From e10ef2241d951b1d9a399ed0ee09a336234df4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 7 Apr 2023 08:31:37 +0200
Subject: [PATCH 001/729] Transformations: Improve UX and fix refId issues
 (#65982)

* Transformations: Improve UX and fix refId issues

* Show query names and frame names in description

* move to main grafan UI component

* Added unit test

* Fix lint error

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 .../FieldsByFrameRefIdMatcher.test.tsx        |  54 +++++++
 .../MatchersUI/FieldsByFrameRefIdMatcher.tsx  | 153 ++++++++++++------
 .../TransformationFilter.tsx                  |  19 +--
 .../geomap/editor/FrameSelectionEditor.tsx    |  79 +--------
 4 files changed, 179 insertions(+), 126 deletions(-)
 create mode 100644 packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.test.tsx

diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.test.tsx b/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.test.tsx
new file mode 100644
index 00000000000..c8ab4606ea7
--- /dev/null
+++ b/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.test.tsx
@@ -0,0 +1,54 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { toDataFrame, FieldType } from '@grafana/data';
+
+import { RefIDPicker, Props } from './FieldsByFrameRefIdMatcher';
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+const frame1 = toDataFrame({
+  refId: 'A',
+  name: 'Series A',
+  fields: [],
+});
+
+const frame2 = toDataFrame({
+  refId: 'A',
+  fields: [{ name: 'Value', type: FieldType.number, values: [10, 200], config: { displayName: 'Second series' } }],
+});
+
+const frame3 = toDataFrame({
+  refId: 'B',
+  name: 'Series B',
+  fields: [],
+});
+
+const mockOnChange = jest.fn();
+
+const props: Props = {
+  data: [frame1, frame2, frame3],
+  onChange: mockOnChange,
+};
+
+const setup = (testProps?: Partial<Props>) => {
+  const editorProps = { ...props, ...testProps };
+  return render(<RefIDPicker {...editorProps} />);
+};
+
+describe('RefIDPicker', () => {
+  it('Should be able to select frame', async () => {
+    setup();
+
+    const select = await screen.findByRole('combobox');
+    fireEvent.keyDown(select, { keyCode: 40 });
+
+    const selectOptions = screen.getAllByLabelText('Select option');
+
+    expect(selectOptions).toHaveLength(2);
+    expect(selectOptions[0]).toHaveTextContent('Query: AFrames (2): Series A, Second series');
+    expect(selectOptions[1]).toHaveTextContent('Query: BFrames (1): Series B');
+  });
+});
diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx b/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx
index e452fcde5bb..65617bfacb4 100644
--- a/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx
+++ b/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx
@@ -1,35 +1,117 @@
-import React, { memo, useMemo, useCallback } from 'react';
+import React, { useMemo, useState, useCallback } from 'react';
 
-import { FieldMatcherID, fieldMatchers, SelectableValue, DataFrame } from '@grafana/data';
+import { DataFrame, getFrameDisplayName, FieldMatcherID, fieldMatchers, SelectableValue } from '@grafana/data';
 
 import { Select } from '../Select/Select';
 
-import { MatcherUIProps, FieldMatcherUIRegistryItem } from './types';
+import { FieldMatcherUIRegistryItem, MatcherUIProps } from './types';
 
-/**
- * UI to configure "fields by frame refId"-matcher.
- * @public
- */
-export const FieldsByFrameRefIdMatcher = memo<MatcherUIProps<string>>((props) => {
-  const { data, options, onChange: onChangeFromProps } = props;
-  const referenceIDs = useFrameRefIds(data);
-  const selectOptions = useSelectOptions(referenceIDs);
+const recoverRefIdMissing = (
+  newRefIds: SelectableValue[],
+  oldRefIds: SelectableValue[],
+  previousValue: string | undefined
+): SelectableValue | undefined => {
+  if (!previousValue) {
+    return;
+  }
+  // Previously selected value is missing from the new list.
+  // Find the value that is in the new list but isn't in the old list
+  let changedTo = newRefIds.find((refId) => {
+    return !oldRefIds.some((refId2) => {
+      return refId === refId2;
+    });
+  });
+  if (changedTo) {
+    // Found the new value, we assume the old value changed to this one, so we'll use it
+    return changedTo;
+  }
+  return;
+};
 
-  const onChange = useCallback(
-    (selection: SelectableValue<string>) => {
-      if (!selection.value || !referenceIDs.has(selection.value)) {
-        return;
-      }
-      return onChangeFromProps(selection.value);
+export interface Props {
+  value?: string; // refID
+  data: DataFrame[];
+  onChange: (value: string) => void;
+  placeholder?: string;
+}
+
+// Not exported globally... but used in grafana core
+export function RefIDPicker({ value, data, onChange, placeholder }: Props) {
+  const listOfRefIds = useMemo(() => getListOfQueryRefIds(data), [data]);
+
+  const [priorSelectionState, updatePriorSelectionState] = useState<{
+    refIds: SelectableValue[];
+    value: string | undefined;
+  }>({
+    refIds: [],
+    value: undefined,
+  });
+
+  const currentValue = useMemo(() => {
+    return (
+      listOfRefIds.find((refId) => refId.value === value) ??
+      recoverRefIdMissing(listOfRefIds, priorSelectionState.refIds, priorSelectionState.value)
+    );
+  }, [value, listOfRefIds, priorSelectionState]);
+
+  const onFilterChange = useCallback(
+    (v: SelectableValue<string>) => {
+      onChange(v.value!);
     },
-    [referenceIDs, onChangeFromProps]
+    [onChange]
   );
 
-  const selectedOption = selectOptions.find((v) => v.value === options);
-  return <Select value={selectedOption} options={selectOptions} onChange={onChange} />;
-});
+  if (listOfRefIds !== priorSelectionState.refIds || currentValue?.value !== priorSelectionState.value) {
+    updatePriorSelectionState({
+      refIds: listOfRefIds,
+      value: currentValue?.value,
+    });
+  }
+  return (
+    <Select
+      options={listOfRefIds}
+      onChange={onFilterChange}
+      isClearable={true}
+      placeholder={placeholder ?? 'Select query refId'}
+      value={currentValue}
+    />
+  );
+}
 
-FieldsByFrameRefIdMatcher.displayName = 'FieldsByFrameRefIdMatcher';
+function getListOfQueryRefIds(data: DataFrame[]): Array<SelectableValue<string>> {
+  const queries = new Map<string, DataFrame[]>();
+
+  for (const frame of data) {
+    const refId = frame.refId ?? '';
+    const frames = queries.get(refId) ?? [];
+
+    if (frames.length === 0) {
+      queries.set(refId, frames);
+    }
+
+    frames.push(frame);
+  }
+
+  const values: Array<SelectableValue<string>> = [];
+
+  for (const [refId, frames] of queries.entries()) {
+    values.push({
+      value: refId,
+      label: `Query: ${refId ?? '(missing refId)'}`,
+      description: getFramesDescription(frames),
+    });
+  }
+
+  return values;
+}
+
+function getFramesDescription(frames: DataFrame[]): string {
+  return `Frames (${frames.length}):
+    ${frames
+      .slice(0, Math.min(3, frames.length))
+      .map((x) => getFrameDisplayName(x))
+      .join(', ')} ${frames.length > 3 ? '...' : ''}`;
+}
 
 /**
  * Registry item for UI to configure "fields by frame refId"-matcher.
@@ -37,32 +119,11 @@ FieldsByFrameRefIdMatcher.displayName = 'FieldsByFrameRefIdMatcher';
  */
 export const fieldsByFrameRefIdItem: FieldMatcherUIRegistryItem<string> = {
   id: FieldMatcherID.byFrameRefID,
-  component: FieldsByFrameRefIdMatcher,
+  component: (props: MatcherUIProps<string>) => {
+    return <RefIDPicker value={props.options} data={props.data} onChange={props.onChange} />;
+  },
   matcher: fieldMatchers.get(FieldMatcherID.byFrameRefID),
   name: 'Fields returned by query',
   description: 'Set properties for fields from a specific query',
   optionsToLabel: (options) => options,
 };
-
-const useFrameRefIds = (data: DataFrame[]): Set<string> => {
-  return useMemo(() => {
-    const refIds: Set<string> = new Set();
-
-    for (const frame of data) {
-      if (frame.refId) {
-        refIds.add(frame.refId);
-      }
-    }
-
-    return refIds;
-  }, [data]);
-};
-
-const useSelectOptions = (displayNames: Set<string>): Array<SelectableValue<string>> => {
-  return useMemo(() => {
-    return Array.from(displayNames).map((n) => ({
-      value: n,
-      label: n,
-    }));
-  }, [displayNames]);
-};
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
index ebbccbab512..7de44c7d3a6 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
@@ -8,7 +8,7 @@ import {
   StandardEditorContext,
   StandardEditorsRegistryItem,
 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { Field, useStyles2 } from '@grafana/ui';
 import { FrameSelectionEditor } from 'app/plugins/panel/geomap/editor/FrameSelectionEditor';
 
 interface TransformationFilterProps {
@@ -27,14 +27,15 @@ export const TransformationFilter = ({ index, data, config, onChange }: Transfor
 
   return (
     <div className={styles.wrapper}>
-      <h5>Apply tranformation to</h5>
-      <FrameSelectionEditor
-        value={config.filter!}
-        context={context}
-        // eslint-disable-next-line
-        item={{} as StandardEditorsRegistryItem}
-        onChange={(filter) => onChange(index, { ...config, filter })}
-      />
+      <Field label="Apply tranformation to">
+        <FrameSelectionEditor
+          value={config.filter!}
+          context={context}
+          // eslint-disable-next-line
+          item={{} as StandardEditorsRegistryItem}
+          onChange={(filter) => onChange(index, { ...config, filter })}
+        />
+      </Field>
     </div>
   );
 };
diff --git a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
index 98bcac91b8b..26bf727d8b9 100644
--- a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
@@ -1,69 +1,18 @@
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback } from 'react';
 
-import {
-  FrameMatcherID,
-  getFieldDisplayName,
-  MatcherConfig,
-  SelectableValue,
-  StandardEditorProps,
-} from '@grafana/data';
-import { Select } from '@grafana/ui';
-
-const recoverRefIdMissing = (
-  newRefIds: SelectableValue[],
-  oldRefIds: SelectableValue[],
-  previousValue: string | undefined
-): SelectableValue | undefined => {
-  if (!previousValue) {
-    return;
-  }
-  // Previously selected value is missing from the new list.
-  // Find the value that is in the new list but isn't in the old list
-  let changedTo = newRefIds.find((refId) => {
-    return !oldRefIds.some((refId2) => {
-      return refId === refId2;
-    });
-  });
-  if (changedTo) {
-    // Found the new value, we assume the old value changed to this one, so we'll use it
-    return changedTo;
-  }
-  return;
-};
+import { FrameMatcherID, MatcherConfig, StandardEditorProps } from '@grafana/data';
+import { RefIDPicker } from '@grafana/ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher';
 
 type Props = StandardEditorProps<MatcherConfig>;
 
-export const FrameSelectionEditor = ({ value, context, onChange, item }: Props) => {
-  const listOfRefId = useMemo(() => {
-    return context.data.map((f) => ({
-      value: f.refId,
-      label: `Query: ${f.refId} (size: ${f.length})`,
-      description: f.fields.map((f) => getFieldDisplayName(f)).join(', '),
-    }));
-  }, [context.data]);
-
-  const [priorSelectionState, updatePriorSelectionState] = useState<{
-    refIds: SelectableValue[];
-    value: string | undefined;
-  }>({
-    refIds: [],
-    value: undefined,
-  });
-
-  const currentValue = useMemo(() => {
-    return (
-      listOfRefId.find((refId) => refId.value === value?.options) ??
-      recoverRefIdMissing(listOfRefId, priorSelectionState.refIds, priorSelectionState.value)
-    );
-  }, [value, listOfRefId, priorSelectionState]);
-
+export const FrameSelectionEditor = ({ value, context, onChange }: Props) => {
   const onFilterChange = useCallback(
-    (v: SelectableValue<string>) => {
+    (v: string) => {
       onChange(
-        v?.value
+        v?.length
           ? {
               id: FrameMatcherID.byRefId,
-              options: v.value,
+              options: v,
             }
           : undefined
       );
@@ -71,19 +20,7 @@ export const FrameSelectionEditor = ({ value, context, onChange, item }: Props)
     [onChange]
   );
 
-  if (listOfRefId !== priorSelectionState.refIds || currentValue?.value !== priorSelectionState.value) {
-    updatePriorSelectionState({
-      refIds: listOfRefId,
-      value: currentValue?.value,
-    });
-  }
   return (
-    <Select
-      options={listOfRefId}
-      onChange={onFilterChange}
-      isClearable={true}
-      placeholder="Change filter"
-      value={currentValue}
-    />
+    <RefIDPicker value={value.options} onChange={onFilterChange} data={context.data} placeholder="Change filter" />
   );
 };

From 5dc529a55d4fa5e172580f62fddad7497e5dd3c0 Mon Sep 17 00:00:00 2001
From: Domas <domasx2@gmail.com>
Date: Fri, 7 Apr 2023 13:31:18 +0300
Subject: [PATCH 002/729] Query Splitting: Fix for handling queries with no
 requestId (#66161)

Loki query splitting fix for when there's no request id
---
 .../plugins/datasource/loki/querySplitting.ts | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/public/app/plugins/datasource/loki/querySplitting.ts b/public/app/plugins/datasource/loki/querySplitting.ts
index 865ae15bfd6..e7ff7ebb62a 100644
--- a/public/app/plugins/datasource/loki/querySplitting.ts
+++ b/public/app/plugins/datasource/loki/querySplitting.ts
@@ -111,7 +111,6 @@ export function runSplitGroupedQueries(datasource: LokiDatasource, requests: Lok
     };
 
     const group = requests[requestGroup];
-    const requestId = `${group.request.requestId}_${requestN}`;
     const range = group.partition[requestN - 1];
     const targets = adjustTargetsFromResponseState(group.request.targets, mergedResponse);
 
@@ -120,23 +119,27 @@ export function runSplitGroupedQueries(datasource: LokiDatasource, requests: Lok
       return;
     }
 
-    subquerySubsciption = datasource
-      .runQuery({ ...requests[requestGroup].request, range, requestId, targets })
-      .subscribe({
-        next: (partialResponse) => {
-          mergedResponse = combineResponses(mergedResponse, partialResponse);
-          if ((mergedResponse.errors ?? []).length > 0 || mergedResponse.error != null) {
-            shouldStop = true;
-          }
-        },
-        complete: () => {
-          subscriber.next(mergedResponse);
-          nextRequest();
-        },
-        error: (error) => {
-          subscriber.error(error);
-        },
-      });
+    const subRequest = { ...requests[requestGroup].request, range, targets };
+    // request may not have a request id
+    if (group.request.requestId) {
+      subRequest.requestId = `${group.request.requestId}_${requestN}`;
+    }
+
+    subquerySubsciption = datasource.runQuery(subRequest).subscribe({
+      next: (partialResponse) => {
+        mergedResponse = combineResponses(mergedResponse, partialResponse);
+        if ((mergedResponse.errors ?? []).length > 0 || mergedResponse.error != null) {
+          shouldStop = true;
+        }
+      },
+      complete: () => {
+        subscriber.next(mergedResponse);
+        nextRequest();
+      },
+      error: (error) => {
+        subscriber.error(error);
+      },
+    });
   };
 
   const response = new Observable<DataQueryResponse>((subscriber) => {
@@ -176,7 +179,6 @@ export function runSplitQuery(datasource: LokiDatasource, request: DataQueryRequ
   const [logQueries, metricQueries] = partition(normalQueries, (query) => isLogsQuery(query.expr));
 
   request.queryGroupId = uuidv4();
-
   const oneDayMs = 24 * 60 * 60 * 1000;
   const rangePartitionedLogQueries = groupBy(logQueries, (query) =>
     query.splitDuration ? durationToMilliseconds(parseDuration(query.splitDuration)) : oneDayMs

From 3e12b72f58bac39cb6ccd17b60da8adce7b930d0 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Fri, 7 Apr 2023 12:31:18 +0100
Subject: [PATCH 003/729] Alerting: Fix docs link when creating or editing
 rules (#66019)

---
 .../alerting/unified/components/rule-editor/DetailsStep.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
index 799b89f67cf..a33071e7a05 100644
--- a/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
@@ -12,7 +12,7 @@ function getDescription(ruleType: RuleFormType | undefined) {
     return 'Select the Namespace and Group for your recording rule.';
   }
   const docsLink =
-    'https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/variables-label-annotation/#the-values-variable';
+    'https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/variables-label-annotation';
   const LinkToDocs = () => (
     <span>
       Click{' '}
@@ -26,8 +26,7 @@ function getDescription(ruleType: RuleFormType | undefined) {
     return (
       <span>
         {' '}
-        Write a summary to help you better manage your alerts.
-        <LinkToDocs />
+        Write a summary to help you better manage your alerts. <LinkToDocs />
       </span>
     );
   }
@@ -36,7 +35,6 @@ function getDescription(ruleType: RuleFormType | undefined) {
       <span>
         {' '}
         Select the Namespace and evaluation group for your alert. Write a summary to help you better manage your alerts.{' '}
-        <LinkToDocs />
       </span>
     );
   }

From cb8a5b2c96107f8b82d6c9c286968871d77d5dcd Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Fri, 7 Apr 2023 13:48:46 +0200
Subject: [PATCH 004/729] Alerting: Fix explore link in alert detail view
 (#66106)

---
 .../unified/GrafanaRuleQueryViewer.tsx        | 69 ++++++++++---------
 .../rule-viewer/RuleViewerVisualization.tsx   | 11 ++-
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
index 0b2cfde30f2..03bb94aadde 100644
--- a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
+++ b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
@@ -44,47 +44,51 @@ export function GrafanaRuleQueryViewer({
   const dsByUid = keyBy(Object.values(config.datasources), (ds) => ds.uid);
   const dataQueries = queries.filter((q) => !isExpressionQuery(q.model));
   const expressions = queries.filter((q) => isExpressionQuery(q.model));
+  const styles = useStyles2(getExpressionViewerStyles);
 
   return (
     <Stack gap={2} direction="column">
-      <Stack gap={2}>
-        {dataQueries.map(({ model, relativeTimeRange, refId, datasourceUid }, index) => {
-          const dataSource = dsByUid[datasourceUid];
+      <div className={styles.maxWidthContainer}>
+        <Stack gap={2}>
+          {dataQueries.map(({ model, relativeTimeRange, refId, datasourceUid }, index) => {
+            const dataSource = dsByUid[datasourceUid];
 
-          return (
-            <QueryPreview
-              key={index}
-              refId={refId}
-              isAlertCondition={condition === refId}
-              model={model}
-              relativeTimeRange={relativeTimeRange}
-              evalTimeRange={evalTimeRanges[refId]}
-              dataSource={dataSource}
-              queryData={evalDataByQuery[refId]}
-              onEvalTimeRangeChange={(timeRange) => onTimeRangeChange(refId, timeRange)}
-            />
-          );
-        })}
-      </Stack>
-
-      <Stack gap={1}>
-        {expressions.map(({ model, relativeTimeRange, refId, datasourceUid }, index) => {
-          const dataSource = dsByUid[datasourceUid];
-
-          return (
-            isExpressionQuery(model) && (
-              <ExpressionPreview
+            return (
+              <QueryPreview
                 key={index}
                 refId={refId}
                 isAlertCondition={condition === refId}
                 model={model}
+                relativeTimeRange={relativeTimeRange}
+                evalTimeRange={evalTimeRanges[refId]}
                 dataSource={dataSource}
-                evalData={evalDataByQuery[refId]}
+                queryData={evalDataByQuery[refId]}
+                onEvalTimeRangeChange={(timeRange) => onTimeRangeChange(refId, timeRange)}
               />
-            )
-          );
-        })}
-      </Stack>
+            );
+          })}
+        </Stack>
+      </div>
+      <div className={styles.maxWidthContainer}>
+        <Stack gap={1}>
+          {expressions.map(({ model, refId, datasourceUid }, index) => {
+            const dataSource = dsByUid[datasourceUid];
+
+            return (
+              isExpressionQuery(model) && (
+                <ExpressionPreview
+                  key={index}
+                  refId={refId}
+                  isAlertCondition={condition === refId}
+                  model={model}
+                  dataSource={dataSource}
+                  evalData={evalDataByQuery[refId]}
+                />
+              )
+            );
+          })}
+        </Stack>
+      </div>
     </Stack>
   );
 }
@@ -389,6 +393,9 @@ const getExpressionViewerStyles = (theme: GrafanaTheme2) => {
 
   return {
     ...common,
+    maxWidthContainer: css`
+      max-width: 100%;
+    `,
     container: css`
       padding: ${theme.spacing(1)};
       display: flex;
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
index c215696afdf..9c01e69ecc6 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
@@ -141,12 +141,19 @@ export function RuleViewerVisualization({
 function createExploreLink(settings: DataSourceInstanceSettings, model: AlertDataQuery): string {
   const { name } = settings;
   const { refId, ...rest } = model;
-  const queryParams = { ...rest, datasource: name };
 
+  /**
+    In my testing I've found some alerts that don't have a data source embedded inside the model.
+   
+    At this moment in time it is unclear to me why some alert definitions not have a data source embedded in the model.
+    Ideally we'd resolve the datasource name to the proper datasource Ref "{ type: string, uid: string }" and pass that in to the model.
+   
+    I don't think that should happen here, the fact that the datasource ref is sometimes missing here is a symptom of another cause. (Gilles)
+   */
   return urlUtil.renderUrl(`${config.appSubUrl}/explore`, {
     left: JSON.stringify({
       datasource: name,
-      queries: [{ refId: 'A', ...queryParams }],
+      queries: [{ refId: 'A', ...rest }],
       range: { from: 'now-1h', to: 'now' },
     }),
   });

From fcdbb7a86f8cf440a30bf2e2360c14cc7bfa4d22 Mon Sep 17 00:00:00 2001
From: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Date: Fri, 7 Apr 2023 08:44:01 -0500
Subject: [PATCH 005/729] Docs: updates Grafana installation for Red Hat,
 Fedora, RHEL, SUSE, and OpenSUSE (#65232)

* removes references to CentOS

* starts reorg

* complete restructure

* updates alias

* Update docs/sources/setup-grafana/installation/rpm/index.md

* Apply suggestions from code review

Co-authored-by: Dan Cech <dcech@grafana.com>

* incorporates review feedback

* adds install on suse/opensuse

* updates aliases

* Apply suggestions from code review

Co-authored-by: Dan Cech <dcech@grafana.com>

* removes start server content from both topics; adds link to start server docs in Next steps

* Apply suggestions from code review

Co-authored-by: Dan Cech <dcech@grafana.com>

* incorporates review feedback

* Apply suggestions from code review

* typo fix

---------

Co-authored-by: Dan Cech <dcech@grafana.com>
---
 .../setup-grafana/installation/_index.md      |   6 +-
 .../installation/redhat-rhel-fedora/index.md  | 102 ++++++++
 .../setup-grafana/installation/rpm/index.md   | 232 ------------------
 .../installation/suse-opensuse/index.md       |  84 +++++++
 .../shared/upgrade/upgrade-common-tasks.md    |  12 +-
 5 files changed, 199 insertions(+), 237 deletions(-)
 create mode 100644 docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
 delete mode 100644 docs/sources/setup-grafana/installation/rpm/index.md
 create mode 100644 docs/sources/setup-grafana/installation/suse-opensuse/index.md

diff --git a/docs/sources/setup-grafana/installation/_index.md b/docs/sources/setup-grafana/installation/_index.md
index 01cafd89cf3..999c7c0b2c5 100644
--- a/docs/sources/setup-grafana/installation/_index.md
+++ b/docs/sources/setup-grafana/installation/_index.md
@@ -5,6 +5,7 @@ aliases:
   - ../installation/installation/
   - ../installation/requirements/
   - /docs/grafana/v2.1/installation/install/
+  - ./rpm/
 description: Installation guide for Grafana
 title: Install Grafana
 weight: 100
@@ -22,8 +23,9 @@ Grafana relies on other open source software to operate. For a list of open sour
 
 Grafana supports the following operating systems:
 
-- [Debian / Ubuntu]({{< relref "debian/" >}})
-- [RPM-based Linux (Fedora, SUSE/OpenSUSE, RedHat)]({{< relref "rpm/" >}})
+- [Debian/Ubuntu]({{< relref "debian/" >}})
+- [Red Hat/RHEL/Fedora]({{< relref "redhat-rhel-fedora/" >}})
+- [SUSE/OpenSUSE]({{< relref "suse-opensuse/" >}})
 - [macOS]({{< relref "mac/" >}})
 - [Windows]({{< relref "windows/" >}})
 
diff --git a/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
new file mode 100644
index 00000000000..60a6f12dd14
--- /dev/null
+++ b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
@@ -0,0 +1,102 @@
+---
+description: Install guide for Grafana on Red Hat, RHEL, and Fedora.
+title: Install Grafana on Red Hat, RHEL, or Fedora
+menuTitle: Redhat, RHEL, or Fedora
+weight: 400
+---
+
+# Install Grafana on Red Hat, RHEL, or Fedora
+
+This topic explains how to install Grafana dependencies, install Grafana on Redhat, RHEL, or Fedora, and start the Grafana server on your system.
+
+You can install Grafana using a YUM repository, using RPM, or by downloading a binary `.tar.gz` file.
+
+If you install via RPM or the `.tar.gz` file, then you must manually update Grafana for each new version.
+
+## Install Grafana from the YUM repository
+
+If you install from the YUM repository, then Grafana is automatically updated every time you run `sudo yum update`.
+
+| Grafana Version    | Package            | Repository                |
+| ------------------ | ------------------ | ------------------------- |
+| Grafana Enterprise | grafana-enterprise | `https://rpm.grafana.com` |
+| Grafana OSS        | grafana            | `https://rpm.grafana.com` |
+
+> **Note:** Grafana Enterprise is the recommended and default edition. It is available for free and includes all the features of the OSS edition. You can also upgrade to the [full Enterprise feature set](https://grafana.com/products/enterprise/?utm_source=grafana-install-page), which has support for [Enterprise plugins](https://grafana.com/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page).
+
+To install Grafana using a YUM repository, complete the following steps:
+
+1. Add a file to your YUM repository using the method of your choice.
+
+   The following example uses `nano` to add a file to the YUM repo.
+
+   ```bash
+   sudo nano /etc/yum.repos.d/grafana.repo
+   ```
+
+   ```bash
+   [grafana]
+   name=grafana
+   baseurl=https://rpm.grafana.com
+   repo_gpgcheck=1
+   enabled=1
+   gpgcheck=1
+   gpgkey=https://rpm.grafana.com/gpg.key
+   sslverify=1
+   sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+   ```
+
+1. To prevent beta versions from being installed, add the following exclude line to your `.repo` file.
+
+   ```bash
+   exclude=*beta*
+   ```
+
+1. To install Grafana OSS, run the following command:
+
+   ```bash
+   sudo yum install grafana
+   ```
+
+1. To install Grafana Enterprise, run the following command:
+
+   ```bash
+   sudo yum install grafana-enterprise
+   ```
+
+## Install the Grafana RPM package manually
+
+If you install Grafana manually using YUM or RPM, then you must manually update Grafana for each new version. This method varies according to which Linux OS you are running.
+
+**Note:** The RPM files are signed. You can verify the signature with this [public GPG key](https://rpm.grafana.com/gpg.key).
+
+1. On the [Grafana download page](https://grafana.com/grafana/download), select the Grafana version you want to install.
+   - The most recent Grafana version is selected by default.
+   - The **Version** field displays only finished releases. If you want to install a beta version, click **Nightly Builds** and then select a version.
+1. Select an **Edition**.
+   - **Enterprise** - Recommended download. Functionally identical to the open source version, but includes features you can unlock with a license if you so choose.
+   - **Open Source** - Functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
+1. Depending on which system you are running, click **Linux** or **ARM**.
+1. Copy and paste the RPM package URL and the local RPM package information from the installation page into the pattern shown below, then run the commands.
+
+   ```bash
+   sudo yum install -y <rpm package url>
+   ```
+
+## Install Grafana as a standalone binary
+
+Complete the following steps to install Grafana using the standalone binaries:
+
+1. Navigate to the [Grafana download page](https://grafana.com/grafana/download).
+1. Select the Grafana version you want to install.
+   - The most recent Grafana version is selected by default.
+   - The **Version** field displays only tagged releases. If you want to install a nightly build, click **Nightly Builds** and then select a version.
+1. Select an **Edition**.
+   - **Enterprise:** This is the recommended version. It is functionally identical to the open-source version but includes features you can unlock with a license if you so choose.
+   - **Open Source:** This version is functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
+1. Depending on which system you are running, click the **Linux** or **ARM** tab on the download page.
+1. Copy and paste the code from the installation page into your command line and run.
+
+## Next steps
+
+Refer to [Start the Grafana server]({{< relref "../start-restart-grafana/" >}}).
diff --git a/docs/sources/setup-grafana/installation/rpm/index.md b/docs/sources/setup-grafana/installation/rpm/index.md
deleted file mode 100644
index 76ffccf6d35..00000000000
--- a/docs/sources/setup-grafana/installation/rpm/index.md
+++ /dev/null
@@ -1,232 +0,0 @@
----
-aliases:
-  - ../../installation/installation/rpm/
-  - ../../installation/rpm/
-description: Grafana Installation guide for RPM-based Linux, such as Centos, Fedora,
-  OpenSuse, and Red Hat.
-title: Install on RPM-based Linux
-weight: 400
----
-
-# Install on RPM-based Linux (CentOS, Fedora, OpenSuse, Red Hat)
-
-This topic explains how to install Grafana dependencies, download and install Grafana, get the service up and running on your RPM-based Linux system, and the installation package details.
-
-## Repository migration (November 8th 2022)
-
-From that date, Grafana packages will be served from a new repository (<packages.grafana.com/rpm/{product}> -> <rpm.grafana.com>). The new repository serves, from a single YUM/DNF configuration, all Grafana OSS products, as well as Grafana Enterprise.
-
-The old URLs will still work, serving the content from the new repository, but you may encounter warnings about some repository attributes changing.
-
-## Note on upgrading
-
-While the process for upgrading Grafana is very similar to installing Grafana, there are some key backup steps you should perform. Read [Upgrading Grafana]({{< relref "../../../upgrade-guide/" >}}) for tips and guidance on updating an existing installation.
-
-## 1. Download and install
-
-You can install Grafana from a YUM repository, manually using YUM, manually using RPM, or by downloading a binary `.tar.gz` file.
-
-### Install from YUM repository
-
-If you install from the YUM repository, then Grafana is automatically updated every time you run `sudo yum update`.
-
-| Grafana Version    | Package            | Repository                |
-| ------------------ | ------------------ | ------------------------- |
-| Grafana Enterprise | grafana-enterprise | `https://rpm.grafana.com` |
-| Grafana OSS        | grafana            | `https://rpm.grafana.com` |
-
-> **Note:** Grafana Enterprise is the recommended and default edition. It is available for free and includes all the features of the OSS Edition. You can also upgrade to the [full Enterprise feature set](https://grafana.com/products/enterprise/?utm_source=grafana-install-page) and has support for [Enterprise plugins](https://grafana.com/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page).
-
-Add a new file to your YUM repo using the method of your choice. The command below uses `nano`.
-
-```bash
-sudo nano /etc/yum.repos.d/grafana.repo
-```
-
-```bash
-[grafana]
-name=grafana
-baseurl=https://rpm.grafana.com
-repo_gpgcheck=1
-enabled=1
-gpgcheck=1
-gpgkey=https://rpm.grafana.com/gpg.key
-sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
-```
-
-Optionally, add an exclude line to your `.repo` file to prevent beta versions from being installed.
-
-```bash
-exclude=*beta*
-```
-
-Install Grafana with one of the following commands
-
-> We recommend all users to install the Enterprise Edition of Grafana, which can be seamlessly upgraded with a Grafana Enterprise [subscription](https://grafana.com/products/enterprise/?utm_source=grafana-install-page).
-
-```bash
-sudo yum install grafana
-
-# or
-
-sudo yum install grafana-enterprise
-```
-
-### Install manually with YUM
-
-If you install manually with YUM, then you will need to manually update Grafana for each new version. To enable automatic updates for your Grafana installation please use the instructions below to install via our YUM repository.
-
-1. On the [Grafana download page](https://grafana.com/grafana/download), select the Grafana version you want to install.
-   - The most recent Grafana version is selected by default.
-   - The **Version** field displays only finished releases. If you want to install a beta version, click **Nightly Builds** and then select a version.
-1. Select an **Edition**.
-   - **Enterprise** - Recommended download. Functionally identical to the open source version, but includes features you can unlock with a license if you so choose.
-   - **Open Source** - Functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want enterprise features.
-1. Depending on which system you are running, click **Linux** or **ARM**.
-1. Copy and paste the code from the installation page into your command line and run. It follows the pattern shown below.
-
-```bash
-wget <rpm package url>
-sudo yum localinstall <local rpm package>
-```
-
-You can also install Grafana using YUM directly:
-
-```bash
-sudo yum install <rpm package url>
-```
-
-### Install with RPM
-
-If you install with RPM, then you will need to manually update Grafana for each new version. This method varies according to which Linux OS you are running. Read the instructions fully before you begin.
-
-**Note:** The .rpm files are signed, you can verify the signature with this [public GPG key](https://rpm.grafana.com/gpg.key).
-
-1. On the [Grafana download page](https://grafana.com/grafana/download), select the Grafana version you want to install.
-   - The most recent Grafana version is selected by default.
-   - The **Version** field displays only finished releases. If you want to install a beta version, click **Nightly Builds** and then select a version.
-1. Select an **Edition**.
-   - **Enterprise** - Recommended download. Functionally identical to the open source version, but includes features you can unlock with a license if you so choose.
-   - **Open Source** - Functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
-1. Depending on which system you are running, click **Linux** or **ARM**.
-1. Copy and paste the .rpm package URL and the local .rpm package information from the installation page into the pattern shown below, then run the commands.
-
-**On CentOS, Fedora, Red Hat, or RHEL:**
-
-```bash
-sudo yum install initscripts urw-fonts wget
-wget <rpm package url>
-sudo rpm -Uvh <local rpm package>
-```
-
-**On OpenSUSE or SUSE:**
-
-```bash
-wget <rpm package url>
-sudo rpm -i --nodeps <local rpm package>
-```
-
-### Install from binary .tar.gz file
-
-Download the latest [`.tar.gz` file](https://grafana.com/grafana/download?platform=linux) and extract it. The files are extracted into a folder named after the Grafana version that you downloaded. This folder contains all files required to run Grafana. There are no init scripts or install scripts in this package.
-
-```bash
-wget <tar.gz package url>
-sudo tar -zxvf <tar.gz package>
-```
-
-## 2. Start the server
-
-This starts the `grafana-server` process as the `grafana` user, which was created during the package installation. The systemd commands work in most cases, but some older Linux systems might require init.d. The installer should prompt you with the correct commands.
-
-If you installed with an `.rpm` package, then you can start the server using `systemd` or `init.d`. If you installed a binary `.tar.gz` file, then you need to execute the binary.
-
-### Start the server with systemd
-
-To start the service and verify that the service has started:
-
-```bash
-sudo systemctl daemon-reload
-sudo systemctl start grafana-server
-sudo systemctl status grafana-server
-```
-
-Configure the Grafana server to start at boot:
-
-```bash
-sudo systemctl enable grafana-server
-```
-
-> **SUSE or OpenSUSE users:** You might need to start the server with the systemd method, then use the init.d method to configure Grafana to start at boot.
-
-#### Serving Grafana on a port < 1024
-
-{{< docs/shared "systemd/bind-net-capabilities.md" >}}
-
-#### Serving Grafana behind a proxy
-
-When serving Grafana behind a proxy, you need to configure the `http_proxy` and `https_proxy` environment variables.
-
-##### Centos 6
-
-If you are on Centos 6, add the following lines to the `/etc/sysconfig/grafana-server` file.
-
-```
-export no_proxy=internal.domain,127.0.0.1
-export http_proxy=http://proxy.domain:3128/
-export https_proxy=http://proxy.domain:3128/
-```
-
-##### Centos 7
-
-If you are on Centos 7, add the following lines to the `/etc/sysconfig/grafana-server` file.
-
-```
-http_proxy=http://proxy.domain:3128/
-https_proxy=http://proxy.domain:3128/
-no_proxy=internal.domain,127.0.0.1
-```
-
-### Start the server with init.d
-
-To start the service and verify that the service has started:
-
-```bash
-sudo service grafana-server start
-sudo service grafana-server status
-```
-
-Configure the Grafana server to start at boot:
-
-```bash
-sudo /sbin/chkconfig --add grafana-server
-```
-
-### Execute the binary
-
-The `grafana-server` binary needs the working directory to be the root install directory where the binary and the `public` folder are located.
-
-Start Grafana by running:
-
-```bash
-./bin/grafana-server web
-```
-
-## Package details
-
-- Installs binary to `/usr/sbin/grafana-server`
-- Copies init.d script to `/etc/init.d/grafana-server`
-- Installs default file (environment vars) to `/etc/sysconfig/grafana-server`
-- Copies configuration file to `/etc/grafana/grafana.ini`
-- Installs systemd service (if systemd is available) name `grafana-server.service`
-- The default configuration uses a log file at `/var/log/grafana/grafana.log`
-- The default configuration specifies an sqlite3 database at `/var/lib/grafana/grafana.db`
-
-## Next steps
-
-Refer to the [Getting Started]({{< relref "../../../getting-started/build-first-dashboard/" >}}) guide for information about logging in, setting up data sources, and so on.
-
-## Configure Grafana
-
-Refer to the [Configuration]({{< relref "../../configure-grafana/" >}}) page for details on options for customizing your environment, logging, database, and so on.
diff --git a/docs/sources/setup-grafana/installation/suse-opensuse/index.md b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
new file mode 100644
index 00000000000..d6aee092d07
--- /dev/null
+++ b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
@@ -0,0 +1,84 @@
+---
+description: Install guide for Grafana on SUSE or OpenSUSE.
+title: Install Grafana on SUSE or OpenSUSE
+menuTitle: Redhat, RHEL, or Fedora
+weight: 450
+---
+
+# Install Grafana on SUSE or OpenSUSE
+
+This topic explains how to install Grafana dependencies, install Grafana on SUSE or OpenSUSE and start the Grafana server on your system.
+
+You can install Grafana using a YUM repository, using RPM, or by downloading a binary `.tar.gz` file.
+
+If you install via RPM or the `.tar.gz` file, then you must manually update Grafana for each new version.
+
+## Install Grafana from the YUM repository
+
+If you install from the YUM repository, then Grafana is automatically updated every time you run `sudo zypper update`.
+
+| Grafana Version    | Package            | Repository                |
+| ------------------ | ------------------ | ------------------------- |
+| Grafana Enterprise | grafana-enterprise | `https://rpm.grafana.com` |
+| Grafana OSS        | grafana            | `https://rpm.grafana.com` |
+
+> **Note:** Grafana Enterprise is the recommended and default edition. It is available for free and includes all the features of the OSS edition. You can also upgrade to the [full Enterprise feature set](https://grafana.com/products/enterprise/?utm_source=grafana-install-page), which has support for [Enterprise plugins](https://grafana.com/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page).
+
+To install Grafana using a YUM repository, complete the following steps:
+
+1. Use zypper to add the grafana repo.
+
+   ```bash
+   sudo zypper addrepo https://rpm.grafana.com grafana
+   ```
+
+1. To install Grafana OSS, run the following command:
+
+   ```bash
+   sudo zypper install grafana
+   ```
+
+1. To install Grafana Enterprise, run the following command:
+
+   ```bash
+   sudo zypper install grafana-enterprise
+   ```
+
+## Install the Grafana RPM package manually
+
+If you install Grafana manually using YUM or RPM, then you must manually update Grafana for each new version. This method varies according to which Linux OS you are running.
+
+**Note:** The RPM files are signed. You can verify the signature with this [public GPG key](https://rpm.grafana.com/gpg.key).
+
+1. On the [Grafana download page](https://grafana.com/grafana/download), select the Grafana version you want to install.
+   - The most recent Grafana version is selected by default.
+   - The **Version** field displays only finished releases. If you want to install a beta version, click **Nightly Builds** and then select a version.
+1. Select an **Edition**.
+   - **Enterprise** - Recommended download. Functionally identical to the open source version, but includes features you can unlock with a license if you so choose.
+   - **Open Source** - Functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
+1. Depending on which system you are running, click **Linux** or **ARM**.
+1. Copy and paste the RPM package URL and the local RPM package information from the installation page into the pattern shown below, then run the commands.
+
+   ```bash
+   sudo zypper install initscripts urw-fonts wget
+   wget <rpm package url>
+   sudo rpm -Uvh <local rpm package>
+   ```
+
+## Install Grafana as a standalone binary
+
+Complete the following steps to install Grafana using the standalone binaries:
+
+1. Navigate to the [Grafana download page](https://grafana.com/grafana/download).
+1. Select the Grafana version you want to install.
+   - The most recent Grafana version is selected by default.
+   - The **Version** field displays only tagged releases. If you want to install a nightly build, click **Nightly Builds** and then select a version.
+1. Select an **Edition**.
+   - **Enterprise:** This is the recommended version. It is functionally identical to the open-source version but includes features you can unlock with a license if you so choose.
+   - **Open Source:** This version is functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
+1. Depending on which system you are running, click the **Linux** or **ARM** tab on the download page.
+1. Copy and paste the code from the installation page into your command line and run.
+
+## Next steps
+
+Refer to [Start the Grafana server]({{< relref "../start-restart-grafana/" >}}).
diff --git a/docs/sources/shared/upgrade/upgrade-common-tasks.md b/docs/sources/shared/upgrade/upgrade-common-tasks.md
index fb6e35b3004..bd964412efe 100644
--- a/docs/sources/shared/upgrade/upgrade-common-tasks.md
+++ b/docs/sources/shared/upgrade/upgrade-common-tasks.md
@@ -105,9 +105,9 @@ To upgrade Grafana installed from the binary `.tar.gz` package, complete the fol
 
 1. Extract the downloaded package and overwrite the existing files.
 
-### CentOS or RHEL
+### RPM or YUM
 
-To upgrade Grafana running on CentOS or RHEL, complete the following steps:
+To upgrade Grafana installed using RPM or YUM complete the following steps:
 
 1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/conf/custom.ini`.
 
@@ -115,13 +115,19 @@ To upgrade Grafana running on CentOS or RHEL, complete the following steps:
 
 1. Perform one of the following steps based on your installation.
 
-   - If you [downloaded an RPM package](https://grafana.com/grafana/download) to install Grafana, then complete the steps documented in [Install on RPM-based Linux]({{< relref "../../setup-grafana/installation/rpm/" >}}) to upgrade Grafana.
+   - If you [downloaded an RPM package](https://grafana.com/grafana/download) to install Grafana, then complete the steps documented in [Install Grafana on Red Hat, RHEL, or Fedora]({{< relref "../../setup-grafana/installation/redhat-rhel-fedora/" >}}) or [Install Grafana on SUSE or OpenSUSE]({{< relref "../../setup-grafana/installation/suse-opensuse/" >}}) to upgrade Grafana.
    - If you used the Grafana YUM repository, run the following command:
 
      ```bash
      sudo yum update grafana
      ```
 
+   - If you installed Grafana on OpenSUSE or SUSE, run the following command:
+
+     ```bash
+     sudo zypper update
+     ```
+
 ### Docker
 
 To upgrade Grafana running in a Docker container, complete the following steps:

From 536fad5b61fa9a9ca9d709197efaee559f8d5d69 Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Fri, 7 Apr 2023 09:20:25 -0500
Subject: [PATCH 006/729] Plugins: add env variables needed for the secure
 socks proxy in the plugins sdk (#65878)

---
 go.mod                                          |  2 +-
 go.sum                                          |  2 ++
 pkg/infra/proxy/secure_socks_proxy_test.go      |  6 ------
 pkg/plugins/config/config.go                    |  8 ++++++--
 .../manager/loader/initializer/initializer.go   | 17 +++++++++++++++++
 .../pluginsintegration/config/config.go         |  1 +
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index 658b536798b..8f6a58a3297 100644
--- a/go.mod
+++ b/go.mod
@@ -67,7 +67,7 @@ require (
 	github.com/grafana/cuetsy v0.1.6
 	github.com/grafana/grafana-aws-sdk v0.12.0
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
-	github.com/grafana/grafana-plugin-sdk-go v0.158.0
+	github.com/grafana/grafana-plugin-sdk-go v0.159.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/hashicorp/go-hclog v1.2.0
 	github.com/hashicorp/go-plugin v1.4.3
diff --git a/go.sum b/go.sum
index ac7f880de80..1dc1f33fae6 100644
--- a/go.sum
+++ b/go.sum
@@ -1299,6 +1299,8 @@ github.com/grafana/grafana-plugin-sdk-go v0.157.0 h1:Qm0r5A4TsG+Tmy8Vagffqv21t3R
 github.com/grafana/grafana-plugin-sdk-go v0.157.0/go.mod h1:FwinU1fti54nWWsacIdL8D2WfYcKOWB2VRMtxnBbY+o=
 github.com/grafana/grafana-plugin-sdk-go v0.158.0 h1:kucTwr4LEa6hoSunnRqkuEeJOgbBTFrhdGNkJrMV4Zg=
 github.com/grafana/grafana-plugin-sdk-go v0.158.0/go.mod h1:7/F3lL/w3MGuZTwu0jam5oL/4zNOQmhs2k8WZ9VlzhI=
+github.com/grafana/grafana-plugin-sdk-go v0.159.0 h1:tjqzTe/wz+1zzaeHpOJvBvSvZFx/bJUSHj6WA8HJqhE=
+github.com/grafana/grafana-plugin-sdk-go v0.159.0/go.mod h1:7/F3lL/w3MGuZTwu0jam5oL/4zNOQmhs2k8WZ9VlzhI=
 github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375 h1:iWFjqAU5GjIV/HetIE/Me6VF3SRw29u5QviMVbJUVQo=
 github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375/go.mod h1:213a3clTiegHfheYcLPLeEyHv/azK/fAF67OEbzuLzw=
 github.com/grafana/phlare/api v0.1.3 h1:mYTaE9mLsAW/uzPXlW/PQSLsZ4ojBFA+oAMfR/PDdw8=
diff --git a/pkg/infra/proxy/secure_socks_proxy_test.go b/pkg/infra/proxy/secure_socks_proxy_test.go
index 80058780b65..ca5e0973214 100644
--- a/pkg/infra/proxy/secure_socks_proxy_test.go
+++ b/pkg/infra/proxy/secure_socks_proxy_test.go
@@ -67,12 +67,6 @@ func TestSecureSocksProxyEnabledOnDS(t *testing.T) {
 				},
 				enabled: false,
 			},
-			{
-				instanceSettings: &backend.AppInstanceSettings{
-					JSONData: []byte("{ \"enableSecureSocksProxy\": \"nonbool\" }"),
-				},
-				enabled: false,
-			},
 			{
 				instanceSettings: &backend.AppInstanceSettings{
 					JSONData: []byte("{ \"enableSecureSocksProxy\": false }"),
diff --git a/pkg/plugins/config/config.go b/pkg/plugins/config/config.go
index c1509453d47..3b2e1d9c662 100644
--- a/pkg/plugins/config/config.go
+++ b/pkg/plugins/config/config.go
@@ -24,6 +24,9 @@ type Cfg struct {
 	// Azure Cloud settings
 	Azure *azsettings.AzureSettings
 
+	// Proxy Settings
+	ProxySettings setting.SecureSocksDSProxySettings
+
 	BuildVersion string // TODO Remove
 
 	LogDatasourceRequests bool
@@ -34,8 +37,8 @@ type Cfg struct {
 }
 
 func NewCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
-	awsAllowedAuthProviders []string, awsAssumeRoleEnabled bool, azure *azsettings.AzureSettings, grafanaVersion string,
-	logDatasourceRequests bool, pluginsCDNURLTemplate string, tracing Tracing) *Cfg {
+	awsAllowedAuthProviders []string, awsAssumeRoleEnabled bool, azure *azsettings.AzureSettings, secureSocksDSProxy setting.SecureSocksDSProxySettings,
+	grafanaVersion string, logDatasourceRequests bool, pluginsCDNURLTemplate string, tracing Tracing) *Cfg {
 	return &Cfg{
 		log:                     log.New("plugin.cfg"),
 		PluginsPath:             pluginsPath,
@@ -46,6 +49,7 @@ func NewCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSetti
 		AWSAllowedAuthProviders: awsAllowedAuthProviders,
 		AWSAssumeRoleEnabled:    awsAssumeRoleEnabled,
 		Azure:                   azure,
+		ProxySettings:           secureSocksDSProxy,
 		LogDatasourceRequests:   logDatasourceRequests,
 		PluginsCDNURLTemplate:   pluginsCDNURLTemplate,
 		Tracing:                 tracing,
diff --git a/pkg/plugins/manager/loader/initializer/initializer.go b/pkg/plugins/manager/loader/initializer/initializer.go
index 39afb5be578..c1f10c8ed26 100644
--- a/pkg/plugins/manager/loader/initializer/initializer.go
+++ b/pkg/plugins/manager/loader/initializer/initializer.go
@@ -4,10 +4,12 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
@@ -63,6 +65,7 @@ func (i *Initializer) envVars(plugin *plugins.Plugin) []string {
 	}
 
 	hostEnv = append(hostEnv, i.awsEnvVars()...)
+	hostEnv = append(hostEnv, i.secureSocksProxyEnvVars()...)
 	hostEnv = append(hostEnv, azsettings.WriteToEnvStr(i.cfg.Azure)...)
 
 	// Tracing
@@ -97,6 +100,20 @@ func (i *Initializer) awsEnvVars() []string {
 	return variables
 }
 
+func (i *Initializer) secureSocksProxyEnvVars() []string {
+	var variables []string
+	if i.cfg.ProxySettings.Enabled {
+		variables = append(variables, proxy.PluginSecureSocksProxyClientCert+"="+i.cfg.ProxySettings.ClientCert)
+		variables = append(variables, proxy.PluginSecureSocksProxyClientKey+"="+i.cfg.ProxySettings.ClientKey)
+		variables = append(variables, proxy.PluginSecureSocksProxyRootCACert+"="+i.cfg.ProxySettings.RootCA)
+		variables = append(variables, proxy.PluginSecureSocksProxyProxyAddress+"="+i.cfg.ProxySettings.ProxyAddress)
+		variables = append(variables, proxy.PluginSecureSocksProxyServerName+"="+i.cfg.ProxySettings.ServerName)
+		variables = append(variables, proxy.PluginSecureSocksProxyEnabled+"="+strconv.FormatBool(i.cfg.ProxySettings.Enabled))
+	}
+
+	return variables
+}
+
 type pluginSettings map[string]string
 
 func (ps pluginSettings) asEnvVar(prefix string, hostEnv []string) []string {
diff --git a/pkg/services/pluginsintegration/config/config.go b/pkg/services/pluginsintegration/config/config.go
index 24d1e5c2f03..762603b0476 100644
--- a/pkg/services/pluginsintegration/config/config.go
+++ b/pkg/services/pluginsintegration/config/config.go
@@ -33,6 +33,7 @@ func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg) (*
 		allowedAuth,
 		aws.KeyValue("assume_role_enabled").MustBool(grafanaCfg.AWSAssumeRoleEnabled),
 		grafanaCfg.Azure,
+		grafanaCfg.SecureSocksDSProxy,
 		grafanaCfg.BuildVersion,
 		grafanaCfg.PluginLogBackendRequests,
 		grafanaCfg.PluginsCDNURLTemplate,

From 652c6dbd222eb498d19e8ed64fa9af33271a82ca Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Fri, 7 Apr 2023 17:11:47 +0200
Subject: [PATCH 007/729] Plugins: Refactoring: Move plugins tracing env vars
 to separate func (#66170)

---
 .../manager/loader/initializer/initializer.go | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkg/plugins/manager/loader/initializer/initializer.go b/pkg/plugins/manager/loader/initializer/initializer.go
index c1f10c8ed26..09aa6bbf64a 100644
--- a/pkg/plugins/manager/loader/initializer/initializer.go
+++ b/pkg/plugins/manager/loader/initializer/initializer.go
@@ -67,25 +67,30 @@ func (i *Initializer) envVars(plugin *plugins.Plugin) []string {
 	hostEnv = append(hostEnv, i.awsEnvVars()...)
 	hostEnv = append(hostEnv, i.secureSocksProxyEnvVars()...)
 	hostEnv = append(hostEnv, azsettings.WriteToEnvStr(i.cfg.Azure)...)
+	hostEnv = append(hostEnv, i.tracingEnvVars(plugin)...)
 
-	// Tracing
+	ev := getPluginSettings(plugin.ID, i.cfg).asEnvVar("GF_PLUGIN", hostEnv)
+	return ev
+}
+
+func (i *Initializer) tracingEnvVars(plugin *plugins.Plugin) []string {
 	var pluginTracingEnabled bool
 	if v, exists := i.cfg.PluginSettings[plugin.ID]["tracing"]; exists {
 		pluginTracingEnabled = v == "true"
 	}
-	if i.cfg.Tracing.IsEnabled() && pluginTracingEnabled {
-		if plugin.Info.Version != "" {
-			hostEnv = append(hostEnv, fmt.Sprintf("GF_PLUGIN_VERSION=%s", plugin.Info.Version))
-		}
-		hostEnv = append(
-			hostEnv,
-			fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", i.cfg.Tracing.OpenTelemetry.Address),
-			fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", i.cfg.Tracing.OpenTelemetry.Propagation),
-		)
+	if !i.cfg.Tracing.IsEnabled() || !pluginTracingEnabled {
+		return nil
 	}
 
-	ev := getPluginSettings(plugin.ID, i.cfg).asEnvVar("GF_PLUGIN", hostEnv)
-	return ev
+	var vars []string
+	if plugin.Info.Version != "" {
+		vars = append(vars, fmt.Sprintf("GF_PLUGIN_VERSION=%s", plugin.Info.Version))
+	}
+	return append(
+		vars,
+		fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", i.cfg.Tracing.OpenTelemetry.Address),
+		fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", i.cfg.Tracing.OpenTelemetry.Propagation),
+	)
 }
 
 func (i *Initializer) awsEnvVars() []string {

From 4a2d86750eca720e3b9fb6a5653be2da808dc47e Mon Sep 17 00:00:00 2001
From: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Date: Fri, 7 Apr 2023 10:12:50 -0500
Subject: [PATCH 008/729] Docs: removes start server content, updates links
 (#66172)

removes start server content, updates links
---
 .../installation/debian/index.md              | 73 -------------------
 .../setup-grafana/installation/mac/index.md   |  4 -
 .../installation/redhat-rhel-fedora/index.md  |  2 +-
 .../installation/suse-opensuse/index.md       |  2 +-
 .../installation/windows/index.md             |  4 -
 5 files changed, 2 insertions(+), 83 deletions(-)

diff --git a/docs/sources/setup-grafana/installation/debian/index.md b/docs/sources/setup-grafana/installation/debian/index.md
index bb15faf7830..396d95e3a73 100644
--- a/docs/sources/setup-grafana/installation/debian/index.md
+++ b/docs/sources/setup-grafana/installation/debian/index.md
@@ -80,79 +80,6 @@ Complete the following steps to install Grafana using DEB or the standalone bina
 1. Depending on which system you are running, click the **Linux** or **ARM** tab on the download page.
 1. Copy and paste the code from the installation page into your command line and run.
 
-## 2. Start the server
-
-The following sections provide instructions for starting the `grafana-server` process as the `grafana` user, which was created during the package installation.
-
-If you installed with the APT repository or `.deb` package, then you can start the server using `systemd` or `init.d`. If you installed a binary `.tar.gz` file, then you need to execute the binary.
-
-> **Note:** The following subsections describe three methods of starting the Grafana server: with systemd, initd, or by directly running the binary. You should follow only one set of instructions, depending on how your machine is configured.
-
-### Start the Grafana server with systemd
-
-Complete the following steps to start the Grafana server with systemd and verify that it is running:
-
-1. To start the service, run the following commands:
-
-   ```bash
-   sudo systemctl daemon-reload
-   sudo systemctl start grafana-server
-   sudo systemctl status grafana-server
-   ```
-
-1. To verify that the service is running, run the following command:
-
-   ```
-   sudo systemctl status grafana-server
-   ```
-
-1. To configure the Grafana server to start at boot, run the following command:
-
-   ```bash
-   sudo systemctl enable grafana-server.service
-   ```
-
-#### Serve Grafana on a port < 1024
-
-{{< docs/shared "systemd/bind-net-capabilities.md" >}}
-
-### Start the server with init.d
-
-Complete the following steps to start the Grafana service and verify that it is running:
-
-1. To start the Grafana server, run the following commands:
-
-   ```bash
-   sudo service grafana-server start
-   sudo service grafana-server status
-   ```
-
-1. To verify that the service is running, run the following command:
-
-   ```
-   sudo service grafana-server status
-   ```
-
-1. To configure the Grafana server to start at boot, run the following command:
-
-   ```bash
-   sudo update-rc.d grafana-server defaults
-   ```
-
-### Start the server using the binary
-
-The `grafana-server` binary .tar.gz needs the working directory to be the root install directory where the binary and the `public` folder are located.
-
-To start the Grafana server, run the following command:
-
-```bash
-./bin/grafana-server
-```
-
-## Upgrade Grafana
-
-While the process for upgrading Grafana is similar to installing Grafana, there are important backup tasks you should perform. Refer to [Upgrade Grafana]({{< relref "../../../upgrade-guide/" >}}) for guidance on updating an existing installation.
-
 ## Next steps
 
 - [Start the Grafana server]({{< relref "../../start-restart-grafana/" >}})
diff --git a/docs/sources/setup-grafana/installation/mac/index.md b/docs/sources/setup-grafana/installation/mac/index.md
index 98bf75ac5e4..71b8c46828c 100644
--- a/docs/sources/setup-grafana/installation/mac/index.md
+++ b/docs/sources/setup-grafana/installation/mac/index.md
@@ -57,10 +57,6 @@ To install Grafana on macOS using the standalone binaries, complete the followin
    ./bin/grafana-server
    ```
 
-## Upgrade Grafana
-
-While the process for upgrading Grafana is very similar to installing Grafana, there are important backup tasks you should perform. Refer to [Upgrade Grafana]({{< relref "../../../upgrade-guide/" >}}) for guidance on updating an existing installation.
-
 ## Next steps
 
 - [Start the Grafana server]({{< relref "../../start-restart-grafana/" >}})
diff --git a/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
index 60a6f12dd14..d54c67aaa9e 100644
--- a/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
+++ b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
@@ -99,4 +99,4 @@ Complete the following steps to install Grafana using the standalone binaries:
 
 ## Next steps
 
-Refer to [Start the Grafana server]({{< relref "../start-restart-grafana/" >}}).
+Refer to [Start the Grafana server]({{< relref "../../start-restart-grafana/" >}}).
diff --git a/docs/sources/setup-grafana/installation/suse-opensuse/index.md b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
index d6aee092d07..bb31b27831d 100644
--- a/docs/sources/setup-grafana/installation/suse-opensuse/index.md
+++ b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
@@ -81,4 +81,4 @@ Complete the following steps to install Grafana using the standalone binaries:
 
 ## Next steps
 
-Refer to [Start the Grafana server]({{< relref "../start-restart-grafana/" >}}).
+Refer to [Start the Grafana server]({{< relref "../../start-restart-grafana/" >}}).
diff --git a/docs/sources/setup-grafana/installation/windows/index.md b/docs/sources/setup-grafana/installation/windows/index.md
index 51be167d01e..e03676842bf 100644
--- a/docs/sources/setup-grafana/installation/windows/index.md
+++ b/docs/sources/setup-grafana/installation/windows/index.md
@@ -54,10 +54,6 @@ Start Grafana by executing `grafana-server.exe`, located in the `bin` directory,
 
    Port `8080` should not require extra Windows privileges.
 
-## Upgrade Grafana
-
-While the process for upgrading Grafana is very similar to installing Grafana, there are important backup tasks you should perform. Refer to [Upgrade Grafana]({{< relref "../../../upgrade-guide/" >}}) for guidance on updating an existing installation.
-
 ## Next steps
 
 - [Start the Grafana server]({{< relref "../../start-restart-grafana/" >}})

From d9b4aa07f7b982ba00c39b528c91e1d2dcbbc172 Mon Sep 17 00:00:00 2001
From: Artur Wierzbicki <artur.wierzbicki@grafana.com>
Date: Fri, 7 Apr 2023 19:15:46 +0400
Subject: [PATCH 009/729] Previews: remove dashboard previews UI (#66146)

* remove dashboard previews ui

* remove dashboard previews ui

* remove layout prop

* remove layout prop
---
 .../components/PreviewsSystemRequirements.tsx |  94 ------------
 .../search/page/components/ActionRow.tsx      |  17 +--
 .../components/SearchResultsGrid.test.tsx     |  66 ---------
 .../page/components/SearchResultsGrid.tsx     | 134 ------------------
 .../search/page/components/SearchView.tsx     |  13 --
 public/app/features/search/page/reporting.ts  |   7 +-
 public/app/features/search/types.ts           |   1 -
 .../app/plugins/panel/dashlist/DashList.tsx   |  17 +--
 public/app/plugins/panel/dashlist/module.tsx  |  17 +--
 .../app/plugins/panel/dashlist/panelcfg.cue   |   2 -
 .../plugins/panel/dashlist/panelcfg.gen.ts    |   7 -
 11 files changed, 7 insertions(+), 368 deletions(-)
 delete mode 100644 public/app/features/search/components/PreviewsSystemRequirements.tsx
 delete mode 100644 public/app/features/search/page/components/SearchResultsGrid.test.tsx
 delete mode 100644 public/app/features/search/page/components/SearchResultsGrid.tsx

diff --git a/public/app/features/search/components/PreviewsSystemRequirements.tsx b/public/app/features/search/components/PreviewsSystemRequirements.tsx
deleted file mode 100644
index c3ba284c01b..00000000000
--- a/public/app/features/search/components/PreviewsSystemRequirements.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { config } from '@grafana/runtime/src';
-import { Alert, useStyles2 } from '@grafana/ui';
-
-export interface Props {
-  showPreviews?: boolean;
-  /** On click handler for alert button, mostly used for dismissing the alert */
-  onRemove?: (event: React.MouseEvent) => void;
-  topSpacing?: number;
-  bottomSpacing?: number;
-}
-
-const MessageLink = ({ text }: { text: string }) => (
-  <a
-    href="https://grafana.com/grafana/plugins/grafana-image-renderer"
-    target="_blank"
-    rel="noopener noreferrer"
-    className="external-link"
-  >
-    {text}
-  </a>
-);
-
-const Message = ({ requiredImageRendererPluginVersion }: { requiredImageRendererPluginVersion?: string }) => {
-  if (requiredImageRendererPluginVersion) {
-    return (
-      <>
-        You must update the <MessageLink text="Grafana image renderer plugin" /> to version{' '}
-        {requiredImageRendererPluginVersion} to enable dashboard previews. Please contact your Grafana administrator to
-        update the plugin.
-      </>
-    );
-  }
-
-  return (
-    <>
-      You must install the <MessageLink text="Grafana image renderer plugin" /> to enable dashboard previews. Please
-      contact your Grafana administrator to install the plugin.
-    </>
-  );
-};
-
-export const PreviewsSystemRequirements = ({ showPreviews, onRemove, topSpacing, bottomSpacing }: Props) => {
-  const styles = useStyles2(getStyles);
-
-  const previewsEnabled = config.featureToggles.dashboardPreviews;
-  const rendererAvailable = config.rendererAvailable;
-
-  const {
-    systemRequirements: { met: systemRequirementsMet, requiredImageRendererPluginVersion },
-    thumbnailsExist,
-  } = config.dashboardPreviews;
-
-  const arePreviewsEnabled = previewsEnabled && showPreviews;
-  const areRequirementsMet = (rendererAvailable && systemRequirementsMet) || thumbnailsExist;
-  const shouldDisplayRequirements = arePreviewsEnabled && !areRequirementsMet;
-
-  const title = requiredImageRendererPluginVersion
-    ? 'Image renderer plugin needs to be updated'
-    : 'Image renderer plugin not installed';
-
-  return (
-    <>
-      {shouldDisplayRequirements && (
-        <div className={styles.wrapper}>
-          <Alert
-            className={styles.alert}
-            topSpacing={topSpacing}
-            bottomSpacing={bottomSpacing}
-            severity="info"
-            title={title}
-            onRemove={onRemove}
-          >
-            <Message requiredImageRendererPluginVersion={requiredImageRendererPluginVersion} />
-          </Alert>
-        </div>
-      )}
-    </>
-  );
-};
-
-const getStyles = () => {
-  return {
-    wrapper: css`
-      display: flex;
-      justify-content: center;
-    `,
-    alert: css`
-      max-width: 800px;
-    `,
-  };
-};
diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx
index 74400e7847c..f9881c9351f 100644
--- a/public/app/features/search/page/components/ActionRow.tsx
+++ b/public/app/features/search/page/components/ActionRow.tsx
@@ -3,7 +3,7 @@ import React, { FormEvent } from 'react';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { HorizontalGroup, RadioButtonGroup, useStyles2, Checkbox, Button } from '@grafana/ui';
+import { Button, Checkbox, HorizontalGroup, RadioButtonGroup, useStyles2 } from '@grafana/ui';
 import { SortPicker } from 'app/core/components/Select/SortPicker';
 import { TagFilter, TermCount } from 'app/core/components/TagFilter/TagFilter';
 import { t, Trans } from 'app/core/internationalization';
@@ -11,20 +11,10 @@ import { t, Trans } from 'app/core/internationalization';
 import { SearchLayout, SearchState } from '../../types';
 
 function getLayoutOptions() {
-  const layoutOptions = [
+  return [
     { value: SearchLayout.Folders, icon: 'folder', ariaLabel: t('search.actions.view-as-folders', 'View by folders') },
     { value: SearchLayout.List, icon: 'list-ul', ariaLabel: t('search.actions.view-as-list', 'View as list') },
   ];
-
-  if (config.featureToggles.dashboardPreviews) {
-    layoutOptions.push({
-      value: SearchLayout.Grid,
-      icon: 'apps',
-      ariaLabel: t('search.actions.view-as-grid', 'Grid view'),
-    });
-  }
-
-  return layoutOptions;
 }
 
 interface Props {
@@ -54,9 +44,6 @@ export function getValidQueryLayout(q: SearchState): SearchLayout {
     }
   }
 
-  if (layout === SearchLayout.Grid && !config.featureToggles.dashboardPreviews) {
-    return SearchLayout.List;
-  }
   return layout;
 }
 
diff --git a/public/app/features/search/page/components/SearchResultsGrid.test.tsx b/public/app/features/search/page/components/SearchResultsGrid.test.tsx
deleted file mode 100644
index 05eb1187051..00000000000
--- a/public/app/features/search/page/components/SearchResultsGrid.test.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import React, { KeyboardEvent } from 'react';
-import { Observable } from 'rxjs';
-
-import { ArrayVector, DataFrame, DataFrameView, FieldType } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-
-import { DashboardQueryResult, QueryResponse } from '../../service';
-import { DashboardSearchItemType } from '../../types';
-
-import { SearchResultsGrid } from './SearchResultsGrid';
-
-describe('SearchResultsGrid', () => {
-  const dashboardsData: DataFrame = {
-    fields: [
-      {
-        name: 'kind',
-        type: FieldType.string,
-        config: {},
-        values: new ArrayVector([DashboardSearchItemType.DashDB]),
-      },
-      { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector(['My dashboard 1', 'dash2']) },
-      { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector(['my-dashboard-1', 'dash-2']) },
-      { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector(['/my-dashbaord-1', '/dash-2']) },
-    ],
-    length: 2,
-  };
-  const mockSearchResult: QueryResponse = {
-    isItemLoaded: jest.fn(),
-    loadMoreItems: jest.fn(),
-    totalRows: dashboardsData.length,
-    view: new DataFrameView<DashboardQueryResult>(dashboardsData),
-  };
-
-  const baseProps = {
-    response: mockSearchResult,
-    width: 800,
-    height: 600,
-    clearSelection: jest.fn(),
-    onTagSelected: jest.fn(),
-    keyboardEvents: new Observable<KeyboardEvent<Element>>(),
-  };
-
-  it('should render grid of dashboards', () => {
-    render(<SearchResultsGrid {...baseProps} />);
-    expect(screen.getByTestId(selectors.components.Search.dashboardCard('My dashboard 1'))).toBeInTheDocument();
-    expect(screen.getByTestId(selectors.components.Search.dashboardCard('dash2'))).toBeInTheDocument();
-  });
-
-  it('should not render checkboxes for non-editable results', async () => {
-    render(<SearchResultsGrid {...baseProps} />);
-    expect(screen.queryByRole('checkbox')).toBeNull();
-    await waitFor(() => expect(screen.queryAllByRole('checkbox')).toHaveLength(0));
-  });
-
-  it('should render checkboxes for editable results ', async () => {
-    const mockSelectionToggle = jest.fn();
-    const mockSelection = jest.fn();
-    render(<SearchResultsGrid {...baseProps} selection={mockSelection} selectionToggle={mockSelectionToggle} />);
-
-    await waitFor(() => expect(screen.queryAllByRole('checkbox')).toHaveLength(2));
-    fireEvent.click(await screen.findByRole('checkbox', { name: /Select dashboard dash2/i }));
-    expect(mockSelectionToggle).toHaveBeenCalledWith('dashboard', 'dash-2');
-    expect(mockSelectionToggle).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/public/app/features/search/page/components/SearchResultsGrid.tsx b/public/app/features/search/page/components/SearchResultsGrid.tsx
deleted file mode 100644
index 037fe739886..00000000000
--- a/public/app/features/search/page/components/SearchResultsGrid.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-import { FixedSizeGrid } from 'react-window';
-import InfiniteLoader from 'react-window-infinite-loader';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { useStyles2 } from '@grafana/ui';
-
-import { SearchCard } from '../../components/SearchCard';
-import { useSearchKeyboardNavigation } from '../../hooks/useSearchKeyboardSelection';
-import { queryResultToViewItem } from '../../service/utils';
-import { DashboardViewItem } from '../../types';
-
-import { SearchResultsProps } from './SearchResultsTable';
-
-export const SearchResultsGrid = ({
-  response,
-  width,
-  height,
-  selection,
-  selectionToggle,
-  onTagSelected,
-  onClickItem,
-  keyboardEvents,
-}: SearchResultsProps) => {
-  const styles = useStyles2(getStyles);
-
-  // Hacked to reuse existing SearchCard (and old DashboardSectionItem)
-  const itemProps = {
-    editable: selection != null,
-    onToggleChecked: (item: DashboardViewItem) => {
-      if (selectionToggle) {
-        selectionToggle(item.kind, item.uid);
-      }
-    },
-    onTagSelected,
-    onClick: onClickItem,
-  };
-
-  const itemCount = response.totalRows ?? response.view.length;
-  const view = response.view;
-  const numColumns = Math.ceil(width / 320);
-  const cellWidth = width / numColumns;
-  const cellHeight = (cellWidth - 64) * 0.75 + 56 + 8;
-  const numRows = Math.ceil(itemCount / numColumns);
-  const highlightIndex = useSearchKeyboardNavigation(keyboardEvents, numColumns, response);
-
-  return (
-    <InfiniteLoader isItemLoaded={response.isItemLoaded} itemCount={itemCount} loadMoreItems={response.loadMoreItems}>
-      {({ onItemsRendered, ref }) => (
-        <FixedSizeGrid
-          ref={ref}
-          onItemsRendered={(v) => {
-            onItemsRendered({
-              visibleStartIndex: v.visibleRowStartIndex * numColumns,
-              visibleStopIndex: v.visibleRowStopIndex * numColumns,
-              overscanStartIndex: v.overscanRowStartIndex * numColumns,
-              overscanStopIndex: v.overscanColumnStopIndex * numColumns,
-            });
-          }}
-          columnCount={numColumns}
-          columnWidth={cellWidth}
-          rowCount={numRows}
-          rowHeight={cellHeight}
-          className={styles.wrapper}
-          innerElementType="ul"
-          height={height}
-          width={width - 2}
-        >
-          {({ columnIndex, rowIndex, style }) => {
-            const index = rowIndex * numColumns + columnIndex;
-            if (index >= view.length) {
-              return null;
-            }
-            const item = view.get(index);
-            const kind = item.kind ?? 'dashboard';
-
-            const facade = queryResultToViewItem(item, view);
-
-            if (kind === 'panel') {
-              const type = item.panel_type;
-              facade.icon = 'public/img/icons/unicons/graph-bar.svg';
-              if (type) {
-                const info = config.panels[type];
-                if (info?.name) {
-                  const v = info.info?.logos.small;
-                  if (v && v.endsWith('.svg')) {
-                    facade.icon = v;
-                  }
-                }
-              }
-            }
-
-            let className = styles.virtualizedGridItemWrapper;
-            if (rowIndex === highlightIndex.y && columnIndex === highlightIndex.x) {
-              className += ' ' + styles.selectedItem;
-            }
-
-            // The wrapper div is needed as the inner SearchItem has margin-bottom spacing
-            // And without this wrapper there is no room for that margin
-            return item ? (
-              <li style={style} className={className}>
-                <SearchCard
-                  key={item.uid}
-                  {...itemProps}
-                  item={facade}
-                  isSelected={selection ? selection(facade.kind, facade.uid) : false}
-                />
-              </li>
-            ) : null;
-          }}
-        </FixedSizeGrid>
-      )}
-    </InfiniteLoader>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  virtualizedGridItemWrapper: css`
-    padding: 4px;
-  `,
-  wrapper: css`
-    display: flex;
-    flex-direction: column;
-
-    > ul {
-      list-style: none;
-    }
-  `,
-  selectedItem: css`
-    box-shadow: inset 1px 1px 3px 3px ${theme.colors.primary.border};
-  `,
-});
diff --git a/public/app/features/search/page/components/SearchView.tsx b/public/app/features/search/page/components/SearchView.tsx
index ce46c4910fd..b1f65393187 100644
--- a/public/app/features/search/page/components/SearchView.tsx
+++ b/public/app/features/search/page/components/SearchView.tsx
@@ -10,7 +10,6 @@ import { useStyles2, Spinner, Button } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import { FolderDTO } from 'app/types';
 
-import { PreviewsSystemRequirements } from '../../components/PreviewsSystemRequirements';
 import { getGrafanaSearcher } from '../../service';
 import { getSearchStateManager } from '../../state/SearchStateManager';
 import { SearchLayout, DashboardViewItem } from '../../types';
@@ -21,7 +20,6 @@ import { FolderSection } from './FolderSection';
 import { ManageActions } from './ManageActions';
 import { RootFolderView } from './RootFolderView';
 import { SearchResultsCards } from './SearchResultsCards';
-import { SearchResultsGrid } from './SearchResultsGrid';
 import { SearchResultsTable, SearchResultsProps } from './SearchResultsTable';
 
 export type SearchViewProps = {
@@ -133,10 +131,6 @@ export const SearchView = ({ showManage, folderDTO, hidePseudoFolders, keyboardE
               onClickItem: stateManager.onSearchItemClicked,
             };
 
-            if (layout === SearchLayout.Grid) {
-              return <SearchResultsGrid {...props} />;
-            }
-
             if (width < 800) {
               return <SearchResultsCards {...props} />;
             }
@@ -193,13 +187,6 @@ export const SearchView = ({ showManage, folderDTO, hidePseudoFolders, keyboardE
         />
       )}
 
-      {layout === SearchLayout.Grid && (
-        <PreviewsSystemRequirements
-          bottomSpacing={3}
-          showPreviews={true}
-          onRemove={() => stateManager.onLayoutChange(SearchLayout.List)}
-        />
-      )}
       {renderResults()}
     </>
   );
diff --git a/public/app/features/search/page/reporting.ts b/public/app/features/search/page/reporting.ts
index 9c708ac069f..5b89b070c2e 100644
--- a/public/app/features/search/page/reporting.ts
+++ b/public/app/features/search/page/reporting.ts
@@ -1,4 +1,4 @@
-import { config, reportInteraction } from '@grafana/runtime';
+import { reportInteraction } from '@grafana/runtime';
 import { InspectTab } from 'app/features/inspector/types';
 
 import { EventTrackingNamespace, SearchLayout } from '../types';
@@ -40,12 +40,7 @@ export const reportPanelInspectInteraction = (
 };
 
 const getQuerySearchContext = (query: QueryProps) => {
-  const showPreviews = query.layout === SearchLayout.Grid;
-  const previewsEnabled = Boolean(config.featureToggles.panelTitleSearch);
-  const previews = previewsEnabled ? (showPreviews ? 'on' : 'off') : 'feature_disabled';
-
   return {
-    previews,
     layout: query.layout,
     starredFilter: query.starred ?? false,
     sort: query.sortValue ?? '',
diff --git a/public/app/features/search/types.ts b/public/app/features/search/types.ts
index 269727fa88f..d0f148da767 100644
--- a/public/app/features/search/types.ts
+++ b/public/app/features/search/types.ts
@@ -102,7 +102,6 @@ export type OnToggleChecked = (item: DashboardViewItem) => void;
 export enum SearchLayout {
   List = 'list',
   Folders = 'folders',
-  Grid = 'grid', // preview
 }
 
 export interface SearchQueryParams {
diff --git a/public/app/plugins/panel/dashlist/DashList.tsx b/public/app/plugins/panel/dashlist/DashList.tsx
index 102b0cc1f6b..c776990ea44 100644
--- a/public/app/plugins/panel/dashlist/DashList.tsx
+++ b/public/app/plugins/panel/dashlist/DashList.tsx
@@ -20,12 +20,11 @@ import { getBackendSrv } from 'app/core/services/backend_srv';
 import impressionSrv from 'app/core/services/impression_srv';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { SearchCard } from 'app/features/search/components/SearchCard';
 import { DashboardSearchItem } from 'app/features/search/types';
 import { getVariablesUrlParams } from 'app/features/variables/getAllVariableValuesForUrl';
 import { useDispatch } from 'app/types';
 
-import { PanelLayout, PanelOptions } from './panelcfg.gen';
+import { PanelOptions } from './panelcfg.gen';
 import { getStyles } from './styles';
 
 type Dashboard = DashboardSearchItem & { id?: number; isSearchResult?: boolean; isRecent?: boolean };
@@ -130,7 +129,7 @@ export function DashList(props: PanelProps<PanelOptions>) {
     ];
   }, [dashboards]);
 
-  const { showStarred, showRecentlyViewed, showHeadings, showSearch, layout } = props.options;
+  const { showStarred, showRecentlyViewed, showHeadings, showSearch } = props.options;
 
   const dashboardGroups: DashboardGroup[] = [
     {
@@ -198,16 +197,6 @@ export function DashList(props: PanelProps<PanelOptions>) {
     </ul>
   );
 
-  const renderPreviews = (dashboards: Dashboard[]) => (
-    <ul className={css.gridContainer}>
-      {dashboards.map((dash) => (
-        <li key={dash.uid}>
-          <SearchCard item={{ ...dash, kind: 'dashboard' }} />
-        </li>
-      ))}
-    </ul>
-  );
-
   return (
     <CustomScrollbar autoHeightMin="100%" autoHeightMax="100%">
       {dashboardGroups.map(
@@ -215,7 +204,7 @@ export function DashList(props: PanelProps<PanelOptions>) {
           show && (
             <div className={css.dashlistSection} key={`dash-group-${i}`}>
               {showHeadings && <h6 className={css.dashlistSectionHeader}>{header}</h6>}
-              {layout === PanelLayout.Previews ? renderPreviews(dashboards) : renderList(dashboards)}
+              {renderList(dashboards)}
             </div>
           )
       )}
diff --git a/public/app/plugins/panel/dashlist/module.tsx b/public/app/plugins/panel/dashlist/module.tsx
index d22c00e5094..19e5a85c64a 100644
--- a/public/app/plugins/panel/dashlist/module.tsx
+++ b/public/app/plugins/panel/dashlist/module.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { PanelModel, PanelPlugin } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { TagsInput } from '@grafana/ui';
 
 import {
@@ -11,24 +10,10 @@ import {
 } from '../../../core/components/Select/ReadonlyFolderPicker/ReadonlyFolderPicker';
 
 import { DashList } from './DashList';
-import { defaultPanelOptions, PanelLayout, PanelOptions } from './panelcfg.gen';
+import { defaultPanelOptions, PanelOptions } from './panelcfg.gen';
 
 export const plugin = new PanelPlugin<PanelOptions>(DashList)
   .setPanelOptions((builder) => {
-    if (config.featureToggles.dashboardPreviews) {
-      builder.addRadio({
-        path: 'layout',
-        name: 'Layout',
-        defaultValue: PanelLayout.List,
-        settings: {
-          options: [
-            { value: PanelLayout.List, label: 'List' },
-            { value: PanelLayout.Previews, label: 'Preview' },
-          ],
-        },
-      });
-    }
-
     builder
       .addBooleanSwitch({
         path: 'keepTime',
diff --git a/public/app/plugins/panel/dashlist/panelcfg.cue b/public/app/plugins/panel/dashlist/panelcfg.cue
index 600563bbf27..bd656a5e174 100644
--- a/public/app/plugins/panel/dashlist/panelcfg.cue
+++ b/public/app/plugins/panel/dashlist/panelcfg.cue
@@ -22,9 +22,7 @@ composableKinds: PanelCfg: {
 			{
 				schemas: [
 					{
-						PanelLayout: "list" | "previews" @cuetsy(kind="enum")
 						PanelOptions: {
-							layout?:            PanelLayout | *"list"
 							keepTime:           bool | *false
 							includeVars:        bool | *false
 							showStarred:        bool | *true
diff --git a/public/app/plugins/panel/dashlist/panelcfg.gen.ts b/public/app/plugins/panel/dashlist/panelcfg.gen.ts
index 19f89096fd7..a884e896d2b 100644
--- a/public/app/plugins/panel/dashlist/panelcfg.gen.ts
+++ b/public/app/plugins/panel/dashlist/panelcfg.gen.ts
@@ -10,16 +10,10 @@
 
 export const PanelCfgModelVersion = Object.freeze([0, 0]);
 
-export enum PanelLayout {
-  List = 'list',
-  Previews = 'previews',
-}
-
 export interface PanelOptions {
   folderId?: number;
   includeVars: boolean;
   keepTime: boolean;
-  layout?: PanelLayout;
   maxItems: number;
   query: string;
   showHeadings: boolean;
@@ -32,7 +26,6 @@ export interface PanelOptions {
 export const defaultPanelOptions: Partial<PanelOptions> = {
   includeVars: false,
   keepTime: false,
-  layout: PanelLayout.List,
   maxItems: 10,
   query: '',
   showHeadings: true,

From ce00465d9be2987d557a19cf704a31f4a1405826 Mon Sep 17 00:00:00 2001
From: lwandz13 <126723338+lwandz13@users.noreply.github.com>
Date: Fri, 7 Apr 2023 11:01:41 -0500
Subject: [PATCH 010/729] fixed broken links (#66153)

---
 docs/sources/datasources/loki/query-editor/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/datasources/loki/query-editor/index.md b/docs/sources/datasources/loki/query-editor/index.md
index b3cea436004..24e8299a9ec 100644
--- a/docs/sources/datasources/loki/query-editor/index.md
+++ b/docs/sources/datasources/loki/query-editor/index.md
@@ -14,7 +14,7 @@ weight: 300
 
 # Loki query editor
 
-The Loki data source's query editor helps you create [log]({{< relref "#create-a-logs-query" >}}) and [metric]({{< relref "#create-a-metrics-query" >}}) queries that use Loki's query language, [LogQL](/docs/loki/latest/logql/).
+The Loki data source's query editor helps you create [log]({{< relref "#create-a-log-query" >}}) and [metric]({{< relref "#create-a-metric-query" >}}) queries that use Loki's query language, [LogQL](/docs/loki/latest/logql/).
 
 This topic explains querying specific to the Loki data source.
 For general documentation on querying data sources in Grafana, see [Query and transform data]({{< relref "../../../panels-visualizations/query-transform-data" >}}).

From 6ab7ed0f66191f3902d05b0e0e497b6f507e1ed7 Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Fri, 7 Apr 2023 16:06:02 -0500
Subject: [PATCH 011/729] Prometheus: Fix flaky unit test (#66188)

Fix flaky unit test
---
 public/app/plugins/datasource/prometheus/language_utils.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/prometheus/language_utils.test.ts b/public/app/plugins/datasource/prometheus/language_utils.test.ts
index cdf497ae8ed..efb9b8e21c6 100644
--- a/public/app/plugins/datasource/prometheus/language_utils.test.ts
+++ b/public/app/plugins/datasource/prometheus/language_utils.test.ts
@@ -249,7 +249,7 @@ describe('getRangeSnapInterval', () => {
   it('will snap range to closest minute', () => {
     const queryDurationMinutes = 10;
     const intervalSeconds = queryDurationMinutes * 60; // 10 minutes
-    const now = new Date().valueOf();
+    const now = 1680901009826;
     const nowPlusOneMinute = now + 1000 * 60;
     const nowPlusTwoMinute = now + 1000 * 60 * 2;
 

From af31c77331c89c6a1f8e00747c44c3f39bb737bb Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 7 Apr 2023 14:13:19 -0700
Subject: [PATCH 012/729] Dataplane: Support prometheus dataplane contract for
 transformations and name matchers (#65237)

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
---
 .../feature-toggles/index.md                  |  1 +
 packages/grafana-data/src/field/fieldState.ts |  2 +-
 .../matchers/nameMatcher.test.ts              | 80 +++++++++++++++++++
 .../transformations/matchers/nameMatcher.ts   | 50 +++++++++++-
 .../transformers/groupingToMatrix.ts          | 26 +++++-
 .../src/types/featureToggles.gen.ts           |  1 +
 pkg/services/featuremgmt/registry.go          |  7 ++
 pkg/services/featuremgmt/toggles_gen.csv      |  1 +
 pkg/services/featuremgmt/toggles_gen.go       |  4 +
 .../TransformationFilter.tsx                  |  2 +-
 .../prometheus/result_transformer.test.ts     | 73 +++++++++++++++++
 .../prometheus/result_transformer.ts          | 20 ++++-
 12 files changed, 259 insertions(+), 8 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 7b9aff01b69..310230be7ed 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -107,6 +107,7 @@ Alpha features might be changed or removed without prior notice.
 | `alertStateHistoryLokiOnly`        | Disable Grafana alerts from emitting annotations when a remote Loki instance is available.                                                                                                          |
 | `unifiedRequestLog`                | Writes error logs to the request logger                                                                                                                                                             |
 | `pyroscopeFlameGraph`              | Changes flame graph to pyroscope one                                                                                                                                                                |
+| `dataplaneFrontendFallback`        | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                |
 
 ## Development feature toggles
 
diff --git a/packages/grafana-data/src/field/fieldState.ts b/packages/grafana-data/src/field/fieldState.ts
index 14e75bd8095..01f3a8760c1 100644
--- a/packages/grafana-data/src/field/fieldState.ts
+++ b/packages/grafana-data/src/field/fieldState.ts
@@ -55,7 +55,7 @@ export function getFieldDisplayName(field: Field, frame?: DataFrame, allFrames?:
 /**
  * Get an appropriate display name. If the 'displayName' field config is set, use that.
  */
-function calculateFieldDisplayName(field: Field, frame?: DataFrame, allFrames?: DataFrame[]): string {
+export function calculateFieldDisplayName(field: Field, frame?: DataFrame, allFrames?: DataFrame[]): string {
   const hasConfigTitle = field.config?.displayName && field.config?.displayName.length;
 
   let displayName = hasConfigTitle ? field.config!.displayName! : field.name;
diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
index df611f50bcb..d6a29777257 100644
--- a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
+++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
@@ -1,9 +1,21 @@
 import { toDataFrame } from '../../dataframe/processDataFrame';
+import { FieldType, DataFrame } from '../../types';
+import { ArrayVector } from '../../vector';
 import { getFieldMatcher } from '../matchers';
 
 import { FieldMatcherID } from './ids';
 import { ByNamesMatcherMode } from './nameMatcher';
 
+// mock the default window.grafanaBootData settings
+// eslint-disable-next-line
+(window as any).grafanaBootData = {
+  settings: {
+    featureToggles: {
+      dataplaneFrontendFallback: true,
+    },
+  },
+};
+
 describe('Field Name by Regexp Matcher', () => {
   it('Match all with wildcard regex', () => {
     const seriesWithNames = toDataFrame({
@@ -385,6 +397,74 @@ describe('Field Regexp or Names Matcher', () => {
       expect(matcher(field, seriesWithNames, [seriesWithNames])).toBe(true);
     }
   });
+
+  it('Support fallback name matchers', () => {
+    const frame: DataFrame = {
+      fields: [
+        { name: 'time', type: FieldType.time, config: {}, values: new ArrayVector([1, 2]) },
+        {
+          name: 'UP',
+          type: FieldType.number,
+          config: {},
+          values: new ArrayVector([1, 2]),
+          labels: { __name__: 'UP' },
+        },
+      ],
+      name: 'X',
+      length: 2,
+    };
+
+    let matcher = getFieldMatcher({
+      id: FieldMatcherID.byName,
+      options: 'Value',
+    });
+    expect(matcher(frame.fields[0], frame, [])).toBeFalsy();
+    expect(matcher(frame.fields[1], frame, [])).toBeTruthy();
+
+    matcher = getFieldMatcher({
+      id: FieldMatcherID.byName,
+      options: 'Time',
+    });
+    expect(matcher(frame.fields[0], frame, [])).toBeTruthy();
+    expect(matcher(frame.fields[1], frame, [])).toBeFalsy();
+  });
+});
+
+it('Support fallback multiple names matchers', () => {
+  const frame: DataFrame = {
+    fields: [
+      { name: 'time', type: FieldType.time, config: {}, values: new ArrayVector([1, 2]) },
+      {
+        name: 'UP',
+        type: FieldType.number,
+        config: {},
+        values: new ArrayVector([1, 2]),
+        labels: { __name__: 'UP' },
+      },
+    ],
+    name: 'X',
+    length: 2,
+  };
+
+  let matcher = getFieldMatcher({
+    id: FieldMatcherID.byNames,
+    options: {
+      mode: ByNamesMatcherMode.include,
+      names: ['Value'],
+    },
+  });
+  expect(matcher(frame.fields[0], frame, [])).toBeFalsy();
+  expect(matcher(frame.fields[1], frame, [])).toBeTruthy();
+
+  matcher = getFieldMatcher({
+    id: FieldMatcherID.byNames,
+    options: {
+      mode: ByNamesMatcherMode.include,
+      names: ['Time'],
+    },
+  });
+  expect(matcher(frame.fields[0], frame, [])).toBeTruthy();
+  expect(matcher(frame.fields[1], frame, [])).toBeFalsy();
 });
 
 describe('Fields returned by query with refId', () => {
diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
index 45f3e75606b..0d31b613c62 100644
--- a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
+++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
@@ -1,10 +1,9 @@
 import { getFieldDisplayName } from '../../field/fieldState';
 import { stringToJsRegex } from '../../text/string';
-import { Field, DataFrame } from '../../types/dataFrame';
+import { Field, DataFrame, FieldType, TIME_SERIES_VALUE_FIELD_NAME } from '../../types/dataFrame';
 import { FieldMatcherInfo, FrameMatcherInfo, FieldMatcher } from '../../types/transformations';
 
 import { FieldMatcherID, FrameMatcherID } from './ids';
-
 export interface RegexpOrNamesMatcherOptions {
   pattern?: string;
   names?: string[];
@@ -40,8 +39,16 @@ const fieldNameMatcher: FieldMatcherInfo<string> = {
   defaultOptions: '',
 
   get: (name: string): FieldMatcher => {
+    const uniqueNames = new Set<string>([name] ?? []);
+
+    const fallback = fieldNameFallback(uniqueNames);
+
     return (field: Field, frame: DataFrame, allFrames: DataFrame[]) => {
-      return name === field.name || getFieldDisplayName(field, frame, allFrames) === name;
+      return (
+        name === field.name ||
+        name === getFieldDisplayName(field, frame, allFrames) ||
+        Boolean(fallback && fallback(field, frame, allFrames))
+      );
     };
   },
 
@@ -63,8 +70,14 @@ const multipleFieldNamesMatcher: FieldMatcherInfo<ByNamesMatcherOptions> = {
     const { names, mode = ByNamesMatcherMode.include } = options;
     const uniqueNames = new Set<string>(names ?? []);
 
+    const fallback = fieldNameFallback(uniqueNames);
+
     const matcher = (field: Field, frame: DataFrame, frames: DataFrame[]) => {
-      return uniqueNames.has(field.name) || uniqueNames.has(getFieldDisplayName(field, frame, frames));
+      return (
+        uniqueNames.has(field.name) ||
+        uniqueNames.has(getFieldDisplayName(field, frame, frames)) ||
+        Boolean(fallback && fallback(field, frame, frames))
+      );
     };
 
     if (mode === ByNamesMatcherMode.exclude) {
@@ -85,6 +98,35 @@ const multipleFieldNamesMatcher: FieldMatcherInfo<ByNamesMatcherOptions> = {
   },
 };
 
+// In an effor to support migrating to a consistent data contract, the
+// naming conventions need to get normalized.  However many existing setups
+// exist that would no longer match names if that changes.  This injects
+// fallback logic when when the data frame has not type version specified
+export function fieldNameFallback(fields: Set<string>) {
+  let fallback: FieldMatcher | undefined = undefined;
+
+  // grafana-data does not have access to runtime so we are accessing the window object
+  // to get access to the feature toggle
+  // eslint-disable-next-line
+  const useMatcherFallback = (window as any)?.grafanaBootData?.settings?.featureToggles?.dataplaneFrontendFallback;
+  if (useMatcherFallback) {
+    if (fields.has(TIME_SERIES_VALUE_FIELD_NAME)) {
+      fallback = (field: Field, frame: DataFrame) => {
+        return (
+          Boolean(field.labels) && // Value was reasonable when the name was set in labels or on the frame
+          field.labels?.__name__ === field.name
+        );
+      };
+    } else if (fields.has('Time') || fields.has('time')) {
+      fallback = (field: Field, frame: DataFrame) => {
+        return frame.meta?.typeVersion == null && field.type === FieldType.time;
+      };
+    }
+  }
+
+  return fallback;
+}
+
 const regexpFieldNameMatcher: FieldMatcherInfo<string> = {
   id: FieldMatcherID.byRegexp,
   name: 'Field Name by Regexp',
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
index 85fa47edf15..3aa21d8b1b7 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
@@ -3,6 +3,8 @@ import { map } from 'rxjs/operators';
 import { MutableDataFrame } from '../../dataframe';
 import { getFieldDisplayName } from '../../field/fieldState';
 import { DataFrame, DataTransformerInfo, Field, FieldType, SpecialValue, Vector } from '../../types';
+import { fieldMatchers } from '../matchers';
+import { FieldMatcherID } from '../matchers/ids';
 
 import { DataTransformerID } from './ids';
 
@@ -18,6 +20,11 @@ const DEFAULT_ROW_FIELD = 'Time';
 const DEFAULT_VALUE_FIELD = 'Value';
 const DEFAULT_EMPTY_VALUE = SpecialValue.Empty;
 
+// grafana-data does not have access to runtime so we are accessing the window object
+// to get access to the feature toggle
+// eslint-disable-next-line
+const supportDataplaneFallback = (window as any)?.grafanaBootData?.settings?.featureToggles?.dataplaneFrontendFallback;
+
 export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTransformerOptions> = {
   id: DataTransformerID.groupingToMatrix,
   name: 'Grouping to Matrix',
@@ -83,6 +90,14 @@ export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTr
             values.push(value);
           }
 
+          // setting the displayNameFromDS in prometheus overrides
+          // the column name based on value fields that are numbers
+          // this prevents columns that should be named 1000190
+          // from becoming named {__name__: 'metricName'}
+          if (supportDataplaneFallback && typeof columnName === 'number') {
+            valueField.config = { ...valueField.config, displayNameFromDS: undefined };
+          }
+
           resultFrame.addField({
             name: columnName.toString(),
             values: values,
@@ -110,7 +125,16 @@ function findKeyField(frame: DataFrame, matchTitle: string): Field | null {
   for (let fieldIndex = 0; fieldIndex < frame.fields.length; fieldIndex++) {
     const field = frame.fields[fieldIndex];
 
-    if (matchTitle === getFieldDisplayName(field)) {
+    // support for dataplane contract with Prometheus and change in location of field name
+    let matches: boolean;
+    if (supportDataplaneFallback) {
+      const matcher = fieldMatchers.get(FieldMatcherID.byName).get(matchTitle);
+      matches = matcher(field, frame, [frame]);
+    } else {
+      matches = matchTitle === getFieldDisplayName(field);
+    }
+
+    if (matches) {
       return field;
     }
   }
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index d2414f1c493..862a2542cb7 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -94,4 +94,5 @@ export interface FeatureToggles {
   unifiedRequestLog?: boolean;
   renderAuthJWT?: boolean;
   pyroscopeFlameGraph?: boolean;
+  dataplaneFrontendFallback?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index dd8d6e5241f..b4855827ac9 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -505,5 +505,12 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaObservabilityTracesAndProfilingSquad,
 		},
+		{
+			Name:         "dataplaneFrontendFallback",
+			Description:  "Support dataplane contract field name change for transformations and field name matchers where the name is different",
+			State:        FeatureStateAlpha,
+			FrontendOnly: true,
+			Owner:        grafanaObservabilityMetricsSquad,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 43e42e059e5..550a4eb02d9 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -75,3 +75,4 @@ alertStateHistoryLokiOnly,alpha,@grafana/alerting-squad,false,false,false,false
 unifiedRequestLog,alpha,@grafana/backend-platform,false,false,false,false
 renderAuthJWT,beta,@grafana/grafana-as-code,false,false,false,false
 pyroscopeFlameGraph,alpha,@grafana/observability-traces-and-profiling,false,false,false,false
+dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 90fad46a56f..dc74c116dce 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -310,4 +310,8 @@ const (
 	// FlagPyroscopeFlameGraph
 	// Changes flame graph to pyroscope one
 	FlagPyroscopeFlameGraph = "pyroscopeFlameGraph"
+
+	// FlagDataplaneFrontendFallback
+	// Support dataplane contract field name change for transformations and field name matchers where the name is different
+	FlagDataplaneFrontendFallback = "dataplaneFrontendFallback"
 )
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
index 7de44c7d3a6..1597da71db9 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
@@ -27,7 +27,7 @@ export const TransformationFilter = ({ index, data, config, onChange }: Transfor
 
   return (
     <div className={styles.wrapper}>
-      <Field label="Apply tranformation to">
+      <Field label="Apply transformation to">
         <FrameSelectionEditor
           value={config.filter!}
           context={context}
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
index e7afaf09cfa..4a47088bdb3 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
@@ -22,6 +22,11 @@ jest.mock('@grafana/runtime', () => ({
       },
     };
   },
+  config: {
+    featureToggles: {
+      prometheusDataplane: true,
+    },
+  },
 }));
 
 const matrixResponse = {
@@ -106,6 +111,74 @@ describe('Prometheus Result Transformer', () => {
       });
     });
 
+    it('dataplane handling, adds displayNameFromDs from calculateFieldDisplayName() when __name__ is the field name when legendFormat is auto', () => {
+      const request = {
+        targets: [
+          {
+            format: 'time_series',
+            refId: 'A',
+            legendFormat: '__auto',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          {
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                values: [1],
+                typeInfo: { frame: 'time.Time' },
+              },
+              {
+                name: 'up',
+                labels: { __name__: 'up' },
+                config: {},
+                values: [1],
+              },
+            ],
+            length: 1,
+            refId: 'A',
+            meta: {
+              type: 'timeseries-multi',
+              typeVersion: [0, 1],
+            },
+          },
+        ],
+      } as unknown as DataQueryResponse;
+      const series = transformV2(response, request, {});
+      expect(series).toEqual({
+        data: [
+          {
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                values: [1],
+                typeInfo: { frame: 'time.Time' },
+              },
+              {
+                config: { displayNameFromDS: 'up' },
+                labels: { __name__: 'up' },
+                name: 'up',
+                values: [1],
+              },
+            ],
+            length: 1,
+            meta: {
+              type: 'timeseries-multi',
+              typeVersion: [0, 1],
+              preferredVisualisationType: 'graph',
+            },
+            refId: 'A',
+          },
+        ],
+        state: 'Done',
+      });
+    });
+
     it('results with table format should be transformed to table dataFrames', () => {
       const request = {
         targets: [
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index 30f3150391a..027d215bdf7 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -22,7 +22,8 @@ import {
   TIME_SERIES_TIME_FIELD_NAME,
   TIME_SERIES_VALUE_FIELD_NAME,
 } from '@grafana/data';
-import { FetchResponse, getDataSourceSrv, getTemplateSrv } from '@grafana/runtime';
+import { calculateFieldDisplayName } from '@grafana/data/src/field/fieldState';
+import { config, FetchResponse, getDataSourceSrv, getTemplateSrv } from '@grafana/runtime';
 
 import { renderLegendFormat } from './legend';
 import {
@@ -71,6 +72,23 @@ export function transformV2(
   request: DataQueryRequest<PromQuery>,
   options: { exemplarTraceIdDestinations?: ExemplarTraceIdDestination[] }
 ) {
+  // migration for dataplane field name issue
+  if (config.featureToggles.prometheusDataplane) {
+    // update displayNameFromDS in the field config
+    response.data.forEach((f: DataFrame) => {
+      const target = request.targets.find((t) => t.refId === f.refId);
+      // check that the legend is selected as auto
+      if (target && target.legendFormat === '__auto') {
+        f.fields.forEach((field) => {
+          if (field.labels?.__name__ && field.labels?.__name__ === field.name) {
+            const fieldCopy = { ...field, name: TIME_SERIES_VALUE_FIELD_NAME };
+            field.config.displayNameFromDS = calculateFieldDisplayName(fieldCopy, f, response.data);
+          }
+        });
+      }
+    });
+  }
+
   const [tableFrames, framesWithoutTable] = partition<DataFrame>(response.data, (df) => isTableResult(df, request));
   const processedTableFrames = transformDFToTable(tableFrames);
 

From 680816f2e1a0b98554a818ddc129618b471862c7 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pbaumard@gmail.com>
Date: Sun, 9 Apr 2023 20:20:01 +0200
Subject: [PATCH 013/729] Chore: Update emails README (#66173)

---
 emails/README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/emails/README.md b/emails/README.md
index 4e46c280637..fc48f16078e 100644
--- a/emails/README.md
+++ b/emails/README.md
@@ -1,12 +1,10 @@
 ## Prerequisites
 
 - npm install
-- gem install premailer
 
 ## Tasks
 
-- npm run build (default task will build new inlines email templates)
-- npm start (builds on source HTML, text, or CSS change)
+- make (default task will build new inlines email templates)
 
 ## Result
 

From 8dd87a79f7632035f867679a065d1dbc60116c98 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Mon, 10 Apr 2023 10:05:01 +0300
Subject: [PATCH 014/729] Grafana Cloud: Add `VariantLinuxAmd64` in build
 variants (#66167)

Add VariantLinuxAmd64 in build variants
---
 pkg/build/config/versions.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/build/config/versions.go b/pkg/build/config/versions.go
index c7f5959ec02..7078b4b4602 100644
--- a/pkg/build/config/versions.go
+++ b/pkg/build/config/versions.go
@@ -207,6 +207,8 @@ var Versions = VersionMap{
 	CloudMode: {
 		Variants: []Variant{
 			VariantLinuxAmd64Musl,
+			// We still need this variant to build the .deb file
+			VariantLinuxAmd64,
 		},
 		PluginSignature: PluginSignature{
 			Sign:      true,

From a2634495e53f9c6f762d0941e0d24fa819c48bb6 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Mon, 10 Apr 2023 10:05:18 +0300
Subject: [PATCH 015/729] Grafana Cloud: Put cloud artifacts to `*/release` dir
 (#66168)

Put cloud artifacts to */release dir
---
 pkg/build/cmd/uploadpackages.go      | 4 ++--
 pkg/build/cmd/uploadpackages_test.go | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/build/cmd/uploadpackages.go b/pkg/build/cmd/uploadpackages.go
index 009ad8dd521..da0dd6a607a 100644
--- a/pkg/build/cmd/uploadpackages.go
+++ b/pkg/build/cmd/uploadpackages.go
@@ -141,11 +141,11 @@ func bucketForEnterprise2(releaseModeConfig *config.BuildConfig, event string) (
 
 func getVersionFolder(cfg uploadConfig, event string) (string, error) {
 	switch cfg.versionMode {
-	case config.TagMode:
+	case config.TagMode, config.CloudMode:
 		return releaseFolder, nil
 	case config.MainMode, config.DownstreamMode:
 		return mainFolder, nil
-	case config.ReleaseBranchMode, config.CloudMode:
+	case config.ReleaseBranchMode:
 		return releaseBranchFolder, nil
 	default:
 		// Corner case for custom enterprise2 mode
diff --git a/pkg/build/cmd/uploadpackages_test.go b/pkg/build/cmd/uploadpackages_test.go
index af44a66d994..9d3bc7b52e1 100644
--- a/pkg/build/cmd/uploadpackages_test.go
+++ b/pkg/build/cmd/uploadpackages_test.go
@@ -27,6 +27,7 @@ func Test_getVersionFolder(t *testing.T) {
 		{"downstream mode", args{uploadConfig{versionMode: config.DownstreamMode}, "", mainFolder}, nil},
 		{"release branch mode", args{uploadConfig{versionMode: config.ReleaseBranchMode}, "", releaseBranchFolder}, nil},
 		{"enterprise pro mode", args{uploadConfig{versionMode: config.Enterprise2Mode}, config.Custom, releaseFolder}, nil},
+		{"cloud mode", args{uploadConfig{versionMode: config.CloudMode}, "", releaseFolder}, nil},
 		{"unrecognised version mode", args{uploadConfig{versionMode: "foo"}, config.Custom, ""}, errors.New("")},
 	}
 	for _, tt := range tests {

From 4ba7c48cf504d8a8d263a762a9f1adb601d8fbe7 Mon Sep 17 00:00:00 2001
From: Khushi Jain <57278642+khushijain21@users.noreply.github.com>
Date: Mon, 10 Apr 2023 21:46:07 +0530
Subject: [PATCH 016/729] Search: Add clear search button to the input bar
 (#66204)

---
 .../features/search/components/ManageDashboardsNew.tsx    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/features/search/components/ManageDashboardsNew.tsx b/public/app/features/search/components/ManageDashboardsNew.tsx
index 68b61b1d729..bca54ec5a8e 100644
--- a/public/app/features/search/components/ManageDashboardsNew.tsx
+++ b/public/app/features/search/components/ManageDashboardsNew.tsx
@@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css';
 import React, { useEffect } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Input, useStyles2, Spinner } from '@grafana/ui';
+import { useStyles2, FilterInput } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import { FolderDTO, AccessControlAction } from 'app/types';
@@ -43,9 +43,9 @@ export const ManageDashboardsNew = React.memo(({ folder }: Props) => {
     <>
       <div className={cx(styles.actionBar, 'page-action-bar')}>
         <div className={cx(styles.inputWrapper, 'gf-form gf-form--grow m-r-2')}>
-          <Input
+          <FilterInput
             value={state.query ?? ''}
-            onChange={(e) => stateManager.onQueryChange(e.currentTarget.value)}
+            onChange={(e) => stateManager.onQueryChange(e)}
             onKeyDown={onKeyDown}
             // eslint-disable-next-line jsx-a11y/no-autofocus
             autoFocus
@@ -55,8 +55,8 @@ export const ManageDashboardsNew = React.memo(({ folder }: Props) => {
                 ? t('search.search-input.include-panels-placeholder', 'Search for dashboards and panels')
                 : t('search.search-input.placeholder', 'Search for dashboards')
             }
+            escapeRegex={false}
             className={styles.searchInput}
-            suffix={false ? <Spinner /> : null}
           />
         </div>
         {viewActions && (

From 759a05083a4bddb9fb6b786f495445916af36800 Mon Sep 17 00:00:00 2001
From: juanicabanas <juan.cabanas@grafana.com>
Date: Mon, 10 Apr 2023 21:02:20 -0300
Subject: [PATCH 017/729] Panels: GeomapPanel edit mode fix (#66222)

---
 public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
index 26bf727d8b9..8f19c7f2f03 100644
--- a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
@@ -21,6 +21,6 @@ export const FrameSelectionEditor = ({ value, context, onChange }: Props) => {
   );
 
   return (
-    <RefIDPicker value={value.options} onChange={onFilterChange} data={context.data} placeholder="Change filter" />
+    <RefIDPicker value={value?.options} onChange={onFilterChange} data={context.data} placeholder="Change filter" />
   );
 };

From b302cc229712a9864604b24e3e2f05cca1d4a6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Tue, 11 Apr 2023 08:53:00 +0200
Subject: [PATCH 018/729] Correlations: Show correct number of variables
 (#66191)

* Show correct number of variables

* Remove duplicated test
---
 public/app/features/explore/utils/links.test.ts | 17 +++++++++++++++++
 public/app/features/explore/utils/links.ts      |  4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/public/app/features/explore/utils/links.test.ts b/public/app/features/explore/utils/links.test.ts
index b161153a2ca..ef459db08b5 100644
--- a/public/app/features/explore/utils/links.test.ts
+++ b/public/app/features/explore/utils/links.test.ts
@@ -671,6 +671,23 @@ describe('explore links utils', () => {
       const dataLinkRtnVal = getVariableUsageInfo(dataLink, scopedVars).allVariablesDefined;
       expect(dataLinkRtnVal).toBe(true);
     });
+
+    it('returns deduplicated list of variables', () => {
+      const dataLink = {
+        url: '',
+        title: '',
+        internal: {
+          datasourceUid: 'uid',
+          datasourceName: 'dsName',
+          query: { query: 'test ${test} ${foo} ${test:raw} $test' },
+        },
+      };
+      const scopedVars = {
+        testVal: { text: '', value: 'val1' },
+      };
+      const variables = getVariableUsageInfo(dataLink, scopedVars).variables;
+      expect(variables).toHaveLength(2);
+    });
   });
 });
 
diff --git a/public/app/features/explore/utils/links.ts b/public/app/features/explore/utils/links.ts
index 21ed0166985..818ff1566ca 100644
--- a/public/app/features/explore/utils/links.ts
+++ b/public/app/features/explore/utils/links.ts
@@ -1,3 +1,4 @@
+import { uniqBy } from 'lodash';
 import { useCallback } from 'react';
 
 import {
@@ -260,9 +261,10 @@ export function getVariableUsageInfo<T extends DataLink>(
   query: T,
   scopedVars: ScopedVars
 ): { variables: VariableInterpolation[]; allVariablesDefined: boolean } {
-  const variables: VariableInterpolation[] = [];
+  let variables: VariableInterpolation[] = [];
   const replaceFn = getTemplateSrv().replace.bind(getTemplateSrv());
   replaceFn(getStringsFromObject(query), scopedVars, undefined, variables);
+  variables = uniqBy(variables, 'variableName');
   return {
     variables: variables,
     allVariablesDefined: variables.every((variable) => variable.found),

From b68be999f7e0da95616e5d9b1ce9d0b7339ba90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Tue, 11 Apr 2023 08:53:34 +0200
Subject: [PATCH 019/729] Correlations: Add usage stats about correlations
 (#66021)

* Add usage stats about correlations

* Add stats.correlations.count to collected stats

* Expose grafana_stat_totals_correlations metric

* Organize imports
---
 pkg/infra/metrics/metrics.go                  | 10 ++++++++
 .../usagestats/statscollector/service.go      |  3 +++
 .../usagestats/statscollector/service_test.go |  2 ++
 .../correlations/correlationstest/fake.go     | 23 +++++++++++++++++++
 pkg/services/stats/models.go                  |  1 +
 pkg/services/stats/statsimpl/stats.go         |  1 +
 pkg/services/stats/statsimpl/stats_test.go    | 22 ++++++++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 pkg/services/correlations/correlationstest/fake.go

diff --git a/pkg/infra/metrics/metrics.go b/pkg/infra/metrics/metrics.go
index 152733c1405..c90c2177c66 100644
--- a/pkg/infra/metrics/metrics.go
+++ b/pkg/infra/metrics/metrics.go
@@ -201,6 +201,9 @@ var (
 
 	// MStatTotalPublicDashboards is a metric total amount of public dashboards
 	MStatTotalPublicDashboards prometheus.Gauge
+
+	// MStatTotalCorrelations is a metric total amount of correlations
+	MStatTotalCorrelations prometheus.Gauge
 )
 
 func init() {
@@ -592,6 +595,12 @@ func init() {
 		Help:      "total amount of public dashboards",
 		Namespace: ExporterName,
 	})
+
+	MStatTotalCorrelations = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name:      "stat_totals_correlations",
+		Help:      "total amount of correlations",
+		Namespace: ExporterName,
+	})
 }
 
 // SetBuildInformation sets the build information for this binary
@@ -705,5 +714,6 @@ func initMetricVars() {
 		MStatTotalPublicDashboards,
 		MPublicDashboardRequestCount,
 		MPublicDashboardDatasourceQuerySuccess,
+		MStatTotalCorrelations,
 	)
 }
diff --git a/pkg/infra/usagestats/statscollector/service.go b/pkg/infra/usagestats/statscollector/service.go
index 0845468d067..2d0c79e5fc2 100644
--- a/pkg/infra/usagestats/statscollector/service.go
+++ b/pkg/infra/usagestats/statscollector/service.go
@@ -158,6 +158,7 @@ func (s *Service) collectSystemStats(ctx context.Context) (map[string]interface{
 	m["stats.data_keys.count"] = statsResult.DataKeys
 	m["stats.active_data_keys.count"] = statsResult.ActiveDataKeys
 	m["stats.public_dashboards.count"] = statsResult.PublicDashboards
+	m["stats.correlations.count"] = statsResult.Correlations
 
 	ossEditionCount := 1
 	enterpriseEditionCount := 0
@@ -314,6 +315,8 @@ func (s *Service) updateTotalStats(ctx context.Context) bool {
 
 	metrics.MStatTotalPublicDashboards.Set(float64(statsResult.PublicDashboards))
 
+	metrics.MStatTotalCorrelations.Set(float64(statsResult.Correlations))
+
 	dsResult, err := s.statsService.GetDataSourceStats(ctx, &stats.GetDataSourceStatsQuery{})
 	if err != nil {
 		s.log.Error("Failed to get datasource stats", "error", err)
diff --git a/pkg/infra/usagestats/statscollector/service_test.go b/pkg/infra/usagestats/statscollector/service_test.go
index 98812cf14c8..b7c5299f13e 100644
--- a/pkg/infra/usagestats/statscollector/service_test.go
+++ b/pkg/infra/usagestats/statscollector/service_test.go
@@ -177,6 +177,7 @@ func TestCollectingUsageStats(t *testing.T) {
 	assert.EqualValues(t, 11, metrics["stats.data_keys.count"])
 	assert.EqualValues(t, 3, metrics["stats.active_data_keys.count"])
 	assert.EqualValues(t, 5, metrics["stats.public_dashboards.count"])
+	assert.EqualValues(t, 3, metrics["stats.correlations.count"])
 
 	assert.InDelta(t, int64(65), metrics["stats.uptime"], 6)
 }
@@ -336,6 +337,7 @@ func mockSystemStats(statsService *statstest.FakeService) {
 		DataKeys:                  11,
 		ActiveDataKeys:            3,
 		PublicDashboards:          5,
+		Correlations:              3,
 	}
 }
 
diff --git a/pkg/services/correlations/correlationstest/fake.go b/pkg/services/correlations/correlationstest/fake.go
new file mode 100644
index 00000000000..8180f35b9e5
--- /dev/null
+++ b/pkg/services/correlations/correlationstest/fake.go
@@ -0,0 +1,23 @@
+package correlationstest
+
+import (
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/correlations"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	fakeDatasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/quota/quotatest"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func New(sqlStore *sqlstore.SQLStore) *correlations.CorrelationsService {
+	ds := &fakeDatasources.FakeDataSourceService{
+		DataSources: []*datasources.DataSource{
+			{ID: 1, UID: "graphite", Type: datasources.DS_GRAPHITE},
+		},
+	}
+
+	correlationsSvc, _ := correlations.ProvideService(sqlStore, routing.NewRouteRegister(), ds, acimpl.ProvideAccessControl(setting.NewCfg()), sqlStore.Bus(), quotatest.New(false, nil), sqlStore.Cfg)
+	return correlationsSvc
+}
diff --git a/pkg/services/stats/models.go b/pkg/services/stats/models.go
index 66ab9dce1ad..ad8c4519531 100644
--- a/pkg/services/stats/models.go
+++ b/pkg/services/stats/models.go
@@ -42,6 +42,7 @@ type SystemStats struct {
 	DataKeys                  int64
 	ActiveDataKeys            int64
 	PublicDashboards          int64
+	Correlations              int64
 }
 
 type DataSourceStats struct {
diff --git a/pkg/services/stats/statsimpl/stats.go b/pkg/services/stats/statsimpl/stats.go
index dfc8875cd6b..122f6093707 100644
--- a/pkg/services/stats/statsimpl/stats.go
+++ b/pkg/services/stats/statsimpl/stats.go
@@ -73,6 +73,7 @@ func (ss *sqlStatsService) GetSystemStats(ctx context.Context, query *stats.GetS
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("star") + `) AS stars,`)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("playlist") + `) AS playlists,`)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("alert") + `) AS alerts,`)
+		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("correlation") + `) AS correlations,`)
 
 		now := time.Now()
 		activeUserDeadlineDate := now.Add(-activeUserTimeLimit)
diff --git a/pkg/services/stats/statsimpl/stats_test.go b/pkg/services/stats/statsimpl/stats_test.go
index e458f49105c..f2d1c840efd 100644
--- a/pkg/services/stats/statsimpl/stats_test.go
+++ b/pkg/services/stats/statsimpl/stats_test.go
@@ -8,6 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/services/correlations"
+	"github.com/grafana/grafana/pkg/services/correlations/correlationstest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
@@ -38,6 +40,7 @@ func TestIntegrationStatsDataAccess(t *testing.T) {
 		assert.Equal(t, int64(0), result.LibraryPanels)
 		assert.Equal(t, int64(0), result.LibraryVariables)
 		assert.Equal(t, int64(0), result.APIKeys)
+		assert.Equal(t, int64(2), result.Correlations)
 	})
 
 	t.Run("Get system user count stats should not results in error", func(t *testing.T) {
@@ -77,6 +80,25 @@ func populateDB(t *testing.T, sqlStore *sqlstore.SQLStore) {
 	orgService, _ := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, quotatest.New(false, nil))
 	userSvc, _ := userimpl.ProvideService(sqlStore, orgService, sqlStore.Cfg, nil, nil, &quotatest.FakeQuotaService{}, supportbundlestest.NewFakeBundleService())
 
+	correlationsSvc := correlationstest.New(sqlStore)
+
+	c := make([]correlations.Correlation, 2)
+	for i := range c {
+		cmd := correlations.CreateCorrelationCommand{
+			Label:     fmt.Sprintf("correlation %v", i),
+			SourceUID: "graphite",
+			OrgId:     1,
+			Config: correlations.CorrelationConfig{
+				Field:  "field",
+				Target: map[string]interface{}{},
+				Type:   correlations.ConfigTypeQuery,
+			},
+		}
+		correlation, err := correlationsSvc.CreateCorrelation(context.Background(), cmd)
+		require.NoError(t, err)
+		c[i] = correlation
+	}
+
 	users := make([]user.User, 3)
 	for i := range users {
 		cmd := user.CreateUserCommand{

From a164b794ce3d66f31bed5ab5fa95f5041d662434 Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Tue, 11 Apr 2023 09:08:55 +0200
Subject: [PATCH 020/729] Docs: updates to error handling (#65599)

* Docs: updates to error handling

* ran prettier
---
 .../create-grafana-managed-rule.md            | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index 5585cfb1c58..99557b5ca3c 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -77,18 +77,24 @@ To generate a separate alert for each series, create a multi-dimensional rule. U
 
 For more information, see [expressions documentation]({{< relref "/docs/grafana/latest/panels-visualizations/query-transform-data/expression-queries" >}}).
 
-### No data and error handling
+### Configure no data and error handling
 
-Configure alerting behavior in the absence of data using information in the following tables.
+Configure alerting behavior when your alert rule evaluation returns no data or an error.
 
-| No Data Option | Description                                                                                                                               |
-| -------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| No Data        | Create a new alert `DatasourceNoData` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels. |
-| Alerting       | Set alert rule state to `Alerting`. This option will respect the configured **Evaluate for** pending period.                              |
-| Ok             | Set alert rule state to `Normal`.                                                                                                         |
+**Note:** Alert rules that are configured to fire when an evaluation returns no data or error only fire when the entire duration of the evaluation period has finished. This means that rather than immediately firing when the alert rule condition is breached, the alert rule waits until the time set as the **For** field has finished and then fires, reducing alert noise and allowing for temporary data availability issues.
 
-| Error or timeout option | Description                                                                                                                              |
-| ----------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
-| Error                   | Create a new alert `DatasourceError` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels. |
-| Alerting                | Set alert rule state to `Alerting`. This option will respect the configured **Evaluate for** pending period.                             |
-| OK                      | Set alert rule state to `Normal`                                                                                                         |
+If your alert rule evaluation returns no data, you can set the state on your alert rule to appear as follows:
+
+| No Data  | Description                                                                                                                                |
+| -------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| No Data  | Creates a new alert `DatasourceNoData` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels. |
+| Alerting | Sets alert rule state to `Alerting`. The alert rule waits until the time set in the **For** field has finished before firing.              |
+| Ok       | Sets alert rule state to `Normal`.                                                                                                         |
+
+If your evaluation returns an error, you can set the state on your alert rule to appear as follows:
+
+| Error    | Description                                                                                                                                     |
+| -------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| Error    | Creates an alert instance `DatasourceError` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels. |
+| Alerting | Sets alert rule state to `Alerting`. The alert rule waits until the time set in the **For** field has finished before firing.                   |
+| Ok       | Sets alert rule state to `Normal`.                                                                                                              |

From 0bf2b89eb9fe4a5781b8a27dbe9a10c736500e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Tue, 11 Apr 2023 10:05:04 +0200
Subject: [PATCH 021/729] Explore: Align multiple log volumes (#64356)

* Align log volumes on x an y axes

* Move helper functions to logs/utils

* Add tests

* Simplify supplementaryQueries.ts

* Fix tests

* Revert code simplifications

To simplify the PR, this can be added in a separate PR

* Fix reusing logs volume when limited/non-limited are used

* Use more specific property name

* Add missing property

* Stretch graph to selected range but only if there's data available

* Fix unit tests

* Fix calculating maximum when bars are stacked

* Sort log volumes by data source name

* Simplify logic to determine if log volumes can be zoomed in
---
 packages/grafana-data/src/types/logs.ts       | 23 ---------
 public/app/core/logsModel.test.ts             | 41 +++++++++-------
 .../features/explore/Graph/ExploreGraph.tsx   |  8 ++-
 .../explore/Graph/exploreGraphStyleUtils.ts   |  4 +-
 .../features/explore/LogsVolumePanel.test.tsx |  1 +
 .../app/features/explore/LogsVolumePanel.tsx  | 15 +++---
 .../features/explore/LogsVolumePanelList.tsx  | 35 ++++++++++---
 public/app/features/explore/state/query.ts    |  9 +++-
 public/app/features/logs/utils.test.ts        | 49 +++++++++++++++++--
 public/app/features/logs/utils.ts             | 49 ++++++++++++++++++-
 10 files changed, 166 insertions(+), 68 deletions(-)

diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts
index fda6ff0720a..d6508191bd9 100644
--- a/packages/grafana-data/src/types/logs.ts
+++ b/packages/grafana-data/src/types/logs.ts
@@ -205,29 +205,6 @@ export type LogsVolumeCustomMetaData = {
   sourceQuery: DataQuery;
 };
 
-export const getLogsVolumeAbsoluteRange = (
-  dataFrames: DataFrame[],
-  defaultRange: AbsoluteTimeRange
-): AbsoluteTimeRange => {
-  return dataFrames[0].meta?.custom?.absoluteRange || defaultRange;
-};
-
-export const getLogsVolumeDataSourceInfo = (dataFrames: DataFrame[]): { name: string } | null => {
-  const customMeta = dataFrames[0]?.meta?.custom;
-
-  if (customMeta && customMeta.datasourceName) {
-    return {
-      name: customMeta.datasourceName,
-    };
-  }
-
-  return null;
-};
-
-export const isLogsVolumeLimited = (dataFrames: DataFrame[]) => {
-  return dataFrames[0]?.meta?.custom?.logsVolumeType === LogsVolumeType.Limited;
-};
-
 /**
  * Data sources that support supplementary queries in Explore.
  * This will enable users to see additional data when running original queries.
diff --git a/public/app/core/logsModel.test.ts b/public/app/core/logsModel.test.ts
index 14daad0b413..0d99b8ea285 100644
--- a/public/app/core/logsModel.test.ts
+++ b/public/app/core/logsModel.test.ts
@@ -13,6 +13,7 @@ import {
   LogRowModel,
   LogsDedupStrategy,
   LogsMetaKind,
+  LogsVolumeCustomMetaData,
   LogsVolumeType,
   MutableDataFrame,
   sortDataFrame,
@@ -1207,6 +1208,16 @@ describe('logs volume', () => {
   it('applies correct meta data', async () => {
     setup(setupMultipleResults);
 
+    const logVolumeCustomMeta: LogsVolumeCustomMetaData = {
+      sourceQuery: { refId: 'A', target: 'volume query 1' } as DataQuery,
+      datasourceName: 'loki',
+      logsVolumeType: LogsVolumeType.FullRange,
+      absoluteRange: {
+        from: FROM.valueOf(),
+        to: TO.valueOf(),
+      },
+    };
+
     await expect(volumeProvider).toEmitValuesWith((received) => {
       expect(received).toContainEqual({ state: LoadingState.Loading, error: undefined, data: [] });
       expect(received).toContainEqual({
@@ -1216,15 +1227,7 @@ describe('logs volume', () => {
           expect.objectContaining({
             fields: expect.anything(),
             meta: {
-              custom: {
-                sourceQuery: { refId: 'A', target: 'volume query 1' },
-                datasourceName: 'loki',
-                logsVolumeType: LogsVolumeType.FullRange,
-                absoluteRange: {
-                  from: FROM.valueOf(),
-                  to: TO.valueOf(),
-                },
-              },
+              custom: logVolumeCustomMeta,
             },
           }),
           expect.anything(),
@@ -1236,6 +1239,16 @@ describe('logs volume', () => {
   it('applies correct meta data when streaming', async () => {
     setup(setupMultipleResultsStreaming);
 
+    const logVolumeCustomMeta: LogsVolumeCustomMetaData = {
+      sourceQuery: { refId: 'A', target: 'volume query 1' } as DataQuery,
+      datasourceName: 'loki',
+      logsVolumeType: LogsVolumeType.FullRange,
+      absoluteRange: {
+        from: FROM.valueOf(),
+        to: TO.valueOf(),
+      },
+    };
+
     await expect(volumeProvider).toEmitValuesWith((received) => {
       expect(received).toContainEqual({ state: LoadingState.Loading, error: undefined, data: [] });
       expect(received).toContainEqual({
@@ -1245,15 +1258,7 @@ describe('logs volume', () => {
           expect.objectContaining({
             fields: expect.anything(),
             meta: {
-              custom: {
-                sourceQuery: { refId: 'A', target: 'volume query 1' },
-                datasourceName: 'loki',
-                logsVolumeType: LogsVolumeType.FullRange,
-                absoluteRange: {
-                  from: FROM.valueOf(),
-                  to: TO.valueOf(),
-                },
-              },
+              custom: logVolumeCustomMeta,
             },
           }),
           expect.anything(),
diff --git a/public/app/features/explore/Graph/ExploreGraph.tsx b/public/app/features/explore/Graph/ExploreGraph.tsx
index 6e55d7ce570..6ff56904d6e 100644
--- a/public/app/features/explore/Graph/ExploreGraph.tsx
+++ b/public/app/features/explore/Graph/ExploreGraph.tsx
@@ -54,6 +54,7 @@ interface Props {
   onChangeTime: (timeRange: AbsoluteTimeRange) => void;
   graphStyle: ExploreGraphStyle;
   anchorToZero?: boolean;
+  yAxisMaximum?: number;
   eventBus: EventBus;
 }
 
@@ -71,6 +72,7 @@ export function ExploreGraph({
   graphStyle,
   tooltipDisplayMode = TooltipDisplayMode.Single,
   anchorToZero = false,
+  yAxisMaximum,
   eventBus,
 }: Props) {
   const theme = useTheme2();
@@ -94,6 +96,7 @@ export function ExploreGraph({
   const [fieldConfig, setFieldConfig] = useState<FieldConfigSource>({
     defaults: {
       min: anchorToZero ? 0 : undefined,
+      max: yAxisMaximum || undefined,
       color: {
         mode: FieldColorModeId.PaletteClassic,
       },
@@ -106,7 +109,10 @@ export function ExploreGraph({
     overrides: [],
   });
 
-  const styledFieldConfig = useMemo(() => applyGraphStyle(fieldConfig, graphStyle), [fieldConfig, graphStyle]);
+  const styledFieldConfig = useMemo(
+    () => applyGraphStyle(fieldConfig, graphStyle, yAxisMaximum),
+    [fieldConfig, graphStyle, yAxisMaximum]
+  );
 
   const dataWithConfig = useMemo(() => {
     return applyFieldOverrides({
diff --git a/public/app/features/explore/Graph/exploreGraphStyleUtils.ts b/public/app/features/explore/Graph/exploreGraphStyleUtils.ts
index f48c746254e..1bbf6f7ad7a 100644
--- a/public/app/features/explore/Graph/exploreGraphStyleUtils.ts
+++ b/public/app/features/explore/Graph/exploreGraphStyleUtils.ts
@@ -6,12 +6,14 @@ import { ExploreGraphStyle } from 'app/types';
 
 export type FieldConfig = FieldConfigSource<GraphFieldConfig>;
 
-export function applyGraphStyle(config: FieldConfig, style: ExploreGraphStyle): FieldConfig {
+export function applyGraphStyle(config: FieldConfig, style: ExploreGraphStyle, maximum?: number): FieldConfig {
   return produce(config, (draft) => {
     if (draft.defaults.custom === undefined) {
       draft.defaults.custom = {};
     }
 
+    draft.defaults.max = maximum;
+
     const { custom } = draft.defaults;
 
     if (custom.stacking === undefined) {
diff --git a/public/app/features/explore/LogsVolumePanel.test.tsx b/public/app/features/explore/LogsVolumePanel.test.tsx
index 54ebf8962c3..683600d1f56 100644
--- a/public/app/features/explore/LogsVolumePanel.test.tsx
+++ b/public/app/features/explore/LogsVolumePanel.test.tsx
@@ -24,6 +24,7 @@ function renderPanel(logsVolumeData?: DataQueryResponse) {
       onLoadLogsVolume={() => {}}
       onHiddenSeriesChanged={() => null}
       eventBus={new EventBusSrv()}
+      allLogsVolumeMaximum={20}
     />
   );
 }
diff --git a/public/app/features/explore/LogsVolumePanel.tsx b/public/app/features/explore/LogsVolumePanel.tsx
index 278b827b68a..a39b18cf52b 100644
--- a/public/app/features/explore/LogsVolumePanel.tsx
+++ b/public/app/features/explore/LogsVolumePanel.tsx
@@ -9,17 +9,17 @@ import {
   SplitOpen,
   TimeZone,
   EventBus,
-  isLogsVolumeLimited,
-  getLogsVolumeAbsoluteRange,
   GrafanaTheme2,
-  getLogsVolumeDataSourceInfo,
 } from '@grafana/data';
 import { Icon, Tooltip, TooltipDisplayMode, useStyles2, useTheme2 } from '@grafana/ui';
 
+import { getLogsVolumeDataSourceInfo, isLogsVolumeLimited } from '../logs/utils';
+
 import { ExploreGraph } from './Graph/ExploreGraph';
 
 type Props = {
   logsVolumeData: DataQueryResponse | undefined;
+  allLogsVolumeMaximum: number;
   absoluteRange: AbsoluteTimeRange;
   timeZone: TimeZone;
   splitOpen: SplitOpen;
@@ -31,7 +31,7 @@ type Props = {
 };
 
 export function LogsVolumePanel(props: Props) {
-  const { width, timeZone, splitOpen, onUpdateTimeRange, onHiddenSeriesChanged } = props;
+  const { width, timeZone, splitOpen, onUpdateTimeRange, onHiddenSeriesChanged, allLogsVolumeMaximum } = props;
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
   const spacing = parseInt(theme.spacing(2).slice(0, -2), 10);
@@ -55,10 +55,6 @@ export function LogsVolumePanel(props: Props) {
       .join('. ');
   }
 
-  const range = isLogsVolumeLimited(logsVolumeData.data)
-    ? getLogsVolumeAbsoluteRange(logsVolumeData.data, props.absoluteRange)
-    : props.absoluteRange;
-
   let LogsVolumePanelContent;
 
   if (logsVolumeData?.data) {
@@ -70,13 +66,14 @@ export function LogsVolumePanel(props: Props) {
           data={logsVolumeData.data}
           height={height}
           width={width - spacing * 2}
-          absoluteRange={range}
+          absoluteRange={props.absoluteRange}
           onChangeTime={onUpdateTimeRange}
           timeZone={timeZone}
           splitOpenFn={splitOpen}
           tooltipDisplayMode={TooltipDisplayMode.Multi}
           onHiddenSeriesChanged={onHiddenSeriesChanged}
           anchorToZero
+          yAxisMaximum={allLogsVolumeMaximum}
           eventBus={props.eventBus}
         />
       );
diff --git a/public/app/features/explore/LogsVolumePanelList.tsx b/public/app/features/explore/LogsVolumePanelList.tsx
index f530336822d..490eaaf81a4 100644
--- a/public/app/features/explore/LogsVolumePanelList.tsx
+++ b/public/app/features/explore/LogsVolumePanelList.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { groupBy, mapValues } from 'lodash';
+import { flatten, groupBy, mapValues, sortBy } from 'lodash';
 import React, { useMemo } from 'react';
 
 import {
@@ -8,14 +8,13 @@ import {
   DataQueryResponse,
   EventBus,
   GrafanaTheme2,
-  isLogsVolumeLimited,
   LoadingState,
   SplitOpen,
   TimeZone,
 } from '@grafana/data';
 import { Button, InlineField, useStyles2 } from '@grafana/ui';
 
-import { mergeLogsVolumeDataFrames } from '../logs/utils';
+import { mergeLogsVolumeDataFrames, isLogsVolumeLimited, getLogsVolumeMaximumRange } from '../logs/utils';
 
 import { LogsVolumePanel } from './LogsVolumePanel';
 import { SupplementaryResultError } from './SupplementaryResultError';
@@ -46,11 +45,25 @@ export const LogsVolumePanelList = ({
   timeZone,
   onClose,
 }: Props) => {
-  const logVolumes: Record<string, DataFrame[]> = useMemo(() => {
-    const grouped = groupBy(logsVolumeData?.data || [], 'meta.custom.datasourceName');
-    return mapValues(grouped, (value) => {
-      return mergeLogsVolumeDataFrames(value);
+  const {
+    logVolumes,
+    maximumValue: allLogsVolumeMaximumValue,
+    maximumRange: allLogsVolumeMaximumRange,
+  } = useMemo(() => {
+    let maximumValue = -Infinity;
+    const sorted = sortBy(logsVolumeData?.data || [], 'meta.custom.datasourceName');
+    const grouped = groupBy(sorted, 'meta.custom.datasourceName');
+    const logVolumes = mapValues(grouped, (value) => {
+      const mergedData = mergeLogsVolumeDataFrames(value);
+      maximumValue = Math.max(maximumValue, mergedData.maximum);
+      return mergedData.dataFrames;
     });
+    const maximumRange = getLogsVolumeMaximumRange(flatten(Object.values(logVolumes)));
+    return {
+      maximumValue,
+      maximumRange,
+      logVolumes,
+    };
   }, [logsVolumeData]);
 
   const styles = useStyles2(getStyles);
@@ -64,6 +77,11 @@ export const LogsVolumePanelList = ({
 
   const timeoutError = isTimeoutErrorResponse(logsVolumeData);
 
+  const visibleRange = {
+    from: Math.max(absoluteRange.from, allLogsVolumeMaximumRange.from),
+    to: Math.min(absoluteRange.to, allLogsVolumeMaximumRange.to),
+  };
+
   if (logsVolumeData?.state === LoadingState.Loading) {
     return <span>Loading...</span>;
   } else if (timeoutError) {
@@ -87,7 +105,8 @@ export const LogsVolumePanelList = ({
         return (
           <LogsVolumePanel
             key={index}
-            absoluteRange={absoluteRange}
+            absoluteRange={visibleRange}
+            allLogsVolumeMaximum={allLogsVolumeMaximumValue}
             width={width}
             logsVolumeData={logsVolumeData}
             onUpdateTimeRange={onUpdateTimeRange}
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 13330f34e22..23722794c2a 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -15,6 +15,7 @@ import {
   hasQueryImportSupport,
   HistoryItem,
   LoadingState,
+  LogsVolumeType,
   PanelEvents,
   QueryFixAction,
   SupplementaryQueryType,
@@ -695,6 +696,12 @@ function canReuseSupplementaryQueryData(
     head
   );
 
+  const allSupportZoomingIn = supplementaryQueryData.data.every((data: DataFrame) => {
+    // If log volume is based on returned log lines (i.e. LogsVolumeType.Limited),
+    // zooming in may return different results, so we don't want to reuse the data
+    return data.meta?.custom?.logsVolumeType === LogsVolumeType.FullRange;
+  });
+
   const allQueriesAreTheSame = deepEqual(newQueriesByRefId, existingDataByRefId);
 
   const allResultsHaveWiderRange = supplementaryQueryData.data.every((data: DataFrame) => {
@@ -707,7 +714,7 @@ function canReuseSupplementaryQueryData(
     return hasWiderRange;
   });
 
-  return allQueriesAreTheSame && allResultsHaveWiderRange;
+  return allSupportZoomingIn && allQueriesAreTheSame && allResultsHaveWiderRange;
 }
 
 /**
diff --git a/public/app/features/logs/utils.test.ts b/public/app/features/logs/utils.test.ts
index 67f33b56547..385f3e20b0f 100644
--- a/public/app/features/logs/utils.test.ts
+++ b/public/app/features/logs/utils.test.ts
@@ -1,6 +1,6 @@
 import {
+  AbsoluteTimeRange,
   ArrayVector,
-  DataFrame,
   FieldType,
   Labels,
   LogLevel,
@@ -8,6 +8,7 @@ import {
   LogsModel,
   LogsSortOrder,
   MutableDataFrame,
+  DataFrame,
 } from '@grafana/data';
 
 import {
@@ -16,6 +17,7 @@ import {
   checkLogsError,
   getLogLevel,
   getLogLevelFromKey,
+  getLogsVolumeMaximumRange,
   logRowsToReadableJson,
   mergeLogsVolumeDataFrames,
   sortLogsResult,
@@ -296,13 +298,15 @@ describe('mergeLogsVolumeDataFrames', () => {
     const debugVolume1 = mockLogVolume('debug', [2, 3], [2, 3]);
     const debugVolume2 = mockLogVolume('debug', [1, 5], [1, 0]);
 
-    // error 1:    - - - - - 1
-    // error 2:    1 - - - - 1
-    // total:      1 - - - - 2
+    // error 1:    1 - - - - 1
+    // error 2:    1 - - - - -
+    // total:      2 - - - - 1
     const errorVolume1 = mockLogVolume('error', [1, 6], [1, 1]);
     const errorVolume2 = mockLogVolume('error', [1], [1]);
 
-    const merged = mergeLogsVolumeDataFrames([
+    // all totals: 6 5 4 - 0 2
+
+    const { dataFrames: merged, maximum } = mergeLogsVolumeDataFrames([
       infoVolume1,
       infoVolume2,
       debugVolume1,
@@ -365,5 +369,40 @@ describe('mergeLogsVolumeDataFrames', () => {
         ],
       },
     ]);
+    expect(maximum).toBe(6);
+  });
+});
+
+describe('getLogsVolumeDimensions', () => {
+  function mockLogVolumeDataFrame(values: number[], absoluteRange: AbsoluteTimeRange) {
+    return new MutableDataFrame({
+      meta: {
+        custom: {
+          absoluteRange,
+        },
+      },
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: new ArrayVector([]),
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          values: new ArrayVector(values),
+        },
+      ],
+    });
+  }
+
+  it('calculates the maximum value and range of all log volumes', () => {
+    const maximumRange = getLogsVolumeMaximumRange([
+      mockLogVolumeDataFrame([], { from: 5, to: 20 }),
+      mockLogVolumeDataFrame([], { from: 10, to: 25 }),
+      mockLogVolumeDataFrame([], { from: 7, to: 23 }),
+    ]);
+
+    expect(maximumRange).toEqual({ from: 5, to: 25 });
   });
 });
diff --git a/public/app/features/logs/utils.ts b/public/app/features/logs/utils.ts
index 9b6e560a416..9e164c18e22 100644
--- a/public/app/features/logs/utils.ts
+++ b/public/app/features/logs/utils.ts
@@ -12,6 +12,7 @@ import {
   FieldType,
   MutableDataFrame,
   QueryResultMeta,
+  LogsVolumeType,
 } from '@grafana/data';
 
 import { getDataframeFields } from './components/logParser';
@@ -163,12 +164,37 @@ export function logRowsToReadableJson(logs: LogRowModel[]) {
   });
 }
 
-export const mergeLogsVolumeDataFrames = (dataFrames: DataFrame[]): DataFrame[] => {
+export const getLogsVolumeMaximumRange = (dataFrames: DataFrame[]) => {
+  let widestRange = { from: Infinity, to: -Infinity };
+
+  dataFrames.forEach((dataFrame: DataFrame) => {
+    const meta = dataFrame.meta?.custom || {};
+    if (meta.absoluteRange?.from && meta.absoluteRange?.to) {
+      widestRange = {
+        from: Math.min(widestRange.from, meta.absoluteRange.from),
+        to: Math.max(widestRange.to, meta.absoluteRange.to),
+      };
+    }
+  });
+
+  return widestRange;
+};
+
+/**
+ * Merge data frames by level and calculate maximum total value for all levels together
+ */
+export const mergeLogsVolumeDataFrames = (dataFrames: DataFrame[]): { dataFrames: DataFrame[]; maximum: number } => {
   if (dataFrames.length === 0) {
     throw new Error('Cannot aggregate data frames: there must be at least one data frame to aggregate');
   }
 
+  // aggregate by level (to produce data frames)
   const aggregated: Record<string, Record<number, number>> = {};
+
+  // aggregate totals to align Y axis when multiple log volumes are shown
+  const totals: Record<number, number> = {};
+  let maximumValue = -Infinity;
+
   const configs: Record<
     string,
     { meta?: QueryResultMeta; valueFieldConfig: FieldConfig; timeFieldConfig: FieldConfig }
@@ -201,6 +227,9 @@ export const mergeLogsVolumeDataFrames = (dataFrames: DataFrame[]): DataFrame[]
       const value: number = valueField.values.get(pointIndex);
       aggregated[level] ??= {};
       aggregated[level][time] = (aggregated[level][time] || 0) + value;
+
+      totals[time] = (totals[time] || 0) + value;
+      maximumValue = Math.max(totals[time], maximumValue);
     }
   });
 
@@ -225,5 +254,21 @@ export const mergeLogsVolumeDataFrames = (dataFrames: DataFrame[]): DataFrame[]
     results.push(levelDataFrame);
   });
 
-  return results;
+  return { dataFrames: results, maximum: maximumValue };
+};
+
+export const getLogsVolumeDataSourceInfo = (dataFrames: DataFrame[]): { name: string } | null => {
+  const customMeta = dataFrames[0]?.meta?.custom;
+
+  if (customMeta && customMeta.datasourceName) {
+    return {
+      name: customMeta.datasourceName,
+    };
+  }
+
+  return null;
+};
+
+export const isLogsVolumeLimited = (dataFrames: DataFrame[]) => {
+  return dataFrames[0]?.meta?.custom?.logsVolumeType === LogsVolumeType.Limited;
 };

From 1d0e74f9988ef4dac3018b482d1062c7d2c50f34 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 11 Apr 2023 09:08:46 +0100
Subject: [PATCH 022/729] PanelHeaderMenuTrigger: Store `clickCoordinates` in a
 ref instead of state (#65601)

rewrite panelheadermenutrigger to use ref instead of state
---
 .../PanelHeader/PanelHeaderMenuTrigger.tsx      | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
index 7b9bb06df6d..6d12cb3d1f5 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
@@ -1,4 +1,4 @@
-import React, { HTMLAttributes, MouseEvent, ReactElement, useCallback, useState } from 'react';
+import React, { HTMLAttributes, MouseEvent, ReactElement, useCallback, useRef, useState } from 'react';
 
 import { CartesianCoords2D } from '@grafana/data';
 
@@ -12,26 +12,23 @@ interface Props extends Omit<HTMLAttributes<HTMLDivElement>, 'children'> {
 }
 
 export function PanelHeaderMenuTrigger({ children, ...divProps }: Props) {
-  const [clickCoordinates, setClickCoordinates] = useState<CartesianCoords2D>({ x: 0, y: 0 });
+  const clickCoordinates = useRef<CartesianCoords2D>({ x: 0, y: 0 });
   const [panelMenuOpen, setPanelMenuOpen] = useState<boolean>(false);
 
   const onMenuToggle = useCallback(
     (event: MouseEvent<HTMLDivElement>) => {
-      if (!isClick(clickCoordinates, eventToClickCoordinates(event))) {
+      if (!isClick(clickCoordinates.current, eventToClickCoordinates(event))) {
         return;
       }
 
       setPanelMenuOpen(!panelMenuOpen);
     },
-    [clickCoordinates, panelMenuOpen, setPanelMenuOpen]
+    [panelMenuOpen, setPanelMenuOpen]
   );
 
-  const onMouseDown = useCallback(
-    (event: MouseEvent<HTMLDivElement>) => {
-      setClickCoordinates(eventToClickCoordinates(event));
-    },
-    [setClickCoordinates]
-  );
+  const onMouseDown = useCallback((event: MouseEvent<HTMLDivElement>) => {
+    clickCoordinates.current = eventToClickCoordinates(event);
+  }, []);
 
   return (
     <header {...divProps} className="panel-title-container" onClick={onMenuToggle} onMouseDown={onMouseDown}>

From 2e2c98953097b9ca5f3075028e6ec211baf82c9c Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 11 Apr 2023 09:10:32 +0100
Subject: [PATCH 023/729] Dashboard: rewrite `useDashboardSave` to not use
 `useEffect` (#65602)

rewrite useDashboardSave to not use useEffect
---
 .../SaveDashboard/useDashboardSave.tsx        | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx b/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
index b636f8b50e5..391ac86c90f 100644
--- a/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
@@ -1,5 +1,4 @@
-import { useEffect } from 'react';
-import useAsyncFn from 'react-use/lib/useAsyncFn';
+import { useAsyncFn } from 'react-use';
 
 import { locationUtil } from '@grafana/data';
 import { locationService, reportInteraction } from '@grafana/runtime';
@@ -27,54 +26,55 @@ const saveDashboard = async (saveModel: any, options: SaveDashboardOptions, dash
 };
 
 export const useDashboardSave = (dashboard: DashboardModel, isCopy = false) => {
-  const [state, onDashboardSave] = useAsyncFn(
-    async (clone: any, options: SaveDashboardOptions, dashboard: DashboardModel) =>
-      await saveDashboard(clone, options, dashboard),
-    []
-  );
   const dispatch = useDispatch();
-
   const notifyApp = useAppNotification();
-  useEffect(() => {
-    if (state.error && !state.loading) {
-      notifyApp.error(state.error.message ?? 'Error saving dashboard');
-    }
-    if (state.value) {
-      dashboard.version = state.value.version;
-      dashboard.clearUnsavedChanges();
+  const [state, onDashboardSave] = useAsyncFn(
+    async (clone: any, options: SaveDashboardOptions, dashboard: DashboardModel) => {
+      try {
+        const result = await saveDashboard(clone, options, dashboard);
+        dashboard.version = result.version;
+        dashboard.clearUnsavedChanges();
 
-      // important that these happen before location redirect below
-      appEvents.publish(new DashboardSavedEvent());
-      notifyApp.success('Dashboard saved');
-      if (isCopy) {
-        reportInteraction('grafana_dashboard_copied', {
-          name: dashboard.title,
-          url: state.value.url,
-        });
-      } else {
-        reportInteraction(`grafana_dashboard_${dashboard.id ? 'saved' : 'created'}`, {
-          name: dashboard.title,
-          url: state.value.url,
-        });
-      }
+        // important that these happen before location redirect below
+        appEvents.publish(new DashboardSavedEvent());
+        notifyApp.success('Dashboard saved');
+        if (isCopy) {
+          reportInteraction('grafana_dashboard_copied', {
+            name: dashboard.title,
+            url: result.url,
+          });
+        } else {
+          reportInteraction(`grafana_dashboard_${dashboard.id ? 'saved' : 'created'}`, {
+            name: dashboard.title,
+            url: result.url,
+          });
+        }
 
-      const currentPath = locationService.getLocation().pathname;
-      const newUrl = locationUtil.stripBaseFromUrl(state.value.url);
+        const currentPath = locationService.getLocation().pathname;
+        const newUrl = locationUtil.stripBaseFromUrl(result.url);
 
-      if (newUrl !== currentPath) {
-        setTimeout(() => locationService.replace(newUrl));
+        if (newUrl !== currentPath) {
+          setTimeout(() => locationService.replace(newUrl));
+        }
+        if (dashboard.meta.isStarred) {
+          dispatch(
+            updateDashboardName({
+              id: dashboard.uid,
+              title: dashboard.title,
+              url: newUrl,
+            })
+          );
+        }
+        return result;
+      } catch (error) {
+        if (error instanceof Error) {
+          notifyApp.error(error.message ?? 'Error saving dashboard');
+        }
+        throw error;
       }
-      if (dashboard.meta.isStarred) {
-        dispatch(
-          updateDashboardName({
-            id: dashboard.uid,
-            title: dashboard.title,
-            url: newUrl,
-          })
-        );
-      }
-    }
-  }, [dashboard, isCopy, state, notifyApp, dispatch]);
+    },
+    [dispatch, notifyApp]
+  );
 
   return { state, onDashboardSave };
 };

From dec3361331b9fcb6a4db3454c231a465e8e24e0f Mon Sep 17 00:00:00 2001
From: Jack Baldry <jack.baldry@grafana.com>
Date: Tue, 11 Apr 2023 09:32:54 +0100
Subject: [PATCH 024/729] Remove "Open source" label from all "RBAC" pages
 (#66129)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
---
 .../roles-and-permissions/access-control/_index.md           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/sources/administration/roles-and-permissions/access-control/_index.md b/docs/sources/administration/roles-and-permissions/access-control/_index.md
index c4e96848c3c..d95e7aa214d 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/_index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/_index.md
@@ -3,6 +3,11 @@ aliases:
   - ../../enterprise/access-control/
   - ../../enterprise/access-control/about-rbac/
   - ../../enterprise/access-control/roles/
+cascade:
+  labels:
+    products:
+      - cloud
+      - enterprise
 description: Role-based access control (RBAC) provides a standardized way of granting,
   changing, and revoking access so that users can view and modify Grafana resources,
   such as users and reports.

From a5499bbf702cc45a461987e25628b5dc798c0a11 Mon Sep 17 00:00:00 2001
From: Jack Baldry <jack.baldry@grafana.com>
Date: Tue, 11 Apr 2023 09:34:17 +0100
Subject: [PATCH 025/729] Remove "Open source" label from "Recorded queries"
 page (#66127)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
---
 docs/sources/administration/recorded-queries/index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/sources/administration/recorded-queries/index.md b/docs/sources/administration/recorded-queries/index.md
index cc380b234ca..81475ae48c3 100644
--- a/docs/sources/administration/recorded-queries/index.md
+++ b/docs/sources/administration/recorded-queries/index.md
@@ -7,6 +7,10 @@ keywords:
   - query
   - queries
   - recorded
+labels:
+  products:
+    - cloud
+    - enterprise
 title: Recorded queries
 weight: 300
 ---

From 1261345b81ea12346ed405bc30429564a06e2b99 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 11 Apr 2023 10:51:54 +0100
Subject: [PATCH 026/729] Chore: Upgrade to react 18 (#64428)

* update react 18 related deps

* fix some types

* make sure we're on react-router-dom >= 5.3.3

* Use new root API

* Remove StrictMode for now - react 18 double rendering causes issues

* fix + ignore some @grafana/ui types

* fix some more types

* use renderHook from @testing-library/react in almost all cases

* fix storybook types

* rewrite useDashboardSave to not use useEffect

* make props optional

* only render if props are provided

* add correct type for useCallback

* make resourcepicker tests more robust

* fix ModalManager rendering

* fix some more unit tests

* store the click coordinates in a ref as setState is NOT synchronous

* fix remaining e2e tests

* rewrite dashboardpage tests to avoid act warnings

* undo lint ignores

* fix ExpanderCell types

* set SymbolCell type correctly

* fix QueryAndExpressionsStep

* looks like the types were actually wrong instead :D

* undo this for now...

* remove spinner waits

* more robust tests

* rewrite errorboundary test to not explicitly count the number of renders

* make urlParam expect async

* increase timeout in waitFor

* revert ExplorePage test changes

* Update public/app/features/dashboard/containers/DashboardPage.test.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* skip fakeTimer test, ignore table types for now + other review comments

* update package peerDeps

* small tweak to resourcepicker test

* update lockfile...

* increase timeout in sharepublicdashboard tests

* ensure ExplorePaneContainer passes correct queries to initializeExplore

* fix LokiContextUI test

* fix unit tests

* make importDashboard flow more consistent

* wait for dashboard name before continuing

* more test fixes

* readd dashboard name to variable e2e tests

* wait for switches to be enabled before clicking

* fix modal rendering

* don't use @testing-library/dom directly

* quick fix for rendering of panels in firefox

* make PromQueryField test more robust

* don't wait for chartData - in react 18 this can happen before the wait code even gets executed

---------

Co-authored-by: kay delaney <kay@grafana.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
---
 .github/renovate.json5                        |  10 -
 ...ook-addon-docs-npm-6.5.16-56ecbd77e7.patch |  14 +
 ...act-split-pane-npm-0.1.92-93dbf51dff.patch |  12 +
 ...g_a_row_with_a_non_repeating_panel.spec.ts |   2 +
 .../new-constant-variable.spec.ts             |   4 +-
 .../new-custom-variable.spec.ts               |   3 +
 .../new-datasource-variable.spec.ts           |   2 +
 .../new-interval-variable.spec.ts             |   2 +
 .../new-query-variable.spec.ts                |   4 +
 .../new-text-box-variable.spec.ts             |   2 +
 .../trace-view-scrolling.spec.ts              |   4 +-
 package.json                                  |  24 +-
 packages/grafana-data/package.json            |  19 +-
 .../grafana-e2e/src/flows/configurePanel.ts   |   3 -
 .../grafana-e2e/src/flows/importDashboard.ts  |   7 +-
 packages/grafana-runtime/package.json         |  17 +-
 .../usePluginInteractionReporter.test.tsx     |   2 +-
 packages/grafana-ui/package.json              |  23 +-
 .../src/components/Dropdown/Dropdown.tsx      |   2 +-
 .../ErrorBoundary/ErrorBoundary.test.tsx      |   6 +-
 .../InteractiveTable/ExpanderCell.tsx         |   2 +-
 .../src/components/Logs/LogRowContext.tsx     |   3 +-
 .../src/components/Menu/MenuItem.test.tsx     |   3 +-
 .../src/components/Menu/hooks.test.tsx        |   4 +-
 .../src/components/Segment/Segment.tsx        |   3 +-
 .../src/components/Segment/SegmentAsync.tsx   |   3 +-
 .../src/components/Slider/HandleTooltip.tsx   |   3 +-
 .../src/components/Slider/RangeSlider.tsx     |   2 +-
 .../grafana-ui/src/components/Table/utils.ts  |   4 +
 .../src/themes/ThemeContext.test.tsx          |   3 +-
 packages/grafana-ui/src/utils/reactUtils.ts   |   4 +-
 .../internal/input-datasource/package.json    |   8 +-
 public/app/AppWrapper.tsx                     |  70 ++--
 public/app/angular/services/ng_react.ts       |  29 +-
 public/app/app.ts                             |   8 +-
 public/app/core/services/ModalManager.ts      |   9 +-
 .../alerting/NotificationsListPage.tsx        |   2 +-
 .../features/alerting/TestRuleResult.test.tsx |  10 +-
 .../alerting/unified/Receivers.test.tsx       |  27 +-
 .../notification-policies/Modals.tsx          |   6 +-
 .../hooks/useAlertManagerSourceName.test.tsx  |   2 +-
 .../hooks/useExternalAMSelector.test.tsx      |  93 ++---
 .../unified/hooks/useIsRuleEditable.test.tsx  |   2 +-
 .../AnnotationsSettings.test.tsx              |   3 +-
 .../DashboardSettings/LinksSettings.test.tsx  |   3 +-
 .../VersionsSettings.test.tsx                 |   3 +-
 .../SharePublicDashboard.test.tsx             |  33 +-
 .../containers/DashboardPage.test.tsx         | 338 ++++++++--------
 .../containers/PublicDashboardPage.test.tsx   | 280 ++++++--------
 .../dashboard/dashgrid/DashboardGrid.test.tsx |   3 +-
 .../dashboard/dashgrid/DashboardPanel.tsx     |   4 +-
 .../dashboard/dashgrid/LazyLoader.tsx         |   4 +-
 .../components/DataSourceTestingStatus.tsx    |   2 +-
 .../features/explore/ExplorePaneContainer.tsx |   4 +-
 .../TraceView/useChildrenState.test.ts        |   2 +-
 .../explore/TraceView/useDetailState.test.ts  |   2 +-
 .../TraceView/useHoverIndentGuide.test.ts     |   2 +-
 .../explore/TraceView/useSearch.test.ts       |   2 +-
 .../explore/TraceView/useViewRange.test.ts    |   2 +-
 .../features/explore/spec/helper/setup.tsx    |   3 +-
 public/app/features/explore/state/query.ts    |   3 +-
 .../LibraryPanelsSearch.test.tsx              |   3 +-
 .../logs/components/LogRowContext.tsx         |   6 +-
 .../features/playlist/PlaylistForm.test.tsx   |   3 +-
 .../profile/UserProfileEditPage.test.tsx      |   3 +-
 .../search/page/components/columns.tsx        |   8 +-
 .../MetricsQueryEditor/dataHooks.test.ts      |  70 ++--
 .../components/QueryEditor/QueryEditor.tsx    |   2 +-
 .../ResourcePicker/ResourcePicker.test.tsx    |  26 +-
 .../VariableEditor/VariableEditor.tsx         |   4 +-
 .../azuremonitor/utils/useAsyncState.test.ts  |  25 +-
 .../azuremonitor/utils/useLastError.test.ts   |   2 +-
 .../datasource/cloudwatch/hooks.test.ts       |  82 ++--
 .../useMigratedMetricsQuery.test.ts           |   2 +-
 .../elasticsearch/hooks/useFields.test.tsx    |   2 +-
 .../elasticsearch/hooks/useNextId.test.tsx    |   2 +-
 .../VisualInfluxQLEditor/Editor.test.tsx      |  10 +-
 .../components/useShadowedState.test.ts       |   2 +-
 .../influxdb/components/useUniqueId.test.ts   |   2 +-
 .../loki/components/LokiContextUi.test.tsx    |   5 +-
 .../parca/QueryEditor/QueryEditor.test.tsx    |   3 +-
 .../phlare/QueryEditor/QueryEditor.test.tsx   |   3 +-
 .../components/PromQueryField.test.tsx        |   8 +-
 .../querybuilder/shared/hooks/useFlag.test.ts |   2 +-
 .../datasource/zipkin/QueryField.test.tsx     |  32 +-
 .../components/FlameGraph/FlameGraph.test.tsx |   3 +-
 public/app/plugins/panel/graph/graph.ts       |  13 +-
 .../plugins/panel/nodeGraph/layout.test.ts    |   2 +-
 yarn.lock                                     | 361 +++++++++---------
 89 files changed, 921 insertions(+), 920 deletions(-)
 create mode 100644 .yarn/patches/@storybook-addon-docs-npm-6.5.16-56ecbd77e7.patch
 create mode 100644 .yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index a652df0a8ad..83033b38060 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -22,16 +22,6 @@
     "@sentry/browser",
     "@sentry/types",
     "@sentry/utils",
-
-    // dep updates blocked by React 18
-    "@testing-library/dom",
-    "@testing-library/react",
-    "@types/react",
-    "@types/react-dom",
-    "@types/react-test-renderer",
-    "react",
-    "react-dom",
-    "react-test-renderer"
   ],
   "includePaths": ["package.json", "packages/**"],
   "ignorePaths": ["packages/grafana-toolkit/package.json", "emails/**", "plugins-bundled/**", "**/mocks/**"],
diff --git a/.yarn/patches/@storybook-addon-docs-npm-6.5.16-56ecbd77e7.patch b/.yarn/patches/@storybook-addon-docs-npm-6.5.16-56ecbd77e7.patch
new file mode 100644
index 00000000000..5fc706f7d5d
--- /dev/null
+++ b/.yarn/patches/@storybook-addon-docs-npm-6.5.16-56ecbd77e7.patch
@@ -0,0 +1,14 @@
+diff --git a/dist/ts3.9/blocks/DocsContainer.d.ts b/dist/ts3.9/blocks/DocsContainer.d.ts
+index be330e44bebb02eaf2c92d365d4e7dc1da452465..6c8b1d42bea2e184456e2757eb2ee20076ba43b3 100644
+--- a/dist/ts3.9/blocks/DocsContainer.d.ts
++++ b/dist/ts3.9/blocks/DocsContainer.d.ts
+@@ -1,7 +1,8 @@
+-import { FunctionComponent } from 'react';
++import { FunctionComponent, ReactNode } from 'react';
+ import { AnyFramework } from '@storybook/csf';
+ import { DocsContextProps } from './DocsContext';
+ export interface DocsContainerProps<TFramework extends AnyFramework = AnyFramework> {
+     context: DocsContextProps<TFramework>;
++    children?: ReactNode;
+ }
+ export declare const DocsContainer: FunctionComponent<DocsContainerProps>;
diff --git a/.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch b/.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch
new file mode 100644
index 00000000000..1ea29362cf1
--- /dev/null
+++ b/.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch
@@ -0,0 +1,12 @@
+diff --git a/index.d.ts b/index.d.ts
+index d116f54d6da12d24b48e24ff3636c9066059aa58..93290945d8b1818cab893d6466179b33869a47b9 100644
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -25,6 +25,7 @@ export type SplitPaneProps = {
+   pane2Style?: React.CSSProperties;
+   resizerClassName?: string;
+   step?: number;
++  children?: React.ReactNode;
+ };
+ 
+ export type SplitPaneState = {
diff --git a/e2e/dashboards-suite/Repeating_a_row_with_a_non_repeating_panel.spec.ts b/e2e/dashboards-suite/Repeating_a_row_with_a_non_repeating_panel.spec.ts
index c47eb7fd096..0b44c94cf85 100644
--- a/e2e/dashboards-suite/Repeating_a_row_with_a_non_repeating_panel.spec.ts
+++ b/e2e/dashboards-suite/Repeating_a_row_with_a_non_repeating_panel.spec.ts
@@ -1,5 +1,6 @@
 import { e2e } from '@grafana/e2e';
 const PAGE_UNDER_TEST = 'k3PEoCpnk/repeating-a-row-with-a-non-repeating-panel-and-horizontal-repeating-panel';
+const DASHBOARD_NAME = 'Repeating a row with a non-repeating panel and horizontal repeating panel';
 
 describe('Repeating a row with repeated panels and a non-repeating panel', () => {
   beforeEach(() => {
@@ -8,6 +9,7 @@ describe('Repeating a row with repeated panels and a non-repeating panel', () =>
 
   it('should be able to collapse and expand a repeated row without losing panels', () => {
     e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     const panelsToCheck = [
       'Row 2 non-repeating panel',
diff --git a/e2e/dashboards-suite/new-constant-variable.spec.ts b/e2e/dashboards-suite/new-constant-variable.spec.ts
index bdb990828ed..c595e49c692 100644
--- a/e2e/dashboards-suite/new-constant-variable.spec.ts
+++ b/e2e/dashboards-suite/new-constant-variable.spec.ts
@@ -2,11 +2,13 @@ import { e2e } from '@grafana/e2e';
 import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
 
 describe('Variables - Constant', () => {
   it('can add a new constant variable', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     // Create a new "Constant" variable
     e2e.components.CallToActionCard.buttonV2('Add variable').click();
@@ -15,8 +17,8 @@ describe('Variables - Constant', () => {
       e2e().get('input').type('Constant{enter}');
     });
     e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type('VariableUnderTest').blur();
-    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type('Variable under test').blur();
     e2e.pages.Dashboard.Settings.Variables.Edit.ConstantVariable.constantOptionsQueryInputV2().type('pesto').blur();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type('Variable under test').blur();
 
     e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().eq(0).should('have.text', 'pesto');
 
diff --git a/e2e/dashboards-suite/new-custom-variable.spec.ts b/e2e/dashboards-suite/new-custom-variable.spec.ts
index 1ed710f11d3..79b8a139a28 100644
--- a/e2e/dashboards-suite/new-custom-variable.spec.ts
+++ b/e2e/dashboards-suite/new-custom-variable.spec.ts
@@ -2,6 +2,7 @@ import { e2e } from '@grafana/e2e';
 import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
 
 function fillInCustomVariable(name: string, label: string, value: string) {
   e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
@@ -23,6 +24,7 @@ describe('Variables - Custom', () => {
   it('can add a custom template variable', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     // Create a new "Custom" variable
     e2e.components.CallToActionCard.buttonV2('Add variable').click();
@@ -50,6 +52,7 @@ describe('Variables - Custom', () => {
   it('can add a custom template variable with labels', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     // Create a new "Custom" variable
     e2e.components.CallToActionCard.buttonV2('Add variable').click();
diff --git a/e2e/dashboards-suite/new-datasource-variable.spec.ts b/e2e/dashboards-suite/new-datasource-variable.spec.ts
index 8d9bdfb4ea3..27aaa3c15fd 100644
--- a/e2e/dashboards-suite/new-datasource-variable.spec.ts
+++ b/e2e/dashboards-suite/new-datasource-variable.spec.ts
@@ -2,11 +2,13 @@ import { e2e } from '@grafana/e2e';
 import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
 
 describe('Variables - Datasource', () => {
   it('can add a new datasource variable', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     // Create a new "Datasource" variable
     e2e.components.CallToActionCard.buttonV2('Add variable').click();
diff --git a/e2e/dashboards-suite/new-interval-variable.spec.ts b/e2e/dashboards-suite/new-interval-variable.spec.ts
index c55fb7b0796..6e4eeda55af 100644
--- a/e2e/dashboards-suite/new-interval-variable.spec.ts
+++ b/e2e/dashboards-suite/new-interval-variable.spec.ts
@@ -2,6 +2,7 @@ import { e2e } from '@grafana/e2e';
 import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
 
 function assertPreviewValues(expectedValues: string[]) {
   for (const expected of expectedValues) {
@@ -14,6 +15,7 @@ describe('Variables - Interval', () => {
   it('can add a new interval variable', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     // Create a new "Interval" variable
     e2e.components.CallToActionCard.buttonV2('Add variable').click();
diff --git a/e2e/dashboards-suite/new-query-variable.spec.ts b/e2e/dashboards-suite/new-query-variable.spec.ts
index 2dfc095d9bc..307f3da7b6c 100644
--- a/e2e/dashboards-suite/new-query-variable.spec.ts
+++ b/e2e/dashboards-suite/new-query-variable.spec.ts
@@ -2,11 +2,13 @@ import { e2e } from '@grafana/e2e';
 import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
+const DASHBOARD_NAME = 'Templating - Nested Template Variables';
 
 describe('Variables - Query - Add variable', () => {
   it('query variable should be default and default fields should be correct', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     e2e.pages.Dashboard.Settings.Variables.List.newButton().should('be.visible').click();
 
@@ -77,6 +79,7 @@ describe('Variables - Query - Add variable', () => {
   it('adding a single value query variable', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     e2e.pages.Dashboard.Settings.Variables.List.newButton().should('be.visible').click();
 
@@ -132,6 +135,7 @@ describe('Variables - Query - Add variable', () => {
   it('adding a multi value query variable', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     e2e.pages.Dashboard.Settings.Variables.List.newButton().should('be.visible').click();
 
diff --git a/e2e/dashboards-suite/new-text-box-variable.spec.ts b/e2e/dashboards-suite/new-text-box-variable.spec.ts
index f07385729d2..9bd24f16157 100644
--- a/e2e/dashboards-suite/new-text-box-variable.spec.ts
+++ b/e2e/dashboards-suite/new-text-box-variable.spec.ts
@@ -2,11 +2,13 @@ import { e2e } from '@grafana/e2e';
 import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
 
 describe('Variables - Text box', () => {
   it('can add a new text box variable', () => {
     e2e.flows.login('admin', 'admin');
     e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
 
     // Create a new "text box" variable
     e2e.components.CallToActionCard.buttonV2('Add variable').click();
diff --git a/e2e/various-suite/trace-view-scrolling.spec.ts b/e2e/various-suite/trace-view-scrolling.spec.ts
index 3342281afe5..5fd3cfdae0f 100644
--- a/e2e/various-suite/trace-view-scrolling.spec.ts
+++ b/e2e/various-suite/trace-view-scrolling.spec.ts
@@ -29,7 +29,9 @@ describe('Trace view', () => {
         e2e.pages.Explore.General.scrollView().children('.scrollbar-view').scrollTo('center');
 
         // After scrolling we should load more spans
-        e2e.components.TraceViewer.spanBar().its('length').should('be.gt', oldLength);
+        e2e.components.TraceViewer.spanBar().should(($span) => {
+          expect($span.length).to.be.gt(oldLength);
+        });
       });
   });
 });
diff --git a/package.json b/package.json
index 1e8cf53df28..d266f25c225 100644
--- a/package.json
+++ b/package.json
@@ -114,10 +114,9 @@
     "@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1",
     "@swc/core": "1.3.38",
     "@swc/helpers": "0.4.14",
-    "@testing-library/dom": "8.20.0",
+    "@testing-library/dom": "9.0.1",
     "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/react": "12.1.4",
-    "@testing-library/react-hooks": "8.0.1",
+    "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
     "@types/angular": "1.8.4",
     "@types/angular-route": "1.7.2",
@@ -146,15 +145,15 @@
     "@types/papaparse": "5.3.7",
     "@types/pluralize": "^0.0.29",
     "@types/prismjs": "1.26.0",
-    "@types/react": "17.0.42",
+    "@types/react": "18.0.28",
     "@types/react-beautiful-dnd": "13.1.3",
-    "@types/react-dom": "17.0.14",
+    "@types/react-dom": "18.0.11",
     "@types/react-grid-layout": "1.3.2",
     "@types/react-highlight-words": "0.16.4",
     "@types/react-redux": "7.1.25",
     "@types/react-router-dom": "5.3.3",
     "@types/react-table": "7.7.14",
-    "@types/react-test-renderer": "17.0.1",
+    "@types/react-test-renderer": "18.0.0",
     "@types/react-transition-group": "4.4.5",
     "@types/react-virtualized-auto-sizer": "1.0.1",
     "@types/react-window": "1.8.5",
@@ -226,7 +225,7 @@
     "react-refresh": "0.14.0",
     "react-select-event": "5.5.1",
     "react-simple-compat": "1.2.3",
-    "react-test-renderer": "17.0.2",
+    "react-test-renderer": "18.2.0",
     "redux-mock-store": "1.5.4",
     "rimraf": "4.4.0",
     "rudder-sdk-js": "2.25.0",
@@ -294,6 +293,7 @@
     "@sentry/browser": "6.19.7",
     "@sentry/types": "6.19.7",
     "@sentry/utils": "6.19.7",
+    "@testing-library/react-hooks": "^8.0.1",
     "@types/react-resizable": "3.0.3",
     "@types/webpack-env": "1.18.0",
     "@visx/event": "3.0.1",
@@ -366,11 +366,11 @@
     "rc-time-picker": "3.7.3",
     "rc-tree": "5.7.2",
     "re-resizable": "6.9.9",
-    "react": "17.0.2",
+    "react": "18.2.0",
     "react-awesome-query-builder": "5.4.0",
     "react-beautiful-dnd": "13.1.1",
     "react-diff-viewer": "^3.1.1",
-    "react-dom": "17.0.2",
+    "react-dom": "18.2.0",
     "react-draggable": "4.4.5",
     "react-dropzone": "^14.2.3",
     "react-enable": "^3.1.0",
@@ -385,7 +385,7 @@
     "react-redux": "7.2.6",
     "react-resizable": "3.0.4",
     "react-reverse-portal": "2.1.1",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "5.3.3",
     "react-select": "5.7.0",
     "react-split-pane": "0.1.92",
     "react-table": "7.8.0",
@@ -437,7 +437,9 @@
     "@storybook/manager-webpack5/webpack": "5.76.0",
     "ngtemplate-loader/loader-utils": "^2.0.0",
     "trim": "0.0.3",
-    "slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch"
+    "slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch",
+    "react-split-pane@0.1.92": "patch:react-split-pane@npm:0.1.92#.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch",
+    "@storybook/addon-docs@6.5.16": "patch:@storybook/addon-docs@npm:6.5.16#.yarn/patches/@storybook-addon-docs-npm-6.5.16-56ecbd77e7.patch"
   },
   "workspaces": {
     "packages": [
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 70497f3d1ed..7032827909b 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -63,10 +63,9 @@
     "@rollup/plugin-commonjs": "23.0.2",
     "@rollup/plugin-json": "5.0.1",
     "@rollup/plugin-node-resolve": "15.0.1",
-    "@testing-library/dom": "8.20.0",
+    "@testing-library/dom": "9.0.1",
     "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/react": "12.1.4",
-    "@testing-library/react-hooks": "8.0.1",
+    "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
     "@types/dompurify": "^2",
     "@types/history": "4.7.11",
@@ -76,15 +75,15 @@
     "@types/marked": "4.0.8",
     "@types/node": "18.14.6",
     "@types/papaparse": "5.3.7",
-    "@types/react": "17.0.42",
-    "@types/react-dom": "17.0.14",
+    "@types/react": "18.0.28",
+    "@types/react-dom": "18.0.11",
     "@types/sinon": "10.0.13",
     "@types/testing-library__jest-dom": "5.14.5",
     "@types/tinycolor2": "1.4.3",
     "esbuild": "0.16.17",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
-    "react-test-renderer": "17.0.2",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-test-renderer": "18.2.0",
     "rimraf": "4.4.0",
     "rollup": "2.79.1",
     "rollup-plugin-dts": "^5.0.0",
@@ -94,7 +93,7 @@
     "typescript": "4.8.4"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0"
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0"
   }
 }
diff --git a/packages/grafana-e2e/src/flows/configurePanel.ts b/packages/grafana-e2e/src/flows/configurePanel.ts
index 7181c06fa05..a121376a98a 100644
--- a/packages/grafana-e2e/src/flows/configurePanel.ts
+++ b/packages/grafana-e2e/src/flows/configurePanel.ts
@@ -141,7 +141,6 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
 
     if (queriesForm) {
       queriesForm(fullConfig);
-      e2e().wait('@chartData');
 
       // Wait for a possible complex visualization to render (or something related, as this isn't necessary on the dashboard page)
       // Can't assert that its HTML changed because a new query could produce the same results
@@ -158,8 +157,6 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
     // Avoid annotations flakiness
     e2e.components.RefreshPicker.runButtonV2().first().click({ force: true });
 
-    e2e().wait('@chartData');
-
     // Wait for RxJS
     e2e().wait(500);
 
diff --git a/packages/grafana-e2e/src/flows/importDashboard.ts b/packages/grafana-e2e/src/flows/importDashboard.ts
index d3b01c2be6b..2d9edeee690 100644
--- a/packages/grafana-e2e/src/flows/importDashboard.ts
+++ b/packages/grafana-e2e/src/flows/importDashboard.ts
@@ -20,10 +20,9 @@ export const importDashboard = (dashboardToImport: Dashboard, queryTimeout?: num
   e2e().visit(fromBaseUrl('/dashboard/import'));
 
   // Note: normally we'd use 'click' and then 'type' here, but the json object is so big that using 'val' is much faster
-  e2e.components.DashboardImportPage.textarea()
-    .should('be.visible')
-    .click()
-    .invoke('val', JSON.stringify(dashboardToImport));
+  e2e.components.DashboardImportPage.textarea().should('be.visible');
+  e2e.components.DashboardImportPage.textarea().click();
+  e2e.components.DashboardImportPage.textarea().invoke('val', JSON.stringify(dashboardToImport));
   e2e.components.DashboardImportPage.submit().should('be.visible').click();
   e2e.components.ImportDashboardForm.name().should('be.visible').click().clear().type(dashboardToImport.title);
   e2e.components.ImportDashboardForm.submit().should('be.visible').click();
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index 67798bf4475..e7ba8738b6c 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -52,21 +52,20 @@
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@rollup/plugin-commonjs": "23.0.2",
     "@rollup/plugin-node-resolve": "15.0.1",
-    "@testing-library/dom": "8.20.0",
-    "@testing-library/react": "12.1.4",
-    "@testing-library/react-hooks": "8.0.1",
+    "@testing-library/dom": "9.0.1",
+    "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
     "@types/angular": "1.8.4",
     "@types/history": "4.7.11",
     "@types/jest": "29.2.3",
     "@types/lodash": "4.14.191",
-    "@types/react": "17.0.42",
-    "@types/react-dom": "17.0.14",
+    "@types/react": "18.0.28",
+    "@types/react-dom": "18.0.11",
     "@types/systemjs": "^0.20.6",
     "esbuild": "0.16.17",
     "lodash": "4.17.21",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "rimraf": "4.4.0",
     "rollup": "2.79.1",
     "rollup-plugin-dts": "^5.0.0",
@@ -77,7 +76,7 @@
     "typescript": "4.8.4"
   },
   "peerDependencies": {
-    "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0"
   }
 }
diff --git a/packages/grafana-runtime/src/analytics/plugins/usePluginInteractionReporter.test.tsx b/packages/grafana-runtime/src/analytics/plugins/usePluginInteractionReporter.test.tsx
index 75b52e2cf59..40c2a65bdc9 100644
--- a/packages/grafana-runtime/src/analytics/plugins/usePluginInteractionReporter.test.tsx
+++ b/packages/grafana-runtime/src/analytics/plugins/usePluginInteractionReporter.test.tsx
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 import React from 'react';
 
 import {
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 09febdfebd2..9185bda19ca 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -97,7 +97,7 @@
     "react-inlinesvg": "3.0.2",
     "react-popper": "2.3.0",
     "react-popper-tooltip": "4.4.2",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "5.3.3",
     "react-select": "5.7.0",
     "react-select-event": "^5.1.0",
     "react-table": "7.8.0",
@@ -134,10 +134,9 @@
     "@storybook/preset-scss": "1.0.3",
     "@storybook/react": "6.5.16",
     "@storybook/theming": "6.5.16",
-    "@testing-library/dom": "8.20.0",
+    "@testing-library/dom": "9.0.1",
     "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/react": "12.1.4",
-    "@testing-library/react-hooks": "8.0.1",
+    "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
     "@types/common-tags": "^1.8.0",
     "@types/d3": "7.4.0",
@@ -149,15 +148,15 @@
     "@types/mock-raf": "1.0.3",
     "@types/node": "18.14.6",
     "@types/prismjs": "1.26.0",
-    "@types/react": "17.0.42",
+    "@types/react": "18.0.28",
     "@types/react-beautiful-dnd": "13.1.3",
     "@types/react-calendar": "3.9.0",
     "@types/react-color": "3.0.6",
-    "@types/react-dom": "17.0.14",
+    "@types/react-dom": "18.0.11",
     "@types/react-highlight-words": "0.16.4",
     "@types/react-router-dom": "5.3.3",
     "@types/react-table": "7.7.14",
-    "@types/react-test-renderer": "17.0.1",
+    "@types/react-test-renderer": "18.0.0",
     "@types/react-transition-group": "4.4.5",
     "@types/react-window": "1.8.5",
     "@types/slate": "0.47.11",
@@ -173,9 +172,9 @@
     "expose-loader": "4.0.0",
     "mock-raf": "1.0.1",
     "process": "^0.11.10",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
-    "react-test-renderer": "17.0.2",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-test-renderer": "18.2.0",
     "rimraf": "4.4.0",
     "rollup": "2.79.1",
     "rollup-plugin-dts": "^5.0.0",
@@ -190,7 +189,7 @@
     "webpack": "5.76.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0"
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0"
   }
 }
diff --git a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
index 21f1e28ed8c..3db8ed9c69f 100644
--- a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
@@ -71,7 +71,7 @@ export const Dropdown = React.memo(({ children, overlay, placement, offset, onVi
                 timeout={{ appear: animationDuration, exit: 0, enter: 0 }}
                 classNames={animationStyles}
               >
-                <div ref={transitionRef}>{ReactUtils.renderOrCallToRender(overlay)}</div>
+                <div ref={transitionRef}>{ReactUtils.renderOrCallToRender(overlay, {})}</div>
               </CSSTransition>
             </div>
           </FocusScope>
diff --git a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx
index 72eb6d9084b..df5241e46de 100644
--- a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx
+++ b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx
@@ -57,7 +57,7 @@ describe('ErrorBoundary', () => {
     expect((faro.api.pushError as jest.Mock).mock.calls[0][0]).toBe(problem);
   });
 
-  it('should recover when when recover props change', async () => {
+  it('should rerender when recover props change', async () => {
     const problem = new Error('things went terribly wrong');
     let renderCount = 0;
 
@@ -75,6 +75,8 @@ describe('ErrorBoundary', () => {
     );
 
     await screen.findByText(problem.message);
+    expect(renderCount).toBeGreaterThan(0);
+    const oldRenderCount = renderCount;
 
     rerender(
       <ErrorBoundary dependencies={[1, 3]}>
@@ -89,6 +91,6 @@ describe('ErrorBoundary', () => {
       </ErrorBoundary>
     );
 
-    expect(renderCount).toBe(2);
+    expect(renderCount).toBeGreaterThan(oldRenderCount);
   });
 });
diff --git a/packages/grafana-ui/src/components/InteractiveTable/ExpanderCell.tsx b/packages/grafana-ui/src/components/InteractiveTable/ExpanderCell.tsx
index 69873f54e13..607b032878b 100644
--- a/packages/grafana-ui/src/components/InteractiveTable/ExpanderCell.tsx
+++ b/packages/grafana-ui/src/components/InteractiveTable/ExpanderCell.tsx
@@ -10,7 +10,7 @@ const expanderContainerStyles = css`
   height: 100%;
 `;
 
-export function ExpanderCell<K extends object>({ row, __rowID }: CellProps<K, void> & { __rowID: string }) {
+export function ExpanderCell<K extends object>({ row, __rowID }: CellProps<K, void>) {
   return (
     <div className={expanderContainerStyles}>
       <IconButton
diff --git a/packages/grafana-ui/src/components/Logs/LogRowContext.tsx b/packages/grafana-ui/src/components/Logs/LogRowContext.tsx
index ad94500bbee..b7596cf844e 100644
--- a/packages/grafana-ui/src/components/Logs/LogRowContext.tsx
+++ b/packages/grafana-ui/src/components/Logs/LogRowContext.tsx
@@ -158,13 +158,14 @@ export const LogRowContextGroup = ({
               <List
                 items={rows}
                 renderItem={(item) => {
+                  const message = typeof item === 'string' ? item : item.message ?? '';
                   return (
                     <div
                       className={css`
                         padding: 5px 0;
                       `}
                     >
-                      {typeof item === 'string' && textUtil.hasAnsiCodes(item) ? <LogMessageAnsi value={item} /> : item}
+                      {textUtil.hasAnsiCodes(message) ? <LogMessageAnsi value={message} /> : message}
                     </div>
                   );
                 }}
diff --git a/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx b/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
index 5371d1c7674..0a9c729903a 100644
--- a/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
+++ b/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
@@ -1,5 +1,4 @@
-import { fireEvent } from '@testing-library/dom';
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
diff --git a/packages/grafana-ui/src/components/Menu/hooks.test.tsx b/packages/grafana-ui/src/components/Menu/hooks.test.tsx
index 94b007a4ab7..254f41c7a8a 100644
--- a/packages/grafana-ui/src/components/Menu/hooks.test.tsx
+++ b/packages/grafana-ui/src/components/Menu/hooks.test.tsx
@@ -1,6 +1,4 @@
-import { fireEvent } from '@testing-library/dom';
-import { render, screen } from '@testing-library/react';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, fireEvent, render, renderHook, screen } from '@testing-library/react';
 import React, { createRef, KeyboardEvent, RefObject } from 'react';
 
 import { useMenuFocus } from './hooks';
diff --git a/packages/grafana-ui/src/components/Segment/Segment.tsx b/packages/grafana-ui/src/components/Segment/Segment.tsx
index fd8401c6c82..9f25ceb6243 100644
--- a/packages/grafana-ui/src/components/Segment/Segment.tsx
+++ b/packages/grafana-ui/src/components/Segment/Segment.tsx
@@ -40,6 +40,7 @@ export function Segment<T>({
 
   if (!expanded) {
     const label = isObject(value) ? value.label : value;
+    const labelAsString = label != null ? String(label) : undefined;
 
     return (
       <Label
@@ -56,7 +57,7 @@ export function Segment<T>({
                 className
               )}
             >
-              {label || placeholder}
+              {labelAsString || placeholder}
             </InlineLabel>
           )
         }
diff --git a/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx b/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx
index 5d9e90c8fbc..03011d2f08c 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx
@@ -53,6 +53,7 @@ export function SegmentAsync<T>({
 
   if (!expanded) {
     const label = isObject(value) ? value.label : value;
+    const labelAsString = label != null ? String(label) : undefined;
 
     return (
       <Label
@@ -70,7 +71,7 @@ export function SegmentAsync<T>({
                 className
               )}
             >
-              {label || placeholder}
+              {labelAsString || placeholder}
             </InlineLabel>
           )
         }
diff --git a/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx b/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
index 387555d06dc..034f01348b1 100644
--- a/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
+++ b/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
@@ -17,7 +17,7 @@ const HandleTooltip = (props: {
   children: React.ReactElement;
   visible: boolean;
   placement: 'top' | 'right';
-  tipFormatter?: (value: number) => React.ReactNode;
+  tipFormatter?: () => React.ReactNode;
 }) => {
   const { value, children, visible, placement, tipFormatter, ...restProps } = props;
 
@@ -71,6 +71,7 @@ const tooltipStyles = (theme: GrafanaTheme2) => {
       fontSize: theme.typography.bodySmall.fontSize,
       opacity: 0.9,
       padding: 3,
+      zIndex: theme.zIndex.tooltip,
     }),
   };
 };
diff --git a/packages/grafana-ui/src/components/Slider/RangeSlider.tsx b/packages/grafana-ui/src/components/Slider/RangeSlider.tsx
index 2c7b3bc1bcd..dcd0df00e16 100644
--- a/packages/grafana-ui/src/components/Slider/RangeSlider.tsx
+++ b/packages/grafana-ui/src/components/Slider/RangeSlider.tsx
@@ -51,7 +51,7 @@ export const RangeSlider = ({
       <HandleTooltip
         value={handleProps.value}
         visible={tooltipAlwaysVisible || handleProps.dragging}
-        tipFormatter={formatTooltipResult}
+        tipFormatter={formatTooltipResult ? () => formatTooltipResult(handleProps.value) : undefined}
         placement={isHorizontal ? 'top' : 'right'}
       >
         {node}
diff --git a/packages/grafana-ui/src/components/Table/utils.ts b/packages/grafana-ui/src/components/Table/utils.ts
index 3529ff42afd..6fd4d1a5b29 100644
--- a/packages/grafana-ui/src/components/Table/utils.ts
+++ b/packages/grafana-ui/src/components/Table/utils.ts
@@ -85,6 +85,8 @@ export function getColumns(
       // Make an expander cell
       Header: () => null, // No header
       id: 'expander', // It needs an ID
+      // @ts-expect-error
+      // TODO fix type error here
       Cell: RowExpander,
       width: EXPANDER_WIDTH,
       minWidth: EXPANDER_WIDTH,
@@ -124,6 +126,8 @@ export function getColumns(
 
     const Cell = getCellComponent(fieldTableOptions.cellOptions?.type, field);
     columns.push({
+      // @ts-expect-error
+      // TODO fix type error here
       Cell,
       id: fieldIndex.toString(),
       field: field,
diff --git a/packages/grafana-ui/src/themes/ThemeContext.test.tsx b/packages/grafana-ui/src/themes/ThemeContext.test.tsx
index 7e5c464a08f..7164d43a270 100644
--- a/packages/grafana-ui/src/themes/ThemeContext.test.tsx
+++ b/packages/grafana-ui/src/themes/ThemeContext.test.tsx
@@ -1,6 +1,5 @@
 import { css } from '@emotion/css';
-import { render } from '@testing-library/react';
-import { renderHook } from '@testing-library/react-hooks';
+import { render, renderHook } from '@testing-library/react';
 import React from 'react';
 
 import { mockThemeContext, useStyles2 } from './ThemeContext';
diff --git a/packages/grafana-ui/src/utils/reactUtils.ts b/packages/grafana-ui/src/utils/reactUtils.ts
index 9c4766b4eeb..9ed5b9428a2 100644
--- a/packages/grafana-ui/src/utils/reactUtils.ts
+++ b/packages/grafana-ui/src/utils/reactUtils.ts
@@ -25,14 +25,14 @@ export function getChildId(children: ReactElement): string | undefined {
  * @param props props to be passed to the function if item provided as such
  */
 export function renderOrCallToRender<TProps = {}>(
-  itemToRender: ((props?: TProps) => React.ReactNode) | React.ReactNode,
+  itemToRender: ((props: TProps) => React.ReactNode) | React.ReactNode,
   props?: TProps
 ): React.ReactNode {
   if (React.isValidElement(itemToRender) || typeof itemToRender === 'string' || typeof itemToRender === 'number') {
     return itemToRender;
   }
 
-  if (typeof itemToRender === 'function') {
+  if (typeof itemToRender === 'function' && props) {
     return itemToRender(props);
   }
 
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 202c3a7fa11..aa6567a463a 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -18,17 +18,17 @@
     "@grafana/toolkit": "10.0.0-pre",
     "@types/jest": "26.0.15",
     "@types/lodash": "4.14.149",
-    "@types/react": "17.0.30",
+    "@types/react": "18.0.28",
     "lodash": "4.17.21"
   },
   "dependencies": {
     "@grafana/data": "10.0.0-pre",
     "@grafana/ui": "10.0.0-pre",
     "jquery": "3.5.1",
-    "react": "17.0.1",
-    "react-dom": "17.0.1",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "react-hook-form": "7.5.3",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "5.3.3",
     "tslib": "2.4.0"
   }
 }
diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index 77017d0f853..715f1de4645 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -94,42 +94,40 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
     };
 
     return (
-      <React.StrictMode>
-        <Provider store={store}>
-          <ErrorBoundaryAlert style="page">
-            <GrafanaContext.Provider value={app.context}>
-              <ThemeProvider value={config.theme2}>
-                <KBarProvider
-                  actions={[]}
-                  options={{ enableHistory: true, callbacks: { onSelectAction: commandPaletteActionSelected } }}
-                >
-                  <ModalsProvider>
-                    <GlobalStyles />
-                    <div className="grafana-app">
-                      <Router history={locationService.getHistory()}>
-                        <AppChrome>
-                          {pageBanners.map((Banner, index) => (
-                            <Banner key={index.toString()} />
-                          ))}
-                          <AngularRoot />
-                          <AppNotificationList />
-                          {ready && this.renderRoutes()}
-                          {bodyRenderHooks.map((Hook, index) => (
-                            <Hook key={index.toString()} />
-                          ))}
-                        </AppChrome>
-                      </Router>
-                    </div>
-                    <LiveConnectionWarning />
-                    <ModalRoot />
-                    <PortalContainer />
-                  </ModalsProvider>
-                </KBarProvider>
-              </ThemeProvider>
-            </GrafanaContext.Provider>
-          </ErrorBoundaryAlert>
-        </Provider>
-      </React.StrictMode>
+      <Provider store={store}>
+        <ErrorBoundaryAlert style="page">
+          <GrafanaContext.Provider value={app.context}>
+            <ThemeProvider value={config.theme2}>
+              <KBarProvider
+                actions={[]}
+                options={{ enableHistory: true, callbacks: { onSelectAction: commandPaletteActionSelected } }}
+              >
+                <ModalsProvider>
+                  <GlobalStyles />
+                  <div className="grafana-app">
+                    <Router history={locationService.getHistory()}>
+                      <AppChrome>
+                        {pageBanners.map((Banner, index) => (
+                          <Banner key={index.toString()} />
+                        ))}
+                        <AngularRoot />
+                        <AppNotificationList />
+                        {ready && this.renderRoutes()}
+                        {bodyRenderHooks.map((Hook, index) => (
+                          <Hook key={index.toString()} />
+                        ))}
+                      </AppChrome>
+                    </Router>
+                  </div>
+                  <LiveConnectionWarning />
+                  <ModalRoot />
+                  <PortalContainer />
+                </ModalsProvider>
+              </KBarProvider>
+            </ThemeProvider>
+          </GrafanaContext.Provider>
+        </ErrorBoundaryAlert>
+      </Provider>
     );
   }
 }
diff --git a/public/app/angular/services/ng_react.ts b/public/app/angular/services/ng_react.ts
index 8f33ea560cf..55f7217c178 100644
--- a/public/app/angular/services/ng_react.ts
+++ b/public/app/angular/services/ng_react.ts
@@ -12,14 +12,17 @@
 import angular, { auto } from 'angular';
 import { kebabCase } from 'lodash';
 import React, { ComponentType } from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot, Root } from 'react-dom/client';
 
 // get a react component from name (components can be an angular injectable e.g. value, factory or
 // available on window
-function getReactComponent(name: string | Function, $injector: auto.IInjectorService): ComponentType {
+function getReactComponent(
+  name: string | Function,
+  $injector: auto.IInjectorService
+): ComponentType<React.PropsWithChildren<{}>> {
   // if name is a function assume it is component and return it
   if (angular.isFunction(name)) {
-    return name as unknown as ComponentType;
+    return name as unknown as ComponentType<React.PropsWithChildren<{}>>;
   }
 
   // a React component name must be specified
@@ -46,7 +49,7 @@ function getReactComponent(name: string | Function, $injector: auto.IInjectorSer
     throw Error('Cannot find react component ' + name);
   }
 
-  return reactComponent as unknown as ComponentType;
+  return reactComponent as unknown as ComponentType<React.PropsWithChildren<{}>>;
 }
 
 // wraps a function with scope.$apply, if already applied just return
@@ -140,9 +143,9 @@ function watchProps(watchDepth: string, scope: any, watchExpressions: any[], lis
 }
 
 // render React component, with scope[attrs.props] being passed in as the component props
-function renderComponent(component: any, props: object, scope: any, elem: Element[]) {
+function renderComponent(component: any, props: object, scope: any, root: Root) {
   scope.$evalAsync(() => {
-    ReactDOM.render(React.createElement(component, props), elem[0]);
+    root.render(React.createElement(component, props));
   });
 }
 
@@ -207,11 +210,12 @@ const reactComponent = ($injector: any): any => {
     link: function (scope: any, elem: Element[], attrs: any) {
       const reactComponent = getReactComponent(attrs.name, $injector);
 
+      const root = createRoot(elem[0]);
       const renderMyComponent = () => {
         const scopeProps = scope.$eval(attrs.props);
         const props = applyFunctions(scopeProps, scope);
 
-        renderComponent(reactComponent, props, scope, elem);
+        renderComponent(reactComponent, props, scope, root);
       };
 
       // If there are props, re-render when they change
@@ -220,10 +224,10 @@ const reactComponent = ($injector: any): any => {
       // cleanup when scope is destroyed
       scope.$on('$destroy', () => {
         if (!attrs.onScopeDestroy) {
-          ReactDOM.unmountComponentAtNode(elem[0]);
+          root.unmount();
         } else {
           scope.$eval(attrs.onScopeDestroy, {
-            unmountComponent: ReactDOM.unmountComponentAtNode.bind(this, elem[0]),
+            unmountComponent: root.unmount.bind(this),
           });
         }
       });
@@ -264,6 +268,7 @@ const reactDirective = ($injector: auto.IInjectorService) => {
       replace: true,
       link: function (scope: any, elem: Element[], attrs: any) {
         const reactComponent = getReactComponent(reactComponentName, $injector);
+        const root = createRoot(elem[0]);
 
         // if props is not defined, fall back to use the React component's propTypes if present
         props = props || Object.keys(reactComponent.propTypes || {});
@@ -281,7 +286,7 @@ const reactDirective = ($injector: auto.IInjectorService) => {
 
           scopeProps = applyFunctions(scopeProps, scope, config);
           scopeProps = angular.extend({}, scopeProps, injectableProps);
-          renderComponent(reactComponent, scopeProps, scope, elem);
+          renderComponent(reactComponent, scopeProps, scope, root);
         };
 
         // watch each property name and trigger an update whenever something changes,
@@ -298,10 +303,10 @@ const reactDirective = ($injector: auto.IInjectorService) => {
         // cleanup when scope is destroyed
         scope.$on('$destroy', () => {
           if (!attrs.onScopeDestroy) {
-            ReactDOM.unmountComponentAtNode(elem[0]);
+            root.unmount();
           } else {
             scope.$eval(attrs.onScopeDestroy, {
-              unmountComponent: ReactDOM.unmountComponentAtNode.bind(this, elem[0]),
+              unmountComponent: root.unmount.bind(this),
             });
           }
         });
diff --git a/public/app/app.ts b/public/app/app.ts
index 635006fd1be..8a8422f743d 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -11,7 +11,7 @@ import 'app/features/all';
 
 import _ from 'lodash'; // eslint-disable-line lodash/import-scope
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 
 import {
   locationUtil,
@@ -209,11 +209,11 @@ export class GrafanaApp {
         config,
       };
 
-      ReactDOM.render(
+      const root = createRoot(document.getElementById('reactRoot')!);
+      root.render(
         React.createElement(AppWrapper, {
           app: this,
-        }),
-        document.getElementById('reactRoot')
+        })
       );
     } catch (error) {
       console.error('Failed to start Grafana', error);
diff --git a/public/app/core/services/ModalManager.ts b/public/app/core/services/ModalManager.ts
index 92f59748d3f..1c04169bcda 100644
--- a/public/app/core/services/ModalManager.ts
+++ b/public/app/core/services/ModalManager.ts
@@ -1,5 +1,5 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 
 import { textUtil } from '@grafana/data';
 import { config, CopyPanelEvent } from '@grafana/runtime';
@@ -19,6 +19,7 @@ import { provideTheme } from '../utils/ConfigProvider';
 export class ModalManager {
   reactModalRoot = document.body;
   reactModalNode = document.createElement('div');
+  root = createRoot(this.reactModalNode);
 
   init() {
     appEvents.subscribe(ShowConfirmModalEvent, (e) => this.showConfirmModal(e.payload));
@@ -39,11 +40,11 @@ export class ModalManager {
 
     const elem = React.createElement(provideTheme(AngularModalProxy, config.theme2), modalProps);
     this.reactModalRoot.appendChild(this.reactModalNode);
-    ReactDOM.render(elem, this.reactModalNode);
+    this.root.render(elem);
   }
 
   onReactModalDismiss = () => {
-    ReactDOM.unmountComponentAtNode(this.reactModalNode);
+    this.root.render(null);
     this.reactModalRoot.removeChild(this.reactModalNode);
   };
 
@@ -96,6 +97,6 @@ export class ModalManager {
 
     const elem = React.createElement(provideTheme(AngularModalProxy, config.theme2), modalProps);
     this.reactModalRoot.appendChild(this.reactModalNode);
-    ReactDOM.render(elem, this.reactModalNode);
+    this.root.render(elem);
   }
 }
diff --git a/public/app/features/alerting/NotificationsListPage.tsx b/public/app/features/alerting/NotificationsListPage.tsx
index 6f11e260aac..5ad60b94e04 100644
--- a/public/app/features/alerting/NotificationsListPage.tsx
+++ b/public/app/features/alerting/NotificationsListPage.tsx
@@ -52,7 +52,7 @@ const NotificationsListPage: FC = () => {
   return (
     <Page navModel={navModel}>
       <Page.Contents>
-        {state.error && <p>{state.error}</p>}
+        {state.error && <p>{state.error.message}</p>}
         {!!notifications.length && (
           <>
             <div className="page-action-bar">
diff --git a/public/app/features/alerting/TestRuleResult.test.tsx b/public/app/features/alerting/TestRuleResult.test.tsx
index c62f8ace394..2fbbe94c5b0 100644
--- a/public/app/features/alerting/TestRuleResult.test.tsx
+++ b/public/app/features/alerting/TestRuleResult.test.tsx
@@ -1,4 +1,4 @@
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { PanelModel } from '../dashboard/state';
@@ -27,13 +27,15 @@ const props: React.ComponentProps<typeof TestRuleResult> = {
 };
 
 describe('TestRuleResult', () => {
-  it('should render without error', () => {
-    expect(() => render(<TestRuleResult {...props} />)).not.toThrow();
+  it('should render without error', async () => {
+    render(<TestRuleResult {...props} />);
+    await screen.findByRole('button', { name: 'Copy to Clipboard' });
   });
 
-  it('should call testRule when mounting', () => {
+  it('should call testRule when mounting', async () => {
     jest.spyOn(backendSrv, 'post');
     render(<TestRuleResult {...props} />);
+    await screen.findByRole('button', { name: 'Copy to Clipboard' });
 
     expect(backendSrv.post).toHaveBeenCalledWith(
       '/api/alerts/test',
diff --git a/public/app/features/alerting/unified/Receivers.test.tsx b/public/app/features/alerting/unified/Receivers.test.tsx
index 0877c1ff128..b311da63e17 100644
--- a/public/app/features/alerting/unified/Receivers.test.tsx
+++ b/public/app/features/alerting/unified/Receivers.test.tsx
@@ -189,7 +189,7 @@ describe('Receivers', () => {
     mocks.api.fetchConfig.mockImplementation((name) =>
       Promise.resolve(name === GRAFANA_RULES_SOURCE_NAME ? someGrafanaAlertManagerConfig : someCloudAlertManagerConfig)
     );
-    await renderReceivers();
+    renderReceivers();
 
     // check that by default grafana templates & receivers are fetched rendered in appropriate tables
     await ui.receiversTable.find();
@@ -234,7 +234,7 @@ describe('Receivers', () => {
 
     mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
 
-    await renderReceivers();
+    renderReceivers();
 
     // go to new contact point page
     await userEvent.click(await ui.newContactPointButton.find());
@@ -292,7 +292,7 @@ describe('Receivers', () => {
 
     mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
     mocks.api.updateConfig.mockResolvedValue();
-    await renderReceivers();
+    renderReceivers();
 
     // go to new contact point page
     await userEvent.click(await ui.newContactPointButton.find());
@@ -351,18 +351,19 @@ describe('Receivers', () => {
     });
   });
 
-  it('Hides create contact point button for users without permission', () => {
+  it('Hides create contact point button for users without permission', async () => {
     mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
 
     mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
     mocks.api.updateConfig.mockResolvedValue();
-    mocks.contextSrv.hasAccess.mockImplementation((action) =>
+    mocks.contextSrv.hasPermission.mockImplementation((action) =>
       [AccessControlAction.AlertingNotificationsRead, AccessControlAction.AlertingNotificationsExternalRead].some(
         (a) => a === action
       )
     );
     mocks.hooks.useGetContactPointsState.mockReturnValue(emptyContactPointsState);
     renderReceivers();
+    await ui.receiversTable.find();
 
     expect(ui.newContactPointButton.query()).not.toBeInTheDocument();
   });
@@ -372,7 +373,7 @@ describe('Receivers', () => {
 
     mocks.api.fetchConfig.mockResolvedValue(someCloudAlertManagerConfig);
     mocks.api.updateConfig.mockResolvedValue();
-    await renderReceivers('CloudManager');
+    renderReceivers('CloudManager');
 
     // click edit button for the receiver
     await ui.receiversTable.find();
@@ -404,7 +405,7 @@ describe('Receivers', () => {
     // delete a field
     await userEvent.click(byText(/Fields \(2\)/i).get(slackContainer));
     await userEvent.click(byTestId('items.1.settings.fields.0.delete-button').get());
-    await byText(/Fields \(1\)/i).get(slackContainer);
+    byText(/Fields \(1\)/i).get(slackContainer);
 
     // add another channel
     await userEvent.click(ui.newContactPointIntegrationButton.get());
@@ -470,7 +471,7 @@ describe('Receivers', () => {
       ...someCloudAlertManagerStatus,
       config: someCloudAlertManagerConfig.alertmanager_config,
     });
-    await renderReceivers(dataSources.promAlertManager.name);
+    renderReceivers(dataSources.promAlertManager.name);
 
     await ui.receiversTable.find();
     // there's no templates table for vanilla prom, API does not return templates
@@ -510,7 +511,7 @@ describe('Receivers', () => {
       alertmanager_config: {},
     });
     mocks.api.fetchStatus.mockResolvedValue(someCloudAlertManagerStatus);
-    await renderReceivers('CloudManager');
+    renderReceivers('CloudManager');
 
     // check that receiver from the default config is represented
     await ui.receiversTable.find();
@@ -530,7 +531,7 @@ describe('Receivers', () => {
     mocks.api.discoverAlertmanagerFeatures.mockResolvedValue({ lazyConfigInit: true });
     mocks.api.fetchConfig.mockRejectedValue({ message: 'alertmanager storage object not found' });
 
-    await renderReceivers('CloudManager');
+    renderReceivers('CloudManager');
 
     const templatesTable = await ui.templatesTable.find();
     const receiversTable = await ui.receiversTable.find();
@@ -588,7 +589,7 @@ describe('Receivers', () => {
       };
 
       mocks.hooks.useGetContactPointsState.mockReturnValue(receiversMock);
-      await renderReceivers();
+      renderReceivers();
 
       //
       await ui.receiversTable.find();
@@ -660,7 +661,7 @@ describe('Receivers', () => {
       };
 
       mocks.hooks.useGetContactPointsState.mockReturnValue(receiversMock);
-      await renderReceivers();
+      renderReceivers();
 
       //
       await ui.receiversTable.find();
@@ -696,7 +697,7 @@ describe('Receivers', () => {
       mocks.api.updateConfig.mockResolvedValue();
 
       mocks.hooks.useGetContactPointsState.mockReturnValue(emptyContactPointsState);
-      await renderReceivers();
+      renderReceivers();
 
       await ui.receiversTable.find();
       //should not render notification error
diff --git a/public/app/features/alerting/unified/components/notification-policies/Modals.tsx b/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
index 074ba61b7d0..b479a76c8f7 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
@@ -218,9 +218,11 @@ const useAlertGroupsModal = (): [
     setMatchers([]);
   }, []);
 
-  const handleShow = useCallback((alertGroups, matchers) => {
+  const handleShow = useCallback((alertGroups: AlertmanagerGroup[], matchers?: ObjectMatcher[]) => {
     setAlertGroups(alertGroups);
-    setMatchers(matchers);
+    if (matchers) {
+      setMatchers(matchers);
+    }
     setShowModal(true);
   }, []);
 
diff --git a/public/app/features/alerting/unified/hooks/useAlertManagerSourceName.test.tsx b/public/app/features/alerting/unified/hooks/useAlertManagerSourceName.test.tsx
index 95d8f4a29bf..2aad7ab0442 100644
--- a/public/app/features/alerting/unified/hooks/useAlertManagerSourceName.test.tsx
+++ b/public/app/features/alerting/unified/hooks/useAlertManagerSourceName.test.tsx
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 import { MemoryRouter, Router } from 'react-router-dom';
diff --git a/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx b/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
index a18f8fe3c55..f45b2bc0ffe 100644
--- a/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
+++ b/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook, waitFor } from '@testing-library/react';
 import { setupServer } from 'msw/node';
 import React from 'react';
 import { Provider } from 'react-redux';
@@ -48,15 +48,15 @@ describe('useExternalDataSourceAlertmanagers', () => {
     const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
 
     // Act
-    const { result, waitForNextUpdate } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
-    await waitForNextUpdate();
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
+    await waitFor(() => {
+      // Assert
+      const { current } = result;
 
-    // Assert
-    const { current } = result;
-
-    expect(current).toHaveLength(1);
-    expect(current[0].dataSource.uid).toBe('1');
-    expect(current[0].url).toBe('http://grafana.com');
+      expect(current).toHaveLength(1);
+      expect(current[0].dataSource.uid).toBe('1');
+      expect(current[0].url).toBe('http://grafana.com');
+    });
   });
 
   it('Should have active state if available in the activeAlertManagers', async () => {
@@ -81,15 +81,15 @@ describe('useExternalDataSourceAlertmanagers', () => {
     const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
 
     // Act
-    const { result, waitForValueToChange } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
-    await waitForValueToChange(() => result.current[0].status);
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
+    await waitFor(() => {
+      // Assert
+      const { current } = result;
 
-    // Assert
-    const { current } = result;
-
-    expect(current).toHaveLength(1);
-    expect(current[0].status).toBe('active');
-    expect(current[0].statusInconclusive).toBe(false);
+      expect(current).toHaveLength(1);
+      expect(current[0].status).toBe('active');
+      expect(current[0].statusInconclusive).toBe(false);
+    });
   });
 
   it('Should have dropped state if available in the droppedAlertManagers', async () => {
@@ -114,15 +114,16 @@ describe('useExternalDataSourceAlertmanagers', () => {
     const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
 
     // Act
-    const { result, waitForValueToChange } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
-    await waitForValueToChange(() => result.current[0].status);
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
 
-    // Assert
-    const { current } = result;
+    await waitFor(() => {
+      // Assert
+      const { current } = result;
 
-    expect(current).toHaveLength(1);
-    expect(current[0].status).toBe('dropped');
-    expect(current[0].statusInconclusive).toBe(false);
+      expect(current).toHaveLength(1);
+      expect(current[0].status).toBe('dropped');
+      expect(current[0].statusInconclusive).toBe(false);
+    });
   });
 
   it('Should have pending state if not available neither in dropped nor in active alertManagers', async () => {
@@ -147,15 +148,16 @@ describe('useExternalDataSourceAlertmanagers', () => {
     const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
 
     // Act
-    const { result, waitForNextUpdate } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
-    await waitForNextUpdate();
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
 
-    // Assert
-    const { current } = result;
+    await waitFor(() => {
+      // Assert
+      const { current } = result;
 
-    expect(current).toHaveLength(1);
-    expect(current[0].status).toBe('pending');
-    expect(current[0].statusInconclusive).toBe(false);
+      expect(current).toHaveLength(1);
+      expect(current[0].status).toBe('pending');
+      expect(current[0].statusInconclusive).toBe(false);
+    });
   });
 
   it('Should match Alertmanager url when datasource url does not have protocol specified', async () => {
@@ -180,15 +182,16 @@ describe('useExternalDataSourceAlertmanagers', () => {
     const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
 
     // Act
-    const { result, waitForValueToChange } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
-    await waitForValueToChange(() => result.current[0].status);
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
 
-    // Assert
-    const { current } = result;
+    await waitFor(() => {
+      // Assert
+      const { current } = result;
 
-    expect(current).toHaveLength(1);
-    expect(current[0].status).toBe('active');
-    expect(current[0].url).toBe('localhost:9093');
+      expect(current).toHaveLength(1);
+      expect(current[0].status).toBe('active');
+      expect(current[0].url).toBe('localhost:9093');
+    });
   });
 
   it('Should have inconclusive state when there are many Alertmanagers of the same URL', async () => {
@@ -213,16 +216,16 @@ describe('useExternalDataSourceAlertmanagers', () => {
     const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
 
     // Act
-    const { result, waitForValueToChange } = renderHook(() => useExternalDataSourceAlertmanagers(), {
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), {
       wrapper,
     });
 
-    await waitForValueToChange(() => result.current[0].status);
-
-    // Assert
-    expect(result.current).toHaveLength(1);
-    expect(result.current[0].status).toBe('active');
-    expect(result.current[0].statusInconclusive).toBe(true);
+    await waitFor(() => {
+      // Assert
+      expect(result.current).toHaveLength(1);
+      expect(result.current[0].status).toBe('active');
+      expect(result.current[0].statusInconclusive).toBe(true);
+    });
   });
 });
 
diff --git a/public/app/features/alerting/unified/hooks/useIsRuleEditable.test.tsx b/public/app/features/alerting/unified/hooks/useIsRuleEditable.test.tsx
index ee0bf681b0c..8b1705aa9d0 100644
--- a/public/app/features/alerting/unified/hooks/useIsRuleEditable.test.tsx
+++ b/public/app/features/alerting/unified/hooks/useIsRuleEditable.test.tsx
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 import React from 'react';
 import { Provider } from 'react-redux';
 
diff --git a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
index 98174a431dd..1f7432012a2 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
@@ -1,5 +1,4 @@
-import { within } from '@testing-library/dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
diff --git a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
index b4dbc4d30ea..e97c4fb589f 100644
--- a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
@@ -1,5 +1,4 @@
-import { within } from '@testing-library/dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Provider } from 'react-redux';
diff --git a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
index add18331246..2ca3aae4e00 100644
--- a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
@@ -1,5 +1,4 @@
-import { within } from '@testing-library/dom';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Provider } from 'react-redux';
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
index fc1451d8d92..842d3b6370c 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
@@ -1,4 +1,4 @@
-import { screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
@@ -311,6 +311,7 @@ describe('SharePublic - Already persisted', () => {
 
 describe('SharePublic - Report interactions', () => {
   beforeEach(() => {
+    jest.clearAllMocks();
     server.use(getExistentPublicDashboardResponse());
     server.use(
       rest.put('/api/dashboards/uid/:dashboardUid/public-dashboards/:uid', (req, res, ctx) =>
@@ -327,29 +328,41 @@ describe('SharePublic - Report interactions', () => {
 
   it('reports interaction when time range is clicked', async () => {
     await renderSharePublicDashboard();
+    await waitFor(() => {
+      expect(screen.getByTestId(selectors.EnableTimeRangeSwitch)).toBeEnabled();
+    });
     await userEvent.click(screen.getByTestId(selectors.EnableTimeRangeSwitch));
-    await waitForElementToBeRemoved(screen.getByTestId('Spinner'));
 
-    expect(reportInteraction).toHaveBeenCalledWith('grafana_dashboards_public_time_selection_clicked', {
-      action: pubdashResponse.timeSelectionEnabled ? 'disable' : 'enable',
+    await waitFor(() => {
+      expect(reportInteraction).toHaveBeenCalledWith('grafana_dashboards_public_time_selection_clicked', {
+        action: pubdashResponse.timeSelectionEnabled ? 'disable' : 'enable',
+      });
     });
   });
   it('reports interaction when show annotations is clicked', async () => {
     await renderSharePublicDashboard();
+    await waitFor(() => {
+      expect(screen.getByTestId(selectors.EnableAnnotationsSwitch)).toBeEnabled();
+    });
     await userEvent.click(screen.getByTestId(selectors.EnableAnnotationsSwitch));
-    await waitForElementToBeRemoved(screen.getByTestId('Spinner'));
 
-    expect(reportInteraction).toHaveBeenCalledWith('grafana_dashboards_public_annotations_clicked', {
-      action: pubdashResponse.annotationsEnabled ? 'disable' : 'enable',
+    await waitFor(() => {
+      expect(reportInteraction).toHaveBeenCalledWith('grafana_dashboards_public_annotations_clicked', {
+        action: pubdashResponse.annotationsEnabled ? 'disable' : 'enable',
+      });
     });
   });
   it('reports interaction when pause is clicked', async () => {
     await renderSharePublicDashboard();
+    await waitFor(() => {
+      expect(screen.getByTestId(selectors.PauseSwitch)).toBeEnabled();
+    });
     await userEvent.click(screen.getByTestId(selectors.PauseSwitch));
-    await waitForElementToBeRemoved(screen.getByTestId('Spinner'));
 
-    expect(reportInteraction).toHaveBeenCalledWith('grafana_dashboards_public_enable_clicked', {
-      action: pubdashResponse.isEnabled ? 'disable' : 'enable',
+    await waitFor(() => {
+      expect(reportInteraction).toHaveBeenCalledWith('grafana_dashboards_public_enable_clicked', {
+        action: pubdashResponse.isEnabled ? 'disable' : 'enable',
+      });
     });
   });
 });
diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx
index 89ac8c23743..27ea636e6cc 100644
--- a/public/app/features/dashboard/containers/DashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import { Provider } from 'react-redux';
 import { match, Router } from 'react-router-dom';
@@ -66,16 +66,6 @@ jest.mock('react-virtualized-auto-sizer', () => {
   return ({ children }: AutoSizerProps) => children({ height: 1, width: 1 });
 });
 
-interface ScenarioContext {
-  dashboard?: DashboardModel | null;
-  container?: HTMLElement;
-  mount: (propOverrides?: Partial<Props>) => void;
-  unmount: () => void;
-  props: Props;
-  rerender: (propOverrides?: Partial<Props>) => void;
-  setup: (fn: () => void) => void;
-}
-
 function getTestDashboard(overrides?: Partial<Dashboard>, metaOverrides?: Partial<DashboardMeta>): DashboardModel {
   const data = Object.assign(
     {
@@ -95,123 +85,98 @@ function getTestDashboard(overrides?: Partial<Dashboard>, metaOverrides?: Partia
   return createDashboardModelFixture(data, metaOverrides);
 }
 
-function dashboardPageScenario(description: string, scenarioFn: (ctx: ScenarioContext) => void) {
-  describe(description, () => {
-    let setupFn: () => void;
+const mockInitDashboard = jest.fn();
+const mockCleanUpDashboardAndVariables = jest.fn();
 
-    const ctx: ScenarioContext = {
-      setup: (fn) => {
-        setupFn = fn;
-      },
-      mount: (propOverrides?: Partial<Props>) => {
-        config.bootData.navTree = [
-          { text: 'Dashboards', id: 'dashboards' },
-          { text: 'Home', id: HOME_NAV_ID },
-        ];
+function setup(propOverrides?: Partial<Props>) {
+  config.bootData.navTree = [
+    { text: 'Dashboards', id: 'dashboards' },
+    { text: 'Home', id: HOME_NAV_ID },
+  ];
 
-        const store = configureStore();
-        const props: Props = {
-          ...getRouteComponentProps({
-            match: { params: { slug: 'my-dash', uid: '11' } } as unknown as match,
-            route: { routeName: DashboardRoutes.Normal } as RouteDescriptor,
-          }),
-          navIndex: {
-            dashboards: { text: 'Dashboards', id: 'dashboards', parentItem: { text: 'Home', id: HOME_NAV_ID } },
-            [HOME_NAV_ID]: { text: 'Home', id: HOME_NAV_ID },
-          },
-          initPhase: DashboardInitPhase.NotStarted,
-          initError: null,
-          initDashboard: jest.fn(),
-          notifyApp: mockToolkitActionCreator(notifyApp),
-          cleanUpDashboardAndVariables: jest.fn(),
-          cancelVariables: jest.fn(),
-          templateVarsChangedInUrl: jest.fn(),
-          dashboard: null,
-          theme: createTheme(),
-        };
+  const store = configureStore();
+  const props: Props = {
+    ...getRouteComponentProps({
+      match: { params: { slug: 'my-dash', uid: '11' } } as unknown as match,
+      route: { routeName: DashboardRoutes.Normal } as RouteDescriptor,
+    }),
+    navIndex: {
+      dashboards: { text: 'Dashboards', id: 'dashboards', parentItem: { text: 'Home', id: HOME_NAV_ID } },
+      [HOME_NAV_ID]: { text: 'Home', id: HOME_NAV_ID },
+    },
+    initPhase: DashboardInitPhase.NotStarted,
+    initError: null,
+    initDashboard: mockInitDashboard,
+    notifyApp: mockToolkitActionCreator(notifyApp),
+    cleanUpDashboardAndVariables: mockCleanUpDashboardAndVariables,
+    cancelVariables: jest.fn(),
+    templateVarsChangedInUrl: jest.fn(),
+    dashboard: null,
+    theme: createTheme(),
+  };
 
-        Object.assign(props, propOverrides);
+  Object.assign(props, propOverrides);
 
-        ctx.props = props;
-        ctx.dashboard = props.dashboard;
+  const context = getGrafanaContextMock();
 
-        const context = getGrafanaContextMock();
+  const { unmount, rerender } = render(
+    <GrafanaContext.Provider value={context}>
+      <Provider store={store}>
+        <Router history={locationService.getHistory()}>
+          <UnthemedDashboardPage {...props} />
+        </Router>
+      </Provider>
+    </GrafanaContext.Provider>
+  );
 
-        const { container, rerender, unmount } = render(
-          <GrafanaContext.Provider value={context}>
-            <Provider store={store}>
-              <Router history={locationService.getHistory()}>
-                <UnthemedDashboardPage {...props} />
-              </Router>
-            </Provider>
-          </GrafanaContext.Provider>
-        );
+  const wrappedRerender = (newProps: Partial<Props>) => {
+    Object.assign(props, newProps);
+    return rerender(
+      <GrafanaContext.Provider value={context}>
+        <Provider store={store}>
+          <Router history={locationService.getHistory()}>
+            <UnthemedDashboardPage {...props} />
+          </Router>
+        </Provider>
+      </GrafanaContext.Provider>
+    );
+  };
 
-        ctx.container = container;
-
-        ctx.rerender = (newProps?: Partial<Props>) => {
-          Object.assign(props, newProps);
-
-          rerender(
-            <GrafanaContext.Provider value={context}>
-              <Provider store={store}>
-                <Router history={locationService.getHistory()}>
-                  <UnthemedDashboardPage {...props} />
-                </Router>
-              </Provider>
-            </GrafanaContext.Provider>
-          );
-        };
-
-        ctx.unmount = unmount;
-      },
-      props: {} as Props,
-      rerender: () => {},
-      unmount: () => {},
-    };
-
-    beforeEach(() => {
-      setupFn();
-    });
-
-    scenarioFn(ctx);
-  });
+  return { rerender: wrappedRerender, unmount };
 }
 
 describe('DashboardPage', () => {
-  dashboardPageScenario('Given initial state', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('Should call initDashboard on mount', () => {
+    setup();
+    expect(mockInitDashboard).toBeCalledWith({
+      fixUrl: true,
+      routeName: 'normal-dashboard',
+      urlSlug: 'my-dash',
+      urlUid: '11',
+      keybindingSrv: expect.anything(),
+    });
+  });
+
+  describe('Given a simple dashboard', () => {
+    it('Should render panels', async () => {
+      setup({ dashboard: getTestDashboard() });
+      expect(await screen.findByText('My panel title')).toBeInTheDocument();
     });
 
-    it('Should call initDashboard on mount', () => {
-      expect(ctx.props.initDashboard).toBeCalledWith({
-        fixUrl: true,
-        routeName: 'normal-dashboard',
-        urlSlug: 'my-dash',
-        urlUid: '11',
-        keybindingSrv: expect.anything(),
+    it('Should update title', async () => {
+      setup({ dashboard: getTestDashboard() });
+      await waitFor(() => {
+        expect(document.title).toBe('My dashboard - Dashboards - Grafana');
       });
     });
   });
 
-  dashboardPageScenario('Given a simple dashboard', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
-      ctx.rerender({ dashboard: getTestDashboard() });
-    });
-
-    it('Should render panels', () => {
-      expect(screen.getByText('My panel title')).toBeInTheDocument();
-    });
-
-    it('Should update title', () => {
-      expect(document.title).toBe('My dashboard - Dashboards - Grafana');
-    });
-  });
-
-  dashboardPageScenario('When going into view mode', (ctx) => {
-    ctx.setup(() => {
+  describe('When going into view mode', () => {
+    beforeEach(() => {
       setDataSourceSrv({
         get: jest.fn().mockResolvedValue({ getRef: jest.fn(), query: jest.fn().mockResolvedValue([]) }),
         getInstanceSettings: jest.fn().mockReturnValue({ meta: {} }),
@@ -221,101 +186,110 @@ describe('DashboardPage', () => {
       setDashboardSrv({
         getCurrent: () => getTestDashboard(),
       } as DashboardSrv);
-      ctx.mount({
-        dashboard: getTestDashboard(),
+    });
+
+    it('Should render panel in view mode', async () => {
+      const dashboard = getTestDashboard();
+      setup({
+        dashboard,
         queryParams: { viewPanel: '1' },
       });
+      await waitFor(() => {
+        expect(dashboard.panelInView).toBeDefined();
+        expect(dashboard.panels[0].isViewing).toBe(true);
+      });
     });
 
-    it('Should render panel in view mode', () => {
-      expect(ctx.dashboard?.panelInView).toBeDefined();
-      expect(ctx.dashboard?.panels[0].isViewing).toBe(true);
-    });
+    it('Should reset state when leaving', async () => {
+      const dashboard = getTestDashboard();
+      const { rerender } = setup({
+        dashboard,
+        queryParams: { viewPanel: '1' },
+      });
+      rerender({ queryParams: {}, dashboard });
 
-    it('Should reset state when leaving', () => {
-      ctx.rerender({ queryParams: {} });
-
-      expect(ctx.dashboard?.panelInView).toBeUndefined();
-      expect(ctx.dashboard?.panels[0].isViewing).toBe(false);
+      await waitFor(() => {
+        expect(dashboard.panelInView).toBeUndefined();
+        expect(dashboard.panels[0].isViewing).toBe(false);
+      });
     });
   });
 
-  dashboardPageScenario('When going into edit mode', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount({
-        dashboard: getTestDashboard(),
+  describe('When going into edit mode', () => {
+    it('Should render panel in edit mode', async () => {
+      const dashboard = getTestDashboard();
+      setup({
+        dashboard,
         queryParams: { editPanel: '1' },
       });
+      await waitFor(() => {
+        expect(dashboard.panelInEdit).toBeDefined();
+      });
     });
 
-    it('Should render panel in edit mode', () => {
-      expect(ctx.dashboard?.panelInEdit).toBeDefined();
+    it('Should render panel editor', async () => {
+      const dashboard = getTestDashboard();
+      setup({
+        dashboard,
+        queryParams: { editPanel: '1' },
+      });
+      expect(await screen.findByTitle('Apply changes and go back to dashboard')).toBeInTheDocument();
     });
 
-    it('Should render panel editor', () => {
-      expect(screen.getByTitle('Apply changes and go back to dashboard')).toBeInTheDocument();
-    });
-
-    it('Should reset state when leaving', () => {
-      ctx.rerender({ queryParams: {} });
-      expect(screen.queryByTitle('Apply changes and go back to dashboard')).not.toBeInTheDocument();
+    it('Should reset state when leaving', async () => {
+      const dashboard = getTestDashboard();
+      const { rerender } = setup({
+        dashboard,
+        queryParams: { editPanel: '1' },
+      });
+      rerender({ queryParams: {} });
+      await waitFor(() => {
+        expect(screen.queryByTitle('Apply changes and go back to dashboard')).not.toBeInTheDocument();
+      });
     });
   });
 
-  dashboardPageScenario('When dashboard unmounts', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
-      ctx.rerender({ dashboard: getTestDashboard() });
-      ctx.unmount();
-    });
-
-    it('Should call close action', () => {
-      expect(ctx.props.cleanUpDashboardAndVariables).toHaveBeenCalledTimes(1);
+  describe('When dashboard unmounts', () => {
+    it('Should call close action', async () => {
+      const { rerender, unmount } = setup();
+      rerender({ dashboard: getTestDashboard() });
+      unmount();
+      await waitFor(() => {
+        expect(mockCleanUpDashboardAndVariables).toHaveBeenCalledTimes(1);
+      });
     });
   });
 
-  dashboardPageScenario('When dashboard changes', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
-      ctx.rerender({ dashboard: getTestDashboard() });
-      ctx.rerender({
-        match: {
-          params: { uid: 'new-uid' },
-        } as unknown as match,
+  describe('When dashboard changes', () => {
+    it('Should call clean up action and init', async () => {
+      const { rerender } = setup();
+      rerender({ dashboard: getTestDashboard() });
+      rerender({
+        match: { params: { uid: 'new-uid' } } as unknown as match,
         dashboard: getTestDashboard({ title: 'Another dashboard' }),
       });
-    });
-
-    it('Should call clean up action and init', () => {
-      expect(ctx.props.cleanUpDashboardAndVariables).toHaveBeenCalledTimes(1);
-      expect(ctx.props.initDashboard).toHaveBeenCalledTimes(2);
-    });
-  });
-
-  dashboardPageScenario('No kiosk mode tv', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount({ dashboard: getTestDashboard() });
-      ctx.rerender({ dashboard: ctx.dashboard });
-    });
-
-    it('should render dashboard page toolbar and submenu', () => {
-      expect(screen.queryAllByTestId(selectors.pages.Dashboard.DashNav.navV2)).toHaveLength(1);
-      expect(screen.queryAllByLabelText(selectors.pages.Dashboard.SubMenu.submenu)).toHaveLength(1);
-    });
-  });
-
-  dashboardPageScenario('When in full kiosk mode', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount({
-        queryParams: { kiosk: true },
-        dashboard: getTestDashboard(),
+      await waitFor(() => {
+        expect(mockCleanUpDashboardAndVariables).toHaveBeenCalledTimes(1);
+        expect(mockInitDashboard).toHaveBeenCalledTimes(2);
       });
-      ctx.rerender({ dashboard: ctx.dashboard });
     });
+  });
 
-    it('should not render page toolbar and submenu', () => {
-      expect(screen.queryAllByTestId(selectors.pages.Dashboard.DashNav.navV2)).toHaveLength(0);
-      expect(screen.queryAllByLabelText(selectors.pages.Dashboard.SubMenu.submenu)).toHaveLength(0);
+  describe('No kiosk mode tv', () => {
+    it('should render dashboard page toolbar and submenu', async () => {
+      setup({ dashboard: getTestDashboard() });
+      expect(await screen.findAllByTestId(selectors.pages.Dashboard.DashNav.navV2)).toHaveLength(1);
+      expect(screen.getAllByLabelText(selectors.pages.Dashboard.SubMenu.submenu)).toHaveLength(1);
+    });
+  });
+
+  describe('When in full kiosk mode', () => {
+    it('should not render page toolbar and submenu', async () => {
+      setup({ dashboard: getTestDashboard(), queryParams: { kiosk: true } });
+      await waitFor(() => {
+        expect(screen.queryAllByTestId(selectors.pages.Dashboard.DashNav.navV2)).toHaveLength(0);
+        expect(screen.queryAllByLabelText(selectors.pages.Dashboard.SubMenu.submenu)).toHaveLength(0);
+      });
     });
   });
 });
diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
index 86d3315db95..df4ad02b0b7 100644
--- a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
@@ -1,4 +1,4 @@
-import { render, RenderResult, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import { Provider } from 'react-redux';
 import { Router } from 'react-router-dom';
@@ -48,29 +48,27 @@ jest.mock('app/types', () => ({
   useDispatch: () => jest.fn(),
 }));
 
-interface ScenarioContext {
-  mount: () => void;
-  rerender: ({
-    propOverrides,
-    newState,
-  }: {
-    propOverrides?: Partial<Props>;
-    newState?: Partial<appTypes.StoreState>;
-  }) => void;
-  setup: (fn: () => void) => void;
-}
-
-const renderWithProvider = ({
-  props,
-  initialState,
-}: {
-  props: Props;
-  initialState?: Partial<appTypes.StoreState>;
-}): RenderResult => {
+const setup = (propOverrides?: Partial<Props>, initialState?: Partial<appTypes.StoreState>) => {
   const context = getGrafanaContextMock();
   const store = configureStore(initialState);
 
-  return render(
+  const props: Props = {
+    ...getRouteComponentProps({
+      match: { params: { accessToken: 'an-access-token' }, isExact: true, url: '', path: '' },
+      route: {
+        routeName: DashboardRoutes.Public,
+        path: '/public-dashboards/:accessToken',
+        component: SafeDynamicImport(
+          () =>
+            import(/* webpackChunkName: "PublicDashboardPage"*/ 'app/features/dashboard/containers/PublicDashboardPage')
+        ),
+      },
+    }),
+  };
+
+  Object.assign(props, propOverrides);
+
+  const { unmount, rerender } = render(
     <GrafanaContext.Provider value={context}>
       <Provider store={store}>
         <Router history={locationService.getHistory()}>
@@ -79,6 +77,21 @@ const renderWithProvider = ({
       </Provider>
     </GrafanaContext.Provider>
   );
+
+  const wrappedRerender = (newProps: Partial<Props>) => {
+    Object.assign(props, newProps);
+    return rerender(
+      <GrafanaContext.Provider value={context}>
+        <Provider store={store}>
+          <Router history={locationService.getHistory()}>
+            <PublicDashboardPage {...props} />
+          </Router>
+        </Provider>
+      </GrafanaContext.Provider>
+    );
+  };
+
+  return { rerender: wrappedRerender, unmount };
 };
 
 const selectors = e2eSelectors.components;
@@ -110,185 +123,114 @@ const getTestDashboard = (overrides?: Partial<Dashboard>, metaOverrides?: Partia
   return new DashboardModel(data, metaOverrides);
 };
 
-function dashboardPageScenario(description: string, scenarioFn: (ctx: ScenarioContext) => void) {
-  describe(description, () => {
-    let setupFn: () => void;
+describe('PublicDashboardPage', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
 
-    const ctx: ScenarioContext = {
-      setup: (fn) => {
-        setupFn = fn;
+  it('Should call initDashboard on mount', () => {
+    setup();
+    expect(initDashboard).toBeCalledWith({
+      fixUrl: false,
+      accessToken: 'an-access-token',
+      routeName: 'public-dashboard',
+      keybindingSrv: expect.anything(),
+    });
+  });
+
+  describe('Given a simple public dashboard', () => {
+    const newState = {
+      dashboard: {
+        getModel: getTestDashboard,
+        initError: null,
+        initPhase: DashboardInitPhase.Completed,
+        permissions: [],
       },
-      mount: () => {
-        const props: Props = {
-          ...getRouteComponentProps({
-            match: { params: { accessToken: 'an-access-token' }, isExact: true, url: '', path: '' },
-            route: {
-              routeName: DashboardRoutes.Public,
-              path: '/public-dashboards/:accessToken',
-              component: SafeDynamicImport(
-                () =>
-                  import(
-                    /* webpackChunkName: "PublicDashboardPage"*/ 'app/features/dashboard/containers/PublicDashboardPage'
-                  )
-              ),
-            },
-          }),
-        };
-
-        const { rerender } = renderWithProvider({ props });
-
-        ctx.rerender = ({
-          propsOverride,
-          newState,
-        }: {
-          propsOverride?: Partial<Props>;
-          newState?: Partial<appTypes.StoreState>;
-        }) => {
-          Object.assign(props, propsOverride);
-
-          const context = getGrafanaContextMock();
-          const store = configureStore(newState);
-
-          rerender(
-            <GrafanaContext.Provider value={context}>
-              <Provider store={store}>
-                <Router history={locationService.getHistory()}>
-                  <PublicDashboardPage {...props} />
-                </Router>
-              </Provider>
-            </GrafanaContext.Provider>
-          );
-        };
-      },
-      rerender: () => {},
     };
 
-    beforeEach(() => {
-      setupFn();
+    it('Should render panels', async () => {
+      setup(undefined, newState);
+      expect(await screen.findByText('My panel title')).toBeInTheDocument();
     });
 
-    scenarioFn(ctx);
-  });
-}
-
-describe('PublicDashboardPage', () => {
-  dashboardPageScenario('Given initial state', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
+    it('Should update title', async () => {
+      setup(undefined, newState);
+      await waitFor(() => {
+        expect(document.title).toBe('My dashboard - Grafana');
+      });
     });
 
-    it('Should call initDashboard on mount', () => {
-      expect(initDashboard).toBeCalledWith({
-        fixUrl: false,
-        accessToken: 'an-access-token',
-        routeName: 'public-dashboard',
-        keybindingSrv: expect.anything(),
+    it('Should not render neither time range nor refresh picker buttons', async () => {
+      setup(undefined, newState);
+      await waitFor(() => {
+        expect(screen.queryByTestId(selectors.TimePicker.openButton)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(selectors.RefreshPicker.runButtonV2)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(selectors.RefreshPicker.intervalButtonV2)).not.toBeInTheDocument();
+      });
+    });
+
+    it('Should not render paused or deleted screen', async () => {
+      setup(undefined, newState);
+      await waitFor(() => {
+        expect(screen.queryByTestId(publicDashboardSelector.NotAvailable.container)).not.toBeInTheDocument();
       });
     });
   });
 
-  dashboardPageScenario('Given a simple public dashboard', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
-      ctx.rerender({
-        newState: {
-          dashboard: {
-            getModel: getTestDashboard,
-            initError: null,
-            initPhase: DashboardInitPhase.Completed,
-            permissions: [],
-          },
+  describe('Given a public dashboard with time range enabled', () => {
+    it('Should render time range and refresh picker buttons', async () => {
+      setup(undefined, {
+        dashboard: {
+          getModel: () =>
+            getTestDashboard({
+              timepicker: { hidden: false, collapse: false, enable: true, refresh_intervals: [], time_options: [] },
+            }),
+          initError: null,
+          initPhase: DashboardInitPhase.Completed,
+          permissions: [],
         },
       });
-    });
-
-    it('Should render panels', () => {
-      expect(screen.getByText('My panel title')).toBeInTheDocument();
-    });
-
-    it('Should update title', () => {
-      expect(document.title).toBe('My dashboard - Grafana');
-    });
-
-    it('Should not render neither time range nor refresh picker buttons', () => {
-      expect(screen.queryByTestId(selectors.TimePicker.openButton)).not.toBeInTheDocument();
-      expect(screen.queryByTestId(selectors.RefreshPicker.runButtonV2)).not.toBeInTheDocument();
-      expect(screen.queryByTestId(selectors.RefreshPicker.intervalButtonV2)).not.toBeInTheDocument();
-    });
-
-    it('Should not render paused or deleted screen', () => {
-      expect(screen.queryByTestId(publicDashboardSelector.NotAvailable.container)).not.toBeInTheDocument();
-    });
-  });
-
-  dashboardPageScenario('Given a public dashboard with time range enabled', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
-      ctx.rerender({
-        newState: {
-          dashboard: {
-            getModel: () =>
-              getTestDashboard({
-                timepicker: { hidden: false, collapse: false, enable: true, refresh_intervals: [], time_options: [] },
-              }),
-            initError: null,
-            initPhase: DashboardInitPhase.Completed,
-            permissions: [],
-          },
-        },
-      });
-    });
-
-    it('Should render time range and refresh picker buttons', () => {
-      expect(screen.getByTestId(selectors.TimePicker.openButton)).toBeInTheDocument();
+      expect(await screen.findByTestId(selectors.TimePicker.openButton)).toBeInTheDocument();
       expect(screen.getByTestId(selectors.RefreshPicker.runButtonV2)).toBeInTheDocument();
       expect(screen.getByTestId(selectors.RefreshPicker.intervalButtonV2)).toBeInTheDocument();
     });
   });
 
-  dashboardPageScenario('Given paused public dashboard', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
-      ctx.rerender({
-        newState: {
-          dashboard: {
-            getModel: () => getTestDashboard(undefined, { publicDashboardEnabled: false, dashboardNotFound: false }),
-            initError: null,
-            initPhase: DashboardInitPhase.Completed,
-            permissions: [],
-          },
+  describe('Given paused public dashboard', () => {
+    it('Should render public dashboard paused screen', async () => {
+      setup(undefined, {
+        dashboard: {
+          getModel: () => getTestDashboard(undefined, { publicDashboardEnabled: false, dashboardNotFound: false }),
+          initError: null,
+          initPhase: DashboardInitPhase.Completed,
+          permissions: [],
         },
       });
-    });
-
-    it('Should render public dashboard paused screen', () => {
-      expect(screen.queryByTestId(publicDashboardSelector.page)).not.toBeInTheDocument();
 
+      await waitFor(() => {
+        expect(screen.queryByTestId(publicDashboardSelector.page)).not.toBeInTheDocument();
+      });
       expect(screen.getByTestId(publicDashboardSelector.NotAvailable.title)).toBeInTheDocument();
       expect(screen.getByTestId(publicDashboardSelector.NotAvailable.pausedDescription)).toBeInTheDocument();
     });
   });
 
-  dashboardPageScenario('Given deleted public dashboard', (ctx) => {
-    ctx.setup(() => {
-      ctx.mount();
-      ctx.rerender({
-        newState: {
-          dashboard: {
-            getModel: () => getTestDashboard(undefined, { dashboardNotFound: true }),
-            initError: null,
-            initPhase: DashboardInitPhase.Completed,
-            permissions: [],
-          },
+  describe('Given deleted public dashboard', () => {
+    it('Should render public dashboard deleted screen', async () => {
+      setup(undefined, {
+        dashboard: {
+          getModel: () => getTestDashboard(undefined, { dashboardNotFound: true }),
+          initError: null,
+          initPhase: DashboardInitPhase.Completed,
+          permissions: [],
         },
       });
-    });
-
-    it('Should render public dashboard deleted screen', () => {
-      expect(screen.queryByTestId(publicDashboardSelector.page)).not.toBeInTheDocument();
 
+      await waitFor(() => {
+        expect(screen.queryByTestId(publicDashboardSelector.page)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(publicDashboardSelector.NotAvailable.pausedDescription)).not.toBeInTheDocument();
+      });
       expect(screen.getByTestId(publicDashboardSelector.NotAvailable.title)).toBeInTheDocument();
-      expect(screen.queryByTestId(publicDashboardSelector.NotAvailable.pausedDescription)).not.toBeInTheDocument();
     });
   });
 });
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
index 06b8208a2cd..853391201a0 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
@@ -8,9 +8,10 @@ import { DashboardModel } from '../state';
 import { createDashboardModelFixture } from '../state/__fixtures__/dashboardFixtures';
 
 import { DashboardGrid, Props } from './DashboardGrid';
+import { Props as LazyLoaderProps } from './LazyLoader';
 
 jest.mock('app/features/dashboard/dashgrid/LazyLoader', () => {
-  const LazyLoader = ({ children }: React.PropsWithChildren<{}>) => {
+  const LazyLoader = ({ children }: LazyLoaderProps) => {
     return <>{children}</>;
   };
   return { LazyLoader };
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index d9731a1fb49..3e6a31f5b5a 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -71,7 +71,7 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
     }
   };
 
-  renderPanel = (isInView: boolean) => {
+  renderPanel = ({ isInView }: { isInView: boolean }) => {
     const { dashboard, panel, isViewing, isEditing, width, height, plugin, timezone, hideMenu } = this.props;
 
     if (!plugin) {
@@ -118,7 +118,7 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
         {this.renderPanel}
       </LazyLoader>
     ) : (
-      this.renderPanel(true)
+      this.renderPanel({ isInView: true })
     );
   }
 }
diff --git a/public/app/features/dashboard/dashgrid/LazyLoader.tsx b/public/app/features/dashboard/dashgrid/LazyLoader.tsx
index da9339e5459..1170d2fb0c0 100644
--- a/public/app/features/dashboard/dashgrid/LazyLoader.tsx
+++ b/public/app/features/dashboard/dashgrid/LazyLoader.tsx
@@ -55,7 +55,9 @@ LazyLoader.addCallback = (id: string, c: (e: IntersectionObserverEntry) => void)
 LazyLoader.observer = new IntersectionObserver(
   (entries) => {
     for (const entry of entries) {
-      LazyLoader.callbacks[entry.target.id](entry);
+      if (LazyLoader.callbacks[entry.target.id]) {
+        LazyLoader.callbacks[entry.target.id](entry);
+      }
     }
   },
   { rootMargin: '100px' }
diff --git a/public/app/features/datasources/components/DataSourceTestingStatus.tsx b/public/app/features/datasources/components/DataSourceTestingStatus.tsx
index 43d67e578fd..ba2b43abf3e 100644
--- a/public/app/features/datasources/components/DataSourceTestingStatus.tsx
+++ b/public/app/features/datasources/components/DataSourceTestingStatus.tsx
@@ -26,7 +26,7 @@ export function DataSourceTestingStatus({ testingStatus }: Props) {
             <>
               {detailsMessage}
               {detailsVerboseMessage ? (
-                <details style={{ whiteSpace: 'pre-wrap' }}>{detailsVerboseMessage}</details>
+                <details style={{ whiteSpace: 'pre-wrap' }}>{String(detailsVerboseMessage)}</details>
               ) : null}
             </>
           )}
diff --git a/public/app/features/explore/ExplorePaneContainer.tsx b/public/app/features/explore/ExplorePaneContainer.tsx
index 1edae84625e..9744d8a07fd 100644
--- a/public/app/features/explore/ExplorePaneContainer.tsx
+++ b/public/app/features/explore/ExplorePaneContainer.tsx
@@ -110,9 +110,9 @@ class ExplorePaneContainerUnconnected extends React.PureComponent<Props> {
               rootDatasourceOverride = changeDatasourceUid;
               const datasource = await getDatasourceSrv().get(changeDatasourceUid);
               const datasourceInit = await getDatasourceSrv().get(initialDatasource);
-              await this.props.importQueries(exploreId, queries, datasourceInit, datasource);
+              const newQueries = await this.props.importQueries(exploreId, queries, datasourceInit, datasource);
               await this.props.stateSave({ replace: true });
-              queries = this.props.initialQueries;
+              queries = newQueries ?? this.props.initialQueries;
             }
           }
         }
diff --git a/public/app/features/explore/TraceView/useChildrenState.test.ts b/public/app/features/explore/TraceView/useChildrenState.test.ts
index ab462c1ec48..7b17d67eaaf 100644
--- a/public/app/features/explore/TraceView/useChildrenState.test.ts
+++ b/public/app/features/explore/TraceView/useChildrenState.test.ts
@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
 
 import { TraceSpan } from './components';
 import { useChildrenState } from './useChildrenState';
diff --git a/public/app/features/explore/TraceView/useDetailState.test.ts b/public/app/features/explore/TraceView/useDetailState.test.ts
index e9454bd1091..cbf9066369c 100644
--- a/public/app/features/explore/TraceView/useDetailState.test.ts
+++ b/public/app/features/explore/TraceView/useDetailState.test.ts
@@ -1,4 +1,4 @@
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@testing-library/react';
 
 import { DataFrame } from '@grafana/data';
 
diff --git a/public/app/features/explore/TraceView/useHoverIndentGuide.test.ts b/public/app/features/explore/TraceView/useHoverIndentGuide.test.ts
index e3a16ce351d..91cba83433a 100644
--- a/public/app/features/explore/TraceView/useHoverIndentGuide.test.ts
+++ b/public/app/features/explore/TraceView/useHoverIndentGuide.test.ts
@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
 
 import { useHoverIndentGuide } from './useHoverIndentGuide';
 
diff --git a/public/app/features/explore/TraceView/useSearch.test.ts b/public/app/features/explore/TraceView/useSearch.test.ts
index a4a0f537172..ffe7314f38a 100644
--- a/public/app/features/explore/TraceView/useSearch.test.ts
+++ b/public/app/features/explore/TraceView/useSearch.test.ts
@@ -1,4 +1,4 @@
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@testing-library/react';
 
 import { TraceSpan } from './components';
 import { useSearch } from './useSearch';
diff --git a/public/app/features/explore/TraceView/useViewRange.test.ts b/public/app/features/explore/TraceView/useViewRange.test.ts
index 8212c5b05cd..3d53379e717 100644
--- a/public/app/features/explore/TraceView/useViewRange.test.ts
+++ b/public/app/features/explore/TraceView/useViewRange.test.ts
@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
 
 import { useViewRange } from './useViewRange';
 
diff --git a/public/app/features/explore/spec/helper/setup.tsx b/public/app/features/explore/spec/helper/setup.tsx
index 1c163dcbeda..eff78133d9d 100644
--- a/public/app/features/explore/spec/helper/setup.tsx
+++ b/public/app/features/explore/spec/helper/setup.tsx
@@ -1,5 +1,4 @@
-import { within } from '@testing-library/dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen, within } from '@testing-library/react';
 import { fromPairs } from 'lodash';
 import React from 'react';
 import { Provider } from 'react-redux';
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 23722794c2a..961eb74c0c3 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -339,7 +339,7 @@ export const importQueries = (
   sourceDataSource: DataSourceApi | undefined | null,
   targetDataSource: DataSourceApi,
   singleQueryChangeRef?: string // when changing one query DS to another in a mixed environment, we do not want to change all queries, just the one being changed
-): ThunkResult<Promise<void>> => {
+): ThunkResult<Promise<DataQuery[] | void>> => {
   return async (dispatch) => {
     if (!sourceDataSource) {
       // explore not initialized
@@ -396,6 +396,7 @@ export const importQueries = (
     }
 
     dispatch(queriesImportedAction({ exploreId, queries: nextQueries }));
+    return nextQueries;
   };
 };
 
diff --git a/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.test.tsx b/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.test.tsx
index c1686b83c7d..3adc501b882 100644
--- a/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.test.tsx
+++ b/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.test.tsx
@@ -1,5 +1,4 @@
-import { within } from '@testing-library/dom';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
diff --git a/public/app/features/logs/components/LogRowContext.tsx b/public/app/features/logs/components/LogRowContext.tsx
index 1e8a98bb7eb..53bb0cf0a99 100644
--- a/public/app/features/logs/components/LogRowContext.tsx
+++ b/public/app/features/logs/components/LogRowContext.tsx
@@ -357,7 +357,11 @@ export const LogRowContextGroup = ({
                         padding: 5px 0;
                       `}
                     >
-                      {typeof item === 'string' && textUtil.hasAnsiCodes(item) ? <LogMessageAnsi value={item} /> : item}
+                      {typeof item === 'string' && textUtil.hasAnsiCodes(item) ? (
+                        <LogMessageAnsi value={item} />
+                      ) : (
+                        String(item)
+                      )}
                     </div>
                   );
                 }}
diff --git a/public/app/features/playlist/PlaylistForm.test.tsx b/public/app/features/playlist/PlaylistForm.test.tsx
index b19a05f35cb..3ab028ee755 100644
--- a/public/app/features/playlist/PlaylistForm.test.tsx
+++ b/public/app/features/playlist/PlaylistForm.test.tsx
@@ -1,5 +1,4 @@
-import { within } from '@testing-library/dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
diff --git a/public/app/features/profile/UserProfileEditPage.test.tsx b/public/app/features/profile/UserProfileEditPage.test.tsx
index 0c92be131ab..18a744eb2c0 100644
--- a/public/app/features/profile/UserProfileEditPage.test.tsx
+++ b/public/app/features/profile/UserProfileEditPage.test.tsx
@@ -1,5 +1,4 @@
-import { within } from '@testing-library/dom';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event';
 import React from 'react';
 
diff --git a/public/app/features/search/page/components/columns.tsx b/public/app/features/search/page/components/columns.tsx
index aa195a129a4..8c7c71c0547 100644
--- a/public/app/features/search/page/components/columns.tsx
+++ b/public/app/features/search/page/components/columns.tsx
@@ -187,7 +187,7 @@ export const generateColumns = (
       },
       id: `column-location`,
       field: access.location ?? access.url,
-      Header: () => t('search.results-table.location-header', 'Location'),
+      Header: t('search.results-table.location-header', 'Location'),
       width,
     });
   }
@@ -274,7 +274,7 @@ function makeDataSourceColumn(
   return {
     id: `column-datasource`,
     field,
-    Header: () => t('search.results-table.datasource-header', 'Data source'),
+    Header: t('search.results-table.datasource-header', 'Data source'),
     Cell: (p) => {
       const dslist = field.values.get(p.row.index);
       if (!dslist?.length) {
@@ -322,7 +322,7 @@ function makeTypeColumn(
   return {
     id: `column-type`,
     field: kindField ?? typeField,
-    Header: () => t('search.results-table.type-header', 'Type'),
+    Header: t('search.results-table.type-header', 'Type'),
     Cell: (p) => {
       const i = p.row.index;
       const kind = kindField?.values.get(i) ?? 'dashboard';
@@ -393,7 +393,7 @@ function makeTagsColumn(
     },
     id: `column-tags`,
     field: field,
-    Header: () => t('search.results-table.tags-header', 'Tags'),
+    Header: t('search.results-table.tags-header', 'Tags'),
     width,
   };
 }
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts
index 5a8d3b6104c..27e011f4311 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook, waitFor } from '@testing-library/react';
 
 import createMockDatasource from '../../__mocks__/datasource';
 import Datasource from '../../datasource';
@@ -13,10 +13,6 @@ import {
   MetricsMetadataHook,
 } from './dataHooks';
 
-const WAIT_OPTIONS = {
-  timeout: 1000,
-};
-
 const opt = (text: string, value: string) => ({ text, value });
 
 interface TestScenario {
@@ -180,10 +176,11 @@ describe('AzureMonitor: metrics dataHooks', () => {
         ...bareQuery,
         azureMonitor: scenario.emptyQueryPartial,
       };
-      const { result, waitForNextUpdate } = renderHook(() => scenario.hook(query, datasource, onChange, setError));
-      await waitForNextUpdate(WAIT_OPTIONS);
+      const { result } = renderHook(() => scenario.hook(query, datasource, onChange, setError));
 
-      expect(result.current).toEqual(scenario.expectedOptions);
+      await waitFor(() => {
+        expect(result.current).toEqual(scenario.expectedOptions);
+      });
     });
 
     it('adds custom properties as a valid option', async () => {
@@ -192,10 +189,11 @@ describe('AzureMonitor: metrics dataHooks', () => {
         azureMonitor: scenario.customProperties,
         ...scenario.topLevelCustomProperties,
       };
-      const { result, waitForNextUpdate } = renderHook(() => scenario.hook(query, datasource, onChange, setError));
-      await waitForNextUpdate(WAIT_OPTIONS);
+      const { result } = renderHook(() => scenario.hook(query, datasource, onChange, setError));
 
-      expect(result.current).toEqual(scenario.expectedCustomPropertyResults);
+      await waitFor(() => {
+        expect(result.current).toEqual(scenario.expectedCustomPropertyResults);
+      });
     });
   });
 
@@ -239,18 +237,19 @@ describe('AzureMonitor: metrics dataHooks', () => {
         ...bareQuery,
         azureMonitor: metricsMetadataConfig.emptyQueryPartial,
       };
-      const { result, waitForNextUpdate } = renderHook(() => metricsMetadataConfig.hook(query, datasource, onChange));
-      await waitForNextUpdate(WAIT_OPTIONS);
+      const { result } = renderHook(() => metricsMetadataConfig.hook(query, datasource, onChange));
 
-      expect(result.current).toEqual(metricsMetadataConfig.expectedOptions);
-      expect(onChange).toHaveBeenCalledWith({
-        ...query,
-        azureMonitor: {
-          ...query.azureMonitor,
-          aggregation: result.current.primaryAggType,
-          timeGrain: 'auto',
-          allowedTimeGrainsMs: [60_000, 300_000, 900_000, 1_800_000, 3_600_000, 21_600_000, 43_200_000, 86_400_000],
-        },
+      await waitFor(() => {
+        expect(result.current).toEqual(metricsMetadataConfig.expectedOptions);
+        expect(onChange).toHaveBeenCalledWith({
+          ...query,
+          azureMonitor: {
+            ...query.azureMonitor,
+            aggregation: result.current.primaryAggType,
+            timeGrain: 'auto',
+            allowedTimeGrainsMs: [60_000, 300_000, 900_000, 1_800_000, 3_600_000, 21_600_000, 43_200_000, 86_400_000],
+          },
+        });
       });
     });
   });
@@ -281,21 +280,20 @@ describe('AzureMonitor: metrics dataHooks', () => {
         ...bareQuery,
         azureMonitor: metricNamespacesConfig.emptyQueryPartial,
       };
-      const { result, waitForNextUpdate } = renderHook(() =>
-        metricNamespacesConfig.hook(query, datasource, onChange, jest.fn())
-      );
-      await waitForNextUpdate(WAIT_OPTIONS);
+      const { result } = renderHook(() => metricNamespacesConfig.hook(query, datasource, onChange, jest.fn()));
 
-      expect(result.current).toEqual(metricNamespacesConfig.expectedOptions);
-      expect(datasource.azureMonitorDatasource.getMetricNamespaces).toHaveBeenCalledWith(
-        expect.objectContaining({
-          resourceGroup: 'rg',
-          resourceName: 'rn',
-          metricNamespace: 'azure/vm',
-        }),
-        // Here, "global" should be false
-        false
-      );
+      await waitFor(() => {
+        expect(result.current).toEqual(metricNamespacesConfig.expectedOptions);
+        expect(datasource.azureMonitorDatasource.getMetricNamespaces).toHaveBeenCalledWith(
+          expect.objectContaining({
+            resourceGroup: 'rg',
+            resourceName: 'rn',
+            metricNamespace: 'azure/vm',
+          }),
+          // Here, "global" should be false
+          false
+        );
+      });
     });
   });
 });
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
index f9e75280f71..1dcbab5b1a7 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
@@ -71,7 +71,7 @@ const QueryEditor = ({
         <>
           <Space v={2} />
           <Alert severity="error" title="An error occurred while requesting metadata from Azure Monitor">
-            {errorMessage}
+            {errorMessage instanceof Error ? errorMessage.message : errorMessage}
           </Alert>
         </>
       )}
diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.test.tsx
index 9358c52ea46..3e1b20c4d0f 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.test.tsx
@@ -89,20 +89,20 @@ describe('AzureMonitor ResourcePicker', () => {
 
   it('should show a subscription as selected if there is one saved', async () => {
     render(<ResourcePicker {...defaultProps} resources={[singleSubscriptionSelectionURI]} />);
-    await waitFor(async () => {
-      const subscriptionCheckboxes = await screen.findAllByLabelText('Dev Subscription');
-      expect(subscriptionCheckboxes.length).toBe(2);
+    await waitFor(() => {
+      expect(screen.getAllByLabelText('Dev Subscription')).toHaveLength(2);
     });
     const subscriptionCheckboxes = await screen.findAllByLabelText('Dev Subscription');
-    expect(subscriptionCheckboxes.length).toBe(2);
     expect(subscriptionCheckboxes[0]).toBeChecked();
     expect(subscriptionCheckboxes[1]).toBeChecked();
   });
 
   it('should show a resourceGroup as selected if there is one saved', async () => {
     render(<ResourcePicker {...defaultProps} resources={[singleResourceGroupSelectionURI]} />);
+    await waitFor(() => {
+      expect(screen.getAllByLabelText('A Great Resource Group')).toHaveLength(2);
+    });
     const resourceGroupCheckboxes = await screen.findAllByLabelText('A Great Resource Group');
-    expect(resourceGroupCheckboxes.length).toBe(2);
     expect(resourceGroupCheckboxes[0]).toBeChecked();
     expect(resourceGroupCheckboxes[1]).toBeChecked();
   });
@@ -112,8 +112,10 @@ describe('AzureMonitor ResourcePicker', () => {
     await waitFor(() => {
       expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
     });
+    await waitFor(() => {
+      expect(screen.getAllByLabelText('db-server')).toHaveLength(2);
+    });
     const resourceCheckboxes = await screen.findAllByLabelText('db-server');
-    expect(resourceCheckboxes.length).toBe(2);
     expect(resourceCheckboxes[0]).toBeChecked();
     expect(resourceCheckboxes[1]).toBeChecked();
   });
@@ -158,8 +160,10 @@ describe('AzureMonitor ResourcePicker', () => {
   it('should call onApply removing an element', async () => {
     const onApply = jest.fn();
     render(<ResourcePicker {...defaultProps} resources={['/subscriptions/def-123']} onApply={onApply} />);
+    await waitFor(() => {
+      expect(screen.getAllByLabelText('Primary Subscription')).toHaveLength(2);
+    });
     const subscriptionCheckbox = await screen.findAllByLabelText('Primary Subscription');
-    expect(subscriptionCheckbox).toHaveLength(2);
     expect(subscriptionCheckbox.at(0)).toBeChecked();
     await userEvent.click(subscriptionCheckbox.at(0)!);
     const applyButton = screen.getByRole('button', { name: 'Apply' });
@@ -173,8 +177,10 @@ describe('AzureMonitor ResourcePicker', () => {
     render(
       <ResourcePicker {...defaultProps} resources={['/subscriptions/def-456/resourceGroups/DEV-3']} onApply={onApply} />
     );
+    await waitFor(() => {
+      expect(screen.getAllByLabelText('A Great Resource Group')).toHaveLength(2);
+    });
     const subscriptionCheckbox = await screen.findAllByLabelText('A Great Resource Group');
-    expect(subscriptionCheckbox).toHaveLength(2);
     expect(subscriptionCheckbox.at(0)).toBeChecked();
     await userEvent.click(subscriptionCheckbox.at(0)!);
     const applyButton = screen.getByRole('button', { name: 'Apply' });
@@ -232,8 +238,10 @@ describe('AzureMonitor ResourcePicker', () => {
     await waitFor(() => {
       expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
     });
+    await waitFor(() => {
+      expect(screen.getAllByLabelText('web-server')).toHaveLength(2);
+    });
     const checkbox = await screen.findAllByLabelText('web-server');
-    expect(checkbox).toHaveLength(2);
     expect(checkbox.at(0)).toBeChecked();
     await userEvent.click(checkbox.at(0)!);
     const applyButton = screen.getByRole('button', { name: 'Apply' });
diff --git a/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx
index c0716cb2ed9..321cc7a887f 100644
--- a/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx
@@ -256,7 +256,7 @@ const VariableEditor = (props: Props) => {
             <>
               <Space v={2} />
               <Alert severity="error" title="An error occurred while requesting metadata from Azure Monitor">
-                {errorMessage}
+                {errorMessage instanceof Error ? errorMessage.message : errorMessage}
               </Alert>
             </>
           )}
@@ -365,7 +365,7 @@ const VariableEditor = (props: Props) => {
             <>
               <Space v={2} />
               <Alert severity="error" title="An error occurred while requesting metadata from Azure Monitor">
-                {errorMessage}
+                {errorMessage instanceof Error ? errorMessage.message : errorMessage}
               </Alert>
             </>
           )}
diff --git a/public/app/plugins/datasource/azuremonitor/utils/useAsyncState.test.ts b/public/app/plugins/datasource/azuremonitor/utils/useAsyncState.test.ts
index 19afed17fea..69703838a9f 100644
--- a/public/app/plugins/datasource/azuremonitor/utils/useAsyncState.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/utils/useAsyncState.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook, waitFor } from '@testing-library/react';
 
 import { useAsyncState } from './useAsyncState';
 
@@ -36,10 +36,11 @@ describe('useAsyncState', () => {
     const apiCall = () => Promise.resolve(['a', 'b', 'c']);
     const setError = jest.fn();
 
-    const { result, waitForNextUpdate } = renderHook(() => useAsyncState(apiCall, setError, []));
-    await waitForNextUpdate();
+    const { result } = renderHook(() => useAsyncState(apiCall, setError, []));
 
-    expect(result.current).toEqual(['a', 'b', 'c']);
+    await waitFor(() => {
+      expect(result.current).toEqual(['a', 'b', 'c']);
+    });
   });
 
   it('should report errors through setError', async () => {
@@ -47,20 +48,22 @@ describe('useAsyncState', () => {
     const apiCall = () => Promise.reject(error);
     const setError = createWaitableMock();
 
-    const { result, waitForNextUpdate } = renderHook(() => useAsyncState(apiCall, setError, []));
-    await Promise.race([waitForNextUpdate(), setError.waitToBeCalled()]);
+    const { result } = renderHook(() => useAsyncState(apiCall, setError, []));
 
-    expect(result.current).toEqual([]);
-    expect(setError).toHaveBeenCalledWith(MOCKED_RANDOM_VALUE, error);
+    await waitFor(() => {
+      expect(result.current).toEqual([]);
+      expect(setError).toHaveBeenCalledWith(MOCKED_RANDOM_VALUE, error);
+    });
   });
 
   it('should clear the error once the request is successful', async () => {
     const apiCall = () => Promise.resolve(['a', 'b', 'c']);
     const setError = createWaitableMock();
 
-    const { waitForNextUpdate } = renderHook(() => useAsyncState(apiCall, setError, []));
-    await Promise.race([waitForNextUpdate(), setError.waitToBeCalled()]);
+    renderHook(() => useAsyncState(apiCall, setError, []));
 
-    expect(setError).toHaveBeenCalledWith(MOCKED_RANDOM_VALUE, undefined);
+    await waitFor(() => {
+      expect(setError).toHaveBeenCalledWith(MOCKED_RANDOM_VALUE, undefined);
+    });
   });
 });
diff --git a/public/app/plugins/datasource/azuremonitor/utils/useLastError.test.ts b/public/app/plugins/datasource/azuremonitor/utils/useLastError.test.ts
index a725cc4cec5..32783d9f677 100644
--- a/public/app/plugins/datasource/azuremonitor/utils/useLastError.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/utils/useLastError.test.ts
@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
 
 import useLastError from './useLastError';
 
diff --git a/public/app/plugins/datasource/cloudwatch/hooks.test.ts b/public/app/plugins/datasource/cloudwatch/hooks.test.ts
index 97349de75a5..79a8a49cf05 100644
--- a/public/app/plugins/datasource/cloudwatch/hooks.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/hooks.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook, waitFor } from '@testing-library/react';
 
 import { config } from '@grafana/runtime';
 
@@ -13,10 +13,6 @@ import {
 import { setupMockedResourcesAPI } from './__mocks__/ResourcesAPI';
 import { useAccountOptions, useDimensionKeys, useIsMonitoringAccount, useMetrics } from './hooks';
 
-const WAIT_OPTIONS = {
-  timeout: 1000,
-};
-
 const originalFeatureToggleValue = config.featureToggles.cloudWatchCrossAccountQuerying;
 
 describe('hooks', () => {
@@ -32,10 +28,11 @@ describe('hooks', () => {
       const isMonitoringAccountMock = jest.fn().mockResolvedValue(true);
       api.isMonitoringAccount = isMonitoringAccountMock;
 
-      const { waitForNextUpdate } = renderHook(() => useIsMonitoringAccount(api, `$${regionVariable.name}`));
-      await waitForNextUpdate(WAIT_OPTIONS);
-      expect(isMonitoringAccountMock).toHaveBeenCalledTimes(1);
-      expect(isMonitoringAccountMock).toHaveBeenCalledWith(regionVariable.current.value);
+      renderHook(() => useIsMonitoringAccount(api, `$${regionVariable.name}`));
+      await waitFor(() => {
+        expect(isMonitoringAccountMock).toHaveBeenCalledTimes(1);
+        expect(isMonitoringAccountMock).toHaveBeenCalledWith(regionVariable.current.value);
+      });
     });
   });
   describe('useMetricNames', () => {
@@ -46,19 +43,20 @@ describe('hooks', () => {
       const getMetricsMock = jest.fn().mockResolvedValue([]);
       datasource.resources.getMetrics = getMetricsMock;
 
-      const { waitForNextUpdate } = renderHook(() =>
+      renderHook(() =>
         useMetrics(datasource, {
           namespace: `$${namespaceVariable.name}`,
           region: `$${regionVariable.name}`,
           accountId: `$${accountIdVariable.name}`,
         })
       );
-      await waitForNextUpdate(WAIT_OPTIONS);
-      expect(getMetricsMock).toHaveBeenCalledTimes(1);
-      expect(getMetricsMock).toHaveBeenCalledWith({
-        region: regionVariable.current.value,
-        namespace: namespaceVariable.current.value,
-        accountId: accountIdVariable.current.value,
+      await waitFor(() => {
+        expect(getMetricsMock).toHaveBeenCalledTimes(1);
+        expect(getMetricsMock).toHaveBeenCalledWith({
+          region: regionVariable.current.value,
+          namespace: namespaceVariable.current.value,
+          accountId: accountIdVariable.current.value,
+        });
       });
     });
   });
@@ -72,7 +70,7 @@ describe('hooks', () => {
       const getDimensionKeysMock = jest.fn().mockResolvedValue([]);
       datasource.resources.getDimensionKeys = getDimensionKeysMock;
 
-      const { waitForNextUpdate } = renderHook(() =>
+      renderHook(() =>
         useDimensionKeys(datasource, {
           namespace: `$${namespaceVariable.name}`,
           metricName: `$${metricVariable.name}`,
@@ -83,16 +81,17 @@ describe('hooks', () => {
           },
         })
       );
-      await waitForNextUpdate(WAIT_OPTIONS);
-      expect(getDimensionKeysMock).toHaveBeenCalledTimes(1);
-      expect(getDimensionKeysMock).toHaveBeenCalledWith({
-        region: regionVariable.current.value,
-        namespace: namespaceVariable.current.value,
-        metricName: metricVariable.current.value,
-        accountId: accountIdVariable.current.value,
-        dimensionFilters: {
-          environment: [dimensionVariable.current.value],
-        },
+      await waitFor(() => {
+        expect(getDimensionKeysMock).toHaveBeenCalledTimes(1);
+        expect(getDimensionKeysMock).toHaveBeenCalledWith({
+          region: regionVariable.current.value,
+          namespace: namespaceVariable.current.value,
+          metricName: metricVariable.current.value,
+          accountId: accountIdVariable.current.value,
+          dimensionFilters: {
+            environment: [dimensionVariable.current.value],
+          },
+        });
       });
     });
   });
@@ -105,9 +104,10 @@ describe('hooks', () => {
       });
       const getAccountsMock = jest.fn().mockResolvedValue([{ id: '123', label: 'accountLabel' }]);
       api.getAccounts = getAccountsMock;
-      const { waitForNextUpdate } = renderHook(() => useAccountOptions(api, `$${regionVariable.name}`));
-      await waitForNextUpdate(WAIT_OPTIONS);
-      expect(getAccountsMock).toHaveBeenCalledTimes(0);
+      renderHook(() => useAccountOptions(api, `$${regionVariable.name}`));
+      await waitFor(() => {
+        expect(getAccountsMock).toHaveBeenCalledTimes(0);
+      });
     });
 
     it('interpolates region variables before calling the api', async () => {
@@ -117,10 +117,11 @@ describe('hooks', () => {
       });
       const getAccountsMock = jest.fn().mockResolvedValue([{ id: '123', label: 'accountLabel' }]);
       api.getAccounts = getAccountsMock;
-      const { waitForNextUpdate } = renderHook(() => useAccountOptions(api, `$${regionVariable.name}`));
-      await waitForNextUpdate(WAIT_OPTIONS);
-      expect(getAccountsMock).toHaveBeenCalledTimes(1);
-      expect(getAccountsMock).toHaveBeenCalledWith({ region: regionVariable.current.value });
+      renderHook(() => useAccountOptions(api, `$${regionVariable.name}`));
+      await waitFor(() => {
+        expect(getAccountsMock).toHaveBeenCalledTimes(1);
+        expect(getAccountsMock).toHaveBeenCalledWith({ region: regionVariable.current.value });
+      });
     });
 
     it('returns properly formatted account options, and template variables', async () => {
@@ -130,12 +131,13 @@ describe('hooks', () => {
       });
       const getAccountsMock = jest.fn().mockResolvedValue([{ id: '123', label: 'accountLabel' }]);
       api.getAccounts = getAccountsMock;
-      const { waitForNextUpdate, result } = renderHook(() => useAccountOptions(api, `$${regionVariable.name}`));
-      await waitForNextUpdate(WAIT_OPTIONS);
-      expect(result.current.value).toEqual([
-        { label: 'accountLabel', description: '123', value: '123' },
-        { label: 'Template Variables', options: [{ label: '$region', value: '$region' }] },
-      ]);
+      const { result } = renderHook(() => useAccountOptions(api, `$${regionVariable.name}`));
+      await waitFor(() => {
+        expect(result.current.value).toEqual([
+          { label: 'accountLabel', description: '123', value: '123' },
+          { label: 'Template Variables', options: [{ label: '$region', value: '$region' }] },
+        ]);
+      });
     });
   });
 });
diff --git a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
index 8b1ac99a964..d29fef5a1da 100644
--- a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 
 import { config } from '@grafana/runtime';
 
diff --git a/public/app/plugins/datasource/elasticsearch/hooks/useFields.test.tsx b/public/app/plugins/datasource/elasticsearch/hooks/useFields.test.tsx
index 76230e2a5e6..d977e5f4dec 100644
--- a/public/app/plugins/datasource/elasticsearch/hooks/useFields.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/hooks/useFields.test.tsx
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 import React, { PropsWithChildren } from 'react';
 import { from } from 'rxjs';
 
diff --git a/public/app/plugins/datasource/elasticsearch/hooks/useNextId.test.tsx b/public/app/plugins/datasource/elasticsearch/hooks/useNextId.test.tsx
index 1ce6b4bac72..881d1030d73 100644
--- a/public/app/plugins/datasource/elasticsearch/hooks/useNextId.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/hooks/useNextId.test.tsx
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 import React, { PropsWithChildren } from 'react';
 
 import { getDefaultTimeRange } from '@grafana/data';
diff --git a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx
index 58a033a41ab..9caff3d37f9 100644
--- a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx
+++ b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx
@@ -1,4 +1,4 @@
-import { act, render } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
 import React from 'react';
 
 import InfluxDatasource from '../../datasource';
@@ -41,10 +41,10 @@ async function assertEditor(query: InfluxQuery, textContent: string) {
   const datasource: InfluxDatasource = {
     metricFindQuery: () => Promise.resolve([]),
   } as unknown as InfluxDatasource;
-  await act(async () => {
-    const { container } = await render(
-      <Editor query={query} datasource={datasource} onChange={onChange} onRunQuery={onRunQuery} />
-    );
+  const { container } = render(
+    <Editor query={query} datasource={datasource} onChange={onChange} onRunQuery={onRunQuery} />
+  );
+  await waitFor(() => {
     expect(container.textContent).toBe(textContent);
   });
 }
diff --git a/public/app/plugins/datasource/influxdb/components/useShadowedState.test.ts b/public/app/plugins/datasource/influxdb/components/useShadowedState.test.ts
index d339123ef40..f66287dbab5 100644
--- a/public/app/plugins/datasource/influxdb/components/useShadowedState.test.ts
+++ b/public/app/plugins/datasource/influxdb/components/useShadowedState.test.ts
@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
 
 import { useShadowedState } from './useShadowedState';
 
diff --git a/public/app/plugins/datasource/influxdb/components/useUniqueId.test.ts b/public/app/plugins/datasource/influxdb/components/useUniqueId.test.ts
index 57c5483cc50..98b3dd63b67 100644
--- a/public/app/plugins/datasource/influxdb/components/useUniqueId.test.ts
+++ b/public/app/plugins/datasource/influxdb/components/useUniqueId.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 
 import { useUniqueId } from './useUniqueId';
 
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
index fbe81f936bb..dc324fdc784 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
@@ -118,14 +118,13 @@ describe('LokiContextUi', () => {
     render(<LokiContextUi {...props} />);
     await waitFor(() => {
       expect(props.languageProvider.start).toHaveBeenCalled();
+      expect(screen.getAllByRole('combobox')).toHaveLength(2);
     });
-    const select = await screen.findAllByRole('combobox');
-    await selectOptionInTest(select[1], 'label3');
+    await selectOptionInTest(screen.getAllByRole('combobox')[1], 'label3');
     act(() => {
       jest.runAllTimers();
     });
     expect(props.updateFilter).toHaveBeenCalled();
-
     jest.useRealTimers();
   });
 
diff --git a/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.test.tsx
index 95f6ce34d1f..3f4ea1620ab 100644
--- a/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.test.tsx
@@ -1,5 +1,4 @@
-import { screen } from '@testing-library/dom';
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
index 88d73f848b2..95356fa90f1 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
@@ -1,5 +1,4 @@
-import { screen } from '@testing-library/dom';
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx
index d40d7b014cb..5c8393649a0 100644
--- a/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx
@@ -1,4 +1,4 @@
-import { getByTestId, render, screen } from '@testing-library/react';
+import { getByTestId, render, screen, waitFor } from '@testing-library/react';
 // @ts-ignore
 import userEvent from '@testing-library/user-event';
 import React from 'react';
@@ -141,11 +141,13 @@ describe('PromQueryField', () => {
 
     // If we check the label browser right away it should be in loading state
     let labelBrowser = screen.getByRole('button');
-    expect(labelBrowser.textContent).toContain('Loading');
+    expect(labelBrowser).toHaveTextContent('Loading');
 
     // wait for component to rerender
     labelBrowser = await screen.findByRole('button');
-    expect(labelBrowser.textContent).toContain('Metrics browser');
+    await waitFor(() => {
+      expect(labelBrowser).toHaveTextContent('Metrics browser');
+    });
   });
 
   it('should not run query onBlur', async () => {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.test.ts b/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.test.ts
index 7218b082f80..4c2ada605b2 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.test.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.test.ts
@@ -1,4 +1,4 @@
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@testing-library/react';
 
 import { lokiQueryEditorExplainKey, promQueryEditorExplainKey, useFlag } from './useFlag';
 
diff --git a/public/app/plugins/datasource/zipkin/QueryField.test.tsx b/public/app/plugins/datasource/zipkin/QueryField.test.tsx
index 77c901f17b4..5991d365d46 100644
--- a/public/app/plugins/datasource/zipkin/QueryField.test.tsx
+++ b/public/app/plugins/datasource/zipkin/QueryField.test.tsx
@@ -1,5 +1,4 @@
-import { render, screen } from '@testing-library/react';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, render, renderHook, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 
 import { CascaderOption } from '@grafana/ui';
@@ -38,12 +37,13 @@ describe('useServices', () => {
       },
     } as ZipkinDatasource;
 
-    const { result, waitForNextUpdate } = renderHook(() => useServices(ds));
-    await waitForNextUpdate();
-    expect(result.current.value).toEqual([
-      { label: 'service1', value: 'service1', isLeaf: false },
-      { label: 'service2', value: 'service2', isLeaf: false },
-    ]);
+    const { result } = renderHook(() => useServices(ds));
+    await waitFor(() => {
+      expect(result.current.value).toEqual([
+        { label: 'service1', value: 'service1', isLeaf: false },
+        { label: 'service2', value: 'service2', isLeaf: false },
+      ]);
+    });
   });
 });
 
@@ -62,25 +62,25 @@ describe('useLoadOptions', () => {
       },
     } as ZipkinDatasource;
 
-    const { result, waitForNextUpdate } = renderHook(() => useLoadOptions(ds));
+    const { result } = renderHook(() => useLoadOptions(ds));
     expect(result.current.allOptions).toEqual({});
 
     act(() => {
       result.current.onLoadOptions([{ value: 'service1' } as CascaderOption]);
     });
 
-    await waitForNextUpdate();
-
-    expect(result.current.allOptions).toEqual({ service1: { span1: undefined, span2: undefined } });
+    await waitFor(() => {
+      expect(result.current.allOptions).toEqual({ service1: { span1: undefined, span2: undefined } });
+    });
 
     act(() => {
       result.current.onLoadOptions([{ value: 'service1' } as CascaderOption, { value: 'span1' } as CascaderOption]);
     });
 
-    await waitForNextUpdate();
-
-    expect(result.current.allOptions).toEqual({
-      service1: { span1: { 'trace1 [10 ms]': 'traceId1' }, span2: undefined },
+    await waitFor(() => {
+      expect(result.current.allOptions).toEqual({
+        service1: { span1: { 'trace1 [10 ms]': 'traceId1' }, span2: undefined },
+      });
     });
   });
 });
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx
index b49738c4f7f..0d1b51ba755 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx
@@ -1,5 +1,4 @@
-import { fireEvent, screen } from '@testing-library/dom';
-import { render } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import React, { useState } from 'react';
 
 import { CoreApp, MutableDataFrame } from '@grafana/data';
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 70ca98fb615..5fc5818ec16 100644
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -11,7 +11,7 @@ import './jquery.flot.events';
 import $ from 'jquery';
 import { clone, find, flatten, isUndefined, map, max as _max, min as _min, sortBy as _sortBy, toNumber } from 'lodash';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot, Root } from 'react-dom/client';
 
 import {
   DataFrame,
@@ -76,6 +76,7 @@ class GraphElement {
   thresholdManager: ThresholdManager;
   timeRegionManager: TimeRegionManager;
   declare legendElem: HTMLElement;
+  declare legendElemRoot: Root;
 
   constructor(
     private scope: any,
@@ -118,6 +119,7 @@ class GraphElement {
     // get graph legend element
     if (this.elem && this.elem.parent) {
       this.legendElem = this.elem.parent().find('.graph-legend')[0];
+      this.legendElemRoot = createRoot(this.legendElem);
     }
   }
 
@@ -134,7 +136,7 @@ class GraphElement {
 
     if (!this.panel.legend.show) {
       if (this.legendElem.hasChildNodes()) {
-        ReactDOM.unmountComponentAtNode(this.legendElem);
+        this.legendElemRoot.unmount();
       }
       this.renderPanel();
       return;
@@ -156,7 +158,10 @@ class GraphElement {
     };
 
     const legendReactElem = React.createElement(LegendWithThemeProvider, legendProps);
-    ReactDOM.render(legendReactElem, this.legendElem, () => this.renderPanel());
+
+    // render callback isn't supported in react 18+, see: https://github.com/reactwg/react-18/discussions/5
+    this.legendElemRoot.render(legendReactElem);
+    requestIdleCallback(() => this.renderPanel());
   }
 
   onGraphHover(evt: LegacyGraphHoverEventPayload | DataHoverPayload) {
@@ -192,7 +197,7 @@ class GraphElement {
     this.elem.off();
     this.elem.remove();
 
-    ReactDOM.unmountComponentAtNode(this.legendElem);
+    this.legendElemRoot.unmount();
   }
 
   onGraphHoverClear(handler: LegacyEventHandler<any>) {
diff --git a/public/app/plugins/panel/nodeGraph/layout.test.ts b/public/app/plugins/panel/nodeGraph/layout.test.ts
index 7b1bba496eb..7c9bca49b3c 100644
--- a/public/app/plugins/panel/nodeGraph/layout.test.ts
+++ b/public/app/plugins/panel/nodeGraph/layout.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 
 import { useLayout } from './layout';
 import { EdgeDatum, NodeDatum } from './types';
diff --git a/yarn.lock b/yarn.lock
index 405468006b1..1b202d1a912 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2993,13 +2993,13 @@ __metadata:
     "@grafana/ui": 10.0.0-pre
     "@types/jest": 26.0.15
     "@types/lodash": 4.14.149
-    "@types/react": 17.0.30
+    "@types/react": 18.0.28
     jquery: 3.5.1
     lodash: 4.17.21
-    react: 17.0.1
-    react-dom: 17.0.1
+    react: 18.2.0
+    react-dom: 18.2.0
     react-hook-form: 7.5.3
-    react-router-dom: ^5.2.0
+    react-router-dom: 5.3.3
     tslib: 2.4.0
   languageName: unknown
   linkType: soft
@@ -3033,10 +3033,9 @@ __metadata:
     "@rollup/plugin-commonjs": 23.0.2
     "@rollup/plugin-json": 5.0.1
     "@rollup/plugin-node-resolve": 15.0.1
-    "@testing-library/dom": 8.20.0
+    "@testing-library/dom": 9.0.1
     "@testing-library/jest-dom": 5.16.5
-    "@testing-library/react": 12.1.4
-    "@testing-library/react-hooks": 8.0.1
+    "@testing-library/react": 14.0.0
     "@testing-library/user-event": 14.4.3
     "@types/d3-interpolate": ^3.0.0
     "@types/dompurify": ^2
@@ -3047,8 +3046,8 @@ __metadata:
     "@types/marked": 4.0.8
     "@types/node": 18.14.6
     "@types/papaparse": 5.3.7
-    "@types/react": 17.0.42
-    "@types/react-dom": 17.0.14
+    "@types/react": 18.0.28
+    "@types/react-dom": 18.0.11
     "@types/sinon": 10.0.13
     "@types/testing-library__jest-dom": 5.14.5
     "@types/tinycolor2": 1.4.3
@@ -3065,9 +3064,9 @@ __metadata:
     moment-timezone: 0.5.41
     ol: 7.2.2
     papaparse: 5.3.2
-    react: 17.0.2
-    react-dom: 17.0.2
-    react-test-renderer: 17.0.2
+    react: 18.2.0
+    react-dom: 18.2.0
+    react-test-renderer: 18.2.0
     react-use: 17.4.0
     regenerator-runtime: 0.13.11
     rimraf: 4.4.0
@@ -3083,8 +3082,8 @@ __metadata:
     uplot: 1.6.24
     xss: ^1.0.14
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0
-    react-dom: ^16.8.0 || ^17.0.0
+    react: ^17.0.0 || ^18.0.0
+    react-dom: ^17.0.0 || ^18.0.0
   languageName: unknown
   linkType: soft
 
@@ -3293,22 +3292,21 @@ __metadata:
     "@rollup/plugin-commonjs": 23.0.2
     "@rollup/plugin-node-resolve": 15.0.1
     "@sentry/browser": 6.19.7
-    "@testing-library/dom": 8.20.0
-    "@testing-library/react": 12.1.4
-    "@testing-library/react-hooks": 8.0.1
+    "@testing-library/dom": 9.0.1
+    "@testing-library/react": 14.0.0
     "@testing-library/user-event": 14.4.3
     "@types/angular": 1.8.4
     "@types/history": 4.7.11
     "@types/jest": 29.2.3
     "@types/lodash": 4.14.191
-    "@types/react": 17.0.42
-    "@types/react-dom": 17.0.14
+    "@types/react": 18.0.28
+    "@types/react-dom": 18.0.11
     "@types/systemjs": ^0.20.6
     esbuild: 0.16.17
     history: 4.10.1
     lodash: 4.17.21
-    react: 17.0.2
-    react-dom: 17.0.2
+    react: 18.2.0
+    react-dom: 18.2.0
     rimraf: 4.4.0
     rollup: 2.79.1
     rollup-plugin-dts: ^5.0.0
@@ -3321,8 +3319,8 @@ __metadata:
     tslib: 2.5.0
     typescript: 4.8.4
   peerDependencies:
-    react: 17.0.2
-    react-dom: 17.0.2
+    react: ^17.0.0 || ^18.0.0
+    react-dom: ^17.0.0 || ^18.0.0
   languageName: unknown
   linkType: soft
 
@@ -3500,10 +3498,9 @@ __metadata:
     "@storybook/preset-scss": 1.0.3
     "@storybook/react": 6.5.16
     "@storybook/theming": 6.5.16
-    "@testing-library/dom": 8.20.0
+    "@testing-library/dom": 9.0.1
     "@testing-library/jest-dom": 5.16.5
-    "@testing-library/react": 12.1.4
-    "@testing-library/react-hooks": 8.0.1
+    "@testing-library/react": 14.0.0
     "@testing-library/user-event": 14.4.3
     "@types/common-tags": ^1.8.0
     "@types/d3": 7.4.0
@@ -3515,15 +3512,15 @@ __metadata:
     "@types/mock-raf": 1.0.3
     "@types/node": 18.14.6
     "@types/prismjs": 1.26.0
-    "@types/react": 17.0.42
+    "@types/react": 18.0.28
     "@types/react-beautiful-dnd": 13.1.3
     "@types/react-calendar": 3.9.0
     "@types/react-color": 3.0.6
-    "@types/react-dom": 17.0.14
+    "@types/react-dom": 18.0.11
     "@types/react-highlight-words": 0.16.4
     "@types/react-router-dom": 5.3.3
     "@types/react-table": 7.7.14
-    "@types/react-test-renderer": 17.0.1
+    "@types/react-test-renderer": 18.0.0
     "@types/react-transition-group": 4.4.5
     "@types/react-window": 1.8.5
     "@types/slate": 0.47.11
@@ -3561,12 +3558,12 @@ __metadata:
     rc-slider: 10.1.1
     rc-time-picker: ^3.7.3
     rc-tooltip: 5.3.1
-    react: 17.0.2
+    react: 18.2.0
     react-beautiful-dnd: 13.1.1
     react-calendar: 4.0.0
     react-colorful: 5.6.1
     react-custom-scrollbars-2: 4.5.0
-    react-dom: 17.0.2
+    react-dom: 18.2.0
     react-dropzone: 14.2.3
     react-highlight-words: 0.20.0
     react-hook-form: 7.5.3
@@ -3574,11 +3571,11 @@ __metadata:
     react-inlinesvg: 3.0.2
     react-popper: 2.3.0
     react-popper-tooltip: 4.4.2
-    react-router-dom: ^5.2.0
+    react-router-dom: 5.3.3
     react-select: 5.7.0
     react-select-event: ^5.1.0
     react-table: 7.8.0
-    react-test-renderer: 17.0.2
+    react-test-renderer: 18.2.0
     react-transition-group: 4.4.5
     react-use: 17.4.0
     react-window: 1.8.8
@@ -3603,8 +3600,8 @@ __metadata:
     uuid: 9.0.0
     webpack: 5.76.0
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0
-    react-dom: ^16.8.0 || ^17.0.0
+    react: ^17.0.0 || ^18.0.0
+    react-dom: ^17.0.0 || ^18.0.0
   languageName: unknown
   linkType: soft
 
@@ -7315,6 +7312,53 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/addon-docs@patch:@storybook/addon-docs@npm:6.5.16#.yarn/patches/@storybook-addon-docs-npm-6.5.16-56ecbd77e7.patch::locator=grafana%40workspace%3A.":
+  version: 6.5.16
+  resolution: "@storybook/addon-docs@patch:@storybook/addon-docs@npm%3A6.5.16#.yarn/patches/@storybook-addon-docs-npm-6.5.16-56ecbd77e7.patch::version=6.5.16&hash=1c984c&locator=grafana%40workspace%3A."
+  dependencies:
+    "@babel/plugin-transform-react-jsx": ^7.12.12
+    "@babel/preset-env": ^7.12.11
+    "@jest/transform": ^26.6.2
+    "@mdx-js/react": ^1.6.22
+    "@storybook/addons": 6.5.16
+    "@storybook/api": 6.5.16
+    "@storybook/components": 6.5.16
+    "@storybook/core-common": 6.5.16
+    "@storybook/core-events": 6.5.16
+    "@storybook/csf": 0.0.2--canary.4566f4d.1
+    "@storybook/docs-tools": 6.5.16
+    "@storybook/mdx1-csf": ^0.0.1
+    "@storybook/node-logger": 6.5.16
+    "@storybook/postinstall": 6.5.16
+    "@storybook/preview-web": 6.5.16
+    "@storybook/source-loader": 6.5.16
+    "@storybook/store": 6.5.16
+    "@storybook/theming": 6.5.16
+    babel-loader: ^8.0.0
+    core-js: ^3.8.2
+    fast-deep-equal: ^3.1.3
+    global: ^4.4.0
+    lodash: ^4.17.21
+    regenerator-runtime: ^0.13.7
+    remark-external-links: ^8.0.0
+    remark-slug: ^6.0.0
+    ts-dedent: ^2.0.0
+    util-deprecate: ^1.0.2
+  peerDependencies:
+    "@storybook/mdx2-csf": ^0.0.3
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@storybook/mdx2-csf":
+      optional: true
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: de675ef948051275255c1430e114a6bcdb7fabc48f747c3d8d79a062679790208d8c6814809d8747068c5ee8a5f5425ca1c5d87f495fe80bcff99cbd45e72832
+  languageName: node
+  linkType: hard
+
 "@storybook/addon-essentials@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/addon-essentials@npm:6.5.16"
@@ -8672,9 +8716,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/dom@npm:8.20.0, @testing-library/dom@npm:>=7, @testing-library/dom@npm:^8.0.0":
-  version: 8.20.0
-  resolution: "@testing-library/dom@npm:8.20.0"
+"@testing-library/dom@npm:9.0.1, @testing-library/dom@npm:>=7, @testing-library/dom@npm:^9.0.0":
+  version: 9.0.1
+  resolution: "@testing-library/dom@npm:9.0.1"
   dependencies:
     "@babel/code-frame": ^7.10.4
     "@babel/runtime": ^7.12.5
@@ -8682,9 +8726,9 @@ __metadata:
     aria-query: ^5.0.0
     chalk: ^4.1.0
     dom-accessibility-api: ^0.5.9
-    lz-string: ^1.4.4
+    lz-string: ^1.5.0
     pretty-format: ^27.0.2
-  checksum: 1e599129a2fe91959ce80900a0a4897232b89e2a8e22c1f5950c36d39c97629ea86b4986b60b173b5525a05de33fde1e35836ea597b03de78cc51b122835c6f0
+  checksum: fa3d4097d0efd3b186d90e32ffa71c3f9c4ea7a5a793b186b565044b2950eea469594e1f75803e5edb52a75731feecd19cf7034b009b0bd3bfba173eb9c9cd0c
   languageName: node
   linkType: hard
 
@@ -8705,7 +8749,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/react-hooks@npm:8.0.1":
+"@testing-library/react-hooks@npm:^8.0.1":
   version: 8.0.1
   resolution: "@testing-library/react-hooks@npm:8.0.1"
   dependencies:
@@ -8727,17 +8771,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:12.1.4":
-  version: 12.1.4
-  resolution: "@testing-library/react@npm:12.1.4"
+"@testing-library/react@npm:14.0.0":
+  version: 14.0.0
+  resolution: "@testing-library/react@npm:14.0.0"
   dependencies:
     "@babel/runtime": ^7.12.5
-    "@testing-library/dom": ^8.0.0
-    "@types/react-dom": "*"
+    "@testing-library/dom": ^9.0.0
+    "@types/react-dom": ^18.0.0
   peerDependencies:
-    react: "*"
-    react-dom: "*"
-  checksum: 944c5f8d4abb22c0650c25c7ae499651828c37c0e741ff67a4635d4cd99b307d486dabec05b372aba638bd359d29cd2af97393b5055ea294a201d80b4bc384b8
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 4a54c8f56cc4a39b50803205f84f06280bb76521d6d5d4b3b36651d760c7c7752ef142d857d52aaf4fad4848ed7a8be49afc793a5dda105955d2f8bef24901ac
   languageName: node
   linkType: hard
 
@@ -9468,13 +9512,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/history@npm:*":
-  version: 4.7.9
-  resolution: "@types/history@npm:4.7.9"
-  checksum: 556b062adb92795839301965776b0418e9ca32798bd8a6031345a6a84d7512771107143a497b7e3ff826d0b0d4456e962c6450485dda6f55c7dd33371e840529
-  languageName: node
-  linkType: hard
-
 "@types/history@npm:4.7.11, @types/history@npm:^4.7.11":
   version: 4.7.11
   resolution: "@types/history@npm:4.7.11"
@@ -10024,12 +10061,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:17.0.14":
-  version: 17.0.14
-  resolution: "@types/react-dom@npm:17.0.14"
+"@types/react-dom@npm:18.0.11, @types/react-dom@npm:^18.0.0":
+  version: 18.0.11
+  resolution: "@types/react-dom@npm:18.0.11"
   dependencies:
     "@types/react": "*"
-  checksum: b54cd0ef573236b3d87fe7493e6d1c36d8b4ca37a3b46364272a5c91ac178e3296b68ea1aeb299ce68f12ad663c5720ee890d0539b14881c6754bdcbdb0befa0
+  checksum: 579691e4d5ec09688087568037c35edf8cfb1ab3e07f6c60029280733ee7b5c06d66df6fcc90786702c93ac8cb13bc7ff16c79ddfc75d082938fbaa36e1cdbf4
   languageName: node
   linkType: hard
 
@@ -10096,12 +10133,12 @@ __metadata:
   linkType: hard
 
 "@types/react-router@npm:*":
-  version: 5.1.17
-  resolution: "@types/react-router@npm:5.1.17"
+  version: 5.1.20
+  resolution: "@types/react-router@npm:5.1.20"
   dependencies:
-    "@types/history": "*"
+    "@types/history": ^4.7.11
     "@types/react": "*"
-  checksum: b9d1c7b6ce073652c39712d2b02aeec7640036e369c04be2e57e4b0eb049b64ec9f34fb91cad680ab3f794e89576f77aacadb015b61eb21500a1779e5c955b86
+  checksum: 128764143473a5e9457ddc715436b5d49814b1c214dde48939b9bef23f0e77f52ffcdfa97eb8d3cc27e2c229869c0cdd90f637d887b62f2c9f065a87d6425419
   languageName: node
   linkType: hard
 
@@ -10114,12 +10151,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-test-renderer@npm:17.0.1":
-  version: 17.0.1
-  resolution: "@types/react-test-renderer@npm:17.0.1"
+"@types/react-test-renderer@npm:18.0.0":
+  version: 18.0.0
+  resolution: "@types/react-test-renderer@npm:18.0.0"
   dependencies:
     "@types/react": "*"
-  checksum: ecaae8df36cd8cfeb89080d52534856acc3789bad9a6e369ff5119426377c827b4e5b5daa638507f2c1c2fd6c994bf45de288a698143178cd4049c2cd8b77b35
+  checksum: 6afc938a1d7618d88ab8793e251f0bd5981bf3f08c1b600f74df3f8800b92589ea534dc6dcb7c8d683893fcc740bf8d7843a42bf2dae59785cfe88f004bd7b0b
   languageName: node
   linkType: hard
 
@@ -10169,36 +10206,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*":
-  version: 17.0.33
-  resolution: "@types/react@npm:17.0.33"
+"@types/react@npm:*, @types/react@npm:18.0.28":
+  version: 18.0.28
+  resolution: "@types/react@npm:18.0.28"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: 5f53f3dae034229ff1eccb5de1c16d046696e883f8eae81b86e95c532798e655015e4edff8a6c9ec8f1c0ef12bb60dec43622d06256ba33ba6069e67a74b8d4e
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:17.0.30":
-  version: 17.0.30
-  resolution: "@types/react@npm:17.0.30"
-  dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-  checksum: e3aaac1b8fda6e3622b75db0bd7d8dc412c2f2b77a00afdd32cae8c71fb0b1ca6926ab1fbe1c536dd51d96c0ba372738993837a8df1637637aaab7b86e421b7f
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:17.0.42":
-  version: 17.0.42
-  resolution: "@types/react@npm:17.0.42"
-  dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-  checksum: 9a84374da1173901b5eba6b2dda9e70220842c8e70274628e5c93684fca59786b7f6215c93f492e34f8834983de096b2544f280c60da9b8fd4c3f20ffe7cc51e
+  checksum: e752df961105e5127652460504785897ca6e77259e0da8f233f694f9e8f451cde7fa0709d4456ade0ff600c8ce909cfe29f9b08b9c247fa9b734e126ec53edd7
   languageName: node
   linkType: hard
 
@@ -20160,10 +20175,10 @@ __metadata:
     "@sentry/utils": 6.19.7
     "@swc/core": 1.3.38
     "@swc/helpers": 0.4.14
-    "@testing-library/dom": 8.20.0
+    "@testing-library/dom": 9.0.1
     "@testing-library/jest-dom": 5.16.5
-    "@testing-library/react": 12.1.4
-    "@testing-library/react-hooks": 8.0.1
+    "@testing-library/react": 14.0.0
+    "@testing-library/react-hooks": ^8.0.1
     "@testing-library/user-event": 14.4.3
     "@types/angular": 1.8.4
     "@types/angular-route": 1.7.2
@@ -20192,16 +20207,16 @@ __metadata:
     "@types/papaparse": 5.3.7
     "@types/pluralize": ^0.0.29
     "@types/prismjs": 1.26.0
-    "@types/react": 17.0.42
+    "@types/react": 18.0.28
     "@types/react-beautiful-dnd": 13.1.3
-    "@types/react-dom": 17.0.14
+    "@types/react-dom": 18.0.11
     "@types/react-grid-layout": 1.3.2
     "@types/react-highlight-words": 0.16.4
     "@types/react-redux": 7.1.25
     "@types/react-resizable": 3.0.3
     "@types/react-router-dom": 5.3.3
     "@types/react-table": 7.7.14
-    "@types/react-test-renderer": 17.0.1
+    "@types/react-test-renderer": 18.0.0
     "@types/react-transition-group": 4.4.5
     "@types/react-virtualized-auto-sizer": 1.0.1
     "@types/react-window": 1.8.5
@@ -20341,11 +20356,11 @@ __metadata:
     rc-time-picker: 3.7.3
     rc-tree: 5.7.2
     re-resizable: 6.9.9
-    react: 17.0.2
+    react: 18.2.0
     react-awesome-query-builder: 5.4.0
     react-beautiful-dnd: 13.1.1
     react-diff-viewer: ^3.1.1
-    react-dom: 17.0.2
+    react-dom: 18.2.0
     react-draggable: 4.4.5
     react-dropzone: ^14.2.3
     react-enable: ^3.1.0
@@ -20361,13 +20376,13 @@ __metadata:
     react-refresh: 0.14.0
     react-resizable: 3.0.4
     react-reverse-portal: 2.1.1
-    react-router-dom: ^5.2.0
+    react-router-dom: 5.3.3
     react-select: 5.7.0
     react-select-event: 5.5.1
     react-simple-compat: 1.2.3
     react-split-pane: 0.1.92
     react-table: 7.8.0
-    react-test-renderer: 17.0.2
+    react-test-renderer: 18.2.0
     react-transition-group: 4.4.5
     react-use: 17.4.0
     react-virtual: 2.10.4
@@ -25165,12 +25180,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lz-string@npm:^1.4.4":
-  version: 1.4.4
-  resolution: "lz-string@npm:1.4.4"
+"lz-string@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "lz-string@npm:1.5.0"
   bin:
     lz-string: bin/bin.js
-  checksum: 54e31238a61a84d8f664d9860a9fba7310c5b97a52c444f80543069bc084815eff40b8d4474ae1d93992fdf6c252dca37cf27f6adbeb4dbc3df2f3ac773d0e61
+  checksum: 1ee98b4580246fd90dd54da6e346fb1caefcf05f677c686d9af237a157fdea3fd7c83a4bc58f858cd5b10a34d27afe0fdcbd0505a47e0590726a873dc8b8f65d
   languageName: node
   linkType: hard
 
@@ -30810,29 +30825,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:17.0.1":
-  version: 17.0.1
-  resolution: "react-dom@npm:17.0.1"
+"react-dom@npm:18.2.0":
+  version: 18.2.0
+  resolution: "react-dom@npm:18.2.0"
   dependencies:
     loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-    scheduler: ^0.20.1
+    scheduler: ^0.23.0
   peerDependencies:
-    react: 17.0.1
-  checksum: df2af300dd4f49a5daaccc38f5a307def2a9ae2b7ebffa3dce8fb9986129057696b86a2c94e5ae36133057c69428c500e4ee3bf5884eb44e5632ace8b7ace41f
-  languageName: node
-  linkType: hard
-
-"react-dom@npm:17.0.2":
-  version: 17.0.2
-  resolution: "react-dom@npm:17.0.2"
-  dependencies:
-    loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-    scheduler: ^0.20.2
-  peerDependencies:
-    react: 17.0.2
-  checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c
+    react: ^18.2.0
+  checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
   languageName: node
   linkType: hard
 
@@ -30905,13 +30906,13 @@ __metadata:
   linkType: hard
 
 "react-error-boundary@npm:^3.1.0":
-  version: 3.1.3
-  resolution: "react-error-boundary@npm:3.1.3"
+  version: 3.1.4
+  resolution: "react-error-boundary@npm:3.1.4"
   dependencies:
     "@babel/runtime": ^7.12.5
   peerDependencies:
     react: ">=16.13.1"
-  checksum: 0a05af404aa054c54d7bc65a1814810093bf136c3ad4b3576a51d8509ee8fc302adfb66405da501fc01e839db557dd0d994b487e651897e36293907bb61458cf
+  checksum: f36270a5d775a25c8920f854c0d91649ceea417b15b5bc51e270a959b0476647bb79abb4da3be7dd9a4597b029214e8fe43ea914a7f16fa7543c91f784977f1b
   languageName: node
   linkType: hard
 
@@ -31030,13 +31031,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:17.0.2, react-is@npm:^16.12.0 || ^17.0.0, react-is@npm:^17.0.1, react-is@npm:^17.0.2":
+"react-is@npm:17.0.2, react-is@npm:^17.0.1, react-is@npm:^17.0.2":
   version: 17.0.2
   resolution: "react-is@npm:17.0.2"
   checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8
   languageName: node
   linkType: hard
 
+"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.2.0":
+  version: 18.2.0
+  resolution: "react-is@npm:18.2.0"
+  checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e
+  languageName: node
+  linkType: hard
+
 "react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.1":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
@@ -31184,26 +31192,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^5.2.0":
-  version: 5.3.0
-  resolution: "react-router-dom@npm:5.3.0"
+"react-router-dom@npm:5.3.3":
+  version: 5.3.3
+  resolution: "react-router-dom@npm:5.3.3"
   dependencies:
     "@babel/runtime": ^7.12.13
     history: ^4.9.0
     loose-envify: ^1.3.1
     prop-types: ^15.6.2
-    react-router: 5.2.1
+    react-router: 5.3.3
     tiny-invariant: ^1.0.2
     tiny-warning: ^1.0.0
   peerDependencies:
     react: ">=15"
-  checksum: 47584fd629ecca52398d7888cab193b8a74057cc99a7ef44410c405d4082f618c3c0399db5325bc3524f9c511404086169570013b61a94dfa6acdfdc850d7a1f
+  checksum: e1998918e391611f09b967bce0cb88bc9794aa3d8dc5f86453467a1226ae2ace648a1f401f5282f19c84a3a61fa6a3207e2a6fdfe8c8efae0b255244631febeb
   languageName: node
   linkType: hard
 
-"react-router@npm:5.2.1":
-  version: 5.2.1
-  resolution: "react-router@npm:5.2.1"
+"react-router@npm:5.3.3":
+  version: 5.3.3
+  resolution: "react-router@npm:5.3.3"
   dependencies:
     "@babel/runtime": ^7.12.13
     history: ^4.9.0
@@ -31217,7 +31225,7 @@ __metadata:
     tiny-warning: ^1.0.0
   peerDependencies:
     react: ">=15"
-  checksum: 7daae084bf64531eb619cc5f4cc40ce5ae0a541b64f71d74ec71a38cbf6130ebdbb7cf38f157303fad5846deec259401f96c4d6c7386466dcc989719e01f9aaa
+  checksum: 52a9f28fa97577fda18a8ed2922b658704eafe873e444fe07202640d55d9e81e67c03efd2b2a5b80e3a80e8be8352df826a227ce5f42b33b91bef853c74d4841
   languageName: node
   linkType: hard
 
@@ -31259,15 +31267,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-shallow-renderer@npm:^16.13.1":
-  version: 16.14.1
-  resolution: "react-shallow-renderer@npm:16.14.1"
+"react-shallow-renderer@npm:^16.15.0":
+  version: 16.15.0
+  resolution: "react-shallow-renderer@npm:16.15.0"
   dependencies:
     object-assign: ^4.1.1
-    react-is: ^16.12.0 || ^17.0.0
+    react-is: ^16.12.0 || ^17.0.0 || ^18.0.0
   peerDependencies:
-    react: ^16.0.0 || ^17.0.0
-  checksum: f344c663c48720d19559b4198b1f63ad47a3f11bedc92ede053a6c0706b5209e6110086f3ccc6db04eda9f0d1a415845956ddfb6ce09a922167d4831fcba9314
+    react: ^16.0.0 || ^17.0.0 || ^18.0.0
+  checksum: 6052c7e3e9627485120ebd8257f128aad8f56386fe8d42374b7743eac1be457c33506d153c7886b4e32923c0c352d402ab805ef9ca02dbcd8393b2bdeb6e5af8
   languageName: node
   linkType: hard
 
@@ -31307,6 +31315,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-split-pane@patch:react-split-pane@npm:0.1.92#.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch::locator=grafana%40workspace%3A.":
+  version: 0.1.92
+  resolution: "react-split-pane@patch:react-split-pane@npm%3A0.1.92#.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch::version=0.1.92&hash=23e19a&locator=grafana%40workspace%3A."
+  dependencies:
+    prop-types: ^15.7.2
+    react-lifecycles-compat: ^3.0.4
+    react-style-proptype: ^3.2.2
+  peerDependencies:
+    react: ^16.0.0-0
+    react-dom: ^16.0.0-0
+  checksum: 4cdcc9e5a03ee1534100ddd6d5a5cce9e083ffe1a0acf7adf085d71d003d0ac475192964e0d63b2887392871dd687ec5340e2122eb588b5685de0a219cb00b11
+  languageName: node
+  linkType: hard
+
 "react-style-proptype@npm:^3.2.2":
   version: 3.2.2
   resolution: "react-style-proptype@npm:3.2.2"
@@ -31340,17 +31362,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-test-renderer@npm:17.0.2":
-  version: 17.0.2
-  resolution: "react-test-renderer@npm:17.0.2"
+"react-test-renderer@npm:18.2.0":
+  version: 18.2.0
+  resolution: "react-test-renderer@npm:18.2.0"
   dependencies:
-    object-assign: ^4.1.1
-    react-is: ^17.0.2
-    react-shallow-renderer: ^16.13.1
-    scheduler: ^0.20.2
+    react-is: ^18.2.0
+    react-shallow-renderer: ^16.15.0
+    scheduler: ^0.23.0
   peerDependencies:
-    react: 17.0.2
-  checksum: e6b5c6ed2a0bde2c34f1ab9523ff9bc4c141a271daf730d6b852374e83acc0155d58ab71a318251e953ebfa65b8bebb9c5dce3eba1ccfcbef7cc4e1e8261c401
+    react: ^18.2.0
+  checksum: 6b6980ced93fa2b72662d5e4ab3b4896833586940047ce52ca9aca801e5432adf05fcbe28289b0af3ce6a2a7c590974e25dcc8aa43d0de658bfe8bbcd686f958
   languageName: node
   linkType: hard
 
@@ -31475,23 +31496,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:17.0.1":
-  version: 17.0.1
-  resolution: "react@npm:17.0.1"
+"react@npm:18.2.0":
+  version: 18.2.0
+  resolution: "react@npm:18.2.0"
   dependencies:
     loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-  checksum: 83b9df9529a2b489f00a4eaa608fc7d55518b258e046c100344ae068713e43ae64e477a140f87e38cfe75489bcfd26d27fce5818f89f4ec41bdbda7ead4bb426
-  languageName: node
-  linkType: hard
-
-"react@npm:17.0.2":
-  version: 17.0.2
-  resolution: "react@npm:17.0.2"
-  dependencies:
-    loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-  checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b
+  checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b
   languageName: node
   linkType: hard
 
@@ -32799,13 +32809,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.20.1, scheduler@npm:^0.20.2":
-  version: 0.20.2
-  resolution: "scheduler@npm:0.20.2"
+"scheduler@npm:^0.23.0":
+  version: 0.23.0
+  resolution: "scheduler@npm:0.23.0"
   dependencies:
     loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-  checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc
+  checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
   languageName: node
   linkType: hard
 

From e9b15eff72247192f0dbcccd27cddbf43385d5bf Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Tue, 11 Apr 2023 12:19:28 +0200
Subject: [PATCH 027/729] Logs: Move components to dedicated directory (#65936)

* move log-context components to dedicated directory

* fix any

* add right format of lerna.json
---
 .betterer.results                                      |  5 +----
 public/app/features/explore/Logs.tsx                   |  2 +-
 public/app/features/logs/components/LogRow.tsx         | 10 +++++-----
 public/app/features/logs/components/LogRowMessage.tsx  |  4 ++--
 public/app/features/logs/components/LogRows.tsx        |  7 ++++---
 .../{ => log-context}/LogRowContext.test.tsx           |  0
 .../components/{ => log-context}/LogRowContext.tsx     |  3 ++-
 .../{ => log-context}/LogRowContextProvider.test.tsx   |  6 ++++--
 .../{ => log-context}/LogRowContextProvider.tsx        |  5 +----
 .../app/features/logs/components/log-context/types.ts  |  4 ++++
 public/app/plugins/datasource/cloudwatch/datasource.ts |  2 +-
 .../query-runner/CloudWatchLogsQueryRunner.ts          |  2 +-
 .../app/plugins/datasource/elasticsearch/datasource.ts |  4 ++--
 public/app/plugins/datasource/loki/datasource.ts       |  2 +-
 14 files changed, 29 insertions(+), 27 deletions(-)
 rename public/app/features/logs/components/{ => log-context}/LogRowContext.test.tsx (100%)
 rename public/app/features/logs/components/{ => log-context}/LogRowContext.tsx (99%)
 rename public/app/features/logs/components/{ => log-context}/LogRowContextProvider.test.tsx (97%)
 rename public/app/features/logs/components/{ => log-context}/LogRowContextProvider.tsx (98%)
 create mode 100644 public/app/features/logs/components/log-context/types.ts

diff --git a/.betterer.results b/.betterer.results
index 4db1152f170..21a1127350f 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2948,15 +2948,12 @@ exports[`better eslint`] = {
     "public/app/features/live/index.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/logs/components/LogRowContextProvider.tsx:5381": [
+    "public/app/features/logs/components/log-context/LogRowContextProvider.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"]
     ],
-    "public/app/features/logs/components/LogRows.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/logs/utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index d883367602f..263595de654 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -43,8 +43,8 @@ import { dedupLogRows, filterLogLevels } from 'app/core/logsModel';
 import store from 'app/core/store';
 import { ExploreId } from 'app/types/explore';
 
-import { RowContextOptions } from '../logs/components/LogRowContextProvider';
 import { LogRows } from '../logs/components/LogRows';
+import { RowContextOptions } from '../logs/components/log-context/types';
 
 import { LogsMetaRow } from './LogsMetaRow';
 import LogsNavigation from './LogsNavigation';
diff --git a/public/app/features/logs/components/LogRow.tsx b/public/app/features/logs/components/LogRow.tsx
index ebeac4c7930..65748b5c52a 100644
--- a/public/app/features/logs/components/LogRow.tsx
+++ b/public/app/features/logs/components/LogRow.tsx
@@ -20,16 +20,16 @@ import { checkLogsError, escapeUnescapedString } from '../utils';
 
 import { LogDetails } from './LogDetails';
 import { LogLabels } from './LogLabels';
+import { LogRowMessage } from './LogRowMessage';
+import { LogRowMessageDisplayedFields } from './LogRowMessageDisplayedFields';
+import { getLogLevelStyles, LogRowStyles } from './getLogRowStyles';
 import {
   LogRowContextRows,
   LogRowContextQueryErrors,
   HasMoreContextRows,
   LogRowContextProvider,
-  RowContextOptions,
-} from './LogRowContextProvider';
-import { LogRowMessage } from './LogRowMessage';
-import { LogRowMessageDisplayedFields } from './LogRowMessageDisplayedFields';
-import { getLogLevelStyles, LogRowStyles } from './getLogRowStyles';
+} from './log-context/LogRowContextProvider';
+import { RowContextOptions } from './log-context/types';
 
 interface Props extends Themeable2 {
   row: LogRowModel;
diff --git a/public/app/features/logs/components/LogRowMessage.tsx b/public/app/features/logs/components/LogRowMessage.tsx
index e8108f815a4..97a6a87b135 100644
--- a/public/app/features/logs/components/LogRowMessage.tsx
+++ b/public/app/features/logs/components/LogRowMessage.tsx
@@ -13,9 +13,9 @@ import {
 import { IconButton, Tooltip } from '@grafana/ui';
 
 import { LogMessageAnsi } from './LogMessageAnsi';
-import { LogRowContext } from './LogRowContext';
-import { LogRowContextQueryErrors, HasMoreContextRows, LogRowContextRows } from './LogRowContextProvider';
 import { LogRowStyles } from './getLogRowStyles';
+import { LogRowContext } from './log-context/LogRowContext';
+import { LogRowContextQueryErrors, HasMoreContextRows, LogRowContextRows } from './log-context/LogRowContextProvider';
 
 export const MAX_CHARACTERS = 100000;
 
diff --git a/public/app/features/logs/components/LogRows.tsx b/public/app/features/logs/components/LogRows.tsx
index 464e37837a7..8d38e8984b7 100644
--- a/public/app/features/logs/components/LogRows.tsx
+++ b/public/app/features/logs/components/LogRows.tsx
@@ -11,6 +11,7 @@ import {
   CoreApp,
   DataFrame,
   DataSourceWithLogsContextSupport,
+  DataQueryResponse,
 } from '@grafana/data';
 import { withTheme2, Themeable2 } from '@grafana/ui';
 
@@ -18,8 +19,8 @@ import { sortLogRows } from '../utils';
 
 //Components
 import { LogRow } from './LogRow';
-import { RowContextOptions } from './LogRowContextProvider';
 import { getLogRowStyles } from './getLogRowStyles';
+import { RowContextOptions } from './log-context/types';
 
 export const PREVIEW_LIMIT = 100;
 
@@ -42,7 +43,7 @@ export interface Props extends Themeable2 {
   showContextToggle?: (row?: LogRowModel) => boolean;
   onClickFilterLabel?: (key: string, value: string) => void;
   onClickFilterOutLabel?: (key: string, value: string) => void;
-  getRowContext?: (row: LogRowModel, options?: RowContextOptions) => Promise<any>;
+  getRowContext?: (row: LogRowModel, options?: RowContextOptions) => Promise<DataQueryResponse>;
   getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
   getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   onClickShowField?: (key: string) => void;
@@ -148,7 +149,7 @@ class UnThemedLogRows extends PureComponent<Props, State> {
 
     // React profiler becomes unusable if we pass all rows to all rows and their labels, using getter instead
     const getRows = this.makeGetRows(orderedRows);
-    const getRowContext = this.props.getRowContext ? this.props.getRowContext : () => Promise.resolve([]);
+    const getRowContext = this.props.getRowContext ? this.props.getRowContext : () => Promise.resolve({ data: [] });
 
     return (
       <table className={styles.logsRowsTable}>
diff --git a/public/app/features/logs/components/LogRowContext.test.tsx b/public/app/features/logs/components/log-context/LogRowContext.test.tsx
similarity index 100%
rename from public/app/features/logs/components/LogRowContext.test.tsx
rename to public/app/features/logs/components/log-context/LogRowContext.test.tsx
diff --git a/public/app/features/logs/components/LogRowContext.tsx b/public/app/features/logs/components/log-context/LogRowContext.tsx
similarity index 99%
rename from public/app/features/logs/components/LogRowContext.tsx
rename to public/app/features/logs/components/log-context/LogRowContext.tsx
index 53bb0cf0a99..937be311f34 100644
--- a/public/app/features/logs/components/LogRowContext.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContext.tsx
@@ -22,7 +22,8 @@ import {
   useTheme2,
 } from '@grafana/ui';
 
-import { LogMessageAnsi } from './LogMessageAnsi';
+import { LogMessageAnsi } from '../LogMessageAnsi';
+
 import { HasMoreContextRows, LogRowContextQueryErrors, LogRowContextRows } from './LogRowContextProvider';
 
 export enum LogGroupPosition {
diff --git a/public/app/features/logs/components/LogRowContextProvider.test.tsx b/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
similarity index 97%
rename from public/app/features/logs/components/LogRowContextProvider.test.tsx
rename to public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
index 27f38f02087..2ae4af716cd 100644
--- a/public/app/features/logs/components/LogRowContextProvider.test.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
@@ -3,8 +3,10 @@ import React from 'react';
 
 import { FieldType, LogRowModel, MutableDataFrame, DataQueryResponse } from '@grafana/data';
 
-import { getRowContexts, LogRowContextProvider, RowContextOptions } from './LogRowContextProvider';
-import { createLogRow } from './__mocks__/logRow';
+import { createLogRow } from '../__mocks__/logRow';
+
+import { getRowContexts, LogRowContextProvider } from './LogRowContextProvider';
+import { RowContextOptions } from './types';
 
 const row = createLogRow({ entry: '4', timeEpochMs: 4 });
 
diff --git a/public/app/features/logs/components/LogRowContextProvider.tsx b/public/app/features/logs/components/log-context/LogRowContextProvider.tsx
similarity index 98%
rename from public/app/features/logs/components/LogRowContextProvider.tsx
rename to public/app/features/logs/components/log-context/LogRowContextProvider.tsx
index 1f0bf7ee70f..ac0e4419f87 100644
--- a/public/app/features/logs/components/LogRowContextProvider.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextProvider.tsx
@@ -12,10 +12,7 @@ import {
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 
-export interface RowContextOptions {
-  direction?: 'BACKWARD' | 'FORWARD';
-  limit?: number;
-}
+import { RowContextOptions } from './types';
 
 export interface LogRowContextRows {
   before?: string[];
diff --git a/public/app/features/logs/components/log-context/types.ts b/public/app/features/logs/components/log-context/types.ts
new file mode 100644
index 00000000000..3497156f2c9
--- /dev/null
+++ b/public/app/features/logs/components/log-context/types.ts
@@ -0,0 +1,4 @@
+export interface RowContextOptions {
+  direction?: 'BACKWARD' | 'FORWARD';
+  limit?: number;
+}
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index 0332c147b95..118afb69331 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -16,7 +16,7 @@ import { DataSourceWithBackend } from '@grafana/runtime';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
-import { RowContextOptions } from '../../../features/logs/components/LogRowContextProvider';
+import { RowContextOptions } from '../../../features/logs/components/log-context/types';
 
 import { CloudWatchAnnotationSupport } from './annotationSupport';
 import { DEFAULT_METRICS_QUERY, getDefaultLogsQuery } from './defaultQueries';
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
index 439b925341d..3dad3cf8401 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
@@ -31,7 +31,7 @@ import { BackendDataSourceResponse, config, FetchError, FetchResponse, toDataQue
 import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 
-import { RowContextOptions } from '../../../../features/logs/components/LogRowContextProvider';
+import { RowContextOptions } from '../../../../features/logs/components/log-context/types';
 import {
   CloudWatchJsonData,
   CloudWatchLogsQuery,
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index cfb9395df41..04f2183feb9 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -37,7 +37,7 @@ import { queryLogsVolume } from 'app/core/logsModel';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
-import { RowContextOptions } from '../../../features/logs/components/LogRowContextProvider';
+import { RowContextOptions } from '../../../features/logs/components/log-context/types';
 import { getLogLevelFromKey } from '../../../features/logs/utils';
 
 import { ElasticResponse } from './ElasticResponse';
@@ -561,7 +561,7 @@ export class ElasticDatasource
         return { data: [] };
       }
       /**
-       * The LogRowContextProvider requires there is a field in the dataFrame.fields
+       * The LogRowContext requires there is a field in the dataFrame.fields
        * named `ts` for timestamp and `line` for the actual log line to display.
        * Unfortunatly these fields are hardcoded and are required for the lines to
        * be properly displayed. This code just copies the fields based on this.timeField
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 76e5d3aa7b0..04f99951524 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -41,7 +41,7 @@ import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
 import { serializeParams } from '../../../core/utils/fetch';
-import { RowContextOptions } from '../../../features/logs/components/LogRowContextProvider';
+import { RowContextOptions } from '../../../features/logs/components/log-context/types';
 import { getLogLevelFromKey } from '../../../features/logs/utils';
 import { renderLegendFormat } from '../prometheus/legend';
 import { replaceVariables, returnVariables } from '../prometheus/querybuilder/shared/parsingUtils';

From c178cbc4dc657aee7f013eccca1e1da82c188d8e Mon Sep 17 00:00:00 2001
From: Khushi Jain <57278642+khushijain21@users.noreply.github.com>
Date: Tue, 11 Apr 2023 15:50:11 +0530
Subject: [PATCH 028/729] Docs: updated emotion's cx link (#66180)

updates emotion's cx link
---
 contribute/style-guides/styling.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contribute/style-guides/styling.md b/contribute/style-guides/styling.md
index caf1b137f41..6dd61117c15 100644
--- a/contribute/style-guides/styling.md
+++ b/contribute/style-guides/styling.md
@@ -34,7 +34,7 @@ const getStyles = (theme: GrafanaTheme2) =>
 ### Styling complex components
 
 In more complex cases, especially when you need to style multiple DOM elements in one component, or when using styles that depend on properties and/or state you
-can have your getStyles function return an object with many class names and use [Emotion's `cx` function](https://emotion.sh/docs/emotion#cx) to compose them.
+can have your getStyles function return an object with many class names and use [Emotion's `cx` function](https://emotion.sh/docs/@emotion/css#cx) to compose them.
 
 Let's say you need to style a component that has a different background depending on the `isActive` property :
 

From 05f7ae6c69c4f4959a9e5df75d7499baca6e779d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 11 Apr 2023 12:58:55 +0200
Subject: [PATCH 029/729] prometheus: slightly different approach for dataplane
 compatibility (#65993)

---
 pkg/tsdb/prometheus/querydata/response.go | 20 +++++++++++++++-----
 pkg/util/converter/prom.go                | 10 ----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkg/tsdb/prometheus/querydata/response.go b/pkg/tsdb/prometheus/querydata/response.go
index 63211a227d5..4c4b2ff026a 100644
--- a/pkg/tsdb/prometheus/querydata/response.go
+++ b/pkg/tsdb/prometheus/querydata/response.go
@@ -41,7 +41,7 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt
 		if s.enableWideSeries {
 			addMetadataToWideFrame(q, frame)
 		} else {
-			addMetadataToMultiFrame(q, frame)
+			addMetadataToMultiFrame(q, frame, s.enableDataplane)
 		}
 	}
 
@@ -102,7 +102,7 @@ func (s *QueryData) processExemplars(q *models.Query, dr backend.DataResponse) b
 	}
 }
 
-func addMetadataToMultiFrame(q *models.Query, frame *data.Frame) {
+func addMetadataToMultiFrame(q *models.Query, frame *data.Frame, enableDataplane bool) {
 	if frame.Meta == nil {
 		frame.Meta = &data.FrameMeta{}
 	}
@@ -110,10 +110,20 @@ func addMetadataToMultiFrame(q *models.Query, frame *data.Frame) {
 	if len(frame.Fields) < 2 {
 		return
 	}
-	frame.Name = getName(q, frame.Fields[1])
 	frame.Fields[0].Config = &data.FieldConfig{Interval: float64(q.Step.Milliseconds())}
-	if frame.Name != "" {
-		frame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: frame.Name}
+
+	customName := getName(q, frame.Fields[1])
+	if customName != "" {
+		frame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: customName}
+	}
+
+	if enableDataplane {
+		valueField := frame.Fields[1]
+		if n, ok := valueField.Labels["__name__"]; ok {
+			valueField.Name = n
+		}
+	} else {
+		frame.Name = customName
 	}
 }
 
diff --git a/pkg/util/converter/prom.go b/pkg/util/converter/prom.go
index 702f12c0ffb..a771a9336e4 100644
--- a/pkg/util/converter/prom.go
+++ b/pkg/util/converter/prom.go
@@ -400,11 +400,6 @@ func readMatrixOrVectorWide(iter *jsoniter.Iterator, resultType string, opt Opti
 			switch l1Field {
 			case "metric":
 				iter.ReadVal(&valueField.Labels)
-				if opt.Dataplane {
-					if n, ok := valueField.Labels["__name__"]; ok {
-						valueField.Name = n
-					}
-				}
 
 			case "value":
 				timeMap, rowIdx = addValuePairToFrame(frame, timeMap, rowIdx, iter)
@@ -503,11 +498,6 @@ func readMatrixOrVectorMulti(iter *jsoniter.Iterator, resultType string, opt Opt
 			switch l1Field {
 			case "metric":
 				iter.ReadVal(&valueField.Labels)
-				if opt.Dataplane {
-					if n, ok := valueField.Labels["__name__"]; ok {
-						valueField.Name = n
-					}
-				}
 
 			case "value":
 				t, v, err := readTimeValuePair(iter)

From 3e4eb9c93e51d55b7e08be0ae07a4606fa96bf33 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 11 Apr 2023 13:29:38 +0200
Subject: [PATCH 030/729] Elasticsearch: Fix legend generated on backend
 (#66039)

* Elasticsearch: Fix legend

* Remove comments

* fix adding name to config

* Fix lint
---
 pkg/tsdb/elasticsearch/response_parser.go     | 11 ++--
 .../response_parser_frontend_test.go          | 13 +++-
 .../elasticsearch/response_parser_test.go     | 62 +++++++++----------
 .../testdata/trimedges_string.golden.jsonc    |  8 ++-
 .../metric_avg.a.golden.jsonc                 |  8 ++-
 .../metric_complex.a.golden.jsonc             | 36 +++++++----
 .../metric_extended_stats.a.golden.jsonc      | 16 +++--
 .../metric_multi.a.golden.jsonc               |  8 ++-
 .../metric_multi.b.golden.jsonc               |  8 ++-
 .../metric_percentiles.a.golden.jsonc         | 16 +++--
 .../metric_simple.a.golden.jsonc              | 18 ++++--
 .../metric_top_metrics.a.golden.jsonc         |  8 ++-
 12 files changed, 131 insertions(+), 81 deletions(-)

diff --git a/pkg/tsdb/elasticsearch/response_parser.go b/pkg/tsdb/elasticsearch/response_parser.go
index 9225cbada1f..4ffe2346977 100644
--- a/pkg/tsdb/elasticsearch/response_parser.go
+++ b/pkg/tsdb/elasticsearch/response_parser.go
@@ -85,7 +85,7 @@ func parseResponse(responses []*es.SearchResponse, targets []*Query, configuredF
 			if err != nil {
 				return &backend.QueryDataResponse{}, err
 			}
-			nameFrames(queryRes, target)
+			nameFields(queryRes, target)
 			trimDatapoints(queryRes, target)
 
 			result.Responses[target.RefID] = queryRes
@@ -806,7 +806,7 @@ func getSortedLabelValues(labels data.Labels) []string {
 	return values
 }
 
-func nameFrames(queryResult backend.DataResponse, target *Query) {
+func nameFields(queryResult backend.DataResponse, target *Query) {
 	set := make(map[string]struct{})
 	frames := queryResult.Frames
 	for _, v := range frames {
@@ -825,7 +825,10 @@ func nameFrames(queryResult backend.DataResponse, target *Query) {
 			// another is "number"
 			valueField := frame.Fields[1]
 			fieldName := getFieldName(*valueField, target, metricTypeCount)
-			frame.Name = fieldName
+			if valueField.Config == nil {
+				valueField.Config = &data.FieldConfig{}
+			}
+			valueField.Config.DisplayNameFromDS = fieldName
 		}
 	}
 }
@@ -895,7 +898,7 @@ func getFieldName(dataField data.Field, target *Query, metricTypeCount int) stri
 				found := false
 				for _, metric := range target.Metrics {
 					if metric.ID == field {
-						metricName += " " + describeMetric(metric.Type, field)
+						metricName += " " + describeMetric(metric.Type, metric.Field)
 						found = true
 					}
 				}
diff --git a/pkg/tsdb/elasticsearch/response_parser_frontend_test.go b/pkg/tsdb/elasticsearch/response_parser_frontend_test.go
index 398ff18aecd..e3b8f3d7305 100644
--- a/pkg/tsdb/elasticsearch/response_parser_frontend_test.go
+++ b/pkg/tsdb/elasticsearch/response_parser_frontend_test.go
@@ -61,7 +61,18 @@ func requireFloatAt(t *testing.T, expected float64, field *data.Field, index int
 }
 
 func requireTimeSeriesName(t *testing.T, expected string, frame *data.Frame) {
-	require.Equal(t, expected, frame.Name)
+	getField := func() *data.Field {
+		for _, field := range frame.Fields {
+			if field.Type() != data.FieldTypeTime {
+				return field
+			}
+		}
+		return nil
+	}
+
+	field := getField()
+	require.NotNil(t, expected, field.Config)
+	require.Equal(t, expected, field.Config.DisplayNameFromDS)
 }
 
 func TestRefIdMatching(t *testing.T) {
diff --git a/pkg/tsdb/elasticsearch/response_parser_test.go b/pkg/tsdb/elasticsearch/response_parser_test.go
index 7592a356eb9..2b3bb0c345d 100644
--- a/pkg/tsdb/elasticsearch/response_parser_test.go
+++ b/pkg/tsdb/elasticsearch/response_parser_test.go
@@ -63,7 +63,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "Count")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
 		})
 
 		t.Run("Simple query count & avg aggregation", func(t *testing.T) {
@@ -112,7 +112,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "Count")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -121,7 +121,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "Average value")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average value")
 		})
 
 		t.Run("Single group by query one metric", func(t *testing.T) {
@@ -175,7 +175,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "server1")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -183,7 +183,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "server2")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2")
 		})
 
 		t.Run("Single group by query two metrics", func(t *testing.T) {
@@ -244,7 +244,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "server1 Count")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Count")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -252,7 +252,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "server1 Average @value")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Average @value")
 
 			frame = dataframes[2]
 			require.Len(t, frame.Fields, 2)
@@ -260,7 +260,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "server2 Count")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Count")
 
 			frame = dataframes[3]
 			require.Len(t, frame.Fields, 2)
@@ -268,7 +268,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "server2 Average @value")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Average @value")
 		})
 
 		t.Run("With percentiles", func(t *testing.T) {
@@ -316,7 +316,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "p75")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "p75")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -324,7 +324,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "p90")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "p90")
 		})
 
 		t.Run("With extended stats", func(t *testing.T) {
@@ -397,7 +397,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "server1 Max")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Max")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -405,7 +405,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "server1 Std Dev Lower")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Std Dev Lower")
 
 			frame = dataframes[2]
 			require.Len(t, frame.Fields, 2)
@@ -413,7 +413,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "server1 Std Dev Upper")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Std Dev Upper")
 
 			frame = dataframes[3]
 			require.Len(t, frame.Fields, 2)
@@ -421,7 +421,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "server2 Max")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Max")
 
 			frame = dataframes[4]
 			require.Len(t, frame.Fields, 2)
@@ -429,7 +429,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "server2 Std Dev Lower")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Std Dev Lower")
 
 			frame = dataframes[5]
 			require.Len(t, frame.Fields, 2)
@@ -437,7 +437,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "server2 Std Dev Upper")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Std Dev Upper")
 		})
 
 		t.Run("Single group by with alias pattern", func(t *testing.T) {
@@ -500,7 +500,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "server1 Count and {{not_exist}} server1")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Count and {{not_exist}} server1")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -508,7 +508,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "server2 Count and {{not_exist}} server2")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Count and {{not_exist}} server2")
 
 			frame = dataframes[2]
 			require.Len(t, frame.Fields, 2)
@@ -516,7 +516,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "0 Count and {{not_exist}} 0")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "0 Count and {{not_exist}} 0")
 		})
 
 		t.Run("Histogram response", func(t *testing.T) {
@@ -602,7 +602,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "@metric:cpu")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "@metric:cpu")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -610,7 +610,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "@metric:logins.count")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "@metric:logins.count")
 		})
 
 		t.Run("With drop first and last aggregation (numeric)", func(t *testing.T) {
@@ -670,7 +670,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "Average")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -678,7 +678,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "Count")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
 		})
 
 		t.Run("With drop first and last aggregation (string)", func(t *testing.T) {
@@ -738,7 +738,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "Average")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -746,7 +746,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Name, "Count")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
 		})
 
 		t.Run("Larger trimEdges value", func(t *testing.T) {
@@ -949,7 +949,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "Sum @value")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Sum @value")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -957,7 +957,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "Max @value")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Max @value")
 
 			frame = dataframes[2]
 			require.Len(t, frame.Fields, 2)
@@ -965,7 +965,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Name, "Sum @value * Max @value")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Sum @value * Max @value")
 		})
 
 		t.Run("Terms with two bucket_script", func(t *testing.T) {
@@ -1543,7 +1543,7 @@ func TestResponseParser(t *testing.T) {
 		assert.Len(t, frame.Fields, 2)
 		require.Equal(t, frame.Fields[0].Len(), 2)
 		require.Equal(t, frame.Fields[1].Len(), 2)
-		assert.Equal(t, frame.Name, "Top Metrics @value")
+		assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Top Metrics @value")
 		v, _ := frame.FloatAt(0, 0)
 		assert.Equal(t, 1609459200000., v)
 		v, _ = frame.FloatAt(1, 0)
@@ -1560,7 +1560,7 @@ func TestResponseParser(t *testing.T) {
 		assert.Len(t, frame.Fields, 2)
 		require.Equal(t, frame.Fields[0].Len(), 2)
 		require.Equal(t, frame.Fields[1].Len(), 2)
-		assert.Equal(t, frame.Name, "Top Metrics @anotherValue")
+		assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Top Metrics @anotherValue")
 		v, _ = frame.FloatAt(0, 0)
 		assert.Equal(t, 1609459200000., v)
 		v, _ = frame.FloatAt(1, 0)
diff --git a/pkg/tsdb/elasticsearch/testdata/trimedges_string.golden.jsonc b/pkg/tsdb/elasticsearch/testdata/trimedges_string.golden.jsonc
index 59b2f6fae2b..b16bfc9bd9a 100644
--- a/pkg/tsdb/elasticsearch/testdata/trimedges_string.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata/trimedges_string.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: Count
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+------------------+
 //  | Name: Time                    | Name: Value      |
@@ -26,7 +26,6 @@
   "frames": [
     {
       "schema": {
-        "name": "Count",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -49,7 +48,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "Count"
+            }
           }
         ]
       },
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc
index 332e0a3e542..22005bf997f 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: Average counter
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+------------------+
 //  | Name: Time                        | Name: Value      |
@@ -26,7 +26,6 @@
   "frames": [
     {
       "schema": {
-        "name": "Average counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -49,7 +48,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "Average counter"
+            }
           }
         ]
       },
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc
index 44961dd47d8..cbbf26e2fd8 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: val3 Max float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
@@ -28,7 +28,7 @@
 //          0
 //      ]
 //  }
-//  Name: val3 Min float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
@@ -49,7 +49,7 @@
 //          0
 //      ]
 //  }
-//  Name: val2 Max float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
@@ -70,7 +70,7 @@
 //          0
 //      ]
 //  }
-//  Name: val2 Min float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
@@ -91,7 +91,7 @@
 //          0
 //      ]
 //  }
-//  Name: val1 Max float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
@@ -112,7 +112,7 @@
 //          0
 //      ]
 //  }
-//  Name: val1 Min float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
@@ -131,7 +131,6 @@
   "frames": [
     {
       "schema": {
-        "name": "val3 Max float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -156,6 +155,9 @@
             },
             "labels": {
               "label": "val3"
+            },
+            "config": {
+              "displayNameFromDS": "val3 Max float"
             }
           }
         ]
@@ -177,7 +179,6 @@
     },
     {
       "schema": {
-        "name": "val3 Min float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -202,6 +203,9 @@
             },
             "labels": {
               "label": "val3"
+            },
+            "config": {
+              "displayNameFromDS": "val3 Min float"
             }
           }
         ]
@@ -223,7 +227,6 @@
     },
     {
       "schema": {
-        "name": "val2 Max float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -248,6 +251,9 @@
             },
             "labels": {
               "label": "val2"
+            },
+            "config": {
+              "displayNameFromDS": "val2 Max float"
             }
           }
         ]
@@ -269,7 +275,6 @@
     },
     {
       "schema": {
-        "name": "val2 Min float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -294,6 +299,9 @@
             },
             "labels": {
               "label": "val2"
+            },
+            "config": {
+              "displayNameFromDS": "val2 Min float"
             }
           }
         ]
@@ -315,7 +323,6 @@
     },
     {
       "schema": {
-        "name": "val1 Max float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -340,6 +347,9 @@
             },
             "labels": {
               "label": "val1"
+            },
+            "config": {
+              "displayNameFromDS": "val1 Max float"
             }
           }
         ]
@@ -361,7 +371,6 @@
     },
     {
       "schema": {
-        "name": "val1 Min float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -386,6 +395,9 @@
             },
             "labels": {
               "label": "val1"
+            },
+            "config": {
+              "displayNameFromDS": "val1 Min float"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc
index ef26770774e..6b51aa33988 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: Std Dev Lower counter
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+--------------------+
 //  | Name: Time                        | Name: Value        |
@@ -28,7 +28,7 @@
 //          0
 //      ]
 //  }
-//  Name: Std Dev Upper counter
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+--------------------+
 //  | Name: Time                        | Name: Value        |
@@ -47,7 +47,6 @@
   "frames": [
     {
       "schema": {
-        "name": "Std Dev Lower counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -70,7 +69,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "Std Dev Lower counter"
+            }
           }
         ]
       },
@@ -91,7 +93,6 @@
     },
     {
       "schema": {
-        "name": "Std Dev Upper counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -114,7 +115,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "Std Dev Upper counter"
+            }
           }
         ]
       },
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc
index 422064808fe..7ca6e62de3a 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: Max float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+-------------------+
 //  | Name: Time                    | Name: Value       |
@@ -26,7 +26,6 @@
   "frames": [
     {
       "schema": {
-        "name": "Max float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -49,7 +48,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "Max float"
+            }
           }
         ]
       },
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc
index 83eac404c90..61dd567194f 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: Min float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+---------------------+
 //  | Name: Time                    | Name: Value         |
@@ -26,7 +26,6 @@
   "frames": [
     {
       "schema": {
-        "name": "Min float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -49,7 +48,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "Min float"
+            }
           }
         ]
       },
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc
index 4bb41abd139..a33daf632dc 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: p25.0 counter
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+------------------+
 //  | Name: Time                        | Name: Value      |
@@ -28,7 +28,7 @@
 //          0
 //      ]
 //  }
-//  Name: p75.0 counter
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+------------------+
 //  | Name: Time                        | Name: Value      |
@@ -47,7 +47,6 @@
   "frames": [
     {
       "schema": {
-        "name": "p25.0 counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -70,7 +69,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "p25.0 counter"
+            }
           }
         ]
       },
@@ -91,7 +93,6 @@
     },
     {
       "schema": {
-        "name": "p75.0 counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -114,7 +115,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "p75.0 counter"
+            }
           }
         ]
       },
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc
index 11741e85dd7..e67e507a976 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: val3
+//  Name: 
 //  Dimensions: 2 Fields by 4 Rows
 //  +-----------------------------------+--------------------+
 //  | Name: Time                        | Name: Value        |
@@ -29,7 +29,7 @@
 //          0
 //      ]
 //  }
-//  Name: val2
+//  Name: 
 //  Dimensions: 2 Fields by 4 Rows
 //  +-----------------------------------+--------------------+
 //  | Name: Time                        | Name: Value        |
@@ -51,7 +51,7 @@
 //          0
 //      ]
 //  }
-//  Name: val1
+//  Name: 
 //  Dimensions: 2 Fields by 4 Rows
 //  +-----------------------------------+--------------------+
 //  | Name: Time                        | Name: Value        |
@@ -71,7 +71,6 @@
   "frames": [
     {
       "schema": {
-        "name": "val3",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -96,6 +95,9 @@
             },
             "labels": {
               "label": "val3"
+            },
+            "config": {
+              "displayNameFromDS": "val3"
             }
           }
         ]
@@ -119,7 +121,6 @@
     },
     {
       "schema": {
-        "name": "val2",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -144,6 +145,9 @@
             },
             "labels": {
               "label": "val2"
+            },
+            "config": {
+              "displayNameFromDS": "val2"
             }
           }
         ]
@@ -167,7 +171,6 @@
     },
     {
       "schema": {
-        "name": "val1",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -192,6 +195,9 @@
             },
             "labels": {
               "label": "val1"
+            },
+            "config": {
+              "displayNameFromDS": "val1"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc
index 3f76101bac4..e02d8f90d05 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: Top Metrics float
+//  Name: 
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+-------------------+
 //  | Name: Time                        | Name: Value       |
@@ -26,7 +26,6 @@
   "frames": [
     {
       "schema": {
-        "name": "Top Metrics float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -49,7 +48,10 @@
               "frame": "float64",
               "nullable": true
             },
-            "labels": {}
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "Top Metrics float"
+            }
           }
         ]
       },

From 0aa301e251f2799ca9a96598a059eaf5c9d5045e Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 11 Apr 2023 13:05:08 +0100
Subject: [PATCH 031/729] Navigation: Scrolled hamburger menu links now
 navigate correctly in Safari (#66261)

overlayProps/dialogProps need to go inside FocusScope
---
 public/app/core/components/MegaMenu/NavBarMenu.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/core/components/MegaMenu/NavBarMenu.tsx b/public/app/core/components/MegaMenu/NavBarMenu.tsx
index 7e34dc45069..0522c1eefa3 100644
--- a/public/app/core/components/MegaMenu/NavBarMenu.tsx
+++ b/public/app/core/components/MegaMenu/NavBarMenu.tsx
@@ -61,8 +61,8 @@ export function NavBarMenu({ activeItem, navItems, searchBarHidden, onClose }: P
         timeout={{ enter: animationSpeed, exit: 0 }}
         onExited={onClose}
       >
-        <div data-testid="navbarmenu" ref={ref} {...overlayProps} {...dialogProps} className={styles.container}>
-          <FocusScope contain autoFocus>
+        <FocusScope contain autoFocus>
+          <div data-testid="navbarmenu" ref={ref} {...overlayProps} {...dialogProps} className={styles.container}>
             <div className={styles.mobileHeader}>
               <Icon name="bars" size="xl" />
               <IconButton
@@ -82,8 +82,8 @@ export function NavBarMenu({ activeItem, navItems, searchBarHidden, onClose }: P
                 </ul>
               </CustomScrollbar>
             </nav>
-          </FocusScope>
-        </div>
+          </div>
+        </FocusScope>
       </CSSTransition>
       <CSSTransition
         nodeRef={backdropRef}

From 02a8bc76d20f4fc63b3e9d727dbffd43ce0160f2 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Tue, 11 Apr 2023 15:54:55 +0300
Subject: [PATCH 032/729] SQL Datasources: Fix variable throwing error if query
 returns no data (#65937)

* Fix SQL query variable throwing error if query returns no data

* Tests to verify that metricFindQuery returns properly and doesn't throw error

* Fix all codepaths that might throw errors because of undefined backendSrv response
---
 .../plugins/sql/datasource/SqlDatasource.ts   |   2 +-
 .../datasource/mssql/datasource.test.ts       | 128 ++++++++++++++
 .../plugins/datasource/mssql/datasource.ts    |   4 +-
 .../datasource/mysql/specs/datasource.test.ts | 159 ++++++++++++++++--
 .../datasource/postgres/datasource.test.ts    | 156 +++++++++++++++++
 .../plugins/datasource/postgres/datasource.ts |  16 +-
 6 files changed, 443 insertions(+), 22 deletions(-)

diff --git a/public/app/features/plugins/sql/datasource/SqlDatasource.ts b/public/app/features/plugins/sql/datasource/SqlDatasource.ts
index 1128826b9cd..974a8f4c0dd 100644
--- a/public/app/features/plugins/sql/datasource/SqlDatasource.ts
+++ b/public/app/features/plugins/sql/datasource/SqlDatasource.ts
@@ -164,7 +164,7 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
         .pipe(
           map((res: FetchResponse<BackendDataSourceResponse>) => {
             const rsp = toDataQueryResponse(res, queries);
-            return rsp.data[0];
+            return rsp.data[0] ?? { fields: [] };
           })
         )
     );
diff --git a/public/app/plugins/datasource/mssql/datasource.test.ts b/public/app/plugins/datasource/mssql/datasource.test.ts
index fbd08120245..36a1b17113f 100644
--- a/public/app/plugins/datasource/mssql/datasource.test.ts
+++ b/public/app/plugins/datasource/mssql/datasource.test.ts
@@ -5,6 +5,7 @@ import {
   dataFrameToJSON,
   DataSourceInstanceSettings,
   dateTime,
+  FieldType,
   MetricFindValue,
   MutableDataFrame,
   TimeRange,
@@ -80,6 +81,133 @@ describe('MSSQLDatasource', () => {
     });
   });
 
+  describe('When runSql returns an empty dataframe', () => {
+    const response = {
+      results: {
+        tempvar: {
+          refId: 'tempvar',
+          frames: [],
+        },
+      },
+    };
+
+    beforeEach(async () => {
+      fetchMock.mockImplementation(() => of(createFetchResponse(response)));
+    });
+
+    it('should return an empty array when metricFindQuery is called', async () => {
+      const query = 'select * from atable';
+      const results = await ctx.ds.metricFindQuery(query);
+      expect(results.length).toBe(0);
+    });
+
+    it('should return an empty array when fetchDatasets is called', async () => {
+      const results = await ctx.ds.fetchDatasets();
+      expect(results.length).toBe(0);
+    });
+
+    it('should return an empty array when fetchTables is called', async () => {
+      const results = await ctx.ds.fetchTables();
+      expect(results.length).toBe(0);
+    });
+
+    it('should return an empty array when fetchFields is called', async () => {
+      const query: SQLQuery = {
+        refId: 'refId',
+        table: 'schema.table',
+        dataset: 'dataset',
+      };
+      const results = await ctx.ds.fetchFields(query);
+      expect(results.length).toBe(0);
+    });
+  });
+
+  describe('When runSql returns a populated dataframe', () => {
+    it('should return a list of datasets when fetchDatasets is called', async () => {
+      const fetchDatasetsResponse = {
+        results: {
+          datasets: {
+            refId: 'datasets',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [{ name: 'name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+      fetchMock.mockImplementation(() => of(createFetchResponse(fetchDatasetsResponse)));
+
+      const results = await ctx.ds.fetchDatasets();
+      expect(results.length).toBe(3);
+      expect(results).toEqual(['test1', 'test2', 'test3']);
+    });
+
+    it('should return a list of tables when fetchTables is called', async () => {
+      const fetchTableResponse = {
+        results: {
+          tables: {
+            refId: 'tables',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [{ name: 'schemaAndName', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      fetchMock.mockImplementation(() => of(createFetchResponse(fetchTableResponse)));
+
+      const results = await ctx.ds.fetchTables();
+      expect(results.length).toBe(3);
+      expect(results).toEqual(['test1', 'test2', 'test3']);
+    });
+
+    it('should return a list of fields when fetchFields is called', async () => {
+      const fetchFieldsResponse = {
+        results: {
+          columns: {
+            refId: 'columns',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [
+                    { name: 'column', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
+                    { name: 'type', type: FieldType.string, values: ['int', 'char', 'bool'] },
+                  ],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      fetchMock.mockImplementation(() => of(createFetchResponse(fetchFieldsResponse)));
+
+      const sqlQuery: SQLQuery = {
+        refId: 'fields',
+        table: 'table',
+        dataset: 'dataset',
+      };
+      const results = await ctx.ds.fetchFields(sqlQuery);
+      expect(results.length).toBe(3);
+      expect(results[0].label).toBe('test1');
+      expect(results[0].value).toBe('test1');
+      expect(results[0].type).toBe('int');
+      expect(results[1].label).toBe('test2');
+      expect(results[1].value).toBe('test2');
+      expect(results[1].type).toBe('char');
+      expect(results[2].label).toBe('test3');
+      expect(results[2].value).toBe('test3');
+      expect(results[2].type).toBe('bool');
+    });
+  });
+
   describe('When performing metricFindQuery with key, value columns', () => {
     let results: MetricFindValue[];
     const query = 'select * from atable';
diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts
index 0ceacf28e0a..5f85575d54b 100644
--- a/public/app/plugins/datasource/mssql/datasource.ts
+++ b/public/app/plugins/datasource/mssql/datasource.ts
@@ -23,13 +23,13 @@ export class MssqlDatasource extends SqlDatasource {
 
   async fetchDatasets(): Promise<string[]> {
     const datasets = await this.runSql<{ name: string[] }>(showDatabases(), { refId: 'datasets' });
-    return datasets.fields.name.values.toArray().flat();
+    return datasets.fields.name?.values.toArray().flat() ?? [];
   }
 
   async fetchTables(dataset?: string): Promise<string[]> {
     // We get back the table name with the schema as well. like dbo.table
     const tables = await this.runSql<{ schemaAndName: string[] }>(getSchemaAndName(dataset), { refId: 'tables' });
-    return tables.fields.schemaAndName.values.toArray().flat();
+    return tables.fields.schemaAndName?.values.toArray().flat() ?? [];
   }
 
   async fetchFields(query: SQLQuery): Promise<SQLSelectableValue[]> {
diff --git a/public/app/plugins/datasource/mysql/specs/datasource.test.ts b/public/app/plugins/datasource/mysql/specs/datasource.test.ts
index b6d9bc589a7..9e6c749b4d6 100644
--- a/public/app/plugins/datasource/mysql/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/mysql/specs/datasource.test.ts
@@ -5,6 +5,7 @@ import {
   DataQueryRequest,
   DataSourceInstanceSettings,
   dateTime,
+  FieldType,
   MutableDataFrame,
 } from '@grafana/data';
 import { FetchResponse, setBackendSrv } from '@grafana/runtime';
@@ -17,7 +18,7 @@ import { MySqlDatasource } from '../MySqlDatasource';
 import { MySQLOptions } from '../types';
 
 describe('MySQLDatasource', () => {
-  const setupTextContext = (response: unknown) => {
+  const setupTestContext = (response: unknown) => {
     jest.clearAllMocks();
     setBackendSrv(backendSrv);
     const fetchMock = jest.spyOn(backendSrv, 'fetch');
@@ -55,7 +56,7 @@ describe('MySQLDatasource', () => {
         ],
       } as unknown as DataQueryRequest<SQLQuery>;
 
-      const { ds, fetchMock } = setupTextContext({});
+      const { ds, fetchMock } = setupTestContext({});
 
       await expect(ds.query(options)).toEmitValuesWith((received) => {
         expect(received[0]).toEqual({ data: [] });
@@ -64,6 +65,132 @@ describe('MySQLDatasource', () => {
     });
   });
 
+  describe('When runSql returns an empty dataframe', () => {
+    let ds: MySqlDatasource;
+    const response = {
+      results: {
+        tempvar: {
+          refId: 'tempvar',
+          frames: [],
+        },
+      },
+    };
+
+    beforeEach(async () => {
+      ds = setupTestContext(response).ds;
+    });
+
+    it('should return an empty array when metricFindQuery is called', async () => {
+      const query = 'select * from atable';
+      const results = await ds.metricFindQuery(query);
+      expect(results.length).toBe(0);
+    });
+
+    it('should return an empty array when fetchDatasets is called', async () => {
+      const results = await ds.fetchDatasets();
+      expect(results.length).toBe(0);
+    });
+
+    it('should return an empty array when fetchTables is called', async () => {
+      const results = await ds.fetchTables();
+      expect(results.length).toBe(0);
+    });
+
+    it('should return an empty array when fetchFields is called', async () => {
+      const query: SQLQuery = {
+        refId: 'refId',
+        table: 'schema.table',
+        dataset: 'dataset',
+      };
+      const results = await ds.fetchFields(query);
+      expect(results.length).toBe(0);
+    });
+  });
+
+  describe('When runSql returns a populated dataframe', () => {
+    it('should return a list of datasets when fetchDatasets is called', async () => {
+      const fetchDatasetsResponse = {
+        results: {
+          datasets: {
+            refId: 'datasets',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [{ name: 'name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+      const { ds } = setupTestContext(fetchDatasetsResponse);
+
+      const results = await ds.fetchDatasets();
+      expect(results.length).toBe(3);
+      expect(results).toEqual(['test1', 'test2', 'test3']);
+    });
+
+    it('should return a list of tables when fetchTables is called', async () => {
+      const fetchTableResponse = {
+        results: {
+          tables: {
+            refId: 'tables',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [{ name: 'table_name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+      const { ds } = setupTestContext(fetchTableResponse);
+
+      const results = await ds.fetchTables();
+      expect(results.length).toBe(3);
+      expect(results).toEqual(['test1', 'test2', 'test3']);
+    });
+
+    it('should return a list of fields when fetchFields is called', async () => {
+      const fetchFieldsResponse = {
+        results: {
+          fields: {
+            refId: 'fields',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [
+                    { name: 'column_name', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
+                    { name: 'data_type', type: FieldType.string, values: ['int', 'char', 'bool'] },
+                  ],
+                })
+              ),
+            ],
+          },
+        },
+      };
+      const { ds } = setupTestContext(fetchFieldsResponse);
+
+      const sqlQuery: SQLQuery = {
+        refId: 'fields',
+        table: 'table',
+        dataset: 'dataset',
+      };
+      const results = await ds.fetchFields(sqlQuery);
+      expect(results.length).toBe(3);
+      expect(results[0].label).toBe('test1');
+      expect(results[0].value).toBe('test1');
+      expect(results[0].type).toBe('int');
+      expect(results[1].label).toBe('test2');
+      expect(results[1].value).toBe('test2');
+      expect(results[1].type).toBe('char');
+      expect(results[2].label).toBe('test3');
+      expect(results[2].value).toBe('test3');
+      expect(results[2].type).toBe('bool');
+    });
+  });
+
   describe('When performing metricFindQuery that returns multiple string fields', () => {
     const query = 'select * from atable';
     const response = {
@@ -88,7 +215,7 @@ describe('MySQLDatasource', () => {
     };
 
     it('should return list of all string field values', async () => {
-      const { ds } = setupTextContext(response);
+      const { ds } = setupTestContext(response);
       const results = await ds.metricFindQuery(query, {});
 
       expect(results.length).toBe(6);
@@ -121,7 +248,7 @@ describe('MySQLDatasource', () => {
     };
 
     it('should return list of all column values', async () => {
-      const { ds, fetchMock } = setupTextContext(response);
+      const { ds, fetchMock } = setupTestContext(response);
       const results = await ds.metricFindQuery(query, { searchFilter: 'aTit' });
 
       expect(fetchMock).toBeCalledTimes(1);
@@ -156,7 +283,7 @@ describe('MySQLDatasource', () => {
     };
 
     it('should return list of all column values', async () => {
-      const { ds, fetchMock } = setupTextContext(response);
+      const { ds, fetchMock } = setupTestContext(response);
       const results = await ds.metricFindQuery(query, {});
 
       expect(fetchMock).toBeCalledTimes(1);
@@ -189,7 +316,7 @@ describe('MySQLDatasource', () => {
     };
 
     it('should return list of as text, value', async () => {
-      const { ds } = setupTextContext(response);
+      const { ds } = setupTestContext(response);
       const results = await ds.metricFindQuery(query, {});
 
       expect(results.length).toBe(3);
@@ -224,7 +351,7 @@ describe('MySQLDatasource', () => {
     };
 
     it('should return list of all field values as text', async () => {
-      const { ds } = setupTextContext(response);
+      const { ds } = setupTestContext(response);
       const results = await ds.metricFindQuery(query, {});
 
       expect(results).toEqual([
@@ -262,7 +389,7 @@ describe('MySQLDatasource', () => {
     };
 
     it('should return list of unique keys', async () => {
-      const { ds } = setupTextContext(response);
+      const { ds } = setupTestContext(response);
       const results = await ds.metricFindQuery(query, {});
 
       expect(results.length).toBe(1);
@@ -274,28 +401,28 @@ describe('MySQLDatasource', () => {
   describe('When interpolating variables', () => {
     describe('and value is a string', () => {
       it('should return an unquoted value', () => {
-        const { ds, variable } = setupTextContext({});
+        const { ds, variable } = setupTestContext({});
         expect(ds.interpolateVariable('abc', variable)).toEqual('abc');
       });
     });
 
     describe('and value is a number', () => {
       it('should return an unquoted value', () => {
-        const { ds, variable } = setupTextContext({});
+        const { ds, variable } = setupTestContext({});
         expect(ds.interpolateVariable(1000, variable)).toEqual(1000);
       });
     });
 
     describe('and value is an array of strings', () => {
       it('should return comma separated quoted values', () => {
-        const { ds, variable } = setupTextContext({});
+        const { ds, variable } = setupTestContext({});
         expect(ds.interpolateVariable(['a', 'b', 'c'], variable)).toEqual("'a','b','c'");
       });
     });
 
     describe('and variable allows multi-value and value is a string', () => {
       it('should return a quoted value', () => {
-        const { ds, variable } = setupTextContext({});
+        const { ds, variable } = setupTestContext({});
         variable.multi = true;
         expect(ds.interpolateVariable('abc', variable)).toEqual("'abc'");
       });
@@ -303,7 +430,7 @@ describe('MySQLDatasource', () => {
 
     describe('and variable contains single quote', () => {
       it('should return a quoted value', () => {
-        const { ds, variable } = setupTextContext({});
+        const { ds, variable } = setupTestContext({});
         variable.multi = true;
         expect(ds.interpolateVariable("a'bc", variable)).toEqual("'a''bc'");
       });
@@ -311,7 +438,7 @@ describe('MySQLDatasource', () => {
 
     describe('and variable allows all and value is a string', () => {
       it('should return a quoted value', () => {
-        const { ds, variable } = setupTextContext({});
+        const { ds, variable } = setupTestContext({});
         variable.includeAll = true;
         expect(ds.interpolateVariable('abc', variable)).toEqual("'abc'");
       });
@@ -320,7 +447,7 @@ describe('MySQLDatasource', () => {
 
   describe('targetContainsTemplate', () => {
     it('given query that contains template variable it should return true', () => {
-      const { ds, templateSrv } = setupTextContext({});
+      const { ds, templateSrv } = setupTestContext({});
       const rawSql = `SELECT
       $__timeGroup(createdAt,'$summarize') as time_sec,
       avg(value) as value,
@@ -347,7 +474,7 @@ describe('MySQLDatasource', () => {
     });
 
     it('given query that only contains global template variable it should return false', () => {
-      const { ds, templateSrv } = setupTextContext({});
+      const { ds, templateSrv } = setupTestContext({});
       const rawSql = `SELECT
       $__timeGroup(createdAt,'$__interval') as time_sec,
       avg(value) as value,
diff --git a/public/app/plugins/datasource/postgres/datasource.test.ts b/public/app/plugins/datasource/postgres/datasource.test.ts
index e8b8eef1250..6a6c0789f35 100644
--- a/public/app/plugins/datasource/postgres/datasource.test.ts
+++ b/public/app/plugins/datasource/postgres/datasource.test.ts
@@ -7,6 +7,7 @@ import {
   DataQueryResponse,
   DataSourceInstanceSettings,
   dateTime,
+  FieldType,
   LoadingState,
   MutableDataFrame,
 } from '@grafana/data';
@@ -303,6 +304,161 @@ describe('PostgreSQLDatasource', () => {
     });
   });
 
+  describe('When runSql returns an empty dataframe', () => {
+    let ds: PostgresDatasource;
+    const response = {
+      results: {
+        tempvar: {
+          refId: 'tempvar',
+          frames: [],
+        },
+      },
+    };
+
+    beforeEach(async () => {
+      ds = setupTestContext(response).ds;
+    });
+
+    it('should return an empty array when metricFindQuery is called', async () => {
+      const query = 'select * from atable';
+      const results = await ds.metricFindQuery(query);
+      expect(results.length).toBe(0);
+    });
+
+    it('should return an empty array when fetchTables is called', async () => {
+      const results = await ds.fetchTables();
+      expect(results.length).toBe(0);
+    });
+
+    it('should return empty string when getVersion is called', async () => {
+      const results = await ds.getVersion();
+      expect(results).toBe('');
+    });
+
+    it('should return undefined when getTimescaleDBVersion is called', async () => {
+      const results = await ds.getTimescaleDBVersion();
+      expect(results).toBe(undefined);
+    });
+
+    it('should return an empty array when fetchFields is called', async () => {
+      const query: SQLQuery = {
+        refId: 'refId',
+        table: 'schema.table',
+        dataset: 'dataset',
+      };
+      const results = await ds.fetchFields(query);
+      expect(results.length).toBe(0);
+    });
+  });
+
+  describe('When runSql returns a populated dataframe', () => {
+    it('should return a list of tables when fetchTables is called', async () => {
+      const fetchTableResponse = {
+        results: {
+          tables: {
+            refId: 'tables',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [{ name: 'table', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(fetchTableResponse);
+
+      const results = await ds.fetchTables();
+      expect(results.length).toBe(3);
+      expect(results).toEqual(['test1', 'test2', 'test3']);
+    });
+
+    it('should return a version string when getVersion is called', async () => {
+      const fetchVersionResponse = {
+        results: {
+          meta: {
+            refId: 'meta',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [{ name: 'version', type: FieldType.string, values: ['test1'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(fetchVersionResponse);
+
+      const version = await ds.getVersion();
+      expect(version).toBe('test1');
+    });
+
+    it('should return a version string when getTimescaleDBVersion is called', async () => {
+      const fetchVersionResponse = {
+        results: {
+          meta: {
+            refId: 'meta',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [{ name: 'extversion', type: FieldType.string, values: ['test1'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(fetchVersionResponse);
+
+      const version = await ds.getTimescaleDBVersion();
+      expect(version).toBe('test1');
+    });
+
+    it('should return a list of fields when fetchFields is called', async () => {
+      const fetchFieldsResponse = {
+        results: {
+          columns: {
+            refId: 'columns',
+            frames: [
+              dataFrameToJSON(
+                new MutableDataFrame({
+                  fields: [
+                    { name: 'column', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
+                    { name: 'type', type: FieldType.string, values: ['int', 'char', 'bool'] },
+                  ],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(fetchFieldsResponse);
+
+      const sqlQuery: SQLQuery = {
+        refId: 'fields',
+        table: 'table',
+        dataset: 'dataset',
+      };
+      const results = await ds.fetchFields(sqlQuery);
+      expect(results.length).toBe(3);
+      expect(results[0].label).toBe('test1');
+      expect(results[0].value).toBe('test1');
+      expect(results[0].type).toBe('int');
+      expect(results[1].label).toBe('test2');
+      expect(results[1].value).toBe('test2');
+      expect(results[1].type).toBe('char');
+      expect(results[2].label).toBe('test3');
+      expect(results[2].value).toBe('test3');
+      expect(results[2].type).toBe('bool');
+    });
+  });
+
   describe('When performing metricFindQuery that returns multiple string fields', () => {
     it('should return list of all string field values', async () => {
       const query = 'select * from atable';
diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts
index 8ec07b794ce..af6d2e97e87 100644
--- a/public/app/plugins/datasource/postgres/datasource.ts
+++ b/public/app/plugins/datasource/postgres/datasource.ts
@@ -24,19 +24,29 @@ export class PostgresDatasource extends SqlDatasource {
 
   async getVersion(): Promise<string> {
     const value = await this.runSql<{ version: number }>(getVersion());
-    const results = value.fields.version.values.toArray();
+    const results = value.fields.version?.values.toArray();
+
+    if (!results) {
+      return '';
+    }
+
     return results[0].toString();
   }
 
   async getTimescaleDBVersion(): Promise<string | undefined> {
     const value = await this.runSql<{ extversion: string }>(getTimescaleDBVersion());
-    const results = value.fields.extversion.values.toArray();
+    const results = value.fields.extversion?.values.toArray();
+
+    if (!results) {
+      return undefined;
+    }
+
     return results[0];
   }
 
   async fetchTables(): Promise<string[]> {
     const tables = await this.runSql<{ table: string[] }>(showTables(), { refId: 'tables' });
-    return tables.fields.table.values.toArray().flat();
+    return tables.fields.table?.values.toArray().flat() ?? [];
   }
 
   getSqlLanguageDefinition(db: DB): LanguageDefinition {

From fda38de293f595be9bf6d1d821fecd9dcbb74082 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 11 Apr 2023 14:16:20 +0100
Subject: [PATCH 033/729] Library panels: Ensure pagination controls are always
 correctly displayed (#65283)

correctly count library panels in the general folder
---
 pkg/services/libraryelements/database.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go
index 79262251670..ee7cf98325d 100644
--- a/pkg/services/libraryelements/database.go
+++ b/pkg/services/libraryelements/database.go
@@ -422,8 +422,19 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 
 		var libraryElements []model.LibraryElement
 		countBuilder := db.SQLBuilder{}
-		countBuilder.Write("SELECT * FROM library_element AS le")
-		countBuilder.Write(" INNER JOIN dashboard AS dashboard on le.folder_id = dashboard.id")
+		if folderFilter.includeGeneralFolder {
+			countBuilder.Write(selectLibraryElementDTOWithMeta)
+			countBuilder.Write(getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect()))
+			countBuilder.Write(` WHERE le.org_id=? AND le.folder_id=0`, signedInUser.OrgID)
+			writeKindSQL(query, &countBuilder)
+			writeSearchStringSQL(query, l.SQLStore, &countBuilder)
+			writeExcludeSQL(query, &countBuilder)
+			writeTypeFilterSQL(typeFilter, &countBuilder)
+			countBuilder.Write(" UNION ")
+		}
+		countBuilder.Write(selectLibraryElementDTOWithMeta)
+		countBuilder.Write(getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect()))
+		countBuilder.Write(" INNER JOIN dashboard AS dashboard on le.folder_id = dashboard.id and le.folder_id<>0")
 		countBuilder.Write(` WHERE le.org_id=?`, signedInUser.OrgID)
 		writeKindSQL(query, &countBuilder)
 		writeSearchStringSQL(query, l.SQLStore, &countBuilder)

From 5df9e64986e8c0324b4da96de5b55e533c3990ed Mon Sep 17 00:00:00 2001
From: Gabriel MABILLE <gamab@users.noreply.github.com>
Date: Tue, 11 Apr 2023 15:21:19 +0200
Subject: [PATCH 034/729] AuthN: feature flag for external service
 authentication (#66160)

* AuthN: feature flag for external service authentication

* Change the description message
---
 .../configure-grafana/feature-toggles/index.md        | 11 ++++++-----
 packages/grafana-data/src/types/featureToggles.gen.ts |  1 +
 pkg/services/featuremgmt/registry.go                  |  7 +++++++
 pkg/services/featuremgmt/toggles_gen.csv              |  1 +
 pkg/services/featuremgmt/toggles_gen.go               |  4 ++++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 310230be7ed..5b8a2f758e7 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -113,8 +113,9 @@ Alpha features might be changed or removed without prior notice.
 
 The following toggles require explicitly setting Grafana's [app mode]({{< relref "../_index.md/#app_mode" >}}) to 'development' before you can enable this feature toggle. These features tend to be experimental.
 
-| Feature toggle name | Description                                         |
-| ------------------- | --------------------------------------------------- |
-| `k8s`               | Explore native k8s integrations                     |
-| `entityStore`       | SQL-based entity store (requires storage flag also) |
-| `nestedFolders`     | Enable folder nesting                               |
+| Feature toggle name   | Description                                                    |
+| --------------------- | -------------------------------------------------------------- |
+| `k8s`                 | Explore native k8s integrations                                |
+| `entityStore`         | SQL-based entity store (requires storage flag also)            |
+| `nestedFolders`       | Enable folder nesting                                          |
+| `externalServiceAuth` | Starts an OAuth2 authentication provider for external services |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 862a2542cb7..d8fea398788 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -94,5 +94,6 @@ export interface FeatureToggles {
   unifiedRequestLog?: boolean;
   renderAuthJWT?: boolean;
   pyroscopeFlameGraph?: boolean;
+  externalServiceAuth?: boolean;
   dataplaneFrontendFallback?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index b4855827ac9..8751d8b34cb 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -505,6 +505,13 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaObservabilityTracesAndProfilingSquad,
 		},
+		{
+			Name:            "externalServiceAuth",
+			Description:     "Starts an OAuth2 authentication provider for external services",
+			State:           FeatureStateAlpha,
+			RequiresDevMode: true,
+			Owner:           grafanaAuthnzSquad,
+		},
 		{
 			Name:         "dataplaneFrontendFallback",
 			Description:  "Support dataplane contract field name change for transformations and field name matchers where the name is different",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 550a4eb02d9..b4a0d44b016 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -75,4 +75,5 @@ alertStateHistoryLokiOnly,alpha,@grafana/alerting-squad,false,false,false,false
 unifiedRequestLog,alpha,@grafana/backend-platform,false,false,false,false
 renderAuthJWT,beta,@grafana/grafana-as-code,false,false,false,false
 pyroscopeFlameGraph,alpha,@grafana/observability-traces-and-profiling,false,false,false,false
+externalServiceAuth,alpha,@grafana/grafana-authnz-team,true,false,false,false
 dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index dc74c116dce..f79f1cf9c9e 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -311,6 +311,10 @@ const (
 	// Changes flame graph to pyroscope one
 	FlagPyroscopeFlameGraph = "pyroscopeFlameGraph"
 
+	// FlagExternalServiceAuth
+	// Starts an OAuth2 authentication provider for external services
+	FlagExternalServiceAuth = "externalServiceAuth"
+
 	// FlagDataplaneFrontendFallback
 	// Support dataplane contract field name change for transformations and field name matchers where the name is different
 	FlagDataplaneFrontendFallback = "dataplaneFrontendFallback"

From 931ae02f2642e0b09aaf449862bc315e7d98f9db Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matyax@gmail.com>
Date: Tue, 11 Apr 2023 16:26:50 +0200
Subject: [PATCH 035/729] Logs Navigation: Scroll to first log when using
 pagination (#66214)

* Logs: add reference to the start of the logs

* Logs: Improve pagination by scrolling to the first log

* Logs: move first log ref

* Logs navigation: reset scroll on page changes

* Update tests

* Logs navigation: unify reference to start of logs for scrolling to top

* Chore: update test title

* Move scrolling reference a bit more to the top
---
 public/app/features/explore/Logs.tsx          |  3 +-
 .../features/explore/LogsNavigation.test.tsx  | 20 ++++++++---
 .../app/features/explore/LogsNavigation.tsx   | 33 ++++++++++++++-----
 .../explore/LogsNavigationPages.test.tsx      | 12 +++++--
 .../features/explore/LogsNavigationPages.tsx  | 20 +++--------
 5 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index 263595de654..63964d11b06 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -397,7 +397,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
           )}
         </Collapse>
         <Collapse label="Logs" loading={loading} isOpen className={styleOverridesForStickyNavigation}>
-          <div className={styles.logOptions} ref={this.topLogsRef}>
+          <div className={styles.logOptions}>
             <InlineFieldRow>
               <InlineField label="Time" className={styles.horizontalInlineLabel} transparent>
                 <InlineSwitch
@@ -471,6 +471,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
               </InlineField>
             </div>
           </div>
+          <div ref={this.topLogsRef} />
           <LogsMetaRow
             logRows={logRows}
             meta={logsMeta || []}
diff --git a/public/app/features/explore/LogsNavigation.test.tsx b/public/app/features/explore/LogsNavigation.test.tsx
index 4d25677bb39..dfb0c09b6d8 100644
--- a/public/app/features/explore/LogsNavigation.test.tsx
+++ b/public/app/features/explore/LogsNavigation.test.tsx
@@ -1,4 +1,5 @@
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React, { ComponentProps } from 'react';
 
 import { LogsSortOrder } from '@grafana/data';
@@ -25,7 +26,7 @@ const defaultProps: LogsNavigationProps = {
   clearCache: jest.fn(),
 };
 
-const setup = (propOverrides?: object) => {
+const setup = (propOverrides?: Partial<LogsNavigationProps>) => {
   const props = {
     ...defaultProps,
     ...propOverrides,
@@ -73,10 +74,10 @@ describe('LogsNavigation', () => {
     expect(screen.getByTestId('logsNavigationPages')).toBeInTheDocument();
   });
 
-  it('should correctly request older logs when flipped order', () => {
+  it('should correctly request older logs when flipped order', async () => {
     const onChangeTimeMock = jest.fn();
     const { rerender } = setup({ onChangeTime: onChangeTimeMock });
-    fireEvent.click(screen.getByTestId('olderLogsButton'));
+    await userEvent.click(screen.getByTestId('olderLogsButton'));
     expect(onChangeTimeMock).toHaveBeenCalledWith({ from: 1637319359000, to: 1637322959000 });
 
     rerender(
@@ -88,7 +89,16 @@ describe('LogsNavigation', () => {
         logsSortOrder={LogsSortOrder.Ascending}
       />
     );
-    fireEvent.click(screen.getByTestId('olderLogsButton'));
+    await userEvent.click(screen.getByTestId('olderLogsButton'));
     expect(onChangeTimeMock).toHaveBeenCalledWith({ from: 1637319338000, to: 1637322938000 });
   });
+
+  it('should reset the scroll when pagination is clic ked', async () => {
+    const scrollToTopLogsMock = jest.fn();
+    setup({ scrollToTopLogs: scrollToTopLogsMock });
+
+    expect(scrollToTopLogsMock).not.toHaveBeenCalled();
+    await userEvent.click(screen.getByTestId('olderLogsButton'));
+    expect(scrollToTopLogsMock).toHaveBeenCalled();
+  });
 });
diff --git a/public/app/features/explore/LogsNavigation.tsx b/public/app/features/explore/LogsNavigation.tsx
index ba3193c7594..250ac8c6e89 100644
--- a/public/app/features/explore/LogsNavigation.tsx
+++ b/public/app/features/explore/LogsNavigation.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
 import { isEqual } from 'lodash';
-import React, { memo, useEffect, useRef, useState } from 'react';
+import React, { memo, useCallback, useEffect, useRef, useState } from 'react';
 
 import { AbsoluteTimeRange, GrafanaTheme2, LogsSortOrder, TimeZone } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
@@ -54,7 +54,7 @@ function LogsNavigation({
   const onFirstPage = oldestLogsFirst ? currentPageIndex === pages.length - 1 : currentPageIndex === 0;
   const onLastPage = oldestLogsFirst ? currentPageIndex === 0 : currentPageIndex === pages.length - 1;
   const theme = useTheme2();
-  const styles = getStyles(theme, oldestLogsFirst, loading);
+  const styles = getStyles(theme, oldestLogsFirst);
 
   // Main effect to set pages and index
   useEffect(() => {
@@ -91,10 +91,13 @@ function LogsNavigation({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  const changeTime = ({ from, to }: AbsoluteTimeRange) => {
-    expectedRangeRef.current = { from, to };
-    onChangeTime({ from, to });
-  };
+  const changeTime = useCallback(
+    ({ from, to }: AbsoluteTimeRange) => {
+      expectedRangeRef.current = { from, to };
+      onChangeTime({ from, to });
+    },
+    [onChangeTime]
+  );
 
   const sortPages = (a: LogsPage, b: LogsPage, logsSortOrder?: LogsSortOrder | null) => {
     if (logsSortOrder === LogsSortOrder.Ascending) {
@@ -123,6 +126,7 @@ function LogsNavigation({
           //If we are on the last page, create new range
           changeTime({ from: visibleRange.from - rangeSpanRef.current, to: visibleRange.from });
         }
+        scrollToTopLogs();
       }}
       disabled={loading}
     >
@@ -150,6 +154,7 @@ function LogsNavigation({
             to: pages[currentPageIndex + indexChange].queryRange.to,
           });
         }
+        scrollToTopLogs();
         //If we are on the first page, button is disabled and we do nothing
       }}
       disabled={loading || onFirstPage}
@@ -162,6 +167,18 @@ function LogsNavigation({
     </Button>
   );
 
+  const onPageClick = useCallback(
+    (page: LogsPage, pageNumber: number) => {
+      reportInteraction('grafana_explore_logs_pagination_clicked', {
+        pageType: 'page',
+        pageNumber,
+      });
+      !loading && changeTime({ from: page.queryRange.from, to: page.queryRange.to });
+      scrollToTopLogs();
+    },
+    [changeTime, loading, scrollToTopLogs]
+  );
+
   return (
     <div className={styles.navContainer}>
       {oldestLogsFirst ? olderLogsButton : newerLogsButton}
@@ -171,7 +188,7 @@ function LogsNavigation({
         oldestLogsFirst={oldestLogsFirst}
         timeZone={timeZone}
         loading={loading}
-        changeTime={changeTime}
+        onClick={onPageClick}
       />
       {oldestLogsFirst ? newerLogsButton : olderLogsButton}
       <Button
@@ -189,7 +206,7 @@ function LogsNavigation({
 
 export default memo(LogsNavigation);
 
-const getStyles = (theme: GrafanaTheme2, oldestLogsFirst: boolean, loading: boolean) => {
+const getStyles = (theme: GrafanaTheme2, oldestLogsFirst: boolean) => {
   const navContainerHeight = theme.flags.topnav
     ? `calc(100vh - 2*${theme.spacing(2)} - 2*${TOP_BAR_LEVEL_HEIGHT}px)`
     : '95vh';
diff --git a/public/app/features/explore/LogsNavigationPages.test.tsx b/public/app/features/explore/LogsNavigationPages.test.tsx
index 6320bb1d78b..bd0a4e76301 100644
--- a/public/app/features/explore/LogsNavigationPages.test.tsx
+++ b/public/app/features/explore/LogsNavigationPages.test.tsx
@@ -1,11 +1,12 @@
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React, { ComponentProps } from 'react';
 
 import { LogsNavigationPages } from './LogsNavigationPages';
 
 type LogsNavigationPagesProps = ComponentProps<typeof LogsNavigationPages>;
 
-const setup = (propOverrides?: object) => {
+const setup = (propOverrides?: Partial<LogsNavigationPagesProps>) => {
   const props: LogsNavigationPagesProps = {
     pages: [
       {
@@ -21,7 +22,7 @@ const setup = (propOverrides?: object) => {
     oldestLogsFirst: false,
     timeZone: 'local',
     loading: false,
-    changeTime: jest.fn(),
+    onClick: jest.fn(),
     ...propOverrides,
   };
 
@@ -43,4 +44,11 @@ describe('LogsNavigationPages', () => {
     expect(screen.getByText(/02:59:11 — 02:59:15/i)).toBeInTheDocument();
     expect(screen.getByText(/02:59:01 — 02:59:05/i)).toBeInTheDocument();
   });
+  it('should invoke the callback when clicked', async () => {
+    const onPageClicked = jest.fn();
+    setup({ onClick: onPageClicked });
+    expect(onPageClicked).not.toHaveBeenCalled();
+    await userEvent.click(screen.getByText(/02:59:05 — 02:59:01/i));
+    expect(onPageClicked).toHaveBeenCalled();
+  });
 });
diff --git a/public/app/features/explore/LogsNavigationPages.tsx b/public/app/features/explore/LogsNavigationPages.tsx
index bcaf2303c08..2f8de5c7d58 100644
--- a/public/app/features/explore/LogsNavigationPages.tsx
+++ b/public/app/features/explore/LogsNavigationPages.tsx
@@ -1,8 +1,7 @@
 import { css, cx } from '@emotion/css';
 import React from 'react';
 
-import { dateTimeFormat, systemDateFormats, TimeZone, AbsoluteTimeRange, GrafanaTheme2 } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
+import { dateTimeFormat, systemDateFormats, TimeZone, GrafanaTheme2 } from '@grafana/data';
 import { CustomScrollbar, Spinner, useTheme2, clearButtonStyles } from '@grafana/ui';
 
 import { LogsPage } from './LogsNavigation';
@@ -13,17 +12,10 @@ type Props = {
   oldestLogsFirst: boolean;
   timeZone: TimeZone;
   loading: boolean;
-  changeTime: (range: AbsoluteTimeRange) => void;
+  onClick: (page: LogsPage, pageNumber: number) => void;
 };
 
-export function LogsNavigationPages({
-  pages,
-  currentPageIndex,
-  oldestLogsFirst,
-  timeZone,
-  loading,
-  changeTime,
-}: Props) {
+export function LogsNavigationPages({ pages, currentPageIndex, oldestLogsFirst, timeZone, loading, onClick }: Props) {
   const formatTime = (time: number) => {
     return `${dateTimeFormat(time, {
       format: systemDateFormats.interval.second,
@@ -54,11 +46,7 @@ export function LogsNavigationPages({
               className={cx(clearButtonStyles(theme), styles.page)}
               key={page.queryRange.to}
               onClick={() => {
-                reportInteraction('grafana_explore_logs_pagination_clicked', {
-                  pageType: 'page',
-                  pageNumber: index + 1,
-                });
-                !loading && changeTime({ from: page.queryRange.from, to: page.queryRange.to });
+                onClick(page, index + 1);
               }}
             >
               <div className={cx(styles.line, { selectedBg: currentPageIndex === index })} />

From 58f1ee15019aae5e95c7bed8d75934b13561f8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 11 Apr 2023 16:31:39 +0200
Subject: [PATCH 036/729] Alert: Restore storybook examples (#66097)

* Alert: Restore storybook examples

* Remove elevated prop from inline banner story
---
 .../components/Alert/InlineBanner.story.tsx   | 35 ++++++++
 .../src/components/Alert/Toast.story.tsx      | 90 ++++++++++++++++++-
 2 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx b/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
index a9f45c3cfe6..5da630ce66b 100644
--- a/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
+++ b/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 
 import { Alert, AlertVariant, VerticalGroup } from '@grafana/ui';
 
+import { StoryExample } from '../../utils/storybook/StoryExample';
 import { withCenteredStory, withHorizontallyCenteredStory } from '../../utils/storybook/withCenteredStory';
 import mdx from '../Alert/Alert.mdx';
 
@@ -60,4 +61,38 @@ WithActions.args = {
   buttonContent: 'Close',
 };
 
+export const Examples: ComponentStory<typeof Alert> = () => {
+  return (
+    <VerticalGroup>
+      <StoryExample name="With buttonContent and children">
+        <Alert
+          title={'The title of the alert'}
+          severity={'error'}
+          buttonContent={<span>Close</span>}
+          onRemove={action('Remove button clicked')}
+        >
+          Child content that includes some alert details, like maybe what actually happened
+        </Alert>
+      </StoryExample>
+      <StoryExample name="No dismiss">
+        <Alert title={'No dismiss'} severity={'success'} />
+      </StoryExample>
+      <StoryExample name="Severities">
+        <VerticalGroup>
+          {severities.map((severity) => (
+            <Alert
+              title={`Severity: ${severity}`}
+              severity={severity}
+              key={severity}
+              onRemove={action('Remove button clicked')}
+            >
+              Child content
+            </Alert>
+          ))}
+        </VerticalGroup>
+      </StoryExample>
+    </VerticalGroup>
+  );
+};
+
 export default meta;
diff --git a/packages/grafana-ui/src/components/Alert/Toast.story.tsx b/packages/grafana-ui/src/components/Alert/Toast.story.tsx
index 852242eead5..90cb66fd439 100644
--- a/packages/grafana-ui/src/components/Alert/Toast.story.tsx
+++ b/packages/grafana-ui/src/components/Alert/Toast.story.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 
 import { Alert, AlertVariant, VerticalGroup } from '@grafana/ui';
 
+import { StoryExample } from '../../utils/storybook/StoryExample';
 import { withCenteredStory, withHorizontallyCenteredStory } from '../../utils/storybook/withCenteredStory';
 import mdx from '../Alert/Alert.mdx';
 
@@ -29,7 +30,7 @@ const meta: ComponentMeta<typeof Alert> = {
   },
 };
 
-export const Toast: ComponentStory<typeof Alert> = (args) => {
+export const Basic: ComponentStory<typeof Alert> = (args) => {
   return (
     <div className="page-alert-list">
       <Alert {...args} elevated>
@@ -41,4 +42,91 @@ export const Toast: ComponentStory<typeof Alert> = (args) => {
   );
 };
 
+export function Examples() {
+  return (
+    <VerticalGroup>
+      <StoryExample name="Severities">
+        <VerticalGroup>
+          {severities.map((severity) => (
+            <Alert
+              title={`Severity: ${severity}`}
+              severity={severity}
+              key={severity}
+              onRemove={action('Remove button clicked')}
+              elevated={true}
+            />
+          ))}
+        </VerticalGroup>
+      </StoryExample>
+      <StoryExample name="With huge payload">
+        <Alert title="Alert with huge payload" severity="error" elevated={true}>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam metus urna, aliquam eu scelerisque non,
+          facilisis eget est. Morbi eleifend egestas massa id vulputate. Fusce dignissim magna lacus, ut molestie odio
+          feugiat sed. Cras fringilla justo sit amet turpis scelerisque, a volutpat purus iaculis. Nunc sagittis
+          molestie faucibus. Curabitur at neque luctus, pellentesque urna eget, posuere urna. Nunc malesuada elit in
+          ipsum dictum egestas. Praesent convallis mauris massa, porta mattis ex gravida ut. Proin consectetur ultrices
+          tortor sit amet efficitur. Suspendisse nec turpis dapibus mauris venenatis maximus quis eget orci. Ut semper
+          enim magna, ullamcorper elementum sapien pharetra vitae. Vivamus at nulla ut metus bibendum ornare et ut leo.
+          Proin ante turpis, ornare a malesuada et, rutrum nec lorem. Maecenas vestibulum orci vel nibh convallis
+          eleifend. Quisque vitae consectetur massa, vitae elementum mauris. Pellentesque sit amet ligula lorem. Fusce
+          sit amet lorem non augue rutrum varius. Donec sed imperdiet libero, eget venenatis elit. Fusce porttitor
+          dapibus urna. Duis fringilla ante vel tempor tincidunt. In euismod vestibulum odio sit amet iaculis. Donec vel
+          dapibus libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi lacinia commodo lectus. Aenean
+          in magna eget lectus luctus suscipit et vitae erat. Pellentesque quis ligula id lorem egestas sollicitudin sit
+          amet sed sem. Nullam et nibh a odio rhoncus efficitur sed nec est. Sed commodo lacus vitae sem congue,
+          accumsan dignissim metus iaculis. Praesent in dignissim nisl. Aliquam facilisis, sapien eget porttitor
+          ultrices, massa libero bibendum odio, at ornare diam arcu ac massa. Vestibulum egestas leo eget lorem congue
+          condimentum. Praesent egestas, neque id gravida vehicula, augue ex scelerisque lectus, finibus pellentesque
+          enim dolor vel ante. Cras convallis, sem at malesuada tincidunt, diam urna auctor leo, sed laoreet est ex in
+          libero. Ut condimentum ante eget ex gravida, id tempus metus ultricies. Pellentesque placerat, massa id
+          laoreet molestie, justo nisl varius metus, maximus vehicula erat libero vitae nulla. Mauris rhoncus ligula
+          vitae volutpat auctor. Suspendisse potenti. Quisque quis orci faucibus, ullamcorper dolor eget, mollis massa.
+          Etiam eu molestie ipsum. Sed laoreet diam metus, luctus maximus erat viverra quis. Ut eu felis dictum,
+          tincidunt erat sit amet, scelerisque neque. Orci varius natoque penatibus et magnis dis parturient montes,
+          nascetur ridiculus mus. Phasellus sit amet est tristique, fermentum massa ut, viverra metus. Interdum et
+          malesuada fames ac ante ipsum primis in faucibus. Nunc iaculis nunc elit, ut feugiat ipsum egestas eget.
+          Vestibulum pulvinar ligula mi, quis lacinia diam suscipit eget. Etiam consectetur vel nunc at hendrerit.
+          Pellentesque blandit eleifend aliquam. Etiam et malesuada purus, et bibendum sapien. Phasellus tincidunt
+          consequat eros consequat sodales. Vestibulum quis viverra neque. Integer sit amet lacinia nunc. Ut cursus,
+          elit id faucibus elementum, elit nunc dapibus tellus, non ornare nisi sapien et eros. Nunc sit amet suscipit
+          arcu. Nulla ut nunc tempor, auctor massa sed, consectetur orci. Pellentesque erat ante, placerat eget dictum
+          elementum, dapibus et ipsum. Nunc sit amet nulla gravida, finibus felis vel, tempus sem. In urna purus,
+          accumsan quis aliquam et, condimentum ac urna. Nullam volutpat ullamcorper sapien, quis ultricies purus
+          dignissim aliquam. Mauris quis enim ante. Etiam vulputate faucibus placerat. Ut pellentesque, purus vitae
+          euismod cursus, lacus enim vulputate sapien, in porttitor erat dui eu lectus. Duis eleifend, massa vel
+          vehicula gravida, magna urna rutrum ligula, vitae mollis ipsum neque id enim. Donec varius tristique nisi, et
+          vestibulum dolor efficitur eget. Cras mauris leo, bibendum eget pretium a, tincidunt faucibus massa.
+          Vestibulum hendrerit arcu magna, vel consequat est euismod nec. Vestibulum non lacus porttitor, congue tortor
+          ut, venenatis elit. Duis at lectus arcu. Nunc quis sapien eu ipsum rutrum accumsan. Orci varius natoque
+          penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus quis sapien luctus, volutpat nulla
+          eget, gravida nunc. Aenean placerat a felis quis imperdiet. Sed sapien tellus, ultrices non ipsum eget,
+          pretium rhoncus quam. Aliquam erat volutpat. Maecenas at interdum turpis, eu mattis ligula. Class aptent
+          taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In lobortis felis a leo
+          ultricies, venenatis mollis felis lobortis. Suspendisse placerat vel ante vel euismod. Aenean sit amet
+          ullamcorper mauris, id consectetur est. Ut ultricies enim non quam condimentum, et congue arcu commodo.
+          Praesent convallis eleifend turpis, vitae feugiat turpis imperdiet sit amet. Class aptent taciti sociosqu ad
+          litora torquent per conubia nostra, per inceptos himenaeos. Quisque vulputate porttitor mattis. Pellentesque
+          sed ullamcorper lectus. Suspendisse velit tortor, viverra eget facilisis condimentum, accumsan sit amet felis.
+          Cras lobortis mi fermentum ligula consectetur, vitae tincidunt mauris scelerisque. Aenean ac condimentum erat,
+          quis lacinia lacus. Ut magna nibh, tempor et ligula suscipit, placerat laoreet ipsum. In semper semper nisl.
+          Donec risus lorem, tempor sed sollicitudin vitae, fringilla et mi. Vivamus pulvinar quam nisl, et tincidunt
+          justo tempus quis. Duis semper magna nunc, vitae faucibus lectus facilisis sed. Phasellus consequat arcu vel
+          interdum fermentum. In condimentum euismod neque, sed aliquet mauris posuere nec. Etiam metus eros,
+          pellentesque eget scelerisque id, porttitor at ligula. Curabitur eget nibh maximus enim lobortis sodales.
+          Etiam vulputate ligula lobortis vestibulum pulvinar. Curabitur eros justo, accumsan sed elit ac, mattis
+          lacinia nisi. Suspendisse ullamcorper lectus sit amet tellus condimentum porttitor. Duis cursus, neque et
+          aliquam congue, odio lectus porta elit, id lacinia dolor justo non leo. Aliquam vehicula at tellus ullamcorper
+          tincidunt. Phasellus neque nibh, convallis sit amet arcu sit amet, convallis egestas tortor. Etiam sit amet
+          vehicula quam. Praesent id consequat lacus, ac facilisis quam. Integer tristique lorem eros, id consequat
+          lorem lobortis vitae. Aliquam luctus purus eget sem molestie iaculis. Duis nisl risus, sodales sit amet nunc
+          vitae, volutpat cursus augue. Pellentesque congue massa eu metus pellentesque consectetur at vel neque. Donec
+          bibendum hendrerit erat, vitae dictum enim lobortis a. Quisque ac dapibus tellus, sit amet facilisis orci.
+          Cras pretium tortor non condimentum semper. Phasellus mollis condimentum blandit. Pellentesque at arcu risus.
+          Vivamus sit amet dui semper, suscipit est nec, elementum arcu. Praesent ante turpis, convallis ac leo eget,
+        </Alert>
+      </StoryExample>
+    </VerticalGroup>
+  );
+}
+
 export default meta;

From 2031997994af807d7b3ee2bd01d04965e8a44e2a Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Tue, 11 Apr 2023 15:58:35 +0100
Subject: [PATCH 037/729] API keys: Add deprecation to api keys (#65948)

* add: deprecation to api keys write path

* boolean w. meessage

* add read and delete endpoints

* better description of deprecation

* updated with puncutations
---
 docs/sources/administration/api-keys/index.md |  2 +-
 pkg/api/apikey.go                             | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/sources/administration/api-keys/index.md b/docs/sources/administration/api-keys/index.md
index d9f4fdf8653..2b9da4c533d 100644
--- a/docs/sources/administration/api-keys/index.md
+++ b/docs/sources/administration/api-keys/index.md
@@ -17,7 +17,7 @@ An API key is a randomly generated string that external systems use to interact
 
 When you create an API key, you specify a **Role** that determines the permissions associated with the API key. Role permissions control that actions the API key can perform on Grafana resources.
 
-> **Note:** If you use Grafana v8.5 or newer, use service accounts instead of API keys. For more information, refer to [Grafana service accounts]({{< relref "../service-accounts/" >}}).
+> **Note:** If you use Grafana v9.1 or newer, use service accounts instead of API keys. For more information, refer to [Grafana service accounts]({{< relref "../service-accounts/" >}}).
 
 {{< section >}}
 
diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go
index fc48575ee50..ecd2b1e03a0 100644
--- a/pkg/api/apikey.go
+++ b/pkg/api/apikey.go
@@ -20,6 +20,11 @@ import (
 //
 // Will return auth keys.
 //
+// Deprecated: true.
+//
+// Deprecated. Please use GET /api/serviceaccounts and GET /api/serviceaccounts/{id}/tokens instead
+// see https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.
+//
 // Responses:
 // 200: getAPIkeyResponse
 // 401: unauthorisedError
@@ -66,6 +71,10 @@ func (hs *HTTPServer) GetAPIKeys(c *contextmodel.ReqContext) response.Response {
 //
 // Delete API key.
 //
+// Deletes an API key.
+// Deprecated. See: https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.
+//
+// Deprecated: true
 // Responses:
 // 200: okResponse
 // 401: unauthorisedError
@@ -99,6 +108,11 @@ func (hs *HTTPServer) DeleteAPIKey(c *contextmodel.ReqContext) response.Response
 //
 // Will return details of the created API key.
 //
+// Deprecated: true
+// Deprecated. Please use POST /api/serviceaccounts and POST /api/serviceaccounts/{id}/tokens
+//
+// see: https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.
+//
 // Responses:
 // 200: postAPIkeyResponse
 // 400: badRequestError

From facd4eca7eddc4fdd3960dc841b62f6db624a49a Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Tue, 11 Apr 2023 17:15:34 +0200
Subject: [PATCH 038/729] Plugins: Fix plugin signature calculation not working
 on Windows (#66273)

* Plugins: Fix plugin signature calculation not working on Windows

* Plugins: Added test for NTFS path separators in signature verification

* Use filepath.ToSlash and replace its implementation in tests

* Fix typo
---
 pkg/plugins/manager/signature/manifest.go     |  11 +-
 .../manager/signature/manifest_test.go        | 130 ++++++++++++++++++
 2 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/pkg/plugins/manager/signature/manifest.go b/pkg/plugins/manager/signature/manifest.go
index 1bd03488aae..4f7923b067e 100644
--- a/pkg/plugins/manager/signature/manifest.go
+++ b/pkg/plugins/manager/signature/manifest.go
@@ -12,6 +12,7 @@ import (
 	"net/url"
 	"os"
 	"path"
+	"path/filepath"
 	"runtime"
 	"strings"
 
@@ -55,7 +56,12 @@ N1c5v9v/4h6qeA==
 -----END PGP PUBLIC KEY BLOCK-----
 `
 
-var runningWindows = runtime.GOOS == "windows"
+var (
+	runningWindows = runtime.GOOS == "windows"
+
+	// toSlash is filepath.ToSlash, but can be overwritten in tests path separators cross-platform
+	toSlash = filepath.ToSlash
+)
 
 // PluginManifest holds details for the file manifest
 type PluginManifest struct {
@@ -194,6 +200,9 @@ func Calculate(ctx context.Context, mlog log.Logger, src plugins.PluginSource, p
 	// Track files missing from the manifest
 	var unsignedFiles []string
 	for _, f := range plugin.FS.Files() {
+		// Ensure slashes are used, because MANIFEST.txt always uses slashes regardless of the filesystem
+		f = toSlash(f)
+
 		// Ignoring unsigned Chromium debug.log so it doesn't invalidate the signature for Renderer plugin running on Windows
 		if runningWindows && plugin.JSONData.Type == plugins.Renderer && f == "chrome-win/debug.log" {
 			continue
diff --git a/pkg/plugins/manager/signature/manifest_test.go b/pkg/plugins/manager/signature/manifest_test.go
index 6683523762a..e3157c1b239 100644
--- a/pkg/plugins/manager/signature/manifest_test.go
+++ b/pkg/plugins/manager/signature/manifest_test.go
@@ -210,6 +210,136 @@ func TestCalculate(t *testing.T) {
 			SigningOrg: "Grafana Labs",
 		}, sig)
 	})
+
+	t.Run("Signature verification should work with any path separator", func(t *testing.T) {
+		var toSlashUnix = newToSlash('/')
+		var toSlashWindows = newToSlash('\\')
+
+		for _, tc := range []struct {
+			name    string
+			sep     string
+			toSlash func(string) string
+		}{
+			{"unix", "/", toSlashUnix},
+			{"windows", "\\", toSlashWindows},
+		} {
+			t.Run(tc.name, func(t *testing.T) {
+				// Replace toSlash for cross-platform testing
+				oldToSlash := toSlash
+				t.Cleanup(func() {
+					toSlash = oldToSlash
+				})
+				toSlash = tc.toSlash
+
+				basePath := "../testdata/app-with-child/dist"
+
+				sig, err := Calculate(context.Background(), log.NewTestLogger(), &fakes.FakePluginSource{
+					PluginClassFunc: func(ctx context.Context) plugins.Class {
+						return plugins.External
+					},
+				}, plugins.FoundPlugin{
+					JSONData: plugins.JSONData{
+						ID:   "myorgid-simple-app",
+						Type: plugins.App,
+						Info: plugins.Info{
+							Version: "%VERSION%",
+						},
+					},
+					FS: newPathSeparatorOverrideFS(tc.sep, map[string]struct{}{
+						filepath.Join(basePath, "MANIFEST.txt"):      {},
+						filepath.Join(basePath, "plugin.json"):       {},
+						filepath.Join(basePath, "child/plugin.json"): {},
+					}, basePath),
+				})
+				require.NoError(t, err)
+				require.Equal(t, plugins.Signature{
+					Status:     plugins.SignatureValid,
+					Type:       plugins.GrafanaSignature,
+					SigningOrg: "Grafana Labs",
+				}, sig)
+			})
+		}
+	})
+}
+
+// newToSlash returns a new function that acts as filepath.ToSlash but for the specified os-separator.
+// This can be used to test filepath.ToSlash-dependant code cross-platform.
+func newToSlash(sep rune) func(string) string {
+	return func(path string) string {
+		if sep == '/' {
+			return path
+		}
+		return strings.ReplaceAll(path, string(sep), "/")
+	}
+}
+
+func TestNewToSlash(t *testing.T) {
+	t.Run("unix", func(t *testing.T) {
+		toSlashUnix := newToSlash('/')
+		require.Equal(t, "folder", toSlashUnix("folder"))
+		require.Equal(t, "/folder", toSlashUnix("/folder"))
+		require.Equal(t, "/folder/file", toSlashUnix("/folder/file"))
+		require.Equal(t, "/folder/other\\file", toSlashUnix("/folder/other\\file"))
+	})
+
+	t.Run("windows", func(t *testing.T) {
+		toSlashWindows := newToSlash('\\')
+		require.Equal(t, "folder", toSlashWindows("folder"))
+		require.Equal(t, "C:/folder", toSlashWindows("C:\\folder"))
+		require.Equal(t, "folder/file.exe", toSlashWindows("folder\\file.exe"))
+	})
+}
+
+// fsPathSeparatorFiles embeds plugins.LocalFS and overrides the Files() behaviour so all the returned elements
+// have the specified path separator. This can be used to test Files() behaviour cross-platform.
+type fsPathSeparatorFiles struct {
+	plugins.LocalFS
+
+	separator string
+}
+
+// newPathSeparatorOverrideFS returns a new fsPathSeparatorFiles. Sep is the separator that will be used ONLY for
+// the elements returned by Files(). Files and basePath MUST use the os-specific path separator (filepath.Separator)
+// if Open() is required to work for the test case.
+func newPathSeparatorOverrideFS(sep string, files map[string]struct{}, basePath string) fsPathSeparatorFiles {
+	return fsPathSeparatorFiles{
+		LocalFS:   plugins.NewLocalFS(files, basePath),
+		separator: sep,
+	}
+}
+
+// Files returns LocalFS.Files(), but all path separators (filepath.Separator) are replaced with f.separator.
+func (f fsPathSeparatorFiles) Files() []string {
+	files := f.LocalFS.Files()
+	const osSepStr = string(filepath.Separator)
+	for i := 0; i < len(files); i++ {
+		files[i] = strings.ReplaceAll(files[i], osSepStr, f.separator)
+	}
+	return files
+}
+
+func TestFSPathSeparatorFiles(t *testing.T) {
+	for _, tc := range []struct {
+		name string
+		sep  string
+	}{
+		{"unix", "/"},
+		{"windows", "\\"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			fs := newPathSeparatorOverrideFS("/", map[string]struct{}{
+				"a": {},
+				strings.Join([]string{"a", "b", "c"}, tc.sep): {},
+			}, ".")
+			files := fs.Files()
+			filesMap := make(map[string]struct{}, len(files))
+			// Re-convert to map as the key order is not stable
+			for _, f := range files {
+				filesMap[f] = struct{}{}
+			}
+			require.Equal(t, filesMap, map[string]struct{}{"a": {}, strings.Join([]string{"a", "b", "c"}, tc.sep): {}})
+		})
+	}
 }
 
 func fileList(manifest *PluginManifest) []string {

From 2ecd63764e13ea104278f8d3ab4cee5a82da829d Mon Sep 17 00:00:00 2001
From: Kousik Mitra <kousikmitra12@gmail.com>
Date: Tue, 11 Apr 2023 21:31:26 +0530
Subject: [PATCH 039/729] Datasource/Loki: Add tooltip explaining resolution
 for loki query (#66283)

* Add tooltip explaining resolution for loki query

* Update tooltip text with more detail

Co-authored-by: Matias Chomicki <matyax@gmail.com>

* Fix lint error

---------

Co-authored-by: Matias Chomicki <matyax@gmail.com>
---
 .../loki/querybuilder/components/LokiQueryBuilderOptions.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
index 9dc9a702db9..12ee13f284c 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
@@ -101,7 +101,10 @@ export const LokiQueryBuilderOptions = React.memo<Props>(
               />
             </EditorField>
           )}
-          <EditorField label="Resolution">
+          <EditorField
+            label="Resolution"
+            tooltip="Sets the step parameter of Loki metrics range queries. With a resolution of 1/1, each pixel corresponds to one data point. 1/10 retrieves one data point per 10 pixels. Lower resolutions perform better."
+          >
             <Select
               isSearchable={false}
               onChange={onResolutionChange}

From dcd976dc0703aaaa572960acf74467f3aae13767 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Tue, 11 Apr 2023 17:08:05 +0100
Subject: [PATCH 040/729] Chore: Update CODEOWNERS with new partner datasources
 team name (#66306)

Update partner datasources team name
---
 .github/CODEOWNERS | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 59d3c75414e..456d9e4f8f4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -168,7 +168,7 @@
 /devenv/dev-dashboards-without-uid/ @grafana/dashboards-squad
 /devenv/dev-dashboards/ @grafana/dashboards-squad
 /devenv/docker/blocks/alert_webhook_listener/ @grafana/alerting-squad-backend
-/devenv/docker/blocks/clickhouse/ @grafana/partner-plugins
+/devenv/docker/blocks/clickhouse/ @grafana/partner-datasources
 /devenv/docker/blocks/collectd/ @grafana/observability-metrics
 /devenv/docker/blocks/grafana/ @grafana/grafana-as-code
 /devenv/docker/blocks/graphite/ @grafana/observability-metrics
@@ -231,8 +231,8 @@
 
 # OSS Plugin Partnerships backend code
 /pkg/tsdb/cloudwatch/ @grafana/aws-datasources
-/pkg/tsdb/azuremonitor/ @grafana/partner-plugins
-/pkg/tsdb/cloudmonitoring/ @grafana/partner-plugins
+/pkg/tsdb/azuremonitor/ @grafana/partner-datasources
+/pkg/tsdb/cloudmonitoring/ @grafana/partner-datasources
 
 # Observability backend code
 /pkg/tsdb/prometheus/ @grafana/observability-metrics
@@ -295,7 +295,7 @@
 /public/locales/ @grafana/grafana-frontend-platform
 /public/app/core/internationalization/ @grafana/grafana-frontend-platform
 /e2e/ @grafana/grafana-frontend-platform
-/e2e/cloud-plugins-suite/ @grafana/partner-plugins
+/e2e/cloud-plugins-suite/ @grafana/partner-datasources
 /packages/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/dataviz-squad
 /packages/grafana-e2e-selectors/ @grafana/grafana-frontend-platform
 /packages/grafana-e2e/ @grafana/grafana-frontend-platform
@@ -494,7 +494,7 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/datasource/elasticsearch/ @grafana/observability-logs
 /public/app/plugins/datasource/grafana/ @grafana/grafana-frontend-platform
 /public/app/plugins/datasource/testdata/ @grafana/plugins-platform-frontend
-/public/app/plugins/datasource/azuremonitor/ @grafana/partner-plugins
+/public/app/plugins/datasource/azuremonitor/ @grafana/partner-datasources
 /public/app/plugins/datasource/graphite/ @grafana/observability-metrics
 /public/app/plugins/datasource/influxdb/ @grafana/observability-metrics
 /public/app/plugins/datasource/jaeger/ @grafana/observability-traces-and-profiling
@@ -505,7 +505,7 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/datasource/opentsdb/ @grafana/backend-platform
 /public/app/plugins/datasource/postgres/ @grafana/grafana-bi-squad
 /public/app/plugins/datasource/prometheus/ @grafana/observability-metrics
-/public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-plugins
+/public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
 /public/app/plugins/datasource/zipkin/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/tempo/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/phlare/ @grafana/observability-traces-and-profiling
@@ -573,7 +573,7 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/backport.yml @grafana/grafana-delivery
 /.github/workflows/bump-version.yml @grafana/grafana-delivery
 /.github/workflows/close-milestone.yml @grafana/grafana-delivery
-/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-plugins @grafana/aws-datasources
+/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-datasources @grafana/aws-datasources
 /.github/workflows/codeowners-validator.yml @tolzhabayev
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo

From c4f2b50da9a60eb670912f4a6dbf26b85eb1fc0f Mon Sep 17 00:00:00 2001
From: SatVeer Singh <developer.satveer@gmail.com>
Date: Tue, 11 Apr 2023 22:07:08 +0530
Subject: [PATCH 041/729] Cloudwatch: Fix ui bug in template variable editor
 (#66207)

---
 .../components/VariableQueryEditor/VariableTextField.tsx         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx
index 16ec391826f..7e23666f82d 100644
--- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx
@@ -23,6 +23,7 @@ export const VariableTextField = ({ interactive, label, onBlur, placeholder, val
         value={localValue}
         onChange={(e) => setLocalValue(e.currentTarget.value)}
         onBlur={() => onBlur(localValue)}
+        width={25}
       />
     </InlineField>
   );

From a9bd3fc334bbde11c0d26f4f8b560e3d3694502c Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Tue, 11 Apr 2023 09:54:34 -0700
Subject: [PATCH 042/729] Timeseries: Align tooltip values to the right
 (#64096)

---
 packages/grafana-ui/src/components/VizTooltip/SeriesTable.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/grafana-ui/src/components/VizTooltip/SeriesTable.tsx b/packages/grafana-ui/src/components/VizTooltip/SeriesTable.tsx
index b8796f94c4f..e08628491aa 100644
--- a/packages/grafana-ui/src/components/VizTooltip/SeriesTable.tsx
+++ b/packages/grafana-ui/src/components/VizTooltip/SeriesTable.tsx
@@ -37,6 +37,7 @@ const getSeriesTableRowStyles = (theme: GrafanaTheme2) => {
     `,
     value: css`
       padding-left: ${theme.spacing(2)};
+      text-align: right;
     `,
     activeSeries: css`
       font-weight: ${theme.typography.fontWeightBold};

From 1ed75f97099a0893088538755dcac7e90a52f855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 11 Apr 2023 19:19:25 +0200
Subject: [PATCH 043/729] PageNotFound: Update design so that it looks better
 in topnav (#66295)

---
 public/app/AppWrapper.tsx                     |   1 -
 .../core/components/ErrorPage/ErrorPage.tsx   | 117 ++++++++++--------
 .../dashboard/containers/DashboardPage.tsx    |   2 +-
 public/app/routes/routes.tsx                  |   2 +-
 4 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index 715f1de4645..b126832386e 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -62,7 +62,6 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
         path={route.path}
         key={route.path}
         render={(props) => {
-          navigationLogger('AppWrapper', false, 'Rendering route', route, 'with match', props.location);
           // TODO[Router]: test this logic
           if (roles?.length) {
             if (!roles.some((r: string) => contextSrv.hasRole(r))) {
diff --git a/public/app/core/components/ErrorPage/ErrorPage.tsx b/public/app/core/components/ErrorPage/ErrorPage.tsx
index 9324111739a..65d934bd173 100644
--- a/public/app/core/components/ErrorPage/ErrorPage.tsx
+++ b/public/app/core/components/ErrorPage/ErrorPage.tsx
@@ -1,71 +1,78 @@
+import { css } from '@emotion/css';
 import React from 'react';
 
-import { config } from '@grafana/runtime';
-import { Icon } from '@grafana/ui';
+import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+import { VizLegendSeriesIcon } from '@grafana/ui/src/components/VizLegend/VizLegendSeriesIcon';
 
 import { Page } from '../Page/Page';
 
 export function ErrorPage() {
+  const styles = useStyles2(getStyles);
+
   return (
-    <Page navId="not-found">
-      <Page.Contents>
-        <div className="page-container page-body">
-          <div className="panel-container error-container">
-            <div className="error-column graph-box">
-              <div className="error-row">
-                <div className="error-column error-space-between graph-percentage">
-                  <p>100%</p>
-                  <p>80%</p>
-                  <p>60%</p>
-                  <p>40%</p>
-                  <p>20%</p>
-                  <p>0%</p>
-                </div>
-                <div className="error-column image-box">
-                  <img src="public/img/graph404.svg" width="100%" alt="graph" />
-                  <div className="error-row error-space-between">
-                    <p className="graph-text">Then</p>
-                    <p className="graph-text">Now</p>
-                  </div>
-                </div>
-              </div>
+    <Page navId="home" layout={PageLayoutType.Canvas} pageNav={{ text: 'Page not found' }}>
+      <div className={styles.container}>
+        <h1>Page not found</h1>
+        <div className={styles.subtitle}>
+          We could not find the page you are looking for. If the issue persists seek help on the{' '}
+          <a href="https://community.grafana.com" target="_blank" rel="noreferrer" className="error-link">
+            community site.
+          </a>
+        </div>
+
+        <div className={styles.panel}>
+          <div className="error-row">
+            <div className="error-column error-space-between graph-percentage">
+              <p>100%</p>
+              <p>80%</p>
+              <p>60%</p>
+              <p>40%</p>
+              <p>20%</p>
+              <p>0%</p>
             </div>
-            <div className="error-column info-box">
-              <div className="error-row current-box">
-                <p className="current-text">current</p>
-              </div>
-              <div className="error-row" style={{ flex: 1 }}>
-                <Icon name="minus-circle" className="error-minus" />
-                <div className="error-column error-space-between error-full-width">
-                  <div className="error-row error-space-between">
-                    <p>Chances you are on the page you are looking for.</p>
-                    <p className="left-margin">0%</p>
-                  </div>
-                  <div>
-                    <h3>Sorry for the inconvenience</h3>
-                    <p>
-                      Please go back to your{' '}
-                      <a href={config.appSubUrl} className="error-link">
-                        home dashboard
-                      </a>{' '}
-                      and try again.
-                    </p>
-                    <p>
-                      If the error persists, seek help on the{' '}
-                      <a href="https://community.grafana.com" target="_blank" rel="noreferrer" className="error-link">
-                        community site
-                      </a>
-                      .
-                    </p>
-                  </div>
-                </div>
+            <div className="error-column image-box">
+              <img src="public/img/graph404.svg" width="100%" alt="graph" />
+              <div className="error-row error-space-between">
+                <p className="graph-text">Then</p>
+                <p className="graph-text">Now</p>
               </div>
             </div>
           </div>
+          <div className={styles.legend}>
+            <VizLegendSeriesIcon seriesName="asd" color="green" />
+            <div>Chances you are on the page you are looking for (Last: 0%)</div>
+          </div>
         </div>
-      </Page.Contents>
+      </div>
     </Page>
   );
 }
 
-export default ErrorPage;
+export function getStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      padding: theme.spacing(4),
+    }),
+    subtitle: css({
+      color: theme.colors.text.secondary,
+      marginBottom: theme.spacing(2),
+    }),
+    panel: css({
+      display: 'flex',
+      flexDirection: 'column',
+      maxWidth: '874px',
+      border: `1px solid ${theme.colors.border.weak}`,
+      borderRadius: theme.shape.borderRadius(),
+      padding: theme.spacing(2),
+      background: theme.colors.background.primary,
+    }),
+    legend: css({
+      display: 'flex',
+      justifyContent: 'flex-end',
+      alignItems: 'center',
+    }),
+  };
+}
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index bdb77e9aa8d..d79868e7968 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -19,7 +19,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { config, locationService } from '@grafana/runtime';
 import { Icon, Themeable2, withTheme2 } from '@grafana/ui';
 import { notifyApp } from 'app/core/actions';
-import ErrorPage from 'app/core/components/ErrorPage/ErrorPage';
+import { ErrorPage } from 'app/core/components/ErrorPage/ErrorPage';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaContext, GrafanaContextType } from 'app/core/context/GrafanaContext';
 import { createErrorNotification } from 'app/core/copy/appNotification';
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index 1e452d773fd..f9b3e6ed981 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Redirect } from 'react-router-dom';
 
 import { NavLandingPage } from 'app/core/components/AppChrome/NavLandingPage';
-import ErrorPage from 'app/core/components/ErrorPage/ErrorPage';
+import { ErrorPage } from 'app/core/components/ErrorPage/ErrorPage';
 import { LoginPage } from 'app/core/components/Login/LoginPage';
 import config from 'app/core/config';
 import { contextSrv } from 'app/core/services/context_srv';

From 92e591d2e10c038c41a12ec1f8aa8555c1cfc347 Mon Sep 17 00:00:00 2001
From: juanicabanas <juan.cabanas@grafana.com>
Date: Tue, 11 Apr 2023 14:36:50 -0300
Subject: [PATCH 044/729] PublicDashboards: metrics collected in background
 service (#65836)

---
 .../backgroundsvcs/background_services.go     |  3 +
 pkg/server/wire.go                            |  2 +
 .../publicdashboards/database/database.go     | 14 +++
 .../database/database_test.go                 | 90 ++++++++++++++++---
 .../publicdashboards/metric/metric.go         | 74 +++++++++++++++
 .../publicdashboards/metric/metrics.go        | 23 +++++
 .../publicdashboards/models/metrics.go        | 11 +++
 .../public_dashboard_service_mock.go          |  2 +-
 .../public_dashboard_service_wrapper_mock.go  |  2 +-
 .../public_dashboard_store_mock.go            | 26 +++++-
 .../publicdashboards/publicdashboard.go       |  1 +
 pkg/services/stats/statsimpl/stats.go         |  4 +-
 12 files changed, 232 insertions(+), 20 deletions(-)
 create mode 100644 pkg/services/publicdashboards/metric/metric.go
 create mode 100644 pkg/services/publicdashboards/metric/metrics.go
 create mode 100644 pkg/services/publicdashboards/models/metrics.go

diff --git a/pkg/server/backgroundsvcs/background_services.go b/pkg/server/backgroundsvcs/background_services.go
index 08c6460f492..b26ddbbbdd0 100644
--- a/pkg/server/backgroundsvcs/background_services.go
+++ b/pkg/server/backgroundsvcs/background_services.go
@@ -24,6 +24,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/notifications"
 	plugindashboardsservice "github.com/grafana/grafana/pkg/services/plugindashboards/service"
 	"github.com/grafana/grafana/pkg/services/provisioning"
+	publicdashboardsmetric "github.com/grafana/grafana/pkg/services/publicdashboards/metric"
 	"github.com/grafana/grafana/pkg/services/rendering"
 	"github.com/grafana/grafana/pkg/services/searchV2"
 	secretsMigrations "github.com/grafana/grafana/pkg/services/secrets/kvstore/migrations"
@@ -50,6 +51,7 @@ func ProvideBackgroundServiceRegistry(
 	saService *samanager.ServiceAccountsService, authInfoService *authinfoservice.Implementation,
 	grpcServerProvider grpcserver.Provider, secretMigrationProvider secretsMigrations.SecretMigrationProvider, loginAttemptService *loginattemptimpl.Service,
 	bundleService *supportbundlesimpl.Service,
+	publicDashboardsMetric *publicdashboardsmetric.Service,
 	// Need to make sure these are initialized, is there a better place to put them?
 	_ dashboardsnapshots.Service, _ *alerting.AlertNotificationService,
 	_ serviceaccounts.Service, _ *guardian.Provider,
@@ -86,6 +88,7 @@ func ProvideBackgroundServiceRegistry(
 		secretMigrationProvider,
 		loginAttemptService,
 		bundleService,
+		publicDashboardsMetric,
 	)
 }
 
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index c906340f946..2bf368349a3 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -96,6 +96,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
 	publicdashboardsApi "github.com/grafana/grafana/pkg/services/publicdashboards/api"
 	publicdashboardsStore "github.com/grafana/grafana/pkg/services/publicdashboards/database"
+	publicdashboardsmetric "github.com/grafana/grafana/pkg/services/publicdashboards/metric"
 	publicdashboardsService "github.com/grafana/grafana/pkg/services/publicdashboards/service"
 	"github.com/grafana/grafana/pkg/services/query"
 	"github.com/grafana/grafana/pkg/services/queryhistory"
@@ -327,6 +328,7 @@ var wireBasicSet = wire.NewSet(
 	wire.Bind(new(publicdashboards.Service), new(*publicdashboardsService.PublicDashboardServiceImpl)),
 	publicdashboardsStore.ProvideStore,
 	wire.Bind(new(publicdashboards.Store), new(*publicdashboardsStore.PublicDashboardStoreImpl)),
+	publicdashboardsmetric.ProvideService,
 	publicdashboardsApi.ProvideApi,
 	starApi.ProvideApi,
 	userimpl.ProvideService,
diff --git a/pkg/services/publicdashboards/database/database.go b/pkg/services/publicdashboards/database/database.go
index 669f6c1d679..bdee4da07ea 100644
--- a/pkg/services/publicdashboards/database/database.go
+++ b/pkg/services/publicdashboards/database/database.go
@@ -285,3 +285,17 @@ func (d *PublicDashboardStoreImpl) FindByDashboardFolder(ctx context.Context, da
 
 	return pubdashes, nil
 }
+
+func (d *PublicDashboardStoreImpl) GetMetrics(ctx context.Context) (*Metrics, error) {
+	metrics := &Metrics{
+		TotalPublicDashboards: []*TotalPublicDashboard{},
+	}
+	err := d.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		return sess.SQL("SELECT COUNT(*) as total_count, is_enabled, share as share_type  FROM dashboard_public GROUP BY is_enabled, share").Find(&metrics.TotalPublicDashboards)
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return metrics, nil
+}
diff --git a/pkg/services/publicdashboards/database/database_test.go b/pkg/services/publicdashboards/database/database_test.go
index e67da63d104..f918570ceae 100644
--- a/pkg/services/publicdashboards/database/database_test.go
+++ b/pkg/services/publicdashboards/database/database_test.go
@@ -47,9 +47,9 @@ func TestIntegrationListPublicDashboard(t *testing.T) {
 	cDash := insertTestDashboard(t, dashboardStore, "c", orgId, 0, true)
 
 	// these are in order of how they should be returned from ListPUblicDashboards
-	a := insertPublicDashboard(t, publicdashboardStore, bDash.UID, orgId, true)
-	b := insertPublicDashboard(t, publicdashboardStore, cDash.UID, orgId, true)
-	c := insertPublicDashboard(t, publicdashboardStore, aDash.UID, orgId, false)
+	a := insertPublicDashboard(t, publicdashboardStore, bDash.UID, orgId, true, PublicShareType)
+	b := insertPublicDashboard(t, publicdashboardStore, cDash.UID, orgId, true, PublicShareType)
+	c := insertPublicDashboard(t, publicdashboardStore, aDash.UID, orgId, false, PublicShareType)
 
 	// this is case that can happen as of now, however, postgres and mysql sort
 	// null in the exact opposite fashion and there is no shared syntax to sort
@@ -57,7 +57,7 @@ func TestIntegrationListPublicDashboard(t *testing.T) {
 	//d := insertPublicDashboard(t, publicdashboardStore, "missing", orgId, false)
 
 	// should not be included in response
-	_ = insertPublicDashboard(t, publicdashboardStore, "wrongOrgId", 777, false)
+	_ = insertPublicDashboard(t, publicdashboardStore, "wrongOrgId", 777, false, PublicShareType)
 
 	resp, err := publicdashboardStore.FindAll(context.Background(), orgId)
 	require.NoError(t, err)
@@ -258,7 +258,7 @@ func TestIntegrationFindByDashboardUid(t *testing.T) {
 
 	t.Run("returns public dashboard by dashboardUid", func(t *testing.T) {
 		setup()
-		savedPubdash := insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, false)
+		savedPubdash := insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, false, PublicShareType)
 		pubdash, err := publicdashboardStore.FindByDashboardUid(context.Background(), savedDashboard.OrgID, savedDashboard.UID)
 		require.NoError(t, err)
 		assert.Equal(t, savedPubdash, pubdash)
@@ -325,7 +325,7 @@ func TestIntegrationFindByAccessToken(t *testing.T) {
 
 	t.Run("returns public dashboard by accessToken", func(t *testing.T) {
 		setup()
-		savedPubdash := insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, false)
+		savedPubdash := insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, false, PublicShareType)
 		pubdash, err := publicdashboardStore.FindByAccessToken(context.Background(), savedPubdash.AccessToken)
 		require.NoError(t, err)
 		assert.Equal(t, savedPubdash, pubdash)
@@ -392,7 +392,7 @@ func TestIntegrationCreatePublicDashboard(t *testing.T) {
 		publicdashboardStore = ProvideStore(sqlStore)
 		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 		savedDashboard2 = insertTestDashboard(t, dashboardStore, "testDashie2", 1, 0, true)
-		insertPublicDashboard(t, publicdashboardStore, savedDashboard2.UID, savedDashboard2.OrgID, false)
+		insertPublicDashboard(t, publicdashboardStore, savedDashboard2.UID, savedDashboard2.OrgID, false, PublicShareType)
 	}
 
 	t.Run("saves new public dashboard", func(t *testing.T) {
@@ -646,7 +646,7 @@ func TestIntegrationDelete(t *testing.T) {
 		require.NoError(t, err)
 		publicdashboardStore = ProvideStore(sqlStore)
 		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
-		savedPublicDashboard = insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, true)
+		savedPublicDashboard = insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, true, PublicShareType)
 	}
 
 	t.Run("Delete success", func(t *testing.T) {
@@ -697,10 +697,10 @@ func TestGetDashboardByFolder(t *testing.T) {
 		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 		require.NoError(t, err)
 		pubdashStore := ProvideStore(sqlStore)
-		dashboard := insertTestDashboard(t, dashboardStore, "title", 1, 1, true)
-		pubdash := insertPublicDashboard(t, pubdashStore, dashboard.UID, dashboard.OrgID, true)
-		dashboard2 := insertTestDashboard(t, dashboardStore, "title", 1, 2, true)
-		_ = insertPublicDashboard(t, pubdashStore, dashboard2.UID, dashboard2.OrgID, true)
+		dashboard := insertTestDashboard(t, dashboardStore, "title", 1, 1, true, PublicShareType)
+		pubdash := insertPublicDashboard(t, pubdashStore, dashboard.UID, dashboard.OrgID, true, PublicShareType)
+		dashboard2 := insertTestDashboard(t, dashboardStore, "title", 1, 2, true, PublicShareType)
+		_ = insertPublicDashboard(t, pubdashStore, dashboard2.UID, dashboard2.OrgID, true, PublicShareType)
 
 		pubdashes, err := pubdashStore.FindByDashboardFolder(context.Background(), dashboard)
 
@@ -710,6 +710,69 @@ func TestGetDashboardByFolder(t *testing.T) {
 	})
 }
 
+func TestGetMetrics(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	var sqlStore db.DB
+	var cfg *setting.Cfg
+	var dashboardStore dashboards.Store
+	var publicdashboardStore *PublicDashboardStoreImpl
+	var savedDashboard *dashboards.Dashboard
+	var savedDashboard2 *dashboards.Dashboard
+	var savedDashboard3 *dashboards.Dashboard
+	var savedDashboard4 *dashboards.Dashboard
+
+	setup := func() {
+		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagPublicDashboards}})
+		quotaService := quotatest.New(false, nil)
+		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		require.NoError(t, err)
+		dashboardStore = store
+		publicdashboardStore = ProvideStore(sqlStore)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, false)
+		savedDashboard2 = insertTestDashboard(t, dashboardStore, "testDashie2", 1, 0, false)
+		savedDashboard3 = insertTestDashboard(t, dashboardStore, "testDashie3", 2, 0, false)
+		savedDashboard4 = insertTestDashboard(t, dashboardStore, "testDashie4", 2, 0, false)
+		insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, true, PublicShareType)
+		insertPublicDashboard(t, publicdashboardStore, savedDashboard2.UID, savedDashboard2.OrgID, true, PublicShareType)
+		insertPublicDashboard(t, publicdashboardStore, savedDashboard3.UID, savedDashboard3.OrgID, true, EmailShareType)
+		insertPublicDashboard(t, publicdashboardStore, savedDashboard4.UID, savedDashboard4.OrgID, false, EmailShareType)
+	}
+
+	t.Run("returns correct list of metrics", func(t *testing.T) {
+		setup()
+
+		metrics, err := publicdashboardStore.GetMetrics(context.Background())
+		require.NoError(t, err)
+
+		assert.Equal(t, 3, len(metrics.TotalPublicDashboards))
+		enabledAndPublicCount := -1
+		enabledAndEmailCount := -1
+		disabledAndEmailCount := -1
+		disabledAndPublicCount := -1
+		for _, metric := range metrics.TotalPublicDashboards {
+			if metric.ShareType == string(PublicShareType) && metric.IsEnabled {
+				enabledAndPublicCount = int(metric.TotalCount)
+			}
+			if metric.ShareType == string(PublicShareType) && !metric.IsEnabled {
+				disabledAndPublicCount = int(metric.TotalCount)
+			}
+			if metric.ShareType == string(EmailShareType) && metric.IsEnabled {
+				enabledAndEmailCount = int(metric.TotalCount)
+			}
+			if metric.ShareType == string(EmailShareType) && !metric.IsEnabled {
+				disabledAndEmailCount = int(metric.TotalCount)
+			}
+		}
+
+		assert.Equal(t, 2, enabledAndPublicCount)
+		assert.Equal(t, 1, enabledAndEmailCount)
+		assert.Equal(t, 1, disabledAndEmailCount)
+		assert.Equal(t, -1, disabledAndPublicCount)
+	})
+}
+
 // helper function to insert a dashboard
 func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title string, orgId int64,
 	folderId int64, isFolder bool, tags ...interface{}) *dashboards.Dashboard {
@@ -733,7 +796,7 @@ func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title st
 }
 
 // helper function to insert a public dashboard
-func insertPublicDashboard(t *testing.T, publicdashboardStore *PublicDashboardStoreImpl, dashboardUid string, orgId int64, isEnabled bool) *PublicDashboard {
+func insertPublicDashboard(t *testing.T, publicdashboardStore *PublicDashboardStoreImpl, dashboardUid string, orgId int64, isEnabled bool, shareType ShareType) *PublicDashboard {
 	ctx := context.Background()
 
 	uid := util.GenerateShortUID()
@@ -751,6 +814,7 @@ func insertPublicDashboard(t *testing.T, publicdashboardStore *PublicDashboardSt
 			CreatedBy:    1,
 			CreatedAt:    time.Now(),
 			AccessToken:  accessToken,
+			Share:        shareType,
 		},
 	}
 
diff --git a/pkg/services/publicdashboards/metric/metric.go b/pkg/services/publicdashboards/metric/metric.go
new file mode 100644
index 00000000000..faa68a867e9
--- /dev/null
+++ b/pkg/services/publicdashboards/metric/metric.go
@@ -0,0 +1,74 @@
+package metric
+
+import (
+	"context"
+	"errors"
+	"strconv"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+type Service struct {
+	store   publicdashboards.Store
+	Metrics *Metrics
+	log     log.Logger
+}
+
+func ProvideService(
+	store publicdashboards.Store,
+	prom prometheus.Registerer,
+) (*Service, error) {
+	s := &Service{
+		store:   store,
+		Metrics: newMetrics(),
+		log:     log.New("publicdashboards.metric"),
+	}
+
+	if err := s.registerMetrics(prom); err != nil {
+		return nil, err
+	}
+
+	return s, nil
+}
+
+func (s *Service) registerMetrics(prom prometheus.Registerer) error {
+	err := prom.Register(s.Metrics.PublicDashboardsAmount)
+	var alreadyRegisterErr prometheus.AlreadyRegisteredError
+	if errors.As(err, &alreadyRegisterErr) {
+		if alreadyRegisterErr.ExistingCollector == alreadyRegisterErr.NewCollector {
+			err = nil
+		}
+	}
+
+	return err
+}
+
+func (s *Service) Run(ctx context.Context) error {
+	s.recordMetrics(ctx)
+
+	ticker := time.NewTicker(12 * time.Hour)
+	for {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case <-ticker.C:
+			s.recordMetrics(ctx)
+		}
+	}
+}
+
+func (s *Service) recordMetrics(ctx context.Context) {
+	records, err := s.store.GetMetrics(ctx)
+	if err != nil {
+		s.log.Error("error collecting background metrics", "err", err)
+		return
+	}
+
+	s.Metrics.PublicDashboardsAmount.Reset()
+	for _, r := range records.TotalPublicDashboards {
+		s.Metrics.PublicDashboardsAmount.WithLabelValues(strconv.FormatBool(r.IsEnabled), r.ShareType).Set(r.TotalCount)
+	}
+}
diff --git a/pkg/services/publicdashboards/metric/metrics.go b/pkg/services/publicdashboards/metric/metrics.go
new file mode 100644
index 00000000000..ad4d19b9616
--- /dev/null
+++ b/pkg/services/publicdashboards/metric/metrics.go
@@ -0,0 +1,23 @@
+package metric
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const (
+	namespace = "grafana"
+)
+
+type Metrics struct {
+	PublicDashboardsAmount *prometheus.GaugeVec
+}
+
+func newMetrics() *Metrics {
+	return &Metrics{
+		PublicDashboardsAmount: prometheus.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "public_dashboards_amount",
+			Help:      "Total amount of public dashboards",
+		}, []string{"is_enabled", "share_type"}),
+	}
+}
diff --git a/pkg/services/publicdashboards/models/metrics.go b/pkg/services/publicdashboards/models/metrics.go
new file mode 100644
index 00000000000..a2e458464d0
--- /dev/null
+++ b/pkg/services/publicdashboards/models/metrics.go
@@ -0,0 +1,11 @@
+package models
+
+type TotalPublicDashboard struct {
+	TotalCount float64
+	IsEnabled  bool
+	ShareType  string
+}
+
+type Metrics struct {
+	TotalPublicDashboards []*TotalPublicDashboard
+}
diff --git a/pkg/services/publicdashboards/public_dashboard_service_mock.go b/pkg/services/publicdashboards/public_dashboard_service_mock.go
index 0aa2eb1d568..886cd340ec4 100644
--- a/pkg/services/publicdashboards/public_dashboard_service_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_service_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.16.0. DO NOT EDIT.
+// Code generated by mockery v2.14.0. DO NOT EDIT.
 
 package publicdashboards
 
diff --git a/pkg/services/publicdashboards/public_dashboard_service_wrapper_mock.go b/pkg/services/publicdashboards/public_dashboard_service_wrapper_mock.go
index 5b96a227f48..69ee15d2b9a 100644
--- a/pkg/services/publicdashboards/public_dashboard_service_wrapper_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_service_wrapper_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.16.0. DO NOT EDIT.
+// Code generated by mockery v2.14.0. DO NOT EDIT.
 
 package publicdashboards
 
diff --git a/pkg/services/publicdashboards/public_dashboard_store_mock.go b/pkg/services/publicdashboards/public_dashboard_store_mock.go
index 07e5f97cfdc..47fccf70101 100644
--- a/pkg/services/publicdashboards/public_dashboard_store_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_store_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.16.0. DO NOT EDIT.
+// Code generated by mockery v2.14.0. DO NOT EDIT.
 
 package publicdashboards
 
@@ -7,7 +7,6 @@ import (
 
 	dashboards "github.com/grafana/grafana/pkg/services/dashboards"
 	mock "github.com/stretchr/testify/mock"
-
 	models "github.com/grafana/grafana/pkg/services/publicdashboards/models"
 )
 
@@ -238,6 +237,29 @@ func (_m *FakePublicDashboardStore) FindDashboard(ctx context.Context, orgId int
 	return r0, r1
 }
 
+// GetMetrics provides a mock function with given fields: ctx
+func (_m *FakePublicDashboardStore) GetMetrics(ctx context.Context) (*models.Metrics, error) {
+	ret := _m.Called(ctx)
+
+	var r0 *models.Metrics
+	if rf, ok := ret.Get(0).(func(context.Context) *models.Metrics); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.Metrics)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetOrgIdByAccessToken provides a mock function with given fields: ctx, accessToken
 func (_m *FakePublicDashboardStore) GetOrgIdByAccessToken(ctx context.Context, accessToken string) (int64, error) {
 	ret := _m.Called(ctx, accessToken)
diff --git a/pkg/services/publicdashboards/publicdashboard.go b/pkg/services/publicdashboards/publicdashboard.go
index a1b69547dfa..2b37aa94384 100644
--- a/pkg/services/publicdashboards/publicdashboard.go
+++ b/pkg/services/publicdashboards/publicdashboard.go
@@ -61,4 +61,5 @@ type Store interface {
 	FindByDashboardFolder(ctx context.Context, dashboard *dashboards.Dashboard) ([]*PublicDashboard, error)
 	ExistsEnabledByAccessToken(ctx context.Context, accessToken string) (bool, error)
 	ExistsEnabledByDashboardUid(ctx context.Context, dashboardUid string) (bool, error)
+	GetMetrics(ctx context.Context) (*Metrics, error)
 }
diff --git a/pkg/services/stats/statsimpl/stats.go b/pkg/services/stats/statsimpl/stats.go
index 122f6093707..66ad8a2d07c 100644
--- a/pkg/services/stats/statsimpl/stats.go
+++ b/pkg/services/stats/statsimpl/stats.go
@@ -124,9 +124,7 @@ func (ss *sqlStatsService) GetSystemStats(ctx context.Context, query *stats.GetS
 		sb.Write(`(SELECT COUNT(id) FROM `+dialect.Quote("library_element")+` WHERE kind = ?) AS library_variables,`, model.VariableElement)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("data_keys") + `) AS data_keys,`)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("data_keys") + `WHERE active = true) AS active_data_keys,`)
-
-		// TODO: table name will change and filter should check only for is_enabled = true
-		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("dashboard_public") + `WHERE is_enabled = true) AS public_dashboards,`)
+		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("dashboard_public") + `) AS public_dashboards,`)
 
 		sb.Write(ss.roleCounterSQL(ctx))
 

From ae23ef5b4163d6db6f6e59124f6de9f684b68ac4 Mon Sep 17 00:00:00 2001
From: Shirley <4163034+fridgepoet@users.noreply.github.com>
Date: Tue, 11 Apr 2023 19:55:57 +0200
Subject: [PATCH 045/729] CloudWatch: Refactor around handleGetRegions (#65713)

* Create minimal EC2 interface

* convert regions variable to a function returning a copy

* Add test for multiple calls to regions to check regionsCache

* Add returns to handler after error

* Refactor handleGetRegions
---
 pkg/tsdb/cloudwatch/client_factory.go         |  3 +-
 pkg/tsdb/cloudwatch/cloudwatch.go             | 13 ++---
 pkg/tsdb/cloudwatch/constants/metrics.go      | 38 +++++++++++--
 pkg/tsdb/cloudwatch/metric_find_query.go      | 40 ++++++--------
 pkg/tsdb/cloudwatch/metric_find_query_test.go | 53 ++++++++++++++++---
 pkg/tsdb/cloudwatch/models/api.go             |  6 +++
 pkg/tsdb/cloudwatch/resource_handler.go       |  4 ++
 pkg/tsdb/cloudwatch/test_utils.go             | 14 +++++
 8 files changed, 129 insertions(+), 42 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/client_factory.go b/pkg/tsdb/cloudwatch/client_factory.go
index 2f07888b935..f58e063ae10 100644
--- a/pkg/tsdb/cloudwatch/client_factory.go
+++ b/pkg/tsdb/cloudwatch/client_factory.go
@@ -8,7 +8,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/aws/aws-sdk-go/service/oam"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface"
@@ -53,7 +52,7 @@ var NewCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatch
 // EC2 client factory.
 //
 // Stubbable by tests.
-var newEC2Client = func(provider client.ConfigProvider) ec2iface.EC2API {
+var newEC2Client = func(provider client.ConfigProvider) models.EC2APIProvider {
 	return ec2.New(provider)
 }
 
diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index de267eef3f8..5bd58a48aaf 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"regexp"
+	"sync"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -13,7 +14,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface"
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -119,10 +119,11 @@ func NewInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 
 // cloudWatchExecutor executes CloudWatch requests.
 type cloudWatchExecutor struct {
-	im       instancemgmt.InstanceManager
-	cfg      *setting.Cfg
-	sessions SessionCache
-	features featuremgmt.FeatureToggles
+	im          instancemgmt.InstanceManager
+	cfg         *setting.Cfg
+	sessions    SessionCache
+	features    featuremgmt.FeatureToggles
+	regionCache sync.Map
 
 	resourceHandler backend.CallResourceHandler
 }
@@ -310,7 +311,7 @@ func (e *cloudWatchExecutor) getCWLogsClient(pluginCtx backend.PluginContext, re
 	return logsClient, nil
 }
 
-func (e *cloudWatchExecutor) getEC2Client(pluginCtx backend.PluginContext, region string) (ec2iface.EC2API, error) {
+func (e *cloudWatchExecutor) getEC2Client(pluginCtx backend.PluginContext, region string) (models.EC2APIProvider, error) {
 	sess, err := e.newSession(pluginCtx, region)
 	if err != nil {
 		return nil, err
diff --git a/pkg/tsdb/cloudwatch/constants/metrics.go b/pkg/tsdb/cloudwatch/constants/metrics.go
index e0d29a1f602..ff7cc61af02 100644
--- a/pkg/tsdb/cloudwatch/constants/metrics.go
+++ b/pkg/tsdb/cloudwatch/constants/metrics.go
@@ -523,9 +523,37 @@ var NamespaceDimensionKeysMap = map[string][]string{
 	"CloudWatchSynthetics":        {"CanaryName", "StepName"},
 }
 
-var Regions = []string{
-	"af-south-1", "ap-east-1", "ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ap-south-1", "ap-southeast-1",
-	"ap-southeast-2", "ap-southeast-3", "ca-central-1", "cn-north-1", "cn-northwest-1", "eu-central-1", "eu-north-1", "eu-south-1", "eu-west-1",
-	"eu-west-2", "eu-west-3", "me-south-1", "sa-east-1", "us-east-1", "us-east-2", "us-gov-east-1", "us-gov-west-1",
-	"us-iso-east-1", "us-isob-east-1", "us-west-1", "us-west-2",
+type RegionsSet map[string]struct{}
+
+func Regions() RegionsSet {
+	return RegionsSet{
+		"af-south-1":     {},
+		"ap-east-1":      {},
+		"ap-northeast-1": {},
+		"ap-northeast-2": {},
+		"ap-northeast-3": {},
+		"ap-south-1":     {},
+		"ap-southeast-1": {},
+		"ap-southeast-2": {},
+		"ap-southeast-3": {},
+		"ca-central-1":   {},
+		"cn-north-1":     {},
+		"cn-northwest-1": {},
+		"eu-central-1":   {},
+		"eu-north-1":     {},
+		"eu-south-1":     {},
+		"eu-west-1":      {},
+		"eu-west-2":      {},
+		"eu-west-3":      {},
+		"me-south-1":     {},
+		"sa-east-1":      {},
+		"us-east-1":      {},
+		"us-east-2":      {},
+		"us-gov-east-1":  {},
+		"us-gov-west-1":  {},
+		"us-iso-east-1":  {},
+		"us-isob-east-1": {},
+		"us-west-1":      {},
+		"us-west-2":      {},
+	}
 }
diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go
index 29387858e5f..2d7e15555f8 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query.go
@@ -8,7 +8,6 @@ import (
 	"reflect"
 	"sort"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -24,8 +23,6 @@ type suggestData struct {
 	Label string `json:"label,omitempty"`
 }
 
-var regionCache sync.Map
-
 func parseMultiSelectValue(input string) []string {
 	trimmedInput := strings.TrimSpace(input)
 	if strings.HasPrefix(trimmedInput, "{") {
@@ -49,7 +46,7 @@ func (e *cloudWatchExecutor) handleGetRegions(pluginCtx backend.PluginContext, p
 	}
 
 	profile := instance.Settings.Profile
-	if cache, ok := regionCache.Load(profile); ok {
+	if cache, ok := e.regionCache.Load(profile); ok {
 		if cache2, ok2 := cache.([]suggestData); ok2 {
 			return cache2, nil
 		}
@@ -59,38 +56,35 @@ func (e *cloudWatchExecutor) handleGetRegions(pluginCtx backend.PluginContext, p
 	if err != nil {
 		return nil, err
 	}
-	regions := constants.Regions
-	r, err := client.DescribeRegions(&ec2.DescribeRegionsInput{})
+	regions := constants.Regions()
+	ec2Regions, err := client.DescribeRegions(&ec2.DescribeRegionsInput{})
 	if err != nil {
 		// ignore error for backward compatibility
 		logger.Error("Failed to get regions", "error", err)
 	} else {
-		for _, region := range r.Regions {
-			exists := false
-
-			for _, existingRegion := range regions {
-				if existingRegion == *region.RegionName {
-					exists = true
-					break
-				}
-			}
-
-			if !exists {
-				regions = append(regions, *region.RegionName)
-			}
-		}
+		mergeEC2RegionsAndConstantRegions(regions, ec2Regions.Regions)
 	}
-	sort.Strings(regions)
 
 	result := make([]suggestData, 0)
-	for _, region := range regions {
+	for region := range regions {
 		result = append(result, suggestData{Text: region, Value: region, Label: region})
 	}
-	regionCache.Store(profile, result)
+	sort.Slice(result, func(i, j int) bool {
+		return result[i].Text < result[j].Text
+	})
+	e.regionCache.Store(profile, result)
 
 	return result, nil
 }
 
+func mergeEC2RegionsAndConstantRegions(regions map[string]struct{}, ec2Regions []*ec2.Region) {
+	for _, region := range ec2Regions {
+		if _, ok := regions[*region.RegionName]; !ok {
+			regions[*region.RegionName] = struct{}{}
+		}
+	}
+}
+
 func (e *cloudWatchExecutor) handleGetEbsVolumeIds(pluginCtx backend.PluginContext, parameters url.Values) ([]suggestData, error) {
 	region := parameters.Get("region")
 	instanceId := parameters.Get("instanceId")
diff --git a/pkg/tsdb/cloudwatch/metric_find_query_test.go b/pkg/tsdb/cloudwatch/metric_find_query_test.go
index 9061430d4b7..5ad46002775 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query_test.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"encoding/json"
 	"net/url"
+	"sort"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -19,6 +19,7 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/constants"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
@@ -30,7 +31,7 @@ func TestQuery_Regions(t *testing.T) {
 
 	var cli fakeEC2Client
 
-	newEC2Client = func(client.ConfigProvider) ec2iface.EC2API {
+	newEC2Client = func(client.ConfigProvider) models.EC2APIProvider {
 		return cli
 	}
 
@@ -55,7 +56,7 @@ func TestQuery_Regions(t *testing.T) {
 		)
 		require.NoError(t, err)
 
-		expRegions := append(constants.Regions, regionName)
+		expRegions := buildSortedSliceOfDefaultAndExtraRegions(t, regionName)
 		expFrame := data.NewFrame(
 			"",
 			data.NewField("text", nil, expRegions),
@@ -63,7 +64,7 @@ func TestQuery_Regions(t *testing.T) {
 		)
 		expFrame.Meta = &data.FrameMeta{
 			Custom: map[string]interface{}{
-				"rowCount": len(constants.Regions) + 1,
+				"rowCount": len(constants.Regions()) + 1,
 			},
 		}
 
@@ -75,6 +76,46 @@ func TestQuery_Regions(t *testing.T) {
 	})
 }
 
+func buildSortedSliceOfDefaultAndExtraRegions(t *testing.T, regionName string) []string {
+	t.Helper()
+	regions := constants.Regions()
+	regions[regionName] = struct{}{}
+	var expRegions []string
+	for region := range regions {
+		expRegions = append(expRegions, region)
+	}
+	sort.Strings(expRegions)
+	return expRegions
+}
+
+func Test_handleGetRegions_regionCache(t *testing.T) {
+	origNewEC2Client := newEC2Client
+	t.Cleanup(func() {
+		newEC2Client = origNewEC2Client
+	})
+	cli := mockEC2Client{}
+	newEC2Client = func(client.ConfigProvider) models.EC2APIProvider {
+		return &cli
+	}
+	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
+	})
+
+	t.Run("AWS only called once for multiple calls to handleGetRegions", func(t *testing.T) {
+		cli.On("DescribeRegions", mock.Anything, mock.Anything).Return(&ec2.DescribeRegionsOutput{}, nil)
+		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		_, err := executor.handleGetRegions(
+			backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}}, nil)
+		require.NoError(t, err)
+
+		_, err = executor.handleGetRegions(
+			backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}}, nil)
+		require.NoError(t, err)
+
+		cli.AssertNumberOfCalls(t, "DescribeRegions", 1)
+	})
+}
+
 func TestQuery_InstanceAttributes(t *testing.T) {
 	origNewEC2Client := newEC2Client
 	t.Cleanup(func() {
@@ -83,7 +124,7 @@ func TestQuery_InstanceAttributes(t *testing.T) {
 
 	var cli fakeEC2Client
 
-	newEC2Client = func(client.ConfigProvider) ec2iface.EC2API {
+	newEC2Client = func(client.ConfigProvider) models.EC2APIProvider {
 		return cli
 	}
 
@@ -144,7 +185,7 @@ func TestQuery_EBSVolumeIDs(t *testing.T) {
 
 	var cli fakeEC2Client
 
-	newEC2Client = func(client.ConfigProvider) ec2iface.EC2API {
+	newEC2Client = func(client.ConfigProvider) models.EC2APIProvider {
 		return cli
 	}
 
diff --git a/pkg/tsdb/cloudwatch/models/api.go b/pkg/tsdb/cloudwatch/models/api.go
index 85b47e50b13..edded6342eb 100644
--- a/pkg/tsdb/cloudwatch/models/api.go
+++ b/pkg/tsdb/cloudwatch/models/api.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/oam"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -58,3 +59,8 @@ type OAMAPIProvider interface {
 	ListSinks(*oam.ListSinksInput) (*oam.ListSinksOutput, error)
 	ListAttachedLinks(*oam.ListAttachedLinksInput) (*oam.ListAttachedLinksOutput, error)
 }
+
+type EC2APIProvider interface {
+	DescribeRegions(in *ec2.DescribeRegionsInput) (*ec2.DescribeRegionsOutput, error)
+	DescribeInstancesPages(in *ec2.DescribeInstancesInput, fn func(*ec2.DescribeInstancesOutput, bool) bool) error
+}
diff --git a/pkg/tsdb/cloudwatch/resource_handler.go b/pkg/tsdb/cloudwatch/resource_handler.go
index d1994c03801..f51adb7b2a4 100644
--- a/pkg/tsdb/cloudwatch/resource_handler.go
+++ b/pkg/tsdb/cloudwatch/resource_handler.go
@@ -37,19 +37,23 @@ func handleResourceReq(handleFunc handleFn) func(rw http.ResponseWriter, req *ht
 		err := req.ParseForm()
 		if err != nil {
 			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err))
+			return
 		}
 		data, err := handleFunc(pluginContext, req.URL.Query())
 		if err != nil {
 			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err))
+			return
 		}
 		body, err := json.Marshal(data)
 		if err != nil {
 			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err))
+			return
 		}
 		rw.WriteHeader(http.StatusOK)
 		_, err = rw.Write(body)
 		if err != nil {
 			logger.Error("Unable to write HTTP response", "error", err)
+			return
 		}
 	}
 }
diff --git a/pkg/tsdb/cloudwatch/test_utils.go b/pkg/tsdb/cloudwatch/test_utils.go
index d04e3163eac..4a76a00c104 100644
--- a/pkg/tsdb/cloudwatch/test_utils.go
+++ b/pkg/tsdb/cloudwatch/test_utils.go
@@ -106,6 +106,20 @@ func (c *fakeCWAnnotationsClient) DescribeAlarms(params *cloudwatch.DescribeAlar
 	return c.describeAlarmsOutput, nil
 }
 
+type mockEC2Client struct {
+	mock.Mock
+}
+
+func (c *mockEC2Client) DescribeRegions(in *ec2.DescribeRegionsInput) (*ec2.DescribeRegionsOutput, error) {
+	args := c.Called(in)
+	return args.Get(0).(*ec2.DescribeRegionsOutput), args.Error(1)
+}
+
+func (c *mockEC2Client) DescribeInstancesPages(in *ec2.DescribeInstancesInput, fn func(*ec2.DescribeInstancesOutput, bool) bool) error {
+	args := c.Called(in, fn)
+	return args.Error(0)
+}
+
 type fakeEC2Client struct {
 	ec2iface.EC2API
 

From 7e270021a8382e9d809229f5c3bf11aefb1d61ce Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Tue, 11 Apr 2023 13:01:57 -0500
Subject: [PATCH 046/729] Timeseries: Limit long text in legend (#66307)

---
 .../grafana-ui/src/components/VizLegend/VizLegendListItem.tsx | 4 ++++
 .../src/components/VizLegend/VizLegendTableItem.tsx           | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
index d9ebbaa0b97..d342d261c00 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
@@ -74,6 +74,7 @@ export const VizLegendListItem = <T = unknown,>({
       <button
         disabled={readonly}
         type="button"
+        title={item.label}
         onBlur={onMouseOut}
         onFocus={onMouseOver}
         onMouseOver={onMouseOver}
@@ -100,6 +101,9 @@ const getStyles = (theme: GrafanaTheme2) => ({
     font-size: inherit;
     padding: 0;
     user-select: text;
+    max-width: 600px;
+    text-overflow: ellipsis;
+    overflow: hidden;
   `,
   itemDisabled: css`
     label: LegendLabelDisabled;
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx
index 981c20403cf..0a2f20f1382 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx
@@ -73,6 +73,7 @@ export const LegendTableItem = ({
           <button
             disabled={readonly}
             type="button"
+            title={item.label}
             onBlur={onMouseOut}
             onFocus={onMouseOver}
             onMouseOver={onMouseOver}
@@ -122,6 +123,9 @@ const getStyles = (theme: GrafanaTheme2) => {
       border: none;
       font-size: inherit;
       padding: 0;
+      max-width: 600px;
+      text-overflow: ellipsis;
+      overflow: hidden;
     `,
     labelDisabled: css`
       label: LegendLabelDisabled;

From 0cf77741937bf0bcf85ffb9aa062bc502cb49d2a Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Tue, 11 Apr 2023 15:01:36 -0400
Subject: [PATCH 047/729] docs: update broken link (#66317)

* docs: update broken link

Updates link to Community page that no longer exists.

* fix linting
---
 docs/sources/troubleshooting/_index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/troubleshooting/_index.md b/docs/sources/troubleshooting/_index.md
index e3805d150bf..40cffd947e4 100644
--- a/docs/sources/troubleshooting/_index.md
+++ b/docs/sources/troubleshooting/_index.md
@@ -57,6 +57,6 @@ sudo yum install freetype*
 sudo yum install urw-fonts
 ```
 
-## FAQs
+## More help
 
-Check out the [FAQ section](https://community.grafana.com/c/howto/faq) on the Grafana Community page for answers to frequently asked questions.
+Check out the [Grafana Community](https://community.grafana.com/) for more troubleshooting help (you must be logged in to post or comment).

From 1791c6043f113450ae4931253908361f3c517448 Mon Sep 17 00:00:00 2001
From: Alexander Weaver <weaver.alex.d@gmail.com>
Date: Tue, 11 Apr 2023 14:38:06 -0500
Subject: [PATCH 048/729] Alerting: Document state history config options in
 default and sample configuration files (#65748)

* Document configuration options

* Improve documentation
---
 conf/defaults.ini | 48 +++++++++++++++++++++++++++++++++++++++++++++
 conf/sample.ini   | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index abcfda646ba..0c561da4c14 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1010,6 +1010,54 @@ disabled_labels =
 # Enable the state history functionality in Unified Alerting. The previous states of alert rules will be visible in panels and in the UI.
 enabled = true
 
+# Select which pluggable state history backend to use. Either "annotations", "loki", or "multiple"
+# "loki" writes state history to an external Loki instance. "multiple" allows history to be written to multiple backends at once.
+# Defaults to "annotations".
+backend =
+
+# For "multiple" only.
+# Indicates the main backend used to serve state history queries.
+# Either "annotations" or "loki"
+primary =
+
+# For "multiple" only.
+# Comma-separated list of additional backends to write state history data to.
+secondaries =
+
+# For "loki" only.
+# URL of the external Loki instance.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+loki_remote_url =
+
+# For "loki" only.
+# URL of the external Loki's read path. To be used in configurations where Loki has separated read and write URLs.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+loki_remote_read_url =
+
+# For "loki" only.
+# URL of the external Loki's write path. To be used in configurations where Loki has separated read and write URLs.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+loki_remote_write_url =
+
+# For "loki" only.
+# Optional tenant ID to attach to requests sent to Loki.
+loki_tenant_id =
+
+# For "loki" only.
+# Optional username for basic authentication on requests sent to Loki. Can be left blank to disable basic auth.
+loki_basic_auth_username =
+
+# For "loki" only.
+# Optional password for basic authentication on requests sent to Loki. Can be left blank.
+loki_basic_auth_password =
+
+[unified_alerting.state_history.external_labels]
+# Optional extra labels to attach to outbound state history records or log streams.
+# Any number of label key-value-pairs can be provided.
+#
+# ex.
+# mylabelkey = mylabelvalue
+
 #################################### Alerting ############################
 [alerting]
 # Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
diff --git a/conf/sample.ini b/conf/sample.ini
index a2d6b597ff5..2a7a562c5c9 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -967,6 +967,56 @@
 # For example: `disabled_labels=grafana_folder`
 ;disabled_labels =
 
+[unified_alerting.state_history]
+# Enable the state history functionality in Unified Alerting. The previous states of alert rules will be visible in panels and in the UI.
+; enabled = true
+
+# Select which pluggable state history backend to use. Either "annotations", "loki", or "multiple"
+# "loki" writes state history to an external Loki instance. "multiple" allows history to be written to multiple backends at once.
+# Defaults to "annotations".
+; backend = "multiple"
+
+# For "multiple" only.
+# Indicates the main backend used to serve state history queries.
+# Either "annotations" or "loki"
+; primary = "loki"
+
+# For "multiple" only.
+# Comma-separated list of additional backends to write state history data to.
+; secondaries = "annotations"
+
+# For "loki" only.
+# URL of the external Loki instance.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_url = "http://loki:3100"
+
+# For "loki" only.
+# URL of the external Loki's read path. To be used in configurations where Loki has separated read and write URLs.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_read_url = "http://loki-querier:3100"
+
+# For "loki" only.
+# URL of the external Loki's write path. To be used in configurations where Loki has separated read and write URLs.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_write_url = "http://loki-distributor:3100"
+
+# For "loki" only.
+# Optional tenant ID to attach to requests sent to Loki.
+; loki_tenant_id = 123
+
+# For "loki" only.
+# Optional username for basic authentication on requests sent to Loki. Can be left blank to disable basic auth.
+; loki_basic_auth_username = "myuser"
+
+# For "loki" only.
+# Optional password for basic authentication on requests sent to Loki. Can be left blank.
+; loki_basic_auth_password = "mypass"
+
+[unified_alerting.state_history.external_labels]
+# Optional extra labels to attach to outbound state history records or log streams.
+# Any number of label key-value-pairs can be provided.
+; mylabelkey = mylabelvalue
+
 #################################### Alerting ############################
 [alerting]
 # Disable legacy alerting engine & UI features

From a1bc2272289ad453e196b78a434281eca925ca12 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Tue, 11 Apr 2023 22:04:32 +0200
Subject: [PATCH 049/729] Instrumentation: Report the size of plugin request
 (#66149)

* Report the size of the plugin request

* Remove middleware, report directly

* PR review updates
---
 .../instrumentation/instrumentation.go        | 31 +++++++++++++++----
 pkg/plugins/manager/client/client.go          | 11 +++++--
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/pkg/plugins/backendplugin/instrumentation/instrumentation.go b/pkg/plugins/backendplugin/instrumentation/instrumentation.go
index 87438e4bd6f..ae58d9cd593 100644
--- a/pkg/plugins/backendplugin/instrumentation/instrumentation.go
+++ b/pkg/plugins/backendplugin/instrumentation/instrumentation.go
@@ -29,12 +29,26 @@ var (
 		Help:      "Plugin request duration",
 		Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100},
 	}, []string{"plugin_id", "endpoint", "target"})
+
+	pluginRequestSizeHistogram = promauto.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: "grafana",
+			Name:      "plugin_request_size_bytes",
+			Help:      "histogram of plugin request sizes returned",
+			Buckets:   []float64{128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576},
+		}, []string{"source", "plugin_id", "endpoint", "target"},
+	)
 )
 
 const (
 	statusOK        = "ok"
 	statusError     = "error"
 	statusCancelled = "cancelled"
+
+	endpointCallResource   = "callResource"
+	endpointCheckHealth    = "checkHealth"
+	endpointCollectMetrics = "collectMetrics"
+	endpointQueryData      = "queryData"
 )
 
 var logger = plog.New("plugin.instrumentation")
@@ -99,20 +113,25 @@ type Cfg struct {
 
 // InstrumentCollectMetrics instruments collectMetrics.
 func InstrumentCollectMetrics(ctx context.Context, req *backend.PluginContext, cfg Cfg, fn func() error) error {
-	return instrumentPluginRequest(ctx, cfg, req, "collectMetrics", fn)
+	return instrumentPluginRequest(ctx, cfg, req, endpointCollectMetrics, fn)
 }
 
 // InstrumentCheckHealthRequest instruments checkHealth.
 func InstrumentCheckHealthRequest(ctx context.Context, req *backend.PluginContext, cfg Cfg, fn func() error) error {
-	return instrumentPluginRequest(ctx, cfg, req, "checkHealth", fn)
+	return instrumentPluginRequest(ctx, cfg, req, endpointCheckHealth, fn)
 }
 
 // InstrumentCallResourceRequest instruments callResource.
-func InstrumentCallResourceRequest(ctx context.Context, req *backend.PluginContext, cfg Cfg, fn func() error) error {
-	return instrumentPluginRequest(ctx, cfg, req, "callResource", fn)
+func InstrumentCallResourceRequest(ctx context.Context, req *backend.PluginContext, cfg Cfg, requestSize float64, fn func() error) error {
+	pluginRequestSizeHistogram.WithLabelValues("grafana-backend", req.PluginID, endpointCallResource,
+		string(cfg.Target)).Observe(requestSize)
+	return instrumentPluginRequest(ctx, cfg, req, endpointCallResource, fn)
 }
 
 // InstrumentQueryDataRequest instruments success rate and latency of query data requests.
-func InstrumentQueryDataRequest(ctx context.Context, req *backend.PluginContext, cfg Cfg, fn func() error) error {
-	return instrumentPluginRequest(ctx, cfg, req, "queryData", fn)
+func InstrumentQueryDataRequest(ctx context.Context, req *backend.PluginContext, cfg Cfg,
+	requestSize float64, fn func() error) error {
+	pluginRequestSizeHistogram.WithLabelValues("grafana-backend", req.PluginID, endpointQueryData,
+		string(cfg.Target)).Observe(requestSize)
+	return instrumentPluginRequest(ctx, cfg, req, endpointQueryData, fn)
 }
diff --git a/pkg/plugins/manager/client/client.go b/pkg/plugins/manager/client/client.go
index 4663cddef02..a1bd1e864f6 100644
--- a/pkg/plugins/manager/client/client.go
+++ b/pkg/plugins/manager/client/client.go
@@ -40,11 +40,16 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 		return nil, plugins.ErrPluginNotRegistered.Errorf("%w", backendplugin.ErrPluginNotRegistered)
 	}
 
+	var totalBytes float64
+	for _, v := range req.Queries {
+		totalBytes += float64(len(v.JSON))
+	}
+
 	var resp *backend.QueryDataResponse
 	err := instrumentation.InstrumentQueryDataRequest(ctx, &req.PluginContext, instrumentation.Cfg{
 		LogDatasourceRequests: s.cfg.LogDatasourceRequests,
 		Target:                p.Target(),
-	}, func() (innerErr error) {
+	}, totalBytes, func() (innerErr error) {
 		resp, innerErr = p.QueryData(ctx, req)
 		return
 	})
@@ -86,10 +91,12 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 	if !exists {
 		return backendplugin.ErrPluginNotRegistered
 	}
+
+	totalBytes := float64(len(req.Body))
 	err := instrumentation.InstrumentCallResourceRequest(ctx, &req.PluginContext, instrumentation.Cfg{
 		LogDatasourceRequests: s.cfg.LogDatasourceRequests,
 		Target:                p.Target(),
-	}, func() error {
+	}, totalBytes, func() error {
 		removeConnectionHeaders(req.Headers)
 		removeHopByHopHeaders(req.Headers)
 

From 4e142246691e881d8cfd139ff87d1e6ff88e2c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Wed, 12 Apr 2023 10:13:28 +0200
Subject: [PATCH 050/729] Correlations: Fix parsing create/update response
 (#66193)

* Fix parsing create/update response

* Make types more explicit
---
 .../correlations/CorrelationsPage.test.tsx    | 80 ++++---------------
 .../__mocks__/useCorrelations.mocks.ts        | 55 +++++++++++++
 public/app/features/correlations/types.ts     | 20 +++++
 .../features/correlations/useCorrelations.ts  | 23 ++++--
 4 files changed, 108 insertions(+), 70 deletions(-)
 create mode 100644 public/app/features/correlations/__mocks__/useCorrelations.mocks.ts

diff --git a/public/app/features/correlations/CorrelationsPage.test.tsx b/public/app/features/correlations/CorrelationsPage.test.tsx
index f143a2bed43..9b9430cd34c 100644
--- a/public/app/features/correlations/CorrelationsPage.test.tsx
+++ b/public/app/features/correlations/CorrelationsPage.test.tsx
@@ -2,58 +2,28 @@ import { render, waitFor, screen, fireEvent, within, Matcher, getByRole } from '
 import userEvent from '@testing-library/user-event';
 import { merge, uniqueId } from 'lodash';
 import React from 'react';
-import { DeepPartial } from 'react-hook-form';
 import { Observable } from 'rxjs';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { MockDataSourceApi } from 'test/mocks/datasource_srv';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { DataSourcePluginMeta } from '@grafana/data';
-import {
-  BackendSrv,
-  FetchError,
-  FetchResponse,
-  setDataSourceSrv,
-  BackendSrvRequest,
-  reportInteraction,
-} from '@grafana/runtime';
+import { BackendSrv, setDataSourceSrv, BackendSrvRequest, reportInteraction } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
 import { configureStore } from 'app/store/configureStore';
 
 import { mockDataSource, MockDataSourceSrv } from '../alerting/unified/mocks';
 
 import CorrelationsPage from './CorrelationsPage';
+import {
+  createCreateCorrelationResponse,
+  createFetchCorrelationsError,
+  createFetchCorrelationsResponse,
+  createRemoveCorrelationResponse,
+  createUpdateCorrelationResponse,
+} from './__mocks__/useCorrelations.mocks';
 import { Correlation, CreateCorrelationParams } from './types';
 
-function createFetchResponse<T>(overrides?: DeepPartial<FetchResponse>): FetchResponse<T> {
-  return merge(
-    {
-      data: undefined,
-      status: 200,
-      url: '',
-      config: { url: '' },
-      type: 'basic',
-      statusText: 'Ok',
-      redirected: false,
-      headers: {} as unknown as Headers,
-      ok: true,
-    },
-    overrides
-  );
-}
-
-function createFetchError(overrides?: DeepPartial<FetchError>): FetchError {
-  return merge(
-    createFetchResponse(),
-    {
-      status: 500,
-      statusText: 'Internal Server Error',
-      ok: false,
-    },
-    overrides
-  );
-}
-
 const renderWithContext = async (
   datasources: ConstructorParameters<typeof MockDataSourceSrv>[0] = {},
   correlations: Correlation[] = []
@@ -67,19 +37,10 @@ const renderWithContext = async (
       if (matches?.groups) {
         const { dsUid, correlationUid } = matches.groups;
         correlations = correlations.filter((c) => c.uid !== correlationUid || c.sourceUID !== dsUid);
-        return createFetchResponse({
-          data: {
-            message: 'Correlation deleted',
-          },
-        });
+        return createRemoveCorrelationResponse();
       }
 
-      throw createFetchError({
-        data: {
-          message: 'Correlation not found',
-        },
-        status: 404,
-      });
+      throw createFetchCorrelationsError();
     },
     post: async (url: string, data: Omit<CreateCorrelationParams, 'sourceUID'>) => {
       const matches = url.match(/^\/api\/datasources\/uid\/(?<sourceUID>[a-zA-Z0-9]+)\/correlations$/);
@@ -87,15 +48,10 @@ const renderWithContext = async (
         const { sourceUID } = matches.groups;
         const correlation = { sourceUID, ...data, uid: uniqueId() };
         correlations.push(correlation);
-        return correlation;
+        return createCreateCorrelationResponse(correlation);
       }
 
-      throw createFetchError({
-        status: 404,
-        data: {
-          message: 'Source datasource not found',
-        },
-      });
+      throw createFetchCorrelationsError();
     },
     patch: async (url: string, data: Omit<CreateCorrelationParams, 'sourceUID'>) => {
       const matches = url.match(
@@ -109,20 +65,14 @@ const renderWithContext = async (
           }
           return c;
         });
-        return createFetchResponse({
-          data: { sourceUID, ...data },
-        });
+        return createUpdateCorrelationResponse({ sourceUID, ...data, uid: uniqueId() });
       }
 
-      throw createFetchError({
-        data: { message: 'either correlation uid or source id not found' },
-        status: 404,
-      });
+      throw createFetchCorrelationsError();
     },
     fetch: (options: BackendSrvRequest) => {
       return new Observable((s) => {
-        s.next(merge(createFetchResponse({ url: options.url, data: correlations })));
-
+        s.next(merge(createFetchCorrelationsResponse({ url: options.url, data: correlations })));
         s.complete();
       });
     },
diff --git a/public/app/features/correlations/__mocks__/useCorrelations.mocks.ts b/public/app/features/correlations/__mocks__/useCorrelations.mocks.ts
new file mode 100644
index 00000000000..d95500dc376
--- /dev/null
+++ b/public/app/features/correlations/__mocks__/useCorrelations.mocks.ts
@@ -0,0 +1,55 @@
+import { merge } from 'lodash';
+import { DeepPartial } from 'react-hook-form';
+
+import { FetchError, FetchResponse } from '@grafana/runtime';
+
+import { Correlation, CreateCorrelationResponse, RemoveCorrelationResponse, UpdateCorrelationResponse } from '../types';
+
+export function createFetchCorrelationsResponse<T>(overrides?: DeepPartial<FetchResponse>): FetchResponse<T> {
+  return merge(
+    {
+      data: undefined,
+      status: 200,
+      url: '',
+      config: { url: '' },
+      type: 'basic',
+      statusText: 'Ok',
+      redirected: false,
+      headers: {} as unknown as Headers,
+      ok: true,
+    },
+    overrides
+  );
+}
+
+export function createFetchCorrelationsError(overrides?: DeepPartial<FetchError>): FetchError {
+  return merge(
+    createFetchCorrelationsResponse(),
+    {
+      status: 500,
+      statusText: 'Internal Server Error',
+      ok: false,
+    },
+    overrides
+  );
+}
+
+export function createCreateCorrelationResponse(correlation: Correlation): CreateCorrelationResponse {
+  return {
+    message: 'Correlation created',
+    result: correlation,
+  };
+}
+
+export function createUpdateCorrelationResponse(correlation: Correlation): UpdateCorrelationResponse {
+  return {
+    message: 'Correlation updated',
+    result: correlation,
+  };
+}
+
+export function createRemoveCorrelationResponse(): RemoveCorrelationResponse {
+  return {
+    message: 'Correlation removed',
+  };
+}
diff --git a/public/app/features/correlations/types.ts b/public/app/features/correlations/types.ts
index ae3b6950b4c..08ee7328dde 100644
--- a/public/app/features/correlations/types.ts
+++ b/public/app/features/correlations/types.ts
@@ -6,6 +6,26 @@ export interface AddCorrelationResponse {
 
 export type GetCorrelationsResponse = Correlation[];
 
+export interface CorrelationsApiResponse {
+  message: string;
+}
+
+export interface CorrelationsErrorResponse extends CorrelationsApiResponse {
+  error: string;
+}
+
+export interface CreateCorrelationResponse extends CorrelationsApiResponse {
+  result: Correlation;
+}
+
+export interface UpdateCorrelationResponse extends CorrelationsApiResponse {
+  result: Correlation;
+}
+
+export interface RemoveCorrelationResponse {
+  message: string;
+}
+
 type CorrelationConfigType = 'query';
 
 export interface CorrelationConfig {
diff --git a/public/app/features/correlations/useCorrelations.ts b/public/app/features/correlations/useCorrelations.ts
index b013a0d99d6..55729366cf9 100644
--- a/public/app/features/correlations/useCorrelations.ts
+++ b/public/app/features/correlations/useCorrelations.ts
@@ -5,7 +5,15 @@ import { DataSourceInstanceSettings } from '@grafana/data';
 import { getDataSourceSrv, FetchResponse } from '@grafana/runtime';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 
-import { Correlation, CreateCorrelationParams, RemoveCorrelationParams, UpdateCorrelationParams } from './types';
+import {
+  Correlation,
+  CreateCorrelationParams,
+  CreateCorrelationResponse,
+  RemoveCorrelationParams,
+  RemoveCorrelationResponse,
+  UpdateCorrelationParams,
+  UpdateCorrelationResponse,
+} from './types';
 
 export interface CorrelationData extends Omit<Correlation, 'sourceUID' | 'targetUID'> {
   source: DataSourceInstanceSettings;
@@ -44,20 +52,25 @@ export const useCorrelations = () => {
 
   const [createInfo, create] = useAsyncFn<(params: CreateCorrelationParams) => Promise<CorrelationData>>(
     ({ sourceUID, ...correlation }) =>
-      backend.post(`/api/datasources/uid/${sourceUID}/correlations`, correlation).then(toEnrichedCorrelationData),
+      backend
+        .post<CreateCorrelationResponse>(`/api/datasources/uid/${sourceUID}/correlations`, correlation)
+        .then((response) => {
+          return toEnrichedCorrelationData(response.result);
+        }),
     [backend]
   );
 
   const [removeInfo, remove] = useAsyncFn<(params: RemoveCorrelationParams) => Promise<{ message: string }>>(
-    ({ sourceUID, uid }) => backend.delete(`/api/datasources/uid/${sourceUID}/correlations/${uid}`),
+    ({ sourceUID, uid }) =>
+      backend.delete<RemoveCorrelationResponse>(`/api/datasources/uid/${sourceUID}/correlations/${uid}`),
     [backend]
   );
 
   const [updateInfo, update] = useAsyncFn<(params: UpdateCorrelationParams) => Promise<CorrelationData>>(
     ({ sourceUID, uid, ...correlation }) =>
       backend
-        .patch(`/api/datasources/uid/${sourceUID}/correlations/${uid}`, correlation)
-        .then(toEnrichedCorrelationData),
+        .patch<UpdateCorrelationResponse>(`/api/datasources/uid/${sourceUID}/correlations/${uid}`, correlation)
+        .then((response) => toEnrichedCorrelationData(response.result)),
     [backend]
   );
 

From db84277244904ca7115c01480203d87b9136676e Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matyax@gmail.com>
Date: Wed, 12 Apr 2023 10:27:31 +0200
Subject: [PATCH 051/729] Logs Navigation: Fix typo in test description
 (#66293)

Fix typo in test description
---
 public/app/features/explore/LogsNavigation.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/explore/LogsNavigation.test.tsx b/public/app/features/explore/LogsNavigation.test.tsx
index dfb0c09b6d8..d045191b060 100644
--- a/public/app/features/explore/LogsNavigation.test.tsx
+++ b/public/app/features/explore/LogsNavigation.test.tsx
@@ -93,7 +93,7 @@ describe('LogsNavigation', () => {
     expect(onChangeTimeMock).toHaveBeenCalledWith({ from: 1637319338000, to: 1637322938000 });
   });
 
-  it('should reset the scroll when pagination is clic ked', async () => {
+  it('should reset the scroll when pagination is clicked', async () => {
     const scrollToTopLogsMock = jest.fn();
     setup({ scrollToTopLogs: scrollToTopLogsMock });
 

From 1290dc824a6d81678d55d49ab89a1c683a59baf2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 08:42:17 +0000
Subject: [PATCH 052/729] Bump grafana/code-coverage from 0.1.18 to 0.1.19
 (#65308)

Bumps [grafana/code-coverage](https://github.com/grafana/code-coverage) from 0.1.18 to 0.1.19.
- [Release notes](https://github.com/grafana/code-coverage/releases)
- [Commits](https://github.com/grafana/code-coverage/compare/v0.1.18...v0.1.19)

---
updated-dependencies:
- dependency-name: grafana/code-coverage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cloud-data-sources-code-coverage.yml | 2 +-
 .github/workflows/ox-code-coverage.yml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cloud-data-sources-code-coverage.yml b/.github/workflows/cloud-data-sources-code-coverage.yml
index a99d0409468..dbd1d2bcb01 100644
--- a/.github/workflows/cloud-data-sources-code-coverage.yml
+++ b/.github/workflows/cloud-data-sources-code-coverage.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.18
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.19
     with:
       frontend-path-regexp: public\/app\/plugins\/datasource\/(azuremonitor|cloud-monitoring|cloudwatch)
       backend-path-regexp: pkg\/tsdb\/(azuremonitor|cloudmonitoring|cloudwatch)
diff --git a/.github/workflows/ox-code-coverage.yml b/.github/workflows/ox-code-coverage.yml
index 4961bc20444..faeaad2dd78 100644
--- a/.github/workflows/ox-code-coverage.yml
+++ b/.github/workflows/ox-code-coverage.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.18
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.19
     with:
       frontend-path-regexp: public\/app\/features\/(explore|correlations)|public\/app\/plugins\/datasource\/(loki|elasticsearch)
       backend-path-regexp: pkg\/services\/(queryhistory)|pkg\/tsdb\/(loki|elasticsearch)

From 24d348f804d07be66705995375c5af0f0bdc65ef Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Wed, 12 Apr 2023 11:47:40 +0300
Subject: [PATCH 053/729] CI: Split `/bin/build artifacts *` subcommand
 (#66005)

* Split go files

* Modify publishartifacts.go

* Split main

* FIXME: Temp add GCSCopy to gcloud/storage

* Fix lint

* Exported flags

* Update starlark - make drone

* Further backend lint fixes

* Add fallback_test.go

* Fix go imports order

* make drone

* Remove GCSCopy from static assets

* Remove GCSCopy from storybook

* Fix lint

* Remove GCSCopy

* Remove success logline

* drone yaml cleanup

* Add artifacts-editions flag

* Fix starlark

* Add default sting slice in artifacts packages command
---
 .drone.yml                           |  43 +++++-
 pkg/build/cmd/flags.go               |  18 +++
 pkg/build/cmd/main.go                |  81 ++++++-----
 pkg/build/cmd/publishartifacts.go    | 197 +++++++--------------------
 pkg/build/cmd/publishconfig.go       |  13 ++
 pkg/build/cmd/publishstaticassets.go |  51 +++++++
 pkg/build/cmd/publishstorybook.go    |  64 +++++++++
 pkg/build/env/fallback.go            |  40 ++++++
 pkg/build/env/fallback_test.go       | 143 +++++++++++++++++++
 pkg/build/gcloud/storage/gsutil.go   |   1 -
 scripts/drone/events/release.star    |  44 +++++-
 11 files changed, 504 insertions(+), 191 deletions(-)
 create mode 100644 pkg/build/cmd/publishconfig.go
 create mode 100644 pkg/build/cmd/publishstaticassets.go
 create mode 100644 pkg/build/cmd/publishstorybook.go
 create mode 100644 pkg/build/env/fallback.go
 create mode 100644 pkg/build/env/fallback_test.go

diff --git a/.drone.yml b/.drone.yml
index 9c5f364a85e..97ae6955df3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4171,7 +4171,7 @@ steps:
   image: golang:1.20.1
   name: compile-build-cmd
 - commands:
-  - ./bin/build artifacts publish --security --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
+  - ./bin/build artifacts packages --security --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
   depends_on:
   - compile-build-cmd
   environment:
@@ -4183,10 +4183,21 @@ steps:
       from_secret: prerelease_bucket
     SECURITY_DEST_BUCKET:
       from_secret: security_dest_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: publish-artifacts
+- commands:
+  - ./bin/build artifacts static-assets --tag ${DRONE_TAG}
+  depends_on:
+  - compile-build-cmd
+  environment:
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
     STATIC_ASSET_EDITIONS:
       from_secret: static_asset_editions
   image: grafana/grafana-ci-deploy:1.3.3
-  name: publish-artifacts
+  name: publish-static-assets
 trigger:
   event:
   - promote
@@ -4222,7 +4233,7 @@ steps:
   image: golang:1.20.1
   name: compile-build-cmd
 - commands:
-  - ./bin/build artifacts publish --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
+  - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
   depends_on:
   - compile-build-cmd
   environment:
@@ -4234,10 +4245,32 @@ steps:
       from_secret: prerelease_bucket
     SECURITY_DEST_BUCKET:
       from_secret: security_dest_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: publish-artifacts
+- commands:
+  - ./bin/build artifacts static-assets --tag ${DRONE_TAG}
+  depends_on:
+  - compile-build-cmd
+  environment:
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
     STATIC_ASSET_EDITIONS:
       from_secret: static_asset_editions
   image: grafana/grafana-ci-deploy:1.3.3
-  name: publish-artifacts
+  name: publish-static-assets
+- commands:
+  - ./bin/build artifacts storybook --tag ${DRONE_TAG}
+  depends_on:
+  - compile-build-cmd
+  environment:
+    GCP_KEY:
+      from_secret: gcp_key
+    PRERELEASE_BUCKET:
+      from_secret: prerelease_bucket
+  image: grafana/grafana-ci-deploy:1.3.3
+  name: publish-storybook
 trigger:
   event:
   - promote
@@ -6753,6 +6786,6 @@ kind: secret
 name: enterprise2_security_prefix
 ---
 kind: signature
-hmac: 54bded4dc7c3ffbbf3859a4f8f6364f59f3b6e0696152a0b835211eca7119e50
+hmac: 421b968fc475a71ac3367a4f9d2da3b6ff68208c04d28d5fd1074cf03688a52a
 
 ...
diff --git a/pkg/build/cmd/flags.go b/pkg/build/cmd/flags.go
index 5d0efe489b3..c9020fe2403 100644
--- a/pkg/build/cmd/flags.go
+++ b/pkg/build/cmd/flags.go
@@ -51,4 +51,22 @@ var (
 		Name:  "tag",
 		Usage: "Grafana version tag",
 	}
+	securityFlag = cli.BoolFlag{
+		Name:  "security",
+		Usage: "Security release",
+	}
+	srcFlag = cli.StringFlag{
+		Name:  "src-bucket",
+		Value: "grafana-prerelease",
+		Usage: "Google Cloud Storage bucket",
+	}
+	securityDestBucketFlag = cli.StringFlag{
+		Name:  "security-dest-bucket",
+		Usage: "Google Cloud Storage bucket for security packages (or $SECURITY_DEST_BUCKET)",
+	}
+	destFlag = cli.StringFlag{
+		Name:  "dest-bucket",
+		Value: "grafana-downloads",
+		Usage: "Google Cloud Storage bucket for published packages",
+	}
 )
diff --git a/pkg/build/cmd/main.go b/pkg/build/cmd/main.go
index 2d2f9cbe4c6..225a02f38bc 100644
--- a/pkg/build/cmd/main.go
+++ b/pkg/build/cmd/main.go
@@ -198,42 +198,31 @@ func main() {
 			Usage: "Handle Grafana artifacts",
 			Subcommands: cli.Commands{
 				{
-					Name:   "publish",
-					Usage:  "Publish Grafana artifacts",
-					Action: PublishArtifactsAction,
+					Name:   "storybook",
+					Usage:  "Publish Grafana storybook",
+					Action: PublishStorybookAction,
 					Flags: []cli.Flag{
 						&editionFlag,
-						&cli.BoolFlag{
-							Name:  "security",
-							Usage: "Security release",
-						},
+						&tagFlag,
+						&srcFlag,
 						&cli.StringFlag{
-							Name:  "security-dest-bucket",
-							Usage: "Google Cloud Storage bucket for security packages (or $SECURITY_DEST_BUCKET)",
-						},
-						&cli.StringFlag{
-							Name:  "tag",
-							Usage: "Grafana version tag",
-						},
-						&cli.StringFlag{
-							Name:  "src-bucket",
-							Value: "grafana-prerelease",
-							Usage: "Google Cloud Storage bucket",
-						},
-						&cli.StringFlag{
-							Name:  "dest-bucket",
-							Value: "grafana-downloads",
-							Usage: "Google Cloud Storage bucket for published packages",
-						},
-						&cli.StringFlag{
-							Name:  "enterprise2-dest-bucket",
-							Value: "grafana-downloads-enterprise2",
-							Usage: "Google Cloud Storage bucket for published packages",
-						},
-						&cli.StringFlag{
-							Name:  "enterprise2-security-prefix",
-							Usage: "Bucket path prefix for enterprise2 security releases (or $ENTERPRISE2_SECURITY_PREFIX)",
+							Name:  "storybook-bucket",
+							Value: "grafana-storybook",
+							Usage: "Google Cloud Storage bucket for storybooks",
 						},
+					},
+				},
+				{
+					Name:   "static-assets",
+					Usage:  "Publish Grafana static assets",
+					Action: PublishStaticAssetsAction,
+					Flags: []cli.Flag{
+						&editionFlag,
+						&securityFlag,
+						&securityDestBucketFlag,
+						&tagFlag,
+						&srcFlag,
+						&destFlag,
 						&cli.StringFlag{
 							Name:  "static-assets-bucket",
 							Value: "grafana-static-assets",
@@ -243,10 +232,32 @@ func main() {
 							Name:  "static-asset-editions",
 							Usage: "All the editions of the static assets (or $STATIC_ASSET_EDITIONS)",
 						},
+					},
+				},
+				{
+					Name:   "packages",
+					Usage:  "Publish Grafana packages",
+					Action: PublishArtifactsAction,
+					Flags: []cli.Flag{
+						&editionFlag,
+						&securityFlag,
+						&securityDestBucketFlag,
+						&tagFlag,
+						&srcFlag,
+						&destFlag,
+						&cli.StringSliceFlag{
+							Name:  "artifacts-editions",
+							Value: cli.NewStringSlice("oss", "enterprise", "enterprise2"),
+							Usage: "Editions for which the artifacts should be delivered (oss,enterprise,enterprise2), (or $ARTIFACTS_EDITIONS)",
+						},
 						&cli.StringFlag{
-							Name:  "storybook-bucket",
-							Value: "grafana-storybook",
-							Usage: "Google Cloud Storage bucket for storybooks",
+							Name:  "enterprise2-dest-bucket",
+							Value: "grafana-downloads-enterprise2",
+							Usage: "Google Cloud Storage bucket for published packages",
+						},
+						&cli.StringFlag{
+							Name:  "enterprise2-security-prefix",
+							Usage: "Bucket path prefix for enterprise2 security releases (or $ENTERPRISE2_SECURITY_PREFIX)",
 						},
 					},
 				},
diff --git a/pkg/build/cmd/publishartifacts.go b/pkg/build/cmd/publishartifacts.go
index bd158d6d3ad..bf3f162e362 100644
--- a/pkg/build/cmd/publishartifacts.go
+++ b/pkg/build/cmd/publishartifacts.go
@@ -3,60 +3,16 @@ package main
 import (
 	"fmt"
 	"log"
-	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/build/env"
 	"github.com/grafana/grafana/pkg/build/gcloud"
-	"github.com/grafana/grafana/pkg/build/versions"
+	"github.com/grafana/grafana/pkg/build/gcloud/storage"
 	"github.com/urfave/cli/v2"
 )
 
-type publishConfig struct {
-	tag                       string
-	srcBucket                 string
-	destBucket                string
-	enterprise2DestBucket     string
-	enterprise2SecurityPrefix string
-	staticAssetsBucket        string
-	staticAssetEditions       []string
-	storybookBucket           string
-	security                  bool
-}
-
-// requireListWithEnvFallback first checks the CLI for a flag with the required
-// name. If this is empty, it  falls back to taking the environment variable.
-// Sadly, we cannot use cli.Flag.EnvVars for this due to it potentially leaking
-// environment variables as default values in usage-errors.
-func requireListWithEnvFallback(cctx *cli.Context, name string, envName string) ([]string, error) {
-	result := cctx.StringSlice(name)
-	if len(result) == 0 {
-		for _, v := range strings.Split(os.Getenv(envName), ",") {
-			value := strings.TrimSpace(v)
-			if value != "" {
-				result = append(result, value)
-			}
-		}
-	}
-	if len(result) == 0 {
-		return nil, cli.Exit(fmt.Sprintf("Required flag (%s) or environment variable (%s) not set", name, envName), 1)
-	}
-	return result, nil
-}
-
-func requireStringWithEnvFallback(cctx *cli.Context, name string, envName string) (string, error) {
-	result := cctx.String(name)
-	if result == "" {
-		result = os.Getenv(envName)
-	}
-	if result == "" {
-		return "", cli.Exit(fmt.Sprintf("Required flag (%s) or environment variable (%s) not set", name, envName), 1)
-	}
-	return result, nil
-}
-
-// Action implements the sub-command "publish-artifacts".
+// PublishArtifactsAction Action implements the sub-command "publish-artifacts".
 func PublishArtifactsAction(c *cli.Context) error {
 	if c.NArg() > 0 {
 		if err := cli.ShowSubcommandHelp(c); err != nil {
@@ -65,17 +21,23 @@ func PublishArtifactsAction(c *cli.Context) error {
 		return cli.Exit("", 1)
 	}
 
-	staticAssetEditions, err := requireListWithEnvFallback(c, "static-asset-editions", "STATIC_ASSET_EDITIONS")
+	security := c.Bool("security")
+	var securityDestBucket, enterprise2SecurityPrefix string
+
+	artifactsEditions, err := env.RequireListWithEnvFallback(c, "artifacts-editions", "ARTIFACTS_EDITIONS")
 	if err != nil {
 		return err
 	}
-	securityDestBucket, err := requireStringWithEnvFallback(c, "security-dest-bucket", "SECURITY_DEST_BUCKET")
-	if err != nil {
-		return err
-	}
-	enterprise2SecurityPrefix, err := requireStringWithEnvFallback(c, "enterprise2-security-prefix", "ENTERPRISE2_SECURITY_PREFIX")
-	if err != nil {
-		return err
+
+	if security {
+		securityDestBucket, err = env.RequireStringWithEnvFallback(c, "security-dest-bucket", "SECURITY_DEST_BUCKET")
+		if err != nil {
+			return err
+		}
+		enterprise2SecurityPrefix, err = env.RequireStringWithEnvFallback(c, "enterprise2-security-prefix", "ENTERPRISE2_SECURITY_PREFIX")
+		if err != nil {
+			return err
+		}
 	}
 
 	if err := gcloud.ActivateServiceAccount(); err != nil {
@@ -87,10 +49,7 @@ func PublishArtifactsAction(c *cli.Context) error {
 		destBucket:                c.String("dest-bucket"),
 		enterprise2DestBucket:     c.String("enterprise2-dest-bucket"),
 		enterprise2SecurityPrefix: enterprise2SecurityPrefix,
-		staticAssetsBucket:        c.String("static-assets-bucket"),
-		staticAssetEditions:       staticAssetEditions,
-		storybookBucket:           c.String("storybook-bucket"),
-		security:                  c.Bool("security"),
+		security:                  security,
 		tag:                       strings.TrimPrefix(c.String("tag"), "v"),
 	}
 
@@ -98,114 +57,56 @@ func PublishArtifactsAction(c *cli.Context) error {
 		cfg.destBucket = securityDestBucket
 	}
 
-	err = copyStaticAssets(cfg)
+	gcs, err := storage.New()
 	if err != nil {
 		return err
 	}
-	err = copyStorybook(cfg)
-	if err != nil {
-		return err
-	}
-	err = copyDownloads(cfg)
-	if err != nil {
-		return err
-	}
-	err = copyEnterprise2Downloads(cfg)
-	if err != nil {
-		return err
+
+	for _, edition := range artifactsEditions {
+		switch edition {
+		case "oss", "enterprise":
+			err = copyArtifacts(c, gcs, cfg, edition)
+			if err != nil {
+				return err
+			}
+		case "enterprise2":
+			err = copyEnterprise2Artifacts(c, gcs, cfg)
+			if err != nil {
+				return err
+			}
+		default:
+			log.Printf("unrecognised artifacts edition: %s\n", edition)
+		}
 	}
+
 	return nil
 }
 
-func copyStaticAssets(cfg publishConfig) error {
-	for _, edition := range cfg.staticAssetEditions {
-		log.Printf("Copying static assets for %s", edition)
-		srcURL := fmt.Sprintf("%s/artifacts/static-assets/%s/%s/*", cfg.srcBucket, edition, cfg.tag)
-		destURL := fmt.Sprintf("%s/%s/%s/", cfg.staticAssetsBucket, edition, cfg.tag)
-		err := gcsCopy("static assets", srcURL, destURL)
-		if err != nil {
-			return fmt.Errorf("error copying static assets, %q", err)
-		}
+func copyArtifacts(c *cli.Context, gcs *storage.Client, cfg publishConfig, edition string) error {
+	bucket := gcs.Bucket(cfg.destBucket)
+	destURL := edition
+	if !cfg.security {
+		destURL = filepath.Join(destURL, "release")
 	}
-	log.Printf("Successfully copied static assets!")
-	return nil
-}
-
-func copyStorybook(cfg publishConfig) error {
-	if cfg.security {
-		log.Printf("skipping storybook copy - not needed for a security release")
-		return nil
-	}
-	log.Printf("Copying storybooks...")
-	srcURL := fmt.Sprintf("%s/artifacts/storybook/v%s/*", cfg.srcBucket, cfg.tag)
-	destURL := fmt.Sprintf("%s/%s", cfg.storybookBucket, cfg.tag)
-	err := gcsCopy("storybook", srcURL, destURL)
-	if err != nil {
-		return fmt.Errorf("error copying storybook. %q", err)
-	}
-	stableVersion, err := versions.GetLatestVersion(versions.LatestStableVersionURL)
-	if err != nil {
+	log.Printf("Copying downloads for %s, from %s bucket to %s bucket", edition, cfg.srcBucket, destURL)
+	if err := gcs.CopyRemoteDir(c.Context, gcs.Bucket(cfg.srcBucket), fmt.Sprintf("artifacts/downloads/v%s/%s/release", cfg.tag, edition), bucket, destURL); err != nil {
 		return err
 	}
-	isLatest, err := versions.IsGreaterThanOrEqual(cfg.tag, stableVersion)
-	if err != nil {
-		return err
-	}
-	if isLatest {
-		log.Printf("Copying storybooks to latest...")
-		srcURL := fmt.Sprintf("%s/artifacts/storybook/v%s/*", cfg.srcBucket, cfg.tag)
-		destURL := fmt.Sprintf("%s/latest", cfg.storybookBucket)
-		err := gcsCopy("storybook (latest)", srcURL, destURL)
-		if err != nil {
-			return fmt.Errorf("error copying storybook to latest. %q", err)
-		}
-	}
 
-	log.Printf("Successfully copied storybook!")
-	return nil
-}
-
-func copyDownloads(cfg publishConfig) error {
-	for _, edition := range []string{
-		"oss", "enterprise",
-	} {
-		destURL := fmt.Sprintf("%s/%s/", cfg.destBucket, edition)
-		srcURL := fmt.Sprintf("%s/artifacts/downloads/v%s/%s/release/*", cfg.srcBucket, cfg.tag, edition)
-		if !cfg.security {
-			destURL = filepath.Join(destURL, "release")
-		}
-		log.Printf("Copying downloads for %s, from %s bucket to %s bucket", edition, srcURL, destURL)
-		err := gcsCopy("downloads", srcURL, destURL)
-		if err != nil {
-			return fmt.Errorf("error copying downloads, %q", err)
-		}
-	}
 	log.Printf("Successfully copied downloads.")
 	return nil
 }
 
-func copyEnterprise2Downloads(cfg publishConfig) error {
+func copyEnterprise2Artifacts(c *cli.Context, gcs *storage.Client, cfg publishConfig) error {
+	bucket := gcs.Bucket(cfg.enterprise2DestBucket)
 	var prefix string
 	if cfg.security {
 		prefix = cfg.enterprise2SecurityPrefix
 	}
-	srcURL := fmt.Sprintf("%s/artifacts/downloads-enterprise2/v%s/enterprise2/release/*", cfg.srcBucket, cfg.tag)
-	destURL := fmt.Sprintf("%s/enterprise2/%srelease", cfg.enterprise2DestBucket, prefix)
-	log.Printf("Copying downloads for enterprise2, from %s bucket to %s bucket", srcURL, destURL)
-	err := gcsCopy("enterprise2 downloads", srcURL, destURL)
-	if err != nil {
-		return fmt.Errorf("error copying ")
-	}
-	return nil
-}
-
-func gcsCopy(desc, src, dest string) error {
-	args := strings.Split(fmt.Sprintf("-m cp -r gs://%s gs://%s", src, dest), " ")
-	// nolint:gosec
-	cmd := exec.Command("gsutil", args...)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("failed to publish %s: %w\n%s", desc, err, out)
+	destURL := fmt.Sprintf("enterprise2/%srelease", prefix)
+	log.Printf("Copying downloads for enterprise2, from %s bucket to %s bucket", cfg.srcBucket, destURL)
+	if err := gcs.CopyRemoteDir(c.Context, gcs.Bucket(cfg.srcBucket), fmt.Sprintf("artifacts/downloads-enterprise2/v%s/enterprise2/release", cfg.tag), bucket, destURL); err != nil {
+		return err
 	}
 	return nil
 }
diff --git a/pkg/build/cmd/publishconfig.go b/pkg/build/cmd/publishconfig.go
new file mode 100644
index 00000000000..4715fce25e7
--- /dev/null
+++ b/pkg/build/cmd/publishconfig.go
@@ -0,0 +1,13 @@
+package main
+
+type publishConfig struct {
+	tag                       string
+	srcBucket                 string
+	destBucket                string
+	enterprise2DestBucket     string
+	enterprise2SecurityPrefix string
+	staticAssetsBucket        string
+	staticAssetEditions       []string
+	storybookBucket           string
+	security                  bool
+}
diff --git a/pkg/build/cmd/publishstaticassets.go b/pkg/build/cmd/publishstaticassets.go
new file mode 100644
index 00000000000..5b6eff9f12a
--- /dev/null
+++ b/pkg/build/cmd/publishstaticassets.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/build/env"
+	"github.com/grafana/grafana/pkg/build/gcloud"
+	"github.com/grafana/grafana/pkg/build/gcloud/storage"
+	"github.com/urfave/cli/v2"
+)
+
+// PublishStaticAssetsAction Action implements the sub-command "artifacts static-assets".
+func PublishStaticAssetsAction(c *cli.Context) error {
+	if c.NArg() > 0 {
+		if err := cli.ShowSubcommandHelp(c); err != nil {
+			return cli.Exit(err.Error(), 1)
+		}
+		return cli.Exit("", 1)
+	}
+
+	staticAssetEditions, err := env.RequireListWithEnvFallback(c, "static-asset-editions", "STATIC_ASSET_EDITIONS")
+	if err != nil {
+		return err
+	}
+
+	if err := gcloud.ActivateServiceAccount(); err != nil {
+		return fmt.Errorf("error connecting to gcp, %q", err)
+	}
+
+	cfg := publishConfig{
+		srcBucket:           c.String("src-bucket"),
+		staticAssetsBucket:  c.String("static-assets-bucket"),
+		staticAssetEditions: staticAssetEditions,
+		tag:                 strings.TrimPrefix(c.String("tag"), "v"),
+	}
+
+	gcs, err := storage.New()
+	if err != nil {
+		return err
+	}
+	bucket := gcs.Bucket(cfg.staticAssetsBucket)
+
+	for _, edition := range staticAssetEditions {
+		if err := gcs.CopyRemoteDir(c.Context, gcs.Bucket(cfg.srcBucket), fmt.Sprintf("artifacts/static-assets/%s/%s", edition, cfg.tag), bucket, fmt.Sprintf("%s/%s", edition, cfg.tag)); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/build/cmd/publishstorybook.go b/pkg/build/cmd/publishstorybook.go
new file mode 100644
index 00000000000..b147d9a7b40
--- /dev/null
+++ b/pkg/build/cmd/publishstorybook.go
@@ -0,0 +1,64 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/build/gcloud"
+	"github.com/grafana/grafana/pkg/build/gcloud/storage"
+	"github.com/grafana/grafana/pkg/build/versions"
+	"github.com/urfave/cli/v2"
+)
+
+// PublishStorybookAction Action implements the sub-command "publish-artifacts".
+func PublishStorybookAction(c *cli.Context) error {
+	if c.NArg() > 0 {
+		if err := cli.ShowSubcommandHelp(c); err != nil {
+			return cli.Exit(err.Error(), 1)
+		}
+		return cli.Exit("", 1)
+	}
+
+	if err := gcloud.ActivateServiceAccount(); err != nil {
+		return fmt.Errorf("error connecting to gcp, %q", err)
+	}
+
+	cfg := publishConfig{
+		srcBucket:       c.String("src-bucket"),
+		storybookBucket: c.String("storybook-bucket"),
+		tag:             strings.TrimPrefix(c.String("tag"), "v"),
+	}
+
+	gcs, err := storage.New()
+	if err != nil {
+		return err
+	}
+	bucket := gcs.Bucket(cfg.storybookBucket)
+	if err := gcs.CopyRemoteDir(c.Context, gcs.Bucket(cfg.srcBucket), fmt.Sprintf("artifacts/storybook/v%s", cfg.tag), bucket, cfg.tag); err != nil {
+		return err
+	}
+
+	if latest, err := isLatest(cfg); err != nil && latest {
+		log.Printf("Copying storybooks to latest...")
+		if err := gcs.CopyRemoteDir(c.Context, gcs.Bucket(cfg.srcBucket), fmt.Sprintf("artifacts/storybook/v%s", cfg.tag), bucket, "latest"); err != nil {
+			return err
+		}
+	} else {
+		return err
+	}
+
+	return nil
+}
+
+func isLatest(cfg publishConfig) (bool, error) {
+	stableVersion, err := versions.GetLatestVersion(versions.LatestStableVersionURL)
+	if err != nil {
+		return false, err
+	}
+	isLatest, err := versions.IsGreaterThanOrEqual(cfg.tag, stableVersion)
+	if err != nil {
+		return false, err
+	}
+	return isLatest, nil
+}
diff --git a/pkg/build/env/fallback.go b/pkg/build/env/fallback.go
new file mode 100644
index 00000000000..7f4f31cb09e
--- /dev/null
+++ b/pkg/build/env/fallback.go
@@ -0,0 +1,40 @@
+package env
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v2"
+)
+
+// RequireListWithEnvFallback first checks the CLI for a flag with the required
+// name. If this is empty, it  falls back to taking the environment variable.
+// Sadly, we cannot use cli.Flag.EnvVars for this due to it potentially leaking
+// environment variables as default values in usage-errors.
+func RequireListWithEnvFallback(cctx *cli.Context, name string, envName string) ([]string, error) {
+	result := cctx.StringSlice(name)
+	if len(result) == 0 {
+		for _, v := range strings.Split(os.Getenv(envName), ",") {
+			value := strings.TrimSpace(v)
+			if value != "" {
+				result = append(result, value)
+			}
+		}
+	}
+	if len(result) == 0 {
+		return nil, cli.Exit(fmt.Sprintf("Required flag (%s) or environment variable (%s) not set", name, envName), 1)
+	}
+	return result, nil
+}
+
+func RequireStringWithEnvFallback(cctx *cli.Context, name string, envName string) (string, error) {
+	result := cctx.String(name)
+	if result == "" {
+		result = os.Getenv(envName)
+	}
+	if result == "" {
+		return "", cli.Exit(fmt.Sprintf("Required flag (%s) or environment variable (%s) not set", name, envName), 1)
+	}
+	return result, nil
+}
diff --git a/pkg/build/env/fallback_test.go b/pkg/build/env/fallback_test.go
new file mode 100644
index 00000000000..d14e13ee774
--- /dev/null
+++ b/pkg/build/env/fallback_test.go
@@ -0,0 +1,143 @@
+package env
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/urfave/cli/v2"
+)
+
+const (
+	flag1 = "flag1"
+	flag2 = "flag2"
+)
+
+func TestRequireListWithEnvFallback(t *testing.T) {
+	var app = cli.NewApp()
+	tests := []struct {
+		testName    string
+		ctx         *cli.Context
+		name        string
+		envName     string
+		expected    []string
+		expectedErr error
+	}{
+		{
+			testName:    "string slice present in context",
+			ctx:         cli.NewContext(app, applyFlagSet(t, flag1, "a"), nil),
+			name:        flag1,
+			envName:     "",
+			expected:    []string{"a"},
+			expectedErr: nil,
+		},
+		{
+			testName:    "string slice present in env",
+			ctx:         cli.NewContext(app, flag.NewFlagSet("test", 0), nil),
+			name:        flag1,
+			envName:     setEnv(t, flag1, "a"),
+			expected:    []string{"a"},
+			expectedErr: nil,
+		},
+		{
+			testName:    "string slice absent in both context and env",
+			ctx:         cli.NewContext(app, flag.NewFlagSet("test", 0), nil),
+			name:        flag1,
+			envName:     "",
+			expected:    []string(nil),
+			expectedErr: cli.Exit("Required flag (flag1) or environment variable () not set", 1),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			flagList, err := RequireListWithEnvFallback(tt.ctx, tt.name, tt.envName)
+			if tt.expectedErr != nil {
+				require.Error(t, err)
+			}
+			require.Equal(t, tt.expected, flagList)
+		})
+	}
+}
+
+func TestRequireStringWithEnvFallback(t *testing.T) {
+	var app = cli.NewApp()
+	tests := []struct {
+		testName    string
+		ctx         *cli.Context
+		name        string
+		envName     string
+		expected    string
+		expectedErr error
+	}{
+		{
+			testName:    "string present in the context",
+			ctx:         cli.NewContext(app, setFlags(t, flag1, flag2, flag.NewFlagSet("test", flag.ContinueOnError)), nil),
+			name:        flag1,
+			envName:     "",
+			expected:    "a",
+			expectedErr: nil,
+		},
+		{
+			testName:    "string present in env",
+			ctx:         cli.NewContext(app, setFlags(t, "", "", flag.NewFlagSet("test", flag.ContinueOnError)), nil),
+			name:        flag1,
+			envName:     setEnv(t, flag1, "a"),
+			expected:    "a",
+			expectedErr: nil,
+		},
+		{
+			testName:    "string absent from both context and env",
+			ctx:         cli.NewContext(app, setFlags(t, "", flag2, flag.NewFlagSet("test", flag.ContinueOnError)), nil),
+			name:        flag1,
+			envName:     "",
+			expected:    "",
+			expectedErr: cli.Exit("Required flag (flag1) or environment variable () not set", 1),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.testName, func(t *testing.T) {
+			flagString, err := RequireStringWithEnvFallback(tt.ctx, tt.name, tt.envName)
+			if tt.expectedErr != nil {
+				require.Error(t, err)
+			}
+			require.Equal(t, tt.expected, flagString)
+		})
+	}
+}
+
+func applyFlagSet(t *testing.T, aFlag, aValue string) *flag.FlagSet {
+	t.Helper()
+	var val cli.StringSlice
+	fl := cli.StringSliceFlag{Name: aFlag, EnvVars: []string{"FLAG"}, Value: &val}
+	set := flag.NewFlagSet("test", 0)
+	parseInput := []string{fmt.Sprintf("-%s", aFlag), aValue}
+	err := fl.Apply(set)
+	require.NoError(t, err)
+	err = set.Parse(parseInput)
+	require.NoError(t, err)
+	return set
+}
+
+func setFlags(t *testing.T, flag1, flag2 string, flagSet *flag.FlagSet) *flag.FlagSet {
+	t.Helper()
+	if flag1 != "" {
+		flagSet.StringVar(&flag1, "flag1", "a", "")
+	}
+	if flag2 != "" {
+		flagSet.StringVar(&flag2, "flag2", "b", "")
+	}
+	return flagSet
+}
+
+func setEnv(t *testing.T, key, value string) string {
+	t.Helper()
+	os.Clearenv()
+
+	err := os.Setenv(key, value)
+	if err != nil {
+		require.NoError(t, err)
+	}
+	return key
+}
diff --git a/pkg/build/gcloud/storage/gsutil.go b/pkg/build/gcloud/storage/gsutil.go
index 3c7e5392386..38a040f6017 100644
--- a/pkg/build/gcloud/storage/gsutil.go
+++ b/pkg/build/gcloud/storage/gsutil.go
@@ -207,7 +207,6 @@ func (client *Client) RemoteCopy(ctx context.Context, file File, fromBucket, toB
 		return fmt.Errorf("failed to copy object %s, to %s, err: %w", file.FullPath, dstObject, err)
 	}
 
-	log.Printf("%s was successfully copied to %v bucket!.\n\n", file.FullPath, toBucket)
 	return nil
 }
 
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index a163927b045..0c30444b271 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -557,17 +557,54 @@ def publish_artifacts_step(mode):
             "PRERELEASE_BUCKET": from_secret("prerelease_bucket"),
             "ENTERPRISE2_SECURITY_PREFIX": from_secret("enterprise2_security_prefix"),
             "SECURITY_DEST_BUCKET": from_secret("security_dest_bucket"),
-            "STATIC_ASSET_EDITIONS": from_secret("static_asset_editions"),
         },
         "commands": [
-            "./bin/build artifacts publish {}--tag $${{DRONE_TAG}} --src-bucket $${{PRERELEASE_BUCKET}}".format(
+            "./bin/build artifacts packages {}--tag $${{DRONE_TAG}} --src-bucket $${{PRERELEASE_BUCKET}}".format(
                 security,
             ),
         ],
         "depends_on": ["compile-build-cmd"],
     }
 
+def publish_static_assets_step():
+    return {
+        "name": "publish-static-assets",
+        "image": publish_image,
+        "environment": {
+            "GCP_KEY": from_secret("gcp_key"),
+            "PRERELEASE_BUCKET": from_secret("prerelease_bucket"),
+            "STATIC_ASSET_EDITIONS": from_secret("static_asset_editions"),
+        },
+        "commands": [
+            "./bin/build artifacts static-assets --tag ${DRONE_TAG}",
+        ],
+        "depends_on": ["compile-build-cmd"],
+    }
+
+def publish_storybook_step():
+    return {
+        "name": "publish-storybook",
+        "image": publish_image,
+        "environment": {
+            "GCP_KEY": from_secret("gcp_key"),
+            "PRERELEASE_BUCKET": from_secret("prerelease_bucket"),
+        },
+        "commands": [
+            "./bin/build artifacts storybook --tag ${DRONE_TAG}",
+        ],
+        "depends_on": ["compile-build-cmd"],
+    }
+
 def publish_artifacts_pipelines(mode):
+    """Published artifacts after they've been stored and tested in prerelease buckets.
+
+    Args:
+      mode: public or security.
+        Defaults to ''.
+
+    Returns:
+      List of Drone pipelines.
+    """
     trigger = {
         "event": ["promote"],
         "target": [mode],
@@ -575,7 +612,10 @@ def publish_artifacts_pipelines(mode):
     steps = [
         compile_build_cmd(),
         publish_artifacts_step(mode),
+        publish_static_assets_step(),
     ]
+    if mode != "security":
+        steps.extend([publish_storybook_step()])
 
     return [
         pipeline(

From 48de17945fb538dd9e0ddf40b023816a10dd3f05 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Wed, 12 Apr 2023 11:18:38 +0200
Subject: [PATCH 054/729] Chore: Use maintained crypto library (#66304)

---
 pkg/plugins/manager/signature/manifest.go | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkg/plugins/manager/signature/manifest.go b/pkg/plugins/manager/signature/manifest.go
index 4f7923b067e..604795edd99 100644
--- a/pkg/plugins/manager/signature/manifest.go
+++ b/pkg/plugins/manager/signature/manifest.go
@@ -16,14 +16,10 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/gobwas/glob"
-
-	// TODO: replace deprecated `golang.org/x/crypto` package https://github.com/grafana/grafana/issues/46050
-	// nolint:staticcheck
-	"golang.org/x/crypto/openpgp"
-	// nolint:staticcheck
-	"golang.org/x/crypto/openpgp/clearsign"
-
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/setting"
@@ -337,7 +333,7 @@ func validateManifest(m PluginManifest, block *clearsign.Block) error {
 
 	if _, err = openpgp.CheckDetachedSignature(keyring,
 		bytes.NewBuffer(block.Bytes),
-		block.ArmoredSignature.Body); err != nil {
+		block.ArmoredSignature.Body, &packet.Config{}); err != nil {
 		return fmt.Errorf("%v: %w", "failed to check signature", err)
 	}
 

From 52f39e6fa06e6353fc681a2d14f7d7eadb4e4f04 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Wed, 12 Apr 2023 11:34:16 +0200
Subject: [PATCH 055/729] Chore: Soft failure in plugin initialization (#66210)

---
 pkg/plugins/manager/fakes/fakes.go        |  23 +++--
 pkg/plugins/manager/loader/loader.go      |  11 ++-
 pkg/plugins/manager/loader/loader_test.go | 103 ++++++++++++++++++++++
 3 files changed, 125 insertions(+), 12 deletions(-)

diff --git a/pkg/plugins/manager/fakes/fakes.go b/pkg/plugins/manager/fakes/fakes.go
index 55c8f8d595a..b94a40c7e78 100644
--- a/pkg/plugins/manager/fakes/fakes.go
+++ b/pkg/plugins/manager/fakes/fakes.go
@@ -299,23 +299,28 @@ func (m *FakeProcessManager) Stop(ctx context.Context, pluginID string) error {
 }
 
 type FakeBackendProcessProvider struct {
-	Requested map[string]int
-	Invoked   map[string]int
+	Requested          map[string]int
+	Invoked            map[string]int
+	BackendFactoryFunc func(context.Context, *plugins.Plugin) backendplugin.PluginFactoryFunc
 }
 
 func NewFakeBackendProcessProvider() *FakeBackendProcessProvider {
-	return &FakeBackendProcessProvider{
+	f := &FakeBackendProcessProvider{
 		Requested: make(map[string]int),
 		Invoked:   make(map[string]int),
 	}
+	f.BackendFactoryFunc = func(ctx context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
+		f.Requested[p.ID]++
+		return func(pluginID string, _ log.Logger, _ []string) (backendplugin.Plugin, error) {
+			f.Invoked[pluginID]++
+			return &FakePluginClient{}, nil
+		}
+	}
+	return f
 }
 
-func (pr *FakeBackendProcessProvider) BackendFactory(_ context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
-	pr.Requested[p.ID]++
-	return func(pluginID string, _ log.Logger, _ []string) (backendplugin.Plugin, error) {
-		pr.Invoked[pluginID]++
-		return &FakePluginClient{}, nil
-	}
+func (pr *FakeBackendProcessProvider) BackendFactory(ctx context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
+	return pr.BackendFactoryFunc(ctx, p)
 }
 
 type FakeLicensingService struct {
diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go
index 2349b4d255e..0cc65c06468 100644
--- a/pkg/plugins/manager/loader/loader.go
+++ b/pkg/plugins/manager/loader/loader.go
@@ -161,17 +161,22 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
 		verifiedPlugins = append(verifiedPlugins, plugin)
 	}
 
+	// initialize plugins
+	initializedPlugins := make([]*plugins.Plugin, 0)
 	for _, p := range verifiedPlugins {
 		err := l.pluginInitializer.Initialize(ctx, p)
 		if err != nil {
-			return nil, err
+			l.log.Error("Could not initialize plugin", "pluginId", p.ID, "err", err)
+			continue
 		}
 		if errDeclareRoles := l.roleRegistry.DeclarePluginRoles(ctx, p.ID, p.Name, p.Roles); errDeclareRoles != nil {
 			l.log.Warn("Declare plugin roles failed.", "pluginID", p.ID, "err", errDeclareRoles)
 		}
+
+		initializedPlugins = append(initializedPlugins, p)
 	}
 
-	for _, p := range verifiedPlugins {
+	for _, p := range initializedPlugins {
 		if err := l.load(ctx, p); err != nil {
 			l.log.Error("Could not start plugin", "pluginId", p.ID, "err", err)
 		}
@@ -181,7 +186,7 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
 		}
 	}
 
-	return verifiedPlugins, nil
+	return initializedPlugins, nil
 }
 
 func (l *Loader) Unload(ctx context.Context, pluginID string) error {
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index 81e09f76813..d922f27fb3c 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -2,6 +2,7 @@ package loader
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path/filepath"
 	"sort"
@@ -12,6 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
@@ -1014,6 +1016,107 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
 	})
 }
 
+func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
+	t.Run("Load duplicate plugin folders", func(t *testing.T) {
+		pluginDir1, err := filepath.Abs("../testdata/test-app")
+		if err != nil {
+			t.Errorf("could not construct absolute path of plugin dir")
+			return
+		}
+		pluginDir2, err := filepath.Abs("../testdata/valid-v2-signature")
+		if err != nil {
+			t.Errorf("could not construct absolute path of plugin dir")
+			return
+		}
+		expected := []*plugins.Plugin{
+			{
+				JSONData: plugins.JSONData{
+					ID:   "test-app",
+					Type: "app",
+					Name: "Test App",
+					Info: plugins.Info{
+						Author: plugins.InfoLink{
+							Name: "Test Inc.",
+							URL:  "http://test.com",
+						},
+						Description: "Official Grafana Test App & Dashboard bundle",
+						Version:     "1.0.0",
+						Links: []plugins.InfoLink{
+							{Name: "Project site", URL: "http://project.com"},
+							{Name: "License & Terms", URL: "http://license.com"},
+						},
+						Logos: plugins.Logos{
+							Small: "public/plugins/test-app/img/logo_small.png",
+							Large: "public/plugins/test-app/img/logo_large.png",
+						},
+						Screenshots: []plugins.Screenshots{
+							{Path: "public/plugins/test-app/img/screenshot1.png", Name: "img1"},
+							{Path: "public/plugins/test-app/img/screenshot2.png", Name: "img2"},
+						},
+						Updated: "2015-02-10",
+					},
+					Dependencies: plugins.Dependencies{
+						GrafanaVersion: "3.x.x",
+						Plugins: []plugins.Dependency{
+							{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
+							{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
+						},
+					},
+					Includes: []*plugins.Includes{
+						{Name: "Nginx Connections", Path: "dashboards/connections.json", Type: "dashboard", Role: "Viewer", Slug: "nginx-connections"},
+						{Name: "Nginx Memory", Path: "dashboards/memory.json", Type: "dashboard", Role: "Viewer", Slug: "nginx-memory"},
+						{Name: "Nginx Panel", Type: "panel", Role: "Viewer", Slug: "nginx-panel"},
+						{Name: "Nginx Datasource", Type: "datasource", Role: "Viewer", Slug: "nginx-datasource"},
+					},
+					Backend: false,
+				},
+				FS:            plugins.NewLocalFS(filesInDir(t, pluginDir1), pluginDir1),
+				Class:         plugins.External,
+				Signature:     plugins.SignatureValid,
+				SignatureType: plugins.GrafanaSignature,
+				SignatureOrg:  "Grafana Labs",
+				Module:        "plugins/test-app/module",
+				BaseURL:       "public/plugins/test-app",
+			},
+		}
+
+		reg := fakes.NewFakePluginRegistry()
+		storage := fakes.NewFakePluginStorage()
+		procPrvdr := fakes.NewFakeBackendProcessProvider()
+		// Cause an initialization error
+		procPrvdr.BackendFactoryFunc = func(ctx context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
+			return func(pluginID string, _ log.Logger, _ []string) (backendplugin.Plugin, error) {
+				if pluginID == "test-datasource" {
+					return nil, fmt.Errorf("failed to initialize")
+				}
+				return &fakes.FakePluginClient{}, nil
+			}
+		}
+		procMgr := fakes.NewFakeProcessManager()
+		l := newLoader(&config.Cfg{}, func(l *Loader) {
+			l.pluginRegistry = reg
+			l.pluginStorage = storage
+			l.processManager = procMgr
+			l.pluginInitializer = initializer.New(&config.Cfg{}, procPrvdr, fakes.NewFakeLicensingService())
+		})
+		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
+			PluginClassFunc: func(ctx context.Context) plugins.Class {
+				return plugins.External
+			},
+			PluginURIsFunc: func(ctx context.Context) []string {
+				return []string{pluginDir1, pluginDir2}
+			},
+		})
+		require.NoError(t, err)
+
+		if !cmp.Equal(got, expected, compareOpts...) {
+			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
+		}
+
+		verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+	})
+}
+
 func TestLoader_Load_NestedPlugins(t *testing.T) {
 	rootDir, err := filepath.Abs("../")
 	if err != nil {

From 5df33c0dc1a673e1a9ed6128b7cf4b4649371e5f Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 12 Apr 2023 10:44:01 +0100
Subject: [PATCH 056/729] NestedFolders: New Browse Dashboards views (#66003)

* scaffold new browse routes

* a part of rtk query

* load nested data

* .

* link nested dashboards items

* add comment about bad code, update codeowners

* tidies
---
 .github/CODEOWNERS                            |   1 +
 public/app/core/reducers/root.ts              |   2 +
 .../BrowseDashboardsPage.tsx                  |  47 ++++++++
 .../api/browseDashboardsAPI.ts                |  40 +++++++
 .../components/BrowseActions.tsx              |  39 +++++++
 .../components/BrowseView.tsx                 | 101 ++++++++++++++++++
 .../components/SearchView.tsx                 |  17 +++
 .../search/components/DashboardListPage.tsx   |   1 +
 public/app/features/search/service/folders.ts |  10 +-
 public/app/routes/routes.tsx                  |  25 ++++-
 public/app/store/configureStore.ts            |   4 +-
 11 files changed, 282 insertions(+), 5 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
 create mode 100644 public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BrowseView.tsx
 create mode 100644 public/app/features/browse-dashboards/components/SearchView.tsx

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 456d9e4f8f4..fe7ad32d3ab 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -377,6 +377,7 @@ lerna.json @grafana/frontend-ops
 /public/app/features/query/ @grafana/dashboards-squad
 /public/app/features/sandbox/ @grafana/grafana-frontend-platform
 /public/app/features/scenes/ @grafana/dashboards-squad
+/public/app/features/browse-dashboards/ @grafana/grafana-frontend-platform
 /public/app/features/search/ @grafana/grafana-frontend-platform
 /public/app/features/serviceaccounts/ @grafana/grafana-authnz-team
 /public/app/features/storage/ @grafana/grafana-app-platform-squad
diff --git a/public/app/core/reducers/root.ts b/public/app/core/reducers/root.ts
index 07e871a703e..9d0f89de4f9 100644
--- a/public/app/core/reducers/root.ts
+++ b/public/app/core/reducers/root.ts
@@ -4,6 +4,7 @@ import sharedReducers from 'app/core/reducers';
 import ldapReducers from 'app/features/admin/state/reducers';
 import alertingReducers from 'app/features/alerting/state/reducers';
 import apiKeysReducers from 'app/features/api-keys/state/reducers';
+import { browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { publicDashboardApi } from 'app/features/dashboard/api/publicDashboardApi';
 import panelEditorReducers from 'app/features/dashboard/components/PanelEditor/state/reducers';
 import dashboardReducers from 'app/features/dashboard/state/reducers';
@@ -48,6 +49,7 @@ const rootReducers = {
   plugins: pluginsReducer,
   [alertingApi.reducerPath]: alertingApi.reducer,
   [publicDashboardApi.reducerPath]: publicDashboardApi.reducer,
+  [browseDashboardsAPI.reducerPath]: browseDashboardsAPI.reducer,
 };
 
 const addedReducers = {};
diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
new file mode 100644
index 00000000000..114396465de
--- /dev/null
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -0,0 +1,47 @@
+import React, { memo, useMemo } from 'react';
+
+import { locationSearchToObject } from '@grafana/runtime';
+import { Page } from 'app/core/components/Page/Page';
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+
+import { buildNavModel } from '../folders/state/navModel';
+import { parseRouteParams } from '../search/utils';
+
+import { skipToken, useGetFolderQuery } from './api/browseDashboardsAPI';
+import { BrowseActions } from './components/BrowseActions';
+import { BrowseView } from './components/BrowseView';
+import { SearchView } from './components/SearchView';
+
+export interface BrowseDashboardsPageRouteParams {
+  uid?: string;
+  slug?: string;
+}
+
+interface Props extends GrafanaRouteComponentProps<BrowseDashboardsPageRouteParams> {}
+
+// New Browse/Manage/Search Dashboards views for nested folders
+
+export const BrowseDashboardsPage = memo(({ match, location }: Props) => {
+  const { uid: folderUID } = match.params;
+
+  const searchState = useMemo(() => {
+    return parseRouteParams(locationSearchToObject(location.search));
+  }, [location.search]);
+
+  const { data: folderDTO } = useGetFolderQuery(folderUID ?? skipToken);
+  const navModel = useMemo(() => (folderDTO ? buildNavModel(folderDTO) : undefined), [folderDTO]);
+
+  return (
+    <Page navId="dashboards/browse" pageNav={navModel}>
+      <Page.Contents>
+        <BrowseActions />
+
+        {folderDTO && <pre>{JSON.stringify(folderDTO, null, 2)}</pre>}
+
+        {searchState.query ? <SearchView searchState={searchState} /> : <BrowseView folderUID={folderUID} />}
+      </Page.Contents>
+    </Page>
+  );
+});
+
+BrowseDashboardsPage.displayName = 'BrowseDashboardsPage';
diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
new file mode 100644
index 00000000000..5f4fbe6f68e
--- /dev/null
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -0,0 +1,40 @@
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
+
+import { FolderDTO } from 'app/types';
+
+// interface RequestOptions extends BackendSrvRequest {
+//   manageError?: (err: unknown) => { error: unknown };
+//   showErrorAlert?: boolean;
+// }
+
+// function createBackendSrvBaseQuery({ baseURL }: { baseURL: string }): BaseQueryFn<RequestOptions> {
+//   async function backendSrvBaseQuery(requestOptions: RequestOptions) {
+//     try {
+//       const { data: responseData, ...meta } = await lastValueFrom(
+//         getBackendSrv().fetch({
+//           ...requestOptions,
+//           url: baseURL + requestOptions.url,
+//           showErrorAlert: requestOptions.showErrorAlert,
+//         })
+//       );
+//       return { data: responseData, meta };
+//     } catch (error) {
+//       return requestOptions.manageError ? requestOptions.manageError(error) : { error };
+//     }
+//   }
+
+//   return backendSrvBaseQuery;
+// }
+
+export const browseDashboardsAPI = createApi({
+  reducerPath: 'browse-dashboards',
+  baseQuery: fetchBaseQuery({ baseUrl: '/api' }),
+  endpoints: (builder) => ({
+    getFolder: builder.query<FolderDTO, string>({
+      query: (folderUID) => `/folders/${folderUID}`,
+    }),
+  }),
+});
+
+export const { useGetFolderQuery } = browseDashboardsAPI;
+export { skipToken } from '@reduxjs/toolkit/query/react';
diff --git a/public/app/features/browse-dashboards/components/BrowseActions.tsx b/public/app/features/browse-dashboards/components/BrowseActions.tsx
new file mode 100644
index 00000000000..cf05c7d856e
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions.tsx
@@ -0,0 +1,39 @@
+import React, { useMemo } from 'react';
+
+import { Input } from '@grafana/ui';
+import { ActionRow } from 'app/features/search/page/components/ActionRow';
+import { SearchLayout } from 'app/features/search/types';
+
+export function BrowseActions() {
+  const fakeState = useMemo(() => {
+    return {
+      query: '',
+      tag: [],
+      starred: false,
+      layout: SearchLayout.Folders,
+      eventTrackingNamespace: 'manage_dashboards' as const,
+    };
+  }, []);
+
+  return (
+    <div>
+      <Input placeholder="Search box" />
+
+      <br />
+
+      <ActionRow
+        includePanels={false}
+        state={fakeState}
+        getTagOptions={() => Promise.resolve([])}
+        getSortOptions={() => Promise.resolve([])}
+        onLayoutChange={() => {}}
+        onSortChange={() => {}}
+        onStarredFilterChange={() => {}}
+        onTagFilterChange={() => {}}
+        onDatasourceChange={() => {}}
+        onPanelTypeChange={() => {}}
+        onSetIncludePanels={() => {}}
+      />
+    </div>
+  );
+}
diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
new file mode 100644
index 00000000000..9ea9b49b30f
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -0,0 +1,101 @@
+import React, { useCallback, useEffect, useState } from 'react';
+
+import { Icon, IconButton, Link } from '@grafana/ui';
+import { getFolderChildren } from 'app/features/search/service/folders';
+import { DashboardViewItem } from 'app/features/search/types';
+
+type NestedData = Record<string, DashboardViewItem[] | undefined>;
+
+interface BrowseViewProps {
+  folderUID: string | undefined;
+}
+
+export function BrowseView({ folderUID }: BrowseViewProps) {
+  const [nestedData, setNestedData] = useState<NestedData>({});
+
+  // Note: entire implementation of this component must be replaced.
+  // This is just to show proof of concept for fetching and showing the data
+
+  useEffect(() => {
+    const folderKey = folderUID ?? '$$root';
+
+    getFolderChildren(folderUID, undefined, true).then((children) => {
+      setNestedData((v) => ({ ...v, [folderKey]: children }));
+    });
+  }, [folderUID]);
+
+  const items = nestedData[folderUID ?? '$$root'] ?? [];
+
+  const handleNodeClick = useCallback(
+    (uid: string) => {
+      if (nestedData[uid]) {
+        setNestedData((v) => ({ ...v, [uid]: undefined }));
+        return;
+      }
+
+      getFolderChildren(uid).then((children) => {
+        setNestedData((v) => ({ ...v, [uid]: children }));
+      });
+    },
+    [nestedData]
+  );
+
+  return (
+    <div>
+      <p>Browse view</p>
+
+      <ul style={{ marginLeft: 16 }}>
+        {items.map((item) => {
+          return (
+            <li key={item.uid}>
+              <BrowseItem item={item} nestedData={nestedData} onFolderClick={handleNodeClick} />
+            </li>
+          );
+        })}
+      </ul>
+    </div>
+  );
+}
+
+function BrowseItem({
+  item,
+  nestedData,
+  onFolderClick,
+}: {
+  item: DashboardViewItem;
+  nestedData: NestedData;
+  onFolderClick: (uid: string) => void;
+}) {
+  const childItems = nestedData[item.uid];
+
+  return (
+    <>
+      <div>
+        {item.kind === 'folder' ? (
+          <IconButton onClick={() => onFolderClick(item.uid)} name={childItems ? 'angle-down' : 'angle-right'} />
+        ) : (
+          <span style={{ paddingRight: 20 }} />
+        )}
+        <Icon name={item.kind === 'folder' ? (childItems ? 'folder-open' : 'folder') : 'apps'} />{' '}
+        <Link href={item.kind === 'folder' ? `/nested-dashboards/f/${item.uid}` : `/d/${item.uid}`}>{item.title}</Link>
+      </div>
+
+      {childItems && (
+        <ul style={{ marginLeft: 16 }}>
+          {childItems.length === 0 && (
+            <li>
+              <em>Empty folder</em>
+            </li>
+          )}
+          {childItems.map((childItem) => {
+            return (
+              <li key={childItem.uid}>
+                <BrowseItem item={childItem} nestedData={nestedData} onFolderClick={onFolderClick} />{' '}
+              </li>
+            );
+          })}
+        </ul>
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/browse-dashboards/components/SearchView.tsx b/public/app/features/browse-dashboards/components/SearchView.tsx
new file mode 100644
index 00000000000..b789d99a6e9
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/SearchView.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { parseRouteParams } from 'app/features/search/utils';
+
+interface SearchViewProps {
+  searchState: ReturnType<typeof parseRouteParams>;
+}
+
+export function SearchView({ searchState }: SearchViewProps) {
+  return (
+    <div>
+      <p>SearchView</p>
+
+      <pre>{JSON.stringify(searchState, null, 2)}</pre>
+    </div>
+  );
+}
diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx
index 846b3351da2..8c21db76909 100644
--- a/public/app/features/search/components/DashboardListPage.tsx
+++ b/public/app/features/search/components/DashboardListPage.tsx
@@ -23,6 +23,7 @@ export const DashboardListPage = memo(({ match, location }: Props) => {
   const { loading, value } = useAsync<() => Promise<{ folder?: FolderDTO; pageNav?: NavModelItem }>>(() => {
     const uid = match.params.uid;
     const url = location.pathname;
+
     if (!uid || !url.startsWith('/dashboards')) {
       return Promise.resolve({});
     }
diff --git a/public/app/features/search/service/folders.ts b/public/app/features/search/service/folders.ts
index c71609a21de..f6b3c39eb5d 100644
--- a/public/app/features/search/service/folders.ts
+++ b/public/app/features/search/service/folders.ts
@@ -7,13 +7,17 @@ import { getGrafanaSearcher } from './searcher';
 import { NestedFolderDTO } from './types';
 import { queryResultToViewItem } from './utils';
 
-export async function getFolderChildren(parentUid?: string, parentTitle?: string): Promise<DashboardViewItem[]> {
+export async function getFolderChildren(
+  parentUid?: string,
+  parentTitle?: string,
+  dashboardsAtRoot = false
+): Promise<DashboardViewItem[]> {
   if (!config.featureToggles.nestedFolders) {
     console.error('getFolderChildren requires nestedFolders feature toggle');
     return [];
   }
 
-  if (!parentUid) {
+  if (!dashboardsAtRoot && !parentUid) {
     // We don't show dashboards at root in folder view yet - they're shown under a dummy 'general'
     // folder that FolderView adds in
     const folders = await getChildFolders();
@@ -24,7 +28,7 @@ export async function getFolderChildren(parentUid?: string, parentTitle?: string
   const dashboardsResults = await searcher.search({
     kind: ['dashboard'],
     query: '*',
-    location: parentUid,
+    location: parentUid ?? 'general',
     limit: 1000,
   });
 
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index f9b3e6ed981..a46873526f4 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Redirect } from 'react-router-dom';
 
+import { isTruthy } from '@grafana/data';
 import { NavLandingPage } from 'app/core/components/AppChrome/NavLandingPage';
 import { ErrorPage } from 'app/core/components/ErrorPage/ErrorPage';
 import { LoginPage } from 'app/core/components/Login/LoginPage';
@@ -168,6 +169,9 @@ export function getAppRoutes(): RouteDescriptor[] {
             )
       ),
     },
+
+    ...(config.featureToggles.nestedFolders ? getNestedFoldersRoutes() : []),
+
     {
       path: '/dashboards',
       component: SafeDynamicImport(
@@ -513,7 +517,7 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     // TODO[Router]
     // ...playlistRoutes,
-  ];
+  ].filter(isTruthy);
 }
 
 export function getSupportBundleRoutes(cfg = config): RouteDescriptor[] {
@@ -565,3 +569,22 @@ export function getDynamicDashboardRoutes(cfg = config): RouteDescriptor[] {
     },
   ];
 }
+
+function getNestedFoldersRoutes(): RouteDescriptor[] {
+  return [
+    {
+      path: '/nested-dashboards',
+      component: SafeDynamicImport(() => import('app/features/browse-dashboards/BrowseDashboardsPage')),
+    },
+
+    {
+      path: '/nested-dashboards/f/:uid',
+      component: SafeDynamicImport(() => import('app/features/browse-dashboards/BrowseDashboardsPage')),
+    },
+
+    {
+      path: '/nested-dashboards/f/:uid/:slug',
+      component: SafeDynamicImport(() => import('app/features/browse-dashboards/BrowseDashboardsPage')),
+    },
+  ];
+}
diff --git a/public/app/store/configureStore.ts b/public/app/store/configureStore.ts
index 30e2c0a7164..ed36b9340f1 100644
--- a/public/app/store/configureStore.ts
+++ b/public/app/store/configureStore.ts
@@ -1,5 +1,6 @@
 import { configureStore as reduxConfigureStore } from '@reduxjs/toolkit';
 
+import { browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { publicDashboardApi } from 'app/features/dashboard/api/publicDashboardApi';
 import { StoreState } from 'app/types/store';
 
@@ -22,7 +23,8 @@ export function configureStore(initialState?: Partial<StoreState>) {
     middleware: (getDefaultMiddleware) =>
       getDefaultMiddleware({ thunk: true, serializableCheck: false, immutableCheck: false }).concat(
         alertingApi.middleware,
-        publicDashboardApi.middleware
+        publicDashboardApi.middleware,
+        browseDashboardsAPI.middleware
       ),
     devTools: process.env.NODE_ENV !== 'production',
     preloadedState: {

From 2eed889ab7224e5910155c386e2816e64652157c Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Wed, 12 Apr 2023 11:07:06 +0100
Subject: [PATCH 057/729] Service accounts: Refactor to make roleOptions act as
 Users for service accounts (#66107)

add fetchAC for licenseenabled
---
 .../components/ServiceAccountProfile.tsx      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx b/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx
index a6d83cc5b38..324f101b0ba 100644
--- a/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx
+++ b/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx
@@ -19,7 +19,7 @@ interface Props {
 export function ServiceAccountProfile({ serviceAccount, timeZone, onChange }: Props): JSX.Element {
   const styles = useStyles2(getStyles);
   const ableToWrite = contextSrv.hasPermission(AccessControlAction.ServiceAccountsWrite);
-  const [roles, setRoles] = React.useState<Role[]>([]);
+  const [roles, setRoleOptions] = React.useState<Role[]>([]);
 
   const onRoleChange = (role: OrgRole) => {
     onChange({ ...serviceAccount, role: role });
@@ -28,21 +28,21 @@ export function ServiceAccountProfile({ serviceAccount, timeZone, onChange }: Pr
   const onNameChange = (newValue: string) => {
     onChange({ ...serviceAccount, name: newValue });
   };
-  // TODO: this is a temporary solution to fetch roles for service accounts
-  // until we make use of the state from the serviceaccountspage
-  // and pass it down to the serviceaccountprofile
+
   React.useEffect(() => {
-    if (contextSrv.licensedAccessControlEnabled()) {
-      if (contextSrv.hasPermission(AccessControlAction.ActionRolesList)) {
-        fetchRoleOptions(serviceAccount.orgId)
-          .then((roles) => {
-            setRoles(roles);
-          })
-          .catch((err) => {
-            console.log('fetchRoleOptions error: ', err);
-          });
+    async function fetchOptions() {
+      try {
+        if (contextSrv.hasPermission(AccessControlAction.ActionRolesList)) {
+          let options = await fetchRoleOptions(serviceAccount.orgId);
+          setRoleOptions(options);
+        }
+      } catch (e) {
+        console.error('Error loading options for service account');
       }
     }
+    if (contextSrv.licensedAccessControlEnabled()) {
+      fetchOptions();
+    }
   }, [serviceAccount.orgId]);
 
   return (

From 29c43fcf7eb09f7f4c7515d4cc15e93a8783eb25 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 12 Apr 2023 14:10:14 +0200
Subject: [PATCH 058/729] Explore: Remove deprecated
 DataSourceWithLogsVolumeSupport (#66266)

Logs volume: Remove deprecated DataSourceWithLogsVolumeSupport
---
 .betterer.results                             |  3 ---
 packages/grafana-data/src/types/index.ts      |  1 -
 packages/grafana-data/src/types/logsVolume.ts | 26 -------------------
 public/app/features/explore/state/query.ts    | 22 ----------------
 4 files changed, 52 deletions(-)
 delete mode 100644 packages/grafana-data/src/types/logsVolume.ts

diff --git a/.betterer.results b/.betterer.results
index 21a1127350f..02f138aeec2 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -431,9 +431,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
-    "packages/grafana-data/src/types/logsVolume.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "packages/grafana-data/src/types/options.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts
index 6bf12f650b8..67657309dd6 100644
--- a/packages/grafana-data/src/types/index.ts
+++ b/packages/grafana-data/src/types/index.ts
@@ -7,7 +7,6 @@ export * from './dashboard';
 export * from './query';
 export * from './annotations';
 export * from './logs';
-export * from './logsVolume';
 export * from './navModel';
 export * from './select';
 export * from './time';
diff --git a/packages/grafana-data/src/types/logsVolume.ts b/packages/grafana-data/src/types/logsVolume.ts
deleted file mode 100644
index 273a53e91ce..00000000000
--- a/packages/grafana-data/src/types/logsVolume.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Observable } from 'rxjs';
-
-import { DataQueryRequest, DataQueryResponse } from './datasource';
-import { DataQuery } from './query';
-
-/**
- * Support for DataSourceWithLogsVolumeSupport is deprecated and will be removed in the next major version.
- * Use DataSourceWithSupplementaryQueriesSupport instead.
- *
- * @deprecated
- */
-export interface DataSourceWithLogsVolumeSupport<TQuery extends DataQuery> {
-  getLogsVolumeDataProvider(request: DataQueryRequest<TQuery>): Observable<DataQueryResponse> | undefined;
-}
-
-/**
- * Support for hasLogsVolumeSupport is deprecated and will be removed in the next major version.
- * Use DataSourceWithSupplementaryQueriesSupport and hasSupplementaryQuerySupport instead.
- *
- * @deprecated
- */
-export const hasLogsVolumeSupport = <TQuery extends DataQuery>(
-  datasource: unknown
-): datasource is DataSourceWithLogsVolumeSupport<TQuery> => {
-  return (datasource as DataSourceWithLogsVolumeSupport<TQuery>).getLogsVolumeDataProvider !== undefined;
-};
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 961eb74c0c3..ce92375a47d 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -10,7 +10,6 @@ import {
   DataQueryErrorType,
   DataQueryResponse,
   DataSourceApi,
-  hasLogsVolumeSupport,
   hasQueryExportSupport,
   hasQueryImportSupport,
   HistoryItem,
@@ -630,27 +629,6 @@ export const runQueries = (
               })
             );
 
-            if (!canReuseSupplementaryQueryData(supplementaryQueries[type].data, queries, absoluteRange)) {
-              dispatch(cleanSupplementaryQueryAction({ exploreId, type }));
-              if (supplementaryQueries[type].enabled) {
-                dispatch(loadSupplementaryQueryData(exploreId, type));
-              }
-            }
-            // Code below (else if scenario) is for backward compatibility with data sources that don't support supplementary queries
-            // TODO: Remove in next major version - v10 (https://github.com/grafana/grafana/issues/61845)
-          } else if (hasLogsVolumeSupport(datasourceInstance) && type === SupplementaryQueryType.LogsVolume) {
-            const dataProvider = datasourceInstance.getLogsVolumeDataProvider({
-              ...transaction.request,
-              requestId: `${transaction.request.requestId}_${snakeCase(type)}`,
-            });
-            dispatch(
-              storeSupplementaryQueryDataProviderAction({
-                exploreId,
-                type,
-                dataProvider,
-              })
-            );
-
             if (!canReuseSupplementaryQueryData(supplementaryQueries[type].data, queries, absoluteRange)) {
               dispatch(cleanSupplementaryQueryAction({ exploreId, type }));
               if (supplementaryQueries[type].enabled) {

From 303777e682758076d6a8e1df6b82f97b3b2393a7 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 12 Apr 2023 14:20:43 +0200
Subject: [PATCH 059/729] Elasticsearch: Add feature toggle to disable running
 queries trough backend (#66260)

* Elasticsearch: Create feature toggle to disable running queries trough backend

* Fix frontend tests running trough frontend

* Update description of feature toggle
---
 .../feature-toggles/index.md                  | 61 +++++++++----------
 .../src/types/featureToggles.gen.ts           |  3 +-
 pkg/services/featuremgmt/registry.go          | 18 ++----
 pkg/services/featuremgmt/toggles_gen.csv      |  3 +-
 pkg/services/featuremgmt/toggles_gen.go       | 12 ++--
 .../elasticsearch/datasource.test.ts          |  6 ++
 .../datasource/elasticsearch/datasource.ts    | 13 ++--
 7 files changed, 52 insertions(+), 64 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 5b8a2f758e7..67f03b425c3 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -19,39 +19,39 @@ This page contains a list of available feature toggles. To learn how to turn on
 
 Some stable features are enabled by default. You can disable a stable feature by setting the feature flag to "false" in the configuration.
 
-| Feature toggle name                 | Description                                                                                                                                                                  | Enabled by default |
-| ----------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| `disableEnvelopeEncryption`         | Disable envelope encryption (emergency only)                                                                                                                                 |                    |
-| `database_metrics`                  | Add Prometheus metrics for database tables                                                                                                                                   |                    |
-| `featureHighlights`                 | Highlight Grafana Enterprise features                                                                                                                                        |                    |
-| `cloudWatchDynamicLabels`           | Use dynamic labels instead of alias patterns in CloudWatch datasource                                                                                                        | Yes                |
-| `dataConnectionsConsole`            | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | Yes                |
-| `internationalization`              | Enables internationalization                                                                                                                                                 | Yes                |
-| `topnav`                            | Enables new top navigation and page layouts                                                                                                                                  | Yes                |
-| `cloudWatchCrossAccountQuerying`    | Enables cross-account querying in CloudWatch datasources                                                                                                                     | Yes                |
-| `newPanelChromeUI`                  | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu                                                                                          | Yes                |
-| `accessTokenExpirationCheck`        | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                         |                    |
-| `emptyDashboardPage`                | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                             | Yes                |
-| `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling                                                                                                                                         |                    |
-| `logsSampleInExplore`               | Enables access to the logs sample feature in Explore                                                                                                                         | Yes                |
+| Feature toggle name                   | Description                                                                                                                                                                  | Enabled by default |
+| ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| `disableEnvelopeEncryption`           | Disable envelope encryption (emergency only)                                                                                                                                 |                    |
+| `database_metrics`                    | Add Prometheus metrics for database tables                                                                                                                                   |                    |
+| `featureHighlights`                   | Highlight Grafana Enterprise features                                                                                                                                        |                    |
+| `cloudWatchDynamicLabels`             | Use dynamic labels instead of alias patterns in CloudWatch datasource                                                                                                        | Yes                |
+| `dataConnectionsConsole`              | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | Yes                |
+| `internationalization`                | Enables internationalization                                                                                                                                                 | Yes                |
+| `topnav`                              | Enables new top navigation and page layouts                                                                                                                                  | Yes                |
+| `cloudWatchCrossAccountQuerying`      | Enables cross-account querying in CloudWatch datasources                                                                                                                     | Yes                |
+| `newPanelChromeUI`                    | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu                                                                                          | Yes                |
+| `accessTokenExpirationCheck`          | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                         |                    |
+| `emptyDashboardPage`                  | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                             | Yes                |
+| `disablePrometheusExemplarSampling`   | Disable Prometheus exemplar sampling                                                                                                                                         |                    |
+| `logsSampleInExplore`                 | Enables access to the logs sample feature in Explore                                                                                                                         | Yes                |
+| `disableElasticsearchBackendQuerying` | Disable the processing of queries and responses in the Elasticsearch data source through backend                                                                             |                    |
 
 ## Beta feature toggles
 
-| Feature toggle name                       | Description                                                                                                                                                                                  |
-| ----------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `trimDefaults`                            | Use cue schema to remove values that will be applied automatically                                                                                                                           |
-| `panelTitleSearch`                        | Search for dashboards using panel title                                                                                                                                                      |
-| `prometheusAzureOverrideAudience`         | Experimental. Allow override default AAD audience for Azure Prometheus endpoint                                                                                                              |
-| `migrationLocking`                        | Lock database during migrations                                                                                                                                                              |
-| `newDBLibrary`                            | Use jmoiron/sqlx rather than xorm for a few backend services                                                                                                                                 |
-| `validateDashboardsOnSave`                | Validate dashboard JSON POSTed to api/dashboards/db                                                                                                                                          |
-| `autoMigrateOldPanels`                    | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)                                                                                                           |
-| `disableAngular`                          | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. |
-| `grpcServer`                              | Run the GRPC server                                                                                                                                                                          |
-| `accessControlOnCall`                     | Access control primitives for OnCall                                                                                                                                                         |
-| `alertingNoNormalState`                   | Stop maintaining state of alerts that are not firing                                                                                                                                         |
-| `disableElasticsearchBackendExploreQuery` | Disable executing of Elasticsearch Explore queries trough backend                                                                                                                            |
-| `renderAuthJWT`                           | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
+| Feature toggle name               | Description                                                                                                                                                                                  |
+| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `trimDefaults`                    | Use cue schema to remove values that will be applied automatically                                                                                                                           |
+| `panelTitleSearch`                | Search for dashboards using panel title                                                                                                                                                      |
+| `prometheusAzureOverrideAudience` | Experimental. Allow override default AAD audience for Azure Prometheus endpoint                                                                                                              |
+| `migrationLocking`                | Lock database during migrations                                                                                                                                                              |
+| `newDBLibrary`                    | Use jmoiron/sqlx rather than xorm for a few backend services                                                                                                                                 |
+| `validateDashboardsOnSave`        | Validate dashboard JSON POSTed to api/dashboards/db                                                                                                                                          |
+| `autoMigrateOldPanels`            | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)                                                                                                           |
+| `disableAngular`                  | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. |
+| `grpcServer`                      | Run the GRPC server                                                                                                                                                                          |
+| `accessControlOnCall`             | Access control primitives for OnCall                                                                                                                                                         |
+| `alertingNoNormalState`           | Stop maintaining state of alerts that are not firing                                                                                                                                         |
+| `renderAuthJWT`                   | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
 
 ## Alpha feature toggles
 
@@ -82,7 +82,6 @@ Alpha features might be changed or removed without prior notice.
 | `athenaAsyncQueryDataSupport`      | Enable async query data support for Athena                                                                                                                                                          |
 | `showDashboardValidationWarnings`  | Show warnings when dashboards do not validate against the schema                                                                                                                                    |
 | `mysqlAnsiQuotes`                  | Use double quotes to escape keyword in a MySQL query                                                                                                                                                |
-| `elasticsearchBackendMigration`    | Use Elasticsearch as backend data source                                                                                                                                                            |
 | `showTraceId`                      | Show trace ids for requests                                                                                                                                                                         |
 | `datasourceOnboarding`             | Enable data source onboarding page                                                                                                                                                                  |
 | `secureSocksDatasourceProxy`       | Enable secure socks tunneling for supported core datasources                                                                                                                                        |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index d8fea398788..8e43df06807 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -63,7 +63,6 @@ export interface FeatureToggles {
   accessControlOnCall?: boolean;
   nestedFolders?: boolean;
   accessTokenExpirationCheck?: boolean;
-  elasticsearchBackendMigration?: boolean;
   showTraceId?: boolean;
   datasourceOnboarding?: boolean;
   emptyDashboardPage?: boolean;
@@ -86,7 +85,6 @@ export interface FeatureToggles {
   prometheusResourceBrowserCache?: boolean;
   influxdbBackendMigration?: boolean;
   clientTokenRotation?: boolean;
-  disableElasticsearchBackendExploreQuery?: boolean;
   prometheusDataplane?: boolean;
   alertStateHistoryLokiSecondary?: boolean;
   alertStateHistoryLokiPrimary?: boolean;
@@ -96,4 +94,5 @@ export interface FeatureToggles {
   pyroscopeFlameGraph?: boolean;
   externalServiceAuth?: boolean;
   dataplaneFrontendFallback?: boolean;
+  disableElasticsearchBackendQuerying?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 8751d8b34cb..80c1b20e915 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -303,12 +303,6 @@ var (
 			State:       FeatureStateStable,
 			Owner:       grafanaAuthnzSquad,
 		},
-		{
-			Name:        "elasticsearchBackendMigration",
-			Description: "Use Elasticsearch as backend data source",
-			State:       FeatureStateAlpha,
-			Owner:       grafanaObservabilityLogsSquad,
-		},
 		{
 			Name:        "showTraceId",
 			Description: "Show trace ids for requests",
@@ -457,12 +451,6 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaAuthnzSquad,
 		},
-		{
-			Name:        "disableElasticsearchBackendExploreQuery",
-			Description: "Disable executing of Elasticsearch Explore queries trough backend",
-			State:       FeatureStateBeta,
-			Owner:       grafanaObservabilityLogsSquad,
-		},
 		{
 			Name:        "prometheusDataplane",
 			Description: "Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from 'Value' to the value of the `__name__` label when present.",
@@ -519,5 +507,11 @@ var (
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityMetricsSquad,
 		},
+		{
+			Name:        "disableElasticsearchBackendQuerying",
+			Description: "Disable the processing of queries and responses in the Elasticsearch data source through backend",
+			State:       FeatureStateStable,
+			Owner:       grafanaObservabilityLogsSquad,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index b4a0d44b016..39e4fdd58b4 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -44,7 +44,6 @@ mysqlAnsiQuotes,alpha,@grafana/backend-platform,false,false,false,false
 accessControlOnCall,beta,@grafana/grafana-authnz-team,false,false,false,false
 nestedFolders,alpha,@grafana/backend-platform,true,false,false,false
 accessTokenExpirationCheck,stable,@grafana/grafana-authnz-team,false,false,false,false
-elasticsearchBackendMigration,alpha,@grafana/observability-logs,false,false,false,false
 showTraceId,alpha,@grafana/observability-logs,false,false,false,false
 datasourceOnboarding,alpha,@grafana/dashboards-squad,false,false,false,false
 emptyDashboardPage,stable,@grafana/dashboards-squad,false,false,false,true
@@ -67,7 +66,6 @@ timeSeriesTable,alpha,@grafana/app-o11y,false,false,false,true
 prometheusResourceBrowserCache,alpha,@grafana/observability-metrics,false,false,false,true
 influxdbBackendMigration,alpha,@grafana/observability-metrics,false,false,false,true
 clientTokenRotation,alpha,@grafana/grafana-authnz-team,false,false,false,false
-disableElasticsearchBackendExploreQuery,beta,@grafana/observability-logs,false,false,false,false
 prometheusDataplane,alpha,@grafana/observability-metrics,false,false,false,false
 alertStateHistoryLokiSecondary,alpha,@grafana/alerting-squad,false,false,false,false
 alertStateHistoryLokiPrimary,alpha,@grafana/alerting-squad,false,false,false,false
@@ -77,3 +75,4 @@ renderAuthJWT,beta,@grafana/grafana-as-code,false,false,false,false
 pyroscopeFlameGraph,alpha,@grafana/observability-traces-and-profiling,false,false,false,false
 externalServiceAuth,alpha,@grafana/grafana-authnz-team,true,false,false,false
 dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false,true
+disableElasticsearchBackendQuerying,stable,@grafana/observability-logs,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index f79f1cf9c9e..22518a70146 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -187,10 +187,6 @@ const (
 	// Enable OAuth access_token expiration check and token refresh using the refresh_token
 	FlagAccessTokenExpirationCheck = "accessTokenExpirationCheck"
 
-	// FlagElasticsearchBackendMigration
-	// Use Elasticsearch as backend data source
-	FlagElasticsearchBackendMigration = "elasticsearchBackendMigration"
-
 	// FlagShowTraceId
 	// Show trace ids for requests
 	FlagShowTraceId = "showTraceId"
@@ -279,10 +275,6 @@ const (
 	// Replaces the current in-request token rotation so that the client initiates the rotation
 	FlagClientTokenRotation = "clientTokenRotation"
 
-	// FlagDisableElasticsearchBackendExploreQuery
-	// Disable executing of Elasticsearch Explore queries trough backend
-	FlagDisableElasticsearchBackendExploreQuery = "disableElasticsearchBackendExploreQuery"
-
 	// FlagPrometheusDataplane
 	// Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from &#39;Value&#39; to the value of the `__name__` label when present.
 	FlagPrometheusDataplane = "prometheusDataplane"
@@ -318,4 +310,8 @@ const (
 	// FlagDataplaneFrontendFallback
 	// Support dataplane contract field name change for transformations and field name matchers where the name is different
 	FlagDataplaneFrontendFallback = "dataplaneFrontendFallback"
+
+	// FlagDisableElasticsearchBackendQuerying
+	// Disable the processing of queries and responses in the Elasticsearch data source through backend
+	FlagDisableElasticsearchBackendQuerying = "disableElasticsearchBackendQuerying"
 )
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index b470338f836..4936257d09c 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -43,6 +43,12 @@ jest.mock('@grafana/runtime', () => ({
       },
     };
   },
+  config: {
+    buildInfo: {},
+    featureToggles: {
+      disableElasticsearchBackendQuerying: true,
+    },
+  },
 }));
 
 const TIMESRV_START = [2022, 8, 21, 6, 10, 10];
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 04f2183feb9..612da1585ff 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -501,8 +501,8 @@ export class ElasticDatasource
   }
 
   getLogRowContext = async (row: LogRowModel, options?: RowContextOptions): Promise<{ data: DataFrame[] }> => {
-    const { disableElasticsearchBackendExploreQuery, elasticsearchBackendMigration } = config.featureToggles;
-    if (!disableElasticsearchBackendExploreQuery || elasticsearchBackendMigration) {
+    const { disableElasticsearchBackendQuerying } = config.featureToggles;
+    if (!disableElasticsearchBackendQuerying) {
       const contextRequest = this.makeLogContextDataRequest(row, options);
 
       return lastValueFrom(
@@ -679,13 +679,8 @@ export class ElasticDatasource
   }
 
   query(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> {
-    // Run request through backend if it is coming from Explore and disableElasticsearchBackendExploreQuery is not set
-    // or if elasticsearchBackendMigration feature toggle is enabled
-    const { elasticsearchBackendMigration, disableElasticsearchBackendExploreQuery } = config.featureToggles;
-    const shouldRunTroughBackend =
-      (request.app === CoreApp.Explore && !disableElasticsearchBackendExploreQuery) || elasticsearchBackendMigration;
-
-    if (shouldRunTroughBackend) {
+    const { disableElasticsearchBackendQuerying } = config.featureToggles;
+    if (!disableElasticsearchBackendQuerying) {
       const start = new Date();
       return super.query(request).pipe(tap((response) => trackQuery(response, request, start)));
     }

From cca109eb7714db6217732bb2528719662080620e Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Wed, 12 Apr 2023 07:28:51 -0500
Subject: [PATCH 060/729] Prometheus: Query cache flakey tests (#66366)

Fix flaky tests
---
 .../app/plugins/datasource/prometheus/language_provider.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/prometheus/language_provider.test.ts b/public/app/plugins/datasource/prometheus/language_provider.test.ts
index dbe70fb8a0e..b751647be22 100644
--- a/public/app/plugins/datasource/prometheus/language_provider.test.ts
+++ b/public/app/plugins/datasource/prometheus/language_provider.test.ts
@@ -11,7 +11,7 @@ import LanguageProvider from './language_provider';
 import { getClientCacheDurationInMinutes, getPrometheusTime, getRangeSnapInterval } from './language_utils';
 import { PrometheusCacheLevel, PromQuery } from './types';
 
-const now = new Date().getTime();
+const now = new Date(1681300293392).getTime();
 const timeRangeDurationSeconds = 1;
 const toPrometheusTime = getPrometheusTime(dateTime(now), false);
 const fromPrometheusTime = getPrometheusTime(dateTime(now - timeRangeDurationSeconds * 1000), false);

From d830591cdc5e4be96658c0aab982fd29e9ba9192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Wed, 12 Apr 2023 14:45:21 +0200
Subject: [PATCH 061/729] Revert "Prometheus: Reduce allocations parsing
 exemplars" (#66367)

Revert "Prometheus: Reduce allocations parsing exemplars (#58959)"

This reverts commit a1f2d0e20582e3773ac623c5e0d55300fdbdc620.
---
 pkg/tsdb/prometheus/querydata/framing_bench_test.go | 1 -
 pkg/util/converter/prom.go                          | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkg/tsdb/prometheus/querydata/framing_bench_test.go b/pkg/tsdb/prometheus/querydata/framing_bench_test.go
index f1f96e01616..fa63a4fa85d 100644
--- a/pkg/tsdb/prometheus/querydata/framing_bench_test.go
+++ b/pkg/tsdb/prometheus/querydata/framing_bench_test.go
@@ -41,7 +41,6 @@ func BenchmarkExemplarJson(b *testing.B) {
 	tCtx, err := setup(true)
 	require.NoError(b, err)
 	b.ResetTimer()
-	b.ReportAllocs()
 	for n := 0; n < b.N; n++ {
 		res := http.Response{
 			StatusCode: 200,
diff --git a/pkg/util/converter/prom.go b/pkg/util/converter/prom.go
index a771a9336e4..a71968abf2e 100644
--- a/pkg/util/converter/prom.go
+++ b/pkg/util/converter/prom.go
@@ -228,8 +228,8 @@ func readArrayData(iter *jsoniter.Iterator) backend.DataResponse {
 }
 
 // For consistent ordering read values to an array not a map
-func readLabelsAsPairs(iter *jsoniter.Iterator, pairs [][2]string) [][2]string {
-	pairs = pairs[:0]
+func readLabelsAsPairs(iter *jsoniter.Iterator) [][2]string {
+	pairs := make([][2]string, 0, 10)
 	for k := iter.ReadObject(); k != ""; k = iter.ReadObject() {
 		pairs = append(pairs, [2]string{k, iter.ReadString()})
 	}
@@ -270,7 +270,7 @@ func readLabelsOrExemplars(iter *jsoniter.Iterator) (*data.Frame, [][2]string) {
 
 					case "labels":
 						max := 0
-						for _, pair := range readLabelsAsPairs(iter, pairs) {
+						for _, pair := range readLabelsAsPairs(iter) {
 							k := pair[0]
 							v := pair[1]
 							f, ok := lookup[k]
@@ -305,7 +305,6 @@ func readLabelsOrExemplars(iter *jsoniter.Iterator) (*data.Frame, [][2]string) {
 			}
 		default:
 			v := fmt.Sprintf("%v", iter.Read())
-			pairs = pairs[:0]
 			pairs = append(pairs, [2]string{l1Field, v})
 		}
 	}

From 2c210909312625bf891332a86d2ebf00c3104376 Mon Sep 17 00:00:00 2001
From: Misi <mgyongyosi@users.noreply.github.com>
Date: Wed, 12 Apr 2023 14:53:05 +0200
Subject: [PATCH 062/729] AccessControl: Allow editors to access GET
 /api/datasources (#66343)

Allow editors to access GET /datasources
---
 pkg/api/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 366b632fb2e..8f7c0117ec4 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -392,7 +392,7 @@ func (hs *HTTPServer) registerRoutes() {
 			idScope := datasources.ScopeProvider.GetResourceScope(ac.Parameter(":id"))
 			uidScope := datasources.ScopeProvider.GetResourceScopeUID(ac.Parameter(":uid"))
 			nameScope := datasources.ScopeProvider.GetResourceScopeName(ac.Parameter(":name"))
-			datasourceRoute.Get("/", authorize(reqOrgAdmin, ac.EvalPermission(datasources.ActionRead)), routing.Wrap(hs.GetDataSources))
+			datasourceRoute.Get("/", authorize(reqEditorRole, ac.EvalPermission(datasources.ActionRead)), routing.Wrap(hs.GetDataSources))
 			datasourceRoute.Post("/", authorize(reqOrgAdmin, ac.EvalPermission(datasources.ActionCreate)), quota(string(datasources.QuotaTargetSrv)), routing.Wrap(hs.AddDataSource))
 			datasourceRoute.Put("/:id", authorize(reqOrgAdmin, ac.EvalPermission(datasources.ActionWrite, idScope)), routing.Wrap(hs.UpdateDataSourceByID))
 			datasourceRoute.Put("/uid/:uid", authorize(reqOrgAdmin, ac.EvalPermission(datasources.ActionWrite, uidScope)), routing.Wrap(hs.UpdateDataSourceByUID))

From e12598f55c878b675f25cf9b66f7fcde41aec66c Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 12 Apr 2023 15:09:37 +0200
Subject: [PATCH 063/729] Loki: Move log context to separate log context
 provider (#66357)

* Loki: Move log context to separate provider

* Update public/app/plugins/datasource/loki/LogContextProvider.ts

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>

* Fix lint

---------

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
---
 .betterer.results                             |   8 +-
 .../datasource/loki/LogContextProvider.ts     | 152 ++++++++++++++++++
 .../loki/LogContextProvidet.test.ts           |  60 +++++++
 .../datasource/loki/datasource.test.ts        | 107 ------------
 .../app/plugins/datasource/loki/datasource.ts | 149 ++---------------
 5 files changed, 228 insertions(+), 248 deletions(-)
 create mode 100644 public/app/plugins/datasource/loki/LogContextProvider.ts
 create mode 100644 public/app/plugins/datasource/loki/LogContextProvidet.test.ts

diff --git a/.betterer.results b/.betterer.results
index 02f138aeec2..c1f01ae34a7 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4606,6 +4606,9 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/loki/LiveStreams.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
+    "public/app/plugins/datasource/loki/LogContextProvider.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
@@ -4632,10 +4635,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
     ],
     "public/app/plugins/datasource/loki/getDerivedFields.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
new file mode 100644
index 00000000000..7549e6dede3
--- /dev/null
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -0,0 +1,152 @@
+import { FieldCache, FieldType, LogRowModel, TimeRange, toUtc } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
+
+import LokiLanguageProvider from './LanguageProvider';
+import { LokiContextUi } from './components/LokiContextUi';
+import { REF_ID_STARTER_LOG_ROW_CONTEXT } from './datasource';
+import { escapeLabelValueInExactSelector } from './languageUtils';
+import { addLabelToQuery, addParserToQuery } from './modifyQuery';
+import { getParserFromQuery } from './queryUtils';
+import { ContextFilter, LokiQuery, LokiQueryDirection, LokiQueryType } from './types';
+
+export class LogContextProvider {
+  languageProvider: LokiLanguageProvider;
+  onContextClose: (() => void) | undefined;
+
+  constructor(languageProvider: LokiLanguageProvider) {
+    this.languageProvider = languageProvider;
+  }
+
+  async prepareLogRowContextQueryTarget(
+    row: LogRowModel,
+    limit: number,
+    direction: 'BACKWARD' | 'FORWARD',
+    origQuery?: DataQuery
+  ): Promise<{ query: LokiQuery; range: TimeRange }> {
+    let expr = await this.prepareContextExpr(row, origQuery);
+
+    const contextTimeBuffer = 2 * 60 * 60 * 1000; // 2h buffer
+
+    const queryDirection = direction === 'FORWARD' ? LokiQueryDirection.Forward : LokiQueryDirection.Backward;
+
+    const query: LokiQuery = {
+      expr,
+      queryType: LokiQueryType.Range,
+      refId: `${REF_ID_STARTER_LOG_ROW_CONTEXT}${row.dataFrame.refId || ''}`,
+      maxLines: limit,
+      direction: queryDirection,
+    };
+
+    const fieldCache = new FieldCache(row.dataFrame);
+    const tsField = fieldCache.getFirstFieldOfType(FieldType.time);
+    if (tsField === undefined) {
+      throw new Error('loki: data frame missing time-field, should never happen');
+    }
+    const tsValue = tsField.values.get(row.rowIndex);
+    const timestamp = toUtc(tsValue);
+
+    const range =
+      queryDirection === LokiQueryDirection.Forward
+        ? {
+            // start param in Loki API is inclusive so we'll have to filter out the row that this request is based from
+            // and any other that were logged in the same ns but before the row. Right now these rows will be lost
+            // because the are before but came it he response that should return only rows after.
+            from: timestamp,
+            // convert to ns, we lose some precision here but it is not that important at the far points of the context
+            to: toUtc(row.timeEpochMs + contextTimeBuffer),
+          }
+        : {
+            // convert to ns, we lose some precision here but it is not that important at the far points of the context
+            from: toUtc(row.timeEpochMs - contextTimeBuffer),
+            to: timestamp,
+          };
+
+    return {
+      query,
+      range: {
+        from: range.from,
+        to: range.to,
+        raw: range,
+      },
+    };
+  }
+
+  getLogRowContextUi(row: LogRowModel, runContextQuery: () => void): React.ReactNode {
+    const updateFilter = (contextFilters: ContextFilter[]) => {
+      this.prepareContextExpr = async (row: LogRowModel, origQuery?: DataQuery) => {
+        await this.languageProvider.start();
+        const labels = this.languageProvider.getLabelKeys();
+
+        let expr = contextFilters
+          .map((filter) => {
+            const label = filter.value;
+            if (filter && !filter.fromParser && filter.enabled && labels.includes(label)) {
+              // escape backslashes in label as users can't escape them by themselves
+              return `${label}="${escapeLabelValueInExactSelector(row.labels[label])}"`;
+            }
+            return '';
+          })
+          // Filter empty strings
+          .filter((label) => !!label)
+          .join(',');
+
+        expr = `{${expr}}`;
+
+        const parserContextFilters = contextFilters.filter((filter) => filter.fromParser && filter.enabled);
+        if (parserContextFilters.length) {
+          // we should also filter for labels from parsers, let's find the right parser
+          if (origQuery) {
+            const parser = getParserFromQuery((origQuery as LokiQuery).expr);
+            if (parser) {
+              expr = addParserToQuery(expr, parser);
+            }
+          }
+          for (const filter of parserContextFilters) {
+            if (filter.enabled) {
+              expr = addLabelToQuery(expr, filter.label, '=', row.labels[filter.label]);
+            }
+          }
+        }
+        return expr;
+      };
+      if (runContextQuery) {
+        runContextQuery();
+      }
+    };
+
+    // we need to cache this function so that it doesn't get recreated on every render
+    this.onContextClose =
+      this.onContextClose ??
+      (() => {
+        this.prepareContextExpr = this.prepareContextExprWithoutParsedLabels;
+      });
+
+    return LokiContextUi({
+      row,
+      updateFilter,
+      languageProvider: this.languageProvider,
+      onClose: this.onContextClose,
+    });
+  }
+
+  async prepareContextExpr(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
+    return await this.prepareContextExprWithoutParsedLabels(row, origQuery);
+  }
+
+  private async prepareContextExprWithoutParsedLabels(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
+    await this.languageProvider.start();
+    const labels = this.languageProvider.getLabelKeys();
+    const expr = Object.keys(row.labels)
+      .map((label: string) => {
+        if (labels.includes(label)) {
+          // escape backslashes in label as users can't escape them by themselves
+          return `${label}="${escapeLabelValueInExactSelector(row.labels[label])}"`;
+        }
+        return '';
+      })
+      .filter((label) => !!label)
+      .join(',');
+
+    return `{${expr}}`;
+  }
+}
diff --git a/public/app/plugins/datasource/loki/LogContextProvidet.test.ts b/public/app/plugins/datasource/loki/LogContextProvidet.test.ts
new file mode 100644
index 00000000000..26a4989059e
--- /dev/null
+++ b/public/app/plugins/datasource/loki/LogContextProvidet.test.ts
@@ -0,0 +1,60 @@
+import { FieldType, LogRowModel, MutableDataFrame } from '@grafana/data';
+
+import LokiLanguageProvider from './LanguageProvider';
+import { LogContextProvider } from './LogContextProvider';
+
+const defaultLanguageProviderMock = {
+  start: jest.fn(),
+  getLabelKeys: jest.fn(() => ['foo']),
+} as unknown as LokiLanguageProvider;
+
+const defaultLogRow = {
+  rowIndex: 0,
+  dataFrame: new MutableDataFrame({
+    fields: [
+      {
+        name: 'ts',
+        type: FieldType.time,
+        values: [0],
+      },
+    ],
+  }),
+  labels: { bar: 'baz', foo: 'uniqueParsedLabel' },
+  uid: '1',
+} as unknown as LogRowModel;
+
+describe('new context ui', () => {
+  it('returns expression with 1 label', async () => {
+    const lcp = new LogContextProvider(defaultLanguageProviderMock);
+    const result = await lcp.prepareContextExpr(defaultLogRow);
+
+    expect(result).toEqual('{foo="uniqueParsedLabel"}');
+  });
+
+  it('returns empty expression for parsed labels', async () => {
+    const languageProviderMock = {
+      ...defaultLanguageProviderMock,
+      getLabelKeys: jest.fn(() => []),
+    } as unknown as LokiLanguageProvider;
+
+    const lcp = new LogContextProvider(languageProviderMock);
+    const result = await lcp.prepareContextExpr(defaultLogRow);
+
+    expect(result).toEqual('{}');
+  });
+});
+
+describe('prepareLogRowContextQueryTarget', () => {
+  const lcp = new LogContextProvider(defaultLanguageProviderMock);
+  it('creates query with only labels from /labels API', async () => {
+    const contextQuery = await lcp.prepareLogRowContextQueryTarget(defaultLogRow, 10, 'BACKWARD');
+
+    expect(contextQuery.query.expr).toContain('uniqueParsedLabel');
+    expect(contextQuery.query.expr).not.toContain('baz');
+  });
+
+  it('should call languageProvider.start to fetch labels', async () => {
+    await lcp.prepareLogRowContextQueryTarget(defaultLogRow, 10, 'BACKWARD');
+    expect(lcp.languageProvider.start).toBeCalled();
+  });
+});
diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index 1ff0e55149b..bfa63d0791d 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -13,8 +13,6 @@ import {
   DataSourceInstanceSettings,
   dateTime,
   FieldType,
-  LogRowModel,
-  MutableDataFrame,
   SupplementaryQueryType,
 } from '@grafana/data';
 import {
@@ -839,57 +837,6 @@ describe('LokiDatasource', () => {
     });
   });
 
-  describe('prepareLogRowContextQueryTarget', () => {
-    const ds = createLokiDatasource(templateSrvStub);
-    it('creates query with only labels from /labels API', async () => {
-      const row: LogRowModel = {
-        rowIndex: 0,
-        dataFrame: new MutableDataFrame({
-          fields: [
-            {
-              name: 'ts',
-              type: FieldType.time,
-              values: [0],
-            },
-          ],
-        }),
-        labels: { bar: 'baz', foo: 'uniqueParsedLabel' },
-        uid: '1',
-      } as unknown as LogRowModel;
-
-      //Mock stored labels to only include "bar" label
-      jest.spyOn(ds.languageProvider, 'start').mockImplementation(() => Promise.resolve([]));
-      jest.spyOn(ds.languageProvider, 'getLabelKeys').mockImplementation(() => ['bar']);
-      const contextQuery = await ds.prepareLogRowContextQueryTarget(row, 10, 'BACKWARD');
-
-      expect(contextQuery.query.expr).toContain('baz');
-      expect(contextQuery.query.expr).not.toContain('uniqueParsedLabel');
-    });
-
-    it('should call languageProvider.start to fetch labels', async () => {
-      const row: LogRowModel = {
-        rowIndex: 0,
-        dataFrame: new MutableDataFrame({
-          fields: [
-            {
-              name: 'ts',
-              type: FieldType.time,
-              values: [0],
-            },
-          ],
-        }),
-        labels: { bar: 'baz', foo: 'uniqueParsedLabel' },
-        uid: '1',
-      } as unknown as LogRowModel;
-
-      //Mock stored labels to only include "bar" label
-      jest.spyOn(ds.languageProvider, 'start').mockImplementation(() => Promise.resolve([]));
-      await ds.prepareLogRowContextQueryTarget(row, 10, 'BACKWARD');
-
-      expect(ds.languageProvider.start).toBeCalled();
-    });
-  });
-
   describe('logs volume data provider', () => {
     let ds: LokiDatasource;
     beforeEach(() => {
@@ -1228,57 +1175,3 @@ function makeAnnotationQueryRequest(options = {}): AnnotationQueryRequest<LokiQu
     rangeRaw: timeRange,
   };
 }
-
-describe('new context ui', () => {
-  it('returns expression with 1 label', async () => {
-    const ds = createLokiDatasource(templateSrvStub);
-
-    const row: LogRowModel = {
-      rowIndex: 0,
-      dataFrame: new MutableDataFrame({
-        fields: [
-          {
-            name: 'ts',
-            type: FieldType.time,
-            values: [0],
-          },
-        ],
-      }),
-      labels: { bar: 'baz', foo: 'uniqueParsedLabel' },
-      uid: '1',
-    } as unknown as LogRowModel;
-
-    jest.spyOn(ds.languageProvider, 'start').mockImplementation(() => Promise.resolve([]));
-    jest.spyOn(ds.languageProvider, 'getLabelKeys').mockImplementation(() => ['foo']);
-
-    const result = await ds.prepareContextExpr(row);
-
-    expect(result).toEqual('{foo="uniqueParsedLabel"}');
-  });
-
-  it('returns empty expression for parsed labels', async () => {
-    const ds = createLokiDatasource(templateSrvStub);
-
-    const row: LogRowModel = {
-      rowIndex: 0,
-      dataFrame: new MutableDataFrame({
-        fields: [
-          {
-            name: 'ts',
-            type: FieldType.time,
-            values: [0],
-          },
-        ],
-      }),
-      labels: { bar: 'baz', foo: 'uniqueParsedLabel' },
-      uid: '1',
-    } as unknown as LogRowModel;
-
-    jest.spyOn(ds.languageProvider, 'start').mockImplementation(() => Promise.resolve([]));
-    jest.spyOn(ds.languageProvider, 'getLabelKeys').mockImplementation(() => []);
-
-    const result = await ds.prepareContextExpr(row);
-
-    expect(result).toEqual('{}');
-  });
-});
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 04f99951524..06f1c31092b 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -31,7 +31,6 @@ import {
   rangeUtil,
   ScopedVars,
   TimeRange,
-  toUtc,
 } from '@grafana/data';
 import { BackendSrvRequest, config, DataSourceWithBackend, FetchError } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
@@ -48,10 +47,10 @@ import { replaceVariables, returnVariables } from '../prometheus/querybuilder/sh
 
 import LanguageProvider from './LanguageProvider';
 import { LiveStreams, LokiLiveTarget } from './LiveStreams';
+import { LogContextProvider } from './LogContextProvider';
 import { transformBackendResult } from './backendResultTransformer';
 import { LokiAnnotationsQueryEditor } from './components/AnnotationsQueryEditor';
-import { LokiContextUi } from './components/LokiContextUi';
-import { escapeLabelValueInExactSelector, escapeLabelValueInSelector, isRegexSelector } from './languageUtils';
+import { escapeLabelValueInSelector, isRegexSelector } from './languageUtils';
 import { labelNamesRegex, labelValuesRegex } from './migrations/variableQueryMigrations';
 import {
   addLabelFormatToQuery,
@@ -72,7 +71,6 @@ import {
   getLogQueryFromMetricsQuery,
   getNormalizedLokiQuery,
   getStreamSelectorsFromQuery,
-  getParserFromQuery,
   isLogsQuery,
   isValidQuery,
   requestSupportsSplitting,
@@ -81,10 +79,8 @@ import { sortDataFrameByTime, SortDirection } from './sortDataFrame';
 import { doLokiChannelStream } from './streaming';
 import { trackQuery } from './tracking';
 import {
-  ContextFilter,
   LokiOptions,
   LokiQuery,
-  LokiQueryDirection,
   LokiQueryType,
   LokiVariableQuery,
   LokiVariableQueryType,
@@ -135,8 +131,8 @@ export class LokiDatasource
 {
   private streams = new LiveStreams();
   languageProvider: LanguageProvider;
+  logContextProvider: LogContextProvider;
   maxLines: number;
-  onContextClose: (() => void) | undefined;
 
   constructor(
     private instanceSettings: DataSourceInstanceSettings<LokiOptions>,
@@ -152,6 +148,7 @@ export class LokiDatasource
       QueryEditor: LokiAnnotationsQueryEditor,
     };
     this.variables = new LokiVariableSupport(this);
+    this.logContextProvider = new LogContextProvider(this.languageProvider);
   }
 
   getDataProvider(
@@ -654,7 +651,12 @@ export class LokiDatasource
   ): Promise<{ data: DataFrame[] }> => {
     const direction = (options && options.direction) || 'BACKWARD';
     const limit = (options && options.limit) || 10;
-    const { query, range } = await this.prepareLogRowContextQueryTarget(row, limit, direction, origQuery);
+    const { query, range } = await this.logContextProvider.prepareLogRowContextQueryTarget(
+      row,
+      limit,
+      direction,
+      origQuery
+    );
 
     const processDataFrame = (frame: DataFrame): DataFrame => {
       // log-row-context requires specific field-names to work, so we set them here: "ts", "line", "id"
@@ -717,137 +719,8 @@ export class LokiDatasource
     );
   };
 
-  prepareLogRowContextQueryTarget = async (
-    row: LogRowModel,
-    limit: number,
-    direction: 'BACKWARD' | 'FORWARD',
-    origQuery?: DataQuery
-  ): Promise<{ query: LokiQuery; range: TimeRange }> => {
-    let expr = await this.prepareContextExpr(row, origQuery);
-
-    const contextTimeBuffer = 2 * 60 * 60 * 1000; // 2h buffer
-
-    const queryDirection = direction === 'FORWARD' ? LokiQueryDirection.Forward : LokiQueryDirection.Backward;
-
-    const query: LokiQuery = {
-      expr,
-      queryType: LokiQueryType.Range,
-      refId: `${REF_ID_STARTER_LOG_ROW_CONTEXT}${row.dataFrame.refId || ''}`,
-      maxLines: limit,
-      direction: queryDirection,
-    };
-
-    const fieldCache = new FieldCache(row.dataFrame);
-    const tsField = fieldCache.getFirstFieldOfType(FieldType.time);
-    if (tsField === undefined) {
-      throw new Error('loki: dataframe missing time-field, should never happen');
-    }
-    const tsValue = tsField.values.get(row.rowIndex);
-    const timestamp = toUtc(tsValue);
-
-    const range =
-      queryDirection === LokiQueryDirection.Forward
-        ? {
-            // start param in Loki API is inclusive so we'll have to filter out the row that this request is based from
-            // and any other that were logged in the same ns but before the row. Right now these rows will be lost
-            // because the are before but came it he response that should return only rows after.
-            from: timestamp,
-            // convert to ns, we lose some precision here but it is not that important at the far points of the context
-            to: toUtc(row.timeEpochMs + contextTimeBuffer),
-          }
-        : {
-            // convert to ns, we lose some precision here but it is not that important at the far points of the context
-            from: toUtc(row.timeEpochMs - contextTimeBuffer),
-            to: timestamp,
-          };
-
-    return {
-      query,
-      range: {
-        from: range.from,
-        to: range.to,
-        raw: range,
-      },
-    };
-  };
-
-  async prepareContextExprWithoutParsedLabels(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
-    await this.languageProvider.start();
-    const labels = this.languageProvider.getLabelKeys();
-    const expr = Object.keys(row.labels)
-      .map((label: string) => {
-        if (labels.includes(label)) {
-          // escape backslashes in label as users can't escape them by themselves
-          return `${label}="${escapeLabelValueInExactSelector(row.labels[label])}"`;
-        }
-        return '';
-      })
-      .filter((label) => !!label)
-      .join(',');
-
-    return `{${expr}}`;
-  }
-
-  async prepareContextExpr(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
-    return await this.prepareContextExprWithoutParsedLabels(row, origQuery);
-  }
-
   getLogRowContextUi(row: LogRowModel, runContextQuery: () => void): React.ReactNode {
-    const updateFilter = (contextFilters: ContextFilter[]) => {
-      this.prepareContextExpr = async (row: LogRowModel, origQuery?: DataQuery) => {
-        await this.languageProvider.start();
-        const labels = this.languageProvider.getLabelKeys();
-
-        let expr = contextFilters
-          .map((filter) => {
-            const label = filter.value;
-            if (filter && !filter.fromParser && filter.enabled && labels.includes(label)) {
-              // escape backslashes in label as users can't escape them by themselves
-              return `${label}="${escapeLabelValueInExactSelector(row.labels[label])}"`;
-            }
-            return '';
-          })
-          // Filter empty strings
-          .filter((label) => !!label)
-          .join(',');
-
-        expr = `{${expr}}`;
-
-        const parserContextFilters = contextFilters.filter((filter) => filter.fromParser && filter.enabled);
-        if (parserContextFilters.length) {
-          // we should also filter for labels from parsers, let's find the right parser
-          if (origQuery) {
-            const parser = getParserFromQuery((origQuery as LokiQuery).expr);
-            if (parser) {
-              expr = addParserToQuery(expr, parser);
-            }
-          }
-          for (const filter of parserContextFilters) {
-            if (filter.enabled) {
-              expr = addLabelToQuery(expr, filter.label, '=', row.labels[filter.label]);
-            }
-          }
-        }
-        return expr;
-      };
-      if (runContextQuery) {
-        runContextQuery();
-      }
-    };
-
-    // we need to cache this function so that it doesn't get recreated on every render
-    this.onContextClose =
-      this.onContextClose ??
-      (() => {
-        this.prepareContextExpr = this.prepareContextExprWithoutParsedLabels;
-      });
-
-    return LokiContextUi({
-      row,
-      updateFilter,
-      languageProvider: this.languageProvider,
-      onClose: this.onContextClose,
-    });
+    return this.logContextProvider.getLogRowContextUi(row, runContextQuery);
   }
 
   testDatasource(): Promise<{ status: string; message: string }> {

From f9fdeafe35562216a39738fddc8cc9fb85494bc7 Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Wed, 12 Apr 2023 09:22:30 -0400
Subject: [PATCH 064/729] docs: What's New & Upgrade Guide 9.5 (#64168)

* added what's new and upgrade guide 9.5 and updated whats new index page

* Added new nav and nested folders.

* added empty dashboard state and dashboards section

* fixed caption

* fixed formatting of link and UI element

* Add: onlyExternalOrgRoleSync

* Adds Alerting entries

* Adds alerting screenshots

* More alerting screenshots

* add dashboard panel redesign

* Update _index.md

* Adds search to notification policy entry

* deletes old line

* Removed nested folders (will be private preview and not part of what's new)

* Docs: support bundle section for 9.5 What's New (#65641)

* support bundle section for 9.5 what's new

* Update whats-new-in-v9-5.md

* Update docs/sources/whatsnew/whats-new-in-v9-5.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* doc feedback

---------

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Influxdb database field deprecation notice

* Update reasoning

* fixed typo

* Docs: what's new API keys UI update (#65720)

* API keys deprecation

* Update docs/sources/whatsnew/whats-new-in-v9-5.md

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Update docs/sources/whatsnew/whats-new-in-v9-5.md

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Docs: API keys UI updates (#65723)

update

* Docs: add dashboard previews deprecation notice (#65692)

* previews deprecation notice

* Apply suggestions from code review

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

---------

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* we set the FF emptyDashboardPage ON by default, so it's available by default

* Update docs/sources/whatsnew/whats-new-in-v9-5.md

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* add whats new toggle for prom browser cache feature

* Prometheus: metric encyclopedia feature toggle

* spell check

* Product editorial pass

Adds hyperlinks, notes release stages, updates intro, Adds content to upgrade guide

* add blurb for prom query cache

* Add more context to org role sync

Add more context to organization role sync about the ability to change a user's organization role even then sync is enabled. Also outlined why this is valuable and when it should be used.

* copy edit of upgrade guide

* copy edit and link fixes

* Update docs/sources/whatsnew/whats-new-in-v9-5.md

Makes it clear what can happen after sign in.

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* Update docs/sources/whatsnew/whats-new-in-v9-5.md

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* Update docs/sources/whatsnew/whats-new-in-v9-5.md

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* Apply suggestions from code review

* fixes link

* Adds dark screenshot for alerting

* fixes alerting title

* Update whats-new-in-v9-5.md

* added missing quotation mark

* trigger linting

* small change to trigger linting

* fix title to follow pattern

* Update whats-new-in-v9-5.md

* Clearer explanation

* wording edits

* fixed heading levels

* fix title wording

* wording edit and availability fix

* remove extra space

* final copy edit

---------

Co-authored-by: Zsofia <zsofia.komaromi@gmail.com>
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Artur Wierzbicki <artur.wierzbicki@grafana.com>
Co-authored-by: polinaboneva <polina.boneva@grafana.com>
Co-authored-by: Galen <galen.kistler@grafana.com>
Co-authored-by: bohandley <brendan.ohandley@gmail.com>
Co-authored-by: Mitchel Seaman <mitchel.seaman@gmail.com>
Co-authored-by: danielkenlee <115471695+danielkenlee@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
Co-authored-by: Fabrizia Rossano <117294258+frossano-grafana@users.noreply.github.com>
---
 docs/sources/_index.md                        |   4 +-
 .../upgrade-guide/upgrade-v9.5/index.md       |  31 +++
 docs/sources/whatsnew/_index.md               |  10 +-
 docs/sources/whatsnew/whats-new-in-v9-5.md    | 192 ++++++++++++++++++
 4 files changed, 226 insertions(+), 11 deletions(-)
 create mode 100644 docs/sources/upgrade-guide/upgrade-v9.5/index.md
 create mode 100644 docs/sources/whatsnew/whats-new-in-v9-5.md

diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index f0fc1a6967d..a36fac62115 100644
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -70,8 +70,8 @@ title: Grafana documentation
         <h4>Provisioning</h4>
         <p>Learn how to automate your Grafana configuration.</p>
     </a>
-    <a href="{{< relref "whatsnew/whats-new-in-v9-4/" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v9.4</h4>
+    <a href="{{< relref "whatsnew/whats-new-in-v9-5/" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v9.5</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
 
diff --git a/docs/sources/upgrade-guide/upgrade-v9.5/index.md b/docs/sources/upgrade-guide/upgrade-v9.5/index.md
new file mode 100644
index 00000000000..535f92affd5
--- /dev/null
+++ b/docs/sources/upgrade-guide/upgrade-v9.5/index.md
@@ -0,0 +1,31 @@
+---
+description: Guide for upgrading to Grafana v9.5
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - upgrade
+title: Upgrade to Grafana v9.5
+menuTitle: Upgrade to v9.5
+weight: 1800
+---
+
+# Upgrade to Grafana v9.5
+
+{{< docs/shared "upgrade/upgrade-common-tasks.md" >}}
+
+## Technical notes
+
+### InfluxDB provisioning change
+
+Beginning in v9.5, the InfluxDB data source deprecates the `database` field in provisioning files.
+The `dbName` field under `jsonData` must be used to store the database information.
+For more information and examples, please refer to [InfluxDB Provisioning]({{< relref "../../datasources/influxdb/#provision-the-data-source" >}}).
+
+### Dashboard previews deprecation notice
+
+We are deprecating the [Dashboard previews]({{< relref "../../search/dashboard-previews" >}}) feature and will remove it in Grafana v10. We've started exploring alternative ways of adding visual previews using the Scenes framework, and we'll share more information about it in the future.
+
+### Migrate your API keys to service accounts
+
+We are upgrading Grafana [API keys]({{< relref "../../administration/api-keys/" >}}) to service accounts. Service accounts are a superset of API keys that include token rotation and compatibility with [Role-based access control]({{< relref "../../administration/roles-and-permissions/access-control/" >}}). In a future release, we'll automatically migrate all existing API keys to service accounts. All of your existing tokens will continue to work; they will simply be migrated to service accounts. You can preempt this change by migrating your existing API keys to service accounts using Grafana's UI or API. Learn how to do this in the [API keys documentation]({{< relref "../../administration/api-keys/#migrate-api-keys-to-grafana-service-accounts" >}}).
diff --git a/docs/sources/whatsnew/_index.md b/docs/sources/whatsnew/_index.md
index 62da2dee350..8293e436943 100644
--- a/docs/sources/whatsnew/_index.md
+++ b/docs/sources/whatsnew/_index.md
@@ -72,6 +72,7 @@ For a complete list of every change, with links to pull requests and related iss
 
 ## Grafana 9
 
+- [What's new in 9.5]({{< relref "whats-new-in-v9-5/" >}})
 - [What's new in 9.4]({{< relref "whats-new-in-v9-4/" >}})
 - [What's new in 9.3]({{< relref "whats-new-in-v9-3/" >}})
 - [What's new in 9.2]({{< relref "whats-new-in-v9-2/" >}})
@@ -86,12 +87,3 @@ For a complete list of every change, with links to pull requests and related iss
 - [What's new in 8.2]({{< relref "whats-new-in-v8-2/" >}})
 - [What's new in 8.1]({{< relref "whats-new-in-v8-1/" >}})
 - [What's new in 8.0]({{< relref "whats-new-in-v8-0/" >}})
-
-## Grafana 7
-
-- [What's new in 7.5]({{< relref "whats-new-in-v7-5/" >}})
-- [What's new in 7.4]({{< relref "whats-new-in-v7-4/" >}})
-- [What's new in 7.3]({{< relref "whats-new-in-v7-3/" >}})
-- [What's new in 7.2]({{< relref "whats-new-in-v7-2/" >}})
-- [What's new in 7.1]({{< relref "whats-new-in-v7-1/" >}})
-- [What's new in 7.0]({{< relref "whats-new-in-v7-0/" >}})
diff --git a/docs/sources/whatsnew/whats-new-in-v9-5.md b/docs/sources/whatsnew/whats-new-in-v9-5.md
new file mode 100644
index 00000000000..443ba0de231
--- /dev/null
+++ b/docs/sources/whatsnew/whats-new-in-v9-5.md
@@ -0,0 +1,192 @@
+---
+description: Feature and improvement highlights for Grafana v9.5
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '9.5'
+  - release notes
+title: What's new in Grafana v9.5
+weight: -33
+---
+
+# What’s new in Grafana v9.5
+
+Welcome to Grafana 9.5! We're excited to share some major updates to Grafana's navigation, tons of usability improvements to Alerting, and some promising experiments to help you query your Prometheus metrics. Also, read on to learn about our continued migration from API keys to service accounts, as well as deprecation of plugins that use Angular and a field in the InfluxDB data source.
+
+For more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). For the specific steps we recommend when you upgrade to v9.5, check out our [Upgrade Guide]({{< relref "../upgrade-guide/upgrade-v9.5/index.md" >}}).
+
+<!-- Template below
+
+## Feature
+[Generally available | Available in experimental/beta] in Grafana [Open Source, Enterprise, Cloud Free, Cloud Pro, Cloud Advanced]
+
+Description. Include an overview of the feature and problem it solves, and where to learn more (like a link to the docs).
+
+> **Note:** You must use relative references when linking to docs within the Grafana repo. Please do not use absolute URLs. For more information about relrefs, refer to [Links and references](/docs/writers-toolkit/writing-guide/references/).-->
+
+## Grafana's new navigation is generally available
+
+_Generally available in all editions of Grafana._
+
+The navigation in Grafana has been updated with a new design and an improved structure to make it easier for you to access the data you need. With this update, you can quickly navigate between pages, giving you full visibility into the health of your systems.
+
+As Grafana evolved from a visualization platform to a comprehensive observability solution, we added numerous tools to support users throughout the software development life cycle. These tools focus on preventing incidents, monitoring applications or infrastructure, and aiding incident response. However, the added functionality must be easily discoverable and navigable to be truly helpful. These key updates to Grafana’s navigation experience help address this:
+
+- A redesigned navigation menu that groups related tools together for easy access.
+- A command palette you can use to take actions in Grafana, like creating a dashboard or navigating to an app or page.
+- Updated layouts featuring breadcrumbs and a sidebar, allowing you to quickly jump between pages.
+- A new header that appears on all pages in Grafana, which includes a search function.
+
+Join the [discussion on GitHub](https://github.com/grafana/grafana/discussions/58910) and share your feedback.
+
+{{< figure src="/media/docs/grafana/navigation-9-4.png" max-width="750px" caption="Grafana new navigation" >}}
+
+## Dashboards and visualizations
+
+### Redesigned empty dashboard state
+
+_Generally available in all editions of Grafana._
+
+Dashboards have been updated so that it’s easier to begin building from scratch. The options displayed when you add a new dashboard—adding a visualization, a row, or importing panels—each include brief explanations of what those steps will do, so you can begin building with confidence.
+
+Also, a text **Add** dropdown with these options has replaced the previous "+" icon at the top of the dashboard. This makes it clearer that this element allows you not only to add new panels, but to take all the actions associated with building a new dashboard.
+
+{{< figure src="/media/docs/grafana/screenshot-empty-dashboard-whats-new-9-5.png" max-width="750px" caption="Dashboard without any visualizations added" >}}
+
+### Redesigned dashboard panel is generally available
+
+_Generally available in all editions of Grafana._
+
+Dashboard panels contain a lot of information, some of which is difficult to discover or access from the dashboard. With our redesigned panels, we've improved accessibility and made it easier to understand the status of a panel by adding and moving key elements.
+
+We’ve improved panels without titles, made panel descriptions and errors more succinct, and linked key actions from the header of the panel. All of these are laid out from left to right in a row, so there are no overlapping, unusable components.
+
+Grafana’s new panel design is available only for React-based panels. No Angular-based panels, like the legacy Graph and Worldmap panels, are redesigned. As a reminder, Angular is deprecated in Grafana and will be removed in a future release. See our [deprecation docs]({{< relref "../developers/angular_deprecation/" >}}) for more information.
+
+{{< figure src="/media/docs/grafana/panel-redesign-whats-new-9.5.png" max-width="750px" caption="Panel header with open menu" >}}
+
+## Prometheus performance and usability improvements
+
+### Prometheus metric encyclopedia
+
+_Experimental in all editions of Grafana._
+
+When you have thousands (or millions) of Prometheus metrics, it can be hard to find the exact one you're looking for. Enable feature toggle `prometheusMetricEncyclopedia` to replace the basic metric select dropdown in the Prometheus query builder with a paginated and searchable metric _encyclopedia_.
+
+Here's what you can do with the metric encyclopedia:
+
+- Fuzzy search for metrics by name, type, and description
+- Filter metrics by Prometheus types (gauge, counter, histogram, summary)
+- Display metrics in a paginated list, sort the results, and choose a number of results per page, so that you don't wait a long time for search results
+- View metric details, like type and description
+- [Expert feature] Search metric names by regex using the backend only
+
+### Prometheus browser cache
+
+_Experimental in all editions of Grafana._
+
+New feature toggle `prometheusResourceBrowserCache` provides the ability to cache Prometheus editor API calls in the Prometheus data source configuration.
+This improves Prometheus query editor performance, with the biggest performance improvements seen by users with high cardinality Prometheus instances.
+
+## Removal of API key creation from the UI
+
+With this update we are going one step further in deprecating API keys in favor of [service accounts]({{< relref "../administration/service-accounts/" >}}). We've removed the button for creating new API keys through Grafana's user interface, and now only allow the creation of API keys using our HTTP API. We recommend that you migrate your existing API keys to service accounts, and opt for new service accounts instead of new API keys. This change is part of our long-term strategy for sunsetting API keys.
+
+Learn more about the deprecation strategy for API keys and how to manage them in our [Sunsetting API keys](https://github.com/grafana/grafana/issues/53567) GitHub issue.
+
+## Resolve Grafana issues faster with support bundles
+
+_Generally available in all editions of Grafana._
+
+Support bundles provide a simple way to collect information about your Grafana instance through Grafana's user interface. In a few clicks, you can create a support bundle containing data about migrations, plugins, settings, and more. Once you've created a support bundle, you can either examine it yourself, or share it with your colleagues or Grafana engineers to aid in troubleshooting of your Grafana instance.
+
+Learn more about support bundles and how to configure them in our [support bundle documentation]({{< relref "../troubleshooting/support-bundles/" >}}).
+
+{{< figure src="/static/img/docs/troubleshooting/support-bundle.png" max-width="750px" caption="Create a support bundle to resolve issues faster" >}}
+
+## Alerting
+
+_All Alerting improvements are generally available in all editions of Grafana._
+
+### Search for alert rules from multiple data sources
+
+Search for and display alert rules for multiple data sources at the same time.
+
+### Fuzzy search on the Alert rule list view
+
+Search for namespaces or folders, evaluation groups, and alert rule names on the Alert rules list view with immediate results, and regardless of typos.
+
+### Access an alert rule from a dashboard or a panel
+
+Navigate to an alert rule directly from a dashboard or a panel to easily access the alert rule details.
+
+{{< figure src="/media/docs/alerting/alert-rule-dashboard.png" max-width="750px" caption="Access an alert rule from a dashboard or a panel" >}}
+
+### Access a dashboard or panel from an alert rule
+
+Navigate from an alert rule straight to a dashboard or a panel associated with the alert rule to visualize your alerting data.
+
+{{< figure src="/media/docs/alerting/dashboard-alert-rule-2.png" max-width="750px" caption="Access a dashboard or panel from an alert rule" >}}
+
+### Preview queries for recording rules
+
+Visualize queries when creating or editing recording rules, so you can see the results of your query before saving your recording rule.
+
+{{< figure src="/media/docs/alerting/preview-queries-recording-rule.png" max-width="750px" caption="Preview queries for recording rules" >}}
+
+### Updated alert behavior when an evaluation returns no data
+
+Alert rules that are configured to fire when an evaluation returns no data now only fire when the entire duration of the evaluation period has finished. This means that rather than immediately firing when the alert rule condition is breached, the alert rule waits until the time set in the **For** field has finished and then fires, reducing alert noise and allowing for temporary data availability issues.
+
+### Improved Notification policies view
+
+Updates to the Notification policies view make it easier to use and manage in the following ways:
+
+- View default policy and nested policies at a glance
+- New tab for mute timings
+- View alert instances for each policy
+- View contact points and which integrations are configured for each policy
+- View inherited properties on nested policies
+- Search for label matchers and for contact points to see which notifications are going where
+
+{{< figure src="/media/docs/alerting/notification-policies-view.png" max-width="750px" caption="Improved Notification policies view" >}}
+
+### Guidance for configuring your Alertmanager
+
+Get additional help while configuring your Alertmanager. If you enter an invalid Alertmanager configuration, an error message displays, and you can choose from a previous working configuration to restart it.
+
+## InfluxDB plugin database field deprecation
+
+The `database` field in the provisioning file has been deprecated.
+This information will be stored in the `jsonData` field using the `dbName` property.
+The `database` field will be removed in the future to make InfluxDB consistent with other data sources.
+For more information and examples please refer to the [InfluxDB Provisioning docs]({{< relref "../datasources/influxdb/#provision-the-data-source" >}}).
+
+## Auth: Lock organization roles synced from auth providers
+
+_Generally available in all editions of Grafana._
+
+Grafana v9.4 provided the ability to configure synchronization of organization roles for each OAuth provider. With synchronization on, the organization role was applied to the user from the OAuth provider upon signing in. However, after the user signed in, you could still change the user’s organization role during the session.
+
+With this release, we are reinforcing organization role syncing behavior by introducing a new feature toggle called `onlyExternalOrgRoleSync`. Once enabled, users signing in to Grafana cannot change organization roles that have been synchronized from an external authentication provider, like Active Directory or Google OAuth. This can help ensure the right users maintain the right level of access at all times.
+
+This feature should be used if you want to enforce strict role synchronization from your auth provider to the organization roles.
+
+To use this feature, enable the `onlyExternalOrgRoleSync` feature toggle. If you’re using Grafana Cloud and would like to enable this feature, please contact customer support. We'll also be automatically enabling this feature for Grafana Cloud instances over the upcoming weeks.
+
+You can also _prevent_ the synchronization of organization roles from a given authentication provider. Learn more in our [skip org role sync]({{< relref "../setup-grafana/configure-grafana/#authgrafana_com-skip_org_role_sync/" >}}) documentation.
+
+## Reporting UI adapted to match the new navigation style
+
+_Generally available in Grafana Enterprise, Cloud Pro, and Cloud Advanced._
+
+We updated the reporting UI to better fit the new navigation style, adding a horizontal slider and moving the **Preview** and **Send** buttons to the Action section in the page. We also fixed the alignment of the different sections.
+
+{{< figure src="/media/docs/grafana/Screenshot-newUI-report.png" max-width="750px" caption="New Grafana report UI" >}}
+
+## Experimental support for using JWTs as auth method
+
+_Experimental in Grafana Open Source and Enterprise._
+
+This feature adds support for using JWT tokens to store rendering keys instead of relying on “remote caching”. It covers most rendering use cases, though some still rely on the remote cache as a store. You can enable this by enabling the feature flag `renderAuthJWT` in the `custom.ini` configuration file.

From f48d31171e28c77e4fb3d0f6c61a2f2c1e607da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Wed, 12 Apr 2023 15:24:11 +0200
Subject: [PATCH 065/729] Docs: Correlations (#66121)

* Add usage stats about correlations

* Add stats.correlations.count to collected stats

* Expose grafana_stat_totals_correlations metric

* Organize imports

* Correlations: Add documentation

* Add info about the feature toggle and move it to beta

* Remove incorrect bullet point

* Remove a bullet point that is not a step

* Update punctuation

* Update punctuation

* Fix typo

* Fix typo

* Grammar

* Rephrase

* Clarify

* Update transformation.field documentation

* Revert automatic merge formatting
---
 .../administration/correlations/_index.md     |  35 +++++
 .../index.md                                  |  18 +++
 .../correlation-configuration/index.md        | 101 +++++++++++++
 .../correlation-permissions/index.md          |  15 ++
 .../create-a-new-correlation/index.md         | 120 ++++++++++++++++
 .../index.md                                  |  29 ++++
 .../index.md                                  | 135 ++++++++++++++++++
 .../feature-toggles/index.md                  |   2 +-
 8 files changed, 454 insertions(+), 1 deletion(-)
 create mode 100644 docs/sources/administration/correlations/_index.md
 create mode 100644 docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md
 create mode 100644 docs/sources/administration/correlations/correlation-configuration/index.md
 create mode 100644 docs/sources/administration/correlations/correlation-permissions/index.md
 create mode 100644 docs/sources/administration/correlations/create-a-new-correlation/index.md
 create mode 100644 docs/sources/administration/correlations/use-correlations-in-visualizations/index.md
 create mode 100644 docs/sources/administration/correlations/use-variables-and-transformations/index.md

diff --git a/docs/sources/administration/correlations/_index.md b/docs/sources/administration/correlations/_index.md
new file mode 100644
index 00000000000..90381514d69
--- /dev/null
+++ b/docs/sources/administration/correlations/_index.md
@@ -0,0 +1,35 @@
+---
+title: Correlations
+weight: 900
+keywords:
+  - correlations
+  - Explore
+---
+
+# Correlations
+
+You can create interactive links for Explore visualizations to run queries related to presented data by setting up Correlations.
+
+A correlation defines how data in one [data source]({{< relref "/docs/grafana/latest/datasources/" >}}) is used to query data in another data source. Some examples:
+
+- an application name returned in a logs data source can be used to query metrics related to that application in a metrics data source, or
+- a user name returned by an SQL data source can be used to query logs related to that particular user in a logs data source
+
+[Explore]({{< relref "/docs/grafana/latest/explore/" >}}) takes user-defined correlations to display links inside the visualizations. You can click on a link to run the related query and see results in [Explore Split View]({{< relref "/docs/grafana/latest/explore/#split-and-compare" >}}).
+
+Explore visualizations that currently support showing links based on correlations:
+
+- [Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}})
+- [Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}})
+
+You can configure correlations using [Administration > Correlation page]({{< relref "/docs/grafana/latest/administration/" >}}) or with [provisioning]({{< relref "/docs/grafana/latest/administration/provisioning" >}}).
+
+> **Note:** Correlations are available in Grafana 10.0+ as an opt-in beta feature. Modify Grafana [configuration file]({{< relref "/docs/grafana/latest/setup-grafana/configure-grafana/#configuration-file-location" >}}) to enable the `correlations` [feature toggle]({{< relref "/docs/grafana/latest/setup-grafana/configure-grafana/#feature_toggles" >}}) to use it.
+
+## Example of how links work in Explore once set up
+
+{{< figure src="/static/img/docs/correlations/correlations-in-explore-10-0.gif" caption="Correlations links in Explore" >}}
+
+See also:
+
+{{< section >}}
diff --git a/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md b/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md
new file mode 100644
index 00000000000..bb644be513c
--- /dev/null
+++ b/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md
@@ -0,0 +1,18 @@
+---
+title: Add permissions to create new correlations
+menuTitle: Add permissions
+weight: 30
+---
+
+# Add permissions to create new correlations
+
+## Before you begin
+
+Adding access to create correlations for [Viewers and Editors]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) is available with [Role-based access control]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}).
+
+## Add permissions to create correlations
+
+1. Go to the Administration section in Grafana.
+1. Open Users page.
+1. Select the user to be granted access to create correlations.
+1. Add _Data sources writer_ role.
diff --git a/docs/sources/administration/correlations/correlation-configuration/index.md b/docs/sources/administration/correlations/correlation-configuration/index.md
new file mode 100644
index 00000000000..b83a8836552
--- /dev/null
+++ b/docs/sources/administration/correlations/correlation-configuration/index.md
@@ -0,0 +1,101 @@
+---
+title: Correlation
+weight: 10
+---
+
+# Correlation
+
+Each correlation is configured with the following options:
+
+**Label**
+: Link label, shown in the visualization
+
+**Description**
+: Optional description
+
+**Source data source**
+: The source of results that have links displayed
+
+**Results field**
+: Defines where the link is shown in a visualization
+
+**Target query**
+: The target query run when a link is clicked
+
+**Transformations**
+: Optional manipulations to the source data included passed to the target query
+
+Learn how to create correlations using the [Administration page]({{< relref "./create-a-new-correlation#create-a-correlation-in-administration-page" >}}) or with [provisioning]({{< relref "./create-a-new-correlation#create-a-correlation-with-provisioning" >}}).
+
+## Source data source and result field
+
+Links are shown in Explore visualizations for the results from the correlation’s source data source. A link is assigned to one of the fields from the result provided in the correlation configuration (the results field). Each visualization displays fields with links in a different way ([Correlations in Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}}) and see [Correlations in Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}}))
+
+## Target query
+
+The target query is run when a link is clicked in the visualization. You can use the query editor of the selected target data source to specify the target query. Source data results can be accessed inside the target query with variables.
+
+### Correlation Variables
+
+You can use variables inside the target query to access the source data related to the query. Correlations use [Grafana variable syntax]({{< relref "/docs/grafana/latest/dashboards/variables/variable-syntax" >}}). Variables are filled with values from the source results when the link is clicked. There are two types of variables you can use:
+
+- [field variables]({{< relref "/docs/grafana/latest/panels-visualizations/configure-data-links#field-variables" >}}) (allows to access field values and labels)
+- correlation variables (allows to access field values and transformations)
+
+Example: If source results contain a field called “employee”, the value of the field can be accessed with:
+
+- A field variable ${\_\_data.fields.employee}
+- A correlation variable that maps the field value above to ${employee}
+
+In addition to mapping field values to shorter variable names, more correlation variables can be created by applying transformations to existing fields
+
+For more details, please see the example in [Use variables and transformations in a correlation]({{< relref "./use-variables-and-transformations" >}}).
+
+### Correlation Transformations
+
+Correlations provide a way to extract more variables out of field values. The output of transformations is a set of new variables that can be accessed as any other variable.
+
+There are two types of transformations: logfmt and regular expression.
+
+Each transformation uses a selected field value as the input. The output of a transformation is a set of new variables based on the type and options of the transformation.
+
+For more details, please see the example in [Use variables and transformations in a correlation]({{< relref "./use-variables-and-transformations" >}}) for more details.
+
+### Logfmt transformation
+
+The logfmt transformation deconstructs a field value containing text formatted with [logfmt key/value pairs](https://brandur.org/logfmt). Each pair becomes a variable with the key being the name of the variable.
+
+The logfmt transformation only requires specifying the input field name if you would like the transformation to apply to a different field than the results field.
+Example output variables for field = “host=srv001 endpoint=/test app=foo”:
+
+| name     | value  |
+| :------- | :----- |
+| host     | srv001 |
+| endpoint | /test  |
+| app      | foo    |
+
+### Regular expression transformation
+
+The regular expression transformation deconstructs a field value based on the provided regular expression.
+
+Regular expression transformation options:
+
+**field**
+: Input field name
+
+**expression**
+: Regular expression. Named capture groups are mapped to variables matching the group name. If non-named matching groups are used a variable is created out of the first match. The value overrides the variable matching the input field or a new variable is created if mapValue is provided (check the example below)
+
+**mapValue**
+: Used with simple regex groups without named matching groups. By default, the first match overrides the variable with the name of the field that is used as the input. To change that default behavior you can specify the mapValue property. The provided name is used to create a new variable. This can be useful if your target query requires both the exact value and a part of the value extracted with the transformation.
+
+Example: Assuming the selected field name is “employee” and the field value is “John Doe”.
+
+Various output variables based on expression and mapValue options:
+
+| expression        | mapValue | output variables             | comment                                                                                           |
+| :---------------- | :------- | :--------------------------- | :------------------------------------------------------------------------------------------------ |
+| /\\w+ (\\w+)/     | -        | employee=Doe                 | No mapValue provided. The first matching is mapped to the existing field name variable (employee) |
+| /(\\w+) (\\w+)/   | name     | name=John                    | The first matching is mapped to a new variable called “name”                                      |
+| /(?\\w+) (?\\w+)/ | -        | firstName=John, lastName=Doe | When named groups are used they are the names of the output variables and mapValue is ignored.    |
+| /(?\\w+) (?\\w+)/ | name     | firstName=John, lastName=Doe | Same as above                                                                                     |
diff --git a/docs/sources/administration/correlations/correlation-permissions/index.md b/docs/sources/administration/correlations/correlation-permissions/index.md
new file mode 100644
index 00000000000..5e2391ca841
--- /dev/null
+++ b/docs/sources/administration/correlations/correlation-permissions/index.md
@@ -0,0 +1,15 @@
+---
+title: Permissions
+weight: 20
+---
+
+# Permissions
+
+Users with [Viewer base role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) or with [datasources:query RBAC role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}) can:
+
+- Use correlations in Explore’s visualizations
+- List all available correlations in read-only mode
+
+Users with [Admin base role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) or with [datasources:write RBAC role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}) can:
+
+- Add, edit and delete correlations
diff --git a/docs/sources/administration/correlations/create-a-new-correlation/index.md b/docs/sources/administration/correlations/create-a-new-correlation/index.md
new file mode 100644
index 00000000000..c67a4af9c1d
--- /dev/null
+++ b/docs/sources/administration/correlations/create-a-new-correlation/index.md
@@ -0,0 +1,120 @@
+---
+title: Create a new correlation
+weight: 40
+---
+
+# Create a new correlation
+
+## Before you begin
+
+Make sure you have permission to add new correlations. Only users with write permissions to data sources can define new correlations.
+
+## Create a correlation in Administration page
+
+1. Go to the Administration section in Grafana.
+1. Open Correlations page.
+1. Click the “Add” button in the top right corner.
+1. Provide a **label** for the correlation.
+1. Provide an optional **description**.
+1. Go to the next page.
+1. Provide **target data source**.
+1. Provide **target query** using variables.
+1. Go to the next page.
+1. Provide **source data source**.
+1. Provide **results field**.
+1. Add transformations if you need variables that are not fields in the source data source.
+1. Click “Add” to add a new transformation.
+1. Select the type of a transformation.
+1. Configure transformation depending on the selected type.
+1. Save correlation.
+
+You can edit correlation in the same way, but you cannot change the selected data sources.
+
+## Create a correlation with provisioning
+
+Provision correlations by extending provisioned data sources. Correlations are defined as a subsection of the source data source configuration:
+
+```yaml
+datasources:
+  - name: Data source name # source data source
+    ...
+    jsonData:
+    ...
+    correlations:
+      - targetUID: uid
+        label: "test"
+        description: "..."
+        config:
+          type: "query"
+          target:
+            expr: "..."
+          field: "name"
+          transformations:
+            - type: regex
+              field: "test"
+              expression: /\w+/
+              mapValue: "other"
+            - type: logfmt
+              field: "test"
+```
+
+Description of provisioning properties:
+
+**targetUID**
+: Target data source UID
+
+**label**
+: Link label
+
+**description**
+: Optional description
+
+**config**
+: Config object
+
+**config.type**
+: Correlation type. “query” is the only supported type at the moment
+
+**config.target**
+: [Target query model]({{< relref "#determine-target-query-model-structure" >}})
+
+**config.field**
+: Name of the field where link is shown
+
+**config.transformations (list)**
+: List of transformation objects
+
+**transformation.type**
+: regex, or logfmt
+
+**transformation.field**
+: The field that will be transformed. If this is not defined, it will apply the transformation to the data from the correlation's config.field.
+
+**transformation.expression**
+: Regex expression (regex transformation only)
+
+**transformation.mapValue**
+: New name of the variable from the first regex match (regex transformation only)
+
+### Determine target query model structure
+
+When you set up a correlation with admin page you can use the target query editor. When you use provisioning you may need to know the structure of the target query which may not be well documented depending on the plugin. Here is a quick step-by-step guide on how to determine the target query model:
+
+1. Open Explore.
+1. Select the data source you want to use as the target of the correlation.
+1. Open the inspector tab and select “Query”.
+1. Run a sample query.
+1. Inspect results.
+1. Look for the “queries” list object. Each object is created using the query model structure defined by the data source. You can use the same structure in your provisioning file.
+
+   {{< figure src="/static/img/docs/correlations/determine-target-query-structure-inspector-10-0.png" max-width="600px" caption="Query inspector with target query structure" >}}
+
+   The query model in this example is represented by the first entry in the queries list. Properties “refId” and “datasource” are added to all queries in runtime and can be omitted:
+
+   ```json
+   {
+     "scenario_id": "random_walk",
+     "alias": "app",
+     "seriesCount: 2
+   }
+   ```
diff --git a/docs/sources/administration/correlations/use-correlations-in-visualizations/index.md b/docs/sources/administration/correlations/use-correlations-in-visualizations/index.md
new file mode 100644
index 00000000000..a1ea800f08d
--- /dev/null
+++ b/docs/sources/administration/correlations/use-correlations-in-visualizations/index.md
@@ -0,0 +1,29 @@
+---
+title: Use correlations in visualizations
+weight: 70
+---
+
+# Use correlations in visualizations
+
+## Correlations in Logs Panel
+
+1. Setup a correlation.
+1. Open Explore.
+1. Select a data source that you chose as the source data source of the correlation.
+1. Run a query that results in data containing fields required to build variables in the target query.
+1. Expand log row details.
+1. If the selected row contains all the information required to build the target query a link appears in the “Links” section at the bottom.
+1. Additional information about used variables and their values is shown next to each link.
+
+   {{< figure src="/static/img/docs/correlations/correlations-in-logs-panel-10-0.png" max-width="600px" caption="Correlation links in Logs panel" >}}
+
+## Correlations in Table
+
+1. Setup a correlation.
+1. Open Explore.
+1. Select a data source that you chose as the source data source of the correlation.
+1. Run a query that results in data containing fields required to build variables in the target query.
+1. Links are added to cell rows in the column representing the field with the assigned link ([the results field]({{< relref "/docs/grafana/latest/administration/correlations/correlation-configuration#source-data-source-and-result-field" >}}).
+1. Cells containing multiple links accessible with a context menu.
+
+   {{< figure src="/static/img/docs/correlations/correlations-in-table-10-0.png" max-width="600px" caption="Correlations links in table" >}}
diff --git a/docs/sources/administration/correlations/use-variables-and-transformations/index.md b/docs/sources/administration/correlations/use-variables-and-transformations/index.md
new file mode 100644
index 00000000000..d966506ab28
--- /dev/null
+++ b/docs/sources/administration/correlations/use-variables-and-transformations/index.md
@@ -0,0 +1,135 @@
+---
+title: Use variables and transformations in a correlation
+weight: 60
+---
+
+# Use variables and transformations in a correlation
+
+## Before you begin
+
+This example walks through creating a link in a test data source but the same principles apply to any data source.
+
+The example emulates a scenario with two data sources:
+
+- Logs containing lines in the format: “2020-01-01 10:00 level=error message=error service=app1.loginService” stored in a field named “msg”
+- Metrics for application included in the service name of a log line (e.g. app1)
+
+Instructions below show how to set up a link that can run metrics query for the host included in each log line with provisioning and regex transformation. Additionally, a link with a query containing the full name of the service is set up to demonstrate the logfmt transformation.
+
+## Use variables and transformations in provisioning
+
+1. Add the following provisioning configuration to your Grafana:
+
+   ```yaml
+   datasources:
+     - name: Target
+       uid: test-target
+       type: testdata
+
+     - name: Source
+       uid: test-source
+       type: testdata
+     - name: Source
+       uid: test-source
+       type: testdata
+       correlations:
+         - targetUID: test-target
+           label: App metrics
+           description: Application HTTP request metrics
+           config:
+             type: query
+             target:
+               scenario_id: random_walk
+               alias: $${application}
+             field: msg
+             transformations:
+               - type: regex
+                 field: msg
+                 expression: service=(\w+)\.\w+
+                 mapValue: application
+         - targetUID: test-target
+           label: Service metrics
+           description: Service metrics
+           config:
+             type: query
+             target:
+               scenario_id: random_walk
+               alias: $${service}
+             field: msg
+             transformations:
+               - type: logfmt
+                 field: msg
+   ```
+
+   Two data sources are created: Source (emulating logs data source) and Target (emulating metrics data source):
+
+   - A correlation called “App metrics” is created targeting the Target data source with its UID.
+     - The label and description are provided as text
+     - Each correlation contains the following configuration:
+       - Required correlation type (query)
+       - Target query matching test data source model
+     - “App metrics” correlation contains the following configuration:
+       - Alias is set to ${application} variable (note that in provisioning files $ is used to access environment variables so it has to be [escaped]({{< relref "/docs/grafana/latest/administration/provisioning#using-environment-variables" >}})).
+       - Regular expression transformation is created to extract values from “msg” field
+         - Regular expression transformation is used to capture the application name from the full name of the service stored in the log line.
+         - The output of the transformation is mapped to a variable called “application”.
+     - “Service metrics” correlation is created in a similar way but with logfmt transformation to break down log message and access full name of the service (e.g. “app1.loginService”).
+       - For example, when a logline “2020-01-01 10:00 level=error message=error service=app1.loginService” is provided as the input, the transformation produces new variables: level, message, and service.
+       - “service” variable is used as the alias in the target query.
+
+1. Navigate to Explore and open “Source” data source.
+1. Select the “Raw Frames” scenario and provide the following data frames to emulate returning log lines:
+   ```json
+   [
+     {
+       "meta": {
+         "preferredVisualisationType": "logs"
+       },
+       "fields": [
+         {
+           "name": "time",
+           "values": [1, 2]
+         },
+         {
+           "name": "msg",
+           "values": [
+             "level=error msg=error service=app1.loginService",
+             "level=debug msg=info service=app2.userProfileService"
+           ]
+         }
+       ]
+     }
+   ]
+   ```
+1. Run the query and open log details by clicking on the log line.
+
+   {{< figure src="/static/img/docs/correlations/correlations-in-logs-panel-10-0.png" max-width="600px" caption="Correlation links in Logs panel" >}}
+
+   A link “App metrics” and “Service metrics” show next to variables extracted out of the log line with transformations
+
+1. Click on the “App metrics” link.
+1. A split view is opened and the target query is run.
+1. Notice how the application name from the log line is filled in as the alias property in the target query.
+
+   {{< figure src="/static/img/docs/correlations/interpolated-target-query-10-0.png" max-width="600px" caption="Interpolated target query" >}}
+
+   This allows you to run a specific query based on the source results:
+
+   {{< figure src="/static/img/docs/correlations/target-query-results-10-0.png" max-width="600px" caption="Interpolated target query results" >}}
+
+1. Go back to the source query and change raw frames’ preferred visualization type to “table” to see how links are displayed in a Table visualization.
+
+   ```json
+   [
+     {
+       "meta": {
+         "preferredVisualisationType": "table"
+       },
+       "fields": [...]
+     }
+   ]
+   ```
+
+1. Run the query and notice how links are created in the Table cell:
+
+   {{< figure src="/static/img/docs/correlations/correlations-in-table-10-0.png" max-width="600px" caption="Correlations links in table" >}}
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 67f03b425c3..5b05dd7d308 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -52,6 +52,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `accessControlOnCall`             | Access control primitives for OnCall                                                                                                                                                         |
 | `alertingNoNormalState`           | Stop maintaining state of alerts that are not firing                                                                                                                                         |
 | `renderAuthJWT`                   | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
+| `correlations`                    | Correlations page                                                                                                                                                                            |
 
 ## Alpha feature toggles
 
@@ -70,7 +71,6 @@ Alpha features might be changed or removed without prior notice.
 | `storage`                          | Configurable storage for dashboards, datasources, and resources                                                                                                                                     |
 | `exploreMixedDatasource`           | Enable mixed datasource in Explore                                                                                                                                                                  |
 | `newTraceView`                     | Shows the new trace view design                                                                                                                                                                     |
-| `correlations`                     | Correlations page                                                                                                                                                                                   |
 | `datasourceQueryMultiStatus`       | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                    |
 | `traceToMetrics`                   | Enable trace to metrics links                                                                                                                                                                       |
 | `prometheusWideSeries`             | Enable wide series responses in the Prometheus datasource                                                                                                                                           |

From 18cb2ac9dd391bbd703e9befe3b4a3e94ab21019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Wed, 12 Apr 2023 15:41:33 +0200
Subject: [PATCH 066/729] GrafanaUI: Remove obsolete logs exports (#66268)

* grafana-ui: removed obsolete logs exports

* updated betterer stats

* updated CODEOWNERS
---
 .betterer.results                             |  10 -
 .github/CODEOWNERS                            |   1 -
 .../src/components/Logs/LogDetails.tsx        | 180 ------------
 .../components/Logs/LogDetailsRow.test.tsx    | 121 --------
 .../src/components/Logs/LogDetailsRow.tsx     | 224 ---------------
 .../src/components/Logs/LogLabelStats.tsx     | 101 -------
 .../src/components/Logs/LogLabelStatsRow.tsx  |  85 ------
 .../src/components/Logs/LogLabels.test.tsx    |  27 --
 .../src/components/Logs/LogLabels.tsx         |  74 -----
 .../components/Logs/LogMessageAnsi.test.tsx   |  45 ---
 .../src/components/Logs/LogMessageAnsi.tsx    | 107 -------
 .../grafana-ui/src/components/Logs/LogRow.tsx | 261 ------------------
 .../components/Logs/LogRowContext.test.tsx    |  25 --
 .../src/components/Logs/LogRowContext.tsx     | 237 ----------------
 .../components/Logs/LogRowContextProvider.tsx | 216 ---------------
 .../src/components/Logs/LogRowMessage.tsx     | 191 -------------
 .../Logs/LogRowMessageDetectedFields.tsx      |  51 ----
 .../src/components/Logs/LogRows.tsx           | 194 -------------
 .../src/components/Logs/getLogRowStyles.ts    | 186 -------------
 .../src/components/Logs/logParser.ts          | 124 ---------
 packages/grafana-ui/src/components/index.ts   |   4 -
 21 files changed, 2464 deletions(-)
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogDetails.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogDetailsRow.test.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogDetailsRow.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogLabelStats.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogLabels.test.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogLabels.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogMessageAnsi.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogRow.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogRowContext.test.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogRowContext.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogRowMessage.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/LogRows.tsx
 delete mode 100644 packages/grafana-ui/src/components/Logs/getLogRowStyles.ts
 delete mode 100644 packages/grafana-ui/src/components/Logs/logParser.ts

diff --git a/.betterer.results b/.betterer.results
index c1f01ae34a7..725c072dd3d 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -1096,16 +1096,6 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/components/Layout/Layout.story.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
-    "packages/grafana-ui/src/components/Logs/LogRows.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "packages/grafana-ui/src/components/Logs/logParser.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "packages/grafana-ui/src/components/MatchersUI/FieldValueMatcher.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fe7ad32d3ab..7f881d08f34 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -304,7 +304,6 @@
 /packages/grafana-ui/src/components/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/DateTimePickers/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/GraphNG/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/Logs/ @grafana/observability-logs
 /packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
 /packages/grafana-ui/src/components/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/uPlot/ @grafana/dataviz-squad
diff --git a/packages/grafana-ui/src/components/Logs/LogDetails.tsx b/packages/grafana-ui/src/components/Logs/LogDetails.tsx
deleted file mode 100644
index ffc0724151c..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogDetails.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import { css, cx } from '@emotion/css';
-import memoizeOne from 'memoize-one';
-import React, { PureComponent } from 'react';
-
-import {
-  calculateFieldStats,
-  calculateLogsLabelStats,
-  calculateStats,
-  Field,
-  getParser,
-  LinkModel,
-  LogRowModel,
-  GrafanaTheme2,
-} from '@grafana/data';
-
-import { withTheme2 } from '../../themes/index';
-import { Themeable2 } from '../../types/theme';
-import { Icon } from '../Icon/Icon';
-import { Tooltip } from '../Tooltip/Tooltip';
-
-import { LogDetailsRow } from './LogDetailsRow';
-import { getLogRowStyles } from './getLogRowStyles';
-import { getAllFields } from './logParser';
-
-/** @deprecated will be removed in the next major version */
-export interface Props extends Themeable2 {
-  row: LogRowModel;
-  showDuplicates: boolean;
-  getRows: () => LogRowModel[];
-  wrapLogMessage: boolean;
-  className?: string;
-  hasError?: boolean;
-
-  onClickFilterLabel?: (key: string, value: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string) => void;
-  getFieldLinks?: (field: Field, rowIndex: number) => Array<LinkModel<Field>>;
-  showDetectedFields?: string[];
-  onClickShowDetectedField?: (key: string) => void;
-  onClickHideDetectedField?: (key: string) => void;
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    logsRowLevelDetails: css`
-      label: logs-row__level_details;
-      &::after {
-        top: -3px;
-      }
-    `,
-    logDetails: css`
-      label: logDetailsDefaultCursor;
-      cursor: default;
-
-      &:hover {
-        background-color: ${theme.colors.background.primary};
-      }
-    `,
-  };
-};
-
-class UnThemedLogDetails extends PureComponent<Props> {
-  getParser = memoizeOne(getParser);
-
-  getStatsForDetectedField = (key: string) => {
-    const matcher = this.getParser(this.props.row.entry)!.buildMatcher(key);
-    return calculateFieldStats(this.props.getRows(), matcher);
-  };
-
-  render() {
-    const {
-      row,
-      theme,
-      hasError,
-      onClickFilterOutLabel,
-      onClickFilterLabel,
-      getRows,
-      showDuplicates,
-      className,
-      onClickShowDetectedField,
-      onClickHideDetectedField,
-      showDetectedFields,
-      getFieldLinks,
-      wrapLogMessage,
-    } = this.props;
-    const style = getLogRowStyles(theme, row.logLevel);
-    const styles = getStyles(theme);
-    const labels = row.labels ? row.labels : {};
-    const labelsAvailable = Object.keys(labels).length > 0;
-    const fields = getAllFields(row, getFieldLinks);
-    const detectedFieldsAvailable = fields && fields.length > 0;
-    // If logs with error, we are not showing the level color
-    const levelClassName = cx(!hasError && [style.logsRowLevel, styles.logsRowLevelDetails]);
-
-    return (
-      <tr className={cx(className, styles.logDetails)}>
-        {showDuplicates && <td />}
-        <td className={levelClassName} aria-label="Log level" />
-        <td colSpan={4}>
-          <div className={style.logDetailsContainer}>
-            <table className={style.logDetailsTable}>
-              <tbody>
-                {labelsAvailable && (
-                  <tr>
-                    <td colSpan={5} className={style.logDetailsHeading} aria-label="Log labels">
-                      Log labels
-                    </td>
-                  </tr>
-                )}
-                {Object.keys(labels)
-                  .sort()
-                  .map((key) => {
-                    const value = labels[key];
-                    return (
-                      <LogDetailsRow
-                        key={`${key}=${value}`}
-                        parsedKey={key}
-                        parsedValue={value}
-                        isLabel={true}
-                        getStats={() => calculateLogsLabelStats(getRows(), key)}
-                        onClickFilterOutLabel={onClickFilterOutLabel}
-                        onClickFilterLabel={onClickFilterLabel}
-                      />
-                    );
-                  })}
-
-                {detectedFieldsAvailable && (
-                  <tr>
-                    <td colSpan={5} className={style.logDetailsHeading} aria-label="Detected fields">
-                      Detected fields
-                      <Tooltip content="Fields that are parsed from log message and detected by Grafana.">
-                        <Icon
-                          name="question-circle"
-                          size="xs"
-                          className={css`
-                            margin-left: 4px;
-                          `}
-                        />
-                      </Tooltip>
-                    </td>
-                  </tr>
-                )}
-                {fields.sort().map((field) => {
-                  const { key, value, links, fieldIndex } = field;
-                  return (
-                    <LogDetailsRow
-                      key={`${key}=${value}`}
-                      parsedKey={key}
-                      parsedValue={value}
-                      links={links}
-                      onClickShowDetectedField={onClickShowDetectedField}
-                      onClickHideDetectedField={onClickHideDetectedField}
-                      getStats={() =>
-                        fieldIndex === undefined
-                          ? this.getStatsForDetectedField(key)
-                          : calculateStats(row.dataFrame.fields[fieldIndex].values.toArray())
-                      }
-                      showDetectedFields={showDetectedFields}
-                      wrapLogMessage={wrapLogMessage}
-                    />
-                  );
-                })}
-                {!detectedFieldsAvailable && !labelsAvailable && (
-                  <tr>
-                    <td colSpan={5} aria-label="No details">
-                      No details available
-                    </td>
-                  </tr>
-                )}
-              </tbody>
-            </table>
-          </div>
-        </td>
-      </tr>
-    );
-  }
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogDetails = withTheme2(UnThemedLogDetails);
-LogDetails.displayName = 'LogDetails';
diff --git a/packages/grafana-ui/src/components/Logs/LogDetailsRow.test.tsx b/packages/grafana-ui/src/components/Logs/LogDetailsRow.test.tsx
deleted file mode 100644
index bf5583b6511..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogDetailsRow.test.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { screen, render, fireEvent } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React, { ComponentProps } from 'react';
-
-import { LogDetailsRow } from './LogDetailsRow';
-
-type Props = ComponentProps<typeof LogDetailsRow>;
-
-const setup = (propOverrides?: Partial<Props>) => {
-  const props: Props = {
-    parsedValue: '',
-    parsedKey: '',
-    isLabel: true,
-    wrapLogMessage: false,
-    getStats: () => null,
-    onClickFilterLabel: () => {},
-    onClickFilterOutLabel: () => {},
-    onClickShowDetectedField: () => {},
-    onClickHideDetectedField: () => {},
-    showDetectedFields: [],
-  };
-
-  Object.assign(props, propOverrides);
-
-  return render(
-    <table>
-      <tbody>
-        <LogDetailsRow {...props} />
-      </tbody>
-    </table>
-  );
-};
-
-describe('LogDetailsRow', () => {
-  it('should render parsed key', () => {
-    setup({ parsedKey: 'test key' });
-    expect(screen.getByText('test key')).toBeInTheDocument();
-  });
-  it('should render parsed value', () => {
-    setup({ parsedValue: 'test value' });
-    expect(screen.getByText('test value')).toBeInTheDocument();
-  });
-
-  it('should render metrics button', () => {
-    setup();
-    expect(screen.getAllByTitle('Ad-hoc statistics')).toHaveLength(1);
-  });
-
-  describe('if props is a label', () => {
-    it('should render filter label button', () => {
-      setup();
-      expect(screen.getAllByTitle('Filter for value')).toHaveLength(1);
-    });
-    it('should render filter out label button', () => {
-      setup();
-      expect(screen.getAllByTitle('Filter out value')).toHaveLength(1);
-    });
-    it('should not render filtering buttons if no filtering functions provided', () => {
-      setup({ onClickFilterLabel: undefined, onClickFilterOutLabel: undefined });
-      expect(screen.queryByTitle('Filter out value')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('if props is not a label', () => {
-    it('should not render a filter label button', () => {
-      setup({ isLabel: false });
-      expect(screen.queryByTitle('Filter for value')).not.toBeInTheDocument();
-    });
-    it('should render a show toggleFieldButton button', () => {
-      setup({ isLabel: false });
-      expect(screen.getAllByTitle('Show this field instead of the message')).toHaveLength(1);
-    });
-    it('should not render a show toggleFieldButton button if no detected fields toggling functions provided', () => {
-      setup({
-        isLabel: false,
-        onClickShowDetectedField: undefined,
-        onClickHideDetectedField: undefined,
-      });
-      expect(screen.queryByTitle('Show this field instead of the message')).not.toBeInTheDocument();
-    });
-  });
-
-  it('should render stats when stats icon is clicked', () => {
-    setup({
-      parsedKey: 'key',
-      parsedValue: 'value',
-      getStats: () => {
-        return [
-          {
-            count: 1,
-            proportion: 1 / 2,
-            value: 'value',
-          },
-          {
-            count: 1,
-            proportion: 1 / 2,
-            value: 'another value',
-          },
-        ];
-      },
-    });
-
-    expect(screen.queryByTestId('logLabelStats')).not.toBeInTheDocument();
-    const adHocStatsButton = screen.getByTitle('Ad-hoc statistics');
-    fireEvent.click(adHocStatsButton);
-    expect(screen.getByTestId('logLabelStats')).toBeInTheDocument();
-    expect(screen.getByTestId('logLabelStats')).toHaveTextContent('another value');
-  });
-
-  it('should render clipboard button on hover of log row table value', async () => {
-    setup({ parsedKey: 'key', parsedValue: 'value' });
-
-    const valueCell = screen.getByRole('cell', { name: 'value' });
-    await userEvent.hover(valueCell);
-
-    expect(screen.getByRole('button', { name: 'Copy value to clipboard' })).toBeInTheDocument();
-    await userEvent.unhover(valueCell);
-
-    expect(screen.queryByRole('button', { name: 'Copy value to clipboard' })).not.toBeInTheDocument();
-  });
-});
diff --git a/packages/grafana-ui/src/components/Logs/LogDetailsRow.tsx b/packages/grafana-ui/src/components/Logs/LogDetailsRow.tsx
deleted file mode 100644
index 9c82ad9c791..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogDetailsRow.tsx
+++ /dev/null
@@ -1,224 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { PureComponent } from 'react';
-
-import { Field, LinkModel, LogLabelStatsModel, GrafanaTheme2 } from '@grafana/data';
-
-import { withTheme2 } from '../../themes/index';
-import { Themeable2 } from '../../types/theme';
-import { ClipboardButton } from '../ClipboardButton/ClipboardButton';
-import { DataLinkButton } from '../DataLinks/DataLinkButton';
-import { IconButton } from '../IconButton/IconButton';
-
-import { LogLabelStats } from './LogLabelStats';
-import { getLogRowStyles } from './getLogRowStyles';
-
-/** @deprecated will be removed in the next major version */
-export interface Props extends Themeable2 {
-  parsedValue: string;
-  parsedKey: string;
-  wrapLogMessage?: boolean;
-  isLabel?: boolean;
-  onClickFilterLabel?: (key: string, value: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string) => void;
-  links?: Array<LinkModel<Field>>;
-  getStats: () => LogLabelStatsModel[] | null;
-  showDetectedFields?: string[];
-  onClickShowDetectedField?: (key: string) => void;
-  onClickHideDetectedField?: (key: string) => void;
-}
-
-interface State {
-  showFieldsStats: boolean;
-  fieldCount: number;
-  fieldStats: LogLabelStatsModel[] | null;
-  mouseOver: boolean;
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    noHoverBackground: css`
-      label: noHoverBackground;
-      :hover {
-        background-color: transparent;
-      }
-    `,
-    hoverCursor: css`
-      label: hoverCursor;
-      cursor: pointer;
-    `,
-    wordBreakAll: css`
-      label: wordBreakAll;
-      word-break: break-all;
-    `,
-    showingField: css`
-      color: ${theme.colors.primary.text};
-    `,
-    hoverValueCopy: css`
-      margin: ${theme.spacing(0, 0, 0, 1.2)};
-      position: absolute;
-      top: 0px;
-      justify-content: center;
-      border-radius: ${theme.shape.radius.circle};
-      width: 26px;
-      height: 26px;
-    `,
-    wrapLine: css`
-      label: wrapLine;
-      white-space: pre-wrap;
-    `,
-  };
-};
-class UnThemedLogDetailsRow extends PureComponent<Props, State> {
-  state: State = {
-    showFieldsStats: false,
-    fieldCount: 0,
-    fieldStats: null,
-    mouseOver: false,
-  };
-
-  showField = () => {
-    const { onClickShowDetectedField, parsedKey } = this.props;
-    if (onClickShowDetectedField) {
-      onClickShowDetectedField(parsedKey);
-    }
-  };
-
-  hideField = () => {
-    const { onClickHideDetectedField, parsedKey } = this.props;
-    if (onClickHideDetectedField) {
-      onClickHideDetectedField(parsedKey);
-    }
-  };
-
-  filterLabel = () => {
-    const { onClickFilterLabel, parsedKey, parsedValue } = this.props;
-    if (onClickFilterLabel) {
-      onClickFilterLabel(parsedKey, parsedValue);
-    }
-  };
-
-  filterOutLabel = () => {
-    const { onClickFilterOutLabel, parsedKey, parsedValue } = this.props;
-    if (onClickFilterOutLabel) {
-      onClickFilterOutLabel(parsedKey, parsedValue);
-    }
-  };
-
-  showStats = () => {
-    const { showFieldsStats } = this.state;
-    if (!showFieldsStats) {
-      const fieldStats = this.props.getStats();
-      const fieldCount = fieldStats ? fieldStats.reduce((sum, stat) => sum + stat.count, 0) : 0;
-      this.setState({ fieldStats, fieldCount });
-    }
-    this.toggleFieldsStats();
-  };
-
-  toggleFieldsStats() {
-    this.setState((state) => {
-      return {
-        showFieldsStats: !state.showFieldsStats,
-      };
-    });
-  }
-
-  hoverValueCopy() {
-    const mouseOver = !this.state.mouseOver;
-    this.setState({ mouseOver });
-  }
-
-  render() {
-    const {
-      theme,
-      parsedKey,
-      parsedValue,
-      isLabel,
-      links,
-      showDetectedFields,
-      wrapLogMessage,
-      onClickShowDetectedField,
-      onClickHideDetectedField,
-      onClickFilterLabel,
-      onClickFilterOutLabel,
-    } = this.props;
-    const { showFieldsStats, fieldStats, fieldCount, mouseOver } = this.state;
-    const styles = getStyles(theme);
-    const style = getLogRowStyles(theme);
-
-    const hasDetectedFieldsFunctionality = onClickShowDetectedField && onClickHideDetectedField;
-    const hasFilteringFunctionality = onClickFilterLabel && onClickFilterOutLabel;
-
-    const toggleFieldButton =
-      !isLabel && showDetectedFields && showDetectedFields.includes(parsedKey) ? (
-        <IconButton name="eye" className={styles.showingField} title="Hide this field" onClick={this.hideField} />
-      ) : (
-        <IconButton name="eye" title="Show this field instead of the message" onClick={this.showField} />
-      );
-
-    return (
-      <tr className={cx(style.logDetailsValue, { [styles.noHoverBackground]: showFieldsStats })}>
-        {/* Action buttons - show stats/filter results */}
-        <td className={style.logsDetailsIcon}>
-          <IconButton name="signal" title={'Ad-hoc statistics'} onClick={this.showStats} />
-        </td>
-
-        {hasFilteringFunctionality && isLabel && (
-          <>
-            <td className={style.logsDetailsIcon}>
-              <IconButton name="search-plus" title="Filter for value" onClick={this.filterLabel} />
-            </td>
-            <td className={style.logsDetailsIcon}>
-              <IconButton name="search-minus" title="Filter out value" onClick={this.filterOutLabel} />
-            </td>
-          </>
-        )}
-
-        {hasDetectedFieldsFunctionality && !isLabel && (
-          <td className={style.logsDetailsIcon} colSpan={2}>
-            {toggleFieldButton}
-          </td>
-        )}
-
-        {/* Key - value columns */}
-        <td className={style.logDetailsLabel}>{parsedKey}</td>
-        <td
-          className={cx(styles.wordBreakAll, wrapLogMessage && styles.wrapLine)}
-          onMouseEnter={this.hoverValueCopy.bind(this)}
-          onMouseLeave={this.hoverValueCopy.bind(this)}
-        >
-          {parsedValue}
-          {mouseOver && (
-            <ClipboardButton
-              getText={() => parsedValue}
-              title="Copy value to clipboard"
-              fill="text"
-              variant="secondary"
-              icon="copy"
-              size="sm"
-              className={styles.hoverValueCopy}
-            />
-          )}
-          {links?.map((link) => (
-            <span key={link.title}>
-              &nbsp;
-              <DataLinkButton link={link} />
-            </span>
-          ))}
-          {showFieldsStats && (
-            <LogLabelStats
-              stats={fieldStats!}
-              label={parsedKey}
-              value={parsedValue}
-              rowCount={fieldCount}
-              isLabel={isLabel}
-            />
-          )}
-        </td>
-      </tr>
-    );
-  }
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogDetailsRow = withTheme2(UnThemedLogDetailsRow);
-LogDetailsRow.displayName = 'LogDetailsRow';
diff --git a/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx b/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx
deleted file mode 100644
index 96bba271e25..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { css } from '@emotion/css';
-import React, { PureComponent } from 'react';
-
-import { LogLabelStatsModel, GrafanaTheme2 } from '@grafana/data';
-
-import { stylesFactory } from '../../themes';
-import { withTheme2 } from '../../themes/index';
-import { Themeable2 } from '../../types/theme';
-
-//Components
-import { LogLabelStatsRow } from './LogLabelStatsRow';
-
-const STATS_ROW_LIMIT = 5;
-
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    logsStats: css`
-      label: logs-stats;
-      background: inherit;
-      color: ${theme.colors.text.primary};
-      word-break: break-all;
-      width: fit-content;
-      max-width: 100%;
-    `,
-    logsStatsHeader: css`
-      label: logs-stats__header;
-      border-bottom: 1px solid ${theme.colors.border.medium};
-      display: flex;
-    `,
-    logsStatsTitle: css`
-      label: logs-stats__title;
-      font-weight: ${theme.typography.fontWeightMedium};
-      padding-right: ${theme.spacing(2)};
-      display: inline-block;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      flex-grow: 1;
-    `,
-    logsStatsClose: css`
-      label: logs-stats__close;
-      cursor: pointer;
-    `,
-    logsStatsBody: css`
-      label: logs-stats__body;
-      padding: 5px 0;
-    `,
-  };
-});
-
-interface Props extends Themeable2 {
-  stats: LogLabelStatsModel[];
-  label: string;
-  value: string;
-  rowCount: number;
-  isLabel?: boolean;
-}
-
-class UnThemedLogLabelStats extends PureComponent<Props> {
-  render() {
-    const { label, rowCount, stats, value, theme, isLabel } = this.props;
-    const style = getStyles(theme);
-    const topRows = stats.slice(0, STATS_ROW_LIMIT);
-    let activeRow = topRows.find((row) => row.value === value);
-    let otherRows = stats.slice(STATS_ROW_LIMIT);
-    const insertActiveRow = !activeRow;
-
-    // Remove active row from other to show extra
-    if (insertActiveRow) {
-      activeRow = otherRows.find((row) => row.value === value);
-      otherRows = otherRows.filter((row) => row.value !== value);
-    }
-
-    const otherCount = otherRows.reduce((sum, row) => sum + row.count, 0);
-    const topCount = topRows.reduce((sum, row) => sum + row.count, 0);
-    const total = topCount + otherCount;
-    const otherProportion = otherCount / total;
-
-    return (
-      <div className={style.logsStats} data-testid="logLabelStats">
-        <div className={style.logsStatsHeader}>
-          <div className={style.logsStatsTitle}>
-            {label}: {total} of {rowCount} rows have that {isLabel ? 'label' : 'field'}
-          </div>
-        </div>
-        <div className={style.logsStatsBody}>
-          {topRows.map((stat) => (
-            <LogLabelStatsRow key={stat.value} {...stat} active={stat.value === value} />
-          ))}
-          {insertActiveRow && activeRow && <LogLabelStatsRow key={activeRow.value} {...activeRow} active />}
-          {otherCount > 0 && (
-            <LogLabelStatsRow key="__OTHERS__" count={otherCount} value="Other" proportion={otherProportion} />
-          )}
-        </div>
-      </div>
-    );
-  }
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogLabelStats = withTheme2(UnThemedLogLabelStats);
-LogLabelStats.displayName = 'LogLabelStats';
diff --git a/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx b/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx
deleted file mode 100644
index 56c6ff201ec..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-
-import { useStyles2 } from '../../themes/ThemeContext';
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  logsStatsRow: css`
-    label: logs-stats-row;
-    margin: ${parseInt(theme.spacing(2), 10) / 1.75}px 0;
-  `,
-  logsStatsRowActive: css`
-    label: logs-stats-row--active;
-    color: ${theme.colors.primary.text};
-    position: relative;
-  `,
-  logsStatsRowLabel: css`
-    label: logs-stats-row__label;
-    display: flex;
-    margin-bottom: 1px;
-  `,
-  logsStatsRowValue: css`
-    label: logs-stats-row__value;
-    flex: 1;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  `,
-  logsStatsRowCount: css`
-    label: logs-stats-row__count;
-    text-align: right;
-    margin-left: 0.5em;
-  `,
-  logsStatsRowPercent: css`
-    label: logs-stats-row__percent;
-    text-align: right;
-    margin-left: 0.5em;
-    width: 3em;
-  `,
-  logsStatsRowBar: css`
-    label: logs-stats-row__bar;
-    height: 4px;
-    overflow: hidden;
-    background: ${theme.colors.text.disabled};
-  `,
-  logsStatsRowInnerBar: css`
-    label: logs-stats-row__innerbar;
-    height: 4px;
-    overflow: hidden;
-    background: ${theme.colors.primary.main};
-  `,
-});
-
-/** @deprecated will be removed in the next major version */
-export interface Props {
-  active?: boolean;
-  count: number;
-  proportion: number;
-  value?: string;
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogLabelStatsRow = ({ active, count, proportion, value }: Props) => {
-  const style = useStyles2(getStyles);
-  const percent = `${Math.round(proportion * 100)}%`;
-  const barStyle = { width: percent };
-  const className = active ? cx([style.logsStatsRow, style.logsStatsRowActive]) : cx([style.logsStatsRow]);
-
-  return (
-    <div className={className}>
-      <div className={cx([style.logsStatsRowLabel])}>
-        <div className={cx([style.logsStatsRowValue])} title={value}>
-          {value}
-        </div>
-        <div className={cx([style.logsStatsRowCount])}>{count}</div>
-        <div className={cx([style.logsStatsRowPercent])}>{percent}</div>
-      </div>
-      <div className={cx([style.logsStatsRowBar])}>
-        <div className={cx([style.logsStatsRowInnerBar])} style={barStyle} />
-      </div>
-    </div>
-  );
-};
-
-LogLabelStatsRow.displayName = 'LogLabelStatsRow';
diff --git a/packages/grafana-ui/src/components/Logs/LogLabels.test.tsx b/packages/grafana-ui/src/components/Logs/LogLabels.test.tsx
deleted file mode 100644
index e76459f0b65..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogLabels.test.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { LogLabels } from './LogLabels';
-
-describe('<LogLabels />', () => {
-  it('renders notice when no labels are found', () => {
-    render(<LogLabels labels={{}} />);
-    expect(screen.queryByText('(no unique labels)')).toBeInTheDocument();
-  });
-  it('renders labels', () => {
-    render(<LogLabels labels={{ foo: 'bar', baz: '42' }} />);
-    expect(screen.queryByText('bar')).toBeInTheDocument();
-    expect(screen.queryByText('42')).toBeInTheDocument();
-  });
-  it('excludes labels with certain names or labels starting with underscore', () => {
-    render(<LogLabels labels={{ foo: 'bar', level: '42', _private: '13' }} />);
-    expect(screen.queryByText('bar')).toBeInTheDocument();
-    expect(screen.queryByText('42')).not.toBeInTheDocument();
-    expect(screen.queryByText('13')).not.toBeInTheDocument();
-  });
-  it('excludes labels with empty string values', () => {
-    render(<LogLabels labels={{ foo: 'bar', baz: '' }} />);
-    expect(screen.queryByText('bar')).toBeInTheDocument();
-    expect(screen.queryByText('baz')).not.toBeInTheDocument();
-  });
-});
diff --git a/packages/grafana-ui/src/components/Logs/LogLabels.tsx b/packages/grafana-ui/src/components/Logs/LogLabels.tsx
deleted file mode 100644
index 9a3126cf7f4..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogLabels.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2, Labels } from '@grafana/data';
-
-import { useStyles2 } from '../../themes/ThemeContext';
-
-// Levels are already encoded in color, filename is a Loki-ism
-const HIDDEN_LABELS = ['level', 'lvl', 'filename'];
-
-interface Props {
-  labels: Labels;
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogLabels = ({ labels }: Props) => {
-  const styles = useStyles2(getStyles);
-  const displayLabels = Object.keys(labels).filter((label) => !label.startsWith('_') && !HIDDEN_LABELS.includes(label));
-
-  if (displayLabels.length === 0) {
-    return (
-      <span className={cx([styles.logsLabels])}>
-        <span className={cx([styles.logsLabel])}>(no unique labels)</span>
-      </span>
-    );
-  }
-
-  return (
-    <span className={cx([styles.logsLabels])}>
-      {displayLabels.sort().map((label) => {
-        const value = labels[label];
-        if (!value) {
-          return;
-        }
-        const tooltip = `${label}: ${value}`;
-        return (
-          <span key={label} className={cx([styles.logsLabel])}>
-            <span className={cx([styles.logsLabelValue])} title={tooltip}>
-              {value}
-            </span>
-          </span>
-        );
-      })}
-    </span>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    logsLabels: css`
-      display: flex;
-      flex-wrap: wrap;
-      font-size: ${theme.typography.size.xs};
-    `,
-    logsLabel: css`
-      label: logs-label;
-      display: flex;
-      padding: 0 2px;
-      background-color: ${theme.colors.background.secondary};
-      border-radius: ${theme.shape.borderRadius(1)};
-      margin: 1px 4px 0 0;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-    `,
-    logsLabelValue: css`
-      label: logs-label__value;
-      display: inline-block;
-      max-width: 20em;
-      text-overflow: ellipsis;
-      overflow: hidden;
-    `,
-  };
-};
diff --git a/packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx b/packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx
deleted file mode 100644
index cfc197459b6..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { render, screen, within } from '@testing-library/react';
-import React from 'react';
-
-import { createTheme } from '@grafana/data';
-
-import { UnThemedLogMessageAnsi as LogMessageAnsi } from './LogMessageAnsi';
-
-describe('<LogMessageAnsi />', () => {
-  it('renders string without ANSI codes', () => {
-    render(<LogMessageAnsi value="Lorem ipsum" theme={createTheme()} />);
-
-    expect(screen.queryByTestId('ansiLogLine')).not.toBeInTheDocument();
-    expect(screen.queryByText('Lorem ipsum')).toBeInTheDocument();
-  });
-  it('renders string with ANSI codes', () => {
-    const value = 'Lorem \u001B[31mipsum\u001B[0m et dolor';
-    render(<LogMessageAnsi value={value} theme={createTheme()} />);
-
-    expect(screen.queryByTestId('ansiLogLine')).toBeInTheDocument();
-    expect(screen.getAllByTestId('ansiLogLine')).toHaveLength(1);
-    expect(screen.getAllByTestId('ansiLogLine').at(0)).toHaveAttribute('style', expect.stringMatching('color'));
-
-    const { getByText } = within(screen.getAllByTestId('ansiLogLine').at(0)!);
-    expect(getByText('ipsum')).toBeInTheDocument();
-  });
-  it('renders string with ANSI codes with correctly converted css classnames', () => {
-    const value = 'Lorem \u001B[1;32mIpsum';
-    render(<LogMessageAnsi value={value} theme={createTheme()} />);
-
-    expect(screen.queryByTestId('ansiLogLine')).toBeInTheDocument();
-    expect(screen.getAllByTestId('ansiLogLine')).toHaveLength(1);
-
-    expect(screen.getAllByTestId('ansiLogLine').at(0)).toHaveAttribute('style', expect.stringMatching('font-weight'));
-  });
-  it('renders string with ANSI dim code with appropriate themed color', () => {
-    const value = 'Lorem \u001B[1;2mIpsum';
-    const theme = createTheme();
-    render(<LogMessageAnsi value={value} theme={theme} />);
-
-    expect(screen.queryByTestId('ansiLogLine')).toBeInTheDocument();
-    expect(screen.getAllByTestId('ansiLogLine')).toHaveLength(1);
-
-    expect(screen.getAllByTestId('ansiLogLine').at(0)).toHaveStyle({ color: theme.colors.text.secondary });
-  });
-});
diff --git a/packages/grafana-ui/src/components/Logs/LogMessageAnsi.tsx b/packages/grafana-ui/src/components/Logs/LogMessageAnsi.tsx
deleted file mode 100644
index 0178098e851..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogMessageAnsi.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import ansicolor from 'ansicolor';
-import React, { PureComponent } from 'react';
-import Highlighter from 'react-highlight-words';
-
-import { findHighlightChunksInText, GrafanaTheme2 } from '@grafana/data';
-
-import { withTheme2 } from '../../themes';
-import { Themeable2 } from '../../types';
-
-interface Style {
-  [key: string]: string;
-}
-
-interface ParsedChunk {
-  style: Style;
-  text: string;
-}
-
-function convertCSSToStyle(theme: GrafanaTheme2, css: string): Style {
-  return css.split(/;\s*/).reduce<Style>((accumulated, line) => {
-    // The ansicolor package returns this color if the chunk has the ANSI dim
-    // style (`\e[2m`), but it is nearly unreadable in the dark theme, so we use
-    // GrafanaTheme2 instead to style it in a way that works across all themes.
-    if (line === 'color:rgba(0,0,0,0.5)') {
-      return { color: theme.colors.text.secondary };
-    }
-
-    const match = line.match(/([^:\s]+)\s*:\s*(.+)/);
-
-    if (match && match[1] && match[2]) {
-      const key = match[1].replace(/-([a-z])/g, (_, character) => character.toUpperCase());
-      accumulated[key] = match[2];
-    }
-
-    return accumulated;
-  }, {});
-}
-
-interface Props extends Themeable2 {
-  value: string;
-  highlight?: {
-    searchWords: string[];
-    highlightClassName: string;
-  };
-}
-
-interface State {
-  chunks: ParsedChunk[];
-  prevValue: string;
-}
-
-/** @deprecated will be removed in the next major version */
-export class UnThemedLogMessageAnsi extends PureComponent<Props, State> {
-  state: State = {
-    chunks: [],
-    prevValue: '',
-  };
-
-  static getDerivedStateFromProps(props: Props, state: State) {
-    if (props.value === state.prevValue) {
-      return null;
-    }
-
-    const parsed = ansicolor.parse(props.value);
-
-    return {
-      chunks: parsed.spans.map((span) => {
-        return span.css
-          ? {
-              style: convertCSSToStyle(props.theme, span.css),
-              text: span.text,
-            }
-          : { text: span.text };
-      }),
-      prevValue: props.value,
-    };
-  }
-
-  render() {
-    const { chunks } = this.state;
-
-    return chunks.map((chunk, index) => {
-      const chunkText = this.props.highlight?.searchWords ? (
-        <Highlighter
-          key={index}
-          textToHighlight={chunk.text}
-          searchWords={this.props.highlight.searchWords}
-          findChunks={findHighlightChunksInText}
-          highlightClassName={this.props.highlight.highlightClassName}
-        />
-      ) : (
-        chunk.text
-      );
-      return chunk.style ? (
-        <span key={index} style={chunk.style} data-testid="ansiLogLine">
-          {chunkText}
-        </span>
-      ) : (
-        chunkText
-      );
-    });
-  }
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogMessageAnsi = withTheme2(UnThemedLogMessageAnsi);
-LogMessageAnsi.displayName = 'LogMessageAnsi';
diff --git a/packages/grafana-ui/src/components/Logs/LogRow.tsx b/packages/grafana-ui/src/components/Logs/LogRow.tsx
deleted file mode 100644
index 909b2d495db..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogRow.tsx
+++ /dev/null
@@ -1,261 +0,0 @@
-import { cx, css } from '@emotion/css';
-import React, { PureComponent } from 'react';
-
-import {
-  Field,
-  LinkModel,
-  LogRowModel,
-  LogsSortOrder,
-  TimeZone,
-  DataQueryResponse,
-  dateTimeFormat,
-  checkLogsError,
-  escapeUnescapedString,
-  GrafanaTheme2,
-} from '@grafana/data';
-
-import { styleMixins, withTheme2 } from '../../themes/index';
-import { Themeable2 } from '../../types/theme';
-import { Icon } from '../Icon/Icon';
-import { Tooltip } from '../Tooltip/Tooltip';
-
-import { LogDetails } from './LogDetails';
-import { LogLabels } from './LogLabels';
-import {
-  LogRowContextRows,
-  LogRowContextQueryErrors,
-  HasMoreContextRows,
-  LogRowContextProvider,
-  RowContextOptions,
-} from './LogRowContextProvider';
-import { LogRowMessage } from './LogRowMessage';
-import { LogRowMessageDetectedFields } from './LogRowMessageDetectedFields';
-import { getLogRowStyles } from './getLogRowStyles';
-
-//Components
-
-interface Props extends Themeable2 {
-  row: LogRowModel;
-  showDuplicates: boolean;
-  showLabels: boolean;
-  showTime: boolean;
-  wrapLogMessage: boolean;
-  prettifyLogMessage: boolean;
-  timeZone: TimeZone;
-  enableLogDetails: boolean;
-  logsSortOrder?: LogsSortOrder | null;
-  forceEscape?: boolean;
-  showDetectedFields?: string[];
-  getRows: () => LogRowModel[];
-  onClickFilterLabel?: (key: string, value: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string) => void;
-  onContextClick?: () => void;
-  getRowContext: (row: LogRowModel, options?: RowContextOptions) => Promise<DataQueryResponse>;
-  getFieldLinks?: (field: Field, rowIndex: number) => Array<LinkModel<Field>>;
-  showContextToggle?: (row?: LogRowModel) => boolean;
-  onClickShowDetectedField?: (key: string) => void;
-  onClickHideDetectedField?: (key: string) => void;
-  onLogRowHover?: (row?: LogRowModel) => void;
-}
-
-interface State {
-  showContext: boolean;
-  showDetails: boolean;
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    topVerticalAlign: css`
-      label: topVerticalAlign;
-      margin-top: -${theme.spacing(0.9)};
-      margin-left: -${theme.spacing(0.25)};
-    `,
-    detailsOpen: css`
-      &:hover {
-        background-color: ${styleMixins.hoverColor(theme.colors.background.primary, theme)};
-      }
-    `,
-    errorLogRow: css`
-      label: erroredLogRow;
-      color: ${theme.colors.text.secondary};
-    `,
-  };
-};
-/**
- * Renders a log line.
- *
- * When user hovers over it for a certain time, it lazily parses the log line.
- * Once a parser is found, it will determine fields, that will be highlighted.
- * When the user requests stats for a field, they will be calculated and rendered below the row.
- */
-class UnThemedLogRow extends PureComponent<Props, State> {
-  state: State = {
-    showContext: false,
-    showDetails: false,
-  };
-
-  toggleContext = () => {
-    this.setState((state) => {
-      return {
-        showContext: !state.showContext,
-      };
-    });
-  };
-
-  toggleDetails = () => {
-    if (!this.props.enableLogDetails) {
-      return;
-    }
-    this.setState((state) => {
-      return {
-        showDetails: !state.showDetails,
-      };
-    });
-  };
-
-  renderTimeStamp(epochMs: number) {
-    return dateTimeFormat(epochMs, {
-      timeZone: this.props.timeZone,
-    });
-  }
-
-  renderLogRow(
-    context?: LogRowContextRows,
-    errors?: LogRowContextQueryErrors,
-    hasMoreContextRows?: HasMoreContextRows,
-    updateLimit?: () => void
-  ) {
-    const {
-      getRows,
-      onClickFilterLabel,
-      onClickFilterOutLabel,
-      onClickShowDetectedField,
-      onClickHideDetectedField,
-      enableLogDetails,
-      row,
-      showDuplicates,
-      showContextToggle,
-      showLabels,
-      showTime,
-      showDetectedFields,
-      wrapLogMessage,
-      prettifyLogMessage,
-      theme,
-      getFieldLinks,
-      forceEscape,
-      onLogRowHover,
-    } = this.props;
-    const { showDetails, showContext } = this.state;
-    const style = getLogRowStyles(theme, row.logLevel);
-    const styles = getStyles(theme);
-    const { errorMessage, hasError } = checkLogsError(row);
-    const logRowBackground = cx(style.logsRow, {
-      [styles.errorLogRow]: hasError,
-    });
-
-    const processedRow =
-      row.hasUnescapedContent && forceEscape
-        ? { ...row, entry: escapeUnescapedString(row.entry), raw: escapeUnescapedString(row.raw) }
-        : row;
-
-    return (
-      <>
-        <tr
-          className={logRowBackground}
-          onClick={this.toggleDetails}
-          onMouseEnter={() => {
-            onLogRowHover && onLogRowHover(row);
-          }}
-          onMouseLeave={() => {
-            onLogRowHover && onLogRowHover(undefined);
-          }}
-        >
-          {showDuplicates && (
-            <td className={style.logsRowDuplicates}>
-              {processedRow.duplicates && processedRow.duplicates > 0 ? `${processedRow.duplicates + 1}x` : null}
-            </td>
-          )}
-          <td className={cx({ [style.logsRowLevel]: !hasError })}>
-            {hasError && (
-              <Tooltip content={`Error: ${errorMessage}`} placement="right" theme="error">
-                <Icon className={style.logIconError} name="exclamation-triangle" size="xs" />
-              </Tooltip>
-            )}
-          </td>
-          {enableLogDetails && (
-            <td title={showDetails ? 'Hide log details' : 'See log details'} className={style.logsRowToggleDetails}>
-              <Icon className={styles.topVerticalAlign} name={showDetails ? 'angle-down' : 'angle-right'} />
-            </td>
-          )}
-          {showTime && <td className={style.logsRowLocalTime}>{this.renderTimeStamp(row.timeEpochMs)}</td>}
-          {showLabels && processedRow.uniqueLabels && (
-            <td className={style.logsRowLabels}>
-              <LogLabels labels={processedRow.uniqueLabels} />
-            </td>
-          )}
-          {showDetectedFields && showDetectedFields.length > 0 ? (
-            <LogRowMessageDetectedFields
-              row={processedRow}
-              showDetectedFields={showDetectedFields!}
-              getFieldLinks={getFieldLinks}
-              wrapLogMessage={wrapLogMessage}
-            />
-          ) : (
-            <LogRowMessage
-              row={processedRow}
-              getRows={getRows}
-              errors={errors}
-              hasMoreContextRows={hasMoreContextRows}
-              updateLimit={updateLimit}
-              context={context}
-              contextIsOpen={showContext}
-              showContextToggle={showContextToggle}
-              wrapLogMessage={wrapLogMessage}
-              prettifyLogMessage={prettifyLogMessage}
-              onToggleContext={this.toggleContext}
-            />
-          )}
-        </tr>
-        {this.state.showDetails && (
-          <LogDetails
-            className={logRowBackground}
-            showDuplicates={showDuplicates}
-            getFieldLinks={getFieldLinks}
-            onClickFilterLabel={onClickFilterLabel}
-            onClickFilterOutLabel={onClickFilterOutLabel}
-            onClickShowDetectedField={onClickShowDetectedField}
-            onClickHideDetectedField={onClickHideDetectedField}
-            getRows={getRows}
-            row={processedRow}
-            wrapLogMessage={wrapLogMessage}
-            hasError={hasError}
-            showDetectedFields={showDetectedFields}
-          />
-        )}
-      </>
-    );
-  }
-
-  render() {
-    const { showContext } = this.state;
-    const { logsSortOrder, row, getRowContext } = this.props;
-
-    if (showContext) {
-      return (
-        <>
-          <LogRowContextProvider row={row} getRowContext={getRowContext} logsSortOrder={logsSortOrder}>
-            {({ result, errors, hasMoreContextRows, updateLimit }) => {
-              return <>{this.renderLogRow(result, errors, hasMoreContextRows, updateLimit)}</>;
-            }}
-          </LogRowContextProvider>
-        </>
-      );
-    }
-
-    return this.renderLogRow();
-  }
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogRow = withTheme2(UnThemedLogRow);
-LogRow.displayName = 'LogRow';
diff --git a/packages/grafana-ui/src/components/Logs/LogRowContext.test.tsx b/packages/grafana-ui/src/components/Logs/LogRowContext.test.tsx
deleted file mode 100644
index b63d7f8f791..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogRowContext.test.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { LogRowModel } from '@grafana/data';
-
-import { LogRowContextGroup } from './LogRowContext';
-
-describe('LogRowContextGroup component', () => {
-  it('should correctly render logs with ANSI', () => {
-    const defaultProps = {
-      rows: ['Log 1 with \u001B[31mANSI\u001B[0m code', 'Log 2', 'Log 3 with \u001B[31mANSI\u001B[0m code'],
-      onLoadMoreContext: () => {},
-      canLoadMoreRows: false,
-      row: {} as LogRowModel,
-      className: '',
-    };
-
-    render(
-      <div>
-        <LogRowContextGroup {...defaultProps} />
-      </div>
-    );
-    expect(screen.getAllByTestId('ansiLogLine')).toHaveLength(2);
-  });
-});
diff --git a/packages/grafana-ui/src/components/Logs/LogRowContext.tsx b/packages/grafana-ui/src/components/Logs/LogRowContext.tsx
deleted file mode 100644
index b7596cf844e..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogRowContext.tsx
+++ /dev/null
@@ -1,237 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { useRef, useState, useLayoutEffect, useEffect } from 'react';
-
-import { GrafanaTheme2, DataQueryError, LogRowModel, textUtil } from '@grafana/data';
-
-import { useStyles2 } from '../../themes/ThemeContext';
-import { Alert } from '../Alert/Alert';
-import { ClickOutsideWrapper } from '../ClickOutsideWrapper/ClickOutsideWrapper';
-import { CustomScrollbar } from '../CustomScrollbar/CustomScrollbar';
-import { List } from '../List/List';
-
-import { LogMessageAnsi } from './LogMessageAnsi';
-import { LogRowContextRows, LogRowContextQueryErrors, HasMoreContextRows } from './LogRowContextProvider';
-
-interface LogRowContextProps {
-  row: LogRowModel;
-  context: LogRowContextRows;
-  wrapLogMessage: boolean;
-  errors?: LogRowContextQueryErrors;
-  hasMoreContextRows?: HasMoreContextRows;
-  onOutsideClick: () => void;
-  onLoadMoreContext: () => void;
-}
-
-const getLogRowContextStyles = (theme: GrafanaTheme2, wrapLogMessage?: boolean) => {
-  /**
-   * This is workaround for displaying uncropped context when we have unwrapping log messages.
-   * We are using margins to correctly position context. Because non-wrapped logs have always 1 line of log
-   * and 1 line of Show/Hide context switch. Therefore correct position can be reliably achieved by margins.
-   * We also adjust width to 75%.
-   */
-
-  const afterContext = wrapLogMessage
-    ? css`
-        top: -250px;
-      `
-    : css`
-        margin-top: -250px;
-        width: 75%;
-      `;
-
-  const beforeContext = wrapLogMessage
-    ? css`
-        top: 100%;
-      `
-    : css`
-        margin-top: 40px;
-        width: 75%;
-      `;
-  return {
-    commonStyles: css`
-      position: absolute;
-      height: 250px;
-      z-index: ${theme.zIndex.dropdown};
-      overflow: hidden;
-      background: ${theme.colors.background.primary};
-      box-shadow: 0 0 10px ${theme.v1.palette.black};
-      border: 1px solid ${theme.colors.background.secondary};
-      border-radius: ${theme.shape.borderRadius()};
-      width: 100%;
-    `,
-    header: css`
-      height: 30px;
-      padding: 0 10px;
-      display: flex;
-      align-items: center;
-      background: ${theme.colors.background.secondary};
-    `,
-    logs: css`
-      height: 220px;
-      padding: 10px;
-    `,
-    afterContext,
-    beforeContext,
-  };
-};
-
-interface LogRowContextGroupHeaderProps {
-  row: LogRowModel;
-  rows: Array<string | DataQueryError>;
-  onLoadMoreContext: () => void;
-  shouldScrollToBottom?: boolean;
-  canLoadMoreRows?: boolean;
-}
-interface LogRowContextGroupProps extends LogRowContextGroupHeaderProps {
-  rows: Array<string | DataQueryError>;
-  className?: string;
-  error?: string;
-}
-
-const LogRowContextGroupHeader = ({ row, rows, onLoadMoreContext, canLoadMoreRows }: LogRowContextGroupHeaderProps) => {
-  const { header } = useStyles2(getLogRowContextStyles);
-
-  return (
-    <div className={header}>
-      <span
-        className={css`
-          opacity: 0.6;
-        `}
-      >
-        Found {rows.length} rows.
-      </span>
-      {(rows.length >= 10 || (rows.length > 10 && rows.length % 10 !== 0)) && canLoadMoreRows && (
-        <span
-          className={css`
-            margin-left: 10px;
-            &:hover {
-              text-decoration: underline;
-              cursor: pointer;
-            }
-          `}
-          onClick={onLoadMoreContext}
-        >
-          Load 10 more
-        </span>
-      )}
-    </div>
-  );
-};
-
-/** @deprecated will be removed in the next major version */
-export const LogRowContextGroup = ({
-  row,
-  rows,
-  error,
-  className,
-  shouldScrollToBottom,
-  canLoadMoreRows,
-  onLoadMoreContext,
-}: LogRowContextGroupProps) => {
-  const { commonStyles, logs } = useStyles2(getLogRowContextStyles);
-  const [scrollTop, setScrollTop] = useState(0);
-  const listContainerRef = useRef<HTMLDivElement>(null);
-
-  useLayoutEffect(() => {
-    // We want to scroll to bottom only when we receive first 10 log lines
-    const shouldScrollRows = rows.length > 0 && rows.length <= 10;
-    if (shouldScrollToBottom && shouldScrollRows && listContainerRef.current) {
-      setScrollTop(listContainerRef.current.offsetHeight);
-    }
-  }, [shouldScrollToBottom, rows]);
-
-  const headerProps = {
-    row,
-    rows,
-    onLoadMoreContext,
-    canLoadMoreRows,
-  };
-
-  return (
-    <div className={cx(commonStyles, className)}>
-      {/* When displaying "after" context */}
-      {shouldScrollToBottom && !error && <LogRowContextGroupHeader {...headerProps} />}
-      <div className={logs}>
-        <CustomScrollbar autoHide scrollTop={scrollTop} autoHeightMin={'210px'}>
-          <div ref={listContainerRef}>
-            {!error && (
-              <List
-                items={rows}
-                renderItem={(item) => {
-                  const message = typeof item === 'string' ? item : item.message ?? '';
-                  return (
-                    <div
-                      className={css`
-                        padding: 5px 0;
-                      `}
-                    >
-                      {textUtil.hasAnsiCodes(message) ? <LogMessageAnsi value={message} /> : message}
-                    </div>
-                  );
-                }}
-              />
-            )}
-            {error && <Alert title={error} />}
-          </div>
-        </CustomScrollbar>
-      </div>
-      {/* When displaying "before" context */}
-      {!shouldScrollToBottom && !error && <LogRowContextGroupHeader {...headerProps} />}
-    </div>
-  );
-};
-
-/** @deprecated will be removed in the next major version */
-export const LogRowContext = ({
-  row,
-  context,
-  errors,
-  onOutsideClick,
-  onLoadMoreContext,
-  hasMoreContextRows,
-  wrapLogMessage,
-}: LogRowContextProps) => {
-  useEffect(() => {
-    const handleEscKeyDown = (e: KeyboardEvent): void => {
-      if (e.keyCode === 27) {
-        onOutsideClick();
-      }
-    };
-    document.addEventListener('keydown', handleEscKeyDown, false);
-    return () => {
-      document.removeEventListener('keydown', handleEscKeyDown, false);
-    };
-  }, [onOutsideClick]);
-  const { afterContext, beforeContext } = useStyles2((theme) => getLogRowContextStyles(theme, wrapLogMessage));
-
-  return (
-    <ClickOutsideWrapper onClick={onOutsideClick}>
-      {/* e.stopPropagation is necessary so the log details doesn't open when clicked on log line in context
-       * and/or when context log line is being highlighted */}
-      <div onClick={(e) => e.stopPropagation()}>
-        {context.after && (
-          <LogRowContextGroup
-            rows={context.after}
-            error={errors && errors.after}
-            row={row}
-            className={afterContext}
-            shouldScrollToBottom
-            canLoadMoreRows={hasMoreContextRows ? hasMoreContextRows.after : false}
-            onLoadMoreContext={onLoadMoreContext}
-          />
-        )}
-
-        {context.before && (
-          <LogRowContextGroup
-            onLoadMoreContext={onLoadMoreContext}
-            canLoadMoreRows={hasMoreContextRows ? hasMoreContextRows.before : false}
-            row={row}
-            rows={context.before}
-            error={errors && errors.before}
-            className={beforeContext}
-          />
-        )}
-      </div>
-    </ClickOutsideWrapper>
-  );
-};
diff --git a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx b/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx
deleted file mode 100644
index 5e1d029a0fd..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import { useState, useEffect } from 'react';
-import useAsync from 'react-use/lib/useAsync';
-
-import {
-  LogRowModel,
-  toDataFrame,
-  Field,
-  FieldCache,
-  LogsSortOrder,
-  DataQueryResponse,
-  DataQueryError,
-} from '@grafana/data';
-
-/** @deprecated will be removed in the next major version */
-export interface RowContextOptions {
-  direction?: 'BACKWARD' | 'FORWARD';
-  limit?: number;
-}
-
-/** @deprecated will be removed in the next major version */
-export interface LogRowContextRows {
-  before?: string[];
-  after?: string[];
-}
-
-/** @deprecated will be removed in the next major version */
-export interface LogRowContextQueryErrors {
-  before?: string;
-  after?: string;
-}
-
-/** @deprecated will be removed in the next major version */
-export interface HasMoreContextRows {
-  before: boolean;
-  after: boolean;
-}
-
-interface ResultType {
-  data: string[][];
-  errors: string[];
-}
-
-interface LogRowContextProviderProps {
-  row: LogRowModel;
-  logsSortOrder?: LogsSortOrder | null;
-  getRowContext: (row: LogRowModel, options?: RowContextOptions) => Promise<DataQueryResponse>;
-  children: (props: {
-    result: LogRowContextRows;
-    errors: LogRowContextQueryErrors;
-    hasMoreContextRows: HasMoreContextRows;
-    updateLimit: () => void;
-    limit: number;
-  }) => JSX.Element;
-}
-
-/** @deprecated will be removed in the next major version */
-export const getRowContexts = async (
-  getRowContext: (row: LogRowModel, options?: RowContextOptions) => Promise<DataQueryResponse>,
-  row: LogRowModel,
-  limit: number,
-  logsSortOrder?: LogsSortOrder | null
-) => {
-  const promises = [
-    getRowContext(row, {
-      limit,
-    }),
-    getRowContext(row, {
-      // The start time is inclusive so we will get the one row we are using as context entry
-      limit: limit + 1,
-      direction: 'FORWARD',
-    }),
-  ];
-
-  const results: Array<DataQueryResponse | DataQueryError> = await Promise.all(promises.map((p) => p.catch((e) => e)));
-
-  const data = results.map((result) => {
-    const dataResult: DataQueryResponse = result as DataQueryResponse;
-    if (!dataResult.data) {
-      return [];
-    }
-
-    const data = [];
-    for (let index = 0; index < dataResult.data.length; index++) {
-      const dataFrame = toDataFrame(dataResult.data[index]);
-      const fieldCache = new FieldCache(dataFrame);
-      const timestampField: Field<string> = fieldCache.getFieldByName('ts')!;
-      const idField: Field<string> | undefined = fieldCache.getFieldByName('id');
-
-      for (let fieldIndex = 0; fieldIndex < timestampField.values.length; fieldIndex++) {
-        // TODO: this filtering is datasource dependant so it will make sense to move it there so the API is
-        //  to return correct list of lines handling inclusive ranges or how to filter the correct line on the
-        //  datasource.
-
-        // Filter out the row that is the one used as a focal point for the context as we will get it in one of the
-        // requests.
-        if (idField) {
-          // For Loki this means we filter only the one row. Issue is we could have other rows logged at the same
-          // ns which came before but they come in the response that search for logs after. This means right now
-          // we will show those as if they came after. This is not strictly correct but seems better than losing them
-          // and making this correct would mean quite a bit of complexity to shuffle things around and messing up
-          //counts.
-          if (idField.values.get(fieldIndex) === row.uid) {
-            continue;
-          }
-        } else {
-          // Fallback to timestamp. This should not happen right now as this feature is implemented only for loki
-          // and that has ID. Later this branch could be used in other DS but mind that this could also filter out
-          // logs which were logged in the same timestamp and that can be a problem depending on the precision.
-          if (parseInt(timestampField.values.get(fieldIndex), 10) === row.timeEpochMs) {
-            continue;
-          }
-        }
-
-        const lineField: Field<string> = dataFrame.fields.filter((field) => field.name === 'line')[0];
-        const line = lineField.values.get(fieldIndex); // assuming that both fields have same length
-
-        data.push(line);
-      }
-    }
-
-    return logsSortOrder === LogsSortOrder.Ascending ? data.reverse() : data;
-  });
-
-  const errors = results.map((result) => {
-    const errorResult: DataQueryError = result as DataQueryError;
-    if (!errorResult.message) {
-      return '';
-    }
-
-    return errorResult.message;
-  });
-
-  return {
-    data: logsSortOrder === LogsSortOrder.Ascending ? data.reverse() : data,
-    errors: logsSortOrder === LogsSortOrder.Ascending ? errors.reverse() : errors,
-  };
-};
-
-/** @deprecated will be removed in the next major version */
-export const LogRowContextProvider = ({ getRowContext, row, children, logsSortOrder }: LogRowContextProviderProps) => {
-  // React Hook that creates a number state value called limit to component state and a setter function called setLimit
-  // The initial value for limit is 10
-  // Used for the number of rows to retrieve from backend from a specific point in time
-  const [limit, setLimit] = useState(10);
-
-  // React Hook that creates an object state value called result to component state and a setter function called setResult
-  // The initial value for result is null
-  // Used for sorting the response from backend
-  const [result, setResult] = useState<ResultType | null>(null);
-
-  // React Hook that creates an object state value called hasMoreContextRows to component state and a setter function called setHasMoreContextRows
-  // The initial value for hasMoreContextRows is {before: true, after: true}
-  // Used for indicating in UI if there are more rows to load in a given direction
-  const [hasMoreContextRows, setHasMoreContextRows] = useState({
-    before: true,
-    after: true,
-  });
-
-  // React Hook that resolves two promises every time the limit prop changes
-  // First promise fetches limit number of rows backwards in time from a specific point in time
-  // Second promise fetches limit number of rows forwards in time from a specific point in time
-  const { value } = useAsync(async () => {
-    return await getRowContexts(getRowContext, row, limit, logsSortOrder); // Moved it to a separate function for debugging purposes
-  }, [limit]);
-
-  // React Hook that performs a side effect every time the value (from useAsync hook) prop changes
-  // The side effect changes the result state with the response from the useAsync hook
-  // The side effect changes the hasMoreContextRows state if there are more context rows before or after the current result
-  useEffect(() => {
-    if (value) {
-      setResult((currentResult) => {
-        let hasMoreLogsBefore = true,
-          hasMoreLogsAfter = true;
-
-        if (currentResult) {
-          const currentResultBefore = currentResult.data[0];
-          const currentResultAfter = currentResult.data[1];
-          const valueBefore = value.data[0];
-          const valueAfter = value.data[1];
-
-          // checks if there are more log rows in a given direction
-          // if after fetching additional rows the length of result is the same,
-          // we can assume there are no logs in that direction within a given time range
-          if (!valueBefore || currentResultBefore.length === valueBefore.length) {
-            hasMoreLogsBefore = false;
-          }
-
-          if (!valueAfter || currentResultAfter.length === valueAfter.length) {
-            hasMoreLogsAfter = false;
-          }
-        }
-
-        setHasMoreContextRows({
-          before: hasMoreLogsBefore,
-          after: hasMoreLogsAfter,
-        });
-
-        return value;
-      });
-    }
-  }, [value]);
-
-  return children({
-    result: {
-      before: result ? result.data[0] : [],
-      after: result ? result.data[1] : [],
-    },
-    errors: {
-      before: result ? result.errors[0] : undefined,
-      after: result ? result.errors[1] : undefined,
-    },
-    hasMoreContextRows,
-    updateLimit: () => setLimit(limit + 10),
-    limit,
-  });
-};
diff --git a/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx b/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx
deleted file mode 100644
index ff6580355d4..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import { css, cx } from '@emotion/css';
-import memoizeOne from 'memoize-one';
-import React, { PureComponent } from 'react';
-import Highlighter from 'react-highlight-words';
-import tinycolor from 'tinycolor2';
-
-import { LogRowModel, findHighlightChunksInText, GrafanaTheme2 } from '@grafana/data';
-
-import { withTheme2 } from '../../themes/index';
-import { Themeable2 } from '../../types/theme';
-import { IconButton } from '../IconButton/IconButton';
-import { Tooltip } from '../Tooltip/Tooltip';
-
-import { LogMessageAnsi } from './LogMessageAnsi';
-import { LogRowContext } from './LogRowContext';
-import { LogRowContextQueryErrors, HasMoreContextRows, LogRowContextRows } from './LogRowContextProvider';
-import { getLogRowStyles } from './getLogRowStyles';
-
-/** @deprecated will be removed in the next major version */
-export const MAX_CHARACTERS = 100000;
-
-interface Props extends Themeable2 {
-  row: LogRowModel;
-  hasMoreContextRows?: HasMoreContextRows;
-  contextIsOpen: boolean;
-  wrapLogMessage: boolean;
-  prettifyLogMessage: boolean;
-  errors?: LogRowContextQueryErrors;
-  context?: LogRowContextRows;
-  showContextToggle?: (row?: LogRowModel) => boolean;
-  getRows: () => LogRowModel[];
-  onToggleContext: () => void;
-  updateLimit?: () => void;
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  const outlineColor = tinycolor(theme.components.dashboard.background).setAlpha(0.7).toRgbString();
-
-  return {
-    positionRelative: css`
-      label: positionRelative;
-      position: relative;
-    `,
-    rowWithContext: css`
-      label: rowWithContext;
-      z-index: 1;
-      outline: 9999px solid ${outlineColor};
-    `,
-    horizontalScroll: css`
-      label: verticalScroll;
-      white-space: pre;
-    `,
-    contextNewline: css`
-      display: block;
-      margin-left: 0px;
-    `,
-    contextButton: css`
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-      align-content: flex-end;
-      justify-content: space-evenly;
-      align-items: center;
-      position: absolute;
-      right: -8px;
-      top: 0;
-      bottom: auto;
-      width: 80px;
-      height: 36px;
-      background: ${theme.colors.background.primary};
-      box-shadow: ${theme.shadows.z3};
-      padding: ${theme.spacing(0, 0, 0, 0.5)};
-      z-index: 100;
-    `,
-  };
-};
-
-function renderLogMessage(
-  hasAnsi: boolean,
-  entry: string,
-  highlights: string[] | undefined,
-  highlightClassName: string
-) {
-  const needsHighlighter =
-    highlights && highlights.length > 0 && highlights[0] && highlights[0].length > 0 && entry.length < MAX_CHARACTERS;
-  const searchWords = highlights ?? [];
-  if (hasAnsi) {
-    const highlight = needsHighlighter ? { searchWords, highlightClassName } : undefined;
-    return <LogMessageAnsi value={entry} highlight={highlight} />;
-  } else if (needsHighlighter) {
-    return (
-      <Highlighter
-        textToHighlight={entry}
-        searchWords={searchWords}
-        findChunks={findHighlightChunksInText}
-        highlightClassName={highlightClassName}
-      />
-    );
-  } else {
-    return entry;
-  }
-}
-
-const restructureLog = memoizeOne((line: string, prettifyLogMessage: boolean): string => {
-  if (prettifyLogMessage) {
-    try {
-      return JSON.stringify(JSON.parse(line), undefined, 2);
-    } catch (error) {
-      return line;
-    }
-  }
-  return line;
-});
-
-class UnThemedLogRowMessage extends PureComponent<Props> {
-  onContextToggle = (e: React.SyntheticEvent<HTMLElement>) => {
-    e.stopPropagation();
-    this.props.onToggleContext();
-  };
-
-  render() {
-    const {
-      row,
-      theme,
-      errors,
-      hasMoreContextRows,
-      updateLimit,
-      context,
-      contextIsOpen,
-      showContextToggle,
-      wrapLogMessage,
-      prettifyLogMessage,
-      onToggleContext,
-    } = this.props;
-
-    const style = getLogRowStyles(theme, row.logLevel);
-    const { hasAnsi, raw } = row;
-    const restructuredEntry = restructureLog(raw, prettifyLogMessage);
-    const styles = getStyles(theme);
-
-    return (
-      // When context is open, the position has to be NOT relative.
-      // Setting the postion as inline-style to overwrite the more sepecific style definition from `style.logsRowMessage`.
-      <td style={contextIsOpen ? { position: 'unset' } : undefined} className={style.logsRowMessage}>
-        <div
-          className={cx({ [styles.positionRelative]: wrapLogMessage }, { [styles.horizontalScroll]: !wrapLogMessage })}
-        >
-          {contextIsOpen && context && (
-            <LogRowContext
-              row={row}
-              context={context}
-              errors={errors}
-              wrapLogMessage={wrapLogMessage}
-              hasMoreContextRows={hasMoreContextRows}
-              onOutsideClick={onToggleContext}
-              onLoadMoreContext={() => {
-                if (updateLimit) {
-                  updateLimit();
-                }
-              }}
-            />
-          )}
-          <span className={cx(styles.positionRelative, { [styles.rowWithContext]: contextIsOpen })}>
-            {renderLogMessage(hasAnsi, restructuredEntry, row.searchWords, style.logsRowMatchHighLight)}
-          </span>
-          {!contextIsOpen && showContextToggle?.(row) && (
-            <span
-              className={cx('log-row-context', style.context, styles.contextButton)}
-              onClick={(e) => e.stopPropagation()}
-            >
-              <Tooltip placement="top" content={'Show context'}>
-                <IconButton size="md" name="gf-show-context" onClick={this.onContextToggle} />
-              </Tooltip>
-              <Tooltip placement="top" content={'Copy'}>
-                <IconButton
-                  size="md"
-                  name="copy"
-                  onClick={() => navigator.clipboard.writeText(JSON.stringify(restructuredEntry))}
-                />
-              </Tooltip>
-            </span>
-          )}
-        </div>
-      </td>
-    );
-  }
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogRowMessage = withTheme2(UnThemedLogRowMessage);
-LogRowMessage.displayName = 'LogRowMessage';
diff --git a/packages/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx b/packages/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx
deleted file mode 100644
index 6fae34e6d6e..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { css } from '@emotion/css';
-import React, { PureComponent } from 'react';
-
-import { LogRowModel, Field, LinkModel } from '@grafana/data';
-
-import { withTheme2 } from '../../themes/index';
-import { Themeable2 } from '../../types/theme';
-
-import { getAllFields } from './logParser';
-
-/** @deprecated will be removed in the next major version */
-export interface Props extends Themeable2 {
-  row: LogRowModel;
-  showDetectedFields: string[];
-  wrapLogMessage: boolean;
-  getFieldLinks?: (field: Field, rowIndex: number) => Array<LinkModel<Field>>;
-}
-
-class UnThemedLogRowMessageDetectedFields extends PureComponent<Props> {
-  render() {
-    const { row, showDetectedFields, getFieldLinks, wrapLogMessage } = this.props;
-    const fields = getAllFields(row, getFieldLinks);
-    const wrapClassName = wrapLogMessage
-      ? ''
-      : css`
-          white-space: nowrap;
-        `;
-
-    const line = showDetectedFields
-      .map((parsedKey) => {
-        const field = fields.find((field) => {
-          const { key } = field;
-          return key === parsedKey;
-        });
-
-        if (field) {
-          return `${parsedKey}=${field.value}`;
-        }
-
-        return null;
-      })
-      .filter((s) => s !== null)
-      .join(' ');
-
-    return <td className={wrapClassName}>{line}</td>;
-  }
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogRowMessageDetectedFields = withTheme2(UnThemedLogRowMessageDetectedFields);
-LogRowMessageDetectedFields.displayName = 'LogRowMessageDetectedFields';
diff --git a/packages/grafana-ui/src/components/Logs/LogRows.tsx b/packages/grafana-ui/src/components/Logs/LogRows.tsx
deleted file mode 100644
index 1d7896f4189..00000000000
--- a/packages/grafana-ui/src/components/Logs/LogRows.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-import memoizeOne from 'memoize-one';
-import React, { PureComponent } from 'react';
-
-import { TimeZone, LogsDedupStrategy, LogRowModel, Field, LinkModel, LogsSortOrder, sortLogRows } from '@grafana/data';
-
-import { withTheme2 } from '../../themes/index';
-import { Themeable2 } from '../../types/theme';
-
-import { LogRow } from './LogRow';
-import { RowContextOptions } from './LogRowContextProvider';
-import { getLogRowStyles } from './getLogRowStyles';
-
-/** @deprecated will be removed in the next major version */
-export const PREVIEW_LIMIT = 100;
-
-/** @deprecated will be removed in the next major version */
-export interface Props extends Themeable2 {
-  logRows?: LogRowModel[];
-  deduplicatedRows?: LogRowModel[];
-  dedupStrategy: LogsDedupStrategy;
-  showLabels: boolean;
-  showTime: boolean;
-  wrapLogMessage: boolean;
-  prettifyLogMessage: boolean;
-  timeZone: TimeZone;
-  enableLogDetails: boolean;
-  logsSortOrder?: LogsSortOrder | null;
-  previewLimit?: number;
-  forceEscape?: boolean;
-  showDetectedFields?: string[];
-  showContextToggle?: (row?: LogRowModel) => boolean;
-  onClickFilterLabel?: (key: string, value: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string) => void;
-  getRowContext?: (row: LogRowModel, options?: RowContextOptions) => Promise<any>;
-  getFieldLinks?: (field: Field, rowIndex: number) => Array<LinkModel<Field>>;
-  onClickShowDetectedField?: (key: string) => void;
-  onClickHideDetectedField?: (key: string) => void;
-  onLogRowHover?: (row?: LogRowModel) => void;
-}
-
-interface State {
-  renderAll: boolean;
-}
-
-class UnThemedLogRows extends PureComponent<Props, State> {
-  renderAllTimer: number | null = null;
-
-  static defaultProps = {
-    previewLimit: PREVIEW_LIMIT,
-  };
-
-  state: State = {
-    renderAll: false,
-  };
-
-  componentDidMount() {
-    // Staged rendering
-    const { logRows, previewLimit } = this.props;
-    const rowCount = logRows ? logRows.length : 0;
-    // Render all right away if not too far over the limit
-    const renderAll = rowCount <= previewLimit! * 2;
-    if (renderAll) {
-      this.setState({ renderAll });
-    } else {
-      this.renderAllTimer = window.setTimeout(() => this.setState({ renderAll: true }), 2000);
-    }
-  }
-
-  componentWillUnmount() {
-    if (this.renderAllTimer) {
-      clearTimeout(this.renderAllTimer);
-    }
-  }
-
-  makeGetRows = memoizeOne((orderedRows: LogRowModel[]) => {
-    return () => orderedRows;
-  });
-
-  sortLogs = memoizeOne((logRows: LogRowModel[], logsSortOrder: LogsSortOrder): LogRowModel[] =>
-    sortLogRows(logRows, logsSortOrder)
-  );
-
-  render() {
-    const {
-      dedupStrategy,
-      showContextToggle,
-      showLabels,
-      showTime,
-      wrapLogMessage,
-      prettifyLogMessage,
-      logRows,
-      deduplicatedRows,
-      timeZone,
-      onClickFilterLabel,
-      onClickFilterOutLabel,
-      theme,
-      enableLogDetails,
-      previewLimit,
-      getFieldLinks,
-      logsSortOrder,
-      showDetectedFields,
-      onClickShowDetectedField,
-      onClickHideDetectedField,
-      forceEscape,
-      onLogRowHover,
-    } = this.props;
-    const { renderAll } = this.state;
-    const { logsRowsTable } = getLogRowStyles(theme);
-    const dedupedRows = deduplicatedRows ? deduplicatedRows : logRows;
-    const hasData = logRows && logRows.length > 0;
-    const dedupCount = dedupedRows
-      ? dedupedRows.reduce((sum, row) => (row.duplicates ? sum + row.duplicates : sum), 0)
-      : 0;
-    const showDuplicates = dedupStrategy !== LogsDedupStrategy.none && dedupCount > 0;
-    // Staged rendering
-    const processedRows = dedupedRows ? dedupedRows : [];
-    const orderedRows = logsSortOrder ? this.sortLogs(processedRows, logsSortOrder) : processedRows;
-    const firstRows = orderedRows.slice(0, previewLimit!);
-    const lastRows = orderedRows.slice(previewLimit!, orderedRows.length);
-
-    // React profiler becomes unusable if we pass all rows to all rows and their labels, using getter instead
-    const getRows = this.makeGetRows(orderedRows);
-    const getRowContext = this.props.getRowContext ? this.props.getRowContext : () => Promise.resolve([]);
-
-    return (
-      <table className={logsRowsTable}>
-        <tbody>
-          {hasData &&
-            firstRows.map((row, index) => (
-              <LogRow
-                key={row.uid}
-                getRows={getRows}
-                getRowContext={getRowContext}
-                row={row}
-                showContextToggle={showContextToggle}
-                showDuplicates={showDuplicates}
-                showLabels={showLabels}
-                showTime={showTime}
-                showDetectedFields={showDetectedFields}
-                wrapLogMessage={wrapLogMessage}
-                prettifyLogMessage={prettifyLogMessage}
-                timeZone={timeZone}
-                enableLogDetails={enableLogDetails}
-                onClickFilterLabel={onClickFilterLabel}
-                onClickFilterOutLabel={onClickFilterOutLabel}
-                onClickShowDetectedField={onClickShowDetectedField}
-                onClickHideDetectedField={onClickHideDetectedField}
-                getFieldLinks={getFieldLinks}
-                logsSortOrder={logsSortOrder}
-                forceEscape={forceEscape}
-                onLogRowHover={onLogRowHover}
-              />
-            ))}
-          {hasData &&
-            renderAll &&
-            lastRows.map((row, index) => (
-              <LogRow
-                key={row.uid}
-                getRows={getRows}
-                getRowContext={getRowContext}
-                row={row}
-                showContextToggle={showContextToggle}
-                showDuplicates={showDuplicates}
-                showLabels={showLabels}
-                showTime={showTime}
-                showDetectedFields={showDetectedFields}
-                wrapLogMessage={wrapLogMessage}
-                prettifyLogMessage={prettifyLogMessage}
-                timeZone={timeZone}
-                enableLogDetails={enableLogDetails}
-                onClickFilterLabel={onClickFilterLabel}
-                onClickFilterOutLabel={onClickFilterOutLabel}
-                onClickShowDetectedField={onClickShowDetectedField}
-                onClickHideDetectedField={onClickHideDetectedField}
-                getFieldLinks={getFieldLinks}
-                logsSortOrder={logsSortOrder}
-                forceEscape={forceEscape}
-                onLogRowHover={onLogRowHover}
-              />
-            ))}
-          {hasData && !renderAll && (
-            <tr>
-              <td colSpan={5}>Rendering {orderedRows.length - previewLimit!} rows...</td>
-            </tr>
-          )}
-        </tbody>
-      </table>
-    );
-  }
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogRows = withTheme2(UnThemedLogRows);
-LogRows.displayName = 'LogsRows';
diff --git a/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts b/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts
deleted file mode 100644
index 34ac2253f80..00000000000
--- a/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { css } from '@emotion/css';
-
-import { GrafanaTheme2, LogLevel } from '@grafana/data';
-
-import { styleMixins } from '../../themes';
-
-/** @deprecated will be removed in the next major version */
-export const getLogRowStyles = (theme: GrafanaTheme2, logLevel?: LogLevel) => {
-  let logColor = theme.isLight ? theme.v1.palette.gray5 : theme.v1.palette.gray2;
-  const hoverBgColor = styleMixins.hoverColor(theme.colors.background.secondary, theme);
-
-  switch (logLevel) {
-    case LogLevel.crit:
-    case LogLevel.critical:
-      logColor = '#705da0';
-      break;
-    case LogLevel.error:
-    case LogLevel.err:
-      logColor = '#e24d42';
-      break;
-    case LogLevel.warning:
-    case LogLevel.warn:
-      logColor = theme.colors.warning.main;
-      break;
-    case LogLevel.info:
-      logColor = '#7eb26d';
-      break;
-    case LogLevel.debug:
-      logColor = '#1f78c1';
-      break;
-    case LogLevel.trace:
-      logColor = '#6ed0e0';
-      break;
-  }
-
-  return {
-    logsRowMatchHighLight: css`
-      label: logs-row__match-highlight;
-      background: inherit;
-      padding: inherit;
-      color: ${theme.components.textHighlight.text}
-      background-color: ${theme.components.textHighlight};
-    `,
-    logsRowsTable: css`
-      label: logs-rows;
-      font-family: ${theme.typography.fontFamilyMonospace};
-      font-size: ${theme.typography.bodySmall.fontSize};
-      width: 100%;
-    `,
-    context: css`
-      label: context;
-      visibility: hidden;
-      white-space: nowrap;
-      position: relative;
-      margin-left: 10px;
-    `,
-    logsRow: css`
-      label: logs-row;
-      width: 100%;
-      cursor: pointer;
-      vertical-align: top;
-
-      &:hover {
-        .log-row-context {
-          visibility: visible;
-          z-index: 1;
-          text-decoration: underline;
-          &:hover {
-            color: ${theme.colors.warning.main};
-          }
-        }
-      }
-
-      td:last-child {
-        width: 100%;
-      }
-
-      > td {
-        position: relative;
-        padding-right: ${theme.spacing(1)};
-        border-top: 1px solid transparent;
-        border-bottom: 1px solid transparent;
-        height: 100%;
-      }
-
-      &:hover {
-        background: ${hoverBgColor};
-      }
-    `,
-    logsRowDuplicates: css`
-      label: logs-row__duplicates;
-      text-align: right;
-      width: 4em;
-      cursor: default;
-    `,
-    logsRowLevel: css`
-      label: logs-row__level;
-      max-width: 10px;
-      cursor: default;
-      &::after {
-        content: '';
-        display: block;
-        position: absolute;
-        top: 1px;
-        bottom: 1px;
-        width: 3px;
-        left: 4px;
-        background-color: ${logColor};
-      }
-    `,
-    logIconError: css`
-      color: ${theme.colors.warning.main};
-    `,
-    logsRowToggleDetails: css`
-      label: logs-row-toggle-details__level;
-      font-size: 9px;
-      padding-top: 5px;
-      max-width: 15px;
-    `,
-    logsRowLocalTime: css`
-      label: logs-row__localtime;
-      white-space: nowrap;
-    `,
-    logsRowLabels: css`
-      label: logs-row__labels;
-      white-space: nowrap;
-      max-width: 22em;
-
-      /* This is to make the labels vertical align */
-      > span {
-        margin-top: 0.75px;
-      }
-    `,
-    logsRowMessage: css`
-      label: logs-row__message;
-      white-space: pre-wrap;
-      word-break: break-all;
-    `,
-    //Log details specific CSS
-    logDetailsContainer: css`
-      label: logs-row-details-table;
-      border: 1px solid ${theme.colors.border.medium};
-      padding: 0 ${theme.spacing(1)} ${theme.spacing(1)};
-      border-radius: ${theme.shape.radius.default};
-      margin: 20px 8px 20px 16px;
-      cursor: default;
-    `,
-    logDetailsTable: css`
-      label: logs-row-details-table;
-      line-height: 18px;
-      width: 100%;
-      td:last-child {
-        width: 100%;
-      }
-    `,
-    logsDetailsIcon: css`
-      label: logs-row-details__icon;
-      position: relative;
-      color: ${theme.v1.palette.gray3};
-      padding-top: 6px;
-      padding-left: 6px;
-    `,
-    logDetailsLabel: css`
-      label: logs-row-details__label;
-      max-width: 30em;
-      min-width: 20em;
-      padding: 0 ${theme.spacing(1)};
-      overflow-wrap: break-word;
-    `,
-    logDetailsHeading: css`
-      label: logs-row-details__heading;
-      font-weight: ${theme.typography.fontWeightBold};
-      padding: ${theme.spacing(1)} 0 ${theme.spacing(0.5)};
-    `,
-    logDetailsValue: css`
-      label: logs-row-details__row;
-      position: relative;
-      vertical-align: middle;
-      cursor: default;
-
-      &:hover {
-        background-color: ${hoverBgColor};
-      }
-    `,
-  };
-};
diff --git a/packages/grafana-ui/src/components/Logs/logParser.ts b/packages/grafana-ui/src/components/Logs/logParser.ts
deleted file mode 100644
index 34ad5db7174..00000000000
--- a/packages/grafana-ui/src/components/Logs/logParser.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import memoizeOne from 'memoize-one';
-
-import { Field, FieldType, getParser, LinkModel, LogRowModel } from '@grafana/data';
-
-import { MAX_CHARACTERS } from './LogRowMessage';
-
-const memoizedGetParser = memoizeOne(getParser);
-
-type FieldDef = {
-  key: string;
-  value: string;
-  links?: Array<LinkModel<Field>>;
-  fieldIndex?: number;
-};
-
-/**
- * Returns all fields for log row which consists of fields we parse from the message itself and additional fields
- * found in the dataframe (they may contain links).
- *
- * @deprecated will be removed in the next major version
- */
-export const getAllFields = memoizeOne(
-  (row: LogRowModel, getFieldLinks?: (field: Field, rowIndex: number) => Array<LinkModel<Field>>) => {
-    const logMessageFields = parseMessage(row.entry);
-    const dataframeFields = getDataframeFields(row, getFieldLinks);
-    const fieldsMap = [...dataframeFields, ...logMessageFields].reduce((acc, field) => {
-      // Strip enclosing quotes for hashing. When values are parsed from log line the quotes are kept, but if same
-      // value is in the dataFrame it will be without the quotes. We treat them here as the same value.
-      // We need to handle this scenario:
-      // - we use derived-fields in Loki
-      // - we name the derived field the same as the parsed-field-name
-      // - the same field will appear twice
-      //   - in the fields coming from `logMessageFields`
-      //   - in the fields coming from `dataframeFields`
-      // - but, in the fields coming from `logMessageFields`, there might be doublequotes around the value
-      // - we want to "merge" data from both sources, so we remove quotes from the beginning and end
-      const value = field.value.replace(/(^")|("$)/g, '');
-      const fieldHash = `${field.key}=${value}`;
-      if (acc[fieldHash]) {
-        acc[fieldHash].links = [...(acc[fieldHash].links || []), ...(field.links || [])];
-      } else {
-        acc[fieldHash] = field;
-      }
-      return acc;
-    }, {} as { [key: string]: FieldDef });
-
-    const allFields = Object.values(fieldsMap);
-    allFields.sort(sortFieldsLinkFirst);
-
-    return allFields;
-  }
-);
-
-const parseMessage = memoizeOne((rowEntry): FieldDef[] => {
-  if (rowEntry.length > MAX_CHARACTERS) {
-    return [];
-  }
-  const parser = memoizedGetParser(rowEntry);
-  if (!parser) {
-    return [];
-  }
-  // Use parser to highlight detected fields
-  const detectedFields = parser.getFields(rowEntry);
-  const fields = detectedFields.map((field) => {
-    const key = parser.getLabelFromField(field);
-    const value = parser.getValueFromField(field);
-    return { key, value };
-  });
-
-  return fields;
-});
-
-// creates fields from the dataframe-fields, adding data-links, when field.config.links exists
-const getDataframeFields = memoizeOne(
-  (row: LogRowModel, getFieldLinks?: (field: Field, rowIndex: number) => Array<LinkModel<Field>>): FieldDef[] => {
-    return row.dataFrame.fields
-      .map((field, index) => ({ ...field, index }))
-      .filter((field, index) => !shouldRemoveField(field, index, row))
-      .map((field) => {
-        const links = getFieldLinks ? getFieldLinks(field, row.rowIndex) : [];
-        return {
-          key: field.name,
-          value: field.values.get(row.rowIndex).toString(),
-          links: links,
-          fieldIndex: field.index,
-        };
-      });
-  }
-);
-
-function sortFieldsLinkFirst(fieldA: FieldDef, fieldB: FieldDef) {
-  if (fieldA.links?.length && !fieldB.links?.length) {
-    return -1;
-  }
-  if (!fieldA.links?.length && fieldB.links?.length) {
-    return 1;
-  }
-  return fieldA.key > fieldB.key ? 1 : fieldA.key < fieldB.key ? -1 : 0;
-}
-
-function shouldRemoveField(field: Field, index: number, row: LogRowModel) {
-  // Remove field if it is:
-  // "labels" field that is in Loki used to store all labels
-  if (field.name === 'labels' && field.type === FieldType.other) {
-    return true;
-  }
-  // "id" field which we use for react key
-  if (field.name === 'id') {
-    return true;
-  }
-  // entry field which we are showing as the log message
-  if (row.entryFieldIndex === index) {
-    return true;
-  }
-  // hidden field
-  if (field.config.custom?.hidden) {
-    return true;
-  }
-  // field that has empty value (we want to keep 0 or empty string)
-  if (field.values.get(row.rowIndex) == null) {
-    return true;
-  }
-  return false;
-}
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 368c4beb04f..e6ec45d22ce 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -147,10 +147,6 @@ export { Alert, type AlertVariant } from './Alert/Alert';
 export { GraphSeriesToggler, type GraphSeriesTogglerAPI } from './Graph/GraphSeriesToggler';
 export { Collapse, ControlledCollapse } from './Collapse/Collapse';
 export { CollapsableSection } from './Collapse/CollapsableSection';
-export { LogLabels } from './Logs/LogLabels';
-export { LogMessageAnsi } from './Logs/LogMessageAnsi';
-export { LogRows } from './Logs/LogRows';
-export { getLogRowStyles } from './Logs/getLogRowStyles';
 export { DataLinkButton } from './DataLinks/DataLinkButton';
 export { FieldLinkList } from './DataLinks/FieldLinkList';
 // Panel editors

From 3224b4c8f0120a9ebf017cfc44ab42773c0c706f Mon Sep 17 00:00:00 2001
From: Ezequiel Victorero <ezequiel.victorero@grafana.com>
Date: Wed, 12 Apr 2023 10:57:42 -0300
Subject: [PATCH 067/729] PublicDashboards: validate only one public dashboard
 per dashboard (#66228)

---
 .../publicdashboards/api/query_test.go        |  2 +-
 .../publicdashboards/models/errors.go         |  1 +
 .../publicdashboards/service/query_test.go    |  6 +-
 .../publicdashboards/service/service.go       | 17 ++---
 .../publicdashboards/service/service_test.go  | 64 +++++++++----------
 5 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/pkg/services/publicdashboards/api/query_test.go b/pkg/services/publicdashboards/api/query_test.go
index 7b44066d721..26a5db68ee9 100644
--- a/pkg/services/publicdashboards/api/query_test.go
+++ b/pkg/services/publicdashboards/api/query_test.go
@@ -324,7 +324,7 @@ func TestIntegrationUnauthenticatedUserCanGetPubdashPanelQueryData(t *testing.T)
 	store := publicdashboardsStore.ProvideStore(db)
 	cfg := setting.NewCfg()
 	ac := acmock.New()
-	ws := &publicdashboards.FakePublicDashboardServiceWrapper{}
+	ws := publicdashboardsService.ProvideServiceWrapper(store)
 	cfg.RBACEnabled = false
 	service := publicdashboardsService.ProvideService(cfg, store, qds, annotationsService, ac, ws)
 	pubdash, err := service.Create(context.Background(), &user.SignedInUser{}, savePubDashboardCmd)
diff --git a/pkg/services/publicdashboards/models/errors.go b/pkg/services/publicdashboards/models/errors.go
index 7a122248440..b73217201cb 100644
--- a/pkg/services/publicdashboards/models/errors.go
+++ b/pkg/services/publicdashboards/models/errors.go
@@ -20,6 +20,7 @@ var (
 	ErrInvalidMaxDataPoints                = errutil.NewBase(errutil.StatusBadRequest, "publicdashboards.maxDataPoints", errutil.WithPublicMessage("maxDataPoints should be greater than 0"))
 	ErrInvalidTimeRange                    = errutil.NewBase(errutil.StatusBadRequest, "publicdashboards.invalidTimeRange", errutil.WithPublicMessage("Invalid time range"))
 	ErrInvalidShareType                    = errutil.NewBase(errutil.StatusBadRequest, "publicdashboards.invalidShareType", errutil.WithPublicMessage("Invalid share type"))
+	ErrDashboardIsPublic                   = errutil.NewBase(errutil.StatusBadRequest, "publicdashboards.dashboardIsPublic", errutil.WithPublicMessage("Dashboard is already public"))
 
 	ErrPublicDashboardNotEnabled = errutil.NewBase(errutil.StatusForbidden, "publicdashboards.notEnabled", errutil.WithPublicMessage("Public dashboard paused"))
 )
diff --git a/pkg/services/publicdashboards/service/query_test.go b/pkg/services/publicdashboards/service/query_test.go
index ecc0aff01db..1ac490d1bff 100644
--- a/pkg/services/publicdashboards/service/query_test.go
+++ b/pkg/services/publicdashboards/service/query_test.go
@@ -651,7 +651,7 @@ func TestGetQueryDataResponse(t *testing.T) {
 	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
 	require.NoError(t, err)
 	publicdashboardStore := database.ProvideStore(sqlStore)
-
+	serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
 	fakeQueryService := &query.FakeQueryService{}
 	fakeQueryService.On("QueryData", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&backend.QueryDataResponse{}, nil)
 
@@ -660,6 +660,7 @@ func TestGetQueryDataResponse(t *testing.T) {
 		store:              publicdashboardStore,
 		intervalCalculator: intervalv2.NewCalculator(),
 		QueryDataService:   fakeQueryService,
+		serviceWrapper:     serviceWrapper,
 	}
 
 	publicDashboardQueryDTO := PublicDashboardQueryDTO{
@@ -1180,7 +1181,7 @@ func TestBuildMetricRequest(t *testing.T) {
 	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
 	require.NoError(t, err)
 	publicdashboardStore := database.ProvideStore(sqlStore)
-
+	serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
 	publicDashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true, []map[string]interface{}{}, nil)
 	nonPublicDashboard := insertTestDashboard(t, dashboardStore, "testNonPublicDashie", 1, 0, true, []map[string]interface{}{}, nil)
 	from, to := internal.GetTimeRangeFromDashboard(t, publicDashboard.Data)
@@ -1189,6 +1190,7 @@ func TestBuildMetricRequest(t *testing.T) {
 		log:                log.New("test.logger"),
 		store:              publicdashboardStore,
 		intervalCalculator: intervalv2.NewCalculator(),
+		serviceWrapper:     serviceWrapper,
 	}
 
 	publicDashboardQueryDTO := PublicDashboardQueryDTO{
diff --git a/pkg/services/publicdashboards/service/service.go b/pkg/services/publicdashboards/service/service.go
index ee624c73a26..13f15941748 100644
--- a/pkg/services/publicdashboards/service/service.go
+++ b/pkg/services/publicdashboards/service/service.go
@@ -152,13 +152,14 @@ func (pd *PublicDashboardServiceImpl) Create(ctx context.Context, u *user.Signed
 		return nil, err
 	}
 
-	// verify public dashboard does not exist and that we didn't get one from the
-	// request
-	existingPubdash, err := pd.store.Find(ctx, dto.PublicDashboard.Uid)
-	if err != nil {
-		return nil, ErrInternalServerError.Errorf("Create: failed to find the public dashboard: %w", err)
-	} else if existingPubdash != nil {
-		return nil, ErrBadRequest.Errorf("Create: public dashboard already exists: %s", dto.PublicDashboard.Uid)
+	// validate the dashboard does not already have a public dashboard
+	existingPubdash, err := pd.FindByDashboardUid(ctx, u.OrgID, dto.DashboardUid)
+	if err != nil && !errors.Is(err, ErrPublicDashboardNotFound) {
+		return nil, err
+	}
+
+	if existingPubdash != nil {
+		return nil, ErrDashboardIsPublic.Errorf("Create: public dashboard for dashboard %s already exists", dto.DashboardUid)
 	}
 
 	// set default value for time settings
@@ -314,7 +315,7 @@ func (pd *PublicDashboardServiceImpl) NewPublicDashboardAccessToken(ctx context.
 			return accessToken, nil
 		}
 	}
-	return "", ErrInternalServerError.Errorf("failed to generate a unique accesssToken for public dashboard")
+	return "", ErrInternalServerError.Errorf("failed to generate a unique accessToken for public dashboard")
 }
 
 // FindAll Returns a list of public dashboards by orgId
diff --git a/pkg/services/publicdashboards/service/service_test.go b/pkg/services/publicdashboards/service/service_test.go
index 2c55926288d..7489d0b28d4 100644
--- a/pkg/services/publicdashboards/service/service_test.go
+++ b/pkg/services/publicdashboards/service/service_test.go
@@ -329,10 +329,14 @@ func TestCreatePublicDashboard(t *testing.T) {
 		publicDashboardStore.On("FindDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 		publicDashboardStore.On("Find", mock.Anything, mock.Anything).Return(nil, nil)
 		publicDashboardStore.On("FindByAccessToken", mock.Anything, mock.Anything).Return(pubdash, nil)
+		publicDashboardStore.On("FindByDashboardUid", mock.Anything, mock.Anything, mock.Anything).Return(nil, ErrPublicDashboardNotFound.Errorf(""))
+
+		serviceWrapper := ProvideServiceWrapper(publicDashboardStore)
 
 		service := &PublicDashboardServiceImpl{
-			log:   log.New("test.logger"),
-			store: publicDashboardStore,
+			log:            log.New("test.logger"),
+			store:          publicDashboardStore,
+			serviceWrapper: serviceWrapper,
 		}
 
 		dto := &SavePublicDashboardDTO{
@@ -348,7 +352,7 @@ func TestCreatePublicDashboard(t *testing.T) {
 
 		_, err := service.Create(context.Background(), SignedInUser, dto)
 		require.Error(t, err)
-		require.Equal(t, err, ErrInternalServerError.Errorf("failed to generate a unique accesssToken for public dashboard"))
+		require.Equal(t, err, ErrInternalServerError.Errorf("failed to generate a unique accessToken for public dashboard"))
 		publicDashboardStore.AssertNotCalled(t, "Create")
 	})
 
@@ -356,12 +360,20 @@ func TestCreatePublicDashboard(t *testing.T) {
 		sqlStore := db.InitTestDB(t)
 		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
 		require.NoError(t, err)
-		publicdashboardStore := database.ProvideStore(sqlStore)
+
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true, []map[string]interface{}{}, nil)
 
+		publicdashboardStore := &FakePublicDashboardStore{}
+		publicdashboardStore.On("FindByDashboardUid", mock.Anything, mock.Anything, mock.Anything).Return(&PublicDashboard{Uid: "newPubdashUid"}, nil)
+		publicdashboardStore.On("FindDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+		publicdashboardStore.On("Find", mock.Anything, mock.Anything).Return(nil, nil)
+
+		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
+
 		service := &PublicDashboardServiceImpl{
-			log:   log.New("test.logger"),
-			store: publicdashboardStore,
+			log:            log.New("test.logger"),
+			store:          publicdashboardStore,
+			serviceWrapper: serviceWrapper,
 		}
 
 		dto := &SavePublicDashboardDTO{
@@ -376,30 +388,9 @@ func TestCreatePublicDashboard(t *testing.T) {
 		}
 
 		savedPubdash, err := service.Create(context.Background(), SignedInUser, dto)
-		require.NoError(t, err)
-
-		// attempt to overwrite settings
-		dto = &SavePublicDashboardDTO{
-			DashboardUid: dashboard.UID,
-			OrgId:        dashboard.OrgID,
-			UserId:       8,
-			PublicDashboard: &PublicDashboard{
-				Uid:          savedPubdash.Uid,
-				OrgId:        9,
-				DashboardUid: "abc1234",
-				CreatedBy:    9,
-				CreatedAt:    time.Time{},
-
-				IsEnabled:          true,
-				AnnotationsEnabled: true,
-				TimeSettings:       timeSettings,
-				AccessToken:        "NOTAREALUUID",
-			},
-		}
-
-		_, err = service.Create(context.Background(), SignedInUser, dto)
-		require.Error(t, err)
-		assert.True(t, ErrBadRequest.Is(err))
+		assert.Error(t, err)
+		assert.Nil(t, savedPubdash)
+		assert.True(t, ErrDashboardIsPublic.Is(err))
 	})
 
 	t.Run("Validate pubdash has default share value", func(t *testing.T) {
@@ -445,11 +436,13 @@ func TestUpdatePublicDashboard(t *testing.T) {
 		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
 		require.NoError(t, err)
 		publicdashboardStore := database.ProvideStore(sqlStore)
+		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true, []map[string]interface{}{}, nil)
 
 		service := &PublicDashboardServiceImpl{
-			log:   log.New("test.logger"),
-			store: publicdashboardStore,
+			log:            log.New("test.logger"),
+			store:          publicdashboardStore,
+			serviceWrapper: serviceWrapper,
 		}
 
 		dto := &SavePublicDashboardDTO{
@@ -512,11 +505,14 @@ func TestUpdatePublicDashboard(t *testing.T) {
 		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
 		require.NoError(t, err)
 		publicdashboardStore := database.ProvideStore(sqlStore)
+		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
+
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true, []map[string]interface{}{}, nil)
 
 		service := &PublicDashboardServiceImpl{
-			log:   log.New("test.logger"),
-			store: publicdashboardStore,
+			log:            log.New("test.logger"),
+			store:          publicdashboardStore,
+			serviceWrapper: serviceWrapper,
 		}
 
 		dto := &SavePublicDashboardDTO{

From d4bd024951e7555e9306681e10bbdd2b7cac2fa1 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Wed, 12 Apr 2023 16:33:31 +0200
Subject: [PATCH 068/729] Expressions: Fix expression load with legacy UID -100
 (#65950)

* Fix expressions instance settings loading

* Introduce a new method to get name or uid

* Update public/app/features/plugins/datasource_srv.ts

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

* Move getNameOrUid method outside the class

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 .betterer.results                             | 23 +++-----
 .../src/utils/DataSourceWithBackend.test.ts   |  2 +
 public/app/features/plugins/datasource_srv.ts | 40 ++++++++------
 .../plugins/tests/datasource_srv.test.ts      | 55 ++++++++++++++++++-
 4 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 725c072dd3d..9d49a248460 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -3119,27 +3119,20 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Do not use any type assertions.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
+      [0, 0, 0, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
       [0, 0, 0, "Do not use any type assertions.", "12"],
       [0, 0, 0, "Do not use any type assertions.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
+      [0, 0, 0, "Do not use any type assertions.", "14"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Do not use any type assertions.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Do not use any type assertions.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Do not use any type assertions.", "24"]
+      [0, 0, 0, "Do not use any type assertions.", "17"]
     ],
     "public/app/features/plugins/importPanelPlugin.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
index 40b17f3fdb0..439f4a0300d 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
@@ -307,6 +307,8 @@ describe('DataSourceWithBackend', () => {
       expect(isExpressionReference('Expression')).toBeTruthy(); // Name
       expect(isExpressionReference({ type: '__expr__' })).toBeTruthy();
       expect(isExpressionReference({ type: '-100' })).toBeTruthy();
+      expect(isExpressionReference(null)).toBeFalsy();
+      expect(isExpressionReference(undefined)).toBeFalsy();
     });
   });
 });
diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index 72153941a50..c31c13c1900 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -65,26 +65,17 @@ export class DatasourceSrv implements DataSourceService {
     ref: string | null | undefined | DataSourceRef,
     scopedVars?: ScopedVars
   ): DataSourceInstanceSettings | undefined {
-    const isstring = typeof ref === 'string';
-    let nameOrUid = isstring ? (ref as string) : ((ref as any)?.uid as string | undefined);
-
-    if (nameOrUid === 'default' || nameOrUid === null || nameOrUid === undefined) {
-      if (!isstring && ref) {
-        const type = (ref as any)?.type as string;
-        if (type === ExpressionDatasourceRef.type) {
-          return expressionDatasource.instanceSettings;
-        } else if (type) {
-          console.log('FIND Default instance for datasource type?', ref);
-        }
-      }
-      return this.settingsMapByUid[this.defaultName] ?? this.settingsMapByName[this.defaultName];
-    }
+    let nameOrUid = getNameOrUid(ref);
 
     // Expressions has a new UID as __expr__ See: https://github.com/grafana/grafana/pull/62510/
     // But we still have dashboards/panels with old expression UID (-100)
     // To support both UIDs until we migrate them all to new one, this check is necessary
     if (isExpressionReference(nameOrUid)) {
-      return expressionDatasource.instanceSettings;
+      return expressionInstanceSettings;
+    }
+
+    if (nameOrUid === 'default' || nameOrUid == null) {
+      return this.settingsMapByUid[this.defaultName] ?? this.settingsMapByName[this.defaultName];
     }
 
     // Complex logic to support template variable data source names
@@ -114,15 +105,19 @@ export class DatasourceSrv implements DataSourceService {
       };
     }
 
-    return this.settingsMapByUid[nameOrUid] ?? this.settingsMapByName[nameOrUid];
+    return this.settingsMapByUid[nameOrUid] ?? this.settingsMapByName[nameOrUid] ?? this.settingsMapById[nameOrUid];
   }
 
   get(ref?: string | DataSourceRef | null, scopedVars?: ScopedVars): Promise<DataSourceApi> {
-    let nameOrUid = typeof ref === 'string' ? (ref as string) : ((ref as any)?.uid as string | undefined);
+    let nameOrUid = getNameOrUid(ref);
     if (!nameOrUid) {
       return this.get(this.defaultName);
     }
 
+    if (isExpressionReference(ref)) {
+      return Promise.resolve(this.datasources[ExpressionDatasourceUID]);
+    }
+
     // Check if nameOrUid matches a uid and then get the name
     const byName = this.settingsMapByName[nameOrUid];
     if (byName) {
@@ -154,7 +149,7 @@ export class DatasourceSrv implements DataSourceService {
     }
 
     // find the metadata
-    const instanceSettings = this.settingsMapByUid[key] ?? this.settingsMapByName[key] ?? this.settingsMapById[key];
+    const instanceSettings = this.getInstanceSettings(key);
     if (!instanceSettings) {
       return Promise.reject({ message: `Datasource ${key} was not found` });
     }
@@ -349,6 +344,15 @@ export class DatasourceSrv implements DataSourceService {
   }
 }
 
+export function getNameOrUid(ref?: string | DataSourceRef | null): string | undefined {
+  if (isExpressionReference(ref)) {
+    return ExpressionDatasourceRef.uid;
+  }
+
+  const isString = typeof ref === 'string';
+  return isString ? (ref as string) : ((ref as any)?.uid as string | undefined);
+}
+
 export function variableInterpolation(value: any[]) {
   if (Array.isArray(value)) {
     return value[0];
diff --git a/public/app/features/plugins/tests/datasource_srv.test.ts b/public/app/features/plugins/tests/datasource_srv.test.ts
index 6b6342a06f5..319cf5ed141 100644
--- a/public/app/features/plugins/tests/datasource_srv.test.ts
+++ b/public/app/features/plugins/tests/datasource_srv.test.ts
@@ -6,7 +6,7 @@ import {
   ScopedVars,
 } from '@grafana/data';
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
-import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { DatasourceSrv, getNameOrUid } from 'app/features/plugins/datasource_srv';
 
 // Datasource variable $datasource with current value 'BBB'
 const templateSrv: any = {
@@ -221,6 +221,29 @@ describe('datasource_srv', () => {
       });
     });
 
+    describe('when loading datasource', () => {
+      it('should load expressions', async () => {
+        let api = await dataSourceSrv.loadDatasource('-100'); // Legacy expression id
+        expect(api.uid).toBe(ExpressionDatasourceRef.uid);
+
+        api = await dataSourceSrv.loadDatasource('__expr__'); // Legacy expression id
+        expect(api.uid).toBe(ExpressionDatasourceRef.uid);
+
+        api = await dataSourceSrv.loadDatasource('Expression'); // Legacy expression id
+        expect(api.uid).toBe(ExpressionDatasourceRef.uid);
+      });
+
+      it('should load by variable', async () => {
+        const api = await dataSourceSrv.loadDatasource('${datasource}');
+        expect(api.meta).toBe(dataSourceInit.BBB.meta);
+      });
+
+      it('should load by name', async () => {
+        let api = await dataSourceSrv.loadDatasource('ZZZ');
+        expect(api.meta).toBe(dataSourceInit.ZZZ.meta);
+      });
+    });
+
     describe('when getting external metric sources', () => {
       it('should return list of explore sources', () => {
         const externalSources = dataSourceSrv.getExternal();
@@ -344,4 +367,34 @@ describe('datasource_srv', () => {
       expect(initMock).toHaveBeenCalledWith(dataSourceInit, 'aaa');
     });
   });
+
+  describe('getNameOrUid', () => {
+    it('should return expression uid __expr__', () => {
+      expect(getNameOrUid('__expr__')).toBe(ExpressionDatasourceRef.uid);
+      expect(getNameOrUid('-100')).toBe(ExpressionDatasourceRef.uid);
+      expect(getNameOrUid('Expression')).toBe(ExpressionDatasourceRef.uid);
+      expect(getNameOrUid({ type: '__expr__' })).toBe(ExpressionDatasourceRef.uid);
+      expect(getNameOrUid({ type: '-100' })).toBe(ExpressionDatasourceRef.uid);
+    });
+
+    it('should return ref if it is string', () => {
+      const value = 'mixed-datasource';
+      const nameOrUid = getNameOrUid(value);
+      expect(nameOrUid).not.toBeUndefined();
+      expect(nameOrUid).toBe(value);
+    });
+
+    it('should return the uid if the ref is not string', () => {
+      const value = { type: 'mixed', uid: 'theUID' };
+      const nameOrUid = getNameOrUid(value);
+      expect(nameOrUid).not.toBeUndefined();
+      expect(nameOrUid).toBe(value.uid);
+    });
+
+    it('should return undefined if the ref has no uid', () => {
+      const value = { type: 'mixed' };
+      const nameOrUid = getNameOrUid(value);
+      expect(nameOrUid).toBeUndefined();
+    });
+  });
 });

From 4e71c91cfd29fb60cd83a018cd2e52a9e53a8bc2 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Wed, 12 Apr 2023 16:34:14 +0200
Subject: [PATCH 069/729] InfluxDB: Fix Interpolation when querying variables
 (#65875)

Interpolate variables with InfluxQueryModel
---
 public/app/plugins/datasource/influxdb/datasource.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index de7771952dd..88365b8cfbb 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -539,7 +539,15 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       });
     }
 
-    const interpolated = this.templateSrv.replace(query, undefined, 'regex');
+    const interpolated = new InfluxQueryModel(
+      {
+        refId: 'metricFindQuery',
+        query,
+        rawQuery: true,
+      },
+      this.templateSrv,
+      options.scopedVars
+    ).render(true);
 
     return lastValueFrom(this._seriesQuery(interpolated, options)).then((resp) => {
       return this.responseParser.parse(query, resp);

From e0385d08a890239153283702357adb60951cc851 Mon Sep 17 00:00:00 2001
From: Emil Tullstedt <emil.tullstedt@grafana.com>
Date: Wed, 12 Apr 2023 16:56:06 +0200
Subject: [PATCH 070/729] Correlations: Update feature toggle status to beta
 (#66390)

---
 .../setup-grafana/configure-grafana/feature-toggles/index.md    | 2 +-
 pkg/services/featuremgmt/registry.go                            | 2 +-
 pkg/services/featuremgmt/toggles_gen.csv                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 5b05dd7d308..947f574760b 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -44,6 +44,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `panelTitleSearch`                | Search for dashboards using panel title                                                                                                                                                      |
 | `prometheusAzureOverrideAudience` | Experimental. Allow override default AAD audience for Azure Prometheus endpoint                                                                                                              |
 | `migrationLocking`                | Lock database during migrations                                                                                                                                                              |
+| `correlations`                    | Correlations page                                                                                                                                                                            |
 | `newDBLibrary`                    | Use jmoiron/sqlx rather than xorm for a few backend services                                                                                                                                 |
 | `validateDashboardsOnSave`        | Validate dashboard JSON POSTed to api/dashboards/db                                                                                                                                          |
 | `autoMigrateOldPanels`            | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)                                                                                                           |
@@ -52,7 +53,6 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `accessControlOnCall`             | Access control primitives for OnCall                                                                                                                                                         |
 | `alertingNoNormalState`           | Stop maintaining state of alerts that are not firing                                                                                                                                         |
 | `renderAuthJWT`                   | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
-| `correlations`                    | Correlations page                                                                                                                                                                            |
 
 ## Alpha feature toggles
 
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 80c1b20e915..2152ac303ed 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -126,7 +126,7 @@ var (
 		{
 			Name:        "correlations",
 			Description: "Correlations page",
-			State:       FeatureStateAlpha,
+			State:       FeatureStateBeta,
 			Owner:       grafanaExploreSquad,
 		},
 		{
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 39e4fdd58b4..3784d49fb5d 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -17,7 +17,7 @@ storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
 k8s,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
 exploreMixedDatasource,alpha,@grafana/explore-squad,false,false,false,true
 newTraceView,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
-correlations,alpha,@grafana/explore-squad,false,false,false,false
+correlations,beta,@grafana/explore-squad,false,false,false,false
 cloudWatchDynamicLabels,stable,@grafana/aws-plugins,false,false,false,false
 datasourceQueryMultiStatus,alpha,@grafana/plugins-platform-backend,false,false,false,false
 traceToMetrics,alpha,@grafana/observability-traces-and-profiling,false,false,false,true

From 08727b7d6cb6200432f6f8fb2ce06c5db12e7410 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Wed, 12 Apr 2023 17:22:35 +0200
Subject: [PATCH 071/729] Prometheus: Show initial hint on builder mode when
 metric lookup disabled (#65827)

* Show initial hint on builder mode when metric lookup disabled

* Disable MetricEncyclopedia and label request when metric lookup is disabled
---
 lerna.json                                    |  4 +-
 .../public_dashboard_store_mock.go            |  2 +-
 .../components/MetricSelect.test.tsx          |  5 ++-
 .../querybuilder/components/MetricSelect.tsx  | 22 ++++++++--
 .../components/PromQueryBuilder.test.tsx      | 40 +++++++++++++++++++
 .../components/PromQueryBuilder.tsx           | 19 ++++++++-
 6 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/lerna.json b/lerna.json
index 75716a4cd76..ffc0d55874a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,8 +1,6 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "10.0.0-pre"
 }
diff --git a/pkg/services/publicdashboards/public_dashboard_store_mock.go b/pkg/services/publicdashboards/public_dashboard_store_mock.go
index 47fccf70101..564a6cf755a 100644
--- a/pkg/services/publicdashboards/public_dashboard_store_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_store_mock.go
@@ -6,8 +6,8 @@ import (
 	context "context"
 
 	dashboards "github.com/grafana/grafana/pkg/services/dashboards"
-	mock "github.com/stretchr/testify/mock"
 	models "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	mock "github.com/stretchr/testify/mock"
 )
 
 // FakePublicDashboardStore is an autogenerated mock type for the Store type
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
index e76a6fecc54..63344ad82e5 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
@@ -7,7 +7,7 @@ import { DataSourceInstanceSettings, MetricFindValue } from '@grafana/data/src';
 import { PrometheusDatasource } from '../../datasource';
 import { PromOptions } from '../../types';
 
-import { MetricSelect } from './MetricSelect';
+import { MetricSelect, Props } from './MetricSelect';
 
 const instanceSettings = {
   url: 'proxied',
@@ -44,7 +44,7 @@ dataSourceMock.metricFindQuery = jest.fn((query: string) => {
   );
 });
 
-const props = {
+const props: Props = {
   labelsFilters: [],
   datasource: dataSourceMock,
   query: {
@@ -54,6 +54,7 @@ const props = {
   },
   onChange: jest.fn(),
   onGetMetrics: jest.fn().mockResolvedValue(mockValues),
+  metricLookupDisabled: false,
 };
 
 describe('MetricSelect', () => {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
index ced806d0c77..74c48ef49cc 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
@@ -3,7 +3,7 @@ import debounce from 'debounce-promise';
 import React, { useCallback, useState } from 'react';
 import Highlighter from 'react-highlight-words';
 
-import { SelectableValue, toOption, GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
 import { EditorField, EditorFieldGroup } from '@grafana/experimental';
 import { AsyncSelect, FormatOptionLabelMeta, useStyles2 } from '@grafana/ui';
 
@@ -16,6 +16,7 @@ import { PromVisualQuery } from '../types';
 const splitSeparator = ' ';
 
 export interface Props {
+  metricLookupDisabled: boolean;
   query: PromVisualQuery;
   onChange: (query: PromVisualQuery) => void;
   onGetMetrics: () => Promise<SelectableValue[]>;
@@ -25,7 +26,14 @@ export interface Props {
 
 export const PROMETHEUS_QUERY_BUILDER_MAX_RESULTS = 1000;
 
-export function MetricSelect({ datasource, query, onChange, onGetMetrics, labelsFilters }: Props) {
+export function MetricSelect({
+  datasource,
+  query,
+  onChange,
+  onGetMetrics,
+  labelsFilters,
+  metricLookupDisabled,
+}: Props) {
   const styles = useStyles2(getStyles);
   const [state, setState] = useState<{
     metrics?: Array<SelectableValue<any>>;
@@ -114,6 +122,9 @@ export function MetricSelect({ datasource, query, onChange, onGetMetrics, labels
     });
   };
 
+  // When metric and label lookup is disabled we won't request labels
+  const metricLookupDisabledSearch = () => Promise.resolve([]);
+
   const debouncedSearch = debounce(
     (query: string) => getMetricLabels(query),
     datasource.getDebounceTimeInMilliseconds()
@@ -126,11 +137,14 @@ export function MetricSelect({ datasource, query, onChange, onGetMetrics, labels
           inputId="prometheus-metric-select"
           className={styles.select}
           value={query.metric ? toOption(query.metric) : undefined}
-          placeholder="Select metric"
+          placeholder={'Select metric'}
           allowCustomValue
           formatOptionLabel={formatOptionLabel}
           filterOption={customFilterOption}
           onOpenMenu={async () => {
+            if (metricLookupDisabled) {
+              return;
+            }
             setState({ isLoading: true });
             const metrics = await onGetMetrics();
             if (metrics.length > PROMETHEUS_QUERY_BUILDER_MAX_RESULTS) {
@@ -138,7 +152,7 @@ export function MetricSelect({ datasource, query, onChange, onGetMetrics, labels
             }
             setState({ metrics, isLoading: undefined });
           }}
-          loadOptions={debouncedSearch}
+          loadOptions={metricLookupDisabled ? metricLookupDisabledSearch : debouncedSearch}
           isLoading={state.isLoading}
           defaultOptions={state.metrics}
           onChange={({ value }) => {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
index 493495c3f72..7a04f3224dc 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
@@ -8,6 +8,7 @@ import {
   LoadingState,
   MutableDataFrame,
   PanelData,
+  QueryHint,
   TimeRange,
 } from '@grafana/data';
 
@@ -229,6 +230,45 @@ describe('PromQueryBuilder', () => {
     expect(await screen.queryByText(EXPLAIN_LABEL_FILTER_CONTENT)).not.toBeInTheDocument();
   });
 
+  it('renders hint if initial hint provided', async () => {
+    const { datasource } = createDatasource();
+    datasource.getInitHints = (): QueryHint[] => [
+      {
+        label: 'Initial hint',
+        type: 'warning',
+      },
+    ];
+    const props = createProps(datasource);
+    render(
+      <PromQueryBuilder
+        {...props}
+        query={{
+          metric: 'histogram_metric_sum',
+          labels: [],
+          operations: [],
+        }}
+      />
+    );
+    expect(await screen.queryByText('Initial hint')).toBeInTheDocument();
+  });
+
+  it('renders no hint if no initial hint provided', async () => {
+    const { datasource } = createDatasource();
+    datasource.getInitHints = (): QueryHint[] => [];
+    const props = createProps(datasource);
+    render(
+      <PromQueryBuilder
+        {...props}
+        query={{
+          metric: 'histogram_metric_sum',
+          labels: [],
+          operations: [],
+        }}
+      />
+    );
+    expect(await screen.queryByText('Initial hint')).not.toBeInTheDocument();
+  });
+
   // <ModernPrometheus>
   it('tries to load labels when metric selected modern prom', async () => {
     const { languageProvider } = setup(undefined, undefined, {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
index 894f9d97298..d56c50722da 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
@@ -208,12 +208,14 @@ export const PromQueryBuilder = React.memo<Props>((props) => {
   }, [datasource, query, withTemplateVariableOptions]);
 
   const lang = { grammar: promqlGrammar, name: 'promql' };
-  const MetricEncyclopedia = config.featureToggles.prometheusMetricEncyclopedia;
+  const isMetricEncyclopediaEnabled = config.featureToggles.prometheusMetricEncyclopedia;
+
+  const initHints = datasource.getInitHints();
 
   return (
     <>
       <EditorRow>
-        {MetricEncyclopedia ? (
+        {isMetricEncyclopediaEnabled && !datasource.lookupsDisabled ? (
           <>
             <Button
               className={styles.button}
@@ -252,6 +254,7 @@ export const PromQueryBuilder = React.memo<Props>((props) => {
             onGetMetrics={onGetMetrics}
             datasource={datasource}
             labelsFilters={query.labels}
+            metricLookupDisabled={datasource.lookupsDisabled}
           />
         )}
         <LabelFilters
@@ -264,6 +267,18 @@ export const PromQueryBuilder = React.memo<Props>((props) => {
           onGetLabelValues={(forLabel) => withTemplateVariableOptions(onGetLabelValues(forLabel))}
         />
       </EditorRow>
+      {initHints.length ? (
+        <div className="query-row-break">
+          <div className="prom-query-field-info text-warning">
+            {initHints[0].label}{' '}
+            {initHints[0].fix ? (
+              <button type="button" className={'text-warning'}>
+                {initHints[0].fix.label}
+              </button>
+            ) : null}
+          </div>
+        </div>
+      ) : null}
       {showExplain && (
         <OperationExplainedBox
           stepNumber={1}

From 4025927f7dbde1396d79189b45a4faf536b88140 Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Wed, 12 Apr 2023 11:28:30 -0400
Subject: [PATCH 072/729] docs: nav updates for enterprise and reports (#66389)

nav-related text updates
---
 .../administration/enterprise-licensing/_index.md        | 6 +++---
 .../manage-license-in-aws-marketplace/index.md           | 4 ++--
 docs/sources/dashboards/create-reports/index.md          | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/sources/administration/enterprise-licensing/_index.md b/docs/sources/administration/enterprise-licensing/_index.md
index 1bf0e64d8c1..bee4a0d4f92 100644
--- a/docs/sources/administration/enterprise-licensing/_index.md
+++ b/docs/sources/administration/enterprise-licensing/_index.md
@@ -52,8 +52,8 @@ There is more than one way to add the license to a Grafana instance:
 This is the preferred option for single instance installations of Grafana Enterprise.
 
 1. Sign in as a Grafana server administrator.
-1. Navigate to **Server Admin > Upgrade** within Grafana.
-1. Click **Upload license token file**.
+1. Click **Administration > Stats and license** in the side navigation menu.
+1. Click **Upload a new token**.
 1. Select your license file, and upload it.
 
 #### Put the `license.jwt` file into the data directory of Grafana
@@ -205,7 +205,7 @@ To determine the number of active users:
 
 1. Sign in to Grafana Enterprise as a System Administrator.
 
-1. Click **Administration** in the left-side menu.
+1. Click **Administration** in the side navigation menu.
 
 1. Click **Stats and license**.
 
diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md
index d142d5fc209..1b0eeebf7da 100644
--- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md
+++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md
@@ -32,9 +32,9 @@ You can use AWS Marketplace to make the following modifications to your Grafana
 
 1. Sign in to Grafana as a Server Administrator.
 
-1. Click **Administration** in the left-side menu, and then **Stats and license**.
+1. Click **Administration** in the side navigation menu, and then **Stats and license**.
 
-1. In the **Token** section under **Enterprise License**, click **Renew License**.
+1. In the **Token** section under **Enterprise License**, click **Renew token**.
 
    This action retrieves updated license information from AWS.
 
diff --git a/docs/sources/dashboards/create-reports/index.md b/docs/sources/dashboards/create-reports/index.md
index 3d11ae5e0cc..b278126de6a 100644
--- a/docs/sources/dashboards/create-reports/index.md
+++ b/docs/sources/dashboards/create-reports/index.md
@@ -43,10 +43,11 @@ When [RBAC]({{< relref "../../administration/roles-and-permissions/access-contro
 
 Only organization administrators can create reports by default. You can customize who can create reports with [Role-based access control]({{< relref "../../administration/roles-and-permissions/access-control/" >}}).
 
-1. Click on the Reports icon in the side navigation menu.
+1. Click **Dashboards > Reports** in the side navigation menu.
 
-   The Reports tab allows you to view, create, and update your reports. The report form has a multi-step layout. The steps do not need to be completed in succession and can be skipped over by clicking a step name.
+   The Reports page allows you to view, create, and update your reports. The report form has a multi-step layout. The steps do not need to be completed in succession and can be skipped over by clicking a step name.
 
+1. Click **+ Create a new report**.
 1. Select report dashboard.
    - **Source dashboard:** Select the dashboard from which you want to generate the report.
    - **Time range:** (optional) Use custom time range for the report. For more information, refer to [Report time range]({{< relref "#report-time-range" >}}).
@@ -183,7 +184,7 @@ You can generate and save PDF files of any dashboard.
 
 > **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 6.7 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
-1. In the upper-right corner of the dashboard that you want to export as PDF, click the **Share dashboard** icon.
+1. In the dashboard that you want to export as PDF, click the **Share dashboard** icon.
 1. On the PDF tab, select a layout option for the exported dashboard: **Portrait** or **Landscape**.
 1. Click **Save as PDF** to render the dashboard as a PDF file.
 
@@ -230,7 +231,7 @@ font_italic = DejaVuSansCondensed-Oblique.ttf
 
 > **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.2 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
-You can configure organization-wide report settings in the **Settings** tab on the **Reporting** page. Settings are applied to all the reports for current organization.
+You can configure organization-wide report settings in the **Settings** under **Dashboards > Reporting**. Settings are applied to all the reports for current organization.
 
 You can customize the branding options.
 

From d49b79fb248391378f54890b90a2cb4c0b975c6c Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@grafana.com>
Date: Thu, 13 Apr 2023 01:46:13 +1000
Subject: [PATCH 073/729] add workaround for intercom iframe background being
 non-transparent in dark mode (#66329)

---
 .../src/themes/GlobalStyles/GlobalStyles.tsx         |  2 ++
 packages/grafana-ui/src/themes/GlobalStyles/extra.ts | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100755 packages/grafana-ui/src/themes/GlobalStyles/extra.ts

diff --git a/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx b/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx
index f46a07512d5..44567187aea 100644
--- a/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx
+++ b/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx
@@ -6,6 +6,7 @@ import { useTheme2 } from '..';
 import { getAgularPanelStyles } from './angularPanelStyles';
 import { getCardStyles } from './card';
 import { getElementStyles } from './elements';
+import { getExtraStyles } from './extra';
 import { getFormElementStyles } from './forms';
 import { getMarkdownStyles } from './markdownStyles';
 import { getPageStyles } from './page';
@@ -18,6 +19,7 @@ export function GlobalStyles() {
     <Global
       styles={[
         getElementStyles(theme),
+        getExtraStyles(theme),
         getFormElementStyles(theme),
         getPageStyles(theme),
         getCardStyles(theme),
diff --git a/packages/grafana-ui/src/themes/GlobalStyles/extra.ts b/packages/grafana-ui/src/themes/GlobalStyles/extra.ts
new file mode 100755
index 00000000000..4344f99aabe
--- /dev/null
+++ b/packages/grafana-ui/src/themes/GlobalStyles/extra.ts
@@ -0,0 +1,12 @@
+import { css } from '@emotion/react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+export function getExtraStyles(theme: GrafanaTheme2) {
+  return css`
+    // fix white background on intercom in dark mode
+    iframe.intercom-borderless-frame {
+      color-scheme: ${theme.colors.mode};
+    }
+  `;
+}

From b83627a6612304619bcee70b8883acc9caca6323 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 12 Apr 2023 08:52:44 -0700
Subject: [PATCH 074/729] Table Panel: Fix panel migration for options cell
 type (#66305)

---
 .../dashboard/state/DashboardMigrator.test.ts    |  4 ++--
 .../dashboard/state/DashboardMigrator.ts         | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/app/features/dashboard/state/DashboardMigrator.test.ts b/public/app/features/dashboard/state/DashboardMigrator.test.ts
index 8be8111780f..2b014d77ce4 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.test.ts
@@ -3,6 +3,7 @@ import { each, map } from 'lodash';
 import { DataLinkBuiltInVars, MappingType } from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
 import { setDataSourceSrv } from '@grafana/runtime';
+import { FieldConfigSource } from '@grafana/schema';
 import { config } from 'app/core/config';
 import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants';
 import { mockDataSource, MockDataSourceSrv } from 'app/features/alerting/unified/mocks';
@@ -2196,8 +2197,7 @@ describe('when migrating table cell display mode to cell options', () => {
                 inspect: false,
               },
             },
-            overrides: [],
-          },
+          } as unknown as FieldConfigSource, // missing overrides
         },
         // @ts-expect-error
         {
diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts
index c95dcc7c5c8..7fb0ca83103 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.ts
@@ -825,14 +825,14 @@ export class DashboardMigrator {
           }
 
           // Update any overrides referencing the cell display mode
-          for (let i = 0; i < panel.fieldConfig.overrides.length; i++) {
-            for (let j = 0; j < panel.fieldConfig.overrides[i].properties.length; j++) {
-              let overrideDisplayMode = panel.fieldConfig.overrides[i].properties[j].value;
-
-              if (panel.fieldConfig.overrides[i].properties[j].id === 'custom.displayMode') {
-                panel.fieldConfig.overrides[i].properties[j].id = 'custom.cellOptions';
-                panel.fieldConfig.overrides[i].properties[j].value =
-                  migrateTableDisplayModeToCellOptions(overrideDisplayMode);
+          if (panel.fieldConfig?.overrides) {
+            for (const override of panel.fieldConfig.overrides) {
+              for (let j = 0; j < override.properties?.length ?? 0; j++) {
+                let overrideDisplayMode = override.properties[j].value;
+                if (override.properties[j].id === 'custom.displayMode') {
+                  override.properties[j].id = 'custom.cellOptions';
+                  override.properties[j].value = migrateTableDisplayModeToCellOptions(overrideDisplayMode);
+                }
               }
             }
           }

From e78be44e1a38b7afb85909b807b6a2e9e5a98830 Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Wed, 12 Apr 2023 12:24:34 -0400
Subject: [PATCH 075/729] SSE: Dataplane Compliance (#65927)

Takes a specific code path for data that identifies itself as dataplane instead of "guessing" what the data is.

The data must identify itself by being in the dataplane by having both the following frame metadata properties:

- TypeVersion property that is greater than 0.0
- 'Type' property

The flag is disableSSEDataplane and disables this functionality and uses the old code for all queries regardless.

See https://github.com/grafana/grafana-plugin-sdk-go/blob/main/data/contract_docs/contract.md for dataplane details.
---
 .../feature-toggles/index.md                  |   1 +
 go.mod                                        |   2 +
 go.sum                                        |  10 +
 .../src/types/featureToggles.gen.ts           |   1 +
 pkg/expr/dataplane.go                         | 129 ++++++++++
 pkg/expr/dataplane_test.go                    | 242 ++++++++++++++++++
 pkg/expr/mathexp/type_series.go               |  41 ++-
 pkg/expr/mathexp/types.go                     |  24 +-
 pkg/expr/nodes.go                             |   6 +
 pkg/expr/service.go                           |   5 +-
 pkg/expr/service_test.go                      |   6 +
 pkg/services/featuremgmt/registry.go          |   6 +
 pkg/services/featuremgmt/toggles_gen.csv      |   1 +
 pkg/services/featuremgmt/toggles_gen.go       |   4 +
 pkg/services/ngalert/eval/eval_test.go        |   3 +-
 .../ngalert/schedule/schedule_unit_test.go    |   3 +-
 pkg/services/query/query_test.go              |   2 +-
 17 files changed, 480 insertions(+), 6 deletions(-)
 create mode 100644 pkg/expr/dataplane.go
 create mode 100644 pkg/expr/dataplane_test.go

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 947f574760b..fc77bacf855 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -104,6 +104,7 @@ Alpha features might be changed or removed without prior notice.
 | `alertStateHistoryLokiSecondary`   | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.                                                                                        |
 | `alertStateHistoryLokiPrimary`     | Enable a remote Loki instance as the primary source for state history reads.                                                                                                                        |
 | `alertStateHistoryLokiOnly`        | Disable Grafana alerts from emitting annotations when a remote Loki instance is available.                                                                                                          |
+| `disableSSEDataplane`              | Disables dataplane specific processing in server side expressions.                                                                                                                                  |
 | `unifiedRequestLog`                | Writes error logs to the request logger                                                                                                                                                             |
 | `pyroscopeFlameGraph`              | Changes flame graph to pyroscope one                                                                                                                                                                |
 | `dataplaneFrontendFallback`        | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                |
diff --git a/go.mod b/go.mod
index 8f6a58a3297..c0516eb15d7 100644
--- a/go.mod
+++ b/go.mod
@@ -268,6 +268,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/dave/dst v0.27.2
 	github.com/go-jose/go-jose/v3 v3.0.0
+	github.com/grafana/dataplane/sdata v0.0.6
 	github.com/grafana/go-mssqldb v0.9.1
 	github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375
 	github.com/grafana/thema v0.0.0-20230302221249-6952e4a999b7
@@ -306,6 +307,7 @@ require (
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	github.com/gophercloud/gophercloud v1.0.0 // indirect
+	github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad // indirect
 	github.com/grafana/sqlds/v2 v2.3.10 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
diff --git a/go.sum b/go.sum
index 1dc1f33fae6..7dabb210c9f 100644
--- a/go.sum
+++ b/go.sum
@@ -1281,6 +1281,16 @@ github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw
 github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
 github.com/grafana/cuetsy v0.1.6 h1:61QGIDy1rVABU3OkoarOn0+qPdGopIJr34PyWVmGDfs=
 github.com/grafana/cuetsy v0.1.6/go.mod h1:4KWkUOslwvRTpEv7wdQG0jDFTuJmU+0L9x0h4kWxa2A=
+github.com/grafana/dataplane/examples v0.0.0-20230322121339-5fb4468146dd h1:w7pLYpu9nJLUiam5Zw0VjC0QwHVCYBswdioc/cLr858=
+github.com/grafana/dataplane/examples v0.0.0-20230322121339-5fb4468146dd/go.mod h1:h5YwY8s407/17XF5/dS8XrUtsTVV2RnuW8+m1Mp46mg=
+github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad h1:bROIOQEkRlxAt+Epn9Pos8ytkVqoIAvnaUZOAb7EgEU=
+github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad/go.mod h1:h5YwY8s407/17XF5/dS8XrUtsTVV2RnuW8+m1Mp46mg=
+github.com/grafana/dataplane/sdata v0.0.4 h1:GumUrUHsdCkGTjXbzy5uBmjLYavUYHPZ18ad6U9Whuc=
+github.com/grafana/dataplane/sdata v0.0.4/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
+github.com/grafana/dataplane/sdata v0.0.5 h1:RIfwNCd5777nSOyw5C7nRFlWhO2cjVJaHmKjUQNiTn4=
+github.com/grafana/dataplane/sdata v0.0.5/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
+github.com/grafana/dataplane/sdata v0.0.6 h1:Ejlj8d1Hvy/uDLeI4sOvL34Y8WLlVDd9iN270F+8aTw=
+github.com/grafana/dataplane/sdata v0.0.6/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
 github.com/grafana/dskit v0.0.0-20230202092222-880a7f8141cc h1:lQFgXpsZNDdi0whUROW15r/akzLIdXAn6xr5vqlZucI=
 github.com/grafana/dskit v0.0.0-20230202092222-880a7f8141cc/go.mod h1:ulYLLoSd71AWIjxgifLO86Lndx82Yj+IcV+fFnh8tkI=
 github.com/grafana/go-mssqldb v0.9.1 h1:3CqteWF0CadwXV9f3FxoI+i3uSW3azjTlQipyOJtWtQ=
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 8e43df06807..cdaf51a76bd 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -89,6 +89,7 @@ export interface FeatureToggles {
   alertStateHistoryLokiSecondary?: boolean;
   alertStateHistoryLokiPrimary?: boolean;
   alertStateHistoryLokiOnly?: boolean;
+  disableSSEDataplane?: boolean;
   unifiedRequestLog?: boolean;
   renderAuthJWT?: boolean;
   pyroscopeFlameGraph?: boolean;
diff --git a/pkg/expr/dataplane.go b/pkg/expr/dataplane.go
new file mode 100644
index 00000000000..0d24254c905
--- /dev/null
+++ b/pkg/expr/dataplane.go
@@ -0,0 +1,129 @@
+package expr
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/grafana/dataplane/sdata"
+	"github.com/grafana/dataplane/sdata/numeric"
+	"github.com/grafana/dataplane/sdata/reader"
+	"github.com/grafana/dataplane/sdata/timeseries"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/infra/log"
+)
+
+func shouldUseDataplane(frames data.Frames, logger *log.ConcreteLogger, disable bool) (dt data.FrameType, b bool, e error) {
+	if disable {
+		return
+	}
+	dt = data.FrameTypeUnknown
+	if len(frames) == 0 {
+		return data.FrameTypeUnknown, true, nil
+	}
+
+	firstFrame := frames[0]
+	if firstFrame == nil {
+		return
+	}
+
+	if firstFrame.Meta == nil {
+		return
+	}
+
+	if firstFrame.Meta.Type == "" {
+		return
+	}
+
+	if firstFrame.Meta.TypeVersion.IsZero() {
+		return
+	}
+
+	dt, err := reader.CanReadBasedOnMeta(frames)
+	if err != nil {
+		var vw *sdata.VersionWarning
+		if errors.As(err, &vw) {
+			logger.Warn("Attempting to read mismatched version dataplane data", "error", err, "datatype", dt)
+			return dt, true, nil
+		}
+		// TODO: Remove as more confidence is gained in dataplane data handling and return the error
+		logger.Warn("Dataplane data detected but falling back to old processing due to error",
+			"error", err)
+
+		return dt, false, err
+	}
+	return dt, true, nil
+}
+
+func handleDataplaneFrames(k data.FrameTypeKind, frames data.Frames) (mathexp.Results, error) {
+	switch k {
+	case data.KindUnknown:
+		return mathexp.Results{Values: mathexp.Values{mathexp.NoData{}.New()}}, nil
+	case data.KindTimeSeries:
+		return handleDataplaneTimeseries(frames)
+	case data.KindNumeric:
+		return handleDataplaneNumeric(frames)
+	default:
+		return mathexp.Results{}, fmt.Errorf("kind %s not supported by server side expressions", k)
+	}
+}
+
+func handleDataplaneTimeseries(frames data.Frames) (mathexp.Results, error) {
+	dps, err := timeseries.CollectionReaderFromFrames(frames)
+	if err != nil {
+		return mathexp.Results{}, err
+	}
+	sc, err := dps.GetCollection(false)
+	if err != nil {
+		return mathexp.Results{}, err
+	}
+	if sc.NoData() {
+		noData := mathexp.NoData{}.New()
+		if len(dps.Frames()) == 1 {
+			// If single frame form of nodata, copy the frame to pass through metadata
+			noData.Frame = dps.Frames()[0]
+		}
+		return mathexp.Results{Values: mathexp.Values{noData}}, nil
+	}
+	res := mathexp.Results{}
+	res.Values = make([]mathexp.Value, 0, len(sc.Refs))
+	for _, s := range sc.Refs {
+		newSeries, err := mathexp.NewSeriesFromRef(sc.RefID, s)
+		if err != nil {
+			return res, err
+		}
+		res.Values = append(res.Values, newSeries)
+	}
+
+	return res, nil
+}
+
+func handleDataplaneNumeric(frames data.Frames) (mathexp.Results, error) {
+	dn, err := numeric.CollectionReaderFromFrames(frames)
+	if err != nil {
+		return mathexp.Results{}, err
+	}
+	nc, err := dn.GetCollection(false)
+	if err != nil {
+		return mathexp.Results{}, err
+	}
+	if nc.NoData() {
+		noData := mathexp.NoData{}.New()
+		if len(dn.Frames()) == 1 {
+			// If single frame form of nodata, copy the frame to pass through metadata
+			noData.Frame = dn.Frames()[0]
+		}
+		return mathexp.Results{Values: mathexp.Values{noData}}, nil
+	}
+	res := mathexp.Results{}
+	res.Values = make([]mathexp.Value, 0, len(nc.Refs))
+	for _, n := range nc.Refs {
+		newNum, err := mathexp.NumberFromRef(nc.RefID, n)
+		if err != nil {
+			return res, err
+		}
+		res.Values = append(res.Values, newNum)
+	}
+
+	return res, nil
+}
diff --git a/pkg/expr/dataplane_test.go b/pkg/expr/dataplane_test.go
new file mode 100644
index 00000000000..647ec9f17ae
--- /dev/null
+++ b/pkg/expr/dataplane_test.go
@@ -0,0 +1,242 @@
+package expr
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/grafana/dataplane/examples"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	datafakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPassThroughDataplaneExamples(t *testing.T) {
+	es, err := examples.GetExamples()
+	require.NoError(t, err)
+
+	validExamples, err := es.Filter(examples.FilterOptions{
+		Version: data.FrameTypeVersion{0, 1},
+		Valid:   util.Pointer(true),
+	})
+	require.NoError(t, err)
+
+	for _, collection := range validExamples.Collections() {
+		for _, example := range collection.ExampleSlice() {
+			t.Run(example.Info().ID, func(t *testing.T) {
+				_, err := framesPassThroughService(t, example.Frames("A"))
+				require.NoError(t, err)
+			})
+		}
+	}
+}
+
+func framesPassThroughService(t *testing.T, frames data.Frames) (data.Frames, error) {
+	me := &mockEndpoint{
+		Frames: frames,
+	}
+
+	cfg := setting.NewCfg()
+
+	s := Service{
+		cfg:               cfg,
+		dataService:       me,
+		dataSourceService: &datafakes.FakeDataSourceService{},
+		features:          &featuremgmt.FeatureManager{},
+	}
+	queries := []Query{{
+		RefID: "A",
+		DataSource: &datasources.DataSource{
+			OrgID: 1,
+			UID:   "test",
+			Type:  "test",
+		},
+		JSON: json.RawMessage(`{ "datasource": { "uid": "1" }, "intervalMs": 1000, "maxDataPoints": 1000 }`),
+		TimeRange: AbsoluteTimeRange{
+			From: time.Time{},
+			To:   time.Time{},
+		},
+	}}
+
+	req := &Request{Queries: queries}
+
+	pl, err := s.BuildPipeline(req)
+	require.NoError(t, err)
+
+	res, err := s.ExecutePipeline(context.Background(), time.Now(), pl)
+	require.NoError(t, err)
+
+	require.Contains(t, res.Responses, "A")
+
+	return res.Responses["A"].Frames, res.Responses["A"].Error
+}
+
+func TestShouldUseDataplane(t *testing.T) {
+	t.Run("zero frames returns no data and is allowed", func(t *testing.T) {
+		f := data.Frames{}
+		dt, use, err := shouldUseDataplane(f, log.New(""), false)
+		require.NoError(t, err)
+		require.True(t, use)
+		require.Equal(t, data.KindUnknown, dt.Kind())
+	})
+
+	t.Run("a frame with Type and TypeVersion 0.0 will not use dataplane", func(t *testing.T) {
+		f := data.Frames{(&data.Frame{}).SetMeta(
+			&data.FrameMeta{
+				TypeVersion: data.FrameTypeVersion{},
+				Type:        data.FrameTypeTimeSeriesMulti,
+			},
+		)}
+		_, use, err := shouldUseDataplane(f, log.New(""), false)
+		require.NoError(t, err)
+		require.False(t, use)
+	})
+
+	t.Run("a frame without Type and TypeVersion > 0.0 will not use dataplane", func(t *testing.T) {
+		f := data.Frames{(&data.Frame{}).SetMeta(
+			&data.FrameMeta{
+				TypeVersion: data.FrameTypeVersion{0, 1},
+			},
+		)}
+		_, use, err := shouldUseDataplane(f, log.New(""), false)
+		require.NoError(t, err)
+		require.False(t, use)
+	})
+
+	t.Run("a frame with no metadata will not use dataplane", func(t *testing.T) {
+		f := data.Frames{&data.Frame{}}
+		_, use, err := shouldUseDataplane(f, log.New(""), false)
+		require.NoError(t, err)
+		require.False(t, use)
+	})
+
+	t.Run("a newer version that supported will return a warning but still use dataplane", func(t *testing.T) {
+		ty := data.FrameTypeTimeSeriesMulti
+		v := data.FrameTypeVersion{999, 999}
+		f := data.Frames{(&data.Frame{}).SetMeta(
+			&data.FrameMeta{
+				Type:        ty,
+				TypeVersion: v,
+			},
+		)}
+		dt, use, err := shouldUseDataplane(f, log.New(""), false)
+
+		require.NoError(t, err)
+
+		require.True(t, use)
+		require.Equal(t, data.KindTimeSeries, dt.Kind())
+	})
+
+	t.Run("all valid dataplane examples should use dataplane", func(t *testing.T) {
+		es, err := examples.GetExamples()
+		require.NoError(t, err)
+
+		validExamples, err := es.Filter(examples.FilterOptions{
+			Version: data.FrameTypeVersion{0, 1},
+			Valid:   util.Pointer(true),
+		})
+		require.NoError(t, err)
+
+		for _, collection := range validExamples.Collections() {
+			for _, example := range collection.ExampleSlice() {
+				t.Run(example.Info().ID, func(t *testing.T) {
+					_, err := framesPassThroughService(t, example.Frames("A"))
+					require.NoError(t, err)
+				})
+			}
+		}
+	})
+}
+
+func TestHandleDataplaneNumeric(t *testing.T) {
+	t.Run("no data", func(t *testing.T) {
+		es, err := examples.GetExamples()
+		require.NoError(t, err)
+
+		validNoDataNumericExamples, err := es.Filter(examples.FilterOptions{
+			Version: data.FrameTypeVersion{0, 1},
+			Valid:   util.Pointer(true),
+			Kind:    data.KindNumeric,
+			NoData:  util.Pointer(true),
+		})
+		require.NoError(t, err)
+
+		for _, example := range validNoDataNumericExamples.AsSlice() {
+			t.Run(example.Info().ID, func(t *testing.T) {
+				res, err := handleDataplaneNumeric(example.Frames("A"))
+				require.NoError(t, err)
+				require.Len(t, res.Values, 1)
+			})
+		}
+	})
+
+	t.Run("should read correct number of items from examples", func(t *testing.T) {
+		es, err := examples.GetExamples()
+		require.NoError(t, err)
+
+		numericExamples, err := es.Filter(examples.FilterOptions{
+			Version: data.FrameTypeVersion{0, 1},
+			Valid:   util.Pointer(true),
+			Kind:    data.KindNumeric,
+			NoData:  util.Pointer(false),
+		})
+		require.NoError(t, err)
+
+		for _, example := range numericExamples.AsSlice() {
+			t.Run(example.Info().ID, func(t *testing.T) {
+				res, err := handleDataplaneNumeric(example.Frames("A"))
+				require.NoError(t, err)
+				require.Len(t, res.Values, example.Info().ItemCount)
+			})
+		}
+	})
+}
+
+func TestHandleDataplaneTS(t *testing.T) {
+	t.Run("no data", func(t *testing.T) {
+		es, err := examples.GetExamples()
+		require.NoError(t, err)
+
+		validNoDataTSExamples, err := es.Filter(examples.FilterOptions{
+			Version: data.FrameTypeVersion{0, 1},
+			Valid:   util.Pointer(true),
+			Kind:    data.KindTimeSeries,
+			NoData:  util.Pointer(true),
+		})
+		require.NoError(t, err)
+
+		for _, example := range validNoDataTSExamples.AsSlice() {
+			t.Run(example.Info().ID, func(t *testing.T) {
+				res, err := handleDataplaneTimeseries(example.Frames("A"))
+				require.NoError(t, err)
+				require.Len(t, res.Values, 1)
+			})
+		}
+	})
+	t.Run("should read correct number of items from examples", func(t *testing.T) {
+		es, err := examples.GetExamples()
+		require.NoError(t, err)
+
+		tsExamples, err := es.Filter(examples.FilterOptions{
+			Version: data.FrameTypeVersion{0, 1},
+			Valid:   util.Pointer(true),
+			Kind:    data.KindTimeSeries,
+			NoData:  util.Pointer(false),
+		})
+		require.NoError(t, err)
+
+		for _, example := range tsExamples.AsSlice() {
+			t.Run(example.Info().ID, func(t *testing.T) {
+				res, err := handleDataplaneTimeseries(example.Frames("A"))
+				require.NoError(t, err)
+				require.Len(t, res.Values, example.Info().ItemCount)
+			})
+		}
+	})
+}
diff --git a/pkg/expr/mathexp/type_series.go b/pkg/expr/mathexp/type_series.go
index efb5d80587b..9220a32b61b 100644
--- a/pkg/expr/mathexp/type_series.go
+++ b/pkg/expr/mathexp/type_series.go
@@ -5,6 +5,7 @@ import (
 	"sort"
 	"time"
 
+	"github.com/grafana/dataplane/sdata/timeseries"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
 	"github.com/grafana/grafana/pkg/expr/mathexp/parse"
@@ -132,12 +133,50 @@ func NewSeries(refID string, labels data.Labels, size int) Series {
 	fields := make([]*data.Field, 2)
 	fields[seriesTypeTimeIdx] = data.NewField("Time", nil, make([]time.Time, size))
 	fields[seriesTypeValIdx] = data.NewField(refID, labels, make([]*float64, size))
+	frame := data.NewFrame("", fields...)
+	frame.RefID = refID
+	frame.Meta = &data.FrameMeta{
+		Type:        data.FrameTypeTimeSeriesMulti,
+		TypeVersion: data.FrameTypeVersion{0, 1},
+	}
 
 	return Series{
-		Frame: data.NewFrame("", fields...),
+		Frame: frame,
 	}
 }
 
+// NewSeries returns a dataframe of type Series.
+func NewSeriesFromRef(refID string, s timeseries.MetricRef) (Series, error) {
+	frame := data.NewFrame("")
+	frame.RefID = refID
+	frame.Meta = &data.FrameMeta{
+		Type:        data.FrameTypeTimeSeriesMulti,
+		TypeVersion: data.FrameTypeVersion{0, 1},
+	}
+
+	valField := s.ValueField
+	if valField.Type() != data.FieldTypeNullableFloat64 {
+		convertedField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, valField.Len())
+		convertedField.Name = valField.Name
+		convertedField.Labels = valField.Labels
+		convertedField.Config = valField.Config
+		for j := 0; j < valField.Len(); j++ {
+			ff, err := valField.NullableFloatAt(j)
+			if err != nil {
+				break
+			}
+
+			convertedField.Set(j, ff)
+		}
+		valField = convertedField
+	}
+	frame.Fields = []*data.Field{s.TimeField, valField}
+
+	return Series{
+		Frame: frame, // No Data Frame
+	}, nil
+}
+
 // Type returns the Value type and allows it to fulfill the Value interface.
 func (s Series) Type() parse.ReturnType { return parse.TypeSeriesSet }
 
diff --git a/pkg/expr/mathexp/types.go b/pkg/expr/mathexp/types.go
index 4c522a670ed..182058c4064 100644
--- a/pkg/expr/mathexp/types.go
+++ b/pkg/expr/mathexp/types.go
@@ -1,6 +1,7 @@
 package mathexp
 
 import (
+	"github.com/grafana/dataplane/sdata/numeric"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
 	"github.com/grafana/grafana/pkg/expr/mathexp/parse"
@@ -128,10 +129,31 @@ func NewNumber(name string, labels data.Labels) Number {
 	return Number{
 		data.NewFrame("",
 			data.NewField(name, labels, make([]*float64, 1)),
-		),
+		).SetMeta(&data.FrameMeta{
+			Type:        data.FrameTypeNumericMulti,
+			TypeVersion: data.FrameTypeVersion{0, 1},
+		}),
 	}
 }
 
+// NewNumber returns a data that holds a float64Vector
+func NumberFromRef(refID string, nr numeric.MetricRef) (Number, error) {
+	f, _, err := nr.NullableFloat64Value()
+	if err != nil {
+		return Number{}, err
+	}
+
+	frame := data.NewFrame("",
+		data.NewField(nr.GetMetricName(), nr.GetLabels(), []*float64{f})).SetMeta(&data.FrameMeta{
+		Type:        data.FrameTypeNumericMulti,
+		TypeVersion: data.FrameTypeVersion{0, 1},
+	})
+
+	frame.Fields[0].Config = nr.ValueField.Config
+
+	return Number{frame}, nil
+}
+
 func (n Number) GetMeta() interface{} {
 	return n.Frame.Meta.Custom
 }
diff --git a/pkg/expr/nodes.go b/pkg/expr/nodes.go
index 304f04c8e08..3c072c4792c 100644
--- a/pkg/expr/nodes.go
+++ b/pkg/expr/nodes.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/expr/mathexp"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/adapters"
 )
 
@@ -258,6 +259,11 @@ func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s
 		return mathexp.Results{}, QueryError{RefID: dn.refID, Err: response.Error}
 	}
 
+	if dt, use, _ := shouldUseDataplane(response.Frames, logger, s.features.IsEnabled(featuremgmt.FlagDisableSSEDataplane)); use {
+		logger.Debug("Handling SSE data source query through dataplane", "datatype", dt)
+		return handleDataplaneFrames(dt.Kind(), response.Frames)
+	}
+
 	dataSource := dn.datasource.Type
 	if isAllFrameVectors(dataSource, response.Frames) { // Prometheus Specific Handling
 		vals, err = framesToNumbers(response.Frames)
diff --git a/pkg/expr/service.go b/pkg/expr/service.go
index c2f9b3bca4d..5db62beb681 100644
--- a/pkg/expr/service.go
+++ b/pkg/expr/service.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -40,13 +41,15 @@ type Service struct {
 	cfg               *setting.Cfg
 	dataService       backend.QueryDataHandler
 	dataSourceService datasources.DataSourceService
+	features          featuremgmt.FeatureToggles
 }
 
-func ProvideService(cfg *setting.Cfg, pluginClient plugins.Client, dataSourceService datasources.DataSourceService) *Service {
+func ProvideService(cfg *setting.Cfg, pluginClient plugins.Client, dataSourceService datasources.DataSourceService, features featuremgmt.FeatureToggles) *Service {
 	return &Service{
 		cfg:               cfg,
 		dataService:       pluginClient,
 		dataSourceService: dataSourceService,
+		features:          features,
 	}
 }
 
diff --git a/pkg/expr/service_test.go b/pkg/expr/service_test.go
index 05a9f7e71af..466b2ae8c79 100644
--- a/pkg/expr/service_test.go
+++ b/pkg/expr/service_test.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/datasources"
 	datafakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -32,6 +33,7 @@ func TestService(t *testing.T) {
 		cfg:               cfg,
 		dataService:       me,
 		dataSourceService: &datafakes.FakeDataSourceService{},
+		features:          &featuremgmt.FeatureManager{},
 	}
 
 	queries := []Query{
@@ -67,6 +69,10 @@ func TestService(t *testing.T) {
 		data.NewField("Time", nil, []time.Time{time.Unix(1, 0)}),
 		data.NewField("B", nil, []*float64{fp(4)}))
 	bDF.RefID = "B"
+	bDF.SetMeta(&data.FrameMeta{
+		Type:        data.FrameTypeTimeSeriesMulti,
+		TypeVersion: data.FrameTypeVersion{0, 1},
+	})
 
 	expect := &backend.QueryDataResponse{
 		Responses: backend.Responses{
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 2152ac303ed..d45a526ff0d 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -475,6 +475,12 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaAlertingSquad,
 		},
+		{
+			Name:        "disableSSEDataplane",
+			Description: "Disables dataplane specific processing in server side expressions.",
+			State:       FeatureStateAlpha,
+			Owner:       grafanaObservabilityMetricsSquad,
+		},
 		{
 			Name:        "unifiedRequestLog",
 			Description: "Writes error logs to the request logger",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 3784d49fb5d..50f07229c47 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -70,6 +70,7 @@ prometheusDataplane,alpha,@grafana/observability-metrics,false,false,false,false
 alertStateHistoryLokiSecondary,alpha,@grafana/alerting-squad,false,false,false,false
 alertStateHistoryLokiPrimary,alpha,@grafana/alerting-squad,false,false,false,false
 alertStateHistoryLokiOnly,alpha,@grafana/alerting-squad,false,false,false,false
+disableSSEDataplane,alpha,@grafana/observability-metrics,false,false,false,false
 unifiedRequestLog,alpha,@grafana/backend-platform,false,false,false,false
 renderAuthJWT,beta,@grafana/grafana-as-code,false,false,false,false
 pyroscopeFlameGraph,alpha,@grafana/observability-traces-and-profiling,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 22518a70146..925bc11af25 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -291,6 +291,10 @@ const (
 	// Disable Grafana alerts from emitting annotations when a remote Loki instance is available.
 	FlagAlertStateHistoryLokiOnly = "alertStateHistoryLokiOnly"
 
+	// FlagDisableSSEDataplane
+	// Disables dataplane specific processing in server side expressions.
+	FlagDisableSSEDataplane = "disableSSEDataplane"
+
 	// FlagUnifiedRequestLog
 	// Writes error logs to the request logger
 	FlagUnifiedRequestLog = "unifiedRequestLog"
diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go
index a69c54e31e7..c22f76e578b 100644
--- a/pkg/services/ngalert/eval/eval_test.go
+++ b/pkg/services/ngalert/eval/eval_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	fakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -532,7 +533,7 @@ func TestValidate(t *testing.T) {
 				pluginsStore: store,
 			})
 
-			evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil), store)
+			evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}), store)
 			evalCtx := NewContext(context.Background(), u)
 
 			err := evaluator.Validate(evalCtx, condition)
diff --git a/pkg/services/ngalert/schedule/schedule_unit_test.go b/pkg/services/ngalert/schedule/schedule_unit_test.go
index e6b96e46ce3..7717756cb97 100644
--- a/pkg/services/ngalert/schedule/schedule_unit_test.go
+++ b/pkg/services/ngalert/schedule/schedule_unit_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
@@ -780,7 +781,7 @@ func setupScheduler(t *testing.T, rs *fakeRulesStore, is *state.FakeInstanceStor
 
 	var evaluator = evalMock
 	if evalMock == nil {
-		evaluator = eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, nil, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil), &plugins.FakePluginStore{})
+		evaluator = eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, nil, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}), &plugins.FakePluginStore{})
 	}
 
 	if registry == nil {
diff --git a/pkg/services/query/query_test.go b/pkg/services/query/query_test.go
index 524342443e1..0848abf2a6e 100644
--- a/pkg/services/query/query_test.go
+++ b/pkg/services/query/query_test.go
@@ -446,7 +446,7 @@ func setup(t *testing.T) *testContext {
 		DataSources:           nil,
 		SimulatePluginFailure: false,
 	}
-	exprService := expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, pc, fakeDatasourceService)
+	exprService := expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, pc, fakeDatasourceService, &featuremgmt.FeatureManager{})
 	queryService := ProvideService(setting.NewCfg(), dc, exprService, rv, ds, pc) // provider belonging to this package
 	return &testContext{
 		pluginContext:          pc,

From 5626461b3c358f5c5c5c690b82977c09744d09b4 Mon Sep 17 00:00:00 2001
From: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:30:33 -0400
Subject: [PATCH 076/729] Caching: Refactor enterprise query caching middleware
 to a wire service (#65616)

* define initial service and add to wire

* update caching service interface

* add skipQueryCache header handler and update metrics query function to use it

* add caching service as a dependency to query service

* working caching impl

* propagate cache status to frontend in response

* beginning of improvements suggested by Lean - separate caching logic from query logic.

* more changes to simplify query function

* Decided to revert renaming of function

* Remove error status from cache request

* add extra documentation

* Move query caching duration metric to query package

* add a little bit of documentation

* wip: convert resource caching

* Change return type of query service QueryData to a QueryDataResponse with Headers

* update codeowners

* change X-Cache value to const

* use resource caching in endpoint handlers

* write resource headers to response even if it's not a cache hit

* fix panic caused by lack of nil check

* update unit test

* remove NONE header - shouldn't show up in OSS

* Convert everything to use the plugin middleware

* revert a few more things

* clean up unused vars

* start reverting resource caching, start to implement in plugin middleware

* revert more, fix typo

* Update caching interfaces - resource caching now has a separate cache method

* continue wiring up new resource caching conventions - still in progress

* add more safety to implementation

* remove some unused objects

* remove some code that I left in by accident

* add some comments, fix codeowners, fix duplicate registration

* fix source of panic in resource middleware

* Update client decorator test to provide an empty response object

* create tests for caching middleware

* fix unit test

* Update pkg/services/caching/service.go

Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com>

* improve error message in error log

* quick docs update

* Remove use of mockery. Update return signature to return an explicit hit/miss bool

* create unit test for empty request context

* rename caching metrics to make it clear they pertain to caching

* Update pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Add clarifying comments to cache skip middleware func

* Add comment pointing to the resource cache update call

* fix unit tests (missing dependency)

* try to fix mystery syntax error

* fix a panic

* Caching: Introduce feature toggle to caching service refactor (#66323)

* introduce new feature toggle

* hide calls to new service behind a feature flag

* remove licensing flag from toggle (misunderstood what it was for)

* fix unit tests

* rerun toggle gen

---------

Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
---
 .github/CODEOWNERS                            |   1 +
 .../feature-toggles/index.md                  |   1 +
 .../src/types/featureToggles.gen.ts           |   1 +
 pkg/api/datasources.go                        |   8 +-
 pkg/api/http_server.go                        |   8 +-
 pkg/api/metrics.go                            |   2 +-
 pkg/api/plugin_resource.go                    |  14 +-
 pkg/api/plugin_resource_test.go               |   4 +-
 pkg/api/plugins_test.go                       |  22 +-
 pkg/infra/usagestats/service/api_test.go      |   2 +-
 pkg/middleware/middleware.go                  |   7 +-
 .../manager/client/clienttest/clienttest.go   |   5 +-
 pkg/server/wireexts_oss.go                    |   3 +
 pkg/services/accesscontrol/middleware_test.go |   2 +-
 .../resourcepermissions/api_test.go           |   2 +-
 pkg/services/caching/fake_caching_service.go  |  46 ++++
 pkg/services/caching/service.go               |  60 +++++
 pkg/services/contexthandler/contexthandler.go |   2 +-
 pkg/services/contexthandler/model/model.go    |   3 +-
 .../datasourceproxy/datasourceproxy.go        |   4 +-
 pkg/services/featuremgmt/codeowners.go        |   1 +
 pkg/services/featuremgmt/registry.go          |   7 +
 pkg/services/featuremgmt/toggles_gen.csv      |   1 +
 pkg/services/featuremgmt/toggles_gen.go       |   4 +
 pkg/services/ngalert/api/lotex_am.go          |   2 +-
 pkg/services/ngalert/api/lotex_prom.go        |   2 +-
 pkg/services/ngalert/api/lotex_ruler.go       |   2 +-
 pkg/services/ngalert/api/util.go              |   2 +-
 pkg/services/ngalert/api/util_test.go         |   6 +-
 .../clientmiddleware/caching_metrics.go       |  35 +++
 .../clientmiddleware/caching_middleware.go    | 144 +++++++++++
 .../caching_middleware_test.go                | 225 ++++++++++++++++++
 .../pluginsintegration/pluginsintegration.go  |  30 ++-
 .../publicdashboards/api/common_test.go       |   2 +-
 pkg/services/publicdashboards/api/query.go    |   2 +-
 .../public_dashboard_service_mock.go          |   2 +-
 .../publicdashboards/publicdashboard.go       |   2 +-
 .../publicdashboards/service/query.go         |   4 +-
 pkg/services/query/query.go                   |  22 +-
 pkg/services/query/query_service_mock.go      |  10 +-
 pkg/web/webtest/webtest.go                    |   2 +-
 41 files changed, 639 insertions(+), 65 deletions(-)
 create mode 100644 pkg/services/caching/fake_caching_service.go
 create mode 100644 pkg/services/caching/service.go
 create mode 100644 pkg/services/pluginsintegration/clientmiddleware/caching_metrics.go
 create mode 100644 pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
 create mode 100644 pkg/services/pluginsintegration/clientmiddleware/caching_middleware_test.go

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7f881d08f34..e6133723d01 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -541,6 +541,7 @@ lerna.json @grafana/frontend-ops
 # Grafana Operator Experience Team
 /pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-operator-experience-squad
 /pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go @grafana/grafana-operator-experience-squad
+/pkg/services/caching/ @grafana/grafana-operator-experience-squad
 
 # Kind definitions
 /kinds/dashboard @grafana/dashboards-squad
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index fc77bacf855..cc1097d8a33 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -34,6 +34,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `emptyDashboardPage`                  | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                             | Yes                |
 | `disablePrometheusExemplarSampling`   | Disable Prometheus exemplar sampling                                                                                                                                         |                    |
 | `logsSampleInExplore`                 | Enables access to the logs sample feature in Explore                                                                                                                         | Yes                |
+| `useCachingService`                   | When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation                |                    |
 | `disableElasticsearchBackendQuerying` | Disable the processing of queries and responses in the Elasticsearch data source through backend                                                                             |                    |
 
 ## Beta feature toggles
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index cdaf51a76bd..c94d9787601 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -95,5 +95,6 @@ export interface FeatureToggles {
   pyroscopeFlameGraph?: boolean;
   externalServiceAuth?: boolean;
   dataplaneFrontendFallback?: boolean;
+  useCachingService?: boolean;
   disableElasticsearchBackendQuerying?: boolean;
 }
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 85f2029a768..1c357dcfcee 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -653,7 +653,7 @@ func (hs *HTTPServer) CallDatasourceResource(c *contextmodel.ReqContext) {
 		c.JsonApiErr(http.StatusBadRequest, "id is invalid", nil)
 		return
 	}
-	ds, err := hs.DataSourceCache.GetDatasource(c.Req.Context(), datasourceID, c.SignedInUser, c.SkipCache)
+	ds, err := hs.DataSourceCache.GetDatasource(c.Req.Context(), datasourceID, c.SignedInUser, c.SkipDSCache)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceAccessDenied) {
 			c.JsonApiErr(403, "Access denied to datasource", err)
@@ -690,7 +690,7 @@ func (hs *HTTPServer) CallDatasourceResourceWithUID(c *contextmodel.ReqContext)
 		return
 	}
 
-	ds, err := hs.DataSourceCache.GetDatasourceByUID(c.Req.Context(), dsUID, c.SignedInUser, c.SkipCache)
+	ds, err := hs.DataSourceCache.GetDatasourceByUID(c.Req.Context(), dsUID, c.SignedInUser, c.SkipDSCache)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceAccessDenied) {
 			c.JsonApiErr(http.StatusForbidden, "Access denied to datasource", err)
@@ -760,7 +760,7 @@ func (hs *HTTPServer) CheckDatasourceHealthWithUID(c *contextmodel.ReqContext) r
 		return response.Error(http.StatusBadRequest, "UID is invalid", nil)
 	}
 
-	ds, err := hs.DataSourceCache.GetDatasourceByUID(c.Req.Context(), dsUID, c.SignedInUser, c.SkipCache)
+	ds, err := hs.DataSourceCache.GetDatasourceByUID(c.Req.Context(), dsUID, c.SignedInUser, c.SkipDSCache)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceAccessDenied) {
 			return response.Error(http.StatusForbidden, "Access denied to datasource", err)
@@ -790,7 +790,7 @@ func (hs *HTTPServer) CheckDatasourceHealth(c *contextmodel.ReqContext) response
 		return response.Error(http.StatusBadRequest, "id is invalid", nil)
 	}
 
-	ds, err := hs.DataSourceCache.GetDatasource(c.Req.Context(), datasourceID, c.SignedInUser, c.SkipCache)
+	ds, err := hs.DataSourceCache.GetDatasource(c.Req.Context(), datasourceID, c.SignedInUser, c.SkipDSCache)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceAccessDenied) {
 			return response.Error(http.StatusForbidden, "Access denied to datasource", err)
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 584a44f6adb..54053704385 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -41,6 +41,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/authn"
+	"github.com/grafana/grafana/pkg/services/caching"
 	"github.com/grafana/grafana/pkg/services/cleanup"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/correlations"
@@ -210,6 +211,7 @@ type HTTPServer struct {
 	statsService           stats.Service
 	authnService           authn.Service
 	starApi                *starApi.API
+	cachingService         caching.CachingService
 }
 
 type ServerOptions struct {
@@ -252,7 +254,8 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	accesscontrolService accesscontrol.Service, dashboardThumbsService thumbs.DashboardThumbService, navTreeService navtree.Service,
 	annotationRepo annotations.Repository, tagService tag.Service, searchv2HTTPService searchV2.SearchHTTPService, oauthTokenService oauthtoken.OAuthTokenService,
 	statsService stats.Service, authnService authn.Service, pluginsCDNService *pluginscdn.Service,
-	starApi *starApi.API,
+	starApi *starApi.API, cachingService caching.CachingService,
+
 ) (*HTTPServer, error) {
 	web.Env = cfg.Env
 	m := web.New()
@@ -358,6 +361,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		authnService:                 authnService,
 		pluginsCDNService:            pluginsCDNService,
 		starApi:                      starApi,
+		cachingService:               cachingService,
 	}
 	if hs.Listener != nil {
 		hs.log.Debug("Using provided listener")
@@ -630,7 +634,7 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
 		m.Use(middleware.ValidateHostHeader(hs.Cfg))
 	}
 
-	m.Use(middleware.HandleNoCacheHeader)
+	m.Use(middleware.HandleNoCacheHeaders)
 
 	if hs.Cfg.CSPEnabled || hs.Cfg.CSPReportOnlyEnabled {
 		m.UseMiddleware(middleware.ContentSecurityPolicy(hs.Cfg, hs.log))
diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go
index 695a28e21de..990f1ed4372 100644
--- a/pkg/api/metrics.go
+++ b/pkg/api/metrics.go
@@ -52,7 +52,7 @@ func (hs *HTTPServer) QueryMetricsV2(c *contextmodel.ReqContext) response.Respon
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
 
-	resp, err := hs.queryDataService.QueryData(c.Req.Context(), c.SignedInUser, c.SkipCache, reqDTO)
+	resp, err := hs.queryDataService.QueryData(c.Req.Context(), c.SignedInUser, c.SkipDSCache, reqDTO)
 	if err != nil {
 		return hs.handleQueryMetricsError(err)
 	}
diff --git a/pkg/api/plugin_resource.go b/pkg/api/plugin_resource.go
index a9b0ab61af0..5ebe91cb86e 100644
--- a/pkg/api/plugin_resource.go
+++ b/pkg/api/plugin_resource.go
@@ -15,6 +15,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/util/proxyutil"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -129,7 +130,7 @@ func (hs *HTTPServer) makePluginResourceRequest(w http.ResponseWriter, req *http
 
 	var flushStreamErr error
 	go func() {
-		flushStreamErr = hs.flushStream(stream, w)
+		flushStreamErr = hs.flushStream(req.Context(), crReq, stream, w)
 		wg.Done()
 	}()
 
@@ -140,9 +141,10 @@ func (hs *HTTPServer) makePluginResourceRequest(w http.ResponseWriter, req *http
 	return flushStreamErr
 }
 
-func (hs *HTTPServer) flushStream(stream callResourceClientResponseStream, w http.ResponseWriter) error {
+func (hs *HTTPServer) flushStream(ctx context.Context, req *backend.CallResourceRequest, stream callResourceClientResponseStream, w http.ResponseWriter) error {
 	processedStreams := 0
-
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
 	for {
 		resp, err := stream.Recv()
 		if errors.Is(err, io.EOF) {
@@ -198,6 +200,12 @@ func (hs *HTTPServer) flushStream(stream callResourceClientResponseStream, w htt
 
 		if _, err := w.Write(resp.Body); err != nil {
 			hs.log.Error("Failed to write resource response", "err", err)
+		} else if hs.Features.IsEnabled(featuremgmt.FlagUseCachingService) {
+			// Placing the new service implementation behind a feature flag until it is known to be stable
+
+			// The enterprise implementation of this function will use the headers and status of the first response,
+			// And append the body of any subsequent responses. It waits for the context to be canceled before caching the cumulative result.
+			hs.cachingService.CacheResourceResponse(ctx, req, resp)
 		}
 
 		if flusher, ok := w.(http.Flusher); ok {
diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index 7c990f8a7e7..596c1456374 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -29,6 +29,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/store"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/caching"
 	datasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
@@ -77,6 +78,7 @@ func TestCallResource(t *testing.T) {
 		hs.QuotaService = quotatest.New(false, nil)
 		hs.pluginStore = ps
 		hs.pluginClient = pluginClient.ProvideService(reg, pCfg)
+		hs.cachingService = &caching.OSSCachingService{}
 	})
 
 	t.Run("Test successful response is received for valid request", func(t *testing.T) {
@@ -106,7 +108,7 @@ func TestCallResource(t *testing.T) {
 			req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 			return errors.New("something went wrong")
 		}),
-	}, pluginsintegration.CreateMiddlewares(cfg, &oauthtokentest.Service{}, tracing.InitializeTracerForTest())...)
+	}, pluginsintegration.CreateMiddlewares(cfg, &oauthtokentest.Service{}, tracing.InitializeTracerForTest(), &caching.OSSCachingService{}, &featuremgmt.FeatureManager{})...)
 	require.NoError(t, err)
 
 	srv = SetupAPITestServer(t, func(hs *HTTPServer) {
diff --git a/pkg/api/plugins_test.go b/pkg/api/plugins_test.go
index 9de3a41e4cc..1ce73b89d67 100644
--- a/pkg/api/plugins_test.go
+++ b/pkg/api/plugins_test.go
@@ -30,7 +30,9 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/store"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/caching"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
@@ -371,9 +373,11 @@ func Test_GetPluginAssets(t *testing.T) {
 
 func TestMakePluginResourceRequest(t *testing.T) {
 	hs := HTTPServer{
-		Cfg:          setting.NewCfg(),
-		log:          log.New(),
-		pluginClient: &fakePluginClient{},
+		Cfg:            setting.NewCfg(),
+		log:            log.New(),
+		pluginClient:   &fakePluginClient{},
+		cachingService: &caching.OSSCachingService{},
+		Features:       &featuremgmt.FeatureManager{},
 	}
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 
@@ -399,6 +403,8 @@ func TestMakePluginResourceRequestSetCookieNotPresent(t *testing.T) {
 		pluginClient: &fakePluginClient{
 			headers: map[string][]string{"Set-Cookie": {"monster"}},
 		},
+		cachingService: &caching.OSSCachingService{},
+		Features:       &featuremgmt.FeatureManager{},
 	}
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	resp := httptest.NewRecorder()
@@ -433,6 +439,8 @@ func TestMakePluginResourceRequestContentTypeUnique(t *testing.T) {
 						"x-another": {"hello"},
 					},
 				},
+				cachingService: &caching.OSSCachingService{},
+				Features:       &featuremgmt.FeatureManager{},
 			}
 			req := httptest.NewRequest(http.MethodGet, "/", nil)
 			resp := httptest.NewRecorder()
@@ -456,9 +464,11 @@ func TestMakePluginResourceRequestContentTypeEmpty(t *testing.T) {
 		statusCode: http.StatusNoContent,
 	}
 	hs := HTTPServer{
-		Cfg:          setting.NewCfg(),
-		log:          log.New(),
-		pluginClient: pluginClient,
+		Cfg:            setting.NewCfg(),
+		log:            log.New(),
+		pluginClient:   pluginClient,
+		cachingService: &caching.OSSCachingService{},
+		Features:       &featuremgmt.FeatureManager{},
 	}
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	resp := httptest.NewRecorder()
diff --git a/pkg/infra/usagestats/service/api_test.go b/pkg/infra/usagestats/service/api_test.go
index 92ab183954f..4aa7ce51837 100644
--- a/pkg/infra/usagestats/service/api_test.go
+++ b/pkg/infra/usagestats/service/api_test.go
@@ -97,7 +97,7 @@ func contextProvider(tc *testContext) web.Handler {
 			Context:      c,
 			SignedInUser: tc.user,
 			IsSignedIn:   signedIn,
-			SkipCache:    true,
+			SkipDSCache:  true,
 			Logger:       log.New("test"),
 		}
 		c.Req = c.Req.WithContext(ctxkey.Set(c.Req.Context(), reqCtx))
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index eb4861dbbeb..55e49b9b209 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -22,8 +22,11 @@ var (
 	ReqOrgAdmin            = RoleAuth(org.RoleAdmin)
 )
 
-func HandleNoCacheHeader(ctx *contextmodel.ReqContext) {
-	ctx.SkipCache = ctx.Req.Header.Get("X-Grafana-NoCache") == "true"
+func HandleNoCacheHeaders(ctx *contextmodel.ReqContext) {
+	// X-Grafana-NoCache tells Grafana to skip the cache while retrieving datasource instance metadata
+	ctx.SkipDSCache = ctx.Req.Header.Get("X-Grafana-NoCache") == "true"
+	// X-Cache-Skip tells Grafana to skip the Enterprise query/resource cache while issuing query and resource calls
+	ctx.SkipQueryCache = ctx.Req.Header.Get("X-Cache-Skip") == "true"
 }
 
 func AddDefaultResponseHeaders(cfg *setting.Cfg) web.Handler {
diff --git a/pkg/plugins/manager/client/clienttest/clienttest.go b/pkg/plugins/manager/client/clienttest/clienttest.go
index 1ab7a78a3b4..32995bfa38f 100644
--- a/pkg/plugins/manager/client/clienttest/clienttest.go
+++ b/pkg/plugins/manager/client/clienttest/clienttest.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"net/http/httptest"
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -238,7 +239,9 @@ func WithReqContext(req *http.Request, user *user.SignedInUser) ClientDecoratorT
 	return ClientDecoratorTestOption(func(cdt *ClientDecoratorTest) {
 		if cdt.ReqContext == nil {
 			cdt.ReqContext = &contextmodel.ReqContext{
-				Context:      &web.Context{},
+				Context: &web.Context{
+					Resp: web.NewResponseWriter(req.Method, httptest.NewRecorder()),
+				},
 				SignedInUser: user,
 			}
 		}
diff --git a/pkg/server/wireexts_oss.go b/pkg/server/wireexts_oss.go
index 285d6263fdc..dfd5cbcda6f 100644
--- a/pkg/server/wireexts_oss.go
+++ b/pkg/server/wireexts_oss.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/authimpl"
+	"github.com/grafana/grafana/pkg/services/caching"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/datasources/permissions"
 	datasourceservice "github.com/grafana/grafana/pkg/services/datasources/service"
@@ -88,6 +89,8 @@ var wireExtsBasicSet = wire.NewSet(
 	pluginsintegration.WireExtensionSet,
 	publicdashboardsService.ProvideServiceWrapper,
 	wire.Bind(new(publicdashboards.ServiceWrapper), new(*publicdashboardsService.PublicDashboardServiceWrapperImpl)),
+	caching.ProvideCachingService,
+	wire.Bind(new(caching.CachingService), new(*caching.OSSCachingService)),
 )
 
 var wireExtsSet = wire.NewSet(
diff --git a/pkg/services/accesscontrol/middleware_test.go b/pkg/services/accesscontrol/middleware_test.go
index c9f3626058c..9487786210b 100644
--- a/pkg/services/accesscontrol/middleware_test.go
+++ b/pkg/services/accesscontrol/middleware_test.go
@@ -136,7 +136,7 @@ func contextProvider(modifiers ...func(c *contextmodel.ReqContext)) web.Handler
 			Logger:       log.New(""),
 			SignedInUser: &user.SignedInUser{},
 			IsSignedIn:   true,
-			SkipCache:    true,
+			SkipDSCache:  true,
 		}
 		for _, modifier := range modifiers {
 			modifier(reqCtx)
diff --git a/pkg/services/accesscontrol/resourcepermissions/api_test.go b/pkg/services/accesscontrol/resourcepermissions/api_test.go
index da13f042aa6..d994055ceef 100644
--- a/pkg/services/accesscontrol/resourcepermissions/api_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/api_test.go
@@ -449,7 +449,7 @@ func contextProvider(tc *testContext) web.Handler {
 			Context:      c,
 			SignedInUser: tc.user,
 			IsSignedIn:   signedIn,
-			SkipCache:    true,
+			SkipDSCache:  true,
 			Logger:       log.New("test"),
 		}
 		c.Req = c.Req.WithContext(ctxkey.Set(c.Req.Context(), reqCtx))
diff --git a/pkg/services/caching/fake_caching_service.go b/pkg/services/caching/fake_caching_service.go
new file mode 100644
index 00000000000..c4cb7434425
--- /dev/null
+++ b/pkg/services/caching/fake_caching_service.go
@@ -0,0 +1,46 @@
+package caching
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/assert"
+)
+
+type FakeOSSCachingService struct {
+	calls                  map[string]int
+	ReturnHit              bool
+	ReturnResourceResponse *backend.CallResourceResponse
+	ReturnQueryResponse    CachedQueryDataResponse
+}
+
+func (f *FakeOSSCachingService) CacheResourceResponse(ctx context.Context, req *backend.CallResourceRequest, resp *backend.CallResourceResponse) {
+	f.calls["CacheResourceResponse"]++
+}
+
+func (f *FakeOSSCachingService) HandleQueryRequest(ctx context.Context, req *backend.QueryDataRequest) (bool, CachedQueryDataResponse) {
+	f.calls["HandleQueryRequest"]++
+	return f.ReturnHit, f.ReturnQueryResponse
+}
+
+func (f *FakeOSSCachingService) HandleResourceRequest(ctx context.Context, req *backend.CallResourceRequest) (bool, *backend.CallResourceResponse) {
+	f.calls["HandleResourceRequest"]++
+	return f.ReturnHit, f.ReturnResourceResponse
+}
+
+func (f *FakeOSSCachingService) AssertCalls(t *testing.T, fn string, times int) {
+	assert.Equal(t, times, f.calls[fn])
+}
+
+func (f *FakeOSSCachingService) Reset() {
+	*f = *NewFakeOSSCachingService()
+}
+
+func NewFakeOSSCachingService() *FakeOSSCachingService {
+	fake := &FakeOSSCachingService{
+		calls: map[string]int{},
+	}
+
+	return fake
+}
diff --git a/pkg/services/caching/service.go b/pkg/services/caching/service.go
new file mode 100644
index 00000000000..57be8735c78
--- /dev/null
+++ b/pkg/services/caching/service.go
@@ -0,0 +1,60 @@
+package caching
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+)
+
+const (
+	XCacheHeader   = "X-Cache"
+	StatusHit      = "HIT"
+	StatusMiss     = "MISS"
+	StatusBypass   = "BYPASS"
+	StatusError    = "ERROR"
+	StatusDisabled = "DISABLED"
+)
+
+type CacheQueryResponseFn func(context.Context, *backend.QueryDataResponse)
+
+type CachedQueryDataResponse struct {
+	// The cached data response associated with a query, or nil if no cached data is found
+	Response *backend.QueryDataResponse
+	// A function that should be used to cache a QueryDataResponse for a given query.
+	// It can be set to nil by the method implementation (if there is an error, for example), so it should be checked before being called.
+	UpdateCacheFn CacheQueryResponseFn
+}
+
+func ProvideCachingService() *OSSCachingService {
+	return &OSSCachingService{}
+}
+
+type CachingService interface {
+	// HandleQueryRequest uses a QueryDataRequest to check the cache for any existing results for that query.
+	// If none are found, it should return false and a CachedQueryDataResponse with an UpdateCacheFn which can be used to update the results cache after the fact.
+	// This function may populate any response headers (accessible through the context) with the cache status using the X-Cache header.
+	HandleQueryRequest(context.Context, *backend.QueryDataRequest) (bool, CachedQueryDataResponse)
+	// HandleResourceRequest uses a CallResourceRequest to check the cache for any existing results for that request. If none are found, it should return false.
+	// This function may populate any response headers (accessible through the context) with the cache status using the X-Cache header.
+	HandleResourceRequest(context.Context, *backend.CallResourceRequest) (bool, *backend.CallResourceResponse)
+	// CacheResourceResponse is used to cache resource responses for a resource request.
+	// Because plugins can send multiple responses asyncronously, the implementation should be able to handle multiple calls to this function for one request.
+	CacheResourceResponse(context.Context, *backend.CallResourceRequest, *backend.CallResourceResponse)
+}
+
+// Implementation of interface - does nothing
+type OSSCachingService struct {
+}
+
+func (s *OSSCachingService) HandleQueryRequest(ctx context.Context, req *backend.QueryDataRequest) (bool, CachedQueryDataResponse) {
+	return false, CachedQueryDataResponse{}
+}
+
+func (s *OSSCachingService) HandleResourceRequest(ctx context.Context, req *backend.CallResourceRequest) (bool, *backend.CallResourceResponse) {
+	return false, nil
+}
+
+func (s *OSSCachingService) CacheResourceResponse(ctx context.Context, req *backend.CallResourceRequest, resp *backend.CallResourceResponse) {
+}
+
+var _ CachingService = &OSSCachingService{}
diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go
index 62c59721005..d55b931ec9d 100644
--- a/pkg/services/contexthandler/contexthandler.go
+++ b/pkg/services/contexthandler/contexthandler.go
@@ -125,7 +125,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
 			},
 			IsSignedIn:     false,
 			AllowAnonymous: false,
-			SkipCache:      false,
+			SkipDSCache:    false,
 			Logger:         log.New("context"),
 		}
 
diff --git a/pkg/services/contexthandler/model/model.go b/pkg/services/contexthandler/model/model.go
index 4904bb52f1e..07c8a43dc70 100644
--- a/pkg/services/contexthandler/model/model.go
+++ b/pkg/services/contexthandler/model/model.go
@@ -25,7 +25,8 @@ type ReqContext struct {
 	IsSignedIn     bool
 	IsRenderCall   bool
 	AllowAnonymous bool
-	SkipCache      bool
+	SkipDSCache    bool
+	SkipQueryCache bool
 	Logger         log.Logger
 	Error          error
 	// RequestNonce is a cryptographic request identifier for use with Content Security Policy.
diff --git a/pkg/services/datasourceproxy/datasourceproxy.go b/pkg/services/datasourceproxy/datasourceproxy.go
index 00893b2ef03..c03f63c303e 100644
--- a/pkg/services/datasourceproxy/datasourceproxy.go
+++ b/pkg/services/datasourceproxy/datasourceproxy.go
@@ -73,7 +73,7 @@ func (p *DataSourceProxyService) ProxyDatasourceRequestWithUID(c *contextmodel.R
 		return
 	}
 
-	ds, err := p.DataSourceCache.GetDatasourceByUID(c.Req.Context(), dsUID, c.SignedInUser, c.SkipCache)
+	ds, err := p.DataSourceCache.GetDatasourceByUID(c.Req.Context(), dsUID, c.SignedInUser, c.SkipDSCache)
 	if err != nil {
 		toAPIError(c, err)
 		return
@@ -84,7 +84,7 @@ func (p *DataSourceProxyService) ProxyDatasourceRequestWithUID(c *contextmodel.R
 func (p *DataSourceProxyService) ProxyDatasourceRequestWithID(c *contextmodel.ReqContext, dsID int64) {
 	c.TimeRequest(metrics.MDataSourceProxyReqTimer)
 
-	ds, err := p.DataSourceCache.GetDatasource(c.Req.Context(), dsID, c.SignedInUser, c.SkipCache)
+	ds, err := p.DataSourceCache.GetDatasource(c.Req.Context(), dsID, c.SignedInUser, c.SkipDSCache)
 	if err != nil {
 		toAPIError(c, err)
 		return
diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index 5b41d6d573e..ec2992aa4cf 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -23,4 +23,5 @@ const (
 	awsPluginsSquad                             codeowner = "@grafana/aws-plugins"
 	appO11ySquad                                codeowner = "@grafana/app-o11y"
 	grafanaPartnerPluginsSquad                  codeowner = "@grafana/partner-plugins"
+	grafanaOperatorExperienceSquad              codeowner = "@grafana/grafana-operator-experience-squad"
 )
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index d45a526ff0d..80bb1c627ea 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -513,6 +513,13 @@ var (
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityMetricsSquad,
 		},
+		{
+			Name:            "useCachingService",
+			Description:     "When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation",
+			State:           FeatureStateStable,
+			Owner:           grafanaOperatorExperienceSquad,
+			RequiresRestart: true,
+		},
 		{
 			Name:        "disableElasticsearchBackendQuerying",
 			Description: "Disable the processing of queries and responses in the Elasticsearch data source through backend",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 50f07229c47..88f3f8d63d3 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -76,4 +76,5 @@ renderAuthJWT,beta,@grafana/grafana-as-code,false,false,false,false
 pyroscopeFlameGraph,alpha,@grafana/observability-traces-and-profiling,false,false,false,false
 externalServiceAuth,alpha,@grafana/grafana-authnz-team,true,false,false,false
 dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false,true
+useCachingService,stable,@grafana/grafana-operator-experience-squad,false,false,true,false
 disableElasticsearchBackendQuerying,stable,@grafana/observability-logs,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 925bc11af25..c254998fb49 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -315,6 +315,10 @@ const (
 	// Support dataplane contract field name change for transformations and field name matchers where the name is different
 	FlagDataplaneFrontendFallback = "dataplaneFrontendFallback"
 
+	// FlagUseCachingService
+	// When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation
+	FlagUseCachingService = "useCachingService"
+
 	// FlagDisableElasticsearchBackendQuerying
 	// Disable the processing of queries and responses in the Elasticsearch data source through backend
 	FlagDisableElasticsearchBackendQuerying = "disableElasticsearchBackendQuerying"
diff --git a/pkg/services/ngalert/api/lotex_am.go b/pkg/services/ngalert/api/lotex_am.go
index 0a4ac25864e..3d1745f376f 100644
--- a/pkg/services/ngalert/api/lotex_am.go
+++ b/pkg/services/ngalert/api/lotex_am.go
@@ -74,7 +74,7 @@ func (am *LotexAM) withAMReq(
 		return response.Error(http.StatusBadRequest, "DatasourceUID is invalid", nil)
 	}
 
-	ds, err := am.DataProxy.DataSourceCache.GetDatasourceByUID(ctx.Req.Context(), datasourceUID, ctx.SignedInUser, ctx.SkipCache)
+	ds, err := am.DataProxy.DataSourceCache.GetDatasourceByUID(ctx.Req.Context(), datasourceUID, ctx.SignedInUser, ctx.SkipDSCache)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceAccessDenied) {
 			return ErrResp(http.StatusForbidden, err, "Access denied to datasource")
diff --git a/pkg/services/ngalert/api/lotex_prom.go b/pkg/services/ngalert/api/lotex_prom.go
index 7be5a3b417b..761fe90a4af 100644
--- a/pkg/services/ngalert/api/lotex_prom.go
+++ b/pkg/services/ngalert/api/lotex_prom.go
@@ -82,7 +82,7 @@ func (p *LotexProm) getEndpoints(ctx *contextmodel.ReqContext) (*promEndpoints,
 		return nil, fmt.Errorf("datasource UID is invalid")
 	}
 
-	ds, err := p.DataProxy.DataSourceCache.GetDatasourceByUID(ctx.Req.Context(), datasourceUID, ctx.SignedInUser, ctx.SkipCache)
+	ds, err := p.DataProxy.DataSourceCache.GetDatasourceByUID(ctx.Req.Context(), datasourceUID, ctx.SignedInUser, ctx.SkipDSCache)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/ngalert/api/lotex_ruler.go b/pkg/services/ngalert/api/lotex_ruler.go
index ef1776fe6ec..4e0100304cc 100644
--- a/pkg/services/ngalert/api/lotex_ruler.go
+++ b/pkg/services/ngalert/api/lotex_ruler.go
@@ -179,7 +179,7 @@ func (r *LotexRuler) validateAndGetPrefix(ctx *contextmodel.ReqContext) (string,
 		return "", fmt.Errorf("datasource UID is invalid")
 	}
 
-	ds, err := r.DataProxy.DataSourceCache.GetDatasourceByUID(ctx.Req.Context(), datasourceUID, ctx.SignedInUser, ctx.SkipCache)
+	ds, err := r.DataProxy.DataSourceCache.GetDatasourceByUID(ctx.Req.Context(), datasourceUID, ctx.SignedInUser, ctx.SkipDSCache)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/services/ngalert/api/util.go b/pkg/services/ngalert/api/util.go
index 799b8aec7e8..48da342039f 100644
--- a/pkg/services/ngalert/api/util.go
+++ b/pkg/services/ngalert/api/util.go
@@ -36,7 +36,7 @@ func toMacaronPath(path string) string {
 
 func getDatasourceByUID(ctx *contextmodel.ReqContext, cache datasources.CacheService, expectedType apimodels.Backend) (*datasources.DataSource, error) {
 	datasourceUID := web.Params(ctx.Req)[":DatasourceUID"]
-	ds, err := cache.GetDatasourceByUID(ctx.Req.Context(), datasourceUID, ctx.SignedInUser, ctx.SkipCache)
+	ds, err := cache.GetDatasourceByUID(ctx.Req.Context(), datasourceUID, ctx.SignedInUser, ctx.SkipDSCache)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/ngalert/api/util_test.go b/pkg/services/ngalert/api/util_test.go
index 6c5d5e18980..7f7c34a03b5 100644
--- a/pkg/services/ngalert/api/util_test.go
+++ b/pkg/services/ngalert/api/util_test.go
@@ -50,7 +50,8 @@ func TestAlertingProxy_createProxyContext(t *testing.T) {
 		IsSignedIn:            rand.Int63()%2 == 1,
 		IsRenderCall:          rand.Int63()%2 == 1,
 		AllowAnonymous:        rand.Int63()%2 == 1,
-		SkipCache:             rand.Int63()%2 == 1,
+		SkipDSCache:           rand.Int63()%2 == 1,
+		SkipQueryCache:        rand.Int63()%2 == 1,
 		Logger:                log.New("test"),
 		RequestNonce:          util.GenerateShortUID(),
 		IsPublicDashboardView: rand.Int63()%2 == 1,
@@ -75,7 +76,8 @@ func TestAlertingProxy_createProxyContext(t *testing.T) {
 			require.Equal(t, ctx.IsSignedIn, newCtx.IsSignedIn)
 			require.Equal(t, ctx.IsRenderCall, newCtx.IsRenderCall)
 			require.Equal(t, ctx.AllowAnonymous, newCtx.AllowAnonymous)
-			require.Equal(t, ctx.SkipCache, newCtx.SkipCache)
+			require.Equal(t, ctx.SkipDSCache, newCtx.SkipDSCache)
+			require.Equal(t, ctx.SkipQueryCache, newCtx.SkipQueryCache)
 			require.Equal(t, ctx.Logger, newCtx.Logger)
 			require.Equal(t, ctx.RequestNonce, newCtx.RequestNonce)
 			require.Equal(t, ctx.IsPublicDashboardView, newCtx.IsPublicDashboardView)
diff --git a/pkg/services/pluginsintegration/clientmiddleware/caching_metrics.go b/pkg/services/pluginsintegration/clientmiddleware/caching_metrics.go
new file mode 100644
index 00000000000..51f64d3ca4c
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/caching_metrics.go
@@ -0,0 +1,35 @@
+package clientmiddleware
+
+import (
+	"github.com/grafana/grafana/pkg/infra/metrics"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const (
+	QueryPubdash   = "pubdash"
+	QueryDashboard = "dashboard"
+)
+
+var QueryCachingRequestHistogram = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+	Namespace: metrics.ExporterName,
+	Subsystem: "caching",
+	Name:      "query_caching_request_duration_seconds",
+	Help:      "histogram of grafana query endpoint requests in seconds",
+	Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100},
+}, []string{"datasource_type", "cache", "query_type"})
+
+var ResourceCachingRequestHistogram = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+	Namespace: metrics.ExporterName,
+	Subsystem: "caching",
+	Name:      "resource_caching_request_duration_seconds",
+	Help:      "histogram of grafana resource endpoint requests in seconds",
+	Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100},
+}, []string{"plugin_id", "cache"})
+
+func getQueryType(req *contextmodel.ReqContext) string {
+	if req.IsPublicDashboardView {
+		return QueryPubdash
+	}
+	return QueryDashboard
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
new file mode 100644
index 00000000000..a86f5921dce
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
@@ -0,0 +1,144 @@
+package clientmiddleware
+
+import (
+	"context"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/caching"
+	"github.com/grafana/grafana/pkg/services/contexthandler"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+// NewCachingMiddleware creates a new plugins.ClientMiddleware that will
+// attempt to read and write query results to the cache
+func NewCachingMiddleware(cachingService caching.CachingService) plugins.ClientMiddleware {
+	log := log.New("caching_middleware")
+	if err := prometheus.Register(QueryCachingRequestHistogram); err != nil {
+		log.Error("error registering prometheus collector 'QueryRequestHistogram'", "error", err)
+	}
+	if err := prometheus.Register(ResourceCachingRequestHistogram); err != nil {
+		log.Error("error registering prometheus collector 'ResourceRequestHistogram'", "error", err)
+	}
+	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+		return &CachingMiddleware{
+			next:    next,
+			caching: cachingService,
+			log:     log,
+		}
+	})
+}
+
+type CachingMiddleware struct {
+	next    plugins.Client
+	caching caching.CachingService
+	log     log.Logger
+}
+
+// QueryData receives a data request and attempts to access results already stored in the cache for that request.
+// If data is found, it will return it immediately. Otherwise, it will perform the queries as usual, then write the response to the cache.
+// If the cache service is implemented, we capture the request duration as a metric. The service is expected to write any response headers.
+func (m *CachingMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	if req == nil {
+		return m.next.QueryData(ctx, req)
+	}
+
+	reqCtx := contexthandler.FromContext(ctx)
+	if reqCtx == nil {
+		return m.next.QueryData(ctx, req)
+	}
+
+	// time how long this request takes
+	start := time.Now()
+
+	// First look in the query cache if enabled
+	hit, cr := m.caching.HandleQueryRequest(ctx, req)
+
+	defer func() {
+		// record request duration if caching was used
+		if ch := reqCtx.Resp.Header().Get(caching.XCacheHeader); ch != "" {
+			QueryCachingRequestHistogram.With(prometheus.Labels{
+				"datasource_type": req.PluginContext.DataSourceInstanceSettings.Type,
+				"cache":           ch,
+				"query_type":      getQueryType(reqCtx),
+			}).Observe(time.Since(start).Seconds())
+		}
+	}()
+
+	// Cache hit; return the response
+	if hit {
+		return cr.Response, nil
+	}
+
+	// Cache miss; do the actual queries
+	resp, err := m.next.QueryData(ctx, req)
+
+	// Update the query cache with the result for this metrics request
+	if err == nil && cr.UpdateCacheFn != nil {
+		cr.UpdateCacheFn(ctx, resp)
+	}
+
+	return resp, err
+}
+
+// CallResource receives a resource request and attempts to access results already stored in the cache for that request.
+// If data is found, it will return it immediately. Otherwise, it will perform the request as usual. The caller of CallResource is expected to explicitly update the cache with any responses.
+// If the cache service is implemented, we capture the request duration as a metric. The service is expected to write any response headers.
+func (m *CachingMiddleware) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	if req == nil {
+		return m.next.CallResource(ctx, req, sender)
+	}
+
+	reqCtx := contexthandler.FromContext(ctx)
+	if reqCtx == nil {
+		return m.next.CallResource(ctx, req, sender)
+	}
+
+	// time how long this request takes
+	start := time.Now()
+
+	// First look in the resource cache if enabled
+	hit, resp := m.caching.HandleResourceRequest(ctx, req)
+
+	defer func() {
+		// record request duration if caching was used
+		if ch := reqCtx.Resp.Header().Get(caching.XCacheHeader); ch != "" {
+			ResourceCachingRequestHistogram.With(prometheus.Labels{
+				"plugin_id": req.PluginContext.PluginID,
+				"cache":     ch,
+			}).Observe(time.Since(start).Seconds())
+		}
+	}()
+
+	// Cache hit; send the response and return
+	if hit {
+		return sender.Send(resp)
+	}
+
+	// Cache miss; do the actual request
+	// The call to update the cache happens in /pkg/api/plugin_resource.go in the flushStream() func
+	// TODO: Implement updating the cache from this method
+	return m.next.CallResource(ctx, req, sender)
+}
+
+func (m *CachingMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	return m.next.CheckHealth(ctx, req)
+}
+
+func (m *CachingMiddleware) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
+	return m.next.CollectMetrics(ctx, req)
+}
+
+func (m *CachingMiddleware) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	return m.next.SubscribeStream(ctx, req)
+}
+
+func (m *CachingMiddleware) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	return m.next.PublishStream(ctx, req)
+}
+
+func (m *CachingMiddleware) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	return m.next.RunStream(ctx, req, sender)
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware_test.go
new file mode 100644
index 00000000000..54cf5e2103c
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware_test.go
@@ -0,0 +1,225 @@
+package clientmiddleware
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/plugins/manager/client/clienttest"
+	"github.com/grafana/grafana/pkg/services/caching"
+	"github.com/grafana/grafana/pkg/services/contexthandler"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCachingMiddleware(t *testing.T) {
+	t.Run("When QueryData is called", func(t *testing.T) {
+		req, err := http.NewRequest(http.MethodGet, "/query", nil)
+		require.NoError(t, err)
+
+		cs := caching.NewFakeOSSCachingService()
+		cdt := clienttest.NewClientDecoratorTest(t,
+			clienttest.WithReqContext(req, &user.SignedInUser{}),
+			clienttest.WithMiddlewares(NewCachingMiddleware(cs)),
+		)
+
+		jsonDataMap := map[string]interface{}{}
+		jsonDataBytes, err := json.Marshal(&jsonDataMap)
+		require.NoError(t, err)
+
+		pluginCtx := backend.PluginContext{
+			DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+				JSONData: jsonDataBytes,
+			},
+		}
+
+		// Populated by clienttest.WithReqContext
+		reqCtx := contexthandler.FromContext(req.Context())
+		require.NotNil(t, reqCtx)
+
+		qdr := &backend.QueryDataRequest{
+			PluginContext: pluginCtx,
+		}
+
+		// Track whether the update cache fn was called, depending on what the response headers are in the cache request
+		var updateCacheCalled bool
+		dataResponse := caching.CachedQueryDataResponse{
+			Response: &backend.QueryDataResponse{},
+			UpdateCacheFn: func(ctx context.Context, qdr *backend.QueryDataResponse) {
+				updateCacheCalled = true
+			},
+		}
+
+		t.Run("If cache returns a hit, no queries are issued", func(t *testing.T) {
+			t.Cleanup(func() {
+				updateCacheCalled = false
+				cs.Reset()
+			})
+
+			cs.ReturnHit = true
+			cs.ReturnQueryResponse = dataResponse
+
+			resp, err := cdt.Decorator.QueryData(req.Context(), qdr)
+			assert.NoError(t, err)
+			// Cache service is called once
+			cs.AssertCalls(t, "HandleQueryRequest", 1)
+			// Equals the mocked response
+			assert.NotNil(t, resp)
+			assert.Equal(t, dataResponse.Response, resp)
+			// Cache was not updated by the middleware
+			assert.False(t, updateCacheCalled)
+		})
+
+		t.Run("If cache returns a miss, queries are issued and the update cache function is called", func(t *testing.T) {
+			t.Cleanup(func() {
+				updateCacheCalled = false
+				cs.Reset()
+			})
+
+			cs.ReturnHit = false
+			cs.ReturnQueryResponse = dataResponse
+
+			resp, err := cdt.Decorator.QueryData(req.Context(), qdr)
+			assert.NoError(t, err)
+			// Cache service is called once
+			cs.AssertCalls(t, "HandleQueryRequest", 1)
+			// Equals nil (returned by the decorator test)
+			assert.Nil(t, resp)
+			// Since it was a miss, the middleware called the update func
+			assert.True(t, updateCacheCalled)
+		})
+	})
+
+	t.Run("When CallResource is called", func(t *testing.T) {
+		req, err := http.NewRequest(http.MethodGet, "/resource/blah", nil)
+		require.NoError(t, err)
+
+		cs := caching.NewFakeOSSCachingService()
+		cdt := clienttest.NewClientDecoratorTest(t,
+			clienttest.WithReqContext(req, &user.SignedInUser{}),
+			clienttest.WithMiddlewares(NewCachingMiddleware(cs)),
+		)
+
+		jsonDataMap := map[string]interface{}{}
+		jsonDataBytes, err := json.Marshal(&jsonDataMap)
+		require.NoError(t, err)
+
+		pluginCtx := backend.PluginContext{
+			DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+				JSONData: jsonDataBytes,
+			},
+		}
+
+		// Populated by clienttest.WithReqContext
+		reqCtx := contexthandler.FromContext(req.Context())
+		require.NotNil(t, reqCtx)
+
+		crr := &backend.CallResourceRequest{
+			PluginContext: pluginCtx,
+		}
+
+		resourceResponse := &backend.CallResourceResponse{
+			Status: 200,
+			Body:   []byte("bogus"),
+		}
+
+		var sentResponse *backend.CallResourceResponse
+		var storeOneResponseCallResourceSender = callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
+			sentResponse = res
+			return nil
+		})
+
+		t.Run("If cache returns a hit, no resource call is issued", func(t *testing.T) {
+			t.Cleanup(func() {
+				sentResponse = nil
+				cs.Reset()
+			})
+
+			cs.ReturnHit = true
+			cs.ReturnResourceResponse = resourceResponse
+
+			err := cdt.Decorator.CallResource(req.Context(), crr, storeOneResponseCallResourceSender)
+			assert.NoError(t, err)
+			// Cache service is called once
+			cs.AssertCalls(t, "HandleResourceRequest", 1)
+			// Equals the mocked response was sent
+			assert.NotNil(t, sentResponse)
+			assert.Equal(t, resourceResponse, sentResponse)
+		})
+
+		t.Run("If cache returns a miss, resource call is issued", func(t *testing.T) {
+			t.Cleanup(func() {
+				sentResponse = nil
+				cs.Reset()
+			})
+
+			cs.ReturnHit = false
+			cs.ReturnResourceResponse = resourceResponse
+
+			err := cdt.Decorator.CallResource(req.Context(), crr, storeOneResponseCallResourceSender)
+			assert.NoError(t, err)
+			// Cache service is called once
+			cs.AssertCalls(t, "HandleResourceRequest", 1)
+			// Nil response was sent
+			assert.Nil(t, sentResponse)
+		})
+	})
+
+	t.Run("When RequestContext is nil", func(t *testing.T) {
+		req, err := http.NewRequest(http.MethodGet, "/doesnt/matter", nil)
+		require.NoError(t, err)
+
+		cs := caching.NewFakeOSSCachingService()
+		cdt := clienttest.NewClientDecoratorTest(t,
+			// Skip the request context in this case
+			clienttest.WithMiddlewares(NewCachingMiddleware(cs)),
+		)
+		reqCtx := contexthandler.FromContext(req.Context())
+		require.Nil(t, reqCtx)
+
+		jsonDataMap := map[string]interface{}{}
+		jsonDataBytes, err := json.Marshal(&jsonDataMap)
+		require.NoError(t, err)
+
+		pluginCtx := backend.PluginContext{
+			DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+				JSONData: jsonDataBytes,
+			},
+		}
+
+		t.Run("Query caching is skipped", func(t *testing.T) {
+			t.Cleanup(func() {
+				cs.Reset()
+			})
+
+			qdr := &backend.QueryDataRequest{
+				PluginContext: pluginCtx,
+			}
+
+			resp, err := cdt.Decorator.QueryData(context.Background(), qdr)
+			assert.NoError(t, err)
+			// Cache service is never called
+			cs.AssertCalls(t, "HandleQueryRequest", 0)
+			// Equals nil (returned by the decorator test)
+			assert.Nil(t, resp)
+		})
+
+		t.Run("Resource caching is skipped", func(t *testing.T) {
+			t.Cleanup(func() {
+				cs.Reset()
+			})
+
+			crr := &backend.CallResourceRequest{
+				PluginContext: pluginCtx,
+			}
+
+			err := cdt.Decorator.CallResource(req.Context(), crr, nopCallResourceSender)
+			assert.NoError(t, err)
+			// Cache service is never called
+			cs.AssertCalls(t, "HandleResourceRequest", 0)
+		})
+	})
+}
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index 1434b9a2dbb..0ae3e011d73 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -21,6 +21,8 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/store"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	"github.com/grafana/grafana/pkg/plugins/repo"
+	"github.com/grafana/grafana/pkg/services/caching"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/oauthtoken"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
@@ -77,24 +79,29 @@ var WireExtensionSet = wire.NewSet(
 	finder.NewLocalFinder,
 )
 
-func ProvideClientDecorator(cfg *setting.Cfg, pCfg *pCfg.Cfg,
+func ProvideClientDecorator(
+	cfg *setting.Cfg, pCfg *pCfg.Cfg,
 	pluginRegistry registry.Service,
 	oAuthTokenService oauthtoken.OAuthTokenService,
-	tracer tracing.Tracer) (*client.Decorator, error) {
-	return NewClientDecorator(cfg, pCfg, pluginRegistry, oAuthTokenService, tracer)
+	tracer tracing.Tracer,
+	cachingService caching.CachingService,
+	features *featuremgmt.FeatureManager,
+) (*client.Decorator, error) {
+	return NewClientDecorator(cfg, pCfg, pluginRegistry, oAuthTokenService, tracer, cachingService, features)
 }
 
-func NewClientDecorator(cfg *setting.Cfg, pCfg *pCfg.Cfg,
-	pluginRegistry registry.Service,
-	oAuthTokenService oauthtoken.OAuthTokenService,
-	tracer tracing.Tracer) (*client.Decorator, error) {
+func NewClientDecorator(
+	cfg *setting.Cfg, pCfg *pCfg.Cfg,
+	pluginRegistry registry.Service, oAuthTokenService oauthtoken.OAuthTokenService,
+	tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager,
+) (*client.Decorator, error) {
 	c := client.ProvideService(pluginRegistry, pCfg)
-	middlewares := CreateMiddlewares(cfg, oAuthTokenService, tracer)
+	middlewares := CreateMiddlewares(cfg, oAuthTokenService, tracer, cachingService, features)
 
 	return client.NewDecorator(c, middlewares...)
 }
 
-func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer) []plugins.ClientMiddleware {
+func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager) []plugins.ClientMiddleware {
 	skipCookiesNames := []string{cfg.LoginCookieName}
 	middlewares := []plugins.ClientMiddleware{
 		clientmiddleware.NewTracingMiddleware(tracer),
@@ -104,6 +111,11 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken
 		clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
 	}
 
+	// Placing the new service implementation behind a feature flag until it is known to be stable
+	if features.IsEnabled(featuremgmt.FlagUseCachingService) {
+		middlewares = append(middlewares, clientmiddleware.NewCachingMiddleware(cachingService))
+	}
+
 	if cfg.SendUserHeader {
 		middlewares = append(middlewares, clientmiddleware.NewUserHeaderMiddleware())
 	}
diff --git a/pkg/services/publicdashboards/api/common_test.go b/pkg/services/publicdashboards/api/common_test.go
index 511342475c5..f256c6f64c7 100644
--- a/pkg/services/publicdashboards/api/common_test.go
+++ b/pkg/services/publicdashboards/api/common_test.go
@@ -86,7 +86,7 @@ func contextProvider(tc *testContext) web.Handler {
 			Context:      c,
 			SignedInUser: tc.user,
 			IsSignedIn:   signedIn,
-			SkipCache:    true,
+			SkipDSCache:  true,
 			Logger:       log.New("publicdashboards-test"),
 		}
 		c.Req = c.Req.WithContext(ctxkey.Set(c.Req.Context(), reqCtx))
diff --git a/pkg/services/publicdashboards/api/query.go b/pkg/services/publicdashboards/api/query.go
index 39ea9ccfb60..b1575095cb9 100644
--- a/pkg/services/publicdashboards/api/query.go
+++ b/pkg/services/publicdashboards/api/query.go
@@ -70,7 +70,7 @@ func (api *Api) QueryPublicDashboard(c *contextmodel.ReqContext) response.Respon
 		return response.Err(ErrBadRequest.Errorf("QueryPublicDashboard: error parsing request: %v", err))
 	}
 
-	resp, err := api.PublicDashboardService.GetQueryDataResponse(c.Req.Context(), c.SkipCache, reqDTO, panelId, accessToken)
+	resp, err := api.PublicDashboardService.GetQueryDataResponse(c.Req.Context(), c.SkipDSCache, reqDTO, panelId, accessToken)
 	if err != nil {
 		return response.Err(err)
 	}
diff --git a/pkg/services/publicdashboards/public_dashboard_service_mock.go b/pkg/services/publicdashboards/public_dashboard_service_mock.go
index 886cd340ec4..b5d72558bf1 100644
--- a/pkg/services/publicdashboards/public_dashboard_service_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_service_mock.go
@@ -461,4 +461,4 @@ func NewFakePublicDashboardService(t mockConstructorTestingTNewFakePublicDashboa
 	t.Cleanup(func() { mock.AssertExpectations(t) })
 
 	return mock
-}
+}
\ No newline at end of file
diff --git a/pkg/services/publicdashboards/publicdashboard.go b/pkg/services/publicdashboards/publicdashboard.go
index 2b37aa94384..def7c718eb6 100644
--- a/pkg/services/publicdashboards/publicdashboard.go
+++ b/pkg/services/publicdashboards/publicdashboard.go
@@ -29,7 +29,7 @@ type Service interface {
 	DeleteByDashboard(ctx context.Context, dashboard *dashboards.Dashboard) error
 
 	GetMetricRequest(ctx context.Context, dashboard *dashboards.Dashboard, publicDashboard *PublicDashboard, panelId int64, reqDTO PublicDashboardQueryDTO) (dtos.MetricRequest, error)
-	GetQueryDataResponse(ctx context.Context, skipCache bool, reqDTO PublicDashboardQueryDTO, panelId int64, accessToken string) (*backend.QueryDataResponse, error)
+	GetQueryDataResponse(ctx context.Context, skipDSCache bool, reqDTO PublicDashboardQueryDTO, panelId int64, accessToken string) (*backend.QueryDataResponse, error)
 	GetOrgIdByAccessToken(ctx context.Context, accessToken string) (int64, error)
 	NewPublicDashboardAccessToken(ctx context.Context) (string, error)
 	NewPublicDashboardUid(ctx context.Context) (string, error)
diff --git a/pkg/services/publicdashboards/service/query.go b/pkg/services/publicdashboards/service/query.go
index 22c6fd4f96c..c68798d98ac 100644
--- a/pkg/services/publicdashboards/service/query.go
+++ b/pkg/services/publicdashboards/service/query.go
@@ -120,7 +120,7 @@ func (pd *PublicDashboardServiceImpl) GetMetricRequest(ctx context.Context, dash
 }
 
 // GetQueryDataResponse returns a query data response for the given panel and query
-func (pd *PublicDashboardServiceImpl) GetQueryDataResponse(ctx context.Context, skipCache bool, queryDto models.PublicDashboardQueryDTO, panelId int64, accessToken string) (*backend.QueryDataResponse, error) {
+func (pd *PublicDashboardServiceImpl) GetQueryDataResponse(ctx context.Context, skipDSCache bool, queryDto models.PublicDashboardQueryDTO, panelId int64, accessToken string) (*backend.QueryDataResponse, error) {
 	publicDashboard, dashboard, err := pd.FindEnabledPublicDashboardAndDashboardByAccessToken(ctx, accessToken)
 	if err != nil {
 		return nil, err
@@ -136,7 +136,7 @@ func (pd *PublicDashboardServiceImpl) GetQueryDataResponse(ctx context.Context,
 	}
 
 	anonymousUser := buildAnonymousUser(ctx, dashboard)
-	res, err := pd.QueryDataService.QueryData(ctx, anonymousUser, skipCache, metricReq)
+	res, err := pd.QueryDataService.QueryData(ctx, anonymousUser, skipDSCache, metricReq)
 
 	reqDatasources := metricReq.GetUniqueDatasourceTypes()
 	if err != nil {
diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go
index f7533375fcc..eadddc50ab8 100644
--- a/pkg/services/query/query.go
+++ b/pkg/services/query/query.go
@@ -56,7 +56,7 @@ func ProvideService(
 //go:generate mockery --name Service --structname FakeQueryService --inpackage --filename query_service_mock.go
 type Service interface {
 	Run(ctx context.Context) error
-	QueryData(ctx context.Context, user *user.SignedInUser, skipCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error)
+	QueryData(ctx context.Context, user *user.SignedInUser, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error)
 }
 
 // Gives us compile time error if the service does not adhere to the contract of the interface
@@ -79,9 +79,9 @@ func (s *ServiceImpl) Run(ctx context.Context) error {
 }
 
 // QueryData processes queries and returns query responses. It handles queries to single or mixed datasources, as well as expressions.
-func (s *ServiceImpl) QueryData(ctx context.Context, user *user.SignedInUser, skipCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error) {
+func (s *ServiceImpl) QueryData(ctx context.Context, user *user.SignedInUser, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error) {
 	// Parse the request into parsed queries grouped by datasource uid
-	parsedReq, err := s.parseMetricRequest(ctx, user, skipCache, reqDTO)
+	parsedReq, err := s.parseMetricRequest(ctx, user, skipDSCache, reqDTO)
 	if err != nil {
 		return nil, err
 	}
@@ -95,11 +95,11 @@ func (s *ServiceImpl) QueryData(ctx context.Context, user *user.SignedInUser, sk
 		return s.handleQuerySingleDatasource(ctx, user, parsedReq)
 	}
 	// If there are multiple datasources, handle their queries concurrently and return the aggregate result
-	return s.executeConcurrentQueries(ctx, user, skipCache, reqDTO, parsedReq.parsedQueries)
+	return s.executeConcurrentQueries(ctx, user, skipDSCache, reqDTO, parsedReq.parsedQueries)
 }
 
 // executeConcurrentQueries executes queries to multiple datasources concurrently and returns the aggregate result.
-func (s *ServiceImpl) executeConcurrentQueries(ctx context.Context, user *user.SignedInUser, skipCache bool, reqDTO dtos.MetricRequest, queriesbyDs map[string][]parsedQuery) (*backend.QueryDataResponse, error) {
+func (s *ServiceImpl) executeConcurrentQueries(ctx context.Context, user *user.SignedInUser, skipDSCache bool, reqDTO dtos.MetricRequest, queriesbyDs map[string][]parsedQuery) (*backend.QueryDataResponse, error) {
 	g, ctx := errgroup.WithContext(ctx)
 	g.SetLimit(8) // arbitrary limit to prevent too many concurrent requests
 	rchan := make(chan backend.Responses, len(queriesbyDs))
@@ -132,7 +132,7 @@ func (s *ServiceImpl) executeConcurrentQueries(ctx context.Context, user *user.S
 			// Handle panics in the datasource qery
 			defer recoveryFn(subDTO.Queries)
 
-			subResp, err := s.QueryData(ctx, user, skipCache, subDTO)
+			subResp, err := s.QueryData(ctx, user, skipDSCache, subDTO)
 			if err == nil {
 				rchan <- subResp.Responses
 			} else {
@@ -248,7 +248,7 @@ func (s *ServiceImpl) handleQuerySingleDatasource(ctx context.Context, user *use
 }
 
 // parseRequest parses a request into parsed queries grouped by datasource uid
-func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user *user.SignedInUser, skipCache bool, reqDTO dtos.MetricRequest) (*parsedRequest, error) {
+func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user *user.SignedInUser, skipDSCache bool, reqDTO dtos.MetricRequest) (*parsedRequest, error) {
 	if len(reqDTO.Queries) == 0 {
 		return nil, ErrNoQueriesFound
 	}
@@ -263,7 +263,7 @@ func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user *user.SignedI
 	// Parse the queries and store them by datasource
 	datasourcesByUid := map[string]*datasources.DataSource{}
 	for _, query := range reqDTO.Queries {
-		ds, err := s.getDataSourceFromQuery(ctx, user, skipCache, query, datasourcesByUid)
+		ds, err := s.getDataSourceFromQuery(ctx, user, skipDSCache, query, datasourcesByUid)
 		if err != nil {
 			return nil, err
 		}
@@ -309,7 +309,7 @@ func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user *user.SignedI
 	return req, req.validateRequest(ctx)
 }
 
-func (s *ServiceImpl) getDataSourceFromQuery(ctx context.Context, user *user.SignedInUser, skipCache bool, query *simplejson.Json, history map[string]*datasources.DataSource) (*datasources.DataSource, error) {
+func (s *ServiceImpl) getDataSourceFromQuery(ctx context.Context, user *user.SignedInUser, skipDSCache bool, query *simplejson.Json, history map[string]*datasources.DataSource) (*datasources.DataSource, error) {
 	var err error
 	uid := query.Get("datasource").Get("uid").MustString()
 
@@ -333,7 +333,7 @@ func (s *ServiceImpl) getDataSourceFromQuery(ctx context.Context, user *user.Sig
 	}
 
 	if uid != "" {
-		ds, err = s.dataSourceCache.GetDatasourceByUID(ctx, uid, user, skipCache)
+		ds, err = s.dataSourceCache.GetDatasourceByUID(ctx, uid, user, skipDSCache)
 		if err != nil {
 			return nil, err
 		}
@@ -343,7 +343,7 @@ func (s *ServiceImpl) getDataSourceFromQuery(ctx context.Context, user *user.Sig
 	// use datasourceId if it exists
 	id := query.Get("datasourceId").MustInt64(0)
 	if id > 0 {
-		ds, err = s.dataSourceCache.GetDatasource(ctx, id, user, skipCache)
+		ds, err = s.dataSourceCache.GetDatasource(ctx, id, user, skipDSCache)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/services/query/query_service_mock.go b/pkg/services/query/query_service_mock.go
index 49f4ff03a4a..4d12dd838a4 100644
--- a/pkg/services/query/query_service_mock.go
+++ b/pkg/services/query/query_service_mock.go
@@ -19,13 +19,13 @@ type FakeQueryService struct {
 	mock.Mock
 }
 
-// QueryData provides a mock function with given fields: ctx, _a1, skipCache, reqDTO
-func (_m *FakeQueryService) QueryData(ctx context.Context, _a1 *user.SignedInUser, skipCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error) {
-	ret := _m.Called(ctx, _a1, skipCache, reqDTO)
+// QueryData provides a mock function with given fields: ctx, _a1, skipDSCache, reqDTO
+func (_m *FakeQueryService) QueryData(ctx context.Context, _a1 *user.SignedInUser, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error) {
+	ret := _m.Called(ctx, _a1, skipDSCache, reqDTO)
 
 	var r0 *backend.QueryDataResponse
 	if rf, ok := ret.Get(0).(func(context.Context, *user.SignedInUser, bool, dtos.MetricRequest) *backend.QueryDataResponse); ok {
-		r0 = rf(ctx, _a1, skipCache, reqDTO)
+		r0 = rf(ctx, _a1, skipDSCache, reqDTO)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*backend.QueryDataResponse)
@@ -34,7 +34,7 @@ func (_m *FakeQueryService) QueryData(ctx context.Context, _a1 *user.SignedInUse
 
 	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *user.SignedInUser, bool, dtos.MetricRequest) error); ok {
-		r1 = rf(ctx, _a1, skipCache, reqDTO)
+		r1 = rf(ctx, _a1, skipDSCache, reqDTO)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/pkg/web/webtest/webtest.go b/pkg/web/webtest/webtest.go
index 36d477ee673..0977be1b89b 100644
--- a/pkg/web/webtest/webtest.go
+++ b/pkg/web/webtest/webtest.go
@@ -140,7 +140,7 @@ func requestContextMiddleware() web.Middleware {
 				c.IsSignedIn = ctx.IsSignedIn
 				c.IsRenderCall = ctx.IsRenderCall
 				c.AllowAnonymous = ctx.AllowAnonymous
-				c.SkipCache = ctx.SkipCache
+				c.SkipDSCache = ctx.SkipDSCache
 				c.RequestNonce = ctx.RequestNonce
 				c.PerfmonTimer = ctx.PerfmonTimer
 				c.LookupTokenErr = ctx.LookupTokenErr

From 5197fca70cb3e9236887dab277659c6049a179af Mon Sep 17 00:00:00 2001
From: lwandz13 <126723338+lwandz13@users.noreply.github.com>
Date: Wed, 12 Apr 2023 11:43:44 -0500
Subject: [PATCH 077/729] remove duplicate exemplars section (#66398)

---
 docs/sources/datasources/prometheus/_index.md | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/docs/sources/datasources/prometheus/_index.md b/docs/sources/datasources/prometheus/_index.md
index 04a414ffd41..0bb195dea82 100644
--- a/docs/sources/datasources/prometheus/_index.md
+++ b/docs/sources/datasources/prometheus/_index.md
@@ -62,21 +62,11 @@ To configure basic settings for the data source, complete the following steps:
     | `Disable metrics lookup`        | Checking this option will disable the metrics chooser and metric/label support in the query field's autocomplete. This helps if you have performance issues with bigger Prometheus instances.                                                                                                                   |
     | `Custom query parameters`       | Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup`, or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'.                                                                                                         |
     | **Exemplars configuration**     |                                                                                                                                                                                                                                                                                                                 |
-    | `Internal link`                 | Enable this option is you have an internal link. When you enable this option, you will see a data source selector. Select the backend tracing data store for your exemplar data.                                                                                                                                |
-    | `Data source`                   | You will see this option only if you enable `Internal link` option. Select the backend tracing data store for your exemplar data.                                                                                                                                                                               |
-    | `URL`                           | You will see this option only if the `Internal link` option is disabled. Enter the full URL of the external link. You can interpolate the value from the field with `${__value.raw }` macro.                                                                                                                    |
-    | `URL Label`                     | (Optional) add a custom display label to override the value of the `Label name` field.                                                                                                                                                                                                                          |
-    | `Label name`                    | Add a name for the exemplar traceID property.                                                                                                                                                                                                                                                                   |
-
-        **Exemplars configuration:**
-
-    | Name              | Description                                                                                                                                                                                                                                                    |
-    | ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-    | **Internal link** | Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select the backend tracing data store for your exemplar data.                                                                                            |
-    | **Data source**   | _(Visible only if you enable `Internal link`)_ Selects the backend tracing data store for your exemplar data.                                                                                                                                                  |
-    | **URL**           | _(Visible only if you disable `Internal link`)_ Defines the external link's full URL. You can interpolate the value from the field by using the [`${__value.raw}` macro]({{< relref "../..//panels-visualizations/configure-data-links/#value-variables" >}}). |
-    | **URL label**     | _(Optional)_ Adds a custom display label to override the value of the `Label name` field.                                                                                                                                                                      |
-    | **Label name**    | Adds a name for the exemplar traceID property.                                                                                                                                                                                                                 |
+    | `Internal link`                 | Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select the backend tracing data store for your exemplar data.                                                                                                                                             |
+    | `Data source`                   | _(Visible only if you enable `Internal link`)_ Selects the backend tracing data store for your exemplar data.                                                                                                                                                                                                   |
+    | `URL`                           | _(Visible only if you disable `Internal link`)_ Defines the external link's full URL. You can interpolate the value from the field by using the [`${__value.raw}` macro]({{< relref "../..//panels-visualizations/configure-data-links/#value-variables" >}}).                                                  |
+    | `URL Label`                     | _(Optional)_ Adds a custom display label to override the value of the `Label name` field.                                                                                                                                                                                                                       |
+    | `Label name`                    | Adds a name for the exemplar traceID property.                                                                                                                                                                                                                                                                  |
 
 ### Provision the data source
 

From 77852d587d3699f79bb54d2f95be980539c451bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 12 Apr 2023 18:57:25 +0200
Subject: [PATCH 078/729] DashboardChangedModal: Update and fix design issues
 (#66380)

---
 .../live/dashboard/DashboardChangedModal.tsx  | 139 +++++-------------
 1 file changed, 40 insertions(+), 99 deletions(-)

diff --git a/public/app/features/live/dashboard/DashboardChangedModal.tsx b/public/app/features/live/dashboard/DashboardChangedModal.tsx
index 24b534208c4..3c30055e162 100644
--- a/public/app/features/live/dashboard/DashboardChangedModal.tsx
+++ b/public/app/features/live/dashboard/DashboardChangedModal.tsx
@@ -1,120 +1,61 @@
 import { css } from '@emotion/css';
-import React, { PureComponent } from 'react';
+import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { Modal, stylesFactory } from '@grafana/ui';
+import { locationService } from '@grafana/runtime';
+import { Button, Modal, stylesFactory, useStyles2 } from '@grafana/ui';
 
 import { dashboardWatcher } from './dashboardWatcher';
 import { DashboardEvent, DashboardEventAction } from './types';
 
 interface Props {
   event?: DashboardEvent;
+  onDismiss: () => void;
 }
 
-interface State {
-  dismiss?: boolean;
-}
+export function DashboardChangedModal({ onDismiss, event }: Props) {
+  const styles = useStyles2(getStyles);
 
-interface ActionInfo {
-  label: string;
-  description: string;
-  action: () => void;
-}
+  const onDiscardChanges = () => {
+    if (event?.action === DashboardEventAction.Deleted) {
+      locationService.push('/');
+      return;
+    }
 
-export class DashboardChangedModal extends PureComponent<Props, State> {
-  state: State = {};
-
-  discardAndReload: ActionInfo = {
-    label: 'Discard local changes',
-    description: 'Load the latest saved version for this dashboard',
-    action: () => {
-      dashboardWatcher.reloadPage();
-      this.onDismiss();
-    },
+    dashboardWatcher.reloadPage();
+    onDismiss();
   };
 
-  continueEditing: ActionInfo = {
-    label: 'Continue editing',
-    description:
-      'Keep your local changes and continue editing.  Note: when you save, this will overwrite the most recent changes',
-    action: () => {
-      this.onDismiss();
-    },
-  };
-
-  acceptDelete: ActionInfo = {
-    label: 'Discard Local changes',
-    description: 'view grafana homepage',
-    action: () => {
-      // Navigate to the root URL
-      document.location.href = config.appUrl;
-    },
-  };
-
-  onDismiss = () => {
-    this.setState({ dismiss: true });
-  };
-
-  render() {
-    const { event } = this.props;
-    const { dismiss } = this.state;
-    const styles = getStyles(config.theme2);
-
-    const isDelete = event?.action === DashboardEventAction.Deleted;
-
-    const options = isDelete
-      ? [this.continueEditing, this.acceptDelete]
-      : [this.continueEditing, this.discardAndReload];
-
-    return (
-      <Modal
-        isOpen={!dismiss}
-        title="Dashboard Changed"
-        icon="copy"
-        onDismiss={this.onDismiss}
-        onClickBackdrop={() => {}}
-        className={styles.modal}
-      >
-        <div>
-          {isDelete ? (
-            <div>This dashboard has been deleted by another session</div>
-          ) : (
-            <div>This dashboard has been modifed by another session</div>
-          )}
-          <br />
-          {options.map((opt) => {
-            return (
-              <div key={opt.label} onClick={opt.action} className={styles.radioItem}>
-                <h3>{opt.label}</h3>
-                {opt.description}
-              </div>
-            );
-          })}
-          <br />
-        </div>
-      </Modal>
-    );
-  }
+  return (
+    <Modal
+      isOpen={true}
+      title="Dashboard changed"
+      icon="copy"
+      onDismiss={onDismiss}
+      onClickBackdrop={() => {}}
+      className={styles.modal}
+    >
+      <div className={styles.description}>
+        The dashboad has been updated by another session. Do you want to continue editing or discard your local changes?
+      </div>
+      <Modal.ButtonRow>
+        <Button onClick={onDismiss} variant="secondary" fill="outline">
+          Continue editing
+        </Button>
+        <Button onClick={onDiscardChanges} variant="destructive">
+          Discard local changes
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
 }
 
 const getStyles = stylesFactory((theme: GrafanaTheme2) => {
   return {
-    modal: css`
-      width: 500px;
-    `,
-    radioItem: css`
-      margin: 0;
-      font-size: ${theme.typography.size.sm};
-      color: ${theme.colors.text.secondary};
-      padding: 10px;
-      cursor: pointer;
-      width: 100%;
-
-      &:hover {
-        background: ${theme.colors.primary.main};
-        color: ${theme.colors.text};
-      }
-    `,
+    modal: css({ width: '600px' }),
+    description: css({
+      color: theme.colors.text.secondary,
+      paddingBottom: theme.spacing(1),
+    }),
   };
 });

From 0c032460ca30d5e9004a943f2c1366142137ef9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 12 Apr 2023 18:57:42 +0200
Subject: [PATCH 079/729] VizLegend: Fixes flicking visualization height &
 re-render (#66331)

* VizLegend: Fixes flicking visualization height & re-render

* Fix test
---
 packages/grafana-ui/src/components/VizLayout/VizLayout.tsx | 4 ++--
 public/app/plugins/panel/piechart/PieChartPanel.test.tsx   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/VizLayout/VizLayout.tsx b/packages/grafana-ui/src/components/VizLayout/VizLayout.tsx
index 55faf5b1f75..05018fbeeed 100644
--- a/packages/grafana-ui/src/components/VizLayout/VizLayout.tsx
+++ b/packages/grafana-ui/src/components/VizLayout/VizLayout.tsx
@@ -61,7 +61,7 @@ export const VizLayout: VizLayoutComponentType = ({ width, height, legend, child
       containerStyle.flexDirection = 'column';
       legendStyle.maxHeight = maxHeight;
 
-      if (legendMeasure) {
+      if (legendMeasure.height) {
         size = { width, height: height - legendMeasure.height };
       }
       break;
@@ -69,7 +69,7 @@ export const VizLayout: VizLayoutComponentType = ({ width, height, legend, child
       containerStyle.flexDirection = 'row';
       legendStyle.maxWidth = maxWidth;
 
-      if (legendMeasure) {
+      if (legendMeasure.width) {
         size = { width: width - legendMeasure.width, height };
       }
 
diff --git a/public/app/plugins/panel/piechart/PieChartPanel.test.tsx b/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
index 0b315565a5b..3d1f2536f11 100644
--- a/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
+++ b/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
@@ -16,6 +16,11 @@ import { LegendDisplayMode, SortOrder, TooltipDisplayMode } from '@grafana/schem
 import { PieChartPanel } from './PieChartPanel';
 import { PanelOptions, PieChartType, PieChartLegendValues } from './panelcfg.gen';
 
+jest.mock('react-use', () => ({
+  ...jest.requireActual('react-use'),
+  useMeasure: () => [() => {}, { width: 100, height: 100 }],
+}));
+
 type PieChartPanelProps = ComponentProps<typeof PieChartPanel>;
 
 describe('PieChartPanel', () => {

From 4ea7677bff0f49203dfa413ec3e0a40469db05de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 12 Apr 2023 18:58:08 +0200
Subject: [PATCH 080/729] Explore: Start using PanelChrome as container
 (#66370)

* Explore: Start using PanelChrome as container

* fix test

* Fixing issue with test and timerange
---
 e2e/various-suite/exemplars.spec.ts           |  8 ++++
 .../src/components/Collapse/Collapse.tsx      |  2 +-
 .../components/PanelChrome/PanelChrome.tsx    |  1 -
 public/app/features/explore/Explore.tsx       |  7 ++-
 .../explore/Graph/ExploreGraphLabel.tsx       |  7 +--
 .../features/explore/Graph/GraphContainer.tsx | 45 ++++++++++---------
 .../app/features/explore/TableContainer.tsx   | 43 ++++++++++--------
 .../timeseries/plugins/OutsideRangePlugin.tsx |  6 ++-
 8 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/e2e/various-suite/exemplars.spec.ts b/e2e/various-suite/exemplars.spec.ts
index 70c286902a0..7b6f5ad6e1a 100644
--- a/e2e/various-suite/exemplars.spec.ts
+++ b/e2e/various-suite/exemplars.spec.ts
@@ -69,6 +69,14 @@ describe('Exemplars', () => {
     e2e.components.TimePicker.applyTimeRange().click();
     e2e.components.QueryField.container().should('be.visible').type('exemplar-query_bucket{shift}{enter}');
 
+    cy.wait(1000);
+
+    cy.get('body').then((body) => {
+      if (body.find(`[data-testid="time-series-zoom-to-data"]`).length > 0) {
+        cy.get(`[data-testid="time-series-zoom-to-data"]`).click();
+      }
+    });
+
     e2e.components.DataSource.Prometheus.exemplarMarker().first().trigger('mouseover');
     e2e().contains('Query with gdev-tempo').click();
     e2e.components.TraceViewer.spanBar().should('have.length', 11);
diff --git a/packages/grafana-ui/src/components/Collapse/Collapse.tsx b/packages/grafana-ui/src/components/Collapse/Collapse.tsx
index 3b56bae307f..79453de0984 100644
--- a/packages/grafana-ui/src/components/Collapse/Collapse.tsx
+++ b/packages/grafana-ui/src/components/Collapse/Collapse.tsx
@@ -12,7 +12,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     label: collapse;
     margin-bottom: ${theme.spacing(1)};
     background-color: ${theme.colors.background.primary};
-    border: 1px solid ${theme.colors.border.medium};
+    border: 1px solid ${theme.colors.border.weak};
     position: relative;
     border-radius: ${theme.shape.radius.default};
     width: 100%;
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
index ba8310352f1..2921b053527 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
@@ -252,7 +252,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       height: '100%',
       display: 'flex',
       flexDirection: 'column',
-      flex: '1 1 0',
 
       '.show-on-hover': {
         visibility: 'hidden',
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 17ebe026ad8..3fab8c067ad 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -76,10 +76,9 @@ const getStyles = (theme: GrafanaTheme2) => {
       // Is needed for some transition animations to work.
       position: relative;
       margin-top: 21px;
-    `,
-    button: css`
-      label: button;
-      margin: 1em 4px 0 0;
+      display: flex;
+      flex-direction: column;
+      gap: ${theme.spacing(1)};
     `,
     queryContainer: css`
       label: queryContainer;
diff --git a/public/app/features/explore/Graph/ExploreGraphLabel.tsx b/public/app/features/explore/Graph/ExploreGraphLabel.tsx
index 576a55e10e5..72d1c609d2c 100644
--- a/public/app/features/explore/Graph/ExploreGraphLabel.tsx
+++ b/public/app/features/explore/Graph/ExploreGraphLabel.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { RadioButtonGroup, HorizontalGroup } from '@grafana/ui';
+import { RadioButtonGroup } from '@grafana/ui';
 import { EXPLORE_GRAPH_STYLES, ExploreGraphStyle } from 'app/types';
 
 const ALL_GRAPH_STYLE_OPTIONS: Array<SelectableValue<ExploreGraphStyle>> = EXPLORE_GRAPH_STYLES.map((style) => ({
@@ -18,9 +18,6 @@ type Props = {
 export function ExploreGraphLabel(props: Props) {
   const { graphStyle, onChangeGraphStyle } = props;
   return (
-    <HorizontalGroup justify="space-between" wrap>
-      Graph
-      <RadioButtonGroup size="sm" options={ALL_GRAPH_STYLE_OPTIONS} value={graphStyle} onChange={onChangeGraphStyle} />
-    </HorizontalGroup>
+    <RadioButtonGroup size="sm" options={ALL_GRAPH_STYLE_OPTIONS} value={graphStyle} onChange={onChangeGraphStyle} />
   );
 }
diff --git a/public/app/features/explore/Graph/GraphContainer.tsx b/public/app/features/explore/Graph/GraphContainer.tsx
index cbbbbc8d166..ca3ce6cf752 100644
--- a/public/app/features/explore/Graph/GraphContainer.tsx
+++ b/public/app/features/explore/Graph/GraphContainer.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from 'react';
 
 import { DataFrame, EventBus, AbsoluteTimeRange, TimeZone, SplitOpen, LoadingState } from '@grafana/data';
-import { Collapse, useTheme2 } from '@grafana/ui';
+import { PanelChrome } from '@grafana/ui';
 import { ExploreGraphStyle } from 'app/types';
 
 import { storeGraphStyle } from '../state/utils';
@@ -25,7 +25,6 @@ interface Props {
 }
 
 export const GraphContainer = ({
-  loading,
   data,
   eventBus,
   height,
@@ -38,8 +37,6 @@ export const GraphContainer = ({
   loadingState,
 }: Props) => {
   const [graphStyle, setGraphStyle] = useState(loadGraphStyle);
-  const theme = useTheme2();
-  const spacing = parseInt(theme.spacing(2).slice(0, -2), 10);
 
   const onGraphStyleChange = useCallback((graphStyle: ExploreGraphStyle) => {
     storeGraphStyle(graphStyle);
@@ -47,24 +44,28 @@ export const GraphContainer = ({
   }, []);
 
   return (
-    <Collapse
-      label={<ExploreGraphLabel graphStyle={graphStyle} onChangeGraphStyle={onGraphStyleChange} />}
-      loading={loading}
-      isOpen
+    <PanelChrome
+      title="Graph"
+      width={width}
+      height={height}
+      loadingState={loadingState}
+      actions={<ExploreGraphLabel graphStyle={graphStyle} onChangeGraphStyle={onGraphStyleChange} />}
     >
-      <ExploreGraph
-        graphStyle={graphStyle}
-        data={data}
-        height={height}
-        width={width - spacing}
-        absoluteRange={absoluteRange}
-        onChangeTime={onChangeTime}
-        timeZone={timeZone}
-        annotations={annotations}
-        splitOpenFn={splitOpenFn}
-        loadingState={loadingState}
-        eventBus={eventBus}
-      />
-    </Collapse>
+      {(innerWidth, innerHeight) => (
+        <ExploreGraph
+          graphStyle={graphStyle}
+          data={data}
+          height={innerHeight}
+          width={innerWidth}
+          absoluteRange={absoluteRange}
+          onChangeTime={onChangeTime}
+          timeZone={timeZone}
+          annotations={annotations}
+          splitOpenFn={splitOpenFn}
+          loadingState={loadingState}
+          eventBus={eventBus}
+        />
+      )}
+    </PanelChrome>
   );
 };
diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx
index affe1bb0a6e..6e7795d9eb9 100644
--- a/public/app/features/explore/TableContainer.tsx
+++ b/public/app/features/explore/TableContainer.tsx
@@ -1,10 +1,9 @@
 import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { ValueLinkConfig, applyFieldOverrides, TimeZone, SplitOpen, DataFrame } from '@grafana/data';
-import { Collapse, Table, AdHocFilterItem } from '@grafana/ui';
+import { ValueLinkConfig, applyFieldOverrides, TimeZone, SplitOpen, DataFrame, LoadingState } from '@grafana/data';
+import { Table, AdHocFilterItem, PanelChrome } from '@grafana/ui';
 import { config } from 'app/core/config';
-import { PANEL_BORDER } from 'app/core/constants';
 import { StoreState } from 'app/types';
 import { ExploreId, ExploreItemState } from 'app/types/explore';
 
@@ -53,7 +52,6 @@ export class TableContainer extends PureComponent<Props> {
   render() {
     const { loading, onCellFilterAdded, tableResult, width, splitOpenFn, range, ariaLabel, timeZone } = this.props;
     const height = this.getTableHeight();
-    const tableWidth = width - config.theme.panelPadding * 2 - PANEL_BORDER;
 
     let dataFrames = tableResult;
 
@@ -90,21 +88,30 @@ export class TableContainer extends PureComponent<Props> {
     const subFrames = dataFrames?.filter((df) => df.meta?.custom?.parentRowIndex !== undefined);
 
     return (
-      <Collapse label="Table" loading={loading} isOpen>
-        {mainFrame?.length ? (
-          <Table
-            ariaLabel={ariaLabel}
-            data={mainFrame}
-            subData={subFrames}
-            width={tableWidth}
-            height={height}
-            maxHeight={600}
-            onCellFilterAdded={onCellFilterAdded}
-          />
-        ) : (
-          <MetaInfoText metaItems={[{ value: '0 series returned' }]} />
+      <PanelChrome
+        title="Table"
+        width={width}
+        height={height}
+        loadingState={loading ? LoadingState.Loading : undefined}
+      >
+        {(innerWidth, innerHeight) => (
+          <>
+            {mainFrame?.length ? (
+              <Table
+                ariaLabel={ariaLabel}
+                data={mainFrame}
+                subData={subFrames}
+                width={innerWidth}
+                height={innerHeight}
+                maxHeight={600}
+                onCellFilterAdded={onCellFilterAdded}
+              />
+            ) : (
+              <MetaInfoText metaItems={[{ value: '0 series returned' }]} />
+            )}
+          </>
         )}
-      </Collapse>
+      </PanelChrome>
     );
   }
 }
diff --git a/public/app/plugins/panel/timeseries/plugins/OutsideRangePlugin.tsx b/public/app/plugins/panel/timeseries/plugins/OutsideRangePlugin.tsx
index f75057f6f7f..d802f85def4 100644
--- a/public/app/plugins/panel/timeseries/plugins/OutsideRangePlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/OutsideRangePlugin.tsx
@@ -71,7 +71,11 @@ export const OutsideRangePlugin = ({ config, onChangeTimeRange }: ThresholdContr
     >
       <div>
         <div>Data outside time range</div>
-        <Button onClick={(v) => onChangeTimeRange({ from: first, to: last })} variant="secondary">
+        <Button
+          onClick={(v) => onChangeTimeRange({ from: first, to: last })}
+          variant="secondary"
+          data-testid="time-series-zoom-to-data"
+        >
           Zoom to data
         </Button>
       </div>

From c5172247a9bdcb4f9e6e2b582e87261919a7a2ac Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Wed, 12 Apr 2023 18:05:52 +0100
Subject: [PATCH 081/729] @grafana/ui: Add support for showing selected options
 in `Select` (#66391)

* Add support for showing selected options

* Don't set a default to avoid breaking existing
---
 .../src/components/Select/SelectBase.test.tsx         | 11 +++++++++++
 .../grafana-ui/src/components/Select/SelectBase.tsx   |  2 ++
 packages/grafana-ui/src/components/Select/types.ts    |  1 +
 3 files changed, 14 insertions(+)

diff --git a/packages/grafana-ui/src/components/Select/SelectBase.test.tsx b/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
index bdfb164c6c0..97d877616fd 100644
--- a/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
@@ -206,5 +206,16 @@ describe('SelectBase', () => {
         { action: 'select-option', name: undefined, option: undefined }
       );
     });
+
+    it('hideSelectedOptions prop - when false does not hide selected', async () => {
+      render(<SelectBase onChange={jest.fn()} options={options} aria-label="My select" hideSelectedOptions={false} />);
+
+      const selectEl = screen.getByLabelText('My select');
+
+      await selectOptionInTest(selectEl, 'Option 2');
+      await userEvent.click(screen.getByText(/option 2/i));
+      const menuOptions = screen.getAllByLabelText('Select option');
+      expect(menuOptions).toHaveLength(2);
+    });
   });
 });
diff --git a/packages/grafana-ui/src/components/Select/SelectBase.tsx b/packages/grafana-ui/src/components/Select/SelectBase.tsx
index 3241839dbf9..065de3928b0 100644
--- a/packages/grafana-ui/src/components/Select/SelectBase.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectBase.tsx
@@ -144,6 +144,7 @@ export function SelectBase<T>({
   width,
   isValidNewOption,
   formatOptionLabel,
+  hideSelectedOptions,
 }: SelectBaseProps<T>) {
   const theme = useTheme2();
   const styles = getSelectStyles(theme);
@@ -222,6 +223,7 @@ export function SelectBase<T>({
     filterOption,
     getOptionLabel,
     getOptionValue,
+    hideSelectedOptions,
     inputValue,
     invalid,
     isClearable,
diff --git a/packages/grafana-ui/src/components/Select/types.ts b/packages/grafana-ui/src/components/Select/types.ts
index e8c960cd535..f223ffba58b 100644
--- a/packages/grafana-ui/src/components/Select/types.ts
+++ b/packages/grafana-ui/src/components/Select/types.ts
@@ -37,6 +37,7 @@ export interface SelectCommonProps<T> {
   formatCreateLabel?: (input: string) => string;
   getOptionLabel?: (item: SelectableValue<T>) => React.ReactNode;
   getOptionValue?: (item: SelectableValue<T>) => string;
+  hideSelectedOptions?: boolean;
   inputValue?: string;
   invalid?: boolean;
   isClearable?: boolean;

From 2b2a4e13e580427ef8933cd8efd76e0d5c3c1cc7 Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Wed, 12 Apr 2023 13:10:10 -0500
Subject: [PATCH 082/729] Prometheus: Incremental querying option for `to: now`
 dashboards (#62932)

Provide new feature in Prometheus dashboards to cache queried time series data, modify requests to not include previously cached data in order to improve dashboard refresh performance.

Co-authored-by: Galen <galen.kistler@grafana.com>
Co-authored-by: Leon <leon.sorokin@grafana.com>
---
 .../administration/provisioning/index.md      | 104 +--
 docs/sources/datasources/prometheus/_index.md |  10 +
 .../app/features/live/data/amendTimeSeries.ts |  93 ++
 .../prometheus/configuration/PromSettings.tsx |  46 +
 .../datasource/prometheus/datasource.tsx      |  32 +-
 .../prometheus/querycache/QueryCache.test.ts  | 490 ++++++++++
 .../prometheus/querycache/QueryCache.ts       | 258 ++++++
 .../querycache/QueryCacheTestData.ts          | 864 ++++++++++++++++++
 .../plugins/datasource/prometheus/types.ts    |   2 +
 9 files changed, 1843 insertions(+), 56 deletions(-)
 create mode 100644 public/app/features/live/data/amendTimeSeries.ts
 create mode 100644 public/app/plugins/datasource/prometheus/querycache/QueryCache.test.ts
 create mode 100644 public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
 create mode 100644 public/app/plugins/datasource/prometheus/querycache/QueryCacheTestData.ts

diff --git a/docs/sources/administration/provisioning/index.md b/docs/sources/administration/provisioning/index.md
index f1c59989121..d93ddc329ab 100644
--- a/docs/sources/administration/provisioning/index.md
+++ b/docs/sources/administration/provisioning/index.md
@@ -169,57 +169,59 @@ Common settings in the [built-in core data sources]({{< relref "../../datasource
 
 > **Note:** Data sources tagged with _HTTP\*_ communicate using the HTTP protocol, which includes all core data source plugins except MySQL, PostgreSQL, and MSSQL.
 
-| Name                       | Type    | Data source                                                      | Description                                                                                                                                                                                                 |
-| -------------------------- | ------- | ---------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| tlsAuth                    | boolean | _HTTP\*_, MySQL                                                  | Enable TLS authentication using client cert configured in secure json data                                                                                                                                  |
-| tlsAuthWithCACert          | boolean | _HTTP\*_, MySQL, PostgreSQL                                      | Enable TLS authentication using CA cert                                                                                                                                                                     |
-| tlsSkipVerify              | boolean | _HTTP\*_, MySQL, PostgreSQL, MSSQL                               | Controls whether a client verifies the server's certificate chain and host name.                                                                                                                            |
-| serverName                 | string  | _HTTP\*_, MSSQL                                                  | Optional. Controls the server name used for certificate common name/subject alternative name verification. Defaults to using the data source URL.                                                           |
-| timeout                    | string  | _HTTP\*_                                                         | Request timeout in seconds. Overrides dataproxy.timeout option                                                                                                                                              |
-| graphiteVersion            | string  | Graphite                                                         | Graphite version                                                                                                                                                                                            |
-| timeInterval               | string  | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source.                                                                                                                                        |
-| httpMode                   | string  | Influxdb                                                         | HTTP Method. 'GET', 'POST', defaults to GET                                                                                                                                                                 |
-| maxSeries                  | number  | Influxdb                                                         | Max number of series/tables that Grafana processes                                                                                                                                                          |
-| httpMethod                 | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to POST                                                                                                                                                                |
-| customQueryParameters      | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                                                                                                                           |
-| manageAlerts               | boolean | Prometheus and Loki                                              | Manage alerts via Alerting UI                                                                                                                                                                               |
-| alertmanagerUid            | string  | Prometheus and Loki                                              | UID of Alert Manager that manages Alert for this data source.                                                                                                                                               |
-| timeField                  | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                                                                                                                                |
-| interval                   | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'                                                                                                                 |
-| logMessageField            | string  | Elasticsearch                                                    | Which field should be used as the log message                                                                                                                                                               |
-| logLevelField              | string  | Elasticsearch                                                    | Which field should be used to indicate the priority of the log message                                                                                                                                      |
-| maxConcurrentShardRequests | number  | Elasticsearch                                                    | Maximum number of concurrent shard requests that each sub-search request executes per node                                                                                                                  |
-| sigV4Auth                  | boolean | Elasticsearch and Prometheus                                     | Enable usage of SigV4                                                                                                                                                                                       |
-| sigV4AuthType              | string  | Elasticsearch and Prometheus                                     | SigV4 auth provider. default/credentials/keys                                                                                                                                                               |
-| sigV4ExternalId            | string  | Elasticsearch and Prometheus                                     | Optional SigV4 External ID                                                                                                                                                                                  |
-| sigV4AssumeRoleArn         | string  | Elasticsearch and Prometheus                                     | Optional SigV4 ARN role to assume                                                                                                                                                                           |
-| sigV4Region                | string  | Elasticsearch and Prometheus                                     | SigV4 AWS region                                                                                                                                                                                            |
-| sigV4Profile               | string  | Elasticsearch and Prometheus                                     | Optional SigV4 credentials profile                                                                                                                                                                          |
-| authType                   | string  | Cloudwatch                                                       | Auth provider. default/credentials/keys                                                                                                                                                                     |
-| externalId                 | string  | Cloudwatch                                                       | Optional External ID                                                                                                                                                                                        |
-| assumeRoleArn              | string  | Cloudwatch                                                       | Optional ARN role to assume                                                                                                                                                                                 |
-| defaultRegion              | string  | Cloudwatch                                                       | Optional default AWS region                                                                                                                                                                                 |
-| customMetricsNamespaces    | string  | Cloudwatch                                                       | Namespaces of Custom Metrics                                                                                                                                                                                |
-| profile                    | string  | Cloudwatch                                                       | Optional credentials profile                                                                                                                                                                                |
-| tsdbVersion                | string  | OpenTSDB                                                         | Version                                                                                                                                                                                                     |
-| tsdbResolution             | string  | OpenTSDB                                                         | Resolution                                                                                                                                                                                                  |
-| sslmode                    | string  | PostgreSQL                                                       | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full'                                                                                                                                                 |
-| tlsConfigurationMethod     | string  | PostgreSQL                                                       | SSL Certificate configuration, either by 'file-path' or 'file-content'                                                                                                                                      |
-| sslRootCertFile            | string  | PostgreSQL, MSSQL                                                | SSL server root certificate file, must be readable by the Grafana user                                                                                                                                      |
-| sslCertFile                | string  | PostgreSQL                                                       | SSL client certificate file, must be readable by the Grafana user                                                                                                                                           |
-| sslKeyFile                 | string  | PostgreSQL                                                       | SSL client key file, must be readable by _only_ the Grafana user                                                                                                                                            |
-| encrypt                    | string  | MSSQL                                                            | Connection SSL encryption handling. 'disable', 'false' or 'true'                                                                                                                                            |
-| postgresVersion            | number  | PostgreSQL                                                       | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10                                                                                                                            |
-| timescaledb                | boolean | PostgreSQL                                                       | Enable usage of TimescaleDB extension                                                                                                                                                                       |
-| maxOpenConns               | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of open connections to the database (Grafana v5.4+)                                                                                                                                          |
-| maxIdleConns               | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of connections in the idle connection pool (Grafana v5.4+)                                                                                                                                   |
-| connMaxLifetime            | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+)                                                                                                                                |
-| keepCookies                | array   | _HTTP\*_                                                         | Cookies that needs to be passed along while communicating with data sources                                                                                                                                 |
-| prometheusVersion          | string  | Prometheus                                                       | The version of the Prometheus data source, such as `2.37.0`, `2.24.0`                                                                                                                                       |
-| prometheusType             | string  | Prometheus                                                       | The type of the Prometheus data sources. such as `Prometheus`, `Cortex`, `Thanos`, `Mimir`                                                                                                                  |
-| cacheLevel                 | string  | Prometheus                                                       | This determines the duration of the browser cache. Valid values include: `Low`, `Medium`, `High`, and `None`. This field is configurable when you enable the `prometheusResourceBrowserCache` feature flag. |
-| implementation             | string  | AlertManager                                                     | The implementation of the AlertManager data source, such as `prometheus`, `cortex` or `mimir`                                                                                                               |
-| handleGrafanaManagedAlerts | boolean | AlertManager                                                     | When enabled, Grafana-managed alerts are sent to this Alertmanager                                                                                                                                          |
+| Name                          | Type    | Data source                                                      | Description                                                                                                                                                                                                 |
+| ----------------------------- | ------- | ---------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| tlsAuth                       | boolean | _HTTP\*_, MySQL                                                  | Enable TLS authentication using client cert configured in secure json data                                                                                                                                  |
+| tlsAuthWithCACert             | boolean | _HTTP\*_, MySQL, PostgreSQL                                      | Enable TLS authentication using CA cert                                                                                                                                                                     |
+| tlsSkipVerify                 | boolean | _HTTP\*_, MySQL, PostgreSQL, MSSQL                               | Controls whether a client verifies the server's certificate chain and host name.                                                                                                                            |
+| serverName                    | string  | _HTTP\*_, MSSQL                                                  | Optional. Controls the server name used for certificate common name/subject alternative name verification. Defaults to using the data source URL.                                                           |
+| timeout                       | string  | _HTTP\*_                                                         | Request timeout in seconds. Overrides dataproxy.timeout option                                                                                                                                              |
+| graphiteVersion               | string  | Graphite                                                         | Graphite version                                                                                                                                                                                            |
+| timeInterval                  | string  | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source.                                                                                                                                        |
+| httpMode                      | string  | Influxdb                                                         | HTTP Method. 'GET', 'POST', defaults to GET                                                                                                                                                                 |
+| maxSeries                     | number  | Influxdb                                                         | Max number of series/tables that Grafana processes                                                                                                                                                          |
+| httpMethod                    | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to POST                                                                                                                                                                |
+| customQueryParameters         | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                                                                                                                           |
+| manageAlerts                  | boolean | Prometheus and Loki                                              | Manage alerts via Alerting UI                                                                                                                                                                               |
+| alertmanagerUid               | string  | Prometheus and Loki                                              | UID of Alert Manager that manages Alert for this data source.                                                                                                                                               |
+| timeField                     | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                                                                                                                                |
+| interval                      | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'                                                                                                                 |
+| logMessageField               | string  | Elasticsearch                                                    | Which field should be used as the log message                                                                                                                                                               |
+| logLevelField                 | string  | Elasticsearch                                                    | Which field should be used to indicate the priority of the log message                                                                                                                                      |
+| maxConcurrentShardRequests    | number  | Elasticsearch                                                    | Maximum number of concurrent shard requests that each sub-search request executes per node                                                                                                                  |
+| sigV4Auth                     | boolean | Elasticsearch and Prometheus                                     | Enable usage of SigV4                                                                                                                                                                                       |
+| sigV4AuthType                 | string  | Elasticsearch and Prometheus                                     | SigV4 auth provider. default/credentials/keys                                                                                                                                                               |
+| sigV4ExternalId               | string  | Elasticsearch and Prometheus                                     | Optional SigV4 External ID                                                                                                                                                                                  |
+| sigV4AssumeRoleArn            | string  | Elasticsearch and Prometheus                                     | Optional SigV4 ARN role to assume                                                                                                                                                                           |
+| sigV4Region                   | string  | Elasticsearch and Prometheus                                     | SigV4 AWS region                                                                                                                                                                                            |
+| sigV4Profile                  | string  | Elasticsearch and Prometheus                                     | Optional SigV4 credentials profile                                                                                                                                                                          |
+| authType                      | string  | Cloudwatch                                                       | Auth provider. default/credentials/keys                                                                                                                                                                     |
+| externalId                    | string  | Cloudwatch                                                       | Optional External ID                                                                                                                                                                                        |
+| assumeRoleArn                 | string  | Cloudwatch                                                       | Optional ARN role to assume                                                                                                                                                                                 |
+| defaultRegion                 | string  | Cloudwatch                                                       | Optional default AWS region                                                                                                                                                                                 |
+| customMetricsNamespaces       | string  | Cloudwatch                                                       | Namespaces of Custom Metrics                                                                                                                                                                                |
+| profile                       | string  | Cloudwatch                                                       | Optional credentials profile                                                                                                                                                                                |
+| tsdbVersion                   | string  | OpenTSDB                                                         | Version                                                                                                                                                                                                     |
+| tsdbResolution                | string  | OpenTSDB                                                         | Resolution                                                                                                                                                                                                  |
+| sslmode                       | string  | PostgreSQL                                                       | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full'                                                                                                                                                 |
+| tlsConfigurationMethod        | string  | PostgreSQL                                                       | SSL Certificate configuration, either by 'file-path' or 'file-content'                                                                                                                                      |
+| sslRootCertFile               | string  | PostgreSQL, MSSQL                                                | SSL server root certificate file, must be readable by the Grafana user                                                                                                                                      |
+| sslCertFile                   | string  | PostgreSQL                                                       | SSL client certificate file, must be readable by the Grafana user                                                                                                                                           |
+| sslKeyFile                    | string  | PostgreSQL                                                       | SSL client key file, must be readable by _only_ the Grafana user                                                                                                                                            |
+| encrypt                       | string  | MSSQL                                                            | Connection SSL encryption handling. 'disable', 'false' or 'true'                                                                                                                                            |
+| postgresVersion               | number  | PostgreSQL                                                       | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10                                                                                                                            |
+| timescaledb                   | boolean | PostgreSQL                                                       | Enable usage of TimescaleDB extension                                                                                                                                                                       |
+| maxOpenConns                  | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of open connections to the database (Grafana v5.4+)                                                                                                                                          |
+| maxIdleConns                  | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of connections in the idle connection pool (Grafana v5.4+)                                                                                                                                   |
+| connMaxLifetime               | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+)                                                                                                                                |
+| keepCookies                   | array   | _HTTP\*_                                                         | Cookies that needs to be passed along while communicating with data sources                                                                                                                                 |
+| prometheusVersion             | string  | Prometheus                                                       | The version of the Prometheus data source, such as `2.37.0`, `2.24.0`                                                                                                                                       |
+| prometheusType                | string  | Prometheus                                                       | The type of the Prometheus data sources. such as `Prometheus`, `Cortex`, `Thanos`, `Mimir`                                                                                                                  |
+| cacheLevel                    | string  | Prometheus                                                       | This determines the duration of the browser cache. Valid values include: `Low`, `Medium`, `High`, and `None`. This field is configurable when you enable the `prometheusResourceBrowserCache` feature flag. |
+| incrementalQuerying           | string  | Prometheus                                                       | Experimental: Turn on incremental querying to enhance dashboard reload performance with slow data sources                                                                                                   |
+| incrementalQueryOverlapWindow | string  | Prometheus                                                       | Experimental: Configure incremental query overlap window. Requires a valid duration string, i.e. `180s` or `15m` Default value is `10m` (10 minutes).                                                       |
+| implementation                | string  | AlertManager                                                     | The implementation of the AlertManager data source, such as `prometheus`, `cortex` or `mimir`                                                                                                               |
+| handleGrafanaManagedAlerts    | boolean | AlertManager                                                     | When enabled, Grafana-managed alerts are sent to this Alertmanager                                                                                                                                          |
 
 For examples of specific data sources' JSON data, refer to that [data source's documentation]({{< relref "../../datasources" >}}).
 
diff --git a/docs/sources/datasources/prometheus/_index.md b/docs/sources/datasources/prometheus/_index.md
index 0bb195dea82..042be6eb14f 100644
--- a/docs/sources/datasources/prometheus/_index.md
+++ b/docs/sources/datasources/prometheus/_index.md
@@ -89,6 +89,8 @@ datasources:
       manageAlerts: true
       prometheusType: Prometheus
       prometheusVersion: 2.37.0
+      incrementalQuerying: true
+      incrementalQueryOverlapWindow: 10m
       cacheLevel: 'High'
       exemplarTraceIdDestinations:
         # Field with internal link pointing to data source in Grafana.
@@ -165,3 +167,11 @@ Grafana lists these variables in dropdown select boxes at the top of the dashboa
 Grafana refers to such variables as template variables.
 
 For details, see the [template variables documentation]({{< relref "./template-variables/" >}}).
+
+## Incremental Dashboard Queries (beta)
+
+As of Grafana 10, the Prometheus data source can be configured to query live dashboards incrementally, instead of re-querying the entire duration on each dashboard refresh.
+This can be toggled on or off in the datasource configuration or provisioning file (under `incrementalQuerying` in jsonData).
+Additionally, the amount of overlap between incremental queries can be configured using the `incrementalQueryOverlapWindow` jsonData field, the default value is 10m (10 minutes).
+
+Increasing the duration of the `incrementalQueryOverlapWindow` will increase the size of every incremental query, but might be helpful for instances that have inconsistent results for recent data.
diff --git a/public/app/features/live/data/amendTimeSeries.ts b/public/app/features/live/data/amendTimeSeries.ts
new file mode 100644
index 00000000000..c64fb423b95
--- /dev/null
+++ b/public/app/features/live/data/amendTimeSeries.ts
@@ -0,0 +1,93 @@
+import { closestIdx } from "./StreamingDataFrame";
+
+export type Table = [times: number[], ...values: any[][]];
+
+// prevTable and nextTable are assumed sorted ASC on reference [0] arrays
+// nextTable is assumed to be contiguous, only edges are checked for overlap
+// ...so prev: [1,2,5] + next: [3,4,6] -> [1,2,3,4,6]
+export function amendTable(prevTable: Table, nextTable: Table): Table {
+  let [prevTimes] = prevTable;
+  let [nextTimes] = nextTable;
+
+  let pLen = prevTimes.length;
+  let pStart = prevTimes[0];
+  let pEnd = prevTimes[pLen - 1];
+
+  let nLen = nextTimes.length;
+  let nStart = nextTimes[0];
+  let nEnd = nextTimes[nLen - 1];
+
+  let outTable: Table;
+
+  if (pLen) {
+    if (nLen) {
+      // append, no overlap
+      if (nStart > pEnd) {
+        outTable = prevTable.map((_, i) => prevTable[i].concat(nextTable[i])) as Table;
+      }
+      // prepend, no overlap
+      else if (nEnd < pStart) {
+        outTable = nextTable.map((_, i) => nextTable[i].concat(prevTable[i])) as Table;
+      }
+      // full replace
+      else if (nStart <= pStart && nEnd >= pEnd) {
+        outTable = nextTable;
+      }
+      // partial replace
+      else if (nStart > pStart && nEnd < pEnd) {
+      }
+      // append, with overlap
+      else if (nStart >= pStart) {
+        let idx = closestIdx(nStart, prevTimes);
+        idx = prevTimes[idx] < nStart ? idx - 1 : idx;
+        outTable = prevTable.map((_, i) => prevTable[i].slice(0, idx).concat(nextTable[i])) as Table;
+      }
+      // prepend, with overlap
+      else if (nEnd >= pStart) {
+        let idx = closestIdx(nEnd, prevTimes);
+        idx = prevTimes[idx] < nEnd ? idx : idx + 1;
+        outTable = nextTable.map((_, i) => nextTable[i].concat(prevTable[i].slice(idx))) as Table;
+      }
+    } else {
+      outTable = prevTable;
+    }
+  } else {
+    if (nLen) {
+      outTable = nextTable;
+    } else {
+      outTable = [[]];
+    }
+  }
+
+  return outTable!;
+}
+
+export function trimTable(table: Table, fromTime: number, toTime: number): Table {
+  let [times, ...vals] = table;
+  let fromIdx: number | undefined;
+  let toIdx: number | undefined;
+
+  // trim to bounds
+  if (times[0] < fromTime) {
+    fromIdx = closestIdx(fromTime, times);
+
+    if (times[fromIdx] < fromTime) {
+      fromIdx++;
+    }
+  }
+
+  if (times[times.length - 1] > toTime) {
+    toIdx = closestIdx(toTime, times);
+
+    if (times[toIdx] > toTime) {
+      toIdx--;
+    }
+  }
+
+  if (fromIdx != null || toIdx != null) {
+    times = times.slice(fromIdx ?? 0, toIdx);
+    vals = vals.map(vals2 => vals2.slice(fromIdx ?? 0, toIdx));
+  }
+
+  return [times, ...vals];
+}
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
index 50e1083230b..b6594c2738c 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
@@ -4,6 +4,7 @@ import semver from 'semver/preload';
 import {
   DataSourcePluginOptionsEditorProps,
   DataSourceSettings as DataSourceSettingsType,
+  isValidDuration,
   onUpdateDatasourceJsonDataOptionChecked,
   SelectableValue,
   updateDatasourcePluginJsonDataOption,
@@ -23,6 +24,7 @@ import config from '../../../../core/config';
 import { useUpdateDatasource } from '../../../../features/datasources/state';
 import { PromApplication, PromBuildInfoResponse } from '../../../../types/unified-alerting-dto';
 import { QueryEditorMode } from '../querybuilder/shared/types';
+import { defaultPrometheusQueryOverlapWindow } from '../querycache/QueryCache';
 import { PrometheusCacheLevel, PromOptions } from '../types';
 
 import { ExemplarsSettings } from './ExemplarsSettings';
@@ -362,6 +364,50 @@ export const PromSettings = (props: Props) => {
             </div>
           </div>
         )}
+
+        <div className="gf-form-inline">
+          <div className="gf-form max-width-30">
+            <FormField
+              label="Incremental querying (beta)"
+              labelWidth={14}
+              tooltip="This feature will change the default behavior of relative queries to always request fresh data from the prometheus instance, instead query results will be cached, and only new records are requested. Turn this on to decrease database and network load."
+              inputEl={
+                <InlineSwitch
+                  value={options.jsonData.incrementalQuerying ?? false}
+                  onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'incrementalQuerying')}
+                  disabled={options.readOnly}
+                />
+              }
+            />
+          </div>
+        </div>
+
+        <div className="gf-form-inline">
+          {options.jsonData.incrementalQuerying && (
+            <FormField
+              label="Query overlap window"
+              labelWidth={14}
+              tooltip="Set a duration like 10m or 120s or 0s. Default of 10 minutes. This duration will be added to the duration of each incremental request."
+              inputEl={
+                <Input
+                  validationEvents={{
+                    onBlur: [
+                      {
+                        rule: (value) => isValidDuration(value),
+                        errorMessage: 'Invalid duration. Example values: 100s, 10m',
+                      },
+                    ],
+                  }}
+                  className="width-25"
+                  value={options.jsonData.incrementalQueryOverlapWindow ?? defaultPrometheusQueryOverlapWindow}
+                  onChange={onChangeHandler('incrementalQueryOverlapWindow', options, onOptionsChange)}
+                  spellCheck={false}
+                  disabled={options.readOnly}
+                />
+              }
+            />
+          )}
+        </div>
       </div>
       <ExemplarsSettings
         options={options.jsonData.exemplarTraceIdDestinations}
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index bc82353972e..b212d59baf1 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -56,6 +56,7 @@ import { renderLegendFormat } from './legend';
 import PrometheusMetricFindQuery from './metric_find_query';
 import { getInitHints, getQueryHints } from './query_hints';
 import { QueryEditorMode } from './querybuilder/shared/types';
+import { CacheRequestInfo, defaultPrometheusQueryOverlapWindow, QueryCache } from './querycache/QueryCache';
 import { getOriginalMetricName, transform, transformV2 } from './result_transformer';
 import { trackQuery } from './tracking';
 import {
@@ -84,6 +85,7 @@ export class PrometheusDatasource
 {
   type: string;
   ruleMappings: { [index: string]: string };
+  hasIncrementalQuery: boolean;
   url: string;
   id: number;
   directUrl: string;
@@ -105,6 +107,7 @@ export class PrometheusDatasource
   subType: PromApplication;
   rulerEnabled: boolean;
   cacheLevel: PrometheusCacheLevel;
+  cache: QueryCache;
 
   constructor(
     instanceSettings: DataSourceInstanceSettings<PromOptions>,
@@ -129,6 +132,7 @@ export class PrometheusDatasource
     // here we "fall back" to this.url to make typescript happy, but it should never happen
     this.directUrl = instanceSettings.jsonData.directUrl ?? this.url;
     this.exemplarTraceIdDestinations = instanceSettings.jsonData.exemplarTraceIdDestinations;
+    this.hasIncrementalQuery = instanceSettings.jsonData.incrementalQuerying ?? false;
     this.ruleMappings = {};
     this.languageProvider = languageProvider ?? new PrometheusLanguageProvider(this);
     this.lookupsDisabled = instanceSettings.jsonData.disableMetricsLookup ?? false;
@@ -139,6 +143,9 @@ export class PrometheusDatasource
     this.variables = new PrometheusVariableSupport(this, this.templateSrv, this.timeSrv);
     this.exemplarsAvailable = true;
     this.cacheLevel = instanceSettings.jsonData.cacheLevel ?? PrometheusCacheLevel.Low;
+    this.cache = new QueryCache(
+      instanceSettings.jsonData.incrementalQueryOverlapWindow ?? defaultPrometheusQueryOverlapWindow
+    );
 
     // This needs to be here and cannot be static because of how annotations typing affects casting of data source
     // objects to DataSourceApi types.
@@ -447,12 +454,27 @@ export class PrometheusDatasource
 
   query(request: DataQueryRequest<PromQuery>): Observable<DataQueryResponse> {
     if (this.access === 'proxy') {
-      const targets = request.targets.map((target) => this.processTargetV2(target, request));
+      let fullOrPartialRequest: DataQueryRequest<PromQuery>;
+      let requestInfo: CacheRequestInfo | undefined = undefined;
+      if (this.hasIncrementalQuery) {
+        requestInfo = this.cache.requestInfo(request, this.interpolateString.bind(this));
+        fullOrPartialRequest = requestInfo.requests[0];
+      } else {
+        fullOrPartialRequest = request;
+      }
+
+      const targets = fullOrPartialRequest.targets.map((target) => this.processTargetV2(target, fullOrPartialRequest));
       const startTime = new Date();
-      return super.query({ ...request, targets: targets.flat() }).pipe(
-        map((response) =>
-          transformV2(response, request, { exemplarTraceIdDestinations: this.exemplarTraceIdDestinations })
-        ),
+      return super.query({ ...fullOrPartialRequest, targets: targets.flat() }).pipe(
+        map((response) => {
+          const amendedResponse = {
+            ...response,
+            data: this.cache.procFrames(request, requestInfo, response.data),
+          };
+          return transformV2(amendedResponse, request, {
+            exemplarTraceIdDestinations: this.exemplarTraceIdDestinations,
+          });
+        }),
         tap((response: DataQueryResponse) => {
           trackQuery(response, request, startTime);
         })
diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCache.test.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCache.test.ts
new file mode 100644
index 00000000000..dfb18147f41
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCache.test.ts
@@ -0,0 +1,490 @@
+import moment from 'moment';
+
+import { DataFrame, DataQueryRequest, DateTime, dateTime, TimeRange } from '@grafana/data/src';
+
+import { QueryEditorMode } from '../querybuilder/shared/types';
+import { PromQuery } from '../types';
+
+import { getTargSig, QueryCache } from './QueryCache';
+import { IncrementalStorageDataFrameScenarios } from './QueryCacheTestData';
+
+const mockRequest = (request?: Partial<DataQueryRequest<PromQuery>>): DataQueryRequest<PromQuery> => {
+  // Histogram
+  const defaultRequest: DataQueryRequest<PromQuery> = {
+    app: 'undefined',
+    requestId: '',
+    timezone: '',
+    range: {
+      from: moment('2023-01-30T19:33:01.332Z') as DateTime,
+      to: moment('2023-01-30T20:33:01.332Z') as DateTime,
+      raw: { from: 'now-1h', to: 'now' },
+    },
+    interval: '15s',
+    intervalMs: 15000,
+    targets: [
+      {
+        datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+        editorMode: QueryEditorMode.Code,
+        exemplar: false,
+        expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+        format: 'heatmap',
+        legendFormat: '{{le}}',
+        range: true,
+        refId: 'A',
+        utcOffsetSec: -21600,
+      },
+    ],
+    maxDataPoints: 871,
+    scopedVars: {
+      __interval: { text: '15s', value: '15s' },
+      __interval_ms: { text: '15000', value: 15000 },
+    },
+    startTime: 1675110781332,
+    rangeRaw: { from: 'now-1h', to: 'now' },
+  };
+  return {
+    ...defaultRequest,
+    ...request,
+  };
+};
+
+describe('QueryCache', function () {
+  it('instantiates', () => {
+    const storage = new QueryCache();
+    expect(storage).toBeInstanceOf(QueryCache);
+  });
+
+  it('will not modify or crash with empty response', () => {
+    const storage = new QueryCache();
+    const firstFrames: DataFrame[] = [];
+    const secondFrames: DataFrame[] = [];
+
+    const cache = new Map<string, string>();
+
+    // start time of scenario
+    const firstFrom = dateTime(new Date(1675262550000));
+    // End time of scenario
+    const firstTo = dateTime(new Date(1675262550000)).add(6, 'hours');
+
+    const firstRange: TimeRange = {
+      from: firstFrom,
+      to: firstTo,
+      raw: {
+        from: 'now-6h',
+        to: 'now',
+      },
+    };
+
+    // Same query 2 minutes later
+    const numberOfSamplesLater = 4;
+    const interval = 30000;
+
+    const secondFrom = dateTime(new Date(1675262550000 + interval * numberOfSamplesLater));
+    const secondTo = dateTime(new Date(1675262550000 + interval * numberOfSamplesLater)).add(6, 'hours');
+
+    const secondRange: TimeRange = {
+      from: secondFrom,
+      to: secondTo,
+      raw: {
+        from: 'now-6h',
+        to: 'now',
+      },
+    };
+
+    const targetSignature = `'1=1'|${interval}|${JSON.stringify(secondRange.raw)}`;
+    const dashboardId = `dashid`;
+    const panelId = 2;
+    const targetIdentity = `${dashboardId}|${panelId}|A`;
+
+    cache.set(targetIdentity, targetSignature);
+
+    const firstStoredFrames = storage.procFrames(
+      mockRequest({
+        range: firstRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      }),
+      {
+        requests: [], // unused
+        targSigs: cache,
+        shouldCache: true,
+      },
+      firstFrames
+    );
+
+    const cached = storage.cache.get(targetIdentity);
+
+    expect(cached?.frames[0].fields[0].values.length).toEqual(firstFrames[0]?.fields[0]?.values?.length);
+    expect(firstStoredFrames[0]?.fields[0].values.length).toEqual(firstFrames[0]?.fields[0]?.values?.length);
+
+    // Should return the request frames unaltered
+    expect(firstStoredFrames).toEqual(firstFrames);
+
+    const secondRequest = mockRequest({
+      range: secondRange,
+      dashboardUID: dashboardId,
+      panelId: panelId,
+    });
+
+    const secondStoredFrames = storage.procFrames(
+      secondRequest,
+      {
+        requests: [], // unused
+        targSigs: cache,
+        shouldCache: true,
+      },
+      secondFrames
+    );
+
+    const storageLengthAfterSubsequentQuery = storage.cache.get(targetIdentity);
+
+    expect(secondStoredFrames).toEqual([]);
+
+    storageLengthAfterSubsequentQuery?.frames.forEach((dataFrame, index) => {
+      const secondFramesLength = secondFrames[index].fields[0].values.length;
+      const firstFramesLength = firstFrames[index].fields[0].values.length;
+
+      const cacheLength = dataFrame.fields[0].values.length;
+
+      // Cache can contain more, but never less
+      expect(cacheLength).toBeGreaterThanOrEqual(secondFramesLength + firstFramesLength - (20 + numberOfSamplesLater));
+
+      // Fewer results are sent in incremental result
+      expect(firstFramesLength).toBeGreaterThan(secondFramesLength);
+    });
+  });
+
+  it('Merges incremental queries in storage', () => {
+    const scenarios = [
+      IncrementalStorageDataFrameScenarios.histogram.getSeriesWithGapAtEnd(),
+      IncrementalStorageDataFrameScenarios.histogram.getSeriesWithGapInMiddle(),
+      IncrementalStorageDataFrameScenarios.histogram.getSeriesWithGapAtStart(),
+    ];
+    scenarios.forEach((scenario, index) => {
+      const storage = new QueryCache();
+      const firstFrames = scenario.first.dataFrames as unknown as DataFrame[];
+      const secondFrames = scenario.second.dataFrames as unknown as DataFrame[];
+
+      const targetSignatures = new Map<string, string>();
+
+      // start time of scenario
+      const firstFrom = dateTime(new Date(1675262550000));
+      // End time of scenario
+      const firstTo = dateTime(new Date(1675262550000)).add(6, 'hours');
+
+      const firstRange: TimeRange = {
+        from: firstFrom,
+        to: firstTo,
+        raw: {
+          from: 'now-6h',
+          to: 'now',
+        },
+      };
+
+      // Same query 2 minutes later
+      const numberOfSamplesLater = 4;
+      const interval = 30000;
+
+      const secondFrom = dateTime(new Date(1675262550000 + interval * numberOfSamplesLater));
+      const secondTo = dateTime(new Date(1675262550000 + interval * numberOfSamplesLater)).add(6, 'hours');
+
+      const secondRange: TimeRange = {
+        from: secondFrom,
+        to: secondTo,
+        raw: {
+          from: 'now-6h',
+          to: 'now',
+        },
+      };
+
+      const dashboardId = `dashid--${index}`;
+      const panelId = 2 + index;
+
+      // This can't change
+      const targetIdentity = `${dashboardId}|${panelId}|A`;
+
+      const request = mockRequest({
+        range: firstRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      });
+
+      // But the signature can, and we should clean up any non-matching signatures
+      const targetSignature = getTargSig(request.targets[0].expr, request, request.targets[0]);
+
+      targetSignatures.set(targetIdentity, targetSignature);
+
+      const firstStoredFrames = storage.procFrames(
+        request,
+        {
+          requests: [], // unused
+          targSigs: targetSignatures,
+          shouldCache: true,
+        },
+        firstFrames
+      );
+
+      const cached = storage.cache.get(targetIdentity);
+
+      // I would expect that the number of values received from the API should be the same as the cached values?
+      expect(cached?.frames[0].fields[0].values.length).toEqual(firstFrames[0].fields[0].values.length);
+
+      // Should return the request frames unaltered
+      expect(firstStoredFrames).toEqual(firstFrames);
+
+      const secondRequest = mockRequest({
+        range: secondRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      });
+
+      const secondStoredFrames = storage.procFrames(
+        secondRequest,
+        {
+          requests: [], // unused
+          targSigs: targetSignatures,
+          shouldCache: true,
+        },
+        secondFrames
+      );
+
+      const storageLengthAfterSubsequentQuery = storage.cache.get(targetIdentity);
+
+      storageLengthAfterSubsequentQuery?.frames.forEach((dataFrame, index) => {
+        const secondFramesLength = secondFrames[index].fields[0].values.length;
+        const firstFramesLength = firstFrames[index].fields[0].values.length;
+
+        const cacheLength = dataFrame.fields[0].values.length;
+
+        // Cache can contain more, but never less
+        expect(cacheLength).toBeGreaterThanOrEqual(
+          secondFramesLength + firstFramesLength - (20 + numberOfSamplesLater)
+        );
+
+        // Fewer results are sent in incremental result
+        expect(firstFramesLength).toBeGreaterThan(secondFramesLength);
+      });
+
+      // All of the new values should be the ones that were stored, this is overkill
+      secondFrames.forEach((frame, frameIdx) => {
+        frame.fields.forEach((field, fieldIdx) => {
+          secondFrames[frameIdx].fields[fieldIdx].values.toArray().forEach((value) => {
+            expect(secondStoredFrames[frameIdx].fields[fieldIdx].values).toContain(value);
+          });
+        });
+      });
+
+      const interpolateString = (s: string) => {
+        return s;
+      };
+      const secondRequestModified = {
+        ...secondRequest,
+        range: {
+          ...secondRequest.range,
+          to: dateTime(secondRequest.range.to.valueOf() + 30000),
+        },
+      };
+      const cacheRequest = storage.requestInfo(secondRequestModified, interpolateString);
+      expect(cacheRequest.requests[0].targets).toEqual(secondRequestModified.targets);
+      expect(cacheRequest.requests[0].range.to).toEqual(secondRequestModified.range.to);
+      expect(cacheRequest.requests[0].range.raw).toEqual(secondRequestModified.range.raw);
+      expect(cacheRequest.requests[0].range.from.valueOf() - 21000000).toEqual(
+        secondRequestModified.range.from.valueOf()
+      );
+      expect(cacheRequest.shouldCache).toBe(true);
+    });
+  });
+
+  it('Will evict old dataframes, and use stored data when user shortens query window', () => {
+    const storage = new QueryCache();
+
+    // Initial request with all data for time range
+    const firstFrames = IncrementalStorageDataFrameScenarios.histogram.evictionRequests.first
+      .dataFrames as unknown as DataFrame[];
+
+    // Shortened request 30s later
+    const secondFrames = IncrementalStorageDataFrameScenarios.histogram.evictionRequests.second
+      .dataFrames as unknown as DataFrame[];
+
+    // Now the user waits a minute and changes the query duration to just the last 5 minutes, luckily the interval hasn't changed, so we can still use the data in storage except for the latest minute
+    const thirdFrames = IncrementalStorageDataFrameScenarios.histogram.evictionRequests.second
+      .dataFrames as unknown as DataFrame[];
+
+    const cache = new Map<string, string>();
+    const interval = 15000;
+
+    // start time of scenario
+    const firstFrom = dateTime(new Date(1675107180000));
+    const firstTo = dateTime(new Date(1675107180000)).add(1, 'hours');
+    const firstRange: TimeRange = {
+      from: firstFrom,
+      to: firstTo,
+      raw: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    };
+
+    // 30 seconds later
+    const secondNumberOfSamplesLater = 2;
+    const secondFrom = dateTime(new Date(1675107180000 + interval * secondNumberOfSamplesLater));
+    const secondTo = dateTime(new Date(1675107180000 + interval * secondNumberOfSamplesLater)).add(1, 'hours');
+    const secondRange: TimeRange = {
+      from: secondFrom,
+      to: secondTo,
+      raw: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    };
+
+    // 1 minute + 30 seconds later, but 5 minute viewing window
+    const thirdNumberOfSamplesLater = 6;
+    const thirdFrom = dateTime(new Date(1675107180000 + interval * thirdNumberOfSamplesLater));
+    const thirdTo = dateTime(new Date(1675107180000 + interval * thirdNumberOfSamplesLater)).add(5, 'minutes');
+    const thirdRange: TimeRange = {
+      from: thirdFrom,
+      to: thirdTo,
+      raw: {
+        from: 'now-5m',
+        to: 'now',
+      },
+    };
+
+    // Signifier definition
+
+    const dashboardId = `dashid`;
+    const panelId = 200;
+
+    const targetIdentity = `${dashboardId}|${panelId}|A`;
+
+    const request = mockRequest({
+      range: firstRange,
+      dashboardUID: dashboardId,
+      panelId: panelId,
+    });
+
+    const requestInfo = {
+      requests: [], // unused
+      targSigs: cache,
+      shouldCache: true,
+    };
+    const targetSignature = `1=1|${interval}|${JSON.stringify(request.rangeRaw ?? '')}`;
+    cache.set(targetIdentity, targetSignature);
+
+    const firstQueryResult = storage.procFrames(request, requestInfo, firstFrames);
+
+    const firstMergedLength = firstQueryResult[0].fields[0].values.length;
+
+    const secondQueryResult = storage.procFrames(
+      mockRequest({
+        range: secondRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      }),
+      {
+        requests: [], // unused
+        targSigs: cache,
+        shouldCache: true,
+      },
+      secondFrames
+    );
+
+    const secondMergedLength = secondQueryResult[0].fields[0].values.length;
+
+    // Since the step is 15s, and the request was 30 seconds later, we should have 2 extra frames, but we should evict the first two, so we should get the same length
+    expect(firstMergedLength).toEqual(secondMergedLength);
+    expect(firstQueryResult[0].fields[0].values.toArray()[2]).toEqual(
+      secondQueryResult[0].fields[0].values.toArray()[0]
+    );
+    expect(firstQueryResult[0].fields[0].values.toArray()[0] + 30000).toEqual(
+      secondQueryResult[0].fields[0].values.toArray()[0]
+    );
+
+    cache.set(targetIdentity, `'1=1'|${interval}|${JSON.stringify(thirdRange.raw)}`);
+
+    storage.procFrames(
+      mockRequest({
+        range: thirdRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      }),
+      {
+        requests: [], // unused
+        targSigs: cache,
+        shouldCache: true,
+      },
+      thirdFrames
+    );
+
+    const cachedAfterThird = storage.cache.get(targetIdentity);
+    const storageLengthAfterThirdQuery = cachedAfterThird?.frames[0].fields[0].values.toArray().length;
+    expect(storageLengthAfterThirdQuery).toEqual(20);
+  });
+
+  it('Will build signature using target overrides', () => {
+    const targetInterval = '30s';
+    const requestInterval = '15s';
+
+    const target: PromQuery = {
+      datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+      editorMode: QueryEditorMode.Code,
+      exemplar: false,
+      expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+      format: 'heatmap',
+      interval: targetInterval,
+      legendFormat: '{{le}}',
+      range: true,
+      refId: 'A',
+      utcOffsetSec: -21600,
+    };
+
+    const request = mockRequest({
+      interval: requestInterval,
+      targets: [target],
+    });
+    const targSig = getTargSig('__EXPR__', request, target);
+    expect(targSig).toContain(targetInterval);
+    expect(targSig.includes(requestInterval)).toBeFalsy();
+  });
+
+  it('will not modify request with absolute duration', () => {
+    const request = mockRequest({
+      range: {
+        from: moment('2023-01-30T19:33:01.332Z') as DateTime,
+        to: moment('2023-01-30T20:33:01.332Z') as DateTime,
+        raw: { from: '2023-01-30T19:33:01.332Z', to: '2023-01-30T20:33:01.332Z' },
+      },
+      rangeRaw: { from: '2023-01-30T19:33:01.332Z', to: '2023-01-30T20:33:01.332Z' },
+    });
+    const storage = new QueryCache();
+    const interpolateString = (s: string) => {
+      return s;
+    };
+    const cacheRequest = storage.requestInfo(request, interpolateString);
+    expect(cacheRequest.requests[0]).toBe(request);
+    expect(cacheRequest.shouldCache).toBe(false);
+  });
+
+  it('mark request as shouldCache', () => {
+    const request = mockRequest();
+    const storage = new QueryCache();
+    const interpolateString = (s: string) => {
+      return s;
+    };
+    const cacheRequest = storage.requestInfo(request, interpolateString);
+    expect(cacheRequest.requests[0]).toBe(request);
+    expect(cacheRequest.shouldCache).toBe(true);
+  });
+
+  it('Should modify request', () => {
+    const request = mockRequest();
+    const storage = new QueryCache();
+    const interpolateString = (s: string) => {
+      return s;
+    };
+    const cacheRequest = storage.requestInfo(request, interpolateString);
+    expect(cacheRequest.requests[0]).toBe(request);
+    expect(cacheRequest.shouldCache).toBe(true);
+  });
+});
diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
new file mode 100644
index 00000000000..335710887ea
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
@@ -0,0 +1,258 @@
+import {
+  ArrayVector,
+  DataFrame,
+  DataQueryRequest,
+  dateTime,
+  durationToMilliseconds,
+  Field,
+  isValidDuration,
+  parseDuration,
+} from '@grafana/data/src';
+import { amendTable, Table, trimTable } from 'app/features/live/data/amendTimeSeries';
+
+import { PromQuery } from '../types';
+
+// dashboardUID + panelId + refId
+// (must be stable across query changes, time range changes / interval changes / panel resizes / template variable changes)
+type TargetIdent = string;
+
+// query + template variables + interval + raw time range
+// used for full target cache busting -> full range re-query
+type TargetSig = string;
+
+type TimestampMs = number;
+
+type StringInterpolator = (expr: string) => string;
+
+// string matching requirements defined in durationutil.ts
+export const defaultPrometheusQueryOverlapWindow = '10m';
+
+interface TargetCache {
+  sig: TargetSig;
+  prevTo: TimestampMs;
+  frames: DataFrame[];
+}
+
+export interface CacheRequestInfo {
+  requests: Array<DataQueryRequest<PromQuery>>;
+  targSigs: Map<TargetIdent, TargetSig>;
+  shouldCache: boolean;
+}
+
+/**
+ * Get field identity
+ * This is the string used to uniquely identify a field within a "target"
+ * @param field
+ */
+export const getFieldIdent = (field: Field) => `${field.type}|${field.name}|${JSON.stringify(field.labels ?? '')}`;
+
+/**
+ * Get target signature
+ * @param targExpr
+ * @param request
+ * @param targ
+ */
+export function getTargSig(targExpr: string, request: DataQueryRequest<PromQuery>, targ: PromQuery) {
+  return `${targExpr}|${targ.interval ?? request.interval}|${JSON.stringify(request.rangeRaw ?? '')}|${targ.exemplar}`;
+}
+
+/**
+ * NOMENCLATURE
+ * Target: The request target (DataQueryRequest), i.e. a specific query reference within a panel
+ * Ident: Identity: the string that is not expected to change
+ * Sig: Signature: the string that is expected to change, upon which we wipe the cache fields
+ */
+export class QueryCache {
+  private overlapWindowMs: number;
+  constructor(overlapString?: string) {
+    const unverifiedOverlap = overlapString ?? defaultPrometheusQueryOverlapWindow;
+    if (isValidDuration(unverifiedOverlap)) {
+      const duration = parseDuration(unverifiedOverlap);
+      this.overlapWindowMs = durationToMilliseconds(duration);
+    } else {
+      const duration = parseDuration(defaultPrometheusQueryOverlapWindow);
+      this.overlapWindowMs = durationToMilliseconds(duration);
+    }
+  }
+
+  cache = new Map<TargetIdent, TargetCache>();
+
+  // can be used to change full range request to partial, split into multiple requests
+  requestInfo(request: DataQueryRequest<PromQuery>, interpolateString: StringInterpolator): CacheRequestInfo {
+    // TODO: align from/to to interval to increase probability of hitting backend cache
+
+    const newFrom = request.range.from.valueOf();
+    const newTo = request.range.to.valueOf();
+
+    // only cache 'now'-relative queries (that can benefit from a backfill cache)
+    const shouldCache = request.rangeRaw?.to?.toString() === 'now';
+
+    // all targets are queried together, so we check for any that causes group cache invalidation & full re-query
+    let doPartialQuery = shouldCache;
+    let prevTo: TimestampMs;
+
+    // pre-compute reqTargSigs
+    const reqTargSigs = new Map<TargetIdent, TargetSig>();
+    request.targets.forEach((targ) => {
+      let targIdent = `${request.dashboardUID}|${request.panelId}|${targ.refId}`;
+      // @todo refactor getTargSig into datasource class and remove targExpr. See #65952 for a potential implementation
+      let targExpr = interpolateString(targ.expr);
+      let targSig = getTargSig(targExpr, request, targ);
+
+      reqTargSigs.set(targIdent, targSig);
+    });
+
+    // figure out if new query range or new target props trigger full cache invalidation & re-query
+    for (const [targIdent, targSig] of reqTargSigs) {
+      let cached = this.cache.get(targIdent);
+      let cachedSig = cached?.sig;
+
+      if (cachedSig !== targSig) {
+        doPartialQuery = false;
+      } else {
+        // only do partial queries when new request range follows prior request range (possibly with overlap)
+        // e.g. now-6h with refresh <= 6h
+        prevTo = cached?.prevTo ?? Infinity;
+        doPartialQuery = newTo > prevTo && newFrom <= prevTo;
+      }
+
+      if (!doPartialQuery) {
+        break;
+      }
+    }
+
+    if (doPartialQuery) {
+      // 10m re-query overlap
+
+      // clamp to make sure we don't re-query previous 10m when newFrom is ahead of it (e.g. 5min range, 30s refresh)
+      let newFromPartial = Math.max(prevTo! - this.overlapWindowMs, newFrom);
+
+      // modify to partial query
+      request = {
+        ...request,
+        range: {
+          ...request.range,
+          from: dateTime(newFromPartial),
+          to: dateTime(newTo),
+        },
+      };
+    } else {
+      reqTargSigs.forEach((targSig, targIdent) => {
+        this.cache.delete(targIdent);
+      });
+    }
+
+    return {
+      requests: [request],
+      targSigs: reqTargSigs,
+      shouldCache,
+    };
+  }
+
+  // should amend existing cache with new frames and return full response
+  procFrames(
+    request: DataQueryRequest<PromQuery>,
+    requestInfo: CacheRequestInfo | undefined,
+    respFrames: DataFrame[]
+  ): DataFrame[] {
+    if (requestInfo?.shouldCache) {
+      const newFrom = request.range.from.valueOf();
+      const newTo = request.range.to.valueOf();
+
+      // group frames by targets
+      const respByTarget = new Map<TargetIdent, DataFrame[]>();
+
+      respFrames.forEach((frame: DataFrame) => {
+        let targIdent = `${request.dashboardUID}|${request.panelId}|${frame.refId}`;
+
+        let frames = respByTarget.get(targIdent);
+
+        if (!frames) {
+          frames = [];
+          respByTarget.set(targIdent, frames);
+        }
+
+        frames.push(frame);
+      });
+
+      let outFrames: DataFrame[] = [];
+
+      respByTarget.forEach((respFrames, targIdent) => {
+        let cachedFrames = (targIdent ? this.cache.get(targIdent)?.frames : null) ?? [];
+
+        respFrames.forEach((respFrame: DataFrame) => {
+          // skip empty frames
+          if (respFrame.length === 0 || respFrame.fields.length === 0) {
+            return;
+          }
+
+          // frames are identified by their second (non-time) field's name + labels
+          // TODO: maybe also frame.meta.type?
+          let respFrameIdent = getFieldIdent(respFrame.fields[1]);
+
+          let cachedFrame = cachedFrames.find((cached) => getFieldIdent(cached.fields[1]) === respFrameIdent);
+
+          if (!cachedFrame) {
+            // append new unknown frames
+            cachedFrames.push(respFrame);
+          } else {
+            // we assume that fields cannot appear/disappear and will all exist in same order
+
+            // amend & re-cache
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            let prevTable: Table = cachedFrame.fields.map((field) => field.values.toArray()) as Table;
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            let nextTable: Table = respFrame.fields.map((field) => field.values.toArray()) as Table;
+
+            let amendedTable = amendTable(prevTable, nextTable);
+
+            for (let i = 0; i < amendedTable.length; i++) {
+              cachedFrame.fields[i].values = new ArrayVector(amendedTable[i]);
+            }
+
+            cachedFrame.length = cachedFrame.fields[0].values.length;
+          }
+        });
+
+        // trim all frames to in-view range, evict those that end up with 0 length
+        let nonEmptyCachedFrames: DataFrame[] = [];
+
+        cachedFrames.forEach((frame) => {
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          let table: Table = frame.fields.map((field) => field.values.toArray()) as Table;
+
+          let trimmed = trimTable(table, newFrom, newTo);
+
+          if (trimmed[0].length > 0) {
+            for (let i = 0; i < trimmed.length; i++) {
+              frame.fields[i].values = new ArrayVector(trimmed[i]);
+            }
+            nonEmptyCachedFrames.push(frame);
+          }
+        });
+
+        this.cache.set(targIdent, {
+          sig: requestInfo.targSigs.get(targIdent)!,
+          frames: nonEmptyCachedFrames,
+          prevTo: newTo,
+        });
+
+        outFrames.push(...nonEmptyCachedFrames);
+      });
+
+      // transformV2 mutates field values for heatmap de-accum, and modifies field order, so we gotta clone here, for now :(
+      respFrames = outFrames.map((frame) => ({
+        ...frame,
+        fields: frame.fields.map((field) => ({
+          ...field,
+          config: {
+            ...field.config, // prevents mutatative exemplars links (re)enrichment
+          },
+          values: new ArrayVector(field.values.toArray().slice()),
+        })),
+      }));
+    }
+
+    return respFrames;
+  }
+}
diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCacheTestData.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCacheTestData.ts
new file mode 100644
index 00000000000..6ab436640c4
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCacheTestData.ts
@@ -0,0 +1,864 @@
+import { clone } from 'lodash';
+
+import { ArrayVector } from '@grafana/data/src';
+
+/**
+ *
+ * @param length - Number of values to add
+ * @param start - First timestamp (ms)
+ * @param step - step duration (ms)
+ */
+export const getMockTimeFrameArray = (length: number, start: number, step: number): ArrayVector => {
+  let timeValues = [];
+  for (let i = 0; i < length; i++) {
+    timeValues.push(start + i * step);
+  }
+
+  return new ArrayVector(timeValues);
+};
+
+/**
+ * @param length - number of "Values" to add
+ * @param values
+ * @param high
+ */
+export const getMockValueFrameArray = (length: number, values = 0): ArrayVector => {
+  return new ArrayVector(Array(length).fill(values));
+};
+
+const timeFrameWithMissingValuesInMiddle = getMockTimeFrameArray(721, 1675262550000, 30000);
+const timeFrameWithMissingValuesAtStart = getMockTimeFrameArray(721, 1675262550000, 30000);
+const timeFrameWithMissingValuesAtEnd = getMockTimeFrameArray(721, 1675262550000, 30000);
+
+// Deleting some out the middle
+timeFrameWithMissingValuesInMiddle.toArray().splice(360, 721 - 684);
+timeFrameWithMissingValuesAtStart.toArray().splice(0, 721 - 684);
+timeFrameWithMissingValuesAtEnd.toArray().splice(721 - 684, 721 - 684);
+
+const mockLabels = {
+  __name__: 'cortex_request_duration_seconds_bucket',
+  cluster: 'dev-us-central-0',
+  container: 'aggregator',
+  instance: 'aggregator-7:aggregator:http-metrics',
+  job: 'mimir-dev-11/aggregator',
+  le: '0.5',
+  method: 'GET',
+  namespace: 'mimir-dev-11',
+  pod: 'aggregator-7',
+  route: 'metrics',
+  status_code: '200',
+  ws: 'false',
+};
+
+const twoRequestsOneCachedMissingData = {
+  first: {
+    request: {
+      app: 'panel-viewer',
+      requestId: 'Q100',
+      panelId: 19,
+      dashboardId: 884,
+      dashboardUID: 'dtngicc4z',
+      range: {
+        from: '2023-02-01T14:42:54.929Z',
+        to: '2023-02-01T20:42:54.929Z',
+        raw: { from: 'now-6h', to: 'now' },
+      },
+      interval: '30s',
+      intervalMs: 30000,
+      targets: [
+        {
+          datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+          editorMode: 'code',
+          expr: '',
+          legendFormat: '',
+          range: true,
+          refId: 'A',
+          exemplar: false,
+          requestId: '19A',
+          utcOffsetSec: -21600,
+        },
+      ],
+      startTime: 1675284174929,
+      rangeRaw: { from: 'now-6h', to: 'now' },
+    },
+    dataFrames: [
+      {
+        name: '+Inf',
+        refId: 'A',
+        fields: [
+          {
+            name: 'Time',
+            type: 'time',
+            typeInfo: { frame: 'time.Time' },
+            config: { interval: 30000 },
+            // Delete values from the middle
+            values: timeFrameWithMissingValuesInMiddle,
+            entities: {},
+          },
+          {
+            name: 'Value',
+            type: 'number',
+            typeInfo: { frame: 'float64' },
+            labels: { ...mockLabels, le: '+Inf' },
+            config: { displayNameFromDS: '+Inf' },
+            values: getMockValueFrameArray(684, 1),
+            entities: {},
+          },
+        ],
+        length: 684,
+      },
+      {
+        name: '0.5',
+        refId: 'A',
+        meta: {
+          type: 'timeseries-multi',
+          custom: { resultType: 'matrix' },
+          executedQueryString:
+            'Expr: {__name__="cortex_request_duration_seconds_bucket", cluster="dev-us-central-0", container="aggregator", instance=~"aggregator-7:aggregator:http-metrics|aggregator-6:aggregator:http-metrics", job="mimir-dev-11/aggregator", le=~"\\\\+Inf|0.5", method="GET", namespace="mimir-dev-11", pod="aggregator-7"}\nStep: 30s',
+          preferredVisualisationType: 'graph',
+        },
+        fields: [
+          {
+            name: 'Time',
+            type: 'time',
+            typeInfo: { frame: 'time.Time' },
+            config: { interval: 30000 },
+            values: timeFrameWithMissingValuesInMiddle,
+            entities: {},
+          },
+          {
+            name: 'Value',
+            type: 'number',
+            typeInfo: { frame: 'float64' },
+            labels: { ...mockLabels, le: '0.5' },
+            config: { displayNameFromDS: '0.5' },
+            values: getMockValueFrameArray(684, 25349),
+            entities: {},
+          },
+        ],
+        length: 684,
+      },
+    ],
+    originalRange: undefined,
+    timeSrv: { from: 'now-6h', to: 'now' },
+  },
+  second: {
+    request: {
+      app: 'panel-viewer',
+      requestId: 'Q101',
+      timezone: 'browser',
+      panelId: 19,
+      dashboardId: 884,
+      dashboardUID: 'dtngicc4z',
+      publicDashboardAccessToken: '',
+      range: {
+        from: '2023-02-01T14:44:01.928Z',
+        to: '2023-02-01T20:44:01.928Z',
+        raw: { from: 'now-6h', to: 'now' },
+      },
+      timeInfo: '',
+      interval: '30s',
+      intervalMs: 30000,
+      targets: [
+        {
+          datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+          editorMode: 'code',
+          expr: '{__name__="cortex_request_duration_seconds_bucket", cluster="dev-us-central-0", container="aggregator", instance=~"aggregator-7:aggregator:http-metrics|aggregator-6:aggregator:http-metrics", job="mimir-dev-11/aggregator", le=~"\\\\+Inf|0.5", method="GET", namespace="mimir-dev-11", pod="aggregator-7"}',
+          legendFormat: '{{le}}',
+          range: true,
+          refId: 'A',
+          exemplar: false,
+          requestId: '19A',
+          utcOffsetSec: -21600,
+        },
+      ],
+      maxDataPoints: 775,
+      scopedVars: { __interval: { text: '30s', value: '30s' }, __interval_ms: { text: '30000', value: 30000 } },
+      startTime: 1675284241929,
+      rangeRaw: { from: 'now-6h', to: 'now' },
+    },
+    dataFrames: [
+      {
+        name: '+Inf',
+        refId: 'A',
+        meta: {
+          type: 'timeseries-multi',
+          custom: { resultType: 'matrix' },
+          executedQueryString:
+            'Expr: {__name__="cortex_request_duration_seconds_bucket", cluster="dev-us-central-0", container="aggregator", instance=~"aggregator-7:aggregator:http-metrics|aggregator-6:aggregator:http-metrics", job="mimir-dev-11/aggregator", le=~"\\\\+Inf|0.5", method="GET", namespace="mimir-dev-11", pod="aggregator-7"}\nStep: 30s',
+          preferredVisualisationType: 'graph',
+        },
+        fields: [
+          {
+            name: 'Time',
+            type: 'time',
+            typeInfo: { frame: 'time.Time' },
+            config: { interval: 30000 },
+            values: getMockTimeFrameArray(24, 1675283550000, 30000),
+            entities: {},
+          },
+          {
+            name: 'Value',
+            type: 'number',
+            typeInfo: { frame: 'float64' },
+            labels: { ...mockLabels, le: '+Inf' },
+            config: { displayNameFromDS: '+Inf' },
+            values: getMockValueFrameArray(24, 1),
+            entities: {},
+          },
+        ],
+        length: 24,
+      },
+      {
+        name: '0.5',
+        refId: 'A',
+        meta: {
+          type: 'timeseries-multi',
+          custom: { resultType: 'matrix' },
+          executedQueryString:
+            'Expr: {__name__="cortex_request_duration_seconds_bucket", cluster="dev-us-central-0", container="aggregator", instance=~"aggregator-7:aggregator:http-metrics|aggregator-6:aggregator:http-metrics", job="mimir-dev-11/aggregator", le=~"\\\\+Inf|0.5", method="GET", namespace="mimir-dev-11", pod="aggregator-7"}\nStep: 30s',
+          preferredVisualisationType: 'graph',
+        },
+        fields: [
+          {
+            name: 'Time',
+            type: 'time',
+            typeInfo: { frame: 'time.Time' },
+            config: { interval: 30000 },
+            values: getMockTimeFrameArray(21, 1675283550000, 30000),
+            entities: {},
+          },
+          {
+            name: 'Value',
+            type: 'number',
+            typeInfo: { frame: 'float64' },
+            labels: {
+              __name__: 'cortex_request_duration_seconds_bucket',
+              cluster: 'dev-us-central-0',
+              container: 'aggregator',
+              instance: 'aggregator-7:aggregator:http-metrics',
+              job: 'mimir-dev-11/aggregator',
+              le: '0.5',
+              method: 'GET',
+              namespace: 'mimir-dev-11',
+              pod: 'aggregator-7',
+              route: 'metrics',
+              status_code: '200',
+              ws: 'false',
+            },
+            config: { displayNameFromDS: '0.5' },
+            values: getMockValueFrameArray(21, 2),
+            entities: {},
+          },
+        ],
+        length: 21,
+      },
+    ],
+    originalRange: { end: 1675284241920, start: 1675262641920 },
+    timeSrv: { from: 'now-6h', to: 'now' },
+  },
+};
+
+export const IncrementalStorageDataFrameScenarios = {
+  histogram: {
+    // 3 requests, one 30 seconds after the first, and then the user waits a minute and shortens to a 5 minute query window from 1 hour to force frames to get evicted
+    evictionRequests: {
+      first: {
+        request: {
+          range: {
+            from: '2023-01-30T19:33:01.332Z',
+            to: '2023-01-30T20:33:01.332Z',
+            raw: { from: 'now-1h', to: 'now' },
+          },
+          interval: '15s',
+          intervalMs: 15000,
+          targets: [
+            {
+              datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+              editorMode: 'code',
+              exemplar: false,
+              expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+              format: 'heatmap',
+              legendFormat: '{{le}}',
+              range: true,
+              refId: 'A',
+              requestId: '2A',
+              utcOffsetSec: -21600,
+            },
+          ],
+          maxDataPoints: 871,
+          scopedVars: {
+            __interval: { text: '15s', value: '15s' },
+            __interval_ms: { text: '15000', value: 15000 },
+          },
+          startTime: 1675110781332,
+          rangeRaw: { from: 'now-1h', to: 'now' },
+        },
+        dataFrames: [
+          {
+            name: '0.005',
+            refId: 'A',
+            meta: {
+              type: 'heatmap-rows',
+              custom: { resultType: 'matrix' },
+              executedQueryString:
+                'Expr: sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[1m0s]))\nStep: 15s',
+            },
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                typeInfo: { frame: 'time.Time' },
+                config: { interval: 15000 },
+                values: getMockTimeFrameArray(241, 1675107180000, 15000),
+                entities: {},
+              },
+              {
+                name: '0.005',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.005' },
+                config: { displayNameFromDS: '0.005' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.01',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.01' },
+                config: { displayNameFromDS: '0.01' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.025',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.025' },
+                config: { displayNameFromDS: '0.025' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.05',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.05' },
+                config: { displayNameFromDS: '0.05' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.1',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.1' },
+                config: { displayNameFromDS: '0.1' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.25',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.25' },
+                config: { displayNameFromDS: '0.25' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.5' },
+                config: { displayNameFromDS: '0.5' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '1.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '1.0' },
+                config: { displayNameFromDS: '1.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '2.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '2.5' },
+                config: { displayNameFromDS: '2.5' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '5.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '5.0' },
+                config: { displayNameFromDS: '5.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '10.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '10.0' },
+                config: { displayNameFromDS: '10.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '25.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '25.0' },
+                config: { displayNameFromDS: '25.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '50.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '50.0' },
+                config: { displayNameFromDS: '50.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '100.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '100.0' },
+                config: { displayNameFromDS: '100.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '+Inf',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '+Inf' },
+                config: { displayNameFromDS: '+Inf' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+            ],
+            length: 241,
+          },
+        ],
+      },
+      second: {
+        request: {
+          range: {
+            from: '2023-01-30T19:33:31.357Z',
+            to: '2023-01-30T20:33:31.357Z',
+            raw: { from: 'now-1h', to: 'now' },
+          },
+          interval: '15s',
+          intervalMs: 15000,
+          targets: [
+            {
+              datasource: { type: 'prometheus' },
+              editorMode: 'code',
+              exemplar: false,
+              expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+              format: 'heatmap',
+              legendFormat: '{{le}}',
+              range: true,
+              refId: 'A',
+              requestId: '2A',
+              utcOffsetSec: -21600,
+            },
+          ],
+          maxDataPoints: 871,
+          scopedVars: {
+            __interval: { text: '15s', value: '15s' },
+            __interval_ms: { text: '15000', value: 15000 },
+          },
+          startTime: 1675110811357,
+          rangeRaw: { from: 'now-1h', to: 'now' },
+        },
+        dataFrames: [
+          {
+            name: '0.005',
+            refId: 'A',
+            meta: {
+              type: 'heatmap-rows',
+              custom: { resultType: 'matrix' },
+              executedQueryString:
+                'Expr: sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[1m0s]))\nStep: 15s',
+            },
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                typeInfo: { frame: 'time.Time' },
+                config: { interval: 15000 },
+                values: getMockTimeFrameArray(43, 1675110180000, 15000),
+                entities: {},
+              },
+              {
+                name: '0.005',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.005' },
+                config: { displayNameFromDS: '0.005' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.01',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.01' },
+                config: { displayNameFromDS: '0.01' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.025',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.025' },
+                config: { displayNameFromDS: '0.025' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.05',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.05' },
+                config: { displayNameFromDS: '0.05' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.1',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.1' },
+                config: { displayNameFromDS: '0.1' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.25',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.25' },
+                config: { displayNameFromDS: '0.25' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.5' },
+                config: { displayNameFromDS: '0.5' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '1.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '1.0' },
+                config: { displayNameFromDS: '1.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '2.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '2.5' },
+                config: { displayNameFromDS: '2.5' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '5.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '5.0' },
+                config: { displayNameFromDS: '5.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '10.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '10.0' },
+                config: { displayNameFromDS: '10.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '25.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '25.0' },
+                config: { displayNameFromDS: '25.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '50.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '50.0' },
+                config: { displayNameFromDS: '50.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '100.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '100.0' },
+                config: { displayNameFromDS: '100.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '+Inf',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '+Inf' },
+                config: { displayNameFromDS: '+Inf' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+            ],
+            length: 43,
+          },
+        ],
+      },
+      third: {
+        request: {
+          range: {
+            from: '2023-01-30T20:33:31.357Z',
+            to: '2023-01-30T20:34:31.357Z',
+            raw: { from: 'now-5m', to: 'now' },
+          },
+          interval: '15s',
+          intervalMs: 15000,
+          targets: [
+            {
+              datasource: { type: 'prometheus' },
+              editorMode: 'code',
+              exemplar: false,
+              expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+              format: 'heatmap',
+              legendFormat: '{{le}}',
+              range: true,
+              refId: 'A',
+              requestId: '2A',
+              utcOffsetSec: -21600,
+            },
+          ],
+          maxDataPoints: 871,
+          scopedVars: {
+            __interval: { text: '15s', value: '15s' },
+            __interval_ms: { text: '15000', value: 15000 },
+          },
+          startTime: 1675110811357,
+          rangeRaw: { from: 'now-1h', to: 'now' },
+        },
+        dataFrames: [
+          {
+            name: '0.005',
+            refId: 'A',
+            meta: {
+              type: 'heatmap-rows',
+              custom: { resultType: 'matrix' },
+              executedQueryString:
+                'Expr: sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[1m0s]))\nStep: 15s',
+            },
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                typeInfo: { frame: 'time.Time' },
+                config: { interval: 15000 },
+                values: getMockTimeFrameArray(20, 1675110810000, 15000),
+                entities: {},
+              },
+              {
+                name: '0.005',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.005' },
+                config: { displayNameFromDS: '0.005' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.01',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.01' },
+                config: { displayNameFromDS: '0.01' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.025',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.025' },
+                config: { displayNameFromDS: '0.025' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.05',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.05' },
+                config: { displayNameFromDS: '0.05' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.1',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.1' },
+                config: { displayNameFromDS: '0.1' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.25',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.25' },
+                config: { displayNameFromDS: '0.25' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+
+              // Sometimes we don't always get new values, the preprocessing will need to back-fill any missing values
+              {
+                name: '0.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.5' },
+                config: { displayNameFromDS: '0.5' },
+                values: getMockValueFrameArray(10, 4.3),
+                entities: {},
+              },
+              {
+                name: '1.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '1.0' },
+                config: { displayNameFromDS: '1.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '2.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '2.5' },
+                config: { displayNameFromDS: '2.5' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '5.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '5.0' },
+                config: { displayNameFromDS: '5.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '10.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '10.0' },
+                config: { displayNameFromDS: '10.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '25.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '25.0' },
+                config: { displayNameFromDS: '25.0' },
+                values: getMockValueFrameArray(10, 4.3),
+                entities: {},
+              },
+              {
+                name: '50.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '50.0' },
+                config: { displayNameFromDS: '50.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '100.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '100.0' },
+                config: { displayNameFromDS: '100.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '+Inf',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '+Inf' },
+                config: { displayNameFromDS: '+Inf' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+            ],
+            length: 43,
+          },
+        ],
+      },
+    },
+
+    getSeriesWithGapAtEnd: (countOfSeries = 2) => {
+      const templateClone = clone(twoRequestsOneCachedMissingData);
+      for (let i = 0; i < countOfSeries - 1; i++) {
+        templateClone.first.dataFrames[i].fields[0].values = timeFrameWithMissingValuesAtEnd;
+      }
+      return templateClone;
+    },
+
+    getSeriesWithGapAtStart: (countOfSeries = 2) => {
+      const templateClone = clone(twoRequestsOneCachedMissingData);
+      for (let i = 0; i < countOfSeries - 1; i++) {
+        templateClone.first.dataFrames[i].fields[0].values = timeFrameWithMissingValuesAtStart;
+      }
+      return templateClone;
+    },
+
+    getSeriesWithGapInMiddle: (countOfSeries = 2) => {
+      const templateClone = clone(twoRequestsOneCachedMissingData);
+      for (let i = 0; i < countOfSeries - 1; i++) {
+        templateClone.first.dataFrames[i].fields[0].values = timeFrameWithMissingValuesInMiddle;
+      }
+      return templateClone;
+    },
+  },
+};
diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts
index 4be7c63911e..65386982c10 100644
--- a/public/app/plugins/datasource/prometheus/types.ts
+++ b/public/app/plugins/datasource/prometheus/types.ts
@@ -38,6 +38,8 @@ export interface PromOptions extends DataSourceJsonData {
   prometheusVersion?: string;
   cacheLevel?: PrometheusCacheLevel;
   defaultEditor?: QueryEditorMode;
+  incrementalQuerying?: boolean;
+  incrementalQueryOverlapWindow?: string;
 }
 
 export type ExemplarTraceIdDestination = {

From b6ddc5b35b29eee665a11c1b77568dd715343ff6 Mon Sep 17 00:00:00 2001
From: David Harris <david.harris@grafana.com>
Date: Wed, 12 Apr 2023 19:43:08 +0100
Subject: [PATCH 083/729] docs: remove ref to resolved issue (#66369)

remove ref to resolved issue

Linked issue (and its replacement) have been closed, assume this can be removed from our docs now.
---
 docs/sources/developers/plugins/data-frames.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/sources/developers/plugins/data-frames.md b/docs/sources/developers/plugins/data-frames.md
index 62cd731793a..52a705c362a 100644
--- a/docs/sources/developers/plugins/data-frames.md
+++ b/docs/sources/developers/plugins/data-frames.md
@@ -129,8 +129,6 @@ In long format, string values are represented as separate fields rather than as
 
 Grafana can detect and convert data frames in long format into wide format.
 
-> **Note:** Long format is currently only supported in the backend: [Grafana Issue #22219](https://github.com/grafana/grafana/issues/22219).
-
 For example, the following data frame in long format:
 
 ```text

From 00cf561f43c1560eeb33e108c3c2918cf8b2c569 Mon Sep 17 00:00:00 2001
From: Kyle Cunningham <codeincarnate@users.noreply.github.com>
Date: Thu, 13 Apr 2023 11:46:15 +0700
Subject: [PATCH 084/729] Dashboard Datasource: Update Language (#66015)

Update language on dashboard datasource
---
 .../app/plugins/datasource/dashboard/DashboardQueryEditor.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
index f585c791885..e2c8360519b 100644
--- a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
+++ b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
@@ -188,7 +188,7 @@ export function DashboardQueryEditor({ panelData, queries, onChange, onRunQuerie
       ) : (
         <>
           {results && Boolean(results.length) && (
-            <Field label="Available queries from panel">
+            <Field label="Queries from panel">
               <VerticalGroup spacing="sm">
                 {results.map((target, i) => (
                   <Card key={`DashboardQueryRow-${i}`}>

From 7f9ad2cd73e8a9ed722a4a7e59e630c34b9ba127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 13 Apr 2023 07:56:09 +0200
Subject: [PATCH 085/729] Table: Fix storybook stories (#66414)

---
 .../src/components/Table/Table.story.tsx      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/grafana-ui/src/components/Table/Table.story.tsx b/packages/grafana-ui/src/components/Table/Table.story.tsx
index a300ecb99a2..69ba6309771 100644
--- a/packages/grafana-ui/src/components/Table/Table.story.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.story.tsx
@@ -15,6 +15,7 @@ import {
 import { Table } from '@grafana/ui';
 
 import { useTheme2 } from '../../themes';
+import { DashboardStoryCanvas } from '../../utils/storybook/DashboardStoryCanvas';
 import { prepDataForStorybook } from '../../utils/storybook/data';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 
@@ -189,9 +190,9 @@ export const Basic: ComponentStory<typeof Table> = (args) => {
   const data = buildData(theme, {});
 
   return (
-    <div className="panel-container" style={{ width: 'auto' }}>
+    <DashboardStoryCanvas>
       <Table {...args} data={data} />
-    </div>
+    </DashboardStoryCanvas>
   );
 };
 
@@ -201,16 +202,19 @@ export const BarGaugeCell: ComponentStory<typeof Table> = (args) => {
     Progress: {
       custom: {
         width: 200,
-        displayMode: 'gradient-gauge',
+        cellOptions: {
+          type: 'gauge',
+          mode: 'gradient',
+        },
       },
       thresholds: defaultThresholds,
     },
   });
 
   return (
-    <div className="panel-container" style={{ width: 'auto' }}>
+    <DashboardStoryCanvas>
       <Table {...args} data={data} />
-    </div>
+    </DashboardStoryCanvas>
   );
 };
 
@@ -227,9 +231,9 @@ export const ColoredCells: ComponentStory<typeof Table> = (args) => {
   });
 
   return (
-    <div className="panel-container" style={{ width: 'auto' }}>
+    <DashboardStoryCanvas>
       <Table {...args} data={data} />
-    </div>
+    </DashboardStoryCanvas>
   );
 };
 
@@ -239,9 +243,9 @@ export const Footer: ComponentStory<typeof Table> = (args) => {
   const footer = buildFooterData(data);
 
   return (
-    <div className="panel-container" style={{ width: 'auto', height: 'unset' }}>
+    <DashboardStoryCanvas>
       <Table {...args} data={data} footerValues={footer} />
-    </div>
+    </DashboardStoryCanvas>
   );
 };
 
@@ -263,9 +267,9 @@ export const SubTables: ComponentStory<typeof Table> = (args) => {
   });
 
   return (
-    <div className="panel-container" style={{ width: 'auto', height: 'unset' }}>
+    <DashboardStoryCanvas>
       <Table {...args} data={data} subData={subData} />
-    </div>
+    </DashboardStoryCanvas>
   );
 };
 

From 8e03badfa2e820b17d61a48becd7269cf0c05932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Thu, 13 Apr 2023 09:10:04 +0200
Subject: [PATCH 086/729] Prometheus: Enable converter tests (#66378)

* converter: enable tests

* updated snapshot tests

---------

Co-authored-by: Kyle Brandt <kyle@grafana.com>
---
 pkg/util/converter/prom_test.go               |    3 -
 .../testdata/loki-streams-a-frame.jsonc       |   21 +
 .../testdata/loki-streams-a-wide-frame.jsonc  |   21 +
 .../testdata/loki-streams-b-frame.jsonc       |   20 +
 .../testdata/loki-streams-b-wide-frame.jsonc  |   20 +
 .../testdata/loki-streams-c-frame.jsonc       |   14 +-
 .../testdata/loki-streams-c-wide-frame.jsonc  |   14 +-
 .../testdata/prom-exemplars-a-frame.jsonc     |   16 +
 .../prom-exemplars-a-wide-frame.jsonc         |   16 +
 .../testdata/prom-exemplars-b-frame.jsonc     | 1032 +++++++++++++++++
 .../prom-exemplars-b-wide-frame.jsonc         | 1032 +++++++++++++++++
 .../testdata/prom-matrix-frame.jsonc          |   16 +
 ...rom-matrix-histogram-no-labels-frame.jsonc |   12 +-
 ...atrix-histogram-no-labels-wide-frame.jsonc |   12 +-
 ...m-matrix-histogram-partitioned-frame.jsonc |  288 ++++-
 ...rix-histogram-partitioned-wide-frame.jsonc |  288 ++++-
 .../testdata/prom-matrix-wide-frame.jsonc     |    8 +
 .../prom-matrix-with-nans-frame.jsonc         |    8 +
 .../prom-matrix-with-nans-wide-frame.jsonc    |    8 +
 .../testdata/prom-scalar-frame.jsonc          |   12 +-
 .../testdata/prom-scalar-wide-frame.jsonc     |   12 +-
 .../testdata/prom-string-frame.jsonc          |    8 +
 .../testdata/prom-string-wide-frame.jsonc     |    8 +
 .../testdata/prom-vector-frame.jsonc          |   40 +
 ...rom-vector-histogram-no-labels-frame.jsonc |   12 +-
 ...ector-histogram-no-labels-wide-frame.jsonc |   12 +-
 .../testdata/prom-vector-wide-frame.jsonc     |    8 +
 .../testdata/prom-warnings-frame.jsonc        |   40 +
 .../testdata/prom-warnings-wide-frame.jsonc   |    8 +
 29 files changed, 2894 insertions(+), 115 deletions(-)

diff --git a/pkg/util/converter/prom_test.go b/pkg/util/converter/prom_test.go
index 29649c6a68c..9b1f4844c09 100644
--- a/pkg/util/converter/prom_test.go
+++ b/pkg/util/converter/prom_test.go
@@ -16,9 +16,6 @@ import (
 const update = true
 
 func TestReadPromFrames(t *testing.T) {
-	// FIXME:
-	// skipping test due to flaky behavior
-	t.Skip()
 	files := []string{
 		"prom-labels",
 		"prom-matrix",
diff --git a/pkg/util/converter/testdata/loki-streams-a-frame.jsonc b/pkg/util/converter/testdata/loki-streams-a-frame.jsonc
index 06559dd9366..86e5a4fa250 100644
--- a/pkg/util/converter/testdata/loki-streams-a-frame.jsonc
+++ b/pkg/util/converter/testdata/loki-streams-a-frame.jsonc
@@ -1,6 +1,10 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "stats": {
 //              "ingester": {
@@ -59,6 +63,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "stats": {
               "ingester": {
@@ -177,6 +185,19 @@
             "1645030245539423744",
             "1645030244091700992"
           ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040,
+            587968,
+            587968,
+            423744,
+            700992
+          ],
+          null,
+          null
         ]
       }
     }
diff --git a/pkg/util/converter/testdata/loki-streams-a-wide-frame.jsonc b/pkg/util/converter/testdata/loki-streams-a-wide-frame.jsonc
index 06559dd9366..86e5a4fa250 100644
--- a/pkg/util/converter/testdata/loki-streams-a-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/loki-streams-a-wide-frame.jsonc
@@ -1,6 +1,10 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "stats": {
 //              "ingester": {
@@ -59,6 +63,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "stats": {
               "ingester": {
@@ -177,6 +185,19 @@
             "1645030245539423744",
             "1645030244091700992"
           ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040,
+            587968,
+            587968,
+            423744,
+            700992
+          ],
+          null,
+          null
         ]
       }
     }
diff --git a/pkg/util/converter/testdata/loki-streams-b-frame.jsonc b/pkg/util/converter/testdata/loki-streams-b-frame.jsonc
index fa04ae09377..20d30f6b52c 100644
--- a/pkg/util/converter/testdata/loki-streams-b-frame.jsonc
+++ b/pkg/util/converter/testdata/loki-streams-b-frame.jsonc
@@ -1,6 +1,10 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "stats": {
 //              "ingester": {
@@ -58,6 +62,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "stats": {
               "ingester": {
@@ -169,6 +177,18 @@
             "1645030245539423744",
             "1645030244091700992"
           ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040,
+            587968,
+            423744,
+            700992
+          ],
+          null,
+          null
         ]
       }
     }
diff --git a/pkg/util/converter/testdata/loki-streams-b-wide-frame.jsonc b/pkg/util/converter/testdata/loki-streams-b-wide-frame.jsonc
index fa04ae09377..20d30f6b52c 100644
--- a/pkg/util/converter/testdata/loki-streams-b-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/loki-streams-b-wide-frame.jsonc
@@ -1,6 +1,10 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "stats": {
 //              "ingester": {
@@ -58,6 +62,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "stats": {
               "ingester": {
@@ -169,6 +177,18 @@
             "1645030245539423744",
             "1645030244091700992"
           ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040,
+            587968,
+            423744,
+            700992
+          ],
+          null,
+          null
         ]
       }
     }
diff --git a/pkg/util/converter/testdata/loki-streams-c-frame.jsonc b/pkg/util/converter/testdata/loki-streams-c-frame.jsonc
index 45c917f3e6f..15532051765 100644
--- a/pkg/util/converter/testdata/loki-streams-c-frame.jsonc
+++ b/pkg/util/converter/testdata/loki-streams-c-frame.jsonc
@@ -1,6 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
-//  Frame[0] {}
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
+//  }
 //  Name: 
 //  Dimensions: 4 Fields by 2 Rows
 //  +-------------------------+-------------------------------+----------------+---------------------+
@@ -19,7 +24,12 @@
   "frames": [
     {
       "schema": {
-        "meta": {},
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ]
+        },
         "fields": [
           {
             "name": "__labels",
diff --git a/pkg/util/converter/testdata/loki-streams-c-wide-frame.jsonc b/pkg/util/converter/testdata/loki-streams-c-wide-frame.jsonc
index 45c917f3e6f..15532051765 100644
--- a/pkg/util/converter/testdata/loki-streams-c-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/loki-streams-c-wide-frame.jsonc
@@ -1,6 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
-//  Frame[0] {}
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
+//  }
 //  Name: 
 //  Dimensions: 4 Fields by 2 Rows
 //  +-------------------------+-------------------------------+----------------+---------------------+
@@ -19,7 +24,12 @@
   "frames": [
     {
       "schema": {
-        "meta": {},
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ]
+        },
         "fields": [
           {
             "name": "__labels",
diff --git a/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc b/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc
index 5ecc472e7f0..3e9d37f2d67 100644
--- a/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc
@@ -1,6 +1,10 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -18,6 +22,10 @@
 //  
 //  
 //  Frame[1] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -41,6 +49,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -102,6 +114,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
diff --git a/pkg/util/converter/testdata/prom-exemplars-a-wide-frame.jsonc b/pkg/util/converter/testdata/prom-exemplars-a-wide-frame.jsonc
index 5ecc472e7f0..3e9d37f2d67 100644
--- a/pkg/util/converter/testdata/prom-exemplars-a-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-exemplars-a-wide-frame.jsonc
@@ -1,6 +1,10 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -18,6 +22,10 @@
 //  
 //  
 //  Frame[1] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -41,6 +49,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -102,6 +114,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
diff --git a/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc b/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc
index 25369baebe5..327e5e5e65a 100644
--- a/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc
@@ -1,6 +1,10 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -18,6 +22,10 @@
 //  
 //  
 //  Frame[1] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -44,6 +52,10 @@
 //  
 //  
 //  Frame[2] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -70,6 +82,10 @@
 //  
 //  
 //  Frame[3] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -94,6 +110,10 @@
 //  
 //  
 //  Frame[4] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -112,6 +132,10 @@
 //  
 //  
 //  Frame[5] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -138,6 +162,10 @@
 //  
 //  
 //  Frame[6] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -164,6 +192,10 @@
 //  
 //  
 //  Frame[7] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -184,6 +216,10 @@
 //  
 //  
 //  Frame[8] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -210,6 +246,10 @@
 //  
 //  
 //  Frame[9] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -236,6 +276,10 @@
 //  
 //  
 //  Frame[10] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -253,6 +297,10 @@
 //  
 //  
 //  Frame[11] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -279,6 +327,10 @@
 //  
 //  
 //  Frame[12] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -305,6 +357,10 @@
 //  
 //  
 //  Frame[13] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -322,6 +378,10 @@
 //  
 //  
 //  Frame[14] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -344,6 +404,10 @@
 //  
 //  
 //  Frame[15] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -370,6 +434,10 @@
 //  
 //  
 //  Frame[16] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -396,6 +464,10 @@
 //  
 //  
 //  Frame[17] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -415,6 +487,10 @@
 //  
 //  
 //  Frame[18] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -439,6 +515,10 @@
 //  
 //  
 //  Frame[19] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -465,6 +545,10 @@
 //  
 //  
 //  Frame[20] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -487,6 +571,10 @@
 //  
 //  
 //  Frame[21] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -513,6 +601,10 @@
 //  
 //  
 //  Frame[22] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -539,6 +631,10 @@
 //  
 //  
 //  Frame[23] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -565,6 +661,10 @@
 //  
 //  
 //  Frame[24] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -591,6 +691,10 @@
 //  
 //  
 //  Frame[25] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -610,6 +714,10 @@
 //  
 //  
 //  Frame[26] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -627,6 +735,10 @@
 //  
 //  
 //  Frame[27] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -651,6 +763,10 @@
 //  
 //  
 //  Frame[28] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -677,6 +793,10 @@
 //  
 //  
 //  Frame[29] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -703,6 +823,10 @@
 //  
 //  
 //  Frame[30] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -720,6 +844,10 @@
 //  
 //  
 //  Frame[31] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -746,6 +874,10 @@
 //  
 //  
 //  Frame[32] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -772,6 +904,10 @@
 //  
 //  
 //  Frame[33] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -789,6 +925,10 @@
 //  
 //  
 //  Frame[34] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -815,6 +955,10 @@
 //  
 //  
 //  Frame[35] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -839,6 +983,10 @@
 //  
 //  
 //  Frame[36] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -865,6 +1013,10 @@
 //  
 //  
 //  Frame[37] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -882,6 +1034,10 @@
 //  
 //  
 //  Frame[38] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -908,6 +1064,10 @@
 //  
 //  
 //  Frame[39] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -931,6 +1091,10 @@
 //  
 //  
 //  Frame[40] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -954,6 +1118,10 @@
 //  
 //  
 //  Frame[41] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -980,6 +1148,10 @@
 //  
 //  
 //  Frame[42] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1006,6 +1178,10 @@
 //  
 //  
 //  Frame[43] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1023,6 +1199,10 @@
 //  
 //  
 //  Frame[44] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1049,6 +1229,10 @@
 //  
 //  
 //  Frame[45] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1074,6 +1258,10 @@
 //  
 //  
 //  Frame[46] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1100,6 +1288,10 @@
 //  
 //  
 //  Frame[47] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1126,6 +1318,10 @@
 //  
 //  
 //  Frame[48] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1152,6 +1348,10 @@
 //  
 //  
 //  Frame[49] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1178,6 +1378,10 @@
 //  
 //  
 //  Frame[50] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1204,6 +1408,10 @@
 //  
 //  
 //  Frame[51] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1230,6 +1438,10 @@
 //  
 //  
 //  Frame[52] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1247,6 +1459,10 @@
 //  
 //  
 //  Frame[53] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1273,6 +1489,10 @@
 //  
 //  
 //  Frame[54] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1297,6 +1517,10 @@
 //  
 //  
 //  Frame[55] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1323,6 +1547,10 @@
 //  
 //  
 //  Frame[56] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1349,6 +1577,10 @@
 //  
 //  
 //  Frame[57] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1373,6 +1605,10 @@
 //  
 //  
 //  Frame[58] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1396,6 +1632,10 @@
 //  
 //  
 //  Frame[59] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1422,6 +1662,10 @@
 //  
 //  
 //  Frame[60] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1448,6 +1692,10 @@
 //  
 //  
 //  Frame[61] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1465,6 +1713,10 @@
 //  
 //  
 //  Frame[62] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1491,6 +1743,10 @@
 //  
 //  
 //  Frame[63] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1516,6 +1772,10 @@
 //  
 //  
 //  Frame[64] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1533,6 +1793,10 @@
 //  
 //  
 //  Frame[65] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1550,6 +1814,10 @@
 //  
 //  
 //  Frame[66] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1575,6 +1843,10 @@
 //  
 //  
 //  Frame[67] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1601,6 +1873,10 @@
 //  
 //  
 //  Frame[68] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1627,6 +1903,10 @@
 //  
 //  
 //  Frame[69] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1653,6 +1933,10 @@
 //  
 //  
 //  Frame[70] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1675,6 +1959,10 @@
 //  
 //  
 //  Frame[71] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1692,6 +1980,10 @@
 //  
 //  
 //  Frame[72] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1709,6 +2001,10 @@
 //  
 //  
 //  Frame[73] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1735,6 +2031,10 @@
 //  
 //  
 //  Frame[74] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1761,6 +2061,10 @@
 //  
 //  
 //  Frame[75] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1780,6 +2084,10 @@
 //  
 //  
 //  Frame[76] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1806,6 +2114,10 @@
 //  
 //  
 //  Frame[77] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1823,6 +2135,10 @@
 //  
 //  
 //  Frame[78] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1849,6 +2165,10 @@
 //  
 //  
 //  Frame[79] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1875,6 +2195,10 @@
 //  
 //  
 //  Frame[80] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1901,6 +2225,10 @@
 //  
 //  
 //  Frame[81] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1927,6 +2255,10 @@
 //  
 //  
 //  Frame[82] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1953,6 +2285,10 @@
 //  
 //  
 //  Frame[83] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1979,6 +2315,10 @@
 //  
 //  
 //  Frame[84] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2005,6 +2345,10 @@
 //  
 //  
 //  Frame[85] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2031,6 +2375,10 @@
 //  
 //  
 //  Frame[86] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2055,6 +2403,10 @@
 //  
 //  
 //  Frame[87] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2081,6 +2433,10 @@
 //  
 //  
 //  Frame[88] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2107,6 +2463,10 @@
 //  
 //  
 //  Frame[89] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2126,6 +2486,10 @@
 //  
 //  
 //  Frame[90] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2152,6 +2516,10 @@
 //  
 //  
 //  Frame[91] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2178,6 +2546,10 @@
 //  
 //  
 //  Frame[92] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2204,6 +2576,10 @@
 //  
 //  
 //  Frame[93] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2230,6 +2606,10 @@
 //  
 //  
 //  Frame[94] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2256,6 +2636,10 @@
 //  
 //  
 //  Frame[95] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2282,6 +2666,10 @@
 //  
 //  
 //  Frame[96] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2308,6 +2696,10 @@
 //  
 //  
 //  Frame[97] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2334,6 +2726,10 @@
 //  
 //  
 //  Frame[98] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2351,6 +2747,10 @@
 //  
 //  
 //  Frame[99] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2377,6 +2777,10 @@
 //  
 //  
 //  Frame[100] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2403,6 +2807,10 @@
 //  
 //  
 //  Frame[101] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2429,6 +2837,10 @@
 //  
 //  
 //  Frame[102] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2455,6 +2867,10 @@
 //  
 //  
 //  Frame[103] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2475,6 +2891,10 @@
 //  
 //  
 //  Frame[104] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2501,6 +2921,10 @@
 //  
 //  
 //  Frame[105] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2527,6 +2951,10 @@
 //  
 //  
 //  Frame[106] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2553,6 +2981,10 @@
 //  
 //  
 //  Frame[107] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2579,6 +3011,10 @@
 //  
 //  
 //  Frame[108] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2605,6 +3041,10 @@
 //  
 //  
 //  Frame[109] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2631,6 +3071,10 @@
 //  
 //  
 //  Frame[110] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2657,6 +3101,10 @@
 //  
 //  
 //  Frame[111] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2677,6 +3125,10 @@
 //  
 //  
 //  Frame[112] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2703,6 +3155,10 @@
 //  
 //  
 //  Frame[113] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2725,6 +3181,10 @@
 //  
 //  
 //  Frame[114] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2742,6 +3202,10 @@
 //  
 //  
 //  Frame[115] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2759,6 +3223,10 @@
 //  
 //  
 //  Frame[116] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2777,6 +3245,10 @@
 //  
 //  
 //  Frame[117] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2803,6 +3275,10 @@
 //  
 //  
 //  Frame[118] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2829,6 +3305,10 @@
 //  
 //  
 //  Frame[119] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2850,6 +3330,10 @@
 //  
 //  
 //  Frame[120] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2876,6 +3360,10 @@
 //  
 //  
 //  Frame[121] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2901,6 +3389,10 @@
 //  
 //  
 //  Frame[122] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2918,6 +3410,10 @@
 //  
 //  
 //  Frame[123] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2935,6 +3431,10 @@
 //  
 //  
 //  Frame[124] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2961,6 +3461,10 @@
 //  
 //  
 //  Frame[125] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2987,6 +3491,10 @@
 //  
 //  
 //  Frame[126] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -3013,6 +3521,10 @@
 //  
 //  
 //  Frame[127] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -3030,6 +3542,10 @@
 //  
 //  
 //  Frame[128] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -3052,6 +3568,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3110,6 +3630,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3288,6 +3812,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3490,6 +4018,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3569,6 +4101,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3630,6 +4166,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3751,6 +4291,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3896,6 +4440,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3963,6 +4511,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4063,6 +4615,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4178,6 +4734,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4236,6 +4796,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4390,6 +4954,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4544,6 +5112,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4602,6 +5174,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4675,6 +5251,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4895,6 +5475,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4983,6 +5567,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5047,6 +5635,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5126,6 +5718,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5346,6 +5942,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5419,6 +6019,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5573,6 +6177,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5787,6 +6395,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5995,6 +6607,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6182,6 +6798,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6246,6 +6866,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6304,6 +6928,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6383,6 +7011,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6591,6 +7223,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6733,6 +7369,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6791,6 +7431,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6891,6 +7535,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7117,6 +7765,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7175,6 +7827,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7263,6 +7919,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7342,6 +8002,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7517,6 +8181,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7575,6 +8243,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7777,6 +8449,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7853,6 +8529,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7929,6 +8609,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8026,6 +8710,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8192,6 +8880,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8250,6 +8942,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8461,6 +9157,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8543,6 +9243,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8775,6 +9479,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9007,6 +9715,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9230,6 +9942,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9378,6 +10094,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9505,6 +10225,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9638,6 +10362,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9696,6 +10424,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9793,6 +10525,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9872,6 +10608,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10032,6 +10772,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10222,6 +10966,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10301,6 +11049,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10377,6 +11129,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10462,6 +11218,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10661,6 +11421,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10719,6 +11483,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10930,6 +11698,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11012,6 +11784,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11070,6 +11846,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11128,6 +11908,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11210,6 +11994,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11301,6 +12089,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11461,6 +12253,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11675,6 +12471,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11748,6 +12548,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11806,6 +12610,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11864,6 +12672,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12094,6 +12906,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12324,6 +13140,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12386,6 +13206,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12589,6 +13413,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12645,6 +13473,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12875,6 +13707,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -13105,6 +13941,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -13335,6 +14175,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -13565,6 +14409,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -13795,6 +14643,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14025,6 +14877,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14255,6 +15111,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14428,6 +15288,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14505,6 +15369,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14684,6 +15552,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14908,6 +15780,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14970,6 +15846,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15200,6 +16080,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15361,6 +16245,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15573,6 +16461,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15803,6 +16695,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15931,6 +16827,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16161,6 +17061,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16355,6 +17259,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16510,6 +17418,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16566,6 +17478,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16796,6 +17712,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17020,6 +17940,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17235,6 +18159,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17465,6 +18393,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17530,6 +18462,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17757,6 +18693,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17858,6 +18798,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17950,6 +18894,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18078,6 +19026,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18305,6 +19257,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18415,6 +19371,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18582,6 +19542,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18647,6 +19611,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18877,6 +19845,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18948,6 +19920,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19004,6 +19980,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19060,6 +20040,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19119,6 +20103,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19349,6 +20337,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19441,6 +20433,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19509,6 +20505,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19739,6 +20739,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19819,6 +20823,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19875,6 +20883,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19931,6 +20943,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -20107,6 +21123,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -20196,6 +21216,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -20402,6 +21426,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -20458,6 +21486,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
diff --git a/pkg/util/converter/testdata/prom-exemplars-b-wide-frame.jsonc b/pkg/util/converter/testdata/prom-exemplars-b-wide-frame.jsonc
index 25369baebe5..327e5e5e65a 100644
--- a/pkg/util/converter/testdata/prom-exemplars-b-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-exemplars-b-wide-frame.jsonc
@@ -1,6 +1,10 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -18,6 +22,10 @@
 //  
 //  
 //  Frame[1] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -44,6 +52,10 @@
 //  
 //  
 //  Frame[2] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -70,6 +82,10 @@
 //  
 //  
 //  Frame[3] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -94,6 +110,10 @@
 //  
 //  
 //  Frame[4] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -112,6 +132,10 @@
 //  
 //  
 //  Frame[5] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -138,6 +162,10 @@
 //  
 //  
 //  Frame[6] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -164,6 +192,10 @@
 //  
 //  
 //  Frame[7] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -184,6 +216,10 @@
 //  
 //  
 //  Frame[8] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -210,6 +246,10 @@
 //  
 //  
 //  Frame[9] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -236,6 +276,10 @@
 //  
 //  
 //  Frame[10] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -253,6 +297,10 @@
 //  
 //  
 //  Frame[11] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -279,6 +327,10 @@
 //  
 //  
 //  Frame[12] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -305,6 +357,10 @@
 //  
 //  
 //  Frame[13] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -322,6 +378,10 @@
 //  
 //  
 //  Frame[14] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -344,6 +404,10 @@
 //  
 //  
 //  Frame[15] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -370,6 +434,10 @@
 //  
 //  
 //  Frame[16] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -396,6 +464,10 @@
 //  
 //  
 //  Frame[17] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -415,6 +487,10 @@
 //  
 //  
 //  Frame[18] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -439,6 +515,10 @@
 //  
 //  
 //  Frame[19] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -465,6 +545,10 @@
 //  
 //  
 //  Frame[20] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -487,6 +571,10 @@
 //  
 //  
 //  Frame[21] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -513,6 +601,10 @@
 //  
 //  
 //  Frame[22] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -539,6 +631,10 @@
 //  
 //  
 //  Frame[23] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -565,6 +661,10 @@
 //  
 //  
 //  Frame[24] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -591,6 +691,10 @@
 //  
 //  
 //  Frame[25] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -610,6 +714,10 @@
 //  
 //  
 //  Frame[26] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -627,6 +735,10 @@
 //  
 //  
 //  Frame[27] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -651,6 +763,10 @@
 //  
 //  
 //  Frame[28] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -677,6 +793,10 @@
 //  
 //  
 //  Frame[29] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -703,6 +823,10 @@
 //  
 //  
 //  Frame[30] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -720,6 +844,10 @@
 //  
 //  
 //  Frame[31] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -746,6 +874,10 @@
 //  
 //  
 //  Frame[32] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -772,6 +904,10 @@
 //  
 //  
 //  Frame[33] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -789,6 +925,10 @@
 //  
 //  
 //  Frame[34] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -815,6 +955,10 @@
 //  
 //  
 //  Frame[35] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -839,6 +983,10 @@
 //  
 //  
 //  Frame[36] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -865,6 +1013,10 @@
 //  
 //  
 //  Frame[37] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -882,6 +1034,10 @@
 //  
 //  
 //  Frame[38] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -908,6 +1064,10 @@
 //  
 //  
 //  Frame[39] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -931,6 +1091,10 @@
 //  
 //  
 //  Frame[40] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -954,6 +1118,10 @@
 //  
 //  
 //  Frame[41] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -980,6 +1148,10 @@
 //  
 //  
 //  Frame[42] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1006,6 +1178,10 @@
 //  
 //  
 //  Frame[43] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1023,6 +1199,10 @@
 //  
 //  
 //  Frame[44] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1049,6 +1229,10 @@
 //  
 //  
 //  Frame[45] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1074,6 +1258,10 @@
 //  
 //  
 //  Frame[46] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1100,6 +1288,10 @@
 //  
 //  
 //  Frame[47] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1126,6 +1318,10 @@
 //  
 //  
 //  Frame[48] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1152,6 +1348,10 @@
 //  
 //  
 //  Frame[49] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1178,6 +1378,10 @@
 //  
 //  
 //  Frame[50] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1204,6 +1408,10 @@
 //  
 //  
 //  Frame[51] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1230,6 +1438,10 @@
 //  
 //  
 //  Frame[52] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1247,6 +1459,10 @@
 //  
 //  
 //  Frame[53] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1273,6 +1489,10 @@
 //  
 //  
 //  Frame[54] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1297,6 +1517,10 @@
 //  
 //  
 //  Frame[55] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1323,6 +1547,10 @@
 //  
 //  
 //  Frame[56] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1349,6 +1577,10 @@
 //  
 //  
 //  Frame[57] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1373,6 +1605,10 @@
 //  
 //  
 //  Frame[58] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1396,6 +1632,10 @@
 //  
 //  
 //  Frame[59] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1422,6 +1662,10 @@
 //  
 //  
 //  Frame[60] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1448,6 +1692,10 @@
 //  
 //  
 //  Frame[61] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1465,6 +1713,10 @@
 //  
 //  
 //  Frame[62] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1491,6 +1743,10 @@
 //  
 //  
 //  Frame[63] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1516,6 +1772,10 @@
 //  
 //  
 //  Frame[64] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1533,6 +1793,10 @@
 //  
 //  
 //  Frame[65] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1550,6 +1814,10 @@
 //  
 //  
 //  Frame[66] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1575,6 +1843,10 @@
 //  
 //  
 //  Frame[67] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1601,6 +1873,10 @@
 //  
 //  
 //  Frame[68] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1627,6 +1903,10 @@
 //  
 //  
 //  Frame[69] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1653,6 +1933,10 @@
 //  
 //  
 //  Frame[70] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1675,6 +1959,10 @@
 //  
 //  
 //  Frame[71] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1692,6 +1980,10 @@
 //  
 //  
 //  Frame[72] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1709,6 +2001,10 @@
 //  
 //  
 //  Frame[73] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1735,6 +2031,10 @@
 //  
 //  
 //  Frame[74] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1761,6 +2061,10 @@
 //  
 //  
 //  Frame[75] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1780,6 +2084,10 @@
 //  
 //  
 //  Frame[76] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1806,6 +2114,10 @@
 //  
 //  
 //  Frame[77] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1823,6 +2135,10 @@
 //  
 //  
 //  Frame[78] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1849,6 +2165,10 @@
 //  
 //  
 //  Frame[79] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1875,6 +2195,10 @@
 //  
 //  
 //  Frame[80] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1901,6 +2225,10 @@
 //  
 //  
 //  Frame[81] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1927,6 +2255,10 @@
 //  
 //  
 //  Frame[82] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1953,6 +2285,10 @@
 //  
 //  
 //  Frame[83] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -1979,6 +2315,10 @@
 //  
 //  
 //  Frame[84] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2005,6 +2345,10 @@
 //  
 //  
 //  Frame[85] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2031,6 +2375,10 @@
 //  
 //  
 //  Frame[86] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2055,6 +2403,10 @@
 //  
 //  
 //  Frame[87] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2081,6 +2433,10 @@
 //  
 //  
 //  Frame[88] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2107,6 +2463,10 @@
 //  
 //  
 //  Frame[89] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2126,6 +2486,10 @@
 //  
 //  
 //  Frame[90] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2152,6 +2516,10 @@
 //  
 //  
 //  Frame[91] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2178,6 +2546,10 @@
 //  
 //  
 //  Frame[92] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2204,6 +2576,10 @@
 //  
 //  
 //  Frame[93] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2230,6 +2606,10 @@
 //  
 //  
 //  Frame[94] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2256,6 +2636,10 @@
 //  
 //  
 //  Frame[95] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2282,6 +2666,10 @@
 //  
 //  
 //  Frame[96] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2308,6 +2696,10 @@
 //  
 //  
 //  Frame[97] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2334,6 +2726,10 @@
 //  
 //  
 //  Frame[98] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2351,6 +2747,10 @@
 //  
 //  
 //  Frame[99] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2377,6 +2777,10 @@
 //  
 //  
 //  Frame[100] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2403,6 +2807,10 @@
 //  
 //  
 //  Frame[101] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2429,6 +2837,10 @@
 //  
 //  
 //  Frame[102] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2455,6 +2867,10 @@
 //  
 //  
 //  Frame[103] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2475,6 +2891,10 @@
 //  
 //  
 //  Frame[104] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2501,6 +2921,10 @@
 //  
 //  
 //  Frame[105] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2527,6 +2951,10 @@
 //  
 //  
 //  Frame[106] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2553,6 +2981,10 @@
 //  
 //  
 //  Frame[107] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2579,6 +3011,10 @@
 //  
 //  
 //  Frame[108] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2605,6 +3041,10 @@
 //  
 //  
 //  Frame[109] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2631,6 +3071,10 @@
 //  
 //  
 //  Frame[110] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2657,6 +3101,10 @@
 //  
 //  
 //  Frame[111] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2677,6 +3125,10 @@
 //  
 //  
 //  Frame[112] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2703,6 +3155,10 @@
 //  
 //  
 //  Frame[113] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2725,6 +3181,10 @@
 //  
 //  
 //  Frame[114] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2742,6 +3202,10 @@
 //  
 //  
 //  Frame[115] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2759,6 +3223,10 @@
 //  
 //  
 //  Frame[116] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2777,6 +3245,10 @@
 //  
 //  
 //  Frame[117] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2803,6 +3275,10 @@
 //  
 //  
 //  Frame[118] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2829,6 +3305,10 @@
 //  
 //  
 //  Frame[119] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2850,6 +3330,10 @@
 //  
 //  
 //  Frame[120] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2876,6 +3360,10 @@
 //  
 //  
 //  Frame[121] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2901,6 +3389,10 @@
 //  
 //  
 //  Frame[122] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2918,6 +3410,10 @@
 //  
 //  
 //  Frame[123] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2935,6 +3431,10 @@
 //  
 //  
 //  Frame[124] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2961,6 +3461,10 @@
 //  
 //  
 //  Frame[125] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -2987,6 +3491,10 @@
 //  
 //  
 //  Frame[126] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -3013,6 +3521,10 @@
 //  
 //  
 //  Frame[127] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -3030,6 +3542,10 @@
 //  
 //  
 //  Frame[128] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "exemplar"
 //      }
@@ -3052,6 +3568,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3110,6 +3630,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3288,6 +3812,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3490,6 +4018,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3569,6 +4101,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3630,6 +4166,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3751,6 +4291,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3896,6 +4440,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -3963,6 +4511,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4063,6 +4615,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4178,6 +4734,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4236,6 +4796,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4390,6 +4954,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4544,6 +5112,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4602,6 +5174,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4675,6 +5251,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4895,6 +5475,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -4983,6 +5567,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5047,6 +5635,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5126,6 +5718,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5346,6 +5942,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5419,6 +6019,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5573,6 +6177,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5787,6 +6395,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -5995,6 +6607,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6182,6 +6798,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6246,6 +6866,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6304,6 +6928,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6383,6 +7011,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6591,6 +7223,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6733,6 +7369,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6791,6 +7431,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -6891,6 +7535,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7117,6 +7765,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7175,6 +7827,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7263,6 +7919,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7342,6 +8002,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7517,6 +8181,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7575,6 +8243,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7777,6 +8449,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7853,6 +8529,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -7929,6 +8609,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8026,6 +8710,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8192,6 +8880,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8250,6 +8942,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8461,6 +9157,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8543,6 +9243,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -8775,6 +9479,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9007,6 +9715,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9230,6 +9942,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9378,6 +10094,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9505,6 +10225,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9638,6 +10362,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9696,6 +10424,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9793,6 +10525,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -9872,6 +10608,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10032,6 +10772,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10222,6 +10966,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10301,6 +11049,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10377,6 +11129,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10462,6 +11218,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10661,6 +11421,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10719,6 +11483,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -10930,6 +11698,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11012,6 +11784,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11070,6 +11846,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11128,6 +11908,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11210,6 +11994,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11301,6 +12089,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11461,6 +12253,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11675,6 +12471,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11748,6 +12548,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11806,6 +12610,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -11864,6 +12672,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12094,6 +12906,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12324,6 +13140,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12386,6 +13206,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12589,6 +13413,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12645,6 +13473,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -12875,6 +13707,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -13105,6 +13941,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -13335,6 +14175,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -13565,6 +14409,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -13795,6 +14643,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14025,6 +14877,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14255,6 +15111,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14428,6 +15288,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14505,6 +15369,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14684,6 +15552,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14908,6 +15780,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -14970,6 +15846,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15200,6 +16080,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15361,6 +16245,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15573,6 +16461,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15803,6 +16695,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -15931,6 +16827,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16161,6 +17061,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16355,6 +17259,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16510,6 +17418,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16566,6 +17478,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -16796,6 +17712,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17020,6 +17940,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17235,6 +18159,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17465,6 +18393,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17530,6 +18462,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17757,6 +18693,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17858,6 +18798,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -17950,6 +18894,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18078,6 +19026,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18305,6 +19257,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18415,6 +19371,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18582,6 +19542,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18647,6 +19611,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18877,6 +19845,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -18948,6 +19920,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19004,6 +19980,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19060,6 +20040,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19119,6 +20103,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19349,6 +20337,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19441,6 +20433,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19509,6 +20505,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19739,6 +20739,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19819,6 +20823,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19875,6 +20883,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -19931,6 +20943,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -20107,6 +21123,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -20196,6 +21216,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -20402,6 +21426,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
@@ -20458,6 +21486,10 @@
     {
       "schema": {
         "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "exemplar"
           }
diff --git a/pkg/util/converter/testdata/prom-matrix-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-frame.jsonc
index 34962e54703..4ecafdfbd88 100644
--- a/pkg/util/converter/testdata/prom-matrix-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-matrix-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "matrix"
 //      }
@@ -22,6 +26,10 @@
 //  
 //  Frame[1] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "matrix"
 //      }
@@ -47,6 +55,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "matrix"
           }
@@ -92,6 +104,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "matrix"
           }
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc
index f02ca0ce646..4f20a1abe2b 100644
--- a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc
@@ -1,7 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 932 Rows
@@ -30,7 +34,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.jsonc
index f02ca0ce646..4f20a1abe2b 100644
--- a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.jsonc
@@ -1,7 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 932 Rows
@@ -30,7 +34,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc
index 49c6a3829a6..f4903ec2f39 100644
--- a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc
@@ -1,7 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -15,7 +19,11 @@
 //  
 //  
 //  Frame[1] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -29,7 +37,11 @@
 //  
 //  
 //  Frame[2] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -43,7 +55,11 @@
 //  
 //  
 //  Frame[3] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -57,7 +73,11 @@
 //  
 //  
 //  Frame[4] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -71,7 +91,11 @@
 //  
 //  
 //  Frame[5] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -85,7 +109,11 @@
 //  
 //  
 //  Frame[6] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -99,7 +127,11 @@
 //  
 //  
 //  Frame[7] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -113,7 +145,11 @@
 //  
 //  
 //  Frame[8] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 1 Rows
@@ -128,7 +164,11 @@
 //  
 //  
 //  Frame[9] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -142,7 +182,11 @@
 //  
 //  
 //  Frame[10] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 426 Rows
@@ -166,7 +210,11 @@
 //  
 //  
 //  Frame[11] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 1 Rows
@@ -181,7 +229,11 @@
 //  
 //  
 //  Frame[12] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 6 Rows
@@ -201,7 +253,11 @@
 //  
 //  
 //  Frame[13] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 269 Rows
@@ -225,7 +281,11 @@
 //  
 //  
 //  Frame[14] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 303 Rows
@@ -249,7 +309,11 @@
 //  
 //  
 //  Frame[15] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 56 Rows
@@ -273,7 +337,11 @@
 //  
 //  
 //  Frame[16] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 41 Rows
@@ -297,7 +365,11 @@
 //  
 //  
 //  Frame[17] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 29 Rows
@@ -321,7 +393,11 @@
 //  
 //  
 //  Frame[18] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 38 Rows
@@ -345,7 +421,11 @@
 //  
 //  
 //  Frame[19] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 195 Rows
@@ -369,7 +449,11 @@
 //  
 //  
 //  Frame[20] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 261 Rows
@@ -393,7 +477,11 @@
 //  
 //  
 //  Frame[21] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 176 Rows
@@ -417,7 +505,11 @@
 //  
 //  
 //  Frame[22] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 255 Rows
@@ -441,7 +533,11 @@
 //  
 //  
 //  Frame[23] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 167 Rows
@@ -470,7 +566,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -528,7 +628,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -586,7 +690,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -644,7 +752,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -702,7 +814,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -760,7 +876,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -818,7 +938,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -876,7 +1000,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -934,7 +1062,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -1002,7 +1134,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -1060,7 +1196,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -3253,7 +3393,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -3321,7 +3465,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -3414,7 +3562,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -4822,7 +4974,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -6400,7 +6556,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -6743,7 +6903,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -7011,7 +7175,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -7219,7 +7387,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -7472,7 +7644,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -8510,7 +8686,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -9878,7 +10058,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -10821,7 +11005,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -12159,7 +12347,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.jsonc
index 49c6a3829a6..f4903ec2f39 100644
--- a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.jsonc
@@ -1,7 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -15,7 +19,11 @@
 //  
 //  
 //  Frame[1] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -29,7 +37,11 @@
 //  
 //  
 //  Frame[2] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -43,7 +55,11 @@
 //  
 //  
 //  Frame[3] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -57,7 +73,11 @@
 //  
 //  
 //  Frame[4] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -71,7 +91,11 @@
 //  
 //  
 //  Frame[5] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -85,7 +109,11 @@
 //  
 //  
 //  Frame[6] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -99,7 +127,11 @@
 //  
 //  
 //  Frame[7] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -113,7 +145,11 @@
 //  
 //  
 //  Frame[8] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 1 Rows
@@ -128,7 +164,11 @@
 //  
 //  
 //  Frame[9] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 0 Rows
@@ -142,7 +182,11 @@
 //  
 //  
 //  Frame[10] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 426 Rows
@@ -166,7 +210,11 @@
 //  
 //  
 //  Frame[11] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 1 Rows
@@ -181,7 +229,11 @@
 //  
 //  
 //  Frame[12] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 6 Rows
@@ -201,7 +253,11 @@
 //  
 //  
 //  Frame[13] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 269 Rows
@@ -225,7 +281,11 @@
 //  
 //  
 //  Frame[14] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 303 Rows
@@ -249,7 +309,11 @@
 //  
 //  
 //  Frame[15] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 56 Rows
@@ -273,7 +337,11 @@
 //  
 //  
 //  Frame[16] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 41 Rows
@@ -297,7 +365,11 @@
 //  
 //  
 //  Frame[17] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 29 Rows
@@ -321,7 +393,11 @@
 //  
 //  
 //  Frame[18] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 38 Rows
@@ -345,7 +421,11 @@
 //  
 //  
 //  Frame[19] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 195 Rows
@@ -369,7 +449,11 @@
 //  
 //  
 //  Frame[20] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 261 Rows
@@ -393,7 +477,11 @@
 //  
 //  
 //  Frame[21] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 176 Rows
@@ -417,7 +505,11 @@
 //  
 //  
 //  Frame[22] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 255 Rows
@@ -441,7 +533,11 @@
 //  
 //  
 //  Frame[23] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 167 Rows
@@ -470,7 +566,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -528,7 +628,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -586,7 +690,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -644,7 +752,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -702,7 +814,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -760,7 +876,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -818,7 +938,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -876,7 +1000,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -934,7 +1062,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -1002,7 +1134,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -1060,7 +1196,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -3253,7 +3393,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -3321,7 +3465,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -3414,7 +3562,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -4822,7 +4974,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -6400,7 +6556,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -6743,7 +6903,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -7011,7 +7175,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -7219,7 +7387,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -7472,7 +7644,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -8510,7 +8686,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -9878,7 +10058,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -10821,7 +11005,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
@@ -12159,7 +12347,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
diff --git a/pkg/util/converter/testdata/prom-matrix-wide-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-wide-frame.jsonc
index affb83ab5b2..346b89d1eb0 100644
--- a/pkg/util/converter/testdata/prom-matrix-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-matrix-wide-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "matrix"
 //      }
@@ -27,6 +31,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "matrix"
           }
diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc
index f527d47df0d..b70eeb0114f 100644
--- a/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "matrix"
 //      }
@@ -27,6 +31,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "matrix"
           }
diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.jsonc
index c53e80c0c73..32700084f19 100644
--- a/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "matrix"
 //      }
@@ -27,6 +31,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "matrix"
           }
diff --git a/pkg/util/converter/testdata/prom-scalar-frame.jsonc b/pkg/util/converter/testdata/prom-scalar-frame.jsonc
index bd0d2cacdd5..51d7bd4cdc1 100644
--- a/pkg/util/converter/testdata/prom-scalar-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-scalar-frame.jsonc
@@ -1,7 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "timeseries-multi",
+//      "type": "numeric-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "scalar"
 //      }
@@ -24,7 +28,11 @@
     {
       "schema": {
         "meta": {
-          "type": "timeseries-multi",
+          "type": "numeric-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "scalar"
           }
diff --git a/pkg/util/converter/testdata/prom-scalar-wide-frame.jsonc b/pkg/util/converter/testdata/prom-scalar-wide-frame.jsonc
index bd0d2cacdd5..51d7bd4cdc1 100644
--- a/pkg/util/converter/testdata/prom-scalar-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-scalar-wide-frame.jsonc
@@ -1,7 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "timeseries-multi",
+//      "type": "numeric-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "scalar"
 //      }
@@ -24,7 +28,11 @@
     {
       "schema": {
         "meta": {
-          "type": "timeseries-multi",
+          "type": "numeric-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "scalar"
           }
diff --git a/pkg/util/converter/testdata/prom-string-frame.jsonc b/pkg/util/converter/testdata/prom-string-frame.jsonc
index 6307e2916bc..bb666cbe17e 100644
--- a/pkg/util/converter/testdata/prom-string-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-string-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "string"
 //      }
@@ -25,6 +29,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "string"
           }
diff --git a/pkg/util/converter/testdata/prom-string-wide-frame.jsonc b/pkg/util/converter/testdata/prom-string-wide-frame.jsonc
index 6307e2916bc..bb666cbe17e 100644
--- a/pkg/util/converter/testdata/prom-string-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-string-wide-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "string"
 //      }
@@ -25,6 +29,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "string"
           }
diff --git a/pkg/util/converter/testdata/prom-vector-frame.jsonc b/pkg/util/converter/testdata/prom-vector-frame.jsonc
index cdd2532fa5f..aaa61cef9b9 100644
--- a/pkg/util/converter/testdata/prom-vector-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-vector-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      }
@@ -20,6 +24,10 @@
 //  
 //  Frame[1] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      }
@@ -38,6 +46,10 @@
 //  
 //  Frame[2] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      }
@@ -56,6 +68,10 @@
 //  
 //  Frame[3] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      }
@@ -74,6 +90,10 @@
 //  
 //  Frame[4] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      }
@@ -97,6 +117,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           }
@@ -138,6 +162,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           }
@@ -179,6 +207,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           }
@@ -227,6 +259,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           }
@@ -275,6 +311,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           }
diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc
index 21f3e31e35e..96385a67302 100644
--- a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc
@@ -1,7 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 134 Rows
@@ -30,7 +34,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.jsonc b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.jsonc
index 21f3e31e35e..96385a67302 100644
--- a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.jsonc
@@ -1,7 +1,11 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "heatmap-cells"
+//      "type": "heatmap-cells",
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
 //  }
 //  Name: 
 //  Dimensions: 5 Fields by 134 Rows
@@ -30,7 +34,11 @@
     {
       "schema": {
         "meta": {
-          "type": "heatmap-cells"
+          "type": "heatmap-cells",
+          "typeVersion": [
+            0,
+            0
+          ]
         },
         "fields": [
           {
diff --git a/pkg/util/converter/testdata/prom-vector-wide-frame.jsonc b/pkg/util/converter/testdata/prom-vector-wide-frame.jsonc
index e6cd4985d55..1be2f8cdd86 100644
--- a/pkg/util/converter/testdata/prom-vector-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-vector-wide-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      }
@@ -26,6 +30,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           }
diff --git a/pkg/util/converter/testdata/prom-warnings-frame.jsonc b/pkg/util/converter/testdata/prom-warnings-frame.jsonc
index 6f88319e60b..6e7a9e43753 100644
--- a/pkg/util/converter/testdata/prom-warnings-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-warnings-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      },
@@ -30,6 +34,10 @@
 //  
 //  Frame[1] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      },
@@ -58,6 +66,10 @@
 //  
 //  Frame[2] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      },
@@ -86,6 +98,10 @@
 //  
 //  Frame[3] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      },
@@ -114,6 +130,10 @@
 //  
 //  Frame[4] {
 //      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      },
@@ -147,6 +167,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           },
@@ -198,6 +222,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           },
@@ -249,6 +277,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           },
@@ -307,6 +339,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           },
@@ -365,6 +401,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           },
diff --git a/pkg/util/converter/testdata/prom-warnings-wide-frame.jsonc b/pkg/util/converter/testdata/prom-warnings-wide-frame.jsonc
index 36fac2a7969..1b5e6d5c8a2 100644
--- a/pkg/util/converter/testdata/prom-warnings-wide-frame.jsonc
+++ b/pkg/util/converter/testdata/prom-warnings-wide-frame.jsonc
@@ -2,6 +2,10 @@
 //  
 //  Frame[0] {
 //      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
 //      "custom": {
 //          "resultType": "vector"
 //      },
@@ -36,6 +40,10 @@
       "schema": {
         "meta": {
           "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
           "custom": {
             "resultType": "vector"
           },

From 4cac95d1c22cc553723ceb72218b3167b8d13dcf Mon Sep 17 00:00:00 2001
From: Misi <mgyongyosi@users.noreply.github.com>
Date: Thu, 13 Apr 2023 09:23:39 +0200
Subject: [PATCH 087/729] Auth: Remove the session cookie only if it's invalid
 or revoked (#65984)

Remove the cookie if it's invalid or revoked
---
 pkg/services/contexthandler/contexthandler.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go
index d55b931ec9d..b0b96273094 100644
--- a/pkg/services/contexthandler/contexthandler.go
+++ b/pkg/services/contexthandler/contexthandler.go
@@ -481,8 +481,8 @@ func (h *ContextHandler) initContextWithToken(reqContext *contextmodel.ReqContex
 	token, err := h.AuthTokenService.LookupToken(ctx, rawToken)
 	if err != nil {
 		reqContext.Logger.Warn("failed to look up session from cookie", "error", err)
-		if errors.Is(err, auth.ErrUserTokenNotFound) || errors.Is(err, auth.ErrInvalidSessionToken) {
-			// Burn the cookie in case of invalid, expired or missing token
+		if errors.Is(err, auth.ErrInvalidSessionToken) {
+			// Burn the cookie in case of invalid or revoked token
 			reqContext.Resp.Before(h.deleteInvalidCookieEndOfRequestFunc(reqContext))
 		}
 

From 89f23fcbc986612a18d8603bc15477125f76273d Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 13 Apr 2023 09:39:55 +0200
Subject: [PATCH 088/729] Logs: Fix typo in filename of
 `loki/LogContextProvider` (#66410)

change filename to match class name
---
 .../{LogContextProvidet.test.ts => LogContextProvider.test.ts}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename public/app/plugins/datasource/loki/{LogContextProvidet.test.ts => LogContextProvider.test.ts} (100%)

diff --git a/public/app/plugins/datasource/loki/LogContextProvidet.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
similarity index 100%
rename from public/app/plugins/datasource/loki/LogContextProvidet.test.ts
rename to public/app/plugins/datasource/loki/LogContextProvider.test.ts

From 92b69dfb975ba3afbcafafc212ed1ad14ddecb11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Thu, 13 Apr 2023 09:48:09 +0200
Subject: [PATCH 089/729] Correlations: Track completion rate for adding
 correlations (#66361)

Track completion rate for adding correlations
---
 public/app/features/correlations/CorrelationsPage.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/app/features/correlations/CorrelationsPage.tsx b/public/app/features/correlations/CorrelationsPage.tsx
index 57f2d08924e..119e5b66452 100644
--- a/public/app/features/correlations/CorrelationsPage.tsx
+++ b/public/app/features/correlations/CorrelationsPage.tsx
@@ -40,7 +40,15 @@ const loaderWrapper = css`
 
 export default function CorrelationsPage() {
   const navModel = useNavModel('correlations');
-  const [isAdding, setIsAdding] = useState(false);
+  const [isAdding, setIsAddingValue] = useState(false);
+
+  const setIsAdding = (value: boolean) => {
+    setIsAddingValue(value);
+    if (value) {
+      reportInteraction('grafana_correlations_adding_started');
+    }
+  };
+
   const {
     remove,
     get: { execute: fetchCorrelations, ...get },

From 659024f6728392f7049ee7c8ea87d640cefcfef7 Mon Sep 17 00:00:00 2001
From: mikkancso <miklos.tolnai@grafana.com>
Date: Thu, 13 Apr 2023 09:53:18 +0200
Subject: [PATCH 090/729] EditDataSources: Add EditDataSourceActions to
 EditDataSourcePages (#64487)

* add EditDataSourceActions to EditDataSourcePages

* fix tests

* EditDSPage: do not show buttons in header if topnav is off

* remove delete button from the header

* EditDSPage: hide buttons from footer when topnav is on

* update tests

* rename ActionProps to Props

* wrap setting of feature toggle in act in jest test

* fix jest test by using waitFor
---
 .../connections/pages/EditDataSourcePage.tsx  |  8 +-
 .../datasources/components/ButtonRow.tsx      | 29 ++++---
 .../components/EditDataSourceActions.tsx      | 80 +++++++++++++++++++
 .../pages/EditDataSourcePage.test.tsx         | 25 +++++-
 .../datasources/pages/EditDataSourcePage.tsx  |  8 +-
 5 files changed, 134 insertions(+), 16 deletions(-)
 create mode 100644 public/app/features/datasources/components/EditDataSourceActions.tsx

diff --git a/public/app/features/connections/pages/EditDataSourcePage.tsx b/public/app/features/connections/pages/EditDataSourcePage.tsx
index d72a168518c..2f66e87f6db 100644
--- a/public/app/features/connections/pages/EditDataSourcePage.tsx
+++ b/public/app/features/connections/pages/EditDataSourcePage.tsx
@@ -1,8 +1,10 @@
 import * as React from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 
+import { config } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { EditDataSource } from 'app/features/datasources/components/EditDataSource';
+import { EditDataSourceActions } from 'app/features/datasources/components/EditDataSourceActions';
 
 import { useDataSourceSettingsNav } from '../hooks/useDataSourceSettingsNav';
 
@@ -14,7 +16,11 @@ export function EditDataSourcePage() {
   const { navId, pageNav } = useDataSourceSettingsNav();
 
   return (
-    <Page navId={navId} pageNav={pageNav}>
+    <Page
+      navId={navId}
+      pageNav={pageNav}
+      actions={config.featureToggles.topnav ? <EditDataSourceActions uid={uid} /> : undefined}
+    >
       <Page.Contents>
         <EditDataSource uid={uid} pageId={pageId} />
       </Page.Contents>
diff --git a/public/app/features/datasources/components/ButtonRow.tsx b/public/app/features/datasources/components/ButtonRow.tsx
index 773d81d7697..d1c40f885be 100644
--- a/public/app/features/datasources/components/ButtonRow.tsx
+++ b/public/app/features/datasources/components/ButtonRow.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
+import { config } from '@grafana/runtime';
 import { Button, LinkButton } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types';
@@ -19,21 +20,25 @@ export function ButtonRow({ canSave, canDelete, onDelete, onSubmit, onTest, expl
 
   return (
     <div className="gf-form-button-row">
-      <Button variant="secondary" fill="solid" type="button" onClick={() => history.back()}>
-        Back
-      </Button>
+      {!config.featureToggles.topnav && (
+        <Button variant="secondary" fill="solid" type="button" onClick={() => history.back()}>
+          Back
+        </Button>
+      )}
       <LinkButton variant="secondary" fill="solid" href={exploreUrl} disabled={!canExploreDataSources}>
         Explore
       </LinkButton>
-      <Button
-        type="button"
-        variant="destructive"
-        disabled={!canDelete}
-        onClick={onDelete}
-        aria-label={selectors.pages.DataSource.delete}
-      >
-        Delete
-      </Button>
+      {!config.featureToggles.topnav && (
+        <Button
+          type="button"
+          variant="destructive"
+          disabled={!canDelete}
+          onClick={onDelete}
+          aria-label={selectors.pages.DataSource.delete}
+        >
+          Delete
+        </Button>
+      )}
       {canSave && (
         <Button
           type="submit"
diff --git a/public/app/features/datasources/components/EditDataSourceActions.tsx b/public/app/features/datasources/components/EditDataSourceActions.tsx
new file mode 100644
index 00000000000..ae07c1dafdc
--- /dev/null
+++ b/public/app/features/datasources/components/EditDataSourceActions.tsx
@@ -0,0 +1,80 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Button, LinkButton, useStyles2 } from '@grafana/ui';
+import { contextSrv } from 'app/core/core';
+import { AccessControlAction } from 'app/types';
+
+import { useDataSource, useDataSourceRights, useDeleteLoadedDataSource } from '../state';
+import { trackCreateDashboardClicked, trackExploreClicked } from '../tracking';
+import { constructDataSourceExploreUrl } from '../utils';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    button: css({
+      marginLeft: theme.spacing(2),
+    }),
+  };
+};
+
+interface Props {
+  uid: string;
+}
+
+export function EditDataSourceActions({ uid }: Props) {
+  const styles = useStyles2(getStyles);
+  const dataSource = useDataSource(uid);
+  const onDelete = useDeleteLoadedDataSource();
+
+  const { readOnly, hasDeleteRights } = useDataSourceRights(uid);
+  const hasExploreRights = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore);
+
+  const canDelete = !readOnly && hasDeleteRights;
+
+  return (
+    <>
+      <LinkButton
+        icon="apps"
+        fill="outline"
+        variant="secondary"
+        href={`dashboard/new-with-ds/${dataSource.uid}`}
+        onClick={() => {
+          trackCreateDashboardClicked({
+            grafana_version: config.buildInfo.version,
+            datasource_uid: dataSource.uid,
+            plugin_name: dataSource.typeName,
+            path: location.pathname,
+          });
+        }}
+      >
+        Build a dashboard
+      </LinkButton>
+
+      {hasExploreRights && (
+        <LinkButton
+          icon="compass"
+          fill="outline"
+          variant="secondary"
+          className={styles.button}
+          href={constructDataSourceExploreUrl(dataSource)}
+          onClick={() => {
+            trackExploreClicked({
+              grafana_version: config.buildInfo.version,
+              datasource_uid: dataSource.uid,
+              plugin_name: dataSource.typeName,
+              path: location.pathname,
+            });
+          }}
+        >
+          Explore
+        </LinkButton>
+      )}
+
+      <Button type="button" variant="destructive" disabled={!canDelete} onClick={onDelete} className={styles.button}>
+        Delete
+      </Button>
+    </>
+  );
+}
diff --git a/public/app/features/datasources/pages/EditDataSourcePage.test.tsx b/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
index 54c2cd9ec9c..149ef0f29b5 100644
--- a/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
+++ b/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
@@ -1,10 +1,11 @@
-import { screen, render } from '@testing-library/react';
+import { screen, render, waitFor } from '@testing-library/react';
 import React from 'react';
 import { Store } from 'redux';
 import { TestProvider } from 'test/helpers/TestProvider';
 
 import { LayoutModes } from '@grafana/data';
 import { setAngularLoader } from '@grafana/runtime';
+import config from 'app/core/config';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
 import { configureStore } from 'app/store/configureStore';
 
@@ -57,6 +58,7 @@ describe('<EditDataSourcePage>', () => {
   const dataSourceMeta = getMockDataSourceMeta();
   const dataSourceSettings = getMockDataSourceSettingsState();
   let store: Store;
+  const topnavValue = config.featureToggles.topnav;
 
   beforeAll(() => {
     setAngularLoader({
@@ -94,7 +96,12 @@ describe('<EditDataSourcePage>', () => {
     });
   });
 
+  afterAll(() => {
+    config.featureToggles.topnav = topnavValue;
+  });
+
   it('should render the edit page without an issue', async () => {
+    config.featureToggles.topnav = false;
     setup(uid, store);
 
     expect(screen.queryByText('Loading ...')).not.toBeInTheDocument();
@@ -106,9 +113,23 @@ describe('<EditDataSourcePage>', () => {
     expect(screen.queryByRole('button', { name: /Back/i })).toBeVisible();
     expect(screen.queryByRole('button', { name: /Delete/i })).toBeVisible();
     expect(screen.queryByRole('button', { name: /Save (.*) test/i })).toBeVisible();
-    expect(screen.queryByText('Explore')).toBeVisible();
+    expect(screen.queryByRole('link', { name: /Explore/i })).toBeVisible();
 
     // wait for the rest of the async processes to finish
     expect(await screen.findByText(name)).toBeVisible();
   });
+
+  it('should show updated action buttons when topnav is on', async () => {
+    config.featureToggles.topnav = true;
+    setup(uid, store);
+
+    await waitFor(() => {
+      // Buttons
+      expect(screen.queryAllByRole('button', { name: /Back/i })).toHaveLength(0);
+      expect(screen.queryByRole('button', { name: /Delete/i })).toBeVisible();
+      expect(screen.queryByRole('button', { name: /Save (.*) test/i })).toBeVisible();
+      expect(screen.queryByRole('link', { name: /Build a dashboard/i })).toBeVisible();
+      expect(screen.queryAllByRole('link', { name: /Explore/i })).toHaveLength(2);
+    });
+  });
 });
diff --git a/public/app/features/datasources/pages/EditDataSourcePage.tsx b/public/app/features/datasources/pages/EditDataSourcePage.tsx
index 22f959c5a4a..b9804fc970d 100644
--- a/public/app/features/datasources/pages/EditDataSourcePage.tsx
+++ b/public/app/features/datasources/pages/EditDataSourcePage.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
 
+import { config } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
 import { EditDataSource } from '../components/EditDataSource';
+import { EditDataSourceActions } from '../components/EditDataSourceActions';
 import { useDataSourceSettingsNav } from '../state';
 
 export interface Props extends GrafanaRouteComponentProps<{ uid: string }> {}
@@ -15,7 +17,11 @@ export function EditDataSourcePage(props: Props) {
   const nav = useDataSourceSettingsNav(uid, pageId);
 
   return (
-    <Page navId="datasources" pageNav={nav.main}>
+    <Page
+      navId="datasources"
+      pageNav={nav.main}
+      actions={config.featureToggles.topnav ? <EditDataSourceActions uid={uid} /> : undefined}
+    >
       <Page.Contents>
         <EditDataSource uid={uid} pageId={pageId} />
       </Page.Contents>

From 6309d3fae62583c2570e6b975c7761215a830380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ida=20=C5=A0tambuk?= <ida.stambuk@grafana.com>
Date: Thu, 13 Apr 2023 10:07:06 +0200
Subject: [PATCH 091/729] Cloudwatch: Pass refId from query for expression
 queries (#66147)

Co-authored-by: Shirley <4163034+fridgepoet@users.noreply.github.com>
Co-authored-by: Isabella Siu <Isabella.siu@grafana.com>
---
 pkg/tsdb/cloudwatch/cloudwatch_test.go     | 132 ---------
 pkg/tsdb/cloudwatch/log_sync_query.go      |   9 +-
 pkg/tsdb/cloudwatch/log_sync_query_test.go | 310 +++++++++++++++++++++
 pkg/tsdb/cloudwatch/test_utils.go          |  15 +
 4 files changed, 332 insertions(+), 134 deletions(-)
 create mode 100644 pkg/tsdb/cloudwatch/log_sync_query_test.go

diff --git a/pkg/tsdb/cloudwatch/cloudwatch_test.go b/pkg/tsdb/cloudwatch/cloudwatch_test.go
index 5aae16c2cba..f64d98abc19 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch_test.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch_test.go
@@ -2,16 +2,13 @@ package cloudwatch
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
-	"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -19,8 +16,6 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/query"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
@@ -193,133 +188,6 @@ func Test_CheckHealth(t *testing.T) {
 		}, resp)
 	})
 }
-func Test_executeSyncLogQuery(t *testing.T) {
-	origNewCWClient := NewCWClient
-	t.Cleanup(func() {
-		NewCWClient = origNewCWClient
-	})
-
-	var cli fakeCWLogsClient
-	NewCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
-		return &cli
-	}
-
-	t.Run("getCWLogsClient is called with region from input JSON", func(t *testing.T) {
-		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
-		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
-		})
-		sess := fakeSessionCache{}
-		executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
-
-		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
-			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
-			Queries: []backend.DataQuery{
-				{
-					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
-					JSON: json.RawMessage(`{
-						"queryMode":    "Logs",
-						"region": "some region"
-					}`),
-				},
-			},
-		})
-
-		assert.NoError(t, err)
-		assert.Equal(t, []string{"some region"}, sess.calledRegions)
-	})
-
-	t.Run("getCWLogsClient is called with region from instance manager when region is default", func(t *testing.T) {
-		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
-		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}}, nil
-		})
-		sess := fakeSessionCache{}
-
-		executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
-		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
-			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
-			Queries: []backend.DataQuery{
-				{
-					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
-					JSON: json.RawMessage(`{
-						"queryMode":    "Logs",
-						"region": "default"
-					}`),
-				},
-			},
-		})
-
-		assert.NoError(t, err)
-		assert.Equal(t, []string{"instance manager's region"}, sess.calledRegions)
-	})
-
-	t.Run("with header", func(t *testing.T) {
-		testcases := []struct {
-			name    string
-			headers map[string]string
-			called  bool
-		}{
-			{
-				"alert header",
-				map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
-				true,
-			},
-			{
-				"expression header",
-				map[string]string{fmt.Sprintf("http_%s", query.HeaderFromExpression): "some value"},
-				true,
-			},
-			{
-				"no header",
-				map[string]string{},
-				false,
-			},
-		}
-		origExecuteSyncLogQuery := executeSyncLogQuery
-		var syncCalled bool
-		executeSyncLogQuery = func(ctx context.Context, e *cloudWatchExecutor, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-			syncCalled = true
-			return nil, nil
-		}
-
-		for _, tc := range testcases {
-			t.Run(tc.name, func(t *testing.T) {
-				syncCalled = false
-				cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
-				im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-					return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}}, nil
-				})
-				sess := fakeSessionCache{}
-
-				executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
-				_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-					Headers:       tc.headers,
-					PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
-					Queries: []backend.DataQuery{
-						{
-							TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
-							JSON: json.RawMessage(`{
-								"queryMode":    "Logs",
-								"type":        "logAction",
-								"subtype":     "StartQuery",
-								"region":      "default",
-								"queryString": "fields @message"
-							}`),
-						},
-					},
-				})
-
-				assert.NoError(t, err)
-				assert.Equal(t, tc.called, syncCalled)
-			})
-		}
-
-		executeSyncLogQuery = origExecuteSyncLogQuery
-	})
-}
 
 func TestQuery_ResourceRequest_DescribeLogGroups_with_CrossAccountQuerying(t *testing.T) {
 	sender := &mockedCallResourceResponseSenderForOauth{}
diff --git a/pkg/tsdb/cloudwatch/log_sync_query.go b/pkg/tsdb/cloudwatch/log_sync_query.go
index a256aec2c75..e4a5684e6c0 100644
--- a/pkg/tsdb/cloudwatch/log_sync_query.go
+++ b/pkg/tsdb/cloudwatch/log_sync_query.go
@@ -65,9 +65,14 @@ var executeSyncLogQuery = func(ctx context.Context, e *cloudWatchExecutor, req *
 			frames = data.Frames{dataframe}
 		}
 
-		respD := resp.Responses["A"]
+		refId := "A"
+		if q.RefID != "" {
+			refId = q.RefID
+		}
+
+		respD := resp.Responses[refId]
 		respD.Frames = frames
-		resp.Responses["A"] = respD
+		resp.Responses[refId] = respD
 	}
 
 	return resp, nil
diff --git a/pkg/tsdb/cloudwatch/log_sync_query_test.go b/pkg/tsdb/cloudwatch/log_sync_query_test.go
new file mode 100644
index 00000000000..53cae18516a
--- /dev/null
+++ b/pkg/tsdb/cloudwatch/log_sync_query_test.go
@@ -0,0 +1,310 @@
+package cloudwatch
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
+	"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
+	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/query"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_executeSyncLogQuery(t *testing.T) {
+	origNewCWClient := NewCWClient
+	t.Cleanup(func() {
+		NewCWClient = origNewCWClient
+	})
+
+	var cli fakeCWLogsClient
+	NewCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
+		return &cli
+	}
+
+	t.Run("getCWLogsClient is called with region from input JSON", func(t *testing.T) {
+		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
+		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+		})
+		sess := fakeSessionCache{}
+		executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
+
+		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
+			Queries: []backend.DataQuery{
+				{
+					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+					JSON: json.RawMessage(`{
+						"queryMode":    "Logs",
+						"region": "some region"
+					}`),
+				},
+			},
+		})
+
+		assert.NoError(t, err)
+		assert.Equal(t, []string{"some region"}, sess.calledRegions)
+	})
+
+	t.Run("getCWLogsClient is called with region from instance manager when region is default", func(t *testing.T) {
+		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
+		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}}, nil
+		})
+		sess := fakeSessionCache{}
+
+		executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
+		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
+			Queries: []backend.DataQuery{
+				{
+					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+					JSON: json.RawMessage(`{
+						"queryMode":    "Logs",
+						"region": "default"
+					}`),
+				},
+			},
+		})
+
+		assert.NoError(t, err)
+		assert.Equal(t, []string{"instance manager's region"}, sess.calledRegions)
+	})
+
+	t.Run("with header", func(t *testing.T) {
+		testcases := []struct {
+			name    string
+			headers map[string]string
+			called  bool
+		}{
+			{
+				"alert header",
+				map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+				true,
+			},
+			{
+				"expression header",
+				map[string]string{fmt.Sprintf("http_%s", query.HeaderFromExpression): "some value"},
+				true,
+			},
+			{
+				"no header",
+				map[string]string{},
+				false,
+			},
+		}
+		origExecuteSyncLogQuery := executeSyncLogQuery
+		var syncCalled bool
+		executeSyncLogQuery = func(ctx context.Context, e *cloudWatchExecutor, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+			syncCalled = true
+			return nil, nil
+		}
+
+		for _, tc := range testcases {
+			t.Run(tc.name, func(t *testing.T) {
+				syncCalled = false
+				cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
+				im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+					return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}}, nil
+				})
+				sess := fakeSessionCache{}
+
+				executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
+				_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+					Headers:       tc.headers,
+					PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
+					Queries: []backend.DataQuery{
+						{
+							TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+							JSON: json.RawMessage(`{
+								"queryMode":    "Logs",
+								"type":        "logAction",
+								"subtype":     "StartQuery",
+								"region":      "default",
+								"queryString": "fields @message"
+							}`),
+						},
+					},
+				})
+
+				assert.NoError(t, err)
+				assert.Equal(t, tc.called, syncCalled)
+			})
+		}
+
+		executeSyncLogQuery = origExecuteSyncLogQuery
+	})
+}
+func Test_executeSyncLogQuery_handles_RefId_from_input_queries(t *testing.T) {
+	origNewCWClient := NewCWClient
+	t.Cleanup(func() {
+		NewCWClient = origNewCWClient
+	})
+
+	var cli *mockLogsSyncClient
+	NewCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
+		return cli
+	}
+
+	t.Run("when a query refId is not provided, 'A' is assigned by default", func(t *testing.T) {
+		cli = &mockLogsSyncClient{}
+		cli.On("StartQueryWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.StartQueryOutput{
+			QueryId: aws.String("abcd-efgh-ijkl-mnop"),
+		}, nil)
+		cli.On("GetQueryResultsWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}, nil)
+		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+		})
+		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+
+		res, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
+			Queries: []backend.DataQuery{
+				{
+					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+					JSON: json.RawMessage(`{
+						"queryMode":    "Logs"
+					}`),
+				},
+			},
+		})
+
+		assert.NoError(t, err)
+		_, ok := res.Responses["A"]
+		assert.True(t, ok)
+	})
+
+	t.Run("when a query refId is provided, it is returned in the response", func(t *testing.T) {
+		cli = &mockLogsSyncClient{}
+		cli.On("StartQueryWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.StartQueryOutput{
+			QueryId: aws.String("abcd-efgh-ijkl-mnop"),
+		}, nil)
+		cli.On("GetQueryResultsWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}, nil)
+		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+		})
+		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+
+		res, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
+			Queries: []backend.DataQuery{
+				{
+					RefID:     "A",
+					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+					JSON: json.RawMessage(`{
+						"queryMode":    "Logs"
+					}`),
+				},
+				{
+					RefID:     "B",
+					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+					JSON: json.RawMessage(`{
+						"queryMode":    "Logs"
+					}`),
+				},
+			},
+		})
+
+		assert.NoError(t, err)
+		_, ok := res.Responses["A"]
+		assert.True(t, ok)
+		_, ok = res.Responses["B"]
+		assert.True(t, ok)
+	})
+
+	t.Run("when RefIDs are provided, correctly pass them on with the results", func(t *testing.T) {
+		// This test demonstrates that given two queries with different RefIds,
+		// when each query has a different response from AWS API calls, the RefIds are correctly reassigned to the associated response.
+		cli = &mockLogsSyncClient{}
+		// mock.MatchedBy makes sure that the QueryId below will only be returned when the input expression = "query string for A"
+		cli.On("StartQueryWithContext", mock.Anything, mock.MatchedBy(func(input *cloudwatchlogs.StartQueryInput) bool {
+			return *input.QueryString == "fields @timestamp,ltrim(@log) as __log__grafana_internal__,ltrim(@logStream) as __logstream__grafana_internal__|query string for A"
+		}), mock.Anything).Return(&cloudwatchlogs.StartQueryOutput{
+			QueryId: aws.String("queryId for A"),
+		}, nil)
+
+		// mock.MatchedBy makes sure that the QueryId below will only be returned when the input expression = "query string for B"
+		cli.On("StartQueryWithContext", mock.Anything, mock.MatchedBy(func(input *cloudwatchlogs.StartQueryInput) bool {
+			return *input.QueryString == "fields @timestamp,ltrim(@log) as __log__grafana_internal__,ltrim(@logStream) as __logstream__grafana_internal__|query string for B"
+		}), mock.Anything).Return(&cloudwatchlogs.StartQueryOutput{
+			QueryId: aws.String("queryId for B"),
+		}, nil)
+		cli.On("GetQueryResultsWithContext", mock.Anything, mock.MatchedBy(func(input *cloudwatchlogs.GetQueryResultsInput) bool {
+			return *input.QueryId == "queryId for A"
+		}), mock.Anything).Return(&cloudwatchlogs.GetQueryResultsOutput{
+			// this result will only be returned when the argument is QueryId = "queryId for A"
+			Results: [][]*cloudwatchlogs.ResultField{{{
+				Field: utils.Pointer("@log"),
+				Value: utils.Pointer("A result"),
+			}}},
+			Status: aws.String("Complete")}, nil)
+		cli.On("GetQueryResultsWithContext", mock.Anything, mock.MatchedBy(func(input *cloudwatchlogs.GetQueryResultsInput) bool {
+			return *input.QueryId == "queryId for B"
+		}), mock.Anything).Return(&cloudwatchlogs.GetQueryResultsOutput{
+			// this result will only be returned when the argument is QueryId = "queryId for B"
+			Results: [][]*cloudwatchlogs.ResultField{{{
+				Field: utils.Pointer("@log"),
+				Value: utils.Pointer("B result"),
+			}}},
+			Status: aws.String("Complete")}, nil)
+
+		im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+		})
+		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+
+		res, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
+			Queries: []backend.DataQuery{
+				{
+					RefID:     "A",
+					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+					JSON: json.RawMessage(`{
+						"queryMode":    "Logs",
+						"expression": "query string for A"
+					}`),
+				},
+				{
+					RefID:     "B",
+					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+					JSON: json.RawMessage(`{
+						"queryMode":    "Logs",
+						"expression": "query string for B"
+					}`),
+				},
+			},
+		})
+
+		expectedLogFieldFromFirstCall := data.NewField("@log", nil, []*string{utils.Pointer("A result")}) // verifies the response from GetQueryResultsWithContext matches the input RefId A
+		assert.NoError(t, err)
+		respA, ok := res.Responses["A"]
+		require.True(t, ok)
+		assert.Equal(t, []*data.Field{expectedLogFieldFromFirstCall}, respA.Frames[0].Fields)
+
+		expectedLogFieldFromSecondCall := data.NewField("@log", nil, []*string{utils.Pointer("B result")}) // verifies the response from GetQueryResultsWithContext matches the input RefId B
+		respB, ok := res.Responses["B"]
+		require.True(t, ok)
+		assert.Equal(t, []*data.Field{expectedLogFieldFromSecondCall}, respB.Frames[0].Fields)
+	})
+}
diff --git a/pkg/tsdb/cloudwatch/test_utils.go b/pkg/tsdb/cloudwatch/test_utils.go
index 4a76a00c104..dea49df53fa 100644
--- a/pkg/tsdb/cloudwatch/test_utils.go
+++ b/pkg/tsdb/cloudwatch/test_utils.go
@@ -56,6 +56,21 @@ func (m *fakeCWLogsClient) StopQueryWithContext(ctx context.Context, input *clou
 	}, nil
 }
 
+type mockLogsSyncClient struct {
+	cloudwatchlogsiface.CloudWatchLogsAPI
+
+	mock.Mock
+}
+
+func (m *mockLogsSyncClient) GetQueryResultsWithContext(ctx context.Context, input *cloudwatchlogs.GetQueryResultsInput, option ...request.Option) (*cloudwatchlogs.GetQueryResultsOutput, error) {
+	args := m.Called(ctx, input, option)
+	return args.Get(0).(*cloudwatchlogs.GetQueryResultsOutput), args.Error(1)
+}
+func (m *mockLogsSyncClient) StartQueryWithContext(ctx context.Context, input *cloudwatchlogs.StartQueryInput, option ...request.Option) (*cloudwatchlogs.StartQueryOutput, error) {
+	args := m.Called(ctx, input, option)
+	return args.Get(0).(*cloudwatchlogs.StartQueryOutput), args.Error(1)
+}
+
 func (m *fakeCWLogsClient) DescribeLogGroups(input *cloudwatchlogs.DescribeLogGroupsInput) (*cloudwatchlogs.DescribeLogGroupsOutput, error) {
 	m.calls.describeLogGroups = append(m.calls.describeLogGroups, input)
 	output := &m.logGroups[m.logGroupsIndex]

From 344bbb251c61f7e3f26db27c544f27ad044f91ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Thu, 13 Apr 2023 10:18:45 +0200
Subject: [PATCH 092/729] GLDS: Create AutoSaveField component (#61316)

---
 .../AutoSaveField/AutoSaveField.mdx           | 283 ++++++++++
 .../AutoSaveField/AutoSaveField.story.tsx     | 207 +++++++
 .../AutoSaveField/AutoSaveField.test.tsx      | 518 ++++++++++++++++++
 .../AutoSaveField/AutoSaveField.tsx           | 126 +++++
 .../grafana-ui/src/components/Forms/Field.tsx |  99 ++--
 .../components/InlineToast/InlineToast.tsx    |  47 +-
 packages/grafana-ui/src/components/index.ts   |   1 +
 7 files changed, 1232 insertions(+), 49 deletions(-)
 create mode 100644 packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.mdx
 create mode 100644 packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.story.tsx
 create mode 100644 packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.test.tsx
 create mode 100644 packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx

diff --git a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.mdx b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.mdx
new file mode 100644
index 00000000000..11b660493e0
--- /dev/null
+++ b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.mdx
@@ -0,0 +1,283 @@
+import { Props, Preview, ArgsTable } from '@storybook/addon-docs/blocks';
+import { AutoSaveField } from './AutoSaveField';
+import { Basic } from './AutoSaveField.story.tsx';
+
+# AutoSaveField
+
+Used for form inputs that should save its content automatically.
+
+---
+
+In this documentation you can find:
+
+1. [Usage](#usage)
+1. [Variants](#variants)
+1. [Accessibility](#accessibility)
+1. [Content](#content)
+1. [Formatting](#formatting)
+1. [Behaviours](#behaviours)
+1. [Props table](#propstable)
+1. [Related](#related)
+
+<br />
+<br />
+
+## <a name="usage"/> Usage
+
+<br />
+
+### **Do's**
+
+- Use in **low-impact** areas within Grafana (examples: team name, display name)
+- Include helper text to tell users of the new behaviour for recently modified elements
+
+<br />
+
+### **Dont's**
+
+- Do not use if high-impact situations (e.g. saving/changing passwords)
+  <br />
+  <br />
+
+## <a name="variants"/>Variants
+
+### 1. Text:
+
+- The `Input` component allows saving the value of a string.
+- This is the main component thought to work as an `AutoSaveField` child.
+
+```jsx
+<AutoSaveField
+  onFinishChange={customRequest}
+  //Complete field args if needed
+>
+  {(onChange) => (
+    <Input
+      value={inputTextValue}
+      onChange={(e) => {
+        onChange(e.currentTarget.value);
+        //Complete code if needed
+      }}
+    />
+  )}
+</AutoSaveField>
+```
+
+### 2. TextArea:
+
+The `TextArea` component allows saving a multi-line text.
+
+```jsx
+<AutoSaveField
+  onFinishChange={customRequest}
+  //Complete field args if needed
+>
+  {(onChange) => (
+    <TextArea
+      value={textAreaValue}
+      onChange={(e) => {
+        onChange(e.currentTarget.value);
+        //Complete code if needed
+      }}
+    />
+  )}
+</AutoSaveField>
+```
+
+### 3. Checkbox:
+
+The `Checkbox` component allows saving a specific value by ticking or not the checkbox input.
+
+```jsx
+<AutoSaveField
+  onFinishChange={customRequest}
+  //Complete field args if needed
+>
+  {(onChange) => (
+    <Checkbox
+      value={checkBoxTest}
+      onChange={(e) => {
+        onChange(e.currentTarget.value);
+        //Complete code if needed
+      }}
+    />
+  )}
+</AutoSaveField>
+```
+
+### 4. Switch:
+
+The `Switch` component allows saving a specific value turning the switch input on or off.
+
+```jsx
+<AutoSaveField
+  onFinishChange={customRequest}
+  //Complete field args if needed
+>
+  {(onChange) => (
+    <Switch
+      value={switchTest}
+      onChange={(e) => {
+        onChange(e.currentTarget.value);
+        //Complete code if needed
+      }}
+    />
+  )}
+</AutoSaveField>
+```
+
+### 5. RadioButtonGroup:
+
+The `RadioButtonGroup` component allows saving a specific value selecting the corresponding `RadioButton`.
+
+```jsx
+<AutoSaveField
+  onFinishChange={customRequest}
+  //Complete field args if needed
+>
+  {(onChange) => (
+    <RadioButtonGroup
+      options={radioButtonOptions}
+      value={currentOption}
+      onChange={(value) => {
+        onChange(value);
+        //Complete code if needed
+      }}
+    />
+  )}
+</AutoSaveField>
+```
+
+### 6. Select:
+
+The `Select` component allows saving a specific value selected from a list of options.
+
+```jsx
+<AutoSaveField
+  onFinishChange={customRequest}
+  //Complete field args if needed
+>
+  {(onChange) => (
+    <Select
+      loadOptions={optionsList}
+      value={option}
+      onChange={(value) => {
+        onChange(value);
+        //Complete code if needed
+      }}
+    />
+  )}
+</AutoSaveField>
+```
+
+<br />
+<br />
+
+## <a name="accessibility"/>Accessibility
+
+`AutoSaveField` has inherited the accessibility properties of both the `Field` and the `Input` component it is comprised of.
+Apart from that, the `InlineToast`, used to show the success of the request, has an [aria-live](https://www.w3.org/TR/wai-aria/#aria-live) property set to polite, so assistive technologies will notify users of updates but generally do not interrupt the current task.
+
+<br />
+<br />
+
+## <a name="content"/>Content
+
+<br />
+
+### Main elements
+
+<br />
+
+1. **Label:** the AutoSaveField must be accompanied with labels that should be clear and descriptive.
+2. **Input element:** this component must have an input as a child. There is a list of tested components in the ‘Variants’ section.
+3. **InlineToast:** when the input value is successfully saved, a toast notification with the text ‘Saved!’ will appear next to the proper field.
+4. **Error message:** this element will appear when the request fails. This message can be customized by the user or be the response of the request.
+   <br />
+
+### Optional elements:
+
+- **Description:** used to inform the user the value of this input will be saved automatically. _This is a tentative requirement until users become familiar with this pattern_
+  <br />
+  <br />
+
+## <a name="formatting"/>Formatting
+
+<br />
+
+### Anatomy
+
+The `AutoSaveField`component is comprised of:
+
+- A slot for form elements (e.g text input, checkbox, dropdown etc)
+- Inline toast notification: used to indicate temporal status near fields/components, such as a Saved! indicator next to a field, or a little Copied! indicator above a button
+- Inline validation
+- Helper text: used to inform the user the value of this input will be save automatically
+- Custom error message
+
+{' '}
+
+<Preview>
+  <Basic />
+</Preview>
+<br />
+
+### Placement
+
+Placement for the `InlineToast` is dependent on the amount space around the field:
+
+- When there is space, the inline toast notification displays directly to the right of the field it corresponds with.
+- If there is not enough space (e.g. on mobile) the inline toast notification is displayed beneath the field it corresponds to and overlaps the content below it. As the inline toast only displays for a few seconds, this will have no impact on the legibility of the content beneath it.
+- If the field errors and the inline validation is displayed, space will be created to persistently hold the inline validation error message until the issue has been addressed and the message goes away.
+  <br />
+  <br />
+
+## <a name="behaviours"/>Behaviours
+
+As the data is changed (for instance typing into a text input), the `AutoSaveField` attempts to save that new data, displaying first a spinner to indicate the loading state and then either an `InlineToast` with the text “Saved!” to indicate the data has been successfully saved or an error message to convey that the save has not been successful.
+
+<br />
+
+### Common behaviour
+
+_**What triggers the auto-save action?**_\
+A change on the input, such as after typing a text or selecting a new option. The request will be triggered after waiting 600 milliseconds from the last change (debouncing).
+
+_**What can be expected from the request?**_
+
+1. The request is customized by the user working with the AutoSaveInput.
+1. This request can finish successfully or with an error:\
+   2.1. **Success:** \
+   2.1.1. An InlineToast with the text ‘Saved!’ will be shown. \
+   2.1.2. It will automatically disappear after a short period of time. \
+   2.1.3. It will place itself on the bottom of the input in case the screen is not wide enough to be placed on its right. \
+   2.2. **Error:** \
+   2.2.1. An error message will be shown. It can be a custom error message or the one from the request response.
+
+<br />
+
+### Specific behaviour
+
+1. **Loading state:** shows a spinner while making the request: \
+   This is specific of the `Input` component
+1. **Invalid prop:** shows a red border on the input: \
+   This is specific of the `Input`, `TextArea` and `Select` components.
+   <br />
+   <br />
+
+## <a name="propstable"/>Props table
+
+<ArgsTable of={AutoSaveField} />
+
+## <a name="related"/>Related
+
+Links to related components:
+
+- [Field](/docs/forms-field--horizontal-layout)
+- [InlineToast](/docs/inlinetoast--inline-toast)
+- [Input](/docs/forms-input--simple)
+- [TextArea](/docs/forms-textarea--basic)
+- [Checkbox](/docs/forms-checkbox--basic)
+- [RadioButtonGroup](/docs/forms-radiobuttongroup--radio-buttons)
+- [Switch](/docs/forms-switch--controlled)
+- [Select](/docs/forms-select--basic)
diff --git a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.story.tsx b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.story.tsx
new file mode 100644
index 00000000000..c665254f885
--- /dev/null
+++ b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.story.tsx
@@ -0,0 +1,207 @@
+import { Story, Meta } from '@storybook/react';
+import React, { useState } from 'react';
+
+import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
+import { Checkbox } from '../Forms/Checkbox';
+import { RadioButtonGroup } from '../Forms/RadioButtonGroup/RadioButtonGroup';
+import { Input } from '../Input/Input';
+import { Select } from '../Select/Select';
+import { Switch } from '../Switch/Switch';
+import { TextArea } from '../TextArea/TextArea';
+
+import { AutoSaveField } from './AutoSaveField';
+import mdx from './AutoSaveField.mdx';
+
+const meta: Meta = {
+  title: 'Forms/AutoSaveField',
+  component: AutoSaveField,
+  decorators: [withCenteredStory],
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+    options: {
+      storySort: {
+        order: ['Basic', 'AllComponentsSuccess', 'AllComponentsError'],
+      },
+    },
+    controls: {
+      exclude: [
+        'className',
+        'error',
+        'loading',
+        'htmlFor',
+        'invalid',
+        'horizontal',
+        'onFinishChange',
+        'validationMessageHorizontalOverflow',
+      ],
+    },
+  },
+  argTypes: {
+    saveErrorMessage: { control: 'text' },
+    label: { control: 'text' },
+    required: {
+      control: { type: 'boolean', options: [true, false] },
+    },
+    inputSuccessful: {
+      control: { type: 'boolean', options: [true, false] },
+    },
+  },
+  args: {
+    saveErrorMessage: 'This is a custom error message',
+    required: false,
+    description: 'This input has an auto-save behaviour',
+  },
+};
+
+export default meta;
+
+const getSuccess = () => {
+  return new Promise<void>((resolve) => {
+    setTimeout(resolve, 1000);
+  });
+};
+const getError = () => {
+  return new Promise<void>((resolve, reject) => {
+    reject();
+  });
+};
+const themeOptions = [
+  { value: '', label: 'Default' },
+  { value: 'dark', label: 'Dark' },
+  { value: 'light', label: 'Light' },
+  { value: 'system', label: 'System' },
+];
+
+export const Basic: Story = (args) => {
+  const [inputValue, setInputValue] = useState('');
+  return (
+    <AutoSaveField onFinishChange={args.inputSuccessful ? getSuccess : getError} {...args}>
+      {(onChange) => (
+        <Input
+          value={inputValue}
+          onChange={(e) => {
+            const value = e.currentTarget.value;
+            onChange(value);
+            setInputValue(e.currentTarget.value);
+          }}
+        />
+      )}
+    </AutoSaveField>
+  );
+};
+
+Basic.args = {
+  required: false,
+  label: 'Input saving value automatically',
+  inputSuccessful: false,
+};
+
+export const AllComponents: Story = (args) => {
+  const [selected, setSelected] = useState('');
+  const [checkBoxTest, setCheckBoxTest] = useState(false);
+  const [textAreaValue, setTextAreaValue] = useState('');
+  const [inputTextValue, setInputTextValue] = useState('');
+  const [switchTest, setSwitchTest] = useState(false);
+
+  return (
+    <div>
+      <AutoSaveField onFinishChange={args.inputSuccessful ? getSuccess : getError} label="Text as a child" {...args}>
+        {(onChange) => (
+          <Input
+            value={inputTextValue}
+            onChange={(e) => {
+              const value = e.currentTarget.value;
+              onChange(value);
+              setInputTextValue(e.currentTarget.value);
+            }}
+          />
+        )}
+      </AutoSaveField>
+      <AutoSaveField onFinishChange={args.inputSuccessful ? getSuccess : getError} label="Select as child" {...args}>
+        {(onChange) => (
+          <Select
+            options={themeOptions}
+            value={args.weekPickerValue}
+            onChange={(v) => {
+              onChange(v.value);
+            }}
+          />
+        )}
+      </AutoSaveField>
+      <AutoSaveField
+        onFinishChange={args.inputSuccessful ? getSuccess : getError}
+        label="RadioButtonGroup as a child"
+        {...args}
+      >
+        {(onChange) => (
+          <RadioButtonGroup
+            options={themeOptions}
+            value={selected}
+            onChange={(themeOption) => {
+              setSelected(themeOption);
+              onChange(themeOption);
+            }}
+          />
+        )}
+      </AutoSaveField>
+      <AutoSaveField<Boolean>
+        onFinishChange={args.inputSuccessful ? getSuccess : getError}
+        label="Checkbox as a child"
+        {...args}
+      >
+        {(onChange) => (
+          <Checkbox
+            label="Checkbox test"
+            description="This is a checkbox input"
+            name="checkbox-test"
+            value={checkBoxTest}
+            onChange={(e) => {
+              const value = e.currentTarget.checked;
+              onChange(value);
+              setCheckBoxTest(value);
+            }}
+          />
+        )}
+      </AutoSaveField>
+      <AutoSaveField
+        onFinishChange={args.inputSuccessful ? getSuccess : getError}
+        label="TextArea as a child"
+        {...args}
+      >
+        {(onChange) => (
+          <TextArea
+            value={textAreaValue}
+            onChange={(e) => {
+              const value = e.currentTarget.value;
+              onChange(value);
+              setTextAreaValue(e.currentTarget.value);
+            }}
+          />
+        )}
+      </AutoSaveField>
+      <AutoSaveField<Boolean>
+        onFinishChange={args.inputSuccessful ? getSuccess : getError}
+        label="Switch as a child"
+        {...args}
+      >
+        {(onChange) => (
+          <Switch
+            label="Switch test"
+            name="switch-test"
+            value={switchTest}
+            onChange={(e) => {
+              onChange(e.currentTarget.checked);
+              setSwitchTest(e.currentTarget.checked);
+            }}
+          />
+        )}
+      </AutoSaveField>
+    </div>
+  );
+};
+AllComponents.args = {
+  required: false,
+  inputSuccessful: true,
+};
diff --git a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.test.tsx b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.test.tsx
new file mode 100644
index 00000000000..5e11efda035
--- /dev/null
+++ b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.test.tsx
@@ -0,0 +1,518 @@
+import { act, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { createTheme, SelectableValue } from '@grafana/data';
+
+import { Checkbox } from '../Forms/Checkbox';
+import { RadioButtonGroup } from '../Forms/RadioButtonGroup/RadioButtonGroup';
+import { Input } from '../Input/Input';
+import { SelectBase } from '../Select/SelectBase';
+import { Switch } from '../Switch/Switch';
+import { TextArea } from '../TextArea/TextArea';
+
+import { AutoSaveField, Props } from './AutoSaveField';
+
+const mockOnFinishChange = jest.fn().mockImplementation(() => Promise.resolve());
+const mockOnFinishChangeError = jest.fn().mockImplementation(() => Promise.reject());
+const options: Array<SelectableValue<string>> = [
+  {
+    label: 'Light',
+    value: 'light',
+  },
+  {
+    label: 'Dark',
+    value: 'dark',
+  },
+  {
+    label: 'Default',
+    value: 'default',
+  },
+];
+const setup = (propOverrides?: Partial<Props>) => {
+  const props: Omit<Props, 'children'> = {
+    label: 'Test',
+    onFinishChange: mockOnFinishChange,
+    htmlFor: 'input-test',
+  };
+
+  Object.assign(props, propOverrides);
+
+  render(
+    <AutoSaveField {...props}>
+      {(onChange) => <Input id="input-test" name="input-test" onChange={(e) => onChange(e.currentTarget.value)} />}
+    </AutoSaveField>
+  );
+};
+
+const setupTextArea = (propOverrides?: Partial<Props>) => {
+  const props: Omit<Props, 'children'> = {
+    label: 'Test',
+    onFinishChange: mockOnFinishChange,
+    htmlFor: 'textarea-test',
+  };
+
+  Object.assign(props, propOverrides);
+
+  render(
+    <AutoSaveField {...props}>
+      {(onChange) => (
+        <TextArea id="textarea-test" name="textarea-test" onChange={(e) => onChange(e.currentTarget.value)} />
+      )}
+    </AutoSaveField>
+  );
+};
+
+const setupCheckbox = (propOverrides?: Partial<Props>) => {
+  const props: Omit<Props<Boolean>, 'children'> = {
+    label: 'Test',
+    onFinishChange: mockOnFinishChange,
+    htmlFor: 'checkbox-test',
+    defaultChecked: false,
+  };
+
+  Object.assign(props, propOverrides);
+
+  render(
+    <AutoSaveField<Boolean> {...props}>
+      {(onChange) => (
+        <Checkbox
+          id="checkbox-test"
+          name="checkbox-test"
+          onChange={(e) => {
+            onChange(e.currentTarget.checked);
+          }}
+        />
+      )}
+    </AutoSaveField>
+  );
+};
+
+const setupSwitch = (propOverrides?: Partial<Props>) => {
+  const props: Omit<Props<Boolean>, 'children'> = {
+    label: 'Test',
+    onFinishChange: mockOnFinishChange,
+    htmlFor: 'switch-test',
+    defaultChecked: false,
+  };
+
+  Object.assign(props, propOverrides);
+
+  render(
+    <AutoSaveField<Boolean> {...props}>
+      {(onChange) => (
+        <Switch
+          id="switch-test"
+          name="switch-test"
+          onChange={(e) => {
+            onChange(e.currentTarget.checked);
+          }}
+        />
+      )}
+    </AutoSaveField>
+  );
+};
+
+const setupRadioButton = (propOverrides?: Partial<Props>) => {
+  const props: Omit<Props, 'children'> = {
+    label: 'Choose your theme',
+    onFinishChange: mockOnFinishChange,
+    htmlFor: 'radio-button-group-test',
+  };
+
+  Object.assign(props, propOverrides);
+
+  render(
+    <AutoSaveField {...props}>
+      {(onChange) => (
+        <RadioButtonGroup
+          id="radio-button-group-test"
+          onChange={(option) => {
+            onChange(option);
+          }}
+          options={options}
+        />
+      )}
+    </AutoSaveField>
+  );
+};
+
+const setupSelect = (propOverrides?: Partial<Props>) => {
+  const props: Omit<Props, 'children'> = {
+    label: 'Choose your theme',
+    onFinishChange: mockOnFinishChange,
+    htmlFor: 'select-test',
+  };
+
+  Object.assign(props, propOverrides);
+
+  render(
+    <AutoSaveField {...props}>
+      {(onChange) => (
+        <SelectBase
+          data-testid="select-test"
+          onChange={(option) => {
+            onChange(option.value ?? '');
+          }}
+          options={options}
+        />
+      )}
+    </AutoSaveField>
+  );
+};
+
+/*
+Cases to cover:
+1.- General:
+  a) It renders
+  b) It has a children
+  c) It has a onFinishChange function
+  d) If success, the InlineToast renders on the right
+  e) If success but not enough space, the InlineToas renders on the bottom
+2.- Per child:
+  a) It renders
+  b) When it is succesful, it show the InlineToast saying Saved!
+  c) When there was an error, show the error message
+  d) When there was an error and the child has an invalid prop, show the red border
+*/
+
+describe('AutoSaveField ', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    user = userEvent.setup({ delay: null });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders with an Input as a children', () => {
+    setup();
+    expect(
+      screen.getByRole('textbox', {
+        name: 'Test',
+      })
+    ).toBeInTheDocument();
+  });
+  it('triggers the function on change by typing and shows the InlineToast', async () => {
+    setup();
+    const inputField = screen.getByRole('textbox', {
+      name: 'Test',
+    });
+    await user.type(inputField, 'This is a test text');
+    expect(inputField).toHaveValue('This is a test text');
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChange).toHaveBeenCalledWith('This is a test text');
+    expect(await screen.findByText('Saved!')).toBeInTheDocument();
+  });
+});
+
+describe('Input, as AutoSaveField child, ', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    user = userEvent.setup({ delay: null });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('shows an error message if there was any problem with the request', async () => {
+    setup({ saveErrorMessage: 'There was an error', onFinishChange: mockOnFinishChangeError });
+    const inputField = screen.getByRole('textbox', {
+      name: 'Test',
+    });
+    await user.type(inputField, 'This is a test text');
+    expect(inputField).toHaveValue('This is a test text');
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChangeError).toHaveBeenCalledWith('This is a test text');
+    expect(await screen.findByText('There was an error')).toBeInTheDocument();
+  });
+
+  it('shows a red border when invalid is true', async () => {
+    setup({ invalid: true, onFinishChange: mockOnFinishChangeError });
+    const theme = createTheme();
+    const inputField = screen.getByRole('textbox', {
+      name: 'Test',
+    });
+    await user.type(inputField, 'This is a test text');
+    expect(inputField).toHaveValue('This is a test text');
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChangeError).not.toHaveBeenCalled();
+    expect(inputField).toHaveStyle(`border: 1px solid ${theme.colors.error.border};`);
+  });
+});
+
+describe('TextArea, as AutoSaveField child, ', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    user = userEvent.setup({ delay: null });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders itself', () => {
+    setupTextArea();
+    expect(
+      screen.getByRole('textbox', {
+        name: 'Test',
+      })
+    ).toBeInTheDocument();
+  });
+  //TextArea does not have a loading state so this test will fail till that is fixed
+  it.skip('triggers the function on change by typing and shows the InlineToast', async () => {
+    setupTextArea();
+    const textArea = screen.getByRole('textbox', {
+      name: 'Test',
+    });
+    await user.type(textArea, 'This is a test text');
+    expect(textArea).toHaveValue('This is a test text');
+    act(() => {
+      jest.runAllTimers();
+    });
+
+    expect(mockOnFinishChange).toHaveBeenCalledWith('This is a test text');
+    expect(await screen.findByText('Saved!')).toBeInTheDocument();
+  });
+  //TextArea does not have a loading state so this test will fail till that is fixed
+  it.skip('shows an error message if there was any problem with the request', async () => {
+    setupTextArea({ saveErrorMessage: 'There was an error', onFinishChange: mockOnFinishChangeError });
+    const textArea = screen.getByRole('textbox', {
+      name: 'Test',
+    });
+    await user.type(textArea, 'This is a test text');
+    expect(textArea).toHaveValue('This is a test text');
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChangeError).toHaveBeenCalledWith('This is a test text');
+    expect(await screen.findByText('There was an error')).toBeInTheDocument();
+  });
+
+  it('shows a red border when invalid is true', async () => {
+    setupTextArea({ invalid: true, onFinishChange: mockOnFinishChangeError });
+    const theme = createTheme();
+    const textArea = screen.getByRole('textbox', {
+      name: 'Test',
+    });
+    await user.type(textArea, 'This is a test text');
+    expect(textArea).toHaveValue('This is a test text');
+
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChangeError).not.toHaveBeenCalled();
+    expect(textArea).toHaveStyle(`border-color: ${theme.colors.error.border}`);
+  });
+});
+
+describe('Checkbox, as AutoSaveField child, ', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    user = userEvent.setup({ delay: null });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders itself', () => {
+    setupCheckbox();
+    expect(
+      screen.getByRole('checkbox', {
+        name: 'Test',
+      })
+    ).toBeInTheDocument();
+  });
+  //Checkbox does not have a loading state so this test will fail till that is fixed
+  it.skip('triggers the function on change by click on it and shows the InlineToast', async () => {
+    setupCheckbox();
+    const checkbox = screen.getByRole('checkbox', {
+      name: 'Test',
+    });
+    await user.click(checkbox);
+    expect(checkbox).toBeChecked();
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChange).toHaveBeenCalledWith(true);
+    expect(await screen.findByText('Saved!')).toBeInTheDocument();
+  });
+  //Checkbox does not have a loading state so this test will fail till that is fixed
+  it.skip('shows an error message if there was any problem with the request', async () => {
+    setupCheckbox({ saveErrorMessage: 'There was an error', onFinishChange: mockOnFinishChangeError });
+    const checkbox = screen.getByRole('checkbox', {
+      name: 'Test',
+    });
+    await user.click(checkbox);
+    expect(checkbox).toBeChecked();
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChangeError).toHaveBeenCalledWith(true);
+    expect(await screen.findByText('There was an error')).toBeInTheDocument();
+  });
+});
+
+describe('Switch, as AutoSaveField child, ', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    user = userEvent.setup({ delay: null });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders itself', () => {
+    setupSwitch();
+    //Is there another way to find the switch element? Filtering by name doesn't work
+    expect(
+      screen.getByRole('checkbox', {
+        checked: false,
+      })
+    ).toBeInTheDocument();
+  });
+  //Switch does not have a loading state so this test will fail till that is fixed
+  it.skip('triggers the function on change by toggle it and shows the InlineToast', async () => {
+    setupSwitch();
+    const switchInput = screen.getByRole('checkbox', {
+      checked: false,
+    });
+    await user.click(switchInput);
+    expect(switchInput).toBeChecked();
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChange).toHaveBeenCalledWith(true);
+    expect(await screen.findByText('Saved!')).toBeInTheDocument();
+  });
+  //Switch does not have a loading state so this test will fail till that is fixed
+  it.skip('shows an error message if there was any problem with the request', async () => {
+    setupSwitch({ saveErrorMessage: 'There was an error', onFinishChange: mockOnFinishChangeError });
+    const switchInput = screen.getByRole('checkbox', {
+      checked: false,
+    });
+    await user.click(switchInput);
+    expect(switchInput).toBeChecked();
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChangeError).toHaveBeenCalledWith(true);
+    expect(await screen.findByText('There was an error')).toBeInTheDocument();
+  });
+});
+
+describe('RadioButtonGroup, as AutoSaveField child, ', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    user = userEvent.setup({ delay: null });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders itself', () => {
+    setupRadioButton();
+    expect(screen.getAllByRole('radio')).toHaveLength(3);
+  });
+  it('triggers the function on change by click on an option and shows the InlineToast', async () => {
+    setupRadioButton();
+    const radioOption = screen.getByRole('radio', {
+      name: /Light/,
+    });
+    await user.click(radioOption);
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChange).toHaveBeenCalledWith('light');
+    expect(await screen.findByText('Saved!')).toBeInTheDocument();
+  });
+
+  it('shows an error message if there was any problem with the request', async () => {
+    setupRadioButton({ saveErrorMessage: 'There was an error', onFinishChange: mockOnFinishChangeError });
+    const radioOption = screen.getByRole('radio', {
+      name: /Light/,
+    });
+    await user.click(radioOption);
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChangeError).toHaveBeenCalledWith('light');
+    expect(await screen.findByText('There was an error')).toBeInTheDocument();
+  });
+});
+
+describe('Select, as AutoSaveField child, ', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    user = userEvent.setup({ delay: null });
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders itself', async () => {
+    setupSelect();
+    expect(screen.getByRole('combobox')).toBeInTheDocument();
+    await user.click(screen.getByText('Choose'));
+    const selectOptions = screen.getAllByLabelText('Select option');
+    expect(selectOptions).toHaveLength(3);
+  });
+  it('triggers the function on change by selecting an option and shows the InlineToast', async () => {
+    setupSelect();
+    expect(screen.getByRole('combobox')).toBeInTheDocument();
+    await user.click(screen.getByText('Choose'));
+    const selectOptions = screen.getAllByLabelText('Select option');
+    await user.click(selectOptions[1]);
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChange).toHaveBeenCalledWith('dark');
+    expect(await screen.findByText('Saved!')).toBeInTheDocument();
+  });
+
+  it('shows an error message if there was any problem with the request', async () => {
+    setupSelect({ saveErrorMessage: 'There was an error', onFinishChange: mockOnFinishChangeError });
+    expect(screen.getByRole('combobox')).toBeInTheDocument();
+    await user.click(screen.getByText('Choose'));
+    const selectOptions = screen.getAllByLabelText('Select option');
+    await user.click(selectOptions[1]);
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockOnFinishChangeError).toHaveBeenCalledWith('dark');
+    expect(await screen.findByText('There was an error')).toBeInTheDocument();
+  });
+});
diff --git a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx
new file mode 100644
index 00000000000..cd4d5308941
--- /dev/null
+++ b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx
@@ -0,0 +1,126 @@
+import { debounce } from 'lodash';
+import React, { useCallback, useMemo, useRef } from 'react';
+
+import { Field, FieldProps } from '../Forms/Field';
+import { InlineToast } from '../InlineToast/InlineToast';
+
+/**
+1.- Use the Input component as a base
+2.- Just save if there is any change and when it loses focus
+3.- Set the loading to true while the backend is saving
+4.- Be aware of the backend response. If there is an error show a proper message and return the focus to the input.
+5.- Add aria-live="polite" and check how it works in a screen-reader.
+Debounce instead of working with onBlur?
+import debouncePromise from 'debounce-promise';
+or
+import { debounce} from 'lodash';
+ */
+
+const SHOW_SUCCESS_DURATION = 2 * 1000;
+
+export interface Props<T = string> extends Omit<FieldProps, 'children'> {
+  /** Saving request that will be triggered 600ms after changing the value */
+  onFinishChange: (inputValue: T) => Promise<void>;
+  /** Custom error message to display on saving */
+  saveErrorMessage?: string;
+  /** Input that will save its value on change  */
+  children: (onChange: (newValue: T) => void) => React.ReactElement;
+}
+export function AutoSaveField<T = string>(props: Props<T>) {
+  const {
+    invalid,
+    loading,
+    onFinishChange,
+    saveErrorMessage = 'Error saving this value',
+    error,
+    children,
+    disabled,
+    ...restProps
+  } = props;
+
+  const [fieldState, setFieldState] = React.useState({
+    isLoading: false,
+    showSuccess: false,
+    showError: invalid,
+  });
+
+  const fieldRef = useRef<HTMLDivElement>(null);
+
+  React.useEffect(() => {
+    let timeoutId: ReturnType<typeof setTimeout>;
+    if (fieldState.showSuccess) {
+      const time = fieldState.showError ? 0 : SHOW_SUCCESS_DURATION;
+      timeoutId = setTimeout(() => {
+        setFieldState({ ...fieldState, showSuccess: false });
+      }, time);
+    }
+
+    return () => {
+      window.clearTimeout(timeoutId);
+    };
+  }, [fieldState]);
+
+  const handleChange = useCallback(
+    (nextValue: T) => {
+      if (invalid) {
+        return;
+      }
+      setFieldState({ ...fieldState, isLoading: true, showSuccess: false });
+      onFinishChange(nextValue)
+        .then(() => {
+          setFieldState({
+            isLoading: false,
+            showSuccess: true,
+            showError: false,
+          });
+        })
+        .catch(() => {
+          setFieldState({
+            ...fieldState,
+            isLoading: false,
+            showError: true,
+          });
+        });
+    },
+    [invalid, fieldState, onFinishChange]
+  );
+
+  const lodashDebounce = useMemo(() => debounce(handleChange, 600, { leading: false }), [handleChange]);
+  //We never want to pass false to field, because it won't be deleted with deleteUndefinedProps() being false
+  const isInvalid = invalid || fieldState.showError || undefined;
+  const isLoading = loading || fieldState.isLoading || undefined;
+  /**
+   * use Field around input to pass the error message
+   * use InlineToast.tsx to show the save message
+   */
+  return (
+    <>
+      <Field
+        {...restProps}
+        loading={isLoading}
+        invalid={isInvalid}
+        disabled={disabled}
+        error={error || (fieldState.showError && saveErrorMessage)}
+        ref={fieldRef}
+      >
+        {React.cloneElement(
+          children((newValue) => {
+            lodashDebounce(newValue);
+          })
+        )}
+      </Field>
+      {fieldState.showSuccess && (
+        <InlineToast
+          suffixIcon={'check'}
+          referenceElement={fieldRef.current}
+          placement="right"
+          alternativePlacement="bottom"
+        >
+          Saved!
+        </InlineToast>
+      )}
+    </>
+  );
+}
+
+AutoSaveField.displayName = 'AutoSaveField';
diff --git a/packages/grafana-ui/src/components/Forms/Field.tsx b/packages/grafana-ui/src/components/Forms/Field.tsx
index e6f32fca6e4..f1d6d03166e 100644
--- a/packages/grafana-ui/src/components/Forms/Field.tsx
+++ b/packages/grafana-ui/src/components/Forms/Field.tsx
@@ -69,43 +69,58 @@ export const getFieldStyles = stylesFactory((theme: GrafanaTheme2) => {
   };
 });
 
-export const Field = ({
-  label,
-  description,
-  horizontal,
-  invalid,
-  loading,
-  disabled,
-  required,
-  error,
-  children,
-  className,
-  validationMessageHorizontalOverflow,
-  htmlFor,
-  ...otherProps
-}: FieldProps) => {
-  const theme = useTheme2();
-  const styles = getFieldStyles(theme);
-  const inputId = htmlFor ?? getChildId(children);
+export const Field = React.forwardRef<HTMLDivElement, FieldProps>(
+  (
+    {
+      label,
+      description,
+      horizontal,
+      invalid,
+      loading,
+      disabled,
+      required,
+      error,
+      children,
+      className,
+      validationMessageHorizontalOverflow,
+      htmlFor,
+      ...otherProps
+    }: FieldProps,
+    ref
+  ) => {
+    const theme = useTheme2();
+    const styles = getFieldStyles(theme);
+    const inputId = htmlFor ?? getChildId(children);
 
-  const labelElement =
-    typeof label === 'string' ? (
-      <Label htmlFor={inputId} description={description}>
-        {`${label}${required ? ' *' : ''}`}
-      </Label>
-    ) : (
-      label
-    );
+    const labelElement =
+      typeof label === 'string' ? (
+        <Label htmlFor={inputId} description={description}>
+          {`${label}${required ? ' *' : ''}`}
+        </Label>
+      ) : (
+        label
+      );
 
-  const childProps = deleteUndefinedProps({ invalid, disabled, loading });
-  return (
-    <div className={cx(styles.field, horizontal && styles.fieldHorizontal, className)} {...otherProps}>
-      {labelElement}
-      <div>
-        {React.cloneElement(children, childProps)}
-        {invalid && error && !horizontal && (
+    const childProps = deleteUndefinedProps({ invalid, disabled, loading });
+    return (
+      <div className={cx(styles.field, horizontal && styles.fieldHorizontal, className)} {...otherProps}>
+        {labelElement}
+        <div>
+          <div ref={ref}>{React.cloneElement(children, childProps)}</div>
+          {invalid && error && !horizontal && (
+            <div
+              className={cx(styles.fieldValidationWrapper, {
+                [styles.validationMessageHorizontalOverflow]: !!validationMessageHorizontalOverflow,
+              })}
+            >
+              <FieldValidationMessage>{error}</FieldValidationMessage>
+            </div>
+          )}
+        </div>
+
+        {invalid && error && horizontal && (
           <div
-            className={cx(styles.fieldValidationWrapper, {
+            className={cx(styles.fieldValidationWrapper, styles.fieldValidationWrapperHorizontal, {
               [styles.validationMessageHorizontalOverflow]: !!validationMessageHorizontalOverflow,
             })}
           >
@@ -113,19 +128,11 @@ export const Field = ({
           </div>
         )}
       </div>
+    );
+  }
+);
 
-      {invalid && error && horizontal && (
-        <div
-          className={cx(styles.fieldValidationWrapper, styles.fieldValidationWrapperHorizontal, {
-            [styles.validationMessageHorizontalOverflow]: !!validationMessageHorizontalOverflow,
-          })}
-        >
-          <FieldValidationMessage>{error}</FieldValidationMessage>
-        </div>
-      )}
-    </div>
-  );
-};
+Field.displayName = 'Field';
 
 function deleteUndefinedProps<T extends Object>(obj: T): Partial<T> {
   for (const key in obj) {
diff --git a/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx b/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
index d58f110dc50..67fa6dab9a4 100644
--- a/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
+++ b/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
@@ -15,22 +15,38 @@ export interface InlineToastProps {
   suffixIcon?: IconName;
   referenceElement: HTMLElement | null;
   placement: BasePlacement;
+  // Placement to use if there is not enough space to show the full toast with the original placement
+  alternativePlacement?: BasePlacement;
 }
 
-export function InlineToast({ referenceElement, children, suffixIcon, placement }: InlineToastProps) {
+export function InlineToast({
+  referenceElement,
+  children,
+  suffixIcon,
+  placement,
+  alternativePlacement,
+}: InlineToastProps) {
   const [indicatorElement, setIndicatorElement] = useState<HTMLElement | null>(null);
-  const popper = usePopper(referenceElement, indicatorElement, { placement });
+  const [toastPlacement, setToastPlacement] = useState(placement);
+  const popper = usePopper(referenceElement, indicatorElement, { placement: toastPlacement });
   const styles = useStyles2(getStyles);
   const placementStyles = useStyles2(getPlacementStyles);
 
+  React.useEffect(() => {
+    if (alternativePlacement && shouldUseAlt(placement, indicatorElement, referenceElement)) {
+      setToastPlacement(alternativePlacement);
+    }
+  }, [alternativePlacement, placement, indicatorElement, referenceElement]);
+
   return (
     <Portal>
       <div
         style={{ display: 'inline-block', ...popper.styles.popper }}
         {...popper.attributes.popper}
         ref={setIndicatorElement}
+        aria-live="polite"
       >
-        <span className={cx(styles.root, placementStyles[placement])}>
+        <span className={cx(styles.root, placementStyles[toastPlacement])}>
           {children && <span>{children}</span>}
           {suffixIcon && <Icon name={suffixIcon} />}
         </span>
@@ -55,6 +71,31 @@ const getStyles = (theme: GrafanaTheme2) => {
   };
 };
 
+//To calculate if the InlineToast is displayed off-screen and should use the alternative placement
+const shouldUseAlt = (
+  placement: BasePlacement,
+  indicatorElement: HTMLElement | null,
+  referenceElement: HTMLElement | null
+) => {
+  const indicatorSizes = indicatorElement?.getBoundingClientRect();
+  const referenceSizes = referenceElement?.getBoundingClientRect();
+  if (!indicatorSizes || !referenceSizes) {
+    return false;
+  }
+  switch (placement) {
+    case 'right':
+      return indicatorSizes.width + referenceSizes.right > window.innerWidth;
+    case 'bottom':
+      return indicatorSizes.height + referenceSizes.bottom > window.innerHeight;
+    case 'left':
+      return referenceSizes.left - indicatorSizes.width < 0;
+    case 'top':
+      return referenceSizes.top - indicatorSizes.height < 0;
+    default:
+      return false;
+  }
+};
+
 const createAnimation = (fromX: string | number, fromY: string | number) =>
   keyframes({
     from: {
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index e6ec45d22ce..404e5168b43 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -46,6 +46,7 @@ export { DateTimePicker } from './DateTimePickers/DateTimePicker/DateTimePicker'
 export { List } from './List/List';
 export { InteractiveTable } from './InteractiveTable/InteractiveTable';
 export { TagsInput } from './TagsInput/TagsInput';
+export { AutoSaveField } from './AutoSaveField/AutoSaveField';
 export { Pagination } from './Pagination/Pagination';
 export { Tag, type OnTagClick } from './Tags/Tag';
 export { TagList } from './Tags/TagList';

From 1c3ad81826fa023b39cce8414ea5a62771731cc3 Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Thu, 13 Apr 2023 10:48:15 +0200
Subject: [PATCH 093/729] Plugins: Fix module.js file not being closed when
 loading plugins (#66288)

* Plugins: Loader: Fix module.js file not being closed

* Plugins: LocalFS: Add comments, ensure same Read() behaviour as os.File's

* Changed comment for Close()

* Add tests for LocalFS

* "Fix" linter error

* "Fix" linter error again
---
 pkg/plugins/localfiles.go            |  36 ++++++-
 pkg/plugins/localfiles_test.go       | 143 +++++++++++++++++++++++++++
 pkg/plugins/manager/loader/loader.go |   6 +-
 3 files changed, 181 insertions(+), 4 deletions(-)
 create mode 100644 pkg/plugins/localfiles_test.go

diff --git a/pkg/plugins/localfiles.go b/pkg/plugins/localfiles.go
index a805ae5d43f..92708796a90 100644
--- a/pkg/plugins/localfiles.go
+++ b/pkg/plugins/localfiles.go
@@ -12,11 +12,18 @@ import (
 
 var _ fs.FS = (*LocalFS)(nil)
 
+// LocalFS is a plugins.FS that allows accessing files on the local file system.
 type LocalFS struct {
-	m        map[string]*LocalFile
+	// m is a map of relative file paths that can be accessed on the local filesystem.
+	// The path separator must be os-specific.
+	m map[string]*LocalFile
+
+	// basePath is the basePath that will be prepended to all the files (in m map) before accessing them.
 	basePath string
 }
 
+// NewLocalFS returns a new LocalFS that can access the specified files in the specified base path.
+// Both the map keys and basePath should use the os-specific path separator for Open() to work properly.
 func NewLocalFS(m map[string]struct{}, basePath string) LocalFS {
 	pfs := make(map[string]*LocalFile, len(m))
 	for k := range m {
@@ -31,6 +38,8 @@ func NewLocalFS(m map[string]struct{}, basePath string) LocalFS {
 	}
 }
 
+// Open opens the specified file on the local filesystem, and returns the corresponding fs.File.
+// If a nil error is returned, the caller should take care of closing the returned file.
 func (f LocalFS) Open(name string) (fs.File, error) {
 	cleanPath, err := util.CleanRelativePath(name)
 	if err != nil {
@@ -53,10 +62,13 @@ func (f LocalFS) Open(name string) (fs.File, error) {
 	return nil, ErrFileNotExist
 }
 
+// Base returns the base path for the LocalFS.
 func (f LocalFS) Base() string {
 	return f.basePath
 }
 
+// Files returns a slice of all the file paths in the LocalFS relative to the base path.
+// The returned strings use the same path separator as the
 func (f LocalFS) Files() []string {
 	var files []string
 	for p := range f.m {
@@ -72,11 +84,14 @@ func (f LocalFS) Files() []string {
 
 var _ fs.File = (*LocalFile)(nil)
 
+// LocalFile implements a fs.File for accessing the local filesystem.
 type LocalFile struct {
 	f    *os.File
 	path string
 }
 
+// Stat returns a FileInfo describing the named file.
+// It returns ErrFileNotExist if the file does not exist, or ErrPluginFileRead if another error occurs.
 func (p *LocalFile) Stat() (fs.FileInfo, error) {
 	fi, err := os.Stat(p.path)
 	if err != nil {
@@ -88,7 +103,19 @@ func (p *LocalFile) Stat() (fs.FileInfo, error) {
 	return fi, nil
 }
 
-func (p *LocalFile) Read(bytes []byte) (int, error) {
+// Read reads up to len(b) bytes from the File and stores them in b.
+// It returns the number of bytes read and any error encountered.
+// At end of file, Read returns 0, io.EOF.
+// If the file is already open, it is opened again, without closing it first.
+// The file is not closed at the end of the read operation. If a non-nil error is returned, it
+// must be manually closed by the caller by calling Close().
+func (p *LocalFile) Read(b []byte) (int, error) {
+	if p.f != nil {
+		// File is already open, Read() can be called more than once.
+		// io.EOF is returned if the file has been read entirely.
+		return p.f.Read(b)
+	}
+
 	var err error
 	p.f, err = os.Open(p.path)
 	if err != nil {
@@ -97,9 +124,12 @@ func (p *LocalFile) Read(bytes []byte) (int, error) {
 		}
 		return 0, ErrPluginFileRead
 	}
-	return p.f.Read(bytes)
+	return p.f.Read(b)
 }
 
+// Close closes the file.
+// If the file was never open, nil is returned.
+// If the file is already closed, an error is returned.
 func (p *LocalFile) Close() error {
 	if p.f != nil {
 		return p.f.Close()
diff --git a/pkg/plugins/localfiles_test.go b/pkg/plugins/localfiles_test.go
new file mode 100644
index 00000000000..ed66190c048
--- /dev/null
+++ b/pkg/plugins/localfiles_test.go
@@ -0,0 +1,143 @@
+package plugins
+
+import (
+	"io"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+type tempFileScenario struct {
+	filePath string
+}
+
+func (s tempFileScenario) cleanup() error {
+	return os.Remove(s.filePath)
+}
+
+func (s tempFileScenario) newLocalFile() LocalFile {
+	return LocalFile{path: s.filePath}
+}
+
+func newTempFileScenario() (tempFileScenario, error) {
+	tf, err := os.CreateTemp(os.TempDir(), "*")
+	if err != nil {
+		return tempFileScenario{}, err
+	}
+	defer tf.Close() //nolint
+	if _, err := tf.Write([]byte("hello\n")); err != nil {
+		return tempFileScenario{}, err
+	}
+	return tempFileScenario{
+		filePath: tf.Name(),
+	}, nil
+}
+
+func newTempFileScenarioForTest(t *testing.T) tempFileScenario {
+	s, err := newTempFileScenario()
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		require.NoError(t, s.cleanup())
+	})
+	return s
+}
+
+func TestLocalFile_Read(t *testing.T) {
+	t.Run("not exists", func(t *testing.T) {
+		var out []byte
+		f := LocalFile{path: "does not exist"}
+		n, err := f.Read(out)
+		require.Zero(t, n)
+		require.Equal(t, ErrFileNotExist, err)
+	})
+
+	t.Run("read", func(t *testing.T) {
+		t.Run("extra", func(t *testing.T) {
+			s := newTempFileScenarioForTest(t)
+			f := s.newLocalFile()
+
+			const bufSize = 512
+			out := make([]byte, bufSize)
+			n, err := f.Read(out)
+			require.NoError(t, err)
+			require.NoError(t, f.Close())
+			const exp = "hello\n"
+			require.Equal(t, len(exp), n)
+			require.Equal(t, []byte(exp), out[:len(exp)])
+			require.Equal(t, make([]byte, bufSize-len(exp)), out[len(exp):])
+		})
+
+		t.Run("empty", func(t *testing.T) {
+			s := newTempFileScenarioForTest(t)
+			f := s.newLocalFile()
+
+			var out []byte
+			n, err := f.Read(out)
+			require.NoError(t, err)
+			require.NoError(t, f.Close())
+			require.Zero(t, n)
+			require.Empty(t, out)
+		})
+
+		t.Run("multiple", func(t *testing.T) {
+			s := newTempFileScenarioForTest(t)
+			f := s.newLocalFile()
+
+			a := make([]byte, 2)
+			b := make([]byte, 3)
+			c := make([]byte, 2)
+
+			t.Cleanup(func() {
+				require.NoError(t, f.Close())
+			})
+
+			n, err := f.Read(a)
+			require.NoError(t, err)
+			require.Equal(t, 2, n)
+			require.Equal(t, []byte("he"), a)
+
+			n, err = f.Read(b)
+			require.NoError(t, err)
+			require.Equal(t, 3, n)
+			require.Equal(t, []byte("llo"), b)
+
+			n, err = f.Read(c)
+			require.NoError(t, err)
+			require.Equal(t, 1, n)
+			require.Equal(t, []byte{'\n', 0}, c)
+
+			n, err = f.Read(c)
+			require.Zero(t, n)
+			require.Equal(t, io.EOF, err)
+		})
+	})
+}
+
+func TestLocalFile_Close(t *testing.T) {
+	t.Run("once after read", func(t *testing.T) {
+		s := newTempFileScenarioForTest(t)
+		f := s.newLocalFile()
+
+		_, err := f.Read(nil)
+		require.NoError(t, err)
+		require.NoError(t, f.Close())
+	})
+
+	t.Run("never opened", func(t *testing.T) {
+		s := newTempFileScenarioForTest(t)
+		f := s.newLocalFile()
+
+		require.NoError(t, f.Close())
+	})
+
+	t.Run("twice", func(t *testing.T) {
+		s := newTempFileScenarioForTest(t)
+		f := s.newLocalFile()
+
+		_, err := f.Read(nil)
+		require.NoError(t, err)
+		require.NoError(t, f.Close())
+		require.Error(t, f.Close())
+	})
+}
diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go
index 0cc65c06468..9f2d0abcb38 100644
--- a/pkg/plugins/manager/loader/loader.go
+++ b/pkg/plugins/manager/loader/loader.go
@@ -141,12 +141,16 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
 		// verify module.js exists for SystemJS to load.
 		// CDN plugins can be loaded with plugin.json only, so do not warn for those.
 		if !plugin.IsRenderer() && !plugin.IsCorePlugin() {
-			_, err := plugin.FS.Open("module.js")
+			f, err := plugin.FS.Open("module.js")
 			if err != nil {
 				if errors.Is(err, plugins.ErrFileNotExist) {
 					l.log.Warn("Plugin missing module.js", "pluginID", plugin.ID,
 						"warning", "Missing module.js, If you loaded this plugin from git, make sure to compile it.")
 				}
+			} else if f != nil {
+				if err := f.Close(); err != nil {
+					l.log.Warn("Could not close module.js", "pluginID", plugin.ID, "err", err)
+				}
 			}
 		}
 

From 2ea665a705b7798ed1f643167cc943ef37b7209c Mon Sep 17 00:00:00 2001
From: Gareth Dawson <gareth.dawson@grafana.com>
Date: Thu, 13 Apr 2023 10:29:13 +0100
Subject: [PATCH 094/729] Loki docs: Better description of label browser
 buttons (#65897)

add more detailed description of label browser buttons
---
 docs/sources/datasources/loki/query-editor/index.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/sources/datasources/loki/query-editor/index.md b/docs/sources/datasources/loki/query-editor/index.md
index 24e8299a9ec..635e1ee3755 100644
--- a/docs/sources/datasources/loki/query-editor/index.md
+++ b/docs/sources/datasources/loki/query-editor/index.md
@@ -187,8 +187,7 @@ You can use the Loki label browser to navigate through your labels and values, a
 
    The search field supports fuzzy search, and the label browser also supports faceting to list only possible label combinations.
 
-1. Choose a query type between [**logs query**]({{< relref "#create-a-log-query" >}}) and [**rate metrics query**]({{< relref "#create-a-metric-query" >}}).
-   You can also validate the selector.
+1. Select the **Show logs** button to display log lines based on the selected labels, or select the **Show logs rate** button to show the rate based on metrics such as requests per second. Additionally, you can validate the selector by clicking the **Validate selector** button.
 
 {{< figure src="/static/img/docs/v75/loki_label_browser.png" class="docs-image--no-shadow" max-width="800px" caption="The Loki label browser" >}}
 

From 0b2a4322db4729d3840192ab3062887c0b5596f4 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 13 Apr 2023 10:46:24 +0100
Subject: [PATCH 095/729] NestedFolders: Fix warning from tests, restore page
 default export (#66441)

NestedFolders: Fix warning from tests, and restore default export for page
---
 .../BrowseDashboardsPage.tsx                  |  3 +-
 .../api/browseDashboardsAPI.ts                | 50 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index 114396465de..a3d3cf83352 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -21,7 +21,7 @@ interface Props extends GrafanaRouteComponentProps<BrowseDashboardsPageRoutePara
 
 // New Browse/Manage/Search Dashboards views for nested folders
 
-export const BrowseDashboardsPage = memo(({ match, location }: Props) => {
+const BrowseDashboardsPage = memo(({ match, location }: Props) => {
   const { uid: folderUID } = match.params;
 
   const searchState = useMemo(() => {
@@ -45,3 +45,4 @@ export const BrowseDashboardsPage = memo(({ match, location }: Props) => {
 });
 
 BrowseDashboardsPage.displayName = 'BrowseDashboardsPage';
+export default BrowseDashboardsPage;
diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index 5f4fbe6f68e..c87d45ef6fd 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -1,37 +1,39 @@
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
+import { BaseQueryFn, createApi } from '@reduxjs/toolkit/query/react';
+import { lastValueFrom } from 'rxjs';
 
+import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
 import { FolderDTO } from 'app/types';
 
-// interface RequestOptions extends BackendSrvRequest {
-//   manageError?: (err: unknown) => { error: unknown };
-//   showErrorAlert?: boolean;
-// }
+interface RequestOptions extends BackendSrvRequest {
+  manageError?: (err: unknown) => { error: unknown };
+  showErrorAlert?: boolean;
+}
 
-// function createBackendSrvBaseQuery({ baseURL }: { baseURL: string }): BaseQueryFn<RequestOptions> {
-//   async function backendSrvBaseQuery(requestOptions: RequestOptions) {
-//     try {
-//       const { data: responseData, ...meta } = await lastValueFrom(
-//         getBackendSrv().fetch({
-//           ...requestOptions,
-//           url: baseURL + requestOptions.url,
-//           showErrorAlert: requestOptions.showErrorAlert,
-//         })
-//       );
-//       return { data: responseData, meta };
-//     } catch (error) {
-//       return requestOptions.manageError ? requestOptions.manageError(error) : { error };
-//     }
-//   }
+function createBackendSrvBaseQuery({ baseURL }: { baseURL: string }): BaseQueryFn<RequestOptions> {
+  async function backendSrvBaseQuery(requestOptions: RequestOptions) {
+    try {
+      const { data: responseData, ...meta } = await lastValueFrom(
+        getBackendSrv().fetch({
+          ...requestOptions,
+          url: baseURL + requestOptions.url,
+          showErrorAlert: requestOptions.showErrorAlert,
+        })
+      );
+      return { data: responseData, meta };
+    } catch (error) {
+      return requestOptions.manageError ? requestOptions.manageError(error) : { error };
+    }
+  }
 
-//   return backendSrvBaseQuery;
-// }
+  return backendSrvBaseQuery;
+}
 
 export const browseDashboardsAPI = createApi({
   reducerPath: 'browse-dashboards',
-  baseQuery: fetchBaseQuery({ baseUrl: '/api' }),
+  baseQuery: createBackendSrvBaseQuery({ baseURL: '/api' }),
   endpoints: (builder) => ({
     getFolder: builder.query<FolderDTO, string>({
-      query: (folderUID) => `/folders/${folderUID}`,
+      query: (folderUID) => ({ url: `/folders/${folderUID}` }),
     }),
   }),
 });

From 2991d4c2136f1a2c65eeb02a72958dfe33f4863a Mon Sep 17 00:00:00 2001
From: Virginia Cepeda <virginia.cepeda@grafana.com>
Date: Thu, 13 Apr 2023 06:58:59 -0300
Subject: [PATCH 096/729] Alerting: Fix creating a recording rule when having
 multiple datasources (#66415)

Fix creating recording rules when having multiple datasources
---
 .../components/rule-editor/RecordingRuleEditor.tsx  |  8 +++++---
 .../query-and-alert-condition/AlertType.tsx         |  2 ++
 .../QueryAndExpressionsStep.tsx                     | 13 ++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx b/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
index 7a1d741d5ab..cba32d4f669 100644
--- a/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
@@ -57,17 +57,19 @@ export const RecordingRuleEditor: FC<RecordingRuleEditorProps> = ({
 
   const handleChangedQuery = (changedQuery: DataQuery) => {
     const query = queries[0];
+    const dataSourceId = getDataSourceSrv().getInstanceSettings(dataSourceName)?.uid;
 
-    if (!isPromOrLokiQuery(query.model)) {
+    if (!isPromOrLokiQuery(changedQuery) || !dataSourceId) {
       return;
     }
 
-    const expr = query.model.expr;
+    const expr = changedQuery.expr;
 
     const merged = {
       ...query,
       refId: changedQuery.refId,
-      queryType: query.model.queryType ?? '',
+      queryType: changedQuery.queryType ?? '',
+      datasourceUid: dataSourceId,
       expr,
       model: {
         refId: changedQuery.refId,
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/AlertType.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/AlertType.tsx
index 73448a0ad42..49a75f973fe 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/AlertType.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/AlertType.tsx
@@ -67,6 +67,8 @@ export const AlertType = ({ editingExistingRule }: Props) => {
                   onChange={(ds: DataSourceInstanceSettings) => {
                     // reset location if switching data sources, as different rules source will have different groups and namespaces
                     setValue('location', undefined);
+                    // reset expression as they don't need to persist after changing datasources
+                    setValue('expression', '');
                     onChange(ds?.name ?? null);
                   }}
                 />
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
index 15d8facc044..68bb7fd6e87 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
@@ -198,19 +198,26 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
   useEffect(() => {
     setPanelData({});
     if (type === RuleFormType.cloudRecording) {
+      const expr = getValues('expression');
+      const datasourceUid =
+        (editingExistingRule && getDataSourceSrv().getInstanceSettings(dataSourceName)?.uid) ||
+        recordingRuleDefaultDatasource.uid;
+
       const defaultQuery = {
         refId: 'A',
-        datasourceUid: recordingRuleDefaultDatasource.uid,
+        datasourceUid,
         queryType: '',
         relativeTimeRange: getDefaultRelativeTimeRange(),
+        expr,
         model: {
           refId: 'A',
           hide: false,
+          expr,
         },
       };
-      dispatch(setRecordingRulesQueries({ recordingRuleQueries: [defaultQuery], expression: getValues('expression') }));
+      dispatch(setRecordingRulesQueries({ recordingRuleQueries: [defaultQuery], expression: expr }));
     }
-  }, [type, recordingRuleDefaultDatasource, editingExistingRule, getValues]);
+  }, [type, recordingRuleDefaultDatasource, editingExistingRule, getValues, dataSourceName]);
 
   const onDuplicateQuery = useCallback((query: AlertQuery) => {
     dispatch(duplicateQuery(query));

From 38ee910e396d6c99fa8489d666f023e9c80969ab Mon Sep 17 00:00:00 2001
From: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Date: Thu, 13 Apr 2023 12:00:59 +0100
Subject: [PATCH 097/729] Dashboards: Prevent template variables from resolving
 twice (#66372)

---
 .../core/components/AppChrome/AppChrome.tsx   | 43 ++++++++++---------
 .../components/AppChrome/AppChromeService.tsx |  1 +
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index 548436f4101..6e2f3f9ad06 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -47,31 +47,32 @@ export function AppChrome({ children }: Props) {
   });
 
   // Chromeless routes are without topNav, mega menu, search & command palette
-  if (state.chromeless) {
-    return (
-      <main className="main-view">
-        <div className={contentClass}>{children}</div>
-      </main>
-    );
-  }
+  // We check chromeless twice here instead of having a separate path so {children}
+  // doesn't get re-mounted when chromeless goes from true to false.
 
   return (
     <main className="main-view">
-      <div className={cx(styles.topNav)}>
-        {!searchBarHidden && <TopSearchBar />}
-        <NavToolbar
-          searchBarHidden={searchBarHidden}
-          sectionNav={state.sectionNav}
-          pageNav={state.pageNav}
-          actions={state.actions}
-          onToggleSearchBar={chrome.onToggleSearchBar}
-          onToggleMegaMenu={chrome.onToggleMegaMenu}
-          onToggleKioskMode={chrome.onToggleKioskMode}
-        />
-      </div>
+      {!state.chromeless && (
+        <div className={cx(styles.topNav)}>
+          {!searchBarHidden && <TopSearchBar />}
+          <NavToolbar
+            searchBarHidden={searchBarHidden}
+            sectionNav={state.sectionNav}
+            pageNav={state.pageNav}
+            actions={state.actions}
+            onToggleSearchBar={chrome.onToggleSearchBar}
+            onToggleMegaMenu={chrome.onToggleMegaMenu}
+            onToggleKioskMode={chrome.onToggleKioskMode}
+          />
+        </div>
+      )}
       <div className={contentClass}>{children}</div>
-      <MegaMenu searchBarHidden={searchBarHidden} onClose={() => chrome.setMegaMenu(false)} />
-      <CommandPalette />
+      {!state.chromeless && (
+        <>
+          <MegaMenu searchBarHidden={searchBarHidden} onClose={() => chrome.setMegaMenu(false)} />
+          <CommandPalette />
+        </>
+      )}
     </main>
   );
 }
diff --git a/public/app/core/components/AppChrome/AppChromeService.tsx b/public/app/core/components/AppChrome/AppChromeService.tsx
index bc919918d99..641d4d87283 100644
--- a/public/app/core/components/AppChrome/AppChromeService.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.tsx
@@ -73,6 +73,7 @@ export class AppChromeService {
     // Some updates can have new instance of sectionNav or pageNav but with same values
     if (newState.sectionNav !== current.sectionNav || newState.pageNav !== current.pageNav) {
       if (
+        newState.actions === current.actions &&
         navItemsAreTheSame(newState.sectionNav, current.sectionNav) &&
         navItemsAreTheSame(newState.pageNav, current.pageNav)
       ) {

From 7bc0692801e5bb384935be141c9ae9ad9f18fd18 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 13 Apr 2023 13:07:28 +0200
Subject: [PATCH 098/729] Logs: Add new LogRowContext types to `@grafana/data`
 (#66404)

* Logs: Add new LogRowContext types to grafana/data

* use right type for `RowContextOptions`

* add missing renames
---
 packages/grafana-data/src/types/logs.ts       | 16 +++++++++-----
 public/app/features/explore/Logs.tsx          |  4 ++--
 .../app/features/logs/components/LogRow.tsx   |  4 ++--
 .../app/features/logs/components/LogRows.tsx  |  4 ++--
 .../LogRowContextProvider.test.tsx            | 11 +++++-----
 .../log-context/LogRowContextProvider.tsx     | 10 ++++-----
 .../logs/components/log-context/types.ts      |  4 ----
 .../datasource/cloudwatch/datasource.ts       |  5 ++---
 .../CloudWatchLogsQueryRunner.test.ts         |  7 ++++++-
 .../query-runner/CloudWatchLogsQueryRunner.ts |  9 ++++----
 .../datasource/elasticsearch/datasource.ts    | 21 ++++++++++---------
 .../loki/LogContextProvider.test.ts           | 10 ++++++---
 .../datasource/loki/LogContextProvider.ts     |  7 ++++---
 .../app/plugins/datasource/loki/datasource.ts |  7 ++++---
 public/app/plugins/datasource/loki/types.ts   |  4 ++--
 15 files changed, 68 insertions(+), 55 deletions(-)
 delete mode 100644 public/app/features/logs/components/log-context/types.ts

diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts
index d6508191bd9..5e0d078a4b2 100644
--- a/packages/grafana-data/src/types/logs.ts
+++ b/packages/grafana-data/src/types/logs.ts
@@ -139,6 +139,16 @@ export enum LogsDedupDescription {
   signature = 'De-duplication of successive lines that have identical punctuation and whitespace.',
 }
 
+export interface LogRowContextOptions {
+  direction?: LogRowContextQueryDirection;
+  limit?: number;
+}
+
+export enum LogRowContextQueryDirection {
+  Backward = 'BACKWARD',
+  Forward = 'FORWARD',
+}
+
 /**
  * Data sources that allow showing context rows around the provided LowRowModel should implement this method.
  * This will enable "context" button in Logs Panel.
@@ -147,11 +157,7 @@ export interface DataSourceWithLogsContextSupport<TQuery extends DataQuery = Dat
   /**
    * Retrieve context for a given log row
    */
-  getLogRowContext: <TContextQueryOptions extends {}>(
-    row: LogRowModel,
-    options?: TContextQueryOptions,
-    query?: TQuery
-  ) => Promise<DataQueryResponse>;
+  getLogRowContext: (row: LogRowModel, options?: LogRowContextOptions, query?: TQuery) => Promise<DataQueryResponse>;
 
   /**
    * This method can be used to show "context" button based on runtime conditions (for example row model data or plugin settings, etc.)
diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index 63964d11b06..c1c2e0e8a96 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -26,6 +26,7 @@ import {
   DataHoverClearEvent,
   EventBus,
   DataSourceWithLogsContextSupport,
+  LogRowContextOptions,
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
@@ -44,7 +45,6 @@ import store from 'app/core/store';
 import { ExploreId } from 'app/types/explore';
 
 import { LogRows } from '../logs/components/LogRows';
-import { RowContextOptions } from '../logs/components/log-context/types';
 
 import { LogsMetaRow } from './LogsMetaRow';
 import LogsNavigation from './LogsNavigation';
@@ -79,7 +79,7 @@ interface Props extends Themeable2 {
   onClickFilterOutLabel: (key: string, value: string) => void;
   onStartScanning?: () => void;
   onStopScanning?: () => void;
-  getRowContext?: (row: LogRowModel, options?: RowContextOptions) => Promise<any>;
+  getRowContext?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<any>;
   getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
   getFieldLinks: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   addResultsToCache: () => void;
diff --git a/public/app/features/logs/components/LogRow.tsx b/public/app/features/logs/components/LogRow.tsx
index 65748b5c52a..ef10135df72 100644
--- a/public/app/features/logs/components/LogRow.tsx
+++ b/public/app/features/logs/components/LogRow.tsx
@@ -11,6 +11,7 @@ import {
   CoreApp,
   DataFrame,
   DataSourceWithLogsContextSupport,
+  LogRowContextOptions,
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { TimeZone } from '@grafana/schema';
@@ -29,7 +30,6 @@ import {
   HasMoreContextRows,
   LogRowContextProvider,
 } from './log-context/LogRowContextProvider';
-import { RowContextOptions } from './log-context/types';
 
 interface Props extends Themeable2 {
   row: LogRowModel;
@@ -50,7 +50,7 @@ interface Props extends Themeable2 {
   onClickFilterLabel?: (key: string, value: string) => void;
   onClickFilterOutLabel?: (key: string, value: string) => void;
   onContextClick?: () => void;
-  getRowContext: (row: LogRowModel, options?: RowContextOptions) => Promise<DataQueryResponse>;
+  getRowContext: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>;
   getLogRowContextUi?: (row: LogRowModel) => React.ReactNode;
   getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   showContextToggle?: (row?: LogRowModel) => boolean;
diff --git a/public/app/features/logs/components/LogRows.tsx b/public/app/features/logs/components/LogRows.tsx
index 8d38e8984b7..2109c479c0d 100644
--- a/public/app/features/logs/components/LogRows.tsx
+++ b/public/app/features/logs/components/LogRows.tsx
@@ -12,6 +12,7 @@ import {
   DataFrame,
   DataSourceWithLogsContextSupport,
   DataQueryResponse,
+  LogRowContextOptions,
 } from '@grafana/data';
 import { withTheme2, Themeable2 } from '@grafana/ui';
 
@@ -20,7 +21,6 @@ import { sortLogRows } from '../utils';
 //Components
 import { LogRow } from './LogRow';
 import { getLogRowStyles } from './getLogRowStyles';
-import { RowContextOptions } from './log-context/types';
 
 export const PREVIEW_LIMIT = 100;
 
@@ -43,7 +43,7 @@ export interface Props extends Themeable2 {
   showContextToggle?: (row?: LogRowModel) => boolean;
   onClickFilterLabel?: (key: string, value: string) => void;
   onClickFilterOutLabel?: (key: string, value: string) => void;
-  getRowContext?: (row: LogRowModel, options?: RowContextOptions) => Promise<DataQueryResponse>;
+  getRowContext?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>;
   getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
   getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   onClickShowField?: (key: string) => void;
diff --git a/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx b/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
index 2ae4af716cd..79a2aee3e27 100644
--- a/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
@@ -1,12 +1,11 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { FieldType, LogRowModel, MutableDataFrame, DataQueryResponse } from '@grafana/data';
+import { FieldType, LogRowModel, MutableDataFrame, DataQueryResponse, LogRowContextOptions } from '@grafana/data';
 
 import { createLogRow } from '../__mocks__/logRow';
 
 import { getRowContexts, LogRowContextProvider } from './LogRowContextProvider';
-import { RowContextOptions } from './types';
 
 const row = createLogRow({ entry: '4', timeEpochMs: 4 });
 
@@ -35,7 +34,7 @@ describe('getRowContexts', () => {
         ],
       });
       let called = false;
-      const getRowContextMock = (row: LogRowModel, options?: RowContextOptions): Promise<DataQueryResponse> => {
+      const getRowContextMock = (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse> => {
         if (!called) {
           called = true;
           return Promise.resolve({ data: [firstResult] });
@@ -70,7 +69,7 @@ describe('getRowContexts', () => {
         ],
       });
       let called = false;
-      const getRowContextMock = (row: LogRowModel, options?: RowContextOptions): Promise<DataQueryResponse> => {
+      const getRowContextMock = (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse> => {
         if (!called) {
           called = true;
           return Promise.resolve({ data: [firstResult] });
@@ -95,7 +94,7 @@ describe('getRowContexts', () => {
       const firstError = new Error('Error 1');
       const secondError = new Error('Error 2');
       let called = false;
-      const getRowContextMock = (row: LogRowModel, options?: RowContextOptions): Promise<DataQueryResponse> => {
+      const getRowContextMock = (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse> => {
         if (!called) {
           called = true;
           return Promise.reject(firstError);
@@ -142,7 +141,7 @@ describe('LogRowContextProvider', () => {
       });
 
       let called = false;
-      const getRowContextMock = (row: LogRowModel, options?: RowContextOptions): Promise<DataQueryResponse> => {
+      const getRowContextMock = (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse> => {
         if (!called) {
           called = true;
           return Promise.resolve({ data: [firstResult] });
diff --git a/public/app/features/logs/components/log-context/LogRowContextProvider.tsx b/public/app/features/logs/components/log-context/LogRowContextProvider.tsx
index ac0e4419f87..a9fed25c431 100644
--- a/public/app/features/logs/components/log-context/LogRowContextProvider.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextProvider.tsx
@@ -6,14 +6,14 @@ import {
   DataQueryResponse,
   Field,
   FieldCache,
+  LogRowContextOptions,
+  LogRowContextQueryDirection,
   LogRowModel,
   LogsSortOrder,
   toDataFrame,
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 
-import { RowContextOptions } from './types';
-
 export interface LogRowContextRows {
   before?: string[];
   after?: string[];
@@ -37,7 +37,7 @@ interface ResultType {
 interface LogRowContextProviderProps {
   row: LogRowModel;
   logsSortOrder?: LogsSortOrder | null;
-  getRowContext: (row: LogRowModel, options?: RowContextOptions) => Promise<DataQueryResponse>;
+  getRowContext: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>;
   children: (props: {
     result: LogRowContextRows;
     errors: LogRowContextQueryErrors;
@@ -50,7 +50,7 @@ interface LogRowContextProviderProps {
 }
 
 export const getRowContexts = async (
-  getRowContext: (row: LogRowModel, options?: RowContextOptions) => Promise<DataQueryResponse>,
+  getRowContext: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>,
   row: LogRowModel,
   limit: number,
   logsSortOrder?: LogsSortOrder | null
@@ -62,7 +62,7 @@ export const getRowContexts = async (
     getRowContext(row, {
       // The start time is inclusive so we will get the one row we are using as context entry
       limit: limit + 1,
-      direction: 'FORWARD',
+      direction: LogRowContextQueryDirection.Forward,
     }),
   ];
 
diff --git a/public/app/features/logs/components/log-context/types.ts b/public/app/features/logs/components/log-context/types.ts
deleted file mode 100644
index 3497156f2c9..00000000000
--- a/public/app/features/logs/components/log-context/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface RowContextOptions {
-  direction?: 'BACKWARD' | 'FORWARD';
-  limit?: number;
-}
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index 118afb69331..1ee0ebd28e9 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -9,6 +9,7 @@ import {
   DataSourceInstanceSettings,
   DataSourceWithLogsContextSupport,
   LoadingState,
+  LogRowContextOptions,
   LogRowModel,
   ScopedVars,
 } from '@grafana/data';
@@ -16,8 +17,6 @@ import { DataSourceWithBackend } from '@grafana/runtime';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
-import { RowContextOptions } from '../../../features/logs/components/log-context/types';
-
 import { CloudWatchAnnotationSupport } from './annotationSupport';
 import { DEFAULT_METRICS_QUERY, getDefaultLogsQuery } from './defaultQueries';
 import { isCloudWatchAnnotationQuery, isCloudWatchLogsQuery, isCloudWatchMetricsQuery } from './guards';
@@ -136,7 +135,7 @@ export class CloudWatchDatasource
 
   getLogRowContext = async (
     row: LogRowModel,
-    context?: RowContextOptions,
+    context?: LogRowContextOptions,
     query?: CloudWatchLogsQuery
   ): Promise<{ data: DataFrame[] }> => {
     return this.logsQueryRunner.getLogRowContext(row, context, query);
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
index 7dd13f85b22..85e6c23d022 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
@@ -8,6 +8,7 @@ import {
   MutableDataFrame,
   dateTime,
   DataQueryRequest,
+  LogRowContextQueryDirection,
 } from '@grafana/data';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
@@ -61,7 +62,11 @@ describe('CloudWatchLogsQueryRunner', () => {
       expect(fetchMock.mock.calls[0][0].data.queries[0].endTime).toBe(4);
       expect(fetchMock.mock.calls[0][0].data.queries[0].region).toBe(undefined);
 
-      await runner.getLogRowContext(row, { direction: 'FORWARD' }, { ...validLogsQuery, region: 'eu-east' });
+      await runner.getLogRowContext(
+        row,
+        { direction: LogRowContextQueryDirection.Forward },
+        { ...validLogsQuery, region: 'eu-east' }
+      );
       expect(fetchMock.mock.calls[1][0].data.queries[0].startTime).toBe(4);
       expect(fetchMock.mock.calls[1][0].data.queries[0].region).toBe('eu-east');
     });
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
index 3dad3cf8401..0f4beed4989 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
@@ -24,6 +24,8 @@ import {
   DataQueryResponse,
   DataSourceInstanceSettings,
   LoadingState,
+  LogRowContextOptions,
+  LogRowContextQueryDirection,
   LogRowModel,
   rangeUtil,
 } from '@grafana/data';
@@ -31,7 +33,6 @@ import { BackendDataSourceResponse, config, FetchError, FetchResponse, toDataQue
 import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 
-import { RowContextOptions } from '../../../../features/logs/components/log-context/types';
 import {
   CloudWatchJsonData,
   CloudWatchLogsQuery,
@@ -325,7 +326,7 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
 
   getLogRowContext = async (
     row: LogRowModel,
-    { limit = 10, direction = 'BACKWARD' }: RowContextOptions = {},
+    { limit = 10, direction = LogRowContextQueryDirection.Backward }: LogRowContextOptions = {},
     query?: CloudWatchLogsQuery
   ): Promise<{ data: DataFrame[] }> => {
     let logStreamField = null;
@@ -347,13 +348,13 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
 
     const requestParams: GetLogEventsRequest = {
       limit,
-      startFromHead: direction !== 'BACKWARD',
+      startFromHead: direction !== LogRowContextQueryDirection.Backward,
       region: query?.region,
       logGroupName: parseLogGroupName(logField!.values.get(row.rowIndex)),
       logStreamName: logStreamField!.values.get(row.rowIndex),
     };
 
-    if (direction === 'BACKWARD') {
+    if (direction === LogRowContextQueryDirection.Backward) {
       requestParams.endTime = row.timeEpochMs;
     } else {
       requestParams.startTime = row.timeEpochMs;
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 612da1585ff..2defa6c8526 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -31,13 +31,14 @@ import {
   rangeUtil,
   Field,
   sortDataFrame,
+  LogRowContextQueryDirection,
+  LogRowContextOptions,
 } from '@grafana/data';
 import { BackendSrvRequest, DataSourceWithBackend, getBackendSrv, getDataSourceSrv, config } from '@grafana/runtime';
 import { queryLogsVolume } from 'app/core/logsModel';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
-import { RowContextOptions } from '../../../features/logs/components/log-context/types';
 import { getLogLevelFromKey } from '../../../features/logs/utils';
 
 import { ElasticResponse } from './ElasticResponse';
@@ -500,7 +501,7 @@ export class ElasticDatasource
     return true;
   }
 
-  getLogRowContext = async (row: LogRowModel, options?: RowContextOptions): Promise<{ data: DataFrame[] }> => {
+  getLogRowContext = async (row: LogRowModel, options?: LogRowContextOptions): Promise<{ data: DataFrame[] }> => {
     const { disableElasticsearchBackendQuerying } = config.featureToggles;
     if (!disableElasticsearchBackendQuerying) {
       const contextRequest = this.makeLogContextDataRequest(row, options);
@@ -523,10 +524,10 @@ export class ElasticDatasource
     } else {
       const sortField = row.dataFrame.fields.find((f) => f.name === 'sort');
       const searchAfter = sortField?.values.get(row.rowIndex) || [row.timeEpochMs];
-      const sort = options?.direction === 'FORWARD' ? 'asc' : 'desc';
+      const sort = options?.direction === LogRowContextQueryDirection.Forward ? 'asc' : 'desc';
 
       const header =
-        options?.direction === 'FORWARD'
+        options?.direction === LogRowContextQueryDirection.Forward
           ? this.getQueryHeader('query_then_fetch', dateTime(row.timeEpochMs))
           : this.getQueryHeader('query_then_fetch', undefined, dateTime(row.timeEpochMs));
 
@@ -539,7 +540,7 @@ export class ElasticDatasource
               {
                 range: {
                   [this.timeField]: {
-                    [options?.direction === 'FORWARD' ? 'gte' : 'lte']: row.timeEpochMs,
+                    [options?.direction === LogRowContextQueryDirection.Forward ? 'gte' : 'lte']: row.timeEpochMs,
                     format: 'epoch_millis',
                   },
                 },
@@ -1109,15 +1110,15 @@ export class ElasticDatasource
     return freshDatabaseVersion;
   }
 
-  private makeLogContextDataRequest = (row: LogRowModel, options?: RowContextOptions) => {
-    const direction = options?.direction || 'BACKWARD';
+  private makeLogContextDataRequest = (row: LogRowModel, options?: LogRowContextOptions) => {
+    const direction = options?.direction || LogRowContextQueryDirection.Backward;
     const logQuery: Logs = {
       type: 'logs',
       id: '1',
       settings: {
         limit: options?.limit ? options?.limit.toString() : '10',
         // Sorting of results in the context query
-        sortDirection: direction === 'BACKWARD' ? 'desc' : 'asc',
+        sortDirection: direction === LogRowContextQueryDirection.Backward ? 'desc' : 'asc',
         // Used to get the next log lines before/after the current log line using sort field of selected log line
         searchAfter: row.dataFrame.fields.find((f) => f.name === 'sort')?.values.get(row.rowIndex) ?? [row.timeEpochMs],
       },
@@ -1266,7 +1267,7 @@ function createContextTimeRange(rowTimeEpochMs: number, direction: string, inter
   // For log context, we want to request data from 7 subsequent/previous indices
   if (intervalPattern) {
     const intervalInfo = intervalMap[intervalPattern];
-    if (direction === 'FORWARD') {
+    if (direction === LogRowContextQueryDirection.Forward) {
       return {
         from: dateTime(rowTimeEpochMs).utc(),
         to: dateTime(rowTimeEpochMs).add(offset, intervalInfo.amount).utc().startOf(intervalInfo.startOf),
@@ -1279,7 +1280,7 @@ function createContextTimeRange(rowTimeEpochMs: number, direction: string, inter
     }
     // If we don't have an interval pattern, we can't do this, so we just request data from 7h before/after
   } else {
-    if (direction === 'FORWARD') {
+    if (direction === LogRowContextQueryDirection.Forward) {
       return {
         from: dateTime(rowTimeEpochMs).utc(),
         to: dateTime(rowTimeEpochMs).add(offset, 'hours').utc(),
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
index 26a4989059e..6a494ef8b79 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
@@ -1,4 +1,4 @@
-import { FieldType, LogRowModel, MutableDataFrame } from '@grafana/data';
+import { FieldType, LogRowContextQueryDirection, LogRowModel, MutableDataFrame } from '@grafana/data';
 
 import LokiLanguageProvider from './LanguageProvider';
 import { LogContextProvider } from './LogContextProvider';
@@ -47,14 +47,18 @@ describe('new context ui', () => {
 describe('prepareLogRowContextQueryTarget', () => {
   const lcp = new LogContextProvider(defaultLanguageProviderMock);
   it('creates query with only labels from /labels API', async () => {
-    const contextQuery = await lcp.prepareLogRowContextQueryTarget(defaultLogRow, 10, 'BACKWARD');
+    const contextQuery = await lcp.prepareLogRowContextQueryTarget(
+      defaultLogRow,
+      10,
+      LogRowContextQueryDirection.Backward
+    );
 
     expect(contextQuery.query.expr).toContain('uniqueParsedLabel');
     expect(contextQuery.query.expr).not.toContain('baz');
   });
 
   it('should call languageProvider.start to fetch labels', async () => {
-    await lcp.prepareLogRowContextQueryTarget(defaultLogRow, 10, 'BACKWARD');
+    await lcp.prepareLogRowContextQueryTarget(defaultLogRow, 10, LogRowContextQueryDirection.Backward);
     expect(lcp.languageProvider.start).toBeCalled();
   });
 });
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
index 7549e6dede3..f8dedc90c3b 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -1,4 +1,4 @@
-import { FieldCache, FieldType, LogRowModel, TimeRange, toUtc } from '@grafana/data';
+import { FieldCache, FieldType, LogRowContextQueryDirection, LogRowModel, TimeRange, toUtc } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 
 import LokiLanguageProvider from './LanguageProvider';
@@ -20,14 +20,15 @@ export class LogContextProvider {
   async prepareLogRowContextQueryTarget(
     row: LogRowModel,
     limit: number,
-    direction: 'BACKWARD' | 'FORWARD',
+    direction: LogRowContextQueryDirection,
     origQuery?: DataQuery
   ): Promise<{ query: LokiQuery; range: TimeRange }> {
     let expr = await this.prepareContextExpr(row, origQuery);
 
     const contextTimeBuffer = 2 * 60 * 60 * 1000; // 2h buffer
 
-    const queryDirection = direction === 'FORWARD' ? LokiQueryDirection.Forward : LokiQueryDirection.Backward;
+    const queryDirection =
+      direction === LogRowContextQueryDirection.Forward ? LokiQueryDirection.Forward : LokiQueryDirection.Backward;
 
     const query: LokiQuery = {
       expr,
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 06f1c31092b..527ba30ca42 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -31,6 +31,8 @@ import {
   rangeUtil,
   ScopedVars,
   TimeRange,
+  LogRowContextOptions,
+  LogRowContextQueryDirection,
 } from '@grafana/data';
 import { BackendSrvRequest, config, DataSourceWithBackend, FetchError } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
@@ -40,7 +42,6 @@ import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
 import { serializeParams } from '../../../core/utils/fetch';
-import { RowContextOptions } from '../../../features/logs/components/log-context/types';
 import { getLogLevelFromKey } from '../../../features/logs/utils';
 import { renderLegendFormat } from '../prometheus/legend';
 import { replaceVariables, returnVariables } from '../prometheus/querybuilder/shared/parsingUtils';
@@ -646,10 +647,10 @@ export class LokiDatasource
 
   getLogRowContext = async (
     row: LogRowModel,
-    options?: RowContextOptions,
+    options?: LogRowContextOptions,
     origQuery?: DataQuery
   ): Promise<{ data: DataFrame[] }> => {
-    const direction = (options && options.direction) || 'BACKWARD';
+    const direction = (options && options.direction) || LogRowContextQueryDirection.Backward;
     const limit = (options && options.limit) || 10;
     const { query, range } = await this.logContextProvider.prepareLogRowContextQueryTarget(
       row,
diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts
index 607c376bf8e..7b0261ee56c 100644
--- a/public/app/plugins/datasource/loki/types.ts
+++ b/public/app/plugins/datasource/loki/types.ts
@@ -8,7 +8,7 @@ export interface LokiInstantQueryRequest {
   query: string;
   limit?: number;
   time?: string;
-  direction?: 'BACKWARD' | 'FORWARD';
+  direction?: LokiQueryDirection;
 }
 
 export interface LokiRangeQueryRequest {
@@ -17,7 +17,7 @@ export interface LokiRangeQueryRequest {
   start?: number;
   end?: number;
   step?: number;
-  direction?: 'BACKWARD' | 'FORWARD';
+  direction?: LokiQueryDirection;
 }
 
 export enum LokiResultType {

From 93c252e0fec2b655b0aeb8cd45a23ba23adc0874 Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Thu, 13 Apr 2023 13:07:45 +0200
Subject: [PATCH 099/729] Docs: Add docs for [plugin.plugin_id].tracing config
 key (#65900)

* Docs: Add docs for [plugin.plugin_id].tracing config key

* Docs: Changes after PR review

* PR review changes

* PR review changes
---
 .../setup-grafana/configure-grafana/_index.md      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md
index 9f269675b3d..3f61ed8b758 100644
--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -2020,6 +2020,20 @@ ha_engine_address = 127.0.0.1:6379
 
 <hr>
 
+## [plugin.plugin_id]
+
+This section can be used to configure plugin-specific settings. Replace the `plugin_id` attribute with the plugin ID present in `plugin.json`.
+
+Properties described in this section are available for all plugins, but you must set them individually for each plugin.
+
+### tracing
+
+> **Note**: Available in Grafana v9.5.0 or later, and [OpenTelemetry must be configured as well](#tracingopentelemetry).
+
+If `true`, propagate the tracing context to the plugin backend and enable tracing (if the backend supports it).
+
+<hr>
+
 ## [plugin.grafana-image-renderer]
 
 For more information, refer to [Image rendering]({{< relref "../image-rendering/" >}}).

From 83289065f6591b2a456457e00438d6d636e18f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Thu, 13 Apr 2023 13:32:09 +0200
Subject: [PATCH 100/729] GrafanaData: Remove obsolete logs exports (#66271)

* grafana-data: removed obsolete logs exports

* updated betterer checksums
---
 .betterer.results                            |   4 -
 packages/grafana-data/src/types/logs.ts      |  29 --
 packages/grafana-data/src/utils/index.ts     |   1 -
 packages/grafana-data/src/utils/logs.test.ts | 372 -------------------
 packages/grafana-data/src/utils/logs.ts      | 246 ------------
 5 files changed, 652 deletions(-)
 delete mode 100644 packages/grafana-data/src/utils/logs.test.ts
 delete mode 100644 packages/grafana-data/src/utils/logs.ts

diff --git a/.betterer.results b/.betterer.results
index 9d49a248460..c904362ac2d 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -613,10 +613,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
-    "packages/grafana-data/src/utils/logs.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
     "packages/grafana-data/src/utils/testdata/testTheme.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts
index 5e0d078a4b2..9ad6d49ef04 100644
--- a/packages/grafana-data/src/types/logs.ts
+++ b/packages/grafana-data/src/types/logs.ts
@@ -103,35 +103,6 @@ export interface LogLabelStatsModel {
   value: string;
 }
 
-/** @deprecated will be removed in the next major version */
-export interface LogsParser {
-  /**
-   * Value-agnostic matcher for a field label.
-   * Used to filter rows, and first capture group contains the value.
-   */
-  buildMatcher: (label: string) => RegExp;
-
-  /**
-   * Returns all parsable substrings from a line, used for highlighting
-   */
-  getFields: (line: string) => string[];
-
-  /**
-   * Gets the label name from a parsable substring of a line
-   */
-  getLabelFromField: (field: string) => string;
-
-  /**
-   * Gets the label value from a parsable substring of a line
-   */
-  getValueFromField: (field: string) => string;
-  /**
-   * Function to verify if this is a valid parser for the given line.
-   * The parser accepts the line if it returns true.
-   */
-  test: (line: string) => boolean;
-}
-
 export enum LogsDedupDescription {
   none = 'No de-duplication',
   exact = 'De-duplication of successive lines that are identical, ignoring ISO datetimes.',
diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts
index 5df29eb910b..53b6c632d5f 100644
--- a/packages/grafana-data/src/utils/index.ts
+++ b/packages/grafana-data/src/utils/index.ts
@@ -4,7 +4,6 @@ export * from './Registry';
 export * from './datasource';
 export * from './deprecationWarning';
 export * from './csv';
-export * from './logs';
 export * from './labels';
 export * from './numbers';
 export * from './object';
diff --git a/packages/grafana-data/src/utils/logs.test.ts b/packages/grafana-data/src/utils/logs.test.ts
deleted file mode 100644
index f4c9966e981..00000000000
--- a/packages/grafana-data/src/utils/logs.test.ts
+++ /dev/null
@@ -1,372 +0,0 @@
-import { MutableDataFrame } from '../dataframe/MutableDataFrame';
-import { Labels } from '../types/data';
-import { LogLevel, LogsModel, LogRowModel, LogsSortOrder } from '../types/logs';
-
-import {
-  getLogLevel,
-  calculateLogsLabelStats,
-  calculateFieldStats,
-  getParser,
-  LogsParsers,
-  calculateStats,
-  getLogLevelFromKey,
-  sortLogsResult,
-  checkLogsError,
-} from './logs';
-
-describe('getLoglevel()', () => {
-  it('returns no log level on empty line', () => {
-    expect(getLogLevel('')).toBe(LogLevel.unknown);
-  });
-
-  it('returns no log level on when level is part of a word', () => {
-    expect(getLogLevel('who warns us')).toBe(LogLevel.unknown);
-  });
-
-  it('returns same log level for long and short version', () => {
-    expect(getLogLevel('[Warn]')).toBe(LogLevel.warning);
-    expect(getLogLevel('[Warning]')).toBe(LogLevel.warning);
-    expect(getLogLevel('[Warn]')).toBe('warning');
-  });
-
-  it('returns correct log level when level is capitalized', () => {
-    expect(getLogLevel('WARN')).toBe(LogLevel.warn);
-  });
-
-  it('returns log level on line contains a log level', () => {
-    expect(getLogLevel('warn: it is looking bad')).toBe(LogLevel.warn);
-    expect(getLogLevel('2007-12-12 12:12:12 [WARN]: it is looking bad')).toBe(LogLevel.warn);
-  });
-
-  it('returns first log level found', () => {
-    expect(getLogLevel('WARN this could be a debug message')).toBe(LogLevel.warn);
-    expect(getLogLevel('WARN this is a non-critical message')).toBe(LogLevel.warn);
-  });
-});
-
-describe('getLogLevelFromKey()', () => {
-  it('returns correct log level', () => {
-    expect(getLogLevelFromKey('info')).toBe(LogLevel.info);
-  });
-  it('returns correct log level when level is capitalized', () => {
-    expect(getLogLevelFromKey('INFO')).toBe(LogLevel.info);
-  });
-  it('returns unknown log level when level is integer', () => {
-    expect(getLogLevelFromKey(1)).toBe(LogLevel.unknown);
-  });
-});
-
-describe('calculateLogsLabelStats()', () => {
-  test('should return no stats for empty rows', () => {
-    expect(calculateLogsLabelStats([], '')).toEqual([]);
-  });
-
-  test('should return no stats of label is not found', () => {
-    const rows = [
-      {
-        entry: 'foo 1',
-        labels: {
-          foo: 'bar',
-        } as Labels,
-      },
-    ] as LogRowModel[];
-
-    expect(calculateLogsLabelStats(rows, 'baz')).toEqual([]);
-  });
-
-  test('should return stats for found labels', () => {
-    const rows = [
-      {
-        entry: 'foo 1',
-        labels: {
-          foo: 'bar',
-        } as Labels,
-      },
-      {
-        entry: 'foo 0',
-        labels: {
-          foo: 'xxx',
-        } as Labels,
-      },
-      {
-        entry: 'foo 2',
-        labels: {
-          foo: 'bar',
-        } as Labels,
-      },
-    ] as LogRowModel[];
-
-    expect(calculateLogsLabelStats(rows, 'foo')).toMatchObject([
-      {
-        value: 'bar',
-        count: 2,
-      },
-      {
-        value: 'xxx',
-        count: 1,
-      },
-    ]);
-  });
-});
-
-describe('LogsParsers', () => {
-  describe('logfmt', () => {
-    const parser = LogsParsers.logfmt;
-
-    test('should detect format', () => {
-      expect(parser.test('foo')).toBeFalsy();
-      expect(parser.test('foo=bar')).toBeTruthy();
-    });
-
-    test('should return detected fields', () => {
-      expect(
-        parser.getFields(
-          'foo=bar baz="42 + 1" msg="[resolver] received A record \\"127.0.0.1\\" for \\"localhost.\\" from udp:192.168.65.1" time(ms)=50 label{foo}=bar'
-        )
-      ).toEqual([
-        'foo=bar',
-        'baz="42 + 1"',
-        'msg="[resolver] received A record \\"127.0.0.1\\" for \\"localhost.\\" from udp:192.168.65.1"',
-        'time(ms)=50',
-        'label{foo}=bar',
-      ]);
-    });
-
-    test('should return label for field', () => {
-      expect(parser.getLabelFromField('foo=bar')).toBe('foo');
-      expect(parser.getLabelFromField('time(ms)=50')).toBe('time(ms)');
-    });
-
-    test('should return value for field', () => {
-      expect(parser.getValueFromField('foo=bar')).toBe('bar');
-      expect(parser.getValueFromField('time(ms)=50')).toBe('50');
-      expect(
-        parser.getValueFromField(
-          'msg="[resolver] received A record \\"127.0.0.1\\" for \\"localhost.\\" from udp:192.168.65.1"'
-        )
-      ).toBe('"[resolver] received A record \\"127.0.0.1\\" for \\"localhost.\\" from udp:192.168.65.1"');
-    });
-
-    test('should build a valid value matcher', () => {
-      const matcher = parser.buildMatcher('foo');
-      const match = 'foo=bar'.match(matcher);
-      expect(match).toBeDefined();
-      expect(match![1]).toBe('bar');
-    });
-
-    test('should build a valid complex value matcher', () => {
-      const matcher = parser.buildMatcher('time(ms)');
-      const match = 'time(ms)=50'.match(matcher);
-      expect(match).toBeDefined();
-      expect(match![1]).toBe('50');
-    });
-  });
-
-  describe('JSON', () => {
-    const parser = LogsParsers.JSON;
-
-    test('should detect format', () => {
-      expect(parser.test('foo')).toBeFalsy();
-      expect(parser.test('"foo"')).toBeFalsy();
-      expect(parser.test('{"foo":"bar"}')).toBeTruthy();
-    });
-
-    test('should return detected fields', () => {
-      expect(parser.getFields('{ "foo" : "bar", "baz" : 42 }')).toEqual(['"foo":"bar"', '"baz":42']);
-    });
-
-    test('should return detected fields for nested quotes', () => {
-      expect(parser.getFields(`{"foo":"bar: '[value=\\"42\\"]'"}`)).toEqual([`"foo":"bar: '[value=\\"42\\"]'"`]);
-    });
-
-    test('should return label for field', () => {
-      expect(parser.getLabelFromField('"foo" : "bar"')).toBe('foo');
-      expect(parser.getLabelFromField('"docker.memory.fail.count":0')).toBe('docker.memory.fail.count');
-    });
-
-    test('should return value for field', () => {
-      expect(parser.getValueFromField('"foo" : "bar"')).toBe('"bar"');
-      expect(parser.getValueFromField('"foo" : 42')).toBe('42');
-      expect(parser.getValueFromField('"foo" : 42.1')).toBe('42.1');
-    });
-
-    test('should build a valid value matcher for strings', () => {
-      const matcher = parser.buildMatcher('foo');
-      const match = '{"foo":"bar"}'.match(matcher);
-      expect(match).toBeDefined();
-      expect(match![1]).toBe('bar');
-    });
-
-    test('should build a valid value matcher for integers', () => {
-      const matcher = parser.buildMatcher('foo');
-      const match = '{"foo":42.1}'.match(matcher);
-      expect(match).toBeDefined();
-      expect(match![1]).toBe('42.1');
-    });
-  });
-});
-
-describe('calculateFieldStats()', () => {
-  test('should return no stats for empty rows', () => {
-    expect(calculateFieldStats([], /foo=(.*)/)).toEqual([]);
-  });
-
-  test('should return no stats if extractor does not match', () => {
-    const rows = [
-      {
-        entry: 'foo=bar',
-      },
-    ] as LogRowModel[];
-
-    expect(calculateFieldStats(rows, /baz=(.*)/)).toEqual([]);
-  });
-
-  test('should return stats for found field', () => {
-    const rows = [
-      {
-        entry: 'foo="42 + 1"',
-      },
-      {
-        entry: 'foo=503 baz=foo',
-      },
-      {
-        entry: 'foo="42 + 1"',
-      },
-      {
-        entry: 't=2018-12-05T07:44:59+0000 foo=503',
-      },
-    ] as LogRowModel[];
-
-    expect(calculateFieldStats(rows, /foo=("[^"]*"|\S+)/)).toMatchObject([
-      {
-        value: '"42 + 1"',
-        count: 2,
-      },
-      {
-        value: '503',
-        count: 2,
-      },
-    ]);
-  });
-});
-
-describe('calculateStats()', () => {
-  test('should return no stats for empty array', () => {
-    expect(calculateStats([])).toEqual([]);
-  });
-
-  test('should return correct stats', () => {
-    const values = ['one', 'one', null, undefined, 'two'];
-    expect(calculateStats(values)).toMatchObject([
-      {
-        value: 'one',
-        count: 2,
-        proportion: 2 / 3,
-      },
-      {
-        value: 'two',
-        count: 1,
-        proportion: 1 / 3,
-      },
-    ]);
-  });
-});
-
-describe('getParser()', () => {
-  test('should return no parser on empty line', () => {
-    expect(getParser('')).toBeUndefined();
-  });
-
-  test('should return no parser on unknown line pattern', () => {
-    expect(getParser('To Be or not to be')).toBeUndefined();
-  });
-
-  test('should return logfmt parser on key value patterns', () => {
-    expect(getParser('foo=bar baz="41 + 1')).toEqual(LogsParsers.logfmt);
-  });
-
-  test('should return JSON parser on JSON log lines', () => {
-    // TODO implement other JSON value types than string
-    expect(getParser('{"foo": "bar", "baz": "41 + 1"}')).toEqual(LogsParsers.JSON);
-  });
-});
-
-describe('sortLogsResult', () => {
-  const firstRow: LogRowModel = {
-    rowIndex: 0,
-    entryFieldIndex: 0,
-    dataFrame: new MutableDataFrame(),
-    entry: '',
-    hasAnsi: false,
-    hasUnescapedContent: false,
-    labels: {},
-    logLevel: LogLevel.info,
-    raw: '',
-    timeEpochMs: 0,
-    timeEpochNs: '0',
-    timeFromNow: '',
-    timeLocal: '',
-    timeUtc: '',
-    uid: '1',
-  };
-  const sameAsFirstRow = firstRow;
-  const secondRow: LogRowModel = {
-    rowIndex: 1,
-    entryFieldIndex: 0,
-    dataFrame: new MutableDataFrame(),
-    entry: '',
-    hasAnsi: false,
-    hasUnescapedContent: false,
-    labels: {},
-    logLevel: LogLevel.info,
-    raw: '',
-    timeEpochMs: 10,
-    timeEpochNs: '10000000',
-    timeFromNow: '',
-    timeLocal: '',
-    timeUtc: '',
-    uid: '2',
-  };
-
-  describe('when called with LogsSortOrder.Descending', () => {
-    it('then it should sort descending', () => {
-      const logsResult: LogsModel = {
-        rows: [firstRow, sameAsFirstRow, secondRow],
-        hasUniqueLabels: false,
-      };
-      const result = sortLogsResult(logsResult, LogsSortOrder.Descending);
-
-      expect(result).toEqual({
-        rows: [secondRow, firstRow, sameAsFirstRow],
-        hasUniqueLabels: false,
-      });
-    });
-  });
-
-  describe('when called with LogsSortOrder.Ascending', () => {
-    it('then it should sort ascending', () => {
-      const logsResult: LogsModel = {
-        rows: [secondRow, firstRow, sameAsFirstRow],
-        hasUniqueLabels: false,
-      };
-      const result = sortLogsResult(logsResult, LogsSortOrder.Ascending);
-
-      expect(result).toEqual({
-        rows: [firstRow, sameAsFirstRow, secondRow],
-        hasUniqueLabels: false,
-      });
-    });
-  });
-});
-
-describe('checkLogsError()', () => {
-  const log = {
-    labels: {
-      __error__: 'Error Message',
-      foo: 'boo',
-    } as Labels,
-  } as LogRowModel;
-  test('should return correct error if error is present', () => {
-    expect(checkLogsError(log)).toStrictEqual({ hasError: true, errorMessage: 'Error Message' });
-  });
-});
diff --git a/packages/grafana-data/src/utils/logs.ts b/packages/grafana-data/src/utils/logs.ts
deleted file mode 100644
index e9ec99fb66c..00000000000
--- a/packages/grafana-data/src/utils/logs.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import { countBy, chain, escapeRegExp } from 'lodash';
-
-import { DataFrame, FieldType } from '../types/index';
-import { LogLevel, LogRowModel, LogLabelStatsModel, LogsParser, LogsModel, LogsSortOrder } from '../types/logs';
-import { ArrayVector } from '../vector/ArrayVector';
-
-// This matches:
-// first a label from start of the string or first white space, then any word chars until "="
-// second either an empty quotes, or anything that starts with quote and ends with unescaped quote,
-// or any non whitespace chars that do not start with quote
-const LOGFMT_REGEXP = /(?:^|\s)([\w\(\)\[\]\{\}]+)=(""|(?:".*?[^\\]"|[^"\s]\S*))/;
-
-/**
- * Returns the log level of a log line.
- * Parse the line for level words. If no level is found, it returns `LogLevel.unknown`.
- *
- * Example: `getLogLevel('WARN 1999-12-31 this is great') // LogLevel.warn`
- */
-/** @deprecated will be removed in the next major version */
-export function getLogLevel(line: string): LogLevel {
-  if (!line) {
-    return LogLevel.unknown;
-  }
-  let level = LogLevel.unknown;
-  let currentIndex: number | undefined = undefined;
-
-  for (const key of Object.keys(LogLevel)) {
-    const regexp = new RegExp(`\\b${key}\\b`, 'i');
-    const result = regexp.exec(line);
-
-    if (result) {
-      if (currentIndex === undefined || result.index < currentIndex) {
-        level = LogLevel[key as keyof typeof LogLevel];
-        currentIndex = result.index;
-      }
-    }
-  }
-  return level;
-}
-
-/** @deprecated will be removed in the next major version */
-export function getLogLevelFromKey(key: string | number): LogLevel {
-  const level = LogLevel[key.toString().toLowerCase() as keyof typeof LogLevel];
-  if (level) {
-    return level;
-  }
-
-  return LogLevel.unknown;
-}
-
-/** @deprecated will be removed in the next major version */
-export function addLogLevelToSeries(series: DataFrame, lineIndex: number): DataFrame {
-  const levels = new ArrayVector<LogLevel>();
-  const lines = series.fields[lineIndex];
-  for (let i = 0; i < lines.values.length; i++) {
-    const line = lines.values.get(lineIndex);
-    levels.buffer.push(getLogLevel(line));
-  }
-
-  return {
-    ...series, // Keeps Tags, RefID etc
-    fields: [
-      ...series.fields,
-      {
-        name: 'LogLevel',
-        type: FieldType.string,
-        values: levels,
-        config: {},
-      },
-    ],
-  };
-}
-
-/** @deprecated will be removed in the next major version */
-export const LogsParsers: { [name: string]: LogsParser } = {
-  JSON: {
-    buildMatcher: (label) => new RegExp(`(?:{|,)\\s*"${label}"\\s*:\\s*"?([\\d\\.]+|[^"]*)"?`),
-    getFields: (line) => {
-      try {
-        const parsed = JSON.parse(line);
-        return Object.keys(parsed).map((key) => {
-          return `"${key}":${JSON.stringify(parsed[key])}`;
-        });
-      } catch {}
-      return [];
-    },
-    getLabelFromField: (field) => (field.match(/^"([^"]+)"\s*:/) || [])[1],
-    getValueFromField: (field) => (field.match(/:\s*(.*)$/) || [])[1],
-    test: (line) => {
-      let parsed;
-      try {
-        parsed = JSON.parse(line);
-      } catch (error) {}
-      // The JSON parser should only be used for log lines that are valid serialized JSON objects.
-      // If it would be used for a string, detected fields would include each letter as a separate field.
-      return typeof parsed === 'object';
-    },
-  },
-
-  logfmt: {
-    buildMatcher: (label) => new RegExp(`(?:^|\\s)${escapeRegExp(label)}=("[^"]*"|\\S+)`),
-    getFields: (line) => {
-      const fields: string[] = [];
-      line.replace(new RegExp(LOGFMT_REGEXP, 'g'), (substring) => {
-        fields.push(substring.trim());
-        return '';
-      });
-      return fields;
-    },
-    getLabelFromField: (field) => (field.match(LOGFMT_REGEXP) || [])[1],
-    getValueFromField: (field) => (field.match(LOGFMT_REGEXP) || [])[2],
-    test: (line) => LOGFMT_REGEXP.test(line),
-  },
-};
-
-/** @deprecated will be removed in the next major version */
-export function calculateFieldStats(rows: LogRowModel[], extractor: RegExp): LogLabelStatsModel[] {
-  // Consider only rows that satisfy the matcher
-  const rowsWithField = rows.filter((row) => extractor.test(row.entry));
-  const rowCount = rowsWithField.length;
-
-  // Get field value counts for eligible rows
-  const countsByValue = countBy(rowsWithField, (r) => {
-    const row: LogRowModel = r;
-    const match = row.entry.match(extractor);
-
-    return match ? match[1] : null;
-  });
-  return getSortedCounts(countsByValue, rowCount);
-}
-
-/** @deprecated will be removed in the next major version */
-export function calculateLogsLabelStats(rows: LogRowModel[], label: string): LogLabelStatsModel[] {
-  // Consider only rows that have the given label
-  const rowsWithLabel = rows.filter((row) => row.labels[label] !== undefined);
-  const rowCount = rowsWithLabel.length;
-
-  // Get label value counts for eligible rows
-  const countsByValue = countBy(rowsWithLabel, (row) => row.labels[label]);
-  return getSortedCounts(countsByValue, rowCount);
-}
-
-/** @deprecated will be removed in the next major version */
-export function calculateStats(values: unknown[]): LogLabelStatsModel[] {
-  const nonEmptyValues = values.filter((value) => value !== undefined && value !== null);
-  const countsByValue = countBy(nonEmptyValues);
-  return getSortedCounts(countsByValue, nonEmptyValues.length);
-}
-
-const getSortedCounts = (countsByValue: { [value: string]: number }, rowCount: number) => {
-  return chain(countsByValue)
-    .map((count, value) => ({ count, value, proportion: count / rowCount }))
-    .sortBy('count')
-    .reverse()
-    .value();
-};
-
-/** @deprecated will be removed in the next major version */
-export function getParser(line: string): LogsParser | undefined {
-  let parser;
-  try {
-    if (LogsParsers.JSON.test(line)) {
-      parser = LogsParsers.JSON;
-    }
-  } catch (error) {}
-
-  if (!parser && LogsParsers.logfmt.test(line)) {
-    parser = LogsParsers.logfmt;
-  }
-
-  return parser;
-}
-
-/** @deprecated will be removed in the next major version */
-export const sortInAscendingOrder = (a: LogRowModel, b: LogRowModel) => {
-  // compare milliseconds
-  if (a.timeEpochMs < b.timeEpochMs) {
-    return -1;
-  }
-
-  if (a.timeEpochMs > b.timeEpochMs) {
-    return 1;
-  }
-
-  // if milliseconds are equal, compare nanoseconds
-  if (a.timeEpochNs < b.timeEpochNs) {
-    return -1;
-  }
-
-  if (a.timeEpochNs > b.timeEpochNs) {
-    return 1;
-  }
-
-  return 0;
-};
-
-/** @deprecated will be removed in the next major version */
-export const sortInDescendingOrder = (a: LogRowModel, b: LogRowModel) => {
-  // compare milliseconds
-  if (a.timeEpochMs > b.timeEpochMs) {
-    return -1;
-  }
-
-  if (a.timeEpochMs < b.timeEpochMs) {
-    return 1;
-  }
-
-  // if milliseconds are equal, compare nanoseconds
-  if (a.timeEpochNs > b.timeEpochNs) {
-    return -1;
-  }
-
-  if (a.timeEpochNs < b.timeEpochNs) {
-    return 1;
-  }
-
-  return 0;
-};
-
-/** @deprecated will be removed in the next major version */
-export const sortLogsResult = (logsResult: LogsModel | null, sortOrder: LogsSortOrder): LogsModel => {
-  const rows = logsResult ? sortLogRows(logsResult.rows, sortOrder) : [];
-  return logsResult ? { ...logsResult, rows } : { hasUniqueLabels: false, rows };
-};
-
-/** @deprecated will be removed in the next major version */
-export const sortLogRows = (logRows: LogRowModel[], sortOrder: LogsSortOrder) =>
-  sortOrder === LogsSortOrder.Ascending ? logRows.sort(sortInAscendingOrder) : logRows.sort(sortInDescendingOrder);
-
-// Currently supports only error condition in Loki logs
-/** @deprecated will be removed in the next major version */
-export const checkLogsError = (logRow: LogRowModel): { hasError: boolean; errorMessage?: string } => {
-  if (logRow.labels.__error__) {
-    return {
-      hasError: true,
-      errorMessage: logRow.labels.__error__,
-    };
-  }
-  return {
-    hasError: false,
-  };
-};
-
-/** @deprecated will be removed in the next major version */
-export const escapeUnescapedString = (string: string) =>
-  string.replace(/\\r\\n|\\n|\\t|\\r/g, (match: string) => (match.slice(1) === 't' ? '\t' : '\n'));

From fef43fff7bc1e0592eee4efabc898a6189971658 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 13 Apr 2023 13:35:23 +0200
Subject: [PATCH 101/729] Logs: Use `DataQuery` from @grafana/schema (#66403)

Logs: Use `dataQuery` from schema
---
 packages/grafana-data/src/types/logs.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts
index 9ad6d49ef04..85138e44de9 100644
--- a/packages/grafana-data/src/types/logs.ts
+++ b/packages/grafana-data/src/types/logs.ts
@@ -1,9 +1,10 @@
 import { Observable } from 'rxjs';
 
+import { DataQuery } from '@grafana/schema';
+
 import { Labels } from './data';
 import { DataFrame } from './dataFrame';
 import { DataQueryRequest, DataQueryResponse } from './datasource';
-import { DataQuery } from './query';
 import { AbsoluteTimeRange } from './time';
 export { LogsDedupStrategy, LogsSortOrder } from '@grafana/schema';
 

From 2bbf0c9de4afa6ccdf919547b1d19e3f148873ca Mon Sep 17 00:00:00 2001
From: gotjosh <josue.abreu@gmail.com>
Date: Thu, 13 Apr 2023 12:55:42 +0100
Subject: [PATCH 102/729] Alerting: Allow Rules to Schedule to be filtered by
 Rule Group (#59990)

* Alerting: Allow Rules to Schedule to be filtered by Rule Group
---
 pkg/services/ngalert/eval/eval.go             |   2 +-
 pkg/services/ngalert/models/alert_rule.go     |   1 +
 pkg/services/ngalert/store/alert_rule.go      |  72 ++++---
 pkg/services/ngalert/store/alert_rule_test.go | 202 ++++++++++++------
 pkg/services/ngalert/store/testing.go         |  60 ++++++
 pkg/services/ngalert/tests/util.go            |  35 +--
 6 files changed, 243 insertions(+), 129 deletions(-)

diff --git a/pkg/services/ngalert/eval/eval.go b/pkg/services/ngalert/eval/eval.go
index fd9f4b6084b..8311dea2bee 100644
--- a/pkg/services/ngalert/eval/eval.go
+++ b/pkg/services/ngalert/eval/eval.go
@@ -29,7 +29,7 @@ var logger = log.New("ngalert.eval")
 type EvaluatorFactory interface {
 	// Validate validates that the condition is correct. Returns nil if the condition is correct. Otherwise, error that describes the failure
 	Validate(ctx EvaluationContext, condition models.Condition) error
-	// BuildRuleEvaluator build an evaluator pipeline ready to evaluate a rule's query
+	// Create builds an evaluator pipeline ready to evaluate a rule's query
 	Create(ctx EvaluationContext, condition models.Condition) (ConditionEvaluator, error)
 }
 
diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go
index 3628ab14842..5b03f6c6a63 100644
--- a/pkg/services/ngalert/models/alert_rule.go
+++ b/pkg/services/ngalert/models/alert_rule.go
@@ -398,6 +398,7 @@ type CountAlertRulesQuery struct {
 
 type GetAlertRulesForSchedulingQuery struct {
 	PopulateFolders bool
+	RuleGroups      []string
 
 	ResultRules         []*AlertRule
 	ResultFoldersTitles map[string]string
diff --git a/pkg/services/ngalert/store/alert_rule.go b/pkg/services/ngalert/store/alert_rule.go
index 01a57b62d90..04b8c5ac404 100644
--- a/pkg/services/ngalert/store/alert_rule.go
+++ b/pkg/services/ngalert/store/alert_rule.go
@@ -421,38 +421,24 @@ func (st DBstore) GetNamespaceByUID(ctx context.Context, uid string, orgID int64
 	return folder, nil
 }
 
-func (st DBstore) getFilterByOrgsString() (string, []interface{}) {
-	if len(st.Cfg.DisabledOrgs) == 0 {
-		return "", nil
-	}
-	builder := strings.Builder{}
-	builder.WriteString("org_id NOT IN(")
-	idx := len(st.Cfg.DisabledOrgs)
-	args := make([]interface{}, 0, len(st.Cfg.DisabledOrgs))
-	for orgId := range st.Cfg.DisabledOrgs {
-		args = append(args, orgId)
-		builder.WriteString("?")
-		idx--
-		if idx == 0 {
-			builder.WriteString(")")
-			break
-		}
-		builder.WriteString(",")
-	}
-	return builder.String(), args
-}
-
 func (st DBstore) GetAlertRulesKeysForScheduling(ctx context.Context) ([]ngmodels.AlertRuleKeyWithVersion, error) {
 	var result []ngmodels.AlertRuleKeyWithVersion
 	err := st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
-		alertRulesSql := "SELECT org_id, uid, version FROM alert_rule"
-		filter, args := st.getFilterByOrgsString()
-		if filter != "" {
-			alertRulesSql += " WHERE " + filter
+		alertRulesSql := sess.Table("alert_rule").Select("org_id, uid, version")
+		var disabledOrgs []int64
+
+		for orgID := range st.Cfg.DisabledOrgs {
+			disabledOrgs = append(disabledOrgs, orgID)
 		}
-		if err := sess.SQL(alertRulesSql, args...).Find(&result); err != nil {
+
+		if len(disabledOrgs) > 0 {
+			alertRulesSql = alertRulesSql.NotIn("org_id", disabledOrgs)
+		}
+
+		if err := alertRulesSql.Find(&result); err != nil {
 			return err
 		}
+
 		return nil
 	})
 	return result, err
@@ -466,21 +452,29 @@ func (st DBstore) GetAlertRulesForScheduling(ctx context.Context, query *ngmodel
 	}
 	var rules []*ngmodels.AlertRule
 	return st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
-		foldersSql := "SELECT D.uid, D.title FROM dashboard AS D WHERE is_folder IS TRUE AND EXISTS (SELECT 1 FROM alert_rule AS A WHERE D.uid = A.namespace_uid)"
-		alertRulesSql := "SELECT * FROM alert_rule"
-		filter, args := st.getFilterByOrgsString()
-		if filter != "" {
-			foldersSql += " AND " + filter
-			alertRulesSql += " WHERE " + filter
+		var disabledOrgs []int64
+		for orgID := range st.Cfg.DisabledOrgs {
+			disabledOrgs = append(disabledOrgs, orgID)
+		}
+
+		alertRulesSql := sess.Table("alert_rule")
+		if len(disabledOrgs) > 0 {
+			alertRulesSql.NotIn("org_id", disabledOrgs)
+		}
+
+		if len(query.RuleGroups) > 0 {
+			alertRulesSql.In("rule_group", query.RuleGroups)
 		}
 
 		rule := new(ngmodels.AlertRule)
-		rows, err := sess.SQL(alertRulesSql, args...).Rows(rule)
+		rows, err := alertRulesSql.Rows(rule)
 		if err != nil {
 			return fmt.Errorf("failed to fetch alert rules: %w", err)
 		}
 		defer func() {
-			_ = rows.Close()
+			if err := rows.Close(); err != nil {
+				st.Logger.Error("unable to close rows session", "error", err)
+			}
 		}()
 
 		// Deserialize each rule separately in case any of them contain invalid JSON.
@@ -495,8 +489,16 @@ func (st DBstore) GetAlertRulesForScheduling(ctx context.Context, query *ngmodel
 		}
 
 		query.ResultRules = rules
+
 		if query.PopulateFolders {
-			if err := sess.SQL(foldersSql, args...).Find(&folders); err != nil {
+			foldersSql := sess.Table("dashboard").Alias("d").Select("d.uid, d.title").
+				Where("is_folder = ?", st.SQLStore.GetDialect().BooleanStr(true)).
+				And(`EXISTS (SELECT 1 FROM alert_rule a WHERE d.uid = a.namespace_uid)`)
+			if len(disabledOrgs) > 0 {
+				foldersSql.NotIn("org_id", disabledOrgs)
+			}
+
+			if err := foldersSql.Find(&folders); err != nil {
 				return fmt.Errorf("failed to fetch a list of folders that contain alert rules: %w", err)
 			}
 			query.ResultFoldersTitles = make(map[string]string, len(folders))
diff --git a/pkg/services/ngalert/store/alert_rule_test.go b/pkg/services/ngalert/store/alert_rule_test.go
index fb03060a063..7bc13cafd57 100644
--- a/pkg/services/ngalert/store/alert_rule_test.go
+++ b/pkg/services/ngalert/store/alert_rule_test.go
@@ -7,7 +7,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/user"
+
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/rand"
 
@@ -21,12 +28,13 @@ func TestIntegrationUpdateAlertRules(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	cfg := setting.NewCfg()
+	cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{BaseInterval: time.Duration(rand.Int63n(100)) * time.Second}
 	sqlStore := db.InitTestDB(t)
 	store := &DBstore{
-		SQLStore: sqlStore,
-		Cfg: setting.UnifiedAlertingSettings{
-			BaseInterval: time.Duration(rand.Int63n(100)) * time.Second,
-		},
+		SQLStore:      sqlStore,
+		Cfg:           cfg.UnifiedAlerting,
+		FolderService: setupFolderService(t, sqlStore, cfg),
 	}
 
 	t.Run("should increase version", func(t *testing.T) {
@@ -68,6 +76,97 @@ func TestIntegrationUpdateAlertRules(t *testing.T) {
 	})
 }
 
+func TestIntegration_GetAlertRulesForScheduling(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	cfg := setting.NewCfg()
+	cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{
+		BaseInterval: time.Duration(rand.Int63n(100)) * time.Second,
+	}
+
+	sqlStore := db.InitTestDB(t)
+	store := &DBstore{
+		SQLStore: sqlStore,
+		Cfg: setting.UnifiedAlertingSettings{
+			BaseInterval: time.Duration(rand.Int63n(100)) * time.Second,
+		},
+		FolderService: setupFolderService(t, sqlStore, cfg),
+	}
+
+	rule1 := createRule(t, store)
+	rule2 := createRule(t, store)
+
+	tc := []struct {
+		name         string
+		rules        []string
+		ruleGroups   []string
+		disabledOrgs []int64
+		folders      map[string]string
+	}{
+		{
+			name:  "without a rule group filter, it returns all created rules",
+			rules: []string{rule1.Title, rule2.Title},
+		},
+		{
+			name:       "with a rule group filter, it only returns the rules that match on rule group",
+			ruleGroups: []string{rule1.RuleGroup},
+			rules:      []string{rule1.Title},
+		},
+		{
+			name:         "with a filter on orgs, it returns rules that do not belong to that org",
+			rules:        []string{rule1.Title},
+			disabledOrgs: []int64{rule2.OrgID},
+		},
+		{
+			name:    "with populate folders enabled, it returns them",
+			rules:   []string{rule1.Title, rule2.Title},
+			folders: map[string]string{rule1.NamespaceUID: rule1.Title, rule2.NamespaceUID: rule2.Title},
+		},
+		{
+			name:         "with populate folders enabled and a filter on orgs, it only returns selected information",
+			rules:        []string{rule1.Title},
+			disabledOrgs: []int64{rule2.OrgID},
+			folders:      map[string]string{rule1.NamespaceUID: rule1.Title},
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			if len(tt.disabledOrgs) > 0 {
+				store.Cfg.DisabledOrgs = map[int64]struct{}{}
+
+				for _, orgID := range tt.disabledOrgs {
+					store.Cfg.DisabledOrgs[orgID] = struct{}{}
+					t.Cleanup(func() {
+						delete(store.Cfg.DisabledOrgs, orgID)
+					})
+				}
+			}
+
+			populateFolders := len(tt.folders) > 0
+			query := &models.GetAlertRulesForSchedulingQuery{
+				RuleGroups:      tt.ruleGroups,
+				PopulateFolders: populateFolders,
+			}
+			require.NoError(t, store.GetAlertRulesForScheduling(context.Background(), query))
+			require.Len(t, query.ResultRules, len(tt.rules))
+
+			r := make([]string, 0, len(query.ResultRules))
+			for _, rule := range query.ResultRules {
+				r = append(r, rule.Title)
+			}
+
+			require.ElementsMatch(t, r, tt.rules)
+
+			if populateFolders {
+				require.Equal(t, tt.folders, query.ResultFoldersTitles)
+			}
+		})
+	}
+}
+
 func withIntervalMatching(baseInterval time.Duration) func(*models.AlertRule) {
 	return func(rule *models.AlertRule) {
 		rule.IntervalSeconds = int64(baseInterval.Seconds()) * rand.Int63n(10)
@@ -75,68 +174,14 @@ func withIntervalMatching(baseInterval time.Duration) func(*models.AlertRule) {
 	}
 }
 
-func TestIntegration_getFilterByOrgsString(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	testCases := []struct {
-		testName       string
-		orgs           map[int64]struct{}
-		expectedFilter string
-		expectedArgs   []interface{}
-	}{
-		{
-			testName:       "should return empty string if map is empty",
-			orgs:           map[int64]struct{}{},
-			expectedFilter: "",
-			expectedArgs:   nil,
-		},
-		{
-			testName:       "should return empty string if map is nil",
-			orgs:           nil,
-			expectedFilter: "",
-			expectedArgs:   nil,
-		},
-		{
-			testName: "should return correct filter if single element",
-			orgs: map[int64]struct{}{
-				1: {},
-			},
-			expectedFilter: "org_id NOT IN(?)",
-			expectedArgs:   []interface{}{int64(1)},
-		},
-		{
-			testName: "should return correct filter if many elements",
-			orgs: map[int64]struct{}{
-				1: {},
-				2: {},
-				3: {},
-			},
-			expectedFilter: "org_id NOT IN(?,?,?)",
-			expectedArgs:   []interface{}{int64(1), int64(2), int64(3)},
-		},
-	}
-	for _, testCase := range testCases {
-		t.Run(testCase.testName, func(t *testing.T) {
-			store := &DBstore{
-				Cfg: setting.UnifiedAlertingSettings{
-					DisabledOrgs: testCase.orgs,
-				},
-			}
-			filter, args := store.getFilterByOrgsString()
-			assert.Equal(t, testCase.expectedFilter, filter)
-			assert.ElementsMatch(t, testCase.expectedArgs, args)
-		})
-	}
-}
-
 func TestIntegration_CountAlertRules(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
 
 	sqlStore := db.InitTestDB(t)
-	store := &DBstore{SQLStore: sqlStore}
+	cfg := setting.NewCfg()
+	store := &DBstore{SQLStore: sqlStore, FolderService: setupFolderService(t, sqlStore, cfg)}
 	rule := createRule(t, store)
 
 	tests := map[string]struct {
@@ -176,7 +221,9 @@ func TestIntegration_CountAlertRules(t *testing.T) {
 }
 
 func createRule(t *testing.T, store *DBstore) *models.AlertRule {
+	t.Helper()
 	rule := models.AlertRuleGen(withIntervalMatching(store.Cfg.BaseInterval), models.WithUniqueID())()
+	createFolder(t, store, rule.NamespaceUID, rule.Title, rule.OrgID)
 	err := store.SQLStore.WithDbSession(context.Background(), func(sess *db.Session) error {
 		_, err := sess.Table(models.AlertRule{}).InsertOne(rule)
 		if err != nil {
@@ -191,8 +238,41 @@ func createRule(t *testing.T, store *DBstore) *models.AlertRule {
 			return errors.New("cannot read inserted record")
 		}
 		rule = dbRule
+
+		require.NoError(t, err)
+
 		return nil
 	})
 	require.NoError(t, err)
+
 	return rule
 }
+
+func createFolder(t *testing.T, store *DBstore, namespace, title string, orgID int64) {
+	t.Helper()
+	u := &user.SignedInUser{
+		UserID:         1,
+		OrgID:          orgID,
+		OrgRole:        org.RoleAdmin,
+		IsGrafanaAdmin: true,
+	}
+
+	_, err := store.FolderService.Create(context.Background(), &folder.CreateFolderCommand{
+		UID:          namespace,
+		OrgID:        orgID,
+		Title:        title,
+		Description:  "",
+		SignedInUser: u,
+	})
+
+	require.NoError(t, err)
+}
+
+func setupFolderService(t *testing.T, sqlStore *sqlstore.SQLStore, cfg *setting.Cfg) folder.Service {
+	tracer := tracing.InitializeTracerForTest()
+	inProcBus := bus.ProvideBus(tracer)
+	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	_, dashboardStore := SetupDashboardService(t, sqlStore, folderStore, cfg)
+
+	return SetupFolderService(t, cfg, dashboardStore, folderStore, inProcBus)
+}
diff --git a/pkg/services/ngalert/store/testing.go b/pkg/services/ngalert/store/testing.go
index 51770c100ce..6d3af7bf618 100644
--- a/pkg/services/ngalert/store/testing.go
+++ b/pkg/services/ngalert/store/testing.go
@@ -6,7 +6,25 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/database"
+	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
+	"github.com/grafana/grafana/pkg/services/folder/foldertest"
+	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/quota/quotatest"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 func NewFakeImageStore(t *testing.T) *FakeImageStore {
@@ -100,3 +118,45 @@ func (f *FakeAdminConfigStore) UpdateAdminConfiguration(cmd UpdateAdminConfigura
 
 	return nil
 }
+
+func SetupFolderService(tb testing.TB, cfg *setting.Cfg, dashboardStore dashboards.Store, folderStore *folderimpl.DashboardFolderStoreImpl, bus *bus.InProcBus) folder.Service {
+	tb.Helper()
+
+	ac := acmock.New()
+	features := featuremgmt.WithFeatures()
+
+	return folderimpl.ProvideService(ac, bus, cfg, dashboardStore, folderStore, nil, features)
+}
+
+func SetupDashboardService(tb testing.TB, sqlStore *sqlstore.SQLStore, fs *folderimpl.DashboardFolderStoreImpl, cfg *setting.Cfg) (*dashboardservice.DashboardServiceImpl, dashboards.Store) {
+	tb.Helper()
+
+	origNewGuardian := guardian.New
+	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{
+		CanSaveValue:  true,
+		CanViewValue:  true,
+		CanAdminValue: true,
+	})
+	tb.Cleanup(func() {
+		guardian.New = origNewGuardian
+	})
+
+	ac := acmock.New()
+	dashboardPermissions := acmock.NewMockedPermissionsService()
+	folderPermissions := acmock.NewMockedPermissionsService()
+	folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
+
+	features := featuremgmt.WithFeatures()
+	quotaService := quotatest.New(false, nil)
+
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+	dashboardService := dashboardservice.ProvideDashboardServiceImpl(
+		cfg, dashboardStore, fs, nil,
+		features, folderPermissions, dashboardPermissions, ac,
+		foldertest.NewFakeService(),
+	)
+
+	require.NoError(tb, err)
+
+	return dashboardService, dashboardStore
+}
diff --git a/pkg/services/ngalert/tests/util.go b/pkg/services/ngalert/tests/util.go
index b31f93d8cf5..f04dcf9d408 100644
--- a/pkg/services/ngalert/tests/util.go
+++ b/pkg/services/ngalert/tests/util.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/api/routing"
@@ -19,17 +18,12 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
 	"github.com/grafana/grafana/pkg/services/dashboards"
-	databasestore "github.com/grafana/grafana/pkg/services/dashboards/database"
-	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
-	"github.com/grafana/grafana/pkg/services/folder/foldertest"
-	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/ngalert"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -38,7 +32,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/secrets/database"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
-	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -47,15 +40,6 @@ import (
 // SetupTestEnv initializes a store to used by the tests.
 func SetupTestEnv(tb testing.TB, baseInterval time.Duration) (*ngalert.AlertNG, *store.DBstore) {
 	tb.Helper()
-	origNewGuardian := guardian.New
-	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{
-		CanSaveValue:  true,
-		CanViewValue:  true,
-		CanAdminValue: true,
-	})
-	tb.Cleanup(func() {
-		guardian.New = origNewGuardian
-	})
 
 	cfg := setting.NewCfg()
 	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
@@ -69,27 +53,14 @@ func SetupTestEnv(tb testing.TB, baseInterval time.Duration) (*ngalert.AlertNG,
 	m := metrics.NewNGAlert(prometheus.NewRegistry())
 	sqlStore := db.InitTestDB(tb)
 	secretsService := secretsManager.SetupTestService(tb, database.ProvideSecretsStore(sqlStore))
-	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := databasestore.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
-	require.NoError(tb, err)
 
 	ac := acmock.New()
-	features := featuremgmt.WithFeatures()
-	folderPermissions := acmock.NewMockedPermissionsService()
-	folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
-	dashboardPermissions := acmock.NewMockedPermissionsService()
-
-	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-
-	dashboardService := dashboardservice.ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, nil,
-		features, folderPermissions, dashboardPermissions, ac,
-		foldertest.NewFakeService(),
-	)
 
 	tracer := tracing.InitializeTracerForTest()
 	bus := bus.ProvideBus(tracer)
-	folderService := folderimpl.ProvideService(ac, bus, cfg, dashboardStore, folderStore, nil, features)
+	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	dashboardService, dashboardStore := store.SetupDashboardService(tb, sqlStore, folderStore, cfg)
+	folderService := store.SetupFolderService(tb, cfg, dashboardStore, folderStore, bus)
 
 	ng, err := ngalert.ProvideService(
 		cfg, featuremgmt.WithFeatures(), nil, nil, routing.NewRouteRegister(), sqlStore, nil, nil, nil, quotatest.New(false, nil),

From 03f95d6e98650b31394cd30384ad9298e232406b Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Thu, 13 Apr 2023 14:03:57 +0200
Subject: [PATCH 103/729] Alerting: Hide mute timing actions when dealing with
 vanilla prometheus (#66457)

---
 .../alerting/unified/NotificationPolicies.tsx        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/app/features/alerting/unified/NotificationPolicies.tsx b/public/app/features/alerting/unified/NotificationPolicies.tsx
index d4ffb2ae05c..d213921829d 100644
--- a/public/app/features/alerting/unified/NotificationPolicies.tsx
+++ b/public/app/features/alerting/unified/NotificationPolicies.tsx
@@ -188,9 +188,9 @@ const AmRoutes = () => {
     );
   }
 
-  const readOnly = alertManagerSourceName
-    ? isVanillaPrometheusAlertManagerDataSource(alertManagerSourceName) || isProvisioned
-    : true;
+  const vanillaPrometheusAlertManager = isVanillaPrometheusAlertManagerDataSource(alertManagerSourceName);
+  const readOnlyPolicies = vanillaPrometheusAlertManager || isProvisioned;
+  const readOnlyMuteTimings = vanillaPrometheusAlertManager;
 
   const numberOfMuteTimings = result?.alertmanager_config.mute_time_intervals?.length ?? 0;
   const haveData = result && !resultError && !resultLoading;
@@ -254,7 +254,7 @@ const AmRoutes = () => {
                       currentRoute={rootRoute}
                       alertGroups={fetchAlertGroups.result}
                       contactPointsState={contactPointsState.receivers}
-                      readOnly={readOnly}
+                      readOnly={readOnlyPolicies}
                       alertManagerSourceName={alertManagerSourceName}
                       onAddPolicy={openAddModal}
                       onEditPolicy={openEditModal}
@@ -270,7 +270,9 @@ const AmRoutes = () => {
                 {alertInstancesModal}
               </>
             )}
-            {muteTimingsTabActive && <MuteTimingsTable alertManagerSourceName={alertManagerSourceName} />}
+            {muteTimingsTabActive && (
+              <MuteTimingsTable alertManagerSourceName={alertManagerSourceName} hideActions={readOnlyMuteTimings} />
+            )}
           </>
         )}
       </TabContent>

From 2a12283da89cd865789be2868e786edd41849fb4 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matyax@gmail.com>
Date: Thu, 13 Apr 2023 14:11:14 +0200
Subject: [PATCH 104/729] Loki Autocomplete: Update Lezer LogQL and update
 labels autocomplete after the upgrade (#66289)

* Dependencies: update lezer

* Loki Autocomplete: Add support for selectors containing error nodes

* Update tests
---
 package.json                                  |  2 +-
 .../situation.test.ts                         |  7 ++++
 .../monaco-completion-provider/situation.ts   | 35 ++++++++++++-------
 yarn.lock                                     | 10 +++---
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index d266f25c225..6d395b02e71 100644
--- a/package.json
+++ b/package.json
@@ -262,7 +262,7 @@
     "@grafana/faro-core": "1.0.2",
     "@grafana/faro-web-sdk": "1.0.2",
     "@grafana/google-sdk": "0.1.1",
-    "@grafana/lezer-logql": "0.1.2",
+    "@grafana/lezer-logql": "0.1.3",
     "@grafana/monaco-logql": "^0.0.7",
     "@grafana/runtime": "workspace:*",
     "@grafana/scenes": "^0.3.0",
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts
index 84ae6d606e6..3c24635f12f 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts
@@ -115,6 +115,13 @@ describe('situation', () => {
       type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
       otherLabels: [],
     });
+
+    ['sum({label="value",^})', '{label="value",^}', '{label="value", ^}'].forEach((query) => {
+      assertSituation(query, {
+        type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+        otherLabels: [{ name: 'label', value: 'value', op: '=' }],
+      });
+    });
   });
 
   it('identifies labels from queries', () => {
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts
index 891dc320966..7bfa9b7fb70 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts
@@ -143,6 +143,10 @@ const RESOLVERS: Resolver[] = [
     path: [Selector],
     fun: resolveSelector,
   },
+  {
+    path: [ERROR_NODE_ID, Matchers, Selector],
+    fun: resolveSelector,
+  },
   {
     path: [LogQL],
     fun: resolveTopLevel,
@@ -244,14 +248,11 @@ function getLabels(selectorNode: SyntaxNode, text: string): Label[] {
 
   while (listNode !== null) {
     const matcherNode = walk(listNode, [['lastChild', Matcher]]);
-    if (matcherNode === null) {
-      // unexpected, we stop
-      return [];
-    }
-
-    const label = getLabel(matcherNode, text);
-    if (label !== null) {
-      labels.push(label);
+    if (matcherNode !== null) {
+      const label = getLabel(matcherNode, text);
+      if (label !== null) {
+        labels.push(label);
+      }
     }
 
     // there might be more labels
@@ -469,14 +470,24 @@ function resolveSelector(node: SyntaxNode, text: string, pos: number): Situation
     // to be able to suggest adding the next label.
     // the area between the end-of-the-child-node and the cursor-pos
     // must contain a `,` in this case.
-    const textToCheck = text.slice(child.to, pos);
-
-    if (!textToCheck.includes(',')) {
+    const textToCheck = text.slice(child.from, pos);
+    if (!textToCheck.trim().endsWith(',')) {
       return null;
     }
   }
 
-  const otherLabels = getLabels(node, text);
+  const selectorNode =
+    node.type.id === ERROR_NODE_ID
+      ? walk(node, [
+          ['parent', Matchers],
+          ['parent', Selector],
+        ])
+      : node;
+  if (!selectorNode) {
+    return null;
+  }
+
+  const otherLabels = getLabels(selectorNode, text);
 
   return {
     type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
diff --git a/yarn.lock b/yarn.lock
index 1b202d1a912..7100713f754 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3262,12 +3262,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/lezer-logql@npm:0.1.2":
-  version: 0.1.2
-  resolution: "@grafana/lezer-logql@npm:0.1.2"
+"@grafana/lezer-logql@npm:0.1.3":
+  version: 0.1.3
+  resolution: "@grafana/lezer-logql@npm:0.1.3"
   peerDependencies:
     "@lezer/lr": ^1.0.0
-  checksum: 4b62fda9c2c7e29c48f7485df19573b96bfd34539529283980f24e9931f81b44c86b1e655bae5f50730d9d7b37bae87e6f7f7773dafaf4f6acef90b2c2cb776f
+  checksum: 160e4039ce7dd0cd304d37608c0764c24d61030a84636161161bb7cd5cd2d6f064cd3156e8814ed4cb5b8ddebeb4dbae77120f9a3eaea6afe889d99f6dd23543
   languageName: node
   linkType: hard
 
@@ -20134,7 +20134,7 @@ __metadata:
     "@grafana/faro-core": 1.0.2
     "@grafana/faro-web-sdk": 1.0.2
     "@grafana/google-sdk": 0.1.1
-    "@grafana/lezer-logql": 0.1.2
+    "@grafana/lezer-logql": 0.1.3
     "@grafana/monaco-logql": ^0.0.7
     "@grafana/runtime": "workspace:*"
     "@grafana/scenes": ^0.3.0

From 7c7b222ae732969fcda26a99289fb0f5a1d9a5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 13 Apr 2023 14:16:46 +0200
Subject: [PATCH 105/729] FrameGraphTopTable: Use standard Table component
 (#66411)

* FrameGraphTopTable: Use standard Table component

* Simplify

* Fix test

* Update tests

* Fixing test
---
 .../components/FlameGraphContainer.test.tsx   |   6 +-
 .../components/FlameGraphHeader.tsx           |  26 +-
 .../TopTable/FlameGraphTopTable.tsx           | 265 ------------------
 .../FlameGraphTopTableContainer.test.tsx      |   4 +-
 .../TopTable/FlameGraphTopTableContainer.tsx  | 168 +++++++----
 5 files changed, 124 insertions(+), 345 deletions(-)
 delete mode 100644 public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTable.tsx

diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx
index f39ff0c5fb3..c3f5dc8f397 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx
@@ -39,11 +39,11 @@ describe('FlameGraphContainer', () => {
 
   it('should update search when row selected in top table', async () => {
     render(<FlameGraphContainerWithProps />);
-    await userEvent.click((await screen.findAllByRole('row'))[1]);
+    await userEvent.click((await screen.findAllByTitle('Highlight symbol'))[0]);
     expect(screen.getByDisplayValue('net/http.HandlerFunc.ServeHTTP')).toBeInTheDocument();
-    await userEvent.click(screen.getAllByRole('row')[2]);
+    await userEvent.click((await screen.findAllByTitle('Highlight symbol'))[1]);
     expect(screen.getByDisplayValue('total')).toBeInTheDocument();
-    await userEvent.click(screen.getAllByRole('row')[2]);
+    await userEvent.click((await screen.findAllByTitle('Highlight symbol'))[1]);
     expect(screen.queryByDisplayValue('total')).not.toBeInTheDocument();
   });
 
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx
index c539e8f1ecf..8b062c10bef 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraphHeader.tsx
@@ -39,6 +39,7 @@ const FlameGraphHeader = ({
     { value: SelectedView.TopTable, label: 'Top Table', description: 'Only show top table' },
     { value: SelectedView.FlameGraph, label: 'Flame Graph', description: 'Only show flame graph' },
   ];
+
   if (containerWidth >= MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH) {
     viewOptions.push({
       value: SelectedView.Both,
@@ -47,6 +48,14 @@ const FlameGraphHeader = ({
     });
   }
 
+  const onResetView = () => {
+    setTopLevelIndex(0);
+    setSelectedBarIndex(0);
+    setRangeMin(0);
+    setRangeMax(1);
+    setSearch('');
+  };
+
   return (
     <div className={styles.header}>
       <div className={styles.leftContainer}>
@@ -57,22 +66,11 @@ const FlameGraphHeader = ({
               setSearch(v.currentTarget.value);
             }}
             placeholder={'Search..'}
-            width={24}
+            width={44}
           />
         </div>
-        <Button
-          type={'button'}
-          variant={'secondary'}
-          size={'md'}
-          onClick={() => {
-            setTopLevelIndex(0);
-            setSelectedBarIndex(0);
-            setRangeMin(0);
-            setRangeMax(1);
-            setSearch('');
-          }}
-        >
-          Reset View
+        <Button type={'button'} variant="secondary" onClick={onResetView}>
+          Reset view
         </Button>
       </div>
 
diff --git a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTable.tsx b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTable.tsx
deleted file mode 100644
index ddbfb006c1d..00000000000
--- a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTable.tsx
+++ /dev/null
@@ -1,265 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { CSSProperties, useCallback, useMemo } from 'react';
-import { SortByFn, useSortBy, useAbsoluteLayout, useTable, CellProps } from 'react-table';
-import { FixedSizeList } from 'react-window';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { Icon, useStyles2, CustomScrollbar } from '@grafana/ui';
-
-import { TOP_TABLE_COLUMN_WIDTH } from '../../constants';
-import { ColumnTypes, TopTableData, TopTableValue } from '../types';
-
-type Props = {
-  width: number;
-  height: number;
-  data: TopTableData[];
-  search: string;
-  setSearch: (search: string) => void;
-  setTopLevelIndex: (level: number) => void;
-  setSelectedBarIndex: (bar: number) => void;
-  setRangeMin: (range: number) => void;
-  setRangeMax: (range: number) => void;
-};
-
-const FlameGraphTopTable = ({
-  width,
-  height,
-  data,
-  search,
-  setSearch,
-  setTopLevelIndex,
-  setSelectedBarIndex,
-  setRangeMin,
-  setRangeMax,
-}: Props) => {
-  const styles = useStyles2((theme) => getStyles(theme));
-
-  const sortSymbols: SortByFn<object> = (a, b, column) => {
-    return a.values[column].localeCompare(b.values[column]);
-  };
-
-  const sortUnits: SortByFn<object> = (a, b, column) => {
-    return a.values[column].value.toString().localeCompare(b.values[column].value.toString(), 'en', { numeric: true });
-  };
-
-  const columns = useMemo(
-    () => [
-      {
-        accessor: ColumnTypes.Symbol.toLowerCase(),
-        header: ColumnTypes.Symbol,
-        cell: SymbolCell,
-        sortType: sortSymbols,
-        width: width - TOP_TABLE_COLUMN_WIDTH * 2,
-      },
-      {
-        accessor: ColumnTypes.Self.toLowerCase(),
-        header: ColumnTypes.Self,
-        cell: UnitCell,
-        sortType: sortUnits,
-        width: TOP_TABLE_COLUMN_WIDTH,
-      },
-      {
-        accessor: ColumnTypes.Total.toLowerCase(),
-        header: ColumnTypes.Total,
-        cell: UnitCell,
-        sortType: sortUnits,
-        width: TOP_TABLE_COLUMN_WIDTH,
-      },
-    ],
-    [width]
-  );
-
-  const options = useMemo(
-    () => ({
-      columns,
-      data,
-      initialState: {
-        sortBy: [
-          {
-            id: ColumnTypes.Self.toLowerCase(),
-            desc: true,
-          },
-        ],
-      },
-    }),
-    [columns, data]
-  );
-
-  const rowClicked = useCallback(
-    (symbol: string) => {
-      if (search === symbol) {
-        setSearch('');
-      } else {
-        setSearch(symbol);
-        // Reset selected level in flamegraph when selecting row in top table
-        setTopLevelIndex(0);
-        setSelectedBarIndex(0);
-        setRangeMin(0);
-        setRangeMax(1);
-      }
-    },
-    [search, setRangeMax, setRangeMin, setSearch, setTopLevelIndex, setSelectedBarIndex]
-  );
-
-  const { headerGroups, rows, prepareRow } = useTable(options, useSortBy, useAbsoluteLayout);
-
-  const renderRow = React.useCallback(
-    ({ index, style }: { index: number; style: CSSProperties }) => {
-      let row = rows[index];
-      prepareRow(row);
-
-      const symbol = row.values[ColumnTypes.Symbol.toLowerCase()];
-      const classNames = cx(symbol === search && styles.matchedRow, styles.row);
-
-      return (
-        <div
-          {...row.getRowProps({ style })}
-          className={classNames}
-          onClick={() => {
-            rowClicked(symbol);
-          }}
-        >
-          {row.cells.map((cell) => {
-            const { key, ...cellProps } = cell.getCellProps();
-            if (cellProps.style) {
-              cellProps.style.minWidth = cellProps.style.width;
-            }
-            return (
-              <div key={key} className={styles.cell} {...cellProps}>
-                {cell.render('cell')}
-              </div>
-            );
-          })}
-        </div>
-      );
-    },
-    [rows, prepareRow, search, styles.matchedRow, styles.row, styles.cell, rowClicked]
-  );
-
-  return (
-    <div className={styles.table(height)} data-testid="topTable">
-      {headerGroups.map((headerGroup) => {
-        const { key, ...headerGroupProps } = headerGroup.getHeaderGroupProps();
-
-        return (
-          <div key={key} className={styles.header} {...headerGroupProps}>
-            {headerGroup.headers.map((column) => {
-              const { key, ...headerProps } = column.getHeaderProps(
-                column.canSort ? column.getSortByToggleProps() : undefined
-              );
-
-              return (
-                <div key={key} className={styles.headerCell} {...headerProps}>
-                  {column.render('header')}
-                  {column.isSorted && <Icon name={column.isSortedDesc ? 'arrow-down' : 'arrow-up'} />}
-                </div>
-              );
-            })}
-          </div>
-        );
-      })}
-
-      {rows.length > 0 ? (
-        <CustomScrollbar hideVerticalTrack={true}>
-          <FixedSizeList
-            height={height}
-            itemCount={rows.length}
-            itemSize={38}
-            width={'100%'}
-            style={{ overflow: 'hidden auto' }}
-          >
-            {renderRow}
-          </FixedSizeList>
-        </CustomScrollbar>
-      ) : (
-        <div style={{ height: height }} className={styles.noData}>
-          No data
-        </div>
-      )}
-    </div>
-  );
-};
-
-const SymbolCell = ({ cell: { value } }: CellProps<TopTableValue, string>) => {
-  return <div>{value}</div>;
-};
-
-const UnitCell = ({ cell: { value } }: CellProps<TopTableValue, TopTableValue>) => {
-  return <div>{value.unitValue}</div>;
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  table: (height: number) => {
-    return css`
-      background-color: ${theme.colors.background.primary};
-      height: ${height}px;
-      overflow: scroll;
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-    `;
-  },
-  header: css`
-    height: 38px;
-
-    & > :nth-child(2),
-    & > :nth-child(3) {
-      text-align: right;
-    }
-
-    // needed to keep header row height fixed so header row does not resize with browser
-    & > :nth-child(3) {
-      position: relative !important;
-    }
-  `,
-  headerCell: css`
-    background-color: ${theme.colors.background.secondary};
-    color: ${theme.colors.primary.text};
-    padding: ${theme.spacing(1)};
-  `,
-  matchedRow: css`
-    & > :nth-child(1),
-    & > :nth-child(2),
-    & > :nth-child(3) {
-      background-color: ${theme.colors.background.secondary} !important;
-    }
-  `,
-  row: css`
-    border-top: 1px solid ${theme.components.panel.borderColor};
-
-    &:hover {
-      background-color: ${theme.colors.emphasize(theme.colors.background.primary, 0.03)};
-    }
-    & > :nth-child(2),
-    & > :nth-child(3) {
-      text-align: right;
-    }
-    & > :nth-child(3) {
-      border-right: none;
-    }
-  `,
-  cell: css`
-    border-right: 1px solid ${theme.components.panel.borderColor};
-    padding: ${theme.spacing(1)};
-
-    div {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    &:hover {
-      overflow: visible;
-      width: auto !important;
-      box-shadow: 0 0 2px ${theme.colors.primary.main};
-      background-color: ${theme.colors.emphasize(theme.colors.background.primary, 0.03)};
-      z-index: 1;
-    }
-  `,
-  noData: css`
-    align-items: center;
-    display: flex;
-    justify-content: center;
-  `,
-});
-
-export default FlameGraphTopTable;
diff --git a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx
index d9390cb681a..1e823537ec4 100644
--- a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx
+++ b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx
@@ -45,7 +45,7 @@ describe('FlameGraphTopTableContainer', () => {
 
     render(<FlameGraphTopTableContainerWithProps />);
     const rows = screen.getAllByRole('row');
-    expect(rows).toHaveLength(17); // + 1 for the columnHeaders
+    expect(rows).toHaveLength(16);
 
     const columnHeaders = screen.getAllByRole('columnheader');
     expect(columnHeaders).toHaveLength(3);
@@ -54,7 +54,7 @@ describe('FlameGraphTopTableContainer', () => {
     expect(columnHeaders[2].textContent).toEqual('Total');
 
     const cells = screen.getAllByRole('cell');
-    expect(cells).toHaveLength(48); // 16 rows
+    expect(cells).toHaveLength(45); // 16 rows
     expect(cells[0].textContent).toEqual('net/http.HandlerFunc.ServeHTTP');
     expect(cells[1].textContent).toEqual('31.7 K');
     expect(cells[2].textContent).toEqual('31.7 Bil');
diff --git a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
index cd80cf0f22b..3ef85d5e51b 100644
--- a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
+++ b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
@@ -1,15 +1,22 @@
 import { css } from '@emotion/css';
-import React, { useMemo } from 'react';
+import React from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
-import { CoreApp, DisplayValue } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import {
+  applyFieldOverrides,
+  ArrayVector,
+  CoreApp,
+  DataFrame,
+  DataLinkClickEvent,
+  Field,
+  FieldType,
+} from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Table, useStyles2 } from '@grafana/ui';
 
-import { PIXELS_PER_LEVEL } from '../../constants';
+import { PIXELS_PER_LEVEL, TOP_TABLE_COLUMN_WIDTH } from '../../constants';
 import { FlameGraphDataContainer } from '../FlameGraph/dataTransform';
-import { SelectedView, TableData, TopTableData } from '../types';
-
-import FlameGraphTopTable from './FlameGraphTopTable';
+import { SelectedView, TableData } from '../types';
 
 type Props = {
   data: FlameGraphDataContainer;
@@ -38,68 +45,107 @@ const FlameGraphTopTableContainer = ({
 }: Props) => {
   const styles = useStyles2(() => getStyles(selectedView, app));
 
-  const topTable = useMemo(() => {
-    // Group the data by label
-    // TODO: should be by filename + funcName + linenumber?
-    let table: { [key: string]: TableData } = {};
-    for (let i = 0; i < data.data.length; i++) {
-      const value = data.getValue(i);
-      const self = data.getSelf(i);
-      const label = data.getLabel(i);
-      table[label] = table[label] || {};
-      table[label].self = table[label].self ? table[label].self + self : self;
-      table[label].total = table[label].total ? table[label].total + value : value;
+  const onSymbolClick = (symbol: string) => {
+    if (search === symbol) {
+      setSearch('');
+    } else {
+      setSearch(symbol);
+      // Reset selected level in flamegraph when selecting row in top table
+      setTopLevelIndex(0);
+      setSelectedBarIndex(0);
+      setRangeMin(0);
+      setRangeMax(1);
     }
+  };
 
-    let topTable: TopTableData[] = [];
-    for (let key in table) {
-      const selfUnit = handleUnits(data.valueDisplayProcessor(table[key].self), data.getUnitTitle());
-      const valueUnit = handleUnits(data.valueDisplayProcessor(table[key].total), data.getUnitTitle());
-
-      topTable.push({
-        symbol: key,
-        self: { value: table[key].self, unitValue: selfUnit },
-        total: { value: table[key].total, unitValue: valueUnit },
-      });
-    }
-
-    return topTable;
-  }, [data]);
+  const initialSortBy = [{ displayName: 'Self', desc: true }];
 
   return (
-    <>
-      {topTable && (
-        <div className={styles.topTableContainer}>
-          <AutoSizer style={{ width: '100%', height: PIXELS_PER_LEVEL * totalLevels + 'px' }}>
-            {({ width, height }) => (
-              <FlameGraphTopTable
-                width={width}
-                height={height}
-                data={topTable}
-                search={search}
-                setSearch={setSearch}
-                setTopLevelIndex={setTopLevelIndex}
-                setSelectedBarIndex={setSelectedBarIndex}
-                setRangeMin={setRangeMin}
-                setRangeMax={setRangeMax}
-              />
-            )}
-          </AutoSizer>
-        </div>
-      )}
-    </>
+    <div className={styles.topTableContainer} data-testid="topTable">
+      <AutoSizer style={{ width: '100%', height: PIXELS_PER_LEVEL * totalLevels + 'px' }}>
+        {({ width, height }) => {
+          if (width < 3 || height < 3) {
+            return null;
+          }
+
+          const frame = buildTableDataFrame(data, width, onSymbolClick);
+          return <Table initialSortBy={initialSortBy} data={frame} width={width} height={height} />;
+        }}
+      </AutoSizer>
+    </div>
   );
 };
 
-function handleUnits(displayValue: DisplayValue, unit: string) {
-  let unitValue = displayValue.text + displayValue.suffix;
-  if (unit === 'Count') {
-    if (!displayValue.suffix) {
-      // Makes sure we don't show 123undefined or something like that if suffix isn't defined
-      unitValue = displayValue.text;
-    }
+function buildTableDataFrame(
+  data: FlameGraphDataContainer,
+  width: number,
+  onSymbolClick: (str: string) => void
+): DataFrame {
+  // Group the data by label
+  // TODO: should be by filename + funcName + linenumber?
+  let table: { [key: string]: TableData } = {};
+  for (let i = 0; i < data.data.length; i++) {
+    const value = data.getValue(i);
+    const self = data.getSelf(i);
+    const label = data.getLabel(i);
+    table[label] = table[label] || {};
+    table[label].self = table[label].self ? table[label].self + self : self;
+    table[label].total = table[label].total ? table[label].total + value : value;
   }
-  return unitValue;
+
+  const symbolField = {
+    type: FieldType.string,
+    name: 'Symbol',
+    values: new ArrayVector(),
+    config: {
+      custom: { width: width - TOP_TABLE_COLUMN_WIDTH * 2 },
+      links: [
+        {
+          title: 'Highlight symbol',
+          url: '',
+          onClick: (e: DataLinkClickEvent) => {
+            const field: Field = e.origin.field;
+            const value = field.values.get(e.origin.rowIndex);
+            onSymbolClick(value);
+          },
+        },
+      ],
+    },
+  };
+
+  const selfField = {
+    type: FieldType.number,
+    name: 'Self',
+    values: new ArrayVector(),
+    config: { unit: data.selfField.config.unit, custom: { width: TOP_TABLE_COLUMN_WIDTH } },
+  };
+
+  const totalField = {
+    type: FieldType.number,
+    name: 'Total',
+    values: new ArrayVector(),
+    config: { unit: data.valueField.config.unit, custom: { width: TOP_TABLE_COLUMN_WIDTH } },
+  };
+
+  for (let key in table) {
+    symbolField.values.add(key);
+    selfField.values.add(table[key].self);
+    totalField.values.add(table[key].total);
+  }
+
+  const frame = { fields: [symbolField, selfField, totalField], length: symbolField.values.length };
+
+  const dataFrames = applyFieldOverrides({
+    data: [frame],
+    fieldConfig: {
+      defaults: {},
+      overrides: [],
+    },
+    replaceVariables: (value: string) => value,
+    theme: config.theme2,
+  });
+
+  return dataFrames[0];
 }
 
 const getStyles = (selectedView: SelectedView, app: CoreApp) => {

From 725f29e6d0fe9f879a8235778d991c002e644a00 Mon Sep 17 00:00:00 2001
From: Laura Benz <48948963+L-M-K-B@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:21:36 +0200
Subject: [PATCH 106/729] Design System: Set TextArea to display: block in
 order to remove spacing below (#66262)

refactor: set textarea to display: block and add margin
---
 packages/grafana-ui/src/components/TextArea/TextArea.tsx    | 1 +
 public/app/features/explore/RichHistory/RichHistoryCard.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/grafana-ui/src/components/TextArea/TextArea.tsx b/packages/grafana-ui/src/components/TextArea/TextArea.tsx
index 3497b33f4d8..ca79c7f5f94 100644
--- a/packages/grafana-ui/src/components/TextArea/TextArea.tsx
+++ b/packages/grafana-ui/src/components/TextArea/TextArea.tsx
@@ -24,6 +24,7 @@ const getTextAreaStyle = stylesFactory((theme: GrafanaTheme2, invalid = false) =
       sharedInputStyle(theme),
       getFocusStyle(theme),
       css`
+        display: block;
         border-radius: ${theme.shape.borderRadius()};
         padding: ${theme.spacing.gridSize / 4}px ${theme.spacing.gridSize}px;
         width: 100%;
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
index c21c423f942..bd81b1ed3d5 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
@@ -108,6 +108,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     `,
     commentButtonRow: css`
       > * {
+        margin-top: ${theme.spacing(1)};
         margin-right: ${theme.spacing(1)};
       }
     `,

From af3bf04f2ef2bb3bb80ffee7140c13623a58a0f9 Mon Sep 17 00:00:00 2001
From: David Harris <david.harris@grafana.com>
Date: Thu, 13 Apr 2023 13:22:08 +0100
Subject: [PATCH 107/729] doc: update doc link which 404s (#66453)

Previous link 404s, this seems the right place to direct users towards.
---
 public/app/plugins/panel/annolist/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/annolist/README.md b/public/app/plugins/panel/annolist/README.md
index 019f1a2885a..f3dcf5a6573 100644
--- a/public/app/plugins/panel/annolist/README.md
+++ b/public/app/plugins/panel/annolist/README.md
@@ -6,6 +6,6 @@ Using the annotations list panel, you can quickly collect, filter and access ann
 
 The annotations panel can be used to show annotations present within the panels on the current dashboard, or site-wide. Additional options include the ability to limit the list of annotations based on the current time range and the tags used on the annotations.
 
-Read more about it here:
+Read more about annotations here:
 
-[http://docs.grafana.org/features/panels/annolist/](http://docs.grafana.org/features/panels/annolist/)
+[https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/annotations/](https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/annotations/)

From 531caec60263738ed6b31878b1ec093de635e4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Thu, 13 Apr 2023 15:07:08 +0200
Subject: [PATCH 108/729] Loki: Add feature flag to enable dataplane-compliant
 metric frames (#66017)

* loki: add feature flag to enable dataplane-compatible metric frames

* linter fix
---
 .../feature-toggles/index.md                  |   1 +
 .../src/types/featureToggles.gen.ts           |   1 +
 pkg/services/featuremgmt/registry.go          |   6 +
 pkg/services/featuremgmt/toggles_gen.csv      |   1 +
 pkg/services/featuremgmt/toggles_gen.go       |   4 +
 pkg/tsdb/loki/api.go                          |   4 +-
 pkg/tsdb/loki/api_test.go                     |  12 +-
 pkg/tsdb/loki/frame.go                        |  10 +-
 pkg/tsdb/loki/frame_test.go                   | 133 +++---
 pkg/tsdb/loki/framing_test.go                 |  37 +-
 pkg/tsdb/loki/loki.go                         |  20 +-
 pkg/tsdb/loki/loki_bench_test.go              |   2 +-
 .../empty.golden.jsonc                        |   5 +
 .../loki/testdata_metric_dataplane/empty.json |   1 +
 .../matrix_gap.golden.jsonc                   |  87 ++++
 .../testdata_metric_dataplane/matrix_gap.json |  19 +
 .../matrix_inf.golden.jsonc                   | 114 ++++++
 .../testdata_metric_dataplane/matrix_inf.json |  25 ++
 .../matrix_name.golden.jsonc                  |  75 ++++
 .../matrix_name.json                          |  17 +
 .../matrix_nan.golden.jsonc                   |  88 ++++
 .../testdata_metric_dataplane/matrix_nan.json |  16 +
 .../matrix_simple.golden.jsonc                | 164 ++++++++
 .../matrix_simple.json                        |  33 ++
 .../matrix_small_step.golden.jsonc            |  83 ++++
 .../matrix_small_step.json                    |  19 +
 .../matrix_with_stats.golden.jsonc            | 365 +++++++++++++++++
 .../matrix_with_stats.json                    |  60 +++
 .../streams_parse_errors.golden.jsonc         | 129 ++++++
 .../streams_parse_errors.json                 |  29 ++
 .../streams_simple.golden.jsonc               | 377 ++++++++++++++++++
 .../streams_simple.json                       |  80 ++++
 .../vector_simple.golden.jsonc                | 137 +++++++
 .../vector_simple.json                        |  16 +
 .../vector_special_values.golden.jsonc        | 226 +++++++++++
 .../vector_special_values.json                |  20 +
 36 files changed, 2333 insertions(+), 83 deletions(-)
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/empty.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/empty.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_gap.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_gap.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_inf.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_inf.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_name.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_name.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_nan.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_nan.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_simple.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_simple.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_small_step.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_small_step.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_with_stats.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/matrix_with_stats.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/streams_parse_errors.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/streams_parse_errors.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/streams_simple.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/streams_simple.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/vector_simple.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/vector_simple.json
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/vector_special_values.golden.jsonc
 create mode 100644 pkg/tsdb/loki/testdata_metric_dataplane/vector_special_values.json

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index cc1097d8a33..60c0b9b771a 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -102,6 +102,7 @@ Alpha features might be changed or removed without prior notice.
 | `influxdbBackendMigration`         | Query InfluxDB InfluxQL without the proxy                                                                                                                                                           |
 | `clientTokenRotation`              | Replaces the current in-request token rotation so that the client initiates the rotation                                                                                                            |
 | `prometheusDataplane`              | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from 'Value' to the value of the `__name__` label when present. |
+| `lokiMetricDataplane`              | Changes responses from Loki to be compliant with the dataplane specification.                                                                                                                       |
 | `alertStateHistoryLokiSecondary`   | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.                                                                                        |
 | `alertStateHistoryLokiPrimary`     | Enable a remote Loki instance as the primary source for state history reads.                                                                                                                        |
 | `alertStateHistoryLokiOnly`        | Disable Grafana alerts from emitting annotations when a remote Loki instance is available.                                                                                                          |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index c94d9787601..f621ef52e3a 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -86,6 +86,7 @@ export interface FeatureToggles {
   influxdbBackendMigration?: boolean;
   clientTokenRotation?: boolean;
   prometheusDataplane?: boolean;
+  lokiMetricDataplane?: boolean;
   alertStateHistoryLokiSecondary?: boolean;
   alertStateHistoryLokiPrimary?: boolean;
   alertStateHistoryLokiOnly?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 80bb1c627ea..ca9e2abf786 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -457,6 +457,12 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaObservabilityMetricsSquad,
 		},
+		{
+			Name:        "lokiMetricDataplane",
+			Description: "Changes responses from Loki to be compliant with the dataplane specification.",
+			State:       FeatureStateAlpha,
+			Owner:       grafanaObservabilityLogsSquad,
+		},
 		{
 			Name:        "alertStateHistoryLokiSecondary",
 			Description: "Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 88f3f8d63d3..6a424dff587 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -67,6 +67,7 @@ prometheusResourceBrowserCache,alpha,@grafana/observability-metrics,false,false,
 influxdbBackendMigration,alpha,@grafana/observability-metrics,false,false,false,true
 clientTokenRotation,alpha,@grafana/grafana-authnz-team,false,false,false,false
 prometheusDataplane,alpha,@grafana/observability-metrics,false,false,false,false
+lokiMetricDataplane,alpha,@grafana/observability-logs,false,false,false,false
 alertStateHistoryLokiSecondary,alpha,@grafana/alerting-squad,false,false,false,false
 alertStateHistoryLokiPrimary,alpha,@grafana/alerting-squad,false,false,false,false
 alertStateHistoryLokiOnly,alpha,@grafana/alerting-squad,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index c254998fb49..9163922ac0a 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -279,6 +279,10 @@ const (
 	// Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from &#39;Value&#39; to the value of the `__name__` label when present.
 	FlagPrometheusDataplane = "prometheusDataplane"
 
+	// FlagLokiMetricDataplane
+	// Changes responses from Loki to be compliant with the dataplane specification.
+	FlagLokiMetricDataplane = "lokiMetricDataplane"
+
 	// FlagAlertStateHistoryLokiSecondary
 	// Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.
 	FlagAlertStateHistoryLokiSecondary = "alertStateHistoryLokiSecondary"
diff --git a/pkg/tsdb/loki/api.go b/pkg/tsdb/loki/api.go
index 23b0654e8f6..834fab5f849 100644
--- a/pkg/tsdb/loki/api.go
+++ b/pkg/tsdb/loki/api.go
@@ -148,7 +148,7 @@ func readLokiError(body io.ReadCloser) error {
 	return makeLokiError(bytes)
 }
 
-func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery) (data.Frames, error) {
+func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts ResponseOpts) (data.Frames, error) {
 	req, err := makeDataRequest(ctx, api.url, query)
 	if err != nil {
 		return nil, err
@@ -170,7 +170,7 @@ func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery) (data.Frames
 	}
 
 	iter := jsoniter.Parse(jsoniter.ConfigDefault, resp.Body, 1024)
-	res := converter.ReadPrometheusStyleResult(iter, converter.Options{MatrixWideSeries: false, VectorWideSeries: false})
+	res := converter.ReadPrometheusStyleResult(iter, converter.Options{MatrixWideSeries: false, VectorWideSeries: false, Dataplane: responseOpts.metricDataplane})
 
 	if res.Error != nil {
 		return nil, res.Error
diff --git a/pkg/tsdb/loki/api_test.go b/pkg/tsdb/loki/api_test.go
index 77206ae0e49..6adc839f8ad 100644
--- a/pkg/tsdb/loki/api_test.go
+++ b/pkg/tsdb/loki/api_test.go
@@ -28,7 +28,7 @@ func TestApiLogVolume(t *testing.T) {
 			require.Equal(t, "Source=logvolhist", req.Header.Get("X-Query-Tags"))
 		})
 
-		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsVolume, QueryType: QueryTypeRange})
+		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsVolume, QueryType: QueryTypeRange}, ResponseOpts{})
 		require.NoError(t, err)
 		require.True(t, called)
 	})
@@ -40,7 +40,7 @@ func TestApiLogVolume(t *testing.T) {
 			require.Equal(t, "Source=logsample", req.Header.Get("X-Query-Tags"))
 		})
 
-		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsSample, QueryType: QueryTypeRange})
+		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsSample, QueryType: QueryTypeRange}, ResponseOpts{})
 		require.NoError(t, err)
 		require.True(t, called)
 	})
@@ -52,7 +52,7 @@ func TestApiLogVolume(t *testing.T) {
 			require.Equal(t, "Source=datasample", req.Header.Get("X-Query-Tags"))
 		})
 
-		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryDataSample, QueryType: QueryTypeRange})
+		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryDataSample, QueryType: QueryTypeRange}, ResponseOpts{})
 		require.NoError(t, err)
 		require.True(t, called)
 	})
@@ -64,7 +64,7 @@ func TestApiLogVolume(t *testing.T) {
 			require.Equal(t, "", req.Header.Get("X-Query-Tags"))
 		})
 
-		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryNone, QueryType: QueryTypeRange})
+		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryNone, QueryType: QueryTypeRange}, ResponseOpts{})
 		require.NoError(t, err)
 		require.True(t, called)
 	})
@@ -133,7 +133,7 @@ func TestApiUrlHandling(t *testing.T) {
 				QueryType: QueryTypeRange,
 			}
 
-			_, err := api.DataQuery(context.Background(), query)
+			_, err := api.DataQuery(context.Background(), query, ResponseOpts{})
 			require.NoError(t, err)
 			require.True(t, called)
 		})
@@ -154,7 +154,7 @@ func TestApiUrlHandling(t *testing.T) {
 				QueryType: QueryTypeInstant,
 			}
 
-			_, err := api.DataQuery(context.Background(), query)
+			_, err := api.DataQuery(context.Background(), query, ResponseOpts{})
 			require.NoError(t, err)
 			require.True(t, called)
 		})
diff --git a/pkg/tsdb/loki/frame.go b/pkg/tsdb/loki/frame.go
index d64c6b63b4d..53b4f8e8ae3 100644
--- a/pkg/tsdb/loki/frame.go
+++ b/pkg/tsdb/loki/frame.go
@@ -12,7 +12,7 @@ import (
 
 // we adjust the dataframes to be the way frontend & alerting
 // wants them.
-func adjustFrame(frame *data.Frame, query *lokiQuery) error {
+func adjustFrame(frame *data.Frame, query *lokiQuery, setMetricFrameName bool) error {
 	fields := frame.Fields
 
 	if len(fields) < 2 {
@@ -25,13 +25,13 @@ func adjustFrame(frame *data.Frame, query *lokiQuery) error {
 	secondField := fields[1]
 
 	if secondField.Type() == data.FieldTypeFloat64 {
-		return adjustMetricFrame(frame, query)
+		return adjustMetricFrame(frame, query, setMetricFrameName)
 	} else {
 		return adjustLogsFrame(frame, query)
 	}
 }
 
-func adjustMetricFrame(frame *data.Frame, query *lokiQuery) error {
+func adjustMetricFrame(frame *data.Frame, query *lokiQuery, setFrameName bool) error {
 	fields := frame.Fields
 	// we check if the fields are of correct type
 	if len(fields) != 2 {
@@ -50,7 +50,9 @@ func adjustMetricFrame(frame *data.Frame, query *lokiQuery) error {
 	isMetricRange := query.QueryType == QueryTypeRange
 
 	name := formatName(labels, query)
-	frame.Name = name
+	if setFrameName {
+		frame.Name = name
+	}
 
 	if frame.Meta == nil {
 		frame.Meta = &data.FrameMeta{}
diff --git a/pkg/tsdb/loki/frame_test.go b/pkg/tsdb/loki/frame_test.go
index 47bbbf7f90a..5784a000992 100644
--- a/pkg/tsdb/loki/frame_test.go
+++ b/pkg/tsdb/loki/frame_test.go
@@ -50,21 +50,23 @@ func TestAdjustFrame(t *testing.T) {
 		timeNs3 := strconv.FormatInt(time3.UnixNano(), 10)
 		timeNs4 := strconv.FormatInt(time4.UnixNano(), 10)
 
-		frame := data.NewFrame("",
-			data.NewField("__labels", nil, []json.RawMessage{
-				json.RawMessage(`{"level":"info"}`),
-				json.RawMessage(`{"level":"error"}`),
-				json.RawMessage(`{"level":"error"}`),
-				json.RawMessage(`{"level":"info"}`),
-			}),
-			data.NewField("Time", nil, []time.Time{
-				time1, time2, time3, time4,
-			}),
-			data.NewField("Line", nil, []string{"line1", "line2", "line2", "line3"}),
-			data.NewField("TS", nil, []string{
-				timeNs1, timeNs2, timeNs3, timeNs4,
-			}),
-		)
+		makeFrame := func() *data.Frame {
+			return data.NewFrame("",
+				data.NewField("__labels", nil, []json.RawMessage{
+					json.RawMessage(`{"level":"info"}`),
+					json.RawMessage(`{"level":"error"}`),
+					json.RawMessage(`{"level":"error"}`),
+					json.RawMessage(`{"level":"info"}`),
+				}),
+				data.NewField("Time", nil, []time.Time{
+					time1, time2, time3, time4,
+				}),
+				data.NewField("Line", nil, []string{"line1", "line2", "line2", "line3"}),
+				data.NewField("TS", nil, []string{
+					timeNs1, timeNs2, timeNs3, timeNs4,
+				}),
+			)
+		}
 
 		query := &lokiQuery{
 			Expr:      `{type="important"}`,
@@ -72,30 +74,43 @@ func TestAdjustFrame(t *testing.T) {
 			RefID:     "A",
 		}
 
-		err := adjustFrame(frame, query)
+		verifyFrame := func(frame *data.Frame) {
+			fields := frame.Fields
+
+			require.Equal(t, 5, len(fields))
+
+			idField := fields[4]
+			require.Equal(t, "id", idField.Name)
+			require.Equal(t, data.FieldTypeString, idField.Type())
+			require.Equal(t, 4, idField.Len())
+			require.Equal(t, "1641092645000000006_a36f4e1b_A", idField.At(0))
+			require.Equal(t, "1641092705000000006_1d77c9ca_A", idField.At(1))
+			require.Equal(t, "1641092705000000006_1d77c9ca_1_A", idField.At(2))
+			require.Equal(t, "1641092765000000006_948c1a7d_A", idField.At(3))
+		}
+
+		frame := makeFrame()
+
+		err := adjustFrame(frame, query, true)
 		require.NoError(t, err)
+		verifyFrame(frame)
 
-		fields := frame.Fields
-
-		require.Equal(t, 5, len(fields))
-
-		idField := fields[4]
-		require.Equal(t, "id", idField.Name)
-		require.Equal(t, data.FieldTypeString, idField.Type())
-		require.Equal(t, 4, idField.Len())
-		require.Equal(t, "1641092645000000006_a36f4e1b_A", idField.At(0))
-		require.Equal(t, "1641092705000000006_1d77c9ca_A", idField.At(1))
-		require.Equal(t, "1641092705000000006_1d77c9ca_1_A", idField.At(2))
-		require.Equal(t, "1641092765000000006_948c1a7d_A", idField.At(3))
+		frame = makeFrame() // we need to reset the frame, because adjustFrame mutates it
+		err = adjustFrame(frame, query, false)
+		require.NoError(t, err)
+		verifyFrame(frame)
 	})
 
 	t.Run("naming inside metric fields should be correct", func(t *testing.T) {
-		field1 := data.NewField("", nil, make([]time.Time, 0))
-		field2 := data.NewField("", nil, make([]float64, 0))
-		field2.Labels = data.Labels{"app": "Application", "tag2": "tag2"}
+		makeFrame := func() *data.Frame {
+			field1 := data.NewField("", nil, make([]time.Time, 0))
+			field2 := data.NewField("", nil, make([]float64, 0))
+			field2.Labels = data.Labels{"app": "Application", "tag2": "tag2"}
 
-		frame := data.NewFrame("test", field1, field2)
-		frame.SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti})
+			frame := data.NewFrame("", field1, field2)
+			frame.SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti})
+			return frame
+		}
 
 		query := &lokiQuery{
 			Expr:         "up(ALERTS)",
@@ -104,13 +119,23 @@ func TestAdjustFrame(t *testing.T) {
 			Step:         time.Second * 42,
 		}
 
-		err := adjustFrame(frame, query)
+		frame := makeFrame()
+		err := adjustFrame(frame, query, true)
 		require.NoError(t, err)
 
 		require.Equal(t, frame.Name, "legend Application")
 		require.Equal(t, frame.Meta.ExecutedQueryString, "Expr: up(ALERTS)\nStep: 42s")
 		require.Equal(t, frame.Fields[0].Config.Interval, float64(42000))
 		require.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "legend Application")
+
+		frame = makeFrame()
+		err = adjustFrame(frame, query, false)
+		require.NoError(t, err)
+
+		require.Equal(t, frame.Name, "")
+		require.Equal(t, frame.Meta.ExecutedQueryString, "Expr: up(ALERTS)\nStep: 42s")
+		require.Equal(t, frame.Fields[0].Config.Interval, float64(42000))
+		require.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "legend Application")
 	})
 
 	t.Run("should set interval-attribute in response", func(t *testing.T) {
@@ -119,24 +144,36 @@ func TestAdjustFrame(t *testing.T) {
 			QueryType: QueryTypeRange,
 		}
 
-		field1 := data.NewField("", nil, make([]time.Time, 0))
-		field2 := data.NewField("", nil, make([]float64, 0))
+		makeFrame := func() *data.Frame {
+			field1 := data.NewField("", nil, make([]time.Time, 0))
+			field2 := data.NewField("", nil, make([]float64, 0))
 
-		frame := data.NewFrame("test", field1, field2)
-		frame.SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti})
+			frame := data.NewFrame("", field1, field2)
+			frame.SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti})
+			return frame
+		}
 
-		err := adjustFrame(frame, query)
+		verifyFrame := func(frame *data.Frame) {
+			// to keep the test simple, we assume the
+			// first field is the time-field
+			timeField := frame.Fields[0]
+			require.NotNil(t, timeField)
+			require.Equal(t, data.FieldTypeTime, timeField.Type())
+
+			timeFieldConfig := timeField.Config
+			require.NotNil(t, timeFieldConfig)
+			require.Equal(t, float64(42000), timeFieldConfig.Interval)
+		}
+
+		frame := makeFrame()
+
+		err := adjustFrame(frame, query, true)
 		require.NoError(t, err)
+		verifyFrame(frame)
 
-		// to keep the test simple, we assume the
-		// first field is the time-field
-		timeField := frame.Fields[0]
-		require.NotNil(t, timeField)
-		require.Equal(t, data.FieldTypeTime, timeField.Type())
-
-		timeFieldConfig := timeField.Config
-		require.NotNil(t, timeFieldConfig)
-		require.Equal(t, float64(42000), timeFieldConfig.Interval)
+		err = adjustFrame(frame, query, false)
+		require.NoError(t, err)
+		verifyFrame(frame)
 	})
 
 	t.Run("should parse response stats", func(t *testing.T) {
diff --git a/pkg/tsdb/loki/framing_test.go b/pkg/tsdb/loki/framing_test.go
index 26fea7925e5..6a62b1ce3e5 100644
--- a/pkg/tsdb/loki/framing_test.go
+++ b/pkg/tsdb/loki/framing_test.go
@@ -52,23 +52,28 @@ func TestSuccessResponse(t *testing.T) {
 		{name: "parse an empty response", filepath: "empty", query: matrixQuery},
 	}
 
+	runTest := func(folder string, path string, query lokiQuery, responseOpts ResponseOpts) {
+		responseFileName := filepath.Join(folder, path+".json")
+		goldenFileName := path + ".golden"
+
+		//nolint:gosec
+		bytes, err := os.ReadFile(responseFileName)
+		require.NoError(t, err)
+
+		frames, err := runQuery(context.Background(), makeMockedAPI(http.StatusOK, "application/json", bytes, nil), &query, responseOpts)
+		require.NoError(t, err)
+
+		dr := &backend.DataResponse{
+			Frames: frames,
+			Error:  err,
+		}
+		experimental.CheckGoldenJSONResponse(t, folder, goldenFileName, dr, true)
+	}
+
 	for _, test := range tt {
 		t.Run(test.name, func(t *testing.T) {
-			responseFileName := filepath.Join("testdata", test.filepath+".json")
-			goldenFileName := test.filepath + ".golden"
-
-			//nolint:gosec
-			bytes, err := os.ReadFile(responseFileName)
-			require.NoError(t, err)
-
-			frames, err := runQuery(context.Background(), makeMockedAPI(http.StatusOK, "application/json", bytes, nil), &test.query)
-			require.NoError(t, err)
-
-			dr := &backend.DataResponse{
-				Frames: frames,
-				Error:  err,
-			}
-			experimental.CheckGoldenJSONResponse(t, "testdata", goldenFileName, dr, true)
+			runTest("testdata", test.filepath, test.query, ResponseOpts{metricDataplane: false})
+			runTest("testdata_metric_dataplane", test.filepath, test.query, ResponseOpts{metricDataplane: true})
 		})
 	}
 }
@@ -118,7 +123,7 @@ func TestErrorResponse(t *testing.T) {
 
 	for _, test := range tt {
 		t.Run(test.name, func(t *testing.T) {
-			frames, err := runQuery(context.Background(), makeMockedAPI(400, test.contentType, test.body, nil), &lokiQuery{QueryType: QueryTypeRange, Direction: DirectionBackward})
+			frames, err := runQuery(context.Background(), makeMockedAPI(400, test.contentType, test.body, nil), &lokiQuery{QueryType: QueryTypeRange, Direction: DirectionBackward}, ResponseOpts{})
 
 			require.Len(t, frames, 0)
 			require.Error(t, err)
diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go
index 054ba1f2540..dfe33d3c0a8 100644
--- a/pkg/tsdb/loki/loki.go
+++ b/pkg/tsdb/loki/loki.go
@@ -63,6 +63,10 @@ type QueryJSONModel struct {
 	SupportingQueryType *string `json:"supportingQueryType"`
 }
 
+type ResponseOpts struct {
+	metricDataplane bool
+}
+
 func parseQueryModel(raw json.RawMessage) (*QueryJSONModel, error) {
 	model := &QueryJSONModel{}
 	err := json.Unmarshal(raw, model)
@@ -144,10 +148,14 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 		return result, err
 	}
 
-	return queryData(ctx, req, dsInfo, s.tracer)
+	responseOpts := ResponseOpts{
+		metricDataplane: s.features.IsEnabled(featuremgmt.FlagLokiMetricDataplane),
+	}
+
+	return queryData(ctx, req, dsInfo, responseOpts, s.tracer)
 }
 
-func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datasourceInfo, tracer tracing.Tracer) (*backend.QueryDataResponse, error) {
+func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datasourceInfo, responseOpts ResponseOpts, tracer tracing.Tracer) (*backend.QueryDataResponse, error) {
 	result := backend.NewQueryDataResponse()
 
 	api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, logger.FromContext(ctx))
@@ -170,7 +178,7 @@ func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datas
 		logger := logger.FromContext(ctx) // get logger with trace-id and other contextual info
 		logger.Debug("Sending query", "start", query.Start, "end", query.End, "step", query.Step, "query", query.Expr)
 
-		frames, err := runQuery(ctx, api, query)
+		frames, err := runQuery(ctx, api, query, responseOpts)
 
 		span.End()
 		queryRes := backend.DataResponse{}
@@ -187,14 +195,14 @@ func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datas
 }
 
 // we extracted this part of the functionality to make it easy to unit-test it
-func runQuery(ctx context.Context, api *LokiAPI, query *lokiQuery) (data.Frames, error) {
-	frames, err := api.DataQuery(ctx, *query)
+func runQuery(ctx context.Context, api *LokiAPI, query *lokiQuery, responseOpts ResponseOpts) (data.Frames, error) {
+	frames, err := api.DataQuery(ctx, *query, responseOpts)
 	if err != nil {
 		return data.Frames{}, err
 	}
 
 	for _, frame := range frames {
-		if err = adjustFrame(frame, query); err != nil {
+		if err = adjustFrame(frame, query, !responseOpts.metricDataplane); err != nil {
 			return data.Frames{}, err
 		}
 		if err != nil {
diff --git a/pkg/tsdb/loki/loki_bench_test.go b/pkg/tsdb/loki/loki_bench_test.go
index 05e4b6f9273..fa68b0ddc06 100644
--- a/pkg/tsdb/loki/loki_bench_test.go
+++ b/pkg/tsdb/loki/loki_bench_test.go
@@ -17,7 +17,7 @@ func BenchmarkMatrixJson(b *testing.B) {
 
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
-		_, _ = runQuery(context.Background(), makeMockedAPI(http.StatusOK, "application/json", bytes, nil), &lokiQuery{})
+		_, _ = runQuery(context.Background(), makeMockedAPI(http.StatusOK, "application/json", bytes, nil), &lokiQuery{}, ResponseOpts{})
 	}
 }
 
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/empty.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/empty.golden.jsonc
new file mode 100644
index 00000000000..e63a03ad551
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/empty.golden.jsonc
@@ -0,0 +1,5 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/empty.json b/pkg/tsdb/loki/testdata_metric_dataplane/empty.json
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/empty.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_gap.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_gap.golden.jsonc
new file mode 100644
index 00000000000..1e8a5475657
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_gap.golden.jsonc
@@ -0,0 +1,87 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 6 Rows
+//  +-----------------------------------+-----------------+
+//  | Name: Time                        | Name: Value     |
+//  | Labels:                           | Labels:         |
+//  | Type: []time.Time                 | Type: []float64 |
+//  +-----------------------------------+-----------------+
+//  | 2022-01-24 08:54:13.815 +0000 UTC | 50              |
+//  | 2022-01-24 08:59:13.815 +0000 UTC | 57              |
+//  | 2022-01-24 09:04:13.815 +0000 UTC | 55              |
+//  | 2022-01-24 09:34:13.815 +0000 UTC | 54              |
+//  | 2022-01-24 09:39:13.815 +0000 UTC | 55              |
+//  | 2022-01-24 09:44:13.815 +0000 UTC | 56              |
+//  +-----------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "{}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1643014453815,
+            1643014753815,
+            1643015053815,
+            1643016853815,
+            1643017153815,
+            1643017453815
+          ],
+          [
+            50,
+            57,
+            55,
+            54,
+            55,
+            56
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_gap.json b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_gap.json
new file mode 100644
index 00000000000..dbb9224b65d
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_gap.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "matrix",
+    "result": [
+      {
+        "metric": {},
+        "values": [
+          [1643014453.815, "50"],
+          [1643014753.815, "57"],
+          [1643015053.815, "55"],
+          [1643016853.815, "54"],
+          [1643017153.815, "55"],
+          [1643017453.815, "56"]
+        ]
+      }
+    ]
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_inf.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_inf.golden.jsonc
new file mode 100644
index 00000000000..37ee3459d86
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_inf.golden.jsonc
@@ -0,0 +1,114 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 8 Rows
+//  +---------------------------------+--------------------------------------------------+
+//  | Name: Time                      | Name: Value                                      |
+//  | Labels:                         | Labels: level=info, location=moon, protocol=http |
+//  | Type: []time.Time               | Type: []float64                                  |
+//  +---------------------------------+--------------------------------------------------+
+//  | 2022-01-24 10:53:31.1 +0000 UTC | +Inf                                             |
+//  | 2022-01-24 10:58:31.2 +0000 UTC | -Inf                                             |
+//  | 2022-01-24 10:53:31.3 +0000 UTC | +Inf                                             |
+//  | 2022-01-24 10:58:31.4 +0000 UTC | -Inf                                             |
+//  | 2022-01-24 10:53:31.5 +0000 UTC | +Inf                                             |
+//  | 2022-01-24 10:58:31.6 +0000 UTC | -Inf                                             |
+//  | 2022-01-24 10:53:31.7 +0000 UTC | +Inf                                             |
+//  | 2022-01-24 10:58:31.8 +0000 UTC | -Inf                                             |
+//  +---------------------------------+--------------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "info",
+              "location": "moon",
+              "protocol": "http"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"info\", location=\"moon\", protocol=\"http\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1643021611100,
+            1643021911200,
+            1643021611300,
+            1643021911400,
+            1643021611500,
+            1643021911600,
+            1643021611700,
+            1643021911800
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ]
+        ],
+        "entities": [
+          null,
+          {
+            "Inf": [
+              0,
+              2,
+              4,
+              6
+            ],
+            "NegInf": [
+              1,
+              3,
+              5,
+              7
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_inf.json b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_inf.json
new file mode 100644
index 00000000000..a7f95130dc3
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_inf.json
@@ -0,0 +1,25 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "matrix",
+    "result": [
+      {
+        "metric": {
+          "level": "info",
+          "location": "moon",
+          "protocol": "http"
+        },
+        "values": [
+          [1643021611.1, "+Inf"],
+          [1643021911.2, "-Inf"],
+          [1643021611.3, "+Infinity"],
+          [1643021911.4, "-Infinity"],
+          [1643021611.5, "+inf"],
+          [1643021911.6, "-infinity"],
+          [1643021611.7, "+iNf"],
+          [1643021911.8, "-INfInItY"]
+        ]
+      }
+    ]
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_name.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_name.golden.jsonc
new file mode 100644
index 00000000000..76d4efd9a3a
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_name.golden.jsonc
@@ -0,0 +1,75 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------------+
+//  | Name: Time                        | Name: Value                        |
+//  | Labels:                           | Labels: __name__=moon, level=error |
+//  | Type: []time.Time                 | Type: []float64                    |
+//  +-----------------------------------+------------------------------------+
+//  | 2021-12-10 08:36:06.989 +0000 UTC | 0.4                                |
+//  +-----------------------------------+------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "__name__": "moon",
+              "level": "error"
+            },
+            "config": {
+              "displayNameFromDS": "{__name__=\"moon\", level=\"error\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1639125366989
+          ],
+          [
+            0.4
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_name.json b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_name.json
new file mode 100644
index 00000000000..7870730fd9e
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_name.json
@@ -0,0 +1,17 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "matrix",
+    "result": [
+      {
+        "metric": {
+          "level": "error",
+          "__name__": "moon"
+        },
+        "values": [
+          [1639125366.989, "0.4"]
+        ]
+      }
+    ]
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_nan.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_nan.golden.jsonc
new file mode 100644
index 00000000000..4b3a625e366
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_nan.golden.jsonc
@@ -0,0 +1,88 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+-----------------+
+//  | Name: Time                        | Name: Value     |
+//  | Labels:                           | Labels:         |
+//  | Type: []time.Time                 | Type: []float64 |
+//  +-----------------------------------+-----------------+
+//  | 2022-01-24 08:54:10.417 +0000 UTC | NaN             |
+//  | 2022-01-24 08:59:10.517 +0000 UTC | NaN             |
+//  | 2022-01-24 08:54:10.617 +0000 UTC | NaN             |
+//  +-----------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "{}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1643014450417,
+            1643014750517,
+            1643014450617
+          ],
+          [
+            null,
+            null,
+            null
+          ]
+        ],
+        "entities": [
+          null,
+          {
+            "NaN": [
+              0,
+              1,
+              2
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_nan.json b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_nan.json
new file mode 100644
index 00000000000..e862c581992
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_nan.json
@@ -0,0 +1,16 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "matrix",
+    "result": [
+      {
+        "metric": {},
+        "values": [
+          [1643014450.417, "NaN"],
+          [1643014750.517, "nan"],
+          [1643014450.617, "nAn"]
+        ]
+      }
+    ]
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_simple.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_simple.golden.jsonc
new file mode 100644
index 00000000000..c7436ab811a
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_simple.golden.jsonc
@@ -0,0 +1,164 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 4 Rows
+//  +-----------------------------------+------------------------------------+
+//  | Name: Time                        | Name: Value                        |
+//  | Labels:                           | Labels: level=error, location=moon |
+//  | Type: []time.Time                 | Type: []float64                    |
+//  +-----------------------------------+------------------------------------+
+//  | 2021-12-10 08:36:06.989 +0000 UTC | 0.4                                |
+//  | 2021-12-10 08:36:46.989 +0000 UTC | 0.2                                |
+//  | 2021-12-10 08:36:56.989 +0000 UTC | 0.2                                |
+//  | 2021-12-10 08:37:46.989 +0000 UTC | 0.6                                |
+//  +-----------------------------------+------------------------------------+
+//  
+//  
+//  
+//  Frame[1] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-----------------------------------+-----------------------------------+
+//  | Name: Time                        | Name: Value                       |
+//  | Labels:                           | Labels: level=info, location=mars |
+//  | Type: []time.Time                 | Type: []float64                   |
+//  +-----------------------------------+-----------------------------------+
+//  | 2021-12-10 08:36:26.989 +0000 UTC | 0.6                               |
+//  | 2021-12-10 08:36:36.989 +0000 UTC | 0.8                               |
+//  | 2021-12-10 08:36:46.989 +0000 UTC | 0.8                               |
+//  | 2021-12-10 08:36:56.989 +0000 UTC | 0.8                               |
+//  | 2021-12-10 08:37:56.989 +0000 UTC | 2.6                               |
+//  +-----------------------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "error",
+              "location": "moon"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"error\", location=\"moon\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1639125366989,
+            1639125406989,
+            1639125416989,
+            1639125466989
+          ],
+          [
+            0.4,
+            0.2,
+            0.2,
+            0.6
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "info",
+              "location": "mars"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"info\", location=\"mars\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1639125386989,
+            1639125396989,
+            1639125406989,
+            1639125416989,
+            1639125476989
+          ],
+          [
+            0.6,
+            0.8,
+            0.8,
+            0.8,
+            2.6
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_simple.json b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_simple.json
new file mode 100644
index 00000000000..8b3608d2f0b
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_simple.json
@@ -0,0 +1,33 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "matrix",
+    "result": [
+      {
+        "metric": {
+          "level": "error",
+          "location": "moon"
+        },
+        "values": [
+          [1639125366.989, "0.4"],
+          [1639125406.989, "0.2"],
+          [1639125416.989, "0.2"],
+          [1639125466.989, "0.6"]
+        ]
+      },
+      {
+        "metric": {
+          "level": "info",
+          "location": "mars"
+        },
+        "values": [
+          [1639125386.989, "0.6"],
+          [1639125396.989, "0.8"],
+          [1639125406.989, "0.8"],
+          [1639125416.989, "0.8"],
+          [1639125476.989, "2.6"]
+        ]
+      }
+    ]
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_small_step.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_small_step.golden.jsonc
new file mode 100644
index 00000000000..6a515e6c823
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_small_step.golden.jsonc
@@ -0,0 +1,83 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 4 Rows
+//  +-----------------------------------+---------------------+
+//  | Name: Time                        | Name: Value         |
+//  | Labels:                           | Labels: level=error |
+//  | Type: []time.Time                 | Type: []float64     |
+//  +-----------------------------------+---------------------+
+//  | 2021-12-10 08:36:06.511 +0000 UTC | 0.4                 |
+//  | 2021-12-10 08:36:46.512 +0000 UTC | 0.2                 |
+//  | 2021-12-10 08:36:56.513 +0000 UTC | 0.2                 |
+//  | 2021-12-10 08:37:46.514 +0000 UTC | 0.6                 |
+//  +-----------------------------------+---------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "error"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"error\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1639125366511,
+            1639125406512,
+            1639125416513,
+            1639125466514
+          ],
+          [
+            0.4,
+            0.2,
+            0.2,
+            0.6
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_small_step.json b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_small_step.json
new file mode 100644
index 00000000000..7d0d2067548
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_small_step.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "matrix",
+    "result": [
+      {
+        "metric": {
+          "level": "error"
+        },
+        "values": [
+          [1639125366.511, "0.4"],
+          [1639125406.512, "0.2"],
+          [1639125416.513, "0.2"],
+          [1639125466.514, "0.6"]
+        ]
+      }
+    ]
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_with_stats.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_with_stats.golden.jsonc
new file mode 100644
index 00000000000..dc46ac1d1e2
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_with_stats.golden.jsonc
@@ -0,0 +1,365 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 2 Rows
+//  +-----------------------------------+------------------------------------+
+//  | Name: Time                        | Name: Value                        |
+//  | Labels:                           | Labels: level=error, location=moon |
+//  | Type: []time.Time                 | Type: []float64                    |
+//  +-----------------------------------+------------------------------------+
+//  | 2021-12-10 08:36:06.989 +0000 UTC | 0.4                                |
+//  | 2021-12-10 08:36:46.989 +0000 UTC | 0.2                                |
+//  +-----------------------------------+------------------------------------+
+//  
+//  
+//  
+//  Frame[1] {
+//      "type": "timeseries-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 2 Rows
+//  +-----------------------------------+-----------------------------------+
+//  | Name: Time                        | Name: Value                       |
+//  | Labels:                           | Labels: level=info, location=mars |
+//  | Type: []time.Time                 | Type: []float64                   |
+//  +-----------------------------------+-----------------------------------+
+//  | 2021-12-10 08:36:26.989 +0000 UTC | 0.6                               |
+//  | 2021-12-10 08:36:36.989 +0000 UTC | 0.8                               |
+//  +-----------------------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "error",
+              "location": "moon"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"error\", location=\"moon\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1639125366989,
+            1639125406989
+          ],
+          [
+            0.4,
+            0.2
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: up(ALERTS)\nStep: 42s"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "interval": 42000
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "info",
+              "location": "mars"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"info\", location=\"mars\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1639125386989,
+            1639125396989
+          ],
+          [
+            0.6,
+            0.8
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/matrix_with_stats.json b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_with_stats.json
new file mode 100644
index 00000000000..609ce7ff170
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/matrix_with_stats.json
@@ -0,0 +1,60 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "matrix",
+    "result": [
+      {
+        "metric": {
+          "level": "error",
+          "location": "moon"
+        },
+        "values": [
+          [1639125366.989, "0.4"],
+          [1639125406.989, "0.2"]
+        ]
+      },
+      {
+        "metric": {
+          "level": "info",
+          "location": "mars"
+        },
+        "values": [
+          [1639125386.989, "0.6"],
+          [1639125396.989, "0.8"]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/streams_parse_errors.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/streams_parse_errors.golden.jsonc
new file mode 100644
index 00000000000..8dccc85320f
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/streams_parse_errors.golden.jsonc
@@ -0,0 +1,129 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "frameType": "LabeledTimeValues"
+//      },
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 5 Fields by 4 Rows
+//  +------------------------------------------------+-------------------------------+----------------+---------------------+---------------------------------+
+//  | Name: labels                                   | Name: Time                    | Name: Line     | Name: tsNs          | Name: id                        |
+//  | Labels:                                        | Labels:                       | Labels:        | Labels:             | Labels:                         |
+//  | Type: []json.RawMessage                        | Type: []time.Time             | Type: []string | Type: []string      | Type: []string                  |
+//  +------------------------------------------------+-------------------------------+----------------+---------------------+---------------------------------+
+//  | {"__error__":"LogfmtParserErr","place":"moon"} | 2022-06-17 06:49:51 +0000 UTC | "hello1        | 1655448591000000000 | 1655448591000000000_44cbf4ec_sq |
+//  | {"__error__":"LogfmtParserErr","place":"moon"} | 2022-06-17 06:49:54 +0000 UTC | "hello4        | 1655448594000000000 | 1655448594000000000_408b3f5b_sq |
+//  | {"place":"moon","text":"hello3"}               | 2022-06-17 06:49:52 +0000 UTC | text=hello2    | 1655448592000000000 | 1655448592000000000_d1b2086_sq  |
+//  | {"place":"moon","text":"hello4"}               | 2022-06-17 06:49:53 +0000 UTC | text=hello3    | 1655448593000000000 | 1655448593000000000_45714922_sq |
+//  +------------------------------------------------+-------------------------------+----------------+---------------------+---------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "frameType": "LabeledTimeValues"
+          },
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "tsNs",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "__error__": "LogfmtParserErr",
+              "place": "moon"
+            },
+            {
+              "__error__": "LogfmtParserErr",
+              "place": "moon"
+            },
+            {
+              "place": "moon",
+              "text": "hello3"
+            },
+            {
+              "place": "moon",
+              "text": "hello4"
+            }
+          ],
+          [
+            1655448591000,
+            1655448594000,
+            1655448592000,
+            1655448593000
+          ],
+          [
+            "\"hello1",
+            "\"hello4",
+            "text=hello2",
+            "text=hello3"
+          ],
+          [
+            "1655448591000000000",
+            "1655448594000000000",
+            "1655448592000000000",
+            "1655448593000000000"
+          ],
+          [
+            "1655448591000000000_44cbf4ec_sq",
+            "1655448594000000000_408b3f5b_sq",
+            "1655448592000000000_d1b2086_sq",
+            "1655448593000000000_45714922_sq"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/streams_parse_errors.json b/pkg/tsdb/loki/testdata_metric_dataplane/streams_parse_errors.json
new file mode 100644
index 00000000000..3df7cd09781
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/streams_parse_errors.json
@@ -0,0 +1,29 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": { "__error__": "LogfmtParserErr", "place": "moon" },
+        "values": [
+          ["1655448591000000000", "\"hello1"],
+          ["1655448594000000000", "\"hello4"]
+        ]
+      },
+      {
+        "stream": {
+          "place": "moon",
+          "text": "hello3"
+        },
+        "values": [["1655448592000000000", "text=hello2"]]
+      },
+      {
+        "stream": {
+          "place": "moon",
+          "text": "hello4"
+        },
+        "values": [["1655448593000000000", "text=hello3"]]
+      }
+    ]
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/streams_simple.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/streams_simple.golden.jsonc
new file mode 100644
index 00000000000..1d83e77e033
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/streams_simple.golden.jsonc
@@ -0,0 +1,377 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "frameType": "LabeledTimeValues"
+//      },
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 5 Fields by 6 Rows
+//  +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------------+
+//  | Name: labels                          | Name: Time                              | Name: Line       | Name: tsNs          | Name: id                          |
+//  | Labels:                               | Labels:                                 | Labels:          | Labels:             | Labels:                           |
+//  | Type: []json.RawMessage               | Type: []time.Time                       | Type: []string   | Type: []string      | Type: []string                    |
+//  +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------------+
+//  | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC  | log line error 1 | 1645030244810757120 | 1645030244810757120_1d8c2178_sq   |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC  | log line info 1  | 1645030247027735040 | 1645030247027735040_87a7aed2_sq   |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968 | 1645030246277587968_318d05c9_sq   |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968 | 1645030246277587968_318d05c9_1_sq |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3  | 1645030245539423744 | 1645030245539423744_fd17f65c_sq   |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4  | 1645030244091700992 | 1645030244091700992_62ae07f3_sq   |
+//  +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "frameType": "LabeledTimeValues"
+          },
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "tsNs",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "one\",",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1645030244810,
+            1645030247027,
+            1645030246277,
+            1645030246277,
+            1645030245539,
+            1645030244091
+          ],
+          [
+            "log line error 1",
+            "log line info 1",
+            "log line info 2",
+            "log line info 2",
+            "log line info 3",
+            "log line info 4"
+          ],
+          [
+            "1645030244810757120",
+            "1645030247027735040",
+            "1645030246277587968",
+            "1645030246277587968",
+            "1645030245539423744",
+            "1645030244091700992"
+          ],
+          [
+            "1645030244810757120_1d8c2178_sq",
+            "1645030247027735040_87a7aed2_sq",
+            "1645030246277587968_318d05c9_sq",
+            "1645030246277587968_318d05c9_1_sq",
+            "1645030245539423744_fd17f65c_sq",
+            "1645030244091700992_62ae07f3_sq"
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040,
+            587968,
+            587968,
+            423744,
+            700992
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/streams_simple.json b/pkg/tsdb/loki/testdata_metric_dataplane/streams_simple.json
new file mode 100644
index 00000000000..71c0d4ab44b
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/streams_simple.json
@@ -0,0 +1,80 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "one\",",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030244810757120",
+						"log line error 1"
+          ]
+        ]
+      },
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030247027735040",
+						"log line info 1"
+          ],
+          [
+            "1645030246277587968",
+						"log line info 2"
+          ],
+          [
+            "1645030246277587968",
+						"log line info 2"
+          ],
+          [
+            "1645030245539423744",
+						"log line info 3"
+          ],
+          [
+            "1645030244091700992",
+						"log line info 4"
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/vector_simple.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/vector_simple.golden.jsonc
new file mode 100644
index 00000000000..f51330309f2
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/vector_simple.golden.jsonc
@@ -0,0 +1,137 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "numeric-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------------------------+
+//  | Name: Time                    | Name: Value                        |
+//  | Labels:                       | Labels: level=error, location=moon |
+//  | Type: []time.Time             | Type: []float64                    |
+//  +-------------------------------+------------------------------------+
+//  | 2022-02-16 16:41:39 +0000 UTC | 23                                 |
+//  +-------------------------------+------------------------------------+
+//  
+//  
+//  
+//  Frame[1] {
+//      "type": "numeric-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-----------------------------------+
+//  | Name: Time                    | Name: Value                       |
+//  | Labels:                       | Labels: level=info, location=moon |
+//  | Type: []time.Time             | Type: []float64                   |
+//  +-------------------------------+-----------------------------------+
+//  | 2022-02-16 16:41:39 +0000 UTC | 47                                |
+//  +-------------------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "numeric-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "error",
+              "location": "moon"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"error\", location=\"moon\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1645029699000
+          ],
+          [
+            23
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "numeric-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "info",
+              "location": "moon"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"info\", location=\"moon\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1645029699000
+          ],
+          [
+            47
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/vector_simple.json b/pkg/tsdb/loki/testdata_metric_dataplane/vector_simple.json
new file mode 100644
index 00000000000..7c7154c1b71
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/vector_simple.json
@@ -0,0 +1,16 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": { "level": "error", "location": "moon"},
+        "value": [1645029699, "23"]
+      },
+      {
+        "metric": { "level": "info", "location": "moon" },
+        "value": [1645029699, "47"]
+      }
+    ]
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/vector_special_values.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/vector_special_values.golden.jsonc
new file mode 100644
index 00000000000..08abdedd52a
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/vector_special_values.golden.jsonc
@@ -0,0 +1,226 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "numeric-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------------------------+
+//  | Name: Time                    | Name: Value                        |
+//  | Labels:                       | Labels: level=error, location=moon |
+//  | Type: []time.Time             | Type: []float64                    |
+//  +-------------------------------+------------------------------------+
+//  | 2022-02-16 16:41:39 +0000 UTC | +Inf                               |
+//  +-------------------------------+------------------------------------+
+//  
+//  
+//  
+//  Frame[1] {
+//      "type": "numeric-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-----------------------------------+
+//  | Name: Time                    | Name: Value                       |
+//  | Labels:                       | Labels: level=info, location=moon |
+//  | Type: []time.Time             | Type: []float64                   |
+//  +-------------------------------+-----------------------------------+
+//  | 2022-02-16 16:41:39 +0000 UTC | -Inf                              |
+//  +-------------------------------+-----------------------------------+
+//  
+//  
+//  
+//  Frame[2] {
+//      "type": "numeric-multi",
+//      "typeVersion": [
+//          0,
+//          1
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------------------------+
+//  | Name: Time                    | Name: Value                        |
+//  | Labels:                       | Labels: level=debug, location=moon |
+//  | Type: []time.Time             | Type: []float64                    |
+//  +-------------------------------+------------------------------------+
+//  | 2022-02-16 16:41:39 +0000 UTC | NaN                                |
+//  +-------------------------------+------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "numeric-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "error",
+              "location": "moon"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"error\", location=\"moon\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1645029699000
+          ],
+          [
+            null
+          ]
+        ],
+        "entities": [
+          null,
+          {
+            "Inf": [
+              0
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "numeric-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "info",
+              "location": "moon"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"info\", location=\"moon\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1645029699000
+          ],
+          [
+            null
+          ]
+        ],
+        "entities": [
+          null,
+          {
+            "NegInf": [
+              0
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "schema": {
+        "meta": {
+          "type": "numeric-multi",
+          "typeVersion": [
+            0,
+            1
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64"
+            },
+            "labels": {
+              "level": "debug",
+              "location": "moon"
+            },
+            "config": {
+              "displayNameFromDS": "{level=\"debug\", location=\"moon\"}"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1645029699000
+          ],
+          [
+            null
+          ]
+        ],
+        "entities": [
+          null,
+          {
+            "NaN": [
+              0
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/vector_special_values.json b/pkg/tsdb/loki/testdata_metric_dataplane/vector_special_values.json
new file mode 100644
index 00000000000..18979ea3204
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/vector_special_values.json
@@ -0,0 +1,20 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": { "level": "error", "location": "moon"},
+        "value": [1645029699, "+Inf"]
+      },
+      {
+        "metric": { "level": "info", "location": "moon" },
+        "value": [1645029699, "-Inf"]
+      },
+      {
+        "metric": { "level": "debug", "location": "moon" },
+        "value": [1645029699, "NaN"]
+      }
+    ]
+  }
+}

From b928fce070b6d9e559b00a23746405491b06e802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Thu, 13 Apr 2023 15:22:09 +0200
Subject: [PATCH 109/729] Loki: Remove alpha feature toggle lokiDataframeApi
 (#65918)

loki: remove experimental feature-flag
---
 .../feature-toggles/index.md                  |  1 -
 .../src/types/featureToggles.gen.ts           |  1 -
 pkg/services/featuremgmt/registry.go          |  6 ---
 pkg/services/featuremgmt/toggles_gen.csv      |  1 -
 pkg/services/featuremgmt/toggles_gen.go       |  4 --
 pkg/tsdb/loki/streaming.go                    | 16 +-----
 pkg/tsdb/loki/streaming_frame.go              | 52 -------------------
 pkg/tsdb/loki/streaming_frame_test.go         | 40 --------------
 8 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 pkg/tsdb/loki/streaming_frame.go
 delete mode 100644 pkg/tsdb/loki/streaming_frame_test.go

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 60c0b9b771a..8d422d4ff7b 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -68,7 +68,6 @@ Alpha features might be changed or removed without prior notice.
 | `publicDashboards`                 | Enables public access to dashboards                                                                                                                                                                 |
 | `publicDashboardsEmailSharing`     | Enables public dashboard sharing to be restricted to only allowed emails                                                                                                                            |
 | `lokiLive`                         | Support WebSocket streaming for loki (early prototype)                                                                                                                                              |
-| `lokiDataframeApi`                 | Use experimental loki api for WebSocket streaming (early prototype)                                                                                                                                 |
 | `storage`                          | Configurable storage for dashboards, datasources, and resources                                                                                                                                     |
 | `exploreMixedDatasource`           | Enable mixed datasource in Explore                                                                                                                                                                  |
 | `newTraceView`                     | Shows the new trace view design                                                                                                                                                                     |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index f621ef52e3a..6f7fc4701c3 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -29,7 +29,6 @@ export interface FeatureToggles {
   publicDashboards?: boolean;
   publicDashboardsEmailSharing?: boolean;
   lokiLive?: boolean;
-  lokiDataframeApi?: boolean;
   featureHighlights?: boolean;
   migrationLocking?: boolean;
   storage?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index ca9e2abf786..7ebc777cd0c 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -78,12 +78,6 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaObservabilityLogsSquad,
 		},
-		{
-			Name:        "lokiDataframeApi",
-			Description: "Use experimental loki api for WebSocket streaming (early prototype)",
-			State:       FeatureStateAlpha,
-			Owner:       grafanaObservabilityLogsSquad,
-		},
 		{
 			Name:        "featureHighlights",
 			Description: "Highlight Grafana Enterprise features",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 6a424dff587..52a462aef92 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -10,7 +10,6 @@ prometheusAzureOverrideAudience,beta,@grafana/observability-metrics,false,false,
 publicDashboards,alpha,@grafana/dashboards-squad,false,false,false,false
 publicDashboardsEmailSharing,alpha,@grafana/dashboards-squad,false,true,false,false
 lokiLive,alpha,@grafana/observability-logs,false,false,false,false
-lokiDataframeApi,alpha,@grafana/observability-logs,false,false,false,false
 featureHighlights,stable,@grafana/grafana-as-code,false,false,false,false
 migrationLocking,beta,@grafana/backend-platform,false,false,false,false
 storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 9163922ac0a..3893f834bff 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -51,10 +51,6 @@ const (
 	// Support WebSocket streaming for loki (early prototype)
 	FlagLokiLive = "lokiLive"
 
-	// FlagLokiDataframeApi
-	// Use experimental loki api for WebSocket streaming (early prototype)
-	FlagLokiDataframeApi = "lokiDataframeApi"
-
 	// FlagFeatureHighlights
 	// Highlight Grafana Enterprise features
 	FlagFeatureHighlights = "featureHighlights"
diff --git a/pkg/tsdb/loki/streaming.go b/pkg/tsdb/loki/streaming.go
index 09a172ec99c..6c75eb449a6 100644
--- a/pkg/tsdb/loki/streaming.go
+++ b/pkg/tsdb/loki/streaming.go
@@ -13,8 +13,6 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 func (s *Service) SubscribeStream(_ context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
@@ -84,15 +82,9 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
 	params := url.Values{}
 	params.Add("query", query.Expr)
 
-	lokiDataframeApi := s.features.IsEnabled(featuremgmt.FlagLokiDataframeApi)
-
 	wsurl, _ := url.Parse(dsInfo.URL)
 
-	if lokiDataframeApi {
-		wsurl.Path = "/loki/api/v2alpha/tail"
-	} else {
-		wsurl.Path = "/loki/api/v1/tail"
-	}
+	wsurl.Path = "/loki/api/v2alpha/tail"
 
 	if wsurl.Scheme == "https" {
 		wsurl.Scheme = "wss"
@@ -133,11 +125,7 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
 			}
 
 			frame := &data.Frame{}
-			if !lokiDataframeApi {
-				frame, err = lokiBytesToLabeledFrame(message)
-			} else {
-				err = json.Unmarshal(message, &frame)
-			}
+			err = json.Unmarshal(message, &frame)
 
 			if err == nil && frame != nil {
 				next, _ := data.FrameToJSONCache(frame)
diff --git a/pkg/tsdb/loki/streaming_frame.go b/pkg/tsdb/loki/streaming_frame.go
deleted file mode 100644
index e03cd298b7d..00000000000
--- a/pkg/tsdb/loki/streaming_frame.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package loki
-
-import (
-	"encoding/json"
-	"strconv"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-)
-
-type lokiResponse struct {
-	Streams []lokiStream `json:"streams"`
-}
-
-type lokiStream struct {
-	Stream data.Labels `json:"stream"`
-	Values [][2]string `json:"values"`
-}
-
-func lokiBytesToLabeledFrame(msg []byte) (*data.Frame, error) {
-	rsp := &lokiResponse{}
-	err := json.Unmarshal(msg, rsp)
-	if err != nil {
-		return nil, err
-	}
-
-	labelField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
-	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
-	lineField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
-
-	labelField.Name = "__labels" // for now, avoid automatically spreading this by labels
-	timeField.Name = "Time"
-	lineField.Name = "Line"
-
-	for _, stream := range rsp.Streams {
-		label := stream.Stream.String() // TODO -- make it match prom labels!
-		for _, value := range stream.Values {
-			n, err := strconv.ParseInt(value[0], 10, 64)
-			if err != nil {
-				continue
-			}
-			ts := time.Unix(0, n)
-			line := value[1]
-
-			labelField.Append(label)
-			timeField.Append(ts)
-			lineField.Append(line)
-		}
-	}
-
-	return data.NewFrame("", labelField, timeField, lineField), nil
-}
diff --git a/pkg/tsdb/loki/streaming_frame_test.go b/pkg/tsdb/loki/streaming_frame_test.go
deleted file mode 100644
index 659bc8320db..00000000000
--- a/pkg/tsdb/loki/streaming_frame_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package loki
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestLokiFramer(t *testing.T) {
-	t.Run("converting metric name", func(t *testing.T) {
-		msg := []byte(`{"streams":[
-			{"stream":
-			  {"job":"node-exporter","metric":"go_memstats_heap_inuse_bytes"},
-			  "values":[
-				["1642091525267322910","line1"]
-			  ]},
-			{"stream":
-			  {"job":"node-exporter","metric":"go_memstats_heap_inuse_bytes"},
-			  "values":[
-				  ["1642091525770585774","line2"],
-				  ["1642091525770585775","line3"]
-			  ]},
-			{"stream":
-			  {"metric":"go_memstats_heap_inuse_bytes","job":"node-exporter"},
-			  "values":[
-				  ["1642091526263785281","line4"]
-			   ]}
-			]}`)
-
-		frame, err := lokiBytesToLabeledFrame(msg)
-		require.NoError(t, err)
-
-		lines := frame.Fields[2]
-		require.Equal(t, 4, lines.Len())
-		require.Equal(t, "line1", lines.At(0))
-		require.Equal(t, "line2", lines.At(1))
-		require.Equal(t, "line3", lines.At(2))
-		require.Equal(t, "line4", lines.At(3))
-	})
-}

From e2dde66b3fdfae56f64f7973c58ab5c10d833ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 13 Apr 2023 15:27:01 +0200
Subject: [PATCH 110/729] FlameGraph: Refactor and simplify styles (#66433)

* FrameGraphTopTable: Use standard Table component

* Simplify

* Fix test

* Update tests

* Fixing test

* FlameGraph: Refactor and simplify styles

* updated
---
 .../panel/flamegraph/FlameGraphPanel.tsx      |  2 +-
 .../components/FlameGraph/FlameGraph.tsx      | 15 ++-
 .../components/FlameGraphContainer.tsx        | 97 ++++++++++---------
 .../TopTable/FlameGraphTopTableContainer.tsx  | 16 +--
 4 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx b/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx
index f7c289c6e9b..5f3212f6e69 100644
--- a/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx
+++ b/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx
@@ -5,5 +5,5 @@ import { CoreApp, PanelProps } from '@grafana/data';
 import FlameGraphContainer from './components/FlameGraphContainer';
 
 export const FlameGraphPanel = (props: PanelProps) => {
-  return <FlameGraphContainer data={props.data.series[0]} app={CoreApp.Unknown} flameGraphHeight={props.height} />;
+  return <FlameGraphContainer data={props.data.series[0]} app={CoreApp.Unknown} />;
 };
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.tsx
index ed381659a5f..dd450a5b2f3 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.tsx
@@ -22,6 +22,7 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMeasure } from 'react-use';
 
 import { CoreApp } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
 
 import { PIXELS_PER_LEVEL } from '../../constants';
 import { SelectedView, ContextMenuData } from '../types';
@@ -35,7 +36,6 @@ import { getBarX, getRectDimensionsForLevel, renderRect } from './rendering';
 type Props = {
   data: FlameGraphDataContainer;
   app: CoreApp;
-  flameGraphHeight?: number;
   levels: LevelItem[][];
   topLevelIndex: number;
   selectedBarIndex: number;
@@ -53,7 +53,6 @@ type Props = {
 const FlameGraph = ({
   data,
   app,
-  flameGraphHeight,
   levels,
   topLevelIndex,
   selectedBarIndex,
@@ -66,7 +65,7 @@ const FlameGraph = ({
   setRangeMax,
   selectedView,
 }: Props) => {
-  const styles = getStyles(selectedView, app, flameGraphHeight);
+  const styles = useStyles2(getStyles);
   const totalTicks = data.getValue(0);
 
   const [sizeRef, { width: wrapperWidth }] = useMeasure<HTMLDivElement>();
@@ -233,14 +232,12 @@ const FlameGraph = ({
   );
 };
 
-const getStyles = (selectedView: SelectedView, app: CoreApp, flameGraphHeight: number | undefined) => ({
+const getStyles = () => ({
   graph: css`
-    float: left;
     overflow: scroll;
-    width: ${selectedView === SelectedView.FlameGraph ? '100%' : '50%'};
-    ${app !== CoreApp.Explore
-      ? `height: calc(${flameGraphHeight}px - 50px)`
-      : ''}; // 50px to adjust for header pushing content down
+    height: 100%;
+    flex-grow: 1;
+    flex-basis: 50%;
   `,
   canvasContainer: css`
     cursor: pointer;
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.tsx
index df4368b782f..ae3724c4f0b 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.tsx
@@ -2,10 +2,10 @@ import { css } from '@emotion/css';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useMeasure } from 'react-use';
 
-import { DataFrame, CoreApp } from '@grafana/data';
+import { DataFrame, CoreApp, GrafanaTheme2 } from '@grafana/data';
 import { useStyles2, useTheme2 } from '@grafana/ui';
 
-import { MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH, PIXELS_PER_LEVEL } from '../constants';
+import { MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH } from '../constants';
 
 import FlameGraph from './FlameGraph/FlameGraph';
 import { FlameGraphDataContainer, LevelItem, nestedSetToLevels } from './FlameGraph/dataTransform';
@@ -16,10 +16,6 @@ import { SelectedView } from './types';
 type Props = {
   data?: DataFrame;
   app: CoreApp;
-  // Height for flame graph when not used in explore.
-  // This needs to be different to explore flame graph height as we
-  // use panels with user adjustable heights in dashboards etc.
-  flameGraphHeight?: number;
 };
 
 const FlameGraphContainer = (props: Props) => {
@@ -44,7 +40,7 @@ const FlameGraphContainer = (props: Props) => {
     return [container, nestedSetToLevels(container)];
   }, [props.data, theme]);
 
-  const styles = useStyles2(() => getStyles(props.app, PIXELS_PER_LEVEL * (levels?.length ?? 0)));
+  const styles = useStyles2(getStyles);
 
   // If user resizes window with both as the selected view
   useEffect(() => {
@@ -81,49 +77,62 @@ const FlameGraphContainer = (props: Props) => {
             containerWidth={containerWidth}
           />
 
-          {selectedView !== SelectedView.FlameGraph && (
-            <FlameGraphTopTableContainer
-              data={dataContainer}
-              app={props.app}
-              totalLevels={levels.length}
-              selectedView={selectedView}
-              search={search}
-              setSearch={setSearch}
-              setTopLevelIndex={setTopLevelIndex}
-              setSelectedBarIndex={setSelectedBarIndex}
-              setRangeMin={setRangeMin}
-              setRangeMax={setRangeMax}
-            />
-          )}
+          <div className={styles.body}>
+            {selectedView !== SelectedView.FlameGraph && (
+              <FlameGraphTopTableContainer
+                data={dataContainer}
+                app={props.app}
+                totalLevels={levels.length}
+                selectedView={selectedView}
+                search={search}
+                setSearch={setSearch}
+                setTopLevelIndex={setTopLevelIndex}
+                setSelectedBarIndex={setSelectedBarIndex}
+                setRangeMin={setRangeMin}
+                setRangeMax={setRangeMax}
+              />
+            )}
 
-          {selectedView !== SelectedView.TopTable && (
-            <FlameGraph
-              data={dataContainer}
-              app={props.app}
-              flameGraphHeight={props.flameGraphHeight}
-              levels={levels}
-              topLevelIndex={topLevelIndex}
-              selectedBarIndex={selectedBarIndex}
-              rangeMin={rangeMin}
-              rangeMax={rangeMax}
-              search={search}
-              setTopLevelIndex={setTopLevelIndex}
-              setSelectedBarIndex={setSelectedBarIndex}
-              setRangeMin={setRangeMin}
-              setRangeMax={setRangeMax}
-              selectedView={selectedView}
-            />
-          )}
+            {selectedView !== SelectedView.TopTable && (
+              <FlameGraph
+                data={dataContainer}
+                app={props.app}
+                levels={levels}
+                topLevelIndex={topLevelIndex}
+                selectedBarIndex={selectedBarIndex}
+                rangeMin={rangeMin}
+                rangeMax={rangeMax}
+                search={search}
+                setTopLevelIndex={setTopLevelIndex}
+                setSelectedBarIndex={setSelectedBarIndex}
+                setRangeMin={setRangeMin}
+                setRangeMax={setRangeMax}
+                selectedView={selectedView}
+              />
+            )}
+          </div>
         </div>
       )}
     </>
   );
 };
 
-const getStyles = (app: CoreApp, height: number) => ({
-  container: css`
-    height: ${app === CoreApp.Explore ? height + 'px' : '100%'};
-  `,
-});
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      height: '100%',
+      display: 'flex',
+      flex: '1 1 0',
+      flexDirection: 'column',
+      minHeight: 0,
+      gap: theme.spacing(2),
+    }),
+    body: css({
+      display: 'flex',
+      flexGrow: 1,
+      minHeight: 0,
+    }),
+  };
+}
 
 export default FlameGraphContainer;
diff --git a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
index 3ef85d5e51b..5e7c4a78e5e 100644
--- a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
+++ b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
@@ -43,7 +43,7 @@ const FlameGraphTopTableContainer = ({
   setRangeMin,
   setRangeMax,
 }: Props) => {
-  const styles = useStyles2(() => getStyles(selectedView, app));
+  const styles = useStyles2(getStyles);
 
   const onSymbolClick = (symbol: string) => {
     if (search === symbol) {
@@ -148,18 +148,12 @@ function buildTableDataFrame(
   return dataFrames[0];
 }
 
-const getStyles = (selectedView: SelectedView, app: CoreApp) => {
-  const marginRight = '20px';
-
+const getStyles = () => {
   return {
     topTableContainer: css`
-      cursor: pointer;
-      float: left;
-      margin-right: ${marginRight};
-      width: ${selectedView === SelectedView.TopTable ? '100%' : `calc(50% - ${marginRight})`};
-      ${app !== CoreApp.Explore
-        ? 'height: calc(100% - 50px)'
-        : 'height: calc(100% + 50px)'}; // 50px to adjust for header pushing content down
+      flex-grow: 1;
+      flex-basis: 50%;
+      overflow: hidden;
     `,
   };
 };

From 9964441b80d4b26a2b024e5322345126c6f70394 Mon Sep 17 00:00:00 2001
From: juanicabanas <juan.cabanas@grafana.com>
Date: Thu, 13 Apr 2023 10:29:09 -0300
Subject: [PATCH 111/729] PublicDashboards: Code formatted (#66462)

---
 pkg/services/publicdashboards/public_dashboard_service_mock.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/publicdashboards/public_dashboard_service_mock.go b/pkg/services/publicdashboards/public_dashboard_service_mock.go
index b5d72558bf1..886cd340ec4 100644
--- a/pkg/services/publicdashboards/public_dashboard_service_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_service_mock.go
@@ -461,4 +461,4 @@ func NewFakePublicDashboardService(t mockConstructorTestingTNewFakePublicDashboa
 	t.Cleanup(func() { mock.AssertExpectations(t) })
 
 	return mock
-}
\ No newline at end of file
+}

From 85b56d4f52cc5d7f3c9153ea6b9addd39f67a84b Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:42:11 +0100
Subject: [PATCH 112/729] Tracing: Update provisioning docs (#66055)

Update provisioning docs
---
 docs/sources/datasources/jaeger/_index.md | 4 ++++
 docs/sources/datasources/tempo/_index.md  | 8 ++++----
 docs/sources/datasources/zipkin/_index.md | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/sources/datasources/jaeger/_index.md b/docs/sources/datasources/jaeger/_index.md
index ad0d61fdb61..2d6a7e19a22 100644
--- a/docs/sources/datasources/jaeger/_index.md
+++ b/docs/sources/datasources/jaeger/_index.md
@@ -192,6 +192,10 @@ datasources:
             query: 'sum(rate(traces_spanmetrics_latency_bucket{$__tags}[5m]))'
       nodeGraph:
         enabled: true
+      traceQuery:
+        timeShiftEnabled: true
+        spanStartTimeShift: '1h'
+        spanEndTimeShift: '-1h'
       spanBar:
         type: 'None'
     secureJsonData:
diff --git a/docs/sources/datasources/tempo/_index.md b/docs/sources/datasources/tempo/_index.md
index 0b10a4bada8..d37e97da545 100644
--- a/docs/sources/datasources/tempo/_index.md
+++ b/docs/sources/datasources/tempo/_index.md
@@ -228,13 +228,13 @@ datasources:
         hide: false
       lokiSearch:
         datasourceUid: 'loki'
+      traceQuery:
+        timeShiftEnabled: true
+        spanStartTimeShift: '1h'
+        spanEndTimeShift: '-1h'
       spanBar:
         type: 'Tag'
         tag: 'http.path'
-      traceQuery:
-        timeShiftEnabled: true
-        spanStartTimeShift: 15m
-        spanEndTimeShift: 20m
 ```
 
 ## Query the data source
diff --git a/docs/sources/datasources/zipkin/_index.md b/docs/sources/datasources/zipkin/_index.md
index c3cb2878c66..7cd554d230f 100644
--- a/docs/sources/datasources/zipkin/_index.md
+++ b/docs/sources/datasources/zipkin/_index.md
@@ -190,6 +190,10 @@ datasources:
             query: 'sum(rate(traces_spanmetrics_latency_bucket{$__tags}[5m]))'
       nodeGraph:
         enabled: true
+      traceQuery:
+        timeShiftEnabled: true
+        spanStartTimeShift: '1h'
+        spanEndTimeShift: '-1h'
       spanBar:
         type: 'None'
     secureJsonData:

From 4796a63554237f14c5e804dab84b772e923c8415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 13 Apr 2023 15:50:49 +0200
Subject: [PATCH 113/729] InteractiveTable: Updated design and minor tweak to
 Correlactions page (#66443)

* InteractiveTable: Updated design

* Fix css issue

* Fixed test

* Removed leftover
---
 .../InteractiveTable/InteractiveTable.tsx     | 149 +++++++++++-------
 .../correlations/CorrelationsPage.test.tsx    |  23 ++-
 .../correlations/CorrelationsPage.tsx         |  22 +--
 3 files changed, 120 insertions(+), 74 deletions(-)

diff --git a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.tsx b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.tsx
index 8801e8ec529..e556c4388fd 100644
--- a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.tsx
+++ b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.tsx
@@ -11,57 +11,90 @@ import { Icon } from '../Icon/Icon';
 import { Column } from './types';
 import { EXPANDER_CELL_ID, getColumns } from './utils';
 
-const getStyles = (theme: GrafanaTheme2) => ({
-  table: css`
-    border-radius: ${theme.shape.borderRadius()};
-    border: solid 1px ${theme.colors.border.weak};
-    background-color: ${theme.colors.background.secondary};
-    width: 100%;
+const getStyles = (theme: GrafanaTheme2) => {
+  const rowHoverBg = theme.colors.emphasize(theme.colors.background.primary, 0.03);
 
-    td {
-      padding: ${theme.spacing(1)};
-    }
-
-    td,
-    th {
-      min-width: ${theme.spacing(3)};
-    }
-  `,
-  evenRow: css`
-    background: ${theme.colors.background.primary};
-  `,
-  disableGrow: css`
-    width: 0%;
-  `,
-  header: css`
-    &,
-    & > button {
-      position: relative;
-      white-space: nowrap;
-      padding: ${theme.spacing(1)};
-    }
-    & > button {
-      &:after {
-        content: '\\00a0';
-      }
+  return {
+    table: css`
+      border-radius: ${theme.shape.borderRadius()};
       width: 100%;
-      height: 100%;
-      background: none;
-      border: none;
-      padding-right: ${theme.spacing(2.5)};
-      text-align: left;
-      &:hover {
-        background-color: ${theme.colors.emphasize(theme.colors.background.secondary, 0.05)};
+
+      td {
+        padding: ${theme.spacing(1)};
       }
-    }
-  `,
-  sortableHeader: css`
-    /* increases selector's specificity so that it always takes precedence over default styles  */
-    && {
-      padding: 0;
-    }
-  `,
-});
+
+      td,
+      th {
+        min-width: ${theme.spacing(3)};
+      }
+    `,
+    disableGrow: css`
+      width: 0%;
+    `,
+    header: css`
+      border-bottom: 1px solid ${theme.colors.border.weak};
+      &,
+      & > button {
+        position: relative;
+        white-space: nowrap;
+        padding: ${theme.spacing(1)};
+      }
+      & > button {
+        &:after {
+          content: '\\00a0';
+        }
+        width: 100%;
+        height: 100%;
+        background: none;
+        border: none;
+        padding-right: ${theme.spacing(2.5)};
+        text-align: left;
+        font-weight: ${theme.typography.fontWeightMedium};
+      }
+    `,
+    row: css`
+      label: row;
+      border-bottom: 1px solid ${theme.colors.border.weak};
+
+      &:hover {
+        background-color: ${rowHoverBg};
+      }
+
+      &:last-child {
+        border-bottom: 0;
+      }
+    `,
+    expandedRow: css`
+      label: expanded-row-content;
+      border-bottom: none;
+    `,
+    expandedContentRow: css`
+      label: expanded-row-content;
+
+      td {
+        border-bottom: 1px solid ${theme.colors.border.weak};
+        position: relative;
+        padding: ${theme.spacing(2, 2, 2, 5)};
+
+        &:before {
+          content: '';
+          position: absolute;
+          width: 1px;
+          top: 0;
+          left: 16px;
+          bottom: ${theme.spacing(2)};
+          background: ${theme.colors.border.medium};
+        }
+      }
+    `,
+    sortableHeader: css`
+      /* increases selector's specificity so that it always takes precedence over default styles  */
+      && {
+        padding: 0;
+      }
+    `,
+  };
+};
 
 interface Props<TableData extends object> {
   /**
@@ -161,14 +194,15 @@ export function InteractiveTable<TableData extends object>({
       </thead>
 
       <tbody {...getTableBodyProps()}>
-        {rows.map((row, rowIndex) => {
-          const className = cx(rowIndex % 2 === 0 && styles.evenRow);
+        {rows.map((row) => {
           const { key, ...otherRowProps } = row.getRowProps();
           const rowId = getRowHTMLID(row);
+          // @ts-expect-error react-table doesn't ship with useExpanded types and we can't use declaration merging without affecting the table viz
+          const isExpanded = row.isExpanded;
 
           return (
             <Fragment key={key}>
-              <tr className={className} {...otherRowProps}>
+              <tr {...otherRowProps} className={cx(styles.row, isExpanded && styles.expandedRow)}>
                 {row.cells.map((cell) => {
                   const { key, ...otherCellProps } = cell.getCellProps();
                   return (
@@ -178,14 +212,11 @@ export function InteractiveTable<TableData extends object>({
                   );
                 })}
               </tr>
-              {
-                // @ts-expect-error react-table doesn't ship with useExpanded types and we can't use declaration merging without affecting the table viz
-                row.isExpanded && renderExpandedRow && (
-                  <tr className={className} {...otherRowProps} id={rowId}>
-                    <td colSpan={row.cells.length}>{renderExpandedRow(row.original)}</td>
-                  </tr>
-                )
-              }
+              {isExpanded && renderExpandedRow && (
+                <tr {...otherRowProps} id={rowId} className={styles.expandedContentRow}>
+                  <td colSpan={row.cells.length}>{renderExpandedRow(row.original)}</td>
+                </tr>
+              )}
             </Fragment>
           );
         })}
diff --git a/public/app/features/correlations/CorrelationsPage.test.tsx b/public/app/features/correlations/CorrelationsPage.test.tsx
index 9b9430cd34c..4de653007fc 100644
--- a/public/app/features/correlations/CorrelationsPage.test.tsx
+++ b/public/app/features/correlations/CorrelationsPage.test.tsx
@@ -173,12 +173,23 @@ const mocks = {
   reportInteraction: jest.fn(),
 };
 
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  reportInteraction: (...args: Parameters<typeof reportInteraction>) => {
-    mocks.reportInteraction(...args);
-  },
-}));
+jest.mock('@grafana/runtime', () => {
+  const runtime = jest.requireActual('@grafana/runtime');
+
+  return {
+    ...runtime,
+    config: {
+      ...runtime.config,
+      featureToggles: {
+        ...runtime.config.featureToggles,
+        topnav: true,
+      },
+    },
+    reportInteraction: (...args: Parameters<typeof reportInteraction>) => {
+      mocks.reportInteraction(...args);
+    },
+  };
+});
 
 beforeAll(() => {
   mocks.contextSrv.hasPermission.mockImplementation(() => true);
diff --git a/public/app/features/correlations/CorrelationsPage.tsx b/public/app/features/correlations/CorrelationsPage.tsx
index 119e5b66452..f04d6d9e1dc 100644
--- a/public/app/features/correlations/CorrelationsPage.tsx
+++ b/public/app/features/correlations/CorrelationsPage.tsx
@@ -144,22 +144,26 @@ export default function CorrelationsPage() {
   );
 
   const data = useMemo(() => get.value, [get.value]);
-
   const showEmptyListCTA = data?.length === 0 && !isAdding && !get.error;
+  const addButton = canWriteCorrelations && data?.length !== 0 && data !== undefined && !isAdding && (
+    <Button icon="plus" onClick={() => setIsAdding(true)}>
+      Add new
+    </Button>
+  );
 
   return (
-    <Page navModel={navModel}>
+    <Page
+      navModel={navModel}
+      subTitle="Define how data living in different data sources relates to each other."
+      actions={addButton}
+    >
       <Page.Contents>
         <div>
           <HorizontalGroup justify="space-between">
-            <div>
+            <Page.OldNavOnly>
               <p>Define how data living in different data sources relates to each other.</p>
-            </div>
-            {canWriteCorrelations && data?.length !== 0 && data !== undefined && !isAdding && (
-              <Button icon="plus" onClick={() => setIsAdding(true)}>
-                Add new
-              </Button>
-            )}
+            </Page.OldNavOnly>
+            <Page.OldNavOnly>{addButton}</Page.OldNavOnly>
           </HorizontalGroup>
         </div>
 

From 22fde6a3f2495a44757253b74823b6ab6fb84f61 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:56:35 +0100
Subject: [PATCH 114/729] Tracing: Add links to documentation in config pages
 (#66442)

Add links to documentation in config pages and clean up styles
---
 public/app/core/components/DocsLinkButton.tsx | 26 +++++++++++++++++++
 .../app/core/components/NodeGraphSettings.tsx | 22 +++++++++++++---
 .../TraceToLogs/TraceToLogsSettings.tsx       |  7 ++++-
 .../TraceToMetrics/TraceToMetricsSettings.tsx |  6 ++++-
 .../components/settings/SpanBarSettings.tsx   |  5 ++--
 .../configuration/LokiSearchSettings.tsx      | 23 +++++-----------
 .../tempo/configuration/QuerySettings.tsx     |  9 +++----
 .../tempo/configuration/SearchSettings.tsx    | 25 +++++++++---------
 .../configuration/ServiceGraphSettings.tsx    | 25 +++++++-----------
 .../configuration/TraceQLSearchSettings.tsx   | 23 +++++++---------
 10 files changed, 101 insertions(+), 70 deletions(-)
 create mode 100644 public/app/core/components/DocsLinkButton.tsx

diff --git a/public/app/core/components/DocsLinkButton.tsx b/public/app/core/components/DocsLinkButton.tsx
new file mode 100644
index 00000000000..fb476deea10
--- /dev/null
+++ b/public/app/core/components/DocsLinkButton.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+
+import { LinkButton } from '@grafana/ui';
+
+type Props = {
+  hrefSuffix: string;
+};
+
+export function DocsLinkButton(props: Props) {
+  const { hrefSuffix } = props;
+  const tooltip = 'Learn more in the Grafana docs';
+
+  return (
+    <LinkButton
+      aria-label={tooltip}
+      icon="external-link-alt"
+      fill="text"
+      href={`https://grafana.com/docs/grafana/next/datasources/${hrefSuffix}`}
+      variant="secondary"
+      size="md"
+      target="_blank"
+      tooltip={tooltip}
+      tooltipPlacement="top"
+    />
+  );
+}
diff --git a/public/app/core/components/NodeGraphSettings.tsx b/public/app/core/components/NodeGraphSettings.tsx
index 1cf1dd9b7f3..459beda1aeb 100644
--- a/public/app/core/components/NodeGraphSettings.tsx
+++ b/public/app/core/components/NodeGraphSettings.tsx
@@ -4,9 +4,12 @@ import React from 'react';
 import {
   DataSourceJsonData,
   DataSourcePluginOptionsEditorProps,
+  GrafanaTheme2,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
-import { InlineField, InlineFieldRow, InlineSwitch } from '@grafana/ui';
+import { InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui';
+
+import { DocsLinkButton } from './DocsLinkButton';
 
 export interface NodeGraphOptions {
   enabled?: boolean;
@@ -19,9 +22,17 @@ export interface NodeGraphData extends DataSourceJsonData {
 interface Props extends DataSourcePluginOptionsEditorProps<NodeGraphData> {}
 
 export function NodeGraphSettings({ options, onOptionsChange }: Props) {
+  const styles = useStyles2(getStyles);
+
   return (
     <div className={styles.container}>
       <h3 className="page-heading">Node graph</h3>
+
+      <div className={styles.infoText}>
+        {`Show or hide the node graph visualization`}
+        <DocsLinkButton hrefSuffix={`${options.type}/#node-graph`} />
+      </div>
+
       <InlineFieldRow className={styles.row}>
         <InlineField
           tooltip="Displays the node graph above the trace view. Default: disabled"
@@ -44,7 +55,12 @@ export function NodeGraphSettings({ options, onOptionsChange }: Props) {
   );
 }
 
-const styles = {
+const getStyles = (theme: GrafanaTheme2) => ({
+  infoText: css`
+    label: infoText;
+    padding-bottom: ${theme.spacing(2)};
+    color: ${theme.colors.text.secondary};
+  `,
   container: css`
     label: container;
     width: 100%;
@@ -53,4 +69,4 @@ const styles = {
     label: row;
     align-items: baseline;
   `,
-};
+});
diff --git a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx b/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
index 669fc237033..d572983fdb9 100644
--- a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
+++ b/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
@@ -10,6 +10,8 @@ import {
 import { DataSourcePicker } from '@grafana/runtime';
 import { InlineField, InlineFieldRow, Input, useStyles2, InlineSwitch } from '@grafana/ui';
 
+import { DocsLinkButton } from '../DocsLinkButton';
+
 import { TagMappingInput } from './TagMappingInput';
 
 // @deprecated use getTraceToLogsOptions to get the v2 version of this config from jsonData
@@ -107,7 +109,10 @@ export function TraceToLogsSettings({ options, onOptionsChange }: Props) {
     <div className={css({ width: '100%' })}>
       <h3 className="page-heading">Trace to logs</h3>
 
-      <div className={styles.infoText}>Navigate from a trace span to the selected data source&apos;s logs.</div>
+      <div className={styles.infoText}>
+        Navigate from a trace span to the selected data source&apos;s logs
+        <DocsLinkButton hrefSuffix={`${options.type}/#trace-to-logs`} />
+      </div>
 
       <InlineFieldRow>
         <InlineField
diff --git a/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx b/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx
index 0d70787550e..2e6a12662e1 100644
--- a/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx
+++ b/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx
@@ -10,6 +10,7 @@ import {
 import { DataSourcePicker } from '@grafana/runtime';
 import { Button, InlineField, InlineFieldRow, Input, useStyles2 } from '@grafana/ui';
 
+import { DocsLinkButton } from '../DocsLinkButton';
 import { TagMappingInput } from '../TraceToLogs/TagMappingInput';
 
 export interface TraceToMetricsOptions {
@@ -38,7 +39,10 @@ export function TraceToMetricsSettings({ options, onOptionsChange }: Props) {
     <div className={css({ width: '100%' })}>
       <h3 className="page-heading">Trace to metrics</h3>
 
-      <div className={styles.infoText}>Navigate from a trace span to the selected data source&apos;s metrics.</div>
+      <div className={styles.infoText}>
+        Navigate from a trace span to the selected data source&apos;s metrics
+        <DocsLinkButton hrefSuffix={`${options.type}/#trace-to-metrics`} />
+      </div>
 
       <InlineFieldRow className={styles.row}>
         <InlineField
diff --git a/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
index 5beba96c5b8..a59323f27ad 100644
--- a/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
+++ b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
@@ -9,6 +9,7 @@ import {
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
 import { InlineField, InlineFieldRow, Input, Select, useStyles2 } from '@grafana/ui';
+import { DocsLinkButton } from 'app/core/components/DocsLinkButton';
 
 export interface SpanBarOptions {
   type?: string;
@@ -34,7 +35,8 @@ export default function SpanBarSettings({ options, onOptionsChange }: Props) {
       <h3 className="page-heading">Span bar</h3>
 
       <div className={styles.infoText}>
-        Add additional info next to the service and operation on a span bar row in the trace view.
+        Add additional info next to the service and operation on a span bar row in the trace view
+        <DocsLinkButton hrefSuffix={`${options.type}/#span-bar`} />
       </div>
 
       <InlineFieldRow className={styles.row}>
@@ -88,7 +90,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
     padding-bottom: ${theme.spacing(2)};
     color: ${theme.colors.text.secondary};
   `,
-
   row: css`
     label: row;
     align-items: baseline;
diff --git a/public/app/plugins/datasource/tempo/configuration/LokiSearchSettings.tsx b/public/app/plugins/datasource/tempo/configuration/LokiSearchSettings.tsx
index eb2cbb51e8a..e43ba60e472 100644
--- a/public/app/plugins/datasource/tempo/configuration/LokiSearchSettings.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/LokiSearchSettings.tsx
@@ -1,12 +1,14 @@
-import { css } from '@emotion/css';
 import React from 'react';
 
-import { DataSourcePluginOptionsEditorProps, GrafanaTheme2, updateDatasourcePluginJsonDataOption } from '@grafana/data';
+import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption } from '@grafana/data';
 import { DataSourcePicker } from '@grafana/runtime';
 import { Button, InlineField, InlineFieldRow, useStyles2 } from '@grafana/ui';
+import { DocsLinkButton } from 'app/core/components/DocsLinkButton';
 
 import { TempoJsonData } from '../types';
 
+import { getStyles } from './QuerySettings';
+
 interface Props extends DataSourcePluginOptionsEditorProps<TempoJsonData> {}
 
 export function LokiSearchSettings({ options, onOptionsChange }: Props) {
@@ -23,11 +25,12 @@ export function LokiSearchSettings({ options, onOptionsChange }: Props) {
   }
 
   return (
-    <div className={css({ width: '100%' })}>
+    <div className={styles.container}>
       <h3 className="page-heading">Loki search</h3>
 
       <div className={styles.infoText}>
-        Select a Loki data source to search for traces. Derived fields must be configured in the Loki data source.
+        Select a Loki data source to search for traces. Derived fields must be configured in the Loki data source
+        <DocsLinkButton hrefSuffix="tempo/#loki-search" />
       </div>
 
       <InlineFieldRow className={styles.row}>
@@ -64,15 +67,3 @@ export function LokiSearchSettings({ options, onOptionsChange }: Props) {
     </div>
   );
 }
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  infoText: css`
-    label: infoText;
-    padding-bottom: ${theme.spacing(2)};
-    color: ${theme.colors.text.secondary};
-  `,
-  row: css`
-    label: row;
-    align-items: baseline;
-  `,
-});
diff --git a/public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx b/public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx
index f8f0f154b8b..d901982dce9 100644
--- a/public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps, GrafanaTheme2, updateDatasourcePluginJsonDataOption } from '@grafana/data';
 import { InlineField, InlineFieldRow, InlineSwitch, Input, useStyles2 } from '@grafana/ui';
+import { DocsLinkButton } from 'app/core/components/DocsLinkButton';
 
 import { TempoJsonData } from '../types';
 
@@ -16,7 +17,8 @@ export function QuerySettings({ options, onOptionsChange }: Props) {
       <h3 className="page-heading">TraceID query</h3>
 
       <div className={styles.infoText}>
-        Modify how TraceID queries are run. These settings do not apply to TraceQL queries.
+        Modify how TraceID queries are run
+        <DocsLinkButton hrefSuffix="tempo/#traceid-query" />
       </div>
 
       <InlineField
@@ -83,18 +85,15 @@ export function QuerySettings({ options, onOptionsChange }: Props) {
   );
 }
 
-const getStyles = (theme: GrafanaTheme2) => ({
+export const getStyles = (theme: GrafanaTheme2) => ({
   infoText: css`
-    label: infoText;
     padding-bottom: ${theme.spacing(2)};
     color: ${theme.colors.text.secondary};
   `,
   container: css`
-    label: container;
     width: 100%;
   `,
   row: css`
-    label: row;
     align-items: baseline;
   `,
 });
diff --git a/public/app/plugins/datasource/tempo/configuration/SearchSettings.tsx b/public/app/plugins/datasource/tempo/configuration/SearchSettings.tsx
index 0e0ef4bd4f2..f674a718862 100644
--- a/public/app/plugins/datasource/tempo/configuration/SearchSettings.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/SearchSettings.tsx
@@ -1,17 +1,27 @@
-import { css } from '@emotion/css';
 import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption } from '@grafana/data';
-import { InlineField, InlineFieldRow, InlineSwitch } from '@grafana/ui';
+import { InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui';
+import { DocsLinkButton } from 'app/core/components/DocsLinkButton';
 
 import { TempoJsonData } from '../types';
 
+import { getStyles } from './QuerySettings';
+
 interface Props extends DataSourcePluginOptionsEditorProps<TempoJsonData> {}
 
 export function SearchSettings({ options, onOptionsChange }: Props) {
+  const styles = useStyles2(getStyles);
+
   return (
     <div className={styles.container}>
       <h3 className="page-heading">Tempo search</h3>
+
+      <div className={styles.infoText}>
+        Modify how traces are searched
+        <DocsLinkButton hrefSuffix="tempo/#tempo-search" />
+      </div>
+
       <InlineFieldRow className={styles.row}>
         <InlineField tooltip="Removes the search tab from the query editor" label="Hide search" labelWidth={26}>
           <InlineSwitch
@@ -29,14 +39,3 @@ export function SearchSettings({ options, onOptionsChange }: Props) {
     </div>
   );
 }
-
-const styles = {
-  container: css`
-    label: container;
-    width: 100%;
-  `,
-  row: css`
-    label: row;
-    align-items: baseline;
-  `,
-};
diff --git a/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx b/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
index 28dad5caaec..e947f0fd044 100644
--- a/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
@@ -1,22 +1,27 @@
-import { css } from '@emotion/css';
 import React from 'react';
 
-import { DataSourcePluginOptionsEditorProps, GrafanaTheme2, updateDatasourcePluginJsonDataOption } from '@grafana/data';
+import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption } from '@grafana/data';
 import { DataSourcePicker } from '@grafana/runtime';
 import { Button, InlineField, InlineFieldRow, useStyles2 } from '@grafana/ui';
+import { DocsLinkButton } from 'app/core/components/DocsLinkButton';
 
 import { TempoJsonData } from '../types';
 
+import { getStyles } from './QuerySettings';
+
 interface Props extends DataSourcePluginOptionsEditorProps<TempoJsonData> {}
 
 export function ServiceGraphSettings({ options, onOptionsChange }: Props) {
   const styles = useStyles2(getStyles);
 
   return (
-    <div className={css({ width: '100%' })}>
+    <div className={styles.container}>
       <h3 className="page-heading">Service graph</h3>
 
-      <div className={styles.infoText}>Select a Prometheus data source that contains the service graph data.</div>
+      <div className={styles.infoText}>
+        Select a Prometheus data source that contains the service graph data
+        <DocsLinkButton hrefSuffix="tempo/#service-graph" />
+      </div>
 
       <InlineFieldRow className={styles.row}>
         <InlineField
@@ -56,15 +61,3 @@ export function ServiceGraphSettings({ options, onOptionsChange }: Props) {
     </div>
   );
 }
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  infoText: css`
-    label: infoText;
-    padding-bottom: ${theme.spacing(2)};
-    color: ${theme.colors.text.secondary};
-  `,
-  row: css`
-    label: row;
-    align-items: baseline;
-  `,
-});
diff --git a/public/app/plugins/datasource/tempo/configuration/TraceQLSearchSettings.tsx b/public/app/plugins/datasource/tempo/configuration/TraceQLSearchSettings.tsx
index 0a2ab3cea5f..e85311bd147 100644
--- a/public/app/plugins/datasource/tempo/configuration/TraceQLSearchSettings.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/TraceQLSearchSettings.tsx
@@ -1,19 +1,21 @@
-import { css } from '@emotion/css';
 import React from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
 import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
-import { InlineField, InlineFieldRow, InlineSwitch } from '@grafana/ui';
+import { InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui';
+import { DocsLinkButton } from 'app/core/components/DocsLinkButton';
 
 import { TempoDatasource } from '../datasource';
 import { TempoJsonData } from '../types';
 
+import { getStyles } from './QuerySettings';
 import { TraceQLSearchTags } from './TraceQLSearchTags';
 
 interface Props extends DataSourcePluginOptionsEditorProps<TempoJsonData> {}
 
 export function TraceQLSearchSettings({ options, onOptionsChange }: Props) {
+  const styles = useStyles2(getStyles);
   const dataSourceSrv = getDataSourceSrv();
   const fetchDatasource = async () => {
     return (await dataSourceSrv.get({ type: options.type, uid: options.uid })) as TempoDatasource;
@@ -24,6 +26,12 @@ export function TraceQLSearchSettings({ options, onOptionsChange }: Props) {
   return (
     <div className={styles.container}>
       <h3 className="page-heading">Tempo search</h3>
+
+      <div className={styles.infoText}>
+        Modify how traces are searched
+        <DocsLinkButton hrefSuffix="tempo/#tempo-search" />
+      </div>
+
       <InlineFieldRow className={styles.row}>
         <InlineField tooltip="Removes the search tab from the query editor" label="Hide search" labelWidth={26}>
           <InlineSwitch
@@ -46,14 +54,3 @@ export function TraceQLSearchSettings({ options, onOptionsChange }: Props) {
     </div>
   );
 }
-
-const styles = {
-  container: css`
-    label: container;
-    width: 100%;
-  `,
-  row: css`
-    label: row;
-    align-items: baseline;
-  `,
-};

From 0d06aef5f7ad2ca3f9cdd0a0709d4ba3f5cc638f Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Thu, 13 Apr 2023 09:57:00 -0400
Subject: [PATCH 115/729] docs: nav updates for exemplars (#66469)

* nav-related image upates

* resized some images
---
 docs/sources/fundamentals/exemplars/index.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/sources/fundamentals/exemplars/index.md b/docs/sources/fundamentals/exemplars/index.md
index c4ad1e625fe..b30cf32d55a 100644
--- a/docs/sources/fundamentals/exemplars/index.md
+++ b/docs/sources/fundamentals/exemplars/index.md
@@ -26,7 +26,7 @@ Support for exemplars is available for the Prometheus data source only. Once you
 
 Grafana shows exemplars alongside a metric in the Explore view and in dashboards. Each exemplar displays as a highlighted star. You can hover your cursor over an exemplar to view the unique traceID, which is a combination of a key value pair. To investigate further, click the blue button next to the `traceID` property.
 
-{{< figure src="/static/img/docs/v74/exemplars.png" class="docs-image--no-shadow" max-width= "750px" caption="Screenshot showing the detail window of an Exemplar" >}}
+{{< figure src="/media/docs/grafana/exemplars/screenshot-exemplars.png" class="docs-image--no-shadow" max-width= "750px" caption="Screenshot showing the detail window of an exemplar" >}}
 
 Refer to [View exemplar data]({{< relref "#view-exemplar-data" >}}) for instructions on how to drill down and view exemplar trace details from metrics and logs. To know more about exemplars, refer to the blogpost [Intro to exemplars, which enable Grafana Tempo’s distributed tracing at massive scale](https://grafana.com/blog/2021/03/31/intro-to-exemplars-which-enable-grafana-tempos-distributed-tracing-at-massive-scale/).
 
@@ -42,11 +42,11 @@ To examine the details of an exemplar trace:
 
 1. Place your cursor over an exemplar (highlighted star). Depending on your backend trace data source, you will see a blue button with the label `Query with <data source name>`. In the following example, the tracing data source is Tempo.
 
-   {{< figure src="/static/img/docs/basics/exemplar-details.png" class="docs-image--no-shadow" max-width= "275px" caption="Screenshot showing Exemplar details" >}}
+   {{< figure src="/media/docs/grafana/exemplars/screenshot-exemplar-details.png" class="docs-image--no-shadow" max-width= "350px" caption="Screenshot showing exemplar details" >}}
 
 1. Click the **Query with Tempo** option next to the `traceID` property. The trace details, including the spans within the trace are listed in a separate panel on the right.
 
-   {{< figure src="/static/img/docs/basics/exemplar-explore-view.png" class="docs-image--no-shadow" max-width= "750px" caption="Explorer view with panel showing trace details" >}}
+   {{< figure src="/media/docs/grafana/exemplars/screenshot-exemplar-explore-view.png" class="docs-image--no-shadow" max-width= "900px" caption="Explorer view with panel showing trace details" >}}
 
 For more information on how to drill down and analyze the trace and span details, refer to the [Analyze trace and span details](#analyze-trace-and-spans) section.
 
@@ -56,11 +56,11 @@ You can also view exemplar trace details from the Loki logs in Explore. Use rege
 
 To view the details of an exemplar trace:
 
-1. Expand a log line and scroll down to the `Detected fields` section. Depending on your backend trace data source, you will see a blue button with the label `<data source name>`.
+1. Expand a log line and scroll down to the `Fields` section. Depending on your backend trace data source, you will see a blue button with the label `<data source name>`.
 
 1. Click the blue button next to the `traceID` property. Typically, it will have the name of the backend data source. In the following example, the tracing data source is Tempo. The trace details, including the spans within the trace are listed in a separate panel on the right.
 
-{{< figure src="/static/img/docs/basics/exemplar-loki-logs.png" class="docs-image--no-shadow" max-width= "750px" caption="Explorer view with panel showing trace details" >}}
+{{< figure src="/media/docs/grafana/exemplars/screenshot-exemplar-loki-logs.png" class="docs-image--no-shadow" max-width= "750px" caption="Explorer view with panel showing trace details" >}}
 
 For more information on how to drill down and analyze the trace and span details, refer to the [Analyze trace and span details](#analyze-trace-and-spans) section.
 
@@ -84,4 +84,4 @@ This panel shows the details of the trace in different segments.
 
   This displays additional metadata associated with the span. The metadata itself is initially shown in a narrow strip but you can see more details by clicking the metadata strip.
 
-  {{< figure src="/static/img/docs/basics/exemplar-span-details.png" class="docs-image--no-shadow" max-width= "750px" caption="Span details" >}}
+  {{< figure src="/media/docs/grafana/exemplars/screenshot-exemplar-span-details.png" class="docs-image--no-shadow" max-width= "600px" caption="Span details" >}}

From 7d1b61e033ed96dd6ca82f5fa7f82f4a0b1357df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 13 Apr 2023 16:00:03 +0200
Subject: [PATCH 116/729] AlertRules: Update design to align it with recent
 changes to lists and tables  (#66461)

* AlertRules: Update design to be less boxy

* tag alignment fix

* Minor tweak
---
 .../src/themes/createComponents.ts            |   6 +
 .../grafana-ui/src/components/Table/styles.ts |   5 +-
 .../unified/components/DynamicTable.tsx       |   5 +-
 .../components/DynamicTableWithGuidelines.tsx |   4 +-
 .../unified/components/rules/GrafanaRules.tsx |   1 +
 .../unified/components/rules/RuleState.tsx    |  20 +--
 .../unified/components/rules/RulesGroup.tsx   | 137 +++++++++---------
 .../unified/components/rules/RulesTable.tsx   |   6 +-
 8 files changed, 98 insertions(+), 86 deletions(-)

diff --git a/packages/grafana-data/src/themes/createComponents.ts b/packages/grafana-data/src/themes/createComponents.ts
index 7646160521d..1273431458e 100644
--- a/packages/grafana-data/src/themes/createComponents.ts
+++ b/packages/grafana-data/src/themes/createComponents.ts
@@ -49,6 +49,9 @@ export interface ThemeComponents {
   horizontalDrawer: {
     defaultHeight: number;
   };
+  table: {
+    rowHoverBackground: string;
+  };
 }
 
 export function createComponents(colors: ThemeColors, shadows: ThemeShadows): ThemeComponents {
@@ -102,5 +105,8 @@ export function createComponents(colors: ThemeColors, shadows: ThemeShadows): Th
     horizontalDrawer: {
       defaultHeight: 400,
     },
+    table: {
+      rowHoverBackground: colors.emphasize(colors.background.primary, 0.03),
+    },
   };
 }
diff --git a/packages/grafana-ui/src/components/Table/styles.ts b/packages/grafana-ui/src/components/Table/styles.ts
index ee871a2cd22..35b34ea45f1 100644
--- a/packages/grafana-ui/src/components/Table/styles.ts
+++ b/packages/grafana-ui/src/components/Table/styles.ts
@@ -10,7 +10,6 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
   const cellHeight = getCellHeight(theme, cellHeightOption, cellPadding);
   const rowHeight = cellHeight + 2;
   const headerHeight = 28;
-  const rowHoverBg = theme.colors.emphasize(theme.colors.background.primary, 0.03);
 
   const buildCellContainerStyle = (color?: string, background?: string, overflowOnHover?: boolean) => {
     const cellActionsOverflow: CSSObject = {
@@ -28,7 +27,7 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
       overflow: 'visible',
       width: 'auto !important',
       boxShadow: `0 0 2px ${theme.colors.primary.main}`,
-      background: background ?? rowHoverBg,
+      background: background ?? theme.components.table.rowHoverBackground,
       zIndex: 1,
     };
 
@@ -231,7 +230,7 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
       border-bottom: 1px solid ${borderColor};
 
       &:hover {
-        background-color: ${rowHoverBg};
+        background-color: ${theme.components.table.rowHoverBackground};
       }
 
       &:last-child {
diff --git a/public/app/features/alerting/unified/components/DynamicTable.tsx b/public/app/features/alerting/unified/components/DynamicTable.tsx
index caf74ef40d2..bf925ffc8ce 100644
--- a/public/app/features/alerting/unified/components/DynamicTable.tsx
+++ b/public/app/features/alerting/unified/components/DynamicTable.tsx
@@ -122,7 +122,7 @@ export const DynamicTable = <T extends object>({
                 <div className={cx(styles.cell, styles.expandCell)}>
                   <IconButton
                     aria-label={`${isItemExpanded ? 'Collapse' : 'Expand'} row`}
-                    size="xl"
+                    size="lg"
                     data-testid="collapse-toggle"
                     className={styles.expandButton}
                     name={isItemExpanded ? 'angle-down' : 'angle-right'}
@@ -186,7 +186,7 @@ const getStyles = <T extends unknown>(
 
   return (theme: GrafanaTheme2) => ({
     container: css`
-      border: 1px solid ${theme.colors.border.strong};
+      border: 1px solid ${theme.colors.border.weak};
       border-radius: ${theme.shape.borderRadius()};
       color: ${theme.colors.text.secondary};
     `,
@@ -226,6 +226,7 @@ const getStyles = <T extends unknown>(
       padding: ${theme.spacing(1)};
     `,
     cell: css`
+      display: flex;
       align-items: center;
       padding: ${theme.spacing(1)};
 
diff --git a/public/app/features/alerting/unified/components/DynamicTableWithGuidelines.tsx b/public/app/features/alerting/unified/components/DynamicTableWithGuidelines.tsx
index ad75ae1a53b..7c2a0b805f4 100644
--- a/public/app/features/alerting/unified/components/DynamicTableWithGuidelines.tsx
+++ b/public/app/features/alerting/unified/components/DynamicTableWithGuidelines.tsx
@@ -49,7 +49,7 @@ export const getStyles = (theme: GrafanaTheme2) => ({
   `,
   guideline: css`
     left: -19px;
-    border-left: 1px solid ${theme.colors.border.medium};
+    border-left: 1px solid ${theme.colors.border.weak};
     position: absolute;
 
     ${theme.breakpoints.down('md')} {
@@ -72,7 +72,7 @@ export const getStyles = (theme: GrafanaTheme2) => ({
     left: -49px !important;
   `,
   headerGuideline: css`
-    top: -25px;
+    top: -17px;
     bottom: 0;
   `,
 });
diff --git a/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx b/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx
index 5294d4a5512..29be1f78034 100644
--- a/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx
+++ b/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx
@@ -81,6 +81,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
   sectionHeader: css`
     display: flex;
     justify-content: space-between;
+    margin-bottom: ${theme.spacing(1)};
   `,
   wrapper: css`
     margin-bottom: ${theme.spacing(4)};
diff --git a/public/app/features/alerting/unified/components/rules/RuleState.tsx b/public/app/features/alerting/unified/components/rules/RuleState.tsx
index 922d674a35d..a16c8324ead 100644
--- a/public/app/features/alerting/unified/components/rules/RuleState.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleState.tsx
@@ -2,7 +2,8 @@ import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
 import { GrafanaTheme2, intervalToAbbreviatedDurationString } from '@grafana/data';
-import { HorizontalGroup, Spinner, useStyles2 } from '@grafana/ui';
+import { Stack } from '@grafana/experimental';
+import { Spinner, useStyles2 } from '@grafana/ui';
 import { CombinedRule } from 'app/types/unified-alerting';
 import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
@@ -53,25 +54,24 @@ export const RuleState = ({ rule, isDeleting, isCreating, isPaused }: Props) =>
 
   if (isDeleting) {
     return (
-      <HorizontalGroup align="flex-start">
+      <Stack gap={1}>
         <Spinner />
-        deleting
-      </HorizontalGroup>
+        Deleting
+      </Stack>
     );
   } else if (isCreating) {
     return (
-      <HorizontalGroup align="flex-start">
-        {' '}
+      <Stack gap={1}>
         <Spinner />
-        creating
-      </HorizontalGroup>
+        Creating
+      </Stack>
     );
   } else if (promRule && isAlertingRule(promRule)) {
     return (
-      <HorizontalGroup align="flex-start">
+      <Stack gap={1}>
         <AlertStateTag state={promRule.state} isPaused={isPaused} />
         {forTime}
-      </HorizontalGroup>
+      </Stack>
     );
   } else if (promRule && isRecordingRule(promRule)) {
     return <>Recording rule</>;
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
index 007e6032d1b..3e6a5b51493 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
@@ -209,9 +209,12 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
             />
           </Tooltip>
         )}
-        <h6 className={styles.heading}>
-          {isFederated && <Badge color="purple" text="Federated" />} {groupName}
-        </h6>
+        {
+          // eslint-disable-next-line
+          <div className={styles.groupName} onClick={() => setIsCollapsed(!isCollapsed)}>
+            {isFederated && <Badge color="purple" text="Federated" />} {groupName}
+          </div>
+        }
         <div className={styles.spacer} />
         <div className={styles.headerStats}>
           <RuleStats group={group} />
@@ -275,68 +278,70 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
 
 RulesGroup.displayName = 'RulesGroup';
 
-export const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css`
-    & + & {
-      margin-top: ${theme.spacing(2)};
-    }
-  `,
-  header: css`
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    padding: ${theme.spacing(1)} ${theme.spacing(1)} ${theme.spacing(1)} 0;
-    background-color: ${theme.colors.background.secondary};
-    flex-wrap: wrap;
-  `,
-  headerStats: css`
-    span {
-      vertical-align: middle;
-    }
+export const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    wrapper: css``,
+    header: css`
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      padding: ${theme.spacing(1)} ${theme.spacing(1)} ${theme.spacing(1)} 0;
+      flex-wrap: wrap;
+      border-bottom: 1px solid ${theme.colors.border.weak};
+      &:hover {
+        background-color: ${theme.components.table.rowHoverBackground};
+      }
+    `,
+    headerStats: css`
+      span {
+        vertical-align: middle;
+      }
 
-    ${theme.breakpoints.down('sm')} {
-      order: 2;
-      width: 100%;
-      padding-left: ${theme.spacing(1)};
-    }
-  `,
-  heading: css`
-    margin-left: ${theme.spacing(1)};
-    margin-bottom: 0;
-  `,
-  spacer: css`
-    flex: 1;
-  `,
-  collapseToggle: css`
-    background: none;
-    border: none;
-    margin-top: -${theme.spacing(1)};
-    margin-bottom: -${theme.spacing(1)};
-
-    svg {
+      ${theme.breakpoints.down('sm')} {
+        order: 2;
+        width: 100%;
+        padding-left: ${theme.spacing(1)};
+      }
+    `,
+    groupName: css`
+      margin-left: ${theme.spacing(1)};
       margin-bottom: 0;
-    }
-  `,
-  dataSourceIcon: css`
-    width: ${theme.spacing(2)};
-    height: ${theme.spacing(2)};
-    margin-left: ${theme.spacing(2)};
-  `,
-  dataSourceOrigin: css`
-    margin-right: 1em;
-    color: ${theme.colors.text.disabled};
-  `,
-  actionsSeparator: css`
-    margin: 0 ${theme.spacing(2)};
-  `,
-  actionIcons: css`
-    width: 80px;
-    align-items: center;
-  `,
-  rulesTable: css`
-    margin-top: ${theme.spacing(3)};
-  `,
-  rotate90: css`
-    transform: rotate(90deg);
-  `,
-});
+      cursor: pointer;
+    `,
+    spacer: css`
+      flex: 1;
+    `,
+    collapseToggle: css`
+      background: none;
+      border: none;
+      margin-top: -${theme.spacing(1)};
+      margin-bottom: -${theme.spacing(1)};
+
+      svg {
+        margin-bottom: 0;
+      }
+    `,
+    dataSourceIcon: css`
+      width: ${theme.spacing(2)};
+      height: ${theme.spacing(2)};
+      margin-left: ${theme.spacing(2)};
+    `,
+    dataSourceOrigin: css`
+      margin-right: 1em;
+      color: ${theme.colors.text.disabled};
+    `,
+    actionsSeparator: css`
+      margin: 0 ${theme.spacing(2)};
+    `,
+    actionIcons: css`
+      width: 80px;
+      align-items: center;
+    `,
+    rulesTable: css`
+      margin: ${theme.spacing(2, 0)};
+    `,
+    rotate90: css`
+      transform: rotate(90deg);
+    `,
+  };
+};
diff --git a/public/app/features/alerting/unified/components/rules/RulesTable.tsx b/public/app/features/alerting/unified/components/rules/RulesTable.tsx
index ac01a21f735..dd372f0ba86 100644
--- a/public/app/features/alerting/unified/components/rules/RulesTable.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesTable.tsx
@@ -106,9 +106,9 @@ export const getStyles = (theme: GrafanaTheme2) => ({
     padding-top: ${theme.spacing(1)};
     padding-bottom: ${theme.spacing(0.25)};
     justify-content: center;
-    border-left: 1px solid ${theme.colors.border.strong};
-    border-right: 1px solid ${theme.colors.border.strong};
-    border-bottom: 1px solid ${theme.colors.border.strong};
+    border-left: 1px solid ${theme.colors.border.medium};
+    border-right: 1px solid ${theme.colors.border.medium};
+    border-bottom: 1px solid ${theme.colors.border.medium};
   `,
 });
 

From 7476219b0c2876f60bc9c6e28b22190f239e1426 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 13 Apr 2023 17:07:43 +0300
Subject: [PATCH 117/729] SAML: Configuration UI (#64054)

* Add initial authentication config page skeleton

* Add initial SAML config page WIP

* Add few more pages

* Add connect to IdP page

* Assertion mappings page stub and url params

* Able to save settings

* Some tweaks for authentication page

* Tweak behaviour

* Tweak provider name

* Move SAML config pages to enterprise

* minor refactor

* Able to reset settings

* Configure key and cert from UI

* Refactor WIP

* Tweak styles

* Optional save button

* Some tweaks for the page

* Don't show info popup when save settings

* Improve key/cert validation

* Fetch provider status and display on auth page

* Add settings list to the auth page

* Show call to action card if no auth configured

* clean up

* Show authentication page only if SAML available

* Add access control for SSO config page

* Add feature toggle for auth config UI

* Add code owners for auth config page

* Auth config UI disabled by default

* Fix feature toggle check

* Apply suggestions from review

* Refactor: use forms for steps

* Clean up

* Improve authentication page loading

* Fix CTA link

* Minor tweaks

* Fix page route

* Fix formatting

* Fix generated code formatting
---
 .github/CODEOWNERS                            |   1 +
 .../feature-toggles/index.md                  |   2 +
 .../src/types/featureToggles.gen.ts           |   1 +
 .../ClipboardButton/ClipboardButton.tsx       |   2 +-
 pkg/services/accesscontrol/models.go          |   7 +-
 pkg/services/accesscontrol/roles.go           |  31 +++-
 pkg/services/featuremgmt/registry.go          |   6 +
 pkg/services/featuremgmt/toggles_gen.csv      |   1 +
 pkg/services/featuremgmt/toggles_gen.go       |   4 +
 pkg/services/navtree/models.go                |   1 +
 pkg/services/navtree/navtreeimpl/admin.go     |  20 +++
 pkg/services/navtree/navtreeimpl/navtree.go   |   5 +-
 public/app/core/reducers/root.ts              |   2 +
 .../features/auth-config/AuthConfigPage.tsx   | 155 ++++++++++++++++++
 .../features/auth-config/ErrorContainer.tsx   |  45 +++++
 .../components/ConfigureAuthCTA.tsx           |  56 +++++++
 .../auth-config/components/ProviderCard.tsx   |  61 +++++++
 public/app/features/auth-config/constants.ts  |   1 +
 public/app/features/auth-config/index.ts      |  49 ++++++
 .../app/features/auth-config/state/actions.ts |  79 +++++++++
 .../features/auth-config/state/reducers.ts    |  57 +++++++
 public/app/features/auth-config/types.ts      |  11 ++
 public/app/features/auth-config/utils.ts      |  15 ++
 public/app/routes/routes.tsx                  |   8 +
 public/app/types/accessControl.ts             |   3 +
 public/app/types/configAuth.ts                |  19 +++
 public/app/types/index.ts                     |   2 +
 public/app/types/settings.ts                  |   8 +
 28 files changed, 647 insertions(+), 5 deletions(-)
 create mode 100644 public/app/features/auth-config/AuthConfigPage.tsx
 create mode 100644 public/app/features/auth-config/ErrorContainer.tsx
 create mode 100644 public/app/features/auth-config/components/ConfigureAuthCTA.tsx
 create mode 100644 public/app/features/auth-config/components/ProviderCard.tsx
 create mode 100644 public/app/features/auth-config/constants.ts
 create mode 100644 public/app/features/auth-config/index.ts
 create mode 100644 public/app/features/auth-config/state/actions.ts
 create mode 100644 public/app/features/auth-config/state/reducers.ts
 create mode 100644 public/app/features/auth-config/types.ts
 create mode 100644 public/app/features/auth-config/utils.ts
 create mode 100644 public/app/types/configAuth.ts
 create mode 100644 public/app/types/settings.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e6133723d01..df929e30e09 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -345,6 +345,7 @@ lerna.json @grafana/frontend-ops
 /public/app/core/components/Layers/ @grafana/dataviz-squad
 /public/app/features/all.ts @grafana/grafana-frontend-platform
 /public/app/features/admin/ @grafana/grafana-authnz-team
+/public/app/features/auth-config/ @grafana/grafana-authnz-team
 /public/app/features/annotations/ @grafana/grafana-frontend-platform
 /public/app/features/api-keys/ @grafana/grafana-frontend-platform
 /public/app/features/canvas/ @grafana/dataviz-squad
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 8d422d4ff7b..e9afa27effb 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -71,6 +71,7 @@ Alpha features might be changed or removed without prior notice.
 | `storage`                          | Configurable storage for dashboards, datasources, and resources                                                                                                                                     |
 | `exploreMixedDatasource`           | Enable mixed datasource in Explore                                                                                                                                                                  |
 | `newTraceView`                     | Shows the new trace view design                                                                                                                                                                     |
+| `correlations`                     | Correlations page                                                                                                                                                                                   |
 | `datasourceQueryMultiStatus`       | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                    |
 | `traceToMetrics`                   | Enable trace to metrics links                                                                                                                                                                       |
 | `prometheusWideSeries`             | Enable wide series responses in the Prometheus datasource                                                                                                                                           |
@@ -109,6 +110,7 @@ Alpha features might be changed or removed without prior notice.
 | `unifiedRequestLog`                | Writes error logs to the request logger                                                                                                                                                             |
 | `pyroscopeFlameGraph`              | Changes flame graph to pyroscope one                                                                                                                                                                |
 | `dataplaneFrontendFallback`        | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                |
+| `authenticationConfigUI`           | Enables authentication configuration UI                                                                                                                                                             |
 
 ## Development feature toggles
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 6f7fc4701c3..1b3cee87cbd 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -97,4 +97,5 @@ export interface FeatureToggles {
   dataplaneFrontendFallback?: boolean;
   useCachingService?: boolean;
   disableElasticsearchBackendQuerying?: boolean;
+  authenticationConfigUI?: boolean;
 }
diff --git a/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx b/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx
index 0265dc5f8ac..4151461307e 100644
--- a/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx
+++ b/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx
@@ -73,7 +73,7 @@ export function ClipboardButton({
         variant={showCopySuccess ? 'success' : variant}
         aria-label={showCopySuccess ? 'Copied' : undefined}
         {...buttonProps}
-        className={cx(styles.button, showCopySuccess && styles.successButton)}
+        className={cx(styles.button, showCopySuccess && styles.successButton, buttonProps.className)}
         ref={buttonRef}
       >
         {children}
diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index 5548e66b9d4..ea688c67635 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -309,7 +309,8 @@ const (
 	ActionServerStatsRead = "server.stats:read"
 
 	// Settings actions
-	ActionSettingsRead = "settings:read"
+	ActionSettingsRead  = "settings:read"
+	ActionSettingsWrite = "settings:write"
 
 	// Datasources actions
 	ActionDatasourcesExplore = "datasources:explore"
@@ -324,7 +325,9 @@ const (
 	ScopeUsersAll = "users:*"
 
 	// Settings scope
-	ScopeSettingsAll = "settings:*"
+	ScopeSettingsAll  = "settings:*"
+	ScopeSettingsAuth = "settings:auth:*"
+	ScopeSettingsSAML = "settings:auth.saml:*"
 
 	// Team related actions
 	ActionTeamsCreate           = "teams:create"
diff --git a/pkg/services/accesscontrol/roles.go b/pkg/services/accesscontrol/roles.go
index 67beeb00fb3..5f195f604bd 100644
--- a/pkg/services/accesscontrol/roles.go
+++ b/pkg/services/accesscontrol/roles.go
@@ -171,6 +171,31 @@ var (
 			},
 		}),
 	}
+
+	authenticationConfigWriterRole = RoleDTO{
+		Name:        "fixed:authentication.config:writer",
+		DisplayName: "Authentication config writer",
+		Description: "Read and update authentication configuration and access configuration UI.",
+		Group:       "Settings",
+		Permissions: []Permission{
+			{
+				Action: ActionSettingsRead,
+				Scope:  ScopeSettingsAuth,
+			},
+			{
+				Action: ActionSettingsRead,
+				Scope:  ScopeSettingsSAML,
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  ScopeSettingsAuth,
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  ScopeSettingsSAML,
+			},
+		},
+	}
 )
 
 // Declare OSS roles to the accesscontrol service
@@ -207,9 +232,13 @@ func DeclareFixedRoles(service Service) error {
 		Role:   usersWriterRole,
 		Grants: []string{RoleGrafanaAdmin},
 	}
+	authenticationConfigWriter := RoleRegistration{
+		Role:   authenticationConfigWriterRole,
+		Grants: []string{RoleGrafanaAdmin},
+	}
 
 	return service.DeclareFixedRoles(ldapReader, ldapWriter, orgUsersReader, orgUsersWriter,
-		settingsReader, statsReader, usersReader, usersWriter)
+		settingsReader, statsReader, usersReader, usersWriter, authenticationConfigWriter)
 }
 
 func ConcatPermissions(permissions ...[]Permission) []Permission {
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 7ebc777cd0c..f76f7924c88 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -526,5 +526,11 @@ var (
 			State:       FeatureStateStable,
 			Owner:       grafanaObservabilityLogsSquad,
 		},
+		{
+			Name:        "authenticationConfigUI",
+			Description: "Enables authentication configuration UI",
+			State:       FeatureStateAlpha,
+			Owner:       grafanaAuthnzSquad,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 52a462aef92..bb0dcd4a43d 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -78,3 +78,4 @@ externalServiceAuth,alpha,@grafana/grafana-authnz-team,true,false,false,false
 dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false,true
 useCachingService,stable,@grafana/grafana-operator-experience-squad,false,false,true,false
 disableElasticsearchBackendQuerying,stable,@grafana/observability-logs,false,false,false,false
+authenticationConfigUI,alpha,@grafana/grafana-authnz-team,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 3893f834bff..6f24c8d6238 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -322,4 +322,8 @@ const (
 	// FlagDisableElasticsearchBackendQuerying
 	// Disable the processing of queries and responses in the Elasticsearch data source through backend
 	FlagDisableElasticsearchBackendQuerying = "disableElasticsearchBackendQuerying"
+
+	// FlagAuthenticationConfigUI
+	// Enables authentication configuration UI
+	FlagAuthenticationConfigUI = "authenticationConfigUI"
 )
diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index e857c08d848..30f796f7919 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -192,6 +192,7 @@ func ApplyAdminIA(root *NavTreeRoot) {
 			orgSettings.Text = "Default preferences"
 			adminNodeLinks = append(adminNodeLinks, orgSettings)
 		}
+		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("authentication"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("server-settings"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-orgs"))
 
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index ae43cded0ec..3babb95bc0c 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -136,6 +136,17 @@ func (s *ServiceImpl) getServerAdminNode(c *contextmodel.ReqContext) *navtree.Na
 		}
 	}
 
+	authConfigUIAvailable := s.license.FeatureEnabled("saml") && s.features.IsEnabled(featuremgmt.FlagAuthenticationConfigUI)
+	if authConfigUIAvailable && hasAccess(ac.ReqGrafanaAdmin, evalAuthenticationSettings()) {
+		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
+			Text:     "Authentication",
+			Id:       "authentication",
+			SubTitle: "Manage your auth settings and configure single sign-on",
+			Icon:     "signin",
+			Url:      s.cfg.AppSubURL + "/admin/authentication",
+		})
+	}
+
 	if hasGlobalAccess(ac.ReqGrafanaAdmin, orgsAccessEvaluator) {
 		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
 			Text: "Organizations", SubTitle: "Isolated instances of Grafana running on the same server", Id: "global-orgs", Url: s.cfg.AppSubURL + "/admin/orgs", Icon: "building",
@@ -189,3 +200,12 @@ func enableServiceAccount(s *ServiceImpl, c *contextmodel.ReqContext) bool {
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	return hasAccess(ac.ReqOrgAdmin, serviceaccounts.AccessEvaluator)
 }
+
+func evalAuthenticationSettings() ac.Evaluator {
+	return ac.EvalAll(
+		ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsAuth),
+		ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsSAML),
+		ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAuth),
+		ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsSAML),
+	)
+}
diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index b5722d093b9..9d1de401bd2 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/navtree"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
@@ -35,6 +36,7 @@ type ServiceImpl struct {
 	accesscontrolService ac.Service
 	kvStore              kvstore.KVStore
 	apiKeyService        apikey.Service
+	license              licensing.Licensing
 
 	// Navigation
 	navigationAppConfig     map[string]NavigationAppConfig
@@ -48,7 +50,7 @@ type NavigationAppConfig struct {
 	Icon       string
 }
 
-func ProvideService(cfg *setting.Cfg, accessControl ac.AccessControl, pluginStore plugins.Store, pluginSettings pluginsettings.Service, starService star.Service, features *featuremgmt.FeatureManager, dashboardService dashboards.DashboardService, accesscontrolService ac.Service, kvStore kvstore.KVStore, apiKeyService apikey.Service) navtree.Service {
+func ProvideService(cfg *setting.Cfg, accessControl ac.AccessControl, pluginStore plugins.Store, pluginSettings pluginsettings.Service, starService star.Service, features *featuremgmt.FeatureManager, dashboardService dashboards.DashboardService, accesscontrolService ac.Service, kvStore kvstore.KVStore, apiKeyService apikey.Service, license licensing.Licensing) navtree.Service {
 	service := &ServiceImpl{
 		cfg:                  cfg,
 		log:                  log.New("navtree service"),
@@ -61,6 +63,7 @@ func ProvideService(cfg *setting.Cfg, accessControl ac.AccessControl, pluginStor
 		accesscontrolService: accesscontrolService,
 		kvStore:              kvStore,
 		apiKeyService:        apiKeyService,
+		license:              license,
 	}
 
 	service.readNavigationSettings()
diff --git a/public/app/core/reducers/root.ts b/public/app/core/reducers/root.ts
index 9d0f89de4f9..71b150f6cd2 100644
--- a/public/app/core/reducers/root.ts
+++ b/public/app/core/reducers/root.ts
@@ -4,6 +4,7 @@ import sharedReducers from 'app/core/reducers';
 import ldapReducers from 'app/features/admin/state/reducers';
 import alertingReducers from 'app/features/alerting/state/reducers';
 import apiKeysReducers from 'app/features/api-keys/state/reducers';
+import authConfigReducers from 'app/features/auth-config/state/reducers';
 import { browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { publicDashboardApi } from 'app/features/dashboard/api/publicDashboardApi';
 import panelEditorReducers from 'app/features/dashboard/components/PanelEditor/state/reducers';
@@ -46,6 +47,7 @@ const rootReducers = {
   ...panelsReducers,
   ...templatingReducers,
   ...supportBundlesReducer,
+  ...authConfigReducers,
   plugins: pluginsReducer,
   [alertingApi.reducerPath]: alertingApi.reducer,
   [publicDashboardApi.reducerPath]: publicDashboardApi.reducer,
diff --git a/public/app/features/auth-config/AuthConfigPage.tsx b/public/app/features/auth-config/AuthConfigPage.tsx
new file mode 100644
index 00000000000..bf6f13a4e48
--- /dev/null
+++ b/public/app/features/auth-config/AuthConfigPage.tsx
@@ -0,0 +1,155 @@
+import { css } from '@emotion/css';
+import { isEmpty } from 'lodash';
+import React, { useEffect } from 'react';
+import { connect, ConnectedProps } from 'react-redux';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+import { StoreState } from 'app/types';
+
+import ConfigureAuthCTA from './components/ConfigureAuthCTA';
+import { ProviderCard } from './components/ProviderCard';
+import { loadSettings } from './state/actions';
+import { filterAuthSettings, getProviderUrl } from './utils';
+
+import { getRegisteredAuthProviders } from '.';
+
+interface OwnProps {}
+
+export type Props = OwnProps & ConnectedProps<typeof connector>;
+
+function mapStateToProps(state: StoreState) {
+  const { settings, isLoading, providerStatuses } = state.authConfig;
+  return {
+    settings,
+    isLoading,
+    providerStatuses,
+  };
+}
+
+const mapDispatchToProps = {
+  loadSettings,
+};
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
+
+export const AuthConfigPageUnconnected = ({
+  settings,
+  providerStatuses,
+  isLoading,
+  loadSettings,
+}: Props): JSX.Element => {
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    loadSettings();
+  }, [loadSettings]);
+
+  const authProviders = getRegisteredAuthProviders();
+  const enabledProviders = authProviders.filter((p) => providerStatuses[p.id]?.enabled);
+  const configuresProviders = authProviders.filter(
+    (p) => providerStatuses[p.id]?.configured && !providerStatuses[p.id]?.enabled
+  );
+  const availableProviders = authProviders.filter(
+    (p) => !providerStatuses[p.id]?.enabled && !providerStatuses[p.id]?.configured
+  );
+  const authSettings = filterAuthSettings(settings);
+  const firstAvailableProvider = availableProviders?.length ? availableProviders[0] : null;
+
+  return (
+    <Page navId="authentication">
+      <Page.Contents isLoading={isLoading}>
+        <h3 className={styles.sectionHeader}>Configured authentication</h3>
+        {!!enabledProviders?.length && (
+          <div className={styles.cardsContainer}>
+            {enabledProviders.map((provider) => (
+              <ProviderCard
+                key={provider.id}
+                providerId={provider.id}
+                displayName={provider.displayName}
+                authType={provider.type}
+                enabled={providerStatuses[provider.id]?.enabled}
+                configPath={provider.configPath}
+              />
+            ))}
+          </div>
+        )}
+        {!enabledProviders?.length && firstAvailableProvider && !isEmpty(providerStatuses) && (
+          <ConfigureAuthCTA
+            title={`You have no ${firstAvailableProvider.type} configuration created at the moment`}
+            buttonIcon="plus-circle"
+            buttonLink={getProviderUrl(firstAvailableProvider)}
+            buttonTitle={`Configure ${firstAvailableProvider.type}`}
+            description={`Important: if you have ${firstAvailableProvider.type} configuration enabled via the .ini file Grafana is using it.
+              Configuring ${firstAvailableProvider.type} via UI will take precedence over any configuration in the .ini file.
+              No changes will be written into .ini file.`}
+          />
+        )}
+        {!!configuresProviders?.length && (
+          <div className={styles.cardsContainer}>
+            {configuresProviders.map((provider) => (
+              <ProviderCard
+                key={provider.id}
+                providerId={provider.id}
+                displayName={provider.displayName}
+                authType={provider.protocol}
+                enabled={providerStatuses[provider.id]?.enabled}
+                configPath={provider.configPath}
+              />
+            ))}
+          </div>
+        )}
+        <div className={styles.settingsSection}>
+          <h3>Settings</h3>
+          {authSettings && (
+            <table className="filter-table">
+              <tbody>
+                {Object.entries(authSettings).map(([sectionName, sectionSettings], i) => (
+                  <React.Fragment key={`section-${i}`}>
+                    <tr>
+                      <td className="admin-settings-section">{sectionName}</td>
+                      <td />
+                    </tr>
+                    {Object.entries(sectionSettings).map(([settingName, settingValue], j) => (
+                      <tr key={`property-${j}`}>
+                        <td className={styles.settingName}>{settingName}</td>
+                        <td className={styles.settingName}>{settingValue}</td>
+                      </tr>
+                    ))}
+                  </React.Fragment>
+                ))}
+              </tbody>
+            </table>
+          )}
+        </div>
+      </Page.Contents>
+    </Page>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    cardsContainer: css`
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(288px, 1fr));
+      gap: ${theme.spacing(3)};
+      margin-bottom: ${theme.spacing(3)};
+      margin-top: ${theme.spacing(2)};
+    `,
+    sectionHeader: css`
+      margin-bottom: ${theme.spacing(3)};
+    `,
+    settingsSection: css`
+      margin-top: ${theme.spacing(4)};
+    `,
+    settingName: css`
+      padding-left: 25px;
+    `,
+    settingValue: css`
+      white-space: break-spaces;
+    `,
+  };
+};
+
+export default connector(AuthConfigPageUnconnected);
diff --git a/public/app/features/auth-config/ErrorContainer.tsx b/public/app/features/auth-config/ErrorContainer.tsx
new file mode 100644
index 00000000000..fbb039896f0
--- /dev/null
+++ b/public/app/features/auth-config/ErrorContainer.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import { connect, ConnectedProps } from 'react-redux';
+
+import { Alert } from '@grafana/ui';
+import { StoreState } from 'app/types';
+
+import { resetError, resetWarning } from './state/reducers';
+
+function mapStateToProps(state: StoreState) {
+  return {
+    error: state.authConfig.updateError,
+    warning: state.authConfig.warning,
+  };
+}
+
+const mapDispatchToProps = {
+  resetError,
+  resetWarning,
+};
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
+export type Props = ConnectedProps<typeof connector>;
+
+export const ErrorContainerUnconnected = ({ error, warning, resetError, resetWarning }: Props): JSX.Element => {
+  return (
+    <div>
+      {error && (
+        <Alert title={error.message} onRemove={() => resetError()}>
+          {error.errors?.map((e, i) => (
+            <div key={i}>{e}</div>
+          ))}
+        </Alert>
+      )}
+      {warning && (
+        <Alert title={warning.message} onRemove={() => resetWarning()} severity="warning">
+          {warning.errors?.map((e, i) => (
+            <div key={i}>{e}</div>
+          ))}
+        </Alert>
+      )}
+    </div>
+  );
+};
+
+export default connector(ErrorContainerUnconnected);
diff --git a/public/app/features/auth-config/components/ConfigureAuthCTA.tsx b/public/app/features/auth-config/components/ConfigureAuthCTA.tsx
new file mode 100644
index 00000000000..78892b0d874
--- /dev/null
+++ b/public/app/features/auth-config/components/ConfigureAuthCTA.tsx
@@ -0,0 +1,56 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { CallToActionCard, IconName, LinkButton, useStyles2 } from '@grafana/ui';
+
+export interface Props {
+  title: string;
+  buttonIcon: IconName;
+  buttonLink?: string;
+  buttonTitle: string;
+  buttonDisabled?: boolean;
+  description?: string;
+}
+
+const ConfigureAuthCTA: React.FunctionComponent<Props> = ({
+  title,
+  buttonIcon,
+  buttonLink,
+  buttonTitle,
+  buttonDisabled,
+  description,
+}) => {
+  const styles = useStyles2(getStyles);
+  const footer = description ? <span key="proTipFooter">{description}</span> : '';
+  const ctaElementClassName = !description ? styles.button : '';
+
+  const ctaElement = (
+    <LinkButton
+      size="lg"
+      href={buttonLink}
+      icon={buttonIcon}
+      className={ctaElementClassName}
+      data-testid={selectors.components.CallToActionCard.buttonV2(buttonTitle)}
+      disabled={buttonDisabled}
+    >
+      {buttonTitle}
+    </LinkButton>
+  );
+
+  return <CallToActionCard className={styles.cta} message={title} footer={footer} callToActionElement={ctaElement} />;
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    cta: css`
+      text-align: center;
+    `,
+    button: css`
+      margin-bottom: ${theme.spacing(2.5)};
+    `,
+  };
+};
+
+export default ConfigureAuthCTA;
diff --git a/public/app/features/auth-config/components/ProviderCard.tsx b/public/app/features/auth-config/components/ProviderCard.tsx
new file mode 100644
index 00000000000..3be7aff28ab
--- /dev/null
+++ b/public/app/features/auth-config/components/ProviderCard.tsx
@@ -0,0 +1,61 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Badge, Card, useStyles2 } from '@grafana/ui';
+
+import { BASE_PATH } from '../constants';
+
+export const LOGO_SIZE = '48px';
+
+type Props = {
+  providerId: string;
+  displayName: string;
+  enabled: boolean;
+  configPath?: string;
+  authType?: string;
+  badges?: JSX.Element[];
+};
+
+export function ProviderCard({ providerId, displayName, enabled, configPath, authType, badges }: Props) {
+  const styles = useStyles2(getStyles);
+  configPath = BASE_PATH + (configPath || providerId);
+
+  return (
+    <Card href={configPath} className={styles.container}>
+      <Card.Heading className={styles.name}>{displayName}</Card.Heading>
+      <div className={styles.footer}>
+        {authType && <Badge text={authType} color="blue" icon="info-circle" />}
+        {enabled ? <Badge text="Enabled" color="green" icon="check" /> : <Badge text="Not enabled" color="red" />}
+      </div>
+    </Card>
+  );
+}
+
+export const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    container: css`
+      min-height: ${theme.spacing(16)};
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      padding: ${theme.spacing(2)};
+    `,
+    header: css`
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      margin-bottom: ${theme.spacing(2)};
+    `,
+    footer: css`
+      display: flex;
+      justify-content: space-between;
+    `,
+    name: css`
+      align-self: flex-start;
+      font-size: ${theme.typography.h4.fontSize};
+      color: ${theme.colors.text.primary};
+      margin: 0;
+    `,
+  };
+};
diff --git a/public/app/features/auth-config/constants.ts b/public/app/features/auth-config/constants.ts
new file mode 100644
index 00000000000..1bd9e7d1c6e
--- /dev/null
+++ b/public/app/features/auth-config/constants.ts
@@ -0,0 +1 @@
+export const BASE_PATH = 'admin/authentication/';
diff --git a/public/app/features/auth-config/index.ts b/public/app/features/auth-config/index.ts
new file mode 100644
index 00000000000..32a1301d920
--- /dev/null
+++ b/public/app/features/auth-config/index.ts
@@ -0,0 +1,49 @@
+import { AuthProviderStatus, Settings, SettingsSection } from 'app/types';
+
+import { AuthProviderInfo, GetStatusHook } from './types';
+
+export * from './types';
+
+const registeredAuthProviders: AuthProviderInfo[] = [];
+const authProvidersConfigHooks: Record<string, GetStatusHook> = {};
+
+export function registerAuthProvider(provider: AuthProviderInfo, getConfigHook?: GetStatusHook) {
+  if (!registeredAuthProviders.find((p) => p.id === provider.id)) {
+    registeredAuthProviders.push(provider);
+    if (getConfigHook) {
+      authProvidersConfigHooks[provider.id] = getConfigHook;
+    }
+  }
+}
+
+export function getRegisteredAuthProviders(): AuthProviderInfo[] {
+  return registeredAuthProviders;
+}
+
+export function getAuthProviderInfo(provider: string) {
+  return registeredAuthProviders.find((p) => p.id === provider);
+}
+
+export function getAuthProviders(cfg: Settings): SettingsSection[] {
+  const providers: SettingsSection[] = [];
+  for (const [section, sectionConfig] of Object.entries(cfg)) {
+    const provider = registeredAuthProviders.find((provider) => `auth.${provider.id}` === section);
+    if (provider) {
+      const providerData = {
+        ...sectionConfig,
+        providerId: provider.id,
+        displayName: sectionConfig.name || provider.displayName,
+      };
+      providers.push(providerData);
+    }
+  }
+  return providers;
+}
+
+export async function getAuthProviderStatus(providerId: string): Promise<AuthProviderStatus> {
+  if (authProvidersConfigHooks[providerId]) {
+    const getStatusHook = authProvidersConfigHooks[providerId];
+    return getStatusHook();
+  }
+  return { configured: false, enabled: false };
+}
diff --git a/public/app/features/auth-config/state/actions.ts b/public/app/features/auth-config/state/actions.ts
new file mode 100644
index 00000000000..b231c2c0bed
--- /dev/null
+++ b/public/app/features/auth-config/state/actions.ts
@@ -0,0 +1,79 @@
+import { lastValueFrom } from 'rxjs';
+
+import { getBackendSrv, isFetchError } from '@grafana/runtime';
+import { contextSrv } from 'app/core/core';
+import {
+  AccessControlAction,
+  Settings,
+  ThunkResult,
+  SettingsError,
+  UpdateSettingsQuery,
+  AuthProviderStatus,
+} from 'app/types';
+
+import { getAuthProviderStatus, getRegisteredAuthProviders } from '..';
+
+import { loadingBegin, loadingEnd, providerStatusesLoaded, resetError, setError, settingsUpdated } from './reducers';
+
+export function loadSettings(): ThunkResult<Promise<Settings>> {
+  return async (dispatch) => {
+    if (contextSrv.hasPermission(AccessControlAction.SettingsRead)) {
+      dispatch(loadingBegin());
+      const result = await getBackendSrv().get('/api/admin/settings');
+      dispatch(settingsUpdated(result));
+      await dispatch(loadProviderStatuses());
+      dispatch(loadingEnd());
+      return result;
+    }
+  };
+}
+
+export function loadProviderStatuses(): ThunkResult<void> {
+  return async (dispatch) => {
+    const registeredProviders = getRegisteredAuthProviders();
+    const providerStatuses: Record<string, AuthProviderStatus> = {};
+    const getStatusPromises: Array<Promise<AuthProviderStatus>> = [];
+    for (const provider of registeredProviders) {
+      getStatusPromises.push(getAuthProviderStatus(provider.id));
+    }
+    const statuses = await Promise.all(getStatusPromises);
+    for (let i = 0; i < registeredProviders.length; i++) {
+      const provider = registeredProviders[i];
+      const status = statuses[i];
+      providerStatuses[provider.id] = status;
+    }
+    dispatch(providerStatusesLoaded(providerStatuses));
+  };
+}
+
+export function saveSettings(data: UpdateSettingsQuery): ThunkResult<Promise<boolean>> {
+  return async (dispatch) => {
+    if (contextSrv.hasPermission(AccessControlAction.SettingsRead)) {
+      try {
+        await lastValueFrom(
+          getBackendSrv().fetch({
+            url: '/api/admin/settings',
+            method: 'PUT',
+            data,
+            showSuccessAlert: false,
+            showErrorAlert: false,
+          })
+        );
+        dispatch(resetError());
+        return true;
+      } catch (error) {
+        console.log(error);
+        if (isFetchError(error)) {
+          error.isHandled = true;
+          const updateErr: SettingsError = {
+            message: error.data?.message,
+            errors: error.data?.errors,
+          };
+          dispatch(setError(updateErr));
+          return false;
+        }
+      }
+    }
+    return false;
+  };
+}
diff --git a/public/app/features/auth-config/state/reducers.ts b/public/app/features/auth-config/state/reducers.ts
new file mode 100644
index 00000000000..88e7674be05
--- /dev/null
+++ b/public/app/features/auth-config/state/reducers.ts
@@ -0,0 +1,57 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+
+import { AuthConfigState, AuthProviderStatus, Settings, SettingsError } from 'app/types';
+
+export const initialState: AuthConfigState = {
+  settings: {},
+  providerStatuses: {},
+  isLoading: false,
+};
+
+const authConfigSlice = createSlice({
+  name: 'authConfig',
+  initialState,
+  reducers: {
+    settingsUpdated: (state, action: PayloadAction<Settings>): AuthConfigState => {
+      return { ...state, settings: action.payload };
+    },
+    providerStatusesLoaded: (state, action: PayloadAction<{ [key: string]: AuthProviderStatus }>): AuthConfigState => {
+      return { ...state, providerStatuses: action.payload };
+    },
+    loadingBegin: (state: AuthConfigState) => {
+      return { ...state, isLoading: true };
+    },
+    loadingEnd: (state: AuthConfigState) => {
+      return { ...state, isLoading: false };
+    },
+    setError: (state, action: PayloadAction<SettingsError>): AuthConfigState => {
+      return { ...state, updateError: action.payload };
+    },
+    resetError: (state): AuthConfigState => {
+      return { ...state, updateError: undefined };
+    },
+    setWarning: (state, action: PayloadAction<SettingsError>): AuthConfigState => {
+      return { ...state, warning: action.payload };
+    },
+    resetWarning: (state): AuthConfigState => {
+      return { ...state, warning: undefined };
+    },
+  },
+});
+
+export const {
+  settingsUpdated,
+  providerStatusesLoaded,
+  loadingBegin,
+  loadingEnd,
+  setError,
+  resetError,
+  setWarning,
+  resetWarning,
+} = authConfigSlice.actions;
+
+export const authConfigReducer = authConfigSlice.reducer;
+
+export default {
+  authConfig: authConfigReducer,
+};
diff --git a/public/app/features/auth-config/types.ts b/public/app/features/auth-config/types.ts
new file mode 100644
index 00000000000..5bbf127d1da
--- /dev/null
+++ b/public/app/features/auth-config/types.ts
@@ -0,0 +1,11 @@
+import { AuthProviderStatus } from 'app/types';
+
+export interface AuthProviderInfo {
+  id: string;
+  type: string;
+  protocol: string;
+  displayName: string;
+  configPath?: string;
+}
+
+export type GetStatusHook = () => Promise<AuthProviderStatus>;
diff --git a/public/app/features/auth-config/utils.ts b/public/app/features/auth-config/utils.ts
new file mode 100644
index 00000000000..6513cbccc7c
--- /dev/null
+++ b/public/app/features/auth-config/utils.ts
@@ -0,0 +1,15 @@
+import { Settings } from 'app/types';
+
+import { BASE_PATH } from './constants';
+import { AuthProviderInfo } from './types';
+
+export function filterAuthSettings(settings: Settings) {
+  const authSettings: Settings = Object.fromEntries(
+    Object.entries(settings).filter(([sectionName]) => sectionName === 'auth')
+  );
+  return authSettings;
+}
+
+export function getProviderUrl(provider: AuthProviderInfo) {
+  return BASE_PATH + (provider.configPath || provider.id);
+}
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index a46873526f4..bc6820ed411 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -313,6 +313,14 @@ export function getAppRoutes(): RouteDescriptor[] {
       component: SafeDynamicImport(() => import(/* webpackChunkName: "TeamPages" */ 'app/features/teams/TeamPages')),
     },
     // ADMIN
+    {
+      path: '/admin/authentication',
+      component: config.featureToggles.authenticationConfigUI
+        ? SafeDynamicImport(
+            () => import(/* webpackChunkName: "AdminAuthentication" */ 'app/features/auth-config/AuthConfigPage')
+          )
+        : () => <Redirect to="/admin" />,
+    },
     {
       path: '/admin',
       component: () => (config.featureToggles.topnav ? <NavLandingPage navId="cfg" /> : <Redirect to="/admin/users" />),
diff --git a/public/app/types/accessControl.ts b/public/app/types/accessControl.ts
index 010f64426a5..d608586854b 100644
--- a/public/app/types/accessControl.ts
+++ b/public/app/types/accessControl.ts
@@ -127,6 +127,9 @@ export enum AccessControlAction {
 
   PluginsInstall = 'plugins:install',
   PluginsWrite = 'plugins:write',
+
+  // Settings
+  SettingsRead = 'settings:read',
 }
 
 export interface Role {
diff --git a/public/app/types/configAuth.ts b/public/app/types/configAuth.ts
new file mode 100644
index 00000000000..b7dd994b6ea
--- /dev/null
+++ b/public/app/types/configAuth.ts
@@ -0,0 +1,19 @@
+import { Settings } from 'app/types';
+
+export interface AuthConfigState {
+  settings: Settings;
+  providerStatuses: Record<string, AuthProviderStatus>;
+  isLoading?: boolean;
+  updateError?: SettingsError;
+  warning?: SettingsError;
+}
+
+export interface AuthProviderStatus {
+  enabled: boolean;
+  configured: boolean;
+}
+
+export interface SettingsError {
+  message: string;
+  errors: string[];
+}
diff --git a/public/app/types/index.ts b/public/app/types/index.ts
index 830fb6cbea1..fe3fb7a7f63 100644
--- a/public/app/types/index.ts
+++ b/public/app/types/index.ts
@@ -18,6 +18,8 @@ export * from './appEvent';
 export * from './query';
 export * from './accessControl';
 export * from './supportBundles';
+export * from './configAuth';
+export * from './settings';
 
 import * as CoreEvents from './events';
 export { CoreEvents };
diff --git a/public/app/types/settings.ts b/public/app/types/settings.ts
new file mode 100644
index 00000000000..1dc52a59411
--- /dev/null
+++ b/public/app/types/settings.ts
@@ -0,0 +1,8 @@
+export type Settings = { [key: string]: SettingsSection };
+
+export type SettingsSection = Record<string, string>;
+
+export interface UpdateSettingsQuery {
+  updates?: Settings;
+  removals?: Record<string, string[]>;
+}

From 1dad340ab3fddffa6292437eddc324f8d658104e Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Thu, 13 Apr 2023 10:28:04 -0500
Subject: [PATCH 118/729] Prometheus: Add exemplar modal "locking" for time
 series (#63896)

* add ability to lock exemplar open state until user clicks off
---
 .../panel/heatmap/ExemplarModalHeader.tsx     | 26 ++++++++
 .../plugins/panel/heatmap/HeatmapPanel.tsx    | 23 +------
 .../timeseries/plugins/ExemplarMarker.tsx     | 64 +++++++++++++++----
 .../timeseries/plugins/ExemplarsPlugin.tsx    |  9 ++-
 4 files changed, 87 insertions(+), 35 deletions(-)
 create mode 100644 public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx

diff --git a/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx b/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx
new file mode 100644
index 00000000000..12bcaaa8656
--- /dev/null
+++ b/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+
+import { CloseButton } from '../../../core/components/CloseButton/CloseButton';
+
+export function ExemplarModalHeader(props: { onClick: () => void }) {
+  return (
+    <div
+      style={{
+        width: '100%',
+        display: 'flex',
+        justifyContent: 'flex-end',
+        paddingBottom: '6px',
+      }}
+    >
+      <CloseButton
+        onClick={props.onClick}
+        style={{
+          position: 'relative',
+          top: 'auto',
+          right: 'auto',
+          marginRight: 0,
+        }}
+      />
+    </div>
+  );
+}
diff --git a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
index 775dd09fb86..e31d1f4bc5b 100644
--- a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
@@ -14,10 +14,10 @@ import {
   VizLayout,
   VizTooltipContainer,
 } from '@grafana/ui';
-import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
 import { ColorScale } from 'app/core/components/ColorScale/ColorScale';
 import { isHeatmapCellsDense, readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap';
 
+import { ExemplarModalHeader } from './ExemplarModalHeader';
 import { HeatmapHoverView } from './HeatmapHoverView';
 import { prepareHeatmapData } from './fields';
 import { quantizeScheme } from './palettes';
@@ -206,26 +206,7 @@ export const HeatmapPanel = ({
             offset={{ x: 10, y: 10 }}
             allowPointerEvents={isToolTipOpen.current}
           >
-            {shouldDisplayCloseButton && (
-              <div
-                style={{
-                  width: '100%',
-                  display: 'flex',
-                  justifyContent: 'flex-end',
-                  paddingBottom: '6px',
-                }}
-              >
-                <CloseButton
-                  onClick={onCloseToolTip}
-                  style={{
-                    position: 'relative',
-                    top: 'auto',
-                    right: 'auto',
-                    marginRight: 0,
-                  }}
-                />
-              </div>
-            )}
+            {shouldDisplayCloseButton && <ExemplarModalHeader onClick={onCloseToolTip} />}
             <HeatmapHoverView
               timeRange={timeRange}
               data={info}
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
index 5cb502818e3..8caccc4d442 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
@@ -1,5 +1,5 @@
 import { css, cx } from '@emotion/css';
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { usePopper } from 'react-popper';
 
 import {
@@ -16,6 +16,8 @@ import {
 import { selectors } from '@grafana/e2e-selectors';
 import { FieldLinkList, Portal, UPlotConfigBuilder, useStyles2 } from '@grafana/ui';
 
+import { ExemplarModalHeader } from '../../heatmap/ExemplarModalHeader';
+
 interface ExemplarMarkerProps {
   timeZone: TimeZone;
   dataFrame: DataFrame;
@@ -23,6 +25,8 @@ interface ExemplarMarkerProps {
   config: UPlotConfigBuilder;
   getFieldLinks: (field: Field, rowIndex: number) => Array<LinkModel<Field>>;
   exemplarColor?: string;
+  clickedExemplarFieldIndex: DataFrameFieldIndex | undefined;
+  setClickedExemplarFieldIndex: React.Dispatch<DataFrameFieldIndex | undefined>;
 }
 
 export const ExemplarMarker = ({
@@ -32,9 +36,12 @@ export const ExemplarMarker = ({
   config,
   getFieldLinks,
   exemplarColor,
+  clickedExemplarFieldIndex,
+  setClickedExemplarFieldIndex,
 }: ExemplarMarkerProps) => {
   const styles = useStyles2(getExemplarMarkerStyles);
   const [isOpen, setIsOpen] = useState(false);
+  const [isLocked, setIsLocked] = useState(false);
   const [markerElement, setMarkerElement] = React.useState<HTMLDivElement | null>(null);
   const [popperElement, setPopperElement] = React.useState<HTMLDivElement | null>(null);
   const { styles: popperStyles, attributes } = usePopper(markerElement, popperElement, {
@@ -55,6 +62,17 @@ export const ExemplarMarker = ({
   });
   const popoverRenderTimeout = useRef<NodeJS.Timer>();
 
+  useEffect(() => {
+    if (
+      !(
+        clickedExemplarFieldIndex?.fieldIndex === dataFrameFieldIndex.fieldIndex &&
+        clickedExemplarFieldIndex?.frameIndex === dataFrameFieldIndex.frameIndex
+      )
+    ) {
+      setIsLocked(false);
+    }
+  }, [clickedExemplarFieldIndex, dataFrameFieldIndex]);
+
   const getSymbol = () => {
     const symbols = [
       <rect
@@ -88,16 +106,22 @@ export const ExemplarMarker = ({
   };
 
   const onMouseEnter = useCallback(() => {
-    if (popoverRenderTimeout.current) {
-      clearTimeout(popoverRenderTimeout.current);
+    if (clickedExemplarFieldIndex === undefined) {
+      if (popoverRenderTimeout.current) {
+        clearTimeout(popoverRenderTimeout.current);
+      }
+      setIsOpen(true);
     }
-    setIsOpen(true);
-  }, [setIsOpen]);
+  }, [setIsOpen, clickedExemplarFieldIndex]);
+
+  const lockExemplarModal = () => {
+    setIsLocked(true);
+  };
 
   const onMouseLeave = useCallback(() => {
     popoverRenderTimeout.current = setTimeout(() => {
       setIsOpen(false);
-    }, 100);
+    }, 150);
   }, [setIsOpen]);
 
   const renderMarker = useCallback(() => {
@@ -112,6 +136,12 @@ export const ExemplarMarker = ({
       });
     };
 
+    const onClose = () => {
+      setIsLocked(false);
+      setIsOpen(false);
+      setClickedExemplarFieldIndex(undefined);
+    };
+
     return (
       <div
         onMouseEnter={onMouseEnter}
@@ -122,10 +152,11 @@ export const ExemplarMarker = ({
         {...attributes.popper}
       >
         <div className={styles.wrapper}>
-          <div className={styles.header}>
-            <span className={styles.title}>Exemplar</span>
-          </div>
+          {isLocked && <ExemplarModalHeader onClick={onClose} />}
           <div className={styles.body}>
+            <div className={styles.header}>
+              <span className={styles.title}>Exemplars</span>
+            </div>
             <div>
               <table className={styles.exemplarsTable}>
                 <tbody>
@@ -163,6 +194,8 @@ export const ExemplarMarker = ({
     popperStyles.popper,
     styles,
     timeZone,
+    isLocked,
+    setClickedExemplarFieldIndex,
   ]);
 
   const seriesColor = config
@@ -173,6 +206,10 @@ export const ExemplarMarker = ({
     <>
       <div
         ref={setMarkerElement}
+        onClick={() => {
+          setClickedExemplarFieldIndex(dataFrameFieldIndex);
+          lockExemplarModal();
+        }}
         onMouseEnter={onMouseEnter}
         onMouseLeave={onMouseLeave}
         className={styles.markerWrapper}
@@ -183,12 +220,12 @@ export const ExemplarMarker = ({
           width="7"
           height="7"
           style={{ fill: seriesColor }}
-          className={cx(styles.marble, isOpen && styles.activeMarble)}
+          className={cx(styles.marble, (isOpen || isLocked) && styles.activeMarble)}
         >
           {getSymbol()}
         </svg>
       </div>
-      {isOpen && <Portal>{renderMarker()}</Portal>}
+      {(isOpen || isLocked) && <Portal>{renderMarker()}</Portal>}
     </>
   );
 };
@@ -228,6 +265,7 @@ const getExemplarMarkerStyles = (theme: GrafanaTheme2) => {
       border: 1px solid ${headerBg};
       border-radius: ${theme.shape.borderRadius(2)};
       box-shadow: 0 0 20px ${shadowColor};
+      padding: ${theme.spacing(1)};
     `,
     exemplarsTable: css`
       width: 100%;
@@ -240,6 +278,7 @@ const getExemplarMarkerStyles = (theme: GrafanaTheme2) => {
 
       tr {
         background-color: ${theme.colors.background.primary};
+
         &:nth-child(even) {
           background-color: ${tableBgOdd};
         }
@@ -281,8 +320,9 @@ const getExemplarMarkerStyles = (theme: GrafanaTheme2) => {
       flex-grow: 1;
     `,
     body: css`
-      padding: ${theme.spacing(1)};
       font-weight: ${theme.typography.fontWeightMedium};
+      border-radius: ${theme.shape.borderRadius(2)};
+      overflow: hidden;
     `,
     marble: css`
       display: block;
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
index c9d0d254e4d..46892b323f5 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useLayoutEffect, useRef } from 'react';
+import React, { useCallback, useLayoutEffect, useRef, useState } from 'react';
 import uPlot from 'uplot';
 
 import {
@@ -32,6 +32,8 @@ export const ExemplarsPlugin = ({
 }: ExemplarsPluginProps) => {
   const plotInstance = useRef<uPlot>();
 
+  const [lockedExemplarFieldIndex, setLockedExemplarFieldIndex] = useState<DataFrameFieldIndex | undefined>();
+
   useLayoutEffect(() => {
     config.addHook('init', (u) => {
       plotInstance.current = u;
@@ -83,6 +85,8 @@ export const ExemplarsPlugin = ({
 
       return (
         <ExemplarMarker
+          setClickedExemplarFieldIndex={setLockedExemplarFieldIndex}
+          clickedExemplarFieldIndex={lockedExemplarFieldIndex}
           timeZone={timeZone}
           getFieldLinks={getFieldLinks}
           dataFrame={dataFrame}
@@ -92,7 +96,7 @@ export const ExemplarsPlugin = ({
         />
       );
     },
-    [config, timeZone, getFieldLinks, visibleSeries]
+    [config, timeZone, getFieldLinks, visibleSeries, setLockedExemplarFieldIndex, lockedExemplarFieldIndex]
   );
 
   return (
@@ -138,6 +142,7 @@ interface LabelWithExemplarUIData {
   labels: Labels;
   color?: string;
 }
+
 /**
  * Get color of active series in legend
  */

From 694b48660b1a08a622742a3be0d9854c86c7f34a Mon Sep 17 00:00:00 2001
From: Vardan Torosyan <vardants@gmail.com>
Date: Thu, 13 Apr 2023 17:47:15 +0200
Subject: [PATCH 119/729] Docs: Fix a type in support bundles (#66481)

---
 docs/sources/troubleshooting/support-bundles/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/troubleshooting/support-bundles/index.md b/docs/sources/troubleshooting/support-bundles/index.md
index f8decb69cb6..ff5d794d3c5 100644
--- a/docs/sources/troubleshooting/support-bundles/index.md
+++ b/docs/sources/troubleshooting/support-bundles/index.md
@@ -90,7 +90,7 @@ Ensure [age](https://github.com/FiloSottile/age#installation) is installed on yo
 Add the public key to the `public_keys` setting in the `support_bundle` section of the Grafana configuration file.
 
 ```ini
-[support_bundle]
+[support_bundles]
 public_keys = "age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p"
 ```
 
@@ -100,7 +100,7 @@ public_keys = "age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p"
 Example:
 
 ```ini
-[support_bundle]
+[support_bundles]
 public_keys = "age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p age1yu8vzu554pv3klw46yhdv4raz36k5w3vy30lpxn46923lqngudyqvxacer"
 ```
 

From e5e0a1cbbff52a82736f04905cd0d936695e8be7 Mon Sep 17 00:00:00 2001
From: Kousik Mitra <kousikmitra12@gmail.com>
Date: Thu, 13 Apr 2023 21:37:25 +0530
Subject: [PATCH 120/729] Tempo: Encode IDs as hexadecimal when downloading
 traces (#66001)

* Remove converting tempo trace id to base64

* fix typo

* Update id format to hex for tempo json mock
---
 .../datasource/tempo/mockJsonResponse.json    | 32 ++++++++---------
 .../datasource/tempo/resultTransformer.ts     | 35 ++++---------------
 .../plugins/datasource/tempo/testResponse.ts  |  6 ++--
 3 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/public/app/plugins/datasource/tempo/mockJsonResponse.json b/public/app/plugins/datasource/tempo/mockJsonResponse.json
index 31cae22d1e3..51ed3ce0060 100644
--- a/public/app/plugins/datasource/tempo/mockJsonResponse.json
+++ b/public/app/plugins/datasource/tempo/mockJsonResponse.json
@@ -46,9 +46,9 @@
           "instrumentationLibrary": {},
           "spans": [
             {
-              "traceId": "AAAAAAAAAABguiq7RPE+rg==",
-              "spanId": "cmteMBAvwNA=",
-              "parentSpanId": "OY8PIaPbma4=",
+              "traceId": "000000000000000060ba2abb44f13eae",
+              "spanId": "726b5e30102fc0d0",
+              "parentSpanId": "398f0f21a3db99ae",
               "name": "HTTP GET - root",
               "kind": "SPAN_KIND_SERVER",
               "startTimeUnixNano": "1627471657255809000",
@@ -156,8 +156,8 @@
           "instrumentationLibrary": {},
           "spans": [
             {
-              "traceId": "AAAAAAAAAABguiq7RPE+rg==",
-              "spanId": "GVdnHErYWoo=",
+              "traceId": "000000000000000060ba2abb44f13eae",
+              "spanId": "1957671c4ad85a8a",
               "parentSpanId": "WgdmnUQaoyY=",
               "name": "HTTP Client",
               "startTimeUnixNano": "1627471657251425000",
@@ -214,8 +214,8 @@
           "instrumentationLibrary": {},
           "spans": [
             {
-              "traceId": "AAAAAAAAAABguiq7RPE+rg==",
-              "spanId": "YLoqu0TxPq4=",
+              "traceId": "000000000000000060ba2abb44f13eae",
+              "spanId": "60ba2abb44f13eae",
               "name": "HTTP Client",
               "startTimeUnixNano": "1627471657247632000",
               "endTimeUnixNano": "1627471657260233000",
@@ -285,9 +285,9 @@
           "instrumentationLibrary": {},
           "spans": [
             {
-              "traceId": "AAAAAAAAAABguiq7RPE+rg==",
-              "spanId": "VzhhbsaOedI=",
-              "parentSpanId": "YLoqu0TxPq4=",
+              "traceId": "000000000000000060ba2abb44f13eae",
+              "spanId": "5738616ec68e79d2",
+              "parentSpanId": "60ba2abb44f13eae",
               "name": "HTTP GET",
               "kind": "SPAN_KIND_CLIENT",
               "startTimeUnixNano": "1627471657247674000",
@@ -530,9 +530,9 @@
           "instrumentationLibrary": {},
           "spans": [
             {
-              "traceId": "AAAAAAAAAABguiq7RPE+rg==",
-              "spanId": "OY8PIaPbma4=",
-              "parentSpanId": "GVdnHErYWoo=",
+              "traceId": "000000000000000060ba2abb44f13eae",
+              "spanId": "398f0f21a3db99ae",
+              "parentSpanId": "1957671c4ad85a8a",
               "name": "HTTP GET",
               "kind": "SPAN_KIND_CLIENT",
               "startTimeUnixNano": "1627471657251445000",
@@ -775,9 +775,9 @@
           "instrumentationLibrary": {},
           "spans": [
             {
-              "traceId": "AAAAAAAAAABguiq7RPE+rg==",
-              "spanId": "WgdmnUQaoyY=",
-              "parentSpanId": "VzhhbsaOedI=",
+              "traceId": "000000000000000060ba2abb44f13eae",
+              "spanId": "5a07669d441aa326",
+              "parentSpanId": "5738616ec68e79d2",
               "name": "HTTP GET - root",
               "kind": "SPAN_KIND_SERVER",
               "startTimeUnixNano": "1627471657251228000",
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.ts b/public/app/plugins/datasource/tempo/resultTransformer.ts
index 403787af5fb..38eefebadd6 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.ts
@@ -116,29 +116,6 @@ export function transformTraceList(
   return response;
 }
 
-// Don't forget to change the backend code when the id representation changed
-function transformBase64IDToHexString(base64: string) {
-  const raw = atob(base64);
-  let result = '';
-  for (let i = 0; i < raw.length; i++) {
-    const hex = raw.charCodeAt(i).toString(16);
-    result += hex.length === 2 ? hex : '0' + hex;
-  }
-
-  return result.length > 16 ? result.slice(16) : result;
-}
-
-function transformHexStringToBase64ID(hex: string) {
-  const hexArray = hex.match(/\w{2}/g) || [];
-  return btoa(
-    hexArray
-      .map(function (a) {
-        return String.fromCharCode(parseInt(a, 16));
-      })
-      .join('')
-  );
-}
-
 function getAttributeValue(value: collectorTypes.opentelemetryProto.common.v1.AnyValue): any {
   if (value.stringValue) {
     return value.stringValue;
@@ -297,9 +274,9 @@ export function transformFromOTLP(
       for (const librarySpan of data.instrumentationLibrarySpans) {
         for (const span of librarySpan.spans) {
           frame.add({
-            traceID: transformBase64IDToHexString(span.traceId),
-            spanID: transformBase64IDToHexString(span.spanId),
-            parentSpanID: transformBase64IDToHexString(span.parentSpanId || ''),
+            traceID: span.traceId.length > 16 ? span.traceId.slice(16) : span.traceId,
+            spanID: span.spanId,
+            parentSpanID: span.parentSpanId || '',
             operationName: span.name || '',
             serviceName,
             serviceTags,
@@ -376,10 +353,10 @@ export function transformToOTLP(data: MutableDataFrame): {
     }
 
     result.batches[batchIndex].instrumentationLibrarySpans[0].spans.push({
-      traceId: transformHexStringToBase64ID(span.traceID.padStart(32, '0')),
-      spanId: transformHexStringToBase64ID(span.spanID),
+      traceId: span.traceID.padStart(32, '0'),
+      spanId: span.spanID,
+      parentSpanId: span.parentSpanID || '',
       traceState: '',
-      parentSpanId: transformHexStringToBase64ID(span.parentSpanID || ''),
       name: span.operationName,
       kind: getOTLPSpanKind(span.tags) as any,
       startTimeUnixNano: span.startTime * 1000000,
diff --git a/public/app/plugins/datasource/tempo/testResponse.ts b/public/app/plugins/datasource/tempo/testResponse.ts
index 1aa1bf0a781..5d91c5ceca7 100644
--- a/public/app/plugins/datasource/tempo/testResponse.ts
+++ b/public/app/plugins/datasource/tempo/testResponse.ts
@@ -2137,9 +2137,9 @@ export const otlpResponse = {
         {
           spans: [
             {
-              traceId: 'AAAAAAAAAABguiq7RPE+rg==',
-              spanId: 'cmteMBAvwNA=',
-              parentSpanId: 'OY8PIaPbma4=',
+              traceId: '000000000000000060ba2abb44f13eae',
+              spanId: '726b5e30102fc0d0',
+              parentSpanId: '398f0f21a3db99ae',
               name: 'HTTP GET - root',
               kind: 'SPAN_KIND_CLIENT',
               startTimeUnixNano: 1627471657255809000,

From afd52d086670132345d7cbe5763b76b799bc8d96 Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Thu, 13 Apr 2023 12:25:32 -0400
Subject: [PATCH 121/729] Alerting: use alerting GrafanaReceiver and
 BuildReceiverConfiguration in Grafana (#65224)

* replace receiver errors with one from alerting
* add the converter to alerting models
* update buildReceiverIntegration to accept GrafanaReceiver
---------

Co-authored-by: George Robinson <george.robinson@grafana.com>
---
 pkg/services/ngalert/api/api_alertmanager.go  |   2 +-
 .../ngalert/api/api_alertmanager_test.go      |   8 +-
 pkg/services/ngalert/notifier/alertmanager.go |  14 +-
 pkg/services/ngalert/notifier/compat.go       |  42 +++++
 pkg/services/ngalert/notifier/compat_test.go  | 143 ++++++++++++++++++
 pkg/services/ngalert/notifier/config.go       |  23 +--
 pkg/services/ngalert/notifier/receivers.go    |  24 ---
 .../sqlstore/migrations/ualert/channel.go     |   2 +-
 .../sqlstore/migrations/ualert/ualert.go      |  34 +----
 .../sqlstore/migrations/ualert/ualert_test.go |   7 +-
 10 files changed, 209 insertions(+), 90 deletions(-)
 create mode 100644 pkg/services/ngalert/notifier/compat.go
 create mode 100644 pkg/services/ngalert/notifier/compat_test.go

diff --git a/pkg/services/ngalert/api/api_alertmanager.go b/pkg/services/ngalert/api/api_alertmanager.go
index 2884433551a..88dd9eb96f9 100644
--- a/pkg/services/ngalert/api/api_alertmanager.go
+++ b/pkg/services/ngalert/api/api_alertmanager.go
@@ -406,7 +406,7 @@ func statusForTestReceivers(v []notifier.TestReceiverResult) int {
 		for _, next := range receiver.Configs {
 			if next.Error != nil {
 				var (
-					invalidReceiverErr notifier.InvalidReceiverError
+					invalidReceiverErr alertingNotify.InvalidReceiverError
 					receiverTimeoutErr alertingNotify.ReceiverTimeoutError
 				)
 				if errors.As(next.Error, &invalidReceiverErr) {
diff --git a/pkg/services/ngalert/api/api_alertmanager_test.go b/pkg/services/ngalert/api/api_alertmanager_test.go
index 8cbe6168bb4..5fed1c2c87f 100644
--- a/pkg/services/ngalert/api/api_alertmanager_test.go
+++ b/pkg/services/ngalert/api/api_alertmanager_test.go
@@ -108,7 +108,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test1",
 				UID:    "uid1",
 				Status: "failed",
-				Error:  notifier.InvalidReceiverError{},
+				Error:  alertingNotify.InvalidReceiverError{},
 			}},
 		}, {
 			Name: "test2",
@@ -116,7 +116,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test2",
 				UID:    "uid2",
 				Status: "failed",
-				Error:  notifier.InvalidReceiverError{},
+				Error:  alertingNotify.InvalidReceiverError{},
 			}},
 		}}))
 	})
@@ -148,7 +148,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test1",
 				UID:    "uid1",
 				Status: "failed",
-				Error:  notifier.InvalidReceiverError{},
+				Error:  alertingNotify.InvalidReceiverError{},
 			}},
 		}, {
 			Name: "test2",
@@ -156,7 +156,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test2",
 				UID:    "uid2",
 				Status: "failed",
-				Error:  notifier.ReceiverTimeoutError{},
+				Error:  alertingNotify.ReceiverTimeoutError{},
 			}},
 		}}))
 	})
diff --git a/pkg/services/ngalert/notifier/alertmanager.go b/pkg/services/ngalert/notifier/alertmanager.go
index 17812a59cc5..1f26f219888 100644
--- a/pkg/services/ngalert/notifier/alertmanager.go
+++ b/pkg/services/ngalert/notifier/alertmanager.go
@@ -334,7 +334,7 @@ func (am *Alertmanager) buildIntegrationsMap(receivers []*apimodels.PostableApiR
 func (am *Alertmanager) buildReceiverIntegrations(receiver *apimodels.PostableApiReceiver, tmpl *alertingNotify.Template) ([]*alertingNotify.Integration, error) {
 	integrations := make([]*alertingNotify.Integration, 0, len(receiver.GrafanaManagedReceivers))
 	for i, r := range receiver.GrafanaManagedReceivers {
-		n, err := am.buildReceiverIntegration(r, tmpl)
+		n, err := am.buildReceiverIntegration(PostableGrafanaReceiverToGrafanaReceiver(r), tmpl)
 		if err != nil {
 			return nil, err
 		}
@@ -343,14 +343,14 @@ func (am *Alertmanager) buildReceiverIntegrations(receiver *apimodels.PostableAp
 	return integrations, nil
 }
 
-func (am *Alertmanager) buildReceiverIntegration(r *apimodels.PostableGrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.NotificationChannel, error) {
+func (am *Alertmanager) buildReceiverIntegration(r *alertingNotify.GrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.NotificationChannel, error) {
 	// secure settings are already encrypted at this point
 	secureSettings := make(map[string][]byte, len(r.SecureSettings))
 
 	for k, v := range r.SecureSettings {
 		d, err := base64.StdEncoding.DecodeString(v)
 		if err != nil {
-			return nil, InvalidReceiverError{
+			return nil, alertingNotify.InvalidReceiverError{
 				Receiver: r,
 				Err:      errors.New("failed to decode secure setting"),
 			}
@@ -365,27 +365,27 @@ func (am *Alertmanager) buildReceiverIntegration(r *apimodels.PostableGrafanaRec
 			Name:                  r.Name,
 			Type:                  r.Type,
 			DisableResolveMessage: r.DisableResolveMessage,
-			Settings:              json.RawMessage(r.Settings),
+			Settings:              r.Settings,
 			SecureSettings:        secureSettings,
 		}
 	)
 	factoryConfig, err := receivers.NewFactoryConfig(cfg, NewNotificationSender(am.NotificationService), am.decryptFn, tmpl, newImageStore(am.Store), LoggerFactory, setting.BuildVersion)
 	if err != nil {
-		return nil, InvalidReceiverError{
+		return nil, alertingNotify.InvalidReceiverError{
 			Receiver: r,
 			Err:      err,
 		}
 	}
 	receiverFactory, exists := alertingNotify.Factory(r.Type)
 	if !exists {
-		return nil, InvalidReceiverError{
+		return nil, alertingNotify.InvalidReceiverError{
 			Receiver: r,
 			Err:      fmt.Errorf("notifier %s is not supported", r.Type),
 		}
 	}
 	n, err := receiverFactory(factoryConfig)
 	if err != nil {
-		return nil, InvalidReceiverError{
+		return nil, alertingNotify.InvalidReceiverError{
 			Receiver: r,
 			Err:      err,
 		}
diff --git a/pkg/services/ngalert/notifier/compat.go b/pkg/services/ngalert/notifier/compat.go
new file mode 100644
index 00000000000..90c4807d8f3
--- /dev/null
+++ b/pkg/services/ngalert/notifier/compat.go
@@ -0,0 +1,42 @@
+package notifier
+
+import (
+	"encoding/json"
+
+	alertingNotify "github.com/grafana/alerting/notify"
+
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+)
+
+func PostableGrafanaReceiverToGrafanaReceiver(p *apimodels.PostableGrafanaReceiver) *alertingNotify.GrafanaReceiver {
+	return &alertingNotify.GrafanaReceiver{
+		UID:                   p.UID,
+		Name:                  p.Name,
+		Type:                  p.Type,
+		DisableResolveMessage: p.DisableResolveMessage,
+		Settings:              json.RawMessage(p.Settings),
+		SecureSettings:        p.SecureSettings,
+	}
+}
+
+func PostableApiReceiverToApiReceiver(r *apimodels.PostableApiReceiver) *alertingNotify.APIReceiver {
+	receivers := alertingNotify.GrafanaReceivers{
+		Receivers: make([]*alertingNotify.GrafanaReceiver, 0, len(r.GrafanaManagedReceivers)),
+	}
+	for _, receiver := range r.GrafanaManagedReceivers {
+		receivers.Receivers = append(receivers.Receivers, PostableGrafanaReceiverToGrafanaReceiver(receiver))
+	}
+
+	return &alertingNotify.APIReceiver{
+		ConfigReceiver:   r.Receiver,
+		GrafanaReceivers: receivers,
+	}
+}
+
+func PostableApiAlertingConfigToApiReceivers(c apimodels.PostableApiAlertingConfig) []*alertingNotify.APIReceiver {
+	apiReceivers := make([]*alertingNotify.APIReceiver, 0, len(c.Receivers))
+	for _, receiver := range c.Receivers {
+		apiReceivers = append(apiReceivers, PostableApiReceiverToApiReceiver(receiver))
+	}
+	return apiReceivers
+}
diff --git a/pkg/services/ngalert/notifier/compat_test.go b/pkg/services/ngalert/notifier/compat_test.go
new file mode 100644
index 00000000000..46d95b37405
--- /dev/null
+++ b/pkg/services/ngalert/notifier/compat_test.go
@@ -0,0 +1,143 @@
+package notifier
+
+import (
+	"encoding/json"
+	"testing"
+
+	alertingNotify "github.com/grafana/alerting/notify"
+	"github.com/prometheus/alertmanager/config"
+	"github.com/stretchr/testify/require"
+
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+)
+
+func TestPostableGrafanaReceiverToGrafanaReceiver(t *testing.T) {
+	r := &apimodels.PostableGrafanaReceiver{
+		UID:                   "test-uid",
+		Name:                  "test-name",
+		Type:                  "slack",
+		DisableResolveMessage: false,
+		Settings:              apimodels.RawMessage(`{ "data" : "test" }`),
+		SecureSettings: map[string]string{
+			"test": "data",
+		},
+	}
+	actual := PostableGrafanaReceiverToGrafanaReceiver(r)
+	require.Equal(t, alertingNotify.GrafanaReceiver{
+		UID:                   "test-uid",
+		Name:                  "test-name",
+		Type:                  "slack",
+		DisableResolveMessage: false,
+		Settings:              json.RawMessage(`{ "data" : "test" }`),
+		SecureSettings: map[string]string{
+			"test": "data",
+		},
+	}, *actual)
+}
+
+func TestPostableApiReceiverToApiReceiver(t *testing.T) {
+	t.Run("returns empty when no receivers", func(t *testing.T) {
+		r := &apimodels.PostableApiReceiver{
+			Receiver: config.Receiver{
+				Name: "test-receiver",
+			},
+		}
+		actual := PostableApiReceiverToApiReceiver(r)
+		require.Empty(t, actual.Receivers)
+		require.Equal(t, r.Receiver, actual.ConfigReceiver)
+	})
+	t.Run("converts receivers", func(t *testing.T) {
+		r := &apimodels.PostableApiReceiver{
+			Receiver: config.Receiver{
+				Name: "test-receiver",
+			},
+			PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{
+				GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{
+					{
+						UID:                   "test-uid",
+						Name:                  "test-name",
+						Type:                  "slack",
+						DisableResolveMessage: false,
+						Settings:              apimodels.RawMessage(`{ "data" : "test" }`),
+						SecureSettings: map[string]string{
+							"test": "data",
+						},
+					},
+					{
+						UID:                   "test-uid2",
+						Name:                  "test-name2",
+						Type:                  "webhook",
+						DisableResolveMessage: false,
+						Settings:              apimodels.RawMessage(`{ "data2" : "test2" }`),
+						SecureSettings: map[string]string{
+							"test2": "data2",
+						},
+					},
+				},
+			},
+		}
+		actual := PostableApiReceiverToApiReceiver(r)
+		require.Len(t, actual.Receivers, 2)
+		require.Equal(t, r.Receiver, actual.ConfigReceiver)
+		require.Equal(t, *PostableGrafanaReceiverToGrafanaReceiver(r.GrafanaManagedReceivers[0]), *actual.Receivers[0])
+		require.Equal(t, *PostableGrafanaReceiverToGrafanaReceiver(r.GrafanaManagedReceivers[1]), *actual.Receivers[1])
+	})
+}
+
+func TestPostableApiAlertingConfigToApiReceivers(t *testing.T) {
+	t.Run("returns empty when no receivers", func(t *testing.T) {
+		r := apimodels.PostableApiAlertingConfig{
+			Config: apimodels.Config{},
+		}
+		actual := PostableApiAlertingConfigToApiReceivers(r)
+		require.Empty(t, actual)
+	})
+	c := apimodels.PostableApiAlertingConfig{
+		Config: apimodels.Config{},
+		Receivers: []*apimodels.PostableApiReceiver{
+			{
+				Receiver: config.Receiver{
+					Name: "test-receiver",
+				},
+				PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{
+					GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{
+						{
+							UID:                   "test-uid",
+							Name:                  "test-name",
+							Type:                  "slack",
+							DisableResolveMessage: false,
+							Settings:              apimodels.RawMessage(`{ "data" : "test" }`),
+							SecureSettings: map[string]string{
+								"test": "data",
+							},
+						},
+					},
+				},
+			},
+			{
+				Receiver: config.Receiver{
+					Name: "test-receiver2",
+				},
+				PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{
+					GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{
+						{
+							UID:                   "test-uid2",
+							Name:                  "test-name1",
+							Type:                  "slack",
+							DisableResolveMessage: false,
+							Settings:              apimodels.RawMessage(`{ "data" : "test" }`),
+							SecureSettings: map[string]string{
+								"test": "data",
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	actual := PostableApiAlertingConfigToApiReceivers(c)
+
+	require.Len(t, actual, 2)
+	require.Equal(t, PostableApiReceiverToApiReceiver(c.Receivers[0]), actual[0])
+	require.Equal(t, PostableApiReceiverToApiReceiver(c.Receivers[1]), actual[1])
+}
diff --git a/pkg/services/ngalert/notifier/config.go b/pkg/services/ngalert/notifier/config.go
index d59338ce663..01ecab34017 100644
--- a/pkg/services/ngalert/notifier/config.go
+++ b/pkg/services/ngalert/notifier/config.go
@@ -97,31 +97,12 @@ type AlertingConfiguration struct {
 	AlertmanagerTemplates *alertingNotify.Template
 
 	IntegrationsFunc         func(receivers []*api.PostableApiReceiver, templates *alertingNotify.Template) (map[string][]*alertingNotify.Integration, error)
-	ReceiverIntegrationsFunc func(r *api.PostableGrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.NotificationChannel, error)
+	ReceiverIntegrationsFunc func(r *alertingNotify.GrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.NotificationChannel, error)
 }
 
 func (a AlertingConfiguration) BuildReceiverIntegrationsFunc() func(next *alertingNotify.GrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.Notifier, error) {
 	return func(next *alertingNotify.GrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.Notifier, error) {
-		// TODO: We shouldn't need to do all of this marshalling - there should be no difference between types.
-		var out api.RawMessage
-		settingsJSON, err := json.Marshal(next.Settings)
-		if err != nil {
-			return nil, fmt.Errorf("unable to marshal settings to JSON: %v", err)
-		}
-
-		err = out.UnmarshalJSON(settingsJSON)
-		if err != nil {
-			return nil, fmt.Errorf("unable to marshal JSON to RawMessage: %v", err)
-		}
-		gr := &api.PostableGrafanaReceiver{
-			UID:                   next.UID,
-			Name:                  next.Name,
-			Type:                  next.Type,
-			DisableResolveMessage: next.DisableResolveMessage,
-			Settings:              out,
-			SecureSettings:        next.SecureSettings,
-		}
-		return a.ReceiverIntegrationsFunc(gr, tmpl)
+		return a.ReceiverIntegrationsFunc(next, tmpl)
 	}
 }
 
diff --git a/pkg/services/ngalert/notifier/receivers.go b/pkg/services/ngalert/notifier/receivers.go
index 85318f3975f..f473a035a33 100644
--- a/pkg/services/ngalert/notifier/receivers.go
+++ b/pkg/services/ngalert/notifier/receivers.go
@@ -3,8 +3,6 @@ package notifier
 import (
 	"context"
 	"encoding/json"
-	"errors"
-	"fmt"
 	"time"
 
 	alertingNotify "github.com/grafana/alerting/notify"
@@ -16,10 +14,6 @@ import (
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 )
 
-var (
-	ErrNoReceivers = errors.New("no receivers")
-)
-
 type TestReceiversResult struct {
 	Alert     types.Alert
 	Receivers []TestReceiverResult
@@ -38,24 +32,6 @@ type TestReceiverConfigResult struct {
 	Error  error
 }
 
-type InvalidReceiverError struct {
-	Receiver *apimodels.PostableGrafanaReceiver
-	Err      error
-}
-
-func (e InvalidReceiverError) Error() string {
-	return fmt.Sprintf("the receiver is invalid: %s", e.Err)
-}
-
-type ReceiverTimeoutError struct {
-	Receiver *apimodels.PostableGrafanaReceiver
-	Err      error
-}
-
-func (e ReceiverTimeoutError) Error() string {
-	return fmt.Sprintf("the receiver timed out: %s", e.Err)
-}
-
 func (am *Alertmanager) TestReceivers(ctx context.Context, c apimodels.TestReceiversConfigBodyParams) (*TestReceiversResult, error) {
 	receivers := make([]*alertingNotify.APIReceiver, 0, len(c.Receivers))
 	for _, r := range c.Receivers {
diff --git a/pkg/services/sqlstore/migrations/ualert/channel.go b/pkg/services/sqlstore/migrations/ualert/channel.go
index 9fcb0bdaf6e..3fac96ae744 100644
--- a/pkg/services/sqlstore/migrations/ualert/channel.go
+++ b/pkg/services/sqlstore/migrations/ualert/channel.go
@@ -121,7 +121,7 @@ func (m *migration) setupAlertmanagerConfigs(rulesPerOrg map[int64]map[*alertRul
 
 		// Validate the alertmanager configuration produced, this gives a chance to catch bad configuration at migration time.
 		// Validation between legacy and unified alerting can be different (e.g. due to bug fixes) so this would fail the migration in that case.
-		if err := m.validateAlertmanagerConfig(orgID, amConfig); err != nil {
+		if err := m.validateAlertmanagerConfig(amConfig); err != nil {
 			return nil, fmt.Errorf("failed to validate AlertmanagerConfig in orgId %d: %w", orgID, err)
 		}
 	}
diff --git a/pkg/services/sqlstore/migrations/ualert/ualert.go b/pkg/services/sqlstore/migrations/ualert/ualert.go
index 03a4ee47834..535c6395006 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert.go
@@ -2,7 +2,6 @@ package ualert
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -12,9 +11,7 @@ import (
 	"strings"
 	"time"
 
-	alertingLogging "github.com/grafana/alerting/logging"
 	alertingNotify "github.com/grafana/alerting/notify"
-	"github.com/grafana/alerting/receivers"
 	pb "github.com/prometheus/alertmanager/silence/silencepb"
 	"xorm.io/xorm"
 
@@ -475,32 +472,21 @@ func (m *migration) writeAlertmanagerConfig(orgID int64, amConfig *PostableUserC
 }
 
 // validateAlertmanagerConfig validates the alertmanager configuration produced by the migration against the receivers.
-func (m *migration) validateAlertmanagerConfig(orgID int64, config *PostableUserConfig) error {
+func (m *migration) validateAlertmanagerConfig(config *PostableUserConfig) error {
 	for _, r := range config.AlertmanagerConfig.Receivers {
 		for _, gr := range r.GrafanaManagedReceivers {
-			// First, let's decode the secure settings - given they're stored as base64.
-			secureSettings := make(map[string][]byte, len(gr.SecureSettings))
-			for k, v := range gr.SecureSettings {
-				d, err := base64.StdEncoding.DecodeString(v)
-				if err != nil {
-					return err
-				}
-				secureSettings[k] = d
-			}
-
 			data, err := gr.Settings.MarshalJSON()
 			if err != nil {
 				return err
 			}
 			var (
-				cfg = &receivers.NotificationChannelConfig{
+				cfg = &alertingNotify.GrafanaReceiver{
 					UID:                   gr.UID,
-					OrgID:                 orgID,
 					Name:                  gr.Name,
 					Type:                  gr.Type,
 					DisableResolveMessage: gr.DisableResolveMessage,
 					Settings:              data,
-					SecureSettings:        secureSettings,
+					SecureSettings:        gr.SecureSettings,
 				}
 			)
 
@@ -517,17 +503,9 @@ func (m *migration) validateAlertmanagerConfig(orgID int64, config *PostableUser
 				}
 				return fallback
 			}
-			receiverFactory, exists := alertingNotify.Factory(gr.Type)
-			if !exists {
-				return fmt.Errorf("notifier %s is not supported", gr.Type)
-			}
-			factoryConfig, err := receivers.NewFactoryConfig(cfg, nil, decryptFunc, nil, nil, func(ctx ...interface{}) alertingLogging.Logger {
-				return &alertingLogging.FakeLogger{}
-			}, setting.BuildVersion)
-			if err != nil {
-				return err
-			}
-			_, err = receiverFactory(factoryConfig)
+			_, err = alertingNotify.BuildReceiverConfiguration(context.Background(), &alertingNotify.APIReceiver{
+				GrafanaReceivers: alertingNotify.GrafanaReceivers{Receivers: []*alertingNotify.GrafanaReceiver{cfg}},
+			}, decryptFunc)
 			if err != nil {
 				return err
 			}
diff --git a/pkg/services/sqlstore/migrations/ualert/ualert_test.go b/pkg/services/sqlstore/migrations/ualert/ualert_test.go
index 1f75906b74b..ef2086ccb54 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert_test.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert_test.go
@@ -65,14 +65,14 @@ func Test_validateAlertmanagerConfig(t *testing.T) {
 			name: "when a slack receiver does not have a valid URL - it should error",
 			receivers: []*PostableGrafanaReceiver{
 				{
-					UID:            util.GenerateShortUID(),
+					UID:            "test-uid",
 					Name:           "SlackWithBadURL",
 					Type:           "slack",
 					Settings:       simplejson.NewFromAny(map[string]interface{}{}),
 					SecureSettings: map[string]string{"url": invalidUri},
 				},
 			},
-			err: fmt.Errorf("failed to validate receiver \"SlackWithBadURL\" of type \"slack\": invalid URL %q", invalidUri),
+			err: fmt.Errorf("failed to validate receiver \"SlackWithBadURL\" of type \"slack\": failed to parse notifier SlackWithBadURL (UID: test-uid): invalid URL %q", invalidUri),
 		},
 		{
 			name: "when a slack receiver has an invalid recipient - it should not error",
@@ -103,11 +103,10 @@ func Test_validateAlertmanagerConfig(t *testing.T) {
 	for _, tt := range tc {
 		t.Run(tt.name, func(t *testing.T) {
 			mg := newTestMigration(t)
-			orgID := int64(1)
 
 			config := configFromReceivers(t, tt.receivers)
 			require.NoError(t, config.EncryptSecureSettings()) // make sure we encrypt the settings
-			err := mg.validateAlertmanagerConfig(orgID, config)
+			err := mg.validateAlertmanagerConfig(config)
 			if tt.err != nil {
 				require.Error(t, err)
 				require.EqualError(t, err, tt.err.Error())

From cef9f64f133a7b372c7c47b32c3ecd03f0012e8d Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 13 Apr 2023 17:33:05 +0100
Subject: [PATCH 122/729] Chore: Restore shouldFailOnLog being enabled only
 during CI (#66498)

---
 public/test/setupTests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/test/setupTests.ts b/public/test/setupTests.ts
index ac9da47b115..31f322f1d4a 100644
--- a/public/test/setupTests.ts
+++ b/public/test/setupTests.ts
@@ -6,7 +6,7 @@ import { initReactI18next } from 'react-i18next';
 import { matchers } from './matchers';
 
 failOnConsole({
-  shouldFailOnLog: true,
+  shouldFailOnLog: process.env.CI ? true : false,
 });
 
 expect.extend(matchers);

From e0b2aeffa34ba6ca812ff3db6a08adee7a89b6d4 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Thu, 13 Apr 2023 19:27:10 +0200
Subject: [PATCH 123/729] Correlations: Remove  feature toggle from alpha list
 in index.md (#66499)

---
 .../setup-grafana/configure-grafana/feature-toggles/index.md     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index e9afa27effb..8c3bcefcd81 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -71,7 +71,6 @@ Alpha features might be changed or removed without prior notice.
 | `storage`                          | Configurable storage for dashboards, datasources, and resources                                                                                                                                     |
 | `exploreMixedDatasource`           | Enable mixed datasource in Explore                                                                                                                                                                  |
 | `newTraceView`                     | Shows the new trace view design                                                                                                                                                                     |
-| `correlations`                     | Correlations page                                                                                                                                                                                   |
 | `datasourceQueryMultiStatus`       | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                    |
 | `traceToMetrics`                   | Enable trace to metrics links                                                                                                                                                                       |
 | `prometheusWideSeries`             | Enable wide series responses in the Prometheus datasource                                                                                                                                           |

From 2136e680c42e9cfef12d65ce4ee1009340235408 Mon Sep 17 00:00:00 2001
From: Artur Wierzbicki <artur.wierzbicki@grafana.com>
Date: Thu, 13 Apr 2023 21:42:24 +0400
Subject: [PATCH 124/729] Previews: remove dashboard previews backend (#66176)

* remove dashboard previews backend

* remove dashboard previews backend

* bring back the migration

* bring back the migration

* bring back the migration
---
 .github/CODEOWNERS                            |   3 -
 conf/defaults.ini                             |  19 -
 .../feature-toggles/index.md                  |   1 -
 .../src/types/featureToggles.gen.ts           |   1 -
 pkg/api/api.go                                |   6 -
 pkg/api/dtos/frontend_settings.go             |  12 -
 pkg/api/frontendsettings.go                   |   4 -
 pkg/api/http_server.go                        |  36 +-
 .../backgroundsvcs/background_services.go     |   5 +-
 .../usage_stats_providers_registry.go         |   3 -
 pkg/server/wire.go                            |   4 -
 pkg/server/wireexts_oss.go                    |   3 -
 pkg/services/dashboards/errors.go             |   5 -
 pkg/services/featuremgmt/registry.go          |   6 -
 pkg/services/featuremgmt/toggles_gen.csv      |   1 -
 pkg/services/featuremgmt/toggles_gen.go       |   4 -
 pkg/services/featuremgmt/usage_stats_test.go  |   2 -
 .../migrations/dashboard_thumbs_mig.go        |  57 +-
 .../sqlstore/migrations/migrations.go         |   5 -
 pkg/services/sqlstore/sqlstore.go             |   1 -
 pkg/services/thumbs/crawler.go                | 349 -----------
 pkg/services/thumbs/crawler_auth.go           | 139 -----
 pkg/services/thumbs/dashboard_thumbs.go       |  13 -
 .../dashboardthumbsimpl/dashboard_thumbs.go   |  43 --
 .../thumbs/dashboardthumbsimpl/store.go       |  15 -
 .../thumbs/dashboardthumbsimpl/store_test.go  | 402 -------------
 .../thumbs/dashboardthumbsimpl/xorm_store.go  | 216 -------
 pkg/services/thumbs/datasources_lookup.go     |  92 ---
 .../thumbs/datasources_lookup_test.go         |  85 ---
 pkg/services/thumbs/dummy.go                  |  65 ---
 pkg/services/thumbs/models.go                 | 210 -------
 pkg/services/thumbs/repo.go                   | 107 ----
 pkg/services/thumbs/service.go                | 549 ------------------
 .../testdata/empty_search_response_frame.json | 120 ----
 .../testdata/search_response_frame.json       | 123 ----
 pkg/setting/setting.go                        |   3 -
 pkg/setting/setting_dashboard_previews.go     |  31 -
 37 files changed, 45 insertions(+), 2695 deletions(-)
 delete mode 100644 pkg/services/thumbs/crawler.go
 delete mode 100644 pkg/services/thumbs/crawler_auth.go
 delete mode 100644 pkg/services/thumbs/dashboard_thumbs.go
 delete mode 100644 pkg/services/thumbs/dashboardthumbsimpl/dashboard_thumbs.go
 delete mode 100644 pkg/services/thumbs/dashboardthumbsimpl/store.go
 delete mode 100644 pkg/services/thumbs/dashboardthumbsimpl/store_test.go
 delete mode 100644 pkg/services/thumbs/dashboardthumbsimpl/xorm_store.go
 delete mode 100644 pkg/services/thumbs/datasources_lookup.go
 delete mode 100644 pkg/services/thumbs/datasources_lookup_test.go
 delete mode 100644 pkg/services/thumbs/dummy.go
 delete mode 100644 pkg/services/thumbs/models.go
 delete mode 100644 pkg/services/thumbs/repo.go
 delete mode 100644 pkg/services/thumbs/service.go
 delete mode 100644 pkg/services/thumbs/testdata/empty_search_response_frame.json
 delete mode 100644 pkg/services/thumbs/testdata/search_response_frame.json
 delete mode 100644 pkg/setting/setting_dashboard_previews.go

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index df929e30e09..60c63bace46 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -284,9 +284,6 @@
 /pkg/tsdb/testdatasource/ @grafana/plugins-platform-backend
 /pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend
 
-# Dashboard previews / crawler (behind feature flag)
-/pkg/services/thumbs/ @grafana/grafana-app-platform-squad
-
 # Backend code docs
 /contribute/backend/ @grafana/backend-platform
 
diff --git a/conf/defaults.ini b/conf/defaults.ini
index 0c561da4c14..322bf3a89bf 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1429,25 +1429,6 @@ default_baselayer_config =
 # Enable or disable loading other base map layers
 enable_custom_baselayers = true
 
-#################################### Dashboard previews #####################################
-
-[dashboard_previews.crawler]
-# Number of dashboards rendered in parallel. Default is 6.
-thread_count =
-
-# Timeout passed down to the Image Renderer plugin. It is used in two separate places within a single rendering request:
-# First during the initial navigation to the dashboard and then when waiting for all the panels to load. Default is 20s.
-# This setting should be expressed as a duration. Examples: 10s (seconds), 1m (minutes).
-rendering_timeout =
-
-# Maximum duration of a single crawl. Default is 1h.
-# This setting should be expressed as a duration. Examples: 10s (seconds), 1m (minutes).
-max_crawl_duration =
-
-# Minimum interval between two subsequent scheduler runs. Default is 12h.
-# This setting should be expressed as a duration. Examples: 10s (seconds), 1m (minutes).
-scheduler_interval =
-
 #################################### Support Bundles #####################################
 [support_bundles]
 # Enable support bundle creation (default: true)
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 8c3bcefcd81..efb4061cbe2 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -62,7 +62,6 @@ Alpha features might be changed or removed without prior notice.
 
 | Feature toggle name                | Description                                                                                                                                                                                         |
 | ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `dashboardPreviews`                | Create and show thumbnails for dashboard search results                                                                                                                                             |
 | `live-service-web-worker`          | This will use a webworker thread to processes events rather than the main thread                                                                                                                    |
 | `queryOverLive`                    | Use Grafana Live WebSocket to execute backend queries                                                                                                                                               |
 | `publicDashboards`                 | Enables public access to dashboards                                                                                                                                                                 |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 1b3cee87cbd..0ff1038aadd 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -21,7 +21,6 @@ export interface FeatureToggles {
   trimDefaults?: boolean;
   disableEnvelopeEncryption?: boolean;
   database_metrics?: boolean;
-  dashboardPreviews?: boolean;
   ['live-service-web-worker']?: boolean;
   queryOverLive?: boolean;
   panelTitleSearch?: boolean;
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 8f7c0117ec4..fa3d844f63d 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -479,12 +479,6 @@ func (hs *HTTPServer) registerRoutes() {
 				})
 			})
 
-			dashboardRoute.Group("/uid/:uid", func(dashUidRoute routing.RouteRegister) {
-				if hs.ThumbService != nil {
-					dashUidRoute.Get("/img/:kind/:theme", hs.ThumbService.GetImage)
-				}
-			})
-
 			dashboardRoute.Post("/calculate-diff", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.CalculateDashboardDiff))
 			dashboardRoute.Post("/validate", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.ValidateDashboard))
 			dashboardRoute.Post("/trim", routing.Wrap(hs.TrimDashboard))
diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go
index c956ae87069..60bfd8966d0 100644
--- a/pkg/api/dtos/frontend_settings.go
+++ b/pkg/api/dtos/frontend_settings.go
@@ -64,16 +64,6 @@ type FrontendSettingsUnifiedAlertingDTO struct {
 	MinInterval string `json:"minInterval"`
 }
 
-type DashboardPreviewsSystemRequirements struct {
-	Met                                bool   `json:"met"`
-	RequiredImageRendererPluginVersion string `json:"requiredImageRendererPluginVersion"`
-}
-
-type DashboardPreviewsSetupConfig struct {
-	SystemRequirements DashboardPreviewsSystemRequirements `json:"systemRequirements"`
-	ThumbnailsExist    bool                                `json:"thumbnailsExist"`
-}
-
 // Enterprise-only
 type FrontendSettingsLicensingDTO struct {
 	Slug                   *string `json:"slug,omitempty"`
@@ -210,8 +200,6 @@ type FrontendSettingsDTO struct {
 	SamlName                string                             `json:"samlName"`
 	TokenExpirationDayLimit int                                `json:"tokenExpirationDayLimit"`
 
-	DashboardPreviews DashboardPreviewsSetupConfig `json:"dashboardPreviews,omitempty"`
-
 	GeomapDefaultBaseLayerConfig *map[string]interface{} `json:"geomapDefaultBaseLayerConfig,omitempty"`
 	GeomapDisableCustomBaseLayer bool                    `json:"geomapDisableCustomBaseLayer"`
 
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index fbd626e9c80..09211a0e4a6 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -233,10 +233,6 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		frontendSettings.PluginsCDNBaseURL = cdnBaseURL
 	}
 
-	if hs.ThumbService != nil {
-		frontendSettings.DashboardPreviews = hs.ThumbService.GetDashboardPreviewsSetupSettings(c)
-	}
-
 	if hs.Cfg.GeomapDefaultBaseLayerConfig != nil {
 		frontendSettings.GeomapDefaultBaseLayerConfig = &hs.Cfg.GeomapDefaultBaseLayerConfig
 	}
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 54053704385..b9b84af22ed 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -96,7 +96,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/teamguardian"
 	tempUser "github.com/grafana/grafana/pkg/services/temp_user"
-	"github.com/grafana/grafana/pkg/services/thumbs"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/validations"
@@ -145,7 +144,6 @@ type HTTPServer struct {
 	CorrelationsService          correlations.Service
 	Live                         *live.GrafanaLive
 	LivePushGateway              *pushhttp.Gateway
-	ThumbService                 thumbs.Service
 	StorageService               store.StorageService
 	httpEntityStore              httpentitystore.HTTPEntityStore
 	SearchV2HTTPService          searchV2.SearchHTTPService
@@ -198,20 +196,19 @@ type HTTPServer struct {
 	kvStore                      kvstore.KVStore
 	pluginsCDNService            *pluginscdn.Service
 
-	userService            user.Service
-	tempUserService        tempUser.Service
-	dashboardThumbsService thumbs.DashboardThumbService
-	loginAttemptService    loginAttempt.Service
-	orgService             org.Service
-	teamService            team.Service
-	accesscontrolService   accesscontrol.Service
-	annotationsRepo        annotations.Repository
-	tagService             tag.Service
-	oauthTokenService      oauthtoken.OAuthTokenService
-	statsService           stats.Service
-	authnService           authn.Service
-	starApi                *starApi.API
-	cachingService         caching.CachingService
+	userService          user.Service
+	tempUserService      tempUser.Service
+	loginAttemptService  loginAttempt.Service
+	orgService           org.Service
+	teamService          team.Service
+	accesscontrolService accesscontrol.Service
+	annotationsRepo      annotations.Repository
+	tagService           tag.Service
+	oauthTokenService    oauthtoken.OAuthTokenService
+	statsService         stats.Service
+	authnService         authn.Service
+	starApi              *starApi.API
+	cachingService       caching.CachingService
 }
 
 type ServerOptions struct {
@@ -225,8 +222,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	pluginDashboardService plugindashboards.Service, pluginStore plugins.Store, pluginClient plugins.Client,
 	pluginErrorResolver plugins.ErrorResolver, pluginInstaller plugins.Installer, settingsProvider setting.Provider,
 	dataSourceCache datasources.CacheService, userTokenService auth.UserTokenService,
-	cleanUpService *cleanup.CleanUpService, shortURLService shorturls.Service, queryHistoryService queryhistory.Service, correlationsService correlations.Service,
-	thumbService thumbs.Service, remoteCache *remotecache.RemoteCache, provisioningService provisioning.ProvisioningService,
+	cleanUpService *cleanup.CleanUpService, shortURLService shorturls.Service, queryHistoryService queryhistory.Service, correlationsService correlations.Service, remoteCache *remotecache.RemoteCache, provisioningService provisioning.ProvisioningService,
 	loginService login.Service, authenticator loginpkg.Authenticator, accessControl accesscontrol.AccessControl,
 	dataSourceProxy *datasourceproxy.DataSourceProxyService, searchService *search.SearchService,
 	live *live.GrafanaLive, livePushGateway *pushhttp.Gateway, plugCtxProvider *plugincontext.Provider,
@@ -251,7 +247,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	secretsPluginMigrator spm.SecretMigrationProvider, secretsStore secretsKV.SecretsKVStore,
 	publicDashboardsApi *publicdashboardsApi.Api, userService user.Service, tempUserService tempUser.Service,
 	loginAttemptService loginAttempt.Service, orgService org.Service, teamService team.Service,
-	accesscontrolService accesscontrol.Service, dashboardThumbsService thumbs.DashboardThumbService, navTreeService navtree.Service,
+	accesscontrolService accesscontrol.Service, navTreeService navtree.Service,
 	annotationRepo annotations.Repository, tagService tag.Service, searchv2HTTPService searchV2.SearchHTTPService, oauthTokenService oauthtoken.OAuthTokenService,
 	statsService stats.Service, authnService authn.Service, pluginsCDNService *pluginscdn.Service,
 	starApi *starApi.API, cachingService caching.CachingService,
@@ -288,7 +284,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		QueryHistoryService:          queryHistoryService,
 		CorrelationsService:          correlationsService,
 		Features:                     features,
-		ThumbService:                 thumbService,
 		StorageService:               storageService,
 		RemoteCacheService:           remoteCache,
 		ProvisioningService:          provisioningService,
@@ -348,7 +343,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		PublicDashboardsApi:          publicDashboardsApi,
 		userService:                  userService,
 		tempUserService:              tempUserService,
-		dashboardThumbsService:       dashboardThumbsService,
 		loginAttemptService:          loginAttemptService,
 		orgService:                   orgService,
 		teamService:                  teamService,
diff --git a/pkg/server/backgroundsvcs/background_services.go b/pkg/server/backgroundsvcs/background_services.go
index b26ddbbbdd0..70e25fb1465 100644
--- a/pkg/server/backgroundsvcs/background_services.go
+++ b/pkg/server/backgroundsvcs/background_services.go
@@ -35,7 +35,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/store/entity"
 	"github.com/grafana/grafana/pkg/services/store/sanitizer"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlesimpl"
-	"github.com/grafana/grafana/pkg/services/thumbs"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
 )
 
@@ -46,8 +45,7 @@ func ProvideBackgroundServiceRegistry(
 	provisioning *provisioning.ProvisioningServiceImpl, alerting *alerting.AlertEngine, usageStats *uss.UsageStats,
 	statsCollector *statscollector.Service, grafanaUpdateChecker *updatechecker.GrafanaService,
 	pluginsUpdateChecker *updatechecker.PluginsService, metrics *metrics.InternalMetricsService,
-	secretsService *secretsManager.SecretsService, remoteCache *remotecache.RemoteCache,
-	thumbnailsService thumbs.Service, StorageService store.StorageService, searchService searchV2.SearchService, entityEventsService store.EntityEventsService,
+	secretsService *secretsManager.SecretsService, remoteCache *remotecache.RemoteCache, StorageService store.StorageService, searchService searchV2.SearchService, entityEventsService store.EntityEventsService,
 	saService *samanager.ServiceAccountsService, authInfoService *authinfoservice.Implementation,
 	grpcServerProvider grpcserver.Provider, secretMigrationProvider secretsMigrations.SecretMigrationProvider, loginAttemptService *loginattemptimpl.Service,
 	bundleService *supportbundlesimpl.Service,
@@ -78,7 +76,6 @@ func ProvideBackgroundServiceRegistry(
 		remoteCache,
 		secretsService,
 		StorageService,
-		thumbnailsService,
 		searchService,
 		entityEventsService,
 		grpcServerProvider,
diff --git a/pkg/server/usagestatssvcs/usage_stats_providers_registry.go b/pkg/server/usagestatssvcs/usage_stats_providers_registry.go
index 1030ebc9572..ad243798420 100644
--- a/pkg/server/usagestatssvcs/usage_stats_providers_registry.go
+++ b/pkg/server/usagestatssvcs/usage_stats_providers_registry.go
@@ -3,15 +3,12 @@ package usagestatssvcs
 import (
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/thumbs"
 )
 
 func ProvideUsageStatsProvidersRegistry(
-	thumbsService thumbs.Service,
 	accesscontrol accesscontrol.Service,
 ) *UsageStatsProvidersRegistry {
 	return NewUsageStatsProvidersRegistry(
-		thumbsService,
 		accesscontrol,
 	)
 }
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 2bf368349a3..5a744fe569f 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -136,8 +136,6 @@ import (
 	teamguardianManager "github.com/grafana/grafana/pkg/services/teamguardian/manager"
 	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
 	"github.com/grafana/grafana/pkg/services/temp_user/tempuserimpl"
-	"github.com/grafana/grafana/pkg/services/thumbs"
-	"github.com/grafana/grafana/pkg/services/thumbs/dashboardthumbsimpl"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
@@ -176,7 +174,6 @@ var wireBasicSet = wire.NewSet(
 	wire.Bind(new(query.Service), new(*query.ServiceImpl)),
 	bus.ProvideBus,
 	wire.Bind(new(bus.Bus), new(*bus.InProcBus)),
-	thumbs.ProvideService,
 	rendering.ProvideService,
 	wire.Bind(new(rendering.Service), new(*rendering.RenderingService)),
 	routing.ProvideRegister,
@@ -186,7 +183,6 @@ var wireBasicSet = wire.NewSet(
 	localcache.ProvideService,
 	bundleregistry.ProvideService,
 	wire.Bind(new(supportbundles.Service), new(*bundleregistry.Service)),
-	dashboardthumbsimpl.ProvideService,
 	updatechecker.ProvideGrafanaService,
 	updatechecker.ProvidePluginsService,
 	uss.ProvideService,
diff --git a/pkg/server/wireexts_oss.go b/pkg/server/wireexts_oss.go
index dfd5cbcda6f..761bc0ced01 100644
--- a/pkg/server/wireexts_oss.go
+++ b/pkg/server/wireexts_oss.go
@@ -36,7 +36,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/searchusers"
 	"github.com/grafana/grafana/pkg/services/searchusers/filters"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
-	"github.com/grafana/grafana/pkg/services/thumbs"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/validations"
 	"github.com/grafana/grafana/pkg/setting"
@@ -56,8 +55,6 @@ var wireExtsBasicSet = wire.NewSet(
 	wire.Bind(new(accesscontrol.RoleRegistry), new(*acimpl.Service)),
 	wire.Bind(new(plugins.RoleRegistry), new(*acimpl.Service)),
 	wire.Bind(new(accesscontrol.Service), new(*acimpl.Service)),
-	thumbs.ProvideCrawlerAuthSetupService,
-	wire.Bind(new(thumbs.CrawlerAuthSetupService), new(*thumbs.OSSCrawlerAuthSetupService)),
 	validations.ProvideValidator,
 	wire.Bind(new(validations.PluginRequestValidator), new(*validations.OSSPluginRequestValidator)),
 	provisioning.ProvideService,
diff --git a/pkg/services/dashboards/errors.go b/pkg/services/dashboards/errors.go
index 7adb67e2e85..be505679e48 100644
--- a/pkg/services/dashboards/errors.go
+++ b/pkg/services/dashboards/errors.go
@@ -116,11 +116,6 @@ var (
 		StatusCode: 404,
 		Status:     "not-found",
 	}
-	ErrDashboardThumbnailNotFound = DashboardErr{
-		Reason:     "Dashboard thumbnail not found",
-		StatusCode: 404,
-		Status:     "not-found",
-	}
 
 	ErrFolderNotFound           = errors.New("folder not found")
 	ErrFolderVersionMismatch    = errors.New("the folder has been changed by someone else")
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index f76f7924c88..b2232ae0ddb 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -27,12 +27,6 @@ var (
 			State:       FeatureStateStable,
 			Owner:       hostedGrafanaTeam,
 		},
-		{
-			Name:        "dashboardPreviews",
-			Description: "Create and show thumbnails for dashboard search results",
-			State:       FeatureStateAlpha,
-			Owner:       grafanaAppPlatformSquad,
-		},
 		{
 			Name:         "live-service-web-worker",
 			Description:  "This will use a webworker thread to processes events rather than the main thread",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index bb0dcd4a43d..125fdde4775 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -2,7 +2,6 @@ Name,State,Owner,requiresDevMode,RequiresLicense,RequiresRestart,FrontendOnly
 trimDefaults,beta,@grafana/grafana-as-code,false,false,false,false
 disableEnvelopeEncryption,stable,@grafana/grafana-as-code,false,false,false,false
 database_metrics,stable,@grafana/hosted-grafana-team,false,false,false,false
-dashboardPreviews,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
 live-service-web-worker,alpha,@grafana/grafana-app-platform-squad,false,false,false,true
 queryOverLive,alpha,@grafana/grafana-app-platform-squad,false,false,false,true
 panelTitleSearch,beta,@grafana/grafana-app-platform-squad,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 6f24c8d6238..3758432afa3 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -19,10 +19,6 @@ const (
 	// Add Prometheus metrics for database tables
 	FlagDatabaseMetrics = "database_metrics"
 
-	// FlagDashboardPreviews
-	// Create and show thumbnails for dashboard search results
-	FlagDashboardPreviews = "dashboardPreviews"
-
 	// FlagLiveServiceWebWorker
 	// This will use a webworker thread to processes events rather than the main thread
 	FlagLiveServiceWebWorker = "live-service-web-worker"
diff --git a/pkg/services/featuremgmt/usage_stats_test.go b/pkg/services/featuremgmt/usage_stats_test.go
index 90cba229ab8..79417ed87da 100644
--- a/pkg/services/featuremgmt/usage_stats_test.go
+++ b/pkg/services/featuremgmt/usage_stats_test.go
@@ -11,7 +11,6 @@ func TestFeatureUsageStats(t *testing.T) {
 	featureManagerWithAllFeatures := WithFeatures(
 		"trimDefaults",
 		"database_metrics",
-		"dashboardPreviews",
 		"live-config",
 		"UPPER_SNAKE_CASE",
 		"feature.with.a.dot",
@@ -20,7 +19,6 @@ func TestFeatureUsageStats(t *testing.T) {
 	require.Equal(t, map[string]interface{}{
 		"stats.features.trim_defaults.count":      1,
 		"stats.features.database_metrics.count":   1,
-		"stats.features.dashboard_previews.count": 1,
 		"stats.features.live_config.count":        1,
 		"stats.features.upper_snake_case.count":   1,
 		"stats.features.feature_with_a_dot.count": 1,
diff --git a/pkg/services/sqlstore/migrations/dashboard_thumbs_mig.go b/pkg/services/sqlstore/migrations/dashboard_thumbs_mig.go
index 09a9138004b..7a2124811c4 100644
--- a/pkg/services/sqlstore/migrations/dashboard_thumbs_mig.go
+++ b/pkg/services/sqlstore/migrations/dashboard_thumbs_mig.go
@@ -1,31 +1,32 @@
 package migrations
 
-import "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+// This migration was run behind the `dashboardPreviews` flag.
+// The feature flag and the whole dashboard previews feature was removed in https://github.com/grafana/grafana/pull/66176
 
-func addDashboardThumbsMigrations(mg *migrator.Migrator) {
-	dashThumbs := migrator.Table{
-		Name: "dashboard_thumbnail",
-		Columns: []*migrator.Column{
-			{Name: "id", Type: migrator.DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-			{Name: "dashboard_id", Type: migrator.DB_BigInt, Nullable: false},             // can join with dashboard table
-			{Name: "dashboard_version", Type: migrator.DB_Int, Nullable: false},           // screenshoted version of the dashboard
-			{Name: "state", Type: migrator.DB_NVarchar, Length: 10, Nullable: false},      // stale | locked
-			{Name: "panel_id", Type: migrator.DB_SmallInt, Nullable: false, Default: "0"}, // for panel thumbnails
-			{Name: "image", Type: migrator.DB_MediumBlob, Nullable: false},                // image stored as blob. MediumBlob has a max limit of 16mb in MySQL
-			{Name: "mime_type", Type: migrator.DB_NVarchar, Length: 255, Nullable: false}, // e.g. image/png, image/webp
-			{Name: "kind", Type: migrator.DB_NVarchar, Length: 8, Nullable: false},        // thumb | tall
-			{Name: "theme", Type: migrator.DB_NVarchar, Length: 8, Nullable: false},       // light|dark
-			{Name: "updated", Type: migrator.DB_DateTime, Nullable: false},
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"dashboard_id", "panel_id", "kind", "theme"}, Type: migrator.UniqueIndex},
-		},
-	}
-
-	mg.AddMigration("create dashboard_thumbnail table", migrator.NewAddTableMigration(dashThumbs))
-	mg.AddMigration("add unique indexes for dashboard_thumbnail", migrator.NewAddIndexMigration(dashThumbs, dashThumbs.Indices[0]))
-	mg.AddMigration("Add ds_uids column to dashboard_thumbnail table", migrator.NewAddColumnMigration(dashThumbs,
-		// uids of datasources used in the dashboard when taking preview
-		&migrator.Column{Name: "ds_uids", Type: migrator.DB_Text, Nullable: true, Default: ""},
-	))
-}
+//func addDashboardThumbsMigrations(mg *migrator.Migrator) {
+//	dashThumbs := migrator.Table{
+//		Name: "dashboard_thumbnail",
+//		Columns: []*migrator.Column{
+//			{Name: "id", Type: migrator.DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+//			{Name: "dashboard_id", Type: migrator.DB_BigInt, Nullable: false},             // can join with dashboard table
+//			{Name: "dashboard_version", Type: migrator.DB_Int, Nullable: false},           // screenshoted version of the dashboard
+//			{Name: "state", Type: migrator.DB_NVarchar, Length: 10, Nullable: false},      // stale | locked
+//			{Name: "panel_id", Type: migrator.DB_SmallInt, Nullable: false, Default: "0"}, // for panel thumbnails
+//			{Name: "image", Type: migrator.DB_MediumBlob, Nullable: false},                // image stored as blob. MediumBlob has a max limit of 16mb in MySQL
+//			{Name: "mime_type", Type: migrator.DB_NVarchar, Length: 255, Nullable: false}, // e.g. image/png, image/webp
+//			{Name: "kind", Type: migrator.DB_NVarchar, Length: 8, Nullable: false},        // thumb | tall
+//			{Name: "theme", Type: migrator.DB_NVarchar, Length: 8, Nullable: false},       // light|dark
+//			{Name: "updated", Type: migrator.DB_DateTime, Nullable: false},
+//		},
+//		Indices: []*migrator.Index{
+//			{Cols: []string{"dashboard_id", "panel_id", "kind", "theme"}, Type: migrator.UniqueIndex},
+//		},
+//	}
+//
+//	mg.AddMigration("create dashboard_thumbnail table", migrator.NewAddTableMigration(dashThumbs))
+//	mg.AddMigration("add unique indexes for dashboard_thumbnail", migrator.NewAddIndexMigration(dashThumbs, dashThumbs.Indices[0]))
+//	mg.AddMigration("Add ds_uids column to dashboard_thumbnail table", migrator.NewAddColumnMigration(dashThumbs,
+//		// uids of datasources used in the dashboard when taking preview
+//		&migrator.Column{Name: "ds_uids", Type: migrator.DB_Text, Nullable: true, Default: ""},
+//	))
+//}
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 3511b0617bd..659cfff71e1 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -53,11 +53,6 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
 	ualert.AddTablesMigrations(mg)
 	ualert.AddDashAlertMigration(mg)
 	addLibraryElementsMigrations(mg)
-	if mg.Cfg != nil && mg.Cfg.IsFeatureToggleEnabled != nil {
-		if mg.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagDashboardPreviews) {
-			addDashboardThumbsMigrations(mg)
-		}
-	}
 
 	ualert.RerunDashAlertMigration(mg)
 	addSecretsMigration(mg)
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 909289a9bf4..ee3d5cbce97 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -535,7 +535,6 @@ type InitTestDBOpt struct {
 }
 
 var featuresEnabledDuringTests = []string{
-	featuremgmt.FlagDashboardPreviews,
 	featuremgmt.FlagPanelTitleSearch,
 	featuremgmt.FlagEntityStore,
 }
diff --git a/pkg/services/thumbs/crawler.go b/pkg/services/thumbs/crawler.go
deleted file mode 100644
index cca086cf51d..00000000000
--- a/pkg/services/thumbs/crawler.go
+++ /dev/null
@@ -1,349 +0,0 @@
-package thumbs
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/sync/errgroup"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/live"
-	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-type simpleCrawler struct {
-	renderService    rendering.Service
-	threadCount      int
-	concurrentLimit  int
-	renderingTimeout time.Duration
-
-	glive                   *live.GrafanaLive
-	thumbnailRepo           thumbnailRepo
-	mode                    CrawlerMode
-	thumbnailKind           ThumbnailKind
-	auth                    CrawlerAuth
-	opts                    rendering.Opts
-	status                  crawlStatus
-	statusMutex             sync.RWMutex
-	queue                   []*DashboardWithStaleThumbnail
-	queueMutex              sync.Mutex
-	log                     log.Logger
-	renderingSessionByOrgId map[int64]rendering.Session
-	dsUidsLookup            getDatasourceUidsForDashboard
-}
-
-func newSimpleCrawler(renderService rendering.Service, gl *live.GrafanaLive, repo thumbnailRepo, cfg *setting.Cfg, settings setting.DashboardPreviewsSettings, dsUidsLookup getDatasourceUidsForDashboard) dashRenderer {
-	threadCount := int(settings.CrawlThreadCount)
-	c := &simpleCrawler{
-		// temporarily increases the concurrentLimit from the 'cfg.RendererConcurrentRequestLimit' to 'cfg.RendererConcurrentRequestLimit + crawlerThreadCount'
-		concurrentLimit:  cfg.RendererConcurrentRequestLimit + threadCount,
-		renderingTimeout: settings.RenderingTimeout,
-		renderService:    renderService,
-		threadCount:      threadCount,
-		glive:            gl,
-		dsUidsLookup:     dsUidsLookup,
-		thumbnailRepo:    repo,
-		log:              log.New("thumbnails_crawler"),
-		status: crawlStatus{
-			State:    initializing,
-			Complete: 0,
-			Queue:    0,
-		},
-		renderingSessionByOrgId: make(map[int64]rendering.Session),
-		queue:                   nil,
-	}
-	c.broadcastStatus()
-	return c
-}
-
-func (r *simpleCrawler) next(ctx context.Context) (*DashboardWithStaleThumbnail, rendering.Session, rendering.AuthOpts, error) {
-	r.queueMutex.Lock()
-	defer r.queueMutex.Unlock()
-
-	if r.queue == nil || len(r.queue) < 1 {
-		return nil, nil, rendering.AuthOpts{}, nil
-	}
-
-	v := r.queue[0]
-	r.queue = r.queue[1:]
-
-	authOpts := rendering.AuthOpts{
-		OrgID:   v.OrgId,
-		UserID:  r.auth.GetUserId(v.OrgId),
-		OrgRole: r.auth.GetOrgRole(),
-	}
-
-	if renderingSession, ok := r.renderingSessionByOrgId[v.OrgId]; ok {
-		return v, renderingSession, authOpts, nil
-	}
-
-	renderingSession, err := r.renderService.CreateRenderingSession(ctx, authOpts, rendering.SessionOpts{
-		Expiry:                     5 * time.Minute,
-		RefreshExpiryOnEachRequest: true,
-	})
-
-	if err != nil {
-		return nil, nil, authOpts, err
-	}
-
-	r.renderingSessionByOrgId[v.OrgId] = renderingSession
-	return v, renderingSession, authOpts, nil
-}
-
-func (r *simpleCrawler) broadcastStatus() {
-	s, err := r.Status()
-	if err != nil {
-		r.log.Warn("Error reading status", "err", err)
-		return
-	}
-	msg, err := json.Marshal(s)
-	if err != nil {
-		r.log.Warn("Error making message", "err", err)
-		return
-	}
-	err = r.glive.Publish(r.opts.OrgID, "grafana/broadcast/crawler", msg)
-	if err != nil {
-		r.log.Warn("Error Publish message", "err", err)
-		return
-	}
-}
-
-type byOrgId []*DashboardWithStaleThumbnail
-
-func (d byOrgId) Len() int           { return len(d) }
-func (d byOrgId) Less(i, j int) bool { return d[i].OrgId > d[j].OrgId }
-func (d byOrgId) Swap(i, j int)      { d[i], d[j] = d[j], d[i] }
-
-func (r *simpleCrawler) Run(ctx context.Context, auth CrawlerAuth, mode CrawlerMode, theme models.Theme, thumbnailKind ThumbnailKind) error {
-	res, err := r.renderService.HasCapability(ctx, rendering.ScalingDownImages)
-	if err != nil {
-		return err
-	}
-
-	if !res.IsSupported {
-		return fmt.Errorf("cant run dashboard crawler - rendering service needs to be updated. "+
-			"current version: %s, requiredVersion: %s", r.renderService.Version(), res.SemverConstraint)
-	}
-
-	runStarted := time.Now()
-
-	r.queueMutex.Lock()
-	if r.IsRunning() {
-		r.queueMutex.Unlock()
-		r.log.Info("Already running")
-		return nil
-	}
-
-	items, err := r.thumbnailRepo.findDashboardsWithStaleThumbnails(ctx, theme, thumbnailKind)
-	if err != nil {
-		r.log.Error("Error when fetching dashboards with stale thumbnails", "err", err.Error())
-		r.queueMutex.Unlock()
-		return err
-	}
-
-	if len(items) == 0 {
-		r.queueMutex.Unlock()
-		return nil
-	}
-
-	// sort the items so that we render all items from each org before moving on to the next one
-	// helps us avoid having to maintain multiple active rendering sessions
-	sort.Sort(byOrgId(items))
-
-	r.mode = mode
-	r.thumbnailKind = thumbnailKind
-	r.auth = auth
-	r.opts = rendering.Opts{
-		TimeoutOpts: rendering.TimeoutOpts{
-			Timeout:                  r.renderingTimeout,
-			RequestTimeoutMultiplier: 3,
-		},
-		Theme:           theme,
-		ConcurrentLimit: r.concurrentLimit,
-	}
-
-	r.renderingSessionByOrgId = make(map[int64]rendering.Session)
-	r.queue = items
-	r.status = crawlStatus{
-		Started:  runStarted,
-		State:    running,
-		Complete: 0,
-	}
-	r.broadcastStatus()
-	r.queueMutex.Unlock()
-
-	r.log.Info("Starting dashboard crawler", "threadCount", r.threadCount, "dashboardsToCrawl", len(items), "mode", string(mode), "theme", string(theme), "kind", string(thumbnailKind), "crawlerSetupTime", time.Since(runStarted))
-
-	group, gCtx := errgroup.WithContext(ctx)
-	// create a pool of workers
-	for i := 0; i < r.threadCount; i++ {
-		walkerId := i
-		group.Go(func() error {
-			r.walk(gCtx, walkerId)
-			return nil
-		})
-	}
-
-	err = group.Wait()
-
-	status, _ := r.Status()
-	r.log.Info("Crawl finished", "completedCount", status.Complete, "errorCount", status.Errors, "threadCount", r.threadCount, "dashboardsToCrawl", len(items), "mode", string(mode), "theme", string(theme), "kind", string(thumbnailKind), "crawlerRunTime", time.Since(runStarted))
-	if err != nil {
-		r.log.Error("Crawl ended with an error", "err", err)
-	}
-
-	r.crawlFinished()
-	r.broadcastStatus()
-	return err
-}
-
-func (r *simpleCrawler) IsRunning() bool {
-	r.statusMutex.Lock()
-	defer r.statusMutex.Unlock()
-	return r.status.State == running
-}
-
-func (r *simpleCrawler) Stop() (crawlStatus, error) {
-	r.statusMutex.Lock()
-	if r.status.State == running {
-		r.status.State = stopping
-	}
-	r.statusMutex.Unlock()
-
-	return r.Status()
-}
-
-func (r *simpleCrawler) Status() (crawlStatus, error) {
-	r.statusMutex.RLock()
-	defer r.statusMutex.RUnlock()
-
-	status := crawlStatus{
-		State:    r.status.State,
-		Started:  r.status.Started,
-		Complete: r.status.Complete,
-		Errors:   r.status.Errors,
-		Queue:    len(r.queue),
-		Last:     r.status.Last,
-	}
-	return status, nil
-}
-
-func (r *simpleCrawler) newErrorResult() {
-	r.statusMutex.Lock()
-	defer r.statusMutex.Unlock()
-
-	r.status.Errors++
-	r.status.Last = time.Now()
-}
-
-func (r *simpleCrawler) newSuccessResult() {
-	r.statusMutex.Lock()
-	defer r.statusMutex.Unlock()
-
-	r.status.Complete++
-	r.status.Last = time.Now()
-}
-
-func (r *simpleCrawler) crawlFinished() {
-	r.statusMutex.Lock()
-	defer r.statusMutex.Unlock()
-
-	r.status.State = stopped
-	r.status.Finished = time.Now()
-}
-
-func (r *simpleCrawler) shouldWalk() bool {
-	r.statusMutex.RLock()
-	defer r.statusMutex.RUnlock()
-
-	return r.status.State == running
-}
-
-func (r *simpleCrawler) walk(ctx context.Context, id int) {
-	walkerStarted := time.Now()
-
-	for {
-		if !r.shouldWalk() {
-			break
-		}
-
-		itemStarted := time.Now()
-		item, renderingSession, authOpts, err := r.next(ctx)
-		if err != nil {
-			r.log.Error("Render item retrieval error", "walkerId", id, "error", err)
-			break
-		}
-
-		if item == nil || renderingSession == nil {
-			break
-		}
-
-		url := dashboards.GetKioskModeDashboardURL(item.Uid, item.Slug, r.opts.Theme)
-		r.log.Info("Getting dashboard thumbnail", "walkerId", id, "dashboardUID", item.Uid, "url", url)
-
-		dsUids, err := r.dsUidsLookup(ctx, item.Uid, item.OrgId)
-		if err != nil {
-			r.log.Warn("Error getting datasource uids", "walkerId", id, "dashboardUID", item.Uid, "url", url, "err", err)
-			r.newErrorResult()
-			continue
-		}
-
-		res, err := r.renderService.Render(ctx, rendering.Opts{
-			Width:             320,
-			Height:            240,
-			Path:              strings.TrimPrefix(url, "/"),
-			AuthOpts:          authOpts,
-			TimeoutOpts:       r.opts.TimeoutOpts,
-			ConcurrentLimit:   r.opts.ConcurrentLimit,
-			Theme:             r.opts.Theme,
-			DeviceScaleFactor: -5, // negative numbers will render larger and then scale down.
-		}, renderingSession)
-		if err != nil {
-			r.log.Warn("Error getting image", "walkerId", id, "dashboardUID", item.Uid, "url", url, "err", err)
-			r.newErrorResult()
-		} else if res.FilePath == "" {
-			r.log.Warn("Error getting image... no response", "walkerId", id, "dashboardUID", item.Uid, "url", url)
-			r.newErrorResult()
-		} else if strings.Contains(res.FilePath, "public/img") {
-			r.log.Warn("Error getting image... internal result", "walkerId", id, "dashboardUID", item.Uid, "url", url, "img", res.FilePath)
-			// rendering service returned a static error image - we should not remove that file
-			r.newErrorResult()
-		} else {
-			func() {
-				defer func() {
-					err := os.Remove(res.FilePath)
-					if err != nil {
-						r.log.Error("Failed to remove thumbnail temp file", "walkerId", id, "dashboardUID", item.Uid, "url", url, "err", err)
-					}
-				}()
-
-				thumbnailId, err := r.thumbnailRepo.saveFromFile(ctx, res.FilePath, DashboardThumbnailMeta{
-					DashboardUID: item.Uid,
-					OrgId:        item.OrgId,
-					Theme:        r.opts.Theme,
-					Kind:         r.thumbnailKind,
-				}, item.Version, dsUids)
-
-				if err != nil {
-					r.log.Warn("Error saving image image", "walkerId", id, "dashboardUID", item.Uid, "url", url, "err", err, "itemTime", time.Since(itemStarted))
-					r.newErrorResult()
-				} else {
-					r.log.Info("Saved thumbnail", "walkerId", id, "dashboardUID", item.Uid, "url", url, "thumbnailId", thumbnailId, "itemTime", time.Since(itemStarted))
-					r.newSuccessResult()
-				}
-			}()
-		}
-		r.broadcastStatus()
-	}
-
-	r.log.Info("Walker finished", "walkerId", id, "walkerTime", time.Since(walkerStarted))
-}
diff --git a/pkg/services/thumbs/crawler_auth.go b/pkg/services/thumbs/crawler_auth.go
deleted file mode 100644
index d1fd757b902..00000000000
--- a/pkg/services/thumbs/crawler_auth.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package thumbs
-
-import (
-	"context"
-	"errors"
-	"strconv"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/serviceaccounts"
-)
-
-type CrawlerAuthSetupService interface {
-	Setup(ctx context.Context) (CrawlerAuth, error)
-}
-
-func ProvideCrawlerAuthSetupService(serviceAccounts serviceaccounts.Service,
-	sqlStore db.DB, orgService org.Service) *OSSCrawlerAuthSetupService {
-	return &OSSCrawlerAuthSetupService{
-		serviceAccountNamePrefix: "dashboard-previews-crawler-org-",
-		serviceAccounts:          serviceAccounts,
-		log:                      log.New("oss_crawler_account_setup_service"),
-		sqlStore:                 sqlStore,
-		orgService:               orgService,
-	}
-}
-
-type OSSCrawlerAuthSetupService struct {
-	log                      log.Logger
-	serviceAccountNamePrefix string
-	serviceAccounts          serviceaccounts.Service
-	sqlStore                 db.DB
-	orgService               org.Service
-}
-
-type CrawlerAuth interface {
-	GetUserId(orgId int64) int64
-	GetLogin(orgId int64) string
-	GetOrgRole() org.RoleType
-}
-
-func (o *OSSCrawlerAuthSetupService) findAllOrgIds(ctx context.Context) ([]int64, error) {
-	searchAllOrgsQuery := &org.SearchOrgsQuery{}
-	result, err := o.orgService.Search(ctx, searchAllOrgsQuery)
-	if err != nil {
-		o.log.Error("Error when searching for orgs", "err", err)
-		return nil, err
-	}
-
-	orgIds := make([]int64, 0)
-	for i := range result {
-		orgIds = append(orgIds, result[i].ID)
-	}
-
-	return orgIds, nil
-}
-
-type crawlerAuth struct {
-	accountIdByOrgId map[int64]int64
-	loginByOrgId     map[int64]string
-	orgRole          org.RoleType
-}
-
-func (o *crawlerAuth) GetOrgRole() org.RoleType {
-	return o.orgRole
-}
-
-func (o *crawlerAuth) GetUserId(orgId int64) int64 {
-	return o.accountIdByOrgId[orgId]
-}
-
-func (o *crawlerAuth) GetLogin(orgId int64) string {
-	return o.loginByOrgId[orgId]
-}
-
-func (o *OSSCrawlerAuthSetupService) Setup(ctx context.Context) (CrawlerAuth, error) {
-	orgIds, err := o.findAllOrgIds(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	// userId:0 and RoleAdmin grants the crawler process permissions to view all dashboards in all folders & orgs
-	// the process doesn't and shouldn't actually need to edit/modify any resources from the UI
-	orgRole := org.RoleAdmin
-
-	accountIdByOrgId := make(map[int64]int64)
-	loginByOrgId := make(map[int64]string)
-	for _, orgId := range orgIds {
-		o.log.Info("Creating account for org", "orgId", orgId)
-
-		serviceAccountNameOrg := o.serviceAccountNamePrefix + strconv.FormatInt(orgId, 10)
-
-		saForm := serviceaccounts.CreateServiceAccountForm{
-			Name: serviceAccountNameOrg,
-			Role: &orgRole,
-		}
-
-		serviceAccount, err := o.serviceAccounts.CreateServiceAccount(ctx, orgId, &saForm)
-		accountAlreadyExists := errors.Is(err, serviceaccounts.ErrServiceAccountAlreadyExists)
-
-		if !accountAlreadyExists && err != nil {
-			o.log.Error("Failed to create the service account", "err", err, "accountName", serviceAccountNameOrg, "orgId", orgId)
-			return nil, err
-		}
-
-		var serviceAccountLogin string
-		var serviceAccountId int64
-		if accountAlreadyExists {
-			id, err := o.serviceAccounts.RetrieveServiceAccountIdByName(ctx, orgId, serviceAccountNameOrg)
-			if err != nil {
-				o.log.Error("Failed to retrieve service account", "err", err, "accountName", serviceAccountNameOrg)
-				return nil, err
-			}
-
-			// update org_role to make sure everything works properly if someone has changed the role since SA's original creation
-			dto, err := o.serviceAccounts.UpdateServiceAccount(ctx, orgId, id, &serviceaccounts.UpdateServiceAccountForm{
-				Name: &serviceAccountNameOrg,
-				Role: &orgRole,
-			})
-
-			if err != nil {
-				o.log.Error("Failed to update service account's role", "err", err, "accountName", serviceAccountNameOrg)
-				return nil, err
-			}
-
-			serviceAccountLogin = dto.Login
-			serviceAccountId = id
-		} else {
-			serviceAccountLogin = serviceAccount.Login
-			serviceAccountId = serviceAccount.Id
-		}
-
-		accountIdByOrgId[orgId] = serviceAccountId
-		loginByOrgId[orgId] = serviceAccountLogin
-	}
-
-	return &crawlerAuth{accountIdByOrgId: accountIdByOrgId, loginByOrgId: loginByOrgId, orgRole: orgRole}, nil
-}
diff --git a/pkg/services/thumbs/dashboard_thumbs.go b/pkg/services/thumbs/dashboard_thumbs.go
deleted file mode 100644
index 2c30915724b..00000000000
--- a/pkg/services/thumbs/dashboard_thumbs.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package thumbs
-
-import (
-	"context"
-)
-
-type DashboardThumbService interface {
-	GetThumbnail(ctx context.Context, query *GetDashboardThumbnailCommand) (*DashboardThumbnail, error)
-	SaveThumbnail(ctx context.Context, cmd *SaveDashboardThumbnailCommand) (*DashboardThumbnail, error)
-	UpdateThumbnailState(ctx context.Context, cmd *UpdateThumbnailStateCommand) error
-	FindThumbnailCount(ctx context.Context, cmd *FindDashboardThumbnailCountCommand) (int64, error)
-	FindDashboardsWithStaleThumbnails(ctx context.Context, cmd *FindDashboardsWithStaleThumbnailsCommand) ([]*DashboardWithStaleThumbnail, error)
-}
diff --git a/pkg/services/thumbs/dashboardthumbsimpl/dashboard_thumbs.go b/pkg/services/thumbs/dashboardthumbsimpl/dashboard_thumbs.go
deleted file mode 100644
index 58943da0de9..00000000000
--- a/pkg/services/thumbs/dashboardthumbsimpl/dashboard_thumbs.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package dashboardthumbsimpl
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/thumbs"
-)
-
-type Service struct {
-	store store
-}
-
-func ProvideService(db db.DB) thumbs.DashboardThumbService {
-	return &Service{
-		store: &xormStore{db: db},
-	}
-}
-
-func (s *Service) GetThumbnail(ctx context.Context, query *thumbs.GetDashboardThumbnailCommand) (*thumbs.DashboardThumbnail, error) {
-	dt, err := s.store.Get(ctx, query)
-	return dt, err
-}
-
-func (s *Service) SaveThumbnail(ctx context.Context, cmd *thumbs.SaveDashboardThumbnailCommand) (*thumbs.DashboardThumbnail, error) {
-	dt, err := s.store.Save(ctx, cmd)
-	return dt, err
-}
-
-func (s *Service) UpdateThumbnailState(ctx context.Context, cmd *thumbs.UpdateThumbnailStateCommand) error {
-	err := s.store.UpdateState(ctx, cmd)
-	return err
-}
-
-func (s *Service) FindThumbnailCount(ctx context.Context, cmd *thumbs.FindDashboardThumbnailCountCommand) (int64, error) {
-	n, err := s.store.Count(ctx, cmd)
-	return n, err
-}
-
-func (s *Service) FindDashboardsWithStaleThumbnails(ctx context.Context, cmd *thumbs.FindDashboardsWithStaleThumbnailsCommand) ([]*thumbs.DashboardWithStaleThumbnail, error) {
-	thumbs, err := s.store.FindDashboardsWithStaleThumbnails(ctx, cmd)
-	return thumbs, err
-}
diff --git a/pkg/services/thumbs/dashboardthumbsimpl/store.go b/pkg/services/thumbs/dashboardthumbsimpl/store.go
deleted file mode 100644
index 49284504690..00000000000
--- a/pkg/services/thumbs/dashboardthumbsimpl/store.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package dashboardthumbsimpl
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/services/thumbs"
-)
-
-type store interface {
-	Get(ctx context.Context, query *thumbs.GetDashboardThumbnailCommand) (*thumbs.DashboardThumbnail, error)
-	Save(ctx context.Context, cmd *thumbs.SaveDashboardThumbnailCommand) (*thumbs.DashboardThumbnail, error)
-	UpdateState(ctx context.Context, cmd *thumbs.UpdateThumbnailStateCommand) error
-	Count(ctx context.Context, cmd *thumbs.FindDashboardThumbnailCountCommand) (int64, error)
-	FindDashboardsWithStaleThumbnails(ctx context.Context, cmd *thumbs.FindDashboardsWithStaleThumbnailsCommand) ([]*thumbs.DashboardWithStaleThumbnail, error)
-}
diff --git a/pkg/services/thumbs/dashboardthumbsimpl/store_test.go b/pkg/services/thumbs/dashboardthumbsimpl/store_test.go
deleted file mode 100644
index 33ebfce9565..00000000000
--- a/pkg/services/thumbs/dashboardthumbsimpl/store_test.go
+++ /dev/null
@@ -1,402 +0,0 @@
-package dashboardthumbsimpl
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
-	"github.com/grafana/grafana/pkg/services/thumbs"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-var theme = models.ThemeDark
-var kind = thumbs.ThumbnailKindDefault
-
-func TestIntegrationSqlStorage(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	var sqlStore db.DB
-	var store store
-	var savedFolder *dashboards.Dashboard
-
-	setup := func() {
-		sqlStore = db.InitTestDB(t)
-		store = &xormStore{db: sqlStore}
-		savedFolder = insertTestDashboard(t, sqlStore, "1 test dash folder", 1, 0, true, "prod", "webapp")
-	}
-
-	t.Run("Should insert dashboard in default state", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-		thumb := getThumbnail(t, store, dash.UID, dash.OrgID)
-
-		require.Positive(t, thumb.Id)
-		require.Equal(t, thumbs.ThumbnailStateDefault, thumb.State)
-		require.Equal(t, dash.Version, thumb.DashboardVersion)
-	})
-
-	t.Run("Should be able to update the thumbnail", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-		thumb := getThumbnail(t, store, dash.UID, dash.OrgID)
-
-		insertedThumbnailId := thumb.Id
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version+1)
-
-		updatedThumb := getThumbnail(t, store, dash.UID, dash.OrgID)
-		require.Equal(t, insertedThumbnailId, updatedThumb.Id)
-		require.Equal(t, dash.Version+1, updatedThumb.DashboardVersion)
-	})
-
-	t.Run("Should return empty array if all dashboards have thumbnails", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:  kind,
-			Theme: theme,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 0)
-	})
-
-	t.Run("Should return dashboards with thumbnails with empty ds_uids array", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:                             kind,
-			IncludeThumbnailsWithEmptyDsUIDs: true,
-			Theme:                            theme,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 1)
-		require.Equal(t, dash.ID, res[0].Id)
-	})
-
-	t.Run("Should return dashboards with thumbnails marked as stale", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-		updateThumbnailState(t, store, dash.UID, dash.OrgID, thumbs.ThumbnailStateStale)
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:  kind,
-			Theme: theme,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 1)
-		require.Equal(t, dash.ID, res[0].Id)
-	})
-
-	t.Run("Should not return dashboards with updated thumbnails that had been marked as stale", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-		updateThumbnailState(t, store, dash.UID, dash.OrgID, thumbs.ThumbnailStateStale)
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:  kind,
-			Theme: theme,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 0)
-	})
-
-	t.Run("Should find dashboards without thumbnails", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:  kind,
-			Theme: theme,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 1)
-		require.Equal(t, dash.ID, res[0].Id)
-	})
-
-	t.Run("Should find dashboards with outdated thumbnails", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-
-		updateTestDashboard(t, sqlStore, dash, map[string]interface{}{
-			"tags": "different-tag",
-		})
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:  kind,
-			Theme: theme,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 1)
-		require.Equal(t, dash.ID, res[0].Id)
-	})
-
-	t.Run("Should not return dashboards with locked thumbnails even if they are outdated", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, dash.Version)
-		updateThumbnailState(t, store, dash.UID, dash.OrgID, thumbs.ThumbnailStateLocked)
-
-		updateTestDashboard(t, sqlStore, dash, map[string]interface{}{
-			"tags": "different-tag",
-		})
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:  kind,
-			Theme: theme,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 0)
-	})
-
-	t.Run("Should not return dashboards with manually uploaded thumbnails by default", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, thumbs.DashboardVersionForManualThumbnailUpload)
-
-		updateTestDashboard(t, sqlStore, dash, map[string]interface{}{
-			"tags": "different-tag",
-		})
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:  kind,
-			Theme: theme,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 0)
-	})
-
-	t.Run("Should return dashboards with manually uploaded thumbnails if requested", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, thumbs.DashboardVersionForManualThumbnailUpload)
-
-		updateTestDashboard(t, sqlStore, dash, map[string]interface{}{
-			"tags": "different-tag",
-		})
-
-		cmd := thumbs.FindDashboardsWithStaleThumbnailsCommand{
-			Kind:                              kind,
-			Theme:                             theme,
-			IncludeManuallyUploadedThumbnails: true,
-		}
-		res, err := store.FindDashboardsWithStaleThumbnails(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Len(t, res, 1)
-		require.Equal(t, dash.ID, res[0].Id)
-	})
-
-	t.Run("Should count all dashboard thumbnails", func(t *testing.T) {
-		setup()
-		dash := insertTestDashboard(t, sqlStore, "test dash 23", 1, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash.UID, dash.OrgID, 1)
-		dash2 := insertTestDashboard(t, sqlStore, "test dash 23", 2, savedFolder.ID, false, "prod", "webapp")
-		upsertTestDashboardThumbnail(t, store, dash2.UID, dash2.OrgID, 1)
-
-		updateTestDashboard(t, sqlStore, dash, map[string]interface{}{
-			"tags": "different-tag",
-		})
-
-		cmd := thumbs.FindDashboardThumbnailCountCommand{}
-		res, err := store.Count(context.Background(), &cmd)
-		require.NoError(t, err)
-		require.Equal(t, res, int64(2))
-	})
-}
-
-func getThumbnail(t *testing.T, store store, dashboardUID string, orgId int64) *thumbs.DashboardThumbnail {
-	t.Helper()
-	cmd := thumbs.GetDashboardThumbnailCommand{
-		DashboardThumbnailMeta: thumbs.DashboardThumbnailMeta{
-			DashboardUID: dashboardUID,
-			OrgId:        orgId,
-			PanelID:      0,
-			Kind:         kind,
-			Theme:        theme,
-		},
-	}
-
-	thumb, err := store.Get(context.Background(), &cmd)
-	require.NoError(t, err)
-	return thumb
-}
-
-func upsertTestDashboardThumbnail(t *testing.T, store store, dashboardUID string, orgId int64, dashboardVersion int) *thumbs.DashboardThumbnail {
-	t.Helper()
-	cmd := thumbs.SaveDashboardThumbnailCommand{
-		DashboardThumbnailMeta: thumbs.DashboardThumbnailMeta{
-			DashboardUID: dashboardUID,
-			OrgId:        orgId,
-			PanelID:      0,
-			Kind:         kind,
-			Theme:        theme,
-		},
-		DashboardVersion: dashboardVersion,
-		Image:            make([]byte, 0),
-		MimeType:         "image/png",
-	}
-	dash, err := store.Save(context.Background(), &cmd)
-	require.NoError(t, err)
-	require.NotNil(t, dash)
-
-	return dash
-}
-
-func updateThumbnailState(t *testing.T, store store, dashboardUID string, orgId int64, state thumbs.ThumbnailState) {
-	t.Helper()
-	cmd := thumbs.UpdateThumbnailStateCommand{
-		DashboardThumbnailMeta: thumbs.DashboardThumbnailMeta{
-			DashboardUID: dashboardUID,
-			OrgId:        orgId,
-			PanelID:      0,
-			Kind:         kind,
-			Theme:        theme,
-		},
-		State: state,
-	}
-	err := store.UpdateState(context.Background(), &cmd)
-	require.NoError(t, err)
-}
-
-func updateTestDashboard(t *testing.T, sqlStore db.DB, dashModel *dashboards.Dashboard, data map[string]interface{}) {
-	t.Helper()
-
-	data["id"] = dashModel.ID
-
-	parentVersion := dashModel.Version
-
-	cmd := dashboards.SaveDashboardCommand{
-		OrgID:     dashModel.OrgID,
-		Overwrite: true,
-		Dashboard: simplejson.NewFromAny(data),
-	}
-	var dash *dashboards.Dashboard
-	err := sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
-		var existing dashboards.Dashboard
-		dash = cmd.GetDashboardModel()
-		dashWithIdExists, err := sess.Where("id=? AND org_id=?", dash.ID, dash.OrgID).Get(&existing)
-		require.NoError(t, err)
-		require.True(t, dashWithIdExists)
-
-		if dash.Version != existing.Version {
-			dash.SetVersion(existing.Version)
-			dash.Version = existing.Version
-		}
-
-		dash.SetVersion(dash.Version + 1)
-		dash.Created = time.Now()
-		dash.Updated = time.Now()
-		dash.ID = dashModel.ID
-		dash.UID = util.GenerateShortUID()
-
-		_, err = sess.MustCols("folder_id").ID(dash.ID).Update(dash)
-		return err
-	})
-
-	require.Nil(t, err)
-
-	err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
-		dashVersion := &dashver.DashboardVersion{
-			DashboardID:   dash.ID,
-			ParentVersion: parentVersion,
-			RestoredFrom:  cmd.RestoredFrom,
-			Version:       dash.Version,
-			Created:       time.Now(),
-			CreatedBy:     dash.UpdatedBy,
-			Message:       cmd.Message,
-			Data:          dash.Data,
-		}
-
-		if affectedRows, err := sess.Insert(dashVersion); err != nil {
-			return err
-		} else if affectedRows == 0 {
-			return dashboards.ErrDashboardNotFound
-		}
-
-		return nil
-	})
-
-	require.NoError(t, err)
-}
-
-func insertTestDashboard(t *testing.T, sqlStore db.DB, title string, orgId int64,
-	folderId int64, isFolder bool, tags ...interface{}) *dashboards.Dashboard {
-	t.Helper()
-	cmd := dashboards.SaveDashboardCommand{
-		OrgID:    orgId,
-		FolderID: folderId,
-		IsFolder: isFolder,
-		Dashboard: simplejson.NewFromAny(map[string]interface{}{
-			"id":    nil,
-			"title": title,
-			"tags":  tags,
-		}),
-	}
-
-	var dash *dashboards.Dashboard
-	err := sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
-		dash = cmd.GetDashboardModel()
-		dash.SetVersion(1)
-		dash.Created = time.Now()
-		dash.Updated = time.Now()
-		dash.UID = util.GenerateShortUID()
-		_, err := sess.Insert(dash)
-		return err
-	})
-
-	require.NoError(t, err)
-	require.NotNil(t, dash)
-	dash.Data.Set("id", dash.ID)
-	dash.Data.Set("uid", dash.UID)
-
-	err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
-		dashVersion := &dashver.DashboardVersion{
-			DashboardID:   dash.ID,
-			ParentVersion: dash.Version,
-			RestoredFrom:  cmd.RestoredFrom,
-			Version:       dash.Version,
-			Created:       time.Now(),
-			CreatedBy:     dash.UpdatedBy,
-			Message:       cmd.Message,
-			Data:          dash.Data,
-		}
-		require.NoError(t, err)
-
-		if affectedRows, err := sess.Insert(dashVersion); err != nil {
-			return err
-		} else if affectedRows == 0 {
-			return dashboards.ErrDashboardNotFound
-		}
-
-		return nil
-	})
-	require.NoError(t, err)
-
-	return dash
-}
diff --git a/pkg/services/thumbs/dashboardthumbsimpl/xorm_store.go b/pkg/services/thumbs/dashboardthumbsimpl/xorm_store.go
deleted file mode 100644
index 88a8dfc598a..00000000000
--- a/pkg/services/thumbs/dashboardthumbsimpl/xorm_store.go
+++ /dev/null
@@ -1,216 +0,0 @@
-package dashboardthumbsimpl
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/thumbs"
-)
-
-type xormStore struct {
-	db db.DB
-}
-
-func (ss *xormStore) Get(ctx context.Context, query *thumbs.GetDashboardThumbnailCommand) (result *thumbs.DashboardThumbnail, err error) {
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		thumb, err := findThumbnailByMeta(sess, query.DashboardThumbnailMeta)
-		if err != nil {
-			return err
-		}
-		result = thumb
-		return nil
-	})
-
-	return result, err
-}
-
-func marshalDatasourceUids(dsUids []string) (string, error) {
-	if dsUids == nil {
-		return "", nil
-	}
-
-	b, err := json.Marshal(dsUids)
-	if err != nil {
-		return "", err
-	}
-	return string(b), nil
-}
-
-func (ss *xormStore) Save(ctx context.Context, cmd *thumbs.SaveDashboardThumbnailCommand) (result *thumbs.DashboardThumbnail, err error) {
-	err = ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		existing, err := findThumbnailByMeta(sess, cmd.DashboardThumbnailMeta)
-
-		if err != nil && !errors.Is(err, dashboards.ErrDashboardThumbnailNotFound) {
-			return err
-		}
-
-		dsUids, err := marshalDatasourceUids(cmd.DatasourceUIDs)
-		if err != nil {
-			return err
-		}
-
-		if existing != nil {
-			existing.Image = cmd.Image
-			existing.MimeType = cmd.MimeType
-			existing.Updated = time.Now()
-			existing.DashboardVersion = cmd.DashboardVersion
-			existing.DsUIDs = dsUids
-			existing.State = thumbs.ThumbnailStateDefault
-			_, err = sess.ID(existing.Id).Update(existing)
-			result = existing
-			return err
-		}
-
-		thumb := &thumbs.DashboardThumbnail{}
-
-		dash, err := findDashboardIdByThumbMeta(sess, cmd.DashboardThumbnailMeta)
-
-		if err != nil {
-			return err
-		}
-
-		thumb.Updated = time.Now()
-		thumb.Theme = cmd.Theme
-		thumb.Kind = cmd.Kind
-		thumb.Image = cmd.Image
-		thumb.DsUIDs = dsUids
-		thumb.MimeType = cmd.MimeType
-		thumb.DashboardId = dash.Id
-		thumb.DashboardVersion = cmd.DashboardVersion
-		thumb.State = thumbs.ThumbnailStateDefault
-		thumb.PanelId = cmd.PanelID
-		_, err = sess.Insert(thumb)
-		result = thumb
-		return err
-	})
-
-	return result, err
-}
-
-func (ss *xormStore) UpdateState(ctx context.Context, cmd *thumbs.UpdateThumbnailStateCommand) error {
-	err := ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		existing, err := findThumbnailByMeta(sess, cmd.DashboardThumbnailMeta)
-
-		if err != nil {
-			return err
-		}
-
-		existing.State = cmd.State
-		_, err = sess.ID(existing.Id).Update(existing)
-		return err
-	})
-
-	return err
-}
-
-func (ss *xormStore) Count(ctx context.Context, cmd *thumbs.FindDashboardThumbnailCountCommand) (n int64, err error) {
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		count, err := sess.Count(&thumbs.DashboardThumbnail{})
-		if err != nil {
-			return err
-		}
-
-		n = count
-		return nil
-	})
-
-	return n, err
-}
-
-func (ss *xormStore) FindDashboardsWithStaleThumbnails(ctx context.Context, cmd *thumbs.FindDashboardsWithStaleThumbnailsCommand) (result []*thumbs.DashboardWithStaleThumbnail, err error) {
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		sess.Table("dashboard")
-		sess.Join("LEFT", "dashboard_thumbnail", "dashboard.id = dashboard_thumbnail.dashboard_id AND dashboard_thumbnail.theme = ? AND dashboard_thumbnail.kind = ?", cmd.Theme, cmd.Kind)
-		sess.Where("dashboard.is_folder = ?", ss.db.GetDialect().BooleanStr(false))
-
-		query := "(dashboard.version != dashboard_thumbnail.dashboard_version " +
-			"OR dashboard_thumbnail.state = ? " +
-			"OR dashboard_thumbnail.id IS NULL"
-		args := []interface{}{thumbs.ThumbnailStateStale}
-
-		if cmd.IncludeThumbnailsWithEmptyDsUIDs {
-			query += " OR dashboard_thumbnail.ds_uids = ? OR dashboard_thumbnail.ds_uids IS NULL"
-			args = append(args, "")
-		}
-		sess.Where(query+")", args...)
-
-		if !cmd.IncludeManuallyUploadedThumbnails {
-			sess.Where("(dashboard_thumbnail.id is not null AND dashboard_thumbnail.dashboard_version != ?) "+
-				"OR dashboard_thumbnail.id is null "+
-				"OR dashboard_thumbnail.state = ?", thumbs.DashboardVersionForManualThumbnailUpload, thumbs.ThumbnailStateStale)
-		}
-
-		sess.Where("(dashboard_thumbnail.id IS NULL OR dashboard_thumbnail.state != ?)", thumbs.ThumbnailStateLocked)
-
-		sess.Cols("dashboard.id",
-			"dashboard.uid",
-			"dashboard.org_id",
-			"dashboard.version",
-			"dashboard.slug")
-
-		var list = make([]*thumbs.DashboardWithStaleThumbnail, 0)
-		err := sess.Find(&list)
-
-		if err != nil {
-			return err
-		}
-		result = list
-		return err
-	})
-
-	return result, err
-}
-
-func findThumbnailByMeta(sess *db.Session, meta thumbs.DashboardThumbnailMeta) (*thumbs.DashboardThumbnail, error) {
-	result := &thumbs.DashboardThumbnail{}
-
-	sess.Table("dashboard_thumbnail")
-	sess.Join("INNER", "dashboard", "dashboard.id = dashboard_thumbnail.dashboard_id")
-	sess.Where("dashboard.uid = ? AND dashboard.org_id = ? AND panel_id = ? AND kind = ? AND theme = ?", meta.DashboardUID, meta.OrgId, meta.PanelID, meta.Kind, meta.Theme)
-	sess.Cols("dashboard_thumbnail.id",
-		"dashboard_thumbnail.dashboard_id",
-		"dashboard_thumbnail.panel_id",
-		"dashboard_thumbnail.image",
-		"dashboard_thumbnail.dashboard_version",
-		"dashboard_thumbnail.state",
-		"dashboard_thumbnail.kind",
-		"dashboard_thumbnail.ds_uids",
-		"dashboard_thumbnail.mime_type",
-		"dashboard_thumbnail.theme",
-		"dashboard_thumbnail.updated")
-	exists, err := sess.Get(result)
-
-	if !exists {
-		return nil, dashboards.ErrDashboardThumbnailNotFound
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-type dash struct {
-	Id int64
-}
-
-func findDashboardIdByThumbMeta(sess *db.Session, meta thumbs.DashboardThumbnailMeta) (*dash, error) {
-	result := &dash{}
-
-	sess.Table("dashboard").Where("dashboard.uid = ? AND dashboard.org_id = ?", meta.DashboardUID, meta.OrgId).Cols("id")
-	exists, err := sess.Get(result)
-
-	if err != nil {
-		return nil, err
-	}
-	if !exists {
-		return nil, dashboards.ErrDashboardNotFound
-	}
-
-	return result, err
-}
diff --git a/pkg/services/thumbs/datasources_lookup.go b/pkg/services/thumbs/datasources_lookup.go
deleted file mode 100644
index 32ce1d24ec0..00000000000
--- a/pkg/services/thumbs/datasources_lookup.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package thumbs
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/searchV2"
-	"github.com/grafana/grafana/pkg/tsdb/grafanads"
-)
-
-type getDatasourceUidsForDashboard func(ctx context.Context, dashboardUid string, orgId int64) ([]string, error)
-
-type dsUidsLookup struct {
-	searchService searchV2.SearchService
-	crawlerAuth   CrawlerAuth
-	features      featuremgmt.FeatureToggles
-}
-
-func getDatasourceUIDs(resp *backend.DataResponse, uid string) ([]string, error) {
-	if resp == nil {
-		return nil, errors.New("nil response")
-	}
-
-	if resp.Error != nil {
-		return nil, resp.Error
-	}
-
-	if len(resp.Frames) == 0 {
-		return nil, errors.New("empty response")
-	}
-
-	frame := resp.Frames[0]
-	field, idx := frame.FieldByName("ds_uid")
-
-	if field.Len() == 0 || idx == -1 {
-		return nil, fmt.Errorf("no ds_uid field for uid %s", uid)
-	}
-
-	rawValue, ok := field.At(0).(json.RawMessage)
-	if !ok || rawValue == nil {
-		return nil, fmt.Errorf("invalid value for uid %s in ds_uid field: %s", uid, field.At(0))
-	}
-
-	jsonValue, err := rawValue.MarshalJSON()
-	if err != nil {
-		return nil, err
-	}
-
-	var uids []string
-	err = json.Unmarshal(jsonValue, &uids)
-	if err != nil {
-		return nil, err
-	}
-
-	return uids, nil
-}
-
-func filterOutGrafanaDs(uids []string) []string {
-	filtered := make([]string, 0)
-	for _, uid := range uids {
-		if uid != grafanads.DatasourceUID {
-			filtered = append(filtered, uid)
-		}
-	}
-
-	return filtered
-}
-
-func (d *dsUidsLookup) getDatasourceUidsForDashboard(ctx context.Context, dashboardUid string, orgId int64) ([]string, error) {
-	if d.searchService.IsDisabled() {
-		return nil, nil
-	}
-
-	dashQueryResponse := d.searchService.DoDashboardQuery(ctx, &backend.User{
-		Login: d.crawlerAuth.GetLogin(orgId),
-		Role:  string(d.crawlerAuth.GetOrgRole()),
-	}, orgId, searchV2.DashboardQuery{
-		UIDs: []string{dashboardUid},
-	})
-
-	uids, err := getDatasourceUIDs(dashQueryResponse, dashboardUid)
-	if err != nil {
-		return nil, err
-	}
-
-	return filterOutGrafanaDs(uids), nil
-}
diff --git a/pkg/services/thumbs/datasources_lookup_test.go b/pkg/services/thumbs/datasources_lookup_test.go
deleted file mode 100644
index 2643655c59a..00000000000
--- a/pkg/services/thumbs/datasources_lookup_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package thumbs
-
-import (
-	"context"
-	_ "embed"
-	"testing"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/searchV2"
-)
-
-var (
-	//go:embed testdata/search_response_frame.json
-	exampleListFrameJSON string
-	exampleListFrame     = &data.Frame{}
-	_                    = exampleListFrame.UnmarshalJSON([]byte(exampleListFrameJSON))
-
-	//go:embed testdata/empty_search_response_frame.json
-	listFrameJSONWithNoDatasources string
-	listFrameWithNoDatasources     = &data.Frame{}
-	_                              = listFrameWithNoDatasources.UnmarshalJSON([]byte(listFrameJSONWithNoDatasources))
-)
-
-func TestShouldParseUidFromSearchResponseFrame(t *testing.T) {
-	searchService := &searchV2.MockSearchService{}
-	dsLookup := &dsUidsLookup{
-		searchService: searchService,
-		crawlerAuth:   &crawlerAuth{},
-		features:      featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch),
-	}
-
-	dashboardUid := "abc"
-	searchService.On("IsDisabled").Return(false)
-	searchService.On("DoDashboardQuery", mock.Anything, mock.Anything, mock.Anything, searchV2.DashboardQuery{
-		UIDs: []string{dashboardUid},
-	}).Return(&backend.DataResponse{
-		Frames: []*data.Frame{exampleListFrame},
-	})
-
-	uids, err := dsLookup.getDatasourceUidsForDashboard(context.Background(), dashboardUid, 1)
-	require.NoError(t, err)
-	require.Equal(t, []string{"datasource-2", "datasource-3", "datasource-4"}, uids)
-}
-
-func TestShouldReturnEmptyArrayIfThereAreNoDatasources(t *testing.T) {
-	searchService := &searchV2.MockSearchService{}
-	dsLookup := &dsUidsLookup{
-		searchService: searchService,
-		crawlerAuth:   &crawlerAuth{},
-		features:      featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch),
-	}
-
-	dashboardUid := "abc"
-	searchService.On("IsDisabled").Return(false)
-	searchService.On("DoDashboardQuery", mock.Anything, mock.Anything, mock.Anything, searchV2.DashboardQuery{
-		UIDs: []string{dashboardUid},
-	}).Return(&backend.DataResponse{
-		Frames: []*data.Frame{listFrameWithNoDatasources},
-	})
-
-	uids, err := dsLookup.getDatasourceUidsForDashboard(context.Background(), dashboardUid, 1)
-	require.NoError(t, err)
-	require.Equal(t, []string{}, uids)
-	require.NotNil(t, uids)
-}
-
-func TestShouldReturnNullIfSearchServiceIsDisabled(t *testing.T) {
-	searchService := &searchV2.MockSearchService{}
-	dsLookup := &dsUidsLookup{
-		searchService: searchService,
-		crawlerAuth:   &crawlerAuth{},
-		features:      featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch),
-	}
-
-	dashboardUid := "abc"
-	searchService.On("IsDisabled").Return(true)
-	uids, err := dsLookup.getDatasourceUidsForDashboard(context.Background(), dashboardUid, 1)
-	require.NoError(t, err)
-	require.Nil(t, uids)
-}
diff --git a/pkg/services/thumbs/dummy.go b/pkg/services/thumbs/dummy.go
deleted file mode 100644
index 6afeea7e869..00000000000
--- a/pkg/services/thumbs/dummy.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package thumbs
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/grafana/grafana/pkg/api/dtos"
-	"github.com/grafana/grafana/pkg/api/response"
-	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-)
-
-// When the feature flag is not enabled we just implement a dummy service
-type dummyService struct{}
-
-func (ds *dummyService) GetUsageStats(ctx context.Context) map[string]interface{} {
-	return make(map[string]interface{})
-}
-
-func (ds *dummyService) GetImage(c *contextmodel.ReqContext) {
-	c.JSON(400, map[string]string{"error": "invalid size"})
-}
-
-func (ds *dummyService) UpdateThumbnailState(c *contextmodel.ReqContext) {
-	c.JSON(400, map[string]string{"error": "invalid size"})
-}
-
-func (ds *dummyService) SetImage(c *contextmodel.ReqContext) {
-	c.JSON(400, map[string]string{"error": "invalid size"})
-}
-
-func (ds *dummyService) Enabled() bool {
-	return false
-}
-
-func (ds *dummyService) GetDashboardPreviewsSetupSettings(c *contextmodel.ReqContext) dtos.DashboardPreviewsSetupConfig {
-	return dtos.DashboardPreviewsSetupConfig{
-		SystemRequirements: dtos.DashboardPreviewsSystemRequirements{
-			Met:                                false,
-			RequiredImageRendererPluginVersion: "",
-		},
-		ThumbnailsExist: false,
-	}
-}
-
-func (ds *dummyService) StartCrawler(c *contextmodel.ReqContext) response.Response {
-	result := make(map[string]string)
-	result["error"] = "Not enabled"
-	return response.JSON(http.StatusOK, result)
-}
-
-func (ds *dummyService) StopCrawler(c *contextmodel.ReqContext) response.Response {
-	result := make(map[string]string)
-	result["error"] = "Not enabled"
-	return response.JSON(http.StatusOK, result)
-}
-
-func (ds *dummyService) CrawlerStatus(c *contextmodel.ReqContext) response.Response {
-	result := make(map[string]string)
-	result["error"] = "Not enabled"
-	return response.JSON(http.StatusOK, result)
-}
-
-func (ds *dummyService) Run(ctx context.Context) error {
-	return nil
-}
diff --git a/pkg/services/thumbs/models.go b/pkg/services/thumbs/models.go
deleted file mode 100644
index 87081e3df86..00000000000
--- a/pkg/services/thumbs/models.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package thumbs
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/grafana/grafana/pkg/models"
-)
-
-type CrawlerMode string
-
-const (
-
-	// CrawlerModeThumbs will create small thumbnails for everything.
-	CrawlerModeThumbs CrawlerMode = "thumbs"
-
-	// CrawlerModeAnalytics will get full page results for everything.
-	CrawlerModeAnalytics CrawlerMode = "analytics"
-
-	// CrawlerModeMigrate will migrate all dashboards with old schema.
-	CrawlerModeMigrate CrawlerMode = "migrate"
-)
-
-type crawlerState string
-
-const (
-	initializing crawlerState = "initializing"
-	running      crawlerState = "running"
-	stopping     crawlerState = "stopping"
-	stopped      crawlerState = "stopped"
-)
-
-type previewRequest struct {
-	OrgID int64         `json:"orgId"`
-	UID   string        `json:"uid"`
-	Kind  ThumbnailKind `json:"kind"`
-	Theme models.Theme  `json:"theme"`
-}
-
-type crawlCmd struct {
-	Mode  CrawlerMode  `json:"mode"`  // thumbs | analytics | migrate
-	Theme models.Theme `json:"theme"` // light | dark
-}
-
-type crawlStatus struct {
-	State    crawlerState `json:"state"`
-	Started  time.Time    `json:"started,omitempty"`
-	Finished time.Time    `json:"finished,omitempty"`
-	Complete int          `json:"complete"`
-	Errors   int          `json:"errors"`
-	Queue    int          `json:"queue"`
-	Last     time.Time    `json:"last,omitempty"`
-}
-
-type ThumbnailKind string
-type ThumbnailState string
-
-const (
-	// ThumbnailKindDefault is a small 320x240 preview
-	ThumbnailKindDefault ThumbnailKind = "thumb"
-
-	// unsupported for now
-	// - ThumbnailKindLarge ThumbnailKind = "large"
-	// - ThumbnailKindTall ThumbnailKind = "tall"
-)
-
-const (
-	// ThumbnailStateDefault is the initial state for all thumbnails. Thumbnails in the "default" state will be considered stale,
-	// and thus refreshed by the crawler, if the dashboard version from the time of taking the thumbnail is different from the current dashboard version
-	ThumbnailStateDefault ThumbnailState = "default"
-
-	// ThumbnailStateStale is a manually assigned state. Thumbnails in the "stale" state will be refreshed on the next crawler run
-	ThumbnailStateStale ThumbnailState = "stale"
-
-	// ThumbnailStateLocked is a manually assigned state. Thumbnails in the "locked" state will not be refreshed by the crawler as long as they remain in the "locked" state.
-	ThumbnailStateLocked ThumbnailState = "locked"
-)
-
-func (s ThumbnailState) IsValid() bool {
-	return s == ThumbnailStateDefault || s == ThumbnailStateStale || s == ThumbnailStateLocked
-}
-
-func (s *ThumbnailState) UnmarshalJSON(data []byte) error {
-	var str string
-	err := json.Unmarshal(data, &str)
-	if err != nil {
-		return err
-	}
-
-	*s = ThumbnailState(str)
-
-	if !s.IsValid() {
-		if (*s) != "" {
-			return fmt.Errorf("JSON validation error: invalid thumbnail state value: %s", *s)
-		}
-
-		*s = ThumbnailStateDefault
-	}
-
-	return nil
-}
-
-// IsKnownThumbnailKind checks if the value is supported
-func (p ThumbnailKind) IsKnownThumbnailKind() bool {
-	switch p {
-	case
-		ThumbnailKindDefault:
-		return true
-	}
-	return false
-}
-
-func ParseThumbnailKind(str string) (ThumbnailKind, error) {
-	switch str {
-	case string(ThumbnailKindDefault):
-		return ThumbnailKindDefault, nil
-	}
-	return ThumbnailKindDefault, errors.New("unknown thumbnail kind " + str)
-}
-
-// A DashboardThumbnail includes all metadata for a dashboard thumbnail
-type DashboardThumbnail struct {
-	Id               int64          `json:"id"`
-	DashboardId      int64          `json:"dashboardId"`
-	DashboardVersion int            `json:"dashboardVersion"`
-	State            ThumbnailState `json:"state"`
-	PanelId          int64          `json:"panelId,omitempty"`
-	Kind             ThumbnailKind  `json:"kind"`
-	Theme            models.Theme   `json:"theme"`
-	Image            []byte         `json:"image"`
-	MimeType         string         `json:"mimeType"`
-	Updated          time.Time      `json:"updated"`
-	DsUIDs           string         `json:"-" xorm:"ds_uids"`
-}
-
-//
-// Commands
-//
-
-// DashboardThumbnailMeta uniquely identifies a thumbnail; a natural key
-type DashboardThumbnailMeta struct {
-	DashboardUID string
-	OrgId        int64
-	PanelID      int64
-	Kind         ThumbnailKind
-	Theme        models.Theme
-}
-
-type GetDashboardThumbnailCommand struct {
-	DashboardThumbnailMeta
-}
-
-const DashboardVersionForManualThumbnailUpload = -1
-
-type DashboardWithStaleThumbnail struct {
-	Id      int64
-	OrgId   int64
-	Uid     string
-	Version int
-	Slug    string
-}
-
-type FindDashboardThumbnailCountCommand struct {
-}
-
-type FindDashboardsWithStaleThumbnailsCommand struct {
-	IncludeManuallyUploadedThumbnails bool
-	IncludeThumbnailsWithEmptyDsUIDs  bool
-	Theme                             models.Theme
-	Kind                              ThumbnailKind
-}
-
-type SaveDashboardThumbnailCommand struct {
-	DashboardThumbnailMeta
-	DashboardVersion int
-	Image            []byte
-	MimeType         string
-	DatasourceUIDs   []string
-}
-
-type UpdateThumbnailStateCommand struct {
-	State ThumbnailState
-	DashboardThumbnailMeta
-}
-
-type dashRenderer interface {
-
-	// Run Assumes you have already authenticated as admin.
-	Run(ctx context.Context, auth CrawlerAuth, mode CrawlerMode, theme models.Theme, kind ThumbnailKind) error
-
-	// Assumes you have already authenticated as admin.
-	Stop() (crawlStatus, error)
-
-	// Assumes you have already authenticated as admin.
-	Status() (crawlStatus, error)
-
-	IsRunning() bool
-}
-
-type thumbnailRepo interface {
-	updateThumbnailState(ctx context.Context, state ThumbnailState, meta DashboardThumbnailMeta) error
-	doThumbnailsExist(ctx context.Context) (bool, error)
-	saveFromFile(ctx context.Context, filePath string, meta DashboardThumbnailMeta, dashboardVersion int, dsUids []string) (int64, error)
-	saveFromBytes(ctx context.Context, bytes []byte, mimeType string, meta DashboardThumbnailMeta, dashboardVersion int, dsUids []string) (int64, error)
-	getThumbnail(ctx context.Context, meta DashboardThumbnailMeta) (*DashboardThumbnail, error)
-	findDashboardsWithStaleThumbnails(ctx context.Context, theme models.Theme, thumbnailKind ThumbnailKind) ([]*DashboardWithStaleThumbnail, error)
-}
diff --git a/pkg/services/thumbs/repo.go b/pkg/services/thumbs/repo.go
deleted file mode 100644
index 45b3d70c15e..00000000000
--- a/pkg/services/thumbs/repo.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package thumbs
-
-import (
-	"context"
-	"errors"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/searchV2"
-)
-
-func newThumbnailRepo(thumbsService DashboardThumbService, search searchV2.SearchService) thumbnailRepo {
-	repo := &sqlThumbnailRepository{
-		store:  thumbsService,
-		search: search,
-		log:    log.New("thumbnails_repo"),
-	}
-	return repo
-}
-
-type sqlThumbnailRepository struct {
-	store  DashboardThumbService
-	search searchV2.SearchService
-	log    log.Logger
-}
-
-func (r *sqlThumbnailRepository) saveFromFile(ctx context.Context, filePath string, meta DashboardThumbnailMeta, dashboardVersion int, dsUids []string) (int64, error) {
-	// the filePath variable is never set by the user. it refers to a temporary file created either in
-	//   1. thumbs/service.go, when user uploads a thumbnail
-	//   2. the rendering service, when image-renderer returns a screenshot
-
-	if !filepath.IsAbs(filePath) {
-		r.log.Error("Received relative path", "dashboardUID", meta.DashboardUID, "err", filePath)
-		return 0, errors.New("relative paths are not supported")
-	}
-
-	content, err := os.ReadFile(filepath.Clean(filePath))
-
-	if err != nil {
-		r.log.Error("error reading file", "dashboardUID", meta.DashboardUID, "err", err)
-		return 0, err
-	}
-
-	return r.saveFromBytes(ctx, content, getMimeType(filePath), meta, dashboardVersion, dsUids)
-}
-
-func getMimeType(filePath string) string {
-	if strings.HasSuffix(filePath, ".webp") {
-		return "image/webp"
-	}
-
-	return "image/png"
-}
-
-func (r *sqlThumbnailRepository) saveFromBytes(ctx context.Context, content []byte, mimeType string, meta DashboardThumbnailMeta, dashboardVersion int, dsUids []string) (int64, error) {
-	cmd := &SaveDashboardThumbnailCommand{
-		DashboardThumbnailMeta: meta,
-		Image:                  content,
-		MimeType:               mimeType,
-		DashboardVersion:       dashboardVersion,
-		DatasourceUIDs:         dsUids,
-	}
-
-	result, err := r.store.SaveThumbnail(ctx, cmd)
-	if err != nil {
-		r.log.Error("Error saving to the db", "dashboardUID", meta.DashboardUID, "err", err)
-		return 0, err
-	}
-
-	return result.Id, nil
-}
-
-func (r *sqlThumbnailRepository) updateThumbnailState(ctx context.Context, state ThumbnailState, meta DashboardThumbnailMeta) error {
-	return r.store.UpdateThumbnailState(ctx, &UpdateThumbnailStateCommand{
-		State:                  state,
-		DashboardThumbnailMeta: meta,
-	})
-}
-
-func (r *sqlThumbnailRepository) getThumbnail(ctx context.Context, meta DashboardThumbnailMeta) (*DashboardThumbnail, error) {
-	query := &GetDashboardThumbnailCommand{
-		DashboardThumbnailMeta: meta,
-	}
-	return r.store.GetThumbnail(ctx, query)
-}
-
-func (r *sqlThumbnailRepository) findDashboardsWithStaleThumbnails(ctx context.Context, theme models.Theme, kind ThumbnailKind) ([]*DashboardWithStaleThumbnail, error) {
-	return r.store.FindDashboardsWithStaleThumbnails(ctx, &FindDashboardsWithStaleThumbnailsCommand{
-		IncludeManuallyUploadedThumbnails: false,
-		IncludeThumbnailsWithEmptyDsUIDs:  !r.search.IsDisabled(),
-		Theme:                             theme,
-		Kind:                              kind,
-	})
-}
-
-func (r *sqlThumbnailRepository) doThumbnailsExist(ctx context.Context) (bool, error) {
-	cmd := &FindDashboardThumbnailCountCommand{}
-	count, err := r.store.FindThumbnailCount(ctx, cmd)
-	if err != nil {
-		r.log.Error("Error finding thumbnails", "err", err)
-		return false, err
-	}
-	return count > 0, err
-}
diff --git a/pkg/services/thumbs/service.go b/pkg/services/thumbs/service.go
deleted file mode 100644
index aa15717b207..00000000000
--- a/pkg/services/thumbs/service.go
+++ /dev/null
@@ -1,549 +0,0 @@
-package thumbs
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-
-	"github.com/segmentio/encoding/json"
-
-	"github.com/grafana/grafana/pkg/api/dtos"
-	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/serverlock"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/registry"
-	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources/permissions"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/guardian"
-	"github.com/grafana/grafana/pkg/services/licensing"
-	"github.com/grafana/grafana/pkg/services/live"
-	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/services/searchV2"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web"
-)
-
-type Service interface {
-	registry.ProvidesUsageStats
-	Run(ctx context.Context) error
-	Enabled() bool
-	GetImage(c *contextmodel.ReqContext)
-	GetDashboardPreviewsSetupSettings(c *contextmodel.ReqContext) dtos.DashboardPreviewsSetupConfig
-
-	// from dashboard page
-	SetImage(c *contextmodel.ReqContext) // form post
-	UpdateThumbnailState(c *contextmodel.ReqContext)
-
-	// Must be admin
-	StartCrawler(c *contextmodel.ReqContext) response.Response
-	StopCrawler(c *contextmodel.ReqContext) response.Response
-	CrawlerStatus(c *contextmodel.ReqContext) response.Response
-}
-
-type thumbService struct {
-	scheduleOptions            crawlerScheduleOptions
-	renderer                   dashRenderer
-	renderingService           rendering.Service
-	thumbnailRepo              thumbnailRepo
-	lockService                *serverlock.ServerLockService
-	features                   featuremgmt.FeatureToggles
-	store                      db.DB
-	crawlLockServiceActionName string
-	log                        log.Logger
-	canRunCrawler              bool
-	settings                   setting.DashboardPreviewsSettings
-	dashboardService           dashboards.DashboardService
-	dsUidsLookup               getDatasourceUidsForDashboard
-	dsPermissionsService       permissions.DatasourcePermissionsService
-	licensing                  licensing.Licensing
-	searchService              searchV2.SearchService
-}
-
-type crawlerScheduleOptions struct {
-	crawlInterval    time.Duration
-	tickerInterval   time.Duration
-	maxCrawlDuration time.Duration
-	crawlerMode      CrawlerMode
-	thumbnailKind    ThumbnailKind
-	themes           []models.Theme
-	auth             CrawlerAuth
-}
-
-func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles,
-	lockService *serverlock.ServerLockService, renderService rendering.Service,
-	gl *live.GrafanaLive, store db.DB, authSetupService CrawlerAuthSetupService,
-	dashboardService dashboards.DashboardService, dashboardThumbsService DashboardThumbService, searchService searchV2.SearchService,
-	dsPermissionsService permissions.DatasourcePermissionsService, licensing licensing.Licensing) Service {
-	if !features.IsEnabled(featuremgmt.FlagDashboardPreviews) {
-		return &dummyService{}
-	}
-	logger := log.New("previews_service")
-
-	thumbnailRepo := newThumbnailRepo(dashboardThumbsService, searchService)
-
-	canRunCrawler := true
-
-	authSetupStarted := time.Now()
-	crawlerAuth, err := authSetupService.Setup(context.Background())
-
-	if err != nil {
-		logger.Error("Crawler auth setup failed", "err", err, "crawlerAuthSetupTime", time.Since(authSetupStarted))
-		canRunCrawler = false
-	} else {
-		logger.Info("Crawler auth setup complete", "crawlerAuthSetupTime", time.Since(authSetupStarted))
-	}
-
-	dsUidsLookup := &dsUidsLookup{
-		searchService: searchService,
-		crawlerAuth:   crawlerAuth,
-		features:      features,
-	}
-
-	t := &thumbService{
-		licensing:                  licensing,
-		renderingService:           renderService,
-		renderer:                   newSimpleCrawler(renderService, gl, thumbnailRepo, cfg, cfg.DashboardPreviews, dsUidsLookup.getDatasourceUidsForDashboard),
-		thumbnailRepo:              thumbnailRepo,
-		store:                      store,
-		features:                   features,
-		lockService:                lockService,
-		crawlLockServiceActionName: "dashboard-crawler",
-		searchService:              searchService,
-		log:                        logger,
-		canRunCrawler:              canRunCrawler,
-		dsUidsLookup:               dsUidsLookup.getDatasourceUidsForDashboard,
-		settings:                   cfg.DashboardPreviews,
-		dsPermissionsService:       dsPermissionsService,
-		scheduleOptions: crawlerScheduleOptions{
-			tickerInterval:   5 * time.Minute,
-			crawlInterval:    cfg.DashboardPreviews.SchedulerInterval,
-			maxCrawlDuration: cfg.DashboardPreviews.MaxCrawlDuration,
-			crawlerMode:      CrawlerModeThumbs,
-			thumbnailKind:    ThumbnailKindDefault,
-			themes:           []models.Theme{models.ThemeDark, models.ThemeLight},
-			auth:             crawlerAuth,
-		},
-		dashboardService: dashboardService,
-	}
-
-	return t
-}
-
-func (hs *thumbService) GetUsageStats(ctx context.Context) map[string]interface{} {
-	s := hs.getDashboardPreviewsSetupSettings(ctx)
-
-	stats := make(map[string]interface{})
-
-	if s.SystemRequirements.Met {
-		stats["stats.dashboard_previews.system_req_met.count"] = 1
-	}
-
-	if s.ThumbnailsExist {
-		stats["stats.dashboard_previews.thumbnails_exist.count"] = 1
-	}
-
-	return stats
-}
-
-func (hs *thumbService) Enabled() bool {
-	return hs.features.IsEnabled(featuremgmt.FlagDashboardPreviews)
-}
-
-func (hs *thumbService) parseImageReq(c *contextmodel.ReqContext, checkSave bool) *previewRequest {
-	params := web.Params(c.Req)
-
-	kind, err := ParseThumbnailKind(params[":kind"])
-	if err != nil {
-		c.JSON(400, map[string]string{"error": "invalid size"})
-		return nil
-	}
-
-	theme, err := models.ParseTheme(params[":theme"])
-	if err != nil {
-		c.JSON(400, map[string]string{"error": "invalid theme"})
-		return nil
-	}
-
-	req := &previewRequest{
-		OrgID: c.OrgID,
-		UID:   params[":uid"],
-		Theme: theme,
-		Kind:  kind,
-	}
-
-	if len(req.UID) < 1 {
-		c.JSON(400, map[string]string{"error": "missing UID"})
-		return nil
-	}
-
-	// Check permissions and status
-	status, err := hs.getStatus(c, req.UID, checkSave)
-	if err != nil {
-		c.JSON(status, map[string]string{"error": err.Error()})
-		return nil
-	}
-
-	if status != 200 {
-		c.JSON(status, map[string]string{"error": fmt.Sprintf("code: %d", status)})
-		return nil
-	}
-	return req
-}
-
-type updateThumbnailStateRequest struct {
-	State ThumbnailState `json:"state" binding:"Required"`
-}
-
-func (hs *thumbService) UpdateThumbnailState(c *contextmodel.ReqContext) {
-	req := hs.parseImageReq(c, false)
-	if req == nil {
-		return // already returned value
-	}
-
-	var body = &updateThumbnailStateRequest{}
-
-	err := web.Bind(c.Req, body)
-	if err != nil {
-		hs.log.Error("Error parsing update thumbnail state request", "dashboardUid", req.UID, "err", err.Error())
-		c.JSON(500, map[string]string{"dashboardUID": req.UID, "error": "unknown"})
-		return
-	}
-
-	err = hs.thumbnailRepo.updateThumbnailState(c.Req.Context(), body.State, DashboardThumbnailMeta{
-		DashboardUID: req.UID,
-		OrgId:        req.OrgID,
-		Theme:        req.Theme,
-		Kind:         ThumbnailKindDefault,
-	})
-
-	if err != nil {
-		hs.log.Error("Error when trying to update thumbnail state", "dashboardUid", req.UID, "err", err.Error(), "newState", body.State)
-		c.JSON(500, map[string]string{"dashboardUID": req.UID, "error": "unknown"})
-		return
-	}
-
-	hs.log.Info("Updated dashboard thumbnail state", "dashboardUid", req.UID, "theme", req.Theme, "newState", body.State)
-	c.JSON(http.StatusOK, map[string]string{"success": "true"})
-}
-
-func (hs *thumbService) GetImage(c *contextmodel.ReqContext) {
-	req := hs.parseImageReq(c, false)
-	if req == nil {
-		return // already returned value
-	}
-
-	res, err := hs.thumbnailRepo.getThumbnail(c.Req.Context(), DashboardThumbnailMeta{
-		DashboardUID: req.UID,
-		OrgId:        req.OrgID,
-		Theme:        req.Theme,
-		Kind:         ThumbnailKindDefault,
-	})
-
-	if errors.Is(err, dashboards.ErrDashboardThumbnailNotFound) {
-		c.Resp.WriteHeader(404)
-		return
-	}
-
-	if err != nil || res == nil {
-		hs.log.Error("Error when retrieving thumbnail", "dashboardUid", req.UID, "err", err.Error())
-		c.JSON(500, map[string]string{"dashboardUID": req.UID, "error": "unknown"})
-		return
-	}
-
-	if !hs.hasAccessToPreview(c, res, req) {
-		return
-	}
-
-	currentEtag := fmt.Sprintf("%d", res.Updated.Unix())
-	c.Resp.Header().Set("ETag", currentEtag)
-
-	previousEtag := c.Req.Header.Get("If-None-Match")
-	if previousEtag == currentEtag {
-		c.Resp.WriteHeader(http.StatusNotModified)
-		return
-	}
-
-	c.Resp.Header().Set("Content-Type", res.MimeType)
-	if _, err := c.Resp.Write(res.Image); err != nil {
-		hs.log.Error("Error writing to response", "dashboardUid", req.UID, "err", err)
-	}
-}
-
-func (hs *thumbService) hasAccessToPreview(c *contextmodel.ReqContext, res *DashboardThumbnail, req *previewRequest) bool {
-	if !hs.licensing.FeatureEnabled("accesscontrol.enforcement") {
-		return true
-	}
-
-	if hs.searchService.IsDisabled() {
-		c.JSON(404, map[string]string{"dashboardUID": req.UID, "error": "unknown"})
-		return false
-	}
-
-	if res.DsUIDs == "" {
-		hs.log.Debug("dashboard preview is stale; no datasource uids", "dashboardUid", req.UID)
-		c.JSON(404, map[string]string{"dashboardUID": req.UID, "error": "unknown"})
-		return false
-	}
-
-	var dsUids []string
-	err := json.Unmarshal([]byte(res.DsUIDs), &dsUids)
-
-	if err != nil {
-		hs.log.Error("Error when retrieving datasource uids", "dashboardUid", req.UID, "err", err)
-		c.JSON(404, map[string]string{"dashboardUID": req.UID, "error": "unknown"})
-		return false
-	}
-
-	accessibleDatasources, err := hs.dsPermissionsService.FilterDatasourceUidsBasedOnQueryPermissions(c.Req.Context(), c.SignedInUser, dsUids)
-	if err != nil && !errors.Is(err, permissions.ErrNotImplemented) {
-		hs.log.Error("Error when filtering datasource uids", "dashboardUid", req.UID, "err", err)
-		c.JSON(500, map[string]string{"dashboardUID": req.UID, "error": "unknown"})
-		return false
-	}
-
-	if !errors.Is(err, permissions.ErrNotImplemented) {
-		canQueryAllDatasources := len(accessibleDatasources) == len(dsUids)
-		if !canQueryAllDatasources {
-			hs.log.Info("Denied access to dashboard preview", "dashboardUid", req.UID, "err", err, "dashboardDatasources", dsUids, "accessibleDatasources", accessibleDatasources)
-			c.JSON(404, map[string]string{"dashboardUID": req.UID, "error": "unknown"})
-			return false
-		}
-	}
-
-	return true
-}
-
-func (hs *thumbService) GetDashboardPreviewsSetupSettings(c *contextmodel.ReqContext) dtos.DashboardPreviewsSetupConfig {
-	return hs.getDashboardPreviewsSetupSettings(c.Req.Context())
-}
-
-func (hs *thumbService) getDashboardPreviewsSetupSettings(ctx context.Context) dtos.DashboardPreviewsSetupConfig {
-	systemRequirements := hs.getSystemRequirements(ctx)
-	thumbnailsExist, err := hs.thumbnailRepo.doThumbnailsExist(ctx)
-
-	if err != nil {
-		return dtos.DashboardPreviewsSetupConfig{
-			SystemRequirements: systemRequirements,
-			ThumbnailsExist:    false,
-		}
-	}
-
-	return dtos.DashboardPreviewsSetupConfig{
-		SystemRequirements: systemRequirements,
-		ThumbnailsExist:    thumbnailsExist,
-	}
-}
-
-func (hs *thumbService) getSystemRequirements(ctx context.Context) dtos.DashboardPreviewsSystemRequirements {
-	res, err := hs.renderingService.HasCapability(ctx, rendering.ScalingDownImages)
-	if err != nil {
-		hs.log.Error("Error when verifying dashboard previews system requirements thumbnail", "err", err.Error())
-		return dtos.DashboardPreviewsSystemRequirements{
-			Met: false,
-		}
-	}
-
-	if !res.IsSupported {
-		return dtos.DashboardPreviewsSystemRequirements{
-			Met:                                false,
-			RequiredImageRendererPluginVersion: res.SemverConstraint,
-		}
-	}
-
-	return dtos.DashboardPreviewsSystemRequirements{
-		Met: true,
-	}
-}
-
-// Hack for now -- lets you upload images explicitly
-func (hs *thumbService) SetImage(c *contextmodel.ReqContext) {
-	req := hs.parseImageReq(c, false)
-	if req == nil {
-		return // already returned value
-	}
-
-	r := c.Req
-
-	// Parse our multipart form, 10 << 20 specifies a maximum
-	// upload of 10 MB files.
-	err := r.ParseMultipartForm(10 << 20)
-	if err != nil {
-		c.JSON(400, map[string]string{"error": "invalid upload size"})
-		return
-	}
-
-	// FormFile returns the first file for the given key `myFile`
-	// it also returns the FileHeader so we can get the Filename,
-	// the Header and the size of the file
-	file, handler, err := r.FormFile("file")
-	if err != nil {
-		c.JSON(400, map[string]string{"error": "missing multi-part form field named 'file'"})
-		fmt.Println("error", err)
-		return
-	}
-	defer func() {
-		_ = file.Close()
-	}()
-	hs.log.Info("Uploaded File: %+v\n", handler.Filename)
-	hs.log.Info("File Size: %+v\n", handler.Size)
-	hs.log.Info("MIME Header: %+v\n", handler.Header)
-
-	fileBytes, err := io.ReadAll(file)
-	if err != nil {
-		fmt.Println(err)
-		c.JSON(400, map[string]string{"error": "error reading file"})
-		return
-	}
-
-	dsUids, err := hs.dsUidsLookup(c.Req.Context(), req.UID, req.OrgID)
-	if err != nil {
-		hs.log.Error("error looking up datasource ids", "err", err, "dashboardUid", req.UID)
-		c.JSON(500, map[string]string{"error": "internal server error"})
-		return
-	}
-
-	_, err = hs.thumbnailRepo.saveFromBytes(c.Req.Context(), fileBytes, getMimeType(handler.Filename), DashboardThumbnailMeta{
-		DashboardUID: req.UID,
-		OrgId:        req.OrgID,
-		Theme:        req.Theme,
-		Kind:         req.Kind,
-	}, DashboardVersionForManualThumbnailUpload, dsUids)
-
-	if err != nil {
-		c.JSON(400, map[string]string{"error": "error saving thumbnail file"})
-		fmt.Println("error", err)
-		return
-	}
-
-	c.JSON(http.StatusOK, map[string]int{"OK": len(fileBytes)})
-}
-
-func (hs *thumbService) StartCrawler(c *contextmodel.ReqContext) response.Response {
-	body, err := io.ReadAll(c.Req.Body)
-	if err != nil {
-		return response.Error(500, "error reading bytes", err)
-	}
-	cmd := &crawlCmd{}
-	err = json.Unmarshal(body, cmd)
-	if err != nil {
-		return response.Error(500, "error parsing bytes", err)
-	}
-	if cmd.Mode == "" {
-		cmd.Mode = CrawlerModeThumbs
-	}
-
-	go hs.runOnDemandCrawl(context.Background(), cmd.Theme, cmd.Mode, ThumbnailKindDefault, rendering.AuthOpts{
-		OrgID:   c.OrgID,
-		UserID:  c.UserID,
-		OrgRole: c.OrgRole,
-	})
-
-	status, err := hs.renderer.Status()
-	if err != nil {
-		return response.Error(500, "error starting", err)
-	}
-
-	return response.JSON(http.StatusOK, status)
-}
-
-func (hs *thumbService) StopCrawler(c *contextmodel.ReqContext) response.Response {
-	msg, err := hs.renderer.Stop()
-	if err != nil {
-		return response.Error(500, "error starting", err)
-	}
-	return response.JSON(http.StatusOK, msg)
-}
-
-func (hs *thumbService) CrawlerStatus(c *contextmodel.ReqContext) response.Response {
-	msg, err := hs.renderer.Status()
-	if err != nil {
-		return response.Error(500, "error starting", err)
-	}
-	return response.JSON(http.StatusOK, msg)
-}
-
-// Ideally this service would not require first looking up the full dashboard just to bet the id!
-func (hs *thumbService) getStatus(c *contextmodel.ReqContext, uid string, checkSave bool) (int, error) {
-	guardian, err := guardian.NewByUID(c.Req.Context(), uid, c.OrgID, c.SignedInUser)
-	if err != nil {
-		return 0, err
-	}
-
-	if checkSave {
-		if canSave, err := guardian.CanSave(); err != nil || !canSave {
-			return 403, nil // forbidden
-		}
-		return 200, nil
-	}
-
-	if canView, err := guardian.CanView(); err != nil || !canView {
-		return 403, nil // forbidden
-	}
-
-	return 200, nil // found and OK
-}
-
-func (hs *thumbService) runOnDemandCrawl(parentCtx context.Context, theme models.Theme, mode CrawlerMode, kind ThumbnailKind, authOpts rendering.AuthOpts) {
-	if !hs.canRunCrawler {
-		return
-	}
-
-	crawlerCtx, cancel := context.WithTimeout(parentCtx, hs.scheduleOptions.maxCrawlDuration)
-	defer cancel()
-
-	// wait for at least a minute after the last completed run
-	interval := time.Minute
-	err := hs.lockService.LockAndExecute(crawlerCtx, hs.crawlLockServiceActionName, interval, func(ctx context.Context) {
-		if err := hs.renderer.Run(crawlerCtx, hs.scheduleOptions.auth, mode, theme, kind); err != nil {
-			hs.log.Error("On demand crawl error", "mode", mode, "theme", theme, "kind", kind, "userId", authOpts.UserID, "orgId", authOpts.OrgID, "orgRole", authOpts.OrgRole)
-		}
-	})
-
-	if err != nil {
-		hs.log.Error("On demand crawl lock error", "err", err)
-	}
-}
-
-func (hs *thumbService) runScheduledCrawl(parentCtx context.Context) {
-	crawlerCtx, cancel := context.WithTimeout(parentCtx, hs.scheduleOptions.maxCrawlDuration)
-	defer cancel()
-
-	err := hs.lockService.LockAndExecute(crawlerCtx, hs.crawlLockServiceActionName, hs.scheduleOptions.crawlInterval, func(ctx context.Context) {
-		for _, theme := range hs.scheduleOptions.themes {
-			if err := hs.renderer.Run(crawlerCtx, hs.scheduleOptions.auth, hs.scheduleOptions.crawlerMode, theme, hs.scheduleOptions.thumbnailKind); err != nil {
-				hs.log.Error("Scheduled crawl error", "theme", theme, "kind", hs.scheduleOptions.thumbnailKind, "err", err)
-			}
-		}
-	})
-
-	if err != nil {
-		hs.log.Error("Scheduled crawl lock error", "err", err)
-	}
-}
-
-func (hs *thumbService) Run(ctx context.Context) error {
-	if !hs.canRunCrawler {
-		return nil
-	}
-
-	gc := time.NewTicker(hs.scheduleOptions.tickerInterval)
-
-	for {
-		select {
-		case <-gc.C:
-			go hs.runScheduledCrawl(ctx)
-		case <-ctx.Done():
-			hs.log.Debug("Grafana is shutting down - stopping dashboard crawler")
-			gc.Stop()
-
-			return nil
-		}
-	}
-}
diff --git a/pkg/services/thumbs/testdata/empty_search_response_frame.json b/pkg/services/thumbs/testdata/empty_search_response_frame.json
deleted file mode 100644
index d322532b637..00000000000
--- a/pkg/services/thumbs/testdata/empty_search_response_frame.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "schema": {
-    "name": "Query results",
-    "refId": "Search",
-    "meta": {
-      "type": "search-results",
-      "custom": {
-        "count": 106,
-        "locationInfo": {
-          "yboVMzb7z": {
-            "name": "gdev dashboards",
-            "kind": "folder",
-            "url": "/dashboards/f/yboVMzb7z/gdev-dashboards"
-          }
-        },
-        "sortBy": "name_sort"
-      }
-    },
-    "fields": [
-      {
-        "name": "kind",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      },
-      {
-        "name": "uid",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      },
-      {
-        "name": "name",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      },
-      {
-        "name": "panel_type",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      },
-      {
-        "name": "url",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        },
-        "config": {
-          "links": [
-            {
-              "title": "link",
-              "url": "${__value.text}"
-            }
-          ]
-        }
-      },
-      {
-        "name": "tags",
-        "type": "other",
-        "typeInfo": {
-          "frame": "json.RawMessage",
-          "nullable": true
-        }
-      },
-      {
-        "name": "ds_uid",
-        "type": "other",
-        "typeInfo": {
-          "frame": "json.RawMessage",
-          "nullable": false
-        }
-      },
-      {
-        "name": "location",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      }
-    ]
-  },
-  "data": {
-    "values": [
-      [
-        "dashboard"
-      ],
-      [
-        "ujaM1h6nz"
-      ],
-      [
-        "abc2"
-      ],
-      [
-        ""
-      ],
-      [
-        "/dashboards/f/ujaM1h6nz/abc2"
-      ],
-      [
-        [
-          "gdev"
-        ]
-      ],
-      [
-        [
-          "grafana"
-        ]
-      ],
-      [
-        ""
-      ]
-    ]
-  }
-}
diff --git a/pkg/services/thumbs/testdata/search_response_frame.json b/pkg/services/thumbs/testdata/search_response_frame.json
deleted file mode 100644
index 5ba17a6f6af..00000000000
--- a/pkg/services/thumbs/testdata/search_response_frame.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "schema": {
-    "name": "Query results",
-    "refId": "Search",
-    "meta": {
-      "type": "search-results",
-      "custom": {
-        "count": 106,
-        "locationInfo": {
-          "yboVMzb7z": {
-            "name": "gdev dashboards",
-            "kind": "folder",
-            "url": "/dashboards/f/yboVMzb7z/gdev-dashboards"
-          }
-        },
-        "sortBy": "name_sort"
-      }
-    },
-    "fields": [
-      {
-        "name": "kind",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      },
-      {
-        "name": "uid",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      },
-      {
-        "name": "name",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      },
-      {
-        "name": "panel_type",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      },
-      {
-        "name": "url",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        },
-        "config": {
-          "links": [
-            {
-              "title": "link",
-              "url": "${__value.text}"
-            }
-          ]
-        }
-      },
-      {
-        "name": "tags",
-        "type": "other",
-        "typeInfo": {
-          "frame": "json.RawMessage",
-          "nullable": true
-        }
-      },
-      {
-        "name": "ds_uid",
-        "type": "other",
-        "typeInfo": {
-          "frame": "json.RawMessage",
-          "nullable": false
-        }
-      },
-      {
-        "name": "location",
-        "type": "string",
-        "typeInfo": {
-          "frame": "string"
-        }
-      }
-    ]
-  },
-  "data": {
-    "values": [
-      [
-        "dashboard"
-      ],
-      [
-        "ujaM1h6nz"
-      ],
-      [
-        "abc2"
-      ],
-      [
-        ""
-      ],
-      [
-        "/dashboards/f/ujaM1h6nz/abc2"
-      ],
-      [
-        [
-          "gdev"
-        ]
-      ],
-      [
-        [
-          "datasource-2",
-          "datasource-3",
-          "datasource-4",
-          "grafana"
-        ]
-      ],
-      [
-        ""
-      ]
-    ]
-  }
-}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 589ca001917..d4236f46610 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -484,8 +484,6 @@ type Cfg struct {
 	// Query history
 	QueryHistoryEnabled bool
 
-	DashboardPreviews DashboardPreviewsSettings
-
 	Storage StorageSettings
 
 	Search SearchSettings
@@ -1116,7 +1114,6 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 
 	cfg.readDataSourcesSettings()
 
-	cfg.DashboardPreviews = readDashboardPreviewsSettings(iniFile)
 	cfg.Storage = readStorageSettings(iniFile)
 	cfg.Search = readSearchSettings(iniFile)
 
diff --git a/pkg/setting/setting_dashboard_previews.go b/pkg/setting/setting_dashboard_previews.go
deleted file mode 100644
index f73e046e99f..00000000000
--- a/pkg/setting/setting_dashboard_previews.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package setting
-
-import (
-	"time"
-
-	"gopkg.in/ini.v1"
-)
-
-type DashboardPreviewsSettings struct {
-	SchedulerInterval time.Duration
-	MaxCrawlDuration  time.Duration
-	RenderingTimeout  time.Duration
-	CrawlThreadCount  uint32
-}
-
-func readDashboardPreviewsSettings(iniFile *ini.File) DashboardPreviewsSettings {
-	maxThreadCount := uint32(20)
-
-	s := DashboardPreviewsSettings{}
-
-	previewsCrawlerSection := iniFile.Section("dashboard_previews.crawler")
-	s.CrawlThreadCount = uint32(previewsCrawlerSection.Key("thread_count").MustUint(6))
-	if s.CrawlThreadCount > maxThreadCount {
-		s.CrawlThreadCount = maxThreadCount
-	}
-
-	s.SchedulerInterval = previewsCrawlerSection.Key("scheduler_interval").MustDuration(12 * time.Hour)
-	s.MaxCrawlDuration = previewsCrawlerSection.Key("max_crawl_duration").MustDuration(1 * time.Hour)
-	s.RenderingTimeout = previewsCrawlerSection.Key("rendering_timeout").MustDuration(20 * time.Second)
-	return s
-}

From 1b46d2f5bdce3d4f42663e07f10f6f0fc5bb6b7d Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:34:56 -0400
Subject: [PATCH 125/729] docs: nav update notes for videos (#66506)

* nav related notes for videos

* wording edit

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>

* wording edits

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>

---------

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>
---
 .../administration/plugin-management/index.md        | 12 +++++++-----
 .../sources/administration/service-accounts/index.md |  3 ++-
 docs/sources/alerting/_index.md                      |  2 ++
 .../alerting-rules/create-grafana-managed-rule.md    |  2 ++
 .../alerting-rules/create-mimir-loki-managed-rule.md |  2 ++
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docs/sources/administration/plugin-management/index.md b/docs/sources/administration/plugin-management/index.md
index 6e3eff53e43..bde0cf5d17e 100644
--- a/docs/sources/administration/plugin-management/index.md
+++ b/docs/sources/administration/plugin-management/index.md
@@ -72,18 +72,20 @@ The Plugin catalog allows you to browse and manage plugins from within Grafana.
   </video>
 </div>
 
+_Video shows the Plugin catalog in a previous version of Grafana._
+
 In order to be able to install / uninstall / update plugins using plugin catalog, you must enable it via the `plugin_admin_enabled` flag in the [configuration]({{< relref "../../setup-grafana/configure-grafana/#plugin_admin_enabled" >}}) file.
 Before following the steps below, make sure you are logged in as a Grafana administrator.
 
 <a id="#plugin-catalog-entry"></a>
 
-- Administrators can find the Plugin catalog at **Administration > Plugins**.
+Administrators can find the Plugin catalog at **Administration > Plugins**.
 
 ### Browse plugins
 
 To browse for available plugins:
 
-1. In Grafana, [navigate to the Plugin catalog](#plugin-catalog-entry) to view installed plugins.
+1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
 1. Click the **All** filter to browse all available plugins.
 1. Click the **Data sources**, **Panels**, or **Applications** buttons to filter by plugin type.
 
@@ -91,7 +93,7 @@ To browse for available plugins:
 
 To install a plugin:
 
-1. In Grafana, [navigate to the Plugin catalog](#plugin-catalog-entry) to view installed plugins.
+1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
 1. Browse and find a plugin.
 1. Click on the plugin logo.
 1. Click **Install**.
@@ -102,7 +104,7 @@ When the update is complete, you see a confirmation message that the installatio
 
 To update a plugin:
 
-1. In Grafana, [navigate to the Plugin catalog](#plugin-catalog-entry) to view installed plugins.
+1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
 1. Click on the plugin logo.
 1. Click **Update**.
 
@@ -112,7 +114,7 @@ When the update is complete, you see a confirmation message that the update was
 
 To uninstall a plugin:
 
-1. In Grafana, [navigate to the Plugin catalog](#plugin-catalog-entry) to view installed plugins.
+1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
 1. Click on the plugin logo.
 1. Click **Uninstall**.
 
diff --git a/docs/sources/administration/service-accounts/index.md b/docs/sources/administration/service-accounts/index.md
index 21ca111affd..900d87ae63a 100644
--- a/docs/sources/administration/service-accounts/index.md
+++ b/docs/sources/administration/service-accounts/index.md
@@ -31,7 +31,8 @@ In [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}})
 > **Note:** Service accounts can only act in the organization they are created for. If you have the same task that is needed for multiple organizations, we recommend creating service accounts in each organization.
 
 {{< vimeo 742056367 >}}
-<br>
+
+_Video shows service accounts in Grafana v9.1. Refer to [Create a service account in Grafana]({{< relref "#create-a-service-account-in-grafana" >}}) for current instructions._
 
 ## Service account tokens
 
diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index c7747d9dea4..a4788d0be2e 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -19,6 +19,8 @@ Grafana Alerting is available for Grafana OSS, Grafana Enterprise, or Grafana Cl
 
 Watch this video to learn more about Grafana Alerting: {{< vimeo 720001629 >}}
 
+_Video shows Alerting in Grafana v9.0. Refer to [Manage your alert rules]({{< relref "../alerting/alerting-rules/" >}}) for current instructions._
+
 ## Overview
 
 The following diagram gives you an overview of how Grafana Alerting works and introduces you to some of the key concepts that work together and form the core of our flexible and powerful alerting engine.
diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index 99557b5ca3c..b1a0512fcd2 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -18,6 +18,8 @@ Grafana allows you to create alerting rules that query one or more data sources,
 
 Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
 
+_Video shows Alerting in Grafana v9.0. Refer to [Add Grafana managed rule]({{< relref "#add-grafana-managed-rule" >}}) (following) for current instructions._
+
 ## Add Grafana managed rule
 
 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
index 5386189bb10..81f27c5be37 100644
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
@@ -30,6 +30,8 @@ Grafana allows you to create alerting rules for an external Grafana Mimir or Lok
 
 Watch this video to learn more about how to create a Mimir managed alert rule: {{< vimeo 720001865 >}}
 
+_Video shows Alerting in Grafana v8.5. Refer to [Add a Grafana Mimir or Loki managed alerting rule]({{< relref "#add-a-grafana-mimir-or-loki-managed-alerting-rule" >}}) (following) for current instructions._
+
 > **Note:** If you do not want to manage alerting rules for a particular Loki or Prometheus data source, go to its settings and clear the **Manage alerts via Alerting UI** checkbox.
 
 ## Add a Grafana Mimir or Loki managed alerting rule

From fef490e4f8e911f42b3b077317b4053ec8d25dd2 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 13 Apr 2023 11:37:03 -0700
Subject: [PATCH 126/729] Analytics: Add total dashboard byte size to reporting
 (#66425)

Co-authored-by: Dan Cech <dcech@grafana.com>
---
 pkg/infra/usagestats/statscollector/service.go | 2 ++
 pkg/services/stats/models.go                   | 2 ++
 pkg/services/stats/statsimpl/stats.go          | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/pkg/infra/usagestats/statscollector/service.go b/pkg/infra/usagestats/statscollector/service.go
index 2d0c79e5fc2..092ba4ce54c 100644
--- a/pkg/infra/usagestats/statscollector/service.go
+++ b/pkg/infra/usagestats/statscollector/service.go
@@ -115,6 +115,8 @@ func (s *Service) collectSystemStats(ctx context.Context) (map[string]interface{
 	}
 
 	m["stats.dashboards.count"] = statsResult.Dashboards
+	m["stats.dashboard_bytes.total"] = statsResult.DashboardBytesTotal
+	m["stats.dashboard_bytes.max"] = statsResult.DashboardBytesMax
 	m["stats.users.count"] = statsResult.Users
 	m["stats.admins.count"] = statsResult.Admins
 	m["stats.editors.count"] = statsResult.Editors
diff --git a/pkg/services/stats/models.go b/pkg/services/stats/models.go
index ad8c4519531..1c0e4b93630 100644
--- a/pkg/services/stats/models.go
+++ b/pkg/services/stats/models.go
@@ -2,6 +2,8 @@ package stats
 
 type SystemStats struct {
 	Dashboards                int64
+	DashboardBytesTotal       int64
+	DashboardBytesMax         int64
 	Datasources               int64
 	Users                     int64
 	ActiveUsers               int64
diff --git a/pkg/services/stats/statsimpl/stats.go b/pkg/services/stats/statsimpl/stats.go
index 66ad8a2d07c..081f21075b5 100644
--- a/pkg/services/stats/statsimpl/stats.go
+++ b/pkg/services/stats/statsimpl/stats.go
@@ -89,6 +89,8 @@ func (ss *sqlStatsService) GetSystemStats(ctx context.Context, query *stats.GetS
 			notServiceAccount(dialect)+` AND last_seen_at > ?) AS monthly_active_users,`, monthlyActiveUserDeadlineDate)
 
 		sb.Write(`(SELECT COUNT(id) FROM `+dialect.Quote("dashboard")+` WHERE is_folder = ?) AS dashboards,`, dialect.BooleanStr(false))
+		sb.Write(`(SELECT SUM(LENGTH(data)) FROM `+dialect.Quote("dashboard")+` WHERE is_folder = ?) AS dashboard_bytes_total,`, dialect.BooleanStr(false))
+		sb.Write(`(SELECT MAX(LENGTH(data)) FROM `+dialect.Quote("dashboard")+` WHERE is_folder = ?) AS dashboard_bytes_max,`, dialect.BooleanStr(false))
 		sb.Write(`(SELECT COUNT(id) FROM `+dialect.Quote("dashboard")+` WHERE is_folder = ?) AS folders,`, dialect.BooleanStr(true))
 
 		sb.Write(`(

From d208324331f52470a3d483e65929326265058c07 Mon Sep 17 00:00:00 2001
From: samu6851 <samuel.oswalt@grafana.com>
Date: Thu, 13 Apr 2023 12:45:02 -0700
Subject: [PATCH 127/729] Put the numbers before dashboard elements. (#65749)

* Put the numbers before dashboard elements.

Putting the numbers before the dashboard elements will make finding these easier for our customers as the first thing most people will do is look for the number that corresponds with the number in the photo.

* fixed icon name

---------

Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
---
 .../dashboards/use-dashboards/index.md        | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/sources/dashboards/use-dashboards/index.md b/docs/sources/dashboards/use-dashboards/index.md
index 9753b8884df..db62eb9793a 100644
--- a/docs/sources/dashboards/use-dashboards/index.md
+++ b/docs/sources/dashboards/use-dashboards/index.md
@@ -29,26 +29,26 @@ The following image and descriptions highlights all dashboards features.
 
 {{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-annotated-9-5-0.png" width="700px" >}}
 
-- **Grafana home** (1): Click **Home** in the breadcrumb to be redirected to the home page configured in the Grafana instance.
-- **Dashboard title** (2): When you click the dashboard title you can search for dashboard contained in the current folder.
-- **Share dashboard or panel** (3): Use this option to share the current dashboard or panel by link or snapshot. You can also export the dashboard definition from the share modal.
-- **Add** (4): Use this option to add a panel, dashboard row, or library panel to the current dashboard.
-- **Save dashboard** (5): Click to save changes to your dashboard.
-- **Dashboard insights** (6): Click to view analytics about your dashboard including information about users, activity, query counts.
-- **Dashboard settings** (7): Use this option to change dashboard name, folder, and tags and manage variables and annotation queries. For more information about dashboard settings, refer to [Modify dashboard settings]({{< relref "../build-dashboards/modify-dashboard-settings/" >}}).
-- **Time picker dropdown** (8): Click to select relative time range options and set custom absolute time ranges.
+- (1) **Grafana home**: Click **Home** in the breadcrumb to be redirected to the home page configured in the Grafana instance.
+- (2) **Dashboard title**: When you click the dashboard title you can search for dashboard contained in the current folder.
+- (3) **Share dashboard or panel**: Use this option to share the current dashboard or panel by link or snapshot. You can also export the dashboard definition from the share modal.
+- (4) **Add**: Use this option to add a panel, dashboard row, or library panel to the current dashboard.
+- (5) **Save dashboard**: Click to save changes to your dashboard.
+- (6) **Dashboard insights**: Click to view analytics about your dashboard including information about users, activity, query counts.
+- (7) **Dashboard settings**: Use this option to change dashboard name, folder, and tags and manage variables and annotation queries. For more information about dashboard settings, refer to [Modify dashboard settings]({{< relref "../build-dashboards/modify-dashboard-settings/" >}}).
+- (8) **Time picker dropdown**: Click to select relative time range options and set custom absolute time ranges.
   - You can change the **Timezone** and **fiscal year** settings from the time range controls by clicking the **Change time settings** button.
   - Time settings are saved on a per-dashboard basis.
-- **Zoom out time range** (9): Click to zoom out the time range. For more information about how to use time range controls, refer to [Common time range controls]({{< relref "#common-time-range-controls" >}}).
-- **Refresh dashboard** (10): Click to immediately trigger queries and refresh dashboard data.
-- **Refresh dashboard time interval** (11): Click to select a dashboard auto refresh time interval.
-- **View mode** (12): Click to display the dashboard on a large screen such as a TV or a kiosk. View mode hides irrelevant information such as navigation menus. For more information about view mode, refer to [How to Create Kiosks to Display Dashboards on a TV](https://grafana.com/blog/2019/05/02/grafana-tutorial-how-to-create-kiosks-to-display-dashboards-on-a-tv/).
-- **Dashboard panel** (13): The primary building block of a dashboard is the panel. To add a new panel, dashboard row, or library panel, click **Add panel**.
+- (9) **Zoom out time range**: Click to zoom out the time range. For more information about how to use time range controls, refer to [Common time range controls]({{< relref "#common-time-range-controls" >}}).
+- (10) **Refresh dashboard**: Click to immediately trigger queries and refresh dashboard data.
+- (11) **Refresh dashboard time interval**: Click to select a dashboard auto refresh time interval.
+- (12) **View mode**: Click to display the dashboard on a large screen such as a TV or a kiosk. View mode hides irrelevant information such as navigation menus. For more information about view mode, refer to [How to Create Kiosks to Display Dashboards on a TV](https://grafana.com/blog/2019/05/02/grafana-tutorial-how-to-create-kiosks-to-display-dashboards-on-a-tv/).
+- (13) **Dashboard panel**: The primary building block of a dashboard is the panel. To add a new panel, dashboard row, or library panel, click **Add panel**.
   - Library panels can be shared among many dashboards.
   - To move a panel, drag the panel header to another location.
   - To resize a panel, click and drag the lower right corner of the panel.
-- **Graph legend** (14): Change series colors, y-axis and series visibility directly from the legend.
-- **Dashboard row** (15): A dashboard row is a logical divider within a dashboard that groups panels together.
+- (14) **Graph legend**: Change series colors, y-axis and series visibility directly from the legend.
+- (15) **Dashboard row**: A dashboard row is a logical divider within a dashboard that groups panels together.
   - Rows can be collapsed or expanded allowing you to hide parts of the dashboard.
   - Panels inside a collapsed row do not issue queries.
   - Use [repeating rows]({{< relref "../build-dashboards/create-dashboard/#configure-repeating-rows" >}}) to dynamically create rows based on a template variable.

From 4a7f27489eb1fc4878272187733ebcdedff025e7 Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Thu, 13 Apr 2023 15:05:20 -0500
Subject: [PATCH 128/729] Prometheus: Fix ad-hoc filters (#66521)

* refactor label names back to getTagKeys to fulfill contract with parent class required for ad-hoc functionality
---
 .../prometheus/components/VariableQueryEditor.tsx    |  2 +-
 .../plugins/datasource/prometheus/datasource.test.ts | 12 +++++++++++-
 .../app/plugins/datasource/prometheus/datasource.tsx |  4 +++-
 .../datasource/prometheus/metric_find_query.ts       |  2 +-
 .../tempo/QueryEditor/ServiceGraphSection.tsx        |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
index c2b064d5e76..167b1f9608e 100644
--- a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
@@ -72,7 +72,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
       return;
     }
 
-    datasource.getLabelNames().then((labelNames: Array<{ text: string }>) => {
+    datasource.getTagKeys().then((labelNames: Array<{ text: string }>) => {
       setLabelOptions(labelNames.map(({ text }) => ({ label: text, value: text })));
     });
   }, [datasource, qryType]);
diff --git a/public/app/plugins/datasource/prometheus/datasource.test.ts b/public/app/plugins/datasource/prometheus/datasource.test.ts
index 7c41947e10b..c7fb6b5f2a5 100644
--- a/public/app/plugins/datasource/prometheus/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.test.ts
@@ -94,6 +94,16 @@ describe('PrometheusDatasource', () => {
     ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
   });
 
+  // Some functions are required by the parent datasource class to provide functionality such as ad-hoc filters, which requires the definition of the getTagKeys, and getTagValues functions
+  describe('Datasource contract', () => {
+    it('has function called getTagKeys', () => {
+      expect(Object.getOwnPropertyNames(Object.getPrototypeOf(ds))).toContain('getTagKeys');
+    });
+    it('has function called getTagValues', () => {
+      expect(Object.getOwnPropertyNames(Object.getPrototypeOf(ds))).toContain('getTagValues');
+    });
+  });
+
   describe('Query', () => {
     it('returns empty array when no queries', async () => {
       await expect(ds.query(createDataRequest([]))).toEmitValuesWith((response) => {
@@ -167,7 +177,7 @@ describe('PrometheusDatasource', () => {
       ).rejects.toMatchObject({
         message: expect.stringMatching('Browser access'),
       });
-      await expect(directDs.getLabelNames()).rejects.toMatchObject({
+      await expect(directDs.getTagKeys()).rejects.toMatchObject({
         message: expect.stringMatching('Browser access'),
       });
       await expect(directDs.getTagValues()).rejects.toMatchObject({
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index b212d59baf1..e4c03719d26 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -934,10 +934,11 @@ export class PrometheusDatasource
     );
   }
 
+  // By implementing getTagKeys and getTagValues we add ad-hoc filters functionality
   // this is used to get label keys, a.k.a label names
   // it is used in metric_find_query.ts
   // and in Tempo here grafana/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx
-  async getLabelNames(options?: any) {
+  async getTagKeys(options?: any) {
     if (options?.series) {
       // Get tags for the provided series only
       const seriesLabels: Array<Record<string, string[]>> = await Promise.all(
@@ -956,6 +957,7 @@ export class PrometheusDatasource
     }
   }
 
+  // By implementing getTagKeys and getTagValues we add ad-hoc filters functionality
   async getTagValues(options: { key?: string } = {}) {
     const params = this.getTimeRangeParams();
     const result = await this.metadataRequest(`/api/v1/label/${options.key}/values`, params);
diff --git a/public/app/plugins/datasource/prometheus/metric_find_query.ts b/public/app/plugins/datasource/prometheus/metric_find_query.ts
index 7ce5f1f50d8..a0225c60b5a 100644
--- a/public/app/plugins/datasource/prometheus/metric_find_query.ts
+++ b/public/app/plugins/datasource/prometheus/metric_find_query.ts
@@ -25,7 +25,7 @@ export default class PrometheusMetricFindQuery {
     const queryResultRegex = /^query_result\((.+)\)\s*$/;
     const labelNamesQuery = this.query.match(labelNamesRegex);
     if (labelNamesQuery) {
-      return this.datasource.getLabelNames();
+      return this.datasource.getTagKeys();
     }
 
     const labelValuesQuery = this.query.match(labelValuesRegex);
diff --git a/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx b/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx
index 1c5785dec69..edaa5ea1d8c 100644
--- a/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx
+++ b/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx
@@ -29,7 +29,7 @@ export function ServiceGraphSection({
   const [hasKeys, setHasKeys] = useState<boolean | undefined>(undefined);
   useEffect(() => {
     async function fn(ds: PrometheusDatasource) {
-      const keys = await ds.getLabelNames({
+      const keys = await ds.getTagKeys({
         series: [
           'traces_service_graph_request_server_seconds_sum',
           'traces_service_graph_request_total',

From 8d6314c6549586c794bfee249e1b5fb23662d6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Kraml?=
 <117438585+jkraml-staffbase@users.noreply.github.com>
Date: Thu, 13 Apr 2023 23:03:31 +0200
Subject: [PATCH 129/729] Dashboard: Add series color shades (#61300)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Dashboard: Add series color shades

Add color option "Shades of a color" which gives each series a color derived from a user-selected base color.

* Documentation: Add entry for color shades

Describe color option "Shades of a color" in documentation.

* Chore: formatting fixes

* Dashboard: Use better fallback color for color shades in fieldColor.ts

Fall back to a gray color if the configured color cannot be parsed.

* Chore: fix typo in fieldColor.test.ts

* Documentation: fix a sentence

* remove custom color parsing and change logic a bit

* Fix prettier issue

---------

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
Co-authored-by: Kristina Durivage <kristina.durivage@grafana.com>
---
 .../configure-standard-options/index.md       |  1 +
 .../grafana-data/src/field/fieldColor.test.ts | 18 +++++++-
 packages/grafana-data/src/field/fieldColor.ts | 43 +++++++++++++++++++
 packages/grafana-data/src/types/fieldColor.ts |  1 +
 .../core/components/OptionsUI/fieldColor.tsx  |  2 +-
 5 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/docs/sources/panels-visualizations/configure-standard-options/index.md b/docs/sources/panels-visualizations/configure-standard-options/index.md
index cc15a0b91b3..e9e1080739e 100644
--- a/docs/sources/panels-visualizations/configure-standard-options/index.md
+++ b/docs/sources/panels-visualizations/configure-standard-options/index.md
@@ -119,6 +119,7 @@ Select one of the following palettes:
 | Color mode                      | Description                                                                                                                                              |
 | ------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **Single color**                | Specify a single color, useful in an override rule                                                                                                       |
+| **Shades of a color**           | Selects shades of a single color, useful in an override rule                                                                                             |
 | **From thresholds**             | Informs Grafana to take the color from the matching threshold                                                                                            |
 | **Classic palette**             | Grafana will assign color by looking up a color in a palette by series index. Useful for Graphs and pie charts and other categorical data visualizations |
 | **Green-Yellow-Red (by value)** | Continuous color scheme                                                                                                                                  |
diff --git a/packages/grafana-data/src/field/fieldColor.test.ts b/packages/grafana-data/src/field/fieldColor.test.ts
index bf20bce0cf8..9652e91fb4e 100644
--- a/packages/grafana-data/src/field/fieldColor.test.ts
+++ b/packages/grafana-data/src/field/fieldColor.test.ts
@@ -4,7 +4,7 @@ import { ArrayVector } from '../vector/ArrayVector';
 
 import { fieldColorModeRegistry, FieldValueColorCalculator, getFieldSeriesColor } from './fieldColor';
 
-function getTestField(mode: string): Field {
+function getTestField(mode: string, fixedColor?: string): Field {
   return {
     name: 'name',
     type: FieldType.number,
@@ -12,6 +12,7 @@ function getTestField(mode: string): Field {
     config: {
       color: {
         mode: mode,
+        fixedColor: fixedColor,
       },
     },
     state: {},
@@ -21,10 +22,11 @@ function getTestField(mode: string): Field {
 interface GetCalcOptions {
   mode: string;
   seriesIndex?: number;
+  fixedColor?: string;
 }
 
 function getCalculator(options: GetCalcOptions): FieldValueColorCalculator {
-  const field = getTestField(options.mode);
+  const field = getTestField(options.mode, options.fixedColor);
   const mode = fieldColorModeRegistry.get(options.mode);
   field.state!.seriesIndex = options.seriesIndex;
   return mode.getCalculator(field, createTheme());
@@ -59,6 +61,18 @@ describe('fieldColorModeRegistry', () => {
 
     expect(color.color).toEqual(calcFn(4, 0.75));
   });
+
+  it('Shades should return selected color for index 0', () => {
+    const color = '#123456';
+    const calcFn = getCalculator({ mode: FieldColorModeId.Shades, seriesIndex: 0, fixedColor: color });
+    expect(calcFn(70, 0, undefined)).toEqual(color);
+  });
+
+  it('Shades should return different than selected color for index 1', () => {
+    const color = '#123456';
+    const calcFn = getCalculator({ mode: FieldColorModeId.Shades, seriesIndex: 1, fixedColor: color });
+    expect(calcFn(70, 0, undefined)).not.toEqual(color);
+  });
 });
 
 describe('getFieldSeriesColor', () => {
diff --git a/packages/grafana-data/src/field/fieldColor.ts b/packages/grafana-data/src/field/fieldColor.ts
index 8cd714e7f7a..a9d09572998 100644
--- a/packages/grafana-data/src/field/fieldColor.ts
+++ b/packages/grafana-data/src/field/fieldColor.ts
@@ -1,4 +1,5 @@
 import { interpolateRgbBasis } from 'd3-interpolate';
+import tinycolor from 'tinycolor2';
 
 import { GrafanaTheme2 } from '../themes/types';
 import { reduceField } from '../transformations/fieldReducer';
@@ -29,6 +30,12 @@ export const fieldColorModeRegistry = new Registry<FieldColorMode>(() => {
       description: 'Set a specific color',
       getCalculator: getFixedColor,
     },
+    {
+      id: FieldColorModeId.Shades,
+      name: 'Shades of a color',
+      description: 'Select shades of a specific color',
+      getCalculator: getShadedColor,
+    },
     {
       id: FieldColorModeId.Thresholds,
       name: 'From thresholds',
@@ -236,3 +243,39 @@ function getFixedColor(field: Field, theme: GrafanaTheme2) {
     return theme.visualization.getColorByName(field.config.color?.fixedColor ?? FALLBACK_COLOR);
   };
 }
+
+function getShadedColor(field: Field, theme: GrafanaTheme2) {
+  return () => {
+    const baseColorString: string = theme.visualization.getColorByName(
+      field.config.color?.fixedColor ?? FALLBACK_COLOR
+    );
+
+    const colors: string[] = [
+      baseColorString, // start with base color
+    ];
+
+    const shadesCount = 6;
+    const maxHueSpin = 10; // hue spin, max is 360
+    const maxDarken = 35; // max 100%
+    const maxBrighten = 35; // max 100%
+
+    for (let i = 1; i < shadesCount; i++) {
+      // push alternating darker and brighter shades
+      colors.push(
+        tinycolor(baseColorString)
+          .spin((i / shadesCount) * maxHueSpin)
+          .brighten((i / shadesCount) * maxDarken)
+          .toHexString()
+      );
+      colors.push(
+        tinycolor(baseColorString)
+          .spin(-(i / shadesCount) * maxHueSpin)
+          .darken((i / shadesCount) * maxBrighten)
+          .toHexString()
+      );
+    }
+
+    const seriesIndex = field.state?.seriesIndex ?? 0;
+    return colors[seriesIndex % colors.length];
+  };
+}
diff --git a/packages/grafana-data/src/types/fieldColor.ts b/packages/grafana-data/src/types/fieldColor.ts
index 465c268e1a5..d58bb68ceab 100644
--- a/packages/grafana-data/src/types/fieldColor.ts
+++ b/packages/grafana-data/src/types/fieldColor.ts
@@ -16,6 +16,7 @@ export enum FieldColorModeId {
   ContinuousGreens = 'continuous-greens',
   ContinuousPurples = 'continuous-purples',
   Fixed = 'fixed',
+  Shades = 'shades',
 }
 
 /**
diff --git a/public/app/core/components/OptionsUI/fieldColor.tsx b/public/app/core/components/OptionsUI/fieldColor.tsx
index 72855b33699..3576efc7d0e 100644
--- a/public/app/core/components/OptionsUI/fieldColor.tsx
+++ b/public/app/core/components/OptionsUI/fieldColor.tsx
@@ -68,7 +68,7 @@ export const FieldColorEditor = ({ value, onChange, item, id }: Props) => {
 
   const mode = value?.mode ?? FieldColorModeId.Thresholds;
 
-  if (mode === FieldColorModeId.Fixed) {
+  if (mode === FieldColorModeId.Fixed || mode === FieldColorModeId.Shades) {
     return (
       <div className={styles.group}>
         <Select

From 46742f6d96b33d35ba6d18ff267913cb18df8209 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matyax@gmail.com>
Date: Thu, 13 Apr 2023 23:30:27 +0200
Subject: [PATCH 130/729] Loki Variable Query Editor: Fix bug when the query is
 updated (#66509)

* Variable Query Editor: Remove options override in effect

* Add regression test
---
 .../components/VariableQueryEditor.test.tsx   | 51 +++++++++++--------
 .../loki/components/VariableQueryEditor.tsx   |  4 --
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx
index 0f66035ed62..81a4259c334 100644
--- a/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx
@@ -26,7 +26,14 @@ describe('LokiVariableQueryEditor', () => {
       onChange: () => {},
     };
 
-    jest.spyOn(props.datasource, 'labelNamesQuery').mockResolvedValue([]);
+    jest.spyOn(props.datasource, 'labelNamesQuery').mockResolvedValue([
+      {
+        text: 'moon',
+      },
+      {
+        text: 'luna',
+      },
+    ]);
   });
 
   test('Allows to create a Label names variable', async () => {
@@ -47,14 +54,6 @@ describe('LokiVariableQueryEditor', () => {
 
   test('Allows to create a Label values variable', async () => {
     const onChange = jest.fn();
-    jest.spyOn(props.datasource, 'labelNamesQuery').mockResolvedValue([
-      {
-        text: 'moon',
-      },
-      {
-        text: 'luna',
-      },
-    ]);
     render(<LokiVariableQueryEditor {...props} onChange={onChange} />);
 
     expect(onChange).not.toHaveBeenCalled();
@@ -77,14 +76,6 @@ describe('LokiVariableQueryEditor', () => {
 
   test('Allows to create a Label values variable with custom label', async () => {
     const onChange = jest.fn();
-    jest.spyOn(props.datasource, 'labelNamesQuery').mockResolvedValue([
-      {
-        text: 'moon',
-      },
-      {
-        text: 'luna',
-      },
-    ]);
     render(<LokiVariableQueryEditor {...props} onChange={onChange} />);
 
     expect(onChange).not.toHaveBeenCalled();
@@ -106,12 +97,12 @@ describe('LokiVariableQueryEditor', () => {
   });
 
   test('Migrates legacy string queries to LokiVariableQuery instances', async () => {
-    const query = 'label_values(log stream selector, label_selector)';
+    const query = 'label_values(log stream selector, luna)';
     // @ts-expect-error
     render(<LokiVariableQueryEditor {...props} onChange={() => {}} query={query} />);
 
     await waitFor(() => expect(screen.getByText('Label values')).toBeInTheDocument());
-    await waitFor(() => expect(screen.getByText('label_selector')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('luna')).toBeInTheDocument());
     await waitFor(() => expect(screen.getByDisplayValue('log stream selector')).toBeInTheDocument());
   });
 
@@ -122,7 +113,7 @@ describe('LokiVariableQueryEditor', () => {
         onChange={() => {}}
         query={{
           type: LokiVariableQueryType.LabelValues,
-          label: 'label_selector',
+          label: 'luna',
           stream: 'log stream selector',
           refId,
         }}
@@ -130,7 +121,25 @@ describe('LokiVariableQueryEditor', () => {
     );
 
     await waitFor(() => expect(screen.getByText('Label values')).toBeInTheDocument());
-    await waitFor(() => expect(screen.getByText('label_selector')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('luna')).toBeInTheDocument());
     await waitFor(() => expect(screen.getByDisplayValue('log stream selector')).toBeInTheDocument());
   });
+
+  test('Label options are not lost when selecting one', async () => {
+    const { rerender } = render(<LokiVariableQueryEditor {...props} onChange={() => {}} />);
+
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label values');
+    await selectOptionInTest(screen.getByLabelText('Label'), 'luna');
+
+    const updatedQuery = {
+      refId: 'test',
+      type: LokiVariableQueryType.LabelValues,
+      label: 'luna',
+    };
+    rerender(<LokiVariableQueryEditor {...props} query={updatedQuery} onChange={() => {}} />);
+
+    await selectOptionInTest(screen.getByLabelText('Label'), 'moon');
+    await selectOptionInTest(screen.getByLabelText('Label'), 'luna');
+    await screen.findByText('luna');
+  });
 });
diff --git a/public/app/plugins/datasource/loki/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/loki/components/VariableQueryEditor.tsx
index d9c47dc894c..033b28aba0d 100644
--- a/public/app/plugins/datasource/loki/components/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/VariableQueryEditor.tsx
@@ -31,10 +31,6 @@ export const LokiVariableQueryEditor = ({ onChange, query, datasource }: Props)
     setType(variableQuery.type);
     setLabel(variableQuery.label || '');
     setStream(variableQuery.stream || '');
-
-    if (variableQuery.label) {
-      setLabelOptions([{ label: variableQuery.label, value: variableQuery.label }]);
-    }
   }, [query]);
 
   useEffect(() => {

From c3fee5881fccaa52a93607766a2bb0f6ec53fb23 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus.andersson@grafana.com>
Date: Fri, 14 Apr 2023 09:11:15 +0200
Subject: [PATCH 131/729] E2E: Fixed so openPanelMenuItem flow works with
 new/old panel chrome without breaking changes (#66118)

Fixed so the openPanelMenuItem works with both angular and react panels.
---
 e2e/panels-suite/panelEdit_base.spec.ts       |  2 +-
 e2e/various-suite/inspect-drawer.spec.ts      |  4 +-
 .../src/flows/openPanelMenuItem.ts            | 61 +++++++++++++------
 .../dashboard/dashgrid/PanelChromeAngular.tsx |  6 +-
 4 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/e2e/panels-suite/panelEdit_base.spec.ts b/e2e/panels-suite/panelEdit_base.spec.ts
index 2ae5daa1cd2..d24a2fe5dac 100644
--- a/e2e/panels-suite/panelEdit_base.spec.ts
+++ b/e2e/panels-suite/panelEdit_base.spec.ts
@@ -17,7 +17,7 @@ e2e.scenario({
     e2e.flows.openDashboard({ uid: 'TkZXxlNG3' });
     e2e().wait('@query');
 
-    e2e.flows.openPanelMenuItem(e2e.flows.PanelMenuItems.Edit, PANEL_UNDER_TEST, true);
+    e2e.flows.openPanelMenuItem(e2e.flows.PanelMenuItems.Edit, PANEL_UNDER_TEST);
 
     // New panel editor opens when navigating from Panel menu
     e2e.components.PanelEditor.General.content().should('be.visible');
diff --git a/e2e/various-suite/inspect-drawer.spec.ts b/e2e/various-suite/inspect-drawer.spec.ts
index e8ce12099b6..155f1c7cd12 100644
--- a/e2e/various-suite/inspect-drawer.spec.ts
+++ b/e2e/various-suite/inspect-drawer.spec.ts
@@ -37,7 +37,7 @@ e2e.scenario({
     e2e.flows.openDashboard({ uid: 'wfTJJL5Wz' });
 
     // testing opening inspect drawer directly by clicking on Inspect in header menu
-    e2e.flows.openPanelMenuItem(e2e.flows.PanelMenuItems.Inspect, PANEL_UNDER_TEST, true);
+    e2e.flows.openPanelMenuItem(e2e.flows.PanelMenuItems.Inspect, PANEL_UNDER_TEST);
 
     expectDrawerTabsAndContent();
 
@@ -49,7 +49,7 @@ e2e.scenario({
     expectSubMenuScenario('Query');
     expectSubMenuScenario('Panel JSON', 'JSON');
 
-    e2e.flows.openPanelMenuItem(e2e.flows.PanelMenuItems.Edit, PANEL_UNDER_TEST, true);
+    e2e.flows.openPanelMenuItem(e2e.flows.PanelMenuItems.Edit, PANEL_UNDER_TEST);
 
     e2e.components.QueryTab.queryInspectorButton().should('be.visible').click();
 
diff --git a/packages/grafana-e2e/src/flows/openPanelMenuItem.ts b/packages/grafana-e2e/src/flows/openPanelMenuItem.ts
index 7a08cd9440f..1ccd5206826 100644
--- a/packages/grafana-e2e/src/flows/openPanelMenuItem.ts
+++ b/packages/grafana-e2e/src/flows/openPanelMenuItem.ts
@@ -7,26 +7,51 @@ export enum PanelMenuItems {
   Extensions = 'Extensions',
 }
 
-export const openPanelMenuItem = (menu: PanelMenuItems, panelTitle = 'Panel Title', isReactPanel = false) => {
+export const openPanelMenuItem = (menu: PanelMenuItems, panelTitle = 'Panel Title') => {
   // we changed the way we open the panel menu in react panels with the new panel header
-  if (isReactPanel) {
-    e2e.components.Panels.Panel.menu(panelTitle).click({ force: true }); // force click because menu is hidden and show on hover
-    e2e.components.Panels.Panel.menuItems(menu).should('be.visible').click();
-  } else {
-    // this is the old way of opening the panel menu from the title
-    e2e.components.Panels.Panel.title(panelTitle).should('be.visible').click();
-    e2e.components.Panels.Panel.headerItems(menu).should('be.visible').click();
-  }
+  detectPanelType(panelTitle, (isAngularPanel) => {
+    if (isAngularPanel) {
+      e2e.components.Panels.Panel.title(panelTitle).should('be.visible').click();
+      e2e.components.Panels.Panel.headerItems(menu).should('be.visible').click();
+    } else {
+      e2e.components.Panels.Panel.menu(panelTitle).click({ force: true }); // force click because menu is hidden and show on hover
+      e2e.components.Panels.Panel.menuItems(menu).should('be.visible').click();
+    }
+  });
 };
 
 export const openPanelMenuExtension = (extensionTitle: string, panelTitle = 'Panel Title') => {
-  e2e.components.Panels.Panel.title(panelTitle).should('be.visible').click();
-
-  e2e.components.Panels.Panel.headerItems(PanelMenuItems.Extensions)
-    .should('be.visible')
-    .parent()
-    .parent()
-    .invoke('addClass', 'open');
-
-  e2e.components.Panels.Panel.headerItems(extensionTitle).should('be.visible').click();
+  const menuItem = PanelMenuItems.Extensions;
+  // we changed the way we open the panel menu in react panels with the new panel header
+  detectPanelType(panelTitle, (isAngularPanel) => {
+    if (isAngularPanel) {
+      e2e.components.Panels.Panel.title(panelTitle).should('be.visible').click();
+      e2e.components.Panels.Panel.headerItems(menuItem)
+        .should('be.visible')
+        .parent()
+        .parent()
+        .invoke('addClass', 'open');
+      e2e.components.Panels.Panel.headerItems(extensionTitle).should('be.visible').click();
+    } else {
+      e2e.components.Panels.Panel.menu(panelTitle).click({ force: true }); // force click because menu is hidden and show on hover
+      e2e.components.Panels.Panel.menuItems(menuItem).trigger('mouseover', { force: true });
+      e2e.components.Panels.Panel.menuItems(extensionTitle).click({ force: true });
+    }
+  });
 };
+
+function detectPanelType(panelTitle: string, detected: (isAngularPanel: boolean) => void) {
+  e2e.components.Panels.Panel.title(panelTitle).then((el) => {
+    const isAngularPanel = el.find('plugin-component.ng-scope').length > 0;
+
+    if (isAngularPanel) {
+      Cypress.log({
+        name: 'detectPanelType',
+        displayName: 'detector',
+        message: 'Angular panel detected, will use legacy selectors.',
+      });
+    }
+
+    detected(isAngularPanel);
+  });
+}
diff --git a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
index e1c76ff94cf..fd1ceed7030 100644
--- a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
@@ -197,7 +197,11 @@ export class PanelChromeAngularUnconnected extends PureComponent<Props, State> {
     });
 
     return (
-      <div className={containerClassNames} aria-label={selectors.components.Panels.Panel.containerByTitle(panel.title)}>
+      <div
+        className={containerClassNames}
+        data-testid={selectors.components.Panels.Panel.title(panel.title)}
+        aria-label={selectors.components.Panels.Panel.containerByTitle(panel.title)}
+      >
         <PanelHeader
           panel={panel}
           dashboard={dashboard}

From 202afb904144c9eab9600f02eed512b4acf0266f Mon Sep 17 00:00:00 2001
From: Emil Tullstedt <emil.tullstedt@grafana.com>
Date: Fri, 14 Apr 2023 10:01:14 +0200
Subject: [PATCH 132/729] Chore: Upgrade Go to 1.20.3 (#66264)

---
 .bingo/Variables.mk               |   3 +-
 .drone.yml                        | 546 +++++++++++++++---------------
 Dockerfile                        |   2 +-
 Makefile                          |   2 +-
 scripts/build/ci-build/Dockerfile |   2 +-
 scripts/drone/steps/lib.star      |   4 +-
 6 files changed, 280 insertions(+), 279 deletions(-)

diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index 2e45d61a756..8a63fd034b0 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -33,7 +33,8 @@ DRONE := $(GOBIN)/drone-v1.5.0
 $(DRONE): $(BINGO_DIR)/drone.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/drone-v1.5.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
+	@# Manual modification: CGo is disabled to make the Drone CLI build successfully on Darwin/arm64 machines.
+	@cd $(BINGO_DIR) && CGO_ENABLED=0 GOWORK=off $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
 
 GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.51.2
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
diff --git a/.drone.yml b/.drone.yml
index 97ae6955df3..276d5ee3117 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,7 +24,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build verify-drone
@@ -74,13 +74,13 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build verify-starlark .
   depends_on:
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: lint-starlark
 trigger:
   event:
@@ -127,13 +127,13 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - yarn-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: betterer-frontend
 - commands:
   - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST"
@@ -153,7 +153,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - yarn run ci:test-frontend
@@ -162,7 +162,7 @@ steps:
   - clone-enterprise
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-frontend
 trigger:
   event:
@@ -216,7 +216,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -225,7 +225,7 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - yarn run prettier:check
@@ -237,7 +237,7 @@ steps:
   - clone-enterprise
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: lint-frontend
 trigger:
   event:
@@ -291,7 +291,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -302,7 +302,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -312,7 +312,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -321,25 +321,25 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend-integration
 trigger:
   event:
@@ -388,7 +388,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST"
@@ -408,13 +408,13 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - make gen-go
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - apt-get update && apt-get install make
@@ -423,7 +423,7 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: lint-backend
 trigger:
   event:
@@ -478,7 +478,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -487,7 +487,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -495,18 +495,18 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@@ -529,7 +529,7 @@ steps:
       from_secret: github_token_pr
     TEST_TAG: v0.0.0-test
   failure: ignore
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: trigger-test-release
   when:
     paths:
@@ -556,7 +556,7 @@ steps:
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -565,7 +565,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -574,7 +574,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition oss
@@ -582,7 +582,7 @@ steps:
   - compile-build-cmd
   - yarn-install
   environment: null
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss
@@ -593,7 +593,7 @@ steps:
   - build-frontend
   - build-frontend-packages
   environment: null
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package
 - commands:
   - ./scripts/grafana-server/start-server
@@ -606,7 +606,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -709,7 +709,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-storybook
   when:
     paths:
@@ -720,7 +720,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - yarn wait-on http://$HOST:$PORT
@@ -822,7 +822,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mkdir -p bin
@@ -835,7 +835,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -849,7 +849,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -858,13 +858,13 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - apt-get update
@@ -880,7 +880,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -896,7 +896,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -906,7 +906,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -916,7 +916,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: memcached-integration-tests
 trigger:
   event:
@@ -968,7 +968,7 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - |-
@@ -980,7 +980,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: codespell
 - commands:
   - yarn run prettier:checkDocs
@@ -988,7 +988,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: lint-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana/latest
@@ -1032,13 +1032,13 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build shellcheck
   depends_on:
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: shellcheck
 trigger:
   event:
@@ -1079,7 +1079,7 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - |-
@@ -1091,7 +1091,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: codespell
 - commands:
   - yarn run prettier:checkDocs
@@ -1099,7 +1099,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: lint-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana/latest
@@ -1152,13 +1152,13 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - yarn-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -1166,7 +1166,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-frontend
 trigger:
   branch: main
@@ -1206,7 +1206,7 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - yarn run prettier:check
@@ -1217,7 +1217,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: lint-frontend
 trigger:
   branch: main
@@ -1259,7 +1259,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1268,7 +1268,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1276,25 +1276,25 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend-integration
 trigger:
   branch: main
@@ -1336,12 +1336,12 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - apt-get update && apt-get install make
@@ -1350,7 +1350,7 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: lint-backend
 - commands:
   - ./bin/build verify-drone
@@ -1404,7 +1404,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1413,7 +1413,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1421,25 +1421,25 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -1448,7 +1448,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -1457,7 +1457,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition oss
@@ -1467,7 +1467,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign
@@ -1485,7 +1485,7 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package
 - commands:
   - ./scripts/grafana-server/start-server
@@ -1498,7 +1498,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -1601,7 +1601,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-storybook
   when:
     paths:
@@ -1612,7 +1612,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - yarn wait-on http://$HOST:$PORT
@@ -1656,7 +1656,7 @@ steps:
     GRAFANA_MISC_STATS_API_KEY:
       from_secret: grafana_misc_stats_api_key
   failure: ignore
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: publish-frontend-metrics
   when:
     repo:
@@ -1737,7 +1737,7 @@ steps:
   environment:
     NPM_TOKEN:
       from_secret: npm_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: release-canary-npm-packages
   when:
     repo:
@@ -1841,7 +1841,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -1854,7 +1854,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1862,13 +1862,13 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - apt-get update
@@ -1884,7 +1884,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -1900,7 +1900,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -1910,7 +1910,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -1920,7 +1920,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: memcached-integration-tests
 trigger:
   branch: main
@@ -2158,32 +2158,32 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build build-backend --jobs 8 --edition oss ${DRONE_TAG}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG}
@@ -2192,7 +2192,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG}
@@ -2201,7 +2201,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition oss
@@ -2211,7 +2211,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition oss  --sign ${DRONE_TAG}
@@ -2229,14 +2229,14 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition oss --shouldSave
@@ -2275,7 +2275,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -2352,7 +2352,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-storybook
   when:
     event:
@@ -2411,7 +2411,7 @@ steps:
       from_secret: gcp_key
     PRERELEASE_BUCKET:
       from_secret: prerelease_bucket
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: store-npm-packages
 trigger:
   event:
@@ -2457,13 +2457,13 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - yarn-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -2471,7 +2471,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-frontend
 trigger:
   event:
@@ -2513,7 +2513,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2522,7 +2522,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2530,25 +2530,25 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend-integration
 trigger:
   event:
@@ -2664,7 +2664,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -2681,7 +2681,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -2689,19 +2689,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2711,7 +2711,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2720,14 +2720,14 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -2736,7 +2736,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -2745,7 +2745,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -2755,7 +2755,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise  --sign ${DRONE_TAG}
@@ -2773,14 +2773,14 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise --shouldSave
@@ -2820,7 +2820,7 @@ steps:
     ARCH: linux-amd64
     PORT: 3001
     RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -2955,7 +2955,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -2972,7 +2972,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -2982,14 +2982,14 @@ steps:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - init-enterprise
   - yarn-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -2998,7 +2998,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-frontend
 trigger:
   event:
@@ -3038,7 +3038,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mkdir -p bin
@@ -3061,7 +3061,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -3073,7 +3073,7 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3083,7 +3083,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3092,25 +3092,25 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend-integration
 trigger:
   event:
@@ -3246,7 +3246,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -3263,7 +3263,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -3271,19 +3271,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3293,7 +3293,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -3302,7 +3302,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -3311,7 +3311,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -3321,14 +3321,14 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend-enterprise2
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise2  --sign ${DRONE_TAG}
@@ -3346,7 +3346,7 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package-enterprise2
 - commands:
   - ./bin/build upload-cdn --edition enterprise2
@@ -3366,7 +3366,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package-enterprise2
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise2 --shouldSave
@@ -3500,7 +3500,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -3517,7 +3517,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -3525,19 +3525,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3547,7 +3547,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -3556,7 +3556,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -3565,7 +3565,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -3575,14 +3575,14 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend-enterprise2
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise2  --sign ${DRONE_TAG}
@@ -3600,7 +3600,7 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package-enterprise2
 - commands:
   - ./bin/build upload-cdn --edition enterprise2
@@ -3620,7 +3620,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package-enterprise2
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise2 --shouldSave
@@ -3746,7 +3746,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition oss
@@ -3842,7 +3842,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition enterprise
@@ -3921,7 +3921,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition enterprise
@@ -3990,7 +3990,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition enterprise2
@@ -4053,7 +4053,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition enterprise2
@@ -4117,7 +4117,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build publish aws --image grafana/grafana-enterprise --repo grafana-labs/grafanaenterprise
@@ -4168,7 +4168,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts packages --security --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -4230,7 +4230,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -4303,12 +4303,12 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG}
@@ -4332,7 +4332,7 @@ steps:
     NPM_TOKEN:
       from_secret: npm_token
   failure: ignore
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: release-npm-packages
 trigger:
   event:
@@ -4369,7 +4369,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - depends_on:
   - compile-build-cmd
@@ -4460,7 +4460,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - depends_on:
   - compile-build-cmd
@@ -4556,7 +4556,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -4573,7 +4573,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -4581,7 +4581,7 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts-page
@@ -4590,7 +4590,7 @@ steps:
   environment:
     GCP_KEY:
       from_secret: gcp_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: artifacts-page
 trigger:
   event:
@@ -4635,32 +4635,32 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -4669,7 +4669,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -4678,7 +4678,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition oss
@@ -4688,7 +4688,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign
@@ -4706,14 +4706,14 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition oss --shouldSave
@@ -4752,7 +4752,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -4829,7 +4829,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-storybook
   when:
     paths:
@@ -4910,13 +4910,13 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - yarn-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -4924,7 +4924,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-frontend
 trigger:
   ref:
@@ -4960,7 +4960,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -4969,7 +4969,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -4977,25 +4977,25 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend-integration
 trigger:
   ref:
@@ -5065,7 +5065,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5073,13 +5073,13 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - apt-get update
@@ -5095,7 +5095,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -5111,7 +5111,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -5121,7 +5121,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -5131,7 +5131,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: memcached-integration-tests
 trigger:
   ref:
@@ -5237,7 +5237,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -5253,7 +5253,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -5261,19 +5261,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -5283,7 +5283,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5292,14 +5292,14 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -5308,7 +5308,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -5317,7 +5317,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -5327,7 +5327,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -5346,14 +5346,14 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise --shouldSave
@@ -5393,7 +5393,7 @@ steps:
     ARCH: linux-amd64
     PORT: 3001
     RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -5534,7 +5534,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -5550,7 +5550,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -5560,14 +5560,14 @@ steps:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - init-enterprise
   - yarn-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -5576,7 +5576,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-frontend
 trigger:
   ref:
@@ -5610,7 +5610,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mkdir -p bin
@@ -5632,7 +5632,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -5644,7 +5644,7 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -5654,7 +5654,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5663,25 +5663,25 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: test-backend-integration
 trigger:
   ref:
@@ -5751,7 +5751,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -5767,7 +5767,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -5777,7 +5777,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5786,13 +5786,13 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - apt-get update
@@ -5808,7 +5808,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -5824,7 +5824,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -5834,7 +5834,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -5844,7 +5844,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: memcached-integration-tests
 trigger:
   ref:
@@ -5970,7 +5970,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -5986,7 +5986,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -5994,19 +5994,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -6016,7 +6016,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -6025,7 +6025,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -6034,7 +6034,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -6044,7 +6044,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-plugins
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER}
@@ -6052,7 +6052,7 @@ steps:
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: build-backend-enterprise2
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER}
@@ -6071,7 +6071,7 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: package-enterprise2
 - commands:
   - ./bin/build upload-cdn --edition enterprise2
@@ -6091,7 +6091,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package-enterprise2
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise2 --shouldSave
@@ -6245,7 +6245,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -6253,13 +6253,13 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - apt-get update
@@ -6275,7 +6275,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -6291,7 +6291,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -6301,7 +6301,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -6311,7 +6311,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: memcached-integration-tests
 trigger:
   event:
@@ -6388,7 +6388,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -6405,7 +6405,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: init-enterprise
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -6415,7 +6415,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -6424,13 +6424,13 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: wire-install
 - commands:
   - apt-get update
@@ -6446,7 +6446,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -6462,7 +6462,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -6472,7 +6472,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -6482,7 +6482,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.2
+  image: grafana/build-container:1.7.3
   name: memcached-integration-tests
 trigger:
   event:
@@ -6635,7 +6635,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.1
+  image: golang:1.20.3
   name: compile-build-cmd
 - commands:
   - ./bin/build publish grafana-com --edition oss
@@ -6786,6 +6786,6 @@ kind: secret
 name: enterprise2_security_prefix
 ---
 kind: signature
-hmac: 421b968fc475a71ac3367a4f9d2da3b6ff68208c04d28d5fd1074cf03688a52a
+hmac: da82099e984231d3b292921e031655723eae03f45efac84af1a5a2104601fbfe
 
 ...
diff --git a/Dockerfile b/Dockerfile
index 9b6fbb2a441..621cbe5443f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 ARG BASE_IMAGE=alpine:3.17
 ARG JS_IMAGE=node:18-alpine3.17
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.20.1-alpine3.17
+ARG GO_IMAGE=golang:1.20.3-alpine3.17
 
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
diff --git a/Makefile b/Makefile
index ad161a619d8..bf9da4ea438 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
 	--build-arg BASE_IMAGE=ubuntu:20.04 \
-	--build-arg GO_IMAGE=golang:1.20.1 \
+	--build-arg GO_IMAGE=golang:1.20.3 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)
 
diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile
index d504535b647..9d3a65b388a 100644
--- a/scripts/build/ci-build/Dockerfile
+++ b/scripts/build/ci-build/Dockerfile
@@ -108,7 +108,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
 # Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's.
 FROM debian:buster-20220822
 
-ENV GOVERSION=1.20.1 \
+ENV GOVERSION=1.20.3 \
     PATH=/usr/local/go/bin:$PATH \
     GOPATH=/go \
     NODEVERSION=18.12.0-1nodesource1 \
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 749250171a6..d590436ed9c 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -9,14 +9,14 @@ load(
 )
 
 grabpl_version = "v3.0.30"
-build_image = "grafana/build-container:1.7.2"
+build_image = "grafana/build-container:1.7.3"
 publish_image = "grafana/grafana-ci-deploy:1.3.3"
 deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image"
 alpine_image = "alpine:3.17.1"
 curl_image = "byrnedo/alpine-curl:0.1.8"
 windows_image = "mcr.microsoft.com/windows:1809"
 wix_image = "grafana/ci-wix:0.1.1"
-go_image = "golang:1.20.1"
+go_image = "golang:1.20.3"
 
 trigger_oss = {
     "repo": [

From 4abe0249ba1271e2051bd9f88b25a7f455498519 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 14 Apr 2023 09:43:11 +0100
Subject: [PATCH 133/729] Chore: Clean up old navigation (#66287)

* remove code outside of the topnav feature flag

* delete NavBar folder

* remove topnav toggle from backend

* restructure AppChrome folder

* fix utils mock

* fix applinks tests

* remove tests since they're covered in e2e

* fix 1 of the approotpage tests

* Fix another dashboardpage test

* remove reverse portalling + test for plugins using deprecated onNavChanged method

* kick drone

* handle correlations
---
 .betterer.results                             |   5 -
 conf/defaults.ini                             |   1 -
 conf/sample.ini                               |   1 -
 e2e/cloud-plugins-suite/azure-monitor.spec.ts |  11 +-
 .../new-constant-variable.spec.ts             |  11 +-
 .../new-custom-variable.spec.ts               |  21 +-
 .../new-datasource-variable.spec.ts           |  11 +-
 .../new-interval-variable.spec.ts             |  11 +-
 .../new-query-variable.spec.ts                |  21 +-
 .../new-text-box-variable.spec.ts             |  11 +-
 .../set-options-from-ui.spec.ts               |  31 +-
 ...ting-dashboard-links-and-variables.spec.ts |  11 +-
 package.json                                  |   1 -
 .../ToolbarButton/ToolbarButton.tsx           |   2 +-
 pkg/api/api.go                                |   7 +-
 pkg/api/index.go                              |   4 +-
 pkg/services/licensing/oss.go                 |  10 +-
 pkg/services/navtree/models.go                |  31 +-
 pkg/services/navtree/models_test.go           |  21 +-
 pkg/services/navtree/navtreeimpl/admin.go     |  28 +-
 pkg/services/navtree/navtreeimpl/applinks.go  |  16 +-
 .../navtree/navtreeimpl/applinks_test.go      |  75 ++-
 pkg/services/navtree/navtreeimpl/navtree.go   |  53 +-
 .../core/components/AppChrome/AppChrome.tsx   |  25 +-
 .../MegaMenu/MegaMenu.test.tsx                |   2 +-
 .../{ => AppChrome}/MegaMenu/MegaMenu.tsx     |   3 +-
 .../MegaMenu}/NavBarItemIcon.tsx              |   2 +-
 .../{ => AppChrome}/MegaMenu/NavBarMenu.tsx   |   2 +-
 .../MegaMenu/NavBarMenuItem.tsx               |   0
 .../MegaMenu/NavBarMenuItemWrapper.tsx        |   3 +-
 .../MegaMenu/NavBarMenuSection.tsx            |   7 +-
 .../MegaMenu}/NavFeatureHighlight.tsx         |   0
 .../MegaMenu}/navBarItem-translations.ts      |  31 +-
 .../MegaMenu}/utils.test.ts                   |  66 +--
 .../{NavBar => AppChrome/MegaMenu}/utils.ts   |  64 +--
 .../AppChrome/{ => NavToolbar}/NavToolbar.tsx |   6 +-
 .../{ => NavToolbar}/NavToolbarSeparator.tsx  |   7 +-
 .../OrganizationPicker.tsx                    |   0
 .../OrganizationSelect.tsx                    |   0
 .../OrganizationSwitcher.test.tsx             |   0
 .../OrganizationSwitcher.tsx                  |   0
 .../types.ts                                  |   0
 .../AppChrome/QuickAdd/QuickAdd.tsx           |   2 +-
 .../AppChrome/TopBar/TopNavBarMenu.tsx        |   2 +-
 .../AppChrome/{ => TopBar}/TopSearchBar.tsx   |  16 +-
 .../TopSearchBarCommandPaletteTrigger.tsx     |   0
 .../core/components/NavBar/NavBar.test.tsx    |  51 --
 public/app/core/components/NavBar/NavBar.tsx  | 296 -----------
 .../components/NavBar/NavBarItem.test.tsx     | 247 ---------
 .../app/core/components/NavBar/NavBarItem.tsx | 115 -----
 .../core/components/NavBar/NavBarItemMenu.tsx | 120 -----
 .../components/NavBar/NavBarItemMenuItem.tsx  |  92 ----
 .../NavBar/NavBarItemMenuTrigger.tsx          | 254 ----------
 .../NavBar/NavBarItemWithoutMenu.tsx          | 117 -----
 .../components/NavBar/NavBarMenu.test.tsx     |  54 --
 .../app/core/components/NavBar/NavBarMenu.tsx | 467 ------------------
 .../components/NavBar/NavBarMenuItem.test.tsx |  56 ---
 .../core/components/NavBar/NavBarMenuItem.tsx | 153 ------
 .../NavBar/NavBarMenuPortalContainer.tsx      |  27 -
 .../core/components/NavBar/NavBarToggle.tsx   |  43 --
 public/app/core/components/NavBar/context.tsx |  32 --
 .../NavLandingPage.test.tsx                   |   0
 .../NavLandingPage.tsx                        |   0
 .../NavLandingPageCard.test.tsx               |   0
 .../NavLandingPageCard.tsx                    |   0
 .../app/core/components/Page/OldNavOnly.tsx   |  10 -
 public/app/core/components/Page/Page.tsx      |   2 -
 public/app/core/components/Page/types.ts      |   2 -
 public/app/core/components/PageNew/Page.tsx   |   4 -
 public/app/core/components/help/HelpModal.tsx |  10 +-
 public/app/core/reducers/navBarTree.ts        |   2 +-
 public/app/core/reducers/navModel.ts          |   2 +-
 public/app/core/services/keybindingSrv.ts     |  22 +-
 public/app/features/alerting/routes.tsx       |  25 +-
 public/app/features/alerting/unified/Home.tsx |   3 +-
 .../app/features/connections/Connections.tsx  |   2 +-
 .../connections/pages/DataSourcesListPage.tsx |   3 +-
 .../correlations/CorrelationsPage.test.tsx    |   7 -
 .../correlations/CorrelationsPage.tsx         |  10 -
 .../components/DashNav/DashNav.test.tsx       |  54 --
 .../dashboard/components/DashNav/DashNav.tsx  |  69 +--
 .../DashboardSettings/DashboardSettings.tsx   |  35 +-
 .../components/PanelEditor/PanelEditor.tsx    |  19 +-
 .../containers/DashboardPage.test.tsx         |  29 +-
 .../dashboard/containers/DashboardPage.tsx    |   2 +-
 .../components/DataSourcesListHeader.tsx      |  33 +-
 .../datasources/pages/DataSourcesListPage.tsx |   2 +-
 public/app/features/explore/Explore.test.tsx  |  12 +-
 .../app/features/explore/ExploreToolbar.tsx   |  23 +-
 .../app/features/explore/LogsNavigation.tsx   |   4 +-
 .../components/NewDashboardsFolder.tsx        |   1 -
 public/app/features/org/UserInvitePage.tsx    |   5 +-
 .../plugins/components/AppRootPage.test.tsx   |  61 +--
 .../plugins/components/AppRootPage.tsx        |  16 +-
 public/app/features/plugins/utils.test.ts     |  14 +-
 public/app/features/plugins/utils.ts          |   6 -
 .../profile/ChangePasswordPage.test.tsx       |   2 +-
 .../features/profile/ChangePasswordPage.tsx   |   3 -
 .../scenes/dashboard/DashboardScene.tsx       |  10 +-
 .../search/components/DashboardSearch.tsx     | 115 -----
 .../search/components/SearchWrapper.tsx       |  12 +-
 .../ServiceAccountCreatePage.tsx              |   3 -
 .../ServiceAccountsListPage.tsx               |  17 +-
 .../features/storage/StorageFolderPage.tsx    |   8 +-
 .../support-bundles/SupportBundles.tsx        |   5 +-
 .../support-bundles/SupportBundlesCreate.tsx  |   3 -
 public/app/routes/routes.tsx                  |  72 ++-
 yarn.lock                                     |  11 -
 108 files changed, 240 insertions(+), 3266 deletions(-)
 rename public/app/core/components/{ => AppChrome}/MegaMenu/MegaMenu.test.tsx (95%)
 rename public/app/core/components/{ => AppChrome}/MegaMenu/MegaMenu.tsx (97%)
 rename public/app/core/components/{NavBar => AppChrome/MegaMenu}/NavBarItemIcon.tsx (95%)
 rename public/app/core/components/{ => AppChrome}/MegaMenu/NavBarMenu.tsx (99%)
 rename public/app/core/components/{ => AppChrome}/MegaMenu/NavBarMenuItem.tsx (100%)
 rename public/app/core/components/{ => AppChrome}/MegaMenu/NavBarMenuItemWrapper.tsx (98%)
 rename public/app/core/components/{ => AppChrome}/MegaMenu/NavBarMenuSection.tsx (94%)
 rename public/app/core/components/{NavBar => AppChrome/MegaMenu}/NavFeatureHighlight.tsx (100%)
 rename public/app/core/components/{NavBar => AppChrome/MegaMenu}/navBarItem-translations.ts (88%)
 rename public/app/core/components/{NavBar => AppChrome/MegaMenu}/utils.test.ts (68%)
 rename public/app/core/components/{NavBar => AppChrome/MegaMenu}/utils.ts (68%)
 rename public/app/core/components/AppChrome/{ => NavToolbar}/NavToolbar.tsx (94%)
 rename public/app/core/components/AppChrome/{ => NavToolbar}/NavToolbarSeparator.tsx (82%)
 rename public/app/core/components/AppChrome/{Organization => OrganizationSwitcher}/OrganizationPicker.tsx (100%)
 rename public/app/core/components/AppChrome/{Organization => OrganizationSwitcher}/OrganizationSelect.tsx (100%)
 rename public/app/core/components/AppChrome/{Organization => OrganizationSwitcher}/OrganizationSwitcher.test.tsx (100%)
 rename public/app/core/components/AppChrome/{Organization => OrganizationSwitcher}/OrganizationSwitcher.tsx (100%)
 rename public/app/core/components/AppChrome/{Organization => OrganizationSwitcher}/types.ts (100%)
 rename public/app/core/components/AppChrome/{ => TopBar}/TopSearchBar.tsx (87%)
 rename public/app/core/components/AppChrome/{ => TopBar}/TopSearchBarCommandPaletteTrigger.tsx (100%)
 delete mode 100644 public/app/core/components/NavBar/NavBar.test.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBar.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarItem.test.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarItem.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarItemMenu.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarItemMenuItem.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarItemWithoutMenu.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarMenu.test.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarMenu.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarMenuItem.test.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarMenuItem.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarMenuPortalContainer.tsx
 delete mode 100644 public/app/core/components/NavBar/NavBarToggle.tsx
 delete mode 100644 public/app/core/components/NavBar/context.tsx
 rename public/app/core/components/{AppChrome => NavLandingPage}/NavLandingPage.test.tsx (100%)
 rename public/app/core/components/{AppChrome => NavLandingPage}/NavLandingPage.tsx (100%)
 rename public/app/core/components/{AppChrome => NavLandingPage}/NavLandingPageCard.test.tsx (100%)
 rename public/app/core/components/{AppChrome => NavLandingPage}/NavLandingPageCard.tsx (100%)
 delete mode 100644 public/app/core/components/Page/OldNavOnly.tsx
 delete mode 100644 public/app/features/dashboard/components/DashNav/DashNav.test.tsx
 delete mode 100644 public/app/features/search/components/DashboardSearch.tsx

diff --git a/.betterer.results b/.betterer.results
index c904362ac2d..77c376299b1 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -1537,11 +1537,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
     ],
-    "public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
-    ],
     "public/app/core/components/OptionsUI/registry.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/conf/defaults.ini b/conf/defaults.ini
index 322bf3a89bf..ecd4f941f7a 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1462,7 +1462,6 @@ index_update_interval = 10s
 
 
 # Move an app plugin referenced by its id (including all its pages) to a specific navigation section
-# Dependencies: needs the `topnav` feature to be enabled
 # Format: <Plugin ID> = <Section ID> <Sort Weight>
 [navigation.app_sections]
 
diff --git a/conf/sample.ini b/conf/sample.ini
index 2a7a562c5c9..29331b68d77 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -1392,7 +1392,6 @@
 ;enable_custom_baselayers = true
 
 # Move an app plugin referenced by its id (including all its pages) to a specific navigation section
-# Dependencies: needs the `topnav` feature to be enabled
 [navigation.app_sections]
 # The following will move an app plugin with the id of `my-app-id` under the `starred` section
 # my-app-id = admin
diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
index 37ced38c1d3..71a9e5c4819 100644
--- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts
+++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
@@ -2,7 +2,6 @@ import { load } from 'js-yaml';
 import { v4 as uuidv4 } from 'uuid';
 
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 import { selectors } from '../../public/app/plugins/datasource/azuremonitor/e2e/selectors';
 import {
@@ -97,15 +96,7 @@ const addAzureMonitorVariable = (
       break;
   }
   e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
-  e2e()
-    .window()
-    .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-      if (win.grafanaBootData.settings.featureToggles.topnav) {
-        e2e.pages.Dashboard.Settings.Actions.close().click();
-      } else {
-        e2e.components.PageToolbar.item('Go Back').click();
-      }
-    });
+  e2e.pages.Dashboard.Settings.Actions.close().click();
 };
 
 e2e.scenario({
diff --git a/e2e/dashboards-suite/new-constant-variable.spec.ts b/e2e/dashboards-suite/new-constant-variable.spec.ts
index c595e49c692..69ac02bff28 100644
--- a/e2e/dashboards-suite/new-constant-variable.spec.ts
+++ b/e2e/dashboards-suite/new-constant-variable.spec.ts
@@ -1,5 +1,4 @@
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
 const DASHBOARD_NAME = 'Test variable output';
@@ -24,15 +23,7 @@ describe('Variables - Constant', () => {
 
     // Navigate back to the homepage and change the selected variable value
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.pages.Dashboard.Settings.Actions.close().click();
-        } else {
-          e2e.components.BackButton.backArrow().click({ force: true });
-        }
-      });
+    e2e.pages.Dashboard.Settings.Actions.close().click();
     e2e.components.RefreshPicker.runButtonV2().click();
 
     // Assert it was rendered
diff --git a/e2e/dashboards-suite/new-custom-variable.spec.ts b/e2e/dashboards-suite/new-custom-variable.spec.ts
index 79b8a139a28..91873ce27f8 100644
--- a/e2e/dashboards-suite/new-custom-variable.spec.ts
+++ b/e2e/dashboards-suite/new-custom-variable.spec.ts
@@ -1,5 +1,4 @@
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
 const DASHBOARD_NAME = 'Test variable output';
@@ -33,15 +32,7 @@ describe('Variables - Custom', () => {
 
     // Navigate back to the homepage and change the selected variable value
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.pages.Dashboard.Settings.Actions.close().click();
-        } else {
-          e2e.components.BackButton.backArrow().click({ force: true });
-        }
-      });
+    e2e.pages.Dashboard.Settings.Actions.close().click();
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('one').click();
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('two').click();
 
@@ -66,15 +57,7 @@ describe('Variables - Custom', () => {
 
     // Navigate back to the homepage and change the selected variable value
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.pages.Dashboard.Settings.Actions.close().click();
-        } else {
-          e2e.components.BackButton.backArrow().click({ force: true });
-        }
-      });
+    e2e.pages.Dashboard.Settings.Actions.close().click();
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('One').click();
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('Two').click();
 
diff --git a/e2e/dashboards-suite/new-datasource-variable.spec.ts b/e2e/dashboards-suite/new-datasource-variable.spec.ts
index 27aaa3c15fd..1008347464e 100644
--- a/e2e/dashboards-suite/new-datasource-variable.spec.ts
+++ b/e2e/dashboards-suite/new-datasource-variable.spec.ts
@@ -1,5 +1,4 @@
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
 const DASHBOARD_NAME = 'Test variable output';
@@ -32,15 +31,7 @@ describe('Variables - Datasource', () => {
 
     // Navigate back to the homepage and change the selected variable value
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.pages.Dashboard.Settings.Actions.close().click();
-        } else {
-          e2e.components.BackButton.backArrow().click({ force: true });
-        }
-      });
+    e2e.pages.Dashboard.Settings.Actions.close().click();
     e2e.components.RefreshPicker.runButtonV2().click();
 
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('gdev-prometheus').click();
diff --git a/e2e/dashboards-suite/new-interval-variable.spec.ts b/e2e/dashboards-suite/new-interval-variable.spec.ts
index 6e4eeda55af..d091d62a010 100644
--- a/e2e/dashboards-suite/new-interval-variable.spec.ts
+++ b/e2e/dashboards-suite/new-interval-variable.spec.ts
@@ -1,5 +1,4 @@
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
 const DASHBOARD_NAME = 'Test variable output';
@@ -34,15 +33,7 @@ describe('Variables - Interval', () => {
 
     // Navigate back to the homepage and change the selected variable value
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.pages.Dashboard.Settings.Actions.close().click();
-        } else {
-          e2e.components.BackButton.backArrow().click({ force: true });
-        }
-      });
+    e2e.pages.Dashboard.Settings.Actions.close().click();
     e2e.components.RefreshPicker.runButtonV2().click();
 
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('10s').click();
diff --git a/e2e/dashboards-suite/new-query-variable.spec.ts b/e2e/dashboards-suite/new-query-variable.spec.ts
index 307f3da7b6c..2bae25ad442 100644
--- a/e2e/dashboards-suite/new-query-variable.spec.ts
+++ b/e2e/dashboards-suite/new-query-variable.spec.ts
@@ -1,5 +1,4 @@
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
 const DASHBOARD_NAME = 'Templating - Nested Template Variables';
@@ -106,15 +105,7 @@ describe('Variables - Query - Add variable', () => {
 
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().scrollIntoView().should('be.visible').click();
 
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.pages.Dashboard.Settings.Actions.close().click();
-        } else {
-          e2e.components.BackButton.backArrow().click({ force: true });
-        }
-      });
+    e2e.pages.Dashboard.Settings.Actions.close().click();
 
     e2e.pages.Dashboard.SubMenu.submenuItemLabels('a label').should('be.visible');
     e2e.pages.Dashboard.SubMenu.submenuItem()
@@ -179,15 +170,7 @@ describe('Variables - Query - Add variable', () => {
 
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().scrollIntoView().should('be.visible').click();
 
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.pages.Dashboard.Settings.Actions.close().click();
-        } else {
-          e2e.components.BackButton.backArrow().click({ force: true });
-        }
-      });
+    e2e.pages.Dashboard.Settings.Actions.close().click();
 
     e2e.pages.Dashboard.SubMenu.submenuItemLabels('a label').should('be.visible');
     e2e.pages.Dashboard.SubMenu.submenuItem()
diff --git a/e2e/dashboards-suite/new-text-box-variable.spec.ts b/e2e/dashboards-suite/new-text-box-variable.spec.ts
index 9bd24f16157..20df50bec16 100644
--- a/e2e/dashboards-suite/new-text-box-variable.spec.ts
+++ b/e2e/dashboards-suite/new-text-box-variable.spec.ts
@@ -1,5 +1,4 @@
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
 const DASHBOARD_NAME = 'Test variable output';
@@ -24,15 +23,7 @@ describe('Variables - Text box', () => {
 
     // Navigate back to the homepage and change the selected variable value
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.pages.Dashboard.Settings.Actions.close().click();
-        } else {
-          e2e.components.BackButton.backArrow().click({ force: true });
-        }
-      });
+    e2e.pages.Dashboard.Settings.Actions.close().click();
     e2e().get('#var-VariableUnderTest').clear().type('dog-cat').blur();
 
     // Assert it was rendered
diff --git a/e2e/dashboards-suite/set-options-from-ui.spec.ts b/e2e/dashboards-suite/set-options-from-ui.spec.ts
index c6d61d78c1d..f9333cd2837 100644
--- a/e2e/dashboards-suite/set-options-from-ui.spec.ts
+++ b/e2e/dashboards-suite/set-options-from-ui.spec.ts
@@ -1,5 +1,4 @@
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
 
@@ -12,15 +11,7 @@ describe('Variables - Set options from ui', () => {
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('A').should('be.visible').click();
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('B').should('be.visible').click();
 
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.components.NavToolbar.container().click();
-        } else {
-          e2e.components.PageToolbar.container().click();
-        }
-      });
+    e2e.components.NavToolbar.container().click();
 
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('B').scrollIntoView().should('be.visible');
 
@@ -72,15 +63,7 @@ describe('Variables - Set options from ui', () => {
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A').should('be.visible').click();
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('B').should('be.visible').click();
 
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.components.NavToolbar.container().click();
-        } else {
-          e2e.components.PageToolbar.container().click();
-        }
-      });
+    e2e.components.NavToolbar.container().click();
 
     e2e().wait('@query');
 
@@ -130,15 +113,7 @@ describe('Variables - Set options from ui', () => {
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A + B').should('be.visible').click();
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('A').should('be.visible').click();
 
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.components.NavToolbar.container().click();
-        } else {
-          e2e.components.PageToolbar.container().click();
-        }
-      });
+    e2e.components.NavToolbar.container().click();
 
     e2e().wait('@query');
 
diff --git a/e2e/dashboards-suite/templating-dashboard-links-and-variables.spec.ts b/e2e/dashboards-suite/templating-dashboard-links-and-variables.spec.ts
index 272da3a5916..19757379ef2 100644
--- a/e2e/dashboards-suite/templating-dashboard-links-and-variables.spec.ts
+++ b/e2e/dashboards-suite/templating-dashboard-links-and-variables.spec.ts
@@ -1,5 +1,4 @@
 import { e2e } from '@grafana/e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 e2e.scenario({
   describeName: 'Templating',
@@ -47,15 +46,7 @@ e2e.scenario({
 
     e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('p2').should('be.visible').click();
 
-    e2e()
-      .window()
-      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
-        if (win.grafanaBootData.settings.featureToggles.topnav) {
-          e2e.components.NavToolbar.container().click();
-        } else {
-          e2e.components.PageToolbar.container().click();
-        }
-      });
+    e2e.components.NavToolbar.container().click();
     e2e.components.DashboardLinks.dropDown()
       .scrollIntoView()
       .should('be.visible')
diff --git a/package.json b/package.json
index 6d395b02e71..ac9b69310d3 100644
--- a/package.json
+++ b/package.json
@@ -384,7 +384,6 @@
     "react-popper-tooltip": "4.4.2",
     "react-redux": "7.2.6",
     "react-resizable": "3.0.4",
-    "react-reverse-portal": "2.1.1",
     "react-router-dom": "5.3.3",
     "react-select": "5.7.0",
     "react-split-pane": "0.1.92",
diff --git a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
index 19519613225..4a5f7e6394f 100644
--- a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
+++ b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
@@ -194,7 +194,7 @@ const getStyles = (theme: GrafanaTheme2) => {
         }
       }
     `,
-    default: theme.flags.topnav ? defaultTopNav : defaultOld,
+    default: defaultTopNav,
     canvas: defaultOld,
     active: css`
       color: ${theme.v1.palette.orangeDark};
diff --git a/pkg/api/api.go b/pkg/api/api.go
index fa3d844f63d..e93bc997e7f 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -104,12 +104,7 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/configuration", reqGrafanaAdmin, hs.Index)
 	r.Get("/admin", reqOrgAdmin, hs.Index)
 	r.Get("/admin/settings", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)), hs.Index)
-	// Show the combined users page for org admins if topnav is enabled
-	if hs.Features.IsEnabled(featuremgmt.FlagTopnav) {
-		r.Get("/admin/users", authorize(reqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionOrgUsersRead), ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll))), hs.Index)
-	} else {
-		r.Get("/admin/users", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll)), hs.Index)
-	}
+	r.Get("/admin/users", authorize(reqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionOrgUsersRead), ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll))), hs.Index)
 	r.Get("/admin/users/create", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionUsersCreate)), hs.Index)
 	r.Get("/admin/users/edit/:id", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionUsersRead)), hs.Index)
 	r.Get("/admin/orgs", authorizeInOrg(reqGrafanaAdmin, ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index)
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 469655292f4..16cdd4557fd 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -166,8 +166,8 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 
 	hs.HooksService.RunIndexDataHooks(&data, c)
 
-	// This will remove empty cfg or admin sections and move sections around if topnav is enabled
-	data.NavTree.RemoveEmptySectionsAndApplyNewInformationArchitecture(hs.Features.IsEnabled(featuremgmt.FlagTopnav))
+	// This will remove empty cfg or admin sections and move sections around
+	data.NavTree.RemoveEmptySectionsAndApplyNewInformationArchitecture()
 	data.NavTree.Sort()
 
 	return &data, nil
diff --git a/pkg/services/licensing/oss.go b/pkg/services/licensing/oss.go
index 8139d63542d..c01caac6bab 100644
--- a/pkg/services/licensing/oss.go
+++ b/pkg/services/licensing/oss.go
@@ -59,15 +59,7 @@ func ProvideService(cfg *setting.Cfg, hooksService *hooks.HooksService) *OSSLice
 			return
 		}
 
-		var adminNodeID string
-
-		if cfg.IsFeatureToggleEnabled("topnav") {
-			adminNodeID = navtree.NavIDCfg
-		} else {
-			adminNodeID = navtree.NavIDAdmin
-		}
-
-		if adminNode := indexData.NavTree.FindById(adminNodeID); adminNode != nil {
+		if adminNode := indexData.NavTree.FindById(navtree.NavIDCfg); adminNode != nil {
 			adminNode.Children = append(adminNode.Children, &navtree.NavLink{
 				Text: "Stats and license",
 				Id:   "upgrading",
diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index 30f796f7919..1d0df6eedaf 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -100,7 +100,7 @@ func (root *NavTreeRoot) FindById(id string) *NavLink {
 	return FindById(root.Children, id)
 }
 
-func (root *NavTreeRoot) RemoveEmptySectionsAndApplyNewInformationArchitecture(topNavEnabled bool) {
+func (root *NavTreeRoot) RemoveEmptySectionsAndApplyNewInformationArchitecture() {
 	// Remove server admin node if it has no children or set the url to first child
 	if node := root.FindById(NavIDAdmin); node != nil {
 		if len(node.Children) == 0 {
@@ -110,31 +110,26 @@ func (root *NavTreeRoot) RemoveEmptySectionsAndApplyNewInformationArchitecture(t
 		}
 	}
 
-	if topNavEnabled {
-		ApplyAdminIA(root)
+	ApplyAdminIA(root)
 
-		// Move reports into dashboards
-		if reports := root.FindById(NavIDReporting); reports != nil {
-			if dashboards := root.FindById(NavIDDashboards); dashboards != nil {
-				reports.SortWeight = 0
-				dashboards.Children = append(dashboards.Children, reports)
-				root.RemoveSection(reports)
-			}
-		}
-
-		// Change id of dashboards
+	// Move reports into dashboards
+	if reports := root.FindById(NavIDReporting); reports != nil {
 		if dashboards := root.FindById(NavIDDashboards); dashboards != nil {
-			dashboards.Id = "dashboards/browse"
+			reports.SortWeight = 0
+			dashboards.Children = append(dashboards.Children, reports)
+			root.RemoveSection(reports)
 		}
 	}
 
-	// Remove top level cfg / administration node if it has no children (needs to be after topnav new info archicture logic above that moves server admin into it)
-	// Remove server admin node if it has no children or set the url to first child
+	// Change id of dashboards
+	if dashboards := root.FindById(NavIDDashboards); dashboards != nil {
+		dashboards.Id = "dashboards/browse"
+	}
+
+	// Remove top level cfg / administration node if it has no children
 	if node := root.FindById(NavIDCfg); node != nil {
 		if len(node.Children) == 0 {
 			root.RemoveSection(node)
-		} else if !topNavEnabled {
-			node.Url = node.Children[0].Url
 		}
 	}
 
diff --git a/pkg/services/navtree/models_test.go b/pkg/services/navtree/models_test.go
index c76938469a0..06ded8cd6da 100644
--- a/pkg/services/navtree/models_test.go
+++ b/pkg/services/navtree/models_test.go
@@ -15,25 +15,12 @@ func TestNavTreeRoot(t *testing.T) {
 			},
 		}
 
-		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture(false)
+		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture()
 
 		require.Equal(t, 0, len(treeRoot.Children))
 	})
 
-	t.Run("Should not remove admin sections when they have children", func(t *testing.T) {
-		treeRoot := NavTreeRoot{
-			Children: []*NavLink{
-				{Id: NavIDCfg, Children: []*NavLink{{Id: "child"}}},
-				{Id: NavIDAdmin, Children: []*NavLink{{Id: "child"}}},
-			},
-		}
-
-		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture(false)
-
-		require.Equal(t, 2, len(treeRoot.Children))
-	})
-
-	t.Run("Should create 3 new sections in the Admin node when topnav is enabled", func(t *testing.T) {
+	t.Run("Should create 3 new sections in the Admin node", func(t *testing.T) {
 		treeRoot := NavTreeRoot{
 			Children: []*NavLink{
 				{Id: NavIDCfg},
@@ -41,7 +28,7 @@ func TestNavTreeRoot(t *testing.T) {
 			},
 		}
 
-		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture(true)
+		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture()
 
 		require.Equal(t, "Administration", treeRoot.Children[0].Text)
 	})
@@ -54,7 +41,7 @@ func TestNavTreeRoot(t *testing.T) {
 			},
 		}
 
-		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture(true)
+		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture()
 
 		require.Equal(t, NavIDReporting, treeRoot.Children[0].Children[0].Id)
 	})
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index 3babb95bc0c..65a156c9cdd 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -36,18 +36,6 @@ func (s *ServiceImpl) getOrgAdminNode(c *contextmodel.ReqContext) (*navtree.NavL
 		})
 	}
 
-	if !s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		if hasAccess(ac.ReqOrgAdmin, ac.EvalPermission(ac.ActionOrgUsersRead)) {
-			configNodes = append(configNodes, &navtree.NavLink{
-				Text:     "Users",
-				Id:       "users",
-				SubTitle: "Invite and assign roles to users",
-				Icon:     "user",
-				Url:      s.cfg.AppSubURL + "/org/users",
-			})
-		}
-	}
-
 	if hasAccess(s.ReqCanAdminTeams, ac.TeamsAccessEvaluator) {
 		configNodes = append(configNodes, &navtree.NavLink{
 			Text:     "Teams",
@@ -122,18 +110,10 @@ func (s *ServiceImpl) getServerAdminNode(c *contextmodel.ReqContext) *navtree.Na
 	orgsAccessEvaluator := ac.EvalPermission(ac.ActionOrgsRead)
 	adminNavLinks := []*navtree.NavLink{}
 
-	if s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		if hasAccess(ac.ReqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionOrgUsersRead), ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll))) {
-			adminNavLinks = append(adminNavLinks, &navtree.NavLink{
-				Text: "Users", SubTitle: "Manage users in Grafana", Id: "global-users", Url: s.cfg.AppSubURL + "/admin/users", Icon: "user",
-			})
-		}
-	} else {
-		if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll)) {
-			adminNavLinks = append(adminNavLinks, &navtree.NavLink{
-				Text: "Users", SubTitle: "Manage and create users across the whole Grafana server", Id: "global-users", Url: s.cfg.AppSubURL + "/admin/users", Icon: "user",
-			})
-		}
+	if hasAccess(ac.ReqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionOrgUsersRead), ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll))) {
+		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
+			Text: "Users", SubTitle: "Manage users in Grafana", Id: "global-users", Url: s.cfg.AppSubURL + "/admin/users", Icon: "user",
+		})
 	}
 
 	authConfigUIAvailable := s.license.FeatureEnabled("saml") && s.features.IsEnabled(featuremgmt.FlagAuthenticationConfigUI)
diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index d147cf2ace9..362e7c82161 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -16,7 +16,6 @@ import (
 )
 
 func (s *ServiceImpl) addAppLinks(treeRoot *navtree.NavTreeRoot, c *contextmodel.ReqContext) error {
-	topNavEnabled := s.features.IsEnabled(featuremgmt.FlagTopnav)
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	appLinks := []*navtree.NavLink{}
 
@@ -47,7 +46,7 @@ func (s *ServiceImpl) addAppLinks(treeRoot *navtree.NavTreeRoot, c *contextmodel
 			continue
 		}
 
-		if appNode := s.processAppPlugin(plugin, c, topNavEnabled, treeRoot); appNode != nil {
+		if appNode := s.processAppPlugin(plugin, c, treeRoot); appNode != nil {
 			appLinks = append(appLinks, appNode)
 		}
 	}
@@ -65,7 +64,7 @@ func (s *ServiceImpl) addAppLinks(treeRoot *navtree.NavTreeRoot, c *contextmodel
 	return nil
 }
 
-func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *contextmodel.ReqContext, topNavEnabled bool, treeRoot *navtree.NavTreeRoot) *navtree.NavLink {
+func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *contextmodel.ReqContext, treeRoot *navtree.NavTreeRoot) *navtree.NavLink {
 	hasAccessToInclude := s.hasAccessToInclude(c, plugin.ID)
 	appLink := &navtree.NavLink{
 		Text:       plugin.Name,
@@ -76,12 +75,7 @@ func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *contextmodel
 		SortWeight: navtree.WeightPlugin,
 		IsSection:  true,
 		PluginID:   plugin.ID,
-	}
-
-	if topNavEnabled {
-		appLink.Url = s.cfg.AppSubURL + "/a/" + plugin.ID
-	} else {
-		appLink.Url = path.Join(s.cfg.AppSubURL, plugin.DefaultNavURL)
+		Url:        s.cfg.AppSubURL + "/a/" + plugin.ID,
 	}
 
 	for _, include := range plugin.Includes {
@@ -159,10 +153,6 @@ func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *contextmodel
 		appLink.Children = []*navtree.NavLink{}
 	}
 
-	if !topNavEnabled {
-		return appLink
-	}
-
 	// Remove default nav child
 	childrenWithoutDefault := []*navtree.NavLink{}
 	for _, child := range appLink.Children {
diff --git a/pkg/services/navtree/navtreeimpl/applinks_test.go b/pkg/services/navtree/navtreeimpl/applinks_test.go
index ac937d601e3..4ca7c92eea9 100644
--- a/pkg/services/navtree/navtreeimpl/applinks_test.go
+++ b/pkg/services/navtree/navtreeimpl/applinks_test.go
@@ -119,17 +119,7 @@ func TestAddAppLinks(t *testing.T) {
 		},
 	}
 
-	t.Run("Should add enabled apps with pages", func(t *testing.T) {
-		treeRoot := navtree.NavTreeRoot{}
-		err := service.addAppLinks(&treeRoot, reqCtx)
-		require.NoError(t, err)
-		require.Equal(t, "Test app1 name", treeRoot.Children[0].Text)
-		require.Equal(t, "/a/test-app1/catalog", treeRoot.Children[0].Url)
-		require.Equal(t, "/a/test-app1/page2", treeRoot.Children[0].Children[1].Url)
-	})
-
-	t.Run("Should move apps to Apps category when topnav is enabled", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
+	t.Run("Should move apps to Apps category", func(t *testing.T) {
 		treeRoot := navtree.NavTreeRoot{}
 		err := service.addAppLinks(&treeRoot, reqCtx)
 		require.NoError(t, err)
@@ -141,8 +131,17 @@ func TestAddAppLinks(t *testing.T) {
 		require.Equal(t, testApp1.Name, appsNode.Children[0].Text)
 	})
 
-	t.Run("Should remove the default nav child (DefaultNav=true) when topnav is enabled and should set its URL to the plugin nav root", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
+	t.Run("Should add enabled apps with pages", func(t *testing.T) {
+		treeRoot := navtree.NavTreeRoot{}
+		err := service.addAppLinks(&treeRoot, reqCtx)
+		require.NoError(t, err)
+		appsNode := treeRoot.FindById(navtree.NavIDApps)
+		require.Equal(t, "Test app1 name", appsNode.Children[0].Text)
+		require.Equal(t, "/a/test-app1/catalog", appsNode.Children[0].Url)
+		require.Equal(t, "/a/test-app1/page2", appsNode.Children[0].Children[0].Url)
+	})
+
+	t.Run("Should remove the default nav child (DefaultNav=true) and should set its URL to the plugin nav root", func(t *testing.T) {
 		treeRoot := navtree.NavTreeRoot{}
 		err := service.addAppLinks(&treeRoot, reqCtx)
 		require.NoError(t, err)
@@ -155,7 +154,6 @@ func TestAddAppLinks(t *testing.T) {
 
 	// This can be done by using `[navigation.app_sections]` in the INI config
 	t.Run("Should move apps that have root nav id configured to the root", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
 		service.navigationAppConfig = map[string]NavigationAppConfig{
 			"test-app1": {SectionID: navtree.NavIDRoot},
 		}
@@ -179,7 +177,6 @@ func TestAddAppLinks(t *testing.T) {
 
 	// This can be done by using `[navigation.app_sections]` in the INI config
 	t.Run("Should move apps that have specific nav id configured to correct section", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
 		service.navigationAppConfig = map[string]NavigationAppConfig{
 			"test-app1": {SectionID: navtree.NavIDAdmin},
 		}
@@ -207,7 +204,6 @@ func TestAddAppLinks(t *testing.T) {
 	})
 
 	t.Run("Should only add a 'Monitoring' section if a plugin exists that wants to live there", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
 		service.navigationAppConfig = map[string]NavigationAppConfig{}
 
 		// Check if the Monitoring section is not there if no apps try to register to it
@@ -231,7 +227,6 @@ func TestAddAppLinks(t *testing.T) {
 	})
 
 	t.Run("Should add a 'Alerts and Incidents' section if a plugin exists that wants to live there", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
 		service.navigationAppConfig = map[string]NavigationAppConfig{}
 
 		// Check if the 'Alerts and Incidents' section is not there if no apps try to register to it
@@ -257,7 +252,6 @@ func TestAddAppLinks(t *testing.T) {
 	})
 
 	t.Run("Should add a 'Alerts and Incidents' section if a plugin exists that wants to live there even without an alerting node", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
 		service.navigationAppConfig = map[string]NavigationAppConfig{}
 
 		// Check if the 'Alerts and Incidents' section is not there if no apps try to register to it
@@ -281,7 +275,6 @@ func TestAddAppLinks(t *testing.T) {
 	})
 
 	t.Run("Should be able to control app sort order with SortWeight (smaller SortWeight displayed first)", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav)
 		service.navigationAppConfig = map[string]NavigationAppConfig{
 			"test-app2": {SectionID: navtree.NavIDMonitoring, SortWeight: 2},
 			"test-app1": {SectionID: navtree.NavIDMonitoring, SortWeight: 3},
@@ -300,7 +293,7 @@ func TestAddAppLinks(t *testing.T) {
 	})
 
 	t.Run("Should replace page from plugin", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav, featuremgmt.FlagDataConnectionsConsole)
+		service.features = featuremgmt.WithFeatures(featuremgmt.FlagDataConnectionsConsole)
 		service.navigationAppConfig = map[string]NavigationAppConfig{}
 		service.navigationAppPathConfig = map[string]NavigationAppConfig{
 			"/connections/connect-data": {SectionID: "connections"},
@@ -340,7 +333,7 @@ func TestAddAppLinks(t *testing.T) {
 	})
 
 	t.Run("Should not register pages under the app plugin section unless AddToNav=true", func(t *testing.T) {
-		service.features = featuremgmt.WithFeatures(featuremgmt.FlagTopnav, featuremgmt.FlagDataConnectionsConsole)
+		service.features = featuremgmt.WithFeatures(featuremgmt.FlagDataConnectionsConsole)
 		service.navigationAppPathConfig = map[string]NavigationAppConfig{} // We don't configure it as a standalone plugin page
 
 		treeRoot := navtree.NavTreeRoot{}
@@ -466,11 +459,12 @@ func TestAddAppLinksAccessControl(t *testing.T) {
 
 		err := service.addAppLinks(&treeRoot, reqCtx)
 		require.NoError(t, err)
-		require.Len(t, treeRoot.Children, 1)
-		require.Equal(t, "Test app1 name", treeRoot.Children[0].Text)
-		require.Len(t, treeRoot.Children[0].Children, 2)
-		require.Equal(t, "/a/test-app1/catalog", treeRoot.Children[0].Children[0].Url)
-		require.Equal(t, "/a/test-app1/page2", treeRoot.Children[0].Children[1].Url)
+		appsNode := treeRoot.FindById(navtree.NavIDApps)
+		require.Len(t, appsNode.Children, 1)
+		require.Equal(t, "Test app1 name", appsNode.Children[0].Text)
+		require.Equal(t, "/a/test-app1/catalog", appsNode.Children[0].Url)
+		require.Len(t, appsNode.Children[0].Children, 1)
+		require.Equal(t, "/a/test-app1/page2", appsNode.Children[0].Children[0].Url)
 	})
 	t.Run("Should add one include when the user is a viewer", func(t *testing.T) {
 		treeRoot := navtree.NavTreeRoot{}
@@ -481,10 +475,11 @@ func TestAddAppLinksAccessControl(t *testing.T) {
 
 		err := service.addAppLinks(&treeRoot, reqCtx)
 		require.NoError(t, err)
-		require.Len(t, treeRoot.Children, 1)
-		require.Equal(t, "Test app1 name", treeRoot.Children[0].Text)
-		require.Len(t, treeRoot.Children[0].Children, 1)
-		require.Equal(t, "/a/test-app1/page2", treeRoot.Children[0].Children[0].Url)
+		appsNode := treeRoot.FindById(navtree.NavIDApps)
+		require.Len(t, appsNode.Children, 1)
+		require.Equal(t, "Test app1 name", appsNode.Children[0].Text)
+		require.Len(t, appsNode.Children[0].Children, 1)
+		require.Equal(t, "/a/test-app1/page2", appsNode.Children[0].Children[0].Url)
 	})
 	t.Run("Should add both includes when the user is a viewer with catalog read", func(t *testing.T) {
 		treeRoot := navtree.NavTreeRoot{}
@@ -496,11 +491,12 @@ func TestAddAppLinksAccessControl(t *testing.T) {
 
 		err := service.addAppLinks(&treeRoot, reqCtx)
 		require.NoError(t, err)
-		require.Len(t, treeRoot.Children, 1)
-		require.Equal(t, "Test app1 name", treeRoot.Children[0].Text)
-		require.Len(t, treeRoot.Children[0].Children, 2)
-		require.Equal(t, "/a/test-app1/catalog", treeRoot.Children[0].Children[0].Url)
-		require.Equal(t, "/a/test-app1/page2", treeRoot.Children[0].Children[1].Url)
+		appsNode := treeRoot.FindById(navtree.NavIDApps)
+		require.Len(t, appsNode.Children, 1)
+		require.Equal(t, "Test app1 name", appsNode.Children[0].Text)
+		require.Equal(t, "/a/test-app1/catalog", appsNode.Children[0].Url)
+		require.Len(t, appsNode.Children[0].Children, 1)
+		require.Equal(t, "/a/test-app1/page2", appsNode.Children[0].Children[0].Url)
 	})
 	t.Run("Should add one include when the user is an editor without catalog read", func(t *testing.T) {
 		treeRoot := navtree.NavTreeRoot{}
@@ -512,9 +508,10 @@ func TestAddAppLinksAccessControl(t *testing.T) {
 
 		err := service.addAppLinks(&treeRoot, reqCtx)
 		require.NoError(t, err)
-		require.Len(t, treeRoot.Children, 1)
-		require.Equal(t, "Test app1 name", treeRoot.Children[0].Text)
-		require.Len(t, treeRoot.Children[0].Children, 1)
-		require.Equal(t, "/a/test-app1/page2", treeRoot.Children[0].Children[0].Url)
+		appsNode := treeRoot.FindById(navtree.NavIDApps)
+		require.Len(t, appsNode.Children, 1)
+		require.Equal(t, "Test app1 name", appsNode.Children[0].Text)
+		require.Len(t, appsNode.Children[0].Children, 1)
+		require.Equal(t, "/a/test-app1/page2", appsNode.Children[0].Children[0].Url)
 	})
 }
diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index 9d1de401bd2..881378a54c7 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -195,9 +195,6 @@ func (s *ServiceImpl) getHomeNode(c *contextmodel.ReqContext, prefs *pref.Prefer
 		Section:    navtree.NavSectionCore,
 		SortWeight: navtree.WeightHome,
 	}
-	if !s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		homeNode.HideFromMenu = true
-	}
 	return homeNode
 }
 
@@ -345,12 +342,6 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext, hasEdit
 
 	dashboardChildNavs := []*navtree.NavLink{}
 
-	if !s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
-			Text: "Browse", Id: navtree.NavIDDashboardsBrowse, Url: s.cfg.AppSubURL + "/dashboards", Icon: "sitemap",
-		})
-	}
-
 	dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
 		Text: "Playlists", SubTitle: "Groups of dashboards that are displayed in a sequence", Id: "dashboards/playlists", Url: s.cfg.AppSubURL + "/playlists", Icon: "presentation-play",
 	})
@@ -393,12 +384,6 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext, hasEdit
 		})
 	}
 
-	if hasEditPerm && !s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
-			Text: "Divider", Divider: true, Id: "divider", HideFromTabs: true,
-		})
-	}
-
 	if hasEditPerm {
 		if hasAccess(hasEditPermInAnyFolder, ac.EvalPermission(dashboards.ActionDashboardsCreate)) {
 			dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
@@ -412,15 +397,6 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext, hasEdit
 		}
 	}
 
-	if hasEditPerm && !s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		if hasAccess(ac.ReqOrgAdminOrEditor, ac.EvalPermission(dashboards.ActionFoldersCreate)) {
-			dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
-				Text: "New folder", SubTitle: "Create a new folder to organize your dashboards", Id: "dashboards/folder/new",
-				Icon: "plus", Url: s.cfg.AppSubURL + "/dashboards/folder/new", HideFromTabs: true, ShowIconInNavbar: true,
-			})
-		}
-	}
-
 	return dashboardChildNavs
 }
 
@@ -445,12 +421,7 @@ func (s *ServiceImpl) buildLegacyAlertNavLinks(c *contextmodel.ReqContext) *navt
 		Children:   alertChildNavs,
 		Section:    navtree.NavSectionCore,
 		SortWeight: navtree.WeightAlerting,
-	}
-
-	if s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		alertNav.Url = s.cfg.AppSubURL + "/alerting"
-	} else {
-		alertNav.Url = s.cfg.AppSubURL + "/alerting/list"
+		Url:        s.cfg.AppSubURL + "/alerting",
 	}
 
 	return &alertNav
@@ -460,15 +431,6 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext, hasEditPerm
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	var alertChildNavs []*navtree.NavLink
 
-	if !s.features.IsEnabled(featuremgmt.FlagTopnav) {
-		alertChildNavs = append(alertChildNavs, &navtree.NavLink{
-			Text: "Home",
-			Id:   "alert-home",
-			Url:  s.cfg.AppSubURL + "/alerting/home",
-			Icon: "home",
-		})
-	}
-
 	if hasAccess(ac.ReqViewer, ac.EvalAny(ac.EvalPermission(ac.ActionAlertingRuleRead), ac.EvalPermission(ac.ActionAlertingRuleExternalRead))) {
 		alertChildNavs = append(alertChildNavs, &navtree.NavLink{
 			Text: "Alert rules", SubTitle: "Rules that determine whether an alert will fire", Id: "alert-list", Url: s.cfg.AppSubURL + "/alerting/list", Icon: "list-ul",
@@ -498,12 +460,6 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext, hasEditPerm
 	fallbackHasEditPerm := func(*contextmodel.ReqContext) bool { return hasEditPerm }
 
 	if hasAccess(fallbackHasEditPerm, ac.EvalAny(ac.EvalPermission(ac.ActionAlertingRuleCreate), ac.EvalPermission(ac.ActionAlertingRuleExternalWrite))) {
-		if !s.features.IsEnabled(featuremgmt.FlagTopnav) {
-			alertChildNavs = append(alertChildNavs, &navtree.NavLink{
-				Text: "Divider", Divider: true, Id: "divider", HideFromTabs: true,
-			})
-		}
-
 		alertChildNavs = append(alertChildNavs, &navtree.NavLink{
 			Text: "Create alert rule", SubTitle: "Create an alert rule", Id: "alert",
 			Icon: "plus", Url: s.cfg.AppSubURL + "/alerting/new", HideFromTabs: true, ShowIconInNavbar: true, IsCreateAction: true,
@@ -519,12 +475,7 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext, hasEditPerm
 			Children:   alertChildNavs,
 			Section:    navtree.NavSectionCore,
 			SortWeight: navtree.WeightAlerting,
-		}
-
-		if s.features.IsEnabled(featuremgmt.FlagTopnav) {
-			alertNav.Url = s.cfg.AppSubURL + "/alerting"
-		} else {
-			alertNav.Url = s.cfg.AppSubURL + "/alerting/home"
+			Url:        s.cfg.AppSubURL + "/alerting",
 		}
 
 		return &alertNav
diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index 6e2f3f9ad06..829ca792805 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -2,18 +2,14 @@ import { css, cx } from '@emotion/css';
 import React, { PropsWithChildren } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { useStyles2 } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 import { CommandPalette } from 'app/features/commandPalette/CommandPalette';
-import { SearchWrapper } from 'app/features/search';
 import { KioskMode } from 'app/types';
 
-import { MegaMenu } from '../MegaMenu/MegaMenu';
-import { NavBar } from '../NavBar/NavBar';
-
-import { NavToolbar } from './NavToolbar';
-import { TopSearchBar } from './TopSearchBar';
+import { MegaMenu } from './MegaMenu/MegaMenu';
+import { NavToolbar } from './NavToolbar/NavToolbar';
+import { TopSearchBar } from './TopBar/TopSearchBar';
 import { TOP_BAR_LEVEL_HEIGHT } from './types';
 
 export interface Props extends PropsWithChildren<{}> {}
@@ -23,21 +19,6 @@ export function AppChrome({ children }: Props) {
   const { chrome } = useGrafana();
   const state = chrome.useState();
 
-  if (!config.featureToggles.topnav) {
-    return (
-      <>
-        {!state.chromeless && (
-          <>
-            <NavBar />
-            <SearchWrapper />
-            <CommandPalette />
-          </>
-        )}
-        <main className="main-view">{children}</main>
-      </>
-    );
-  }
-
   const searchBarHidden = state.searchBarHidden || state.kioskMode === KioskMode.TV;
 
   const contentClass = cx({
diff --git a/public/app/core/components/MegaMenu/MegaMenu.test.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
similarity index 95%
rename from public/app/core/components/MegaMenu/MegaMenu.test.tsx
rename to public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
index b88f7f087c9..49f7d60176a 100644
--- a/public/app/core/components/MegaMenu/MegaMenu.test.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
@@ -6,7 +6,7 @@ import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 import { NavModelItem, NavSection } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 
-import { TestProvider } from '../../../../test/helpers/TestProvider';
+import { TestProvider } from '../../../../../test/helpers/TestProvider';
 
 import { MegaMenu } from './MegaMenu';
 
diff --git a/public/app/core/components/MegaMenu/MegaMenu.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
similarity index 97%
rename from public/app/core/components/MegaMenu/MegaMenu.tsx
rename to public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
index b9a4cef37c7..607a5beabd3 100644
--- a/public/app/core/components/MegaMenu/MegaMenu.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
@@ -7,9 +7,8 @@ import { GrafanaTheme2, NavSection } from '@grafana/data';
 import { useTheme2 } from '@grafana/ui';
 import { useSelector } from 'app/types';
 
-import { enrichConfigItems, enrichWithInteractionTracking, getActiveItem } from '../NavBar/utils';
-
 import { NavBarMenu } from './NavBarMenu';
+import { enrichConfigItems, enrichWithInteractionTracking, getActiveItem } from './utils';
 
 export interface Props {
   onClose: () => void;
diff --git a/public/app/core/components/NavBar/NavBarItemIcon.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarItemIcon.tsx
similarity index 95%
rename from public/app/core/components/NavBar/NavBarItemIcon.tsx
rename to public/app/core/components/AppChrome/MegaMenu/NavBarItemIcon.tsx
index f3b8d3c2707..e180e74d3aa 100644
--- a/public/app/core/components/NavBar/NavBarItemIcon.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/NavBarItemIcon.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { Icon, toIconName, useTheme2 } from '@grafana/ui';
 
-import { Branding } from '../Branding/Branding';
+import { Branding } from '../../Branding/Branding';
 
 interface NavBarItemIconProps {
   link: NavModelItem;
diff --git a/public/app/core/components/MegaMenu/NavBarMenu.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx
similarity index 99%
rename from public/app/core/components/MegaMenu/NavBarMenu.tsx
rename to public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx
index 0522c1eefa3..e09a76e0302 100644
--- a/public/app/core/components/MegaMenu/NavBarMenu.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx
@@ -9,7 +9,7 @@ import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { CustomScrollbar, Icon, IconButton, useTheme2 } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 
-import { TOP_BAR_LEVEL_HEIGHT } from '../AppChrome/types';
+import { TOP_BAR_LEVEL_HEIGHT } from '../types';
 
 import { NavBarMenuItemWrapper } from './NavBarMenuItemWrapper';
 
diff --git a/public/app/core/components/MegaMenu/NavBarMenuItem.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItem.tsx
similarity index 100%
rename from public/app/core/components/MegaMenu/NavBarMenuItem.tsx
rename to public/app/core/components/AppChrome/MegaMenu/NavBarMenuItem.tsx
diff --git a/public/app/core/components/MegaMenu/NavBarMenuItemWrapper.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx
similarity index 98%
rename from public/app/core/components/MegaMenu/NavBarMenuItemWrapper.tsx
rename to public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx
index 2501c0341d7..ac5deb8cd9c 100644
--- a/public/app/core/components/MegaMenu/NavBarMenuItemWrapper.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx
@@ -4,10 +4,9 @@ import React from 'react';
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { toIconName, useStyles2 } from '@grafana/ui';
 
-import { isMatchOrChildMatch } from '../NavBar/utils';
-
 import { NavBarMenuItem } from './NavBarMenuItem';
 import { NavBarMenuSection } from './NavBarMenuSection';
+import { isMatchOrChildMatch } from './utils';
 
 export function NavBarMenuItemWrapper({
   link,
diff --git a/public/app/core/components/MegaMenu/NavBarMenuSection.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuSection.tsx
similarity index 94%
rename from public/app/core/components/MegaMenu/NavBarMenuSection.tsx
rename to public/app/core/components/AppChrome/MegaMenu/NavBarMenuSection.tsx
index a5569873fc1..433ee3c886e 100644
--- a/public/app/core/components/MegaMenu/NavBarMenuSection.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuSection.tsx
@@ -5,11 +5,10 @@ import { useLocalStorage } from 'react-use';
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { Button, Icon, useStyles2 } from '@grafana/ui';
 
-import { NavBarItemIcon } from '../NavBar/NavBarItemIcon';
-import { NavFeatureHighlight } from '../NavBar/NavFeatureHighlight';
-import { hasChildMatch } from '../NavBar/utils';
-
+import { NavBarItemIcon } from './NavBarItemIcon';
 import { NavBarMenuItem } from './NavBarMenuItem';
+import { NavFeatureHighlight } from './NavFeatureHighlight';
+import { hasChildMatch } from './utils';
 
 export function NavBarMenuSection({
   link,
diff --git a/public/app/core/components/NavBar/NavFeatureHighlight.tsx b/public/app/core/components/AppChrome/MegaMenu/NavFeatureHighlight.tsx
similarity index 100%
rename from public/app/core/components/NavBar/NavFeatureHighlight.tsx
rename to public/app/core/components/AppChrome/MegaMenu/NavFeatureHighlight.tsx
diff --git a/public/app/core/components/NavBar/navBarItem-translations.ts b/public/app/core/components/AppChrome/MegaMenu/navBarItem-translations.ts
similarity index 88%
rename from public/app/core/components/NavBar/navBarItem-translations.ts
rename to public/app/core/components/AppChrome/MegaMenu/navBarItem-translations.ts
index fa61f68e466..a7e3602411a 100644
--- a/public/app/core/components/NavBar/navBarItem-translations.ts
+++ b/public/app/core/components/AppChrome/MegaMenu/navBarItem-translations.ts
@@ -1,4 +1,3 @@
-import { config } from '@grafana/runtime';
 import { t } from 'app/core/internationalization';
 
 // Maps the ID of the nav item to a translated phrase to later pass to <Trans />
@@ -30,9 +29,7 @@ export function getNavTitle(navId: string | undefined) {
     case 'dashboards':
       return t('nav.dashboards.title', 'Dashboards');
     case 'dashboards/browse':
-      return config.featureToggles.topnav
-        ? t('nav.dashboards.title', 'Dashboards')
-        : t('nav.manage-dashboards.title', 'Browse');
+      return t('nav.dashboards.title', 'Dashboards');
     case 'dashboards/playlists':
       return t('nav.playlists.title', 'Playlists');
     case 'dashboards/snapshots':
@@ -72,9 +69,7 @@ export function getNavTitle(navId: string | undefined) {
     case 'alerting-admin':
       return t('nav.alerting-admin.title', 'Admin');
     case 'cfg':
-      return config.featureToggles.topnav
-        ? t('nav.config.title', 'Administration')
-        : t('nav.config.titleBeforeTopnav', 'Configuration');
+      return t('nav.config.title', 'Administration');
     case 'datasources':
       return t('nav.datasources.title', 'Data sources');
     case 'correlations':
@@ -86,9 +81,7 @@ export function getNavTitle(navId: string | undefined) {
     case 'plugins':
       return t('nav.plugins.title', 'Plugins');
     case 'org-settings':
-      return config.featureToggles.topnav
-        ? t('nav.org-settings.title', 'Default preferences')
-        : t('nav.org-settings.titleBeforeTopnav', 'Preferences');
+      return t('nav.org-settings.title', 'Default preferences');
     case 'apikeys':
       return t('nav.api-keys.title', 'API keys');
     case 'serviceaccounts':
@@ -98,9 +91,7 @@ export function getNavTitle(navId: string | undefined) {
     case 'support-bundles':
       return t('nav.support-bundles.title', 'Support bundles');
     case 'global-users':
-      return config.featureToggles.topnav
-        ? t('nav.global-users.title', 'Users')
-        : t('nav.global-users.titleBeforeTopnav', 'Users');
+      return t('nav.global-users.title', 'Users');
     case 'global-orgs':
       return t('nav.global-orgs.title', 'Organizations');
     case 'server-settings':
@@ -137,9 +128,7 @@ export function getNavSubTitle(navId: string | undefined) {
     case 'dashboards':
       return t('nav.dashboards.subtitle', 'Create and manage dashboards to visualize your data');
     case 'dashboards/browse':
-      return config.featureToggles.topnav
-        ? t('nav.dashboards.subtitle', 'Create and manage dashboards to visualize your data')
-        : undefined;
+      return t('nav.dashboards.subtitle', 'Create and manage dashboards to visualize your data');
     case 'manage-folder':
       return t('nav.manage-folder.subtitle', 'Manage folder dashboards and permissions');
     case 'dashboards/playlists':
@@ -193,12 +182,10 @@ export function getNavSubTitle(navId: string | undefined) {
     case 'support-bundles':
       return t('nav.support-bundles.subtitle', 'Download support bundles');
     case 'admin':
-      return config.featureToggles.topnav
-        ? t(
-            'nav.admin.subtitle',
-            'Manage server-wide settings and access to resources such as organizations, users, and licenses'
-          )
-        : undefined;
+      return t(
+        'nav.admin.subtitle',
+        'Manage server-wide settings and access to resources such as organizations, users, and licenses'
+      );
     case 'apps':
       return t('nav.apps.subtitle', 'App plugins that extend the Grafana experience');
     case 'monitoring':
diff --git a/public/app/core/components/NavBar/utils.test.ts b/public/app/core/components/AppChrome/MegaMenu/utils.test.ts
similarity index 68%
rename from public/app/core/components/NavBar/utils.test.ts
rename to public/app/core/components/AppChrome/MegaMenu/utils.test.ts
index 3bce87818c9..e9ea4590c67 100644
--- a/public/app/core/components/NavBar/utils.test.ts
+++ b/public/app/core/components/AppChrome/MegaMenu/utils.test.ts
@@ -3,9 +3,9 @@ import { Location } from 'history';
 import { GrafanaConfig, locationUtil, NavModelItem } from '@grafana/data';
 import { ContextSrv, setContextSrv } from 'app/core/services/context_srv';
 
-import { enrichConfigItems, getActiveItem, isMatchOrChildMatch, isSearchActive } from './utils';
+import { enrichConfigItems, getActiveItem, isMatchOrChildMatch } from './utils';
 
-jest.mock('../../app_events', () => ({
+jest.mock('../../../app_events', () => ({
   publish: jest.fn(),
 }));
 
@@ -33,46 +33,6 @@ describe('enrichConfigItems', () => {
     ];
   });
 
-  it('does not add a sign in item if a user signed in', () => {
-    const contextSrv = new ContextSrv();
-    contextSrv.user.isSignedIn = false;
-    setContextSrv(contextSrv);
-    const enrichedConfigItems = enrichConfigItems(mockItems, mockLocation);
-    const signInNode = enrichedConfigItems.find((item) => item.id === 'sign-in');
-    expect(signInNode).toBeDefined();
-  });
-
-  it('adds a sign in item if a user is not signed in', () => {
-    const contextSrv = new ContextSrv();
-    contextSrv.user.isSignedIn = true;
-    setContextSrv(contextSrv);
-    const enrichedConfigItems = enrichConfigItems(mockItems, mockLocation);
-    const signInNode = enrichedConfigItems.find((item) => item.id === 'sign-in');
-    expect(signInNode).toBeDefined();
-  });
-
-  it('does not add an org switcher to the profile node if there is 1 org', () => {
-    const contextSrv = new ContextSrv();
-    contextSrv.user.orgCount = 1;
-    setContextSrv(contextSrv);
-    const enrichedConfigItems = enrichConfigItems(mockItems, mockLocation);
-    const profileNode = enrichedConfigItems.find((item) => item.id === 'profile');
-    expect(profileNode!.children).toBeUndefined();
-  });
-
-  it('adds an org switcher to the profile node if there is more than 1 org', () => {
-    const contextSrv = new ContextSrv();
-    contextSrv.user.orgCount = 2;
-    setContextSrv(contextSrv);
-    const enrichedConfigItems = enrichConfigItems(mockItems, mockLocation);
-    const profileNode = enrichedConfigItems.find((item) => item.id === 'profile');
-    expect(profileNode!.children).toContainEqual(
-      expect.objectContaining({
-        text: 'Switch organization',
-      })
-    );
-  });
-
   it('enhances the help node with extra child links', () => {
     const contextSrv = new ContextSrv();
     setContextSrv(contextSrv);
@@ -241,25 +201,3 @@ describe('getActiveItem', () => {
     });
   });
 });
-
-describe('isSearchActive', () => {
-  it('returns true if the search query parameter is "open"', () => {
-    const mockLocation = {
-      hash: '',
-      pathname: '/',
-      search: '?search=open',
-      state: '',
-    };
-    expect(isSearchActive(mockLocation)).toBe(true);
-  });
-
-  it('returns false if the search query parameter is missing', () => {
-    const mockLocation = {
-      hash: '',
-      pathname: '/',
-      search: '',
-      state: '',
-    };
-    expect(isSearchActive(mockLocation)).toBe(false);
-  });
-});
diff --git a/public/app/core/components/NavBar/utils.ts b/public/app/core/components/AppChrome/MegaMenu/utils.ts
similarity index 68%
rename from public/app/core/components/NavBar/utils.ts
rename to public/app/core/components/AppChrome/MegaMenu/utils.ts
index 92cc50e577e..2127d76eba6 100644
--- a/public/app/core/components/NavBar/utils.ts
+++ b/public/app/core/components/AppChrome/MegaMenu/utils.ts
@@ -1,52 +1,19 @@
 import { Location } from 'history';
 
-import { locationUtil, NavModelItem, NavSection } from '@grafana/data';
+import { locationUtil, NavModelItem } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
 import { t } from 'app/core/internationalization';
-import { contextSrv } from 'app/core/services/context_srv';
 
-import { ShowModalReactEvent } from '../../../types/events';
-import appEvents from '../../app_events';
-import { getFooterLinks } from '../Footer/Footer';
-import { OrgSwitcher } from '../OrgSwitcher';
-import { HelpModal } from '../help/HelpModal';
-
-export const SEARCH_ITEM_ID = 'search';
-export const NAV_MENU_PORTAL_CONTAINER_ID = 'navbar-menu-portal-container';
-
-export const getNavMenuPortalContainer = () => document.getElementById(NAV_MENU_PORTAL_CONTAINER_ID) ?? document.body;
+import { ShowModalReactEvent } from '../../../../types/events';
+import appEvents from '../../../app_events';
+import { getFooterLinks } from '../../Footer/Footer';
+import { HelpModal } from '../../help/HelpModal';
 
 export const enrichConfigItems = (items: NavModelItem[], location: Location<unknown>) => {
-  const { isSignedIn, user } = contextSrv;
   const onOpenShortcuts = () => {
     appEvents.publish(new ShowModalReactEvent({ component: HelpModal }));
   };
 
-  const onOpenOrgSwitcher = () => {
-    appEvents.publish(new ShowModalReactEvent({ component: OrgSwitcher }));
-  };
-
-  if (!config.featureToggles.topnav && user && user.orgCount > 1) {
-    const profileNode = items.find((bottomNavItem) => bottomNavItem.id === 'profile');
-    if (profileNode) {
-      profileNode.showOrgSwitcher = true;
-      profileNode.subTitle = `Organization: ${user?.orgName}`;
-    }
-  }
-
-  if (!isSignedIn && !config.featureToggles.topnav) {
-    const loginUrl = locationUtil.getUrlForPartial(location, { forceLogin: 'true' });
-
-    items.unshift({
-      icon: 'signout',
-      id: 'sign-in',
-      section: NavSection.Config,
-      target: '_self',
-      text: t('nav.sign-in', 'Sign in'),
-      url: loginUrl,
-    });
-  }
-
   items.forEach((link) => {
     let menuItems = link.children || [];
 
@@ -63,18 +30,6 @@ export const enrichConfigItems = (items: NavModelItem[], location: Location<unkn
         },
       ];
     }
-
-    if (!config.featureToggles.topnav && link.showOrgSwitcher) {
-      link.children = [
-        ...menuItems,
-        {
-          id: 'switch-organization',
-          text: t('nav.profile/switch-org', 'Switch organization'),
-          icon: 'arrow-random',
-          onClick: onOpenOrgSwitcher,
-        },
-      ];
-    }
   });
   return items;
 };
@@ -163,15 +118,6 @@ export const getActiveItem = (
   return currentBestMatch;
 };
 
-export const isSearchActive = (location: Location<unknown>) => {
-  const query = new URLSearchParams(location.search);
-  return query.get('search') === 'open';
-};
-
-export function getNavModelItemKey(item: NavModelItem) {
-  return item.id ?? item.text;
-}
-
 export function getEditionAndUpdateLinks(): NavModelItem[] {
   const { buildInfo, licenseInfo } = config;
   const stateInfo = licenseInfo.stateInfo ? ` (${licenseInfo.stateInfo})` : '';
diff --git a/public/app/core/components/AppChrome/NavToolbar.tsx b/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
similarity index 94%
rename from public/app/core/components/AppChrome/NavToolbar.tsx
rename to public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
index 9a63160c6a0..fc7f789ca75 100644
--- a/public/app/core/components/AppChrome/NavToolbar.tsx
+++ b/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
@@ -8,11 +8,11 @@ import { t } from 'app/core/internationalization';
 import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 import { useSelector } from 'app/types';
 
-import { Breadcrumbs } from '../Breadcrumbs/Breadcrumbs';
-import { buildBreadcrumbs } from '../Breadcrumbs/utils';
+import { Breadcrumbs } from '../../Breadcrumbs/Breadcrumbs';
+import { buildBreadcrumbs } from '../../Breadcrumbs/utils';
+import { TOP_BAR_LEVEL_HEIGHT } from '../types';
 
 import { NavToolbarSeparator } from './NavToolbarSeparator';
-import { TOP_BAR_LEVEL_HEIGHT } from './types';
 
 export interface Props {
   onToggleSearchBar(): void;
diff --git a/public/app/core/components/AppChrome/NavToolbarSeparator.tsx b/public/app/core/components/AppChrome/NavToolbar/NavToolbarSeparator.tsx
similarity index 82%
rename from public/app/core/components/AppChrome/NavToolbarSeparator.tsx
rename to public/app/core/components/AppChrome/NavToolbar/NavToolbarSeparator.tsx
index 36fe42e58b8..e801acd5d6c 100644
--- a/public/app/core/components/AppChrome/NavToolbarSeparator.tsx
+++ b/public/app/core/components/AppChrome/NavToolbar/NavToolbarSeparator.tsx
@@ -2,7 +2,6 @@ import { css, cx } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { useStyles2 } from '@grafana/ui';
 
 export interface Props {
@@ -17,11 +16,7 @@ export function NavToolbarSeparator({ className, leftActionsSeparator }: Props)
     return <div className={cx(className, styles.leftActionsSeparator)} />;
   }
 
-  if (config.featureToggles.topnav) {
-    return <div className={cx(className, styles.line)} />;
-  }
-
-  return null;
+  return <div className={cx(className, styles.line)} />;
 }
 
 const getStyles = (theme: GrafanaTheme2) => {
diff --git a/public/app/core/components/AppChrome/Organization/OrganizationPicker.tsx b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationPicker.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/Organization/OrganizationPicker.tsx
rename to public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationPicker.tsx
diff --git a/public/app/core/components/AppChrome/Organization/OrganizationSelect.tsx b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSelect.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/Organization/OrganizationSelect.tsx
rename to public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSelect.tsx
diff --git a/public/app/core/components/AppChrome/Organization/OrganizationSwitcher.test.tsx b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/Organization/OrganizationSwitcher.test.tsx
rename to public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx
diff --git a/public/app/core/components/AppChrome/Organization/OrganizationSwitcher.tsx b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/Organization/OrganizationSwitcher.tsx
rename to public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx
diff --git a/public/app/core/components/AppChrome/Organization/types.ts b/public/app/core/components/AppChrome/OrganizationSwitcher/types.ts
similarity index 100%
rename from public/app/core/components/AppChrome/Organization/types.ts
rename to public/app/core/components/AppChrome/OrganizationSwitcher/types.ts
diff --git a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
index c322b4c3875..65a9b92e498 100644
--- a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
+++ b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
@@ -7,7 +7,7 @@ import { Menu, Dropdown, useStyles2, useTheme2, ToolbarButton } from '@grafana/u
 import { useMediaQueryChange } from 'app/core/hooks/useMediaQueryChange';
 import { useSelector } from 'app/types';
 
-import { NavToolbarSeparator } from '../NavToolbarSeparator';
+import { NavToolbarSeparator } from '../NavToolbar/NavToolbarSeparator';
 
 import { findCreateActions } from './utils';
 
diff --git a/public/app/core/components/AppChrome/TopBar/TopNavBarMenu.tsx b/public/app/core/components/AppChrome/TopBar/TopNavBarMenu.tsx
index b04e2a062a3..d885fd83f3c 100644
--- a/public/app/core/components/AppChrome/TopBar/TopNavBarMenu.tsx
+++ b/public/app/core/components/AppChrome/TopBar/TopNavBarMenu.tsx
@@ -6,7 +6,7 @@ import { useLocation } from 'react-router-dom';
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { Menu, MenuItem, useStyles2 } from '@grafana/ui';
 
-import { enrichConfigItems, enrichWithInteractionTracking } from '../../NavBar/utils';
+import { enrichConfigItems, enrichWithInteractionTracking } from '../MegaMenu/utils';
 
 export interface TopNavBarMenuProps {
   node: NavModelItem;
diff --git a/public/app/core/components/AppChrome/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
similarity index 87%
rename from public/app/core/components/AppChrome/TopSearchBar.tsx
rename to public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
index 7038efdfccd..6bca6daa1a1 100644
--- a/public/app/core/components/AppChrome/TopSearchBar.tsx
+++ b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
@@ -8,16 +8,16 @@ import { config } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
 import { useSelector } from 'app/types';
 
-import { Branding } from '../Branding/Branding';
+import { Branding } from '../../Branding/Branding';
+import { NewsContainer } from '../News/NewsContainer';
+import { OrganizationSwitcher } from '../OrganizationSwitcher/OrganizationSwitcher';
+import { QuickAdd } from '../QuickAdd/QuickAdd';
+import { TOP_BAR_LEVEL_HEIGHT } from '../types';
 
-import { NewsContainer } from './News/NewsContainer';
-import { OrganizationSwitcher } from './Organization/OrganizationSwitcher';
-import { QuickAdd } from './QuickAdd/QuickAdd';
-import { SignInLink } from './TopBar/SignInLink';
-import { TopNavBarMenu } from './TopBar/TopNavBarMenu';
-import { TopSearchBarSection } from './TopBar/TopSearchBarSection';
+import { SignInLink } from './SignInLink';
+import { TopNavBarMenu } from './TopNavBarMenu';
 import { TopSearchBarCommandPaletteTrigger } from './TopSearchBarCommandPaletteTrigger';
-import { TOP_BAR_LEVEL_HEIGHT } from './types';
+import { TopSearchBarSection } from './TopSearchBarSection';
 
 export const TopSearchBar = React.memo(function TopSearchBar() {
   const styles = useStyles2(getStyles);
diff --git a/public/app/core/components/AppChrome/TopSearchBarCommandPaletteTrigger.tsx b/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/TopSearchBarCommandPaletteTrigger.tsx
rename to public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx
diff --git a/public/app/core/components/NavBar/NavBar.test.tsx b/public/app/core/components/NavBar/NavBar.test.tsx
deleted file mode 100644
index a4ffe1ea4ca..00000000000
--- a/public/app/core/components/NavBar/NavBar.test.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { act, render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { locationService } from '@grafana/runtime';
-
-import { TestProvider } from '../../../../test/helpers/TestProvider';
-
-import { NavBar } from './NavBar';
-
-jest.mock('app/core/services/context_srv', () => ({
-  contextSrv: {
-    sidemenu: true,
-    user: {},
-    isSignedIn: false,
-    isGrafanaAdmin: false,
-    isEditor: false,
-    hasEditPermissionFolders: false,
-  },
-}));
-
-const setup = () => {
-  return render(
-    <TestProvider>
-      <NavBar />
-    </TestProvider>
-  );
-};
-
-describe('NavBar', () => {
-  it('should render component', async () => {
-    setup();
-    const sidemenu = await screen.findByTestId('sidemenu');
-    expect(sidemenu).toBeInTheDocument();
-  });
-
-  it('should not render when in kiosk mode is tv', async () => {
-    setup();
-
-    act(() => locationService.partial({ kiosk: 'tv' }));
-    const sidemenu = screen.queryByTestId('sidemenu');
-    expect(sidemenu).not.toBeInTheDocument();
-  });
-
-  it('should not render when in kiosk mode is full', async () => {
-    setup();
-
-    act(() => locationService.partial({ kiosk: '1' }));
-    const sidemenu = screen.queryByTestId('sidemenu');
-    expect(sidemenu).not.toBeInTheDocument();
-  });
-});
diff --git a/public/app/core/components/NavBar/NavBar.tsx b/public/app/core/components/NavBar/NavBar.tsx
deleted file mode 100644
index a3700c5f788..00000000000
--- a/public/app/core/components/NavBar/NavBar.tsx
+++ /dev/null
@@ -1,296 +0,0 @@
-import { css, cx } from '@emotion/css';
-import { FocusScope } from '@react-aria/focus';
-import { Location as HistoryLocation } from 'history';
-import { cloneDeep } from 'lodash';
-import React, { useState } from 'react';
-import { useLocation } from 'react-router-dom';
-
-import { GrafanaTheme2, locationUtil, NavModelItem, NavSection, textUtil } from '@grafana/data';
-import { config, locationSearchToObject, locationService, reportInteraction } from '@grafana/runtime';
-import { useTheme2, CustomScrollbar, IconButton } from '@grafana/ui';
-import { getKioskMode } from 'app/core/navigation/kiosk';
-import { useSelector } from 'app/types';
-
-import NavBarItem from './NavBarItem';
-import { NavBarItemIcon } from './NavBarItemIcon';
-import { NavBarItemWithoutMenu } from './NavBarItemWithoutMenu';
-import { NavBarMenu } from './NavBarMenu';
-import { NavBarMenuPortalContainer } from './NavBarMenuPortalContainer';
-import { NavBarToggle } from './NavBarToggle';
-import { NavBarContext } from './context';
-import {
-  enrichConfigItems,
-  enrichWithInteractionTracking,
-  getActiveItem,
-  isMatchOrChildMatch,
-  isSearchActive,
-  SEARCH_ITEM_ID,
-} from './utils';
-
-const onOpenSearch = () => {
-  locationService.partial({ search: 'open' });
-};
-
-export const NavBar = React.memo(() => {
-  const navBarTree = useSelector((state) => state.navBarTree);
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-  const location = useLocation();
-  const [menuOpen, setMenuOpen] = useState(false);
-  const [menuAnimationInProgress, setMenuAnimationInProgress] = useState(false);
-  const [menuIdOpen, setMenuIdOpen] = useState<string | undefined>(undefined);
-
-  // Here we need to hack in a "home" and "search" NavModelItem since this is constructed in the frontend
-  const searchItem: NavModelItem = enrichWithInteractionTracking(
-    {
-      id: SEARCH_ITEM_ID,
-      onClick: onOpenSearch,
-      text: 'Search dashboards',
-      icon: 'search',
-    },
-    menuOpen
-  );
-
-  let homeUrl = config.appSubUrl || '/';
-  if (!config.bootData.user.isSignedIn && !config.anonymousEnabled) {
-    homeUrl = textUtil.sanitizeUrl(locationUtil.getUrlForPartial(location, { forceLogin: 'true' }));
-  }
-
-  const homeItem: NavModelItem = enrichWithInteractionTracking(
-    {
-      id: 'home',
-      text: 'Home',
-      url: homeUrl,
-      icon: 'grafana',
-    },
-    menuOpen
-  );
-
-  const navTree = cloneDeep(navBarTree).filter((item) => item.hideFromMenu !== true);
-
-  const coreItems = navTree
-    .filter((item) => item.section === NavSection.Core)
-    .map((item) => enrichWithInteractionTracking(item, menuOpen));
-  const pluginItems = navTree
-    .filter((item) => item.section === NavSection.Plugin)
-    .map((item) => enrichWithInteractionTracking(item, menuOpen));
-  const configItems = enrichConfigItems(
-    navTree.filter((item) => item.section === NavSection.Config),
-    location
-  ).map((item) => enrichWithInteractionTracking(item, menuOpen));
-
-  const activeItem = isSearchActive(location) ? searchItem : getActiveItem(navTree, location.pathname);
-
-  if (shouldHideNavBar(location)) {
-    return null;
-  }
-
-  return (
-    <div className={styles.navWrapper}>
-      <nav className={cx(styles.sidemenu, 'sidemenu')} data-testid="sidemenu" aria-label="Main menu">
-        <NavBarContext.Provider
-          value={{
-            menuIdOpen: menuIdOpen,
-            setMenuIdOpen: setMenuIdOpen,
-          }}
-        >
-          <FocusScope>
-            <div className={styles.mobileSidemenuLogo} key="hamburger">
-              <IconButton
-                name="bars"
-                tooltip="Toggle menu"
-                tooltipPlacement="bottom"
-                size="xl"
-                onClick={() => setMenuOpen(!menuOpen)}
-              />
-            </div>
-
-            <NavBarToggle
-              className={styles.menuExpandIcon}
-              isExpanded={menuOpen}
-              onClick={() => {
-                reportInteraction('grafana_navigation_expanded');
-                setMenuOpen(true);
-              }}
-            />
-
-            <NavBarMenuPortalContainer />
-
-            <NavBarItemWithoutMenu
-              elClassName={styles.grafanaLogoInner}
-              label={homeItem.text}
-              className={styles.grafanaLogo}
-              url={homeItem.url}
-              onClick={homeItem.onClick}
-            >
-              <NavBarItemIcon link={homeItem} />
-            </NavBarItemWithoutMenu>
-
-            <CustomScrollbar hideHorizontalTrack hideVerticalTrack showScrollIndicators>
-              <ul className={styles.itemList}>
-                <NavBarItem className={styles.search} isActive={activeItem === searchItem} link={searchItem} />
-
-                {coreItems.map((link, index) => (
-                  <NavBarItem
-                    key={`${link.id}-${index}`}
-                    isActive={isMatchOrChildMatch(link, activeItem)}
-                    link={{ ...link, subTitle: undefined }}
-                  />
-                ))}
-
-                {pluginItems.length > 0 &&
-                  pluginItems.map((link, index) => (
-                    <NavBarItem
-                      key={`${link.id}-${index}`}
-                      isActive={isMatchOrChildMatch(link, activeItem)}
-                      link={link}
-                    />
-                  ))}
-
-                {configItems.map((link, index) => (
-                  <NavBarItem
-                    key={`${link.id}-${index}`}
-                    isActive={isMatchOrChildMatch(link, activeItem)}
-                    reverseMenuDirection
-                    link={link}
-                    className={cx({ [styles.verticalSpacer]: index === 0 })}
-                  />
-                ))}
-              </ul>
-            </CustomScrollbar>
-          </FocusScope>
-        </NavBarContext.Provider>
-      </nav>
-      {(menuOpen || menuAnimationInProgress) && (
-        <div className={styles.menuWrapper}>
-          <NavBarMenu
-            activeItem={activeItem}
-            isOpen={menuOpen}
-            setMenuAnimationInProgress={setMenuAnimationInProgress}
-            navItems={[homeItem, searchItem, ...coreItems, ...pluginItems, ...configItems]}
-            onClose={() => setMenuOpen(false)}
-          />
-        </div>
-      )}
-    </div>
-  );
-});
-
-function shouldHideNavBar(location: HistoryLocation) {
-  const queryParams = locationSearchToObject(location.search);
-
-  if (getKioskMode(queryParams)) {
-    return true;
-  }
-
-  // Temporary, can be removed after topnav is made permanent
-  if ((location.pathname.indexOf('/d/') === 0 && queryParams.editview) || queryParams.editPanel) {
-    return true;
-  }
-
-  return false;
-}
-
-NavBar.displayName = 'NavBar';
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  navWrapper: css({
-    position: 'relative',
-    display: 'flex',
-  }),
-  sidemenu: css({
-    label: 'sidemenu',
-    display: 'flex',
-    flexDirection: 'column',
-    backgroundColor: theme.colors.background.primary,
-    zIndex: theme.zIndex.sidemenu,
-    padding: `${theme.spacing(1)} 0`,
-    position: 'relative',
-    width: theme.components.sidemenu.width,
-    borderRight: `1px solid ${theme.colors.border.weak}`,
-
-    [theme.breakpoints.down('md')]: {
-      height: theme.spacing(7),
-      position: 'fixed',
-      paddingTop: '0px',
-      backgroundColor: 'inherit',
-      borderRight: 0,
-    },
-  }),
-  mobileSidemenuLogo: css({
-    alignItems: 'center',
-    display: 'flex',
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    padding: theme.spacing(2),
-
-    [theme.breakpoints.up('md')]: {
-      display: 'none',
-    },
-  }),
-  itemList: css({
-    backgroundColor: 'inherit',
-    display: 'flex',
-    flexDirection: 'column',
-    height: '100%',
-
-    [theme.breakpoints.down('md')]: {
-      visibility: 'hidden',
-    },
-  }),
-  grafanaLogo: css({
-    alignItems: 'stretch',
-    display: 'flex',
-    flexShrink: 0,
-    height: theme.spacing(6),
-    justifyContent: 'stretch',
-
-    [theme.breakpoints.down('md')]: {
-      visibility: 'hidden',
-    },
-  }),
-  grafanaLogoInner: css({
-    alignItems: 'center',
-    display: 'flex',
-    height: '100%',
-    justifyContent: 'center',
-    width: '100%',
-
-    '> div': {
-      height: 'auto',
-      width: 'auto',
-    },
-  }),
-  search: css({
-    display: 'none',
-    marginTop: 0,
-
-    [theme.breakpoints.up('md')]: {
-      display: 'grid',
-    },
-  }),
-  verticalSpacer: css({
-    marginTop: 'auto',
-  }),
-  hideFromMobile: css({
-    [theme.breakpoints.down('md')]: {
-      display: 'none',
-    },
-  }),
-  menuWrapper: css({
-    position: 'fixed',
-    display: 'grid',
-    gridAutoFlow: 'column',
-    height: '100%',
-    zIndex: theme.zIndex.sidemenu,
-  }),
-  menuExpandIcon: css({
-    position: 'absolute',
-    top: '43px',
-    right: '0px',
-    transform: `translateX(50%)`,
-  }),
-  menuPortalContainer: css({
-    zIndex: theme.zIndex.sidemenu,
-  }),
-});
diff --git a/public/app/core/components/NavBar/NavBarItem.test.tsx b/public/app/core/components/NavBar/NavBarItem.test.tsx
deleted file mode 100644
index fe89f225b39..00000000000
--- a/public/app/core/components/NavBar/NavBarItem.test.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { BrowserRouter } from 'react-router-dom';
-
-import { locationUtil } from '@grafana/data';
-import { config, LocationService, setLocationService } from '@grafana/runtime';
-
-// Need to mock createBrowserHistory here to avoid errors
-jest.mock('history', () => ({
-  ...jest.requireActual('history'),
-  createBrowserHistory: () => ({
-    listen: jest.fn(),
-    location: {},
-    createHref: jest.fn(),
-  }),
-}));
-
-import NavBarItem, { Props } from './NavBarItem';
-import { NavBarContext } from './context';
-
-const onClickMock = jest.fn();
-const setMenuIdOpenMock = jest.fn();
-const defaults: Props = {
-  link: {
-    text: 'Parent Node',
-    onClick: onClickMock,
-    children: [
-      { text: 'Child Node 1', onClick: onClickMock, children: [] },
-      { text: 'Child Node 2', onClick: onClickMock, children: [] },
-    ],
-    id: 'MY_NAV_ID',
-  },
-};
-
-async function getTestContext(overrides: Partial<Props> = {}, subUrl = '', isMenuOpen = false) {
-  jest.clearAllMocks();
-  config.appSubUrl = subUrl;
-  locationUtil.initialize({ config, getTimeRangeForUrl: jest.fn(), getVariablesUrlParams: jest.fn() });
-  const pushMock = jest.fn();
-  const locationService = { push: pushMock } as unknown as LocationService;
-  setLocationService(locationService);
-  const props = { ...defaults, ...overrides };
-
-  const { rerender } = render(
-    <BrowserRouter>
-      <NavBarContext.Provider
-        value={{
-          menuIdOpen: isMenuOpen ? props.link.id : undefined,
-          setMenuIdOpen: setMenuIdOpenMock,
-        }}
-      >
-        <NavBarItem {...props} />
-      </NavBarContext.Provider>
-    </BrowserRouter>
-  );
-
-  // Need to click this first to set the correct selection range
-  // see https://github.com/testing-library/user-event/issues/901#issuecomment-1087192424
-  await userEvent.click(document.body);
-  return { rerender, pushMock };
-}
-
-describe('NavBarItem', () => {
-  describe('when url property is not set', () => {
-    it('then it renders the menu trigger as a button', async () => {
-      await getTestContext();
-
-      expect(screen.getAllByRole('button')).toHaveLength(1);
-    });
-
-    describe('and clicking on the menu trigger button', () => {
-      it('then the onClick handler should be called', async () => {
-        await getTestContext();
-
-        await userEvent.click(screen.getByRole('button'));
-        expect(onClickMock).toHaveBeenCalledTimes(1);
-      });
-    });
-
-    describe('and hovering over the menu trigger button', () => {
-      it('then the menuIdOpen should be set correctly', async () => {
-        await getTestContext();
-
-        await userEvent.hover(screen.getByRole('button'));
-        expect(setMenuIdOpenMock).toHaveBeenCalledWith(defaults.link.id);
-      });
-    });
-
-    describe('and tabbing to the menu trigger button', () => {
-      it('then the menuIdOpen should be set correctly', async () => {
-        await getTestContext();
-
-        await userEvent.tab();
-        expect(setMenuIdOpenMock).toHaveBeenCalledWith(defaults.link.id);
-      });
-    });
-
-    it('shows the menu when the correct menuIdOpen is set', async () => {
-      await getTestContext(undefined, undefined, true);
-
-      expect(screen.getByText('Parent Node')).toBeInTheDocument();
-      expect(screen.getByText('Child Node 1')).toBeInTheDocument();
-      expect(screen.getByText('Child Node 2')).toBeInTheDocument();
-    });
-
-    describe('and pressing arrow right on the menu trigger button', () => {
-      it('then the correct menu item should receive focus', async () => {
-        await getTestContext(undefined, undefined, true);
-
-        await userEvent.tab();
-        expect(screen.getAllByRole('menuitem')).toHaveLength(3);
-        expect(screen.getByRole('menuitem', { name: 'Parent Node' })).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[1]).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[2]).toHaveAttribute('tabIndex', '-1');
-
-        await userEvent.keyboard('{ArrowRight}');
-        expect(screen.getAllByRole('menuitem')).toHaveLength(3);
-        expect(screen.getAllByRole('menuitem')[0]).toHaveAttribute('tabIndex', '0');
-        expect(screen.getAllByRole('menuitem')[1]).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[2]).toHaveAttribute('tabIndex', '-1');
-      });
-    });
-  });
-
-  describe('when url property is set', () => {
-    it('then it renders the menu trigger as a link', async () => {
-      await getTestContext({ link: { ...defaults.link, url: 'https://www.grafana.com' } });
-
-      expect(screen.getAllByRole('link')).toHaveLength(1);
-      expect(screen.getByRole('link')).toHaveAttribute('href', 'https://www.grafana.com');
-    });
-
-    describe('and hovering over the menu trigger link', () => {
-      it('sets the correct menuIdOpen', async () => {
-        await getTestContext({ link: { ...defaults.link, url: 'https://www.grafana.com' } });
-
-        await userEvent.hover(screen.getByRole('link'));
-
-        expect(setMenuIdOpenMock).toHaveBeenCalledWith(defaults.link.id);
-      });
-    });
-
-    describe('and tabbing to the menu trigger link', () => {
-      it('sets the correct menuIdOpen', async () => {
-        await getTestContext({ link: { ...defaults.link, url: 'https://www.grafana.com' } });
-
-        await userEvent.tab();
-
-        expect(setMenuIdOpenMock).toHaveBeenCalledWith(defaults.link.id);
-      });
-    });
-
-    it('shows the menu when the correct menuIdOpen is set', async () => {
-      await getTestContext({ link: { ...defaults.link, url: 'https://www.grafana.com' } }, undefined, true);
-
-      expect(screen.getByText('Parent Node')).toBeInTheDocument();
-      expect(screen.getByText('Child Node 1')).toBeInTheDocument();
-      expect(screen.getByText('Child Node 2')).toBeInTheDocument();
-    });
-
-    describe('and pressing arrow right on the menu trigger link', () => {
-      it('then the correct menu item should receive focus', async () => {
-        await getTestContext({ link: { ...defaults.link, url: 'https://www.grafana.com' } }, undefined, true);
-
-        await userEvent.tab();
-        expect(screen.getAllByRole('link')[0]).toHaveFocus();
-        expect(screen.getAllByRole('menuitem')).toHaveLength(3);
-        expect(screen.getAllByRole('menuitem')[0]).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[1]).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[2]).toHaveAttribute('tabIndex', '-1');
-
-        await userEvent.keyboard('{ArrowRight}');
-        expect(screen.getAllByRole('link')[0]).not.toHaveFocus();
-        expect(screen.getAllByRole('menuitem')).toHaveLength(3);
-        expect(screen.getAllByRole('menuitem')[0]).toHaveAttribute('tabIndex', '0');
-        expect(screen.getAllByRole('menuitem')[1]).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[2]).toHaveAttribute('tabIndex', '-1');
-      });
-    });
-
-    describe('and pressing arrow left on a menu item', () => {
-      it('then the nav bar item should receive focus', async () => {
-        await getTestContext({ link: { ...defaults.link, url: 'https://www.grafana.com' } }, undefined, true);
-
-        await userEvent.tab();
-        await userEvent.keyboard('{ArrowRight}');
-        expect(screen.getAllByRole('link')[0]).not.toHaveFocus();
-        expect(screen.getAllByRole('menuitem')).toHaveLength(3);
-        expect(screen.getAllByRole('menuitem')[0]).toHaveAttribute('tabIndex', '0');
-        expect(screen.getAllByRole('menuitem')[1]).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[2]).toHaveAttribute('tabIndex', '-1');
-
-        await userEvent.keyboard('{ArrowLeft}');
-        expect(screen.getAllByRole('link')[0]).toHaveFocus();
-        expect(screen.getAllByRole('menuitem')).toHaveLength(3);
-        expect(screen.getAllByRole('menuitem')[0]).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[1]).toHaveAttribute('tabIndex', '-1');
-        expect(screen.getAllByRole('menuitem')[2]).toHaveAttribute('tabIndex', '-1');
-      });
-    });
-
-    describe('when appSubUrl is configured and user clicks on menuitem link', () => {
-      it('then location service should be called with correct url', async () => {
-        const { pushMock } = await getTestContext(
-          {
-            link: {
-              ...defaults.link,
-              url: 'https://www.grafana.com',
-              children: [{ text: 'New', url: '/grafana/dashboard/new', children: [] }],
-            },
-          },
-          '/grafana',
-          true
-        );
-
-        await userEvent.click(screen.getByText('New'));
-        await waitFor(() => {
-          expect(pushMock).toHaveBeenCalledTimes(1);
-          expect(pushMock).toHaveBeenCalledWith('/dashboard/new');
-        });
-      });
-    });
-
-    describe('when appSubUrl is not configured and user clicks on menuitem link', () => {
-      it('then location service should be called with correct url', async () => {
-        const { pushMock } = await getTestContext(
-          {
-            link: {
-              ...defaults.link,
-              url: 'https://www.grafana.com',
-              children: [{ text: 'New', url: '/grafana/dashboard/new', children: [] }],
-            },
-          },
-          undefined,
-          true
-        );
-
-        await userEvent.click(screen.getByText('New'));
-        await waitFor(() => {
-          expect(pushMock).toHaveBeenCalledTimes(1);
-          expect(pushMock).toHaveBeenCalledWith('/grafana/dashboard/new');
-        });
-      });
-    });
-  });
-});
diff --git a/public/app/core/components/NavBar/NavBarItem.tsx b/public/app/core/components/NavBar/NavBarItem.tsx
deleted file mode 100644
index 906840fb9d8..00000000000
--- a/public/app/core/components/NavBar/NavBarItem.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { css, cx } from '@emotion/css';
-import { Item } from '@react-stately/collections';
-import React from 'react';
-
-import { GrafanaTheme2, locationUtil, NavMenuItemType, NavModelItem } from '@grafana/data';
-import { locationService } from '@grafana/runtime';
-import { toIconName, useTheme2 } from '@grafana/ui';
-
-import { NavBarItemMenu } from './NavBarItemMenu';
-import { NavBarItemMenuTrigger } from './NavBarItemMenuTrigger';
-import { getNavBarItemWithoutMenuStyles } from './NavBarItemWithoutMenu';
-import { NavBarMenuItem } from './NavBarMenuItem';
-import { useNavBarContext } from './context';
-import { getNavModelItemKey } from './utils';
-
-export interface Props {
-  isActive?: boolean;
-  className?: string;
-  reverseMenuDirection?: boolean;
-  link: NavModelItem;
-}
-
-const NavBarItem = ({ isActive = false, className, reverseMenuDirection = false, link }: Props) => {
-  const theme = useTheme2();
-  const menuItems = link.children ?? [];
-  const { menuIdOpen } = useNavBarContext();
-
-  // Spreading `menuItems` here as otherwise we'd be mutating props
-  const menuItemsSorted = reverseMenuDirection ? [...menuItems].reverse() : menuItems;
-  const filteredItems = menuItemsSorted
-    .filter((item) => !item.hideFromMenu)
-    .map((i) => ({ ...i, menuItemType: NavMenuItemType.Item }));
-  const adjustHeightForBorder = filteredItems.length === 0;
-  const styles = getStyles(theme, adjustHeightForBorder, isActive);
-  const section: NavModelItem = {
-    ...link,
-    children: filteredItems,
-    menuItemType: NavMenuItemType.Section,
-  };
-  const items: NavModelItem[] = [section].concat(filteredItems);
-
-  const onNavigate = (item: NavModelItem) => {
-    const { url, target, onClick } = item;
-    onClick?.();
-
-    if (url) {
-      if (!target && url.startsWith('/')) {
-        locationService.push(locationUtil.stripBaseFromUrl(url));
-      } else {
-        window.open(url, target);
-      }
-    }
-  };
-
-  return (
-    <li className={cx(styles.container, { [styles.containerHover]: section.id === menuIdOpen }, className)}>
-      <NavBarItemMenuTrigger
-        item={section}
-        isActive={isActive}
-        label={link.text}
-        reverseMenuDirection={reverseMenuDirection}
-      >
-        <NavBarItemMenu
-          items={items}
-          reverseMenuDirection={reverseMenuDirection}
-          adjustHeightForBorder={adjustHeightForBorder}
-          disabledKeys={['divider', 'subtitle']}
-          aria-label={section.text}
-          onNavigate={onNavigate}
-        >
-          {(item: NavModelItem) => {
-            const isSection = item.menuItemType === NavMenuItemType.Section;
-            const iconName = item.icon ? toIconName(item.icon) : undefined;
-            const icon = item.showIconInNavbar && !isSection ? iconName : undefined;
-
-            return (
-              <Item key={getNavModelItemKey(item)} textValue={item.text}>
-                <NavBarMenuItem
-                  isDivider={!isSection && item.divider}
-                  icon={icon}
-                  target={item.target}
-                  text={item.text}
-                  url={item.url}
-                  onClick={item.onClick}
-                  styleOverrides={cx(styles.primaryText, { [styles.header]: isSection })}
-                />
-              </Item>
-            );
-          }}
-        </NavBarItemMenu>
-      </NavBarItemMenuTrigger>
-    </li>
-  );
-};
-
-export default NavBarItem;
-
-const getStyles = (theme: GrafanaTheme2, adjustHeightForBorder: boolean, isActive?: boolean) => ({
-  ...getNavBarItemWithoutMenuStyles(theme, isActive),
-  containerHover: css({
-    backgroundColor: theme.colors.action.hover,
-    color: theme.colors.text.primary,
-  }),
-  primaryText: css({
-    color: theme.colors.text.primary,
-  }),
-  header: css({
-    height: `calc(${theme.spacing(6)} - ${adjustHeightForBorder ? 2 : 1}px)`,
-    fontSize: theme.typography.h4.fontSize,
-    fontWeight: theme.typography.h4.fontWeight,
-    padding: `${theme.spacing(1)} ${theme.spacing(2)}`,
-    whiteSpace: 'nowrap',
-    width: '100%',
-  }),
-});
diff --git a/public/app/core/components/NavBar/NavBarItemMenu.tsx b/public/app/core/components/NavBar/NavBarItemMenu.tsx
deleted file mode 100644
index caeda7e2f8e..00000000000
--- a/public/app/core/components/NavBar/NavBarItemMenu.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { css } from '@emotion/css';
-import { useMenu } from '@react-aria/menu';
-import { mergeProps } from '@react-aria/utils';
-import { useTreeState } from '@react-stately/tree';
-import { SpectrumMenuProps } from '@react-types/menu';
-import React, { ReactElement, useEffect, useRef } from 'react';
-
-import { GrafanaTheme2, NavMenuItemType, NavModelItem } from '@grafana/data';
-import { CustomScrollbar, useTheme2 } from '@grafana/ui';
-
-import { NavBarItemMenuItem } from './NavBarItemMenuItem';
-import { useNavBarItemMenuContext } from './context';
-import { getNavModelItemKey } from './utils';
-
-export interface NavBarItemMenuProps extends SpectrumMenuProps<NavModelItem> {
-  onNavigate: (item: NavModelItem) => void;
-  adjustHeightForBorder: boolean;
-  reverseMenuDirection?: boolean;
-}
-
-export function NavBarItemMenu(props: NavBarItemMenuProps): ReactElement | null {
-  const { reverseMenuDirection, adjustHeightForBorder, disabledKeys, onNavigate, ...rest } = props;
-  const contextProps = useNavBarItemMenuContext();
-  const completeProps = {
-    ...mergeProps(contextProps, rest),
-  };
-  const { menuHasFocus, menuProps: contextMenuProps = {} } = contextProps;
-  const theme = useTheme2();
-  const styles = getStyles(theme, reverseMenuDirection);
-  const state = useTreeState<NavModelItem>({ ...rest, disabledKeys });
-  const ref = useRef(null);
-  const { menuProps } = useMenu(completeProps, { ...state }, ref);
-  const allItems = [...state.collection];
-  const items = allItems.filter((item) => item.value.menuItemType === NavMenuItemType.Item);
-  const section = allItems.find((item) => item.value.menuItemType === NavMenuItemType.Section);
-
-  useEffect(() => {
-    if (menuHasFocus && !state.selectionManager.isFocused) {
-      state.selectionManager.setFocusedKey(section?.key ?? '');
-      state.selectionManager.setFocused(true);
-    } else if (!menuHasFocus) {
-      state.selectionManager.setFocused(false);
-      state.selectionManager.setFocusedKey('');
-      state.selectionManager.clearSelection();
-    }
-  }, [menuHasFocus, state.selectionManager, reverseMenuDirection, section?.key]);
-
-  if (!section) {
-    return null;
-  }
-
-  const menuSubTitle = section.value.subTitle;
-
-  const headerComponent = <NavBarItemMenuItem key={section.key} item={section} state={state} onNavigate={onNavigate} />;
-
-  const itemComponents = items.map((item) => (
-    <NavBarItemMenuItem key={getNavModelItemKey(item.value)} item={item} state={state} onNavigate={onNavigate} />
-  ));
-
-  if (itemComponents.length === 0 && section.value.emptyMessage) {
-    itemComponents.push(
-      <div key="empty-message" className={styles.emptyMessage}>
-        {section.value.emptyMessage}
-      </div>
-    );
-  }
-
-  const subTitleComponent = menuSubTitle && (
-    <li key={menuSubTitle} className={styles.subtitle}>
-      {menuSubTitle}
-    </li>
-  );
-
-  const contents = [itemComponents, subTitleComponent];
-  const contentComponent = (
-    <CustomScrollbar hideHorizontalTrack hideVerticalTrack showScrollIndicators key="scrollContainer">
-      {reverseMenuDirection ? contents.reverse() : contents}
-    </CustomScrollbar>
-  );
-
-  const menu = [headerComponent, contentComponent];
-
-  return (
-    <ul className={styles.menu} ref={ref} {...mergeProps(menuProps, contextMenuProps)} tabIndex={-1}>
-      {reverseMenuDirection ? menu.reverse() : menu}
-    </ul>
-  );
-}
-
-function getStyles(theme: GrafanaTheme2, reverseDirection?: boolean) {
-  return {
-    menu: css`
-      background-color: ${theme.colors.background.primary};
-      border: 1px solid ${theme.components.panel.borderColor};
-      box-shadow: ${theme.shadows.z3};
-      display: flex;
-      flex-direction: column;
-      list-style: none;
-      max-height: 400px;
-      max-width: 300px;
-      min-width: 140px;
-      transition: ${theme.transitions.create('opacity')};
-      z-index: ${theme.zIndex.sidemenu};
-    `,
-    subtitle: css`
-      background-color: transparent;
-      border-${reverseDirection ? 'bottom' : 'top'}: 1px solid ${theme.colors.border.weak};
-      color: ${theme.colors.text.secondary};
-      font-size: ${theme.typography.bodySmall.fontSize};
-      font-weight: ${theme.typography.bodySmall.fontWeight};
-      padding: ${theme.spacing(1)} ${theme.spacing(2)} ${theme.spacing(1)};
-      text-align: left;
-      white-space: nowrap;
-    `,
-    emptyMessage: css`
-      font-style: italic;
-      padding: ${theme.spacing(0.5, 2)};
-    `,
-  };
-}
diff --git a/public/app/core/components/NavBar/NavBarItemMenuItem.tsx b/public/app/core/components/NavBar/NavBarItemMenuItem.tsx
deleted file mode 100644
index 5ad0f769bbc..00000000000
--- a/public/app/core/components/NavBar/NavBarItemMenuItem.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { css } from '@emotion/css';
-import { useFocus, useKeyboard } from '@react-aria/interactions';
-import { useMenuItem } from '@react-aria/menu';
-import { mergeProps } from '@react-aria/utils';
-import { TreeState } from '@react-stately/tree';
-import { Node } from '@react-types/shared';
-import React, { ReactElement, useRef, useState } from 'react';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { useTheme2 } from '@grafana/ui';
-
-import { useNavBarItemMenuContext, useNavBarContext } from './context';
-
-export interface NavBarItemMenuItemProps {
-  item: Node<NavModelItem>;
-  state: TreeState<NavModelItem>;
-  onNavigate: (item: NavModelItem) => void;
-}
-
-export function NavBarItemMenuItem({ item, state, onNavigate }: NavBarItemMenuItemProps): ReactElement {
-  const { onClose, onLeft } = useNavBarItemMenuContext();
-  const { setMenuIdOpen } = useNavBarContext();
-  const { key, rendered } = item;
-  const ref = useRef<HTMLLIElement>(null);
-  const isDisabled = state.disabledKeys.has(key);
-
-  // style to the focused menu item
-  const [isFocused, setFocused] = useState(false);
-  const { focusProps } = useFocus({ onFocusChange: setFocused, isDisabled });
-  const theme = useTheme2();
-  const isSection = item.value.menuItemType === 'section';
-  const styles = getStyles(theme, isFocused, isSection);
-  const onAction = () => {
-    setMenuIdOpen(undefined);
-    onNavigate(item.value);
-    onClose();
-  };
-
-  let { menuItemProps } = useMenuItem(
-    {
-      isDisabled,
-      'aria-label': item['aria-label'],
-      key,
-      closeOnSelect: true,
-      onClose,
-      onAction,
-    },
-    state,
-    ref
-  );
-
-  const { keyboardProps } = useKeyboard({
-    onKeyDown: (e) => {
-      if (e.key === 'ArrowLeft') {
-        onLeft();
-      }
-      e.continuePropagation();
-    },
-  });
-
-  return (
-    <>
-      <li {...mergeProps(menuItemProps, focusProps, keyboardProps)} ref={ref} className={styles.menuItem}>
-        {rendered}
-      </li>
-    </>
-  );
-}
-
-function getStyles(theme: GrafanaTheme2, isFocused: boolean, isSection: boolean) {
-  let backgroundColor = 'transparent';
-  if (isFocused) {
-    backgroundColor = theme.colors.action.hover;
-  } else if (isSection) {
-    backgroundColor = theme.colors.background.secondary;
-  }
-  return {
-    menuItem: css`
-      background-color: ${backgroundColor};
-      color: ${theme.colors.text.primary};
-
-      &:focus-visible {
-        background-color: ${theme.colors.action.hover};
-        box-shadow: none;
-        color: ${theme.colors.text.primary};
-        outline: 2px solid ${theme.colors.primary.main};
-        outline-offset: -2px;
-        transition: none;
-      }
-    `,
-  };
-}
diff --git a/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx b/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx
deleted file mode 100644
index f9f22171407..00000000000
--- a/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx
+++ /dev/null
@@ -1,254 +0,0 @@
-import { css, cx } from '@emotion/css';
-import { useButton } from '@react-aria/button';
-import { useDialog } from '@react-aria/dialog';
-import { FocusScope } from '@react-aria/focus';
-import { useFocusWithin, useHover, useKeyboard } from '@react-aria/interactions';
-import { useMenuTrigger } from '@react-aria/menu';
-import { DismissButton, OverlayContainer, useOverlay, useOverlayPosition } from '@react-aria/overlays';
-import { useMenuTriggerState } from '@react-stately/menu';
-import { MenuTriggerProps } from '@react-types/menu';
-import React, { ReactElement, useEffect, useState } from 'react';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { reportExperimentView } from '@grafana/runtime';
-import { Link, useTheme2 } from '@grafana/ui';
-
-import { NavBarItemIcon } from './NavBarItemIcon';
-import { getNavMenuPortalContainer } from './NavBarMenuPortalContainer';
-import { NavFeatureHighlight } from './NavFeatureHighlight';
-import { NavBarItemMenuContext, useNavBarContext } from './context';
-
-export interface NavBarItemMenuTriggerProps extends MenuTriggerProps {
-  children: ReactElement;
-  item: NavModelItem;
-  isActive?: boolean;
-  label: string;
-  reverseMenuDirection: boolean;
-}
-
-export function NavBarItemMenuTrigger(props: NavBarItemMenuTriggerProps): ReactElement {
-  const { item, isActive, label, children: menu, reverseMenuDirection, ...rest } = props;
-  const [menuHasFocus, setMenuHasFocus] = useState(false);
-  const { menuIdOpen, setMenuIdOpen } = useNavBarContext();
-  const theme = useTheme2();
-  const styles = getStyles(theme, isActive);
-
-  // Create state based on the incoming props
-  const state = useMenuTriggerState({ ...rest });
-
-  // Get props for the menu trigger and menu elements
-  const ref = React.useRef<HTMLElement>(null);
-  const { menuTriggerProps, menuProps } = useMenuTrigger({}, state, ref);
-
-  useEffect(() => {
-    if (item.highlightId) {
-      reportExperimentView(`feature-highlights-${item.highlightId}-nav`, 'test', '');
-    }
-  }, [item.highlightId]);
-
-  const { hoverProps } = useHover({
-    onHoverChange: (isHovering) => {
-      if (isHovering) {
-        state.open();
-        setMenuIdOpen(item.id);
-      } else {
-        state.close();
-        setMenuIdOpen(undefined);
-      }
-    },
-  });
-
-  useEffect(() => {
-    // close the menu when changing submenus
-    if (menuIdOpen !== item.id) {
-      state.close();
-      setMenuHasFocus(false);
-    } else {
-      state.open();
-    }
-  }, [menuIdOpen, state, item.id]);
-
-  const { keyboardProps } = useKeyboard({
-    onKeyDown: (e) => {
-      switch (e.key) {
-        case 'ArrowRight':
-          if (!state.isOpen) {
-            state.open();
-            setMenuIdOpen(item.id);
-          }
-          setMenuHasFocus(true);
-          break;
-        case 'Tab':
-          setMenuIdOpen(undefined);
-          break;
-        default:
-          break;
-      }
-    },
-  });
-
-  // Get props for the button based on the trigger props from useMenuTrigger
-  const { buttonProps } = useButton(menuTriggerProps, ref);
-  const Wrapper = item.highlightText ? NavFeatureHighlight : React.Fragment;
-  const itemContent = (
-    <Wrapper>
-      <span className={styles.icon}>
-        <NavBarItemIcon link={item} />
-      </span>
-    </Wrapper>
-  );
-  let element = (
-    <button
-      className={styles.element}
-      {...buttonProps}
-      {...keyboardProps}
-      {...hoverProps}
-      ref={ref as React.RefObject<HTMLButtonElement>}
-      onClick={item?.onClick}
-      aria-label={label}
-    >
-      {itemContent}
-    </button>
-  );
-
-  if (item?.url) {
-    element =
-      !item.target && item.url.startsWith('/') ? (
-        <Link
-          {...buttonProps}
-          {...keyboardProps}
-          {...hoverProps}
-          ref={ref as React.RefObject<HTMLAnchorElement>}
-          href={item.url}
-          target={item.target}
-          onClick={item?.onClick}
-          className={styles.element}
-          aria-label={label}
-        >
-          {itemContent}
-        </Link>
-      ) : (
-        <a
-          href={item.url}
-          target={item.target}
-          onClick={item?.onClick}
-          {...buttonProps}
-          {...keyboardProps}
-          {...hoverProps}
-          ref={ref as React.RefObject<HTMLAnchorElement>}
-          className={styles.element}
-          aria-label={label}
-        >
-          {itemContent}
-        </a>
-      );
-  }
-
-  const overlayRef = React.useRef<HTMLDivElement>(null);
-  const { dialogProps } = useDialog({}, overlayRef);
-  const { overlayProps } = useOverlay(
-    {
-      onClose: () => {
-        state.close();
-        setMenuIdOpen(undefined);
-      },
-      isOpen: state.isOpen,
-      isDismissable: true,
-    },
-    overlayRef
-  );
-
-  let { overlayProps: overlayPositionProps } = useOverlayPosition({
-    targetRef: ref,
-    overlayRef,
-    placement: reverseMenuDirection ? 'right bottom' : 'right top',
-    isOpen: state.isOpen,
-  });
-
-  const { focusWithinProps } = useFocusWithin({
-    onFocusWithin: (e) => {
-      if (e.target.id === ref.current?.id) {
-        // If focussing on the trigger itself, set the menu id that is open
-        setMenuIdOpen(item.id);
-        state.open();
-      }
-      e.target.scrollIntoView?.({
-        block: 'nearest',
-      });
-    },
-    onBlurWithin: (e) => {
-      if (e.target?.getAttribute('role') === 'menuitem' && !overlayRef.current?.contains(e.relatedTarget)) {
-        // If it is blurring from a menuitem to an element outside the current overlay
-        // close the menu that is open
-        setMenuIdOpen(undefined);
-      }
-    },
-  });
-
-  return (
-    <div className={cx(styles.element, 'dropdown')} {...focusWithinProps}>
-      {element}
-      {state.isOpen && (
-        <OverlayContainer portalContainer={getNavMenuPortalContainer()}>
-          <NavBarItemMenuContext.Provider
-            value={{
-              menuProps,
-              menuHasFocus,
-              onClose: () => state.close(),
-              onLeft: () => {
-                setMenuHasFocus(false);
-                ref.current?.focus();
-              },
-            }}
-          >
-            <FocusScope restoreFocus>
-              <div {...overlayProps} {...overlayPositionProps} {...dialogProps} {...hoverProps} ref={overlayRef}>
-                <DismissButton onDismiss={() => state.close()} />
-                {menu}
-                <DismissButton onDismiss={() => state.close()} />
-              </div>
-            </FocusScope>
-          </NavBarItemMenuContext.Provider>
-        </OverlayContainer>
-      )}
-    </div>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2, isActive?: boolean) => ({
-  element: css({
-    backgroundColor: 'transparent',
-    border: 'none',
-    color: 'inherit',
-    display: 'grid',
-    padding: 0,
-    placeContent: 'center',
-    height: theme.spacing(6),
-    width: theme.spacing(7),
-
-    '&::before': {
-      display: isActive ? 'block' : 'none',
-      content: '" "',
-      position: 'absolute',
-      left: theme.spacing(1),
-      top: theme.spacing(1.5),
-      bottom: theme.spacing(1.5),
-      width: theme.spacing(0.5),
-      borderRadius: theme.shape.borderRadius(1),
-      backgroundImage: theme.colors.gradients.brandVertical,
-    },
-
-    '&:focus-visible': {
-      backgroundColor: theme.colors.action.hover,
-      boxShadow: 'none',
-      color: theme.colors.text.primary,
-      outline: `${theme.shape.borderRadius(1)} solid ${theme.colors.primary.main}`,
-      outlineOffset: `-${theme.shape.borderRadius(1)}`,
-      transition: 'none',
-    },
-  }),
-  icon: css({
-    height: '100%',
-    width: '100%',
-  }),
-});
diff --git a/public/app/core/components/NavBar/NavBarItemWithoutMenu.tsx b/public/app/core/components/NavBar/NavBarItemWithoutMenu.tsx
deleted file mode 100644
index e956b825bfd..00000000000
--- a/public/app/core/components/NavBar/NavBarItemWithoutMenu.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { ReactNode } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { Link, useTheme2 } from '@grafana/ui';
-
-import { NavFeatureHighlight } from './NavFeatureHighlight';
-
-export interface NavBarItemWithoutMenuProps {
-  label: string;
-  children: ReactNode;
-  className?: string;
-  elClassName?: string;
-  url?: string;
-  target?: string;
-  isActive?: boolean;
-  onClick?: () => void;
-  highlightText?: string;
-}
-
-export function NavBarItemWithoutMenu({
-  label,
-  children,
-  url,
-  target,
-  isActive = false,
-  onClick,
-  highlightText,
-  className,
-  elClassName,
-}: NavBarItemWithoutMenuProps) {
-  const theme = useTheme2();
-  const styles = getNavBarItemWithoutMenuStyles(theme, isActive);
-
-  const content = highlightText ? (
-    <NavFeatureHighlight>
-      <div className={styles.icon}>{children}</div>
-    </NavFeatureHighlight>
-  ) : (
-    <div className={styles.icon}>{children}</div>
-  );
-
-  const elStyle = cx(styles.element, elClassName);
-
-  const renderContents = () => {
-    if (!url) {
-      return (
-        <button className={elStyle} onClick={onClick} aria-label={label}>
-          {content}
-        </button>
-      );
-    } else if (!target && url.startsWith('/')) {
-      return (
-        <Link className={elStyle} href={url} target={target} aria-label={label} onClick={onClick} aria-haspopup="true">
-          {content}
-        </Link>
-      );
-    } else {
-      return (
-        <a href={url} target={target} className={elStyle} onClick={onClick} aria-label={label}>
-          {content}
-        </a>
-      );
-    }
-  };
-
-  return <div className={cx(styles.container, className)}>{renderContents()}</div>;
-}
-
-export function getNavBarItemWithoutMenuStyles(theme: GrafanaTheme2, isActive?: boolean) {
-  return {
-    container: css({
-      position: 'relative',
-      color: isActive ? theme.colors.text.primary : theme.colors.text.secondary,
-      display: 'grid',
-
-      '&:hover': {
-        backgroundColor: theme.colors.action.hover,
-        color: theme.colors.text.primary,
-      },
-    }),
-    element: css({
-      backgroundColor: 'transparent',
-      border: 'none',
-      color: 'inherit',
-      display: 'block',
-      padding: 0,
-      overflowWrap: 'anywhere',
-
-      '&::before': {
-        display: isActive ? 'block' : 'none',
-        content: "' '",
-        position: 'absolute',
-        left: theme.spacing(1),
-        top: theme.spacing(1.5),
-        bottom: theme.spacing(1.5),
-        width: theme.spacing(0.5),
-        borderRadius: theme.shape.borderRadius(1),
-        backgroundImage: theme.colors.gradients.brandVertical,
-      },
-
-      '&:focus-visible': {
-        backgroundColor: theme.colors.action.hover,
-        boxShadow: 'none',
-        color: theme.colors.text.primary,
-        outline: `${theme.shape.borderRadius(1)} solid ${theme.colors.primary.main}`,
-        outlineOffset: `-${theme.shape.borderRadius(1)}`,
-        transition: 'none',
-      },
-    }),
-
-    icon: css({
-      height: '100%',
-      width: '100%',
-    }),
-  };
-}
diff --git a/public/app/core/components/NavBar/NavBarMenu.test.tsx b/public/app/core/components/NavBar/NavBarMenu.test.tsx
deleted file mode 100644
index 14670f47ccd..00000000000
--- a/public/app/core/components/NavBar/NavBarMenu.test.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { render } from 'test/redux-rtl';
-
-import { NavModelItem } from '@grafana/data';
-
-import { NavBarMenu } from './NavBarMenu';
-
-// don't care about interaction tracking in our unit tests
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  reportInteraction: jest.fn(),
-}));
-
-describe('NavBarMenu', () => {
-  const mockOnClose = jest.fn();
-  const mockNavItems: NavModelItem[] = [];
-  const mockSetMenuAnimationInProgress = jest.fn();
-
-  beforeEach(() => {
-    render(
-      <NavBarMenu
-        isOpen
-        onClose={mockOnClose}
-        navItems={mockNavItems}
-        setMenuAnimationInProgress={mockSetMenuAnimationInProgress}
-      />
-    );
-  });
-
-  it('should render the component', () => {
-    const sidemenu = screen.getByTestId('navbarmenu');
-    expect(sidemenu).toBeInTheDocument();
-  });
-
-  it('has a close button', () => {
-    const closeButton = screen.getAllByRole('button', { name: 'Close navigation menu' });
-    // this is for mobile, will be hidden with display: none; on desktop
-    expect(closeButton[0]).toBeInTheDocument();
-    // this is for desktop, will be hidden with display: none; on mobile
-    expect(closeButton[1]).toBeInTheDocument();
-  });
-
-  it('clicking the close button calls the onClose callback', async () => {
-    const closeButton = screen.getAllByRole('button', { name: 'Close navigation menu' });
-    expect(closeButton[0]).toBeInTheDocument();
-    expect(closeButton[1]).toBeInTheDocument();
-    await userEvent.click(closeButton[0]);
-    expect(mockOnClose).toHaveBeenCalled();
-    await userEvent.click(closeButton[1]);
-    expect(mockOnClose).toHaveBeenCalled();
-  });
-});
diff --git a/public/app/core/components/NavBar/NavBarMenu.tsx b/public/app/core/components/NavBar/NavBarMenu.tsx
deleted file mode 100644
index d39ab6a4680..00000000000
--- a/public/app/core/components/NavBar/NavBarMenu.tsx
+++ /dev/null
@@ -1,467 +0,0 @@
-import { css, cx } from '@emotion/css';
-import { useDialog } from '@react-aria/dialog';
-import { FocusScope } from '@react-aria/focus';
-import { OverlayContainer, useOverlay } from '@react-aria/overlays';
-import React, { useRef } from 'react';
-import CSSTransition from 'react-transition-group/CSSTransition';
-import { useLocalStorage } from 'react-use';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
-import { CollapsableSection, CustomScrollbar, Icon, IconButton, toIconName, useStyles2, useTheme2 } from '@grafana/ui';
-
-import { NavBarItemIcon } from './NavBarItemIcon';
-import { NavBarItemWithoutMenu } from './NavBarItemWithoutMenu';
-import { NavBarMenuItem } from './NavBarMenuItem';
-import { NavBarToggle } from './NavBarToggle';
-import { NavFeatureHighlight } from './NavFeatureHighlight';
-import { isMatchOrChildMatch } from './utils';
-
-const MENU_WIDTH = '350px';
-
-export interface Props {
-  activeItem?: NavModelItem;
-  isOpen: boolean;
-  navItems: NavModelItem[];
-  setMenuAnimationInProgress: (isInProgress: boolean) => void;
-  onClose: () => void;
-}
-
-export function NavBarMenu({ activeItem, isOpen, navItems, onClose, setMenuAnimationInProgress }: Props) {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-  const ANIMATION_DURATION = theme.transitions.duration.standard;
-  const animStyles = getAnimStyles(theme, ANIMATION_DURATION);
-  const ref = useRef(null);
-  const backdropRef = useRef(null);
-  const { dialogProps } = useDialog({}, ref);
-
-  const { overlayProps, underlayProps } = useOverlay(
-    {
-      isDismissable: true,
-      isOpen,
-      onClose,
-    },
-    ref
-  );
-
-  return (
-    <OverlayContainer>
-      <FocusScope contain restoreFocus autoFocus>
-        <CSSTransition
-          nodeRef={ref}
-          onEnter={() => setMenuAnimationInProgress(true)}
-          onExited={() => setMenuAnimationInProgress(false)}
-          appear={isOpen}
-          in={isOpen}
-          classNames={animStyles.overlay}
-          timeout={ANIMATION_DURATION}
-        >
-          <div data-testid="navbarmenu" ref={ref} {...overlayProps} {...dialogProps} className={styles.container}>
-            <div className={styles.mobileHeader}>
-              <Icon name="bars" size="xl" />
-              <IconButton
-                aria-label="Close navigation menu"
-                name="times"
-                onClick={onClose}
-                size="xl"
-                variant="secondary"
-              />
-            </div>
-            <NavBarToggle
-              className={styles.menuCollapseIcon}
-              isExpanded={isOpen}
-              onClick={() => {
-                reportInteraction('grafana_navigation_collapsed');
-                onClose();
-              }}
-            />
-            <nav className={styles.content}>
-              <CustomScrollbar hideHorizontalTrack>
-                <ul className={styles.itemList}>
-                  {navItems.map((link) => (
-                    <NavItem link={link} onClose={onClose} activeItem={activeItem} key={link.text} />
-                  ))}
-                </ul>
-              </CustomScrollbar>
-            </nav>
-          </div>
-        </CSSTransition>
-      </FocusScope>
-      <CSSTransition
-        nodeRef={backdropRef}
-        appear={isOpen}
-        in={isOpen}
-        classNames={animStyles.backdrop}
-        timeout={ANIMATION_DURATION}
-      >
-        <div className={styles.backdrop} {...underlayProps} ref={backdropRef} />
-      </CSSTransition>
-    </OverlayContainer>
-  );
-}
-
-NavBarMenu.displayName = 'NavBarMenu';
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  backdrop: css({
-    backdropFilter: 'blur(1px)',
-    backgroundColor: theme.components.overlay.background,
-    bottom: 0,
-    left: 0,
-    position: 'fixed',
-    right: 0,
-    top: 0,
-    zIndex: theme.zIndex.modalBackdrop,
-  }),
-  container: css({
-    display: 'flex',
-    bottom: 0,
-    flexDirection: 'column',
-    left: 0,
-    paddingTop: theme.spacing(1),
-    marginRight: theme.spacing(1.5),
-    right: 0,
-    zIndex: theme.zIndex.modal,
-    position: 'fixed',
-    top: 0,
-    boxSizing: 'content-box',
-    [theme.breakpoints.up('md')]: {
-      borderRight: `1px solid ${theme.colors.border.weak}`,
-      right: 'unset',
-    },
-  }),
-  content: css({
-    display: 'flex',
-    flexDirection: 'column',
-    overflow: 'auto',
-  }),
-  mobileHeader: css({
-    borderBottom: `1px solid ${theme.colors.border.weak}`,
-    display: 'flex',
-    justifyContent: 'space-between',
-    padding: theme.spacing(1, 2, 2),
-    [theme.breakpoints.up('md')]: {
-      display: 'none',
-    },
-  }),
-  itemList: css({
-    display: 'grid',
-    gridAutoRows: `minmax(${theme.spacing(6)}, auto)`,
-    minWidth: MENU_WIDTH,
-  }),
-  menuCollapseIcon: css({
-    position: 'absolute',
-    top: '43px',
-    right: '0px',
-    transform: `translateX(50%)`,
-  }),
-});
-
-const getAnimStyles = (theme: GrafanaTheme2, animationDuration: number) => {
-  const commonTransition = {
-    transitionDuration: `${animationDuration}ms`,
-    transitionTimingFunction: theme.transitions.easing.easeInOut,
-    [theme.breakpoints.down('md')]: {
-      overflow: 'hidden',
-    },
-  };
-
-  const overlayTransition = {
-    ...commonTransition,
-    transitionProperty: 'background-color, box-shadow, width',
-    // this is needed to prevent a horizontal scrollbar during the animation on firefox
-    '.scrollbar-view': {
-      overflow: 'hidden !important',
-    },
-  };
-
-  const backdropTransition = {
-    ...commonTransition,
-    transitionProperty: 'opacity',
-  };
-
-  const overlayOpen = {
-    backgroundColor: theme.colors.background.canvas,
-    boxShadow: theme.shadows.z3,
-    width: '100%',
-    [theme.breakpoints.up('md')]: {
-      width: MENU_WIDTH,
-    },
-  };
-
-  const overlayClosed = {
-    boxShadow: 'none',
-    width: 0,
-    [theme.breakpoints.up('md')]: {
-      backgroundColor: theme.colors.background.primary,
-      width: theme.spacing(7),
-    },
-  };
-
-  const backdropOpen = {
-    opacity: 1,
-  };
-
-  const backdropClosed = {
-    opacity: 0,
-  };
-
-  return {
-    backdrop: {
-      appear: css(backdropClosed),
-      appearActive: css(backdropTransition, backdropOpen),
-      appearDone: css(backdropOpen),
-      exit: css(backdropOpen),
-      exitActive: css(backdropTransition, backdropClosed),
-    },
-    overlay: {
-      appear: css(overlayClosed),
-      appearActive: css(overlayTransition, overlayOpen),
-      appearDone: css(overlayOpen),
-      exit: css(overlayOpen),
-      exitActive: css(overlayTransition, overlayClosed),
-    },
-  };
-};
-
-export function NavItem({
-  link,
-  activeItem,
-  onClose,
-}: {
-  link: NavModelItem;
-  activeItem?: NavModelItem;
-  onClose: () => void;
-}) {
-  const styles = useStyles2(getNavItemStyles);
-
-  if (linkHasChildren(link)) {
-    return (
-      <CollapsibleNavItem onClose={onClose} link={link} isActive={isMatchOrChildMatch(link, activeItem)}>
-        <ul className={styles.children}>
-          {link.children.map((childLink) => {
-            const icon = childLink.icon ? toIconName(childLink.icon) : undefined;
-            return (
-              !childLink.divider && (
-                <NavBarMenuItem
-                  key={`${link.text}-${childLink.text}`}
-                  isActive={activeItem === childLink}
-                  isDivider={childLink.divider}
-                  icon={childLink.showIconInNavbar ? icon : undefined}
-                  onClick={() => {
-                    childLink.onClick?.();
-                    onClose();
-                  }}
-                  styleOverrides={styles.item}
-                  target={childLink.target}
-                  text={childLink.text}
-                  url={childLink.url}
-                  isMobile={true}
-                />
-              )
-            );
-          })}
-        </ul>
-      </CollapsibleNavItem>
-    );
-  } else if (link.emptyMessage) {
-    return (
-      <CollapsibleNavItem onClose={onClose} link={link} isActive={isMatchOrChildMatch(link, activeItem)}>
-        <ul className={styles.children}>
-          <div className={styles.emptyMessage}>{link.emptyMessage}</div>
-        </ul>
-      </CollapsibleNavItem>
-    );
-  } else {
-    const FeatureHighlightWrapper = link.highlightText ? NavFeatureHighlight : React.Fragment;
-    return (
-      <li className={styles.flex}>
-        <NavBarItemWithoutMenu
-          className={styles.itemWithoutMenu}
-          elClassName={styles.fullWidth}
-          label={link.text}
-          url={link.url}
-          target={link.target}
-          onClick={() => {
-            link.onClick?.();
-            onClose();
-          }}
-          isActive={link === activeItem}
-        >
-          <div className={styles.itemWithoutMenuContent}>
-            <div className={styles.iconContainer}>
-              <FeatureHighlightWrapper>
-                <NavBarItemIcon link={link} />
-              </FeatureHighlightWrapper>
-            </div>
-            <span className={styles.linkText}>{link.text}</span>
-          </div>
-        </NavBarItemWithoutMenu>
-      </li>
-    );
-  }
-}
-
-const getNavItemStyles = (theme: GrafanaTheme2) => ({
-  children: css({
-    display: 'flex',
-    flexDirection: 'column',
-  }),
-  item: css({
-    padding: `${theme.spacing(1)} ${theme.spacing(1.5)}`,
-    width: `calc(100% - ${theme.spacing(3)})`,
-    '&::before': {
-      display: 'none',
-    },
-  }),
-  flex: css({
-    display: 'flex',
-  }),
-  itemWithoutMenu: css({
-    position: 'relative',
-    placeItems: 'inherit',
-    justifyContent: 'start',
-    display: 'flex',
-    flexGrow: 1,
-    alignItems: 'center',
-  }),
-  fullWidth: css({
-    height: '100%',
-    width: '100%',
-  }),
-  iconContainer: css({
-    display: 'flex',
-    placeContent: 'center',
-  }),
-  itemWithoutMenuContent: css({
-    display: 'grid',
-    gridAutoFlow: 'column',
-    gridTemplateColumns: `${theme.spacing(7)} auto`,
-    alignItems: 'center',
-    height: '100%',
-  }),
-  linkText: css({
-    fontSize: theme.typography.pxToRem(14),
-    justifySelf: 'start',
-    padding: theme.spacing(0.5, 4.25, 0.5, 0.5),
-  }),
-  emptyMessage: css({
-    color: theme.colors.text.secondary,
-    fontStyle: 'italic',
-    padding: theme.spacing(1, 1.5),
-  }),
-});
-
-function CollapsibleNavItem({
-  link,
-  isActive,
-  children,
-  className,
-  onClose,
-}: {
-  link: NavModelItem;
-  isActive?: boolean;
-  children: React.ReactNode;
-  className?: string;
-  onClose: () => void;
-}) {
-  const styles = useStyles2(getCollapsibleStyles);
-  const [sectionExpanded, setSectionExpanded] = useLocalStorage(`grafana.navigation.expanded[${link.text}]`, false);
-  const FeatureHighlightWrapper = link.highlightText ? NavFeatureHighlight : React.Fragment;
-
-  return (
-    <li className={cx(styles.menuItem, className)}>
-      <NavBarItemWithoutMenu
-        isActive={isActive}
-        label={link.text}
-        url={link.url}
-        target={link.target}
-        onClick={() => {
-          link.onClick?.();
-          onClose();
-        }}
-        className={styles.collapsibleMenuItem}
-        elClassName={styles.collapsibleIcon}
-      >
-        <FeatureHighlightWrapper>
-          <NavBarItemIcon link={link} />
-        </FeatureHighlightWrapper>
-      </NavBarItemWithoutMenu>
-      <div className={styles.collapsibleSectionWrapper}>
-        <CollapsableSection
-          isOpen={Boolean(sectionExpanded)}
-          onToggle={(isOpen) => setSectionExpanded(isOpen)}
-          className={styles.collapseWrapper}
-          contentClassName={styles.collapseContent}
-          label={
-            <div className={cx(styles.labelWrapper, { [styles.primary]: isActive })}>
-              <span className={styles.linkText}>{link.text}</span>
-            </div>
-          }
-        >
-          {children}
-        </CollapsableSection>
-      </div>
-    </li>
-  );
-}
-
-const getCollapsibleStyles = (theme: GrafanaTheme2) => ({
-  menuItem: css({
-    position: 'relative',
-    display: 'grid',
-    gridAutoFlow: 'column',
-    gridTemplateColumns: `${theme.spacing(7)} minmax(calc(${MENU_WIDTH} - ${theme.spacing(7)}), auto)`,
-  }),
-  collapsibleMenuItem: css({
-    height: theme.spacing(6),
-    width: theme.spacing(7),
-    display: 'grid',
-  }),
-  collapsibleIcon: css({
-    display: 'grid',
-    placeContent: 'center',
-  }),
-  collapsibleSectionWrapper: css({
-    display: 'flex',
-    flexGrow: 1,
-    alignSelf: 'start',
-    flexDirection: 'column',
-  }),
-  collapseWrapper: css({
-    paddingLeft: theme.spacing(0.5),
-    paddingRight: theme.spacing(4.25),
-    minHeight: theme.spacing(6),
-    overflowWrap: 'anywhere',
-    alignItems: 'center',
-    color: theme.colors.text.secondary,
-    '&:hover, &:focus-within': {
-      backgroundColor: theme.colors.action.hover,
-      color: theme.colors.text.primary,
-    },
-    '&:focus-within': {
-      boxShadow: 'none',
-      outline: `2px solid ${theme.colors.primary.main}`,
-      outlineOffset: '-2px',
-      transition: 'none',
-    },
-  }),
-  collapseContent: css({
-    padding: 0,
-  }),
-  labelWrapper: css({
-    fontSize: '15px',
-  }),
-  primary: css({
-    color: theme.colors.text.primary,
-  }),
-  linkText: css({
-    fontSize: theme.typography.pxToRem(14),
-    justifySelf: 'start',
-  }),
-});
-
-function linkHasChildren(link: NavModelItem): link is NavModelItem & { children: NavModelItem[] } {
-  return Boolean(link.children && link.children.length > 0);
-}
diff --git a/public/app/core/components/NavBar/NavBarMenuItem.test.tsx b/public/app/core/components/NavBar/NavBarMenuItem.test.tsx
deleted file mode 100644
index 42e308bc047..00000000000
--- a/public/app/core/components/NavBar/NavBarMenuItem.test.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { BrowserRouter } from 'react-router-dom';
-
-import { NavBarMenuItem } from './NavBarMenuItem';
-
-describe('NavBarMenuItem', () => {
-  const mockText = 'MyChildItem';
-  const mockUrl = '/route';
-  const mockIcon = 'home-alt';
-
-  it('displays the text', () => {
-    render(<NavBarMenuItem text={mockText} />);
-    const text = screen.getByText(mockText);
-    expect(text).toBeInTheDocument();
-  });
-
-  it('attaches the url to the text if provided', () => {
-    render(
-      <BrowserRouter>
-        <NavBarMenuItem text={mockText} url={mockUrl} />
-      </BrowserRouter>
-    );
-    const link = screen.getByRole('link', { name: mockText });
-    expect(link).toBeInTheDocument();
-    expect(link).toHaveAttribute('href', mockUrl);
-  });
-
-  it('displays an icon if a valid icon is provided', () => {
-    render(<NavBarMenuItem text={mockText} icon={mockIcon} />);
-    const icon = screen.getByTestId('dropdown-child-icon');
-    expect(icon).toBeInTheDocument();
-  });
-
-  it('displays an external link icon if the target is _blank', () => {
-    render(<NavBarMenuItem text={mockText} icon={mockIcon} url={mockUrl} target="_blank" />);
-    const icon = screen.getByTestId('external-link-icon');
-    expect(icon).toBeInTheDocument();
-  });
-
-  it('displays a divider instead when isDivider is true', () => {
-    render(<NavBarMenuItem text={mockText} icon={mockIcon} url={mockUrl} isDivider />);
-
-    // Check the divider is shown
-    const divider = screen.getByTestId('dropdown-child-divider');
-    expect(divider).toBeInTheDocument();
-
-    // Check nothing else is rendered
-    const text = screen.queryByText(mockText);
-    const icon = screen.queryByTestId('dropdown-child-icon');
-    const link = screen.queryByRole('link', { name: mockText });
-    expect(text).not.toBeInTheDocument();
-    expect(icon).not.toBeInTheDocument();
-    expect(link).not.toBeInTheDocument();
-  });
-});
diff --git a/public/app/core/components/NavBar/NavBarMenuItem.tsx b/public/app/core/components/NavBar/NavBarMenuItem.tsx
deleted file mode 100644
index 173f1bb2f1a..00000000000
--- a/public/app/core/components/NavBar/NavBarMenuItem.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { Icon, IconName, Link, useTheme2 } from '@grafana/ui';
-
-export interface Props {
-  icon?: IconName;
-  isActive?: boolean;
-  isDivider?: boolean;
-  onClick?: () => void;
-  styleOverrides?: string;
-  target?: HTMLAnchorElement['target'];
-  text: React.ReactNode;
-  url?: string;
-  adjustHeightForBorder?: boolean;
-  isMobile?: boolean;
-}
-
-export function NavBarMenuItem({
-  icon,
-  isActive,
-  isDivider,
-  onClick,
-  styleOverrides,
-  target,
-  text,
-  url,
-  isMobile = false,
-}: Props) {
-  const theme = useTheme2();
-  const styles = getStyles(theme, isActive);
-  const elStyle = cx(styles.element, styleOverrides);
-
-  const linkContent = (
-    <div className={styles.linkContent}>
-      {icon && <Icon data-testid="dropdown-child-icon" name={icon} />}
-
-      <div className={styles.linkText}>{text}</div>
-
-      {target === '_blank' && (
-        <Icon data-testid="external-link-icon" name="external-link-alt" className={styles.externalLinkIcon} />
-      )}
-    </div>
-  );
-
-  let element = (
-    <button className={elStyle} onClick={onClick} tabIndex={-1}>
-      {linkContent}
-    </button>
-  );
-
-  if (url) {
-    element =
-      !target && url.startsWith('/') ? (
-        <Link className={elStyle} href={url} target={target} onClick={onClick} tabIndex={!isMobile ? -1 : 0}>
-          {linkContent}
-        </Link>
-      ) : (
-        <a href={url} target={target} className={elStyle} onClick={onClick} tabIndex={!isMobile ? -1 : 0}>
-          {linkContent}
-        </a>
-      );
-  }
-
-  if (isMobile) {
-    return isDivider ? (
-      <div data-testid="dropdown-child-divider" className={styles.divider} tabIndex={-1} aria-disabled />
-    ) : (
-      <li className={styles.listItem}>{element}</li>
-    );
-  }
-
-  return isDivider ? (
-    <div data-testid="dropdown-child-divider" className={styles.divider} tabIndex={-1} aria-disabled />
-  ) : (
-    <div style={{ position: 'relative' }}>{element}</div>
-  );
-}
-
-NavBarMenuItem.displayName = 'NavBarMenuItem';
-
-const getStyles = (theme: GrafanaTheme2, isActive: Props['isActive']) => ({
-  linkContent: css({
-    alignItems: 'center',
-    display: 'flex',
-    gap: '0.5rem',
-    width: '100%',
-  }),
-  linkText: css({
-    textOverflow: 'ellipsis',
-    overflow: 'hidden',
-    whiteSpace: 'nowrap',
-  }),
-  externalLinkIcon: css({
-    color: theme.colors.text.secondary,
-    gridColumnStart: 3,
-  }),
-  element: css({
-    alignItems: 'center',
-    background: 'none',
-    border: 'none',
-    color: isActive ? theme.colors.text.primary : theme.colors.text.secondary,
-    display: 'flex',
-    flex: 1,
-    fontSize: 'inherit',
-    height: '100%',
-    overflowWrap: 'anywhere',
-    padding: theme.spacing(0.5, 2),
-    textAlign: 'left',
-    width: '100%',
-    '&:hover, &:focus-visible': {
-      backgroundColor: theme.colors.action.hover,
-      color: theme.colors.text.primary,
-    },
-    '&:focus-visible': {
-      boxShadow: 'none',
-      outline: `2px solid ${theme.colors.primary.main}`,
-      outlineOffset: '-2px',
-      transition: 'none',
-    },
-    '&::before': {
-      display: isActive ? 'block' : 'none',
-      content: '" "',
-      position: 'absolute',
-      left: 0,
-      top: 0,
-      bottom: 0,
-      width: theme.spacing(0.5),
-      borderRadius: theme.shape.borderRadius(1),
-      backgroundImage: theme.colors.gradients.brandVertical,
-    },
-  }),
-  listItem: css({
-    position: 'relative',
-    display: 'flex',
-    alignItems: 'center',
-
-    '&:hover, &:focus-within': {
-      color: theme.colors.text.primary,
-
-      '> *:first-child::after': {
-        backgroundColor: theme.colors.action.hover,
-      },
-    },
-  }),
-  divider: css({
-    borderBottom: `1px solid ${theme.colors.border.weak}`,
-    height: '1px',
-    margin: `${theme.spacing(1)} 0`,
-    overflow: 'hidden',
-  }),
-});
diff --git a/public/app/core/components/NavBar/NavBarMenuPortalContainer.tsx b/public/app/core/components/NavBar/NavBarMenuPortalContainer.tsx
deleted file mode 100644
index 5d51ff0af89..00000000000
--- a/public/app/core/components/NavBar/NavBarMenuPortalContainer.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useTheme2 } from '@grafana/ui';
-
-const NAV_MENU_PORTAL_CONTAINER_ID = 'navbar-menu-portal-container';
-
-export const getNavMenuPortalContainer = () => document.getElementById(NAV_MENU_PORTAL_CONTAINER_ID) ?? document.body;
-
-export const NavBarMenuPortalContainer = () => {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-  return <div className={styles.menuPortalContainer} id={NAV_MENU_PORTAL_CONTAINER_ID} />;
-};
-
-NavBarMenuPortalContainer.displayName = 'NavBarMenuPortalContainer';
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  menuPortalContainer: css({
-    left: 0,
-    position: 'fixed',
-    right: 0,
-    top: 0,
-    zIndex: theme.zIndex.sidemenu,
-  }),
-});
diff --git a/public/app/core/components/NavBar/NavBarToggle.tsx b/public/app/core/components/NavBar/NavBarToggle.tsx
deleted file mode 100644
index c913464e4b4..00000000000
--- a/public/app/core/components/NavBar/NavBarToggle.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { css } from '@emotion/css';
-import classnames from 'classnames';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { IconButton, useTheme2 } from '@grafana/ui';
-
-export interface Props {
-  className?: string;
-  isExpanded: boolean;
-  onClick: () => void;
-}
-
-export const NavBarToggle = ({ className, isExpanded, onClick }: Props) => {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-
-  return (
-    <IconButton
-      aria-label={isExpanded ? 'Close navigation menu' : 'Open navigation menu'}
-      name={isExpanded ? 'angle-left' : 'angle-right'}
-      className={classnames(className, styles.icon)}
-      size="xl"
-      onClick={onClick}
-    />
-  );
-};
-
-NavBarToggle.displayName = 'NavBarToggle';
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  icon: css({
-    backgroundColor: theme.colors.background.secondary,
-    border: `1px solid ${theme.colors.border.weak}`,
-    borderRadius: '50%',
-    marginRight: 0,
-    zIndex: theme.zIndex.sidemenu + 1,
-
-    [theme.breakpoints.down('md')]: {
-      display: 'none',
-    },
-  }),
-});
diff --git a/public/app/core/components/NavBar/context.tsx b/public/app/core/components/NavBar/context.tsx
deleted file mode 100644
index e7baf632b4c..00000000000
--- a/public/app/core/components/NavBar/context.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { createContext, HTMLAttributes, useContext } from 'react';
-
-export interface NavBarItemMenuContextProps {
-  menuHasFocus: boolean;
-  onClose: () => void;
-  onLeft: () => void;
-  menuProps?: HTMLAttributes<HTMLElement>;
-}
-
-export const NavBarItemMenuContext = createContext<NavBarItemMenuContextProps>({
-  menuHasFocus: false,
-  onClose: () => undefined,
-  onLeft: () => undefined,
-});
-
-export function useNavBarItemMenuContext(): NavBarItemMenuContextProps {
-  return useContext(NavBarItemMenuContext);
-}
-
-export interface NavBarContextProps {
-  menuIdOpen: string | undefined;
-  setMenuIdOpen: (id: string | undefined) => void;
-}
-
-export const NavBarContext = createContext<NavBarContextProps>({
-  menuIdOpen: undefined,
-  setMenuIdOpen: () => undefined,
-});
-
-export function useNavBarContext(): NavBarContextProps {
-  return useContext(NavBarContext);
-}
diff --git a/public/app/core/components/AppChrome/NavLandingPage.test.tsx b/public/app/core/components/NavLandingPage/NavLandingPage.test.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/NavLandingPage.test.tsx
rename to public/app/core/components/NavLandingPage/NavLandingPage.test.tsx
diff --git a/public/app/core/components/AppChrome/NavLandingPage.tsx b/public/app/core/components/NavLandingPage/NavLandingPage.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/NavLandingPage.tsx
rename to public/app/core/components/NavLandingPage/NavLandingPage.tsx
diff --git a/public/app/core/components/AppChrome/NavLandingPageCard.test.tsx b/public/app/core/components/NavLandingPage/NavLandingPageCard.test.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/NavLandingPageCard.test.tsx
rename to public/app/core/components/NavLandingPage/NavLandingPageCard.test.tsx
diff --git a/public/app/core/components/AppChrome/NavLandingPageCard.tsx b/public/app/core/components/NavLandingPage/NavLandingPageCard.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/NavLandingPageCard.tsx
rename to public/app/core/components/NavLandingPage/NavLandingPageCard.tsx
diff --git a/public/app/core/components/Page/OldNavOnly.tsx b/public/app/core/components/Page/OldNavOnly.tsx
deleted file mode 100644
index 62a97548086..00000000000
--- a/public/app/core/components/Page/OldNavOnly.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-
-interface Props {
-  children: React.ReactNode;
-}
-
-/** Remove after topnav feature toggle is removed */
-export function OldNavOnly({ children }: Props): React.ReactElement | null {
-  return <>{children}</>;
-}
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index 65f96065503..4931ade57c4 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -11,7 +11,6 @@ import { Footer } from '../Footer/Footer';
 import { PageHeader } from '../PageHeader/PageHeader';
 import { Page as NewPage } from '../PageNew/Page';
 
-import { OldNavOnly } from './OldNavOnly';
 import { PageContents } from './PageContents';
 import { PageType } from './types';
 import { usePageNav } from './usePageNav';
@@ -93,7 +92,6 @@ export const OldPage: PageType = ({
 };
 
 OldPage.Contents = PageContents;
-OldPage.OldNavOnly = OldNavOnly;
 
 export const Page: PageType = config.featureToggles.topnav ? NewPage : OldPage;
 
diff --git a/public/app/core/components/Page/types.ts b/public/app/core/components/Page/types.ts
index 1cbf15c54d4..64b8ba7ba0d 100644
--- a/public/app/core/components/Page/types.ts
+++ b/public/app/core/components/Page/types.ts
@@ -2,7 +2,6 @@ import React, { FC, HTMLAttributes, RefCallback } from 'react';
 
 import { NavModel, NavModelItem, PageLayoutType } from '@grafana/data';
 
-import { OldNavOnly } from './OldNavOnly';
 import { PageContents } from './PageContents';
 
 export interface PageProps extends HTMLAttributes<HTMLDivElement> {
@@ -34,6 +33,5 @@ export interface PageInfoItem {
 }
 
 export interface PageType extends FC<PageProps> {
-  OldNavOnly: typeof OldNavOnly;
   Contents: typeof PageContents;
 }
diff --git a/public/app/core/components/PageNew/Page.tsx b/public/app/core/components/PageNew/Page.tsx
index 73a09f82603..85993de8d13 100644
--- a/public/app/core/components/PageNew/Page.tsx
+++ b/public/app/core/components/PageNew/Page.tsx
@@ -92,10 +92,6 @@ export const Page: PageType = ({
 
 Page.Contents = PageContents;
 
-Page.OldNavOnly = function OldNavOnly() {
-  return null;
-};
-
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     wrapper: css({
diff --git a/public/app/core/components/help/HelpModal.tsx b/public/app/core/components/help/HelpModal.tsx
index fa7fdf37530..c05a3cfa736 100644
--- a/public/app/core/components/help/HelpModal.tsx
+++ b/public/app/core/components/help/HelpModal.tsx
@@ -3,7 +3,6 @@ import React, { useMemo } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Modal, useStyles2 } from '@grafana/ui';
-import { config } from 'app/core/config';
 import { getModKey } from 'app/core/utils/browser';
 
 const getShortcuts = (modKey: string) => {
@@ -12,14 +11,7 @@ const getShortcuts = (modKey: string) => {
       { keys: ['g', 'h'], description: 'Go to Home Dashboard' },
       { keys: ['g', 'e'], description: 'Go to Explore' },
       { keys: ['g', 'p'], description: 'Go to Profile' },
-
-      ...(config.featureToggles.topnav
-        ? [{ keys: [`${modKey} + k`], description: 'Open search' }]
-        : [
-            { keys: ['s', 'o'], description: 'Open search' },
-            { keys: [`${modKey} + k`], description: 'Open command palette' },
-          ]),
-
+      { keys: [`${modKey} + k`], description: 'Open search' },
       { keys: ['esc'], description: 'Exit edit/setting views' },
       { keys: ['h'], description: 'Show all keyboard shortcuts' },
       { keys: ['c', 't'], description: 'Change theme' },
diff --git a/public/app/core/reducers/navBarTree.ts b/public/app/core/reducers/navBarTree.ts
index d5fba3cd666..57c9922c508 100644
--- a/public/app/core/reducers/navBarTree.ts
+++ b/public/app/core/reducers/navBarTree.ts
@@ -3,7 +3,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { NavModelItem } from '@grafana/data';
 import { config } from '@grafana/runtime';
 
-import { getNavSubTitle, getNavTitle } from '../components/NavBar/navBarItem-translations';
+import { getNavSubTitle, getNavTitle } from '../components/AppChrome/MegaMenu/navBarItem-translations';
 
 export const initialState: NavModelItem[] = config.bootData?.navTree ?? [];
 
diff --git a/public/app/core/reducers/navModel.ts b/public/app/core/reducers/navModel.ts
index 18f0699d461..e289681699c 100644
--- a/public/app/core/reducers/navModel.ts
+++ b/public/app/core/reducers/navModel.ts
@@ -4,7 +4,7 @@ import { cloneDeep } from 'lodash';
 import { NavIndex, NavModel, NavModelItem } from '@grafana/data';
 import config from 'app/core/config';
 
-import { getNavSubTitle, getNavTitle } from '../components/NavBar/navBarItem-translations';
+import { getNavSubTitle, getNavTitle } from '../components/AppChrome/MegaMenu/navBarItem-translations';
 
 export const HOME_NAV_ID = 'home';
 
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index b88e4126c0f..0cd96bbd712 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -3,7 +3,7 @@ import Mousetrap from 'mousetrap';
 import 'mousetrap-global-bind';
 import 'mousetrap/plugins/global-bind/mousetrap-global-bind';
 import { LegacyGraphHoverClearEvent, locationUtil } from '@grafana/data';
-import { config, LocationService } from '@grafana/runtime';
+import { LocationService } from '@grafana/runtime';
 import appEvents from 'app/core/app_events';
 import { getExploreUrl } from 'app/core/utils/explore';
 import { SaveDashboardDrawer } from 'app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer';
@@ -41,10 +41,6 @@ export class KeybindingSrv {
       this.bind('g a', this.openAlerting);
       this.bind('g p', this.goToProfile);
       this.bind('g e', this.goToExplore);
-      if (!config.featureToggles.topnav) {
-        this.bind('s o', this.openSearch);
-        this.bind('f', this.openSearch);
-      }
       this.bind('t a', this.makeAbsoluteTime);
       this.bind('esc', this.exit);
       this.bindGlobalEsc();
@@ -52,10 +48,6 @@ export class KeybindingSrv {
 
     this.bind('c t', () => toggleTheme(false));
     this.bind('c r', () => toggleTheme(true));
-
-    if (process.env.NODE_ENV === 'development') {
-      this.bind('t n', () => this.toggleNav());
-    }
   }
 
   bindGlobalEsc() {
@@ -88,18 +80,6 @@ export class KeybindingSrv {
     this.exit();
   }
 
-  toggleNav() {
-    window.location.href =
-      config.appSubUrl +
-      locationUtil.getUrlForPartial(this.locationService.getLocation(), {
-        '__feature.topnav': (!config.featureToggles.topnav).toString(),
-      });
-  }
-
-  private openSearch() {
-    this.locationService.partial({ search: 'open' });
-  }
-
   private closeSearch() {
     this.locationService.partial({ search: null });
   }
diff --git a/public/app/features/alerting/routes.tsx b/public/app/features/alerting/routes.tsx
index 8924059bbd5..ea1a6f90859 100644
--- a/public/app/features/alerting/routes.tsx
+++ b/public/app/features/alerting/routes.tsx
@@ -1,10 +1,9 @@
 import { uniq } from 'lodash';
 import React from 'react';
-import { Redirect } from 'react-router-dom';
 
 import { OrgRole } from '@grafana/data';
-import { NavLandingPage } from 'app/core/components/AppChrome/NavLandingPage';
 import { SafeDynamicImport } from 'app/core/components/DynamicImports/SafeDynamicImport';
+import { NavLandingPage } from 'app/core/components/NavLandingPage/NavLandingPage';
 import { config } from 'app/core/config';
 import { RouteDescriptor } from 'app/core/navigation/types';
 import { AccessControlAction } from 'app/types';
@@ -17,8 +16,7 @@ const legacyRoutes: RouteDescriptor[] = [
   ...commonRoutes,
   {
     path: '/alerting',
-    component: () =>
-      config.featureToggles.topnav ? <NavLandingPage navId="alerting-legacy" /> : <Redirect to="/alerting/list" />,
+    component: () => <NavLandingPage navId="alerting-legacy" />,
   },
   {
     path: '/alerting/list',
@@ -90,19 +88,12 @@ const legacyRoutes: RouteDescriptor[] = [
 
 const unifiedRoutes: RouteDescriptor[] = [
   ...commonRoutes,
-  config.featureToggles.topnav
-    ? {
-        path: '/alerting',
-        component: SafeDynamicImport(
-          () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/Home')
-        ),
-      }
-    : {
-        path: '/alerting/home',
-        component: SafeDynamicImport(
-          () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/Home')
-        ),
-      },
+  {
+    path: '/alerting',
+    component: SafeDynamicImport(
+      () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/Home')
+    ),
+  },
   {
     path: '/alerting/list',
     roles: evaluateAccess(
diff --git a/public/app/features/alerting/unified/Home.tsx b/public/app/features/alerting/unified/Home.tsx
index 700155f65ac..96f0fec3c0e 100644
--- a/public/app/features/alerting/unified/Home.tsx
+++ b/public/app/features/alerting/unified/Home.tsx
@@ -4,7 +4,6 @@ import SVG from 'react-inlinesvg';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
-import { config } from '@grafana/runtime';
 import { Icon, useStyles2, useTheme2 } from '@grafana/ui';
 
 import { AlertingPageWrapper } from './components/AlertingPageWrapper';
@@ -14,7 +13,7 @@ export default function Home() {
   const styles = useStyles2(getWelcomePageStyles);
 
   return (
-    <AlertingPageWrapper pageId={config.featureToggles.topnav ? 'alerting' : 'alert-home'}>
+    <AlertingPageWrapper pageId={'alerting'}>
       <div className={styles.grid}>
         <WelcomeHeader className={styles.ctaContainer} />
         <ContentBox className={styles.flowBlock}>
diff --git a/public/app/features/connections/Connections.tsx b/public/app/features/connections/Connections.tsx
index e4346e3eea0..1a66576c825 100644
--- a/public/app/features/connections/Connections.tsx
+++ b/public/app/features/connections/Connections.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 
-import { NavLandingPage } from 'app/core/components/AppChrome/NavLandingPage';
+import { NavLandingPage } from 'app/core/components/NavLandingPage/NavLandingPage';
 import { DataSourcesRoutesContext } from 'app/features/datasources/state';
 import { StoreState, useSelector } from 'app/types';
 
diff --git a/public/app/features/connections/pages/DataSourcesListPage.tsx b/public/app/features/connections/pages/DataSourcesListPage.tsx
index 47508f26fb6..394fc16ab2a 100644
--- a/public/app/features/connections/pages/DataSourcesListPage.tsx
+++ b/public/app/features/connections/pages/DataSourcesListPage.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 
-import { config } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { DataSourceAddButton } from 'app/features/datasources/components/DataSourceAddButton';
 import { DataSourcesList } from 'app/features/datasources/components/DataSourcesList';
@@ -10,7 +9,7 @@ import { StoreState, useSelector } from 'app/types';
 export function DataSourcesListPage() {
   const dataSourcesCount = useSelector(({ dataSources }: StoreState) => getDataSourcesCount(dataSources));
 
-  const actions = config.featureToggles.topnav && dataSourcesCount > 0 ? <DataSourceAddButton /> : undefined;
+  const actions = dataSourcesCount > 0 ? <DataSourceAddButton /> : undefined;
   return (
     <Page navId={'connections-your-connections-datasources'} actions={actions}>
       <Page.Contents>
diff --git a/public/app/features/correlations/CorrelationsPage.test.tsx b/public/app/features/correlations/CorrelationsPage.test.tsx
index 4de653007fc..abfdc10a78c 100644
--- a/public/app/features/correlations/CorrelationsPage.test.tsx
+++ b/public/app/features/correlations/CorrelationsPage.test.tsx
@@ -178,13 +178,6 @@ jest.mock('@grafana/runtime', () => {
 
   return {
     ...runtime,
-    config: {
-      ...runtime.config,
-      featureToggles: {
-        ...runtime.config.featureToggles,
-        topnav: true,
-      },
-    },
     reportInteraction: (...args: Parameters<typeof reportInteraction>) => {
       mocks.reportInteraction(...args);
     },
diff --git a/public/app/features/correlations/CorrelationsPage.tsx b/public/app/features/correlations/CorrelationsPage.tsx
index f04d6d9e1dc..db075c534ea 100644
--- a/public/app/features/correlations/CorrelationsPage.tsx
+++ b/public/app/features/correlations/CorrelationsPage.tsx
@@ -8,7 +8,6 @@ import {
   Badge,
   Button,
   DeleteButton,
-  HorizontalGroup,
   LoadingPlaceholder,
   useStyles2,
   Alert,
@@ -158,15 +157,6 @@ export default function CorrelationsPage() {
       actions={addButton}
     >
       <Page.Contents>
-        <div>
-          <HorizontalGroup justify="space-between">
-            <Page.OldNavOnly>
-              <p>Define how data living in different data sources relates to each other.</p>
-            </Page.OldNavOnly>
-            <Page.OldNavOnly>{addButton}</Page.OldNavOnly>
-          </HorizontalGroup>
-        </div>
-
         <div>
           {!data && get.loading && (
             <div className={loaderWrapper}>
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.test.tsx b/public/app/features/dashboard/components/DashNav/DashNav.test.tsx
deleted file mode 100644
index c9ee0d49456..00000000000
--- a/public/app/features/dashboard/components/DashNav/DashNav.test.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { act, render, screen, waitFor } from '@testing-library/react';
-import React from 'react';
-import { Provider } from 'react-redux';
-import { Router } from 'react-router-dom';
-
-import { locationService } from '@grafana/runtime/src';
-import { GrafanaContext } from 'app/core/context/GrafanaContext';
-
-import { getGrafanaContextMock } from '../../../../../test/mocks/getGrafanaContextMock';
-import { setStarred } from '../../../../core/reducers/navBarTree';
-import { configureStore } from '../../../../store/configureStore';
-import { updateTimeZoneForSession } from '../../../profile/state/reducers';
-import { createDashboardModelFixture } from '../../state/__fixtures__/dashboardFixtures';
-
-import { DashNav } from './DashNav';
-
-describe('Public dashboard title tag', () => {
-  it('will be rendered when publicDashboardEnabled set to true in dashboard meta', async () => {
-    let dashboard = createDashboardModelFixture({}, { publicDashboardEnabled: false });
-
-    const store = configureStore();
-    const context = getGrafanaContextMock();
-    const props = {
-      setStarred: jest.fn() as unknown as typeof setStarred,
-      updateTimeZoneForSession: jest.fn() as unknown as typeof updateTimeZoneForSession,
-    };
-
-    render(
-      <Provider store={store}>
-        <GrafanaContext.Provider value={context}>
-          <Router history={locationService.getHistory()}>
-            <DashNav
-              {...props}
-              dashboard={dashboard}
-              hideTimePicker={true}
-              isFullscreen={false}
-              onAddPanel={() => {}}
-              title="test"
-            />
-          </Router>
-        </GrafanaContext.Provider>
-      </Provider>
-    );
-
-    const publicTag = screen.queryByText('Public');
-    expect(publicTag).not.toBeInTheDocument();
-
-    act(() => {
-      dashboard.updateMeta({ publicDashboardEnabled: true });
-    });
-
-    await waitFor(() => screen.getByText('Public'));
-  });
-});
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index d4bc3c21672..3da75e21590 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -3,14 +3,13 @@ import React, { FC, ReactNode, useContext, useEffect } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 
-import { locationUtil, textUtil } from '@grafana/data';
+import { textUtil } from '@grafana/data';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { locationService } from '@grafana/runtime';
 import {
   ButtonGroup,
   ModalsController,
   ToolbarButton,
-  PageToolbar,
   useForceUpdate,
   Tag,
   ToolbarButtonRow,
@@ -18,9 +17,8 @@ import {
   ConfirmModal,
 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
-import { NavToolbarSeparator } from 'app/core/components/AppChrome/NavToolbarSeparator';
+import { NavToolbarSeparator } from 'app/core/components/AppChrome/NavToolbar/NavToolbarSeparator';
 import config from 'app/core/config';
-import { useGrafana } from 'app/core/context/GrafanaContext';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { appEvents } from 'app/core/core';
 import { useBusEvent } from 'app/core/hooks/useBusEvent';
@@ -79,8 +77,9 @@ export function addCustomRightAction(content: DashNavButtonModel) {
 type Props = OwnProps & ConnectedProps<typeof connector>;
 
 export const DashNav = React.memo<Props>((props) => {
+  // this ensures the component rerenders when the location changes
+  useLocation();
   const forceUpdate = useForceUpdate();
-  const { chrome } = useGrafana();
   const { showModal, hideModal } = useContext(ModalsContext);
 
   // We don't really care about the event payload here only that it triggeres a re-render of this component
@@ -136,14 +135,6 @@ export const DashNav = React.memo<Props>((props) => {
     });
   };
 
-  const onClose = () => {
-    locationService.partial({ viewPanel: null });
-  };
-
-  const onToggleTVMode = () => {
-    chrome.onToggleKioskMode();
-  };
-
   const onOpenSettings = () => {
     locationService.partial({ editview: 'settings' });
   };
@@ -287,21 +278,13 @@ export const DashNav = React.memo<Props>((props) => {
     const { snapshot } = dashboard;
     const snapshotUrl = snapshot && snapshot.originalUrl;
     const buttons: ReactNode[] = [];
-    const tvButton = config.featureToggles.topnav ? null : (
-      <ToolbarButton
-        tooltip={t('dashboard.toolbar.tv-button', 'Cycle view mode')}
-        icon="monitor"
-        onClick={onToggleTVMode}
-        key="tv-button"
-      />
-    );
 
     if (isPlaylistRunning()) {
       return [renderPlaylistControls(), renderTimeControls()];
     }
 
     if (kioskMode === KioskMode.TV) {
-      return [renderTimeControls(), tvButton];
+      return [renderTimeControls()];
     }
 
     if (canEdit && !isFullscreen) {
@@ -364,7 +347,6 @@ export const DashNav = React.memo<Props>((props) => {
     addCustomContent(customRightActions, buttons);
 
     buttons.push(renderTimeControls());
-    buttons.push(tvButton);
 
     if (config.featureToggles.scenes) {
       buttons.push(
@@ -379,39 +361,16 @@ export const DashNav = React.memo<Props>((props) => {
     return buttons;
   };
 
-  const { isFullscreen, title, folderTitle } = props;
-  // this ensures the component rerenders when the location changes
-  const location = useLocation();
-  const titleHref = locationUtil.getUrlForPartial(location, { search: 'open' });
-  const parentHref = locationUtil.getUrlForPartial(location, { search: 'open', query: 'folder:current' });
-  const onGoBack = isFullscreen ? onClose : undefined;
-
-  if (config.featureToggles.topnav) {
-    return (
-      <AppChromeUpdate
-        actions={
-          <>
-            {renderLeftActions()}
-            <NavToolbarSeparator leftActionsSeparator />
-            <ToolbarButtonRow alignment="right">{renderRightActions()}</ToolbarButtonRow>
-          </>
-        }
-      />
-    );
-  }
-
   return (
-    <PageToolbar
-      pageIcon={isFullscreen ? undefined : 'apps'}
-      title={title}
-      parent={folderTitle}
-      titleHref={titleHref}
-      parentHref={parentHref}
-      onGoBack={onGoBack}
-      leftItems={renderLeftActions()}
-    >
-      {renderRightActions()}
-    </PageToolbar>
+    <AppChromeUpdate
+      actions={
+        <>
+          {renderLeftActions()}
+          <NavToolbarSeparator leftActionsSeparator />
+          <ToolbarButtonRow alignment="right">{renderRightActions()}</ToolbarButtonRow>
+        </>
+      }
+    />
   );
 });
 
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
index f69223b37c9..8ba6072b32c 100644
--- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
@@ -5,7 +5,7 @@ import { useLocation } from 'react-router-dom';
 import { locationUtil, NavModel, NavModelItem } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { locationService } from '@grafana/runtime';
-import { Button, PageToolbar, ToolbarButtonRow } from '@grafana/ui';
+import { Button, ToolbarButtonRow } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { Page } from 'app/core/components/PageNew/Page';
 import config from 'app/core/config';
@@ -49,28 +49,25 @@ export function DashboardSettings({ dashboard, editview, pageNav, sectionNav }:
     dashboard.meta.hasUnsavedFolderChange = false;
   };
 
-  const folderTitle = dashboard.meta.folderTitle;
   const currentPage = pages.find((page) => page.id === editview) ?? pages[0];
   const canSaveAs = contextSrv.hasEditPermissionInFolders;
   const canSave = dashboard.meta.canSave;
   const location = useLocation();
   const editIndex = getEditIndex(location);
   const subSectionNav = getSectionNav(pageNav, sectionNav, pages, currentPage, location);
-  const size = config.featureToggles.topnav ? 'sm' : 'md';
+  const size = 'sm';
 
   const actions = [
-    config.featureToggles.topnav && (
-      <Button
-        data-testid={selectors.pages.Dashboard.Settings.Actions.close}
-        variant="secondary"
-        key="close"
-        fill="outline"
-        size={size}
-        onClick={onClose}
-      >
-        Close
-      </Button>
-    ),
+    <Button
+      data-testid={selectors.pages.Dashboard.Settings.Actions.close}
+      variant="secondary"
+      key="close"
+      fill="outline"
+      size={size}
+      onClick={onClose}
+    >
+      Close
+    </Button>,
     canSaveAs && (
       <SaveDashboardAsButton
         dashboard={dashboard}
@@ -85,13 +82,7 @@ export function DashboardSettings({ dashboard, editview, pageNav, sectionNav }:
 
   return (
     <>
-      {!config.featureToggles.topnav ? (
-        <PageToolbar title={`${dashboard.title} / Settings`} parent={folderTitle} onGoBack={onClose}>
-          {actions}
-        </PageToolbar>
-      ) : (
-        <AppChromeUpdate actions={<ToolbarButtonRow alignment="right">{actions}</ToolbarButtonRow>} />
-      )}
+      <AppChromeUpdate actions={<ToolbarButtonRow alignment="right">{actions}</ToolbarButtonRow>} />
       <currentPage.component sectionNav={subSectionNav} dashboard={dashboard} editIndex={editIndex} />
     </>
   );
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
index ee23bce4524..de45e2a6f12 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
@@ -7,13 +7,12 @@ import { Subscription } from 'rxjs';
 import { FieldConfigSource, GrafanaTheme2, NavModel, NavModelItem, PageLayoutType } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Stack } from '@grafana/experimental';
-import { config, locationService } from '@grafana/runtime';
+import { locationService } from '@grafana/runtime';
 import {
   Button,
   HorizontalGroup,
   InlineSwitch,
   ModalsController,
-  PageToolbar,
   RadioButtonGroup,
   stylesFactory,
   Themeable2,
@@ -322,7 +321,7 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
   }
 
   renderEditorActions() {
-    const size = config.featureToggles.topnav ? 'sm' : 'md';
+    const size = 'sm';
     let editorActions = [
       <Button
         onClick={this.onDiscard}
@@ -431,18 +430,8 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
   };
 
   renderToolbar() {
-    if (config.featureToggles.topnav) {
-      return (
-        <AppChromeUpdate
-          actions={<ToolbarButtonRow alignment="right">{this.renderEditorActions()}</ToolbarButtonRow>}
-        />
-      );
-    }
-
     return (
-      <PageToolbar title={this.props.dashboard.title} section="Edit Panel" onGoBack={this.onGoBackToDashboard}>
-        {this.renderEditorActions()}
-      </PageToolbar>
+      <AppChromeUpdate actions={<ToolbarButtonRow alignment="right">{this.renderEditorActions()}</ToolbarButtonRow>} />
     );
   }
 
@@ -514,7 +503,7 @@ export const getStyles = stylesFactory((theme: GrafanaTheme2, props: Props) => {
       flexGrow: 1,
       minHeight: 0,
       display: 'flex',
-      paddingTop: config.featureToggles.topnav ? theme.spacing(2) : 0,
+      paddingTop: theme.spacing(2),
     }),
     verticalSplitPanesWrapper: css`
       display: flex;
diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx
index 27ea636e6cc..d2abb8f84f1 100644
--- a/public/app/features/dashboard/containers/DashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx
@@ -90,7 +90,7 @@ const mockCleanUpDashboardAndVariables = jest.fn();
 
 function setup(propOverrides?: Partial<Props>) {
   config.bootData.navTree = [
-    { text: 'Dashboards', id: 'dashboards' },
+    { text: 'Dashboards', id: 'dashboards/browse' },
     { text: 'Home', id: HOME_NAV_ID },
   ];
 
@@ -101,7 +101,11 @@ function setup(propOverrides?: Partial<Props>) {
       route: { routeName: DashboardRoutes.Normal } as RouteDescriptor,
     }),
     navIndex: {
-      dashboards: { text: 'Dashboards', id: 'dashboards', parentItem: { text: 'Home', id: HOME_NAV_ID } },
+      'dashboards/browse': {
+        text: 'Dashboards',
+        id: 'dashboards/browse',
+        parentItem: { text: 'Home', id: HOME_NAV_ID },
+      },
       [HOME_NAV_ID]: { text: 'Home', id: HOME_NAV_ID },
     },
     initPhase: DashboardInitPhase.NotStarted,
@@ -226,27 +230,6 @@ describe('DashboardPage', () => {
         expect(dashboard.panelInEdit).toBeDefined();
       });
     });
-
-    it('Should render panel editor', async () => {
-      const dashboard = getTestDashboard();
-      setup({
-        dashboard,
-        queryParams: { editPanel: '1' },
-      });
-      expect(await screen.findByTitle('Apply changes and go back to dashboard')).toBeInTheDocument();
-    });
-
-    it('Should reset state when leaving', async () => {
-      const dashboard = getTestDashboard();
-      const { rerender } = setup({
-        dashboard,
-        queryParams: { editPanel: '1' },
-      });
-      rerender({ queryParams: {} });
-      await waitFor(() => {
-        expect(screen.queryByTitle('Apply changes and go back to dashboard')).not.toBeInTheDocument();
-      });
-    });
   });
 
   describe('When dashboard unmounts', () => {
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index d79868e7968..febdac4d4b6 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -551,7 +551,7 @@ function updateStatePageNavFromProps(props: Props, state: State): State {
       pageNav.parentItem = pageNav.parentItem;
     }
   } else {
-    sectionNav = getNavModel(props.navIndex, config.featureToggles.topnav ? 'dashboards/browse' : 'dashboards');
+    sectionNav = getNavModel(props.navIndex, 'dashboards/browse');
   }
 
   if (state.editPanel || state.viewPanel) {
diff --git a/public/app/features/datasources/components/DataSourcesListHeader.tsx b/public/app/features/datasources/components/DataSourcesListHeader.tsx
index 4f97016b4f7..4961a22e172 100644
--- a/public/app/features/datasources/components/DataSourcesListHeader.tsx
+++ b/public/app/features/datasources/components/DataSourcesListHeader.tsx
@@ -1,18 +1,10 @@
 import React, { useCallback } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import PageActionBar from 'app/core/components/PageActionBar/PageActionBar';
-import { contextSrv } from 'app/core/core';
-import { StoreState, useSelector, useDispatch, AccessControlAction } from 'app/types';
+import { StoreState, useSelector, useDispatch } from 'app/types';
 
-import {
-  getDataSourcesSearchQuery,
-  getDataSourcesSort,
-  setDataSourcesSearchQuery,
-  setIsSortAscending,
-  useDataSourcesRoutes,
-} from '../state';
+import { getDataSourcesSearchQuery, getDataSourcesSort, setDataSourcesSearchQuery, setIsSortAscending } from '../state';
 
 const ascendingSortValue = 'alpha-asc';
 const descendingSortValue = 'alpha-desc';
@@ -30,19 +22,6 @@ export function DataSourcesListHeader() {
   const setSearchQuery = useCallback((q: string) => dispatch(setDataSourcesSearchQuery(q)), [dispatch]);
   const searchQuery = useSelector(({ dataSources }: StoreState) => getDataSourcesSearchQuery(dataSources));
 
-  // TODO remove this logic adding the link button once topnav is live
-  // instead use the actions in DataSourcesListPage
-  const canCreateDataSource = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
-  const dataSourcesRoutes = useDataSourcesRoutes();
-  const isTopnav = config.featureToggles.topnav;
-  const linkButton =
-    !isTopnav && canCreateDataSource
-      ? {
-          href: dataSourcesRoutes.New,
-          title: 'Add new data source',
-        }
-      : undefined;
-
   const setSort = useCallback(
     (sort: SelectableValue) => dispatch(setIsSortAscending(sort.value === ascendingSortValue)),
     [dispatch]
@@ -56,12 +35,6 @@ export function DataSourcesListHeader() {
   };
 
   return (
-    <PageActionBar
-      searchQuery={searchQuery}
-      setSearchQuery={setSearchQuery}
-      key="action-bar"
-      sortPicker={sortPicker}
-      linkButton={linkButton}
-    />
+    <PageActionBar searchQuery={searchQuery} setSearchQuery={setSearchQuery} key="action-bar" sortPicker={sortPicker} />
   );
 }
diff --git a/public/app/features/datasources/pages/DataSourcesListPage.tsx b/public/app/features/datasources/pages/DataSourcesListPage.tsx
index 05c43b663ff..b425cef95da 100644
--- a/public/app/features/datasources/pages/DataSourcesListPage.tsx
+++ b/public/app/features/datasources/pages/DataSourcesListPage.tsx
@@ -12,7 +12,7 @@ import { getDataSourcesCount } from '../state';
 export function DataSourcesListPage() {
   const dataSourcesCount = useSelector(({ dataSources }: StoreState) => getDataSourcesCount(dataSources));
 
-  const actions = config.featureToggles.topnav && dataSourcesCount > 0 ? <DataSourceAddButton /> : undefined;
+  const actions = dataSourcesCount > 0 ? <DataSourceAddButton /> : undefined;
   return (
     <Page navId="datasources" actions={actions}>
       <Page.Contents>
diff --git a/public/app/features/explore/Explore.test.tsx b/public/app/features/explore/Explore.test.tsx
index 3007377ff7e..045eb9ce7bd 100644
--- a/public/app/features/explore/Explore.test.tsx
+++ b/public/app/features/explore/Explore.test.tsx
@@ -1,10 +1,9 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
-import { Provider } from 'react-redux';
 import { AutoSizerProps } from 'react-virtualized-auto-sizer';
+import { TestProvider } from 'test/helpers/TestProvider';
 
 import { DataSourceApi, LoadingState, CoreApp, createTheme, EventBusSrv } from '@grafana/data';
-import { configureStore } from 'app/store/configureStore';
 import { ExploreId } from 'app/types/explore';
 
 import { Explore, Props } from './Explore';
@@ -120,13 +119,12 @@ jest.mock('react-virtualized-auto-sizer', () => {
 });
 
 const setup = (overrideProps?: Partial<Props>) => {
-  const store = configureStore();
   const exploreProps = { ...dummyProps, ...overrideProps };
 
   return render(
-    <Provider store={store}>
+    <TestProvider>
       <Explore {...exploreProps} />
-    </Provider>
+    </TestProvider>
   );
 };
 
@@ -135,7 +133,7 @@ describe('Explore', () => {
     setup();
 
     // Wait for the Explore component to render
-    await screen.findByText('Explore');
+    await screen.findByLabelText('Data source picker select container');
 
     expect(screen.queryByTestId('explore-no-data')).not.toBeInTheDocument();
   });
@@ -145,7 +143,7 @@ describe('Explore', () => {
     setup({ queryResponse: queryResp });
 
     // Wait for the Explore component to render
-    await screen.findByText('Explore');
+    await screen.findByLabelText('Data source picker select container');
 
     expect(screen.getByTestId('explore-no-data')).toBeInTheDocument();
   });
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 6e1806b2f40..317d7452275 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -243,7 +243,6 @@ class UnConnectedExploreToolbar extends PureComponent<Props> {
       this.props;
 
     const showSmallDataSourcePicker = (splitted ? containerWidth < 700 : containerWidth < 800) || false;
-    const isTopnav = config.featureToggles.topnav;
 
     const shareButton = (
       <DashNavButton
@@ -267,27 +266,15 @@ class UnConnectedExploreToolbar extends PureComponent<Props> {
         />
       );
 
-    const toolbarLeftItems = [
-      // We only want to show the shortened link button in the left Toolbar if topnav is not enabled as with topnav enabled it sits next to the brecrumbs
-      !isTopnav && exploreId === ExploreId.left && shareButton,
-      getDataSourcePicker(),
-    ].filter(Boolean);
+    const toolbarLeftItems = [getDataSourcePicker()].filter(Boolean);
 
     return (
       <div ref={topOfViewRef}>
         {refreshInterval && <SetInterval func={this.onRunQuery} interval={refreshInterval} loading={loading} />}
-        {isTopnav && (
-          <div ref={topOfViewRef}>
-            <AppChromeUpdate actions={[shareButton, <div style={{ flex: 1 }} key="spacer" />]} />
-          </div>
-        )}
-        <PageToolbar
-          aria-label="Explore toolbar"
-          title={exploreId === ExploreId.left && !isTopnav ? 'Explore' : undefined}
-          pageIcon={exploreId === ExploreId.left && !isTopnav ? 'compass' : undefined}
-          leftItems={toolbarLeftItems}
-          forceShowLeftItems
-        >
+        <div ref={topOfViewRef}>
+          <AppChromeUpdate actions={[shareButton, <div style={{ flex: 1 }} key="spacer" />]} />
+        </div>
+        <PageToolbar aria-label="Explore toolbar" leftItems={toolbarLeftItems} forceShowLeftItems>
           {this.renderActions()}
         </PageToolbar>
       </div>
diff --git a/public/app/features/explore/LogsNavigation.tsx b/public/app/features/explore/LogsNavigation.tsx
index 250ac8c6e89..ffd62a5c407 100644
--- a/public/app/features/explore/LogsNavigation.tsx
+++ b/public/app/features/explore/LogsNavigation.tsx
@@ -207,9 +207,7 @@ function LogsNavigation({
 export default memo(LogsNavigation);
 
 const getStyles = (theme: GrafanaTheme2, oldestLogsFirst: boolean) => {
-  const navContainerHeight = theme.flags.topnav
-    ? `calc(100vh - 2*${theme.spacing(2)} - 2*${TOP_BAR_LEVEL_HEIGHT}px)`
-    : '95vh';
+  const navContainerHeight = `calc(100vh - 2*${theme.spacing(2)} - 2*${TOP_BAR_LEVEL_HEIGHT}px)`;
   return {
     navContainer: css`
       max-height: ${navContainerHeight};
diff --git a/public/app/features/folders/components/NewDashboardsFolder.tsx b/public/app/features/folders/components/NewDashboardsFolder.tsx
index 34c03f82fc6..7664956bab1 100644
--- a/public/app/features/folders/components/NewDashboardsFolder.tsx
+++ b/public/app/features/folders/components/NewDashboardsFolder.tsx
@@ -54,7 +54,6 @@ function NewDashboardsFolder({ createNewFolder }: Props) {
   return (
     <Page navId="dashboards/browse" pageNav={pageNav}>
       <Page.Contents>
-        {!config.featureToggles.topnav && <h3>New dashboard folder</h3>}
         <Form defaultValues={initialFormModel} onSubmit={onSubmit}>
           {({ register, errors }) => (
             <>
diff --git a/public/app/features/org/UserInvitePage.tsx b/public/app/features/org/UserInvitePage.tsx
index 7f0236cc6ab..3e51c35b383 100644
--- a/public/app/features/org/UserInvitePage.tsx
+++ b/public/app/features/org/UserInvitePage.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 
-import { config } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 
@@ -14,10 +13,8 @@ export function UserInvitePage() {
     </>
   );
 
-  const navId = config.featureToggles.topnav ? 'global-users' : 'users';
-
   return (
-    <Page navId={navId} pageNav={{ text: 'Invite user' }} subTitle={subTitle}>
+    <Page navId="global-users" pageNav={{ text: 'Invite user' }} subTitle={subTitle}>
       <Page.Contents>
         <UserInviteForm />
       </Page.Contents>
diff --git a/public/app/features/plugins/components/AppRootPage.test.tsx b/public/app/features/plugins/components/AppRootPage.test.tsx
index d19e0e89b23..b43f32927fd 100644
--- a/public/app/features/plugins/components/AppRootPage.test.tsx
+++ b/public/app/features/plugins/components/AppRootPage.test.tsx
@@ -36,32 +36,10 @@ const getPluginSettingsMock = getPluginSettings as jest.Mock<
 >;
 
 class RootComponent extends Component<AppRootProps> {
-  static timesMounted = 0;
-  componentDidMount() {
-    RootComponent.timesMounted += 1;
-    const node: NavModelItem = {
-      text: 'My Great plugin',
-      children: [
-        {
-          text: 'A page',
-          url: '/apage',
-          id: 'a',
-        },
-        {
-          text: 'Another page',
-          url: '/anotherpage',
-          id: 'b',
-        },
-      ],
-    };
-    this.props.onNavChanged({
-      main: node,
-      node,
-    });
-  }
-
+  static timesRendered = 0;
   render() {
-    return <p>my great plugin</p>;
+    RootComponent.timesRendered += 1;
+    return <p>my great component</p>;
   }
 }
 
@@ -119,36 +97,9 @@ describe('AppRootPage', () => {
     enabled: true,
   });
 
-  it('should not mount plugin twice if nav is changed', async () => {
-    // reproduces https://github.com/grafana/grafana/pull/28105
-    getPluginSettingsMock.mockResolvedValue(pluginMeta);
-
-    const plugin = new AppPlugin();
-    plugin.meta = pluginMeta;
-    plugin.root = RootComponent;
-
-    importAppPluginMock.mockResolvedValue(plugin);
-
-    renderUnderRouter();
-
-    // check that plugin and nav links were rendered, and plugin is mounted only once
-    expect(await screen.findByText('my great plugin')).toBeVisible();
-    expect(await screen.findByLabelText('Tab A page')).toBeVisible();
-    expect(await screen.findByLabelText('Tab Another page')).toBeVisible();
-    expect(RootComponent.timesMounted).toEqual(1);
-  });
-
   it('should not render component if not at plugin path', async () => {
     getPluginSettingsMock.mockResolvedValue(pluginMeta);
 
-    class RootComponent extends Component<AppRootProps> {
-      static timesRendered = 0;
-      render() {
-        RootComponent.timesRendered += 1;
-        return <p>my great component</p>;
-      }
-    }
-
     const plugin = new AppPlugin();
     plugin.meta = pluginMeta;
     plugin.root = RootComponent;
@@ -160,18 +111,18 @@ describe('AppRootPage', () => {
     expect(await screen.findByText('my great component')).toBeVisible();
 
     // renders the first time
-    expect(RootComponent.timesRendered).toEqual(2);
+    expect(RootComponent.timesRendered).toEqual(1);
 
     await act(async () => {
       locationService.push('/foo');
     });
 
-    expect(RootComponent.timesRendered).toEqual(2);
+    expect(RootComponent.timesRendered).toEqual(1);
 
     await act(async () => {
       locationService.push('/a/my-awesome-plugin');
     });
 
-    expect(RootComponent.timesRendered).toEqual(4);
+    expect(RootComponent.timesRendered).toEqual(2);
   });
 });
diff --git a/public/app/features/plugins/components/AppRootPage.tsx b/public/app/features/plugins/components/AppRootPage.tsx
index d4ab24d0d80..da1132db22a 100644
--- a/public/app/features/plugins/components/AppRootPage.tsx
+++ b/public/app/features/plugins/components/AppRootPage.tsx
@@ -1,7 +1,6 @@
 // Libraries
 import { AnyAction, createSlice, PayloadAction } from '@reduxjs/toolkit';
 import React, { useCallback, useEffect, useMemo, useReducer } from 'react';
-import { createHtmlPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
 import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { AppEvents, AppPlugin, AppPluginMeta, NavModel, NavModelItem, PluginType } from '@grafana/data';
@@ -37,7 +36,6 @@ export function AppRootPage({ pluginId, pluginNavSection }: Props) {
   const match = useRouteMatch();
   const location = useLocation();
   const [state, dispatch] = useReducer(stateSlice.reducer, initialState);
-  const portalNode = useMemo(() => createHtmlPortalNode(), []);
   const currentUrl = config.appSubUrl + location.pathname + location.search;
   const { plugin, loading, pluginNav } = state;
   const navModel = buildPluginSectionNav(pluginNavSection, pluginNav, currentUrl);
@@ -75,23 +73,18 @@ export function AppRootPage({ pluginId, pluginNavSection }: Props) {
     />
   );
 
-  if (config.featureToggles.topnav && !pluginNav) {
+  if (!pluginNav) {
     return <PluginPageContext.Provider value={context}>{pluginRoot}</PluginPageContext.Provider>;
   }
 
   return (
     <>
-      <InPortal node={portalNode}>{pluginRoot}</InPortal>
       {navModel ? (
         <Page navModel={navModel} pageNav={pluginNav?.node}>
-          <Page.Contents isLoading={loading}>
-            <OutPortal node={portalNode} />
-          </Page.Contents>
+          <Page.Contents isLoading={loading}>{pluginRoot}</Page.Contents>
         </Page>
       ) : (
-        <Page>
-          <OutPortal node={portalNode} />
-        </Page>
+        <Page>{pluginRoot}</Page>
       )}
     </>
   );
@@ -112,8 +105,7 @@ const stateSlice = createSlice({
           ...pluginNav,
           node: {
             ...pluginNav.main,
-            // Because breadcumbs code is also used to set title when topnav should only set hideFromBreadcrumbs when topnav is enabled
-            hideFromBreadcrumbs: config.featureToggles.topnav,
+            hideFromBreadcrumbs: true,
           },
         };
       }
diff --git a/public/app/features/plugins/utils.test.ts b/public/app/features/plugins/utils.test.ts
index b79a5840279..c66d7ea2ebc 100644
--- a/public/app/features/plugins/utils.test.ts
+++ b/public/app/features/plugins/utils.test.ts
@@ -1,5 +1,4 @@
 import { NavModelItem } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 
 import { buildPluginSectionNav } from './utils';
@@ -50,41 +49,30 @@ describe('buildPluginSectionNav', () => {
 
   app1.parentItem = appsSection;
 
-  it('Should return pluginNav if topnav is disabled', () => {
-    config.featureToggles.topnav = false;
-    const result = buildPluginSectionNav(appsSection, pluginNav, '/a/plugin1/page1');
-    expect(result).toBe(pluginNav);
-  });
-
-  it('Should return return section nav if topnav is enabled', () => {
-    config.featureToggles.topnav = true;
+  it('Should return return section nav', () => {
     const result = buildPluginSectionNav(appsSection, pluginNav, '/a/plugin1/page1');
     expect(result?.main.text).toBe('apps');
   });
 
   it('Should set active page', () => {
-    config.featureToggles.topnav = true;
     const result = buildPluginSectionNav(appsSection, null, '/a/plugin1/page2');
     expect(result?.main.children![0].children![1].active).toBe(true);
     expect(result?.node.text).toBe('page2');
   });
 
   it('Should only set the most specific match as active (not the parents)', () => {
-    config.featureToggles.topnav = true;
     const result = buildPluginSectionNav(appsSection, null, '/a/plugin1/page2');
     expect(result?.main.children![0].children![1].active).toBe(true);
     expect(result?.main.children![0].active).not.toBe(true); // Parent should not be active
   });
 
   it('Should set app section to active', () => {
-    config.featureToggles.topnav = true;
     const result = buildPluginSectionNav(appsSection, null, '/a/plugin1');
     expect(result?.main.children![0].active).toBe(true);
     expect(result?.node.text).toBe('App1');
   });
 
   it('Should handle standalone page', () => {
-    config.featureToggles.topnav = true;
     const result = buildPluginSectionNav(adminSection, pluginNav, '/a/app2/config');
     expect(result?.main.text).toBe('Admin');
     expect(result?.node.text).toBe('Standalone page');
diff --git a/public/app/features/plugins/utils.ts b/public/app/features/plugins/utils.ts
index 145431cc039..d2badad9ed1 100644
--- a/public/app/features/plugins/utils.ts
+++ b/public/app/features/plugins/utils.ts
@@ -1,5 +1,4 @@
 import { GrafanaPlugin, NavModel, NavModelItem, PanelPluginMeta, PluginType } from '@grafana/data';
-import { config } from '@grafana/runtime';
 
 import { importPanelPluginFromMeta } from './importPanelPlugin';
 import { getPluginSettings } from './pluginSettings';
@@ -35,11 +34,6 @@ export function buildPluginSectionNav(
   pluginNav: NavModel | null,
   currentUrl: string
 ): NavModel | undefined {
-  // When topnav is disabled we only just show pluginNav like before
-  if (!config.featureToggles.topnav) {
-    return pluginNav ?? undefined;
-  }
-
   // shallow clone as we set active flag
   let copiedPluginNavSection = { ...pluginNavSection };
   let activePage: NavModelItem | undefined;
diff --git a/public/app/features/profile/ChangePasswordPage.test.tsx b/public/app/features/profile/ChangePasswordPage.test.tsx
index cc3bedbac83..55c2dcb2cc3 100644
--- a/public/app/features/profile/ChangePasswordPage.test.tsx
+++ b/public/app/features/profile/ChangePasswordPage.test.tsx
@@ -59,7 +59,6 @@ describe('ChangePasswordPage', () => {
 
   it('should show change password form when user has loaded', async () => {
     await getTestContext();
-    expect(screen.getByText('Change Your Password')).toBeInTheDocument();
 
     expect(screen.getByLabelText('Old password')).toBeInTheDocument();
     expect(screen.getByLabelText('New password')).toBeInTheDocument();
@@ -70,6 +69,7 @@ describe('ChangePasswordPage', () => {
     expect(screen.getByRole('link', { name: 'Cancel' })).toBeInTheDocument();
     expect(screen.getByRole('link', { name: 'Cancel' })).toHaveAttribute('href', '/profile');
   });
+
   it('should call changePassword if change password is valid', async () => {
     const { props } = await getTestContext();
 
diff --git a/public/app/features/profile/ChangePasswordPage.tsx b/public/app/features/profile/ChangePasswordPage.tsx
index b1c98e274db..a065ec2adc6 100644
--- a/public/app/features/profile/ChangePasswordPage.tsx
+++ b/public/app/features/profile/ChangePasswordPage.tsx
@@ -36,9 +36,6 @@ export function ChangePasswordPage({ loadUser, isUpdating, user, changePassword
       <Page.Contents isLoading={!Boolean(user)}>
         {user ? (
           <>
-            <Page.OldNavOnly>
-              <h3 className="page-sub-heading">Change Your Password</h3>
-            </Page.OldNavOnly>
             <ChangePasswordForm user={user} onChangePassword={changePassword} isSaving={isUpdating} />
           </>
         ) : null}
diff --git a/public/app/features/scenes/dashboard/DashboardScene.tsx b/public/app/features/scenes/dashboard/DashboardScene.tsx
index 8f3a8ffcdb2..88ab5308405 100644
--- a/public/app/features/scenes/dashboard/DashboardScene.tsx
+++ b/public/app/features/scenes/dashboard/DashboardScene.tsx
@@ -2,9 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
+import { locationService } from '@grafana/runtime';
 import { UrlSyncManager, SceneObjectBase, SceneComponentProps, SceneObject, SceneObjectState } from '@grafana/scenes';
-import { PageToolbar, ToolbarButton, useStyles2 } from '@grafana/ui';
+import { ToolbarButton, useStyles2 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { Page } from 'app/core/components/Page/Page';
 
@@ -48,11 +48,7 @@ function DashboardSceneRenderer({ model }: SceneComponentProps<DashboardScene>)
       />
     );
   }
-  const pageToolbar = config.featureToggles.topnav ? (
-    <AppChromeUpdate actions={toolbarActions} />
-  ) : (
-    <PageToolbar title={title}>{toolbarActions}</PageToolbar>
-  );
+  const pageToolbar = <AppChromeUpdate actions={toolbarActions} />;
 
   return (
     <Page navId="scenes" pageNav={{ text: title }} layout={PageLayoutType.Canvas} toolbar={pageToolbar}>
diff --git a/public/app/features/search/components/DashboardSearch.tsx b/public/app/features/search/components/DashboardSearch.tsx
deleted file mode 100644
index 260c2a64d75..00000000000
--- a/public/app/features/search/components/DashboardSearch.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useEffect } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { IconButton, stylesFactory, useStyles2 } from '@grafana/ui';
-
-import { useKeyNavigationListener } from '../hooks/useSearchKeyboardSelection';
-import { SearchView } from '../page/components/SearchView';
-import { getSearchStateManager } from '../state/SearchStateManager';
-
-export interface Props {}
-
-export function DashboardSearch({}: Props) {
-  const styles = useStyles2(getStyles);
-  const stateManager = getSearchStateManager();
-  const state = stateManager.useState();
-
-  useEffect(() => stateManager.initStateFromUrl(), [stateManager]);
-
-  const { onKeyDown, keyboardEvents } = useKeyNavigationListener();
-
-  return (
-    <div className={styles.overlay}>
-      <div className={styles.container}>
-        <div className={styles.searchField}>
-          <div>
-            <input
-              type="text"
-              // eslint-disable-next-line jsx-a11y/no-autofocus
-              autoFocus
-              placeholder={state.includePanels ? 'Search dashboards and panels by name' : 'Search dashboards by name'}
-              value={state.query ?? ''}
-              onChange={(e) => stateManager.onQueryChange(e.currentTarget.value)}
-              onKeyDown={onKeyDown}
-              spellCheck={false}
-              className={styles.input}
-            />
-          </div>
-
-          <div className={styles.closeBtn}>
-            <IconButton name="times" onClick={stateManager.onCloseSearch} size="xxl" tooltip="Close search" />
-          </div>
-        </div>
-        <div className={styles.search}>
-          <SearchView showManage={false} keyboardEvents={keyboardEvents} />
-        </div>
-      </div>
-    </div>
-  );
-}
-
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    overlay: css`
-      left: 0;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      z-index: ${theme.zIndex.sidemenu};
-      position: fixed;
-      background: ${theme.colors.background.canvas};
-      padding: ${theme.spacing(1)};
-
-      ${theme.breakpoints.up('md')} {
-        left: ${theme.components.sidemenu.width}px;
-        z-index: ${theme.zIndex.navbarFixed + 1};
-        padding: ${theme.spacing(2)};
-      }
-    `,
-    container: css`
-      display: flex;
-      flex-direction: column;
-      max-width: 1400px;
-      margin: 0 auto;
-      padding: ${theme.spacing(1)};
-      background: ${theme.colors.background.primary};
-      border: 1px solid ${theme.components.panel.borderColor};
-      height: 100%;
-
-      ${theme.breakpoints.up('md')} {
-        padding: ${theme.spacing(3)};
-      }
-    `,
-    closeBtn: css`
-      right: -5px;
-      top: 2px;
-      z-index: 1;
-      position: absolute;
-    `,
-    searchField: css`
-      position: relative;
-    `,
-    search: css`
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-      height: 100%;
-      padding: ${theme.spacing(2, 0, 3, 0)};
-    `,
-    input: css`
-      box-sizing: border-box;
-      outline: none;
-      background-color: transparent;
-      background: transparent;
-      border-bottom: 2px solid ${theme.v1.colors.border1};
-      font-size: 20px;
-      line-height: 38px;
-      width: 100%;
-
-      &::placeholder {
-        color: ${theme.v1.colors.textWeak};
-      }
-    `,
-  };
-});
diff --git a/public/app/features/search/components/SearchWrapper.tsx b/public/app/features/search/components/SearchWrapper.tsx
index 5e2b73f9be3..86e81409942 100644
--- a/public/app/features/search/components/SearchWrapper.tsx
+++ b/public/app/features/search/components/SearchWrapper.tsx
@@ -1,24 +1,14 @@
 import React, { memo } from 'react';
 
-import { config } from '@grafana/runtime';
 import { useUrlParams } from 'app/core/navigation/hooks';
 
-import { DashboardSearch } from './DashboardSearch';
 import { DashboardSearchModal } from './DashboardSearchModal';
 
 export const SearchWrapper = memo(() => {
   const [params] = useUrlParams();
   const isOpen = params.get('search') === 'open';
-  const isTopnav = config.featureToggles.topnav;
 
-  return isOpen ? (
-    isTopnav ? (
-      <DashboardSearchModal isOpen={isOpen} />
-    ) : (
-      // TODO: remove this component when we turn on the topnav feature toggle
-      <DashboardSearch />
-    )
-  ) : null;
+  return isOpen ? <DashboardSearchModal isOpen={isOpen} /> : null;
 });
 
 SearchWrapper.displayName = 'SearchWrapper';
diff --git a/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx b/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
index 23f073c7a64..45e612ea85b 100644
--- a/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
@@ -100,9 +100,6 @@ export const ServiceAccountCreatePage = ({}: Props): JSX.Element => {
   return (
     <Page navId="serviceaccounts" pageNav={{ text: 'Create service account' }}>
       <Page.Contents>
-        <Page.OldNavOnly>
-          <h3 className="page-sub-heading">Create service account</h3>
-        </Page.OldNavOnly>
         <Form onSubmit={onSubmit} validateOn="onSubmit">
           {({ register, errors }) => {
             return (
diff --git a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
index 8f04334e591..a696c82af20 100644
--- a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
@@ -4,7 +4,7 @@ import React, { useEffect, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { GrafanaTheme2, OrgRole } from '@grafana/data';
-import { ConfirmModal, FilterInput, Icon, LinkButton, RadioButtonGroup, Tooltip, useStyles2 } from '@grafana/ui';
+import { ConfirmModal, FilterInput, LinkButton, RadioButtonGroup, useStyles2 } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import { Page } from 'app/core/components/Page/Page';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
@@ -166,21 +166,6 @@ export const ServiceAccountsListPageUnconnected = ({
   return (
     <Page navId="serviceaccounts" subTitle={subTitle}>
       <Page.Contents>
-        <Page.OldNavOnly>
-          <div className={styles.pageHeader}>
-            <h2>Service accounts</h2>
-            <div className={styles.apiKeyInfoLabel}>
-              <Tooltip
-                placement="bottom"
-                interactive
-                content={<>API keys are now service accounts with tokens. Find out more {docsLink}</>}
-              >
-                <Icon name="question-circle" />
-              </Tooltip>
-              <span>Looking for API keys?</span>
-            </div>
-          </div>
-        </Page.OldNavOnly>
         <div className="page-action-bar">
           <div className="gf-form gf-form--grow">
             <FilterInput
diff --git a/public/app/features/storage/StorageFolderPage.tsx b/public/app/features/storage/StorageFolderPage.tsx
index dd9a1276fcd..9ce2d424e61 100644
--- a/public/app/features/storage/StorageFolderPage.tsx
+++ b/public/app/features/storage/StorageFolderPage.tsx
@@ -2,8 +2,7 @@ import React from 'react';
 import { useAsync } from 'react-use';
 
 import { DataFrame, NavModel, NavModelItem } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { Alert, Card, Icon, Spinner } from '@grafana/ui';
+import { Card, Icon, Spinner } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
@@ -49,11 +48,6 @@ export function StorageFolderPage(props: Props) {
 
   return (
     <Page navModel={navModel} pageNav={pageNav}>
-      {!config.featureToggles.topnav && (
-        <div>
-          <Alert title="Enable the topnav feature toggle">This page is designed assuming topnav is enabled</Alert>
-        </div>
-      )}
       {renderListing()}
     </Page>
   );
diff --git a/public/app/features/support-bundles/SupportBundles.tsx b/public/app/features/support-bundles/SupportBundles.tsx
index f815126d296..303185161b0 100644
--- a/public/app/features/support-bundles/SupportBundles.tsx
+++ b/public/app/features/support-bundles/SupportBundles.tsx
@@ -2,7 +2,6 @@ import React, { useEffect } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { dateTimeFormat } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { LinkButton, Spinner, IconButton } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
@@ -59,13 +58,11 @@ const SupportBundlesUnconnected = ({ supportBundles, isLoading, loadBundles, rem
     contextSrv.isGrafanaAdmin
   );
 
-  const actions = config.featureToggles.topnav && hasAccess ? NewBundleButton : undefined;
+  const actions = hasAccess ? NewBundleButton : undefined;
 
   return (
     <Page navId="support-bundles" subTitle={subTitle} actions={actions}>
       <Page.Contents isLoading={isLoading}>
-        {!config.featureToggles.topnav && hasAccess && NewBundleButton}
-
         <table className="filter-table form-inline">
           <thead>
             <tr>
diff --git a/public/app/features/support-bundles/SupportBundlesCreate.tsx b/public/app/features/support-bundles/SupportBundlesCreate.tsx
index 10fea8602cc..74c87f68053 100644
--- a/public/app/features/support-bundles/SupportBundlesCreate.tsx
+++ b/public/app/features/support-bundles/SupportBundlesCreate.tsx
@@ -56,9 +56,6 @@ export const SupportBundlesCreateUnconnected = ({
   return (
     <Page navId="support-bundles" pageNav={{ text: 'Create support bundle' }} subTitle={subTitle}>
       <Page.Contents isLoading={isLoading}>
-        <Page.OldNavOnly>
-          <h3 className="page-sub-heading">Create support bundle</h3>
-        </Page.OldNavOnly>
         {loadCollectorsError && <Alert title={loadCollectorsError} severity="error" />}
         {createBundleError && <Alert title={createBundleError} severity="error" />}
         {!!collectors.length && (
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index bc6820ed411..a41e7ee3f06 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { Redirect } from 'react-router-dom';
 
 import { isTruthy } from '@grafana/data';
-import { NavLandingPage } from 'app/core/components/AppChrome/NavLandingPage';
 import { ErrorPage } from 'app/core/components/ErrorPage/ErrorPage';
 import { LoginPage } from 'app/core/components/Login/LoginPage';
+import { NavLandingPage } from 'app/core/components/NavLandingPage/NavLandingPage';
 import config from 'app/core/config';
 import { contextSrv } from 'app/core/services/context_srv';
 import UserAdminPage from 'app/features/admin/UserAdminPage';
@@ -24,35 +24,6 @@ import { getPublicDashboardRoutes } from '../features/dashboard/routes';
 export const extraRoutes: RouteDescriptor[] = [];
 
 export function getAppRoutes(): RouteDescriptor[] {
-  const topnavRoutes: RouteDescriptor[] = config.featureToggles.topnav
-    ? [
-        {
-          path: '/apps',
-          component: () => <NavLandingPage navId="apps" />,
-        },
-        {
-          path: '/alerts-and-incidents',
-          component: () => <NavLandingPage navId="alerts-and-incidents" />,
-        },
-        {
-          path: '/monitoring',
-          component: () => <NavLandingPage navId="monitoring" />,
-        },
-        {
-          path: '/admin/general',
-          component: () => <NavLandingPage navId="admin/general" />,
-        },
-        {
-          path: '/admin/plugins',
-          component: () => <NavLandingPage navId="admin/plugins" />,
-        },
-        {
-          path: '/admin/access',
-          component: () => <NavLandingPage navId="admin/access" />,
-        },
-      ]
-    : [];
-
   return [
     // Based on the Grafana configuration standalone plugin pages can even override and extend existing core pages, or they can register new routes under existing ones.
     // In order to make it possible we need to register them first due to how `<Switch>` is evaluating routes. (This will be unnecessary once/when we upgrade to React Router v6 and start using `<Routes>` instead.)
@@ -228,7 +199,30 @@ export function getAppRoutes(): RouteDescriptor[] {
           : import(/* webpackChunkName: "explore-feature-toggle-page" */ 'app/features/explore/FeatureTogglePage')
       ),
     },
-    ...topnavRoutes,
+    {
+      path: '/apps',
+      component: () => <NavLandingPage navId="apps" />,
+    },
+    {
+      path: '/alerts-and-incidents',
+      component: () => <NavLandingPage navId="alerts-and-incidents" />,
+    },
+    {
+      path: '/monitoring',
+      component: () => <NavLandingPage navId="monitoring" />,
+    },
+    {
+      path: '/admin/general',
+      component: () => <NavLandingPage navId="admin/general" />,
+    },
+    {
+      path: '/admin/plugins',
+      component: () => <NavLandingPage navId="admin/plugins" />,
+    },
+    {
+      path: '/admin/access',
+      component: () => <NavLandingPage navId="admin/access" />,
+    },
     {
       path: '/org',
       component: SafeDynamicImport(
@@ -323,17 +317,15 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/admin',
-      component: () => (config.featureToggles.topnav ? <NavLandingPage navId="cfg" /> : <Redirect to="/admin/users" />),
+      component: () => <NavLandingPage navId="cfg" />,
     },
     {
       path: '/admin/access',
-      component: () =>
-        config.featureToggles.topnav ? <NavLandingPage navId="admin/access" /> : <Redirect to="/admin/users" />,
+      component: () => <NavLandingPage navId="admin/access" />,
     },
     {
       path: '/admin/config',
-      component: () =>
-        config.featureToggles.topnav ? <NavLandingPage navId="admin/config" /> : <Redirect to="/admin/org" />,
+      component: () => <NavLandingPage navId="admin/config" />,
     },
     {
       path: '/admin/settings',
@@ -347,11 +339,9 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/admin/users',
-      component: config.featureToggles.topnav
-        ? SafeDynamicImport(() => import(/* webpackChunkName: "UserListPage" */ 'app/features/admin/UserListPage'))
-        : SafeDynamicImport(
-            () => import(/* webpackChunkName: "UserListAdminPage" */ 'app/features/admin/UserListAdminPage')
-          ),
+      component: SafeDynamicImport(
+        () => import(/* webpackChunkName: "UserListPage" */ 'app/features/admin/UserListPage')
+      ),
     },
     {
       path: '/admin/users/create',
diff --git a/yarn.lock b/yarn.lock
index 7100713f754..24a60dab0d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20375,7 +20375,6 @@ __metadata:
     react-redux: 7.2.6
     react-refresh: 0.14.0
     react-resizable: 3.0.4
-    react-reverse-portal: 2.1.1
     react-router-dom: 5.3.3
     react-select: 5.7.0
     react-select-event: 5.5.1
@@ -31182,16 +31181,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-reverse-portal@npm:2.1.1":
-  version: 2.1.1
-  resolution: "react-reverse-portal@npm:2.1.1"
-  peerDependencies:
-    react: ^16.0.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: 2daccae3ac089606acee3a13fa5cde07ef90668de775bcc49edceb3f472f82e133f0673bb3b82dc53687c3ebd781c578f81eb4368c6028acd9c4625e71964394
-  languageName: node
-  linkType: hard
-
 "react-router-dom@npm:5.3.3":
   version: 5.3.3
   resolution: "react-router-dom@npm:5.3.3"

From cab3ba519aab52c888c759767e7a792c11b54e7d Mon Sep 17 00:00:00 2001
From: Arati R <33031346+suntala@users.noreply.github.com>
Date: Fri, 14 Apr 2023 11:17:23 +0200
Subject: [PATCH 134/729] NestedFolders: Add folder service registry with
 dashboard service implementation (#65033)

* Delete folders, dashboards with registry service
Co-authored-by: Serge Zaitsev <hello@zserge.com>
* Update signature of ProvideDashboardServiceImpl
* Regenerate mockery file
* Add test for DeleteInFolder
* Add test for DeleteDashboardsInFolder
* Delete child dashboard associations via registry
* Add validation of folder uid and org id

---------

Co-authored-by: Serge Zaitsev <hello@zserge.com>
---
 pkg/api/dashboard_permission_test.go          |  18 +-
 pkg/api/dashboard_test.go                     |  32 +-
 pkg/api/folder_permission_test.go             |  12 +-
 pkg/services/dashboards/dashboard.go          |   1 +
 pkg/services/dashboards/database/database.go  | 149 ++--
 .../dashboards/database/database_test.go      |  19 +
 pkg/services/dashboards/models.go             |   5 +
 .../dashboards/service/dashboard_service.go   |  15 +-
 .../dashboard_service_integration_test.go     |  15 +-
 .../service/dashboard_service_test.go         |   7 +
 pkg/services/dashboards/store_mock.go         | 810 +++++++++++++++++-
 pkg/services/folder/folderimpl/folder.go      |  42 +-
 pkg/services/folder/foldertest/foldertest.go  |   4 +
 pkg/services/folder/model.go                  |   1 +
 pkg/services/folder/registry.go               |  10 +
 pkg/services/folder/service.go                |   1 +
 .../libraryelements/libraryelements_test.go   |   6 +-
 .../librarypanels/librarypanels_test.go       |   3 +-
 pkg/services/ngalert/store/testing.go         |   5 +-
 19 files changed, 1039 insertions(+), 116 deletions(-)
 create mode 100644 pkg/services/folder/registry.go

diff --git a/pkg/api/dashboard_permission_test.go b/pkg/api/dashboard_permission_test.go
index 32784bb4130..db4cb6b8d8b 100644
--- a/pkg/api/dashboard_permission_test.go
+++ b/pkg/api/dashboard_permission_test.go
@@ -42,15 +42,17 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
 		dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
 
 		folderSvc := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), settings, dashboardStore, foldertest.NewFakeFolderStore(t), mockSQLStore, featuremgmt.WithFeatures())
+		dashboardService, err := dashboardservice.ProvideDashboardServiceImpl(
+			settings, dashboardStore, foldertest.NewFakeFolderStore(t), nil, features, folderPermissions, dashboardPermissions, ac,
+			folderSvc,
+		)
+		require.NoError(t, err)
 		hs := &HTTPServer{
-			Cfg:      settings,
-			SQLStore: mockSQLStore,
-			Features: features,
-			DashboardService: dashboardservice.ProvideDashboardServiceImpl(
-				settings, dashboardStore, foldertest.NewFakeFolderStore(t), nil, features, folderPermissions, dashboardPermissions, ac,
-				folderSvc,
-			),
-			AccessControl: accesscontrolmock.New().WithDisabled(),
+			Cfg:              settings,
+			SQLStore:         mockSQLStore,
+			Features:         features,
+			DashboardService: dashboardService,
+			AccessControl:    accesscontrolmock.New().WithDisabled(),
 		}
 
 		t.Run("Given user has no admin permissions", func(t *testing.T) {
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index bd84bb0c8d7..ca4cbba1b87 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -1096,26 +1096,30 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
 		cfg, dashboardStore, folderStore, db.InitTestDB(t), featuremgmt.WithFeatures())
 
 	if dashboardService == nil {
-		dashboardService = service.ProvideDashboardServiceImpl(
+		dashboardService, err = service.ProvideDashboardServiceImpl(
 			cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
 			ac, folderSvc,
 		)
+		require.NoError(t, err)
 	}
 
+	dashboardProvisioningService, err := service.ProvideDashboardServiceImpl(
+		cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
+		ac, folderSvc,
+	)
+	require.NoError(t, err)
+
 	hs := &HTTPServer{
-		Cfg:                   cfg,
-		LibraryPanelService:   &libraryPanelsService,
-		LibraryElementService: &libraryElementsService,
-		SQLStore:              sc.sqlStore,
-		ProvisioningService:   provisioningService,
-		AccessControl:         accesscontrolmock.New(),
-		dashboardProvisioningService: service.ProvideDashboardServiceImpl(
-			cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
-			ac, folderSvc,
-		),
-		DashboardService: dashboardService,
-		Features:         featuremgmt.WithFeatures(),
-		Kinds:            corekind.NewBase(nil),
+		Cfg:                          cfg,
+		LibraryPanelService:          &libraryPanelsService,
+		LibraryElementService:        &libraryElementsService,
+		SQLStore:                     sc.sqlStore,
+		ProvisioningService:          provisioningService,
+		AccessControl:                accesscontrolmock.New(),
+		dashboardProvisioningService: dashboardProvisioningService,
+		DashboardService:             dashboardService,
+		Features:                     featuremgmt.WithFeatures(),
+		Kinds:                        corekind.NewBase(nil),
 	}
 
 	hs.callGetDashboard(sc)
diff --git a/pkg/api/folder_permission_test.go b/pkg/api/folder_permission_test.go
index aa9f64988c5..220fb259368 100644
--- a/pkg/api/folder_permission_test.go
+++ b/pkg/api/folder_permission_test.go
@@ -37,6 +37,11 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
 	ac := accesscontrolmock.New()
 	folderPermissions := accesscontrolmock.NewMockedPermissionsService()
 	dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
+	dashboardService, err := service.ProvideDashboardServiceImpl(
+		settings, dashboardStore, foldertest.NewFakeFolderStore(t), nil, features, folderPermissions, dashboardPermissions, ac,
+		folderService,
+	)
+	require.NoError(t, err)
 
 	hs := &HTTPServer{
 		Cfg:                         settings,
@@ -44,11 +49,8 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
 		folderService:               folderService,
 		folderPermissionsService:    folderPermissions,
 		dashboardPermissionsService: dashboardPermissions,
-		DashboardService: service.ProvideDashboardServiceImpl(
-			settings, dashboardStore, foldertest.NewFakeFolderStore(t), nil, features, folderPermissions, dashboardPermissions, ac,
-			folderService,
-		),
-		AccessControl: accesscontrolmock.New().WithDisabled(),
+		DashboardService:            dashboardService,
+		AccessControl:               accesscontrolmock.New().WithDisabled(),
 	}
 
 	t.Run("Given folder not exists", func(t *testing.T) {
diff --git a/pkg/services/dashboards/dashboard.go b/pkg/services/dashboards/dashboard.go
index e90f7a04759..5cab7bb3170 100644
--- a/pkg/services/dashboards/dashboard.go
+++ b/pkg/services/dashboards/dashboard.go
@@ -84,4 +84,5 @@ type Store interface {
 	// CountDashboardsInFolder returns the number of dashboards associated with
 	// the given parent folder ID.
 	CountDashboardsInFolder(ctx context.Context, request *CountDashboardsInFolderRequest) (int64, error)
+	DeleteDashboardsInFolder(ctx context.Context, request *DeleteDashboardsInFolderRequest) error
 }
diff --git a/pkg/services/dashboards/database/database.go b/pkg/services/dashboards/database/database.go
index 979de85fe25..4b3b9cb10f0 100644
--- a/pkg/services/dashboards/database/database.go
+++ b/pkg/services/dashboards/database/database.go
@@ -713,75 +713,19 @@ func (d *dashboardStore) deleteDashboard(cmd *dashboards.DeleteDashboardCommand,
 	if dashboard.IsFolder {
 		deletes = append(deletes, "DELETE FROM dashboard WHERE folder_id = ?")
 
-		var dashIds []struct {
-			Id  int64
-			Uid string
-		}
-		err := sess.SQL("SELECT id, uid FROM dashboard WHERE folder_id = ?", dashboard.ID).Find(&dashIds)
-		if err != nil {
+		if err := d.deleteChildrenDashboardAssociations(sess, dashboard); err != nil {
 			return err
 		}
 
-		for _, id := range dashIds {
-			if err := d.deleteAlertDefinition(id.Id, sess); err != nil {
-				return err
-			}
-		}
-
 		// remove all access control permission with folder scope
 		_, err = sess.Exec("DELETE FROM permission WHERE scope = ?", dashboards.ScopeFoldersProvider.GetResourceScopeUID(dashboard.UID))
 		if err != nil {
 			return err
 		}
 
-		for _, dash := range dashIds {
-			// remove all access control permission with child dashboard scopes
-			_, err = sess.Exec("DELETE FROM permission WHERE scope = ?", ac.GetResourceScopeUID("dashboards", dash.Uid))
-			if err != nil {
-				return err
-			}
-		}
-
-		if len(dashIds) > 0 {
-			childrenDeletes := []string{
-				"DELETE FROM dashboard_tag WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
-				"DELETE FROM star WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
-				"DELETE FROM dashboard_version WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
-				"DELETE FROM annotation WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
-				"DELETE FROM dashboard_provisioning WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
-				"DELETE FROM dashboard_acl WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
-			}
-			for _, sql := range childrenDeletes {
-				_, err := sess.Exec(sql, dashboard.OrgID, dashboard.ID)
-				if err != nil {
-					return err
-				}
-			}
-		}
-
-		var existingRuleID int64
-		exists, err := sess.Table("alert_rule").Where("namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)", dashboard.ID).Cols("id").Get(&existingRuleID)
-		if err != nil {
+		if err := deleteFolderAlertRules(sess, dashboard, cmd.ForceDeleteFolderRules); err != nil {
 			return err
 		}
-		if exists {
-			if !cmd.ForceDeleteFolderRules {
-				return fmt.Errorf("folder cannot be deleted: %w", dashboards.ErrFolderContainsAlertRules)
-			}
-
-			// Delete all rules under this folder.
-			deleteNGAlertsByFolder := []string{
-				"DELETE FROM alert_rule WHERE namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)",
-				"DELETE FROM alert_rule_version WHERE rule_namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)",
-			}
-
-			for _, sql := range deleteNGAlertsByFolder {
-				_, err := sess.Exec(sql, dashboard.ID)
-				if err != nil {
-					return err
-				}
-			}
-		}
 	} else {
 		_, err = sess.Exec("DELETE FROM permission WHERE scope = ?", ac.GetResourceScopeUID("dashboards", dashboard.UID))
 		if err != nil {
@@ -809,6 +753,74 @@ func (d *dashboardStore) deleteDashboard(cmd *dashboards.DeleteDashboardCommand,
 	return nil
 }
 
+func (d *dashboardStore) deleteChildrenDashboardAssociations(sess *db.Session, dashboard dashboards.Dashboard) error {
+	var dashIds []struct {
+		Id  int64
+		Uid string
+	}
+	err := sess.SQL("SELECT id, uid FROM dashboard WHERE folder_id = ?", dashboard.ID).Find(&dashIds)
+	if err != nil {
+		return err
+	}
+
+	if len(dashIds) > 0 {
+		for _, dash := range dashIds {
+			if err := d.deleteAlertDefinition(dash.Id, sess); err != nil {
+				return err
+			}
+
+			// remove all access control permission with child dashboard scopes
+			_, err = sess.Exec("DELETE FROM permission WHERE scope = ?", ac.GetResourceScopeUID("dashboards", dash.Uid))
+			if err != nil {
+				return err
+			}
+		}
+
+		childrenDeletes := []string{
+			"DELETE FROM dashboard_tag WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
+			"DELETE FROM star WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
+			"DELETE FROM dashboard_version WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
+			"DELETE FROM annotation WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
+			"DELETE FROM dashboard_provisioning WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
+			"DELETE FROM dashboard_acl WHERE dashboard_id IN (SELECT id FROM dashboard WHERE org_id = ? AND folder_id = ?)",
+		}
+		for _, sql := range childrenDeletes {
+			_, err := sess.Exec(sql, dashboard.OrgID, dashboard.ID)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func deleteFolderAlertRules(sess *db.Session, dashboard dashboards.Dashboard, forceDeleteFolderAlertRules bool) error {
+	var existingRuleID int64
+	exists, err := sess.Table("alert_rule").Where("namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)", dashboard.ID).Cols("id").Get(&existingRuleID)
+	if err != nil {
+		return err
+	}
+	if exists {
+		if !forceDeleteFolderAlertRules {
+			return fmt.Errorf("folder cannot be deleted: %w", dashboards.ErrFolderContainsAlertRules)
+		}
+
+		// Delete all rules under this folder.
+		deleteNGAlertsByFolder := []string{
+			"DELETE FROM alert_rule WHERE namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)",
+			"DELETE FROM alert_rule_version WHERE rule_namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)",
+		}
+
+		for _, sql := range deleteNGAlertsByFolder {
+			_, err := sess.Exec(sql, dashboard.ID)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func createEntityEvent(dashboard *dashboards.Dashboard, eventType store.EntityEventType) *store.EntityEvent {
 	var entityEvent *store.EntityEvent
 	if dashboard.IsFolder {
@@ -1045,6 +1057,27 @@ func (d *dashboardStore) CountDashboardsInFolder(
 	return count, err
 }
 
+func (d *dashboardStore) DeleteDashboardsInFolder(
+	ctx context.Context, req *dashboards.DeleteDashboardsInFolderRequest) error {
+	return d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
+		dashboard := dashboards.Dashboard{OrgID: req.OrgID}
+		has, err := sess.Where("uid = ? AND org_id = ?", req.FolderUID, req.OrgID).Get(&dashboard)
+		if err != nil {
+			return err
+		}
+		if !has {
+			return dashboards.ErrFolderNotFound
+		}
+
+		if err := d.deleteChildrenDashboardAssociations(sess, dashboard); err != nil {
+			return err
+		}
+
+		_, err = sess.Where("folder_id = ? AND org_id = ? AND is_folder = ?", dashboard.ID, dashboard.OrgID, false).Delete(&dashboards.Dashboard{})
+		return err
+	})
+}
+
 func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
 	limits := &quota.Map{}
 
diff --git a/pkg/services/dashboards/database/database_test.go b/pkg/services/dashboards/database/database_test.go
index 3bdf7c38869..5ada585b6ee 100644
--- a/pkg/services/dashboards/database/database_test.go
+++ b/pkg/services/dashboards/database/database_test.go
@@ -491,6 +491,25 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, int64(2), count)
 	})
+
+	t.Run("Can delete dashboards in folder", func(t *testing.T) {
+		setup()
+		folder := insertTestDashboard(t, dashboardStore, "dash folder", 1, 0, true, "prod", "webapp")
+		_ = insertTestDashboard(t, dashboardStore, "delete me 1", 1, folder.ID, false, "delete this 1")
+		_ = insertTestDashboard(t, dashboardStore, "delete me 2", 1, folder.ID, false, "delete this 2")
+
+		err := dashboardStore.DeleteDashboardsInFolder(
+			context.Background(),
+			&dashboards.DeleteDashboardsInFolderRequest{
+				FolderUID: folder.UID,
+				OrgID:     1,
+			})
+		require.NoError(t, err)
+
+		count, err := dashboardStore.CountDashboardsInFolder(context.Background(), &dashboards.CountDashboardsInFolderRequest{FolderID: 2, OrgID: 1})
+		require.NoError(t, err)
+		require.Equal(t, count, int64(0))
+	})
 }
 
 func TestIntegrationDashboardDataAccessGivenPluginWithImportedDashboards(t *testing.T) {
diff --git a/pkg/services/dashboards/models.go b/pkg/services/dashboards/models.go
index 98384bd0ddf..8e4b65ef672 100644
--- a/pkg/services/dashboards/models.go
+++ b/pkg/services/dashboards/models.go
@@ -340,6 +340,11 @@ func FromDashboard(dash *Dashboard) *folder.Folder {
 	}
 }
 
+type DeleteDashboardsInFolderRequest struct {
+	FolderUID string
+	OrgID     int64
+}
+
 //
 // DASHBOARD ACL
 //
diff --git a/pkg/services/dashboards/service/dashboard_service.go b/pkg/services/dashboards/service/dashboard_service.go
index d6dd003dde1..4c2650452e6 100644
--- a/pkg/services/dashboards/service/dashboard_service.go
+++ b/pkg/services/dashboards/service/dashboard_service.go
@@ -18,6 +18,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/search/model"
+	"github.com/grafana/grafana/pkg/services/store/entity"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -55,7 +56,7 @@ func ProvideDashboardServiceImpl(
 	features featuremgmt.FeatureToggles, folderPermissionsService accesscontrol.FolderPermissionsService,
 	dashboardPermissionsService accesscontrol.DashboardPermissionsService, ac accesscontrol.AccessControl,
 	folderSvc folder.Service,
-) *DashboardServiceImpl {
+) (*DashboardServiceImpl, error) {
 	dashSvc := &DashboardServiceImpl{
 		cfg:                  cfg,
 		log:                  log.New("dashboard-service"),
@@ -72,7 +73,11 @@ func ProvideDashboardServiceImpl(
 	ac.RegisterScopeAttributeResolver(dashboards.NewDashboardIDScopeResolver(folderStore, dashSvc, folderSvc))
 	ac.RegisterScopeAttributeResolver(dashboards.NewDashboardUIDScopeResolver(folderStore, dashSvc, folderSvc))
 
-	return dashSvc
+	if err := folderSvc.RegisterService(dashSvc); err != nil {
+		return nil, err
+	}
+
+	return dashSvc, nil
 }
 
 func (dr *DashboardServiceImpl) GetProvisionedDashboardData(ctx context.Context, name string) ([]*dashboards.DashboardProvisioning, error) {
@@ -641,3 +646,9 @@ func (dr DashboardServiceImpl) CountDashboardsInFolder(ctx context.Context, quer
 
 	return dr.dashboardStore.CountDashboardsInFolder(ctx, &dashboards.CountDashboardsInFolderRequest{FolderID: folder.ID, OrgID: u.OrgID})
 }
+
+func (dr *DashboardServiceImpl) DeleteInFolder(ctx context.Context, orgID int64, UID string) error {
+	return dr.dashboardStore.DeleteDashboardsInFolder(ctx, &dashboards.DeleteDashboardsInFolderRequest{FolderUID: UID, OrgID: orgID})
+}
+
+func (dr *DashboardServiceImpl) Kind() string { return entity.StandardKindDashboard }
diff --git a/pkg/services/dashboards/service/dashboard_service_integration_test.go b/pkg/services/dashboards/service/dashboard_service_integration_test.go
index 682278dbeb6..19230e3be24 100644
--- a/pkg/services/dashboards/service/dashboard_service_integration_test.go
+++ b/pkg/services/dashboards/service/dashboard_service_integration_test.go
@@ -828,7 +828,7 @@ func permissionScenario(t *testing.T, desc string, canSave bool, fn permissionSc
 		dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 		require.NoError(t, err)
 		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-		service := ProvideDashboardServiceImpl(
+		service, err := ProvideDashboardServiceImpl(
 			cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 			featuremgmt.WithFeatures(),
 			accesscontrolmock.NewMockedPermissionsService(),
@@ -836,6 +836,7 @@ func permissionScenario(t *testing.T, desc string, canSave bool, fn permissionSc
 			accesscontrolmock.New(),
 			foldertest.NewFakeService(),
 		)
+		require.NoError(t, err)
 		guardian.InitLegacyGuardian(cfg, sqlStore, service, &teamtest.FakeService{})
 
 		savedFolder := saveTestFolder(t, "Saved folder", testOrgID, sqlStore)
@@ -889,7 +890,7 @@ func callSaveWithResult(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSt
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	service := ProvideDashboardServiceImpl(
+	service, err := ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 		featuremgmt.WithFeatures(),
 		accesscontrolmock.NewMockedPermissionsService(),
@@ -897,6 +898,7 @@ func callSaveWithResult(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSt
 		accesscontrolmock.New(),
 		foldertest.NewFakeService(),
 	)
+	require.NoError(t, err)
 	res, err := service.SaveDashboard(context.Background(), &dto, false)
 	require.NoError(t, err)
 
@@ -912,7 +914,7 @@ func callSaveWithError(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSto
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	service := ProvideDashboardServiceImpl(
+	service, err := ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 		featuremgmt.WithFeatures(),
 		accesscontrolmock.NewMockedPermissionsService(),
@@ -920,6 +922,7 @@ func callSaveWithError(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSto
 		accesscontrolmock.New(),
 		foldertest.NewFakeService(),
 	)
+	require.NoError(t, err)
 	_, err = service.SaveDashboard(context.Background(), &dto, false)
 	return err
 }
@@ -953,7 +956,7 @@ func saveTestDashboard(t *testing.T, title string, orgID, folderID int64, sqlSto
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	service := ProvideDashboardServiceImpl(
+	service, err := ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 		featuremgmt.WithFeatures(),
 		accesscontrolmock.NewMockedPermissionsService(),
@@ -961,6 +964,7 @@ func saveTestDashboard(t *testing.T, title string, orgID, folderID int64, sqlSto
 		accesscontrolmock.New(),
 		foldertest.NewFakeService(),
 	)
+	require.NoError(t, err)
 	res, err := service.SaveDashboard(context.Background(), &dto, false)
 	require.NoError(t, err)
 
@@ -995,7 +999,7 @@ func saveTestFolder(t *testing.T, title string, orgID int64, sqlStore db.DB) *da
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	service := ProvideDashboardServiceImpl(
+	service, err := ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 		featuremgmt.WithFeatures(),
 		accesscontrolmock.NewMockedPermissionsService(),
@@ -1003,6 +1007,7 @@ func saveTestFolder(t *testing.T, title string, orgID int64, sqlStore db.DB) *da
 		accesscontrolmock.New(),
 		foldertest.NewFakeService(),
 	)
+	require.NoError(t, err)
 	res, err := service.SaveDashboard(context.Background(), &dto, false)
 	require.NoError(t, err)
 
diff --git a/pkg/services/dashboards/service/dashboard_service_test.go b/pkg/services/dashboards/service/dashboard_service_test.go
index a55a16083cd..50774fd5727 100644
--- a/pkg/services/dashboards/service/dashboard_service_test.go
+++ b/pkg/services/dashboards/service/dashboard_service_test.go
@@ -240,6 +240,13 @@ func TestDashboardService(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, int64(3), count)
 		})
+
+		t.Run("Delete dashboards in folder", func(t *testing.T) {
+			args := &dashboards.DeleteDashboardsInFolderRequest{OrgID: 1, FolderUID: "uid"}
+			fakeStore.On("DeleteDashboardsInFolder", mock.Anything, args).Return(nil).Once()
+			err := service.DeleteInFolder(context.Background(), 1, "uid")
+			require.NoError(t, err)
+		})
 	})
 
 	t.Run("Delete user by acl", func(t *testing.T) {
diff --git a/pkg/services/dashboards/store_mock.go b/pkg/services/dashboards/store_mock.go
index f32268a86ce..9ddc9858829 100644
--- a/pkg/services/dashboards/store_mock.go
+++ b/pkg/services/dashboards/store_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.16.0. DO NOT EDIT.
+// Code generated by mockery v2.23.2. DO NOT EDIT.
 
 package dashboards
 
@@ -18,11 +18,23 @@ type FakeDashboardStore struct {
 	mock.Mock
 }
 
+type FakeDashboardStore_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *FakeDashboardStore) EXPECT() *FakeDashboardStore_Expecter {
+	return &FakeDashboardStore_Expecter{mock: &_m.Mock}
+}
+
 // Count provides a mock function with given fields: _a0, _a1
 func (_m *FakeDashboardStore) Count(_a0 context.Context, _a1 *quota.ScopeParameters) (*quota.Map, error) {
 	ret := _m.Called(_a0, _a1)
 
 	var r0 *quota.Map
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *quota.ScopeParameters) (*quota.Map, error)); ok {
+		return rf(_a0, _a1)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *quota.ScopeParameters) *quota.Map); ok {
 		r0 = rf(_a0, _a1)
 	} else {
@@ -31,7 +43,6 @@ func (_m *FakeDashboardStore) Count(_a0 context.Context, _a1 *quota.ScopeParamet
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *quota.ScopeParameters) error); ok {
 		r1 = rf(_a0, _a1)
 	} else {
@@ -41,18 +52,50 @@ func (_m *FakeDashboardStore) Count(_a0 context.Context, _a1 *quota.ScopeParamet
 	return r0, r1
 }
 
+// FakeDashboardStore_Count_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Count'
+type FakeDashboardStore_Count_Call struct {
+	*mock.Call
+}
+
+// Count is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 *quota.ScopeParameters
+func (_e *FakeDashboardStore_Expecter) Count(_a0 interface{}, _a1 interface{}) *FakeDashboardStore_Count_Call {
+	return &FakeDashboardStore_Count_Call{Call: _e.mock.On("Count", _a0, _a1)}
+}
+
+func (_c *FakeDashboardStore_Count_Call) Run(run func(_a0 context.Context, _a1 *quota.ScopeParameters)) *FakeDashboardStore_Count_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*quota.ScopeParameters))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_Count_Call) Return(_a0 *quota.Map, _a1 error) *FakeDashboardStore_Count_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_Count_Call) RunAndReturn(run func(context.Context, *quota.ScopeParameters) (*quota.Map, error)) *FakeDashboardStore_Count_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // CountDashboardsInFolder provides a mock function with given fields: ctx, request
 func (_m *FakeDashboardStore) CountDashboardsInFolder(ctx context.Context, request *CountDashboardsInFolderRequest) (int64, error) {
 	ret := _m.Called(ctx, request)
 
 	var r0 int64
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *CountDashboardsInFolderRequest) (int64, error)); ok {
+		return rf(ctx, request)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *CountDashboardsInFolderRequest) int64); ok {
 		r0 = rf(ctx, request)
 	} else {
 		r0 = ret.Get(0).(int64)
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *CountDashboardsInFolderRequest) error); ok {
 		r1 = rf(ctx, request)
 	} else {
@@ -62,6 +105,35 @@ func (_m *FakeDashboardStore) CountDashboardsInFolder(ctx context.Context, reque
 	return r0, r1
 }
 
+// FakeDashboardStore_CountDashboardsInFolder_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CountDashboardsInFolder'
+type FakeDashboardStore_CountDashboardsInFolder_Call struct {
+	*mock.Call
+}
+
+// CountDashboardsInFolder is a helper method to define mock.On call
+//   - ctx context.Context
+//   - request *CountDashboardsInFolderRequest
+func (_e *FakeDashboardStore_Expecter) CountDashboardsInFolder(ctx interface{}, request interface{}) *FakeDashboardStore_CountDashboardsInFolder_Call {
+	return &FakeDashboardStore_CountDashboardsInFolder_Call{Call: _e.mock.On("CountDashboardsInFolder", ctx, request)}
+}
+
+func (_c *FakeDashboardStore_CountDashboardsInFolder_Call) Run(run func(ctx context.Context, request *CountDashboardsInFolderRequest)) *FakeDashboardStore_CountDashboardsInFolder_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*CountDashboardsInFolderRequest))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_CountDashboardsInFolder_Call) Return(_a0 int64, _a1 error) *FakeDashboardStore_CountDashboardsInFolder_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_CountDashboardsInFolder_Call) RunAndReturn(run func(context.Context, *CountDashboardsInFolderRequest) (int64, error)) *FakeDashboardStore_CountDashboardsInFolder_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // DeleteACLByUser provides a mock function with given fields: _a0, _a1
 func (_m *FakeDashboardStore) DeleteACLByUser(_a0 context.Context, _a1 int64) error {
 	ret := _m.Called(_a0, _a1)
@@ -76,6 +148,35 @@ func (_m *FakeDashboardStore) DeleteACLByUser(_a0 context.Context, _a1 int64) er
 	return r0
 }
 
+// FakeDashboardStore_DeleteACLByUser_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteACLByUser'
+type FakeDashboardStore_DeleteACLByUser_Call struct {
+	*mock.Call
+}
+
+// DeleteACLByUser is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 int64
+func (_e *FakeDashboardStore_Expecter) DeleteACLByUser(_a0 interface{}, _a1 interface{}) *FakeDashboardStore_DeleteACLByUser_Call {
+	return &FakeDashboardStore_DeleteACLByUser_Call{Call: _e.mock.On("DeleteACLByUser", _a0, _a1)}
+}
+
+func (_c *FakeDashboardStore_DeleteACLByUser_Call) Run(run func(_a0 context.Context, _a1 int64)) *FakeDashboardStore_DeleteACLByUser_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_DeleteACLByUser_Call) Return(_a0 error) *FakeDashboardStore_DeleteACLByUser_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardStore_DeleteACLByUser_Call) RunAndReturn(run func(context.Context, int64) error) *FakeDashboardStore_DeleteACLByUser_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // DeleteDashboard provides a mock function with given fields: ctx, cmd
 func (_m *FakeDashboardStore) DeleteDashboard(ctx context.Context, cmd *DeleteDashboardCommand) error {
 	ret := _m.Called(ctx, cmd)
@@ -90,6 +191,78 @@ func (_m *FakeDashboardStore) DeleteDashboard(ctx context.Context, cmd *DeleteDa
 	return r0
 }
 
+// FakeDashboardStore_DeleteDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteDashboard'
+type FakeDashboardStore_DeleteDashboard_Call struct {
+	*mock.Call
+}
+
+// DeleteDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - cmd *DeleteDashboardCommand
+func (_e *FakeDashboardStore_Expecter) DeleteDashboard(ctx interface{}, cmd interface{}) *FakeDashboardStore_DeleteDashboard_Call {
+	return &FakeDashboardStore_DeleteDashboard_Call{Call: _e.mock.On("DeleteDashboard", ctx, cmd)}
+}
+
+func (_c *FakeDashboardStore_DeleteDashboard_Call) Run(run func(ctx context.Context, cmd *DeleteDashboardCommand)) *FakeDashboardStore_DeleteDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*DeleteDashboardCommand))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_DeleteDashboard_Call) Return(_a0 error) *FakeDashboardStore_DeleteDashboard_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardStore_DeleteDashboard_Call) RunAndReturn(run func(context.Context, *DeleteDashboardCommand) error) *FakeDashboardStore_DeleteDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// DeleteDashboardsInFolder provides a mock function with given fields: ctx, request
+func (_m *FakeDashboardStore) DeleteDashboardsInFolder(ctx context.Context, request *DeleteDashboardsInFolderRequest) error {
+	ret := _m.Called(ctx, request)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *DeleteDashboardsInFolderRequest) error); ok {
+		r0 = rf(ctx, request)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// FakeDashboardStore_DeleteDashboardsInFolder_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteDashboardsInFolder'
+type FakeDashboardStore_DeleteDashboardsInFolder_Call struct {
+	*mock.Call
+}
+
+// DeleteDashboardsInFolder is a helper method to define mock.On call
+//   - ctx context.Context
+//   - request *DeleteDashboardsInFolderRequest
+func (_e *FakeDashboardStore_Expecter) DeleteDashboardsInFolder(ctx interface{}, request interface{}) *FakeDashboardStore_DeleteDashboardsInFolder_Call {
+	return &FakeDashboardStore_DeleteDashboardsInFolder_Call{Call: _e.mock.On("DeleteDashboardsInFolder", ctx, request)}
+}
+
+func (_c *FakeDashboardStore_DeleteDashboardsInFolder_Call) Run(run func(ctx context.Context, request *DeleteDashboardsInFolderRequest)) *FakeDashboardStore_DeleteDashboardsInFolder_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*DeleteDashboardsInFolderRequest))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_DeleteDashboardsInFolder_Call) Return(_a0 error) *FakeDashboardStore_DeleteDashboardsInFolder_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardStore_DeleteDashboardsInFolder_Call) RunAndReturn(run func(context.Context, *DeleteDashboardsInFolderRequest) error) *FakeDashboardStore_DeleteDashboardsInFolder_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // DeleteOrphanedProvisionedDashboards provides a mock function with given fields: ctx, cmd
 func (_m *FakeDashboardStore) DeleteOrphanedProvisionedDashboards(ctx context.Context, cmd *DeleteOrphanedProvisionedDashboardsCommand) error {
 	ret := _m.Called(ctx, cmd)
@@ -104,11 +277,44 @@ func (_m *FakeDashboardStore) DeleteOrphanedProvisionedDashboards(ctx context.Co
 	return r0
 }
 
+// FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteOrphanedProvisionedDashboards'
+type FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call struct {
+	*mock.Call
+}
+
+// DeleteOrphanedProvisionedDashboards is a helper method to define mock.On call
+//   - ctx context.Context
+//   - cmd *DeleteOrphanedProvisionedDashboardsCommand
+func (_e *FakeDashboardStore_Expecter) DeleteOrphanedProvisionedDashboards(ctx interface{}, cmd interface{}) *FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call {
+	return &FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call{Call: _e.mock.On("DeleteOrphanedProvisionedDashboards", ctx, cmd)}
+}
+
+func (_c *FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call) Run(run func(ctx context.Context, cmd *DeleteOrphanedProvisionedDashboardsCommand)) *FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*DeleteOrphanedProvisionedDashboardsCommand))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call) Return(_a0 error) *FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call) RunAndReturn(run func(context.Context, *DeleteOrphanedProvisionedDashboardsCommand) error) *FakeDashboardStore_DeleteOrphanedProvisionedDashboards_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // FindDashboards provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) FindDashboards(ctx context.Context, query *FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []DashboardSearchProjection
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *FindPersistedDashboardsQuery) []DashboardSearchProjection); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -117,7 +323,6 @@ func (_m *FakeDashboardStore) FindDashboards(ctx context.Context, query *FindPer
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *FindPersistedDashboardsQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -127,11 +332,44 @@ func (_m *FakeDashboardStore) FindDashboards(ctx context.Context, query *FindPer
 	return r0, r1
 }
 
+// FakeDashboardStore_FindDashboards_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FindDashboards'
+type FakeDashboardStore_FindDashboards_Call struct {
+	*mock.Call
+}
+
+// FindDashboards is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *FindPersistedDashboardsQuery
+func (_e *FakeDashboardStore_Expecter) FindDashboards(ctx interface{}, query interface{}) *FakeDashboardStore_FindDashboards_Call {
+	return &FakeDashboardStore_FindDashboards_Call{Call: _e.mock.On("FindDashboards", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_FindDashboards_Call) Run(run func(ctx context.Context, query *FindPersistedDashboardsQuery)) *FakeDashboardStore_FindDashboards_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*FindPersistedDashboardsQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_FindDashboards_Call) Return(_a0 []DashboardSearchProjection, _a1 error) *FakeDashboardStore_FindDashboards_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_FindDashboards_Call) RunAndReturn(run func(context.Context, *FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error)) *FakeDashboardStore_FindDashboards_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboard provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) GetDashboard(ctx context.Context, query *GetDashboardQuery) (*Dashboard, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 *Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardQuery) (*Dashboard, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardQuery) *Dashboard); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -140,7 +378,6 @@ func (_m *FakeDashboardStore) GetDashboard(ctx context.Context, query *GetDashbo
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -150,11 +387,44 @@ func (_m *FakeDashboardStore) GetDashboard(ctx context.Context, query *GetDashbo
 	return r0, r1
 }
 
+// FakeDashboardStore_GetDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboard'
+type FakeDashboardStore_GetDashboard_Call struct {
+	*mock.Call
+}
+
+// GetDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardQuery
+func (_e *FakeDashboardStore_Expecter) GetDashboard(ctx interface{}, query interface{}) *FakeDashboardStore_GetDashboard_Call {
+	return &FakeDashboardStore_GetDashboard_Call{Call: _e.mock.On("GetDashboard", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_GetDashboard_Call) Run(run func(ctx context.Context, query *GetDashboardQuery)) *FakeDashboardStore_GetDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboard_Call) Return(_a0 *Dashboard, _a1 error) *FakeDashboardStore_GetDashboard_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboard_Call) RunAndReturn(run func(context.Context, *GetDashboardQuery) (*Dashboard, error)) *FakeDashboardStore_GetDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboardACLInfoList provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) GetDashboardACLInfoList(ctx context.Context, query *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []*DashboardACLInfoDTO
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardACLInfoListQuery) []*DashboardACLInfoDTO); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -163,7 +433,6 @@ func (_m *FakeDashboardStore) GetDashboardACLInfoList(ctx context.Context, query
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardACLInfoListQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -173,11 +442,44 @@ func (_m *FakeDashboardStore) GetDashboardACLInfoList(ctx context.Context, query
 	return r0, r1
 }
 
+// FakeDashboardStore_GetDashboardACLInfoList_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboardACLInfoList'
+type FakeDashboardStore_GetDashboardACLInfoList_Call struct {
+	*mock.Call
+}
+
+// GetDashboardACLInfoList is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardACLInfoListQuery
+func (_e *FakeDashboardStore_Expecter) GetDashboardACLInfoList(ctx interface{}, query interface{}) *FakeDashboardStore_GetDashboardACLInfoList_Call {
+	return &FakeDashboardStore_GetDashboardACLInfoList_Call{Call: _e.mock.On("GetDashboardACLInfoList", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_GetDashboardACLInfoList_Call) Run(run func(ctx context.Context, query *GetDashboardACLInfoListQuery)) *FakeDashboardStore_GetDashboardACLInfoList_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardACLInfoListQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboardACLInfoList_Call) Return(_a0 []*DashboardACLInfoDTO, _a1 error) *FakeDashboardStore_GetDashboardACLInfoList_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboardACLInfoList_Call) RunAndReturn(run func(context.Context, *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error)) *FakeDashboardStore_GetDashboardACLInfoList_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboardTags provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) GetDashboardTags(ctx context.Context, query *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []*DashboardTagCloudItem
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardTagsQuery) []*DashboardTagCloudItem); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -186,7 +488,6 @@ func (_m *FakeDashboardStore) GetDashboardTags(ctx context.Context, query *GetDa
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardTagsQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -196,11 +497,44 @@ func (_m *FakeDashboardStore) GetDashboardTags(ctx context.Context, query *GetDa
 	return r0, r1
 }
 
+// FakeDashboardStore_GetDashboardTags_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboardTags'
+type FakeDashboardStore_GetDashboardTags_Call struct {
+	*mock.Call
+}
+
+// GetDashboardTags is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardTagsQuery
+func (_e *FakeDashboardStore_Expecter) GetDashboardTags(ctx interface{}, query interface{}) *FakeDashboardStore_GetDashboardTags_Call {
+	return &FakeDashboardStore_GetDashboardTags_Call{Call: _e.mock.On("GetDashboardTags", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_GetDashboardTags_Call) Run(run func(ctx context.Context, query *GetDashboardTagsQuery)) *FakeDashboardStore_GetDashboardTags_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardTagsQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboardTags_Call) Return(_a0 []*DashboardTagCloudItem, _a1 error) *FakeDashboardStore_GetDashboardTags_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboardTags_Call) RunAndReturn(run func(context.Context, *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error)) *FakeDashboardStore_GetDashboardTags_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboardUIDByID provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) GetDashboardUIDByID(ctx context.Context, query *GetDashboardRefByIDQuery) (*DashboardRef, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 *DashboardRef
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardRefByIDQuery) (*DashboardRef, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardRefByIDQuery) *DashboardRef); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -209,7 +543,6 @@ func (_m *FakeDashboardStore) GetDashboardUIDByID(ctx context.Context, query *Ge
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardRefByIDQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -219,11 +552,44 @@ func (_m *FakeDashboardStore) GetDashboardUIDByID(ctx context.Context, query *Ge
 	return r0, r1
 }
 
+// FakeDashboardStore_GetDashboardUIDByID_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboardUIDByID'
+type FakeDashboardStore_GetDashboardUIDByID_Call struct {
+	*mock.Call
+}
+
+// GetDashboardUIDByID is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardRefByIDQuery
+func (_e *FakeDashboardStore_Expecter) GetDashboardUIDByID(ctx interface{}, query interface{}) *FakeDashboardStore_GetDashboardUIDByID_Call {
+	return &FakeDashboardStore_GetDashboardUIDByID_Call{Call: _e.mock.On("GetDashboardUIDByID", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_GetDashboardUIDByID_Call) Run(run func(ctx context.Context, query *GetDashboardRefByIDQuery)) *FakeDashboardStore_GetDashboardUIDByID_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardRefByIDQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboardUIDByID_Call) Return(_a0 *DashboardRef, _a1 error) *FakeDashboardStore_GetDashboardUIDByID_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboardUIDByID_Call) RunAndReturn(run func(context.Context, *GetDashboardRefByIDQuery) (*DashboardRef, error)) *FakeDashboardStore_GetDashboardUIDByID_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboards provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) GetDashboards(ctx context.Context, query *GetDashboardsQuery) ([]*Dashboard, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []*Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardsQuery) ([]*Dashboard, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardsQuery) []*Dashboard); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -232,7 +598,6 @@ func (_m *FakeDashboardStore) GetDashboards(ctx context.Context, query *GetDashb
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardsQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -242,11 +607,44 @@ func (_m *FakeDashboardStore) GetDashboards(ctx context.Context, query *GetDashb
 	return r0, r1
 }
 
+// FakeDashboardStore_GetDashboards_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboards'
+type FakeDashboardStore_GetDashboards_Call struct {
+	*mock.Call
+}
+
+// GetDashboards is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardsQuery
+func (_e *FakeDashboardStore_Expecter) GetDashboards(ctx interface{}, query interface{}) *FakeDashboardStore_GetDashboards_Call {
+	return &FakeDashboardStore_GetDashboards_Call{Call: _e.mock.On("GetDashboards", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_GetDashboards_Call) Run(run func(ctx context.Context, query *GetDashboardsQuery)) *FakeDashboardStore_GetDashboards_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardsQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboards_Call) Return(_a0 []*Dashboard, _a1 error) *FakeDashboardStore_GetDashboards_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboards_Call) RunAndReturn(run func(context.Context, *GetDashboardsQuery) ([]*Dashboard, error)) *FakeDashboardStore_GetDashboards_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboardsByPluginID provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) GetDashboardsByPluginID(ctx context.Context, query *GetDashboardsByPluginIDQuery) ([]*Dashboard, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []*Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardsByPluginIDQuery) ([]*Dashboard, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardsByPluginIDQuery) []*Dashboard); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -255,7 +653,6 @@ func (_m *FakeDashboardStore) GetDashboardsByPluginID(ctx context.Context, query
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardsByPluginIDQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -265,11 +662,44 @@ func (_m *FakeDashboardStore) GetDashboardsByPluginID(ctx context.Context, query
 	return r0, r1
 }
 
+// FakeDashboardStore_GetDashboardsByPluginID_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboardsByPluginID'
+type FakeDashboardStore_GetDashboardsByPluginID_Call struct {
+	*mock.Call
+}
+
+// GetDashboardsByPluginID is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardsByPluginIDQuery
+func (_e *FakeDashboardStore_Expecter) GetDashboardsByPluginID(ctx interface{}, query interface{}) *FakeDashboardStore_GetDashboardsByPluginID_Call {
+	return &FakeDashboardStore_GetDashboardsByPluginID_Call{Call: _e.mock.On("GetDashboardsByPluginID", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_GetDashboardsByPluginID_Call) Run(run func(ctx context.Context, query *GetDashboardsByPluginIDQuery)) *FakeDashboardStore_GetDashboardsByPluginID_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardsByPluginIDQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboardsByPluginID_Call) Return(_a0 []*Dashboard, _a1 error) *FakeDashboardStore_GetDashboardsByPluginID_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetDashboardsByPluginID_Call) RunAndReturn(run func(context.Context, *GetDashboardsByPluginIDQuery) ([]*Dashboard, error)) *FakeDashboardStore_GetDashboardsByPluginID_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetProvisionedDashboardData provides a mock function with given fields: ctx, name
 func (_m *FakeDashboardStore) GetProvisionedDashboardData(ctx context.Context, name string) ([]*DashboardProvisioning, error) {
 	ret := _m.Called(ctx, name)
 
 	var r0 []*DashboardProvisioning
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) ([]*DashboardProvisioning, error)); ok {
+		return rf(ctx, name)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, string) []*DashboardProvisioning); ok {
 		r0 = rf(ctx, name)
 	} else {
@@ -278,7 +708,6 @@ func (_m *FakeDashboardStore) GetProvisionedDashboardData(ctx context.Context, n
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
 		r1 = rf(ctx, name)
 	} else {
@@ -288,11 +717,44 @@ func (_m *FakeDashboardStore) GetProvisionedDashboardData(ctx context.Context, n
 	return r0, r1
 }
 
+// FakeDashboardStore_GetProvisionedDashboardData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetProvisionedDashboardData'
+type FakeDashboardStore_GetProvisionedDashboardData_Call struct {
+	*mock.Call
+}
+
+// GetProvisionedDashboardData is a helper method to define mock.On call
+//   - ctx context.Context
+//   - name string
+func (_e *FakeDashboardStore_Expecter) GetProvisionedDashboardData(ctx interface{}, name interface{}) *FakeDashboardStore_GetProvisionedDashboardData_Call {
+	return &FakeDashboardStore_GetProvisionedDashboardData_Call{Call: _e.mock.On("GetProvisionedDashboardData", ctx, name)}
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDashboardData_Call) Run(run func(ctx context.Context, name string)) *FakeDashboardStore_GetProvisionedDashboardData_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDashboardData_Call) Return(_a0 []*DashboardProvisioning, _a1 error) *FakeDashboardStore_GetProvisionedDashboardData_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDashboardData_Call) RunAndReturn(run func(context.Context, string) ([]*DashboardProvisioning, error)) *FakeDashboardStore_GetProvisionedDashboardData_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetProvisionedDataByDashboardID provides a mock function with given fields: ctx, dashboardID
 func (_m *FakeDashboardStore) GetProvisionedDataByDashboardID(ctx context.Context, dashboardID int64) (*DashboardProvisioning, error) {
 	ret := _m.Called(ctx, dashboardID)
 
 	var r0 *DashboardProvisioning
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64) (*DashboardProvisioning, error)); ok {
+		return rf(ctx, dashboardID)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, int64) *DashboardProvisioning); ok {
 		r0 = rf(ctx, dashboardID)
 	} else {
@@ -301,7 +763,6 @@ func (_m *FakeDashboardStore) GetProvisionedDataByDashboardID(ctx context.Contex
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, int64) error); ok {
 		r1 = rf(ctx, dashboardID)
 	} else {
@@ -311,11 +772,44 @@ func (_m *FakeDashboardStore) GetProvisionedDataByDashboardID(ctx context.Contex
 	return r0, r1
 }
 
+// FakeDashboardStore_GetProvisionedDataByDashboardID_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetProvisionedDataByDashboardID'
+type FakeDashboardStore_GetProvisionedDataByDashboardID_Call struct {
+	*mock.Call
+}
+
+// GetProvisionedDataByDashboardID is a helper method to define mock.On call
+//   - ctx context.Context
+//   - dashboardID int64
+func (_e *FakeDashboardStore_Expecter) GetProvisionedDataByDashboardID(ctx interface{}, dashboardID interface{}) *FakeDashboardStore_GetProvisionedDataByDashboardID_Call {
+	return &FakeDashboardStore_GetProvisionedDataByDashboardID_Call{Call: _e.mock.On("GetProvisionedDataByDashboardID", ctx, dashboardID)}
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDataByDashboardID_Call) Run(run func(ctx context.Context, dashboardID int64)) *FakeDashboardStore_GetProvisionedDataByDashboardID_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDataByDashboardID_Call) Return(_a0 *DashboardProvisioning, _a1 error) *FakeDashboardStore_GetProvisionedDataByDashboardID_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDataByDashboardID_Call) RunAndReturn(run func(context.Context, int64) (*DashboardProvisioning, error)) *FakeDashboardStore_GetProvisionedDataByDashboardID_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetProvisionedDataByDashboardUID provides a mock function with given fields: ctx, orgID, dashboardUID
 func (_m *FakeDashboardStore) GetProvisionedDataByDashboardUID(ctx context.Context, orgID int64, dashboardUID string) (*DashboardProvisioning, error) {
 	ret := _m.Called(ctx, orgID, dashboardUID)
 
 	var r0 *DashboardProvisioning
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) (*DashboardProvisioning, error)); ok {
+		return rf(ctx, orgID, dashboardUID)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, int64, string) *DashboardProvisioning); ok {
 		r0 = rf(ctx, orgID, dashboardUID)
 	} else {
@@ -324,7 +818,6 @@ func (_m *FakeDashboardStore) GetProvisionedDataByDashboardUID(ctx context.Conte
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
 		r1 = rf(ctx, orgID, dashboardUID)
 	} else {
@@ -334,18 +827,51 @@ func (_m *FakeDashboardStore) GetProvisionedDataByDashboardUID(ctx context.Conte
 	return r0, r1
 }
 
+// FakeDashboardStore_GetProvisionedDataByDashboardUID_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetProvisionedDataByDashboardUID'
+type FakeDashboardStore_GetProvisionedDataByDashboardUID_Call struct {
+	*mock.Call
+}
+
+// GetProvisionedDataByDashboardUID is a helper method to define mock.On call
+//   - ctx context.Context
+//   - orgID int64
+//   - dashboardUID string
+func (_e *FakeDashboardStore_Expecter) GetProvisionedDataByDashboardUID(ctx interface{}, orgID interface{}, dashboardUID interface{}) *FakeDashboardStore_GetProvisionedDataByDashboardUID_Call {
+	return &FakeDashboardStore_GetProvisionedDataByDashboardUID_Call{Call: _e.mock.On("GetProvisionedDataByDashboardUID", ctx, orgID, dashboardUID)}
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDataByDashboardUID_Call) Run(run func(ctx context.Context, orgID int64, dashboardUID string)) *FakeDashboardStore_GetProvisionedDataByDashboardUID_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64), args[2].(string))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDataByDashboardUID_Call) Return(_a0 *DashboardProvisioning, _a1 error) *FakeDashboardStore_GetProvisionedDataByDashboardUID_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_GetProvisionedDataByDashboardUID_Call) RunAndReturn(run func(context.Context, int64, string) (*DashboardProvisioning, error)) *FakeDashboardStore_GetProvisionedDataByDashboardUID_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // HasAdminPermissionInDashboardsOrFolders provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *folder.HasAdminPermissionInDashboardsOrFoldersQuery) (bool, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *folder.HasAdminPermissionInDashboardsOrFoldersQuery) (bool, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *folder.HasAdminPermissionInDashboardsOrFoldersQuery) bool); ok {
 		r0 = rf(ctx, query)
 	} else {
 		r0 = ret.Get(0).(bool)
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *folder.HasAdminPermissionInDashboardsOrFoldersQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -355,18 +881,50 @@ func (_m *FakeDashboardStore) HasAdminPermissionInDashboardsOrFolders(ctx contex
 	return r0, r1
 }
 
+// FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'HasAdminPermissionInDashboardsOrFolders'
+type FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call struct {
+	*mock.Call
+}
+
+// HasAdminPermissionInDashboardsOrFolders is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *folder.HasAdminPermissionInDashboardsOrFoldersQuery
+func (_e *FakeDashboardStore_Expecter) HasAdminPermissionInDashboardsOrFolders(ctx interface{}, query interface{}) *FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call {
+	return &FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call{Call: _e.mock.On("HasAdminPermissionInDashboardsOrFolders", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call) Run(run func(ctx context.Context, query *folder.HasAdminPermissionInDashboardsOrFoldersQuery)) *FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*folder.HasAdminPermissionInDashboardsOrFoldersQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call) Return(_a0 bool, _a1 error) *FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call) RunAndReturn(run func(context.Context, *folder.HasAdminPermissionInDashboardsOrFoldersQuery) (bool, error)) *FakeDashboardStore_HasAdminPermissionInDashboardsOrFolders_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // HasEditPermissionInFolders provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) HasEditPermissionInFolders(ctx context.Context, query *folder.HasEditPermissionInFoldersQuery) (bool, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *folder.HasEditPermissionInFoldersQuery) (bool, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *folder.HasEditPermissionInFoldersQuery) bool); ok {
 		r0 = rf(ctx, query)
 	} else {
 		r0 = ret.Get(0).(bool)
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *folder.HasEditPermissionInFoldersQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -376,6 +934,35 @@ func (_m *FakeDashboardStore) HasEditPermissionInFolders(ctx context.Context, qu
 	return r0, r1
 }
 
+// FakeDashboardStore_HasEditPermissionInFolders_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'HasEditPermissionInFolders'
+type FakeDashboardStore_HasEditPermissionInFolders_Call struct {
+	*mock.Call
+}
+
+// HasEditPermissionInFolders is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *folder.HasEditPermissionInFoldersQuery
+func (_e *FakeDashboardStore_Expecter) HasEditPermissionInFolders(ctx interface{}, query interface{}) *FakeDashboardStore_HasEditPermissionInFolders_Call {
+	return &FakeDashboardStore_HasEditPermissionInFolders_Call{Call: _e.mock.On("HasEditPermissionInFolders", ctx, query)}
+}
+
+func (_c *FakeDashboardStore_HasEditPermissionInFolders_Call) Run(run func(ctx context.Context, query *folder.HasEditPermissionInFoldersQuery)) *FakeDashboardStore_HasEditPermissionInFolders_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*folder.HasEditPermissionInFoldersQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_HasEditPermissionInFolders_Call) Return(_a0 bool, _a1 error) *FakeDashboardStore_HasEditPermissionInFolders_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_HasEditPermissionInFolders_Call) RunAndReturn(run func(context.Context, *folder.HasEditPermissionInFoldersQuery) (bool, error)) *FakeDashboardStore_HasEditPermissionInFolders_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // SaveAlerts provides a mock function with given fields: ctx, dashID, alerts
 func (_m *FakeDashboardStore) SaveAlerts(ctx context.Context, dashID int64, alerts []*models.Alert) error {
 	ret := _m.Called(ctx, dashID, alerts)
@@ -390,11 +977,45 @@ func (_m *FakeDashboardStore) SaveAlerts(ctx context.Context, dashID int64, aler
 	return r0
 }
 
+// FakeDashboardStore_SaveAlerts_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveAlerts'
+type FakeDashboardStore_SaveAlerts_Call struct {
+	*mock.Call
+}
+
+// SaveAlerts is a helper method to define mock.On call
+//   - ctx context.Context
+//   - dashID int64
+//   - alerts []*models.Alert
+func (_e *FakeDashboardStore_Expecter) SaveAlerts(ctx interface{}, dashID interface{}, alerts interface{}) *FakeDashboardStore_SaveAlerts_Call {
+	return &FakeDashboardStore_SaveAlerts_Call{Call: _e.mock.On("SaveAlerts", ctx, dashID, alerts)}
+}
+
+func (_c *FakeDashboardStore_SaveAlerts_Call) Run(run func(ctx context.Context, dashID int64, alerts []*models.Alert)) *FakeDashboardStore_SaveAlerts_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64), args[2].([]*models.Alert))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_SaveAlerts_Call) Return(_a0 error) *FakeDashboardStore_SaveAlerts_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardStore_SaveAlerts_Call) RunAndReturn(run func(context.Context, int64, []*models.Alert) error) *FakeDashboardStore_SaveAlerts_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // SaveDashboard provides a mock function with given fields: ctx, cmd
 func (_m *FakeDashboardStore) SaveDashboard(ctx context.Context, cmd SaveDashboardCommand) (*Dashboard, error) {
 	ret := _m.Called(ctx, cmd)
 
 	var r0 *Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, SaveDashboardCommand) (*Dashboard, error)); ok {
+		return rf(ctx, cmd)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, SaveDashboardCommand) *Dashboard); ok {
 		r0 = rf(ctx, cmd)
 	} else {
@@ -403,7 +1024,6 @@ func (_m *FakeDashboardStore) SaveDashboard(ctx context.Context, cmd SaveDashboa
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, SaveDashboardCommand) error); ok {
 		r1 = rf(ctx, cmd)
 	} else {
@@ -413,11 +1033,44 @@ func (_m *FakeDashboardStore) SaveDashboard(ctx context.Context, cmd SaveDashboa
 	return r0, r1
 }
 
+// FakeDashboardStore_SaveDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveDashboard'
+type FakeDashboardStore_SaveDashboard_Call struct {
+	*mock.Call
+}
+
+// SaveDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - cmd SaveDashboardCommand
+func (_e *FakeDashboardStore_Expecter) SaveDashboard(ctx interface{}, cmd interface{}) *FakeDashboardStore_SaveDashboard_Call {
+	return &FakeDashboardStore_SaveDashboard_Call{Call: _e.mock.On("SaveDashboard", ctx, cmd)}
+}
+
+func (_c *FakeDashboardStore_SaveDashboard_Call) Run(run func(ctx context.Context, cmd SaveDashboardCommand)) *FakeDashboardStore_SaveDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(SaveDashboardCommand))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_SaveDashboard_Call) Return(_a0 *Dashboard, _a1 error) *FakeDashboardStore_SaveDashboard_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_SaveDashboard_Call) RunAndReturn(run func(context.Context, SaveDashboardCommand) (*Dashboard, error)) *FakeDashboardStore_SaveDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // SaveProvisionedDashboard provides a mock function with given fields: ctx, cmd, provisioning
 func (_m *FakeDashboardStore) SaveProvisionedDashboard(ctx context.Context, cmd SaveDashboardCommand, provisioning *DashboardProvisioning) (*Dashboard, error) {
 	ret := _m.Called(ctx, cmd, provisioning)
 
 	var r0 *Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, SaveDashboardCommand, *DashboardProvisioning) (*Dashboard, error)); ok {
+		return rf(ctx, cmd, provisioning)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, SaveDashboardCommand, *DashboardProvisioning) *Dashboard); ok {
 		r0 = rf(ctx, cmd, provisioning)
 	} else {
@@ -426,7 +1079,6 @@ func (_m *FakeDashboardStore) SaveProvisionedDashboard(ctx context.Context, cmd
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, SaveDashboardCommand, *DashboardProvisioning) error); ok {
 		r1 = rf(ctx, cmd, provisioning)
 	} else {
@@ -436,6 +1088,36 @@ func (_m *FakeDashboardStore) SaveProvisionedDashboard(ctx context.Context, cmd
 	return r0, r1
 }
 
+// FakeDashboardStore_SaveProvisionedDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveProvisionedDashboard'
+type FakeDashboardStore_SaveProvisionedDashboard_Call struct {
+	*mock.Call
+}
+
+// SaveProvisionedDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - cmd SaveDashboardCommand
+//   - provisioning *DashboardProvisioning
+func (_e *FakeDashboardStore_Expecter) SaveProvisionedDashboard(ctx interface{}, cmd interface{}, provisioning interface{}) *FakeDashboardStore_SaveProvisionedDashboard_Call {
+	return &FakeDashboardStore_SaveProvisionedDashboard_Call{Call: _e.mock.On("SaveProvisionedDashboard", ctx, cmd, provisioning)}
+}
+
+func (_c *FakeDashboardStore_SaveProvisionedDashboard_Call) Run(run func(ctx context.Context, cmd SaveDashboardCommand, provisioning *DashboardProvisioning)) *FakeDashboardStore_SaveProvisionedDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(SaveDashboardCommand), args[2].(*DashboardProvisioning))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_SaveProvisionedDashboard_Call) Return(_a0 *Dashboard, _a1 error) *FakeDashboardStore_SaveProvisionedDashboard_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_SaveProvisionedDashboard_Call) RunAndReturn(run func(context.Context, SaveDashboardCommand, *DashboardProvisioning) (*Dashboard, error)) *FakeDashboardStore_SaveProvisionedDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // UnprovisionDashboard provides a mock function with given fields: ctx, id
 func (_m *FakeDashboardStore) UnprovisionDashboard(ctx context.Context, id int64) error {
 	ret := _m.Called(ctx, id)
@@ -450,6 +1132,35 @@ func (_m *FakeDashboardStore) UnprovisionDashboard(ctx context.Context, id int64
 	return r0
 }
 
+// FakeDashboardStore_UnprovisionDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UnprovisionDashboard'
+type FakeDashboardStore_UnprovisionDashboard_Call struct {
+	*mock.Call
+}
+
+// UnprovisionDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - id int64
+func (_e *FakeDashboardStore_Expecter) UnprovisionDashboard(ctx interface{}, id interface{}) *FakeDashboardStore_UnprovisionDashboard_Call {
+	return &FakeDashboardStore_UnprovisionDashboard_Call{Call: _e.mock.On("UnprovisionDashboard", ctx, id)}
+}
+
+func (_c *FakeDashboardStore_UnprovisionDashboard_Call) Run(run func(ctx context.Context, id int64)) *FakeDashboardStore_UnprovisionDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_UnprovisionDashboard_Call) Return(_a0 error) *FakeDashboardStore_UnprovisionDashboard_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardStore_UnprovisionDashboard_Call) RunAndReturn(run func(context.Context, int64) error) *FakeDashboardStore_UnprovisionDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // UpdateDashboardACL provides a mock function with given fields: ctx, uid, items
 func (_m *FakeDashboardStore) UpdateDashboardACL(ctx context.Context, uid int64, items []*DashboardACL) error {
 	ret := _m.Called(ctx, uid, items)
@@ -464,18 +1175,51 @@ func (_m *FakeDashboardStore) UpdateDashboardACL(ctx context.Context, uid int64,
 	return r0
 }
 
+// FakeDashboardStore_UpdateDashboardACL_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateDashboardACL'
+type FakeDashboardStore_UpdateDashboardACL_Call struct {
+	*mock.Call
+}
+
+// UpdateDashboardACL is a helper method to define mock.On call
+//   - ctx context.Context
+//   - uid int64
+//   - items []*DashboardACL
+func (_e *FakeDashboardStore_Expecter) UpdateDashboardACL(ctx interface{}, uid interface{}, items interface{}) *FakeDashboardStore_UpdateDashboardACL_Call {
+	return &FakeDashboardStore_UpdateDashboardACL_Call{Call: _e.mock.On("UpdateDashboardACL", ctx, uid, items)}
+}
+
+func (_c *FakeDashboardStore_UpdateDashboardACL_Call) Run(run func(ctx context.Context, uid int64, items []*DashboardACL)) *FakeDashboardStore_UpdateDashboardACL_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64), args[2].([]*DashboardACL))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_UpdateDashboardACL_Call) Return(_a0 error) *FakeDashboardStore_UpdateDashboardACL_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardStore_UpdateDashboardACL_Call) RunAndReturn(run func(context.Context, int64, []*DashboardACL) error) *FakeDashboardStore_UpdateDashboardACL_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // ValidateDashboardBeforeSave provides a mock function with given fields: ctx, dashboard, overwrite
 func (_m *FakeDashboardStore) ValidateDashboardBeforeSave(ctx context.Context, dashboard *Dashboard, overwrite bool) (bool, error) {
 	ret := _m.Called(ctx, dashboard, overwrite)
 
 	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *Dashboard, bool) (bool, error)); ok {
+		return rf(ctx, dashboard, overwrite)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *Dashboard, bool) bool); ok {
 		r0 = rf(ctx, dashboard, overwrite)
 	} else {
 		r0 = ret.Get(0).(bool)
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *Dashboard, bool) error); ok {
 		r1 = rf(ctx, dashboard, overwrite)
 	} else {
@@ -485,6 +1229,36 @@ func (_m *FakeDashboardStore) ValidateDashboardBeforeSave(ctx context.Context, d
 	return r0, r1
 }
 
+// FakeDashboardStore_ValidateDashboardBeforeSave_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ValidateDashboardBeforeSave'
+type FakeDashboardStore_ValidateDashboardBeforeSave_Call struct {
+	*mock.Call
+}
+
+// ValidateDashboardBeforeSave is a helper method to define mock.On call
+//   - ctx context.Context
+//   - dashboard *Dashboard
+//   - overwrite bool
+func (_e *FakeDashboardStore_Expecter) ValidateDashboardBeforeSave(ctx interface{}, dashboard interface{}, overwrite interface{}) *FakeDashboardStore_ValidateDashboardBeforeSave_Call {
+	return &FakeDashboardStore_ValidateDashboardBeforeSave_Call{Call: _e.mock.On("ValidateDashboardBeforeSave", ctx, dashboard, overwrite)}
+}
+
+func (_c *FakeDashboardStore_ValidateDashboardBeforeSave_Call) Run(run func(ctx context.Context, dashboard *Dashboard, overwrite bool)) *FakeDashboardStore_ValidateDashboardBeforeSave_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*Dashboard), args[2].(bool))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardStore_ValidateDashboardBeforeSave_Call) Return(_a0 bool, _a1 error) *FakeDashboardStore_ValidateDashboardBeforeSave_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardStore_ValidateDashboardBeforeSave_Call) RunAndReturn(run func(context.Context, *Dashboard, bool) (bool, error)) *FakeDashboardStore_ValidateDashboardBeforeSave_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 type mockConstructorTestingTNewFakeDashboardStore interface {
 	mock.TestingT
 	Cleanup(func())
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 2dae51cd872..8b169b453f5 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
@@ -36,6 +37,9 @@ type Service struct {
 
 	// bus is currently used to publish event in case of title change
 	bus bus.Bus
+
+	mutex    sync.RWMutex
+	registry map[string]folder.RegistryService
 }
 
 func ProvideService(
@@ -58,6 +62,7 @@ func ProvideService(
 		accessControl:        ac,
 		bus:                  bus,
 		db:                   db,
+		registry:             make(map[string]folder.RegistryService),
 	}
 	if features.IsEnabled(featuremgmt.FlagNestedFolders) {
 		srv.DBMigration(db)
@@ -437,6 +442,12 @@ func (s *Service) Delete(ctx context.Context, cmd *folder.DeleteFolderCommand) e
 	if cmd.SignedInUser == nil {
 		return folder.ErrBadRequest.Errorf("missing signed in user")
 	}
+	if cmd.UID == "" {
+		return folder.ErrBadRequest.Errorf("missing UID")
+	}
+	if cmd.OrgID < 1 {
+		return folder.ErrBadRequest.Errorf("invalid orgID")
+	}
 	result := []string{cmd.UID}
 	err := s.db.InTransaction(ctx, func(ctx context.Context) error {
 		if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
@@ -466,6 +477,11 @@ func (s *Service) Delete(ctx context.Context, cmd *folder.DeleteFolderCommand) e
 				}
 				return dashboards.ErrFolderAccessDenied
 			}
+
+			if err := s.deleteChildrenInFolder(ctx, dashFolder.OrgID, dashFolder.UID); err != nil {
+				return err
+			}
+
 			err = s.legacyDelete(ctx, cmd, dashFolder)
 			if err != nil {
 				return err
@@ -477,6 +493,15 @@ func (s *Service) Delete(ctx context.Context, cmd *folder.DeleteFolderCommand) e
 	return err
 }
 
+func (s *Service) deleteChildrenInFolder(ctx context.Context, orgID int64, UID string) error {
+	for _, v := range s.registry {
+		if err := v.DeleteInFolder(ctx, orgID, UID); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (s *Service) legacyDelete(ctx context.Context, cmd *folder.DeleteFolderCommand, dashFolder *folder.Folder) error {
 	deleteCmd := dashboards.DeleteDashboardCommand{OrgID: cmd.OrgID, ID: dashFolder.ID, ForceDeleteFolderRules: cmd.ForceDeleteRules}
 
@@ -588,7 +613,8 @@ func (s *Service) nestedFolderDelete(ctx context.Context, cmd *folder.DeleteFold
 		}
 		result = append(result, subfolders...)
 	}
-	logger.Info("deleting folder", "org_id", cmd.OrgID, "uid", cmd.UID)
+
+	logger.Info("deleting folder and its contents", "org_id", cmd.OrgID, "uid", cmd.UID)
 	err = s.store.Delete(ctx, cmd.UID, cmd.OrgID)
 	if err != nil {
 		logger.Info("failed deleting folder", "org_id", cmd.OrgID, "uid", cmd.UID, "err", err)
@@ -794,3 +820,17 @@ func toFolderError(err error) error {
 
 	return err
 }
+
+func (s *Service) RegisterService(r folder.RegistryService) error {
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
+
+	_, ok := s.registry[r.Kind()]
+	if ok {
+		return folder.ErrTargetRegistrySrvConflict.Errorf("target registry service: %s already exists", r.Kind())
+	}
+
+	s.registry[r.Kind()] = r
+
+	return nil
+}
diff --git a/pkg/services/folder/foldertest/foldertest.go b/pkg/services/folder/foldertest/foldertest.go
index c83be22bec0..684cdf0bd6c 100644
--- a/pkg/services/folder/foldertest/foldertest.go
+++ b/pkg/services/folder/foldertest/foldertest.go
@@ -45,3 +45,7 @@ func (s *FakeService) MakeUserAdmin(ctx context.Context, orgID int64, userID, fo
 func (s *FakeService) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*folder.Folder, error) {
 	return s.ExpectedFolder, s.ExpectedError
 }
+
+func (s *FakeService) RegisterService(service folder.RegistryService) error {
+	return s.ExpectedError
+}
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index ef32296a9c2..ee656d74ed3 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -13,6 +13,7 @@ var ErrDatabaseError = errutil.NewBase(errutil.StatusInternal, "folder.database-
 var ErrInternal = errutil.NewBase(errutil.StatusInternal, "folder.internal")
 var ErrFolderTooDeep = errutil.NewBase(errutil.StatusInternal, "folder.too-deep")
 var ErrCircularReference = errutil.NewBase(errutil.StatusBadRequest, "folder.circular-reference", errutil.WithPublicMessage("Circular reference detected"))
+var ErrTargetRegistrySrvConflict = errutil.NewBase(errutil.StatusInternal, "folder.target-registry-srv-conflict")
 
 const (
 	GeneralFolderUID     = "general"
diff --git a/pkg/services/folder/registry.go b/pkg/services/folder/registry.go
new file mode 100644
index 00000000000..7aa088a38c9
--- /dev/null
+++ b/pkg/services/folder/registry.go
@@ -0,0 +1,10 @@
+package folder
+
+import (
+	"context"
+)
+
+type RegistryService interface {
+	DeleteInFolder(ctx context.Context, orgID int64, UID string) error
+	Kind() string
+}
diff --git a/pkg/services/folder/service.go b/pkg/services/folder/service.go
index 068588fba17..06028c96783 100644
--- a/pkg/services/folder/service.go
+++ b/pkg/services/folder/service.go
@@ -25,6 +25,7 @@ type Service interface {
 	MakeUserAdmin(ctx context.Context, orgID int64, userID, folderID int64, setViewAndEditPermissions bool) error
 	// Move changes a folder's parent folder to the requested new parent.
 	Move(ctx context.Context, cmd *MoveFolderCommand) (*Folder, error)
+	RegisterService(service RegistryService) error
 }
 
 // FolderStore is a folder store.
diff --git a/pkg/services/libraryelements/libraryelements_test.go b/pkg/services/libraryelements/libraryelements_test.go
index 2da4b10263a..967d43cbe3d 100644
--- a/pkg/services/libraryelements/libraryelements_test.go
+++ b/pkg/services/libraryelements/libraryelements_test.go
@@ -295,11 +295,12 @@ func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash
 	folderPermissions := acmock.NewMockedPermissionsService()
 	dashboardPermissions := acmock.NewMockedPermissionsService()
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	service := dashboardservice.ProvideDashboardServiceImpl(
+	service, err := dashboardservice.ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, dashAlertExtractor,
 		features, folderPermissions, dashboardPermissions, ac,
 		foldertest.NewFakeService(),
 	)
+	require.NoError(t, err)
 	dashboard, err := service.SaveDashboard(context.Background(), dashItem, true)
 	require.NoError(t, err)
 
@@ -441,11 +442,12 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 		folderPermissions := acmock.NewMockedPermissionsService()
 		dashboardPermissions := acmock.NewMockedPermissionsService()
 		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-		dashboardService := dashboardservice.ProvideDashboardServiceImpl(
+		dashboardService, err := dashboardservice.ProvideDashboardServiceImpl(
 			sqlStore.Cfg, dashboardStore, folderStore, nil,
 			features, folderPermissions, dashboardPermissions, ac,
 			foldertest.NewFakeService(),
 		)
+		require.NoError(t, err)
 		guardian.InitLegacyGuardian(sqlStore.Cfg, sqlStore, dashboardService, &teamtest.FakeService{})
 		service := LibraryElementService{
 			Cfg:           sqlStore.Cfg,
diff --git a/pkg/services/librarypanels/librarypanels_test.go b/pkg/services/librarypanels/librarypanels_test.go
index 8c3f363e3f7..37130266d95 100644
--- a/pkg/services/librarypanels/librarypanels_test.go
+++ b/pkg/services/librarypanels/librarypanels_test.go
@@ -707,11 +707,12 @@ func createDashboard(t *testing.T, sqlStore db.DB, user *user.SignedInUser, dash
 	dashAlertService := alerting.ProvideDashAlertExtractorService(nil, nil, nil)
 	ac := acmock.New()
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	service := dashboardservice.ProvideDashboardServiceImpl(
+	service, err := dashboardservice.ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, dashAlertService,
 		featuremgmt.WithFeatures(), acmock.NewMockedPermissionsService(), acmock.NewMockedPermissionsService(), ac,
 		foldertest.NewFakeService(),
 	)
+	require.NoError(t, err)
 	dashboard, err := service.SaveDashboard(context.Background(), dashItem, true)
 	require.NoError(t, err)
 
diff --git a/pkg/services/ngalert/store/testing.go b/pkg/services/ngalert/store/testing.go
index 6d3af7bf618..5480f443867 100644
--- a/pkg/services/ngalert/store/testing.go
+++ b/pkg/services/ngalert/store/testing.go
@@ -150,12 +150,13 @@ func SetupDashboardService(tb testing.TB, sqlStore *sqlstore.SQLStore, fs *folde
 	quotaService := quotatest.New(false, nil)
 
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
-	dashboardService := dashboardservice.ProvideDashboardServiceImpl(
+	require.NoError(tb, err)
+
+	dashboardService, err := dashboardservice.ProvideDashboardServiceImpl(
 		cfg, dashboardStore, fs, nil,
 		features, folderPermissions, dashboardPermissions, ac,
 		foldertest.NewFakeService(),
 	)
-
 	require.NoError(tb, err)
 
 	return dashboardService, dashboardStore

From f48c858ca22b3f246d1033670f14605adb13cdf3 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 14 Apr 2023 11:24:35 +0200
Subject: [PATCH 135/729] Elasticsearch: Change feature toggle for backend
 migration to enableElasticsearchBackendQuerying (#66500)

* Elasticsearch: Change feature toggle for backend migration to enableElasticsearchBackendQuerying

* Update logic in data source

* Run test to re-genartate toggle
---
 .../feature-toggles/index.md                  | 64 +++++++++----------
 .../src/types/featureToggles.gen.ts           |  2 +-
 pkg/services/featuremgmt/registry.go          |  6 +-
 pkg/services/featuremgmt/toggles_gen.csv      |  2 +-
 pkg/services/featuremgmt/toggles_gen.go       |  6 +-
 .../elasticsearch/datasource.test.ts          |  6 --
 .../datasource/elasticsearch/datasource.ts    |  8 +--
 7 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index efb4061cbe2..85771c3b30b 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -19,41 +19,41 @@ This page contains a list of available feature toggles. To learn how to turn on
 
 Some stable features are enabled by default. You can disable a stable feature by setting the feature flag to "false" in the configuration.
 
-| Feature toggle name                   | Description                                                                                                                                                                  | Enabled by default |
-| ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| `disableEnvelopeEncryption`           | Disable envelope encryption (emergency only)                                                                                                                                 |                    |
-| `database_metrics`                    | Add Prometheus metrics for database tables                                                                                                                                   |                    |
-| `featureHighlights`                   | Highlight Grafana Enterprise features                                                                                                                                        |                    |
-| `cloudWatchDynamicLabels`             | Use dynamic labels instead of alias patterns in CloudWatch datasource                                                                                                        | Yes                |
-| `dataConnectionsConsole`              | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | Yes                |
-| `internationalization`                | Enables internationalization                                                                                                                                                 | Yes                |
-| `topnav`                              | Enables new top navigation and page layouts                                                                                                                                  | Yes                |
-| `cloudWatchCrossAccountQuerying`      | Enables cross-account querying in CloudWatch datasources                                                                                                                     | Yes                |
-| `newPanelChromeUI`                    | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu                                                                                          | Yes                |
-| `accessTokenExpirationCheck`          | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                         |                    |
-| `emptyDashboardPage`                  | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                             | Yes                |
-| `disablePrometheusExemplarSampling`   | Disable Prometheus exemplar sampling                                                                                                                                         |                    |
-| `logsSampleInExplore`                 | Enables access to the logs sample feature in Explore                                                                                                                         | Yes                |
-| `useCachingService`                   | When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation                |                    |
-| `disableElasticsearchBackendQuerying` | Disable the processing of queries and responses in the Elasticsearch data source through backend                                                                             |                    |
+| Feature toggle name                 | Description                                                                                                                                                                  | Enabled by default |
+| ----------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| `disableEnvelopeEncryption`         | Disable envelope encryption (emergency only)                                                                                                                                 |                    |
+| `database_metrics`                  | Add Prometheus metrics for database tables                                                                                                                                   |                    |
+| `featureHighlights`                 | Highlight Grafana Enterprise features                                                                                                                                        |                    |
+| `cloudWatchDynamicLabels`           | Use dynamic labels instead of alias patterns in CloudWatch datasource                                                                                                        | Yes                |
+| `dataConnectionsConsole`            | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | Yes                |
+| `internationalization`              | Enables internationalization                                                                                                                                                 | Yes                |
+| `topnav`                            | Enables new top navigation and page layouts                                                                                                                                  | Yes                |
+| `cloudWatchCrossAccountQuerying`    | Enables cross-account querying in CloudWatch datasources                                                                                                                     | Yes                |
+| `newPanelChromeUI`                  | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu                                                                                          | Yes                |
+| `accessTokenExpirationCheck`        | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                         |                    |
+| `emptyDashboardPage`                | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                             | Yes                |
+| `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling                                                                                                                                         |                    |
+| `logsSampleInExplore`               | Enables access to the logs sample feature in Explore                                                                                                                         | Yes                |
+| `useCachingService`                 | When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation                |                    |
 
 ## Beta feature toggles
 
-| Feature toggle name               | Description                                                                                                                                                                                  |
-| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `trimDefaults`                    | Use cue schema to remove values that will be applied automatically                                                                                                                           |
-| `panelTitleSearch`                | Search for dashboards using panel title                                                                                                                                                      |
-| `prometheusAzureOverrideAudience` | Experimental. Allow override default AAD audience for Azure Prometheus endpoint                                                                                                              |
-| `migrationLocking`                | Lock database during migrations                                                                                                                                                              |
-| `correlations`                    | Correlations page                                                                                                                                                                            |
-| `newDBLibrary`                    | Use jmoiron/sqlx rather than xorm for a few backend services                                                                                                                                 |
-| `validateDashboardsOnSave`        | Validate dashboard JSON POSTed to api/dashboards/db                                                                                                                                          |
-| `autoMigrateOldPanels`            | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)                                                                                                           |
-| `disableAngular`                  | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. |
-| `grpcServer`                      | Run the GRPC server                                                                                                                                                                          |
-| `accessControlOnCall`             | Access control primitives for OnCall                                                                                                                                                         |
-| `alertingNoNormalState`           | Stop maintaining state of alerts that are not firing                                                                                                                                         |
-| `renderAuthJWT`                   | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
+| Feature toggle name                  | Description                                                                                                                                                                                  |
+| ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `trimDefaults`                       | Use cue schema to remove values that will be applied automatically                                                                                                                           |
+| `panelTitleSearch`                   | Search for dashboards using panel title                                                                                                                                                      |
+| `prometheusAzureOverrideAudience`    | Experimental. Allow override default AAD audience for Azure Prometheus endpoint                                                                                                              |
+| `migrationLocking`                   | Lock database during migrations                                                                                                                                                              |
+| `correlations`                       | Correlations page                                                                                                                                                                            |
+| `newDBLibrary`                       | Use jmoiron/sqlx rather than xorm for a few backend services                                                                                                                                 |
+| `validateDashboardsOnSave`           | Validate dashboard JSON POSTed to api/dashboards/db                                                                                                                                          |
+| `autoMigrateOldPanels`               | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)                                                                                                           |
+| `disableAngular`                     | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. |
+| `grpcServer`                         | Run the GRPC server                                                                                                                                                                          |
+| `accessControlOnCall`                | Access control primitives for OnCall                                                                                                                                                         |
+| `alertingNoNormalState`              | Stop maintaining state of alerts that are not firing                                                                                                                                         |
+| `renderAuthJWT`                      | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
+| `enableElasticsearchBackendQuerying` | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                              |
 
 ## Alpha feature toggles
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 0ff1038aadd..c0f11a0d3a4 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -95,6 +95,6 @@ export interface FeatureToggles {
   externalServiceAuth?: boolean;
   dataplaneFrontendFallback?: boolean;
   useCachingService?: boolean;
-  disableElasticsearchBackendQuerying?: boolean;
+  enableElasticsearchBackendQuerying?: boolean;
   authenticationConfigUI?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index b2232ae0ddb..add101533a4 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -515,9 +515,9 @@ var (
 			RequiresRestart: true,
 		},
 		{
-			Name:        "disableElasticsearchBackendQuerying",
-			Description: "Disable the processing of queries and responses in the Elasticsearch data source through backend",
-			State:       FeatureStateStable,
+			Name:        "enableElasticsearchBackendQuerying",
+			Description: "Enable the processing of queries and responses in the Elasticsearch data source through backend",
+			State:       FeatureStateBeta,
 			Owner:       grafanaObservabilityLogsSquad,
 		},
 		{
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 125fdde4775..9bc4f460056 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -76,5 +76,5 @@ pyroscopeFlameGraph,alpha,@grafana/observability-traces-and-profiling,false,fals
 externalServiceAuth,alpha,@grafana/grafana-authnz-team,true,false,false,false
 dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false,true
 useCachingService,stable,@grafana/grafana-operator-experience-squad,false,false,true,false
-disableElasticsearchBackendQuerying,stable,@grafana/observability-logs,false,false,false,false
+enableElasticsearchBackendQuerying,beta,@grafana/observability-logs,false,false,false,false
 authenticationConfigUI,alpha,@grafana/grafana-authnz-team,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 3758432afa3..ec864dd4e7c 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -315,9 +315,9 @@ const (
 	// When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation
 	FlagUseCachingService = "useCachingService"
 
-	// FlagDisableElasticsearchBackendQuerying
-	// Disable the processing of queries and responses in the Elasticsearch data source through backend
-	FlagDisableElasticsearchBackendQuerying = "disableElasticsearchBackendQuerying"
+	// FlagEnableElasticsearchBackendQuerying
+	// Enable the processing of queries and responses in the Elasticsearch data source through backend
+	FlagEnableElasticsearchBackendQuerying = "enableElasticsearchBackendQuerying"
 
 	// FlagAuthenticationConfigUI
 	// Enables authentication configuration UI
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index 4936257d09c..b470338f836 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -43,12 +43,6 @@ jest.mock('@grafana/runtime', () => ({
       },
     };
   },
-  config: {
-    buildInfo: {},
-    featureToggles: {
-      disableElasticsearchBackendQuerying: true,
-    },
-  },
 }));
 
 const TIMESRV_START = [2022, 8, 21, 6, 10, 10];
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 2defa6c8526..38842c63ca4 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -502,8 +502,8 @@ export class ElasticDatasource
   }
 
   getLogRowContext = async (row: LogRowModel, options?: LogRowContextOptions): Promise<{ data: DataFrame[] }> => {
-    const { disableElasticsearchBackendQuerying } = config.featureToggles;
-    if (!disableElasticsearchBackendQuerying) {
+    const { enableElasticsearchBackendQuerying } = config.featureToggles;
+    if (enableElasticsearchBackendQuerying) {
       const contextRequest = this.makeLogContextDataRequest(row, options);
 
       return lastValueFrom(
@@ -680,8 +680,8 @@ export class ElasticDatasource
   }
 
   query(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> {
-    const { disableElasticsearchBackendQuerying } = config.featureToggles;
-    if (!disableElasticsearchBackendQuerying) {
+    const { enableElasticsearchBackendQuerying } = config.featureToggles;
+    if (enableElasticsearchBackendQuerying) {
       const start = new Date();
       return super.query(request).pipe(tap((response) => trackQuery(response, request, start)));
     }

From b5e2b0d14cb945852b527b166d1a5ee5ffac7183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Fri, 14 Apr 2023 11:31:46 +0200
Subject: [PATCH 136/729] Explore: Allow supplementary query data provider to
 be undefined for mixed data sources (#66422)

* Switch back to the API where data provider for a supplementary query can be undefined

* Promote exploreMixedDatasource to beta

* Revert "Promote exploreMixedDatasource to beta"

This reverts commit a3bc167d1c223e71958edb953c6f94ecaeb77014.

* Resolve data source in parallel

* Do not modify function params

* Reorganize code for better readability

* Improve readability

* Simplify code

* Stop using a deprecated error property
---
 .../app/features/explore/state/query.test.ts  |   2 +-
 public/app/features/explore/state/query.ts    | 146 +++++++++++++-----
 .../utils/supplementaryQueries.test.ts        |  80 +++++-----
 .../explore/utils/supplementaryQueries.ts     | 123 ++++++---------
 4 files changed, 187 insertions(+), 164 deletions(-)

diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts
index 52dbe7530b1..d6a00955f8c 100644
--- a/public/app/features/explore/state/query.test.ts
+++ b/public/app/features/explore/state/query.test.ts
@@ -171,7 +171,7 @@ describe('runQueries', () => {
       expect(datasource.getDataProvider).toHaveBeenCalledWith(
         type,
         expect.objectContaining({
-          requestId: `explore_left_${snakeCase(type)}`,
+          requestId: `explore_left_${snakeCase(type)}_0`,
         })
       );
     }
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index ce92375a47d..822f8fbc970 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -17,6 +17,7 @@ import {
   LogsVolumeType,
   PanelEvents,
   QueryFixAction,
+  ScopedVars,
   SupplementaryQueryType,
   toLegacyResponseData,
 } from '@grafana/data';
@@ -37,7 +38,14 @@ import { CorrelationData } from 'app/features/correlations/useCorrelations';
 import { getTimeZone } from 'app/features/profile/state/selectors';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 import { store } from 'app/store/store';
-import { createAsyncThunk, ExploreItemState, ExplorePanelData, ThunkDispatch, ThunkResult } from 'app/types';
+import {
+  createAsyncThunk,
+  ExploreItemState,
+  ExplorePanelData,
+  QueryTransaction,
+  ThunkDispatch,
+  ThunkResult,
+} from 'app/types';
 import { ExploreId, ExploreState, QueryOptions, SupplementaryQueries } from 'app/types/explore';
 
 import { notifyApp } from '../../../core/actions';
@@ -607,44 +615,17 @@ export const runQueries = (
           dispatch(cleanSupplementaryQueryAction({ exploreId, type }));
         }
       } else {
-        for (const type of supplementaryQueryTypes) {
-          // We always prepare provider, even is supplementary query is disabled because when the user
-          // enables the query, we need to load the data, so we need the provider
-          const dataProvider = getSupplementaryQueryProvider(
+        dispatch(
+          handleSupplementaryQueries({
+            exploreId,
             datasourceInstance,
-            type,
-            {
-              ...transaction.request,
-              requestId: `${transaction.request.requestId}_${snakeCase(type)}`,
-            },
-            newQuerySource
-          );
-
-          if (dataProvider) {
-            dispatch(
-              storeSupplementaryQueryDataProviderAction({
-                exploreId,
-                type,
-                dataProvider,
-              })
-            );
-
-            if (!canReuseSupplementaryQueryData(supplementaryQueries[type].data, queries, absoluteRange)) {
-              dispatch(cleanSupplementaryQueryAction({ exploreId, type }));
-              if (supplementaryQueries[type].enabled) {
-                dispatch(loadSupplementaryQueryData(exploreId, type));
-              }
-            }
-          } else {
-            // If data source instance doesn't support this supplementary query, we clean the data provider
-            dispatch(
-              cleanSupplementaryQueryDataProviderAction({
-                exploreId,
-                type,
-              })
-            );
-          }
-        }
+            transaction,
+            newQuerySource,
+            supplementaryQueries,
+            queries,
+            absoluteRange,
+          })
+        );
       }
     }
 
@@ -652,6 +633,95 @@ export const runQueries = (
   };
 };
 
+const groupDataQueries = async (datasources: DataQuery[], scopedVars: ScopedVars) => {
+  const nonMixedDataSources = datasources.filter((t) => {
+    return t.datasource?.uid !== MIXED_DATASOURCE_NAME;
+  });
+  const sets: { [key: string]: DataQuery[] } = groupBy(nonMixedDataSources, 'datasource.uid');
+
+  return await Promise.all(
+    Object.values(sets).map(async (targets) => {
+      const datasource = await getDataSourceSrv().get(targets[0].datasource, scopedVars);
+      return {
+        datasource,
+        targets,
+      };
+    })
+  );
+};
+
+type HandleSupplementaryQueriesOptions = {
+  exploreId: ExploreId;
+  transaction: QueryTransaction;
+  datasourceInstance: DataSourceApi;
+  newQuerySource: Observable<ExplorePanelData>;
+  supplementaryQueries: SupplementaryQueries;
+  queries: DataQuery[];
+  absoluteRange: AbsoluteTimeRange;
+};
+
+const handleSupplementaryQueries = createAsyncThunk(
+  'explore/handleSupplementaryQueries',
+  async (
+    {
+      datasourceInstance,
+      exploreId,
+      transaction,
+      newQuerySource,
+      supplementaryQueries,
+      queries,
+      absoluteRange,
+    }: HandleSupplementaryQueriesOptions,
+    { dispatch }
+  ) => {
+    let groupedQueries;
+    if (datasourceInstance.meta.mixed) {
+      groupedQueries = await groupDataQueries(transaction.request.targets, transaction.request.scopedVars);
+    } else {
+      groupedQueries = [{ datasource: datasourceInstance, targets: transaction.request.targets }];
+    }
+
+    for (const type of supplementaryQueryTypes) {
+      // We always prepare provider, even is supplementary query is disabled because when the user
+      // enables the query, we need to load the data, so we need the provider
+      const dataProvider = getSupplementaryQueryProvider(
+        groupedQueries,
+        type,
+        {
+          ...transaction.request,
+          requestId: `${transaction.request.requestId}_${snakeCase(type)}`,
+        },
+        newQuerySource
+      );
+
+      if (dataProvider) {
+        dispatch(
+          storeSupplementaryQueryDataProviderAction({
+            exploreId,
+            type,
+            dataProvider,
+          })
+        );
+
+        if (!canReuseSupplementaryQueryData(supplementaryQueries[type].data, queries, absoluteRange)) {
+          dispatch(cleanSupplementaryQueryAction({ exploreId, type }));
+          if (supplementaryQueries[type].enabled) {
+            dispatch(loadSupplementaryQueryData(exploreId, type));
+          }
+        }
+      } else {
+        // If data source instance doesn't support this supplementary query, we clean the data provider
+        dispatch(
+          cleanSupplementaryQueryDataProviderAction({
+            exploreId,
+            type,
+          })
+        );
+      }
+    }
+  }
+);
+
 /**
  * Checks if after changing the time range the existing data can be used to show supplementary query.
  * It can happen if queries are the same and new time range is within existing data time range.
diff --git a/public/app/features/explore/utils/supplementaryQueries.test.ts b/public/app/features/explore/utils/supplementaryQueries.test.ts
index ce023643a2c..ce85095d7e1 100644
--- a/public/app/features/explore/utils/supplementaryQueries.test.ts
+++ b/public/app/features/explore/utils/supplementaryQueries.test.ts
@@ -133,7 +133,6 @@ const datasources: DataSourceApi[] = [
   ),
   new MockDataSourceApi('no-data-providers'),
   new MockDataSourceApi('no-data-providers-2'),
-  new MockDataSourceApi('mixed').setupMixed(true),
 ];
 
 jest.mock('@grafana/runtime', () => ({
@@ -145,17 +144,23 @@ jest.mock('@grafana/runtime', () => ({
   },
 }));
 
-const setup = async (rootDataSource: string, type: SupplementaryQueryType, targetSources?: string[]) => {
-  const rootDataSourceApiMock = await getDataSourceSrv().get({ uid: rootDataSource });
-
-  targetSources = targetSources || [rootDataSource];
-
+const setup = async (targetSources: string[], type: SupplementaryQueryType) => {
   const requestMock = new MockDataQueryRequest({
     targets: targetSources.map((source, i) => new MockQuery(`${i}`, 'a', { uid: source })),
   });
   const explorePanelDataMock: Observable<ExplorePanelData> = mockExploreDataWithLogs();
 
-  return getSupplementaryQueryProvider(rootDataSourceApiMock, type, requestMock, explorePanelDataMock);
+  const datasources = await Promise.all(
+    targetSources.map(async (source, i) => {
+      const datasource = await getDataSourceSrv().get({ uid: source });
+      return {
+        datasource,
+        targets: [new MockQuery(`${i}`, 'a', { uid: source })],
+      };
+    })
+  );
+
+  return getSupplementaryQueryProvider(datasources, type, requestMock, explorePanelDataMock);
 };
 
 const assertDataFrom = (type: SupplementaryQueryType, ...datasources: string[]) => {
@@ -173,7 +178,7 @@ const assertDataFromLogsResults = () => {
 describe('SupplementaryQueries utils', function () {
   describe('Non-mixed data source', function () {
     it('Returns result from the provider', async () => {
-      const testProvider = await setup('logs-volume-a', SupplementaryQueryType.LogsVolume);
+      const testProvider = await setup(['logs-volume-a'], SupplementaryQueryType.LogsVolume);
 
       await expect(testProvider).toEmitValuesWith((received) => {
         expect(received).toMatchObject([
@@ -186,7 +191,7 @@ describe('SupplementaryQueries utils', function () {
       });
     });
     it('Uses fallback for logs volume', async () => {
-      const testProvider = await setup('no-data-providers', SupplementaryQueryType.LogsVolume);
+      const testProvider = await setup(['no-data-providers'], SupplementaryQueryType.LogsVolume);
 
       await expect(testProvider).toEmitValuesWith((received) => {
         expect(received).toMatchObject([
@@ -198,14 +203,11 @@ describe('SupplementaryQueries utils', function () {
       });
     });
     it('Returns undefined for logs sample', async () => {
-      const testProvider = await setup('no-data-providers', SupplementaryQueryType.LogsSample);
+      const testProvider = await setup(['no-data-providers'], SupplementaryQueryType.LogsSample);
       await expect(testProvider).toBe(undefined);
     });
     it('Creates single fallback result', async () => {
-      const testProvider = await setup('no-data-providers', SupplementaryQueryType.LogsVolume, [
-        'no-data-providers',
-        'no-data-providers-2',
-      ]);
+      const testProvider = await setup(['no-data-providers', 'no-data-providers-2'], SupplementaryQueryType.LogsVolume);
 
       await expect(testProvider).toEmitValuesWith((received) => {
         expect(received).toMatchObject([
@@ -226,10 +228,7 @@ describe('SupplementaryQueries utils', function () {
     describe('Logs volume', function () {
       describe('All data sources support full range logs volume', function () {
         it('Merges all data frames into a single response', async () => {
-          const testProvider = await setup('mixed', SupplementaryQueryType.LogsVolume, [
-            'logs-volume-a',
-            'logs-volume-b',
-          ]);
+          const testProvider = await setup(['logs-volume-a', 'logs-volume-b'], SupplementaryQueryType.LogsVolume);
           await expect(testProvider).toEmitValuesWith((received) => {
             expect(received).toMatchObject([
               { data: [], state: LoadingState.Loading },
@@ -248,10 +247,10 @@ describe('SupplementaryQueries utils', function () {
 
       describe('All data sources do not support full range logs volume', function () {
         it('Creates single fallback result', async () => {
-          const testProvider = await setup('mixed', SupplementaryQueryType.LogsVolume, [
-            'no-data-providers',
-            'no-data-providers-2',
-          ]);
+          const testProvider = await setup(
+            ['no-data-providers', 'no-data-providers-2'],
+            SupplementaryQueryType.LogsVolume
+          );
 
           await expect(testProvider).toEmitValuesWith((received) => {
             expect(received).toMatchObject([
@@ -270,12 +269,10 @@ describe('SupplementaryQueries utils', function () {
 
       describe('Some data sources support full range logs volume, while others do not', function () {
         it('Creates merged result containing full range and limited logs volume', async () => {
-          const testProvider = await setup('mixed', SupplementaryQueryType.LogsVolume, [
-            'logs-volume-a',
-            'no-data-providers',
-            'logs-volume-b',
-            'no-data-providers-2',
-          ]);
+          const testProvider = await setup(
+            ['logs-volume-a', 'no-data-providers', 'logs-volume-b', 'no-data-providers-2'],
+            SupplementaryQueryType.LogsVolume
+          );
           await expect(testProvider).toEmitValuesWith((received) => {
             expect(received).toMatchObject([
               {
@@ -310,10 +307,7 @@ describe('SupplementaryQueries utils', function () {
     describe('Logs sample', function () {
       describe('All data sources support logs sample', function () {
         it('Merges all responses into single result', async () => {
-          const testProvider = await setup('mixed', SupplementaryQueryType.LogsSample, [
-            'logs-sample-a',
-            'logs-sample-b',
-          ]);
+          const testProvider = await setup(['logs-sample-a', 'logs-sample-b'], SupplementaryQueryType.LogsSample);
           await expect(testProvider).toEmitValuesWith((received) => {
             expect(received).toMatchObject([
               { data: [], state: LoadingState.Loading },
@@ -332,24 +326,20 @@ describe('SupplementaryQueries utils', function () {
 
       describe('All data sources do not support full range logs volume', function () {
         it('Does not provide fallback result', async () => {
-          const testProvider = await setup('mixed', SupplementaryQueryType.LogsSample, [
-            'no-data-providers',
-            'no-data-providers-2',
-          ]);
-          await expect(testProvider).toEmitValuesWith((received) => {
-            expect(received).toMatchObject([{ state: LoadingState.NotStarted, data: [] }]);
-          });
+          const testProvider = await setup(
+            ['no-data-providers', 'no-data-providers-2'],
+            SupplementaryQueryType.LogsSample
+          );
+          await expect(testProvider).toBeUndefined();
         });
       });
 
       describe('Some data sources support full range logs volume, while others do not', function () {
         it('Returns results only for data sources supporting logs sample', async () => {
-          const testProvider = await setup('mixed', SupplementaryQueryType.LogsSample, [
-            'logs-sample-a',
-            'no-data-providers',
-            'logs-sample-b',
-            'no-data-providers-2',
-          ]);
+          const testProvider = await setup(
+            ['logs-sample-a', 'no-data-providers', 'logs-sample-b', 'no-data-providers-2'],
+            SupplementaryQueryType.LogsSample
+          );
           await expect(testProvider).toEmitValuesWith((received) => {
             expect(received).toMatchObject([
               { data: [], state: LoadingState.Loading },
diff --git a/public/app/features/explore/utils/supplementaryQueries.ts b/public/app/features/explore/utils/supplementaryQueries.ts
index da91115b3fd..75ca46ce5af 100644
--- a/public/app/features/explore/utils/supplementaryQueries.ts
+++ b/public/app/features/explore/utils/supplementaryQueries.ts
@@ -1,5 +1,5 @@
 import { cloneDeep, groupBy } from 'lodash';
-import { distinct, from, mergeMap, Observable, of } from 'rxjs';
+import { distinct, Observable, merge } from 'rxjs';
 import { scan } from 'rxjs/operators';
 
 import {
@@ -9,15 +9,14 @@ import {
   DataQueryResponse,
   DataSourceApi,
   hasSupplementaryQuerySupport,
+  isTruthy,
   LoadingState,
   LogsVolumeCustomMetaData,
   LogsVolumeType,
   SupplementaryQueryType,
 } from '@grafana/data';
-import { getDataSourceSrv } from '@grafana/runtime';
 import { makeDataFramesForLogs } from 'app/core/logsModel';
 import store from 'app/core/store';
-import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 import { ExplorePanelData, SupplementaryQueries } from 'app/types';
 
 export const supplementaryQueryTypes: SupplementaryQueryType[] = [
@@ -129,98 +128,62 @@ const getSupplementaryQueryFallback = (
   if (type === SupplementaryQueryType.LogsVolume) {
     return createFallbackLogVolumeProvider(explorePanelData, queryTargets, datasourceName);
   } else {
-    return of({
-      data: [],
-      state: LoadingState.NotStarted,
-    });
+    return undefined;
   }
 };
 
 export const getSupplementaryQueryProvider = (
-  datasourceInstance: DataSourceApi,
+  groupedQueries: Array<{ datasource: DataSourceApi; targets: DataQuery[] }>,
   type: SupplementaryQueryType,
   request: DataQueryRequest,
   explorePanelData: Observable<ExplorePanelData>
 ): Observable<DataQueryResponse> | undefined => {
-  if (hasSupplementaryQuerySupport(datasourceInstance, type)) {
-    return datasourceInstance.getDataProvider(type, request);
-  } else if (datasourceInstance.meta?.mixed === true) {
-    const queries = request.targets.filter((t) => {
-      return t.datasource?.uid !== MIXED_DATASOURCE_NAME;
-    });
-    // Build groups of queries to run in parallel
-    const sets: { [key: string]: DataQuery[] } = groupBy(queries, 'datasource.uid');
-    const mixed: Array<{ datasource: Promise<DataSourceApi>; targets: DataQuery[] }> = [];
+  const providers = groupedQueries.map(({ datasource, targets }, i) => {
+    const dsRequest = cloneDeep(request);
+    dsRequest.requestId = `${dsRequest.requestId || ''}_${i}`;
+    dsRequest.targets = targets;
 
-    for (const key in sets) {
-      const targets = sets[key];
-      mixed.push({
-        datasource: getDataSourceSrv().get(targets[0].datasource, request.scopedVars),
-        targets,
-      });
+    if (hasSupplementaryQuerySupport(datasource, type)) {
+      return datasource.getDataProvider(type, dsRequest);
+    } else {
+      return getSupplementaryQueryFallback(type, explorePanelData, targets, datasource.name);
     }
+  });
 
-    return from(mixed).pipe(
-      mergeMap((query, i) => {
-        return from(query.datasource).pipe(
-          mergeMap((ds) => {
-            const dsRequest = cloneDeep(request);
-            dsRequest.requestId = `mixed-${type}-${i}-${dsRequest.requestId || ''}`;
-            dsRequest.targets = query.targets;
+  const definedProviders = providers.filter(isTruthy);
 
-            if (hasSupplementaryQuerySupport(ds, type)) {
-              const dsProvider = ds.getDataProvider(type, dsRequest);
-              if (dsProvider) {
-                // 1) It provides data for current request - use the provider
-                return dsProvider;
-              } else {
-                // 2) It doesn't provide data for current request -> return nothing
-                return of({
-                  data: [],
-                  state: LoadingState.NotStarted,
-                });
-              }
-            } else {
-              // 3) Data source doesn't support the supplementary query -> use fallback
-              // the fallback cannot determine data availability based on request, it
-              // works on the results once they are available so it never uses the cache
-              return getSupplementaryQueryFallback(type, explorePanelData, query.targets, ds.name);
-            }
-          })
-        );
-      }),
-      scan<DataQueryResponse, DataQueryResponse>(
-        (acc, next) => {
-          if (acc.error || next.state === LoadingState.NotStarted) {
-            return acc;
-          }
+  if (definedProviders.length === 0) {
+    return undefined;
+  } else if (definedProviders.length === 1) {
+    return definedProviders[0];
+  }
 
-          if (next.state === LoadingState.Loading && acc.state === LoadingState.NotStarted) {
-            return {
-              ...acc,
-              state: LoadingState.Loading,
-            };
-          }
-
-          if (next.state && next.state !== LoadingState.Done) {
-            return acc;
-          }
+  return merge(...definedProviders).pipe(
+    scan<DataQueryResponse, DataQueryResponse>(
+      (acc, next) => {
+        if ((acc.errors && acc.errors.length) || next.state === LoadingState.NotStarted) {
+          return acc;
+        }
 
+        if (next.state === LoadingState.Loading && acc.state === LoadingState.NotStarted) {
           return {
             ...acc,
-            data: [...acc.data, ...next.data],
-            state: LoadingState.Done,
+            state: LoadingState.Loading,
           };
-        },
-        { data: [], state: LoadingState.NotStarted }
-      ),
-      distinct()
-    );
-  } else if (type === SupplementaryQueryType.LogsSample) {
-    return undefined;
-  } else {
-    // Create a fallback to results based logs volume
-    return getSupplementaryQueryFallback(type, explorePanelData, request.targets, datasourceInstance.name);
-  }
-  return undefined;
+        }
+
+        if (next.state && next.state !== LoadingState.Done) {
+          return acc;
+        }
+
+        return {
+          ...acc,
+          data: [...acc.data, ...next.data],
+          state: LoadingState.Done,
+        };
+      },
+      { data: [], state: LoadingState.NotStarted }
+    ),
+    distinct()
+  );
 };

From d3a1faad1ae4afa85f902000db1ce2115868b549 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matyax@gmail.com>
Date: Fri, 14 Apr 2023 11:39:54 +0200
Subject: [PATCH 137/729] Loki Config: Add missing section header + minor
 improvements (#66216)

* Loki config: add missing section title to max lines

* Loki config: minor improvements to datasource test messages

* Chore: remove new line

* Loki: further improve error messages

* Alerting Settings: Add missing tooltip

* Update packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx

* Update alerting label and tooltip

* Update packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Alerting settings: Increase label width

* Loki config: update success message

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
---
 e2e/various-suite/loki-editor.spec.ts         |  2 +-
 e2e/various-suite/loki-query-builder.spec.ts  |  2 +-
 .../AlertingSettings.test.tsx                 |  4 +-
 .../DataSourceSettings/AlertingSettings.tsx   |  7 ++-
 .../loki/configuration/ConfigEditor.tsx       | 14 ++---
 .../loki/configuration/MaxLinesField.tsx      | 53 +++++++++++--------
 .../datasource/loki/datasource.test.ts        |  9 ++--
 .../app/plugins/datasource/loki/datasource.ts |  6 +--
 8 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/e2e/various-suite/loki-editor.spec.ts b/e2e/various-suite/loki-editor.spec.ts
index a965a5c3acf..0f33f683b7f 100644
--- a/e2e/various-suite/loki-editor.spec.ts
+++ b/e2e/various-suite/loki-editor.spec.ts
@@ -5,7 +5,7 @@ const addDataSource = () => {
   e2e.flows.addDataSource({
     type: 'Loki',
     expectedAlertMessage:
-      'Unable to fetch labels from Loki (Failed to call resource), please check the server logs for more details',
+      'Unable to connect with Loki (Failed to call resource). Please check the server logs for more details.',
     name: dataSourceName,
     form: () => {
       e2e.components.DataSource.DataSourceHttpSettings.urlInput().type('http://loki-url:3100');
diff --git a/e2e/various-suite/loki-query-builder.spec.ts b/e2e/various-suite/loki-query-builder.spec.ts
index 96bf1230a86..c2f6a98675e 100644
--- a/e2e/various-suite/loki-query-builder.spec.ts
+++ b/e2e/various-suite/loki-query-builder.spec.ts
@@ -6,7 +6,7 @@ const addDataSource = () => {
   e2e.flows.addDataSource({
     type: 'Loki',
     expectedAlertMessage:
-      'Unable to fetch labels from Loki (Failed to call resource), please check the server logs for more details',
+      'Unable to connect with Loki (Failed to call resource). Please check the server logs for more details.',
     name: dataSourceName,
     form: () => {
       e2e.components.DataSource.DataSourceHttpSettings.urlInput().type('http://loki-url:3100');
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.test.tsx b/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.test.tsx
index e68e6829975..e860f0ade63 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.test.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.test.tsx
@@ -44,8 +44,8 @@ describe('Alerting Settings', () => {
     expect(screen.queryByText('Alertmanager data source')).toBeNull();
   });
 
-  it('should show the option to Manage alerts via Alerting UI', () => {
+  it('should show the option to manager alerts', () => {
     setup();
-    expect(screen.getByText('Manage alerts via Alerting UI')).toBeVisible();
+    expect(screen.getByText('Manage alert rules in Alerting UI')).toBeVisible();
   });
 });
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx
index 171858ae17d..e02c7954daf 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx
@@ -19,7 +19,12 @@ export function AlertingSettings<T extends AlertingConfig>({ options, onOptionsC
       <div className="gf-form-group">
         <div className="gf-form-inline">
           <div className="gf-form">
-            <InlineField labelWidth={26} label="Manage alerts via Alerting UI" disabled={options.readOnly}>
+            <InlineField
+              labelWidth={29}
+              label="Manage alert rules in Alerting UI"
+              disabled={options.readOnly}
+              tooltip="Manage alert rules for this data source. To manage other alerting resources, add an Alertmanager data source."
+            >
               <InlineSwitch
                 value={options.jsonData.manageAlerts !== false}
                 onChange={(event) =>
diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
index 73706113841..f5a3dee4ccb 100644
--- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
@@ -44,16 +44,10 @@ export const ConfigEditor = (props: Props) => {
 
       <AlertingSettings<LokiOptions> options={options} onOptionsChange={onOptionsChange} />
 
-      <div className="gf-form-group">
-        <div className="gf-form-inline">
-          <div className="gf-form">
-            <MaxLinesField
-              value={options.jsonData.maxLines || ''}
-              onChange={(value) => onOptionsChange(setMaxLines(options, value))}
-            />
-          </div>
-        </div>
-      </div>
+      <MaxLinesField
+        value={options.jsonData.maxLines || ''}
+        onChange={(value) => onOptionsChange(setMaxLines(options, value))}
+      />
 
       <DerivedFields
         value={options.jsonData.derivedFields}
diff --git a/public/app/plugins/datasource/loki/configuration/MaxLinesField.tsx b/public/app/plugins/datasource/loki/configuration/MaxLinesField.tsx
index 424499a6083..c79d78b334d 100644
--- a/public/app/plugins/datasource/loki/configuration/MaxLinesField.tsx
+++ b/public/app/plugins/datasource/loki/configuration/MaxLinesField.tsx
@@ -11,27 +11,36 @@ type Props = {
 export const MaxLinesField = (props: Props) => {
   const { value, onChange } = props;
   return (
-    <FormField
-      label="Maximum lines"
-      labelWidth={11}
-      inputWidth={20}
-      inputEl={
-        <input
-          type="number"
-          className="gf-form-input width-8 gf-form-input--has-help-icon"
-          value={value}
-          onChange={(event) => onChange(event.currentTarget.value)}
-          spellCheck={false}
-          placeholder="1000"
-        />
-      }
-      tooltip={
-        <>
-          Loki queries must contain a limit of the maximum number of lines returned (default: 1000). Increase this limit
-          to have a bigger result set for ad-hoc analysis. Decrease this limit if your browser becomes sluggish when
-          displaying the log results.
-        </>
-      }
-    />
+    <>
+      <h3 className="page-heading">Queries</h3>
+      <div className="gf-form-group">
+        <div className="gf-form-inline">
+          <div className="gf-form">
+            <FormField
+              label="Maximum lines"
+              labelWidth={11}
+              inputWidth={20}
+              inputEl={
+                <input
+                  type="number"
+                  className="gf-form-input width-8 gf-form-input--has-help-icon"
+                  value={value}
+                  onChange={(event) => onChange(event.currentTarget.value)}
+                  spellCheck={false}
+                  placeholder="1000"
+                />
+              }
+              tooltip={
+                <>
+                  Loki queries must contain a limit of the maximum number of lines returned (default: 1000). Increase
+                  this limit to have a bigger result set for ad-hoc analysis. Decrease this limit if your browser
+                  becomes sluggish when displaying the log results.
+                </>
+              }
+            />
+          </div>
+        </div>
+      </div>
+    </>
   );
 };
diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index bfa63d0791d..ad3e48e7944 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -336,7 +336,7 @@ describe('LokiDatasource', () => {
 
       expect(result).toStrictEqual({
         status: 'success',
-        message: 'Data source connected and labels found.',
+        message: 'Data source successfully connected.',
       });
     });
 
@@ -347,7 +347,8 @@ describe('LokiDatasource', () => {
 
       expect(result).toStrictEqual({
         status: 'error',
-        message: 'Data source connected, but no labels received. Verify that Loki and Promtail is configured properly.',
+        message:
+          'Data source connected, but no labels were received. Verify that Loki and Promtail are correctly configured.',
       });
     });
 
@@ -358,7 +359,7 @@ describe('LokiDatasource', () => {
 
       expect(result).toStrictEqual({
         status: 'error',
-        message: 'Unable to fetch labels from Loki, please check the server logs for more details',
+        message: 'Unable to connect with Loki. Please check the server logs for more details.',
       });
     });
 
@@ -374,7 +375,7 @@ describe('LokiDatasource', () => {
 
       expect(result).toStrictEqual({
         status: 'error',
-        message: 'Unable to fetch labels from Loki (error42), please check the server logs for more details',
+        message: 'Unable to connect with Loki (error42). Please check the server logs for more details.',
       });
     });
   });
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 527ba30ca42..f07f7b1c52d 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -735,11 +735,11 @@ export class LokiDatasource
     return this.metadataRequest('labels', params).then(
       (values) => {
         return values.length > 0
-          ? { status: 'success', message: 'Data source connected and labels found.' }
+          ? { status: 'success', message: 'Data source successfully connected.' }
           : {
               status: 'error',
               message:
-                'Data source connected, but no labels received. Verify that Loki and Promtail is configured properly.',
+                'Data source connected, but no labels were received. Verify that Loki and Promtail are correctly configured.',
             };
       },
       (err) => {
@@ -750,7 +750,7 @@ export class LokiDatasource
         // because those will only describe how the request between browser<>server failed
         const info: string = err?.data?.message ?? '';
         const infoInParentheses = info !== '' ? ` (${info})` : '';
-        const message = `Unable to fetch labels from Loki${infoInParentheses}, please check the server logs for more details`;
+        const message = `Unable to connect with Loki${infoInParentheses}. Please check the server logs for more details.`;
         return { status: 'error', message: message };
       }
     );

From 1855bca2fa783286a8a9097dc88927f9e6dd9507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Fri, 14 Apr 2023 12:07:46 +0200
Subject: [PATCH 138/729] Explore: Promote exploreMixedDatasource feature
 toggle to beta (#66552)

Promote exploreMixedDatasource to beta
---
 .../setup-grafana/configure-grafana/feature-toggles/index.md    | 2 +-
 pkg/services/featuremgmt/registry.go                            | 2 +-
 pkg/services/featuremgmt/toggles_gen.csv                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 85771c3b30b..679de6b828a 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -44,6 +44,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `panelTitleSearch`                   | Search for dashboards using panel title                                                                                                                                                      |
 | `prometheusAzureOverrideAudience`    | Experimental. Allow override default AAD audience for Azure Prometheus endpoint                                                                                                              |
 | `migrationLocking`                   | Lock database during migrations                                                                                                                                                              |
+| `exploreMixedDatasource`             | Enable mixed datasource in Explore                                                                                                                                                           |
 | `correlations`                       | Correlations page                                                                                                                                                                            |
 | `newDBLibrary`                       | Use jmoiron/sqlx rather than xorm for a few backend services                                                                                                                                 |
 | `validateDashboardsOnSave`           | Validate dashboard JSON POSTed to api/dashboards/db                                                                                                                                          |
@@ -68,7 +69,6 @@ Alpha features might be changed or removed without prior notice.
 | `publicDashboardsEmailSharing`     | Enables public dashboard sharing to be restricted to only allowed emails                                                                                                                            |
 | `lokiLive`                         | Support WebSocket streaming for loki (early prototype)                                                                                                                                              |
 | `storage`                          | Configurable storage for dashboards, datasources, and resources                                                                                                                                     |
-| `exploreMixedDatasource`           | Enable mixed datasource in Explore                                                                                                                                                                  |
 | `newTraceView`                     | Shows the new trace view design                                                                                                                                                                     |
 | `datasourceQueryMultiStatus`       | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                    |
 | `traceToMetrics`                   | Enable trace to metrics links                                                                                                                                                                       |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index add101533a4..1153e39c680 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -100,7 +100,7 @@ var (
 		{
 			Name:         "exploreMixedDatasource",
 			Description:  "Enable mixed datasource in Explore",
-			State:        FeatureStateAlpha,
+			State:        FeatureStateBeta,
 			FrontendOnly: true,
 			Owner:        grafanaExploreSquad,
 		},
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 9bc4f460056..1f5bd22a36e 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -13,7 +13,7 @@ featureHighlights,stable,@grafana/grafana-as-code,false,false,false,false
 migrationLocking,beta,@grafana/backend-platform,false,false,false,false
 storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
 k8s,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
-exploreMixedDatasource,alpha,@grafana/explore-squad,false,false,false,true
+exploreMixedDatasource,beta,@grafana/explore-squad,false,false,false,true
 newTraceView,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
 correlations,beta,@grafana/explore-squad,false,false,false,false
 cloudWatchDynamicLabels,stable,@grafana/aws-plugins,false,false,false,false

From d1f1beaef9b05ab2fd8f0fdccce4bc7acbd8f870 Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Fri, 14 Apr 2023 12:18:07 +0200
Subject: [PATCH 139/729] Docs: Add distributed tracing plugin developer guide
 (#65898)

* Docs: Add plugin developer guide on distributed tracing

* Docs: Fix typo

* Docs: Plugins: Tracing: Address TODOs and other changes

* Docs: Plugins: Tracing: Fix typo

* Docs: Plugins: Tracing: Add note about min SDK version and update command

* Docs: Plugins: Tracing: Fix some typos, rephrase some sentences

* Docs: Plugins: Traacing: Removed manual instance management instructions

* Update docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md

Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com>

* Docs: Plugins: Tracing: Use markdown instead of HTML

---------

Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com>
---
 docs/sources/developers/plugins/_index.md     |   1 +
 ...distributed-tracing-for-backend-plugins.md | 123 ++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md

diff --git a/docs/sources/developers/plugins/_index.md b/docs/sources/developers/plugins/_index.md
index 31739b21e3d..8011411857b 100644
--- a/docs/sources/developers/plugins/_index.md
+++ b/docs/sources/developers/plugins/_index.md
@@ -52,6 +52,7 @@ Improve an existing plugin with one of our guides:
 - [Add support for Explore queries]({{< relref "add-support-for-explore-queries.md" >}})
 - [Add support for variables]({{< relref "add-support-for-variables.md" >}})
 - [Add a query editor help component]({{< relref "add-query-editor-help.md" >}})
+- [Add distributed tracing for backend plugins]({{< relref "add-distributed-tracing-for-backend-plugins.md" >}})
 - [Build a logs data source plugin]({{< relref "build-a-logs-data-source-plugin.md" >}})
 - [Build a streaming data source plugin]({{< relref "build-a-streaming-data-source-plugin.md" >}}/)
 - [Error handling]({{< relref "error-handling.md" >}})
diff --git a/docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md b/docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md
new file mode 100644
index 00000000000..17ea19108ea
--- /dev/null
+++ b/docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md
@@ -0,0 +1,123 @@
+---
+title: Add distributed tracing for backend plugins
+---
+
+# Add distributed tracing for backend plugins
+
+> **Note:** This feature requires at least Grafana 9.5.0, and your plugin needs to be built at least with
+> grafana-plugins-sdk-go v0.157.0. If you run a plugin with tracing features on an older version of Grafana,
+> tracing will be disabled.
+
+## Introduction
+
+Distributed tracing allows backend plugin developers to create custom spans in their plugins, and send them to the same endpoint
+and with the same propagation format as the main Grafana instance. The tracing context is also propagated from the Grafana instance
+to the plugin, so the plugin's spans will be correlated to the correct trace.
+
+## Configuration
+
+> **Note:** Only OpenTelemetry is supported. If Grafana is configured to use a deprecated tracing system (Jaeger or OpenTracing),
+> tracing will be disabled in the plugin. Please note that OpenTelemetry + Jaeger propagator is supported.
+
+OpenTelemetry must be enabled and configured for the Grafana instance. Please refer to [this section](
+{{< relref "../../setup-grafana/configure-grafana/#tracingopentelemetry" >}}) for more information.
+
+As of Grafana 9.5.0, plugins tracing must be enabled manually on a per-plugin basis, by specifying `tracing = true` in the plugin's config section:
+
+```ini
+[plugin.myorg-myplugin-datasource]
+tracing = true
+```
+
+## Implementing tracing in your plugin
+
+> **Note:** Make sure you are using at least grafana-plugin-sdk-go v0.157.0. You can update with `go get -u github.com/grafana/grafana-plugin-sdk-go`.
+
+When OpenTelemetry tracing is enabled on the main Grafana instance and tracing is enabeld for a plugin,
+the OpenTelemetry endpoint address and propagation format will be passed to the plugin during startup,
+which will be used to configure a global tracer.
+
+1. The global tracer is configured automatically if you use <code>datasource.Manage</code> or <code>app.Manage</code> to run your plugin.
+
+   This also allows you to specify custom attributes for the default tracer:
+
+   ```go
+   func main() {
+       if err := datasource.Manage("MY_PLUGIN_ID", plugin.NewDatasource, datasource.ManageOpts{
+           TracingOpts: tracing.Opts{
+               // Optional custom attributes attached to the tracer's resource.
+               // The tracer will already have some SDK and runtime ones pre-populated.
+               CustomAttributes: []attribute.KeyValue{
+                   attribute.String("my_plugin.my_attribute", "custom value"),
+               },
+           },
+       }); err != nil {
+           log.DefaultLogger.Error(err.Error())
+           os.Exit(1)
+       }
+   }
+   ```
+
+1. Once tracing is configured, you can access the global tracer with:
+
+   ```go
+   tracing.DefaultTracer()
+   ```
+
+   this returns an [OpenTelemetry trace.Tracer](https://pkg.go.dev/go.opentelemetry.io/otel/trace#Tracer), and can be used to create spans.
+
+   For example:
+
+   ```go
+   func (d *Datasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) (backend.DataResponse, error) {
+       ctx, span := tracing.DefaultTracer().Start(
+           ctx,
+           "query processing",
+           trace.WithAttributes(
+               attribute.String("query.ref_id", query.RefID),
+               attribute.String("query.type", query.QueryType),
+               attribute.Int64("query.max_data_points", query.MaxDataPoints),
+               attribute.Int64("query.interval_ms", query.Interval.Milliseconds()),
+               attribute.Int64("query.time_range.from", query.TimeRange.From.Unix()),
+               attribute.Int64("query.time_range.to", query.TimeRange.To.Unix()),
+           ),
+       )
+       defer span.End()
+       log.DefaultLogger.Debug("query", "traceID", trace.SpanContextFromContext(ctx).TraceID())
+
+       // ...
+   }
+   ```
+
+   Refer to the [OpenTelemetry Go SDK](https://pkg.go.dev/go.opentelemetry.io/otel) for in-depth documentation about all the features provided by OpenTelemetry.
+
+   If tracing is disabled in Grafana, `backend.DefaultTracer()` returns a no-op tracer.
+
+### Tracing GRPC calls
+
+A new span is created automatically for each GRPC call (`QueryData`, `CheckHealth`, etc), both on Grafana's side and
+on the plugin's side.
+
+This also injects the trace context into the `context.Context` passed to those methods.
+
+This allows you to retrieve the [trace.SpanContext](https://pkg.go.dev/go.opentelemetry.io/otel/trace#SpanContext) by using `tracing.SpanContextFromContext` by passing the original `context.Context` to it:
+
+```go
+func (d *Datasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) (backend.DataResponse, error) {
+    spanCtx := trace.SpanContextFromContext(ctx)
+    traceID := spanCtx.TraceID()
+
+    // ...
+}
+```
+
+### Tracing HTTP requests
+
+When tracing is enabled, a `TracingMiddleware` is also added to the default middleware stack to all HTTP clients created
+using the `httpclient.New` or `httpclient.NewProvider`, unless custom middlewares are specified.
+
+This middleware creates spans for each outgoing HTTP request and provides some useful attributes and events related to the request's lifecycle.
+
+## Complete plugin example
+
+You can refer to the [datasource-http-backend plugin example](https://github.com/grafana/grafana-plugin-examples/tree/main/examples/datasource-http-backend) for a complete example of a plugin that has full tracing support.

From ee166205cde431f3e673a77456933185256e5587 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 14 Apr 2023 11:46:18 +0100
Subject: [PATCH 140/729] Navigation: move connections in IA (#66559)

move connections in IA
---
 pkg/services/navtree/models.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index 1d0df6eedaf..e8130651b0c 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -17,11 +17,11 @@ const (
 	WeightDashboard
 	WeightExplore
 	WeightAlerting
-	WeightDataConnections
 	WeightPlugin
 	WeightConfig
 	WeightAlertsAndIncidents
 	WeightMonitoring
+	WeightDataConnections
 	WeightApps
 	WeightAdmin
 	WeightProfile

From d84bbfd51b8cbc011742f980e03f4917021cad39 Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Fri, 14 Apr 2023 11:47:52 +0100
Subject: [PATCH 141/729] Explore: fix table sizing with few rows (#66546)

---
 public/app/features/explore/TableContainer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx
index 6e7795d9eb9..828dbeaebf4 100644
--- a/public/app/features/explore/TableContainer.tsx
+++ b/public/app/features/explore/TableContainer.tsx
@@ -46,7 +46,7 @@ export class TableContainer extends PureComponent<Props> {
     }
 
     // tries to estimate table height
-    return Math.max(Math.min(600, mainFrame.length * 35) + 35);
+    return Math.max(Math.min(600, mainFrame.length * 36) + 40 + 46);
   }
 
   render() {

From 7bc31ab04b5c87f06bdb383c7f4a6195e70d53d1 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Fri, 14 Apr 2023 13:01:10 +0200
Subject: [PATCH 142/729] Replace the DS drawer toggle with the new DS picker
 one (#66551)

---
 .../configure-grafana/feature-toggles/index.md     |  2 +-
 .../grafana-data/src/types/featureToggles.gen.ts   |  2 +-
 pkg/services/featuremgmt/registry.go               | 14 +++++++-------
 pkg/services/featuremgmt/toggles_gen.csv           |  2 +-
 pkg/services/featuremgmt/toggles_gen.go            |  8 ++++----
 .../app/features/query/components/QueryGroup.tsx   |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 679de6b828a..759969cac5e 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -92,7 +92,6 @@ Alpha features might be changed or removed without prior notice.
 | `lokiQuerySplittingConfig`         | Give users the option to configure split durations for Loki queries                                                                                                                                 |
 | `individualCookiePreferences`      | Support overriding cookie preferences per user                                                                                                                                                      |
 | `onlyExternalOrgRoleSync`          | Prohibits a user from changing organization roles synced with external auth providers                                                                                                               |
-| `drawerDataSourcePicker`           | Changes the user experience for data source selection to a drawer.                                                                                                                                  |
 | `traceqlSearch`                    | Enables the 'TraceQL Search' tab for the Tempo datasource which provides a UI to generate TraceQL queries                                                                                           |
 | `prometheusMetricEncyclopedia`     | Replaces the Prometheus query builder metric select option with a paginated and filterable component                                                                                                |
 | `timeSeriesTable`                  | Enable time series table transformer & sparkline cell type                                                                                                                                          |
@@ -109,6 +108,7 @@ Alpha features might be changed or removed without prior notice.
 | `pyroscopeFlameGraph`              | Changes flame graph to pyroscope one                                                                                                                                                                |
 | `dataplaneFrontendFallback`        | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                |
 | `authenticationConfigUI`           | Enables authentication configuration UI                                                                                                                                                             |
+| `advancedDataSourcePicker`         | Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode                                                                                      |
 
 ## Development feature toggles
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index c0f11a0d3a4..4125a27b7df 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -76,7 +76,6 @@ export interface FeatureToggles {
   lokiQuerySplittingConfig?: boolean;
   individualCookiePreferences?: boolean;
   onlyExternalOrgRoleSync?: boolean;
-  drawerDataSourcePicker?: boolean;
   traceqlSearch?: boolean;
   prometheusMetricEncyclopedia?: boolean;
   timeSeriesTable?: boolean;
@@ -97,4 +96,5 @@ export interface FeatureToggles {
   useCachingService?: boolean;
   enableElasticsearchBackendQuerying?: boolean;
   authenticationConfigUI?: boolean;
+  advancedDataSourcePicker?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 1153e39c680..d47daf1ae6c 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -391,13 +391,6 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaAuthnzSquad,
 		},
-		{
-			Name:         "drawerDataSourcePicker",
-			Description:  "Changes the user experience for data source selection to a drawer.",
-			State:        FeatureStateAlpha,
-			FrontendOnly: true,
-			Owner:        grafanaBiSquad,
-		},
 		{
 			Name:         "traceqlSearch",
 			Description:  "Enables the 'TraceQL Search' tab for the Tempo datasource which provides a UI to generate TraceQL queries",
@@ -526,5 +519,12 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaAuthnzSquad,
 		},
+		{
+			Name:         "advancedDataSourcePicker",
+			Description:  "Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode",
+			State:        FeatureStateAlpha,
+			FrontendOnly: true,
+			Owner:        grafanaDashboardsSquad,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 1f5bd22a36e..7e1be02493c 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -57,7 +57,6 @@ lokiQuerySplitting,alpha,@grafana/observability-logs,false,false,false,true
 lokiQuerySplittingConfig,alpha,@grafana/observability-logs,false,false,false,true
 individualCookiePreferences,alpha,@grafana/backend-platform,false,false,false,false
 onlyExternalOrgRoleSync,alpha,@grafana/grafana-authnz-team,false,false,false,false
-drawerDataSourcePicker,alpha,@grafana/grafana-bi-squad,false,false,false,true
 traceqlSearch,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
 prometheusMetricEncyclopedia,alpha,@grafana/observability-metrics,false,false,false,true
 timeSeriesTable,alpha,@grafana/app-o11y,false,false,false,true
@@ -78,3 +77,4 @@ dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false
 useCachingService,stable,@grafana/grafana-operator-experience-squad,false,false,true,false
 enableElasticsearchBackendQuerying,beta,@grafana/observability-logs,false,false,false,false
 authenticationConfigUI,alpha,@grafana/grafana-authnz-team,false,false,false,false
+advancedDataSourcePicker,alpha,@grafana/dashboards-squad,false,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index ec864dd4e7c..1b7897b7b26 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -239,10 +239,6 @@ const (
 	// Prohibits a user from changing organization roles synced with external auth providers
 	FlagOnlyExternalOrgRoleSync = "onlyExternalOrgRoleSync"
 
-	// FlagDrawerDataSourcePicker
-	// Changes the user experience for data source selection to a drawer.
-	FlagDrawerDataSourcePicker = "drawerDataSourcePicker"
-
 	// FlagTraceqlSearch
 	// Enables the &#39;TraceQL Search&#39; tab for the Tempo datasource which provides a UI to generate TraceQL queries
 	FlagTraceqlSearch = "traceqlSearch"
@@ -322,4 +318,8 @@ const (
 	// FlagAuthenticationConfigUI
 	// Enables authentication configuration UI
 	FlagAuthenticationConfigUI = "authenticationConfigUI"
+
+	// FlagAdvancedDataSourcePicker
+	// Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode
+	FlagAdvancedDataSourcePicker = "advancedDataSourcePicker"
 )
diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index d2cf1134c07..0d97f58750b 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -214,7 +214,7 @@ export class QueryGroup extends PureComponent<Props, State> {
             Data source
           </InlineFormLabel>
           <div className={styles.dataSourceRowItem}>
-            {config.featureToggles.drawerDataSourcePicker ? (
+            {config.featureToggles.advancedDataSourcePicker ? (
               <DataSourcePickerWithHistory
                 onChange={this.onChangeDataSource}
                 current={options.dataSource}

From a438576a6d5542a9b6305ba08d0b18a07c070def Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 14 Apr 2023 12:20:25 +0100
Subject: [PATCH 143/729] Chore: Use @types/chance types (#66569)

---
 package.json                                  |  1 +
 .../TraceView/components/demo/chance.d.ts     |  1 -
 .../components/demo/trace-generators.ts       | 79 ++++++++++++++++---
 yarn.lock                                     |  8 ++
 4 files changed, 75 insertions(+), 14 deletions(-)
 delete mode 100644 public/app/features/explore/TraceView/components/demo/chance.d.ts

diff --git a/package.json b/package.json
index ac9b69310d3..550490c5cc7 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
     "@testing-library/user-event": "14.4.3",
     "@types/angular": "1.8.4",
     "@types/angular-route": "1.7.2",
+    "@types/chance": "^1.1.3",
     "@types/common-tags": "^1.8.0",
     "@types/d3": "7.4.0",
     "@types/d3-force": "^3.0.0",
diff --git a/public/app/features/explore/TraceView/components/demo/chance.d.ts b/public/app/features/explore/TraceView/components/demo/chance.d.ts
deleted file mode 100644
index 9ddde3c0f42..00000000000
--- a/public/app/features/explore/TraceView/components/demo/chance.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'chance';
diff --git a/public/app/features/explore/TraceView/components/demo/trace-generators.ts b/public/app/features/explore/TraceView/components/demo/trace-generators.ts
index a87889233f4..35b7e417bf9 100644
--- a/public/app/features/explore/TraceView/components/demo/trace-generators.ts
+++ b/public/app/features/explore/TraceView/components/demo/trace-generators.ts
@@ -14,11 +14,62 @@
 
 import Chance from 'chance';
 
-import { TraceSpanData, TraceProcess } from 'app/features/explore/TraceView/components/types/trace';
+import {
+  TraceSpanData,
+  TraceProcess,
+  TraceKeyValuePair,
+  TraceResponse,
+} from 'app/features/explore/TraceView/components/types/trace';
 
 import { getSpanId } from '../selectors/span';
 
-const chance = new Chance();
+interface Process extends TraceProcess {
+  processID: string;
+}
+
+interface ChanceSpanOptions {
+  traceID?: string;
+  processes?: Record<string, unknown>;
+  traceStartTime?: number;
+  traceEndTime?: number;
+  operations?: string[];
+}
+
+interface ChanceTraceOptions {
+  numberOfSpans?: number;
+  numberOfProcesses?: number;
+  maxDepth?: number;
+  spansPerLevel?: number | null;
+}
+
+interface ChanceTracesOptions {
+  numberOfTraces?: number;
+}
+
+interface ChanceProcessOptions {
+  services?: string[];
+}
+
+interface ChanceProcessesOptions {
+  numberOfProcesses?: number;
+}
+
+interface ChanceMixins {
+  tag(): TraceKeyValuePair;
+  tags(): TraceKeyValuePair[];
+
+  span(options: ChanceSpanOptions): TraceSpanData;
+
+  trace(options: ChanceTraceOptions): TraceResponse;
+  traces(options: ChanceTracesOptions): TraceResponse[];
+
+  process(options: ChanceProcessOptions): Process;
+  processes(options: ChanceProcessesOptions): Process[];
+}
+
+// Difficult to extend Chance interface with our mixins, so we just steam roll them in instead
+// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+const chance = new Chance() as Chance.Chance & ChanceMixins;
 
 export const SERVICE_LIST = ['serviceA', 'serviceB', 'serviceC', 'serviceD', 'serviceE', 'serviceF'];
 export const OPERATIONS_LIST = [
@@ -32,10 +83,6 @@ export const OPERATIONS_LIST = [
   'MongoDB::update',
 ];
 
-type Process = TraceProcess & {
-  processID: string;
-};
-
 function setupParentSpan(spans: TraceSpanData[], parentSpanValues: TraceSpanData) {
   Object.assign(spans[0], parentSpanValues);
   return spans;
@@ -55,7 +102,7 @@ function getParentSpanId(span: TraceSpanData, levels: string[][]) {
 }
 
 /* this simulates the hierarchy created by CHILD_OF tags */
-function attachReferences(spans: TraceSpanData[], depth: number, spansPerLevel: null) {
+function attachReferences(spans: TraceSpanData[], depth: number, spansPerLevel: number | null) {
   let levels: string[][] = [[getSpanId(spans[0])]];
 
   const duplicateLevelFilter = (currentLevels: string[][]) => (span: TraceSpanData) =>
@@ -81,7 +128,7 @@ function attachReferences(spans: TraceSpanData[], depth: number, spansPerLevel:
           ...span,
           references: [
             {
-              refType: 'CHILD_OF',
+              refType: 'CHILD_OF' as const,
               traceID: span.traceID,
               spanID: parentSpanId,
             },
@@ -104,7 +151,7 @@ export default chance.mixin({
     numberOfProcesses = chance.integer({ min: 1, max: 10 }),
     maxDepth = chance.integer({ min: 1, max: 10 }),
     spansPerLevel = null,
-  }) {
+  }: ChanceTraceOptions) {
     const traceID = chance.guid();
     const duration: number = chance.integer({ min: 10000, max: 5000000 });
     const timestamp = (new Date().getTime() - chance.integer({ min: 0, max: 1000 }) * 1000) * 1000;
@@ -129,6 +176,7 @@ export default chance.mixin({
       processes,
     };
   },
+
   tag() {
     return {
       key: 'http.url',
@@ -136,13 +184,14 @@ export default chance.mixin({
       value: `/v2/${chance.pickone(['alpha', 'beta', 'gamma'])}/${chance.guid()}`,
     };
   },
+
   span({
     traceID = chance.guid(),
     processes = {},
     traceStartTime = 0,
     traceEndTime = 0,
     operations = OPERATIONS_LIST,
-  }) {
+  }: ChanceSpanOptions) {
     // Set default values for trace start/end time.
     traceStartTime = traceStartTime || chance.timestamp() * 1000 * 1000;
     traceEndTime = traceEndTime || traceStartTime + 100000;
@@ -167,20 +216,24 @@ export default chance.mixin({
       logs: [],
     };
   },
-  process({ services = SERVICE_LIST }) {
+
+  process({ services = SERVICE_LIST }: ChanceProcessOptions) {
     return {
       processID: chance.guid(),
       serviceName: chance.pickone(services),
       tags: chance.tags(),
     };
   },
-  traces({ numberOfTraces = chance.integer({ min: 5, max: 15 }) }) {
+
+  traces({ numberOfTraces = chance.integer({ min: 5, max: 15 }) }: ChanceTracesOptions) {
     return chance.n(chance.trace, numberOfTraces, {});
   },
+
   tags() {
     return chance.n(chance.tag, chance.integer({ min: 1, max: 10 }), {});
   },
-  processes({ numberOfProcesses = chance.integer({ min: 1, max: 25 }) }) {
+
+  processes({ numberOfProcesses = chance.integer({ min: 1, max: 25 }) }: ChanceProcessesOptions) {
     return chance.n(chance.process, numberOfProcesses, {});
   },
 });
diff --git a/yarn.lock b/yarn.lock
index 24a60dab0d8..1e0b8d3acd4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8942,6 +8942,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/chance@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@types/chance@npm:1.1.3"
+  checksum: df2be43fab359e5fa734fb91aa1c4c15108310be0e4990d00203805a63f9b2182da74eaabc8859b742e150d970decf27a773fcc6cbf28fb5b372c9b1bd7e9b89
+  languageName: node
+  linkType: hard
+
 "@types/chrome-remote-interface@npm:0.31.9":
   version: 0.31.9
   resolution: "@types/chrome-remote-interface@npm:0.31.9"
@@ -20182,6 +20189,7 @@ __metadata:
     "@testing-library/user-event": 14.4.3
     "@types/angular": 1.8.4
     "@types/angular-route": 1.7.2
+    "@types/chance": ^1.1.3
     "@types/common-tags": ^1.8.0
     "@types/d3": 7.4.0
     "@types/d3-force": ^3.0.0

From a31104b107a6a0ebceaec8786ab1a0d8d02eb563 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 14 Apr 2023 13:44:02 +0200
Subject: [PATCH 144/729] Loki: Refactor logic for using context filters
 (#66382)

* Loki: Change logic for using context filters

* Dont add parser and parsed labels if multiple

* Update public/app/plugins/datasource/loki/LogContextProvider.ts

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>

* Update public/app/plugins/datasource/loki/LogContextProvider.ts

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>

* Update

* Rename variable

---------

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
---
 .betterer.results                             |   6 +-
 .../loki/LogContextProvider.test.ts           | 171 +++++++++++---
 .../datasource/loki/LogContextProvider.ts     | 213 +++++++++++++-----
 .../loki/components/LokiContextUi.test.tsx    |  48 ++--
 .../loki/components/LokiContextUi.tsx         |  26 +--
 .../app/plugins/datasource/loki/datasource.ts |  75 +-----
 .../app/plugins/datasource/loki/queryUtils.ts |  14 +-
 7 files changed, 327 insertions(+), 226 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 77c376299b1..ab21280defc 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4580,9 +4580,6 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/loki/LiveStreams.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/datasource/loki/LogContextProvider.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
@@ -4616,6 +4613,9 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/loki/getDerivedFields.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
+    "public/app/plugins/datasource/loki/queryUtils.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
index 6a494ef8b79..7a4feeb7fd5 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
@@ -1,13 +1,27 @@
-import { FieldType, LogRowContextQueryDirection, LogRowModel, MutableDataFrame } from '@grafana/data';
+import { of } from 'rxjs';
+
+import {
+  DataQueryResponse,
+  FieldType,
+  LogRowContextQueryDirection,
+  LogRowModel,
+  MutableDataFrame,
+} from '@grafana/data';
 
 import LokiLanguageProvider from './LanguageProvider';
 import { LogContextProvider } from './LogContextProvider';
+import { createLokiDatasource } from './mocks';
+import { LokiQuery } from './types';
 
 const defaultLanguageProviderMock = {
   start: jest.fn(),
-  getLabelKeys: jest.fn(() => ['foo']),
+  getLabelKeys: jest.fn(() => ['bar', 'xyz']),
 } as unknown as LokiLanguageProvider;
 
+const defaultDatasourceMock = createLokiDatasource();
+defaultDatasourceMock.query = jest.fn(() => of({ data: [] } as DataQueryResponse));
+defaultDatasourceMock.languageProvider = defaultLanguageProviderMock;
+
 const defaultLogRow = {
   rowIndex: 0,
   dataFrame: new MutableDataFrame({
@@ -19,46 +33,129 @@ const defaultLogRow = {
       },
     ],
   }),
-  labels: { bar: 'baz', foo: 'uniqueParsedLabel' },
+  labels: { bar: 'baz', foo: 'uniqueParsedLabel', xyz: 'abc' },
   uid: '1',
 } as unknown as LogRowModel;
 
-describe('new context ui', () => {
-  it('returns expression with 1 label', async () => {
-    const lcp = new LogContextProvider(defaultLanguageProviderMock);
-    const result = await lcp.prepareContextExpr(defaultLogRow);
-
-    expect(result).toEqual('{foo="uniqueParsedLabel"}');
-  });
-
-  it('returns empty expression for parsed labels', async () => {
-    const languageProviderMock = {
-      ...defaultLanguageProviderMock,
-      getLabelKeys: jest.fn(() => []),
-    } as unknown as LokiLanguageProvider;
-
-    const lcp = new LogContextProvider(languageProviderMock);
-    const result = await lcp.prepareContextExpr(defaultLogRow);
-
-    expect(result).toEqual('{}');
-  });
-});
-
-describe('prepareLogRowContextQueryTarget', () => {
-  const lcp = new LogContextProvider(defaultLanguageProviderMock);
-  it('creates query with only labels from /labels API', async () => {
-    const contextQuery = await lcp.prepareLogRowContextQueryTarget(
-      defaultLogRow,
-      10,
-      LogRowContextQueryDirection.Backward
+describe('LogContextProvider', () => {
+  let logContextProvider: LogContextProvider;
+  beforeEach(() => {
+    logContextProvider = new LogContextProvider(defaultDatasourceMock);
+    logContextProvider.getInitContextFiltersFromLabels = jest.fn(() =>
+      Promise.resolve([{ value: 'bar', enabled: true, fromParser: false, label: 'bar' }])
     );
-
-    expect(contextQuery.query.expr).toContain('uniqueParsedLabel');
-    expect(contextQuery.query.expr).not.toContain('baz');
   });
 
-  it('should call languageProvider.start to fetch labels', async () => {
-    await lcp.prepareLogRowContextQueryTarget(defaultLogRow, 10, LogRowContextQueryDirection.Backward);
-    expect(lcp.languageProvider.start).toBeCalled();
+  describe('getLogRowContext', () => {
+    it('should call getInitContextFilters if no appliedContextFilters', async () => {
+      expect(logContextProvider.appliedContextFilters).toHaveLength(0);
+      await logContextProvider.getLogRowContext(defaultLogRow, {
+        limit: 10,
+        direction: LogRowContextQueryDirection.Backward,
+      });
+      expect(logContextProvider.getInitContextFiltersFromLabels).toBeCalled();
+      expect(logContextProvider.appliedContextFilters).toHaveLength(1);
+    });
+
+    it('should not call getInitContextFilters if appliedContextFilters', async () => {
+      logContextProvider.appliedContextFilters = [
+        { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
+        { value: 'xyz', enabled: true, fromParser: false, label: 'xyz' },
+      ];
+      await logContextProvider.getLogRowContext(defaultLogRow, {
+        limit: 10,
+        direction: LogRowContextQueryDirection.Backward,
+      });
+      expect(logContextProvider.getInitContextFiltersFromLabels).not.toBeCalled();
+      expect(logContextProvider.appliedContextFilters).toHaveLength(2);
+    });
+  });
+
+  describe('prepareLogRowContextQueryTarget', () => {
+    describe('query with no parser', () => {
+      const query = {
+        expr: '{bar="baz"}',
+      } as LokiQuery;
+      it('returns empty expression if no appliedContextFilters', async () => {
+        logContextProvider.appliedContextFilters = [];
+        const result = await logContextProvider.prepareLogRowContextQueryTarget(
+          defaultLogRow,
+          10,
+          LogRowContextQueryDirection.Backward,
+          query
+        );
+        expect(result.query.expr).toEqual('{}');
+      });
+
+      it('should not apply parsed labels', async () => {
+        logContextProvider.appliedContextFilters = [
+          { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
+          { value: 'xyz', enabled: true, fromParser: false, label: 'xyz' },
+          { value: 'foo', enabled: true, fromParser: true, label: 'foo' },
+        ];
+        const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
+          defaultLogRow,
+          10,
+          LogRowContextQueryDirection.Backward,
+          query
+        );
+
+        expect(contextQuery.query.expr).toEqual('{bar="baz",xyz="abc"}');
+      });
+    });
+
+    describe('query with parser', () => {
+      it('should apply parser', async () => {
+        logContextProvider.appliedContextFilters = [
+          { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
+          { value: 'xyz', enabled: true, fromParser: false, label: 'xyz' },
+        ];
+        const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
+          defaultLogRow,
+          10,
+          LogRowContextQueryDirection.Backward,
+          {
+            expr: '{bar="baz"} | logfmt',
+          } as LokiQuery
+        );
+
+        expect(contextQuery.query.expr).toEqual('{bar="baz",xyz="abc"} | logfmt');
+      });
+
+      it('should apply parser and parsed labels', async () => {
+        logContextProvider.appliedContextFilters = [
+          { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
+          { value: 'xyz', enabled: true, fromParser: false, label: 'xyz' },
+          { value: 'foo', enabled: true, fromParser: true, label: 'foo' },
+        ];
+        const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
+          defaultLogRow,
+          10,
+          LogRowContextQueryDirection.Backward,
+          {
+            expr: '{bar="baz"} | logfmt',
+          } as LokiQuery
+        );
+
+        expect(contextQuery.query.expr).toEqual('{bar="baz",xyz="abc"} | logfmt | foo=`uniqueParsedLabel`');
+      });
+    });
+
+    it('should not apply parser and parsed labels if more parsers in original query', async () => {
+      logContextProvider.appliedContextFilters = [
+        { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
+        { value: 'foo', enabled: true, fromParser: true, label: 'foo' },
+      ];
+      const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
+        defaultLogRow,
+        10,
+        LogRowContextQueryDirection.Backward,
+        {
+          expr: '{bar="baz"} | logfmt | json',
+        } as unknown as LokiQuery
+      );
+
+      expect(contextQuery.query.expr).toEqual(`{bar="baz"}`);
+    });
   });
 });
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
index f8dedc90c3b..087563445c3 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -1,30 +1,128 @@
-import { FieldCache, FieldType, LogRowContextQueryDirection, LogRowModel, TimeRange, toUtc } from '@grafana/data';
-import { DataQuery } from '@grafana/schema';
+import { catchError, lastValueFrom, of, switchMap } from 'rxjs';
+
+import {
+  CoreApp,
+  DataFrame,
+  DataQueryError,
+  DataQueryResponse,
+  FieldCache,
+  FieldType,
+  LogRowModel,
+  TimeRange,
+  toUtc,
+  LogRowContextQueryDirection,
+  LogRowContextOptions,
+} from '@grafana/data';
+import { DataQuery, Labels } from '@grafana/schema';
 
-import LokiLanguageProvider from './LanguageProvider';
 import { LokiContextUi } from './components/LokiContextUi';
-import { REF_ID_STARTER_LOG_ROW_CONTEXT } from './datasource';
+import { LokiDatasource, makeRequest, REF_ID_STARTER_LOG_ROW_CONTEXT } from './datasource';
 import { escapeLabelValueInExactSelector } from './languageUtils';
 import { addLabelToQuery, addParserToQuery } from './modifyQuery';
-import { getParserFromQuery } from './queryUtils';
+import { getParserFromQuery, isLokiQuery, isQueryWithParser } from './queryUtils';
+import { sortDataFrameByTime, SortDirection } from './sortDataFrame';
 import { ContextFilter, LokiQuery, LokiQueryDirection, LokiQueryType } from './types';
 
 export class LogContextProvider {
-  languageProvider: LokiLanguageProvider;
+  datasource: LokiDatasource;
+  appliedContextFilters: ContextFilter[];
   onContextClose: (() => void) | undefined;
 
-  constructor(languageProvider: LokiLanguageProvider) {
-    this.languageProvider = languageProvider;
+  constructor(datasource: LokiDatasource) {
+    this.datasource = datasource;
+    this.appliedContextFilters = [];
   }
 
+  getLogRowContext = async (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    origQuery?: DataQuery
+  ): Promise<{ data: DataFrame[] }> => {
+    const direction = (options && options.direction) || LogRowContextQueryDirection.Backward;
+    const limit = (options && options.limit) || 10;
+
+    // This happens only on initial load, when user haven't applied any filters yet
+    // We need to get the initial filters from the row labels
+    if (this.appliedContextFilters.length === 0) {
+      const filters = (await this.getInitContextFiltersFromLabels(row.labels)).filter((filter) => filter.enabled);
+      this.appliedContextFilters = filters;
+    }
+
+    const { query, range } = await this.prepareLogRowContextQueryTarget(row, limit, direction, origQuery);
+
+    const processDataFrame = (frame: DataFrame): DataFrame => {
+      // log-row-context requires specific field-names to work, so we set them here: "ts", "line", "id"
+      const cache = new FieldCache(frame);
+      const timestampField = cache.getFirstFieldOfType(FieldType.time);
+      const lineField = cache.getFirstFieldOfType(FieldType.string);
+      const idField = cache.getFieldByName('id');
+
+      if (timestampField === undefined || lineField === undefined || idField === undefined) {
+        // this should never really happen, but i want to keep typescript happy
+        return { ...frame, fields: [] };
+      }
+
+      return {
+        ...frame,
+        fields: [
+          {
+            ...timestampField,
+            name: 'ts',
+          },
+          {
+            ...lineField,
+            name: 'line',
+          },
+          {
+            ...idField,
+            name: 'id',
+          },
+        ],
+      };
+    };
+
+    const processResults = (result: DataQueryResponse): DataQueryResponse => {
+      const frames: DataFrame[] = result.data;
+      const processedFrames = frames
+        .map((frame) => sortDataFrameByTime(frame, SortDirection.Descending))
+        .map((frame) => processDataFrame(frame)); // rename fields if needed
+
+      return {
+        ...result,
+        data: processedFrames,
+      };
+    };
+
+    // this can only be called from explore currently
+    const app = CoreApp.Explore;
+
+    return lastValueFrom(
+      this.datasource.query(makeRequest(query, range, app, `${REF_ID_STARTER_LOG_ROW_CONTEXT}${direction}`)).pipe(
+        catchError((err) => {
+          const error: DataQueryError = {
+            message: 'Error during context query. Please check JS console logs.',
+            status: err.status,
+            statusText: err.statusText,
+          };
+          throw error;
+        }),
+        switchMap((res) => of(processResults(res)))
+      )
+    );
+  };
+
   async prepareLogRowContextQueryTarget(
     row: LogRowModel,
     limit: number,
     direction: LogRowContextQueryDirection,
     origQuery?: DataQuery
   ): Promise<{ query: LokiQuery; range: TimeRange }> {
-    let expr = await this.prepareContextExpr(row, origQuery);
-
+    let originalLokiQuery: LokiQuery | undefined = undefined;
+    // Type guard for LokiQuery
+    if (origQuery && isLokiQuery(origQuery)) {
+      originalLokiQuery = origQuery;
+    }
+    const expr = this.processContextFiltersToExpr(row, this.appliedContextFilters, originalLokiQuery);
     const contextTimeBuffer = 2 * 60 * 60 * 1000; // 2h buffer
 
     const queryDirection =
@@ -74,42 +172,8 @@ export class LogContextProvider {
 
   getLogRowContextUi(row: LogRowModel, runContextQuery: () => void): React.ReactNode {
     const updateFilter = (contextFilters: ContextFilter[]) => {
-      this.prepareContextExpr = async (row: LogRowModel, origQuery?: DataQuery) => {
-        await this.languageProvider.start();
-        const labels = this.languageProvider.getLabelKeys();
+      this.appliedContextFilters = contextFilters;
 
-        let expr = contextFilters
-          .map((filter) => {
-            const label = filter.value;
-            if (filter && !filter.fromParser && filter.enabled && labels.includes(label)) {
-              // escape backslashes in label as users can't escape them by themselves
-              return `${label}="${escapeLabelValueInExactSelector(row.labels[label])}"`;
-            }
-            return '';
-          })
-          // Filter empty strings
-          .filter((label) => !!label)
-          .join(',');
-
-        expr = `{${expr}}`;
-
-        const parserContextFilters = contextFilters.filter((filter) => filter.fromParser && filter.enabled);
-        if (parserContextFilters.length) {
-          // we should also filter for labels from parsers, let's find the right parser
-          if (origQuery) {
-            const parser = getParserFromQuery((origQuery as LokiQuery).expr);
-            if (parser) {
-              expr = addParserToQuery(expr, parser);
-            }
-          }
-          for (const filter of parserContextFilters) {
-            if (filter.enabled) {
-              expr = addLabelToQuery(expr, filter.label, '=', row.labels[filter.label]);
-            }
-          }
-        }
-        return expr;
-      };
       if (runContextQuery) {
         runContextQuery();
       }
@@ -119,35 +183,66 @@ export class LogContextProvider {
     this.onContextClose =
       this.onContextClose ??
       (() => {
-        this.prepareContextExpr = this.prepareContextExprWithoutParsedLabels;
+        this.appliedContextFilters = [];
       });
 
     return LokiContextUi({
       row,
       updateFilter,
-      languageProvider: this.languageProvider,
       onClose: this.onContextClose,
+      logContextProvider: this,
     });
   }
 
-  async prepareContextExpr(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
-    return await this.prepareContextExprWithoutParsedLabels(row, origQuery);
-  }
-
-  private async prepareContextExprWithoutParsedLabels(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
-    await this.languageProvider.start();
-    const labels = this.languageProvider.getLabelKeys();
-    const expr = Object.keys(row.labels)
-      .map((label: string) => {
-        if (labels.includes(label)) {
+  processContextFiltersToExpr = (row: LogRowModel, contextFilters: ContextFilter[], query: LokiQuery | undefined) => {
+    const labelFilters = contextFilters
+      .map((filter) => {
+        const label = filter.value;
+        if (!filter.fromParser && filter.enabled) {
           // escape backslashes in label as users can't escape them by themselves
           return `${label}="${escapeLabelValueInExactSelector(row.labels[label])}"`;
         }
         return '';
       })
+      // Filter empty strings
       .filter((label) => !!label)
       .join(',');
 
-    return `{${expr}}`;
-  }
+    let expr = `{${labelFilters}}`;
+
+    // We need to have original query to get parser and include parsed labels
+    // We only add parser and parsed labels if there is only one parser in query
+    if (query && isQueryWithParser(query.expr).parserCount === 1) {
+      const parser = getParserFromQuery(query.expr);
+      if (parser) {
+        expr = addParserToQuery(expr, parser);
+        const parsedLabels = contextFilters.filter((filter) => filter.fromParser && filter.enabled);
+        for (const parsedLabel of parsedLabels) {
+          if (parsedLabel.enabled) {
+            expr = addLabelToQuery(expr, parsedLabel.label, '=', row.labels[parsedLabel.label]);
+          }
+        }
+      }
+    }
+
+    return expr;
+  };
+
+  getInitContextFiltersFromLabels = async (labels: Labels) => {
+    await this.datasource.languageProvider.start();
+    const allLabels = this.datasource.languageProvider.getLabelKeys();
+    const contextFilters: ContextFilter[] = [];
+    Object.entries(labels).forEach(([label, value]) => {
+      const filter: ContextFilter = {
+        label,
+        value: label, // this looks weird in the first place, but we need to set the label as value here
+        enabled: allLabels.includes(label),
+        fromParser: !allLabels.includes(label),
+        description: value,
+      };
+      contextFilters.push(filter);
+    });
+
+    return contextFilters;
+  };
 }
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
index dc324fdc784..fce625d2f5d 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
@@ -4,7 +4,7 @@ import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
 import { LogRowModel } from '@grafana/data';
 
-import LokiLanguageProvider from '../LanguageProvider';
+import { LogContextProvider } from '../LogContextProvider';
 
 import { LokiContextUi, LokiContextUiProps } from './LokiContextUi';
 
@@ -30,37 +30,17 @@ describe('LokiContextUi', () => {
     global = savedGlobal;
   });
   const setupProps = (): LokiContextUiProps => {
-    const mockLanguageProvider = {
-      start: jest.fn().mockImplementation(() => Promise.resolve()),
-      getLabelValues: (name: string) => {
-        switch (name) {
-          case 'label1':
-            return ['value1-1', 'value1-2'];
-          case 'label2':
-            return ['value2-1', 'value2-2'];
-          case 'label3':
-            return ['value3-1', 'value3-2'];
-        }
-        return [];
-      },
-      fetchSeriesLabels: (selector: string) => {
-        switch (selector) {
-          case '{label1="value1-1"}':
-            return { label1: ['value1-1'], label2: ['value2-1'], label3: ['value3-1'] };
-          case '{label1=~"value1-1|value1-2"}':
-            return { label1: ['value1-1', 'value1-2'], label2: ['value2-1'], label3: ['value3-1', 'value3-2'] };
-        }
-        // Allow full set by default
-        return {
-          label1: ['value1-1', 'value1-2'],
-          label2: ['value2-1', 'value2-2'],
-        };
-      },
-      getLabelKeys: () => ['label1', 'label2'],
+    const mockLogContextProvider = {
+      getInitContextFiltersFromLabels: jest.fn().mockImplementation(() =>
+        Promise.resolve([
+          { value: 'label1', enabled: true, fromParser: false, label: 'label1' },
+          { value: 'label3', enabled: false, fromParser: true, label: 'label3' },
+        ])
+      ),
     };
 
     const defaults: LokiContextUiProps = {
-      languageProvider: mockLanguageProvider as unknown as LokiLanguageProvider,
+      logContextProvider: mockLogContextProvider as unknown as LogContextProvider,
       updateFilter: jest.fn(),
       row: {
         entry: 'WARN test 1.23 on [xxx]',
@@ -83,12 +63,12 @@ describe('LokiContextUi', () => {
     expect(await screen.findByText(/Select labels to be included in the context query/)).toBeInTheDocument();
   });
 
-  it('starts the languageProvider', async () => {
+  it('initialize context filters', async () => {
     const props = setupProps();
     render(<LokiContextUi {...props} />);
 
     await waitFor(() => {
-      expect(props.languageProvider.start).toHaveBeenCalled();
+      expect(props.logContextProvider.getInitContextFiltersFromLabels).toHaveBeenCalled();
     });
   });
 
@@ -96,7 +76,7 @@ describe('LokiContextUi', () => {
     const props = setupProps();
     render(<LokiContextUi {...props} />);
     await waitFor(() => {
-      expect(props.languageProvider.start).toHaveBeenCalled();
+      expect(props.logContextProvider.getInitContextFiltersFromLabels).toHaveBeenCalled();
     });
     const select = await screen.findAllByRole('combobox');
     await selectOptionInTest(select[0], 'label1');
@@ -106,7 +86,7 @@ describe('LokiContextUi', () => {
     const props = setupProps();
     render(<LokiContextUi {...props} />);
     await waitFor(() => {
-      expect(props.languageProvider.start).toHaveBeenCalled();
+      expect(props.logContextProvider.getInitContextFiltersFromLabels).toHaveBeenCalled();
     });
     const select = await screen.findAllByRole('combobox');
     await selectOptionInTest(select[1], 'label3');
@@ -117,7 +97,7 @@ describe('LokiContextUi', () => {
     const props = setupProps();
     render(<LokiContextUi {...props} />);
     await waitFor(() => {
-      expect(props.languageProvider.start).toHaveBeenCalled();
+      expect(props.logContextProvider.getInitContextFiltersFromLabels).toHaveBeenCalled();
       expect(screen.getAllByRole('combobox')).toHaveLength(2);
     });
     await selectOptionInTest(screen.getAllByRole('combobox')[1], 'label3');
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index 859a715845d..4532dce3b5d 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -7,11 +7,11 @@ import { GrafanaTheme2, LogRowModel, SelectableValue } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { LoadingPlaceholder, MultiSelect, Tag, Tooltip, useStyles2 } from '@grafana/ui';
 
-import LokiLanguageProvider from '../LanguageProvider';
+import { LogContextProvider } from '../LogContextProvider';
 import { ContextFilter } from '../types';
 
 export interface LokiContextUiProps {
-  languageProvider: LokiLanguageProvider;
+  logContextProvider: LogContextProvider;
   row: LogRowModel;
   updateFilter: (value: ContextFilter[]) => void;
   onClose: () => void;
@@ -58,7 +58,7 @@ const formatOptionLabel = memoizeOne(({ label, description }: SelectableValue<st
 ));
 
 export function LokiContextUi(props: LokiContextUiProps) {
-  const { row, languageProvider, updateFilter, onClose } = props;
+  const { row, logContextProvider, updateFilter, onClose } = props;
   const styles = useStyles2(getStyles);
 
   const [contextFilters, setContextFilters] = useState<ContextFilter[]>([]);
@@ -91,7 +91,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
     }
     setLoading(true);
     timerHandle.current = window.setTimeout(() => {
-      updateFilter(contextFilters);
+      updateFilter(contextFilters.filter(({ enabled }) => enabled));
       setLoading(false);
     }, 1500);
 
@@ -109,23 +109,11 @@ export function LokiContextUi(props: LokiContextUiProps) {
   }, [onClose]);
 
   useAsync(async () => {
-    await languageProvider.start();
-    const allLabels = languageProvider.getLabelKeys();
-    const contextFilters: ContextFilter[] = [];
-
-    Object.entries(row.labels).forEach(([label, value]) => {
-      const filter: ContextFilter = {
-        label,
-        value: label, // this looks weird in the first place, but we need to set the label as value here
-        enabled: allLabels.includes(label),
-        fromParser: !allLabels.includes(label),
-        description: value,
-      };
-      contextFilters.push(filter);
-    });
-
+    setLoading(true);
+    const contextFilters = await logContextProvider.getInitContextFiltersFromLabels(row.labels);
     setContextFilters(contextFilters);
     setInitialized(true);
+    setLoading(false);
   });
 
   useEffect(() => {
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index f07f7b1c52d..384a298e81b 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -32,7 +32,6 @@ import {
   ScopedVars,
   TimeRange,
   LogRowContextOptions,
-  LogRowContextQueryDirection,
 } from '@grafana/data';
 import { BackendSrvRequest, config, DataSourceWithBackend, FetchError } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
@@ -76,7 +75,6 @@ import {
   isValidQuery,
   requestSupportsSplitting,
 } from './queryUtils';
-import { sortDataFrameByTime, SortDirection } from './sortDataFrame';
 import { doLokiChannelStream } from './streaming';
 import { trackQuery } from './tracking';
 import {
@@ -100,7 +98,7 @@ export const REF_ID_STARTER_LOG_VOLUME = 'log-volume-';
 export const REF_ID_STARTER_LOG_SAMPLE = 'log-sample-';
 const NS_IN_MS = 1000000;
 
-function makeRequest(
+export function makeRequest(
   query: LokiQuery,
   range: TimeRange,
   app: CoreApp,
@@ -149,7 +147,7 @@ export class LokiDatasource
       QueryEditor: LokiAnnotationsQueryEditor,
     };
     this.variables = new LokiVariableSupport(this);
-    this.logContextProvider = new LogContextProvider(this.languageProvider);
+    this.logContextProvider = new LogContextProvider(this);
   }
 
   getDataProvider(
@@ -650,74 +648,7 @@ export class LokiDatasource
     options?: LogRowContextOptions,
     origQuery?: DataQuery
   ): Promise<{ data: DataFrame[] }> => {
-    const direction = (options && options.direction) || LogRowContextQueryDirection.Backward;
-    const limit = (options && options.limit) || 10;
-    const { query, range } = await this.logContextProvider.prepareLogRowContextQueryTarget(
-      row,
-      limit,
-      direction,
-      origQuery
-    );
-
-    const processDataFrame = (frame: DataFrame): DataFrame => {
-      // log-row-context requires specific field-names to work, so we set them here: "ts", "line", "id"
-      const cache = new FieldCache(frame);
-      const timestampField = cache.getFirstFieldOfType(FieldType.time);
-      const lineField = cache.getFirstFieldOfType(FieldType.string);
-      const idField = cache.getFieldByName('id');
-
-      if (timestampField === undefined || lineField === undefined || idField === undefined) {
-        // this should never really happen, but i want to keep typescript happy
-        return { ...frame, fields: [] };
-      }
-
-      return {
-        ...frame,
-        fields: [
-          {
-            ...timestampField,
-            name: 'ts',
-          },
-          {
-            ...lineField,
-            name: 'line',
-          },
-          {
-            ...idField,
-            name: 'id',
-          },
-        ],
-      };
-    };
-
-    const processResults = (result: DataQueryResponse): DataQueryResponse => {
-      const frames: DataFrame[] = result.data;
-      const processedFrames = frames
-        .map((frame) => sortDataFrameByTime(frame, SortDirection.Descending))
-        .map((frame) => processDataFrame(frame)); // rename fields if needed
-
-      return {
-        ...result,
-        data: processedFrames,
-      };
-    };
-
-    // this can only be called from explore currently
-    const app = CoreApp.Explore;
-
-    return lastValueFrom(
-      this.query(makeRequest(query, range, app, `${REF_ID_STARTER_LOG_ROW_CONTEXT}${direction}`)).pipe(
-        catchError((err) => {
-          const error: DataQueryError = {
-            message: 'Error during context query. Please check JS console logs.',
-            status: err.status,
-            statusText: err.statusText,
-          };
-          throw error;
-        }),
-        switchMap((res) => of(processResults(res)))
-      )
-    );
+    return await this.logContextProvider.getLogRowContext(row, options, origQuery);
   };
 
   getLogRowContextUi(row: LogRowModel, runContextQuery: () => void): React.ReactNode {
diff --git a/public/app/plugins/datasource/loki/queryUtils.ts b/public/app/plugins/datasource/loki/queryUtils.ts
index 236e02b0616..9ad5b5a2c7b 100644
--- a/public/app/plugins/datasource/loki/queryUtils.ts
+++ b/public/app/plugins/datasource/loki/queryUtils.ts
@@ -18,6 +18,7 @@ import {
   Matcher,
   Identifier,
 } from '@grafana/lezer-logql';
+import { DataQuery } from '@grafana/schema';
 
 import { ErrorId } from '../prometheus/querybuilder/shared/parsingUtils';
 
@@ -175,9 +176,9 @@ export function isQueryWithParser(query: string): { queryWithParser: boolean; pa
   return { queryWithParser: parserCount > 0, parserCount };
 }
 
-export function getParserFromQuery(query: string) {
+export function getParserFromQuery(query: string): string | undefined {
   const tree = parser.parse(query);
-  let logParser;
+  let logParser: string | undefined = undefined;
   tree.iterate({
     enter: (node: SyntaxNode): false | void => {
       if (node.type.id === LabelParser || node.type.id === JsonExpressionParser) {
@@ -304,3 +305,12 @@ export function requestSupportsSplitting(allQueries: LokiQuery[]) {
 
   return queries.length > 0;
 }
+
+export const isLokiQuery = (query: DataQuery): query is LokiQuery => {
+  if (!query) {
+    return false;
+  }
+
+  const lokiQuery = query as LokiQuery;
+  return lokiQuery.expr !== undefined;
+};

From 060728b3d54e1679182f1228ee3c5de5c229ec15 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 14 Apr 2023 13:53:12 +0200
Subject: [PATCH 145/729] Explore: Add tooltip to explain what logs sample is 
 (#66568)

* Explore: Add tooltip to logs sample

* Update tooltip
---
 .../app/features/explore/LogsSamplePanel.tsx  | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/public/app/features/explore/LogsSamplePanel.tsx b/public/app/features/explore/LogsSamplePanel.tsx
index f1b4383f0ec..8f5a89f4865 100644
--- a/public/app/features/explore/LogsSamplePanel.tsx
+++ b/public/app/features/explore/LogsSamplePanel.tsx
@@ -13,7 +13,7 @@ import {
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { DataQuery, TimeZone } from '@grafana/schema';
-import { Button, Collapse, useStyles2 } from '@grafana/ui';
+import { Button, Collapse, Icon, Tooltip, useStyles2 } from '@grafana/ui';
 import { dataFrameToLogsModel } from 'app/core/logsModel';
 import store from 'app/core/store';
 
@@ -66,13 +66,7 @@ export function LogsSamplePanel(props: Props) {
     };
 
     return (
-      <Button
-        size="sm"
-        className={styles.logSamplesButton}
-        // TODO: support multiple queries (#62107)
-        // This currently works only for the first query as splitOpen supports only 1 query
-        onClick={onSplitOpen}
-      >
+      <Button size="sm" className={styles.logSamplesButton} onClick={onSplitOpen}>
         Open logs in split view
       </Button>
     );
@@ -112,7 +106,19 @@ export function LogsSamplePanel(props: Props) {
   }
 
   return queryResponse?.state !== LoadingState.NotStarted ? (
-    <Collapse label="Logs sample" isOpen={enabled} collapsible={true} onToggle={onToggleLogsSampleCollapse}>
+    <Collapse
+      label={
+        <div>
+          Logs sample
+          <Tooltip content="Show log lines that contributed to visualized metrics">
+            <Icon name="info-circle" className={styles.infoTooltip} />
+          </Tooltip>
+        </div>
+      }
+      isOpen={enabled}
+      collapsible={true}
+      onToggle={onToggleLogsSampleCollapse}
+    >
       {LogsSamplePanelContent}
     </Collapse>
   ) : null;
@@ -127,4 +133,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
   logContainer: css`
     overflow-x: scroll;
   `,
+  infoTooltip: css`
+    margin-left: ${theme.spacing(1)};
+  `,
 });

From 4f5b80095edebc95ba99c53e2cb00e32bf464873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Fri, 14 Apr 2023 14:25:07 +0200
Subject: [PATCH 146/729] Dashboards: Fix broken internal data links (#66567)

* In dashboards splitOpenFn is not passed, instead "href" link is used. When we added tracking we changed the behaviour so onClickFn is always passed when generating the model. To bring back the previous behaviour we skip the onClickFn if the split function is not provided.

* Fix test and add a task to re-check the logic
---
 public/app/features/explore/utils/links.test.ts | 6 +-----
 public/app/features/explore/utils/links.ts      | 4 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/app/features/explore/utils/links.test.ts b/public/app/features/explore/utils/links.test.ts
index ef459db08b5..86f84abd7d1 100644
--- a/public/app/features/explore/utils/links.test.ts
+++ b/public/app/features/explore/utils/links.test.ts
@@ -315,11 +315,7 @@ describe('explore links utils', () => {
         links[0][0].onClick({});
       }
 
-      expect(reportInteraction).toBeCalledWith('grafana_data_link_clicked', {
-        app: CoreApp.Explore,
-        internal: true,
-        origin: DataLinkConfigOrigin.Correlations,
-      });
+      expect(reportInteraction).not.toBeCalled();
 
       expect(links[1]).toHaveLength(1);
       expect(links[1][0].href).toBe(
diff --git a/public/app/features/explore/utils/links.ts b/public/app/features/explore/utils/links.ts
index 818ff1566ca..881fb025b12 100644
--- a/public/app/features/explore/utils/links.ts
+++ b/public/app/features/explore/utils/links.ts
@@ -195,7 +195,9 @@ export const getFieldLinksForExplore = (options: {
             scopedVars: allVars,
             range,
             field,
-            onClickFn: (options) => splitFnWithTracking(options),
+            // Don't track internal links without split view as they are used only in Dashboards
+            // TODO: It should be revisited in #66570
+            onClickFn: options.splitOpenFn ? (options) => splitFnWithTracking(options) : undefined,
             replaceVariables: getTemplateSrv().replace.bind(getTemplateSrv()),
           });
           return { ...internalLink, variables: variables };

From b8188eead4f2c2f415240b2107927dbee22e04a6 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 14 Apr 2023 05:36:53 -0700
Subject: [PATCH 147/729] FieldValues: Use plain arrays instead of Vector (part
 1 of 2) (#66187)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .betterer.results                             |  34 +++-
 .../src/dataframe/ArrayDataFrame.ts           |   8 +-
 .../src/dataframe/DataFrameJSON.test.ts       |   2 +-
 .../src/dataframe/MutableDataFrame.ts         |  34 ++--
 .../transformers/joinDataFrames.test.ts       |   2 +-
 .../transformers/reduce.test.ts               |   6 +-
 packages/grafana-data/src/types/dataFrame.ts  |   8 +-
 packages/grafana-data/src/types/vector.ts     |  94 ++++++++--
 .../src/vector/AppendedVectors.ts             |   4 +-
 .../src/vector/ArrayVector.test.ts            |  41 +++++
 .../grafana-data/src/vector/ArrayVector.ts    |  61 +++----
 .../src/vector/BinaryOperationVector.ts       |   7 +-
 .../src/vector/CircularVector.test.ts         |   3 +
 .../grafana-data/src/vector/CircularVector.ts |  24 +--
 .../grafana-data/src/vector/ConstantVector.ts |   8 +-
 .../src/vector/FunctionalVector.ts            | 165 ++++++++++++++++--
 .../grafana-data/src/vector/IndexVector.ts    |   2 +
 packages/grafana-data/src/vector/RowVector.ts |   7 +-
 .../grafana-data/src/vector/SortedVector.ts   |   9 +-
 .../grafana-data/src/vector/vectorToArray.ts  |   1 +
 .../GraphNG/nullInsertThreshold.test.ts       |  74 +++-----
 .../components/GraphNG/nullToValue.test.ts    |  24 +--
 public/app/features/geo/format/utils.ts       |   4 +-
 .../app/features/geo/gazetteer/gazetteer.ts   |   4 +-
 .../features/geo/utils/frameVectorSource.ts   |   2 +-
 public/app/features/geo/utils/location.ts     |   2 +-
 .../live/centrifuge/LiveDataStream.test.ts    |  16 +-
 .../live/data/StreamingDataFrame.test.ts      |  18 +-
 .../features/live/data/StreamingDataFrame.ts  |  34 ++--
 public/app/features/live/live.test.ts         |  12 +-
 .../lookupGazetteer/fieldLookup.ts            |   5 +-
 .../timeSeriesTableTransformer.test.ts        |  22 +--
 .../timeSeriesTableTransformer.ts             |   8 +-
 .../elasticsearch/ElasticResponse.test.ts     |  42 ++---
 .../plugins/datasource/loki/responseUtils.ts  |   2 +-
 .../datasource/postgres/datasource.test.ts    |  20 +--
 public/app/plugins/panel/timeseries/utils.ts  |  14 +-
 37 files changed, 531 insertions(+), 292 deletions(-)
 create mode 100644 packages/grafana-data/src/vector/ArrayVector.test.ts

diff --git a/.betterer.results b/.betterer.results
index ab21280defc..1166a7948a6 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -285,6 +285,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
+    "packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
     "packages/grafana-data/src/transformations/transformers/merge.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -484,8 +487,17 @@ exports[`better eslint`] = {
     ],
     "packages/grafana-data/src/types/vector.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
     ],
     "packages/grafana-data/src/utils/OptionsUIBuilders.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -648,10 +660,13 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
     "packages/grafana-data/src/vector/ArrayVector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "packages/grafana-data/src/vector/CircularVector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "packages/grafana-data/src/vector/ConstantVector.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -661,7 +676,16 @@ exports[`better eslint`] = {
     ],
     "packages/grafana-data/src/vector/FunctionalVector.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
     ],
     "packages/grafana-data/src/vector/SortedVector.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts b/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
index 2b6132526ad..36ea2d43fc1 100644
--- a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
@@ -1,4 +1,4 @@
-import { Vector, QueryResultMeta } from '../types';
+import { QueryResultMeta } from '../types';
 import { Field, FieldType, DataFrame } from '../types/dataFrame';
 import { FunctionalVector } from '../vector/FunctionalVector';
 import { vectorToArray } from '../vector/vectorToArray';
@@ -10,10 +10,12 @@ export type ValueConverter<T = any> = (val: unknown) => T;
 
 const NOOP: ValueConverter = (v) => v;
 
-class ArrayPropertyVector<T = any> implements Vector<T> {
+class ArrayPropertyVector<T = any> extends FunctionalVector<T> {
   converter = NOOP;
 
-  constructor(private source: any[], private prop: string) {}
+  constructor(private source: any[], private prop: string) {
+    super();
+  }
 
   get length(): number {
     return this.source.length;
diff --git a/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts b/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
index fe6930eaf2f..a767faf0895 100644
--- a/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
@@ -235,7 +235,7 @@ describe('DataFrame JSON', () => {
         },
       };
 
-      expect(dataFrameToJSON(inputFrame)).toStrictEqual(expectedJSON);
+      expect(dataFrameToJSON(inputFrame)).toEqual(expectedJSON);
     });
   });
 });
diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.ts b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
index 8d5c6964147..5deccf1dac0 100644
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
@@ -2,20 +2,20 @@ import { isString } from 'lodash';
 
 import { QueryResultMeta } from '../types/data';
 import { Field, DataFrame, DataFrameDTO, FieldDTO, FieldType } from '../types/dataFrame';
-import { MutableVector, Vector } from '../types/vector';
+import { Vector } from '../types/vector';
 import { makeFieldParser } from '../utils/fieldParser';
 import { ArrayVector } from '../vector/ArrayVector';
 import { FunctionalVector } from '../vector/FunctionalVector';
 
 import { guessFieldTypeFromValue, guessFieldTypeForField, toDataFrameDTO } from './processDataFrame';
 
-export type MutableField<T = any> = Field<T, MutableVector<T>>;
+export type MutableField<T = any> = Field<T>;
 
-type MutableVectorCreator = (buffer?: any[]) => MutableVector;
+type MutableVectorCreator = (buffer?: any[]) => Vector;
 
 export const MISSING_VALUE = undefined; // Treated as connected in new graph panel
 
-export class MutableDataFrame<T = any> extends FunctionalVector<T> implements DataFrame, MutableVector<T> {
+export class MutableDataFrame<T = any> extends FunctionalVector<T> implements DataFrame {
   name?: string;
   refId?: string;
   meta?: QueryResultMeta;
@@ -148,15 +148,6 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
     }
   }
 
-  /**
-   * Reverse all values
-   */
-  reverse() {
-    for (const f of this.fields) {
-      f.values.reverse();
-    }
-  }
-
   private parsers: Map<Field, (v: string) => any> | undefined = undefined;
 
   /**
@@ -210,10 +201,25 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
     }
   }
 
+  /** support standard array push syntax */
+  push(...vals: T[]): number {
+    for (const v of vals) {
+      this.add(v);
+    }
+    return this.length;
+  }
+
+  reverse() {
+    for (const field of this.fields) {
+      field.values.reverse();
+    }
+    return this;
+  }
+
   /**
    * Add values from an object to corresponding fields. Similar to appendRow but does not create new fields.
    */
-  add(value: T) {
+  add(value: T): void {
     // Will add one value for every field
     const obj = value as any;
     for (const field of this.fields) {
diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
index 5f4ef23427b..9c3b030ea28 100644
--- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
@@ -332,7 +332,7 @@ describe('align frames', () => {
       const v = new ArrayVector([null, null, null, 4, null]);
       expect(isLikelyAscendingVector(v)).toBeTruthy();
       expect(isLikelyAscendingVector(new ArrayVector([4]))).toBeTruthy();
-      expect(isLikelyAscendingVector(new ArrayVector([]))).toBeTruthy();
+      expect(isLikelyAscendingVector(new ArrayVector([] as any[]))).toBeTruthy();
     });
 
     it('middle values', () => {
diff --git a/packages/grafana-data/src/transformations/transformers/reduce.test.ts b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
index 6ad69449486..16a6dfb1173 100644
--- a/packages/grafana-data/src/transformations/transformers/reduce.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
@@ -418,7 +418,7 @@ describe('Reducer Transformer', () => {
               "CA",
               "NY",
               "CA",
-              ,
+              undefined,
             ],
           },
           {
@@ -426,8 +426,8 @@ describe('Reducer Transformer', () => {
             "name": "country",
             "type": "string",
             "values": [
-              ,
-              ,
+              undefined,
+              undefined,
               "USA",
               "USA",
             ],
diff --git a/packages/grafana-data/src/types/dataFrame.ts b/packages/grafana-data/src/types/dataFrame.ts
index d7200416ce4..639a3770b76 100644
--- a/packages/grafana-data/src/types/dataFrame.ts
+++ b/packages/grafana-data/src/types/dataFrame.ts
@@ -136,7 +136,13 @@ export interface Field<T = any, V = Vector<T>> {
    *  Meta info about how field and how to display it
    */
   config: FieldConfig;
-  values: V; // The raw field values
+
+  /**
+   * The raw field values
+   * In Grafana 10, this accepts both simple arrays and the Vector interface
+   * In Grafana 11, the Vector interface will be removed
+   */
+  values: V | T[];
 
   /**
    * When type === FieldType.Time, this can optionally store
diff --git a/packages/grafana-data/src/types/vector.ts b/packages/grafana-data/src/types/vector.ts
index 76f2038e71c..29e7fc04d51 100644
--- a/packages/grafana-data/src/types/vector.ts
+++ b/packages/grafana-data/src/types/vector.ts
@@ -1,35 +1,99 @@
-export interface Vector<T = any> {
+declare global {
+  interface Array<T> {
+    /** @deprecated this only exists to help migrate Vector to Array */
+    get(idx: number): T;
+    /** @deprecated this only exists to help migrate Vector to Array */
+    set(idx: number, value: T): void;
+    /** @deprecated this only exists to help migrate Vector to Array */
+    add(value: T): void;
+    /** @deprecated this only exists to help migrate Vector to Array */
+    toArray(): T[];
+  }
+}
+
+// JS original sin
+// this if condition is because Jest will re-exec this block multiple times (in a browser this only runs once)
+if (!Object.getOwnPropertyDescriptor(Array.prototype, 'toArray')) {
+  Object.defineProperties(Array.prototype, {
+    get: {
+      value: function (idx: number): any {
+        return (this as any)[idx];
+      },
+      writable: false,
+      enumerable: false,
+      configurable: false,
+    },
+    set: {
+      value: function (idx: number, value: any) {
+        (this as any)[idx] = value;
+      },
+      writable: false,
+      enumerable: false,
+      configurable: false,
+    },
+    add: {
+      value: function (value: any) {
+        (this as any).push(value);
+      },
+      writable: false,
+      enumerable: false,
+      configurable: false,
+    },
+    toArray: {
+      value: function () {
+        return this;
+      },
+      writable: false,
+      enumerable: false,
+      configurable: false,
+    },
+  });
+}
+
+/** @deprecated use a simple Array<T> */
+export interface Vector<T = any> extends Array<T> {
   length: number;
 
   /**
    * Access the value by index (Like an array)
+   *
+   * @deprecated use a simple Array<T>
    */
   get(index: number): T;
 
+  /**
+   * Set a value
+   *
+   * @deprecated use a simple Array<T>
+   */
+  set: (index: number, value: T) => void;
+
+  /**
+   * Adds the value to the vector
+   * Same as Array.push()
+   *
+   * @deprecated use a simple Array<T>
+   */
+  add: (value: T) => void;
+
   /**
    * Get the results as an array.
+   *
+   * @deprecated use a simple Array<T>
    */
   toArray(): T[];
 }
 
 /**
  * Apache arrow vectors are Read/Write
+ *
+ * @deprecated -- this is now part of the base Vector interface
  */
-export interface ReadWriteVector<T = any> extends Vector<T> {
-  set: (index: number, value: T) => void;
-}
+export interface ReadWriteVector<T = any> extends Vector<T> {}
 
 /**
  * Vector with standard manipulation functions
+ *
+ * @deprecated -- this is now part of the base Vector interface
  */
-export interface MutableVector<T = any> extends ReadWriteVector<T> {
-  /**
-   * Adds the value to the vector
-   */
-  add: (value: T) => void;
-
-  /**
-   * modifies the vector so it is now the opposite order
-   */
-  reverse: () => void;
-}
+export interface MutableVector<T = any> extends ReadWriteVector<T> {}
diff --git a/packages/grafana-data/src/vector/AppendedVectors.ts b/packages/grafana-data/src/vector/AppendedVectors.ts
index cc33811f731..66883c102cd 100644
--- a/packages/grafana-data/src/vector/AppendedVectors.ts
+++ b/packages/grafana-data/src/vector/AppendedVectors.ts
@@ -1,5 +1,6 @@
 import { Vector } from '../types/vector';
 
+import { FunctionalVector } from './FunctionalVector';
 import { vectorToArray } from './vectorToArray';
 
 interface AppendedVectorInfo<T> {
@@ -13,11 +14,12 @@ interface AppendedVectorInfo<T> {
  * RAM -- rather than allocate a new array the size of all previous arrays, this just
  * points the correct index to their original array values
  */
-export class AppendedVectors<T = any> implements Vector<T> {
+export class AppendedVectors<T = any> extends FunctionalVector<T> {
   length = 0;
   source: Array<AppendedVectorInfo<T>> = [];
 
   constructor(startAt = 0) {
+    super();
     this.length = startAt;
   }
 
diff --git a/packages/grafana-data/src/vector/ArrayVector.test.ts b/packages/grafana-data/src/vector/ArrayVector.test.ts
new file mode 100644
index 00000000000..119e42579df
--- /dev/null
+++ b/packages/grafana-data/src/vector/ArrayVector.test.ts
@@ -0,0 +1,41 @@
+import { Field, FieldType } from '../types';
+
+import { ArrayVector } from './ArrayVector';
+
+describe('ArrayVector', () => {
+  it('should init 150k with 65k Array.push() chonking', () => {
+    const arr = Array.from({ length: 150e3 }, (v, i) => i);
+    const av = new ArrayVector(arr);
+
+    expect(av.toArray()).toEqual(arr);
+  });
+
+  it('should support add and push', () => {
+    const av = new ArrayVector<number>();
+    av.add(1);
+    av.push(2);
+    av.push(3, 4);
+
+    expect(av.toArray()).toEqual([1, 2, 3, 4]);
+  });
+
+  it('typescript should not re-define the ArrayVector<T> based on input to the constructor', () => {
+    const field: Field<number> = {
+      name: 'test',
+      config: {},
+      type: FieldType.number,
+      values: new ArrayVector(), // this defaults to `new ArrayVector<any>()`
+    };
+    expect(field).toBeDefined();
+
+    // Before collapsing Vector, ReadWriteVector, and MutableVector these all worked fine
+    field.values = new ArrayVector();
+    field.values = new ArrayVector(undefined);
+    field.values = new ArrayVector([1, 2, 3]);
+    field.values = new ArrayVector([]);
+    field.values = new ArrayVector([1, undefined]);
+    field.values = new ArrayVector([null]);
+    field.values = new ArrayVector(['a', 'b', 'c']);
+    expect(field.values.length).toBe(3);
+  });
+});
diff --git a/packages/grafana-data/src/vector/ArrayVector.ts b/packages/grafana-data/src/vector/ArrayVector.ts
index d153cfb636c..121276503f5 100644
--- a/packages/grafana-data/src/vector/ArrayVector.ts
+++ b/packages/grafana-data/src/vector/ArrayVector.ts
@@ -1,43 +1,38 @@
-import { MutableVector } from '../types/vector';
-
-import { FunctionalVector } from './FunctionalVector';
-
 /**
  * @public
+ *
+ * @deprecated use a simple Array<T>
  */
-export class ArrayVector<T = any> extends FunctionalVector<T> implements MutableVector<T> {
-  buffer: T[];
+export class ArrayVector<T = any> extends Array<T> {
+  get buffer() {
+    return this;
+  }
 
-  constructor(buffer?: T[]) {
+  set buffer(values: any[]) {
+    this.length = 0;
+
+    const len = values?.length;
+
+    if (len) {
+      let chonkSize = 65e3;
+      let numChonks = Math.ceil(len / chonkSize);
+
+      for (let chonkIdx = 0; chonkIdx < numChonks; chonkIdx++) {
+        this.push.apply(this, values.slice(chonkIdx * chonkSize, (chonkIdx + 1) * chonkSize));
+      }
+    }
+  }
+
+  /**
+   * This any type is here to make the change type changes in v10 non breaking for plugins.
+   * Before you could technically assign field.values any typed ArrayVector no matter what the Field<T> T type was.
+   */
+  constructor(buffer?: any[]) {
     super();
-    this.buffer = buffer ? buffer : [];
-  }
-
-  get length() {
-    return this.buffer.length;
-  }
-
-  add(value: T) {
-    this.buffer.push(value);
-  }
-
-  get(index: number): T {
-    return this.buffer[index];
-  }
-
-  set(index: number, value: T) {
-    this.buffer[index] = value;
-  }
-
-  reverse() {
-    this.buffer.reverse();
-  }
-
-  toArray(): T[] {
-    return this.buffer;
+    this.buffer = buffer ?? [];
   }
 
   toJSON(): T[] {
-    return this.buffer;
+    return [...this]; // copy to avoid circular reference (only for jest)
   }
 }
diff --git a/packages/grafana-data/src/vector/BinaryOperationVector.ts b/packages/grafana-data/src/vector/BinaryOperationVector.ts
index a8ea3024bec..51ecb808ec4 100644
--- a/packages/grafana-data/src/vector/BinaryOperationVector.ts
+++ b/packages/grafana-data/src/vector/BinaryOperationVector.ts
@@ -1,13 +1,16 @@
 import { Vector } from '../types/vector';
 import { BinaryOperation } from '../utils/binaryOperators';
 
+import { FunctionalVector } from './FunctionalVector';
 import { vectorToArray } from './vectorToArray';
 
 /**
  * @public
  */
-export class BinaryOperationVector implements Vector<number> {
-  constructor(private left: Vector<number>, private right: Vector<number>, private operation: BinaryOperation) {}
+export class BinaryOperationVector extends FunctionalVector<number> {
+  constructor(private left: Vector<number>, private right: Vector<number>, private operation: BinaryOperation) {
+    super();
+  }
 
   get length(): number {
     return this.left.length;
diff --git a/packages/grafana-data/src/vector/CircularVector.test.ts b/packages/grafana-data/src/vector/CircularVector.test.ts
index abffd15846b..3ed934e89bc 100644
--- a/packages/grafana-data/src/vector/CircularVector.test.ts
+++ b/packages/grafana-data/src/vector/CircularVector.test.ts
@@ -20,6 +20,9 @@ describe('Check Circular Vector', () => {
 
     v.add(8);
     expect(v.toArray()).toEqual([6, 7, 8]);
+
+    v.push(9, 10);
+    expect(v.toArray()).toEqual([8, 9, 10]);
   });
 
   it('should grow buffer until it hits capacity (append)', () => {
diff --git a/packages/grafana-data/src/vector/CircularVector.ts b/packages/grafana-data/src/vector/CircularVector.ts
index 6d848ad40f4..42ea9604b12 100644
--- a/packages/grafana-data/src/vector/CircularVector.ts
+++ b/packages/grafana-data/src/vector/CircularVector.ts
@@ -1,7 +1,4 @@
-import { MutableVector } from '../types/vector';
-
 import { FunctionalVector } from './FunctionalVector';
-import { vectorToArray } from './vectorToArray';
 
 interface CircularOptions<T> {
   buffer?: T[];
@@ -18,7 +15,7 @@ interface CircularOptions<T> {
  *
  * @public
  */
-export class CircularVector<T = any> extends FunctionalVector<T> implements MutableVector<T> {
+export class CircularVector<T = any> extends FunctionalVector<T> {
   private buffer: T[];
   private index: number;
   private capacity: number;
@@ -43,7 +40,7 @@ export class CircularVector<T = any> extends FunctionalVector<T> implements Muta
    *  * head vs tail
    *  * growing buffer vs overwriting values
    */
-  private getAddFunction() {
+  private getAddFunction(): (value: T) => void {
     // When we are not at capacity, it should actually modify the buffer
     if (this.capacity > this.buffer.length) {
       if (this.tail) {
@@ -114,31 +111,18 @@ export class CircularVector<T = any> extends FunctionalVector<T> implements Muta
   }
 
   reverse() {
-    this.buffer.reverse();
+    return this.buffer.reverse();
   }
 
-  /**
-   * Add the value to the buffer
-   */
-  add: (value: T) => void;
-
   get(index: number) {
     return this.buffer[(index + this.index) % this.buffer.length];
   }
 
-  set(index: number, value: T) {
+  set(index: number, value: any) {
     this.buffer[(index + this.index) % this.buffer.length] = value;
   }
 
   get length() {
     return this.buffer.length;
   }
-
-  toArray(): T[] {
-    return vectorToArray(this);
-  }
-
-  toJSON(): T[] {
-    return vectorToArray(this);
-  }
 }
diff --git a/packages/grafana-data/src/vector/ConstantVector.ts b/packages/grafana-data/src/vector/ConstantVector.ts
index 2024514f506..ff39aaacfdb 100644
--- a/packages/grafana-data/src/vector/ConstantVector.ts
+++ b/packages/grafana-data/src/vector/ConstantVector.ts
@@ -1,10 +1,12 @@
-import { Vector } from '../types/vector';
+import { FunctionalVector } from './FunctionalVector';
 
 /**
  * @public
  */
-export class ConstantVector<T = any> implements Vector<T> {
-  constructor(private value: T, private len: number) {}
+export class ConstantVector<T = any> extends FunctionalVector<T> {
+  constructor(private value: T, private len: number) {
+    super();
+  }
 
   get length() {
     return this.len;
diff --git a/packages/grafana-data/src/vector/FunctionalVector.ts b/packages/grafana-data/src/vector/FunctionalVector.ts
index b9f4e22907b..9e5ba6b77e7 100644
--- a/packages/grafana-data/src/vector/FunctionalVector.ts
+++ b/packages/grafana-data/src/vector/FunctionalVector.ts
@@ -3,7 +3,7 @@ import { Vector } from '../types';
 import { vectorToArray } from './vectorToArray';
 
 /** @public */
-export abstract class FunctionalVector<T = any> implements Vector<T>, Iterable<T> {
+export abstract class FunctionalVector<T = any> implements Vector<T> {
   abstract get length(): number;
 
   abstract get(index: number): T;
@@ -15,32 +15,176 @@ export abstract class FunctionalVector<T = any> implements Vector<T>, Iterable<T
     }
   }
 
+  set(index: number, value: any): void {
+    throw 'unsupported operation';
+  }
+
+  add(value: T): void {
+    throw 'unsupported operation';
+  }
+
+  push(...vals: T[]): number {
+    for (const v of vals) {
+      this.add(v);
+    }
+    return this.length;
+  }
+
   // Implement "iterable protocol"
   [Symbol.iterator]() {
     return this.iterator();
   }
 
-  forEach(iterator: (row: T) => void) {
+  forEach(iterator: (row: T, index: number, array: T[]) => void): void {
     return vectorator(this).forEach(iterator);
   }
 
-  map<V>(transform: (item: T, index: number) => V) {
+  map<V>(transform: (item: T, index: number, array: T[]) => V): V[] {
     return vectorator(this).map(transform);
   }
 
-  filter(predicate: (item: T) => boolean): T[] {
+  filter(predicate: (item: T, index: number, array: T[]) => boolean): T[] {
     return vectorator(this).filter(predicate);
   }
 
+  at(index: number): T | undefined {
+    return this.get(index);
+  }
+
   toArray(): T[] {
     return vectorToArray(this);
   }
 
+  join(separator?: string | undefined): string {
+    return this.toArray().join(separator);
+  }
+
   toJSON(): any {
     return this.toArray();
   }
+
+  //--------------------------
+  // Method not implemented
+  //--------------------------
+
+  [n: number]: T;
+
+  pop(): T | undefined {
+    throw new Error('Method not implemented.');
+  }
+  concat(...items: Array<ConcatArray<T>>): T[];
+  concat(...items: Array<T | ConcatArray<T>>): T[] {
+    throw new Error('Method not implemented.');
+  }
+  reverse(): T[] {
+    throw new Error('Method not implemented.');
+  }
+  shift(): T | undefined {
+    throw new Error('Method not implemented.');
+  }
+  slice(start?: number | undefined, end?: number | undefined): T[] {
+    throw new Error('Method not implemented.');
+  }
+  sort(compareFn?: ((a: T, b: T) => number) | undefined): this {
+    throw new Error('Method not implemented.');
+  }
+  splice(start: number, deleteCount?: number | undefined): T[];
+  splice(start: number, deleteCount: number, ...items: T[]): T[] {
+    throw new Error('Method not implemented.');
+  }
+  unshift(...items: T[]): number {
+    throw new Error('Method not implemented.');
+  }
+  fill(value: T, start?: number | undefined, end?: number | undefined): this {
+    throw new Error('Method not implemented.');
+  }
+  copyWithin(target: number, start: number, end?: number | undefined): this {
+    throw new Error('Method not implemented.');
+  }
+
+  [Symbol.unscopables](): {
+    copyWithin: boolean;
+    entries: boolean;
+    fill: boolean;
+    find: boolean;
+    findIndex: boolean;
+    keys: boolean;
+    values: boolean;
+  } {
+    throw new Error('Method not implemented.');
+  }
+
+  //--------------------------------------------------------------------------------
+  // Delegated Array function -- these will not be efficient :grimmice:
+  //--------------------------------------------------------------------------------
+
+  indexOf(searchElement: T, fromIndex?: number | undefined): number {
+    return this.toArray().indexOf(searchElement, fromIndex);
+  }
+  lastIndexOf(searchElement: T, fromIndex?: number | undefined): number {
+    return this.toArray().lastIndexOf(searchElement, fromIndex);
+  }
+  every<S extends T>(predicate: (value: T, index: number, array: T[]) => value is S, thisArg?: any): this is S[];
+  every(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
+  every(predicate: any, thisArg?: unknown): boolean {
+    return this.toArray().every(predicate, thisArg);
+  }
+  some(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean {
+    return this.toArray().some(predicate, thisArg);
+  }
+  reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
+  reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
+  reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
+  reduce(callbackfn: unknown, initialValue?: unknown): T {
+    throw new Error('Method not implemented.');
+  }
+  reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
+  reduceRight(
+    callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T,
+    initialValue: T
+  ): T;
+  reduceRight<U>(
+    callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U,
+    initialValue: U
+  ): U;
+  reduceRight(callbackfn: unknown, initialValue?: unknown): T {
+    throw new Error('Method not implemented.');
+  }
+  find<S extends T>(
+    predicate: (this: void, value: T, index: number, obj: T[]) => value is S,
+    thisArg?: any
+  ): S | undefined;
+  find(predicate: (value: T, index: number, obj: T[]) => unknown, thisArg?: any): T | undefined {
+    return this.toArray().find(predicate, thisArg);
+  }
+  findIndex(predicate: (value: T, index: number, obj: T[]) => unknown, thisArg?: any): number {
+    return this.toArray().findIndex(predicate, thisArg);
+  }
+  entries(): IterableIterator<[number, T]> {
+    return this.toArray().entries();
+  }
+  keys(): IterableIterator<number> {
+    return this.toArray().keys();
+  }
+  values(): IterableIterator<T> {
+    return this.toArray().values();
+  }
+  includes(searchElement: T, fromIndex?: number | undefined): boolean {
+    return this.toArray().includes(searchElement, fromIndex);
+  }
+  flatMap<U, This = undefined>(
+    callback: (this: This, value: T, index: number, array: T[]) => U | readonly U[],
+    thisArg?: This | undefined
+  ): U[] {
+    return this.toArray().flatMap(callback, thisArg);
+  }
+  flat<A, D extends number = 1>(this: A, depth?: D | undefined): Array<FlatArray<A, D>> {
+    throw new Error('Method not implemented.');
+  }
 }
 
+const emptyarray: any[] = [];
+
 /**
  * Use functional programming with your vector
  */
@@ -52,25 +196,26 @@ export function vectorator<T>(vector: Vector<T>) {
       }
     },
 
-    forEach(iterator: (row: T) => void) {
+    forEach(iterator: (row: T, index: number, array: T[]) => void): void {
       for (let i = 0; i < vector.length; i++) {
-        iterator(vector.get(i));
+        iterator(vector.get(i), i, emptyarray);
       }
     },
 
-    map<V>(transform: (item: T, index: number) => V) {
+    map<V>(transform: (item: T, index: number, array: T[]) => V): V[] {
       const result: V[] = [];
       for (let i = 0; i < vector.length; i++) {
-        result.push(transform(vector.get(i), i));
+        result.push(transform(vector.get(i), i, emptyarray));
       }
       return result;
     },
 
     /** Add a predicate where you return true if it should *keep* the value */
-    filter(predicate: (item: T) => boolean): T[] {
+    filter(predicate: (item: T, index: number, array: T[]) => boolean): T[] {
       const result: T[] = [];
+      let count = 0;
       for (const val of this) {
-        if (predicate(val)) {
+        if (predicate(val, count++, emptyarray)) {
           result.push(val);
         }
       }
diff --git a/packages/grafana-data/src/vector/IndexVector.ts b/packages/grafana-data/src/vector/IndexVector.ts
index 4a7fc3dfc27..f69fb51dc5d 100644
--- a/packages/grafana-data/src/vector/IndexVector.ts
+++ b/packages/grafana-data/src/vector/IndexVector.ts
@@ -6,6 +6,8 @@ import { FunctionalVector } from './FunctionalVector';
  * IndexVector is a simple vector implementation that returns the index value
  * for each element in the vector.  It is functionally equivolant a vector backed
  * by an array with values: `[0,1,2,...,length-1]`
+ *
+ * @deprecated use a simple Arrays
  */
 export class IndexVector extends FunctionalVector<number> {
   constructor(private len: number) {
diff --git a/packages/grafana-data/src/vector/RowVector.ts b/packages/grafana-data/src/vector/RowVector.ts
index 21746be48fd..abd2077c564 100644
--- a/packages/grafana-data/src/vector/RowVector.ts
+++ b/packages/grafana-data/src/vector/RowVector.ts
@@ -1,13 +1,16 @@
 import { Vector } from '../types';
 
+import { FunctionalVector } from './FunctionalVector';
 import { vectorToArray } from './vectorToArray';
 
 /**
  * RowVector makes the row values look like a vector
  * @internal
  */
-export class RowVector implements Vector {
-  constructor(private columns: Vector[]) {}
+export class RowVector extends FunctionalVector<number> {
+  constructor(private columns: Vector[]) {
+    super();
+  }
 
   rowIndex = 0;
 
diff --git a/packages/grafana-data/src/vector/SortedVector.ts b/packages/grafana-data/src/vector/SortedVector.ts
index e2a318e95d4..780005c0000 100644
--- a/packages/grafana-data/src/vector/SortedVector.ts
+++ b/packages/grafana-data/src/vector/SortedVector.ts
@@ -1,12 +1,17 @@
 import { Vector } from '../types/vector';
 
+import { FunctionalVector } from './FunctionalVector';
 import { vectorToArray } from './vectorToArray';
 
 /**
  * Values are returned in the order defined by the input parameter
+ *
+ * @deprecated use a simple Arrays
  */
-export class SortedVector<T = any> implements Vector<T> {
-  constructor(private source: Vector<T>, private order: number[]) {}
+export class SortedVector<T = any> extends FunctionalVector<T> {
+  constructor(private source: Vector<T>, private order: number[]) {
+    super();
+  }
 
   get length(): number {
     return this.source.length;
diff --git a/packages/grafana-data/src/vector/vectorToArray.ts b/packages/grafana-data/src/vector/vectorToArray.ts
index a0a17d71cb9..7ec23d9c261 100644
--- a/packages/grafana-data/src/vector/vectorToArray.ts
+++ b/packages/grafana-data/src/vector/vectorToArray.ts
@@ -1,5 +1,6 @@
 import { Vector } from '../types/vector';
 
+/** @deprecated use a simple Arrays */
 export function vectorToArray<T>(v: Vector<T>): T[] {
   const arr: T[] = Array(v.length);
   for (let i = 0; i < v.length; i++) {
diff --git a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
index ea2fe6f50f6..6ffa6408d0e 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
@@ -59,9 +59,9 @@ describe('nullInsertThreshold Transformer', () => {
 
     const result = applyNullInsertThreshold({ frame: df });
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([4, null, 6, null, null, null, null, null, null, 8]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a', null, 'b', null, null, null, null, null, null, 'c']);
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    expect(result.fields[1].values).toEqual([4, null, 6, null, null, null, null, null, null, 8]);
+    expect(result.fields[2].values).toEqual(['a', null, 'b', null, null, null, null, null, null, 'c']);
   });
 
   test('should insert nulls at +threshold between adjacent > threshold: 2', () => {
@@ -76,9 +76,9 @@ describe('nullInsertThreshold Transformer', () => {
 
     const result = applyNullInsertThreshold({ frame: df });
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([5, 7, 9, 11]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([4, 6, null, 8]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a', 'b', null, 'c']);
+    expect(result.fields[0].values).toEqual([5, 7, 9, 11]);
+    expect(result.fields[1].values).toEqual([4, 6, null, 8]);
+    expect(result.fields[2].values).toEqual(['a', 'b', null, 'c']);
   });
 
   test('should insert nulls at +interval between adjacent > interval: 1', () => {
@@ -93,9 +93,9 @@ describe('nullInsertThreshold Transformer', () => {
 
     const result = applyNullInsertThreshold({ frame: df });
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([4, null, 6, null, null, null, null, null, null, 8]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a', null, 'b', null, null, null, null, null, null, 'c']);
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    expect(result.fields[1].values).toEqual([4, null, 6, null, null, null, null, null, null, 8]);
+    expect(result.fields[2].values).toEqual(['a', null, 'b', null, null, null, null, null, null, 'c']);
   });
 
   test('should insert leading null at beginning +interval when timeRange.from.valueOf() exceeds threshold', () => {
@@ -115,8 +115,8 @@ describe('nullInsertThreshold Transformer', () => {
       refFieldPseudoMax: 13,
     });
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([
+    expect(result.fields[0].values).toEqual([-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
+    expect(result.fields[1].values).toEqual([
       null,
       null,
       null,
@@ -133,7 +133,7 @@ describe('nullInsertThreshold Transformer', () => {
       null,
       8,
     ]);
-    expect(result.fields[2].values.toArray()).toStrictEqual([
+    expect(result.fields[2].values).toEqual([
       null,
       null,
       null,
@@ -164,35 +164,9 @@ describe('nullInsertThreshold Transformer', () => {
 
     const result = applyNullInsertThreshold({ frame: df, refFieldName: null, refFieldPseudoMax: 13 });
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([
-      4,
-      null,
-      6,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      8,
-      null,
-      null,
-    ]);
-    expect(result.fields[2].values.toArray()).toStrictEqual([
-      'a',
-      null,
-      'b',
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      'c',
-      null,
-      null,
-    ]);
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
+    expect(result.fields[1].values).toEqual([4, null, 6, null, null, null, null, null, null, 8, null, null]);
+    expect(result.fields[2].values).toEqual(['a', null, 'b', null, null, null, null, null, null, 'c', null, null]);
 
     // should work for frames with 1 datapoint
     const df2 = new MutableDataFrame({
@@ -208,9 +182,9 @@ describe('nullInsertThreshold Transformer', () => {
     // we get 12 nulls instead of the additional 1
     const result2 = applyNullInsertThreshold({ frame: df2, refFieldName: null, refFieldPseudoMax: 2.5 });
 
-    expect(result2.fields[0].values.toArray()).toStrictEqual([1, 2]);
-    expect(result2.fields[1].values.toArray()).toStrictEqual([1, null]);
-    expect(result2.fields[2].values.toArray()).toStrictEqual(['a', null]);
+    expect(result2.fields[0].values).toEqual([1, 2]);
+    expect(result2.fields[1].values).toEqual([1, null]);
+    expect(result2.fields[2].values).toEqual(['a', null]);
   });
 
   test('should not insert trailing null at end +interval when timeRange.to.valueOf() equals threshold', () => {
@@ -225,9 +199,9 @@ describe('nullInsertThreshold Transformer', () => {
 
     const result = applyNullInsertThreshold({ frame: df, refFieldName: null, refFieldPseudoMax: 2 });
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([1]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([1]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a']);
+    expect(result.fields[0].values).toEqual([1]);
+    expect(result.fields[1].values).toEqual([1]);
+    expect(result.fields[2].values).toEqual(['a']);
   });
 
   // TODO: make this work
@@ -243,9 +217,9 @@ describe('nullInsertThreshold Transformer', () => {
 
     const result = applyNullInsertThreshold({ frame: df });
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([5, 6, 7, 8, 11]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([4, null, 6, null, 8]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a', null, 'b', null, 'c']);
+    expect(result.fields[0].values).toEqual([5, 6, 7, 8, 11]);
+    expect(result.fields[1].values).toEqual([4, null, 6, null, 8]);
+    expect(result.fields[2].values).toEqual(['a', null, 'b', null, 'c']);
   });
 
   test('should noop on 0 datapoints', () => {
diff --git a/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts b/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts
index f5c3bfb1a7e..a321f6a7e2f 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts
@@ -26,9 +26,9 @@ describe('nullToValue Transformer', () => {
 
     const result = nullToValue(applyNullInsertThreshold({ frame: df }));
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([4, 0, 6, 0, 0, 0, 0, 0, 0, 8]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a', 0, 'b', 0, 0, 0, 0, 0, 0, 'c']);
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    expect(result.fields[1].values).toEqual([4, 0, 6, 0, 0, 0, 0, 0, 0, 8]);
+    expect(result.fields[2].values).toEqual(['a', 0, 'b', 0, 0, 0, 0, 0, 0, 'c']);
   });
 
   test('should change all nulls to configured positive value', () => {
@@ -53,9 +53,9 @@ describe('nullToValue Transformer', () => {
 
     const result = nullToValue(applyNullInsertThreshold({ frame: df }));
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([5, 7, 9, 11]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([4, 6, 1, 8]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a', 'b', 1, 'c']);
+    expect(result.fields[0].values).toEqual([5, 7, 9, 11]);
+    expect(result.fields[1].values).toEqual([4, 6, 1, 8]);
+    expect(result.fields[2].values).toEqual(['a', 'b', 1, 'c']);
   });
 
   test('should change all nulls to configured negative value', () => {
@@ -70,9 +70,9 @@ describe('nullToValue Transformer', () => {
 
     const result = nullToValue(applyNullInsertThreshold({ frame: df }));
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([4, -1, 6, -1, -1, -1, -1, -1, -1, 8]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a', -1, 'b', -1, -1, -1, -1, -1, -1, 'c']);
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    expect(result.fields[1].values).toEqual([4, -1, 6, -1, -1, -1, -1, -1, -1, 8]);
+    expect(result.fields[2].values).toEqual(['a', -1, 'b', -1, -1, -1, -1, -1, -1, 'c']);
   });
 
   test('should have no effect without nulls', () => {
@@ -87,8 +87,8 @@ describe('nullToValue Transformer', () => {
 
     const result = nullToValue(applyNullInsertThreshold({ frame: df, refFieldName: null }));
 
-    expect(result.fields[0].values.toArray()).toStrictEqual([1, 2, 3]);
-    expect(result.fields[1].values.toArray()).toStrictEqual([4, 6, 8]);
-    expect(result.fields[2].values.toArray()).toStrictEqual(['a', 'b', 'c']);
+    expect(result.fields[0].values).toEqual([1, 2, 3]);
+    expect(result.fields[1].values).toEqual([4, 6, 8]);
+    expect(result.fields[2].values).toEqual(['a', 'b', 'c']);
   });
 });
diff --git a/public/app/features/geo/format/utils.ts b/public/app/features/geo/format/utils.ts
index c5d5814894d..e4b12b829e2 100644
--- a/public/app/features/geo/format/utils.ts
+++ b/public/app/features/geo/format/utils.ts
@@ -8,7 +8,7 @@ import { Gazetteer } from '../gazetteer/gazetteer';
 
 import { decodeGeohash } from './geohash';
 
-export function pointFieldFromGeohash(geohash: Field<string>): Field<Point> {
+export function pointFieldFromGeohash(geohash: Field<string>): Field<Geometry | undefined> {
   return {
     name: geohash.name ?? 'Point',
     type: FieldType.geo,
@@ -25,7 +25,7 @@ export function pointFieldFromGeohash(geohash: Field<string>): Field<Point> {
   };
 }
 
-export function pointFieldFromLonLat(lon: Field, lat: Field): Field<Point> {
+export function pointFieldFromLonLat(lon: Field, lat: Field): Field<Geometry | undefined> {
   const buffer = new Array<Point>(lon.values.length);
   for (let i = 0; i < lon.values.length; i++) {
     const longitude = lon.values.get(i);
diff --git a/public/app/features/geo/gazetteer/gazetteer.ts b/public/app/features/geo/gazetteer/gazetteer.ts
index 94b2b81a96a..80bb0864839 100644
--- a/public/app/features/geo/gazetteer/gazetteer.ts
+++ b/public/app/features/geo/gazetteer/gazetteer.ts
@@ -60,7 +60,7 @@ export function loadGazetteer(path: string, data: any): Gazetteer {
 
 export function frameAsGazetter(frame: DataFrame, opts: { path: string; keys?: string[] }): Gazetteer {
   const keys: Field[] = [];
-  let geo: Field<Geometry> | undefined = undefined;
+  let geo: Field<Geometry | undefined> | undefined = undefined;
   let lat: Field | undefined = undefined;
   let lng: Field | undefined = undefined;
   let geohash: Field | undefined = undefined;
@@ -132,7 +132,7 @@ export function frameAsGazetter(frame: DataFrame, opts: { path: string; keys?: s
       isPoint = true;
     }
   } else {
-    isPoint = geo.values.get(0).getType() === 'Point';
+    isPoint = geo.values.get(0)?.getType() === 'Point';
   }
 
   const lookup = new Map<string, number>();
diff --git a/public/app/features/geo/utils/frameVectorSource.ts b/public/app/features/geo/utils/frameVectorSource.ts
index 2525833fa48..17be6b05ec2 100644
--- a/public/app/features/geo/utils/frameVectorSource.ts
+++ b/public/app/features/geo/utils/frameVectorSource.ts
@@ -44,7 +44,7 @@ export class FrameVectorSource<T extends Geometry = Geometry> extends VectorSour
     }
 
     //eslint-disable-next-line
-    const field = info.field as Field<Point>;
+    const field = info.field as unknown as Field<Point>;
     const geometry = new LineString(field.values.toArray().map((p) => p.getCoordinates())) as Geometry;
     this.addFeatureInternal(
       new Feature({
diff --git a/public/app/features/geo/utils/location.ts b/public/app/features/geo/utils/location.ts
index 5c0828a834f..02a25c40fa3 100644
--- a/public/app/features/geo/utils/location.ts
+++ b/public/app/features/geo/utils/location.ts
@@ -113,7 +113,7 @@ export interface LocationFields {
   h3?: Field;
   wkt?: Field;
   lookup?: Field;
-  geo?: Field<Geometry>;
+  geo?: Field<Geometry | undefined>;
 }
 
 export function getLocationFields(frame: DataFrame, location: LocationFieldMatchers): LocationFields {
diff --git a/public/app/features/live/centrifuge/LiveDataStream.test.ts b/public/app/features/live/centrifuge/LiveDataStream.test.ts
index 17b73f44e72..acae046c385 100644
--- a/public/app/features/live/centrifuge/LiveDataStream.test.ts
+++ b/public/app/features/live/centrifuge/LiveDataStream.test.ts
@@ -300,17 +300,13 @@ describe('LiveDataStream', () => {
           config: {},
           name: 'time',
           type: 'time',
-          values: {
-            buffer: [100, 101],
-          },
+          values: [100, 101],
         },
         {
           config: {},
           name: 'b',
           type: 'number',
-          values: {
-            buffer: [1, 2],
-          },
+          values: [1, 2],
         },
       ]);
       expect(deserializedFrame.length).toEqual(dataFrameJsons.schema1().data.values[0].length);
@@ -529,17 +525,13 @@ describe('LiveDataStream', () => {
           config: {},
           name: 'time',
           type: 'time',
-          values: {
-            buffer: [100, 101],
-          },
+          values: [100, 101],
         },
         {
           config: {},
           name: 'b',
           type: 'number',
-          values: {
-            buffer: [1, 2],
-          },
+          values: [1, 2],
         },
       ]);
       expect(deserializedFrame.length).toEqual(dataFrameJsons.schema1().data.values[0].length);
diff --git a/public/app/features/live/data/StreamingDataFrame.test.ts b/public/app/features/live/data/StreamingDataFrame.test.ts
index fb3baab7396..97366e20d4e 100644
--- a/public/app/features/live/data/StreamingDataFrame.test.ts
+++ b/public/app/features/live/data/StreamingDataFrame.test.ts
@@ -90,7 +90,7 @@ describe('Streaming JSON', () => {
     });
 
     it('should create frame with schema & data', () => {
-      expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
+      expect(stream.fields.map((f) => ({ name: f.name, value: f.values }))).toMatchInlineSnapshot(`
         [
           {
             "name": "time",
@@ -127,7 +127,7 @@ describe('Streaming JSON', () => {
         },
       });
 
-      expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
+      expect(stream.fields.map((f) => ({ name: f.name, value: f.values }))).toMatchInlineSnapshot(`
         [
           {
             "name": "time",
@@ -167,7 +167,7 @@ describe('Streaming JSON', () => {
         },
       });
 
-      expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
+      expect(stream.fields.map((f) => ({ name: f.name, value: f.values }))).toMatchInlineSnapshot(`
         [
           {
             "name": "time",
@@ -211,7 +211,7 @@ describe('Streaming JSON', () => {
         },
       });
 
-      expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
+      expect(stream.fields.map((f) => ({ name: f.name, value: f.values }))).toMatchInlineSnapshot(`
         [
           {
             "name": "time",
@@ -263,7 +263,7 @@ describe('Streaming JSON', () => {
         },
       });
 
-      expect(stream.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
+      expect(stream.fields.map((f) => ({ name: f.name, value: f.values }))).toMatchInlineSnapshot(`
         [
           {
             "name": "time",
@@ -558,7 +558,7 @@ describe('Streaming JSON', () => {
         [10, 11],
       ]);
       expect(frame.length).toEqual(3);
-      expect(frame.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
+      expect(frame.fields.map((f) => ({ name: f.name, value: f.values }))).toMatchInlineSnapshot(`
         [
           {
             "name": "time",
@@ -603,7 +603,7 @@ describe('Streaming JSON', () => {
         [10, 11],
       ]);
       expect(frame.length).toEqual(2);
-      expect(frame.fields.map((f) => ({ name: f.name, value: f.values.buffer }))).toMatchInlineSnapshot(`
+      expect(frame.fields.map((f) => ({ name: f.name, value: f.values }))).toMatchInlineSnapshot(`
         [
           {
             "name": "time",
@@ -720,7 +720,7 @@ describe('Streaming JSON', () => {
       },
     });
 
-    expect(stream.fields.map((f) => ({ name: f.name, labels: f.labels, values: f.values.buffer })))
+    expect(stream.fields.map((f) => ({ name: f.name, labels: f.labels, values: f.values })))
       .toMatchInlineSnapshot(`
       [
         {
@@ -854,7 +854,7 @@ describe('Streaming JSON', () => {
 
     const getSnapshot = (f: StreamingDataFrame) => {
       return {
-        values: f.fields[1].values.toArray(),
+        values: f.fields[1].values,
         info: f.packetInfo,
       };
     };
diff --git a/public/app/features/live/data/StreamingDataFrame.ts b/public/app/features/live/data/StreamingDataFrame.ts
index 14ffa94c85e..a4c326ccec0 100644
--- a/public/app/features/live/data/StreamingDataFrame.ts
+++ b/public/app/features/live/data/StreamingDataFrame.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   DataFrame,
   DataFrameJSON,
   decodeFieldValueEntities,
@@ -60,7 +59,7 @@ export class StreamingDataFrame implements DataFrame {
   refId?: string;
   meta: QueryResultMeta = {};
 
-  fields: Array<Field<any, ArrayVector<any>>> = [];
+  fields: Field[] = [];
   length = 0;
 
   private schemaFields: FieldSchema[] = [];
@@ -146,11 +145,11 @@ export class StreamingDataFrame implements DataFrame {
       ...f,
       type: f.type ?? FieldType.other,
       config: f.config ?? {},
-      values: Array.isArray(f.values) ? new ArrayVector(f.values) : new ArrayVector(),
+      values: f.values ?? [],
     }));
 
     assureValuesAreWithinLengthLimit(
-      this.fields.map((f) => f.values.buffer),
+      this.fields.map((f) => f.values),
       this.options.maxLength,
       this.timeFieldIndex,
       this.options.maxDelta
@@ -256,8 +255,8 @@ export class StreamingDataFrame implements DataFrame {
             // transfer old values by type & name, unless we relied on labels to match fields
             values: isWide
               ? this.fields.find((of) => of.name === f.name && f.type === of.type)?.values ??
-                new ArrayVector(Array(this.length).fill(undefined))
-              : new ArrayVector(),
+                Array(this.length).fill(undefined)
+              : [],
           };
         });
       }
@@ -322,7 +321,7 @@ export class StreamingDataFrame implements DataFrame {
             name,
             type,
             config: {},
-            values: new ArrayVector([]),
+            values: [],
           };
         });
       }
@@ -336,13 +335,14 @@ export class StreamingDataFrame implements DataFrame {
         this.packetInfo.action = StreamingFrameAction.Append;
 
         // mutates appended
-        appended = this.fields.map((f) => f.values.buffer);
+        appended = this.fields.map((f) => f.values);
         circPush(appended, values, this.options.maxLength, this.timeFieldIndex, this.options.maxDelta);
       }
 
       appended.forEach((v, i) => {
-        const { state, values } = this.fields[i];
-        values.buffer = v;
+        const field = this.fields[i];
+        const { state } = field;
+        field.values = v;
         if (state) {
           state.calcs = undefined;
         }
@@ -369,7 +369,7 @@ export class StreamingDataFrame implements DataFrame {
 
     if (this.options.action === StreamingFrameAction.Append) {
       circPush(
-        this.fields.map((f) => f.values.buffer),
+        this.fields.map((f) => f.values),
         values,
         this.options.maxLength,
         this.timeFieldIndex,
@@ -377,19 +377,19 @@ export class StreamingDataFrame implements DataFrame {
       );
     } else {
       values.forEach((v, i) => {
-        if (this.fields[i]?.values) {
-          this.fields[i].values.buffer = v;
+        if (this.fields[i]) {
+          this.fields[i].values = v;
         }
       });
 
       assureValuesAreWithinLengthLimit(
-        this.fields.map((f) => f.values.buffer),
+        this.fields.map((f) => f.values),
         this.options.maxLength,
         this.timeFieldIndex,
         this.options.maxDelta
       );
     }
-    const newLength = this.fields?.[0]?.values?.buffer?.length;
+    const newLength = this.fields?.[0]?.values.length;
     if (newLength !== undefined) {
       this.length = newLength;
     }
@@ -412,7 +412,7 @@ export class StreamingDataFrame implements DataFrame {
 
   getValuesFromLastPacket = (): unknown[][] =>
     this.fields.map((f) => {
-      const values = f.values.buffer;
+      const values = f.values;
       return values.slice(Math.max(values.length - this.packetInfo.length));
     });
 
@@ -449,7 +449,7 @@ export class StreamingDataFrame implements DataFrame {
           ...proto,
           config,
           labels: parsedLabels,
-          values: new ArrayVector(Array(this.length).fill(undefined)),
+          values: Array(this.length).fill(undefined),
         });
       }
     }
diff --git a/public/app/features/live/live.test.ts b/public/app/features/live/live.test.ts
index 7fd6536fa69..e1627284f8a 100644
--- a/public/app/features/live/live.test.ts
+++ b/public/app/features/live/live.test.ts
@@ -99,25 +99,19 @@ describe('GrafanaLiveService', () => {
         config: {},
         name: 'time',
         type: FieldType.time,
-        values: {
-          buffer: [100, 101],
-        },
+        values: [100, 101],
       },
       {
         config: {},
         name: 'a',
         type: FieldType.string,
-        values: {
-          buffer: ['a', 'b'],
-        },
+        values: ['a', 'b'],
       },
       {
         config: {},
         name: 'b',
         type: FieldType.number,
-        values: {
-          buffer: [1, 2],
-        },
+        values: [1, 2],
       },
     ]);
   });
diff --git a/public/app/features/transformers/lookupGazetteer/fieldLookup.ts b/public/app/features/transformers/lookupGazetteer/fieldLookup.ts
index ccaf1da4926..4f9470c176e 100644
--- a/public/app/features/transformers/lookupGazetteer/fieldLookup.ts
+++ b/public/app/features/transformers/lookupGazetteer/fieldLookup.ts
@@ -1,7 +1,6 @@
 import { mergeMap, from } from 'rxjs';
 
 import {
-  ArrayVector,
   DataFrame,
   DataTransformerID,
   Field,
@@ -53,12 +52,12 @@ export function addFieldsFromGazetteer(frames: DataFrame[], gaz: Gazetteer, matc
 
       //if the field matches
       if (matcher(field, frame, frames)) {
-        const values = field.values.toArray();
+        const values = field.values;
         const sub: any[][] = [];
         for (const f of src) {
           const buffer = new Array(length);
           sub.push(buffer);
-          fields.push({ ...f, values: new ArrayVector(buffer) });
+          fields.push({ ...f, values: buffer });
         }
 
         // Add all values to the buffer
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
index 952fcdf0d9b..76a8898bff2 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
@@ -15,8 +15,8 @@ describe('timeSeriesTableTransformer', () => {
     const result = results[0];
     expect(result.refId).toBe('A');
     expect(result.fields).toHaveLength(3);
-    expect(result.fields[0].values.toArray()).toEqual(['A', 'A', 'A']);
-    expect(result.fields[1].values.toArray()).toEqual(['B', 'C', 'D']);
+    expect(result.fields[0].values).toEqual(['A', 'A', 'A']);
+    expect(result.fields[1].values).toEqual(['B', 'C', 'D']);
     assertDataFrameField(result.fields[2], series);
   });
 
@@ -33,8 +33,8 @@ describe('timeSeriesTableTransformer', () => {
     expect(results[0]).toEqual(series[0]);
     expect(results[1].refId).toBe('A');
     expect(results[1].fields).toHaveLength(3);
-    expect(results[1].fields[0].values.toArray()).toEqual(['A', 'A']);
-    expect(results[1].fields[1].values.toArray()).toEqual(['B', 'C']);
+    expect(results[1].fields[0].values).toEqual(['A', 'A']);
+    expect(results[1].fields[1].values).toEqual(['B', 'C']);
     expect(results[2]).toEqual(series[3]);
   });
 
@@ -51,14 +51,14 @@ describe('timeSeriesTableTransformer', () => {
     expect(results).toHaveLength(2);
     expect(results[0].refId).toBe('A');
     expect(results[0].fields).toHaveLength(3);
-    expect(results[0].fields[0].values.toArray()).toEqual(['A', 'A', 'A']);
-    expect(results[0].fields[1].values.toArray()).toEqual(['B', 'C', 'D']);
+    expect(results[0].fields[0].values).toEqual(['A', 'A', 'A']);
+    expect(results[0].fields[1].values).toEqual(['B', 'C', 'D']);
     assertDataFrameField(results[0].fields[2], series.slice(0, 3));
     expect(results[1].refId).toBe('B');
     expect(results[1].fields).toHaveLength(4);
-    expect(results[1].fields[0].values.toArray()).toEqual(['B', 'B']);
-    expect(results[1].fields[1].values.toArray()).toEqual(['F', 'G']);
-    expect(results[1].fields[2].values.toArray()).toEqual(['A', 'B']);
+    expect(results[1].fields[0].values).toEqual(['B', 'B']);
+    expect(results[1].fields[1].values).toEqual(['F', 'G']);
+    expect(results[1].fields[2].values).toEqual(['A', 'B']);
     assertDataFrameField(results[1].fields[3], series.slice(3, 5));
   });
 });
@@ -66,12 +66,12 @@ describe('timeSeriesTableTransformer', () => {
 function assertFieldsEqual(field1: Field, field2: Field) {
   expect(field1.type).toEqual(field2.type);
   expect(field1.name).toEqual(field2.name);
-  expect(field1.values.toArray()).toEqual(field2.values.toArray());
+  expect(field1.values).toEqual(field2.values);
   expect(field1.labels ?? {}).toEqual(field2.labels ?? {});
 }
 
 function assertDataFrameField(field: Field, matchesFrames: DataFrame[]) {
-  const frames: DataFrame[] = field.values.toArray();
+  const frames: DataFrame[] = field.values;
   expect(frames).toHaveLength(matchesFrames.length);
   frames.forEach((frame, idx) => {
     const matchingFrame = matchesFrames[idx];
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
index d3e6b68a12c..e20087a3bb3 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
@@ -68,7 +68,11 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
         values: new ArrayVector(),
       };
       refId2frameField[refId] = frameField;
-      const table = new MutableDataFrame();
+
+      // NOTE: MutableDataFrame.addField() makes copies, including any .values buffers
+      // since we do .values.add() later on the *originals*, we pass a custom MutableVectorCreator
+      // which will re-use the existing empty .values buffer by reference
+      const table = new MutableDataFrame(undefined, (buffer) => buffer ?? []);
       for (const label of Object.values(labelFields)) {
         table.addField(label);
       }
@@ -81,7 +85,7 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
     const labels = frame.fields[1].labels;
     for (const labelKey of Object.keys(labelFields)) {
       const labelValue = labels?.[labelKey] ?? null;
-      labelFields[labelKey].values.add(labelValue);
+      labelFields[labelKey].values.add(labelValue!);
     }
 
     frameField.values.add(frame);
diff --git a/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts b/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
index 6f5955aedd9..6f19818be05 100644
--- a/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
@@ -371,7 +371,7 @@ describe('ElasticResponse', () => {
       expect(getTimeField(frame1).values.get(0)).toBe(1000);
 
       expect(frame2.name).toBe('Average value');
-      expect(getValueField(frame2).values.toArray()).toStrictEqual([88, 99]);
+      expect(getValueField(frame2).values.toArray()).toEqual([88, 99]);
     });
   });
 
@@ -688,20 +688,20 @@ describe('ElasticResponse', () => {
       const firstSeries = result.data[0];
       expect(firstSeries.name).toBe('Top Metrics @value');
       expect(firstSeries.length).toBe(2);
-      expect(getTimeField(firstSeries).values.toArray()).toStrictEqual([
+      expect(getTimeField(firstSeries).values.toArray()).toEqual([
         new Date('2021-01-01T00:00:00.000Z').valueOf(),
         new Date('2021-01-01T00:00:10.000Z').valueOf(),
       ]);
-      expect(getValueField(firstSeries).values.toArray()).toStrictEqual([1, 1]);
+      expect(getValueField(firstSeries).values.toArray()).toEqual([1, 1]);
 
       const secondSeries = result.data[1];
       expect(secondSeries.name).toBe('Top Metrics @anotherValue');
       expect(secondSeries.length).toBe(2);
-      expect(getTimeField(secondSeries).values.toArray()).toStrictEqual([
+      expect(getTimeField(secondSeries).values.toArray()).toEqual([
         new Date('2021-01-01T00:00:00.000Z').valueOf(),
         new Date('2021-01-01T00:00:10.000Z').valueOf(),
       ]);
-      expect(getValueField(secondSeries).values.toArray()).toStrictEqual([2, 2]);
+      expect(getValueField(secondSeries).values.toArray()).toEqual([2, 2]);
     });
   });
 
@@ -814,9 +814,9 @@ describe('ElasticResponse', () => {
       const { fields } = result.data[0];
       expect(fields.length).toBe(2);
       expect(fields[0].name).toBe('bytes');
-      expect(fields[0].config).toStrictEqual({ filterable: true });
+      expect(fields[0].config).toEqual({ filterable: true });
       expect(fields[1].name).toBe('Count');
-      expect(fields[1].config).toStrictEqual({});
+      expect(fields[1].config).toEqual({});
     });
   });
 
@@ -989,9 +989,9 @@ describe('ElasticResponse', () => {
       const field2 = result.data[0].fields[1];
       const field3 = result.data[0].fields[2];
 
-      expect(field1.values.toArray()).toStrictEqual(['server-1', 'server-2']);
-      expect(field2.values.toArray()).toStrictEqual([1000, 2000]);
-      expect(field3.values.toArray()).toStrictEqual([369, 200]);
+      expect(field1.values).toEqual(['server-1', 'server-2']);
+      expect(field2.values).toEqual([1000, 2000]);
+      expect(field3.values).toEqual([369, 200]);
     });
   });
 
@@ -1044,9 +1044,9 @@ describe('ElasticResponse', () => {
       expect(field2.name).toBe('p75 value');
       expect(field3.name).toBe('p90 value');
 
-      expect(field1.values.toArray()).toStrictEqual(['id1', 'id2']);
-      expect(field2.values.toArray()).toStrictEqual([3.3, 2.3]);
-      expect(field3.values.toArray()).toStrictEqual([5.5, 4.5]);
+      expect(field1.values.toArray()).toEqual(['id1', 'id2']);
+      expect(field2.values.toArray()).toEqual([3.3, 2.3]);
+      expect(field3.values.toArray()).toEqual([5.5, 4.5]);
     });
   });
 
@@ -1088,9 +1088,9 @@ describe('ElasticResponse', () => {
     it('should include field in metric name', () => {
       expect(result.data[0].length).toBe(1);
       expect(result.data[0].fields.length).toBe(3);
-      expect(result.data[0].fields[0].values.toArray()).toStrictEqual(['server-1']);
-      expect(result.data[0].fields[1].values.toArray()).toStrictEqual([1000]);
-      expect(result.data[0].fields[2].values.toArray()).toStrictEqual([3000]);
+      expect(result.data[0].fields[0].values.toArray()).toEqual(['server-1']);
+      expect(result.data[0].fields[1].values.toArray()).toEqual([1000]);
+      expect(result.data[0].fields[2].values.toArray()).toEqual([3000]);
     });
   });
 
@@ -1286,11 +1286,11 @@ describe('ElasticResponse', () => {
       expect(frame.length).toBe(2);
       const { fields } = frame;
       expect(fields.length).toBe(5);
-      expect(fields[0].values.toArray()).toStrictEqual([1000, 2000]);
-      expect(fields[1].values.toArray()).toStrictEqual([2, 3]);
-      expect(fields[2].values.toArray()).toStrictEqual([3, 4]);
-      expect(fields[3].values.toArray()).toStrictEqual([6, 12]);
-      expect(fields[4].values.toArray()).toStrictEqual([24, 48]);
+      expect(fields[0].values.toArray()).toEqual([1000, 2000]);
+      expect(fields[1].values.toArray()).toEqual([2, 3]);
+      expect(fields[2].values.toArray()).toEqual([3, 4]);
+      expect(fields[3].values.toArray()).toEqual([6, 12]);
+      expect(fields[4].values.toArray()).toEqual([24, 48]);
     });
   });
 
diff --git a/public/app/plugins/datasource/loki/responseUtils.ts b/public/app/plugins/datasource/loki/responseUtils.ts
index 306c3b387f8..279133c9450 100644
--- a/public/app/plugins/datasource/loki/responseUtils.ts
+++ b/public/app/plugins/datasource/loki/responseUtils.ts
@@ -220,7 +220,7 @@ function cloneDataFrame(frame: DataQueryResponseData): DataQueryResponseData {
     ...frame,
     fields: frame.fields.map((field: Field<unknown, ArrayVector>) => ({
       ...field,
-      values: new ArrayVector(field.values.buffer),
+      values: new ArrayVector(field.values.toArray()),
     })),
   };
 }
diff --git a/public/app/plugins/datasource/postgres/datasource.test.ts b/public/app/plugins/datasource/postgres/datasource.test.ts
index 6a6c0789f35..48c9a2990c9 100644
--- a/public/app/plugins/datasource/postgres/datasource.test.ts
+++ b/public/app/plugins/datasource/postgres/datasource.test.ts
@@ -141,9 +141,7 @@ describe('PostgreSQLDatasource', () => {
                   entities: {},
                   name: 'time',
                   type: 'time',
-                  values: {
-                    buffer: [1599643351085],
-                  },
+                  values: [1599643351085],
                 },
                 {
                   config: {},
@@ -153,9 +151,7 @@ describe('PostgreSQLDatasource', () => {
                   },
                   name: 'metric',
                   type: 'number',
-                  values: {
-                    buffer: [30.226249741223704],
-                  },
+                  values: [30.226249741223704],
                 },
               ],
               length: 1,
@@ -237,27 +233,21 @@ describe('PostgreSQLDatasource', () => {
                   entities: {},
                   name: 'time',
                   type: 'time',
-                  values: {
-                    buffer: [1599643351085],
-                  },
+                  values: [1599643351085],
                 },
                 {
                   config: {},
                   entities: {},
                   name: 'metric',
                   type: 'string',
-                  values: {
-                    buffer: ['America'],
-                  },
+                  values: ['America'],
                 },
                 {
                   config: {},
                   entities: {},
                   name: 'value',
                   type: 'number',
-                  values: {
-                    buffer: [30.226249741223704],
-                  },
+                  values: [30.226249741223704],
                 },
               ],
               length: 1,
diff --git a/public/app/plugins/panel/timeseries/utils.ts b/public/app/plugins/panel/timeseries/utils.ts
index e2257c6abfc..f40e2dd24e4 100644
--- a/public/app/plugins/panel/timeseries/utils.ts
+++ b/public/app/plugins/panel/timeseries/utils.ts
@@ -124,14 +124,12 @@ export function prepareGraphableFields(
             ...field,
             config,
             type: FieldType.number,
-            values: new ArrayVector(
-              field.values.toArray().map((v) => {
-                if (v == null) {
-                  return v;
-                }
-                return Boolean(v) ? 1 : 0;
-              })
-            ),
+            values: field.values.map((v) => {
+              if (v == null) {
+                return v;
+              }
+              return Boolean(v) ? 1 : 0;
+            }),
           };
 
           if (!isBooleanUnit(config.unit)) {

From 2e2f44c2d3c385f9e1029d3ce6db85bb86fec539 Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Fri, 14 Apr 2023 14:01:41 +0100
Subject: [PATCH 148/729] Docs: update docs migration path for api keys w.
 examples (#66463)

* docs update migration path w. examples

* update with current example for api

* updated linsk for the documentation

* trigger commit

* Update docs/sources/administration/api-keys/index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update docs/sources/administration/api-keys/index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update docs/sources/administration/api-keys/index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update docs/sources/administration/api-keys/index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Update docs/sources/administration/api-keys/index.md

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* added cloud stack section

---------

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
---
 docs/sources/administration/api-keys/index.md | 210 +++++++++++++++++-
 1 file changed, 205 insertions(+), 5 deletions(-)

diff --git a/docs/sources/administration/api-keys/index.md b/docs/sources/administration/api-keys/index.md
index 2b9da4c533d..462061476fc 100644
--- a/docs/sources/administration/api-keys/index.md
+++ b/docs/sources/administration/api-keys/index.md
@@ -106,9 +106,9 @@ To migrate a single API key to a service account, complete the following steps:
 1. Find the API Key you want to migrate.
 1. Click **Migrate to service account**.
 
-### Migrate API keys to Grafana service accounts using the API
+### Migrate API keys to Grafana service accounts for API calls
 
-This section shows you how to migrate API keys to Grafana service accounts using the Grafana API.
+This section shows you how to migrate API keys to Grafana service accounts for Grafana API workflows. For references see: [Grafana Service Accounts for the Grafana API]({{< relref "../../developers/http_api/serviceaccount/#create-service-account" >}}).
 
 #### Before you begin
 
@@ -120,7 +120,7 @@ To follow these instructions, you need one of the following:
 
 #### Steps
 
-Complete the following steps to migrate from API keys to service accounts using the API:
+Complete the following steps to migrate from API keys to service accounts for API:
 
 1. Call the `POST /api/serviceaccounts` endpoint and the `POST /api/serviceaccounts/<id>/tokens`.
 
@@ -135,9 +135,44 @@ Complete the following steps to migrate from API keys to service accounts using
 1. Remove code that handles the old `/api/auth/keys` endpoint.
 1. Track the [API keys](http://localhost:3000/org/apikeys) in use and migrate them to SATs.
 
-### Migrate API keys to Grafana service accounts using Terraform
+#### Example
 
-This section shows you how to migrate API keys to Grafana service accounts using Terraform.
+Your current setup
+
+```sh
+curl -X POST -H "Content-Type: application/json" -d '{"name": "my-api-key", "role": "Viewer"}' http://admin:admin@localhost:3000/api/auth/keys
+
+# response from the api
+{"id":2,"name":"my-api-key","key":"eyJrIjoiTFRSN1RBOVc3SGhjblc0bWZodXZ3MnNDcU92Um5VZUIiLKJuIjoibXktYXBpLWtleSIsImlkIjoxfQ=="}%
+```
+
+New setup
+
+```sh
+# create a service account
+curl -X POST -H "Content-Type: application/json" -d '{"name": "my-service-account", "role": "Viewer"}' http://admin:admin@localhost:3000/api/serviceaccounts
+
+# response with the created service account id,name, login
+{"id":1,"name":"my-service-account","login":"sa-my-service-account","orgId":1,"isDisabled":false,"role":"Viewer","tokens":0,"avatarUrl":""}%
+
+# create the service account token with the service account id 1 - /serviceaccounts/{id} returned from the previous step
+curl -X POST -H "Content-Type: application/json" -d '{"name": "my-service-account-token"}' http://admin:admin@localhost:3000/api/serviceaccounts/1/tokens
+
+# response with the created SAT id,name and key.
+{"id":2,"name":"my-service-account-token","key":"glsa_9244xlVFZK0j8Lh4fU8Cz6Z5tO664zIi_7a762939"}%
+
+# now you can authenticate the same way as you did with the API key
+curl --request GET --url http://localhost:3000/api/folders --header 'Authorization: Bearer glsa_9244xlVFZK0j8Lh4fU8Cz6Z5tO664zIi_7a762939'
+
+# response
+[{"id":1,"uid":"a5261a84-eebc-4733-83a9-61f4713561d1","title":"gdev dashboards"}]%
+```
+
+### Migrate API keys to Grafana service accounts in Terraform
+
+This section shows you how to migrate your Terraform configuration for API keys to Grafana service accounts. For resources, see [Grafana Service Accounts in Terraform](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/service_account_token).
+
+For migration your cloud stack api keys, use the `grafana_cloud_stack_service_account` and `gafana_cloud_stack_service_account_token` resources see [Grafana Cloud Stack Service Accounts in Terraform](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/cloud_stack_service_account).
 
 #### Steps
 
@@ -147,3 +182,168 @@ Complete the following steps to migrate from API keys to service accounts using
 1. Specify the desired scopes and expiration date when creating the service account.
 1. Use the token returned from `grafana_service_account_token` to authenticate the API requests.
 1. Remove the terraform configuration for creating your `grafana_api_key` resources.
+
+**Example: your current Terraform configuration**
+
+```tf
+terraform {
+  required_providers {
+    grafana = {
+      source  = "grafana/grafana"
+    }
+  }
+}
+
+# configure the provider with basic auth
+provider "grafana" {
+  url  = "http://localhost:3000"
+  auth = "admin:admin"
+}
+
+resource "grafana_api_key" "foo" {
+  name = "key_foo"
+  role = "Viewer"
+}
+
+resource "grafana_api_key" "bar" {
+  name            = "key_bar"
+  role            = "Admin"
+  seconds_to_live = 30
+}
+```
+
+**Your new Terraform configuration**
+
+_Note:_ you can create multiple tokens using one service account.
+
+```tf
+terraform {
+  required_providers {
+    grafana = {
+      source  = "grafana/grafana"
+    }
+  }
+}
+
+# configure the provider with basic auth
+provider "grafana" {
+  url  = "http://localhost:3000"
+  auth = "admin:admin"
+}
+
+# Creating a service account in Grafana instance to be used as auth and attach tokens
+# notice we can attach multiple tokens to one service account
+resource "grafana_service_account" "sa-admin" {
+  name             = "sa-admin"
+  role             = "Admin"
+}
+
+# Creating a service account token in Grafana instance to be used for creating resources in Grafana instance
+resource "grafana_service_account_token" "sat-bar" {
+  name           = "sat-bar"
+  service_account_id = grafana_service_account.sa-admin.id
+}
+
+# Creating a service account token in Grafana instance to be used for creating resources in Grafana instance
+resource "grafana_service_account_token" "sat-foo" {
+  name           = "sat-foo"
+  service_account_id = grafana_service_account.sa-admin.id
+  seconds_to_live    = 30
+}
+```
+
+### Migrate Cloud **Stack** API keys to Grafana cloud stack service accounts in Terraform
+
+This section shows you how to migrate your Terraform configuration for Grafana cloud stack API keys to Grafana cloud stack service accounts. For migration your cloud stack api keys, use the `grafana_cloud_stack_service_account` and `gafana_cloud_stack_service_account_token` resources see [Grafana Cloud Stack Service Accounts in Terraform](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/cloud_stack_service_account).
+
+> **Note:** This is only relevant for Grafana Cloud **Stack** API keys `grafana_cloud_stack_api_key`. Grafana Cloud API keys resource `grafana_cloud_api_key` are not deprecated and should be used for authentication for managing your Grafana cloud.
+
+#### Steps
+
+Complete the following steps to migrate from cloud stack API keys to cloud stack service accounts using Terraform:
+
+1. Generate `grafana_cloud_stack_service_account` and `grafana_cloud_stack_service_account_token` resources.
+1. Specify the desired scopes and expiration date when creating the service account.
+1. Use the token returned from `grafana_cloud_stack_service_account_token` to authenticate the API requests.
+1. Remove the Terraform configuration for creating your `grafana_cloud_stack_api_key` resources.
+
+**Example: Your current Terraform configuration**
+
+```tf
+terraform {
+  required_providers {
+    grafana = {
+      source = "grafana/grafana"
+    }
+  }
+}
+
+# Declaring the first provider to be only used for creating the cloud-stack
+provider "grafana" {
+  alias = "cloud"
+
+  cloud_api_key = "<API-Key>"
+}
+
+resource "grafana_cloud_stack" "my_stack" {
+  provider = grafana.cloud
+
+  name        = "my_stack"
+  slug        = "my_stack"
+  region_slug = "eu" # Example “us”,”eu” etc
+}
+
+# Creating a Grafana API key to be used as auth
+resource "grafana_cloud_stack_api_key" "management" {
+  provider = grafana.cloud
+
+  stack_slug = grafana_cloud_stack.my_stack.slug
+  name       = "management-key"
+  role       = "Admin"
+}
+```
+
+**Your new Terraform configuration**
+
+```tf
+terraform {
+  required_providers {
+    grafana = {
+      source = "grafana/grafana"
+    }
+  }
+}
+
+# Declaring the first provider to be only used for creating the cloud-stack
+provider "grafana" {
+  alias = "cloud"
+
+  cloud_api_key = "<API-Key>"
+}
+
+resource "grafana_cloud_stack" "my_stack" {
+  provider = grafana.cloud
+
+  name        = "my_stack"
+  slug        = "my_stack"
+  region_slug = "eu" # Example “us”,”eu” etc
+}
+
+# Creating a grafana cloud stack service account
+resource "grafana_cloud_stack_service_account" "mystack_cloud-stack_service_account" {
+  provider   = grafana.cloud
+  stack_slug = grafana_cloud_stack.my_stack.slug
+
+  name = "mystack-cloud-stack-sa"
+  role = "Admin"
+}
+
+# Creating a grafana cloud stack service account token
+resource "grafana_cloud_stack_service_account_token" "mystack_cloud-stack_service-account_token" {
+  provider   = grafana.cloud
+  stack_slug = grafana_cloud_stack.my_stack.slug
+
+  name               = "mystack-cloud-stack-sa-token"
+  service_account_id = grafana_cloud_stack_service_account.mystack_cloud-stack_service_account.id
+}
+```

From 6d53c87862e4ef67aa454c1b722282b5dd04b4a8 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Fri, 14 Apr 2023 15:10:31 +0200
Subject: [PATCH 149/729] InfluxDB: Fix querying with hardcoded retention
 policy (#66466)

* Use default retention policy instead of hardcoded retention policy

* Load retention policies for the editor

* Fix the typo

* Add more comment line

* Update comment

* Better error message

* Put back getTagKeys and getTagValues

* Fix unit test
---
 .../VisualInfluxQLEditor/Editor.test.tsx      |  1 +
 .../plugins/datasource/influxdb/datasource.ts | 45 ++++++++++++++++++-
 .../influxdb/influxQLMetadataQuery.ts         |  3 +-
 .../datasource/influxdb/queryUtils.test.ts    | 18 +++++++-
 .../plugins/datasource/influxdb/queryUtils.ts | 16 +++++++
 .../influxdb/specs/datasource.test.ts         | 13 ++++++
 6 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx
index 9caff3d37f9..c763668811d 100644
--- a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx
+++ b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx
@@ -39,6 +39,7 @@ async function assertEditor(query: InfluxQuery, textContent: string) {
   const onChange = jest.fn();
   const onRunQuery = jest.fn();
   const datasource: InfluxDatasource = {
+    retentionPolicies: [],
     metricFindQuery: () => Promise.resolve([]),
   } as unknown as InfluxDatasource;
   const { container } = render(
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 88365b8cfbb..04d9dda778f 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -1,5 +1,5 @@
 import { cloneDeep, extend, groupBy, has, isString, map as _map, omit, pick, reduce } from 'lodash';
-import { lastValueFrom, merge, Observable, of, throwError } from 'rxjs';
+import { defer, lastValueFrom, merge, mergeMap, Observable, of, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 import {
@@ -33,10 +33,11 @@ import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_sr
 import { AnnotationEditor } from './components/AnnotationEditor';
 import { FluxQueryEditor } from './components/FluxQueryEditor';
 import { BROWSER_MODE_DISABLED_MESSAGE } from './constants';
+import { getAllPolicies } from './influxQLMetadataQuery';
 import InfluxQueryModel from './influx_query_model';
 import InfluxSeries from './influx_series';
 import { prepareAnnotation } from './migrations';
-import { buildRawQuery } from './queryUtils';
+import { buildRawQuery, replaceHardCodedRetentionPolicy } from './queryUtils';
 import { InfluxQueryBuilder } from './query_builder';
 import ResponseParser from './response_parser';
 import { InfluxOptions, InfluxQuery, InfluxVersion } from './types';
@@ -127,6 +128,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
   httpMode: string;
   isFlux: boolean;
   isProxyAccess: boolean;
+  retentionPolicies: string[];
 
   constructor(
     instanceSettings: DataSourceInstanceSettings<InfluxOptions>,
@@ -152,6 +154,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     this.responseParser = new ResponseParser();
     this.isFlux = settingsData.version === InfluxVersion.Flux;
     this.isProxyAccess = instanceSettings.access === 'proxy';
+    this.retentionPolicies = [];
 
     if (this.isFlux) {
       // When flux, use an annotation processor rather than the `annotationQuery` lifecycle
@@ -166,11 +169,47 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     }
   }
 
+  async getRetentionPolicies(): Promise<string[]> {
+    if (this.retentionPolicies.length) {
+      return Promise.resolve(this.retentionPolicies);
+    } else {
+      return getAllPolicies(this).catch((err) => {
+        console.error(
+          'Unable to fetch retention policies. Queries will be run without specifying retention policy.',
+          err
+        );
+        return Promise.resolve(this.retentionPolicies);
+      });
+    }
+  }
+
   query(request: DataQueryRequest<InfluxQuery>): Observable<DataQueryResponse> {
     if (!this.isProxyAccess) {
       const error = new Error(BROWSER_MODE_DISABLED_MESSAGE);
       return throwError(() => error);
     }
+
+    // When the dashboard first load or on dashboard panel edit mode
+    // PanelQueryRunner runs the queries to have a visualization on the panel.
+    // At that point datasource doesn't have the retention policies fetched.
+    // So hardcoded policy is being sent. Which causes problems.
+    // To overcome this we check/load policies first and then do the query.
+    return defer(() => this.getRetentionPolicies()).pipe(
+      mergeMap((allPolicies) => {
+        this.retentionPolicies = allPolicies;
+        const policyFixedRequests = {
+          ...request,
+          targets: request.targets.map((t) => ({
+            ...t,
+            policy: replaceHardCodedRetentionPolicy(t.policy, this.retentionPolicies),
+          })),
+        };
+        return this._query(policyFixedRequests);
+      })
+    );
+  }
+
+  _query(request: DataQueryRequest<InfluxQuery>): Observable<DataQueryResponse> {
     // for not-flux queries we call `this.classicQuery`, and that
     // handles the is-hidden situation.
     // for the flux-case, we do the filtering here
@@ -554,6 +593,8 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     });
   }
 
+  // By implementing getTagKeys and getTagValues we add ad-hoc filters functionality
+  // Used in public/app/features/variables/adhoc/picker/AdHocFilterKey.tsx::fetchFilterKeys
   getTagKeys(options: any = {}) {
     const queryBuilder = new InfluxQueryBuilder({ measurement: options.measurement || '', tags: [] }, this.database);
     const query = queryBuilder.buildExploreQuery('TAG_KEYS');
diff --git a/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts b/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
index 486d8081dbd..4f668b619f0 100644
--- a/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
+++ b/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
@@ -1,4 +1,5 @@
 import InfluxDatasource from './datasource';
+import { replaceHardCodedRetentionPolicy } from './queryUtils';
 import { InfluxQueryBuilder } from './query_builder';
 import { InfluxQueryTag } from './types';
 
@@ -11,7 +12,7 @@ const runExploreQuery = (
 ): Promise<Array<{ text: string }>> => {
   const builder = new InfluxQueryBuilder(target, datasource.database);
   const q = builder.buildExploreQuery(type, withKey, withMeasurementFilter);
-  const options = { policy: target.policy };
+  const options = { policy: replaceHardCodedRetentionPolicy(target.policy, datasource.retentionPolicies) };
   return datasource.metricFindQuery(q, options);
 };
 
diff --git a/public/app/plugins/datasource/influxdb/queryUtils.test.ts b/public/app/plugins/datasource/influxdb/queryUtils.test.ts
index 1620ae99732..70c3a652cd0 100644
--- a/public/app/plugins/datasource/influxdb/queryUtils.test.ts
+++ b/public/app/plugins/datasource/influxdb/queryUtils.test.ts
@@ -1,6 +1,12 @@
 import { cloneDeep } from 'lodash';
 
-import { buildRawQuery, changeGroupByPart, changeSelectPart, normalizeQuery } from './queryUtils';
+import {
+  buildRawQuery,
+  changeGroupByPart,
+  changeSelectPart,
+  normalizeQuery,
+  replaceHardCodedRetentionPolicy,
+} from './queryUtils';
 import { InfluxQuery } from './types';
 
 describe('InfluxDB query utils', () => {
@@ -435,4 +441,14 @@ describe('InfluxDB query utils', () => {
       });
     });
   });
+  describe('replaceHardCodedRetentionPolicy', () => {
+    it('should replace non-existing hardcoded retention policy', () => {
+      const hardCodedRetentionPolicy = 'default';
+      const fetchedRetentionPolicies = ['foo', 'fighters', 'nirvana'];
+      expect(replaceHardCodedRetentionPolicy(hardCodedRetentionPolicy, fetchedRetentionPolicies)).toBe('foo');
+      expect(replaceHardCodedRetentionPolicy('foo', fetchedRetentionPolicies)).toBe('foo');
+      expect(replaceHardCodedRetentionPolicy(undefined, fetchedRetentionPolicies)).toBe('foo');
+      expect(replaceHardCodedRetentionPolicy(hardCodedRetentionPolicy, [])).toBe('');
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/influxdb/queryUtils.ts b/public/app/plugins/datasource/influxdb/queryUtils.ts
index 4e29614906c..c38d6b97077 100644
--- a/public/app/plugins/datasource/influxdb/queryUtils.ts
+++ b/public/app/plugins/datasource/influxdb/queryUtils.ts
@@ -90,3 +90,19 @@ export function changeGroupByPart(query: InfluxQuery, partIndex: number, newPara
   };
   return { ...query, groupBy: newGroupBy };
 }
+
+// Retention policy was hardcoded as `default` in
+// public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/FromSection.tsx
+// We opted out hardcoded the policy in public/app/plugins/datasource/influxdb/influx_query_model.ts
+// Which means if a user has a default retention policy named `default` they cannot use it.
+// In https://github.com/grafana/grafana/pull/63820 we introduced a feature to use actual retention policies.
+// But this did not consider that some users have hardcoded `default` retention policy in their dashboards.
+// This function checks whether the given target has hardcoded retention policy not.
+// If it is hardcoded it returns the actual default policy.
+export function replaceHardCodedRetentionPolicy(policy: string | undefined, retentionPolicies: string[]): string {
+  if (!policy || !retentionPolicies.includes(policy)) {
+    return retentionPolicies[0] ?? '';
+  }
+
+  return policy;
+}
diff --git a/public/app/plugins/datasource/influxdb/specs/datasource.test.ts b/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
index e6225f065a2..894d1ad7589 100644
--- a/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
@@ -116,6 +116,8 @@ describe('InfluxDataSource', () => {
         } as FetchResponse);
       });
 
+      ctx.ds.retentionPolicies = [''];
+
       try {
         await lastValueFrom(ctx.ds.query(queryOptions));
       } catch (err) {
@@ -200,6 +202,17 @@ describe('InfluxDataSource', () => {
     });
   });
 
+  // Some functions are required by the parent datasource class to provide functionality
+  // such as ad-hoc filters, which requires the definition of the getTagKeys, and getTagValues
+  describe('Datasource contract', () => {
+    it('has function called getTagKeys', () => {
+      expect(Object.getOwnPropertyNames(Object.getPrototypeOf(ctx.ds))).toContain('getTagKeys');
+    });
+    it('has function called getTagValues', () => {
+      expect(Object.getOwnPropertyNames(Object.getPrototypeOf(ctx.ds))).toContain('getTagValues');
+    });
+  });
+
   describe('Variables should be interpolated correctly', () => {
     const instanceSettings: any = {};
     const text = 'interpolationText';

From e65163ba4ec511c5ea688d9071f3e25e7dee08e4 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 14 Apr 2023 07:03:45 -0700
Subject: [PATCH 150/729] FieldValues: Use plain arrays instead of Vector (part
 2 of 2) (#66224)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
---
 .betterer.results                             | 68 ++++++++-----------
 .../src/dataframe/DataFrameJSON.test.ts       |  5 +-
 .../src/dataframe/DataFrameJSON.ts            |  5 +-
 .../src/dataframe/MutableDataFrame.test.ts    | 14 ++--
 .../src/dataframe/MutableDataFrame.ts         | 14 ++--
 .../src/dataframe/processDataFrame.ts         | 42 +++++-------
 .../src/field/displayProcessor.test.ts        |  7 +-
 .../grafana-data/src/field/fieldColor.test.ts |  7 +-
 .../src/field/fieldOverrides.test.ts          | 13 ++--
 packages/grafana-data/src/field/scale.test.ts |  7 +-
 .../grafana-data/src/field/thresholds.test.ts |  3 +-
 .../src/transformations/fieldReducer.test.ts  |  5 +-
 .../matchers/nameMatcher.test.ts              |  9 ++-
 .../transformDataFrame.test.ts                |  5 +-
 .../transformers/calculateField.ts            |  4 +-
 .../transformations/transformers/concat.ts    |  3 +-
 .../transformers/convertFieldType.test.ts     | 43 ++++++------
 .../transformers/convertFieldType.ts          | 13 ++--
 .../transformers/filterByValue.test.ts        | 21 +++---
 .../transformers/filterByValue.ts             |  3 +-
 .../transformers/groupBy.test.ts              | 27 ++++----
 .../transformations/transformers/groupBy.ts   |  7 +-
 .../transformers/groupingToMatrix.test.ts     | 21 +++---
 .../transformations/transformers/histogram.ts | 13 ++--
 .../transformers/joinByField.test.ts          | 13 ++--
 .../transformers/joinDataFrames.test.ts       | 31 ++++-----
 .../transformers/joinDataFrames.ts            | 13 ++--
 .../transformers/labelsToFields.ts            |  7 +-
 .../transformers/limit.test.ts                | 13 ++--
 .../src/transformations/transformers/limit.ts |  4 +-
 .../transformers/merge.test.ts                |  3 +-
 .../src/transformations/transformers/merge.ts |  3 +-
 .../transformers/order.test.ts                | 25 ++++---
 .../transformers/organize.test.ts             |  9 ++-
 .../transformers/reduce.test.ts               | 55 ++++++++-------
 .../transformations/transformers/reduce.ts    | 27 ++++----
 .../transformers/rename.test.ts               | 19 +++---
 .../transformers/seriesToRows.test.ts         |  5 +-
 .../transformers/seriesToRows.ts              |  5 +-
 public/app/core/logsModel.test.ts             | 25 ++++---
 .../unified/state/AlertingQueryRunner.test.ts |  5 +-
 public/app/features/logs/utils.test.ts        | 17 +++--
 public/app/features/search/service/bluge.ts   |  5 +-
 .../prepareTimeSeries.test.ts                 |  3 +-
 .../prepareTimeSeries/prepareTimeSeries.ts    |  5 +-
 .../timeSeriesTableTransformer.ts             |  5 +-
 .../CloudWatchMetricsQueryRunner.test.ts      |  4 +-
 .../elasticsearch/datasource.test.ts          | 11 ++-
 .../plugins/datasource/jaeger/testResponse.ts |  4 +-
 .../datasource/tempo/graphTransform.test.ts   | 36 +++++-----
 .../tempo/resultTransformer.test.ts           | 30 ++++----
 .../datasource/tempo/resultTransformer.ts     |  2 +-
 .../datasource/zipkin/utils/testData.ts       |  4 +-
 .../datasource/zipkin/utils/testResponse.ts   |  4 +-
 public/app/plugins/panel/news/utils.ts        | 22 +++---
 .../app/plugins/panel/nodeGraph/utils.test.ts | 16 ++---
 public/app/plugins/panel/nodeGraph/utils.ts   | 33 +++++----
 57 files changed, 374 insertions(+), 448 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 1166a7948a6..ccfc022545e 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -45,18 +45,19 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Do not use any type assertions.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Do not use any type assertions.", "12"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
+      [0, 0, 0, "Do not use any type assertions.", "14"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Do not use any type assertions.", "16"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
+      [0, 0, 0, "Do not use any type assertions.", "17"]
     ],
     "packages/grafana-data/src/dataframe/dimensions.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -72,26 +73,29 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "6"],
       [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Do not use any type assertions.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Do not use any type assertions.", "10"],
       [0, 0, 0, "Do not use any type assertions.", "11"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Do not use any type assertions.", "14"],
+      [0, 0, 0, "Do not use any type assertions.", "13"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
       [0, 0, 0, "Do not use any type assertions.", "15"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
       [0, 0, 0, "Do not use any type assertions.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Do not use any type assertions.", "19"],
+      [0, 0, 0, "Do not use any type assertions.", "18"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
       [0, 0, 0, "Do not use any type assertions.", "20"],
-      [0, 0, 0, "Do not use any type assertions.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
+      [0, 0, 0, "Do not use any type assertions.", "22"],
+      [0, 0, 0, "Do not use any type assertions.", "23"],
+      [0, 0, 0, "Do not use any type assertions.", "24"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "26"]
     ],
     "packages/grafana-data/src/datetime/datemath.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -273,7 +277,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/transformations/transformers/groupBy.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -285,9 +290,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
-    "packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "packages/grafana-data/src/transformations/transformers/merge.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -297,9 +299,7 @@ exports[`better eslint`] = {
     ],
     "packages/grafana-data/src/transformations/transformers/reduce.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "packages/grafana-data/src/types/OptionsUIRegistryBuilder.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -3287,8 +3287,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/search/service/bluge.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/search/service/sql.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -4585,10 +4584,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/jaeger/testResponse.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/jaeger/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -5120,15 +5116,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
-    "public/app/plugins/datasource/zipkin/utils/testData.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/datasource/zipkin/utils/testResponse.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/zipkin/utils/transforms.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -5796,7 +5786,9 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/panel/nodeGraph/utils.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/plugins/panel/piechart/PieChart.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
diff --git a/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts b/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
index a767faf0895..035edd46550 100644
--- a/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameJSON.test.ts
@@ -1,4 +1,3 @@
-import { ArrayVector } from '..';
 import { DataFrame, FieldType } from '../types/dataFrame';
 
 import { DataFrameJSON, dataFrameFromJSON, dataFrameToJSON } from './DataFrameJSON';
@@ -203,13 +202,13 @@ describe('DataFrame JSON', () => {
             name: 'time1',
             type: FieldType.time,
             config: {},
-            values: new ArrayVector([11, 12, 13]),
+            values: [11, 12, 13],
           },
           {
             name: 'time2',
             type: FieldType.time,
             config: {},
-            values: new ArrayVector([14, 15, 16]),
+            values: [14, 15, 16],
             nanos: [17, 18, 19],
           },
         ],
diff --git a/packages/grafana-data/src/dataframe/DataFrameJSON.ts b/packages/grafana-data/src/dataframe/DataFrameJSON.ts
index 47b64fe72b6..c56842b33b6 100644
--- a/packages/grafana-data/src/dataframe/DataFrameJSON.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameJSON.ts
@@ -1,5 +1,4 @@
 import { DataFrame, FieldType, FieldConfig, Labels, QueryResultMeta, Field } from '../types';
-import { ArrayVector } from '../vector';
 
 import { guessFieldTypeFromNameAndValue } from './processDataFrame';
 
@@ -203,7 +202,7 @@ export function dataFrameFromJSON(dto: DataFrameJSON): DataFrame {
       ...f,
       type: type ?? guessFieldType(f.name, buffer),
       config: f.config ?? {},
-      values: new ArrayVector(buffer),
+      values: buffer,
       // the presence of this prop is an optimization signal & lookup for consumers
       entities: entities ?? {},
     };
@@ -242,7 +241,7 @@ export function dataFrameToJSON(frame: DataFrame): DataFrameJSON {
     fields: frame.fields.map((f) => {
       const { values, nanos, state, display, ...sfield } = f;
       delete (sfield as any).entities;
-      data.values.push(values.toArray());
+      data.values.push(values);
 
       if (nanos != null) {
         allNanos.push(nanos);
diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.test.ts b/packages/grafana-data/src/dataframe/MutableDataFrame.test.ts
index a22ff61c746..e76f54d839d 100644
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.test.ts
@@ -15,15 +15,15 @@ describe('Reversing DataFrame', () => {
 
       const helper = new MutableDataFrame(frame);
 
-      expect(helper.fields[0].values.toArray()).toEqual([100, 200, 300]);
-      expect(helper.fields[1].values.toArray()).toEqual(['a', 'b', 'c']);
-      expect(helper.fields[2].values.toArray()).toEqual([1, 2, 3]);
+      expect(helper.fields[0].values).toEqual([100, 200, 300]);
+      expect(helper.fields[1].values).toEqual(['a', 'b', 'c']);
+      expect(helper.fields[2].values).toEqual([1, 2, 3]);
 
       helper.reverse();
 
-      expect(helper.fields[0].values.toArray()).toEqual([300, 200, 100]);
-      expect(helper.fields[1].values.toArray()).toEqual(['c', 'b', 'a']);
-      expect(helper.fields[2].values.toArray()).toEqual([3, 2, 1]);
+      expect(helper.fields[0].values).toEqual([300, 200, 100]);
+      expect(helper.fields[1].values).toEqual(['c', 'b', 'a']);
+      expect(helper.fields[2].values).toEqual([3, 2, 1]);
     });
   });
 });
@@ -39,7 +39,7 @@ describe('Apending DataFrame', () => {
     };
 
     const frame = new MutableDataFrame(dto);
-    expect(frame.fields[0].values.toArray()).toEqual([100, undefined, undefined]);
+    expect(frame.fields[0].values).toEqual([100, undefined, undefined]);
 
     // Set a value on the second row
     frame.set(1, { time: 200, name: 'BB', value: 20 });
diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.ts b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
index 5deccf1dac0..84a58ab6498 100644
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
@@ -2,16 +2,14 @@ import { isString } from 'lodash';
 
 import { QueryResultMeta } from '../types/data';
 import { Field, DataFrame, DataFrameDTO, FieldDTO, FieldType } from '../types/dataFrame';
-import { Vector } from '../types/vector';
 import { makeFieldParser } from '../utils/fieldParser';
-import { ArrayVector } from '../vector/ArrayVector';
 import { FunctionalVector } from '../vector/FunctionalVector';
 
 import { guessFieldTypeFromValue, guessFieldTypeForField, toDataFrameDTO } from './processDataFrame';
 
 export type MutableField<T = any> = Field<T>;
 
-type MutableVectorCreator = (buffer?: any[]) => Vector;
+type MutableVectorCreator = (buffer?: any[]) => any[];
 
 export const MISSING_VALUE = undefined; // Treated as connected in new graph panel
 
@@ -21,7 +19,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
   meta?: QueryResultMeta;
   fields: MutableField[] = [];
 
-  private first: Vector = new ArrayVector();
+  private first: any[] = [];
   private creator: MutableVectorCreator;
 
   constructor(source?: DataFrame | DataFrameDTO, creator?: MutableVectorCreator) {
@@ -31,7 +29,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
     this.creator = creator
       ? creator
       : (buffer?: any[]) => {
-          return new ArrayVector(buffer);
+          return buffer ?? [];
         };
 
     // Copy values from
@@ -78,11 +76,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
     let buffer: any[] | undefined = undefined;
 
     if (f.values) {
-      if (Array.isArray(f.values)) {
-        buffer = f.values;
-      } else {
-        buffer = (f.values as Vector).toArray();
-      }
+      buffer = f.values;
     }
 
     let type = f.type;
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index fa60304f871..c121388bae6 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -22,10 +22,8 @@ import {
   DataQueryResponseData,
   PanelData,
   LoadingState,
+  GraphSeriesValue,
 } from '../types/index';
-import { ArrayVector } from '../vector/ArrayVector';
-import { SortedVector } from '../vector/SortedVector';
-import { vectorToArray } from '../vector/vectorToArray';
 
 import { ArrayDataFrame } from './ArrayDataFrame';
 import { dataFrameFromJSON } from './DataFrameJSON';
@@ -38,7 +36,7 @@ function convertTableToDataFrame(table: TableData): DataFrame {
     return {
       name: text?.length ? text : c, // rename 'text' to the 'name' field
       config: (disp || {}) as FieldConfig,
-      values: new ArrayVector(),
+      values: [] as any[],
       type: type && Object.values(FieldType).includes(type as FieldType) ? (type as FieldType) : FieldType.other,
     };
   });
@@ -49,7 +47,7 @@ function convertTableToDataFrame(table: TableData): DataFrame {
 
   for (const row of table.rows) {
     for (let i = 0; i < fields.length; i++) {
-      fields[i].values.buffer.push(row[i]);
+      fields[i].values.push(row[i]);
     }
   }
 
@@ -87,7 +85,7 @@ function convertTimeSeriesToDataFrame(timeSeries: TimeSeries): DataFrame {
       name: TIME_SERIES_TIME_FIELD_NAME,
       type: FieldType.time,
       config: {},
-      values: new ArrayVector<number>(times),
+      values: times,
     },
     {
       name: TIME_SERIES_VALUE_FIELD_NAME,
@@ -95,7 +93,7 @@ function convertTimeSeriesToDataFrame(timeSeries: TimeSeries): DataFrame {
       config: {
         unit: timeSeries.unit,
       },
-      values: new ArrayVector<TimeSeriesValue>(values),
+      values: values,
       labels: timeSeries.tags,
     },
   ];
@@ -118,13 +116,13 @@ function convertTimeSeriesToDataFrame(timeSeries: TimeSeries): DataFrame {
  * to DataFrame.  See: https://github.com/grafana/grafana/issues/18528
  */
 function convertGraphSeriesToDataFrame(graphSeries: GraphSeriesXY): DataFrame {
-  const x = new ArrayVector();
-  const y = new ArrayVector();
+  const x: GraphSeriesValue[] = [];
+  const y: GraphSeriesValue[] = [];
 
   for (let i = 0; i < graphSeries.data.length; i++) {
     const row = graphSeries.data[i];
-    x.buffer.push(row[1]);
-    y.buffer.push(row[0]);
+    x.push(row[1]);
+    y.push(row[0]);
   }
 
   return {
@@ -145,7 +143,7 @@ function convertGraphSeriesToDataFrame(graphSeries: GraphSeriesXY): DataFrame {
         values: y,
       },
     ],
-    length: x.buffer.length,
+    length: x.length,
   };
 }
 
@@ -159,12 +157,12 @@ function convertJSONDocumentDataToDataFrame(timeSeries: TimeSeries): DataFrame {
         unit: timeSeries.unit,
         filterable: (timeSeries as any).filterable,
       },
-      values: new ArrayVector(),
+      values: [] as TimeSeriesValue[][],
     },
   ];
 
   for (const point of timeSeries.datapoints) {
-    fields[0].values.buffer.push(point);
+    fields[0].values.push(point);
   }
 
   return {
@@ -392,7 +390,7 @@ export const toLegacyResponseData = (frame: DataFrame): TimeSeries | TableData =
     return {
       alias: fields[0].name || frame.name,
       target: fields[0].name || frame.name,
-      datapoints: fields[0].values.toArray(),
+      datapoints: fields[0].values,
       filterable: fields[0].config ? fields[0].config.filterable : undefined,
       type: 'docs',
     } as TimeSeries;
@@ -436,7 +434,7 @@ export function sortDataFrame(data: DataFrame, sortIndex?: number, reverse = fal
     fields: data.fields.map((f) => {
       return {
         ...f,
-        values: new SortedVector(f.values, index),
+        values: f.values.map((v, i) => f.values[index[i]]),
       };
     }),
   };
@@ -449,11 +447,11 @@ export function reverseDataFrame(data: DataFrame): DataFrame {
   return {
     ...data,
     fields: data.fields.map((f) => {
-      const copy = [...f.values.toArray()];
-      copy.reverse();
+      const values = [...f.values];
+      values.reverse();
       return {
         ...f,
-        values: new ArrayVector(copy),
+        values,
       };
     }),
   };
@@ -480,11 +478,7 @@ export function toDataFrameDTO(data: DataFrame): DataFrameDTO {
 export function toFilteredDataFrameDTO(data: DataFrame, fieldPredicate?: (f: Field) => boolean): DataFrameDTO {
   const filteredFields = fieldPredicate ? data.fields.filter(fieldPredicate) : data.fields;
   const fields: FieldDTO[] = filteredFields.map((f) => {
-    let values = f.values.toArray();
-    // The byte buffers serialize like objects
-    if (values instanceof Float64Array) {
-      values = vectorToArray(f.values);
-    }
+    let values = f.values;
     return {
       name: f.name,
       type: f.type,
diff --git a/packages/grafana-data/src/field/displayProcessor.test.ts b/packages/grafana-data/src/field/displayProcessor.test.ts
index 415d383bed3..2997e8049d9 100644
--- a/packages/grafana-data/src/field/displayProcessor.test.ts
+++ b/packages/grafana-data/src/field/displayProcessor.test.ts
@@ -3,7 +3,6 @@ import { createTheme } from '../themes';
 import { FieldConfig, FieldType, ThresholdsMode } from '../types';
 import { DisplayProcessor, DisplayValue } from '../types/displayValue';
 import { MappingType, ValueMapping } from '../types/valueMapping';
-import { ArrayVector } from '../vector';
 
 import { getDisplayProcessor, getRawDisplayProcessor } from './displayProcessor';
 
@@ -548,7 +547,7 @@ describe('Date display options', () => {
       field: {
         type: FieldType.time,
         config: {},
-        values: new ArrayVector([Date.parse('2020-08-01T08:48:43.783337Z'), Date.parse('2020-08-01T08:49:15.123456Z')]),
+        values: [Date.parse('2020-08-01T08:48:43.783337Z'), Date.parse('2020-08-01T08:49:15.123456Z')],
       },
       theme: createTheme(),
     });
@@ -562,7 +561,7 @@ describe('Date display options', () => {
       field: {
         type: FieldType.time,
         config: {},
-        values: new ArrayVector([Date.parse('2020-08-01T08:49:15.123456Z'), Date.parse('2020-08-01T08:43:43.783337Z')]),
+        values: [Date.parse('2020-08-01T08:49:15.123456Z'), Date.parse('2020-08-01T08:43:43.783337Z')],
       },
       theme: createTheme(),
     });
@@ -578,7 +577,7 @@ describe('Date display options', () => {
         config: {
           unit: 'time:YYYY-MM-DD HH:mm',
         },
-        values: new ArrayVector([Date.parse('2020-08-01T08:48:43.783337Z'), Date.parse('2020-08-01T08:49:15.123456Z')]),
+        values: [Date.parse('2020-08-01T08:48:43.783337Z'), Date.parse('2020-08-01T08:49:15.123456Z')],
       },
       theme: createTheme(),
     });
diff --git a/packages/grafana-data/src/field/fieldColor.test.ts b/packages/grafana-data/src/field/fieldColor.test.ts
index 9652e91fb4e..a279429f997 100644
--- a/packages/grafana-data/src/field/fieldColor.test.ts
+++ b/packages/grafana-data/src/field/fieldColor.test.ts
@@ -1,6 +1,5 @@
 import { createTheme } from '../themes';
 import { Field, FieldColorModeId, FieldType } from '../types';
-import { ArrayVector } from '../vector/ArrayVector';
 
 import { fieldColorModeRegistry, FieldValueColorCalculator, getFieldSeriesColor } from './fieldColor';
 
@@ -8,7 +7,7 @@ function getTestField(mode: string, fixedColor?: string): Field {
   return {
     name: 'name',
     type: FieldType.number,
-    values: new ArrayVector(),
+    values: [],
     config: {
       color: {
         mode: mode,
@@ -54,7 +53,7 @@ describe('fieldColorModeRegistry', () => {
     field.config.color!.seriesBy = 'last';
     // min = -10, max = 10, last = 5
     // last percent 75%
-    field.values = new ArrayVector([0, -10, 5, 10, 2, 5]);
+    field.values = [0, -10, 5, 10, 2, 5];
 
     const color = getFieldSeriesColor(field, createTheme());
     const calcFn = getCalculator({ mode: 'continuous-GrYlRd' });
@@ -77,7 +76,7 @@ describe('fieldColorModeRegistry', () => {
 
 describe('getFieldSeriesColor', () => {
   const field = getTestField('continuous-GrYlRd');
-  field.values = new ArrayVector([0, -10, 5, 10, 2, 5]);
+  field.values = [0, -10, 5, 10, 2, 5];
 
   it('When color.seriesBy is last use that to calc series color', () => {
     field.config.color!.seriesBy = 'last';
diff --git a/packages/grafana-data/src/field/fieldOverrides.test.ts b/packages/grafana-data/src/field/fieldOverrides.test.ts
index c0295144ab1..db5c7d514ff 100644
--- a/packages/grafana-data/src/field/fieldOverrides.test.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.test.ts
@@ -17,7 +17,6 @@ import {
 } from '../types';
 import { locationUtil, Registry } from '../utils';
 import { mockStandardProperties } from '../utils/tests/mockStandardProperties';
-import { ArrayVector } from '../vector';
 
 import { FieldConfigOptionsRegistry } from './FieldConfigOptionsRegistry';
 import { getDisplayProcessor } from './displayProcessor';
@@ -1010,14 +1009,14 @@ describe('applyRawFieldOverrides', () => {
       const numberAsEpoc: Field = {
         name: 'numberAsEpoc',
         type: FieldType.number,
-        values: new ArrayVector([1599045551050]),
+        values: [1599045551050],
         config: getNumberFieldConfig(),
       };
 
       const numberWithDecimals: Field = {
         name: 'numberWithDecimals',
         type: FieldType.number,
-        values: new ArrayVector([3.14159265359]),
+        values: [3.14159265359],
         config: {
           ...getNumberFieldConfig(),
           decimals: 3,
@@ -1027,28 +1026,28 @@ describe('applyRawFieldOverrides', () => {
       const numberAsBoolean: Field = {
         name: 'numberAsBoolean',
         type: FieldType.number,
-        values: new ArrayVector([0]),
+        values: [0],
         config: getNumberFieldConfig(),
       };
 
       const boolean: Field = {
         name: 'boolean',
         type: FieldType.boolean,
-        values: new ArrayVector([0]),
+        values: [0],
         config: getEmptyConfig(),
       };
 
       const string: Field = {
         name: 'string',
         type: FieldType.boolean,
-        values: new ArrayVector(['A - string']),
+        values: ['A - string'],
         config: getEmptyConfig(),
       };
 
       const datetime: Field = {
         name: 'datetime',
         type: FieldType.time,
-        values: new ArrayVector([1599045551050]),
+        values: [1599045551050],
         config: {
           unit: 'dateTimeAsIso',
         },
diff --git a/packages/grafana-data/src/field/scale.test.ts b/packages/grafana-data/src/field/scale.test.ts
index 874d283fc44..9ba0cb6227b 100644
--- a/packages/grafana-data/src/field/scale.test.ts
+++ b/packages/grafana-data/src/field/scale.test.ts
@@ -1,6 +1,5 @@
 import { createTheme } from '../themes';
 import { ThresholdsMode, Field, FieldType, FieldColorModeId } from '../types';
-import { ArrayVector } from '../vector/ArrayVector';
 
 import { getScaleCalculator } from './scale';
 import { sortThresholds } from './thresholds';
@@ -17,7 +16,7 @@ describe('getScaleCalculator', () => {
       name: 'test',
       config: { thresholds: { mode: ThresholdsMode.Absolute, steps: sortThresholds(thresholds) } },
       type: FieldType.number,
-      values: new ArrayVector([0, 50, 100]),
+      values: [0, 50, 100],
     };
 
     const calc = getScaleCalculator(field, createTheme());
@@ -33,7 +32,7 @@ describe('getScaleCalculator', () => {
       name: 'test',
       config: {},
       type: FieldType.boolean,
-      values: new ArrayVector([true, false, true]),
+      values: [true, false, true],
     };
 
     const theme = createTheme();
@@ -55,7 +54,7 @@ describe('getScaleCalculator', () => {
       name: 'test',
       config: { color: { mode: FieldColorModeId.ContinuousGrYlRd } },
       type: FieldType.number,
-      values: new ArrayVector([1]),
+      values: [1],
     };
 
     const theme = createTheme();
diff --git a/packages/grafana-data/src/field/thresholds.test.ts b/packages/grafana-data/src/field/thresholds.test.ts
index 500aae9170a..77df5edf76e 100644
--- a/packages/grafana-data/src/field/thresholds.test.ts
+++ b/packages/grafana-data/src/field/thresholds.test.ts
@@ -1,5 +1,4 @@
 import { ThresholdsConfig, ThresholdsMode, FieldConfig, Threshold, Field, FieldType } from '../types';
-import { ArrayVector } from '../vector/ArrayVector';
 
 import { validateFieldConfig } from './fieldOverrides';
 import { sortThresholds, getActiveThreshold, getActiveThresholdForValue } from './thresholds';
@@ -50,7 +49,7 @@ describe('thresholds', () => {
       name: 'test',
       config: { thresholds: { mode: mode, steps: sortThresholds(steps) } },
       type: FieldType.number,
-      values: new ArrayVector([]),
+      values: [],
     };
     validateFieldConfig(field.config!);
     return getActiveThresholdForValue(field, value, percent);
diff --git a/packages/grafana-data/src/transformations/fieldReducer.test.ts b/packages/grafana-data/src/transformations/fieldReducer.test.ts
index dd925166384..1a30e1c3239 100644
--- a/packages/grafana-data/src/transformations/fieldReducer.test.ts
+++ b/packages/grafana-data/src/transformations/fieldReducer.test.ts
@@ -3,7 +3,6 @@ import { difference } from 'lodash';
 import { MutableDataFrame } from '../dataframe/MutableDataFrame';
 import { guessFieldTypeFromValue } from '../dataframe/processDataFrame';
 import { Field, FieldType } from '../types/index';
-import { ArrayVector } from '../vector/ArrayVector';
 
 import { fieldReducers, ReducerID, reduceField } from './fieldReducer';
 
@@ -15,11 +14,11 @@ function reduce(field: Field, id: string) {
 }
 
 function createField<T>(name: string, values?: T[], type?: FieldType): Field<T> {
-  const arr = new ArrayVector(values);
+  const arr = values ?? [];
   return {
     name,
     config: {},
-    type: type ? type : guessFieldTypeFromValue(arr.get(0)),
+    type: type ? type : guessFieldTypeFromValue(arr[0]),
     values: arr,
   };
 }
diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
index d6a29777257..ec1ce239664 100644
--- a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
+++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
@@ -1,6 +1,5 @@
 import { toDataFrame } from '../../dataframe/processDataFrame';
 import { FieldType, DataFrame } from '../../types';
-import { ArrayVector } from '../../vector';
 import { getFieldMatcher } from '../matchers';
 
 import { FieldMatcherID } from './ids';
@@ -401,12 +400,12 @@ describe('Field Regexp or Names Matcher', () => {
   it('Support fallback name matchers', () => {
     const frame: DataFrame = {
       fields: [
-        { name: 'time', type: FieldType.time, config: {}, values: new ArrayVector([1, 2]) },
+        { name: 'time', type: FieldType.time, config: {}, values: [1, 2] },
         {
           name: 'UP',
           type: FieldType.number,
           config: {},
-          values: new ArrayVector([1, 2]),
+          values: [1, 2],
           labels: { __name__: 'UP' },
         },
       ],
@@ -433,12 +432,12 @@ describe('Field Regexp or Names Matcher', () => {
 it('Support fallback multiple names matchers', () => {
   const frame: DataFrame = {
     fields: [
-      { name: 'time', type: FieldType.time, config: {}, values: new ArrayVector([1, 2]) },
+      { name: 'time', type: FieldType.time, config: {}, values: [1, 2] },
       {
         name: 'UP',
         type: FieldType.number,
         config: {},
-        values: new ArrayVector([1, 2]),
+        values: [1, 2],
         labels: { __name__: 'UP' },
       },
     ],
diff --git a/packages/grafana-data/src/transformations/transformDataFrame.test.ts b/packages/grafana-data/src/transformations/transformDataFrame.test.ts
index 8970f2f189d..04e2f58faf3 100644
--- a/packages/grafana-data/src/transformations/transformDataFrame.test.ts
+++ b/packages/grafana-data/src/transformations/transformDataFrame.test.ts
@@ -3,7 +3,6 @@ import { map } from 'rxjs';
 import { toDataFrame } from '../dataframe/processDataFrame';
 import { CustomTransformOperator, FieldType } from '../types';
 import { mockTransformationsRegistry } from '../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../vector/ArrayVector';
 
 import { ReducerID } from './fieldReducer';
 import { FrameMatcherID } from './matchers/ids';
@@ -31,7 +30,7 @@ const customTransform1: CustomTransformOperator = () => (source) => {
           fields: frame.fields.map((field) => {
             return {
               ...field,
-              values: new ArrayVector(field.values.toArray().map((v) => v / 100)),
+              values: field.values.map((v) => v / 100),
             };
           }),
         };
@@ -50,7 +49,7 @@ const customTransform2: CustomTransformOperator = () => (source) => {
           fields: frame.fields.map((field) => {
             return {
               ...field,
-              values: new ArrayVector(field.values.toArray().map((v) => v * 2)),
+              values: field.values.map((v) => v * 2),
             };
           }),
         };
diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.ts b/packages/grafana-data/src/transformations/transformers/calculateField.ts
index 1f1ac16eca9..8b29eb73c6c 100644
--- a/packages/grafana-data/src/transformations/transformers/calculateField.ts
+++ b/packages/grafana-data/src/transformations/transformers/calculateField.ts
@@ -5,7 +5,7 @@ import { getTimeField } from '../../dataframe/processDataFrame';
 import { getFieldDisplayName } from '../../field';
 import { DataFrame, DataTransformerInfo, Field, FieldType, NullValueMode, Vector } from '../../types';
 import { BinaryOperationID, binaryOperators } from '../../utils/binaryOperators';
-import { ArrayVector, BinaryOperationVector, ConstantVector, IndexVector } from '../../vector';
+import { BinaryOperationVector, ConstantVector, IndexVector } from '../../vector';
 import { AsNumberVector } from '../../vector/AsNumberVector';
 import { RowVector } from '../../vector/RowVector';
 import { doStandardCalcs, fieldReducers, ReducerID } from '../fieldReducer';
@@ -207,7 +207,7 @@ function getReduceRowCreator(options: ReduceOptions, allFrames: DataFrame[]): Va
       vals.push(val);
     }
 
-    return new ArrayVector(vals);
+    return vals;
   };
 }
 
diff --git a/packages/grafana-data/src/transformations/transformers/concat.ts b/packages/grafana-data/src/transformations/transformers/concat.ts
index e19728f0686..33cc1fe1871 100644
--- a/packages/grafana-data/src/transformations/transformers/concat.ts
+++ b/packages/grafana-data/src/transformations/transformers/concat.ts
@@ -2,7 +2,6 @@ import { map } from 'rxjs/operators';
 
 import { DataFrame, Field, TIME_SERIES_VALUE_FIELD_NAME } from '../../types/dataFrame';
 import { DataTransformerInfo } from '../../types/transformations';
-import { ArrayVector } from '../../vector';
 
 import { DataTransformerID } from './ids';
 
@@ -94,7 +93,7 @@ export function concatenateFields(data: DataFrame[], opts: ConcatenateTransforme
       values.length = maxLength;
       return {
         ...f,
-        values: new ArrayVector(values),
+        values: values,
       };
     });
   }
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
index 64cd6e05d6d..1ae56494b60 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe/processDataFrame';
 import { Field, FieldType } from '../../types/dataFrame';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 
 import {
   ensureTimeField,
@@ -18,13 +17,13 @@ describe('field convert type', () => {
     const stringTime = {
       name: 'proper dates',
       type: FieldType.string,
-      values: new ArrayVector([
+      values: [
         '2021-07-19 00:00:00.000',
         '2021-07-23 00:00:00.000',
         '2021-07-25 00:00:00.000',
         '2021-08-01 00:00:00.000',
         '2021-08-02 00:00:00.000',
-      ]),
+      ],
       config: {},
     };
 
@@ -32,7 +31,7 @@ describe('field convert type', () => {
     expect(timefield).toEqual({
       name: 'proper dates',
       type: FieldType.time,
-      values: new ArrayVector([1626674400000, 1627020000000, 1627192800000, 1627797600000, 1627884000000]),
+      values: [1626674400000, 1627020000000, 1627192800000, 1627797600000, 1627884000000],
       config: {},
     });
   });
@@ -42,13 +41,13 @@ describe('field convert type', () => {
     const yearFormat = {
       name: 'format to year',
       type: FieldType.string,
-      values: new ArrayVector([
+      values: [
         '2017-07-19 00:00:00.000',
         '2018-07-23 00:00:00.000',
         '2019-07-25 00:00:00.000',
         '2020-08-01 00:00:00.000',
         '2021-08-02 00:00:00.000',
-      ]),
+      ],
       config: {},
     };
 
@@ -56,7 +55,7 @@ describe('field convert type', () => {
     expect(timefield).toEqual({
       name: 'format to year',
       type: FieldType.time,
-      values: new ArrayVector([1483246800000, 1514782800000, 1546318800000, 1577854800000, 1609477200000]),
+      values: [1483246800000, 1514782800000, 1546318800000, 1577854800000, 1609477200000],
       config: {},
     });
   });
@@ -67,7 +66,7 @@ describe('field convert type', () => {
     const misformattedStrings = {
       name: 'misformatted dates',
       type: FieldType.string,
-      values: new ArrayVector(['2021/08-01 00:00.00:000', '2021/08/01 00.00-000', '2021/08-01 00:00.00:000']),
+      values: ['2021/08-01 00:00.00:000', '2021/08/01 00.00-000', '2021/08-01 00:00.00:000'],
       config: { unit: 'time' },
     };
 
@@ -75,7 +74,7 @@ describe('field convert type', () => {
     expect(timefield).toEqual({
       name: 'misformatted dates',
       type: FieldType.time,
-      values: new ArrayVector([null, null, null]),
+      values: [null, null, null],
       config: { unit: 'time' },
     });
   });
@@ -86,7 +85,7 @@ describe('field convert type', () => {
     const stringyNumbers = {
       name: 'stringy nums',
       type: FieldType.string,
-      values: new ArrayVector(['10', '12', '30', '14', '10']),
+      values: ['10', '12', '30', '14', '10'],
       config: {},
     };
 
@@ -95,7 +94,7 @@ describe('field convert type', () => {
     expect(numbers).toEqual({
       name: 'stringy nums',
       type: FieldType.number,
-      values: new ArrayVector([10, 12, 30, 14, 10]),
+      values: [10, 12, 30, 14, 10],
       config: {},
     });
   });
@@ -107,7 +106,7 @@ it('can convert strings with commas to numbers', () => {
   const stringyNumbers = {
     name: 'stringy nums',
     type: FieldType.string,
-    values: new ArrayVector(['1,000', '1,000,000']),
+    values: ['1,000', '1,000,000'],
     config: {},
   };
 
@@ -116,7 +115,7 @@ it('can convert strings with commas to numbers', () => {
   expect(numbers).toEqual({
     name: 'stringy nums',
     type: FieldType.number,
-    values: new ArrayVector([1000, 1000000]),
+    values: [1000, 1000000],
     config: {},
   });
 });
@@ -127,7 +126,7 @@ it('converts booleans to numbers', () => {
   const stringyNumbers = {
     name: 'booleans',
     type: FieldType.boolean,
-    values: new ArrayVector([true, false]),
+    values: [true, false],
     config: {},
   };
 
@@ -136,7 +135,7 @@ it('converts booleans to numbers', () => {
   expect(numbers).toEqual({
     name: 'booleans',
     type: FieldType.number,
-    values: new ArrayVector([1, 0]),
+    values: [1, 0],
     config: {},
   });
 });
@@ -382,7 +381,7 @@ describe('ensureTimeField', () => {
       config: {},
       name: 'proper dates',
       type: FieldType.time,
-      values: new ArrayVector([1626674400000, 1627020000000, 1627192800000, 1627797600000, 1627884000000]),
+      values: [1626674400000, 1627020000000, 1627192800000, 1627797600000, 1627884000000],
     });
   });
 });
@@ -396,14 +395,14 @@ describe('fieldToTimeField', () => {
       config: {},
       name: 'ISO 8601 date strings',
       type: FieldType.time,
-      values: new ArrayVector(['2021-11-11T19:45:00Z']),
+      values: ['2021-11-11T19:45:00Z'],
     };
 
     expect(fieldToTimeField(stringTimeField)).toEqual({
       config: {},
       name: 'ISO 8601 date strings',
       type: FieldType.time,
-      values: new ArrayVector([1636659900000]),
+      values: [1636659900000],
     });
   });
 
@@ -412,7 +411,7 @@ describe('fieldToTimeField', () => {
       config: {},
       name: 'ISO 8601 date strings',
       type: FieldType.time,
-      values: new ArrayVector([
+      values: [
         '2021-11-11T19:45:00+05:30',
         '2021-11-11T19:45:00-05:30',
         '2021-11-11T19:45:00+0530',
@@ -421,17 +420,17 @@ describe('fieldToTimeField', () => {
         '2021-11-11T19:45:00.0000000000-0530',
         '2021-11-11T19:45:00.000Z',
         '2021-11-11T19:45:00.0000000000Z',
-      ]),
+      ],
     };
 
     expect(fieldToTimeField(stringTimeField)).toEqual({
       config: {},
       name: 'ISO 8601 date strings',
       type: FieldType.time,
-      values: new ArrayVector([
+      values: [
         1636640100000, 1636679700000, 1636640100000, 1636679700000, 1636640100000, 1636679700000, 1636659900000,
         1636659900000,
-      ]),
+      ],
     });
   });
 });
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
index 25b9d04076b..92d9703e925 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
@@ -3,7 +3,6 @@ import { map } from 'rxjs/operators';
 import { dateTimeParse } from '../../datetime';
 import { SynchronousDataTransformerInfo } from '../../types';
 import { DataFrame, EnumFieldConfig, Field, FieldType } from '../../types/dataFrame';
-import { ArrayVector } from '../../vector';
 import { fieldMatchers } from '../matchers';
 import { FieldMatcherID } from '../matchers/ids';
 
@@ -136,7 +135,7 @@ export function fieldToTimeField(field: Field, dateFormat?: string): Field {
   return {
     ...field,
     type: FieldType.time,
-    values: new ArrayVector(timeValues),
+    values: timeValues,
   };
 }
 
@@ -162,7 +161,7 @@ function fieldToNumberField(field: Field): Field {
   return {
     ...field,
     type: FieldType.number,
-    values: new ArrayVector(numValues),
+    values: numValues,
   };
 }
 
@@ -176,7 +175,7 @@ function fieldToBooleanField(field: Field): Field {
   return {
     ...field,
     type: FieldType.boolean,
-    values: new ArrayVector(booleanValues),
+    values: booleanValues,
   };
 }
 
@@ -199,7 +198,7 @@ function fieldToStringField(field: Field, dateFormat?: string): Field {
   return {
     ...field,
     type: FieldType.string,
-    values: new ArrayVector(values),
+    values: values,
   };
 }
 
@@ -217,7 +216,7 @@ function fieldToComplexField(field: Field): Field {
   return {
     ...field,
     type: FieldType.other,
-    values: new ArrayVector(complexValues),
+    values: complexValues,
   };
 }
 
@@ -273,6 +272,6 @@ function fieldToEnumField(field: Field, cfg?: EnumFieldConfig): Field {
       },
     },
     type: FieldType.enum,
-    values: new ArrayVector(enumValues),
+    values: enumValues,
   };
 }
diff --git a/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts b/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts
index 96fd6b4dae0..37e836f38e2 100644
--- a/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe/processDataFrame';
 import { DataTransformerConfig, FieldType, MatcherConfig } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { ValueMatcherID } from '../matchers/ids';
 import { BasicValueMatcherOptions } from '../matchers/valueMatchers/types';
 import { transformDataFrame } from '../transformDataFrame';
@@ -18,8 +17,8 @@ const seriesAWithSingleField = toDataFrame({
   name: 'A',
   length: 7,
   fields: [
-    { name: 'time', type: FieldType.time, values: new ArrayVector([1000, 2000, 3000, 4000, 5000, 6000, 7000]) },
-    { name: 'numbers', type: FieldType.number, values: new ArrayVector([1, 2, 3, 4, 5, 6, 7]) },
+    { name: 'time', type: FieldType.time, values: [1000, 2000, 3000, 4000, 5000, 6000, 7000] },
+    { name: 'numbers', type: FieldType.number, values: [1, 2, 3, 4, 5, 6, 7] },
   ],
 });
 
@@ -56,13 +55,13 @@ describe('FilterByValue transformer', () => {
         {
           name: 'time',
           type: FieldType.time,
-          values: new ArrayVector([6000, 7000]),
+          values: [6000, 7000],
           state: {},
         },
         {
           name: 'numbers',
           type: FieldType.number,
-          values: new ArrayVector([6, 7]),
+          values: [6, 7],
           state: {},
         },
       ]);
@@ -97,13 +96,13 @@ describe('FilterByValue transformer', () => {
         {
           name: 'time',
           type: FieldType.time,
-          values: new ArrayVector([1000, 2000, 3000, 4000, 5000]),
+          values: [1000, 2000, 3000, 4000, 5000],
           state: {},
         },
         {
           name: 'numbers',
           type: FieldType.number,
-          values: new ArrayVector([1, 2, 3, 4, 5]),
+          values: [1, 2, 3, 4, 5],
           state: {},
         },
       ]);
@@ -147,13 +146,13 @@ describe('FilterByValue transformer', () => {
         {
           name: 'time',
           type: FieldType.time,
-          values: new ArrayVector([1000, 2000, 3000, 4000, 7000]),
+          values: [1000, 2000, 3000, 4000, 7000],
           state: {},
         },
         {
           name: 'numbers',
           type: FieldType.number,
-          values: new ArrayVector([1, 2, 3, 4, 7]),
+          values: [1, 2, 3, 4, 7],
           state: {},
         },
       ]);
@@ -197,13 +196,13 @@ describe('FilterByValue transformer', () => {
         {
           name: 'time',
           type: FieldType.time,
-          values: new ArrayVector([4000, 5000]),
+          values: [4000, 5000],
           state: {},
         },
         {
           name: 'numbers',
           type: FieldType.number,
-          values: new ArrayVector([4, 5]),
+          values: [4, 5],
           state: {},
         },
       ]);
diff --git a/packages/grafana-data/src/transformations/transformers/filterByValue.ts b/packages/grafana-data/src/transformations/transformers/filterByValue.ts
index 295316dee78..7a8941a72ae 100644
--- a/packages/grafana-data/src/transformations/transformers/filterByValue.ts
+++ b/packages/grafana-data/src/transformations/transformers/filterByValue.ts
@@ -3,7 +3,6 @@ import { map } from 'rxjs/operators';
 import { getFieldDisplayName } from '../../field/fieldState';
 import { DataFrame, Field } from '../../types/dataFrame';
 import { DataTransformerInfo, MatcherConfig } from '../../types/transformations';
-import { ArrayVector } from '../../vector/ArrayVector';
 import { getValueMatcher } from '../matchers';
 
 import { DataTransformerID } from './ids';
@@ -114,7 +113,7 @@ export const filterByValueTransformer: DataTransformerInfo<FilterByValueTransfor
             // We keep field config, but clean the state as it's being recalculated when the field overrides are applied
             fields.push({
               ...field,
-              values: new ArrayVector(buffer),
+              values: buffer,
               state: {},
             });
           }
diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.test.ts b/packages/grafana-data/src/transformations/transformers/groupBy.test.ts
index 3fa11579797..d0b07197ce0 100644
--- a/packages/grafana-data/src/transformations/transformers/groupBy.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupBy.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe/processDataFrame';
 import { DataTransformerConfig, Field, FieldType } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { ReducerID } from '../fieldReducer';
 import { transformDataFrame } from '../transformDataFrame';
 
@@ -69,7 +68,7 @@ describe('GroupBy transformer', () => {
         {
           name: 'message',
           type: FieldType.string,
-          values: new ArrayVector(['one', 'two', 'three']),
+          values: ['one', 'two', 'three'],
           config: {},
         },
       ];
@@ -110,13 +109,13 @@ describe('GroupBy transformer', () => {
         {
           name: 'message',
           type: FieldType.string,
-          values: new ArrayVector(['one', 'two', 'three']),
+          values: ['one', 'two', 'three'],
           config: {},
         },
         {
           name: 'values (sum)',
           type: FieldType.number,
-          values: new ArrayVector([1, 4, 9]),
+          values: [1, 4, 9],
           config: {},
         },
       ];
@@ -161,25 +160,25 @@ describe('GroupBy transformer', () => {
         {
           name: 'message',
           type: FieldType.string,
-          values: new ArrayVector(['one', 'two', 'three']),
+          values: ['one', 'two', 'three'],
           config: {},
         },
         {
           name: 'time (count)',
           type: FieldType.number,
-          values: new ArrayVector([1, 2, 3]),
+          values: [1, 2, 3],
           config: {},
         },
         {
           name: 'time (last)',
           type: FieldType.time,
-          values: new ArrayVector([3000, 5000, 8000]),
+          values: [3000, 5000, 8000],
           config: {},
         },
         {
           name: 'values (sum)',
           type: FieldType.number,
-          values: new ArrayVector([1, 4, 9]),
+          values: [1, 4, 9],
           config: {},
         },
       ];
@@ -230,13 +229,13 @@ describe('GroupBy transformer', () => {
         {
           name: 'message',
           type: FieldType.string,
-          values: new ArrayVector(['one', 'two', 'three']),
+          values: ['one', 'two', 'three'],
           config: {},
         },
         {
           name: 'values (sum)',
           type: FieldType.number,
-          values: new ArrayVector([1, 4, 9]),
+          values: [1, 4, 9],
           config: {},
         },
       ];
@@ -245,13 +244,13 @@ describe('GroupBy transformer', () => {
         {
           name: 'message',
           type: FieldType.string,
-          values: new ArrayVector(['one', 'two', 'three']),
+          values: ['one', 'two', 'three'],
           config: {},
         },
         {
           name: 'values (sum)',
           type: FieldType.number,
-          values: new ArrayVector([0, 7, 8]),
+          values: [0, 7, 8],
           config: {},
         },
       ];
@@ -292,13 +291,13 @@ describe('GroupBy transformer', () => {
         {
           name: 'message',
           type: FieldType.string,
-          values: new ArrayVector(['500', '404', 'one', 'two', '200']),
+          values: ['500', '404', 'one', 'two', '200'],
           config: {},
         },
         {
           name: 'values (sum)',
           type: FieldType.number,
-          values: new ArrayVector([1, 4, 6, 3, 4]),
+          values: [1, 4, 6, 3, 4],
           config: {},
         },
       ];
diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.ts b/packages/grafana-data/src/transformations/transformers/groupBy.ts
index 1c95825d529..3c60451cc20 100644
--- a/packages/grafana-data/src/transformations/transformers/groupBy.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupBy.ts
@@ -5,7 +5,6 @@ import { guessFieldTypeForField } from '../../dataframe/processDataFrame';
 import { getFieldDisplayName } from '../../field/fieldState';
 import { DataFrame, Field, FieldType } from '../../types/dataFrame';
 import { DataTransformerInfo } from '../../types/transformations';
-import { ArrayVector } from '../../vector/ArrayVector';
 import { reduceField, ReducerID } from '../fieldReducer';
 
 import { DataTransformerID } from './ids';
@@ -81,7 +80,7 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
                   name: fieldName,
                   type: field.type,
                   config: { ...field.config },
-                  values: new ArrayVector(),
+                  values: [],
                 };
               }
 
@@ -92,7 +91,7 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
           const fields: Field[] = [];
 
           for (const field of groupByFields) {
-            const values = new ArrayVector();
+            const values: any[] = [];
             const fieldName = getFieldDisplayName(field);
 
             valuesByGroupKey.forEach((value) => {
@@ -137,7 +136,7 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
             for (const aggregation of aggregations) {
               const aggregationField: Field = {
                 name: `${fieldName} (${aggregation})`,
-                values: new ArrayVector(valuesByAggregation[aggregation]),
+                values: valuesByAggregation[aggregation],
                 type: FieldType.other,
                 config: {},
               };
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.test.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.test.ts
index 781d2401095..81a8c670931 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe';
 import { DataTransformerConfig, FieldType, Field, SpecialValue } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { transformDataFrame } from '../transformDataFrame';
 
 import { GroupingToMatrixTransformerOptions, groupingToMatrixTransformer } from './groupingToMatrix';
@@ -32,25 +31,25 @@ describe('Grouping to Matrix', () => {
         {
           name: 'Time\\Time',
           type: FieldType.string,
-          values: new ArrayVector([1000, 1001, 1002]),
+          values: [1000, 1001, 1002],
           config: {},
         },
         {
           name: '1000',
           type: FieldType.number,
-          values: new ArrayVector([1, '', '']),
+          values: [1, '', ''],
           config: {},
         },
         {
           name: '1001',
           type: FieldType.number,
-          values: new ArrayVector(['', 2, '']),
+          values: ['', 2, ''],
           config: {},
         },
         {
           name: '1002',
           type: FieldType.number,
-          values: new ArrayVector(['', '', 3]),
+          values: ['', '', 3],
           config: {},
         },
       ];
@@ -84,19 +83,19 @@ describe('Grouping to Matrix', () => {
         {
           name: 'Row\\Column',
           type: FieldType.string,
-          values: new ArrayVector(['R1', 'R2']),
+          values: ['R1', 'R2'],
           config: {},
         },
         {
           name: 'C1',
           type: FieldType.number,
-          values: new ArrayVector([1, 4]),
+          values: [1, 4],
           config: {},
         },
         {
           name: 'C2',
           type: FieldType.number,
-          values: new ArrayVector([5, '']),
+          values: [5, ''],
           config: {},
         },
       ];
@@ -127,19 +126,19 @@ describe('Grouping to Matrix', () => {
         {
           name: 'Time\\Time',
           type: FieldType.string,
-          values: new ArrayVector([1000, 1001]),
+          values: [1000, 1001],
           config: {},
         },
         {
           name: '1000',
           type: FieldType.number,
-          values: new ArrayVector([1, null]),
+          values: [1, null],
           config: {},
         },
         {
           name: '1001',
           type: FieldType.number,
-          values: new ArrayVector([null, 2]),
+          values: [null, 2],
           config: {},
         },
       ];
diff --git a/packages/grafana-data/src/transformations/transformers/histogram.ts b/packages/grafana-data/src/transformations/transformers/histogram.ts
index c0da943552a..9fddca9a308 100644
--- a/packages/grafana-data/src/transformations/transformers/histogram.ts
+++ b/packages/grafana-data/src/transformations/transformers/histogram.ts
@@ -5,7 +5,6 @@ import { createTheme, GrafanaTheme2 } from '../../themes';
 import { DataFrameType, SynchronousDataTransformerInfo } from '../../types';
 import { DataFrame, Field, FieldConfig, FieldType } from '../../types/dataFrame';
 import { roundDecimals } from '../../utils';
-import { ArrayVector } from '../../vector/ArrayVector';
 
 import { DataTransformerID } from './ids';
 import { AlignedData, join } from './joinDataFrames';
@@ -158,7 +157,7 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine
     xMax = {
       ...xMin,
       name: histogramFrameBucketMaxFieldName,
-      values: new ArrayVector(vals.map((v) => v + bucketSize)),
+      values: vals.map((v) => v + bucketSize),
     };
   }
 
@@ -169,7 +168,7 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine
     xMin = {
       ...xMax,
       name: histogramFrameBucketMinFieldName,
-      values: new ArrayVector(vals.map((v) => v - bucketSize)),
+      values: vals.map((v) => v - bucketSize),
     };
   }
 
@@ -291,7 +290,7 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
 
   const xMin: Field = {
     name: histogramFrameBucketMinFieldName,
-    values: new ArrayVector(joinedHists[0]),
+    values: joinedHists[0],
     type: FieldType.number,
     state: undefined,
     config:
@@ -305,7 +304,7 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
   const xMax = {
     ...xMin,
     name: histogramFrameBucketMaxFieldName,
-    values: new ArrayVector(joinedHists[0].map((v) => v + bucketSize!)),
+    values: joinedHists[0].map((v) => v + bucketSize!),
   };
 
   if (options?.combine) {
@@ -319,14 +318,14 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
       {
         ...counts[0],
         name: 'count',
-        values: new ArrayVector(vals),
+        values: vals,
         type: FieldType.number,
         state: undefined,
       },
     ];
   } else {
     counts.forEach((field, i) => {
-      field.values = new ArrayVector(joinedHists[i + 1]);
+      field.values = joinedHists[i + 1];
     });
   }
 
diff --git a/packages/grafana-data/src/transformations/transformers/joinByField.test.ts b/packages/grafana-data/src/transformations/transformers/joinByField.test.ts
index 1a1026017b3..94208ba43fc 100644
--- a/packages/grafana-data/src/transformations/transformers/joinByField.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinByField.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe';
 import { FieldType, DataTransformerConfig } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { transformDataFrame } from '../transformDataFrame';
 
 import { DataTransformerID } from './ids';
@@ -257,9 +256,9 @@ describe('JOIN Transformer', () => {
         },
       };
 
-      everySecondSeries.fields[0].values = new ArrayVector(everySecondSeries.fields[0].values.toArray().reverse());
-      everySecondSeries.fields[1].values = new ArrayVector(everySecondSeries.fields[1].values.toArray().reverse());
-      everySecondSeries.fields[2].values = new ArrayVector(everySecondSeries.fields[2].values.toArray().reverse());
+      everySecondSeries.fields[0].values = everySecondSeries.fields[0].values.reverse();
+      everySecondSeries.fields[1].values = everySecondSeries.fields[1].values.reverse();
+      everySecondSeries.fields[2].values = everySecondSeries.fields[2].values.reverse();
 
       await expect(transformDataFrame([cfg], [everySecondSeries, everyOtherSecondSeries])).toEmitValuesWith(
         (received) => {
@@ -771,9 +770,9 @@ describe('JOIN Transformer', () => {
         },
       };
 
-      seriesA.fields[0].values = new ArrayVector(seriesA.fields[0].values.toArray().reverse());
-      seriesA.fields[1].values = new ArrayVector(seriesA.fields[1].values.toArray().reverse());
-      seriesA.fields[2].values = new ArrayVector(seriesA.fields[2].values.toArray().reverse());
+      seriesA.fields[0].values = seriesA.fields[0].values.reverse();
+      seriesA.fields[1].values = seriesA.fields[1].values.reverse();
+      seriesA.fields[2].values = seriesA.fields[2].values.reverse();
 
       await expect(transformDataFrame([cfg], [seriesA, seriesB])).toEmitValuesWith((received) => {
         const data = received[0];
diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
index 9c3b030ea28..e25d6e3bd6f 100644
--- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe/processDataFrame';
 import { FieldType } from '../../types/dataFrame';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 
 import { calculateFieldTransformer } from './calculateField';
 import { JoinMode } from './joinByField';
@@ -321,42 +320,40 @@ describe('align frames', () => {
 
   describe('check ascending data', () => {
     it('simple ascending', () => {
-      const v = new ArrayVector([1, 2, 3, 4, 5]);
+      const v = [1, 2, 3, 4, 5];
       expect(isLikelyAscendingVector(v)).toBeTruthy();
     });
     it('simple ascending with null', () => {
-      const v = new ArrayVector([null, 2, 3, 4, null]);
+      const v = [null, 2, 3, 4, null];
       expect(isLikelyAscendingVector(v)).toBeTruthy();
     });
     it('single value', () => {
-      const v = new ArrayVector([null, null, null, 4, null]);
+      const v = [null, null, null, 4, null];
       expect(isLikelyAscendingVector(v)).toBeTruthy();
-      expect(isLikelyAscendingVector(new ArrayVector([4]))).toBeTruthy();
-      expect(isLikelyAscendingVector(new ArrayVector([] as any[]))).toBeTruthy();
+      expect(isLikelyAscendingVector([4])).toBeTruthy();
+      expect(isLikelyAscendingVector([])).toBeTruthy();
     });
 
     it('middle values', () => {
-      const v = new ArrayVector([null, null, 5, 4, null]);
+      const v = [null, null, 5, 4, null];
       expect(isLikelyAscendingVector(v)).toBeFalsy();
     });
 
     it('decending', () => {
-      expect(isLikelyAscendingVector(new ArrayVector([7, 6, null]))).toBeFalsy();
-      expect(isLikelyAscendingVector(new ArrayVector([7, 8, 6]))).toBeFalsy();
+      expect(isLikelyAscendingVector([7, 6, null])).toBeFalsy();
+      expect(isLikelyAscendingVector([7, 8, 6])).toBeFalsy();
     });
 
     it('ascending first/last', () => {
-      expect(isLikelyAscendingVector(new ArrayVector([10, 20, 30, 5, 15, 7, 43, 29, 11]), 3)).toBeFalsy();
-      expect(
-        isLikelyAscendingVector(new ArrayVector([null, 10, 20, 30, 5, null, 15, 7, 43, 29, 11, null]), 3)
-      ).toBeFalsy();
+      expect(isLikelyAscendingVector([10, 20, 30, 5, 15, 7, 43, 29, 11], 3)).toBeFalsy();
+      expect(isLikelyAscendingVector([null, 10, 20, 30, 5, null, 15, 7, 43, 29, 11, null], 3)).toBeFalsy();
     });
 
     it('null stuffs', () => {
-      expect(isLikelyAscendingVector(new ArrayVector([null, null, 1]), 3)).toBeTruthy();
-      expect(isLikelyAscendingVector(new ArrayVector([1, null, null]), 3)).toBeTruthy();
-      expect(isLikelyAscendingVector(new ArrayVector([null, null, null]), 3)).toBeTruthy();
-      expect(isLikelyAscendingVector(new ArrayVector([null, 1, null]), 3)).toBeTruthy();
+      expect(isLikelyAscendingVector([null, null, 1], 3)).toBeTruthy();
+      expect(isLikelyAscendingVector([1, null, null], 3)).toBeTruthy();
+      expect(isLikelyAscendingVector([null, null, null], 3)).toBeTruthy();
+      expect(isLikelyAscendingVector([null, 1, null], 3)).toBeTruthy();
     });
   });
 });
diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
index 767161d2f9a..e765f93a859 100644
--- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
@@ -2,7 +2,6 @@ import intersect from 'fast_array_intersect';
 
 import { getTimeField, sortDataFrame } from '../../dataframe';
 import { DataFrame, Field, FieldMatcher, FieldType, Vector } from '../../types';
-import { ArrayVector } from '../../vector';
 import { fieldMatchers } from '../matchers';
 import { FieldMatcherID } from '../matchers/ids';
 
@@ -227,7 +226,7 @@ export function joinDataFrames(options: JoinOptions): DataFrame | undefined {
     length: joined[0].length,
     fields: originalFields.map((f, index) => ({
       ...f,
-      values: new ArrayVector(joined[index]),
+      values: joined[index],
     })),
   };
 }
@@ -352,7 +351,7 @@ export function join(tables: AlignedData[], nullModes?: number[][], mode: JoinMo
 
 // Test a few samples to see if the values are ascending
 // Only exported for tests
-export function isLikelyAscendingVector(data: Vector, samples = 50) {
+export function isLikelyAscendingVector(data: Vector | [], samples = 50) {
   const len = data.length;
 
   // empty or single value
@@ -364,11 +363,11 @@ export function isLikelyAscendingVector(data: Vector, samples = 50) {
   let firstIdx = 0;
   let lastIdx = len - 1;
 
-  while (firstIdx <= lastIdx && data.get(firstIdx) == null) {
+  while (firstIdx <= lastIdx && data[firstIdx] == null) {
     firstIdx++;
   }
 
-  while (lastIdx >= firstIdx && data.get(lastIdx) == null) {
+  while (lastIdx >= firstIdx && data[lastIdx] == null) {
     lastIdx--;
   }
 
@@ -379,8 +378,8 @@ export function isLikelyAscendingVector(data: Vector, samples = 50) {
 
   const stride = Math.max(1, Math.floor((lastIdx - firstIdx + 1) / samples));
 
-  for (let prevVal = data.get(firstIdx), i = firstIdx + stride; i <= lastIdx; i += stride) {
-    const v = data.get(i);
+  for (let prevVal = data[firstIdx], i = firstIdx + stride; i <= lastIdx; i += stride) {
+    const v = data[i];
 
     if (v != null) {
       if (v <= prevVal) {
diff --git a/packages/grafana-data/src/transformations/transformers/labelsToFields.ts b/packages/grafana-data/src/transformations/transformers/labelsToFields.ts
index 1bdb30df52c..d785120c85b 100644
--- a/packages/grafana-data/src/transformations/transformers/labelsToFields.ts
+++ b/packages/grafana-data/src/transformations/transformers/labelsToFields.ts
@@ -2,7 +2,6 @@ import { map } from 'rxjs/operators';
 
 import { getFieldDisplayName } from '../..';
 import { DataFrame, Field, FieldType, SynchronousDataTransformerInfo } from '../../types';
-import { ArrayVector } from '../../vector';
 
 import { DataTransformerID } from './ids';
 
@@ -83,7 +82,7 @@ export const labelsToFieldsTransformer: SynchronousDataTransformerInfo<LabelsToF
           newFields.push({
             name: name,
             type: FieldType.string,
-            values: new ArrayVector(values),
+            values: values,
             config: {},
           });
         }
@@ -123,8 +122,8 @@ function convertLabelsToRows(data: DataFrame[], keepLabels?: string[]): DataFram
             ...frame,
             name: getFieldDisplayName(field, frame, data),
             fields: [
-              { name: 'label', type: FieldType.string, config: {}, values: new ArrayVector(keys) },
-              { name: 'value', type: FieldType.string, config: {}, values: new ArrayVector(vals) },
+              { name: 'label', type: FieldType.string, config: {}, values: keys },
+              { name: 'value', type: FieldType.string, config: {}, values: vals },
             ],
             length: vals.length,
           });
diff --git a/packages/grafana-data/src/transformations/transformers/limit.test.ts b/packages/grafana-data/src/transformations/transformers/limit.test.ts
index 93228e70523..6608646b986 100644
--- a/packages/grafana-data/src/transformations/transformers/limit.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/limit.test.ts
@@ -3,7 +3,6 @@ import { DataTransformerConfig } from '@grafana/data';
 import { toDataFrame } from '../../dataframe/processDataFrame';
 import { Field, FieldType } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { transformDataFrame } from '../transformDataFrame';
 
 import { DataTransformerID } from './ids';
@@ -37,19 +36,19 @@ describe('Limit transformer', () => {
         {
           name: 'time',
           type: FieldType.time,
-          values: new ArrayVector([3000, 4000, 5000]),
+          values: [3000, 4000, 5000],
           config: {},
         },
         {
           name: 'message',
           type: FieldType.string,
-          values: new ArrayVector(['one', 'two', 'two']),
+          values: ['one', 'two', 'two'],
           config: {},
         },
         {
           name: 'values',
           type: FieldType.number,
-          values: new ArrayVector([1, 2, 2]),
+          values: [1, 2, 2],
           config: {},
         },
       ];
@@ -81,19 +80,19 @@ describe('Limit transformer', () => {
         {
           name: 'time',
           type: FieldType.time,
-          values: new ArrayVector([3000, 4000, 5000, 6000, 7000, 8000]),
+          values: [3000, 4000, 5000, 6000, 7000, 8000],
           config: {},
         },
         {
           name: 'message',
           type: FieldType.string,
-          values: new ArrayVector(['one', 'two', 'two', 'three', 'three', 'three']),
+          values: ['one', 'two', 'two', 'three', 'three', 'three'],
           config: {},
         },
         {
           name: 'values',
           type: FieldType.number,
-          values: new ArrayVector([1, 2, 2, 3, 3, 3]),
+          values: [1, 2, 2, 3, 3, 3],
           config: {},
         },
       ];
diff --git a/packages/grafana-data/src/transformations/transformers/limit.ts b/packages/grafana-data/src/transformations/transformers/limit.ts
index f0bfd04fa6c..5a2f5639639 100644
--- a/packages/grafana-data/src/transformations/transformers/limit.ts
+++ b/packages/grafana-data/src/transformations/transformers/limit.ts
@@ -1,7 +1,6 @@
 import { map } from 'rxjs/operators';
 
 import { DataTransformerInfo } from '../../types';
-import { ArrayVector } from '../../vector/ArrayVector';
 
 import { DataTransformerID } from './ids';
 
@@ -28,10 +27,9 @@ export const limitTransformer: DataTransformerInfo<LimitTransformerOptions> = {
             return {
               ...frame,
               fields: frame.fields.map((f) => {
-                const vals = f.values.toArray();
                 return {
                   ...f,
-                  values: new ArrayVector(vals.slice(0, limitFieldMatch)),
+                  values: f.values.slice(0, limitFieldMatch),
                 };
               }),
               length: limitFieldMatch,
diff --git a/packages/grafana-data/src/transformations/transformers/merge.test.ts b/packages/grafana-data/src/transformations/transformers/merge.test.ts
index 30c38aacd80..e379043ff14 100644
--- a/packages/grafana-data/src/transformations/transformers/merge.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/merge.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe';
 import { DataTransformerConfig, DisplayProcessor, Field, FieldType } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { transformDataFrame } from '../transformDataFrame';
 
 import { DataTransformerID } from './ids';
@@ -592,7 +591,7 @@ const createField = (
   config = {},
   display?: DisplayProcessor
 ): Field => {
-  return { name, type, values: new ArrayVector(values), config, labels: undefined, display };
+  return { name, type, values: values, config, labels: undefined, display };
 };
 
 const unwrap = (fields: Field[]): Field[] => {
diff --git a/packages/grafana-data/src/transformations/transformers/merge.ts b/packages/grafana-data/src/transformations/transformers/merge.ts
index 55185c0756d..eb4c8933d45 100644
--- a/packages/grafana-data/src/transformations/transformers/merge.ts
+++ b/packages/grafana-data/src/transformations/transformers/merge.ts
@@ -4,7 +4,6 @@ import { map } from 'rxjs/operators';
 import { MutableDataFrame } from '../../dataframe';
 import { DataFrame, Field } from '../../types/dataFrame';
 import { DataTransformerInfo } from '../../types/transformations';
-import { ArrayVector } from '../../vector/ArrayVector';
 
 import { DataTransformerID } from './ids';
 
@@ -117,7 +116,7 @@ export const mergeTransformer: DataTransformerInfo<MergeTransformerOptions> = {
 const copyFieldStructure = (field: Field): Field => {
   return {
     ...omit(field, ['values', 'state', 'labels', 'config']),
-    values: new ArrayVector(),
+    values: [],
     config: {
       ...omit(field.config, 'displayName'),
     },
diff --git a/packages/grafana-data/src/transformations/transformers/order.test.ts b/packages/grafana-data/src/transformations/transformers/order.test.ts
index f5b5624e55d..f123469c7da 100644
--- a/packages/grafana-data/src/transformations/transformers/order.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/order.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe';
 import { FieldType, DataTransformerConfig } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { transformDataFrame } from '../transformDataFrame';
 
 import { DataTransformerID } from './ids';
@@ -41,7 +40,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'temperature',
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
             labels: undefined,
             state: {
               displayName: 'temperature',
@@ -52,7 +51,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'humidity',
             type: FieldType.number,
-            values: new ArrayVector([10000.3, 10000.4, 10000.5, 10000.6]),
+            values: [10000.3, 10000.4, 10000.5, 10000.6],
             labels: undefined,
             state: {
               displayName: 'humidity',
@@ -63,7 +62,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'time',
             type: FieldType.time,
-            values: new ArrayVector([3000, 4000, 5000, 6000]),
+            values: [3000, 4000, 5000, 6000],
             labels: undefined,
             state: {
               displayName: 'time',
@@ -95,7 +94,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'time',
             type: FieldType.time,
-            values: new ArrayVector([3000, 4000, 5000, 6000]),
+            values: [3000, 4000, 5000, 6000],
             labels: undefined,
             state: {
               displayName: 'time',
@@ -106,7 +105,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'temperature',
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
             labels: undefined,
             state: {
               displayName: 'temperature',
@@ -117,7 +116,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'humidity',
             type: FieldType.number,
-            values: new ArrayVector([10000.3, 10000.4, 10000.5, 10000.6]),
+            values: [10000.3, 10000.4, 10000.5, 10000.6],
             labels: undefined,
             state: {
               displayName: 'humidity',
@@ -159,7 +158,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'humidity',
             type: FieldType.number,
-            values: new ArrayVector([10000.3, 10000.4, 10000.5, 10000.6]),
+            values: [10000.3, 10000.4, 10000.5, 10000.6],
             labels: undefined,
             state: {
               displayName: 'humidity',
@@ -170,7 +169,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'time',
             type: FieldType.time,
-            values: new ArrayVector([3000, 4000, 5000, 6000]),
+            values: [3000, 4000, 5000, 6000],
             labels: undefined,
             state: {
               displayName: 'time',
@@ -181,7 +180,7 @@ describe('Order Transformer', () => {
             config: {},
             name: 'pressure',
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
             labels: undefined,
             state: {
               displayName: 'pressure',
@@ -219,19 +218,19 @@ describe('Order Transformer', () => {
             config: {},
             name: 'time',
             type: FieldType.time,
-            values: new ArrayVector([3000, 4000, 5000, 6000]),
+            values: [3000, 4000, 5000, 6000],
           },
           {
             config: {},
             name: 'pressure',
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
           },
           {
             config: {},
             name: 'humidity',
             type: FieldType.number,
-            values: new ArrayVector([10000.3, 10000.4, 10000.5, 10000.6]),
+            values: [10000.3, 10000.4, 10000.5, 10000.6],
           },
         ]);
       });
diff --git a/packages/grafana-data/src/transformations/transformers/organize.test.ts b/packages/grafana-data/src/transformations/transformers/organize.test.ts
index fd072d87983..712d9c17c15 100644
--- a/packages/grafana-data/src/transformations/transformers/organize.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/organize.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe';
 import { FieldType, DataTransformerConfig } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { transformDataFrame } from '../transformDataFrame';
 
 import { DataTransformerID } from './ids';
@@ -53,7 +52,7 @@ describe('OrganizeFields Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
           },
           {
             config: {
@@ -66,7 +65,7 @@ describe('OrganizeFields Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.number,
-            values: new ArrayVector([10000.3, 10000.4, 10000.5, 10000.6]),
+            values: [10000.3, 10000.4, 10000.5, 10000.6],
           },
         ]);
       });
@@ -116,7 +115,7 @@ describe('OrganizeFields Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.time,
-            values: new ArrayVector([3000, 4000, 5000, 6000]),
+            values: [3000, 4000, 5000, 6000],
           },
           {
             config: {},
@@ -127,7 +126,7 @@ describe('OrganizeFields Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
           },
         ]);
       });
diff --git a/packages/grafana-data/src/transformations/transformers/reduce.test.ts b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
index 16a6dfb1173..95c175f66a0 100644
--- a/packages/grafana-data/src/transformations/transformers/reduce.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
@@ -2,7 +2,6 @@ import { DataFrameView } from '../../dataframe';
 import { toDataFrame } from '../../dataframe/processDataFrame';
 import { DataTransformerConfig, Field, FieldType } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { ReducerID } from '../fieldReducer';
 import { notTimeFieldMatcher } from '../matchers/predicates';
 import { transformDataFrame } from '../transformDataFrame';
@@ -64,31 +63,31 @@ describe('Reducer Transformer', () => {
           {
             name: 'Field',
             type: FieldType.string,
-            values: new ArrayVector(['A temperature', 'A humidity', 'B temperature', 'B humidity']),
+            values: ['A temperature', 'A humidity', 'B temperature', 'B humidity'],
             config: {},
           },
           {
             name: 'First',
             type: FieldType.number,
-            values: new ArrayVector([3, 10000.3, 1, 11000.1]),
+            values: [3, 10000.3, 1, 11000.1],
             config: {},
           },
           {
             name: 'Min',
             type: FieldType.number,
-            values: new ArrayVector([3, 10000.3, 1, 11000.1]),
+            values: [3, 10000.3, 1, 11000.1],
             config: {},
           },
           {
             name: 'Max',
             type: FieldType.number,
-            values: new ArrayVector([6, 10000.6, 7, 11000.7]),
+            values: [6, 10000.6, 7, 11000.7],
             config: {},
           },
           {
             name: 'Last',
             type: FieldType.number,
-            values: new ArrayVector([6, 10000.6, 7, 11000.7]),
+            values: [6, 10000.6, 7, 11000.7],
             config: {},
           },
         ];
@@ -115,31 +114,31 @@ describe('Reducer Transformer', () => {
           {
             name: 'Field',
             type: FieldType.string,
-            values: new ArrayVector(['A temperature', 'B temperature']),
+            values: ['A temperature', 'B temperature'],
             config: {},
           },
           {
             name: 'First',
             type: FieldType.number,
-            values: new ArrayVector([3, 1]),
+            values: [3, 1],
             config: {},
           },
           {
             name: 'Min',
             type: FieldType.number,
-            values: new ArrayVector([3, 1]),
+            values: [3, 1],
             config: {},
           },
           {
             name: 'Max',
             type: FieldType.number,
-            values: new ArrayVector([6, 7]),
+            values: [6, 7],
             config: {},
           },
           {
             name: 'Last',
             type: FieldType.number,
-            values: new ArrayVector([6, 7]),
+            values: [6, 7],
             config: {},
           },
         ];
@@ -165,31 +164,31 @@ describe('Reducer Transformer', () => {
         {
           name: 'Field',
           type: FieldType.string,
-          values: new ArrayVector(['temperature', 'humidity']),
+          values: ['temperature', 'humidity'],
           config: {},
         },
         {
           name: 'First',
           type: FieldType.number,
-          values: new ArrayVector([3, 10000.3]),
+          values: [3, 10000.3],
           config: {},
         },
         {
           name: 'Min',
           type: FieldType.number,
-          values: new ArrayVector([3, 10000.3]),
+          values: [3, 10000.3],
           config: {},
         },
         {
           name: 'Max',
           type: FieldType.number,
-          values: new ArrayVector([6, 10000.6]),
+          values: [6, 10000.6],
           config: {},
         },
         {
           name: 'Last',
           type: FieldType.number,
-          values: new ArrayVector([6, 10000.6]),
+          values: [6, 10000.6],
           config: {},
         },
       ];
@@ -214,31 +213,31 @@ describe('Reducer Transformer', () => {
         {
           name: 'Field',
           type: FieldType.string,
-          values: new ArrayVector(['temperature']),
+          values: ['temperature'],
           config: {},
         },
         {
           name: 'First',
           type: FieldType.number,
-          values: new ArrayVector([3]),
+          values: [3],
           config: {},
         },
         {
           name: 'Min',
           type: FieldType.number,
-          values: new ArrayVector([3]),
+          values: [3],
           config: {},
         },
         {
           name: 'Max',
           type: FieldType.number,
-          values: new ArrayVector([6]),
+          values: [6],
           config: {},
         },
         {
           name: 'Last',
           type: FieldType.number,
-          values: new ArrayVector([6]),
+          values: [6],
           config: {},
         },
       ];
@@ -306,13 +305,13 @@ describe('Reducer Transformer', () => {
         {
           name: 'Field',
           type: FieldType.string,
-          values: new ArrayVector(['a', '2021']),
+          values: ['a', '2021'],
           config: {},
         },
         {
           name: 'Max',
           type: FieldType.number,
-          values: new ArrayVector([6, 10]),
+          values: [6, 10],
           config: {},
         },
       ];
@@ -351,13 +350,13 @@ describe('Reducer Transformer', () => {
         {
           name: 'Field',
           type: FieldType.string,
-          values: new ArrayVector(['a', '2021']),
+          values: ['a', '2021'],
           config: {},
         },
         {
           name: 'Max',
           type: FieldType.number,
-          values: new ArrayVector([6, 10]),
+          values: [6, 10],
           config: {},
         },
       ];
@@ -418,7 +417,7 @@ describe('Reducer Transformer', () => {
               "CA",
               "NY",
               "CA",
-              undefined,
+              ,
             ],
           },
           {
@@ -426,8 +425,8 @@ describe('Reducer Transformer', () => {
             "name": "country",
             "type": "string",
             "values": [
-              undefined,
-              undefined,
+              ,
+              ,
               "USA",
               "USA",
             ],
diff --git a/packages/grafana-data/src/transformations/transformers/reduce.ts b/packages/grafana-data/src/transformations/transformers/reduce.ts
index 7a5beed909f..1997d233ab0 100644
--- a/packages/grafana-data/src/transformations/transformers/reduce.ts
+++ b/packages/grafana-data/src/transformations/transformers/reduce.ts
@@ -5,7 +5,6 @@ import { getFieldDisplayName } from '../../field';
 import { KeyValue } from '../../types/data';
 import { DataFrame, Field, FieldType } from '../../types/dataFrame';
 import { DataTransformerInfo, FieldMatcher, MatcherConfig } from '../../types/transformations';
-import { ArrayVector } from '../../vector/ArrayVector';
 import { fieldReducers, reduceField, ReducerID } from '../fieldReducer';
 import { getFieldMatcher } from '../matchers';
 import { alwaysFieldMatcher, notTimeFieldMatcher } from '../matchers/predicates';
@@ -80,7 +79,7 @@ export function reduceSeriesToRows(
 
     const size = source.length;
     const fields: Field[] = [];
-    const names = new ArrayVector<string>(new Array(size));
+    const names: string[] = new Array(size);
     fields.push({
       name: 'Field',
       type: FieldType.string,
@@ -88,10 +87,10 @@ export function reduceSeriesToRows(
       config: {},
     });
 
-    const labels: KeyValue<ArrayVector> = {};
+    const labels: KeyValue<any[]> = {};
     if (labelsToFields) {
       for (const key of distinctLabels) {
-        labels[key] = new ArrayVector<string>(new Array(size));
+        labels[key] = new Array(size);
         fields.push({
           name: key,
           type: FieldType.string,
@@ -101,9 +100,9 @@ export function reduceSeriesToRows(
       }
     }
 
-    const calcs: KeyValue<ArrayVector> = {};
+    const calcs: KeyValue<any[]> = {};
     for (const info of calculators) {
-      calcs[info.id] = new ArrayVector(new Array(size));
+      calcs[info.id] = new Array(size);
       fields.push({
         name: info.name,
         type: FieldType.other, // UNKNOWN until after we call the functions
@@ -120,19 +119,19 @@ export function reduceSeriesToRows(
       });
 
       if (labelsToFields) {
-        names.buffer[i] = field.name;
+        names[i] = field.name;
         if (field.labels) {
           for (const key of Object.keys(field.labels)) {
-            labels[key].set(i, field.labels[key]);
+            labels[key][i] = field.labels[key];
           }
         }
       } else {
-        names.buffer[i] = getFieldDisplayName(field, series, data);
+        names[i] = getFieldDisplayName(field, series, data);
       }
 
       for (const info of calculators) {
         const v = results[info.id];
-        calcs[info.id].buffer[i] = v;
+        calcs[info.id][i] = v;
       }
     }
 
@@ -191,9 +190,9 @@ export function mergeResults(data: DataFrame[]): DataFrame | undefined {
         const isSameField = baseField.type === field.type && baseField.name === field.name;
 
         if (isFirstField || isSameField) {
-          const baseValues: any[] = baseField.values.toArray();
-          const values: any[] = field.values.toArray();
-          (baseField.values as unknown as ArrayVector).buffer = baseValues.concat(values);
+          const baseValues = baseField.values;
+          const values = field.values;
+          baseField.values = baseValues.concat(values);
         }
       }
     }
@@ -224,7 +223,7 @@ export function reduceFields(data: DataFrame[], matcher: FieldMatcher, reducerId
           const value = results[reducer];
           const copy = {
             ...field,
-            values: new ArrayVector([value]),
+            values: [value],
           };
           copy.state = undefined;
           if (reducers.length > 1) {
diff --git a/packages/grafana-data/src/transformations/transformers/rename.test.ts b/packages/grafana-data/src/transformations/transformers/rename.test.ts
index d4bfa319a5f..ca9f379dcb9 100644
--- a/packages/grafana-data/src/transformations/transformers/rename.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/rename.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe';
 import { FieldType, DataTransformerConfig } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { transformDataFrame } from '../transformDataFrame';
 
 import { DataTransformerID } from './ids';
@@ -49,7 +48,7 @@ describe('Rename Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.time,
-            values: new ArrayVector([3000, 4000, 5000, 6000]),
+            values: [3000, 4000, 5000, 6000],
           },
           {
             config: {
@@ -62,7 +61,7 @@ describe('Rename Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
           },
           {
             config: {
@@ -75,7 +74,7 @@ describe('Rename Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.number,
-            values: new ArrayVector([10000.3, 10000.4, 10000.5, 10000.6]),
+            values: [10000.3, 10000.4, 10000.5, 10000.6],
           },
         ]);
       });
@@ -119,7 +118,7 @@ describe('Rename Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.time,
-            values: new ArrayVector([3000, 4000, 5000, 6000]),
+            values: [3000, 4000, 5000, 6000],
           },
           {
             config: {},
@@ -130,7 +129,7 @@ describe('Rename Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
           },
           {
             config: {
@@ -143,7 +142,7 @@ describe('Rename Transformer', () => {
               multipleFrames: false,
             },
             type: FieldType.number,
-            values: new ArrayVector([10000.3, 10000.4, 10000.5, 10000.6]),
+            values: [10000.3, 10000.4, 10000.5, 10000.6],
           },
         ]);
       });
@@ -176,19 +175,19 @@ describe('Rename Transformer', () => {
             config: {},
             name: 'time',
             type: FieldType.time,
-            values: new ArrayVector([3000, 4000, 5000, 6000]),
+            values: [3000, 4000, 5000, 6000],
           },
           {
             config: {},
             name: 'pressure',
             type: FieldType.number,
-            values: new ArrayVector([10.3, 10.4, 10.5, 10.6]),
+            values: [10.3, 10.4, 10.5, 10.6],
           },
           {
             config: {},
             name: 'humidity',
             type: FieldType.number,
-            values: new ArrayVector([10000.3, 10000.4, 10000.5, 10000.6]),
+            values: [10000.3, 10000.4, 10000.5, 10000.6],
           },
         ]);
       });
diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
index 8a8b781ba88..49829c3e377 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
@@ -1,7 +1,6 @@
 import { toDataFrame } from '../../dataframe';
 import { DataTransformerConfig, Field, FieldType } from '../../types';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
-import { ArrayVector } from '../../vector';
 import { transformDataFrame } from '../transformDataFrame';
 
 import { DataTransformerID } from './ids';
@@ -246,9 +245,9 @@ describe('Series to rows', () => {
 });
 
 const createField = (name: string, type: FieldType, values: unknown[], config = {}): Field => {
-  return { name, type, values: new ArrayVector(values), config, labels: undefined };
+  return { name, type, values: values, config, labels: undefined };
 };
 
 const unwrap = (fields: Field[]): Field[] => {
-  return fields.map((field) => createField(field.name, field.type, field.values.toArray(), field.config));
+  return fields.map((field) => createField(field.name, field.type, field.values, field.config));
 };
diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
index 3e32de48faa..ee0ddda0787 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
@@ -12,7 +12,6 @@ import {
   TIME_SERIES_VALUE_FIELD_NAME,
 } from '../../types/dataFrame';
 import { DataTransformerInfo } from '../../types/transformations';
-import { ArrayVector } from '../../vector';
 
 import { DataTransformerID } from './ids';
 
@@ -39,7 +38,7 @@ export const seriesToRowsTransformer: DataTransformerInfo<SeriesToRowsTransforme
         const dataFrame = new MutableDataFrame();
         const metricField: Field = {
           name: TIME_SERIES_METRIC_FIELD_NAME,
-          values: new ArrayVector(),
+          values: [],
           config: {},
           type: FieldType.string,
         };
@@ -92,7 +91,7 @@ const copyFieldStructure = (field: Field, name: string): Field => {
   return {
     ...omit(field, ['values', 'state', 'labels', 'config', 'name']),
     name: name,
-    values: new ArrayVector(),
+    values: [],
     config: {
       ...omit(field.config, ['displayName', 'displayNameFromDS']),
     },
diff --git a/public/app/core/logsModel.test.ts b/public/app/core/logsModel.test.ts
index 0d99b8ea285..d16d1484cb7 100644
--- a/public/app/core/logsModel.test.ts
+++ b/public/app/core/logsModel.test.ts
@@ -1,7 +1,6 @@
 import { Observable } from 'rxjs';
 
 import {
-  ArrayVector,
   DataFrame,
   DataQuery,
   DataQueryRequest,
@@ -327,15 +326,15 @@ describe('dataFrameToLogsModel', () => {
       {
         name: 'info',
         fields: [
-          { type: 'time', values: new ArrayVector([1556270891000, 1556289770000]) },
-          { type: 'number', values: new ArrayVector([1, 0]) },
+          { type: 'time', values: [1556270891000, 1556289770000] },
+          { type: 'number', values: [1, 0] },
         ],
       },
       {
         name: 'error',
         fields: [
-          { type: 'time', values: new ArrayVector([1556289770000]) },
-          { type: 'number', values: new ArrayVector([1]) },
+          { type: 'time', values: [1556289770000] },
+          { type: 'number', values: [1] },
         ],
       },
     ]);
@@ -425,15 +424,15 @@ describe('dataFrameToLogsModel', () => {
       {
         name: 'info',
         fields: [
-          { type: 'time', values: new ArrayVector([1556270891000, 1556289770000]) },
-          { type: 'number', values: new ArrayVector([1, 0]) },
+          { type: 'time', values: [1556270891000, 1556289770000] },
+          { type: 'number', values: [1, 0] },
         ],
       },
       {
         name: 'error',
         fields: [
-          { type: 'time', values: new ArrayVector([1556289770000]) },
-          { type: 'number', values: new ArrayVector([1]) },
+          { type: 'time', values: [1556289770000] },
+          { type: 'number', values: [1] },
         ],
       },
     ]);
@@ -698,15 +697,15 @@ describe('dataFrameToLogsModel', () => {
       {
         name: 'error',
         fields: [
-          { type: 'time', values: new ArrayVector([0, 1000, 2000]) },
-          { type: 'number', values: new ArrayVector([1, 0, 1]) },
+          { type: 'time', values: [0, 1000, 2000] },
+          { type: 'number', values: [1, 0, 1] },
         ],
       },
       {
         name: 'debug',
         fields: [
-          { type: 'time', values: new ArrayVector([1000, 2000]) },
-          { type: 'number', values: new ArrayVector([1, 0]) },
+          { type: 'time', values: [1000, 2000] },
+          { type: 'number', values: [1, 0] },
         ],
       },
     ]);
diff --git a/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts b/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
index 8e716bd4153..219aaaef9a5 100644
--- a/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
+++ b/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
@@ -3,7 +3,6 @@ import { delay, take } from 'rxjs/operators';
 import { createFetchResponse } from 'test/helpers/createFetchResponse';
 
 import {
-  ArrayVector,
   DataFrame,
   DataFrameJSON,
   DataSourceApi,
@@ -238,7 +237,7 @@ const expectDataFrameWithValues = ({ time, values }: { time: number[]; values: n
         name: 'time',
         state: null,
         type: FieldType.time,
-        values: new ArrayVector(time),
+        values: time,
       } as Field,
       {
         config: {},
@@ -246,7 +245,7 @@ const expectDataFrameWithValues = ({ time, values }: { time: number[]; values: n
         name: 'value',
         state: null,
         type: FieldType.number,
-        values: new ArrayVector(values),
+        values: values,
       } as Field,
     ],
     length: values.length,
diff --git a/public/app/features/logs/utils.test.ts b/public/app/features/logs/utils.test.ts
index 385f3e20b0f..164994cb6ae 100644
--- a/public/app/features/logs/utils.test.ts
+++ b/public/app/features/logs/utils.test.ts
@@ -1,6 +1,5 @@
 import {
   AbsoluteTimeRange,
-  ArrayVector,
   FieldType,
   Labels,
   LogLevel,
@@ -322,12 +321,12 @@ describe('mergeLogsVolumeDataFrames', () => {
           {
             name: 'Time',
             type: FieldType.time,
-            values: new ArrayVector([1, 2, 3]),
+            values: [1, 2, 3],
           },
           {
             name: 'Value',
             type: FieldType.number,
-            values: new ArrayVector([3, 3, 1]),
+            values: [3, 3, 1],
             config: {
               displayNameFromDS: 'info',
             },
@@ -339,12 +338,12 @@ describe('mergeLogsVolumeDataFrames', () => {
           {
             name: 'Time',
             type: FieldType.time,
-            values: new ArrayVector([1, 2, 3, 5]),
+            values: [1, 2, 3, 5],
           },
           {
             name: 'Value',
             type: FieldType.number,
-            values: new ArrayVector([1, 2, 3, 0]),
+            values: [1, 2, 3, 0],
             config: {
               displayNameFromDS: 'debug',
             },
@@ -356,12 +355,12 @@ describe('mergeLogsVolumeDataFrames', () => {
           {
             name: 'Time',
             type: FieldType.time,
-            values: new ArrayVector([1, 6]),
+            values: [1, 6],
           },
           {
             name: 'Value',
             type: FieldType.number,
-            values: new ArrayVector([2, 1]),
+            values: [2, 1],
             config: {
               displayNameFromDS: 'error',
             },
@@ -385,12 +384,12 @@ describe('getLogsVolumeDimensions', () => {
         {
           name: 'time',
           type: FieldType.time,
-          values: new ArrayVector([]),
+          values: [],
         },
         {
           name: 'value',
           type: FieldType.number,
-          values: new ArrayVector(values),
+          values: values,
         },
       ],
     });
diff --git a/public/app/features/search/service/bluge.ts b/public/app/features/search/service/bluge.ts
index c65cc5a4586..23e5b10bc5b 100644
--- a/public/app/features/search/service/bluge.ts
+++ b/public/app/features/search/service/bluge.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   DataFrame,
   DataFrameJSON,
   DataFrameView,
@@ -181,8 +180,8 @@ export class BlugeSearcher implements GrafanaSearcher {
         // Append the raw values to the same array buffer
         const length = frame.length + view.dataFrame.length;
         for (let i = 0; i < frame.fields.length; i++) {
-          const values = (view.dataFrame.fields[i].values as ArrayVector).buffer;
-          values.push(...frame.fields[i].values.toArray());
+          const values = view.dataFrame.fields[i].values;
+          values.push(...frame.fields[i].values);
         }
         view.dataFrame.length = length;
 
diff --git a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
index ea89bddf440..ab11b30333c 100644
--- a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
+++ b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
@@ -1,6 +1,5 @@
 import {
   toDataFrame,
-  ArrayVector,
   DataFrame,
   FieldType,
   toDataFrameDTO,
@@ -344,6 +343,7 @@ describe('Prepare time series transformer', () => {
     };
 
     const frames = prepareTimeSeriesTransformer.transformer(config, ctx)(source);
+
     expect(frames).toEqual([
       toEquableDataFrame({
         name: 'wants-to-be-many',
@@ -422,7 +422,6 @@ function toEquableDataFrame(source: any): DataFrame {
     fields: source.fields.map((field: any) => {
       return {
         ...field,
-        values: new ArrayVector(field.values),
         config: {},
       };
     }),
diff --git a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts
index e0f1c4684e7..44302a8f7e1 100644
--- a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts
+++ b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts
@@ -11,7 +11,6 @@ import {
   FieldMatcherID,
   Field,
   MutableDataFrame,
-  ArrayVector,
 } from '@grafana/data';
 import { Labels } from 'app/types/unified-alerting-dto';
 
@@ -115,11 +114,11 @@ export function toTimeSeriesMulti(data: DataFrame[]): DataFrame[] {
             fields: [
               {
                 ...timeField,
-                values: new ArrayVector(b.time),
+                values: b.time,
               },
               {
                 ...field,
-                values: new ArrayVector(b.value),
+                values: b.value,
                 labels: b.labels,
               },
             ],
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
index e20087a3bb3..06de2867f2a 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
@@ -69,10 +69,7 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
       };
       refId2frameField[refId] = frameField;
 
-      // NOTE: MutableDataFrame.addField() makes copies, including any .values buffers
-      // since we do .values.add() later on the *originals*, we pass a custom MutableVectorCreator
-      // which will re-use the existing empty .values buffer by reference
-      const table = new MutableDataFrame(undefined, (buffer) => buffer ?? []);
+      const table = new MutableDataFrame();
       for (const label of Object.values(labelFields)) {
         table.addField(label);
       }
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
index addab806a4d..6aff1134a29 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
@@ -179,7 +179,7 @@ describe('CloudWatchMetricsQueryRunner', () => {
           expect(getFrameDisplayName(result.data[0])).toBe(
             data.results.A.series?.length && data.results.A.series[0].target
           );
-          expect(result.data[0].fields[1].values.buffer[0]).toBe(
+          expect(result.data[0].fields[1].values[0]).toBe(
             data.results.A.series?.length && data.results.A.series[0].datapoints[0][0]
           );
         });
@@ -333,7 +333,7 @@ describe('CloudWatchMetricsQueryRunner', () => {
         expect(getFrameDisplayName(result.data[0])).toBe(
           data.results.A.series?.length && data.results.A.series[0].target
         );
-        expect(result.data[0].fields[1].values.buffer[0]).toBe(
+        expect(result.data[0].fields[1].values[0]).toBe(
           data.results.A.series?.length && data.results.A.series[0].datapoints[0][0]
         );
       });
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index b470338f836..81da363795a 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -2,7 +2,6 @@ import { map } from 'lodash';
 import { Observable, of, throwError } from 'rxjs';
 
 import {
-  ArrayVector,
   CoreApp,
   DataLink,
   DataQueryRequest,
@@ -236,13 +235,13 @@ describe('ElasticDatasource', () => {
                   name: 'Time',
                   type: FieldType.time,
                   config: {},
-                  values: new ArrayVector([1000]),
+                  values: [1000],
                 },
                 {
                   name: 'Value',
                   type: FieldType.number,
                   config: {},
-                  values: new ArrayVector([10]),
+                  values: [10],
                 },
               ],
               length: 1,
@@ -997,11 +996,11 @@ describe('enhanceDataFrame', () => {
       fields: [
         {
           name: 'urlField',
-          values: new ArrayVector([]),
+          values: [],
         },
         {
           name: 'traceField',
-          values: new ArrayVector([]),
+          values: [],
         },
       ],
     });
@@ -1065,7 +1064,7 @@ describe('enhanceDataFrame', () => {
       fields: [
         {
           name: 'someField',
-          values: new ArrayVector([]),
+          values: [],
         },
       ],
     });
diff --git a/public/app/plugins/datasource/jaeger/testResponse.ts b/public/app/plugins/datasource/jaeger/testResponse.ts
index 026de7cbc44..3fa71fe6ad4 100644
--- a/public/app/plugins/datasource/jaeger/testResponse.ts
+++ b/public/app/plugins/datasource/jaeger/testResponse.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, FieldDTO } from '@grafana/data';
+import { FieldDTO } from '@grafana/data';
 
 import { TraceResponse } from './types';
 
@@ -51,7 +51,7 @@ export const testResponse: TraceResponse = {
 };
 
 function toVectors(fields: FieldDTO[]) {
-  return fields.map((f) => ({ ...f, values: new ArrayVector<any>(f.values as any[]) }));
+  return fields.map((f) => ({ ...f, values: f.values }));
 }
 
 export const testResponseDataFrameFields = toVectors([
diff --git a/public/app/plugins/datasource/tempo/graphTransform.test.ts b/public/app/plugins/datasource/tempo/graphTransform.test.ts
index 6c4b7082d31..e9e52bb09d1 100644
--- a/public/app/plugins/datasource/tempo/graphTransform.test.ts
+++ b/public/app/plugins/datasource/tempo/graphTransform.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrameView, dateTime, MutableDataFrame } from '@grafana/data';
+import { DataFrameView, dateTime, MutableDataFrame } from '@grafana/data';
 
 import { createGraphFrames, mapPromMetricsToServiceMap } from './graphTransform';
 import { bigResponse } from './testResponse';
@@ -74,19 +74,19 @@ describe('mapPromMetricsToServiceMap', () => {
     );
 
     expect(nodes.fields).toMatchObject([
-      { name: 'id', values: new ArrayVector(['db', 'app', 'lb']) },
-      { name: 'title', values: new ArrayVector(['db', 'app', 'lb']) },
-      { name: 'mainstat', values: new ArrayVector([1000, 2000, NaN]) },
-      { name: 'secondarystat', values: new ArrayVector([0.17, 0.33, NaN]) },
-      { name: 'arc__success', values: new ArrayVector([0.8, 0.25, 1]) },
-      { name: 'arc__failed', values: new ArrayVector([0.2, 0.75, 0]) },
+      { name: 'id', values: ['db', 'app', 'lb'] },
+      { name: 'title', values: ['db', 'app', 'lb'] },
+      { name: 'mainstat', values: [1000, 2000, NaN] },
+      { name: 'secondarystat', values: [0.17, 0.33, NaN] },
+      { name: 'arc__success', values: [0.8, 0.25, 1] },
+      { name: 'arc__failed', values: [0.2, 0.75, 0] },
     ]);
     expect(edges.fields).toMatchObject([
-      { name: 'id', values: new ArrayVector(['app_db', 'lb_app']) },
-      { name: 'source', values: new ArrayVector(['app', 'lb']) },
-      { name: 'target', values: new ArrayVector(['db', 'app']) },
-      { name: 'mainstat', values: new ArrayVector([1000, 2000]) },
-      { name: 'secondarystat', values: new ArrayVector([0.17, 0.33]) },
+      { name: 'id', values: ['app_db', 'lb_app'] },
+      { name: 'source', values: ['app', 'lb'] },
+      { name: 'target', values: ['db', 'app'] },
+      { name: 'mainstat', values: [1000, 2000] },
+      { name: 'secondarystat', values: [0.17, 0.33] },
     ]);
   });
 
@@ -106,12 +106,12 @@ describe('mapPromMetricsToServiceMap', () => {
     );
 
     expect(nodes.fields).toMatchObject([
-      { name: 'id', values: new ArrayVector(['db', 'app', 'lb']) },
-      { name: 'title', values: new ArrayVector(['db', 'app', 'lb']) },
-      { name: 'mainstat', values: new ArrayVector([1000, 2000, NaN]) },
-      { name: 'secondarystat', values: new ArrayVector([0.17, 0.33, NaN]) },
-      { name: 'arc__success', values: new ArrayVector([0, 0, 1]) },
-      { name: 'arc__failed', values: new ArrayVector([1, 1, 0]) },
+      { name: 'id', values: ['db', 'app', 'lb'] },
+      { name: 'title', values: ['db', 'app', 'lb'] },
+      { name: 'mainstat', values: [1000, 2000, NaN] },
+      { name: 'secondarystat', values: [0.17, 0.33, NaN] },
+      { name: 'arc__success', values: [0, 0, 1] },
+      { name: 'arc__failed', values: [1, 1, 0] },
     ]);
   });
 });
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.test.ts b/public/app/plugins/datasource/tempo/resultTransformer.test.ts
index 151086e2668..1b78d658d96 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.test.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.test.ts
@@ -6,7 +6,6 @@ import {
   PluginType,
   DataSourceInstanceSettings,
   dateTime,
-  ArrayVector,
   PluginMetaInfo,
 } from '@grafana/data';
 
@@ -71,12 +70,12 @@ describe('transformTraceList()', () => {
   test('extracts traceIDs from log lines', () => {
     const frame = createTableFrame(lokiDataFrame, 't1', 'tempo', ['traceID=(\\w+)', 'traceID=(\\w\\w)']);
     expect(frame.fields[0].name).toBe('Time');
-    expect(frame.fields[0].values.get(0)).toBe('2020-02-12T15:05:15.265Z');
+    expect(frame.fields[0].values[0]).toBe('2020-02-12T15:05:15.265Z');
     expect(frame.fields[1].name).toBe('traceID');
-    expect(frame.fields[1].values.get(0)).toBe('asdfa1234');
+    expect(frame.fields[1].values[0]).toBe('asdfa1234');
     // Second match in new line
-    expect(frame.fields[0].values.get(1)).toBe('2020-02-12T15:05:15.265Z');
-    expect(frame.fields[1].values.get(1)).toBe('as');
+    expect(frame.fields[0].values[1]).toBe('2020-02-12T15:05:15.265Z');
+    expect(frame.fields[1].values[1]).toBe('as');
   });
 });
 
@@ -106,20 +105,20 @@ describe('createTableFrameFromSearch()', () => {
   test('transforms search response to dataFrame', () => {
     const frame = createTableFrameFromSearch(tempoSearchResponse.traces as TraceSearchMetadata[], defaultSettings);
     expect(frame.fields[0].name).toBe('traceID');
-    expect(frame.fields[0].values.get(0)).toBe('e641dcac1c3a0565');
+    expect(frame.fields[0].values[0]).toBe('e641dcac1c3a0565');
 
     // TraceID must have unit = 'string' to prevent the ID from rendering as Infinity
     expect(frame.fields[0].config.unit).toBe('string');
 
     expect(frame.fields[1].name).toBe('traceName');
-    expect(frame.fields[1].values.get(0)).toBe('c10d7ca4e3a00354 ');
+    expect(frame.fields[1].values[0]).toBe('c10d7ca4e3a00354 ');
 
     expect(frame.fields[2].name).toBe('startTime');
-    expect(frame.fields[2].values.get(0)).toBe('2022-01-28 03:00:28');
-    expect(frame.fields[2].values.get(1)).toBe('2022-01-27 22:56:06');
+    expect(frame.fields[2].values[0]).toBe('2022-01-28 03:00:28');
+    expect(frame.fields[2].values[1]).toBe('2022-01-27 22:56:06');
 
     expect(frame.fields[3].name).toBe('traceDuration');
-    expect(frame.fields[3].values.get(0)).toBe(65);
+    expect(frame.fields[3].values[0]).toBe(65);
   });
 });
 
@@ -129,23 +128,20 @@ describe('createTableFrameFromTraceQlQuery()', () => {
     const frame = frameList[0];
     // Trace ID field
     expect(frame.fields[0].name).toBe('traceID');
-    expect(frame.fields[0].values.get(0)).toBe('b1586c3c8c34d');
+    expect(frame.fields[0].values[0]).toBe('b1586c3c8c34d');
     expect(frame.fields[0].config.unit).toBe('string');
-    expect(frame.fields[0].values).toBeInstanceOf(ArrayVector);
     // Start time field
     expect(frame.fields[1].name).toBe('startTime');
     expect(frame.fields[1].type).toBe('string');
-    expect(frame.fields[1].values.get(1)).toBe('2022-01-27 22:56:06');
-    expect(frame.fields[1].values).toBeInstanceOf(ArrayVector);
+    expect(frame.fields[1].values[1]).toBe('2022-01-27 22:56:06');
     // Trace name field
     expect(frame.fields[2].name).toBe('traceName');
     expect(frame.fields[2].type).toBe('string');
-    expect(frame.fields[2].values.get(0)).toBe('lb HTTP Client');
-    expect(frame.fields[2].values).toBeInstanceOf(ArrayVector);
+    expect(frame.fields[2].values[0]).toBe('lb HTTP Client');
     // Duration field
     expect(frame.fields[3].name).toBe('traceDuration');
     expect(frame.fields[3].type).toBe('number');
-    expect(frame.fields[3].values.get(2)).toBe(44);
+    expect(frame.fields[3].values[2]).toBe(44);
   });
 });
 
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.ts b/public/app/plugins/datasource/tempo/resultTransformer.ts
index 38eefebadd6..568d3fff6f3 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.ts
@@ -77,7 +77,7 @@ export function createTableFrame(
   for (let field of logsFrame.fields) {
     let hasMatch = false;
     if (field.type === FieldType.string) {
-      const values = field.values.toArray();
+      const values = field.values;
       for (let i = 0; i < values.length; i++) {
         const line = values[i];
         if (line) {
diff --git a/public/app/plugins/datasource/zipkin/utils/testData.ts b/public/app/plugins/datasource/zipkin/utils/testData.ts
index 4b01da687e7..2dd531c1df1 100644
--- a/public/app/plugins/datasource/zipkin/utils/testData.ts
+++ b/public/app/plugins/datasource/zipkin/utils/testData.ts
@@ -1,5 +1,3 @@
-import { ArrayVector } from '@grafana/data';
-
 import { ZipkinSpan } from '../types';
 
 export const zipkinResponse: ZipkinSpan[] = [
@@ -127,4 +125,4 @@ export const traceFrameFields = [
       [],
     ],
   },
-].map((f) => ({ ...f, values: new ArrayVector<any>(f.values) }));
+].map((f) => ({ ...f, values: f.values }));
diff --git a/public/app/plugins/datasource/zipkin/utils/testResponse.ts b/public/app/plugins/datasource/zipkin/utils/testResponse.ts
index 50085bdf970..ddc3767abb2 100644
--- a/public/app/plugins/datasource/zipkin/utils/testResponse.ts
+++ b/public/app/plugins/datasource/zipkin/utils/testResponse.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, FieldDTO } from '@grafana/data';
+import { FieldDTO } from '@grafana/data';
 
 import { ZipkinSpan } from '../types';
 
@@ -35,7 +35,7 @@ export const testResponse: ZipkinSpan[] = [
 ];
 
 function toVectors(fields: FieldDTO[]) {
-  return fields.map((f) => ({ ...f, values: new ArrayVector<any>(f.values as any[]) }));
+  return fields.map((f) => ({ ...f, values: f.values }));
 }
 
 export const testResponseDataFrameFields = toVectors([
diff --git a/public/app/plugins/panel/news/utils.ts b/public/app/plugins/panel/news/utils.ts
index f36d7a48cb1..0b0bc3917ff 100644
--- a/public/app/plugins/panel/news/utils.ts
+++ b/public/app/plugins/panel/news/utils.ts
@@ -1,26 +1,26 @@
-import { ArrayVector, FieldType, DataFrame, dateTime } from '@grafana/data';
+import { FieldType, DataFrame, dateTime } from '@grafana/data';
 
 import { Feed } from './types';
 
 export function feedToDataFrame(feed: Feed): DataFrame {
-  const date = new ArrayVector<number>([]);
-  const title = new ArrayVector<string>([]);
-  const link = new ArrayVector<string>([]);
-  const content = new ArrayVector<string>([]);
-  const ogImage = new ArrayVector<string | undefined | null>([]);
+  const date: number[] = [];
+  const title: string[] = [];
+  const link: string[] = [];
+  const content: string[] = [];
+  const ogImage: Array<string | undefined | null> = [];
 
   for (const item of feed.items) {
     const val = dateTime(item.pubDate);
 
     try {
-      date.buffer.push(val.valueOf());
-      title.buffer.push(item.title);
-      link.buffer.push(item.link);
-      ogImage.buffer.push(item.ogImage);
+      date.push(val.valueOf());
+      title.push(item.title);
+      link.push(item.link);
+      ogImage.push(item.ogImage);
 
       if (item.content) {
         const body = item.content.replace(/<\/?[^>]+(>|$)/g, '');
-        content.buffer.push(body);
+        content.push(body);
       }
     } catch (err) {
       console.warn('Error reading news item:', err, item);
diff --git a/public/app/plugins/panel/nodeGraph/utils.test.ts b/public/app/plugins/panel/nodeGraph/utils.test.ts
index b7c1d002a14..4bf9ddc09ab 100644
--- a/public/app/plugins/panel/nodeGraph/utils.test.ts
+++ b/public/app/plugins/panel/nodeGraph/utils.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, FieldType, MutableDataFrame } from '@grafana/data';
+import { DataFrame, FieldType, MutableDataFrame } from '@grafana/data';
 
 import { NodeDatum, NodeGraphOptions } from './types';
 import {
@@ -63,8 +63,8 @@ describe('processNodes', () => {
       expect.objectContaining(makeNodeFromEdgeDatum({ dataFrameRowIndex: 2, id: '2', incoming: 2, title: '2' })),
     ]);
 
-    expect(nodes[0].mainStat?.values).toEqual(new ArrayVector([undefined, 1, 2]));
-    expect(nodes[0].secondaryStat?.values).toEqual(new ArrayVector([undefined, 1, 2]));
+    expect(nodes[0].mainStat?.values).toEqual([undefined, 1, 2]);
+    expect(nodes[0].secondaryStat?.values).toEqual([undefined, 1, 2]);
 
     expect(nodes[0].mainStat).toEqual(nodes[1].mainStat);
     expect(nodes[0].mainStat).toEqual(nodes[2].mainStat);
@@ -265,7 +265,7 @@ function makeNodeDatum(options: Partial<NodeDatum> = {}) {
     index: 7,
     name: 'color',
     type: 'number',
-    values: new ArrayVector([0.5, 0.5, 0.5]),
+    values: [0.5, 0.5, 0.5],
   };
 
   return {
@@ -278,7 +278,7 @@ function makeNodeDatum(options: Partial<NodeDatum> = {}) {
         },
         name: 'arc__success',
         type: 'number',
-        values: new ArrayVector([0.5, 0.5, 0.5]),
+        values: [0.5, 0.5, 0.5],
       },
       {
         config: {
@@ -288,7 +288,7 @@ function makeNodeDatum(options: Partial<NodeDatum> = {}) {
         },
         name: 'arc__errors',
         type: 'number',
-        values: new ArrayVector([0.5, 0.5, 0.5]),
+        values: [0.5, 0.5, 0.5],
       },
     ],
     color: colorField,
@@ -300,14 +300,14 @@ function makeNodeDatum(options: Partial<NodeDatum> = {}) {
       index: 3,
       name: 'mainstat',
       type: 'number',
-      values: new ArrayVector([0.1, 0.1, 0.1]),
+      values: [0.1, 0.1, 0.1],
     },
     secondaryStat: {
       config: {},
       index: 4,
       name: 'secondarystat',
       type: 'number',
-      values: new ArrayVector([2, 2, 2]),
+      values: [2, 2, 2],
     },
     subTitle: 'service',
     title: 'service:0',
diff --git a/public/app/plugins/panel/nodeGraph/utils.ts b/public/app/plugins/panel/nodeGraph/utils.ts
index f0eec22798c..2535d865b7c 100644
--- a/public/app/plugins/panel/nodeGraph/utils.ts
+++ b/public/app/plugins/panel/nodeGraph/utils.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   DataFrame,
   Field,
   FieldCache,
@@ -230,8 +229,8 @@ function computableField(field?: Field) {
  * @param edgeFields
  */
 function normalizeStatsForNodes(nodesMap: { [id: string]: NodeDatumFromEdge }, edgeFields: EdgeFields): NodeDatum[] {
-  const secondaryStatValues = new ArrayVector();
-  const mainStatValues = new ArrayVector();
+  const secondaryStatValues: any[] = [];
+  const mainStatValues: any[] = [];
   const secondaryStatField = computableField(edgeFields.secondaryStat)
     ? {
         ...edgeFields.secondaryStat!,
@@ -347,42 +346,42 @@ function makeNode(index: number) {
 function nodesFrame() {
   const fields: any = {
     [NodeGraphDataFrameFieldNames.id]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
     [NodeGraphDataFrameFieldNames.title]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
     [NodeGraphDataFrameFieldNames.subTitle]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
     [NodeGraphDataFrameFieldNames.mainStat]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
     },
     [NodeGraphDataFrameFieldNames.secondaryStat]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
     },
     [NodeGraphDataFrameFieldNames.arc + 'success']: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
       config: { color: { fixedColor: 'green' } },
     },
     [NodeGraphDataFrameFieldNames.arc + 'errors']: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
       config: { color: { fixedColor: 'red' } },
     },
     [NodeGraphDataFrameFieldNames.color]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
       config: { color: { mode: 'continuous-GrYlRd' } },
     },
     [NodeGraphDataFrameFieldNames.icon]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
   };
@@ -413,23 +412,23 @@ export function makeEdgesDataFrame(
 function edgesFrame() {
   const fields: any = {
     [NodeGraphDataFrameFieldNames.id]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
     [NodeGraphDataFrameFieldNames.source]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
     [NodeGraphDataFrameFieldNames.target]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
     [NodeGraphDataFrameFieldNames.mainStat]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
     },
     [NodeGraphDataFrameFieldNames.secondaryStat]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
     },
   };

From 8567ec92b0c65126d9ca7dcc826c74d8b14018a6 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Fri, 14 Apr 2023 16:21:16 +0200
Subject: [PATCH 151/729] Cloudwatch: Change type of `ts` field in log
 responses to `time` (#66525)

* make timestamp field time type

* Add test for type on handleLogEvents data frame field response

---------

Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com>
---
 pkg/tsdb/cloudwatch/log_actions.go      |  5 ++-
 pkg/tsdb/cloudwatch/log_actions_test.go | 57 ++++++++++++++++++++++++-
 pkg/tsdb/cloudwatch/mocks/logs.go       | 15 +++++++
 3 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/log_actions.go b/pkg/tsdb/cloudwatch/log_actions.go
index 8866f95e265..306ea4d6cd8 100644
--- a/pkg/tsdb/cloudwatch/log_actions.go
+++ b/pkg/tsdb/cloudwatch/log_actions.go
@@ -8,6 +8,7 @@ import (
 	"math"
 	"sort"
 	"strings"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
@@ -164,7 +165,7 @@ func (e *cloudWatchExecutor) handleGetLogEvents(ctx context.Context, logsClient
 	}
 
 	messages := make([]*string, 0)
-	timestamps := make([]*int64, 0)
+	timestamps := make([]time.Time, 0)
 
 	sort.Slice(logEvents.Events, func(i, j int) bool {
 		return *(logEvents.Events[i].Timestamp) > *(logEvents.Events[j].Timestamp)
@@ -172,7 +173,7 @@ func (e *cloudWatchExecutor) handleGetLogEvents(ctx context.Context, logsClient
 
 	for _, event := range logEvents.Events {
 		messages = append(messages, event.Message)
-		timestamps = append(timestamps, event.Timestamp)
+		timestamps = append(timestamps, time.UnixMilli(*event.Timestamp).UTC())
 	}
 
 	timestampField := data.NewField("ts", nil, timestamps)
diff --git a/pkg/tsdb/cloudwatch/log_actions_test.go b/pkg/tsdb/cloudwatch/log_actions_test.go
index 51573eb205c..cf97feb80d9 100644
--- a/pkg/tsdb/cloudwatch/log_actions_test.go
+++ b/pkg/tsdb/cloudwatch/log_actions_test.go
@@ -15,13 +15,16 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
+	"github.com/stretchr/testify/mock"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-func TestQuery_GetLogEvents(t *testing.T) {
+func TestQuery_handleGetLogEvents_passes_nil_start_and_end_times_to_GetLogEvents(t *testing.T) {
 	origNewCWLogsClient := NewCWLogsClient
 	t.Cleanup(func() {
 		NewCWLogsClient = origNewCWLogsClient
@@ -107,6 +110,58 @@ func TestQuery_GetLogEvents(t *testing.T) {
 	}
 }
 
+func TestQuery_GetLogEvents_returns_response_from_GetLogEvents_to_data_frame_field(t *testing.T) {
+	origNewCWLogsClient := NewCWLogsClient
+	t.Cleanup(func() {
+		NewCWLogsClient = origNewCWLogsClient
+	})
+	var cli *mocks.MockLogEvents
+	NewCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
+		return cli
+	}
+	im := datasource.NewInstanceManager(func(s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		return DataSource{Settings: models.CloudWatchSettings{}}, nil
+	})
+	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+
+	cli = &mocks.MockLogEvents{}
+	cli.On("GetLogEventsWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.GetLogEventsOutput{
+		Events: []*cloudwatchlogs.OutputLogEvent{{
+			Message:   utils.Pointer("some message"),
+			Timestamp: utils.Pointer(int64(15)),
+		}}}, nil)
+
+	resp, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+		PluginContext: backend.PluginContext{
+			DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
+		},
+		Queries: []backend.DataQuery{
+			{
+				RefID:     "A",
+				TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+				JSON: json.RawMessage(`{
+							"type":         "logAction",
+							"subtype":       "GetLogEvents",
+							"logGroupName":  "foo",
+							"logStreamName": "bar",
+							"endTime":       1,
+							"startFromHead": false
+						}`),
+			},
+		},
+	})
+
+	require.NoError(t, err)
+
+	respA, ok := resp.Responses["A"]
+	assert.True(t, ok)
+
+	expectedTsField := data.NewField("ts", nil, []time.Time{time.UnixMilli(15).UTC()})
+	expectedMessageField := data.NewField("line", nil, []*string{utils.Pointer("some message")})
+	expectedTsField.SetConfig(&data.FieldConfig{DisplayName: "Time"})
+	assert.Equal(t, []*data.Field{expectedTsField, expectedMessageField}, respA.Frames[0].Fields)
+}
+
 func TestQuery_StartQuery(t *testing.T) {
 	origNewCWLogsClient := NewCWLogsClient
 	t.Cleanup(func() {
diff --git a/pkg/tsdb/cloudwatch/mocks/logs.go b/pkg/tsdb/cloudwatch/mocks/logs.go
index f080a961f42..54ac6737a16 100644
--- a/pkg/tsdb/cloudwatch/mocks/logs.go
+++ b/pkg/tsdb/cloudwatch/mocks/logs.go
@@ -1,7 +1,10 @@
 package mocks
 
 import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
+	"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/mock"
 )
@@ -47,3 +50,15 @@ func (f *MockFeatures) IsEnabled(feature string) bool {
 
 	return args.Bool(0)
 }
+
+type MockLogEvents struct {
+	cloudwatchlogsiface.CloudWatchLogsAPI
+
+	mock.Mock
+}
+
+func (m *MockLogEvents) GetLogEventsWithContext(ctx aws.Context, input *cloudwatchlogs.GetLogEventsInput, option ...request.Option) (*cloudwatchlogs.GetLogEventsOutput, error) {
+	args := m.Called(ctx, input, option)
+
+	return args.Get(0).(*cloudwatchlogs.GetLogEventsOutput), args.Error(1)
+}

From 9665b3afe7c088cb103569bec8a2f7bb7ca1fbf1 Mon Sep 17 00:00:00 2001
From: Selene <selenepinillos@gmail.com>
Date: Fri, 14 Apr 2023 16:45:54 +0200
Subject: [PATCH 152/729] Chore: Update Cuetsy to v0.1.8 version (#66456)

* Update cuetsy version

* Fix defaults

* Update cuetsy

* Update cuelang version in bingo

* Remove TODO comments
---
 .bingo/Variables.mk                           |  6 +--
 .bingo/cue.mod                                |  2 +-
 .bingo/cue.sum                                | 28 ++++++++++
 .bingo/variables.env                          |  2 +-
 go.mod                                        | 14 ++---
 go.sum                                        | 54 +++----------------
 .../grafana-schema/src/common/common.gen.ts   |  4 +-
 packages/grafana-schema/src/common/table.cue  |  2 +-
 .../raw/dashboard/x/dashboard_types.gen.ts    |  4 +-
 .../preferences/x/preferences_types.gen.ts    |  2 +-
 .../kinds/dataquery/types_dataquery_gen.go    | 40 ++++++--------
 .../datasource/cloudwatch/dataquery.cue       |  1 -
 .../datasource/cloudwatch/dataquery.gen.ts    |  5 +-
 .../plugins/datasource/testdata/dataquery.cue |  2 +-
 .../datasource/testdata/dataquery.gen.ts      |  2 +-
 .../app/plugins/panel/barchart/panelcfg.cue   |  8 +--
 .../app/plugins/panel/bargauge/panelcfg.cue   |  4 +-
 public/app/plugins/panel/heatmap/panelcfg.cue |  6 +--
 .../app/plugins/panel/histogram/panelcfg.cue  |  2 +-
 public/app/plugins/panel/stat/panelcfg.cue    |  8 +--
 .../plugins/panel/state-timeline/panelcfg.cue |  4 +-
 .../plugins/panel/status-history/panelcfg.cue |  2 +-
 public/app/plugins/panel/table/panelcfg.cue   |  2 +-
 public/app/plugins/panel/text/panelcfg.cue    |  2 +-
 public/app/plugins/panel/xychart/panelcfg.cue |  4 +-
 25 files changed, 92 insertions(+), 118 deletions(-)

diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index 8a63fd034b0..140dd9509ae 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -23,11 +23,11 @@ $(BRA): $(BINGO_DIR)/bra.mod
 	@echo "(re)installing $(GOBIN)/bra-v0.0.0-20200517080246-1e3013ecaff8"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bra.mod -o=$(GOBIN)/bra-v0.0.0-20200517080246-1e3013ecaff8 "github.com/unknwon/bra"
 
-CUE := $(GOBIN)/cue-v0.5.0-beta.2
+CUE := $(GOBIN)/cue-v0.5.0
 $(CUE): $(BINGO_DIR)/cue.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/cue-v0.5.0-beta.2"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=cue.mod -o=$(GOBIN)/cue-v0.5.0-beta.2 "cuelang.org/go/cmd/cue"
+	@echo "(re)installing $(GOBIN)/cue-v0.5.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=cue.mod -o=$(GOBIN)/cue-v0.5.0 "cuelang.org/go/cmd/cue"
 
 DRONE := $(GOBIN)/drone-v1.5.0
 $(DRONE): $(BINGO_DIR)/drone.mod
diff --git a/.bingo/cue.mod b/.bingo/cue.mod
index 79ccdfb391c..6e13b6d3eec 100644
--- a/.bingo/cue.mod
+++ b/.bingo/cue.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.19
 
-require cuelang.org/go v0.5.0-beta.2 // cmd/cue
+require cuelang.org/go v0.5.0 // cmd/cue
diff --git a/.bingo/cue.sum b/.bingo/cue.sum
index f59e3b21cb6..5e9012b2946 100644
--- a/.bingo/cue.sum
+++ b/.bingo/cue.sum
@@ -2,29 +2,57 @@ cuelang.org/go v0.4.3 h1:W3oBBjDTm7+IZfCKZAmC8uDG0eYfJL4Pp/xbbCMKaVo=
 cuelang.org/go v0.4.3/go.mod h1:7805vR9H+VoBNdWFdI7jyDR3QLUPp4+naHfbcgp55HI=
 cuelang.org/go v0.5.0-beta.2 h1:am5M7jGvNTJ0rnjrFNyvE7fucL/wRqb0emK4XxdThQI=
 cuelang.org/go v0.5.0-beta.2/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
+cuelang.org/go v0.5.0 h1:D6N0UgTGJCOxFKU8RU+qYvavKNsVc/+ZobmifStVJzU=
+cuelang.org/go v0.5.0/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd/v2 v2.0.1 h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE=
 github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
+github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
+github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw=
 github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw=
+github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
 github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto=
+github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc h1:gSVONBi2HWMFXCa9jFdYvYk7IwW/mTLxWOF7rXS4LO0=
 github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b h1:zd/2RNzIRkoGGMjE+YIsZ85CnDIz672JK2F3Zl4vux4=
+github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
+github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ=
 golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
+golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20200612220849-54c614fe050c h1:g6oFfz6Cmw68izP3xsdud3Oxu145IPkeFzyRg58AKHM=
 golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/.bingo/variables.env b/.bingo/variables.env
index a1dde2f98e8..394897e5690 100644
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -10,7 +10,7 @@ fi
 
 BRA="${GOBIN}/bra-v0.0.0-20200517080246-1e3013ecaff8"
 
-CUE="${GOBIN}/cue-v0.5.0-beta.2"
+CUE="${GOBIN}/cue-v0.5.0"
 
 DRONE="${GOBIN}/drone-v1.5.0"
 
diff --git a/go.mod b/go.mod
index c0516eb15d7..1817e3d7041 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,7 @@ require (
 
 require (
 	cloud.google.com/go/storage v1.28.1
-	cuelang.org/go v0.5.0-beta.2
+	cuelang.org/go v0.5.0
 	github.com/Azure/azure-sdk-for-go v65.0.0+incompatible
 	github.com/Azure/go-autorest/autorest v0.11.28
 	github.com/BurntSushi/toml v1.2.1
@@ -64,7 +64,6 @@ require (
 	github.com/google/wire v0.5.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/grafana/alerting v0.0.0-20230315185333-d1e3c68ac064
-	github.com/grafana/cuetsy v0.1.6
 	github.com/grafana/grafana-aws-sdk v0.12.0
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
 	github.com/grafana/grafana-plugin-sdk-go v0.159.0
@@ -100,7 +99,7 @@ require (
 	github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
 	github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f
 	github.com/uber/jaeger-client-go v2.29.1+incompatible
-	github.com/urfave/cli/v2 v2.3.0
+	github.com/urfave/cli/v2 v2.24.4
 	github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae
 	github.com/yalue/merged_fs v1.2.2
 	github.com/yudai/gojsondiff v1.0.0
@@ -169,7 +168,7 @@ require (
 	github.com/go-openapi/spec v0.20.7 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-openapi/validate v0.22.0 // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
+	github.com/golang-jwt/jwt/v4 v4.4.3
 	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
 	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -268,6 +267,8 @@ require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/dave/dst v0.27.2
 	github.com/go-jose/go-jose/v3 v3.0.0
+	github.com/grafana/cuetsy v0.1.8
+	github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad
 	github.com/grafana/dataplane/sdata v0.0.6
 	github.com/grafana/go-mssqldb v0.9.1
 	github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375
@@ -280,7 +281,6 @@ require (
 	cloud.google.com/go v0.107.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/Azure/azure-pipeline-go v0.2.3 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
@@ -307,7 +307,6 @@ require (
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	github.com/gophercloud/gophercloud v1.0.0 // indirect
-	github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad // indirect
 	github.com/grafana/sqlds/v2 v2.3.10 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
@@ -334,6 +333,7 @@ require (
 	github.com/unknwon/com v1.0.1 // indirect
 	github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
 	github.com/weaveworks/promrus v1.2.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	go.opentelemetry.io/otel/metric v0.37.0 // indirect
 	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
@@ -353,7 +353,7 @@ require (
 	github.com/AzureAD/microsoft-authentication-library-for-go v0.7.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2
 	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
 	github.com/RoaringBitmap/roaring v0.9.4 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect
diff --git a/go.sum b/go.sum
index 7dabb210c9f..3636dcde76c 100644
--- a/go.sum
+++ b/go.sum
@@ -115,7 +115,6 @@ github.com/Azure/azure-sdk-for-go v23.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
 github.com/Azure/azure-sdk-for-go v41.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v55.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v57.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v59.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v59.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw=
@@ -150,7 +149,6 @@ github.com/Azure/go-autorest/autorest v0.10.1/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUd
 github.com/Azure/go-autorest/autorest v0.11.9/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
 github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
 github.com/Azure/go-autorest/autorest v0.11.19/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
-github.com/Azure/go-autorest/autorest v0.11.20/go.mod h1:o3tqFY+QR40VOlk+pV4d77mORO64jOXSgEnPQgLK6JY=
 github.com/Azure/go-autorest/autorest v0.11.22/go.mod h1:BAWYUWGPEtKPzjVkp0Q6an0MJcJDsoh5Z1BFAEFs4Xs=
 github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U=
 github.com/Azure/go-autorest/autorest v0.11.28 h1:ndAExarwr5Y+GaHE6VCaY1kyS/HwwGGyuimVhWsHOEM=
@@ -163,7 +161,6 @@ github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMl
 github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
 github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
 github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
-github.com/Azure/go-autorest/autorest/adal v0.9.15/go.mod h1:tGMin8I49Yij6AQ+rvV+Xa/zwxYQB5hmsd6DkfAx2+A=
 github.com/Azure/go-autorest/autorest/adal v0.9.17/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
 github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
 github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
@@ -248,7 +245,6 @@ github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg3
 github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
 github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
 github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
-github.com/Microsoft/hcsshim v0.8.18/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
 github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
 github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
@@ -289,7 +285,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
-github.com/alecthomas/units v0.0.0-20210912230133-d1bdfacee922/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
@@ -348,7 +343,6 @@ github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zK
 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.38.60/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.38.68/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.40.37/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/aws/aws-sdk-go v1.42.16/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go v1.44.171 h1:maREiPAmibvuONMOEZIkCH2OTosLRnDelceTtH3SYfo=
@@ -497,7 +491,6 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
@@ -544,7 +537,6 @@ github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo
 github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI=
 github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
 github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
-github.com/containerd/containerd v1.5.4/go.mod h1:sx18RgvW6ABJ4iYUw7Q5x7bgFOAB9B6G7+yO0XBc4zw=
 github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
 github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs=
 github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0=
@@ -682,7 +674,6 @@ github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod h1:vAd38F8
 github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c1yc=
 github.com/digitalocean/godo v1.62.0/go.mod h1:p7dOjjtSBqCTUksqtA5Fd3uaKs9kyTq2xcz76ulEJRU=
-github.com/digitalocean/godo v1.65.0/go.mod h1:p7dOjjtSBqCTUksqtA5Fd3uaKs9kyTq2xcz76ulEJRU=
 github.com/digitalocean/godo v1.72.0/go.mod h1:GBmu8MkjZmNARE7IXRPmkbbnocNN8+uBm0xbEVw2LCs=
 github.com/digitalocean/godo v1.88.0 h1:SAEdw63xOMmzlwCeCWjLH1GcyDPUjbSAR1Bh7VELxzc=
 github.com/digitalocean/godo v1.88.0/go.mod h1:NRpFznZFvhHjBoqZAaOD3khVzsJ3EibzKqFL4R60dmA=
@@ -750,13 +741,11 @@ github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw
 github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/envoyproxy/go-control-plane v0.9.9/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
 github.com/envoyproxy/go-control-plane v0.10.3 h1:xdCVXxEe0Y3FQith+0cj2irwZudqGYvecuLB1HtdexY=
 github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.6.1/go.mod h1:txg5va2Qkip90uYoSKH+nkAAmXrb2j3iq4FLwdrCbXQ=
 github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
 github.com/envoyproxy/protoc-gen-validate v0.6.13 h1:TvDcILLkjuZV3ER58VkBmncKsLUBqBDxra/XctCzuMM=
@@ -962,7 +951,6 @@ github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk
 github.com/go-openapi/strfmt v0.19.11/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc=
 github.com/go-openapi/strfmt v0.20.0/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc=
 github.com/go-openapi/strfmt v0.20.1/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk=
-github.com/go-openapi/strfmt v0.20.2/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk=
 github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg=
 github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
 github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
@@ -1213,7 +1201,6 @@ github.com/google/pprof v0.0.0-20210506205249-923b5ab0fc1a/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210827144239-02619b876842/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20211122183932-1daafda22083/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
@@ -1250,7 +1237,6 @@ github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8
 github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gophercloud/gophercloud v0.10.0/go.mod h1:gmC5oQqMDOMO1t1gq5DquX/yAU808e/4mzjjDA76+Ss=
 github.com/gophercloud/gophercloud v0.18.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
-github.com/gophercloud/gophercloud v0.20.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
 github.com/gophercloud/gophercloud v0.23.0/go.mod h1:MRw6uyLj8uCGbIvBlqL7QW67t0QtNZnzydUzewo1Ioc=
 github.com/gophercloud/gophercloud v1.0.0 h1:9nTGx0jizmHxDobe4mck89FyQHVyA3CaXLIUSGJjP9k=
 github.com/gophercloud/gophercloud v1.0.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41AdQMDwyo1myduD5c=
@@ -1279,16 +1265,10 @@ github.com/grafana/alerting v0.0.0-20230315185333-d1e3c68ac064 h1:MtsWzSTav7NGKo
 github.com/grafana/alerting v0.0.0-20230315185333-d1e3c68ac064/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
 github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
-github.com/grafana/cuetsy v0.1.6 h1:61QGIDy1rVABU3OkoarOn0+qPdGopIJr34PyWVmGDfs=
-github.com/grafana/cuetsy v0.1.6/go.mod h1:4KWkUOslwvRTpEv7wdQG0jDFTuJmU+0L9x0h4kWxa2A=
-github.com/grafana/dataplane/examples v0.0.0-20230322121339-5fb4468146dd h1:w7pLYpu9nJLUiam5Zw0VjC0QwHVCYBswdioc/cLr858=
-github.com/grafana/dataplane/examples v0.0.0-20230322121339-5fb4468146dd/go.mod h1:h5YwY8s407/17XF5/dS8XrUtsTVV2RnuW8+m1Mp46mg=
+github.com/grafana/cuetsy v0.1.8 h1:l0AKXfHr0clu6qPirirDzNC/W5mqq5gG7iruOVolG34=
+github.com/grafana/cuetsy v0.1.8/go.mod h1:KCOoGIutYLt/5EY9M7jXdbfjSbZ/CNhRkl+yVeG6BFc=
 github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad h1:bROIOQEkRlxAt+Epn9Pos8ytkVqoIAvnaUZOAb7EgEU=
 github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad/go.mod h1:h5YwY8s407/17XF5/dS8XrUtsTVV2RnuW8+m1Mp46mg=
-github.com/grafana/dataplane/sdata v0.0.4 h1:GumUrUHsdCkGTjXbzy5uBmjLYavUYHPZ18ad6U9Whuc=
-github.com/grafana/dataplane/sdata v0.0.4/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
-github.com/grafana/dataplane/sdata v0.0.5 h1:RIfwNCd5777nSOyw5C7nRFlWhO2cjVJaHmKjUQNiTn4=
-github.com/grafana/dataplane/sdata v0.0.5/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
 github.com/grafana/dataplane/sdata v0.0.6 h1:Ejlj8d1Hvy/uDLeI4sOvL34Y8WLlVDd9iN270F+8aTw=
 github.com/grafana/dataplane/sdata v0.0.6/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
 github.com/grafana/dskit v0.0.0-20230202092222-880a7f8141cc h1:lQFgXpsZNDdi0whUROW15r/akzLIdXAn6xr5vqlZucI=
@@ -1305,10 +1285,6 @@ github.com/grafana/grafana-google-sdk-go v0.1.0 h1:LKGY8z2DSxKjYfr2flZsWgTRTZ6HG
 github.com/grafana/grafana-google-sdk-go v0.1.0/go.mod h1:Vo2TKWfDVmNTELBUM+3lkrZvFtBws0qSZdXhQxRdJrE=
 github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW39s+c+LetqSCjFj7xxPC5+M=
 github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk=
-github.com/grafana/grafana-plugin-sdk-go v0.157.0 h1:Qm0r5A4TsG+Tmy8Vagffqv21t3R/tzFUdYZZpd9COYE=
-github.com/grafana/grafana-plugin-sdk-go v0.157.0/go.mod h1:FwinU1fti54nWWsacIdL8D2WfYcKOWB2VRMtxnBbY+o=
-github.com/grafana/grafana-plugin-sdk-go v0.158.0 h1:kucTwr4LEa6hoSunnRqkuEeJOgbBTFrhdGNkJrMV4Zg=
-github.com/grafana/grafana-plugin-sdk-go v0.158.0/go.mod h1:7/F3lL/w3MGuZTwu0jam5oL/4zNOQmhs2k8WZ9VlzhI=
 github.com/grafana/grafana-plugin-sdk-go v0.159.0 h1:tjqzTe/wz+1zzaeHpOJvBvSvZFx/bJUSHj6WA8HJqhE=
 github.com/grafana/grafana-plugin-sdk-go v0.159.0/go.mod h1:7/F3lL/w3MGuZTwu0jam5oL/4zNOQmhs2k8WZ9VlzhI=
 github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375 h1:iWFjqAU5GjIV/HetIE/Me6VF3SRw29u5QviMVbJUVQo=
@@ -1350,7 +1326,6 @@ github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBt
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
 github.com/hashicorp/consul/api v1.4.0/go.mod h1:xc8u05kyMa3Wjr9eEAsIAo3dg8+LywT5E/Cl7cNS5nU=
 github.com/hashicorp/consul/api v1.8.1/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk=
-github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
 github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
 github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
 github.com/hashicorp/consul/api v1.15.3 h1:WYONYL2rxTXtlekAqblR2SCdJsizMDIj/uXb5wNy9zU=
@@ -1440,7 +1415,6 @@ github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKe
 github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493 h1:brI5vBRUlAlM34VFmnLPwjnCL/FxAJp9XvOdX6Zt+XE=
 github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hetznercloud/hcloud-go v1.26.2/go.mod h1:2C5uMtBiMoFr3m7lBFPf7wXTdh33CevmZpQIIDPGYJI=
-github.com/hetznercloud/hcloud-go v1.32.0/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME=
 github.com/hetznercloud/hcloud-go v1.33.1/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME=
 github.com/hetznercloud/hcloud-go v1.35.3 h1:WCmFAhLRooih2QHAsbCbEdpIHnshQQmrPqsr3rHE1Ow=
 github.com/hetznercloud/hcloud-go v1.35.3/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA=
@@ -1451,7 +1425,6 @@ github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbc
 github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
-github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -1468,14 +1441,12 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/flux v0.65.0/go.mod h1:BwN2XG2lMszOoquQaFdPET8FRQfrXiZsWmcMO9rkaVY=
 github.com/influxdata/flux v0.113.0/go.mod h1:3TJtvbm/Kwuo5/PEo5P6HUzwVg4bXWkb2wPQHPtQdlU=
-github.com/influxdata/flux v0.120.1/go.mod h1:pGSAvyAA5d3et7SSzajaYShWYXmnRnJJq2qWi+WWZ2I=
 github.com/influxdata/flux v0.131.0/go.mod h1:CKvnYe6FHpTj/E0YGI7TcOZdGiYHoToOPSnoa12RtKI=
 github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69/go.mod h1:pwymjR6SrP3gD3pRj9RJwdl1j5s3doEEV8gS4X9qSzA=
 github.com/influxdata/influxdb v1.7.6/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
 github.com/influxdata/influxdb v1.7.7/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
 github.com/influxdata/influxdb v1.8.0/go.mod h1:SIzcnsjaHRFpmlxpJ4S3NT64qtEKYweNTUMb/vh0OMQ=
 github.com/influxdata/influxdb v1.9.2/go.mod h1:UEe3MeD9AaP5rlPIes102IhYua3FhIWZuOXNHxDjSrI=
-github.com/influxdata/influxdb v1.9.3/go.mod h1:xD4ZjAgEJQO9/bX3NhFrssKtdNPi+ki1kjrttJRDhGc=
 github.com/influxdata/influxdb v1.9.5/go.mod h1:4uPVvcry9KWQVWLxyT9641qpkRXUBN+xa0MJFFNNLKo=
 github.com/influxdata/influxdb-client-go/v2 v2.3.1-0.20210518120617-5d1fff431040/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8=
 github.com/influxdata/influxdb-client-go/v2 v2.6.0 h1:bIOaGTgvvv1Na2hG+nIvqyv7PK2UiU2WrJN1ck1ykyM=
@@ -1622,6 +1593,7 @@ github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM52
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/knadh/koanf v1.2.0/go.mod h1:xpPTwMhsA/aaQLAilyCCqfpEiY1gpa160AiCuWHJUjY=
+github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg=
 github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1672,13 +1644,11 @@ github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0U
 github.com/linkedin/goavro/v2 v2.10.0 h1:eTBIRoInBM88gITGXYtUSqqxLTFXfOsJBiX8ZMW0o4U=
 github.com/linkedin/goavro/v2 v2.10.0/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA=
 github.com/linode/linodego v0.28.5/go.mod h1:BR0gVkCJffEdIGJSl6bHR80Ty+Uvg/2jkjmrWaFectM=
-github.com/linode/linodego v0.32.0/go.mod h1:BR0gVkCJffEdIGJSl6bHR80Ty+Uvg/2jkjmrWaFectM=
 github.com/linode/linodego v1.2.1/go.mod h1:x/7+BoaKd4unViBmS2umdjYyVAmpFtBtEXZ0wou7FYQ=
 github.com/linode/linodego v1.9.3 h1:+lxNZw4avRxhCqGjwfPgQ2PvMT+vOL0OMsTdzixR7hQ=
 github.com/linode/linodego v1.9.3/go.mod h1:h6AuFR/JpqwwM/vkj7s8KV3iGN8/jxn+zc437F8SZ8w=
 github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/lyft/protoc-gen-star v0.5.1/go.mod h1:9toiA3cC7z5uVbODF7kEQ91Xn7XNFkVUl+SrEe+ZORU=
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
 github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
@@ -2042,7 +2012,6 @@ github.com/prometheus/common v0.23.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMD
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
 github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
@@ -2051,7 +2020,6 @@ github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF
 github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
 github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
 github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg=
-github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
 github.com/prometheus/exporter-toolkit v0.7.0/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
 github.com/prometheus/exporter-toolkit v0.8.2 h1:sbJAfBXQFkG6sUkbwBun8MNdzW9+wd5YfPYofbmj0YM=
 github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0=
@@ -2102,7 +2070,6 @@ github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM=
@@ -2187,7 +2154,6 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
 github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
@@ -2300,8 +2266,8 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=
 github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
-github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
-github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU=
+github.com/urfave/cli/v2 v2.24.4/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
@@ -2352,6 +2318,8 @@ github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6Ut
 github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
 github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yalue/merged_fs v1.2.2 h1:vXHTpJBluJryju7BBpytr3PDIkzsPMpiEknxVGPhN/I=
 github.com/yalue/merged_fs v1.2.2/go.mod h1:WqqchfVYQyclV2tnR7wtRhBddzBvLVR83Cjw9BKQw0M=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
@@ -2700,7 +2668,6 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -2905,7 +2872,6 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -2978,7 +2944,6 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -3052,7 +3017,6 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200721032237-77f530d86f9a/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
@@ -3267,7 +3231,6 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
 k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
 k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
 k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s=
-k8s.io/api v0.22.1/go.mod h1:bh13rkTp3F1XEaLGykbyRD2QaTTzPm0e/BMd8ptFONY=
 k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk=
 k8s.io/api v0.25.3/go.mod h1:o42gKscFrEVjHdQnyRenACrMtbuJsVdP+WVjqejfzmI=
 k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=
@@ -3279,7 +3242,6 @@ k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRp
 k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
 k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
-k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
 k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0=
 k8s.io/apimachinery v0.25.3/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo=
 k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
@@ -3309,7 +3271,6 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
-k8s.io/klog/v2 v2.10.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/klog/v2 v2.20.0/go.mod h1:Gm8eSIfQN6457haJuPaMxZw4wyP5k+ykPFlrhQDvhvw=
 k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
@@ -3319,7 +3280,6 @@ k8s.io/kube-openapi v0.0.0-20190722073852-5e22f3d471e6/go.mod h1:RZvgC8MSN6DjiMV
 k8s.io/kube-openapi v0.0.0-20200316234421-82d701f24f9d/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
-k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index 75c2d74a010..d096dc2cd61 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -664,7 +664,7 @@ export interface TableFooterOptions {
   countRows?: boolean;
   enablePagination?: boolean;
   fields?: Array<string>;
-  reducer: Array<string>;
+  reducer: Array<string>; // actually 1 value
   show: boolean;
 }
 
@@ -846,7 +846,7 @@ export interface TableFieldOptions {
    */
   displayMode?: TableCellDisplayMode;
   filterable?: boolean;
-  hidden?: boolean;
+  hidden?: boolean; // ?? default is missing or false ??
   inspect: boolean;
   minWidth?: number;
   width?: number;
diff --git a/packages/grafana-schema/src/common/table.cue b/packages/grafana-schema/src/common/table.cue
index 2f45cf0d4eb..b5045dae96f 100644
--- a/packages/grafana-schema/src/common/table.cue
+++ b/packages/grafana-schema/src/common/table.cue
@@ -79,7 +79,7 @@ TableCellOptions: TableAutoCellOptions | TableSparklineCellOptions | TableBarGau
 TableFieldOptions: {
 	width?:      number
 	minWidth?:   number
-	align: FieldTextAlignment | *"auto"
+	align: FieldTextAlignment & (*"auto" | _)
 	// This field is deprecated in favor of using cellOptions
 	displayMode?: TableCellDisplayMode
 	cellOptions: TableCellOptions
diff --git a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
index b1332f1b72c..05e42d5a26a 100644
--- a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
+++ b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
@@ -27,7 +27,7 @@ export const defaultAnnotationTarget: Partial<AnnotationTarget> = {
  * FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
  */
 export interface AnnotationQuery {
-  builtIn: number;
+  builtIn: number; // TODO should this be persisted at all?
   /**
    * Datasource to use for annotation.
    */
@@ -193,7 +193,7 @@ export interface FieldColor {
   /**
    * The main color scheme mode
    */
-  mode: FieldColorModeId;
+  mode: (FieldColorModeId | string);
   /**
    * Some visualizations need to know how to assign a series color from by value color schemes
    */
diff --git a/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts b/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
index e18a9375d62..06f775ad878 100644
--- a/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
+++ b/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
@@ -13,7 +13,7 @@ export interface QueryHistoryPreference {
    * one of: '' | 'query' | 'starred';
    */
   homeTab?: string;
-}
+} // 0.0
 
 export interface Preferences {
   /**
diff --git a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
index 0fb508c16ec..33b46336479 100644
--- a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
@@ -355,10 +355,8 @@ type CloudWatchMetricsQuery struct {
 		From    *CloudWatchMetricsQuerySqlFrom `json:"from,omitempty"`
 		GroupBy *struct {
 			// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-			Expressions interface{} `json:"expressions"`
-
-			// TODO this doesn't work; temporarily extended in veneer
-			Type CloudWatchMetricsQuerySqlGroupByType `json:"type"`
+			Expressions interface{}                          `json:"expressions"`
+			Type        CloudWatchMetricsQuerySqlGroupByType `json:"type"`
 		} `json:"groupBy,omitempty"`
 		Limit   *int64 `json:"limit,omitempty"`
 		OrderBy *struct {
@@ -380,10 +378,8 @@ type CloudWatchMetricsQuery struct {
 		} `json:"select,omitempty"`
 		Where *struct {
 			// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-			Expressions interface{} `json:"expressions"`
-
-			// TODO this doesn't work; temporarily extended in veneer
-			Type CloudWatchMetricsQuerySqlWhereType `json:"type"`
+			Expressions interface{}                        `json:"expressions"`
+			Type        CloudWatchMetricsQuerySqlWhereType `json:"type"`
 		} `json:"where,omitempty"`
 	} `json:"sql,omitempty"`
 	SqlExpression *string `json:"sqlExpression,omitempty"`
@@ -423,7 +419,7 @@ type CloudWatchMetricsQuerySqlFrom struct {
 	union json.RawMessage
 }
 
-// TODO this doesn't work; temporarily extended in veneer
+// CloudWatchMetricsQuerySqlGroupByType defines model for CloudWatchMetricsQuery.Sql.GroupBy.Type.
 type CloudWatchMetricsQuerySqlGroupByType string
 
 // CloudWatchMetricsQuerySqlOrderByParametersType defines model for CloudWatchMetricsQuery.Sql.OrderBy.Parameters.Type.
@@ -438,7 +434,7 @@ type CloudWatchMetricsQuerySqlSelectParametersType string
 // CloudWatchMetricsQuerySqlSelectType defines model for CloudWatchMetricsQuery.Sql.Select.Type.
 type CloudWatchMetricsQuerySqlSelectType string
 
-// TODO this doesn't work; temporarily extended in veneer
+// CloudWatchMetricsQuerySqlWhereType defines model for CloudWatchMetricsQuery.Sql.Where.Type.
 type CloudWatchMetricsQuerySqlWhereType string
 
 // CloudWatchQueryMode defines model for CloudWatchQueryMode.
@@ -479,13 +475,11 @@ type MetricStat struct {
 // QueryEditorArrayExpression defines model for QueryEditorArrayExpression.
 type QueryEditorArrayExpression struct {
 	// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-	Expressions interface{} `json:"expressions"`
-
-	// TODO this doesn't work; temporarily extended in veneer
-	Type QueryEditorArrayExpressionType `json:"type"`
+	Expressions interface{}                    `json:"expressions"`
+	Type        QueryEditorArrayExpressionType `json:"type"`
 }
 
-// TODO this doesn't work; temporarily extended in veneer
+// QueryEditorArrayExpressionType defines model for QueryEditorArrayExpression.Type.
 type QueryEditorArrayExpressionType string
 
 // QueryEditorArrayExpression is added in veneer
@@ -613,10 +607,8 @@ type SQLExpression struct {
 	From    *SQLExpressionFrom `json:"from,omitempty"`
 	GroupBy *struct {
 		// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-		Expressions interface{} `json:"expressions"`
-
-		// TODO this doesn't work; temporarily extended in veneer
-		Type SQLExpressionGroupByType `json:"type"`
+		Expressions interface{}              `json:"expressions"`
+		Type        SQLExpressionGroupByType `json:"type"`
 	} `json:"groupBy,omitempty"`
 	Limit   *int64 `json:"limit,omitempty"`
 	OrderBy *struct {
@@ -638,10 +630,8 @@ type SQLExpression struct {
 	} `json:"select,omitempty"`
 	Where *struct {
 		// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-		Expressions interface{} `json:"expressions"`
-
-		// TODO this doesn't work; temporarily extended in veneer
-		Type SQLExpressionWhereType `json:"type"`
+		Expressions interface{}            `json:"expressions"`
+		Type        SQLExpressionWhereType `json:"type"`
 	} `json:"where,omitempty"`
 }
 
@@ -666,7 +656,7 @@ type SQLExpressionFrom struct {
 	union json.RawMessage
 }
 
-// TODO this doesn't work; temporarily extended in veneer
+// SQLExpressionGroupByType defines model for SQLExpression.GroupBy.Type.
 type SQLExpressionGroupByType string
 
 // SQLExpressionOrderByParametersType defines model for SQLExpression.OrderBy.Parameters.Type.
@@ -681,5 +671,5 @@ type SQLExpressionSelectParametersType string
 // SQLExpressionSelectType defines model for SQLExpression.Select.Type.
 type SQLExpressionSelectType string
 
-// TODO this doesn't work; temporarily extended in veneer
+// SQLExpressionWhereType defines model for SQLExpression.Where.Type.
 type SQLExpressionWhereType string
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.cue b/public/app/plugins/datasource/cloudwatch/dataquery.cue
index c8a0c2f5cd3..06f2d85d4eb 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.cue
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.cue
@@ -121,7 +121,6 @@ composableKinds: DataQuery: {
 						#QueryEditorPropertyType: "string" @cuetsy(kind="enum")
 
 						#QueryEditorArrayExpression: {
-							// TODO this doesn't work; temporarily extended in veneer
 							type: (#QueryEditorExpressionType & "and") | (#QueryEditorExpressionType & "or")
 							// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
 							expressions: _
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
index 9a467588bf2..f265a23c393 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
@@ -143,10 +143,7 @@ export interface QueryEditorArrayExpression {
    * TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
    */
   expressions: unknown;
-  /**
-   * TODO this doesn't work; temporarily extended in veneer
-   */
-  type: QueryEditorExpressionType;
+  type: (QueryEditorExpressionType.And | QueryEditorExpressionType.Or);
 }
 
 /**
diff --git a/public/app/plugins/datasource/testdata/dataquery.cue b/public/app/plugins/datasource/testdata/dataquery.cue
index 06f33343b71..36cab2cf727 100644
--- a/public/app/plugins/datasource/testdata/dataquery.cue
+++ b/public/app/plugins/datasource/testdata/dataquery.cue
@@ -32,7 +32,7 @@ composableKinds: DataQuery: {
 					{
 						common.DataQuery
 						alias?:       string
-						scenarioId?:  #TestDataQueryType | *"random_walk"
+						scenarioId?:  #TestDataQueryType & (*"random_walk" | _)
 						stringInput?: string
 						stream?:      #StreamingQuery
 						pulseWave?:   #PulseWaveQuery
diff --git a/public/app/plugins/datasource/testdata/dataquery.gen.ts b/public/app/plugins/datasource/testdata/dataquery.gen.ts
index dcd3d303f6b..8aa2b9289d5 100644
--- a/public/app/plugins/datasource/testdata/dataquery.gen.ts
+++ b/public/app/plugins/datasource/testdata/dataquery.gen.ts
@@ -112,7 +112,7 @@ export interface TestData extends common.DataQuery {
   channel?: string;
   csvContent?: string;
   csvFileName?: string;
-  csvWave?: Array<CSVWave>;
+  csvWave?: Array<CSVWave>; // TODO can we prevent partial from being generated
   errorType?: ('server_panic' | 'frontend_exception' | 'frontend_observable');
   labels?: string;
   levelColumn?: boolean;
diff --git a/public/app/plugins/panel/barchart/panelcfg.cue b/public/app/plugins/panel/barchart/panelcfg.cue
index e02aa406753..988ddf3f442 100644
--- a/public/app/plugins/panel/barchart/panelcfg.cue
+++ b/public/app/plugins/panel/barchart/panelcfg.cue
@@ -37,7 +37,7 @@ composableKinds: PanelCfg: {
 							// Use the color value for a sibling field to color each bar value.
 							colorByField?: string
 							// Controls the orientation of the bar chart, either vertical or horizontal.
-							orientation: common.VizOrientation | *"auto"
+							orientation: common.VizOrientation & (*"auto" | _)
 							// Controls the radius of each bar.
 							barRadius?: float64 & >=0 & <=0.5 | *0
 							// Controls the rotation of the x axis labels.
@@ -48,9 +48,9 @@ composableKinds: PanelCfg: {
 							// negative values indicate backwards skipping behavior
 							xTickLabelSpacing?: int32 | *0
 							// Controls whether bars are stacked or not, either normally or in percent mode.
-							stacking: common.StackingMode | *"none"
+							stacking: common.StackingMode & (*"none" | _)
 							// This controls whether values are shown on top or to the left of bars.
-							showValue: common.VisibilityMode | *"auto"
+							showValue: common.VisibilityMode & (*"auto" | _)
 							// Controls the width of bars. 1 = Max width, 0 = Min width.
 							barWidth: float64 & >=0 & <=1 | *0.97
 							// Controls the width of groups. 1 = max with, 0 = min width.
@@ -69,7 +69,7 @@ composableKinds: PanelCfg: {
 							fillOpacity?: int32 & >=0 & <=100 | *80
 							// Set the mode of the gradient fill. Fill gradient is based on the line color. To change the color, use the standard color scheme field option.
 							// Gradient appearance is influenced by the Fill opacity setting.
-							gradientMode?: common.GraphGradientMode | *"none"
+							gradientMode?: common.GraphGradientMode & (*"none" | _)
 							// Threshold rendering
 							thresholdsStyle?: common.GraphThresholdsStyleConfig
 						} @cuetsy(kind="interface")
diff --git a/public/app/plugins/panel/bargauge/panelcfg.cue b/public/app/plugins/panel/bargauge/panelcfg.cue
index ffb83db0724..7e9e3d8ad66 100644
--- a/public/app/plugins/panel/bargauge/panelcfg.cue
+++ b/public/app/plugins/panel/bargauge/panelcfg.cue
@@ -28,8 +28,8 @@ composableKinds: PanelCfg: {
 					{
 						PanelOptions: {
 							common.SingleStatBaseOptions
-							displayMode:  common.BarGaugeDisplayMode | *"gradient"
-							valueMode:    common.BarGaugeValueMode | *"color"
+							displayMode:  common.BarGaugeDisplayMode & (*"gradient" | _)
+							valueMode:    common.BarGaugeValueMode & (*"color" | _)
 							showUnfilled: bool | *true
 							minVizWidth:  uint32 | *0
 							minVizHeight: uint32 | *10
diff --git a/public/app/plugins/panel/heatmap/panelcfg.cue b/public/app/plugins/panel/heatmap/panelcfg.cue
index 3e4b5e73638..77df808db82 100644
--- a/public/app/plugins/panel/heatmap/panelcfg.cue
+++ b/public/app/plugins/panel/heatmap/panelcfg.cue
@@ -31,13 +31,13 @@ composableKinds: PanelCfg: {
 						// Controls various color options
 						HeatmapColorOptions: {
 							// Sets the color mode
-							mode?: HeatmapColorMode // TODO: remove optional when https://github.com/grafana/cuetsy/issues/74 is fixed
+							mode?: HeatmapColorMode
 							// Controls the color scheme used
 							scheme: string
 							// Controls the color fill when in opacity mode
 							fill: string
 							// Controls the color scale
-							scale?: HeatmapColorScale // TODO: remove optional when https://github.com/grafana/cuetsy/issues/74 is fixed
+							scale?: HeatmapColorScale
 							// Controls the exponent when scale is set to exponential
 							exponent: float32
 							// Controls the number of color steps
@@ -127,7 +127,7 @@ composableKinds: PanelCfg: {
 							// 	layout: ui.HeatmapCellLayout & "auto" // TODO: fix after remove when https://github.com/grafana/cuetsy/issues/74 is fixed
 							// }
 							// Controls the display of the value in the cell
-							showValue: ui.VisibilityMode | *"auto"
+							showValue: ui.VisibilityMode & (*"auto" | _)
 							// Controls gap between cells
 							cellGap?: uint8 & >=0 & <=25 | *1
 							// Controls cell radius
diff --git a/public/app/plugins/panel/histogram/panelcfg.cue b/public/app/plugins/panel/histogram/panelcfg.cue
index 43fc28b3b1e..7e6bdda9328 100644
--- a/public/app/plugins/panel/histogram/panelcfg.cue
+++ b/public/app/plugins/panel/histogram/panelcfg.cue
@@ -48,7 +48,7 @@ composableKinds: PanelCfg: {
 							fillOpacity?: uint32 & <=100 | *80
 							// Set the mode of the gradient fill. Fill gradient is based on the line color. To change the color, use the standard color scheme field option.
 							// Gradient appearance is influenced by the Fill opacity setting.
-							gradientMode?: common.GraphGradientMode | *"none"
+							gradientMode?: common.GraphGradientMode & (*"none" | _)
 						} @cuetsy(kind="interface")
 					},
 				]
diff --git a/public/app/plugins/panel/stat/panelcfg.cue b/public/app/plugins/panel/stat/panelcfg.cue
index 4cb87594a86..17ea0e2ddfd 100644
--- a/public/app/plugins/panel/stat/panelcfg.cue
+++ b/public/app/plugins/panel/stat/panelcfg.cue
@@ -28,10 +28,10 @@ composableKinds: PanelCfg: {
 					{
 						PanelOptions: {
 							common.SingleStatBaseOptions
-							graphMode:   common.BigValueGraphMode | *"area"
-							colorMode:   common.BigValueColorMode | *"value"
-							justifyMode: common.BigValueJustifyMode | *"auto"
-							textMode:    common.BigValueTextMode | *"auto"
+							graphMode:   common.BigValueGraphMode & (*"area" | _)
+							colorMode:   common.BigValueColorMode & (*"value" | _)
+							justifyMode: common.BigValueJustifyMode & (*"auto" | _)
+							textMode:    common.BigValueTextMode & (*"auto" | _)
 						} @cuetsy(kind="interface")
 					},
 				]
diff --git a/public/app/plugins/panel/state-timeline/panelcfg.cue b/public/app/plugins/panel/state-timeline/panelcfg.cue
index dc35ccf0fdb..c29fc243684 100644
--- a/public/app/plugins/panel/state-timeline/panelcfg.cue
+++ b/public/app/plugins/panel/state-timeline/panelcfg.cue
@@ -31,13 +31,13 @@ composableKinds: PanelCfg: {
 							ui.OptionsWithTimezones
 
 							//Show timeline values on chart
-							showValue: ui.VisibilityMode | *"auto"
+							showValue: ui.VisibilityMode & (*"auto" | _)
 							//Controls the row height
 							rowHeight: float & <=1 | *0.9
 							//Merge equal consecutive values
 							mergeValues?: bool | *true
 							//Controls value alignment on the timelines
-							alignValue?: ui.TimelineValueAlignment | *"left"
+							alignValue?: ui.TimelineValueAlignment & (*"left" | _)
 						} @cuetsy(kind="interface")
 						PanelFieldConfig: {
 							ui.HideableFieldConfig
diff --git a/public/app/plugins/panel/status-history/panelcfg.cue b/public/app/plugins/panel/status-history/panelcfg.cue
index 04a7fc4c6fc..ec4df7f94ab 100644
--- a/public/app/plugins/panel/status-history/panelcfg.cue
+++ b/public/app/plugins/panel/status-history/panelcfg.cue
@@ -33,7 +33,7 @@ composableKinds: PanelCfg: {
 							//Set the height of the rows
 							rowHeight: float32 & >=0 & <=1 | *0.9
 							//Show values on the columns
-							showValue: ui.VisibilityMode | *"auto"
+							showValue: ui.VisibilityMode & (*"auto" | _)
 							//Controls the column width
 							colWidth?: float & <=1 | *0.9
 						} @cuetsy(kind="interface")
diff --git a/public/app/plugins/panel/table/panelcfg.cue b/public/app/plugins/panel/table/panelcfg.cue
index 56df445afa5..c79cc2510b2 100644
--- a/public/app/plugins/panel/table/panelcfg.cue
+++ b/public/app/plugins/panel/table/panelcfg.cue
@@ -44,7 +44,7 @@ composableKinds: PanelCfg: {
 								reducer: []
 							}
 							// Controls the height of the rows
-							cellHeight?: ui.TableCellHeight | *"sm"
+							cellHeight?: ui.TableCellHeight & (*"sm" | _)
 						} @cuetsy(kind="interface")
 					},
 				]
diff --git a/public/app/plugins/panel/text/panelcfg.cue b/public/app/plugins/panel/text/panelcfg.cue
index 3ffc1aca627..0a393afd819 100644
--- a/public/app/plugins/panel/text/panelcfg.cue
+++ b/public/app/plugins/panel/text/panelcfg.cue
@@ -34,7 +34,7 @@ composableKinds: PanelCfg: {
 						} @cuetsy(kind="interface")
 
 						PanelOptions: {
-							mode:    TextMode | *"markdown"
+							mode:    TextMode & (*"markdown" | _)
 							code?:   CodeOptions
 							content: string | *"""
                     # Title
diff --git a/public/app/plugins/panel/xychart/panelcfg.cue b/public/app/plugins/panel/xychart/panelcfg.cue
index 55b1372d187..ec1e0ab82e3 100644
--- a/public/app/plugins/panel/xychart/panelcfg.cue
+++ b/public/app/plugins/panel/xychart/panelcfg.cue
@@ -44,7 +44,7 @@ composableKinds: PanelCfg: {
 							common.HideableFieldConfig
 							common.AxisConfig
 
-							show?: ScatterShow | *"points"
+							show?: ScatterShow & (*"points" | _)
 
 							pointSize?:  common.ScaleDimensionConfig
 							lineColor?:  common.ColorDimensionConfig
@@ -53,7 +53,7 @@ composableKinds: PanelCfg: {
 
 							lineWidth?: int32 & >=0
 							lineStyle?: common.LineStyle
-							label?:     common.VisibilityMode | *"auto"
+							label?:     common.VisibilityMode & (*"auto" | _)
 						} @cuetsy(kind="interface",TSVeneer="type")
 
 						ScatterSeriesConfig: {

From a6a7cebbe5e133aaf9f1b4b2cd44966fe31d95f6 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Fri, 14 Apr 2023 17:05:43 +0200
Subject: [PATCH 153/729] Logs: Redesign and improve LogContext (#65939)

* Logs: Add new LogRowContext types to grafana/data

* use right type for `RowContextOptions`

* add missing renames

* add show context modal

* no need to call

* removed unused css

* sort properties

* rename

* use correct

* use

* add tests for

* wip

* remove add/minus buttons

* add tests

* disable processing of context results in Loki

* moved into table to align properly

* remove imports

* add highlighting of opened logline

* improve scrolling behavior

* correct style for the table

* use correct query direction

* fix text

* use LoadingBar

* use overflow auto

* rename `onToggleContext` to `onOpenContext`

* add missing import

* mock scrollIntoView

* update unused props

* remove unused import

* no need to process context dataframes

* only show `LogRowContextModal` if `getRowContext` is defined

* remove unused param

* use `userEvent` rather `fireEvent`

* change to `TimeZone`

* directly use style classes

* revert change to public_dashboard_service_mock.go

* improved styling

* add missing await in test

* fix lint

* fix lint

* remove LogRow scrolling when context is opened

* remove references to `scrollElement`

* Update public/app/features/logs/components/log-context/LogRowContextModal.tsx

Co-authored-by: Matias Chomicki <matyax@gmail.com>

* fix lint

* add comment explaining `onCloseContext`

* add comment about debounced onClose

* add comments and remove `showRowMenu`

* scroll twice to correctly center the element

* revert double scrolling

* remove unnecessary `processDataFrame`

* trigger drone

---------

Co-authored-by: Matias Chomicki <matyax@gmail.com>
---
 .betterer.results                             |   6 -
 public/app/features/explore/Explore.tsx       |   1 -
 public/app/features/explore/Logs.tsx          |  44 +-
 public/app/features/explore/LogsContainer.tsx |   3 -
 .../app/features/logs/components/LogRow.tsx   |  88 +---
 .../logs/components/LogRowMessage.tsx         | 119 +----
 .../app/features/logs/components/LogRows.tsx  |  25 +-
 .../log-context/LogContextButtons.test.tsx    |  47 ++
 .../log-context/LogContextButtons.tsx         |  38 ++
 .../log-context/LogRowContext.test.tsx        |  43 --
 .../components/log-context/LogRowContext.tsx  | 455 ------------------
 .../log-context/LogRowContextModal.test.tsx   | 100 ++++
 .../log-context/LogRowContextModal.tsx        | 299 ++++++++++++
 .../LogRowContextProvider.test.tsx            | 184 -------
 .../log-context/LogRowContextProvider.tsx     | 248 ----------
 .../datasource/elasticsearch/datasource.ts    |  46 +-
 .../datasource/loki/LogContextProvider.ts     |  35 +-
 17 files changed, 570 insertions(+), 1211 deletions(-)
 create mode 100644 public/app/features/logs/components/log-context/LogContextButtons.test.tsx
 create mode 100644 public/app/features/logs/components/log-context/LogContextButtons.tsx
 delete mode 100644 public/app/features/logs/components/log-context/LogRowContext.test.tsx
 delete mode 100644 public/app/features/logs/components/log-context/LogRowContext.tsx
 create mode 100644 public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
 create mode 100644 public/app/features/logs/components/log-context/LogRowContextModal.tsx
 delete mode 100644 public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
 delete mode 100644 public/app/features/logs/components/log-context/LogRowContextProvider.tsx

diff --git a/.betterer.results b/.betterer.results
index ccfc022545e..d07511ae306 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2950,12 +2950,6 @@ exports[`better eslint`] = {
     "public/app/features/live/index.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/logs/components/log-context/LogRowContextProvider.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"]
-    ],
     "public/app/features/logs/utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 3fab8c067ad..c85b9494459 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -358,7 +358,6 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
         onClickFilterOutLabel={this.onClickFilterOutLabel}
         onStartScanning={this.onStartScanning}
         onStopScanning={this.onStopScanning}
-        scrollElement={this.scrollElement}
         eventBus={this.logsEventBus}
         splitOpenFn={this.onSplitOpen('logs')}
       />
diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index c1c2e0e8a96..5c9854adb73 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -45,6 +45,7 @@ import store from 'app/core/store';
 import { ExploreId } from 'app/types/explore';
 
 import { LogRows } from '../logs/components/LogRows';
+import { LogRowContextModal } from '../logs/components/log-context/LogRowContextModal';
 
 import { LogsMetaRow } from './LogsMetaRow';
 import LogsNavigation from './LogsNavigation';
@@ -70,7 +71,6 @@ interface Props extends Themeable2 {
   datasourceType?: string;
   logsVolumeEnabled: boolean;
   logsVolumeData: DataQueryResponse | undefined;
-  scrollElement?: HTMLDivElement;
   onSetLogsVolumeEnabled: (enabled: boolean) => void;
   loadLogsVolumeData: () => void;
   showContextToggle?: (row?: LogRowModel) => boolean;
@@ -98,6 +98,8 @@ interface State {
   isFlipping: boolean;
   displayedFields: string[];
   forceEscape: boolean;
+  contextOpen: boolean;
+  contextRow?: LogRowModel;
 }
 
 // We need to override css overflow of divs in Collapse element to enable sticky Logs navigation
@@ -135,6 +137,8 @@ class UnthemedLogs extends PureComponent<Props, State> {
     isFlipping: false,
     displayedFields: [],
     forceEscape: false,
+    contextOpen: false,
+    contextRow: undefined,
   };
 
   constructor(props: Props) {
@@ -296,6 +300,28 @@ class UnthemedLogs extends PureComponent<Props, State> {
     });
   };
 
+  onCloseContext = () => {
+    this.setState({
+      contextOpen: false,
+      contextRow: undefined,
+    });
+  };
+
+  onOpenContext = (row: LogRowModel, onClose: () => void) => {
+    // we are setting the `contextOpen` open state and passing it down to the `LogRow` in order to highlight the row when a LogContext is open
+    this.setState({
+      contextOpen: true,
+      contextRow: row,
+    });
+    this.onCloseContext = () => {
+      this.setState({
+        contextOpen: false,
+        contextRow: undefined,
+      });
+      onClose();
+    };
+  };
+
   checkUnescapedContent = memoizeOne((logRows: LogRowModel[]) => {
     return !!logRows.some((r) => r.hasUnescapedContent);
   });
@@ -350,7 +376,6 @@ class UnthemedLogs extends PureComponent<Props, State> {
       clearCache,
       addResultsToCache,
       exploreId,
-      scrollElement,
       getRowContext,
       getLogRowContextUi,
     } = this.props;
@@ -366,6 +391,8 @@ class UnthemedLogs extends PureComponent<Props, State> {
       isFlipping,
       displayedFields,
       forceEscape,
+      contextOpen,
+      contextRow,
     } = this.state;
 
     const styles = getStyles(theme, wrapLogMessage);
@@ -380,6 +407,17 @@ class UnthemedLogs extends PureComponent<Props, State> {
 
     return (
       <>
+        {getRowContext && contextRow && (
+          <LogRowContextModal
+            open={contextOpen}
+            row={contextRow}
+            onClose={this.onCloseContext}
+            getRowContext={getRowContext}
+            getLogRowContextUi={getLogRowContextUi}
+            logsSortOrder={logsSortOrder}
+            timeZone={timeZone}
+          />
+        )}
         <Collapse label="Logs volume" collapsible isOpen={logsVolumeEnabled} onToggle={this.onToggleLogsVolumeCollapse}>
           {logsVolumeEnabled && (
             <LogsVolumePanelList
@@ -507,8 +545,8 @@ class UnthemedLogs extends PureComponent<Props, State> {
                 onClickShowField={this.showField}
                 onClickHideField={this.hideField}
                 app={CoreApp.Explore}
-                scrollElement={scrollElement}
                 onLogRowHover={this.onLogRowHover}
+                onOpenContext={this.onOpenContext}
               />
               {!loading && !hasData && !scanning && (
                 <div className={styles.noData}>
diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx
index ec88df6d6e2..b222fb8053e 100644
--- a/public/app/features/explore/LogsContainer.tsx
+++ b/public/app/features/explore/LogsContainer.tsx
@@ -35,7 +35,6 @@ interface LogsContainerProps extends PropsFromRedux {
   scanRange?: RawTimeRange;
   syncedTimes: boolean;
   loadingState: LoadingState;
-  scrollElement?: HTMLDivElement;
   onClickFilterLabel: (key: string, value: string) => void;
   onClickFilterOutLabel: (key: string, value: string) => void;
   onStartScanning: () => void;
@@ -115,7 +114,6 @@ class LogsContainer extends PureComponent<LogsContainerProps> {
       exploreId,
       addResultsToCache,
       clearCache,
-      scrollElement,
       logsVolume,
     } = this.props;
 
@@ -175,7 +173,6 @@ class LogsContainer extends PureComponent<LogsContainerProps> {
             getFieldLinks={this.getFieldLinks}
             addResultsToCache={() => addResultsToCache(exploreId)}
             clearCache={() => clearCache(exploreId)}
-            scrollElement={scrollElement}
             eventBus={this.props.eventBus}
           />
         </LogsCrossFadeTransition>
diff --git a/public/app/features/logs/components/LogRow.tsx b/public/app/features/logs/components/LogRow.tsx
index ef10135df72..a63a73b03a4 100644
--- a/public/app/features/logs/components/LogRow.tsx
+++ b/public/app/features/logs/components/LogRow.tsx
@@ -1,4 +1,5 @@
 import { cx } from '@emotion/css';
+import { debounce } from 'lodash';
 import React, { PureComponent } from 'react';
 
 import {
@@ -10,7 +11,6 @@ import {
   dateTimeFormat,
   CoreApp,
   DataFrame,
-  DataSourceWithLogsContextSupport,
   LogRowContextOptions,
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
@@ -24,12 +24,6 @@ import { LogLabels } from './LogLabels';
 import { LogRowMessage } from './LogRowMessage';
 import { LogRowMessageDisplayedFields } from './LogRowMessageDisplayedFields';
 import { getLogLevelStyles, LogRowStyles } from './getLogRowStyles';
-import {
-  LogRowContextRows,
-  LogRowContextQueryErrors,
-  HasMoreContextRows,
-  LogRowContextProvider,
-} from './log-context/LogRowContextProvider';
 
 interface Props extends Themeable2 {
   row: LogRowModel;
@@ -42,8 +36,6 @@ interface Props extends Themeable2 {
   enableLogDetails: boolean;
   logsSortOrder?: LogsSortOrder | null;
   forceEscape?: boolean;
-  scrollElement?: HTMLDivElement;
-  showRowMenu?: boolean;
   app?: CoreApp;
   displayedFields?: string[];
   getRows: () => LogRowModel[];
@@ -57,7 +49,7 @@ interface Props extends Themeable2 {
   onClickShowField?: (key: string) => void;
   onClickHideField?: (key: string) => void;
   onLogRowHover?: (row?: LogRowModel) => void;
-  toggleContextIsOpen?: () => void;
+  onOpenContext: (row: LogRowModel, onClose: () => void) => void;
   styles: LogRowStyles;
 }
 
@@ -79,20 +71,14 @@ class UnThemedLogRow extends PureComponent<Props, State> {
     showDetails: false,
   };
 
-  toggleContext = (method: string) => {
-    const { datasourceType, uid: logRowUid } = this.props.row;
-    reportInteraction('grafana_explore_logs_log_context_clicked', {
-      datasourceType,
-      logRowUid,
-      type: method,
-    });
+  // we are debouncing the state change by 3 seconds to highlight the logline after the context closed.
+  debouncedContextClose = debounce(() => {
+    this.setState({ showContext: false });
+  }, 3000);
 
-    this.props.toggleContextIsOpen?.();
-    this.setState((state) => {
-      return {
-        showContext: !state.showContext,
-      };
-    });
+  onOpenContext = (row: LogRowModel) => {
+    this.setState({ showContext: true });
+    this.props.onOpenContext(row, this.debouncedContextClose);
   };
 
   toggleDetails = () => {
@@ -133,15 +119,7 @@ class UnThemedLogRow extends PureComponent<Props, State> {
     }
   };
 
-  renderLogRow(
-    context?: LogRowContextRows,
-    errors?: LogRowContextQueryErrors,
-    hasMoreContextRows?: HasMoreContextRows,
-    updateLimit?: () => void,
-    logsSortOrder?: LogsSortOrder | null,
-    getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'],
-    runContextQuery?: () => void
-  ) {
+  render() {
     const {
       getRows,
       onClickFilterLabel,
@@ -152,7 +130,6 @@ class UnThemedLogRow extends PureComponent<Props, State> {
       row,
       showDuplicates,
       showContextToggle,
-      showRowMenu,
       showLabels,
       showTime,
       displayedFields,
@@ -162,7 +139,6 @@ class UnThemedLogRow extends PureComponent<Props, State> {
       getFieldLinks,
       forceEscape,
       app,
-      scrollElement,
       styles,
     } = this.props;
     const { showDetails, showContext } = this.state;
@@ -219,22 +195,11 @@ class UnThemedLogRow extends PureComponent<Props, State> {
           ) : (
             <LogRowMessage
               row={processedRow}
-              getRows={getRows}
-              errors={errors}
-              hasMoreContextRows={hasMoreContextRows}
-              getLogRowContextUi={getLogRowContextUi}
-              runContextQuery={runContextQuery}
-              updateLimit={updateLimit}
-              context={context}
-              contextIsOpen={showContext}
               showContextToggle={showContextToggle}
-              showRowMenu={showRowMenu}
               wrapLogMessage={wrapLogMessage}
               prettifyLogMessage={prettifyLogMessage}
-              onToggleContext={this.toggleContext}
+              onOpenContext={this.onOpenContext}
               app={app}
-              scrollElement={scrollElement}
-              logsSortOrder={logsSortOrder}
               styles={styles}
             />
           )}
@@ -260,37 +225,6 @@ class UnThemedLogRow extends PureComponent<Props, State> {
       </>
     );
   }
-
-  render() {
-    const { showContext } = this.state;
-    const { logsSortOrder, row, getRowContext, getLogRowContextUi } = this.props;
-
-    if (showContext) {
-      return (
-        <>
-          <LogRowContextProvider row={row} getRowContext={getRowContext} logsSortOrder={logsSortOrder}>
-            {({ result, errors, hasMoreContextRows, updateLimit, runContextQuery, logsSortOrder }) => {
-              return (
-                <>
-                  {this.renderLogRow(
-                    result,
-                    errors,
-                    hasMoreContextRows,
-                    updateLimit,
-                    logsSortOrder,
-                    getLogRowContextUi,
-                    runContextQuery
-                  )}
-                </>
-              );
-            }}
-          </LogRowContextProvider>
-        </>
-      );
-    }
-
-    return this.renderLogRow();
-  }
 }
 
 export const LogRow = withTheme2(UnThemedLogRow);
diff --git a/public/app/features/logs/components/LogRowMessage.tsx b/public/app/features/logs/components/LogRowMessage.tsx
index 97a6a87b135..c32f651bcae 100644
--- a/public/app/features/logs/components/LogRowMessage.tsx
+++ b/public/app/features/logs/components/LogRowMessage.tsx
@@ -3,40 +3,21 @@ import memoizeOne from 'memoize-one';
 import React, { PureComponent } from 'react';
 import Highlighter from 'react-highlight-words';
 
-import {
-  LogRowModel,
-  findHighlightChunksInText,
-  LogsSortOrder,
-  CoreApp,
-  DataSourceWithLogsContextSupport,
-} from '@grafana/data';
+import { LogRowModel, findHighlightChunksInText, CoreApp } from '@grafana/data';
 import { IconButton, Tooltip } from '@grafana/ui';
 
 import { LogMessageAnsi } from './LogMessageAnsi';
 import { LogRowStyles } from './getLogRowStyles';
-import { LogRowContext } from './log-context/LogRowContext';
-import { LogRowContextQueryErrors, HasMoreContextRows, LogRowContextRows } from './log-context/LogRowContextProvider';
 
 export const MAX_CHARACTERS = 100000;
 
 interface Props {
   row: LogRowModel;
-  hasMoreContextRows?: HasMoreContextRows;
-  contextIsOpen: boolean;
   wrapLogMessage: boolean;
   prettifyLogMessage: boolean;
-  errors?: LogRowContextQueryErrors;
-  context?: LogRowContextRows;
-  showRowMenu?: boolean;
   app?: CoreApp;
-  scrollElement?: HTMLDivElement;
   showContextToggle?: (row?: LogRowModel) => boolean;
-  getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
-  getRows: () => LogRowModel[];
-  onToggleContext: (method: string) => void;
-  updateLimit?: () => void;
-  runContextQuery?: () => void;
-  logsSortOrder?: LogsSortOrder | null;
+  onOpenContext: (row: LogRowModel) => void;
   styles: LogRowStyles;
 }
 
@@ -78,42 +59,14 @@ const restructureLog = memoizeOne((line: string, prettifyLogMessage: boolean): s
 });
 
 export class LogRowMessage extends PureComponent<Props> {
-  logRowRef: React.RefObject<HTMLTableCellElement> = React.createRef();
-
-  onContextToggle = (e: React.SyntheticEvent<HTMLElement>) => {
-    e.stopPropagation();
-    this.props.onToggleContext('open');
-  };
-
   onShowContextClick = (e: React.SyntheticEvent<HTMLElement, Event>) => {
-    const { scrollElement } = this.props;
-    this.onContextToggle(e);
-    if (scrollElement && this.logRowRef.current) {
-      scrollElement.scroll({
-        behavior: 'smooth',
-        top: scrollElement.scrollTop + this.logRowRef.current.getBoundingClientRect().top - window.innerHeight / 2,
-      });
-    }
+    const { onOpenContext } = this.props;
+    e.stopPropagation();
+    onOpenContext(this.props.row);
   };
 
   render() {
-    const {
-      row,
-      errors,
-      hasMoreContextRows,
-      updateLimit,
-      runContextQuery,
-      context,
-      contextIsOpen,
-      showRowMenu,
-      wrapLogMessage,
-      prettifyLogMessage,
-      onToggleContext,
-      logsSortOrder,
-      showContextToggle,
-      getLogRowContextUi,
-      styles,
-    } = this.props;
+    const { row, wrapLogMessage, prettifyLogMessage, showContextToggle, styles } = this.props;
     const { hasAnsi, raw } = row;
     const restructuredEntry = restructureLog(raw, prettifyLogMessage);
     const shouldShowContextToggle = showContextToggle ? showContextToggle(row) : false;
@@ -124,59 +77,35 @@ export class LogRowMessage extends PureComponent<Props> {
           // When context is open, the position has to be NOT relative. // Setting the postion as inline-style to
           // overwrite the more sepecific style definition from `styles.logsRowMessage`.
         }
-        <td
-          ref={this.logRowRef}
-          style={contextIsOpen ? { position: 'unset' } : undefined}
-          className={styles.logsRowMessage}
-        >
+        <td className={styles.logsRowMessage}>
           <div
             className={cx(
               { [styles.positionRelative]: wrapLogMessage },
               { [styles.horizontalScroll]: !wrapLogMessage }
             )}
           >
-            {contextIsOpen && context && (
-              <LogRowContext
-                row={row}
-                getLogRowContextUi={getLogRowContextUi}
-                runContextQuery={runContextQuery}
-                context={context}
-                errors={errors}
-                wrapLogMessage={wrapLogMessage}
-                hasMoreContextRows={hasMoreContextRows}
-                onOutsideClick={onToggleContext}
-                logsSortOrder={logsSortOrder}
-                onLoadMoreContext={() => {
-                  if (updateLimit) {
-                    updateLimit();
-                  }
-                }}
-              />
-            )}
-            <button className={cx(styles.logLine, styles.positionRelative, { [styles.rowWithContext]: contextIsOpen })}>
+            <button className={cx(styles.logLine, styles.positionRelative)}>
               {renderLogMessage(hasAnsi, restructuredEntry, row.searchWords, styles.logsRowMatchHighLight)}
             </button>
           </div>
         </td>
-        {showRowMenu && (
-          <td className={cx('log-row-menu-cell', styles.logRowMenuCell)}>
-            <span
-              className={cx('log-row-menu', styles.rowMenu, {
-                [styles.rowMenuWithContextButton]: shouldShowContextToggle,
-              })}
-              onClick={(e) => e.stopPropagation()}
-            >
-              {shouldShowContextToggle && (
-                <Tooltip placement="top" content={'Show context'}>
-                  <IconButton size="md" name="gf-show-context" onClick={this.onShowContextClick} />
-                </Tooltip>
-              )}
-              <Tooltip placement="top" content={'Copy'}>
-                <IconButton size="md" name="copy" onClick={() => navigator.clipboard.writeText(restructuredEntry)} />
+        <td className={cx('log-row-menu-cell', styles.logRowMenuCell)}>
+          <span
+            className={cx('log-row-menu', styles.rowMenu, {
+              [styles.rowMenuWithContextButton]: shouldShowContextToggle,
+            })}
+            onClick={(e) => e.stopPropagation()}
+          >
+            {shouldShowContextToggle && (
+              <Tooltip placement="top" content={'Show context'}>
+                <IconButton size="md" name="gf-show-context" onClick={this.onShowContextClick} />
               </Tooltip>
-            </span>
-          </td>
-        )}
+            )}
+            <Tooltip placement="top" content={'Copy'}>
+              <IconButton size="md" name="copy" onClick={() => navigator.clipboard.writeText(restructuredEntry)} />
+            </Tooltip>
+          </span>
+        </td>
       </>
     );
   }
diff --git a/public/app/features/logs/components/LogRows.tsx b/public/app/features/logs/components/LogRows.tsx
index 2109c479c0d..14a65bffe4a 100644
--- a/public/app/features/logs/components/LogRows.tsx
+++ b/public/app/features/logs/components/LogRows.tsx
@@ -39,7 +39,6 @@ export interface Props extends Themeable2 {
   forceEscape?: boolean;
   displayedFields?: string[];
   app?: CoreApp;
-  scrollElement?: HTMLDivElement;
   showContextToggle?: (row?: LogRowModel) => boolean;
   onClickFilterLabel?: (key: string, value: string) => void;
   onClickFilterOutLabel?: (key: string, value: string) => void;
@@ -49,11 +48,11 @@ export interface Props extends Themeable2 {
   onClickShowField?: (key: string) => void;
   onClickHideField?: (key: string) => void;
   onLogRowHover?: (row?: LogRowModel) => void;
+  onOpenContext?: (row: LogRowModel, onClose: () => void) => void;
 }
 
 interface State {
   renderAll: boolean;
-  contextIsOpen: boolean;
 }
 
 class UnThemedLogRows extends PureComponent<Props, State> {
@@ -65,18 +64,15 @@ class UnThemedLogRows extends PureComponent<Props, State> {
 
   state: State = {
     renderAll: false,
-    contextIsOpen: false,
   };
 
   /**
    * Toggle the `contextIsOpen` state when a context of one LogRow is opened in order to not show the menu of the other log rows.
    */
-  toggleContextIsOpen = (): void => {
-    this.setState((state) => {
-      return {
-        contextIsOpen: !state.contextIsOpen,
-      };
-    });
+  openContext = (row: LogRowModel, onClose: () => void): void => {
+    if (this.props.onOpenContext) {
+      this.props.onOpenContext(row, onClose);
+    }
   };
 
   componentDidMount() {
@@ -130,10 +126,9 @@ class UnThemedLogRows extends PureComponent<Props, State> {
       forceEscape,
       onLogRowHover,
       app,
-      scrollElement,
       getLogRowContextUi,
     } = this.props;
-    const { renderAll, contextIsOpen } = this.state;
+    const { renderAll } = this.state;
     const styles = getLogRowStyles(theme);
     const dedupedRows = deduplicatedRows ? deduplicatedRows : logRows;
     const hasData = logRows && logRows.length > 0;
@@ -163,7 +158,6 @@ class UnThemedLogRows extends PureComponent<Props, State> {
                 getLogRowContextUi={getLogRowContextUi}
                 row={row}
                 showContextToggle={showContextToggle}
-                showRowMenu={!contextIsOpen}
                 showDuplicates={showDuplicates}
                 showLabels={showLabels}
                 showTime={showTime}
@@ -179,10 +173,9 @@ class UnThemedLogRows extends PureComponent<Props, State> {
                 getFieldLinks={getFieldLinks}
                 logsSortOrder={logsSortOrder}
                 forceEscape={forceEscape}
-                toggleContextIsOpen={this.toggleContextIsOpen}
+                onOpenContext={this.openContext}
                 onLogRowHover={onLogRowHover}
                 app={app}
-                scrollElement={scrollElement}
                 styles={styles}
               />
             ))}
@@ -196,7 +189,6 @@ class UnThemedLogRows extends PureComponent<Props, State> {
                 getLogRowContextUi={getLogRowContextUi}
                 row={row}
                 showContextToggle={showContextToggle}
-                showRowMenu={!contextIsOpen}
                 showDuplicates={showDuplicates}
                 showLabels={showLabels}
                 showTime={showTime}
@@ -212,10 +204,9 @@ class UnThemedLogRows extends PureComponent<Props, State> {
                 getFieldLinks={getFieldLinks}
                 logsSortOrder={logsSortOrder}
                 forceEscape={forceEscape}
-                toggleContextIsOpen={this.toggleContextIsOpen}
+                onOpenContext={this.openContext}
                 onLogRowHover={onLogRowHover}
                 app={app}
-                scrollElement={scrollElement}
                 styles={styles}
               />
             ))}
diff --git a/public/app/features/logs/components/log-context/LogContextButtons.test.tsx b/public/app/features/logs/components/log-context/LogContextButtons.test.tsx
new file mode 100644
index 00000000000..941bf2abf39
--- /dev/null
+++ b/public/app/features/logs/components/log-context/LogContextButtons.test.tsx
@@ -0,0 +1,47 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+
+import { LogContextButtons, LoadMoreOptions } from './LogContextButtons';
+
+describe('LogContextButtons', () => {
+  const onChangeOption = jest.fn();
+  const option: SelectableValue<number> = { label: '10 lines', value: 10 };
+  const position: 'top' | 'bottom' = 'bottom';
+
+  beforeEach(() => {
+    render(<LogContextButtons option={option} onChangeOption={onChangeOption} position={position} />);
+  });
+
+  it('should render a ButtonGroup with one button', () => {
+    const buttons = screen.getAllByRole('button');
+    expect(buttons.length).toBe(1);
+  });
+
+  it('should render a ButtonSelect with LoadMoreOptions', async () => {
+    const tenLinesButton = screen.getByRole('button', {
+      name: /10 lines/i,
+    });
+    await userEvent.click(tenLinesButton);
+    const options = screen.getAllByRole('menuitemradio');
+    expect(options.length).toBe(LoadMoreOptions.length);
+    options.forEach((optionEl, index) => {
+      expect(optionEl).toHaveTextContent(LoadMoreOptions[index].label!);
+    });
+  });
+
+  it('should call onChangeOption when an option is selected', async () => {
+    const tenLinesButton = screen.getByRole('button', {
+      name: /10 lines/i,
+    });
+    await userEvent.click(tenLinesButton);
+    const twentyLinesButton = screen.getByRole('menuitemradio', {
+      name: /20 lines/i,
+    });
+    await userEvent.click(twentyLinesButton);
+    const newOption = { label: '20 lines', value: 20 };
+    expect(onChangeOption).toHaveBeenCalledWith(newOption);
+  });
+});
diff --git a/public/app/features/logs/components/log-context/LogContextButtons.tsx b/public/app/features/logs/components/log-context/LogContextButtons.tsx
new file mode 100644
index 00000000000..d9c6b419480
--- /dev/null
+++ b/public/app/features/logs/components/log-context/LogContextButtons.tsx
@@ -0,0 +1,38 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { ButtonGroup, ButtonSelect, useStyles2 } from '@grafana/ui';
+
+const getStyles = () => {
+  return {
+    logSamplesButton: css`
+      display: inline-flex;
+    `,
+  };
+};
+
+export const LoadMoreOptions: Array<SelectableValue<number>> = [
+  { label: '10 lines', value: 10 },
+  { label: '20 lines', value: 20 },
+  { label: '50 lines', value: 50 },
+  { label: '100 lines', value: 100 },
+  { label: '200 lines', value: 200 },
+];
+
+export type Props = {
+  option: SelectableValue<number>;
+  onChangeOption: (item: SelectableValue<number>) => void;
+  position?: 'top' | 'bottom';
+};
+
+export const LogContextButtons = (props: Props) => {
+  const { option, onChangeOption } = props;
+  const styles = useStyles2(getStyles);
+
+  return (
+    <ButtonGroup className={styles.logSamplesButton}>
+      <ButtonSelect variant="canvas" value={option} options={LoadMoreOptions} onChange={onChangeOption} />
+    </ButtonGroup>
+  );
+};
diff --git a/public/app/features/logs/components/log-context/LogRowContext.test.tsx b/public/app/features/logs/components/log-context/LogRowContext.test.tsx
deleted file mode 100644
index 40e43b01b02..00000000000
--- a/public/app/features/logs/components/log-context/LogRowContext.test.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { LogRowModel, LogsSortOrder } from '@grafana/data';
-
-import { LogGroupPosition, LogRowContextGroup } from './LogRowContext';
-
-describe('LogRowContextGroup component', () => {
-  it('should correctly render logs with ANSI', () => {
-    const defaultProps = {
-      rows: ['Log 1 with \u001B[31mANSI\u001B[0m code', 'Log 2', 'Log 3 with \u001B[31mANSI\u001B[0m code'],
-      onLoadMoreContext: () => {},
-      canLoadMoreRows: false,
-      row: {} as LogRowModel,
-      className: '',
-      groupPosition: LogGroupPosition.Top,
-    };
-
-    render(<LogRowContextGroup {...defaultProps} />);
-    expect(screen.getAllByTestId('ansiLogLine')).toHaveLength(2);
-  });
-
-  it.each([
-    [LogGroupPosition.Top, LogsSortOrder.Ascending, 'before'],
-    [LogGroupPosition.Top, LogsSortOrder.Descending, 'after'],
-    [LogGroupPosition.Bottom, LogsSortOrder.Ascending, 'after'],
-    [LogGroupPosition.Bottom, LogsSortOrder.Descending, 'before'],
-  ])(`should when component is %s and sorting is %s display '%s'`, async (groupPosition, logsSortOrder, expected) => {
-    const defaultProps = {
-      rows: ['Log 1', 'Log 2', 'Log 3'],
-      onLoadMoreContext: () => {},
-      canLoadMoreRows: false,
-      row: {} as LogRowModel,
-      className: '',
-      groupPosition,
-      logsSortOrder,
-    };
-
-    render(<LogRowContextGroup {...defaultProps} />);
-
-    expect(await screen.findByText(`Showing 3 lines ${expected} match.`)).toBeInTheDocument();
-  });
-});
diff --git a/public/app/features/logs/components/log-context/LogRowContext.tsx b/public/app/features/logs/components/log-context/LogRowContext.tsx
deleted file mode 100644
index 937be311f34..00000000000
--- a/public/app/features/logs/components/log-context/LogRowContext.tsx
+++ /dev/null
@@ -1,455 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import usePrevious from 'react-use/lib/usePrevious';
-
-import {
-  DataQueryError,
-  GrafanaTheme2,
-  LogRowModel,
-  LogsSortOrder,
-  textUtil,
-  DataSourceWithLogsContextSupport,
-} from '@grafana/data';
-import { config } from '@grafana/runtime';
-import {
-  Alert,
-  Button,
-  ClickOutsideWrapper,
-  CustomScrollbar,
-  IconButton,
-  List,
-  useStyles2,
-  useTheme2,
-} from '@grafana/ui';
-
-import { LogMessageAnsi } from '../LogMessageAnsi';
-
-import { HasMoreContextRows, LogRowContextQueryErrors, LogRowContextRows } from './LogRowContextProvider';
-
-export enum LogGroupPosition {
-  Bottom = 'bottom',
-  Top = 'top',
-}
-
-interface LogRowContextProps {
-  row: LogRowModel;
-  context: LogRowContextRows;
-  wrapLogMessage: boolean;
-  errors?: LogRowContextQueryErrors;
-  hasMoreContextRows?: HasMoreContextRows;
-  logsSortOrder?: LogsSortOrder | null;
-  onOutsideClick: (method: string) => void;
-  onLoadMoreContext: () => void;
-  runContextQuery?: () => void;
-  getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
-}
-
-const getLogRowContextStyles = (theme: GrafanaTheme2, wrapLogMessage?: boolean, datasourceUiHeight?: number) => {
-  if (!config.featureToggles.logsContextDatasourceUi || !datasourceUiHeight) {
-    datasourceUiHeight = 0;
-  }
-  /**
-   * This is workaround for displaying uncropped context when we have unwrapping log messages.
-   * We are using margins to correctly position context. Because non-wrapped logs have always 1 line of log
-   * and 1 line of Show/Hide context switch. Therefore correct position can be reliably achieved by margins.
-   * We also adjust width to 75%.
-   */
-
-  const headerHeight = 40;
-  const logsHeight = 220;
-  const contextHeight = datasourceUiHeight + headerHeight + logsHeight;
-  const bottomContextHeight = headerHeight + logsHeight;
-  const width = wrapLogMessage ? '100%' : '75%';
-  const afterContext = wrapLogMessage
-    ? css`
-        top: -${contextHeight}px;
-      `
-    : css`
-        margin-top: -${contextHeight}px;
-      `;
-
-  const beforeContext = wrapLogMessage
-    ? css`
-        top: 100%;
-      `
-    : css`
-        margin-top: ${theme.spacing(2.5)};
-      `;
-  return {
-    width: css`
-      width: ${width};
-    `,
-    bottomContext: css`
-      height: ${bottomContextHeight}px;
-    `,
-    commonStyles: css`
-      position: absolute;
-      height: ${contextHeight}px;
-      z-index: ${theme.zIndex.dropdown};
-      overflow: hidden;
-      background: ${theme.colors.background.primary};
-      box-shadow: 0 0 ${theme.spacing(1.25)} ${theme.v1.palette.black};
-      border: 1px solid ${theme.colors.background.secondary};
-      border-radius: ${theme.shape.radius.default};
-      font-family: ${theme.typography.fontFamily};
-    `,
-    header: css`
-      height: ${headerHeight}px;
-      padding: ${theme.spacing(0, 1.25)};
-      display: flex;
-      align-items: center;
-      background: ${theme.colors.background.canvas};
-    `,
-    datasourceUi: css`
-      height: ${datasourceUiHeight}px;
-      padding: ${theme.spacing(0, 1.25)};
-      display: flex;
-      align-items: center;
-      background: ${theme.colors.background.canvas};
-    `,
-    top: css`
-      border-radius: 0 0 ${theme.shape.radius.default} ${theme.shape.radius.default};
-      box-shadow: 0 0 ${theme.spacing(1.25)} ${theme.v1.palette.black};
-      clip-path: inset(0px -${theme.spacing(1.25)} -${theme.spacing(1.25)} -${theme.spacing(1.25)});
-    `,
-    title: css`
-      position: absolute;
-      width: ${width};
-      margin-top: -${contextHeight + headerHeight}px;
-      z-index: ${theme.zIndex.modal};
-      height: ${headerHeight}px;
-      background: ${theme.colors.background.secondary};
-      border: 1px solid ${theme.colors.background.secondary};
-      border-radius: ${theme.shape.radius.default} ${theme.shape.radius.default} 0 0;
-      box-shadow: 0 0 ${theme.spacing(1.25)} ${theme.v1.palette.black};
-      clip-path: inset(-${theme.spacing(1.25)} -${theme.spacing(1.25)} 0px -${theme.spacing(1.25)});
-      font-family: ${theme.typography.fontFamily};
-
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-
-      padding: ${theme.spacing()};
-
-      > h5 {
-        margin: 0;
-        flex: 1;
-      }
-    `,
-    actions: css`
-      align-items: center;
-      display: flex;
-    `,
-    headerButton: css`
-      margin-left: ${theme.spacing(1)};
-    `,
-    logs: css`
-      height: ${logsHeight}px;
-      padding: ${theme.spacing(1.25)};
-      font-family: ${theme.typography.fontFamilyMonospace};
-
-      .scrollbar-view {
-        overscroll-behavior: contain;
-      }
-    `,
-
-    afterContext,
-    beforeContext,
-  };
-};
-
-interface LogRowContextGroupHeaderProps {
-  row: LogRowModel;
-  rows: Array<string | DataQueryError>;
-  onLoadMoreContext: () => void;
-  groupPosition: LogGroupPosition;
-  shouldScrollToBottom?: boolean;
-  canLoadMoreRows?: boolean;
-  logsSortOrder?: LogsSortOrder | null;
-  getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
-  runContextQuery?: () => void;
-  onHeightChange?: (height: number) => void;
-}
-interface LogRowContextGroupProps extends LogRowContextGroupHeaderProps {
-  rows: Array<string | DataQueryError>;
-  groupPosition: LogGroupPosition;
-  className?: string;
-  error?: string;
-}
-
-const LogRowContextGroupHeader = ({
-  row,
-  rows,
-  onLoadMoreContext,
-  canLoadMoreRows,
-  groupPosition,
-  logsSortOrder,
-  getLogRowContextUi,
-  runContextQuery,
-  onHeightChange,
-}: LogRowContextGroupHeaderProps) => {
-  const [height, setHeight] = useState(0);
-  const datasourceUiRef = React.createRef<HTMLDivElement>();
-  const theme = useTheme2();
-  const { datasourceUi, header, headerButton } = getLogRowContextStyles(theme, undefined, height);
-
-  // determine the position in time for this LogGroup by taking the ordering of
-  // logs and position of the component itself into account.
-  let logGroupPosition = 'after';
-  if (groupPosition === LogGroupPosition.Bottom) {
-    if (logsSortOrder === LogsSortOrder.Descending) {
-      logGroupPosition = 'before';
-    }
-  } else if (logsSortOrder === LogsSortOrder.Ascending) {
-    logGroupPosition = 'before';
-  }
-
-  if (config.featureToggles.logsContextDatasourceUi) {
-    // disabling eslint here, because this condition does not change in runtime
-
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const resizeObserver = useMemo(
-      () =>
-        new ResizeObserver((entries) => {
-          for (let entry of entries) {
-            setHeight(entry.contentRect.height);
-            if (onHeightChange) {
-              onHeightChange(entry.contentRect.height);
-            }
-          }
-        }),
-      [onHeightChange]
-    );
-
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useLayoutEffect(() => {
-      // observe the first child of the ref, which is the datasource controlled component and varies in height
-      // TODO: this is a bit of a hack and we can remove this as soon as we move back from the absolute positioned context
-      const child = datasourceUiRef.current?.children.item(0);
-      if (child) {
-        resizeObserver.observe(child);
-      }
-      return () => {
-        resizeObserver.disconnect();
-      };
-    }, [datasourceUiRef, resizeObserver]);
-  }
-
-  return (
-    <>
-      {config.featureToggles.logsContextDatasourceUi && getLogRowContextUi && (
-        <div ref={datasourceUiRef} className={datasourceUi}>
-          {getLogRowContextUi(row, runContextQuery)}
-        </div>
-      )}
-      <div className={header}>
-        <span
-          className={css`
-            opacity: 0.6;
-          `}
-        >
-          Showing {rows.length} lines {logGroupPosition} match.
-        </span>
-        {(rows.length >= 10 || (rows.length > 10 && rows.length % 10 !== 0)) && canLoadMoreRows && (
-          <Button className={headerButton} variant="secondary" size="sm" onClick={onLoadMoreContext}>
-            Load 10 more lines
-          </Button>
-        )}
-      </div>
-    </>
-  );
-};
-
-export const LogRowContextGroup = ({
-  row,
-  rows,
-  error,
-  className,
-  shouldScrollToBottom,
-  canLoadMoreRows,
-  onLoadMoreContext,
-  groupPosition,
-  logsSortOrder,
-  getLogRowContextUi,
-  runContextQuery,
-  onHeightChange,
-}: LogRowContextGroupProps) => {
-  const [height, setHeight] = useState(0);
-  const theme = useTheme2();
-  const { commonStyles, logs, bottomContext, afterContext } = getLogRowContextStyles(theme, undefined, height);
-  const [scrollTop, setScrollTop] = useState(0);
-  const [scrollHeight, setScrollHeight] = useState(0);
-
-  const listContainerRef = useRef<HTMLDivElement>(null);
-  const prevRows = usePrevious(rows);
-  const prevScrollTop = usePrevious(scrollTop);
-  const prevScrollHeight = usePrevious(scrollHeight);
-
-  /**
-   * This hook is responsible of keeping the right scroll position of the top
-   * context when rows are added. Since rows are added at the top of the DOM,
-   * the scroll position changes and we need to adjust the scrollTop.
-   */
-  useLayoutEffect(() => {
-    if (!shouldScrollToBottom || !listContainerRef.current) {
-      return;
-    }
-
-    const previousRowsLength = prevRows?.length ?? 0;
-    const previousScrollHeight = prevScrollHeight ?? 0;
-    const previousScrollTop = prevScrollTop ?? 0;
-    const scrollElement = listContainerRef.current.parentElement;
-    let currentScrollHeight = 0;
-
-    if (scrollElement) {
-      currentScrollHeight = scrollElement.scrollHeight - scrollElement.clientHeight;
-      setScrollHeight(currentScrollHeight);
-    }
-
-    if (rows.length > previousRowsLength && currentScrollHeight > previousScrollHeight) {
-      setScrollTop(previousScrollTop + (currentScrollHeight - previousScrollHeight));
-    }
-  }, [shouldScrollToBottom, rows, prevRows, prevScrollTop, prevScrollHeight]);
-
-  /**
-   * Keeps track of the scroll position of the list container.
-   */
-  const updateScroll = () => {
-    const scrollElement = listContainerRef.current?.parentElement;
-    if (scrollElement) {
-      setScrollTop(listContainerRef.current?.parentElement.scrollTop);
-    }
-  };
-
-  const changeHeight = (height: number) => {
-    setHeight(height);
-    if (onHeightChange) {
-      onHeightChange(height);
-    }
-  };
-
-  const headerProps = {
-    row,
-    rows,
-    onLoadMoreContext,
-    canLoadMoreRows,
-    groupPosition,
-    logsSortOrder,
-    getLogRowContextUi,
-    runContextQuery,
-  };
-
-  return (
-    <div
-      className={cx(commonStyles, className, groupPosition === LogGroupPosition.Bottom ? bottomContext : afterContext)}
-    >
-      {/* When displaying "after" context */}
-      {shouldScrollToBottom && !error && <LogRowContextGroupHeader onHeightChange={changeHeight} {...headerProps} />}
-      <div className={logs}>
-        <CustomScrollbar autoHide onScroll={updateScroll} scrollTop={scrollTop} autoHeightMin={'210px'}>
-          <div ref={listContainerRef}>
-            {!error && (
-              <List
-                items={rows}
-                renderItem={(item) => {
-                  return (
-                    <div
-                      className={css`
-                        padding: 5px 0;
-                      `}
-                    >
-                      {typeof item === 'string' && textUtil.hasAnsiCodes(item) ? (
-                        <LogMessageAnsi value={item} />
-                      ) : (
-                        String(item)
-                      )}
-                    </div>
-                  );
-                }}
-              />
-            )}
-            {error && <Alert title={error} />}
-          </div>
-        </CustomScrollbar>
-      </div>
-      {/* When displaying "before" context */}
-      {!shouldScrollToBottom && !error && <LogRowContextGroupHeader {...headerProps} />}
-    </div>
-  );
-};
-
-export const LogRowContext = ({
-  row,
-  context,
-  errors,
-  onOutsideClick,
-  onLoadMoreContext,
-  runContextQuery: runContextQuery,
-  hasMoreContextRows,
-  wrapLogMessage,
-  logsSortOrder,
-  getLogRowContextUi,
-}: LogRowContextProps) => {
-  useEffect(() => {
-    const handleEscKeyDown = (e: KeyboardEvent): void => {
-      if (e.key === 'Escape' || e.key === 'Esc') {
-        onOutsideClick('close_esc');
-      }
-    };
-    document.addEventListener('keydown', handleEscKeyDown, false);
-    return () => {
-      document.removeEventListener('keydown', handleEscKeyDown, false);
-    };
-  }, [onOutsideClick, row]);
-  const [height, setHeight] = useState(0);
-  const { beforeContext, title, top, actions, width } = useStyles2((theme) =>
-    getLogRowContextStyles(theme, wrapLogMessage, height)
-  );
-  const handleOutsideClick = useCallback(() => onOutsideClick('close_outside_click'), [onOutsideClick]);
-
-  return (
-    <ClickOutsideWrapper onClick={handleOutsideClick}>
-      {/* e.stopPropagation is necessary so the log details doesn't open when clicked on log line in context
-       * and/or when context log line is being highlighted
-       */}
-      {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
-      <div onClick={(e) => e.stopPropagation()}>
-        {context.after && (
-          <LogRowContextGroup
-            rows={context.after}
-            error={errors && errors.after}
-            row={row}
-            className={cx(top, width)}
-            shouldScrollToBottom
-            canLoadMoreRows={hasMoreContextRows ? hasMoreContextRows.after : false}
-            onLoadMoreContext={onLoadMoreContext}
-            groupPosition={LogGroupPosition.Top}
-            logsSortOrder={logsSortOrder}
-            getLogRowContextUi={getLogRowContextUi}
-            runContextQuery={runContextQuery}
-            onHeightChange={setHeight}
-          />
-        )}
-
-        {context.before && (
-          <LogRowContextGroup
-            onLoadMoreContext={onLoadMoreContext}
-            canLoadMoreRows={hasMoreContextRows ? hasMoreContextRows.before : false}
-            row={row}
-            rows={context.before}
-            error={errors && errors.before}
-            className={cx(beforeContext, width)}
-            groupPosition={LogGroupPosition.Bottom}
-            logsSortOrder={logsSortOrder}
-          />
-        )}
-        <div className={cx(title, width)}>
-          <h5>Log context</h5>
-          <div className={actions}>
-            <IconButton size="lg" name="times" onClick={() => onOutsideClick('close_button')} />
-          </div>
-        </div>
-      </div>
-    </ClickOutsideWrapper>
-  );
-};
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
new file mode 100644
index 00000000000..69ab23f7c36
--- /dev/null
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
@@ -0,0 +1,100 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { act } from 'react-dom/test-utils';
+
+import { createLogRow } from '../__mocks__/logRow';
+
+import { LogRowContextModal } from './LogRowContextModal';
+
+const getRowContext = jest.fn().mockResolvedValue({ data: { fields: [], rows: [] } });
+
+const row = createLogRow({ uid: '1' });
+
+const timeZone = 'UTC';
+
+describe('LogRowContextModal', () => {
+  const originalScrollIntoView = window.HTMLElement.prototype.scrollIntoView;
+
+  beforeEach(() => {
+    window.HTMLElement.prototype.scrollIntoView = jest.fn();
+  });
+  afterEach(() => {
+    window.HTMLElement.prototype.scrollIntoView = originalScrollIntoView;
+    jest.clearAllMocks();
+  });
+
+  it('should not render modal when it is closed', () => {
+    render(
+      <LogRowContextModal row={row} open={false} onClose={() => {}} getRowContext={getRowContext} timeZone={timeZone} />
+    );
+
+    expect(screen.queryByText('Log context')).not.toBeInTheDocument();
+  });
+
+  it('should render modal when it is open', async () => {
+    act(() => {
+      render(
+        <LogRowContextModal
+          row={row}
+          open={true}
+          onClose={() => {}}
+          getRowContext={getRowContext}
+          timeZone={timeZone}
+        />
+      );
+    });
+
+    await waitFor(() => expect(screen.queryByText('Log context')).toBeInTheDocument());
+  });
+
+  it('should call getRowContext on open and change of row', () => {
+    render(
+      <LogRowContextModal row={row} open={false} onClose={() => {}} getRowContext={getRowContext} timeZone={timeZone} />
+    );
+
+    expect(getRowContext).not.toHaveBeenCalled();
+  });
+  it('should call getRowContext on open', async () => {
+    act(() => {
+      render(
+        <LogRowContextModal
+          row={row}
+          open={true}
+          onClose={() => {}}
+          getRowContext={getRowContext}
+          timeZone={timeZone}
+        />
+      );
+    });
+    await waitFor(() => expect(getRowContext).toHaveBeenCalledTimes(2));
+  });
+
+  it('should call getRowContext when limit changes', async () => {
+    act(() => {
+      render(
+        <LogRowContextModal
+          row={row}
+          open={true}
+          onClose={() => {}}
+          getRowContext={getRowContext}
+          timeZone={timeZone}
+        />
+      );
+    });
+    await waitFor(() => expect(getRowContext).toHaveBeenCalledTimes(2));
+
+    const tenLinesButton = screen.getByRole('button', {
+      name: /10 lines/i,
+    });
+    await userEvent.click(tenLinesButton);
+    const twentyLinesButton = screen.getByRole('menuitemradio', {
+      name: /20 lines/i,
+    });
+    act(() => {
+      userEvent.click(twentyLinesButton);
+    });
+
+    await waitFor(() => expect(getRowContext).toHaveBeenCalledTimes(4));
+  });
+});
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
new file mode 100644
index 00000000000..c2f53ca314f
--- /dev/null
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -0,0 +1,299 @@
+import { css, cx } from '@emotion/css';
+import React, { useEffect, useLayoutEffect, useState } from 'react';
+import { useAsyncFn } from 'react-use';
+
+import {
+  DataQueryResponse,
+  DataSourceWithLogsContextSupport,
+  GrafanaTheme2,
+  LogRowContextOptions,
+  LogRowContextQueryDirection,
+  LogRowModel,
+  LogsDedupStrategy,
+  LogsSortOrder,
+  SelectableValue,
+} from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { TimeZone } from '@grafana/schema';
+import { LoadingBar, Modal, useTheme2 } from '@grafana/ui';
+import { dataFrameToLogsModel } from 'app/core/logsModel';
+import store from 'app/core/store';
+import { SETTINGS_KEYS } from 'app/features/explore/utils/logs';
+
+import { LogRows } from '../LogRows';
+
+import { LoadMoreOptions, LogContextButtons } from './LogContextButtons';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    modal: css`
+      width: 85vw;
+      ${theme.breakpoints.down('md')} {
+        width: 100%;
+      }
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+    `,
+    entry: css`
+      position: sticky;
+      z-index: 1;
+      top: -1px;
+      bottom: -1px;
+      & > td {
+        padding: ${theme.spacing(1)} 0 ${theme.spacing(1)} 0;
+      }
+      background: ${theme.colors.emphasize(theme.colors.background.secondary)};
+
+      & > table {
+        margin-bottom: 0;
+      }
+    `,
+    datasourceUi: css`
+      padding-bottom: ${theme.spacing(1.25)};
+      display: flex;
+      align-items: center;
+    `,
+    logRowGroups: css`
+      overflow: auto;
+      max-height: 75%;
+      align-self: stretch;
+      display: inline-block;
+      & > table {
+        min-width: 100%;
+      }
+    `,
+    flexColumn: css`
+      display: flex;
+      flex-direction: column;
+      padding: 0 ${theme.spacing(3)} ${theme.spacing(3)} ${theme.spacing(3)};
+    `,
+    flexRow: css`
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      & > div:last-child {
+        margin-left: auto;
+      }
+    `,
+    noMarginBottom: css`
+      & > table {
+        margin-bottom: 0;
+      }
+    `,
+    hidden: css`
+      display: none;
+    `,
+    paddingTop: css`
+      padding-top: ${theme.spacing(1)};
+    `,
+    paddingBottom: css`
+      padding-bottom: ${theme.spacing(1)};
+    `,
+  };
+};
+
+export enum LogGroupPosition {
+  Bottom = 'bottom',
+  Top = 'top',
+}
+
+interface LogRowContextModalProps {
+  row: LogRowModel;
+  open: boolean;
+  timeZone: TimeZone;
+  onClose: () => void;
+  getRowContext: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>;
+  logsSortOrder?: LogsSortOrder | null;
+  runContextQuery?: () => void;
+  getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
+}
+
+export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps> = ({
+  row,
+  open,
+  logsSortOrder,
+  getLogRowContextUi,
+  onClose,
+  getRowContext,
+  timeZone,
+}) => {
+  const scrollElement = React.createRef<HTMLDivElement>();
+  const entryElement = React.createRef<HTMLTableRowElement>();
+
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+  const [context, setContext] = useState<{ after: LogRowModel[]; before: LogRowModel[] }>({ after: [], before: [] });
+  const [limit, setLimit] = useState<number>(LoadMoreOptions[0].value!);
+  const [loadingWidth, setLoadingWidth] = useState(0);
+  const [loadMoreOption, setLoadMoreOption] = useState<SelectableValue<number>>(LoadMoreOptions[0]);
+
+  const onChangeLimitOption = (option: SelectableValue<number>) => {
+    setLoadMoreOption(option);
+    setLimit(option.value!);
+  };
+
+  const [{ loading }, fetchResults] = useAsyncFn(async () => {
+    if (open && row && limit) {
+      const rawResults = await Promise.all([
+        getRowContext(row, {
+          limit: logsSortOrder === LogsSortOrder.Descending ? limit + 1 : limit,
+          direction:
+            logsSortOrder === LogsSortOrder.Descending
+              ? LogRowContextQueryDirection.Forward
+              : LogRowContextQueryDirection.Backward,
+        }),
+        getRowContext(row, {
+          limit: logsSortOrder === LogsSortOrder.Ascending ? limit + 1 : limit,
+          direction:
+            logsSortOrder === LogsSortOrder.Ascending
+              ? LogRowContextQueryDirection.Forward
+              : LogRowContextQueryDirection.Backward,
+        }),
+      ]);
+
+      const logsModels = rawResults.map((result) => {
+        return dataFrameToLogsModel(result.data);
+      });
+
+      const afterRows = logsSortOrder === LogsSortOrder.Ascending ? logsModels[0].rows.reverse() : logsModels[0].rows;
+      const beforeRows = logsSortOrder === LogsSortOrder.Ascending ? logsModels[1].rows.reverse() : logsModels[1].rows;
+
+      setContext({
+        after: afterRows.filter((r) => {
+          return r.timeEpochNs !== row.timeEpochNs && r.entry !== row.entry;
+        }),
+        before: beforeRows.filter((r) => {
+          return r.timeEpochNs !== row.timeEpochNs && r.entry !== row.entry;
+        }),
+      });
+    } else {
+      setContext({ after: [], before: [] });
+    }
+  }, [row, open, limit]);
+
+  useEffect(() => {
+    if (open) {
+      fetchResults();
+    }
+  }, [fetchResults, open]);
+
+  const [displayedFields, setDisplayedFields] = useState<string[]>([]);
+
+  const showField = (key: string) => {
+    const index = displayedFields.indexOf(key);
+
+    if (index === -1) {
+      setDisplayedFields([...displayedFields, key]);
+    }
+  };
+
+  const hideField = (key: string) => {
+    const index = displayedFields.indexOf(key);
+
+    if (index > -1) {
+      displayedFields.splice(index, 1);
+      setDisplayedFields([...displayedFields]);
+    }
+  };
+
+  useLayoutEffect(() => {
+    if (entryElement.current) {
+      entryElement.current.scrollIntoView({ block: 'center' });
+    }
+  }, [entryElement, context]);
+
+  useLayoutEffect(() => {
+    const width = scrollElement?.current?.parentElement?.clientWidth;
+    if (width && width > 0) {
+      setLoadingWidth(width);
+    }
+  }, [scrollElement]);
+
+  return (
+    <Modal
+      isOpen={open}
+      title="Log context"
+      contentClassName={styles.flexColumn}
+      className={styles.modal}
+      onDismiss={onClose}
+    >
+      {config.featureToggles.logsContextDatasourceUi && getLogRowContextUi && (
+        <div className={styles.datasourceUi}>{getLogRowContextUi(row, fetchResults)}</div>
+      )}
+      <div className={cx(styles.flexRow, styles.paddingBottom)}>
+        <div className={loading ? styles.hidden : ''}>
+          Showing {context.after.length} lines {logsSortOrder === LogsSortOrder.Ascending ? 'after' : 'before'} match.
+        </div>
+        <div>
+          <LogContextButtons onChangeOption={onChangeLimitOption} option={loadMoreOption} />
+        </div>
+      </div>
+      <div className={loading ? '' : styles.hidden}>
+        <LoadingBar width={loadingWidth} />
+      </div>
+      <div ref={scrollElement} className={styles.logRowGroups}>
+        <table>
+          <tbody>
+            <tr>
+              <td className={styles.noMarginBottom}>
+                <LogRows
+                  logRows={context.after}
+                  dedupStrategy={LogsDedupStrategy.none}
+                  showLabels={store.getBool(SETTINGS_KEYS.showLabels, false)}
+                  showTime={store.getBool(SETTINGS_KEYS.showTime, true)}
+                  wrapLogMessage={store.getBool(SETTINGS_KEYS.wrapLogMessage, true)}
+                  prettifyLogMessage={store.getBool(SETTINGS_KEYS.prettifyLogMessage, false)}
+                  enableLogDetails={true}
+                  timeZone={timeZone}
+                  displayedFields={displayedFields}
+                  onClickShowField={showField}
+                  onClickHideField={hideField}
+                />
+              </td>
+            </tr>
+            <tr ref={entryElement} className={styles.entry}>
+              <td className={styles.noMarginBottom}>
+                <LogRows
+                  logRows={[row]}
+                  dedupStrategy={LogsDedupStrategy.none}
+                  showLabels={store.getBool(SETTINGS_KEYS.showLabels, false)}
+                  showTime={store.getBool(SETTINGS_KEYS.showTime, true)}
+                  wrapLogMessage={store.getBool(SETTINGS_KEYS.wrapLogMessage, true)}
+                  prettifyLogMessage={store.getBool(SETTINGS_KEYS.prettifyLogMessage, false)}
+                  enableLogDetails={true}
+                  timeZone={timeZone}
+                  displayedFields={displayedFields}
+                  onClickShowField={showField}
+                  onClickHideField={hideField}
+                />
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <LogRows
+                  logRows={context.before}
+                  dedupStrategy={LogsDedupStrategy.none}
+                  showLabels={store.getBool(SETTINGS_KEYS.showLabels, false)}
+                  showTime={store.getBool(SETTINGS_KEYS.showTime, true)}
+                  wrapLogMessage={store.getBool(SETTINGS_KEYS.wrapLogMessage, true)}
+                  prettifyLogMessage={store.getBool(SETTINGS_KEYS.prettifyLogMessage, false)}
+                  enableLogDetails={true}
+                  timeZone={timeZone}
+                  displayedFields={displayedFields}
+                  onClickShowField={showField}
+                  onClickHideField={hideField}
+                />
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div>
+        <div className={cx(styles.paddingTop, loading ? styles.hidden : '')}>
+          Showing {context.before.length} lines {logsSortOrder === LogsSortOrder.Descending ? 'after' : 'before'} match.
+        </div>
+      </div>
+    </Modal>
+  );
+};
diff --git a/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx b/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
deleted file mode 100644
index 79a2aee3e27..00000000000
--- a/public/app/features/logs/components/log-context/LogRowContextProvider.test.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { FieldType, LogRowModel, MutableDataFrame, DataQueryResponse, LogRowContextOptions } from '@grafana/data';
-
-import { createLogRow } from '../__mocks__/logRow';
-
-import { getRowContexts, LogRowContextProvider } from './LogRowContextProvider';
-
-const row = createLogRow({ entry: '4', timeEpochMs: 4 });
-
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  reportInteraction: jest.fn(),
-}));
-
-describe('getRowContexts', () => {
-  describe('when called with a DataFrame and results are returned', () => {
-    it('then the result should be in correct format and filtered', async () => {
-      const firstResult = new MutableDataFrame({
-        refId: 'B',
-        fields: [
-          { name: 'ts', type: FieldType.time, values: [3, 2, 1] },
-          { name: 'line', type: FieldType.string, values: ['3', '2', '1'], labels: {} },
-          { name: 'id', type: FieldType.string, values: ['3', '2', '1'], labels: {} },
-        ],
-      });
-      const secondResult = new MutableDataFrame({
-        refId: 'B',
-        fields: [
-          { name: 'ts', type: FieldType.time, values: [6, 5, 4] },
-          { name: 'line', type: FieldType.string, values: ['6', '5', '4'], labels: {} },
-          { name: 'id', type: FieldType.string, values: ['6', '5', '4'], labels: {} },
-        ],
-      });
-      let called = false;
-      const getRowContextMock = (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse> => {
-        if (!called) {
-          called = true;
-          return Promise.resolve({ data: [firstResult] });
-        }
-        return Promise.resolve({ data: [secondResult] });
-      };
-
-      const result = await getRowContexts(getRowContextMock, row, 10);
-
-      expect(result).toEqual({
-        data: [
-          ['3', '2'],
-          ['6', '5', '4'],
-        ],
-        errors: ['', ''],
-      });
-    });
-
-    it('then the result should be in correct format and filtered without uid', async () => {
-      const firstResult = new MutableDataFrame({
-        refId: 'B',
-        fields: [
-          { name: 'ts', type: FieldType.time, values: [3, 2, 1] },
-          { name: 'line', type: FieldType.string, values: ['3', '2', '1'], labels: {} },
-        ],
-      });
-      const secondResult = new MutableDataFrame({
-        refId: 'B',
-        fields: [
-          { name: 'ts', type: FieldType.time, values: [6, 5, 4] },
-          { name: 'line', type: FieldType.string, values: ['6', '5', '4'], labels: {} },
-        ],
-      });
-      let called = false;
-      const getRowContextMock = (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse> => {
-        if (!called) {
-          called = true;
-          return Promise.resolve({ data: [firstResult] });
-        }
-        return Promise.resolve({ data: [secondResult] });
-      };
-
-      const result = await getRowContexts(getRowContextMock, row, 10);
-
-      expect(result).toEqual({
-        data: [
-          ['3', '2', '1'],
-          ['6', '5'],
-        ],
-        errors: ['', ''],
-      });
-    });
-  });
-
-  describe('when called with a DataFrame and errors occur', () => {
-    it('then the result should be in correct format', async () => {
-      const firstError = new Error('Error 1');
-      const secondError = new Error('Error 2');
-      let called = false;
-      const getRowContextMock = (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse> => {
-        if (!called) {
-          called = true;
-          return Promise.reject(firstError);
-        }
-        return Promise.reject(secondError);
-      };
-
-      const result = await getRowContexts(getRowContextMock, row, 10);
-
-      expect(result).toEqual({ data: [[], []], errors: ['Error 1', 'Error 2'] });
-    });
-  });
-});
-
-describe('LogRowContextProvider', () => {
-  describe('when requesting longer context', () => {
-    it('can request more log lines', async () => {
-      const firstResult = new MutableDataFrame({
-        refId: 'B',
-        fields: [
-          { name: 'ts', type: FieldType.time, values: [10, 9, 8, 7, 6, 5] },
-          {
-            name: 'line',
-            type: FieldType.string,
-            values: ['10', '9', '8', '7', '6', '5'],
-            labels: {},
-          },
-          {
-            name: 'id',
-            type: FieldType.string,
-            values: ['10', '9', '8', '7', '6', '5'],
-            labels: {},
-          },
-        ],
-      });
-
-      const secondResult = new MutableDataFrame({
-        refId: 'B',
-        fields: [
-          { name: 'ts', type: FieldType.time, values: [14, 13, 12] },
-          { name: 'line', type: FieldType.string, values: ['14', '13', '12'], labels: {} },
-          { name: 'id', type: FieldType.string, values: ['14', '13', '12'], labels: {} },
-        ],
-      });
-
-      let called = false;
-      const getRowContextMock = (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse> => {
-        if (!called) {
-          called = true;
-          return Promise.resolve({ data: [firstResult] });
-        }
-        return Promise.resolve({ data: [secondResult] });
-      };
-      let updateLimitCalled = false;
-
-      const mockedChildren = jest.fn((mockState) => {
-        const { result, errors, hasMoreContextRows, updateLimit, limit } = mockState;
-        if (!updateLimitCalled && result.before.length === 0) {
-          expect(result).toEqual({ before: [], after: [] });
-          expect(errors).toEqual({ before: undefined, after: undefined });
-          expect(hasMoreContextRows).toEqual({ before: true, after: true });
-          expect(limit).toBe(10);
-          return <div data-testid="mockChild" />;
-        }
-        if (!updateLimitCalled && result.before.length > 0) {
-          expect(result).toEqual({ before: ['10', '9', '8', '7', '6', '5'], after: ['14', '13', '12'] });
-          expect(errors).toEqual({ before: '', after: '' });
-          expect(hasMoreContextRows).toEqual({ before: true, after: true });
-          expect(limit).toBe(10);
-          updateLimit();
-          updateLimitCalled = true;
-          return <div data-testid="mockChild" />;
-        }
-        if (updateLimitCalled && result.before.length > 0 && limit > 10) {
-          expect(limit).toBe(20);
-        }
-        return <div data-testid="mockChild" />;
-      });
-      render(
-        <LogRowContextProvider row={row} getRowContext={getRowContextMock}>
-          {mockedChildren}
-        </LogRowContextProvider>
-      );
-      await screen.findByTestId('mockChild');
-    });
-  });
-});
diff --git a/public/app/features/logs/components/log-context/LogRowContextProvider.tsx b/public/app/features/logs/components/log-context/LogRowContextProvider.tsx
deleted file mode 100644
index a9fed25c431..00000000000
--- a/public/app/features/logs/components/log-context/LogRowContextProvider.tsx
+++ /dev/null
@@ -1,248 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import useAsync from 'react-use/lib/useAsync';
-
-import {
-  DataQueryError,
-  DataQueryResponse,
-  Field,
-  FieldCache,
-  LogRowContextOptions,
-  LogRowContextQueryDirection,
-  LogRowModel,
-  LogsSortOrder,
-  toDataFrame,
-} from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
-
-export interface LogRowContextRows {
-  before?: string[];
-  after?: string[];
-}
-export interface LogRowContextQueryErrors {
-  before?: string;
-  after?: string;
-}
-
-export interface HasMoreContextRows {
-  before: boolean;
-  after: boolean;
-}
-
-interface ResultType {
-  data: string[][];
-  errors: string[];
-  doNotCheckForMore?: boolean;
-}
-
-interface LogRowContextProviderProps {
-  row: LogRowModel;
-  logsSortOrder?: LogsSortOrder | null;
-  getRowContext: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>;
-  children: (props: {
-    result: LogRowContextRows;
-    errors: LogRowContextQueryErrors;
-    hasMoreContextRows: HasMoreContextRows;
-    updateLimit: () => void;
-    runContextQuery: () => void;
-    limit: number;
-    logsSortOrder?: LogsSortOrder | null;
-  }) => JSX.Element;
-}
-
-export const getRowContexts = async (
-  getRowContext: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>,
-  row: LogRowModel,
-  limit: number,
-  logsSortOrder?: LogsSortOrder | null
-): Promise<ResultType> => {
-  const promises = [
-    getRowContext(row, {
-      limit,
-    }),
-    getRowContext(row, {
-      // The start time is inclusive so we will get the one row we are using as context entry
-      limit: limit + 1,
-      direction: LogRowContextQueryDirection.Forward,
-    }),
-  ];
-
-  const results: Array<DataQueryResponse | DataQueryError> = await Promise.all(promises.map((p) => p.catch((e) => e)));
-
-  const data = results.map((result) => {
-    const dataResult: DataQueryResponse = result as DataQueryResponse;
-    if (!dataResult.data) {
-      return [];
-    }
-
-    const data = [];
-    for (let index = 0; index < dataResult.data.length; index++) {
-      const dataFrame = toDataFrame(dataResult.data[index]);
-      const fieldCache = new FieldCache(dataFrame);
-      const timestampField: Field<string> = fieldCache.getFieldByName('ts')!;
-      const idField: Field<string> | undefined = fieldCache.getFieldByName('id');
-
-      for (let fieldIndex = 0; fieldIndex < timestampField.values.length; fieldIndex++) {
-        // TODO: this filtering is datasource dependant so it will make sense to move it there so the API is
-        //  to return correct list of lines handling inclusive ranges or how to filter the correct line on the
-        //  datasource.
-
-        // Filter out the row that is the one used as a focal point for the context as we will get it in one of the
-        // requests.
-        if (idField) {
-          // For Loki this means we filter only the one row. Issue is we could have other rows logged at the same
-          // ns which came before but they come in the response that search for logs after. This means right now
-          // we will show those as if they came after. This is not strictly correct but seems better than losing them
-          // and making this correct would mean quite a bit of complexity to shuffle things around and messing up
-          // counts.
-          if (idField.values.get(fieldIndex) === row.uid) {
-            continue;
-          }
-        } else {
-          // Fallback to timestamp. This should not happen right now as this feature is implemented only for loki
-          // and that has ID. Later this branch could be used in other DS but mind that this could also filter out
-          // logs which were logged in the same timestamp and that can be a problem depending on the precision.
-          if (parseInt(timestampField.values.get(fieldIndex), 10) === row.timeEpochMs) {
-            continue;
-          }
-        }
-
-        const lineField: Field<string> = dataFrame.fields.filter((field) => field.name === 'line')[0];
-        const line = lineField.values.get(fieldIndex); // assuming that both fields have same length
-
-        // since we request limit+1 logs, we occasionally get one extra log in the response
-        if (data.length < limit) {
-          data.push(line);
-        }
-      }
-    }
-
-    return logsSortOrder === LogsSortOrder.Ascending ? data.reverse() : data;
-  });
-
-  const errors = results.map((result) => {
-    const errorResult: DataQueryError = result as DataQueryError;
-    if (!errorResult.message) {
-      return '';
-    }
-
-    return errorResult.message;
-  });
-
-  return {
-    data: logsSortOrder === LogsSortOrder.Ascending ? data.reverse() : data,
-    errors: logsSortOrder === LogsSortOrder.Ascending ? errors.reverse() : errors,
-  };
-};
-
-export const LogRowContextProvider = ({ getRowContext, row, children, logsSortOrder }: LogRowContextProviderProps) => {
-  // React Hook that creates a number state value called limit to component state and a setter function called setLimit
-  // The initial value for limit is 10
-  // Used for the number of rows to retrieve from backend from a specific point in time
-  const [limit, setLimit] = useState(10);
-
-  // React Hook that creates an object state value called result to component state and a setter function called setResult
-  // The initial value for result is null
-  // Used for sorting the response from backend
-  const [result, setResult] = useState<ResultType>(null as unknown as ResultType);
-
-  // React Hook that creates an object state value called hasMoreContextRows to component state and a setter function called setHasMoreContextRows
-  // The initial value for hasMoreContextRows is {before: true, after: true}
-  // Used for indicating in UI if there are more rows to load in a given direction
-  const [hasMoreContextRows, setHasMoreContextRows] = useState({
-    before: true,
-    after: true,
-  });
-
-  const [results, setResults] = useState<ResultType>();
-
-  // React Hook that resolves two promises every time the limit prop changes
-  // First promise fetches limit number of rows backwards in time from a specific point in time
-  // Second promise fetches limit number of rows forwards in time from a specific point in time
-  const { value } = useAsync(async () => {
-    return await getRowContexts(getRowContext, row, limit, logsSortOrder); // Moved it to a separate function for debugging purposes
-  }, [limit]);
-
-  useEffect(() => {
-    setResults(value);
-  }, [value]);
-
-  // React Hook that performs a side effect every time the value (from useAsync hook) prop changes
-  // The side effect changes the result state with the response from the useAsync hook
-  // The side effect changes the hasMoreContextRows state if there are more context rows before or after the current result
-  useEffect(() => {
-    if (results) {
-      setResult((currentResult) => {
-        if (!results.doNotCheckForMore) {
-          let hasMoreLogsBefore = true,
-            hasMoreLogsAfter = true;
-
-          const currentResultBefore = currentResult?.data[0];
-          const currentResultAfter = currentResult?.data[1];
-          const valueBefore = results.data[0];
-          const valueAfter = results.data[1];
-
-          // checks if there are more log rows in a given direction
-          // if after fetching additional rows the length of result is the same,
-          // we can assume there are no logs in that direction within a given time range
-          if (currentResult && (!valueBefore || currentResultBefore.length === valueBefore.length)) {
-            hasMoreLogsBefore = false;
-          }
-
-          if (currentResult && (!valueAfter || currentResultAfter.length === valueAfter.length)) {
-            hasMoreLogsAfter = false;
-          }
-
-          setHasMoreContextRows({
-            before: hasMoreLogsBefore,
-            after: hasMoreLogsAfter,
-          });
-        }
-
-        return results;
-      });
-    }
-  }, [results]);
-
-  const updateLimit = useCallback(() => {
-    setLimit(limit + 10);
-
-    const { datasourceType, uid: logRowUid } = row;
-    reportInteraction('grafana_explore_logs_log_context_load_more_clicked', {
-      datasourceType,
-      logRowUid,
-      newLimit: limit + 10,
-    });
-  }, [limit, row]);
-
-  const runContextQuery = useCallback(async () => {
-    const results = await getRowContexts(getRowContext, row, limit, logsSortOrder);
-    results.doNotCheckForMore = true;
-    setResults(results);
-  }, [getRowContext, limit, logsSortOrder, row]);
-
-  const resultData = useMemo(
-    () => ({
-      before: result ? result.data[0] : [],
-      after: result ? result.data[1] : [],
-    }),
-    [result]
-  );
-
-  const errorsData = useMemo(
-    () => ({
-      before: result ? result.errors[0] : undefined,
-      after: result ? result.errors[1] : undefined,
-    }),
-    [result]
-  );
-
-  return children({
-    result: resultData,
-    errors: errorsData,
-    hasMoreContextRows,
-    updateLimit,
-    runContextQuery,
-    limit,
-    logsSortOrder,
-  });
-};
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 38842c63ca4..d296ae50a56 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -1,6 +1,6 @@
 import { cloneDeep, find, first as _first, isNumber, isObject, isString, map as _map } from 'lodash';
 import { generate, lastValueFrom, Observable, of, throwError } from 'rxjs';
-import { catchError, first, map, mergeMap, skipWhile, throwIfEmpty, tap, switchMap } from 'rxjs/operators';
+import { catchError, first, map, mergeMap, skipWhile, throwIfEmpty, tap } from 'rxjs/operators';
 import { SemVer } from 'semver';
 
 import {
@@ -26,11 +26,8 @@ import {
   CoreApp,
   SupplementaryQueryType,
   DataQueryError,
-  FieldCache,
-  FieldType,
   rangeUtil,
   Field,
-  sortDataFrame,
   LogRowContextQueryDirection,
   LogRowContextOptions,
 } from '@grafana/data';
@@ -515,9 +512,6 @@ export class ElasticDatasource
               statusText: err.statusText,
             };
             throw error;
-          }),
-          switchMap((res) => {
-            return of(processToLogContextDataFrames(res));
           })
         )
       );
@@ -1224,44 +1218,6 @@ function transformHitsBasedOnDirection(response: any, direction: 'asc' | 'desc')
   };
 }
 
-function processToLogContextDataFrames(result: DataQueryResponse): DataQueryResponse {
-  const frames = result.data.map((frame) => sortDataFrame(frame, 0, true));
-  const processedFrames = frames.map((frame) => {
-    // log-row-context requires specific field-names to work, so we set them here: "ts", "line", "id"
-    const cache = new FieldCache(frame);
-    const timestampField = cache.getFirstFieldOfType(FieldType.time);
-    const lineField = cache.getFirstFieldOfType(FieldType.string);
-    const idField = cache.getFieldByName('_id');
-
-    if (!timestampField || !lineField || !idField) {
-      return { ...frame, fields: [] };
-    }
-
-    return {
-      ...frame,
-      fields: [
-        {
-          ...timestampField,
-          name: 'ts',
-        },
-        {
-          ...lineField,
-          name: 'line',
-        },
-        {
-          ...idField,
-          name: 'id',
-        },
-      ],
-    };
-  });
-
-  return {
-    ...result,
-    data: processedFrames,
-  };
-}
-
 function createContextTimeRange(rowTimeEpochMs: number, direction: string, intervalPattern: Interval | undefined) {
   const offset = 7;
   // For log context, we want to request data from 7 subsequent/previous indices
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
index 087563445c3..27fc206eddc 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -50,42 +50,9 @@ export class LogContextProvider {
 
     const { query, range } = await this.prepareLogRowContextQueryTarget(row, limit, direction, origQuery);
 
-    const processDataFrame = (frame: DataFrame): DataFrame => {
-      // log-row-context requires specific field-names to work, so we set them here: "ts", "line", "id"
-      const cache = new FieldCache(frame);
-      const timestampField = cache.getFirstFieldOfType(FieldType.time);
-      const lineField = cache.getFirstFieldOfType(FieldType.string);
-      const idField = cache.getFieldByName('id');
-
-      if (timestampField === undefined || lineField === undefined || idField === undefined) {
-        // this should never really happen, but i want to keep typescript happy
-        return { ...frame, fields: [] };
-      }
-
-      return {
-        ...frame,
-        fields: [
-          {
-            ...timestampField,
-            name: 'ts',
-          },
-          {
-            ...lineField,
-            name: 'line',
-          },
-          {
-            ...idField,
-            name: 'id',
-          },
-        ],
-      };
-    };
-
     const processResults = (result: DataQueryResponse): DataQueryResponse => {
       const frames: DataFrame[] = result.data;
-      const processedFrames = frames
-        .map((frame) => sortDataFrameByTime(frame, SortDirection.Descending))
-        .map((frame) => processDataFrame(frame)); // rename fields if needed
+      const processedFrames = frames.map((frame) => sortDataFrameByTime(frame, SortDirection.Descending));
 
       return {
         ...result,

From 02951e8a26f650b812164e95a7b9683d7f177e08 Mon Sep 17 00:00:00 2001
From: Adam Simpson <adam@adamsimpson.net>
Date: Fri, 14 Apr 2023 11:11:25 -0400
Subject: [PATCH 154/729] Google Cloud Monitoring: Fix project variable
 (#66524)

Google Cloud Monitoring: fix project variable

Also fix typo found while debugging
---
 pkg/tsdb/cloudmonitoring/cloudmonitoring.go                     | 2 +-
 .../cloud-monitoring/components/VariableQueryEditor.tsx         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/cloudmonitoring/cloudmonitoring.go b/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
index dd289beec01..172c40fafc1 100644
--- a/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
+++ b/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
@@ -645,7 +645,7 @@ func (s *Service) getDSInfo(pluginCtx backend.PluginContext) (*datasourceInfo, e
 
 	instance, ok := i.(*datasourceInfo)
 	if !ok {
-		return nil, fmt.Errorf("failed to cast datsource info")
+		return nil, fmt.Errorf("failed to cast datasource info")
 	}
 
 	return instance, nil
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
index 9a7c3ac571c..b34098d6464 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
@@ -62,7 +62,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
 
   async componentDidMount() {
     await this.props.datasource.ensureGCEDefaultProject();
-    const projectName = this.props.datasource.getDefaultProject();
+    const projectName = this.props.query.projectName || this.props.datasource.getDefaultProject();
     const projects = (await this.props.datasource.getProjects()) as MetricDescriptor[];
     const metricDescriptors = await this.props.datasource.getMetricTypes(
       this.props.query.projectName || this.props.datasource.getDefaultProject()

From 3b638443908be39293dec8ebf1910b411b23f828 Mon Sep 17 00:00:00 2001
From: Gabriel MABILLE <gamab@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:17:59 +0200
Subject: [PATCH 155/729] RBAC: Feature to override default assignments
 (#66561)

* RBAC: Feature to override default assignments

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

* Add test and trim spaces

* Pass linting

* Apply the rbac overrides to fixed_authentication.config_writer

* Removing from the default ini file for now

* Add grants overrides section to cfg

* slimmer handleGrantOverrides function

---------

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
---
 pkg/services/accesscontrol/acimpl/service.go  | 16 ++++-
 .../accesscontrol/acimpl/service_test.go      | 71 +++++++++++++++++++
 pkg/services/accesscontrol/models.go          |  5 +-
 pkg/services/accesscontrol/roles.go           |  5 +-
 pkg/setting/setting.go                        | 14 ++++
 5 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/pkg/services/accesscontrol/acimpl/service.go b/pkg/services/accesscontrol/acimpl/service.go
index fd83c593593..0ce0c6ba672 100644
--- a/pkg/services/accesscontrol/acimpl/service.go
+++ b/pkg/services/accesscontrol/acimpl/service.go
@@ -166,7 +166,12 @@ func (s *Service) DeclareFixedRoles(registrations ...accesscontrol.RoleRegistrat
 		return nil
 	}
 
-	for _, r := range registrations {
+	for i := range registrations {
+		r := registrations[i]
+		if r.AllowGrantsOverride {
+			s.handleGrantOverrides(&r)
+		}
+
 		err := accesscontrol.ValidateFixedRole(r.Role)
 		if err != nil {
 			return err
@@ -183,6 +188,15 @@ func (s *Service) DeclareFixedRoles(registrations ...accesscontrol.RoleRegistrat
 	return nil
 }
 
+func (s *Service) handleGrantOverrides(r *accesscontrol.RoleRegistration) {
+	// Replace ":" and "." with "_" to match the key in the config
+	key := strings.ReplaceAll(strings.ReplaceAll(r.Role.Name, ":", "_"), ".", "_")
+	if overrides, ok := s.cfg.RBACGrantOverrides[key]; ok {
+		r.Grants = overrides
+		s.log.Info("Overriding grants for role", "role", r.Role.Name, "overrides", overrides)
+	}
+}
+
 // RegisterFixedRoles registers all declared roles in RAM
 func (s *Service) RegisterFixedRoles(ctx context.Context) error {
 	// If accesscontrol is disabled no need to register roles
diff --git a/pkg/services/accesscontrol/acimpl/service_test.go b/pkg/services/accesscontrol/acimpl/service_test.go
index 06ab9b18d3d..c6babb34fec 100644
--- a/pkg/services/accesscontrol/acimpl/service_test.go
+++ b/pkg/services/accesscontrol/acimpl/service_test.go
@@ -161,6 +161,77 @@ func TestService_DeclareFixedRoles(t *testing.T) {
 	}
 }
 
+func TestService_DeclareFixedRoles_Overrides(t *testing.T) {
+	tests := []struct {
+		name         string
+		registration accesscontrol.RoleRegistration
+		overrides    map[string][]string
+		wantGrants   []string
+		wantErr      bool
+	}{
+		{
+			name: "no grant override",
+			registration: accesscontrol.RoleRegistration{
+				Role:                accesscontrol.RoleDTO{Name: "fixed:test:test"},
+				Grants:              []string{"Admin"},
+				AllowGrantsOverride: true,
+			},
+			wantGrants: []string{"Admin"},
+			wantErr:    false,
+		},
+		{
+			name: "should account for grant overrides",
+			registration: accesscontrol.RoleRegistration{
+				Role:                accesscontrol.RoleDTO{Name: "fixed:test:test"},
+				Grants:              []string{"Admin"},
+				AllowGrantsOverride: true,
+			},
+			overrides:  map[string][]string{"fixed_test_test": {"Viewer", "Grafana Admin"}},
+			wantGrants: []string{"Viewer", "Grafana Admin"},
+			wantErr:    false,
+		},
+		{
+			name: "should not account for grant overrides",
+			registration: accesscontrol.RoleRegistration{
+				Role:                accesscontrol.RoleDTO{Name: "fixed:test:test"},
+				Grants:              []string{"Admin"},
+				AllowGrantsOverride: false,
+			},
+			overrides:  map[string][]string{"fixed_test_test": {"Viewer", "Grafana Admin"}},
+			wantGrants: []string{"Admin"},
+			wantErr:    false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ac := setupTestEnv(t)
+
+			// Reset the registations
+			ac.registrations = accesscontrol.RegistrationList{}
+			ac.cfg.RBACGrantOverrides = tt.overrides
+
+			// Test
+			err := ac.DeclareFixedRoles(tt.registration)
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+
+			registrationCnt := 0
+			grants := []string{}
+			ac.registrations.Range(func(registration accesscontrol.RoleRegistration) bool {
+				registrationCnt++
+				grants = registration.Grants
+				return true
+			})
+			require.Equal(t, 1, registrationCnt,
+				"expected service registration list to contain the registration")
+			require.ElementsMatch(t, tt.wantGrants, grants)
+		})
+	}
+}
+
 func TestService_DeclarePluginRoles(t *testing.T) {
 	tests := []struct {
 		name          string
diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index ea688c67635..0810a34e20c 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -16,8 +16,9 @@ var ErrInternal = errutil.NewBase(errutil.StatusInternal, "accesscontrol.interna
 // RoleRegistration stores a role and its assignments to built-in roles
 // (Viewer, Editor, Admin, Grafana Admin)
 type RoleRegistration struct {
-	Role   RoleDTO
-	Grants []string
+	Role                RoleDTO
+	Grants              []string
+	AllowGrantsOverride bool
 }
 
 // Role is the model for Role in RBAC.
diff --git a/pkg/services/accesscontrol/roles.go b/pkg/services/accesscontrol/roles.go
index 5f195f604bd..1b02f2db662 100644
--- a/pkg/services/accesscontrol/roles.go
+++ b/pkg/services/accesscontrol/roles.go
@@ -233,8 +233,9 @@ func DeclareFixedRoles(service Service) error {
 		Grants: []string{RoleGrafanaAdmin},
 	}
 	authenticationConfigWriter := RoleRegistration{
-		Role:   authenticationConfigWriterRole,
-		Grants: []string{RoleGrafanaAdmin},
+		Role:                authenticationConfigWriterRole,
+		Grants:              []string{RoleGrafanaAdmin},
+		AllowGrantsOverride: true,
 	}
 
 	return service.DeclareFixedRoles(ldapReader, ldapWriter, orgUsersReader, orgUsersWriter,
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index d4236f46610..bbf734ecce8 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -505,6 +505,9 @@ type Cfg struct {
 	RBACPermissionValidationEnabled bool
 	// Reset basic roles permissions on start-up
 	RBACResetBasicRoles bool
+	// Override default fixed role assignments
+	RBACGrantOverrides map[string][]string
+
 	// GRPC Server.
 	GRPCServerNetwork   string
 	GRPCServerAddress   string
@@ -1559,6 +1562,17 @@ func readAccessControlSettings(iniFile *ini.File, cfg *Cfg) {
 	cfg.RBACPermissionCache = rbac.Key("permission_cache").MustBool(true)
 	cfg.RBACPermissionValidationEnabled = rbac.Key("permission_validation_enabled").MustBool(false)
 	cfg.RBACResetBasicRoles = rbac.Key("reset_basic_roles").MustBool(false)
+
+	rbacOverrides := iniFile.Section("rbac.overrides")
+	cfg.RBACGrantOverrides = map[string][]string{}
+	for _, key := range rbacOverrides.Keys() {
+		value := key.MustString("")
+		grants := strings.Split(value, ",")
+		for i, grant := range grants {
+			grants[i] = strings.TrimSpace(grant)
+		}
+		cfg.RBACGrantOverrides[key.Name()] = grants
+	}
 }
 
 func readUserSettings(iniFile *ini.File, cfg *Cfg) error {

From 8ab7ba2b30ee793ea8d9df5a87810edf02887394 Mon Sep 17 00:00:00 2001
From: Gareth Dawson <gareth.dawson@grafana.com>
Date: Fri, 14 Apr 2023 16:35:04 +0100
Subject: [PATCH 156/729] Loki docs: Add how to start live tailing logs
 (#65945)

* add how to start live tailing logs

* update old media

* Update docs/sources/datasources/loki/query-editor/index.md

Co-authored-by: Matias Chomicki <matyax@gmail.com>

---------

Co-authored-by: Matias Chomicki <matyax@gmail.com>
---
 docs/sources/datasources/loki/query-editor/index.md | 5 ++++-
 docs/sources/explore/logs-integration.md            | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/sources/datasources/loki/query-editor/index.md b/docs/sources/datasources/loki/query-editor/index.md
index 635e1ee3755..58a573d29b5 100644
--- a/docs/sources/datasources/loki/query-editor/index.md
+++ b/docs/sources/datasources/loki/query-editor/index.md
@@ -107,10 +107,13 @@ log message you're interested in.
 
 ### Tail live logs
 
-Loki supports live tailing of logs in real-time in [Explore]({{< relref "../../../explore#loki-specific-features" >}}).
+Loki supports live tailing of logs in real-time in [Explore]({{< relref "../../../explore" >}}).
 
 Live tailing relies on two Websocket connections: one between the browser and Grafana server, and another between the Grafana server and Loki server.
 
+To start tailing logs click the **Live** button in the top right corner of the Explore view.
+{{< figure src="/static/img/docs/v95/loki_tailing.png" class="docs-image--no-shadow" max-width="80px" >}}
+
 #### Proxying examples
 
 If you use reverse proxies, configure them accordingly to use live tailing:
diff --git a/docs/sources/explore/logs-integration.md b/docs/sources/explore/logs-integration.md
index e41a0c1a013..af9c3c4c194 100644
--- a/docs/sources/explore/logs-integration.md
+++ b/docs/sources/explore/logs-integration.md
@@ -154,4 +154,4 @@ Click the **Live** button in the Explore toolbar to switch to Live tail view.
 
 While in Live tail view new logs will come from the bottom of the screen and will have fading contrasting background so you can keep track of what is new. Click the **Pause** button or scroll the logs view to pause the Live tailing and explore previous logs without interruption. Click **Resume** button to resume the Live tailing or click **Stop** button to exit Live tailing and go back to standard Explore view.
 
-{{< figure src="/static/img/docs/v64/explore_live_tailing.gif" class="docs-image--no-shadow" caption="Explore Live tailing in action" >}}
+{{< video-embed src="/static/img/docs/v95/explore_live_tailing.mp4" >}}

From 85e20768b6d5dde3b55dd2d27565bfe98aad37fa Mon Sep 17 00:00:00 2001
From: David Harris <david.harris@grafana.com>
Date: Fri, 14 Apr 2023 17:41:33 +0100
Subject: [PATCH 157/729] docs: adds license guidance to publishing criteria
 (#64984)

* initial commit

* Update publishing-and-signing-criteria.md

* typo

* typo
---
 .../plugins/publishing-and-signing-criteria.md      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/sources/developers/plugins/publishing-and-signing-criteria.md b/docs/sources/developers/plugins/publishing-and-signing-criteria.md
index 277ba504c2f..8cc7742ea17 100644
--- a/docs/sources/developers/plugins/publishing-and-signing-criteria.md
+++ b/docs/sources/developers/plugins/publishing-and-signing-criteria.md
@@ -23,6 +23,19 @@ Grafana plugins must adhere to the following criteria when being reviewed for pu
   - Should not access the filesystem
   - Should not access environment variables
 
+## Plugin licensing
+
+Plugins must be licensed under one of the following AGPL compliant licenses for publishing to the catalog:
+
+- AGPL-3.0
+- Apache-2.0
+- BSD
+- GPL-3.0
+- LGPL-3.0
+- MIT
+
+If contributing a plugin on behalf of an organization, be sure to seek guidance from your legal team.
+
 ## Commercial
 
 - Usage of 3rd party software or dependencies within the plugin must be licensed for the intended use. For example, using open source dependencies must be credited/licensed; embedding logos or trademarks;

From b2e32a70b9df081c1a59ee0b2396f22c42460300 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Fri, 14 Apr 2023 17:46:49 +0100
Subject: [PATCH 158/729] Chore: Update @grafana/e2e (#66365)

* Update e2e package

- Ensure health request is monitored for addDatasource flow
- Add custom timeout to configurePanel flow

* Make health check optional
---
 e2e/cloud-plugins-suite/azure-monitor.spec.ts    |  1 +
 packages/grafana-e2e/src/flows/addDataSource.ts  | 12 ++++++++++++
 packages/grafana-e2e/src/flows/configurePanel.ts |  4 +++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
index 71a9e5c4819..7a328508443 100644
--- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts
+++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
@@ -49,6 +49,7 @@ function provisionAzureMonitorDatasources(datasources: AzureMonitorProvision[])
     expectedAlertMessage: 'Successfully connected to all Azure Monitor endpoints',
     // Reduce the timeout from 30s to error faster when an invalid alert message is presented
     timeout: 10000,
+    awaitHealth: true,
   });
 }
 
diff --git a/packages/grafana-e2e/src/flows/addDataSource.ts b/packages/grafana-e2e/src/flows/addDataSource.ts
index 4737d1e726a..38779572bd4 100644
--- a/packages/grafana-e2e/src/flows/addDataSource.ts
+++ b/packages/grafana-e2e/src/flows/addDataSource.ts
@@ -14,6 +14,7 @@ export interface AddDataSourceConfig {
   skipTlsVerify: boolean;
   type: string;
   timeout?: number;
+  awaitHealth?: boolean;
 }
 
 // @todo this actually returns type `Cypress.Chainable<AddDaaSourceConfig>`
@@ -40,8 +41,15 @@ export const addDataSource = (config?: Partial<AddDataSourceConfig>) => {
     skipTlsVerify,
     type,
     timeout,
+    awaitHealth,
   } = fullConfig;
 
+  if (awaitHealth) {
+    e2e()
+      .intercept(/health/)
+      .as('health');
+  }
+
   e2e().logToConsole('Adding data source with name:', name);
   e2e.pages.AddDataSource.visit();
   e2e.pages.AddDataSource.dataSourcePluginsV2(type)
@@ -76,6 +84,10 @@ export const addDataSource = (config?: Partial<AddDataSourceConfig>) => {
 
   e2e.pages.DataSource.saveAndTest().click();
 
+  if (awaitHealth) {
+    e2e().wait('@health', { timeout: timeout ?? e2e.config().defaultCommandTimeout });
+  }
+
   // use the timeout passed in if it exists, otherwise, continue to use the default
   e2e.pages.DataSource.alert()
     .should('exist')
diff --git a/packages/grafana-e2e/src/flows/configurePanel.ts b/packages/grafana-e2e/src/flows/configurePanel.ts
index a121376a98a..c6225fb4a0d 100644
--- a/packages/grafana-e2e/src/flows/configurePanel.ts
+++ b/packages/grafana-e2e/src/flows/configurePanel.ts
@@ -34,6 +34,7 @@ interface ConfigurePanelOptional {
   panelTitle?: string;
   timeRange?: TimeRangeConfig;
   visualizationName?: string;
+  timeout?: number;
 }
 
 interface ConfigurePanelRequired {
@@ -80,6 +81,7 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
       timeRange,
       visitDashboardAtStart,
       visualizationName,
+      timeout,
     } = fullConfig;
 
     if (visitDashboardAtStart) {
@@ -158,7 +160,7 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
     e2e.components.RefreshPicker.runButtonV2().first().click({ force: true });
 
     // Wait for RxJS
-    e2e().wait(500);
+    e2e().wait(timeout ?? e2e.config().defaultCommandTimeout);
 
     if (matchScreenshot) {
       let visualization;

From 1b0cee491a06fa135936b883406a6b11e6221322 Mon Sep 17 00:00:00 2001
From: Isabella Siu <Isabella.siu@grafana.com>
Date: Fri, 14 Apr 2023 13:59:31 -0400
Subject: [PATCH 159/729] OpenSearch: Add feature toggle for detecting version
 (#66386)

OpenSearch: Add feature toggle for auto-detecting version
---
 .../configure-grafana/feature-toggles/index.md             | 1 +
 packages/grafana-data/src/types/featureToggles.gen.ts      | 1 +
 pkg/services/featuremgmt/registry.go                       | 7 +++++++
 pkg/services/featuremgmt/toggles_gen.csv                   | 1 +
 pkg/services/featuremgmt/toggles_gen.go                    | 4 ++++
 5 files changed, 14 insertions(+)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 759969cac5e..ccc6d73c882 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -109,6 +109,7 @@ Alpha features might be changed or removed without prior notice.
 | `dataplaneFrontendFallback`        | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                |
 | `authenticationConfigUI`           | Enables authentication configuration UI                                                                                                                                                             |
 | `advancedDataSourcePicker`         | Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode                                                                                      |
+| `opensearchDetectVersion`          | Enable version detection in OpenSearch                                                                                                                                                              |
 
 ## Development feature toggles
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 4125a27b7df..1f33ea090bb 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -97,4 +97,5 @@ export interface FeatureToggles {
   enableElasticsearchBackendQuerying?: boolean;
   authenticationConfigUI?: boolean;
   advancedDataSourcePicker?: boolean;
+  opensearchDetectVersion?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index d47daf1ae6c..d89e675da70 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -526,5 +526,12 @@ var (
 			FrontendOnly: true,
 			Owner:        grafanaDashboardsSquad,
 		},
+		{
+			Name:         "opensearchDetectVersion",
+			Description:  "Enable version detection in OpenSearch",
+			State:        FeatureStateAlpha,
+			FrontendOnly: true,
+			Owner:        awsPluginsSquad,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 7e1be02493c..7bd97fc4f3a 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -78,3 +78,4 @@ useCachingService,stable,@grafana/grafana-operator-experience-squad,false,false,
 enableElasticsearchBackendQuerying,beta,@grafana/observability-logs,false,false,false,false
 authenticationConfigUI,alpha,@grafana/grafana-authnz-team,false,false,false,false
 advancedDataSourcePicker,alpha,@grafana/dashboards-squad,false,false,false,true
+opensearchDetectVersion,alpha,@grafana/aws-plugins,false,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 1b7897b7b26..f24b65e4eb6 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -322,4 +322,8 @@ const (
 	// FlagAdvancedDataSourcePicker
 	// Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode
 	FlagAdvancedDataSourcePicker = "advancedDataSourcePicker"
+
+	// FlagOpensearchDetectVersion
+	// Enable version detection in OpenSearch
+	FlagOpensearchDetectVersion = "opensearchDetectVersion"
 )

From d43482a4632dfd990d214c10f7c34daad897e99c Mon Sep 17 00:00:00 2001
From: Alyssa Bull <58453566+alyssabull@users.noreply.github.com>
Date: Fri, 14 Apr 2023 13:47:41 -0600
Subject: [PATCH 160/729] Azure Monitor: Fix bug that was not showing resources
 for certain locations (#66502)

---
 .../MetricsQueryEditor.test.tsx               |  2 +-
 .../resourcePicker/resourcePickerData.test.ts | 16 +++---
 .../resourcePicker/resourcePickerData.ts      | 49 +++++--------------
 3 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
index 736ae6d0d4d..eb786c5f209 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
@@ -45,7 +45,7 @@ export function createMockResourcePickerData() {
   mockResourcePicker.getResourcesForResourceGroup = jest.fn().mockResolvedValue(mockResourcesByResourceGroup());
   mockResourcePicker.getResourceURIFromWorkspace = jest.fn().mockReturnValue('');
   mockResourcePicker.getResourceURIDisplayProperties = jest.fn().mockResolvedValue({});
-  mockResourcePicker.getLogsLocations = jest.fn().mockResolvedValue(mockGetValidLocations());
+  mockResourcePicker.getLocations = jest.fn().mockResolvedValue(mockGetValidLocations());
   return mockResourcePicker;
 }
 
diff --git a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts
index e05c130ca04..e7d42620d66 100644
--- a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts
@@ -32,11 +32,11 @@ const createResourcePickerData = (responses: AzureGraphResponse[]) => {
     postResource.mockResolvedValueOnce(res);
   });
   resourcePickerData.postResource = postResource;
-  const logLocationsMap = mockGetValidLocations();
-  const getLogsLocations = jest.spyOn(resourcePickerData, 'getLogsLocations').mockResolvedValue(logLocationsMap);
-  resourcePickerData.logLocationsMap = logLocationsMap;
-  resourcePickerData.logLocations = Array.from(logLocationsMap.values()).map((location) => `"${location.name}"`);
-  return { resourcePickerData, postResource, mockDatasource, getValidLocations: getLogsLocations };
+  const locationsMap = mockGetValidLocations();
+  const getLocations = jest.spyOn(resourcePickerData, 'getLocations').mockResolvedValue(locationsMap);
+  resourcePickerData.locationsMap = locationsMap;
+  resourcePickerData.locations = Array.from(locationsMap.values()).map((location) => `"${location.name}"`);
+  return { resourcePickerData, postResource, mockDatasource, getValidLocations: getLocations };
 };
 
 describe('AzureMonitor resourcePickerData', () => {
@@ -397,13 +397,12 @@ describe('AzureMonitor resourcePickerData', () => {
       const { resourcePickerData, getValidLocations } = createResourcePickerData([createMockARGSubscriptionResponse()]);
       getValidLocations.mockRestore();
       const subscriptions = await resourcePickerData.getSubscriptions();
-      const locations = await resourcePickerData.getLogsLocations(subscriptions);
+      const locations = await resourcePickerData.getLocations(subscriptions);
 
       expect(locations.size).toBe(1);
       expect(locations.has('northeurope')).toBe(true);
       expect(locations.get('northeurope')?.name).toBe('northeurope');
       expect(locations.get('northeurope')?.displayName).toBe('North Europe');
-      expect(locations.get('northeurope')?.supportsLogs).toBe(true);
     });
 
     it('returns the raw locations map if provider is undefined', async () => {
@@ -413,13 +412,12 @@ describe('AzureMonitor resourcePickerData', () => {
       getValidLocations.mockRestore();
       mockDatasource.azureMonitorDatasource.getProvider = jest.fn().mockResolvedValue(undefined);
       const subscriptions = await resourcePickerData.getSubscriptions();
-      const locations = await resourcePickerData.getLogsLocations(subscriptions);
+      const locations = await resourcePickerData.getLocations(subscriptions);
 
       expect(locations.size).toBe(1);
       expect(locations.has('northeurope')).toBe(true);
       expect(locations.get('northeurope')?.name).toBe('northeurope');
       expect(locations.get('northeurope')?.displayName).toBe('North Europe');
-      expect(locations.get('northeurope')?.supportsLogs).toBe(false);
     });
   });
 
diff --git a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts
index 52e05d27043..a600b6a3227 100644
--- a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts
+++ b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts
@@ -39,8 +39,8 @@ export default class ResourcePickerData extends DataSourceWithBackend<AzureMonit
   resultLimit = 200;
   azureMonitorDatasource;
   supportedMetricNamespaces = '';
-  logLocationsMap: Map<string, AzureMonitorLocations> = new Map();
-  logLocations: string[] = [];
+  locationsMap: Map<string, AzureMonitorLocations> = new Map();
+  locations: string[] = [];
 
   constructor(
     instanceSettings: DataSourceInstanceSettings<AzureDataSourceJsonData>,
@@ -57,9 +57,9 @@ export default class ResourcePickerData extends DataSourceWithBackend<AzureMonit
   ): Promise<ResourceRowGroup> {
     const subscriptions = await this.getSubscriptions();
 
-    if (this.logLocationsMap.size === 0) {
-      this.logLocationsMap = await this.getLogsLocations(subscriptions);
-      this.logLocations = Array.from(this.logLocationsMap.values()).map((location) => `"${location.name}"`);
+    if (this.locationsMap.size === 0) {
+      this.locationsMap = await this.getLocations(subscriptions);
+      this.locations = Array.from(this.locationsMap.values()).map((location) => `"${location.name}"`);
     }
 
     if (!currentSelection) {
@@ -140,7 +140,7 @@ export default class ResourcePickerData extends DataSourceWithBackend<AzureMonit
         resourceGroupName: item.resourceGroup,
         type,
         typeLabel: resourceTypeDisplayNames[item.type] || item.type,
-        location: this.logLocationsMap.get(item.location)?.displayName || item.location,
+        location: this.locationsMap.get(item.location)?.displayName || item.location,
       };
     });
   };
@@ -243,13 +243,14 @@ export default class ResourcePickerData extends DataSourceWithBackend<AzureMonit
     resourceGroupId: string,
     type: ResourcePickerQueryType
   ): Promise<ResourceRowGroup> {
-    if (!this.logLocations) {
+    if (!this.locations) {
       return [];
     }
+
     const { data: response } = await this.makeResourceGraphRequest<RawAzureResourceItem[]>(`
       resources
       | where id hasprefix "${resourceGroupId}"
-      ${await this.filterByType(type)} and location in (${this.logLocations})
+      ${await this.filterByType(type)} and location in (${this.locations})
     `);
 
     return response.map((item) => {
@@ -264,7 +265,7 @@ export default class ResourcePickerData extends DataSourceWithBackend<AzureMonit
         resourceGroupName: item.resourceGroup,
         type: ResourceRowType.Resource,
         typeLabel: resourceTypeDisplayNames[item.type] || item.type,
-        locationDisplayName: this.logLocationsMap.get(item.location)?.displayName || item.location,
+        locationDisplayName: this.locationsMap.get(item.location)?.displayName || item.location,
         location: item.location,
       };
     });
@@ -391,34 +392,10 @@ export default class ResourcePickerData extends DataSourceWithBackend<AzureMonit
     this.supportedMetricNamespaces = uniq(supportedMetricNamespaces).join(',');
   }
 
-  async getLogsLocations(subscriptions: ResourceRowGroup): Promise<Map<string, AzureMonitorLocations>> {
+  async getLocations(subscriptions: ResourceRowGroup): Promise<Map<string, AzureMonitorLocations>> {
     const subscriptionIds = subscriptions.map((sub) => sub.id);
     const locations = await this.azureMonitorDatasource.getLocations(subscriptionIds);
-    const insightsProvider = await this.azureMonitorDatasource.getProvider('Microsoft.Insights');
-    const logsProvider = insightsProvider?.resourceTypes.find((provider) => provider.resourceType === 'logs');
-
-    if (!logsProvider) {
-      return locations;
-    }
-
-    const logsLocations = logsProvider.locations.map((location) => ({
-      displayName: location,
-      name: '',
-      supportsLogs: true,
-    }));
-
-    const logLocationsMap = new Map<string, AzureMonitorLocations>();
-
-    for (const logLocation of logsLocations) {
-      const name =
-        Array.from(locations.values()).find((location) => logLocation.displayName === location.displayName)?.name || '';
-
-      if (name !== '') {
-        logLocationsMap.set(name, { ...logLocation, name });
-      }
-    }
-
-    return logLocationsMap;
+    return locations;
   }
 
   parseRows(resources: Array<string | AzureMonitorResource>): ResourceRow[] {
@@ -445,7 +422,7 @@ export default class ResourcePickerData extends DataSourceWithBackend<AzureMonit
         uri: resourceToString(resource),
         typeLabel:
           resourceTypeDisplayNames[resource.metricNamespace?.toLowerCase() ?? ''] ?? resource.metricNamespace ?? '',
-        locationDisplayName: this.logLocationsMap.get(resource.region ?? '')?.displayName || resource.region,
+        locationDisplayName: this.locationsMap.get(resource.region ?? '')?.displayName || resource.region,
         location: resource.region,
       });
     });

From 39c04a8e3633ed894cbadc9dfd2561b8f40815fa Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 14 Apr 2023 16:50:10 -0700
Subject: [PATCH 161/729] Chore: Remove deprecated dashboardId from panel query
 runner (#64786)

---
 packages/grafana-data/src/events/common.ts           |  2 +-
 packages/grafana-data/src/types/datasource.ts        |  2 --
 packages/grafana-data/src/types/queryRunner.ts       |  2 +-
 packages/grafana-runtime/src/analytics/types.ts      |  1 +
 pkg/api/dashboard_test.go                            |  4 +++-
 .../internal/input-datasource/src/testHelpers.ts     |  2 +-
 public/app/angular/panel/metrics_panel_ctrl.ts       |  2 +-
 public/app/core/utils/explore.ts                     |  1 -
 .../PanelEditor/PanelEditorTableView.test.tsx        |  2 --
 .../components/PanelEditor/PanelEditorTableView.tsx  |  1 -
 .../dashboard/dashgrid/PanelStateWrapper.tsx         |  1 -
 .../app/features/dashboard/state/DashboardModel.ts   |  1 +
 public/app/features/dashboard/state/PanelModel.ts    |  4 ----
 .../features/dashboard/state/analyticsProcessor.ts   |  1 +
 public/app/features/explore/Explore.test.tsx         |  1 -
 public/app/features/query/state/PanelQueryRunner.ts  |  4 ----
 public/app/features/query/state/QueryRunner.ts       |  4 ++--
 .../app/features/query/state/queryAnalytics.test.ts  | 12 +++---------
 public/app/features/query/state/queryAnalytics.ts    |  1 -
 .../datasource/azuremonitor/__mocks__/panelData.ts   |  1 -
 .../datasource/elasticsearch/datasource.test.ts      |  1 -
 .../datasource/jaeger/components/SearchForm.test.tsx |  1 -
 .../app/plugins/datasource/jaeger/datasource.test.ts |  1 -
 .../datasource/opentsdb/specs/datasource.test.ts     |  1 -
 .../plugins/datasource/prometheus/datasource.test.ts |  3 +--
 .../app/plugins/datasource/prometheus/datasource.tsx |  2 --
 public/test/helpers/getQueryOptions.ts               |  2 +-
 27 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/packages/grafana-data/src/events/common.ts b/packages/grafana-data/src/events/common.ts
index e83ce88e0d6..f66cdbd3c13 100644
--- a/packages/grafana-data/src/events/common.ts
+++ b/packages/grafana-data/src/events/common.ts
@@ -43,7 +43,7 @@ export class AnnotationChangeEvent extends BusEventWithPayload<Partial<Annotatio
 
 // Loaded the first time a dashboard is loaded (not on every render)
 export type DashboardLoadedEventPayload<T> = {
-  dashboardId: string;
+  dashboardId: string; // eeep, this should be UID
   orgId?: number;
   userId?: number;
   grafanaVersion?: string;
diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index 02a196f0240..f8fb6161b00 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -514,8 +514,6 @@ export interface DataQueryRequest<TQuery extends DataQuery = DataQuery> {
   rangeRaw?: RawTimeRange;
   timeInfo?: string; // The query time description (blue text in the upper right)
   panelId?: number;
-  /** @deprecate */
-  dashboardId?: number;
   dashboardUID?: string;
   publicDashboardAccessToken?: string;
 
diff --git a/packages/grafana-data/src/types/queryRunner.ts b/packages/grafana-data/src/types/queryRunner.ts
index cd0c0b3e12c..9634e5f5941 100644
--- a/packages/grafana-data/src/types/queryRunner.ts
+++ b/packages/grafana-data/src/types/queryRunner.ts
@@ -15,7 +15,7 @@ export interface QueryRunnerOptions {
   datasource: DataSourceRef | DataSourceApi | null;
   queries: DataQuery[];
   panelId?: number;
-  dashboardId?: number;
+  dashboardUID?: string;
   timezone: TimeZone;
   timeRange: TimeRange;
   timeInfo?: string; // String description of time range for display
diff --git a/packages/grafana-runtime/src/analytics/types.ts b/packages/grafana-runtime/src/analytics/types.ts
index 5f6812ead7e..742b9aac991 100644
--- a/packages/grafana-runtime/src/analytics/types.ts
+++ b/packages/grafana-runtime/src/analytics/types.ts
@@ -9,6 +9,7 @@ import { EchoEvent, EchoEventType } from '../services/EchoSrv';
  * @public
  */
 export interface DashboardInfo {
+  /** @deprecated -- use UID not internal ID */
   dashboardId: number;
   dashboardUid: string;
   dashboardName: string;
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index ca4cbba1b87..30e9f643622 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -140,7 +140,8 @@ func newTestLive(t *testing.T, store db.DB) *live.GrafanaLive {
 func TestDashboardAPIEndpoint(t *testing.T) {
 	t.Run("Given a dashboard with a parent folder which does not have an ACL", func(t *testing.T) {
 		fakeDash := dashboards.NewDashboard("Child dash")
-		fakeDash.ID = 1
+		fakeDash.SetID(1)
+		fakeDash.SetUID("test-uid-one")
 		fakeDash.FolderID = 1
 		fakeDash.HasACL = false
 		fakeDashboardVersionService := dashvertest.NewDashboardVersionServiceFake()
@@ -188,6 +189,7 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 					sc.sqlStore = mockSQLStore
 					dash := getDashboardShouldReturn200WithConfig(t, sc, nil, nil, dashboardService, nil)
 
+					assert.Equal(t, fakeDash.UID, dash.Dashboard.Get("uid").MustString())
 					assert.False(t, dash.Meta.CanEdit)
 					assert.False(t, dash.Meta.CanSave)
 					assert.False(t, dash.Meta.CanAdmin)
diff --git a/plugins-bundled/internal/input-datasource/src/testHelpers.ts b/plugins-bundled/internal/input-datasource/src/testHelpers.ts
index ed92a3dd85d..d4f0902542c 100644
--- a/plugins-bundled/internal/input-datasource/src/testHelpers.ts
+++ b/plugins-bundled/internal/input-datasource/src/testHelpers.ts
@@ -14,7 +14,7 @@ export function getQueryOptions<TQuery extends DataQuery>(
     scopedVars: {},
     timezone: 'browser',
     panelId: 1,
-    dashboardId: 1,
+    dashboardUID: 'test-uid-1',
     interval: '60s',
     intervalMs: 60000,
     maxDataPoints: 500,
diff --git a/public/app/angular/panel/metrics_panel_ctrl.ts b/public/app/angular/panel/metrics_panel_ctrl.ts
index 385cf430e80..c92c02485a7 100644
--- a/public/app/angular/panel/metrics_panel_ctrl.ts
+++ b/public/app/angular/panel/metrics_panel_ctrl.ts
@@ -194,7 +194,7 @@ class MetricsPanelCtrl extends PanelCtrl {
       datasource: panel.datasource,
       queries: panel.targets,
       panelId: panel.id,
-      dashboardId: this.dashboard.id,
+      dashboardUID: this.dashboard.uid,
       timezone: this.dashboard.getTimezone(),
       timeInfo: this.timeInfo,
       timeRange: this.range,
diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index 022045c3b72..9d7de0088e4 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -142,7 +142,6 @@ export function buildQueryTransaction(
 
   const request: DataQueryRequest = {
     app: CoreApp.Explore,
-    dashboardId: 0,
     // TODO probably should be taken from preferences but does not seem to be used anyway.
     timezone: timeZone || DefaultTimeZone,
     startTime: Date.now(),
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorTableView.test.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorTableView.test.tsx
index 28ec042494e..989cce72a87 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditorTableView.test.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorTableView.test.tsx
@@ -146,7 +146,6 @@ describe('PanelEditorTableView', () => {
 
     // panel queries should have the updated time range
     expect(props.panel.runAllPanelQueries).toHaveBeenNthCalledWith(1, {
-      dashboardId: props.dashboard.id,
       dashboardTimezone: '',
       dashboardUID: props.dashboard.uid,
       timeData: timeRangeUpdated,
@@ -167,7 +166,6 @@ describe('PanelEditorTableView', () => {
 
     // panel queries should have the updated time range
     expect(props.panel.runAllPanelQueries).toHaveBeenLastCalledWith({
-      dashboardId: props.dashboard.id,
       dashboardTimezone: '',
       dashboardUID: props.dashboard.uid,
       timeData: timeRangeUpdated2,
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorTableView.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorTableView.tsx
index 904ae31ec5d..065131123df 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditorTableView.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorTableView.tsx
@@ -34,7 +34,6 @@ export function PanelEditorTableView({ width, height, panel, dashboard }: Props)
     const sub = panel.events.subscribe(RefreshEvent, () => {
       const timeData = applyPanelTimeOverrides(panel, timeSrv.timeRange());
       panel.runAllPanelQueries({
-        dashboardId: dashboard.id,
         dashboardUID: dashboard.uid,
         dashboardTimezone: dashboard.getTimezone(),
         timeData,
diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
index 73d9929ba7b..931f2aa676d 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
@@ -348,7 +348,6 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
         this.setState({ refreshWhenInView: false });
       }
       panel.runAllPanelQueries({
-        dashboardId: dashboard.id,
         dashboardUID: dashboard.uid,
         dashboardTimezone: dashboard.getTimezone(),
         publicDashboardAccessToken: dashboard.meta.publicDashboardAccessToken,
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index b4cb4fbc8fc..16067227c18 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -68,6 +68,7 @@ export interface DashboardLink {
 }
 
 export class DashboardModel implements TimeModel {
+  /** @deprecated use UID */
   id: any;
   // TODO: use propert type and fix all the places where uid is set to null
   uid: any;
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index ecda98f0cc1..bbb3f10e42f 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -45,8 +45,6 @@ export interface GridPos {
 }
 
 type RunPanelQueryOptions = {
-  /** @deprecate */
-  dashboardId: number;
   dashboardUID: string;
   dashboardTimezone: string;
   timeData: TimeOverrideResult;
@@ -340,7 +338,6 @@ export class PanelModel implements DataConfigSource, IPanelModel {
   }
 
   runAllPanelQueries({
-    dashboardId,
     dashboardUID,
     dashboardTimezone,
     timeData,
@@ -351,7 +348,6 @@ export class PanelModel implements DataConfigSource, IPanelModel {
       datasource: this.datasource,
       queries: this.targets,
       panelId: this.id,
-      dashboardId: dashboardId,
       dashboardUID: dashboardUID,
       publicDashboardAccessToken,
       timezone: dashboardTimezone,
diff --git a/public/app/features/dashboard/state/analyticsProcessor.ts b/public/app/features/dashboard/state/analyticsProcessor.ts
index 258cf71ee45..416fda502ba 100644
--- a/public/app/features/dashboard/state/analyticsProcessor.ts
+++ b/public/app/features/dashboard/state/analyticsProcessor.ts
@@ -4,6 +4,7 @@ import { DashboardModel } from './DashboardModel';
 
 export function emitDashboardViewEvent(dashboard: DashboardModel) {
   const eventData: DashboardViewEventPayload = {
+    /** @deprecated */
     dashboardId: dashboard.id,
     dashboardName: dashboard.title,
     dashboardUid: dashboard.uid,
diff --git a/public/app/features/explore/Explore.test.tsx b/public/app/features/explore/Explore.test.tsx
index 045eb9ce7bd..fd726b323f7 100644
--- a/public/app/features/explore/Explore.test.tsx
+++ b/public/app/features/explore/Explore.test.tsx
@@ -23,7 +23,6 @@ const makeEmptyQueryResponse = (loadingState: LoadingState) => {
     requestId: '1',
     intervalMs: 0,
     interval: '1s',
-    dashboardId: 0,
     panelId: 1,
     range: baseEmptyResponse.timeRange,
     scopedVars: {
diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index fbd9b8efcde..19aea5e7c5d 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -48,8 +48,6 @@ export interface QueryRunnerOptions<
   datasource: DataSourceRef | DataSourceApi<TQuery, TOptions> | null;
   queries: TQuery[];
   panelId?: number;
-  /** @deprecate */
-  dashboardId?: number;
   dashboardUID?: string;
   publicDashboardAccessToken?: string;
   timezone: TimeZone;
@@ -205,7 +203,6 @@ export class PanelQueryRunner {
       timezone,
       datasource,
       panelId,
-      dashboardId,
       dashboardUID,
       publicDashboardAccessToken,
       timeRange,
@@ -228,7 +225,6 @@ export class PanelQueryRunner {
       requestId: getNextRequestId(),
       timezone,
       panelId,
-      dashboardId,
       dashboardUID,
       publicDashboardAccessToken,
       range: timeRange,
diff --git a/public/app/features/query/state/QueryRunner.ts b/public/app/features/query/state/QueryRunner.ts
index 7ed29e31db3..0788016038f 100644
--- a/public/app/features/query/state/QueryRunner.ts
+++ b/public/app/features/query/state/QueryRunner.ts
@@ -42,7 +42,7 @@ export class QueryRunner implements QueryRunnerSrv {
       datasource,
       panelId,
       app,
-      dashboardId,
+      dashboardUID,
       timeRange,
       timeInfo,
       cacheTimeout,
@@ -61,7 +61,7 @@ export class QueryRunner implements QueryRunnerSrv {
       requestId: getNextRequestId(),
       timezone,
       panelId,
-      dashboardId,
+      dashboardUID,
       range: timeRange,
       timeInfo,
       interval: '',
diff --git a/public/app/features/query/state/queryAnalytics.test.ts b/public/app/features/query/state/queryAnalytics.test.ts
index 7399a41c4e0..b4a7de819f2 100644
--- a/public/app/features/query/state/queryAnalytics.test.ts
+++ b/public/app/features/query/state/queryAnalytics.test.ts
@@ -89,7 +89,6 @@ function getTestData(requestApp: string, series: DataFrame[] = []): PanelData {
   return {
     request: {
       app: requestApp,
-      dashboardId: 1,
       panelId: 2,
       startTime: now.unix(),
       endTime: now.add(1, 's').unix(),
@@ -111,7 +110,6 @@ function getTestDataForExplore(requestApp: string, series: DataFrame[] = []): Pa
   return {
     request: {
       app: requestApp,
-      dashboardId: 0,
       startTime: now.unix(),
       endTime: now.add(1, 's').unix(),
     } as DataQueryRequest,
@@ -136,12 +134,11 @@ describe('emitDataRequestEvent - from a dashboard panel', () => {
       expect.objectContaining({
         eventName: MetaAnalyticsEventName.DataRequest,
         datasourceName: datasource.name,
-        datasourceId: datasource.id,
         datasourceUid: datasource.uid,
         datasourceType: datasource.type,
         source: 'dashboard',
         panelId: 2,
-        dashboardId: 1,
+        dashboardUid: 'test', // from dashboard srv
         dataSize: 0,
         duration: 1,
         totalQueries: 0,
@@ -159,12 +156,11 @@ describe('emitDataRequestEvent - from a dashboard panel', () => {
       expect.objectContaining({
         eventName: MetaAnalyticsEventName.DataRequest,
         datasourceName: datasource.name,
-        datasourceId: datasource.id,
         datasourceUid: datasource.uid,
         datasourceType: datasource.type,
         source: 'dashboard',
         panelId: 2,
-        dashboardId: 1,
+        dashboardUid: 'test',
         dataSize: 2,
         duration: 1,
         totalQueries: 2,
@@ -182,12 +178,11 @@ describe('emitDataRequestEvent - from a dashboard panel', () => {
       expect.objectContaining({
         eventName: MetaAnalyticsEventName.DataRequest,
         datasourceName: datasource.name,
-        datasourceId: datasource.id,
         datasourceUid: datasource.uid,
         datasourceType: datasource.type,
         source: 'dashboard',
         panelId: 2,
-        dashboardId: 1,
+        dashboardUid: 'test', // from dashboard srv
         dataSize: 2,
         duration: 1,
         totalQueries: 1,
@@ -227,7 +222,6 @@ describe('emitDataRequestEvent - from Explore', () => {
         eventName: MetaAnalyticsEventName.DataRequest,
         source: 'explore',
         datasourceName: 'test',
-        datasourceId: 1,
         datasourceUid: 'test',
         dataSize: 0,
         duration: 1,
diff --git a/public/app/features/query/state/queryAnalytics.ts b/public/app/features/query/state/queryAnalytics.ts
index 102cb954567..71c261d18bd 100644
--- a/public/app/features/query/state/queryAnalytics.ts
+++ b/public/app/features/query/state/queryAnalytics.ts
@@ -66,7 +66,6 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
     const cachedQueries = Object.values(queryCacheStatus).filter((val) => val === true).length;
 
     eventData.panelId = data.request!.panelId;
-    eventData.dashboardId = data.request!.dashboardId;
     eventData.totalQueries = totalQueries;
     eventData.cachedQueries = cachedQueries;
 
diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/panelData.ts b/public/app/plugins/datasource/azuremonitor/__mocks__/panelData.ts
index 640f96c5db6..c2a1bd63b80 100644
--- a/public/app/plugins/datasource/azuremonitor/__mocks__/panelData.ts
+++ b/public/app/plugins/datasource/azuremonitor/__mocks__/panelData.ts
@@ -28,7 +28,6 @@ export default function createMockPanelData(overrides?: DeepPartial<PanelData>)
       requestId: 'request',
       timezone: 'browser',
       panelId: 1,
-      dashboardId: 0,
       timeInfo: '',
       interval: '20s',
       intervalMs: 20000,
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index 81da363795a..c5bd3b8a5f6 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -1204,7 +1204,6 @@ describe('addAdhocFilters', () => {
 const createElasticQuery = (): DataQueryRequest<ElasticsearchQuery> => {
   return {
     requestId: '',
-    dashboardId: 0,
     interval: '',
     panelId: 0,
     intervalMs: 1,
diff --git a/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx b/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx
index eec5ffdf694..61d5000d677 100644
--- a/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx
+++ b/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx
@@ -194,7 +194,6 @@ const defaultSettings: DataSourceInstanceSettings<JaegerJsonData> = {
 
 const defaultQuery: DataQueryRequest<JaegerQuery> = {
   requestId: '1',
-  dashboardId: 0,
   interval: '0',
   intervalMs: 10,
   panelId: 0,
diff --git a/public/app/plugins/datasource/jaeger/datasource.test.ts b/public/app/plugins/datasource/jaeger/datasource.test.ts
index 34f3a56bca1..86416be5eef 100644
--- a/public/app/plugins/datasource/jaeger/datasource.test.ts
+++ b/public/app/plugins/datasource/jaeger/datasource.test.ts
@@ -352,7 +352,6 @@ const defaultSettings: DataSourceInstanceSettings<JaegerJsonData> = {
 
 const defaultQuery: DataQueryRequest<JaegerQuery> = {
   requestId: '1',
-  dashboardId: 0,
   interval: '0',
   intervalMs: 10,
   panelId: 0,
diff --git a/public/app/plugins/datasource/opentsdb/specs/datasource.test.ts b/public/app/plugins/datasource/opentsdb/specs/datasource.test.ts
index dfea25098fe..85dc68d61b2 100644
--- a/public/app/plugins/datasource/opentsdb/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/opentsdb/specs/datasource.test.ts
@@ -187,7 +187,6 @@ describe('opentsdb', () => {
         requestId: 'Q103',
         timezone: 'browser',
         panelId: 2,
-        dashboardId: 189,
         dashboardUID: 'tyzmfPIVz',
         publicDashboardAccessToken: '',
         range: {
diff --git a/public/app/plugins/datasource/prometheus/datasource.test.ts b/public/app/plugins/datasource/prometheus/datasource.test.ts
index c7fb6b5f2a5..4ac51646a40 100644
--- a/public/app/plugins/datasource/prometheus/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.test.ts
@@ -2008,7 +2008,7 @@ describe('PrometheusDatasource for POST', () => {
   });
 
   describe('When querying prometheus via check headers X-Dashboard-Id X-Panel-Id and X-Dashboard-UID', () => {
-    const options = { dashboardId: 1, panelId: 2, dashboardUID: 'WFlOM-jM1' } as DataQueryRequest<PromQuery>;
+    const options = { panelId: 2, dashboardUID: 'WFlOM-jM1' } as DataQueryRequest<PromQuery>;
     const httpOptions = {
       headers: {} as { [key: string]: number | undefined },
     } as PromQueryRequest;
@@ -2032,7 +2032,6 @@ describe('PrometheusDatasource for POST', () => {
 
     it('with proxy access tracing headers should be added', () => {
       ds._addTracingHeaders(httpOptions, options);
-      expect(httpOptions.headers['X-Dashboard-Id']).toBe(options.dashboardId);
       expect(httpOptions.headers['X-Panel-Id']).toBe(options.panelId);
       expect(httpOptions.headers['X-Dashboard-UID']).toBe(options.dashboardUID);
     });
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index e4c03719d26..991a6a9bc1f 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -195,7 +195,6 @@ export class PrometheusDatasource
   _addTracingHeaders(httpOptions: PromQueryRequest, options: DataQueryRequest<PromQuery>) {
     httpOptions.headers = {};
     if (this.access === 'proxy') {
-      httpOptions.headers['X-Dashboard-Id'] = options.dashboardId;
       httpOptions.headers['X-Dashboard-UID'] = options.dashboardUID;
       httpOptions.headers['X-Panel-Id'] = options.panelId;
     }
@@ -1058,7 +1057,6 @@ export class PrometheusDatasource
       targets: [{ refId: 'test', expr: '1+1', instant: true }],
       requestId: `${this.id}-health`,
       scopedVars: {},
-      dashboardId: 0,
       panelId: 0,
       interval: '1m',
       intervalMs: 60000,
diff --git a/public/test/helpers/getQueryOptions.ts b/public/test/helpers/getQueryOptions.ts
index ed92a3dd85d..d4f0902542c 100644
--- a/public/test/helpers/getQueryOptions.ts
+++ b/public/test/helpers/getQueryOptions.ts
@@ -14,7 +14,7 @@ export function getQueryOptions<TQuery extends DataQuery>(
     scopedVars: {},
     timezone: 'browser',
     panelId: 1,
-    dashboardId: 1,
+    dashboardUID: 'test-uid-1',
     interval: '60s',
     intervalMs: 60000,
     maxDataPoints: 500,

From 0181dc183ba616cea4e49d0d7a8efa2f9a4c63d4 Mon Sep 17 00:00:00 2001
From: Luke Palmer <luke@lukepalmer.net>
Date: Sat, 15 Apr 2023 02:08:28 -0400
Subject: [PATCH 162/729] Visualizations: Choose color based on series name
 (#66197)

---
 .../configure-standard-options/index.md       | 25 +++++++++---------
 packages/grafana-data/package.json            |  2 ++
 .../grafana-data/src/field/fieldColor.test.ts | 17 ++++++++----
 packages/grafana-data/src/field/fieldColor.ts | 26 +++++++++++++++++++
 packages/grafana-data/src/types/fieldColor.ts |  1 +
 yarn.lock                                     |  9 +++++++
 6 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/docs/sources/panels-visualizations/configure-standard-options/index.md b/docs/sources/panels-visualizations/configure-standard-options/index.md
index e9e1080739e..d82cc74574d 100644
--- a/docs/sources/panels-visualizations/configure-standard-options/index.md
+++ b/docs/sources/panels-visualizations/configure-standard-options/index.md
@@ -116,18 +116,19 @@ Select one of the following palettes:
 
 <div class="clearfix"></div>
 
-| Color mode                      | Description                                                                                                                                              |
-| ------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Single color**                | Specify a single color, useful in an override rule                                                                                                       |
-| **Shades of a color**           | Selects shades of a single color, useful in an override rule                                                                                             |
-| **From thresholds**             | Informs Grafana to take the color from the matching threshold                                                                                            |
-| **Classic palette**             | Grafana will assign color by looking up a color in a palette by series index. Useful for Graphs and pie charts and other categorical data visualizations |
-| **Green-Yellow-Red (by value)** | Continuous color scheme                                                                                                                                  |
-| **Blue-Yellow-Red (by value)**  | Continuous color scheme                                                                                                                                  |
-| **Blues (by value)**            | Continuous color scheme (panel background to blue)                                                                                                       |
-| **Reds (by value)**             | Continuous color scheme (panel background color to blue)                                                                                                 |
-| **Greens (by value)**           | Continuous color scheme (panel background color to blue)                                                                                                 |
-| **Purple (by value)**           | Continuous color scheme (panel background color to blue)                                                                                                 |
+| Color mode                           | Description                                                                                                                                              |
+| ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Single color**                     | Specify a single color, useful in an override rule                                                                                                       |
+| **Shades of a color**                | Selects shades of a single color, useful in an override rule                                                                                             |
+| **From thresholds**                  | Informs Grafana to take the color from the matching threshold                                                                                            |
+| **Classic palette**                  | Grafana will assign color by looking up a color in a palette by series index. Useful for Graphs and pie charts and other categorical data visualizations |
+| **Classic palette (by series name)** | Grafana will assign color based on the name of the series. Useful when the series names to be visualized depend on the available data.                   |
+| **Green-Yellow-Red (by value)**      | Continuous color scheme                                                                                                                                  |
+| **Blue-Yellow-Red (by value)**       | Continuous color scheme                                                                                                                                  |
+| **Blues (by value)**                 | Continuous color scheme (panel background to blue)                                                                                                       |
+| **Reds (by value)**                  | Continuous color scheme (panel background color to blue)                                                                                                 |
+| **Greens (by value)**                | Continuous color scheme (panel background color to blue)                                                                                                 |
+| **Purple (by value)**                | Continuous color scheme (panel background color to blue)                                                                                                 |
 
 {{< figure src="/static/img/docs/v73/color_scheme_dropdown.png" max-width="350px" caption="Color scheme" >}}
 
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 7032827909b..30c421f565b 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -38,6 +38,7 @@
     "@braintree/sanitize-url": "6.0.2",
     "@grafana/schema": "10.0.0-pre",
     "@types/d3-interpolate": "^3.0.0",
+    "@types/string-hash": "1.1.1",
     "d3-interpolate": "3.0.1",
     "date-fns": "2.29.3",
     "dompurify": "^2.4.3",
@@ -53,6 +54,7 @@
     "react-use": "17.4.0",
     "regenerator-runtime": "0.13.11",
     "rxjs": "7.8.0",
+    "string-hash": "^1.1.3",
     "tinycolor2": "1.6.0",
     "tslib": "2.5.0",
     "uplot": "1.6.24",
diff --git a/packages/grafana-data/src/field/fieldColor.test.ts b/packages/grafana-data/src/field/fieldColor.test.ts
index a279429f997..43813f1f10a 100644
--- a/packages/grafana-data/src/field/fieldColor.test.ts
+++ b/packages/grafana-data/src/field/fieldColor.test.ts
@@ -3,9 +3,9 @@ import { Field, FieldColorModeId, FieldType } from '../types';
 
 import { fieldColorModeRegistry, FieldValueColorCalculator, getFieldSeriesColor } from './fieldColor';
 
-function getTestField(mode: string, fixedColor?: string): Field {
+function getTestField(mode: string, fixedColor?: string, name = 'name'): Field {
   return {
-    name: 'name',
+    name: name,
     type: FieldType.number,
     values: [],
     config: {
@@ -21,11 +21,12 @@ function getTestField(mode: string, fixedColor?: string): Field {
 interface GetCalcOptions {
   mode: string;
   seriesIndex?: number;
+  name?: string;
   fixedColor?: string;
 }
 
 function getCalculator(options: GetCalcOptions): FieldValueColorCalculator {
-  const field = getTestField(options.mode, options.fixedColor);
+  const field = getTestField(options.mode, options.fixedColor, options.name);
   const mode = fieldColorModeRegistry.get(options.mode);
   field.state!.seriesIndex = options.seriesIndex;
   return mode.getCalculator(field, createTheme());
@@ -38,15 +39,21 @@ describe('fieldColorModeRegistry', () => {
   });
 
   it('Palette classic with series index 0', () => {
-    const calcFn = getCalculator({ mode: FieldColorModeId.PaletteClassic, seriesIndex: 0 });
+    const calcFn = getCalculator({ mode: FieldColorModeId.PaletteClassic, seriesIndex: 0, name: 'series1' });
     expect(calcFn(70, 0, undefined)).toEqual('#73BF69');
   });
 
   it('Palette classic with series index 1', () => {
-    const calcFn = getCalculator({ mode: FieldColorModeId.PaletteClassic, seriesIndex: 1 });
+    const calcFn = getCalculator({ mode: FieldColorModeId.PaletteClassic, seriesIndex: 1, name: 'series2' });
     expect(calcFn(70, 0, undefined)).toEqual('#F2CC0C');
   });
 
+  it('Palette uses name', () => {
+    const calcFn1 = getCalculator({ mode: FieldColorModeId.PaletteClassicByName, seriesIndex: 0, name: 'same name' });
+    const calcFn2 = getCalculator({ mode: FieldColorModeId.PaletteClassicByName, seriesIndex: 1, name: 'same name' });
+    expect(calcFn1(12, 34, undefined)).toEqual(calcFn2(56, 78, undefined));
+  });
+
   it('When color.seriesBy is set to last use that instead of v', () => {
     const field = getTestField('continuous-GrYlRd');
 
diff --git a/packages/grafana-data/src/field/fieldColor.ts b/packages/grafana-data/src/field/fieldColor.ts
index a9d09572998..289177150de 100644
--- a/packages/grafana-data/src/field/fieldColor.ts
+++ b/packages/grafana-data/src/field/fieldColor.ts
@@ -1,6 +1,8 @@
 import { interpolateRgbBasis } from 'd3-interpolate';
+import stringHash from 'string-hash';
 import tinycolor from 'tinycolor2';
 
+import { colorManipulator } from '../themes';
 import { GrafanaTheme2 } from '../themes/types';
 import { reduceField } from '../transformations/fieldReducer';
 import { FALLBACK_COLOR, Field, FieldColorModeId, Threshold } from '../types';
@@ -19,6 +21,7 @@ export interface FieldColorMode extends RegistryItem {
   getColors?: (theme: GrafanaTheme2) => string[];
   isContinuous?: boolean;
   isByValue?: boolean;
+  useSeriesName?: boolean;
 }
 
 /** @internal */
@@ -57,6 +60,22 @@ export const fieldColorModeRegistry = new Registry<FieldColorMode>(() => {
         return theme.visualization.palette;
       },
     }),
+    new FieldColorSchemeMode({
+      id: FieldColorModeId.PaletteClassicByName,
+      name: 'Classic palette (by series name)',
+      isContinuous: false,
+      isByValue: false,
+      useSeriesName: true,
+      getColors: (theme: GrafanaTheme2) => {
+        return theme.visualization.palette.filter(
+          (color) =>
+            colorManipulator.getContrastRatio(
+              theme.visualization.getColorByName(color),
+              theme.colors.background.primary
+            ) >= theme.colors.contrastThreshold
+        );
+      },
+    }),
     new FieldColorSchemeMode({
       id: FieldColorModeId.ContinuousGrYlRd,
       name: 'Green-Yellow-Red',
@@ -137,6 +156,7 @@ interface FieldColorSchemeModeOptions {
   getColors: (theme: GrafanaTheme2) => string[];
   isContinuous: boolean;
   isByValue: boolean;
+  useSeriesName?: boolean;
 }
 
 export class FieldColorSchemeMode implements FieldColorMode {
@@ -145,6 +165,7 @@ export class FieldColorSchemeMode implements FieldColorMode {
   description?: string;
   isContinuous: boolean;
   isByValue: boolean;
+  useSeriesName?: boolean;
   colorCache?: string[];
   colorCacheTheme?: GrafanaTheme2;
   interpolator?: (value: number) => string;
@@ -157,6 +178,7 @@ export class FieldColorSchemeMode implements FieldColorMode {
     this.getNamedColors = options.getColors;
     this.isContinuous = options.isContinuous;
     this.isByValue = options.isByValue;
+    this.useSeriesName = options.useSeriesName;
   }
 
   getColors(theme: GrafanaTheme2): string[] {
@@ -195,6 +217,10 @@ export class FieldColorSchemeMode implements FieldColorMode {
           return colors[percent * (colors.length - 1)];
         };
       }
+    } else if (this.useSeriesName) {
+      return (_: number, _percent: number, _threshold?: Threshold) => {
+        return colors[Math.abs(stringHash(field.name)) % colors.length];
+      };
     } else {
       return (_: number, _percent: number, _threshold?: Threshold) => {
         const seriesIndex = field.state?.seriesIndex ?? 0;
diff --git a/packages/grafana-data/src/types/fieldColor.ts b/packages/grafana-data/src/types/fieldColor.ts
index d58bb68ceab..8dcbb526aa3 100644
--- a/packages/grafana-data/src/types/fieldColor.ts
+++ b/packages/grafana-data/src/types/fieldColor.ts
@@ -4,6 +4,7 @@
 export enum FieldColorModeId {
   Thresholds = 'thresholds',
   PaletteClassic = 'palette-classic',
+  PaletteClassicByName = 'palette-classic-by-name',
   PaletteSaturated = 'palette-saturated',
   ContinuousGrYlRd = 'continuous-GrYlRd',
   ContinuousRdYlGr = 'continuous-RdYlGr',
diff --git a/yarn.lock b/yarn.lock
index 1e0b8d3acd4..920cb076c38 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3049,6 +3049,7 @@ __metadata:
     "@types/react": 18.0.28
     "@types/react-dom": 18.0.11
     "@types/sinon": 10.0.13
+    "@types/string-hash": 1.1.1
     "@types/testing-library__jest-dom": 5.14.5
     "@types/tinycolor2": 1.4.3
     d3-interpolate: 3.0.1
@@ -3076,6 +3077,7 @@ __metadata:
     rollup-plugin-node-externals: ^5.0.0
     rxjs: 7.8.0
     sinon: 15.0.1
+    string-hash: ^1.1.3
     tinycolor2: 1.6.0
     tslib: 2.5.0
     typescript: 4.8.4
@@ -10398,6 +10400,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/string-hash@npm:1.1.1":
+  version: 1.1.1
+  resolution: "@types/string-hash@npm:1.1.1"
+  checksum: e7cdba66dc1cfd88033d66a0fd301abd1434f8e3fc22826443073e5c33a26e5c53a26ef4e062d0ebf3f8590f506dec2351c4b952df1d04ba188bc0a48f411f17
+  languageName: node
+  linkType: hard
+
 "@types/symlink-or-copy@npm:^1.2.0":
   version: 1.2.0
   resolution: "@types/symlink-or-copy@npm:1.2.0"

From 9f0d44d176db716aa6615d57d4fefaa31d87e121 Mon Sep 17 00:00:00 2001
From: gotjosh <josue.abreu@gmail.com>
Date: Sat, 15 Apr 2023 12:01:34 +0100
Subject: [PATCH 163/729] GRPC: Document GRPC flags to allow overriding env
 vars (#66628)

---
 conf/defaults.ini | 8 ++++++++
 conf/sample.ini   | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index ecd4f941f7a..1a727c18fb6 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -90,6 +90,14 @@ read_timeout = 0
 #exampleHeader1 = exampleValue1
 #exampleHeader2 = exampleValue2
 
+#################################### GRPC Server #########################
+[grpc_server]
+network = "tcp"
+address = "127.0.0.1:10000"
+use_tls = false
+cert_file =
+key_file =
+
 #################################### Database ############################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
diff --git a/conf/sample.ini b/conf/sample.ini
index 29331b68d77..70275a44ee0 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -91,6 +91,14 @@
 #exampleHeader1 = exampleValue1
 #exampleHeader2 = exampleValue2
 
+#################################### GRPC Server #########################
+;[grpc_server]
+;network = "tcp"
+;address = "127.0.0.1:10000"
+;use_tls = false
+;cert_file =
+;key_file =
+
 #################################### Database ####################################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password

From 9391700d84b137ab01c4406a533c935a12aaf78b Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Mon, 17 Apr 2023 08:30:27 +0100
Subject: [PATCH 164/729] Traces: Span filtering (#65725)

* Filters

* Service/span/duration filters

* Renames for focused span and matches

* Tag filters and new component

* Tag filtering

* Multiple tags and enable next/prev appropriately

* Enum, renames, fixes

* Clean up unecessary props

* setFocusedSearchMatch

* Faster options

* Perf enhancements and cleanup

* General improvements to tags etc

* Updates to filtering

* Add datasourceType in next/prev

* Integrate TracePageSearchBar with NewTracePageSearchBar

* Design tweaks

* Update sticky elem and header design

* Fix tests

* Self review

* Enhancements

* More enhancements

* Update tests

* tests

* More tests

* Add span filters to docs

* Update image link

* Update docs

* Update buttonEnabled and text

* PR review

* Update sticky header

* Doc updates

* Set values for service/span name

* Buffer and dash update
---
 docs/sources/datasources/jaeger/_index.md     |  16 +
 docs/sources/datasources/tempo/_index.md      |  16 +
 docs/sources/datasources/zipkin/_index.md     |  16 +
 docs/sources/explore/trace-integration.md     |  16 +
 .../features/explore/TraceView/TraceView.tsx  |  48 ++-
 .../NewTracePageHeader.test.tsx               |  24 +-
 .../TracePageHeader/NewTracePageHeader.tsx    | 152 ++++---
 .../NewTracePageSearchBar.test.tsx            |  51 +++
 .../TracePageHeader/NewTracePageSearchBar.tsx | 123 ++++++
 .../SpanFilters/SpanFilters.test.tsx          | 179 ++++++++
 .../SpanFilters/SpanFilters.tsx               | 407 ++++++++++++++++++
 .../TracePageHeader/TracePageHeader.test.tsx  |   8 +-
 .../TracePageHeader/TracePageHeader.tsx       |   6 +-
 .../TracePageSearchBar.test.tsx               |   2 +-
 .../TracePageHeader/TracePageSearchBar.tsx    |   8 +-
 .../TraceTimelineViewer/ListView/index.tsx    |   4 +-
 .../VirtualizedTraceView.tsx                  |  13 +-
 .../components/TraceTimelineViewer/index.tsx  |   1 +
 ...Input.test.tsx => SearchBarInput.test.tsx} |  20 +-
 .../{UiFindInput.tsx => SearchBarInput.tsx}   |   2 +-
 .../explore/TraceView/components/index.ts     |   2 +-
 .../components/utils/filter-spans.test.ts     | 370 +++++++++++++++-
 .../components/utils/filter-spans.tsx         | 140 +++++-
 .../explore/TraceView/useSearch.test.ts       |  62 +--
 .../features/explore/TraceView/useSearch.ts   |  47 +-
 .../app/plugins/panel/traces/TracesPanel.tsx  |   3 +-
 26 files changed, 1595 insertions(+), 141 deletions(-)
 create mode 100644 public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
 create mode 100644 public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
 create mode 100644 public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
 create mode 100644 public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
 rename public/app/features/explore/TraceView/components/common/{UiFindInput.test.tsx => SearchBarInput.test.tsx} (61%)
 rename public/app/features/explore/TraceView/components/common/{UiFindInput.tsx => SearchBarInput.tsx} (95%)

diff --git a/docs/sources/datasources/jaeger/_index.md b/docs/sources/datasources/jaeger/_index.md
index 2d6a7e19a22..091e8934989 100644
--- a/docs/sources/datasources/jaeger/_index.md
+++ b/docs/sources/datasources/jaeger/_index.md
@@ -293,6 +293,22 @@ If the file has multiple traces, Grafana visualizes its first trace.
 }
 ```
 
+## Span Filters
+
+> **Note:** This feature is behind the `newTraceView` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
+> If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
+
+![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters.png)
+
+Using span filters, you can filter your spans in the trace timeline viewer. The more filters you add, the more specific are the filtered spans.
+
+You can add one or more of the following filters:
+
+- Service name
+- Span name
+- Duration
+- Tags (which include tags, process tags, and log fields)
+
 ## Link to a trace ID from logs
 
 You can link to Jaeger traces from logs in Loki, Elasticsearch, Splunk, and other logs data sources by configuring an internal link.
diff --git a/docs/sources/datasources/tempo/_index.md b/docs/sources/datasources/tempo/_index.md
index d37e97da545..820f9bbe4db 100644
--- a/docs/sources/datasources/tempo/_index.md
+++ b/docs/sources/datasources/tempo/_index.md
@@ -357,6 +357,22 @@ To open a query in Prometheus with the span name of that row automatically set i
 
 To open a query in Tempo with the span name of that row automatically set in the query, click a row in the **links** column.
 
+## Span Filters
+
+> **Note:** This feature is behind the `newTraceView` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
+> If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
+
+![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters.png)
+
+Using span filters, you can filter your spans in the trace timeline viewer. The more filters you add, the more specific are the filtered spans.
+
+You can add one or more of the following filters:
+
+- Service name
+- Span name
+- Duration
+- Tags (which include tags, process tags, and log fields)
+
 ## Link to a trace ID from logs
 
 You can link to Tempo traces from logs in Loki, Elasticsearch, Splunk, and other logs data sources by configuring an internal link.
diff --git a/docs/sources/datasources/zipkin/_index.md b/docs/sources/datasources/zipkin/_index.md
index 7cd554d230f..c3de7290d6e 100644
--- a/docs/sources/datasources/zipkin/_index.md
+++ b/docs/sources/datasources/zipkin/_index.md
@@ -262,6 +262,22 @@ If the file has multiple traces, Grafana visualizes its first trace.
 ]
 ```
 
+## Span Filters
+
+> **Note:** This feature is behind the `newTraceView` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
+> If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
+
+![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters.png)
+
+Using span filters, you can filter your spans in the trace timeline viewer. The more filters you add, the more specific are the filtered spans.
+
+You can add one or more of the following filters:
+
+- Service name
+- Span name
+- Duration
+- Tags (which include tags, process tags, and log fields)
+
 ## Link to a trace ID from logs
 
 You can link to Zipkin traces from logs in Loki, Elasticsearch, Splunk, and other logs data sources by configuring an internal link.
diff --git a/docs/sources/explore/trace-integration.md b/docs/sources/explore/trace-integration.md
index 06a32394f33..69b1e90231f 100644
--- a/docs/sources/explore/trace-integration.md
+++ b/docs/sources/explore/trace-integration.md
@@ -40,6 +40,22 @@ This section explains the elements of the Trace View.
 
 Shows condensed view or the trace timeline. Drag your mouse over the minimap to zoom into smaller time range. Zooming will also update the main timeline, so it is easy to see shorter spans. Hovering over the minimap, when zoomed, will show Reset Selection button which resets the zoom.
 
+### Span Filters
+
+> **Note:** This feature is behind the `newTraceView` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
+> If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
+
+![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters.png)
+
+Using span filters, you can filter your spans in the trace timeline viewer. The more filters you add, the more specific are the filtered spans.
+
+You can add one or more of the following filters:
+
+- Service name
+- Span name
+- Duration
+- Tags (which include tags, process tags, and log fields)
+
 ### Timeline
 
 {{< figure src="/static/img/docs/v70/explore-trace-view-timeline.png" class="docs-image--no-shadow" max-width= "900px"  caption="Screenshot of the trace view timeline" >}}
diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index 56d69e4823a..f7066c061ea 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -1,5 +1,6 @@
 import { css } from '@emotion/css';
 import React, { RefObject, useMemo, useState } from 'react';
+import { useToggle } from 'react-use';
 
 import {
   DataFrame,
@@ -34,11 +35,13 @@ import {
   TraceTimelineViewer,
   TTraceTimeline,
 } from './components';
+import SpanGraph from './components/TracePageHeader/SpanGraph';
 import { TopOfViewRefType } from './components/TraceTimelineViewer/VirtualizedTraceView';
 import { createSpanLinkFactory } from './createSpanLink';
 import { useChildrenState } from './useChildrenState';
 import { useDetailState } from './useDetailState';
 import { useHoverIndentGuide } from './useHoverIndentGuide';
+import { useSearchNewTraceView } from './useSearch';
 import { useViewRange } from './useViewRange';
 
 const getStyles = (theme: GrafanaTheme2) => ({
@@ -61,6 +64,7 @@ type Props = {
   splitOpenFn?: SplitOpen;
   exploreId?: ExploreId;
   scrollElement?: Element;
+  scrollElementClass?: string;
   traceProp: Trace;
   spanFindMatches?: Set<string>;
   search: string;
@@ -90,6 +94,10 @@ export function TraceView(props: Props) {
   const { removeHoverIndentGuideId, addHoverIndentGuideId, hoverIndentGuideIds } = useHoverIndentGuide();
   const { viewRange, updateViewRangeTime, updateNextViewRangeTime } = useViewRange();
   const { expandOne, collapseOne, childrenToggle, collapseAll, childrenHiddenIDs, expandAll } = useChildrenState();
+  const { newTraceViewSearch, setNewTraceViewSearch, spanFilterMatches } = useSearchNewTraceView(traceProp?.spans);
+  const [newTraceViewFocusedSpanIdForSearch, setNewTraceViewFocusedSpanIdForSearch] = useState('');
+  const [showSpanFilters, setShowSpanFilters] = useToggle(false);
+  const [headerHeight, setHeaderHeight] = useState(0);
 
   const styles = useStyles2(getStyles);
 
@@ -136,19 +144,36 @@ export function TraceView(props: Props) {
   );
   const timeZone = useSelector((state) => getTimeZone(state.user));
   const datasourceType = datasource ? datasource?.type : 'unknown';
+  const scrollElement = props.scrollElement
+    ? props.scrollElement
+    : document.getElementsByClassName(props.scrollElementClass ?? '')[0];
 
   return (
     <>
       {props.dataFrames?.length && traceProp ? (
         <>
           {config.featureToggles.newTraceView ? (
-            <NewTracePageHeader
-              trace={traceProp}
-              updateNextViewRangeTime={updateNextViewRangeTime}
-              updateViewRangeTime={updateViewRangeTime}
-              viewRange={viewRange}
-              timeZone={timeZone}
-            />
+            <>
+              <NewTracePageHeader
+                trace={traceProp}
+                timeZone={timeZone}
+                search={newTraceViewSearch}
+                setSearch={setNewTraceViewSearch}
+                showSpanFilters={showSpanFilters}
+                setShowSpanFilters={setShowSpanFilters}
+                focusedSpanIdForSearch={newTraceViewFocusedSpanIdForSearch}
+                setFocusedSpanIdForSearch={setNewTraceViewFocusedSpanIdForSearch}
+                spanFilterMatches={spanFilterMatches}
+                datasourceType={datasourceType}
+                setHeaderHeight={setHeaderHeight}
+              />
+              <SpanGraph
+                trace={traceProp}
+                viewRange={viewRange}
+                updateNextViewRangeTime={updateNextViewRangeTime}
+                updateViewRangeTime={updateViewRangeTime}
+              />
+            </>
           ) : (
             <TracePageHeader
               trace={traceProp}
@@ -161,7 +186,7 @@ export function TraceView(props: Props) {
           <TraceTimelineViewer
             registerAccessors={noop}
             scrollToFirstVisibleSpan={noop}
-            findMatchesIDs={spanFindMatches}
+            findMatchesIDs={config.featureToggles.newTraceView ? spanFilterMatches : spanFindMatches}
             trace={traceProp}
             datasourceType={datasourceType}
             spanBarOptions={spanBarOptions?.spanBar}
@@ -192,12 +217,15 @@ export function TraceView(props: Props) {
             linksGetter={() => []}
             uiFind={props.search}
             createSpanLink={createSpanLink}
-            scrollElement={props.scrollElement}
+            scrollElement={scrollElement}
             focusedSpanId={focusedSpanId}
-            focusedSpanIdForSearch={props.focusedSpanIdForSearch!}
+            focusedSpanIdForSearch={
+              config.featureToggles.newTraceView ? newTraceViewFocusedSpanIdForSearch : props.focusedSpanIdForSearch!
+            }
             createFocusSpanLink={createFocusSpanLink}
             topOfViewRef={topOfViewRef}
             topOfViewRefType={topOfViewRefType}
+            headerHeight={headerHeight}
           />
         </>
       ) : (
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
index 26b27462222..d68935d294b 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
@@ -12,23 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { getAllByText, getByText, render } from '@testing-library/react';
+import { getByText, render } from '@testing-library/react';
 import React from 'react';
 
 import config from 'app/core/config';
 
+import { defaultFilters } from '../../useSearch';
+
 import { NewTracePageHeader } from './NewTracePageHeader';
-import { TracePageHeaderEmbedProps } from './TracePageHeader';
 import { trace } from './TracePageHeader.test';
 
-const setup = (propOverrides?: TracePageHeaderEmbedProps) => {
+const setup = () => {
   const defaultProps = {
     trace,
     timeZone: '',
-    viewRange: { time: { current: [10, 20] as [number, number] } },
-    updateNextViewRangeTime: () => {},
-    updateViewRangeTime: () => {},
-    ...propOverrides,
+    search: defaultFilters,
+    setSearch: jest.fn(),
+    showSpanFilters: true,
+    setShowSpanFilters: jest.fn(),
+    spanFilterMatches: undefined,
+    focusedSpanIdForSearch: '',
+    setFocusedSpanIdForSearch: jest.fn(),
+    datasourceType: 'tempo',
+    setHeaderHeight: jest.fn(),
   };
 
   return render(<NewTracePageHeader {...defaultProps} />);
@@ -43,13 +49,13 @@ describe('NewTracePageHeader test', () => {
     const method = getByText(header!, 'POST');
     const status = getByText(header!, '200');
     const url = getByText(header!, '/v2/gamma/792edh2w897y2huehd2h89');
-    const duration = getAllByText(header!, '2.36s');
+    const duration = getByText(header!, '2.36s');
     const timestampPart1 = getByText(header!, '2023-02-05 08:50');
     const timestampPart2 = getByText(header!, ':56.289');
     expect(method).toBeInTheDocument();
     expect(status).toBeInTheDocument();
     expect(url).toBeInTheDocument();
-    expect(duration.length).toBe(2);
+    expect(duration).toBeInTheDocument();
     expect(timestampPart1).toBeInTheDocument();
     expect(timestampPart2).toBeInTheDocument();
   });
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
index b8ba1f0336f..12d704e105a 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
@@ -14,75 +14,59 @@
 
 import { css } from '@emotion/css';
 import cx from 'classnames';
-import * as React from 'react';
+import React, { memo, useEffect, useMemo } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { TimeZone } from '@grafana/schema';
 import { Badge, BadgeColor, Tooltip, useStyles2 } from '@grafana/ui';
 
-import { autoColor } from '../Theme';
+import { SearchProps } from '../../useSearch';
 import ExternalLinks from '../common/ExternalLinks';
 import TraceName from '../common/TraceName';
 import { getTraceLinks } from '../model/link-patterns';
 import { getHeaderTags, getTraceName } from '../model/trace-viewer';
+import { Trace } from '../types';
 import { formatDuration } from '../utils/date';
 
 import TracePageActions from './Actions/TracePageActions';
-import SpanGraph from './SpanGraph';
-import { TracePageHeaderEmbedProps, timestamp, getStyles } from './TracePageHeader';
+import { SpanFilters } from './SpanFilters/SpanFilters';
+import { timestamp, getStyles } from './TracePageHeader';
 
-const getNewStyles = (theme: GrafanaTheme2) => {
-  return {
-    titleRow: css`
-      label: TracePageHeaderTitleRow;
-      align-items: center;
-      display: flex;
-      padding: 0 0.5em 0 0.5em;
-    `,
-    title: css`
-      label: TracePageHeaderTitle;
-      color: inherit;
-      flex: 1;
-      font-size: 1.7em;
-      line-height: 1em;
-    `,
-    subtitle: css`
-      flex: 1;
-      line-height: 1em;
-      margin: -0.5em 0.5em 1.5em 0.5em;
-    `,
-    tag: css`
-      margin: 0 0.5em 0 0;
-    `,
-    url: css`
-      margin: -2.5px 0.3em;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      max-width: 30%;
-      display: inline-block;
-    `,
-    divider: css`
-      margin: 0 0.75em;
-    `,
-    header: css`
-      label: TracePageHeader;
-      background-color: ${theme.colors.background.primary};
-      position: sticky;
-      top: 0;
-      z-index: 5;
-      padding: 0.5em 0.25em 0 0.25em;
-      & > :last-child {
-        border-bottom: 1px solid ${autoColor(theme, '#ccc')};
-      }
-    `,
-  };
+export type TracePageHeaderProps = {
+  trace: Trace | null;
+  timeZone: TimeZone;
+  search: SearchProps;
+  setSearch: React.Dispatch<React.SetStateAction<SearchProps>>;
+  showSpanFilters: boolean;
+  setShowSpanFilters: (isOpen: boolean) => void;
+  focusedSpanIdForSearch: string;
+  setFocusedSpanIdForSearch: React.Dispatch<React.SetStateAction<string>>;
+  spanFilterMatches: Set<string> | undefined;
+  datasourceType: string;
+  setHeaderHeight: (height: number) => void;
 };
 
-export function NewTracePageHeader(props: TracePageHeaderEmbedProps) {
-  const { trace, updateNextViewRangeTime, updateViewRangeTime, viewRange, timeZone } = props;
-
+export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
+  const {
+    trace,
+    timeZone,
+    search,
+    setSearch,
+    showSpanFilters,
+    setShowSpanFilters,
+    focusedSpanIdForSearch,
+    setFocusedSpanIdForSearch,
+    spanFilterMatches,
+    datasourceType,
+    setHeaderHeight,
+  } = props;
   const styles = { ...useStyles2(getStyles), ...useStyles2(getNewStyles) };
-  const links = React.useMemo(() => {
+
+  useEffect(() => {
+    setHeaderHeight(document.querySelector('.' + styles.header)?.scrollHeight ?? 0);
+  }, [setHeaderHeight, showSpanFilters, styles.header]);
+
+  const links = useMemo(() => {
     if (!trace) {
       return [];
     }
@@ -146,12 +130,62 @@ export function NewTracePageHeader(props: TracePageHeaderEmbedProps) {
         )}
       </div>
 
-      <SpanGraph
+      <SpanFilters
         trace={trace}
-        viewRange={viewRange}
-        updateNextViewRangeTime={updateNextViewRangeTime}
-        updateViewRangeTime={updateViewRangeTime}
+        showSpanFilters={showSpanFilters}
+        setShowSpanFilters={setShowSpanFilters}
+        search={search}
+        setSearch={setSearch}
+        spanFilterMatches={spanFilterMatches}
+        focusedSpanIdForSearch={focusedSpanIdForSearch}
+        setFocusedSpanIdForSearch={setFocusedSpanIdForSearch}
+        datasourceType={datasourceType}
       />
     </header>
   );
-}
+});
+
+NewTracePageHeader.displayName = 'NewTracePageHeader';
+
+const getNewStyles = (theme: GrafanaTheme2) => {
+  return {
+    header: css`
+      label: TracePageHeader;
+      background-color: ${theme.colors.background.primary};
+      padding: 0.5em 0 0 0;
+      position: sticky;
+      top: 0;
+      z-index: 5;
+    `,
+    titleRow: css`
+      align-items: center;
+      display: flex;
+      padding: 0 8px;
+    `,
+    title: css`
+      color: inherit;
+      flex: 1;
+      font-size: 1.7em;
+      line-height: 1em;
+    `,
+    subtitle: css`
+      flex: 1;
+      line-height: 1em;
+      margin: -0.5em 8px 0.75em 8px;
+    `,
+    tag: css`
+      margin: 0 0.5em 0 0;
+    `,
+    url: css`
+      margin: -2.5px 0.3em;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      max-width: 30%;
+      display: inline-block;
+    `,
+    divider: css`
+      margin: 0 0.75em;
+    `,
+  };
+};
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
new file mode 100644
index 00000000000..5fd328bbe29
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
@@ -0,0 +1,51 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { defaultFilters } from '../../useSearch';
+
+import NewTracePageSearchBar, { TracePageSearchBarProps } from './NewTracePageSearchBar';
+
+const defaultProps = {
+  search: defaultFilters,
+  setFocusedSpanIdForSearch: jest.fn(),
+};
+
+describe('<NewTracePageSearchBar>', () => {
+  it('renders buttons', () => {
+    render(<NewTracePageSearchBar {...(defaultProps as unknown as TracePageSearchBarProps)} />);
+    const nextResButton = screen.queryByRole('button', { name: 'Next result button' });
+    const prevResButton = screen.queryByRole('button', { name: 'Prev result button' });
+    expect(nextResButton).toBeInTheDocument();
+    expect(prevResButton).toBeInTheDocument();
+    expect((nextResButton as HTMLButtonElement)['disabled']).toBe(true);
+    expect((prevResButton as HTMLButtonElement)['disabled']).toBe(true);
+  });
+
+  it('renders buttons that can be used to search if filters added', () => {
+    const props = {
+      ...defaultProps,
+      spanFilterMatches: new Set(['2ed38015486087ca']),
+    };
+    render(<NewTracePageSearchBar {...(props as unknown as TracePageSearchBarProps)} />);
+    const nextResButton = screen.queryByRole('button', { name: 'Next result button' });
+    const prevResButton = screen.queryByRole('button', { name: 'Prev result button' });
+    expect(nextResButton).toBeInTheDocument();
+    expect(prevResButton).toBeInTheDocument();
+    expect((nextResButton as HTMLButtonElement)['disabled']).toBe(false);
+    expect((prevResButton as HTMLButtonElement)['disabled']).toBe(false);
+  });
+});
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
new file mode 100644
index 00000000000..e6788659b47
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
@@ -0,0 +1,123 @@
+// Copyright (c) 2018 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { css } from '@emotion/css';
+import React, { memo, Dispatch, SetStateAction, useEffect } from 'react';
+
+import { config, reportInteraction } from '@grafana/runtime';
+import { Button, useStyles2 } from '@grafana/ui';
+
+import { SearchProps } from '../../useSearch';
+
+export type TracePageSearchBarProps = {
+  search: SearchProps;
+  setSearch: React.Dispatch<React.SetStateAction<SearchProps>>;
+  spanFilterMatches: Set<string> | undefined;
+  focusedSpanIdForSearch: string;
+  setFocusedSpanIdForSearch: Dispatch<SetStateAction<string>>;
+  datasourceType: string;
+};
+
+export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProps) {
+  const { search, spanFilterMatches, focusedSpanIdForSearch, setFocusedSpanIdForSearch, datasourceType } = props;
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    setFocusedSpanIdForSearch('');
+  }, [search, setFocusedSpanIdForSearch]);
+
+  const nextResult = () => {
+    reportInteraction('grafana_traces_trace_view_find_next_prev_clicked', {
+      datasourceType: datasourceType,
+      grafana_version: config.buildInfo.version,
+      direction: 'next',
+    });
+
+    const spanMatches = Array.from(spanFilterMatches!);
+    const prevMatchedIndex = spanMatches.indexOf(focusedSpanIdForSearch);
+
+    // new query || at end, go to start
+    if (prevMatchedIndex === -1 || prevMatchedIndex === spanMatches.length - 1) {
+      setFocusedSpanIdForSearch(spanMatches[0]);
+      return;
+    }
+
+    // get next
+    setFocusedSpanIdForSearch(spanMatches[prevMatchedIndex + 1]);
+  };
+
+  const prevResult = () => {
+    reportInteraction('grafana_traces_trace_view_find_next_prev_clicked', {
+      datasourceType: datasourceType,
+      grafana_version: config.buildInfo.version,
+      direction: 'prev',
+    });
+
+    const spanMatches = Array.from(spanFilterMatches!);
+    const prevMatchedIndex = spanMatches.indexOf(focusedSpanIdForSearch);
+
+    // new query || at start, go to end
+    if (prevMatchedIndex === -1 || prevMatchedIndex === 0) {
+      setFocusedSpanIdForSearch(spanMatches[spanMatches.length - 1]);
+      return;
+    }
+
+    // get prev
+    setFocusedSpanIdForSearch(spanMatches[prevMatchedIndex - 1]);
+  };
+
+  const buttonEnabled = spanFilterMatches && spanFilterMatches?.size > 0;
+
+  return (
+    <div className={styles.searchBar}>
+      <>
+        <Button
+          className={styles.button}
+          variant="secondary"
+          disabled={!buttonEnabled}
+          type="button"
+          fill={'outline'}
+          aria-label="Prev result button"
+          onClick={prevResult}
+        >
+          Prev
+        </Button>
+        <Button
+          className={styles.button}
+          variant="secondary"
+          disabled={!buttonEnabled}
+          type="button"
+          fill={'outline'}
+          aria-label="Next result button"
+          onClick={nextResult}
+        >
+          Next
+        </Button>
+      </>
+    </div>
+  );
+});
+
+export const getStyles = () => {
+  return {
+    searchBar: css`
+      display: flex;
+      justify-content: flex-end;
+      margin-top: 5px;
+    `,
+    button: css`
+      margin-left: 8px;
+    `,
+  };
+};
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
new file mode 100644
index 00000000000..12672b5c20a
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
@@ -0,0 +1,179 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React, { useState } from 'react';
+
+import { defaultFilters } from '../../../useSearch';
+import { Trace } from '../../types/trace';
+
+import { SpanFilters } from './SpanFilters';
+
+const trace: Trace = {
+  traceID: '1ed38015486087ca',
+  spans: [
+    {
+      traceID: '1ed38015486087ca',
+      spanID: '1ed38015486087ca',
+      operationName: 'Span0',
+      tags: [{ key: 'TagKey0', type: 'string', value: 'TagValue0' }],
+      process: {
+        serviceName: 'Service0',
+        tags: [{ key: 'ProcessKey0', type: 'string', value: 'ProcessValue0' }],
+      },
+      logs: [{ fields: [{ key: 'LogKey0', type: 'string', value: 'LogValue0' }] }],
+    },
+    {
+      traceID: '1ed38015486087ca',
+      spanID: '2ed38015486087ca',
+      operationName: 'Span1',
+      tags: [{ key: 'TagKey1', type: 'string', value: 'TagValue1' }],
+      process: {
+        serviceName: 'Service1',
+        tags: [{ key: 'ProcessKey1', type: 'string', value: 'ProcessValue1' }],
+      },
+      logs: [{ fields: [{ key: 'LogKey1', type: 'string', value: 'LogValue1' }] }],
+    },
+  ],
+} as unknown as Trace;
+
+describe('SpanFilters', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+  const SpanFiltersWithProps = () => {
+    const [search, setSearch] = useState(defaultFilters);
+    const props = {
+      trace: trace,
+      showSpanFilters: true,
+      setShowSpanFilters: jest.fn(),
+      search: search,
+      setSearch: setSearch,
+      spanFilterMatches: undefined,
+      focusedSpanIdForSearch: '',
+      setFocusedSpanIdForSearch: jest.fn(),
+      datasourceType: 'tempo',
+    };
+
+    return <SpanFilters {...props} />;
+  };
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    // Need to use delay: null here to work with fakeTimers
+    // see https://github.com/testing-library/user-event/issues/833
+    user = userEvent.setup({ delay: null });
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('should render', () => {
+    expect(() => render(<SpanFiltersWithProps />)).not.toThrow();
+  });
+
+  it('should render filters', async () => {
+    render(<SpanFiltersWithProps />);
+
+    const serviceOperator = screen.getByLabelText('Select service name operator');
+    const serviceValue = screen.getByLabelText('Select service name');
+    const spanOperator = screen.getByLabelText('Select span name operator');
+    const spanValue = screen.getByLabelText('Select span name');
+    const fromOperator = screen.getByLabelText('Select from operator');
+    const fromValue = screen.getByLabelText('Select from value');
+    const toOperator = screen.getByLabelText('Select to operator');
+    const toValue = screen.getByLabelText('Select to value');
+    const tagKey = screen.getByLabelText('Select tag key');
+    const tagOperator = screen.getByLabelText('Select tag operator');
+    const tagValue = screen.getByLabelText('Select tag value');
+    const addTag = screen.getByLabelText('Add tag');
+    const removeTag = screen.getByLabelText('Remove tag');
+
+    expect(serviceOperator).toBeInTheDocument();
+    expect(getElemText(serviceOperator)).toBe('=');
+    expect(serviceValue).toBeInTheDocument();
+    expect(spanOperator).toBeInTheDocument();
+    expect(getElemText(spanOperator)).toBe('=');
+    expect(spanValue).toBeInTheDocument();
+    expect(fromOperator).toBeInTheDocument();
+    expect(getElemText(fromOperator)).toBe('>');
+    expect(fromValue).toBeInTheDocument();
+    expect(toOperator).toBeInTheDocument();
+    expect(getElemText(toOperator)).toBe('<');
+    expect(toValue).toBeInTheDocument();
+    expect(tagKey).toBeInTheDocument();
+    expect(tagOperator).toBeInTheDocument();
+    expect(getElemText(tagOperator)).toBe('=');
+    expect(tagValue).toBeInTheDocument();
+    expect(addTag).toBeInTheDocument();
+    expect(removeTag).toBeInTheDocument();
+
+    await user.click(serviceValue);
+    jest.advanceTimersByTime(1000);
+    await waitFor(() => {
+      expect(screen.getByText('Service0')).toBeInTheDocument();
+      expect(screen.getByText('Service1')).toBeInTheDocument();
+    });
+    await user.click(spanValue);
+    jest.advanceTimersByTime(1000);
+    await waitFor(() => {
+      expect(screen.getByText('Span0')).toBeInTheDocument();
+      expect(screen.getByText('Span1')).toBeInTheDocument();
+    });
+    await user.click(tagKey);
+    jest.advanceTimersByTime(1000);
+    await waitFor(() => {
+      expect(screen.getByText('TagKey0')).toBeInTheDocument();
+      expect(screen.getByText('TagKey1')).toBeInTheDocument();
+      expect(screen.getByText('ProcessKey0')).toBeInTheDocument();
+      expect(screen.getByText('ProcessKey1')).toBeInTheDocument();
+      expect(screen.getByText('LogKey0')).toBeInTheDocument();
+      expect(screen.getByText('LogKey1')).toBeInTheDocument();
+    });
+  });
+
+  it('should update filters', async () => {
+    render(<SpanFiltersWithProps />);
+    const serviceValue = screen.getByLabelText('Select service name');
+    const spanValue = screen.getByLabelText('Select span name');
+    const tagKey = screen.getByLabelText('Select tag key');
+    const tagValue = screen.getByLabelText('Select tag value');
+
+    expect(getElemText(serviceValue)).toBe('All service names');
+    await selectAndCheckValue(user, serviceValue, 'Service0');
+    expect(getElemText(spanValue)).toBe('All span names');
+    await selectAndCheckValue(user, spanValue, 'Span0');
+
+    await user.click(tagValue);
+    jest.advanceTimersByTime(1000);
+    await waitFor(() => expect(screen.getByText('No options found')).toBeInTheDocument());
+
+    expect(getElemText(tagKey)).toBe('Select tag');
+    await selectAndCheckValue(user, tagKey, 'TagKey0');
+    expect(getElemText(tagValue)).toBe('Select value');
+    await selectAndCheckValue(user, tagValue, 'TagValue0');
+  });
+
+  it('should allow adding/removing tags', async () => {
+    render(<SpanFiltersWithProps />);
+    expect(screen.getAllByLabelText('Select tag key').length).toBe(1);
+    await user.click(screen.getByLabelText('Add tag'));
+    jest.advanceTimersByTime(1000);
+    expect(screen.getAllByLabelText('Select tag key').length).toBe(2);
+
+    await user.click(screen.getAllByLabelText('Remove tag')[0]);
+    jest.advanceTimersByTime(1000);
+    expect(screen.getAllByLabelText('Select tag key').length).toBe(1);
+  });
+});
+
+const selectAndCheckValue = async (user: ReturnType<typeof userEvent.setup>, elem: HTMLElement, text: string) => {
+  await user.click(elem);
+  jest.advanceTimersByTime(1000);
+  await waitFor(() => expect(screen.getByText(text)).toBeInTheDocument());
+
+  await user.click(screen.getByText(text));
+  jest.advanceTimersByTime(1000);
+  expect(screen.getByText(text)).toBeInTheDocument();
+};
+
+const getElemText = (elem: HTMLElement) => {
+  return elem.parentElement?.previousSibling?.textContent;
+};
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
new file mode 100644
index 00000000000..cf082ed06e1
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
@@ -0,0 +1,407 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { css } from '@emotion/css';
+import { uniq } from 'lodash';
+import React, { useState, memo } from 'react';
+
+import { SelectableValue, toOption } from '@grafana/data';
+import { AccessoryButton } from '@grafana/experimental';
+import {
+  Collapse,
+  HorizontalGroup,
+  Icon,
+  InlineField,
+  InlineFieldRow,
+  Input,
+  Select,
+  Tooltip,
+  useStyles2,
+} from '@grafana/ui';
+
+import { randomId, SearchProps, Tag } from '../../../useSearch';
+import { Trace } from '../../types';
+import NewTracePageSearchBar from '../NewTracePageSearchBar';
+
+export type SpanFilterProps = {
+  trace: Trace;
+  search: SearchProps;
+  setSearch: React.Dispatch<React.SetStateAction<SearchProps>>;
+  showSpanFilters: boolean;
+  setShowSpanFilters: (isOpen: boolean) => void;
+  focusedSpanIdForSearch: string;
+  setFocusedSpanIdForSearch: React.Dispatch<React.SetStateAction<string>>;
+  spanFilterMatches: Set<string> | undefined;
+  datasourceType: string;
+};
+
+export const SpanFilters = memo((props: SpanFilterProps) => {
+  const {
+    trace,
+    search,
+    setSearch,
+    showSpanFilters,
+    setShowSpanFilters,
+    focusedSpanIdForSearch,
+    setFocusedSpanIdForSearch,
+    spanFilterMatches,
+    datasourceType,
+  } = props;
+  const styles = { ...useStyles2(getStyles) };
+  const [serviceNames, setServiceNames] = useState<Array<SelectableValue<string>>>();
+  const [spanNames, setSpanNames] = useState<Array<SelectableValue<string>>>();
+  const [tagKeys, setTagKeys] = useState<Array<SelectableValue<string>>>();
+  const [tagValues, setTagValues] = useState<{ [key: string]: Array<SelectableValue<string>> }>({});
+
+  if (!trace) {
+    return null;
+  }
+
+  const getServiceNames = () => {
+    if (!serviceNames) {
+      const serviceNames = trace.spans.map((span) => {
+        return span.process.serviceName;
+      });
+      setServiceNames(
+        uniq(serviceNames)
+          .sort()
+          .map((name) => {
+            return toOption(name);
+          })
+      );
+    }
+  };
+
+  const getSpanNames = () => {
+    if (!spanNames) {
+      const spanNames = trace.spans.map((span) => {
+        return span.operationName;
+      });
+      setSpanNames(
+        uniq(spanNames)
+          .sort()
+          .map((name) => {
+            return toOption(name);
+          })
+      );
+    }
+  };
+
+  const getTagKeys = () => {
+    if (!tagKeys) {
+      const keys: string[] = [];
+
+      trace.spans.forEach((span) => {
+        span.tags.forEach((tag) => {
+          keys.push(tag.key);
+        });
+        span.process.tags.forEach((tag) => {
+          keys.push(tag.key);
+        });
+        if (span.logs !== null) {
+          span.logs.forEach((log) => {
+            log.fields.forEach((field) => {
+              keys.push(field.key);
+            });
+          });
+        }
+      });
+
+      setTagKeys(
+        uniq(keys)
+          .sort()
+          .map((name) => {
+            return toOption(name);
+          })
+      );
+    }
+  };
+
+  const getTagValues = async (key: string) => {
+    const values: string[] = [];
+
+    trace.spans.forEach((span) => {
+      const tagValue = span.tags.find((t) => t.key === key)?.value;
+      if (tagValue) {
+        values.push(tagValue.toString());
+      }
+      const processTagValue = span.process.tags.find((t) => t.key === key)?.value;
+      if (processTagValue) {
+        values.push(processTagValue.toString());
+      }
+      if (span.logs !== null) {
+        span.logs.forEach((log) => {
+          const logsTagValue = log.fields.find((t) => t.key === key)?.value;
+          if (logsTagValue) {
+            values.push(logsTagValue.toString());
+          }
+        });
+      }
+    });
+
+    return uniq(values)
+      .sort()
+      .map((name) => {
+        return toOption(name);
+      });
+  };
+
+  const onTagChange = (tag: Tag, v: SelectableValue<string>) => {
+    setSearch({
+      ...search,
+      tags: search.tags?.map((x) => {
+        return x.id === tag.id ? { ...x, key: v?.value || '', value: undefined } : x;
+      }),
+    });
+
+    const loadTagValues = async () => {
+      if (v?.value) {
+        setTagValues({
+          ...tagValues,
+          [tag.id]: await getTagValues(v.value),
+        });
+      } else {
+        // removed value
+        const updatedValues = { ...tagValues };
+        if (updatedValues[tag.id]) {
+          delete updatedValues[tag.id];
+        }
+        setTagValues(updatedValues);
+      }
+    };
+    loadTagValues();
+  };
+
+  const addTag = () => {
+    const tag = {
+      id: randomId(),
+      operator: '=',
+    };
+    setSearch({ ...search, tags: [...search.tags, tag] });
+  };
+
+  const removeTag = (id: string) => {
+    let tags = search.tags.filter((tag) => {
+      return tag.id !== id;
+    });
+    if (tags.length === 0) {
+      tags = [
+        {
+          id: randomId(),
+          operator: '=',
+        },
+      ];
+    }
+    setSearch({ ...search, tags: tags });
+  };
+
+  const collapseLabel = (
+    <Tooltip
+      content="Filter your spans below. The more filters, the more specific the filtered spans."
+      placement="right"
+    >
+      <span id="collapse-label">
+        Span Filters
+        <Icon size="sm" name="info-circle" />
+      </span>
+    </Tooltip>
+  );
+
+  return (
+    <div className={styles.container}>
+      <Collapse label={collapseLabel} collapsible={true} isOpen={showSpanFilters} onToggle={setShowSpanFilters}>
+        <InlineFieldRow>
+          <InlineField label="Service Name" labelWidth={16}>
+            <HorizontalGroup spacing={'xs'}>
+              <Select
+                aria-label="Select service name operator"
+                onChange={(v) => setSearch({ ...search, serviceNameOperator: v.value! })}
+                options={[toOption('='), toOption('!=')]}
+                value={search.serviceNameOperator}
+              />
+              <Select
+                aria-label="Select service name"
+                isClearable
+                onChange={(v) => setSearch({ ...search, serviceName: v?.value || '' })}
+                onOpenMenu={getServiceNames}
+                options={serviceNames}
+                placeholder="All service names"
+                value={search.serviceName}
+              />
+            </HorizontalGroup>
+          </InlineField>
+        </InlineFieldRow>
+        <InlineFieldRow>
+          <InlineField label="Span Name" labelWidth={16}>
+            <HorizontalGroup spacing={'xs'}>
+              <Select
+                aria-label="Select span name operator"
+                onChange={(v) => setSearch({ ...search, spanNameOperator: v.value! })}
+                options={[toOption('='), toOption('!=')]}
+                value={search.spanNameOperator}
+              />
+              <Select
+                aria-label="Select span name"
+                isClearable
+                onChange={(v) => setSearch({ ...search, spanName: v?.value || '' })}
+                onOpenMenu={getSpanNames}
+                options={spanNames}
+                placeholder="All span names"
+                value={search.spanName}
+              />
+            </HorizontalGroup>
+          </InlineField>
+        </InlineFieldRow>
+        <InlineFieldRow>
+          <InlineField label="Duration" labelWidth={16}>
+            <HorizontalGroup spacing={'xs'}>
+              <Select
+                aria-label="Select from operator"
+                onChange={(v) => setSearch({ ...search, fromOperator: v.value! })}
+                options={[toOption('>'), toOption('>=')]}
+                value={search.fromOperator}
+              />
+              <Input
+                aria-label="Select from value"
+                onChange={(v) => setSearch({ ...search, from: v.currentTarget.value })}
+                placeholder="e.g. 100ms, 1.2s"
+                value={search.from || ''}
+                width={18}
+              />
+              <Select
+                aria-label="Select to operator"
+                onChange={(v) => setSearch({ ...search, toOperator: v.value! })}
+                options={[toOption('<'), toOption('<=')]}
+                value={search.toOperator}
+              />
+              <Input
+                aria-label="Select to value"
+                onChange={(v) => setSearch({ ...search, to: v.currentTarget.value })}
+                placeholder="e.g. 100ms, 1.2s"
+                value={search.to || ''}
+                width={18}
+              />
+            </HorizontalGroup>
+          </InlineField>
+        </InlineFieldRow>
+        <InlineFieldRow>
+          <InlineField label="Tags" labelWidth={16} tooltip="Filter by tags, process tags or log fields in your spans.">
+            <div>
+              {search.tags.map((tag, i) => (
+                <div key={i}>
+                  <HorizontalGroup spacing={'xs'} width={'auto'}>
+                    <Select
+                      aria-label={`Select tag key`}
+                      isClearable
+                      key={tag.key}
+                      onChange={(v) => onTagChange(tag, v)}
+                      onOpenMenu={getTagKeys}
+                      options={tagKeys}
+                      placeholder="Select tag"
+                      value={tag.key}
+                    />
+                    <Select
+                      aria-label={`Select tag operator`}
+                      onChange={(v) => {
+                        setSearch({
+                          ...search,
+                          tags: search.tags?.map((x) => {
+                            return x.id === tag.id ? { ...x, operator: v.value! } : x;
+                          }),
+                        });
+                      }}
+                      options={[toOption('='), toOption('!=')]}
+                      value={tag.operator}
+                    />
+                    <span className={styles.tagValues}>
+                      <Select
+                        aria-label={`Select tag value`}
+                        isClearable
+                        key={tag.value}
+                        onChange={(v) => {
+                          setSearch({
+                            ...search,
+                            tags: search.tags?.map((x) => {
+                              return x.id === tag.id ? { ...x, value: v?.value || '' } : x;
+                            }),
+                          });
+                        }}
+                        options={tagValues[tag.id] ? tagValues[tag.id] : []}
+                        placeholder="Select value"
+                        value={tag.value}
+                      />
+                    </span>
+                    <AccessoryButton
+                      aria-label={`Remove tag`}
+                      variant={'secondary'}
+                      icon={'times'}
+                      onClick={() => removeTag(tag.id)}
+                      title={'Remove tag'}
+                    />
+                    <span className={styles.addTag}>
+                      {search?.tags?.length && i === search.tags.length - 1 && (
+                        <AccessoryButton
+                          aria-label="Add tag"
+                          variant={'secondary'}
+                          icon={'plus'}
+                          onClick={addTag}
+                          title={'Add tag'}
+                        />
+                      )}
+                    </span>
+                  </HorizontalGroup>
+                </div>
+              ))}
+            </div>
+          </InlineField>
+        </InlineFieldRow>
+
+        <NewTracePageSearchBar
+          search={search}
+          setSearch={setSearch}
+          spanFilterMatches={spanFilterMatches}
+          focusedSpanIdForSearch={focusedSpanIdForSearch}
+          setFocusedSpanIdForSearch={setFocusedSpanIdForSearch}
+          datasourceType={datasourceType}
+        />
+      </Collapse>
+    </div>
+  );
+});
+
+SpanFilters.displayName = 'SpanFilters';
+
+const getStyles = () => {
+  return {
+    container: css`
+      margin: 0.5em 0 -8px 0;
+      z-index: 5;
+
+      & > div {
+        border-left: none;
+        border-right: none;
+      }
+
+      #collapse-label svg {
+        margin: -1px 0 0 10px;
+      }
+    `,
+    addTag: css`
+      margin: 0 0 0 10px;
+    `,
+    tagValues: css`
+      max-width: 200px;
+    `,
+  };
+};
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx
index 70664101d09..c1f153bb76e 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx
@@ -17,7 +17,7 @@ import React from 'react';
 
 import { getTraceName } from '../model/trace-viewer';
 
-import TracePageHeader, { TracePageHeaderEmbedProps } from './TracePageHeader';
+import TracePageHeader, { TracePageHeaderProps } from './TracePageHeader';
 
 export const trace = {
   services: [{ name: 'serviceA', numberOfSpans: 1 }],
@@ -93,7 +93,7 @@ export const trace = {
   endTime: 1675605058644515,
 };
 
-const setup = (propOverrides?: TracePageHeaderEmbedProps) => {
+const setup = (propOverrides?: TracePageHeaderProps) => {
   const defaultProps = {
     trace,
     timeZone: '',
@@ -113,7 +113,7 @@ describe('TracePageHeader test', () => {
   });
 
   it('should render nothing if a trace is not present', () => {
-    setup({ trace: null } as TracePageHeaderEmbedProps);
+    setup({ trace: null } as TracePageHeaderProps);
     expect(screen.queryByRole('banner')).not.toBeInTheDocument();
     expect(screen.queryAllByRole('listitem')).toHaveLength(0);
     expect(screen.queryByText(/Reset Selection/)).not.toBeInTheDocument();
@@ -155,7 +155,7 @@ describe('TracePageHeader test', () => {
         {...({
           trace: trace,
           viewRange: { time: { current: [10, 20] } },
-        } as unknown as TracePageHeaderEmbedProps)}
+        } as unknown as TracePageHeaderProps)}
       />
     );
     expect(screen.queryAllByRole('listitem')).toHaveLength(5);
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx
index cbeb41d1670..a6fe453a08e 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx
@@ -15,7 +15,7 @@
 import { css } from '@emotion/css';
 import cx from 'classnames';
 import { get as _get, maxBy as _maxBy, values as _values } from 'lodash';
-import * as React from 'react';
+import React from 'react';
 
 import { dateTimeFormat, GrafanaTheme2, TimeZone } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
@@ -106,7 +106,7 @@ export const getStyles = (theme: GrafanaTheme2) => {
   };
 };
 
-export type TracePageHeaderEmbedProps = {
+export type TracePageHeaderProps = {
   trace: Trace | null;
   updateNextViewRangeTime: (update: ViewRangeTimeUpdate) => void;
   updateViewRangeTime: TUpdateViewRangeTimeFunction;
@@ -156,7 +156,7 @@ export const HEADER_ITEMS = [
   },
 ];
 
-export default function TracePageHeader(props: TracePageHeaderEmbedProps) {
+export default function TracePageHeader(props: TracePageHeaderProps) {
   const { trace, updateNextViewRangeTime, updateViewRangeTime, viewRange, timeZone } = props;
 
   const styles = useStyles2(getStyles);
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar.test.tsx
index f79f8734233..e56b03f0b93 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar.test.tsx
@@ -28,7 +28,7 @@ const defaultProps = {
 
 describe('<TracePageSearchBar>', () => {
   describe('truthy textFilter', () => {
-    it('renders UiFindInput with correct props', () => {
+    it('renders SearchBarInput with correct props', () => {
       render(<TracePageSearchBar {...(defaultProps as unknown as TracePageSearchBarProps)} />);
       expect((screen.getByPlaceholderText('Find...') as HTMLInputElement)['value']).toEqual('value');
       const suffix = screen.getByLabelText('Search bar suffix');
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar.tsx
index 4a488b6bee0..2c6838f9c21 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar.tsx
@@ -20,7 +20,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
 import { Button, useStyles2 } from '@grafana/ui';
 
-import UiFindInput from '../common/UiFindInput';
+import SearchBarInput from '../common/SearchBarInput';
 import { ubFlexAuto, ubJustifyEnd } from '../uberUtilityStyles';
 
 // eslint-disable-next-line no-duplicate-imports
@@ -102,7 +102,7 @@ export default memo(function TracePageSearchBar(props: TracePageSearchBarProps)
   ) : null;
 
   const btnClass = cx(styles.TracePageSearchBarBtn, { [styles.TracePageSearchBarBtnDisabled]: !searchValue });
-  const uiFindInputInputProps = {
+  const SearchBarInputProps = {
     className: cx(styles.TracePageSearchBarBar, ubFlexAuto),
     name: 'search',
     suffix,
@@ -172,10 +172,10 @@ export default memo(function TracePageSearchBar(props: TracePageSearchBarProps)
   return (
     <div className={styles.TracePageSearchBar}>
       <span className={ubJustifyEnd} style={{ display: 'flex' }}>
-        <UiFindInput
+        <SearchBarInput
           onChange={setTraceSearch}
           value={searchValue}
-          inputProps={uiFindInputInputProps}
+          inputProps={SearchBarInputProps}
           allowClear={true}
         />
         <>
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
index 64e0b2f4842..6eebc812134 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
@@ -258,7 +258,7 @@ export default class ListView extends React.Component<TListViewProps> {
   getRowPosition = (index: number): { height: number; y: number } =>
     this._yPositions.getRowPosition(index, this._getHeight);
 
-  scrollToIndex = (index: number) => {
+  scrollToIndex = (index: number, headerHeight: number) => {
     // calculate the position of the list view relative to the scroll parent
     const { scrollElement } = this.props;
     const scrollElementTop = scrollElement?.getBoundingClientRect().top || 0;
@@ -269,7 +269,7 @@ export default class ListView extends React.Component<TListViewProps> {
 
     // hard code a small offset to leave a little bit of space above the focused span, so it is visually clear
     // that there is content above
-    this.props.scrollElement?.scrollTo({ top: itemOffset + listViewOffset - 80 });
+    this.props.scrollElement?.scrollTo({ top: itemOffset + listViewOffset - headerHeight - 80 });
   };
 
   /**
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
index 994bc9270e0..583850d4a0b 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
@@ -117,6 +117,7 @@ type TVirtualizedTraceViewOwnProps = {
   topOfViewRef?: RefObject<HTMLDivElement>;
   topOfViewRefType?: TopOfViewRefType;
   datasourceType: string;
+  headerHeight: number;
 };
 
 export type VirtualizedTraceViewProps = TVirtualizedTraceViewOwnProps & TExtractUiFindFromStateReturn & TTraceTimeline;
@@ -204,7 +205,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
   }
 
   componentDidMount() {
-    this.scrollToSpan(this.props.focusedSpanId);
+    this.scrollToSpan(this.props.headerHeight, this.props.focusedSpanId);
   }
 
   shouldComponentUpdate(nextProps: VirtualizedTraceViewProps) {
@@ -226,7 +227,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
   }
 
   componentDidUpdate(prevProps: Readonly<VirtualizedTraceViewProps>) {
-    const { registerAccessors, trace } = prevProps;
+    const { registerAccessors, trace, headerHeight } = prevProps;
     const {
       shouldScrollToFirstUiFindMatch,
       clearShouldScrollToFirstUiFindMatch,
@@ -253,11 +254,11 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
     }
 
     if (focusedSpanId !== prevProps.focusedSpanId) {
-      this.scrollToSpan(focusedSpanId);
+      this.scrollToSpan(headerHeight, focusedSpanId);
     }
 
     if (focusedSpanIdForSearch !== prevProps.focusedSpanIdForSearch) {
-      this.scrollToSpan(focusedSpanIdForSearch);
+      this.scrollToSpan(headerHeight, focusedSpanIdForSearch);
     }
   }
 
@@ -368,13 +369,13 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
       : this.renderSpanBarRow(span, spanIndex, key, style, attrs);
   };
 
-  scrollToSpan = (spanID?: string) => {
+  scrollToSpan = (headerHeight: number, spanID?: string) => {
     if (spanID == null) {
       return;
     }
     const i = this.getRowStates().findIndex((row) => row.span.spanID === spanID);
     if (i >= 0) {
-      this.listView?.scrollToIndex(i);
+      this.listView?.scrollToIndex(i, headerHeight);
     }
   };
 
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
index 778755ba4a0..ca8c8b69f0d 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
@@ -113,6 +113,7 @@ export type TProps = TExtractUiFindFromStateReturn & {
   createFocusSpanLink: (traceId: string, spanId: string) => LinkModel;
   topOfViewRef?: RefObject<HTMLDivElement>;
   topOfViewRefType?: TopOfViewRefType;
+  headerHeight: number;
 };
 
 type State = {
diff --git a/public/app/features/explore/TraceView/components/common/UiFindInput.test.tsx b/public/app/features/explore/TraceView/components/common/SearchBarInput.test.tsx
similarity index 61%
rename from public/app/features/explore/TraceView/components/common/UiFindInput.test.tsx
rename to public/app/features/explore/TraceView/components/common/SearchBarInput.test.tsx
index a2836a147ce..e8cb4206e67 100644
--- a/public/app/features/explore/TraceView/components/common/UiFindInput.test.tsx
+++ b/public/app/features/explore/TraceView/components/common/SearchBarInput.test.tsx
@@ -15,22 +15,22 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import UiFindInput from './UiFindInput';
+import SearchBarInput from './SearchBarInput';
 
-describe('UiFindInput', () => {
+describe('SearchBarInput', () => {
   describe('rendering', () => {
     it('renders as expected with no value', () => {
-      render(<UiFindInput />);
-      const uiFindInput = screen.queryByPlaceholderText('Find...');
-      expect(uiFindInput).toBeInTheDocument();
-      expect(uiFindInput?.getAttribute('value')).toEqual('');
+      render(<SearchBarInput />);
+      const searchBarInput = screen.queryByPlaceholderText('Find...');
+      expect(searchBarInput).toBeInTheDocument();
+      expect(searchBarInput?.getAttribute('value')).toEqual('');
     });
 
     it('renders as expected with value', () => {
-      render(<UiFindInput value="value" />);
-      const uiFindInput = screen.queryByPlaceholderText('Find...');
-      expect(uiFindInput).toBeInTheDocument();
-      expect(uiFindInput?.getAttribute('value')).toEqual('value');
+      render(<SearchBarInput value="value" />);
+      const searchBarInput = screen.queryByPlaceholderText('Find...');
+      expect(searchBarInput).toBeInTheDocument();
+      expect(searchBarInput?.getAttribute('value')).toEqual('value');
     });
   });
 });
diff --git a/public/app/features/explore/TraceView/components/common/UiFindInput.tsx b/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
similarity index 95%
rename from public/app/features/explore/TraceView/components/common/UiFindInput.tsx
rename to public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
index c98db541ae4..81bb386cac8 100644
--- a/public/app/features/explore/TraceView/components/common/UiFindInput.tsx
+++ b/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
@@ -27,7 +27,7 @@ type Props = {
   onChange: (value: string) => void;
 };
 
-export default class UiFindInput extends React.PureComponent<Props> {
+export default class SearchBarInput extends React.PureComponent<Props> {
   static defaultProps: Partial<Props> = {
     inputProps: {},
     trackFindFunction: undefined,
diff --git a/public/app/features/explore/TraceView/components/index.ts b/public/app/features/explore/TraceView/components/index.ts
index e2ea228bac6..334855a9ebc 100644
--- a/public/app/features/explore/TraceView/components/index.ts
+++ b/public/app/features/explore/TraceView/components/index.ts
@@ -6,5 +6,5 @@ export * from './types';
 export * from './TraceTimelineViewer/types';
 export { default as DetailState } from './TraceTimelineViewer/SpanDetail/DetailState';
 export { default as transformTraceData } from './model/transform-trace-data';
-export { default as filterSpans } from './utils/filter-spans';
+export { filterSpansNewTraceView, filterSpans } from './utils/filter-spans';
 export * from './Theme';
diff --git a/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts b/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
index 9123cd2106a..65fe9d37d88 100644
--- a/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
+++ b/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { defaultFilters, defaultTagFilter } from '../../useSearch';
 import { TraceSpan } from '../types';
 
-import filterSpans from './filter-spans';
+import { filterSpans, filterSpansNewTraceView } from './filter-spans';
 
 describe('filterSpans', () => {
   // span0 contains strings that end in 0 or 1
@@ -22,6 +23,7 @@ describe('filterSpans', () => {
   const span0 = {
     spanID: spanID0,
     operationName: 'operationName0',
+    duration: 3050,
     process: {
       serviceName: 'serviceName0',
       tags: [
@@ -66,6 +68,7 @@ describe('filterSpans', () => {
   const span2 = {
     spanID: spanID2,
     operationName: 'operationName2',
+    duration: 5000,
     process: {
       serviceName: 'serviceName2',
       tags: [
@@ -106,6 +109,371 @@ describe('filterSpans', () => {
   };
   const spans = [span0, span2] as TraceSpan[];
 
+  it('should return `undefined` if spans is falsy', () => {
+    expect(filterSpansNewTraceView({ ...defaultFilters, spanName: 'operationName' }, null)).toBe(undefined);
+  });
+
+  // Service / span name
+  it('should return spans whose serviceName match a filter', () => {
+    expect(filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName0' }, spans)).toEqual(
+      new Set([spanID0])
+    );
+    expect(filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName2' }, spans)).toEqual(
+      new Set([spanID2])
+    );
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName2', serviceNameOperator: '!=' }, spans)
+    ).toEqual(new Set([spanID0]));
+  });
+
+  it('should return spans whose operationName match a filter', () => {
+    expect(filterSpansNewTraceView({ ...defaultFilters, spanName: 'operationName0' }, spans)).toEqual(
+      new Set([spanID0])
+    );
+    expect(filterSpansNewTraceView({ ...defaultFilters, spanName: 'operationName2' }, spans)).toEqual(
+      new Set([spanID2])
+    );
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, spanName: 'operationName2', spanNameOperator: '!=' }, spans)
+    ).toEqual(new Set([spanID0]));
+  });
+
+  // Durations
+  it('should return spans whose duration match a filter', () => {
+    expect(filterSpansNewTraceView({ ...defaultFilters, from: '2ms' }, spans)).toEqual(new Set([spanID0, spanID2]));
+    expect(filterSpansNewTraceView({ ...defaultFilters, from: '3.05ms' }, spans)).toEqual(new Set([spanID2]));
+    expect(filterSpansNewTraceView({ ...defaultFilters, from: '3.05ms', fromOperator: '>=' }, spans)).toEqual(
+      new Set([spanID0, spanID2])
+    );
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, from: '3.05ms', fromOperator: '>=', to: '4ms' }, spans)
+    ).toEqual(new Set([spanID0]));
+    expect(filterSpansNewTraceView({ ...defaultFilters, to: '4ms' }, spans)).toEqual(new Set([spanID0]));
+    expect(filterSpansNewTraceView({ ...defaultFilters, to: '5ms', toOperator: '<=' }, spans)).toEqual(
+      new Set([spanID0, spanID2])
+    );
+  });
+
+  // Tags
+  it('should return spans whose tags kv.key match a filter', () => {
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1' }] }, spans)
+    ).toEqual(new Set([spanID0, spanID2]));
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey0' }] }, spans)
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey2' }] }, spans)
+    ).toEqual(new Set([spanID2]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey2', operator: '!=' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+  });
+
+  it('should return spans whose process.tags kv.key match a filter', () => {
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey1' }] }, spans)
+    ).toEqual(new Set([spanID0, spanID2]));
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey0' }] }, spans)
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey2' }] }, spans)
+    ).toEqual(new Set([spanID2]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey2', operator: '!=' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+  });
+
+  it('should return spans whose logs have a field whose kv.key match a filter', () => {
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey1' }] }, spans)
+    ).toEqual(new Set([spanID0, spanID2]));
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey0' }] }, spans)
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey2' }] }, spans)
+    ).toEqual(new Set([spanID2]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey2', operator: '!=' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+  });
+
+  it('should return no spans when logs is null', () => {
+    const nullSpan = { ...span0, logs: null };
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey1' }] }, [
+        nullSpan,
+      ] as unknown as TraceSpan[])
+    ).toEqual(new Set([]));
+  });
+
+  it("should return spans whose tags' kv.key and kv.value match a filter", () => {
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1', operator: '!=' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID2]));
+  });
+
+  it("should not return spans whose tags' kv.key match a filter but kv.value/operator does not match", () => {
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1', operator: '!=' }] },
+        spans
+      )
+    ).toEqual(new Set());
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey2', operator: '!=' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1', operator: '!=' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID2]));
+  });
+
+  it('should return spans with multiple tag filters', () => {
+    // tags in same span
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey1' },
+            { ...defaultTagFilter, key: 'tagKey0' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1' },
+            { ...defaultTagFilter, key: 'tagKey0' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1' },
+            { ...defaultTagFilter, key: 'tagKey0', value: 'tagValue0' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+
+    // tags in different spans
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey0' },
+            { ...defaultTagFilter, key: 'tagKey2' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set());
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey0', value: '' },
+            { ...defaultTagFilter, key: 'tagKey2' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set());
+
+    // values in different spans
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey0', value: 'tagValue0' },
+            { ...defaultTagFilter, key: 'tagKey2' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set());
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey0', value: 'tagValue0' },
+            { ...defaultTagFilter, key: 'tagKey2', value: 'tagValue2' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set());
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1' },
+            { ...defaultTagFilter, key: 'tagKey1', value: 'tagValue2' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set());
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          tags: [
+            { ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1' },
+            { ...defaultTagFilter, key: 'tagKey2', value: 'tagValue2' },
+          ],
+        },
+        spans
+      )
+    ).toEqual(new Set());
+  });
+
+  // Multiple
+  it('should return spans with multiple filters', () => {
+    // service name + span name
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName0' }, spans)
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName2' }, spans)
+    ).toEqual(new Set([]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName2', spanNameOperator: '!=' },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+
+    // service name + span name + duration
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName0', from: '2ms' },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName0', to: '2ms' },
+        spans
+      )
+    ).toEqual(new Set([]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, serviceName: 'serviceName2', spanName: 'operationName2', to: '6ms' },
+        spans
+      )
+    ).toEqual(new Set([spanID2]));
+
+    // service name + tag key
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, serviceName: 'serviceName0', tags: [{ ...defaultTagFilter, key: 'tagKey0' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, serviceName: 'serviceName0', tags: [{ ...defaultTagFilter, key: 'tagKey1' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, serviceName: 'serviceName2', tags: [{ ...defaultTagFilter, key: 'tagKey1' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID2]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, serviceName: 'serviceName2', tags: [{ ...defaultTagFilter, key: 'tagKey2' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID2]));
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          serviceName: 'serviceName0',
+          tags: [{ ...defaultTagFilter, key: 'tagKey1', operator: '!=' }],
+        },
+        spans
+      )
+    ).toEqual(new Set());
+
+    // duration + tag
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, from: '2ms', tags: [{ ...defaultTagFilter, key: 'tagKey0' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+    expect(
+      filterSpansNewTraceView(
+        { ...defaultFilters, to: '5ms', toOperator: '<=', tags: [{ ...defaultTagFilter, key: 'tagKey2' }] },
+        spans
+      )
+    ).toEqual(new Set([spanID2]));
+
+    // all
+    expect(
+      filterSpansNewTraceView(
+        {
+          ...defaultFilters,
+          serviceName: 'serviceName0',
+          spanName: 'operationName2',
+          spanNameOperator: '!=',
+          from: '3.05ms',
+          fromOperator: '>=',
+          to: '3.5ms',
+          tags: [{ ...defaultTagFilter, key: 'tagKey2', operator: '!=' }],
+        },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+  });
+
   it('should return `undefined` if spans is falsy', () => {
     expect(filterSpans('operationName', null)).toBe(undefined);
   });
diff --git a/public/app/features/explore/TraceView/components/utils/filter-spans.tsx b/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
index 4f93a6b42c1..a9e5c5be92c 100644
--- a/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
+++ b/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
@@ -12,9 +12,147 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { SearchProps, Tag } from '../../useSearch';
 import { TNil, TraceKeyValuePair, TraceSpan } from '../types';
 
-export default function filterSpans(textFilter: string, spans: TraceSpan[] | TNil) {
+// filter spans where all filters added need to be true for each individual span that is returned
+// i.e. the more filters added -> the more specific that the returned results are
+export function filterSpansNewTraceView(searchProps: SearchProps, spans: TraceSpan[] | TNil) {
+  if (!spans) {
+    return undefined;
+  }
+
+  let filteredSpans = false;
+  if (searchProps.serviceName) {
+    spans = getServiceNameMatches(spans, searchProps);
+    filteredSpans = true;
+  }
+  if (searchProps.spanName) {
+    spans = getSpanNameMatches(spans, searchProps);
+    filteredSpans = true;
+  }
+  if (searchProps.from || searchProps.to) {
+    spans = getDurationMatches(spans, searchProps);
+    filteredSpans = true;
+  }
+  const tagMatches = getTagMatches(spans, searchProps.tags);
+  if (tagMatches) {
+    spans = tagMatches;
+    filteredSpans = true;
+  }
+
+  return filteredSpans ? new Set(spans.map((span: TraceSpan) => span.spanID)) : undefined;
+}
+
+const getTagMatches = (spans: TraceSpan[], tags: Tag[]) => {
+  // remove empty/default tags
+  tags = tags.filter((tag) => {
+    // tag.key === '' when it is cleared via pressing x icon in select field
+    return (tag.key && tag.key !== '') || tag.value;
+  });
+
+  if (tags.length > 0) {
+    return spans.filter((span: TraceSpan) => {
+      // match against every tag filter
+      return tags.every((tag: Tag) => {
+        if (tag.key && tag.value) {
+          if (span.tags.some((kv) => checkKeyAndValueForMatch(tag, kv))) {
+            return getReturnValue(tag.operator, true);
+          } else if (span.process.tags.some((kv) => checkKeyAndValueForMatch(tag, kv))) {
+            return getReturnValue(tag.operator, true);
+          } else if (span.logs.some((log) => log.fields.some((kv) => checkKeyAndValueForMatch(tag, kv)))) {
+            return getReturnValue(tag.operator, true);
+          }
+        } else if (tag.key) {
+          if (span.tags.some((kv) => checkKeyForMatch(tag.key!, kv.key))) {
+            return getReturnValue(tag.operator, true);
+          } else if (span.process.tags.some((kv) => checkKeyForMatch(tag.key!, kv.key))) {
+            return getReturnValue(tag.operator, true);
+          } else if (
+            span.logs &&
+            span.logs.some((log) => log.fields.some((kv) => checkKeyForMatch(tag.key!, kv.key)))
+          ) {
+            return getReturnValue(tag.operator, true);
+          }
+        }
+        return getReturnValue(tag.operator, false);
+      });
+    });
+  }
+  return undefined;
+};
+
+const checkKeyForMatch = (tagKey: string, key: string) => {
+  return tagKey === key.toString() ? true : false;
+};
+
+const checkKeyAndValueForMatch = (tag: Tag, kv: TraceKeyValuePair) => {
+  return tag.key === kv.key.toString() && tag.value === kv.value.toString() ? true : false;
+};
+
+const getReturnValue = (operator: string, found: boolean) => {
+  return operator === '=' ? found : !found;
+};
+
+const getServiceNameMatches = (spans: TraceSpan[], searchProps: SearchProps) => {
+  return spans.filter((span: TraceSpan) => {
+    return searchProps.serviceNameOperator === '='
+      ? span.process.serviceName === searchProps.serviceName
+      : span.process.serviceName !== searchProps.serviceName;
+  });
+};
+
+const getSpanNameMatches = (spans: TraceSpan[], searchProps: SearchProps) => {
+  return spans.filter((span: TraceSpan) => {
+    return searchProps.spanNameOperator === '='
+      ? span.operationName === searchProps.spanName
+      : span.operationName !== searchProps.spanName;
+  });
+};
+
+const getDurationMatches = (spans: TraceSpan[], searchProps: SearchProps) => {
+  const from = convertTimeFilter(searchProps?.from || '');
+  const to = convertTimeFilter(searchProps?.to || '');
+  let filteredSpans: TraceSpan[] = [];
+
+  if (from) {
+    filteredSpans = spans.filter((span: TraceSpan) => {
+      return searchProps.fromOperator === '>' ? span.duration > from : span.duration >= from;
+    });
+  }
+  if (to) {
+    const filterForDuration = (span: TraceSpan) =>
+      searchProps.toOperator === '<' ? span.duration < to : span.duration <= to;
+    filteredSpans =
+      filteredSpans.length > 0
+        ? filteredSpans.filter((span: TraceSpan) => {
+            return filterForDuration(span);
+          })
+        : spans.filter((span: TraceSpan) => {
+            return filterForDuration(span);
+          });
+  }
+
+  return filteredSpans;
+};
+
+export const convertTimeFilter = (time: string) => {
+  if (time.includes('μs')) {
+    return parseFloat(time.split('μs')[0]);
+  } else if (time.includes('ms')) {
+    return parseFloat(time.split('ms')[0]) * 1000;
+  } else if (time.includes('s')) {
+    return parseFloat(time.split('s')[0]) * 1000 * 1000;
+  } else if (time.includes('m')) {
+    return parseFloat(time.split('m')[0]) * 1000 * 1000 * 60;
+  } else if (time.includes('h')) {
+    return parseFloat(time.split('h')[0]) * 1000 * 1000 * 60 * 60;
+  }
+  return undefined;
+};
+
+// legacy code that will be removed when the newTraceView feature flag is removed
+export function filterSpans(textFilter: string, spans: TraceSpan[] | TNil) {
   if (!spans) {
     return undefined;
   }
diff --git a/public/app/features/explore/TraceView/useSearch.test.ts b/public/app/features/explore/TraceView/useSearch.test.ts
index ffe7314f38a..e144f8fa733 100644
--- a/public/app/features/explore/TraceView/useSearch.test.ts
+++ b/public/app/features/explore/TraceView/useSearch.test.ts
@@ -1,36 +1,47 @@
 import { act, renderHook } from '@testing-library/react';
 
 import { TraceSpan } from './components';
-import { useSearch } from './useSearch';
+import { defaultFilters, useSearch, useSearchNewTraceView } from './useSearch';
 
 describe('useSearch', () => {
+  const spans = [
+    {
+      spanID: 'span1',
+      operationName: 'operation1',
+      process: {
+        serviceName: 'service1',
+        tags: [],
+      },
+      tags: [],
+      logs: [],
+    } as unknown as TraceSpan,
+    {
+      spanID: 'span2',
+      operationName: 'operation2',
+      process: {
+        serviceName: 'service2',
+        tags: [],
+      },
+      tags: [],
+      logs: [],
+    } as unknown as TraceSpan,
+  ];
+
   it('returns matching span IDs', async () => {
-    const { result } = renderHook(() =>
-      useSearch([
-        {
-          spanID: 'span1',
-          operationName: 'operation1',
-          process: {
-            serviceName: 'service1',
-            tags: [],
-          },
-          tags: [],
-          logs: [],
-        } as unknown as TraceSpan,
+    const { result } = renderHook(() => useSearchNewTraceView(spans));
+    act(() => result.current.setNewTraceViewSearch({ ...defaultFilters, serviceName: 'service1' }));
+    expect(result.current.spanFilterMatches?.size).toBe(1);
+    expect(result.current.spanFilterMatches?.has('span1')).toBe(true);
+  });
 
-        {
-          spanID: 'span2',
-          operationName: 'operation2',
-          process: {
-            serviceName: 'service2',
-            tags: [],
-          },
-          tags: [],
-          logs: [],
-        } as unknown as TraceSpan,
-      ])
-    );
+  it('works without spans', async () => {
+    const { result } = renderHook(() => useSearchNewTraceView());
+    act(() => result.current.setNewTraceViewSearch({ ...defaultFilters, serviceName: 'service1' }));
+    expect(result.current.spanFilterMatches).toBe(undefined);
+  });
 
+  it('returns matching span IDs', async () => {
+    const { result } = renderHook(() => useSearch(spans));
     act(() => result.current.setSearch('service1'));
     expect(result.current.spanFindMatches?.size).toBe(1);
     expect(result.current.spanFindMatches?.has('span1')).toBe(true);
@@ -38,7 +49,6 @@ describe('useSearch', () => {
 
   it('works without spans', async () => {
     const { result } = renderHook(() => useSearch());
-
     act(() => result.current.setSearch('service1'));
     expect(result.current.spanFindMatches).toBe(undefined);
   });
diff --git a/public/app/features/explore/TraceView/useSearch.ts b/public/app/features/explore/TraceView/useSearch.ts
index 38550370c17..2339f8a246a 100644
--- a/public/app/features/explore/TraceView/useSearch.ts
+++ b/public/app/features/explore/TraceView/useSearch.ts
@@ -1,11 +1,56 @@
 import { useMemo, useState } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
-import { filterSpans, TraceSpan } from './components';
+import { filterSpansNewTraceView, filterSpans, TraceSpan } from './components';
+
+export interface SearchProps {
+  serviceName?: string;
+  serviceNameOperator: string;
+  spanName?: string;
+  spanNameOperator: string;
+  from?: string;
+  fromOperator: string;
+  to?: string;
+  toOperator: string;
+  tags: Tag[];
+}
+
+export interface Tag {
+  id: string;
+  key?: string;
+  operator: string;
+  value?: string;
+}
+
+export const randomId = () => uuidv4().slice(0, 12);
+
+export const defaultTagFilter = {
+  id: randomId(),
+  operator: '=',
+};
+
+export const defaultFilters = {
+  spanNameOperator: '=',
+  serviceNameOperator: '=',
+  fromOperator: '>',
+  toOperator: '<',
+  tags: [defaultTagFilter],
+};
 
 /**
  * Controls the state of search input that highlights spans if they match the search string.
  * @param spans
  */
+export function useSearchNewTraceView(spans?: TraceSpan[]) {
+  const [newTraceViewSearch, setNewTraceViewSearch] = useState<SearchProps>(defaultFilters);
+  const spanFilterMatches: Set<string> | undefined = useMemo(() => {
+    return spans && filterSpansNewTraceView(newTraceViewSearch, spans);
+  }, [newTraceViewSearch, spans]);
+
+  return { newTraceViewSearch, setNewTraceViewSearch, spanFilterMatches };
+}
+
+// legacy code that will be removed when the newTraceView feature flag is removed
 export function useSearch(spans?: TraceSpan[]) {
   const [search, setSearch] = useState('');
   const spanFindMatches: Set<string> | undefined = useMemo(() => {
diff --git a/public/app/plugins/panel/traces/TracesPanel.tsx b/public/app/plugins/panel/traces/TracesPanel.tsx
index 0805da62948..46ec26476d9 100644
--- a/public/app/plugins/panel/traces/TracesPanel.tsx
+++ b/public/app/plugins/panel/traces/TracesPanel.tsx
@@ -26,7 +26,6 @@ export const TracesPanel = ({ data }: PanelProps) => {
   const dataSource = useAsync(async () => {
     return await getDataSourceSrv().get(data.request?.targets[0].datasource?.uid);
   });
-  const scrollElement = document.getElementsByClassName(styles.wrapper)[0];
   const datasourceType = dataSource && dataSource.value ? dataSource.value.type : 'unknown';
 
   if (!data || !data.series.length || !traceProp) {
@@ -56,7 +55,7 @@ export const TracesPanel = ({ data }: PanelProps) => {
 
       <TraceView
         dataFrames={data.series}
-        scrollElement={scrollElement}
+        scrollElementClass={styles.wrapper}
         traceProp={traceProp}
         spanFindMatches={spanFindMatches}
         search={search}

From 075070db3e3de6ff6ce7edf30fa2d4f8acfa62fc Mon Sep 17 00:00:00 2001
From: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:02:29 +0200
Subject: [PATCH 165/729] Alerting: Update legacy alerting warning (#66269)

* Update legacy alerting warning

* Apply suggestions from code review

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Update DeprecationNotice.tsx

* silly linter

* Clarify alerting deprecation

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
---
 .../alerting/components/DeprecationNotice.tsx  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/public/app/features/alerting/components/DeprecationNotice.tsx b/public/app/features/alerting/components/DeprecationNotice.tsx
index 6db39c68785..bc3db37c7d8 100644
--- a/public/app/features/alerting/components/DeprecationNotice.tsx
+++ b/public/app/features/alerting/components/DeprecationNotice.tsx
@@ -5,23 +5,19 @@ import { Alert } from '@grafana/ui';
 export const LOCAL_STORAGE_KEY = 'grafana.legacyalerting.unifiedalertingpromo';
 
 const DeprecationNotice = () => (
-  <Alert severity="warning" title="Grafana legacy alerting is going away soon">
+  <Alert severity="warning" title="Grafana legacy alerting is deprecated and will be removed in a future release.">
     <p>
-      You are using Grafana legacy alerting, it has been deprecated and will be removed in the next major version of
-      Grafana.
+      You are using Grafana legacy alerting, which has been deprecated since Grafana 9.0. The codebase is now staying as
+      is and will be removed in Grafana 11.0.
       <br />
-      We encourage you to upgrade to the new Grafana Alerting experience.
+      We recommend upgrading to Grafana Alerting as soon as possible.
     </p>
     <p>
       See{' '}
-      <a href="https://grafana.com/docs/grafana/latest/alerting/unified-alerting/difference-old-new/">
-        What’s New with Grafana Alerting
+      <a href="https://grafana.com/docs/grafana/latest/alerting/migrating-alerts/">
+        how to upgrade to Grafana Alerting
       </a>{' '}
-      to learn more about what&lsquo;s new or learn{' '}
-      <a href="https://grafana.com/docs/grafana/latest/alerting/unified-alerting/opt-in/">
-        how to enable the new Grafana Alerting feature
-      </a>
-      .
+      to learn more.
     </p>
   </Alert>
 );

From 2509dec0cbd7b433359cd0d4d01d6ba354ca1d37 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:27:38 +0200
Subject: [PATCH 166/729] Loki: Fix ad hoc filters when used with number and >
 and < operators (#66579)

Loki: Fix ad hoc filters when used with number and >< operators
---
 .../app/plugins/datasource/loki/modifyQuery.test.ts |  2 ++
 public/app/plugins/datasource/loki/modifyQuery.ts   | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/loki/modifyQuery.test.ts b/public/app/plugins/datasource/loki/modifyQuery.test.ts
index 8b76c465263..608fc610992 100644
--- a/public/app/plugins/datasource/loki/modifyQuery.test.ts
+++ b/public/app/plugins/datasource/loki/modifyQuery.test.ts
@@ -52,6 +52,8 @@ describe('addLabelToQuery()', () => {
     ${'{foo="bar"} | logfmt'}                                                                                                         | ${'query with parser with an other escaped value'}                             | ${'bar'} | ${'='}   | ${'baz\\\\'}   | ${'{foo="bar"} | logfmt | bar=`baz\\`'}
     ${'{foo="bar"} | logfmt'}                                                                                                         | ${'query with parser with escaped value and regex operator'}                   | ${'bar'} | ${'~='}  | ${'\\"baz\\"'} | ${'{foo="bar"} | logfmt | bar~=`"baz"`'}
     ${'{foo="bar"} | logfmt'}                                                                                                         | ${'query with parser with escaped value and regex operator'}                   | ${'bar'} | ${'~='}  | ${'\\"baz\\"'} | ${'{foo="bar"} | logfmt | bar~=`"baz"`'}
+    ${'{foo="bar"} | logfmt'}                                                                                                         | ${'query with parser, > operator and number value'}                            | ${'bar'} | ${'>'}   | ${'5'}         | ${'{foo="bar"} | logfmt | bar>5'}
+    ${'{foo="bar"} | logfmt'}                                                                                                         | ${'query with parser, < operator and non-number value'}                        | ${'bar'} | ${'<'}   | ${'5KiB'}      | ${'{foo="bar"} | logfmt | bar<`5KiB`'}
   `(
     'should add label to query:  $query, description: $description',
     ({ query, description, label, operator, value, expectedResult }) => {
diff --git a/public/app/plugins/datasource/loki/modifyQuery.ts b/public/app/plugins/datasource/loki/modifyQuery.ts
index 85c46d8d9b6..8f8ee3a880c 100644
--- a/public/app/plugins/datasource/loki/modifyQuery.ts
+++ b/public/app/plugins/datasource/loki/modifyQuery.ts
@@ -327,9 +327,16 @@ export function addFilterAsLabelFilter(
     const start = query.substring(prev, match.to);
     const end = isLast ? query.substring(match.to) : '';
 
-    // we now unescape all escaped values again, because we are using backticks which can handle those cases.
-    // we also don't care about the operator here, because we need to unescape for both, regex and equal.
-    const labelFilter = ` | ${filter.label}${filter.op}\`${unescapeLabelValue(filter.value)}\``;
+    let labelFilter = '';
+    // For < and >, if the value is number, we don't add quotes around it and use it as number
+    if (!Number.isNaN(Number(filter.value)) && (filter.op === '<' || filter.op === '>')) {
+      labelFilter = ` | ${filter.label}${filter.op}${Number(filter.value)}`;
+    } else {
+      // we now unescape all escaped values again, because we are using backticks which can handle those cases.
+      // we also don't care about the operator here, because we need to unescape for both, regex and equal.
+      labelFilter = ` | ${filter.label}${filter.op}\`${unescapeLabelValue(filter.value)}\``;
+    }
+
     newQuery += start + labelFilter + end;
     prev = match.to;
   }

From 92d92187d9b02b55837bcc9f8e1cec71d1571b5b Mon Sep 17 00:00:00 2001
From: Kyle Cunningham <codeincarnate@users.noreply.github.com>
Date: Mon, 17 Apr 2023 15:44:05 +0700
Subject: [PATCH 167/729] SQL Datasources: Update Max Connection and Max Idle
 Connection Defaults to 100 and add auto mode (#65834)

* Update connection configuration for SQL datasources

* Working auto state for connection numbers

* Add migration

* Use defaults from constants file

* Remove dead code

* Add tests and restructure useMigrateDatabaseField

* Update function names

* Update docs

* Make sure we don't continually issue updates

* Update docs

* Use onOptionsChnage in ConnectionLimits

* Update docs

* Clean up docs

* Update migration

* Fix default values in docs

* Fix spacing issue

* Fix test

* Update default values for SQL connections

* Include consts

* Allow override for default SQL datasource connection parameters

* Fix linter errors

* Remove extra @ts-ignore

* Centralize logic for default values

* Remove debugging

* Remove unecessary function

* Update configuration docs

* minor suggested change

* Fix comment misspelling

* Remove unecessary default setting code

* Update docs to indicate that code was included for backport version

* Remove dead code

---------

Co-authored-by: lwandz13 <larissa.wandzura@grafana.com>
---
 conf/defaults.ini                             |  15 ++
 docs/sources/datasources/mssql/_index.md      |  32 +++--
 docs/sources/datasources/mysql/_index.md      |  42 +++---
 docs/sources/datasources/postgres/_index.md   |  39 +++---
 .../setup-grafana/configure-grafana/_index.md |  18 ++-
 pkg/setting/setting.go                        |  13 ++
 pkg/tsdb/mssql/mssql.go                       |   6 +-
 pkg/tsdb/mysql/mysql.go                       |   6 +-
 pkg/tsdb/postgres/postgres.go                 |   6 +-
 pkg/tsdb/sqleng/sql_engine.go                 |   7 +
 .../core/components/OptionsUI/NumberInput.tsx |   4 +
 .../configuration/ConnectionLimits.tsx        | 132 ++++++++++++++----
 .../configuration/useMigrateDatabaseField.ts  |  25 ----
 .../useMigrateDatabaseFields.test.ts          |  71 ++++++++++
 .../configuration/useMigrateDatabaseFields.ts |  63 +++++++++
 public/app/features/plugins/sql/constants.ts  |   8 ++
 public/app/features/plugins/sql/types.ts      |   1 +
 .../configuration/ConfigurationEditor.tsx     |  12 +-
 .../configuration/ConfigurationEditor.tsx     |  12 +-
 .../configuration/ConfigurationEditor.tsx     |  12 +-
 20 files changed, 378 insertions(+), 146 deletions(-)
 delete mode 100644 public/app/features/plugins/sql/components/configuration/useMigrateDatabaseField.ts
 create mode 100644 public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts
 create mode 100644 public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 1a727c18fb6..c298b25f728 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -413,6 +413,21 @@ default_home_dashboard_path =
 # Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
 datasource_limit = 5000
 
+
+################################### SQL Data Sources #####################
+[sql_datasources]
+# Default maximum number of open connections maintained in the connection pool 
+# when connecting to SQL based data sources
+max_open_conns_default = 100
+
+# Default maximum number of idle connections maintained in the connection pool
+# when connecting to SQL based data sources
+max_idle_conns_default = 100
+
+# Default maximum connection lifetime used when connecting
+# to SQL based data sources. 
+max_conn_lifetime_default = 14400
+
 #################################### Users ###############################
 [users]
 # disable user signup / registration
diff --git a/docs/sources/datasources/mssql/_index.md b/docs/sources/datasources/mssql/_index.md
index 35af22224d0..c93c255cafc 100644
--- a/docs/sources/datasources/mssql/_index.md
+++ b/docs/sources/datasources/mssql/_index.md
@@ -41,19 +41,20 @@ To configure basic settings for the data source, complete the following steps:
 
 1. Set the data source's basic configuration options:
 
-   | Name               | Description                                                                                                                                                                                                                                     |
-   | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-   | **Name**           | Sets the name you use to refer to the data source in panels and queries.                                                                                                                                                                        |
-   | **Default**        | Sets the data source that's pre-selected for new panels.                                                                                                                                                                                        |
-   | **Host**           | Sets the IP address/hostname and optional port of your MS SQL instance. Default port is 0, the driver default. You can specify multiple connection properties, such as `ApplicationIntent`, by separating each property with a semicolon (`;`). |
-   | **Database**       | Sets the name of your MS SQL database.                                                                                                                                                                                                          |
-   | **Authentication** | Sets the authentication mode, either using SQL Server Authentication or Windows Authentication (single sign-on for Windows users).                                                                                                              |
-   | **User**           | Defines the database user's username.                                                                                                                                                                                                           |
-   | **Password**       | Defines the database user's password.                                                                                                                                                                                                           |
-   | **Encrypt**        | Determines whether to negotiate a secure SSL TCP/IP connection with the server, or to which extent. Default is `false`.                                                                                                                         |
-   | **Max open**       | Sets the maximum number of open connections to the database. Default is `unlimited`.                                                                                                                                                            |
-   | **Max idle**       | Sets the maximum number of connections in the idle connection pool. Default is `2`.                                                                                                                                                             |
-   | **Max lifetime**   | Sets the maximum number of seconds that the data source can reuse a connection. Default is `14400` (4 hours).                                                                                                                                   |
+| Name                | Description                                                                                                                                                                                                                                     |
+| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Name**            | Sets the name you use to refer to the data source in panels and queries.                                                                                                                                                                        |
+| **Default**         | Sets the data source that's pre-selected for new panels.                                                                                                                                                                                        |
+| **Host**            | Sets the IP address/hostname and optional port of your MS SQL instance. Default port is 0, the driver default. You can specify multiple connection properties, such as `ApplicationIntent`, by separating each property with a semicolon (`;`). |
+| **Database**        | Sets the name of your MS SQL database.                                                                                                                                                                                                          |
+| **Authentication**  | Sets the authentication mode, either using SQL Server Authentication or Windows Authentication (single sign-on for Windows users).                                                                                                              |
+| **User**            | Defines the database user's username.                                                                                                                                                                                                           |
+| **Password**        | Defines the database user's password.                                                                                                                                                                                                           |
+| **Encrypt**         | Determines whether to negotiate a secure SSL TCP/IP connection with the server, or to which extent. Default is `false`.                                                                                                                         |
+| **Max open**        | Sets the maximum number of open connections to the database. Default is `100`.                                                                                                                                                                  |
+| **Max idle**        | Sets the maximum number of connections in the idle connection pool. Default is `100`.                                                                                                                                                           |
+| **Auto (max idle)** | If set will set the maximum number of idle connections to the number of maximum open connections (Grafana v9.5.1+). Default is `true`.                                                                                                          |
+| **Max lifetime**    | Sets the maximum number of seconds that the data source can reuse a connection. Default is `14400` (4 hours).                                                                                                                                   |
 
 You can also configure settings specific to the Microsoft SQL Server data source. These options are described in the sections below.
 
@@ -122,8 +123,9 @@ datasources:
     user: grafana
     jsonData:
       database: grafana
-      maxOpenConns: 0 # Grafana v5.4+
-      maxIdleConns: 2 # Grafana v5.4+
+      maxOpenConns: 100 # Grafana v5.4+
+      maxIdleConns: 100 # Grafana v5.4+
+      maxIdleConnsAuto: true # Grafana v9.5.1+
       connMaxLifetime: 14400 # Grafana v5.4+
       connectionTimeout: 0 # Grafana v9.3+
     secureJsonData:
diff --git a/docs/sources/datasources/mysql/_index.md b/docs/sources/datasources/mysql/_index.md
index d86dcf60976..33ad8a30578 100644
--- a/docs/sources/datasources/mysql/_index.md
+++ b/docs/sources/datasources/mysql/_index.md
@@ -35,20 +35,19 @@ Administrators can also [configure the data source via YAML]({{< relref "#provis
 
 1. Set the data source's basic configuration options.
 
-### Data source options
-
-| Name               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `Name`             | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                                                                                                                                                                                                                                                   |
-| `Default`          | Default data source means that it will be pre-selected for new panels.                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `Host`             | The IP address/hostname and optional port of your MySQL instance.                                                                                                                                                                                                                                                                                                                                                                                                       |
-| `Database`         | Name of your MySQL database.                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `User`             | Database user's login/username                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `Password`         | Database user's password                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `Session Timezone` | Specify the time zone used in the database session, such as `Europe/Berlin` or `+02:00`. This is necessary, if the timezone of the database (or the host of the database) is set to something other than UTC. Set the value used in the session with `SET time_zone='...'`. If you leave this field empty, then the time zone is not updated. For more information, refer to the [MySQL documentation](https://dev.mysql.com/doc/refman/8.0/en/time-zone-support.html). |
-| `Max open`         | The maximum number of open connections to the database, default `unlimited` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                                                                            |
-| `Max idle`         | The maximum number of connections in the idle connection pool, default `2` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                                                                             |
-| `Max lifetime`     | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours. This should always be lower than configured [wait_timeout](https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_wait_timeout) in MySQL (Grafana v5.4+).                                                                                                                                                                                               |
+| Name                 | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Name**             | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                                                                                                                                                                                                                                                   |
+| **Default**          | Default data source means that it will be pre-selected for new panels.                                                                                                                                                                                                                                                                                                                                                                                                  |
+| **Host**             | The IP address/hostname and optional port of your MySQL instance.                                                                                                                                                                                                                                                                                                                                                                                                       |
+| **Database**         | Name of your MySQL database.                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| **User**             | Database user's login/username                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| **Password**         | Database user's password                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| **Session Timezone** | Specify the time zone used in the database session, such as `Europe/Berlin` or `+02:00`. This is necessary, if the timezone of the database (or the host of the database) is set to something other than UTC. Set the value used in the session with `SET time_zone='...'`. If you leave this field empty, then the time zone is not updated. For more information, refer to the [MySQL documentation](https://dev.mysql.com/doc/refman/8.0/en/time-zone-support.html). |
+| **Max open**         | The maximum number of open connections to the database, default `100` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                                                                                  |
+| **Max idle**         | The maximum number of connections in the idle connection pool, default `100` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                                                                           |
+| **Auto (max idle)**  | If set will set the maximum number of idle connections to the number of maximum open connections (Grafana v9.5.1+). Default is `true`.                                                                                                                                                                                                                                                                                                                                  |
+| **Max lifetime**     | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours. This should always be lower than configured [wait_timeout](https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_wait_timeout) in MySQL (Grafana v5.4+).                                                                                                                                                                                               |
 
 ### Min time interval
 
@@ -107,8 +106,9 @@ datasources:
     user: grafana
     jsonData:
       database: grafana
-      maxOpenConns: 0 # Grafana v5.4+
-      maxIdleConns: 2 # Grafana v5.4+
+      maxOpenConns: 100 # Grafana v5.4+
+      maxIdleConns: 100 # Grafana v5.4+
+      maxIdleConnsAuto: true # Grafana v9.5.1+
       connMaxLifetime: 14400 # Grafana v5.4+
     secureJsonData:
       password: ${GRAFANA_MYSQL_PASSWORD}
@@ -127,8 +127,9 @@ datasources:
     jsonData:
       tlsAuth: true
       database: grafana
-      maxOpenConns: 0 # Grafana v5.4+
-      maxIdleConns: 2 # Grafana v5.4+
+      maxOpenConns: 100 # Grafana v5.4+
+      maxIdleConns: 100 # Grafana v5.4+
+      maxIdleConnsAuto: true # Grafana v9.5.1+
       connMaxLifetime: 14400 # Grafana v5.4+
     secureJsonData:
       password: ${GRAFANA_MYSQL_PASSWORD}
@@ -150,8 +151,9 @@ datasources:
       tlsAuth: true
       skipTLSVerify: true
       database: grafana
-      maxOpenConns: 0 # Grafana v5.4+
-      maxIdleConns: 2 # Grafana v5.4+
+      maxOpenConns: 100 # Grafana v5.4+
+      maxIdleConns: 100 # Grafana v5.4+
+      maxIdleConnsAuto: true # Grafana v9.5.1+
       connMaxLifetime: 14400 # Grafana v5.4+
     secureJsonData:
       password: ${GRAFANA_MYSQL_PASSWORD}
diff --git a/docs/sources/datasources/postgres/_index.md b/docs/sources/datasources/postgres/_index.md
index f2a90da7fde..82db22b8908 100644
--- a/docs/sources/datasources/postgres/_index.md
+++ b/docs/sources/datasources/postgres/_index.md
@@ -33,23 +33,23 @@ To configure basic settings for the data source, complete the following steps:
 
 1.  Set the data source's basic configuration options:
 
-        | Name                        | Description                                                                                                                                                                                                                                                                                                                                                                                                             |
-
-    | --------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-    | **Name** | The data source name. This is how you refer to the data source in panels and queries. |
-    | **Default** | Default data source means that it will be pre-selected for new panels. |
-    | **Host** | The IP address/hostname and optional port of your PostgreSQL instance. _Do not_ include the database name. The connection string for connecting to Postgres will not be correct and it may cause errors. |
-    | **Database** | Name of your PostgreSQL database. |
-    | **User** | Database user's login/username |
-    | **Password** | Database user's password |
-    | **SSL Mode** | Determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server. When SSL Mode is disabled, SSL Method and Auth Details would not be visible. |
-    | **SSL Auth Details Method** | Determines whether the SSL Auth details will be configured as a file path or file content. Grafana v7.5+ |
-    | **SSL Auth Details Value** | File path or file content of SSL root certificate, client certificate and client key |
-    | **Max open** | The maximum number of open connections to the database, default `unlimited` (Grafana v5.4+). |
-    | **Max idle** | The maximum number of connections in the idle connection pool, default `2` (Grafana v5.4+). |
-    | **Max lifetime** | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours (Grafana v5.4+). |
-    | **Version** | Determines which functions are available in the query builder (only available in Grafana 5.3+). |
-    | **TimescaleDB** | A time-series database built as a PostgreSQL extension. When enabled, Grafana uses `time_bucket` in the `$__timeGroup` macro to display TimescaleDB specific aggregate functions in the query builder (only available in Grafana 5.3+). For more information, see [TimescaleDB documentation](https://docs.timescale.com/timescaledb/latest/tutorials/grafana/grafana-timescalecloud/#connect-timescaledb-and-grafana). |
+| Name                        | Description                                                                                                                                                                                                                                                                                                                                                                                                             |
+| --------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Name**                    | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                                                                                                                                                                                                   |
+| **Default**                 | Default data source means that it will be pre-selected for new panels.                                                                                                                                                                                                                                                                                                                                                  |
+| **Host**                    | The IP address/hostname and optional port of your PostgreSQL instance. _Do not_ include the database name. The connection string for connecting to Postgres will not be correct and it may cause errors.                                                                                                                                                                                                                |
+| **Database**                | Name of your PostgreSQL database.                                                                                                                                                                                                                                                                                                                                                                                       |
+| **User**                    | Database user's login/username                                                                                                                                                                                                                                                                                                                                                                                          |
+| **Password**                | Database user's password                                                                                                                                                                                                                                                                                                                                                                                                |
+| **SSL Mode**                | Determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server. When SSL Mode is disabled, SSL Method and Auth Details would not be visible.                                                                                                                                                                                                                                |
+| **SSL Auth Details Method** | Determines whether the SSL Auth details will be configured as a file path or file content. Grafana v7.5+                                                                                                                                                                                                                                                                                                                |
+| **SSL Auth Details Value**  | File path or file content of SSL root certificate, client certificate and client key                                                                                                                                                                                                                                                                                                                                    |
+| **Max open**                | The maximum number of open connections to the database, default `100` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                                  |
+| **Max idle**                | The maximum number of connections in the idle connection pool, default `100` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                           |
+| **Auto (max idle)**         | If set will set the maximum number of idle connections to the number of maximum open connections (Grafana v9.5.1+). Default is `true`.                                                                                                                                                                                                                                                                                  |
+| **Max lifetime**            | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours (Grafana v5.4+).                                                                                                                                                                                                                                                                                                              |
+| **Version**                 | Determines which functions are available in the query builder (only available in Grafana 5.3+).                                                                                                                                                                                                                                                                                                                         |
+| **TimescaleDB**             | A time-series database built as a PostgreSQL extension. When enabled, Grafana uses `time_bucket` in the `$__timeGroup` macro to display TimescaleDB specific aggregate functions in the query builder (only available in Grafana 5.3+). For more information, see [TimescaleDB documentation](https://docs.timescale.com/timescaledb/latest/tutorials/grafana/grafana-timescalecloud/#connect-timescaledb-and-grafana). |
 
 ### Min time interval
 
@@ -141,8 +141,9 @@ datasources:
     jsonData:
       database: grafana
       sslmode: 'disable' # disable/require/verify-ca/verify-full
-      maxOpenConns: 0 # Grafana v5.4+
-      maxIdleConns: 2 # Grafana v5.4+
+      maxOpenConns: 100 # Grafana v5.4+
+      maxIdleConns: 100 # Grafana v5.4+
+      maxIdleConnsAuto: true # Grafana v9.5.1+
       connMaxLifetime: 14400 # Grafana v5.4+
       postgresVersion: 903 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10
       timescaledb: false
diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md
index 3f61ed8b758..1d1e3f96fe1 100644
--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -75,7 +75,7 @@ rendering_ignore_https_errors = true
 enable = newNavigation
 ```
 
-You can override them on Linux machines with:
+You can override variables on Linux machines with:
 
 ```bash
 export GF_DEFAULT_INSTANCE_NAME=my-instance
@@ -730,6 +730,22 @@ Path to the default home dashboard. If this value is empty, then Grafana uses St
 
 <hr />
 
+## [sql_datasources]
+
+### max_open_conns_default
+
+For SQL data sources (MySql, Postgres, MSSQL) you can override the default maximum number of open connections (default: 100). The value configured in data source settings will be preferred over the default value.
+
+### max_idle_conns_default
+
+For SQL data sources (MySql, Postgres, MSSQL) you can override the default allowed number of idle connections (default: 100). The value configured in data source settings will be preferred over the default value.
+
+### max_conn_lifetime_default
+
+For SQL data sources (MySql, Postgres, MSSQL) you can override the default maximum connection lifetime specified in seconds (default: 14400). The value configured in data source settings will be preferred over the default value.
+
+<hr/>
+
 ## [users]
 
 ### allow_sign_up
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index bbf734ecce8..06732a6d056 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -369,6 +369,11 @@ type Cfg struct {
 	// Data sources
 	DataSourceLimit int
 
+	// SQL Data sources
+	SqlDatasourceMaxOpenConnsDefault    int
+	SqlDatasourceMaxIdleConnsDefault    int
+	SqlDatasourceMaxConnLifetimeDefault int
+
 	// Snapshots
 	SnapshotEnabled       bool
 	ExternalSnapshotUrl   string
@@ -1116,6 +1121,7 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	}
 
 	cfg.readDataSourcesSettings()
+	cfg.readSqlDataSourceSettings()
 
 	cfg.Storage = readStorageSettings(iniFile)
 	cfg.Search = readSearchSettings(iniFile)
@@ -1848,6 +1854,13 @@ func (cfg *Cfg) readDataSourcesSettings() {
 	cfg.DataSourceLimit = datasources.Key("datasource_limit").MustInt(5000)
 }
 
+func (cfg *Cfg) readSqlDataSourceSettings() {
+	sqlDatasources := cfg.Raw.Section("sql_datasources")
+	cfg.SqlDatasourceMaxOpenConnsDefault = sqlDatasources.Key("max_open_conns_default").MustInt(100)
+	cfg.SqlDatasourceMaxIdleConnsDefault = sqlDatasources.Key("max_idle_conns_default").MustInt(100)
+	cfg.SqlDatasourceMaxConnLifetimeDefault = sqlDatasources.Key("max_conn_lifetime_default").MustInt(14400)
+}
+
 func GetAllowedOriginGlobs(originPatterns []string) ([]glob.Glob, error) {
 	allowedOrigins := originPatterns
 	originGlobs := make([]glob.Glob, 0, len(allowedOrigins))
diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go
index 086bd33c47c..616bb37da56 100644
--- a/pkg/tsdb/mssql/mssql.go
+++ b/pkg/tsdb/mssql/mssql.go
@@ -56,9 +56,9 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
 	return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		jsonData := sqleng.JsonData{
-			MaxOpenConns:      0,
-			MaxIdleConns:      2,
-			ConnMaxLifetime:   14400,
+			MaxOpenConns:      cfg.SqlDatasourceMaxOpenConnsDefault,
+			MaxIdleConns:      cfg.SqlDatasourceMaxIdleConnsDefault,
+			ConnMaxLifetime:   cfg.SqlDatasourceMaxConnLifetimeDefault,
 			Encrypt:           "false",
 			ConnectionTimeout: 0,
 			SecureDSProxy:     false,
diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go
index 502a7163f54..eca156dd57b 100644
--- a/pkg/tsdb/mysql/mysql.go
+++ b/pkg/tsdb/mysql/mysql.go
@@ -52,9 +52,9 @@ func ProvideService(cfg *setting.Cfg, httpClientProvider httpclient.Provider) *S
 func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
 	return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		jsonData := sqleng.JsonData{
-			MaxOpenConns:    0,
-			MaxIdleConns:    2,
-			ConnMaxLifetime: 14400,
+			MaxOpenConns:    cfg.SqlDatasourceMaxOpenConnsDefault,
+			MaxIdleConns:    cfg.SqlDatasourceMaxIdleConnsDefault,
+			ConnMaxLifetime: cfg.SqlDatasourceMaxConnLifetimeDefault,
 			SecureDSProxy:   false,
 		}
 
diff --git a/pkg/tsdb/postgres/postgres.go b/pkg/tsdb/postgres/postgres.go
index 6a931b6cbb3..f3684591ff2 100644
--- a/pkg/tsdb/postgres/postgres.go
+++ b/pkg/tsdb/postgres/postgres.go
@@ -56,9 +56,9 @@ func (s *Service) newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFacto
 	return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		logger.Debug("Creating Postgres query endpoint")
 		jsonData := sqleng.JsonData{
-			MaxOpenConns:        0,
-			MaxIdleConns:        2,
-			ConnMaxLifetime:     14400,
+			MaxOpenConns:        cfg.SqlDatasourceMaxOpenConnsDefault,
+			MaxIdleConns:        cfg.SqlDatasourceMaxIdleConnsDefault,
+			ConnMaxLifetime:     cfg.SqlDatasourceMaxConnLifetimeDefault,
 			Timescaledb:         false,
 			ConfigurationMethod: "file-path",
 			SecureDSProxy:       false,
diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/sqleng/sql_engine.go
index 8e53d77dd8e..aeb93d411d1 100644
--- a/pkg/tsdb/sqleng/sql_engine.go
+++ b/pkg/tsdb/sqleng/sql_engine.go
@@ -84,6 +84,13 @@ type DataSourceInfo struct {
 	DecryptedSecureJSONData map[string]string
 }
 
+// Defaults for the xorm connection pool
+type DefaultConnectionInfo struct {
+	MaxOpenConns    int
+	MaxIdleConns    int
+	ConnMaxLifetime int
+}
+
 type DataPluginConfiguration struct {
 	DriverName        string
 	DSInfo            DataSourceInfo
diff --git a/public/app/core/components/OptionsUI/NumberInput.tsx b/public/app/core/components/OptionsUI/NumberInput.tsx
index c507b421f48..159a0d550d3 100644
--- a/public/app/core/components/OptionsUI/NumberInput.tsx
+++ b/public/app/core/components/OptionsUI/NumberInput.tsx
@@ -11,6 +11,8 @@ interface Props {
   min?: number;
   max?: number;
   step?: number;
+  width?: number;
+  fieldDisabled?: boolean;
 }
 
 interface State {
@@ -107,6 +109,8 @@ export class NumberInput extends PureComponent<Props, State> {
         onBlur={this.updateValue}
         onKeyPress={this.onKeyPress}
         placeholder={this.props.placeholder}
+        disabled={this.props.fieldDisabled}
+        width={this.props.width}
       />
     );
   }
diff --git a/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx b/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
index 602365c9954..ed7d4cbd0d8 100644
--- a/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
+++ b/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
@@ -1,27 +1,86 @@
 import React from 'react';
 
-import { FieldSet, InlineField } from '@grafana/ui';
+import { DataSourceSettings } from '@grafana/data';
+import { FieldSet, InlineField, InlineFieldRow, InlineSwitch } from '@grafana/ui';
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 
-import { SQLConnectionLimits } from '../../types';
+import { SQLConnectionDefaults } from '../../constants';
+import { SQLConnectionLimits, SQLOptions } from '../../types';
 
 interface Props<T> {
-  onPropertyChanged: (property: keyof T, value?: number) => void;
+  onOptionsChange: Function;
+  options: DataSourceSettings<SQLOptions>;
   labelWidth: number;
-  jsonData: SQLConnectionLimits;
 }
 
 export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>) => {
-  const { onPropertyChanged, labelWidth, jsonData } = props;
+  const { onOptionsChange, options, labelWidth } = props;
+  const jsonData = options.jsonData;
+  const autoIdle = jsonData.maxIdleConnsAuto !== undefined ? jsonData.maxIdleConnsAuto : false;
 
+  // Update JSON data with new values
+  const updateJsonData = (values: {}) => {
+    const newOpts = {
+      ...options,
+      jsonData: {
+        ...jsonData,
+        ...values,
+      },
+    };
+
+    return onOptionsChange(newOpts);
+  };
+
+  // For the case of idle connections and connection lifetime
+  // use a shared function to update respective properties
   const onJSONDataNumberChanged = (property: keyof SQLConnectionLimits) => {
     return (number?: number) => {
-      if (onPropertyChanged) {
-        onPropertyChanged(property, number);
-      }
+      updateJsonData({ property: number });
     };
   };
 
+  // When the maximum number of connections is changed
+  // see if we have the automatic idle option enabled
+  const onMaxConnectionsChanged = (number?: number) => {
+    if (autoIdle && number) {
+      updateJsonData({
+        maxOpenConns: number,
+        maxIdleConns: number,
+      });
+    } else if (number !== undefined) {
+      updateJsonData({
+        maxOpenConns: number,
+      });
+    }
+  };
+
+  // Update auto idle setting when control is toggled
+  // and set minimum idle connections if automatic
+  // is selected
+  const onConnectionIdleAutoChanged = () => {
+    let idleConns = undefined;
+    let maxConns = undefined;
+
+    // If the maximum number of open connections is undefined
+    // and we're setting auto idle then set the default amount
+    // otherwise take the numeric amount and get the value from that
+    if (!autoIdle) {
+      if (jsonData.maxOpenConns !== undefined) {
+        maxConns = jsonData.maxOpenConns;
+        idleConns = jsonData.maxOpenConns;
+      } else {
+        maxConns = SQLConnectionDefaults.MAX_CONNS;
+        idleConns = SQLConnectionDefaults.MAX_CONNS;
+      }
+    }
+
+    updateJsonData({
+      maxIdleConnsAuto: !autoIdle,
+      maxIdleConns: idleConns,
+      maxOpenConns: maxConns,
+    });
+  };
+
   return (
     <FieldSet label="Connection limits">
       <InlineField
@@ -36,29 +95,42 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
         labelWidth={labelWidth}
         label="Max open"
       >
-        <NumberInput
-          placeholder="unlimited"
-          value={jsonData.maxOpenConns}
-          onChange={onJSONDataNumberChanged('maxOpenConns')}
-        ></NumberInput>
-      </InlineField>
-      <InlineField
-        tooltip={
-          <span>
-            The maximum number of connections in the idle connection pool.If <i>Max open connections</i> is greater than
-            0 but less than the <i>Max idle connections</i>, then the <i>Max idle connections</i> will be reduced to
-            match the <i>Max open connections</i> limit. If set to 0, no idle connections are retained.
-          </span>
-        }
-        labelWidth={labelWidth}
-        label="Max idle"
-      >
-        <NumberInput
-          placeholder="2"
-          value={jsonData.maxIdleConns}
-          onChange={onJSONDataNumberChanged('maxIdleConns')}
-        ></NumberInput>
+        <NumberInput placeholder="unlimited" value={jsonData.maxOpenConns} onChange={onMaxConnectionsChanged} />
       </InlineField>
+      <InlineFieldRow>
+        <InlineField
+          tooltip={
+            <span>
+              The maximum number of connections in the idle connection pool.If <i>Max open connections</i> is greater
+              than 0 but less than the <i>Max idle connections</i>, then the <i>Max idle connections</i> will be reduced
+              to match the <i>Max open connections</i> limit. If set to 0, no idle connections are retained.
+            </span>
+          }
+          labelWidth={labelWidth}
+          label="Max idle"
+        >
+          <NumberInput
+            placeholder="2"
+            value={jsonData.maxIdleConns}
+            onChange={onJSONDataNumberChanged('maxIdleConns')}
+            width={8}
+            fieldDisabled={autoIdle}
+          />
+        </InlineField>
+        <InlineField
+          label="Auto"
+          labelWidth={8}
+          tooltip={
+            <span>
+              If enabled, automatically set the number of <i>Maximum idle connections</i> to the same value as
+              <i> Max open connections</i>. If the number of maximum open connections is not set it will be set to the
+              default ({SQLConnectionDefaults.MAX_CONNS}).
+            </span>
+          }
+        >
+          <InlineSwitch value={autoIdle} onChange={onConnectionIdleAutoChanged} />
+        </InlineField>
+      </InlineFieldRow>
       <InlineField
         tooltip="The maximum amount of time in seconds a connection may be reused. If set to 0, connections are reused forever."
         labelWidth={labelWidth}
diff --git a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseField.ts b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseField.ts
deleted file mode 100644
index d43ebaddbb1..00000000000
--- a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseField.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useEffect } from 'react';
-
-import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { logDebug } from '@grafana/runtime';
-
-import { SQLOptions } from '../../types';
-
-/**
- * Moves the database field from the options object to jsonData.database and empties the database field.
- */
-export function useMigrateDatabaseField<T extends DataSourceJsonData = SQLOptions, S = {}>({
-  onOptionsChange,
-  options,
-}: DataSourcePluginOptionsEditorProps<T, S>) {
-  useEffect(() => {
-    if (options.database) {
-      logDebug(`Migrating from options.database with value ${options.database} for ${options.name}`);
-      onOptionsChange({
-        ...options,
-        database: '',
-        jsonData: { ...options.jsonData, database: options.database },
-      });
-    }
-  }, [onOptionsChange, options]);
-}
diff --git a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts
new file mode 100644
index 00000000000..a687b85c304
--- /dev/null
+++ b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts
@@ -0,0 +1,71 @@
+import { renderHook } from '@testing-library/react-hooks';
+
+import { DataSourceSettings } from '@grafana/data';
+
+import { SQLConnectionDefaults } from '../../constants';
+import { SQLOptions } from '../../types';
+
+import { useMigrateDatabaseFields } from './useMigrateDatabaseFields';
+
+describe('Database Field Migration', () => {
+  let defaultProps = {
+    options: {
+      database: 'testDatabase',
+      id: 1,
+      uid: 'unique-id',
+      orgId: 1,
+      name: 'Datasource Name',
+      type: 'postgres',
+      typeName: 'Postgres',
+      typeLogoUrl: 'http://example.com/logo.png',
+      access: 'access',
+      url: 'http://example.com',
+      user: 'user',
+      basicAuth: true,
+      basicAuthUser: 'user',
+      isDefault: false,
+      secureJsonFields: {},
+      readOnly: false,
+      withCredentials: false,
+      jsonData: {
+        tlsAuth: false,
+        tlsAuthWithCACert: false,
+        timezone: 'America/Chicago',
+        tlsSkipVerify: false,
+        user: 'user',
+      },
+    },
+  };
+  it('should migrate the old database field to be included in jsonData', () => {
+    const props = {
+      ...defaultProps,
+      onOptionsChange: (options: DataSourceSettings) => {
+        const jsonData = options.jsonData as SQLOptions;
+        expect(options.database).toBe('');
+        expect(jsonData.database).toBe('testDatabase');
+      },
+    };
+
+    // @ts-ignore Ignore this line as it's expected that
+    // the database object will not be in necessary (most current) state
+    const { rerender, result } = renderHook(() => useMigrateDatabaseFields(props));
+    rerender();
+  });
+
+  it('adds default max connection, max idle connection, and auto idle values when not detected', () => {
+    const props = {
+      ...defaultProps,
+      onOptionsChange: (options: DataSourceSettings) => {
+        const jsonData = options.jsonData as SQLOptions;
+        expect(jsonData.maxOpenConns).toBe(SQLConnectionDefaults.MAX_CONNS);
+        expect(jsonData.maxIdleConns).toBe(Math.ceil(SQLConnectionDefaults.MAX_CONNS));
+        expect(jsonData.maxIdleConnsAuto).toBe(true);
+      },
+    };
+
+    // @ts-ignore Ignore this line as it's expected that
+    // the database object will not be in the expected (most current) state
+    const { rerender, result } = renderHook(() => useMigrateDatabaseFields(props));
+    rerender();
+  });
+});
diff --git a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts
new file mode 100644
index 00000000000..cf587f1b938
--- /dev/null
+++ b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts
@@ -0,0 +1,63 @@
+import { useEffect } from 'react';
+
+import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
+import { logDebug } from '@grafana/runtime';
+
+import { SQLConnectionDefaults } from '../../constants';
+import { SQLOptions } from '../../types';
+
+/**
+ * 1. Moves the database field from the options object to jsonData.database and empties the database field.
+ * 2. If max open connections, max idle connections, and auto idle are all undefined set these to default values.
+ */
+export function useMigrateDatabaseFields<T extends SQLOptions, S = {}>({
+  onOptionsChange,
+  options,
+}: DataSourcePluginOptionsEditorProps<T, S>) {
+  useEffect(() => {
+    const jsonData = options.jsonData;
+    let newOptions = { ...options };
+    let optionsUpdated = false;
+
+    // Migrate the database field from the column into the jsonData object
+    if (options.database) {
+      logDebug(`Migrating from options.database with value ${options.database} for ${options.name}`);
+      newOptions.database = '';
+      newOptions.jsonData = { ...jsonData, database: options.database };
+      optionsUpdated = true;
+    }
+
+    // Set default values for max open connections, max idle connection,
+    // and auto idle if they're all undefined
+    if (
+      jsonData.maxOpenConns === undefined &&
+      jsonData.maxIdleConns === undefined &&
+      jsonData.maxIdleConnsAuto === undefined
+    ) {
+      // It's expected that the default will be greater than 4
+      const maxOpenConns = SQLConnectionDefaults.MAX_CONNS;
+      const maxIdleConns = maxOpenConns;
+
+      logDebug(
+        `Setting default max open connections to ${maxOpenConns} and setting max idle connection to ${maxIdleConns}`
+      );
+
+      // Spread from the jsonData in new options in case
+      // the database field was migrated as well
+      newOptions.jsonData = {
+        ...newOptions.jsonData,
+        maxOpenConns: maxOpenConns,
+        maxIdleConns: maxIdleConns,
+        maxIdleConnsAuto: true,
+      };
+
+      // Make sure we issue an update if options changed
+      optionsUpdated = true;
+    }
+
+    // Only issue an update if we changed options
+    if (optionsUpdated) {
+      onOptionsChange(newOptions);
+    }
+  }, [onOptionsChange, options]);
+}
diff --git a/public/app/features/plugins/sql/constants.ts b/public/app/features/plugins/sql/constants.ts
index 0d3466aecc6..af6a4758786 100644
--- a/public/app/features/plugins/sql/constants.ts
+++ b/public/app/features/plugins/sql/constants.ts
@@ -15,3 +15,11 @@ export const MACRO_NAMES = [
   '$__unixEpochGroup',
   '$__unixEpochGroupAlias',
 ];
+
+/**
+ * Constants for SQL connection
+ * parameters and automatic settings
+ */
+export const SQLConnectionDefaults = {
+  MAX_CONNS: 100,
+};
diff --git a/public/app/features/plugins/sql/types.ts b/public/app/features/plugins/sql/types.ts
index 325f7b6ea24..c930d49261e 100644
--- a/public/app/features/plugins/sql/types.ts
+++ b/public/app/features/plugins/sql/types.ts
@@ -30,6 +30,7 @@ export interface SqlQueryForInterpolation {
 export interface SQLConnectionLimits {
   maxOpenConns: number;
   maxIdleConns: number;
+  maxIdleConnsAuto: boolean;
   connMaxLifetime: number;
 }
 
diff --git a/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
index e095e3173ad..635d3f9fbfe 100644
--- a/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
@@ -26,7 +26,7 @@ import {
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 import { config } from 'app/core/config';
 import { ConnectionLimits } from 'app/features/plugins/sql/components/configuration/ConnectionLimits';
-import { useMigrateDatabaseField } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseField';
+import { useMigrateDatabaseFields } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseFields';
 
 import { MSSQLAuthenticationType, MSSQLEncryptOptions, MssqlOptions } from '../types';
 
@@ -35,7 +35,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<Ms
   const styles = useStyles2(getStyles);
   const jsonData = options.jsonData;
 
-  useMigrateDatabaseField(props);
+  useMigrateDatabaseFields(props);
 
   const onResetPassword = () => {
     updateDatasourcePluginResetOption(props, 'password');
@@ -232,13 +232,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<Ms
         ) : null}
       </FieldSet>
 
-      <ConnectionLimits
-        labelWidth={shortWidth}
-        jsonData={jsonData}
-        onPropertyChanged={(property, value) => {
-          updateDatasourcePluginJsonDataOption(props, property, value);
-        }}
-      ></ConnectionLimits>
+      <ConnectionLimits labelWidth={shortWidth} options={options} onOptionsChange={onOptionsChange} />
 
       <FieldSet label="MS SQL details">
         <InlineField
diff --git a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
index 7d6d4259bc9..3d8c434b3ec 100644
--- a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
@@ -21,7 +21,7 @@ import {
 import { config } from 'app/core/config';
 import { ConnectionLimits } from 'app/features/plugins/sql/components/configuration/ConnectionLimits';
 import { TLSSecretsConfig } from 'app/features/plugins/sql/components/configuration/TLSSecretsConfig';
-import { useMigrateDatabaseField } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseField';
+import { useMigrateDatabaseFields } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseFields';
 
 import { MySQLOptions } from '../types';
 
@@ -29,7 +29,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
   const { options, onOptionsChange } = props;
   const jsonData = options.jsonData;
 
-  useMigrateDatabaseField(props);
+  useMigrateDatabaseFields(props);
 
   const onResetPassword = () => {
     updateDatasourcePluginResetOption(props, 'password');
@@ -166,13 +166,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
         </FieldSet>
       ) : null}
 
-      <ConnectionLimits
-        labelWidth={WIDTH_SHORT}
-        jsonData={jsonData}
-        onPropertyChanged={(property, value) => {
-          updateDatasourcePluginJsonDataOption(props, property, value);
-        }}
-      ></ConnectionLimits>
+      <ConnectionLimits labelWidth={WIDTH_SHORT} options={options} onOptionsChange={onOptionsChange} />
 
       <FieldSet label="MySQL details">
         <InlineField
diff --git a/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
index 57a7e9054b7..458790664c7 100644
--- a/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
@@ -22,7 +22,7 @@ import {
 import { config } from 'app/core/config';
 import { ConnectionLimits } from 'app/features/plugins/sql/components/configuration/ConnectionLimits';
 import { TLSSecretsConfig } from 'app/features/plugins/sql/components/configuration/TLSSecretsConfig';
-import { useMigrateDatabaseField } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseField';
+import { useMigrateDatabaseFields } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseFields';
 
 import { PostgresOptions, PostgresTLSMethods, PostgresTLSModes, SecureJsonData } from '../types';
 
@@ -49,7 +49,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
 
   useAutoDetectFeatures({ props, setVersionOptions });
 
-  useMigrateDatabaseField(props);
+  useMigrateDatabaseFields(props);
 
   const { options, onOptionsChange } = props;
   const jsonData = options.jsonData;
@@ -246,13 +246,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
         </FieldSet>
       ) : null}
 
-      <ConnectionLimits
-        labelWidth={labelWidthShort}
-        jsonData={jsonData}
-        onPropertyChanged={(property, value) => {
-          updateDatasourcePluginJsonDataOption(props, property, value);
-        }}
-      ></ConnectionLimits>
+      <ConnectionLimits labelWidth={labelWidthShort} options={options} onOptionsChange={onOptionsChange} />
 
       <FieldSet label="PostgreSQL details">
         <InlineField

From 3c2a69c82c1d10b048cf0eebf23964a85864ce5e Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:28:23 +0100
Subject: [PATCH 168/729] Chore: Make grot own generated feature flag files
 (#66590)

* Chore: Make grot own generated feature flag files

* make grot own generated feature flags docs
---
 .github/CODEOWNERS | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 60c63bace46..e5b39730559 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -477,8 +477,8 @@ lerna.json @grafana/frontend-ops
 /scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform
 .pa11yci.conf.js @grafana/grafana-frontend-platform
 .pa11yci-pr.conf.js @grafana/grafana-frontend-platform
-.betterer.results @joshhunt
-.betterer.ts @joshhunt
+.betterer.results @grafanabot
+.betterer.ts @grafana/grafana-frontend-platform
 
 # @grafana/ui component documentation
 *.mdx @grafana/plugins-platform-frontend
@@ -601,6 +601,11 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/update-changelog.yml @grafana/grafana-delivery
 /.github/workflows/snyk.yml @grafana/security-team
 
+# Generated files not requiring owner approval
+/packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
+/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @grafanabot
+/pkg/services/featuremgmt/toggles_gen.csv @grafanabot
+/pkg/services/featuremgmt/toggles_gen.go @grafanabot
 
 # Conf
 /conf/defaults.ini @torkelo

From 4027254b871b31071c47d3799f160fcb4c01d2c4 Mon Sep 17 00:00:00 2001
From: linoman <2051016+linoman@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:42:37 +0200
Subject: [PATCH 169/729] Auth: Add SigningKeys Service (#64343)

* Add key service

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

* Wire the service

* Rename Service

* Implement GetJWKS

* Slipt interface and implementation

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

* Change implementation, add tests

* Align to the expected package hierarchy

* Update CODEOWNERS

* Align names and fix wire.go

* Update pkg/services/signingkeys/signingkeysimpl/service.go

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Update pkg/services/signingkeys/signingkeysimpl/service_test.go

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Update pkg/services/signingkeys/signingkeysimpl/service_test.go

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Update pkg/services/signingkeys/signingkeysimpl/service_test.go

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Add AddPrivateKey method to SigningKeysService

* Align tests to the guidelines

* Add test for GetJWKS() method

* Add comments to the interface

* Add FakeSigningKeysService

---------

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
---
 .github/CODEOWNERS                            |   1 +
 pkg/server/wire.go                            |   4 +
 pkg/services/signingkeys/error.go             |   9 +
 pkg/services/signingkeys/signingkeys.go       |  32 ++
 .../signingkeys/signingkeysimpl/service.go    | 113 +++++++
 .../signingkeysimpl/service_test.go           | 283 ++++++++++++++++++
 .../signingkeys/signingkeystest/fake.go       |  48 +++
 7 files changed, 490 insertions(+)
 create mode 100644 pkg/services/signingkeys/error.go
 create mode 100644 pkg/services/signingkeys/signingkeys.go
 create mode 100644 pkg/services/signingkeys/signingkeysimpl/service.go
 create mode 100644 pkg/services/signingkeys/signingkeysimpl/service_test.go
 create mode 100644 pkg/services/signingkeys/signingkeystest/fake.go

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e5b39730559..07c06825e28 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -522,6 +522,7 @@ lerna.json @grafana/frontend-ops
 /pkg/services/anonymous/ @grafana/grafana-authnz-team
 /pkg/services/auth/ @grafana/grafana-authnz-team
 /pkg/services/authn/ @grafana/grafana-authnz-team
+/pkg/services/signingkeys/ @grafana/grafana-authnz-team
 /pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
 /pkg/services/datasources/permissions/ @grafana/grafana-authnz-team
 /pkg/services/guardian/ @grafana/grafana-authnz-team
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 5a744fe569f..8882bb443e6 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -115,6 +115,8 @@ import (
 	serviceaccountsretriever "github.com/grafana/grafana/pkg/services/serviceaccounts/retriever"
 	"github.com/grafana/grafana/pkg/services/shorturls"
 	"github.com/grafana/grafana/pkg/services/shorturls/shorturlimpl"
+	"github.com/grafana/grafana/pkg/services/signingkeys"
+	"github.com/grafana/grafana/pkg/services/signingkeys/signingkeysimpl"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	starApi "github.com/grafana/grafana/pkg/services/star/api"
 	"github.com/grafana/grafana/pkg/services/star/starimpl"
@@ -359,6 +361,8 @@ var wireBasicSet = wire.NewSet(
 	supportbundlesimpl.ProvideService,
 	loggermw.Provide,
 	modules.WireSet,
+	signingkeysimpl.ProvideEmbeddedSigningKeysService,
+	wire.Bind(new(signingkeys.Service), new(*signingkeysimpl.Service)),
 )
 
 var wireSet = wire.NewSet(
diff --git a/pkg/services/signingkeys/error.go b/pkg/services/signingkeys/error.go
new file mode 100644
index 00000000000..2ef529f00fe
--- /dev/null
+++ b/pkg/services/signingkeys/error.go
@@ -0,0 +1,9 @@
+package signingkeys
+
+import "github.com/grafana/grafana/pkg/util/errutil"
+
+var (
+	ErrSigningKeyNotFound      = errutil.NewBase(errutil.StatusNotFound, "signingkeys.keyNotFound")
+	ErrSigningKeyAlreadyExists = errutil.NewBase(errutil.StatusBadRequest, "signingkeys.keyAlreadyExists")
+	ErrKeyGenerationFailed     = errutil.NewBase(errutil.StatusInternal, "signingkeys.keyGenerationFailed")
+)
diff --git a/pkg/services/signingkeys/signingkeys.go b/pkg/services/signingkeys/signingkeys.go
new file mode 100644
index 00000000000..c3e37e44339
--- /dev/null
+++ b/pkg/services/signingkeys/signingkeys.go
@@ -0,0 +1,32 @@
+// Package signingkeys implements the SigningKeys service which is responsible for managing
+// the signing keys used to sign and verify JWT tokens.
+//
+// The service is under active development and is not yet ready for production use.
+//
+// Currently, it only supports RSA keys and the keys are stored in memory.
+
+package signingkeys
+
+import (
+	"crypto"
+
+	"github.com/go-jose/go-jose/v3"
+)
+
+// Service provides functionality for managing signing keys used to sign and verify JWT tokens.
+//
+// The service is under active development and is not yet ready for production use.
+type Service interface {
+	// GetJWKS returns the JSON Web Key Set (JWKS) with all the keys that can be used to verify tokens (public keys)
+	GetJWKS() jose.JSONWebKeySet
+	// GetJWK returns the JSON Web Key (JWK) with the specified key ID which can be used to verify tokens (public key)
+	GetJWK(keyID string) (jose.JSONWebKey, error)
+	// GetPublicKey returns the public key with the specified key ID
+	GetPublicKey(keyID string) (crypto.PublicKey, error)
+	// GetPrivateKey returns the private key with the specified key ID
+	GetPrivateKey(keyID string) (crypto.PrivateKey, error)
+	// GetServerPrivateKey returns the private key used to sign tokens
+	GetServerPrivateKey() (crypto.PrivateKey, error)
+	// AddPrivateKey adds a private key to the service
+	AddPrivateKey(keyID string, privateKey crypto.PrivateKey) error
+}
diff --git a/pkg/services/signingkeys/signingkeysimpl/service.go b/pkg/services/signingkeys/signingkeysimpl/service.go
new file mode 100644
index 00000000000..30d0ec99612
--- /dev/null
+++ b/pkg/services/signingkeys/signingkeysimpl/service.go
@@ -0,0 +1,113 @@
+package signingkeysimpl
+
+import (
+	"crypto"
+	"crypto/rand"
+	"crypto/rsa"
+
+	"github.com/go-jose/go-jose/v3"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/signingkeys"
+)
+
+const (
+	serverPrivateKeyID = "default"
+)
+
+var _ signingkeys.Service = new(Service)
+
+func ProvideEmbeddedSigningKeysService(features *featuremgmt.FeatureManager) (*Service, error) {
+	s := &Service{
+		log:  log.New("auth.key_service"),
+		keys: map[string]crypto.Signer{},
+	}
+
+	privateKey, err := rsa.GenerateKey(rand.Reader, 4096)
+	if err != nil {
+		s.log.Error("Error generating private key", "err", err)
+		return nil, signingkeys.ErrKeyGenerationFailed.Errorf("Error generating private key: %v", err)
+	}
+
+	if err := s.AddPrivateKey(serverPrivateKeyID, privateKey); err != nil {
+		return nil, err
+	}
+
+	return s, nil
+}
+
+// Service provides functionality for managing signing keys used to sign and verify JWT tokens for
+// the OSS version of Grafana.
+//
+// The service is under active development and is not yet ready for production use.
+type Service struct {
+	log  log.Logger
+	keys map[string]crypto.Signer
+}
+
+// GetJWKS returns the JSON Web Key Set (JWKS) with all the keys that can be used to verify tokens (public keys)
+func (s *Service) GetJWKS() jose.JSONWebKeySet {
+	result := jose.JSONWebKeySet{}
+
+	for keyID := range s.keys {
+		// Skip error check because keyID must be a valid key ID
+		jwk, _ := s.GetJWK(keyID)
+		result.Keys = append(result.Keys, jwk)
+	}
+
+	return result
+}
+
+// GetJWK returns the JSON Web Key (JWK) with the specified key ID which can be used to verify tokens (public key)
+func (s *Service) GetJWK(keyID string) (jose.JSONWebKey, error) {
+	privateKey, ok := s.keys[keyID]
+	if !ok {
+		s.log.Error("The specified key was not found", "keyID", keyID)
+		return jose.JSONWebKey{}, signingkeys.ErrSigningKeyNotFound.Errorf("The specified key was not found: %s", keyID)
+	}
+
+	result := jose.JSONWebKey{
+		Key: privateKey.Public(),
+		Use: "sig",
+	}
+
+	return result, nil
+}
+
+// GetPublicKey returns the public key with the specified key ID
+func (s *Service) GetPublicKey(keyID string) (crypto.PublicKey, error) {
+	privateKey, ok := s.keys[keyID]
+	if !ok {
+		s.log.Error("The specified key was not found", "keyID", keyID)
+		return nil, signingkeys.ErrSigningKeyNotFound.Errorf("The specified key was not found: %s", keyID)
+	}
+
+	return privateKey.Public(), nil
+}
+
+// GetPrivateKey returns the private key with the specified key ID
+func (s *Service) GetPrivateKey(keyID string) (crypto.PrivateKey, error) {
+	privateKey, ok := s.keys[keyID]
+	if !ok {
+		s.log.Error("The specified key was not found", "keyID", keyID)
+		return nil, signingkeys.ErrSigningKeyNotFound.Errorf("The specified key was not found: %s", keyID)
+	}
+
+	return privateKey, nil
+}
+
+// AddPrivateKey adds a private key to the service
+func (s *Service) AddPrivateKey(keyID string, privateKey crypto.PrivateKey) error {
+	if _, ok := s.keys[keyID]; ok {
+		s.log.Error("The specified key ID is already in use", "keyID", keyID)
+		return signingkeys.ErrSigningKeyAlreadyExists.Errorf("The specified key ID is already in use: %s", keyID)
+	}
+	s.keys[keyID] = privateKey.(crypto.Signer)
+	return nil
+}
+
+// GetServerPrivateKey returns the private key used to sign tokens
+func (s *Service) GetServerPrivateKey() (crypto.PrivateKey, error) {
+	return s.GetPrivateKey(serverPrivateKeyID)
+}
diff --git a/pkg/services/signingkeys/signingkeysimpl/service_test.go b/pkg/services/signingkeys/signingkeysimpl/service_test.go
new file mode 100644
index 00000000000..f4c891820b9
--- /dev/null
+++ b/pkg/services/signingkeys/signingkeysimpl/service_test.go
@@ -0,0 +1,283 @@
+package signingkeysimpl
+
+import (
+	"crypto"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/json"
+	"encoding/pem"
+	"io"
+	"testing"
+
+	"github.com/go-jose/go-jose/v3"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/stretchr/testify/require"
+)
+
+const (
+	privateKeyPem = `-----BEGIN RSA PRIVATE KEY-----
+MIIJJgIBAAKCAgBixs4SiJylE8NwaR/AN2gr/XWgTfFqwg3m7rm018MSmMZxph77
+lZ96n/UqaAtEL9wCHjU0/76dhMtn6yGXmS9s3zTwOfuy5Hv4ai0PjEoRrxdtbKT8
+u0F0N7HJupBeUBZ86ELhlTw+OgOqxbWv/V6uN81UG/tadaR00k9yyfcT0noCE+3a
+5l4OT7q2ILJL5nvyKgwcZJxGfoBwkGX42BZuIxZ4ANx3Mz/uQrkRMg+5bDDYgvlV
+OsEhoDHmq4DsRODeVyCN0If0HL0fPIUoVv8C87igVnTq3ScxikypndK1uytKLTJP
+ZsenbyfLyvR/jBAu2WZVYS0JSYAxN+4wJH8H1dLotYXpn/YSPBAsR/EHi4kpu5v+
+OBSGhMl21ZSeNNFUqX/YnRjYEYGgQuhYRnfzFaROUh3bWq25WC7bxTWwqtnA1FX2
+Vqr0tgNly0hCr+KP/kkUe7xiGzjBIC+A89b7y70l3m3j/kTj3TXVSzcwn7aGOO8X
+OILw/x7vF08LYC26wLBOk2uPcraR5aKNy6KPhy8rMYLv8u4jNzGP8Y6ISMYyBv5N
+tJ5BLHn80hbx/Vo5zADJ8WeMIUmtxLRD6oedX8za5Jpa3b71cx55zFhYiVThKeS2
+by9PKi2xurd5AYWVtJBr2azTMFY2FdGVbB02/21twepQXrRl17ucfaxapQIDAQAB
+AoICAEO2QQHXgHpxR+LBTbC4ysKNJ5tSkxI6IMmUEN31opYXAMJbvJV+hirLiIcf
+d8mwfUM+bf786jCVHdMJDqgbrLUXdfTP6slBc/Jg5q7n3sasnoS2m4tc2ovOuiOt
+rtXYVPIfTenSIdAOeQESM3CHYeZP/oOQAwiJ6Mjkeu4XoTaHbHgMLVuH3CY3ZakA
+VPlO8NybEl5MYgy5H1cKxbyGdSnfB8IP5RIZodO1DaTKCplznzBs6HsSod5pMIwO
+OXy94uDIHVrZ/rjLEqJdHHMA4COn64KOgeuW2w1M3yzPMei+e/iHbxubO3Z97mv3
+nw/odheHlG0nBnZ9WlFjI/cArctWjqSfs7mEX6aV+Ity0+msMWWgrjg6l0y0rlqa
+odYt2KIzyAcsFiZCUUgsmNRzB8kVycNwjDFpW24ZvwWtakvH/uZ/lK5jloXOF3Id
+TTf4T+h6vtHjEMzfOKmrp2fycfgjavBEX/VMASHooB5H2lzB9poSC9k1V+HAnirq
+s5PSehX2QnHvuFCG47iFN1xX747hESph1plzO17xMsKQnWPDQw8ega3fkW3MMQdx
+wFOriHYZBk2o7pQ6aSErMMqlVM9PS2HXHTOV4ejAEYsFtnGqfZB3RSt3+4DIhyjo
++YS4At/nfWMyxTo5R/9EkuTCzZTfPVEq/7E8gPsK8c3GC/xpAoIBAQC51/DUpDtv
+PsU02PO7m/+u5s1OJLE/PybUI0fNTfL+DAdzOfFlrJkyfhYNBOx2BrhYZsL4bZb/
+nvAj7L8nvUDTeNdhejrR3SFom8U9cxM28ZCBNNn9rCnkSNPdn5FsUr8QqOEJwWZG
+6KXJ/c019LV+0ncn7fN5GYnPhlVgQCmAnSxudwRmH0uqXhV/p1F+veTe4TL/CHXf
+ZrcW01pYlNtRB7D4bQ9YMPxgKaNNl8IcpZdKCocxImbTJeSn6nz7ZeMCVeUP/BuP
+a2aBWe76xvxubm+NZbzcsj3b8tAYngAaL/yh9+uX3yqVA2Y5DR+0m5qgYehTlqET
+jf1cXA9oA/JfAoIBAQCIEKYswfIRQUXoUx905KWT4leVaWRI37nQVjrVYG6ElN26
+mMMIKlN/BghteZB3Wrh9p4ZkHlLMMpXj6vRZRhpgjfiOxeiIkjDdQYQao/q7ZStr
+H0G37lOiboxmMWpLI2XOrNAlTYmDCVVTSjoF0zxvMzIyvRV488X6tI8LAIf3QjDj
++6IrJH1RF1AGwLSeD07JWq4F3epg6BwEXlMePCwUr8cUYAIrPlGWT/ywP9ZKX5Wt
+mNEZEgaWAohvdXGbkG4cQuIT2fvd2HvYDjbr9CvQDV5tHIE36jUrlbzVRHYxp0QQ
+XbPTTN9On6fSueYoFy47CtXJOHrbZ+r74CU0yHl7AoIBACwQYl7YzerTlEiyhB/g
+niAnQ1ia5JfdbmRwNQ8dw1avHXkZrP3xjaVmNe5CU5qsfzseqm3i9iGH2uJ5uN1A
+R0Wc6lyHcbje2JQIEx090rl9T0kDcghusMQa7Hko438uo3TcxfbdL1XyxZR+JBD+
+A6adWnlSNx9oib9113pp3C1NlwJeH+Hi27r6cdiBoJYPilu6Q7AqnmAo55J27H4C
+VXoB+9j7at77Rmu6k6jLKdBHBvccRe/Fe2HnIy8ZLycgglHEcfp3SUWZLoXPABXf
+5mx8rOB21e/yJy6mhObBV77dz+XLdcXduSf51VwDm5fkKSaL8F0ZYvnS+dbTUSfV
+f7sCggEAOQPw/jRPARf++TlLpyngkDV6Seud0EOfk0Nu59a+uOPAfd5ha1yBHGsk
+wOr9tGXZhR3b3LwwKczQrm7X8UjE6MzU6M7Zf9DylORNPPSVrkzYgszYNwCxHxF/
+15rBVbcBhDc6CUeSZcxVas9hvOslGdu0HzrIcqSDw2hBwHR6hQvBfOcGr1ldAcvp
+BstdZBY6B3nuDhtNiUn544K7BaJlPk3h+BG7Fu/INFpUIm69lvCywcmVZRH+nIF3
+Nm1aK7u7yC/mmDbxqaZ7Tq+2J+1rJoVTmhkltI55tUfLlvpXJLtYdBsvrU07DbEt
+G8o2PXppLuh9aRI3uRS0jNMCBDo1XQKCAQAa2CsPi/ey9JzgUkBJvVusv7fF8hYB
+4Nno4PXiRezIGbT9WitZU5lQhfw0g9XokyQqKwSS6iEtuSRE92P6XLB0jswQQ/Jc
+5yWX9DqjKKE4dtpS4/VfkdfE6daIqtFCfE3gybnah/FWPAtYY4iC1207lZQjAp91
+OFOV2sfpk4ZIwnSJBvY0O5Brt/nbHkFUzxJRFgERD7zRrFOU9mZdEUfR9jvj4xlI
+NcKeaYuoa4nWwuLEEzNTQqcS8ccOrpGTZQP2ffpyZdY42q4N8UggTdAcwOtQ6a6L
+D3U+YcnG00aa3FnNN5EjOnY4FeIUJwpqzB8mDc0ztHdwOoJhDETWroDq
+-----END RSA PRIVATE KEY-----`
+)
+
+func getPrivateKey(t *testing.T) *rsa.PrivateKey {
+	pemBlock, _ := pem.Decode([]byte(privateKeyPem))
+	privateKey, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes)
+	require.NoError(t, err)
+	return privateKey
+}
+
+func setupTestService(t *testing.T) *Service {
+	svc := &Service{
+		log:  log.NewNopLogger(),
+		keys: map[string]crypto.Signer{serverPrivateKeyID: getPrivateKey(t)},
+	}
+	return svc
+}
+
+func TestEmbeddedKeyService_GetJWK(t *testing.T) {
+	tests := []struct {
+		name    string
+		keyID   string
+		want    jose.JSONWebKey
+		wantErr bool
+	}{
+		{name: "creates a JSON Web Key successfully",
+			keyID: "default",
+			want: jose.JSONWebKey{
+				Key: getPrivateKey(t).Public(),
+				Use: "sig",
+			},
+			wantErr: false,
+		},
+		{name: "returns error when the specified key was not found",
+			keyID:   "not-existing-key-id",
+			want:    jose.JSONWebKey{},
+			wantErr: true,
+		},
+	}
+	svc := setupTestService(t)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := svc.GetJWK(tt.keyID)
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			require.Equal(t, got, tt.want)
+		})
+	}
+}
+
+func TestEmbeddedKeyService_GetJWK_OnlyPublicKeyShared(t *testing.T) {
+	svc := setupTestService(t)
+	jwk, err := svc.GetJWK("default")
+
+	require.NoError(t, err)
+
+	jwkJson, err := jwk.MarshalJSON()
+	require.NoError(t, err)
+
+	kvs := make(map[string]interface{})
+	err = json.Unmarshal(jwkJson, &kvs)
+	require.NoError(t, err)
+
+	// check that the private key is not shared
+	require.NotContains(t, kvs, "d")
+	require.NotContains(t, kvs, "p")
+	require.NotContains(t, kvs, "q")
+}
+
+func TestEmbeddedKeyService_GetJWKS(t *testing.T) {
+	svc := &Service{
+		log: log.NewNopLogger(),
+		keys: map[string]crypto.Signer{
+			serverPrivateKeyID: getPrivateKey(t),
+			"other":            getPrivateKey(t),
+		},
+	}
+	jwk := svc.GetJWKS()
+
+	require.Equal(t, 2, len(jwk.Keys))
+}
+
+func TestEmbeddedKeyService_GetJWKS_OnlyPublicKeyShared(t *testing.T) {
+	svc := setupTestService(t)
+	jwks := svc.GetJWKS()
+
+	jwksJson, err := json.Marshal(jwks)
+	require.NoError(t, err)
+
+	type keys struct {
+		Keys []map[string]interface{} `json:"keys"`
+	}
+
+	var kvs keys
+	err = json.Unmarshal(jwksJson, &kvs)
+	require.NoError(t, err)
+
+	for _, kv := range kvs.Keys {
+		// check that the private key is not shared
+		require.NotContains(t, kv, "d")
+		require.NotContains(t, kv, "p")
+		require.NotContains(t, kv, "q")
+	}
+}
+
+func TestEmbeddedKeyService_GetPublicKey(t *testing.T) {
+	tests := []struct {
+		name    string
+		keyID   string
+		want    crypto.PublicKey
+		wantErr bool
+	}{
+		{
+			name:    "returns the public key successfully",
+			keyID:   "default",
+			want:    getPrivateKey(t).Public(),
+			wantErr: false,
+		},
+		{
+			name:    "returns error when the specified key was not found",
+			keyID:   "not-existent-key-id",
+			want:    nil,
+			wantErr: true,
+		},
+	}
+	svc := setupTestService(t)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := svc.GetPublicKey(tt.keyID)
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			require.Equal(t, got, tt.want)
+		})
+	}
+}
+
+func TestEmbeddedKeyService_GetPrivateKey(t *testing.T) {
+	tests := []struct {
+		name    string
+		keyID   string
+		want    crypto.PrivateKey
+		wantErr bool
+	}{
+		{
+			name:    "returns the private key successfully",
+			keyID:   "default",
+			want:    getPrivateKey(t),
+			wantErr: false,
+		},
+		{
+			name:    "returns error when the specified key was not found",
+			keyID:   "not-existent-key-id",
+			want:    nil,
+			wantErr: true,
+		},
+	}
+	svc := setupTestService(t)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := svc.GetPrivateKey(tt.keyID)
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			require.Equal(t, got, tt.want)
+		})
+	}
+}
+
+func TestEmbeddedKeyService_AddPrivateKey(t *testing.T) {
+	tests := []struct {
+		name    string
+		keyID   string
+		wantErr bool
+	}{
+		{
+			name:    "adds the private key successfully",
+			keyID:   "new-key-id",
+			wantErr: false,
+		},
+		{
+			name:    "returns error when the specified key is already in the store",
+			keyID:   serverPrivateKeyID,
+			wantErr: true,
+		},
+	}
+	svc := setupTestService(t)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := svc.AddPrivateKey(tt.keyID, &dummyPrivateKey{})
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+type dummyPrivateKey struct {
+}
+
+func (d dummyPrivateKey) Public() crypto.PublicKey {
+	return ""
+}
+
+func (d dummyPrivateKey) Sign(rand io.Reader, digest []byte, opts crypto.SignerOpts) ([]byte, error) {
+	return nil, nil
+}
diff --git a/pkg/services/signingkeys/signingkeystest/fake.go b/pkg/services/signingkeys/signingkeystest/fake.go
new file mode 100644
index 00000000000..4e9163c2970
--- /dev/null
+++ b/pkg/services/signingkeys/signingkeystest/fake.go
@@ -0,0 +1,48 @@
+package signingkeystest
+
+import (
+	"crypto"
+
+	"github.com/go-jose/go-jose/v3"
+)
+
+type FakeSigningKeysService struct {
+	ExpectedJSONWebKeySet    jose.JSONWebKeySet
+	ExpectedJSONWebKey       jose.JSONWebKey
+	ExpectedKeys             map[string]crypto.Signer
+	ExpectedServerPrivateKey crypto.PrivateKey
+	ExpectedError            error
+}
+
+func (s *FakeSigningKeysService) GetJWKS() jose.JSONWebKeySet {
+	return s.ExpectedJSONWebKeySet
+}
+
+// GetJWK returns the JSON Web Key (JWK) with the specified key ID which can be used to verify tokens (public key)
+func (s *FakeSigningKeysService) GetJWK(keyID string) (jose.JSONWebKey, error) {
+	return s.ExpectedJSONWebKey, s.ExpectedError
+}
+
+// GetPublicKey returns the public key with the specified key ID
+func (s *FakeSigningKeysService) GetPublicKey(keyID string) (crypto.PublicKey, error) {
+	return s.ExpectedKeys[keyID].Public(), s.ExpectedError
+}
+
+// GetPrivateKey returns the private key with the specified key ID
+func (s *FakeSigningKeysService) GetPrivateKey(keyID string) (crypto.PrivateKey, error) {
+	return s.ExpectedKeys[keyID], s.ExpectedError
+}
+
+// GetServerPrivateKey returns the private key used to sign tokens
+func (s *FakeSigningKeysService) GetServerPrivateKey() (crypto.PrivateKey, error) {
+	return s.ExpectedServerPrivateKey, s.ExpectedError
+}
+
+// AddPrivateKey adds a private key to the service
+func (s *FakeSigningKeysService) AddPrivateKey(keyID string, privateKey crypto.PrivateKey) error {
+	if s.ExpectedError != nil {
+		return s.ExpectedError
+	}
+	s.ExpectedKeys[keyID] = privateKey.(crypto.Signer)
+	return nil
+}

From 086d8b7363144180c35bf45415e72f0e0a34db99 Mon Sep 17 00:00:00 2001
From: Levente Balogh <balogh.levente.hu@gmail.com>
Date: Mon, 17 Apr 2023 11:43:01 +0200
Subject: [PATCH 170/729] Migration Docs: Restructure plugin migration docs
 (#64900)

* initial restructuring

* add weights for ordering

* fix links

* remove aliases, add script

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: David Harris <david.harris@grafana.com>

* make pretty

* use correct link for angular to react guide

* refactor: move the migration guide to /Developers

* Revert "refactor: move the migration guide to /Developers"

This reverts commit 8f31af8dfde3399060e8023c635174eb1243ae72.

* fix: only redirect if the URL-hash has a valid redirect

* fix: use a rel-ref for the Angular-React migration guide link

* fix: update the hash redirects

---------

Co-authored-by: David Harris <david.harris@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
---
 .../sources/developers/angular_deprecation.md |   2 +-
 .../developers/plugins/migration-guide.md     | 954 ------------------
 .../plugins/migration-guide/_index.md         |  41 +
 .../migration-guide/angular-react/_index.md   |  73 ++
 .../migration-guide/v6.x-v7.x/_index.md       | 120 +++
 .../migration-guide/v7.x-v8.x/_index.md       | 349 +++++++
 .../migration-guide/v8.3.x-8.4.x/_index.md    |  99 ++
 .../migration-guide/v8.x-v9.x/_index.md       | 112 ++
 .../migration-guide/v9.1.x-v9.2.x/_index.md   |  71 ++
 .../migration-guide/v9.3.x-9.4.x/_index.md    | 148 +++
 docs/sources/whatsnew/whats-new-in-v9-4.md    |   2 +-
 11 files changed, 1015 insertions(+), 956 deletions(-)
 delete mode 100644 docs/sources/developers/plugins/migration-guide.md
 create mode 100644 docs/sources/developers/plugins/migration-guide/_index.md
 create mode 100644 docs/sources/developers/plugins/migration-guide/angular-react/_index.md
 create mode 100644 docs/sources/developers/plugins/migration-guide/v6.x-v7.x/_index.md
 create mode 100644 docs/sources/developers/plugins/migration-guide/v7.x-v8.x/_index.md
 create mode 100644 docs/sources/developers/plugins/migration-guide/v8.3.x-8.4.x/_index.md
 create mode 100644 docs/sources/developers/plugins/migration-guide/v8.x-v9.x/_index.md
 create mode 100644 docs/sources/developers/plugins/migration-guide/v9.1.x-v9.2.x/_index.md
 create mode 100644 docs/sources/developers/plugins/migration-guide/v9.3.x-9.4.x/_index.md

diff --git a/docs/sources/developers/angular_deprecation.md b/docs/sources/developers/angular_deprecation.md
index 7b2e48433be..cd4a19b3771 100644
--- a/docs/sources/developers/angular_deprecation.md
+++ b/docs/sources/developers/angular_deprecation.md
@@ -36,6 +36,6 @@ We encourage you to locate the repository of the corresponding plugin and create
 
 ### Links
 
-- [Migrate Angular to React](https://grafana.com/docs/grafana/latest/developers/plugins/migration-guide/#migrate-a-plugin-from-angular-to-react)
+- [Migrate Angular to React]({{< relref "./plugins/migration-guide/angular-react/" >}})
 - [Build a panel plugin](https://grafana.com/tutorials/build-a-panel-plugin/)
 - [Build a data source plugin](https://grafana.com/tutorials/build-a-data-source-plugin/)
diff --git a/docs/sources/developers/plugins/migration-guide.md b/docs/sources/developers/plugins/migration-guide.md
deleted file mode 100644
index d7724e780fb..00000000000
--- a/docs/sources/developers/plugins/migration-guide.md
+++ /dev/null
@@ -1,954 +0,0 @@
----
-title: Plugin migration guide
----
-
-# Plugin migration guide
-
-## Introduction
-
-This guide helps you identify the steps required to update a plugin from the Grafana version it currently supports to newer versions of Grafana.
-
-> **Note:** If you've successfully migrated your plugin using this guide, then share your experiences with us! If you find missing information, then we encourage you to [submit an issue on GitHub](https://github.com/grafana/grafana/issues/new?title=Docs%20feedback:%20/developers/plugins/migration-guide.md) so that we can improve this guide!
-
-## Table of contents
-
-- [Plugin migration guide](#plugin-migration-guide)
-  - [Introduction](#introduction)
-  - [Table of contents](#table-of-contents)
-  - [From version 9.3.x to 9.4.x](#from-version-93x-to-94x)
-    - [Supporting new navigation layout](#supporting-new-navigation-layout)
-    - [Forwarded HTTP headers in grafana-plugin-sdk-go](#forwarded-http-headers-in-grafana-plugin-sdk-go)
-  - [From version 9.1.x to 9.2.x](#from-version-91x-to-92x)
-    - [React and React-dom as peer dependencies](#react-and-react-dom-as-peer-dependencies)
-    - [NavModelItem requires a valid icon name](#navmodelitem-requires-a-valid-icon-name)
-    - [Additional type availability](#additional-type-availability)
-  - [From version 8.x to 9.x](#from-version-8x-to-9x)
-    - [9.0 breaking changes](#90-breaking-changes)
-      - [theme.visualization.getColorByName replaces getColorForTheme](#themevisualizationgetcolorbyname-replaces-getcolorfortheme)
-      - [VizTextDisplayOptions replaces TextDisplayOptions](#viztextdisplayoptions-replaces-textdisplayoptions)
-      - [Changes in the internal of `backendSrv.fetch()`](#changes-in-the-internal-of-backendsrvfetch)
-      - [GrafanaTheme2 and useStyles2 replaces getFormStyles](#grafanatheme2-and-usestyles2-replaces-getformstyles)
-      - [/api/ds/query replaces /api/tsdb/query](#apidsquery-replaces-apitsdbquery)
-      - [selectOptionInTest has been removed](#selectoptionintest-has-been-removed)
-      - [Toolkit 9 and webpack](#toolkit-9-and-webpack)
-  - [From version 8.3.x to 8.4.x](#from-version-83x-to-84x)
-    - [Value Mapping Editor has been removed from @grafana-ui library](#value-mapping-editor-has-been-removed-from-grafana-ui-library)
-    - [Thresholds Editor has been removed from @grafana-ui library](#thresholds-editor-has-been-removed-from-grafana-ui-library)
-    - [8.4 deprecations](#84-deprecations)
-      - [LocationService replaces getLocationSrv](#locationservice-replaces-getlocationsrv)
-  - [From version 7.x.x to 8.x.x](#from-version-7xx-to-8xx)
-    - [Backend plugin v1 support has been dropped](#backend-plugin-v1-support-has-been-dropped)
-      - [1. Add dependency on grafana-plugin-sdk-go](#1-add-dependency-on-grafana-plugin-sdk-go)
-      - [2. Update the way you bootstrap your plugin](#2-update-the-way-you-bootstrap-your-plugin)
-      - [3. Update the plugin package](#3-update-the-plugin-package)
-    - [Sign and load backend plugins](#sign-and-load-backend-plugins)
-    - [Update react-hook-form from v6 to v7](#update-react-hook-form-from-v6-to-v7)
-    - [Update the plugin.json](#update-the-pluginjson)
-    - [Update imports to match emotion 11](#update-imports-to-match-emotion-11)
-    - [Update needed for app plugins using dashboards](#update-needed-for-app-plugins-using-dashboards)
-    - [8.0 deprecations](#80-deprecations)
-      - [Grafana theme v1](#grafana-theme-v1)
-  - [From version 6.2.x to 7.4.0](#from-version-62x-to-740)
-    - [Legend components](#legend-components)
-  - [From version 6.5.x to 7.3.0](#from-version-65x-to-730)
-    - [getColorForTheme changes](#getcolorfortheme-changes)
-  - [From version 6.x.x to 7.0.0](#from-version-6xx-to-700)
-    - [What's new in Grafana 7.0?](#whats-new-in-grafana-70)
-      - [New data format](#new-data-format)
-      - [Improved TypeScript support](#improved-typescript-support)
-      - [Grafana Toolkit](#grafana-toolkit)
-      - [Field options](#field-options)
-      - [Backend plugins](#backend-plugins)
-    - [Migrate a plugin from Angular to React](#migrate-a-plugin-from-angular-to-react)
-      - [Migrate a panel plugin](#migrate-a-panel-plugin)
-      - [Migrate a data source plugin](#migrate-a-data-source-plugin)
-      - [Migrate to data frames](#migrate-to-data-frames)
-    - [Troubleshoot plugin migration](#troubleshoot-plugin-migration)
-
-## From version 9.3.x to 9.4.x
-
-### Supporting new navigation layout
-
-First, enable the `topnav` feature flag in `custom.ini` to check how your plugin renders in the new navigation layout:
-
-```ini
-[feature_toggles]
-enable = topnav
-```
-
-#### Migrate from `onNavChanged`
-
-If your plugin uses the `onNavChanged` callback to inform Grafana of its nav model & sub pages, you should see that this results in duplicated navigation elements. If you disable `topnav` it should look just as before.
-
-When `topnav` is enabled we need to update the plugin to take advantage of the new `PluginPage` component and not call `onNavChanged`. `onNavChanged` is now deprecated.
-
-#### Switch to `PluginPage` component
-
-Grafana now exposes a new `PluginPage` component from `@grafana/runtime` that hooks into the new navigation and page layouts and supports the old page layouts when the `topnav` feature is disabled. This new component will also handle rendering the section navigation. The section navigation can include other core sections and other plugins. To control what pages are displayed in the section navigation for a specific plugin, Grafana will use the pages added in `plugin.json` that have `addToNav` set to `true`.
-
-This component is very easy to use. Simply wrap it around your page content:
-
-```tsx
-import { PluginPage } from '@grafana/runtime';
-
-...
-
-return (
-  <PluginPage>
-    {your page content here}
-  </PluginPage>
-);
-```
-
-Grafana will look at the URL to know what plugin and page should be active in the section nav, so this only works for pages you have specified in `plugin.json`. `PluginPage` will then render a page header based on the page name specified in `plugin.json`.
-
-#### Using `PluginPage` for pages not defined in `plugin.json`
-
-The `PluginPage` component also exposes a `pageNav` property that is a `NavModelItem`. This `pageNav` property is useful for pages that are not defined in `plugin.json` (e.g. individual item pages). The `text` and `description` you specify in the `pageNav` model will be used to populate the breadcrumbs and page header.
-
-Example:
-
-```tsx
-const pageNav = {
-  text: 'Write errors cortex-prod-04',
-  description: 'Incident timeline and details'
-};
-
-return (
-  <PluginPage pageNav={pageNav}>
-    {your page content here}
-  </PluginPage>
-);
-```
-
-The way the active page is matched in the breadcrumbs and section nav relies on the page routes being hierarchical. If you have a list page and an item page, the item page needs to be a subroute of the list page and the list page url needs to be specified in your `plugin.json`. For example, you might have a list of users at `/users`. This means that the item page for a specific user needs to be at `/users/:id`. This may require some refactoring of your routes.
-
-#### Using `PluginPage` with tabs
-
-You can also create a further layer of hierarchy by specifying `children` in the `pageNav` model to created a page with tabbed navigation.
-
-Example:
-
-```tsx
-const pageNav = {
-  text: 'My page',
-  description: 'Incident timeline and details',
-  url: '/a/myorgid-pluginname-app',
-  children: [
-    {
-      url: '/a/myorgid-pluginname-app/tab1',
-      text: 'Tab1',
-      active: true,
-    },
-    {
-      url: '/a/myorgid-pluginname-app/tab2',
-      text: 'Tab1',
-    },
-  ],
-};
-
-return (
-  <PluginPage pageNav={pageNav}>
-    {your page content here}
-  </PluginPage>
-);
-```
-
-#### Using `PluginPage` in a backwards-compatible way
-
-If you want to maintain backwards-compatibility with older versions of Grafana, one way is to implement a `PluginPage` wrapper. If `PluginPage` is available and the `topnav` feature is enabled then use the real `PluginPage`, otherwise fallback to whatever each plugin is doing today (including calling `onNavChanged`).
-
-Example:
-
-```tsx
-import { PluginPageProps, PluginPage as RealPluginPage, config } from '@grafana/runtime';
-
-export const PluginPage = RealPluginPage && config.featureToggles.topnav ? RealPluginPage : PluginPageFallback;
-
-function PluginPageFallback(props: PluginPageProps) {
-  return props.children;
-}
-```
-
-There’s an additional step (and if block) needed to hide/show tabs depending on if `config.features.topnav` is `true`. These changes will need to be made in the `useNavModel.ts` file in your plugin:
-
-```tsx
-// useNavModel.ts
-
-import { config } from '@grafana/runtime';
-
-...
-
-export function useNavModel({ meta, rootPath, onNavChanged }: Args) {
-const { pathname, search } = useLocation();
-useEffect(() => {
-  if (config.featureToggles.topnav) {
-    return;
-  }
-}, [config]);
-
-...
-```
-
-### Forwarded HTTP headers in grafana-plugin-sdk-go
-
-It's recommended to use the `<request>.GetHTTPHeader` or `<request>.GetHTTPHeaders` methods when retrieving forwarded HTTP headers. See [Forward OAuth identity for the logged-in user]({{< relref "add-authentication-for-data-source-plugins.md#forward-oauth-identity-for-the-logged-in-user" >}}), [Forward cookies for the logged-in user
-]({{< relref "add-authentication-for-data-source-plugins.md#forward-cookies-for-the-logged-in-user" >}}) or [Forward user header for the logged-in user]({{< relref "add-authentication-for-data-source-plugins.md#forward-user-header-for-the-logged-in-user" >}}) for example usages.
-
-#### Technical details
-
-The grafana-plugin-sdk-go [v0.147.0](https://github.com/grafana/grafana-plugin-sdk-go/releases/tag/v0.147.0) introduces a new interface [ForwardHTTPHeaders](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go@v0.147.0/backend#ForwardHTTPHeaders) that `QueryDataRequest`, `CheckHealthRequest` and `CallResourceRequest` implements.
-
-Newly introduced forwarded HTTP headers in Grafana v9.4.0 are `X-Grafana-User`, `X-Panel-Id`, `X-Dashboard-Uid`, `X-Datasource-Uid` and `X-Grafana-Org-Id`. Internally these are prefixed with `http_` and sent as `http_<HTTP header name>` in [CheckHealthRequest.Headers](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go@v0.147.0/backend#CheckHealthRequest) and [QueryDataRequest.Headers](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go@v0.147.0/backend#QueryDataRequest). By using the [ForwardHTTPHeaders](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go@v0.147.0/backend#ForwardHTTPHeaders) methods you're guaranteed to be able to operate on HTTP headers without using the prefix, i.e. `X-Grafana-User`, `X-Panel-Id`, `X-Dashboard-Uid`, `X-Datasource-Uid` and `X-Grafana-Org-Id`.
-
-## From version 9.1.x to 9.2.x
-
-### React and React-dom as peer dependencies
-
-In earlier versions of Grafana packages `react` and `react-dom` were installed during a `yarn install` regardless of a plugins dependencies. In 9.2.0 the `@grafana` packages declare these react packages as peerDependencies and will need adding to a plugins `package.json` file for test commands to continue to run successfully.
-
-Example:
-
-```json
-// before
-"dependencies": {
-  "@grafana/data": "9.1.0",
-  "@grafana/ui": "9.1.0",
-},
-
-// after
-"dependencies": {
-  "@grafana/data": "9.2.0",
-  "@grafana/ui": "9.2.0",
-  "react": "17.0.2",
-  "react-dom": "17.0.2"
-},
-
-```
-
-### NavModelItem requires a valid icon name
-
-The typings of the `NavModelItem` have improved to only allow a valid `IconName` for the icon property. You can find the complete list of valid icons [here](https://github.com/grafana/grafana/blob/v9.2.0-beta1/packages/grafana-data/src/types/icon.ts). The icons specified in the list will work for older versions of Grafana 9.
-
-Example:
-
-```ts
-// before
-const model: NavModelItem = {
-  id: 'settings',
-  text: 'Settings',
-  icon: 'fa fa-cog',
-  url: `${baseUrl}/settings`,
-};
-
-// after
-const model: NavModelItem = {
-  id: 'settings',
-  text: 'Settings',
-  icon: 'cog',
-  url: `${baseUrl}/settings`,
-};
-```
-
-### Additional type availability
-
-FieldProps, ModalProps, and QueryFieldProps are now exposed from `@grafana/ui`. They can be imported in the same way as other types.
-
-Example:
-
-```ts
-import { FieldProps, ModalProps, QueryFieldProps } from '@grafana/ui';
-```
-
-## From version 8.x to 9.x
-
-### 9.0 breaking changes
-
-#### theme.visualization.getColorByName replaces getColorForTheme
-
-`getColorForTheme` was removed, use `theme.visualization.getColorByName` instead
-
-Example:
-
-```ts
-// before
-fillColor: getColorForTheme(panel.sparkline.fillColor, config.theme)
-
-// after
-fillColor: config.theme.visualization.getColorByName(panel.sparkline.fillColor),
-```
-
-#### VizTextDisplayOptions replaces TextDisplayOptions
-
-`TextDisplayOptions` was removed, use `VizTextDisplayOptions` instead
-
-Example:
-
-```ts
-// before
-interface Options {
-...
-text?: TextDisplayOptions;
-...
-}
-
-// after
-interface Options {
-...
-text?: VizTextDisplayOptions;
-...
-}
-```
-
-#### Changes in the internal of `backendSrv.fetch()`
-
-We have changed the internals of `backendSrv.fetch()` to throw an error when the response is an incorrect JSON. Make sure to handle possible errors on the callsite where using `backendSrv.fetch()` (or any other `backendSrv` methods)
-
-```ts
-// PREVIOUSLY: this was returning with an empty object {} - in case the response is an invalid JSON
-return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
-
-// AFTER THIS CHANGE: the following will throw an error - in case the response is an invalid JSON
-return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
-```
-
-#### GrafanaTheme2 and useStyles2 replaces getFormStyles
-
-We have removed the deprecated `getFormStyles` function from [grafana-ui](https://www.npmjs.com/package/@grafana/ui). Use `GrafanaTheme2` and the `useStyles2` hook instead
-
-#### /api/ds/query replaces /api/tsdb/query
-
-We have removed the deprecated `/api/tsdb/query` metrics endpoint. Use [/api/ds/query]({{< relref "../http_api/data_source/#query-a-data-source" >}}) instead
-
-#### selectOptionInTest has been removed
-
-The `@grafana/ui` package helper function `selectOptionInTest` used in frontend tests has been removed as it caused testing libraries to be bundled in the production code of Grafana. If you were using this helper function in your tests please update your code accordingly:
-
-```ts
-// before
-import { selectOptionInTest } from '@grafana/ui';
-// ...test usage
-await selectOptionInTest(selectEl, 'Option 2');
-
-// after
-import { select } from 'react-select-event';
-// ...test usage
-await select(selectEl, 'Option 2', { container: document.body });
-```
-
-#### Toolkit 9 and webpack
-
-Plugins using custom Webpack configs could potentially break due to the changes between webpack@4 and webpack@5. Please refer to the [official migration guide](https://webpack.js.org/migrate/5/) for assistance.
-
-Webpack 5 does not include polyfills for node.js core modules by default (e.g. `buffer`, `stream`, `os`). This can result in failed builds for plugins. If polyfills are required it is recommended to create a custom webpack config in the root of the plugin repo and add the required fallbacks:
-
-```js
-// webpack.config.js
-
-module.exports.getWebpackConfig = (config, options) => ({
-  ...config,
-  resolve: {
-    ...config.resolve,
-    fallback: {
-      os: require.resolve('os-browserify/browser'),
-      stream: require.resolve('stream-browserify'),
-      timers: require.resolve('timers-browserify'),
-    },
-  },
-});
-```
-
-Please refer to the webpack build error messages or the [official migration guide](https://webpack.js.org/migrate/5/) for assistance with fallbacks.
-
-## From version 8.3.x to 8.4.x
-
-This section explains how to migrate Grafana v8.3.x plugins to the updated plugin system available in Grafana v8.4.x. Depending on your plugin, you need to perform one or more of the following steps.
-
-### Value Mapping Editor has been removed from @grafana-ui library
-
-Removed due to being an internal component.
-
-### Thresholds Editor has been removed from @grafana-ui library
-
-Removed due to being an internal component.
-
-### 8.4 deprecations
-
-#### LocationService replaces getLocationSrv
-
-In a previous release, we migrated to use a new routing system and introduced a new service for managing locations, navigation, and related information. In this release, we are making that new service the primary service.
-
-**Example:** Import the service.
-
-```ts
-// before
-import { getLocationSrv } from '@grafana/runtime';
-
-// after
-import { locationService } from '@grafana/runtime';
-```
-
-**Example:** Navigate to a path and add a new record in the navigation history so that you can navigate back to the previous one.
-
-```ts
-// before
-getLocationSrv.update({
-  path: '/route-to-navigate-to',
-  replace: false,
-});
-
-// after
-locationService.push('/route-to-navigate-to');
-```
-
-**Example:** Navigate to a path and replace the current record in the navigation history.
-
-```ts
-// before
-getLocationSrv.update({
-  path: '/route-to-navigate-to',
-  replace: true,
-});
-
-// after
-locationService.replace('/route-to-navigate-to');
-```
-
-**Example:** Update the search or query parameter for the current route and add a new record in the navigation history so that you can navigate back to the previous one.
-
-```ts
-// How to navigate to a new path
-// before
-getLocationSrv.update({
-  query: {
-    value: 1,
-  },
-  partial: true,
-  replace: false,
-});
-
-// after
-locationService.partial({ value: 1 });
-```
-
-**Example:** Update the search or query parameter for the current route and add replacing it in the navigation history.
-
-```ts
-// before
-getLocationSrv.update({
-  query: {
-    'var-variable': 1,
-  },
-  partial: true,
-  replace: true,
-});
-
-// after
-locationService.partial({ 'var-variable': 1 }, true);
-```
-
-## From version 7.x.x to 8.x.x
-
-This section explains how to migrate Grafana v7.x.x plugins to the updated plugin system available in Grafana v8.x.x. Depending on your plugin, you need to perform one or more of the following steps. We have documented the breaking changes in Grafana v8.x.x and the steps you need to take to upgrade your plugin.
-
-### Backend plugin v1 support has been dropped
-
-Use the new [plugin sdk](https://github.com/grafana/grafana-plugin-sdk-go) to run your backend plugin running in Grafana 8.
-
-#### 1. Add dependency on grafana-plugin-sdk-go
-
-Add a dependency on the `https://github.com/grafana/grafana-plugin-sdk-go`. We recommend using [go modules](https://go.dev/blog/using-go-modules) to manage your dependencies.
-
-#### 2. Update the way you bootstrap your plugin
-
-Update your `main` package to bootstrap via the new plugin sdk.
-
-```go
-// before
-package main
-
-import (
-  "github.com/grafana/grafana_plugin_model/go/datasource"
-  hclog "github.com/hashicorp/go-hclog"
-  plugin "github.com/hashicorp/go-plugin"
-
-  "github.com/myorgid/datasource/pkg/plugin"
-)
-
-func main() {
-  pluginLogger.Debug("Running GRPC server")
-
-  ds, err := NewSampleDatasource(pluginLogger);
-  if err != nil {
-    pluginLogger.Error("Unable to create plugin");
-  }
-
-  plugin.Serve(&plugin.ServeConfig{
-    HandshakeConfig: plugin.HandshakeConfig{
-			ProtocolVersion:  1,
-			MagicCookieKey:   "grafana_plugin_type",
-			MagicCookieValue: "datasource",
-		},
-    Plugins: map[string]plugin.Plugin{
-			"myorgid-datasource": &datasource.DatasourcePluginImpl{Plugin: ds},
-    },
-    GRPCServer: plugin.DefaultGRPCServer,
-  })
-}
-
-// after
-package main
-
-import (
-  "os"
-
-  "github.com/grafana/grafana-plugin-sdk-go/backend/log"
-  "github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-
-  "github.com/myorgid/datasource/pkg/plugin"
-)
-
-func main() {
-  log.DefaultLogger.Debug("Running GRPC server")
-
-  if err := datasource.Manage("myorgid-datasource", NewSampleDatasource, datasource.ManageOpts{}); err != nil {
-				log.DefaultLogger.Error(err.Error())
-				os.Exit(1)
-		}
-}
-```
-
-#### 3. Update the plugin package
-
-Update your `plugin` package to use the new plugin sdk.
-
-```go
-// before
-package plugin
-
-import (
-  "context"
-
-  "github.com/grafana/grafana_plugin_model/go/datasource"
-  "github.com/hashicorp/go-hclog"
-)
-
-func NewSampleDatasource(pluginLogger hclog.Logger) (*SampleDatasource, error) {
-	return &SampleDatasource{
-		logger: pluginLogger,
-	}, nil
-}
-
-type SampleDatasource struct{
-  logger hclog.Logger
-}
-
-func (d *SampleDatasource) Query(ctx context.Context, tsdbReq *datasource.DatasourceRequest) (*datasource.DatasourceResponse, error) {
-  d.logger.Info("QueryData called", "request", req)
-  // logic for querying your datasource.
-}
-
-// after
-package plugin
-
-import (
-  "context"
-
-  "github.com/grafana/grafana-plugin-sdk-go/backend"
-  "github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-  "github.com/grafana/grafana-plugin-sdk-go/backend/log"
-  "github.com/grafana/grafana-plugin-sdk-go/data"
-)
-
-func NewSampleDatasource(_ backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-	return &SampleDatasource{}, nil
-}
-
-type SampleDatasource struct{}
-
-
-func (d *SampleDatasource) Dispose() {
-	// Clean up datasource instance resources.
-}
-
-func (d *SampleDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-  log.DefaultLogger.Info("QueryData called", "request", req)
-  // logic for querying your datasource.
-}
-
-func (d *SampleDatasource) CheckHealth(_ context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-  log.DefaultLogger.Info("CheckHealth called", "request", req)
-  // The main use case for these health checks is the test button on the
-  // datasource configuration page which allows users to verify that
-  // a datasource is working as expected.
-}
-```
-
-### Sign and load backend plugins
-
-We strongly recommend that you not allow unsigned plugins in your Grafana installation. By allowing unsigned plugins, we cannot guarantee the authenticity of the plugin, which could compromise the security of your Grafana installation.
-
-To sign your plugin, see [Sign a plugin](https://grafana.com/docs/grafana/latest/developers/plugins/sign-a-plugin/#sign-a-plugin).
-
-You can still run and develop an unsigned plugin by running your Grafana instance in [development mode](https://grafana.com/docs/grafana/latest/administration/configuration/#app_mode). Alternatively, you can use the [allow_loading_unsigned_plugins]({{< relref "../../setup-grafana/configure-grafana/#allow_loading_unsigned_plugins" >}}) configuration setting.
-
-### Update react-hook-form from v6 to v7
-
-We have upgraded react-hook-form from version 6 to version 7. To make your forms compatible with version 7, refer to the [react-hook-form-migration-guide](https://react-hook-form.com/migrate-v6-to-v7/).
-
-### Update the plugin.json
-
-The property that defines which Grafana version your plugin supports has been renamed and now it is a range instead of a specific version.
-
-```json
-// before
-{
-"dependencies": {
-    "grafanaVersion": "7.5.x",
-    "plugins": []
-  }
-}
-
-// after
-{
-  "dependencies": {
-    "grafanaDependency": ">=8.0.0",
-    "plugins": []
-  }
-}
-```
-
-### Update imports to match emotion 11
-
-Grafana uses Emotion library to manage frontend styling. We have updated the Emotion package and this can affect your frontend plugin if you have custom styling. You only need to update the import statements to get it working in Grafana 8.
-
-```ts
-// before
-import { cx, css } from 'emotion';
-
-// after
-import { cx, css } from '@emotion/css';
-```
-
-### Update needed for app plugins using dashboards
-
-To make side navigation work properly - app plugins targeting Grafana `8.+` and integrating into the side menu via [addToNav]({{< relref "metadata/#properties-4" >}}) property need to adjust their `plugin.json` and all dashboard json files to have a matching `uid`.
-
-**`plugin.json`**
-
-```json "linenos=inline,hl_lines=7,linenostart=1"
-{
-  "id": "plugin-id",
-  // ...
-  "includes": [
-    {
-      "type": "dashboard",
-      "name": "(Team) Situation Overview",
-      "path": "dashboards/example-dashboard.json",
-      "addToNav": true,
-      "defaultNav": false,
-      "uid": "l3KqBxCMz"
-    }
-  ]
-  // ...
-}
-```
-
-**`dashboards/example-dashboard.json`**
-
-```json
-{
-  // ...
-  "title": "Example Dashboard",
-  "uid": "l3KqBxCMz",
-  "version": 1
-  // ...
-}
-```
-
-### 8.0 deprecations
-
-#### Grafana theme v1
-
-In Grafana 8 we have introduced a new improved version of our theming system. The previous version of the theming system is still available but is deprecated and will be removed in the next major version of Grafana.
-
-You can find more detailed information on how to apply the v2 theme [here](https://github.com/grafana/grafana/blob/main/contribute/style-guides/themes.md#theming-grafana).
-
-**How to style a functional component**
-
-The `useStyles` hook is the preferred way to access the theme when styling. It provides basic memoization and access to the theme object.
-
-```ts
-// before
-import React, { ReactElement } from 'react';
-import css from 'emotion';
-import { GrafanaTheme } from '@grafana/data';
-import { useStyles } from '@grafana/ui';
-
-function Component(): ReactElement | null {
-  const styles = useStyles(getStyles);
-}
-
-const getStyles = (theme: GrafanaTheme) => ({
-  myStyle: css`
-    background: ${theme.colors.bodyBg};
-    display: flex;
-  `,
-});
-
-// after
-import React, { ReactElement } from 'react';
-import { css } from '@emotion/css';
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-function Component(): ReactElement | null {
-  const theme = useStyles2(getStyles);
-}
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  myStyle: css`
-    background: ${theme.colors.background.canvas};
-    display: flex;
-  `,
-});
-```
-
-**How to use the theme in a functional component**
-
-```ts
-// before
-import React, { ReactElement } from 'react';
-import { useTheme } from '@grafana/ui';
-
-function Component(): ReactElement | null {
-  const theme = useTheme();
-}
-
-// after
-import React, { ReactElement } from 'react';
-import { useTheme2 } from '@grafana/ui';
-
-function Component(): ReactElement | null {
-  const theme = useTheme2();
-  // Your component has access to the theme variables now
-}
-```
-
-**How to use the theme in a class component**
-
-```ts
-// before
-import React from 'react';
-import { Themeable, withTheme } from '@grafana/ui';
-
-type Props = {} & Themeable;
-
-class Component extends React.Component<Props> {
-  render() {
-    const { theme } = this.props;
-    // Your component has access to the theme variables now
-  }
-}
-
-export default withTheme(Component);
-
-// after
-import React from 'react';
-import { Themeable2, withTheme2 } from '@grafana/ui';
-
-type Props = {} & Themeable2;
-
-class Component extends React.Component<Props> {
-  render() {
-    const { theme } = this.props;
-    // Your component has access to the theme variables now
-  }
-}
-
-export default withTheme2(Component);
-```
-
-**Gradually migrating components**
-
-If you need to use both the v1 and v2 themes due to using migrated and non-migrated components in the same context, use the `v1` property on the `v2` theme as described in the following example.
-
-```ts
-function Component(): ReactElement | null {
-  const theme = useTheme2();
-  return (
-    <NonMigrated theme={theme.v1}>
-      <Migrated theme={theme] />
-    </NonMigrate>
-  );
-};
-```
-
-## From version 6.2.x to 7.4.0
-
-### Legend components
-
-The Legend components have been refactored and introduced the following changes within the `@grafana/ui` package.
-
-```ts
-// before
-import { LegendItem, LegendOptions, GraphLegend } from '@grafana/ui';
-
-// after
-import { VizLegendItem, VizLegendOptions, VizLegend } from '@grafana/ui';
-```
-
-- `LegendPlacement` has been updated from `'under' | 'right' | 'over'` to `'bottom' | 'right'` so you can not place the legend above the visualization anymore.
-- The `isVisible` in the `LegendItem` has been renamed to `disabled` in `VizLegendItem`.
-
-## From version 6.5.x to 7.3.0
-
-### getColorForTheme changes
-
-The `getColorForTheme` function arguments have changed from `(color: ColorDefinition, theme?: GrafanaThemeType)` to `(color: string, theme: GrafanaTheme)`.
-
-```ts
-// before
-const color: ColorDefinition = {
-  hue: 'green';
-  name: 'dark-green';
-  variants: {
-    light: '#19730E'
-    dark: '#37872D'
-  };
-}
-const themeType: GrafanaThemeType = 'dark';
-const themeColor = getColorForTheme(color, themeType);
-
-// after
-const color = 'green';
-const theme: GrafanaTheme = useTheme();
-const themeColor = getColorForTheme(color, theme);
-
-```
-
-## From version 6.x.x to 7.0.0
-
-### What's new in Grafana 7.0?
-
-Grafana 7.0 introduced a whole new plugin platform based on React. The new platform supersedes the previous Angular-based plugin platform.
-
-Plugins built using Angular still work for the foreseeable future, but we encourage new plugin authors to develop with the new platform.
-
-#### New data format
-
-Along with the move to React, the new plugin platform introduced a new internal data format called [data frames](data-frames.md).
-
-Previously, data source plugins could send data either as time series or tables. With data frames, data sources can send any data in a table-like structure. This gives you more flexibility to visualize your data in Grafana.
-
-#### Improved TypeScript support
-
-While the previous Angular-based plugin SDK did support TypeScript, for the React platform, we’ve greatly improved the support. All our APIs are now TypeScript, which might require existing code to update to the new stricter type definitions. Grafana 7.0 also introduced several new APIs for plugin developers that take advantage of many of the new features in Grafana 7.0.
-
-#### Grafana Toolkit
-
-With Grafana 7.0, we released a new tool for making it easier to develop plugins. Before, you’d use Gulp, Grunt, or similar tools to generate the minified assets. Grafana Toolkit takes care of building and testing your plugin without complicated configuration files.
-
-For more information, refer to [@grafana/toolkit](https://www.npmjs.com/package/@grafana/toolkit).
-
-#### Field options
-
-Grafana 7.0 introduced the concept of _field options_, a new way of configuring your data before it gets visualized. Since this was not available in previous versions, any plugin that enables field-based configuration will not work in previous versions of Grafana.
-
-For plugins prior to Grafana 7.0, all options are considered _Display options_. The tab for field configuration isn't available.
-
-#### Backend plugins
-
-While backend plugins were available as an experimental feature in previous versions of Grafana, the support has been greatly improved for Grafana 7. Backend plugins for Grafana 7.0 are backwards-compatible and will continue to work. However, the old backend plugin system has been deprecated, and we recommend that you use the new SDK for backend plugins.
-
-Since Grafana 7.0 introduced signing of backend plugins, community plugins won’t load by default if they’re unsigned.
-
-### Migrate a plugin from Angular to React
-
-If you’re looking to migrate a plugin to the new plugin platform, then we recommend that you release it under a new major version. Consider keeping a release branch for the previous version to be able to roll out patch releases for versions prior to Grafana 7.
-
-While there's no 1-to-1 migration path from an Angular plugin to the new React platform, from early adopters, we’ve learned that one of the easiest ways to migrate is to:
-
-1. Create a new branch called `migrate-to-react`.
-1. Start from scratch with one of the templates provided by Grafana Toolkit.
-1. Move the existing code into the new plugin incrementally, one component at a time.
-
-#### Migrate a panel plugin
-
-Prior to Grafana 7.0, you would export a MetricsPanelCtrl from module.ts.
-
-**src/module.ts**
-
-```ts
-import { MetricsPanelCtrl } from 'grafana/app/plugins/sdk';
-
-class MyPanelCtrl extends MetricsPanelCtrl {
-  // ...
-}
-
-export { MyPanelCtrl as PanelCtrl };
-```
-
-Starting with 7.0, plugins now export a PanelPlugin from module.ts where MyPanel is a React component containing the props from PanelProps.
-
-**src/module.ts**
-
-```ts
-import { PanelPlugin } from '@grafana/data';
-
-export const plugin = new PanelPlugin<MyOptions>(MyPanel);
-```
-
-**src/MyPanel.tsx**
-
-```ts
-import { PanelProps } from '@grafana/data';
-
-interface Props extends PanelProps<SimpleOptions> {}
-
-export function MyPanel({ options, data, width, height }: Props) {
-  // ...
-}
-```
-
-#### Migrate a data source plugin
-
-While all plugins are different, we'd like to share a migration process that has worked for some of our users.
-
-1. Define your configuration model and `ConfigEditor`. For many plugins, the configuration editor is the simplest component so it's a good candidate to start with.
-1. Implement the `testDatasource()` method on the class that extends `DataSourceApi` using the settings in your configuration model to make sure you can successfully configure and access the external API.
-1. Implement the `query()` method. At this point, you can hard-code your query, because we haven’t yet implemented the query editor. The `query()` method supports both the new data frame response and the old TimeSeries response, so don’t worry about converting to the new format just yet.
-1. Implement the `QueryEditor`. How much work this requires depends on how complex your query model is.
-
-By now, you should be able to release your new version.
-
-To fully migrate to the new plugin platform, convert the time series response to a data frame response.
-
-#### Migrate to data frames
-
-Before 7.0, data source and panel plugins exchanged data using either time series or tables. Starting with 7.0, plugins use the new data frame format to pass data from data sources to panels.
-
-Grafana 7.0 is backward compatible with the old data format used in previous versions. Panels and data sources using the old format will still work with plugins using the new data frame format.
-
-The `DataQueryResponse` returned by the `query` method can be either a [LegacyResponseData](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/datasource.ts#L419) or a [DataFrame](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/dataFrame.ts#L200).
-
-The [toDataFrame()](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/dataframe/processDataFrame.ts#L309) function converts a legacy response, such as `TimeSeries` or `Table`, to a `DataFrame`. Use it to gradually move your code to the new format.
-
-```ts
-import { toDataFrame } from '@grafana/data';
-```
-
-```ts
-async query(options: DataQueryRequest<MyQuery>): Promise<DataQueryResponse> {
-  return {
-    data: options.targets.map(query => {
-      const timeSeries: TimeSeries = await doLegacyRequest(query);
-      return toDataFrame(timeSeries);
-    }
-  };
-}
-```
-
-### Troubleshoot plugin migration
-
-As of Grafana 7.0, backend plugins can now be cryptographically signed to verify their origin. By default, Grafana ignores unsigned plugins. For more information, refer to [Allow unsigned plugins]({{< relref "../../administration/plugin-management/#allow-unsigned-plugins" >}}).
diff --git a/docs/sources/developers/plugins/migration-guide/_index.md b/docs/sources/developers/plugins/migration-guide/_index.md
new file mode 100644
index 00000000000..ba9e7e944f0
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/_index.md
@@ -0,0 +1,41 @@
+---
+aliases:
+  - ../../plugins/developing/migration-guide
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migration guides
+---
+
+<script>
+(function () {
+  // Previously all the migration docs were on a single page, and the different sections could be linked using URL hashes.
+  var anchorRedirects = {
+    "migrate-a-plugin-from-angular-to-react": "./angular-react/",
+    "from-version-62x-to-740": "./v6.x-v7.x#from-version-62x-to-740",
+    "from-version-65x-to-730": "./v6.x-v7.x#from-version-65x-to-730",
+    "from-version-6xx-to-700": "./v6.x-v7.x/",
+    "migrate-to-data-frames": "./v6.x-v7.x/",
+    "troubleshoot-plugin-migration": "./v6.x-v7.x/",
+    "from-version-7xx-to-8xx": "./v7.x-v8.x/",
+    "from-version-83x-to-84x": "./v8.3.x-8.4.x/",
+    "from-version-8x-to-9x": "./v8.x-v9.x/",
+    "from-version-91x-to-92x": "./v9.1.x-v9.2.x/",
+    "from-version-93x-to-94x": "./v9.3.x-9.4.x/",
+  };
+  var hash = window.location.hash.substring(1);
+  var redirectTo = anchorRedirects[hash];
+  if (redirectTo) {
+    window.location.replace(redirectTo);
+  }
+})();
+</script>
+
+# Plugin migration guides
+
+The following guides help you identify the steps required to update a plugin following changes between versions of Grafana.
+
+{{< section menuTitle="true">}}
diff --git a/docs/sources/developers/plugins/migration-guide/angular-react/_index.md b/docs/sources/developers/plugins/migration-guide/angular-react/_index.md
new file mode 100644
index 00000000000..4260bbbcaac
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/angular-react/_index.md
@@ -0,0 +1,73 @@
+---
+description: Guide for migrating plugins from AngularJS to React
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migrating plugins from AngularJS to React
+menutitle: Angular to React
+weight: 1000
+---
+
+# Migrate a plugin from AngularJS to React
+
+If you’re looking to migrate a plugin to the new plugin platform, then we recommend that you release it under a new major version. Consider keeping a release branch for the previous version to be able to roll out patch releases for versions prior to Grafana 7.
+
+While there's no 1-to-1 migration path from an Angular plugin to the new React platform, from early adopters, we’ve learned that one of the easiest ways to migrate is to:
+
+1. Create a new branch called `migrate-to-react`.
+1. Start from scratch with one of the templates provided by Grafana Toolkit.
+1. Move the existing code into the new plugin incrementally, one component at a time.
+
+## Migrate a panel plugin
+
+Prior to Grafana 7.0, you would export a MetricsPanelCtrl from module.ts.
+
+**src/module.ts**
+
+```ts
+import { MetricsPanelCtrl } from 'grafana/app/plugins/sdk';
+
+class MyPanelCtrl extends MetricsPanelCtrl {
+  // ...
+}
+
+export { MyPanelCtrl as PanelCtrl };
+```
+
+Starting with 7.0, plugins now export a PanelPlugin from module.ts where MyPanel is a React component containing the props from PanelProps.
+
+**src/module.ts**
+
+```ts
+import { PanelPlugin } from '@grafana/data';
+
+export const plugin = new PanelPlugin<MyOptions>(MyPanel);
+```
+
+**src/MyPanel.tsx**
+
+```ts
+import { PanelProps } from '@grafana/data';
+
+interface Props extends PanelProps<SimpleOptions> {}
+
+export function MyPanel({ options, data, width, height }: Props) {
+  // ...
+}
+```
+
+## Migrate a data source plugin
+
+While all plugins are different, we'd like to share a migration process that has worked for some of our users.
+
+1. Define your configuration model and `ConfigEditor`. For many plugins, the configuration editor is the simplest component so it's a good candidate to start with.
+1. Implement the `testDatasource()` method on the class that extends `DataSourceApi` using the settings in your configuration model to make sure you can successfully configure and access the external API.
+1. Implement the `query()` method. At this point, you can hard-code your query, because we haven’t yet implemented the query editor. The `query()` method supports both the new data frame response and the old TimeSeries response, so don’t worry about converting to the new format just yet.
+1. Implement the `QueryEditor`. How much work this requires depends on how complex your query model is.
+
+By now, you should be able to release your new version.
+
+To fully migrate to the new plugin platform, convert the time series response to a data frame response.
diff --git a/docs/sources/developers/plugins/migration-guide/v6.x-v7.x/_index.md b/docs/sources/developers/plugins/migration-guide/v6.x-v7.x/_index.md
new file mode 100644
index 00000000000..d3007f2c441
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/v6.x-v7.x/_index.md
@@ -0,0 +1,120 @@
+---
+description: Guide for migrating plugins from Grafana v6.x to v7.x
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migrating plugins from Grafana version 6.x to 7.x
+menutitle: v6.x to v7.x
+weight: 2500
+---
+
+# Migrating plugins from Grafana version 6.x to 7.0
+
+## What's new in Grafana 7.0?
+
+Grafana 7.0 introduced a whole new plugin platform based on React. The new platform supersedes the previous Angular-based plugin platform.
+
+Plugins built using Angular still work for the foreseeable future, but we encourage new plugin authors to develop with the new platform.
+
+### New data format
+
+Along with the move to React, the new plugin platform introduced a new internal data format called [data frames](data-frames.md).
+
+Previously, data source plugins could send data either as time series or tables. With data frames, data sources can send any data in a table-like structure. This gives you more flexibility to visualize your data in Grafana.
+
+### Improved TypeScript support
+
+While the previous Angular-based plugin SDK did support TypeScript, for the React platform, we’ve greatly improved the support. All our APIs are now TypeScript, which might require existing code to update to the new stricter type definitions. Grafana 7.0 also introduced several new APIs for plugin developers that take advantage of many of the new features in Grafana 7.0.
+
+### Grafana Toolkit
+
+With Grafana 7.0, we released a new tool for making it easier to develop plugins. Before, you’d use Gulp, Grunt, or similar tools to generate the minified assets. Grafana Toolkit takes care of building and testing your plugin without complicated configuration files.
+
+For more information, refer to [@grafana/toolkit](https://www.npmjs.com/package/@grafana/toolkit).
+
+### Field options
+
+Grafana 7.0 introduced the concept of _field options_, a new way of configuring your data before it gets visualized. Since this was not available in previous versions, any plugin that enables field-based configuration will not work in previous versions of Grafana.
+
+For plugins prior to Grafana 7.0, all options are considered _Display options_. The tab for field configuration isn't available.
+
+### Backend plugins
+
+While backend plugins were available as an experimental feature in previous versions of Grafana, the support has been greatly improved for Grafana 7. Backend plugins for Grafana 7.0 are backwards-compatible and will continue to work. However, the old backend plugin system has been deprecated, and we recommend that you use the new SDK for backend plugins.
+
+Since Grafana 7.0 introduced signing of backend plugins, community plugins won’t load by default if they’re unsigned.
+
+### Migrate to data frames
+
+Before 7.0, data source and panel plugins exchanged data using either time series or tables. Starting with 7.0, plugins use the new data frame format to pass data from data sources to panels.
+
+Grafana 7.0 is backward compatible with the old data format used in previous versions. Panels and data sources using the old format will still work with plugins using the new data frame format.
+
+The `DataQueryResponse` returned by the `query` method can be either a [LegacyResponseData](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/datasource.ts#L419) or a [DataFrame](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/dataFrame.ts#L200).
+
+The [toDataFrame()](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/dataframe/processDataFrame.ts#L309) function converts a legacy response, such as `TimeSeries` or `Table`, to a `DataFrame`. Use it to gradually move your code to the new format.
+
+```ts
+import { toDataFrame } from '@grafana/data';
+```
+
+```ts
+async query(options: DataQueryRequest<MyQuery>): Promise<DataQueryResponse> {
+  return {
+    data: options.targets.map(query => {
+      const timeSeries: TimeSeries = await doLegacyRequest(query);
+      return toDataFrame(timeSeries);
+    }
+  };
+}
+```
+
+## Troubleshoot plugin migration
+
+As of Grafana 7.0, backend plugins can now be cryptographically signed to verify their origin. By default, Grafana ignores unsigned plugins. For more information, refer to [Allow unsigned plugins]({{< relref "../../../../administration/plugin-management/#allow-unsigned-plugins" >}}).
+
+## From version 6.5.x to 7.3.0
+
+### getColorForTheme changes
+
+The `getColorForTheme` function arguments have changed from `(color: ColorDefinition, theme?: GrafanaThemeType)` to `(color: string, theme: GrafanaTheme)`.
+
+```ts
+// before
+const color: ColorDefinition = {
+  hue: 'green';
+  name: 'dark-green';
+  variants: {
+    light: '#19730E'
+    dark: '#37872D'
+  };
+}
+const themeType: GrafanaThemeType = 'dark';
+const themeColor = getColorForTheme(color, themeType);
+
+// after
+const color = 'green';
+const theme: GrafanaTheme = useTheme();
+const themeColor = getColorForTheme(color, theme);
+
+```
+
+## From 6.2.x to v7.4.x
+
+### Legend components
+
+The Legend components have been refactored and introduced the following changes within the `@grafana/ui` package.
+
+```ts
+// before
+import { LegendItem, LegendOptions, GraphLegend } from '@grafana/ui';
+
+// after
+import { VizLegendItem, VizLegendOptions, VizLegend } from '@grafana/ui';
+```
+
+- `LegendPlacement` has been updated from `'under' | 'right' | 'over'` to `'bottom' | 'right'` so you can not place the legend above the visualization anymore.
+- The `isVisible` in the `LegendItem` has been renamed to `disabled` in `VizLegendItem`.
diff --git a/docs/sources/developers/plugins/migration-guide/v7.x-v8.x/_index.md b/docs/sources/developers/plugins/migration-guide/v7.x-v8.x/_index.md
new file mode 100644
index 00000000000..7ea3a77c7a7
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/v7.x-v8.x/_index.md
@@ -0,0 +1,349 @@
+---
+description: Guide for migrating plugins from Grafana v7.x to v8.x
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migrating plugins from Grafana version 7.x to 8.x
+menutitle: v7.x to v8.x
+weight: 2400
+---
+
+# Migrating plugins from Grafana version 7.x.x to 8.x.x
+
+This section explains how to migrate Grafana v7.x.x plugins to the updated plugin system available in Grafana v8.x.x. Depending on your plugin, you need to perform one or more of the following steps. We have documented the breaking changes in Grafana v8.x.x and the steps you need to take to upgrade your plugin.
+
+## Backend plugin v1 support has been dropped
+
+Use the new [plugin sdk](https://github.com/grafana/grafana-plugin-sdk-go) to run your backend plugin running in Grafana 8.
+
+### 1. Add dependency on grafana-plugin-sdk-go
+
+Add a dependency on the `https://github.com/grafana/grafana-plugin-sdk-go`. We recommend using [go modules](https://go.dev/blog/using-go-modules) to manage your dependencies.
+
+### 2. Update the way you bootstrap your plugin
+
+Update your `main` package to bootstrap via the new plugin sdk.
+
+```go
+// before
+package main
+
+import (
+  "github.com/grafana/grafana_plugin_model/go/datasource"
+  hclog "github.com/hashicorp/go-hclog"
+  plugin "github.com/hashicorp/go-plugin"
+
+  "github.com/myorgid/datasource/pkg/plugin"
+)
+
+func main() {
+  pluginLogger.Debug("Running GRPC server")
+
+  ds, err := NewSampleDatasource(pluginLogger);
+  if err != nil {
+    pluginLogger.Error("Unable to create plugin");
+  }
+
+  plugin.Serve(&plugin.ServeConfig{
+    HandshakeConfig: plugin.HandshakeConfig{
+			ProtocolVersion:  1,
+			MagicCookieKey:   "grafana_plugin_type",
+			MagicCookieValue: "datasource",
+		},
+    Plugins: map[string]plugin.Plugin{
+			"myorgid-datasource": &datasource.DatasourcePluginImpl{Plugin: ds},
+    },
+    GRPCServer: plugin.DefaultGRPCServer,
+  })
+}
+
+// after
+package main
+
+import (
+  "os"
+
+  "github.com/grafana/grafana-plugin-sdk-go/backend/log"
+  "github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+
+  "github.com/myorgid/datasource/pkg/plugin"
+)
+
+func main() {
+  log.DefaultLogger.Debug("Running GRPC server")
+
+  if err := datasource.Manage("myorgid-datasource", NewSampleDatasource, datasource.ManageOpts{}); err != nil {
+				log.DefaultLogger.Error(err.Error())
+				os.Exit(1)
+		}
+}
+```
+
+### 3. Update the plugin package
+
+Update your `plugin` package to use the new plugin sdk.
+
+```go
+// before
+package plugin
+
+import (
+  "context"
+
+  "github.com/grafana/grafana_plugin_model/go/datasource"
+  "github.com/hashicorp/go-hclog"
+)
+
+func NewSampleDatasource(pluginLogger hclog.Logger) (*SampleDatasource, error) {
+	return &SampleDatasource{
+		logger: pluginLogger,
+	}, nil
+}
+
+type SampleDatasource struct{
+  logger hclog.Logger
+}
+
+func (d *SampleDatasource) Query(ctx context.Context, tsdbReq *datasource.DatasourceRequest) (*datasource.DatasourceResponse, error) {
+  d.logger.Info("QueryData called", "request", req)
+  // logic for querying your datasource.
+}
+
+// after
+package plugin
+
+import (
+  "context"
+
+  "github.com/grafana/grafana-plugin-sdk-go/backend"
+  "github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+  "github.com/grafana/grafana-plugin-sdk-go/backend/log"
+  "github.com/grafana/grafana-plugin-sdk-go/data"
+)
+
+func NewSampleDatasource(_ backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return &SampleDatasource{}, nil
+}
+
+type SampleDatasource struct{}
+
+
+func (d *SampleDatasource) Dispose() {
+	// Clean up datasource instance resources.
+}
+
+func (d *SampleDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+  log.DefaultLogger.Info("QueryData called", "request", req)
+  // logic for querying your datasource.
+}
+
+func (d *SampleDatasource) CheckHealth(_ context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+  log.DefaultLogger.Info("CheckHealth called", "request", req)
+  // The main use case for these health checks is the test button on the
+  // datasource configuration page which allows users to verify that
+  // a datasource is working as expected.
+}
+```
+
+## Sign and load backend plugins
+
+We strongly recommend that you not allow unsigned plugins in your Grafana installation. By allowing unsigned plugins, we cannot guarantee the authenticity of the plugin, which could compromise the security of your Grafana installation.
+
+To sign your plugin, see [Sign a plugin](https://grafana.com/docs/grafana/latest/developers/plugins/sign-a-plugin/#sign-a-plugin).
+
+You can still run and develop an unsigned plugin by running your Grafana instance in [development mode](https://grafana.com/docs/grafana/latest/administration/configuration/#app_mode). Alternatively, you can use the [allow_loading_unsigned_plugins]({{< relref "../../../../setup-grafana/configure-grafana/#allow_loading_unsigned_plugins" >}}) configuration setting.
+
+## Update react-hook-form from v6 to v7
+
+We have upgraded react-hook-form from version 6 to version 7. To make your forms compatible with version 7, refer to the [react-hook-form-migration-guide](https://react-hook-form.com/migrate-v6-to-v7/).
+
+## Update the plugin.json
+
+The property that defines which Grafana version your plugin supports has been renamed and now it is a range instead of a specific version.
+
+```json
+// before
+{
+"dependencies": {
+    "grafanaVersion": "7.5.x",
+    "plugins": []
+  }
+}
+
+// after
+{
+  "dependencies": {
+    "grafanaDependency": ">=8.0.0",
+    "plugins": []
+  }
+}
+```
+
+## Update imports to match emotion 11
+
+Grafana uses Emotion library to manage frontend styling. We have updated the Emotion package and this can affect your frontend plugin if you have custom styling. You only need to update the import statements to get it working in Grafana 8.
+
+```ts
+// before
+import { cx, css } from 'emotion';
+
+// after
+import { cx, css } from '@emotion/css';
+```
+
+## Update needed for app plugins using dashboards
+
+To make side navigation work properly - app plugins targeting Grafana `8.+` and integrating into the side menu via [addToNav]({{< relref "../../metadata/#properties-4" >}}) property need to adjust their `plugin.json` and all dashboard json files to have a matching `uid`.
+
+**`plugin.json`**
+
+```json "linenos=inline,hl_lines=7,linenostart=1"
+{
+  "id": "plugin-id",
+  // ...
+  "includes": [
+    {
+      "type": "dashboard",
+      "name": "(Team) Situation Overview",
+      "path": "dashboards/example-dashboard.json",
+      "addToNav": true,
+      "defaultNav": false,
+      "uid": "l3KqBxCMz"
+    }
+  ]
+  // ...
+}
+```
+
+**`dashboards/example-dashboard.json`**
+
+```json
+{
+  // ...
+  "title": "Example Dashboard",
+  "uid": "l3KqBxCMz",
+  "version": 1
+  // ...
+}
+```
+
+## 8.0 deprecations
+
+### Grafana theme v1
+
+In Grafana 8 we have introduced a new improved version of our theming system. The previous version of the theming system is still available but is deprecated and will be removed in the next major version of Grafana.
+
+You can find more detailed information on how to apply the v2 theme [here](https://github.com/grafana/grafana/blob/main/contribute/style-guides/themes.md#theming-grafana).
+
+**How to style a functional component**
+
+The `useStyles` hook is the preferred way to access the theme when styling. It provides basic memoization and access to the theme object.
+
+```ts
+// before
+import React, { ReactElement } from 'react';
+import css from 'emotion';
+import { GrafanaTheme } from '@grafana/data';
+import { useStyles } from '@grafana/ui';
+
+function Component(): ReactElement | null {
+  const styles = useStyles(getStyles);
+}
+
+const getStyles = (theme: GrafanaTheme) => ({
+  myStyle: css`
+    background: ${theme.colors.bodyBg};
+    display: flex;
+  `,
+});
+
+// after
+import React, { ReactElement } from 'react';
+import { css } from '@emotion/css';
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+function Component(): ReactElement | null {
+  const theme = useStyles2(getStyles);
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  myStyle: css`
+    background: ${theme.colors.background.canvas};
+    display: flex;
+  `,
+});
+```
+
+**How to use the theme in a functional component**
+
+```ts
+// before
+import React, { ReactElement } from 'react';
+import { useTheme } from '@grafana/ui';
+
+function Component(): ReactElement | null {
+  const theme = useTheme();
+}
+
+// after
+import React, { ReactElement } from 'react';
+import { useTheme2 } from '@grafana/ui';
+
+function Component(): ReactElement | null {
+  const theme = useTheme2();
+  // Your component has access to the theme variables now
+}
+```
+
+**How to use the theme in a class component**
+
+```ts
+// before
+import React from 'react';
+import { Themeable, withTheme } from '@grafana/ui';
+
+type Props = {} & Themeable;
+
+class Component extends React.Component<Props> {
+  render() {
+    const { theme } = this.props;
+    // Your component has access to the theme variables now
+  }
+}
+
+export default withTheme(Component);
+
+// after
+import React from 'react';
+import { Themeable2, withTheme2 } from '@grafana/ui';
+
+type Props = {} & Themeable2;
+
+class Component extends React.Component<Props> {
+  render() {
+    const { theme } = this.props;
+    // Your component has access to the theme variables now
+  }
+}
+
+export default withTheme2(Component);
+```
+
+**Gradually migrating components**
+
+If you need to use both the v1 and v2 themes due to using migrated and non-migrated components in the same context, use the `v1` property on the `v2` theme as described in the following example.
+
+```ts
+function Component(): ReactElement | null {
+  const theme = useTheme2();
+  return (
+    <NonMigrated theme={theme.v1}>
+      <Migrated theme={theme] />
+    </NonMigrate>
+  );
+};
+```
diff --git a/docs/sources/developers/plugins/migration-guide/v8.3.x-8.4.x/_index.md b/docs/sources/developers/plugins/migration-guide/v8.3.x-8.4.x/_index.md
new file mode 100644
index 00000000000..80338895538
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/v8.3.x-8.4.x/_index.md
@@ -0,0 +1,99 @@
+---
+description: Guide for migrating plugins from Grafana v8.3.x to v8.4.x
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migrating plugins from Grafana version 8.3.x to 8.4.x
+menutitle: v8.3.x to v8.4.x
+weight: 2200
+---
+
+# Migrating plugins from Grafana version 8.3.x to 8.4.x
+
+This section explains how to migrate Grafana v8.3.x plugins to the updated plugin system available in Grafana v8.4.x. Depending on your plugin, you need to perform one or more of the following steps.
+
+## Value Mapping Editor has been removed from @grafana-ui library
+
+Removed due to being an internal component.
+
+## Thresholds Editor has been removed from @grafana-ui library
+
+Removed due to being an internal component.
+
+## 8.4 deprecations
+
+### LocationService replaces getLocationSrv
+
+In a previous release, we migrated to use a new routing system and introduced a new service for managing locations, navigation, and related information. In this release, we are making that new service the primary service.
+
+**Example:** Import the service.
+
+```ts
+// before
+import { getLocationSrv } from '@grafana/runtime';
+
+// after
+import { locationService } from '@grafana/runtime';
+```
+
+**Example:** Navigate to a path and add a new record in the navigation history so that you can navigate back to the previous one.
+
+```ts
+// before
+getLocationSrv.update({
+  path: '/route-to-navigate-to',
+  replace: false,
+});
+
+// after
+locationService.push('/route-to-navigate-to');
+```
+
+**Example:** Navigate to a path and replace the current record in the navigation history.
+
+```ts
+// before
+getLocationSrv.update({
+  path: '/route-to-navigate-to',
+  replace: true,
+});
+
+// after
+locationService.replace('/route-to-navigate-to');
+```
+
+**Example:** Update the search or query parameter for the current route and add a new record in the navigation history so that you can navigate back to the previous one.
+
+```ts
+// How to navigate to a new path
+// before
+getLocationSrv.update({
+  query: {
+    value: 1,
+  },
+  partial: true,
+  replace: false,
+});
+
+// after
+locationService.partial({ value: 1 });
+```
+
+**Example:** Update the search or query parameter for the current route and add replacing it in the navigation history.
+
+```ts
+// before
+getLocationSrv.update({
+  query: {
+    'var-variable': 1,
+  },
+  partial: true,
+  replace: true,
+});
+
+// after
+locationService.partial({ 'var-variable': 1 }, true);
+```
diff --git a/docs/sources/developers/plugins/migration-guide/v8.x-v9.x/_index.md b/docs/sources/developers/plugins/migration-guide/v8.x-v9.x/_index.md
new file mode 100644
index 00000000000..d927f21dcf8
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/v8.x-v9.x/_index.md
@@ -0,0 +1,112 @@
+---
+description: Guide for migrating plugins from Grafana v8.x to v9.x
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migrating plugins from Grafana version 8.x to 9.x
+menutitle: v8.x to v9.x
+weight: 2300
+---
+
+# Migrating plugins from Grafana version 8.x to 9.x
+
+## 9.0 breaking changes
+
+### theme.visualization.getColorByName replaces getColorForTheme
+
+`getColorForTheme` was removed, use `theme.visualization.getColorByName` instead
+
+Example:
+
+```ts
+// before
+fillColor: getColorForTheme(panel.sparkline.fillColor, config.theme)
+
+// after
+fillColor: config.theme.visualization.getColorByName(panel.sparkline.fillColor),
+```
+
+### VizTextDisplayOptions replaces TextDisplayOptions
+
+`TextDisplayOptions` was removed, use `VizTextDisplayOptions` instead
+
+Example:
+
+```ts
+// before
+interface Options {
+...
+text?: TextDisplayOptions;
+...
+}
+
+// after
+interface Options {
+...
+text?: VizTextDisplayOptions;
+...
+}
+```
+
+### Changes in the internal of `backendSrv.fetch()`
+
+We have changed the internals of `backendSrv.fetch()` to throw an error when the response is an incorrect JSON. Make sure to handle possible errors on the callsite where using `backendSrv.fetch()` (or any other `backendSrv` methods)
+
+```ts
+// PREVIOUSLY: this was returning with an empty object {} - in case the response is an invalid JSON
+return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
+
+// AFTER THIS CHANGE: the following will throw an error - in case the response is an invalid JSON
+return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
+```
+
+### GrafanaTheme2 and useStyles2 replaces getFormStyles
+
+We have removed the deprecated `getFormStyles` function from [grafana-ui](https://www.npmjs.com/package/@grafana/ui). Use `GrafanaTheme2` and the `useStyles2` hook instead
+
+### /api/ds/query replaces /api/tsdb/query
+
+We have removed the deprecated `/api/tsdb/query` metrics endpoint. Use [/api/ds/query]({{< relref "../../../http_api/data_source/#query-a-data-source" >}}) instead
+
+### selectOptionInTest has been removed
+
+The `@grafana/ui` package helper function `selectOptionInTest` used in frontend tests has been removed as it caused testing libraries to be bundled in the production code of Grafana. If you were using this helper function in your tests please update your code accordingly:
+
+```ts
+// before
+import { selectOptionInTest } from '@grafana/ui';
+// ...test usage
+await selectOptionInTest(selectEl, 'Option 2');
+
+// after
+import { select } from 'react-select-event';
+// ...test usage
+await select(selectEl, 'Option 2', { container: document.body });
+```
+
+### Toolkit 9 and webpack
+
+Plugins using custom Webpack configs could potentially break due to the changes between webpack@4 and webpack@5. Please refer to the [official migration guide](https://webpack.js.org/migrate/5/) for assistance.
+
+Webpack 5 does not include polyfills for node.js core modules by default (e.g. `buffer`, `stream`, `os`). This can result in failed builds for plugins. If polyfills are required it is recommended to create a custom webpack config in the root of the plugin repo and add the required fallbacks:
+
+```js
+// webpack.config.js
+
+module.exports.getWebpackConfig = (config, options) => ({
+  ...config,
+  resolve: {
+    ...config.resolve,
+    fallback: {
+      os: require.resolve('os-browserify/browser'),
+      stream: require.resolve('stream-browserify'),
+      timers: require.resolve('timers-browserify'),
+    },
+  },
+});
+```
+
+Please refer to the webpack build error messages or the [official migration guide](https://webpack.js.org/migrate/5/) for assistance with fallbacks.
diff --git a/docs/sources/developers/plugins/migration-guide/v9.1.x-v9.2.x/_index.md b/docs/sources/developers/plugins/migration-guide/v9.1.x-v9.2.x/_index.md
new file mode 100644
index 00000000000..82cf154ed1a
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/v9.1.x-v9.2.x/_index.md
@@ -0,0 +1,71 @@
+---
+description: Guide for migrating plugins from Grafana v9.1.x to v9.2.x
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migrating plugins from Grafana 9.1.x to 9.2.x
+menutitle: v9.1.x to v9.2.x
+weight: 2100
+---
+
+# Migrating plugins from Grafana version 9.1.x to 9.2.x
+
+## React and React-dom as peer dependencies
+
+In earlier versions of Grafana packages `react` and `react-dom` were installed during a `yarn install` regardless of a plugins dependencies. In 9.2.0 the `@grafana` packages declare these react packages as peerDependencies and will need adding to a plugins `package.json` file for test commands to continue to run successfully.
+
+Example:
+
+```json
+// before
+"dependencies": {
+  "@grafana/data": "9.1.0",
+  "@grafana/ui": "9.1.0",
+},
+
+// after
+"dependencies": {
+  "@grafana/data": "9.2.0",
+  "@grafana/ui": "9.2.0",
+  "react": "17.0.2",
+  "react-dom": "17.0.2"
+},
+
+```
+
+## NavModelItem requires a valid icon name
+
+The typings of the `NavModelItem` have improved to only allow a valid `IconName` for the icon property. You can find the complete list of valid icons [here](https://github.com/grafana/grafana/blob/v9.2.0-beta1/packages/grafana-data/src/types/icon.ts). The icons specified in the list will work for older versions of Grafana 9.
+
+Example:
+
+```ts
+// before
+const model: NavModelItem = {
+  id: 'settings',
+  text: 'Settings',
+  icon: 'fa fa-cog',
+  url: `${baseUrl}/settings`,
+};
+
+// after
+const model: NavModelItem = {
+  id: 'settings',
+  text: 'Settings',
+  icon: 'cog',
+  url: `${baseUrl}/settings`,
+};
+```
+
+## Additional type availability
+
+FieldProps, ModalProps, and QueryFieldProps are now exposed from `@grafana/ui`. They can be imported in the same way as other types.
+
+Example:
+
+```ts
+import { FieldProps, ModalProps, QueryFieldProps } from '@grafana/ui';
+```
diff --git a/docs/sources/developers/plugins/migration-guide/v9.3.x-9.4.x/_index.md b/docs/sources/developers/plugins/migration-guide/v9.3.x-9.4.x/_index.md
new file mode 100644
index 00000000000..e8237d52c80
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/v9.3.x-9.4.x/_index.md
@@ -0,0 +1,148 @@
+---
+description: Guide for migrating plugins from Grafana v9.3.x to v9.4.x
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migrating plugins from Grafana 9.3.x to 9.4.x
+menutitle: v9.3.x to v9.4.x
+weight: 2000
+---
+
+# Migrating plugins from Grafana 9.3.x to 9.4.x
+
+## Supporting new navigation layout
+
+First, enable the `topnav` feature flag in `custom.ini` to check how your plugin renders in the new navigation layout:
+
+```ini
+[feature_toggles]
+enable = topnav
+```
+
+### Migrate from `onNavChanged`
+
+If your plugin uses the `onNavChanged` callback to inform Grafana of its nav model & sub pages, you should see that this results in duplicated navigation elements. If you disable `topnav` it should look just as before.
+
+When `topnav` is enabled we need to update the plugin to take advantage of the new `PluginPage` component and not call `onNavChanged`. `onNavChanged` is now deprecated.
+
+### Switch to `PluginPage` component
+
+Grafana now exposes a new `PluginPage` component from `@grafana/runtime` that hooks into the new navigation and page layouts and supports the old page layouts when the `topnav` feature is disabled. This new component will also handle rendering the section navigation. The section navigation can include other core sections and other plugins. To control what pages are displayed in the section navigation for a specific plugin, Grafana will use the pages added in `plugin.json` that have `addToNav` set to `true`.
+
+This component is very easy to use. Simply wrap it around your page content:
+
+```tsx
+import { PluginPage } from '@grafana/runtime';
+
+...
+
+return (
+  <PluginPage>
+    {your page content here}
+  </PluginPage>
+);
+```
+
+Grafana will look at the URL to know what plugin and page should be active in the section nav, so this only works for pages you have specified in `plugin.json`. `PluginPage` will then render a page header based on the page name specified in `plugin.json`.
+
+### Using `PluginPage` for pages not defined in `plugin.json`
+
+The `PluginPage` component also exposes a `pageNav` property that is a `NavModelItem`. This `pageNav` property is useful for pages that are not defined in `plugin.json` (e.g. individual item pages). The `text` and `description` you specify in the `pageNav` model will be used to populate the breadcrumbs and page header.
+
+Example:
+
+```tsx
+const pageNav = {
+  text: 'Write errors cortex-prod-04',
+  description: 'Incident timeline and details'
+};
+
+return (
+  <PluginPage pageNav={pageNav}>
+    {your page content here}
+  </PluginPage>
+);
+```
+
+The way the active page is matched in the breadcrumbs and section nav relies on the page routes being hierarchical. If you have a list page and an item page, the item page needs to be a subroute of the list page and the list page url needs to be specified in your `plugin.json`. For example, you might have a list of users at `/users`. This means that the item page for a specific user needs to be at `/users/:id`. This may require some refactoring of your routes.
+
+### Using `PluginPage` with tabs
+
+You can also create a further layer of hierarchy by specifying `children` in the `pageNav` model to created a page with tabbed navigation.
+
+Example:
+
+```tsx
+const pageNav = {
+  text: 'My page',
+  description: 'Incident timeline and details',
+  url: '/a/myorgid-pluginname-app',
+  children: [
+    {
+      url: '/a/myorgid-pluginname-app/tab1',
+      text: 'Tab1',
+      active: true,
+    },
+    {
+      url: '/a/myorgid-pluginname-app/tab2',
+      text: 'Tab1',
+    },
+  ],
+};
+
+return (
+  <PluginPage pageNav={pageNav}>
+    {your page content here}
+  </PluginPage>
+);
+```
+
+### Using `PluginPage` in a backwards-compatible way
+
+If you want to maintain backwards-compatibility with older versions of Grafana, one way is to implement a `PluginPage` wrapper. If `PluginPage` is available and the `topnav` feature is enabled then use the real `PluginPage`, otherwise fallback to whatever each plugin is doing today (including calling `onNavChanged`).
+
+Example:
+
+```tsx
+import { PluginPageProps, PluginPage as RealPluginPage, config } from '@grafana/runtime';
+
+export const PluginPage = RealPluginPage && config.featureToggles.topnav ? RealPluginPage : PluginPageFallback;
+
+function PluginPageFallback(props: PluginPageProps) {
+  return props.children;
+}
+```
+
+There’s an additional step (and if block) needed to hide/show tabs depending on if `config.features.topnav` is `true`. These changes will need to be made in the `useNavModel.ts` file in your plugin:
+
+```tsx
+// useNavModel.ts
+
+import { config } from '@grafana/runtime';
+
+...
+
+export function useNavModel({ meta, rootPath, onNavChanged }: Args) {
+const { pathname, search } = useLocation();
+useEffect(() => {
+  if (config.featureToggles.topnav) {
+    return;
+  }
+}, [config]);
+
+...
+```
+
+## Forwarded HTTP headers in grafana-plugin-sdk-go
+
+It's recommended to use the `<request>.GetHTTPHeader` or `<request>.GetHTTPHeaders` methods when retrieving forwarded HTTP headers. See [Forward OAuth identity for the logged-in user]({{< relref "add-authentication-for-data-source-plugins.md#forward-oauth-identity-for-the-logged-in-user" >}}), [Forward cookies for the logged-in user
+]({{< relref "add-authentication-for-data-source-plugins.md#forward-cookies-for-the-logged-in-user" >}}) or [Forward user header for the logged-in user]({{< relref "add-authentication-for-data-source-plugins.md#forward-user-header-for-the-logged-in-user" >}}) for example usages.
+
+### Technical details
+
+The grafana-plugin-sdk-go [v0.147.0](https://github.com/grafana/grafana-plugin-sdk-go/releases/tag/v0.147.0) introduces a new interface [ForwardHTTPHeaders](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go@v0.147.0/backend#ForwardHTTPHeaders) that `QueryDataRequest`, `CheckHealthRequest` and `CallResourceRequest` implements.
+
+Newly introduced forwarded HTTP headers in Grafana v9.4.0 are `X-Grafana-User`, `X-Panel-Id`, `X-Dashboard-Uid`, `X-Datasource-Uid` and `X-Grafana-Org-Id`. Internally these are prefixed with `http_` and sent as `http_<HTTP header name>` in [CheckHealthRequest.Headers](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go@v0.147.0/backend#CheckHealthRequest) and [QueryDataRequest.Headers](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go@v0.147.0/backend#QueryDataRequest). By using the [ForwardHTTPHeaders](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go@v0.147.0/backend#ForwardHTTPHeaders) methods you're guaranteed to be able to operate on HTTP headers without using the prefix, i.e. `X-Grafana-User`, `X-Panel-Id`, `X-Dashboard-Uid`, `X-Datasource-Uid` and `X-Grafana-Org-Id`.
diff --git a/docs/sources/whatsnew/whats-new-in-v9-4.md b/docs/sources/whatsnew/whats-new-in-v9-4.md
index feea36c9224..365e0bf2326 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-4.md
@@ -40,7 +40,7 @@ The new navigation is gradually rolling out to all users on Grafana Cloud. If yo
 
 > **Note:** The Grafana documentation has not yet been updated to reflect changes to the navigation.
 
-> **Note:** Plugin developers should refer to [the migration guide]({{< relref "../developers/plugins/migration-guide.md#supporting-new-navigation-layout" >}}) to upgrade their plugins to work seamlessly with the new navigation layout.
+> **Note:** Plugin developers should refer to [the migration guide]({{< relref "../developers/plugins/migration-guide/v9.3.x-9.4.x/_index.md#supporting-new-navigation-layout" >}}) to upgrade their plugins to work seamlessly with the new navigation layout.
 
 {{< figure src="/media/docs/grafana/navigation-9-4.png" max-width="750px" caption="Grafana new navigation" >}}
 

From f58a63b2df6f3da84378493201c4a62e17cca26f Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Mon, 17 Apr 2023 12:02:47 +0200
Subject: [PATCH 171/729] Chore: Use time mocks in queryhistory to speed up
 tests (#66644)

* use time mocks in queryhistory to speed up tests

* remove comments
---
 pkg/services/queryhistory/database.go         |  5 ++---
 pkg/services/queryhistory/queryhistory.go     |  3 +++
 .../queryhistory_delete_stale_test.go         |  9 ++++----
 .../queryhistory/queryhistory_migrate_test.go | 13 ++++++------
 .../queryhistory/queryhistory_search_test.go  | 21 +++++++++----------
 .../queryhistory/queryhistory_test.go         |  9 +++++---
 6 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/pkg/services/queryhistory/database.go b/pkg/services/queryhistory/database.go
index 4162118bab9..512f74fbd1b 100644
--- a/pkg/services/queryhistory/database.go
+++ b/pkg/services/queryhistory/database.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -19,7 +18,7 @@ func (s QueryHistoryService) createQuery(ctx context.Context, user *user.SignedI
 		Queries:       cmd.Queries,
 		DatasourceUID: cmd.DatasourceUID,
 		CreatedBy:     user.UserID,
-		CreatedAt:     time.Now().Unix(),
+		CreatedAt:     s.now().Unix(),
 		Comment:       "",
 	}
 
@@ -50,7 +49,7 @@ func (s QueryHistoryService) searchQueries(ctx context.Context, user *user.Signe
 	var allQueries []interface{}
 
 	if query.To <= 0 {
-		query.To = time.Now().Unix()
+		query.To = s.now().Unix()
 	}
 
 	if query.Page <= 0 {
diff --git a/pkg/services/queryhistory/queryhistory.go b/pkg/services/queryhistory/queryhistory.go
index 0bd3a3fe228..2f963a262f4 100644
--- a/pkg/services/queryhistory/queryhistory.go
+++ b/pkg/services/queryhistory/queryhistory.go
@@ -2,6 +2,7 @@ package queryhistory
 
 import (
 	"context"
+	"time"
 
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/infra/db"
@@ -16,6 +17,7 @@ func ProvideService(cfg *setting.Cfg, sqlStore db.DB, routeRegister routing.Rout
 		Cfg:           cfg,
 		RouteRegister: routeRegister,
 		log:           log.New("query-history"),
+		now:           time.Now,
 	}
 
 	// Register routes only when query history is enabled
@@ -43,6 +45,7 @@ type QueryHistoryService struct {
 	Cfg           *setting.Cfg
 	RouteRegister routing.RouteRegister
 	log           log.Logger
+	now           func() time.Time
 }
 
 func (s QueryHistoryService) CreateQueryInQueryHistory(ctx context.Context, user *user.SignedInUser, cmd CreateQueryInQueryHistoryCommand) (QueryHistoryDTO, error) {
diff --git a/pkg/services/queryhistory/queryhistory_delete_stale_test.go b/pkg/services/queryhistory/queryhistory_delete_stale_test.go
index 84ed7839572..354be9cdc62 100644
--- a/pkg/services/queryhistory/queryhistory_delete_stale_test.go
+++ b/pkg/services/queryhistory/queryhistory_delete_stale_test.go
@@ -3,7 +3,6 @@ package queryhistory
 import (
 	"context"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -16,7 +15,7 @@ func TestIntegrationDeleteStaleQueryFromQueryHistory(t *testing.T) {
 	}
 	testScenarioWithQueryInQueryHistory(t, "Stale query history can be deleted",
 		func(t *testing.T, sc scenarioContext) {
-			olderThan := time.Now().Unix() + 60
+			olderThan := sc.service.now().Unix() + 60
 			rowsDeleted, err := sc.service.DeleteStaleQueriesInQueryHistory(context.Background(), olderThan)
 			require.NoError(t, err)
 			require.Equal(t, 1, rowsDeleted)
@@ -28,7 +27,7 @@ func TestIntegrationDeleteStaleQueryFromQueryHistory(t *testing.T) {
 			resp := sc.service.starHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
 
-			olderThan := time.Now().Unix() + 60
+			olderThan := sc.service.now().Unix() + 60
 			rowsDeleted, err := sc.service.DeleteStaleQueriesInQueryHistory(context.Background(), olderThan)
 			require.NoError(t, err)
 			require.Equal(t, 0, rowsDeleted)
@@ -36,7 +35,7 @@ func TestIntegrationDeleteStaleQueryFromQueryHistory(t *testing.T) {
 
 	testScenarioWithQueryInQueryHistory(t, "Not stale query history is not deleted",
 		func(t *testing.T, sc scenarioContext) {
-			olderThan := time.Now().Unix() - 60
+			olderThan := sc.service.now().Unix() - 60
 			rowsDeleted, err := sc.service.DeleteStaleQueriesInQueryHistory(context.Background(), olderThan)
 			require.NoError(t, err)
 			require.Equal(t, 0, rowsDeleted)
@@ -45,7 +44,7 @@ func TestIntegrationDeleteStaleQueryFromQueryHistory(t *testing.T) {
 	// In this scenario we have 2 starred queries and 1 not starred query
 	testScenarioWithMultipleQueriesInQueryHistory(t, "Stale starred query history can not be deleted",
 		func(t *testing.T, sc scenarioContext) {
-			olderThan := time.Now().Unix() + 60
+			olderThan := sc.service.now().Unix() + 60
 			rowsDeleted, err := sc.service.DeleteStaleQueriesInQueryHistory(context.Background(), olderThan)
 			require.NoError(t, err)
 			require.Equal(t, 1, rowsDeleted)
diff --git a/pkg/services/queryhistory/queryhistory_migrate_test.go b/pkg/services/queryhistory/queryhistory_migrate_test.go
index a8f5667eb25..5c2d393a5ba 100644
--- a/pkg/services/queryhistory/queryhistory_migrate_test.go
+++ b/pkg/services/queryhistory/queryhistory_migrate_test.go
@@ -3,7 +3,6 @@ package queryhistory
 import (
 	"encoding/json"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -25,7 +24,7 @@ func TestIntegrationMigrateQueriesToQueryHistory(t *testing.T) {
 						}),
 						Comment:   "",
 						Starred:   false,
-						CreatedAt: time.Now().Unix(),
+						CreatedAt: sc.service.now().Unix(),
 					},
 				},
 			}
@@ -51,7 +50,7 @@ func TestIntegrationMigrateQueriesToQueryHistory(t *testing.T) {
 						}),
 						Comment:   "",
 						Starred:   false,
-						CreatedAt: time.Now().Unix(),
+						CreatedAt: sc.service.now().Unix(),
 					},
 					{
 						DatasourceUID: "NCzh67i",
@@ -60,7 +59,7 @@ func TestIntegrationMigrateQueriesToQueryHistory(t *testing.T) {
 						}),
 						Comment:   "",
 						Starred:   false,
-						CreatedAt: time.Now().Unix() - int64(100),
+						CreatedAt: sc.service.now().Unix() - int64(100),
 					},
 					{
 						DatasourceUID: "ABch68f",
@@ -69,7 +68,7 @@ func TestIntegrationMigrateQueriesToQueryHistory(t *testing.T) {
 						}),
 						Comment:   "",
 						Starred:   false,
-						CreatedAt: time.Now().Unix() - int64(1000),
+						CreatedAt: sc.service.now().Unix() - int64(1000),
 					},
 				},
 			}
@@ -95,7 +94,7 @@ func TestIntegrationMigrateQueriesToQueryHistory(t *testing.T) {
 						}),
 						Comment:   "",
 						Starred:   true,
-						CreatedAt: time.Now().Unix(),
+						CreatedAt: sc.service.now().Unix(),
 					},
 					{
 						DatasourceUID: "NCzh67i",
@@ -104,7 +103,7 @@ func TestIntegrationMigrateQueriesToQueryHistory(t *testing.T) {
 						}),
 						Comment:   "",
 						Starred:   false,
-						CreatedAt: time.Now().Unix() - int64(100),
+						CreatedAt: sc.service.now().Unix() - int64(100),
 					},
 				},
 			}
diff --git a/pkg/services/queryhistory/queryhistory_search_test.go b/pkg/services/queryhistory/queryhistory_search_test.go
index 24ca3f67f11..ccce6d8a5f6 100644
--- a/pkg/services/queryhistory/queryhistory_search_test.go
+++ b/pkg/services/queryhistory/queryhistory_search_test.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"strconv"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -123,7 +122,7 @@ func TestIntegrationGetQueriesFromQueryHistory(t *testing.T) {
 
 	testScenarioWithMultipleQueriesInQueryHistory(t, "When users tries to get queries using from filter, it should return correct queries",
 		func(t *testing.T, sc scenarioContext) {
-			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(time.Now().UnixMilli()-60*1000, 10))
+			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(sc.service.now().UnixMilli()-60*1000, 10))
 			resp := sc.service.searchHandler(sc.reqContext)
 			var response QueryHistorySearchResponse
 			err := json.Unmarshal(resp.Body(), &response)
@@ -145,7 +144,7 @@ func TestIntegrationGetQueriesFromQueryHistory(t *testing.T) {
 
 	testScenarioWithMultipleQueriesInQueryHistory(t, "When users tries to get queries using from filter, it should return no queries",
 		func(t *testing.T, sc scenarioContext) {
-			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(time.Now().UnixMilli()+60*1000, 10))
+			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(sc.service.now().UnixMilli()+60*1000, 10))
 			resp := sc.service.searchHandler(sc.reqContext)
 			var response QueryHistorySearchResponse
 			err := json.Unmarshal(resp.Body(), &response)
@@ -167,7 +166,7 @@ func TestIntegrationGetQueriesFromQueryHistory(t *testing.T) {
 
 	testScenarioWithMultipleQueriesInQueryHistory(t, "When users tries to get queries using to filter, it should return correct queries",
 		func(t *testing.T, sc scenarioContext) {
-			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(time.Now().UnixMilli(), 10))
+			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(sc.service.now().UnixMilli(), 10))
 			resp := sc.service.searchHandler(sc.reqContext)
 			var response QueryHistorySearchResponse
 			err := json.Unmarshal(resp.Body(), &response)
@@ -189,7 +188,7 @@ func TestIntegrationGetQueriesFromQueryHistory(t *testing.T) {
 
 	testScenarioWithMultipleQueriesInQueryHistory(t, "When users tries to get queries using to filter, it should return no queries",
 		func(t *testing.T, sc scenarioContext) {
-			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(time.Now().UnixMilli()-60*1000, 10))
+			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(sc.service.now().UnixMilli()-60*1000, 10))
 			resp := sc.service.searchHandler(sc.reqContext)
 			var response QueryHistorySearchResponse
 			err := json.Unmarshal(resp.Body(), &response)
@@ -211,8 +210,8 @@ func TestIntegrationGetQueriesFromQueryHistory(t *testing.T) {
 
 	testScenarioWithMultipleQueriesInQueryHistory(t, "When users tries to get queries using from and to filter, it should return correct queries",
 		func(t *testing.T, sc scenarioContext) {
-			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(time.Now().UnixMilli(), 10))
-			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(time.Now().UnixMilli()-60*1000, 10))
+			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(sc.service.now().UnixMilli(), 10))
+			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(sc.service.now().UnixMilli()-60*1000, 10))
 			resp := sc.service.searchHandler(sc.reqContext)
 			var response QueryHistorySearchResponse
 			err := json.Unmarshal(resp.Body(), &response)
@@ -223,8 +222,8 @@ func TestIntegrationGetQueriesFromQueryHistory(t *testing.T) {
 
 	testScenarioWithMultipleQueriesInQueryHistory(t, "When users tries to get queries using from and to filter with other filters, it should return correct queries",
 		func(t *testing.T, sc scenarioContext) {
-			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(time.Now().UnixMilli(), 10))
-			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(time.Now().UnixMilli()-60*1000, 10))
+			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(sc.service.now().UnixMilli(), 10))
+			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(sc.service.now().UnixMilli()-60*1000, 10))
 			sc.reqContext.Req.Form.Add("datasourceUid", testDsUID1)
 			sc.reqContext.Req.Form.Add("searchString", "2")
 			resp := sc.service.searchHandler(sc.reqContext)
@@ -251,8 +250,8 @@ func TestIntegrationGetQueriesFromQueryHistory(t *testing.T) {
 
 	testScenarioWithMultipleQueriesInQueryHistory(t, "When users tries to get queries using from and to filter with other filters, it should return no query",
 		func(t *testing.T, sc scenarioContext) {
-			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(time.Now().UnixMilli()-60, 10))
-			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(time.Now().UnixMilli()+60, 10))
+			sc.reqContext.Req.Form.Add("to", strconv.FormatInt(sc.service.now().UnixMilli()-60, 10))
+			sc.reqContext.Req.Form.Add("from", strconv.FormatInt(sc.service.now().UnixMilli()+60, 10))
 			sc.reqContext.Req.Form.Add("datasourceUid", testDsUID1)
 			sc.reqContext.Req.Form.Add("searchString", "2")
 			resp := sc.service.searchHandler(sc.reqContext)
diff --git a/pkg/services/queryhistory/queryhistory_test.go b/pkg/services/queryhistory/queryhistory_test.go
index d112d6cdcb4..37265114ade 100644
--- a/pkg/services/queryhistory/queryhistory_test.go
+++ b/pkg/services/queryhistory/queryhistory_test.go
@@ -54,6 +54,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 		service := QueryHistoryService{
 			Cfg:   setting.NewCfg(),
 			store: sqlStore,
+			now:   time.Now,
 		}
 		service.Cfg.QueryHistoryEnabled = true
 		quotaService := quotatest.New(false, nil)
@@ -69,7 +70,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 			Email:      "signed.in.user@test.com",
 			OrgID:      testOrgID,
 			OrgRole:    org.RoleViewer,
-			LastSeenAt: time.Now(),
+			LastSeenAt: service.now(),
 		}
 
 		_, err = usrSvc.Create(context.Background(), &user.CreateUserCommand{
@@ -113,6 +114,8 @@ func testScenarioWithMultipleQueriesInQueryHistory(t *testing.T, desc string, fn
 	t.Helper()
 
 	testScenario(t, desc, func(t *testing.T, sc scenarioContext) {
+		start := time.Now().Add(-3 * time.Second)
+		sc.service.now = func() time.Time { return start }
 		command1 := CreateQueryInQueryHistoryCommand{
 			DatasourceUID: testDsUID1,
 			Queries: simplejson.NewFromAny(map[string]interface{}{
@@ -129,7 +132,7 @@ func testScenarioWithMultipleQueriesInQueryHistory(t *testing.T, desc string, fn
 		sc.reqContext.Req.Body = mockRequestBody(cmd)
 		sc.service.patchCommentHandler(sc.reqContext)
 
-		time.Sleep(1 * time.Second)
+		sc.service.now = func() time.Time { return start.Add(time.Second) }
 		command2 := CreateQueryInQueryHistoryCommand{
 			DatasourceUID: testDsUID1,
 			Queries: simplejson.NewFromAny(map[string]interface{}{
@@ -142,7 +145,7 @@ func testScenarioWithMultipleQueriesInQueryHistory(t *testing.T, desc string, fn
 		sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result2.Result.UID})
 		sc.service.starHandler(sc.reqContext)
 
-		time.Sleep(1 * time.Second)
+		sc.service.now = func() time.Time { return start.Add(2 * time.Second) }
 		command3 := CreateQueryInQueryHistoryCommand{
 			DatasourceUID: testDsUID2,
 			Queries: simplejson.NewFromAny(map[string]interface{}{

From 9b15c79e1949b6344b7a74ca4b5433ea8909cedc Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:08:24 +0100
Subject: [PATCH 172/729] NestedFolders: Virtual tree view (#66102)

* poc for virtual tree

* remove my silly debug stuff

* wip

* style table

* improve styles

* fix

* start to split tree into seperate component

* cleanup unused function

* split into more components

* more better

* secondary color type column

* simple tests for DashboardsTree

* restore styles from dodgy rebase

* remove my weirdo text component thing
---
 .../BrowseDashboardsPage.tsx                  |  33 +++-
 .../components/BrowseView.tsx                 | 137 ++++++---------
 .../components/DashboardsTree.test.tsx        |  52 ++++++
 .../components/DashboardsTree.tsx             | 165 ++++++++++++++++++
 .../browse-dashboards/components/Indent.tsx   |  20 +++
 .../browse-dashboards/components/NameCell.tsx |  70 ++++++++
 .../browse-dashboards/components/TypeCell.tsx |  45 +++++
 .../fixtures/dashboardsTreeItem.fixture.ts    |  40 +++++
 .../app/features/browse-dashboards/types.ts   |  15 ++
 .../search/page/components/SearchView.tsx     |   2 +-
 10 files changed, 495 insertions(+), 84 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
 create mode 100644 public/app/features/browse-dashboards/components/DashboardsTree.tsx
 create mode 100644 public/app/features/browse-dashboards/components/Indent.tsx
 create mode 100644 public/app/features/browse-dashboards/components/NameCell.tsx
 create mode 100644 public/app/features/browse-dashboards/components/TypeCell.tsx
 create mode 100644 public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
 create mode 100644 public/app/features/browse-dashboards/types.ts

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index a3d3cf83352..eccb6dac905 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -1,6 +1,9 @@
+import { css } from '@emotion/css';
 import React, { memo, useMemo } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { locationSearchToObject } from '@grafana/runtime';
+import { useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
@@ -22,6 +25,7 @@ interface Props extends GrafanaRouteComponentProps<BrowseDashboardsPageRoutePara
 // New Browse/Manage/Search Dashboards views for nested folders
 
 const BrowseDashboardsPage = memo(({ match, location }: Props) => {
+  const styles = useStyles2(getStyles);
   const { uid: folderUID } = match.params;
 
   const searchState = useMemo(() => {
@@ -33,16 +37,37 @@ const BrowseDashboardsPage = memo(({ match, location }: Props) => {
 
   return (
     <Page navId="dashboards/browse" pageNav={navModel}>
-      <Page.Contents>
+      <Page.Contents className={styles.pageContents}>
         <BrowseActions />
 
-        {folderDTO && <pre>{JSON.stringify(folderDTO, null, 2)}</pre>}
-
-        {searchState.query ? <SearchView searchState={searchState} /> : <BrowseView folderUID={folderUID} />}
+        <div className={styles.subView}>
+          <AutoSizer>
+            {({ width, height }) =>
+              searchState.query ? (
+                <SearchView searchState={searchState} />
+              ) : (
+                <BrowseView width={width} height={height} folderUID={folderUID} />
+              )
+            }
+          </AutoSizer>
+        </div>
       </Page.Contents>
     </Page>
   );
 });
 
+const getStyles = () => ({
+  pageContents: css({
+    display: 'grid',
+    gridTemplateRows: 'auto 1fr',
+    height: '100%',
+  }),
+
+  // AutoSizer needs an element to measure the full height available
+  subView: css({
+    height: '100%',
+  }),
+});
+
 BrowseDashboardsPage.displayName = 'BrowseDashboardsPage';
 export default BrowseDashboardsPage;
diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
index 9ea9b49b30f..c8b03b53350 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -1,101 +1,80 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Icon, IconButton, Link } from '@grafana/ui';
 import { getFolderChildren } from 'app/features/search/service/folders';
 import { DashboardViewItem } from 'app/features/search/types';
 
-type NestedData = Record<string, DashboardViewItem[] | undefined>;
+import { DashboardsTreeItem } from '../types';
+
+import { DashboardsTree } from './DashboardsTree';
 
 interface BrowseViewProps {
+  height: number;
+  width: number;
   folderUID: string | undefined;
 }
 
-export function BrowseView({ folderUID }: BrowseViewProps) {
-  const [nestedData, setNestedData] = useState<NestedData>({});
+export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
+  const [openFolders, setOpenFolders] = useState<Record<string, boolean>>({ [folderUID ?? '$$root']: true });
 
-  // Note: entire implementation of this component must be replaced.
-  // This is just to show proof of concept for fetching and showing the data
+  // Rather than storing an actual tree structure (requiring traversing the tree to update children), instead
+  // we keep track of children for each UID and then later combine them in the format required to display them
+  const [childrenByUID, setChildrenByUID] = useState<Record<string, DashboardViewItem[] | undefined>>({});
+
+  async function loadChildrenForUID(uid: string | undefined) {
+    const folderKey = uid ?? '$$root';
+
+    const childItems = await getFolderChildren(uid, undefined, true);
+    setChildrenByUID((v) => ({ ...v, [folderKey]: childItems }));
+  }
 
   useEffect(() => {
-    const folderKey = folderUID ?? '$$root';
-
-    getFolderChildren(folderUID, undefined, true).then((children) => {
-      setNestedData((v) => ({ ...v, [folderKey]: children }));
-    });
+    loadChildrenForUID(folderUID);
   }, [folderUID]);
 
-  const items = nestedData[folderUID ?? '$$root'] ?? [];
-
-  const handleNodeClick = useCallback(
-    (uid: string) => {
-      if (nestedData[uid]) {
-        setNestedData((v) => ({ ...v, [uid]: undefined }));
-        return;
-      }
-
-      getFolderChildren(uid).then((children) => {
-        setNestedData((v) => ({ ...v, [uid]: children }));
-      });
-    },
-    [nestedData]
+  const flatTree = useMemo(
+    () => createFlatTree(folderUID, childrenByUID, openFolders),
+    [folderUID, childrenByUID, openFolders]
   );
 
-  return (
-    <div>
-      <p>Browse view</p>
+  const handleFolderClick = useCallback((uid: string, folderIsOpen: boolean) => {
+    if (folderIsOpen) {
+      loadChildrenForUID(uid);
+    }
 
-      <ul style={{ marginLeft: 16 }}>
-        {items.map((item) => {
-          return (
-            <li key={item.uid}>
-              <BrowseItem item={item} nestedData={nestedData} onFolderClick={handleNodeClick} />
-            </li>
-          );
-        })}
-      </ul>
-    </div>
-  );
+    setOpenFolders((v) => ({ ...v, [uid]: folderIsOpen }));
+  }, []);
+
+  return <DashboardsTree items={flatTree} width={width} height={height} onFolderClick={handleFolderClick} />;
 }
 
-function BrowseItem({
-  item,
-  nestedData,
-  onFolderClick,
-}: {
-  item: DashboardViewItem;
-  nestedData: NestedData;
-  onFolderClick: (uid: string) => void;
-}) {
-  const childItems = nestedData[item.uid];
+// Creates a flat list of items, with nested children indicated by its increasing level
+function createFlatTree(
+  rootFolderUID: string | undefined,
+  childrenByUID: Record<string, DashboardViewItem[] | undefined>,
+  openFolders: Record<string, boolean>,
+  level = 0
+): DashboardsTreeItem[] {
+  function mapItem(item: DashboardViewItem, level: number): DashboardsTreeItem[] {
+    const mappedChildren = createFlatTree(item.uid, childrenByUID, openFolders, level + 1);
 
-  return (
-    <>
-      <div>
-        {item.kind === 'folder' ? (
-          <IconButton onClick={() => onFolderClick(item.uid)} name={childItems ? 'angle-down' : 'angle-right'} />
-        ) : (
-          <span style={{ paddingRight: 20 }} />
-        )}
-        <Icon name={item.kind === 'folder' ? (childItems ? 'folder-open' : 'folder') : 'apps'} />{' '}
-        <Link href={item.kind === 'folder' ? `/nested-dashboards/f/${item.uid}` : `/d/${item.uid}`}>{item.title}</Link>
-      </div>
+    const isOpen = Boolean(openFolders[item.uid]);
+    const emptyFolder = childrenByUID[item.uid]?.length === 0;
+    if (isOpen && emptyFolder) {
+      mappedChildren.push({ isOpen: false, level: level + 1, item: { kind: 'ui-empty-folder' } });
+    }
 
-      {childItems && (
-        <ul style={{ marginLeft: 16 }}>
-          {childItems.length === 0 && (
-            <li>
-              <em>Empty folder</em>
-            </li>
-          )}
-          {childItems.map((childItem) => {
-            return (
-              <li key={childItem.uid}>
-                <BrowseItem item={childItem} nestedData={nestedData} onFolderClick={onFolderClick} />{' '}
-              </li>
-            );
-          })}
-        </ul>
-      )}
-    </>
-  );
+    const thisItem = {
+      item,
+      level,
+      isOpen,
+    };
+
+    return [thisItem, ...mappedChildren];
+  }
+
+  const folderKey = rootFolderUID ?? '$$root';
+  const isOpen = Boolean(openFolders[folderKey]);
+  const items = (isOpen && childrenByUID[folderKey]) || [];
+
+  return items.flatMap((item) => mapItem(item, level));
 }
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
new file mode 100644
index 00000000000..e50d99e06ba
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
@@ -0,0 +1,52 @@
+import { render as rtlRender, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { Router } from 'react-router-dom';
+
+import { locationService } from '@grafana/runtime';
+
+import { wellFormedDashboard, wellFormedEmptyFolder, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
+
+import { DashboardsTree } from './DashboardsTree';
+
+function render(...args: Parameters<typeof rtlRender>) {
+  const [ui, options] = args;
+
+  rtlRender(<Router history={locationService.getHistory()}>{ui}</Router>, options);
+}
+
+describe('browse-dashboards DashboardsTree', () => {
+  const WIDTH = 800;
+  const HEIGHT = 600;
+
+  const folder = wellFormedFolder();
+  const emptyFolderIndicator = wellFormedEmptyFolder();
+  const dashboard = wellFormedDashboard();
+
+  it('renders a dashboard item', () => {
+    render(<DashboardsTree items={[dashboard]} width={WIDTH} height={HEIGHT} onFolderClick={() => {}} />);
+    expect(screen.queryByText(dashboard.item.title)).toBeInTheDocument();
+    expect(screen.queryByText('Dashboard')).toBeInTheDocument();
+  });
+
+  it('renders a folder item', () => {
+    render(<DashboardsTree items={[folder]} width={WIDTH} height={HEIGHT} onFolderClick={() => {}} />);
+    expect(screen.queryByText(folder.item.title)).toBeInTheDocument();
+    expect(screen.queryByText('Folder')).toBeInTheDocument();
+  });
+
+  it('calls onFolderClick when a folder button is clicked', async () => {
+    const handler = jest.fn();
+    render(<DashboardsTree items={[folder]} width={WIDTH} height={HEIGHT} onFolderClick={handler} />);
+    const folderButton = screen.getByLabelText('Collapse folder');
+    await userEvent.click(folderButton);
+
+    expect(handler).toHaveBeenCalledWith(folder.item.uid, false);
+  });
+
+  it('renders empty folder indicators', () => {
+    render(<DashboardsTree items={[emptyFolderIndicator]} width={WIDTH} height={HEIGHT} onFolderClick={() => {}} />);
+    expect(screen.queryByText('Empty folder')).toBeInTheDocument();
+    expect(screen.queryByText(emptyFolderIndicator.item.kind)).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
new file mode 100644
index 00000000000..ed1eb6cbe20
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
@@ -0,0 +1,165 @@
+import { css, cx } from '@emotion/css';
+import React, { useMemo } from 'react';
+import { CellProps, Column, TableInstance, useTable } from 'react-table';
+import { FixedSizeList as List } from 'react-window';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Checkbox, useStyles2 } from '@grafana/ui';
+
+import { DashboardsTreeItem, INDENT_AMOUNT_CSS_VAR } from '../types';
+
+import { NameCell } from './NameCell';
+import { TypeCell } from './TypeCell';
+
+interface DashboardsTreeProps {
+  items: DashboardsTreeItem[];
+  width: number;
+  height: number;
+  onFolderClick: (uid: string, newOpenState: boolean) => void;
+}
+
+type DashboardsTreeColumn = Column<DashboardsTreeItem>;
+
+const HEADER_HEIGHT = 35;
+const ROW_HEIGHT = 35;
+
+export function DashboardsTree({ items, width, height, onFolderClick }: DashboardsTreeProps) {
+  const styles = useStyles2(getStyles);
+
+  const tableColumns = useMemo(() => {
+    const checkboxColumn: DashboardsTreeColumn = {
+      id: 'checkbox',
+      Header: () => <Checkbox value={false} />,
+      Cell: () => <Checkbox value={false} />,
+    };
+
+    const nameColumn: DashboardsTreeColumn = {
+      id: 'name',
+      Header: <span style={{ paddingLeft: 20 }}>Name</span>,
+      Cell: (props: CellProps<DashboardsTreeItem, unknown>) => <NameCell {...props} onFolderClick={onFolderClick} />,
+    };
+
+    const typeColumn: DashboardsTreeColumn = {
+      id: 'type',
+      Header: 'Type',
+      Cell: TypeCell,
+    };
+
+    return [checkboxColumn, nameColumn, typeColumn];
+  }, [onFolderClick]);
+
+  const table = useTable({ columns: tableColumns, data: items });
+  const { getTableProps, getTableBodyProps, headerGroups } = table;
+
+  return (
+    <div {...getTableProps()} className={styles.tableRoot} role="table">
+      {headerGroups.map((headerGroup) => {
+        const { key, ...headerGroupProps } = headerGroup.getHeaderGroupProps({
+          style: { width },
+        });
+
+        return (
+          <div key={key} {...headerGroupProps} className={cx(styles.row, styles.headerRow)}>
+            {headerGroup.headers.map((column) => {
+              const { key, ...headerProps } = column.getHeaderProps();
+
+              return (
+                <div key={key} {...headerProps} role="columnheader" className={styles.cell}>
+                  {column.render('Header')}
+                </div>
+              );
+            })}
+          </div>
+        );
+      })}
+
+      <div {...getTableBodyProps()}>
+        <List
+          height={height - HEADER_HEIGHT}
+          width={width}
+          itemCount={items.length}
+          itemData={table}
+          itemSize={ROW_HEIGHT}
+        >
+          {VirtualListRow}
+        </List>
+      </div>
+    </div>
+  );
+}
+
+interface VirtualListRowProps {
+  index: number;
+  style: React.CSSProperties;
+  data: TableInstance<DashboardsTreeItem>;
+}
+
+function VirtualListRow({ index, style, data: table }: VirtualListRowProps) {
+  const styles = useStyles2(getStyles);
+  const { rows, prepareRow } = table;
+
+  const row = rows[index];
+  prepareRow(row);
+
+  return (
+    <div {...row.getRowProps({ style })} className={cx(styles.row, styles.bodyRow)}>
+      {row.cells.map((cell) => {
+        const { key, ...cellProps } = cell.getCellProps();
+
+        return (
+          <div key={key} {...cellProps} className={styles.cell}>
+            {cell.render('Cell')}
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  const columnSizing = 'auto 2fr 1fr';
+
+  return {
+    tableRoot: css({
+      // The Indented component uses this css variable to indent items to their position
+      // in the tree
+      [INDENT_AMOUNT_CSS_VAR]: theme.spacing(1),
+
+      [theme.breakpoints.up('md')]: {
+        [INDENT_AMOUNT_CSS_VAR]: theme.spacing(3),
+      },
+    }),
+
+    cell: css({
+      padding: theme.spacing(1),
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+    }),
+
+    row: css({
+      display: 'grid',
+      gridTemplateColumns: columnSizing,
+      alignItems: 'center',
+    }),
+
+    headerRow: css({
+      backgroundColor: theme.colors.background.secondary,
+      height: HEADER_HEIGHT,
+    }),
+
+    bodyRow: css({
+      height: ROW_HEIGHT,
+
+      '&:hover': {
+        backgroundColor: theme.colors.emphasize(theme.colors.background.primary, 0.03),
+      },
+    }),
+
+    link: css({
+      '&:hover': {
+        textDecoration: 'underline',
+      },
+    }),
+  };
+};
diff --git a/public/app/features/browse-dashboards/components/Indent.tsx b/public/app/features/browse-dashboards/components/Indent.tsx
new file mode 100644
index 00000000000..d8edb362b6f
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/Indent.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+
+import { useTheme2 } from '@grafana/ui';
+
+import { INDENT_AMOUNT_CSS_VAR } from '../types';
+
+interface IndentProps {
+  children?: React.ReactNode;
+  level: number;
+}
+
+export function Indent({ children, level }: IndentProps) {
+  const theme = useTheme2();
+
+  // DashboardsTree responsively sets the value of INDENT_AMOUNT_CSS_VAR
+  // but we also have a fallback just in case it's not set for some reason...
+  const space = `var(${INDENT_AMOUNT_CSS_VAR}, ${theme.spacing(2)})`;
+
+  return <span style={{ paddingLeft: `calc(${space} * ${level})` }}>{children}</span>;
+}
diff --git a/public/app/features/browse-dashboards/components/NameCell.tsx b/public/app/features/browse-dashboards/components/NameCell.tsx
new file mode 100644
index 00000000000..4765b7042a1
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/NameCell.tsx
@@ -0,0 +1,70 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { CellProps } from 'react-table';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { IconButton, Link, useStyles2 } from '@grafana/ui';
+import { getSvgSize } from '@grafana/ui/src/components/Icon/utils';
+
+import { DashboardsTreeItem } from '../types';
+
+import { Indent } from './Indent';
+
+type NameCellProps = CellProps<DashboardsTreeItem, unknown> & {
+  onFolderClick: (uid: string, newOpenState: boolean) => void;
+};
+
+export function NameCell({ row: { original: data }, onFolderClick }: NameCellProps) {
+  const styles = useStyles2(getStyles);
+  const { item, level, isOpen } = data;
+
+  if (item.kind === 'ui-empty-folder') {
+    return (
+      <>
+        <Indent level={level} />
+        <span className={styles.folderButtonSpacer} />
+        <em>Empty folder</em>
+      </>
+    );
+  }
+
+  const chevronIcon = isOpen ? 'angle-down' : 'angle-right';
+
+  return (
+    <>
+      <Indent level={level} />
+
+      {item.kind === 'folder' ? (
+        <IconButton
+          size="md"
+          onClick={() => onFolderClick(item.uid, !isOpen)}
+          name={chevronIcon}
+          ariaLabel={isOpen ? 'Collapse folder' : 'Expand folder'}
+        />
+      ) : (
+        <span className={styles.folderButtonSpacer} />
+      )}
+
+      <Link
+        href={item.kind === 'folder' ? `/nested-dashboards/f/${item.uid}` : `/d/${item.uid}`}
+        className={styles.link}
+      >
+        {item.title}
+      </Link>
+    </>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    // Should be the same size as the <IconButton /> so Dashboard name is aligned to Folder name siblings
+    folderButtonSpacer: css({
+      paddingLeft: `calc(${getSvgSize('md')}px + ${theme.spacing(0.5)})`,
+    }),
+    link: css({
+      '&:hover': {
+        textDecoration: 'underline',
+      },
+    }),
+  };
+};
diff --git a/public/app/features/browse-dashboards/components/TypeCell.tsx b/public/app/features/browse-dashboards/components/TypeCell.tsx
new file mode 100644
index 00000000000..fa280997f2f
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/TypeCell.tsx
@@ -0,0 +1,45 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { CellProps } from 'react-table';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Icon, useStyles2 } from '@grafana/ui';
+import { getIconForKind } from 'app/features/search/service/utils';
+
+import { DashboardsTreeItem } from '../types';
+
+export function TypeCell({ row: { original: data } }: CellProps<DashboardsTreeItem, unknown>) {
+  const styles = useStyles2(getStyles);
+  const iconName = getIconForKind(data.item.kind);
+
+  switch (data.item.kind) {
+    case 'dashboard':
+      return (
+        <span className={styles.text}>
+          <Icon name={iconName} /> Dashboard
+        </span>
+      );
+    case 'folder':
+      return (
+        <span className={styles.text}>
+          <Icon name={iconName} /> Folder
+        </span>
+      );
+    case 'panel':
+      return (
+        <span className={styles.text}>
+          <Icon name={iconName} /> Panel
+        </span>
+      );
+    default:
+      return null;
+  }
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    text: css({
+      color: theme.colors.text.secondary,
+    }),
+  };
+}
diff --git a/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts b/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
new file mode 100644
index 00000000000..6f3c33f5502
--- /dev/null
+++ b/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
@@ -0,0 +1,40 @@
+import { Chance } from 'chance';
+
+import { DashboardViewItem } from 'app/features/search/types';
+
+import { DashboardsTreeItem } from '../types';
+
+export function wellFormedEmptyFolder(): DashboardsTreeItem {
+  return {
+    item: {
+      kind: 'ui-empty-folder',
+    },
+    level: 0,
+    isOpen: false,
+  };
+}
+
+export function wellFormedDashboard(random = Chance(1)): DashboardsTreeItem<DashboardViewItem> {
+  return {
+    item: {
+      kind: 'dashboard',
+      title: random.sentence({ words: 3 }),
+      uid: random.guid(),
+      tags: [random.word()],
+    },
+    level: 0,
+    isOpen: false,
+  };
+}
+
+export function wellFormedFolder(random = Chance(2)): DashboardsTreeItem<DashboardViewItem> {
+  return {
+    item: {
+      kind: 'folder',
+      title: random.sentence({ words: 3 }),
+      uid: random.guid(),
+    },
+    level: 0,
+    isOpen: true,
+  };
+}
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
new file mode 100644
index 00000000000..7779d4f9c0d
--- /dev/null
+++ b/public/app/features/browse-dashboards/types.ts
@@ -0,0 +1,15 @@
+import { DashboardViewItem as OrigDashboardViewItem } from 'app/features/search/types';
+
+interface UIDashboardViewItem {
+  kind: 'ui-empty-folder';
+}
+
+type DashboardViewItem = OrigDashboardViewItem | UIDashboardViewItem;
+
+export interface DashboardsTreeItem<T extends DashboardViewItem = DashboardViewItem> {
+  item: T;
+  level: number;
+  isOpen: boolean;
+}
+
+export const INDENT_AMOUNT_CSS_VAR = '--dashboards-tree-indentation';
diff --git a/public/app/features/search/page/components/SearchView.tsx b/public/app/features/search/page/components/SearchView.tsx
index b1f65393187..71ea47e1e54 100644
--- a/public/app/features/search/page/components/SearchView.tsx
+++ b/public/app/features/search/page/components/SearchView.tsx
@@ -115,7 +115,7 @@ export const SearchView = ({ showManage, folderDTO, hidePseudoFolders, keyboardE
     }
 
     return (
-      <div style={{ height: '100%', width: '100%' }}>
+      <div style={{ content: 'auto-sizer-wrapper', height: '100%', width: '100%' }}>
         <AutoSizer>
           {({ width, height }) => {
             const props: SearchResultsProps = {

From 90f0b1c6e2756f240f790cf01b28b62cc13786e0 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 17 Apr 2023 11:42:21 +0100
Subject: [PATCH 173/729] Navigation: Redirect to root page when switching
 organization (#66655)

* just redirect to root when switching org

* remove old orgswitcher modal
---
 .../OrganizationSwitcher.tsx                  |  2 +-
 public/app/core/components/OrgSwitcher.tsx    | 68 ------------------
 public/app/core/specs/OrgSwitcher.test.tsx    | 71 -------------------
 3 files changed, 1 insertion(+), 140 deletions(-)
 delete mode 100644 public/app/core/components/OrgSwitcher.tsx
 delete mode 100644 public/app/core/specs/OrgSwitcher.test.tsx

diff --git a/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx
index bcd70326ad7..4398ceb1097 100644
--- a/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx
+++ b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx
@@ -18,7 +18,7 @@ export function OrganizationSwitcher() {
   const onSelectChange = (option: SelectableValue<UserOrg>) => {
     if (option.value) {
       setUserOrganization(option.value.orgId);
-      locationService.partial({ orgId: option.value.orgId }, true);
+      locationService.push(`/?orgId=${option.value.orgId}`);
       // TODO how to reload the current page
       window.location.reload();
     }
diff --git a/public/app/core/components/OrgSwitcher.tsx b/public/app/core/components/OrgSwitcher.tsx
deleted file mode 100644
index 1b89d7b0a14..00000000000
--- a/public/app/core/components/OrgSwitcher.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { css } from '@emotion/css';
-import React, { ReactElement } from 'react';
-import { useAsync } from 'react-use';
-
-import { UserOrgDTO } from '@grafana/data';
-import { Button, CustomScrollbar, Modal } from '@grafana/ui';
-import config from 'app/core/config';
-import { contextSrv } from 'app/core/services/context_srv';
-
-import { api } from '../../features/profile/api';
-
-interface Props {
-  onDismiss: () => void;
-}
-
-export function OrgSwitcher({ onDismiss }: Props): ReactElement {
-  const { value: orgs = [] } = useAsync(() => {
-    return api.loadOrgs();
-  }, []);
-  const currentOrgId = contextSrv.user.orgId;
-  const contentClassName = css({
-    display: 'flex',
-    maxHeight: 'calc(85vh - 42px)',
-  });
-  const setCurrentOrg = async (org: UserOrgDTO) => {
-    await api.setUserOrg(org);
-    window.location.href = `${config.appSubUrl}${config.appSubUrl.endsWith('/') ? '' : '/'}?orgId=${org.orgId}`;
-  };
-
-  return (
-    <Modal
-      title="Switch Organization"
-      icon="arrow-random"
-      onDismiss={onDismiss}
-      isOpen={true}
-      contentClassName={contentClassName}
-    >
-      <CustomScrollbar autoHeightMin="100%">
-        <table className="filter-table form-inline">
-          <thead>
-            <tr>
-              <th>Name</th>
-              <th>Role</th>
-              <th />
-            </tr>
-          </thead>
-          <tbody>
-            {orgs.map((org) => (
-              <tr key={org.orgId}>
-                <td>{org.name}</td>
-                <td>{org.role}</td>
-                <td className="text-right">
-                  {org.orgId === currentOrgId ? (
-                    <Button size="sm">Current</Button>
-                  ) : (
-                    <Button variant="secondary" size="sm" onClick={() => setCurrentOrg(org)}>
-                      Switch to
-                    </Button>
-                  )}
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      </CustomScrollbar>
-    </Modal>
-  );
-}
diff --git a/public/app/core/specs/OrgSwitcher.test.tsx b/public/app/core/specs/OrgSwitcher.test.tsx
deleted file mode 100644
index cb612259ec3..00000000000
--- a/public/app/core/specs/OrgSwitcher.test.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { render, screen, waitFor, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-
-import { api } from '../../features/profile/api';
-import { OrgRole } from '../../types';
-import { OrgSwitcher } from '../components/OrgSwitcher';
-
-jest.mock('@grafana/runtime', () => ({
-  config: {
-    appSubUrl: '/subUrl',
-  },
-}));
-
-jest.mock('app/core/services/context_srv', () => ({
-  contextSrv: {
-    user: { orgId: 1 },
-  },
-}));
-
-describe('OrgSwitcher', () => {
-  const { location } = window;
-  let setUserOrgSpy: jest.SpyInstance;
-
-  beforeEach(async () => {
-    jest.clearAllMocks();
-    const orgs = [
-      { orgId: 1, name: 'Main Org.', role: OrgRole.Admin },
-      { orgId: 2, name: 'Org 2', role: OrgRole.Admin },
-    ];
-    const loadOrgsSpy = jest.spyOn(api, 'loadOrgs').mockResolvedValue(orgs);
-    setUserOrgSpy = jest.spyOn(api, 'setUserOrg').mockResolvedValue(undefined);
-
-    // @ts-ignore
-    delete window.location;
-    window.location = {} as Location;
-
-    render(<OrgSwitcher onDismiss={() => {}} />);
-    await waitFor(() => expect(loadOrgsSpy).toHaveBeenCalledTimes(1));
-  });
-
-  afterEach(() => {
-    window.location = location;
-  });
-
-  describe('when switching org', () => {
-    it('should render correct rows', async () => {
-      expect(screen.getAllByRole('row')).toHaveLength(3); // header + 2 orgs
-      expect(screen.getByRole('row', { name: /main org. admin current/i })).toBeInTheDocument();
-      expect(screen.getByRole('row', { name: /org 2 admin switch to/i })).toBeInTheDocument();
-    });
-
-    it('should switch orgId in call to backend', async () => {
-      const row = screen.getByRole('row', { name: /org 2 admin switch to/i });
-      const switchToButton = within(row).getByText(/switch to/i);
-      await userEvent.click(switchToButton);
-
-      await waitFor(() => expect(setUserOrgSpy).toBeCalledWith({ orgId: 2, name: 'Org 2', role: 'Admin' }));
-    });
-
-    it('should redirect to home page', async () => {
-      expect(window.location.href).toBeUndefined();
-
-      const row = screen.getByRole('row', { name: /org 2 admin switch to/i });
-      const switchToButton = within(row).getByText(/switch to/i);
-      await userEvent.click(switchToButton);
-
-      await waitFor(() => expect(window.location.href).toEqual('/subUrl/?orgId=2'));
-    });
-  });
-});

From 50c5bbc367c9489b7a2db33dac66db1695b00cca Mon Sep 17 00:00:00 2001
From: Sam Jewell <2903904+samjewell@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:56:34 +0100
Subject: [PATCH 174/729] Use headings in bug report template (#65429)

* Use headings in bug report template

I've reported a lot of bugs recently, and I've found that headings
are a far better way to format bug reports.

See https://github.com/grafana/grafana/issues/65426 for an example. Thanks

* Switch from H1s to H2s

As per PR feedback, H1 already exists as the issue title :-)
---
 .github/ISSUE_TEMPLATE/1-bug_report.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md
index a2fecc3893c..e17d15e3e0e 100644
--- a/.github/ISSUE_TEMPLATE/1-bug_report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug_report.md
@@ -14,15 +14,15 @@ PROTIP: record your screen and attach it as a gif to showcase the issue.
 - How to record and attach gif: https://bit.ly/2Mi8T6K
 -->
 
-**What happened**:
+## What happened:
 
-**What you expected to happen**:
+## What you expected to happen:
 
-**How to reproduce it (as minimally and precisely as possible)**:
+## How to reproduce it (as minimally and precisely as possible):
 
-**Anything else we need to know?**:
+## Anything else we need to know?:
 
-**Environment**:
+## Environment:
 - Grafana version:
 - Data source type & version:
 - OS Grafana is installed on:

From 9a4c7ef758583da5a12e94969fac16e24e8ac5e0 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Mon, 17 Apr 2023 13:05:56 +0200
Subject: [PATCH 175/729] Logs: Fix LogContext scrolling behavior (#66654)

fix logrowcontext scrolling behavior
---
 .../logs/components/log-context/LogRowContextModal.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
index c2f53ca314f..f7965a9c07a 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -120,6 +120,10 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
 }) => {
   const scrollElement = React.createRef<HTMLDivElement>();
   const entryElement = React.createRef<HTMLTableRowElement>();
+  // We can not use `entryElement` to scroll to the right element because it's
+  // sticky. That's why we add another row and use this ref to scroll to that
+  // first.
+  const preEntryElement = React.createRef<HTMLTableRowElement>();
 
   const theme = useTheme2();
   const styles = getStyles(theme);
@@ -198,10 +202,11 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
   };
 
   useLayoutEffect(() => {
-    if (entryElement.current) {
+    if (!loading && entryElement.current && preEntryElement.current) {
+      preEntryElement.current.scrollIntoView({ block: 'center' });
       entryElement.current.scrollIntoView({ block: 'center' });
     }
-  }, [entryElement, context]);
+  }, [entryElement, preEntryElement, context, loading]);
 
   useLayoutEffect(() => {
     const width = scrollElement?.current?.parentElement?.clientWidth;
@@ -252,6 +257,7 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
                 />
               </td>
             </tr>
+            <tr ref={preEntryElement}></tr>
             <tr ref={entryElement} className={styles.entry}>
               <td className={styles.noMarginBottom}>
                 <LogRows

From 6ffc0c3eda5519f0c9bdd4be18bc6cd2f8c09d97 Mon Sep 17 00:00:00 2001
From: Kyle Cunningham <codeincarnate@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:46:22 +0700
Subject: [PATCH 176/729] SQL Datasources: Fix saving of max idle connections
 and max connection lifetime (#66662)

Add brackets around property name so that it's dynamic
---
 .../plugins/sql/components/configuration/ConnectionLimits.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx b/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
index ed7d4cbd0d8..aa732c1ad27 100644
--- a/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
+++ b/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
@@ -35,7 +35,7 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
   // use a shared function to update respective properties
   const onJSONDataNumberChanged = (property: keyof SQLConnectionLimits) => {
     return (number?: number) => {
-      updateJsonData({ property: number });
+      updateJsonData({ [property]: number });
     };
   };
 

From 3b3bd03f8a3512c7fa93fc3f5aa1237daef29934 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 17 Apr 2023 13:45:18 +0100
Subject: [PATCH 177/729] Chore: upgrade our version of `rc-cascader` (#66668)

upgrade our version of rc-cascader
---
 package.json                     |   2 +-
 packages/grafana-ui/package.json |   2 +-
 yarn.lock                        | 102 ++++++++++++++++++++++---------
 3 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index 550490c5cc7..b525589d2e0 100644
--- a/package.json
+++ b/package.json
@@ -361,7 +361,7 @@
     "prismjs": "1.29.0",
     "prop-types": "15.8.1",
     "pseudoizer": "^0.1.0",
-    "rc-cascader": "3.8.0",
+    "rc-cascader": "3.10.2",
     "rc-drawer": "6.1.3",
     "rc-slider": "10.1.1",
     "rc-time-picker": "3.7.3",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 9185bda19ca..24e2e86032a 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -81,7 +81,7 @@
     "monaco-editor": "0.34.0",
     "ol": "7.2.2",
     "prismjs": "1.29.0",
-    "rc-cascader": "3.8.0",
+    "rc-cascader": "3.10.2",
     "rc-drawer": "6.1.3",
     "rc-slider": "10.1.1",
     "rc-time-picker": "^3.7.3",
diff --git a/yarn.lock b/yarn.lock
index 920cb076c38..7d77947170f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3555,7 +3555,7 @@ __metadata:
     ol: 7.2.2
     prismjs: 1.29.0
     process: ^0.11.10
-    rc-cascader: 3.8.0
+    rc-cascader: 3.10.2
     rc-drawer: 6.1.3
     rc-slider: 10.1.1
     rc-time-picker: ^3.7.3
@@ -6345,6 +6345,38 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rc-component/portal@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "@rc-component/portal@npm:1.1.1"
+  dependencies:
+    "@babel/runtime": ^7.18.0
+    classnames: ^2.3.2
+    rc-util: ^5.24.4
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: 4a2aef7cfd71a7614dc83b5ee5863ef49613e392b9aec0fa5913de4fb04ca6c9b13fd4ed183d8696475999d9c2bb945d707b245f7f28b7c0615a5f613416206a
+  languageName: node
+  linkType: hard
+
+"@rc-component/trigger@npm:^1.5.0":
+  version: 1.9.0
+  resolution: "@rc-component/trigger@npm:1.9.0"
+  dependencies:
+    "@babel/runtime": ^7.18.3
+    "@rc-component/portal": ^1.1.0
+    classnames: ^2.3.2
+    rc-align: ^4.0.0
+    rc-motion: ^2.0.0
+    rc-resize-observer: ^1.3.1
+    rc-util: ^5.29.2
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: 29c4e593e69c0bdba510fd05b5e3bf8bee3dc01213d3526b8ac5a0461c71e36db246319c088f7292d63764746993bdb53f6edded2d7c0977bf357656c9313b63
+  languageName: node
+  linkType: hard
+
 "@reach/observe-rect@npm:^1.1.0":
   version: 1.2.0
   resolution: "@reach/observe-rect@npm:1.2.0"
@@ -20367,7 +20399,7 @@ __metadata:
     prismjs: 1.29.0
     prop-types: 15.8.1
     pseudoizer: ^0.1.0
-    rc-cascader: 3.8.0
+    rc-cascader: 3.10.2
     rc-drawer: 6.1.3
     rc-slider: 10.1.1
     rc-time-picker: 3.7.3
@@ -30285,20 +30317,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-cascader@npm:3.8.0":
-  version: 3.8.0
-  resolution: "rc-cascader@npm:3.8.0"
+"rc-cascader@npm:3.10.2":
+  version: 3.10.2
+  resolution: "rc-cascader@npm:3.10.2"
   dependencies:
     "@babel/runtime": ^7.12.5
     array-tree-filter: ^2.1.0
     classnames: ^2.3.1
-    rc-select: ~14.2.0
+    rc-select: ~14.4.0
     rc-tree: ~5.7.0
     rc-util: ^5.6.1
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: eb6cb454c80fe2e937ff9bd50036acfc9e946f25c9b238c71fbf82068ae08e0d2fa29639b7a743be6a580f03f3ec9be7bfa139db75272d4aac875bf2ee158f10
+  checksum: f4df7dc148578410e24521120ef2b96108164a83aa6339e522c682c911cc8368729a8d04ac66bfd7cc785bc69b5ffbbc6f9d98ec11a62f8b273871ad63d4941c
   languageName: node
   linkType: hard
 
@@ -30376,21 +30408,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-select@npm:~14.2.0":
-  version: 14.2.0
-  resolution: "rc-select@npm:14.2.0"
+"rc-resize-observer@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "rc-resize-observer@npm:1.3.1"
+  dependencies:
+    "@babel/runtime": ^7.20.7
+    classnames: ^2.2.1
+    rc-util: ^5.27.0
+    resize-observer-polyfill: ^1.5.1
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: cc952e5d3071543e990103ea64b20310e3a09c950a473bf89a3a7e6063bd060c6c041f0333085640676d176c7edd58676a3b3d64dfa17461ea6f3a62f79c4d65
+  languageName: node
+  linkType: hard
+
+"rc-select@npm:~14.4.0":
+  version: 14.4.3
+  resolution: "rc-select@npm:14.4.3"
   dependencies:
     "@babel/runtime": ^7.10.1
+    "@rc-component/trigger": ^1.5.0
     classnames: 2.x
     rc-motion: ^2.0.1
     rc-overflow: ^1.0.0
-    rc-trigger: ^5.0.4
     rc-util: ^5.16.1
     rc-virtual-list: ^3.4.13
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: dbbadf6062e02021407fa6343525901d061e5ccf6adbecd762189df5dc626aa65eda3f32567639db38723be93722571143b30516de497e1202614c47f8c62ca2
+  checksum: 6f5654bf30e571a52842fe8f5542c6c3c833f4756d5686d82548845a31bf4bd299e2a1931cfdd1b47f522402acd38ffe869ff422a6ade0bffed6167fe7fe2f39
   languageName: node
   linkType: hard
 
@@ -30483,22 +30530,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-trigger@npm:^5.0.4":
-  version: 5.2.10
-  resolution: "rc-trigger@npm:5.2.10"
-  dependencies:
-    "@babel/runtime": ^7.11.2
-    classnames: ^2.2.6
-    rc-align: ^4.0.0
-    rc-motion: ^2.0.0
-    rc-util: ^5.5.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 0c71935467bfb3dd86b52c85c106e671c2933409ba4568152f386498b807d5ab680cb2de2f6fc370289368d2b65507afd0e6fc2269965b67e4016c2f61e9bbb1
-  languageName: node
-  linkType: hard
-
 "rc-trigger@npm:^5.3.1":
   version: 5.3.4
   resolution: "rc-trigger@npm:5.3.4"
@@ -30556,7 +30587,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-util@npm:^5.2.1, rc-util@npm:^5.3.0, rc-util@npm:^5.5.0":
+"rc-util@npm:^5.2.1, rc-util@npm:^5.3.0":
   version: 5.14.0
   resolution: "rc-util@npm:5.14.0"
   dependencies:
@@ -30583,6 +30614,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rc-util@npm:^5.29.2":
+  version: 5.30.0
+  resolution: "rc-util@npm:5.30.0"
+  dependencies:
+    "@babel/runtime": ^7.18.3
+    react-is: ^16.12.0
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: d7bf508bd3236cbb2abebbf16d271c50ab05be12cd3be46981979608b0b6d304735cc081650ab2f967f99a144c23189a6f682d52956c0eb4b6e4f41064b8a4ae
+  languageName: node
+  linkType: hard
+
 "rc-virtual-list@npm:^3.4.13":
   version: 3.4.13
   resolution: "rc-virtual-list@npm:3.4.13"

From 6be9264b94008d4b0168cb57b98e8d3615563527 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Mon, 17 Apr 2023 13:54:32 +0100
Subject: [PATCH 178/729] NestedFolders: Don't require dev mode for feature
 toggle (#66501)

NestedFolders: Promote feature flag to non-dev beta
---
 .../configure-grafana/feature-toggles/index.md           | 2 +-
 pkg/services/featuremgmt/registry.go                     | 9 ++++-----
 pkg/services/featuremgmt/toggles_gen.csv                 | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index ccc6d73c882..2111f36dfcf 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -52,6 +52,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `disableAngular`                     | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. |
 | `grpcServer`                         | Run the GRPC server                                                                                                                                                                          |
 | `accessControlOnCall`                | Access control primitives for OnCall                                                                                                                                                         |
+| `nestedFolders`                      | Enable folder nesting                                                                                                                                                                        |
 | `alertingNoNormalState`              | Stop maintaining state of alerts that are not firing                                                                                                                                         |
 | `renderAuthJWT`                      | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
 | `enableElasticsearchBackendQuerying` | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                              |
@@ -119,5 +120,4 @@ The following toggles require explicitly setting Grafana's [app mode]({{< relref
 | --------------------- | -------------------------------------------------------------- |
 | `k8s`                 | Explore native k8s integrations                                |
 | `entityStore`         | SQL-based entity store (requires storage flag also)            |
-| `nestedFolders`       | Enable folder nesting                                          |
 | `externalServiceAuth` | Starts an OAuth2 authentication provider for external services |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index d89e675da70..bc3da24850c 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -279,11 +279,10 @@ var (
 			Owner:       grafanaAuthnzSquad,
 		},
 		{
-			Name:            "nestedFolders",
-			Description:     "Enable folder nesting",
-			State:           FeatureStateAlpha,
-			RequiresDevMode: true,
-			Owner:           grafanaBackendPlatformSquad,
+			Name:        "nestedFolders",
+			Description: "Enable folder nesting",
+			State:       FeatureStateBeta,
+			Owner:       grafanaBackendPlatformSquad,
 		},
 		{
 			Name:        "accessTokenExpirationCheck",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 7bd97fc4f3a..ed9c0c4aa67 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -40,7 +40,7 @@ newPanelChromeUI,stable,@grafana/dashboards-squad,false,false,false,true
 showDashboardValidationWarnings,alpha,@grafana/dashboards-squad,false,false,false,false
 mysqlAnsiQuotes,alpha,@grafana/backend-platform,false,false,false,false
 accessControlOnCall,beta,@grafana/grafana-authnz-team,false,false,false,false
-nestedFolders,alpha,@grafana/backend-platform,true,false,false,false
+nestedFolders,beta,@grafana/backend-platform,false,false,false,false
 accessTokenExpirationCheck,stable,@grafana/grafana-authnz-team,false,false,false,false
 showTraceId,alpha,@grafana/observability-logs,false,false,false,false
 datasourceOnboarding,alpha,@grafana/dashboards-squad,false,false,false,false

From 6462c81f8166334bb3925ffbb562fa074c2f465f Mon Sep 17 00:00:00 2001
From: Eric Mustin <mustin.eric@gmail.com>
Date: Mon, 17 Apr 2023 09:17:53 -0400
Subject: [PATCH 179/729] Trace View: Update the queryType to traceql for
 checking if same trace when clicking span link (#66645)

* TraceView: update the queryType to traceql for checking if same trace when clicking span link

* TraceView: linting

* TraceView: remove traceid check completely
---
 public/app/features/explore/TraceView/TraceView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index f7066c061ea..5e9a44b5873 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -284,7 +284,7 @@ function useFocusSpanLink(options: {
     // Check if the link is to a different trace or not.
     // If it's the same trace, only update panel state with setFocusedSpanId (no navigation).
     // If it's a different trace, use splitOpenFn to open a new explore panel
-    const sameTrace = query?.queryType === 'traceId' && (query as TempoQuery).query === traceId;
+    const sameTrace = query?.queryType === 'traceql' && (query as TempoQuery).query === traceId;
 
     return mapInternalLinkToExplore({
       link,

From 2b7f41f4dfaf7c2d17f6648fc9c7cc8596c6a91a Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Mon, 17 Apr 2023 09:25:28 -0400
Subject: [PATCH 180/729] docs: add missing alias (#66621)

added missing alias
---
 .../sources/panels-visualizations/panel-editor-overview/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/sources/panels-visualizations/panel-editor-overview/index.md b/docs/sources/panels-visualizations/panel-editor-overview/index.md
index 486009d3455..2a74243d074 100644
--- a/docs/sources/panels-visualizations/panel-editor-overview/index.md
+++ b/docs/sources/panels-visualizations/panel-editor-overview/index.md
@@ -6,6 +6,7 @@ aliases:
   - ../panels/add-panels-dynamically/about-repeating-panels-rows/
   - ../panels/add-panels-dynamically/configure-repeating-panels/
   - ../panels/add-panels-dynamically/configure-repeating-rows/
+  - ../panels/working-with-panels/
   - ../panels/working-with-panels/add-panel/
   - ../panels/working-with-panels/navigate-inspector-panel/
   - ../panels/working-with-panels/navigate-panel-editor/

From 1e53b29eee4527ba4ff50fe1e1c237f9e9ed87d4 Mon Sep 17 00:00:00 2001
From: lwandz13 <126723338+lwandz13@users.noreply.github.com>
Date: Mon, 17 Apr 2023 08:36:30 -0500
Subject: [PATCH 181/729] removed duplicate query data source section (#66605)

---
 docs/sources/datasources/prometheus/_index.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/sources/datasources/prometheus/_index.md b/docs/sources/datasources/prometheus/_index.md
index 042be6eb14f..817896d14b1 100644
--- a/docs/sources/datasources/prometheus/_index.md
+++ b/docs/sources/datasources/prometheus/_index.md
@@ -103,12 +103,6 @@ datasources:
           url: 'http://localhost:3000/explore?orgId=1&left=%5B%22now-1h%22,%22now%22,%22Jaeger%22,%7B%22query%22:%22$${__value.raw}%22%7D%5D'
 ```
 
-## Query the data source
-
-The Prometheus query editor includes a code editor and visual query builder.
-
-For details, see the [query editor documentation]({{< relref "./query-editor" >}}).
-
 ## View Grafana metrics with Prometheus
 
 Grafana exposes metrics for Prometheus on the `/metrics` endpoint.

From 850f2baaf31163aa0e67ab954876d6f410cb654e Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 17 Apr 2023 14:40:32 +0100
Subject: [PATCH 182/729] Chore: remove `localStorage mock` which doesn't work
 in node v18.16.0 (#66671)

remove localStorage mock which doesn't work in node v18.16.0
---
 .betterer.results         |  4 +---
 public/test/jest-setup.ts | 20 --------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index d07511ae306..565c4e7848c 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -6155,9 +6155,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/test/jest-setup.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/test/jest-shim.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/public/test/jest-setup.ts b/public/test/jest-setup.ts
index 1477e86bd88..393269edcfa 100644
--- a/public/test/jest-setup.ts
+++ b/public/test/jest-setup.ts
@@ -65,26 +65,6 @@ jest.mock('../app/core/core', () => ({
 jest.mock('../app/angular/partials', () => ({}));
 jest.mock('../app/features/plugins/plugin_loader', () => ({}));
 
-const localStorageMock = (() => {
-  let store: any = {};
-  return {
-    getItem: (key: string) => {
-      return store[key];
-    },
-    setItem: (key: string, value: any) => {
-      store[key] = value.toString();
-    },
-    clear: () => {
-      store = {};
-    },
-    removeItem: (key: string) => {
-      delete store[key];
-    },
-  };
-})();
-
-global.localStorage = localStorageMock;
-
 const throwUnhandledRejections = () => {
   process.on('unhandledRejection', (err) => {
     throw err;

From 8485deb2c01345bae076c5d97a4f09b059af45da Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Mon, 17 Apr 2023 16:30:41 +0200
Subject: [PATCH 183/729] Alerting: Split silences view expired/not-expired
 (#66562)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 .../alerting/unified/Silences.test.tsx        |  31 +++--
 .../unified/components/DynamicTable.tsx       |   4 +-
 .../components/silences/SilencesFilter.tsx    |  26 +---
 .../components/silences/SilencesTable.tsx     | 121 +++++++++++-------
 4 files changed, 108 insertions(+), 74 deletions(-)

diff --git a/public/app/features/alerting/unified/Silences.test.tsx b/public/app/features/alerting/unified/Silences.test.tsx
index 4c333b57825..048aa24c3b9 100644
--- a/public/app/features/alerting/unified/Silences.test.tsx
+++ b/public/app/features/alerting/unified/Silences.test.tsx
@@ -5,13 +5,15 @@ import { TestProvider } from 'test/helpers/TestProvider';
 import { byLabelText, byPlaceholderText, byRole, byTestId, byText } from 'testing-library-selector';
 
 import { dateTime } from '@grafana/data';
-import { locationService, setDataSourceSrv, config } from '@grafana/runtime';
+import { config, locationService, setDataSourceSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AlertState, MatcherOperator } from 'app/plugins/datasource/alertmanager/types';
 import { AccessControlAction } from 'app/types';
 
+import { SilenceState } from '../../../plugins/datasource/alertmanager/types';
+
 import Silences from './Silences';
-import { fetchSilences, fetchAlerts, createOrUpdateSilence } from './api/alertmanager';
+import { createOrUpdateSilence, fetchAlerts, fetchSilences } from './api/alertmanager';
 import { mockAlertmanagerAlert, mockDataSource, MockDataSourceSrv, mockSilence } from './mocks';
 import { parseMatchers } from './utils/alertmanager';
 import { DataSourceType } from './utils/datasource';
@@ -48,10 +50,12 @@ const dataSources = {
 };
 
 const ui = {
-  silencesTable: byTestId('dynamic-table'),
+  notExpiredTable: byTestId('not-expired-table'),
+  expiredTable: byTestId('expired-table'),
+  expiredCaret: byText(/expired/i),
   silenceRow: byTestId('row'),
   silencedAlertCell: byTestId('alerts'),
-  addSilenceButton: byRole('button', { name: /add silence/i }),
+  addSilenceButton: byRole('link', { name: /add silence/i }),
   queryBar: byPlaceholderText('Search'),
   editor: {
     timeRange: byLabelText('Timepicker', { exact: false }),
@@ -75,6 +79,7 @@ const resetMocks = () => {
     return Promise.resolve([
       mockSilence({ id: '12345' }),
       mockSilence({ id: '67890', matchers: parseMatchers('foo!=bar'), comment: 'Catch all' }),
+      mockSilence({ id: '1111', status: { state: SilenceState.Expired } }),
     ]);
   });
 
@@ -128,9 +133,19 @@ describe('Silences', () => {
       await waitFor(() => expect(mocks.api.fetchSilences).toHaveBeenCalled());
       await waitFor(() => expect(mocks.api.fetchAlerts).toHaveBeenCalled());
 
-      expect(ui.silencesTable.query()).not.toBeNull();
+      await userEvent.click(ui.expiredCaret.get());
+      expect(ui.notExpiredTable.get()).not.toBeNull();
+      expect(ui.expiredTable.get()).not.toBeNull();
+      let silences = ui.silenceRow.queryAll();
+      expect(silences).toHaveLength(3);
+      expect(silences[0]).toHaveTextContent('foo=bar');
+      expect(silences[1]).toHaveTextContent('foo!=bar');
+      expect(silences[2]).toHaveTextContent('foo=bar');
 
-      const silences = ui.silenceRow.queryAll();
+      await userEvent.click(ui.expiredCaret.getAll()[0]);
+      expect(ui.notExpiredTable.get()).not.toBeNull();
+      expect(ui.expiredTable.query()).toBeNull();
+      silences = ui.silenceRow.queryAll();
       expect(silences).toHaveLength(2);
       expect(silences[0]).toHaveTextContent('foo=bar');
       expect(silences[1]).toHaveTextContent('foo!=bar');
@@ -158,7 +173,7 @@ describe('Silences', () => {
       await waitFor(() => expect(mocks.api.fetchSilences).toHaveBeenCalled());
       await waitFor(() => expect(mocks.api.fetchAlerts).toHaveBeenCalled());
 
-      const silencedAlertRows = ui.silencedAlertCell.getAll(ui.silencesTable.get());
+      const silencedAlertRows = ui.silencedAlertCell.getAll(ui.notExpiredTable.get());
       expect(silencedAlertRows).toHaveLength(2);
       expect(silencedAlertRows[0]).toHaveTextContent('2');
       expect(silencedAlertRows[1]).toHaveTextContent('0');
@@ -177,7 +192,7 @@ describe('Silences', () => {
       await userEvent.click(queryBar);
       await userEvent.paste('foo=bar');
 
-      await waitFor(() => expect(ui.silenceRow.getAll()).toHaveLength(1));
+      await waitFor(() => expect(ui.silenceRow.getAll()).toHaveLength(2));
     },
     TEST_TIMEOUT
   );
diff --git a/public/app/features/alerting/unified/components/DynamicTable.tsx b/public/app/features/alerting/unified/components/DynamicTable.tsx
index bf925ffc8ce..deae6c1a7eb 100644
--- a/public/app/features/alerting/unified/components/DynamicTable.tsx
+++ b/public/app/features/alerting/unified/components/DynamicTable.tsx
@@ -28,6 +28,7 @@ export interface DynamicTableItemProps<T = unknown> {
 export interface DynamicTableProps<T = unknown> {
   cols: Array<DynamicTableColumnProps<T>>;
   items: Array<DynamicTableItemProps<T>>;
+  dataTestId?: string;
 
   isExpandable?: boolean;
   pagination?: DynamicTablePagination;
@@ -70,6 +71,7 @@ export const DynamicTable = <T extends object>({
   renderPrefixCell,
   renderPrefixHeader,
   footerRow,
+  dataTestId,
 }: DynamicTableProps<T>) => {
   const defaultPaginationStyles = useStyles2(getPaginationStyles);
 
@@ -98,7 +100,7 @@ export const DynamicTable = <T extends object>({
 
   return (
     <>
-      <div className={styles.container} data-testid="dynamic-table">
+      <div className={styles.container} data-testid={dataTestId ?? 'dynamic-table'}>
         <div className={styles.row} data-testid="header">
           {renderPrefixHeader && renderPrefixHeader()}
           {isExpandable && <div className={styles.cell} />}
diff --git a/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx b/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx
index 2d926a9fe41..acb6b61aa66 100644
--- a/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx
+++ b/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx
@@ -2,26 +2,20 @@ import { css } from '@emotion/css';
 import { debounce, uniqueId } from 'lodash';
 import React, { FormEvent, useState } from 'react';
 
-import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
-import { Label, Icon, Input, Tooltip, RadioButtonGroup, useStyles2, Button, Field } from '@grafana/ui';
+import { Button, Field, Icon, Input, Label, Tooltip, useStyles2 } from '@grafana/ui';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
-import { SilenceState } from 'app/plugins/datasource/alertmanager/types';
 
 import { parseMatchers } from '../../utils/alertmanager';
 import { getSilenceFiltersFromUrlParams } from '../../utils/misc';
 
-const stateOptions: SelectableValue[] = Object.entries(SilenceState).map(([key, value]) => ({
-  label: key,
-  value,
-}));
-
 const getQueryStringKey = () => uniqueId('query-string-');
 
 export const SilencesFilter = () => {
   const [queryStringKey, setQueryStringKey] = useState(getQueryStringKey());
   const [queryParams, setQueryParams] = useQueryParams();
-  const { queryString, silenceState } = getSilenceFiltersFromUrlParams(queryParams);
+  const { queryString } = getSilenceFiltersFromUrlParams(queryParams);
   const styles = useStyles2(getStyles);
 
   const handleQueryStringChange = debounce((e: FormEvent<HTMLInputElement>) => {
@@ -29,10 +23,6 @@ export const SilencesFilter = () => {
     setQueryParams({ queryString: target.value || null });
   }, 400);
 
-  const handleSilenceStateChange = (state: string) => {
-    setQueryParams({ silenceState: state });
-  };
-
   const clearFilters = () => {
     setQueryParams({
       queryString: null,
@@ -77,10 +67,8 @@ export const SilencesFilter = () => {
           data-testid="search-query-input"
         />
       </Field>
-      <Field className={styles.rowChild} label="State">
-        <RadioButtonGroup options={stateOptions} value={silenceState} onChange={handleSilenceStateChange} />
-      </Field>
-      {(queryString || silenceState) && (
+
+      {queryString && (
         <div className={styles.rowChild}>
           <Button variant="secondary" icon="times" onClick={clearFilters}>
             Clear filters
@@ -99,8 +87,8 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: flex;
     flex-direction: row;
     align-items: flex-end;
-    padding-bottom: ${theme.spacing(2)};
-    border-bottom: 1px solid ${theme.colors.border.strong};
+    padding-bottom: ${theme.spacing(3)};
+    border-bottom: 1px solid ${theme.colors.border.medium};
   `,
   rowChild: css`
     margin-right: ${theme.spacing(1)};
diff --git a/public/app/features/alerting/unified/components/silences/SilencesTable.tsx b/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
index a86e3aed00d..3d456e17e53 100644
--- a/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
+++ b/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
@@ -1,9 +1,9 @@
 import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
-import { GrafanaTheme2, dateMath } from '@grafana/data';
+import { dateMath, GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
-import { Icon, useStyles2, Link, Button } from '@grafana/ui';
+import { CollapsableSection, Icon, Link, LinkButton, useStyles2 } from '@grafana/ui';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AlertmanagerAlert, Silence, SilenceState } from 'app/plugins/datasource/alertmanager/types';
@@ -39,72 +39,105 @@ interface Props {
 const SilencesTable = ({ silences, alertManagerAlerts, alertManagerSourceName }: Props) => {
   const styles = useStyles2(getStyles);
   const [queryParams] = useQueryParams();
-  const filteredSilences = useFilteredSilences(silences);
+  const filteredSilencesNotExpired = useFilteredSilences(silences, false);
+  const filteredSilencesExpired = useFilteredSilences(silences, true);
   const permissions = getInstancesPermissions(alertManagerSourceName);
 
-  const { silenceState } = getSilenceFiltersFromUrlParams(queryParams);
+  const { silenceState: silenceStateInParams } = getSilenceFiltersFromUrlParams(queryParams);
+  const showExpiredFromUrl = silenceStateInParams === SilenceState.Expired;
 
-  const showExpiredSilencesBanner =
-    !!filteredSilences.length && (silenceState === undefined || silenceState === SilenceState.Expired);
-
-  const columns = useColumns(alertManagerSourceName);
-
-  const items = useMemo((): SilenceTableItemProps[] => {
+  const itemsNotExpired = useMemo((): SilenceTableItemProps[] => {
     const findSilencedAlerts = (id: string) => {
       return alertManagerAlerts.filter((alert) => alert.status.silencedBy.includes(id));
     };
-    return filteredSilences.map((silence) => {
+    return filteredSilencesNotExpired.map((silence) => {
       const silencedAlerts = findSilencedAlerts(silence.id);
       return {
         id: silence.id,
         data: { ...silence, silencedAlerts },
       };
     });
-  }, [filteredSilences, alertManagerAlerts]);
+  }, [filteredSilencesNotExpired, alertManagerAlerts]);
+
+  const itemsExpired = useMemo((): SilenceTableItemProps[] => {
+    const findSilencedAlerts = (id: string) => {
+      return alertManagerAlerts.filter((alert) => alert.status.silencedBy.includes(id));
+    };
+    return filteredSilencesExpired.map((silence) => {
+      const silencedAlerts = findSilencedAlerts(silence.id);
+      return {
+        id: silence.id,
+        data: { ...silence, silencedAlerts },
+      };
+    });
+  }, [filteredSilencesExpired, alertManagerAlerts]);
 
   return (
     <div data-testid="silences-table">
       {!!silences.length && (
-        <>
+        <Stack direction="column">
           <SilencesFilter />
           <Authorize actions={[permissions.create]} fallback={contextSrv.isEditor}>
             <div className={styles.topButtonContainer}>
-              <Link href={makeAMLink('/alerting/silence/new', alertManagerSourceName)}>
-                <Button className={styles.addNewSilence} icon="plus">
-                  Add Silence
-                </Button>
-              </Link>
+              <LinkButton href={makeAMLink('/alerting/silence/new', alertManagerSourceName)} icon="plus">
+                Add Silence
+              </LinkButton>
             </div>
           </Authorize>
-          {!!items.length ? (
-            <>
-              <DynamicTable
-                items={items}
-                cols={columns}
-                isExpandable
-                renderExpandedContent={({ data }) => <SilenceDetails silence={data} />}
+          <SilenceList
+            items={itemsNotExpired}
+            alertManagerSourceName={alertManagerSourceName}
+            dataTestId="not-expired-table"
+          />
+          {itemsExpired.length > 0 && (
+            <CollapsableSection label={`Expired silences (${itemsExpired.length})`} isOpen={showExpiredFromUrl}>
+              <div className={styles.callout}>
+                <Icon className={styles.calloutIcon} name="info-circle" />
+                <span>Expired silences are automatically deleted after 5 days.</span>
+              </div>
+              <SilenceList
+                items={itemsExpired}
+                alertManagerSourceName={alertManagerSourceName}
+                dataTestId="expired-table"
               />
-              {showExpiredSilencesBanner && (
-                <div className={styles.callout}>
-                  <Icon className={styles.calloutIcon} name="info-circle" />
-                  <span>Expired silences are automatically deleted after 5 days.</span>
-                </div>
-              )}
-            </>
-          ) : (
-            'No matching silences found'
+            </CollapsableSection>
           )}
-        </>
+        </Stack>
       )}
       {!silences.length && <NoSilencesSplash alertManagerSourceName={alertManagerSourceName} />}
     </div>
   );
 };
 
-const useFilteredSilences = (silences: Silence[]) => {
+function SilenceList({
+  items,
+  alertManagerSourceName,
+  dataTestId,
+}: {
+  items: SilenceTableItemProps[];
+  alertManagerSourceName: string;
+  dataTestId: string;
+}) {
+  const columns = useColumns(alertManagerSourceName);
+  if (!!items.length) {
+    return (
+      <DynamicTable
+        items={items}
+        cols={columns}
+        isExpandable
+        dataTestId={dataTestId}
+        renderExpandedContent={({ data }) => <SilenceDetails silence={data} />}
+      />
+    );
+  } else {
+    return <>No matching silences found</>;
+  }
+}
+
+const useFilteredSilences = (silences: Silence[], expired = false) => {
   const [queryParams] = useQueryParams();
   return useMemo(() => {
-    const { queryString, silenceState } = getSilenceFiltersFromUrlParams(queryParams);
+    const { queryString } = getSilenceFiltersFromUrlParams(queryParams);
     const silenceIdsString = queryParams?.silenceIds;
     return silences.filter((silence) => {
       if (typeof silenceIdsString === 'string') {
@@ -128,15 +161,13 @@ const useFilteredSilences = (silences: Silence[]) => {
           return false;
         }
       }
-      if (silenceState) {
-        const stateMatches = silence.status.state === silenceState;
-        if (!stateMatches) {
-          return false;
-        }
+      if (expired) {
+        return silence.status.state === SilenceState.Expired;
+      } else {
+        return silence.status.state !== SilenceState.Expired;
       }
-      return true;
     });
-  }, [queryParams, silences]);
+  }, [queryParams, silences, expired]);
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
@@ -156,7 +187,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: flex;
     flex-direction: row;
     align-items: center;
-    margin-top: ${theme.spacing(2)};
 
     & > * {
       margin-left: ${theme.spacing(1)};
@@ -255,5 +285,4 @@ function useColumns(alertManagerSourceName: string) {
     return columns;
   }, [alertManagerSourceName, dispatch, styles, permissions]);
 }
-
 export default SilencesTable;

From ab08b4f7f21a3cb6e2b6a68df23b3f918d16a395 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 17 Apr 2023 16:01:32 +0100
Subject: [PATCH 184/729] Chore: Clean up NavModel interface (#66548)

* clean up navmodel interface

* remove concept of sections from NavModel interface

* clean up applinks
---
 packages/grafana-data/src/types/navModel.ts   |  10 -
 pkg/services/navtree/models.go                |  48 ++--
 pkg/services/navtree/navtreeimpl/admin.go     |   2 -
 pkg/services/navtree/navtreeimpl/applinks.go  |   4 -
 pkg/services/navtree/navtreeimpl/navtree.go   |  16 +-
 .../AppChrome/MegaMenu/MegaMenu.test.tsx      |   4 +-
 .../AppChrome/MegaMenu/MegaMenu.tsx           |  15 +-
 .../MegaMenu/NavBarMenuItemWrapper.tsx        |   4 +-
 .../AppChrome/MegaMenu/utils.test.ts          |  31 +--
 .../components/AppChrome/MegaMenu/utils.ts    |  36 ++-
 .../AppChrome/QuickAdd/QuickAdd.test.tsx      |   4 +-
 .../AppChrome/TopBar/TopNavBarMenu.tsx        |   7 +-
 .../AppChrome/TopBar/TopSearchBar.tsx         |   4 +-
 .../__mocks__/store.navIndex.mock.ts          |  57 +---
 .../__mocks__/store.navIndex.mock.ts          | 251 +-----------------
 public/test/mocks/navModel.ts                 | 149 +----------
 16 files changed, 61 insertions(+), 581 deletions(-)

diff --git a/packages/grafana-data/src/types/navModel.ts b/packages/grafana-data/src/types/navModel.ts
index 405924b4757..2c83bb45753 100644
--- a/packages/grafana-data/src/types/navModel.ts
+++ b/packages/grafana-data/src/types/navModel.ts
@@ -7,17 +7,13 @@ export interface NavLinkDTO {
   id?: string;
   text: string;
   description?: string;
-  section?: NavSection;
   subTitle?: string;
   icon?: IconName;
   img?: string;
   url?: string;
   target?: LinkTarget;
   sortWeight?: number;
-  divider?: boolean;
-  hideFromMenu?: boolean;
   hideFromTabs?: boolean;
-  showIconInNavbar?: boolean;
   roundIcon?: boolean;
   /**
    * This is true for some sections that have no children (but is still a section)
@@ -47,12 +43,6 @@ export interface NavModelItem extends NavLinkDTO {
   emptyMessage?: string;
 }
 
-export enum NavSection {
-  Core = 'core',
-  Plugin = 'plugin',
-  Config = 'config',
-}
-
 export enum NavMenuItemType {
   Section = 'section',
   Item = 'item',
diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index e8130651b0c..a2313976b10 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -17,23 +17,17 @@ const (
 	WeightDashboard
 	WeightExplore
 	WeightAlerting
-	WeightPlugin
-	WeightConfig
 	WeightAlertsAndIncidents
 	WeightMonitoring
 	WeightDataConnections
 	WeightApps
+	WeightPlugin
+	WeightConfig
 	WeightAdmin
 	WeightProfile
 	WeightHelp
 )
 
-const (
-	NavSectionCore   string = "core"
-	NavSectionPlugin string = "plugin"
-	NavSectionConfig string = "config"
-)
-
 const (
 	NavIDRoot               = "root"
 	NavIDDashboards         = "dashboards"
@@ -49,27 +43,23 @@ const (
 )
 
 type NavLink struct {
-	Id               string     `json:"id,omitempty"`
-	Text             string     `json:"text"`
-	Section          string     `json:"section,omitempty"`
-	SubTitle         string     `json:"subTitle,omitempty"`
-	Icon             string     `json:"icon,omitempty"` // Available icons can be browsed in Storybook: https://developers.grafana.com/ui/latest/index.html?path=/story/docs-overview-icon--icons-overview
-	Img              string     `json:"img,omitempty"`
-	Url              string     `json:"url,omitempty"`
-	Target           string     `json:"target,omitempty"`
-	SortWeight       int64      `json:"sortWeight,omitempty"`
-	Divider          bool       `json:"divider,omitempty"`
-	HideFromMenu     bool       `json:"hideFromMenu,omitempty"`
-	HideFromTabs     bool       `json:"hideFromTabs,omitempty"`
-	ShowIconInNavbar bool       `json:"showIconInNavbar,omitempty"`
-	RoundIcon        bool       `json:"roundIcon,omitempty"`
-	IsSection        bool       `json:"isSection,omitempty"`
-	Children         []*NavLink `json:"children,omitempty"`
-	HighlightText    string     `json:"highlightText,omitempty"`
-	HighlightID      string     `json:"highlightId,omitempty"`
-	EmptyMessageId   string     `json:"emptyMessageId,omitempty"`
-	PluginID         string     `json:"pluginId,omitempty"` // (Optional) The ID of the plugin that registered nav link (e.g. as a standalone plugin page)
-	IsCreateAction   bool       `json:"isCreateAction,omitempty"`
+	Id             string     `json:"id,omitempty"`
+	Text           string     `json:"text"`
+	SubTitle       string     `json:"subTitle,omitempty"`
+	Icon           string     `json:"icon,omitempty"` // Available icons can be browsed in Storybook: https://developers.grafana.com/ui/latest/index.html?path=/story/docs-overview-icon--icons-overview
+	Img            string     `json:"img,omitempty"`
+	Url            string     `json:"url,omitempty"`
+	Target         string     `json:"target,omitempty"`
+	SortWeight     int64      `json:"sortWeight,omitempty"`
+	HideFromTabs   bool       `json:"hideFromTabs,omitempty"`
+	RoundIcon      bool       `json:"roundIcon,omitempty"`
+	IsSection      bool       `json:"isSection,omitempty"`
+	Children       []*NavLink `json:"children,omitempty"`
+	HighlightText  string     `json:"highlightText,omitempty"`
+	HighlightID    string     `json:"highlightId,omitempty"`
+	EmptyMessageId string     `json:"emptyMessageId,omitempty"`
+	PluginID       string     `json:"pluginId,omitempty"` // (Optional) The ID of the plugin that registered nav link (e.g. as a standalone plugin page)
+	IsCreateAction bool       `json:"isCreateAction,omitempty"`
 }
 
 func (node *NavLink) Sort() {
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index 65a156c9cdd..4bc69dc6d11 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -96,7 +96,6 @@ func (s *ServiceImpl) getOrgAdminNode(c *contextmodel.ReqContext) (*navtree.NavL
 		Text:       "Configuration",
 		SubTitle:   "Organization: " + c.OrgName,
 		Icon:       "cog",
-		Section:    navtree.NavSectionConfig,
 		SortWeight: navtree.WeightConfig,
 		Children:   configNodes,
 	}
@@ -161,7 +160,6 @@ func (s *ServiceImpl) getServerAdminNode(c *contextmodel.ReqContext) *navtree.Na
 		Id:         navtree.NavIDAdmin,
 		Icon:       "shield",
 		SortWeight: navtree.WeightAdmin,
-		Section:    navtree.NavSectionConfig,
 		Children:   adminNavLinks,
 	}
 
diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index 362e7c82161..6c74399b50a 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -71,7 +71,6 @@ func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *contextmodel
 		Id:         "plugin-page-" + plugin.ID,
 		Img:        plugin.Info.Logos.Small,
 		SubTitle:   plugin.Info.Description,
-		Section:    navtree.NavSectionPlugin,
 		SortWeight: navtree.WeightPlugin,
 		IsSection:  true,
 		PluginID:   plugin.ID,
@@ -201,7 +200,6 @@ func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *n
 				SubTitle:   "App plugins that extend the Grafana experience",
 				Id:         navtree.NavIDApps,
 				Children:   []*navtree.NavLink{appLink},
-				Section:    navtree.NavSectionCore,
 				SortWeight: navtree.WeightApps,
 				Url:        s.cfg.AppSubURL + "/apps",
 			})
@@ -211,7 +209,6 @@ func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *n
 				Id:         navtree.NavIDMonitoring,
 				SubTitle:   "Monitoring and infrastructure apps",
 				Icon:       "heart-rate",
-				Section:    navtree.NavSectionCore,
 				SortWeight: navtree.WeightMonitoring,
 				Children:   []*navtree.NavLink{appLink},
 				Url:        s.cfg.AppSubURL + "/monitoring",
@@ -228,7 +225,6 @@ func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *n
 				Id:         navtree.NavIDAlertsAndIncidents,
 				SubTitle:   "Alerting and incident management apps",
 				Icon:       "bell",
-				Section:    navtree.NavSectionCore,
 				SortWeight: navtree.WeightAlertsAndIncidents,
 				Children:   alertsAndIncidentsChildren,
 				Url:        s.cfg.AppSubURL + "/alerts-and-incidents",
diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index 881378a54c7..f36d5d23530 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -89,7 +89,6 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, hasEditPerm bool, p
 			Id:             "starred",
 			Icon:           "star",
 			SortWeight:     navtree.WeightSavedItems,
-			Section:        navtree.NavSectionCore,
 			Children:       starredItemsLinks,
 			EmptyMessageId: "starred-empty",
 			Url:            s.cfg.AppSubURL + "/dashboards?starred",
@@ -106,7 +105,6 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, hasEditPerm bool, p
 			Icon:       "apps",
 			Url:        s.cfg.AppSubURL + "/dashboards",
 			SortWeight: navtree.WeightDashboard,
-			Section:    navtree.NavSectionCore,
 			Children:   dashboardChildLinks,
 		}
 
@@ -124,7 +122,6 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, hasEditPerm bool, p
 			SubTitle:   "Explore your data",
 			Icon:       "compass",
 			SortWeight: navtree.WeightExplore,
-			Section:    navtree.NavSectionCore,
 			Url:        s.cfg.AppSubURL + "/explore",
 		})
 	}
@@ -192,7 +189,6 @@ func (s *ServiceImpl) getHomeNode(c *contextmodel.ReqContext, prefs *pref.Prefer
 		Id:         "home",
 		Url:        homeUrl,
 		Icon:       "home-alt",
-		Section:    navtree.NavSectionCore,
 		SortWeight: navtree.WeightHome,
 	}
 	return homeNode
@@ -216,7 +212,6 @@ func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *contextmode
 			Url:        "#",
 			Icon:       "question-circle",
 			SortWeight: navtree.WeightHelp,
-			Section:    navtree.NavSectionConfig,
 			Children:   []*navtree.NavLink{},
 		}
 
@@ -234,7 +229,6 @@ func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *contextmode
 				Id:         "support-bundles",
 				Url:        "/support-bundles",
 				Icon:       "wrench",
-				Section:    navtree.NavSectionConfig,
 				SortWeight: navtree.WeightHelp,
 			}
 
@@ -286,7 +280,6 @@ func (s *ServiceImpl) getProfileNode(c *contextmodel.ReqContext) *navtree.NavLin
 		Id:         "profile",
 		Img:        gravatarURL,
 		Url:        s.cfg.AppSubURL + "/profile",
-		Section:    navtree.NavSectionConfig,
 		SortWeight: navtree.WeightProfile,
 		Children:   children,
 		RoundIcon:  true,
@@ -387,12 +380,12 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext, hasEdit
 	if hasEditPerm {
 		if hasAccess(hasEditPermInAnyFolder, ac.EvalPermission(dashboards.ActionDashboardsCreate)) {
 			dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
-				Text: "New dashboard", Icon: "plus", Url: s.cfg.AppSubURL + "/dashboard/new", HideFromTabs: true, Id: "dashboards/new", ShowIconInNavbar: true, IsCreateAction: true,
+				Text: "New dashboard", Icon: "plus", Url: s.cfg.AppSubURL + "/dashboard/new", HideFromTabs: true, Id: "dashboards/new", IsCreateAction: true,
 			})
 
 			dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
 				Text: "Import dashboard", SubTitle: "Import dashboard from file or Grafana.com", Id: "dashboards/import", Icon: "plus",
-				Url: s.cfg.AppSubURL + "/dashboard/import", HideFromTabs: true, ShowIconInNavbar: true, IsCreateAction: true,
+				Url: s.cfg.AppSubURL + "/dashboard/import", HideFromTabs: true, IsCreateAction: true,
 			})
 		}
 	}
@@ -419,7 +412,6 @@ func (s *ServiceImpl) buildLegacyAlertNavLinks(c *contextmodel.ReqContext) *navt
 		Id:         "alerting-legacy",
 		Icon:       "bell",
 		Children:   alertChildNavs,
-		Section:    navtree.NavSectionCore,
 		SortWeight: navtree.WeightAlerting,
 		Url:        s.cfg.AppSubURL + "/alerting",
 	}
@@ -462,7 +454,7 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext, hasEditPerm
 	if hasAccess(fallbackHasEditPerm, ac.EvalAny(ac.EvalPermission(ac.ActionAlertingRuleCreate), ac.EvalPermission(ac.ActionAlertingRuleExternalWrite))) {
 		alertChildNavs = append(alertChildNavs, &navtree.NavLink{
 			Text: "Create alert rule", SubTitle: "Create an alert rule", Id: "alert",
-			Icon: "plus", Url: s.cfg.AppSubURL + "/alerting/new", HideFromTabs: true, ShowIconInNavbar: true, IsCreateAction: true,
+			Icon: "plus", Url: s.cfg.AppSubURL + "/alerting/new", HideFromTabs: true, IsCreateAction: true,
 		})
 	}
 
@@ -473,7 +465,6 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext, hasEditPerm
 			Id:         navtree.NavIDAlerting,
 			Icon:       "bell",
 			Children:   alertChildNavs,
-			Section:    navtree.NavSectionCore,
 			SortWeight: navtree.WeightAlerting,
 			Url:        s.cfg.AppSubURL + "/alerting",
 		}
@@ -527,7 +518,6 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *contextmodel.ReqContext) *n
 			Id:         "connections",
 			Url:        baseUrl,
 			Children:   children,
-			Section:    navtree.NavSectionCore,
 			SortWeight: navtree.WeightDataConnections,
 		}
 
diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
index 49f7d60176a..a411c977ff9 100644
--- a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { Router } from 'react-router-dom';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
-import { NavModelItem, NavSection } from '@grafana/data';
+import { NavModelItem } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 
 import { TestProvider } from '../../../../../test/helpers/TestProvider';
@@ -14,7 +14,6 @@ const setup = () => {
   const navBarTree: NavModelItem[] = [
     {
       text: 'Section name',
-      section: NavSection.Core,
       id: 'section',
       url: 'section',
       children: [
@@ -25,7 +24,6 @@ const setup = () => {
     {
       text: 'Profile',
       id: 'profile',
-      section: NavSection.Config,
       url: 'profile',
     },
   ];
diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
index 607a5beabd3..72b90257473 100644
--- a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
@@ -3,12 +3,12 @@ import { cloneDeep } from 'lodash';
 import React from 'react';
 import { useLocation } from 'react-router-dom';
 
-import { GrafanaTheme2, NavSection } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';
 import { useTheme2 } from '@grafana/ui';
 import { useSelector } from 'app/types';
 
 import { NavBarMenu } from './NavBarMenu';
-import { enrichConfigItems, enrichWithInteractionTracking, getActiveItem } from './utils';
+import { enrichWithInteractionTracking, getActiveItem } from './utils';
 
 export interface Props {
   onClose: () => void;
@@ -23,15 +23,10 @@ export const MegaMenu = React.memo<Props>(({ onClose, searchBarHidden }) => {
 
   const navTree = cloneDeep(navBarTree);
 
-  const coreItems = navTree
-    .filter((item) => item.section === NavSection.Core || item.section === NavSection.Plugin)
+  // Remove profile + help from tree
+  const navItems = navTree
+    .filter((item) => item.id !== 'profile' && item.id !== 'help')
     .map((item) => enrichWithInteractionTracking(item, true));
-  const configItems = enrichConfigItems(
-    navTree.filter((item) => item.section === NavSection.Config && item && item.id !== 'help' && item.id !== 'profile'),
-    location
-  ).map((item) => enrichWithInteractionTracking(item, true));
-
-  const navItems = [...coreItems, ...configItems];
 
   const activeItem = getActiveItem(navItems, location.pathname);
 
diff --git a/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx
index ac5deb8cd9c..d64073c6f6c 100644
--- a/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { toIconName, useStyles2 } from '@grafana/ui';
+import { useStyles2 } from '@grafana/ui';
 
 import { NavBarMenuItem } from './NavBarMenuItem';
 import { NavBarMenuSection } from './NavBarMenuSection';
@@ -34,14 +34,12 @@ export function NavBarMenuItemWrapper({
       {linkHasChildren(link) && (
         <ul className={styles.children}>
           {link.children.map((childLink) => {
-            const icon = childLink.icon ? toIconName(childLink.icon) : undefined;
             return (
               !childLink.isCreateAction && (
                 <NavBarMenuItem
                   key={`${link.text}-${childLink.text}`}
                   isActive={isMatchOrChildMatch(childLink, activeItem)}
                   isChild
-                  icon={childLink.showIconInNavbar ? icon : undefined}
                   onClick={() => {
                     childLink.onClick?.();
                     onClose();
diff --git a/public/app/core/components/AppChrome/MegaMenu/utils.test.ts b/public/app/core/components/AppChrome/MegaMenu/utils.test.ts
index e9ea4590c67..eacea3cfdf9 100644
--- a/public/app/core/components/AppChrome/MegaMenu/utils.test.ts
+++ b/public/app/core/components/AppChrome/MegaMenu/utils.test.ts
@@ -1,43 +1,26 @@
-import { Location } from 'history';
-
 import { GrafanaConfig, locationUtil, NavModelItem } from '@grafana/data';
 import { ContextSrv, setContextSrv } from 'app/core/services/context_srv';
 
-import { enrichConfigItems, getActiveItem, isMatchOrChildMatch } from './utils';
+import { enrichHelpItem, getActiveItem, isMatchOrChildMatch } from './utils';
 
 jest.mock('../../../app_events', () => ({
   publish: jest.fn(),
 }));
 
 describe('enrichConfigItems', () => {
-  let mockItems: NavModelItem[];
-  const mockLocation: Location<unknown> = {
-    hash: '',
-    pathname: '/',
-    search: '',
-    state: '',
-  };
+  let mockHelpNode: NavModelItem;
 
   beforeEach(() => {
-    mockItems = [
-      {
-        id: 'profile',
-        text: 'Profile',
-        hideFromMenu: true,
-      },
-      {
-        id: 'help',
-        text: 'Help',
-        hideFromMenu: true,
-      },
-    ];
+    mockHelpNode = {
+      id: 'help',
+      text: 'Help',
+    };
   });
 
   it('enhances the help node with extra child links', () => {
     const contextSrv = new ContextSrv();
     setContextSrv(contextSrv);
-    const enrichedConfigItems = enrichConfigItems(mockItems, mockLocation);
-    const helpNode = enrichedConfigItems.find((item) => item.id === 'help');
+    const helpNode = enrichHelpItem(mockHelpNode);
     expect(helpNode!.children).toContainEqual(
       expect.objectContaining({
         text: 'Documentation',
diff --git a/public/app/core/components/AppChrome/MegaMenu/utils.ts b/public/app/core/components/AppChrome/MegaMenu/utils.ts
index 2127d76eba6..e75fe898796 100644
--- a/public/app/core/components/AppChrome/MegaMenu/utils.ts
+++ b/public/app/core/components/AppChrome/MegaMenu/utils.ts
@@ -1,5 +1,3 @@
-import { Location } from 'history';
-
 import { locationUtil, NavModelItem } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
 import { t } from 'app/core/internationalization';
@@ -9,29 +7,27 @@ import appEvents from '../../../app_events';
 import { getFooterLinks } from '../../Footer/Footer';
 import { HelpModal } from '../../help/HelpModal';
 
-export const enrichConfigItems = (items: NavModelItem[], location: Location<unknown>) => {
+export const enrichHelpItem = (helpItem: NavModelItem) => {
   const onOpenShortcuts = () => {
     appEvents.publish(new ShowModalReactEvent({ component: HelpModal }));
   };
 
-  items.forEach((link) => {
-    let menuItems = link.children || [];
+  let menuItems = helpItem.children || [];
 
-    if (link.id === 'help') {
-      link.children = [
-        ...menuItems,
-        ...getFooterLinks(),
-        ...getEditionAndUpdateLinks(),
-        {
-          id: 'keyboard-shortcuts',
-          text: t('nav.help/keyboard-shortcuts', 'Keyboard shortcuts'),
-          icon: 'keyboard',
-          onClick: onOpenShortcuts,
-        },
-      ];
-    }
-  });
-  return items;
+  if (helpItem.id === 'help') {
+    helpItem.children = [
+      ...menuItems,
+      ...getFooterLinks(),
+      ...getEditionAndUpdateLinks(),
+      {
+        id: 'keyboard-shortcuts',
+        text: t('nav.help/keyboard-shortcuts', 'Keyboard shortcuts'),
+        icon: 'keyboard',
+        onClick: onOpenShortcuts,
+      },
+    ];
+  }
+  return helpItem;
 };
 
 export const enrichWithInteractionTracking = (item: NavModelItem, expandedState: boolean) => {
diff --git a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.test.tsx b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.test.tsx
index 2bbcc388bf8..53b9099fff3 100644
--- a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.test.tsx
+++ b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 
-import { NavModelItem, NavSection } from '@grafana/data';
+import { NavModelItem } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 
 import { QuickAdd } from './QuickAdd';
@@ -19,7 +19,6 @@ const setup = () => {
   const navBarTree: NavModelItem[] = [
     {
       text: 'Section 1',
-      section: NavSection.Core,
       id: 'section1',
       url: 'section1',
       children: [
@@ -30,7 +29,6 @@ const setup = () => {
     {
       text: 'Section 2',
       id: 'section2',
-      section: NavSection.Config,
       url: 'section2',
       children: [{ text: 'New child 3', id: 'child3', url: 'section2/child3', isCreateAction: true }],
     },
diff --git a/public/app/core/components/AppChrome/TopBar/TopNavBarMenu.tsx b/public/app/core/components/AppChrome/TopBar/TopNavBarMenu.tsx
index d885fd83f3c..1634f8fb8fb 100644
--- a/public/app/core/components/AppChrome/TopBar/TopNavBarMenu.tsx
+++ b/public/app/core/components/AppChrome/TopBar/TopNavBarMenu.tsx
@@ -1,12 +1,11 @@
 import { css } from '@emotion/css';
 import { cloneDeep } from 'lodash';
 import React from 'react';
-import { useLocation } from 'react-router-dom';
 
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { Menu, MenuItem, useStyles2 } from '@grafana/ui';
 
-import { enrichConfigItems, enrichWithInteractionTracking } from '../MegaMenu/utils';
+import { enrichWithInteractionTracking } from '../MegaMenu/utils';
 
 export interface TopNavBarMenuProps {
   node: NavModelItem;
@@ -14,9 +13,7 @@ export interface TopNavBarMenuProps {
 
 export function TopNavBarMenu({ node: nodePlain }: TopNavBarMenuProps) {
   const styles = useStyles2(getStyles);
-  const location = useLocation();
-  const enriched = enrichConfigItems([cloneDeep(nodePlain)], location);
-  const node = enrichWithInteractionTracking(enriched[0], false);
+  const node = enrichWithInteractionTracking(cloneDeep(nodePlain), false);
 
   if (!node) {
     return null;
diff --git a/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
index 6bca6daa1a1..6ec678802da 100644
--- a/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
+++ b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
@@ -1,4 +1,5 @@
 import { css } from '@emotion/css';
+import { cloneDeep } from 'lodash';
 import React from 'react';
 import { useLocation } from 'react-router-dom';
 
@@ -9,6 +10,7 @@ import { contextSrv } from 'app/core/core';
 import { useSelector } from 'app/types';
 
 import { Branding } from '../../Branding/Branding';
+import { enrichHelpItem } from '../MegaMenu/utils';
 import { NewsContainer } from '../News/NewsContainer';
 import { OrganizationSwitcher } from '../OrganizationSwitcher/OrganizationSwitcher';
 import { QuickAdd } from '../QuickAdd/QuickAdd';
@@ -24,7 +26,7 @@ export const TopSearchBar = React.memo(function TopSearchBar() {
   const navIndex = useSelector((state) => state.navIndex);
   const location = useLocation();
 
-  const helpNode = navIndex['help'];
+  const helpNode = enrichHelpItem(cloneDeep(navIndex['help']));
   const profileNode = navIndex['profile'];
 
   let homeUrl = config.appSubUrl || '/';
diff --git a/public/app/features/connections/__mocks__/store.navIndex.mock.ts b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
index 4ff680ab811..f576aec4128 100644
--- a/public/app/features/connections/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
@@ -1,10 +1,9 @@
-import { NavIndex, NavSection } from '@grafana/data';
+import { NavIndex } from '@grafana/data';
 
 export const navIndex: NavIndex = {
   home: {
     id: 'home',
     text: 'Home',
-    section: NavSection.Core,
     icon: 'home-alt',
     url: '/',
     sortWeight: -2000,
@@ -12,14 +11,12 @@ export const navIndex: NavIndex = {
   starred: {
     id: 'starred',
     text: 'Starred',
-    section: NavSection.Core,
     icon: 'star',
     sortWeight: -1900,
     emptyMessageId: 'starred-empty',
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -28,7 +25,6 @@ export const navIndex: NavIndex = {
   'dashboards/browse': {
     id: 'dashboards/browse',
     text: 'Dashboards',
-    section: NavSection.Core,
     subTitle: 'Create and manage dashboards to visualize your data',
     icon: 'apps',
     url: '/dashboards',
@@ -59,7 +55,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -99,7 +94,6 @@ export const navIndex: NavIndex = {
   explore: {
     id: 'explore',
     text: 'Explore',
-    section: NavSection.Core,
     subTitle: 'Explore your data',
     icon: 'compass',
     url: '/explore',
@@ -107,7 +101,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -116,7 +109,6 @@ export const navIndex: NavIndex = {
   alerting: {
     id: 'alerting',
     text: 'Alerting',
-    section: NavSection.Core,
     subTitle: 'Learn about problems in your systems moments after they occur',
     icon: 'bell',
     url: '/alerting',
@@ -163,12 +155,6 @@ export const navIndex: NavIndex = {
         icon: 'cog',
         url: '/alerting/admin',
       },
-      {
-        id: 'divider',
-        text: 'Divider',
-        divider: true,
-        hideFromTabs: true,
-      },
       {
         id: 'alert',
         text: 'Create alert rule',
@@ -176,13 +162,11 @@ export const navIndex: NavIndex = {
         icon: 'plus',
         url: '/alerting/new',
         hideFromTabs: true,
-        showIconInNavbar: true,
       },
     ],
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -236,12 +220,10 @@ export const navIndex: NavIndex = {
     icon: 'plus',
     url: '/alerting/new',
     hideFromTabs: true,
-    showIconInNavbar: true,
   },
   connections: {
     id: 'connections',
     text: 'Connections',
-    section: NavSection.Core,
     icon: 'link',
     url: '/connections',
     sortWeight: -1300,
@@ -276,7 +258,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -323,7 +304,6 @@ export const navIndex: NavIndex = {
   cfg: {
     id: 'cfg',
     text: 'Administration',
-    section: NavSection.Config,
     subTitle: 'Organization: Main Org. 123',
     icon: 'cog',
     url: '/admin',
@@ -381,7 +361,6 @@ export const navIndex: NavIndex = {
       {
         id: 'admin',
         text: 'Server admin',
-        section: NavSection.Config,
         subTitle: 'Manage server-wide settings and access to resources such as organizations, users, and licenses',
         icon: 'shield',
         url: '/admin/server',
@@ -419,7 +398,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -477,7 +455,6 @@ export const navIndex: NavIndex = {
   admin: {
     id: 'admin',
     text: 'Server admin',
-    section: NavSection.Config,
     subTitle: 'Manage server-wide settings and access to resources such as organizations, users, and licenses',
     icon: 'shield',
     url: '/admin/server',
@@ -541,7 +518,6 @@ export const navIndex: NavIndex = {
   monitoring: {
     id: 'monitoring',
     text: 'Monitoring',
-    section: NavSection.Core,
     subTitle: 'Monitoring and infrastructure apps',
     icon: 'heart-rate',
     url: '/monitoring',
@@ -550,7 +526,6 @@ export const navIndex: NavIndex = {
       {
         id: 'plugin-page-grafana-synthetic-monitoring-app',
         text: 'Synthetic Monitoring',
-        section: NavSection.Plugin,
         img: 'public/plugins/grafana-synthetic-monitoring-app/img/logo.svg',
         url: '/a/grafana-synthetic-monitoring-app/home',
         sortWeight: 2,
@@ -588,7 +563,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -597,7 +571,6 @@ export const navIndex: NavIndex = {
   'plugin-page-grafana-synthetic-monitoring-app': {
     id: 'plugin-page-grafana-synthetic-monitoring-app',
     text: 'Synthetic Monitoring',
-    section: NavSection.Plugin,
     img: 'public/plugins/grafana-synthetic-monitoring-app/img/logo.svg',
     url: '/a/grafana-synthetic-monitoring-app/home',
     sortWeight: 2,
@@ -639,7 +612,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'plugin-page-redis-explorer-app',
       text: 'Redis Explorer',
-      section: NavSection.Plugin,
       img: 'public/plugins/redis-explorer-app/img/logo.svg',
       url: '/a/redis-explorer-app/',
       sortWeight: -1200,
@@ -674,7 +646,6 @@ export const navIndex: NavIndex = {
       parentItem: {
         id: 'apps',
         text: 'Apps',
-        section: NavSection.Core,
         subTitle: 'App plugins that extend the Grafana experience',
         icon: 'apps',
         url: '/apps',
@@ -683,7 +654,6 @@ export const navIndex: NavIndex = {
           {
             id: 'plugin-page-cloudflare-app',
             text: 'Cloudflare Grafana App',
-            section: NavSection.Plugin,
             img: 'public/plugins/cloudflare-app/img/cf_icon.png',
             url: '/a/cloudflare-app',
             sortWeight: -1200,
@@ -705,7 +675,6 @@ export const navIndex: NavIndex = {
           {
             id: 'plugin-page-grafana-easystart-app',
             text: 'Integrations and Connections',
-            section: NavSection.Plugin,
             img: 'public/plugins/grafana-easystart-app/img/logo.svg',
             url: '/a/grafana-easystart-app',
             sortWeight: -1200,
@@ -722,7 +691,6 @@ export const navIndex: NavIndex = {
           {
             id: 'plugin-page-grafana-k6-app',
             text: 'k6 Cloud App',
-            section: NavSection.Plugin,
             img: 'public/plugins/grafana-k6-app/img/logo.svg',
             url: '/a/grafana-k6-app',
             sortWeight: -1200,
@@ -732,7 +700,6 @@ export const navIndex: NavIndex = {
           {
             id: 'plugin-page-myorg-app-basic',
             text: 'Basic App',
-            section: NavSection.Plugin,
             img: 'public/plugins/myorg-app-basic/img/logo.svg',
             url: '/a/myorg-app-basic/one',
             sortWeight: -1200,
@@ -766,7 +733,6 @@ export const navIndex: NavIndex = {
         parentItem: {
           id: 'home',
           text: 'Home',
-          section: NavSection.Core,
           icon: 'home-alt',
           url: '/',
           sortWeight: -2000,
@@ -777,7 +743,6 @@ export const navIndex: NavIndex = {
   apps: {
     id: 'apps',
     text: 'Apps',
-    section: NavSection.Core,
     subTitle: 'App plugins that extend the Grafana experience',
     icon: 'apps',
     url: '/apps',
@@ -786,7 +751,6 @@ export const navIndex: NavIndex = {
       {
         id: 'plugin-page-cloudflare-app',
         text: 'Cloudflare Grafana App',
-        section: NavSection.Plugin,
         img: 'public/plugins/cloudflare-app/img/cf_icon.png',
         url: '/a/cloudflare-app',
         sortWeight: -1200,
@@ -808,7 +772,6 @@ export const navIndex: NavIndex = {
       {
         id: 'plugin-page-grafana-easystart-app',
         text: 'Integrations and Connections',
-        section: NavSection.Plugin,
         img: 'public/plugins/grafana-easystart-app/img/logo.svg',
         url: '/a/grafana-easystart-app',
         sortWeight: -1200,
@@ -825,7 +788,6 @@ export const navIndex: NavIndex = {
       {
         id: 'plugin-page-grafana-k6-app',
         text: 'k6 Cloud App',
-        section: NavSection.Plugin,
         img: 'public/plugins/grafana-k6-app/img/logo.svg',
         url: '/a/grafana-k6-app',
         sortWeight: -1200,
@@ -835,7 +797,6 @@ export const navIndex: NavIndex = {
       {
         id: 'plugin-page-myorg-app-basic',
         text: 'Basic App',
-        section: NavSection.Plugin,
         img: 'public/plugins/myorg-app-basic/img/logo.svg',
         url: '/a/myorg-app-basic/one',
         sortWeight: -1200,
@@ -869,7 +830,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -878,7 +838,6 @@ export const navIndex: NavIndex = {
   'plugin-page-cloudflare-app': {
     id: 'plugin-page-cloudflare-app',
     text: 'Cloudflare Grafana App',
-    section: NavSection.Plugin,
     img: 'public/plugins/cloudflare-app/img/cf_icon.png',
     url: '/a/cloudflare-app',
     sortWeight: -1200,
@@ -900,7 +859,6 @@ export const navIndex: NavIndex = {
   'plugin-page-grafana-easystart-app': {
     id: 'plugin-page-grafana-easystart-app',
     text: 'Integrations and Connections',
-    section: NavSection.Plugin,
     img: 'public/plugins/grafana-easystart-app/img/logo.svg',
     url: '/a/grafana-easystart-app',
     sortWeight: -1200,
@@ -917,7 +875,6 @@ export const navIndex: NavIndex = {
   'plugin-page-grafana-k6-app': {
     id: 'plugin-page-grafana-k6-app',
     text: 'k6 Cloud App',
-    section: NavSection.Plugin,
     img: 'public/plugins/grafana-k6-app/img/logo.svg',
     url: '/a/grafana-k6-app',
     sortWeight: -1200,
@@ -927,7 +884,6 @@ export const navIndex: NavIndex = {
   'plugin-page-myorg-app-basic': {
     id: 'plugin-page-myorg-app-basic',
     text: 'Basic App',
-    section: NavSection.Plugin,
     img: 'public/plugins/myorg-app-basic/img/logo.svg',
     url: '/a/myorg-app-basic/one',
     sortWeight: -1200,
@@ -960,7 +916,6 @@ export const navIndex: NavIndex = {
   'plugin-page-redis-explorer-app': {
     id: 'plugin-page-redis-explorer-app',
     text: 'Redis Explorer',
-    section: NavSection.Plugin,
     img: 'public/plugins/redis-explorer-app/img/logo.svg',
     url: '/a/redis-explorer-app/',
     sortWeight: -1200,
@@ -995,7 +950,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'apps',
       text: 'Apps',
-      section: NavSection.Core,
       subTitle: 'App plugins that extend the Grafana experience',
       icon: 'apps',
       url: '/apps',
@@ -1004,7 +958,6 @@ export const navIndex: NavIndex = {
         {
           id: 'plugin-page-cloudflare-app',
           text: 'Cloudflare Grafana App',
-          section: NavSection.Plugin,
           img: 'public/plugins/cloudflare-app/img/cf_icon.png',
           url: '/a/cloudflare-app',
           sortWeight: -1200,
@@ -1026,7 +979,6 @@ export const navIndex: NavIndex = {
         {
           id: 'plugin-page-grafana-easystart-app',
           text: 'Integrations and Connections',
-          section: NavSection.Plugin,
           img: 'public/plugins/grafana-easystart-app/img/logo.svg',
           url: '/a/grafana-easystart-app',
           sortWeight: -1200,
@@ -1043,7 +995,6 @@ export const navIndex: NavIndex = {
         {
           id: 'plugin-page-grafana-k6-app',
           text: 'k6 Cloud App',
-          section: NavSection.Plugin,
           img: 'public/plugins/grafana-k6-app/img/logo.svg',
           url: '/a/grafana-k6-app',
           sortWeight: -1200,
@@ -1053,7 +1004,6 @@ export const navIndex: NavIndex = {
         {
           id: 'plugin-page-myorg-app-basic',
           text: 'Basic App',
-          section: NavSection.Plugin,
           img: 'public/plugins/myorg-app-basic/img/logo.svg',
           url: '/a/myorg-app-basic/one',
           sortWeight: -1200,
@@ -1087,7 +1037,6 @@ export const navIndex: NavIndex = {
       parentItem: {
         id: 'home',
         text: 'Home',
-        section: NavSection.Core,
         icon: 'home-alt',
         url: '/',
         sortWeight: -2000,
@@ -1097,7 +1046,6 @@ export const navIndex: NavIndex = {
   profile: {
     id: 'profile',
     text: 'admin',
-    section: NavSection.Config,
     img: '/avatar/46d229b033af06a191ff2267bca9ae56',
     url: '/profile',
     sortWeight: -600,
@@ -1133,7 +1081,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
@@ -1168,7 +1115,6 @@ export const navIndex: NavIndex = {
   help: {
     id: 'help',
     text: 'Help',
-    section: NavSection.Config,
     subTitle: 'Grafana v9.4.0-pre (8f5dc47e87)',
     icon: 'question-circle',
     url: '#',
@@ -1176,7 +1122,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'home',
       text: 'Home',
-      section: NavSection.Core,
       icon: 'home-alt',
       url: '/',
       sortWeight: -2000,
diff --git a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
index 9ceb0484c09..9376b24ee32 100644
--- a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
@@ -1,10 +1,9 @@
-import { NavSection, NavIndex } from '@grafana/data';
+import { NavIndex } from '@grafana/data';
 
 export const navIndex: NavIndex = {
   dashboards: {
     id: 'dashboards',
     text: 'Dashboards',
-    section: NavSection.Core,
     subTitle: 'Manage dashboards and folders',
     icon: 'apps',
     url: '/dashboards',
@@ -34,19 +33,12 @@ export const navIndex: NavIndex = {
         icon: 'library-panel',
         url: '/library-panels',
       },
-      {
-        id: 'divider',
-        text: 'Divider',
-        divider: true,
-        hideFromTabs: true,
-      },
       {
         id: 'new-dashboard',
         text: 'New dashboard',
         icon: 'plus',
         url: '/dashboard/new',
         hideFromTabs: true,
-        showIconInNavbar: true,
       },
       {
         id: 'new-folder',
@@ -55,7 +47,6 @@ export const navIndex: NavIndex = {
         icon: 'plus',
         url: '/dashboards/folder/new',
         hideFromTabs: true,
-        showIconInNavbar: true,
       },
       {
         id: 'import',
@@ -64,7 +55,6 @@ export const navIndex: NavIndex = {
         icon: 'plus',
         url: '/dashboard/import',
         hideFromTabs: true,
-        showIconInNavbar: true,
       },
     ],
   },
@@ -76,7 +66,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -106,19 +95,12 @@ export const navIndex: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
           icon: 'plus',
           url: '/dashboard/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'new-folder',
@@ -127,7 +109,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboards/folder/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'import',
@@ -136,7 +117,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboard/import',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -149,7 +129,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -179,19 +158,12 @@ export const navIndex: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
           icon: 'plus',
           url: '/dashboard/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'new-folder',
@@ -200,7 +172,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboards/folder/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'import',
@@ -209,7 +180,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboard/import',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -222,7 +192,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -252,19 +221,12 @@ export const navIndex: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
           icon: 'plus',
           url: '/dashboard/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'new-folder',
@@ -273,7 +235,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboards/folder/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'import',
@@ -282,7 +243,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboard/import',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -295,7 +255,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -325,19 +284,12 @@ export const navIndex: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
           icon: 'plus',
           url: '/dashboard/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'new-folder',
@@ -346,7 +298,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboards/folder/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'import',
@@ -355,75 +306,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboard/import',
           hideFromTabs: true,
-          showIconInNavbar: true,
-        },
-      ],
-    },
-  },
-  divider: {
-    id: 'divider',
-    text: 'Divider',
-    divider: true,
-    hideFromTabs: true,
-    parentItem: {
-      id: 'alerting',
-      text: 'Alerting',
-      section: NavSection.Core,
-      subTitle: 'Alert rules and notifications',
-      icon: 'bell',
-      url: '/alerting/list',
-      sortWeight: -1600,
-      children: [
-        {
-          id: 'alert-list',
-          text: 'Alert rules',
-          icon: 'list-ul',
-          url: '/alerting/list',
-        },
-        {
-          id: 'receivers',
-          text: 'Contact points',
-          icon: 'comment-alt-share',
-          url: '/alerting/notifications',
-        },
-        {
-          id: 'am-routes',
-          text: 'Notification policies',
-          icon: 'sitemap',
-          url: '/alerting/routes',
-        },
-        {
-          id: 'silences',
-          text: 'Silences',
-          icon: 'bell-slash',
-          url: '/alerting/silences',
-        },
-        {
-          id: 'groups',
-          text: 'Alert groups',
-          icon: 'layer-group',
-          url: '/alerting/groups',
-        },
-        {
-          id: 'alerting-admin',
-          text: 'Admin',
-          icon: 'cog',
-          url: '/alerting/admin',
-        },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
-        {
-          id: 'alert',
-          text: 'Create alert rule',
-          subTitle: 'Create an alert rule',
-          icon: 'plus',
-          url: '/alerting/new',
-          hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -434,11 +316,9 @@ export const navIndex: NavIndex = {
     icon: 'plus',
     url: '/dashboard/new',
     hideFromTabs: true,
-    showIconInNavbar: true,
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -468,19 +348,12 @@ export const navIndex: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
           icon: 'plus',
           url: '/dashboard/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'new-folder',
@@ -489,7 +362,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboards/folder/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'import',
@@ -498,7 +370,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboard/import',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -510,11 +381,9 @@ export const navIndex: NavIndex = {
     icon: 'plus',
     url: '/dashboards/folder/new',
     hideFromTabs: true,
-    showIconInNavbar: true,
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -544,19 +413,12 @@ export const navIndex: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
           icon: 'plus',
           url: '/dashboard/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'new-folder',
@@ -565,7 +427,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboards/folder/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'import',
@@ -574,7 +435,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboard/import',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -586,11 +446,9 @@ export const navIndex: NavIndex = {
     icon: 'plus',
     url: '/dashboard/import',
     hideFromTabs: true,
-    showIconInNavbar: true,
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -620,19 +478,12 @@ export const navIndex: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
           icon: 'plus',
           url: '/dashboard/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'new-folder',
@@ -641,7 +492,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboards/folder/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
         {
           id: 'import',
@@ -650,7 +500,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/dashboard/import',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -663,7 +512,6 @@ export const navIndex: NavIndex = {
   explore: {
     id: 'explore',
     text: 'Explore',
-    section: NavSection.Core,
     subTitle: 'Explore your data',
     icon: 'compass',
     url: '/explore',
@@ -672,7 +520,6 @@ export const navIndex: NavIndex = {
   alerting: {
     id: 'alerting',
     text: 'Alerting',
-    section: NavSection.Core,
     subTitle: 'Alert rules and notifications',
     icon: 'bell',
     url: '/alerting/list',
@@ -714,12 +561,6 @@ export const navIndex: NavIndex = {
         icon: 'cog',
         url: '/alerting/admin',
       },
-      {
-        id: 'divider',
-        text: 'Divider',
-        divider: true,
-        hideFromTabs: true,
-      },
       {
         id: 'alert',
         text: 'Create alert rule',
@@ -727,7 +568,6 @@ export const navIndex: NavIndex = {
         icon: 'plus',
         url: '/alerting/new',
         hideFromTabs: true,
-        showIconInNavbar: true,
       },
     ],
   },
@@ -739,7 +579,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -781,12 +620,6 @@ export const navIndex: NavIndex = {
           icon: 'cog',
           url: '/alerting/admin',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'alert',
           text: 'Create alert rule',
@@ -794,7 +627,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/alerting/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -807,7 +639,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -849,12 +680,6 @@ export const navIndex: NavIndex = {
           icon: 'cog',
           url: '/alerting/admin',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'alert',
           text: 'Create alert rule',
@@ -862,7 +687,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/alerting/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -875,7 +699,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -917,12 +740,6 @@ export const navIndex: NavIndex = {
           icon: 'cog',
           url: '/alerting/admin',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'alert',
           text: 'Create alert rule',
@@ -930,7 +747,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/alerting/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -943,7 +759,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -985,12 +800,6 @@ export const navIndex: NavIndex = {
           icon: 'cog',
           url: '/alerting/admin',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'alert',
           text: 'Create alert rule',
@@ -998,7 +807,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/alerting/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -1011,7 +819,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -1053,12 +860,6 @@ export const navIndex: NavIndex = {
           icon: 'cog',
           url: '/alerting/admin',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'alert',
           text: 'Create alert rule',
@@ -1066,7 +867,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/alerting/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -1079,7 +879,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -1121,12 +920,6 @@ export const navIndex: NavIndex = {
           icon: 'cog',
           url: '/alerting/admin',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'alert',
           text: 'Create alert rule',
@@ -1134,7 +927,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/alerting/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -1146,11 +938,9 @@ export const navIndex: NavIndex = {
     icon: 'plus',
     url: '/alerting/new',
     hideFromTabs: true,
-    showIconInNavbar: true,
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -1192,12 +982,6 @@ export const navIndex: NavIndex = {
           icon: 'cog',
           url: '/alerting/admin',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'alert',
           text: 'Create alert rule',
@@ -1205,7 +989,6 @@ export const navIndex: NavIndex = {
           icon: 'plus',
           url: '/alerting/new',
           hideFromTabs: true,
-          showIconInNavbar: true,
         },
       ],
     },
@@ -1213,7 +996,6 @@ export const navIndex: NavIndex = {
   connections: {
     id: 'connections',
     text: 'Connections',
-    section: NavSection.Core,
     icon: 'link',
     url: '/connections',
     sortWeight: -1500,
@@ -1257,7 +1039,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'connections',
       text: 'Connections',
-      section: NavSection.Core,
       icon: 'link',
       url: '/connections',
       sortWeight: -1500,
@@ -1302,7 +1083,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'connections',
       text: 'Connections',
-      section: NavSection.Core,
       icon: 'link',
       url: '/connections',
       sortWeight: -1500,
@@ -1347,7 +1127,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'connections',
       text: 'Connections',
-      section: NavSection.Core,
       icon: 'link',
       url: '/connections',
       sortWeight: -1500,
@@ -1392,7 +1171,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'connections',
       text: 'Connections',
-      section: NavSection.Core,
       icon: 'link',
       url: '/connections',
       sortWeight: -1500,
@@ -1431,7 +1209,6 @@ export const navIndex: NavIndex = {
   'plugin-page-basic-app': {
     id: 'plugin-page-basic-app',
     text: 'Basic App',
-    section: NavSection.Plugin,
     img: 'public/plugins/basic-app/img/logo.svg',
     url: '/a/basic-app/one',
     sortWeight: -1400,
@@ -1465,7 +1242,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'plugin-page-grafana-synthetic-monitoring-app',
       text: 'Synthetic Monitoring',
-      section: NavSection.Plugin,
       img: 'public/plugins/grafana-synthetic-monitoring-app/img/logo.svg',
       url: '/a/grafana-synthetic-monitoring-app/home',
       sortWeight: -1400,
@@ -1500,7 +1276,6 @@ export const navIndex: NavIndex = {
   'plugin-page-cloudflare-app': {
     id: 'plugin-page-cloudflare-app',
     text: 'Cloudflare Grafana App',
-    section: NavSection.Plugin,
     img: 'public/plugins/cloudflare-app/img/cf_icon.png',
     sortWeight: -1400,
     children: [
@@ -1517,7 +1292,6 @@ export const navIndex: NavIndex = {
   'plugin-page-grafana-easystart-app': {
     id: 'plugin-page-grafana-easystart-app',
     text: 'Integrations and Connections',
-    section: NavSection.Plugin,
     img: 'public/plugins/grafana-easystart-app/img/logo.svg',
     url: '/a/grafana-easystart-app',
     sortWeight: -1400,
@@ -1525,7 +1299,6 @@ export const navIndex: NavIndex = {
   'plugin-page-redis-explorer-app': {
     id: 'plugin-page-redis-explorer-app',
     text: 'Redis Explorer',
-    section: NavSection.Plugin,
     img: 'public/plugins/redis-explorer-app/img/logo.svg',
     url: '/a/redis-explorer-app/',
     sortWeight: -1400,
@@ -1565,7 +1338,6 @@ export const navIndex: NavIndex = {
   'plugin-page-grafana-synthetic-monitoring-app': {
     id: 'plugin-page-grafana-synthetic-monitoring-app',
     text: 'Synthetic Monitoring',
-    section: NavSection.Plugin,
     img: 'public/plugins/grafana-synthetic-monitoring-app/img/logo.svg',
     url: '/a/grafana-synthetic-monitoring-app/home',
     sortWeight: -1400,
@@ -1599,7 +1371,6 @@ export const navIndex: NavIndex = {
   'plugin-page-grafana-k6-app': {
     id: 'plugin-page-grafana-k6-app',
     text: 'k6 Cloud App',
-    section: NavSection.Plugin,
     img: 'public/plugins/grafana-k6-app/img/logo.svg',
     url: '/a/grafana-k6-app',
     sortWeight: -1400,
@@ -1607,7 +1378,6 @@ export const navIndex: NavIndex = {
   cfg: {
     id: 'cfg',
     text: 'Configuration',
-    section: NavSection.Config,
     subTitle: 'Organization: Main Org.',
     icon: 'cog',
     url: '/datasources',
@@ -1673,7 +1443,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1740,7 +1509,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1807,7 +1575,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1874,7 +1641,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1941,7 +1707,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -2008,7 +1773,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -2075,7 +1839,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -2136,7 +1899,6 @@ export const navIndex: NavIndex = {
   admin: {
     id: 'admin',
     text: 'Server Admin',
-    section: NavSection.Config,
     subTitle: 'Manage all users and orgs',
     icon: 'shield',
     url: '/admin/users',
@@ -2183,7 +1945,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2231,7 +1992,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2279,7 +2039,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2327,7 +2086,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2375,7 +2133,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2418,7 +2175,6 @@ export const navIndex: NavIndex = {
   profile: {
     id: 'profile',
     text: 'admin',
-    section: NavSection.Config,
     img: '/avatar/46d229b033af06a191ff2267bca9ae56',
     url: '/profile',
     sortWeight: -1100,
@@ -2459,7 +2215,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       sortWeight: -1100,
@@ -2501,7 +2256,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       sortWeight: -1100,
@@ -2543,7 +2297,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       sortWeight: -1100,
@@ -2587,7 +2340,6 @@ export const navIndex: NavIndex = {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       sortWeight: -1100,
@@ -2624,7 +2376,6 @@ export const navIndex: NavIndex = {
   help: {
     id: 'help',
     text: 'Help',
-    section: NavSection.Config,
     subTitle: 'Grafana v9.0.0-pre (cd35366222)',
     icon: 'question-circle',
     url: '#',
diff --git a/public/test/mocks/navModel.ts b/public/test/mocks/navModel.ts
index 0bcd93530f7..8bd68be6eeb 100644
--- a/public/test/mocks/navModel.ts
+++ b/public/test/mocks/navModel.ts
@@ -1,17 +1,15 @@
-import { NavIndex, NavSection } from '@grafana/data';
+import { NavIndex } from '@grafana/data';
 
 export const mockNavModel: NavIndex = {
   home: {
     id: 'home',
     text: 'Home',
-    section: NavSection.Core,
     icon: 'home-alt',
     url: '/',
   },
   dashboards: {
     id: 'dashboards',
     text: 'Dashboards',
-    section: NavSection.Core,
     subTitle: 'Manage dashboards and folders',
     icon: 'apps',
     url: '/dashboards',
@@ -40,12 +38,6 @@ export const mockNavModel: NavIndex = {
         icon: 'library-panel',
         url: '/library-panels',
       },
-      {
-        id: 'divider',
-        text: 'Divider',
-        divider: true,
-        hideFromTabs: true,
-      },
       {
         id: 'new-dashboard',
         text: 'New dashboard',
@@ -79,7 +71,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -108,12 +99,6 @@ export const mockNavModel: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
@@ -148,7 +133,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -177,12 +161,6 @@ export const mockNavModel: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
@@ -217,7 +195,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -246,12 +223,6 @@ export const mockNavModel: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
@@ -286,7 +257,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -315,81 +285,6 @@ export const mockNavModel: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
-        {
-          id: 'new-dashboard',
-          text: 'New dashboard',
-          icon: 'plus',
-          url: '/dashboard/new',
-          hideFromTabs: true,
-        },
-        {
-          id: 'new-folder',
-          text: 'New folder',
-          subTitle: 'Create a new folder to organize your dashboards',
-          icon: 'plus',
-          url: '/dashboards/folder/new',
-          hideFromTabs: true,
-        },
-        {
-          id: 'import',
-          text: 'Import',
-          subTitle: 'Import dashboard from file or Grafana.com',
-          icon: 'plus',
-          url: '/dashboard/import',
-          hideFromTabs: true,
-        },
-      ],
-    },
-  },
-  divider: {
-    id: 'divider',
-    text: 'Divider',
-    divider: true,
-    hideFromTabs: true,
-    parentItem: {
-      id: 'dashboards',
-      text: 'Dashboards',
-      section: NavSection.Core,
-      subTitle: 'Manage dashboards and folders',
-      icon: 'apps',
-      url: '/dashboards',
-      children: [
-        {
-          id: 'manage-dashboards',
-          text: 'Browse',
-          icon: 'sitemap',
-          url: '/dashboards',
-        },
-        {
-          id: 'playlists',
-          text: 'Playlists',
-          icon: 'presentation-play',
-          url: '/playlists',
-        },
-        {
-          id: 'snapshots',
-          text: 'Snapshots',
-          icon: 'camera',
-          url: '/dashboard/snapshots',
-        },
-        {
-          id: 'library-panels',
-          text: 'Library panels',
-          icon: 'library-panel',
-          url: '/library-panels',
-        },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
@@ -425,7 +320,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -454,12 +348,6 @@ export const mockNavModel: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
@@ -496,7 +384,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -525,12 +412,6 @@ export const mockNavModel: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
@@ -567,7 +448,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -596,12 +476,6 @@ export const mockNavModel: NavIndex = {
           icon: 'library-panel',
           url: '/library-panels',
         },
-        {
-          id: 'divider',
-          text: 'Divider',
-          divider: true,
-          hideFromTabs: true,
-        },
         {
           id: 'new-dashboard',
           text: 'New dashboard',
@@ -636,7 +510,6 @@ export const mockNavModel: NavIndex = {
   explore: {
     id: 'explore',
     text: 'Explore',
-    section: NavSection.Core,
     subTitle: 'Explore your data',
     icon: 'compass',
     url: '/explore',
@@ -644,7 +517,6 @@ export const mockNavModel: NavIndex = {
   alerting: {
     id: 'alerting',
     text: 'Alerting',
-    section: NavSection.Core,
     subTitle: 'Alert rules and notifications',
     icon: 'bell',
     url: '/alerting/list',
@@ -671,7 +543,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -699,7 +570,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -722,7 +592,6 @@ export const mockNavModel: NavIndex = {
   cfg: {
     id: 'cfg',
     text: 'Configuration',
-    section: NavSection.Config,
     subTitle: 'Organization: Main Org',
     icon: 'cog',
     url: '/datasources',
@@ -773,7 +642,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org',
       icon: 'cog',
       url: '/datasources',
@@ -825,7 +693,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org',
       icon: 'cog',
       url: '/datasources',
@@ -877,7 +744,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org',
       icon: 'cog',
       url: '/datasources',
@@ -929,7 +795,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org',
       icon: 'cog',
       url: '/datasources',
@@ -981,7 +846,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org',
       icon: 'cog',
       url: '/datasources',
@@ -1033,7 +897,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: NavSection.Config,
       subTitle: 'Organization: Main Org',
       icon: 'cog',
       url: '/datasources',
@@ -1080,7 +943,6 @@ export const mockNavModel: NavIndex = {
   admin: {
     id: 'admin',
     text: 'Server Admin',
-    section: NavSection.Config,
     subTitle: 'Manage all users and orgs',
     icon: 'shield',
     url: '/admin/users',
@@ -1120,7 +982,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -1161,7 +1022,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -1208,7 +1068,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -1249,7 +1108,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -1285,7 +1143,6 @@ export const mockNavModel: NavIndex = {
   profile: {
     id: 'profile',
     text: 'admin',
-    section: NavSection.Config,
     img: '/avatar/46d229b033af06a191ff2267bca9ae56',
     url: '/profile',
     children: [
@@ -1319,7 +1176,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       children: [
@@ -1354,7 +1210,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       children: [
@@ -1391,7 +1246,6 @@ export const mockNavModel: NavIndex = {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       children: [
@@ -1421,7 +1275,6 @@ export const mockNavModel: NavIndex = {
   help: {
     id: 'help',
     text: 'Help',
-    section: NavSection.Config,
     subTitle: 'Grafana v8.5.0-pre (f1c4da095b)',
     icon: 'question-circle',
     url: '#',

From 73f1cd7badccdf78f89328783b0ef691fc74cdb3 Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:19:44 +0200
Subject: [PATCH 185/729] TimePicker: Fixes issues with "Recently used absolute
 ranges" section (#66281)

* TimePicker: Fixes issues with "Recently used absolute ranges" section

Squashed commit of the following:

commit 99d5076ce1fadde1f22ed372f372656b58efa1c4
Author: Joao Silva <joao.silva@grafana.com>
Date:   Tue Apr 11 14:06:27 2023 +0100

    user essentials mob! :trident:

    lastFile:public/app/core/components/TimePicker/TimePickerWithHistory.tsx

commit cad0201df452f956a422b030d5b15e8ba4aed9a9
Author: eledobleefe <laura.fernandez@grafana.com>
Date:   Tue Apr 11 11:44:34 2023 +0200

    user essentials mob! :trident:

    lastFile:public/app/core/components/TimePicker/TimePickerWithHistory.tsx

Co-authored-by: eledobleefe <laura.fernandez@grafana.com>

* TimePicker: Add correct date format

* Add convertRawToRange tests

* Rename test variables

* RTL tests

* Proper RTL tests

* Apply suggestions from code review

Co-authored-by: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>

* Remove commented line

* Fix linting

---------

Co-authored-by: eledobleefe <laura.fernandez@grafana.com>
Co-authored-by: Tobias Skarhed <tobias.skarhed@gmail.com>
Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
---
 jest.config.js                                |  2 +-
 .../grafana-data/src/datetime/parser.test.ts  |  5 ++
 .../src/datetime/rangeutil.test.ts            | 49 +++++++++++++++++-
 .../grafana-data/src/datetime/rangeutil.ts    | 11 ++--
 .../TimePicker/TimePickerWithHistory.test.tsx | 50 ++++++++++++++++++-
 .../TimePicker/TimePickerWithHistory.tsx      |  9 ++--
 6 files changed, 115 insertions(+), 11 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 3bb98ec70d4..1bfdda0b359 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,7 +1,7 @@
 // We set this specifically for 2 reasons.
 // 1. It makes sense for both CI tests and local tests to behave the same so issues are found earlier
 // 2. Any wrong timezone handling could be hidden if we use UTC/GMT local time (which would happen in CI).
-process.env.TZ = 'Pacific/Easter';
+process.env.TZ = 'Pacific/Easter'; // UTC-06:00 or UTC-05:00 depending on daylight savings
 
 const esModules = ['ol', 'd3', 'd3-color', 'd3-interpolate', 'delaunator', 'internmap', 'robust-predicates'].join('|');
 
diff --git a/packages/grafana-data/src/datetime/parser.test.ts b/packages/grafana-data/src/datetime/parser.test.ts
index f9756c8b736..f19ddb87ae7 100644
--- a/packages/grafana-data/src/datetime/parser.test.ts
+++ b/packages/grafana-data/src/datetime/parser.test.ts
@@ -2,6 +2,11 @@ import { systemDateFormats, SystemDateFormatsState } from './formats';
 import { dateTimeParse } from './parser';
 
 describe('dateTimeParse', () => {
+  it('should parse using the systems configured timezone', () => {
+    const date = dateTimeParse('2020-03-02 15:00:22');
+    expect(date.format()).toEqual('2020-03-02T15:00:22-05:00');
+  });
+
   it('should be able to parse using default format', () => {
     const date = dateTimeParse('2020-03-02 15:00:22', { timeZone: 'utc' });
     expect(date.format()).toEqual('2020-03-02T15:00:22Z');
diff --git a/packages/grafana-data/src/datetime/rangeutil.test.ts b/packages/grafana-data/src/datetime/rangeutil.test.ts
index 7f48135d928..8fa40c02444 100644
--- a/packages/grafana-data/src/datetime/rangeutil.test.ts
+++ b/packages/grafana-data/src/datetime/rangeutil.test.ts
@@ -1,10 +1,57 @@
-import { TimeRange } from '../types/time';
+import { RawTimeRange, TimeRange } from '../types/time';
 
 import { timeRangeToRelative } from './rangeutil';
 
 import { dateTime, rangeUtil } from './index';
 
 describe('Range Utils', () => {
+  // These tests probably wrap the dateTimeParser tests to some extent
+  describe('convertRawToRange', () => {
+    const DEFAULT_DATE_VALUE = '1996-07-30 16:00:00'; // Default format YYYY-MM-DD HH:mm:ss
+    const DEFAULT_DATE_VALUE_FORMATTED = '1996-07-30T16:00:00-06:00';
+    const defaultRawTimeRange = {
+      from: DEFAULT_DATE_VALUE,
+      to: '1996-07-30 16:20:00',
+    };
+
+    it('should serialize the default format by default', () => {
+      const deserialized = rangeUtil.convertRawToRange(defaultRawTimeRange);
+      expect(deserialized.from.format()).toBe(DEFAULT_DATE_VALUE_FORMATTED);
+    });
+
+    it('should serialize using custom formats', () => {
+      const NON_DEFAULT_FORMAT = 'DD-MM-YYYY HH:mm:ss';
+      const nonDefaultRawTimeRange: RawTimeRange = {
+        from: '30-07-1996 16:00:00',
+        to: '30-07-1996 16:20:00',
+      };
+
+      const deserializedTimeRange = rangeUtil.convertRawToRange(
+        nonDefaultRawTimeRange,
+        undefined,
+        undefined,
+        NON_DEFAULT_FORMAT
+      );
+      expect(deserializedTimeRange.from.format()).toBe(DEFAULT_DATE_VALUE_FORMATTED);
+    });
+
+    it('should take timezone into account', () => {
+      const deserializedTimeRange = rangeUtil.convertRawToRange(defaultRawTimeRange, 'UTC');
+      expect(deserializedTimeRange.from.format()).toBe('1996-07-30T16:00:00Z');
+    });
+
+    it('should leave the raw part intact if it has calulactions', () => {
+      const timeRange = {
+        from: DEFAULT_DATE_VALUE,
+        to: 'now',
+      };
+
+      const deserialized = rangeUtil.convertRawToRange(timeRange);
+      expect(deserialized.raw).toStrictEqual(timeRange);
+      expect(deserialized.to.toString()).not.toBe(deserialized.raw.to);
+    });
+  });
+
   describe('relative time', () => {
     it('should identify absolute vs relative', () => {
       expect(
diff --git a/packages/grafana-data/src/datetime/rangeutil.ts b/packages/grafana-data/src/datetime/rangeutil.ts
index 626780d7f25..29e4d820cc3 100644
--- a/packages/grafana-data/src/datetime/rangeutil.ts
+++ b/packages/grafana-data/src/datetime/rangeutil.ts
@@ -198,9 +198,14 @@ export const describeTimeRangeAbbreviation = (range: TimeRange, timeZone?: TimeZ
   return parsed ? timeZoneAbbrevation(parsed, { timeZone }) : '';
 };
 
-export const convertRawToRange = (raw: RawTimeRange, timeZone?: TimeZone, fiscalYearStartMonth?: number): TimeRange => {
-  const from = dateTimeParse(raw.from, { roundUp: false, timeZone, fiscalYearStartMonth });
-  const to = dateTimeParse(raw.to, { roundUp: true, timeZone, fiscalYearStartMonth });
+export const convertRawToRange = (
+  raw: RawTimeRange,
+  timeZone?: TimeZone,
+  fiscalYearStartMonth?: number,
+  format?: string
+): TimeRange => {
+  const from = dateTimeParse(raw.from, { roundUp: false, timeZone, fiscalYearStartMonth, format });
+  const to = dateTimeParse(raw.to, { roundUp: true, timeZone, fiscalYearStartMonth, format });
 
   if (dateMath.isMathString(raw.from) || dateMath.isMathString(raw.to)) {
     return { from, to, raw };
diff --git a/public/app/core/components/TimePicker/TimePickerWithHistory.test.tsx b/public/app/core/components/TimePicker/TimePickerWithHistory.test.tsx
index c0f294619d5..c946efe0547 100644
--- a/public/app/core/components/TimePicker/TimePickerWithHistory.test.tsx
+++ b/public/app/core/components/TimePicker/TimePickerWithHistory.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { getDefaultTimeRange } from '@grafana/data';
+import { getDefaultTimeRange, systemDateFormats } from '@grafana/data';
 
 import { TimePickerWithHistory } from './TimePickerWithHistory';
 
@@ -41,7 +41,9 @@ describe('TimePickerWithHistory', () => {
     onZoom: () => {},
   };
 
-  afterEach(() => window.localStorage.clear());
+  afterEach(() => {
+    window.localStorage.clear();
+  });
 
   it('Should load with no history', async () => {
     const timeRange = getDefaultTimeRange();
@@ -124,6 +126,50 @@ describe('TimePickerWithHistory', () => {
     const newLsValue = JSON.parse(window.localStorage.getItem(LOCAL_STORAGE_KEY) ?? '[]');
     expect(newLsValue).toEqual(expectedLocalStorage);
   });
+
+  it('Should display handle timezones correctly', async () => {
+    const timeRange = getDefaultTimeRange();
+    render(<TimePickerWithHistory value={timeRange} {...props} {...{ timeZone: 'Eastern/Pacific' }} />);
+    await userEvent.click(screen.getByLabelText(/Time range selected/));
+
+    await clearAndType(getFromField(), '2022-12-10 00:00:00');
+    await clearAndType(getToField(), '2022-12-10 23:59:59');
+    await userEvent.click(getApplyButton());
+
+    await userEvent.click(screen.getByLabelText(/Time range selected/));
+
+    expect(screen.getByText(/2022-12-10 00:00:00 to 2022-12-10 23:59:59/i)).toBeInTheDocument();
+  });
+
+  it('Should display history correctly with custom time format', async () => {
+    const timeRange = getDefaultTimeRange();
+
+    const interval = {
+      millisecond: 'HH:mm:ss.SSS',
+      second: 'HH:mm:ss',
+      minute: 'HH:mm',
+      hour: 'DD-MM HH:mm',
+      day: 'DD-MM',
+      month: 'MM-YYYY',
+      year: 'YYYY',
+    };
+
+    systemDateFormats.update({
+      fullDate: 'DD-MM-YYYY HH:mm:ss',
+      interval: interval,
+      useBrowserLocale: false,
+    });
+    render(<TimePickerWithHistory value={timeRange} {...props} />);
+    await userEvent.click(screen.getByLabelText(/Time range selected/));
+
+    await clearAndType(getFromField(), '03-12-2022 00:00:00');
+    await clearAndType(getToField(), '03-12-2022 23:59:59');
+    await userEvent.click(getApplyButton());
+
+    await userEvent.click(screen.getByLabelText(/Time range selected/));
+
+    expect(screen.getByText(/03-12-2022 00:00:00 to 03-12-2022 23:59:59/i)).toBeInTheDocument();
+  });
 });
 
 async function clearAndType(field: HTMLElement, text: string) {
diff --git a/public/app/core/components/TimePicker/TimePickerWithHistory.tsx b/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
index 4a18ada7875..eb399d90f21 100644
--- a/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
+++ b/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
@@ -1,7 +1,7 @@
 import { uniqBy } from 'lodash';
 import React from 'react';
 
-import { TimeRange, isDateTime, rangeUtil, TimeZone } from '@grafana/data';
+import { TimeRange, isDateTime, rangeUtil } from '@grafana/data';
 import { TimeRangePickerProps, TimeRangePicker } from '@grafana/ui';
 
 import { LocalStorageValueProvider } from '../LocalStorageValueProvider';
@@ -24,7 +24,7 @@ export const TimePickerWithHistory = (props: Props) => {
     <LocalStorageValueProvider<LSTimePickerHistoryItem[]> storageKey={LOCAL_STORAGE_KEY} defaultValue={[]}>
       {(rawValues, onSaveToStore) => {
         const values = migrateHistory(rawValues);
-        const history = deserializeHistory(values, props.timeZone);
+        const history = deserializeHistory(values);
 
         return (
           <TimeRangePicker
@@ -41,8 +41,9 @@ export const TimePickerWithHistory = (props: Props) => {
   );
 };
 
-function deserializeHistory(values: TimePickerHistoryItem[], timeZone: TimeZone | undefined): TimeRange[] {
-  return values.map((item) => rangeUtil.convertRawToRange(item, timeZone));
+function deserializeHistory(values: TimePickerHistoryItem[]): TimeRange[] {
+  // The history is saved in UTC and with the default date format, so we need to pass those values to the convertRawToRange
+  return values.map((item) => rangeUtil.convertRawToRange(item, 'utc', undefined, 'YYYY-MM-DD HH:mm:ss'));
 }
 
 function migrateHistory(values: LSTimePickerHistoryItem[]): TimePickerHistoryItem[] {

From 8ffd58a855508192ba85e182ee2d1f70555e2444 Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:20:05 +0200
Subject: [PATCH 186/729] AnnotationList: Fix panel not updating when variable
 is changed (#65899)

Squashed commit of the following:

commit 421bd0bb7e6220f1c0a65b60696e258003ebf91d
Author: Joao Silva <joao.silva@grafana.com>
Date:   Tue Apr 4 10:48:04 2023 +0100

    user essentials mob! :trident:

    lastFile:public/app/plugins/panel/annolist/AnnoListPanel.tsx

commit 862846a39d774ba78861d567b6fd42fe7e4793ad
Author: joshhunt <josh@trtr.co>
Date:   Tue Apr 4 10:35:35 2023 +0100

    user essentials mob! :trident:

commit 4ddc7febbb790ba4ff65e2739246c951a4ddbe34
Author: Tobias Skarhed <tobias.skarhed@gmail.com>
Date:   Tue Apr 4 11:20:08 2023 +0200

    mob next [ci-skip] [ci skip] [skip ci]

    lastFile:public/app/plugins/panel/annolist/AnnoListPanel.tsx

Co-authored-by: joshhunt <josh@trtr.co>
Co-authored-by: Tobias Skarhed <tobias.skarhed@gmail.com>
---
 public/app/plugins/panel/annolist/AnnoListPanel.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
index 66b6543a9d9..1574e3bfe37 100644
--- a/public/app/plugins/panel/annolist/AnnoListPanel.tsx
+++ b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
@@ -74,6 +74,7 @@ export class AnnoListPanel extends PureComponent<Props, State> {
       options !== prevProps.options ||
       this.state.queryTags !== prevState.queryTags ||
       this.state.queryUser !== prevState.queryUser ||
+      prevProps.renderCounter !== this.props.renderCounter ||
       (options.onlyInTimeRange && timeRange !== prevProps.timeRange);
 
     if (needsQuery) {

From 391a192310ac9e953623667375664f0d849f9594 Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Mon, 17 Apr 2023 18:33:43 +0200
Subject: [PATCH 187/729] Chore: Try a different way to run integration tests
 (#66653)

* try a different way to run integration tests

* fix formatting

* clean test cache again

* use previous command

* playing around with random commands

* dont run tests in parallel yet

* use parallel option instead of gomaxprocs

* use same package set for redis/memcached; use p=1
---
 .drone.yml                   | 86 +++++++++++++++++++++++-------------
 Makefile                     | 15 ++++---
 scripts/drone/steps/lib.star |  8 ++--
 3 files changed, 67 insertions(+), 42 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 276d5ee3117..19ae07730d5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -336,7 +336,9 @@ steps:
   image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
-  - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
+  - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   image: grafana/build-container:1.7.3
@@ -872,8 +874,9 @@ steps:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
   - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -889,8 +892,9 @@ steps:
   - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
     -prootpass
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -1291,7 +1295,9 @@ steps:
   image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
-  - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
+  - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   image: grafana/build-container:1.7.3
@@ -1876,8 +1882,9 @@ steps:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
   - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -1893,8 +1900,9 @@ steps:
   - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
     -prootpass
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -2545,7 +2553,9 @@ steps:
   image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
-  - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
+  - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   image: grafana/build-container:1.7.3
@@ -3107,7 +3117,9 @@ steps:
   image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
-  - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
+  - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   image: grafana/build-container:1.7.3
@@ -4992,7 +5004,9 @@ steps:
   image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
-  - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
+  - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   image: grafana/build-container:1.7.3
@@ -5087,8 +5101,9 @@ steps:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
   - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -5104,8 +5119,9 @@ steps:
   - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
     -prootpass
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -5678,7 +5694,9 @@ steps:
   image: grafana/build-container:1.7.3
   name: test-backend
 - commands:
-  - go test -run Integration -covermode=atomic -timeout=5m ./pkg/...
+  - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   image: grafana/build-container:1.7.3
@@ -5800,8 +5818,9 @@ steps:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
   - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -5817,8 +5836,9 @@ steps:
   - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
     -prootpass
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -6267,8 +6287,9 @@ steps:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
   - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -6284,8 +6305,9 @@ steps:
   - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
     -prootpass
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -6438,8 +6460,9 @@ steps:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
   - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -6455,8 +6478,9 @@ steps:
   - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
     -prootpass
   - go clean -testcache
-  - go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic
-    -timeout=5m {}'
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
   environment:
@@ -6786,6 +6810,6 @@ kind: secret
 name: enterprise2_security_prefix
 ---
 kind: signature
-hmac: da82099e984231d3b292921e031655723eae03f45efac84af1a5a2104601fbfe
+hmac: d3567c954d0ac9f1f47d55bc85eb6594379c888fe591428f2dcd0146f2bd3ca2
 
 ...
diff --git a/Makefile b/Makefile
index bf9da4ea438..327ec29b095 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,8 @@ GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))
 
 targets := $(shell echo '$(sources)' | tr "," " ")
 
+GO_INTEGRATION_TESTS := $(shell find ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' | grep -o '\(.*\)/' | sort -u)
+
 all: deps build
 
 ##@ Dependencies
@@ -129,31 +131,32 @@ test-go-unit: ## Run unit tests for backend with flags.
 .PHONY: test-go-integration
 test-go-integration: ## Run integration tests for backend with flags.
 	@echo "test backend integration tests"
-	$(GO) test -run Integration -covermode=atomic -timeout=30m ./pkg/...
+	$(GO) test -count=1 -run "^TestIntegration" -covermode=atomic -timeout=5m $(GO_INTEGRATION_TESTS)
 
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
 	@echo "test backend integration postgres tests"
 	$(GO) clean -testcache
-	$(GO) list './pkg/...' | xargs -I {} sh -c 'GRAFANA_TEST_DB=postgres go test -run Integration -covermode=atomic -timeout=2m {}'
+	GRAFANA_TEST_DB=postgres \
+	$(GO) test -p=1 -count=1 -run "^TestIntegration" -covermode=atomic -timeout=10m $(GO_INTEGRATION_TESTS)
 
 .PHONY: test-go-integration-mysql
 test-go-integration-mysql: devenv-mysql ## Run integration tests for mysql backend with flags.
 	@echo "test backend integration mysql tests"
-	$(GO) clean -testcache
-	$(GO) list './pkg/...' | xargs -I {} sh -c 'GRAFANA_TEST_DB=mysql go test -run Integration -covermode=atomic -timeout=2m {}'
+	GRAFANA_TEST_DB=mysql \
+	$(GO) test -p=1 -count=1 -run "^TestIntegration" -covermode=atomic -timeout=10m $(GO_INTEGRATION_TESTS)
 
 .PHONY: test-go-integration-redis
 test-go-integration-redis: ## Run integration tests for redis cache.
 	@echo "test backend integration redis tests"
 	$(GO) clean -testcache
-	REDIS_URL=localhost:6379 $(GO) test -run IntegrationRedis -covermode=atomic -timeout=2m ./pkg/...
+	REDIS_URL=localhost:6379 $(GO) test -run IntegrationRedis -covermode=atomic -timeout=2m $(GO_INTEGRATION_TESTS)
 
 .PHONY: test-go-integration-memcached
 test-go-integration-memcached: ## Run integration tests for memcached cache.
 	@echo "test backend integration memcached tests"
 	$(GO) clean -testcache
-	MEMCACHED_HOSTS=localhost:11211 $(GO) test -run IntegrationMemcached -covermode=atomic -timeout=2m ./pkg/...
+	MEMCACHED_HOSTS=localhost:11211 $(GO) test -run IntegrationMemcached -covermode=atomic -timeout=2m $(GO_INTEGRATION_TESTS)
 
 test-js: ## Run tests for frontend.
 	@echo "test frontend"
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index d590436ed9c..f6d448027f7 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -623,7 +623,7 @@ def test_backend_integration_step():
             "wire-install",
         ],
         "commands": [
-            "go test -run Integration -covermode=atomic -timeout=5m ./pkg/...",
+            "go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' | grep -o '\\(.*\\)/' | sort -u)",
         ],
     }
 
@@ -1096,9 +1096,8 @@ def postgres_integration_tests_step():
         "dockerize -wait tcp://postgres:5432 -timeout 120s",
         "psql -p 5432 -h postgres -U grafanatest -d grafanatest -f " +
         "devenv/docker/blocks/postgres_tests/setup.sql",
-        # Make sure that we don't use cached results for another database
         "go clean -testcache",
-        "go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic -timeout=5m {}'",
+        "go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' | grep -o '\\(.*\\)/' | sort -u)",
     ]
     return {
         "name": "postgres-integration-tests",
@@ -1118,9 +1117,8 @@ def mysql_integration_tests_step():
         "apt-get install -yq default-mysql-client",
         "dockerize -wait tcp://mysql:3306 -timeout 120s",
         "cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root -prootpass",
-        # Make sure that we don't use cached results for another database
         "go clean -testcache",
-        "go list './pkg/...' | xargs -I {} sh -c 'go test -run Integration -covermode=atomic -timeout=5m {}'",
+        "go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' | grep -o '\\(.*\\)/' | sort -u)",
     ]
     return {
         "name": "mysql-integration-tests",

From 19ebb079ba4c37bfe6497e8245fe8a2c5c6a1a42 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Mon, 17 Apr 2023 17:45:06 +0100
Subject: [PATCH 188/729] Alerting: Add limits and filters to Prometheus Rules
 API (#66627)

This commit adds support for limits and filters to the Prometheus Rules
API.

Limits:

It adds a number of limits to the Grafana flavour of the Prometheus Rules
API:

- `limit` limits the maximum number of Rule Groups returned
- `limit_rules` limits the maximum number of rules per Rule Group
- `limit_alerts` limits the maximum number of alerts per rule

It sorts Rule Groups and rules within Rule Groups such that data in the
response is stable across requests. It also returns summaries (totals)
for all Rule Groups, individual Rule Groups and rules.

Filters:

Alerts can be filtered by state with the `state` query string. An example
of an HTTP request asking for just firing alerts might be
`/api/prometheus/grafana/api/v1/rules?state=alerting`.

A request can filter by two or more states by adding additional `state`
query strings to the URL. For example `?state=alerting&state=normal`.

Like the alert list panel, the `firing`, `pending` and `normal` state are
first compared against the state of each alert rule. All other states are
ignored. If the alert rule matches then its alert instances are filtered
against states once more.

Alerts can also be filtered by labels using the `matcher` query string.
Like `state`, multiple matchers can be provided by adding additional
`matcher` query strings to the URL.

The match expression should be parsed using existing regular expression
and sent to the API as URL-encoded JSON in the format:

{
    "name": "test",
    "value": "value1",
    "isRegex": false,
    "isEqual": true
}

The `isRegex` and `isEqual` options work as follows:

| IsEqual | IsRegex  | Operator |
| ------- | -------- | -------- |
| true    | false    |    =     |
| true    | true     |    =~    |
| false   | true     |    !~    |
| false   | false    |    !=    |
---
 pkg/services/ngalert/api/api_prometheus.go    | 184 ++++-
 .../ngalert/api/api_prometheus_test.go        | 690 +++++++++++++++++-
 .../ngalert/api/tooling/definitions/prom.go   | 137 +++-
 .../api/tooling/definitions/prom_test.go      |  66 ++
 pkg/services/ngalert/models/alert_rule.go     |  54 ++
 .../ngalert/models/alert_rule_test.go         |  45 ++
 pkg/tests/api/alerting/api_prometheus_test.go |  32 +-
 pkg/web/context.go                            |   8 +
 8 files changed, 1192 insertions(+), 24 deletions(-)
 create mode 100644 pkg/services/ngalert/api/tooling/definitions/prom_test.go

diff --git a/pkg/services/ngalert/api/api_prometheus.go b/pkg/services/ngalert/api/api_prometheus.go
index 6c60958fbee..46813a42b8d 100644
--- a/pkg/services/ngalert/api/api_prometheus.go
+++ b/pkg/services/ngalert/api/api_prometheus.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/prometheus/alertmanager/pkg/labels"
 	apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
 
 	"github.com/grafana/grafana/pkg/api/response"
@@ -21,6 +22,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 type PrometheusSrv struct {
@@ -105,6 +107,44 @@ func getPanelIDFromRequest(r *http.Request) (int64, error) {
 	return 0, nil
 }
 
+func getMatchersFromRequest(r *http.Request) (labels.Matchers, error) {
+	var matchers labels.Matchers
+	for _, s := range r.URL.Query()["matcher"] {
+		var m labels.Matcher
+		if err := json.Unmarshal([]byte(s), &m); err != nil {
+			return nil, err
+		}
+		if len(m.Name) == 0 {
+			return nil, errors.New("bad matcher: the name cannot be blank")
+		}
+		matchers = append(matchers, &m)
+	}
+	return matchers, nil
+}
+
+func getStatesFromRequest(r *http.Request) ([]eval.State, error) {
+	var states []eval.State
+	for _, s := range r.URL.Query()["state"] {
+		s = strings.ToLower(s)
+		switch s {
+		case "normal", "inactive":
+			states = append(states, eval.Normal)
+		case "alerting", "firing":
+			states = append(states, eval.Alerting)
+		case "pending":
+			states = append(states, eval.Pending)
+		case "nodata":
+			states = append(states, eval.NoData)
+		// nolint:goconst
+		case "error":
+			states = append(states, eval.Error)
+		default:
+			return states, fmt.Errorf("unknown state '%s'", s)
+		}
+	}
+	return states, nil
+}
+
 func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) response.Response {
 	dashboardUID := c.Query("dashboard_uid")
 	panelID, err := getPanelIDFromRequest(c.Req)
@@ -115,12 +155,28 @@ func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) respon
 		return ErrResp(http.StatusBadRequest, errors.New("panel_id must be set with dashboard_uid"), "")
 	}
 
+	limitGroups := c.QueryInt64WithDefault("limit", -1)
+	limitRulesPerGroup := c.QueryInt64WithDefault("limit_rules", -1)
+	limitAlertsPerRule := c.QueryInt64WithDefault("limit_alerts", -1)
+	matchers, err := getMatchersFromRequest(c.Req)
+	if err != nil {
+		return ErrResp(http.StatusBadRequest, err, "")
+	}
+	withStates, err := getStatesFromRequest(c.Req)
+	if err != nil {
+		return ErrResp(http.StatusBadRequest, err, "")
+	}
+	withStatesFast := make(map[eval.State]struct{})
+	for _, state := range withStates {
+		withStatesFast[state] = struct{}{}
+	}
+
 	ruleResponse := apimodels.RuleResponse{
 		DiscoveryBase: apimodels.DiscoveryBase{
 			Status: "success",
 		},
 		Data: apimodels.RuleDiscovery{
-			RuleGroups: []*apimodels.RuleGroup{},
+			RuleGroups: []apimodels.RuleGroup{},
 		},
 	}
 
@@ -161,14 +217,22 @@ func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) respon
 		return accesscontrol.HasAccess(srv.ac, c)(accesscontrol.ReqViewer, evaluator)
 	}
 
+	// Group rules together by Namespace and Rule Group. Rules are also grouped by Org ID,
+	// but in this API all rules belong to the same organization.
 	groupedRules := make(map[ngmodels.AlertRuleGroupKey][]*ngmodels.AlertRule)
 	for _, rule := range ruleList {
-		key := rule.GetGroupKey()
-		rulesInGroup := groupedRules[key]
-		rulesInGroup = append(rulesInGroup, rule)
-		groupedRules[key] = rulesInGroup
+		groupKey := rule.GetGroupKey()
+		ruleGroup := groupedRules[groupKey]
+		ruleGroup = append(ruleGroup, rule)
+		groupedRules[groupKey] = ruleGroup
+	}
+	// Sort the rules in each rule group by index. We do this at the end instead of
+	// after each append to avoid having to sort each group multiple times.
+	for _, groupRules := range groupedRules {
+		ngmodels.AlertRulesBy(ngmodels.AlertRulesByIndex).Sort(groupRules)
 	}
 
+	rulesTotals := make(map[string]int64, len(groupedRules))
 	for groupKey, rules := range groupedRules {
 		folder := namespaceMap[groupKey.NamespaceUID]
 		if folder == nil {
@@ -178,16 +242,73 @@ func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) respon
 		if !authorizeAccessToRuleGroup(rules, hasAccess) {
 			continue
 		}
-		ruleResponse.Data.RuleGroups = append(ruleResponse.Data.RuleGroups, srv.toRuleGroup(groupKey.RuleGroup, folder, rules, labelOptions))
+		ruleGroup, totals := srv.toRuleGroup(groupKey, folder, rules, limitAlertsPerRule, withStatesFast, matchers, labelOptions)
+		ruleGroup.Totals = totals
+		for k, v := range totals {
+			rulesTotals[k] += v
+		}
+
+		if len(withStates) > 0 {
+			// Filtering is weird but firing, pending, and normal filters also need to be
+			// applied to the rule. Others such as nodata and error should have no effect.
+			// This is to match the current behavior in the UI.
+			filteredRules := make([]apimodels.AlertingRule, 0, len(ruleGroup.Rules))
+			for _, rule := range ruleGroup.Rules {
+				var state *eval.State
+				switch rule.State {
+				case "normal", "inactive":
+					state = util.Pointer(eval.Normal)
+				case "alerting", "firing":
+					state = util.Pointer(eval.Alerting)
+				case "pending":
+					state = util.Pointer(eval.Pending)
+				}
+				if state != nil {
+					if _, ok := withStatesFast[*state]; ok {
+						filteredRules = append(filteredRules, rule)
+					}
+				}
+			}
+			ruleGroup.Rules = filteredRules
+		}
+
+		if limitRulesPerGroup > -1 && int64(len(ruleGroup.Rules)) > limitRulesPerGroup {
+			ruleGroup.Rules = ruleGroup.Rules[0:limitRulesPerGroup]
+		}
+
+		ruleResponse.Data.RuleGroups = append(ruleResponse.Data.RuleGroups, *ruleGroup)
 	}
+
+	ruleResponse.Data.Totals = rulesTotals
+
+	// Sort Rule Groups before checking limits
+	apimodels.RuleGroupsBy(apimodels.RuleGroupsByFileAndName).Sort(ruleResponse.Data.RuleGroups)
+	if limitGroups > -1 && int64(len(ruleResponse.Data.RuleGroups)) >= limitGroups {
+		ruleResponse.Data.RuleGroups = ruleResponse.Data.RuleGroups[0:limitGroups]
+	}
+
 	return response.JSON(http.StatusOK, ruleResponse)
 }
 
-func (srv PrometheusSrv) toRuleGroup(groupName string, folder *folder.Folder, rules []*ngmodels.AlertRule, labelOptions []ngmodels.LabelOption) *apimodels.RuleGroup {
-	newGroup := &apimodels.RuleGroup{
-		Name: groupName,
-		File: folder.Title, // file is what Prometheus uses for provisioning, we replace it with namespace.
+// This is the same as matchers.Matches but avoids the need to create a LabelSet
+func matchersMatch(matchers []*labels.Matcher, labels map[string]string) bool {
+	for _, m := range matchers {
+		if !m.Matches(labels[m.Name]) {
+			return false
+		}
 	}
+	return true
+}
+
+func (srv PrometheusSrv) toRuleGroup(groupKey ngmodels.AlertRuleGroupKey, folder *folder.Folder, rules []*ngmodels.AlertRule, limitAlerts int64, withStates map[eval.State]struct{}, matchers labels.Matchers, labelOptions []ngmodels.LabelOption) (*apimodels.RuleGroup, map[string]int64) {
+	newGroup := &apimodels.RuleGroup{
+		Name: groupKey.RuleGroup,
+		// file is what Prometheus uses for provisioning, we replace it with namespace which is the folder in Grafana.
+		File: folder.Title,
+	}
+
+	rulesTotals := make(map[string]int64, len(rules))
+
 	ngmodels.RulesGroup(rules).SortByGroupIndex()
 	for _, rule := range rules {
 		alertingRule := apimodels.AlertingRule{
@@ -206,14 +327,20 @@ func (srv PrometheusSrv) toRuleGroup(groupName string, folder *folder.Folder, ru
 			LastEvaluation: time.Time{},
 		}
 
-		for _, alertState := range srv.manager.GetStatesForRuleUID(rule.OrgID, rule.UID) {
+		states := srv.manager.GetStatesForRuleUID(rule.OrgID, rule.UID)
+		totals := make(map[string]int64)
+		for _, alertState := range states {
 			activeAt := alertState.StartsAt
 			valString := ""
 			if alertState.State == eval.Alerting || alertState.State == eval.Pending {
 				valString = formatValues(alertState)
 			}
-
-			alert := &apimodels.Alert{
+			totals[strings.ToLower(alertState.State.String())] += 1
+			// Do not add error twice when execution error state is Error
+			if alertState.Error != nil && rule.ExecErrState != ngmodels.ErrorErrState {
+				totals["error"] += 1
+			}
+			alert := apimodels.Alert{
 				Labels:      alertState.GetLabels(labelOptions...),
 				Annotations: alertState.Annotations,
 
@@ -237,6 +364,9 @@ func (srv PrometheusSrv) toRuleGroup(groupName string, folder *folder.Folder, ru
 					alertingRule.State = "pending"
 				}
 			case eval.Alerting:
+				if alertingRule.ActiveAt == nil || alertingRule.ActiveAt.After(activeAt) {
+					alertingRule.ActiveAt = &activeAt
+				}
 				alertingRule.State = "firing"
 			case eval.Error:
 				newRule.Health = "error"
@@ -249,17 +379,43 @@ func (srv PrometheusSrv) toRuleGroup(groupName string, folder *folder.Folder, ru
 				newRule.Health = "error"
 			}
 
+			if len(withStates) > 0 {
+				if _, ok := withStates[alertState.State]; !ok {
+					continue
+				}
+			}
+
+			if !matchersMatch(matchers, alertState.Labels) {
+				continue
+			}
+
 			alertingRule.Alerts = append(alertingRule.Alerts, alert)
 		}
 
+		if alertingRule.State != "" {
+			rulesTotals[alertingRule.State] += 1
+		}
+
+		if newRule.Health == "error" || newRule.Health == "nodata" {
+			rulesTotals[newRule.Health] += 1
+		}
+
+		apimodels.AlertsBy(apimodels.AlertsByImportance).Sort(alertingRule.Alerts)
+
+		if limitAlerts > -1 && int64(len(alertingRule.Alerts)) > limitAlerts {
+			alertingRule.Alerts = alertingRule.Alerts[0:limitAlerts]
+		}
+
 		alertingRule.Rule = newRule
+		alertingRule.Totals = totals
 		newGroup.Rules = append(newGroup.Rules, alertingRule)
 		newGroup.Interval = float64(rule.IntervalSeconds)
 		// TODO yuri. Change that when scheduler will process alerts in groups
 		newGroup.EvaluationTime = newRule.EvaluationTime
 		newGroup.LastEvaluation = newRule.LastEvaluation
 	}
-	return newGroup
+
+	return newGroup, rulesTotals
 }
 
 // ruleToQuery attempts to extract the datasource queries from the alert query model.
diff --git a/pkg/services/ngalert/api/api_prometheus_test.go b/pkg/services/ngalert/api/api_prometheus_test.go
index 6f085d8ab29..97f8ce59b64 100644
--- a/pkg/services/ngalert/api/api_prometheus_test.go
+++ b/pkg/services/ngalert/api/api_prometheus_test.go
@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"math/rand"
 	"net/http"
@@ -19,6 +20,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/folder"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -254,6 +256,30 @@ func withAlertingState() forEachState {
 	}
 }
 
+func withAlertingErrorState() forEachState {
+	return func(s *state.State) *state.State {
+		s.SetAlerting("", timeNow(), timeNow().Add(5*time.Minute))
+		s.Error = errors.New("this is an error")
+		return s
+	}
+}
+
+func withErrorState() forEachState {
+	return func(s *state.State) *state.State {
+		s.SetError(errors.New("this is an error"), timeNow(), timeNow().Add(5*time.Minute))
+		return s
+	}
+}
+
+func withLabels(labels data.Labels) forEachState {
+	return func(s *state.State) *state.State {
+		for k, v := range labels {
+			s.Labels[k] = v
+		}
+		return s
+	}
+}
+
 func TestRouteGetRuleStatuses(t *testing.T) {
 	timeNow = func() time.Time { return time.Date(2022, 3, 10, 14, 0, 0, 0, time.UTC) }
 	orgID := int64(1)
@@ -305,6 +331,9 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 					"activeAt": "0001-01-01T00:00:00Z",
 					"value": ""
 				}],
+				"totals": {
+					"normal": 1
+				},
 				"labels": {
 					"__a_private_label_on_the_rule__": "a_value"
 				},
@@ -314,10 +343,16 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				"duration": 180,
 				"evaluationTime": 60
 			}],
+			"totals": {
+				"inactive": 1
+			},
 			"interval": 60,
 			"lastEvaluation": "2022-03-10T14:01:00Z",
 			"evaluationTime": 60
-		}]
+		}],
+		"totals": {
+			"inactive": 1
+		}
 	}
 }
 `, folder.Title), string(r.Body()))
@@ -358,6 +393,9 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 					"activeAt": "0001-01-01T00:00:00Z",
 					"value": ""
 				}],
+				"totals": {
+					"normal": 1
+				},
 				"labels": {
 					"__a_private_label_on_the_rule__": "a_value",
 					"__alert_rule_uid__": "RuleUID"
@@ -368,10 +406,16 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				"duration": 180,
 				"evaluationTime": 60
 			}],
+			"totals": {
+				"inactive": 1
+			},
 			"interval": 60,
 			"lastEvaluation": "2022-03-10T14:01:00Z",
 			"evaluationTime": 60
-		}]
+		}],
+		"totals": {
+			"inactive": 1
+		}
 	}
 }
 `, folder.Title), string(r.Body()))
@@ -406,6 +450,9 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 					"activeAt": "0001-01-01T00:00:00Z",
 					"value": ""
 				}],
+				"totals": {
+					"normal": 1
+				},
 				"labels": {
 					"__a_private_label_on_the_rule__": "a_value"
 				},
@@ -415,10 +462,16 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				"duration": 180,
 				"evaluationTime": 60
 			}],
+			"totals": {
+				"inactive": 1
+			},
 			"interval": 60,
 			"lastEvaluation": "2022-03-10T14:01:00Z",
 			"evaluationTime": 60
-		}]
+		}],
+		"totals": {
+			"inactive": 1
+		}
 	}
 }
 `, folder.Title), string(r.Body()))
@@ -504,6 +557,637 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 			assert.Emptyf(t, rules, "not all expected rules were returned")
 		})
 	})
+
+	t.Run("test totals are expected", func(t *testing.T) {
+		fakeStore, fakeAIM, _, api := setupAPI(t)
+		// Create rules in the same Rule Group to keep assertions simple
+		rules := ngmodels.GenerateAlertRules(3, ngmodels.AlertRuleGen(withOrgID(orgID), withGroup("Rule-Group-1"), withNamespace(&folder.Folder{
+			Title: "Folder-1",
+		})))
+		// Need to sort these so we add alerts to the rules as ordered in the response
+		ngmodels.AlertRulesBy(ngmodels.AlertRulesByIndex).Sort(rules)
+		// The last two rules will have errors, however the first will be alerting
+		// while the second one will have a DatasourceError alert.
+		rules[1].ExecErrState = ngmodels.AlertingErrState
+		rules[2].ExecErrState = ngmodels.ErrorErrState
+		fakeStore.PutRule(context.Background(), rules...)
+
+		// create a normal and alerting state for the first rule
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1)
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1, withAlertingState())
+		// create an error state for the last two rules
+		fakeAIM.GenerateAlertInstances(orgID, rules[1].UID, 1, withAlertingErrorState())
+		fakeAIM.GenerateAlertInstances(orgID, rules[2].UID, 1, withErrorState())
+
+		r, err := http.NewRequest("GET", "/api/v1/rules", nil)
+		require.NoError(t, err)
+		c := &contextmodel.ReqContext{
+			Context: &web.Context{Req: r},
+			SignedInUser: &user.SignedInUser{
+				OrgID:   orgID,
+				OrgRole: org.RoleViewer,
+			},
+		}
+		resp := api.RouteGetRuleStatuses(c)
+		require.Equal(t, http.StatusOK, resp.Status())
+		var res apimodels.RuleResponse
+		require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+		// Even though there are just 3 rules, the totals should show two firing rules,
+		// one inactive rules and two errors
+		require.Equal(t, map[string]int64{"firing": 2, "inactive": 1, "error": 2}, res.Data.Totals)
+		// There should be 1 Rule Group that contains all rules
+		require.Len(t, res.Data.RuleGroups, 1)
+		rg := res.Data.RuleGroups[0]
+		require.Len(t, rg.Rules, 3)
+
+		// The first rule should have an alerting and normal alert
+		r1 := rg.Rules[0]
+		require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, r1.Totals)
+		require.Len(t, r1.Alerts, 2)
+		// The second rule should have an alerting alert
+		r2 := rg.Rules[1]
+		require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, r2.Totals)
+		require.Len(t, r2.Alerts, 1)
+		// The last rule should have an error alert
+		r3 := rg.Rules[2]
+		require.Equal(t, map[string]int64{"error": 1}, r3.Totals)
+		require.Len(t, r3.Alerts, 1)
+	})
+
+	t.Run("test time of first firing alert", func(t *testing.T) {
+		fakeStore, fakeAIM, _, api := setupAPI(t)
+		// Create rules in the same Rule Group to keep assertions simple
+		rules := ngmodels.GenerateAlertRules(1, ngmodels.AlertRuleGen(withOrgID(orgID)))
+		fakeStore.PutRule(context.Background(), rules...)
+
+		getRuleResponse := func() apimodels.RuleResponse {
+			r, err := http.NewRequest("GET", "/api/v1/rules", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+			return res
+		}
+
+		// no alerts so timestamp should be nil
+		res := getRuleResponse()
+		require.Len(t, res.Data.RuleGroups, 1)
+		rg := res.Data.RuleGroups[0]
+		require.Len(t, rg.Rules, 1)
+		require.Nil(t, rg.Rules[0].ActiveAt)
+
+		// create a normal alert, the timestamp should still be nil
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1)
+		res = getRuleResponse()
+		require.Len(t, res.Data.RuleGroups, 1)
+		rg = res.Data.RuleGroups[0]
+		require.Len(t, rg.Rules, 1)
+		require.Nil(t, rg.Rules[0].ActiveAt)
+
+		// create a firing alert, the timestamp should be non-nil
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1, withAlertingState())
+		res = getRuleResponse()
+		require.Len(t, res.Data.RuleGroups, 1)
+		rg = res.Data.RuleGroups[0]
+		require.Len(t, rg.Rules, 1)
+		require.NotNil(t, rg.Rules[0].ActiveAt)
+
+		lastActiveAt := rg.Rules[0].ActiveAt
+		// create a second firing alert, the timestamp of first firing alert should be the same
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1, withAlertingState())
+		res = getRuleResponse()
+		require.Len(t, res.Data.RuleGroups, 1)
+		rg = res.Data.RuleGroups[0]
+		require.Len(t, rg.Rules, 1)
+		require.Equal(t, lastActiveAt, rg.Rules[0].ActiveAt)
+	})
+
+	t.Run("test with limit on Rule Groups", func(t *testing.T) {
+		fakeStore, _, _, api := setupAPI(t)
+
+		rules := ngmodels.GenerateAlertRules(2, ngmodels.AlertRuleGen(withOrgID(orgID)))
+		fakeStore.PutRule(context.Background(), rules...)
+
+		t.Run("first without limit", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be 2 inactive rules across all Rule Groups
+			require.Equal(t, map[string]int64{"inactive": 2}, res.Data.Totals)
+			require.Len(t, res.Data.RuleGroups, 2)
+			for _, rg := range res.Data.RuleGroups {
+				// Each Rule Group should have 1 inactive rule
+				require.Equal(t, map[string]int64{"inactive": 1}, rg.Totals)
+				require.Len(t, rg.Rules, 1)
+			}
+		})
+
+		t.Run("then with limit", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?limit=1", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be 2 inactive rules across all Rule Groups
+			require.Equal(t, map[string]int64{"inactive": 2}, res.Data.Totals)
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			// The Rule Group within the limit should have 1 inactive rule
+			require.Equal(t, map[string]int64{"inactive": 1}, rg.Totals)
+			require.Len(t, rg.Rules, 1)
+		})
+
+		t.Run("then with limit larger than number of rule groups", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?limit=1", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+			require.Len(t, res.Data.RuleGroups, 1)
+		})
+	})
+
+	t.Run("test with limit rules", func(t *testing.T) {
+		fakeStore, _, _, api := setupAPI(t)
+		rules := ngmodels.GenerateAlertRules(2, ngmodels.AlertRuleGen(withOrgID(orgID), withGroup("Rule-Group-1")))
+		fakeStore.PutRule(context.Background(), rules...)
+
+		t.Run("first without limit", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be 2 inactive rules across all Rule Groups
+			require.Equal(t, map[string]int64{"inactive": 2}, res.Data.Totals)
+			require.Len(t, res.Data.RuleGroups, 2)
+			for _, rg := range res.Data.RuleGroups {
+				// Each Rule Group should have 1 inactive rule
+				require.Equal(t, map[string]int64{"inactive": 1}, rg.Totals)
+				require.Len(t, rg.Rules, 1)
+			}
+		})
+
+		t.Run("then with limit", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?limit=1&limit_rules=1", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be 2 inactive rules
+			require.Equal(t, map[string]int64{"inactive": 2}, res.Data.Totals)
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			// The Rule Group within the limit should have 1 inactive rule because of the limit
+			require.Equal(t, map[string]int64{"inactive": 1}, rg.Totals)
+			require.Len(t, rg.Rules, 1)
+		})
+
+		t.Run("then with limit larger than number of rules", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?limit=1&limit_rules=2", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+			require.Len(t, res.Data.RuleGroups, 1)
+			require.Len(t, res.Data.RuleGroups[0].Rules, 1)
+		})
+	})
+
+	t.Run("test with limit alerts", func(t *testing.T) {
+		fakeStore, fakeAIM, _, api := setupAPI(t)
+		rules := ngmodels.GenerateAlertRules(2, ngmodels.AlertRuleGen(withOrgID(orgID), withGroup("Rule-Group-1")))
+		fakeStore.PutRule(context.Background(), rules...)
+		// create a normal and firing alert for each rule
+		for _, r := range rules {
+			fakeAIM.GenerateAlertInstances(orgID, r.UID, 1)
+			fakeAIM.GenerateAlertInstances(orgID, r.UID, 1, withAlertingState())
+		}
+
+		t.Run("first without limit", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be 2 firing rules across all Rule Groups
+			require.Equal(t, map[string]int64{"firing": 2}, res.Data.Totals)
+			require.Len(t, res.Data.RuleGroups, 2)
+			for _, rg := range res.Data.RuleGroups {
+				// Each Rule Group should have 1 firing rule
+				require.Equal(t, map[string]int64{"firing": 1}, rg.Totals)
+				require.Len(t, rg.Rules, 1)
+				// Each rule should have two alerts
+				require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].Totals)
+			}
+		})
+
+		t.Run("then with limits", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?limit=1&limit_rules=1&limit_alerts=1", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be 2 firing rules across all Rule Groups
+			require.Equal(t, map[string]int64{"firing": 2}, res.Data.Totals)
+			rg := res.Data.RuleGroups[0]
+			// The Rule Group within the limit should have 1 inactive rule because of the limit
+			require.Equal(t, map[string]int64{"firing": 1}, rg.Totals)
+			require.Len(t, rg.Rules, 1)
+			rule := rg.Rules[0]
+			// The rule should have two alerts, but just one should be returned
+			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rule.Totals)
+			require.Len(t, rule.Alerts, 1)
+			// Firing alerts should have precedence over normal alerts
+			require.Equal(t, "Alerting", rule.Alerts[0].State)
+		})
+
+		t.Run("then with limit larger than number of alerts", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?limit=1&limit_rules=1&limit_alerts=3", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+			require.Len(t, res.Data.RuleGroups, 1)
+			require.Len(t, res.Data.RuleGroups[0].Rules, 1)
+			require.Len(t, res.Data.RuleGroups[0].Rules[0].Alerts, 2)
+		})
+	})
+
+	t.Run("test with filters on state", func(t *testing.T) {
+		fakeStore, fakeAIM, _, api := setupAPI(t)
+		// create two rules in the same Rule Group to keep assertions simple
+		rules := ngmodels.GenerateAlertRules(3, ngmodels.AlertRuleGen(withOrgID(orgID), withGroup("Rule-Group-1"), withNamespace(&folder.Folder{
+			Title: "Folder-1",
+		})))
+		// Need to sort these so we add alerts to the rules as ordered in the response
+		ngmodels.AlertRulesBy(ngmodels.AlertRulesByIndex).Sort(rules)
+		// The last two rules will have errors, however the first will be alerting
+		// while the second one will have a DatasourceError alert.
+		rules[1].ExecErrState = ngmodels.AlertingErrState
+		rules[2].ExecErrState = ngmodels.ErrorErrState
+		fakeStore.PutRule(context.Background(), rules...)
+
+		// create a normal and alerting state for the first rule
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1)
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1, withAlertingState())
+		// create an error state for the last two rules
+		fakeAIM.GenerateAlertInstances(orgID, rules[1].UID, 1, withAlertingErrorState())
+		fakeAIM.GenerateAlertInstances(orgID, rules[2].UID, 1, withErrorState())
+
+		t.Run("invalid state returns 400 Bad Request", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?state=unknown", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusBadRequest, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+			require.Equal(t, "unknown state 'unknown'", res.Error)
+		})
+
+		t.Run("first without filters", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be 2 firing rules, 1 inactive rule, and 2 with errors
+			require.Equal(t, map[string]int64{"firing": 2, "inactive": 1, "error": 2}, res.Data.Totals)
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 3)
+
+			// The first two rules should be firing and the last should be inactive
+			require.Equal(t, "firing", rg.Rules[0].State)
+			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].Totals)
+			require.Len(t, rg.Rules[0].Alerts, 2)
+			require.Equal(t, "firing", rg.Rules[1].State)
+			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].Totals)
+			require.Len(t, rg.Rules[1].Alerts, 1)
+			require.Equal(t, "inactive", rg.Rules[2].State)
+			require.Equal(t, map[string]int64{"error": 1}, rg.Rules[2].Totals)
+			require.Len(t, rg.Rules[2].Alerts, 1)
+		})
+
+		t.Run("then with filter for firing alerts", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?state=firing", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// The totals should be the same
+			require.Equal(t, map[string]int64{"firing": 2, "inactive": 1, "error": 2}, res.Data.Totals)
+
+			// The inactive rules should be filtered out of the result
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 2)
+
+			// Both firing rules should be returned with their totals unchanged
+			require.Equal(t, "firing", rg.Rules[0].State)
+			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].Totals)
+			// The first rule should have just 1 firing alert as the inactive alert
+			// has been removed by the filter for firing alerts
+			require.Len(t, rg.Rules[0].Alerts, 1)
+
+			require.Equal(t, "firing", rg.Rules[1].State)
+			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].Totals)
+			require.Len(t, rg.Rules[1].Alerts, 1)
+		})
+
+		t.Run("then with filters for both inactive and firing alerts", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?state=inactive&state=firing", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// The totals should be the same
+			require.Equal(t, map[string]int64{"firing": 2, "inactive": 1, "error": 2}, res.Data.Totals)
+
+			// The number of rules returned should also be the same
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 3)
+
+			// The first two rules should be firing and the last should be inactive
+			require.Equal(t, "firing", rg.Rules[0].State)
+			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].Totals)
+			require.Len(t, rg.Rules[0].Alerts, 2)
+			require.Equal(t, "firing", rg.Rules[1].State)
+			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].Totals)
+			require.Len(t, rg.Rules[1].Alerts, 1)
+
+			// The last rule should have 1 alert as the filter includes errors too
+			require.Equal(t, "inactive", rg.Rules[2].State)
+			require.Equal(t, map[string]int64{"error": 1}, rg.Rules[2].Totals)
+			// The error alert has been removed as the filters are inactive and firing
+			require.Len(t, rg.Rules[2].Alerts, 0)
+		})
+	})
+
+	t.Run("test with matcher on labels", func(t *testing.T) {
+		fakeStore, fakeAIM, _, api := setupAPI(t)
+		// create two rules in the same Rule Group to keep assertions simple
+		rules := ngmodels.GenerateAlertRules(1, ngmodels.AlertRuleGen(withOrgID(orgID), withGroup("Rule-Group-1"), withNamespace(&folder.Folder{
+			Title: "Folder-1",
+		})))
+		fakeStore.PutRule(context.Background(), rules...)
+
+		// create a normal and alerting state for each rule
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1,
+			withLabels(data.Labels{"test": "value1"}))
+		fakeAIM.GenerateAlertInstances(orgID, rules[0].UID, 1,
+			withLabels(data.Labels{"test": "value2"}), withAlertingState())
+
+		t.Run("invalid matchers returns 400 Bad Request", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?matcher={\"name\":\"\"}", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusBadRequest, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+			require.Equal(t, "bad matcher: the name cannot be blank", res.Error)
+		})
+
+		t.Run("first without matchers", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 1)
+			require.Len(t, rg.Rules[0].Alerts, 2)
+		})
+
+		t.Run("then with single matcher", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?matcher={\"name\":\"test\",\"isEqual\":true,\"value\":\"value1\"}", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be just the alert with the label test=value1
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 1)
+			require.Len(t, rg.Rules[0].Alerts, 1)
+		})
+
+		t.Run("then with URL encoded regex matcher", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?matcher=%7B%22name%22:%22test%22%2C%22isEqual%22:true%2C%22isRegex%22:true%2C%22value%22:%22value%5B0-9%5D%2B%22%7D%0A", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be just the alert with the label test=value1
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 1)
+			require.Len(t, rg.Rules[0].Alerts, 2)
+		})
+
+		t.Run("then with multiple matchers", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?matcher={\"name\":\"alertname\",\"isEqual\":true,\"value\":\"test_title_0\"}&matcher={\"name\":\"test\",\"isEqual\":true,\"value\":\"value1\"}", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be just the alert with the label test=value1
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 1)
+			require.Len(t, rg.Rules[0].Alerts, 1)
+		})
+
+		t.Run("then with multiple matchers that don't match", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?matcher={\"name\":\"alertname\",\"isEqual\":true,\"value\":\"test_title_0\"}&matcher={\"name\":\"test\",\"isEqual\":true,\"value\":\"value3\"}", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should no alerts
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 1)
+			require.Len(t, rg.Rules[0].Alerts, 0)
+		})
+	})
 }
 
 func setupAPI(t *testing.T) (*fakes.RuleStore, *fakeAlertInstanceManager, *acmock.Mock, PrometheusSrv) {
diff --git a/pkg/services/ngalert/api/tooling/definitions/prom.go b/pkg/services/ngalert/api/tooling/definitions/prom.go
index 6a4ffa5d985..346280c33ce 100644
--- a/pkg/services/ngalert/api/tooling/definitions/prom.go
+++ b/pkg/services/ngalert/api/tooling/definitions/prom.go
@@ -1,6 +1,9 @@
 package definitions
 
 import (
+	"fmt"
+	"sort"
+	"strings"
 	"time"
 
 	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
@@ -65,7 +68,8 @@ type DiscoveryBase struct {
 // swagger:model
 type RuleDiscovery struct {
 	// required: true
-	RuleGroups []*RuleGroup `json:"groups"`
+	RuleGroups []RuleGroup      `json:"groups"`
+	Totals     map[string]int64 `json:"totals,omitempty"`
 }
 
 // AlertDiscovery has info for all active alerts.
@@ -85,13 +89,37 @@ type RuleGroup struct {
 	// specific properties, both alerting and recording rules are exposed in the
 	// same array.
 	// required: true
-	Rules []AlertingRule `json:"rules"`
+	Rules  []AlertingRule   `json:"rules"`
+	Totals map[string]int64 `json:"totals"`
 	// required: true
 	Interval       float64   `json:"interval"`
 	LastEvaluation time.Time `json:"lastEvaluation"`
 	EvaluationTime float64   `json:"evaluationTime"`
 }
 
+// RuleGroupsBy is a function that defines the ordering of Rule Groups.
+type RuleGroupsBy func(a1, a2 *RuleGroup) bool
+
+func (by RuleGroupsBy) Sort(groups []RuleGroup) {
+	sort.Sort(RuleGroupsSorter{groups: groups, by: by})
+}
+
+func RuleGroupsByFileAndName(a1, a2 *RuleGroup) bool {
+	if a1.File == a2.File {
+		return a1.Name < a2.Name
+	}
+	return a1.File < a2.File
+}
+
+type RuleGroupsSorter struct {
+	groups []RuleGroup
+	by     RuleGroupsBy
+}
+
+func (s RuleGroupsSorter) Len() int           { return len(s.groups) }
+func (s RuleGroupsSorter) Swap(i, j int)      { s.groups[i], s.groups[j] = s.groups[j], s.groups[i] }
+func (s RuleGroupsSorter) Less(i, j int) bool { return s.by(&s.groups[i], &s.groups[j]) }
+
 // adapted from cortex
 // swagger:model
 type AlertingRule struct {
@@ -106,7 +134,9 @@ type AlertingRule struct {
 	// required: true
 	Annotations overrideLabels `json:"annotations,omitempty"`
 	// required: true
-	Alerts []*Alert `json:"alerts,omitempty"`
+	ActiveAt *time.Time       `json:"activeAt,omitempty"`
+	Alerts   []Alert          `json:"alerts,omitempty"`
+	Totals   map[string]int64 `json:"totals,omitempty"`
 	Rule
 }
 
@@ -141,6 +171,107 @@ type Alert struct {
 	Value string `json:"value"`
 }
 
+type StateByImportance int
+
+const (
+	StateAlerting = iota
+	StatePending
+	StateError
+	StateNoData
+	StateNormal
+)
+
+func stateByImportanceFromString(s string) (StateByImportance, error) {
+	switch s = strings.ToLower(s); s {
+	case "alerting":
+		return StateAlerting, nil
+	case "pending":
+		return StatePending, nil
+	case "error":
+		return StateError, nil
+	case "nodata":
+		return StateNoData, nil
+	case "normal":
+		return StateNormal, nil
+	default:
+		return -1, fmt.Errorf("unknown state: %s", s)
+	}
+}
+
+// AlertsBy is a function that defines the ordering of alerts.
+type AlertsBy func(a1, a2 *Alert) bool
+
+func (by AlertsBy) Sort(alerts []Alert) {
+	sort.Sort(AlertsSorter{alerts: alerts, by: by})
+}
+
+// AlertsByImportance orders alerts by importance. An alert is more important
+// than another alert if its status has higher importance. For example, "alerting"
+// is more important than "normal". If two alerts have the same importance
+// then the ordering is based on their ActiveAt time and their labels.
+func AlertsByImportance(a1, a2 *Alert) bool {
+	// labelsForComparison concatenates each key/value pair into a string and
+	// sorts them.
+	labelsForComparison := func(m map[string]string) []string {
+		s := make([]string, 0, len(m))
+		for k, v := range m {
+			s = append(s, k+v)
+		}
+		sort.Strings(s)
+		return s
+	}
+
+	// compareLabels returns true if labels1 are less than labels2. This happens
+	// when labels1 has fewer labels than labels2, or if the next label from
+	// labels1 is lexicographically less than the next label from labels2.
+	compareLabels := func(labels1, labels2 []string) bool {
+		if len(labels1) == len(labels2) {
+			for i := range labels1 {
+				if labels1[i] != labels2[i] {
+					return labels1[i] < labels2[i]
+				}
+			}
+		}
+		return len(labels1) < len(labels2)
+	}
+
+	// The importance of an alert is first based on the importance of their states.
+	// This ordering is intended to show the most important alerts first when
+	// using pagination.
+	importance1, _ := stateByImportanceFromString(a1.State)
+	importance2, _ := stateByImportanceFromString(a2.State)
+
+	// If both alerts have the same importance then the ordering is based on
+	// their ActiveAt time, and if those are equal, their labels.
+	if importance1 == importance2 {
+		if a1.ActiveAt != nil && a2.ActiveAt == nil {
+			// The first alert is active but not the second
+			return true
+		} else if a1.ActiveAt == nil && a2.ActiveAt != nil {
+			// The second alert is active but not the first
+			return false
+		} else if a1.ActiveAt != nil && a2.ActiveAt != nil && a1.ActiveAt.Before(*a2.ActiveAt) {
+			// Both alerts are active but a1 happened before a2
+			return true
+		}
+		// Both alerts are active since the same time so compare their labels
+		labels1 := labelsForComparison(a1.Labels)
+		labels2 := labelsForComparison(a2.Labels)
+		return compareLabels(labels1, labels2)
+	}
+
+	return importance1 < importance2
+}
+
+type AlertsSorter struct {
+	alerts []Alert
+	by     AlertsBy
+}
+
+func (s AlertsSorter) Len() int           { return len(s.alerts) }
+func (s AlertsSorter) Swap(i, j int)      { s.alerts[i], s.alerts[j] = s.alerts[j], s.alerts[i] }
+func (s AlertsSorter) Less(i, j int) bool { return s.by(&s.alerts[i], &s.alerts[j]) }
+
 // override the labels type with a map for generation.
 // The custom marshaling for labels.Labels ends up doing this anyways.
 type overrideLabels map[string]string
diff --git a/pkg/services/ngalert/api/tooling/definitions/prom_test.go b/pkg/services/ngalert/api/tooling/definitions/prom_test.go
new file mode 100644
index 00000000000..107eedcb5c2
--- /dev/null
+++ b/pkg/services/ngalert/api/tooling/definitions/prom_test.go
@@ -0,0 +1,66 @@
+package definitions
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSortAlertsByImportance(t *testing.T) {
+	tm1, tm2 := time.Now(), time.Now().Add(time.Second)
+	tc := []struct {
+		name     string
+		input    []Alert
+		expected []Alert
+	}{{
+		name:     "alerts are ordered in expected importance",
+		input:    []Alert{{State: "normal"}, {State: "nodata"}, {State: "error"}, {State: "pending"}, {State: "alerting"}},
+		expected: []Alert{{State: "alerting"}, {State: "pending"}, {State: "error"}, {State: "nodata"}, {State: "normal"}},
+	}, {
+		name:     "alerts with same importance are ordered active first",
+		input:    []Alert{{State: "normal"}, {State: "normal", ActiveAt: &tm1}},
+		expected: []Alert{{State: "normal", ActiveAt: &tm1}, {State: "normal"}},
+	}, {
+		name:     "active alerts with same importance are ordered newest first",
+		input:    []Alert{{State: "alerting", ActiveAt: &tm2}, {State: "alerting", ActiveAt: &tm1}},
+		expected: []Alert{{State: "alerting", ActiveAt: &tm1}, {State: "alerting", ActiveAt: &tm2}},
+	}, {
+		name: "inactive alerts with same importance are ordered by labels",
+		input: []Alert{
+			{State: "normal", Labels: map[string]string{"c": "d"}},
+			{State: "normal", Labels: map[string]string{"a": "b"}},
+		},
+		expected: []Alert{
+			{State: "normal", Labels: map[string]string{"a": "b"}},
+			{State: "normal", Labels: map[string]string{"c": "d"}},
+		},
+	}, {
+		name: "active alerts with same importance and active time are ordered fewest labels first",
+		input: []Alert{
+			{State: "alerting", ActiveAt: &tm1, Labels: map[string]string{"a": "b", "c": "d"}},
+			{State: "alerting", ActiveAt: &tm1, Labels: map[string]string{"e": "f"}},
+		},
+		expected: []Alert{
+			{State: "alerting", ActiveAt: &tm1, Labels: map[string]string{"e": "f"}},
+			{State: "alerting", ActiveAt: &tm1, Labels: map[string]string{"a": "b", "c": "d"}},
+		},
+	}, {
+		name: "active alerts with same importance and active time are ordered by labels",
+		input: []Alert{
+			{State: "alerting", ActiveAt: &tm1, Labels: map[string]string{"c": "d"}},
+			{State: "alerting", ActiveAt: &tm1, Labels: map[string]string{"a": "b"}},
+		},
+		expected: []Alert{
+			{State: "alerting", ActiveAt: &tm1, Labels: map[string]string{"a": "b"}},
+			{State: "alerting", ActiveAt: &tm1, Labels: map[string]string{"c": "d"}},
+		},
+	}}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			AlertsBy(AlertsByImportance).Sort(tt.input)
+			assert.EqualValues(t, tt.expected, tt.input)
+		})
+	}
+}
diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go
index 5b03f6c6a63..4fc34822daa 100644
--- a/pkg/services/ngalert/models/alert_rule.go
+++ b/pkg/services/ngalert/models/alert_rule.go
@@ -180,6 +180,37 @@ type AlertRuleWithOptionals struct {
 	HasPause bool
 }
 
+// AlertsRulesBy is a function that defines the ordering of alert rules.
+type AlertRulesBy func(a1, a2 *AlertRule) bool
+
+func (by AlertRulesBy) Sort(rules []*AlertRule) {
+	sort.Sort(AlertRulesSorter{rules: rules, by: by})
+}
+
+// AlertRulesByIndex orders alert rules by rule group index. You should
+// make sure that all alert rules belong to the same rule group (have the
+// same RuleGroupKey) before using this ordering.
+func AlertRulesByIndex(a1, a2 *AlertRule) bool {
+	return a1.RuleGroupIndex < a2.RuleGroupIndex
+}
+
+func AlertRulesByGroupKeyAndIndex(a1, a2 *AlertRule) bool {
+	k1, k2 := a1.GetGroupKey(), a2.GetGroupKey()
+	if k1 == k2 {
+		return a1.RuleGroupIndex < a2.RuleGroupIndex
+	}
+	return AlertRuleGroupKeyByNamespaceAndRuleGroup(&k1, &k2)
+}
+
+type AlertRulesSorter struct {
+	rules []*AlertRule
+	by    AlertRulesBy
+}
+
+func (s AlertRulesSorter) Len() int           { return len(s.rules) }
+func (s AlertRulesSorter) Swap(i, j int)      { s.rules[i], s.rules[j] = s.rules[j], s.rules[i] }
+func (s AlertRulesSorter) Less(i, j int) bool { return s.by(s.rules[i], s.rules[j]) }
+
 // GetDashboardUID returns the DashboardUID or "".
 func (alertRule *AlertRule) GetDashboardUID() string {
 	if alertRule.DashboardUID != nil {
@@ -303,6 +334,29 @@ func (k AlertRuleKey) String() string {
 	return fmt.Sprintf("{orgID: %d, UID: %s}", k.OrgID, k.UID)
 }
 
+// AlertRuleGroupKeyBy is a function that defines the ordering of alert rule group keys.
+type AlertRuleGroupKeyBy func(a1, a2 *AlertRuleGroupKey) bool
+
+func (by AlertRuleGroupKeyBy) Sort(keys []AlertRuleGroupKey) {
+	sort.Sort(AlertRuleGroupKeySorter{keys: keys, by: by})
+}
+
+func AlertRuleGroupKeyByNamespaceAndRuleGroup(k1, k2 *AlertRuleGroupKey) bool {
+	if k1.NamespaceUID == k2.NamespaceUID {
+		return k1.RuleGroup < k2.RuleGroup
+	}
+	return k1.NamespaceUID < k2.NamespaceUID
+}
+
+type AlertRuleGroupKeySorter struct {
+	keys []AlertRuleGroupKey
+	by   AlertRuleGroupKeyBy
+}
+
+func (s AlertRuleGroupKeySorter) Len() int           { return len(s.keys) }
+func (s AlertRuleGroupKeySorter) Swap(i, j int)      { s.keys[i], s.keys[j] = s.keys[j], s.keys[i] }
+func (s AlertRuleGroupKeySorter) Less(i, j int) bool { return s.by(&s.keys[i], &s.keys[j]) }
+
 // GetKey returns the alert definitions identifier
 func (alertRule *AlertRule) GetKey() AlertRuleKey {
 	return AlertRuleKey{OrgID: alertRule.OrgID, UID: alertRule.UID}
diff --git a/pkg/services/ngalert/models/alert_rule_test.go b/pkg/services/ngalert/models/alert_rule_test.go
index 8f33d2dc875..e566c4af5db 100644
--- a/pkg/services/ngalert/models/alert_rule_test.go
+++ b/pkg/services/ngalert/models/alert_rule_test.go
@@ -17,6 +17,51 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
+func TestSortAlertRulesByGroupKeyAndIndex(t *testing.T) {
+	tc := []struct {
+		name     string
+		input    []*AlertRule
+		expected []*AlertRule
+	}{{
+		name: "alert rules are ordered by organization",
+		input: []*AlertRule{
+			{OrgID: 2, NamespaceUID: "test2"},
+			{OrgID: 1, NamespaceUID: "test1"},
+		},
+		expected: []*AlertRule{
+			{OrgID: 1, NamespaceUID: "test1"},
+			{OrgID: 2, NamespaceUID: "test2"},
+		},
+	}, {
+		name: "alert rules in same organization are ordered by namespace",
+		input: []*AlertRule{
+			{OrgID: 1, NamespaceUID: "test2"},
+			{OrgID: 1, NamespaceUID: "test1"},
+		},
+		expected: []*AlertRule{
+			{OrgID: 1, NamespaceUID: "test1"},
+			{OrgID: 1, NamespaceUID: "test2"},
+		},
+	}, {
+		name: "alert rules with same group key are ordered by index",
+		input: []*AlertRule{
+			{OrgID: 1, NamespaceUID: "test", RuleGroupIndex: 2},
+			{OrgID: 1, NamespaceUID: "test", RuleGroupIndex: 1},
+		},
+		expected: []*AlertRule{
+			{OrgID: 1, NamespaceUID: "test", RuleGroupIndex: 1},
+			{OrgID: 1, NamespaceUID: "test", RuleGroupIndex: 2},
+		},
+	}}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			AlertRulesBy(AlertRulesByGroupKeyAndIndex).Sort(tt.input)
+			assert.EqualValues(t, tt.expected, tt.input)
+		})
+	}
+}
+
 func TestNoDataStateFromString(t *testing.T) {
 	allKnownNoDataStates := [...]NoDataState{
 		Alerting,
diff --git a/pkg/tests/api/alerting/api_prometheus_test.go b/pkg/tests/api/alerting/api_prometheus_test.go
index 32a6c10488d..1616d338265 100644
--- a/pkg/tests/api/alerting/api_prometheus_test.go
+++ b/pkg/tests/api/alerting/api_prometheus_test.go
@@ -259,10 +259,16 @@ func TestIntegrationPrometheusRules(t *testing.T) {
 				"lastEvaluation": "0001-01-01T00:00:00Z",
 				"evaluationTime": 0
 			}],
+			"totals": {
+				"inactive": 2
+			},
 			"interval": 60,
 			"lastEvaluation": "0001-01-01T00:00:00Z",
 			"evaluationTime": 0
-		}]
+		}],
+		"totals": {
+			"inactive": 2
+		}
 	}
 }`, string(b))
 	}
@@ -311,10 +317,16 @@ func TestIntegrationPrometheusRules(t *testing.T) {
 				"lastEvaluation": "0001-01-01T00:00:00Z",
 				"evaluationTime": 0
 			}],
+			"totals": {
+				"inactive": 2
+			},
 			"interval": 60,
 			"lastEvaluation": "0001-01-01T00:00:00Z",
 			"evaluationTime": 0
-		}]
+		}],
+		"totals": {
+			"inactive": 2
+		}
 	}
 }`, string(b))
 			return true
@@ -454,10 +466,16 @@ func TestIntegrationPrometheusRulesFilterByDashboard(t *testing.T) {
 				"lastEvaluation": "0001-01-01T00:00:00Z",
 				"evaluationTime": 0
 			}],
+			"totals": {
+				"inactive": 2
+			},
 			"interval": 60,
 			"lastEvaluation": "0001-01-01T00:00:00Z",
 			"evaluationTime": 0
-		}]
+		}],
+		"totals": {
+			"inactive": 2
+		}
 	}
 }`, dashboardUID)
 	expectedFilteredByJSON := fmt.Sprintf(`
@@ -481,10 +499,16 @@ func TestIntegrationPrometheusRulesFilterByDashboard(t *testing.T) {
 				"lastEvaluation": "0001-01-01T00:00:00Z",
 				"evaluationTime": 0
 			}],
+			"totals": {
+				"inactive": 1
+			},
 			"interval": 60,
 			"lastEvaluation": "0001-01-01T00:00:00Z",
 			"evaluationTime": 0
-		}]
+		}],
+		"totals": {
+			"inactive": 1
+		}
 	}
 }`, dashboardUID)
 	expectedNoneJSON := `
diff --git a/pkg/web/context.go b/pkg/web/context.go
index c3d5ba63a72..5fd3eaa398f 100644
--- a/pkg/web/context.go
+++ b/pkg/web/context.go
@@ -188,6 +188,14 @@ func (ctx *Context) QueryInt64(name string) int64 {
 	return n
 }
 
+func (ctx *Context) QueryInt64WithDefault(name string, d int64) int64 {
+	n, err := strconv.ParseInt(ctx.Query(name), 10, 64)
+	if err != nil {
+		return d
+	}
+	return n
+}
+
 // GetCookie returns given cookie value from request header.
 func (ctx *Context) GetCookie(name string) string {
 	cookie, err := ctx.Req.Cookie(name)

From 50cb4f89985ddab7b8e8b717e022045b6f5a6df6 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 17 Apr 2023 14:02:51 -0700
Subject: [PATCH 189/729] FieldValues: Use simple array in transformations and
 grafana/data (#66702)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
---
 .../src/dataframe/DataFrameView.ts            |  2 +-
 .../src/dataframe/FieldCache.test.ts          |  2 +-
 .../grafana-data/src/dataframe/dimensions.ts  |  4 +--
 .../src/dataframe/processDataFrame.test.ts    | 10 +++---
 .../src/dataframe/processDataFrame.ts         | 10 +++---
 .../src/field/displayProcessor.ts             |  4 +--
 .../grafana-data/src/field/fieldComparers.ts  | 21 ++++++------
 .../grafana-data/src/field/fieldDisplay.ts    |  4 +--
 .../src/field/fieldOverrides.test.ts          |  2 +-
 .../src/transformations/fieldReducer.ts       | 24 +++++++-------
 .../transformDataFrame.test.ts                | 14 ++++----
 .../transformers/calculateField.test.ts       |  2 +-
 .../transformers/calculateField.ts            |  9 ++----
 .../transformations/transformers/concat.ts    |  2 +-
 .../transformers/convertFieldType.test.ts     | 10 +++---
 .../transformers/convertFieldType.ts          | 14 ++++----
 .../transformers/filterByValue.ts             |  4 +--
 .../transformations/transformers/groupBy.ts   |  6 ++--
 .../transformers/groupingToMatrix.ts          |  8 ++---
 .../transformers/histogram.test.ts            |  4 +--
 .../transformations/transformers/histogram.ts |  8 ++---
 .../transformers/joinDataFrames.test.ts       | 10 +++---
 .../transformers/joinDataFrames.ts            |  4 +--
 .../transformers/labelsToFields.test.ts       | 14 ++++----
 .../transformers/merge.test.ts                |  4 +--
 .../transformers/sortBy.test.ts               |  2 +-
 packages/grafana-data/src/utils/csv.ts        |  2 +-
 .../grafana-data/src/utils/dataLinks.test.ts  |  7 ++--
 .../grafana-data/src/utils/series.test.ts     |  7 ++--
 packages/grafana-data/src/utils/series.ts     |  4 +--
 .../src/vector/AppendedVectors.ts             |  4 ++-
 .../grafana-data/src/vector/AsNumberVector.ts |  1 +
 .../src/vector/BinaryOperationVector.ts       |  1 +
 .../grafana-data/src/vector/CircularVector.ts |  1 +
 .../grafana-data/src/vector/ConstantVector.ts |  1 +
 .../src/vector/FormattedVector.ts             |  1 +
 .../src/vector/FunctionalVector.ts            |  7 +++-
 packages/grafana-data/src/vector/RowVector.ts |  1 +
 .../calculateHeatmap/heatmap.test.ts          |  2 +-
 .../transformers/calculateHeatmap/heatmap.ts  | 25 +++++++--------
 .../configFromQuery/configFromQuery.ts        |  3 +-
 .../extractFields/extractFields.test.ts       | 10 +++---
 .../extractFields/extractFields.ts            |  5 ++-
 .../joinByLabels/joinByLabels.test.ts         |  4 +--
 .../transformers/joinByLabels/joinByLabels.ts | 17 +++-------
 .../lookupGazetteer/fieldLookup.ts            |  2 +-
 .../partitionByValues.test.ts                 | 32 +++++++++----------
 .../partitionByValues/partitionByValues.ts    |  7 ++--
 .../prepareTimeSeries.test.ts                 |  4 +--
 .../prepareTimeSeries/prepareTimeSeries.ts    | 14 ++++----
 .../rowsToFields/rowsToFields.test.ts         |  6 ++--
 .../transformers/rowsToFields/rowsToFields.ts | 18 +++--------
 .../spatial/spatialTransformer.ts             |  4 +--
 .../features/transformers/spatial/utils.ts    | 12 +++----
 .../timeSeriesTableTransformer.ts             | 11 +++----
 55 files changed, 197 insertions(+), 214 deletions(-)

diff --git a/packages/grafana-data/src/dataframe/DataFrameView.ts b/packages/grafana-data/src/dataframe/DataFrameView.ts
index 9f75cc701e7..33cac6a5144 100644
--- a/packages/grafana-data/src/dataframe/DataFrameView.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameView.ts
@@ -32,7 +32,7 @@ export class DataFrameView<T = any> extends FunctionalVector<T> {
       }
 
       fields[field.name] = field;
-      const getter = () => field.values.get(this.index);
+      const getter = () => field.values.get(this.index); // .get() to support all Vector types
 
       if (!(obj as any).hasOwnProperty(field.name)) {
         Object.defineProperty(obj, field.name, {
diff --git a/packages/grafana-data/src/dataframe/FieldCache.test.ts b/packages/grafana-data/src/dataframe/FieldCache.test.ts
index f6d5a90c8ca..b5f5b861b64 100644
--- a/packages/grafana-data/src/dataframe/FieldCache.test.ts
+++ b/packages/grafana-data/src/dataframe/FieldCache.test.ts
@@ -92,7 +92,7 @@ describe('FieldCache', () => {
     it('should get the first field with a duplicate name', () => {
       const field = fieldCache.getFieldByName('value');
       expect(field!.name).toEqual('value');
-      expect(field!.values.toArray()).toEqual([1, 2, 3]);
+      expect(field!.values).toEqual([1, 2, 3]);
     });
 
     it('should return index of the field', () => {
diff --git a/packages/grafana-data/src/dataframe/dimensions.ts b/packages/grafana-data/src/dataframe/dimensions.ts
index 629ddcbae7c..80058770514 100644
--- a/packages/grafana-data/src/dataframe/dimensions.ts
+++ b/packages/grafana-data/src/dataframe/dimensions.ts
@@ -29,11 +29,11 @@ export const getColumnFromDimension = (dimension: Dimension, column: number) =>
 };
 
 export const getValueFromDimension = (dimension: Dimension, column: number, row: number) => {
-  return dimension.columns[column].values.get(row);
+  return dimension.columns[column].values[row];
 };
 
 export const getAllValuesFromDimension = (dimension: Dimension, column: number, row: number) => {
-  return dimension.columns.map((c) => c.values.get(row));
+  return dimension.columns.map((c) => c.values[row]);
 };
 
 export const getDimensionByName = (dimensions: Dimensions, name: string) => dimensions[name];
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.test.ts b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
index ad08566a507..9357245127f 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
@@ -198,7 +198,7 @@ describe('toDataFrame', () => {
       },
     };
     const dataFrame = toDataFrame(msg);
-    expect(dataFrame.fields.map((f) => ({ [f.name]: f.values.toArray() }))).toMatchInlineSnapshot(`
+    expect(dataFrame.fields.map((f) => ({ [f.name]: f.values }))).toMatchInlineSnapshot(`
       [
         {
           "First": [
@@ -366,14 +366,14 @@ describe('sorted DataFrame', () => {
   it('Should sort numbers', () => {
     const sorted = sortDataFrame(frame, 0, true);
     expect(sorted.length).toEqual(3);
-    expect(sorted.fields[0].values.toArray()).toEqual([3, 2, 1]);
-    expect(sorted.fields[1].values.toArray()).toEqual(['c', 'b', 'a']);
+    expect(sorted.fields[0].values).toEqual([3, 2, 1]);
+    expect(sorted.fields[1].values).toEqual(['c', 'b', 'a']);
   });
 
   it('Should sort strings', () => {
     const sorted = sortDataFrame(frame, 1, true);
     expect(sorted.length).toEqual(3);
-    expect(sorted.fields[0].values.toArray()).toEqual([3, 2, 1]);
-    expect(sorted.fields[1].values.toArray()).toEqual(['c', 'b', 'a']);
+    expect(sorted.fields[0].values).toEqual([3, 2, 1]);
+    expect(sorted.fields[1].values).toEqual(['c', 'b', 'a']);
   });
 });
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index c121388bae6..5fad1214d9e 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -261,7 +261,7 @@ export function guessFieldTypeForField(field: Field): FieldType | undefined {
 
   // 2. Check the first non-null value
   for (let i = 0; i < field.values.length; i++) {
-    const v = field.values.get(i);
+    const v = field.values[i];
     if (v != null) {
       return guessFieldTypeFromValue(v);
     }
@@ -362,8 +362,8 @@ export const toLegacyResponseData = (frame: DataFrame): TimeSeries | TableData =
       // Make sure it is [value,time]
       for (let i = 0; i < rowCount; i++) {
         rows.push([
-          valueField.values.get(i), // value
-          timeField.values.get(i), // time
+          valueField.values[i], // value
+          timeField.values[i], // time
         ]);
       }
 
@@ -381,7 +381,7 @@ export const toLegacyResponseData = (frame: DataFrame): TimeSeries | TableData =
   for (let i = 0; i < rowCount; i++) {
     const row: any[] = [];
     for (let j = 0; j < fields.length; j++) {
-      row.push(fields[j].values.get(i));
+      row.push(fields[j].values[i]);
     }
     rows.push(row);
   }
@@ -463,7 +463,7 @@ export function reverseDataFrame(data: DataFrame): DataFrame {
 export function getDataFrameRow(data: DataFrame, row: number): any[] {
   const values: any[] = [];
   for (const field of data.fields) {
-    values.push(field.values.get(row));
+    values.push(field.values[row]);
   }
   return values;
 }
diff --git a/packages/grafana-data/src/field/displayProcessor.ts b/packages/grafana-data/src/field/displayProcessor.ts
index 71ebcd998ed..8b5cad6c727 100644
--- a/packages/grafana-data/src/field/displayProcessor.ts
+++ b/packages/grafana-data/src/field/displayProcessor.ts
@@ -53,8 +53,8 @@ export function getDisplayProcessor(options?: DisplayProcessorOptions): DisplayP
     unit = `dateTimeAsSystem`;
     hasDateUnit = true;
     if (field.values && field.values.length > 1) {
-      let start = field.values.get(0);
-      let end = field.values.get(field.values.length - 1);
+      let start = field.values[0];
+      let end = field.values[field.values.length - 1];
       if (typeof start === 'string') {
         start = dateTimeParse(start).unix();
         end = dateTimeParse(end).unix();
diff --git a/packages/grafana-data/src/field/fieldComparers.ts b/packages/grafana-data/src/field/fieldComparers.ts
index 32182c74edf..aa709e2ffb7 100644
--- a/packages/grafana-data/src/field/fieldComparers.ts
+++ b/packages/grafana-data/src/field/fieldComparers.ts
@@ -18,7 +18,7 @@ export const fieldIndexComparer = (field: Field, reverse = false): IndexComparer
     case FieldType.boolean:
       return booleanIndexComparer(values, reverse);
     case FieldType.time:
-      if (typeof field.values.get(0) === 'number') {
+      if (typeof field.values[0] === 'number') {
         return timestampIndexComparer(values, reverse);
       }
       return timeIndexComparer(values, reverse);
@@ -80,39 +80,38 @@ const falsyComparer = (a: unknown, b: unknown): number => {
 };
 
 const timestampIndexComparer = (values: Vector<number>, reverse: boolean): IndexComparer => {
-  let vals = values.toArray();
   let mult = reverse ? -1 : 1;
-  return (a: number, b: number): number => mult * (vals[a] - vals[b]);
+  return (a: number, b: number): number => mult * (values[a] - values[b]);
 };
 
 const timeIndexComparer = (values: Vector<unknown>, reverse: boolean): IndexComparer => {
   return (a: number, b: number): number => {
-    const vA = values.get(a);
-    const vB = values.get(b);
+    const vA = values[a];
+    const vB = values[b];
     return reverse ? timeComparer(vB, vA) : timeComparer(vA, vB);
   };
 };
 
 const booleanIndexComparer = (values: Vector<boolean>, reverse: boolean): IndexComparer => {
   return (a: number, b: number): number => {
-    const vA = values.get(a);
-    const vB = values.get(b);
+    const vA = values[a];
+    const vB = values[b];
     return reverse ? booleanComparer(vB, vA) : booleanComparer(vA, vB);
   };
 };
 
 const numericIndexComparer = (values: Vector<number>, reverse: boolean): IndexComparer => {
   return (a: number, b: number): number => {
-    const vA = values.get(a);
-    const vB = values.get(b);
+    const vA = values[a];
+    const vB = values[b];
     return reverse ? numericComparer(vB, vA) : numericComparer(vA, vB);
   };
 };
 
 const stringIndexComparer = (values: Vector<string>, reverse: boolean): IndexComparer => {
   return (a: number, b: number): number => {
-    const vA = values.get(a);
-    const vB = values.get(b);
+    const vA = values[a];
+    const vB = values[b];
     return reverse ? stringComparer(vB, vA) : stringComparer(vA, vB);
   };
 };
diff --git a/packages/grafana-data/src/field/fieldDisplay.ts b/packages/grafana-data/src/field/fieldDisplay.ts
index 6bd10b415fb..e875b5f0a4d 100644
--- a/packages/grafana-data/src/field/fieldDisplay.ts
+++ b/packages/grafana-data/src/field/fieldDisplay.ts
@@ -140,7 +140,7 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi
           field.state = setIndexForPaletteColor(field, values.length);
 
           const scopedVars = getFieldScopedVarsWithDataContexAndRowIndex(field, j);
-          const displayValue = display(field.values.get(j));
+          const displayValue = display(field.values[j]);
           const rowName = getSmartDisplayNameForRow(dataFrame, field, j, replaceVariables, scopedVars);
           const overrideColor = lookupRowColorFromOverride(rowName, options.fieldConfig, theme);
 
@@ -254,7 +254,7 @@ function getSmartDisplayNameForRow(
     }
 
     if (otherField.type === FieldType.string) {
-      const value = otherField.values.get(rowIndex) ?? '';
+      const value = otherField.values[rowIndex] ?? '';
       const mappedValue = otherField.display ? otherField.display(value).text : value;
       if (mappedValue.length > 0) {
         parts.push(mappedValue);
diff --git a/packages/grafana-data/src/field/fieldOverrides.test.ts b/packages/grafana-data/src/field/fieldOverrides.test.ts
index db5c7d514ff..d24892db1f0 100644
--- a/packages/grafana-data/src/field/fieldOverrides.test.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.test.ts
@@ -935,7 +935,7 @@ describe('applyRawFieldOverrides', () => {
 
   const getDisplayValue = (frames: DataFrame[], frameIndex: number, fieldIndex: number) => {
     const field = frames[frameIndex].fields[fieldIndex];
-    const value = field.values.get(0);
+    const value = field.values[0];
     return field.display!(value);
   };
 
diff --git a/packages/grafana-data/src/transformations/fieldReducer.ts b/packages/grafana-data/src/transformations/fieldReducer.ts
index 7a2a720bd46..a24a62d6af5 100644
--- a/packages/grafana-data/src/transformations/fieldReducer.ts
+++ b/packages/grafana-data/src/transformations/fieldReducer.ts
@@ -252,7 +252,7 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     name: 'All values',
     description: 'Returns an array with all values',
     standard: false,
-    reduce: (field: Field) => ({ allValues: field.values.toArray() }),
+    reduce: (field: Field) => ({ allValues: field.values }),
   },
   {
     id: ReducerID.uniqueValues,
@@ -260,7 +260,7 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'Returns an array with all unique values',
     standard: false,
     reduce: (field: Field) => ({
-      uniqueValues: [...new Set(field.values.toArray())],
+      uniqueValues: [...new Set(field.values)],
     }),
   },
 ]);
@@ -290,13 +290,13 @@ export function doStandardCalcs(field: Field, ignoreNulls: boolean, nullAsZero:
     previousDeltaUp: true,
   };
 
-  const data = field.values;
-  calcs.count = ignoreNulls ? data.length : data.toArray().filter((val) => val != null).length;
+  const data = field.values.toArray(); // toArray() ensures we handle all vector types
+  calcs.count = ignoreNulls ? data.length : data.filter((val) => val != null).length;
 
   const isNumberField = field.type === FieldType.number || FieldType.time;
 
   for (let i = 0; i < data.length; i++) {
-    let currentValue = data.get(i);
+    let currentValue = data[i];
 
     if (i === 0) {
       calcs.first = currentValue;
@@ -404,13 +404,13 @@ export function doStandardCalcs(field: Field, ignoreNulls: boolean, nullAsZero:
 }
 
 function calculateFirst(field: Field, ignoreNulls: boolean, nullAsZero: boolean): FieldCalcs {
-  return { first: field.values.get(0) };
+  return { first: field.values[0] };
 }
 
 function calculateFirstNotNull(field: Field, ignoreNulls: boolean, nullAsZero: boolean): FieldCalcs {
   const data = field.values;
   for (let idx = 0; idx < data.length; idx++) {
-    const v = data.get(idx);
+    const v = data[idx];
     if (v != null && v !== undefined) {
       return { firstNotNull: v };
     }
@@ -420,14 +420,14 @@ function calculateFirstNotNull(field: Field, ignoreNulls: boolean, nullAsZero: b
 
 function calculateLast(field: Field, ignoreNulls: boolean, nullAsZero: boolean): FieldCalcs {
   const data = field.values;
-  return { last: data.get(data.length - 1) };
+  return { last: data[data.length - 1] };
 }
 
 function calculateLastNotNull(field: Field, ignoreNulls: boolean, nullAsZero: boolean): FieldCalcs {
   const data = field.values;
   let idx = data.length - 1;
   while (idx >= 0) {
-    const v = data.get(idx--);
+    const v = data[idx--];
     if (v != null && v !== undefined) {
       return { lastNotNull: v };
     }
@@ -447,7 +447,7 @@ function calculateStdDev(field: Field, ignoreNulls: boolean, nullAsZero: boolean
   let runningNonNullCount = 0;
   const data = field.values;
   for (let i = 0; i < data.length; i++) {
-    const currentValue = data.get(i);
+    const currentValue = data[i];
     if (currentValue != null) {
       runningNonNullCount++;
       let _oldMean = runningMean;
@@ -468,7 +468,7 @@ function calculateChangeCount(field: Field, ignoreNulls: boolean, nullAsZero: bo
   let first = true;
   let last = null;
   for (let i = 0; i < data.length; i++) {
-    let currentValue = data.get(i);
+    let currentValue = data[i];
     if (currentValue === null) {
       if (ignoreNulls) {
         continue;
@@ -491,7 +491,7 @@ function calculateDistinctCount(field: Field, ignoreNulls: boolean, nullAsZero:
   const data = field.values;
   const distinct = new Set();
   for (let i = 0; i < data.length; i++) {
-    let currentValue = data.get(i);
+    let currentValue = data[i];
     if (currentValue === null) {
       if (ignoreNulls) {
         continue;
diff --git a/packages/grafana-data/src/transformations/transformDataFrame.test.ts b/packages/grafana-data/src/transformations/transformDataFrame.test.ts
index 04e2f58faf3..83643922401 100644
--- a/packages/grafana-data/src/transformations/transformDataFrame.test.ts
+++ b/packages/grafana-data/src/transformations/transformDataFrame.test.ts
@@ -85,7 +85,7 @@ describe('transformDataFrame', () => {
       const processed = received[0];
       expect(processed[0].length).toEqual(1);
       expect(processed[0].fields.length).toEqual(1);
-      expect(processed[0].fields[0].values.get(0)).toEqual(3);
+      expect(processed[0].fields[0].values[0]).toEqual(3);
     });
   });
 
@@ -112,7 +112,7 @@ describe('transformDataFrame', () => {
       const processed = received[0];
       expect(processed[0].length).toEqual(1);
       expect(processed[0].fields.length).toEqual(2);
-      expect(processed[0].fields[0].values.get(0)).toEqual('temperature');
+      expect(processed[0].fields[0].values[0]).toEqual('temperature');
     });
   });
 
@@ -142,7 +142,7 @@ describe('transformDataFrame', () => {
 
     // Only apply A
     await expect(transformDataFrame(cfg, [frameA, frameB])).toEmitValuesWith((received) => {
-      const processed = received[0].map((v) => v.fields[0].values.toArray());
+      const processed = received[0].map((v) => v.fields[0].values);
       expect(processed).toBeTruthy();
       expect(processed).toMatchObject([[5], [7, 8]]);
     });
@@ -150,7 +150,7 @@ describe('transformDataFrame', () => {
     // Only apply to B
     cfg[0].filter.options = 'B';
     await expect(transformDataFrame(cfg, [frameA, frameB])).toEmitValuesWith((received) => {
-      const processed = received[0].map((v) => v.fields[0].values.toArray());
+      const processed = received[0].map((v) => v.fields[0].values);
       expect(processed).toBeTruthy();
       expect(processed).toMatchObject([[5, 6], [7]]);
     });
@@ -181,7 +181,7 @@ describe('transformDataFrame', () => {
         const processed = received[0];
         expect(processed[0].length).toEqual(1);
         expect(processed[0].fields.length).toEqual(1);
-        expect(processed[0].fields[0].values.get(0)).toEqual(0.03);
+        expect(processed[0].fields[0].values[0]).toEqual(0.03);
       });
     });
     it('supports trailing custom transformation', async () => {
@@ -208,7 +208,7 @@ describe('transformDataFrame', () => {
         const processed = received[0];
         expect(processed[0].length).toEqual(1);
         expect(processed[0].fields.length).toEqual(1);
-        expect(processed[0].fields[0].values.get(0)).toEqual(0.03);
+        expect(processed[0].fields[0].values[0]).toEqual(0.03);
       });
     });
 
@@ -237,7 +237,7 @@ describe('transformDataFrame', () => {
         const processed = received[0];
         expect(processed[0].length).toEqual(1);
         expect(processed[0].fields.length).toEqual(1);
-        expect(processed[0].fields[0].values.get(0)).toEqual(0.06);
+        expect(processed[0].fields[0].values[0]).toEqual(0.06);
       });
     });
   });
diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.test.ts b/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
index 8317e827d0d..f334c0e15e5 100644
--- a/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
@@ -234,7 +234,7 @@ describe('calculateField transformer w/ timeseries', () => {
     await expect(transformDataFrame([cfg], [seriesBC])).toEmitValuesWith((received) => {
       const data = received[0][0];
       expect(data.fields.length).toEqual(1);
-      expect(data.fields[0].values.toArray()).toEqual([0, 1]);
+      expect(data.fields[0].values).toEqual([0, 1]);
     });
   });
 
diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.ts b/packages/grafana-data/src/transformations/transformers/calculateField.ts
index 8b29eb73c6c..76d5b515e72 100644
--- a/packages/grafana-data/src/transformations/transformers/calculateField.ts
+++ b/packages/grafana-data/src/transformations/transformers/calculateField.ts
@@ -5,7 +5,7 @@ import { getTimeField } from '../../dataframe/processDataFrame';
 import { getFieldDisplayName } from '../../field';
 import { DataFrame, DataTransformerInfo, Field, FieldType, NullValueMode, Vector } from '../../types';
 import { BinaryOperationID, binaryOperators } from '../../utils/binaryOperators';
-import { BinaryOperationVector, ConstantVector, IndexVector } from '../../vector';
+import { BinaryOperationVector, ConstantVector } from '../../vector';
 import { AsNumberVector } from '../../vector/AsNumberVector';
 import { RowVector } from '../../vector/RowVector';
 import { doStandardCalcs, fieldReducers, ReducerID } from '../fieldReducer';
@@ -104,11 +104,8 @@ export const calculateFieldTransformer: DataTransformerInfo<CalculateFieldTransf
             const f = {
               name: options.alias ?? 'Row',
               type: FieldType.number,
-              values: new IndexVector(frame.length),
-              config: {
-                min: 0,
-                max: frame.length - 1,
-              },
+              values: [...Array(frame.length).keys()],
+              config: {},
             };
             return {
               ...frame,
diff --git a/packages/grafana-data/src/transformations/transformers/concat.ts b/packages/grafana-data/src/transformations/transformers/concat.ts
index 33cc1fe1871..a8cb3794e20 100644
--- a/packages/grafana-data/src/transformations/transformers/concat.ts
+++ b/packages/grafana-data/src/transformations/transformers/concat.ts
@@ -89,7 +89,7 @@ export function concatenateFields(data: DataFrame[], opts: ConcatenateTransforme
       if (f.values.length === maxLength) {
         return f;
       }
-      const values = f.values.toArray();
+      const values = f.values;
       values.length = maxLength;
       return {
         ...f,
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
index 1ae56494b60..fd4618119cb 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
@@ -174,7 +174,7 @@ describe('field convert types transformer', () => {
     expect(
       numbers[0].fields.map((f) => ({
         type: f.type,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toEqual([
       { type: FieldType.number, values: [1, 2, 3, 4, 5] },
@@ -212,7 +212,7 @@ describe('field convert types transformer', () => {
     expect(
       booleans[0].fields.map((f) => ({
         type: f.type,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toEqual([
       {
@@ -276,7 +276,7 @@ describe('field convert types transformer', () => {
     expect(
       complex[0].fields.map((f) => ({
         type: f.type,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toEqual([
       {
@@ -324,7 +324,7 @@ describe('field convert types transformer', () => {
     expect(
       stringified[0].fields.map((f) => ({
         type: f.type,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toEqual([
       {
@@ -354,7 +354,7 @@ describe('field convert types transformer', () => {
         ],
       }),
     ])[0].fields[0];
-    expect(stringified.values.toArray()).toEqual([
+    expect(stringified.values).toEqual([
       '2021-07',
       '2021-07',
       '2021-07', // can group by month
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
index 92d9703e925..ed2340de66a 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
@@ -117,7 +117,7 @@ const iso8601Regex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3,})?(?:Z|[-+]
 export function fieldToTimeField(field: Field, dateFormat?: string): Field {
   let opts = dateFormat ? { format: dateFormat } : undefined;
 
-  const timeValues = field.values.toArray().slice();
+  const timeValues = field.values.slice();
 
   let firstDefined = timeValues.find((v) => v != null);
 
@@ -140,7 +140,7 @@ export function fieldToTimeField(field: Field, dateFormat?: string): Field {
 }
 
 function fieldToNumberField(field: Field): Field {
-  const numValues = field.values.toArray().slice();
+  const numValues = field.values.slice();
 
   const valuesAsStrings = numValues.some((v) => typeof v === 'string');
 
@@ -166,7 +166,7 @@ function fieldToNumberField(field: Field): Field {
 }
 
 function fieldToBooleanField(field: Field): Field {
-  const booleanValues = field.values.toArray().slice();
+  const booleanValues = field.values.slice();
 
   for (let b = 0; b < booleanValues.length; b++) {
     booleanValues[b] = Boolean(!!booleanValues[b]);
@@ -180,7 +180,7 @@ function fieldToBooleanField(field: Field): Field {
 }
 
 function fieldToStringField(field: Field, dateFormat?: string): Field {
-  let values = field.values.toArray();
+  let values = field.values;
 
   switch (field.type) {
     case FieldType.time:
@@ -203,7 +203,7 @@ function fieldToStringField(field: Field, dateFormat?: string): Field {
 }
 
 function fieldToComplexField(field: Field): Field {
-  const complexValues = field.values.toArray().slice();
+  const complexValues = field.values.slice();
 
   for (let s = 0; s < complexValues.length; s++) {
     try {
@@ -229,7 +229,7 @@ function fieldToComplexField(field: Field): Field {
  * @public
  */
 export function ensureTimeField(field: Field, dateFormat?: string): Field {
-  const firstValueTypeIsNumber = typeof field.values.get(0) === 'number';
+  const firstValueTypeIsNumber = typeof field.values[0] === 'number';
   if (field.type === FieldType.time && firstValueTypeIsNumber) {
     return field; //already time
   }
@@ -244,7 +244,7 @@ export function ensureTimeField(field: Field, dateFormat?: string): Field {
 
 function fieldToEnumField(field: Field, cfg?: EnumFieldConfig): Field {
   const enumConfig = { ...cfg };
-  const enumValues = field.values.toArray().slice();
+  const enumValues = field.values.slice();
   const lookup = new Map<unknown, number>();
   if (enumConfig.text) {
     for (let i = 0; i < enumConfig.text.length; i++) {
diff --git a/packages/grafana-data/src/transformations/transformers/filterByValue.ts b/packages/grafana-data/src/transformations/transformers/filterByValue.ts
index 7a8941a72ae..0e6f47e9b7b 100644
--- a/packages/grafana-data/src/transformations/transformers/filterByValue.ts
+++ b/packages/grafana-data/src/transformations/transformers/filterByValue.ts
@@ -100,12 +100,12 @@ export const filterByValueTransformer: DataTransformerInfo<FilterByValueTransfor
 
             for (let index = 0; index < frame.length; index++) {
               if (include && rows.has(index)) {
-                buffer.push(field.values.get(index));
+                buffer.push(field.values[index]);
                 continue;
               }
 
               if (!include && !rows.has(index)) {
-                buffer.push(field.values.get(index));
+                buffer.push(field.values[index]);
                 continue;
               }
             }
diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.ts b/packages/grafana-data/src/transformations/transformers/groupBy.ts
index 3c60451cc20..03f24ff68b6 100644
--- a/packages/grafana-data/src/transformations/transformers/groupBy.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupBy.ts
@@ -65,7 +65,7 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
           // group for a given field.
           const valuesByGroupKey = new Map<string, Record<string, MutableField>>();
           for (let rowIndex = 0; rowIndex < frame.length; rowIndex++) {
-            const groupKey = String(groupByFields.map((field) => field.values.get(rowIndex)));
+            const groupKey = String(groupByFields.map((field) => field.values[rowIndex]));
             const valuesByField = valuesByGroupKey.get(groupKey) ?? {};
 
             if (!valuesByGroupKey.has(groupKey)) {
@@ -84,7 +84,7 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
                 };
               }
 
-              valuesByField[fieldName].values.add(field.values.get(rowIndex));
+              valuesByField[fieldName].values.push(field.values[rowIndex]);
             }
           }
 
@@ -95,7 +95,7 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
             const fieldName = getFieldDisplayName(field);
 
             valuesByGroupKey.forEach((value) => {
-              values.add(value[fieldName].values.get(0));
+              values.push(value[fieldName].values[0]);
             });
 
             fields.push({
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
index 3aa21d8b1b7..cbc4f8652f9 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
@@ -64,9 +64,9 @@ export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTr
         const matrixValues: { [key: string]: { [key: string]: any } } = {};
 
         for (let index = 0; index < valueField.values.length; index++) {
-          const columnName = keyColumnField.values.get(index);
-          const rowName = keyRowField.values.get(index);
-          const value = valueField.values.get(index);
+          const columnName = keyColumnField.values[index];
+          const rowName = keyRowField.values[index];
+          const value = valueField.values[index];
 
           if (!matrixValues[columnName]) {
             matrixValues[columnName] = {};
@@ -115,7 +115,7 @@ function uniqueValues(values: Vector): any[] {
   const unique = new Set();
 
   for (let index = 0; index < values.length; index++) {
-    unique.add(values.get(index));
+    unique.add(values[index]);
   }
 
   return Array.from(unique);
diff --git a/packages/grafana-data/src/transformations/transformers/histogram.test.ts b/packages/grafana-data/src/transformations/transformers/histogram.test.ts
index dd1e24fb2d7..64a952d2196 100644
--- a/packages/grafana-data/src/transformations/transformers/histogram.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/histogram.test.ts
@@ -26,7 +26,7 @@ describe('histogram frames frames', () => {
     expect(
       out.fields.map((f) => ({
         name: f.name,
-        values: f.values.toArray(),
+        values: f.values,
         config: f.config,
       }))
     ).toMatchInlineSnapshot(`
@@ -140,7 +140,7 @@ describe('histogram frames frames', () => {
     expect(
       out2.fields.map((f) => ({
         name: f.name,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toMatchInlineSnapshot(`
       [
diff --git a/packages/grafana-data/src/transformations/transformers/histogram.ts b/packages/grafana-data/src/transformations/transformers/histogram.ts
index 9fddca9a308..be56e154967 100644
--- a/packages/grafana-data/src/transformations/transformers/histogram.ts
+++ b/packages/grafana-data/src/transformations/transformers/histogram.ts
@@ -151,7 +151,7 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine
 
   // guess bucket size from single explicit bucket field
   if (!xMax && xMin && xMin.values.length > 1) {
-    let vals = xMin.values.toArray();
+    let vals = xMin.values;
     let bucketSize = roundDecimals(vals[1] - vals[0], 6);
 
     xMax = {
@@ -162,7 +162,7 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine
   }
 
   if (!xMin && xMax && xMax?.values.length > 1) {
-    let vals = xMax.values.toArray();
+    let vals = xMax.values;
     let bucketSize = roundDecimals(vals[1] - vals[0], 6);
 
     xMin = {
@@ -199,7 +199,7 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
     for (const frame of frames) {
       for (const field of frame.fields) {
         if (field.type === FieldType.number) {
-          allValues = allValues.concat(field.values.toArray());
+          allValues = allValues.concat(field.values);
         }
       }
     }
@@ -253,7 +253,7 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
   for (const frame of frames) {
     for (const field of frame.fields) {
       if (field.type === FieldType.number) {
-        let fieldHist = histogram(field.values.toArray(), getBucket, histFilter, histSort) as AlignedData;
+        let fieldHist = histogram(field.values, getBucket, histFilter, histSort) as AlignedData;
         histograms.push(fieldHist);
         counts.push({
           ...field,
diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
index e25d6e3bd6f..6f353f356dd 100644
--- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts
@@ -32,7 +32,7 @@ describe('align frames', () => {
       expect(
         out.fields.map((f) => ({
           name: f.name,
-          values: f.values.toArray(),
+          values: f.values,
         }))
       ).toMatchInlineSnapshot(`
         [
@@ -85,7 +85,7 @@ describe('align frames', () => {
       expect(
         out.fields.map((f) => ({
           name: f.name,
-          values: f.values.toArray(),
+          values: f.values,
         }))
       ).toMatchInlineSnapshot(`
         [
@@ -149,7 +149,7 @@ describe('align frames', () => {
     expect(
       out.fields.map((f) => ({
         name: f.name,
-        values: f.values.toArray(),
+        values: f.values,
         state: f.state,
       }))
     ).toMatchInlineSnapshot(`
@@ -242,7 +242,7 @@ describe('align frames', () => {
     expect(
       out.fields.map((f) => ({
         name: f.name,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toMatchInlineSnapshot(`
       [
@@ -289,7 +289,7 @@ describe('align frames', () => {
     expect(
       out.fields.map((f) => ({
         name: f.name,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toMatchInlineSnapshot(`
       [
diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
index e765f93a859..39dfb3f0284 100644
--- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
@@ -207,10 +207,10 @@ export function joinDataFrames(options: JoinOptions): DataFrame | undefined {
     }
 
     nullModes.push(nullModesFrame);
-    const a: AlignedData = [join.values.toArray()]; //
+    const a: AlignedData = [join.values]; //
 
     for (const field of fields) {
-      a.push(field.values.toArray());
+      a.push(field.values);
       originalFields.push(field);
       // clear field displayName state
       delete field.state?.displayName;
diff --git a/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts b/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts
index 1fe663527e4..1b97aa6a812 100644
--- a/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts
@@ -259,7 +259,7 @@ describe('Labels as Columns', () => {
     });
 
     await expect(transformDataFrame([cfg], [source])).toEmitValuesWith((received) => {
-      expect(received[0][0].fields.map((f) => ({ [f.name]: f.values.toArray() }))).toMatchInlineSnapshot(`
+      expect(received[0][0].fields.map((f) => ({ [f.name]: f.values }))).toMatchInlineSnapshot(`
         [
           {
             "time": [
@@ -346,9 +346,8 @@ describe('Labels as Columns', () => {
     });
 
     await expect(transformDataFrame([cfg], [source])).toEmitValuesWith((received) => {
-      expect(
-        received[0].map((f) => ({ name: f.name, fields: f.fields.map((v) => ({ [v.name]: v.values.toArray() })) }))
-      ).toMatchInlineSnapshot(`
+      expect(received[0].map((f) => ({ name: f.name, fields: f.fields.map((v) => ({ [v.name]: v.values })) })))
+        .toMatchInlineSnapshot(`
         [
           {
             "fields": [
@@ -410,9 +409,8 @@ describe('Labels as Columns', () => {
     });
 
     await expect(transformDataFrame([cfg], [source])).toEmitValuesWith((received) => {
-      expect(
-        received[0].map((f) => ({ name: f.name, fields: f.fields.map((v) => ({ [v.name]: v.values.toArray() })) }))
-      ).toMatchInlineSnapshot(`
+      expect(received[0].map((f) => ({ name: f.name, fields: f.fields.map((v) => ({ [v.name]: v.values })) })))
+        .toMatchInlineSnapshot(`
         [
           {
             "fields": [
@@ -457,7 +455,7 @@ describe('Labels as Columns', () => {
 function toSimpleObject(frame: DataFrame) {
   const obj: Record<string, unknown> = {};
   for (const field of frame.fields) {
-    obj[field.name] = field.values.toArray();
+    obj[field.name] = field.values;
   }
   return obj;
 }
diff --git a/packages/grafana-data/src/transformations/transformers/merge.test.ts b/packages/grafana-data/src/transformations/transformers/merge.test.ts
index e379043ff14..e837a98b086 100644
--- a/packages/grafana-data/src/transformations/transformers/merge.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/merge.test.ts
@@ -595,7 +595,5 @@ const createField = (
 };
 
 const unwrap = (fields: Field[]): Field[] => {
-  return fields.map((field) =>
-    createField(field.name, field.type, field.values.toArray(), field.config, field.display)
-  );
+  return fields.map((field) => createField(field.name, field.type, field.values, field.config, field.display));
 };
diff --git a/packages/grafana-data/src/transformations/transformers/sortBy.test.ts b/packages/grafana-data/src/transformations/transformers/sortBy.test.ts
index 557a79e7308..039ac0167eb 100644
--- a/packages/grafana-data/src/transformations/transformers/sortBy.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/sortBy.test.ts
@@ -95,5 +95,5 @@ describe('SortBy transformer', () => {
 });
 
 function getFieldSnapshot(f: Field): Object {
-  return { name: f.name, values: f.values.toArray() };
+  return { name: f.name, values: f.values };
 }
diff --git a/packages/grafana-data/src/utils/csv.ts b/packages/grafana-data/src/utils/csv.ts
index 28a02cae94b..b1121927a2d 100644
--- a/packages/grafana-data/src/utils/csv.ts
+++ b/packages/grafana-data/src/utils/csv.ts
@@ -308,7 +308,7 @@ export function toCSV(data: DataFrame[], config?: CSVConfig): string {
             csv = csv + config.delimiter;
           }
 
-          const v = fields[j].values.get(i);
+          const v = fields[j].values[i];
           if (v !== null) {
             csv = csv + writers[j](v);
           }
diff --git a/packages/grafana-data/src/utils/dataLinks.test.ts b/packages/grafana-data/src/utils/dataLinks.test.ts
index 1729fb0fa53..b2b0baca976 100644
--- a/packages/grafana-data/src/utils/dataLinks.test.ts
+++ b/packages/grafana-data/src/utils/dataLinks.test.ts
@@ -1,5 +1,4 @@
 import { DataLink, FieldType, TimeRange } from '../types';
-import { ArrayVector } from '../vector';
 
 import { mapInternalLinkToExplore } from './dataLinks';
 
@@ -24,7 +23,7 @@ describe('mapInternalLinkToExplore', () => {
         name: 'test',
         type: FieldType.number,
         config: {},
-        values: new ArrayVector([2]),
+        values: [2],
       },
       replaceVariables: (val) => val,
     });
@@ -65,7 +64,7 @@ describe('mapInternalLinkToExplore', () => {
         name: 'test',
         type: FieldType.number,
         config: {},
-        values: new ArrayVector([2]),
+        values: [2],
       },
       replaceVariables: (val) => val,
     });
@@ -112,7 +111,7 @@ describe('mapInternalLinkToExplore', () => {
         name: 'test',
         type: FieldType.number,
         config: {},
-        values: new ArrayVector([2]),
+        values: [2],
       },
       replaceVariables: (val, scopedVars) => val.replace(/\$var/g, scopedVars!['var1']!.value),
     });
diff --git a/packages/grafana-data/src/utils/series.test.ts b/packages/grafana-data/src/utils/series.test.ts
index 5ab3d843a14..8ac46275c31 100644
--- a/packages/grafana-data/src/utils/series.test.ts
+++ b/packages/grafana-data/src/utils/series.test.ts
@@ -1,25 +1,24 @@
 import { Field, FieldType } from '../types';
-import { ArrayVector } from '../vector';
 
 import { getSeriesTimeStep, hasMsResolution } from './series';
 
 const uniformTimeField: Field = {
   name: 'time',
   type: FieldType.time,
-  values: new ArrayVector([0, 100, 200, 300]),
+  values: [0, 100, 200, 300],
   config: {},
 };
 const nonUniformTimeField: Field = {
   name: 'time',
   type: FieldType.time,
-  values: new ArrayVector([0, 100, 300, 350]),
+  values: [0, 100, 300, 350],
   config: {},
 };
 
 const msResolutionTimeField: Field = {
   name: 'time',
   type: FieldType.time,
-  values: new ArrayVector([0, 1572951685007, 300, 350]),
+  values: [0, 1572951685007, 300, 350],
   config: {},
 };
 
diff --git a/packages/grafana-data/src/utils/series.ts b/packages/grafana-data/src/utils/series.ts
index 38937b9a95c..c264e0842d5 100644
--- a/packages/grafana-data/src/utils/series.ts
+++ b/packages/grafana-data/src/utils/series.ts
@@ -10,7 +10,7 @@ export const getSeriesTimeStep = (timeField: Field): number => {
   let returnTimeStep = Number.MAX_VALUE;
 
   for (let i = 0; i < timeField.values.length; i++) {
-    const currentTime = timeField.values.get(i);
+    const currentTime = timeField.values[i];
 
     if (previousTime !== undefined) {
       const timeStep = currentTime - previousTime;
@@ -34,7 +34,7 @@ export const getSeriesTimeStep = (timeField: Field): number => {
  */
 export const hasMsResolution = (timeField: Field) => {
   for (let i = 0; i < timeField.values.length; i++) {
-    const value = timeField.values.get(i);
+    const value = timeField.values[i];
     if (value !== null && value !== undefined) {
       const timestamp = value.toString();
       if (timestamp.length === 13 && timestamp % 1000 !== 0) {
diff --git a/packages/grafana-data/src/vector/AppendedVectors.ts b/packages/grafana-data/src/vector/AppendedVectors.ts
index 66883c102cd..805b88fc273 100644
--- a/packages/grafana-data/src/vector/AppendedVectors.ts
+++ b/packages/grafana-data/src/vector/AppendedVectors.ts
@@ -13,6 +13,8 @@ interface AppendedVectorInfo<T> {
  * This may be more trouble than it is worth.  This trades some computation time for
  * RAM -- rather than allocate a new array the size of all previous arrays, this just
  * points the correct index to their original array values
+ *
+ * @deprecated use a simple Arrays
  */
 export class AppendedVectors<T = any> extends FunctionalVector<T> {
   length = 0;
@@ -60,7 +62,7 @@ export class AppendedVectors<T = any> extends FunctionalVector<T> {
     for (let i = 0; i < this.source.length; i++) {
       const src = this.source[i];
       if (index >= src.start && index < src.end) {
-        return src.values.get(index - src.start);
+        return src.values[index - src.start];
       }
     }
     return undefined as unknown as T;
diff --git a/packages/grafana-data/src/vector/AsNumberVector.ts b/packages/grafana-data/src/vector/AsNumberVector.ts
index 775068dbe45..c51d77179c6 100644
--- a/packages/grafana-data/src/vector/AsNumberVector.ts
+++ b/packages/grafana-data/src/vector/AsNumberVector.ts
@@ -6,6 +6,7 @@ import { FunctionalVector } from './FunctionalVector';
  * This will force all values to be numbers
  *
  * @public
+ * @deprecated use a simple Arrays
  */
 export class AsNumberVector extends FunctionalVector<number> {
   constructor(private field: Vector) {
diff --git a/packages/grafana-data/src/vector/BinaryOperationVector.ts b/packages/grafana-data/src/vector/BinaryOperationVector.ts
index 51ecb808ec4..74453fd6f75 100644
--- a/packages/grafana-data/src/vector/BinaryOperationVector.ts
+++ b/packages/grafana-data/src/vector/BinaryOperationVector.ts
@@ -6,6 +6,7 @@ import { vectorToArray } from './vectorToArray';
 
 /**
  * @public
+ * @deprecated use a simple Arrays
  */
 export class BinaryOperationVector extends FunctionalVector<number> {
   constructor(private left: Vector<number>, private right: Vector<number>, private operation: BinaryOperation) {
diff --git a/packages/grafana-data/src/vector/CircularVector.ts b/packages/grafana-data/src/vector/CircularVector.ts
index 42ea9604b12..e3594b25174 100644
--- a/packages/grafana-data/src/vector/CircularVector.ts
+++ b/packages/grafana-data/src/vector/CircularVector.ts
@@ -14,6 +14,7 @@ interface CircularOptions<T> {
  * to match a configured capacity.
  *
  * @public
+ * @deprecated use a simple Arrays
  */
 export class CircularVector<T = any> extends FunctionalVector<T> {
   private buffer: T[];
diff --git a/packages/grafana-data/src/vector/ConstantVector.ts b/packages/grafana-data/src/vector/ConstantVector.ts
index ff39aaacfdb..5eec8f31abf 100644
--- a/packages/grafana-data/src/vector/ConstantVector.ts
+++ b/packages/grafana-data/src/vector/ConstantVector.ts
@@ -2,6 +2,7 @@ import { FunctionalVector } from './FunctionalVector';
 
 /**
  * @public
+ * @deprecated use a simple Arrays
  */
 export class ConstantVector<T = any> extends FunctionalVector<T> {
   constructor(private value: T, private len: number) {
diff --git a/packages/grafana-data/src/vector/FormattedVector.ts b/packages/grafana-data/src/vector/FormattedVector.ts
index 277342173ed..a6378221d4f 100644
--- a/packages/grafana-data/src/vector/FormattedVector.ts
+++ b/packages/grafana-data/src/vector/FormattedVector.ts
@@ -6,6 +6,7 @@ import { FunctionalVector } from './FunctionalVector';
 
 /**
  * @public
+ * @deprecated use a simple Arrays
  */
 export class FormattedVector<T = any> extends FunctionalVector<string> {
   constructor(private source: Vector<T>, private formatter: DisplayProcessor) {
diff --git a/packages/grafana-data/src/vector/FunctionalVector.ts b/packages/grafana-data/src/vector/FunctionalVector.ts
index 9e5ba6b77e7..7ee154e60f5 100644
--- a/packages/grafana-data/src/vector/FunctionalVector.ts
+++ b/packages/grafana-data/src/vector/FunctionalVector.ts
@@ -2,7 +2,10 @@ import { Vector } from '../types';
 
 import { vectorToArray } from './vectorToArray';
 
-/** @public */
+/**
+ * @public
+ * @deprecated use a simple Arrays
+ */
 export abstract class FunctionalVector<T = any> implements Vector<T> {
   abstract get length(): number;
 
@@ -187,6 +190,8 @@ const emptyarray: any[] = [];
 
 /**
  * Use functional programming with your vector
+ *
+ * @deprecated use a simple Arrays
  */
 export function vectorator<T>(vector: Vector<T>) {
   return {
diff --git a/packages/grafana-data/src/vector/RowVector.ts b/packages/grafana-data/src/vector/RowVector.ts
index abd2077c564..793c13c0df6 100644
--- a/packages/grafana-data/src/vector/RowVector.ts
+++ b/packages/grafana-data/src/vector/RowVector.ts
@@ -6,6 +6,7 @@ import { vectorToArray } from './vectorToArray';
 /**
  * RowVector makes the row values look like a vector
  * @internal
+ * @deprecated use a simple Arrays
  */
 export class RowVector extends FunctionalVector<number> {
   constructor(private columns: Vector[]) {
diff --git a/public/app/features/transformers/calculateHeatmap/heatmap.test.ts b/public/app/features/transformers/calculateHeatmap/heatmap.test.ts
index 968cf120079..0087b9fe22f 100644
--- a/public/app/features/transformers/calculateHeatmap/heatmap.test.ts
+++ b/public/app/features/transformers/calculateHeatmap/heatmap.test.ts
@@ -95,7 +95,7 @@ describe('Heatmap transformer', () => {
         "type": "heatmap-cells",
       }
     `);
-    expect(heatmap.fields[1].values.toArray()).toMatchInlineSnapshot(`
+    expect(heatmap.fields[1].values).toMatchInlineSnapshot(`
       [
         0,
         1,
diff --git a/public/app/features/transformers/calculateHeatmap/heatmap.ts b/public/app/features/transformers/calculateHeatmap/heatmap.ts
index 9710a644256..15677698baf 100644
--- a/public/app/features/transformers/calculateHeatmap/heatmap.ts
+++ b/public/app/features/transformers/calculateHeatmap/heatmap.ts
@@ -1,7 +1,6 @@
 import { map } from 'rxjs';
 
 import {
-  ArrayVector,
   DataFrame,
   DataTransformerID,
   FieldType,
@@ -104,7 +103,7 @@ export interface RowsHeatmapOptions {
 export function rowsToCellsHeatmap(opts: RowsHeatmapOptions): DataFrame {
   // TODO: handle null-filling w/ fields[0].config.interval?
   const xField = opts.frame.fields[0];
-  const xValues = xField.values.toArray();
+  const xValues = xField.values;
   const yFields = opts.frame.fields.filter((f, idx) => f.type === FieldType.number && idx > 0);
 
   // similar to initBins() below
@@ -113,7 +112,7 @@ export function rowsToCellsHeatmap(opts: RowsHeatmapOptions): DataFrame {
   const ys = new Array(len);
   const counts2 = new Array(len);
 
-  const counts = yFields.map((field) => field.values.toArray().slice());
+  const counts = yFields.map((field) => field.values.slice());
 
   // transpose
   counts.forEach((bucketCounts, bi) => {
@@ -197,13 +196,13 @@ export function rowsToCellsHeatmap(opts: RowsHeatmapOptions): DataFrame {
       {
         name: xField.type === FieldType.time ? 'xMax' : 'x',
         type: xField.type,
-        values: new ArrayVector(xs),
+        values: xs,
         config: xField.config,
       },
       {
         name: ordinalFieldName,
         type: FieldType.number,
-        values: new ArrayVector(ys),
+        values: ys,
         config: {
           unit: 'short', // ordinal lookup
         },
@@ -211,7 +210,7 @@ export function rowsToCellsHeatmap(opts: RowsHeatmapOptions): DataFrame {
       {
         name: opts.value?.length ? opts.value : 'Value',
         type: FieldType.number,
-        values: new ArrayVector(counts2),
+        values: counts2,
         config: valueCfg,
         display: yFields[0].display,
       },
@@ -229,7 +228,7 @@ export function prepBucketFrames(frames: DataFrame[]): DataFrame[] {
   frames.sort((a, b) => sortAscStrInf(a.name, b.name));
 
   // cumulative counts
-  const counts = frames.map((frame) => frame.fields[1].values.toArray().slice());
+  const counts = frames.map((frame) => frame.fields[1].values.slice());
 
   // de-accumulate
   counts.reverse();
@@ -248,7 +247,7 @@ export function prepBucketFrames(frames: DataFrame[]): DataFrame[] {
       frame.fields[0],
       {
         ...frame.fields[1],
-        values: new ArrayVector(counts[i]),
+        values: counts[i],
       },
     ],
   }));
@@ -289,10 +288,10 @@ export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCa
       xField = x; // the first X
     }
 
-    const xValues = x.values.toArray();
+    const xValues = x.values;
     for (let field of frame.fields) {
       if (field !== x && field.type === FieldType.number) {
-        const yValues = field.values.toArray();
+        const yValues = field.values;
 
         for (let i = 0; i < xValues.length; i++, j++) {
           xs[j] = xValues[i];
@@ -350,13 +349,13 @@ export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCa
       {
         name: 'xMin',
         type: xField.type,
-        values: new ArrayVector(heat2d.x),
+        values: heat2d.x,
         config: xField.config,
       },
       {
         name: 'yMin',
         type: FieldType.number,
-        values: new ArrayVector(heat2d.y),
+        values: heat2d.y,
         config: {
           ...yField.config, // keep units from the original source
           custom: {
@@ -367,7 +366,7 @@ export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCa
       {
         name: 'Count',
         type: FieldType.number,
-        values: new ArrayVector(heat2d.count),
+        values: heat2d.count,
         config: {
           unit: 'short', // always integer
         },
diff --git a/public/app/features/transformers/configFromQuery/configFromQuery.ts b/public/app/features/transformers/configFromQuery/configFromQuery.ts
index c114a2ce0d6..5c91e7da28a 100644
--- a/public/app/features/transformers/configFromQuery/configFromQuery.ts
+++ b/public/app/features/transformers/configFromQuery/configFromQuery.ts
@@ -1,7 +1,6 @@
 import { map } from 'rxjs/operators';
 
 import {
-  ArrayVector,
   DataFrame,
   DataTransformerID,
   DataTransformerInfo,
@@ -51,7 +50,7 @@ export function extractConfigFromQuery(options: ConfigFromQueryTransformOptions,
     const fieldName = getFieldDisplayName(field, configFrame);
     const fieldMapping = mappingResult.index[fieldName];
     const result = reduceField({ field, reducers: [fieldMapping.reducerId] });
-    newField.values = new ArrayVector([result[fieldMapping.reducerId]]);
+    newField.values = [result[fieldMapping.reducerId]];
     reducedConfigFrame.fields.push(newField);
   }
 
diff --git a/public/app/features/transformers/extractFields/extractFields.test.ts b/public/app/features/transformers/extractFields/extractFields.test.ts
index 8ee2f67923c..63c6c2bd72c 100644
--- a/public/app/features/transformers/extractFields/extractFields.test.ts
+++ b/public/app/features/transformers/extractFields/extractFields.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, Field, FieldType } from '@grafana/data';
+import { DataFrame, Field, FieldType } from '@grafana/data';
 import { toDataFrame } from '@grafana/data/src/dataframe/processDataFrame';
 
 import { extractFieldsTransformer } from './extractFields';
@@ -193,28 +193,28 @@ const testFieldTime: Field = {
   config: {},
   name: 'Time',
   type: FieldType.time,
-  values: new ArrayVector([1669638911691]),
+  values: [1669638911691],
 };
 
 const testFieldString: Field = {
   config: {},
   name: 'String',
   type: FieldType.string,
-  values: new ArrayVector(['Hallo World']),
+  values: ['Hallo World'],
 };
 
 const testFieldJSON: Field = {
   config: {},
   name: 'JSON',
   type: FieldType.string,
-  values: new ArrayVector([
+  values: [
     JSON.stringify({
       object: {
         nestedArray: [1, 2, 3, 4],
         nestedString: 'Hallo World',
       },
     }),
-  ]),
+  ],
 };
 
 const testDataFrame: DataFrame = {
diff --git a/public/app/features/transformers/extractFields/extractFields.ts b/public/app/features/transformers/extractFields/extractFields.ts
index b807de1aee8..9db5202153b 100644
--- a/public/app/features/transformers/extractFields/extractFields.ts
+++ b/public/app/features/transformers/extractFields/extractFields.ts
@@ -2,7 +2,6 @@ import { isString, get } from 'lodash';
 import { map } from 'rxjs/operators';
 
 import {
-  ArrayVector,
   DataFrame,
   DataTransformerID,
   Field,
@@ -53,7 +52,7 @@ function addExtractedFields(frame: DataFrame, options: ExtractFieldsOptions): Da
   const values = new Map<string, any[]>();
 
   for (let i = 0; i < count; i++) {
-    let obj = source.values.get(i);
+    let obj = source.values[i];
 
     if (isString(obj)) {
       try {
@@ -93,7 +92,7 @@ function addExtractedFields(frame: DataFrame, options: ExtractFieldsOptions): Da
     const buffer = values.get(name);
     return {
       name,
-      values: new ArrayVector(buffer),
+      values: buffer,
       type: buffer ? getFieldTypeFromValue(buffer.find((v) => v != null)) : FieldType.other,
       config: {},
     } as Field;
diff --git a/public/app/features/transformers/joinByLabels/joinByLabels.test.ts b/public/app/features/transformers/joinByLabels/joinByLabels.test.ts
index aeaf32651c6..d2d0574e4f5 100644
--- a/public/app/features/transformers/joinByLabels/joinByLabels.test.ts
+++ b/public/app/features/transformers/joinByLabels/joinByLabels.test.ts
@@ -142,8 +142,8 @@ describe('Join by labels', () => {
 
 function toRowsSnapshow(frame: DataFrame) {
   const columns = frame.fields.map((f) => f.name);
-  const rows = frame.fields[0].values.toArray().map((v, idx) => {
-    return frame.fields.map((f) => f.values.get(idx));
+  const rows = frame.fields[0].values.map((v, idx) => {
+    return frame.fields.map((f) => f.values[idx]);
   });
   return {
     columns,
diff --git a/public/app/features/transformers/joinByLabels/joinByLabels.ts b/public/app/features/transformers/joinByLabels/joinByLabels.ts
index 9ebfb34c1a2..f8ffea2e57e 100644
--- a/public/app/features/transformers/joinByLabels/joinByLabels.ts
+++ b/public/app/features/transformers/joinByLabels/joinByLabels.ts
@@ -1,13 +1,6 @@
 import { map } from 'rxjs/operators';
 
-import {
-  ArrayVector,
-  DataFrame,
-  DataTransformerID,
-  Field,
-  FieldType,
-  SynchronousDataTransformerInfo,
-} from '@grafana/data';
+import { DataFrame, DataTransformerID, Field, FieldType, SynchronousDataTransformerInfo } from '@grafana/data';
 
 import { getDistinctLabels } from '../utils';
 
@@ -72,7 +65,7 @@ export function joinByLabels(options: JoinByLabelsTransformOptions, data: DataFr
           found.set(key, item);
         }
         const name = field.labels[options.value];
-        const vals = field.values.toArray();
+        const vals = field.values;
         const old = item.values[name];
         if (old) {
           item.values[name] = old.concat(vals);
@@ -117,7 +110,7 @@ export function joinByLabels(options: JoinByLabelsTransformOptions, data: DataFr
       name: join[i],
       config: {},
       type: FieldType.string,
-      values: new ArrayVector(joinValues[i]),
+      values: joinValues[i],
     });
   }
 
@@ -127,7 +120,7 @@ export function joinByLabels(options: JoinByLabelsTransformOptions, data: DataFr
       name: allNames[i],
       config: {},
       type: old.type ?? FieldType.number,
-      values: new ArrayVector(nameValues[i]),
+      values: nameValues[i],
     });
   }
 
@@ -139,7 +132,7 @@ function getErrorFrame(text: string): DataFrame {
     meta: {
       notices: [{ severity: 'error', text }],
     },
-    fields: [{ name: 'Error', type: FieldType.string, config: {}, values: new ArrayVector([text]) }],
+    fields: [{ name: 'Error', type: FieldType.string, config: {}, values: [text] }],
     length: 0,
   };
 }
diff --git a/public/app/features/transformers/lookupGazetteer/fieldLookup.ts b/public/app/features/transformers/lookupGazetteer/fieldLookup.ts
index 4f9470c176e..94e06a68c8f 100644
--- a/public/app/features/transformers/lookupGazetteer/fieldLookup.ts
+++ b/public/app/features/transformers/lookupGazetteer/fieldLookup.ts
@@ -65,7 +65,7 @@ export function addFieldsFromGazetteer(frames: DataFrame[], gaz: Gazetteer, matc
           const found = gaz.find(values[v]);
           if (found?.index != null) {
             for (let i = 0; i < src.length; i++) {
-              sub[i][v] = src[i].values.get(found.index);
+              sub[i][v] = src[i].values[found.index];
             }
           }
         }
diff --git a/public/app/features/transformers/partitionByValues/partitionByValues.test.ts b/public/app/features/transformers/partitionByValues/partitionByValues.test.ts
index 3b41ccbab8f..3741ff8ea94 100644
--- a/public/app/features/transformers/partitionByValues/partitionByValues.test.ts
+++ b/public/app/features/transformers/partitionByValues/partitionByValues.test.ts
@@ -35,15 +35,15 @@ describe('Partition by values transformer', () => {
     expect(partitioned[0].name).toEqual('Europe');
     expect(partitioned[0].fields[0].name).toEqual('model');
     expect(partitioned[0].fields[1].name).toEqual('region');
-    expect(partitioned[0].fields[0].values.toArray()).toEqual(['E1', 'E2', 'E3']);
-    expect(partitioned[0].fields[1].values.toArray()).toEqual(['Europe', 'Europe', 'Europe']);
+    expect(partitioned[0].fields[0].values).toEqual(['E1', 'E2', 'E3']);
+    expect(partitioned[0].fields[1].values).toEqual(['Europe', 'Europe', 'Europe']);
 
     expect(partitioned[1].length).toEqual(3);
     expect(partitioned[1].name).toEqual('China');
     expect(partitioned[1].fields[0].name).toEqual('model');
     expect(partitioned[1].fields[1].name).toEqual('region');
-    expect(partitioned[1].fields[0].values.toArray()).toEqual(['C1', 'C2', 'C3']);
-    expect(partitioned[1].fields[1].values.toArray()).toEqual(['China', 'China', 'China']);
+    expect(partitioned[1].fields[0].values).toEqual(['C1', 'C2', 'C3']);
+    expect(partitioned[1].fields[1].values).toEqual(['China', 'China', 'China']);
   });
 
   it('should partition by multiple fields', () => {
@@ -76,36 +76,36 @@ describe('Partition by values transformer', () => {
     expect(partitioned[0].fields[0].name).toEqual('model');
     expect(partitioned[0].fields[1].name).toEqual('region');
     expect(partitioned[0].fields[2].name).toEqual('status');
-    expect(partitioned[0].fields[0].values.toArray()).toEqual(['E1']);
-    expect(partitioned[0].fields[1].values.toArray()).toEqual(['Europe']);
-    expect(partitioned[0].fields[2].values.toArray()).toEqual(['OK']);
+    expect(partitioned[0].fields[0].values).toEqual(['E1']);
+    expect(partitioned[0].fields[1].values).toEqual(['Europe']);
+    expect(partitioned[0].fields[2].values).toEqual(['OK']);
 
     expect(partitioned[1].length).toEqual(2);
     expect(partitioned[1].name).toEqual('Europe FAIL');
     expect(partitioned[1].fields[0].name).toEqual('model');
     expect(partitioned[1].fields[1].name).toEqual('region');
     expect(partitioned[1].fields[2].name).toEqual('status');
-    expect(partitioned[1].fields[0].values.toArray()).toEqual(['E2', 'E3']);
-    expect(partitioned[1].fields[1].values.toArray()).toEqual(['Europe', 'Europe']);
-    expect(partitioned[1].fields[2].values.toArray()).toEqual(['FAIL', 'FAIL']);
+    expect(partitioned[1].fields[0].values).toEqual(['E2', 'E3']);
+    expect(partitioned[1].fields[1].values).toEqual(['Europe', 'Europe']);
+    expect(partitioned[1].fields[2].values).toEqual(['FAIL', 'FAIL']);
 
     expect(partitioned[2].length).toEqual(2);
     expect(partitioned[2].name).toEqual('China OK');
     expect(partitioned[2].fields[0].name).toEqual('model');
     expect(partitioned[2].fields[1].name).toEqual('region');
     expect(partitioned[2].fields[2].name).toEqual('status');
-    expect(partitioned[2].fields[0].values.toArray()).toEqual(['C1', 'C2']);
-    expect(partitioned[2].fields[1].values.toArray()).toEqual(['China', 'China']);
-    expect(partitioned[2].fields[2].values.toArray()).toEqual(['OK', 'OK']);
+    expect(partitioned[2].fields[0].values).toEqual(['C1', 'C2']);
+    expect(partitioned[2].fields[1].values).toEqual(['China', 'China']);
+    expect(partitioned[2].fields[2].values).toEqual(['OK', 'OK']);
 
     expect(partitioned[3].length).toEqual(1);
     expect(partitioned[3].name).toEqual('China FAIL');
     expect(partitioned[3].fields[0].name).toEqual('model');
     expect(partitioned[3].fields[1].name).toEqual('region');
     expect(partitioned[3].fields[2].name).toEqual('status');
-    expect(partitioned[3].fields[0].values.toArray()).toEqual(['C3']);
-    expect(partitioned[3].fields[1].values.toArray()).toEqual(['China']);
-    expect(partitioned[3].fields[2].values.toArray()).toEqual(['FAIL']);
+    expect(partitioned[3].fields[0].values).toEqual(['C3']);
+    expect(partitioned[3].fields[1].values).toEqual(['China']);
+    expect(partitioned[3].fields[2].values).toEqual(['FAIL']);
   });
 
   it('should partition by multiple fields with custom frame naming {withNames: true}', () => {
diff --git a/public/app/features/transformers/partitionByValues/partitionByValues.ts b/public/app/features/transformers/partitionByValues/partitionByValues.ts
index afcb985d044..1e81bca60f0 100644
--- a/public/app/features/transformers/partitionByValues/partitionByValues.ts
+++ b/public/app/features/transformers/partitionByValues/partitionByValues.ts
@@ -1,7 +1,6 @@
 import { map } from 'rxjs';
 
 import {
-  ArrayVector,
   DataFrame,
   DataTransformerID,
   SynchronousDataTransformerInfo,
@@ -99,7 +98,7 @@ export function partitionByValues(
   options?: PartitionByValuesTransformerOptions
 ): DataFrame[] {
   const keyFields = frame.fields.filter((f) => matcher(f, frame, [frame]))!;
-  const keyFieldsVals = keyFields.map((f) => f.values.toArray());
+  const keyFieldsVals = keyFields.map((f) => f.values);
   const names = keyFields.map((f) => f.name);
 
   const frameNameOpts = {
@@ -142,7 +141,7 @@ export function partitionByValues(
       meta: frame.meta,
       length: idxs.length,
       fields: filteredFields.map((f) => {
-        const vals = f.values.toArray();
+        const vals = f.values;
         const vals2 = Array(idxs.length);
 
         for (let i = 0; i < idxs.length; i++) {
@@ -157,7 +156,7 @@ export function partitionByValues(
             ...f.labels,
             ...fieldLabels,
           },
-          values: new ArrayVector(vals2),
+          values: vals2,
         };
       }),
     };
diff --git a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
index ab11b30333c..c27ea9c8661 100644
--- a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
+++ b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
@@ -84,8 +84,8 @@ describe('Prepare time series transformer', () => {
       frames.map((f) => ({
         name: getFrameDisplayName(f),
         labels: f.fields[1].labels,
-        time: f.fields[0].values.toArray(),
-        values: f.fields[1].values.toArray(),
+        time: f.fields[0].values,
+        values: f.fields[1].values,
       }))
     ).toMatchInlineSnapshot(`
       [
diff --git a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts
index 44302a8f7e1..61ec170498f 100644
--- a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts
+++ b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts
@@ -78,13 +78,13 @@ export function toTimeSeriesMulti(data: DataFrame[]): DataFrame[] {
         };
         const builders = new Map<string, frameBuilder>();
         for (let i = 0; i < frame.length; i++) {
-          const time = timeField.values.get(i);
-          const value = field.values.get(i);
+          const time = timeField.values[i];
+          const value = field.values[i];
           if (value === undefined || time == null) {
             continue; // skip values left over from join
           }
 
-          const key = labelFields.map((f) => f.values.get(i)).join('/');
+          const key = labelFields.map((f) => f.values[i]).join('/');
           let builder = builders.get(key);
           if (!builder) {
             builder = {
@@ -94,7 +94,7 @@ export function toTimeSeriesMulti(data: DataFrame[]): DataFrame[] {
               labels: {},
             };
             for (const label of labelFields) {
-              builder.labels[label.name] = label.values.get(i);
+              builder.labels[label.name] = label.values[i];
             }
             builders.set(key, builder);
           }
@@ -218,7 +218,7 @@ export function toTimeSeriesLong(data: DataFrame[]): DataFrame[] {
     const uniqueFactorNamesWithWideIndices: string[] = [];
 
     for (let wideRowIndex = 0; wideRowIndex < frame.length; wideRowIndex++) {
-      sortedTimeRowIndices.push({ time: timeField.values.get(wideRowIndex), wideRowIndex: wideRowIndex });
+      sortedTimeRowIndices.push({ time: timeField.values[wideRowIndex], wideRowIndex: wideRowIndex });
     }
 
     for (const labelKeys in labelKeyToWideIndices) {
@@ -257,7 +257,7 @@ export function toTimeSeriesLong(data: DataFrame[]): DataFrame[] {
         const rowValues: Record<string, any> = {};
 
         for (const name of uniqueFactorNamesWithWideIndices) {
-          rowValues[name] = frame.fields[uniqueFactorNamesToWideIndex[name]].values.get(wideRowIndex);
+          rowValues[name] = frame.fields[uniqueFactorNamesToWideIndex[name]].values[wideRowIndex];
         }
 
         let index = 0;
@@ -271,7 +271,7 @@ export function toTimeSeriesLong(data: DataFrame[]): DataFrame[] {
             }
           }
 
-          rowValues[wideField.name] = wideField.values.get(wideRowIndex);
+          rowValues[wideField.name] = wideField.values[wideRowIndex];
         }
 
         rowValues[timeField.name] = time;
diff --git a/public/app/features/transformers/rowsToFields/rowsToFields.test.ts b/public/app/features/transformers/rowsToFields/rowsToFields.test.ts
index bcfab657e51..333fa1ae093 100644
--- a/public/app/features/transformers/rowsToFields/rowsToFields.test.ts
+++ b/public/app/features/transformers/rowsToFields/rowsToFields.test.ts
@@ -83,7 +83,7 @@ describe('Rows to fields', () => {
 
     expect(result.fields[0].name).toBe('Temperature');
     expect(result.fields[0].config).toEqual({});
-    expect(result.fields[0].values.get(0)).toBe(100);
+    expect(result.fields[0].values[0]).toBe(100);
   });
 
   it('Can handle colors', () => {
@@ -150,7 +150,7 @@ describe('Rows to fields', () => {
     );
 
     expect(result.fields[0].name).toEqual('Stockholm');
-    expect(result.fields[0].values.get(0)).toEqual(20);
+    expect(result.fields[0].values[0]).toEqual(20);
   });
 
   it('Can handle number fields as name field', () => {
@@ -172,6 +172,6 @@ describe('Rows to fields', () => {
     );
 
     expect(result.fields[0].name).toEqual('10');
-    expect(result.fields[0].values.get(0)).toEqual(1);
+    expect(result.fields[0].values[0]).toEqual(1);
   });
 });
diff --git a/public/app/features/transformers/rowsToFields/rowsToFields.ts b/public/app/features/transformers/rowsToFields/rowsToFields.ts
index 6874073a6af..8bd7eec91b6 100644
--- a/public/app/features/transformers/rowsToFields/rowsToFields.ts
+++ b/public/app/features/transformers/rowsToFields/rowsToFields.ts
@@ -1,14 +1,6 @@
 import { map } from 'rxjs/operators';
 
-import {
-  ArrayVector,
-  DataFrame,
-  DataTransformerID,
-  DataTransformerInfo,
-  Field,
-  getFieldDisplayName,
-  Labels,
-} from '@grafana/data';
+import { DataFrame, DataTransformerID, DataTransformerInfo, Field, getFieldDisplayName, Labels } from '@grafana/data';
 
 import {
   getFieldConfigFromFrame,
@@ -53,15 +45,15 @@ export function rowsToFields(options: RowToFieldsTransformOptions, data: DataFra
   const outFields: Field[] = [];
 
   for (let index = 0; index < nameField.values.length; index++) {
-    const name = nameField.values.get(index);
-    const value = valueField.values.get(index);
+    const name = nameField.values[index];
+    const value = valueField.values[index];
     const config = getFieldConfigFromFrame(data, index, mappingResult);
     const labels = getLabelsFromRow(data, index, mappingResult);
 
     const field: Field = {
       name: `${name}`,
       type: valueField.type,
-      values: new ArrayVector([value]),
+      values: [value],
       config: config,
       labels,
     };
@@ -87,7 +79,7 @@ function getLabelsFromRow(frame: DataFrame, index: number, mappingResult: Evalua
       continue;
     }
 
-    const value = field.values.get(index);
+    const value = field.values[index];
     if (value != null) {
       labels[fieldName] = value;
     }
diff --git a/public/app/features/transformers/spatial/spatialTransformer.ts b/public/app/features/transformers/spatial/spatialTransformer.ts
index 2c73a5603c6..3be28de4142 100644
--- a/public/app/features/transformers/spatial/spatialTransformer.ts
+++ b/public/app/features/transformers/spatial/spatialTransformer.ts
@@ -1,6 +1,6 @@
 import { mergeMap, from } from 'rxjs';
 
-import { ArrayVector, DataFrame, DataTransformerID, DataTransformerInfo, FieldType } from '@grafana/data';
+import { DataFrame, DataTransformerID, DataTransformerInfo, FieldType } from '@grafana/data';
 import { createGeometryCollection, createLineBetween } from 'app/features/geo/format/utils';
 import { getGeometryField, getLocationMatchers } from 'app/features/geo/utils/location';
 
@@ -64,7 +64,7 @@ async function doSetGeometry(frames: DataFrame[], options: SpatialTransformOptio
                   ...info.field,
                   name,
                   type: FieldType.geo,
-                  values: new ArrayVector([toLineString(info.field)]),
+                  values: [toLineString(info.field)],
                 },
               ],
             };
diff --git a/public/app/features/transformers/spatial/utils.ts b/public/app/features/transformers/spatial/utils.ts
index c1d1f9dd0dd..60cd7a710e9 100644
--- a/public/app/features/transformers/spatial/utils.ts
+++ b/public/app/features/transformers/spatial/utils.ts
@@ -3,14 +3,14 @@ import { Geometry, LineString, Point } from 'ol/geom';
 import { toLonLat } from 'ol/proj';
 import { getArea, getLength } from 'ol/sphere';
 
-import { ArrayVector, Field, FieldType } from '@grafana/data';
+import { Field, FieldType } from '@grafana/data';
 
 import { SpatialCalculation, SpatialCalculationOption } from './models.gen';
 
 /** Will return a field with a single row */
 export function toLineString(field: Field<Geometry | undefined>): LineString {
   const coords: number[][] = [];
-  for (const geo of field.values.toArray()) {
+  for (const geo of field.values) {
     if (geo) {
       coords.push(getCenterPoint(geo));
     }
@@ -55,7 +55,7 @@ export function getCenterPointWGS84(geo?: Geometry): number[] | undefined {
 
 /** Will return a new field with calculated values */
 export function doGeomeryCalculation(field: Field<Geometry | undefined>, options: SpatialCalculationOption): Field {
-  const values = field.values.toArray();
+  const values = field.values;
   const buffer = new Array(field.values.length);
   const op = options.calc ?? SpatialCalculation.Heading;
   const name = options.field ?? op;
@@ -74,7 +74,7 @@ export function doGeomeryCalculation(field: Field<Geometry | undefined>, options
         config: {
           unit: 'areaM2',
         },
-        values: new ArrayVector(buffer),
+        values: buffer,
       };
     }
     case SpatialCalculation.Distance: {
@@ -90,7 +90,7 @@ export function doGeomeryCalculation(field: Field<Geometry | undefined>, options
         config: {
           unit: 'lengthm',
         },
-        values: new ArrayVector(buffer),
+        values: buffer,
       };
     }
 
@@ -103,7 +103,7 @@ export function doGeomeryCalculation(field: Field<Geometry | undefined>, options
         config: {
           unit: 'degree',
         },
-        values: new ArrayVector(calculateBearings(values)),
+        values: calculateBearings(values),
       };
     }
   }
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
index 06de2867f2a..099c3a9acdc 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
@@ -1,7 +1,6 @@
 import { map } from 'rxjs/operators';
 
 import {
-  ArrayVector,
   DataFrame,
   DataTransformerID,
   DataTransformerInfo,
@@ -45,7 +44,7 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
   // initialize fields from labels for each refId
   const refId2LabelFields = getLabelFields(data);
 
-  const refId2frameField: Record<string, Field<DataFrame, ArrayVector>> = {};
+  const refId2frameField: Record<string, Field<DataFrame>> = {};
 
   const result: DataFrame[] = [];
 
@@ -65,7 +64,7 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
         name: 'Trend' + (refId && Object.keys(refId2LabelFields).length > 1 ? ` #${refId}` : ''),
         type: FieldType.frame,
         config: {},
-        values: new ArrayVector(),
+        values: [],
       };
       refId2frameField[refId] = frameField;
 
@@ -91,9 +90,9 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
 }
 
 // For each refId, initialize a field for each label name
-function getLabelFields(frames: DataFrame[]): Record<string, Record<string, Field<string, ArrayVector>>> {
+function getLabelFields(frames: DataFrame[]): Record<string, Record<string, Field<string>>> {
   // refId -> label name -> field
-  const labelFields: Record<string, Record<string, Field<string, ArrayVector>>> = {};
+  const labelFields: Record<string, Record<string, Field<string>>> = {};
 
   for (const frame of frames) {
     if (!isTimeSeriesFrame(frame)) {
@@ -117,7 +116,7 @@ function getLabelFields(frames: DataFrame[]): Record<string, Record<string, Fiel
             name: labelName,
             type: FieldType.string,
             config: {},
-            values: new ArrayVector(),
+            values: [],
           };
         }
       }

From 09f03e92bf05ed2ebf1d5a7a3fef45856f525984 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 17 Apr 2023 14:46:29 -0700
Subject: [PATCH 190/729] FieldValues: Use simple array in panel visualizations
 (#66706)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
---
 .betterer.results                             |  3 --
 .../components/BigValue/BigValue.story.tsx    |  4 +-
 .../BigValue/BigValueLayout.test.tsx          |  6 +--
 .../src/components/Graph/Graph.test.tsx       | 10 ++---
 .../MultiModeGraphTooltip.test.tsx            | 10 ++---
 .../Graph/GraphWithLegend.story.internal.tsx  | 10 ++---
 .../grafana-ui/src/components/Graph/utils.ts  |  8 ++--
 .../GraphNG/nullInsertThreshold.test.ts       |  4 +-
 .../components/GraphNG/nullInsertThreshold.ts |  8 ++--
 .../src/components/GraphNG/nullToValue.ts     |  6 +--
 .../src/components/GraphNG/utils.test.ts      | 17 ++++----
 .../src/components/GraphNG/utils.ts           | 10 ++---
 .../src/components/Sparkline/utils.ts         |  9 +++-
 .../src/components/Table/BarGaugeCell.tsx     |  2 +-
 .../src/components/Table/SparklineCell.tsx    | 15 ++-----
 .../src/components/Table/Table.story.tsx      |  2 +-
 .../src/components/Table/utils.test.tsx       | 24 +++++------
 .../grafana-ui/src/components/Table/utils.ts  |  9 ++--
 .../src/components/TimeSeries/utils.test.ts   | 38 ++++++++--------
 .../src/components/uPlot/Plot.test.tsx        |  6 +--
 .../grafana-ui/src/components/uPlot/utils.ts  |  9 ++--
 .../components/TimelineChart/utils.test.ts    | 43 +++++--------------
 .../core/components/TimelineChart/utils.ts    |  7 ++-
 public/app/features/dimensions/color.ts       |  2 +-
 public/app/features/dimensions/resource.ts    |  4 +-
 public/app/features/dimensions/scalar.test.ts | 14 +++---
 public/app/features/dimensions/scalar.ts      |  2 +-
 public/app/features/dimensions/scale.test.ts  |  8 ++--
 public/app/features/dimensions/scale.ts       |  2 +-
 public/app/features/dimensions/text.ts        |  4 +-
 .../app/features/geo/format/geojson.test.ts   |  2 +-
 public/app/features/geo/format/geojson.ts     |  8 ++--
 public/app/features/geo/format/utils.ts       | 40 ++++++++---------
 .../app/features/geo/gazetteer/gazetteer.ts   |  6 +--
 .../features/geo/utils/frameVectorSource.ts   |  4 +-
 .../app/features/geo/utils/location.test.ts   |  6 +--
 .../app/plugins/panel/barchart/utils.test.ts  |  4 +-
 public/app/plugins/panel/barchart/utils.ts    | 17 +++-----
 .../plugins/panel/candlestick/fields.test.ts  |  6 +--
 .../app/plugins/panel/candlestick/fields.ts   |  9 ++--
 .../FlameGraph/FlameGraphTooltip.test.tsx     |  4 +-
 .../components/FlameGraph/dataTransform.ts    | 14 +++---
 .../TopTable/FlameGraphTopTableContainer.tsx  | 28 +++++-------
 .../geomap/layers/data/geojsonDynamic.ts      |  2 +-
 .../geomap/layers/data/lastPointTracker.ts    |  2 +-
 .../panel/geomap/layers/data/photosLayer.tsx  |  4 +-
 .../panel/geomap/layers/data/routeLayer.tsx   |  2 +-
 .../app/plugins/panel/graph/data_processor.ts |  2 +-
 public/app/plugins/panel/graph/graph.ts       |  2 +-
 .../panel/heatmap/HeatmapHoverView.tsx        |  8 ++--
 .../plugins/panel/heatmap/HeatmapPanel.tsx    | 10 ++---
 public/app/plugins/panel/heatmap/fields.ts    |  8 ++--
 .../app/plugins/panel/histogram/Histogram.tsx |  4 +-
 .../app/plugins/panel/nodeGraph/Node.test.tsx |  6 +--
 public/app/plugins/panel/nodeGraph/Node.tsx   | 16 +++----
 .../panel/nodeGraph/useContextMenu.tsx        | 10 ++---
 public/app/plugins/panel/nodeGraph/utils.ts   | 28 ++++++------
 .../plugins/panel/timeseries/utils.test.ts    |  6 +--
 public/app/plugins/panel/timeseries/utils.ts  | 19 ++++----
 public/app/plugins/panel/xychart/scatter.ts   | 12 +++---
 60 files changed, 265 insertions(+), 320 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 565c4e7848c..ffb18144921 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2859,9 +2859,6 @@ exports[`better eslint`] = {
     "public/app/features/geo/format/geojson.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/geo/format/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/geo/gazetteer/gazetteer.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx b/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
index 67d5c3d734a..c304c28cab8 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
@@ -1,7 +1,7 @@
 import { Story, Meta } from '@storybook/react';
 import React from 'react';
 
-import { ArrayVector, FieldSparkline, FieldType } from '@grafana/data';
+import { FieldSparkline, FieldType } from '@grafana/data';
 
 import { useTheme2 } from '../../themes';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
@@ -74,7 +74,7 @@ export const Basic: Story<StoryProps> = ({
   const sparkline: FieldSparkline = {
     y: {
       name: '',
-      values: new ArrayVector([1, 2, 3, 4, 3]),
+      values: [1, 2, 3, 4, 3],
       type: FieldType.number,
       state: { range: { min: 1, max: 4, delta: 3 } },
       config: {},
diff --git a/packages/grafana-ui/src/components/BigValue/BigValueLayout.test.tsx b/packages/grafana-ui/src/components/BigValue/BigValueLayout.test.tsx
index 373b93e0b94..b48f246478d 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValueLayout.test.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValueLayout.test.tsx
@@ -1,4 +1,4 @@
-import { ArrayVector, createTheme, FieldType } from '@grafana/data';
+import { createTheme, FieldType } from '@grafana/data';
 
 import { Props, BigValueColorMode, BigValueGraphMode, BigValueTextMode } from './BigValue';
 import { buildLayout, StackedWithChartLayout, StackedWithNoChartLayout, WideWithChartLayout } from './BigValueLayout';
@@ -16,7 +16,7 @@ function getProps(propOverrides?: Partial<Props>): Props {
     sparkline: {
       y: {
         name: '',
-        values: new ArrayVector([1, 2, 3, 4, 3]),
+        values: [1, 2, 3, 4, 3],
         type: FieldType.number,
         config: {},
       },
@@ -68,7 +68,7 @@ describe('BigValueLayout', () => {
           sparkline: {
             y: {
               name: '',
-              values: new ArrayVector([1]),
+              values: [1],
               type: FieldType.number,
               config: {},
             },
diff --git a/packages/grafana-ui/src/components/Graph/Graph.test.tsx b/packages/grafana-ui/src/components/Graph/Graph.test.tsx
index 637a79800ed..fc616c31cd8 100644
--- a/packages/grafana-ui/src/components/Graph/Graph.test.tsx
+++ b/packages/grafana-ui/src/components/Graph/Graph.test.tsx
@@ -2,7 +2,7 @@ import { act, render, screen } from '@testing-library/react';
 import $ from 'jquery';
 import React from 'react';
 
-import { GraphSeriesXY, FieldType, ArrayVector, dateTime, FieldColorModeId, DisplayProcessor } from '@grafana/data';
+import { GraphSeriesXY, FieldType, dateTime, FieldColorModeId, DisplayProcessor } from '@grafana/data';
 import { TooltipDisplayMode } from '@grafana/schema';
 
 import { VizTooltip } from '../VizTooltip';
@@ -25,13 +25,13 @@ const series: GraphSeriesXY[] = [
     timeField: {
       type: FieldType.time,
       name: 'time',
-      values: new ArrayVector([1546372800000, 1546376400000, 1546380000000]),
+      values: [1546372800000, 1546376400000, 1546380000000],
       config: {},
     },
     valueField: {
       type: FieldType.number,
       name: 'a-series',
-      values: new ArrayVector([10, 20, 10]),
+      values: [10, 20, 10],
       config: { color: { mode: FieldColorModeId.Fixed, fixedColor: 'red' } },
       display,
     },
@@ -53,13 +53,13 @@ const series: GraphSeriesXY[] = [
     timeField: {
       type: FieldType.time,
       name: 'time',
-      values: new ArrayVector([1546372800000, 1546376400000, 1546380000000]),
+      values: [1546372800000, 1546376400000, 1546380000000],
       config: {},
     },
     valueField: {
       type: FieldType.number,
       name: 'b-series',
-      values: new ArrayVector([20, 30, 40]),
+      values: [20, 30, 40],
       config: { color: { mode: FieldColorModeId.Fixed, fixedColor: 'blue' } },
       display,
     },
diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx b/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx
index 6759fed7a46..0ab52812667 100644
--- a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx
+++ b/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { createDimension, createTheme, ArrayVector, FieldType, DisplayProcessor } from '@grafana/data';
+import { createDimension, createTheme, FieldType, DisplayProcessor } from '@grafana/data';
 
 import { ActiveDimensions } from '../../VizTooltip';
 
@@ -20,14 +20,14 @@ describe('MultiModeGraphTooltip', () => {
         xAxis: createDimension('xAxis', [
           {
             config: {},
-            values: new ArrayVector([0, 100, 200]),
+            values: [0, 100, 200],
             name: 'A-series time',
             type: FieldType.time,
             display,
           },
           {
             config: {},
-            values: new ArrayVector([0, 100, 200]),
+            values: [0, 100, 200],
             name: 'B-series time',
             type: FieldType.time,
             display,
@@ -36,14 +36,14 @@ describe('MultiModeGraphTooltip', () => {
         yAxis: createDimension('yAxis', [
           {
             config: {},
-            values: new ArrayVector([10, 20, 10]),
+            values: [10, 20, 10],
             name: 'A-series values',
             type: FieldType.number,
             display,
           },
           {
             config: {},
-            values: new ArrayVector([20, 30, 40]),
+            values: [20, 30, 40],
             name: 'B-series values',
             type: FieldType.number,
             display,
diff --git a/packages/grafana-ui/src/components/Graph/GraphWithLegend.story.internal.tsx b/packages/grafana-ui/src/components/Graph/GraphWithLegend.story.internal.tsx
index 4eddbb648ee..2e90760a9b2 100644
--- a/packages/grafana-ui/src/components/Graph/GraphWithLegend.story.internal.tsx
+++ b/packages/grafana-ui/src/components/Graph/GraphWithLegend.story.internal.tsx
@@ -1,7 +1,7 @@
 import { Story } from '@storybook/react';
 import React from 'react';
 
-import { GraphSeriesXY, FieldType, ArrayVector, dateTime, FieldColorModeId } from '@grafana/data';
+import { GraphSeriesXY, FieldType, dateTime, FieldColorModeId } from '@grafana/data';
 import { LegendDisplayMode } from '@grafana/schema';
 
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
@@ -42,13 +42,13 @@ const series: GraphSeriesXY[] = [
     timeField: {
       type: FieldType.time,
       name: 'time',
-      values: new ArrayVector([1546372800000, 1546376400000, 1546380000000]),
+      values: [1546372800000, 1546376400000, 1546380000000],
       config: {},
     },
     valueField: {
       type: FieldType.number,
       name: 'a-series',
-      values: new ArrayVector([10, 20, 10]),
+      values: [10, 20, 10],
       config: {
         color: {
           mode: FieldColorModeId.Fixed,
@@ -74,13 +74,13 @@ const series: GraphSeriesXY[] = [
     timeField: {
       type: FieldType.time,
       name: 'time',
-      values: new ArrayVector([1546372800000, 1546376400000, 1546380000000]),
+      values: [1546372800000, 1546376400000, 1546380000000],
       config: {},
     },
     valueField: {
       type: FieldType.number,
       name: 'b-series',
-      values: new ArrayVector([20, 30, 40]),
+      values: [20, 30, 40],
       config: {
         color: {
           mode: FieldColorModeId.Fixed,
diff --git a/packages/grafana-ui/src/components/Graph/utils.ts b/packages/grafana-ui/src/components/Graph/utils.ts
index afd71cccac1..9ac252c82fc 100644
--- a/packages/grafana-ui/src/components/Graph/utils.ts
+++ b/packages/grafana-ui/src/components/Graph/utils.ts
@@ -24,7 +24,7 @@ export const findHoverIndexFromData = (xAxisDimension: Field, xPos: number) => {
       return Math.max(upper, 0);
     }
     middle = Math.floor((lower + upper) / 2);
-    const xPosition = xAxisDimension.values.get(middle);
+    const xPosition = xAxisDimension.values[middle];
 
     if (xPosition === xPos) {
       return middle;
@@ -72,8 +72,8 @@ export const getMultiSeriesGraphHoverInfo = (
     field = yAxisDimensions[i];
     const time = xAxisDimensions[i];
     hoverIndex = findHoverIndexFromData(time, xAxisPosition);
-    hoverDistance = xAxisPosition - time.values.get(hoverIndex);
-    pointTime = time.values.get(hoverIndex);
+    hoverDistance = xAxisPosition - time.values[hoverIndex];
+    pointTime = time.values[hoverIndex];
     // Take the closest point before the cursor, or if it does not exist, the closest after
     if (
       minDistance === undefined ||
@@ -84,7 +84,7 @@ export const getMultiSeriesGraphHoverInfo = (
       minTime = time.display ? formattedValueToString(time.display(pointTime)) : pointTime;
     }
 
-    const disp = field.display!(field.values.get(hoverIndex));
+    const disp = field.display!(field.values[hoverIndex]);
 
     results.push({
       value: formattedValueToString(disp),
diff --git a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
index 6ffa6408d0e..9e8af37ccf8 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, FieldType, MutableDataFrame } from '@grafana/data';
+import { FieldType, MutableDataFrame } from '@grafana/data';
 
 import { applyNullInsertThreshold } from './nullInsertThreshold';
 
@@ -40,7 +40,7 @@ function genFrame() {
         config: {
           interval: i === 0 ? step : null,
         },
-        values: new ArrayVector(values),
+        values: values,
       };
     }),
   };
diff --git a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
index cc49b264751..de02223c02c 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, FieldType, incrRoundDn } from '@grafana/data';
+import { DataFrame, FieldType, incrRoundDn } from '@grafana/data';
 
 type InsertMode = (prev: number, next: number, threshold: number) => number;
 
@@ -60,9 +60,9 @@ export function applyNullInsertThreshold(opts: NullInsertOptions): DataFrame {
       return frame;
     }
 
-    const refValues = refField.values.toArray();
+    const refValues = refField.values;
 
-    const frameValues = frame.fields.map((field) => field.values.toArray());
+    const frameValues = frame.fields.map((field) => field.values);
 
     const filledFieldValues = nullInsertThreshold(
       refValues,
@@ -83,7 +83,7 @@ export function applyNullInsertThreshold(opts: NullInsertOptions): DataFrame {
       length: filledFieldValues[0].length,
       fields: frame.fields.map((field, i) => ({
         ...field,
-        values: new ArrayVector(filledFieldValues[i]),
+        values: filledFieldValues[i],
       })),
     };
   }
diff --git a/packages/grafana-ui/src/components/GraphNG/nullToValue.ts b/packages/grafana-ui/src/components/GraphNG/nullToValue.ts
index f6772d9766d..62aea31b837 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullToValue.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullToValue.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame } from '@grafana/data';
+import { DataFrame } from '@grafana/data';
 
 export function nullToValue(frame: DataFrame) {
   return {
@@ -7,7 +7,7 @@ export function nullToValue(frame: DataFrame) {
       const noValue = +field.config?.noValue!;
 
       if (!Number.isNaN(noValue)) {
-        const transformedVals = field.values.toArray().slice();
+        const transformedVals = field.values.slice();
 
         for (let i = 0; i < transformedVals.length; i++) {
           if (transformedVals[i] === null) {
@@ -17,7 +17,7 @@ export function nullToValue(frame: DataFrame) {
 
         return {
           ...field,
-          values: new ArrayVector(transformedVals),
+          values: transformedVals,
         };
       } else {
         return field;
diff --git a/packages/grafana-ui/src/components/GraphNG/utils.test.ts b/packages/grafana-ui/src/components/GraphNG/utils.test.ts
index e385018d12a..9675cd7ca56 100644
--- a/packages/grafana-ui/src/components/GraphNG/utils.test.ts
+++ b/packages/grafana-ui/src/components/GraphNG/utils.test.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   createTheme,
   DashboardCursorSync,
   DataFrame,
@@ -232,7 +231,7 @@ describe('GraphNG utils', () => {
           name: 'time',
           type: FieldType.time,
           config: {},
-          values: new ArrayVector([1, 2, 4, 6, 100]), // should find smallest delta === 1 from here
+          values: [1, 2, 4, 6, 100], // should find smallest delta === 1 from here
         },
         {
           name: 'value',
@@ -242,7 +241,7 @@ describe('GraphNG utils', () => {
               drawStyle: GraphDrawStyle.Bars,
             },
           },
-          values: new ArrayVector([1, 1, 1, 1, 1]),
+          values: [1, 1, 1, 1, 1],
         },
       ],
     };
@@ -255,7 +254,7 @@ describe('GraphNG utils', () => {
           name: 'time',
           type: FieldType.time,
           config: {},
-          values: new ArrayVector([30, 40, 50, 90, 100]), // should be appended with two smallest-delta increments
+          values: [30, 40, 50, 90, 100], // should be appended with two smallest-delta increments
         },
         {
           name: 'value',
@@ -265,7 +264,7 @@ describe('GraphNG utils', () => {
               drawStyle: GraphDrawStyle.Bars,
             },
           },
-          values: new ArrayVector([2, 2, 2, 2, 2]), // bar series should be appended with nulls
+          values: [2, 2, 2, 2, 2], // bar series should be appended with nulls
         },
         {
           name: 'value',
@@ -275,7 +274,7 @@ describe('GraphNG utils', () => {
               drawStyle: GraphDrawStyle.Line,
             },
           },
-          values: new ArrayVector([3, 3, 3, 3, 3]), // line series should be appended with undefineds
+          values: [3, 3, 3, 3, 3], // line series should be appended with undefineds
         },
       ],
     };
@@ -288,7 +287,7 @@ describe('GraphNG utils', () => {
           name: 'time',
           type: FieldType.time,
           config: {},
-          values: new ArrayVector([1, 1.1]), // should not trip up on smaller deltas of non-bars
+          values: [1, 1.1], // should not trip up on smaller deltas of non-bars
         },
         {
           name: 'value',
@@ -298,7 +297,7 @@ describe('GraphNG utils', () => {
               drawStyle: GraphDrawStyle.Line,
             },
           },
-          values: new ArrayVector([4, 4]),
+          values: [4, 4],
         },
         {
           name: 'value',
@@ -311,7 +310,7 @@ describe('GraphNG utils', () => {
               },
             },
           },
-          values: new ArrayVector([4, 4]),
+          values: [4, 4],
         },
       ],
     };
diff --git a/packages/grafana-ui/src/components/GraphNG/utils.ts b/packages/grafana-ui/src/components/GraphNG/utils.ts
index e5de3bd9f66..3f46c2d9dbe 100644
--- a/packages/grafana-ui/src/components/GraphNG/utils.ts
+++ b/packages/grafana-ui/src/components/GraphNG/utils.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, Field, FieldConfig, FieldType, outerJoinDataFrames, TimeRange } from '@grafana/data';
+import { DataFrame, Field, FieldConfig, FieldType, outerJoinDataFrames, TimeRange } from '@grafana/data';
 import {
   AxisPlacement,
   GraphDrawStyle,
@@ -21,7 +21,7 @@ function isVisibleBarField(f: Field) {
 // will mutate the DataFrame's fields' values
 function applySpanNullsThresholds(frame: DataFrame) {
   let refField = frame.fields.find((field) => field.type === FieldType.time); // this doesnt need to be time, just any numeric/asc join field
-  let refValues = refField?.values.toArray() as any[];
+  let refValues = refField?.values as any[];
 
   for (let i = 0; i < frame.fields.length; i++) {
     let field = frame.fields[i];
@@ -34,7 +34,7 @@ function applySpanNullsThresholds(frame: DataFrame) {
 
     if (typeof spanNulls === 'number') {
       if (spanNulls !== -1) {
-        field.values = new ArrayVector(nullToUndefThreshold(refValues, field.values.toArray(), spanNulls));
+        field.values = nullToUndefThreshold(refValues, field.values, spanNulls);
       }
     }
   }
@@ -84,7 +84,7 @@ export function preparePlotFrame(frames: DataFrame[], dimFields: XYFieldMatchers
         return;
       }
 
-      const xVals = frame.fields[0].values.toArray();
+      const xVals = frame.fields[0].values;
 
       for (let i = 0; i < xVals.length; i++) {
         if (i > 0) {
@@ -107,7 +107,7 @@ export function preparePlotFrame(frames: DataFrame[], dimFields: XYFieldMatchers
     // append 2 null vals at minXDelta to bar series
     if (minXDelta !== Infinity) {
       alignedFrame.fields.forEach((f, fi) => {
-        let vals = f.values.toArray();
+        let vals = f.values;
 
         if (fi === 0) {
           let lastVal = vals[vals.length - 1];
diff --git a/packages/grafana-ui/src/components/Sparkline/utils.ts b/packages/grafana-ui/src/components/Sparkline/utils.ts
index 38a925e1d1b..ff7c0471759 100644
--- a/packages/grafana-ui/src/components/Sparkline/utils.ts
+++ b/packages/grafana-ui/src/components/Sparkline/utils.ts
@@ -1,4 +1,4 @@
-import { DataFrame, FieldConfig, FieldSparkline, IndexVector } from '@grafana/data';
+import { DataFrame, FieldConfig, FieldSparkline, FieldType } from '@grafana/data';
 import { GraphFieldConfig } from '@grafana/schema';
 
 import { applyNullInsertThreshold } from '../GraphNG/nullInsertThreshold';
@@ -17,7 +17,12 @@ export function preparePlotFrame(sparkline: FieldSparkline, config?: FieldConfig
     frame: {
       refId: 'sparkline',
       fields: [
-        sparkline.x ?? IndexVector.newField(length),
+        sparkline.x ?? {
+          name: '',
+          values: [...Array(length).keys()],
+          type: FieldType.number,
+          config: {},
+        },
         {
           ...sparkline.y,
           config: yFieldConfig,
diff --git a/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx b/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
index 7ef0a425c8c..2db7dc97faf 100644
--- a/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
+++ b/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
@@ -124,7 +124,7 @@ function getAlignmentFactor(field: Field, displayValue: DisplayValue, rowIndex:
     const maxIndex = Math.min(field.values.length, rowIndex + 1000);
 
     for (let i = rowIndex + 1; i < maxIndex; i++) {
-      const nextDisplayValue = field.display!(field.values.get(i));
+      const nextDisplayValue = field.display!(field.values[i]);
       if (nextDisplayValue.text.length > alignmentFactor.text.length) {
         alignmentFactor.text = displayValue.text;
       }
diff --git a/packages/grafana-ui/src/components/Table/SparklineCell.tsx b/packages/grafana-ui/src/components/Table/SparklineCell.tsx
index 05fa0f5f35a..73eceb76cb0 100644
--- a/packages/grafana-ui/src/components/Table/SparklineCell.tsx
+++ b/packages/grafana-ui/src/components/Table/SparklineCell.tsx
@@ -1,15 +1,6 @@
-import { isArray } from 'lodash';
 import React from 'react';
 
-import {
-  ArrayVector,
-  FieldType,
-  FieldConfig,
-  getMinMaxAndDelta,
-  FieldSparkline,
-  isDataFrame,
-  Field,
-} from '@grafana/data';
+import { FieldType, FieldConfig, getMinMaxAndDelta, FieldSparkline, isDataFrame, Field } from '@grafana/data';
 import {
   BarAlignment,
   GraphDrawStyle,
@@ -79,12 +70,12 @@ export const SparklineCell = (props: TableCellProps) => {
 };
 
 function getSparkline(value: unknown): FieldSparkline | undefined {
-  if (isArray(value)) {
+  if (Array.isArray(value)) {
     return {
       y: {
         name: 'test',
         type: FieldType.number,
-        values: new ArrayVector(value),
+        values: value,
         config: {},
       },
     };
diff --git a/packages/grafana-ui/src/components/Table/Table.story.tsx b/packages/grafana-ui/src/components/Table/Table.story.tsx
index 69ba6309771..22d00a41472 100644
--- a/packages/grafana-ui/src/components/Table/Table.story.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.story.tsx
@@ -155,7 +155,7 @@ function buildSubTablesData(theme: GrafanaTheme2, config: Record<string, FieldCo
 }
 
 function buildFooterData(data: DataFrame): FooterItem[] {
-  const values = data.fields[3].values.toArray();
+  const values = data.fields[3].values;
   const valueSum = values.reduce((prev, curr) => {
     return prev + curr;
   }, 0);
diff --git a/packages/grafana-ui/src/components/Table/utils.test.tsx b/packages/grafana-ui/src/components/Table/utils.test.tsx
index 5da57c8fff2..f24d63d2650 100644
--- a/packages/grafana-ui/src/components/Table/utils.test.tsx
+++ b/packages/grafana-ui/src/components/Table/utils.test.tsx
@@ -1,6 +1,6 @@
 import { Row } from 'react-table';
 
-import { ArrayVector, Field, FieldType, MutableDataFrame, SelectableValue } from '@grafana/data';
+import { Field, FieldType, MutableDataFrame, SelectableValue } from '@grafana/data';
 
 import {
   calculateUniqueFieldValues,
@@ -92,7 +92,7 @@ describe('Table utils', () => {
 
   describe('filterByValue', () => {
     describe('happy path', () => {
-      const field = { values: new ArrayVector(['a', 'aa', 'ab', 'b', 'ba', 'bb', 'c']) } as unknown as Field;
+      const field = { values: ['a', 'aa', 'ab', 'b', 'ba', 'bb', 'c'] } as unknown as Field;
       const rows = [
         { index: 0, values: { 0: 'a' } },
         { index: 1, values: { 0: 'aa' } },
@@ -116,7 +116,7 @@ describe('Table utils', () => {
     describe('fast exit cases', () => {
       describe('no rows', () => {
         it('should return empty array', () => {
-          const field = { values: new ArrayVector(['a']) } as unknown as Field;
+          const field = { values: ['a'] } as unknown as Field;
           const rows: Row[] = [];
           const filterValues = [{ value: 'a' }];
 
@@ -128,7 +128,7 @@ describe('Table utils', () => {
 
       describe('no filterValues', () => {
         it('should return rows', () => {
-          const field = { values: new ArrayVector(['a']) } as unknown as Field;
+          const field = { values: ['a'] } as unknown as Field;
           const rows = [{}] as Row[];
           const filterValues = undefined;
 
@@ -152,7 +152,7 @@ describe('Table utils', () => {
 
       describe('missing id in values', () => {
         it('should return rows', () => {
-          const field = { values: new ArrayVector(['a', 'b', 'c']) } as unknown as Field;
+          const field = { values: ['a', 'b', 'c'] } as unknown as Field;
           const rows = [
             { index: 0, values: { 0: 'a' } },
             { index: 1, values: { 0: 'b' } },
@@ -185,7 +185,7 @@ describe('Table utils', () => {
         const field: Field = {
           config: {},
           labels: {},
-          values: new ArrayVector([1]),
+          values: [1],
           name: 'value',
           type: FieldType.number,
           getLinks: () => [],
@@ -210,7 +210,7 @@ describe('Table utils', () => {
       it('then it should return an array with unique values', () => {
         const field: Field = {
           config: {},
-          values: new ArrayVector([1, 2, 2, 1, 3, 5, 6]),
+          values: [1, 2, 2, 1, 3, 5, 6],
           name: 'value',
           type: FieldType.number,
           display: jest.fn().mockImplementation((value) => ({
@@ -238,7 +238,7 @@ describe('Table utils', () => {
       it('then it should return an array with unique values', () => {
         const field: Field = {
           config: {},
-          values: new ArrayVector([1, 2, 2, 1, 3, 5, 6]),
+          values: [1, 2, 2, 1, 3, 5, 6],
           name: 'value',
           type: FieldType.number,
         };
@@ -257,7 +257,7 @@ describe('Table utils', () => {
         it('then it should return an array with unique values and (Blanks)', () => {
           const field: Field = {
             config: {},
-            values: new ArrayVector([1, null, null, 1, 3, 5, 6]),
+            values: [1, null, null, 1, 3, 5, 6],
             name: 'value',
             type: FieldType.number,
           };
@@ -282,7 +282,7 @@ describe('Table utils', () => {
           name: 'value',
           type: FieldType.string,
           config: {},
-          values: new ArrayVector(['a', 'b', 'c']),
+          values: ['a', 'b', 'c'],
         };
         const row = { index: 1 };
 
@@ -294,7 +294,7 @@ describe('Table utils', () => {
       describe('field with display processor', () => {
         const field: Field = {
           config: {},
-          values: new ArrayVector([1, 2, 2, 1, 3, 5, 6]),
+          values: [1, 2, 2, 1, 3, 5, 6],
           name: 'value',
           type: FieldType.number,
           display: jest.fn().mockImplementation((value) => ({
@@ -327,7 +327,7 @@ describe('Table utils', () => {
           name: 'value',
           type: FieldType.string,
           config: {},
-          values: new ArrayVector(['a', 'b', 'c']),
+          values: ['a', 'b', 'c'],
         };
         const row = undefined;
 
diff --git a/packages/grafana-ui/src/components/Table/utils.ts b/packages/grafana-ui/src/components/Table/utils.ts
index 6fd4d1a5b29..599653087d3 100644
--- a/packages/grafana-ui/src/components/Table/utils.ts
+++ b/packages/grafana-ui/src/components/Table/utils.ts
@@ -14,7 +14,6 @@ import {
   getDisplayProcessor,
   reduceField,
   GrafanaTheme2,
-  ArrayVector,
   isDataFrame,
   isTimeSeriesFrame,
 } from '@grafana/data';
@@ -133,7 +132,7 @@ export function getColumns(
       field: field,
       Header: getFieldDisplayName(field, data),
       accessor: (_row: any, i: number) => {
-        return field.values.get(i);
+        return field.values[i];
       },
       sortType: selectSortType(field.type),
       width: fieldTableOptions.width,
@@ -188,7 +187,7 @@ export function getCellComponent(displayMode: TableCellDisplayMode, field: Field
   }
 
   if (field.type === FieldType.frame) {
-    const firstValue = field.values.get(0);
+    const firstValue = field.values[0];
     if (isDataFrame(firstValue) && isTimeSeriesFrame(firstValue)) {
       return SparklineCell;
     }
@@ -248,7 +247,7 @@ export function rowToFieldValue(row: any, field?: Field): string {
     return '';
   }
 
-  const fieldValue = field.values.get(row.index);
+  const fieldValue = field.values[row.index];
   const displayValue = field.display ? field.display(fieldValue) : fieldValue;
   const value = field.display ? formattedValueToString(displayValue) : displayValue;
 
@@ -359,7 +358,7 @@ export function getFooterItems(
     }
 
     let newField = clone(data.field);
-    newField.values = new ArrayVector(values[data.id]);
+    newField.values = values[data.id];
     newField.state = undefined;
 
     data.field = newField;
diff --git a/packages/grafana-ui/src/components/TimeSeries/utils.test.ts b/packages/grafana-ui/src/components/TimeSeries/utils.test.ts
index f1c74c96858..583358c7c4c 100644
--- a/packages/grafana-ui/src/components/TimeSeries/utils.test.ts
+++ b/packages/grafana-ui/src/components/TimeSeries/utils.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, EventBus, FieldType } from '@grafana/data';
+import { EventBus, FieldType } from '@grafana/data';
 import { getTheme } from '@grafana/ui';
 
 import { preparePlotConfigBuilder } from './utils';
@@ -26,21 +26,21 @@ describe('when fill below to option is used', () => {
           fields: [
             {
               config: {},
-              values: new ArrayVector([1667406900000, 1667407170000, 1667407185000]),
+              values: [1667406900000, 1667407170000, 1667407185000],
               name: 'Time',
               state: { multipleFrames: true, displayName: 'Time', origin: { fieldIndex: 0, frameIndex: 0 } },
               type: FieldType.time,
             },
             {
               config: { displayNameFromDS: 'Test1', custom: { fillBelowTo: 'Test2' }, min: 0, max: 100 },
-              values: new ArrayVector([1, 2, 3]),
+              values: [1, 2, 3],
               name: 'Value',
               state: { multipleFrames: true, displayName: 'Test1', origin: { fieldIndex: 1, frameIndex: 0 } },
               type: FieldType.number,
             },
             {
               config: { displayNameFromDS: 'Test2', min: 0, max: 100 },
-              values: new ArrayVector([4, 5, 6]),
+              values: [4, 5, 6],
               name: 'Value',
               state: { multipleFrames: true, displayName: 'Test2', origin: { fieldIndex: 1, frameIndex: 1 } },
               type: FieldType.number,
@@ -55,14 +55,14 @@ describe('when fill below to option is used', () => {
             fields: [
               {
                 config: {},
-                values: new ArrayVector([1667406900000, 1667407170000, 1667407185000]),
+                values: [1667406900000, 1667407170000, 1667407185000],
                 name: 'Time',
                 state: { multipleFrames: true, displayName: 'Time', origin: { fieldIndex: 0, frameIndex: 0 } },
                 type: FieldType.time,
               },
               {
                 config: { displayNameFromDS: 'Test1', custom: { fillBelowTo: 'Test2' }, min: 0, max: 100 },
-                values: new ArrayVector([1, 2, 3]),
+                values: [1, 2, 3],
                 name: 'Value',
                 state: { multipleFrames: true, displayName: 'Test1', origin: { fieldIndex: 1, frameIndex: 0 } },
                 type: FieldType.number,
@@ -76,14 +76,14 @@ describe('when fill below to option is used', () => {
             fields: [
               {
                 config: {},
-                values: new ArrayVector([1667406900000, 1667407170000, 1667407185000]),
+                values: [1667406900000, 1667407170000, 1667407185000],
                 name: 'Time',
                 state: { multipleFrames: true, displayName: 'Time', origin: { fieldIndex: 0, frameIndex: 1 } },
                 type: FieldType.time,
               },
               {
                 config: { displayNameFromDS: 'Test2', min: 0, max: 100 },
-                values: new ArrayVector([1, 2, 3]),
+                values: [1, 2, 3],
                 name: 'Value',
                 state: { multipleFrames: true, displayName: 'Test2', origin: { fieldIndex: 1, frameIndex: 1 } },
                 type: FieldType.number,
@@ -99,35 +99,35 @@ describe('when fill below to option is used', () => {
           fields: [
             {
               config: {},
-              values: new ArrayVector([1667406900000, 1667407170000, 1667407185000]),
+              values: [1667406900000, 1667407170000, 1667407185000],
               name: 'time',
               state: { multipleFrames: true, displayName: 'time', origin: { fieldIndex: 0, frameIndex: 0 } },
               type: FieldType.time,
             },
             {
               config: { custom: { fillBelowTo: 'below_value1' } },
-              values: new ArrayVector([1, 2, 3]),
+              values: [1, 2, 3],
               name: 'value1',
               state: { multipleFrames: true, displayName: 'value1', origin: { fieldIndex: 1, frameIndex: 0 } },
               type: FieldType.number,
             },
             {
               config: { custom: { fillBelowTo: 'below_value2' } },
-              values: new ArrayVector([4, 5, 6]),
+              values: [4, 5, 6],
               name: 'value2',
               state: { multipleFrames: true, displayName: 'value2', origin: { fieldIndex: 2, frameIndex: 0 } },
               type: FieldType.number,
             },
             {
               config: {},
-              values: new ArrayVector([4, 5, 6]),
+              values: [4, 5, 6],
               name: 'below_value1',
               state: { multipleFrames: true, displayName: 'below_value1', origin: { fieldIndex: 1, frameIndex: 1 } },
               type: FieldType.number,
             },
             {
               config: {},
-              values: new ArrayVector([4, 5, 6]),
+              values: [4, 5, 6],
               name: 'below_value2',
               state: { multipleFrames: true, displayName: 'below_value2', origin: { fieldIndex: 2, frameIndex: 1 } },
               type: FieldType.number,
@@ -141,21 +141,21 @@ describe('when fill below to option is used', () => {
             fields: [
               {
                 config: {},
-                values: new ArrayVector([1667406900000, 1667407170000, 1667407185000]),
+                values: [1667406900000, 1667407170000, 1667407185000],
                 name: 'time',
                 state: { multipleFrames: true, displayName: 'time', origin: { fieldIndex: 0, frameIndex: 0 } },
                 type: FieldType.time,
               },
               {
                 config: { custom: { fillBelowTo: 'below_value1' } },
-                values: new ArrayVector([1, 2, 3]),
+                values: [1, 2, 3],
                 name: 'value1',
                 state: { multipleFrames: true, displayName: 'value1', origin: { fieldIndex: 1, frameIndex: 0 } },
                 type: FieldType.number,
               },
               {
                 config: { custom: { fillBelowTo: 'below_value2' } },
-                values: new ArrayVector([4, 5, 6]),
+                values: [4, 5, 6],
                 name: 'value2',
                 state: { multipleFrames: true, displayName: 'value2', origin: { fieldIndex: 2, frameIndex: 0 } },
                 type: FieldType.number,
@@ -168,21 +168,21 @@ describe('when fill below to option is used', () => {
             fields: [
               {
                 config: {},
-                values: new ArrayVector([1667406900000, 1667407170000, 1667407185000]),
+                values: [1667406900000, 1667407170000, 1667407185000],
                 name: 'time',
                 state: { multipleFrames: true, displayName: 'time', origin: { fieldIndex: 0, frameIndex: 1 } },
                 type: FieldType.time,
               },
               {
                 config: {},
-                values: new ArrayVector([4, 5, 6]),
+                values: [4, 5, 6],
                 name: 'below_value1',
                 state: { multipleFrames: true, displayName: 'below_value1', origin: { fieldIndex: 1, frameIndex: 1 } },
                 type: FieldType.number,
               },
               {
                 config: {},
-                values: new ArrayVector([4, 5, 6]),
+                values: [4, 5, 6],
                 name: 'below_value2',
                 state: { multipleFrames: true, displayName: 'below_value2', origin: { fieldIndex: 2, frameIndex: 1 } },
                 type: FieldType.number,
diff --git a/packages/grafana-ui/src/components/uPlot/Plot.test.tsx b/packages/grafana-ui/src/components/uPlot/Plot.test.tsx
index 9fed6ed14e6..e1a95e69a38 100644
--- a/packages/grafana-ui/src/components/uPlot/Plot.test.tsx
+++ b/packages/grafana-ui/src/components/uPlot/Plot.test.tsx
@@ -3,7 +3,7 @@ import createMockRaf from 'mock-raf';
 import React from 'react';
 import uPlot from 'uplot';
 
-import { ArrayVector, dateTime, FieldConfig, FieldType, MutableDataFrame } from '@grafana/data';
+import { dateTime, FieldConfig, FieldType, MutableDataFrame } from '@grafana/data';
 import { GraphFieldConfig, GraphDrawStyle } from '@grafana/schema';
 
 import { UPlotChart } from './Plot';
@@ -34,14 +34,14 @@ const mockData = () => {
   data.addField({
     type: FieldType.time,
     name: 'Time',
-    values: new ArrayVector([1602630000000, 1602633600000, 1602637200000]),
+    values: [1602630000000, 1602633600000, 1602637200000],
     config: {},
   });
 
   data.addField({
     type: FieldType.number,
     name: 'Value',
-    values: new ArrayVector([10, 20, 5]),
+    values: [10, 20, 5],
     config: {
       custom: {
         drawStyle: GraphDrawStyle.Line,
diff --git a/packages/grafana-ui/src/components/uPlot/utils.ts b/packages/grafana-ui/src/components/uPlot/utils.ts
index 22a7b3a41ec..84eb359126a 100644
--- a/packages/grafana-ui/src/components/uPlot/utils.ts
+++ b/packages/grafana-ui/src/components/uPlot/utils.ts
@@ -114,9 +114,8 @@ export function getStackingGroups(frame: DataFrame) {
     }
 
     // will this be stacked up or down after any transforms applied
-    let vals = values.toArray();
     let transform = custom.transform;
-    let stackDir = getStackDirection(transform, vals);
+    let stackDir = getStackDirection(transform, values);
 
     let drawStyle = custom.drawStyle as GraphDrawStyle;
     let drawStyle2 =
@@ -174,7 +173,7 @@ export function preparePlotData2(
         return;
       }
 
-      let vals = field.values.toArray();
+      let vals = field.values;
 
       for (let i = 0; i < dataLen; i++) {
         if (vals[i] != null) {
@@ -185,11 +184,11 @@ export function preparePlotData2(
   });
 
   frame.fields.forEach((field, i) => {
-    let vals = field.values.toArray();
+    let vals = field.values;
 
     if (i === 0) {
       if (field.type === FieldType.time) {
-        data[i] = ensureTimeField(field).values.toArray();
+        data[i] = ensureTimeField(field).values;
       } else {
         data[i] = vals;
       }
diff --git a/public/app/core/components/TimelineChart/utils.test.ts b/public/app/core/components/TimelineChart/utils.test.ts
index a2be4c15661..15a291602b3 100644
--- a/public/app/core/components/TimelineChart/utils.test.ts
+++ b/public/app/core/components/TimelineChart/utils.test.ts
@@ -1,13 +1,4 @@
-import {
-  ArrayVector,
-  createTheme,
-  FieldType,
-  ThresholdsMode,
-  TimeRange,
-  toDataFrame,
-  dateTime,
-  DataFrame,
-} from '@grafana/data';
+import { createTheme, FieldType, ThresholdsMode, TimeRange, toDataFrame, dateTime, DataFrame } from '@grafana/data';
 import { LegendDisplayMode, VizLegendOptions } from '@grafana/schema';
 
 import {
@@ -70,7 +61,7 @@ describe('prepare timeline graph', () => {
     const out = info.frames![0];
 
     const field = out.fields.find((f) => f.name === 'b');
-    expect(field?.values.toArray()).toMatchInlineSnapshot(`
+    expect(field?.values).toMatchInlineSnapshot(`
       [
         1,
         1,
@@ -94,7 +85,7 @@ describe('prepare timeline graph', () => {
       }),
     ];
     const result = prepareTimelineFields(frames, true, timeRange, theme);
-    expect(result.frames?.[0].fields[0].values.toArray()).toEqual([1, 2, 3, 4]);
+    expect(result.frames?.[0].fields[0].values).toEqual([1, 2, 3, 4]);
   });
 });
 
@@ -103,7 +94,7 @@ describe('findNextStateIndex', () => {
     const field = {
       name: 'time',
       type: FieldType.number,
-      values: new ArrayVector([1, undefined, undefined, 2, undefined, undefined]),
+      values: [1, undefined, undefined, 2, undefined, undefined],
       config: {},
     };
     const result = findNextStateIndex(field, 0);
@@ -114,7 +105,7 @@ describe('findNextStateIndex', () => {
     const field = {
       name: 'time',
       type: FieldType.number,
-      values: new ArrayVector([1, undefined, undefined, 2, undefined, 3]),
+      values: [1, undefined, undefined, 2, undefined, 3],
       config: {},
     };
     const result = findNextStateIndex(field, 5);
@@ -125,7 +116,7 @@ describe('findNextStateIndex', () => {
     const field = {
       name: 'time',
       type: FieldType.number,
-      values: new ArrayVector([1, undefined, undefined, 2, undefined, 3, undefined]),
+      values: [1, undefined, undefined, 2, undefined, 3, undefined],
       config: {},
     };
     const result = findNextStateIndex(field, 5);
@@ -136,19 +127,7 @@ describe('findNextStateIndex', () => {
     const field = {
       name: 'time',
       type: FieldType.number,
-      values: new ArrayVector([
-        1,
-        undefined,
-        undefined,
-        3,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        2,
-        undefined,
-        undefined,
-      ]),
+      values: [1, undefined, undefined, 3, undefined, undefined, undefined, undefined, 2, undefined, undefined],
       config: {},
     };
     const result = findNextStateIndex(field, 3);
@@ -159,7 +138,7 @@ describe('findNextStateIndex', () => {
     const field = {
       name: 'time',
       type: FieldType.number,
-      values: new ArrayVector([1, 3, 2]),
+      values: [1, 3, 2],
       config: {},
     };
 
@@ -212,10 +191,10 @@ describe('prepareTimelineLegendItems', () => {
                 ],
               },
             },
-            values: new ArrayVector([
+            values: [
               1634092733455, 1634092763455, 1634092793455, 1634092823455, 1634092853455, 1634092883455, 1634092913455,
               1634092943455, 1634092973455, 1634093003455,
-            ]),
+            ],
             display: (value: string) => ({
               text: value,
               color: undefined,
@@ -238,7 +217,7 @@ describe('prepareTimelineLegendItems', () => {
                 ],
               },
             },
-            values: new ArrayVector(['< -∞', null, null, null, null, null, null, null, null, null]),
+            values: ['< -∞', null, null, null, null, null, null, null, null, null],
             display: (value?: string) => ({
               text: value || '',
               color: 'green',
diff --git a/public/app/core/components/TimelineChart/utils.ts b/public/app/core/components/TimelineChart/utils.ts
index 861be4f3985..eac440639e9 100644
--- a/public/app/core/components/TimelineChart/utils.ts
+++ b/public/app/core/components/TimelineChart/utils.ts
@@ -2,7 +2,6 @@ import React from 'react';
 import uPlot from 'uplot';
 
 import {
-  ArrayVector,
   DataFrame,
   DashboardCursorSync,
   DataHoverPayload,
@@ -371,7 +370,7 @@ export function mergeThresholdValues(field: Field, theme: GrafanaTheme2): Field
     textToColor.set(items[i].label, items[i].color!);
   }
 
-  let input = field.values.toArray();
+  let input = field.values;
   const vals = new Array<String | undefined>(field.values.length);
   if (thresholds.mode === ThresholdsMode.Percentage) {
     const { min, max } = getFieldConfigWithMinMax(field);
@@ -403,7 +402,7 @@ export function mergeThresholdValues(field: Field, theme: GrafanaTheme2): Field
       },
     },
     type: FieldType.string,
-    values: new ArrayVector(vals),
+    values: vals,
     display: (value) => ({
       text: String(value),
       color: textToColor.get(String(value)),
@@ -571,7 +570,7 @@ export function getFieldLegendItem(fields: Field[], theme: GrafanaTheme2): VizLe
   let stateColors: Map<string, string | undefined> = new Map();
 
   fields.forEach((field) => {
-    field.values.toArray().forEach((v) => {
+    field.values.forEach((v) => {
       let state = field.display!(v);
       if (state.color) {
         stateColors.set(state.text, state.color!);
diff --git a/public/app/features/dimensions/color.ts b/public/app/features/dimensions/color.ts
index af99e40c6c4..96351e2a562 100644
--- a/public/app/features/dimensions/color.ts
+++ b/public/app/features/dimensions/color.ts
@@ -54,7 +54,7 @@ export function getColorDimensionForField(
 
     return {
       field,
-      get: (index: number): string => getColor(field!.values.get(index)),
+      get: (index: number): string => getColor(field!.values[index]),
       value: () => getColor(getLastNotNullFieldValue(field!)),
     };
   }
diff --git a/public/app/features/dimensions/resource.ts b/public/app/features/dimensions/resource.ts
index 57fed7cb6a9..6ff97ae8b41 100644
--- a/public/app/features/dimensions/resource.ts
+++ b/public/app/features/dimensions/resource.ts
@@ -43,7 +43,7 @@ export function getResourceDimension(
     const mapper = (v: string) => getPublicOrAbsoluteUrl(`${v}`);
     return {
       field,
-      get: (i) => mapper(field.values.get(i)),
+      get: (i) => mapper(field.values[i]),
       value: () => mapper(getLastNotNullFieldValue(field)),
     };
   }
@@ -60,7 +60,7 @@ export function getResourceDimension(
 
   return {
     field,
-    get: (index: number): string => getIcon(field.values.get(index)),
+    get: (index: number): string => getIcon(field.values[index]),
     value: () => getIcon(getLastNotNullFieldValue(field)),
   };
 }
diff --git a/public/app/features/dimensions/scalar.test.ts b/public/app/features/dimensions/scalar.test.ts
index 7643d090f1f..071d83ed00a 100644
--- a/public/app/features/dimensions/scalar.test.ts
+++ b/public/app/features/dimensions/scalar.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 
 import { getScalarDimension } from './scalar';
 
@@ -14,7 +14,7 @@ describe('scalar dimensions', () => {
         {
           name: 'test',
           type: FieldType.number,
-          values: new ArrayVector(values),
+          values: values,
           config: {
             min: -720,
             max: 540,
@@ -31,7 +31,7 @@ describe('scalar dimensions', () => {
       mode: ScalarDimensionMode.Clamped,
     });
 
-    const clamped = frame.fields[0].values.toArray().map((k, i) => supplier.get(i));
+    const clamped = frame.fields[0].values.map((k, i) => supplier.get(i));
     expect(clamped).toEqual([0, 0, 0, 0, 0]);
   });
   it('clamps out of range values', () => {
@@ -43,7 +43,7 @@ describe('scalar dimensions', () => {
         {
           name: 'test',
           type: FieldType.number,
-          values: new ArrayVector(values),
+          values: values,
           config: {
             min: -720,
             max: 540,
@@ -60,7 +60,7 @@ describe('scalar dimensions', () => {
       mode: ScalarDimensionMode.Clamped,
     });
 
-    const clamped = frame.fields[0].values.toArray().map((k, i) => supplier.get(i));
+    const clamped = frame.fields[0].values.map((k, i) => supplier.get(i));
     expect(clamped).toEqual([-360, 10, 360, 90, -210]);
   });
 
@@ -73,7 +73,7 @@ describe('scalar dimensions', () => {
         {
           name: 'test',
           type: FieldType.number,
-          values: new ArrayVector(values),
+          values: values,
           config: {
             min: -721,
             max: 540,
@@ -90,7 +90,7 @@ describe('scalar dimensions', () => {
       mode: ScalarDimensionMode.Mod,
     });
 
-    const remainder = frame.fields[0].values.toArray().map((k, i) => supplier.get(i));
+    const remainder = frame.fields[0].values.map((k, i) => supplier.get(i));
     expect(remainder).toEqual([-1, 10, 180, 30, -210]);
   });
 });
diff --git a/public/app/features/dimensions/scalar.ts b/public/app/features/dimensions/scalar.ts
index 377b412e5a1..d4d9a6f550b 100644
--- a/public/app/features/dimensions/scalar.ts
+++ b/public/app/features/dimensions/scalar.ts
@@ -45,7 +45,7 @@ export function getScalarDimensionForField(
   }
 
   const get = (i: number) => {
-    const v = field.values.get(i);
+    const v = field.values[i];
     if (v === null || typeof v !== 'number') {
       return 0;
     }
diff --git a/public/app/features/dimensions/scale.test.ts b/public/app/features/dimensions/scale.test.ts
index 275081f961f..56fc596143e 100644
--- a/public/app/features/dimensions/scale.test.ts
+++ b/public/app/features/dimensions/scale.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 import { ScaleDimensionConfig } from '@grafana/schema';
 
 import { getScaledDimension, validateScaleConfig } from './scale';
@@ -45,11 +45,11 @@ describe('scale dimensions', () => {
       name: 'a',
       length: values.length,
       fields: [
-        { name: 'time', type: FieldType.number, values: new ArrayVector(values), config: {} },
+        { name: 'time', type: FieldType.number, values: values, config: {} },
         {
           name: 'hello',
           type: FieldType.number,
-          values: new ArrayVector(values),
+          values: values,
           config: {
             min: -10,
             max: 10,
@@ -64,7 +64,7 @@ describe('scale dimensions', () => {
       field: 'hello',
       fixed: 0,
     });
-    const scaled = frame.fields[0].values.toArray().map((k, i) => supplier.get(i));
+    const scaled = frame.fields[0].values.map((k, i) => supplier.get(i));
     expect(scaled).toEqual([-1, -1, -0.5, 0, 0.5, 1, 1]);
   });
 });
diff --git a/public/app/features/dimensions/scale.ts b/public/app/features/dimensions/scale.ts
index fe4c55b64a0..1cda44c3c4d 100644
--- a/public/app/features/dimensions/scale.ts
+++ b/public/app/features/dimensions/scale.ts
@@ -56,7 +56,7 @@ export function getScaledDimensionForField(
   }
 
   const get = (i: number) => {
-    const value = field.values.get(i);
+    const value = field.values[i];
     let percent = 0;
     if (value !== -Infinity) {
       percent = (value - info.min!) / info.delta;
diff --git a/public/app/features/dimensions/text.ts b/public/app/features/dimensions/text.ts
index 0c0ad19e55b..3c2b40cf9cd 100644
--- a/public/app/features/dimensions/text.ts
+++ b/public/app/features/dimensions/text.ts
@@ -42,7 +42,7 @@ export function getTextDimensionForField(
     }
     return {
       field,
-      get: (i) => disp(field.values.get(i)),
+      get: (i) => disp(field.values[i]),
       value: () => disp(getLastNotNullFieldValue(field)),
     };
   }
@@ -59,7 +59,7 @@ export function getTextDimensionForField(
   let disp = (v: unknown) => formattedValueToString(field.display!(v));
   return {
     field,
-    get: (i) => disp(field.values.get(i)),
+    get: (i) => disp(field.values[i]),
     value: () => disp(getLastNotNullFieldValue(field)),
   };
 }
diff --git a/public/app/features/geo/format/geojson.test.ts b/public/app/features/geo/format/geojson.test.ts
index b6c18008325..c4bee7cfd53 100644
--- a/public/app/features/geo/format/geojson.test.ts
+++ b/public/app/features/geo/format/geojson.test.ts
@@ -82,7 +82,7 @@ describe('Read GeoJSON', () => {
     expect(
       frame.fields.reduce<Record<string, unknown[]>>((acc, v, idx, arr) => {
         if (v.type !== FieldType.geo) {
-          acc[v.name] = v.values.toArray();
+          acc[v.name] = v.values;
         }
         return acc;
       }, {})
diff --git a/public/app/features/geo/format/geojson.ts b/public/app/features/geo/format/geojson.ts
index 447055c5fb0..521c7b8d91c 100644
--- a/public/app/features/geo/format/geojson.ts
+++ b/public/app/features/geo/format/geojson.ts
@@ -1,7 +1,7 @@
 import GeoJSON from 'ol/format/GeoJSON';
 import { Geometry } from 'ol/geom';
 
-import { ArrayVector, DataFrame, Field, FieldType, getFieldTypeFromValue } from '@grafana/data';
+import { DataFrame, Field, FieldType, getFieldTypeFromValue } from '@grafana/data';
 
 interface FieldInfo {
   values: any[];
@@ -75,7 +75,7 @@ export function frameFromGeoJSON(body: Document | Element | Object | string): Da
     fields.push({
       name: getBestName('id', '_id', '__id'),
       type,
-      values: new ArrayVector(idfield.values),
+      values: idfield.values,
       config: {},
     });
   }
@@ -84,7 +84,7 @@ export function frameFromGeoJSON(body: Document | Element | Object | string): Da
   fields.push({
     name: getBestName('geo', 'geometry'),
     type: FieldType.geo,
-    values: new ArrayVector(geo),
+    values: geo,
     config: {},
   });
 
@@ -97,7 +97,7 @@ export function frameFromGeoJSON(body: Document | Element | Object | string): Da
     fields.push({
       name,
       type,
-      values: new ArrayVector(info.values),
+      values: info.values,
       config: {},
     });
   }
diff --git a/public/app/features/geo/format/utils.ts b/public/app/features/geo/format/utils.ts
index e4b12b829e2..a8b69f7a2cd 100644
--- a/public/app/features/geo/format/utils.ts
+++ b/public/app/features/geo/format/utils.ts
@@ -1,7 +1,7 @@
 import { Geometry, GeometryCollection, LineString, Point } from 'ol/geom';
 import { fromLonLat } from 'ol/proj';
 
-import { ArrayVector, Field, FieldConfig, FieldType } from '@grafana/data';
+import { Field, FieldConfig, FieldType } from '@grafana/data';
 import { getCenterPoint } from 'app/features/transformers/spatial/utils';
 
 import { Gazetteer } from '../gazetteer/gazetteer';
@@ -12,15 +12,13 @@ export function pointFieldFromGeohash(geohash: Field<string>): Field<Geometry |
   return {
     name: geohash.name ?? 'Point',
     type: FieldType.geo,
-    values: new ArrayVector<any>(
-      geohash.values.toArray().map((v) => {
-        const coords = decodeGeohash(v);
-        if (coords) {
-          return new Point(fromLonLat(coords));
-        }
-        return undefined;
-      })
-    ),
+    values: geohash.values.map((v) => {
+      const coords = decodeGeohash(v);
+      if (coords) {
+        return new Point(fromLonLat(coords));
+      }
+      return undefined;
+    }),
     config: hiddenTooltipField,
   };
 }
@@ -28,8 +26,8 @@ export function pointFieldFromGeohash(geohash: Field<string>): Field<Geometry |
 export function pointFieldFromLonLat(lon: Field, lat: Field): Field<Geometry | undefined> {
   const buffer = new Array<Point>(lon.values.length);
   for (let i = 0; i < lon.values.length; i++) {
-    const longitude = lon.values.get(i);
-    const latitude = lat.values.get(i);
+    const longitude = lon.values[i];
+    const latitude = lat.values[i];
 
     // TODO: Add unit tests to thoroughly test out edge cases
     // If longitude or latitude are null, don't add them to buffer
@@ -43,7 +41,7 @@ export function pointFieldFromLonLat(lon: Field, lat: Field): Field<Geometry | u
   return {
     name: 'Point',
     type: FieldType.geo,
-    values: new ArrayVector(buffer),
+    values: buffer,
     config: hiddenTooltipField,
   };
 }
@@ -52,12 +50,12 @@ export function getGeoFieldFromGazetteer(gaz: Gazetteer, field: Field<string>):
   const count = field.values.length;
   const geo = new Array<Geometry | undefined>(count);
   for (let i = 0; i < count; i++) {
-    geo[i] = gaz.find(field.values.get(i))?.geometry();
+    geo[i] = gaz.find(field.values[i])?.geometry();
   }
   return {
     name: 'Geometry',
     type: FieldType.geo,
-    values: new ArrayVector(geo),
+    values: geo,
     config: hiddenTooltipField,
   };
 }
@@ -66,8 +64,8 @@ export function createGeometryCollection(
   src: Field<Geometry | undefined>,
   dest: Field<Geometry | undefined>
 ): Field<Geometry | undefined> {
-  const v0 = src.values.toArray();
-  const v1 = dest.values.toArray();
+  const v0 = src.values;
+  const v1 = dest.values;
   if (!v0 || !v1) {
     throw 'missing src/dest';
   }
@@ -91,7 +89,7 @@ export function createGeometryCollection(
   return {
     name: 'Geometry',
     type: FieldType.geo,
-    values: new ArrayVector(geo),
+    values: geo,
     config: hiddenTooltipField,
   };
 }
@@ -100,8 +98,8 @@ export function createLineBetween(
   src: Field<Geometry | undefined>,
   dest: Field<Geometry | undefined>
 ): Field<Geometry | undefined> {
-  const v0 = src.values.toArray();
-  const v1 = dest.values.toArray();
+  const v0 = src.values;
+  const v1 = dest.values;
   if (!v0 || !v1) {
     throw 'missing src/dest';
   }
@@ -121,7 +119,7 @@ export function createLineBetween(
   return {
     name: 'Geometry',
     type: FieldType.geo,
-    values: new ArrayVector(geo),
+    values: geo,
     config: hiddenTooltipField,
   };
 }
diff --git a/public/app/features/geo/gazetteer/gazetteer.ts b/public/app/features/geo/gazetteer/gazetteer.ts
index 80bb0864839..586fd585dca 100644
--- a/public/app/features/geo/gazetteer/gazetteer.ts
+++ b/public/app/features/geo/gazetteer/gazetteer.ts
@@ -132,12 +132,12 @@ export function frameAsGazetter(frame: DataFrame, opts: { path: string; keys?: s
       isPoint = true;
     }
   } else {
-    isPoint = geo.values.get(0)?.getType() === 'Point';
+    isPoint = geo.values[0]?.getType() === 'Point';
   }
 
   const lookup = new Map<string, number>();
   keys.forEach((f) => {
-    f.values.toArray().forEach((k, idx) => {
+    f.values.forEach((k, idx) => {
       const str = `${k}`;
       lookup.set(str.toUpperCase(), idx);
       lookup.set(str, idx);
@@ -149,7 +149,7 @@ export function frameAsGazetter(frame: DataFrame, opts: { path: string; keys?: s
     find: (k) => {
       const index = lookup.get(k);
       if (index != null) {
-        const g = geo?.values.get(index);
+        const g = geo?.values[index];
         return {
           frame,
           index,
diff --git a/public/app/features/geo/utils/frameVectorSource.ts b/public/app/features/geo/utils/frameVectorSource.ts
index 17be6b05ec2..8f85f420af5 100644
--- a/public/app/features/geo/utils/frameVectorSource.ts
+++ b/public/app/features/geo/utils/frameVectorSource.ts
@@ -26,7 +26,7 @@ export class FrameVectorSource<T extends Geometry = Geometry> extends VectorSour
         new Feature({
           frame,
           rowIndex: i,
-          geometry: info.field.values.get(i) as T,
+          geometry: info.field.values[i] as T,
         })
       );
     }
@@ -45,7 +45,7 @@ export class FrameVectorSource<T extends Geometry = Geometry> extends VectorSour
 
     //eslint-disable-next-line
     const field = info.field as unknown as Field<Point>;
-    const geometry = new LineString(field.values.toArray().map((p) => p.getCoordinates())) as Geometry;
+    const geometry = new LineString(field.values.map((p) => p.getCoordinates())) as Geometry;
     this.addFeatureInternal(
       new Feature({
         frame,
diff --git a/public/app/features/geo/utils/location.test.ts b/public/app/features/geo/utils/location.test.ts
index 548fa4fd666..ccc22978b71 100644
--- a/public/app/features/geo/utils/location.test.ts
+++ b/public/app/features/geo/utils/location.test.ts
@@ -33,7 +33,7 @@ describe('handle location parsing', () => {
 
     const info = getGeometryField(frame, matchers);
     expect(info.field!.type).toBe(FieldType.geo);
-    expect(info.field!.values.toArray().map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
+    expect(info.field!.values.map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
       [
         [
           -122.01416015625001,
@@ -59,7 +59,7 @@ describe('handle location parsing', () => {
 
     const matchers = await getLocationMatchers();
     const geo = getGeometryField(frame, matchers).field!;
-    expect(geo.values.toArray().map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
+    expect(geo.values.map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
       [
         [
           0,
@@ -86,7 +86,7 @@ describe('handle location parsing', () => {
       mode: FrameGeometrySourceMode.Auto,
     });
     const geo = getGeometryField(frame, matchers).field!;
-    expect(geo.values.toArray().map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
+    expect(geo.values.map((p) => toLonLat((p as Point).getCoordinates()))).toMatchInlineSnapshot(`
       [
         [
           -122.01416015625001,
diff --git a/public/app/plugins/panel/barchart/utils.test.ts b/public/app/plugins/panel/barchart/utils.test.ts
index d90b4ac5e16..3662ca3df36 100644
--- a/public/app/plugins/panel/barchart/utils.test.ts
+++ b/public/app/plugins/panel/barchart/utils.test.ts
@@ -202,7 +202,7 @@ describe('BarChart utils', () => {
       const displayValues = assertIsDefined('viz' in result ? result : null);
 
       const field = displayValues.viz[0].fields[1];
-      expect(field.values.toArray()).toMatchInlineSnapshot(`
+      expect(field.values).toMatchInlineSnapshot(`
         [
           -10,
           null,
@@ -215,7 +215,7 @@ describe('BarChart utils', () => {
       const displayLegendValuesAsc = assertIsDefined('legend' in result ? result : null).legend;
       const legendField = displayLegendValuesAsc.fields[1];
 
-      expect(legendField.values.toArray()).toMatchInlineSnapshot(`
+      expect(legendField.values).toMatchInlineSnapshot(`
       [
         -10,
         null,
diff --git a/public/app/plugins/panel/barchart/utils.ts b/public/app/plugins/panel/barchart/utils.ts
index db3f459fe14..768d3fd77c7 100644
--- a/public/app/plugins/panel/barchart/utils.ts
+++ b/public/app/plugins/panel/barchart/utils.ts
@@ -2,7 +2,6 @@ import { orderBy } from 'lodash';
 import uPlot, { Padding } from 'uplot';
 
 import {
-  ArrayVector,
   DataFrame,
   Field,
   FieldType,
@@ -318,7 +317,7 @@ function getRotationPadding(
   const fontSize = UPLOT_AXIS_FONT_SIZE;
   const displayProcessor = frame.fields[0].display;
   const getProcessedValue = (i: number) => {
-    return displayProcessor ? displayProcessor(values.get(i)) : values.get(i);
+    return displayProcessor ? displayProcessor(values[i]) : values[i];
   };
   let maxLength = 0;
   for (let i = 0; i < values.length; i++) {
@@ -432,14 +431,12 @@ export function prepareBarChartDisplayValues(
               },
             },
           },
-          values: new ArrayVector(
-            field.values.toArray().map((v) => {
-              if (!(Number.isFinite(v) || v == null)) {
-                return null;
-              }
-              return v;
-            })
-          ),
+          values: field.values.map((v) => {
+            if (!(Number.isFinite(v) || v == null)) {
+              return null;
+            }
+            return v;
+          }),
         };
 
         if (options.stacking === StackingMode.Percent) {
diff --git a/public/app/plugins/panel/candlestick/fields.test.ts b/public/app/plugins/panel/candlestick/fields.test.ts
index 2fbc73c32ec..0cde9a918fb 100644
--- a/public/app/plugins/panel/candlestick/fields.test.ts
+++ b/public/app/plugins/panel/candlestick/fields.test.ts
@@ -81,7 +81,7 @@ describe('Candlestick data', () => {
     expect(info.names.close).toMatchInlineSnapshot(`"Next open"`);
 
     // Close should be offset by one and dupliate last point
-    expect({ open: info.open!.values.toArray(), close: info.close!.values.toArray() }).toMatchInlineSnapshot(`
+    expect({ open: info.open!.values, close: info.close!.values }).toMatchInlineSnapshot(`
       {
         "close": [
           5,
@@ -117,8 +117,8 @@ describe('Candlestick data', () => {
       theme
     )!;
 
-    expect(info.open!.values.toArray()).toEqual([1, 1, 2, 3, 4]);
-    expect(info.close!.values.toArray()).toEqual([1, 2, 3, 4, 5]);
+    expect(info.open!.values).toEqual([1, 1, 2, 3, 4]);
+    expect(info.close!.values).toEqual([1, 2, 3, 4, 5]);
   });
 
   it('will unmap high & low fields in volume-only mode', () => {
diff --git a/public/app/plugins/panel/candlestick/fields.ts b/public/app/plugins/panel/candlestick/fields.ts
index 415e70e3200..fc6e0cdb51d 100644
--- a/public/app/plugins/panel/candlestick/fields.ts
+++ b/public/app/plugins/panel/candlestick/fields.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   DataFrame,
   Field,
   FieldType,
@@ -153,11 +152,11 @@ export function prepareCandlestickFields(
 
   // Use next open as 'close' value
   if (data.open && !data.close && !fieldMap.close) {
-    const values = data.open.values.toArray().slice(1);
+    const values = data.open.values.slice(1);
     values.push(values[values.length - 1]); // duplicate last value
     data.close = {
       ...data.open,
-      values: new ArrayVector(values),
+      values: values,
       name: 'Next open',
       state: undefined,
     };
@@ -168,12 +167,12 @@ export function prepareCandlestickFields(
 
   // Use previous close as 'open' value
   if (data.close && !data.open && !fieldMap.open) {
-    const values = data.close.values.toArray().slice();
+    const values = data.close.values.slice();
     values.unshift(values[0]); // duplicate first value
     values.length = frame.length;
     data.open = {
       ...data.close,
-      values: new ArrayVector(values),
+      values: values,
       name: 'Previous close',
       state: undefined,
     };
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx
index b511d3af2bc..087b2107503 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx
@@ -1,4 +1,4 @@
-import { ArrayVector, Field, FieldType, MutableDataFrame } from '@grafana/data';
+import { Field, FieldType, MutableDataFrame } from '@grafana/data';
 
 import { getTooltipData } from './FlameGraphTooltip';
 import { FlameGraphDataContainer } from './dataTransform';
@@ -89,6 +89,6 @@ function makeField(name: string, unit: string, values: number[]): Field {
     config: {
       unit,
     },
-    values: new ArrayVector(values),
+    values: values,
   };
 }
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.ts b/public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.ts
index 8bd8e84f0e7..598bdfb6b51 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.ts
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.ts
@@ -75,7 +75,7 @@ export class FlameGraphDataContainer {
         text: value + '',
         numeric: 0,
       });
-      this.uniqueLabels = [...new Set<string>(this.labelField.values.toArray())];
+      this.uniqueLabels = [...new Set<string>(this.labelField.values)];
     }
 
     this.valueDisplayProcessor = getDisplayProcessor({
@@ -85,27 +85,27 @@ export class FlameGraphDataContainer {
   }
 
   getLabel(index: number) {
-    return this.labelDisplayProcessor(this.labelField.values.get(index)).text;
+    return this.labelDisplayProcessor(this.labelField.values[index]).text;
   }
 
   getLevel(index: number) {
-    return this.levelField.values.get(index);
+    return this.levelField.values[index];
   }
 
   getValue(index: number) {
-    return this.valueField.values.get(index);
+    return this.valueField.values[index];
   }
 
   getValueDisplay(index: number) {
-    return this.valueDisplayProcessor(this.valueField.values.get(index));
+    return this.valueDisplayProcessor(this.valueField.values[index]);
   }
 
   getSelf(index: number) {
-    return this.selfField.values.get(index);
+    return this.selfField.values[index];
   }
 
   getSelfDisplay(index: number) {
-    return this.valueDisplayProcessor(this.selfField.values.get(index));
+    return this.valueDisplayProcessor(this.selfField.values[index]);
   }
 
   getUniqueLabels() {
diff --git a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
index 5e7c4a78e5e..bb54ebb775b 100644
--- a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
+++ b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
@@ -2,15 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
-import {
-  applyFieldOverrides,
-  ArrayVector,
-  CoreApp,
-  DataFrame,
-  DataLinkClickEvent,
-  Field,
-  FieldType,
-} from '@grafana/data';
+import { applyFieldOverrides, CoreApp, DataFrame, DataLinkClickEvent, Field, FieldType } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { Table, useStyles2 } from '@grafana/ui';
 
@@ -93,10 +85,10 @@ function buildTableDataFrame(
     table[label].total = table[label].total ? table[label].total + value : value;
   }
 
-  const symbolField = {
+  const symbolField: Field = {
     type: FieldType.string,
     name: 'Symbol',
-    values: new ArrayVector(),
+    values: [],
     config: {
       custom: { width: width - TOP_TABLE_COLUMN_WIDTH * 2 },
       links: [
@@ -113,24 +105,24 @@ function buildTableDataFrame(
     },
   };
 
-  const selfField = {
+  const selfField: Field = {
     type: FieldType.number,
     name: 'Self',
-    values: new ArrayVector(),
+    values: [],
     config: { unit: data.selfField.config.unit, custom: { width: TOP_TABLE_COLUMN_WIDTH } },
   };
 
-  const totalField = {
+  const totalField: Field = {
     type: FieldType.number,
     name: 'Total',
-    values: new ArrayVector(),
+    values: [],
     config: { unit: data.valueField.config.unit, custom: { width: TOP_TABLE_COLUMN_WIDTH } },
   };
 
   for (let key in table) {
-    symbolField.values.add(key);
-    selfField.values.add(table[key].self);
-    totalField.values.add(table[key].total);
+    symbolField.values.push(key);
+    selfField.values.push(table[key].self);
+    totalField.values.push(table[key].total);
   }
 
   const frame = { fields: [symbolField, selfField, totalField], length: symbolField.values.length };
diff --git a/public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts b/public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts
index cd2daba2c9f..d591e2966f0 100644
--- a/public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts
+++ b/public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts
@@ -174,7 +174,7 @@ export const dynamicGeoJSONLayer: MapLayerRegistryItem<DynamicGeoJSONMapperConfi
           const field = findField(frame, config.idField);
           if (field) {
             idToIdx.clear();
-            field.values.toArray().forEach((v, i) => idToIdx.set(v, i));
+            field.values.forEach((v, i) => idToIdx.set(v, i));
           }
 
           style.dims = getStyleDimension(frame, style, theme, config.dataStyle);
diff --git a/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts b/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts
index e8dabc0ca85..30b3e379215 100644
--- a/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts
+++ b/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts
@@ -56,7 +56,7 @@ export const lastPointTracker: MapLayerRegistryItem<LastPointConfig> = {
           if (!out.field) {
             return; // ???
           }
-          point.setGeometry(out.field.values.get(frame.length - 1));
+          point.setGeometry(out.field.values[frame.length - 1]);
         }
       },
     };
diff --git a/public/app/plugins/panel/geomap/layers/data/photosLayer.tsx b/public/app/plugins/panel/geomap/layers/data/photosLayer.tsx
index 6a45231d6a3..3ad48928a59 100644
--- a/public/app/plugins/panel/geomap/layers/data/photosLayer.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/photosLayer.tsx
@@ -171,13 +171,13 @@ export const photosLayer: MapLayerRegistryItem<PhotoConfig> = {
           if (config.src) {
             const srcField: Field | undefined = findField(frame, config.src);
             if (srcField) {
-              images = srcField?.values.toArray();
+              images = srcField?.values;
             }
           } else {
             for (let i = 0; i < frame.fields.length; i++) {
               const field = frame.fields[i];
               if (field.type === FieldType.string) {
-                images = field.values.toArray();
+                images = field.values;
                 break;
               }
             }
diff --git a/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx b/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
index 07157098386..068d9d58fb0 100644
--- a/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
@@ -229,7 +229,7 @@ export const routeLayer: MapLayerRegistryItem<RouteConfig> = {
             if (frame && time) {
               const timeField = frame.fields.find((f) => f.name === TIME_SERIES_TIME_FIELD_NAME);
               if (timeField) {
-                const timestamps: number[] = timeField.values.toArray();
+                const timestamps: number[] = timeField.values;
                 const pointIdx = findNearestTimeIndex(timestamps, time);
                 if (pointIdx !== null) {
                   const out = getGeometryField(frame, location);
diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts
index 278f3fd94b2..8f67e3abb5c 100644
--- a/public/app/plugins/panel/graph/data_processor.ts
+++ b/public/app/plugins/panel/graph/data_processor.ts
@@ -43,7 +43,7 @@ export class DataProcessor {
         const datapoints = [];
 
         for (let r = 0; r < series.length; r++) {
-          datapoints.push([field.values.get(r), dateTime(timeField.values.get(r)).valueOf()]);
+          datapoints.push([field.values[r], dateTime(timeField.values[r]).valueOf()]);
         }
 
         list.push(this.toTimeSeries(field, name, i, j, datapoints, list.length, range));
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 5fc5818ec16..5b609a70f3e 100644
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -371,7 +371,7 @@ class GraphElement {
       return dataIndex;
     }
 
-    const correctIndex = timeField.values.toArray().findIndex((value) => value === ts);
+    const correctIndex = timeField.values.findIndex((value) => value === ts);
     return correctIndex > -1 ? correctIndex : dataIndex;
   }
 
diff --git a/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx b/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
index 8ffc5efea14..53c7b976494 100644
--- a/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
@@ -51,9 +51,9 @@ const HeatmapHoverCell = ({ data, hover, showHistogram }: Props) => {
     return `${v}`;
   };
 
-  const xVals = xField?.values.toArray();
-  const yVals = yField?.values.toArray();
-  const countVals = countField?.values.toArray();
+  const xVals = xField?.values;
+  const yVals = yField?.values;
+  const countVals = countField?.values;
 
   // labeled buckets
   const meta = readHeatmapRowsCustomMeta(data.heatmap);
@@ -122,7 +122,7 @@ const HeatmapHoverCell = ({ data, hover, showHistogram }: Props) => {
   for (const field of visibleFields ?? []) {
     // TODO: Currently always undefined? (getLinks)
     if (field.getLinks) {
-      const v = field.values.get(index);
+      const v = field.values[index];
       const disp = field.display ? field.display(v) : { text: `${v}`, numeric: +v };
 
       field.getLinks({ calculatedValue: disp, valueRowIndex: index }).forEach((link) => {
diff --git a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
index e31d1f4bc5b..af101be9bc9 100644
--- a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
@@ -68,22 +68,20 @@ export const HeatmapPanel = ({
 
     const meta = readHeatmapRowsCustomMeta(info.heatmap);
     if (info.exemplars?.length && meta.yMatchWithLabel) {
-      exemplarsXFacet = info.exemplars?.fields[0].values.toArray();
+      exemplarsXFacet = info.exemplars?.fields[0].values;
 
       // ordinal/labeled heatmap-buckets?
       const hasLabeledY = meta.yOrdinalDisplay != null;
 
       if (hasLabeledY) {
-        let matchExemplarsBy = info.exemplars?.fields
-          .find((field) => field.name === meta.yMatchWithLabel)!
-          .values.toArray();
+        let matchExemplarsBy = info.exemplars?.fields.find((field) => field.name === meta.yMatchWithLabel)!.values;
         exemplarsyFacet = matchExemplarsBy.map((label) => meta.yOrdinalLabel?.indexOf(label)) as number[];
       } else {
-        exemplarsyFacet = info.exemplars?.fields[1].values.toArray() as number[]; // "Value" field
+        exemplarsyFacet = info.exemplars?.fields[1].values as number[]; // "Value" field
       }
     }
 
-    return [null, info.heatmap?.fields.map((f) => f.values.toArray()), [exemplarsXFacet, exemplarsyFacet]];
+    return [null, info.heatmap?.fields.map((f) => f.values), [exemplarsXFacet, exemplarsyFacet]];
   }, [info.heatmap, info.exemplars]);
 
   const palette = useMemo(() => quantizeScheme(options.color, theme), [options.color, theme]);
diff --git a/public/app/plugins/panel/heatmap/fields.ts b/public/app/plugins/panel/heatmap/fields.ts
index 9269026ce0c..9664e2cc18d 100644
--- a/public/app/plugins/panel/heatmap/fields.ts
+++ b/public/app/plugins/panel/heatmap/fields.ts
@@ -146,7 +146,7 @@ const getSparseHeatmapData = (
   const disp = updateFieldDisplay(frame.fields[3], options.cellValues, theme);
 
   let [minValue, maxValue] = boundedMinMax(
-    frame.fields[3].values.toArray(),
+    frame.fields[3].values,
     options.color.min,
     options.color.max,
     options.filterValues?.le,
@@ -233,8 +233,8 @@ const getDenseHeatmapData = (
   // y:      3,4,5,6,3,4,5,6
   // count:  0,0,0,7,0,3,0,1
 
-  const xs = frame.fields[0].values.toArray();
-  const ys = frame.fields[1].values.toArray();
+  const xs = frame.fields[0].values;
+  const ys = frame.fields[1].values;
   const dlen = xs.length;
 
   // below is literally copy/paste from the pathBuilder code in utils.ts
@@ -245,7 +245,7 @@ const getDenseHeatmapData = (
   let xBinIncr = xs[yBinQty] - xs[0];
 
   let [minValue, maxValue] = boundedMinMax(
-    valueField.values.toArray(),
+    valueField.values,
     options.color.min,
     options.color.max,
     options.filterValues?.le,
diff --git a/public/app/plugins/panel/histogram/Histogram.tsx b/public/app/plugins/panel/histogram/Histogram.tsx
index 8d4f6c43985..89cb7d674f2 100644
--- a/public/app/plugins/panel/histogram/Histogram.tsx
+++ b/public/app/plugins/panel/histogram/Histogram.tsx
@@ -47,7 +47,7 @@ export interface HistogramProps extends Themeable2 {
 
 export function getBucketSize(frame: DataFrame) {
   // assumes BucketMin is fields[0] and BucktMax is fields[1]
-  return frame.fields[1].values.get(0) - frame.fields[0].values.get(0);
+  return frame.fields[1].values[0] - frame.fields[0].values[0];
 }
 
 const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
@@ -221,7 +221,7 @@ const preparePlotData = (frame: DataFrame) => {
 
   for (const field of frame.fields) {
     if (field.name !== histogramFrameBucketMaxFieldName) {
-      data.push(field.values.toArray());
+      data.push(field.values);
     }
   }
 
diff --git a/public/app/plugins/panel/nodeGraph/Node.test.tsx b/public/app/plugins/panel/nodeGraph/Node.test.tsx
index 417040685e9..ca37bd10e86 100644
--- a/public/app/plugins/panel/nodeGraph/Node.test.tsx
+++ b/public/app/plugins/panel/nodeGraph/Node.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { ArrayVector, FieldType } from '@grafana/data/src';
+import { FieldType } from '@grafana/data/src';
 
 import { Node } from './Node';
 
@@ -50,7 +50,7 @@ const nodeDatum = {
   subTitle: 'node subtitle',
   dataFrameRowIndex: 0,
   incoming: 0,
-  mainStat: { name: 'stat', values: new ArrayVector([1234]), type: FieldType.number, config: {} },
-  secondaryStat: { name: 'stat2', values: new ArrayVector([9876]), type: FieldType.number, config: {} },
+  mainStat: { name: 'stat', values: [1234], type: FieldType.number, config: {} },
+  secondaryStat: { name: 'stat2', values: [9876], type: FieldType.number, config: {} },
   arcSections: [],
 };
diff --git a/public/app/plugins/panel/nodeGraph/Node.tsx b/public/app/plugins/panel/nodeGraph/Node.tsx
index a1c3b0dcd7b..aec7b7ced9f 100644
--- a/public/app/plugins/panel/nodeGraph/Node.tsx
+++ b/public/app/plugins/panel/nodeGraph/Node.tsx
@@ -133,13 +133,11 @@ function NodeContents({ node, hovering }: { node: NodeDatum; hovering: HoverStat
   ) : (
     <foreignObject x={node.x - (isHovered ? 100 : 35)} y={node.y - 15} width={isHovered ? '200' : '70'} height="40">
       <div className={cx(styles.statsText, isHovered && styles.textHovering)}>
-        <span>
-          {node.mainStat && statToString(node.mainStat.config, node.mainStat.values.get(node.dataFrameRowIndex))}
-        </span>
+        <span>{node.mainStat && statToString(node.mainStat.config, node.mainStat.values[node.dataFrameRowIndex])}</span>
         <br />
         <span>
           {node.secondaryStat &&
-            statToString(node.secondaryStat.config, node.secondaryStat.values.get(node.dataFrameRowIndex))}
+            statToString(node.secondaryStat.config, node.secondaryStat.values[node.dataFrameRowIndex])}
         </span>
       </div>
     </foreignObject>
@@ -151,7 +149,7 @@ function NodeContents({ node, hovering }: { node: NodeDatum; hovering: HoverStat
  */
 function ColorCircle(props: { node: NodeDatum }) {
   const { node } = props;
-  const fullStat = node.arcSections.find((s) => s.values.get(node.dataFrameRowIndex) >= 1);
+  const fullStat = node.arcSections.find((s) => s.values[node.dataFrameRowIndex] >= 1);
   const theme = useTheme2();
 
   if (fullStat) {
@@ -168,7 +166,7 @@ function ColorCircle(props: { node: NodeDatum }) {
     );
   }
 
-  const nonZero = node.arcSections.filter((s) => s.values.get(node.dataFrameRowIndex) !== 0);
+  const nonZero = node.arcSections.filter((s) => s.values[node.dataFrameRowIndex] !== 0);
   if (nonZero.length === 0) {
     // Fallback if no arc is defined
     return (
@@ -189,7 +187,7 @@ function ColorCircle(props: { node: NodeDatum }) {
   }>(
     (acc, section, index) => {
       const color = section.config.color?.fixedColor || '';
-      const value = section.values.get(node.dataFrameRowIndex);
+      const value = section.values[node.dataFrameRowIndex];
 
       const el = (
         <ArcSection
@@ -254,8 +252,8 @@ function ArcSection({
 
 function getColor(field: Field, index: number, theme: GrafanaTheme2): string {
   if (!field.config.color) {
-    return field.values.get(index);
+    return field.values[index];
   }
 
-  return getFieldColorModeForField(field).getCalculator(field, theme)(0, field.values.get(index));
+  return getFieldColorModeForField(field).getCalculator(field, theme)(0, field.values[index]);
 }
diff --git a/public/app/plugins/panel/nodeGraph/useContextMenu.tsx b/public/app/plugins/panel/nodeGraph/useContextMenu.tsx
index 93210c32f7d..b9d71f3ca98 100644
--- a/public/app/plugins/panel/nodeGraph/useContextMenu.tsx
+++ b/public/app/plugins/panel/nodeGraph/useContextMenu.tsx
@@ -177,7 +177,7 @@ function FieldRow({ field, index }: { field: Field; index: number }) {
   return (
     <HeaderRow
       label={field.config?.displayName || field.name}
-      value={statToString(field.config, field.values.get(index) || '')}
+      value={statToString(field.config, field.values[index] || '')}
     />
   );
 }
@@ -200,7 +200,7 @@ function NodeHeader({ node, nodes }: { node: NodeDatum; nodes?: DataFrame }) {
   if (nodes) {
     const fields = getNodeFields(nodes);
     for (const f of [fields.title, fields.subTitle, fields.mainStat, fields.secondaryStat, ...fields.details]) {
-      if (f && f.values.get(node.dataFrameRowIndex)) {
+      if (f && f.values[node.dataFrameRowIndex]) {
         rows.push(<FieldRow field={f} index={node.dataFrameRowIndex} />);
       }
     }
@@ -227,8 +227,8 @@ function NodeHeader({ node, nodes }: { node: NodeDatum; nodes?: DataFrame }) {
 function EdgeHeader(props: { edge: EdgeDatum; edges: DataFrame }) {
   const index = props.edge.dataFrameRowIndex;
   const fields = getEdgeFields(props.edges);
-  const valueSource = fields.source?.values.get(index) || '';
-  const valueTarget = fields.target?.values.get(index) || '';
+  const valueSource = fields.source?.values[index] || '';
+  const valueTarget = fields.target?.values[index] || '';
 
   const rows = [];
   if (valueSource && valueTarget) {
@@ -236,7 +236,7 @@ function EdgeHeader(props: { edge: EdgeDatum; edges: DataFrame }) {
   }
 
   for (const f of [fields.mainStat, fields.secondaryStat, ...fields.details]) {
-    if (f && f.values.get(index)) {
+    if (f && f.values[index]) {
       rows.push(<FieldRow field={f} index={index} />);
     }
   }
diff --git a/public/app/plugins/panel/nodeGraph/utils.ts b/public/app/plugins/panel/nodeGraph/utils.ts
index 2535d865b7c..e127db2c811 100644
--- a/public/app/plugins/panel/nodeGraph/utils.ts
+++ b/public/app/plugins/panel/nodeGraph/utils.ts
@@ -122,7 +122,7 @@ export function processNodes(
     // Create the nodes here
     const nodesMap: { [id: string]: NodeDatum } = {};
     for (let i = 0; i < nodeFields.id.values.length; i++) {
-      const id = nodeFields.id.values.get(i);
+      const id = nodeFields.id.values[i];
       nodesMap[id] = makeNodeDatum(id, nodeFields, i);
     }
 
@@ -167,12 +167,12 @@ export function processNodes(
       // they are numbers. Here we just sum all incoming edges to get the final value for node.
       if (computableField(edgeFields.mainStat)) {
         nodesMap[target.id].mainStatNumeric =
-          (nodesMap[target.id].mainStatNumeric ?? 0) + edgeFields.mainStat!.values.get(i);
+          (nodesMap[target.id].mainStatNumeric ?? 0) + edgeFields.mainStat!.values[i];
       }
 
       if (computableField(edgeFields.secondaryStat)) {
         nodesMap[target.id].secondaryStatNumeric =
-          (nodesMap[target.id].secondaryStatNumeric ?? 0) + edgeFields.secondaryStat!.values.get(i);
+          (nodesMap[target.id].secondaryStatNumeric ?? 0) + edgeFields.secondaryStat!.values[i];
       }
 
       // We are adding incoming edges count, so we can later on find out which nodes are the roots
@@ -199,20 +199,18 @@ function processEdges(edges: DataFrame, edgeFields: EdgeFields): EdgeDatum[] {
     throw new Error('id field is required for edges data frame.');
   }
 
-  return edgeFields.id.values.toArray().map((id, index) => {
-    const target = edgeFields.target?.values.get(index);
-    const source = edgeFields.source?.values.get(index);
+  return edgeFields.id.values.map((id, index) => {
+    const target = edgeFields.target?.values[index];
+    const source = edgeFields.source?.values[index];
 
     return {
       id,
       dataFrameRowIndex: index,
       source,
       target,
-      mainStat: edgeFields.mainStat
-        ? statToString(edgeFields.mainStat.config, edgeFields.mainStat.values.get(index))
-        : '',
+      mainStat: edgeFields.mainStat ? statToString(edgeFields.mainStat.config, edgeFields.mainStat.values[index]) : '',
       secondaryStat: edgeFields.secondaryStat
-        ? statToString(edgeFields.secondaryStat.config, edgeFields.secondaryStat.values.get(index))
+        ? statToString(edgeFields.secondaryStat.config, edgeFields.secondaryStat.values[index])
         : '',
     };
   });
@@ -269,8 +267,8 @@ function normalizeStatsForNodes(nodesMap: { [id: string]: NodeDatumFromEdge }, e
 }
 
 function makeNodeDatumsFromEdge(edgeFields: EdgeFields, index: number) {
-  const targetId = edgeFields.target?.values.get(index);
-  const sourceId = edgeFields.source?.values.get(index);
+  const targetId = edgeFields.target?.values[index];
+  const sourceId = edgeFields.source?.values[index];
   return {
     target: makeSimpleNodeDatum(targetId, index),
     source: makeSimpleNodeDatum(sourceId, index),
@@ -291,15 +289,15 @@ function makeSimpleNodeDatum(name: string, index: number): NodeDatumFromEdge {
 function makeNodeDatum(id: string, nodeFields: NodeFields, index: number): NodeDatum {
   return {
     id: id,
-    title: nodeFields.title?.values.get(index) || '',
-    subTitle: nodeFields.subTitle?.values.get(index) || '',
+    title: nodeFields.title?.values[index] || '',
+    subTitle: nodeFields.subTitle?.values[index] || '',
     dataFrameRowIndex: index,
     incoming: 0,
     mainStat: nodeFields.mainStat,
     secondaryStat: nodeFields.secondaryStat,
     arcSections: nodeFields.arc,
     color: nodeFields.color,
-    icon: nodeFields.icon?.values.get(index) || '',
+    icon: nodeFields.icon?.values[index] || '',
   };
 }
 
diff --git a/public/app/plugins/panel/timeseries/utils.test.ts b/public/app/plugins/panel/timeseries/utils.test.ts
index d9fa49540ff..07ca5d1faf9 100644
--- a/public/app/plugins/panel/timeseries/utils.test.ts
+++ b/public/app/plugins/panel/timeseries/utils.test.ts
@@ -85,7 +85,7 @@ describe('prepare timeseries graph', () => {
     const frames = prepareGraphableFields([df], createTheme());
 
     const field = frames![0].fields.find((f) => f.name === 'a');
-    expect(field!.values.toArray()).toMatchInlineSnapshot(`
+    expect(field!.values).toMatchInlineSnapshot(`
       [
         -10,
         null,
@@ -106,7 +106,7 @@ describe('prepare timeseries graph', () => {
     const frames = prepareGraphableFields([df], createTheme());
 
     const field = frames![0].fields.find((f) => f.name === 'a');
-    expect(field!.values.toArray()).toMatchInlineSnapshot(`
+    expect(field!.values).toMatchInlineSnapshot(`
       [
         1,
         null,
@@ -130,7 +130,7 @@ describe('prepare timeseries graph', () => {
     const frames = prepareGraphableFields([df], createTheme());
 
     const field = frames![0].fields.find((f) => f.name === 'a');
-    expect(field!.values.toArray()).toMatchInlineSnapshot(`
+    expect(field!.values).toMatchInlineSnapshot(`
       [
         1,
         20,
diff --git a/public/app/plugins/panel/timeseries/utils.ts b/public/app/plugins/panel/timeseries/utils.ts
index f40e2dd24e4..4d2750b076c 100644
--- a/public/app/plugins/panel/timeseries/utils.ts
+++ b/public/app/plugins/panel/timeseries/utils.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   DataFrame,
   Field,
   FieldType,
@@ -47,7 +46,7 @@ export function prepareGraphableFields(
   // this mutates (once)
   for (let frame of series) {
     for (let field of frame.fields) {
-      if (field.type === FieldType.time && typeof field.values.get(0) !== 'number') {
+      if (field.type === FieldType.time && typeof field.values[0] !== 'number') {
         field.values = convertFieldType(field, { destinationType: FieldType.time }).values;
       }
     }
@@ -85,14 +84,12 @@ export function prepareGraphableFields(
           hasValueField = useNumericX ? fieldIdx > 0 : true;
           copy = {
             ...field,
-            values: new ArrayVector(
-              field.values.toArray().map((v) => {
-                if (!(Number.isFinite(v) || v == null)) {
-                  return null;
-                }
-                return v;
-              })
-            ),
+            values: field.values.map((v) => {
+              if (!(Number.isFinite(v) || v == null)) {
+                return null;
+              }
+              return v;
+            }),
           };
 
           fields.push(copy);
@@ -100,7 +97,7 @@ export function prepareGraphableFields(
         case FieldType.string:
           copy = {
             ...field,
-            values: new ArrayVector(field.values.toArray()),
+            values: field.values,
           };
 
           fields.push(copy);
diff --git a/public/app/plugins/panel/xychart/scatter.ts b/public/app/plugins/panel/xychart/scatter.ts
index cc3e5c8d0bf..d3215d8e133 100644
--- a/public/app/plugins/panel/xychart/scatter.ts
+++ b/public/app/plugins/panel/xychart/scatter.ts
@@ -123,10 +123,10 @@ function getScatterSeries(
         const index = dims.pointColorIndex;
         pointColor = (frame: DataFrame) => {
           // Yes we can improve this later
-          return frame.fields[index].values.toArray().map((v) => disp(v).color!);
+          return frame.fields[index].values.map((v) => disp(v).color!);
         };
       } else {
-        seriesColor = pointColorMode.getCalculator(f, config.theme2)(f.values.get(0), 1);
+        seriesColor = pointColorMode.getCalculator(f, config.theme2)(f.values[0], 1);
         pointColor = () => seriesColor;
       }
     }
@@ -675,8 +675,8 @@ const prepConfig = (
       let { fields } = frames[i];
 
       return f.y.map((yIndex, frameSeriesIndex) => {
-        let xValues = fields[f.x[frameSeriesIndex]].values.toArray();
-        let yValues = fields[f.y[frameSeriesIndex]].values.toArray();
+        let xValues = fields[f.x[frameSeriesIndex]].values;
+        let yValues = fields[f.y[frameSeriesIndex]].values;
         let sizeValues = f.size![frameSeriesIndex](frames[i]);
 
         if (!Array.isArray(sizeValues)) {
@@ -719,8 +719,8 @@ export function prepData(info: ScatterPanelInfo, data: DataFrame[], from?: numbe
         colorAlphaValues = Array(frame.length).fill(alpha(r as string, 0.5));
       }
       return [
-        s.x(frame).values.toArray(), // X
-        s.y(frame).values.toArray(), // Y
+        s.x(frame).values, // X
+        s.y(frame).values, // Y
         asArray(frame, s.pointSize),
         colorValues,
         colorAlphaValues,

From 45e1bfe42128112dbd6b3d73580a625a85391c41 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:05:09 -0500
Subject: [PATCH 191/729] Testdata: Update testdata annotations editor (#66620)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 .betterer.results                             | 13 ++++-----
 .../components/AnnotationResultMapper.tsx     |  3 +-
 .../StandardAnnotationQueryEditor.tsx         |  2 +-
 .../annotations/executeAnnotationQuery.ts     |  7 +++--
 .../datasource/testdata/QueryEditor.tsx       | 22 +++++++++++++--
 .../plugins/datasource/testdata/datasource.ts | 28 ++++++++++++++-----
 .../plugins/datasource/testdata/module.tsx    |  7 -----
 7 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index ffb18144921..5608c47eebe 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5049,10 +5049,11 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/testdata/QueryEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
     ],
     "public/app/plugins/datasource/testdata/components/RandomWalkEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -5078,11 +5079,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/testdata/datasource.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
-    "public/app/plugins/datasource/testdata/module.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/testdata/nodeGraphUtils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
diff --git a/public/app/features/annotations/components/AnnotationResultMapper.tsx b/public/app/features/annotations/components/AnnotationResultMapper.tsx
index f4dc02c07d0..fabef95b7e4 100644
--- a/public/app/features/annotations/components/AnnotationResultMapper.tsx
+++ b/public/app/features/annotations/components/AnnotationResultMapper.tsx
@@ -42,7 +42,8 @@ export class AnnotationFieldMapper extends PureComponent<Props, State> {
   }
 
   updateFields = () => {
-    const frame = this.props.response?.panelData?.series[0];
+    const panelData = this.props.response?.panelData;
+    const frame = panelData?.series?.[0] ?? panelData?.annotations?.[0];
     if (frame && frame.fields) {
       const fieldNames = frame.fields.map((f) => {
         const name = getFieldDisplayName(f, frame);
diff --git a/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx b/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
index e6df175dc2e..4bce32eddb1 100644
--- a/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
+++ b/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
@@ -132,7 +132,7 @@ export default class StandardAnnotationQueryEditor extends PureComponent<Props,
         icon = 'exclamation-triangle';
         text = 'No events found';
       } else {
-        const frame = panelData?.series[0];
+        const frame = panelData?.series?.[0] ?? panelData?.annotations?.[0];
 
         text = `${events.length} events (from ${frame?.fields.length} fields)`;
       }
diff --git a/public/app/features/annotations/executeAnnotationQuery.ts b/public/app/features/annotations/executeAnnotationQuery.ts
index e3870a75437..171b713d383 100644
--- a/public/app/features/annotations/executeAnnotationQuery.ts
+++ b/public/app/features/annotations/executeAnnotationQuery.ts
@@ -71,11 +71,12 @@ export function executeAnnotationQuery(
 
   return runRequest(datasource, queryRequest).pipe(
     mergeMap((panelData) => {
-      if (!panelData.series) {
+      // Some annotations set the topic already
+      const data = panelData?.series.length ? panelData.series : panelData.annotations;
+      if (!data?.length) {
         return of({ panelData, events: [] });
       }
-
-      return processor.processEvents!(annotation, panelData.series).pipe(map((events) => ({ panelData, events })));
+      return processor.processEvents!(annotation, data).pipe(map((events) => ({ panelData, events })));
     })
   );
 }
diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx
index 0aa6a27c558..1fb08b1aad6 100644
--- a/public/app/plugins/datasource/testdata/QueryEditor.tsx
+++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx
@@ -57,10 +57,10 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
     }
 
     const vals = await datasource.getScenarios();
-    const hideAlias = ['simulation'];
+    const hideAlias = [TestDataQueryType.Simulation, TestDataQueryType.Annotations];
     return vals.map((v) => ({
       ...v,
-      hideAliasField: hideAlias.includes(v.id),
+      hideAliasField: hideAlias.includes(v.id as TestDataQueryType),
     }));
   }, []);
 
@@ -114,6 +114,9 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
       case TestDataQueryType.PredictableCSVWave:
         update.csvWave = defaultCSVWaveQuery;
         break;
+      case TestDataQueryType.Annotations:
+        update.lines = 10;
+        break;
       case TestDataQueryType.USA:
         update.usa = {
           mode: usaQueryModes[0].value,
@@ -277,7 +280,20 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
           </InlineField>
         </InlineFieldRow>
       )}
-
+      {scenarioId === TestDataQueryType.Annotations && (
+        <InlineFieldRow>
+          <InlineField label="Count" labelWidth={14}>
+            <Input
+              type="number"
+              name="lines"
+              value={query.lines}
+              width={32}
+              onChange={onInputChange}
+              placeholder="10"
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
       {scenarioId === TestDataQueryType.USA && <USAQueryEditor onChange={onUSAStatsChange} query={query.usa ?? {}} />}
       {scenarioId === TestDataQueryType.GrafanaAPI && (
         <InlineField labelWidth={14} label="Endpoint">
diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts
index c662332e9ee..739e7bdade6 100644
--- a/public/app/plugins/datasource/testdata/datasource.ts
+++ b/public/app/plugins/datasource/testdata/datasource.ts
@@ -15,6 +15,7 @@ import {
   ScopedVars,
   toDataFrame,
   MutableDataFrame,
+  AnnotationQuery,
 } from '@grafana/data';
 import { DataSourceWithBackend, getBackendSrv, getGrafanaLiveSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 import { getSearchFilterScopedVar } from 'app/features/variables/utils';
@@ -35,6 +36,24 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
   ) {
     super(instanceSettings);
     this.variables = new TestDataVariableSupport();
+    this.annotations = {
+      getDefaultQuery: () => ({ scenarioId: TestDataQueryType.Annotations, lines: 10 }),
+
+      // Make sure annotations have scenarioId set
+      prepareAnnotation: (old: AnnotationQuery<TestData>) => {
+        if (old.target?.scenarioId?.length) {
+          return old;
+        }
+        return {
+          ...old,
+          target: {
+            refId: 'Anno',
+            scenarioId: TestDataQueryType.Annotations,
+            lines: 10,
+          },
+        };
+      },
+    };
   }
 
   getDefaultQuery(): Partial<TestData> {
@@ -66,7 +85,7 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
         case 'grafana_api':
           streams.push(runGrafanaAPI(target, options));
           break;
-        case 'annotations':
+        case TestDataQueryType.Annotations:
           streams.push(this.annotationDataTopicTest(target, options));
           break;
         case 'variables-query':
@@ -144,10 +163,9 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
   }
 
   annotationDataTopicTest(target: TestData, req: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
-    const events = this.buildFakeAnnotationEvents(req.range, 50);
+    const events = this.buildFakeAnnotationEvents(req.range, target.lines ?? 10);
     const dataFrame = new ArrayDataFrame(events);
     dataFrame.meta = { dataTopic: DataTopic.Annotations };
-
     return of({ key: target.refId, data: [dataFrame] }).pipe(delay(100));
   }
 
@@ -169,10 +187,6 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     return events;
   }
 
-  annotationQuery(options: any) {
-    return Promise.resolve(this.buildFakeAnnotationEvents(options.range, 10));
-  }
-
   getQueryDisplayText(query: TestData) {
     const scenario = query.scenarioId ?? 'Default scenario';
 
diff --git a/public/app/plugins/datasource/testdata/module.tsx b/public/app/plugins/datasource/testdata/module.tsx
index df57421b387..ad727cf0f87 100644
--- a/public/app/plugins/datasource/testdata/module.tsx
+++ b/public/app/plugins/datasource/testdata/module.tsx
@@ -5,16 +5,9 @@ import { QueryEditor } from './QueryEditor';
 import { TestInfoTab } from './TestInfoTab';
 import { TestDataDataSource } from './datasource';
 
-class TestDataAnnotationsQueryCtrl {
-  annotation: any;
-  constructor() {}
-  static template = '<h2>Annotation scenario</h2>';
-}
-
 export const plugin = new DataSourcePlugin(TestDataDataSource)
   .setConfigEditor(ConfigEditor)
   .setQueryEditor(QueryEditor)
-  .setAnnotationQueryCtrl(TestDataAnnotationsQueryCtrl)
   .addConfigPage({
     title: 'Setup',
     icon: 'list-ul',

From 2f13c851e400fd6e6c9980b0f81156e70407cdc7 Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Mon, 17 Apr 2023 19:12:44 -0400
Subject: [PATCH 192/729] =?UTF-8?q?SSE:=20(Chore/Instrumentation)=20Add=20?=
 =?UTF-8?q?ds=5Fqueries=5Ftotal=20metric=20and=20move=20met=E2=80=A6=20(#6?=
 =?UTF-8?q?6695)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* SSE: (Chore/Instrumentation) Add ds_queries_total metric and move metrics to service
---
 pkg/expr/dataplane_test.go                    |  1 +
 pkg/expr/metrics.go                           | 47 +++++++++++++++++++
 pkg/expr/nodes.go                             |  9 +++-
 pkg/expr/service.go                           |  6 ++-
 pkg/expr/service_test.go                      |  1 +
 pkg/expr/transform.go                         | 20 +-------
 pkg/services/ngalert/eval/eval_test.go        |  2 +-
 .../ngalert/schedule/schedule_unit_test.go    |  2 +-
 pkg/services/query/query_test.go              |  2 +-
 9 files changed, 66 insertions(+), 24 deletions(-)
 create mode 100644 pkg/expr/metrics.go

diff --git a/pkg/expr/dataplane_test.go b/pkg/expr/dataplane_test.go
index 647ec9f17ae..46cccd09941 100644
--- a/pkg/expr/dataplane_test.go
+++ b/pkg/expr/dataplane_test.go
@@ -49,6 +49,7 @@ func framesPassThroughService(t *testing.T, frames data.Frames) (data.Frames, er
 		dataService:       me,
 		dataSourceService: &datafakes.FakeDataSourceService{},
 		features:          &featuremgmt.FeatureManager{},
+		metrics:           newMetrics(nil),
 	}
 	queries := []Query{{
 		RefID: "A",
diff --git a/pkg/expr/metrics.go b/pkg/expr/metrics.go
new file mode 100644
index 00000000000..d6f8cabc3a1
--- /dev/null
+++ b/pkg/expr/metrics.go
@@ -0,0 +1,47 @@
+package expr
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const (
+	metricsSubSystem = "sse"
+	metricsNamespace = "grafana"
+)
+
+type metrics struct {
+	dsRequests *prometheus.CounterVec
+
+	// older metric
+	expressionsQuerySummary *prometheus.SummaryVec
+}
+
+func newMetrics(reg prometheus.Registerer) *metrics {
+	m := &metrics{
+		dsRequests: prometheus.NewCounterVec(prometheus.CounterOpts{
+			Namespace: metricsNamespace,
+			Subsystem: metricsSubSystem,
+			Name:      "ds_queries_total",
+			Help:      "Number of datasource queries made via server side expression requests",
+		}, []string{"error", "dataplane"}),
+
+		// older (No Namespace or Subsystem)
+		expressionsQuerySummary: prometheus.NewSummaryVec(
+			prometheus.SummaryOpts{
+				Name:       "expressions_queries_duration_milliseconds",
+				Help:       "Expressions query summary",
+				Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
+			},
+			[]string{"status"},
+		),
+	}
+
+	if reg != nil {
+		reg.MustRegister(
+			m.dsRequests,
+			m.expressionsQuerySummary,
+		)
+	}
+
+	return m
+}
diff --git a/pkg/expr/nodes.go b/pkg/expr/nodes.go
index 3c072c4792c..9385bff38c4 100644
--- a/pkg/expr/nodes.go
+++ b/pkg/expr/nodes.go
@@ -230,11 +230,16 @@ func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s
 	}
 
 	responseType := "unknown"
+	respStatus := "success"
+	var useDataplane bool
 	defer func() {
 		if e != nil {
 			responseType = "error"
+			respStatus = "failure"
 		}
 		logger.Debug("Data source queried", "responseType", responseType)
+
+		s.metrics.dsRequests.WithLabelValues(respStatus, fmt.Sprintf("%t", useDataplane)).Inc()
 	}()
 
 	resp, err := s.dataService.QueryData(ctx, req)
@@ -259,7 +264,9 @@ func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s
 		return mathexp.Results{}, QueryError{RefID: dn.refID, Err: response.Error}
 	}
 
-	if dt, use, _ := shouldUseDataplane(response.Frames, logger, s.features.IsEnabled(featuremgmt.FlagDisableSSEDataplane)); use {
+	var dt data.FrameType
+	dt, useDataplane, _ = shouldUseDataplane(response.Frames, logger, s.features.IsEnabled(featuremgmt.FlagDisableSSEDataplane))
+	if useDataplane {
 		logger.Debug("Handling SSE data source query through dataplane", "datatype", dt)
 		return handleDataplaneFrames(dt.Kind(), response.Frames)
 	}
diff --git a/pkg/expr/service.go b/pkg/expr/service.go
index 5db62beb681..236487b81c6 100644
--- a/pkg/expr/service.go
+++ b/pkg/expr/service.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/plugins"
@@ -42,14 +43,17 @@ type Service struct {
 	dataService       backend.QueryDataHandler
 	dataSourceService datasources.DataSourceService
 	features          featuremgmt.FeatureToggles
+
+	metrics *metrics
 }
 
-func ProvideService(cfg *setting.Cfg, pluginClient plugins.Client, dataSourceService datasources.DataSourceService, features featuremgmt.FeatureToggles) *Service {
+func ProvideService(cfg *setting.Cfg, pluginClient plugins.Client, dataSourceService datasources.DataSourceService, features featuremgmt.FeatureToggles, registerer prometheus.Registerer) *Service {
 	return &Service{
 		cfg:               cfg,
 		dataService:       pluginClient,
 		dataSourceService: dataSourceService,
 		features:          features,
+		metrics:           newMetrics(registerer),
 	}
 }
 
diff --git a/pkg/expr/service_test.go b/pkg/expr/service_test.go
index 466b2ae8c79..6adc152fe76 100644
--- a/pkg/expr/service_test.go
+++ b/pkg/expr/service_test.go
@@ -34,6 +34,7 @@ func TestService(t *testing.T) {
 		dataService:       me,
 		dataSourceService: &datafakes.FakeDataSourceService{},
 		features:          &featuremgmt.FeatureManager{},
+		metrics:           newMetrics(nil),
 	}
 
 	queries := []Query{
diff --git a/pkg/expr/transform.go b/pkg/expr/transform.go
index b757ea7621f..75e76dffb06 100644
--- a/pkg/expr/transform.go
+++ b/pkg/expr/transform.go
@@ -7,28 +7,10 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/grafana/grafana/pkg/services/datasources"
 )
 
-var (
-	expressionsQuerySummary *prometheus.SummaryVec
-)
-
-func init() {
-	expressionsQuerySummary = prometheus.NewSummaryVec(
-		prometheus.SummaryOpts{
-			Name:       "expressions_queries_duration_milliseconds",
-			Help:       "Expressions query summary",
-			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
-		},
-		[]string{"status"},
-	)
-
-	prometheus.MustRegister(expressionsQuerySummary)
-}
-
 // Request is similar to plugins.DataQuery but with the Time Ranges is per Query.
 type Request struct {
 	Headers map[string]string
@@ -97,7 +79,7 @@ func (s *Service) TransformData(ctx context.Context, now time.Time, req *Request
 			respStatus = "failure"
 		}
 		duration := float64(time.Since(start).Nanoseconds()) / float64(time.Millisecond)
-		expressionsQuerySummary.WithLabelValues(respStatus).Observe(duration)
+		s.metrics.expressionsQuerySummary.WithLabelValues(respStatus).Observe(duration)
 	}()
 
 	// Build the pipeline from the request, checking for ordering issues (e.g. loops)
diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go
index c22f76e578b..9e53b5288ad 100644
--- a/pkg/services/ngalert/eval/eval_test.go
+++ b/pkg/services/ngalert/eval/eval_test.go
@@ -533,7 +533,7 @@ func TestValidate(t *testing.T) {
 				pluginsStore: store,
 			})
 
-			evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}), store)
+			evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil), store)
 			evalCtx := NewContext(context.Background(), u)
 
 			err := evaluator.Validate(evalCtx, condition)
diff --git a/pkg/services/ngalert/schedule/schedule_unit_test.go b/pkg/services/ngalert/schedule/schedule_unit_test.go
index 7717756cb97..ae147269857 100644
--- a/pkg/services/ngalert/schedule/schedule_unit_test.go
+++ b/pkg/services/ngalert/schedule/schedule_unit_test.go
@@ -781,7 +781,7 @@ func setupScheduler(t *testing.T, rs *fakeRulesStore, is *state.FakeInstanceStor
 
 	var evaluator = evalMock
 	if evalMock == nil {
-		evaluator = eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, nil, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}), &plugins.FakePluginStore{})
+		evaluator = eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, nil, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil), &plugins.FakePluginStore{})
 	}
 
 	if registry == nil {
diff --git a/pkg/services/query/query_test.go b/pkg/services/query/query_test.go
index 0848abf2a6e..03add52eaeb 100644
--- a/pkg/services/query/query_test.go
+++ b/pkg/services/query/query_test.go
@@ -446,7 +446,7 @@ func setup(t *testing.T) *testContext {
 		DataSources:           nil,
 		SimulatePluginFailure: false,
 	}
-	exprService := expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, pc, fakeDatasourceService, &featuremgmt.FeatureManager{})
+	exprService := expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, pc, fakeDatasourceService, &featuremgmt.FeatureManager{}, nil)
 	queryService := ProvideService(setting.NewCfg(), dc, exprService, rv, ds, pc) // provider belonging to this package
 	return &testContext{
 		pluginContext:          pc,

From 15b469bd12ae0f4b89e890901199aa7a442a8249 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 17 Apr 2023 18:27:04 -0700
Subject: [PATCH 193/729] UsageStats: Add database age and driver (#66535)

Co-authored-by: Dan Cech <dcech@grafana.com>
---
 pkg/infra/usagestats/statscollector/service.go | 6 ++++++
 pkg/services/stats/models.go                   | 6 ++++++
 pkg/services/stats/statsimpl/stats.go          | 6 +++++-
 pkg/services/stats/statsimpl/stats_test.go     | 2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkg/infra/usagestats/statscollector/service.go b/pkg/infra/usagestats/statscollector/service.go
index 092ba4ce54c..a4273548e2f 100644
--- a/pkg/infra/usagestats/statscollector/service.go
+++ b/pkg/infra/usagestats/statscollector/service.go
@@ -161,6 +161,12 @@ func (s *Service) collectSystemStats(ctx context.Context) (map[string]interface{
 	m["stats.active_data_keys.count"] = statsResult.ActiveDataKeys
 	m["stats.public_dashboards.count"] = statsResult.PublicDashboards
 	m["stats.correlations.count"] = statsResult.Correlations
+	if statsResult.DatabaseCreatedTime != nil {
+		m["stats.database.created.time"] = statsResult.DatabaseCreatedTime.Unix()
+	}
+	if statsResult.DatabaseDriver != "" {
+		m["stats.database.driver"] = statsResult.DatabaseDriver
+	}
 
 	ossEditionCount := 1
 	enterpriseEditionCount := 0
diff --git a/pkg/services/stats/models.go b/pkg/services/stats/models.go
index 1c0e4b93630..ea6ae9eecb3 100644
--- a/pkg/services/stats/models.go
+++ b/pkg/services/stats/models.go
@@ -1,5 +1,7 @@
 package stats
 
+import "time"
+
 type SystemStats struct {
 	Dashboards                int64
 	DashboardBytesTotal       int64
@@ -45,6 +47,10 @@ type SystemStats struct {
 	ActiveDataKeys            int64
 	PublicDashboards          int64
 	Correlations              int64
+	DatabaseCreatedTime       *time.Time
+
+	// name of the driver
+	DatabaseDriver string
 }
 
 type DataSourceStats struct {
diff --git a/pkg/services/stats/statsimpl/stats.go b/pkg/services/stats/statsimpl/stats.go
index 081f21075b5..1377dc8932c 100644
--- a/pkg/services/stats/statsimpl/stats.go
+++ b/pkg/services/stats/statsimpl/stats.go
@@ -63,10 +63,10 @@ func notServiceAccount(dialect migrator.Dialect) string {
 }
 
 func (ss *sqlStatsService) GetSystemStats(ctx context.Context, query *stats.GetSystemStatsQuery) (result *stats.SystemStats, err error) {
+	dialect := ss.db.GetDialect()
 	err = ss.db.WithDbSession(ctx, func(dbSession *db.Session) error {
 		sb := &db.SQLBuilder{}
 		sb.Write("SELECT ")
-		dialect := ss.db.GetDialect()
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("user") + ` WHERE ` + notServiceAccount(dialect) + `) AS users,`)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("org") + `) AS orgs,`)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("data_source") + `) AS datasources,`)
@@ -127,6 +127,7 @@ func (ss *sqlStatsService) GetSystemStats(ctx context.Context, query *stats.GetS
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("data_keys") + `) AS data_keys,`)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("data_keys") + `WHERE active = true) AS active_data_keys,`)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("dashboard_public") + `) AS public_dashboards,`)
+		sb.Write(`(SELECT MIN(timestamp) FROM ` + dialect.Quote("migration_log") + `) AS database_created_time,`)
 
 		sb.Write(ss.roleCounterSQL(ctx))
 
@@ -138,8 +139,11 @@ func (ss *sqlStatsService) GetSystemStats(ctx context.Context, query *stats.GetS
 
 		result = &stats
 
+		result.DatabaseDriver = dialect.DriverName()
+
 		return nil
 	})
+
 	return result, err
 }
 
diff --git a/pkg/services/stats/statsimpl/stats_test.go b/pkg/services/stats/statsimpl/stats_test.go
index f2d1c840efd..3aa828f108a 100644
--- a/pkg/services/stats/statsimpl/stats_test.go
+++ b/pkg/services/stats/statsimpl/stats_test.go
@@ -41,6 +41,8 @@ func TestIntegrationStatsDataAccess(t *testing.T) {
 		assert.Equal(t, int64(0), result.LibraryVariables)
 		assert.Equal(t, int64(0), result.APIKeys)
 		assert.Equal(t, int64(2), result.Correlations)
+		assert.NotNil(t, result.DatabaseCreatedTime)
+		assert.Equal(t, db.Dialect.DriverName(), result.DatabaseDriver)
 	})
 
 	t.Run("Get system user count stats should not results in error", func(t *testing.T) {

From 49eb9db698428ebfb10594b223f4b16d32c1b5ff Mon Sep 17 00:00:00 2001
From: Alex Khomenko <Clarity-89@users.noreply.github.com>
Date: Tue, 18 Apr 2023 08:46:51 +0300
Subject: [PATCH 194/729] Cloudwatch: Fix some schema todos (#66664)

* Cloudwatch: fix todos

* Cloudwatch: Run make-gen
---
 .../kinds/dataquery/types_dataquery_gen.go    | 210 ++++++++++++++++--
 .../cloudwatch/__mocks__/sqlUtils.ts          |   4 +-
 .../datasource/cloudwatch/dataquery.cue       |   5 +-
 .../datasource/cloudwatch/dataquery.gen.ts    |   5 +-
 .../datasource/cloudwatch/expressions.ts      |   8 +-
 .../plugins/datasource/cloudwatch/types.ts    |  15 +-
 6 files changed, 204 insertions(+), 43 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
index 33b46336479..afd937176e8 100644
--- a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
@@ -56,6 +56,16 @@ const (
 	CloudWatchMetricsQuerySqlFromPropertyTypeString CloudWatchMetricsQuerySqlFromPropertyType = "string"
 )
 
+// Defines values for CloudWatchMetricsQuerySqlGroupByExpressionsParametersType.
+const (
+	CloudWatchMetricsQuerySqlGroupByExpressionsParametersTypeFunctionParameter CloudWatchMetricsQuerySqlGroupByExpressionsParametersType = "functionParameter"
+)
+
+// Defines values for CloudWatchMetricsQuerySqlGroupByExpressionsPropertyType.
+const (
+	CloudWatchMetricsQuerySqlGroupByExpressionsPropertyTypeString CloudWatchMetricsQuerySqlGroupByExpressionsPropertyType = "string"
+)
+
 // Defines values for CloudWatchMetricsQuerySqlGroupByType.
 const (
 	CloudWatchMetricsQuerySqlGroupByTypeAnd CloudWatchMetricsQuerySqlGroupByType = "and"
@@ -82,6 +92,16 @@ const (
 	CloudWatchMetricsQuerySqlSelectTypeFunction CloudWatchMetricsQuerySqlSelectType = "function"
 )
 
+// Defines values for CloudWatchMetricsQuerySqlWhereExpressionsParametersType.
+const (
+	CloudWatchMetricsQuerySqlWhereExpressionsParametersTypeFunctionParameter CloudWatchMetricsQuerySqlWhereExpressionsParametersType = "functionParameter"
+)
+
+// Defines values for CloudWatchMetricsQuerySqlWhereExpressionsPropertyType.
+const (
+	CloudWatchMetricsQuerySqlWhereExpressionsPropertyTypeString CloudWatchMetricsQuerySqlWhereExpressionsPropertyType = "string"
+)
+
 // Defines values for CloudWatchMetricsQuerySqlWhereType.
 const (
 	CloudWatchMetricsQuerySqlWhereTypeAnd CloudWatchMetricsQuerySqlWhereType = "and"
@@ -107,6 +127,16 @@ const (
 	MetricQueryTypeN1 MetricQueryType = 1
 )
 
+// Defines values for QueryEditorArrayExpressionExpressionsParametersType.
+const (
+	QueryEditorArrayExpressionExpressionsParametersTypeFunctionParameter QueryEditorArrayExpressionExpressionsParametersType = "functionParameter"
+)
+
+// Defines values for QueryEditorArrayExpressionExpressionsPropertyType.
+const (
+	QueryEditorArrayExpressionExpressionsPropertyTypeString QueryEditorArrayExpressionExpressionsPropertyType = "string"
+)
+
 // Defines values for QueryEditorArrayExpressionType.
 const (
 	QueryEditorArrayExpressionTypeAnd QueryEditorArrayExpressionType = "and"
@@ -194,6 +224,16 @@ const (
 	SQLExpressionFromPropertyTypeString SQLExpressionFromPropertyType = "string"
 )
 
+// Defines values for SQLExpressionGroupByExpressionsParametersType.
+const (
+	SQLExpressionGroupByExpressionsParametersTypeFunctionParameter SQLExpressionGroupByExpressionsParametersType = "functionParameter"
+)
+
+// Defines values for SQLExpressionGroupByExpressionsPropertyType.
+const (
+	SQLExpressionGroupByExpressionsPropertyTypeString SQLExpressionGroupByExpressionsPropertyType = "string"
+)
+
 // Defines values for SQLExpressionGroupByType.
 const (
 	SQLExpressionGroupByTypeAnd SQLExpressionGroupByType = "and"
@@ -220,6 +260,16 @@ const (
 	SQLExpressionSelectTypeFunction SQLExpressionSelectType = "function"
 )
 
+// Defines values for SQLExpressionWhereExpressionsParametersType.
+const (
+	SQLExpressionWhereExpressionsParametersTypeFunctionParameter SQLExpressionWhereExpressionsParametersType = "functionParameter"
+)
+
+// Defines values for SQLExpressionWhereExpressionsPropertyType.
+const (
+	SQLExpressionWhereExpressionsPropertyTypeString SQLExpressionWhereExpressionsPropertyType = "string"
+)
+
 // Defines values for SQLExpressionWhereType.
 const (
 	SQLExpressionWhereTypeAnd SQLExpressionWhereType = "and"
@@ -354,9 +404,8 @@ type CloudWatchMetricsQuery struct {
 	Sql    *struct {
 		From    *CloudWatchMetricsQuerySqlFrom `json:"from,omitempty"`
 		GroupBy *struct {
-			// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-			Expressions interface{}                          `json:"expressions"`
-			Type        CloudWatchMetricsQuerySqlGroupByType `json:"type"`
+			Expressions []CloudWatchMetricsQuerySqlGroupByExpressionsItem `json:"expressions"`
+			Type        CloudWatchMetricsQuerySqlGroupByType              `json:"type"`
 		} `json:"groupBy,omitempty"`
 		Limit   *int64 `json:"limit,omitempty"`
 		OrderBy *struct {
@@ -377,9 +426,8 @@ type CloudWatchMetricsQuery struct {
 			Type CloudWatchMetricsQuerySqlSelectType `json:"type"`
 		} `json:"select,omitempty"`
 		Where *struct {
-			// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-			Expressions interface{}                        `json:"expressions"`
-			Type        CloudWatchMetricsQuerySqlWhereType `json:"type"`
+			Expressions []CloudWatchMetricsQuerySqlWhereExpressionsItem `json:"expressions"`
+			Type        CloudWatchMetricsQuerySqlWhereType              `json:"type"`
 		} `json:"where,omitempty"`
 	} `json:"sql,omitempty"`
 	SqlExpression *string `json:"sqlExpression,omitempty"`
@@ -419,6 +467,33 @@ type CloudWatchMetricsQuerySqlFrom struct {
 	union json.RawMessage
 }
 
+// CloudWatchMetricsQuerySqlGroupByExpressionsParametersType defines model for CloudWatchMetricsQuery.Sql.GroupBy.Expressions.Parameters.Type.
+type CloudWatchMetricsQuerySqlGroupByExpressionsParametersType string
+
+// CloudWatchMetricsQuerySqlGroupByExpressionsPropertyType defines model for CloudWatchMetricsQuery.Sql.GroupBy.Expressions.Property.Type.
+type CloudWatchMetricsQuerySqlGroupByExpressionsPropertyType string
+
+// CloudWatchMetricsQuerySqlGroupByExpressionsItem defines model for CloudWatchMetricsQuery.sql.groupBy.expressions.Item.
+type CloudWatchMetricsQuerySqlGroupByExpressionsItem struct {
+	Name *string `json:"name,omitempty"`
+
+	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
+	Operator *struct {
+		Name  *string      `json:"name,omitempty"`
+		Value *interface{} `json:"value,omitempty"`
+	} `json:"operator,omitempty"`
+	Parameters []struct {
+		Name *string                                                   `json:"name,omitempty"`
+		Type CloudWatchMetricsQuerySqlGroupByExpressionsParametersType `json:"type"`
+	} `json:"parameters,omitempty"`
+	Property *struct {
+		Name *string                                                 `json:"name,omitempty"`
+		Type CloudWatchMetricsQuerySqlGroupByExpressionsPropertyType `json:"type"`
+	} `json:"property,omitempty"`
+	Type  *interface{} `json:"type,omitempty"`
+	union json.RawMessage
+}
+
 // CloudWatchMetricsQuerySqlGroupByType defines model for CloudWatchMetricsQuery.Sql.GroupBy.Type.
 type CloudWatchMetricsQuerySqlGroupByType string
 
@@ -434,6 +509,33 @@ type CloudWatchMetricsQuerySqlSelectParametersType string
 // CloudWatchMetricsQuerySqlSelectType defines model for CloudWatchMetricsQuery.Sql.Select.Type.
 type CloudWatchMetricsQuerySqlSelectType string
 
+// CloudWatchMetricsQuerySqlWhereExpressionsParametersType defines model for CloudWatchMetricsQuery.Sql.Where.Expressions.Parameters.Type.
+type CloudWatchMetricsQuerySqlWhereExpressionsParametersType string
+
+// CloudWatchMetricsQuerySqlWhereExpressionsPropertyType defines model for CloudWatchMetricsQuery.Sql.Where.Expressions.Property.Type.
+type CloudWatchMetricsQuerySqlWhereExpressionsPropertyType string
+
+// CloudWatchMetricsQuerySqlWhereExpressionsItem defines model for CloudWatchMetricsQuery.sql.where.expressions.Item.
+type CloudWatchMetricsQuerySqlWhereExpressionsItem struct {
+	Name *string `json:"name,omitempty"`
+
+	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
+	Operator *struct {
+		Name  *string      `json:"name,omitempty"`
+		Value *interface{} `json:"value,omitempty"`
+	} `json:"operator,omitempty"`
+	Parameters []struct {
+		Name *string                                                 `json:"name,omitempty"`
+		Type CloudWatchMetricsQuerySqlWhereExpressionsParametersType `json:"type"`
+	} `json:"parameters,omitempty"`
+	Property *struct {
+		Name *string                                               `json:"name,omitempty"`
+		Type CloudWatchMetricsQuerySqlWhereExpressionsPropertyType `json:"type"`
+	} `json:"property,omitempty"`
+	Type  *interface{} `json:"type,omitempty"`
+	union json.RawMessage
+}
+
 // CloudWatchMetricsQuerySqlWhereType defines model for CloudWatchMetricsQuery.Sql.Where.Type.
 type CloudWatchMetricsQuerySqlWhereType string
 
@@ -474,9 +576,35 @@ type MetricStat struct {
 
 // QueryEditorArrayExpression defines model for QueryEditorArrayExpression.
 type QueryEditorArrayExpression struct {
-	// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-	Expressions interface{}                    `json:"expressions"`
-	Type        QueryEditorArrayExpressionType `json:"type"`
+	Expressions []QueryEditorArrayExpressionExpressionsItem `json:"expressions"`
+	Type        QueryEditorArrayExpressionType              `json:"type"`
+}
+
+// QueryEditorArrayExpressionExpressionsParametersType defines model for QueryEditorArrayExpression.Expressions.Parameters.Type.
+type QueryEditorArrayExpressionExpressionsParametersType string
+
+// QueryEditorArrayExpressionExpressionsPropertyType defines model for QueryEditorArrayExpression.Expressions.Property.Type.
+type QueryEditorArrayExpressionExpressionsPropertyType string
+
+// QueryEditorArrayExpressionExpressionsItem defines model for QueryEditorArrayExpression.expressions.Item.
+type QueryEditorArrayExpressionExpressionsItem struct {
+	Name *string `json:"name,omitempty"`
+
+	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
+	Operator *struct {
+		Name  *string      `json:"name,omitempty"`
+		Value *interface{} `json:"value,omitempty"`
+	} `json:"operator,omitempty"`
+	Parameters []struct {
+		Name *string                                             `json:"name,omitempty"`
+		Type QueryEditorArrayExpressionExpressionsParametersType `json:"type"`
+	} `json:"parameters,omitempty"`
+	Property *struct {
+		Name *string                                           `json:"name,omitempty"`
+		Type QueryEditorArrayExpressionExpressionsPropertyType `json:"type"`
+	} `json:"property,omitempty"`
+	Type  *interface{} `json:"type,omitempty"`
+	union json.RawMessage
 }
 
 // QueryEditorArrayExpressionType defines model for QueryEditorArrayExpression.Type.
@@ -606,9 +734,8 @@ type QueryEditorPropertyExpressionType string
 type SQLExpression struct {
 	From    *SQLExpressionFrom `json:"from,omitempty"`
 	GroupBy *struct {
-		// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-		Expressions interface{}              `json:"expressions"`
-		Type        SQLExpressionGroupByType `json:"type"`
+		Expressions []SQLExpressionGroupByExpressionsItem `json:"expressions"`
+		Type        SQLExpressionGroupByType              `json:"type"`
 	} `json:"groupBy,omitempty"`
 	Limit   *int64 `json:"limit,omitempty"`
 	OrderBy *struct {
@@ -629,9 +756,8 @@ type SQLExpression struct {
 		Type SQLExpressionSelectType `json:"type"`
 	} `json:"select,omitempty"`
 	Where *struct {
-		// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-		Expressions interface{}            `json:"expressions"`
-		Type        SQLExpressionWhereType `json:"type"`
+		Expressions []SQLExpressionWhereExpressionsItem `json:"expressions"`
+		Type        SQLExpressionWhereType              `json:"type"`
 	} `json:"where,omitempty"`
 }
 
@@ -656,6 +782,33 @@ type SQLExpressionFrom struct {
 	union json.RawMessage
 }
 
+// SQLExpressionGroupByExpressionsParametersType defines model for SQLExpression.GroupBy.Expressions.Parameters.Type.
+type SQLExpressionGroupByExpressionsParametersType string
+
+// SQLExpressionGroupByExpressionsPropertyType defines model for SQLExpression.GroupBy.Expressions.Property.Type.
+type SQLExpressionGroupByExpressionsPropertyType string
+
+// SQLExpressionGroupByExpressionsItem defines model for SQLExpression.GroupBy.Expressions.Item.
+type SQLExpressionGroupByExpressionsItem struct {
+	Name *string `json:"name,omitempty"`
+
+	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
+	Operator *struct {
+		Name  *string      `json:"name,omitempty"`
+		Value *interface{} `json:"value,omitempty"`
+	} `json:"operator,omitempty"`
+	Parameters []struct {
+		Name *string                                       `json:"name,omitempty"`
+		Type SQLExpressionGroupByExpressionsParametersType `json:"type"`
+	} `json:"parameters,omitempty"`
+	Property *struct {
+		Name *string                                     `json:"name,omitempty"`
+		Type SQLExpressionGroupByExpressionsPropertyType `json:"type"`
+	} `json:"property,omitempty"`
+	Type  *interface{} `json:"type,omitempty"`
+	union json.RawMessage
+}
+
 // SQLExpressionGroupByType defines model for SQLExpression.GroupBy.Type.
 type SQLExpressionGroupByType string
 
@@ -671,5 +824,32 @@ type SQLExpressionSelectParametersType string
 // SQLExpressionSelectType defines model for SQLExpression.Select.Type.
 type SQLExpressionSelectType string
 
+// SQLExpressionWhereExpressionsParametersType defines model for SQLExpression.Where.Expressions.Parameters.Type.
+type SQLExpressionWhereExpressionsParametersType string
+
+// SQLExpressionWhereExpressionsPropertyType defines model for SQLExpression.Where.Expressions.Property.Type.
+type SQLExpressionWhereExpressionsPropertyType string
+
+// SQLExpressionWhereExpressionsItem defines model for SQLExpression.Where.Expressions.Item.
+type SQLExpressionWhereExpressionsItem struct {
+	Name *string `json:"name,omitempty"`
+
+	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
+	Operator *struct {
+		Name  *string      `json:"name,omitempty"`
+		Value *interface{} `json:"value,omitempty"`
+	} `json:"operator,omitempty"`
+	Parameters []struct {
+		Name *string                                     `json:"name,omitempty"`
+		Type SQLExpressionWhereExpressionsParametersType `json:"type"`
+	} `json:"parameters,omitempty"`
+	Property *struct {
+		Name *string                                   `json:"name,omitempty"`
+		Type SQLExpressionWhereExpressionsPropertyType `json:"type"`
+	} `json:"property,omitempty"`
+	Type  *interface{} `json:"type,omitempty"`
+	union json.RawMessage
+}
+
 // SQLExpressionWhereType defines model for SQLExpression.Where.Type.
 type SQLExpressionWhereType string
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts
index 89eda4b3842..70a8e358eff 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts
@@ -13,13 +13,13 @@ import {
 export function createArray(
   expressions: QueryEditorExpression[],
   type: QueryEditorExpressionType.And | QueryEditorExpressionType.Or = QueryEditorExpressionType.And
-): QueryEditorArrayExpression {
+) {
   const array = {
     type,
     expressions,
   };
 
-  return array;
+  return array as QueryEditorArrayExpression;
 }
 
 export function createOperator(property: string, operator: string, value?: string): QueryEditorOperatorExpression {
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.cue b/public/app/plugins/datasource/cloudwatch/dataquery.cue
index 06f2d85d4eb..c9f9d19bfbc 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.cue
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.cue
@@ -121,9 +121,8 @@ composableKinds: DataQuery: {
 						#QueryEditorPropertyType: "string" @cuetsy(kind="enum")
 
 						#QueryEditorArrayExpression: {
-							type: (#QueryEditorExpressionType & "and") | (#QueryEditorExpressionType & "or")
-							// TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-							expressions: _
+							type:        (#QueryEditorExpressionType & "and") | (#QueryEditorExpressionType & "or")
+							expressions: [...#QueryEditorExpression] | [...#QueryEditorArrayExpression]
 						} @cuetsy(kind="interface")
 
 						// QueryEditorArrayExpression is added in veneer
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
index f265a23c393..2f87b0bf4f5 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
@@ -139,10 +139,7 @@ export enum QueryEditorPropertyType {
 }
 
 export interface QueryEditorArrayExpression {
-  /**
-   * TS type expressions: QueryEditorExpression[] | QueryEditorArrayExpression[], extended in veneer
-   */
-  expressions: unknown;
+  expressions: (Array<QueryEditorExpression> | Array<QueryEditorArrayExpression>);
   type: (QueryEditorExpressionType.And | QueryEditorExpressionType.Or);
 }
 
diff --git a/public/app/plugins/datasource/cloudwatch/expressions.ts b/public/app/plugins/datasource/cloudwatch/expressions.ts
index 43fd1a3ff33..a8e13f8fd8a 100644
--- a/public/app/plugins/datasource/cloudwatch/expressions.ts
+++ b/public/app/plugins/datasource/cloudwatch/expressions.ts
@@ -3,8 +3,8 @@ import {
   QueryEditorOperator as QueryEditorOperatorBase,
   QueryEditorOperatorValueType,
   QueryEditorExpressionType,
-  QueryEditorArrayExpression as QueryEditorArrayExpressionBase,
   QueryEditorExpression as QueryEditorExpressionBase,
+  QueryEditorArrayExpression,
 } from './dataquery.gen';
 export {
   QueryEditorPropertyType,
@@ -13,6 +13,7 @@ export {
   QueryEditorGroupByExpression,
   QueryEditorFunctionExpression,
   QueryEditorFunctionParameterExpression,
+  QueryEditorArrayExpression,
 } from './dataquery.gen';
 
 export { QueryEditorExpressionType };
@@ -25,9 +26,4 @@ export interface QueryEditorOperatorExpression extends QueryEditorOperatorExpres
   operator: QueryEditorOperator<QueryEditorOperatorValueType>;
 }
 
-export interface QueryEditorArrayExpression extends QueryEditorArrayExpressionBase {
-  type: QueryEditorExpressionType.And | QueryEditorExpressionType.Or;
-  expressions: QueryEditorExpression[] | QueryEditorArrayExpression[];
-}
-
 export type QueryEditorExpression = QueryEditorArrayExpression | QueryEditorExpressionBase;
diff --git a/public/app/plugins/datasource/cloudwatch/types.ts b/public/app/plugins/datasource/cloudwatch/types.ts
index 3e9e8098c38..efc9a18163c 100644
--- a/public/app/plugins/datasource/cloudwatch/types.ts
+++ b/public/app/plugins/datasource/cloudwatch/types.ts
@@ -3,28 +3,17 @@ import { DataFrame, DataSourceRef } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 
 import * as raw from './dataquery.gen';
-import { QueryEditorArrayExpression } from './expressions';
 
 export * from './dataquery.gen';
 
-// QueryEditorArrayExpression has a recursive property, so cannot be defined in cue
-export interface SQLExpression extends raw.SQLExpression {
-  where?: QueryEditorArrayExpression;
-  groupBy?: QueryEditorArrayExpression;
-}
-
 export type CloudWatchQuery =
-  | CloudWatchMetricsQuery
+  | raw.CloudWatchMetricsQuery
   | raw.CloudWatchLogsQuery
   | raw.CloudWatchAnnotationQuery
   | CloudWatchDefaultQuery;
 
-export interface CloudWatchMetricsQuery extends raw.CloudWatchMetricsQuery {
-  sql?: SQLExpression;
-}
-
 // We want to allow setting defaults for both Logs and Metrics queries
-export type CloudWatchDefaultQuery = Omit<raw.CloudWatchLogsQuery, 'queryMode'> & CloudWatchMetricsQuery;
+export type CloudWatchDefaultQuery = Omit<raw.CloudWatchLogsQuery, 'queryMode'> & raw.CloudWatchMetricsQuery;
 
 export interface MultiFilters {
   [key: string]: string[];

From a113d94bbb2f9609b84a86a98f3455597367af04 Mon Sep 17 00:00:00 2001
From: Santiago <santiagohernandez.1997@gmail.com>
Date: Tue, 18 Apr 2023 03:01:52 -0300
Subject: [PATCH 195/729] Docs: Un-draft 'Configure Integrations' docs (#66699)

* Docs: Un-draft 'Configure Integrations' docs

* fix typo
---
 .../manage-contact-points/configure-integrations.md            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/sources/alerting/manage-notifications/manage-contact-points/configure-integrations.md b/docs/sources/alerting/manage-notifications/manage-contact-points/configure-integrations.md
index e462c5d20c9..8c28bfda42e 100644
--- a/docs/sources/alerting/manage-notifications/manage-contact-points/configure-integrations.md
+++ b/docs/sources/alerting/manage-notifications/manage-contact-points/configure-integrations.md
@@ -1,6 +1,5 @@
 ---
 description: Configure integrations
-draft: true
 keywords:
   - Grafana
   - alerting
@@ -14,7 +13,7 @@ weight: 100
 
 # Configure integrations
 
-Configure integrations in Grafana to select your preferred communication channel for receiving notifications when your alert rules are fire. Each integration has its own configuration options and setup process. In most cases, this involves providing an API key or a Webhook URL.
+Configure integrations in Grafana to select your preferred communication channel for receiving notifications when your alert rules are firing. Each integration has its own configuration options and setup process. In most cases, this involves providing an API key or a Webhook URL.
 
 Once configured, you can use integrations as part of your contact points to receive notifications whenever your alert changes its state. In this section, we'll cover the basic steps to configure your integrations, so you can start receiving real-time alerts and stay on top of your monitoring data.
 

From 58e3b3a90ef1ae3fa9aee0007e4aa4880c47c1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Dauphin?= <dauphin.sebastien@gmail.com>
Date: Tue, 18 Apr 2023 02:11:54 -0400
Subject: [PATCH 196/729] Update index.md (#66698)

The useful links were down as they were using /docs/grafana/next/ instead of /docs/grafana/latest/ in the path
---
 docs/sources/alerting/fundamentals/contact-points/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/alerting/fundamentals/contact-points/index.md b/docs/sources/alerting/fundamentals/contact-points/index.md
index 63a8a8f858c..6c7a3e4608b 100644
--- a/docs/sources/alerting/fundamentals/contact-points/index.md
+++ b/docs/sources/alerting/fundamentals/contact-points/index.md
@@ -54,6 +54,6 @@ The following table lists the contact point integrations supported by Grafana.
 
 ## Useful links
 
-[Manage contact points](/docs/grafana/next/alerting/manage-notifications/create-contact-point/)
+[Manage contact points](/docs/grafana/latest/alerting/manage-notifications/create-contact-point/)
 
-[Create and edit notification templates](/docs/grafana/next/alerting/manage-notifications/create-message-template/)
+[Create and edit notification templates](/docs/grafana/latest/alerting/manage-notifications/template-notifications/create-notification-templates/)

From c22c31ed13175ca4813b5d1f0556d6532c0cda1d Mon Sep 17 00:00:00 2001
From: Levente Balogh <balogh.levente.hu@gmail.com>
Date: Tue, 18 Apr 2023 08:15:35 +0200
Subject: [PATCH 197/729] Plugins: Fix plugin catalog filtering (#66663)

* fix: make the filters work together

* tests: add more tests
---
 .../plugins/admin/components/SearchField.tsx  |  2 +
 .../plugins/admin/pages/Browse.test.tsx       | 37 ++++++++++
 .../features/plugins/admin/pages/Browse.tsx   |  2 +-
 .../plugins/admin/state/selectors.test.ts     | 69 +++++++++++++++++++
 .../features/plugins/admin/state/selectors.ts | 54 +++++++--------
 5 files changed, 136 insertions(+), 28 deletions(-)
 create mode 100644 public/app/features/plugins/admin/state/selectors.test.ts

diff --git a/public/app/features/plugins/admin/components/SearchField.tsx b/public/app/features/plugins/admin/components/SearchField.tsx
index c251f34b1cc..64866968616 100644
--- a/public/app/features/plugins/admin/components/SearchField.tsx
+++ b/public/app/features/plugins/admin/components/SearchField.tsx
@@ -20,6 +20,7 @@ const useDebounceWithoutFirstRender = (callBack: () => any, delay = 0, deps: Rea
         isFirstRender.current = false;
         return;
       }
+      console.log('--------- DEBUOUNCE');
       return callBack();
     },
     delay,
@@ -42,6 +43,7 @@ export const SearchField = ({ value, onSearch }: Props) => {
       }}
       placeholder="Search Grafana plugins"
       onChange={(value) => {
+        console.log('--------- ONCHANGE', value);
         setQuery(value);
       }}
       width={46}
diff --git a/public/app/features/plugins/admin/pages/Browse.test.tsx b/public/app/features/plugins/admin/pages/Browse.test.tsx
index b3da8c31164..554556330d8 100644
--- a/public/app/features/plugins/admin/pages/Browse.test.tsx
+++ b/public/app/features/plugins/admin/pages/Browse.test.tsx
@@ -207,6 +207,43 @@ describe('Browse list of plugins', () => {
       expect(queryByText('Plugin 2')).not.toBeInTheDocument();
       expect(queryByText('Plugin 3')).not.toBeInTheDocument();
     });
+
+    it('should be possible to filter plugins by type', async () => {
+      const { queryByText } = renderBrowse('/plugins?filterByType=datasource&filterBy=all', [
+        getCatalogPluginMock({ id: 'plugin-1', name: 'Plugin 1', type: PluginType.app }),
+        getCatalogPluginMock({ id: 'plugin-2', name: 'Plugin 2', type: PluginType.app }),
+        getCatalogPluginMock({ id: 'plugin-3', name: 'Plugin 3', type: PluginType.datasource }),
+      ]);
+      await waitFor(() => expect(queryByText('Plugin 3')).toBeInTheDocument());
+      // Other plugin types shouldn't be shown
+      expect(queryByText('Plugin 1')).not.toBeInTheDocument();
+      expect(queryByText('Plugin 2')).not.toBeInTheDocument();
+    });
+
+    it('should be possible to filter plugins both by type and a keyword', async () => {
+      const { queryByText } = renderBrowse('/plugins?filterByType=datasource&filterBy=all&q=Foo', [
+        getCatalogPluginMock({ id: 'plugin-1', name: 'Plugin 1', type: PluginType.app }),
+        getCatalogPluginMock({ id: 'plugin-2', name: 'Plugin 2', type: PluginType.datasource }),
+        getCatalogPluginMock({ id: 'plugin-3', name: 'Foo plugin', type: PluginType.datasource }),
+      ]);
+      await waitFor(() => expect(queryByText('Foo plugin')).toBeInTheDocument());
+      // Other plugin types shouldn't be shown
+      expect(queryByText('Plugin 1')).not.toBeInTheDocument();
+      expect(queryByText('Plugin 2')).not.toBeInTheDocument();
+    });
+
+    it('should list all available plugins if the keyword is empty', async () => {
+      const { queryByText } = renderBrowse('/plugins?filterBy=all&q=', [
+        getCatalogPluginMock({ id: 'plugin-1', name: 'Plugin 1', type: PluginType.app }),
+        getCatalogPluginMock({ id: 'plugin-2', name: 'Plugin 2', type: PluginType.panel }),
+        getCatalogPluginMock({ id: 'plugin-3', name: 'Plugin 3', type: PluginType.datasource }),
+      ]);
+
+      // We did not filter for any specific plugin type, so all plugins should be shown
+      await waitFor(() => expect(queryByText('Plugin 1')).toBeInTheDocument());
+      expect(queryByText('Plugin 2')).toBeInTheDocument();
+      expect(queryByText('Plugin 3')).toBeInTheDocument();
+    });
   });
 
   describe('when sorting', () => {
diff --git a/public/app/features/plugins/admin/pages/Browse.tsx b/public/app/features/plugins/admin/pages/Browse.tsx
index 62cb83ba6dc..61cb863e675 100644
--- a/public/app/features/plugins/admin/pages/Browse.tsx
+++ b/public/app/features/plugins/admin/pages/Browse.tsx
@@ -55,7 +55,7 @@ export default function Browse({ route }: GrafanaRouteComponentProps): ReactElem
   };
 
   const onSearch = (q: string) => {
-    history.push({ query: { filterBy: 'all', filterByType: 'all', q } });
+    history.push({ query: { filterBy, filterByType, q } });
   };
 
   // How should we handle errors?
diff --git a/public/app/features/plugins/admin/state/selectors.test.ts b/public/app/features/plugins/admin/state/selectors.test.ts
new file mode 100644
index 00000000000..c038a4930f2
--- /dev/null
+++ b/public/app/features/plugins/admin/state/selectors.test.ts
@@ -0,0 +1,69 @@
+import { PluginType } from '@grafana/data';
+import { configureStore } from 'app/store/configureStore';
+
+import { getCatalogPluginMock, getPluginsStateMock } from '../__mocks__';
+
+import { find } from './selectors';
+
+describe('Plugins Selectors', () => {
+  describe('find()', () => {
+    const store = configureStore({
+      plugins: getPluginsStateMock([
+        getCatalogPluginMock({ id: 'plugin-1', name: 'Plugin 1', isInstalled: true, type: PluginType.datasource }),
+        getCatalogPluginMock({ id: 'plugin-2', name: 'Plugin 2', isInstalled: true, type: PluginType.datasource }),
+        getCatalogPluginMock({ id: 'plugin-3', name: 'Plugin 3', isInstalled: true, type: PluginType.panel }),
+        getCatalogPluginMock({ id: 'plugin-4', name: 'Plugin 4', isInstalled: false, type: PluginType.panel }),
+        getCatalogPluginMock({ id: 'plugin-5', name: 'Plugin 5', isInstalled: true, type: PluginType.app }),
+      ]),
+    });
+
+    it('should return all plugins if there are no filters', () => {
+      const query = '';
+      const filterBy = 'all';
+      const filterByType = 'all';
+      const results = find(query, filterBy, filterByType)(store.getState());
+
+      expect(results).toHaveLength(5);
+    });
+
+    it('should be possible to search only by the "query"', () => {
+      const query = 'Plugin 3';
+      const filterBy = 'all';
+      const filterByType = 'all';
+      const results = find(query, filterBy, filterByType)(store.getState());
+
+      expect(results).toHaveLength(1);
+      expect(results[0].name).toBe('Plugin 3');
+    });
+
+    it('should be possible to search by plugin type', () => {
+      const query = '';
+      const filterBy = 'all';
+      const filterByType = PluginType.panel;
+      const results = find(query, filterBy, filterByType)(store.getState());
+
+      expect(results).toHaveLength(2);
+      expect(results.map(({ name }) => name)).toEqual(['Plugin 3', 'Plugin 4']);
+    });
+
+    it('should be possible to search by plugin state (installed / all)', () => {
+      const query = '';
+      const filterBy = 'installed';
+      const filterByType = 'all';
+      const results = find(query, filterBy, filterByType)(store.getState());
+
+      expect(results).toHaveLength(4);
+      expect(results.map(({ name }) => name)).toEqual(['Plugin 1', 'Plugin 2', 'Plugin 3', 'Plugin 5']);
+    });
+
+    it('should be possible to search by multiple filters', () => {
+      const query = '2';
+      const filterBy = 'all';
+      const filterByType = PluginType.datasource;
+      const results = find(query, filterBy, filterByType)(store.getState());
+
+      expect(results).toHaveLength(1);
+      expect(results[0].name).toBe('Plugin 2');
+    });
+  });
+});
diff --git a/public/app/features/plugins/admin/state/selectors.ts b/public/app/features/plugins/admin/state/selectors.ts
index 1b84ff6cd60..f6068facdd8 100644
--- a/public/app/features/plugins/admin/state/selectors.ts
+++ b/public/app/features/plugins/admin/state/selectors.ts
@@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
 
 import { PluginError, PluginErrorCode, unEscapeStringFromRegex } from '@grafana/data';
 
-import { RequestStatus, PluginCatalogStoreState } from '../types';
+import { RequestStatus, PluginCatalogStoreState, CatalogPlugin } from '../types';
 
 import { pluginsAdapter } from './reducer';
 
@@ -14,43 +14,43 @@ export const selectDisplayMode = createSelector(selectRoot, ({ settings }) => se
 
 export const { selectAll, selectById } = pluginsAdapter.getSelectors(selectItems);
 
-const selectInstalled = (filterBy: string) =>
+const findByState = (state: string) =>
   createSelector(selectAll, (plugins) =>
-    plugins.filter((plugin) => (filterBy === 'installed' ? plugin.isInstalled : !plugin.isCore))
+    plugins.filter((plugin) => (state === 'installed' ? plugin.isInstalled : !plugin.isCore))
   );
 
-const findByInstallAndType = (filterBy: string, filterByType: string) =>
-  createSelector(selectInstalled(filterBy), (plugins) =>
-    plugins.filter((plugin) => filterByType === 'all' || plugin.type === filterByType)
+type PluginFilters = {
+  state: string;
+  type: string;
+};
+
+const findPluginsByFilters = (filters: PluginFilters) =>
+  createSelector(findByState(filters.state), (plugins) =>
+    plugins.filter((plugin) => filters.type === 'all' || plugin.type === filters.type)
   );
 
-const findByKeyword = (searchBy: string) =>
-  createSelector(selectAll, (plugins) => {
-    if (searchBy === '') {
-      return [];
+const findByKeyword = (plugins: CatalogPlugin[], query: string) => {
+  if (query === '') {
+    return plugins;
+  }
+
+  return plugins.filter((plugin) => {
+    const fields: String[] = [];
+    if (plugin.name) {
+      fields.push(plugin.name.toLowerCase());
     }
 
-    return plugins.filter((plugin) => {
-      const fields: String[] = [];
-      if (plugin.name) {
-        fields.push(plugin.name.toLowerCase());
-      }
+    if (plugin.orgName) {
+      fields.push(plugin.orgName.toLowerCase());
+    }
 
-      if (plugin.orgName) {
-        fields.push(plugin.orgName.toLowerCase());
-      }
-
-      return fields.some((f) => f.includes(unEscapeStringFromRegex(searchBy).toLowerCase()));
-    });
+    return fields.some((f) => f.includes(unEscapeStringFromRegex(query).toLowerCase()));
   });
+};
 
 export const find = (searchBy: string, filterBy: string, filterByType: string) =>
-  createSelector(
-    findByInstallAndType(filterBy, filterByType),
-    findByKeyword(searchBy),
-    (filteredPlugins, searchedPlugins) => {
-      return searchBy === '' ? filteredPlugins : searchedPlugins;
-    }
+  createSelector(findPluginsByFilters({ state: filterBy, type: filterByType }), (filteredPlugins) =>
+    findByKeyword(filteredPlugins, searchBy)
   );
 
 export const selectPluginErrors = createSelector(selectAll, (plugins) =>

From cdb49887d80f25a725ab388fcac9c3549cebb275 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 17 Apr 2023 23:45:14 -0700
Subject: [PATCH 198/729] HelpWizard: Use scenes to render dashboard inline
 dashboard (#64936)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .../components/HelpWizard/HelpWizard.tsx      | 23 ++----------
 .../HelpWizard/SupportSnapshotService.ts      | 36 +++++++++----------
 .../dashboard/components/HelpWizard/utils.ts  |  2 +-
 3 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx b/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
index ddece468a35..f2af5932fbf 100644
--- a/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
+++ b/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
@@ -42,7 +42,6 @@ export function HelpWizard({ panel, plugin, onClose }: Props) {
     currentTab,
     loading,
     error,
-    iframeLoading,
     options,
     showMessage,
     snapshotSize,
@@ -50,18 +49,13 @@ export function HelpWizard({ panel, plugin, onClose }: Props) {
     snapshotText,
     randomize,
     panelTitle,
-    snapshotUpdate,
+    scene,
   } = service.useState();
 
   useEffect(() => {
     service.buildDebugDashboard();
   }, [service, plugin, randomize]);
 
-  useEffect(() => {
-    // Listen for messages from loaded iframe
-    return service.subscribeToIframeLoadingMessage();
-  }, [service]);
-
   if (!plugin) {
     return null;
   }
@@ -211,20 +205,7 @@ export function HelpWizard({ panel, plugin, onClose }: Props) {
 
           <AutoSizer disableWidth>
             {({ height }) => (
-              <>
-                <iframe
-                  title="Support snapshot preview"
-                  src={`${config.appUrl}dashboard/new?orgId=${contextSrv.user.orgId}&kiosk&${snapshotUpdate}`}
-                  width="100%"
-                  height={height - 100}
-                  frameBorder="0"
-                  style={{
-                    display: iframeLoading ? 'block' : 'none',
-                    marginTop: 16,
-                  }}
-                />
-                {!iframeLoading && <div>&nbsp;</div>}
-              </>
+              <div style={{ height, overflow: 'auto' }}>{scene && <scene.Component model={scene} />}</div>
             )}
           </AutoSizer>
         </>
diff --git a/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.ts b/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.ts
index 65f4edaa761..befcd123874 100644
--- a/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.ts
+++ b/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.ts
@@ -2,10 +2,12 @@ import saveAs from 'file-saver';
 
 import { dateTimeFormat, formattedValueToString, getValueFormat, SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
+import { SceneObject } from '@grafana/scenes';
 import { StateManagerBase } from 'app/core/services/StateManagerBase';
+import { createDashboardSceneFromDashboardModel } from 'app/features/scenes/dashboard/DashboardsLoader';
 
 import { getTimeSrv } from '../../services/TimeSrv';
-import { PanelModel } from '../../state';
+import { DashboardModel, PanelModel } from '../../state';
 import { setDashboardToFetchFromLocalStorage } from '../../state/initDashboard';
 
 import { Randomize } from './randomizer';
@@ -19,7 +21,6 @@ interface SupportSnapshotState {
   markdownText: string;
   snapshotSize?: string;
   randomize: Randomize;
-  iframeLoading?: boolean;
   loading?: boolean;
   error?: {
     title: string;
@@ -31,6 +32,7 @@ interface SupportSnapshotState {
   // eslint-disable-next-line
   snapshot?: any;
   snapshotUpdate: number;
+  scene?: SceneObject;
 }
 
 export enum SnapshotTab {
@@ -70,17 +72,25 @@ export class SupportSnapshotService extends StateManagerBase<SupportSnapshotStat
   }
 
   async buildDebugDashboard() {
-    const { panel, randomize, snapshotUpdate, iframeLoading, currentTab } = this.state;
+    const { panel, randomize, snapshotUpdate } = this.state;
     const snapshot = await getDebugDashboard(panel, randomize, getTimeSrv().timeRange());
     const snapshotText = JSON.stringify(snapshot, null, 2);
     const markdownText = getGithubMarkdown(panel, snapshotText);
     const snapshotSize = formattedValueToString(getValueFormat('bytes')(snapshotText?.length ?? 0));
 
-    if (iframeLoading && currentTab === SnapshotTab.Support) {
-      setDashboardToFetchFromLocalStorage({ meta: {}, dashboard: snapshot });
+    let scene: SceneObject | undefined = undefined;
+
+    if (config.featureToggles.scenes && !panel.isAngularPlugin()) {
+      try {
+        const oldModel = new DashboardModel(snapshot);
+        const dash = createDashboardSceneFromDashboardModel(oldModel);
+        scene = dash.state.body; // skip the wrappers
+      } catch (ex) {
+        console.log('Error creating scene:', ex);
+      }
     }
 
-    this.setState({ snapshot, snapshotText, markdownText, snapshotSize, snapshotUpdate: snapshotUpdate + 1 });
+    this.setState({ snapshot, snapshotText, markdownText, snapshotSize, snapshotUpdate: snapshotUpdate + 1, scene });
   }
 
   onCurrentTabChange = (value: SnapshotTab) => {
@@ -134,18 +144,4 @@ export class SupportSnapshotService extends StateManagerBase<SupportSnapshotStat
       global.open(config.appUrl + 'dashboard/new', '_blank');
     }
   };
-
-  subscribeToIframeLoadingMessage() {
-    const handleEvent = (evt: MessageEvent<string>) => {
-      if (evt.data === 'GrafanaAppInit') {
-        setDashboardToFetchFromLocalStorage({ meta: {}, dashboard: this.state.snapshot });
-        this.setState({ iframeLoading: true });
-      }
-    };
-    window.addEventListener('message', handleEvent, false);
-
-    return function cleanup() {
-      window.removeEventListener('message', handleEvent);
-    };
-  }
 }
diff --git a/public/app/features/dashboard/components/HelpWizard/utils.ts b/public/app/features/dashboard/components/HelpWizard/utils.ts
index f51bc33899a..75fc65c3202 100644
--- a/public/app/features/dashboard/components/HelpWizard/utils.ts
+++ b/public/app/features/dashboard/components/HelpWizard/utils.ts
@@ -182,7 +182,7 @@ function getTransformsRow(saveModel: any): string {
     return '';
   }
   return `<tr>
-      <th>Transforms (${saveModel.transformations.length})</th>
+      <th>Transform</th>
       <td>${saveModel.transformations.map((t: DataTransformerConfig) => t.id).join(', ')}</td>
   </tr>`;
 }

From 652fd8889efbb3578f62a7e6bff2b2d6becb1c28 Mon Sep 17 00:00:00 2001
From: Levente Balogh <balogh.levente.hu@gmail.com>
Date: Tue, 18 Apr 2023 09:59:11 +0200
Subject: [PATCH 199/729] Chore: Remove accidental console.log statements
 (#66725)

chore: remove accidental console.log statements
---
 public/app/features/plugins/admin/components/SearchField.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/app/features/plugins/admin/components/SearchField.tsx b/public/app/features/plugins/admin/components/SearchField.tsx
index 64866968616..c251f34b1cc 100644
--- a/public/app/features/plugins/admin/components/SearchField.tsx
+++ b/public/app/features/plugins/admin/components/SearchField.tsx
@@ -20,7 +20,6 @@ const useDebounceWithoutFirstRender = (callBack: () => any, delay = 0, deps: Rea
         isFirstRender.current = false;
         return;
       }
-      console.log('--------- DEBUOUNCE');
       return callBack();
     },
     delay,
@@ -43,7 +42,6 @@ export const SearchField = ({ value, onSearch }: Props) => {
       }}
       placeholder="Search Grafana plugins"
       onChange={(value) => {
-        console.log('--------- ONCHANGE', value);
         setQuery(value);
       }}
       width={46}

From efa641040dfce47882b6a435b29f4ee2b024e527 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Tue, 18 Apr 2023 10:19:37 +0200
Subject: [PATCH 200/729] Build: Improve NPM publishing (#65171)

* chore(packages): remove redundant npm scripts for publishing packages

* feat(packages): rewrite npm publishing script to work for manual and ci publishes

* ci(drone): update release-canary-npm-packages step to use new script

* docs(packages): update manual release instructions

* wip(packages): attempt to validate packed npm package

* fix(packages): release-canary-npm-packages should provide canary dist-tag

* ci(packages): clean up npm package validation script

* chore(devenv): add verdaccio config to allow anon publishing for easier dev npm testing

* ci(packages): clean up publishing script

* ci(drone): during build-frontend-packages, pack and validate packed tarballs

* chore(codeowners): update for publish/validate npm packages scripts

* ci(packages): fix esm loop bug matching e2e package

* ci(npm-packages): fix failing regex

* style(lib.star): run make format-drone

* style(npm-packages): shellcheck fixes for validate-npm-packages script

* docs(packages): update readme instructions for publishing locally and manually

* refactor(npm-publish): use drone when to trigger canary releases

* chore(drone): remove redundant trigger_npm_publish var

* chore(npm-publish): remove redundant echo
---
 .drone.yml                                |  17 +-
 .github/CODEOWNERS                        |   2 +
 .gitignore                                |   2 +-
 devenv/local-npm/conf/config.yaml         | 202 ++++++++++++++++++++++
 devenv/local-npm/docker-compose.yaml      |   2 +-
 package.json                              |   6 -
 packages/README.md                        |  37 ++--
 scripts/circle-release-canary-packages.sh |  24 ---
 scripts/drone/steps/lib.star              |  16 +-
 scripts/publish-npm-packages.sh           |  44 +++++
 scripts/validate-npm-packages.sh          |  80 +++++++++
 11 files changed, 378 insertions(+), 54 deletions(-)
 create mode 100644 devenv/local-npm/conf/config.yaml
 delete mode 100755 scripts/circle-release-canary-packages.sh
 create mode 100755 scripts/publish-npm-packages.sh
 create mode 100755 scripts/validate-npm-packages.sh

diff --git a/.drone.yml b/.drone.yml
index 19ae07730d5..12c44b520d1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -571,6 +571,8 @@ steps:
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
+  - yarn packages:pack
+  - ./scripts/validate-npm-packages.sh
   depends_on:
   - compile-build-cmd
   - yarn-install
@@ -1458,6 +1460,8 @@ steps:
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
+  - yarn packages:pack
+  - ./scripts/validate-npm-packages.sh
   depends_on:
   - compile-build-cmd
   - yarn-install
@@ -1734,7 +1738,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./scripts/circle-release-canary-packages.sh
+  - ./scripts/publish-npm-packages.sh --dist-tag 'canary' --registry 'https://registry.npmjs.org/'
   depends_on:
   - end-to-end-tests-dashboards-suite
   - end-to-end-tests-panels-suite
@@ -1746,6 +1750,9 @@ steps:
   image: grafana/build-container:1.7.3
   name: release-canary-npm-packages
   when:
+    paths:
+      include:
+      - packages/**
     repo:
     - grafana/grafana
 - commands:
@@ -4685,6 +4692,8 @@ steps:
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
+  - yarn packages:pack
+  - ./scripts/validate-npm-packages.sh
   depends_on:
   - compile-build-cmd
   - yarn-install
@@ -5328,6 +5337,8 @@ steps:
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
+  - yarn packages:pack
+  - ./scripts/validate-npm-packages.sh
   depends_on:
   - compile-build-cmd
   - yarn-install
@@ -6049,6 +6060,8 @@ steps:
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
+  - yarn packages:pack
+  - ./scripts/validate-npm-packages.sh
   depends_on:
   - compile-build-cmd
   - yarn-install
@@ -6810,6 +6823,6 @@ kind: secret
 name: enterprise2_security_prefix
 ---
 kind: signature
-hmac: d3567c954d0ac9f1f47d55bc85eb6594379c888fe591428f2dcd0146f2bd3ca2
+hmac: 7f282aaf4f3ba496f2d954241a16afd2facbf2cf1ef04dfb75cfec1b42fd39d1
 
 ...
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 07c06825e28..2d551c7a4df 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -455,6 +455,8 @@ lerna.json @grafana/frontend-ops
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
 /scripts/ci-* @grafana/grafana-delivery
 /scripts/circle-* @grafana/grafana-delivery
+/scripts/publish-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
+/scripts/validate-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
 /scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
 /scripts/cli/ @grafana/grafana-frontend-platform
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
diff --git a/.gitignore b/.gitignore
index 39b7a1e2ae4..fbfb6a6396f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,7 +139,7 @@ pkg/services/quota/quotaimpl/storage/storage.json
 /packages/**/package.tgz
 /packages/grafana-toolkit/sass
 ## CI places the packages in a different location
-/npm-artifacts/*.tgz
+/npm-artifacts
 
 # Ignore frontend build manifest
 manifest.json
diff --git a/devenv/local-npm/conf/config.yaml b/devenv/local-npm/conf/config.yaml
new file mode 100644
index 00000000000..26686016f46
--- /dev/null
+++ b/devenv/local-npm/conf/config.yaml
@@ -0,0 +1,202 @@
+#
+# This is the default configuration file. It allows all users to do anything,
+# please read carefully the documentation and best practices to
+# improve security.
+#
+# Do not configure host and port under `listen` in this file
+# as it will be ignored when using docker.
+# see https://verdaccio.org/docs/en/docker#docker-and-custom-port-configuration
+#
+# Look here for more config file examples:
+# https://github.com/verdaccio/verdaccio/tree/5.x/conf
+#
+# Read about the best practices
+# https://verdaccio.org/docs/best
+
+# path to a directory with all packages
+storage: /verdaccio/storage/data
+# path to a directory with plugins to include
+plugins: /verdaccio/plugins
+
+# https://verdaccio.org/docs/webui
+web:
+  title: Verdaccio
+  # comment out to disable gravatar support
+  # gravatar: false
+  # by default packages are ordercer ascendant (asc|desc)
+  # sort_packages: asc
+  # convert your UI to the dark side
+  # darkMode: true
+  # html_cache: true
+  # by default all features are displayed
+  # login: true
+  # showInfo: true
+  # showSettings: true
+  # In combination with darkMode you can force specific theme
+  # showThemeSwitch: true
+  # showFooter: true
+  # showSearch: true
+  # showRaw: true
+  # showDownloadTarball: true
+  #  HTML tags injected after manifest <scripts/>
+  # scriptsBodyAfter:
+  #    - '<script type="text/javascript" src="https://my.company.com/customJS.min.js"></script>'
+  #  HTML tags injected before ends </head>
+  #  metaScripts:
+  #    - '<script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>'
+  #    - '<script type="text/javascript" src="https://browser.sentry-cdn.com/5.15.5/bundle.min.js"></script>'
+  #    - '<meta name="robots" content="noindex" />'
+  #  HTML tags injected first child at <body/>
+  #  bodyBefore:
+  #    - '<div id="myId">html before webpack scripts</div>'
+  #  Public path for template manifest scripts (only manifest)
+  #  publicPath: http://somedomain.org/
+
+# https://verdaccio.org/docs/configuration#authentication
+auth:
+  htpasswd:
+    file: /verdaccio/storage/htpasswd
+    # Maximum amount of users allowed to register, defaults to "+infinity".
+    # You can set this to -1 to disable registration.
+    # max_users: 1000
+    # Hash algorithm, possible options are: "bcrypt", "md5", "sha1", "crypt".
+    # algorithm: bcrypt # by default is crypt, but is recommended use bcrypt for new installations
+    # Rounds number for "bcrypt", will be ignored for other algorithms.
+    # rounds: 10
+
+# https://verdaccio.org/docs/configuration#uplinks
+# a list of other known repositories we can talk to
+uplinks:
+  npmjs:
+    url: https://registry.npmjs.org/
+
+# Learn how to protect your packages
+# https://verdaccio.org/docs/protect-your-dependencies/
+# https://verdaccio.org/docs/configuration#packages
+packages:
+  '@*/*':
+    # allow all users (including non-authenticated users) to read and
+    # publish scoped packages
+    access: $anonymous
+    publish: $anonymous
+    unpublish: $anonymous
+    proxy: npmjs
+
+  '**':
+    # allow all users (including non-authenticated users) to read and
+    # publish all packages
+    #
+    # you can specify usernames/groupnames (depending on your auth plugin)
+    # and three keywords: "$all", "$anonymous", "$authenticated"
+    access: $anonymous
+
+    # allow all known users to publish/publish packages
+    # (anyone can register by default, remember?)
+    publish: $anonymous
+    unpublish: $anonymous
+
+    # if package is not available locally, proxy requests to 'npmjs' registry
+    proxy: npmjs
+
+# To improve your security configuration and  avoid dependency confusion
+# consider removing the proxy property for private packages
+# https://verdaccio.org/docs/best#remove-proxy-to-increase-security-at-private-packages
+
+# https://verdaccio.org/docs/configuration#server
+# You can specify HTTP/1.1 server keep alive timeout in seconds for incoming connections.
+# A value of 0 makes the http server behave similarly to Node.js versions prior to 8.0.0, which did not have a keep-alive timeout.
+# WORKAROUND: Through given configuration you can workaround following issue https://github.com/verdaccio/verdaccio/issues/301. Set to 0 in case 60 is not enough.
+server:
+  keepAliveTimeout: 60
+  # Allow `req.ip` to resolve properly when Verdaccio is behind a proxy or load-balancer
+  # See: https://expressjs.com/en/guide/behind-proxies.html
+  # trustProxy: '127.0.0.1'
+
+# https://verdaccio.org/docs/configuration#offline-publish
+# publish:
+#   allow_offline: false
+
+# https://verdaccio.org/docs/configuration#url-prefix
+# url_prefix: /verdaccio/
+# VERDACCIO_PUBLIC_URL='https://somedomain.org';
+# url_prefix: '/my_prefix'
+# // url -> https://somedomain.org/my_prefix/
+# VERDACCIO_PUBLIC_URL='https://somedomain.org';
+# url_prefix: '/'
+# // url -> https://somedomain.org/
+# VERDACCIO_PUBLIC_URL='https://somedomain.org/first_prefix';
+# url_prefix: '/second_prefix'
+# // url -> https://somedomain.org/second_prefix/'
+
+# https://verdaccio.org/docs/configuration#security
+# security:
+#   api:
+#     legacy: true
+#     jwt:
+#       sign:
+#         expiresIn: 29d
+#       verify:
+#         someProp: [value]
+#    web:
+#      sign:
+#        expiresIn: 1h # 1 hour by default
+#      verify:
+#         someProp: [value]
+
+# https://verdaccio.org/docs/configuration#user-rate-limit
+# userRateLimit:
+#   windowMs: 50000
+#   max: 1000
+
+# https://verdaccio.org/docs/configuration#max-body-size
+# max_body_size: 10mb
+
+# https://verdaccio.org/docs/configuration#listen-port
+# listen:
+# - localhost:4873            # default value
+# - http://localhost:4873     # same thing
+# - 0.0.0.0:4873              # listen on all addresses (INADDR_ANY)
+# - https://example.org:4873  # if you want to use https
+# - "[::1]:4873"                # ipv6
+# - unix:/tmp/verdaccio.sock    # unix socket
+
+# The HTTPS configuration is useful if you do not consider use a HTTP Proxy
+# https://verdaccio.org/docs/configuration#https
+# https:
+#   key: ./path/verdaccio-key.pem
+#   cert: ./path/verdaccio-cert.pem
+#   ca: ./path/verdaccio-csr.pem
+
+# https://verdaccio.org/docs/configuration#proxy
+# http_proxy: http://something.local/
+# https_proxy: https://something.local/
+
+# https://verdaccio.org/docs/configuration#notifications
+# notify:
+#   method: POST
+#   headers: [{ "Content-Type": "application/json" }]
+#   endpoint: https://usagge.hipchat.com/v2/room/3729485/notification?auth_token=mySecretToken
+#   content: '{"color":"green","message":"New package published: * {{ name }}*","notify":true,"message_format":"text"}'
+
+middlewares:
+  audit:
+    enabled: true
+
+# https://verdaccio.org/docs/logger
+# log settings
+logs: { type: stdout, format: pretty, level: http }
+#experiments:
+#  # support for npm token command
+#  token: false
+#  # enable tarball URL redirect for hosting tarball with a different server, the tarball_url_redirect can be a template string
+#  tarball_url_redirect: 'https://mycdn.com/verdaccio/${packageName}/${filename}'
+#  # the tarball_url_redirect can be a function, takes packageName and filename and returns the url, when working with a js configuration file
+#  tarball_url_redirect(packageName, filename) {
+#    const signedUrl = // generate a signed url
+#    return signedUrl;
+#  }
+
+# translate your registry, api i18n not available yet
+# i18n:
+# list of the available translations https://github.com/verdaccio/verdaccio/blob/master/packages/plugins/ui-theme/src/i18n/ABOUT_TRANSLATIONS.md
+#   web: en-US
\ No newline at end of file
diff --git a/devenv/local-npm/docker-compose.yaml b/devenv/local-npm/docker-compose.yaml
index 1a0acdc8a25..be0ea5220ec 100644
--- a/devenv/local-npm/docker-compose.yaml
+++ b/devenv/local-npm/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
     ports:
       - "4873:4873"
     volumes:
-      - verdaccio:/verdaccio
+      - ./conf:/verdaccio/conf
 
 volumes:
   verdaccio:
diff --git a/package.json b/package.json
index b525589d2e0..0e3fbdef90e 100644
--- a/package.json
+++ b/package.json
@@ -29,12 +29,6 @@
     "packages:clean": "rimraf ./npm-artifacts && lerna run clean --parallel",
     "packages:prepare": "lerna version --no-push --no-git-tag-version --force-publish --exact",
     "packages:pack": "mkdir -p ./npm-artifacts && lerna exec --no-private -- yarn pack --out \"../../npm-artifacts/%s-%v.tgz\"",
-    "packages:publish": "lerna exec --no-private -- npm publish package.tgz",
-    "packages:publishCanary": "lerna exec --no-private -- npm publish package.tgz --tag canary",
-    "packages:publishLatest": "lerna exec --no-private -- npm publish package.tgz",
-    "packages:publishNext": "lerna exec --no-private -- npm publish package.tgz --tag next",
-    "packages:publishTest": "lerna exec --no-private -- npm publish package.tgz --tag test",
-    "packages:publishDev": "lerna exec --no-private -- npm publish package.tgz --tag dev --registry http://localhost:4873",
     "packages:typecheck": "lerna run typecheck",
     "precommit": "yarn run lint-staged",
     "prettier:check": "prettier --check --list-different=false --loglevel=warn \"**/*.{ts,tsx,scss,md,mdx}\"",
diff --git a/packages/README.md b/packages/README.md
index 4fe45149509..6fc9c3cd7b7 100644
--- a/packages/README.md
+++ b/packages/README.md
@@ -36,20 +36,21 @@ Every commit to main that has changes within the `packages` directory is a subje
 
 > All of the steps below must be performed on a release branch, according to Grafana Release Guide.
 
-> Make sure you are logged in to npm in your terminal and that you are a part of Grafana org on npm.
+> You must be logged in to NPM as part of Grafana NPM org before attempting to publish to the npm registery.
 
-1. Run `yarn packages:prepare` script from the root directory. This performs tests on the packages and prompts for the version of the packages. The version should be the same as the one being released.
+1. Run `yarn packages:clean` script from the root directory. This will delete any previous builds of the packages.
+2. Run `yarn packages:prepare` script from the root directory. This performs tests on the packages and prompts for the version of the packages. The version should be the same as the one being released.
    - Make sure you use semver convention. So, _place a dot between prerelease id and prerelease number_, i.e. 6.3.0-alpha.1
    - Make sure you confirm the version bump when prompted!
-2. Run `yarn packages:build` script that compiles distribution code in `packages/grafana-*/dist`.
-3. Run `yarn packages:pack` script to zip each package into `.tgz`. This is required for yarn berry to replace properties in the package.json files declared in `publishConfig`.
-4. Depending whether or not it's a prerelease:
+3. Run `yarn packages:build` script that compiles distribution code in `packages/grafana-*/dist`.
+4. Run `yarn packages:pack` script to compress each package into `npm-artifacts/*.tgz` files. This is required for yarn to replace properties in the package.json files declared in the `publishConfig` property.
+5. Depending on whether or not it's a prerelease:
 
-   - When releasing a prerelease run `packages:publishNext` to publish new versions.
-   - When releasing a stable version run `packages:publishLatest` to publish new versions.
-   - When releasing a test version run `packages:publishTest` to publish test versions.
+   - When releasing a prerelease run `./scripts/publish-npm-packages.sh --dist-tag 'next' --registry 'https://registry.npmjs.org/'` to publish new versions.
+   - When releasing a stable version run `./scripts/publish-npm-packages.sh --dist-tag 'latest' --registry 'https://registry.npmjs.org/'` to publish new versions.
+   - When releasing a test version run `./scripts/publish-npm-packages.sh --dist-tag 'test' --registry 'https://registry.npmjs.org/'` to publish test versions.
 
-5. Push version commit to the release branch.
+6. Revert any changes made by the `packages:prepare` script.
 
 ### Building individual packages
 
@@ -72,21 +73,21 @@ In this guide you will set up [Verdaccio](https://verdaccio.org/) registry local
 From your terminal:
 
 1. Navigate to `devenv/local-npm` directory.
-2. Run `docker-compose up`. This will start your local npm registry, available at http://localhost:4873/
-3. Run `npm login --registry=http://localhost:4873 --scope=@grafana` . This will allow you to publish any @grafana/\* package into the local registry.
-4. Run `npm config set @grafana:registry http://localhost:4873`. This will config your npm to install @grafana scoped packages from your local registry.
+2. Run `docker-compose up`. This will start your local npm registry, available at http://localhost:4873/. Note the verdaccio config allows
+3. To test `@grafana` packages published to your local npm registry uncomment `npmScopes` and `unsafeHttpWhitelist` properties in the `.yarnrc` file.
 
 #### Publishing packages to local npm registry
 
-You need to follow [manual packages release procedure](#manual-release). The only difference is you need to run `yarn packages:publishDev` task in order to publish to you local registry.
+You need to follow [manual packages release procedure](#manual-release). The only difference is the last command in order to publish to you local registry.
 
 From your terminal:
 
-1. Run `yarn packages:prepare`.
-2. Run `yarn packages:build`.
-3. Run `yarn packages:pack`.
-4. Run `yarn packages:publishDev`.
-5. Navigate to http://localhost:4873 and verify that version was published
+1. Run `yarn packages:clean`.
+2. Run `yarn packages:prepare`.
+3. Run `yarn packages:build`.
+4. Run `yarn packages:pack`.
+5. Run `./scripts/publish-npm-packages.sh`.
+6. Navigate to http://localhost:4873 and verify the version was published
 
 Locally published packages will be published under `dev` channel, so in your plugin package.json file you can use that channel. For example:
 
diff --git a/scripts/circle-release-canary-packages.sh b/scripts/circle-release-canary-packages.sh
deleted file mode 100755
index 4487282a782..00000000000
--- a/scripts/circle-release-canary-packages.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-
-# shellcheck source=./scripts/helpers/exit-if-fail.sh
-source "$(dirname "$0")/helpers/exit-if-fail.sh"
-
-# check if there were any changes to packages between current and previous commit
-count=$(git diff HEAD~1..HEAD --name-only -- packages | awk '{c++} END {print c}')
-
-if [ -z "$count" ]; then
-  echo "No changes in packages, skipping packages publishing"
-else
-  echo "Changes detected in ${count} packages"
-  echo "Starting to release latest canary version"
-
-  echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
-
-  echo $'\nPacking packages'
-  yarn packages:pack
-
-  echo $'\nPublishing packages'
-  for file in ./npm-artifacts/*.tgz; do npm publish "$file" --tag canary; done
-
-fi
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index f6d448027f7..3cba0e8da70 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -567,6 +567,8 @@ def build_frontend_package_step(edition, ver_mode):
         cmds = [
             "./bin/build build-frontend-packages --jobs 8 --edition {} ".format(edition) +
             "--build-id {}".format(build_no),
+            "yarn packages:pack",
+            "./scripts/validate-npm-packages.sh",
         ]
 
     return {
@@ -1179,11 +1181,21 @@ def release_canary_npm_packages_step(trigger = None):
             "NPM_TOKEN": from_secret("npm_token"),
         },
         "commands": [
-            "./scripts/circle-release-canary-packages.sh",
+            "./scripts/publish-npm-packages.sh --dist-tag 'canary' --registry 'https://registry.npmjs.org/'",
         ],
     }
     if trigger:
-        step = dict(step, when = trigger)
+        step = dict(
+            step,
+            when = dict(
+                trigger,
+                paths = {
+                    "include": [
+                        "packages/**",
+                    ],
+                },
+            ),
+        )
     return step
 
 def enterprise2_suffix(edition):
diff --git a/scripts/publish-npm-packages.sh b/scripts/publish-npm-packages.sh
new file mode 100755
index 00000000000..2437403626d
--- /dev/null
+++ b/scripts/publish-npm-packages.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Set default values for dist-tag and registry for local development
+# to prevent running this script and accidentally publishing to npm
+dist_tag="canary"
+registry="http://localhost:4873"
+
+# shellcheck source=./scripts/helpers/exit-if-fail.sh
+source "$(dirname "$0")/helpers/exit-if-fail.sh"
+
+if [ -z "$NPM_TOKEN" ]; then
+  echo "The NPM_TOKEN environment variable does not exist."
+  exit 1
+fi
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case $key in
+        --dist-tag)
+        dist_tag="$2"
+        shift # past argument
+        shift # past value
+        ;;
+        --registry)
+        registry="$2"
+        shift # past argument
+        shift # past value
+        ;;
+        *)    # unknown option
+        echo "Unknown option: $1"
+        exit 1
+        ;;
+    esac
+done
+
+echo "Starting to release $dist_tag version"
+
+echo "$registry/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
+
+# Loop over .tar files in directory and publish them to npm registry
+for file in ./npm-artifacts/*.tgz; do
+    npm publish "$file" --tag "$dist_tag" --registry "$registry"
+done
diff --git a/scripts/validate-npm-packages.sh b/scripts/validate-npm-packages.sh
new file mode 100755
index 00000000000..a07ebe5a662
--- /dev/null
+++ b/scripts/validate-npm-packages.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# This script is used to validate the npm packages that are published to npmjs.org are in the correct format.
+# It won't catch things like malformed JS or Types but it will assert that the package has
+# the correct files and package.json properties.
+ARTIFACTS_DIR="./npm-artifacts"
+
+for file in "$ARTIFACTS_DIR"/*.tgz; do
+  echo "🔍 Checking NPM package: $file"
+  # get filename then strip everything after package name.
+  dir_name=$(basename "$file" .tgz | sed 's/^@\(.*\)-[0-9]*[.]*[0-9]*[.]*[0-9]*-\([0-9]*[a-zA-Z]*\)/\1/')
+  mkdir -p "./npm-artifacts/$dir_name"
+  tar -xzf "$file" -C "./npm-artifacts/$dir_name" --strip-components=1
+
+  # Make sure the tar wasn't empty
+  if [ ! -d "./npm-artifacts/$dir_name" ]; then
+    echo -e "❌ Failed: Empty package $dir_name.\n"
+    exit 1
+  fi
+
+  # Navigate inside the new extracted directory
+  pushd "./npm-artifacts/$dir_name" || exit
+
+  # Check for required files
+	check_files=("package.json" "README.md" "CHANGELOG.md" "LICENSE_APACHE2")
+	for check_file in "${check_files[@]}"; do
+		if [ ! -f "$check_file" ]; then
+			echo -e "❌ Failed: Missing required file $check_file in package $dir_name.\n"
+			exit 1
+		fi
+	done
+
+  # @grafana/toolkit structure is different to the other packages
+  if [[ "$dir_name" == "grafana-toolkit" ]]; then
+    if [ ! -d bin ] || [ ! -f bin/grafana-toolkit.js ]; then
+      echo -e "❌ Failed: Missing 'bin' directory or required files in package $dir_name.\n"
+      exit 1
+    fi
+
+    echo -e "✅ Passed: package checks for $file.\n"
+    popd || exit
+    continue
+  fi
+
+  # Assert commonjs builds
+  if [ ! -d dist ] || [ ! -f dist/index.js ] || [ ! -f dist/index.d.ts ]; then
+    echo -e "❌ Failed: Missing 'dist' directory or required commonjs files in package $dir_name.\n"
+    exit 1
+  fi
+
+  if [ "$(jq -r '.main' package.json)" != "dist/index.js" ] || \
+     [ "$(jq -r '.types' package.json)" != "dist/index.d.ts" ]; then
+    echo -e "❌ Failed: Incorrect package.json properties in package $dir_name.\n"
+    exit 1
+  fi
+
+  # Assert esm builds
+  esm_packages=("grafana-data" "grafana-ui" "grafana-runtime" "grafana-e2e-selectors" "grafana-schema")
+  for esm_package in "${esm_packages[@]}"; do
+    if [[ "$dir_name" == "$esm_package" ]]; then
+      if [ ! -d dist/esm ] || [ ! -f dist/esm/index.js ]; then
+        echo -e "❌ Failed: Missing 'dist/esm' directory or required esm files in package $dir_name.\n"
+        exit 1
+      fi
+
+      if [ "$(jq -r '.module' package.json)" != "dist/esm/index.js" ]; then
+        echo -e "❌ Failed: Incorrect package.json properties in package $dir_name.\n"
+        exit 1
+      fi
+    fi
+  done
+
+  echo -e "✅ Passed: package checks for $file.\n"
+  popd || exit
+
+done
+
+echo "🚀 All NPM package checks passed! 🚀"
+rm -rf "${ARTIFACTS_DIR:?}/"*/
+exit 0

From e97befa2215b39e1aa782d66a2441c98b3eddfe6 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Tue, 18 Apr 2023 11:02:37 +0200
Subject: [PATCH 201/729] Fix: NPM canary releases (#66727)

* fix(packages): remove double trailing slash from npmrc credentials

* chore(packages): add new line to storybook config to trigger an npm canary release
---
 .drone.yml                             | 4 ++--
 packages/grafana-ui/.storybook/main.ts | 1 +
 scripts/drone/steps/lib.star           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 12c44b520d1..2fac796ac57 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1738,7 +1738,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./scripts/publish-npm-packages.sh --dist-tag 'canary' --registry 'https://registry.npmjs.org/'
+  - ./scripts/publish-npm-packages.sh --dist-tag 'canary' --registry 'https://registry.npmjs.org'
   depends_on:
   - end-to-end-tests-dashboards-suite
   - end-to-end-tests-panels-suite
@@ -6823,6 +6823,6 @@ kind: secret
 name: enterprise2_security_prefix
 ---
 kind: signature
-hmac: 7f282aaf4f3ba496f2d954241a16afd2facbf2cf1ef04dfb75cfec1b42fd39d1
+hmac: e8c29c328c07ab24a7f858cc319c9b35a5bec1fc79531e809e5d3a390bbcbc2f
 
 ...
diff --git a/packages/grafana-ui/.storybook/main.ts b/packages/grafana-ui/.storybook/main.ts
index e737d0126c5..1690a1db473 100644
--- a/packages/grafana-ui/.storybook/main.ts
+++ b/packages/grafana-ui/.storybook/main.ts
@@ -100,6 +100,7 @@ const mainConfig: StorybookConfig = {
       savePropValueAsString: true,
     },
   },
+
   webpackFinal: async (config) => {
     // expose jquery as a global so jquery plugins don't break at runtime.
     config.module?.rules?.push({
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 3cba0e8da70..500c4a3fc30 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1181,7 +1181,7 @@ def release_canary_npm_packages_step(trigger = None):
             "NPM_TOKEN": from_secret("npm_token"),
         },
         "commands": [
-            "./scripts/publish-npm-packages.sh --dist-tag 'canary' --registry 'https://registry.npmjs.org/'",
+            "./scripts/publish-npm-packages.sh --dist-tag 'canary' --registry 'https://registry.npmjs.org'",
         ],
     }
     if trigger:

From 5d4bf19efbf39b628a5a30935d2a247530f21164 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Tue, 18 Apr 2023 12:00:05 +0200
Subject: [PATCH 202/729] Fix: Canary NPM publishing (#66734)

fix(npm-publishing): strip protocol from registry so npm can auth correctly
---
 packages/grafana-ui/.storybook/main.ts | 1 -
 scripts/publish-npm-packages.sh        | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/.storybook/main.ts b/packages/grafana-ui/.storybook/main.ts
index 1690a1db473..e737d0126c5 100644
--- a/packages/grafana-ui/.storybook/main.ts
+++ b/packages/grafana-ui/.storybook/main.ts
@@ -100,7 +100,6 @@ const mainConfig: StorybookConfig = {
       savePropValueAsString: true,
     },
   },
-
   webpackFinal: async (config) => {
     // expose jquery as a global so jquery plugins don't break at runtime.
     config.module?.rules?.push({
diff --git a/scripts/publish-npm-packages.sh b/scripts/publish-npm-packages.sh
index 2437403626d..537ef8cfab7 100755
--- a/scripts/publish-npm-packages.sh
+++ b/scripts/publish-npm-packages.sh
@@ -36,7 +36,9 @@ done
 
 echo "Starting to release $dist_tag version"
 
-echo "$registry/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
+registry_without_protocol=${registry#*:}
+
+echo "$registry_without_protocol/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
 
 # Loop over .tar files in directory and publish them to npm registry
 for file in ./npm-artifacts/*.tgz; do

From bf3ac0ff189b06ca75c5e6b241c9f70f79630f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 18 Apr 2023 12:04:51 +0200
Subject: [PATCH 203/729] loki: query splitting: labels-based frame matching
 (#66677)

---
 public/app/plugins/datasource/loki/mocks.ts   | 19 ++++++++++
 .../datasource/loki/responseUtils.test.ts     | 11 ++++++
 .../plugins/datasource/loki/responseUtils.ts  | 35 ++++++++++++++++++-
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/mocks.ts b/public/app/plugins/datasource/loki/mocks.ts
index 584b99a5106..f0b3d288ce0 100644
--- a/public/app/plugins/datasource/loki/mocks.ts
+++ b/public/app/plugins/datasource/loki/mocks.ts
@@ -1,6 +1,7 @@
 import {
   ArrayVector,
   DataFrame,
+  DataFrameType,
   DataSourceInstanceSettings,
   DataSourceSettings,
   FieldType,
@@ -151,6 +152,9 @@ export function getMockFrames() {
       },
     ],
     meta: {
+      custom: {
+        frameType: 'LabeledTimeValues',
+      },
       stats: [
         { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
         { displayName: 'Ingester: total reached', value: 1 },
@@ -198,6 +202,9 @@ export function getMockFrames() {
       },
     ],
     meta: {
+      custom: {
+        frameType: 'LabeledTimeValues',
+      },
       stats: [
         { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
         { displayName: 'Ingester: total reached', value: 2 },
@@ -220,9 +227,13 @@ export function getMockFrames() {
         type: FieldType.number,
         config: {},
         values: new ArrayVector([5, 4]),
+        labels: {
+          level: 'debug',
+        },
       },
     ],
     meta: {
+      type: DataFrameType.TimeSeriesMulti,
       stats: [
         { displayName: 'Ingester: total reached', value: 1 },
         { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
@@ -245,9 +256,13 @@ export function getMockFrames() {
         type: FieldType.number,
         config: {},
         values: new ArrayVector([6, 7]),
+        labels: {
+          level: 'debug',
+        },
       },
     ],
     meta: {
+      type: DataFrameType.TimeSeriesMulti,
       stats: [
         { displayName: 'Ingester: total reached', value: 2 },
         { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
@@ -271,9 +286,13 @@ export function getMockFrames() {
         type: FieldType.number,
         config: {},
         values: new ArrayVector([6, 7]),
+        labels: {
+          level: 'error',
+        },
       },
     ],
     meta: {
+      type: DataFrameType.TimeSeriesMulti,
       stats: [
         { displayName: 'Ingester: total reached', value: 2 },
         { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 33 },
diff --git a/public/app/plugins/datasource/loki/responseUtils.test.ts b/public/app/plugins/datasource/loki/responseUtils.test.ts
index 6fa52a91c3b..81286ccb372 100644
--- a/public/app/plugins/datasource/loki/responseUtils.test.ts
+++ b/public/app/plugins/datasource/loki/responseUtils.test.ts
@@ -191,6 +191,9 @@ describe('combineResponses', () => {
           ],
           length: 4,
           meta: {
+            custom: {
+              frameType: 'LabeledTimeValues',
+            },
             stats: [
               {
                 displayName: 'Summary: total bytes processed',
@@ -228,10 +231,14 @@ describe('combineResponses', () => {
               name: 'Value',
               type: 'number',
               values: new ArrayVector([6, 7, 5, 4]),
+              labels: {
+                level: 'debug',
+              },
             },
           ],
           length: 4,
           meta: {
+            type: 'timeseries-multi',
             stats: [
               {
                 displayName: 'Summary: total bytes processed',
@@ -269,10 +276,14 @@ describe('combineResponses', () => {
               name: 'Value',
               type: 'number',
               values: new ArrayVector([6, 7, 5, 4]),
+              labels: {
+                level: 'debug',
+              },
             },
           ],
           length: 4,
           meta: {
+            type: 'timeseries-multi',
             stats: [
               {
                 displayName: 'Summary: total bytes processed',
diff --git a/public/app/plugins/datasource/loki/responseUtils.ts b/public/app/plugins/datasource/loki/responseUtils.ts
index 279133c9450..bebdd5dea11 100644
--- a/public/app/plugins/datasource/loki/responseUtils.ts
+++ b/public/app/plugins/datasource/loki/responseUtils.ts
@@ -1,6 +1,7 @@
 import {
   ArrayVector,
   DataFrame,
+  DataFrameType,
   DataQueryResponse,
   DataQueryResponseData,
   Field,
@@ -8,6 +9,7 @@ import {
   isValidGoDuration,
   Labels,
   QueryResultMetaStat,
+  shallowCompare,
 } from '@grafana/data';
 
 import { isBytesString } from './languageUtils';
@@ -123,7 +125,38 @@ function shouldCombine(frame1: DataFrame, frame2: DataFrame): boolean {
     return false;
   }
 
-  return frame1.name === frame2.name;
+  const frameType1 = frame1.meta?.type;
+  const frameType2 = frame2.meta?.type;
+
+  if (frameType1 !== frameType2) {
+    // we do not join things that have a different type
+    return false;
+  }
+
+  // metric range query data
+  if (frameType1 === DataFrameType.TimeSeriesMulti) {
+    const field1 = frame1.fields.find((f) => f.type === FieldType.number);
+    const field2 = frame2.fields.find((f) => f.type === FieldType.number);
+    if (field1 === undefined || field2 === undefined) {
+      // should never happen
+      return false;
+    }
+
+    return shallowCompare(field1.labels ?? {}, field2.labels ?? {});
+  }
+
+  // logs query data
+  // logs use a special attribute in the dataframe's "custom" section
+  // because we do not have a good "frametype" value for them yet.
+  const customType1 = frame1.meta?.custom?.frameType;
+  const customType2 = frame2.meta?.custom?.frameType;
+
+  if (customType1 === 'LabeledTimeValues' && customType2 === 'LabeledTimeValues') {
+    return true;
+  }
+
+  // should never reach here
+  return false;
 }
 
 export function combineResponses(currentResult: DataQueryResponse | null, newResult: DataQueryResponse) {

From c505d26430e85baa20429675c8958d42ea67adf4 Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Tue, 18 Apr 2023 11:12:19 +0100
Subject: [PATCH 204/729] APIkeys: Add metrics for apikey endpoints (#66732)

add metrics for apikey endpoints
---
 pkg/api/apikey.go            |  4 ++++
 pkg/infra/metrics/metrics.go | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go
index ecd2b1e03a0..35f15fb1831 100644
--- a/pkg/api/apikey.go
+++ b/pkg/api/apikey.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/components/apikeygen"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/apikey"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/web"
@@ -64,6 +65,7 @@ func (hs *HTTPServer) GetAPIKeys(c *contextmodel.ReqContext) response.Response {
 		}
 	}
 
+	metrics.MApiAPIkeysGet.Inc()
 	return response.JSON(http.StatusOK, result)
 }
 
@@ -99,6 +101,7 @@ func (hs *HTTPServer) DeleteAPIKey(c *contextmodel.ReqContext) response.Response
 		return response.Error(status, "Failed to delete API key", err)
 	}
 
+	metrics.MApiAPIkeysDelete.Inc()
 	return response.Success("API key deleted")
 }
 
@@ -166,6 +169,7 @@ func (hs *HTTPServer) AddAPIKey(c *contextmodel.ReqContext) response.Response {
 		Key:  newKeyInfo.ClientSecret,
 	}
 
+	metrics.MApiAPIkeysCreate.Inc()
 	return response.JSON(http.StatusOK, result)
 }
 
diff --git a/pkg/infra/metrics/metrics.go b/pkg/infra/metrics/metrics.go
index c90c2177c66..4cce0d01d31 100644
--- a/pkg/infra/metrics/metrics.go
+++ b/pkg/infra/metrics/metrics.go
@@ -109,6 +109,12 @@ var (
 
 	// MPublicDashboardDatasourceQuerySuccess is a metric counter for successful queries labelled by datasource
 	MPublicDashboardDatasourceQuerySuccess *prometheus.CounterVec
+
+	MApiAPIkeysGet prometheus.Counter
+
+	MApiAPIkeysCreate prometheus.Counter
+
+	MApiAPIkeysDelete prometheus.Counter
 )
 
 // Timers
@@ -446,6 +452,24 @@ func init() {
 		Namespace: ExporterName,
 	}, []string{"datasource", "status"}, map[string][]string{"status": pubdash.QueryResultStatuses})
 
+	MApiAPIkeysGet = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
+		Name:      "api_api_keys_get_total",
+		Help:      "counter for getting api keys",
+		Namespace: ExporterName,
+	})
+
+	MApiAPIkeysCreate = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
+		Name:      "api_api_keys_create_total",
+		Help:      "counter for creating api keys",
+		Namespace: ExporterName,
+	})
+
+	MApiAPIkeysDelete = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
+		Name:      "api_api_keys_delete_total",
+		Help:      "counter for deleting api keys",
+		Namespace: ExporterName,
+	})
+
 	MStatTotalDashboards = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_totals_dashboard",
 		Help:      "total amount of dashboards",
@@ -715,5 +739,8 @@ func initMetricVars() {
 		MPublicDashboardRequestCount,
 		MPublicDashboardDatasourceQuerySuccess,
 		MStatTotalCorrelations,
+		MApiAPIkeysGet,
+		MApiAPIkeysCreate,
+		MApiAPIkeysDelete,
 	)
 }

From 04370f92dc7acfad01363a4a3ecd31d64ca72abb Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Tue, 18 Apr 2023 13:27:40 +0300
Subject: [PATCH 205/729] Annotations: Improve get tags query performance
 (#66182)

* Add benchmark

* Add fix
---
 .../annotations/annotationsimpl/xorm_store.go |  3 +-
 .../annotationsimpl/xorm_store_test.go        | 89 +++++++++++++++++++
 2 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/pkg/services/annotations/annotationsimpl/xorm_store.go b/pkg/services/annotations/annotationsimpl/xorm_store.go
index a78584f07a2..06e8e79b193 100644
--- a/pkg/services/annotations/annotationsimpl/xorm_store.go
+++ b/pkg/services/annotations/annotationsimpl/xorm_store.go
@@ -447,9 +447,10 @@ func (r *xormRepositoryImpl) GetTags(ctx context.Context, query *annotations.Tag
 			count(*) as count
 		FROM tag
 		INNER JOIN annotation_tag ON tag.id = annotation_tag.tag_id
+		INNER JOIN annotation ON annotation.id = annotation_tag.annotation_id
 `)
 
-		sql.WriteString(`WHERE EXISTS(SELECT 1 FROM annotation WHERE annotation.id = annotation_tag.annotation_id AND annotation.org_id = ?)`)
+		sql.WriteString(`WHERE annotation.org_id = ?`)
 		params = append(params, query.OrgID)
 
 		sql.WriteString(` AND (` + tagKey + ` ` + r.db.GetDialect().LikeStr() + ` ? OR ` + tagValue + ` ` + r.db.GetDialect().LikeStr() + ` ?)`)
diff --git a/pkg/services/annotations/annotationsimpl/xorm_store_test.go b/pkg/services/annotations/annotationsimpl/xorm_store_test.go
index 630e266911e..4bbd98b907c 100644
--- a/pkg/services/annotations/annotationsimpl/xorm_store_test.go
+++ b/pkg/services/annotations/annotationsimpl/xorm_store_test.go
@@ -27,6 +27,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/tag"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -847,3 +848,91 @@ func setupRBACPermission(t *testing.T, db *sqlstore.SQLStore, role *accesscontro
 
 	require.NoError(t, err)
 }
+
+func BenchmarkFindTags_10k(b *testing.B) {
+	benchmarkFindTags(b, 10000)
+}
+
+func BenchmarkFindTags_100k(b *testing.B) {
+	benchmarkFindTags(b, 100000)
+}
+
+func benchmarkFindTags(b *testing.B, numAnnotations int) {
+	sql := db.InitTestDB(b)
+	var maximumTagsLength int64 = 60
+	repo := xormRepositoryImpl{db: sql, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(sql, sql.Cfg), maximumTagsLength: maximumTagsLength}
+
+	type annotationTag struct {
+		ID           int64 `xorm:"pk autoincr 'id'"`
+		AnnotationID int64 `xorm:"annotation_id"`
+		TagID        int64 `xorm:"tag_id"`
+	}
+	newAnnotations := make([]annotations.Item, 0, numAnnotations)
+	newTags := make([]tag.Tag, 0, numAnnotations)
+	newAnnotationTags := make([]annotationTag, 0, numAnnotations)
+	for i := 0; i < numAnnotations; i++ {
+		newAnnotations = append(newAnnotations, annotations.Item{
+			ID:          int64(i),
+			OrgID:       1,
+			UserID:      1,
+			DashboardID: int64(i),
+			Text:        "hello",
+			Type:        "alert",
+			Epoch:       10,
+			Data:        simplejson.NewFromAny(map[string]interface{}{"data1": "I am a cool data", "data2": "I am another cool data"}),
+		})
+		newTags = append(newTags, tag.Tag{
+			Id:  int64(i),
+			Key: fmt.Sprintf("tag%d", i),
+		})
+
+		newAnnotationTags = append(newAnnotationTags, annotationTag{
+			AnnotationID: int64(i),
+			TagID:        int64(1),
+		})
+	}
+	err := sql.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+		batchSize := 1000
+		numOfBatches := numAnnotations / batchSize
+		for i := 0; i < numOfBatches; i++ {
+			_, err := sess.Insert(newAnnotations[i*batchSize : (i+1)*batchSize-1])
+			require.NoError(b, err)
+
+			_, err = sess.Insert(newTags[i*batchSize : (i+1)*batchSize-1])
+			require.NoError(b, err)
+
+			_, err = sess.Insert(newAnnotationTags[i*batchSize : (i+1)*batchSize-1])
+			require.NoError(b, err)
+		}
+		return nil
+	})
+	require.NoError(b, err)
+
+	annotationWithTheTag := annotations.Item{
+		ID:          int64(numAnnotations) + 1,
+		OrgID:       1,
+		UserID:      1,
+		DashboardID: int64(1),
+		Text:        "hello",
+		Type:        "alert",
+		Epoch:       10,
+		Tags:        []string{"outage", "error", "type:outage", "server:server-1"},
+		Data:        simplejson.NewFromAny(map[string]interface{}{"data1": "I am a cool data", "data2": "I am another cool data"}),
+	}
+	err = repo.Add(context.Background(), &annotationWithTheTag)
+	require.NoError(b, err)
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		result, err := repo.GetTags(context.Background(), &annotations.TagsQuery{
+			OrgID: 1,
+			Tag:   "outage",
+		})
+		require.NoError(b, err)
+		require.Len(b, result.Tags, 2)
+		require.Equal(b, "outage", result.Tags[0].Tag)
+		require.Equal(b, "type:outage", result.Tags[1].Tag)
+		require.Equal(b, int64(1), result.Tags[0].Count)
+		require.Equal(b, int64(1), result.Tags[1].Count)
+	}
+}

From 43fbb9804e3b42320207bbc63a15dc55fdb470f1 Mon Sep 17 00:00:00 2001
From: Jack Baldry <jack.baldry@grafana.com>
Date: Tue, 18 Apr 2023 11:46:10 +0100
Subject: [PATCH 206/729] Use centralized make-docs script from Writers'
 Toolkit (#66440)

- Adds ability to build multiple projects simultaneously using, for example, `make docs PROJECTS='grafana grafana-cloud'`.
- Adds `make doc-validator` which runs [`doc-validator`](https://github.com/grafana/technical-documentation/tree/main/tools/cmd/doc-validator) on all documentation.

Using a centralized script will help ensure consistency in workflow across all projects.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
---
 .gitignore        |  1 +
 docs/Makefile     | 39 ++++------------------
 docs/docs.mk      | 82 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/variables.mk |  2 ++
 4 files changed, 92 insertions(+), 32 deletions(-)
 create mode 100644 docs/docs.mk
 create mode 100644 docs/variables.mk

diff --git a/.gitignore b/.gitignore
index fbfb6a6396f..c09a8139879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -191,3 +191,4 @@ public/api-spec.json
 deployment_tools_config.json
 
 .betterer.cache
+/docs/make-docs
diff --git a/docs/Makefile b/docs/Makefile
index 1d069a90692..2eaab546cf3 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,33 +1,8 @@
-.PHONY: pull docs docs-quick docs-no-pull docs-test docs-local-static
+.ONESHELL:
+.DELETE_ON_ERROR:
+export SHELL     := bash
+export SHELLOPTS := pipefail:errexit
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rule
 
-PODMAN = $(shell if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)
-IMAGE = grafana/docs-base:latest
-CONTENT_PATH = /hugo/content/docs/grafana/latest
-LOCAL_STATIC_PATH = ../../website/static
-PORT = 3002:3002
-
-pull:
-	$(PODMAN) pull $(IMAGE)
-
-docs: pull
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) make server
-
-docs-preview: pull
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) make server BUILD_DRAFTS=true
-
-docs-no-pull:
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) make server
-
-docs-test: pull
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z --rm -it $(IMAGE) make prod
-
-# expects that you have grafana/website checked out in same path as the grafana repo.
-docs-local-static: pull
-	if [ ! -d "$(LOCAL_STATIC_PATH)" ]; then echo "local path (website project) $(LOCAL_STATIC_PATH) not found"]; exit 1; fi
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z \
-		-v $(shell pwd)/$(LOCAL_STATIC_PATH):/hugo/static:Z -p $(PORT) --rm -it $(IMAGE)
-
-.PHONY: doc-validator/%
-doc-validator/%: ## Run doc-validator on a specific path. To lint the path /docs/sources/administration, run 'make doc-validator/administration'.
-doc-validator/%:
-	$(PODMAN) run --init -v "$(shell pwd)/sources:/sources" grafana/doc-validator:latest --skip-image-validation --include=$(subst doc-validator/,,$@) ./sources /docs/grafana/latest
+include docs.mk
diff --git a/docs/docs.mk b/docs/docs.mk
new file mode 100644
index 00000000000..2ef7063d00d
--- /dev/null
+++ b/docs/docs.mk
@@ -0,0 +1,82 @@
+include variables.mk
+-include variables.mk.local
+
+.ONESHELL:
+.DELETE_ON_ERROR:
+export SHELL     := bash
+export SHELLOPTS := pipefail:errexit
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rule
+
+.DEFAULT_GOAL: help
+
+# Adapted from https://www.thapaliya.com/en/writings/well-documented-makefiles/
+.PHONY: help
+help: ## Display this help.
+help:
+	@awk 'BEGIN {FS = ": ##"; printf "Usage:\n  make <target>\n\nTargets:\n"} /^[a-zA-Z0-9_\.\-\/%]+: ##/ { printf "  %-45s %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
+
+GIT_ROOT := $(shell git rev-parse --show-toplevel)
+
+PODMAN := $(shell if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)
+
+ifeq ($(PROJECTS),)
+$(error "PROJECTS variable must be defined in variables.mk")
+endif
+
+# First project is considered the primary one used for doc-validator.
+PRIMARY_PROJECT := $(firstword $(subst /,-,$(PROJECTS)))
+
+# Name for the container.
+export DOCS_CONTAINER := $(PRIMARY_PROJECT)-docs
+
+# Host port to publish container port to.
+export DOCS_HOST_PORT := 3002
+
+# Container image used to perform Hugo build.
+export DOCS_IMAGE := grafana/docs-base:latest
+
+# Container image used for doc-validator linting.
+export DOC_VALIDATOR_IMAGE := grafana/doc-validator:latest
+
+# PATH-like list of directories within which to find projects.
+# If all projects are checked out into the same directory, ~/repos/ for example, then the default should work.
+export REPOS_PATH := $(realpath $(GIT_ROOT)/..)
+
+# How to treat Hugo relref errors.
+export HUGO_REFLINKSERRORLEVEL := WARNING
+
+.PHONY: docs-rm
+docs-rm: ## Remove the docs container.
+	$(PODMAN) rm -f $(DOCS_CONTAINER)
+
+.PHONY: docs-pull
+docs-pull: ## Pull documentation base image.
+	$(PODMAN) pull $(DOCS_IMAGE)
+
+make-docs: ## Fetch the latest make-docs script.
+make-docs:
+	curl -s -LO https://raw.githubusercontent.com/grafana/writers-toolkit/main/scripts/make-docs
+	chmod +x make-docs
+
+.PHONY: docs
+docs: ## Serve documentation locally.
+docs: docs-pull make-docs
+	$(PWD)/make-docs $(PROJECTS)
+
+.PHONY: docs-no-pull
+docs-no-pull: ## Serve documentation locally without pulling the latest docs-base image.
+docs-no-pull: make-docs
+	$(PWD)/make-docs $(PROJECTS)
+
+.PHONY: doc-validator
+doc-validator: ## Run docs-validator on the entire docs folder.
+	DOCS_IMAGE=$(DOC_VALIDATOR_IMAGE) $(PWD)/make-docs $(PROJECTS)
+
+.PHONY: doc-validator/%
+doc-validator/%: ## Run doc-validator on a specific path. To lint the path /docs/sources/administration, run 'make doc-validator/administration'.
+doc-validator/%:
+	DOCS_IMAGE=$(DOC_VALIDATOR_IMAGE) DOC_VALIDATOR_INCLUDE=$(subst doc-validator/,,$@) $(PWD)/make-docs $(PROJECTS)
+
+docs.mk: ## Fetch the latest version of this Makefile from Writers' Toolkit.
+	curl -s -LO https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk
diff --git a/docs/variables.mk b/docs/variables.mk
new file mode 100644
index 00000000000..ac6ffdd5b65
--- /dev/null
+++ b/docs/variables.mk
@@ -0,0 +1,2 @@
+# List of projects to provide to the make-docs script.
+PROJECTS = grafana

From 9fad5d938d71f644332f88522a3cc248a66e6fea Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Tue, 18 Apr 2023 13:09:08 +0200
Subject: [PATCH 207/729] Docs: removes alerting  video blurb version (#66748)

---
 docs/sources/alerting/_index.md                                 | 2 +-
 .../alerting/alerting-rules/create-grafana-managed-rule.md      | 2 +-
 .../alerting/alerting-rules/create-mimir-loki-managed-rule.md   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index a4788d0be2e..24e284a3a04 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -19,7 +19,7 @@ Grafana Alerting is available for Grafana OSS, Grafana Enterprise, or Grafana Cl
 
 Watch this video to learn more about Grafana Alerting: {{< vimeo 720001629 >}}
 
-_Video shows Alerting in Grafana v9.0. Refer to [Manage your alert rules]({{< relref "../alerting/alerting-rules/" >}}) for current instructions._
+_Refer to [Manage your alert rules]({{< relref "../alerting/alerting-rules/" >}}) for current instructions._
 
 ## Overview
 
diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index b1a0512fcd2..173e3897f4c 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -18,7 +18,7 @@ Grafana allows you to create alerting rules that query one or more data sources,
 
 Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
 
-_Video shows Alerting in Grafana v9.0. Refer to [Add Grafana managed rule]({{< relref "#add-grafana-managed-rule" >}}) (following) for current instructions._
+_Refer to [Add Grafana managed rule]({{< relref "#add-grafana-managed-rule" >}}) (following) for current instructions._
 
 ## Add Grafana managed rule
 
diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
index 81f27c5be37..7a5943e28d8 100644
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
@@ -30,7 +30,7 @@ Grafana allows you to create alerting rules for an external Grafana Mimir or Lok
 
 Watch this video to learn more about how to create a Mimir managed alert rule: {{< vimeo 720001865 >}}
 
-_Video shows Alerting in Grafana v8.5. Refer to [Add a Grafana Mimir or Loki managed alerting rule]({{< relref "#add-a-grafana-mimir-or-loki-managed-alerting-rule" >}}) (following) for current instructions._
+_Refer to [Add a Grafana Mimir or Loki managed alerting rule]({{< relref "#add-a-grafana-mimir-or-loki-managed-alerting-rule" >}}) (following) for current instructions._
 
 > **Note:** If you do not want to manage alerting rules for a particular Loki or Prometheus data source, go to its settings and clear the **Manage alerts via Alerting UI** checkbox.
 

From f3fcc312772af8396a0d6786c1a4dc47cd433766 Mon Sep 17 00:00:00 2001
From: Ludovic Viaud <ludovic.viaud@gmail.com>
Date: Tue, 18 Apr 2023 20:19:13 +0900
Subject: [PATCH 208/729] Set a help text when a readonly prometheus has no
 examplars configuration (#66713)

---
 .../datasource/prometheus/configuration/ExemplarsSettings.tsx   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
index 2a255e87bb7..7c8abc3ae80 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
@@ -57,6 +57,8 @@ export function ExemplarsSettings({ options, onChange, disabled }: Props) {
           Add
         </Button>
       )}
+
+      {disabled && !options && <i>No exemplars configurations</i>}
     </>
   );
 }

From 840fb32ad8566cff116b4739f05e38dd5a6812a3 Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Tue, 18 Apr 2023 08:04:51 -0400
Subject: [PATCH 209/729] SSE: (Instrumentation) Add Tracing (#66700)

spans are prefixed `SSE.`
---
 pkg/expr/classic/classic.go                   |  5 ++++-
 pkg/expr/classic/classic_test.go              |  3 ++-
 pkg/expr/commands.go                          | 22 ++++++++++++++-----
 pkg/expr/commands_test.go                     |  9 ++++----
 pkg/expr/dataplane.go                         | 13 ++++++++---
 pkg/expr/dataplane_test.go                    |  2 ++
 pkg/expr/graph.go                             | 10 +++++++++
 pkg/expr/mathexp/exp.go                       |  7 +++++-
 pkg/expr/mathexp/exp_nan_null_val_test.go     | 13 ++++++-----
 pkg/expr/mathexp/exp_scalar_no_test.go        |  5 +++--
 pkg/expr/mathexp/exp_series_test.go           |  3 ++-
 pkg/expr/mathexp/funcs_test.go                |  5 +++--
 pkg/expr/nodes.go                             | 11 +++++++---
 pkg/expr/service.go                           |  7 +++++-
 pkg/expr/service_test.go                      |  2 ++
 pkg/expr/threshold.go                         |  5 +++--
 pkg/expr/transform.go                         |  3 +++
 pkg/services/ngalert/eval/eval_test.go        |  3 ++-
 .../ngalert/schedule/schedule_unit_test.go    |  2 +-
 pkg/services/query/query_test.go              |  3 ++-
 20 files changed, 98 insertions(+), 35 deletions(-)

diff --git a/pkg/expr/classic/classic.go b/pkg/expr/classic/classic.go
index 6a05c063ed2..c8d124b08e0 100644
--- a/pkg/expr/classic/classic.go
+++ b/pkg/expr/classic/classic.go
@@ -10,6 +10,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
 	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 )
 
 // ConditionsCmd is a command that supports the reduction and comparison of conditions.
@@ -68,7 +69,9 @@ func (cmd *ConditionsCmd) NeedsVars() []string {
 
 // Execute runs the command and returns the results or an error if the command
 // failed to execute.
-func (cmd *ConditionsCmd) Execute(ctx context.Context, t time.Time, vars mathexp.Vars) (mathexp.Results, error) {
+func (cmd *ConditionsCmd) Execute(ctx context.Context, t time.Time, vars mathexp.Vars, tracer tracing.Tracer) (mathexp.Results, error) {
+	ctx, span := tracer.Start(ctx, "SSE.ExecuteClassicConditions")
+	defer span.End()
 	// isFiring and isNoData contains the outcome of ConditionsCmd, and is derived from the
 	// boolean comparison of isCondFiring and isCondNoData of all conditions in ConditionsCmd
 	var isFiring, isNoData bool
diff --git a/pkg/expr/classic/classic_test.go b/pkg/expr/classic/classic_test.go
index e907c437f04..9a732038ba6 100644
--- a/pkg/expr/classic/classic_test.go
+++ b/pkg/expr/classic/classic_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -598,7 +599,7 @@ func TestConditionsCmd(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			res, err := tt.cmd.Execute(context.Background(), time.Now(), tt.vars)
+			res, err := tt.cmd.Execute(context.Background(), time.Now(), tt.vars, tracing.NewFakeTracer())
 			require.NoError(t, err)
 			require.Equal(t, tt.expected(), res)
 		})
diff --git a/pkg/expr/commands.go b/pkg/expr/commands.go
index 8410fc02c5c..03dc3403591 100644
--- a/pkg/expr/commands.go
+++ b/pkg/expr/commands.go
@@ -9,14 +9,16 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"go.opentelemetry.io/otel/attribute"
 
 	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 )
 
 // Command is an interface for all expression commands.
 type Command interface {
 	NeedsVars() []string
-	Execute(ctx context.Context, now time.Time, vars mathexp.Vars) (mathexp.Results, error)
+	Execute(ctx context.Context, now time.Time, vars mathexp.Vars, tracer tracing.Tracer) (mathexp.Results, error)
 }
 
 // MathCommand is a command for a math expression such as "1 + $GA / 2"
@@ -66,8 +68,11 @@ func (gm *MathCommand) NeedsVars() []string {
 
 // Execute runs the command and returns the results or an error if the command
 // failed to execute.
-func (gm *MathCommand) Execute(_ context.Context, _ time.Time, vars mathexp.Vars) (mathexp.Results, error) {
-	return gm.Expression.Execute(gm.refID, vars)
+func (gm *MathCommand) Execute(ctx context.Context, _ time.Time, vars mathexp.Vars, tracer tracing.Tracer) (mathexp.Results, error) {
+	_, span := tracer.Start(ctx, "SSE.ExecuteMath")
+	span.SetAttributes("expression", gm.RawExpression, attribute.Key("expression").String(gm.RawExpression))
+	defer span.End()
+	return gm.Expression.Execute(gm.refID, vars, tracer)
 }
 
 // ReduceCommand is an expression command for reduction of a timeseries such as a min, mean, or max.
@@ -154,7 +159,12 @@ func (gr *ReduceCommand) NeedsVars() []string {
 
 // Execute runs the command and returns the results or an error if the command
 // failed to execute.
-func (gr *ReduceCommand) Execute(_ context.Context, _ time.Time, vars mathexp.Vars) (mathexp.Results, error) {
+func (gr *ReduceCommand) Execute(ctx context.Context, _ time.Time, vars mathexp.Vars, tracer tracing.Tracer) (mathexp.Results, error) {
+	_, span := tracer.Start(ctx, "SSE.ExecuteReduce")
+	defer span.End()
+
+	span.SetAttributes("reducer", gr.Reducer, attribute.Key("reducer").String(gr.Reducer))
+
 	newRes := mathexp.Results{}
 	for _, val := range vars[gr.VarToReduce].Values {
 		switch v := val.(type) {
@@ -262,7 +272,9 @@ func (gr *ResampleCommand) NeedsVars() []string {
 
 // Execute runs the command and returns the results or an error if the command
 // failed to execute.
-func (gr *ResampleCommand) Execute(_ context.Context, now time.Time, vars mathexp.Vars) (mathexp.Results, error) {
+func (gr *ResampleCommand) Execute(ctx context.Context, now time.Time, vars mathexp.Vars, tracer tracing.Tracer) (mathexp.Results, error) {
+	_, span := tracer.Start(ctx, "SSE.ExecuteResample")
+	defer span.End()
 	newRes := mathexp.Results{}
 	timeRange := gr.TimeRange.AbsoluteTime(now)
 	for _, val := range vars[gr.VarToResample].Values {
diff --git a/pkg/expr/commands_test.go b/pkg/expr/commands_test.go
index 4228c280247..284ccf1ef31 100644
--- a/pkg/expr/commands_test.go
+++ b/pkg/expr/commands_test.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/expr/mathexp"
 	"github.com/grafana/grafana/pkg/expr/mathexp/parse"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -115,7 +116,7 @@ func TestReduceExecute(t *testing.T) {
 			},
 		}
 
-		execute, err := cmd.Execute(context.Background(), time.Now(), vars)
+		execute, err := cmd.Execute(context.Background(), time.Now(), vars, tracing.NewFakeTracer())
 		require.NoError(t, err)
 
 		require.Len(t, execute.Values, len(numbers))
@@ -150,7 +151,7 @@ func TestReduceExecute(t *testing.T) {
 			},
 		}
 
-		results, err := cmd.Execute(context.Background(), time.Now(), vars)
+		results, err := cmd.Execute(context.Background(), time.Now(), vars, tracing.NewFakeTracer())
 		require.NoError(t, err)
 
 		require.Len(t, results.Values, 1)
@@ -209,7 +210,7 @@ func TestResampleCommand_Execute(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			result, err := cmd.Execute(context.Background(), time.Now(), mathexp.Vars{
 				varToReduce: mathexp.Results{Values: mathexp.Values{test.vals}},
-			})
+			}, tracing.NewFakeTracer())
 			if test.isError {
 				require.Error(t, err)
 			} else {
@@ -224,7 +225,7 @@ func TestResampleCommand_Execute(t *testing.T) {
 	t.Run("should return empty result if input is nil Value", func(t *testing.T) {
 		result, err := cmd.Execute(context.Background(), time.Now(), mathexp.Vars{
 			varToReduce: mathexp.Results{Values: mathexp.Values{nil}},
-		})
+		}, tracing.NewFakeTracer())
 		require.Empty(t, result.Values)
 		require.NoError(t, err)
 	})
diff --git a/pkg/expr/dataplane.go b/pkg/expr/dataplane.go
index 0d24254c905..7175ad9ca41 100644
--- a/pkg/expr/dataplane.go
+++ b/pkg/expr/dataplane.go
@@ -1,6 +1,7 @@
 package expr
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -11,6 +12,8 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/expr/mathexp"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"go.opentelemetry.io/otel/attribute"
 )
 
 func shouldUseDataplane(frames data.Frames, logger *log.ConcreteLogger, disable bool) (dt data.FrameType, b bool, e error) {
@@ -55,8 +58,12 @@ func shouldUseDataplane(frames data.Frames, logger *log.ConcreteLogger, disable
 	return dt, true, nil
 }
 
-func handleDataplaneFrames(k data.FrameTypeKind, frames data.Frames) (mathexp.Results, error) {
-	switch k {
+func handleDataplaneFrames(ctx context.Context, tracer tracing.Tracer, t data.FrameType, frames data.Frames) (mathexp.Results, error) {
+	_, span := tracer.Start(ctx, "SSE.HandleDataPlaneData")
+	defer span.End()
+	span.SetAttributes("dataplane.type", t, attribute.Key("dataplane.type").String(string(t)))
+
+	switch t.Kind() {
 	case data.KindUnknown:
 		return mathexp.Results{Values: mathexp.Values{mathexp.NoData{}.New()}}, nil
 	case data.KindTimeSeries:
@@ -64,7 +71,7 @@ func handleDataplaneFrames(k data.FrameTypeKind, frames data.Frames) (mathexp.Re
 	case data.KindNumeric:
 		return handleDataplaneNumeric(frames)
 	default:
-		return mathexp.Results{}, fmt.Errorf("kind %s not supported by server side expressions", k)
+		return mathexp.Results{}, fmt.Errorf("kind %s (type %s) not supported by server side expressions", t.Kind(), t)
 	}
 }
 
diff --git a/pkg/expr/dataplane_test.go b/pkg/expr/dataplane_test.go
index 46cccd09941..0810fd38832 100644
--- a/pkg/expr/dataplane_test.go
+++ b/pkg/expr/dataplane_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/dataplane/examples"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	datafakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -49,6 +50,7 @@ func framesPassThroughService(t *testing.T, frames data.Frames) (data.Frames, er
 		dataService:       me,
 		dataSourceService: &datafakes.FakeDataSourceService{},
 		features:          &featuremgmt.FeatureManager{},
+		tracer:            tracing.InitializeTracerForTest(),
 		metrics:           newMetrics(nil),
 	}
 	queries := []Query{{
diff --git a/pkg/expr/graph.go b/pkg/expr/graph.go
index f3e9a00ea35..26c1e5b885d 100644
--- a/pkg/expr/graph.go
+++ b/pkg/expr/graph.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"time"
 
+	"go.opentelemetry.io/otel/attribute"
 	"gonum.org/v1/gonum/graph/simple"
 	"gonum.org/v1/gonum/graph/topo"
 
@@ -50,6 +51,15 @@ type DataPipeline []Node
 func (dp *DataPipeline) execute(c context.Context, now time.Time, s *Service) (mathexp.Vars, error) {
 	vars := make(mathexp.Vars)
 	for _, node := range *dp {
+		c, span := s.tracer.Start(c, "SSE.ExecuteNode")
+		span.SetAttributes("node.refId", node.RefID(), attribute.Key("node.refId").String(node.RefID()))
+		if node.NodeType() == TypeCMDNode {
+			cmdNode := node.(*CMDNode)
+			inputRefIDs := cmdNode.Command.NeedsVars()
+			span.SetAttributes("node.inputRefIDs", inputRefIDs, attribute.Key("node.inputRefIDs").StringSlice(inputRefIDs))
+		}
+		defer span.End()
+
 		res, err := node.Execute(c, now, vars, s)
 		if err != nil {
 			return nil, err
diff --git a/pkg/expr/mathexp/exp.go b/pkg/expr/mathexp/exp.go
index 45e2113d077..0cee81aef72 100644
--- a/pkg/expr/mathexp/exp.go
+++ b/pkg/expr/mathexp/exp.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
 	"github.com/grafana/grafana/pkg/expr/mathexp/parse"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 )
 
 // Expr holds a parsed math command expression.
@@ -25,6 +26,8 @@ type State struct {
 	//  - Unions (How many result A and many Result B in case A + B are joined)
 	//  - NaN/Null behavior
 	RefID string
+
+	tracer tracing.Tracer
 }
 
 // Vars holds the results of datasource queries or other expression commands.
@@ -44,11 +47,13 @@ func New(expr string, funcs ...map[string]parse.Func) (*Expr, error) {
 }
 
 // Execute applies a parse expression to the context and executes it
-func (e *Expr) Execute(refID string, vars Vars) (r Results, err error) {
+func (e *Expr) Execute(refID string, vars Vars, tracer tracing.Tracer) (r Results, err error) {
 	s := &State{
 		Expr:  e,
 		Vars:  vars,
 		RefID: refID,
+
+		tracer: tracer,
 	}
 	return e.executeState(s)
 }
diff --git a/pkg/expr/mathexp/exp_nan_null_val_test.go b/pkg/expr/mathexp/exp_nan_null_val_test.go
index 4d928d405a0..22ae6cf0f1c 100644
--- a/pkg/expr/mathexp/exp_nan_null_val_test.go
+++ b/pkg/expr/mathexp/exp_nan_null_val_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -147,7 +148,7 @@ func TestNaN(t *testing.T) {
 				e, err := New(tt.expr)
 				tt.newErrIs(t, err)
 				if e != nil {
-					res, err := e.Execute("", tt.vars)
+					res, err := e.Execute("", tt.vars, tracing.NewFakeTracer())
 					tt.execErrIs(t, err)
 					if diff := cmp.Diff(res, tt.results, options...); diff != "" {
 						assert.FailNow(t, tt.name, diff)
@@ -409,7 +410,7 @@ func TestNullValues(t *testing.T) {
 				e, err := New(tt.expr)
 				tt.newErrIs(t, err)
 				if e != nil {
-					res, err := e.Execute("", tt.vars)
+					res, err := e.Execute("", tt.vars, tracing.NewFakeTracer())
 					tt.execErrIs(t, err)
 					if diff := cmp.Diff(tt.results, res, options...); diff != "" {
 						t.Errorf("Result mismatch (-want +got):\n%s", diff)
@@ -446,7 +447,7 @@ func TestNoData(t *testing.T) {
 				e, err := New(expr)
 				require.NoError(t, err)
 				if e != nil {
-					res, err := e.Execute("", vars)
+					res, err := e.Execute("", vars, tracing.NewFakeTracer())
 					require.NoError(t, err)
 					require.Len(t, res.Values, 1)
 					require.Equal(t, NewNoData(), res.Values[0])
@@ -487,21 +488,21 @@ func TestNoData(t *testing.T) {
 			require.NoError(t, err)
 			if e != nil {
 				t.Run("$A,$B=nodata", func(t *testing.T) {
-					res, err := e.Execute("", makeVars(NewNoData(), NewNoData()))
+					res, err := e.Execute("", makeVars(NewNoData(), NewNoData()), tracing.NewFakeTracer())
 					require.NoError(t, err)
 					require.Len(t, res.Values, 1)
 					require.Equal(t, NewNoData(), res.Values[0])
 				})
 
 				t.Run("$A=nodata, $B=series", func(t *testing.T) {
-					res, err := e.Execute("", makeVars(NewNoData(), series))
+					res, err := e.Execute("", makeVars(NewNoData(), series), tracing.NewFakeTracer())
 					require.NoError(t, err)
 					require.Len(t, res.Values, 1)
 					require.Equal(t, NewNoData(), res.Values[0])
 				})
 
 				t.Run("$A=series, $B=nodata", func(t *testing.T) {
-					res, err := e.Execute("", makeVars(NewNoData(), series))
+					res, err := e.Execute("", makeVars(NewNoData(), series), tracing.NewFakeTracer())
 					require.NoError(t, err)
 					require.Len(t, res.Values, 1)
 					require.Equal(t, NewNoData(), res.Values[0])
diff --git a/pkg/expr/mathexp/exp_scalar_no_test.go b/pkg/expr/mathexp/exp_scalar_no_test.go
index fa8a015e42a..79cd492caf9 100644
--- a/pkg/expr/mathexp/exp_scalar_no_test.go
+++ b/pkg/expr/mathexp/exp_scalar_no_test.go
@@ -4,6 +4,7 @@ import (
 	"math"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -78,7 +79,7 @@ func TestScalarExpr(t *testing.T) {
 			e, err := New(tt.expr)
 			tt.newErrIs(t, err)
 			if e != nil {
-				res, err := e.Execute("", tt.vars)
+				res, err := e.Execute("", tt.vars, tracing.NewFakeTracer())
 				tt.execErrIs(t, err)
 				tt.resultIs(t, tt.Results, res)
 			}
@@ -131,7 +132,7 @@ func TestNumberExpr(t *testing.T) {
 			e, err := New(tt.expr)
 			tt.newErrIs(t, err)
 			if e != nil {
-				res, err := e.Execute("", tt.vars)
+				res, err := e.Execute("", tt.vars, tracing.NewFakeTracer())
 				tt.execErrIs(t, err)
 				tt.resultIs(t, tt.results, res)
 			}
diff --git a/pkg/expr/mathexp/exp_series_test.go b/pkg/expr/mathexp/exp_series_test.go
index 63f0cf68ea5..5cc5703fbef 100644
--- a/pkg/expr/mathexp/exp_series_test.go
+++ b/pkg/expr/mathexp/exp_series_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -178,7 +179,7 @@ func TestSeriesExpr(t *testing.T) {
 			e, err := New(tt.expr)
 			tt.newErrIs(t, err)
 			if e != nil {
-				res, err := e.Execute("", tt.vars)
+				res, err := e.Execute("", tt.vars, tracing.NewFakeTracer())
 				tt.execErrIs(t, err)
 				if diff := cmp.Diff(tt.results, res, data.FrameTestCompareOptions()...); diff != "" {
 					t.Errorf("Result mismatch (-want +got):\n%s", diff)
diff --git a/pkg/expr/mathexp/funcs_test.go b/pkg/expr/mathexp/funcs_test.go
index 63ccd71f679..ab0b14f6e36 100644
--- a/pkg/expr/mathexp/funcs_test.go
+++ b/pkg/expr/mathexp/funcs_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/stretchr/testify/require"
 )
 
@@ -81,7 +82,7 @@ func TestAbsFunc(t *testing.T) {
 			e, err := New(tt.expr)
 			tt.newErrIs(t, err)
 			if e != nil {
-				res, err := e.Execute("", tt.vars)
+				res, err := e.Execute("", tt.vars, tracing.NewFakeTracer())
 				tt.execErrIs(t, err)
 				tt.resultIs(t, tt.results, res)
 			}
@@ -152,7 +153,7 @@ func TestIsNumberFunc(t *testing.T) {
 			e, err := New(tt.expr)
 			require.NoError(t, err)
 			if e != nil {
-				res, err := e.Execute("", tt.vars)
+				res, err := e.Execute("", tt.vars, tracing.NewFakeTracer())
 				require.NoError(t, err)
 				require.Equal(t, tt.results, res)
 			}
diff --git a/pkg/expr/nodes.go b/pkg/expr/nodes.go
index 9385bff38c4..8468637ad0a 100644
--- a/pkg/expr/nodes.go
+++ b/pkg/expr/nodes.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"go.opentelemetry.io/otel/attribute"
 	"gonum.org/v1/gonum/graph/simple"
 
 	"github.com/grafana/grafana/pkg/expr/classic"
@@ -92,8 +93,8 @@ func (gn *CMDNode) NodeType() NodeType {
 // Execute runs the node and adds the results to vars. If the node requires
 // other nodes they must have already been executed and their results must
 // already by in vars.
-func (gn *CMDNode) Execute(ctx context.Context, now time.Time, vars mathexp.Vars, _ *Service) (mathexp.Results, error) {
-	return gn.Command.Execute(ctx, now, vars)
+func (gn *CMDNode) Execute(ctx context.Context, now time.Time, vars mathexp.Vars, s *Service) (mathexp.Results, error) {
+	return gn.Command.Execute(ctx, now, vars, s.tracer)
 }
 
 func buildCMDNode(dp *simple.DirectedGraph, rn *rawNode) (*CMDNode, error) {
@@ -203,6 +204,9 @@ func (s *Service) buildDSNode(dp *simple.DirectedGraph, rn *rawNode, req *Reques
 // already by in vars.
 func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s *Service) (r mathexp.Results, e error) {
 	logger := logger.FromContext(ctx).New("datasourceType", dn.datasource.Type, "queryRefId", dn.refID, "datasourceUid", dn.datasource.UID, "datasourceVersion", dn.datasource.Version)
+	ctx, span := s.tracer.Start(ctx, "SSE.ExecuteDatasourceQuery")
+	defer span.End()
+
 	dsInstanceSettings, err := adapters.ModelToInstanceSettings(dn.datasource, s.decryptSecureJsonDataFn(ctx))
 	if err != nil {
 		return mathexp.Results{}, fmt.Errorf("%v: %w", "failed to convert datasource instance settings", err)
@@ -213,6 +217,7 @@ func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s
 		PluginID:                   dn.datasource.Type,
 		User:                       dn.request.User,
 	}
+	span.SetAttributes("datasource.type", dn.datasource.Type, attribute.Key("datasource.type").String(dn.datasource.Type))
 
 	req := &backend.QueryDataRequest{
 		PluginContext: pc,
@@ -268,7 +273,7 @@ func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s
 	dt, useDataplane, _ = shouldUseDataplane(response.Frames, logger, s.features.IsEnabled(featuremgmt.FlagDisableSSEDataplane))
 	if useDataplane {
 		logger.Debug("Handling SSE data source query through dataplane", "datatype", dt)
-		return handleDataplaneFrames(dt.Kind(), response.Frames)
+		return handleDataplaneFrames(ctx, s.tracer, dt, response.Frames)
 	}
 
 	dataSource := dn.datasource.Type
diff --git a/pkg/expr/service.go b/pkg/expr/service.go
index 236487b81c6..cb6833c3202 100644
--- a/pkg/expr/service.go
+++ b/pkg/expr/service.go
@@ -8,6 +8,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -44,15 +45,17 @@ type Service struct {
 	dataSourceService datasources.DataSourceService
 	features          featuremgmt.FeatureToggles
 
+	tracer  tracing.Tracer
 	metrics *metrics
 }
 
-func ProvideService(cfg *setting.Cfg, pluginClient plugins.Client, dataSourceService datasources.DataSourceService, features featuremgmt.FeatureToggles, registerer prometheus.Registerer) *Service {
+func ProvideService(cfg *setting.Cfg, pluginClient plugins.Client, dataSourceService datasources.DataSourceService, features featuremgmt.FeatureToggles, registerer prometheus.Registerer, tracer tracing.Tracer) *Service {
 	return &Service{
 		cfg:               cfg,
 		dataService:       pluginClient,
 		dataSourceService: dataSourceService,
 		features:          features,
+		tracer:            tracer,
 		metrics:           newMetrics(registerer),
 	}
 }
@@ -71,6 +74,8 @@ func (s *Service) BuildPipeline(req *Request) (DataPipeline, error) {
 
 // ExecutePipeline executes an expression pipeline and returns all the results.
 func (s *Service) ExecutePipeline(ctx context.Context, now time.Time, pipeline DataPipeline) (*backend.QueryDataResponse, error) {
+	ctx, span := s.tracer.Start(ctx, "SSE.ExecutePipeline")
+	defer span.End()
 	res := backend.NewQueryDataResponse()
 	vars, err := pipeline.execute(ctx, now, s)
 	if err != nil {
diff --git a/pkg/expr/service_test.go b/pkg/expr/service_test.go
index 6adc152fe76..7cc930653b6 100644
--- a/pkg/expr/service_test.go
+++ b/pkg/expr/service_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	datafakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -34,6 +35,7 @@ func TestService(t *testing.T) {
 		dataService:       me,
 		dataSourceService: &datafakes.FakeDataSourceService{},
 		features:          &featuremgmt.FeatureManager{},
+		tracer:            tracing.InitializeTracerForTest(),
 		metrics:           newMetrics(nil),
 	}
 
diff --git a/pkg/expr/threshold.go b/pkg/expr/threshold.go
index 57f650fdca0..3d3b4f3e65c 100644
--- a/pkg/expr/threshold.go
+++ b/pkg/expr/threshold.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 )
 
 type ThresholdCommand struct {
@@ -89,7 +90,7 @@ func (tc *ThresholdCommand) NeedsVars() []string {
 	return []string{tc.ReferenceVar}
 }
 
-func (tc *ThresholdCommand) Execute(ctx context.Context, now time.Time, vars mathexp.Vars) (mathexp.Results, error) {
+func (tc *ThresholdCommand) Execute(ctx context.Context, now time.Time, vars mathexp.Vars, tracer tracing.Tracer) (mathexp.Results, error) {
 	mathExpression, err := createMathExpression(tc.ReferenceVar, tc.ThresholdFunc, tc.Conditions)
 	if err != nil {
 		return mathexp.Results{}, err
@@ -100,7 +101,7 @@ func (tc *ThresholdCommand) Execute(ctx context.Context, now time.Time, vars mat
 		return mathexp.Results{}, err
 	}
 
-	return mathCommand.Execute(ctx, now, vars)
+	return mathCommand.Execute(ctx, now, vars, tracer)
 }
 
 // createMathExpression converts all the info we have about a "threshold" expression in to a Math expression
diff --git a/pkg/expr/transform.go b/pkg/expr/transform.go
index 75e76dffb06..e7faa058c71 100644
--- a/pkg/expr/transform.go
+++ b/pkg/expr/transform.go
@@ -70,6 +70,7 @@ func (s *Service) TransformData(ctx context.Context, now time.Time, req *Request
 	}
 
 	start := time.Now()
+	ctx, span := s.tracer.Start(ctx, "SSE.TransformData")
 	defer func() {
 		var respStatus string
 		switch {
@@ -80,6 +81,8 @@ func (s *Service) TransformData(ctx context.Context, now time.Time, req *Request
 		}
 		duration := float64(time.Since(start).Nanoseconds()) / float64(time.Millisecond)
 		s.metrics.expressionsQuerySummary.WithLabelValues(respStatus).Observe(duration)
+
+		span.End()
 	}()
 
 	// Build the pipeline from the request, checking for ordering issues (e.g. loops)
diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go
index 9e53b5288ad..d0c31aa0ebc 100644
--- a/pkg/services/ngalert/eval/eval_test.go
+++ b/pkg/services/ngalert/eval/eval_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	fakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
@@ -533,7 +534,7 @@ func TestValidate(t *testing.T) {
 				pluginsStore: store,
 			})
 
-			evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil), store)
+			evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest()), store)
 			evalCtx := NewContext(context.Background(), u)
 
 			err := evaluator.Validate(evalCtx, condition)
diff --git a/pkg/services/ngalert/schedule/schedule_unit_test.go b/pkg/services/ngalert/schedule/schedule_unit_test.go
index ae147269857..47eca4f16fd 100644
--- a/pkg/services/ngalert/schedule/schedule_unit_test.go
+++ b/pkg/services/ngalert/schedule/schedule_unit_test.go
@@ -781,7 +781,7 @@ func setupScheduler(t *testing.T, rs *fakeRulesStore, is *state.FakeInstanceStor
 
 	var evaluator = evalMock
 	if evalMock == nil {
-		evaluator = eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, nil, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil), &plugins.FakePluginStore{})
+		evaluator = eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, nil, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest()), &plugins.FakePluginStore{})
 	}
 
 	if registry == nil {
diff --git a/pkg/services/query/query_test.go b/pkg/services/query/query_test.go
index 03add52eaeb..1c852adf123 100644
--- a/pkg/services/query/query_test.go
+++ b/pkg/services/query/query_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/plugins"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
@@ -446,7 +447,7 @@ func setup(t *testing.T) *testContext {
 		DataSources:           nil,
 		SimulatePluginFailure: false,
 	}
-	exprService := expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, pc, fakeDatasourceService, &featuremgmt.FeatureManager{}, nil)
+	exprService := expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, pc, fakeDatasourceService, &featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest())
 	queryService := ProvideService(setting.NewCfg(), dc, exprService, rv, ds, pc) // provider belonging to this package
 	return &testContext{
 		pluginContext:          pc,

From 15c9ced9445173a0cbf5e2cdb820ee59d816c055 Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Tue, 18 Apr 2023 13:05:52 +0100
Subject: [PATCH 210/729] Revert "APIkeys: Add metrics for apikey endpoints
 (#66732)" (#66754)

This reverts commit c505d26430e85baa20429675c8958d42ea67adf4.
---
 pkg/api/apikey.go            |  4 ----
 pkg/infra/metrics/metrics.go | 27 ---------------------------
 2 files changed, 31 deletions(-)

diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go
index 35f15fb1831..ecd2b1e03a0 100644
--- a/pkg/api/apikey.go
+++ b/pkg/api/apikey.go
@@ -9,7 +9,6 @@ import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/components/apikeygen"
-	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/apikey"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/web"
@@ -65,7 +64,6 @@ func (hs *HTTPServer) GetAPIKeys(c *contextmodel.ReqContext) response.Response {
 		}
 	}
 
-	metrics.MApiAPIkeysGet.Inc()
 	return response.JSON(http.StatusOK, result)
 }
 
@@ -101,7 +99,6 @@ func (hs *HTTPServer) DeleteAPIKey(c *contextmodel.ReqContext) response.Response
 		return response.Error(status, "Failed to delete API key", err)
 	}
 
-	metrics.MApiAPIkeysDelete.Inc()
 	return response.Success("API key deleted")
 }
 
@@ -169,7 +166,6 @@ func (hs *HTTPServer) AddAPIKey(c *contextmodel.ReqContext) response.Response {
 		Key:  newKeyInfo.ClientSecret,
 	}
 
-	metrics.MApiAPIkeysCreate.Inc()
 	return response.JSON(http.StatusOK, result)
 }
 
diff --git a/pkg/infra/metrics/metrics.go b/pkg/infra/metrics/metrics.go
index 4cce0d01d31..c90c2177c66 100644
--- a/pkg/infra/metrics/metrics.go
+++ b/pkg/infra/metrics/metrics.go
@@ -109,12 +109,6 @@ var (
 
 	// MPublicDashboardDatasourceQuerySuccess is a metric counter for successful queries labelled by datasource
 	MPublicDashboardDatasourceQuerySuccess *prometheus.CounterVec
-
-	MApiAPIkeysGet prometheus.Counter
-
-	MApiAPIkeysCreate prometheus.Counter
-
-	MApiAPIkeysDelete prometheus.Counter
 )
 
 // Timers
@@ -452,24 +446,6 @@ func init() {
 		Namespace: ExporterName,
 	}, []string{"datasource", "status"}, map[string][]string{"status": pubdash.QueryResultStatuses})
 
-	MApiAPIkeysGet = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
-		Name:      "api_api_keys_get_total",
-		Help:      "counter for getting api keys",
-		Namespace: ExporterName,
-	})
-
-	MApiAPIkeysCreate = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
-		Name:      "api_api_keys_create_total",
-		Help:      "counter for creating api keys",
-		Namespace: ExporterName,
-	})
-
-	MApiAPIkeysDelete = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
-		Name:      "api_api_keys_delete_total",
-		Help:      "counter for deleting api keys",
-		Namespace: ExporterName,
-	})
-
 	MStatTotalDashboards = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_totals_dashboard",
 		Help:      "total amount of dashboards",
@@ -739,8 +715,5 @@ func initMetricVars() {
 		MPublicDashboardRequestCount,
 		MPublicDashboardDatasourceQuerySuccess,
 		MStatTotalCorrelations,
-		MApiAPIkeysGet,
-		MApiAPIkeysCreate,
-		MApiAPIkeysDelete,
 	)
 }

From 9d69d3173f735c145f1601328e7c5f42795ac7d6 Mon Sep 17 00:00:00 2001
From: Kristina <kristina.durivage@grafana.com>
Date: Tue, 18 Apr 2023 07:17:30 -0500
Subject: [PATCH 211/729] Correlations: Add transformation editor (#66217)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* There was an attempt

* Change disabled state based on transformation type

* Add validation to transformation type

* Revert "Add validation to transformation type"

This reverts commit 2188a3d9a93aec5eeafcdd40510391ba1a53671a.

* Add validation to transformation type

* Move transformations editor to a separate file

* Make name more descriptive

* Ensure type dropdown has always the same width

* Add tooltips around transformation options

* Slight style changes

* Remove autofocus on append, integrate read only to transformationeditor, save values that disappear so they come back

* Remove yaml changes

* Have variable background color work with alternating colors on different themes

* Make expression required for regular expressions

* Remove unused empty form object

* Fix bug about transformation’s values saved in memory

* Better validation formatting for expression

* Add labels and (for now) non working test, attempt to fix saved transformation delete/add bug

* Fix datalink comment

* Remove fancy CSS due to background change

* Fix deleting saved transformation bug, finish tests

* Consolidate transformation types

* Double check aria labels

* Change aria labels, fix tests

* Add a transformation with the create correlation test

---------

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
---
 packages/grafana-data/src/types/dataLink.ts   |  11 +-
 packages/grafana-ui/src/types/forms.ts        |   4 +-
 .../correlations/CorrelationsPage.test.tsx    |  89 ++++-
 .../Forms/ConfigureCorrelationSourceForm.tsx  |  31 +-
 .../Forms/TransformationsEditor.tsx           | 315 ++++++++++++++++++
 .../app/features/correlations/Forms/types.ts  |   8 +
 .../features/correlations/transformations.ts  |   6 +-
 .../app/features/explore/utils/links.test.ts  |  20 +-
 8 files changed, 447 insertions(+), 37 deletions(-)
 create mode 100644 public/app/features/correlations/Forms/TransformationsEditor.tsx

diff --git a/packages/grafana-data/src/types/dataLink.ts b/packages/grafana-data/src/types/dataLink.ts
index 0e11beec147..c45a3ed7e7b 100644
--- a/packages/grafana-data/src/types/dataLink.ts
+++ b/packages/grafana-data/src/types/dataLink.ts
@@ -52,15 +52,20 @@ export interface DataLink<T extends DataQuery = any> {
   origin?: DataLinkConfigOrigin;
 }
 
-/** @internal */
-export enum SupportedTransformationTypes {
+/**
+ * We provide tooltips with information about these to guide the user, please
+ * check for validity when adding more transformation types.
+ *
+ * @internal
+ */
+export enum SupportedTransformationType {
   Regex = 'regex',
   Logfmt = 'logfmt',
 }
 
 /** @internal */
 export interface DataLinkTransformationConfig {
-  type: SupportedTransformationTypes;
+  type: SupportedTransformationType;
   field?: string;
   expression?: string;
   mapValue?: string;
diff --git a/packages/grafana-ui/src/types/forms.ts b/packages/grafana-ui/src/types/forms.ts
index 77b82c3f2c1..c5451524c95 100644
--- a/packages/grafana-ui/src/types/forms.ts
+++ b/packages/grafana-ui/src/types/forms.ts
@@ -1,4 +1,4 @@
-import { UseFormReturn, FieldValues, FieldErrors } from 'react-hook-form';
+import { UseFormReturn, FieldValues, FieldErrors, FieldArrayMethodProps } from 'react-hook-form';
 export type { SubmitHandler as FormsOnSubmit, FieldErrors as FormFieldErrors } from 'react-hook-form';
 
 export type FormAPI<T extends FieldValues> = Omit<UseFormReturn<T>, 'trigger' | 'handleSubmit'> & {
@@ -9,7 +9,7 @@ type FieldArrayValue = Partial<FieldValues> | Array<Partial<FieldValues>>;
 
 export interface FieldArrayApi {
   fields: Array<Record<string, any>>;
-  append: (value: FieldArrayValue) => void;
+  append: (value: FieldArrayValue, options?: FieldArrayMethodProps) => void;
   prepend: (value: FieldArrayValue) => void;
   remove: (index?: number | number[]) => void;
   swap: (indexA: number, indexB: number) => void;
diff --git a/public/app/features/correlations/CorrelationsPage.test.tsx b/public/app/features/correlations/CorrelationsPage.test.tsx
index abfdc10a78c..051841c88c1 100644
--- a/public/app/features/correlations/CorrelationsPage.test.tsx
+++ b/public/app/features/correlations/CorrelationsPage.test.tsx
@@ -2,12 +2,13 @@ import { render, waitFor, screen, fireEvent, within, Matcher, getByRole } from '
 import userEvent from '@testing-library/user-event';
 import { merge, uniqueId } from 'lodash';
 import React from 'react';
+import { openMenu } from 'react-select-event';
 import { Observable } from 'rxjs';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { MockDataSourceApi } from 'test/mocks/datasource_srv';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
-import { DataSourcePluginMeta } from '@grafana/data';
+import { DataSourcePluginMeta, SupportedTransformationType } from '@grafana/data';
 import { BackendSrv, setDataSourceSrv, BackendSrvRequest, reportInteraction } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
 import { configureStore } from 'app/store/configureStore';
@@ -274,6 +275,14 @@ describe('CorrelationsPage', () => {
 
       await userEvent.clear(screen.getByRole('textbox', { name: /results field/i }));
       await userEvent.type(screen.getByRole('textbox', { name: /results field/i }), 'Line');
+
+      // add transformation
+      await userEvent.click(screen.getByRole('button', { name: /add transformation/i }));
+      const typeFilterSelect = screen.getAllByLabelText('Type');
+      openMenu(typeFilterSelect[0]);
+      await userEvent.click(screen.getByText('Regular expression'));
+      await userEvent.type(screen.getByLabelText(/expression/i), 'test expression');
+
       await userEvent.click(await screen.findByRole('button', { name: /add$/i }));
 
       expect(mocks.reportInteraction).toHaveBeenLastCalledWith('grafana_correlations_added');
@@ -342,7 +351,14 @@ describe('CorrelationsPage', () => {
             targetUID: 'loki',
             uid: '1',
             label: 'Some label',
-            config: { field: 'line', target: {}, type: 'query' },
+            config: {
+              field: 'line',
+              target: {},
+              type: 'query',
+              transformations: [
+                { type: SupportedTransformationType.Regex, expression: 'url=http[s]?://(S*)', mapValue: 'path' },
+              ],
+            },
           },
           {
             sourceUID: 'prometheus',
@@ -472,12 +488,64 @@ describe('CorrelationsPage', () => {
 
       await userEvent.click(screen.getByRole('button', { name: /next$/i }));
       await userEvent.click(screen.getByRole('button', { name: /next$/i }));
+
       await userEvent.click(screen.getByRole('button', { name: /save$/i }));
 
       expect(await screen.findByRole('cell', { name: /edited label$/i })).toBeInTheDocument();
 
       expect(mocks.reportInteraction).toHaveBeenLastCalledWith('grafana_correlations_edited');
     });
+
+    it('correctly edits transformations', async () => {
+      // wait for table to appear
+      await screen.findByRole('table');
+
+      const tableRows = queryRowsByCellValue('Source', 'loki');
+
+      const rowExpanderButton = within(tableRows[0]).getByRole('button', { name: /toggle row expanded/i });
+      await userEvent.click(rowExpanderButton);
+
+      await userEvent.click(screen.getByRole('button', { name: /next$/i }));
+      await userEvent.click(screen.getByRole('button', { name: /next$/i }));
+
+      // select Logfmt, be sure expression field is disabled
+      let typeFilterSelect = screen.getAllByLabelText('Type');
+      openMenu(typeFilterSelect[0]);
+      await userEvent.click(screen.getByText('Logfmt'));
+
+      let expressionInput = screen.queryByLabelText(/expression/i);
+      expect(expressionInput).toBeInTheDocument();
+      expect(expressionInput).toBeDisabled();
+
+      // select Regex, be sure expression field is not disabled and contains the former expression
+      openMenu(typeFilterSelect[0]);
+      await userEvent.click(screen.getByText('Regular expression', { selector: 'span' }));
+      expressionInput = screen.queryByLabelText(/expression/i);
+      expect(expressionInput).toBeInTheDocument();
+      expect(expressionInput).toBeEnabled();
+      expect(expressionInput).toHaveAttribute('value', 'url=http[s]?://(S*)');
+
+      // select Logfmt, delete, then add a new one to be sure the value is blank
+      openMenu(typeFilterSelect[0]);
+      await userEvent.click(screen.getByText('Logfmt'));
+      await userEvent.click(screen.getByRole('button', { name: /remove transformation/i }));
+      expressionInput = screen.queryByLabelText(/expression/i);
+      expect(expressionInput).not.toBeInTheDocument();
+
+      await userEvent.click(screen.getByRole('button', { name: /add transformation/i }));
+      typeFilterSelect = screen.getAllByLabelText('Type');
+      openMenu(typeFilterSelect[0]);
+      await userEvent.click(screen.getByText('Regular expression'));
+      expressionInput = screen.queryByLabelText(/expression/i);
+      expect(expressionInput).toBeInTheDocument();
+      expect(expressionInput).toBeEnabled();
+      expect(expressionInput).not.toHaveValue('url=http[s]?://(S*)');
+      await userEvent.click(screen.getByRole('button', { name: /save$/i }));
+      expect(screen.getByText('Please define an expression')).toBeInTheDocument();
+      await userEvent.type(screen.getByLabelText(/expression/i), 'test expression');
+      await userEvent.click(screen.getByRole('button', { name: /save$/i }));
+      expect(mocks.reportInteraction).toHaveBeenLastCalledWith('grafana_correlations_edited');
+    });
   });
 
   describe('Read only correlations', () => {
@@ -487,7 +555,12 @@ describe('CorrelationsPage', () => {
         targetUID: 'loki',
         uid: '1',
         label: 'Some label',
-        config: { field: 'line', target: {}, type: 'query' },
+        config: {
+          field: 'line',
+          target: {},
+          type: 'query',
+          transformations: [{ type: SupportedTransformationType.Regex, expression: '(?:msg)=' }],
+        },
       },
     ];
 
@@ -532,6 +605,16 @@ describe('CorrelationsPage', () => {
       expect(descriptionInput).toBeInTheDocument();
       expect(descriptionInput).toHaveAttribute('readonly');
 
+      await userEvent.click(screen.getByRole('button', { name: /next$/i }));
+      await userEvent.click(screen.getByRole('button', { name: /next$/i }));
+
+      // expect the transformation to exist but be read only
+      const expressionInput = screen.queryByLabelText(/expression/i);
+      expect(expressionInput).toBeInTheDocument();
+      expect(expressionInput).toHaveAttribute('readonly');
+      expect(screen.queryByRole('button', { name: 'add transformation' })).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: 'remove transformation' })).not.toBeInTheDocument();
+
       // we don't expect the save button to be rendered
       expect(screen.queryByRole('button', { name: 'save' })).not.toBeInTheDocument();
     });
diff --git a/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx b/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx
index f60d62a118c..4588e881a7b 100644
--- a/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx
+++ b/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx
@@ -9,6 +9,7 @@ import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 
 import { getVariableUsageInfo } from '../../explore/utils/links';
 
+import { TransformationsEditor } from './TransformationsEditor';
 import { useCorrelationsFormContext } from './correlationsFormContext';
 import { getInputId } from './utils';
 
@@ -33,12 +34,11 @@ export const ConfigureCorrelationSourceForm = () => {
   const variables = getVariableUsageInfo(currentTargetQuery, {}).variables.map(
     (variable) => variable.variableName + (variable.fieldPath ? `.${variable.fieldPath}` : '')
   );
-
   return (
     <>
       <FieldSet label="Configure source data source (3/3)">
         <p>
-          Links are displayed with results of the selected origin source data. They shown along with the value of the
+          Links are displayed with results of the selected origin source data. They show along with the value of the
           provided <em>results field</em>.
         </p>
         <Controller
@@ -84,27 +84,26 @@ export const ConfigureCorrelationSourceForm = () => {
             readOnly={readOnly}
           />
         </Field>
-
         {variables.length > 0 && (
           <Card>
             <Card.Heading>Variables used in the target query</Card.Heading>
             <Card.Description>
-              <div>
-                You have used following variables in the target query:{' '}
-                {variables.map((name, i) => (
-                  <span className={styles.variable} key={i}>
-                    {name}
-                    {i < variables.length - 1 ? ', ' : ''}
-                  </span>
-                ))}
-              </div>
-              <div>
-                A data point needs to provide values to all variables as fields or as transformations output to make the
-                correlation button appear in the visualization.
-              </div>
+              You have used following variables in the target query:{' '}
+              {variables.map((name, i) => (
+                <span className={styles.variable} key={i}>
+                  {name}
+                  {i < variables.length - 1 ? ', ' : ''}
+                </span>
+              ))}
+              <br />A data point needs to provide values to all variables as fields or as transformations output to make
+              the correlation button appear in the visualization.
+              <br />
+              Note: Not every variable needs to be explicitly defined below. A transformation such as{' '}
+              <span className={styles.variable}>logfmt</span> will create variables for every key/value pair.
             </Card.Description>
           </Card>
         )}
+        <TransformationsEditor readOnly={readOnly} />
       </FieldSet>
     </>
   );
diff --git a/public/app/features/correlations/Forms/TransformationsEditor.tsx b/public/app/features/correlations/Forms/TransformationsEditor.tsx
new file mode 100644
index 00000000000..a388bf55505
--- /dev/null
+++ b/public/app/features/correlations/Forms/TransformationsEditor.tsx
@@ -0,0 +1,315 @@
+import { css } from '@emotion/css';
+import { compact, fill } from 'lodash';
+import React, { useState } from 'react';
+import { useFormContext } from 'react-hook-form';
+
+import { GrafanaTheme2, SupportedTransformationType } from '@grafana/data';
+import { Stack } from '@grafana/experimental';
+import {
+  Button,
+  Field,
+  FieldArray,
+  Icon,
+  IconButton,
+  Input,
+  InputControl,
+  Label,
+  Select,
+  Tooltip,
+  useStyles2,
+} from '@grafana/ui';
+
+type Props = { readOnly: boolean };
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  heading: css`
+    font-size: ${theme.typography.h5.fontSize};
+    font-weight: ${theme.typography.fontWeightRegular};
+  `,
+  // set fixed position from the top instead of centring as the container
+  // may get bigger when the for is invalid
+  removeButton: css`
+    margin-top: 25px;
+  `,
+});
+
+export const TransformationsEditor = (props: Props) => {
+  const { control, formState, register, setValue, watch, getValues } = useFormContext();
+  const { readOnly } = props;
+  const [keptVals, setKeptVals] = useState<Array<{ expression?: string; mapValue?: string }>>([]);
+
+  const styles = useStyles2(getStyles);
+
+  const transformOptions = getTransformOptions();
+  return (
+    <>
+      <input type="hidden" {...register('id')} />
+      <FieldArray name="config.transformations" control={control}>
+        {({ fields, append, remove }) => (
+          <>
+            <Stack direction="column" alignItems="flex-start">
+              <div className={styles.heading}>Transformations</div>
+              {fields.length === 0 && <div> No transformations defined.</div>}
+              {fields.length > 0 && (
+                <div>
+                  {fields.map((fieldVal, index) => {
+                    return (
+                      <Stack direction="row" key={fieldVal.id} alignItems="top">
+                        <Field
+                          label={
+                            <Stack gap={0.5}>
+                              <Label htmlFor={`config.transformations.${fieldVal.id}-${index}.type`}>Type</Label>
+                              <Tooltip
+                                content={
+                                  <div>
+                                    <p>The type of transformation that will be applied to the source data.</p>
+                                  </div>
+                                }
+                              >
+                                <Icon name="info-circle" size="sm" />
+                              </Tooltip>
+                            </Stack>
+                          }
+                          invalid={!!formState.errors?.config?.transformations?.[index]?.type}
+                          error={formState.errors?.config?.transformations?.[index]?.type?.message}
+                          validationMessageHorizontalOverflow={true}
+                        >
+                          <InputControl
+                            render={({ field: { onChange, ref, ...field } }) => {
+                              // input control field is not manipulated with remove, use value from control
+                              return (
+                                <Select
+                                  {...field}
+                                  value={fieldVal.type}
+                                  onChange={(value) => {
+                                    if (!readOnly) {
+                                      const currentValues = getValues().config.transformations[index];
+                                      let keptValsCopy = fill(Array(index + 1), {});
+                                      keptVals.forEach((keptVal, i) => (keptValsCopy[i] = keptVal));
+                                      keptValsCopy[index] = {
+                                        expression: currentValues.expression,
+                                        mapValue: currentValues.mapValue,
+                                      };
+
+                                      setKeptVals(keptValsCopy);
+
+                                      const newValueDetails = getSupportedTransTypeDetails(value.value);
+
+                                      if (newValueDetails.showExpression) {
+                                        setValue(
+                                          `config.transformations.${index}.expression`,
+                                          keptVals[index]?.expression || ''
+                                        );
+                                      } else {
+                                        setValue(`config.transformations.${index}.expression`, '');
+                                      }
+
+                                      if (newValueDetails.showMapValue) {
+                                        setValue(
+                                          `config.transformations.${index}.mapValue`,
+                                          keptVals[index]?.mapValue || ''
+                                        );
+                                      } else {
+                                        setValue(`config.transformations.${index}.mapValue`, '');
+                                      }
+
+                                      onChange(value.value);
+                                    }
+                                  }}
+                                  options={transformOptions}
+                                  width={25}
+                                  inputId={`config.transformations.${fieldVal.id}-${index}.type`}
+                                />
+                              );
+                            }}
+                            control={control}
+                            name={`config.transformations.${index}.type`}
+                            rules={{ required: { value: true, message: 'Please select a transformation type' } }}
+                          />
+                        </Field>
+                        <Field
+                          label={
+                            <Stack gap={0.5}>
+                              <Label htmlFor={`config.transformations.${fieldVal.id}.field`}>Field</Label>
+                              <Tooltip
+                                content={
+                                  <div>
+                                    <p>
+                                      Optional. The field to transform. If not specified, the transformation will be
+                                      applied to the results field.
+                                    </p>
+                                  </div>
+                                }
+                              >
+                                <Icon name="info-circle" size="sm" />
+                              </Tooltip>
+                            </Stack>
+                          }
+                        >
+                          <Input
+                            {...register(`config.transformations.${index}.field`)}
+                            readOnly={readOnly}
+                            defaultValue={fieldVal.field}
+                            label="field"
+                            id={`config.transformations.${fieldVal.id}.field`}
+                          />
+                        </Field>
+                        <Field
+                          label={
+                            <Stack gap={0.5}>
+                              <Label htmlFor={`config.transformations.${fieldVal.id}.expression`}>
+                                Expression
+                                {getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`))
+                                  .requireExpression
+                                  ? ' *'
+                                  : ''}
+                              </Label>
+                              <Tooltip
+                                content={
+                                  <div>
+                                    <p>
+                                      Required for regular expression. The expression the transformation will use.
+                                      Logfmt does not use further specifications.
+                                    </p>
+                                  </div>
+                                }
+                              >
+                                <Icon name="info-circle" size="sm" />
+                              </Tooltip>
+                            </Stack>
+                          }
+                          invalid={!!formState.errors?.config?.transformations?.[index]?.expression}
+                          error={formState.errors?.config?.transformations?.[index]?.expression?.message}
+                        >
+                          <Input
+                            {...register(`config.transformations.${index}.expression`, {
+                              required: getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`))
+                                .requireExpression
+                                ? 'Please define an expression'
+                                : undefined,
+                            })}
+                            defaultValue={fieldVal.expression}
+                            readOnly={readOnly}
+                            disabled={
+                              !getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`))
+                                .showExpression
+                            }
+                            id={`config.transformations.${fieldVal.id}.expression`}
+                          />
+                        </Field>
+                        <Field
+                          label={
+                            <Stack gap={0.5}>
+                              <Label htmlFor={`config.transformations.${fieldVal.id}.mapValue`}>Map value</Label>
+                              <Tooltip
+                                content={
+                                  <div>
+                                    <p>
+                                      Optional. Defines the name of the variable. This is currently only valid for
+                                      regular expressions with a single, unnamed capture group.
+                                    </p>
+                                  </div>
+                                }
+                              >
+                                <Icon name="info-circle" size="sm" />
+                              </Tooltip>
+                            </Stack>
+                          }
+                        >
+                          <Input
+                            {...register(`config.transformations.${index}.mapValue`)}
+                            defaultValue={fieldVal.mapValue}
+                            readOnly={readOnly}
+                            disabled={
+                              !getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`)).showMapValue
+                            }
+                            id={`config.transformations.${fieldVal.id}.mapValue`}
+                          />
+                        </Field>
+                        {!readOnly && (
+                          <div className={styles.removeButton}>
+                            <IconButton
+                              type="button"
+                              tooltip="Remove transformation"
+                              name={'trash-alt'}
+                              onClick={() => {
+                                remove(index);
+                                const keptValsCopy: Array<{ expression?: string; mapValue?: string } | undefined> = [
+                                  ...keptVals,
+                                ];
+                                keptValsCopy[index] = undefined;
+                                setKeptVals(compact(keptValsCopy));
+                              }}
+                              ariaLabel="Remove transformation"
+                            >
+                              Remove
+                            </IconButton>
+                          </div>
+                        )}
+                      </Stack>
+                    );
+                  })}
+                </div>
+              )}
+              {!readOnly && (
+                <Button
+                  icon="plus"
+                  onClick={() => append({ type: undefined }, { shouldFocus: false })}
+                  variant="secondary"
+                  type="button"
+                >
+                  Add transformation
+                </Button>
+              )}
+            </Stack>
+          </>
+        )}
+      </FieldArray>
+    </>
+  );
+};
+
+interface SupportedTransformationTypeDetails {
+  label: string;
+  value: string;
+  description?: string;
+  showExpression: boolean;
+  showMapValue: boolean;
+  requireExpression?: boolean;
+}
+
+function getSupportedTransTypeDetails(transType: SupportedTransformationType): SupportedTransformationTypeDetails {
+  switch (transType) {
+    case SupportedTransformationType.Logfmt:
+      return {
+        label: 'Logfmt',
+        value: SupportedTransformationType.Logfmt,
+        description: 'Parse provided field with logfmt to get variables',
+        showExpression: false,
+        showMapValue: false,
+      };
+    case SupportedTransformationType.Regex:
+      return {
+        label: 'Regular expression',
+        value: SupportedTransformationType.Regex,
+        description:
+          'Field will be parsed with regex. Use named capture groups to return multiple variables, or a single unnamed capture group to add variable to named map value.',
+        showExpression: true,
+        showMapValue: true,
+        requireExpression: true,
+      };
+    default:
+      return { label: transType, value: transType, showExpression: false, showMapValue: false };
+  }
+}
+
+const getTransformOptions = () => {
+  return Object.values(SupportedTransformationType).map((transformationType) => {
+    const transType = getSupportedTransTypeDetails(transformationType);
+    return {
+      label: transType.label,
+      value: transType.value,
+      description: transType.description,
+    };
+  });
+};
diff --git a/public/app/features/correlations/Forms/types.ts b/public/app/features/correlations/Forms/types.ts
index 368c83f6cee..d3e10e581c4 100644
--- a/public/app/features/correlations/Forms/types.ts
+++ b/public/app/features/correlations/Forms/types.ts
@@ -1,3 +1,5 @@
+import { SupportedTransformationType } from '@grafana/data';
+
 import { CorrelationConfig } from '../types';
 
 export interface FormDTO {
@@ -9,3 +11,9 @@ export interface FormDTO {
 }
 
 export type EditFormDTO = Omit<FormDTO, 'targetUID' | 'sourceUID'>;
+
+export type TransformationDTO = {
+  type: SupportedTransformationType;
+  expression?: string;
+  mapValue?: string;
+};
diff --git a/public/app/features/correlations/transformations.ts b/public/app/features/correlations/transformations.ts
index 86d9c98cb5b..6754d299545 100644
--- a/public/app/features/correlations/transformations.ts
+++ b/public/app/features/correlations/transformations.ts
@@ -1,6 +1,6 @@
 import logfmt from 'logfmt';
 
-import { ScopedVars, DataLinkTransformationConfig, SupportedTransformationTypes } from '@grafana/data';
+import { ScopedVars, DataLinkTransformationConfig, SupportedTransformationType } from '@grafana/data';
 import { safeStringifyValue } from 'app/core/utils/explore';
 
 export const getTransformationVars = (
@@ -10,7 +10,7 @@ export const getTransformationVars = (
 ): ScopedVars => {
   let transformationScopedVars: ScopedVars = {};
   let transformVal: { [key: string]: string | boolean | null | undefined } = {};
-  if (transformation.type === SupportedTransformationTypes.Regex && transformation.expression) {
+  if (transformation.type === SupportedTransformationType.Regex && transformation.expression) {
     const regexp = new RegExp(transformation.expression, 'gi');
     const matches = fieldValue.matchAll(regexp);
     for (const match of matches) {
@@ -20,7 +20,7 @@ export const getTransformationVars = (
         transformVal[transformation.mapValue || fieldName] = match[1] || match[0];
       }
     }
-  } else if (transformation.type === SupportedTransformationTypes.Logfmt) {
+  } else if (transformation.type === SupportedTransformationType.Logfmt) {
     transformVal = logfmt.parse(fieldValue);
   }
 
diff --git a/public/app/features/explore/utils/links.test.ts b/public/app/features/explore/utils/links.test.ts
index 86f84abd7d1..f8bd1fa9e2c 100644
--- a/public/app/features/explore/utils/links.test.ts
+++ b/public/app/features/explore/utils/links.test.ts
@@ -8,7 +8,7 @@ import {
   Field,
   FieldType,
   InterpolateFunction,
-  SupportedTransformationTypes,
+  SupportedTransformationType,
   TimeRange,
   toDataFrame,
 } from '@grafana/data';
@@ -285,8 +285,8 @@ describe('explore links utils', () => {
           datasourceUid: 'uid_1',
           datasourceName: 'test_ds',
           transformations: [
-            { type: SupportedTransformationTypes.Logfmt },
-            { type: SupportedTransformationTypes.Regex, expression: 'host=(dev|prod)', mapValue: 'environment' },
+            { type: SupportedTransformationType.Logfmt },
+            { type: SupportedTransformationType.Regex, expression: 'host=(dev|prod)', mapValue: 'environment' },
           ],
         },
       };
@@ -334,8 +334,8 @@ describe('explore links utils', () => {
           datasourceUid: 'uid_1',
           datasourceName: 'test_ds',
           transformations: [
-            { type: SupportedTransformationTypes.Regex, expression: 'fieldA=(asparagus|broccoli)' },
-            { type: SupportedTransformationTypes.Regex, expression: 'fieldB=(apple|banana)' },
+            { type: SupportedTransformationType.Regex, expression: 'fieldA=(asparagus|broccoli)' },
+            { type: SupportedTransformationType.Regex, expression: 'fieldB=(apple|banana)' },
           ],
         },
       };
@@ -375,7 +375,7 @@ describe('explore links utils', () => {
           query: { query: 'http_requests{app=${application} isOnline=${online}}' },
           datasourceUid: 'uid_1',
           datasourceName: 'test_ds',
-          transformations: [{ type: SupportedTransformationTypes.Logfmt }],
+          transformations: [{ type: SupportedTransformationType.Logfmt }],
         },
       };
 
@@ -414,7 +414,7 @@ describe('explore links utils', () => {
           query: { query: 'http_requests{app=${application}}' },
           datasourceUid: 'uid_1',
           datasourceName: 'test_ds',
-          transformations: [{ type: SupportedTransformationTypes.Logfmt, field: 'fieldNamedInTransformation' }],
+          transformations: [{ type: SupportedTransformationType.Logfmt, field: 'fieldNamedInTransformation' }],
         },
       };
 
@@ -468,7 +468,7 @@ describe('explore links utils', () => {
           datasourceName: 'test_ds',
           transformations: [
             {
-              type: SupportedTransformationTypes.Regex,
+              type: SupportedTransformationType.Regex,
               expression: '(?=.*(?<application>(grafana|loki)))(?=.*(?<environment>(dev|prod)))',
             },
           ],
@@ -546,7 +546,7 @@ describe('explore links utils', () => {
           query: { query: 'http_requests{app=${application} env=${diffVar}}' },
           datasourceUid: 'uid_1',
           datasourceName: 'test_ds',
-          transformations: [{ type: SupportedTransformationTypes.Logfmt }],
+          transformations: [{ type: SupportedTransformationType.Logfmt }],
         },
       };
 
@@ -571,7 +571,7 @@ describe('explore links utils', () => {
           query: { query: 'http_requests{app=test}' },
           datasourceUid: 'uid_1',
           datasourceName: 'test_ds',
-          transformations: [{ type: SupportedTransformationTypes.Logfmt }],
+          transformations: [{ type: SupportedTransformationType.Logfmt }],
         },
       };
 

From 948131aac3ba136a336f06cfe9dd982bcba3896b Mon Sep 17 00:00:00 2001
From: Emil Tullstedt <emil.tullstedt@grafana.com>
Date: Tue, 18 Apr 2023 14:21:38 +0200
Subject: [PATCH 212/729] Annotations: Ignore unique constraint violations for
 tags (#65935)

---
 pkg/services/tag/tagimpl/xorm_store.go | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkg/services/tag/tagimpl/xorm_store.go b/pkg/services/tag/tagimpl/xorm_store.go
index 1bf77111c9d..834dc48e334 100644
--- a/pkg/services/tag/tagimpl/xorm_store.go
+++ b/pkg/services/tag/tagimpl/xorm_store.go
@@ -14,16 +14,18 @@ type sqlStore struct {
 func (s *sqlStore) EnsureTagsExist(ctx context.Context, tags []*tag.Tag) ([]*tag.Tag, error) {
 	err := s.db.WithDbSession(ctx, func(sess *db.Session) error {
 		for _, tagElement := range tags {
-			var existingTag tag.Tag
-			exists, err := sess.Table("tag").Where("`key`=? AND `value`=?", tagElement.Key, tagElement.Value).Get(&existingTag)
+			exists, err := s.innerGetTag(sess, tagElement)
 			if err != nil {
 				return err
 			}
-			if exists {
-				tagElement.Id = existingTag.Id
-			} else {
+			if !exists {
 				_, err := sess.Table("tag").Insert(tagElement)
 				if err != nil {
+					if s.db.GetDialect().IsUniqueConstraintViolation(err) {
+						_, err := s.innerGetTag(sess, tagElement)
+						return err
+					}
+
 					return err
 				}
 			}
@@ -32,3 +34,17 @@ func (s *sqlStore) EnsureTagsExist(ctx context.Context, tags []*tag.Tag) ([]*tag
 	})
 	return tags, err
 }
+
+func (s *sqlStore) innerGetTag(sess *db.Session, tagElement *tag.Tag) (bool, error) {
+	var existingTag tag.Tag
+	exists, err := sess.Table("tag").Where("`key`=? AND `value`=?", tagElement.Key, tagElement.Value).Get(&existingTag)
+	if err != nil {
+		return false, err
+	}
+	if !exists {
+		return false, nil
+	}
+
+	tagElement.Id = existingTag.Id
+	return true, nil
+}

From 28b8d564feac14619fcd374b19fdf8aaefda700a Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 18 Apr 2023 13:42:40 +0100
Subject: [PATCH 213/729] NestedFolders: Add link to new work-in-progress UI
 (#66684)

---
 .../search/components/DashboardListPage.tsx       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx
index 8c21db76909..12bdd25350f 100644
--- a/public/app/features/search/components/DashboardListPage.tsx
+++ b/public/app/features/search/components/DashboardListPage.tsx
@@ -3,7 +3,8 @@ import React, { memo } from 'react';
 import { useAsync } from 'react-use';
 
 import { locationUtil, NavModelItem } from '@grafana/data';
-import { locationService } from '@grafana/runtime';
+import { config, locationService } from '@grafana/runtime';
+import { Badge, Link } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { FolderDTO } from 'app/types';
 
@@ -40,7 +41,17 @@ export const DashboardListPage = memo(({ match, location }: Props) => {
   }, [match.params.uid]);
 
   return (
-    <Page navId="dashboards/browse" pageNav={value?.pageNav}>
+    <Page
+      navId="dashboards/browse"
+      pageNav={value?.pageNav}
+      actions={
+        config.featureToggles.nestedFolders && (
+          <Link href="/nested-dashboards">
+            <Badge icon="folder" color="blue" text="Try WIP nested folders UI" />
+          </Link>
+        )
+      }
+    >
       <Page.Contents
         isLoading={loading}
         className={css`

From 614427c60232e3bfc59f10e05ad2a40d9f433883 Mon Sep 17 00:00:00 2001
From: Guilherme Caulada <guilherme.caulada@grafana.com>
Date: Tue, 18 Apr 2023 10:03:27 -0300
Subject: [PATCH 214/729] Build: Add optional build-args for COMMIT_SHA and
 BUILD_BRANCH (#66672)

* Remove .git from .dockerignore

* Revert "Remove .git from .dockerignore"

This reverts commit 5a4658f270220680a394f43c6f15498836396c23.

* Add optional COMMIT_SHA and BUILD_BRANCH environment variables
---
 Dockerfile       |  6 +++++-
 Makefile         |  4 ++++
 pkg/build/cmd.go | 14 ++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 621cbe5443f..3d4f4dbdbe8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,8 @@ RUN yarn build
 
 FROM ${GO_IMAGE} as go-builder
 
+ARG COMMIT_SHA=""
+ARG BUILD_BRANCH=""
 ARG GO_BUILD_TAGS="oss"
 ARG WIRE_TAGS="oss"
 ARG BINGO="true"
@@ -62,7 +64,9 @@ COPY pkg pkg
 COPY scripts scripts
 COPY conf conf
 COPY .github .github
-COPY .git .git
+
+ENV COMMIT_SHA=${COMMIT_SHA}
+ENV BUILD_BRANCH=${BUILD_BRANCH}
 
 RUN make build-go GO_BUILD_TAGS=${GO_BUILD_TAGS} WIRE_TAGS=${WIRE_TAGS}
 
diff --git a/Makefile b/Makefile
index 327ec29b095..b91a2e36b11 100644
--- a/Makefile
+++ b/Makefile
@@ -191,6 +191,8 @@ build-docker-full: ## Build Docker image for development.
 	--build-arg BINGO=false \
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
+	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
+	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--tag grafana/grafana$(TAG_SUFFIX):dev \
 	$(DOCKER_BUILD_ARGS)
 
@@ -202,6 +204,8 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg BINGO=false \
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
+	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
+	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--build-arg BASE_IMAGE=ubuntu:20.04 \
 	--build-arg GO_IMAGE=golang:1.20.3 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
diff --git a/pkg/build/cmd.go b/pkg/build/cmd.go
index 93de968f7b4..7248c91080d 100644
--- a/pkg/build/cmd.go
+++ b/pkg/build/cmd.go
@@ -217,12 +217,22 @@ func ldflags(opts BuildOpts) (string, error) {
 		return "", err
 	}
 
+	commitSha := getGitSha()
+	if v := os.Getenv("COMMIT_SHA"); v != "" {
+		commitSha = v
+	}
+
+	buildBranch := getGitBranch()
+	if v := os.Getenv("BUILD_BRANCH"); v != "" {
+		buildBranch = v
+	}
+
 	var b bytes.Buffer
 	b.WriteString("-w")
 	b.WriteString(fmt.Sprintf(" -X main.version=%s", opts.version))
-	b.WriteString(fmt.Sprintf(" -X main.commit=%s", getGitSha()))
+	b.WriteString(fmt.Sprintf(" -X main.commit=%s", commitSha))
 	b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp))
-	b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
+	b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", buildBranch))
 	if v := os.Getenv("LDFLAGS"); v != "" {
 		b.WriteString(fmt.Sprintf(" -extldflags \"%s\"", v))
 	}

From f64a89727ef03b165cc4560c58451801d45d81f3 Mon Sep 17 00:00:00 2001
From: Alex Moreno <alexander.moreno@grafana.com>
Date: Tue, 18 Apr 2023 15:10:36 +0200
Subject: [PATCH 215/729] Alerting: Allow provenance disable in alerting
 provisioning API (#63650)

* Allow provenance None in alert rule update and rule group replace

* Allow provenance None in contact point update

* Allow updating policies to none by sending x-disable-provenance header

* Allow mute timings to disable provenance with x-disable-provenance header

* Allow disabling provenance by using x-disable-provenance header

* Add provenance helper to lower the cyclomatic complexity

* Do not downgrade provenance except un ReplaceRuleGroup

* Add function explanation and change error handling

* Add docs for x-disable-provenance changes (#66300)

* Add docs for x-disable-provenance changes

* Apply suggestions from code review

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Update _index.md

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Update docs/sources/alerting/set-up/provision-alerting-resources/_index.md

Co-authored-by: George Robinson <george.robinson@grafana.com>

* Add error message check in tests

* Change docs

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
Co-authored-by: George Robinson <george.robinson@grafana.com>
---
 .../provision-alerting-resources/_index.md    |  19 ++-
 .../http_api/alerting_provisioning.md         |  66 +++++----
 pkg/services/ngalert/api/api_provisioning.go  |  36 ++---
 .../ngalert/provisioning/alert_rules.go       |  16 +--
 .../ngalert/provisioning/alert_rules_test.go  |   4 +-
 .../ngalert/provisioning/contactpoints.go     |   4 +-
 .../provisioning/contactpoints_test.go        | 135 +++++++++---------
 .../ngalert/provisioning/provenance.go        |  13 ++
 8 files changed, 157 insertions(+), 136 deletions(-)
 create mode 100644 pkg/services/ngalert/provisioning/provenance.go

diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
index 1c2e5fd6787..854c4094dd1 100644
--- a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
+++ b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
@@ -24,22 +24,21 @@ There are three options to choose from:
 
    For more information on the Alerting Provisioning HTTP API, refer to [Alerting provisioning API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/).
 
-   **Note:**
-
-   Typically, you cannot edit API-provisioned alert rules from the Grafana UI.
-
-   In order to enable editing, add the x-disable-provenance header to the following requests when creating or editing your alert rules in the API:
-
-   POST /api/v1/provisioning/alert-rules
-
-   PUT /api/v1/provisioning/alert-rules/{UID}
-
 1. Provision your alerting resources using Terraform.
 
 **Note:**
 
 Currently, provisioning for Grafana Alerting supports alert rules, contact points, mute timings, and templates. Provisioned alerting resources using file provisioning or Terraform can only be edited in the source that created them and not from within Grafana or any other source. For example, if you provision your alerting resources using files from disk, you cannot edit the data in Terraform or from within Grafana.
 
+To allow editing of provisioned resources in the Grafana UI, add the `X-Disable-Provenance` header to the following requests in the API:
+
+- `POST /api/v1/provisioning/alert-rules`
+- `PUT /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}` (calling this endpoint will change provenance for all alert rules within the alert group)
+- `POST /api/v1/provisioning/contact-points`
+- `POST /api/v1/provisioning/mute-timings`
+- `PUT /api/v1/provisioning/policies`
+- `PUT /api/v1/provisioning/templates/{name}`
+
 **Useful Links:**
 
 [Grafana provisioning](/docs/grafana/latest/administration/provisioning/)
diff --git a/docs/sources/developers/http_api/alerting_provisioning.md b/docs/sources/developers/http_api/alerting_provisioning.md
index 7187f18356c..1827128b76b 100644
--- a/docs/sources/developers/http_api/alerting_provisioning.md
+++ b/docs/sources/developers/http_api/alerting_provisioning.md
@@ -96,9 +96,10 @@ DELETE /api/v1/provisioning/alert-rules/{UID}
 
 #### Parameters
 
-| Name | Source | Type   | Go type  | Separator | Required | Default | Description    |
-| ---- | ------ | ------ | -------- | --------- | :------: | ------- | -------------- |
-| UID  | `path` | string | `string` |           |    ✓     |         | Alert rule UID |
+| Name                 | Source   | Type   | Go type  | Separator | Required | Default | Description    |
+| -------------------- | -------- | ------ | -------- | --------- | :------: | ------- | -------------- |
+| UID                  | `path`   | string | `string` |           |    ✓     |         | Alert rule UID |
+| X-Disable-Provenance | `header` | string | `string` |           |          |         |                |
 
 #### All responses
 
@@ -637,9 +638,10 @@ POST /api/v1/provisioning/contact-points
 
 #### Parameters
 
-| Name | Source | Type                                            | Go type                       | Separator | Required | Default | Description |
-| ---- | ------ | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | ----------- |
-| Body | `body` | [EmbeddedContactPoint](#embedded-contact-point) | `models.EmbeddedContactPoint` |           |          |         |             |
+| Name                 | Source   | Type                                            | Go type                       | Separator | Required | Default | Description |
+| -------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | ----------- |
+| X-Disable-Provenance | `header` | string                                          | `string`                      |           |          |         |             |
+| Body                 | `body`   | [EmbeddedContactPoint](#embedded-contact-point) | `models.EmbeddedContactPoint` |           |          |         |             |
 
 #### All responses
 
@@ -678,9 +680,10 @@ POST /api/v1/provisioning/mute-timings
 
 #### Parameters
 
-| Name | Source | Type                                    | Go type                   | Separator | Required | Default | Description |
-| ---- | ------ | --------------------------------------- | ------------------------- | --------- | :------: | ------- | ----------- |
-| Body | `body` | [MuteTimeInterval](#mute-time-interval) | `models.MuteTimeInterval` |           |          |         |             |
+| Name                 | Source   | Type                                    | Go type                   | Separator | Required | Default | Description |
+| -------------------- | -------- | --------------------------------------- | ------------------------- | --------- | :------: | ------- | ----------- |
+| X-Disable-Provenance | `header` | string                                  | `string`                  |           |          |         |             |
+| Body                 | `body`   | [MuteTimeInterval](#mute-time-interval) | `models.MuteTimeInterval` |           |          |         |             |
 
 #### All responses
 
@@ -762,11 +765,12 @@ PUT /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}
 
 #### Parameters
 
-| Name      | Source | Type                                | Go type                 | Separator | Required | Default | Description |
-| --------- | ------ | ----------------------------------- | ----------------------- | --------- | :------: | ------- | ----------- |
-| FolderUID | `path` | string                              | `string`                |           |    ✓     |         |             |
-| Group     | `path` | string                              | `string`                |           |    ✓     |         |             |
-| Body      | `body` | [AlertRuleGroup](#alert-rule-group) | `models.AlertRuleGroup` |           |          |         |             |
+| Name                 | Source   | Type                                | Go type                 | Separator | Required | Default | Description |
+| -------------------- | -------- | ----------------------------------- | ----------------------- | --------- | :------: | ------- | ----------- |
+| FolderUID            | `path`   | string                              | `string`                |           |    ✓     |         |             |
+| Group                | `path`   | string                              | `string`                |           |    ✓     |         |             |
+| X-Disable-Provenance | `header` | string                              | `string`                |           |          |         |             |
+| Body                 | `body`   | [AlertRuleGroup](#alert-rule-group) | `models.AlertRuleGroup` |           |          |         |             |
 
 #### All responses
 
@@ -805,10 +809,11 @@ PUT /api/v1/provisioning/contact-points/{UID}
 
 #### Parameters
 
-| Name | Source | Type                                            | Go type                       | Separator | Required | Default | Description                                |
-| ---- | ------ | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | ------------------------------------------ |
-| UID  | `path` | string                                          | `string`                      |           |    ✓     |         | UID is the contact point unique identifier |
-| Body | `body` | [EmbeddedContactPoint](#embedded-contact-point) | `models.EmbeddedContactPoint` |           |          |         |                                            |
+| Name                 | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                |
+| -------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | ------------------------------------------ |
+| UID                  | `path`   | string                                          | `string`                      |           |    ✓     |         | UID is the contact point unique identifier |
+| X-Disable-Provenance | `header` | string                                          | `string`                      |           |          |         |                                            |
+| Body                 | `body`   | [EmbeddedContactPoint](#embedded-contact-point) | `models.EmbeddedContactPoint` |           |          |         |                                            |
 
 #### All responses
 
@@ -847,10 +852,11 @@ PUT /api/v1/provisioning/mute-timings/{name}
 
 #### Parameters
 
-| Name | Source | Type                                    | Go type                   | Separator | Required | Default | Description      |
-| ---- | ------ | --------------------------------------- | ------------------------- | --------- | :------: | ------- | ---------------- |
-| name | `path` | string                                  | `string`                  |           |    ✓     |         | Mute timing name |
-| Body | `body` | [MuteTimeInterval](#mute-time-interval) | `models.MuteTimeInterval` |           |          |         |                  |
+| Name                 | Source   | Type                                    | Go type                   | Separator | Required | Default | Description      |
+| -------------------- | -------- | --------------------------------------- | ------------------------- | --------- | :------: | ------- | ---------------- |
+| name                 | `path`   | string                                  | `string`                  |           |    ✓     |         | Mute timing name |
+| X-Disable-Provenance | `header` | string                                  | `string`                  |           |          |         |                  |
+| Body                 | `body`   | [MuteTimeInterval](#mute-time-interval) | `models.MuteTimeInterval` |           |          |         |                  |
 
 #### All responses
 
@@ -889,9 +895,10 @@ PUT /api/v1/provisioning/policies
 
 #### Parameters
 
-| Name | Source | Type            | Go type        | Separator | Required | Default | Description                              |
-| ---- | ------ | --------------- | -------------- | --------- | :------: | ------- | ---------------------------------------- |
-| Body | `body` | [Route](#route) | `models.Route` |           |          |         | The new notification routing tree to use |
+| Name                 | Source   | Type            | Go type        | Separator | Required | Default | Description                              |
+| -------------------- | -------- | --------------- | -------------- | --------- | :------: | ------- | ---------------------------------------- |
+| X-Disable-Provenance | `header` | string          | `string`       |           |          |         |                                          |
+| Body                 | `body`   | [Route](#route) | `models.Route` |           |          |         | The new notification routing tree to use |
 
 #### All responses
 
@@ -930,10 +937,11 @@ PUT /api/v1/provisioning/templates/{name}
 
 #### Parameters
 
-| Name | Source | Type                                                          | Go type                              | Separator | Required | Default | Description   |
-| ---- | ------ | ------------------------------------------------------------- | ------------------------------------ | --------- | :------: | ------- | ------------- |
-| name | `path` | string                                                        | `string`                             |           |    ✓     |         | Template Name |
-| Body | `body` | [NotificationTemplateContent](#notification-template-content) | `models.NotificationTemplateContent` |           |          |         |               |
+| Name                 | Source   | Type                                                          | Go type                              | Separator | Required | Default | Description   |
+| -------------------- | -------- | ------------------------------------------------------------- | ------------------------------------ | --------- | :------: | ------- | ------------- |
+| name                 | `path`   | string                                                        | `string`                             |           |    ✓     |         | Template Name |
+| X-Disable-Provenance | `header` | string                                                        | `string`                             |           |          |         |               |
+| Body                 | `body`   | [NotificationTemplateContent](#notification-template-content) | `models.NotificationTemplateContent` |           |          |         |               |
 
 #### All responses
 
diff --git a/pkg/services/ngalert/api/api_provisioning.go b/pkg/services/ngalert/api/api_provisioning.go
index 532d08de954..be67dc59488 100644
--- a/pkg/services/ngalert/api/api_provisioning.go
+++ b/pkg/services/ngalert/api/api_provisioning.go
@@ -80,7 +80,8 @@ func (srv *ProvisioningSrv) RouteGetPolicyTree(c *contextmodel.ReqContext) respo
 }
 
 func (srv *ProvisioningSrv) RoutePutPolicyTree(c *contextmodel.ReqContext, tree definitions.Route) response.Response {
-	err := srv.policies.UpdatePolicyTree(c.Req.Context(), c.OrgID, tree, alerting_models.ProvenanceAPI)
+	provenance := determineProvenance(c)
+	err := srv.policies.UpdatePolicyTree(c.Req.Context(), c.OrgID, tree, alerting_models.Provenance(provenance))
 	if errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
 		return ErrResp(http.StatusNotFound, err, "")
 	}
@@ -115,8 +116,8 @@ func (srv *ProvisioningSrv) RouteGetContactPoints(c *contextmodel.ReqContext) re
 }
 
 func (srv *ProvisioningSrv) RoutePostContactPoint(c *contextmodel.ReqContext, cp definitions.EmbeddedContactPoint) response.Response {
-	// TODO: provenance is hardcoded for now, change it later to make it more flexible
-	contactPoint, err := srv.contactPointService.CreateContactPoint(c.Req.Context(), c.OrgID, cp, alerting_models.ProvenanceAPI)
+	provenance := determineProvenance(c)
+	contactPoint, err := srv.contactPointService.CreateContactPoint(c.Req.Context(), c.OrgID, cp, alerting_models.Provenance(provenance))
 	if errors.Is(err, provisioning.ErrValidation) {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
@@ -128,7 +129,8 @@ func (srv *ProvisioningSrv) RoutePostContactPoint(c *contextmodel.ReqContext, cp
 
 func (srv *ProvisioningSrv) RoutePutContactPoint(c *contextmodel.ReqContext, cp definitions.EmbeddedContactPoint, UID string) response.Response {
 	cp.UID = UID
-	err := srv.contactPointService.UpdateContactPoint(c.Req.Context(), c.OrgID, cp, alerting_models.ProvenanceAPI)
+	provenance := determineProvenance(c)
+	err := srv.contactPointService.UpdateContactPoint(c.Req.Context(), c.OrgID, cp, alerting_models.Provenance(provenance))
 	if errors.Is(err, provisioning.ErrValidation) {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
@@ -176,7 +178,7 @@ func (srv *ProvisioningSrv) RoutePutTemplate(c *contextmodel.ReqContext, body de
 	tmpl := definitions.NotificationTemplate{
 		Name:       name,
 		Template:   body.Template,
-		Provenance: definitions.Provenance(alerting_models.ProvenanceAPI),
+		Provenance: determineProvenance(c),
 	}
 	modified, err := srv.templates.SetTemplate(c.Req.Context(), c.OrgID, tmpl)
 	if err != nil {
@@ -218,7 +220,7 @@ func (srv *ProvisioningSrv) RouteGetMuteTimings(c *contextmodel.ReqContext) resp
 }
 
 func (srv *ProvisioningSrv) RoutePostMuteTiming(c *contextmodel.ReqContext, mt definitions.MuteTimeInterval) response.Response {
-	mt.Provenance = definitions.Provenance(alerting_models.ProvenanceAPI)
+	mt.Provenance = determineProvenance(c)
 	created, err := srv.muteTimings.CreateMuteTiming(c.Req.Context(), mt, c.OrgID)
 	if err != nil {
 		if errors.Is(err, provisioning.ErrValidation) {
@@ -231,7 +233,7 @@ func (srv *ProvisioningSrv) RoutePostMuteTiming(c *contextmodel.ReqContext, mt d
 
 func (srv *ProvisioningSrv) RoutePutMuteTiming(c *contextmodel.ReqContext, mt definitions.MuteTimeInterval, name string) response.Response {
 	mt.Name = name
-	mt.Provenance = definitions.Provenance(alerting_models.ProvenanceAPI)
+	mt.Provenance = determineProvenance(c)
 	updated, err := srv.muteTimings.UpdateMuteTiming(c.Req.Context(), mt, c.OrgID)
 	if err != nil {
 		if errors.Is(err, provisioning.ErrValidation) {
@@ -276,7 +278,7 @@ func (srv *ProvisioningSrv) RoutePostAlertRule(c *contextmodel.ReqContext, ar de
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
 	provenance := determineProvenance(c)
-	createdAlertRule, err := srv.alertRules.CreateAlertRule(c.Req.Context(), upstreamModel, provenance, c.UserID)
+	createdAlertRule, err := srv.alertRules.CreateAlertRule(c.Req.Context(), upstreamModel, alerting_models.Provenance(provenance), c.UserID)
 	if errors.Is(err, alerting_models.ErrAlertRuleFailedValidation) {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
@@ -290,7 +292,7 @@ func (srv *ProvisioningSrv) RoutePostAlertRule(c *contextmodel.ReqContext, ar de
 		return ErrResp(http.StatusInternalServerError, err, "")
 	}
 
-	resp := ProvisionedAlertRuleFromAlertRule(createdAlertRule, provenance)
+	resp := ProvisionedAlertRuleFromAlertRule(createdAlertRule, alerting_models.Provenance(provenance))
 	return response.JSON(http.StatusCreated, resp)
 }
 
@@ -302,7 +304,7 @@ func (srv *ProvisioningSrv) RoutePutAlertRule(c *contextmodel.ReqContext, ar def
 	updated.OrgID = c.OrgID
 	updated.UID = UID
 	provenance := determineProvenance(c)
-	updatedAlertRule, err := srv.alertRules.UpdateAlertRule(c.Req.Context(), updated, provenance)
+	updatedAlertRule, err := srv.alertRules.UpdateAlertRule(c.Req.Context(), updated, alerting_models.Provenance(provenance))
 	if errors.Is(err, alerting_models.ErrAlertRuleNotFound) {
 		return response.Empty(http.StatusNotFound)
 	}
@@ -316,12 +318,13 @@ func (srv *ProvisioningSrv) RoutePutAlertRule(c *contextmodel.ReqContext, ar def
 		return ErrResp(http.StatusInternalServerError, err, "")
 	}
 
-	resp := ProvisionedAlertRuleFromAlertRule(updatedAlertRule, provenance)
+	resp := ProvisionedAlertRuleFromAlertRule(updatedAlertRule, alerting_models.Provenance(provenance))
 	return response.JSON(http.StatusOK, resp)
 }
 
 func (srv *ProvisioningSrv) RouteDeleteAlertRule(c *contextmodel.ReqContext, UID string) response.Response {
-	err := srv.alertRules.DeleteAlertRule(c.Req.Context(), c.OrgID, UID, alerting_models.ProvenanceAPI)
+	provenance := determineProvenance(c)
+	err := srv.alertRules.DeleteAlertRule(c.Req.Context(), c.OrgID, UID, alerting_models.Provenance(provenance))
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "")
 	}
@@ -406,7 +409,8 @@ func (srv *ProvisioningSrv) RoutePutAlertRuleGroup(c *contextmodel.ReqContext, a
 	if err != nil {
 		ErrResp(http.StatusBadRequest, err, "")
 	}
-	err = srv.alertRules.ReplaceRuleGroup(c.Req.Context(), c.OrgID, groupModel, c.UserID, alerting_models.ProvenanceAPI)
+	provenance := determineProvenance(c)
+	err = srv.alertRules.ReplaceRuleGroup(c.Req.Context(), c.OrgID, groupModel, c.UserID, alerting_models.Provenance(provenance))
 	if errors.Is(err, alerting_models.ErrAlertRuleFailedValidation) {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
@@ -419,11 +423,11 @@ func (srv *ProvisioningSrv) RoutePutAlertRuleGroup(c *contextmodel.ReqContext, a
 	return response.JSON(http.StatusOK, ag)
 }
 
-func determineProvenance(ctx *contextmodel.ReqContext) alerting_models.Provenance {
+func determineProvenance(ctx *contextmodel.ReqContext) definitions.Provenance {
 	if _, disabled := ctx.Req.Header[disableProvenanceHeaderName]; disabled {
-		return alerting_models.ProvenanceNone
+		return definitions.Provenance(alerting_models.ProvenanceNone)
 	}
-	return alerting_models.ProvenanceAPI
+	return definitions.Provenance(alerting_models.ProvenanceAPI)
 }
 
 func exportResponse(c *contextmodel.ReqContext, body any) response.Response {
diff --git a/pkg/services/ngalert/provisioning/alert_rules.go b/pkg/services/ngalert/provisioning/alert_rules.go
index b2bda5e300c..cbe638d2276 100644
--- a/pkg/services/ngalert/provisioning/alert_rules.go
+++ b/pkg/services/ngalert/provisioning/alert_rules.go
@@ -272,12 +272,12 @@ func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int
 
 		updates := make([]models.UpdateRule, 0, len(delta.Update))
 		for _, update := range delta.Update {
-			// check that provenance is not changed in a invalid way
+			// check that provenance is not changed in an invalid way
 			storedProvenance, err := service.provenanceStore.GetProvenance(ctx, update.New, orgID)
 			if err != nil {
 				return err
 			}
-			if storedProvenance != provenance && storedProvenance != models.ProvenanceNone {
+			if canUpdate := canUpdateProvenanceInRuleGroup(storedProvenance, provenance); !canUpdate {
 				return fmt.Errorf("cannot update with provided provenance '%s', needs '%s'", provenance, storedProvenance)
 			}
 			updates = append(updates, models.UpdateRule{
@@ -295,12 +295,12 @@ func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int
 		}
 
 		for _, delete := range delta.Delete {
-			// check that provenance is not changed in a invalid way
+			// check that provenance is not changed in an invalid way
 			storedProvenance, err := service.provenanceStore.GetProvenance(ctx, delete, orgID)
 			if err != nil {
 				return err
 			}
-			if storedProvenance != provenance && storedProvenance != models.ProvenanceNone {
+			if canUpdate := canUpdateProvenanceInRuleGroup(storedProvenance, provenance); !canUpdate {
 				return fmt.Errorf("cannot update with provided provenance '%s', needs '%s'", provenance, storedProvenance)
 			}
 		}
@@ -316,16 +316,14 @@ func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int
 	})
 }
 
-// CreateAlertRule creates a new alert rule. This function will ignore any
-// interval that is set in the rule struct and fetch the current group interval
-// from database.
+// UpdateAlertRule updates an alert rule.
 func (service *AlertRuleService) UpdateAlertRule(ctx context.Context, rule models.AlertRule, provenance models.Provenance) (models.AlertRule, error) {
 	storedRule, storedProvenance, err := service.GetAlertRule(ctx, rule.OrgID, rule.UID)
 	if err != nil {
 		return models.AlertRule{}, err
 	}
 	if storedProvenance != provenance && storedProvenance != models.ProvenanceNone {
-		return models.AlertRule{}, fmt.Errorf("cannot changed provenance from '%s' to '%s'", storedProvenance, provenance)
+		return models.AlertRule{}, fmt.Errorf("cannot change provenance from '%s' to '%s'", storedProvenance, provenance)
 	}
 	rule.Updated = time.Now()
 	rule.ID = storedRule.ID
@@ -357,7 +355,7 @@ func (service *AlertRuleService) DeleteAlertRule(ctx context.Context, orgID int6
 		OrgID: orgID,
 		UID:   ruleUID,
 	}
-	// check that provenance is not changed in a invalid way
+	// check that provenance is not changed in an invalid way
 	storedProvenance, err := service.provenanceStore.GetProvenance(ctx, rule, rule.OrgID)
 	if err != nil {
 		return err
diff --git a/pkg/services/ngalert/provisioning/alert_rules_test.go b/pkg/services/ngalert/provisioning/alert_rules_test.go
index a0988694f03..893181ff697 100644
--- a/pkg/services/ngalert/provisioning/alert_rules_test.go
+++ b/pkg/services/ngalert/provisioning/alert_rules_test.go
@@ -274,10 +274,10 @@ func TestAlertRuleService(t *testing.T) {
 				errNil: false,
 			},
 			{
-				name:   "should not be able to update from provenance api to none",
+				name:   "should be able to update from provenance api to none",
 				from:   models.ProvenanceAPI,
 				to:     models.ProvenanceNone,
-				errNil: false,
+				errNil: true,
 			},
 			{
 				name:   "should not be able to update from provenance file to api",
diff --git a/pkg/services/ngalert/provisioning/contactpoints.go b/pkg/services/ngalert/provisioning/contactpoints.go
index 55211403654..60b61df460c 100644
--- a/pkg/services/ngalert/provisioning/contactpoints.go
+++ b/pkg/services/ngalert/provisioning/contactpoints.go
@@ -261,13 +261,13 @@ func (ecp *ContactPointService) UpdateContactPoint(ctx context.Context, orgID in
 		return fmt.Errorf("%w: %s", ErrValidation, err.Error())
 	}
 
-	// check that provenance is not changed in a invalid way
+	// check that provenance is not changed in an invalid way
 	storedProvenance, err := ecp.provenanceStore.GetProvenance(ctx, &contactPoint, orgID)
 	if err != nil {
 		return err
 	}
 	if storedProvenance != provenance && storedProvenance != models.ProvenanceNone {
-		return fmt.Errorf("cannot changed provenance from '%s' to '%s'", storedProvenance, provenance)
+		return fmt.Errorf("cannot change provenance from '%s' to '%s'", storedProvenance, provenance)
 	}
 	// transform to internal model
 	extractedSecrets, err := RemoveSecretsForContactPoint(&contactPoint)
diff --git a/pkg/services/ngalert/provisioning/contactpoints_test.go b/pkg/services/ngalert/provisioning/contactpoints_test.go
index ed7e65f11ae..5f331b686d7 100644
--- a/pkg/services/ngalert/provisioning/contactpoints_test.go
+++ b/pkg/services/ngalert/provisioning/contactpoints_test.go
@@ -2,6 +2,7 @@ package provisioning
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/prometheus/alertmanager/config"
@@ -144,78 +145,76 @@ func TestContactPointService(t *testing.T) {
 		require.Equal(t, models.ProvenanceNone, models.Provenance(cps[0].Provenance))
 	})
 
-	t.Run("it's possible to update provenance from none to API", func(t *testing.T) {
-		sut := createContactPointServiceSut(secretsService)
-		newCp := createTestContactPoint()
+	t.Run("contact point provenance should be correctly checked", func(t *testing.T) {
+		tests := []struct {
+			name   string
+			from   models.Provenance
+			to     models.Provenance
+			errNil bool
+		}{
+			{
+				name:   "should be able to update from provenance none to api",
+				from:   models.ProvenanceNone,
+				to:     models.ProvenanceAPI,
+				errNil: true,
+			},
+			{
+				name:   "should be able to update from provenance none to file",
+				from:   models.ProvenanceNone,
+				to:     models.ProvenanceFile,
+				errNil: true,
+			},
+			{
+				name:   "should not be able to update from provenance api to file",
+				from:   models.ProvenanceAPI,
+				to:     models.ProvenanceFile,
+				errNil: false,
+			},
+			{
+				name:   "should not be able to update from provenance api to none",
+				from:   models.ProvenanceAPI,
+				to:     models.ProvenanceNone,
+				errNil: false,
+			},
+			{
+				name:   "should not be able to update from provenance file to api",
+				from:   models.ProvenanceFile,
+				to:     models.ProvenanceAPI,
+				errNil: false,
+			},
+			{
+				name:   "should not be able to update from provenance file to none",
+				from:   models.ProvenanceFile,
+				to:     models.ProvenanceNone,
+				errNil: false,
+			},
+		}
+		for _, test := range tests {
+			t.Run(test.name, func(t *testing.T) {
+				sut := createContactPointServiceSut(secretsService)
+				newCp := createTestContactPoint()
 
-		newCp, err := sut.CreateContactPoint(context.Background(), 1, newCp, models.ProvenanceNone)
-		require.NoError(t, err)
+				newCp, err := sut.CreateContactPoint(context.Background(), 1, newCp, test.from)
+				require.NoError(t, err)
 
-		cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1))
-		require.NoError(t, err)
-		require.Equal(t, newCp.UID, cps[1].UID)
-		require.Equal(t, models.ProvenanceNone, models.Provenance(cps[1].Provenance))
+				cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1))
+				require.NoError(t, err)
+				require.Equal(t, newCp.UID, cps[1].UID)
+				require.Equal(t, test.from, models.Provenance(cps[1].Provenance))
 
-		err = sut.UpdateContactPoint(context.Background(), 1, newCp, models.ProvenanceAPI)
-		require.NoError(t, err)
+				err = sut.UpdateContactPoint(context.Background(), 1, newCp, test.to)
+				if test.errNil {
+					require.NoError(t, err)
 
-		cps, err = sut.GetContactPoints(context.Background(), cpsQuery(1))
-		require.NoError(t, err)
-		require.Equal(t, newCp.UID, cps[1].UID)
-		require.Equal(t, models.ProvenanceAPI, models.Provenance(cps[1].Provenance))
-	})
-
-	t.Run("it's possible to update provenance from none to File", func(t *testing.T) {
-		sut := createContactPointServiceSut(secretsService)
-		newCp := createTestContactPoint()
-
-		newCp, err := sut.CreateContactPoint(context.Background(), 1, newCp, models.ProvenanceNone)
-		require.NoError(t, err)
-
-		cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1))
-		require.NoError(t, err)
-		require.Equal(t, newCp.UID, cps[1].UID)
-		require.Equal(t, models.ProvenanceNone, models.Provenance(cps[1].Provenance))
-
-		err = sut.UpdateContactPoint(context.Background(), 1, newCp, models.ProvenanceFile)
-		require.NoError(t, err)
-
-		cps, err = sut.GetContactPoints(context.Background(), cpsQuery(1))
-		require.NoError(t, err)
-		require.Equal(t, newCp.UID, cps[1].UID)
-		require.Equal(t, models.ProvenanceFile, models.Provenance(cps[1].Provenance))
-	})
-
-	t.Run("it's not possible to update provenance from File to API", func(t *testing.T) {
-		sut := createContactPointServiceSut(secretsService)
-		newCp := createTestContactPoint()
-
-		newCp, err := sut.CreateContactPoint(context.Background(), 1, newCp, models.ProvenanceFile)
-		require.NoError(t, err)
-
-		cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1))
-		require.NoError(t, err)
-		require.Equal(t, newCp.UID, cps[1].UID)
-		require.Equal(t, models.ProvenanceFile, models.Provenance(cps[1].Provenance))
-
-		err = sut.UpdateContactPoint(context.Background(), 1, newCp, models.ProvenanceAPI)
-		require.Error(t, err)
-	})
-
-	t.Run("it's not possible to update provenance from API to File", func(t *testing.T) {
-		sut := createContactPointServiceSut(secretsService)
-		newCp := createTestContactPoint()
-
-		newCp, err := sut.CreateContactPoint(context.Background(), 1, newCp, models.ProvenanceAPI)
-		require.NoError(t, err)
-
-		cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1))
-		require.NoError(t, err)
-		require.Equal(t, newCp.UID, cps[1].UID)
-		require.Equal(t, models.ProvenanceAPI, models.Provenance(cps[1].Provenance))
-
-		err = sut.UpdateContactPoint(context.Background(), 1, newCp, models.ProvenanceFile)
-		require.Error(t, err)
+					cps, err = sut.GetContactPoints(context.Background(), cpsQuery(1))
+					require.NoError(t, err)
+					require.Equal(t, newCp.UID, cps[1].UID)
+					require.Equal(t, test.to, models.Provenance(cps[1].Provenance))
+				} else {
+					require.Error(t, err, fmt.Sprintf("cannot change provenance from '%s' to '%s'", test.from, test.to))
+				}
+			})
+		}
 	})
 
 	t.Run("service respects concurrency token when updating", func(t *testing.T) {
diff --git a/pkg/services/ngalert/provisioning/provenance.go b/pkg/services/ngalert/provisioning/provenance.go
new file mode 100644
index 00000000000..f0c674215a7
--- /dev/null
+++ b/pkg/services/ngalert/provisioning/provenance.go
@@ -0,0 +1,13 @@
+package provisioning
+
+import (
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+// canUpdateProvenanceInRuleGroup checks if a provenance can be updated for a rule group and its alerts.
+// ReplaceRuleGroup function intends to replace an entire rule group: inserting, updating, and removing rules.
+func canUpdateProvenanceInRuleGroup(storedProvenance, provenance models.Provenance) bool {
+	return storedProvenance == provenance ||
+		storedProvenance == models.ProvenanceNone ||
+		(storedProvenance == models.ProvenanceAPI && provenance == models.ProvenanceNone)
+}

From 75fc678d8a746a60844b9e38921fcae984ca6697 Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Tue, 18 Apr 2023 08:22:46 -0500
Subject: [PATCH 216/729] Prometheus: Track incremental query request sizes
 with Faro (#65244)

Track incremental query usage in Faro

Co-authored-by: leeoniya <leon.sorokin@grafana.com>
Co-authored-by: Galen <galen.kistler@grafana.com>
---
 docs/sources/datasources/prometheus/_index.md |   2 +
 .../prometheus/querycache/QueryCache.ts       | 177 +++++++++++++++++-
 2 files changed, 171 insertions(+), 8 deletions(-)

diff --git a/docs/sources/datasources/prometheus/_index.md b/docs/sources/datasources/prometheus/_index.md
index 817896d14b1..2a95f1ba839 100644
--- a/docs/sources/datasources/prometheus/_index.md
+++ b/docs/sources/datasources/prometheus/_index.md
@@ -92,6 +92,8 @@ datasources:
       incrementalQuerying: true
       incrementalQueryOverlapWindow: 10m
       cacheLevel: 'High'
+      incrementalQuerying: true
+      incrementalQueryOverlapWindow: 10m
       exemplarTraceIdDestinations:
         # Field with internal link pointing to data source in Grafana.
         # datasourceUid value can be anything, but it should be unique across all defined data source uids.
diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
index 335710887ea..1551139fd8d 100644
--- a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
@@ -8,6 +8,8 @@ import {
   isValidDuration,
   parseDuration,
 } from '@grafana/data/src';
+import { faro } from '@grafana/faro-web-sdk';
+import { config } from '@grafana/runtime/src';
 import { amendTable, Table, trimTable } from 'app/features/live/data/amendTimeSeries';
 
 import { PromQuery } from '../types';
@@ -22,6 +24,9 @@ type TargetSig = string;
 
 type TimestampMs = number;
 
+// Look like Q001, Q002, etc
+type RequestID = string;
+
 type StringInterpolator = (expr: string) => string;
 
 // string matching requirements defined in durationutil.ts
@@ -64,8 +69,44 @@ export function getTargSig(targExpr: string, request: DataQueryRequest<PromQuery
  */
 export class QueryCache {
   private overlapWindowMs: number;
+  private perfObeserver?: PerformanceObserver;
+  private shouldProfile: boolean;
+
+  // send profile events every 5 minutes
+  sendEventsInterval = 60000 * 5;
+
+  pendingRequestIdsToTargSigs = new Map<
+    RequestID,
+    {
+      identity: string;
+      bytes: number | null;
+      dashboardUID?: string;
+      interval?: string;
+      panelId?: number;
+      expr?: string;
+    }
+  >();
+
+  pendingAccumulatedEvents = new Map<
+    string,
+    {
+      requestCount: number;
+      savedBytesTotal: number;
+      initialRequestSize: number;
+      lastRequestSize: number;
+      panelId: string;
+      dashId: string;
+      expr: string;
+      interval: string;
+      sent: boolean;
+    }
+  >();
+
+  cache = new Map<TargetIdent, TargetCache>();
+
   constructor(overlapString?: string) {
     const unverifiedOverlap = overlapString ?? defaultPrometheusQueryOverlapWindow;
+
     if (isValidDuration(unverifiedOverlap)) {
       const duration = parseDuration(unverifiedOverlap);
       this.overlapWindowMs = durationToMilliseconds(duration);
@@ -73,14 +114,123 @@ export class QueryCache {
       const duration = parseDuration(defaultPrometheusQueryOverlapWindow);
       this.overlapWindowMs = durationToMilliseconds(duration);
     }
+
+    if (config.grafanaJavascriptAgent.enabled) {
+      this.profile();
+      this.shouldProfile = true;
+    } else {
+      this.shouldProfile = false;
+    }
   }
 
-  cache = new Map<TargetIdent, TargetCache>();
+  private profile() {
+    // Check if PerformanceObserver is supported, and if we have Faro enabled for internal profiling
+    if (typeof PerformanceObserver === 'function') {
+      this.perfObeserver = new PerformanceObserver((list: PerformanceObserverEntryList) => {
+        list.getEntries().forEach((entry) => {
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          const entryTypeCast: PerformanceResourceTiming = entry as PerformanceResourceTiming;
+
+          // Safari support for this is coming in 16.4:
+          // https://caniuse.com/mdn-api_performanceresourcetiming_transfersize
+          // Gating that this exists to prevent runtime errors
+          const isSupported = typeof entryTypeCast?.transferSize === 'number';
+
+          if (entryTypeCast?.initiatorType === 'fetch' && isSupported) {
+            let fetchUrl = entryTypeCast.name;
+
+            if (fetchUrl.includes('/api/ds/query')) {
+              let match = fetchUrl.match(/requestId=([a-z\d]+)/i);
+
+              if (match) {
+                let requestId = match[1];
+
+                const requestTransferSize = Math.round(entryTypeCast.transferSize);
+                const currentRequest = this.pendingRequestIdsToTargSigs.get(requestId);
+
+                if (currentRequest) {
+                  const entries = this.pendingRequestIdsToTargSigs.entries();
+
+                  for (let [, value] of entries) {
+                    if (value.identity === currentRequest.identity && value.bytes !== null) {
+                      const previous = this.pendingAccumulatedEvents.get(value.identity);
+
+                      const savedBytes = value.bytes - requestTransferSize;
+
+                      this.pendingAccumulatedEvents.set(value.identity, {
+                        requestCount: (previous?.requestCount ?? 0) + 1,
+                        savedBytesTotal: (previous?.savedBytesTotal ?? 0) + savedBytes,
+                        initialRequestSize: value.bytes,
+                        lastRequestSize: requestTransferSize,
+                        panelId: currentRequest.panelId?.toString() ?? '',
+                        dashId: currentRequest.dashboardUID ?? '',
+                        expr: currentRequest.expr ?? '',
+                        interval: currentRequest.interval ?? '',
+                        sent: false,
+                      });
+
+                      // We don't need to save each subsequent request, only the first one
+                      this.pendingRequestIdsToTargSigs.delete(requestId);
+
+                      return;
+                    }
+                  }
+
+                  // If we didn't return above, this should be the first request, let's save the observed size
+                  this.pendingRequestIdsToTargSigs.set(requestId, { ...currentRequest, bytes: requestTransferSize });
+                }
+              }
+            }
+          }
+        });
+      });
+
+      this.perfObeserver.observe({ type: 'resource', buffered: false });
+
+      setInterval(this.sendPendingTrackingEvents, this.sendEventsInterval);
+
+      // Send any pending profile information when the user navigates away
+      window.addEventListener('beforeunload', this.sendPendingTrackingEvents);
+    }
+  }
+
+  sendPendingTrackingEvents = () => {
+    const entries = this.pendingAccumulatedEvents.entries();
+
+    for (let [key, value] of entries) {
+      if (!value.sent) {
+        this.pendingAccumulatedEvents.set(key, { ...value, sent: true });
+        faro.api.pushMeasurement({
+          type: 'custom',
+          values: {
+            thing: 0,
+            thing2: 1,
+          },
+        });
+        faro.api.pushEvent(
+          'prometheus incremental query response size',
+          {
+            requestCount: value.requestCount.toString(),
+            savedBytesTotal: value.savedBytesTotal.toString(),
+            initialRequestSize: value.initialRequestSize.toString(),
+            lastRequestSize: value.lastRequestSize.toString(),
+            panelId: value.panelId.toString(),
+            dashId: value.dashId.toString(),
+            expr: value.expr.toString(),
+            interval: value.interval.toString(),
+          },
+          'no-interaction',
+          {
+            skipDedupe: true,
+          }
+        );
+      }
+    }
+  };
 
   // can be used to change full range request to partial, split into multiple requests
   requestInfo(request: DataQueryRequest<PromQuery>, interpolateString: StringInterpolator): CacheRequestInfo {
     // TODO: align from/to to interval to increase probability of hitting backend cache
-
     const newFrom = request.range.from.valueOf();
     const newTo = request.range.to.valueOf();
 
@@ -95,9 +245,19 @@ export class QueryCache {
     const reqTargSigs = new Map<TargetIdent, TargetSig>();
     request.targets.forEach((targ) => {
       let targIdent = `${request.dashboardUID}|${request.panelId}|${targ.refId}`;
-      // @todo refactor getTargSig into datasource class and remove targExpr. See #65952 for a potential implementation
       let targExpr = interpolateString(targ.expr);
-      let targSig = getTargSig(targExpr, request, targ);
+      let targSig = getTargSig(targExpr, request, targ); // ${request.maxDataPoints} ?
+
+      if (this.shouldProfile) {
+        this.pendingRequestIdsToTargSigs.set(request.requestId, {
+          identity: targIdent + '|' + targSig,
+          dashboardUID: request.dashboardUID ?? '',
+          interval: targ.interval ?? request.interval,
+          panelId: request.panelId,
+          expr: targExpr,
+          bytes: null,
+        });
+      }
 
       reqTargSigs.set(targIdent, targSig);
     });
@@ -205,12 +365,13 @@ export class QueryCache {
             let nextTable: Table = respFrame.fields.map((field) => field.values.toArray()) as Table;
 
             let amendedTable = amendTable(prevTable, nextTable);
+            if (amendedTable) {
+              for (let i = 0; i < amendedTable.length; i++) {
+                cachedFrame.fields[i].values = new ArrayVector(amendedTable[i]);
+              }
 
-            for (let i = 0; i < amendedTable.length; i++) {
-              cachedFrame.fields[i].values = new ArrayVector(amendedTable[i]);
+              cachedFrame.length = cachedFrame.fields[0].values.length;
             }
-
-            cachedFrame.length = cachedFrame.fields[0].values.length;
           }
         });
 

From 6b8c77c70ca9a289d8ad2f166c50236b625f4c71 Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Tue, 18 Apr 2023 14:34:40 +0100
Subject: [PATCH 217/729] Usagestats: Add interface for stats for user.Service
 and add Usagestats for `case_insensitive_login` (#66742)

* add interface for stats

* add user service to registry
---
 .../usagestatssvcs/usage_stats_providers_registry.go  |  3 +++
 pkg/services/user/user.go                             |  3 +++
 pkg/services/user/userimpl/user.go                    | 11 +++++++++++
 pkg/services/user/usertest/fake.go                    |  5 +++++
 4 files changed, 22 insertions(+)

diff --git a/pkg/server/usagestatssvcs/usage_stats_providers_registry.go b/pkg/server/usagestatssvcs/usage_stats_providers_registry.go
index ad243798420..dff8af90bc0 100644
--- a/pkg/server/usagestatssvcs/usage_stats_providers_registry.go
+++ b/pkg/server/usagestatssvcs/usage_stats_providers_registry.go
@@ -3,13 +3,16 @@ package usagestatssvcs
 import (
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/user"
 )
 
 func ProvideUsageStatsProvidersRegistry(
 	accesscontrol accesscontrol.Service,
+	user user.Service,
 ) *UsageStatsProvidersRegistry {
 	return NewUsageStatsProvidersRegistry(
 		accesscontrol,
+		user,
 	)
 }
 
diff --git a/pkg/services/user/user.go b/pkg/services/user/user.go
index 7c2a4a05b05..66008e7cd01 100644
--- a/pkg/services/user/user.go
+++ b/pkg/services/user/user.go
@@ -2,9 +2,12 @@ package user
 
 import (
 	"context"
+
+	"github.com/grafana/grafana/pkg/registry"
 )
 
 type Service interface {
+	registry.ProvidesUsageStats
 	Create(context.Context, *CreateUserCommand) (*User, error)
 	CreateServiceAccount(context.Context, *CreateUserCommand) (*User, error)
 	Delete(context.Context, *DeleteUserCommand) error
diff --git a/pkg/services/user/userimpl/user.go b/pkg/services/user/userimpl/user.go
index 9be2516aa7b..f5aded11836 100644
--- a/pkg/services/user/userimpl/user.go
+++ b/pkg/services/user/userimpl/user.go
@@ -67,6 +67,17 @@ func ProvideService(
 	return s, nil
 }
 
+func (s *Service) GetUsageStats(ctx context.Context) map[string]interface{} {
+	stats := map[string]interface{}{}
+	caseInsensitiveLoginVal := 0
+	if s.cfg.CaseInsensitiveLogin {
+		caseInsensitiveLoginVal = 1
+	}
+
+	stats["stats.case_insensitive_login.count"] = caseInsensitiveLoginVal
+	return stats
+}
+
 func (s *Service) Usage(ctx context.Context, _ *quota.ScopeParameters) (*quota.Map, error) {
 	u := &quota.Map{}
 	if used, err := s.store.Count(ctx); err != nil {
diff --git a/pkg/services/user/usertest/fake.go b/pkg/services/user/usertest/fake.go
index 984230916bd..2cf76e14459 100644
--- a/pkg/services/user/usertest/fake.go
+++ b/pkg/services/user/usertest/fake.go
@@ -14,6 +14,7 @@ type FakeUserService struct {
 	ExpectedSearchUsers      user.SearchUserQueryResult
 	ExpectedUserProfileDTO   *user.UserProfileDTO
 	ExpectedUserProfileDTOs  []*user.UserProfileDTO
+	ExpectedUsageStats       map[string]interface{}
 
 	GetSignedInUserFn func(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error)
 	CreateFn          func(ctx context.Context, cmd *user.CreateUserCommand) (*user.User, error)
@@ -26,6 +27,10 @@ func NewUserServiceFake() *FakeUserService {
 	return &FakeUserService{}
 }
 
+func (f FakeUserService) GetUsageStats(ctx context.Context) map[string]interface{} {
+	return f.ExpectedUsageStats
+}
+
 func (f *FakeUserService) Create(ctx context.Context, cmd *user.CreateUserCommand) (*user.User, error) {
 	if f.CreateFn != nil {
 		return f.CreateFn(ctx, cmd)

From 2cec4026475129b26dd37bd87946aeb0052ca63a Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Tue, 18 Apr 2023 15:47:57 +0200
Subject: [PATCH 218/729] Alerting: Fix share URL for Prometheus rules on
 subpath (#66752)

---
 .../alerting/unified/RedirectToRuleViewer.tsx |  7 +++++--
 .../components/rules/RuleActionsButtons.tsx   | 18 ++++------------
 .../rules/RuleDetailsActionButtons.tsx        | 14 +++----------
 .../features/alerting/unified/utils/misc.ts   | 12 +++++++++--
 .../features/alerting/unified/utils/url.ts    | 21 ++++++++++++++++++-
 5 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/public/app/features/alerting/unified/RedirectToRuleViewer.tsx b/public/app/features/alerting/unified/RedirectToRuleViewer.tsx
index e7f10bd1aee..faecfd358ec 100644
--- a/public/app/features/alerting/unified/RedirectToRuleViewer.tsx
+++ b/public/app/features/alerting/unified/RedirectToRuleViewer.tsx
@@ -4,6 +4,7 @@ import { Redirect } from 'react-router-dom';
 import { useLocation } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { Alert, Card, Icon, LoadingPlaceholder, useStyles2, withErrorBoundary } from '@grafana/ui';
 
 import { AlertLabels } from './components/AlertLabels';
@@ -13,6 +14,7 @@ import { getRulesSourceByName } from './utils/datasource';
 import { createViewLink } from './utils/misc';
 
 const pageTitle = 'Find rule';
+const subUrl = config.appSubUrl;
 
 function useRuleFindParams() {
   // DO NOT USE REACT-ROUTER HOOKS FOR THIS CODE
@@ -22,7 +24,7 @@ function useRuleFindParams() {
   // Relevant issue: https://github.com/remix-run/history/issues/505#issuecomment-453175833
   // It was probably fixed in React-Router v6
   const location = useLocation();
-  const segments = location.pathname?.split('/') ?? []; // ["", "alerting", "{sourceName}", "{name}]
+  const segments = location.pathname?.replace(subUrl, '').split('/') ?? []; // ["", "alerting", "{sourceName}", "{name}]
 
   const name = decodeURIComponent(segments[3]);
   const sourceName = decodeURIComponent(segments[2]);
@@ -76,7 +78,8 @@ export function RedirectToRuleViewer(): JSX.Element | null {
 
   if (rules.length === 1) {
     const [rule] = rules;
-    return <Redirect to={createViewLink(rulesSource, rule, '/alerting/list')} />;
+    const to = createViewLink(rulesSource, rule, '/alerting/list').replace(subUrl, '');
+    return <Redirect to={to} />;
   }
 
   return (
diff --git a/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx b/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
index b8f7dd8efce..d7cdcc1c05f 100644
--- a/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
@@ -4,7 +4,6 @@ import { useLocation } from 'react-router-dom';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
-import { config } from '@grafana/runtime';
 import { Button, ClipboardButton, ConfirmModal, LinkButton, Tooltip, useStyles2 } from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { useDispatch } from 'app/types';
@@ -12,8 +11,8 @@ import { CombinedRule, RulesSource } from 'app/types/unified-alerting';
 
 import { useIsRuleEditable } from '../../hooks/useIsRuleEditable';
 import { deleteRuleAction } from '../../state/actions';
-import { getRulesSourceName, isCloudRulesSource } from '../../utils/datasource';
-import { createViewLink } from '../../utils/misc';
+import { getRulesSourceName } from '../../utils/datasource';
+import { createShareLink, createViewLink } from '../../utils/misc';
 import * as ruleId from '../../utils/rule-id';
 import { isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
 import { createUrl } from '../../utils/url';
@@ -59,16 +58,7 @@ export const RuleActionsButtons = ({ rule, rulesSource }: Props) => {
     }
   };
 
-  const buildShareUrl = () => {
-    if (isCloudRulesSource(rulesSource)) {
-      const { appUrl, appSubUrl } = config;
-      const baseUrl = appSubUrl !== '' ? `${appUrl}${appSubUrl}/` : config.appUrl;
-      const ruleUrl = `${encodeURIComponent(rulesSource.name)}/${encodeURIComponent(rule.name)}`;
-      return `${baseUrl}alerting/${ruleUrl}/find`;
-    }
-
-    return window.location.href.split('?')[0];
-  };
+  const buildShareUrl = () => createShareLink(rulesSource, rule);
 
   const sourceName = getRulesSourceName(rulesSource);
 
@@ -83,7 +73,7 @@ export const RuleActionsButtons = ({ rule, rulesSource }: Props) => {
           variant="secondary"
           icon="eye"
           href={createViewLink(rulesSource, rule, returnTo)}
-        ></LinkButton>
+        />
       </Tooltip>
     );
   }
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
index 5e52b6f28f0..025850f592f 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
@@ -21,7 +21,7 @@ import { getRulesPermissions } from '../../utils/access-control';
 import { getAlertmanagerByUid } from '../../utils/alertmanager';
 import { Annotation } from '../../utils/constants';
 import { getRulesSourceName, isCloudRulesSource, isGrafanaRulesSource } from '../../utils/datasource';
-import { createExploreLink, makeRuleBasedSilenceLink } from '../../utils/misc';
+import { createExploreLink, createShareLink, makeRuleBasedSilenceLink } from '../../utils/misc';
 import * as ruleId from '../../utils/rule-id';
 import { isAlertingRule, isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
 import { DeclareIncident } from '../bridges/DeclareIncidentButton';
@@ -67,16 +67,6 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
       setRuleToDelete(undefined);
     }
   };
-  const buildShareUrl = () => {
-    if (isCloudRulesSource(rulesSource)) {
-      const { appUrl, appSubUrl } = config;
-      const baseUrl = appSubUrl !== '' ? `${appUrl}${appSubUrl}/` : config.appUrl;
-      const ruleUrl = `${encodeURIComponent(rulesSource.name)}/${encodeURIComponent(rule.name)}`;
-      return `${baseUrl}alerting/${ruleUrl}/find`;
-    }
-
-    return window.location.href.split('?')[0];
-  };
 
   const isFederated = isFederatedRuleGroup(group);
   const rulesSourceName = getRulesSourceName(rulesSource);
@@ -89,6 +79,8 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
   const { isEditable, isRemovable } = useIsRuleEditable(rulesSourceName, rulerRule);
   const canSilence = useCanSilence(rule);
 
+  const buildShareUrl = () => createShareLink(rulesSource, rule);
+
   const returnTo = location.pathname + location.search;
   // explore does not support grafana rule queries atm
   // neither do "federated rules"
diff --git a/public/app/features/alerting/unified/utils/misc.ts b/public/app/features/alerting/unified/utils/misc.ts
index 67510421753..620e801962b 100644
--- a/public/app/features/alerting/unified/utils/misc.ts
+++ b/public/app/features/alerting/unified/utils/misc.ts
@@ -13,10 +13,10 @@ import {
 import { FolderDTO } from '../../../../types';
 
 import { ALERTMANAGER_NAME_QUERY_KEY } from './constants';
-import { getRulesSourceName } from './datasource';
+import { getRulesSourceName, isCloudRulesSource } from './datasource';
 import { getMatcherQueryParams } from './matchers';
 import * as ruleId from './rule-id';
-import { createUrl } from './url';
+import { createAbsoluteUrl, createUrl } from './url';
 
 export function createViewLink(ruleSource: RulesSource, rule: CombinedRule, returnTo: string): string {
   const sourceName = getRulesSourceName(ruleSource);
@@ -50,6 +50,14 @@ export function createMuteTimingLink(muteTimingName: string, alertManagerSourceN
   });
 }
 
+export function createShareLink(ruleSource: RulesSource, rule: CombinedRule): string {
+  if (isCloudRulesSource(ruleSource)) {
+    return createAbsoluteUrl(`/alerting/${encodeURIComponent(ruleSource.name)}/${encodeURIComponent(rule.name)}/find`);
+  }
+
+  return window.location.href.split('?')[0];
+}
+
 export function arrayToRecord(items: Array<{ key: string; value: string }>): Record<string, string> {
   return items.reduce<Record<string, string>>((rec, { key, value }) => {
     rec[key] = value;
diff --git a/public/app/features/alerting/unified/utils/url.ts b/public/app/features/alerting/unified/utils/url.ts
index 8499598eaa0..b712e7ab1e6 100644
--- a/public/app/features/alerting/unified/utils/url.ts
+++ b/public/app/features/alerting/unified/utils/url.ts
@@ -2,5 +2,24 @@ import { config } from '@grafana/runtime';
 
 export function createUrl(path: string, queryParams?: string[][] | Record<string, string> | string | URLSearchParams) {
   const searchParams = new URLSearchParams(queryParams);
-  return `${config.appSubUrl}${path}?${searchParams.toString()}`;
+  const searchParamsString = searchParams.toString();
+
+  return `${config.appSubUrl}${path}${searchParamsString ? `?${searchParamsString}` : ''}`;
+}
+
+export function createAbsoluteUrl(
+  path: string,
+  queryParams?: string[][] | Record<string, string> | string | URLSearchParams
+) {
+  const searchParams = new URLSearchParams(queryParams);
+  const searchParamsString = searchParams.toString();
+
+  try {
+    const baseUrl = new URL(config.appSubUrl, config.appUrl);
+    baseUrl.pathname = path;
+
+    return `${baseUrl.href}${searchParamsString ? `?${searchParamsString}` : ''}`;
+  } catch (err) {
+    return createUrl(path, queryParams);
+  }
 }

From 0741f478769dc3a4b1ddbfeb1fb368465ab2af61 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 18 Apr 2023 14:58:00 +0100
Subject: [PATCH 219/729] Navigation: Move `SectionNav` to `AppChrome` (#64391)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* move section nav to app chrome

* unit tests

* Move SectionNav to AppChrome folder

* fix duplicate variable rendering

---------

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .betterer.results                             |   6 +-
 .../components/AppChrome/AppChrome.test.tsx   | 108 ++++++++++++++++++
 .../core/components/AppChrome/AppChrome.tsx   |  28 ++++-
 .../AppChrome/AppChromeService.test.tsx       |  19 ++-
 .../components/AppChrome/AppChromeService.tsx |  13 ++-
 .../components/AppChrome/AppChromeUpdate.tsx  |   6 +-
 .../SectionNav}/SectionNav.tsx                |   0
 .../SectionNav}/SectionNavItem.test.tsx       |   0
 .../SectionNav}/SectionNavItem.tsx            |   0
 .../SectionNav}/SectionNavToggle.tsx          |   0
 public/app/core/components/Page/Page.tsx      |   2 +-
 .../app/core/components/PageNew/Page.test.tsx |  27 +----
 public/app/core/components/PageNew/Page.tsx   |  61 ++++------
 .../DashboardSettings.test.tsx                |  38 ------
 public/app/features/explore/ExplorePage.tsx   |   2 +-
 15 files changed, 190 insertions(+), 120 deletions(-)
 create mode 100644 public/app/core/components/AppChrome/AppChrome.test.tsx
 rename public/app/core/components/{PageNew => AppChrome/SectionNav}/SectionNav.tsx (100%)
 rename public/app/core/components/{PageNew => AppChrome/SectionNav}/SectionNavItem.test.tsx (100%)
 rename public/app/core/components/{PageNew => AppChrome/SectionNav}/SectionNavItem.tsx (100%)
 rename public/app/core/components/{PageNew => AppChrome/SectionNav}/SectionNavToggle.tsx (100%)
 delete mode 100644 public/app/features/dashboard/components/DashboardSettings/DashboardSettings.test.tsx

diff --git a/.betterer.results b/.betterer.results
index 5608c47eebe..23a5eea677e 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -1548,6 +1548,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
     ],
+    "public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx:5381": [
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    ],
     "public/app/core/components/DynamicImports/SafeDynamicImport.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -1650,9 +1653,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "85"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "86"]
     ],
-    "public/app/core/components/PageNew/SectionNavItem.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "public/app/core/components/PanelTypeFilter/PanelTypeFilter.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/public/app/core/components/AppChrome/AppChrome.test.tsx b/public/app/core/components/AppChrome/AppChrome.test.tsx
new file mode 100644
index 00000000000..6ffcb0c0b88
--- /dev/null
+++ b/public/app/core/components/AppChrome/AppChrome.test.tsx
@@ -0,0 +1,108 @@
+import { render, screen } from '@testing-library/react';
+import { KBarProvider } from 'kbar';
+import React, { ReactNode } from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
+
+import { ArrayVector, DataFrame, DataFrameView, FieldType, NavModelItem } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { HOME_NAV_ID } from 'app/core/reducers/navModel';
+import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from 'app/features/search/service';
+
+import { Page } from '../PageNew/Page';
+
+import { AppChrome } from './AppChrome';
+
+const pageNav: NavModelItem = {
+  text: 'pageNav title',
+  children: [
+    { text: 'pageNav child1', url: '1', active: true },
+    { text: 'pageNav child2', url: '2' },
+  ],
+};
+
+const searchData: DataFrame = {
+  fields: [
+    { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+    { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+    { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+    { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+    { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector([]) },
+    { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+  ],
+  length: 0,
+};
+
+const mockSearchResult: QueryResponse = {
+  isItemLoaded: jest.fn(),
+  loadMoreItems: jest.fn(),
+  totalRows: searchData.length,
+  view: new DataFrameView<DashboardQueryResult>(searchData),
+};
+
+const setup = (children: ReactNode) => {
+  config.bootData.navTree = [
+    {
+      id: HOME_NAV_ID,
+      text: 'Home',
+    },
+    {
+      text: 'Section name',
+      id: 'section',
+      url: 'section',
+      children: [
+        { text: 'Child1', id: 'child1', url: 'section/child1' },
+        { text: 'Child2', id: 'child2', url: 'section/child2' },
+      ],
+    },
+  ];
+
+  const context = getGrafanaContextMock();
+
+  const renderResult = render(
+    <KBarProvider>
+      <TestProvider grafanaContext={context}>
+        <AppChrome>
+          <div data-testid="page-children">{children}</div>
+        </AppChrome>
+      </TestProvider>
+    </KBarProvider>
+  );
+
+  return { renderResult, context };
+};
+
+describe('AppChrome', () => {
+  beforeAll(() => {
+    // need to mock out the search service since kbar calls it to fetch recent dashboards
+    jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockSearchResult);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render section nav model based on navId', async () => {
+    setup(<Page navId="child1">Children</Page>);
+    expect(await screen.findByTestId('page-children')).toBeInTheDocument();
+
+    expect(screen.getByRole('tab', { name: 'Tab Section name' })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
+    expect(screen.getAllByRole('tab').length).toBe(3);
+  });
+
+  it('should render section nav model based on navId and item page nav', async () => {
+    setup(
+      <Page navId="child1" pageNav={pageNav}>
+        Children
+      </Page>
+    );
+    expect(await screen.findByTestId('page-children')).toBeInTheDocument();
+
+    expect(screen.getByRole('tab', { name: 'Tab Section name' })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: 'pageNav title' })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: 'Tab pageNav child1' })).toBeInTheDocument();
+  });
+});
diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index 829ca792805..2ab7cc8ad84 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -1,7 +1,7 @@
 import { css, cx } from '@emotion/css';
 import React, { PropsWithChildren } from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 import { CommandPalette } from 'app/features/commandPalette/CommandPalette';
@@ -9,6 +9,7 @@ import { KioskMode } from 'app/types';
 
 import { MegaMenu } from './MegaMenu/MegaMenu';
 import { NavToolbar } from './NavToolbar/NavToolbar';
+import { SectionNav } from './SectionNav/SectionNav';
 import { TopSearchBar } from './TopBar/TopSearchBar';
 import { TOP_BAR_LEVEL_HEIGHT } from './types';
 
@@ -38,7 +39,7 @@ export function AppChrome({ children }: Props) {
           {!searchBarHidden && <TopSearchBar />}
           <NavToolbar
             searchBarHidden={searchBarHidden}
-            sectionNav={state.sectionNav}
+            sectionNav={state.sectionNav.node}
             pageNav={state.pageNav}
             actions={state.actions}
             onToggleSearchBar={chrome.onToggleSearchBar}
@@ -47,7 +48,12 @@ export function AppChrome({ children }: Props) {
           />
         </div>
       )}
-      <div className={contentClass}>{children}</div>
+      <div className={contentClass}>
+        <div className={styles.panes}>
+          {state.layout === PageLayoutType.Standard && state.sectionNav && <SectionNav model={state.sectionNav} />}
+          <div className={styles.pageContainer}>{children}</div>
+        </div>
+      </div>
       {!state.chromeless && (
         <>
           <MegaMenu searchBarHidden={searchBarHidden} onClose={() => chrome.setMegaMenu(false)} />
@@ -88,5 +94,21 @@ const getStyles = (theme: GrafanaTheme2) => {
       flexDirection: 'column',
       borderBottom: `1px solid ${theme.colors.border.weak}`,
     }),
+    panes: css({
+      label: 'page-panes',
+      display: 'flex',
+      height: '100%',
+      width: '100%',
+      flexGrow: 1,
+      minHeight: 0,
+      flexDirection: 'column',
+      [theme.breakpoints.up('md')]: {
+        flexDirection: 'row',
+      },
+    }),
+    pageContainer: css({
+      label: 'page-container',
+      flexGrow: 1,
+    }),
   };
 };
diff --git a/public/app/core/components/AppChrome/AppChromeService.test.tsx b/public/app/core/components/AppChrome/AppChromeService.test.tsx
index 050d1b25eab..d6021981a88 100644
--- a/public/app/core/components/AppChrome/AppChromeService.test.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.test.tsx
@@ -13,25 +13,34 @@ describe('AppChromeService', () => {
     let stateChanges = 0;
 
     chromeService.state.subscribe(() => stateChanges++);
-    chromeService.update({ sectionNav: { text: 'hello' }, pageNav: { text: 'test', url: 'A' } });
-    chromeService.update({ sectionNav: { text: 'hello' }, pageNav: { text: 'test', url: 'A' } });
+    chromeService.update({
+      sectionNav: { node: { text: 'hello' }, main: { text: '' } },
+      pageNav: { text: 'test', url: 'A' },
+    });
+    chromeService.update({
+      sectionNav: { node: { text: 'hello' }, main: { text: '' } },
+      pageNav: { text: 'test', url: 'A' },
+    });
 
     expect(stateChanges).toBe(2);
 
     // if url change we should update
-    chromeService.update({ sectionNav: { text: 'hello' }, pageNav: { text: 'test', url: 'new/url' } });
+    chromeService.update({
+      sectionNav: { node: { text: 'hello' }, main: { text: '' } },
+      pageNav: { text: 'test', url: 'new/url' },
+    });
     expect(stateChanges).toBe(3);
 
     // if active child changed should update state
     chromeService.update({
-      sectionNav: { text: 'hello' },
+      sectionNav: { node: { text: 'hello' }, main: { text: '' } },
       pageNav: { text: 'test', url: 'A', children: [{ text: 'child', active: true }] },
     });
     expect(stateChanges).toBe(4);
 
     // If active child is the same we should not update state
     chromeService.update({
-      sectionNav: { text: 'hello' },
+      sectionNav: { node: { text: 'hello' }, main: { text: '' } },
       pageNav: { text: 'test', url: 'A', children: [{ text: 'child', active: true }] },
     });
     expect(stateChanges).toBe(4);
diff --git a/public/app/core/components/AppChrome/AppChromeService.tsx b/public/app/core/components/AppChrome/AppChromeService.tsx
index 641d4d87283..f2fa78f168f 100644
--- a/public/app/core/components/AppChrome/AppChromeService.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.tsx
@@ -1,7 +1,7 @@
 import { useObservable } from 'react-use';
 import { BehaviorSubject } from 'rxjs';
 
-import { AppEvents, NavModelItem, UrlQueryValue } from '@grafana/data';
+import { AppEvents, NavModel, NavModelItem, PageLayoutType, UrlQueryValue } from '@grafana/data';
 import { locationService, reportInteraction } from '@grafana/runtime';
 import appEvents from 'app/core/app_events';
 import { t } from 'app/core/internationalization';
@@ -13,12 +13,13 @@ import { RouteDescriptor } from '../../navigation/types';
 
 export interface AppChromeState {
   chromeless?: boolean;
-  sectionNav: NavModelItem;
+  sectionNav: NavModel;
   pageNav?: NavModelItem;
   actions?: React.ReactNode;
   searchBarHidden?: boolean;
   megaMenuOpen?: boolean;
   kioskMode: KioskMode | null;
+  layout: PageLayoutType;
 }
 
 export class AppChromeService {
@@ -28,9 +29,10 @@ export class AppChromeService {
 
   readonly state = new BehaviorSubject<AppChromeState>({
     chromeless: true, // start out hidden to not flash it on pages without chrome
-    sectionNav: { text: t('nav.home.title', 'Home') },
+    sectionNav: { node: { text: t('nav.home.title', 'Home') }, main: { text: '' } },
     searchBarHidden: store.getBool(this.searchBarStorageKey, false),
     kioskMode: null,
+    layout: PageLayoutType.Standard,
   });
 
   setMatchedRoute(route: RouteDescriptor) {
@@ -50,8 +52,9 @@ export class AppChromeService {
     if (!this.routeChangeHandled) {
       newState.actions = undefined;
       newState.pageNav = undefined;
-      newState.sectionNav = { text: t('nav.home.title', 'Home') };
+      newState.sectionNav = { node: { text: t('nav.home.title', 'Home') }, main: { text: '' } };
       newState.chromeless = this.currentRoute?.chromeless;
+      newState.layout = PageLayoutType.Standard;
       this.routeChangeHandled = true;
     }
 
@@ -74,7 +77,7 @@ export class AppChromeService {
     if (newState.sectionNav !== current.sectionNav || newState.pageNav !== current.pageNav) {
       if (
         newState.actions === current.actions &&
-        navItemsAreTheSame(newState.sectionNav, current.sectionNav) &&
+        navItemsAreTheSame(newState.sectionNav.node, current.sectionNav.node) &&
         navItemsAreTheSame(newState.pageNav, current.pageNav)
       ) {
         return true;
diff --git a/public/app/core/components/AppChrome/AppChromeUpdate.tsx b/public/app/core/components/AppChrome/AppChromeUpdate.tsx
index 00644c83b67..7a654d5fc74 100644
--- a/public/app/core/components/AppChrome/AppChromeUpdate.tsx
+++ b/public/app/core/components/AppChrome/AppChromeUpdate.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useLayoutEffect } from 'react';
 
 import { useGrafana } from 'app/core/context/GrafanaContext';
 
@@ -12,7 +12,9 @@ export interface AppChromeUpdateProps {
 export const AppChromeUpdate = React.memo<AppChromeUpdateProps>(({ actions }: AppChromeUpdateProps) => {
   const { chrome } = useGrafana();
 
-  useEffect(() => {
+  // We use useLayoutEffect here to make sure that the chrome is updated before the page is rendered
+  // This prevents flickering actions when going from one dashbaord to another for example
+  useLayoutEffect(() => {
     chrome.update({ actions });
   });
   return null;
diff --git a/public/app/core/components/PageNew/SectionNav.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNav.tsx
similarity index 100%
rename from public/app/core/components/PageNew/SectionNav.tsx
rename to public/app/core/components/AppChrome/SectionNav/SectionNav.tsx
diff --git a/public/app/core/components/PageNew/SectionNavItem.test.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNavItem.test.tsx
similarity index 100%
rename from public/app/core/components/PageNew/SectionNavItem.test.tsx
rename to public/app/core/components/AppChrome/SectionNav/SectionNavItem.test.tsx
diff --git a/public/app/core/components/PageNew/SectionNavItem.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
similarity index 100%
rename from public/app/core/components/PageNew/SectionNavItem.tsx
rename to public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
diff --git a/public/app/core/components/PageNew/SectionNavToggle.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNavToggle.tsx
similarity index 100%
rename from public/app/core/components/PageNew/SectionNavToggle.tsx
rename to public/app/core/components/AppChrome/SectionNav/SectionNavToggle.tsx
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index 4931ade57c4..9d5b594809b 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -44,7 +44,7 @@ export const OldPage: PageType = ({
     if (navModel) {
       // This is needed for chrome to update it's chromeless state
       chrome.update({
-        sectionNav: navModel.node,
+        sectionNav: navModel,
       });
     } else {
       // Need to trigger a chrome state update for the route change to be processed
diff --git a/public/app/core/components/PageNew/Page.test.tsx b/public/app/core/components/PageNew/Page.test.tsx
index 2492edf45e6..53068a201de 100644
--- a/public/app/core/components/PageNew/Page.test.tsx
+++ b/public/app/core/components/PageNew/Page.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
-import { NavModelItem } from '@grafana/data';
+import { NavModelItem, PageLayoutType } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 
@@ -65,28 +65,11 @@ describe('Render', () => {
     expect(screen.getAllByRole('tab').length).toBe(2);
   });
 
-  it('should render section nav model based on navId', async () => {
-    setup({ navId: 'child1' });
-
-    expect(screen.getByRole('tab', { name: 'Tab Section name' })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
-    expect(screen.getAllByRole('tab').length).toBe(3);
-  });
-
-  it('should update chrome with section and pageNav', async () => {
-    const { context } = setup({ navId: 'child1', pageNav });
-    expect(context.chrome.state.getValue().sectionNav.id).toBe('child1');
+  it('should update chrome with section, pageNav and layout', async () => {
+    const { context } = setup({ navId: 'child1', pageNav, layout: PageLayoutType.Canvas });
+    expect(context.chrome.state.getValue().sectionNav.node.id).toBe('child1');
     expect(context.chrome.state.getValue().pageNav).toBe(pageNav);
-  });
-
-  it('should render section nav model based on navId and item page nav', async () => {
-    setup({ navId: 'child1', pageNav });
-
-    expect(screen.getByRole('tab', { name: 'Tab Section name' })).toBeInTheDocument();
-    expect(screen.getByRole('heading', { name: 'pageNav title' })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: 'Tab pageNav child1' })).toBeInTheDocument();
+    expect(context.chrome.state.getValue().layout).toBe(PageLayoutType.Canvas);
   });
 
   it('should update document title', async () => {
diff --git a/public/app/core/components/PageNew/Page.tsx b/public/app/core/components/PageNew/Page.tsx
index 85993de8d13..fd8e3c5f65e 100644
--- a/public/app/core/components/PageNew/Page.tsx
+++ b/public/app/core/components/PageNew/Page.tsx
@@ -1,6 +1,6 @@
 // Libraries
 import { css, cx } from '@emotion/css';
-import React, { useEffect } from 'react';
+import React, { useLayoutEffect } from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
 import { CustomScrollbar, useStyles2 } from '@grafana/ui';
@@ -13,7 +13,6 @@ import { usePageTitle } from '../Page/usePageTitle';
 import { PageContents } from './PageContents';
 import { PageHeader } from './PageHeader';
 import { PageTabs } from './PageTabs';
-import { SectionNav } from './SectionNav';
 
 export const Page: PageType = ({
   navId,
@@ -39,38 +38,36 @@ export const Page: PageType = ({
 
   const pageHeaderNav = pageNav ?? navModel?.node;
 
-  useEffect(() => {
+  // We use useLayoutEffect here to make sure that the chrome is updated before the page is rendered
+  // This prevents flickering sectionNav when going from dashbaord to settings for example
+  useLayoutEffect(() => {
     if (navModel) {
       chrome.update({
-        sectionNav: navModel.node,
+        sectionNav: navModel,
         pageNav: pageNav,
+        layout: layout,
       });
     }
-  }, [navModel, pageNav, chrome]);
+  }, [navModel, pageNav, chrome, layout]);
 
   return (
     <div className={cx(styles.wrapper, className)} {...otherProps}>
       {layout === PageLayoutType.Standard && (
-        <div className={styles.panes}>
-          {navModel && <SectionNav model={navModel} />}
-          <div className={styles.pageContainer}>
-            <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
-              <div className={styles.pageInner}>
-                {pageHeaderNav && (
-                  <PageHeader
-                    actions={actions}
-                    navItem={pageHeaderNav}
-                    renderTitle={renderTitle}
-                    info={info}
-                    subTitle={subTitle}
-                  />
-                )}
-                {pageNav && pageNav.children && <PageTabs navItem={pageNav} />}
-                <div className={styles.pageContent}>{children}</div>
-              </div>
-            </CustomScrollbar>
+        <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
+          <div className={styles.pageInner}>
+            {pageHeaderNav && (
+              <PageHeader
+                actions={actions}
+                navItem={pageHeaderNav}
+                renderTitle={renderTitle}
+                info={info}
+                subTitle={subTitle}
+              />
+            )}
+            {pageNav && pageNav.children && <PageTabs navItem={pageNav} />}
+            <div className={styles.pageContent}>{children}</div>
           </div>
-        </div>
+        </CustomScrollbar>
       )}
       {layout === PageLayoutType.Canvas && (
         <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
@@ -102,22 +99,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       flexDirection: 'column',
       minHeight: 0,
     }),
-    panes: css({
-      label: 'page-panes',
-      display: 'flex',
-      height: '100%',
-      width: '100%',
-      flexGrow: 1,
-      minHeight: 0,
-      flexDirection: 'column',
-      [theme.breakpoints.up('md')]: {
-        flexDirection: 'row',
-      },
-    }),
-    pageContainer: css({
-      label: 'page-container',
-      flexGrow: 1,
-    }),
     pageContent: css({
       label: 'page-content',
       flexGrow: 1,
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.test.tsx
deleted file mode 100644
index 4dcb106fb0e..00000000000
--- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.test.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { TestProvider } from 'test/helpers/TestProvider';
-
-import { NavModel, NavModelItem } from '@grafana/data';
-import { BackendSrv, setBackendSrv } from '@grafana/runtime';
-
-import { createDashboardModelFixture } from '../../state/__fixtures__/dashboardFixtures';
-
-import { DashboardSettings } from './DashboardSettings';
-
-setBackendSrv({
-  get: jest.fn().mockResolvedValue([]),
-} as unknown as BackendSrv);
-
-describe('DashboardSettings', () => {
-  it('pressing escape navigates away correctly', async () => {
-    const dashboard = createDashboardModelFixture(
-      {
-        title: 'Foo',
-      },
-      {
-        folderId: 1,
-      }
-    );
-
-    const sectionNav: NavModel = { main: { text: 'Dashboards' }, node: { text: 'Dashboards' } };
-    const pageNav: NavModelItem = { text: 'My cool dashboard' };
-
-    render(
-      <TestProvider>
-        <DashboardSettings editview="settings" dashboard={dashboard} sectionNav={sectionNav} pageNav={pageNav} />
-      </TestProvider>
-    );
-
-    expect(await screen.findByRole('tab', { name: 'Tab Settings' })).toBeInTheDocument();
-  });
-});
diff --git a/public/app/features/explore/ExplorePage.tsx b/public/app/features/explore/ExplorePage.tsx
index 10400900e90..68458025230 100644
--- a/public/app/features/explore/ExplorePage.tsx
+++ b/public/app/features/explore/ExplorePage.tsx
@@ -49,7 +49,7 @@ export function ExplorePage(props: GrafanaRouteComponentProps<{}, ExploreQueryPa
   useEffect(() => {
     //This is needed for breadcrumbs and topnav.
     //We should probably abstract this out at some point
-    chrome.update({ sectionNav: navModel.node });
+    chrome.update({ sectionNav: navModel });
   }, [chrome, navModel]);
 
   useEffect(() => {

From f612a72f96fbb7d413a548eedf7e32b24854af76 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 18 Apr 2023 15:59:22 +0200
Subject: [PATCH 220/729] Loki: Update log context UI (#66730)

* fix logrowcontext scrolling behavior

* Loki: Update loki context ui menu

* Update

* Add test, update

* Use escapeLabelValueInSelector when displaying labels

* Update test for new appliedContextFilters

---------

Co-authored-by: Sven Grossmann <svennergr@gmail.com>
---
 packages/grafana-data/src/types/logs.ts       |   2 +-
 public/app/features/explore/Logs.tsx          |   3 +-
 public/app/features/explore/LogsContainer.tsx |   7 +-
 .../app/features/logs/components/LogRows.tsx  |   3 +-
 .../loki/LogContextProvider.test.ts           |  26 +--
 .../datasource/loki/LogContextProvider.ts     |  17 +-
 .../loki/components/LokiContextUi.test.tsx    |  99 +++++---
 .../loki/components/LokiContextUi.tsx         | 217 ++++++++++--------
 .../app/plugins/datasource/loki/datasource.ts |   4 +-
 9 files changed, 226 insertions(+), 152 deletions(-)

diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts
index 85138e44de9..9200942492c 100644
--- a/packages/grafana-data/src/types/logs.ts
+++ b/packages/grafana-data/src/types/logs.ts
@@ -141,7 +141,7 @@ export interface DataSourceWithLogsContextSupport<TQuery extends DataQuery = Dat
    * @alpha
    * @internal
    */
-  getLogRowContextUi?(row: LogRowModel, runContextQuery?: () => void): React.ReactNode;
+  getLogRowContextUi?(row: LogRowModel, runContextQuery?: () => void, origQuery?: TQuery): React.ReactNode;
 }
 
 export const hasLogsContextSupport = (datasource: unknown): datasource is DataSourceWithLogsContextSupport => {
diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index 5c9854adb73..c748e8f0361 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -25,7 +25,6 @@ import {
   DataHoverEvent,
   DataHoverClearEvent,
   EventBus,
-  DataSourceWithLogsContextSupport,
   LogRowContextOptions,
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
@@ -80,7 +79,7 @@ interface Props extends Themeable2 {
   onStartScanning?: () => void;
   onStopScanning?: () => void;
   getRowContext?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<any>;
-  getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
+  getLogRowContextUi?: (row: LogRowModel, runContextQuery?: () => void) => React.ReactNode;
   getFieldLinks: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   addResultsToCache: () => void;
   clearCache: () => void;
diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx
index b222fb8053e..eb98c9584b5 100644
--- a/public/app/features/explore/LogsContainer.tsx
+++ b/public/app/features/explore/LogsContainer.tsx
@@ -65,10 +65,13 @@ class LogsContainer extends PureComponent<LogsContainerProps> {
   };
 
   getLogRowContextUi = (row: LogRowModel, runContextQuery?: () => void): React.ReactNode => {
-    const { datasourceInstance } = this.props;
+    const { datasourceInstance, logsQueries } = this.props;
 
     if (hasLogsContextUiSupport(datasourceInstance) && datasourceInstance.getLogRowContextUi) {
-      return datasourceInstance.getLogRowContextUi(row, runContextQuery);
+      const query = (logsQueries ?? []).find(
+        (q) => q.refId === row.dataFrame.refId && q.datasource != null && q.datasource.type === datasourceInstance.type
+      );
+      return datasourceInstance.getLogRowContextUi(row, runContextQuery, query);
     }
 
     return <></>;
diff --git a/public/app/features/logs/components/LogRows.tsx b/public/app/features/logs/components/LogRows.tsx
index 14a65bffe4a..dc71062d073 100644
--- a/public/app/features/logs/components/LogRows.tsx
+++ b/public/app/features/logs/components/LogRows.tsx
@@ -10,7 +10,6 @@ import {
   LogsSortOrder,
   CoreApp,
   DataFrame,
-  DataSourceWithLogsContextSupport,
   DataQueryResponse,
   LogRowContextOptions,
 } from '@grafana/data';
@@ -43,7 +42,7 @@ export interface Props extends Themeable2 {
   onClickFilterLabel?: (key: string, value: string) => void;
   onClickFilterOutLabel?: (key: string, value: string) => void;
   getRowContext?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>;
-  getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
+  getLogRowContextUi?: (row: LogRowModel, runContextQuery?: () => void) => React.ReactNode;
   getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   onClickShowField?: (key: string) => void;
   onClickHideField?: (key: string) => void;
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
index 7a4feeb7fd5..d2db8aa9e5a 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
@@ -42,7 +42,7 @@ describe('LogContextProvider', () => {
   beforeEach(() => {
     logContextProvider = new LogContextProvider(defaultDatasourceMock);
     logContextProvider.getInitContextFiltersFromLabels = jest.fn(() =>
-      Promise.resolve([{ value: 'bar', enabled: true, fromParser: false, label: 'bar' }])
+      Promise.resolve([{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }])
     );
   });
 
@@ -59,8 +59,8 @@ describe('LogContextProvider', () => {
 
     it('should not call getInitContextFilters if appliedContextFilters', async () => {
       logContextProvider.appliedContextFilters = [
-        { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
-        { value: 'xyz', enabled: true, fromParser: false, label: 'xyz' },
+        { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
+        { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
       ];
       await logContextProvider.getLogRowContext(defaultLogRow, {
         limit: 10,
@@ -89,9 +89,9 @@ describe('LogContextProvider', () => {
 
       it('should not apply parsed labels', async () => {
         logContextProvider.appliedContextFilters = [
-          { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
-          { value: 'xyz', enabled: true, fromParser: false, label: 'xyz' },
-          { value: 'foo', enabled: true, fromParser: true, label: 'foo' },
+          { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
+          { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
+          { value: 'uniqueParsedLabel', enabled: true, fromParser: true, label: 'foo' },
         ];
         const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
           defaultLogRow,
@@ -107,8 +107,8 @@ describe('LogContextProvider', () => {
     describe('query with parser', () => {
       it('should apply parser', async () => {
         logContextProvider.appliedContextFilters = [
-          { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
-          { value: 'xyz', enabled: true, fromParser: false, label: 'xyz' },
+          { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
+          { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
         ];
         const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
           defaultLogRow,
@@ -124,9 +124,9 @@ describe('LogContextProvider', () => {
 
       it('should apply parser and parsed labels', async () => {
         logContextProvider.appliedContextFilters = [
-          { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
-          { value: 'xyz', enabled: true, fromParser: false, label: 'xyz' },
-          { value: 'foo', enabled: true, fromParser: true, label: 'foo' },
+          { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
+          { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
+          { value: 'uniqueParsedLabel', enabled: true, fromParser: true, label: 'foo' },
         ];
         const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
           defaultLogRow,
@@ -143,8 +143,8 @@ describe('LogContextProvider', () => {
 
     it('should not apply parser and parsed labels if more parsers in original query', async () => {
       logContextProvider.appliedContextFilters = [
-        { value: 'bar', enabled: true, fromParser: false, label: 'bar' },
-        { value: 'foo', enabled: true, fromParser: true, label: 'foo' },
+        { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
+        { value: 'uniqueParsedLabel', enabled: true, fromParser: true, label: 'foo' },
       ];
       const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
index 27fc206eddc..cbd4eb47981 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -137,7 +137,7 @@ export class LogContextProvider {
     };
   }
 
-  getLogRowContextUi(row: LogRowModel, runContextQuery: () => void): React.ReactNode {
+  getLogRowContextUi(row: LogRowModel, runContextQuery?: () => void, originalQuery?: DataQuery): React.ReactNode {
     const updateFilter = (contextFilters: ContextFilter[]) => {
       this.appliedContextFilters = contextFilters;
 
@@ -153,8 +153,15 @@ export class LogContextProvider {
         this.appliedContextFilters = [];
       });
 
+    let origQuery: LokiQuery | undefined = undefined;
+    // Type guard for LokiQuery
+    if (originalQuery && isLokiQuery(originalQuery)) {
+      origQuery = originalQuery;
+    }
+
     return LokiContextUi({
       row,
+      origQuery,
       updateFilter,
       onClose: this.onContextClose,
       logContextProvider: this,
@@ -164,10 +171,9 @@ export class LogContextProvider {
   processContextFiltersToExpr = (row: LogRowModel, contextFilters: ContextFilter[], query: LokiQuery | undefined) => {
     const labelFilters = contextFilters
       .map((filter) => {
-        const label = filter.value;
         if (!filter.fromParser && filter.enabled) {
           // escape backslashes in label as users can't escape them by themselves
-          return `${label}="${escapeLabelValueInExactSelector(row.labels[label])}"`;
+          return `${filter.label}="${escapeLabelValueInExactSelector(filter.value)}"`;
         }
         return '';
       })
@@ -186,7 +192,7 @@ export class LogContextProvider {
         const parsedLabels = contextFilters.filter((filter) => filter.fromParser && filter.enabled);
         for (const parsedLabel of parsedLabels) {
           if (parsedLabel.enabled) {
-            expr = addLabelToQuery(expr, parsedLabel.label, '=', row.labels[parsedLabel.label]);
+            expr = addLabelToQuery(expr, parsedLabel.label, '=', parsedLabel.value);
           }
         }
       }
@@ -202,10 +208,9 @@ export class LogContextProvider {
     Object.entries(labels).forEach(([label, value]) => {
       const filter: ContextFilter = {
         label,
-        value: label, // this looks weird in the first place, but we need to set the label as value here
+        value: value,
         enabled: allLabels.includes(label),
         fromParser: !allLabels.includes(label),
-        description: value,
       };
       contextFilters.push(filter);
     });
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
index fce625d2f5d..0dc2ae6495b 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
@@ -1,10 +1,12 @@
 import { act, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
 import { LogRowModel } from '@grafana/data';
 
 import { LogContextProvider } from '../LogContextProvider';
+import { ContextFilter, LokiQuery } from '../types';
 
 import { LokiContextUi, LokiContextUiProps } from './LokiContextUi';
 
@@ -14,6 +16,49 @@ jest.mock('@grafana/runtime', () => ({
   reportInteraction: () => null,
 }));
 
+jest.mock('app/core/store', () => {
+  return {
+    set() {},
+    getBool() {
+      return true;
+    },
+  };
+});
+
+const setupProps = (): LokiContextUiProps => {
+  const defaults: LokiContextUiProps = {
+    logContextProvider: mockLogContextProvider as unknown as LogContextProvider,
+    updateFilter: jest.fn(),
+    row: {
+      entry: 'WARN test 1.23 on [xxx]',
+      labels: {
+        label1: 'value1',
+        label3: 'value3',
+      },
+    } as unknown as LogRowModel,
+    onClose: jest.fn(),
+  };
+
+  return defaults;
+};
+
+const mockLogContextProvider = {
+  getInitContextFiltersFromLabels: jest.fn().mockImplementation(() =>
+    Promise.resolve([
+      { value: 'value1', enabled: true, fromParser: false, label: 'label1' },
+      { value: 'value3', enabled: false, fromParser: true, label: 'label3' },
+    ])
+  ),
+  processContextFiltersToExpr: jest.fn().mockImplementation(
+    (row: LogRowModel, contextFilters: ContextFilter[], query: LokiQuery | undefined) =>
+      `{${contextFilters
+        .filter((filter) => filter.enabled)
+        .map((filter) => `${filter.label}="${filter.value}"`)
+        .join('` ')}}`
+  ),
+  getLogRowContext: jest.fn(),
+};
+
 describe('LokiContextUi', () => {
   const savedGlobal = global;
   beforeAll(() => {
@@ -29,38 +74,11 @@ describe('LokiContextUi', () => {
   afterAll(() => {
     global = savedGlobal;
   });
-  const setupProps = (): LokiContextUiProps => {
-    const mockLogContextProvider = {
-      getInitContextFiltersFromLabels: jest.fn().mockImplementation(() =>
-        Promise.resolve([
-          { value: 'label1', enabled: true, fromParser: false, label: 'label1' },
-          { value: 'label3', enabled: false, fromParser: true, label: 'label3' },
-        ])
-      ),
-    };
 
-    const defaults: LokiContextUiProps = {
-      logContextProvider: mockLogContextProvider as unknown as LogContextProvider,
-      updateFilter: jest.fn(),
-      row: {
-        entry: 'WARN test 1.23 on [xxx]',
-        labels: {
-          label1: 'value1',
-          label3: 'value3',
-        },
-      } as unknown as LogRowModel,
-      onClose: jest.fn(),
-    };
-
-    return defaults;
-  };
-
-  it('renders and shows basic text', async () => {
+  it('renders and shows executed query text', async () => {
     const props = setupProps();
     render(<LokiContextUi {...props} />);
-
-    // Initial set of labels is available and not selected
-    expect(await screen.findByText(/Select labels to be included in the context query/)).toBeInTheDocument();
+    expect(await screen.findByText(/Executed log context query:/)).toBeInTheDocument();
   });
 
   it('initialize context filters', async () => {
@@ -79,7 +97,7 @@ describe('LokiContextUi', () => {
       expect(props.logContextProvider.getInitContextFiltersFromLabels).toHaveBeenCalled();
     });
     const select = await screen.findAllByRole('combobox');
-    await selectOptionInTest(select[0], 'label1');
+    await selectOptionInTest(select[0], 'label1="value1"');
   });
 
   it('finds label3 as a parsed label', async () => {
@@ -89,7 +107,7 @@ describe('LokiContextUi', () => {
       expect(props.logContextProvider.getInitContextFiltersFromLabels).toHaveBeenCalled();
     });
     const select = await screen.findAllByRole('combobox');
-    await selectOptionInTest(select[1], 'label3');
+    await selectOptionInTest(select[1], 'label3="value3"');
   });
 
   it('calls updateFilter when selecting a label', async () => {
@@ -100,7 +118,7 @@ describe('LokiContextUi', () => {
       expect(props.logContextProvider.getInitContextFiltersFromLabels).toHaveBeenCalled();
       expect(screen.getAllByRole('combobox')).toHaveLength(2);
     });
-    await selectOptionInTest(screen.getAllByRole('combobox')[1], 'label3');
+    await selectOptionInTest(screen.getAllByRole('combobox')[1], 'label3="value3"');
     act(() => {
       jest.runAllTimers();
     });
@@ -117,4 +135,21 @@ describe('LokiContextUi', () => {
       expect(props.onClose).toHaveBeenCalled();
     });
   });
+
+  it('displays executed query even if context ui closed', async () => {
+    const props = setupProps();
+    render(<LokiContextUi {...props} />);
+    // We start with the context ui open
+    expect(await screen.findByText(/Executed log context query:/)).toBeInTheDocument();
+    // We click on it to close
+    await userEvent.click(screen.getByText(/Executed log context query:/));
+    await waitFor(() => {
+      // We should see the query text (it is split into multiple spans)
+      expect(screen.getByText('{')).toBeInTheDocument();
+      expect(screen.getByText('label1')).toBeInTheDocument();
+      expect(screen.getByText('=')).toBeInTheDocument();
+      expect(screen.getByText('"value1"')).toBeInTheDocument();
+      expect(screen.getByText('}')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index 4532dce3b5d..ba82209170d 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -1,40 +1,38 @@
 import { css } from '@emotion/css';
-import memoizeOne from 'memoize-one';
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useAsync } from 'react-use';
 
 import { GrafanaTheme2, LogRowModel, SelectableValue } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
-import { LoadingPlaceholder, MultiSelect, Tag, Tooltip, useStyles2 } from '@grafana/ui';
+import { Collapse, Label, LoadingPlaceholder, MultiSelect, Tag, Tooltip, useStyles2 } from '@grafana/ui';
+import store from 'app/core/store';
 
+import { RawQuery } from '../../prometheus/querybuilder/shared/RawQuery';
 import { LogContextProvider } from '../LogContextProvider';
-import { ContextFilter } from '../types';
+import { escapeLabelValueInSelector } from '../languageUtils';
+import { lokiGrammar } from '../syntax';
+import { ContextFilter, LokiQuery } from '../types';
 
 export interface LokiContextUiProps {
   logContextProvider: LogContextProvider;
   row: LogRowModel;
   updateFilter: (value: ContextFilter[]) => void;
   onClose: () => void;
+  origQuery?: LokiQuery;
 }
 
 function getStyles(theme: GrafanaTheme2) {
   return {
     labels: css`
       display: flex;
-      gap: 2px;
+      gap: ${theme.spacing(0.5)};
     `,
-    multiSelectWrapper: css`
+    wrapper: css`
       display: flex;
       flex-direction: column;
       flex: 1;
-      margin-top: ${theme.spacing(1)};
       gap: ${theme.spacing(0.5)};
     `,
-    multiSelect: css`
-      & .scrollbar-view {
-        overscroll-behavior: contain;
-      }
-    `,
     loadingPlaceholder: css`
       margin-bottom: 0px;
       float: right;
@@ -48,23 +46,37 @@ function getStyles(theme: GrafanaTheme2) {
     hidden: css`
       visibility: hidden;
     `,
+    tag: css`
+      padding: ${theme.spacing(0.25)} ${theme.spacing(0.75)};
+    `,
+    label: css`
+      max-width: 100%;
+      margin: ${theme.spacing(2)} 0;
+    `,
+    query: css`
+      text-align: start;
+      line-break: anywhere;
+      margin-top: ${theme.spacing(0.5)};
+    `,
+    ui: css`
+      background-color: ${theme.colors.background.secondary};
+      padding: ${theme.spacing(2)};
+    `,
   };
 }
 
-const formatOptionLabel = memoizeOne(({ label, description }: SelectableValue<string>) => (
-  <Tooltip content={`${label}="${description}"`} placement="top" interactive={true}>
-    <span>{label}</span>
-  </Tooltip>
-));
+const IS_LOKI_LOG_CONTEXT_UI_OPEN = 'isLogContextQueryUiOpen';
 
 export function LokiContextUi(props: LokiContextUiProps) {
-  const { row, logContextProvider, updateFilter, onClose } = props;
+  const { row, logContextProvider, updateFilter, onClose, origQuery } = props;
   const styles = useStyles2(getStyles);
 
   const [contextFilters, setContextFilters] = useState<ContextFilter[]>([]);
 
   const [initialized, setInitialized] = useState(false);
   const [loading, setLoading] = useState(false);
+  const [isOpen, setIsOpen] = useState(store.getBool(IS_LOKI_LOG_CONTEXT_UI_OPEN, true));
+
   const timerHandle = React.useRef<number>();
   const previousInitialized = React.useRef<boolean>(false);
   const previousContextFilters = React.useRef<ContextFilter[]>([]);
@@ -136,108 +148,129 @@ export function LokiContextUi(props: LokiContextUiProps) {
   const parsedLabels = contextFilters.filter(({ fromParser }) => fromParser);
   const parsedLabelsEnabled = parsedLabels.filter(({ enabled }) => enabled);
 
+  const contextFilterToSelectFilter = useCallback((contextFilter: ContextFilter): SelectableValue<string> => {
+    return {
+      label: `${contextFilter.label}="${escapeLabelValueInSelector(contextFilter.value)}"`,
+      value: contextFilter.label,
+    };
+  }, []);
+
   return (
-    <div className={styles.multiSelectWrapper}>
-      <div className={styles.textWrapper}>
-        {' '}
-        <Tooltip
-          content={
-            'This feature is experimental and only works on log queries containing no more than 1 parser (logfmt, json).'
-          }
-          placement="top"
-        >
-          <Tag
-            className={css({
-              fontSize: 10,
-              padding: '1px 5px',
-              verticalAlign: 'text-bottom',
-            })}
-            name={'Experimental'}
-            colorIndex={1}
-          />
-        </Tooltip>{' '}
-        Select labels to be included in the context query:
-        <LoadingPlaceholder text="" className={`${styles.loadingPlaceholder} ${loading ? '' : styles.hidden}`} />
-      </div>
-      <div>
-        <MultiSelect
-          className={styles.multiSelect}
-          prefix="Labels"
-          options={realLabels}
-          value={realLabelsEnabled}
-          formatOptionLabel={formatOptionLabel}
-          closeMenuOnSelect={true}
-          maxMenuHeight={200}
-          menuShouldPortal={false}
-          noOptionsMessage="No further labels available"
-          onChange={(keys, actionMeta) => {
-            if (actionMeta.action === 'select-option') {
-              reportInteraction('grafana_explore_logs_loki_log_context_filtered', {
-                logRowUid: row.uid,
-                type: 'label',
-                action: 'select',
-              });
+    <div className={styles.wrapper}>
+      <LoadingPlaceholder text="" className={`${styles.loadingPlaceholder} ${loading ? '' : styles.hidden}`} />
+      <Collapse
+        collapsible={true}
+        isOpen={isOpen}
+        onToggle={() => {
+          store.set(IS_LOKI_LOG_CONTEXT_UI_OPEN, !isOpen);
+          setIsOpen((isOpen) => !isOpen);
+        }}
+        label={
+          <div className={styles.query}>
+            <Label>Executed log context query:</Label>
+            <RawQuery
+              lang={{ grammar: lokiGrammar, name: 'loki' }}
+              query={logContextProvider.processContextFiltersToExpr(
+                row,
+                contextFilters.filter(({ enabled }) => enabled),
+                origQuery
+              )}
+            />
+          </div>
+        }
+      >
+        <div className={styles.ui}>
+          <Tooltip
+            content={
+              'This feature is experimental and only works on log queries containing no more than 1 parser (logfmt, json).'
             }
-            if (actionMeta.action === 'remove-value') {
-              reportInteraction('grafana_explore_logs_loki_log_context_filtered', {
-                logRowUid: row.uid,
-                type: 'label',
-                action: 'remove',
-              });
-            }
-            return setContextFilters(
-              contextFilters.map((filter) => {
-                if (filter.fromParser) {
-                  return filter;
-                }
-                filter.enabled = keys.some((key) => key.value === filter.value);
-                return filter;
-              })
-            );
-          }}
-        />
-      </div>
-      {parsedLabels.length > 0 && (
-        <div>
+            placement="top"
+          >
+            <Tag className={styles.tag} name={'Experimental feature'} colorIndex={1} />
+          </Tooltip>{' '}
+          <Label
+            className={styles.label}
+            description="Context query is created from all labels defining the stream for the selected log line. Select labels to be included in log context query."
+          >
+            1. Select labels
+          </Label>
           <MultiSelect
-            className={styles.multiSelect}
-            prefix="Parsed Labels"
-            options={parsedLabels}
-            value={parsedLabelsEnabled}
-            formatOptionLabel={formatOptionLabel}
+            options={realLabels.map(contextFilterToSelectFilter)}
+            value={realLabelsEnabled.map(contextFilterToSelectFilter)}
             closeMenuOnSelect={true}
-            menuShouldPortal={false}
             maxMenuHeight={200}
             noOptionsMessage="No further labels available"
-            isClearable={true}
             onChange={(keys, actionMeta) => {
               if (actionMeta.action === 'select-option') {
                 reportInteraction('grafana_explore_logs_loki_log_context_filtered', {
                   logRowUid: row.uid,
-                  type: 'parsed_label',
+                  type: 'label',
                   action: 'select',
                 });
               }
               if (actionMeta.action === 'remove-value') {
                 reportInteraction('grafana_explore_logs_loki_log_context_filtered', {
                   logRowUid: row.uid,
-                  type: 'parsed_label',
+                  type: 'label',
                   action: 'remove',
                 });
               }
-              setContextFilters(
+              return setContextFilters(
                 contextFilters.map((filter) => {
-                  if (!filter.fromParser) {
+                  if (filter.fromParser) {
                     return filter;
                   }
-                  filter.enabled = keys.some((key) => key.value === filter.value);
+                  filter.enabled = keys.some((key) => key.value === filter.label);
                   return filter;
                 })
               );
             }}
           />
+          {parsedLabels.length > 0 && (
+            <>
+              <Label
+                className={styles.label}
+                description={`By using parser, you are able to filter for extracted labels. Select extracted labels to be included in log context query.`}
+              >
+                2. Add extracted label filters
+              </Label>
+              <MultiSelect
+                options={parsedLabels.map(contextFilterToSelectFilter)}
+                value={parsedLabelsEnabled.map(contextFilterToSelectFilter)}
+                closeMenuOnSelect={true}
+                maxMenuHeight={200}
+                noOptionsMessage="No further labels available"
+                isClearable={true}
+                onChange={(keys, actionMeta) => {
+                  if (actionMeta.action === 'select-option') {
+                    reportInteraction('grafana_explore_logs_loki_log_context_filtered', {
+                      logRowUid: row.uid,
+                      type: 'parsed_label',
+                      action: 'select',
+                    });
+                  }
+                  if (actionMeta.action === 'remove-value') {
+                    reportInteraction('grafana_explore_logs_loki_log_context_filtered', {
+                      logRowUid: row.uid,
+                      type: 'parsed_label',
+                      action: 'remove',
+                    });
+                  }
+                  setContextFilters(
+                    contextFilters.map((filter) => {
+                      if (!filter.fromParser) {
+                        return filter;
+                      }
+                      filter.enabled = keys.some((key) => key.value === filter.label);
+                      return filter;
+                    })
+                  );
+                }}
+              />
+            </>
+          )}
         </div>
-      )}
+      </Collapse>
     </div>
   );
 }
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 384a298e81b..e65b09fc2af 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -651,8 +651,8 @@ export class LokiDatasource
     return await this.logContextProvider.getLogRowContext(row, options, origQuery);
   };
 
-  getLogRowContextUi(row: LogRowModel, runContextQuery: () => void): React.ReactNode {
-    return this.logContextProvider.getLogRowContextUi(row, runContextQuery);
+  getLogRowContextUi(row: LogRowModel, runContextQuery: () => void, origQuery: DataQuery): React.ReactNode {
+    return this.logContextProvider.getLogRowContextUi(row, runContextQuery, origQuery);
   }
 
   testDatasource(): Promise<{ status: string; message: string }> {

From 98c695c68fb3f0d276da0d98b1e78186e459db50 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Tue, 18 Apr 2023 16:12:05 +0200
Subject: [PATCH 221/729] Chore: Use Grafana API to retrieve the public key to
 validate plugins (#66439)

---
 .../feature-toggles/index.md                  |   1 +
 .../src/types/featureToggles.gen.ts           |   1 +
 pkg/api/plugin_resource_test.go               |   4 +-
 pkg/plugins/config/config.go                  |   9 +-
 pkg/plugins/ifaces.go                         |   8 +
 pkg/plugins/manager/loader/loader.go          |  56 +++---
 pkg/plugins/manager/loader/loader_test.go     | 118 +++++++++++-
 .../manager/manager_integration_test.go       |   4 +-
 pkg/plugins/manager/signature/manifest.go     |  93 ++++------
 .../manager/signature/manifest_test.go        |  23 ++-
 .../signature/manifestverifier/verifier.go    | 171 ++++++++++++++++++
 .../manifestverifier/verifier_test.go         |  74 ++++++++
 pkg/plugins/repo/service.go                   |  10 +-
 pkg/services/featuremgmt/registry.go          |   6 +
 pkg/services/featuremgmt/toggles_gen.csv      |   1 +
 pkg/services/featuremgmt/toggles_gen.go       |   4 +
 .../pluginsintegration/config/config.go       |   5 +-
 .../pluginsintegration/pluginsintegration.go  |   2 +
 18 files changed, 487 insertions(+), 103 deletions(-)
 create mode 100644 pkg/plugins/manager/signature/manifestverifier/verifier.go
 create mode 100644 pkg/plugins/manager/signature/manifestverifier/verifier_test.go

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 2111f36dfcf..00a7f0fef6c 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -109,6 +109,7 @@ Alpha features might be changed or removed without prior notice.
 | `pyroscopeFlameGraph`              | Changes flame graph to pyroscope one                                                                                                                                                                |
 | `dataplaneFrontendFallback`        | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                |
 | `authenticationConfigUI`           | Enables authentication configuration UI                                                                                                                                                             |
+| `pluginsAPIManifestKey`            | Use grafana.com API to retrieve the public manifest key                                                                                                                                             |
 | `advancedDataSourcePicker`         | Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode                                                                                      |
 | `opensearchDetectVersion`          | Enable version detection in OpenSearch                                                                                                                                                              |
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 1f33ea090bb..605a663df8f 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -96,6 +96,7 @@ export interface FeatureToggles {
   useCachingService?: boolean;
   enableElasticsearchBackendQuerying?: boolean;
   authenticationConfigUI?: boolean;
+  pluginsAPIManifestKey?: boolean;
   advancedDataSourcePicker?: boolean;
   opensearchDetectVersion?: boolean;
 }
diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index 596c1456374..ff34565961e 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -60,12 +60,12 @@ func TestCallResource(t *testing.T) {
 
 	coreRegistry := coreplugin.ProvideCoreRegistry(nil, &cloudwatch.CloudWatchService{}, nil, nil, nil, nil,
 		nil, nil, nil, nil, testdatasource.ProvideService(cfg, featuremgmt.WithFeatures()), nil, nil, nil, nil, nil, nil)
-	pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg)
+	pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg, featuremgmt.WithFeatures())
 	require.NoError(t, err)
 	reg := registry.ProvideService()
 	l := loader.ProvideService(pCfg, fakes.NewFakeLicensingService(), signature.NewUnsignedAuthorizer(pCfg),
 		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(),
-		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)))
+		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg))
 	srcs := sources.ProvideService(cfg, pCfg)
 	ps, err := store.ProvideService(reg, srcs, l)
 	require.NoError(t, err)
diff --git a/pkg/plugins/config/config.go b/pkg/plugins/config/config.go
index 3b2e1d9c662..505425e6f2f 100644
--- a/pkg/plugins/config/config.go
+++ b/pkg/plugins/config/config.go
@@ -3,6 +3,7 @@ package config
 import (
 	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 
+	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -34,11 +35,15 @@ type Cfg struct {
 	PluginsCDNURLTemplate string
 
 	Tracing Tracing
+
+	GrafanaComURL string
+
+	Features plugins.FeatureToggles
 }
 
 func NewCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
 	awsAllowedAuthProviders []string, awsAssumeRoleEnabled bool, azure *azsettings.AzureSettings, secureSocksDSProxy setting.SecureSocksDSProxySettings,
-	grafanaVersion string, logDatasourceRequests bool, pluginsCDNURLTemplate string, tracing Tracing) *Cfg {
+	grafanaVersion string, logDatasourceRequests bool, pluginsCDNURLTemplate string, tracing Tracing, features plugins.FeatureToggles) *Cfg {
 	return &Cfg{
 		log:                     log.New("plugin.cfg"),
 		PluginsPath:             pluginsPath,
@@ -53,5 +58,7 @@ func NewCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSetti
 		LogDatasourceRequests:   logDatasourceRequests,
 		PluginsCDNURLTemplate:   pluginsCDNURLTemplate,
 		Tracing:                 tracing,
+		GrafanaComURL:           "https://grafana.com",
+		Features:                features,
 	}
 }
diff --git a/pkg/plugins/ifaces.go b/pkg/plugins/ifaces.go
index 8c1ae78f34b..6b0d6bc3499 100644
--- a/pkg/plugins/ifaces.go
+++ b/pkg/plugins/ifaces.go
@@ -136,3 +136,11 @@ type ClientMiddlewareFunc func(next Client) Client
 func (fn ClientMiddlewareFunc) CreateClientMiddleware(next Client) Client {
 	return fn(next)
 }
+
+type FeatureToggles interface {
+	IsEnabled(flag string) bool
+}
+
+type SignatureCalculator interface {
+	Calculate(ctx context.Context, src PluginSource, plugin FoundPlugin) (Signature, error)
+}
diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go
index 9f2d0abcb38..b515a0364a3 100644
--- a/pkg/plugins/manager/loader/loader.go
+++ b/pkg/plugins/manager/loader/loader.go
@@ -25,44 +25,45 @@ import (
 var _ plugins.ErrorResolver = (*Loader)(nil)
 
 type Loader struct {
-	pluginFinder       finder.Finder
-	processManager     process.Service
-	pluginRegistry     registry.Service
-	roleRegistry       plugins.RoleRegistry
-	pluginInitializer  initializer.Initializer
-	signatureValidator signature.Validator
-	pluginStorage      storage.Manager
-	assetPath          *assetpath.Service
-	log                log.Logger
-	cfg                *config.Cfg
-
-	errs map[string]*plugins.SignatureError
+	pluginFinder        finder.Finder
+	processManager      process.Service
+	pluginRegistry      registry.Service
+	roleRegistry        plugins.RoleRegistry
+	pluginInitializer   initializer.Initializer
+	signatureValidator  signature.Validator
+	signatureCalculator plugins.SignatureCalculator
+	pluginStorage       storage.Manager
+	assetPath           *assetpath.Service
+	log                 log.Logger
+	cfg                 *config.Cfg
+	errs                map[string]*plugins.SignatureError
 }
 
 func ProvideService(cfg *config.Cfg, license plugins.Licensing, authorizer plugins.PluginLoaderAuthorizer,
 	pluginRegistry registry.Service, backendProvider plugins.BackendFactoryProvider, pluginFinder finder.Finder,
-	roleRegistry plugins.RoleRegistry, assetPath *assetpath.Service) *Loader {
+	roleRegistry plugins.RoleRegistry, assetPath *assetpath.Service, signatureCalculator plugins.SignatureCalculator) *Loader {
 	return New(cfg, license, authorizer, pluginRegistry, backendProvider, process.NewManager(pluginRegistry),
 		storage.FileSystem(log.NewPrettyLogger("loader.fs"), cfg.PluginsPath), roleRegistry, assetPath,
-		pluginFinder)
+		pluginFinder, signatureCalculator)
 }
 
 func New(cfg *config.Cfg, license plugins.Licensing, authorizer plugins.PluginLoaderAuthorizer,
 	pluginRegistry registry.Service, backendProvider plugins.BackendFactoryProvider,
 	processManager process.Service, pluginStorage storage.Manager, roleRegistry plugins.RoleRegistry,
-	assetPath *assetpath.Service, pluginFinder finder.Finder) *Loader {
+	assetPath *assetpath.Service, pluginFinder finder.Finder, signatureCalculator plugins.SignatureCalculator) *Loader {
 	return &Loader{
-		pluginFinder:       pluginFinder,
-		pluginRegistry:     pluginRegistry,
-		pluginInitializer:  initializer.New(cfg, backendProvider, license),
-		signatureValidator: signature.NewValidator(authorizer),
-		processManager:     processManager,
-		pluginStorage:      pluginStorage,
-		errs:               make(map[string]*plugins.SignatureError),
-		log:                log.New("plugin.loader"),
-		roleRegistry:       roleRegistry,
-		cfg:                cfg,
-		assetPath:          assetPath,
+		pluginFinder:        pluginFinder,
+		pluginRegistry:      pluginRegistry,
+		pluginInitializer:   initializer.New(cfg, backendProvider, license),
+		signatureValidator:  signature.NewValidator(authorizer),
+		signatureCalculator: signatureCalculator,
+		processManager:      processManager,
+		pluginStorage:       pluginStorage,
+		errs:                make(map[string]*plugins.SignatureError),
+		log:                 log.New("plugin.loader"),
+		roleRegistry:        roleRegistry,
+		cfg:                 cfg,
+		assetPath:           assetPath,
 	}
 }
 
@@ -77,13 +78,14 @@ func (l *Loader) Load(ctx context.Context, src plugins.PluginSource) ([]*plugins
 
 func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, found []*plugins.FoundBundle) ([]*plugins.Plugin, error) {
 	var loadedPlugins []*plugins.Plugin
+
 	for _, p := range found {
 		if _, exists := l.pluginRegistry.Plugin(ctx, p.Primary.JSONData.ID); exists {
 			l.log.Warn("Skipping plugin loading as it's a duplicate", "pluginID", p.Primary.JSONData.ID)
 			continue
 		}
 
-		sig, err := signature.Calculate(ctx, l.log, src, p.Primary)
+		sig, err := l.signatureCalculator.Calculate(ctx, src, p.Primary)
 		if err != nil {
 			l.log.Warn("Could not calculate plugin signature state", "pluginID", p.Primary.JSONData.ID, "err", err)
 			continue
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index d922f27fb3c..2cc0663a8e8 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -2,7 +2,10 @@ package loader
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"net/http"
+	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"sort"
@@ -21,8 +24,10 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/initializer"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/manifestverifier"
 	"github.com/grafana/grafana/pkg/plugins/manager/sources"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -1117,6 +1122,117 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 	})
 }
 
+func TestLoader_Load_UseAPIForManifestPublicKey(t *testing.T) {
+	t.Run("Load plugin using API manifest", func(t *testing.T) {
+		pluginDir, err := filepath.Abs("../testdata/test-app")
+		if err != nil {
+			t.Errorf("could not construct absolute path of plugin dir")
+			return
+		}
+		expected := []*plugins.Plugin{
+			{
+				JSONData: plugins.JSONData{
+					ID:   "test-app",
+					Type: "app",
+					Name: "Test App",
+					Info: plugins.Info{
+						Author: plugins.InfoLink{
+							Name: "Test Inc.",
+							URL:  "http://test.com",
+						},
+						Description: "Official Grafana Test App & Dashboard bundle",
+						Version:     "1.0.0",
+						Links: []plugins.InfoLink{
+							{Name: "Project site", URL: "http://project.com"},
+							{Name: "License & Terms", URL: "http://license.com"},
+						},
+						Logos: plugins.Logos{
+							Small: "public/plugins/test-app/img/logo_small.png",
+							Large: "public/plugins/test-app/img/logo_large.png",
+						},
+						Screenshots: []plugins.Screenshots{
+							{Path: "public/plugins/test-app/img/screenshot1.png", Name: "img1"},
+							{Path: "public/plugins/test-app/img/screenshot2.png", Name: "img2"},
+						},
+						Updated: "2015-02-10",
+					},
+					Dependencies: plugins.Dependencies{
+						GrafanaVersion: "3.x.x",
+						Plugins: []plugins.Dependency{
+							{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
+							{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
+						},
+					},
+					Includes: []*plugins.Includes{
+						{Name: "Nginx Connections", Path: "dashboards/connections.json", Type: "dashboard", Role: "Viewer", Slug: "nginx-connections"},
+						{Name: "Nginx Memory", Path: "dashboards/memory.json", Type: "dashboard", Role: "Viewer", Slug: "nginx-memory"},
+						{Name: "Nginx Panel", Type: "panel", Role: "Viewer", Slug: "nginx-panel"},
+						{Name: "Nginx Datasource", Type: "datasource", Role: "Viewer", Slug: "nginx-datasource"},
+					},
+					Backend: false,
+				},
+				FS:            plugins.NewLocalFS(filesInDir(t, pluginDir), pluginDir),
+				Class:         plugins.External,
+				Signature:     plugins.SignatureValid,
+				SignatureType: plugins.GrafanaSignature,
+				SignatureOrg:  "Grafana Labs",
+				Module:        "plugins/test-app/module",
+				BaseURL:       "public/plugins/test-app",
+			},
+		}
+
+		reg := fakes.NewFakePluginRegistry()
+		storage := fakes.NewFakePluginStorage()
+		procPrvdr := fakes.NewFakeBackendProcessProvider()
+		procMgr := fakes.NewFakeProcessManager()
+		apiCalled := false
+		cfg := &config.Cfg{Features: featuremgmt.WithFeatures([]interface{}{"pluginsAPIManifestKey"}...)}
+		s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/api/plugins/ci/keys" {
+				w.WriteHeader(http.StatusOK)
+				// Use the hardcoded key
+				k, err := manifestverifier.New(&config.Cfg{}, log.New("test")).GetPublicKey("7e4d0c6a708866e7")
+				require.NoError(t, err)
+				data := struct {
+					Items []manifestverifier.ManifestKeys `json:"items"`
+				}{
+					Items: []manifestverifier.ManifestKeys{{PublicKey: k, KeyID: "7e4d0c6a708866e7"}},
+				}
+				b, err := json.Marshal(data)
+				require.NoError(t, err)
+				_, err = w.Write(b)
+				require.NoError(t, err)
+				apiCalled = true
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		}))
+		cfg.GrafanaComURL = s.URL
+		l := newLoader(cfg, func(l *Loader) {
+			l.pluginRegistry = reg
+			l.pluginStorage = storage
+			l.processManager = procMgr
+			l.pluginInitializer = initializer.New(cfg, procPrvdr, fakes.NewFakeLicensingService())
+		})
+		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
+			PluginClassFunc: func(ctx context.Context) plugins.Class {
+				return plugins.External
+			},
+			PluginURIsFunc: func(ctx context.Context) []string {
+				return []string{pluginDir}
+			},
+		})
+		require.NoError(t, err)
+		require.True(t, apiCalled)
+
+		if !cmp.Equal(got, expected, compareOpts...) {
+			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
+		}
+
+		verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+	})
+}
+
 func TestLoader_Load_NestedPlugins(t *testing.T) {
 	rootDir, err := filepath.Abs("../")
 	if err != nil {
@@ -1435,7 +1551,7 @@ func Test_setPathsBasedOnApp(t *testing.T) {
 func newLoader(cfg *config.Cfg, cbs ...func(loader *Loader)) *Loader {
 	l := New(cfg, &fakes.FakeLicensingService{}, signature.NewUnsignedAuthorizer(cfg), fakes.NewFakePluginRegistry(),
 		fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakePluginStorage(),
-		fakes.NewFakeRoleRegistry(), assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder())
+		fakes.NewFakeRoleRegistry(), assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(), signature.ProvideService(cfg))
 
 	for _, cb := range cbs {
 		cb(l)
diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go
index 56899d80ec4..52ec0f71d09 100644
--- a/pkg/plugins/manager/manager_integration_test.go
+++ b/pkg/plugins/manager/manager_integration_test.go
@@ -111,13 +111,13 @@ func TestIntegrationPluginManager(t *testing.T) {
 
 	coreRegistry := coreplugin.ProvideCoreRegistry(am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf, phlare, parca)
 
-	pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg)
+	pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg, featuremgmt.WithFeatures())
 	require.NoError(t, err)
 	reg := registry.ProvideService()
 	lic := plicensing.ProvideLicensing(cfg, &licensing.OSSLicensingService{Cfg: cfg})
 	l := loader.ProvideService(pCfg, lic, signature.NewUnsignedAuthorizer(pCfg),
 		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(),
-		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)))
+		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg))
 	srcs := sources.ProvideService(cfg, pCfg)
 	ps, err := store.ProvideService(reg, srcs, l)
 	require.NoError(t, err)
diff --git a/pkg/plugins/manager/signature/manifest.go b/pkg/plugins/manager/signature/manifest.go
index 604795edd99..7fe263ed9ed 100644
--- a/pkg/plugins/manager/signature/manifest.go
+++ b/pkg/plugins/manager/signature/manifest.go
@@ -1,7 +1,6 @@
 package signature
 
 import (
-	"bytes"
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
@@ -16,42 +15,15 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/gobwas/glob"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/manifestverifier"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-// Soon we can fetch keys from:
-//
-//	https://grafana.com/api/plugins/ci/keys
-const publicKeyText = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: OpenPGP.js v4.10.1
-Comment: https://openpgpjs.org
-
-xpMEXpTXXxMFK4EEACMEIwQBiOUQhvGbDLvndE0fEXaR0908wXzPGFpf0P0Z
-HJ06tsq+0higIYHp7WTNJVEZtcwoYLcPRGaa9OQqbUU63BEyZdgAkPTz3RFd
-5+TkDWZizDcaVFhzbDd500yTwexrpIrdInwC/jrgs7Zy/15h8KA59XXUkdmT
-YB6TR+OA9RKME+dCJozNGUdyYWZhbmEgPGVuZ0BncmFmYW5hLmNvbT7CvAQQ
-EwoAIAUCXpTXXwYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BAAoJEH5NDGpw
-iGbnaWoCCQGQ3SQnCkRWrG6XrMkXOKfDTX2ow9fuoErN46BeKmLM4f1EkDZQ
-Tpq3SE8+My8B5BIH3SOcBeKzi3S57JHGBdFA+wIJAYWMrJNIvw8GeXne+oUo
-NzzACdvfqXAZEp/HFMQhCKfEoWGJE8d2YmwY2+3GufVRTI5lQnZOHLE8L/Vc
-1S5MXESjzpcEXpTXXxIFK4EEACMEIwQBtHX/SD5Qm3v4V92qpaIZQgtTX0sT
-cFPjYWAHqsQ1iENrYN/vg1wU3ADlYATvydOQYvkTyT/tbDvx2Fse8PL84MQA
-YKKQ6AJ3gLVvmeouZdU03YoV4MYaT8KbnJUkZQZkqdz2riOlySNI9CG3oYmv
-omjUAtzgAgnCcurfGLZkkMxlmY8DAQoJwqQEGBMKAAkFAl6U118CGwwACgkQ
-fk0ManCIZuc0jAIJAVw2xdLr4ZQqPUhubrUyFcqlWoW8dQoQagwO8s8ubmby
-KuLA9FWJkfuuRQr+O9gHkDVCez3aism7zmJBqIOi38aNAgjJ3bo6leSS2jR/
-x5NqiKVi83tiXDPncDQYPymOnMhW0l7CVA7wj75HrFvvlRI/4MArlbsZ2tBn
-N1c5v9v/4h6qeA==
-=DNbR
------END PGP PUBLIC KEY BLOCK-----
-`
-
 var (
 	runningWindows = runtime.GOOS == "windows"
 
@@ -79,9 +51,24 @@ func (m *PluginManifest) isV2() bool {
 	return strings.HasPrefix(m.ManifestVersion, "2.")
 }
 
-// ReadPluginManifest attempts to read and verify the plugin manifest
+type Signature struct {
+	verifier *manifestverifier.ManifestVerifier
+	mlog     log.Logger
+}
+
+var _ plugins.SignatureCalculator = &Signature{}
+
+func ProvideService(cfg *config.Cfg) *Signature {
+	log := log.New("plugin.signature")
+	return &Signature{
+		verifier: manifestverifier.New(cfg, log),
+		mlog:     log,
+	}
+}
+
+// readPluginManifest attempts to read and verify the plugin manifest
 // if any error occurs or the manifest is not valid, this will return an error
-func ReadPluginManifest(body []byte) (*PluginManifest, error) {
+func (s *Signature) readPluginManifest(body []byte) (*PluginManifest, error) {
 	block, _ := clearsign.Decode(body)
 	if block == nil {
 		return nil, errors.New("unable to decode manifest")
@@ -94,20 +81,20 @@ func ReadPluginManifest(body []byte) (*PluginManifest, error) {
 		return nil, fmt.Errorf("%v: %w", "Error parsing manifest JSON", err)
 	}
 
-	if err = validateManifest(manifest, block); err != nil {
+	if err = s.validateManifest(manifest, block); err != nil {
 		return nil, err
 	}
 
 	return &manifest, nil
 }
 
-func Calculate(ctx context.Context, mlog log.Logger, src plugins.PluginSource, plugin plugins.FoundPlugin) (plugins.Signature, error) {
+func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plugin plugins.FoundPlugin) (plugins.Signature, error) {
 	if defaultSignature, exists := src.DefaultSignature(ctx); exists {
 		return defaultSignature, nil
 	}
 
 	if len(plugin.FS.Files()) == 0 {
-		mlog.Warn("No plugin file information in directory", "pluginID", plugin.JSONData.ID)
+		s.mlog.Warn("No plugin file information in directory", "pluginID", plugin.JSONData.ID)
 		return plugins.Signature{
 			Status: plugins.SignatureInvalid,
 		}, nil
@@ -116,13 +103,13 @@ func Calculate(ctx context.Context, mlog log.Logger, src plugins.PluginSource, p
 	f, err := plugin.FS.Open("MANIFEST.txt")
 	if err != nil {
 		if errors.Is(err, plugins.ErrFileNotExist) {
-			mlog.Debug("Could not find a MANIFEST.txt", "id", plugin.JSONData.ID, "err", err)
+			s.mlog.Debug("Could not find a MANIFEST.txt", "id", plugin.JSONData.ID, "err", err)
 			return plugins.Signature{
 				Status: plugins.SignatureUnsigned,
 			}, nil
 		}
 
-		mlog.Debug("Could not open MANIFEST.txt", "id", plugin.JSONData.ID, "err", err)
+		s.mlog.Debug("Could not open MANIFEST.txt", "id", plugin.JSONData.ID, "err", err)
 		return plugins.Signature{
 			Status: plugins.SignatureInvalid,
 		}, nil
@@ -132,21 +119,21 @@ func Calculate(ctx context.Context, mlog log.Logger, src plugins.PluginSource, p
 			return
 		}
 		if err = f.Close(); err != nil {
-			mlog.Warn("Failed to close plugin MANIFEST file", "err", err)
+			s.mlog.Warn("Failed to close plugin MANIFEST file", "err", err)
 		}
 	}()
 
 	byteValue, err := io.ReadAll(f)
 	if err != nil || len(byteValue) < 10 {
-		mlog.Debug("MANIFEST.TXT is invalid", "id", plugin.JSONData.ID)
+		s.mlog.Debug("MANIFEST.TXT is invalid", "id", plugin.JSONData.ID)
 		return plugins.Signature{
 			Status: plugins.SignatureUnsigned,
 		}, nil
 	}
 
-	manifest, err := ReadPluginManifest(byteValue)
+	manifest, err := s.readPluginManifest(byteValue)
 	if err != nil {
-		mlog.Debug("Plugin signature invalid", "id", plugin.JSONData.ID, "err", err)
+		s.mlog.Debug("Plugin signature invalid", "id", plugin.JSONData.ID, "err", err)
 		return plugins.Signature{
 			Status: plugins.SignatureInvalid,
 		}, nil
@@ -168,10 +155,10 @@ func Calculate(ctx context.Context, mlog log.Logger, src plugins.PluginSource, p
 	// Validate that plugin is running within defined root URLs
 	if len(manifest.RootURLs) > 0 {
 		if match, err := urlMatch(manifest.RootURLs, setting.AppUrl, manifest.SignatureType); err != nil {
-			mlog.Warn("Could not verify if root URLs match", "plugin", plugin.JSONData.ID, "rootUrls", manifest.RootURLs)
+			s.mlog.Warn("Could not verify if root URLs match", "plugin", plugin.JSONData.ID, "rootUrls", manifest.RootURLs)
 			return plugins.Signature{}, err
 		} else if !match {
-			mlog.Warn("Could not find root URL that matches running application URL", "plugin", plugin.JSONData.ID,
+			s.mlog.Warn("Could not find root URL that matches running application URL", "plugin", plugin.JSONData.ID,
 				"appUrl", setting.AppUrl, "rootUrls", manifest.RootURLs)
 			return plugins.Signature{
 				Status: plugins.SignatureInvalid,
@@ -183,7 +170,7 @@ func Calculate(ctx context.Context, mlog log.Logger, src plugins.PluginSource, p
 
 	// Verify the manifest contents
 	for p, hash := range manifest.Files {
-		err = verifyHash(mlog, plugin, p, hash)
+		err = verifyHash(s.mlog, plugin, p, hash)
 		if err != nil {
 			return plugins.Signature{
 				Status: plugins.SignatureModified,
@@ -213,13 +200,13 @@ func Calculate(ctx context.Context, mlog log.Logger, src plugins.PluginSource, p
 	}
 
 	if len(unsignedFiles) > 0 {
-		mlog.Warn("The following files were not included in the signature", "plugin", plugin.JSONData.ID, "files", unsignedFiles)
+		s.mlog.Warn("The following files were not included in the signature", "plugin", plugin.JSONData.ID, "files", unsignedFiles)
 		return plugins.Signature{
 			Status: plugins.SignatureModified,
 		}, nil
 	}
 
-	mlog.Debug("Plugin signature valid", "id", plugin.JSONData.ID)
+	s.mlog.Debug("Plugin signature valid", "id", plugin.JSONData.ID)
 	return plugins.Signature{
 		Status:     plugins.SignatureValid,
 		Type:       manifest.SignatureType,
@@ -299,7 +286,7 @@ func (r invalidFieldErr) Error() string {
 	return fmt.Sprintf("valid manifest field %s is required", r.field)
 }
 
-func validateManifest(m PluginManifest, block *clearsign.Block) error {
+func (s *Signature) validateManifest(m PluginManifest, block *clearsign.Block) error {
 	if len(m.Plugin) == 0 {
 		return invalidFieldErr{field: "plugin"}
 	}
@@ -326,16 +313,6 @@ func validateManifest(m PluginManifest, block *clearsign.Block) error {
 			return fmt.Errorf("%s is not a valid signature type", m.SignatureType)
 		}
 	}
-	keyring, err := openpgp.ReadArmoredKeyRing(bytes.NewBufferString(publicKeyText))
-	if err != nil {
-		return fmt.Errorf("%v: %w", "failed to parse public key", err)
-	}
 
-	if _, err = openpgp.CheckDetachedSignature(keyring,
-		bytes.NewBuffer(block.Bytes),
-		block.ArmoredSignature.Body, &packet.Config{}); err != nil {
-		return fmt.Errorf("%v: %w", "failed to check signature", err)
-	}
-
-	return nil
+	return s.verifier.Verify(m.KeyID, block)
 }
diff --git a/pkg/plugins/manager/signature/manifest_test.go b/pkg/plugins/manager/signature/manifest_test.go
index e3157c1b239..3a1e887ffa8 100644
--- a/pkg/plugins/manager/signature/manifest_test.go
+++ b/pkg/plugins/manager/signature/manifest_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -49,7 +49,8 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
 -----END PGP SIGNATURE-----`
 
 	t.Run("valid manifest", func(t *testing.T) {
-		manifest, err := ReadPluginManifest([]byte(txt))
+		s := ProvideService(&config.Cfg{})
+		manifest, err := s.readPluginManifest([]byte(txt))
 
 		require.NoError(t, err)
 		require.NotNil(t, manifest)
@@ -65,7 +66,8 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
 
 	t.Run("invalid manifest", func(t *testing.T) {
 		modified := strings.ReplaceAll(txt, "README.md", "xxxxxxxxxx")
-		_, err := ReadPluginManifest([]byte(modified))
+		s := ProvideService(&config.Cfg{})
+		_, err := s.readPluginManifest([]byte(modified))
 		require.Error(t, err)
 	})
 }
@@ -102,7 +104,8 @@ khdr/tZ1PDgRxMqB/u+Vtbpl0xSxgblnrDOYMSI=
 -----END PGP SIGNATURE-----`
 
 	t.Run("valid manifest", func(t *testing.T) {
-		manifest, err := ReadPluginManifest([]byte(txt))
+		s := ProvideService(&config.Cfg{})
+		manifest, err := s.readPluginManifest([]byte(txt))
 
 		require.NoError(t, err)
 		require.NotNil(t, manifest)
@@ -155,7 +158,8 @@ func TestCalculate(t *testing.T) {
 			setting.AppUrl = tc.appURL
 
 			basePath := filepath.Join(parentDir, "testdata/non-pvt-with-root-url/plugin")
-			sig, err := Calculate(context.Background(), log.NewTestLogger(), &fakes.FakePluginSource{
+			s := ProvideService(&config.Cfg{})
+			sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 				PluginClassFunc: func(ctx context.Context) plugins.Class {
 					return plugins.External
 				},
@@ -185,7 +189,8 @@ func TestCalculate(t *testing.T) {
 		basePath := "../testdata/renderer-added-file/plugin"
 
 		runningWindows = true
-		sig, err := Calculate(context.Background(), log.NewTestLogger(), &fakes.FakePluginSource{
+		s := ProvideService(&config.Cfg{})
+		sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
 				return plugins.External
 			},
@@ -233,7 +238,8 @@ func TestCalculate(t *testing.T) {
 
 				basePath := "../testdata/app-with-child/dist"
 
-				sig, err := Calculate(context.Background(), log.NewTestLogger(), &fakes.FakePluginSource{
+				s := ProvideService(&config.Cfg{})
+				sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 					PluginClassFunc: func(ctx context.Context) plugins.Class {
 						return plugins.External
 					},
@@ -677,7 +683,8 @@ func Test_validateManifest(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			err := validateManifest(*tc.manifest, nil)
+			s := ProvideService(&config.Cfg{})
+			err := s.validateManifest(*tc.manifest, nil)
 			require.Errorf(t, err, tc.expectedErr)
 		})
 	}
diff --git a/pkg/plugins/manager/signature/manifestverifier/verifier.go b/pkg/plugins/manager/signature/manifestverifier/verifier.go
new file mode 100644
index 00000000000..a5cd6ce57cb
--- /dev/null
+++ b/pkg/plugins/manager/signature/manifestverifier/verifier.go
@@ -0,0 +1,171 @@
+package manifestverifier
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"sync"
+	"time"
+
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/log"
+)
+
+// ManifestKeys is the database representation of public keys
+// used to verify plugin manifests.
+type ManifestKeys struct {
+	KeyID     string `json:"keyId"`
+	PublicKey string `json:"public"`
+	Since     int64  `json:"since"`
+}
+
+type ManifestVerifier struct {
+	cfg  *config.Cfg
+	mlog log.Logger
+
+	lock       sync.Mutex
+	cli        http.Client
+	publicKeys map[string]ManifestKeys
+}
+
+func New(cfg *config.Cfg, mlog log.Logger) *ManifestVerifier {
+	return &ManifestVerifier{
+		cfg:        cfg,
+		publicKeys: map[string]ManifestKeys{},
+		mlog:       mlog,
+		cli:        makeHttpClient(),
+	}
+}
+
+const publicKeyText = `-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: OpenPGP.js v4.10.1
+Comment: https://openpgpjs.org
+	
+xpMEXpTXXxMFK4EEACMEIwQBiOUQhvGbDLvndE0fEXaR0908wXzPGFpf0P0Z
+HJ06tsq+0higIYHp7WTNJVEZtcwoYLcPRGaa9OQqbUU63BEyZdgAkPTz3RFd
+5+TkDWZizDcaVFhzbDd500yTwexrpIrdInwC/jrgs7Zy/15h8KA59XXUkdmT
+YB6TR+OA9RKME+dCJozNGUdyYWZhbmEgPGVuZ0BncmFmYW5hLmNvbT7CvAQQ
+EwoAIAUCXpTXXwYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BAAoJEH5NDGpw
+iGbnaWoCCQGQ3SQnCkRWrG6XrMkXOKfDTX2ow9fuoErN46BeKmLM4f1EkDZQ
+Tpq3SE8+My8B5BIH3SOcBeKzi3S57JHGBdFA+wIJAYWMrJNIvw8GeXne+oUo
+NzzACdvfqXAZEp/HFMQhCKfEoWGJE8d2YmwY2+3GufVRTI5lQnZOHLE8L/Vc
+1S5MXESjzpcEXpTXXxIFK4EEACMEIwQBtHX/SD5Qm3v4V92qpaIZQgtTX0sT
+cFPjYWAHqsQ1iENrYN/vg1wU3ADlYATvydOQYvkTyT/tbDvx2Fse8PL84MQA
+YKKQ6AJ3gLVvmeouZdU03YoV4MYaT8KbnJUkZQZkqdz2riOlySNI9CG3oYmv
+omjUAtzgAgnCcurfGLZkkMxlmY8DAQoJwqQEGBMKAAkFAl6U118CGwwACgkQ
+fk0ManCIZuc0jAIJAVw2xdLr4ZQqPUhubrUyFcqlWoW8dQoQagwO8s8ubmby
+KuLA9FWJkfuuRQr+O9gHkDVCez3aism7zmJBqIOi38aNAgjJ3bo6leSS2jR/
+x5NqiKVi83tiXDPncDQYPymOnMhW0l7CVA7wj75HrFvvlRI/4MArlbsZ2tBn
+N1c5v9v/4h6qeA==
+=DNbR
+-----END PGP PUBLIC KEY BLOCK-----
+`
+
+// getPublicKey loads public keys from:
+//   - The hard-coded value if the feature flag is not enabled.
+//   - A cached value from memory if it has been already retrieved.
+//   - The Grafana.com API if the database is empty.
+func (pmv *ManifestVerifier) GetPublicKey(keyID string) (string, error) {
+	if pmv.cfg == nil || pmv.cfg.Features == nil || !pmv.cfg.Features.IsEnabled("pluginsAPIManifestKey") {
+		return publicKeyText, nil
+	}
+
+	pmv.lock.Lock()
+	defer pmv.lock.Unlock()
+
+	key, exist := pmv.publicKeys[keyID]
+	if exist {
+		return key.PublicKey, nil
+	}
+
+	// Retrieve the key from the API and store it in the database
+	var data struct {
+		Items []ManifestKeys
+	}
+
+	url, err := url.JoinPath(pmv.cfg.GrafanaComURL, "/api/plugins/ci/keys") // nolint:gosec URL is provided by config
+	if err != nil {
+		return "", err
+	}
+	req, err := http.NewRequest(http.MethodGet, url, nil)
+	if err != nil {
+		return "", err
+	}
+
+	resp, err := pmv.cli.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer func() {
+		err := resp.Body.Close()
+		if err != nil {
+			pmv.mlog.Warn("error closing response body", "error", err)
+		}
+	}()
+
+	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
+		return "", err
+	}
+
+	if len(data.Items) == 0 {
+		return "", errors.New("missing public key")
+	}
+
+	for _, key := range data.Items {
+		pmv.publicKeys[key.KeyID] = key
+	}
+
+	key, exist = pmv.publicKeys[keyID]
+	if exist {
+		return key.PublicKey, nil
+	}
+
+	return "", fmt.Errorf("missing public key for %s", keyID)
+}
+
+func (pmv *ManifestVerifier) Verify(keyID string, block *clearsign.Block) error {
+	publicKey, err := pmv.GetPublicKey(keyID)
+	if err != nil {
+		return err
+	}
+
+	keyring, err := openpgp.ReadArmoredKeyRing(bytes.NewBufferString(publicKey))
+	if err != nil {
+		return fmt.Errorf("%v: %w", "failed to parse public key", err)
+	}
+
+	if _, err = openpgp.CheckDetachedSignature(keyring,
+		bytes.NewBuffer(block.Bytes),
+		block.ArmoredSignature.Body, &packet.Config{}); err != nil {
+		return fmt.Errorf("%v: %w", "failed to check signature", err)
+	}
+
+	return nil
+}
+
+// Same configuration as pkg/plugins/repo/client.go
+func makeHttpClient() http.Client {
+	tr := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		DialContext: (&net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+		}).DialContext,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+
+	return http.Client{
+		Timeout:   10 * time.Second,
+		Transport: tr,
+	}
+}
diff --git a/pkg/plugins/manager/signature/manifestverifier/verifier_test.go b/pkg/plugins/manager/signature/manifestverifier/verifier_test.go
new file mode 100644
index 00000000000..116d447b3d2
--- /dev/null
+++ b/pkg/plugins/manager/signature/manifestverifier/verifier_test.go
@@ -0,0 +1,74 @@
+package manifestverifier
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"testing"
+
+	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_Verify(t *testing.T) {
+	t.Run("it should verify a manifest with the default key", func(t *testing.T) {
+		v := New(&config.Cfg{}, log.New("test"))
+
+		body, err := os.ReadFile("../../testdata/test-app/MANIFEST.txt")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		block, _ := clearsign.Decode(body)
+		if block == nil {
+			t.Fatal("failed to decode")
+		}
+
+		err = v.Verify("7e4d0c6a708866e7", block)
+		require.NoError(t, err)
+	})
+
+	t.Run("it should verify a manifest with the API key", func(t *testing.T) {
+		cfg := &config.Cfg{
+			Features: featuremgmt.WithFeatures([]interface{}{"pluginsAPIManifestKey"}...),
+		}
+		v := New(cfg, log.New("test"))
+		apiCalled := false
+		s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/api/plugins/ci/keys" {
+				w.WriteHeader(http.StatusOK)
+				data := struct {
+					Items []ManifestKeys `json:"items"`
+				}{
+					Items: []ManifestKeys{{PublicKey: publicKeyText, KeyID: "7e4d0c6a708866e7"}},
+				}
+				b, err := json.Marshal(data)
+				require.NoError(t, err)
+				_, err = w.Write(b)
+				require.NoError(t, err)
+				apiCalled = true
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		}))
+		cfg.GrafanaComURL = s.URL
+
+		body, err := os.ReadFile("../../testdata/test-app/MANIFEST.txt")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		block, _ := clearsign.Decode(body)
+		if block == nil {
+			t.Fatal("failed to decode")
+		}
+
+		err = v.Verify("7e4d0c6a708866e7", block)
+		require.NoError(t, err)
+		require.Equal(t, true, apiCalled)
+	})
+}
diff --git a/pkg/plugins/repo/service.go b/pkg/plugins/repo/service.go
index 73cdf14b824..6cd7dec3739 100644
--- a/pkg/plugins/repo/service.go
+++ b/pkg/plugins/repo/service.go
@@ -8,6 +8,7 @@ import (
 	"path"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 )
 
@@ -18,9 +19,12 @@ type Manager struct {
 	log log.PrettyLogger
 }
 
-func ProvideService() *Manager {
-	defaultBaseURL := "https://grafana.com/api/plugins"
-	return New(false, defaultBaseURL, log.NewPrettyLogger("plugin.repository"))
+func ProvideService(cfg *config.Cfg) (*Manager, error) {
+	defaultBaseURL, err := url.JoinPath(cfg.GrafanaComURL, "/api/plugins")
+	if err != nil {
+		return nil, err
+	}
+	return New(false, defaultBaseURL, log.NewPrettyLogger("plugin.repository")), nil
 }
 
 func New(skipTLSVerify bool, baseURL string, logger log.PrettyLogger) *Manager {
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index bc3da24850c..1b135bfb272 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -518,6 +518,12 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaAuthnzSquad,
 		},
+		{
+			Name:        "pluginsAPIManifestKey",
+			Description: "Use grafana.com API to retrieve the public manifest key",
+			State:       FeatureStateAlpha,
+			Owner:       grafanaPluginsPlatformSquad,
+		},
 		{
 			Name:         "advancedDataSourcePicker",
 			Description:  "Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index ed9c0c4aa67..e0b657a6b6e 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -77,5 +77,6 @@ dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false
 useCachingService,stable,@grafana/grafana-operator-experience-squad,false,false,true,false
 enableElasticsearchBackendQuerying,beta,@grafana/observability-logs,false,false,false,false
 authenticationConfigUI,alpha,@grafana/grafana-authnz-team,false,false,false,false
+pluginsAPIManifestKey,alpha,@grafana/plugins-platform-backend,false,false,false,false
 advancedDataSourcePicker,alpha,@grafana/dashboards-squad,false,false,false,true
 opensearchDetectVersion,alpha,@grafana/aws-plugins,false,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index f24b65e4eb6..b22411130ad 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -319,6 +319,10 @@ const (
 	// Enables authentication configuration UI
 	FlagAuthenticationConfigUI = "authenticationConfigUI"
 
+	// FlagPluginsAPIManifestKey
+	// Use grafana.com API to retrieve the public manifest key
+	FlagPluginsAPIManifestKey = "pluginsAPIManifestKey"
+
 	// FlagAdvancedDataSourcePicker
 	// Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode
 	FlagAdvancedDataSourcePicker = "advancedDataSourcePicker"
diff --git a/pkg/services/pluginsintegration/config/config.go b/pkg/services/pluginsintegration/config/config.go
index 762603b0476..ced64a8895d 100644
--- a/pkg/services/pluginsintegration/config/config.go
+++ b/pkg/services/pluginsintegration/config/config.go
@@ -5,10 +5,11 @@ import (
 	"strings"
 
 	pCfg "github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg) (*pCfg.Cfg, error) {
+func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg, features *featuremgmt.FeatureManager) (*pCfg.Cfg, error) {
 	plugins := settingProvider.Section("plugins")
 	allowedUnsigned := grafanaCfg.PluginsAllowUnsigned
 	if len(plugins.KeyValue("allow_loading_unsigned_plugins").Value()) > 0 {
@@ -25,6 +26,7 @@ func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg) (*
 	if err != nil {
 		return nil, fmt.Errorf("new opentelemetry cfg: %w", err)
 	}
+
 	return pCfg.NewCfg(
 		settingProvider.KeyValue("", "app_mode").MustBool(grafanaCfg.Env == setting.Dev),
 		grafanaCfg.PluginsPath,
@@ -38,6 +40,7 @@ func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg) (*
 		grafanaCfg.PluginLogBackendRequests,
 		grafanaCfg.PluginsCDNURLTemplate,
 		tracingCfg,
+		featuremgmt.ProvideToggles(features),
 	), nil
 }
 
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index 0ae3e011d73..bc4ab99eb47 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -66,6 +66,8 @@ var WireSet = wire.NewSet(
 	wire.Bind(new(pluginsettings.Service), new(*pluginSettings.Service)),
 	filestore.ProvideService,
 	wire.Bind(new(plugins.FileStore), new(*filestore.Service)),
+	wire.Bind(new(plugins.SignatureCalculator), new(*signature.Signature)),
+	signature.ProvideService,
 )
 
 // WireExtensionSet provides a wire.ProviderSet of plugin providers that can be

From 13c5aadd5d452d835ac1b5a7f51cba461e03ae48 Mon Sep 17 00:00:00 2001
From: Gareth Dawson <gareth.dawson@grafana.com>
Date: Tue, 18 Apr 2023 15:52:37 +0100
Subject: [PATCH 222/729] Loki: Don't request stats with invalid query (#65287)

* fix: dont call endpoint if invalid query

* fix: use latest lezer-logql

* refactor: use null instead of undefined

* test: returns null when query is invalid

* update
---
 .../datasource/loki/components/LokiQueryEditor.tsx  |  2 +-
 .../monaco-query-field/MonacoQueryField.tsx         |  4 +---
 .../datasource/loki/components/stats.test.ts        | 13 +++++++++----
 .../app/plugins/datasource/loki/components/stats.ts | 11 ++++++++---
 public/app/plugins/datasource/loki/datasource.ts    |  7 ++++++-
 .../components/LokiQueryBuilderOptions.tsx          |  2 +-
 .../querybuilder/components/LokiQueryCodeEditor.tsx |  2 +-
 .../querybuilder/shared/QueryOptionGroup.tsx        |  2 +-
 8 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
index e0abf6b80db..bf459cf6ab4 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
@@ -34,7 +34,7 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
   const [queryPatternsModalOpen, setQueryPatternsModalOpen] = useState(false);
   const [dataIsStale, setDataIsStale] = useState(false);
   const [labelBrowserVisible, setLabelBrowserVisible] = useState(false);
-  const [queryStats, setQueryStats] = useState<QueryStats>();
+  const [queryStats, setQueryStats] = useState<QueryStats | null>(null);
   const { flag: explain, setFlag: setExplain } = useFlag(lokiQueryEditorExplainKey);
 
   const timerange = datasource.getTimeRange();
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
index 0cae11d26e3..caf85fde0c5 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
@@ -9,8 +9,6 @@ import { selectors } from '@grafana/e2e-selectors';
 import { languageConfiguration, monarchlanguage } from '@grafana/monaco-logql';
 import { useTheme2, ReactMonacoEditor, Monaco, monacoTypes, MonacoEditor } from '@grafana/ui';
 
-import { isValidQuery } from '../../queryUtils';
-
 import { Props } from './MonacoQueryFieldProps';
 import { getOverrideServices } from './getOverrideServices';
 import { getCompletionProvider, getSuggestOptions } from './monaco-completion-provider';
@@ -153,7 +151,7 @@ const MonacoQueryField = ({
   };
 
   const onTypeDebounced = debounce(async (query: string) => {
-    if (!onQueryType || (isValidQuery(query) === false && query !== '')) {
+    if (!onQueryType) {
       return;
     }
 
diff --git a/public/app/plugins/datasource/loki/components/stats.test.ts b/public/app/plugins/datasource/loki/components/stats.test.ts
index 86849ac0e34..149175f40a8 100644
--- a/public/app/plugins/datasource/loki/components/stats.test.ts
+++ b/public/app/plugins/datasource/loki/components/stats.test.ts
@@ -54,15 +54,20 @@ describe('shouldUpdateStats', () => {
 describe('makeStatsRequest', () => {
   const datasource = createLokiDatasource();
 
-  it('should return undefined if there is no query', () => {
+  it('should return null if there is no query', () => {
     const query = '';
-    expect(getStats(datasource, query)).resolves.toBe(undefined); // change
+    expect(getStats(datasource, query)).resolves.toBe(null);
   });
 
-  it('should return undefined if the response has no data', () => {
+  it('should return null if the query is invalid', () => {
+    const query = '{job="grafana",';
+    expect(getStats(datasource, query)).resolves.toBe(null);
+  });
+
+  it('should return null if the response has no data', () => {
     const query = '{job="grafana"}';
     datasource.getQueryStats = jest.fn().mockResolvedValue({ streams: 0, chunks: 0, bytes: 0, entries: 0 });
-    expect(getStats(datasource, query)).resolves.toBe(undefined);
+    expect(getStats(datasource, query)).resolves.toBe(null);
   });
 
   it('should return the stats if the response has data', () => {
diff --git a/public/app/plugins/datasource/loki/components/stats.ts b/public/app/plugins/datasource/loki/components/stats.ts
index d68314cd21d..0eaca03c350 100644
--- a/public/app/plugins/datasource/loki/components/stats.ts
+++ b/public/app/plugins/datasource/loki/components/stats.ts
@@ -3,13 +3,18 @@ import { DateTime, isDateTime, TimeRange } from '@grafana/data';
 import { LokiDatasource } from '../datasource';
 import { QueryStats } from '../types';
 
-export async function getStats(datasource: LokiDatasource, query: string): Promise<QueryStats | undefined> {
+export async function getStats(datasource: LokiDatasource, query: string): Promise<QueryStats | null> {
   if (!query) {
-    return undefined;
+    return null;
   }
 
   const response = await datasource.getQueryStats(query);
-  return Object.values(response).every((v) => v === 0) ? undefined : response;
+
+  if (!response) {
+    return null;
+  }
+
+  return Object.values(response).every((v) => v === 0) ? null : response;
 }
 
 /**
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index e65b09fc2af..f615db3e723 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -419,7 +419,12 @@ export class LokiDatasource
     return res.data ?? (res || []);
   }
 
-  async getQueryStats(query: string): Promise<QueryStats> {
+  async getQueryStats(query: string): Promise<QueryStats | undefined> {
+    // if query is invalid, clear stats, and don't request
+    if (!isValidQuery(query)) {
+      return undefined;
+    }
+
     const { start, end } = this.getTimeRangeParams();
     const labelMatchers = getStreamSelectorsFromQuery(query);
 
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
index 12ee13f284c..83874e9d541 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
@@ -18,7 +18,7 @@ export interface Props {
   maxLines: number;
   app?: CoreApp;
   datasource: LokiDatasource;
-  queryStats: QueryStats | undefined;
+  queryStats: QueryStats | null;
 }
 
 export const LokiQueryBuilderOptions = React.memo<Props>(
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
index d4a7c3edb80..07d5ea9f412 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
@@ -14,7 +14,7 @@ import { LokiQueryBuilderExplained } from './LokiQueryBuilderExplained';
 
 type Props = LokiQueryEditorProps & {
   showExplain: boolean;
-  setQueryStats: React.Dispatch<React.SetStateAction<QueryStats | undefined>>;
+  setQueryStats: React.Dispatch<React.SetStateAction<QueryStats | null>>;
 };
 
 export function LokiQueryCodeEditor({
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup.tsx
index 9e093588bf0..fe6fd638ec4 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup.tsx
@@ -10,7 +10,7 @@ import { QueryStats } from 'app/plugins/datasource/loki/types';
 export interface Props {
   title: string;
   collapsedInfo: string[];
-  queryStats?: QueryStats;
+  queryStats?: QueryStats | null;
   children: React.ReactNode;
 }
 

From c0799345dd777049effb696cde423c84501942de Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 18 Apr 2023 16:29:25 +0100
Subject: [PATCH 223/729] Chore: fix unit tests on main (#66780)

adds help node to test data as it should always be there
---
 public/app/core/components/AppChrome/AppChrome.test.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/app/core/components/AppChrome/AppChrome.test.tsx b/public/app/core/components/AppChrome/AppChrome.test.tsx
index 6ffcb0c0b88..7c2074ef6e8 100644
--- a/public/app/core/components/AppChrome/AppChrome.test.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.test.tsx
@@ -55,6 +55,10 @@ const setup = (children: ReactNode) => {
         { text: 'Child2', id: 'child2', url: 'section/child2' },
       ],
     },
+    {
+      text: 'Help',
+      id: 'help',
+    },
   ];
 
   const context = getGrafanaContextMock();

From adf12d0e90f44cad2ad5d145d10e92f7c6b4620e Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Tue, 18 Apr 2023 16:45:59 +0100
Subject: [PATCH 224/729] CloudMonitor: Correctly re-render
 `VisualMetricQueryEditor` on `TimeRange` updates (#66756)

Compare string value rather than object
---
 .../cloud-monitoring/components/VisualMetricQueryEditor.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
index be1fe2a1b03..5e9976b3526 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
@@ -48,7 +48,11 @@ export function Editor({
   const [timeRange, setTimeRange] = useState<TimeRange>({ ...datasource.timeSrv.timeRange() });
 
   const useTime = (time: TimeRange) => {
-    if (timeRange !== null && (timeRange.raw.from !== time.raw.from || timeRange.raw.to !== time.raw.to)) {
+    if (
+      timeRange !== null &&
+      (timeRange.raw.from.toString() !== time.raw.from.toString() ||
+        timeRange.raw.to.toString() !== time.raw.to.toString())
+    ) {
       setTimeRange({ ...time });
     }
   };

From 743fdc159b48e4c4708b487413a5a2bbdf7f1a8f Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Tue, 18 Apr 2023 17:56:14 +0100
Subject: [PATCH 225/729] Traces: Trace view header tweaks (#66049)

* Update header info

* Modify content

* Update test

* Update test

* Add back url and remove tooltip

* Update css
---
 .../Actions/TracePageActions.tsx              |  4 +-
 .../TracePageHeader/NewTracePageHeader.tsx    | 67 ++++++++++---------
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
index 7475fec0f99..4a967e1ff83 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
@@ -40,12 +40,12 @@ export default function TracePageActions(props: TracePageActionsProps) {
         label={copyTraceIdClicked ? 'Copied!' : 'Trace ID'}
         icon={'copy'}
       />
-      <ActionButton
+      {/* <ActionButton
         onClick={() => alert('not implemented')}
         ariaLabel={'Export Trace'}
         label={'Export'}
         icon={'save'}
-      />
+      /> */}
     </div>
   );
 }
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
index 12d704e105a..835ff170d6b 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
@@ -77,18 +77,14 @@ export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
     return null;
   }
 
-  const { method, status, url } = getHeaderTags(trace.spans);
-
   const title = (
     <h1 className={cx(styles.title)}>
       <TraceName traceName={getTraceName(trace.spans)} />
-      <small>
-        <span className={styles.divider}>|</span>
-        {formatDuration(trace.duration)}
-      </small>
+      <small className={styles.duration}>{formatDuration(trace.duration)}</small>
     </h1>
   );
 
+  const { method, status, url } = getHeaderTags(trace.spans);
   let statusColor: BadgeColor = 'green';
   if (status && status.length > 0) {
     if (status[0].value.toString().charAt(0) === '4') {
@@ -107,27 +103,28 @@ export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
       </div>
 
       <div className={styles.subtitle}>
-        {timestamp(trace, timeZone, styles)}
-        {method || status || url ? <span className={styles.divider}>|</span> : undefined}
-        {method && method.length > 0 && (
-          <Tooltip content={'http.method'} interactive={true}>
-            <span className={styles.tag}>
-              <Badge text={method[0].value} color="blue" />
-            </span>
-          </Tooltip>
-        )}
-        {status && status.length > 0 && (
-          <Tooltip content={'http.status_code'} interactive={true}>
-            <span className={styles.tag}>
-              <Badge text={status[0].value} color={statusColor} />
-            </span>
-          </Tooltip>
-        )}
-        {url && url.length > 0 && (
-          <Tooltip content={'http.url or http.target or http.path'} interactive={true}>
-            <span className={styles.url}>{url[0].value}</span>
-          </Tooltip>
-        )}
+        <span className={styles.timestamp}>{timestamp(trace, timeZone, styles)}</span>
+        <span className={styles.tagMeta}>
+          {method && method.length > 0 && (
+            <Tooltip content={'http.method'} interactive={true}>
+              <span className={styles.tag}>
+                <Badge text={method[0].value} color="blue" />
+              </span>
+            </Tooltip>
+          )}
+          {status && status.length > 0 && (
+            <Tooltip content={'http.status_code'} interactive={true}>
+              <span className={styles.tag}>
+                <Badge text={status[0].value} color={statusColor} />
+              </span>
+            </Tooltip>
+          )}
+          {url && url.length > 0 && (
+            <Tooltip content={'http.url or http.target or http.path'} interactive={true}>
+              <span className={styles.url}>{url[0].value}</span>
+            </Tooltip>
+          )}
+        </span>
       </div>
 
       <SpanFilters
@@ -171,11 +168,22 @@ const getNewStyles = (theme: GrafanaTheme2) => {
     subtitle: css`
       flex: 1;
       line-height: 1em;
-      margin: -0.5em 8px 0.75em 8px;
+      margin: -0.5em 0.5em 0.75em 0.5em;
     `,
     tag: css`
       margin: 0 0.5em 0 0;
     `,
+    duration: css`
+      color: #aaa;
+      margin: 0 0.75em;
+    `,
+    timestamp: css`
+      vertical-align: middle;
+    `,
+    tagMeta: css`
+      margin: 0 0.75em;
+      vertical-align: text-top;
+    `,
     url: css`
       margin: -2.5px 0.3em;
       overflow: hidden;
@@ -184,8 +192,5 @@ const getNewStyles = (theme: GrafanaTheme2) => {
       max-width: 30%;
       display: inline-block;
     `,
-    divider: css`
-      margin: 0 0.75em;
-    `,
   };
 };

From 255d8f3326be2a9ae80c2565785062eb2a28d590 Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Tue, 18 Apr 2023 12:11:23 -0500
Subject: [PATCH 226/729] Plugins: Remove secure socks proxy feature toggle
 (#66611)

---
 .../configure-grafana/feature-toggles/index.md   |  1 -
 packages/grafana-data/src/types/config.ts        |  1 +
 .../grafana-data/src/types/featureToggles.gen.ts |  1 -
 packages/grafana-runtime/src/config.ts           |  1 +
 .../DataSourceHttpSettings.tsx                   |  3 +++
 .../src/components/DataSourceSettings/types.ts   |  2 ++
 pkg/api/dtos/frontend_settings.go                |  1 +
 pkg/api/frontendsettings.go                      |  1 +
 .../httpclientprovider/http_client_provider.go   |  4 +---
 pkg/services/featuremgmt/registry.go             |  6 ------
 pkg/services/featuremgmt/toggles_gen.csv         |  1 -
 pkg/services/featuremgmt/toggles_gen.go          |  4 ----
 pkg/tsdb/cloudwatch/cloudwatch.go                |  2 +-
 pkg/tsdb/mssql/mssql.go                          |  3 +--
 pkg/tsdb/mysql/mysql.go                          |  3 +--
 pkg/tsdb/postgres/postgres.go                    |  3 +--
 .../app/angular/partials/http_settings_next.html |  1 +
 .../datasource/alertmanager/ConfigEditor.tsx     |  1 +
 .../azuremonitor/components/ConfigEditor.tsx     |  2 +-
 .../components/ConfigEditor/ConfigEditor.tsx     |  2 +-
 .../cloudwatch/components/ConfigEditor.tsx       |  2 +-
 .../elasticsearch/configuration/ConfigEditor.tsx |  7 ++-----
 .../graphite/configuration/ConfigEditor.tsx      | 13 ++-----------
 .../influxdb/components/ConfigEditor.tsx         | 16 ++--------------
 .../jaeger/components/ConfigEditor.tsx           |  7 ++-----
 .../loki/configuration/ConfigEditor.tsx          |  7 ++-----
 .../mssql/configuration/ConfigurationEditor.tsx  |  2 +-
 .../mysql/configuration/ConfigurationEditor.tsx  |  2 +-
 .../opentsdb/components/ConfigEditor.tsx         |  6 ++----
 .../plugins/datasource/parca/ConfigEditor.tsx    |  6 ++----
 .../plugins/datasource/phlare/ConfigEditor.tsx   | 12 ++----------
 .../configuration/ConfigurationEditor.tsx        |  2 +-
 .../prometheus/configuration/ConfigEditor.tsx    |  7 ++-----
 .../tempo/configuration/ConfigEditor.tsx         |  7 ++-----
 .../plugins/datasource/zipkin/ConfigEditor.tsx   |  7 ++-----
 35 files changed, 44 insertions(+), 102 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 00a7f0fef6c..b0cb06aab05 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -84,7 +84,6 @@ Alpha features might be changed or removed without prior notice.
 | `mysqlAnsiQuotes`                  | Use double quotes to escape keyword in a MySQL query                                                                                                                                                |
 | `showTraceId`                      | Show trace ids for requests                                                                                                                                                                         |
 | `datasourceOnboarding`             | Enable data source onboarding page                                                                                                                                                                  |
-| `secureSocksDatasourceProxy`       | Enable secure socks tunneling for supported core datasources                                                                                                                                        |
 | `authnService`                     | Use new auth service to perform authentication                                                                                                                                                      |
 | `alertingBacktesting`              | Rule backtesting API for alerting                                                                                                                                                                   |
 | `editPanelCSVDragAndDrop`          | Enables drag and drop for CSV and Excel files                                                                                                                                                       |
diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index 07c8186f92d..c73fe2f00cf 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -216,6 +216,7 @@ export interface GrafanaConfig {
   feedbackLinksEnabled: boolean;
   secretsManagerPluginEnabled: boolean;
   supportBundlesEnabled: boolean;
+  secureSocksDSProxyEnabled: boolean;
   googleAnalyticsId: string | undefined;
   googleAnalytics4Id: string | undefined;
   googleAnalytics4SendManualPageViews: boolean;
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 605a663df8f..e31c4cca901 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -64,7 +64,6 @@ export interface FeatureToggles {
   showTraceId?: boolean;
   datasourceOnboarding?: boolean;
   emptyDashboardPage?: boolean;
-  secureSocksDatasourceProxy?: boolean;
   authnService?: boolean;
   disablePrometheusExemplarSampling?: boolean;
   alertingBacktesting?: boolean;
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index 64b0450317d..1c184974d8a 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -67,6 +67,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
   jwtUrlLogin = false;
   sigV4AuthEnabled = false;
   azureAuthEnabled = false;
+  secureSocksDSProxyEnabled = false;
   samlEnabled = false;
   samlName = '';
   autoAssignOrg = true;
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
index 184b523972f..d971c03a813 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
@@ -17,6 +17,7 @@ import { TagsInput } from '../TagsInput/TagsInput';
 import { BasicAuthSettings } from './BasicAuthSettings';
 import { CustomHeadersSettings } from './CustomHeadersSettings';
 import { HttpProxySettings } from './HttpProxySettings';
+import { SecureSocksProxySettings } from './SecureSocksProxySettings';
 import { TLSAuthSettings } from './TLSAuthSettings';
 import { HttpSettingsProps } from './types';
 
@@ -71,6 +72,7 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
     showForwardOAuthIdentityOption,
     azureAuthSettings,
     renderSigV4Editor,
+    secureSocksDSProxyEnabled,
   } = props;
   let urlTooltip;
   const [isAccessHelpVisible, setIsAccessHelpVisible] = useState(false);
@@ -308,6 +310,7 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
           <CustomHeadersSettings dataSourceConfig={dataSourceConfig} onChange={onChange} />
         )}
       </>
+      {secureSocksDSProxyEnabled && <SecureSocksProxySettings options={dataSourceConfig} onOptionsChange={onChange} />}
     </div>
   );
 };
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/types.ts b/packages/grafana-ui/src/components/DataSourceSettings/types.ts
index a18c17694f9..2608fb6cefa 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/types.ts
+++ b/packages/grafana-ui/src/components/DataSourceSettings/types.ts
@@ -39,4 +39,6 @@ export interface HttpSettingsProps extends HttpSettingsBaseProps {
   azureAuthSettings?: AzureAuthSettings;
   /** If SIGV4 is enabled, provide an editor for SIGV4 connection config  **/
   renderSigV4Editor?: React.ReactNode;
+  /** Show the Secure Socks Datasource Proxy toggle option */
+  secureSocksDSProxyEnabled?: boolean;
 }
diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go
index 60bfd8966d0..73ecd137331 100644
--- a/pkg/api/dtos/frontend_settings.go
+++ b/pkg/api/dtos/frontend_settings.go
@@ -187,6 +187,7 @@ type FrontendSettingsDTO struct {
 	AwsAssumeRoleEnabled             bool                           `json:"awsAssumeRoleEnabled"`
 	SupportBundlesEnabled            bool                           `json:"supportBundlesEnabled"`
 	SnapshotEnabled                  bool                           `json:"snapshotEnabled"`
+	SecureSocksDSProxyEnabled        bool                           `json:"secureSocksDSProxyEnabled"`
 
 	Azure FrontendSettingsAzureDTO `json:"azure"`
 
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 09211a0e4a6..91f9830de86 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -138,6 +138,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		EditorsCanAdmin:                     hs.Cfg.EditorsCanAdmin,
 		DisableSanitizeHtml:                 hs.Cfg.DisableSanitizeHtml,
 		DateFormats:                         hs.Cfg.DateFormats,
+		SecureSocksDSProxyEnabled:           hs.Cfg.SecureSocksDSProxy.Enabled,
 
 		Auth: dtos.FrontendSettingsAuthDTO{
 			OAuthSkipOrgRoleUpdateSync:  hs.Cfg.OAuthSkipOrgRoleUpdateSync,
diff --git a/pkg/infra/httpclient/httpclientprovider/http_client_provider.go b/pkg/infra/httpclient/httpclientprovider/http_client_provider.go
index 991247bf7bd..925122d94cf 100644
--- a/pkg/infra/httpclient/httpclientprovider/http_client_provider.go
+++ b/pkg/infra/httpclient/httpclientprovider/http_client_provider.go
@@ -11,7 +11,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/metrics/metricutil"
 	"github.com/grafana/grafana/pkg/infra/proxy"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/validations"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -55,8 +54,7 @@ func New(cfg *setting.Cfg, validator validations.PluginRequestValidator, tracer
 				return
 			}
 
-			if cfg.IsFeatureToggleEnabled(featuremgmt.FlagSecureSocksDatasourceProxy) &&
-				cfg.SecureSocksDSProxy.Enabled && proxy.SecureSocksProxyEnabledOnDS(opts) {
+			if cfg.SecureSocksDSProxy.Enabled && proxy.SecureSocksProxyEnabledOnDS(opts) {
 				err = proxy.NewSecureSocksHTTPProxy(&cfg.SecureSocksDSProxy, transport)
 				if err != nil {
 					logger.Error("Failed to enable secure socks proxy", "error", err.Error(), "datasource", datasourceName)
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 1b135bfb272..ebbf9866eaf 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -310,12 +310,6 @@ var (
 			Expression:   "true", // enabled by default
 			Owner:        grafanaDashboardsSquad,
 		},
-		{
-			Name:        "secureSocksDatasourceProxy",
-			Description: "Enable secure socks tunneling for supported core datasources",
-			State:       FeatureStateAlpha,
-			Owner:       hostedGrafanaTeam,
-		},
 		{
 			Name:        "authnService",
 			Description: "Use new auth service to perform authentication",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index e0b657a6b6e..6ff2620cad0 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -45,7 +45,6 @@ accessTokenExpirationCheck,stable,@grafana/grafana-authnz-team,false,false,false
 showTraceId,alpha,@grafana/observability-logs,false,false,false,false
 datasourceOnboarding,alpha,@grafana/dashboards-squad,false,false,false,false
 emptyDashboardPage,stable,@grafana/dashboards-squad,false,false,false,true
-secureSocksDatasourceProxy,alpha,@grafana/hosted-grafana-team,false,false,false,false
 authnService,alpha,@grafana/grafana-authnz-team,false,false,false,false
 disablePrometheusExemplarSampling,stable,@grafana/observability-metrics,false,false,false,false
 alertingBacktesting,alpha,@grafana/alerting-squad,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index b22411130ad..f5bcadbce47 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -191,10 +191,6 @@ const (
 	// Enable the redesigned user interface of a dashboard page that includes no panels
 	FlagEmptyDashboardPage = "emptyDashboardPage"
 
-	// FlagSecureSocksDatasourceProxy
-	// Enable secure socks tunneling for supported core datasources
-	FlagSecureSocksDatasourceProxy = "secureSocksDatasourceProxy"
-
 	// FlagAuthnService
 	// Use new auth service to perform authentication
 	FlagAuthnService = "authnService"
diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 5bd58a48aaf..4a59945d35a 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -274,7 +274,7 @@ func (e *cloudWatchExecutor) newSession(pluginCtx backend.PluginContext, region
 	}
 
 	// work around until https://github.com/grafana/grafana/issues/39089 is implemented
-	if e.cfg.SecureSocksDSProxy.Enabled && e.features.IsEnabled(featuremgmt.FlagSecureSocksDatasourceProxy) && instance.Settings.SecureSocksProxyEnabled {
+	if e.cfg.SecureSocksDSProxy.Enabled && instance.Settings.SecureSocksProxyEnabled {
 		// only update the transport to try to avoid the issue mentioned here https://github.com/grafana/grafana/issues/46365
 		sess.Config.HTTPClient.Transport = instance.HTTPClient.Transport
 	}
diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go
index 616bb37da56..8586c2d8642 100644
--- a/pkg/tsdb/mssql/mssql.go
+++ b/pkg/tsdb/mssql/mssql.go
@@ -18,7 +18,6 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 	"github.com/grafana/grafana/pkg/util"
@@ -95,7 +94,7 @@ func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
 
 		driverName := "mssql"
 		// register a new proxy driver if the secure socks proxy is enabled
-		if cfg.IsFeatureToggleEnabled(featuremgmt.FlagSecureSocksDatasourceProxy) && cfg.SecureSocksDSProxy.Enabled && jsonData.SecureDSProxy {
+		if cfg.SecureSocksDSProxy.Enabled && jsonData.SecureDSProxy {
 			driverName, err = createMSSQLProxyDriver(&cfg.SecureSocksDSProxy, cnnstr)
 			if err != nil {
 				return nil, err
diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go
index eca156dd57b..7915be9ed98 100644
--- a/pkg/tsdb/mysql/mysql.go
+++ b/pkg/tsdb/mysql/mysql.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 )
@@ -85,7 +84,7 @@ func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provide
 		}
 
 		// register the secure socks proxy dialer context, if enabled
-		if cfg.IsFeatureToggleEnabled(featuremgmt.FlagSecureSocksDatasourceProxy) && cfg.SecureSocksDSProxy.Enabled && jsonData.SecureDSProxy {
+		if cfg.SecureSocksDSProxy.Enabled && jsonData.SecureDSProxy {
 			// UID is only unique per org, the only way to ensure uniqueness is to do it by connection information
 			uniqueIdentifier := dsInfo.User + dsInfo.DecryptedSecureJSONData["password"] + dsInfo.URL + dsInfo.Database
 			protocol, err = registerProxyDialerContext(&cfg.SecureSocksDSProxy, protocol, uniqueIdentifier)
diff --git a/pkg/tsdb/postgres/postgres.go b/pkg/tsdb/postgres/postgres.go
index f3684591ff2..d6ac1206ef0 100644
--- a/pkg/tsdb/postgres/postgres.go
+++ b/pkg/tsdb/postgres/postgres.go
@@ -15,7 +15,6 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 )
@@ -96,7 +95,7 @@ func (s *Service) newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFacto
 
 		driverName := "postgres"
 		// register a proxy driver if the secure socks proxy is enabled
-		if cfg.IsFeatureToggleEnabled(featuremgmt.FlagSecureSocksDatasourceProxy) && cfg.SecureSocksDSProxy.Enabled && jsonData.SecureDSProxy {
+		if cfg.SecureSocksDSProxy.Enabled && jsonData.SecureDSProxy {
 			driverName, err = createPostgresProxyDriver(&cfg.SecureSocksDSProxy, cnnstr)
 			if err != nil {
 				return "", nil
diff --git a/public/app/angular/partials/http_settings_next.html b/public/app/angular/partials/http_settings_next.html
index 9221136155f..3889b157b5f 100644
--- a/public/app/angular/partials/http_settings_next.html
+++ b/public/app/angular/partials/http_settings_next.html
@@ -4,4 +4,5 @@
   showAccessOptions="showAccessOption"
   defaultUrl="suggestUrl"
   showForwardOAuthIdentityOption="showForwardOAuthIdentityOption"
+  secureSocksDSProxyEnabled="secureSocksDSProxyEnabled"
 />
diff --git a/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx b/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx
index 0b87622968d..7822a960e46 100644
--- a/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx
@@ -81,6 +81,7 @@ export const ConfigEditor = (props: Props) => {
         onChange={onOptionsChange}
         sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
         renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
+        secureSocksDSProxyEnabled={false} // the proxy is not implemented to work with the alertmanager
       />
     </>
   );
diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor.tsx
index 44d647fde49..986b39e76ed 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor.tsx
@@ -97,7 +97,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
             {error.details && <details style={{ whiteSpace: 'pre-wrap' }}>{error.details}</details>}
           </Alert>
         )}
-        {config.featureToggles.secureSocksDatasourceProxy && (
+        {config.secureSocksDSProxyEnabled && (
           <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
         )}
       </>
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
index f9502bf1ddb..98ad27a2149 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
@@ -27,7 +27,7 @@ export class ConfigEditor extends PureComponent<Props> {
     return (
       <>
         <ConnectionConfig {...this.props} onOptionsChange={this.handleOnOptionsChange}></ConnectionConfig>
-        {config.featureToggles.secureSocksDatasourceProxy && (
+        {config.secureSocksDSProxyEnabled && (
           <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
         )}
       </>
diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
index 17229ff62b4..70dc5dc1104 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
@@ -67,7 +67,7 @@ export const ConfigEditor = (props: Props) => {
         </InlineField>
       </ConnectionConfig>
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
+      {config.secureSocksDSProxyEnabled && (
         <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
       )}
 
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
index ecb7b41a165..08132c38abc 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useRef } from 'react';
 
 import { SIGV4ConnectionConfig } from '@grafana/aws-sdk';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { Alert, DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui';
+import { Alert, DataSourceHttpSettings } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 import { ElasticsearchOptions } from '../types';
@@ -47,12 +47,9 @@ export const ConfigEditor = (props: Props) => {
         onChange={onOptionsChange}
         sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
         renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
-
       <ElasticDetails value={options} onChange={onOptionsChange} />
 
       <LogsConfig
diff --git a/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx
index acdd562496f..aef4ad9a923 100644
--- a/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx
@@ -6,14 +6,7 @@ import {
   onUpdateDatasourceJsonDataOptionSelect,
   onUpdateDatasourceJsonDataOptionChecked,
 } from '@grafana/data';
-import {
-  Alert,
-  DataSourceHttpSettings,
-  InlineFormLabel,
-  LegacyForms,
-  Select,
-  SecureSocksProxySettings,
-} from '@grafana/ui';
+import { Alert, DataSourceHttpSettings, InlineFormLabel, LegacyForms, Select } from '@grafana/ui';
 import { config } from 'app/core/config';
 import store from 'app/core/store';
 
@@ -82,10 +75,8 @@ export class ConfigEditor extends PureComponent<Props, State> {
           defaultUrl="http://localhost:8080"
           dataSourceConfig={options}
           onChange={onOptionsChange}
+          secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
         />
-        {config.featureToggles.secureSocksDatasourceProxy && (
-          <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-        )}
         <h3 className="page-heading">Graphite details</h3>
         <div className="gf-form-group">
           <div className="gf-form-inline">
diff --git a/public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx b/public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx
index 787ace327bc..baafeae4f8c 100644
--- a/public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx
@@ -11,16 +11,7 @@ import {
   updateDatasourcePluginJsonDataOption,
   updateDatasourcePluginResetOption,
 } from '@grafana/data';
-import {
-  Alert,
-  DataSourceHttpSettings,
-  InfoBox,
-  InlineField,
-  InlineFormLabel,
-  LegacyForms,
-  SecureSocksProxySettings,
-  Select,
-} from '@grafana/ui';
+import { Alert, DataSourceHttpSettings, InfoBox, InlineField, InlineFormLabel, LegacyForms, Select } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 import { BROWSER_MODE_DISABLED_MESSAGE } from '../constants';
@@ -334,12 +325,9 @@ export class ConfigEditor extends PureComponent<Props, State> {
           dataSourceConfig={options}
           defaultUrl="http://localhost:8086"
           onChange={onOptionsChange}
+          secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
         />
 
-        {config.featureToggles.secureSocksDatasourceProxy && (
-          <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-        )}
-
         <div className="gf-form-group">
           <div>
             <h3 className="page-heading">InfluxDB Details</h3>
diff --git a/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx b/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx
index aa2df3773ed..62296f503e2 100644
--- a/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui';
+import { DataSourceHttpSettings } from '@grafana/ui';
 import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings';
 import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
@@ -18,12 +18,9 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         dataSourceConfig={options}
         showAccessOptions={false}
         onChange={onOptionsChange}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
-
       <div className="gf-form-group">
         <TraceToLogsSettings options={options} onOptionsChange={onOptionsChange} />
       </div>
diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
index f5a3dee4ccb..b518ffc06ee 100644
--- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps, DataSourceSettings } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { AlertingSettings, DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui';
+import { AlertingSettings, DataSourceHttpSettings } from '@grafana/ui';
 
 import { LokiOptions } from '../types';
 
@@ -36,12 +36,9 @@ export const ConfigEditor = (props: Props) => {
         dataSourceConfig={options}
         showAccessOptions={false}
         onChange={onOptionsChange}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
-
       <AlertingSettings<LokiOptions> options={options} onOptionsChange={onOptionsChange} />
 
       <MaxLinesField
diff --git a/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
index 635d3f9fbfe..c3d26c6feaf 100644
--- a/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
@@ -156,7 +156,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<Ms
         )}
       </FieldSet>
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
+      {config.secureSocksDSProxyEnabled && (
         <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
       )}
 
diff --git a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
index 3d8c434b3ec..2c351fd51ac 100644
--- a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
@@ -152,7 +152,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
         </InlineField>
       </FieldSet>
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
+      {config.secureSocksDSProxyEnabled && (
         <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
       )}
       {jsonData.tlsAuth || jsonData.tlsAuthWithCACert ? (
diff --git a/public/app/plugins/datasource/opentsdb/components/ConfigEditor.tsx b/public/app/plugins/datasource/opentsdb/components/ConfigEditor.tsx
index 061a37acbf9..aa0feefac35 100644
--- a/public/app/plugins/datasource/opentsdb/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/ConfigEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui';
+import { DataSourceHttpSettings } from '@grafana/ui';
 
 import { OpenTsdbOptions } from '../types';
 
@@ -17,10 +17,8 @@ export const ConfigEditor = (props: DataSourcePluginOptionsEditorProps<OpenTsdbO
         defaultUrl="http://localhost:4242"
         dataSourceConfig={options}
         onChange={onOptionsChange}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
       <OpenTsdbDetails value={options} onChange={onOptionsChange} />
     </>
   );
diff --git a/public/app/plugins/datasource/parca/ConfigEditor.tsx b/public/app/plugins/datasource/parca/ConfigEditor.tsx
index 7937c46fcc4..0c3f1e9df8a 100644
--- a/public/app/plugins/datasource/parca/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/parca/ConfigEditor.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui';
+import { DataSourceHttpSettings } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 import { ParcaDataSourceOptions } from './types';
@@ -18,10 +18,8 @@ export const ConfigEditor = (props: Props) => {
         dataSourceConfig={options}
         showAccessOptions={false}
         onChange={onOptionsChange}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
     </>
   );
 };
diff --git a/public/app/plugins/datasource/phlare/ConfigEditor.tsx b/public/app/plugins/datasource/phlare/ConfigEditor.tsx
index 4d8c1583b0f..05ac5f9cb13 100644
--- a/public/app/plugins/datasource/phlare/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/phlare/ConfigEditor.tsx
@@ -1,13 +1,7 @@
 import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import {
-  DataSourceHttpSettings,
-  EventsWithValidation,
-  LegacyForms,
-  regexValidation,
-  SecureSocksProxySettings,
-} from '@grafana/ui';
+import { DataSourceHttpSettings, EventsWithValidation, LegacyForms, regexValidation } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 import { PhlareDataSourceOptions } from './types';
@@ -24,11 +18,9 @@ export const ConfigEditor = (props: Props) => {
         dataSourceConfig={options}
         showAccessOptions={false}
         onChange={onOptionsChange}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
       <h3 className="page-heading">Querying</h3>
       <div className="gf-form-group">
         <div className="gf-form-inline">
diff --git a/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
index 458790664c7..fd29a5b5c73 100644
--- a/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
@@ -167,7 +167,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
         ) : null}
       </FieldSet>
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
+      {config.secureSocksDSProxyEnabled && (
         <FieldSet label="Secure Socks Proxy">
           <InlineField labelWidth={26} label="Enabled" tooltip="Connect to this datasource via the secure socks proxy.">
             <InlineSwitch
diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
index 65aa4a669a1..6470645ed3d 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
@@ -2,7 +2,7 @@ import React, { useRef } from 'react';
 
 import { SIGV4ConnectionConfig } from '@grafana/aws-sdk';
 import { DataSourcePluginOptionsEditorProps, DataSourceSettings } from '@grafana/data';
-import { AlertingSettings, DataSourceHttpSettings, Alert, SecureSocksProxySettings } from '@grafana/ui';
+import { AlertingSettings, DataSourceHttpSettings, Alert } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 import { PromOptions } from '../types';
@@ -41,12 +41,9 @@ export const ConfigEditor = (props: Props) => {
         sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
         azureAuthSettings={azureAuthSettings}
         renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
-
       <AlertingSettings<PromOptions> options={options} onOptionsChange={onOptionsChange} />
 
       <PromSettings options={options} onOptionsChange={onOptionsChange} />
diff --git a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
index ee127a012b7..0b61641efd2 100644
--- a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui';
+import { DataSourceHttpSettings } from '@grafana/ui';
 import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings';
 import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
@@ -24,12 +24,9 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         dataSourceConfig={options}
         showAccessOptions={false}
         onChange={onOptionsChange}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
-
       <div className="gf-form-group">
         <TraceToLogsSettings options={options} onOptionsChange={onOptionsChange} />
       </div>
diff --git a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
index 81c3dd193fc..672aedeaac8 100644
--- a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui';
+import { DataSourceHttpSettings } from '@grafana/ui';
 import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings';
 import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
@@ -18,12 +18,9 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         dataSourceConfig={options}
         showAccessOptions={false}
         onChange={onOptionsChange}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
       />
 
-      {config.featureToggles.secureSocksDatasourceProxy && (
-        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-      )}
-
       <div className="gf-form-group">
         <TraceToLogsSettings options={options} onOptionsChange={onOptionsChange} />
       </div>

From a21fdd9c810f28cc67e215a3b71b9ceb3fbc8024 Mon Sep 17 00:00:00 2001
From: Kevin Yu <kevinwcyu@users.noreply.github.com>
Date: Tue, 18 Apr 2023 11:56:00 -0700
Subject: [PATCH 227/729] CloudWatch: Use generated type from schema in backend
 (#66420)

* CloudWatch: Use generated type from schema in backend

* address comments

* don't explicity set default metric query type
---
 pkg/tsdb/cloudwatch/annotation_query.go       | 27 ++++--
 pkg/tsdb/cloudwatch/cloudwatch.go             | 16 +---
 pkg/tsdb/cloudwatch/log_actions.go            |  6 +-
 pkg/tsdb/cloudwatch/log_sync_query.go         |  9 +-
 .../cloudwatch/models/cloudwatch_query.go     | 87 ++++++++++---------
 .../models/cloudwatch_query_test.go           | 30 ++++---
 pkg/tsdb/cloudwatch/models/logs_query.go      | 36 +++-----
 pkg/tsdb/cloudwatch/time_series_query_test.go | 31 +++----
 .../datasource/cloudwatch/dataquery.cue       |  2 +-
 9 files changed, 126 insertions(+), 118 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/annotation_query.go b/pkg/tsdb/cloudwatch/annotation_query.go
index 5a439f5cbcd..30b33f0262a 100644
--- a/pkg/tsdb/cloudwatch/annotation_query.go
+++ b/pkg/tsdb/cloudwatch/annotation_query.go
@@ -28,15 +28,20 @@ func (e *cloudWatchExecutor) executeAnnotationQuery(pluginCtx backend.PluginCont
 	}
 
 	var period int64
-	if model.Period != "" {
-		p, err := strconv.ParseInt(model.Period, 10, 64)
+
+	if model.Period != nil && *model.Period != "" {
+		p, err := strconv.ParseInt(*model.Period, 10, 64)
 		if err != nil {
 			return nil, err
 		}
 		period = p
 	}
 
-	if period == 0 && !model.PrefixMatching {
+	prefixMatching := false
+	if model.PrefixMatching != nil {
+		prefixMatching = *model.PrefixMatching
+	}
+	if period == 0 && !prefixMatching {
 		period = 300
 	}
 
@@ -49,19 +54,23 @@ func (e *cloudWatchExecutor) executeAnnotationQuery(pluginCtx backend.PluginCont
 	}
 
 	var alarmNames []*string
-	if model.PrefixMatching {
+	metricName := ""
+	if model.MetricName != nil {
+		metricName = *model.MetricName
+	}
+	if prefixMatching {
 		params := &cloudwatch.DescribeAlarmsInput{
 			MaxRecords:      aws.Int64(100),
-			ActionPrefix:    aws.String(actionPrefix),
-			AlarmNamePrefix: aws.String(alarmNamePrefix),
+			ActionPrefix:    actionPrefix,
+			AlarmNamePrefix: alarmNamePrefix,
 		}
 		resp, err := cli.DescribeAlarms(params)
 		if err != nil {
 			return nil, fmt.Errorf("%v: %w", "failed to call cloudwatch:DescribeAlarms", err)
 		}
-		alarmNames = filterAlarms(resp, model.Namespace, model.MetricName, model.Dimensions, statistic, period)
+		alarmNames = filterAlarms(resp, model.Namespace, metricName, model.Dimensions, statistic, period)
 	} else {
-		if model.Region == "" || model.Namespace == "" || model.MetricName == "" || statistic == "" {
+		if model.Region == "" || model.Namespace == "" || metricName == "" || statistic == "" {
 			return result, errors.New("invalid annotations query")
 		}
 
@@ -80,7 +89,7 @@ func (e *cloudWatchExecutor) executeAnnotationQuery(pluginCtx backend.PluginCont
 		}
 		params := &cloudwatch.DescribeAlarmsForMetricInput{
 			Namespace:  aws.String(model.Namespace),
-			MetricName: aws.String(model.MetricName),
+			MetricName: aws.String(metricName),
 			Dimensions: qd,
 			Statistic:  aws.String(statistic),
 			Period:     aws.Int64(period),
diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 4a59945d35a..771698f3563 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -27,21 +27,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/query"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/clients"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
 type DataQueryJson struct {
-	QueryType       string `json:"type,omitempty"`
-	QueryMode       string
-	PrefixMatching  bool
-	Region          string
-	Namespace       string
-	MetricName      string
-	Dimensions      map[string]interface{}
-	Statistic       *string
-	Period          string
-	ActionPrefix    string
-	AlarmNamePrefix string
+	dataquery.CloudWatchAnnotationQuery
+	Type string `json:"type,omitempty"`
 }
 
 type DataSource struct {
@@ -179,7 +171,7 @@ func (e *cloudWatchExecutor) QueryData(ctx context.Context, req *backend.QueryDa
 	}
 
 	var result *backend.QueryDataResponse
-	switch model.QueryType {
+	switch model.Type {
 	case annotationQuery:
 		result, err = e.executeAnnotationQuery(req.PluginContext, model, q)
 	case logAction:
diff --git a/pkg/tsdb/cloudwatch/log_actions.go b/pkg/tsdb/cloudwatch/log_actions.go
index 306ea4d6cd8..3ced6a4a436 100644
--- a/pkg/tsdb/cloudwatch/log_actions.go
+++ b/pkg/tsdb/cloudwatch/log_actions.go
@@ -112,7 +112,7 @@ func (e *cloudWatchExecutor) executeLogAction(ctx context.Context, logger log.Lo
 	}
 
 	var data *data.Frame = nil
-	switch logsQuery.SubType {
+	switch logsQuery.Subtype {
 	case "StartQuery":
 		data, err = e.handleStartQuery(ctx, logger, logsClient, logsQuery, query.TimeRange, query.RefID)
 	case "StopQuery":
@@ -123,7 +123,7 @@ func (e *cloudWatchExecutor) executeLogAction(ctx context.Context, logger log.Lo
 		data, err = e.handleGetLogEvents(ctx, logsClient, logsQuery)
 	}
 	if err != nil {
-		return nil, fmt.Errorf("failed to execute log action with subtype: %s: %w", logsQuery.SubType, err)
+		return nil, fmt.Errorf("failed to execute log action with subtype: %s: %w", logsQuery.Subtype, err)
 	}
 
 	return data, nil
@@ -214,7 +214,7 @@ func (e *cloudWatchExecutor) executeStartQuery(ctx context.Context, logsClient c
 	if logsQuery.LogGroups != nil && len(logsQuery.LogGroups) > 0 {
 		var logGroupIdentifiers []string
 		for _, lg := range logsQuery.LogGroups {
-			arn := lg.ARN
+			arn := lg.Arn
 			// due to a bug in the startQuery api, we remove * from the arn, otherwise it throws an error
 			logGroupIdentifiers = append(logGroupIdentifiers, strings.TrimSuffix(arn, "*"))
 		}
diff --git a/pkg/tsdb/cloudwatch/log_sync_query.go b/pkg/tsdb/cloudwatch/log_sync_query.go
index e4a5684e6c0..ac01d654bef 100644
--- a/pkg/tsdb/cloudwatch/log_sync_query.go
+++ b/pkg/tsdb/cloudwatch/log_sync_query.go
@@ -10,6 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
@@ -29,7 +30,9 @@ var executeSyncLogQuery = func(ctx context.Context, e *cloudWatchExecutor, req *
 		}
 
 		logsQuery.Subtype = "StartQuery"
-		logsQuery.QueryString = logsQuery.Expression
+		if logsQuery.Expression != nil {
+			logsQuery.QueryString = *logsQuery.Expression
+		}
 
 		region := logsQuery.Region
 		if logsQuery.Region == "" || region == defaultRegion {
@@ -86,7 +89,9 @@ func (e *cloudWatchExecutor) syncQuery(ctx context.Context, logsClient cloudwatc
 	}
 
 	requestParams := models.LogsQuery{
-		Region:  logsQuery.Region,
+		CloudWatchLogsQuery: dataquery.CloudWatchLogsQuery{
+			Region: logsQuery.Region,
+		},
 		QueryId: *startQueryOutput.QueryId,
 	}
 
diff --git a/pkg/tsdb/cloudwatch/models/cloudwatch_query.go b/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
index b100bd18772..e88723e5cb4 100644
--- a/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
+++ b/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
@@ -17,22 +17,23 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 )
 
 type (
-	MetricEditorMode uint32
-	MetricQueryType  uint32
+	MetricEditorMode dataquery.MetricEditorMode
+	MetricQueryType  dataquery.MetricQueryType
 	GMDApiMode       uint32
 )
 
 const (
-	MetricEditorModeBuilder MetricEditorMode = iota
-	MetricEditorModeRaw
+	MetricEditorModeBuilder = dataquery.CloudWatchMetricsQueryMetricEditorModeN0
+	MetricEditorModeRaw     = dataquery.CloudWatchMetricsQueryMetricEditorModeN1
 )
 
 const (
-	MetricQueryTypeSearch MetricQueryType = iota
-	MetricQueryTypeQuery
+	MetricQueryTypeSearch = dataquery.CloudWatchMetricsQueryMetricQueryTypeN0
+	MetricQueryTypeQuery  = dataquery.CloudWatchMetricsQueryMetricQueryTypeN1
 )
 
 const (
@@ -67,8 +68,8 @@ type CloudWatchQuery struct {
 	MatchExact        bool
 	UsedExpression    string
 	TimezoneUTCOffset string
-	MetricQueryType   MetricQueryType
-	MetricEditorMode  MetricEditorMode
+	MetricQueryType   dataquery.CloudWatchMetricsQueryMetricQueryType
+	MetricEditorMode  dataquery.CloudWatchMetricsQueryMetricEditorMode
 	AccountId         *string
 }
 
@@ -213,25 +214,9 @@ const timeSeriesQuery = "timeSeriesQuery"
 var validMetricDataID = regexp.MustCompile(`^[a-z][a-zA-Z0-9_]*$`)
 
 type metricsDataQuery struct {
-	Dimensions        map[string]interface{} `json:"dimensions"`
-	Expression        string                 `json:"expression"`
-	Label             *string                `json:"label"`
-	Id                string                 `json:"id"`
-	MatchExact        *bool                  `json:"matchExact"`
-	MetricEditorMode  *MetricEditorMode      `json:"metricEditorMode"`
-	MetricName        string                 `json:"metricName"`
-	MetricQueryType   MetricQueryType        `json:"metricQueryType"`
-	Namespace         string                 `json:"namespace"`
-	Period            string                 `json:"period"`
-	Region            string                 `json:"region"`
-	SqlExpression     string                 `json:"sqlExpression"`
-	Statistic         *string                `json:"statistic"`
-	Statistics        []*string              `json:"statistics"`
-	TimezoneUTCOffset string                 `json:"timezoneUTCOffset"`
-	QueryType         string                 `json:"type"`
-	Hide              *bool                  `json:"hide"`
-	Alias             string                 `json:"alias"`
-	AccountId         *string                `json:"accountId"`
+	dataquery.CloudWatchMetricsQuery
+	Type              string `json:"type"`
+	TimezoneUTCOffset string `json:"timezoneUTCOffset"`
 }
 
 // ParseMetricDataQueries decodes the metric data queries json, validates, sets default values and returns an array of CloudWatchQueries.
@@ -246,7 +231,7 @@ func ParseMetricDataQueries(dataQueries []backend.DataQuery, startTime time.Time
 			return nil, &QueryError{Err: err, RefID: query.RefID}
 		}
 
-		queryType := metricsDataQuery.QueryType
+		queryType := metricsDataQuery.Type
 		if queryType != timeSeriesQuery && queryType != "" {
 			continue
 		}
@@ -255,19 +240,35 @@ func ParseMetricDataQueries(dataQueries []backend.DataQuery, startTime time.Time
 	}
 
 	result := make([]*CloudWatchQuery, 0, len(metricDataQueries))
+
 	for refId, mdq := range metricDataQueries {
 		cwQuery := &CloudWatchQuery{
 			logger:            logger,
-			Alias:             mdq.Alias,
 			RefId:             refId,
 			Id:                mdq.Id,
 			Region:            mdq.Region,
 			Namespace:         mdq.Namespace,
-			MetricName:        mdq.MetricName,
-			MetricQueryType:   mdq.MetricQueryType,
-			SqlExpression:     mdq.SqlExpression,
 			TimezoneUTCOffset: mdq.TimezoneUTCOffset,
-			Expression:        mdq.Expression,
+		}
+
+		if mdq.Alias != nil {
+			cwQuery.Alias = *mdq.Alias
+		}
+
+		if mdq.MetricName != nil {
+			cwQuery.MetricName = *mdq.MetricName
+		}
+
+		if mdq.MetricQueryType != nil {
+			cwQuery.MetricQueryType = *mdq.MetricQueryType
+		}
+
+		if mdq.SqlExpression != nil {
+			cwQuery.SqlExpression = *mdq.SqlExpression
+		}
+
+		if mdq.Expression != nil {
+			cwQuery.Expression = *mdq.Expression
 		}
 
 		if err := cwQuery.validateAndSetDefaults(refId, mdq, startTime, endTime, defaultRegion, crossAccountQueryingEnabled); err != nil {
@@ -337,14 +338,14 @@ func (q *CloudWatchQuery) validateAndSetDefaults(refId string, metricsDataQuery
 	if metricsDataQuery.Hide != nil {
 		q.ReturnData = !*metricsDataQuery.Hide
 	}
-	if metricsDataQuery.QueryType == "" {
+	if metricsDataQuery.Type == "" {
 		// If no type is provided we assume we are called by alerting service, which requires to return data!
 		// Note, this is sort of a hack, but the official Grafana interfaces do not carry the information
 		// who (which service) called the TsdbQueryEndpoint.Query(...) function.
 		q.ReturnData = true
 	}
 
-	if metricsDataQuery.MetricEditorMode == nil && len(metricsDataQuery.Expression) > 0 {
+	if metricsDataQuery.MetricEditorMode == nil && metricsDataQuery.Expression != nil && len(*metricsDataQuery.Expression) > 0 {
 		// this should only ever happen if this is an alerting query that has not yet been migrated in the frontend
 		q.MetricEditorMode = MetricEditorModeRaw
 	} else {
@@ -369,7 +370,7 @@ func (q *CloudWatchQuery) validateAndSetDefaults(refId string, metricsDataQuery
 func getStatistic(query metricsDataQuery) string {
 	// If there's not a statistic property in the json, we know it's the legacy format and then it has to be migrated
 	if query.Statistic == nil {
-		return *query.Statistics[0]
+		return query.Statistics[0]
 	}
 	return *query.Statistic
 }
@@ -389,14 +390,17 @@ func getLabel(query metricsDataQuery, dynamicLabelsEnabled bool) string {
 	if query.Label != nil {
 		return *query.Label
 	}
-	if query.Alias == "" {
+	if query.Alias != nil && *query.Alias == "" {
 		return ""
 	}
 
 	var result string
 	if dynamicLabelsEnabled {
-		fullAliasField := query.Alias
-		matches := legacyAliasRegexp.FindAllStringSubmatch(query.Alias, -1)
+		fullAliasField := ""
+		if query.Alias != nil {
+			fullAliasField = *query.Alias
+		}
+		matches := legacyAliasRegexp.FindAllStringSubmatch(fullAliasField, -1)
 
 		for _, groups := range matches {
 			fullMatch := groups[0]
@@ -428,7 +432,10 @@ func calculatePeriodBasedOnTimeRange(startTime, endTime time.Time) int {
 }
 
 func getPeriod(query metricsDataQuery, startTime, endTime time.Time) (int, error) {
-	periodString := query.Period
+	periodString := ""
+	if query.Period != nil {
+		periodString = *query.Period
+	}
 	var period int
 	var err error
 	if strings.ToLower(periodString) == "auto" || periodString == "" {
diff --git a/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go b/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
index da1ee6f8081..cc9b0f243e9 100644
--- a/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
+++ b/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
@@ -8,10 +8,12 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/kindsys"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log/logtest"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
@@ -294,7 +296,7 @@ func TestQueryJSON(t *testing.T) {
 	var res metricsDataQuery
 	err := json.Unmarshal(jsonString, &res)
 	require.NoError(t, err)
-	assert.Equal(t, "timeSeriesQuery", res.QueryType)
+	assert.Equal(t, "timeSeriesQuery", res.Type)
 }
 
 func TestRequestParser(t *testing.T) {
@@ -622,11 +624,11 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 }
 
 func Test_ParseMetricDataQueries_query_type_and_metric_editor_mode_and_GMD_query_api_mode(t *testing.T) {
-	const dummyTestEditorMode MetricEditorMode = 99
+	const dummyTestEditorMode dataquery.CloudWatchMetricsQueryMetricEditorMode = 99
 	testCases := map[string]struct {
 		extraDataQueryJson       string
-		expectedMetricQueryType  MetricQueryType
-		expectedMetricEditorMode MetricEditorMode
+		expectedMetricQueryType  dataquery.CloudWatchMetricsQueryMetricQueryType
+		expectedMetricEditorMode dataquery.CloudWatchMetricsQueryMetricEditorMode
 		expectedGMDApiMode       GMDApiMode
 	}{
 		"no metric query type, no metric editor mode, no expression": {
@@ -930,16 +932,18 @@ func Test_migrateAliasToDynamicLabel_single_query_preserves_old_alias_and_create
 			false := false
 
 			queryToMigrate := metricsDataQuery{
-				Region:     "us-east-1",
-				Namespace:  "ec2",
-				MetricName: "CPUUtilization",
-				Alias:      tc.inputAlias,
-				Dimensions: map[string]interface{}{
-					"InstanceId": []interface{}{"test"},
+				CloudWatchMetricsQuery: dataquery.CloudWatchMetricsQuery{
+					Region:     "us-east-1",
+					Namespace:  "ec2",
+					MetricName: kindsys.Ptr("CPUUtilization"),
+					Alias:      kindsys.Ptr(tc.inputAlias),
+					Dimensions: map[string]interface{}{
+						"InstanceId": []interface{}{"test"},
+					},
+					Statistic: &average,
+					Period:    kindsys.Ptr("600"),
+					Hide:      &false,
 				},
-				Statistic: &average,
-				Period:    "600",
-				Hide:      &false,
 			}
 
 			assert.Equal(t, tc.expectedLabel, getLabel(queryToMigrate, true))
diff --git a/pkg/tsdb/cloudwatch/models/logs_query.go b/pkg/tsdb/cloudwatch/models/logs_query.go
index 14406e9baeb..f9ea0c3e0ff 100644
--- a/pkg/tsdb/cloudwatch/models/logs_query.go
+++ b/pkg/tsdb/cloudwatch/models/logs_query.go
@@ -1,28 +1,18 @@
 package models
 
-type LogGroup struct {
-	ARN       string `json:"arn"`
-	Name      string `json:"name"`
-	AccountID string `json:"accountId"`
-}
+import (
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
+)
 
 type LogsQuery struct {
-	LogType            string `json:"type"`
-	SubType            string
-	Limit              *int64
-	Time               int64
-	StartTime          *int64
-	EndTime            *int64
-	LogGroupName       string
-	LogGroupNames      []string
-	LogGroups          []LogGroup `json:"logGroups"`
-	LogGroupNamePrefix string
-	LogStreamName      string
-	StartFromHead      bool
-	Region             string
-	QueryString        string
-	QueryId            string
-	StatsGroups        []string
-	Subtype            string
-	Expression         string
+	dataquery.CloudWatchLogsQuery
+	StartTime     *int64
+	EndTime       *int64
+	Limit         *int64
+	LogGroupName  string
+	LogStreamName string
+	QueryId       string
+	QueryString   string
+	StartFromHead bool
+	Subtype       string
 }
diff --git a/pkg/tsdb/cloudwatch/time_series_query_test.go b/pkg/tsdb/cloudwatch/time_series_query_test.go
index 29728c729fc..5ee82a2ae99 100644
--- a/pkg/tsdb/cloudwatch/time_series_query_test.go
+++ b/pkg/tsdb/cloudwatch/time_series_query_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/mock"
 
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 
@@ -270,16 +271,16 @@ type queryDimensions struct {
 }
 
 type queryParameters struct {
-	MetricQueryType  models.MetricQueryType  `json:"metricQueryType"`
-	MetricEditorMode models.MetricEditorMode `json:"metricEditorMode"`
-	Dimensions       queryDimensions         `json:"dimensions"`
-	Expression       string                  `json:"expression"`
-	Alias            string                  `json:"alias"`
-	Label            *string                 `json:"label"`
-	Statistic        string                  `json:"statistic"`
-	Period           string                  `json:"period"`
-	MatchExact       bool                    `json:"matchExact"`
-	MetricName       string                  `json:"metricName"`
+	MetricQueryType  dataquery.CloudWatchMetricsQueryMetricQueryType  `json:"metricQueryType"`
+	MetricEditorMode dataquery.CloudWatchMetricsQueryMetricEditorMode `json:"metricEditorMode"`
+	Dimensions       queryDimensions                                  `json:"dimensions"`
+	Expression       string                                           `json:"expression"`
+	Alias            string                                           `json:"alias"`
+	Label            *string                                          `json:"label"`
+	Statistic        string                                           `json:"statistic"`
+	Period           string                                           `json:"period"`
+	MatchExact       bool                                             `json:"matchExact"`
+	MetricName       string                                           `json:"metricName"`
 }
 
 var queryId = "query id"
@@ -288,11 +289,11 @@ func newTestQuery(t testing.TB, p queryParameters) json.RawMessage {
 	t.Helper()
 
 	tsq := struct {
-		Type             string                  `json:"type"`
-		MetricQueryType  models.MetricQueryType  `json:"metricQueryType"`
-		MetricEditorMode models.MetricEditorMode `json:"metricEditorMode"`
-		Namespace        string                  `json:"namespace"`
-		MetricName       string                  `json:"metricName"`
+		Type             string                                           `json:"type"`
+		MetricQueryType  dataquery.CloudWatchMetricsQueryMetricQueryType  `json:"metricQueryType"`
+		MetricEditorMode dataquery.CloudWatchMetricsQueryMetricEditorMode `json:"metricEditorMode"`
+		Namespace        string                                           `json:"namespace"`
+		MetricName       string                                           `json:"metricName"`
 		Dimensions       struct {
 			InstanceID []string `json:"InstanceId,omitempty"`
 		} `json:"dimensions"`
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.cue b/public/app/plugins/datasource/cloudwatch/dataquery.cue
index c9f9d19bfbc..b6c7ce5c646 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.cue
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.cue
@@ -23,7 +23,7 @@ import (
 pfs.GrafanaPlugin
 
 composableKinds: DataQuery: {
-	maturity: "merged"
+	maturity: "experimental"
 
 	lineage: {
 		seqs: [

From cf7157f683960b220237eba9f4d281f27a0e2562 Mon Sep 17 00:00:00 2001
From: Alexander Weaver <weaver.alex.d@gmail.com>
Date: Tue, 18 Apr 2023 14:21:28 -0500
Subject: [PATCH 228/729] Alerting: Capture refID of rule's condition
 expression in Loki state history entries (#66419)

* Capture condition from rule

* Add test
---
 pkg/services/ngalert/state/historian/loki.go      |  2 ++
 pkg/services/ngalert/state/historian/loki_test.go | 15 +++++++++++++++
 .../ngalert/state/historian/model/rule.go         |  2 ++
 3 files changed, 19 insertions(+)

diff --git a/pkg/services/ngalert/state/historian/loki.go b/pkg/services/ngalert/state/historian/loki.go
index 99364a788ad..1f8ff0e8196 100644
--- a/pkg/services/ngalert/state/historian/loki.go
+++ b/pkg/services/ngalert/state/historian/loki.go
@@ -260,6 +260,7 @@ func statesToStream(rule history_model.RuleMeta, states []state.StateTransition,
 			Previous:       state.PreviousFormatted(),
 			Current:        state.Formatted(),
 			Values:         valuesAsDataBlob(state.State),
+			Condition:      rule.Condition,
 			DashboardUID:   rule.DashboardUID,
 			PanelID:        rule.PanelID,
 			InstanceLabels: removePrivateLabels(state.Labels),
@@ -302,6 +303,7 @@ type lokiEntry struct {
 	Current       string           `json:"current"`
 	Error         string           `json:"error,omitempty"`
 	Values        *simplejson.Json `json:"values"`
+	Condition     string           `json:"condition"`
 	DashboardUID  string           `json:"dashboardUID"`
 	PanelID       int64            `json:"panelID"`
 	// InstanceLabels is exactly the set of labels associated with the alert instance in Alertmanager.
diff --git a/pkg/services/ngalert/state/historian/loki_test.go b/pkg/services/ngalert/state/historian/loki_test.go
index d254b5c05d0..b2c6a9b5ece 100644
--- a/pkg/services/ngalert/state/historian/loki_test.go
+++ b/pkg/services/ngalert/state/historian/loki_test.go
@@ -139,6 +139,21 @@ func TestRemoteLokiBackend(t *testing.T) {
 			require.InDelta(t, 2.0, entry.Values.Get("A").MustFloat64(), 1e-4)
 			require.InDelta(t, 5.5, entry.Values.Get("B").MustFloat64(), 1e-4)
 		})
+
+		t.Run("captures condition from rule", func(t *testing.T) {
+			rule := createTestRule()
+			rule.Condition = "some-condition"
+			l := log.NewNopLogger()
+			states := singleFromNormal(&state.State{
+				State:  eval.Alerting,
+				Labels: data.Labels{"a": "b"},
+			})
+
+			res := statesToStream(rule, states, nil, l)
+
+			entry := requireSingleEntry(t, res)
+			require.Equal(t, rule.Condition, entry.Condition)
+		})
 	})
 
 	t.Run("selector string", func(t *testing.T) {
diff --git a/pkg/services/ngalert/state/historian/model/rule.go b/pkg/services/ngalert/state/historian/model/rule.go
index 5a76d60c9ce..288a84a8e6e 100644
--- a/pkg/services/ngalert/state/historian/model/rule.go
+++ b/pkg/services/ngalert/state/historian/model/rule.go
@@ -19,6 +19,7 @@ type RuleMeta struct {
 	NamespaceUID string
 	DashboardUID string
 	PanelID      int64
+	Condition    string
 }
 
 func NewRuleMeta(r *models.AlertRule, log log.Logger) RuleMeta {
@@ -43,6 +44,7 @@ func NewRuleMeta(r *models.AlertRule, log log.Logger) RuleMeta {
 		NamespaceUID: r.NamespaceUID,
 		DashboardUID: dashUID,
 		PanelID:      panelID,
+		Condition:    r.Condition,
 	}
 }
 

From a384194e15d60fba362bbfe323ec54e5f9ff5669 Mon Sep 17 00:00:00 2001
From: Alexander Weaver <weaver.alex.d@gmail.com>
Date: Tue, 18 Apr 2023 14:31:29 -0500
Subject: [PATCH 229/729] Alerting: Use default page size of 5000 when querying
 Loki for state history (#66315)

Always specify limit of 5000
---
 .../ngalert/state/historian/loki_http.go      |  4 ++++
 .../ngalert/state/historian/loki_http_test.go | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/pkg/services/ngalert/state/historian/loki_http.go b/pkg/services/ngalert/state/historian/loki_http.go
index ff482397154..003f9ae05d3 100644
--- a/pkg/services/ngalert/state/historian/loki_http.go
+++ b/pkg/services/ngalert/state/historian/loki_http.go
@@ -17,6 +17,8 @@ import (
 	"github.com/weaveworks/common/http/client"
 )
 
+const defaultPageSize = 5000
+
 func NewRequester() client.Requester {
 	return &http.Client{}
 }
@@ -222,6 +224,7 @@ func (c *httpLokiClient) setAuthAndTenantHeaders(req *http.Request) {
 		req.Header.Add("X-Scope-OrgID", c.cfg.TenantID)
 	}
 }
+
 func (c *httpLokiClient) rangeQuery(ctx context.Context, logQL string, start, end int64) (queryRes, error) {
 	// Run the pre-flight checks for the query.
 	if start > end {
@@ -234,6 +237,7 @@ func (c *httpLokiClient) rangeQuery(ctx context.Context, logQL string, start, en
 	values.Set("query", logQL)
 	values.Set("start", fmt.Sprintf("%d", start))
 	values.Set("end", fmt.Sprintf("%d", end))
+	values.Set("limit", fmt.Sprintf("%d", defaultPageSize))
 
 	queryURL.RawQuery = values.Encode()
 
diff --git a/pkg/services/ngalert/state/historian/loki_http_test.go b/pkg/services/ngalert/state/historian/loki_http_test.go
index 25e010227f2..02ebe4cf741 100644
--- a/pkg/services/ngalert/state/historian/loki_http_test.go
+++ b/pkg/services/ngalert/state/historian/loki_http_test.go
@@ -1,6 +1,7 @@
 package historian
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -116,6 +117,28 @@ func TestLokiHTTPClient(t *testing.T) {
 		exp := fmt.Sprintf(`{"streams": [{"stream": {}, "values": [["%d", "some line"]]}]}`, now.UnixNano())
 		require.JSONEq(t, exp, sent)
 	})
+
+	t.Run("range query", func(t *testing.T) {
+		t.Run("passes along page size", func(t *testing.T) {
+			req := NewFakeRequester().WithResponse(&http.Response{
+				Status:        "200 OK",
+				StatusCode:    200,
+				Body:          io.NopCloser(bytes.NewBufferString(`{}`)),
+				ContentLength: int64(0),
+				Header:        make(http.Header, 0),
+			})
+			client := createTestLokiClient(req)
+			now := time.Now().UTC().UnixNano()
+			q := `{from="state-history"}`
+
+			_, err := client.rangeQuery(context.Background(), q, now-100, now)
+
+			require.NoError(t, err)
+			params := req.lastRequest.URL.Query()
+			require.True(t, params.Has("limit"), "query params did not contain 'limit': %#v", params)
+			require.Equal(t, fmt.Sprint(defaultPageSize), params.Get("limit"))
+		})
+	})
 }
 
 // This function can be used for local testing, just remove the skip call.

From 9452c0d718837e7d561695acb9cf421922a3c9f1 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 18 Apr 2023 13:39:30 -0700
Subject: [PATCH 230/729] Annotations: Support filtering the target panels
 (#66325)

Co-authored-by: Adela Almasan <adela.almasan@grafana.com>
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
---
 .betterer.results                             |   9 +-
 .../annotations/annotation-filtering.json     | 433 ++++++++++++++++++
 .../feature-templating/datadata-macros.json   |   2 +-
 .../dev-dashboards/migrations/migrations.json |   5 +-
 .../panel-common/shared_queries.json          |   2 +-
 .../panel-table/table_tests_new.json          |   2 +-
 devenv/jsonnet/dev-dashboards.libsonnet       |   7 +
 .../kinds/core/dashboard/schema-reference.md  | 150 +++---
 e2e/various-suite/filter-annotations.spec.ts  |  61 +++
 kinds/dashboard/dashboard_kind.cue            |  81 +++-
 .../grafana-data/src/types/annotations.ts     |  21 +-
 packages/grafana-data/src/types/datasource.ts |   1 +
 .../src/selectors/components.ts               |   4 +
 .../src/selectors/pages.ts                    |  13 +
 packages/grafana-schema/src/index.gen.ts      |   8 +-
 .../raw/dashboard/x/dashboard_types.gen.ts    |  96 ++--
 .../src/veneer/dashboard.types.ts             |  20 +-
 pkg/kinds/dashboard/dashboard_types_gen.go    |  71 ++-
 .../publicdashboards/service/query.go         |   4 +-
 .../publicdashboards/service/query_test.go    |  43 +-
 .../AnnotationSettingsEdit.tsx                | 158 ++++++-
 .../AnnotationsSettings.test.tsx              |  21 +-
 .../components/SubMenu/AnnotationPicker.tsx   |  14 +-
 .../components/SubMenu/Annotations.tsx        |   5 +-
 .../dashboard/state/DashboardMigrator.test.ts |   2 +-
 .../dashboard/state/DashboardModel.test.ts    |   2 -
 .../state/__fixtures__/dashboardFixtures.ts   |   3 +-
 .../query/state/DashboardQueryRunner/utils.ts |  25 +-
 .../plugins/datasource/grafana/datasource.ts  |   7 +-
 .../app/plugins/datasource/grafana/types.ts   |   3 +-
 .../app/plugins/panel/graph/event_editor.ts   |   2 +-
 .../plugins/annotations/AnnotationMarker.tsx  |   2 +
 32 files changed, 1042 insertions(+), 235 deletions(-)
 create mode 100644 devenv/dev-dashboards/annotations/annotation-filtering.json
 create mode 100644 e2e/various-suite/filter-annotations.spec.ts

diff --git a/.betterer.results b/.betterer.results
index 23a5eea677e..cf5cc6f394d 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -858,7 +858,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"]
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"]
     ],
     "packages/grafana-toolkit/src/cli/tasks/component.create.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -2231,7 +2233,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "4"]
     ],
     "public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"],
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"],
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "3"]
     ],
     "public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/devenv/dev-dashboards/annotations/annotation-filtering.json b/devenv/dev-dashboards/annotations/annotation-filtering.json
new file mode 100644
index 00000000000..f342c42dcd6
--- /dev/null
+++ b/devenv/dev-dashboards/annotations/annotation-filtering.json
@@ -0,0 +1,433 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      },
+      {
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      },
+      {
+        "datasource": {
+          "type": "testdata",
+          "uid": "PD8C576611E62080A"
+        },
+        "enable": true,
+        "filter": {
+          "exclude": false,
+          "ids": [
+            1
+          ]
+        },
+        "iconColor": "red",
+        "name": "Red, only panel 1",
+        "target": {
+          "lines": 4,
+          "refId": "Anno",
+          "scenarioId": "annotations"
+        }
+      },
+      {
+        "datasource": {
+          "type": "testdata",
+          "uid": "PD8C576611E62080A"
+        },
+        "enable": true,
+        "filter": {
+          "exclude": true,
+          "ids": [
+            1
+          ]
+        },
+        "iconColor": "yellow",
+        "name": "Yellow - all except 1",
+        "target": {
+          "lines": 5,
+          "refId": "Anno",
+          "scenarioId": "annotations"
+        }
+      },
+      {
+        "datasource": {
+          "type": "testdata",
+          "uid": "PD8C576611E62080A"
+        },
+        "enable": true,
+        "filter": {
+          "exclude": false,
+          "ids": [
+            3,
+            4
+          ]
+        },
+        "iconColor": "dark-purple",
+        "name": "Purple only panel 3+4",
+        "target": {
+          "lines": 6,
+          "refId": "Anno",
+          "scenarioId": "annotations"
+        }
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 119,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "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": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "title": "Panel one",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "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": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "title": "Panel two",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "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": 8,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "id": 3,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "title": "Panel three",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "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": 8,
+        "w": 12,
+        "x": 12,
+        "y": 8
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "title": "Panel four",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": ["gdev", "annotations"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Annotation filtering",
+  "uid": "ed155665",
+  "version": 17,
+  "weekStart": ""
+}
diff --git a/devenv/dev-dashboards/feature-templating/datadata-macros.json b/devenv/dev-dashboards/feature-templating/datadata-macros.json
index d662d2f7add..ebf2972f8a6 100644
--- a/devenv/dev-dashboards/feature-templating/datadata-macros.json
+++ b/devenv/dev-dashboards/feature-templating/datadata-macros.json
@@ -868,4 +868,4 @@
     "uid": "e7c29343-6d1e-4167-9c13-803fe5be8c46",
     "version": 48,
     "weekStart": ""
-  }
\ No newline at end of file
+  }
diff --git a/devenv/dev-dashboards/migrations/migrations.json b/devenv/dev-dashboards/migrations/migrations.json
index 084551745ea..06e358f6434 100644
--- a/devenv/dev-dashboards/migrations/migrations.json
+++ b/devenv/dev-dashboards/migrations/migrations.json
@@ -119,8 +119,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -582,4 +581,4 @@
   "uid": "cdd412c4",
   "version": 6,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/devenv/dev-dashboards/panel-common/shared_queries.json b/devenv/dev-dashboards/panel-common/shared_queries.json
index a4804559089..9401ab42a45 100644
--- a/devenv/dev-dashboards/panel-common/shared_queries.json
+++ b/devenv/dev-dashboards/panel-common/shared_queries.json
@@ -453,4 +453,4 @@
   "uid": "ZqZnVvFZz",
   "version": 8,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/devenv/dev-dashboards/panel-table/table_tests_new.json b/devenv/dev-dashboards/panel-table/table_tests_new.json
index 92143922121..64ddd464bd0 100644
--- a/devenv/dev-dashboards/panel-table/table_tests_new.json
+++ b/devenv/dev-dashboards/panel-table/table_tests_new.json
@@ -1040,4 +1040,4 @@
   "uid": "U_bZIMRMk",
   "version": 7,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/devenv/jsonnet/dev-dashboards.libsonnet b/devenv/jsonnet/dev-dashboards.libsonnet
index 78eb25255c1..c2eeaeaad97 100644
--- a/devenv/jsonnet/dev-dashboards.libsonnet
+++ b/devenv/jsonnet/dev-dashboards.libsonnet
@@ -79,6 +79,13 @@ local dashboard = grafana.dashboard;
         id: 0,
       }
     },
+    dashboard.new('annotation-filtering', import '../dev-dashboards/annotations/annotation-filtering.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
     dashboard.new('auto_decimals', import '../dev-dashboards/panel-common/auto_decimals.json') +
     resource.addMetadata('folder', 'dev-dashboards') +
     {
diff --git a/docs/sources/developers/kinds/core/dashboard/schema-reference.md b/docs/sources/developers/kinds/core/dashboard/schema-reference.md
index cedcf5c525b..ed150b04d41 100644
--- a/docs/sources/developers/kinds/core/dashboard/schema-reference.md
+++ b/docs/sources/developers/kinds/core/dashboard/schema-reference.md
@@ -13,32 +13,84 @@ title: Dashboard kind
 
 A Grafana dashboard.
 
-| Property               | Type                              | Required | Default   | Description                                                                                                                                                                                                                                 |
-|------------------------|-----------------------------------|----------|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `editable`             | boolean                           | **Yes**  | `true`    | Whether a dashboard is editable or not.                                                                                                                                                                                                     |
-| `graphTooltip`         | integer                           | **Yes**  | `0`       | 0 for no shared crosshair or tooltip (default).<br/>1 for shared crosshair.<br/>2 for shared crosshair AND shared tooltip.<br/>Possible values are: `0`, `1`, `2`.                                                                          |
-| `schemaVersion`        | uint16                            | **Yes**  | `36`      | Version of the JSON schema, incremented each time a Grafana update brings<br/>changes to said schema.<br/>TODO this is the existing schema numbering system. It will be replaced by Thema's themaVersion                                    |
-| `style`                | string                            | **Yes**  | `dark`    | Theme of dashboard.<br/>Possible values are: `dark`, `light`.                                                                                                                                                                               |
-| `annotations`          | [object](#annotations)            | No       |           | TODO docs                                                                                                                                                                                                                                   |
-| `description`          | string                            | No       |           | Description of dashboard.                                                                                                                                                                                                                   |
-| `fiscalYearStartMonth` | integer                           | No       | `0`       | The month that the fiscal year starts on.  0 = January, 11 = December<br/>Constraint: `>=0 & <12`.                                                                                                                                          |
-| `gnetId`               | string                            | No       |           | For dashboards imported from the https://grafana.com/grafana/dashboards/ portal                                                                                                                                                             |
-| `id`                   | integer                           | No       |           | Unique numeric identifier for the dashboard.<br/>TODO must isolate or remove identifiers local to a Grafana instance...?                                                                                                                    |
-| `links`                | [DashboardLink](#dashboardlink)[] | No       |           | TODO docs                                                                                                                                                                                                                                   |
-| `liveNow`              | boolean                           | No       |           | When set to true, the dashboard will redraw panels at an interval matching the pixel width.<br/>This will keep data "moving left" regardless of the query refresh rate.  This setting helps<br/>avoid dashboards presenting stale live data |
-| `panels`               | [object](#panels)[]               | No       |           |                                                                                                                                                                                                                                             |
-| `refresh`              |                                   | No       |           | Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".                                                                                                                                                    |
-| `revision`             | integer                           | No       |           | This property should only be used in dashboards defined by plugins.  It is a quick check<br/>to see if the version has changed since the last time.  Unclear why using the version property<br/>is insufficient.                            |
-| `snapshot`             | [Snapshot](#snapshot)             | No       |           | TODO docs                                                                                                                                                                                                                                   |
-| `tags`                 | string[]                          | No       |           | Tags associated with dashboard.                                                                                                                                                                                                             |
-| `templating`           | [object](#templating)             | No       |           | TODO docs                                                                                                                                                                                                                                   |
-| `time`                 | [object](#time)                   | No       |           | Time range for dashboard, e.g. last 6 hours, last 7 days, etc                                                                                                                                                                               |
-| `timepicker`           | [object](#timepicker)             | No       |           | TODO docs<br/>TODO this appears to be spread all over in the frontend. Concepts will likely need tidying in tandem with schema changes                                                                                                      |
-| `timezone`             | string                            | No       | `browser` | Timezone of dashboard. Accepts IANA TZDB zone ID or "browser" or "utc".                                                                                                                                                                     |
-| `title`                | string                            | No       |           | Title of dashboard.                                                                                                                                                                                                                         |
-| `uid`                  | string                            | No       |           | Unique dashboard identifier that can be generated by anyone. string (8-40)                                                                                                                                                                  |
-| `version`              | uint32                            | No       |           | Version of the dashboard, incremented each time the dashboard is updated.                                                                                                                                                                   |
-| `weekStart`            | string                            | No       |           | TODO docs                                                                                                                                                                                                                                   |
+| Property               | Type                                        | Required | Default   | Description                                                                                                                                                                                                                                 |
+|------------------------|---------------------------------------------|----------|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `editable`             | boolean                                     | **Yes**  | `true`    | Whether a dashboard is editable or not.                                                                                                                                                                                                     |
+| `graphTooltip`         | integer                                     | **Yes**  | `0`       | 0 for no shared crosshair or tooltip (default).<br/>1 for shared crosshair.<br/>2 for shared crosshair AND shared tooltip.<br/>Possible values are: `0`, `1`, `2`.                                                                          |
+| `schemaVersion`        | uint16                                      | **Yes**  | `36`      | Version of the JSON schema, incremented each time a Grafana update brings<br/>changes to said schema.<br/>TODO this is the existing schema numbering system. It will be replaced by Thema's themaVersion                                    |
+| `style`                | string                                      | **Yes**  | `dark`    | Theme of dashboard.<br/>Possible values are: `dark`, `light`.                                                                                                                                                                               |
+| `annotations`          | [AnnotationContainer](#annotationcontainer) | No       |           | TODO -- should not be a public interface on its own, but required for Veneer                                                                                                                                                                |
+| `description`          | string                                      | No       |           | Description of dashboard.                                                                                                                                                                                                                   |
+| `fiscalYearStartMonth` | integer                                     | No       | `0`       | The month that the fiscal year starts on.  0 = January, 11 = December<br/>Constraint: `>=0 & <12`.                                                                                                                                          |
+| `gnetId`               | string                                      | No       |           | For dashboards imported from the https://grafana.com/grafana/dashboards/ portal                                                                                                                                                             |
+| `id`                   | integer                                     | No       |           | Unique numeric identifier for the dashboard.<br/>TODO must isolate or remove identifiers local to a Grafana instance...?                                                                                                                    |
+| `links`                | [DashboardLink](#dashboardlink)[]           | No       |           | TODO docs                                                                                                                                                                                                                                   |
+| `liveNow`              | boolean                                     | No       |           | When set to true, the dashboard will redraw panels at an interval matching the pixel width.<br/>This will keep data "moving left" regardless of the query refresh rate.  This setting helps<br/>avoid dashboards presenting stale live data |
+| `panels`               | [object](#panels)[]                         | No       |           |                                                                                                                                                                                                                                             |
+| `refresh`              |                                             | No       |           | Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".                                                                                                                                                    |
+| `revision`             | integer                                     | No       |           | This property should only be used in dashboards defined by plugins.  It is a quick check<br/>to see if the version has changed since the last time.  Unclear why using the version property<br/>is insufficient.                            |
+| `snapshot`             | [Snapshot](#snapshot)                       | No       |           | TODO docs                                                                                                                                                                                                                                   |
+| `tags`                 | string[]                                    | No       |           | Tags associated with dashboard.                                                                                                                                                                                                             |
+| `templating`           | [object](#templating)                       | No       |           | TODO docs                                                                                                                                                                                                                                   |
+| `time`                 | [object](#time)                             | No       |           | Time range for dashboard, e.g. last 6 hours, last 7 days, etc                                                                                                                                                                               |
+| `timepicker`           | [object](#timepicker)                       | No       |           | TODO docs<br/>TODO this appears to be spread all over in the frontend. Concepts will likely need tidying in tandem with schema changes                                                                                                      |
+| `timezone`             | string                                      | No       | `browser` | Timezone of dashboard. Accepts IANA TZDB zone ID or "browser" or "utc".                                                                                                                                                                     |
+| `title`                | string                                      | No       |           | Title of dashboard.                                                                                                                                                                                                                         |
+| `uid`                  | string                                      | No       |           | Unique dashboard identifier that can be generated by anyone. string (8-40)                                                                                                                                                                  |
+| `version`              | uint32                                      | No       |           | Version of the dashboard, incremented each time the dashboard is updated.                                                                                                                                                                   |
+| `weekStart`            | string                                      | No       |           | TODO docs                                                                                                                                                                                                                                   |
+
+### AnnotationContainer
+
+TODO -- should not be a public interface on its own, but required for Veneer
+
+| Property | Type                                  | Required | Default | Description |
+|----------|---------------------------------------|----------|---------|-------------|
+| `list`   | [AnnotationQuery](#annotationquery)[] | No       |         |             |
+
+### AnnotationQuery
+
+TODO docs
+FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
+
+| Property     | Type                                            | Required | Default | Description                                                                                                                                                                  |
+|--------------|-------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `datasource` | [object](#datasource)                           | **Yes**  |         | TODO: Should be DataSourceRef                                                                                                                                                |
+| `enable`     | boolean                                         | **Yes**  | `true`  | When enabled the annotation query is issued with every dashboard refresh                                                                                                     |
+| `iconColor`  | string                                          | **Yes**  |         | Color to use for the annotation event markers                                                                                                                                |
+| `name`       | string                                          | **Yes**  |         | Name of annotation.                                                                                                                                                          |
+| `filter`     | [AnnotationPanelFilter](#annotationpanelfilter) | No       |         |                                                                                                                                                                              |
+| `hide`       | boolean                                         | No       | `false` | Annotation queries can be toggled on or off at the top of the dashboard.<br/>When hide is true, the toggle is not shown in the dashboard.                                    |
+| `target`     | [AnnotationTarget](#annotationtarget)           | No       |         | TODO: this should be a regular DataQuery that depends on the selected dashboard<br/>these match the properties of the "grafana" datasouce that is default in most dashboards |
+| `type`       | string                                          | No       |         | TODO -- this should not exist here, it is based on the --grafana-- datasource                                                                                                |
+
+### AnnotationPanelFilter
+
+| Property  | Type      | Required | Default | Description                                         |
+|-----------|-----------|----------|---------|-----------------------------------------------------|
+| `ids`     | integer[] | **Yes**  |         | Panel IDs that should be included or excluded       |
+| `exclude` | boolean   | No       | `false` | Should the specified panels be included or excluded |
+
+### AnnotationTarget
+
+TODO: this should be a regular DataQuery that depends on the selected dashboard
+these match the properties of the "grafana" datasouce that is default in most dashboards
+
+| Property   | Type     | Required | Default | Description                                                                                                       |
+|------------|----------|----------|---------|-------------------------------------------------------------------------------------------------------------------|
+| `limit`    | integer  | **Yes**  |         | Only required/valid for the grafana datasource...<br/>but code+tests is already depending on it so hard to change |
+| `matchAny` | boolean  | **Yes**  |         | Only required/valid for the grafana datasource...<br/>but code+tests is already depending on it so hard to change |
+| `tags`     | string[] | **Yes**  |         | Only required/valid for the grafana datasource...<br/>but code+tests is already depending on it so hard to change |
+| `type`     | string   | **Yes**  |         | Only required/valid for the grafana datasource...<br/>but code+tests is already depending on it so hard to change |
+
+### Datasource
+
+TODO: Should be DataSourceRef
+
+| Property | Type   | Required | Default | Description |
+|----------|--------|----------|---------|-------------|
+| `type`   | string | No       |         |             |
+| `uid`    | string | No       |         |             |
 
 ### DashboardLink
 
@@ -76,52 +128,6 @@ TODO docs
 | `userId`      | uint32  | **Yes**  |         | TODO docs   |
 | `url`         | string  | No       |         | TODO docs   |
 
-### Annotations
-
-TODO docs
-
-| Property | Type                                  | Required | Default | Description |
-|----------|---------------------------------------|----------|---------|-------------|
-| `list`   | [AnnotationQuery](#annotationquery)[] | No       |         |             |
-
-### AnnotationQuery
-
-TODO docs
-FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
-
-| Property     | Type                                  | Required | Default     | Description                       |
-|--------------|---------------------------------------|----------|-------------|-----------------------------------|
-| `builtIn`    | uint8                                 | **Yes**  | `0`         |                                   |
-| `datasource` | [object](#datasource)                 | **Yes**  |             | Datasource to use for annotation. |
-| `enable`     | boolean                               | **Yes**  | `true`      | Whether annotation is enabled.    |
-| `showIn`     | uint8                                 | **Yes**  | `0`         |                                   |
-| `type`       | string                                | **Yes**  | `dashboard` |                                   |
-| `hide`       | boolean                               | No       | `false`     | Whether to hide annotation.       |
-| `iconColor`  | string                                | No       |             | Annotation icon color.            |
-| `name`       | string                                | No       |             | Name of annotation.               |
-| `rawQuery`   | string                                | No       |             | Query for annotation data.        |
-| `target`     | [AnnotationTarget](#annotationtarget) | No       |             | TODO docs                         |
-
-### AnnotationTarget
-
-TODO docs
-
-| Property   | Type     | Required | Default | Description |
-|------------|----------|----------|---------|-------------|
-| `limit`    | integer  | **Yes**  |         |             |
-| `matchAny` | boolean  | **Yes**  |         |             |
-| `tags`     | string[] | **Yes**  |         |             |
-| `type`     | string   | **Yes**  |         |             |
-
-### Datasource
-
-Datasource to use for annotation.
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `type`   | string | No       |         |             |
-| `uid`    | string | No       |         |             |
-
 ### Panels
 
 | Property | Type                                                                                                                  | Required | Default | Description |
diff --git a/e2e/various-suite/filter-annotations.spec.ts b/e2e/various-suite/filter-annotations.spec.ts
new file mode 100644
index 00000000000..c6b17f33950
--- /dev/null
+++ b/e2e/various-suite/filter-annotations.spec.ts
@@ -0,0 +1,61 @@
+import { e2e } from '@grafana/e2e';
+const DASHBOARD_ID = 'ed155665';
+
+e2e.scenario({
+  describeName: 'Annotations filtering',
+  itName: 'Tests switching filter type updates the UI accordingly',
+  addScenarioDataSource: false,
+  addScenarioDashBoard: false,
+  skipScenario: false,
+  scenario: () => {
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID });
+
+    e2e.components.PageToolbar.item('Dashboard settings').click();
+    e2e.components.Tab.title('Annotations').click();
+    cy.contains('New query').click();
+    e2e.pages.Dashboard.Settings.Annotations.Settings.name().clear().type('Red - Panel two');
+
+    e2e.pages.Dashboard.Settings.Annotations.NewAnnotation.showInLabel()
+      .should('be.visible')
+      .within(() => {
+        // All panels
+        e2e.components.Annotations.annotationsTypeInput().click({ force: true }).type('All panels{enter}');
+        e2e.components.Annotations.annotationsChoosePanelInput().should('not.exist');
+
+        // All panels except
+        e2e.components.Annotations.annotationsTypeInput().click({ force: true }).type('All panels except{enter}');
+        e2e.components.Annotations.annotationsChoosePanelInput().should('be.visible');
+
+        // Selected panels
+        e2e.components.Annotations.annotationsTypeInput().click({ force: true }).type('Selected panels{enter}');
+        e2e.components.Annotations.annotationsChoosePanelInput()
+          .should('be.visible')
+          .click({ force: true })
+          .type('Panel two{enter}');
+      });
+
+    e2e.pages.Dashboard.Settings.Annotations.NewAnnotation.previewInDashboard().click({ force: true });
+
+    e2e.pages.Dashboard.SubMenu.Annotations.annotationsWrapper()
+      .should('be.visible')
+      .within(() => {
+        e2e.pages.Dashboard.SubMenu.Annotations.annotationLabel('Red - Panel two').should('be.visible');
+        e2e.pages.Dashboard.SubMenu.Annotations.annotationToggle('Red - Panel two')
+          .should('be.checked')
+          .uncheck({ force: true })
+          .should('not.be.checked')
+          .check({ force: true });
+
+        e2e.pages.Dashboard.SubMenu.Annotations.annotationLabel('Red, only panel 1').should('be.visible');
+        e2e.pages.Dashboard.SubMenu.Annotations.annotationToggle('Red, only panel 1').should('be.checked');
+      });
+
+    e2e().wait(3000);
+
+    e2e.components.Panels.Panel.title('Panel one')
+      .should('exist')
+      .within(() => {
+        e2e.pages.SoloPanel.Annotations.marker().should('exist').should('have.length', 4);
+      });
+  },
+});
diff --git a/kinds/dashboard/dashboard_kind.cue b/kinds/dashboard/dashboard_kind.cue
index 970f8116fe5..65349ace538 100644
--- a/kinds/dashboard/dashboard_kind.cue
+++ b/kinds/dashboard/dashboard_kind.cue
@@ -85,10 +85,18 @@ lineage: seqs: [
 				templating?: {
 					list?: [...#VariableModel] @grafanamaturity(NeedsExpertReview)
 				}
-				// TODO docs
-				annotations?: {
+
+				// TODO -- should not be a public interface on its own, but required for Veneer
+				#AnnotationContainer: {
+					// annoying... but required so that the list is defined using the nested Veneer
+					@grafana(TSVeneer="type")
+
 					list?: [...#AnnotationQuery] @grafanamaturity(NeedsExpertReview)
-				}
+				} @cuetsy(kind="interface")
+
+				// TODO docs
+				annotations?: #AnnotationContainer
+
 				// TODO docs
 				links?: [...#DashboardLink] @grafanamaturity(NeedsExpertReview)
 
@@ -97,39 +105,72 @@ lineage: seqs: [
 				///////////////////////////////////////
 				// Definitions (referenced above) are declared below
 
-				// TODO docs
+				// TODO: this should be a regular DataQuery that depends on the selected dashboard
+				// these match the properties of the "grafana" datasouce that is default in most dashboards
 				#AnnotationTarget: {
-					limit:    int64
+					// Only required/valid for the grafana datasource... 
+					// but code+tests is already depending on it so hard to change
+					limit: int64
+					// Only required/valid for the grafana datasource... 
+					// but code+tests is already depending on it so hard to change
 					matchAny: bool
+					// Only required/valid for the grafana datasource... 
+					// but code+tests is already depending on it so hard to change
 					tags: [...string]
+					// Only required/valid for the grafana datasource... 
+					// but code+tests is already depending on it so hard to change
 					type: string
+					... // datasource will stick their raw DataQuery here
 				} @cuetsy(kind="interface") @grafanamaturity(NeedsExpertReview)
 
+				#AnnotationPanelFilter: {
+					// Should the specified panels be included or excluded
+					exclude?: bool | *false
+
+					// Panel IDs that should be included or excluded
+					ids: [...uint8]
+				} @cuetsy(kind="interface")
+
 				// TODO docs
 				// FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
 				#AnnotationQuery: {
-					// Datasource to use for annotation.
+					@grafana(TSVeneer="type")
+
+					// Name of annotation.
+					name: string
+
+					// TODO: Should be DataSourceRef
 					datasource: {
 						type?: string
 						uid?:  string
 					} @grafanamaturity(NeedsExpertReview)
 
-					// Whether annotation is enabled.
-					enable: bool | *true @grafanamaturity(NeedsExpertReview)
-					// Name of annotation.
-					name?:   string     @grafanamaturity(NeedsExpertReview)
-					builtIn: uint8 | *0 @grafanamaturity(NeedsExpertReview) // TODO should this be persisted at all?
-					// Whether to hide annotation.
-					hide?: bool | *false @grafanamaturity(NeedsExpertReview)
-					// Annotation icon color.
-					iconColor?: string                @grafanamaturity(NeedsExpertReview)
-					type:       string | *"dashboard" @grafanamaturity(NeedsExpertReview)
-					// Query for annotation data.
-					rawQuery?: string            @grafanamaturity(NeedsExpertReview)
-					showIn:    uint8 | *0        @grafanamaturity(NeedsExpertReview)
-					target?:   #AnnotationTarget @grafanamaturity(NeedsExpertReview)
+					// When enabled the annotation query is issued with every dashboard refresh
+					enable: bool | *true
+
+					// Annotation queries can be toggled on or off at the top of the dashboard.  
+					// When hide is true, the toggle is not shown in the dashboard.
+					hide?: bool | *false
+
+					// Color to use for the annotation event markers
+					iconColor: string
+
+					// Optionally   
+					filter?: #AnnotationPanelFilter
+
+					// TODO.. this should just be a normal query target
+					target?: #AnnotationTarget
+
+					// TODO -- this should not exist here, it is based on the --grafana-- datasource
+					type?: string @grafanamaturity(NeedsExpertReview)
+
+					// unless datasources have migrated to the target+mapping,
+					// they just spread their query into the base object :(
+					...
 				} @cuetsy(kind="interface")
 
+				#LoadingState: "NotStarted" | "Loading" | "Streaming" | "Done" | "Error" @cuetsy(kind="enum") @grafanamaturity(NeedsExpertReview)
+
 				// FROM: packages/grafana-data/src/types/templateVars.ts
 				// TODO docs
 				// TODO what about what's in public/app/features/types.ts?
diff --git a/packages/grafana-data/src/types/annotations.ts b/packages/grafana-data/src/types/annotations.ts
index da077daa76e..a35e0bea005 100644
--- a/packages/grafana-data/src/types/annotations.ts
+++ b/packages/grafana-data/src/types/annotations.ts
@@ -1,30 +1,23 @@
 import { ComponentType } from 'react';
 import { Observable } from 'rxjs';
 
+import { DataQuery, AnnotationQuery as SchemaAnnotationQuery } from '@grafana/schema';
+
 import { DataFrame } from './dataFrame';
 import { QueryEditorProps } from './datasource';
-import { DataQuery, DataSourceRef } from './query';
 
 /**
  * This JSON object is stored in the dashboard json model.
  */
-export interface AnnotationQuery<TQuery extends DataQuery = DataQuery> {
-  datasource?: DataSourceRef | null;
-
-  enable: boolean;
-  name: string;
-  iconColor: string;
-  hide?: boolean;
-  builtIn?: number;
-  type?: string;
+export interface AnnotationQuery<TQuery extends DataQuery = DataQuery> extends SchemaAnnotationQuery<TQuery> {
   snapshotData?: any;
 
-  // Standard datasource query
-  target?: TQuery;
-
   // Convert a dataframe to an AnnotationEvent
   mappings?: AnnotationEventMappings;
 
+  // When using the 'grafana' datasource, this may be dashboard
+  type?: string;
+
   // Sadly plugins can set any property directly on the main object
   [key: string]: any;
 }
@@ -51,7 +44,7 @@ export interface AnnotationEvent {
   newState?: string;
 
   // Currently used to merge annotations from alerts and dashboard
-  source?: any; // source.type === 'dashboard'
+  source?: any; // source.type === 'dashboard' -- should be AnnotationQuery
 }
 
 export interface AnnotationEventUIModel {
diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index f8fb6161b00..797b5afe730 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -57,6 +57,7 @@ export class DataSourcePlugin<
     return this;
   }
 
+  /** @deprecated -- register the annotation support in the instance constructor */
   setAnnotationQueryCtrl(AnnotationsQueryCtrl: any) {
     this.components.AnnotationsQueryCtrl = AnnotationsQueryCtrl;
     return this;
diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/grafana-e2e-selectors/src/selectors/components.ts
index 7ba3ebf6068..b53074f8d0f 100644
--- a/packages/grafana-e2e-selectors/src/selectors/components.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/components.ts
@@ -416,4 +416,8 @@ export const Components = {
   Variables: {
     variableOption: 'data-testid variable-option',
   },
+  Annotations: {
+    annotationsTypeInput: 'annotations-type-input',
+    annotationsChoosePanelInput: 'choose-panels-input',
+  },
 };
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index 6cfe30a4f0e..9336f53ad6b 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -66,6 +66,11 @@ export const Pages = {
       submenuItemValueDropDownDropDown: 'Variable options',
       submenuItemValueDropDownOptionTexts: (item: string) =>
         `data-testid Dashboard template variables Variable Value DropDown option text ${item}`,
+      Annotations: {
+        annotationsWrapper: 'data-testid annotation-wrapper',
+        annotationLabel: (label: string) => `data-testid Dashboard annotations submenu Label ${label}`,
+        annotationToggle: (label: string) => `data-testid Dashboard annotations submenu Toggle ${label}`,
+      },
     },
     Settings: {
       Actions: {
@@ -93,6 +98,11 @@ export const Pages = {
         Settings: {
           name: 'Annotations settings name input',
         },
+        NewAnnotation: {
+          panelFilterSelect: 'data-testid annotations-panel-filter',
+          showInLabel: 'show-in-label',
+          previewInDashboard: 'data-testid annotations-preview',
+        },
       },
       Variables: {
         List: {
@@ -239,6 +249,9 @@ export const Pages = {
   },
   SoloPanel: {
     url: (page: string) => `/d-solo/${page}`,
+    Annotations: {
+      marker: 'data-testid annotation-marker',
+    },
   },
   PluginsList: {
     page: 'Plugins list page',
diff --git a/packages/grafana-schema/src/index.gen.ts b/packages/grafana-schema/src/index.gen.ts
index cefd43cc220..3d6371d00bd 100644
--- a/packages/grafana-schema/src/index.gen.ts
+++ b/packages/grafana-schema/src/index.gen.ts
@@ -10,7 +10,7 @@
 // Raw generated types from Dashboard kind.
 export type {
   AnnotationTarget,
-  AnnotationQuery,
+  AnnotationPanelFilter,
   DashboardLink,
   DashboardLinkType,
   VariableType,
@@ -34,7 +34,7 @@ export type {
 // Raw generated enums and default consts from dashboard kind.
 export {
   defaultAnnotationTarget,
-  defaultAnnotationQuery,
+  defaultAnnotationPanelFilter,
   LoadingState,
   defaultDashboardLink,
   FieldColorModeId,
@@ -59,6 +59,8 @@ export {
 // TODO generate code such that tsc enforces type compatibility between raw and veneer decls
 export type {
   Dashboard,
+  AnnotationContainer,
+  AnnotationQuery,
   VariableModel,
   DataSourceRef,
   DataTransformerConfig,
@@ -79,6 +81,8 @@ export type {
 // TODO generate code such that tsc enforces type compatibility between raw and veneer decls
 export {
   defaultDashboard,
+  defaultAnnotationContainer,
+  defaultAnnotationQuery,
   defaultVariableModel,
   VariableHide,
   defaultPanel,
diff --git a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
index 05e42d5a26a..32b7b5d1bf2 100644
--- a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
+++ b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
@@ -9,12 +9,40 @@
 // Run 'make gen-cue' from repository root to regenerate.
 
 /**
- * TODO docs
+ * TODO -- should not be a public interface on its own, but required for Veneer
+ */
+export interface AnnotationContainer {
+  list?: Array<AnnotationQuery>;
+}
+
+export const defaultAnnotationContainer: Partial<AnnotationContainer> = {
+  list: [],
+};
+
+/**
+ * TODO: this should be a regular DataQuery that depends on the selected dashboard
+ * these match the properties of the "grafana" datasouce that is default in most dashboards
  */
 export interface AnnotationTarget {
+  /**
+   * Only required/valid for the grafana datasource...
+   * but code+tests is already depending on it so hard to change
+   */
   limit: number;
+  /**
+   * Only required/valid for the grafana datasource...
+   * but code+tests is already depending on it so hard to change
+   */
   matchAny: boolean;
+  /**
+   * Only required/valid for the grafana datasource...
+   * but code+tests is already depending on it so hard to change
+   */
   tags: Array<string>;
+  /**
+   * Only required/valid for the grafana datasource...
+   * but code+tests is already depending on it so hard to change
+   */
   type: string;
 }
 
@@ -22,52 +50,78 @@ export const defaultAnnotationTarget: Partial<AnnotationTarget> = {
   tags: [],
 };
 
+export interface AnnotationPanelFilter {
+  /**
+   * Should the specified panels be included or excluded
+   */
+  exclude?: boolean;
+  /**
+   * Panel IDs that should be included or excluded
+   */
+  ids: Array<number>;
+}
+
+export const defaultAnnotationPanelFilter: Partial<AnnotationPanelFilter> = {
+  exclude: false,
+  ids: [],
+};
+
 /**
  * TODO docs
  * FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
  */
 export interface AnnotationQuery {
-  builtIn: number; // TODO should this be persisted at all?
   /**
-   * Datasource to use for annotation.
+   * TODO: Should be DataSourceRef
    */
   datasource: {
     type?: string;
     uid?: string;
   };
   /**
-   * Whether annotation is enabled.
+   * When enabled the annotation query is issued with every dashboard refresh
    */
   enable: boolean;
   /**
-   * Whether to hide annotation.
+   * Optionally
+   */
+  filter?: AnnotationPanelFilter;
+  /**
+   * Annotation queries can be toggled on or off at the top of the dashboard.
+   * When hide is true, the toggle is not shown in the dashboard.
    */
   hide?: boolean;
   /**
-   * Annotation icon color.
+   * Color to use for the annotation event markers
    */
-  iconColor?: string;
+  iconColor: string;
   /**
    * Name of annotation.
    */
-  name?: string;
+  name: string;
   /**
-   * Query for annotation data.
+   * TODO.. this should just be a normal query target
    */
-  rawQuery?: string;
-  showIn: number;
   target?: AnnotationTarget;
-  type: string;
+  /**
+   * TODO -- this should not exist here, it is based on the --grafana-- datasource
+   */
+  type?: string;
 }
 
 export const defaultAnnotationQuery: Partial<AnnotationQuery> = {
-  builtIn: 0,
   enable: true,
   hide: false,
-  showIn: 0,
-  type: 'dashboard',
 };
 
+export enum LoadingState {
+  Done = 'Done',
+  Error = 'Error',
+  Loading = 'Loading',
+  NotStarted = 'NotStarted',
+  Streaming = 'Streaming',
+}
+
 /**
  * FROM: packages/grafana-data/src/types/templateVars.ts
  * TODO docs
@@ -107,14 +161,6 @@ export enum VariableHide {
   hideVariable = 2,
 }
 
-export enum LoadingState {
-  Done = 'Done',
-  Error = 'Error',
-  Loading = 'Loading',
-  NotStarted = 'NotStarted',
-  Streaming = 'Streaming',
-}
-
 /**
  * Ref to a DataSource instance
  */
@@ -662,9 +708,7 @@ export interface Dashboard {
   /**
    * TODO docs
    */
-  annotations?: {
-    list?: Array<AnnotationQuery>;
-  };
+  annotations?: AnnotationContainer;
   /**
    * Description of dashboard.
    */
diff --git a/packages/grafana-schema/src/veneer/dashboard.types.ts b/packages/grafana-schema/src/veneer/dashboard.types.ts
index bf7a5299cde..41c63816ce9 100644
--- a/packages/grafana-schema/src/veneer/dashboard.types.ts
+++ b/packages/grafana-schema/src/veneer/dashboard.types.ts
@@ -1,6 +1,8 @@
-import { DataSourceRef as CommonDataSourceRef } from '../common/common.gen';
+import { DataSourceRef as CommonDataSourceRef, DataSourceRef } from '../common/common.gen';
 import * as raw from '../raw/dashboard/x/dashboard_types.gen';
 
+import { DataQuery } from './common.types';
+
 export type { CommonDataSourceRef as DataSourceRef };
 
 export interface Panel<TOptions = Record<string, unknown>, TCustomFieldConfig = Record<string, unknown>>
@@ -28,13 +30,24 @@ export interface VariableModel
   datasource: CommonDataSourceRef | null;
 }
 
-export interface Dashboard extends Omit<raw.Dashboard, 'templating'> {
+export interface Dashboard extends Omit<raw.Dashboard, 'templating' | 'annotations'> {
   panels?: Array<Panel | raw.RowPanel | raw.GraphPanel | raw.HeatmapPanel>;
+  annotations?: AnnotationContainer;
   templating?: {
     list?: VariableModel[];
   };
 }
 
+export interface AnnotationQuery<TQuery extends DataQuery = DataQuery>
+  extends Omit<raw.AnnotationQuery, 'target' | 'datasource'> {
+  datasource?: DataSourceRef | null;
+  target?: TQuery;
+}
+
+export interface AnnotationContainer extends Omit<raw.AnnotationContainer, 'list'> {
+  list?: AnnotationQuery[]; // use the version from this file
+}
+
 export interface FieldConfig<TOptions = Record<string, unknown>> extends raw.FieldConfig {
   custom?: TOptions & Record<string, unknown>;
 }
@@ -69,3 +82,6 @@ export const defaultPanel: Partial<Panel> = raw.defaultPanel;
 export const defaultFieldConfig: Partial<FieldConfig> = raw.defaultFieldConfig;
 export const defaultFieldConfigSource: Partial<FieldConfigSource> = raw.defaultFieldConfigSource;
 export const defaultMatcherConfig: Partial<MatcherConfig> = raw.defaultMatcherConfig;
+export const defaultAnnotationQuery: Partial<AnnotationQuery> = raw.defaultAnnotationQuery as AnnotationQuery;
+export const defaultAnnotationContainer: Partial<AnnotationContainer> =
+  raw.defaultAnnotationContainer as AnnotationContainer;
diff --git a/pkg/kinds/dashboard/dashboard_types_gen.go b/pkg/kinds/dashboard/dashboard_types_gen.go
index bf1f312da9d..ff4c26ea296 100644
--- a/pkg/kinds/dashboard/dashboard_types_gen.go
+++ b/pkg/kinds/dashboard/dashboard_types_gen.go
@@ -160,52 +160,75 @@ const (
 	VariableTypeTextbox    VariableType = "textbox"
 )
 
+// TODO -- should not be a public interface on its own, but required for Veneer
+type AnnotationContainer struct {
+	List []AnnotationQuery `json:"list,omitempty"`
+}
+
+// AnnotationPanelFilter defines model for AnnotationPanelFilter.
+type AnnotationPanelFilter struct {
+	// Should the specified panels be included or excluded
+	Exclude *bool `json:"exclude,omitempty"`
+
+	// Panel IDs that should be included or excluded
+	Ids []int `json:"ids"`
+}
+
 // TODO docs
 // FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
 type AnnotationQuery struct {
-	BuiltIn int `json:"builtIn"`
-
-	// Datasource to use for annotation.
+	// TODO: Should be DataSourceRef
 	Datasource struct {
 		Type *string `json:"type,omitempty"`
 		Uid  *string `json:"uid,omitempty"`
 	} `json:"datasource"`
 
-	// Whether annotation is enabled.
-	Enable bool `json:"enable"`
+	// When enabled the annotation query is issued with every dashboard refresh
+	Enable bool                   `json:"enable"`
+	Filter *AnnotationPanelFilter `json:"filter,omitempty"`
 
-	// Whether to hide annotation.
+	// Annotation queries can be toggled on or off at the top of the dashboard.
+	// When hide is true, the toggle is not shown in the dashboard.
 	Hide *bool `json:"hide,omitempty"`
 
-	// Annotation icon color.
-	IconColor *string `json:"iconColor,omitempty"`
+	// Color to use for the annotation event markers
+	IconColor string `json:"iconColor"`
 
 	// Name of annotation.
-	Name *string `json:"name,omitempty"`
+	Name string `json:"name"`
 
-	// Query for annotation data.
-	RawQuery *string `json:"rawQuery,omitempty"`
-	ShowIn   int     `json:"showIn"`
-
-	// TODO docs
+	// TODO: this should be a regular DataQuery that depends on the selected dashboard
+	// these match the properties of the "grafana" datasouce that is default in most dashboards
 	Target *AnnotationTarget `json:"target,omitempty"`
-	Type   string            `json:"type"`
+
+	// TODO -- this should not exist here, it is based on the --grafana-- datasource
+	Type *string `json:"type,omitempty"`
 }
 
-// TODO docs
+// TODO: this should be a regular DataQuery that depends on the selected dashboard
+// these match the properties of the "grafana" datasouce that is default in most dashboards
 type AnnotationTarget struct {
-	Limit    int64    `json:"limit"`
-	MatchAny bool     `json:"matchAny"`
-	Tags     []string `json:"tags"`
-	Type     string   `json:"type"`
+	// Only required/valid for the grafana datasource...
+	// but code+tests is already depending on it so hard to change
+	Limit int64 `json:"limit"`
+
+	// Only required/valid for the grafana datasource...
+	// but code+tests is already depending on it so hard to change
+	MatchAny bool `json:"matchAny"`
+
+	// Only required/valid for the grafana datasource...
+	// but code+tests is already depending on it so hard to change
+	Tags []string `json:"tags"`
+
+	// Only required/valid for the grafana datasource...
+	// but code+tests is already depending on it so hard to change
+	Type string `json:"type"`
 }
 
 // Dashboard defines model for Dashboard.
 type Dashboard struct {
-	// TODO docs
-	Annotations *struct {
-		List []AnnotationQuery `json:"list,omitempty"`
-	} `json:"annotations,omitempty"`
+	// TODO -- should not be a public interface on its own, but required for Veneer
+	Annotations *AnnotationContainer `json:"annotations,omitempty"`
 
 	// Description of dashboard.
 	Description *string `json:"description,omitempty"`
diff --git a/pkg/services/publicdashboards/service/query.go b/pkg/services/publicdashboards/service/query.go
index c68798d98ac..66954ec9230 100644
--- a/pkg/services/publicdashboards/service/query.go
+++ b/pkg/services/publicdashboards/service/query.go
@@ -70,7 +70,7 @@ func (pd *PublicDashboardServiceImpl) FindAnnotations(ctx context.Context, reqDT
 				Tags:        item.Tags,
 				IsRegion:    item.TimeEnd > 0 && item.Time != item.TimeEnd,
 				Text:        item.Text,
-				Color:       *anno.IconColor,
+				Color:       anno.IconColor,
 				Time:        item.Time,
 				TimeEnd:     item.TimeEnd,
 				Source:      anno,
@@ -78,7 +78,7 @@ func (pd *PublicDashboardServiceImpl) FindAnnotations(ctx context.Context, reqDT
 
 			// We want dashboard annotations to reference the panel they're for. If no panelId is provided, they'll show up on all panels
 			// which is only intended for tag and org annotations.
-			if anno.Type == "dashboard" {
+			if anno.Type != nil && *anno.Type == "dashboard" {
 				event.PanelId = item.PanelID
 			}
 
diff --git a/pkg/services/publicdashboards/service/query_test.go b/pkg/services/publicdashboards/service/query_test.go
index 1ac490d1bff..56be3f91f6a 100644
--- a/pkg/services/publicdashboards/service/query_test.go
+++ b/pkg/services/publicdashboards/service/query_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
+	"github.com/grafana/grafana/pkg/util"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -743,21 +744,21 @@ func TestFindAnnotations(t *testing.T) {
 		grafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     true,
-			Name:       &name,
-			IconColor:  &color,
+			Name:       name,
+			IconColor:  color,
 			Target: &dashboard2.AnnotationTarget{
 				Limit:    100,
 				MatchAny: false,
 				Tags:     nil,
 				Type:     "dashboard",
 			},
-			Type: "dashboard",
+			Type: util.Pointer("dashboard"),
 		}
 		grafanaTagAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     true,
-			Name:       &name,
-			IconColor:  &color,
+			Name:       name,
+			IconColor:  color,
 			Target: &dashboard2.AnnotationTarget{
 				Limit:    100,
 				MatchAny: false,
@@ -816,8 +817,8 @@ func TestFindAnnotations(t *testing.T) {
 		grafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     true,
-			Name:       &name,
-			IconColor:  &color,
+			Name:       name,
+			IconColor:  color,
 			Target: &dashboard2.AnnotationTarget{
 				Limit:    100,
 				MatchAny: false,
@@ -876,26 +877,26 @@ func TestFindAnnotations(t *testing.T) {
 		disabledGrafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     false,
-			Name:       &name,
-			IconColor:  &color,
+			Name:       name,
+			IconColor:  color,
 		}
 		grafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     true,
-			Name:       &name,
-			IconColor:  &color,
+			Name:       name,
+			IconColor:  color,
 			Target: &dashboard2.AnnotationTarget{
 				Limit:    100,
 				MatchAny: true,
 				Tags:     nil,
 				Type:     "dashboard",
 			},
-			Type: "dashboard",
+			Type: util.Pointer("dashboard"),
 		}
 		queryAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("prometheus", "abc123"),
 			Enable:     true,
-			Name:       &name,
+			Name:       name,
 		}
 		annos := []DashAnnotation{grafanaAnnotation, queryAnnotation, disabledGrafanaAnnotation}
 		dashboard := AddAnnotationsToDashboard(t, dash, annos)
@@ -975,15 +976,15 @@ func TestFindAnnotations(t *testing.T) {
 		grafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     true,
-			Name:       &name,
-			IconColor:  &color,
+			Name:       name,
+			IconColor:  color,
 			Target: &dashboard2.AnnotationTarget{
 				Limit:    100,
 				MatchAny: false,
 				Tags:     nil,
 				Type:     "dashboard",
 			},
-			Type: "dashboard",
+			Type: util.Pointer("dashboard"),
 		}
 		annos := []DashAnnotation{grafanaAnnotation}
 		dashboard := AddAnnotationsToDashboard(t, dash, annos)
@@ -1010,8 +1011,8 @@ func TestFindAnnotations(t *testing.T) {
 		grafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     true,
-			Name:       &name,
-			IconColor:  &color,
+			Name:       name,
+			IconColor:  color,
 			Target: &dashboard2.AnnotationTarget{
 				Limit:    100,
 				MatchAny: false,
@@ -1039,9 +1040,9 @@ func TestFindAnnotations(t *testing.T) {
 		grafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     true,
-			Name:       &name,
-			IconColor:  &color,
-			Type:       "dashboard",
+			Name:       name,
+			IconColor:  color,
+			Type:       util.Pointer("dashboard"),
 			Target:     nil,
 		}
 
diff --git a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
index 03593b13562..c02049a8be3 100644
--- a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
+++ b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
@@ -1,12 +1,31 @@
-import React, { useState } from 'react';
+import { css } from '@emotion/css';
+import React, { useMemo, useState } from 'react';
 import { useAsync } from 'react-use';
 
-import { AnnotationQuery, DataSourceInstanceSettings, getDataSourceRef } from '@grafana/data';
+import {
+  AnnotationQuery,
+  DataSourceInstanceSettings,
+  getDataSourceRef,
+  GrafanaTheme2,
+  SelectableValue,
+} from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Stack } from '@grafana/experimental';
 import { DataSourcePicker, getDataSourceSrv, locationService } from '@grafana/runtime';
-import { Button, Checkbox, Field, FieldSet, HorizontalGroup, Input } from '@grafana/ui';
+import { AnnotationPanelFilter } from '@grafana/schema/src/raw/dashboard/x/dashboard_types.gen';
+import {
+  Button,
+  Checkbox,
+  Field,
+  FieldSet,
+  HorizontalGroup,
+  Input,
+  MultiSelect,
+  Select,
+  useStyles2,
+} from '@grafana/ui';
 import { ColorValueEditor } from 'app/core/components/OptionsUI/color';
+import config from 'app/core/config';
 import StandardAnnotationQueryEditor from 'app/features/annotations/components/StandardAnnotationQueryEditor';
 
 import { DashboardModel } from '../../state/DashboardModel';
@@ -21,8 +40,16 @@ type Props = {
 export const newAnnotationName = 'New annotation';
 
 export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
+  const styles = useStyles2(getStyles);
   const [annotation, setAnnotation] = useState(dashboard.annotations.list[editIdx]);
 
+  const panelFilter = useMemo(() => {
+    if (!annotation.filter) {
+      return PanelFilterType.AllPanels;
+    }
+    return annotation.filter.exclude ? PanelFilterType.ExcludePanels : PanelFilterType.IncludePanels;
+  }, [annotation.filter]);
+
   const { value: ds } = useAsync(() => {
     return getDataSourceSrv().get(annotation.datasource);
   }, [annotation.datasource]);
@@ -65,6 +92,31 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
     });
   };
 
+  const onFilterTypeChange = (v: SelectableValue<PanelFilterType>) => {
+    let filter =
+      v.value === PanelFilterType.AllPanels
+        ? undefined
+        : {
+            exclude: v.value === PanelFilterType.ExcludePanels,
+            ids: annotation.filter?.ids ?? [],
+          };
+    onUpdate({ ...annotation, filter });
+  };
+
+  const onAddFilterPanelID = (selections: Array<SelectableValue<number>>) => {
+    if (!Array.isArray(selections)) {
+      return;
+    }
+
+    const filter: AnnotationPanelFilter = {
+      exclude: panelFilter === PanelFilterType.ExcludePanels,
+      ids: [],
+    };
+
+    selections.forEach((selection) => selection.value && filter.ids.push(selection.value));
+    onUpdate({ ...annotation, filter });
+  };
+
   const onApply = goBackToList;
 
   const onPreview = () => {
@@ -79,9 +131,30 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
 
   const isNewAnnotation = annotation.name === newAnnotationName;
 
+  const sortFn = (a: SelectableValue<number>, b: SelectableValue<number>) => {
+    if (a.label && b.label) {
+      return a.label.toLowerCase().localeCompare(b.label.toLowerCase());
+    }
+
+    return -1;
+  };
+
+  const panels: Array<SelectableValue<number>> = useMemo(
+    () =>
+      dashboard?.panels
+        .map((panel) => ({
+          value: panel.id,
+          label: panel.title ?? `Panel ${panel.id}`,
+          description: panel.description,
+          imgUrl: config.panels[panel.type].info.logos.small,
+        }))
+        .sort(sortFn) ?? [],
+    [dashboard]
+  );
+
   return (
     <div>
-      <FieldSet>
+      <FieldSet className={styles.settingsForm}>
         <Field label="Name">
           <Input
             aria-label={selectors.pages.Dashboard.Settings.Annotations.Settings.name}
@@ -90,17 +163,10 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
             autoFocus={isNewAnnotation}
             value={annotation.name}
             onChange={onNameChange}
-            width={50}
           />
         </Field>
         <Field label="Data source" htmlFor="data-source-picker">
-          <DataSourcePicker
-            width={50}
-            annotations
-            variables
-            current={annotation.datasource}
-            onChange={onDataSourceChange}
-          />
+          <DataSourcePicker annotations variables current={annotation.datasource} onChange={onDataSourceChange} />
         </Field>
         <Field label="Enabled" description="When enabled the annotation query is issued every dashboard refresh">
           <Checkbox name="enable" id="enable" value={annotation.enable} onChange={onChange} />
@@ -116,6 +182,31 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
             <ColorValueEditor value={annotation?.iconColor} onChange={onColorChange} />
           </HorizontalGroup>
         </Field>
+        <Field label="Show in" aria-label={selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.showInLabel}>
+          <>
+            <Select
+              options={panelFilters}
+              value={panelFilter}
+              onChange={onFilterTypeChange}
+              aria-label={selectors.components.Annotations.annotationsTypeInput}
+            />
+            {panelFilter !== PanelFilterType.AllPanels && (
+              <MultiSelect
+                options={panels}
+                value={panels.filter((panel) => annotation.filter?.ids.includes(panel.value!))}
+                onChange={onAddFilterPanelID}
+                isClearable={true}
+                placeholder="Choose panels"
+                width={100}
+                closeMenuOnSelect={false}
+                className={styles.select}
+                aria-label={selectors.components.Annotations.annotationsChoosePanelInput}
+              />
+            )}
+          </>
+        </Field>
+      </FieldSet>
+      <FieldSet>
         <h3 className="page-heading">Query</h3>
         {ds?.annotations && dsi && (
           <StandardAnnotationQueryEditor
@@ -133,7 +224,11 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
             Delete
           </Button>
         )}
-        <Button variant="secondary" onClick={onPreview}>
+        <Button
+          variant="secondary"
+          onClick={onPreview}
+          data-testid={selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.previewInDashboard}
+        >
           Preview in dashboard
         </Button>
         <Button variant="primary" onClick={onApply}>
@@ -144,8 +239,43 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
   );
 };
 
-AnnotationSettingsEdit.displayName = 'AnnotationSettingsEdit';
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    settingsForm: css({
+      maxWidth: theme.spacing(60),
+      marginBottom: theme.spacing(2),
+    }),
+    select: css`
+      margin-top: 8px;
+    `,
+  };
+};
 
 function goBackToList() {
   locationService.partial({ editIndex: null });
 }
+
+// Synthetic type
+enum PanelFilterType {
+  AllPanels,
+  IncludePanels,
+  ExcludePanels,
+}
+
+const panelFilters = [
+  {
+    label: 'All panels',
+    value: PanelFilterType.AllPanels,
+    description: 'Send the annotation data to all panels that support annotations',
+  },
+  {
+    label: 'Selected panels',
+    value: PanelFilterType.IncludePanels,
+    description: 'Send the annotations to the explicitly listed panels',
+  },
+  {
+    label: 'All panels except',
+    value: PanelFilterType.ExcludePanels,
+    description: 'Do not send annotation data to the following panels',
+  },
+];
diff --git a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
index 1f7432012a2..7a7d1ede798 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
@@ -74,23 +74,11 @@ describe('AnnotationsSettings', () => {
   });
 
   beforeEach(() => {
+    // we have a default build-in annotation
     dashboard = createDashboardModelFixture({
       id: 74,
       version: 7,
-      annotations: {
-        list: [
-          {
-            builtIn: 1,
-            datasource: { uid: 'uid1', type: 'grafana' },
-            enable: true,
-            hide: true,
-            iconColor: 'rgba(0, 211, 255, 1)',
-            name: 'Annotations & Alerts',
-            type: 'dashboard',
-            showIn: 1,
-          },
-        ],
-      },
+      annotations: {},
       links: [],
     });
   });
@@ -99,7 +87,8 @@ describe('AnnotationsSettings', () => {
     setup(dashboard);
 
     expect(screen.queryByRole('grid')).toBeInTheDocument();
-    expect(screen.getByRole('row', { name: /annotations & alerts \(built\-in\) grafana/i })).toBeInTheDocument();
+    expect(screen.getByRole('row', { name: /annotations & alerts \(built-in\) -- grafana --/i })).toBeInTheDocument();
+
     expect(
       screen.getByTestId(selectors.components.CallToActionCard.buttonV2('Add annotation query'))
     ).toBeInTheDocument();
@@ -115,7 +104,7 @@ describe('AnnotationsSettings', () => {
     ).toBeInTheDocument();
   });
 
-  test('it renders the annotation names or uid if annotation doesnt exist', async () => {
+  test('it renders the annotation names or uid if annotation does not exist', async () => {
     dashboard.annotations.list = [
       ...dashboard.annotations.list,
       {
diff --git a/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx b/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx
index ed9a0b3f38c..13c57499f33 100644
--- a/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx
+++ b/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx
@@ -2,6 +2,7 @@ import { css } from '@emotion/css';
 import React, { useEffect, useState } from 'react';
 
 import { AnnotationQuery, EventBus, GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui';
 import { LoadingIndicator } from '@grafana/ui/src/components/PanelChrome/LoadingIndicator';
 
@@ -44,8 +45,17 @@ export const AnnotationPicker = ({ annotation, events, onEnabledChanged }: Annot
   return (
     <div key={annotation.name} className={styles.annotation}>
       <InlineFieldRow>
-        <InlineField label={annotation.name} disabled={loading}>
-          <InlineSwitch value={annotation.enable} onChange={() => onEnabledChanged(annotation)} disabled={loading} />
+        <InlineField
+          label={annotation.name}
+          disabled={loading}
+          data-testid={selectors.pages.Dashboard.SubMenu.Annotations.annotationLabel(annotation.name)}
+        >
+          <InlineSwitch
+            value={annotation.enable}
+            onChange={() => onEnabledChanged(annotation)}
+            disabled={loading}
+            data-testid={selectors.pages.Dashboard.SubMenu.Annotations.annotationToggle(annotation.name)}
+          />
         </InlineField>
         <div className={styles.indicator}>
           <LoadingIndicator loading={loading} onCancel={onCancel} />
diff --git a/public/app/features/dashboard/components/SubMenu/Annotations.tsx b/public/app/features/dashboard/components/SubMenu/Annotations.tsx
index 9ec109780e3..5d950ea06c3 100644
--- a/public/app/features/dashboard/components/SubMenu/Annotations.tsx
+++ b/public/app/features/dashboard/components/SubMenu/Annotations.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 
 import { AnnotationQuery, DataQuery, EventBus } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 
 import { AnnotationPicker } from './AnnotationPicker';
 
@@ -21,7 +22,7 @@ export const Annotations = ({ annotations, onAnnotationChanged, events }: Props)
   }
 
   return (
-    <>
+    <div data-testId={selectors.pages.Dashboard.SubMenu.Annotations.annotationsWrapper}>
       {visibleAnnotations.map((annotation) => (
         <AnnotationPicker
           events={events}
@@ -30,6 +31,6 @@ export const Annotations = ({ annotations, onAnnotationChanged, events }: Props)
           key={annotation.name}
         />
       ))}
-    </>
+    </div>
   );
 };
diff --git a/public/app/features/dashboard/state/DashboardMigrator.test.ts b/public/app/features/dashboard/state/DashboardMigrator.test.ts
index 2b014d77ce4..0e5bf442504 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.test.ts
@@ -2016,8 +2016,8 @@ describe('DashboardModel', () => {
         },
         annotations: {
           list: [
+            // @ts-expect-error
             {
-              // @ts-expect-error
               datasource: null,
             },
             {
diff --git a/public/app/features/dashboard/state/DashboardModel.test.ts b/public/app/features/dashboard/state/DashboardModel.test.ts
index f7b9d8b6faa..bfdfcd9a726 100644
--- a/public/app/features/dashboard/state/DashboardModel.test.ts
+++ b/public/app/features/dashboard/state/DashboardModel.test.ts
@@ -318,13 +318,11 @@ describe('DashboardModel', () => {
           list: [
             {
               datasource: { uid: 'fake-uid', type: 'prometheus' },
-              showIn: 0,
               name: 'Fake annotation',
               type: 'dashboard',
               iconColor: 'rgba(0, 211, 255, 1)',
               enable: true,
               hide: false,
-              builtIn: 0,
             },
           ],
         },
diff --git a/public/app/features/dashboard/state/__fixtures__/dashboardFixtures.ts b/public/app/features/dashboard/state/__fixtures__/dashboardFixtures.ts
index 4565591d01a..9f7a9900a32 100644
--- a/public/app/features/dashboard/state/__fixtures__/dashboardFixtures.ts
+++ b/public/app/features/dashboard/state/__fixtures__/dashboardFixtures.ts
@@ -46,13 +46,12 @@ export function createPanelJSONFixture(panelInput: Partial<Panel | GraphPanel |
 }
 
 export function createAnnotationJSONFixture(annotationInput: Partial<AnnotationQuery>): AnnotationQuery {
+  // @ts-expect-error
   return {
-    builtIn: 0, // ??
     datasource: {
       type: 'foo',
       uid: 'bar',
     },
-    showIn: 2,
     enable: true,
     type: 'anno',
     ...annotationInput,
diff --git a/public/app/features/query/state/DashboardQueryRunner/utils.ts b/public/app/features/query/state/DashboardQueryRunner/utils.ts
index 2e17bf360b2..145e673eb26 100644
--- a/public/app/features/query/state/DashboardQueryRunner/utils.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/utils.ts
@@ -44,8 +44,31 @@ function notifyWithError(title: string, err: any) {
 }
 
 export function getAnnotationsByPanelId(annotations: AnnotationEvent[], panelId?: number) {
+  if (panelId == null) {
+    return annotations;
+  }
+
   return annotations.filter((item) => {
-    if (panelId !== undefined && item.panelId && item.source?.type === 'dashboard') {
+    let source: AnnotationQuery;
+    source = item.source;
+    if (!source) {
+      return true; // should not happen
+    }
+
+    // generic panel filtering
+    if (source.filter) {
+      const includes = (source.filter.ids ?? []).includes(panelId);
+      if (source.filter.exclude) {
+        if (includes) {
+          return false;
+        }
+      } else if (!includes) {
+        return false;
+      }
+    }
+
+    // this is valid for the main 'grafana' datasource
+    if (item.panelId && item.source.type === 'dashboard') {
       return item.panelId === panelId;
     }
     return true;
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 7bf84b28cb1..d453d362986 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -9,7 +9,6 @@ import {
   DataQueryRequest,
   DataQueryResponse,
   DataSourceInstanceSettings,
-  DataSourceRef,
   isValidLiveChannelAddress,
   MutableDataFrame,
   parseLiveChannelAddress,
@@ -25,6 +24,7 @@ import {
   getTemplateSrv,
   StreamingFrameOptions,
 } from '@grafana/runtime';
+import { DataSourceRef } from '@grafana/schema';
 import { migrateDatasourceNameToRef } from 'app/features/dashboard/state/DashboardMigrator';
 
 import { getDashboardSrv } from '../../../features/dashboard/services/DashboardSrv';
@@ -61,7 +61,10 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
           datasource = anno.datasource as DataSourceRef;
         }
 
-        return { ...anno, refId: anno.name, queryType: GrafanaQueryType.Annotations, datasource };
+        // Filter from streaming query conflicts with filter from annotations
+        const { filter, ...rest } = anno;
+
+        return { ...rest, refId: anno.name, queryType: GrafanaQueryType.Annotations, datasource };
       },
     };
   }
diff --git a/public/app/plugins/datasource/grafana/types.ts b/public/app/plugins/datasource/grafana/types.ts
index 435b03a9c22..46c05a22409 100644
--- a/public/app/plugins/datasource/grafana/types.ts
+++ b/public/app/plugins/datasource/grafana/types.ts
@@ -1,5 +1,6 @@
-import { DataQuery, DataFrameJSON } from '@grafana/data';
+import { DataFrameJSON } from '@grafana/data';
 import { LiveDataFilter } from '@grafana/runtime';
+import { DataQuery } from '@grafana/schema';
 import { SearchQuery } from 'app/features/search/service';
 
 //----------------------------------------------
diff --git a/public/app/plugins/panel/graph/event_editor.ts b/public/app/plugins/panel/graph/event_editor.ts
index 6e2dd300036..c64b2c9e2b1 100644
--- a/public/app/plugins/panel/graph/event_editor.ts
+++ b/public/app/plugins/panel/graph/event_editor.ts
@@ -35,7 +35,7 @@ export class EventEditorCtrl {
 
   canDelete(): boolean {
     if (contextSrv.accessControlEnabled()) {
-      if (this.event.source.type === 'dashboard') {
+      if (this.event.source?.type === 'dashboard') {
         return !!this.panelCtrl.dashboard.meta.annotationsPermissions?.dashboard.canDelete;
       }
       return !!this.panelCtrl.dashboard.meta.annotationsPermissions?.organization.canDelete;
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
index a073dc71e0f..15e8d406351 100644
--- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
@@ -3,6 +3,7 @@ import React, { HTMLAttributes, useCallback, useRef, useState } from 'react';
 import { usePopper } from 'react-popper';
 
 import { GrafanaTheme2, dateTimeFormat, systemDateFormats, TimeZone } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { Portal, useStyles2, usePanelContext } from '@grafana/ui';
 import { getTooltipContainerStyles } from '@grafana/ui/src/themes/mixins';
 
@@ -127,6 +128,7 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
         onMouseEnter={onMouseEnter}
         onMouseLeave={onMouseLeave}
         className={!isRegionAnnotation ? styles.markerWrapper : undefined}
+        data-testId={selectors.pages.SoloPanel.Annotations.marker}
       >
         {marker}
       </div>

From 987eff82a35cafd979d2a3c636feddbf9d851d1a Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 18 Apr 2023 14:07:27 -0700
Subject: [PATCH 231/729] FieldValues: Implement array accessors for deprecated
 Vector types (#66807)

---
 .betterer.results                             | 26 ++++++++++---
 .../transformers/calculateField.ts            | 38 +++++++++++--------
 .../transformers/convertFieldType.ts          |  2 +-
 packages/grafana-data/src/types/vector.ts     | 27 +++++++++++++
 .../src/vector/AppendedVectors.test.ts        |  3 ++
 .../src/vector/AppendedVectors.ts             |  5 ++-
 .../grafana-data/src/vector/AsNumberVector.ts | 17 ++-------
 .../src/vector/BinaryOperationVector.test.ts  |  8 +++-
 .../src/vector/BinaryOperationVector.ts       | 29 ++++----------
 .../src/vector/CircularVector.test.ts         |  4 ++
 .../grafana-data/src/vector/CircularVector.ts |  3 ++
 .../src/vector/ConstantVector.test.ts         |  3 +-
 .../grafana-data/src/vector/ConstantVector.ts | 26 ++-----------
 .../src/vector/FormattedVector.ts             | 18 ++-------
 .../grafana-data/src/vector/IndexVector.ts    | 23 +++++------
 packages/grafana-data/src/vector/RowVector.ts | 33 ----------------
 .../src/vector/SortedVector.test.ts           | 13 +++++++
 .../grafana-data/src/vector/SortedVector.ts   |  3 +-
 18 files changed, 137 insertions(+), 144 deletions(-)
 delete mode 100644 packages/grafana-data/src/vector/RowVector.ts
 create mode 100644 packages/grafana-data/src/vector/SortedVector.test.ts

diff --git a/.betterer.results b/.betterer.results
index cf5cc6f394d..d49d92f14c5 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -270,8 +270,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/transformations/transformers/calculateField.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "packages/grafana-data/src/transformations/transformers/ensureColumns.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -497,7 +500,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Do not use any type assertions.", "12"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "13"]
     ],
     "packages/grafana-data/src/utils/OptionsUIBuilders.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -664,15 +669,23 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
+    "packages/grafana-data/src/vector/AsNumberVector.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "packages/grafana-data/src/vector/BinaryOperationVector.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "packages/grafana-data/src/vector/CircularVector.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "packages/grafana-data/src/vector/ConstantVector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "packages/grafana-data/src/vector/FormattedVector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "packages/grafana-data/src/vector/FunctionalVector.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -687,6 +700,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
     ],
+    "packages/grafana-data/src/vector/IndexVector.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "packages/grafana-data/src/vector/SortedVector.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.ts b/packages/grafana-data/src/transformations/transformers/calculateField.ts
index 76d5b515e72..3a5a9218ffc 100644
--- a/packages/grafana-data/src/transformations/transformers/calculateField.ts
+++ b/packages/grafana-data/src/transformations/transformers/calculateField.ts
@@ -3,11 +3,8 @@ import { map } from 'rxjs/operators';
 
 import { getTimeField } from '../../dataframe/processDataFrame';
 import { getFieldDisplayName } from '../../field';
-import { DataFrame, DataTransformerInfo, Field, FieldType, NullValueMode, Vector } from '../../types';
+import { DataFrame, DataTransformerInfo, Field, FieldType, NullValueMode } from '../../types';
 import { BinaryOperationID, binaryOperators } from '../../utils/binaryOperators';
-import { BinaryOperationVector, ConstantVector } from '../../vector';
-import { AsNumberVector } from '../../vector/AsNumberVector';
-import { RowVector } from '../../vector/RowVector';
 import { doStandardCalcs, fieldReducers, ReducerID } from '../fieldReducer';
 import { getFieldMatcher } from '../matchers';
 import { FieldMatcherID } from '../matchers/ids';
@@ -61,7 +58,7 @@ export interface CalculateFieldTransformerOptions {
   // TODO: config?: FieldConfig; or maybe field overrides? since the UI exists
 }
 
-type ValuesCreator = (data: DataFrame) => Vector;
+type ValuesCreator = (data: DataFrame) => any[];
 
 export const calculateFieldTransformer: DataTransformerInfo<CalculateFieldTransformerOptions> = {
   id: DataTransformerID.calculateField,
@@ -181,7 +178,7 @@ function getReduceRowCreator(options: ReduceOptions, allFrames: DataFrame[]): Va
 
   return (frame: DataFrame) => {
     // Find the columns that should be examined
-    const columns: Vector[] = [];
+    const columns: any[] = [];
     for (const field of frame.fields) {
       if (matcher(field, frame, allFrames)) {
         columns.push(field.values);
@@ -189,26 +186,31 @@ function getReduceRowCreator(options: ReduceOptions, allFrames: DataFrame[]): Va
     }
 
     // Prepare a "fake" field for the row
-    const iter = new RowVector(columns);
+    const size = columns.length;
     const row: Field = {
       name: 'temp',
-      values: iter,
+      values: new Array(size),
       type: FieldType.number,
       config: {},
     };
     const vals: number[] = [];
 
     for (let i = 0; i < frame.length; i++) {
-      iter.rowIndex = i;
-      const val = reducer(row, ignoreNulls, nullAsZero)[options.reducer];
-      vals.push(val);
+      for (let j = 0; j < size; j++) {
+        row.values[j] = columns[j][i];
+      }
+      vals.push(reducer(row, ignoreNulls, nullAsZero)[options.reducer]);
     }
 
     return vals;
   };
 }
 
-function findFieldValuesWithNameOrConstant(frame: DataFrame, name: string, allFrames: DataFrame[]): Vector | undefined {
+function findFieldValuesWithNameOrConstant(
+  frame: DataFrame,
+  name: string,
+  allFrames: DataFrame[]
+): number[] | undefined {
   if (!name) {
     return undefined;
   }
@@ -216,7 +218,7 @@ function findFieldValuesWithNameOrConstant(frame: DataFrame, name: string, allFr
   for (const f of frame.fields) {
     if (name === getFieldDisplayName(f, frame, allFrames)) {
       if (f.type === FieldType.boolean) {
-        return new AsNumberVector(f.values);
+        return f.values.map((v) => (v ? 1 : 0));
       }
       return f.values;
     }
@@ -224,7 +226,7 @@ function findFieldValuesWithNameOrConstant(frame: DataFrame, name: string, allFr
 
   const v = parseFloat(name);
   if (!isNaN(v)) {
-    return new ConstantVector(v, frame.length);
+    return new Array(frame.length).fill(v);
   }
 
   return undefined;
@@ -237,10 +239,14 @@ function getBinaryCreator(options: BinaryOptions, allFrames: DataFrame[]): Value
     const left = findFieldValuesWithNameOrConstant(frame, options.left, allFrames);
     const right = findFieldValuesWithNameOrConstant(frame, options.right, allFrames);
     if (!left || !right || !operator) {
-      return undefined as unknown as Vector;
+      return undefined as unknown as any[];
     }
 
-    return new BinaryOperationVector(left, right, operator.operation);
+    const arr = new Array(left.length);
+    for (let i = 0; i < arr.length; i++) {
+      arr[i] = operator.operation(left[i], right[i]);
+    }
+    return arr;
   };
 }
 
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
index ed2340de66a..07ca981597b 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
@@ -147,7 +147,7 @@ function fieldToNumberField(field: Field): Field {
   for (let n = 0; n < numValues.length; n++) {
     let toBeConverted = numValues[n];
 
-    if (valuesAsStrings) {
+    if (valuesAsStrings && toBeConverted != null) {
       // some numbers returned from datasources have commas
       // strip the commas, coerce the string to a number
       toBeConverted = toBeConverted.replace(/,/g, '');
diff --git a/packages/grafana-data/src/types/vector.ts b/packages/grafana-data/src/types/vector.ts
index 29e7fc04d51..b63c7542490 100644
--- a/packages/grafana-data/src/types/vector.ts
+++ b/packages/grafana-data/src/types/vector.ts
@@ -97,3 +97,30 @@ export interface ReadWriteVector<T = any> extends Vector<T> {}
  * @deprecated -- this is now part of the base Vector interface
  */
 export interface MutableVector<T = any> extends ReadWriteVector<T> {}
+
+/**
+ * This is an extremely inefficient Vector wrapper that allows vectors to
+ * be treated as arrays.  We should avoid using this wrapper, but it is helpful
+ * for a clean migration to arrays
+ *
+ * @deprecated
+ */
+export function makeArrayIndexableVector<T extends Vector>(v: T): T {
+  return new Proxy(v, {
+    get(target: Vector, property: string, receiver: Vector) {
+      const idx = +property;
+      if (String(idx) === property) {
+        return target.get(idx);
+      }
+      return Reflect.get(target, property, receiver);
+    },
+    set(target: Vector, property: string, value: any, receiver: Vector) {
+      const idx = +property;
+      if (String(idx) === property) {
+        target.set(idx, value);
+        return true;
+      }
+      return Reflect.set(target, property, value, receiver);
+    },
+  }) as T;
+}
diff --git a/packages/grafana-data/src/vector/AppendedVectors.test.ts b/packages/grafana-data/src/vector/AppendedVectors.test.ts
index 00c1f4272b2..86e54546785 100644
--- a/packages/grafana-data/src/vector/AppendedVectors.test.ts
+++ b/packages/grafana-data/src/vector/AppendedVectors.test.ts
@@ -8,6 +8,9 @@ describe('Check Appending Vector', () => {
     appended.append(new ArrayVector([4, 5, 6]));
     appended.append(new ArrayVector([7, 8, 9]));
     expect(appended.length).toEqual(9);
+    expect(appended[0]).toEqual(1);
+    expect(appended[1]).toEqual(2);
+    expect(appended[100]).toEqual(undefined);
 
     appended.setLength(5);
     expect(appended.length).toEqual(5);
diff --git a/packages/grafana-data/src/vector/AppendedVectors.ts b/packages/grafana-data/src/vector/AppendedVectors.ts
index 805b88fc273..af9873a69c2 100644
--- a/packages/grafana-data/src/vector/AppendedVectors.ts
+++ b/packages/grafana-data/src/vector/AppendedVectors.ts
@@ -1,4 +1,4 @@
-import { Vector } from '../types/vector';
+import { Vector, makeArrayIndexableVector } from '../types/vector';
 
 import { FunctionalVector } from './FunctionalVector';
 import { vectorToArray } from './vectorToArray';
@@ -14,7 +14,7 @@ interface AppendedVectorInfo<T> {
  * RAM -- rather than allocate a new array the size of all previous arrays, this just
  * points the correct index to their original array values
  *
- * @deprecated use a simple Arrays
+ * @deprecated use a simple Arrays.  NOTE this is not used in grafana core
  */
 export class AppendedVectors<T = any> extends FunctionalVector<T> {
   length = 0;
@@ -23,6 +23,7 @@ export class AppendedVectors<T = any> extends FunctionalVector<T> {
   constructor(startAt = 0) {
     super();
     this.length = startAt;
+    return makeArrayIndexableVector(this);
   }
 
   /**
diff --git a/packages/grafana-data/src/vector/AsNumberVector.ts b/packages/grafana-data/src/vector/AsNumberVector.ts
index c51d77179c6..ac8644442be 100644
--- a/packages/grafana-data/src/vector/AsNumberVector.ts
+++ b/packages/grafana-data/src/vector/AsNumberVector.ts
@@ -1,23 +1,14 @@
 import { Vector } from '../types';
 
-import { FunctionalVector } from './FunctionalVector';
-
 /**
  * This will force all values to be numbers
  *
  * @public
- * @deprecated use a simple Arrays
+ * @deprecated use a simple Arrays.  NOTE: Not used in grafana core
  */
-export class AsNumberVector extends FunctionalVector<number> {
-  constructor(private field: Vector) {
+export class AsNumberVector extends Array<number> {
+  constructor(field: Vector) {
     super();
-  }
-
-  get length() {
-    return this.field.length;
-  }
-
-  get(index: number) {
-    return +this.field.get(index);
+    return field.map((v) => +v) as AsNumberVector;
   }
 }
diff --git a/packages/grafana-data/src/vector/BinaryOperationVector.test.ts b/packages/grafana-data/src/vector/BinaryOperationVector.test.ts
index d26ed06d3bb..e59ba476e33 100644
--- a/packages/grafana-data/src/vector/BinaryOperationVector.test.ts
+++ b/packages/grafana-data/src/vector/BinaryOperationVector.test.ts
@@ -11,9 +11,13 @@ describe('ScaledVector', () => {
     const operation = binaryOperators.get(BinaryOperationID.Multiply).operation;
     const v = new BinaryOperationVector(source, new ConstantVector(scale, source.length), operation);
     expect(v.length).toEqual(source.length);
-    //  expect(v.push(10)).toEqual(source.length); // not implemented
-    for (let i = 0; i < 10; i++) {
+    // Accessed with getters
+    for (let i = 0; i < 4; i++) {
       expect(v.get(i)).toEqual(source.get(i) * scale);
     }
+    // Accessed with array index
+    for (let i = 0; i < 4; i++) {
+      expect(v[i]).toEqual(source[i] * scale);
+    }
   });
 });
diff --git a/packages/grafana-data/src/vector/BinaryOperationVector.ts b/packages/grafana-data/src/vector/BinaryOperationVector.ts
index 74453fd6f75..933d3dafe8a 100644
--- a/packages/grafana-data/src/vector/BinaryOperationVector.ts
+++ b/packages/grafana-data/src/vector/BinaryOperationVector.ts
@@ -1,31 +1,18 @@
 import { Vector } from '../types/vector';
 import { BinaryOperation } from '../utils/binaryOperators';
 
-import { FunctionalVector } from './FunctionalVector';
-import { vectorToArray } from './vectorToArray';
-
 /**
  * @public
- * @deprecated use a simple Arrays
+ * @deprecated use a simple Arrays.  NOTE: Not used in grafana core
  */
-export class BinaryOperationVector extends FunctionalVector<number> {
-  constructor(private left: Vector<number>, private right: Vector<number>, private operation: BinaryOperation) {
+export class BinaryOperationVector extends Array<number> {
+  constructor(left: Vector<number>, right: Vector<number>, operation: BinaryOperation) {
     super();
-  }
 
-  get length(): number {
-    return this.left.length;
-  }
-
-  get(index: number): number {
-    return this.operation(this.left.get(index), this.right.get(index));
-  }
-
-  toArray(): number[] {
-    return vectorToArray(this);
-  }
-
-  toJSON(): number[] {
-    return vectorToArray(this);
+    const arr = new Array(left.length);
+    for (let i = 0; i < arr.length; i++) {
+      arr[i] = operation(left[i], right[i]);
+    }
+    return arr as BinaryOperationVector;
   }
 }
diff --git a/packages/grafana-data/src/vector/CircularVector.test.ts b/packages/grafana-data/src/vector/CircularVector.test.ts
index 3ed934e89bc..0c582e8e155 100644
--- a/packages/grafana-data/src/vector/CircularVector.test.ts
+++ b/packages/grafana-data/src/vector/CircularVector.test.ts
@@ -5,6 +5,10 @@ describe('Check Circular Vector', () => {
     const buffer = [1, 2, 3];
     const v = new CircularVector({ buffer }); // tail is default option
     expect(v.toArray()).toEqual([1, 2, 3]);
+    expect(v[0]).toEqual(1);
+    expect(v[1]).toEqual(2);
+    expect(v[2]).toEqual(3);
+    expect(v[3]).toEqual(1); // loops back to one
 
     v.add(4);
     expect(v.toArray()).toEqual([2, 3, 4]);
diff --git a/packages/grafana-data/src/vector/CircularVector.ts b/packages/grafana-data/src/vector/CircularVector.ts
index e3594b25174..aa70ae27578 100644
--- a/packages/grafana-data/src/vector/CircularVector.ts
+++ b/packages/grafana-data/src/vector/CircularVector.ts
@@ -1,3 +1,5 @@
+import { makeArrayIndexableVector } from '../types';
+
 import { FunctionalVector } from './FunctionalVector';
 
 interface CircularOptions<T> {
@@ -34,6 +36,7 @@ export class CircularVector<T = any> extends FunctionalVector<T> {
     if (options.capacity) {
       this.setCapacity(options.capacity);
     }
+    return makeArrayIndexableVector(this);
   }
 
   /**
diff --git a/packages/grafana-data/src/vector/ConstantVector.test.ts b/packages/grafana-data/src/vector/ConstantVector.test.ts
index b1b942209ee..2d94fc34428 100644
--- a/packages/grafana-data/src/vector/ConstantVector.test.ts
+++ b/packages/grafana-data/src/vector/ConstantVector.test.ts
@@ -10,8 +10,9 @@ describe('ConstantVector', () => {
     expect(v.get(1)).toEqual(value);
 
     // Now check all of them
-    for (let i = 0; i < 10; i++) {
+    for (let i = 0; i < 7; i++) {
       expect(v.get(i)).toEqual(value);
+      expect(v[i]).toEqual(value);
     }
   });
 });
diff --git a/packages/grafana-data/src/vector/ConstantVector.ts b/packages/grafana-data/src/vector/ConstantVector.ts
index 5eec8f31abf..65a96ec4143 100644
--- a/packages/grafana-data/src/vector/ConstantVector.ts
+++ b/packages/grafana-data/src/vector/ConstantVector.ts
@@ -1,28 +1,10 @@
-import { FunctionalVector } from './FunctionalVector';
-
 /**
  * @public
- * @deprecated use a simple Arrays
+ * @deprecated use a simple Arrays.  NOTE: Not used in grafana core.
  */
-export class ConstantVector<T = any> extends FunctionalVector<T> {
-  constructor(private value: T, private len: number) {
+export class ConstantVector<T = any> extends Array<T> {
+  constructor(value: T, len: number) {
     super();
-  }
-
-  get length() {
-    return this.len;
-  }
-
-  get(index: number): T {
-    return this.value;
-  }
-
-  toArray(): T[] {
-    const arr = new Array<T>(this.length);
-    return arr.fill(this.value);
-  }
-
-  toJSON(): T[] {
-    return this.toArray();
+    return new Array<T>(len).fill(value) as ConstantVector<T>;
   }
 }
diff --git a/packages/grafana-data/src/vector/FormattedVector.ts b/packages/grafana-data/src/vector/FormattedVector.ts
index a6378221d4f..6dfbf087f6d 100644
--- a/packages/grafana-data/src/vector/FormattedVector.ts
+++ b/packages/grafana-data/src/vector/FormattedVector.ts
@@ -2,23 +2,13 @@ import { DisplayProcessor } from '../types';
 import { Vector } from '../types/vector';
 import { formattedValueToString } from '../valueFormats';
 
-import { FunctionalVector } from './FunctionalVector';
-
 /**
  * @public
- * @deprecated use a simple Arrays
+ * @deprecated use a simple Arrays. NOTE: not used in grafana core.
  */
-export class FormattedVector<T = any> extends FunctionalVector<string> {
-  constructor(private source: Vector<T>, private formatter: DisplayProcessor) {
+export class FormattedVector<T = any> extends Array<string> {
+  constructor(source: Vector<T>, formatter: DisplayProcessor) {
     super();
-  }
-
-  get length() {
-    return this.source.length;
-  }
-
-  get(index: number): string {
-    const v = this.source.get(index);
-    return formattedValueToString(this.formatter(v));
+    return source.map((v) => formattedValueToString(formatter(v))) as FormattedVector<T>;
   }
 }
diff --git a/packages/grafana-data/src/vector/IndexVector.ts b/packages/grafana-data/src/vector/IndexVector.ts
index f69fb51dc5d..c32eb98ca60 100644
--- a/packages/grafana-data/src/vector/IndexVector.ts
+++ b/packages/grafana-data/src/vector/IndexVector.ts
@@ -1,29 +1,26 @@
 import { Field, FieldType } from '../types';
 
-import { FunctionalVector } from './FunctionalVector';
-
 /**
  * IndexVector is a simple vector implementation that returns the index value
  * for each element in the vector.  It is functionally equivolant a vector backed
  * by an array with values: `[0,1,2,...,length-1]`
  *
- * @deprecated use a simple Arrays
+ * @deprecated use a simple Arrays.  NOTE: not used in grafana core
  */
-export class IndexVector extends FunctionalVector<number> {
-  constructor(private len: number) {
+export class IndexVector extends Array<number> {
+  constructor(len: number) {
     super();
-  }
-
-  get length() {
-    return this.len;
-  }
-
-  get(index: number): number {
-    return index;
+    const arr = new Array(len);
+    for (let i = 0; i < len; i++) {
+      arr[i] = i;
+    }
+    return arr as IndexVector;
   }
 
   /**
    * Returns a field representing the range [0 ... length-1]
+   *
+   * @deprecated
    */
   static newField(len: number): Field<number> {
     return {
diff --git a/packages/grafana-data/src/vector/RowVector.ts b/packages/grafana-data/src/vector/RowVector.ts
deleted file mode 100644
index 793c13c0df6..00000000000
--- a/packages/grafana-data/src/vector/RowVector.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Vector } from '../types';
-
-import { FunctionalVector } from './FunctionalVector';
-import { vectorToArray } from './vectorToArray';
-
-/**
- * RowVector makes the row values look like a vector
- * @internal
- * @deprecated use a simple Arrays
- */
-export class RowVector extends FunctionalVector<number> {
-  constructor(private columns: Vector[]) {
-    super();
-  }
-
-  rowIndex = 0;
-
-  get length(): number {
-    return this.columns.length;
-  }
-
-  get(index: number): number {
-    return this.columns[index].get(this.rowIndex);
-  }
-
-  toArray(): number[] {
-    return vectorToArray(this);
-  }
-
-  toJSON(): number[] {
-    return vectorToArray(this);
-  }
-}
diff --git a/packages/grafana-data/src/vector/SortedVector.test.ts b/packages/grafana-data/src/vector/SortedVector.test.ts
new file mode 100644
index 00000000000..c8418e87298
--- /dev/null
+++ b/packages/grafana-data/src/vector/SortedVector.test.ts
@@ -0,0 +1,13 @@
+import { ArrayVector } from './ArrayVector';
+import { SortedVector } from './SortedVector';
+
+describe('SortedVector', () => {
+  it('Should support sorting', () => {
+    const values = new ArrayVector([1, 5, 2, 4]);
+    const sorted = new SortedVector(values, [0, 2, 3, 1]);
+    expect(sorted.toArray()).toEqual([1, 2, 4, 5]);
+
+    // The proxy should still be an instance of SortedVector (used in timeseries)
+    expect(sorted instanceof SortedVector).toBeTruthy();
+  });
+});
diff --git a/packages/grafana-data/src/vector/SortedVector.ts b/packages/grafana-data/src/vector/SortedVector.ts
index 780005c0000..5e3dd5176ba 100644
--- a/packages/grafana-data/src/vector/SortedVector.ts
+++ b/packages/grafana-data/src/vector/SortedVector.ts
@@ -1,4 +1,4 @@
-import { Vector } from '../types/vector';
+import { makeArrayIndexableVector, Vector } from '../types/vector';
 
 import { FunctionalVector } from './FunctionalVector';
 import { vectorToArray } from './vectorToArray';
@@ -11,6 +11,7 @@ import { vectorToArray } from './vectorToArray';
 export class SortedVector<T = any> extends FunctionalVector<T> {
   constructor(private source: Vector<T>, private order: number[]) {
     super();
+    return makeArrayIndexableVector(this);
   }
 
   get length(): number {

From 97a0527b44b00557cb6f9cd355a3ff37e9672c4e Mon Sep 17 00:00:00 2001
From: juanicabanas <juan.cabanas@grafana.com>
Date: Tue, 18 Apr 2023 22:24:56 -0300
Subject: [PATCH 232/729] Variables: Add new format id (#66793)

---
 .../grafana-schema/src/common/common.gen.ts   |  1 +
 .../grafana-schema/src/common/variables.cue   | 36 ++++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index d096dc2cd61..b3d8ac000c1 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -771,6 +771,7 @@ export enum VariableFormatID {
   SQLString = 'sqlstring',
   SingleQuote = 'singlequote',
   Text = 'text',
+  UriEncode = 'uriencode',
 }
 
 export interface DataSourceRef {
diff --git a/packages/grafana-schema/src/common/variables.cue b/packages/grafana-schema/src/common/variables.cue
index 4d706e05257..e16db2f54a1 100644
--- a/packages/grafana-schema/src/common/variables.cue
+++ b/packages/grafana-schema/src/common/variables.cue
@@ -2,36 +2,38 @@ package common
 
 // Optional formats for the template variable replace functions
 // See also https://grafana.com/docs/grafana/latest/dashboards/variables/variable-syntax/#advanced-variable-format-options
-VariableFormatID: 
+VariableFormatID:
     // Values are lucene escaped and multi-valued variables generate an OR expression
-    "lucene" | 
+    "lucene" |
     // Raw values
-    "raw" | 
+    "raw" |
     // Values are regex escaped and multi-valued variables generate a (<value>|<value>) expression
-    "regex" | 
+    "regex" |
     // Values are separated by | character
-    "pipe" | 
+    "pipe" |
     // Multiple values are formatted like variable=value
-    "distributed" | 
+    "distributed" |
     // Comma seperated values
-    "csv" | 
+    "csv" |
     // HTML escaped
-    "html" | 
+    "html" |
     // JSON values
-    "json" | 
+    "json" |
     // Percent encode
-    "percentencode" | 
+    "percentencode" |
+    // Uri encode
+    "uriencode" |
     // Single quote
-    "singlequote" | 
+    "singlequote" |
     // Double quote
-    "doublequote" | 
+    "doublequote" |
     // SQL string quoting and commas for use in IN statements and other scenarios
-    "sqlstring" | 
+    "sqlstring" |
     // Date
-    "date" | 
+    "date" |
     // Format multi-valued variables using glob syntax, example {value1,value2}
-    "glob" | 
+    "glob" |
     // Format variables in their text representation. Example in multi-variable scenario A + B + C.
-    "text" | 
+    "text" |
     // Format variables as URL parameters. Example in multi-variable scenario A + B + C => var-foo=A&var-foo=B&var-foo=C.
-    "queryparam"  @cuetsy(kind="enum",memberNames="Lucene|Raw|Regex|Pipe|Distributed|CSV|HTML|JSON|PercentEncode|SingleQuote|DoubleQuote|SQLString|Date|Glob|Text|QueryParam")
\ No newline at end of file
+    "queryparam"  @cuetsy(kind="enum",memberNames="Lucene|Raw|Regex|Pipe|Distributed|CSV|HTML|JSON|PercentEncode|UriEncode|SingleQuote|DoubleQuote|SQLString|Date|Glob|Text|QueryParam")

From 842ce144292bdf6b51ba2e13961c0986969005e4 Mon Sep 17 00:00:00 2001
From: Alexander Emelin <frvzmb@gmail.com>
Date: Wed, 19 Apr 2023 07:47:15 +0300
Subject: [PATCH 233/729] Live: Update Centrifuge to the latest version
 (#66637)

---
 go.mod                    | 18 ++++++++----------
 go.sum                    | 37 +++++++++++++++++--------------------
 pkg/services/live/live.go | 14 +++++---------
 3 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/go.mod b/go.mod
index 1817e3d7041..32a00ca87b0 100644
--- a/go.mod
+++ b/go.mod
@@ -42,7 +42,7 @@ require (
 	github.com/beevik/etree v1.1.0
 	github.com/benbjohnson/clock v1.3.0
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
-	github.com/centrifugal/centrifuge v0.25.0
+	github.com/centrifugal/centrifuge v0.29.1
 	github.com/crewjam/saml v0.4.12
 	github.com/fatih/color v1.13.0
 	github.com/gchaincl/sqlhooks v1.3.0
@@ -116,11 +116,11 @@ require (
 	golang.org/x/oauth2 v0.6.0
 	golang.org/x/sync v0.1.0
 	golang.org/x/time v0.2.0
-	golang.org/x/tools v0.6.0
+	golang.org/x/tools v0.7.0
 	gonum.org/v1/gonum v0.11.0
 	google.golang.org/api v0.104.0
 	google.golang.org/grpc v1.54.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/protobuf v1.30.0
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/ini.v1 v1.67.0
 	gopkg.in/mail.v2 v2.3.1
@@ -140,14 +140,13 @@ require (
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/FZambia/eagle v0.0.2 // indirect
-	github.com/FZambia/sentinel v1.1.0 // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/andybalholm/brotli v1.0.4
 	github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
-	github.com/centrifugal/protocol v0.8.10 // indirect
+	github.com/centrifugal/protocol v0.10.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
@@ -173,7 +172,6 @@ require (
 	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2
-	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/flatbuffers v2.0.8+incompatible // indirect
 	github.com/googleapis/gax-go/v2 v2.7.0
@@ -197,7 +195,6 @@ require (
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/miekg/dns v1.1.50 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.0 // indirect
-	github.com/mna/redisc v1.3.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
@@ -211,7 +208,7 @@ require (
 	github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect
 	github.com/rs/cors v1.8.3 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
-	github.com/segmentio/encoding v0.3.5
+	github.com/segmentio/encoding v0.3.6 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
@@ -324,9 +321,10 @@ require (
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
 	github.com/rivo/uniseg v0.3.4 // indirect
+	github.com/rueian/rueidis v0.0.100-go1.18 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect
-	github.com/segmentio/asm v1.1.4 // indirect
+	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/shopspring/decimal v1.2.0 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
@@ -397,7 +395,7 @@ require (
 	github.com/yudai/pp v2.0.1+incompatible // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
 
diff --git a/go.sum b/go.sum
index 3636dcde76c..93c875b8518 100644
--- a/go.sum
+++ b/go.sum
@@ -209,8 +209,6 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3
 github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/FZambia/eagle v0.0.2 h1:35qHDuXSQevZ4w9A51k4wU7OE/tPHTEWXoywA93hvkY=
 github.com/FZambia/eagle v0.0.2/go.mod h1:xq6u/JeNZ5/8mrAQ76MMhzNTodASh9FavQlCgg4j48w=
-github.com/FZambia/sentinel v1.1.0 h1:qrCBfxc8SvJihYNjBWgwUI93ZCvFe/PJIPTHKmlp8a8=
-github.com/FZambia/sentinel v1.1.0/go.mod h1:ytL1Am/RLlAoAXG6Kj5LNuw/TRRQrv2rt2FT26vP5gI=
 github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbPSRmHvSXXHOwGRyeXh1jVdquA2G8=
 github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4=
 github.com/HdrHistogram/hdrhistogram-go v1.0.1/go.mod h1:BWJ+nMSHY3L41Zj7CA3uXnloDp7xxV0YvstAE7nKTaM=
@@ -463,10 +461,10 @@ github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+M
 github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/centrifugal/centrifuge v0.25.0 h1:QivFZRPWcN8w3I/gZ8Zs9rMe/KGZoKIS9Kgo1/bY4JE=
-github.com/centrifugal/centrifuge v0.25.0/go.mod h1:bFcSFalnROq/wcFeRiTG+wIbHsxEMW66QUnq95RY1d0=
-github.com/centrifugal/protocol v0.8.10 h1:eezzBIU/4pWyl7a+NUnANYojJBASqbkPZcQh9b8YQRI=
-github.com/centrifugal/protocol v0.8.10/go.mod h1:dlHBjKakr0r+f1pkfwSMfZ+cnpvidN7pQe1ZrsKfhtE=
+github.com/centrifugal/centrifuge v0.29.1 h1:UJ8BjhvJQ2MMi0GQ67qiqohsN4ABU+9IbpLAedk9/zc=
+github.com/centrifugal/centrifuge v0.29.1/go.mod h1:c66vMV0pUDdM3WjXCubTfhLKt9GB0/WYHikxTrAIxLw=
+github.com/centrifugal/protocol v0.10.0 h1:Lac48ATVjVjirYPTHxbSMmiQXXajx7dhARKHy1UOL+A=
+github.com/centrifugal/protocol v0.10.0/go.mod h1:Tq5I1mBpLHkLxNM9gfb3Gth+sTE2kKU5hH3cVgmVs9s=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -1130,8 +1128,6 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219 h1:utua3L2IbQJmauC5IXdEA547bcoU5dozgQAfc8Onsg4=
 github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
-github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws=
-github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
@@ -1772,8 +1768,6 @@ github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mjibson/esc v0.2.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1OPs=
-github.com/mna/redisc v1.3.2 h1:sc9C+nj6qmrTFnsXb70xkjAHpXKtjjBuE6v2UcQV0ZE=
-github.com/mna/redisc v1.3.2/go.mod h1:CplIoaSTDi5h9icnj4FLbRgHoNKCHDNJDVRztWDGeSQ=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs=
 github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
@@ -1872,7 +1866,7 @@ github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDs
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
-github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg=
+github.com/onsi/gomega v1.27.5 h1:T/X6I0RNFw/kTqgfkZPcQ5KU6vCnWNBGdtrIx2dpGeQ=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -2078,6 +2072,8 @@ github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
+github.com/rueian/rueidis v0.0.100-go1.18 h1:uMGspTtI5baJcF7ZUzn9lz58SzY8lhkj02OEGTNUrlg=
+github.com/rueian/rueidis v0.0.100-go1.18/go.mod h1:BQELtOQXfogKB9dqRmbq044YyXjLtKlTN07Ap4ImPgo=
 github.com/russellhaering/goxmldsig v1.2.0 h1:Y6GTTc9Un5hCxSzVz4UIWQ/zuVwDvzJk80guqzwx6Vg=
 github.com/russellhaering/goxmldsig v1.2.0/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
@@ -2105,10 +2101,10 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/securego/gosec v0.0.0-20200203094520-d13bb6d2420c/go.mod h1:gp0gaHj0WlmPh9BdsTmo1aq6C27yIPWdxCKGFGdVKBE=
 github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
-github.com/segmentio/asm v1.1.4 h1:Q/FKBtrgnmDc0YMrurLROqG9mXE6Ndn276EtDnoWtMM=
-github.com/segmentio/asm v1.1.4/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
-github.com/segmentio/encoding v0.3.5 h1:UZEiaZ55nlXGDL92scoVuw00RmiRCazIEmvPSbSvt8Y=
-github.com/segmentio/encoding v0.3.5/go.mod h1:n0JeuIqEQrQoPDGsjo8UNd1iA0U8d8+oHAA4E3G3OxM=
+github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
+github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
+github.com/segmentio/encoding v0.3.6 h1:E6lVLyDPseWEulBmCmAKPanDd3jiyGDo5gMcugCRwZQ=
+github.com/segmentio/encoding v0.3.6/go.mod h1:n0JeuIqEQrQoPDGsjo8UNd1iA0U8d8+oHAA4E3G3OxM=
 github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/sercand/kuberesolver v2.4.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJPl/ZshwPsX/n4Y7u0CW9E7aQIQ=
@@ -2588,8 +2584,8 @@ golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -3044,8 +3040,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
 golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
-golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -3153,8 +3149,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
diff --git a/pkg/services/live/live.go b/pkg/services/live/live.go
index 9e8995bc3bf..f035acfca8a 100644
--- a/pkg/services/live/live.go
+++ b/pkg/services/live/live.go
@@ -106,6 +106,11 @@ func ProvideService(plugCtxProvider *plugincontext.Provider, cfg *setting.Cfg, r
 		LogHandler:       handleLog,
 		LogLevel:         centrifuge.LogLevelError,
 		MetricsNamespace: "grafana_live",
+		// Use reasonably large expiration interval for stream meta key,
+		// much bigger than maximum HistoryLifetime value in Node config.
+		// This way stream meta data will expire, in some cases you may want
+		// to prevent its expiration setting this to zero value.
+		HistoryMetaTTL: 7 * 24 * time.Hour,
 	})
 	if err != nil {
 		return nil, err
@@ -131,14 +136,6 @@ func ProvideService(plugCtxProvider *plugincontext.Provider, cfg *setting.Cfg, r
 
 		broker, err := centrifuge.NewRedisBroker(node, centrifuge.RedisBrokerConfig{
 			Prefix: "gf_live",
-
-			// Use reasonably large expiration interval for stream meta key,
-			// much bigger than maximum HistoryLifetime value in Node config.
-			// This way stream meta data will expire, in some cases you may want
-			// to prevent its expiration setting this to zero value.
-			HistoryMetaTTL: 7 * 24 * time.Hour,
-
-			// And configure a couple of shards to use.
 			Shards: redisShards,
 		})
 		if err != nil {
@@ -283,7 +280,6 @@ func ProvideService(plugCtxProvider *plugincontext.Provider, cfg *setting.Cfg, r
 
 	// Use a pure websocket transport.
 	wsHandler := centrifuge.NewWebsocketHandler(node, centrifuge.WebsocketConfig{
-		ProtocolVersion: centrifuge.ProtocolVersion2,
 		ReadBufferSize:  1024,
 		WriteBufferSize: 1024,
 		CheckOrigin:     checkOrigin,

From bc5881a051262b56ab9285136758ec4667772ba2 Mon Sep 17 00:00:00 2001
From: Ludovic Viaud <ludovic.viaud@gmail.com>
Date: Wed, 19 Apr 2023 17:16:34 +0900
Subject: [PATCH 234/729] Instrumentation: Add plugin service request metric
 (#65527)

* Service request metrics

* Service request metrics
---
 .../backendplugin/instrumentation/instrumentation.go     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg/plugins/backendplugin/instrumentation/instrumentation.go b/pkg/plugins/backendplugin/instrumentation/instrumentation.go
index ae58d9cd593..224c1bc070a 100644
--- a/pkg/plugins/backendplugin/instrumentation/instrumentation.go
+++ b/pkg/plugins/backendplugin/instrumentation/instrumentation.go
@@ -38,6 +38,13 @@ var (
 			Buckets:   []float64{128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576},
 		}, []string{"source", "plugin_id", "endpoint", "target"},
 	)
+
+	PluginRequestDurationSeconds = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		Namespace: "grafana",
+		Name:      "plugin_request_duration_seconds",
+		Help:      "Plugin request duration in seconds",
+		Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25},
+	}, []string{"source", "plugin_id", "endpoint", "status", "target"})
 )
 
 const (
@@ -72,6 +79,8 @@ func instrumentPluginRequest(ctx context.Context, cfg Cfg, pluginCtx *backend.Pl
 	pluginRequestDuration.WithLabelValues(pluginCtx.PluginID, endpoint, string(cfg.Target)).Observe(float64(elapsed / time.Millisecond))
 	pluginRequestCounter.WithLabelValues(pluginCtx.PluginID, endpoint, status, string(cfg.Target)).Inc()
 
+	PluginRequestDurationSeconds.WithLabelValues("grafana-backend", pluginCtx.PluginID, endpoint, string(cfg.Target), status).Observe(elapsed.Seconds())
+
 	if cfg.LogDatasourceRequests {
 		logParams := []interface{}{
 			"status", status,

From 98778289cbf66d794b3f05f87f177bba5ff52322 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Wed, 19 Apr 2023 10:22:24 +0200
Subject: [PATCH 235/729] Catalog: Show install error with incompatible version
 (#65059)

---
 pkg/api/plugins.go                            |  4 ++++
 pkg/plugins/repo/models.go                    |  9 +++++++++
 pkg/plugins/repo/service.go                   |  7 +++----
 public/app/features/plugins/admin/api.ts      |  5 ++++-
 .../InstallControls/InstallControlsButton.tsx | 19 ++++++++++++++-----
 .../admin/components/PluginSubtitle.tsx       | 10 ++++++++--
 .../features/plugins/admin/state/actions.ts   |  5 +++++
 .../app/features/plugins/admin/state/hooks.ts |  8 +++++++-
 8 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go
index b5313141a2c..c628009d458 100644
--- a/pkg/api/plugins.go
+++ b/pkg/api/plugins.go
@@ -469,6 +469,10 @@ func (hs *HTTPServer) InstallPlugin(c *contextmodel.ReqContext) response.Respons
 		if errors.Is(err, plugins.ErrInstallCorePlugin) {
 			return response.Error(http.StatusForbidden, "Cannot install or change a Core plugin", err)
 		}
+		var archError repo.ErrArcNotFound
+		if errors.As(err, &archError) {
+			return response.Error(http.StatusNotFound, archError.Error(), nil)
+		}
 
 		return response.Error(http.StatusInternalServerError, "Failed to install plugin", err)
 	}
diff --git a/pkg/plugins/repo/models.go b/pkg/plugins/repo/models.go
index 080e348108e..35f3153022d 100644
--- a/pkg/plugins/repo/models.go
+++ b/pkg/plugins/repo/models.go
@@ -53,6 +53,15 @@ func (e Response4xxError) Error() string {
 	return fmt.Sprintf("%d", e.StatusCode)
 }
 
+type ErrArcNotFound struct {
+	PluginID   string
+	SystemInfo string
+}
+
+func (e ErrArcNotFound) Error() string {
+	return fmt.Sprintf("%s is not compatible with your system architecture: %s", e.PluginID, e.SystemInfo)
+}
+
 type ErrVersionUnsupported struct {
 	PluginID         string
 	RequestedVersion string
diff --git a/pkg/plugins/repo/service.go b/pkg/plugins/repo/service.go
index 6cd7dec3739..946feb70602 100644
--- a/pkg/plugins/repo/service.go
+++ b/pkg/plugins/repo/service.go
@@ -115,10 +115,9 @@ func (m *Manager) selectVersion(plugin *Plugin, version string, compatOpts Compa
 	var ver Version
 	latestForArch := latestSupportedVersion(plugin, compatOpts)
 	if latestForArch == nil {
-		return nil, ErrVersionUnsupported{
-			PluginID:         plugin.ID,
-			RequestedVersion: version,
-			SystemInfo:       compatOpts.String(),
+		return nil, ErrArcNotFound{
+			PluginID:   plugin.ID,
+			SystemInfo: compatOpts.OSAndArch(),
 		}
 	}
 
diff --git a/public/app/features/plugins/admin/api.ts b/public/app/features/plugins/admin/api.ts
index f99b1fa7d41..73768f9753b 100644
--- a/public/app/features/plugins/admin/api.ts
+++ b/public/app/features/plugins/admin/api.ts
@@ -103,7 +103,10 @@ export async function getLocalPlugins(): Promise<LocalPlugin[]> {
 export async function installPlugin(id: string) {
   // This will install the latest compatible version based on the logic
   // on the backend.
-  return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
+  return await getBackendSrv().post(`${API_ROOT}/${id}/install`, undefined, {
+    // Error is displayed in the page
+    showErrorAlert: false,
+  });
 }
 
 export async function uninstallPlugin(id: string) {
diff --git a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx
index c79e754c0a9..1169c4afbc7 100644
--- a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx
+++ b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import { AppEvents } from '@grafana/data';
@@ -9,7 +9,7 @@ import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { removePluginFromNavTree } from 'app/core/reducers/navBarTree';
 import { useDispatch } from 'app/types';
 
-import { useInstallStatus, useUninstallStatus, useInstall, useUninstall } from '../../state/hooks';
+import { useInstallStatus, useUninstallStatus, useInstall, useUninstall, useUnsetInstall } from '../../state/hooks';
 import { trackPluginInstalled, trackPluginUninstalled } from '../../tracking';
 import { CatalogPlugin, PluginStatus, PluginTabIds, Version } from '../../types';
 
@@ -33,6 +33,7 @@ export function InstallControlsButton({
   const { isUninstalling, error: errorUninstalling } = useUninstallStatus();
   const install = useInstall();
   const uninstall = useUninstall();
+  const unsetInstall = useUnsetInstall();
   const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
   const showConfirmModal = () => setIsConfirmModalVisible(true);
   const hideConfirmModal = () => setIsConfirmModalVisible(false);
@@ -43,10 +44,18 @@ export function InstallControlsButton({
     path: location.pathname,
   };
 
+  useEffect(() => {
+    return () => {
+      // Remove possible installation errors
+      unsetInstall();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const onInstall = async () => {
     trackPluginInstalled(trackingProps);
-    await install(plugin.id, latestCompatibleVersion?.version);
-    if (!errorInstalling) {
+    const result = await install(plugin.id, latestCompatibleVersion?.version);
+    if (!errorInstalling && !('error' in result)) {
       appEvents.emit(AppEvents.alertSuccess, [`Installed ${plugin.name}`]);
       if (plugin.type === 'app') {
         setNeedReload(true);
@@ -115,7 +124,7 @@ export function InstallControlsButton({
   }
 
   return (
-    <Button disabled={isInstalling} onClick={onInstall}>
+    <Button disabled={isInstalling || errorInstalling} onClick={onInstall}>
       {isInstalling ? 'Installing' : 'Install'}
     </Button>
   );
diff --git a/public/app/features/plugins/admin/components/PluginSubtitle.tsx b/public/app/features/plugins/admin/components/PluginSubtitle.tsx
index 192d450a9fd..53393d86d5f 100644
--- a/public/app/features/plugins/admin/components/PluginSubtitle.tsx
+++ b/public/app/features/plugins/admin/components/PluginSubtitle.tsx
@@ -2,11 +2,11 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { Alert, useStyles2 } from '@grafana/ui';
 
 import { InstallControlsWarning } from '../components/InstallControls';
 import { getLatestCompatibleVersion, hasInstallControlWarning } from '../helpers';
-import { useIsRemotePluginsAvailable } from '../state/hooks';
+import { useInstallStatus, useIsRemotePluginsAvailable } from '../state/hooks';
 import { CatalogPlugin, PluginStatus } from '../types';
 
 interface Props {
@@ -16,6 +16,7 @@ interface Props {
 export const PluginSubtitle = ({ plugin }: Props) => {
   const isRemotePluginsAvailable = useIsRemotePluginsAvailable();
   const styles = useStyles2(getStyles);
+  const { error: errorInstalling } = useInstallStatus();
   if (!plugin) {
     return null;
   }
@@ -28,6 +29,11 @@ export const PluginSubtitle = ({ plugin }: Props) => {
 
   return (
     <div className={styles.subtitle}>
+      {errorInstalling && (
+        <Alert title={'message' in errorInstalling ? errorInstalling.message : ''}>
+          {typeof errorInstalling === 'string' ? errorInstalling : errorInstalling.error}
+        </Alert>
+      )}
       {plugin?.description && <div>{plugin?.description}</div>}
       {plugin?.details?.links && plugin.details.links.length > 0 && (
         <span>
diff --git a/public/app/features/plugins/admin/state/actions.ts b/public/app/features/plugins/admin/state/actions.ts
index 9eb4d9003aa..3b604ee5d55 100644
--- a/public/app/features/plugins/admin/state/actions.ts
+++ b/public/app/features/plugins/admin/state/actions.ts
@@ -87,12 +87,17 @@ export const install = createAsyncThunk(
       return { id, changes } as Update<CatalogPlugin>;
     } catch (e) {
       console.error(e);
+      if (isFetchError(e)) {
+        return thunkApi.rejectWithValue(e.data);
+      }
 
       return thunkApi.rejectWithValue('Unknown error.');
     }
   }
 );
 
+export const unsetInstall = createAsyncThunk(`${STATE_PREFIX}/install`, async () => ({}));
+
 export const uninstall = createAsyncThunk(`${STATE_PREFIX}/uninstall`, async (id: string, thunkApi) => {
   try {
     await uninstallPlugin(id);
diff --git a/public/app/features/plugins/admin/state/hooks.ts b/public/app/features/plugins/admin/state/hooks.ts
index 5d2277b1604..98fd4a43972 100644
--- a/public/app/features/plugins/admin/state/hooks.ts
+++ b/public/app/features/plugins/admin/state/hooks.ts
@@ -6,7 +6,7 @@ import { useDispatch, useSelector } from 'app/types';
 import { sortPlugins, Sorters } from '../helpers';
 import { CatalogPlugin, PluginListDisplayMode } from '../types';
 
-import { fetchAll, fetchDetails, fetchRemotePlugins, install, uninstall, fetchAllLocal } from './actions';
+import { fetchAll, fetchDetails, fetchRemotePlugins, install, uninstall, fetchAllLocal, unsetInstall } from './actions';
 import { setDisplayMode } from './reducer';
 import {
   find,
@@ -74,6 +74,12 @@ export const useInstall = () => {
   return (id: string, version?: string, isUpdating?: boolean) => dispatch(install({ id, version, isUpdating }));
 };
 
+export const useUnsetInstall = () => {
+  const dispatch = useDispatch();
+
+  return () => dispatch(unsetInstall());
+};
+
 export const useUninstall = () => {
   const dispatch = useDispatch();
 

From 82a6c8a647620831d1bc56afcad8c2e211517598 Mon Sep 17 00:00:00 2001
From: Gareth Dawson <gareth.dawson@grafana.com>
Date: Wed, 19 Apr 2023 09:30:09 +0100
Subject: [PATCH 236/729] Elastic: Store index in jsonData (#62808)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(typescript): read and write index to jsonData

* feat(go): read index from jsonData

* clear database column when index-name is updated

* Update public/app/plugins/datasource/elasticsearch/datasource.ts

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>

* Update public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>

* add indexChangeHandler function

* fix

* fix failing tests

* fix

* fix

---------

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
---
 pkg/tsdb/elasticsearch/elasticsearch.go       | 10 ++++++++-
 .../configuration/ElasticDetails.test.tsx     |  6 ++---
 .../configuration/ElasticDetails.tsx          | 22 +++++++++++--------
 .../datasource/elasticsearch/datasource.ts    |  2 +-
 .../plugins/datasource/elasticsearch/types.ts |  1 +
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go
index 5b445cd6b1a..ccdf101e555 100644
--- a/pkg/tsdb/elasticsearch/elasticsearch.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch.go
@@ -108,6 +108,14 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			timeInterval = ""
 		}
 
+		index, ok := jsonData["index"].(string)
+		if !ok {
+			index = ""
+		}
+		if index == "" {
+			index = settings.Database
+		}
+
 		var maxConcurrentShardRequests float64
 
 		switch v := jsonData["maxConcurrentShardRequests"].(type) {
@@ -142,7 +150,7 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			ID:                         settings.ID,
 			URL:                        settings.URL,
 			HTTPClient:                 httpCli,
-			Database:                   settings.Database,
+			Database:                   index,
 			MaxConcurrentShardRequests: int64(maxConcurrentShardRequests),
 			ConfiguredFields:           configuredFields,
 			Interval:                   interval,
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx
index 470128711bd..42c69cd9cd9 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx
@@ -22,8 +22,7 @@ describe('ElasticDetails', () => {
 
     expect(onChangeMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        database: '[logstash-]YYYY.MM.DD',
-        jsonData: expect.objectContaining({ interval: 'Daily' }),
+        jsonData: expect.objectContaining({ interval: 'Daily', index: '[logstash-]YYYY.MM.DD' }),
       })
     );
   });
@@ -39,8 +38,7 @@ describe('ElasticDetails', () => {
 
     expect(onChangeMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        database: '[logstash-]YYYY.MM',
-        jsonData: expect.objectContaining({ interval: 'Monthly' }),
+        jsonData: expect.objectContaining({ interval: 'Monthly', index: '[logstash-]YYYY.MM' }),
       })
     );
   });
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
index 0f0639f9238..687891ed154 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
@@ -25,8 +25,8 @@ export const ElasticDetails = ({ value, onChange }: Props) => {
         <InlineField label="Index name" labelWidth={26}>
           <Input
             id="es_config_indexName"
-            value={value.database || ''}
-            onChange={changeHandler('database', value, onChange)}
+            value={value.jsonData.index ?? (value.database || '')}
+            onChange={indexChangeHandler(value, onChange)}
             width={24}
             placeholder="es-index-name"
             required
@@ -108,13 +108,16 @@ export const ElasticDetails = ({ value, onChange }: Props) => {
   );
 };
 
-// TODO: Use change handlers from @grafana/data
-const changeHandler =
-  (key: keyof DataSourceSettings<ElasticsearchOptions>, value: Props['value'], onChange: Props['onChange']) =>
+const indexChangeHandler =
+  (value: Props['value'], onChange: Props['onChange']) =>
   (event: React.SyntheticEvent<HTMLInputElement | HTMLSelectElement>) => {
     onChange({
       ...value,
-      [key]: event.currentTarget.value,
+      database: '',
+      jsonData: {
+        ...value.jsonData,
+        index: event.currentTarget.value,
+      },
     });
   };
 
@@ -145,11 +148,11 @@ const jsonDataSwitchChangeHandler =
 
 const intervalHandler =
   (value: Props['value'], onChange: Props['onChange']) => (option: SelectableValue<Interval | 'none'>) => {
-    const { database } = value;
     // If option value is undefined it will send its label instead so we have to convert made up value to undefined here.
     const newInterval = option.value === 'none' ? undefined : option.value;
 
-    if (!database || database.length === 0 || database.startsWith('[logstash-]')) {
+    const currentIndex = value.jsonData.index ?? value.database;
+    if (!currentIndex || currentIndex.length === 0 || currentIndex.startsWith('[logstash-]')) {
       let newDatabase = '';
 
       if (newInterval !== undefined) {
@@ -162,9 +165,10 @@ const intervalHandler =
 
       onChange({
         ...value,
-        database: newDatabase,
+        database: '',
         jsonData: {
           ...value.jsonData,
+          index: newDatabase,
           interval: newInterval,
         },
       });
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index d296ae50a56..059d99f2e86 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -115,10 +115,10 @@ export class ElasticDatasource
     this.withCredentials = instanceSettings.withCredentials;
     this.url = instanceSettings.url!;
     this.name = instanceSettings.name;
-    this.index = instanceSettings.database ?? '';
     this.isProxyAccess = instanceSettings.access === 'proxy';
     const settingsData = instanceSettings.jsonData || ({} as ElasticsearchOptions);
 
+    this.index = settingsData.index ?? instanceSettings.database ?? '';
     this.timeField = settingsData.timeField;
     this.xpack = Boolean(settingsData.xpack);
     this.indexPattern = new IndexPattern(this.index, settingsData.interval);
diff --git a/public/app/plugins/datasource/elasticsearch/types.ts b/public/app/plugins/datasource/elasticsearch/types.ts
index 1226818adda..ecb44373041 100644
--- a/public/app/plugins/datasource/elasticsearch/types.ts
+++ b/public/app/plugins/datasource/elasticsearch/types.ts
@@ -62,6 +62,7 @@ export interface ElasticsearchOptions extends DataSourceJsonData {
   logLevelField?: string;
   dataLinks?: DataLinkConfig[];
   includeFrozen?: boolean;
+  index?: string;
 }
 
 interface MetricConfiguration<T extends MetricAggregationType> {

From b47b8798d3a8baa1db0e86b738f17c7bd1e05997 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matyax@gmail.com>
Date: Wed, 19 Apr 2023 11:03:45 +0200
Subject: [PATCH 237/729] Logs Context: Always display context toggle (#66379)

* Loki search words: process negative expressions as negative search words

* Revert "Loki search words: process negative expressions as negative search words"

This reverts commit d875b25049b2f58f5ad382824cf68c375582aff7.

* Logs Context: always display
---
 public/app/plugins/datasource/loki/datasource.test.ts | 8 ++++++++
 public/app/plugins/datasource/loki/datasource.ts      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index ad3e48e7944..e9c275581aa 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -1142,6 +1142,14 @@ describe('Variable support', () => {
   });
 });
 
+describe('showContextToggle()', () => {
+  it('always displays logs context', () => {
+    const ds = createLokiDatasource(templateSrvStub);
+
+    expect(ds.showContextToggle()).toBe(true);
+  });
+});
+
 function assertAdHocFilters(query: string, expectedResults: string, ds: LokiDatasource) {
   const lokiQuery: LokiQuery = { refId: 'A', expr: query };
   const result = ds.addAdHocFilters(lokiQuery.expr);
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index f615db3e723..cd4dba02ca8 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -755,7 +755,7 @@ export class LokiDatasource
   }
 
   showContextToggle(row?: LogRowModel): boolean {
-    return (row && row.searchWords && row.searchWords.length > 0) === true;
+    return true;
   }
 
   processError(err: FetchError, target: LokiQuery) {

From 5c129455f610391edb5d5c9bbb2c4f004302227a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 19 Apr 2023 11:10:03 +0200
Subject: [PATCH 238/729] PluginBrowse: Fix double margin due to paragraph tag
 inside description (#66776)

---
 public/app/features/plugins/admin/pages/Browse.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/app/features/plugins/admin/pages/Browse.tsx b/public/app/features/plugins/admin/pages/Browse.tsx
index 61cb863e675..f6996282216 100644
--- a/public/app/features/plugins/admin/pages/Browse.tsx
+++ b/public/app/features/plugins/admin/pages/Browse.tsx
@@ -65,12 +65,15 @@ export default function Browse({ route }: GrafanaRouteComponentProps): ReactElem
   }
 
   const subTitle = config.featureToggles.dataConnectionsConsole ? (
-    <p>
+    <div>
       Extend the Grafana experience with panel plugins and apps. To find more data sources go to{' '}
-      <a href={`${CONNECTIONS_ROUTES.ConnectData}?cat=data-source`}>Connections</a>.
-    </p>
+      <a className="external-link" href={`${CONNECTIONS_ROUTES.ConnectData}?cat=data-source`}>
+        Connections
+      </a>
+      .
+    </div>
   ) : (
-    <p>Extend the Grafana experience with panel plugins and apps.</p>
+    <div>Extend the Grafana experience with panel plugins and apps.</div>
   );
 
   return (

From ba92f6f98aa0fff92f8ee07a08b031cd6fc38fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 19 Apr 2023 12:10:57 +0200
Subject: [PATCH 239/729] AppRootPage: Reduce flickering while loading plugin
 (#66799)

* AppRootPage: Reduce flickering while loading

* Use current layout
---
 .../app/core/components/AppChrome/AppChromeService.tsx |  3 ++-
 public/app/features/plugins/components/AppRootPage.tsx | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/app/core/components/AppChrome/AppChromeService.tsx b/public/app/core/components/AppChrome/AppChromeService.tsx
index f2fa78f168f..32f23a690df 100644
--- a/public/app/core/components/AppChrome/AppChromeService.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.tsx
@@ -32,7 +32,7 @@ export class AppChromeService {
     sectionNav: { node: { text: t('nav.home.title', 'Home') }, main: { text: '' } },
     searchBarHidden: store.getBool(this.searchBarStorageKey, false),
     kioskMode: null,
-    layout: PageLayoutType.Standard,
+    layout: PageLayoutType.Canvas,
   });
 
   setMatchedRoute(route: RouteDescriptor) {
@@ -77,6 +77,7 @@ export class AppChromeService {
     if (newState.sectionNav !== current.sectionNav || newState.pageNav !== current.pageNav) {
       if (
         newState.actions === current.actions &&
+        newState.layout === current.layout &&
         navItemsAreTheSame(newState.sectionNav.node, current.sectionNav.node) &&
         navItemsAreTheSame(newState.pageNav, current.pageNav)
       ) {
diff --git a/public/app/features/plugins/components/AppRootPage.tsx b/public/app/features/plugins/components/AppRootPage.tsx
index da1132db22a..c27159a4ed7 100644
--- a/public/app/features/plugins/components/AppRootPage.tsx
+++ b/public/app/features/plugins/components/AppRootPage.tsx
@@ -7,6 +7,7 @@ import { AppEvents, AppPlugin, AppPluginMeta, NavModel, NavModelItem, PluginType
 import { config, locationSearchToObject } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
+import { useGrafana } from 'app/core/context/GrafanaContext';
 import { appEvents } from 'app/core/core';
 import { getNotFoundNav, getWarningNav, getExceptionNav } from 'app/core/navigation/errorModels';
 
@@ -41,6 +42,7 @@ export function AppRootPage({ pluginId, pluginNavSection }: Props) {
   const navModel = buildPluginSectionNav(pluginNavSection, pluginNav, currentUrl);
   const queryParams = useMemo(() => locationSearchToObject(location.search), [location.search]);
   const context = useMemo(() => buildPluginPageContext(navModel), [navModel]);
+  const grafanaContext = useGrafana();
 
   useEffect(() => {
     loadAppPlugin(pluginId, dispatch);
@@ -52,7 +54,13 @@ export function AppRootPage({ pluginId, pluginNavSection }: Props) {
   );
 
   if (!plugin || pluginId !== plugin.meta.id) {
-    return <Page navModel={navModel}>{loading && <PageLoader />}</Page>;
+    // Use current layout while loading to reduce flickering
+    const currentLayout = grafanaContext.chrome.state.getValue().layout;
+    return (
+      <Page navModel={navModel} pageNav={{ text: '' }} layout={currentLayout}>
+        {loading && <PageLoader />}
+      </Page>
+    );
   }
 
   if (!plugin.root) {

From c13ec0fc1507ea0fe909b7710a96dc8b836370f0 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:58:00 +0100
Subject: [PATCH 240/729] Tracing: Span filters reset filters and button
 (#66781)

* Reset filters and button

* Add tests
---
 .../NewTracePageSearchBar.test.tsx            | 13 ++-
 .../TracePageHeader/NewTracePageSearchBar.tsx | 97 +++++++++++++------
 .../SpanFilters/SpanFilters.test.tsx          | 23 +++++
 .../SpanFilters/SpanFilters.tsx               | 23 ++++-
 4 files changed, 117 insertions(+), 39 deletions(-)

diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
index 5fd328bbe29..fdc550211d9 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
@@ -27,22 +27,25 @@ const defaultProps = {
 describe('<NewTracePageSearchBar>', () => {
   it('renders buttons', () => {
     render(<NewTracePageSearchBar {...(defaultProps as unknown as TracePageSearchBarProps)} />);
-    const nextResButton = screen.queryByRole('button', { name: 'Next result button' });
-    const prevResButton = screen.queryByRole('button', { name: 'Prev result button' });
+    const nextResButton = screen.getByRole('button', { name: 'Next result button' });
+    const prevResButton = screen.getByRole('button', { name: 'Prev result button' });
+    const resetFiltersButton = screen.getByRole('button', { name: 'Reset filters button' });
     expect(nextResButton).toBeInTheDocument();
     expect(prevResButton).toBeInTheDocument();
+    expect(resetFiltersButton).toBeInTheDocument();
     expect((nextResButton as HTMLButtonElement)['disabled']).toBe(true);
     expect((prevResButton as HTMLButtonElement)['disabled']).toBe(true);
+    expect((resetFiltersButton as HTMLButtonElement)['disabled']).toBe(true);
   });
 
-  it('renders buttons that can be used to search if filters added', () => {
+  it('renders buttons that can be used to search if results found', () => {
     const props = {
       ...defaultProps,
       spanFilterMatches: new Set(['2ed38015486087ca']),
     };
     render(<NewTracePageSearchBar {...(props as unknown as TracePageSearchBarProps)} />);
-    const nextResButton = screen.queryByRole('button', { name: 'Next result button' });
-    const prevResButton = screen.queryByRole('button', { name: 'Prev result button' });
+    const nextResButton = screen.getByRole('button', { name: 'Next result button' });
+    const prevResButton = screen.getByRole('button', { name: 'Prev result button' });
     expect(nextResButton).toBeInTheDocument();
     expect(prevResButton).toBeInTheDocument();
     expect((nextResButton as HTMLButtonElement)['disabled']).toBe(false);
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
index e6788659b47..c0ffd8460d3 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
@@ -13,12 +13,13 @@
 // limitations under the License.
 
 import { css } from '@emotion/css';
-import React, { memo, Dispatch, SetStateAction, useEffect } from 'react';
+import React, { memo, Dispatch, SetStateAction, useEffect, useMemo } from 'react';
 
 import { config, reportInteraction } from '@grafana/runtime';
 import { Button, useStyles2 } from '@grafana/ui';
 
 import { SearchProps } from '../../useSearch';
+import { convertTimeFilter } from '../utils/filter-spans';
 
 export type TracePageSearchBarProps = {
   search: SearchProps;
@@ -27,10 +28,11 @@ export type TracePageSearchBarProps = {
   focusedSpanIdForSearch: string;
   setFocusedSpanIdForSearch: Dispatch<SetStateAction<string>>;
   datasourceType: string;
+  reset: () => void;
 };
 
 export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProps) {
-  const { search, spanFilterMatches, focusedSpanIdForSearch, setFocusedSpanIdForSearch, datasourceType } = props;
+  const { search, spanFilterMatches, focusedSpanIdForSearch, setFocusedSpanIdForSearch, datasourceType, reset } = props;
   const styles = useStyles2(getStyles);
 
   useEffect(() => {
@@ -77,34 +79,60 @@ export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProp
     setFocusedSpanIdForSearch(spanMatches[prevMatchedIndex - 1]);
   };
 
+  const resetEnabled = useMemo(() => {
+    return (
+      (search.serviceName && search.serviceName !== '') ||
+      (search.spanName && search.spanName !== '') ||
+      convertTimeFilter(search.from || '') ||
+      convertTimeFilter(search.to || '') ||
+      search.tags.length > 1 ||
+      search.tags.some((tag) => {
+        return tag.key;
+      })
+    );
+  }, [search.serviceName, search.spanName, search.from, search.to, search.tags]);
   const buttonEnabled = spanFilterMatches && spanFilterMatches?.size > 0;
 
   return (
     <div className={styles.searchBar}>
-      <>
-        <Button
-          className={styles.button}
-          variant="secondary"
-          disabled={!buttonEnabled}
-          type="button"
-          fill={'outline'}
-          aria-label="Prev result button"
-          onClick={prevResult}
-        >
-          Prev
-        </Button>
-        <Button
-          className={styles.button}
-          variant="secondary"
-          disabled={!buttonEnabled}
-          type="button"
-          fill={'outline'}
-          aria-label="Next result button"
-          onClick={nextResult}
-        >
-          Next
-        </Button>
-      </>
+      <div className={styles.buttons}>
+        <>
+          <div className={styles.resetButton}>
+            <Button
+              variant="destructive"
+              disabled={!resetEnabled}
+              type="button"
+              fill="outline"
+              aria-label="Reset filters button"
+              onClick={reset}
+            >
+              Reset
+            </Button>
+          </div>
+          <div className={styles.nextPrevButtons}>
+            <Button
+              variant="secondary"
+              disabled={!buttonEnabled}
+              type="button"
+              fill="outline"
+              aria-label="Prev result button"
+              onClick={prevResult}
+            >
+              Prev
+            </Button>
+            <Button
+              variant="secondary"
+              disabled={!buttonEnabled}
+              type="button"
+              fill="outline"
+              aria-label="Next result button"
+              onClick={nextResult}
+            >
+              Next
+            </Button>
+          </div>
+        </>
+      </div>
     </div>
   );
 });
@@ -112,12 +140,23 @@ export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProp
 export const getStyles = () => {
   return {
     searchBar: css`
+      display: inline;
+    `,
+    buttons: css`
       display: flex;
       justify-content: flex-end;
-      margin-top: 5px;
+      margin: 5px 0 0 0;
     `,
-    button: css`
-      margin-left: 8px;
+    resetButton: css`
+      order: 1;
+    `,
+    nextPrevButtons: css`
+      margin-left: auto;
+      order: 2;
+
+      button {
+        margin-left: 8px;
+      }
     `,
   };
 };
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
index 12672b5c20a..857398e7739 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
@@ -162,6 +162,29 @@ describe('SpanFilters', () => {
     jest.advanceTimersByTime(1000);
     expect(screen.getAllByLabelText('Select tag key').length).toBe(1);
   });
+
+  it('should allow resetting filters', async () => {
+    render(<SpanFiltersWithProps />);
+    const resetFiltersButton = screen.getByRole('button', { name: 'Reset filters button' });
+    expect(resetFiltersButton).toBeInTheDocument();
+    expect((resetFiltersButton as HTMLButtonElement)['disabled']).toBe(true);
+
+    const serviceValue = screen.getByLabelText('Select service name');
+    const spanValue = screen.getByLabelText('Select span name');
+    const tagKey = screen.getByLabelText('Select tag key');
+    const tagValue = screen.getByLabelText('Select tag value');
+    await selectAndCheckValue(user, serviceValue, 'Service0');
+    await selectAndCheckValue(user, spanValue, 'Span0');
+    await selectAndCheckValue(user, tagKey, 'TagKey0');
+    await selectAndCheckValue(user, tagValue, 'TagValue0');
+
+    expect((resetFiltersButton as HTMLButtonElement)['disabled']).toBe(false);
+    await user.click(resetFiltersButton);
+    expect(screen.queryByText('Service0')).not.toBeInTheDocument();
+    expect(screen.queryByText('Span0')).not.toBeInTheDocument();
+    expect(screen.queryByText('TagKey0')).not.toBeInTheDocument();
+    expect(screen.queryByText('TagValue0')).not.toBeInTheDocument();
+  });
 });
 
 const selectAndCheckValue = async (user: ReturnType<typeof userEvent.setup>, elem: HTMLElement, text: string) => {
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
index cf082ed06e1..829c1778fb5 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
@@ -14,7 +14,7 @@
 
 import { css } from '@emotion/css';
 import { uniq } from 'lodash';
-import React, { useState, memo } from 'react';
+import React, { useState, useEffect, memo, useCallback } from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
 import { AccessoryButton } from '@grafana/experimental';
@@ -30,7 +30,7 @@ import {
   useStyles2,
 } from '@grafana/ui';
 
-import { randomId, SearchProps, Tag } from '../../../useSearch';
+import { defaultFilters, randomId, SearchProps, Tag } from '../../../useSearch';
 import { Trace } from '../../types';
 import NewTracePageSearchBar from '../NewTracePageSearchBar';
 
@@ -64,6 +64,18 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
   const [tagKeys, setTagKeys] = useState<Array<SelectableValue<string>>>();
   const [tagValues, setTagValues] = useState<{ [key: string]: Array<SelectableValue<string>> }>({});
 
+  const reset = useCallback(() => {
+    setServiceNames(undefined);
+    setSpanNames(undefined);
+    setTagKeys(undefined);
+    setTagValues({});
+    setSearch(defaultFilters);
+  }, [setSearch]);
+
+  useEffect(() => {
+    reset();
+  }, [reset, trace]);
+
   if (!trace) {
     return null;
   }
@@ -237,7 +249,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
                 onOpenMenu={getServiceNames}
                 options={serviceNames}
                 placeholder="All service names"
-                value={search.serviceName}
+                value={search.serviceName || null}
               />
             </HorizontalGroup>
           </InlineField>
@@ -258,7 +270,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
                 onOpenMenu={getSpanNames}
                 options={spanNames}
                 placeholder="All span names"
-                value={search.spanName}
+                value={search.spanName || null}
               />
             </HorizontalGroup>
           </InlineField>
@@ -309,7 +321,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
                       onOpenMenu={getTagKeys}
                       options={tagKeys}
                       placeholder="Select tag"
-                      value={tag.key}
+                      value={tag.key || null}
                     />
                     <Select
                       aria-label={`Select tag operator`}
@@ -374,6 +386,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
           focusedSpanIdForSearch={focusedSpanIdForSearch}
           setFocusedSpanIdForSearch={setFocusedSpanIdForSearch}
           datasourceType={datasourceType}
+          reset={reset}
         />
       </Collapse>
     </div>

From ee247e33b4e3887d3c0623a3f33b6416fc7b4c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 19 Apr 2023 13:47:55 +0200
Subject: [PATCH 241/729] AngularMigration: Clear old angular panel props when
 auto migrating (#66719)

* AngularMigration: Clear old angular panel props when auto migrating

* Update test name
---
 .betterer.results                             |  4 +-
 .../dashboard/state/PanelModel.test.ts        | 38 +++++++++++++++++++
 .../features/dashboard/state/PanelModel.ts    | 18 +++++----
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index d49d92f14c5..38d4720c438 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2592,7 +2592,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
     ],
     "public/app/features/dashboard/state/PanelModel.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts
index 70aa401a1bd..ba83da44802 100644
--- a/public/app/features/dashboard/state/PanelModel.test.ts
+++ b/public/app/features/dashboard/state/PanelModel.test.ts
@@ -352,6 +352,44 @@ describe('PanelModel', () => {
       });
     });
 
+    describe('when autoMigrateFrom angular to react', () => {
+      const onPanelTypeChanged = (panel: PanelModel, prevPluginId: string, prevOptions: Record<string, any>) => {
+        panel.fieldConfig = { defaults: { unit: 'bytes' }, overrides: [] };
+        return { name: prevOptions.angular.oldName };
+      };
+
+      const reactPlugin = getPanelPlugin({ id: 'timeseries' })
+        .setPanelChangeHandler(onPanelTypeChanged as any)
+        .useFieldConfig({
+          disableStandardOptions: [FieldConfigProperty.Thresholds],
+        })
+        .setPanelOptions((builder) => {
+          builder.addTextInput({
+            name: 'Name',
+            path: 'name',
+          });
+        });
+
+      beforeEach(() => {
+        model = new PanelModel({
+          autoMigrateFrom: 'graph',
+          oldName: 'old name',
+          type: 'timeseries',
+        });
+
+        model.pluginLoaded(reactPlugin);
+      });
+
+      it('should run panel changed handler and remove old model props', () => {
+        expect(model.options).toEqual({ name: 'old name' });
+        expect(model.fieldConfig).toEqual({ defaults: { unit: 'bytes' }, overrides: [] });
+        expect(model.autoMigrateFrom).toBe(undefined);
+        expect(model.oldName).toBe(undefined);
+        expect(model.plugin).toBe(reactPlugin);
+        expect(model.type).toBe('timeseries');
+      });
+    });
+
     describe('variables interpolation', () => {
       let panelQueryRunner: any;
 
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index bbb3f10e42f..a38cafe238d 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -416,18 +416,22 @@ export class PanelModel implements DataConfigSource, IPanelModel {
 
   pluginLoaded(plugin: PanelPlugin) {
     this.plugin = plugin;
+
     const version = getPluginVersion(plugin);
 
     if (this.autoMigrateFrom) {
       const wasAngular = autoMigrateAngular[this.autoMigrateFrom] != null;
-      this.callPanelTypeChangeHandler(
-        plugin,
-        this.autoMigrateFrom,
-        this.getOptionsToRemember(), // old options
-        wasAngular
-      );
+      const oldOptions = this.getOptionsToRemember();
+      const prevPluginId = this.autoMigrateFrom;
+      const newPluginId = this.type;
 
-      delete this.autoMigrateFrom;
+      this.clearPropertiesBeforePluginChange();
+
+      // Need to set these again as they get cleared by the above function
+      this.type = newPluginId;
+      this.plugin = plugin;
+
+      this.callPanelTypeChangeHandler(plugin, prevPluginId, oldOptions, wasAngular);
     }
 
     if (plugin.onPanelMigration) {

From c7af53b79f2719d1ce66b306e377e0492e92a58a Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Wed, 19 Apr 2023 15:08:09 +0200
Subject: [PATCH 242/729] [Under FF] New DS Picker with advance mode (#66566)

* Add a wrapper to switch between the previous and new DS picker depending on the feature toggle advancedDataSourcePicker.

* Add a new component to represent the modal DS picker, which we will refer as advanced DS picker
Integrate this into the Edit panel, for now, until we're ready to replace everywhere the grafana-runtime DS picker by the wrapper.

* Replace Drawer component with the dropdown

* Adjust the first version of the styles to fit into this Figma design

* Adjust the design of the FileDropzoneDefaultChildren to match with the new DS modal but everywhere else is used nowadays.

---------

Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
---
 .github/CODEOWNERS                            |   1 -
 .../components/FileDropzone/FileDropzone.tsx  |  64 +++--
 .../DataSourceDrawer.test.ts                  |  37 ---
 .../datasource-drawer/DataSourceDrawer.tsx    | 161 -------------
 .../components/DataSourceCard.tsx             |  38 ---
 .../components/picker/DataSourceCard.tsx      |  54 +++++
 .../components/picker/DataSourceDropdown.tsx  | 223 ++++++++++++++++++
 .../components/picker/DataSourceList.tsx      | 119 ++++++++++
 .../components/picker/DataSourceLogo.tsx}     |  29 +--
 .../components/picker/DataSourceModal.tsx     | 160 +++++++++++++
 .../components/picker/DataSourcePicker.tsx    |  25 ++
 .../components/picker/DataSourcePickerNG.tsx} |  17 +-
 .../DataSourcePickerWithHistory.test.ts       |   0
 .../picker}/DataSourcePickerWithHistory.tsx   |   2 +-
 .../components/picker}/types.ts               |   9 +-
 .../components/picker/utils.test.ts           |  30 +++
 .../datasources/components/picker/utils.ts    |  39 +++
 .../features/query/components/QueryGroup.tsx  |  64 ++---
 .../plugins/datasource/dashboard/plugin.json  |   2 +-
 .../grafana/components/QueryEditor.tsx        |   4 +-
 .../plugins/datasource/grafana/plugin.json    |   2 +-
 .../app/plugins/datasource/mixed/plugin.json  |  13 +
 22 files changed, 762 insertions(+), 331 deletions(-)
 delete mode 100644 public/app/features/datasource-drawer/DataSourceDrawer.test.ts
 delete mode 100644 public/app/features/datasource-drawer/DataSourceDrawer.tsx
 delete mode 100644 public/app/features/datasource-drawer/components/DataSourceCard.tsx
 create mode 100644 public/app/features/datasources/components/picker/DataSourceCard.tsx
 create mode 100644 public/app/features/datasources/components/picker/DataSourceDropdown.tsx
 create mode 100644 public/app/features/datasources/components/picker/DataSourceList.tsx
 rename public/app/features/{datasource-drawer/components/DataSourceDisplay.tsx => datasources/components/picker/DataSourceLogo.tsx} (57%)
 create mode 100644 public/app/features/datasources/components/picker/DataSourceModal.tsx
 create mode 100644 public/app/features/datasources/components/picker/DataSourcePicker.tsx
 rename public/app/features/{datasource-drawer/DataSourcePicker.tsx => datasources/components/picker/DataSourcePickerNG.tsx} (85%)
 rename public/app/features/{datasource-drawer => datasources/components/picker}/DataSourcePickerWithHistory.test.ts (100%)
 rename public/app/features/{datasource-drawer => datasources/components/picker}/DataSourcePickerWithHistory.tsx (96%)
 rename public/app/features/{datasource-drawer => datasources/components/picker}/types.ts (86%)
 create mode 100644 public/app/features/datasources/components/picker/utils.test.ts
 create mode 100644 public/app/features/datasources/components/picker/utils.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2d551c7a4df..bc933311d41 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -353,7 +353,6 @@ lerna.json @grafana/frontend-ops
 /public/app/features/datasources/ @grafana/plugins-platform-frontend
 /public/app/features/dimensions/ @grafana/dataviz-squad
 /public/app/features/dataframe-import/ @grafana/grafana-bi-squad
-/public/app/features/datasource-drawer/ @grafana/grafana-bi-squad
 /public/app/features/explore/ @grafana/explore-squad
 /public/app/features/expressions/ @grafana/observability-metrics
 /public/app/features/folders/ @grafana/grafana-frontend-platform
diff --git a/packages/grafana-ui/src/components/FileDropzone/FileDropzone.tsx b/packages/grafana-ui/src/components/FileDropzone/FileDropzone.tsx
index 228c013282f..cd2ee88422d 100644
--- a/packages/grafana-ui/src/components/FileDropzone/FileDropzone.tsx
+++ b/packages/grafana-ui/src/components/FileDropzone/FileDropzone.tsx
@@ -216,18 +216,11 @@ export function FileDropzone({ options, children, readAs, onLoad, fileListRender
         {children ?? <FileDropzoneDefaultChildren primaryText={getPrimaryText(files, options)} />}
       </div>
       {fileErrors.length > 0 && renderErrorMessages(fileErrors)}
-      <div className={styles.acceptContainer}>
-        {options?.accept && (
-          <small className={cx(styles.small, styles.acceptMargin, styles.acceptedFiles)}>
-            {getAcceptedFileTypeText(options.accept)}
-          </small>
-        )}
-        {options?.maxSize && (
-          <small className={cx(styles.small, styles.acceptMargin)}>{`Max file size: ${formattedValueToString(
-            formattedSize
-          )}`}</small>
-        )}
-      </div>
+      <small className={cx(styles.small, styles.acceptContainer)}>
+        {options?.maxSize && `Max file size: ${formattedValueToString(formattedSize)}`}
+        {options?.maxSize && options?.accept && <span className={styles.acceptSeparator}>|</span>}
+        {options?.accept && getAcceptedFileTypeText(options.accept)}
+      </small>
       {fileList}
     </div>
   );
@@ -261,17 +254,14 @@ export function transformAcceptToNewFormat(accept?: string | string[] | Accept):
   return accept;
 }
 
-export function FileDropzoneDefaultChildren({
-  primaryText = 'Upload file',
-  secondaryText = 'Drag and drop here or browse',
-}) {
+export function FileDropzoneDefaultChildren({ primaryText = 'Drop file here or click to upload', secondaryText = '' }) {
   const theme = useTheme2();
   const styles = getStyles(theme);
 
   return (
-    <div className={styles.iconWrapper}>
-      <Icon name="upload" size="xxl" />
-      <h3>{primaryText}</h3>
+    <div className={cx(styles.defaultDropZone)}>
+      <Icon className={cx(styles.icon)} name="upload" size="xl" />
+      <h6 className={cx(styles.primaryText)}>{primaryText}</h6>
       <small className={styles.small}>{secondaryText}</small>
     </div>
   );
@@ -312,31 +302,33 @@ function getStyles(theme: GrafanaTheme2, isDragActive?: boolean) {
       display: flex;
       flex-direction: column;
       width: 100%;
+      padding: ${theme.spacing(2)};
+      border-radius: 2px;
+      border: 1px dashed ${theme.colors.border.strong};
+      background-color: ${isDragActive ? theme.colors.background.secondary : theme.colors.background.primary};
+      cursor: pointer;
+      align-items: center;
+      justify-content: center;
     `,
     dropzone: css`
       display: flex;
-      flex: 1;
       flex-direction: column;
-      align-items: center;
-      padding: ${theme.spacing(6)};
-      border-radius: 2px;
-      border: 2px dashed ${theme.colors.border.medium};
-      background-color: ${isDragActive ? theme.colors.background.secondary : theme.colors.background.primary};
-      cursor: pointer;
     `,
-    iconWrapper: css`
-      display: flex;
-      flex-direction: column;
-      align-items: center;
+    defaultDropZone: css`
+      text-align: center;
+    `,
+    icon: css`
+      margin-bottom: ${theme.spacing(1)};
+    `,
+    primaryText: css`
+      margin-bottom: ${theme.spacing(1)};
     `,
     acceptContainer: css`
-      display: flex;
+      text-align: center;
+      margin: 0;
     `,
-    acceptedFiles: css`
-      flex-grow: 1;
-    `,
-    acceptMargin: css`
-      margin: ${theme.spacing(2, 0, 1)};
+    acceptSeparator: css`
+      margin: 0 ${theme.spacing(1)};
     `,
     small: css`
       color: ${theme.colors.text.secondary};
diff --git a/public/app/features/datasource-drawer/DataSourceDrawer.test.ts b/public/app/features/datasource-drawer/DataSourceDrawer.test.ts
deleted file mode 100644
index 918ea38ac8e..00000000000
--- a/public/app/features/datasource-drawer/DataSourceDrawer.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { DataSourceInstanceSettings } from '@grafana/data';
-import { DataSourceJsonData, DataSourceRef } from '@grafana/schema';
-
-import { isDataSourceMatch } from './DataSourceDrawer';
-
-describe('DataSourceDrawer', () => {
-  describe('isDataSourceMatch', () => {
-    const dataSourceInstanceSettings = { uid: 'a' } as DataSourceInstanceSettings<DataSourceJsonData>;
-
-    it('matches a string with the uid', () => {
-      expect(isDataSourceMatch(dataSourceInstanceSettings, 'a')).toBeTruthy();
-    });
-    it('matches a datasource with a datasource by the uid', () => {
-      expect(
-        isDataSourceMatch(dataSourceInstanceSettings, { uid: 'a' } as DataSourceInstanceSettings<DataSourceJsonData>)
-      ).toBeTruthy();
-    });
-    it('matches a datasource ref with a datasource by the uid', () => {
-      expect(isDataSourceMatch(dataSourceInstanceSettings, { uid: 'a' } as DataSourceRef)).toBeTruthy();
-    });
-
-    it('doesnt match with null', () => {
-      expect(isDataSourceMatch(dataSourceInstanceSettings, null)).toBeFalsy();
-    });
-    it('doesnt match a datasource to a non matching string', () => {
-      expect(isDataSourceMatch(dataSourceInstanceSettings, 'b')).toBeFalsy();
-    });
-    it('doesnt match a datasource with a different datasource uid', () => {
-      expect(
-        isDataSourceMatch(dataSourceInstanceSettings, { uid: 'b' } as DataSourceInstanceSettings<DataSourceJsonData>)
-      ).toBeFalsy();
-    });
-    it('doesnt match a datasource with a datasource ref with a different uid', () => {
-      expect(isDataSourceMatch(dataSourceInstanceSettings, { uid: 'b' } as DataSourceRef)).toBeFalsy();
-    });
-  });
-});
diff --git a/public/app/features/datasource-drawer/DataSourceDrawer.tsx b/public/app/features/datasource-drawer/DataSourceDrawer.tsx
deleted file mode 100644
index 4e7936bce86..00000000000
--- a/public/app/features/datasource-drawer/DataSourceDrawer.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useCallback, useState } from 'react';
-
-import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
-import {
-  Button,
-  CustomScrollbar,
-  Drawer,
-  FileDropzone,
-  FileDropzoneDefaultChildren,
-  Input,
-  ModalsController,
-  useStyles2,
-} from '@grafana/ui';
-
-import { DataSourceCard } from './components/DataSourceCard';
-import { DataSourceDisplay } from './components/DataSourceDisplay';
-import { PickerContentProps, DataSourceDrawerProps } from './types';
-
-export function DataSourceDrawer(props: DataSourceDrawerProps) {
-  const { current, onChange } = props;
-  const styles = useStyles2(getStyles);
-
-  return (
-    <ModalsController>
-      {({ showModal, hideModal }) => (
-        <Button
-          className={styles.picker}
-          onClick={() => {
-            showModal(PickerContent, {
-              ...props,
-              onDismiss: hideModal,
-              onChange: (ds) => {
-                onChange(ds);
-                hideModal();
-              },
-            });
-          }}
-        >
-          <DataSourceDisplay dataSource={current}></DataSourceDisplay>
-        </Button>
-      )}
-    </ModalsController>
-  );
-}
-
-function PickerContent(props: PickerContentProps) {
-  const { datasources, enableFileUpload, recentlyUsed = [], onChange, fileUploadOptions, onDismiss, current } = props;
-  const changeCallback = useCallback(
-    (ds: string) => {
-      onChange(ds);
-    },
-    [onChange]
-  );
-
-  const [filterTerm, onFilterChange] = useState<string>('');
-  const styles = useStyles2(getStyles);
-
-  const filteredDataSources = datasources.filter((ds) => {
-    return ds?.name.toLocaleLowerCase().indexOf(filterTerm.toLocaleLowerCase()) !== -1;
-  });
-
-  return (
-    <Drawer closeOnMaskClick={true} onClose={onDismiss}>
-      <div className={styles.drawerContent}>
-        <div className={styles.filterContainer}>
-          <Input
-            onChange={(e) => {
-              onFilterChange(e.currentTarget.value);
-            }}
-            value={filterTerm}
-          ></Input>
-        </div>
-        <div className={styles.dataSourceList}>
-          <CustomScrollbar>
-            {recentlyUsed
-              .map((uid) => filteredDataSources.find((ds) => ds.uid === uid))
-              .map((ds) => {
-                if (!ds) {
-                  return null;
-                }
-                return (
-                  <DataSourceCard
-                    selected={isDataSourceMatch(ds, current)}
-                    key={ds.uid}
-                    ds={ds}
-                    onChange={changeCallback}
-                  />
-                );
-              })}
-            {recentlyUsed && recentlyUsed.length > 0 && <hr />}
-            {filteredDataSources.map((ds) => (
-              <DataSourceCard
-                selected={isDataSourceMatch(ds, current)}
-                key={ds.uid}
-                ds={ds}
-                onChange={changeCallback}
-              />
-            ))}
-          </CustomScrollbar>
-        </div>
-        {enableFileUpload && (
-          <div className={styles.additionalContent}>
-            <FileDropzone
-              readAs="readAsArrayBuffer"
-              fileListRenderer={() => undefined}
-              options={{
-                ...fileUploadOptions,
-                onDrop: (...args) => {
-                  onDismiss();
-                  fileUploadOptions?.onDrop?.(...args);
-                },
-              }}
-            >
-              <FileDropzoneDefaultChildren primaryText={'Upload file'} />
-            </FileDropzone>
-          </div>
-        )}
-      </div>
-    </Drawer>
-  );
-}
-
-function getStyles(theme: GrafanaTheme2) {
-  return {
-    drawerContent: css`
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-    `,
-    picker: css`
-      background: ${theme.colors.background.secondary};
-    `,
-    filterContainer: css`
-      padding-bottom: ${theme.spacing(1)};
-    `,
-    dataSourceList: css`
-      height: 50px;
-      flex-grow: 1;
-    `,
-    additionalContent: css`
-      padding-top: ${theme.spacing(1)};
-    `,
-  };
-}
-
-export function isDataSourceMatch(
-  ds: DataSourceInstanceSettings<DataSourceJsonData> | undefined,
-  current: string | DataSourceInstanceSettings<DataSourceJsonData> | DataSourceRef | null | undefined
-): boolean | undefined {
-  if (!ds) {
-    return false;
-  }
-  if (!current) {
-    return false;
-  }
-  if (typeof current === 'string') {
-    return ds.uid === current;
-  }
-  return ds.uid === current.uid;
-}
diff --git a/public/app/features/datasource-drawer/components/DataSourceCard.tsx b/public/app/features/datasource-drawer/components/DataSourceCard.tsx
deleted file mode 100644
index 7856f570cb2..00000000000
--- a/public/app/features/datasource-drawer/components/DataSourceCard.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { DataSourceInstanceSettings, DataSourceJsonData, GrafanaTheme2 } from '@grafana/data';
-import { Card, PluginSignatureBadge, Tag, useStyles2 } from '@grafana/ui';
-
-export interface DataSourceCardProps {
-  onChange: (uid: string) => void;
-  selected?: boolean;
-  ds: DataSourceInstanceSettings<DataSourceJsonData>;
-}
-
-export function DataSourceCard(props: DataSourceCardProps) {
-  const { selected, ds, onChange } = props;
-  const styles = useStyles2(getStyles);
-  return (
-    <Card className={selected ? styles.selectedDataSource : undefined} key={ds.uid} onClick={() => onChange(ds.uid)}>
-      <Card.Figure>
-        <img alt={`${ds.meta.name} logo`} src={ds.meta.info.logos.large}></img>
-      </Card.Figure>
-      <Card.Meta>
-        {[ds.meta.name, ds.url, ds.isDefault && <Tag key="default-tag" name={'default'} colorIndex={1} />]}
-      </Card.Meta>
-      <Card.Tags>
-        <PluginSignatureBadge status={ds.meta.signature} />
-      </Card.Tags>
-      <Card.Heading>{ds.name}</Card.Heading>
-    </Card>
-  );
-}
-
-function getStyles(theme: GrafanaTheme2) {
-  return {
-    selectedDataSource: css`
-      background-color: ${theme.colors.emphasize(theme.colors.background.secondary, 0.1)};
-    `,
-  };
-}
diff --git a/public/app/features/datasources/components/picker/DataSourceCard.tsx b/public/app/features/datasources/components/picker/DataSourceCard.tsx
new file mode 100644
index 00000000000..fd9c65234c2
--- /dev/null
+++ b/public/app/features/datasources/components/picker/DataSourceCard.tsx
@@ -0,0 +1,54 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
+import { Card, TagList, useStyles2 } from '@grafana/ui';
+
+interface DataSourceCardProps {
+  ds: DataSourceInstanceSettings;
+  onClick: () => void;
+  selected: boolean;
+}
+
+export function DataSourceCard({ ds, onClick, selected }: DataSourceCardProps) {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Card key={ds.uid} onClick={onClick} className={cx(styles.card, selected ? styles.selected : undefined)}>
+      <Card.Heading>{ds.name}</Card.Heading>
+      <Card.Meta className={styles.meta}>
+        {ds.meta.name}
+        {ds.meta.info.description}
+      </Card.Meta>
+      <Card.Figure>
+        <img src={ds.meta.info.logos.small} alt={`${ds.meta.name} Logo`} height="40" width="40" />
+      </Card.Figure>
+      <Card.Tags>{ds.isDefault ? <TagList tags={['default']} /> : null}</Card.Tags>
+    </Card>
+  );
+}
+
+// Get styles for the component
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    card: css`
+      cursor: pointer;
+      background-color: ${theme.colors.background.primary};
+      border-bottom: 1px solid ${theme.colors.border.weak};
+      // Move to list component
+      margin-bottom: 0;
+      border-radius: 0;
+    `,
+    selected: css`
+      background-color: ${theme.colors.background.secondary};
+    `,
+    meta: css`
+      display: block;
+      overflow-wrap: unset;
+      white-space: nowrap;
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    `,
+  };
+}
diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
new file mode 100644
index 00000000000..8c563e11e00
--- /dev/null
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -0,0 +1,223 @@
+import { css } from '@emotion/css';
+import { useDialog } from '@react-aria/dialog';
+import { FocusScope } from '@react-aria/focus';
+import { useOverlay } from '@react-aria/overlays';
+import React, { useCallback, useRef, useState } from 'react';
+import { usePopper } from 'react-popper';
+
+import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
+import { DataSourceJsonData } from '@grafana/schema';
+import { Button, CustomScrollbar, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
+
+import { DataSourceList } from './DataSourceList';
+import { DataSourceLogo, DataSourceLogoPlaceHolder } from './DataSourceLogo';
+import { DataSourceModal } from './DataSourceModal';
+import { PickerContentProps, DataSourceDrawerProps } from './types';
+import { dataSourceName as dataSourceLabel } from './utils';
+
+export function DataSourceDropdown(props: DataSourceDrawerProps) {
+  const { current, onChange, ...restProps } = props;
+
+  const [isOpen, setOpen] = useState(false);
+  const [markerElement, setMarkerElement] = useState<HTMLInputElement | null>();
+  const [selectorElement, setSelectorElement] = useState<HTMLDivElement | null>();
+  const [filterTerm, setFilterTerm] = useState<string>();
+
+  const popper = usePopper(markerElement, selectorElement, {
+    placement: 'bottom-start',
+  });
+
+  const ref = useRef<HTMLDivElement>(null);
+  const { overlayProps, underlayProps } = useOverlay(
+    {
+      onClose: () => {
+        setFilterTerm(undefined);
+        setOpen(false);
+      },
+      isDismissable: true,
+      isOpen,
+      shouldCloseOnInteractOutside: (element) => {
+        return markerElement ? !markerElement.isSameNode(element) : false;
+      },
+    },
+    ref
+  );
+  const { dialogProps } = useDialog({}, ref);
+
+  const styles = useStyles2(getStylesDropdown);
+
+  return (
+    <div className={styles.container}>
+      {isOpen ? (
+        <FocusScope contain autoFocus restoreFocus>
+          <Input
+            prefix={filterTerm ? <DataSourceLogoPlaceHolder /> : <DataSourceLogo dataSource={current} />}
+            suffix={<Icon name={filterTerm ? 'search' : 'angle-down'} />}
+            placeholder={dataSourceLabel(current)}
+            className={styles.input}
+            onChange={(e) => {
+              setFilterTerm(e.currentTarget.value);
+            }}
+            ref={setMarkerElement}
+          ></Input>
+          <Portal>
+            <div {...underlayProps} />
+            <div ref={ref} {...overlayProps} {...dialogProps}>
+              <PickerContent
+                filterTerm={filterTerm}
+                onChange={(ds: DataSourceInstanceSettings<DataSourceJsonData>) => {
+                  setFilterTerm(undefined);
+                  setOpen(false);
+                  onChange(ds);
+                }}
+                onClose={() => {
+                  setOpen(false);
+                }}
+                current={current}
+                style={popper.styles.popper}
+                ref={setSelectorElement}
+                {...restProps}
+                onDismiss={() => {}}
+              ></PickerContent>
+            </div>
+          </Portal>
+        </FocusScope>
+      ) : (
+        <div
+          className={styles.trigger}
+          onClick={() => {
+            setOpen(true);
+          }}
+        >
+          <Input
+            className={styles.markerInput}
+            prefix={<DataSourceLogo dataSource={current} />}
+            suffix={<Icon name="angle-down" />}
+            value={dataSourceLabel(current)}
+            onFocus={() => {
+              setOpen(true);
+            }}
+          />
+        </div>
+      )}
+    </div>
+  );
+}
+
+function getStylesDropdown(theme: GrafanaTheme2) {
+  return {
+    container: css`
+      position: relative;
+    `,
+    trigger: css`
+      cursor: pointer;
+    `,
+    input: css`
+      input:focus {
+        box-shadow: none;
+      }
+    `,
+    markerInput: css`
+      input {
+        cursor: pointer;
+      }
+    `,
+  };
+}
+
+const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((props, ref) => {
+  const { filterTerm, onChange, onClose, onClickAddCSV, current } = props;
+  const changeCallback = useCallback(
+    (ds: DataSourceInstanceSettings<DataSourceJsonData>) => {
+      onChange(ds);
+    },
+    [onChange]
+  );
+
+  const clickAddCSVCallback = useCallback(() => {
+    onClickAddCSV?.();
+    onClose();
+  }, [onClickAddCSV, onClose]);
+
+  const styles = useStyles2(getStylesPickerContent);
+
+  return (
+    <div style={props.style} ref={ref} className={styles.container}>
+      <div className={styles.dataSourceList}>
+        <CustomScrollbar>
+          <DataSourceList
+            mixed
+            dashboard
+            current={current}
+            onChange={changeCallback}
+            filter={(ds) => !ds.meta.builtIn && ds.name.includes(filterTerm ?? '')}
+          ></DataSourceList>
+        </CustomScrollbar>
+      </div>
+
+      <div className={styles.footer}>
+        {onClickAddCSV && (
+          <Button variant="secondary" size="sm" onClick={clickAddCSVCallback}>
+            Add csv or spreadsheet
+          </Button>
+        )}
+        <ModalsController>
+          {({ showModal, hideModal }) => (
+            <Button
+              size="sm"
+              variant="secondary"
+              fill="text"
+              onClick={() => {
+                onClose();
+                showModal(DataSourceModal, {
+                  datasources: props.datasources,
+                  recentlyUsed: props.recentlyUsed,
+                  enableFileUpload: props.enableFileUpload,
+                  fileUploadOptions: props.fileUploadOptions,
+                  current,
+                  onDismiss: hideModal,
+                  onChange: (ds) => {
+                    onChange(ds);
+                    hideModal();
+                  },
+                });
+              }}
+            >
+              Open advanced data source picker
+              <Icon name="arrow-right" />
+            </Button>
+          )}
+        </ModalsController>
+      </div>
+    </div>
+  );
+});
+PickerContent.displayName = 'PickerContent';
+
+function getStylesPickerContent(theme: GrafanaTheme2) {
+  return {
+    container: css`
+      display: flex;
+      flex-direction: column;
+      height: 480px;
+      box-shadow: ${theme.shadows.z3};
+      width: 480px;
+      background: ${theme.colors.background.primary};
+      box-shadow: ${theme.shadows.z3};
+    `,
+    picker: css`
+      background: ${theme.colors.background.secondary};
+    `,
+    dataSourceList: css`
+      height: 423px;
+      padding: 0 ${theme.spacing(2)};
+    `,
+    footer: css`
+      display: flex;
+      justify-content: space-between;
+      padding: ${theme.spacing(2)};
+      border-top: 1px solid ${theme.colors.border.weak};
+      height: 57px;
+    `,
+  };
+}
diff --git a/public/app/features/datasources/components/picker/DataSourceList.tsx b/public/app/features/datasources/components/picker/DataSourceList.tsx
new file mode 100644
index 00000000000..408f8aa4c9c
--- /dev/null
+++ b/public/app/features/datasources/components/picker/DataSourceList.tsx
@@ -0,0 +1,119 @@
+import React, { PureComponent } from 'react';
+
+import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+
+import { DataSourceCard } from './DataSourceCard';
+import { isDataSourceMatch } from './utils';
+
+/**
+ * Component props description for the {@link DataSourceList}
+ *
+ * @internal
+ */
+export interface DataSourceListProps {
+  className?: string;
+  onChange: (ds: DataSourceInstanceSettings) => void;
+  current: DataSourceRef | string | null; // uid
+  tracing?: boolean;
+  mixed?: boolean;
+  dashboard?: boolean;
+  metrics?: boolean;
+  type?: string | string[];
+  annotations?: boolean;
+  variables?: boolean;
+  alerting?: boolean;
+  pluginId?: string;
+  /** If true,we show only DSs with logs; and if true, pluginId shouldnt be passed in */
+  logs?: boolean;
+  width?: number;
+  inputId?: string;
+  filter?: (dataSource: DataSourceInstanceSettings) => boolean;
+  onClear?: () => void;
+}
+
+/**
+ * Component state description for the {@link DataSourceList}
+ *
+ * @internal
+ */
+export interface DataSourceListState {
+  error?: string;
+}
+
+/**
+ * Component to be able to select a datasource from the list of installed and enabled
+ * datasources in the current Grafana instance.
+ *
+ * @internal
+ */
+export class DataSourceList extends PureComponent<DataSourceListProps, DataSourceListState> {
+  dataSourceSrv = getDataSourceSrv();
+
+  static defaultProps: Partial<DataSourceListProps> = {
+    filter: () => true,
+  };
+
+  state: DataSourceListState = {};
+
+  constructor(props: DataSourceListProps) {
+    super(props);
+  }
+
+  componentDidMount() {
+    const { current } = this.props;
+    const dsSettings = this.dataSourceSrv.getInstanceSettings(current);
+    if (!dsSettings) {
+      this.setState({ error: 'Could not find data source ' + current });
+    }
+  }
+
+  onChange = (item: DataSourceInstanceSettings) => {
+    const dsSettings = this.dataSourceSrv.getInstanceSettings(item);
+
+    if (dsSettings) {
+      this.props.onChange(dsSettings);
+      this.setState({ error: undefined });
+    }
+  };
+
+  getDataSourceOptions() {
+    const { alerting, tracing, metrics, mixed, dashboard, variables, annotations, pluginId, type, filter, logs } =
+      this.props;
+
+    const options = this.dataSourceSrv.getList({
+      alerting,
+      tracing,
+      metrics,
+      logs,
+      dashboard,
+      mixed,
+      variables,
+      annotations,
+      pluginId,
+      filter,
+      type,
+    });
+
+    return options;
+  }
+
+  render() {
+    const { className, current } = this.props;
+    // QUESTION: Should we use data from the Redux store as admin DS view does?
+    const options = this.getDataSourceOptions();
+
+    return (
+      <div className={className}>
+        {options.map((ds) => (
+          <DataSourceCard
+            key={ds.uid}
+            ds={ds}
+            onClick={this.onChange.bind(this, ds)}
+            selected={!!isDataSourceMatch(ds, current)}
+          />
+        ))}
+      </div>
+    );
+  }
+}
diff --git a/public/app/features/datasource-drawer/components/DataSourceDisplay.tsx b/public/app/features/datasources/components/picker/DataSourceLogo.tsx
similarity index 57%
rename from public/app/features/datasource-drawer/components/DataSourceDisplay.tsx
rename to public/app/features/datasources/components/picker/DataSourceLogo.tsx
index 45e46c6414a..cb05adb3c37 100644
--- a/public/app/features/datasource-drawer/components/DataSourceDisplay.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceLogo.tsx
@@ -5,36 +5,38 @@ import { DataSourceInstanceSettings, DataSourceJsonData, GrafanaTheme2 } from '@
 import { DataSourceRef } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
 
-export interface DataSourceDisplayProps {
+export interface DataSourceLogoProps {
   dataSource: DataSourceInstanceSettings<DataSourceJsonData> | string | DataSourceRef | null | undefined;
 }
 
-export function DataSourceDisplay(props: DataSourceDisplayProps) {
+export function DataSourceLogo(props: DataSourceLogoProps) {
   const { dataSource } = props;
   const styles = useStyles2(getStyles);
 
   if (!dataSource) {
-    return <span>Unknown</span>;
+    return null;
   }
 
   if (typeof dataSource === 'string') {
-    return <span>${dataSource} - not found</span>;
+    return null;
   }
 
   if ('name' in dataSource) {
     return (
-      <>
-        <img
-          className={styles.pickerDSLogo}
-          alt={`${dataSource.meta.name} logo`}
-          src={dataSource.meta.info.logos.small}
-        ></img>
-        <span>{dataSource.name}</span>
-      </>
+      <img
+        className={styles.pickerDSLogo}
+        alt={`${dataSource.meta.name} logo`}
+        src={dataSource.meta.info.logos.small}
+      ></img>
     );
   }
 
-  return <span>{dataSource.uid} - not found</span>;
+  return null;
+}
+
+export function DataSourceLogoPlaceHolder() {
+  const styles = useStyles2(getStyles);
+  return <div className={styles.pickerDSLogo}></div>;
 }
 
 function getStyles(theme: GrafanaTheme2) {
@@ -42,7 +44,6 @@ function getStyles(theme: GrafanaTheme2) {
     pickerDSLogo: css`
       height: 20px;
       width: 20px;
-      margin-right: ${theme.spacing(1)};
     `,
   };
 }
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
new file mode 100644
index 00000000000..99f86a0e7b4
--- /dev/null
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -0,0 +1,160 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+import { DropzoneOptions } from 'react-dropzone';
+
+import { DataSourceInstanceSettings, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
+import {
+  Modal,
+  FileDropzone,
+  FileDropzoneDefaultChildren,
+  CustomScrollbar,
+  LinkButton,
+  useStyles2,
+  Input,
+  Icon,
+} from '@grafana/ui';
+import * as DFImport from 'app/features/dataframe-import';
+
+import { DataSourceList } from './DataSourceList';
+
+interface DataSourceModalProps {
+  onChange: (ds: DataSourceInstanceSettings) => void;
+  current: DataSourceRef | string | null | undefined;
+  onDismiss: () => void;
+  datasources: DataSourceInstanceSettings[];
+  recentlyUsed?: string[];
+  enableFileUpload?: boolean;
+  fileUploadOptions?: DropzoneOptions;
+}
+
+export function DataSourceModal({
+  enableFileUpload,
+  fileUploadOptions,
+  onChange,
+  current,
+  onDismiss,
+}: DataSourceModalProps) {
+  const styles = useStyles2(getDataSourceModalStyles);
+  const [search, setSearch] = useState('');
+
+  return (
+    <Modal
+      title="Select data source"
+      closeOnEscape={true}
+      closeOnBackdropClick={true}
+      isOpen={true}
+      className={styles.modal}
+      onClickBackdrop={onDismiss}
+      onDismiss={onDismiss}
+    >
+      <div className={styles.modalContent}>
+        <div className={styles.leftColumn}>
+          <Input
+            className={styles.searchInput}
+            value={search}
+            prefix={<Icon name="search" />}
+            placeholder="Search data source"
+            onChange={(e) => setSearch(e.currentTarget.value)}
+          />
+          <CustomScrollbar>
+            <DataSourceList
+              dashboard={false}
+              mixed={false}
+              // FIXME: Filter out the grafana data source in a hacky way
+              filter={(ds) => ds.name.includes(search) && ds.name !== '-- Grafana --'}
+              onChange={onChange}
+              current={current}
+            />
+          </CustomScrollbar>
+        </div>
+        <div className={styles.rightColumn}>
+          <div className={styles.builtInDataSources}>
+            <DataSourceList
+              className={styles.builtInDataSourceList}
+              filter={(ds) => !!ds.meta.builtIn}
+              dashboard
+              mixed
+              onChange={onChange}
+              current={current}
+            />
+            {enableFileUpload && (
+              <FileDropzone
+                readAs="readAsArrayBuffer"
+                fileListRenderer={() => undefined}
+                options={{
+                  maxSize: DFImport.maxFileSize,
+                  multiple: false,
+                  accept: DFImport.acceptedFiles,
+                  ...fileUploadOptions,
+                  onDrop: (...args) => {
+                    fileUploadOptions?.onDrop?.(...args);
+                    onDismiss();
+                  },
+                }}
+              >
+                <FileDropzoneDefaultChildren />
+              </FileDropzone>
+            )}
+          </div>
+          <div className={styles.dsCTAs}>
+            <LinkButton variant="secondary" href={`datasources/new`}>
+              Configure a new data source
+            </LinkButton>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  );
+}
+
+function getDataSourceModalStyles(theme: GrafanaTheme2) {
+  return {
+    modal: css`
+      width: 80%;
+      height: 80%;
+    `,
+    modalContent: css`
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: stretch;
+      height: 100%;
+    `,
+    leftColumn: css`
+      display: flex;
+      flex-direction: column;
+      width: 50%;
+      height: 100%;
+      padding-right: ${theme.spacing(1)};
+      border-right: 1px solid ${theme.colors.border.weak};
+    `,
+    rightColumn: css`
+      display: flex;
+      flex-direction: column;
+      width: 50%;
+      height: 100%;
+      padding: ${theme.spacing(1)};
+      justify-items: space-evenly;
+      align-items: stretch;
+      padding-left: ${theme.spacing(1)};
+    `,
+    builtInDataSources: css`
+      flex: 1;
+      margin-bottom: ${theme.spacing(4)};
+    `,
+    builtInDataSourceList: css`
+      margin-bottom: ${theme.spacing(4)};
+    `,
+    dsCTAs: css`
+      display: flex;
+      flex-direction: row;
+      width: 100%;
+      justify-content: flex-end;
+    `,
+    searchInput: css`
+      width: 100%;
+      min-height: 32px;
+      margin-bottom: ${theme.spacing(1)};
+    `,
+  };
+}
diff --git a/public/app/features/datasources/components/picker/DataSourcePicker.tsx b/public/app/features/datasources/components/picker/DataSourcePicker.tsx
new file mode 100644
index 00000000000..83677a1fd1e
--- /dev/null
+++ b/public/app/features/datasources/components/picker/DataSourcePicker.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+import {
+  DataSourcePicker as DeprecatedDataSourcePicker,
+  DataSourcePickerProps as DeprecatedDataSourcePickerProps,
+} from '@grafana/runtime';
+import { config } from 'app/core/config';
+
+import { DataSourcePickerWithHistory } from './DataSourcePickerWithHistory';
+import { DataSourcePickerWithHistoryProps } from './types';
+
+type DataSourcePickerProps = DeprecatedDataSourcePickerProps | DataSourcePickerWithHistoryProps;
+
+/**
+ * DataSourcePicker is a wrapper around the old DataSourcePicker and the new one.
+ * Depending on the feature toggle, it will render the old or the new one.
+ * Feature toggle: advancedDataSourcePicker
+ */
+export function DataSourcePicker(props: DataSourcePickerProps) {
+  return !config.featureToggles.advancedDataSourcePicker ? (
+    <DeprecatedDataSourcePicker {...props} />
+  ) : (
+    <DataSourcePickerWithHistory {...props} />
+  );
+}
diff --git a/public/app/features/datasource-drawer/DataSourcePicker.tsx b/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
similarity index 85%
rename from public/app/features/datasource-drawer/DataSourcePicker.tsx
rename to public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
index c9b84753a22..9c71bc118d1 100644
--- a/public/app/features/datasource-drawer/DataSourcePicker.tsx
+++ b/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
@@ -6,7 +6,7 @@ import { DataSourceInstanceSettings, DataSourceRef, getDataSourceUID } from '@gr
 import { getDataSourceSrv } from '@grafana/runtime';
 import { DataSourceJsonData } from '@grafana/schema';
 
-import { DataSourceDrawer } from './DataSourceDrawer';
+import { DataSourceDropdown } from './DataSourceDropdown';
 import { DataSourcePickerProps } from './types';
 
 /**
@@ -37,13 +37,9 @@ export class DataSourcePicker extends PureComponent<DataSourcePickerProps, DataS
     }
   }
 
-  onChange = (ds?: string) => {
-    const dsSettings = this.dataSourceSrv.getInstanceSettings(ds);
-
-    if (dsSettings) {
-      this.props.onChange(dsSettings);
-      this.setState({ error: undefined });
-    }
+  onChange = (ds: DataSourceInstanceSettings<DataSourceJsonData>) => {
+    this.props.onChange(ds);
+    this.setState({ error: undefined });
   };
 
   private getCurrentDs(): DataSourceInstanceSettings<DataSourceJsonData> | string | DataSourceRef | null | undefined {
@@ -80,17 +76,18 @@ export class DataSourcePicker extends PureComponent<DataSourcePickerProps, DataS
   }
 
   render() {
-    const { recentlyUsed, fileUploadOptions, enableFileUpload } = this.props;
+    const { recentlyUsed, fileUploadOptions, enableFileUpload, onClickAddCSV } = this.props;
 
     return (
       <div>
-        <DataSourceDrawer
+        <DataSourceDropdown
           datasources={this.getDatasources()}
           onChange={this.onChange}
           recentlyUsed={recentlyUsed}
           current={this.getCurrentDs()}
           fileUploadOptions={fileUploadOptions}
           enableFileUpload={enableFileUpload}
+          onClickAddCSV={onClickAddCSV}
         />
       </div>
     );
diff --git a/public/app/features/datasource-drawer/DataSourcePickerWithHistory.test.ts b/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.test.ts
similarity index 100%
rename from public/app/features/datasource-drawer/DataSourcePickerWithHistory.test.ts
rename to public/app/features/datasources/components/picker/DataSourcePickerWithHistory.test.ts
diff --git a/public/app/features/datasource-drawer/DataSourcePickerWithHistory.tsx b/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.tsx
similarity index 96%
rename from public/app/features/datasource-drawer/DataSourcePickerWithHistory.tsx
rename to public/app/features/datasources/components/picker/DataSourcePickerWithHistory.tsx
index 1f0f8272413..b9ea0335415 100644
--- a/public/app/features/datasource-drawer/DataSourcePickerWithHistory.tsx
+++ b/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { dateTime } from '@grafana/data';
 import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
 
-import { DataSourcePicker } from './DataSourcePicker';
+import { DataSourcePicker } from './DataSourcePickerNG';
 import { DataSourcePickerHistoryItem, DataSourcePickerWithHistoryProps } from './types';
 
 const DS_PICKER_STORAGE_KEY = 'DATASOURCE_PICKER';
diff --git a/public/app/features/datasource-drawer/types.ts b/public/app/features/datasources/components/picker/types.ts
similarity index 86%
rename from public/app/features/datasource-drawer/types.ts
rename to public/app/features/datasources/components/picker/types.ts
index c7589ab7110..b6e3101c261 100644
--- a/public/app/features/datasource-drawer/types.ts
+++ b/public/app/features/datasources/components/picker/types.ts
@@ -1,3 +1,4 @@
+import React from 'react';
 import { DropzoneOptions } from 'react-dropzone';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
@@ -5,15 +6,18 @@ import { DataSourceJsonData, DataSourceRef } from '@grafana/schema';
 
 export interface DataSourceDrawerProps {
   datasources: Array<DataSourceInstanceSettings<DataSourceJsonData>>;
-  onFileDrop?: () => void;
-  onChange: (ds: string) => void;
+  onChange: (ds: DataSourceInstanceSettings<DataSourceJsonData>) => void;
   current: DataSourceInstanceSettings<DataSourceJsonData> | string | DataSourceRef | null | undefined;
   enableFileUpload?: boolean;
   fileUploadOptions?: DropzoneOptions;
+  onClickAddCSV?: () => void;
   recentlyUsed?: string[];
 }
 
 export interface PickerContentProps extends DataSourceDrawerProps {
+  style: React.CSSProperties;
+  filterTerm?: string;
+  onClose: () => void;
   onDismiss: () => void;
 }
 
@@ -40,6 +44,7 @@ export interface DataSourcePickerProps {
   disabled?: boolean;
   enableFileUpload?: boolean;
   fileUploadOptions?: DropzoneOptions;
+  onClickAddCSV?: () => void;
 }
 
 export interface DataSourcePickerWithHistoryProps extends Omit<DataSourcePickerProps, 'recentlyUsed'> {
diff --git a/public/app/features/datasources/components/picker/utils.test.ts b/public/app/features/datasources/components/picker/utils.test.ts
new file mode 100644
index 00000000000..8462309c539
--- /dev/null
+++ b/public/app/features/datasources/components/picker/utils.test.ts
@@ -0,0 +1,30 @@
+import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
+
+import { isDataSourceMatch } from './utils';
+
+describe('isDataSourceMatch', () => {
+  const dataSourceInstanceSettings = { uid: 'a' } as DataSourceInstanceSettings;
+
+  it('matches a string with the uid', () => {
+    expect(isDataSourceMatch(dataSourceInstanceSettings, 'a')).toBeTruthy();
+  });
+  it('matches a datasource with a datasource by the uid', () => {
+    expect(isDataSourceMatch(dataSourceInstanceSettings, { uid: 'a' } as DataSourceInstanceSettings)).toBeTruthy();
+  });
+  it('matches a datasource ref with a datasource by the uid', () => {
+    expect(isDataSourceMatch(dataSourceInstanceSettings, { uid: 'a' } as DataSourceRef)).toBeTruthy();
+  });
+
+  it('doesnt match with null', () => {
+    expect(isDataSourceMatch(dataSourceInstanceSettings, null)).toBeFalsy();
+  });
+  it('doesnt match a datasource to a non matching string', () => {
+    expect(isDataSourceMatch(dataSourceInstanceSettings, 'b')).toBeFalsy();
+  });
+  it('doesnt match a datasource with a different datasource uid', () => {
+    expect(isDataSourceMatch(dataSourceInstanceSettings, { uid: 'b' } as DataSourceInstanceSettings)).toBeFalsy();
+  });
+  it('doesnt match a datasource with a datasource ref with a different uid', () => {
+    expect(isDataSourceMatch(dataSourceInstanceSettings, { uid: 'b' } as DataSourceRef)).toBeFalsy();
+  });
+});
diff --git a/public/app/features/datasources/components/picker/utils.ts b/public/app/features/datasources/components/picker/utils.ts
new file mode 100644
index 00000000000..257dca80a84
--- /dev/null
+++ b/public/app/features/datasources/components/picker/utils.ts
@@ -0,0 +1,39 @@
+import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceRef } from '@grafana/data';
+
+export function isDataSourceMatch(
+  ds: DataSourceInstanceSettings | undefined,
+  current: string | DataSourceInstanceSettings | DataSourceRef | null | undefined
+): boolean | undefined {
+  if (!ds) {
+    return false;
+  }
+  if (!current) {
+    return false;
+  }
+  if (typeof current === 'string') {
+    return ds.uid === current;
+  }
+  return ds.uid === current.uid;
+}
+
+export function dataSourceName(
+  dataSource: DataSourceInstanceSettings<DataSourceJsonData> | string | DataSourceRef | null | undefined
+) {
+  if (!dataSource) {
+    return 'Unknown';
+  }
+
+  if (typeof dataSource === 'string') {
+    return `${dataSource} - not found`;
+  }
+
+  if ('name' in dataSource) {
+    return dataSource.name;
+  }
+
+  if (dataSource.uid) {
+    return `${dataSource.uid} - not found`;
+  }
+
+  return 'Unknown';
+}
diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index 0d97f58750b..eefdb6404a0 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -15,14 +15,14 @@ import {
   PanelData,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { DataSourcePicker, getDataSourceSrv } from '@grafana/runtime';
+import { getDataSourceSrv } from '@grafana/runtime';
 import { Button, CustomScrollbar, HorizontalGroup, InlineFormLabel, Modal, stylesFactory } from '@grafana/ui';
 import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp';
 import config from 'app/core/config';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { addQuery, queryIsEmpty } from 'app/core/utils/query';
 import * as DFImport from 'app/features/dataframe-import';
-import { DataSourcePickerWithHistory } from 'app/features/datasource-drawer/DataSourcePickerWithHistory';
+import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
 import { DashboardQueryEditor, isSharedDashboardQuery } from 'app/plugins/datasource/dashboard';
 import { GrafanaQuery, GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
@@ -214,32 +214,22 @@ export class QueryGroup extends PureComponent<Props, State> {
             Data source
           </InlineFormLabel>
           <div className={styles.dataSourceRowItem}>
-            {config.featureToggles.advancedDataSourcePicker ? (
-              <DataSourcePickerWithHistory
-                onChange={this.onChangeDataSource}
-                current={options.dataSource}
-                metrics={true}
-                mixed={true}
-                dashboard={true}
-                variables={true}
-                enableFileUpload={config.featureToggles.editPanelCSVDragAndDrop}
-                fileUploadOptions={{
-                  onDrop: this.onFileDrop,
-                  maxSize: DFImport.maxFileSize,
-                  multiple: false,
-                  accept: DFImport.acceptedFiles,
-                }}
-              ></DataSourcePickerWithHistory>
-            ) : (
-              <DataSourcePicker
-                onChange={this.onChangeDataSource}
-                current={options.dataSource}
-                metrics={true}
-                mixed={true}
-                dashboard={true}
-                variables={true}
-              ></DataSourcePicker>
-            )}
+            <DataSourcePicker
+              onChange={this.onChangeDataSource}
+              current={options.dataSource}
+              metrics={true}
+              mixed={true}
+              dashboard={true}
+              variables={true}
+              enableFileUpload={config.featureToggles.editPanelCSVDragAndDrop}
+              fileUploadOptions={{
+                onDrop: this.onFileDrop,
+                maxSize: DFImport.maxFileSize,
+                multiple: false,
+                accept: DFImport.acceptedFiles,
+              }}
+              onClickAddCSV={this.onClickAddCSV}
+            />
           </div>
           {dataSource && (
             <>
@@ -315,6 +305,24 @@ export class QueryGroup extends PureComponent<Props, State> {
     this.onScrollBottom();
   };
 
+  onClickAddCSV = async () => {
+    const ds = getDataSourceSrv().getInstanceSettings('-- Grafana --');
+    await this.onChangeDataSource(ds!);
+
+    this.onQueriesChange([
+      {
+        refId: 'A',
+        datasource: {
+          type: 'grafana',
+          uid: 'grafana',
+        },
+        queryType: GrafanaQueryType.Snapshot,
+        snapshot: [],
+      },
+    ]);
+    this.props.onRunQueries();
+  };
+
   onFileDrop = (acceptedFiles: File[], fileRejections: FileRejection[], event: DropEvent) => {
     DFImport.filesToDataframes(acceptedFiles).subscribe(async (next) => {
       const snapshot: DataFrameJSON[] = [];
diff --git a/public/app/plugins/datasource/dashboard/plugin.json b/public/app/plugins/datasource/dashboard/plugin.json
index 9b7ab421e8c..149811cbc44 100644
--- a/public/app/plugins/datasource/dashboard/plugin.json
+++ b/public/app/plugins/datasource/dashboard/plugin.json
@@ -5,7 +5,7 @@
   "builtIn": true,
 
   "info": {
-    "description": "TODO",
+    "description": "Uses the result set from another panel in the same dashboard",
     "author": {
       "name": "Grafana Labs",
       "url": "https://grafana.com"
diff --git a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
index 8fc7d07ec7a..2578bba448b 100644
--- a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
@@ -419,7 +419,9 @@ export class UnthemedQueryEditor extends PureComponent<Props, State> {
                 accept: DFImport.acceptedFiles,
               }}
             >
-              <FileDropzoneDefaultChildren primaryText={this.props?.query?.file ? 'Replace file' : 'Upload file'} />
+              <FileDropzoneDefaultChildren
+                primaryText={this.props?.query?.file ? 'Replace file' : 'Drop file here or click to upload'}
+              />
             </FileDropzone>
             {file && (
               <div className={styles.file}>
diff --git a/public/app/plugins/datasource/grafana/plugin.json b/public/app/plugins/datasource/grafana/plugin.json
index 73a96ba2151..df8e1ec3c60 100644
--- a/public/app/plugins/datasource/grafana/plugin.json
+++ b/public/app/plugins/datasource/grafana/plugin.json
@@ -5,7 +5,7 @@
   "builtIn": true,
 
   "info": {
-    "description": "TODO",
+    "description": "A built-in data source that generates random walk data and can poll the Testdata data source. This helps you test visualizations and run experiments.",
     "author": {
       "name": "Grafana Labs",
       "url": "https://grafana.com"
diff --git a/public/app/plugins/datasource/mixed/plugin.json b/public/app/plugins/datasource/mixed/plugin.json
index b28c58710f0..cc4cd84eaea 100644
--- a/public/app/plugins/datasource/mixed/plugin.json
+++ b/public/app/plugins/datasource/mixed/plugin.json
@@ -4,6 +4,19 @@
   "id": "mixed",
 
   "builtIn": true,
+
+  "info": {
+    "description": "Lets you query multiple data sources in the same panel.",
+    "author": {
+      "name": "Grafana Labs",
+      "url": "https://grafana.com"
+    },
+    "logos": {
+      "small": "public/img/icn-datasource.svg",
+      "large": "public/img/icn-datasource.svg"
+    }
+  },
+
   "mixed": true,
   "metrics": true,
 

From 46b73548b3a3aabb895044dd7be5e2634264cdc1 Mon Sep 17 00:00:00 2001
From: Gareth Dawson <gareth.dawson@grafana.com>
Date: Wed, 19 Apr 2023 14:13:53 +0100
Subject: [PATCH 243/729] Elasticsearch: Deprecate the usage of the database
 field in provisioning (#66828)

* update docs and gdev provisioning

* update docs
---
 devenv/datasources.yaml                          | 6 +++---
 devenv/datasources_docker.yaml                   | 6 +++---
 docs/sources/datasources/elasticsearch/_index.md | 8 ++++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml
index 9f2fad5e059..be050bbe382 100644
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -126,9 +126,9 @@ datasources:
     type: elasticsearch
     uid: gdev-elasticsearch
     access: proxy
-    database: "[logs-]YYYY.MM.DD"
     url: http://localhost:9200
     jsonData:
+      index: "[logs-]YYYY.MM.DD"
       interval: Daily
       timeField: "@timestamp"
       logLevelField: level
@@ -137,9 +137,9 @@ datasources:
   - name: gdev-elasticsearch-filebeat
     type: elasticsearch
     access: proxy
-    database: "[filebeat-]YYYY.MM.DD"
     url: http://localhost:9200
     jsonData:
+      index: "[filebeat-]YYYY.MM.DD"
       interval: Daily
       timeField: "@timestamp"
       timeInterval: "10s"
@@ -149,9 +149,9 @@ datasources:
   - name: gdev-elasticsearch-metricbeat
     type: elasticsearch
     access: proxy
-    database: "[metricbeat-]YYYY.MM.DD"
     url: http://localhost:9200
     jsonData:
+      index: "[metricbeat-]YYYY.MM.DD"
       interval: Daily
       timeField: "@timestamp"
       timeInterval: "10s"
diff --git a/devenv/datasources_docker.yaml b/devenv/datasources_docker.yaml
index 53c710e1054..61c0b3c7ecd 100644
--- a/devenv/datasources_docker.yaml
+++ b/devenv/datasources_docker.yaml
@@ -71,18 +71,18 @@ datasources:
   - name: gdev-elasticsearch
     type: elasticsearch
     access: proxy
-    database: "[logs-]YYYY.MM.DD"
     url: http://elasticsearch:9200
     jsonData:
+      index: "[logs-]YYYY.MM.DD"
       interval: Daily
       timeField: "@timestamp"
 
   - name: gdev-elasticsearch-filebeat
     type: elasticsearch
     access: proxy
-    database: "[filebeat-]YYYY.MM.DD"
     url: http://elasticsearch:9200
     jsonData:
+      index: "[filebeat-]YYYY.MM.DD"
       interval: Daily
       timeField: "@timestamp"
       timeInterval: "10s"
@@ -92,9 +92,9 @@ datasources:
   - name: gdev-elasticsearch-metricbeat
     type: elasticsearch
     access: proxy
-    database: "[metricbeat-]YYYY.MM.DD"
     url: http://elasticsearch:9200
     jsonData:
+      index: "[metricbeat-]YYYY.MM.DD"
       interval: Daily
       timeField: "@timestamp"
       timeInterval: "10s"
diff --git a/docs/sources/datasources/elasticsearch/_index.md b/docs/sources/datasources/elasticsearch/_index.md
index 37218e297e0..f4ea2a05b62 100644
--- a/docs/sources/datasources/elasticsearch/_index.md
+++ b/docs/sources/datasources/elasticsearch/_index.md
@@ -140,6 +140,10 @@ For more information about AWS authentication options, refer to [AWS authenticat
 You can define and configure the data source in YAML files as part of Grafana's provisioning system.
 For more information about provisioning, and for available configuration options, refer to [Provisioning Grafana]({{< relref "../../administration/provisioning/#data-sources" >}}).
 
+> **Note:** The previously used `database` field has now been [deprecated](https://github.com/grafana/grafana/pull/58647).
+> You should now use the `index` field in `jsonData` to store the index name.
+> Please see the examples below.
+
 #### Provisioning examples
 
 **Basic provisioning:**
@@ -151,9 +155,9 @@ datasources:
   - name: Elastic
     type: elasticsearch
     access: proxy
-    database: '[metrics-]YYYY.MM.DD'
     url: http://localhost:9200
     jsonData:
+      index: '[metrics-]YYYY.MM.DD'
       interval: Daily
       timeField: '@timestamp'
 ```
@@ -167,9 +171,9 @@ datasources:
   - name: elasticsearch-v7-filebeat
     type: elasticsearch
     access: proxy
-    database: '[filebeat-]YYYY.MM.DD'
     url: http://localhost:9200
     jsonData:
+      index: '[filebeat-]YYYY.MM.DD'
       interval: Daily
       timeField: '@timestamp'
       logMessageField: message

From 5dac0c9871e5edffd4055f7dcb253532d75d5f86 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Wed, 19 Apr 2023 15:15:37 +0200
Subject: [PATCH 244/729] Toolkit: Remove plugin:create and component:create
 commands (#66729)

---
 .betterer.results                             |  14 --
 packages/grafana-toolkit/package.json         |   7 -
 packages/grafana-toolkit/src/cli/index.ts     |  29 +--
 .../src/cli/tasks/component.create.ts         |  88 --------
 .../src/cli/tasks/plugin.create.ts            |  57 -----
 .../src/cli/tasks/plugin/create.ts            | 199 ------------------
 .../templates/component.test.tsx.template.ts  |  12 --
 .../cli/templates/component.tsx.template.ts   |  10 -
 .../src/cli/templates/docs.mdx.template.ts    |  16 --
 .../src/cli/templates/index.ts                |   4 -
 .../src/cli/templates/story.tsx.template.ts   |  22 --
 .../src/cli/utils/pascalCase.ts               |   3 -
 .../grafana-toolkit/src/cli/utils/prompt.ts   |  79 -------
 .../grafana-toolkit/src/cli/utils/rmdir.ts    |  23 --
 yarn.lock                                     | 103 ---------
 15 files changed, 4 insertions(+), 662 deletions(-)
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/component.create.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin.create.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin/create.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/templates/component.tsx.template.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/templates/index.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/utils/pascalCase.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/utils/prompt.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/utils/rmdir.ts

diff --git a/.betterer.results b/.betterer.results
index 38d4720c438..f86842f8765 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -878,10 +878,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "5"],
       [0, 0, 0, "Do not use any type assertions.", "6"]
     ],
-    "packages/grafana-toolkit/src/cli/tasks/component.create.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "packages/grafana-toolkit/src/cli/tasks/package.build.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -898,11 +894,6 @@ exports[`better eslint`] = {
     "packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-toolkit/src/cli/tasks/plugin/create.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -927,11 +918,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-toolkit/src/cli/utils/prompt.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-toolkit/src/cli/utils/useSpinner.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 5637ed8f190..c4ab0b6a77d 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -56,10 +56,8 @@
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@grafana/ui": "10.0.0-pre",
     "@jest/core": "27.5.1",
-    "@types/command-exists": "^1.2.0",
     "@types/eslint": "8.4.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/inquirer": "^8.2.1",
     "@types/jest": "27.4.1",
     "@types/lodash": "4.14.181",
     "@types/node": "16.11.26",
@@ -75,7 +73,6 @@
     "babel-loader": "^8.2.5",
     "babel-plugin-angularjs-annotate": "0.10.0",
     "chalk": "^4.1.2",
-    "command-exists": "^1.2.9",
     "commander": "^9.2.0",
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^6.7.1",
@@ -91,7 +88,6 @@
     "globby": "^11.0.4",
     "html-loader": "^3.1.0",
     "html-webpack-plugin": "^5.5.0",
-    "inquirer": "^8.2.2",
     "jest": "27.5.1",
     "jest-canvas-mock": "2.3.1",
     "jest-junit": "13.1.0",
@@ -101,8 +97,6 @@
     "md5-file": "^5.0.0",
     "mini-css-extract-plugin": "^2.6.0",
     "ora": "^5.4.1",
-    "pixelmatch": "^5.2.1",
-    "pngjs": "^6.0.0",
     "postcss": "^8.4.12",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-loader": "^6.2.1",
@@ -114,7 +108,6 @@
     "sass": "^1.49.9",
     "sass-loader": "^12.6.0",
     "semver": "^7.3.7",
-    "simple-git": "^3.6.0",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.1",
     "ts-jest": "27.1.3",
diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index f166b4ce3f7..e5aaa1d8195 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -1,12 +1,10 @@
 import chalk from 'chalk';
 import { program } from 'commander';
 
-import { componentCreateTask } from './tasks/component.create';
 import { nodeVersionCheckerTask } from './tasks/nodeVersionChecker';
 import { buildPackageTask } from './tasks/package.build';
 import { pluginBuildTask } from './tasks/plugin.build';
 import { ciBuildPluginTask, ciPackagePluginTask, ciPluginReportTask } from './tasks/plugin.ci';
-import { pluginCreateTask } from './tasks/plugin.create';
 import { pluginDevTask } from './tasks/plugin.dev';
 import { pluginSignTask } from './tasks/plugin.sign';
 import { pluginTestTask } from './tasks/plugin.tests';
@@ -82,24 +80,6 @@ export const run = (includeInternalScripts = false) => {
         );
         await execTask(searchTestDataSetupTask)({ count: cmd.count });
       });
-
-    // React generator
-    program
-      .command('component:create')
-      .description(
-        '[deprecated] Scaffold React components. Optionally add test, story and .mdx files. The components are created in the same dir the script is run from.'
-      )
-      .action(async () => {
-        console.log(
-          chalk.yellow.bold(
-            `⚠️ This command is deprecated and will be removed in v10. No further support will be provided. ⚠️`
-          )
-        );
-        console.log(
-          'if you were reliant on this command we recommend https://www.npmjs.com/package/react-gen-component'
-        );
-        await execTask(componentCreateTask)({});
-      });
   }
 
   program.option('-v, --version', 'Toolkit version').action(async () => {
@@ -109,13 +89,12 @@ export const run = (includeInternalScripts = false) => {
 
   program
     .command('plugin:create [name]')
-    .description('[Deprecated] Creates plugin from template')
-    .action(async (cmd) => {
-      console.log(chalk.yellow('\n⚠️  DEPRECATED. This command is deprecated and will be removed in v10. ⚠️'));
+    .description('[removed] Use grafana create-plugin instead')
+    .action(async () => {
       console.log(
-        'Please migrate to grafana create-plugin https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin\n'
+        'No longer supported. Use grafana create-plugin https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin\n'
       );
-      await execTask(pluginCreateTask)({ name: cmd, silent: true });
+      process.exit(1);
     });
 
   program
diff --git a/packages/grafana-toolkit/src/cli/tasks/component.create.ts b/packages/grafana-toolkit/src/cli/tasks/component.create.ts
deleted file mode 100644
index 311c4223a82..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/component.create.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import fs from 'fs';
-import { prompt } from 'inquirer';
-import { template as _template } from 'lodash';
-
-import { componentTpl, docsTpl, storyTpl, testTpl } from '../templates';
-import { pascalCase } from '../utils/pascalCase';
-import { promptConfirm, promptInput, promptList } from '../utils/prompt';
-
-import { Task, TaskRunner } from './task';
-
-interface Details {
-  name?: string;
-  hasStory: boolean;
-  group?: string;
-  isStoryPublic: boolean;
-  hasTests: boolean;
-}
-
-interface GeneratorOptions {
-  details: Details;
-  path: string;
-}
-
-type ComponentGenerator = (options: GeneratorOptions) => Promise<any>;
-
-const componentGroups = [
-  { name: 'General', value: 'General' },
-  { name: 'Forms', value: 'Forms' },
-  { name: 'Panel', value: 'Panel' },
-  { name: 'Visualizations', value: 'Visualizations' },
-  { name: 'Others', value: 'Others' },
-];
-
-export const promptDetails = () => {
-  return prompt<Details>([
-    promptInput('name', 'Component name', true),
-    promptConfirm('hasTests', "Generate component's test file?"),
-    promptConfirm('hasStory', "Generate component's story file?"),
-    promptConfirm(
-      'isStoryPublic',
-      'Generate public story? (Selecting "No" will create an internal story)',
-      true,
-      ({ hasStory }) => hasStory
-    ),
-    promptList(
-      'group',
-      'Select component group for the story (e.g. Forms, Layout)',
-      () => componentGroups,
-      0,
-      ({ hasStory }) => hasStory
-    ),
-  ]);
-};
-
-export const generateComponents: ComponentGenerator = async ({ details, path }) => {
-  const name = pascalCase(details.name);
-  const getCompiled = (template: string) => {
-    return _template(template)({ ...details, name });
-  };
-  const filePath = `${path}/${name}`;
-  let paths = [];
-
-  fs.writeFileSync(`${filePath}.tsx`, getCompiled(componentTpl));
-  paths.push(`${filePath}.tsx`);
-
-  if (details.hasTests) {
-    fs.writeFileSync(`${filePath}.test.tsx`, getCompiled(testTpl));
-    paths.push(`${filePath}.test.tsx`);
-  }
-
-  if (details.hasStory) {
-    const storyExt = details.isStoryPublic ? '.story.tsx' : '.story.internal.tsx';
-    fs.writeFileSync(`${filePath}${storyExt}`, getCompiled(storyTpl));
-    fs.writeFileSync(`${filePath}.mdx`, getCompiled(docsTpl));
-    paths.push(`${filePath}${storyExt}`, `${filePath}.mdx`);
-  }
-
-  console.log('Generated files:');
-  console.log(paths.join('\n'));
-};
-
-const componentCreateRunner: TaskRunner<any> = async () => {
-  const destPath = process.cwd();
-  const details = await promptDetails();
-  await generateComponents({ details, path: destPath });
-};
-
-export const componentCreateTask = new Task('component:create', componentCreateRunner);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.create.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.create.ts
deleted file mode 100644
index b276b869716..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.create.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { prompt } from 'inquirer';
-import path from 'path';
-
-import { promptConfirm } from '../utils/prompt';
-
-import {
-  fetchTemplate,
-  formatPluginDetails,
-  getPluginIdFromName,
-  prepareJsonFiles,
-  printGrafanaTutorialsDetails,
-  promptPluginDetails,
-  promptPluginType,
-  removeGitFiles,
-  verifyGitExists,
-  removeLockFile,
-} from './plugin/create';
-import { Task, TaskRunner } from './task';
-
-interface PluginCreateOptions {
-  name?: string;
-}
-
-const pluginCreateRunner: TaskRunner<PluginCreateOptions> = async ({ name }) => {
-  const destPath = path.resolve(process.cwd(), getPluginIdFromName(name || ''));
-  let pluginDetails;
-
-  // 1. Verifying if git exists in user's env as templates are cloned from git templates
-  await verifyGitExists();
-
-  // 2. Prompt plugin template
-  const { type } = await promptPluginType();
-
-  // 3. Fetch plugin template from GitHub
-  await fetchTemplate({ type, dest: destPath });
-
-  // 4. Prompt plugin details
-  do {
-    pluginDetails = await promptPluginDetails(name);
-    formatPluginDetails(pluginDetails);
-  } while ((await prompt<{ confirm: boolean }>(promptConfirm('confirm', 'Is that ok?'))).confirm === false);
-
-  // 5. Update json files (package.json, src/plugin.json)
-  await prepareJsonFiles({ type: type, pluginDetails, pluginPath: destPath });
-
-  // 6. Starter templates include `yarn.lock` files which will rarely (if ever) be in sync with `latest` dist-tag
-  // so best to remove it after cloning.
-  removeLockFile({ pluginPath: destPath });
-
-  // 7. Remove cloned repository .git dir
-  await removeGitFiles(destPath);
-
-  // 8. Promote Grafana Tutorials :)
-  printGrafanaTutorialsDetails(type);
-};
-
-export const pluginCreateTask = new Task<PluginCreateOptions>('plugin:create task', pluginCreateRunner);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts
deleted file mode 100644
index 5073acadfe9..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import chalk from 'chalk';
-import commandExists from 'command-exists';
-import { promises as fs, readFileSync, existsSync, unlinkSync } from 'fs';
-import { prompt } from 'inquirer';
-import { kebabCase } from 'lodash';
-import path from 'path';
-import gitPromise from 'simple-git';
-
-import { promptConfirm, promptInput } from '../../utils/prompt';
-import { rmdir } from '../../utils/rmdir';
-import { useSpinner } from '../../utils/useSpinner';
-
-const simpleGit = gitPromise(process.cwd());
-
-interface PluginDetails {
-  name: string;
-  org: string;
-  description: string;
-  author: boolean | string;
-  url: string;
-  keywords: string;
-}
-
-type PluginType = 'panel-plugin' | 'datasource-plugin' | 'backend-datasource-plugin';
-
-const PluginNames: Record<PluginType, string> = {
-  'panel-plugin': 'Grafana Panel Plugin',
-  'datasource-plugin': 'Grafana Data Source Plugin',
-  'backend-datasource-plugin': 'Grafana Backend Datasource Plugin',
-};
-const RepositoriesPaths: Record<PluginType, string> = {
-  'panel-plugin': 'https://github.com/grafana/simple-react-panel.git',
-  'datasource-plugin': 'https://github.com/grafana/simple-datasource.git',
-  'backend-datasource-plugin': 'https://github.com/grafana/simple-datasource-backend.git',
-};
-const TutorialPaths: Record<PluginType, string> = {
-  'panel-plugin': 'https://grafana.com/tutorials/build-a-panel-plugin',
-  'datasource-plugin': 'https://grafana.com/tutorials/build-a-data-source-plugin',
-  'backend-datasource-plugin': 'TODO',
-};
-
-export const getGitUsername = async () => {
-  const name = await simpleGit.raw(['config', '--global', 'user.name']);
-  return name || '';
-};
-export const getPluginIdFromName = (name: string) => kebabCase(name);
-export const getPluginId = (pluginDetails: PluginDetails) =>
-  `${kebabCase(pluginDetails.org)}-${getPluginIdFromName(pluginDetails.name)}`;
-
-export const getPluginKeywords = (pluginDetails: PluginDetails) =>
-  pluginDetails.keywords
-    .split(',')
-    .map((k) => k.trim())
-    .filter((k) => k !== '');
-
-export const verifyGitExists = async () => {
-  return new Promise((resolve, reject) => {
-    commandExists('git', (err, exists) => {
-      if (exists) {
-        resolve(true);
-      }
-      reject(new Error('git is not installed'));
-    });
-  });
-};
-
-export const promptPluginType = async () =>
-  prompt<{ type: PluginType }>([
-    {
-      type: 'list',
-      message: 'Select plugin type',
-      name: 'type',
-      choices: [
-        { name: 'Panel Plugin', value: 'panel-plugin' },
-        { name: 'Datasource Plugin', value: 'datasource-plugin' },
-        { name: 'Backend Datasource Plugin', value: 'backend-datasource-plugin' },
-      ],
-    },
-  ]);
-
-export const promptPluginDetails = async (name?: string) => {
-  const username = (await getGitUsername()).trim();
-  const responses = await prompt<PluginDetails>([
-    promptInput('name', 'Plugin name', true, name),
-    promptInput('org', 'Organization (used as part of plugin ID)', true),
-    promptInput('description', 'Description'),
-    promptInput('keywords', 'Keywords (separated by comma)'),
-    // Try using git specified username
-    promptConfirm('author', `Author (${username})`, username, username !== ''),
-    // Prompt for manual author entry if no git user.name specified
-    promptInput('author', `Author`, true, undefined, (answers: any) => !answers.author || username === ''),
-    promptInput('url', 'Your URL (i.e. organisation url)'),
-  ]);
-
-  return {
-    ...responses,
-    author: responses.author === true ? username : responses.author,
-  };
-};
-
-export const fetchTemplate = ({ type, dest }: { type: PluginType; dest: string }) =>
-  useSpinner('Fetching plugin template...', async () => {
-    const url = RepositoriesPaths[type];
-    if (!url) {
-      throw new Error('Unknown plugin type');
-    }
-
-    await simpleGit.clone(url, dest);
-  });
-
-export const prepareJsonFiles = ({
-  type,
-  pluginDetails,
-  pluginPath,
-}: {
-  type: PluginType;
-  pluginDetails: PluginDetails;
-  pluginPath: string;
-}) =>
-  useSpinner('Saving package.json and plugin.json files', async () => {
-    const packageJsonPath = path.resolve(pluginPath, 'package.json');
-    const pluginJsonPath = path.resolve(pluginPath, 'src/plugin.json');
-    const packageJson: any = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
-    const pluginJson: any = JSON.parse(readFileSync(pluginJsonPath, 'utf8'));
-
-    const pluginId = `${kebabCase(pluginDetails.org)}-${getPluginIdFromName(pluginDetails.name)}`;
-    packageJson.name = pluginId;
-    packageJson.author = pluginDetails.author;
-    packageJson.description = pluginDetails.description;
-
-    pluginJson.name = pluginDetails.name;
-    pluginJson.id = pluginId;
-
-    if (type === 'backend-datasource-plugin') {
-      pluginJson.backend = true;
-      pluginJson.executable = 'gpx_' + pluginDetails.name;
-    }
-
-    pluginJson.info = {
-      ...pluginJson.info,
-      description: pluginDetails.description,
-      author: {
-        name: pluginDetails.author,
-        url: pluginDetails.url,
-      },
-      keywords: getPluginKeywords(pluginDetails),
-    };
-
-    await Promise.all(
-      [packageJson, pluginJson].map((f, i) => {
-        const filePath = i === 0 ? packageJsonPath : pluginJsonPath;
-        return fs.writeFile(filePath, JSON.stringify(f, null, 2));
-      })
-    );
-  });
-
-export const removeGitFiles = (pluginPath: string) =>
-  useSpinner('Cleaning', async () => rmdir(`${path.resolve(pluginPath, '.git')}`));
-
-/* eslint-disable no-console */
-export const formatPluginDetails = (details: PluginDetails) => {
-  console.group();
-  console.log();
-  console.log(chalk.bold.yellow('Your plugin details'));
-  console.log('---');
-  console.log(chalk.bold('Name: '), details.name);
-  console.log(chalk.bold('ID: '), getPluginId(details));
-  console.log(chalk.bold('Description: '), details.description);
-  console.log(chalk.bold('Keywords: '), getPluginKeywords(details));
-  console.log(chalk.bold('Author: '), details.author);
-  console.log(chalk.bold('Organisation: '), details.org);
-  console.log(chalk.bold('Website: '), details.url);
-  console.log();
-  console.groupEnd();
-};
-
-export const printGrafanaTutorialsDetails = (type: PluginType) => {
-  console.group();
-  console.log();
-  console.log(chalk.bold.yellow(`Congrats! You have just created ${PluginNames[type]}.`));
-  console.log('Please run `yarn install` to install frontend dependencies.');
-  console.log();
-  if (type !== 'backend-datasource-plugin') {
-    console.log(`${PluginNames[type]} tutorial: ${TutorialPaths[type]}`);
-  }
-  console.log(
-    'Learn more about Grafana Plugins at https://grafana.com/docs/grafana/latest/plugins/developing/development/'
-  );
-  console.log();
-  console.groupEnd();
-};
-/* eslint-enable no-console */
-
-export const removeLockFile = ({ pluginPath }: { pluginPath: string }) => {
-  const lockFilePath = path.resolve(pluginPath, 'yarn.lock');
-  if (existsSync(lockFilePath)) {
-    unlinkSync(lockFilePath);
-  }
-};
diff --git a/packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts b/packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts
deleted file mode 100644
index b6737feab08..00000000000
--- a/packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export const testTpl = `
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { <%= name %> } from './<%= name %>';
-
-
-describe('<%= name %>', () => {
-  it.skip('should render', () => {
-
-  });
-});
-`;
diff --git a/packages/grafana-toolkit/src/cli/templates/component.tsx.template.ts b/packages/grafana-toolkit/src/cli/templates/component.tsx.template.ts
deleted file mode 100644
index 4c7903597a7..00000000000
--- a/packages/grafana-toolkit/src/cli/templates/component.tsx.template.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export const componentTpl = `import React from 'react';
-
-export interface Props {};
-
-export const <%= name %> = (props: Props) => {
-  return (
-    <div>Hello world!</div>
-  )
-};
-`;
diff --git a/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts b/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts
deleted file mode 100644
index b605f755c6b..00000000000
--- a/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export const docsTpl = `import { ArgsTable } from '@storybook/addon-docs/blocks';
-import { <%= name %> } from './<%= name %>';
-
-# <%= name %>
-
-### Usage
-
-\`\`\`jsx
-import { <%= name %> } from '@grafana/ui';
-
-<<%= name %> />
-\`\`\`
-
-### Props
-<ArgsTable of={<%= name %>} />
-`;
diff --git a/packages/grafana-toolkit/src/cli/templates/index.ts b/packages/grafana-toolkit/src/cli/templates/index.ts
deleted file mode 100644
index 57a7319ccbb..00000000000
--- a/packages/grafana-toolkit/src/cli/templates/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { componentTpl } from './component.tsx.template';
-export { storyTpl } from './story.tsx.template';
-export { docsTpl } from './docs.mdx.template';
-export { testTpl } from './component.test.tsx.template';
diff --git a/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts b/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts
deleted file mode 100644
index 21c87a1f20b..00000000000
--- a/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export const storyTpl = `
-import React from 'react';
-import { <%= name %> } from './<%= name %>';
-import { withCenteredStory } from '@grafana/ui/src/utils/storybook/withCenteredStory';
-import mdx from './<%= name %>.mdx';
-
-
-export default {
-  title: '<%= group %>/<%= name %>',
-  component: <%= name %>,
-  decorators: [withCenteredStory],
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-  },
-};
-
-export const Basic = () => {
-  return <<%= name %> />;
-};
-`;
diff --git a/packages/grafana-toolkit/src/cli/utils/pascalCase.ts b/packages/grafana-toolkit/src/cli/utils/pascalCase.ts
deleted file mode 100644
index 17694ef55a0..00000000000
--- a/packages/grafana-toolkit/src/cli/utils/pascalCase.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { flow, camelCase, upperFirst } from 'lodash';
-
-export const pascalCase = flow([camelCase, upperFirst]);
diff --git a/packages/grafana-toolkit/src/cli/utils/prompt.ts b/packages/grafana-toolkit/src/cli/utils/prompt.ts
deleted file mode 100644
index 6a5a478e137..00000000000
--- a/packages/grafana-toolkit/src/cli/utils/prompt.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import inquirer, {
-  Question,
-  InputQuestion,
-  CheckboxQuestion,
-  NumberQuestion,
-  PasswordQuestion,
-  EditorQuestion,
-  ConfirmQuestion,
-  ListQuestion,
-  ChoiceOptions,
-} from 'inquirer';
-
-type QuestionWithValidation<A extends inquirer.Answers = inquirer.Answers> =
-  | InputQuestion<A>
-  | CheckboxQuestion<A>
-  | NumberQuestion<A>
-  | PasswordQuestion<A>
-  | EditorQuestion<A>;
-
-export const answerRequired = <A extends inquirer.Answers>(question: QuestionWithValidation<A>): Question<A> => {
-  return {
-    ...question,
-    validate: (answer: A) => answer.trim() !== '' || `${question.name} is required`,
-  };
-};
-
-export const promptInput = <A extends inquirer.Answers>(
-  name: string,
-  message: string | ((answers: A) => string),
-  required = false,
-  def: any = undefined,
-  when: boolean | ((answers: A) => boolean | Promise<boolean>) = true
-) => {
-  const model: InputQuestion<A> = {
-    type: 'input',
-    name,
-    message,
-    default: def,
-    when,
-  };
-
-  return required ? answerRequired(model) : model;
-};
-
-export const promptList = <A extends inquirer.Answers>(
-  name: string,
-  message: string | ((answers: A) => string),
-  choices: () => ChoiceOptions[],
-  def: any = undefined,
-  when: boolean | ((answers: A) => boolean | Promise<boolean>) = true
-) => {
-  const model: ListQuestion<A> = {
-    type: 'list',
-    name,
-    message,
-    choices,
-    default: def,
-    when,
-  };
-
-  return model;
-};
-
-export const promptConfirm = <A extends inquirer.Answers>(
-  name: string,
-  message: string | ((answers: A) => string),
-  def: any = undefined,
-  when: boolean | ((answers: A) => boolean | Promise<boolean>) = true
-) => {
-  const model: ConfirmQuestion<A> = {
-    type: 'confirm',
-    name,
-    message,
-    default: def,
-    when,
-  };
-
-  return model;
-};
diff --git a/packages/grafana-toolkit/src/cli/utils/rmdir.ts b/packages/grafana-toolkit/src/cli/utils/rmdir.ts
deleted file mode 100644
index f1065628cdb..00000000000
--- a/packages/grafana-toolkit/src/cli/utils/rmdir.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import fs = require('fs');
-import path = require('path');
-
-/**
- * Remove directory recursively
- * Ref https://stackoverflow.com/a/42505874
- */
-export const rmdir = (dirPath: string) => {
-  if (!fs.existsSync(dirPath)) {
-    return;
-  }
-
-  fs.readdirSync(dirPath).forEach((entry) => {
-    const entryPath = path.join(dirPath, entry);
-    if (fs.lstatSync(entryPath).isDirectory()) {
-      rmdir(entryPath);
-    } else {
-      fs.unlinkSync(entryPath);
-    }
-  });
-
-  fs.rmdirSync(dirPath);
-};
diff --git a/yarn.lock b/yarn.lock
index 7d77947170f..7a8ba31c3ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3380,10 +3380,8 @@ __metadata:
     "@grafana/tsconfig": ^1.2.0-rc1
     "@grafana/ui": 10.0.0-pre
     "@jest/core": 27.5.1
-    "@types/command-exists": ^1.2.0
     "@types/eslint": 8.4.1
     "@types/fs-extra": ^9.0.13
-    "@types/inquirer": ^8.2.1
     "@types/jest": 27.4.1
     "@types/lodash": 4.14.181
     "@types/node": 16.11.26
@@ -3399,7 +3397,6 @@ __metadata:
     babel-loader: ^8.2.5
     babel-plugin-angularjs-annotate: 0.10.0
     chalk: ^4.1.2
-    command-exists: ^1.2.9
     commander: ^9.2.0
     copy-webpack-plugin: ^9.0.1
     css-loader: ^6.7.1
@@ -3415,7 +3412,6 @@ __metadata:
     globby: ^11.0.4
     html-loader: ^3.1.0
     html-webpack-plugin: ^5.5.0
-    inquirer: ^8.2.2
     jest: 27.5.1
     jest-canvas-mock: 2.3.1
     jest-junit: 13.1.0
@@ -3425,8 +3421,6 @@ __metadata:
     md5-file: ^5.0.0
     mini-css-extract-plugin: ^2.6.0
     ora: ^5.4.1
-    pixelmatch: ^5.2.1
-    pngjs: ^6.0.0
     postcss: ^8.4.12
     postcss-flexbugs-fixes: ^5.0.2
     postcss-loader: ^6.2.1
@@ -3438,7 +3432,6 @@ __metadata:
     sass: ^1.49.9
     sass-loader: ^12.6.0
     semver: ^7.3.7
-    simple-git: ^3.6.0
     style-loader: ^3.3.1
     terser-webpack-plugin: ^5.3.1
     ts-jest: 27.1.3
@@ -9002,13 +8995,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/command-exists@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@types/command-exists@npm:1.2.0"
-  checksum: 7c5a626c38898d0267375dbf24ea374e6fcc8a85837f38eeb4485a5699a905eda89941059ea4f82ffc92b2207b29bdd7f7ab8dcbae95ed661b65cafe958e3fb1
-  languageName: node
-  linkType: hard
-
 "@types/common-tags@npm:^1.8.0":
   version: 1.8.1
   resolution: "@types/common-tags@npm:1.8.1"
@@ -9617,16 +9603,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/inquirer@npm:^8.2.1":
-  version: 8.2.1
-  resolution: "@types/inquirer@npm:8.2.1"
-  dependencies:
-    "@types/through": "*"
-    rxjs: ^7.2.0
-  checksum: 5362d0b1cbec3887c9d5a671a0b19c58cf54066456c8967dd7ee799dfcc242cc8cd8959440c0f2fe7768becaf721b45fd30c222e6b9bcca378f45c68af43bab5
-  languageName: node
-  linkType: hard
-
 "@types/is-function@npm:^1.0.0":
   version: 1.0.1
   resolution: "@types/is-function@npm:1.0.1"
@@ -10478,15 +10454,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/through@npm:*":
-  version: 0.0.30
-  resolution: "@types/through@npm:0.0.30"
-  dependencies:
-    "@types/node": "*"
-  checksum: 9578470db0b527c26e246a1220ae9bffc6bf47f20f89c54aac467c083ab1f7e16c00d9a7b4bb6cb4e2dfae465027270827e5908a6236063f6214625e50585d78
-  languageName: node
-  linkType: hard
-
 "@types/tinycolor2@npm:1.4.3":
   version: 1.4.3
   resolution: "@types/tinycolor2@npm:1.4.3"
@@ -14409,13 +14376,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"command-exists@npm:^1.2.9":
-  version: 1.2.9
-  resolution: "command-exists@npm:1.2.9"
-  checksum: 729ae3d88a2058c93c58840f30341b7f82688a573019535d198b57a4d8cb0135ced0ad7f52b591e5b28a90feb2c675080ce916e56254a0f7c15cb2395277cac3
-  languageName: node
-  linkType: hard
-
 "command-score@npm:^0.1.2":
   version: 0.1.2
   resolution: "command-score@npm:0.1.2"
@@ -21679,28 +21639,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inquirer@npm:^8.2.2":
-  version: 8.2.2
-  resolution: "inquirer@npm:8.2.2"
-  dependencies:
-    ansi-escapes: ^4.2.1
-    chalk: ^4.1.1
-    cli-cursor: ^3.1.0
-    cli-width: ^3.0.0
-    external-editor: ^3.0.3
-    figures: ^3.0.0
-    lodash: ^4.17.21
-    mute-stream: 0.0.8
-    ora: ^5.4.1
-    run-async: ^2.4.0
-    rxjs: ^7.5.5
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-    through: ^2.3.6
-  checksum: 69a2cf32f51af0e94dd66c597fdca42b890ff521b537dbfe1fd532c19a751d54893b7896523691ec30357f6212a80a2417fec7bf34411f369bbf151bdbc95ae9
-  languageName: node
-  linkType: hard
-
 "inquirer@npm:^8.2.4":
   version: 8.2.4
   resolution: "inquirer@npm:8.2.4"
@@ -28601,17 +28539,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pixelmatch@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "pixelmatch@npm:5.2.1"
-  dependencies:
-    pngjs: ^4.0.1
-  bin:
-    pixelmatch: bin/pixelmatch
-  checksum: 0ec7a87168e51b80812d1c39fe1a278e2266dc1e9c426418c2a9d7f0c6465de3c03c51dbf7e6b97c5ba72a043ec3fb576571cdde1f88b12ef0851bf9bfd16da0
-  languageName: node
-  linkType: hard
-
 "pkg-dir@npm:^3.0.0":
   version: 3.0.0
   resolution: "pkg-dir@npm:3.0.0"
@@ -28676,20 +28603,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pngjs@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "pngjs@npm:4.0.1"
-  checksum: 9497e08a6c2d850630ba7c8d3738fd36c9db1af7ee8b8c2d4b664e450807a280936dfa1489deb60e6943b968bedd58c9aa93def25a765579d745ea44467fc47f
-  languageName: node
-  linkType: hard
-
-"pngjs@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "pngjs@npm:6.0.0"
-  checksum: ab6c285086060087097eab9fe6b5a528a24f9e79c03dea2b4fd6264ed4fdb5beff4a3257eeeaf2a9dc18249b539609c2a4e4013c567164a1f6b5ba2c974d5ecb
-  languageName: node
-  linkType: hard
-
 "pnp-webpack-plugin@npm:1.6.4":
   version: 1.6.4
   resolution: "pnp-webpack-plugin@npm:1.6.4"
@@ -32655,15 +32568,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^7.2.0":
-  version: 7.4.0
-  resolution: "rxjs@npm:7.4.0"
-  dependencies:
-    tslib: ~2.1.0
-  checksum: 6b33172a760dcad6882fdc836ee8cf1ebe160dd7eaad95c45a12338ffdaa96eb41e48e6c25bbd3d1fdf45075949ff447954bc17a9d01c688558a67967d09c114
-  languageName: node
-  linkType: hard
-
 "rxjs@npm:^7.5.5":
   version: 7.5.5
   resolution: "rxjs@npm:7.5.5"
@@ -35760,13 +35664,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:~2.1.0":
-  version: 2.1.0
-  resolution: "tslib@npm:2.1.0"
-  checksum: aa189c8179de0427b0906da30926fd53c59d96ec239dff87d6e6bc831f608df0cbd6f77c61dabc074408bd0aa0b9ae4ec35cb2c15f729e32f37274db5730cb78
-  languageName: node
-  linkType: hard
-
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"

From a90289a1935f1ccaa63a4c20e772b806fc493b27 Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Wed, 19 Apr 2023 08:24:09 -0500
Subject: [PATCH 245/729] Prometheus: mark queries with instant results as
 invalid for incremental querying (#66846)

mark queries with instant results as invalid for incremental querying
---
 .../app/plugins/datasource/prometheus/querycache/QueryCache.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
index 1551139fd8d..2ba7ca76c42 100644
--- a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
@@ -235,7 +235,7 @@ export class QueryCache {
     const newTo = request.range.to.valueOf();
 
     // only cache 'now'-relative queries (that can benefit from a backfill cache)
-    const shouldCache = request.rangeRaw?.to?.toString() === 'now';
+    const shouldCache = request.rangeRaw?.to?.toString() === 'now' && !request.targets.some((targ) => targ.instant);
 
     // all targets are queried together, so we check for any that causes group cache invalidation & full re-query
     let doPartialQuery = shouldCache;

From 60e6ff10386e05744ba87501dc70a885c69f4667 Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Wed, 19 Apr 2023 09:39:03 -0400
Subject: [PATCH 246/729] [docs] remove auth/saml alias from team sync page
 (#66796)

removed auth/saml alias from team sync page
---
 .../setup-grafana/configure-security/configure-team-sync.md      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/sources/setup-grafana/configure-security/configure-team-sync.md b/docs/sources/setup-grafana/configure-security/configure-team-sync.md
index b19d9764441..6c49d377571 100644
--- a/docs/sources/setup-grafana/configure-security/configure-team-sync.md
+++ b/docs/sources/setup-grafana/configure-security/configure-team-sync.md
@@ -1,6 +1,5 @@
 ---
 aliases:
-  - ../../auth/saml/
   - ../../auth/team-sync/
   - ../../enterprise/team-sync/
 description: Learn how to use Team Sync to synchronize between your authentication

From 3c937741b8bae14e3087ed0b5cf710bba3902629 Mon Sep 17 00:00:00 2001
From: David Harris <david.harris@grafana.com>
Date: Wed, 19 Apr 2023 14:42:23 +0100
Subject: [PATCH 247/729] docs: remove confusing singlestat references (#66399)

docs: remove confusing singlestat reference

The removed phrase was confusing, why would I want to learn more about a removed component? Then given the link ends up going to the stat visualization page which replaced singlestatm and I can't find any dedicated page anymore on any version of our docs, it seems a redundant link.
---
 public/app/plugins/panel/stat/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/stat/README.md b/public/app/plugins/panel/stat/README.md
index 3977d8c5d57..5ff11e6d3fd 100644
--- a/public/app/plugins/panel/stat/README.md
+++ b/public/app/plugins/panel/stat/README.md
@@ -11,7 +11,7 @@ By default, the Stat panel displays one of the following:
 
 The Text mode can be used to control whether the text is displayed or not.
 
-The Stat panel is a replacement for the Singlestat panel, which was deprecated in Grafana v7.0 and removed in Grafana v8.4. Learn more about the now removed Singlestat panel [here](https://grafana.com/docs/grafana/v8.4/visualizations/stat-panel/).
+The Stat panel is a replacement for the Singlestat panel, which was deprecated in Grafana v7.0 and removed in Grafana v8.4.
 
 Read more about Stat panel on the docs page:
 

From 772ddbc3c06adce0988d556bc38e4a7353609535 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 19 Apr 2023 15:27:34 +0100
Subject: [PATCH 248/729] Navigation: Vertically align section nav icon at the
 top when the text wraps (#66860)

* vertically align section nav icon at the top

* use theme for img width
---
 .../components/AppChrome/SectionNav/SectionNavItem.tsx     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
index a2840d6020f..d7e0579adfc 100644
--- a/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
+++ b/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
@@ -32,7 +32,7 @@ export function SectionNavItem({ item, isSectionRoot = false }: Props) {
   if (item.img) {
     icon = <img data-testid="section-image" className={styles.sectionImg} src={item.img} alt="" />;
   } else if (item.icon) {
-    icon = <Icon data-testid="section-icon" name={item.icon} />;
+    icon = <Icon data-testid="section-icon" className={styles.sectionImg} name={item.icon} />;
   }
 
   const onItemClicked = () => {
@@ -68,7 +68,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     link: css`
       padding: ${theme.spacing(1, 0, 1, 1.5)};
       display: flex;
-      align-items: center;
+      align-items: flex-start;
       border-radius: ${theme.shape.radius.default};
       gap: ${theme.spacing(1)};
       height: 100%;
@@ -103,7 +103,8 @@ const getStyles = (theme: GrafanaTheme2) => {
       margin-left: ${theme.spacing(1)};
     `,
     sectionImg: css({
-      width: 18,
+      margin: '6px 0',
+      width: theme.spacing(2),
     }),
     isSectionRoot: css({
       fontSize: theme.typography.h4.fontSize,

From 42cdec369dd2a33e617de2bb4adaf54730aef2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?=
 <JohnnyQQQQ@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:04:30 +0200
Subject: [PATCH 249/729] Datasources: provide generic function to extract
 custom headers (#66738)

---
 pkg/api/datasources.go                        |  2 +-
 pkg/services/datasources/datasources.go       |  5 ++
 .../fakes/fake_datasource_service.go          |  4 ++
 pkg/services/datasources/models.go            |  4 ++
 .../datasources/service/datasource.go         | 13 +++-
 .../datasources/service/datasource_test.go    | 72 +++++++++++++++++++
 6 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 1c357dcfcee..936a6369cb5 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -340,7 +340,7 @@ func validateJSONData(jsonData *simplejson.Json, cfg *setting.Cfg) error {
 	}
 
 	for key, value := range jsonData.MustMap() {
-		if strings.HasPrefix(key, "httpHeaderName") {
+		if strings.HasPrefix(key, datasources.CustomHeaderName) {
 			header := fmt.Sprint(value)
 			if http.CanonicalHeaderKey(header) == http.CanonicalHeaderKey(cfg.AuthProxyHeaderName) {
 				datasourcesLogger.Error("Forbidden to add a data source header with a name equal to auth proxy header name", "headerName", key)
diff --git a/pkg/services/datasources/datasources.go b/pkg/services/datasources/datasources.go
index 443b13e3289..598803ca07f 100644
--- a/pkg/services/datasources/datasources.go
+++ b/pkg/services/datasources/datasources.go
@@ -54,6 +54,11 @@ type DataSourceService interface {
 	// DecryptedPassword decrypts the encrypted datasource password and returns the
 	// decrypted value.
 	DecryptedPassword(ctx context.Context, ds *DataSource) (string, error)
+
+	// CustomHeaders returns a map of custom headers the user might have
+	// configured for this Datasource. Not every datasource can has the option
+	// to configure those.
+	CustomHeaders(ctx context.Context, ds *DataSource) (map[string]string, error)
 }
 
 // CacheService interface for retrieving a cached datasource.
diff --git a/pkg/services/datasources/fakes/fake_datasource_service.go b/pkg/services/datasources/fakes/fake_datasource_service.go
index 8f43219769f..69959cc6d57 100644
--- a/pkg/services/datasources/fakes/fake_datasource_service.go
+++ b/pkg/services/datasources/fakes/fake_datasource_service.go
@@ -133,3 +133,7 @@ func (s *FakeDataSourceService) DecryptedBasicAuthPassword(ctx context.Context,
 func (s *FakeDataSourceService) DecryptedPassword(ctx context.Context, ds *datasources.DataSource) (string, error) {
 	return "", nil
 }
+
+func (s *FakeDataSourceService) CustomHeaders(ctx context.Context, ds *datasources.DataSource) (map[string]string, error) {
+	return nil, nil
+}
diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go
index f8be5eeed37..49ef0e03fa5 100644
--- a/pkg/services/datasources/models.go
+++ b/pkg/services/datasources/models.go
@@ -28,6 +28,10 @@ const (
 	DS_ES_OPEN_DISTRO = "grafana-es-open-distro-datasource"
 	DS_ES_OPENSEARCH  = "grafana-opensearch-datasource"
 	DS_AZURE_MONITOR  = "grafana-azure-monitor-datasource"
+	// CustomHeaderName is the prefix that is used to store the name of a custom header.
+	CustomHeaderName = "httpHeaderName"
+	// CustomHeaderValue is the prefix that is used to store the value of a custom header.
+	CustomHeaderValue = "httpHeaderValue"
 )
 
 type DsAccess string
diff --git a/pkg/services/datasources/service/datasource.go b/pkg/services/datasources/service/datasource.go
index 39e90579553..5188b48c4f3 100644
--- a/pkg/services/datasources/service/datasource.go
+++ b/pkg/services/datasources/service/datasource.go
@@ -561,8 +561,8 @@ func (s *Service) getCustomHeaders(jsonData *simplejson.Json, decryptedValues ma
 	index := 0
 	for {
 		index++
-		headerNameSuffix := fmt.Sprintf("httpHeaderName%d", index)
-		headerValueSuffix := fmt.Sprintf("httpHeaderValue%d", index)
+		headerNameSuffix := fmt.Sprintf("%s%d", datasources.CustomHeaderName, index)
+		headerValueSuffix := fmt.Sprintf("%s%d", datasources.CustomHeaderValue, index)
 
 		key := jsonData.Get(headerNameSuffix).MustString()
 		if key == "" {
@@ -651,3 +651,12 @@ func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
 	limits.Set(orgQuotaTag, cfg.Quota.Org.DataSource)
 	return limits, nil
 }
+
+// CustomerHeaders returns the custom headers specified in the datasource. The context is used for the decryption operation that might use the store, so consider setting an acceptable timeout for your use case.
+func (s *Service) CustomHeaders(ctx context.Context, ds *datasources.DataSource) (map[string]string, error) {
+	values, err := s.SecretsService.DecryptJsonData(ctx, ds.SecureJsonData)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get custom headers: %w", err)
+	}
+	return s.getCustomHeaders(ds.JsonData, values), nil
+}
diff --git a/pkg/services/datasources/service/datasource_test.go b/pkg/services/datasources/service/datasource_test.go
index 44327ca0d42..ccd6cd979e2 100644
--- a/pkg/services/datasources/service/datasource_test.go
+++ b/pkg/services/datasources/service/datasource_test.go
@@ -707,6 +707,78 @@ func TestService_GetDecryptedValues(t *testing.T) {
 	})
 }
 
+func TestDataSource_CustomHeaders(t *testing.T) {
+	sqlStore := db.InitTestDB(t)
+	secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
+	secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
+	quotaService := quotatest.New(false, nil)
+	dsService, err := ProvideService(sqlStore, secretsService, secretsStore, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+	require.NoError(t, err)
+
+	dsService.cfg = setting.NewCfg()
+
+	testValue := "HeaderValue1"
+
+	encryptedValue, err := secretsService.Encrypt(context.Background(), []byte(testValue), secrets.WithoutScope())
+	require.NoError(t, err)
+
+	testCases := []struct {
+		name             string
+		jsonData         *simplejson.Json
+		secureJsonData   map[string][]byte
+		expectedHeaders  map[string]string
+		expectedErrorMsg string
+	}{
+		{
+			name: "valid custom headers",
+			jsonData: simplejson.NewFromAny(map[string]interface{}{
+				"httpHeaderName1": "X-Test-Header1",
+			}),
+			secureJsonData: map[string][]byte{
+				"httpHeaderValue1": encryptedValue,
+			},
+			expectedHeaders: map[string]string{
+				"X-Test-Header1": testValue,
+			},
+		},
+		{
+			name: "missing header value",
+			jsonData: simplejson.NewFromAny(map[string]interface{}{
+				"httpHeaderName1": "X-Test-Header1",
+			}),
+			secureJsonData:  map[string][]byte{},
+			expectedHeaders: map[string]string{},
+		},
+		{
+			name: "non customer header value",
+			jsonData: simplejson.NewFromAny(map[string]interface{}{
+				"someotherheader": "X-Test-Header1",
+			}),
+			secureJsonData:  map[string][]byte{},
+			expectedHeaders: map[string]string{},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			ds := &datasources.DataSource{
+				JsonData:       tc.jsonData,
+				SecureJsonData: tc.secureJsonData,
+			}
+
+			headers, err := dsService.CustomHeaders(context.Background(), ds)
+
+			if tc.expectedErrorMsg != "" {
+				require.Error(t, err)
+				assert.Contains(t, err.Error(), tc.expectedErrorMsg)
+			} else {
+				require.NoError(t, err)
+				assert.Equal(t, tc.expectedHeaders, headers)
+			}
+		})
+	}
+}
+
 const caCert string = `-----BEGIN CERTIFICATE-----
 MIIDATCCAemgAwIBAgIJAMQ5hC3CPDTeMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
 BAMMDGNhLWs4cy1zdGhsbTAeFw0xNjEwMjcwODQyMjdaFw00NDAzMTQwODQyMjda

From 33186e3e233583245353733568edb9d0ac89c7e6 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:04:47 +0200
Subject: [PATCH 250/729] Explore: Fix using data source line limit when
 opening logs sample in split view (#66601)

* Logs sample: Use data source max lines setting when opening logs in split view

* Add internal tags
---
 packages/grafana-data/src/types/logs.ts       |  22 +++-
 .../app/features/explore/LogsSamplePanel.tsx  |   2 +-
 .../utils/supplementaryQueries.test.ts        |   3 +-
 .../elasticsearch/datasource.test.ts          |  28 +++--
 .../datasource/elasticsearch/datasource.ts    |   9 +-
 .../datasource/loki/datasource.test.ts        | 100 ++++++++++++------
 .../app/plugins/datasource/loki/datasource.ts |  13 +--
 7 files changed, 121 insertions(+), 56 deletions(-)

diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts
index 9200942492c..8b180435628 100644
--- a/packages/grafana-data/src/types/logs.ts
+++ b/packages/grafana-data/src/types/logs.ts
@@ -163,6 +163,26 @@ export enum SupplementaryQueryType {
   LogsSample = 'LogsSample',
 }
 
+/**
+ * @internal
+ */
+export type SupplementaryQueryOptions = LogsVolumeOption | LogsSampleOptions;
+
+/**
+ * @internal
+ */
+export type LogsVolumeOption = {
+  type: SupplementaryQueryType.LogsVolume;
+};
+
+/**
+ * @internal
+ */
+export type LogsSampleOptions = {
+  type: SupplementaryQueryType.LogsSample;
+  limit?: number;
+};
+
 /**
  * Types of logs volume responses. A data source may return full range histogram (based on selected range)
  * or limited (based on returned results). This information is attached to DataFrame.meta.custom object.
@@ -206,7 +226,7 @@ export interface DataSourceWithSupplementaryQueriesSupport<TQuery extends DataQu
    * Returns a supplementary query to be used to fetch supplementary data based on the provided type and original query.
    * If provided query is not suitable for provided supplementary query type, undefined should be returned.
    */
-  getSupplementaryQuery(type: SupplementaryQueryType, query: TQuery): TQuery | undefined;
+  getSupplementaryQuery(options: SupplementaryQueryOptions, originalQuery: TQuery): TQuery | undefined;
 }
 
 export const hasSupplementaryQuerySupport = <TQuery extends DataQuery>(
diff --git a/public/app/features/explore/LogsSamplePanel.tsx b/public/app/features/explore/LogsSamplePanel.tsx
index 8f5a89f4865..6a3492e120f 100644
--- a/public/app/features/explore/LogsSamplePanel.tsx
+++ b/public/app/features/explore/LogsSamplePanel.tsx
@@ -50,7 +50,7 @@ export function LogsSamplePanel(props: Props) {
     }
 
     const logSampleQueries = queries
-      .map((query) => datasourceInstance.getSupplementaryQuery(SupplementaryQueryType.LogsSample, query))
+      .map((query) => datasourceInstance.getSupplementaryQuery({ type: SupplementaryQueryType.LogsSample }, query))
       .filter((query): query is DataQuery => !!query);
 
     if (!logSampleQueries.length) {
diff --git a/public/app/features/explore/utils/supplementaryQueries.test.ts b/public/app/features/explore/utils/supplementaryQueries.test.ts
index ce85095d7e1..3f13e0d2f51 100644
--- a/public/app/features/explore/utils/supplementaryQueries.test.ts
+++ b/public/app/features/explore/utils/supplementaryQueries.test.ts
@@ -13,6 +13,7 @@ import {
   LogsVolumeType,
   MutableDataFrame,
   SupplementaryQueryType,
+  SupplementaryQueryOptions,
   toDataFrame,
 } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
@@ -53,7 +54,7 @@ class MockDataSourceWithSupplementaryQuerySupport
     return undefined;
   }
 
-  getSupplementaryQuery(type: SupplementaryQueryType, query: DataQuery): DataQuery | undefined {
+  getSupplementaryQuery(options: SupplementaryQueryOptions, query: DataQuery): DataQuery | undefined {
     return query;
   }
 
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index c5bd3b8a5f6..6793fa31871 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -927,22 +927,28 @@ describe('ElasticDatasource', () => {
 
     it('does not return logs volume query for metric query', () => {
       expect(
-        ds.getSupplementaryQuery(SupplementaryQueryType.LogsVolume, {
-          refId: 'A',
-          metrics: [{ type: 'count', id: '1' }],
-          bucketAggs: [{ type: 'filters', settings: { filters: [{ query: 'foo', label: '' }] }, id: '1' }],
-          query: 'foo="bar"',
-        })
+        ds.getSupplementaryQuery(
+          { type: SupplementaryQueryType.LogsVolume },
+          {
+            refId: 'A',
+            metrics: [{ type: 'count', id: '1' }],
+            bucketAggs: [{ type: 'filters', settings: { filters: [{ query: 'foo', label: '' }] }, id: '1' }],
+            query: 'foo="bar"',
+          }
+        )
       ).toEqual(undefined);
     });
 
     it('returns logs volume query for log query', () => {
       expect(
-        ds.getSupplementaryQuery(SupplementaryQueryType.LogsVolume, {
-          refId: 'A',
-          metrics: [{ type: 'logs', id: '1' }],
-          query: 'foo="bar"',
-        })
+        ds.getSupplementaryQuery(
+          { type: SupplementaryQueryType.LogsVolume },
+          {
+            refId: 'A',
+            metrics: [{ type: 'logs', id: '1' }],
+            query: 'foo="bar"',
+          }
+        )
       ).toEqual({
         bucketAggs: [
           {
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 059d99f2e86..e1d887b9f6f 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -25,6 +25,7 @@ import {
   QueryFixAction,
   CoreApp,
   SupplementaryQueryType,
+  SupplementaryQueryOptions,
   DataQueryError,
   rangeUtil,
   Field,
@@ -597,14 +598,14 @@ export class ElasticDatasource
     return [SupplementaryQueryType.LogsVolume];
   }
 
-  getSupplementaryQuery(type: SupplementaryQueryType, query: ElasticsearchQuery): ElasticsearchQuery | undefined {
-    if (!this.getSupportedSupplementaryQueryTypes().includes(type)) {
+  getSupplementaryQuery(options: SupplementaryQueryOptions, query: ElasticsearchQuery): ElasticsearchQuery | undefined {
+    if (!this.getSupportedSupplementaryQueryTypes().includes(options.type)) {
       return undefined;
     }
 
     let isQuerySuitable = false;
 
-    switch (type) {
+    switch (options.type) {
       case SupplementaryQueryType.LogsVolume:
         // it has to be a logs-producing range-query
         isQuerySuitable = !!(query.metrics?.length === 1 && query.metrics[0].type === 'logs');
@@ -655,7 +656,7 @@ export class ElasticDatasource
   getLogsVolumeDataProvider(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> | undefined {
     const logsVolumeRequest = cloneDeep(request);
     const targets = logsVolumeRequest.targets
-      .map((target) => this.getSupplementaryQuery(SupplementaryQueryType.LogsVolume, target))
+      .map((target) => this.getSupplementaryQuery({ type: SupplementaryQueryType.LogsVolume }, target))
       .filter((query): query is ElasticsearchQuery => !!query);
 
     if (!targets.length) {
diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index e9c275581aa..312ec7729d6 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -923,11 +923,14 @@ describe('LokiDatasource', () => {
     describe('logs volume', () => {
       it('returns logs volume query for range log query', () => {
         expect(
-          ds.getSupplementaryQuery(SupplementaryQueryType.LogsVolume, {
-            expr: '{label=value}',
-            queryType: LokiQueryType.Range,
-            refId: 'A',
-          })
+          ds.getSupplementaryQuery(
+            { type: SupplementaryQueryType.LogsVolume },
+            {
+              expr: '{label=value}',
+              queryType: LokiQueryType.Range,
+              refId: 'A',
+            }
+          )
         ).toEqual({
           expr: 'sum by (level) (count_over_time({label=value}[$__interval]))',
           instant: false,
@@ -939,21 +942,27 @@ describe('LokiDatasource', () => {
 
       it('does not return logs volume query for instant log query', () => {
         expect(
-          ds.getSupplementaryQuery(SupplementaryQueryType.LogsVolume, {
-            expr: '{label=value}',
-            queryType: LokiQueryType.Instant,
-            refId: 'A',
-          })
+          ds.getSupplementaryQuery(
+            { type: SupplementaryQueryType.LogsVolume },
+            {
+              expr: '{label=value}',
+              queryType: LokiQueryType.Instant,
+              refId: 'A',
+            }
+          )
         ).toEqual(undefined);
       });
 
       it('does not return logs volume query for metric query', () => {
         expect(
-          ds.getSupplementaryQuery(SupplementaryQueryType.LogsVolume, {
-            expr: 'rate({label=value}[5m]',
-            queryType: LokiQueryType.Range,
-            refId: 'A',
-          })
+          ds.getSupplementaryQuery(
+            { type: SupplementaryQueryType.LogsVolume },
+            {
+              expr: 'rate({label=value}[5m]',
+              queryType: LokiQueryType.Range,
+              refId: 'A',
+            }
+          )
         ).toEqual(undefined);
       });
     });
@@ -961,41 +970,68 @@ describe('LokiDatasource', () => {
     describe('logs sample', () => {
       it('returns logs sample query for range metric query', () => {
         expect(
-          ds.getSupplementaryQuery(SupplementaryQueryType.LogsSample, {
-            expr: 'rate({label=value}[5m]',
-            queryType: LokiQueryType.Range,
-            refId: 'A',
-          })
+          ds.getSupplementaryQuery(
+            { type: SupplementaryQueryType.LogsSample },
+            {
+              expr: 'rate({label=value}[5m]',
+              queryType: LokiQueryType.Range,
+              refId: 'A',
+            }
+          )
         ).toEqual({
           expr: '{label=value}',
           queryType: 'range',
           refId: 'log-sample-A',
-          maxLines: 100,
+          maxLines: 20,
         });
       });
 
       it('returns logs sample query for instant metric query', () => {
         expect(
-          ds.getSupplementaryQuery(SupplementaryQueryType.LogsSample, {
-            expr: 'rate({label=value}[5m]',
-            queryType: LokiQueryType.Instant,
-            refId: 'A',
-          })
+          ds.getSupplementaryQuery(
+            { type: SupplementaryQueryType.LogsSample },
+            {
+              expr: 'rate({label=value}[5m]',
+              queryType: LokiQueryType.Instant,
+              refId: 'A',
+            }
+          )
         ).toEqual({
           expr: '{label=value}',
           queryType: 'instant',
           refId: 'log-sample-A',
-          maxLines: 100,
+          maxLines: 20,
+        });
+      });
+
+      it('correctly overrides maxLines if limit is set', () => {
+        expect(
+          ds.getSupplementaryQuery(
+            { type: SupplementaryQueryType.LogsSample, limit: 5 },
+            {
+              expr: 'rate({label=value}[5m]',
+              queryType: LokiQueryType.Instant,
+              refId: 'A',
+            }
+          )
+        ).toEqual({
+          expr: '{label=value}',
+          queryType: 'instant',
+          refId: 'log-sample-A',
+          maxLines: 5,
         });
       });
 
       it('does not return logs sample query for log query query', () => {
         expect(
-          ds.getSupplementaryQuery(SupplementaryQueryType.LogsSample, {
-            expr: '{label=value}',
-            queryType: LokiQueryType.Range,
-            refId: 'A',
-          })
+          ds.getSupplementaryQuery(
+            { type: SupplementaryQueryType.LogsSample },
+            {
+              expr: '{label=value}',
+              queryType: LokiQueryType.Range,
+              refId: 'A',
+            }
+          )
         ).toEqual(undefined);
       });
     });
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index cd4dba02ca8..095abaa655e 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -30,6 +30,7 @@ import {
   QueryHint,
   rangeUtil,
   ScopedVars,
+  SupplementaryQueryOptions,
   TimeRange,
   LogRowContextOptions,
 } from '@grafana/data';
@@ -171,8 +172,8 @@ export class LokiDatasource
     return [SupplementaryQueryType.LogsVolume, SupplementaryQueryType.LogsSample];
   }
 
-  getSupplementaryQuery(type: SupplementaryQueryType, query: LokiQuery): LokiQuery | undefined {
-    if (!this.getSupportedSupplementaryQueryTypes().includes(type)) {
+  getSupplementaryQuery(options: SupplementaryQueryOptions, query: LokiQuery): LokiQuery | undefined {
+    if (!this.getSupportedSupplementaryQueryTypes().includes(options.type)) {
       return undefined;
     }
 
@@ -180,7 +181,7 @@ export class LokiDatasource
     const expr = removeCommentsFromQuery(normalizedQuery.expr);
     let isQuerySuitable = false;
 
-    switch (type) {
+    switch (options.type) {
       case SupplementaryQueryType.LogsVolume:
         // it has to be a logs-producing range-query
         isQuerySuitable = !!(query.expr && isLogsQuery(query.expr) && query.queryType === LokiQueryType.Range);
@@ -206,7 +207,7 @@ export class LokiDatasource
           ...normalizedQuery,
           refId: `${REF_ID_STARTER_LOG_SAMPLE}${normalizedQuery.refId}`,
           expr: getLogQueryFromMetricsQuery(expr),
-          maxLines: 100,
+          maxLines: Number.isNaN(Number(options.limit)) ? this.maxLines : Number(options.limit),
         };
 
       default:
@@ -217,7 +218,7 @@ export class LokiDatasource
   getLogsVolumeDataProvider(request: DataQueryRequest<LokiQuery>): Observable<DataQueryResponse> | undefined {
     const logsVolumeRequest = cloneDeep(request);
     const targets = logsVolumeRequest.targets
-      .map((query) => this.getSupplementaryQuery(SupplementaryQueryType.LogsVolume, query))
+      .map((query) => this.getSupplementaryQuery({ type: SupplementaryQueryType.LogsVolume }, query))
       .filter((query): query is LokiQuery => !!query);
 
     if (!targets.length) {
@@ -238,7 +239,7 @@ export class LokiDatasource
   getLogsSampleDataProvider(request: DataQueryRequest<LokiQuery>): Observable<DataQueryResponse> | undefined {
     const logsSampleRequest = cloneDeep(request);
     const targets = logsSampleRequest.targets
-      .map((query) => this.getSupplementaryQuery(SupplementaryQueryType.LogsSample, query))
+      .map((query) => this.getSupplementaryQuery({ type: SupplementaryQueryType.LogsSample, limit: 100 }, query))
       .filter((query): query is LokiQuery => !!query);
 
     if (!targets.length) {

From bc11a484ed97d9c87e8dd42347c2c34713e9e441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?=
 <JohnnyQQQQ@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:05:26 +0200
Subject: [PATCH 251/729] Alerting: Add support for running HA using Redis
 (#65267)

Co-authored-by: Steve Simpson <steve.simpson@grafana.com>
---
 conf/defaults.ini                             |  20 +
 conf/sample.ini                               |  20 +
 go.mod                                        |   5 +
 go.sum                                        |  13 +
 .../ngalert/notifier/multiorg_alertmanager.go |  51 +-
 .../ngalert/notifier/redis_channel.go         |  65 ++
 .../ngalert/notifier/redis_channel_test.go    |  64 ++
 pkg/services/ngalert/notifier/redis_peer.go   | 564 ++++++++++++++++++
 pkg/setting/setting_unified_alerting.go       |  12 +
 9 files changed, 806 insertions(+), 8 deletions(-)
 create mode 100644 pkg/services/ngalert/notifier/redis_channel.go
 create mode 100644 pkg/services/ngalert/notifier/redis_channel_test.go
 create mode 100644 pkg/services/ngalert/notifier/redis_peer.go

diff --git a/conf/defaults.ini b/conf/defaults.ini
index c298b25f728..14eda0a60a3 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -962,6 +962,26 @@ admin_config_poll_interval = 60s
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 alertmanager_config_poll_interval = 60s
 
+# The redis server address that should be connected to.
+ha_redis_address =
+
+# The username that should be used to authenticate with the redis server.
+ha_redis_username =
+
+# The password that should be used to authenticate with the redis server.
+ha_redis_password =
+
+# The redis database, by default it's 0.
+ha_redis_db =
+
+# A prefix that is used for every key or channel that is created on the redis server
+# as part of HA for alerting.
+ha_redis_prefix =
+
+# The name of the cluster peer that will be used as identifier. If none is
+# provided, a random one will be generated.
+ha_redis_peer_name =
+
 # Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port.
 ha_listen_address = "0.0.0.0:9094"
 
diff --git a/conf/sample.ini b/conf/sample.ini
index 70275a44ee0..69b6dccfda1 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -931,6 +931,26 @@
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;alertmanager_config_poll_interval = 60s
 
+# The redis server address that should be connected to.
+;ha_redis_address =
+
+# The username that should be used to authenticate with the redis server.
+;ha_redis_username =
+
+# The password that should be used to authenticate with the redis server.
+;ha_redis_password =
+
+# The redis database, by default it's 0.
+;ha_redis_db =
+
+# A prefix that is used for every key or channel that is created on the redis server
+# as part of HA for alerting.
+;ha_redis_prefix =
+
+# The name of the cluster peer that will be used as identifier. If none is
+# provided, a random one will be generated.
+;ha_redis_peer_name =
+
 # Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
 ;ha_listen_address = "0.0.0.0:9094"
 
diff --git a/go.mod b/go.mod
index 32a00ca87b0..0cada30c1a2 100644
--- a/go.mod
+++ b/go.mod
@@ -281,6 +281,9 @@ require (
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
+	github.com/alicebob/miniredis v2.5.0+incompatible // indirect
+	github.com/alicebob/miniredis/v2 v2.30.1 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
@@ -320,6 +323,7 @@ require (
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
+	github.com/redis/go-redis/v9 v9.0.2 // indirect
 	github.com/rivo/uniseg v0.3.4 // indirect
 	github.com/rueian/rueidis v0.0.100-go1.18 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -332,6 +336,7 @@ require (
 	github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
 	github.com/weaveworks/promrus v1.2.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/yuin/gopher-lua v1.1.0 // indirect
 	go.opentelemetry.io/otel/metric v0.37.0 // indirect
 	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
diff --git a/go.sum b/go.sum
index 93c875b8518..de9e60713a1 100644
--- a/go.sum
+++ b/go.sum
@@ -287,6 +287,12 @@ github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a/go.mod h1:OMCwj8V
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
+github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI=
+github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
+github.com/alicebob/miniredis/v2 v2.30.1 h1:HM1rlQjq1bm9yQcsawJqSZBJ9AYgxvjkMsNtddh90+g=
+github.com/alicebob/miniredis/v2 v2.30.1/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
@@ -2047,6 +2053,8 @@ github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b h1:zd/2RN
 github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
+github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
 github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
 github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA=
 github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84=
@@ -2333,6 +2341,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 h1:k/gmLsJDWwWqbLCur2yWnJzwQEKRcAHXo6seXGuSwWw=
+github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
+github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE=
+github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
 github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
@@ -2748,6 +2760,7 @@ golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190102155601-82a175fd1598/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager.go b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
index 1ee6e350dbb..1713a118468 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
@@ -72,14 +72,44 @@ func NewMultiOrgAlertmanager(cfg *setting.Cfg, configStore AlertingStore, orgSto
 		decryptFn:     decryptFn,
 		metrics:       m,
 		ns:            ns,
+		peer:          &NilPeer{},
 	}
+	if err := moa.setupClustering(cfg); err != nil {
+		return nil, err
+	}
+	return moa, nil
+}
 
-	clusterLogger := l.New("component", "cluster")
-	moa.peer = &NilPeer{}
+func (moa *MultiOrgAlertmanager) setupClustering(cfg *setting.Cfg) error {
+	clusterLogger := moa.logger.New("component", "clustering")
+	// We set the settlement timeout to be a multiple of the gossip interval,
+	// ensuring that a sufficient number of broadcasts have occurred, thereby
+	// increasing the probability of success when waiting for the cluster to settle.
+	const settleTimeout = cluster.DefaultGossipInterval * 10
+	// Redis setup.
+	if cfg.UnifiedAlerting.HARedisAddr != "" {
+		redisPeer, err := newRedisPeer(redisConfig{
+			addr:     cfg.UnifiedAlerting.HARedisAddr,
+			name:     cfg.UnifiedAlerting.HARedisPeerName,
+			prefix:   cfg.UnifiedAlerting.HARedisPrefix,
+			password: cfg.UnifiedAlerting.HARedisPassword,
+			username: cfg.UnifiedAlerting.HARedisUsername,
+			db:       cfg.UnifiedAlerting.HARedisDB,
+		}, clusterLogger, moa.metrics.Registerer, cfg.UnifiedAlerting.HAPushPullInterval)
+		if err != nil {
+			return fmt.Errorf("unable to initialize redis: %w", err)
+		}
+		var ctx context.Context
+		ctx, moa.settleCancel = context.WithTimeout(context.Background(), 30*time.Second)
+		go redisPeer.Settle(ctx, settleTimeout)
+		moa.peer = redisPeer
+		return nil
+	}
+	// Memberlist setup.
 	if len(cfg.UnifiedAlerting.HAPeers) > 0 {
 		peer, err := cluster.Create(
 			clusterLogger,
-			m.Registerer,
+			moa.metrics.Registerer,
 			cfg.UnifiedAlerting.HAListenAddr,
 			cfg.UnifiedAlerting.HAAdvertiseAddr,
 			cfg.UnifiedAlerting.HAPeers, // peers
@@ -94,22 +124,22 @@ func NewMultiOrgAlertmanager(cfg *setting.Cfg, configStore AlertingStore, orgSto
 		)
 
 		if err != nil {
-			return nil, fmt.Errorf("unable to initialize gossip mesh: %w", err)
+			return fmt.Errorf("unable to initialize gossip mesh: %w", err)
 		}
 
 		err = peer.Join(cluster.DefaultReconnectInterval, cluster.DefaultReconnectTimeout)
 		if err != nil {
-			l.Error("msg", "unable to join gossip mesh while initializing cluster for high availability mode", "error", err)
+			moa.logger.Error("msg", "unable to join gossip mesh while initializing cluster for high availability mode", "error", err)
 		}
 		// Attempt to verify the number of peers for 30s every 2s. The risk here is what we send a notification "too soon".
 		// Which should _never_ happen given we share the notification log via the database so the risk of double notification is very low.
 		var ctx context.Context
 		ctx, moa.settleCancel = context.WithTimeout(context.Background(), 30*time.Second)
-		go peer.Settle(ctx, cluster.DefaultGossipInterval*10)
+		go peer.Settle(ctx, settleTimeout)
 		moa.peer = peer
+		return nil
 	}
-
-	return moa, nil
+	return nil
 }
 
 func (moa *MultiOrgAlertmanager) Run(ctx context.Context) error {
@@ -308,6 +338,11 @@ func (moa *MultiOrgAlertmanager) StopAndWait() {
 			moa.logger.Warn("unable to leave the gossip mesh", "error", err)
 		}
 	}
+	r, ok := moa.peer.(*redisPeer)
+	if ok {
+		moa.settleCancel()
+		r.Shutdown()
+	}
 }
 
 // AlertmanagerFor returns the Alertmanager instance for the organization provided.
diff --git a/pkg/services/ngalert/notifier/redis_channel.go b/pkg/services/ngalert/notifier/redis_channel.go
new file mode 100644
index 00000000000..8a89fa206fb
--- /dev/null
+++ b/pkg/services/ngalert/notifier/redis_channel.go
@@ -0,0 +1,65 @@
+package notifier
+
+import (
+	"context"
+
+	"github.com/gogo/protobuf/proto"
+	"github.com/prometheus/alertmanager/cluster"
+	"github.com/prometheus/alertmanager/cluster/clusterpb"
+)
+
+type RedisChannel struct {
+	p       *redisPeer
+	key     string
+	channel string
+	msgType string
+	msgc    chan []byte
+}
+
+func newRedisChannel(p *redisPeer, key, channel, msgType string) cluster.ClusterChannel {
+	redisChannel := &RedisChannel{
+		p:       p,
+		key:     key,
+		channel: channel,
+		msgType: msgType,
+		// The buffer size of 200 was taken from the Memberlist implementation.
+		msgc: make(chan []byte, 200),
+	}
+	go redisChannel.handleMessages()
+	return redisChannel
+}
+
+func (c *RedisChannel) handleMessages() {
+	for {
+		select {
+		case <-c.p.shutdownc:
+			return
+		case b := <-c.msgc:
+			pub := c.p.redis.Publish(context.Background(), c.channel, string(b))
+			// An error here might not be as critical as one might think on first sight.
+			// The state will eventually be propagated to other members by the full sync.
+			if pub.Err() != nil {
+				c.p.messagesPublishFailures.WithLabelValues(c.msgType, reasonRedisIssue).Inc()
+				c.p.logger.Error("error publishing a message to redis", "err", pub.Err(), "channel", c.channel)
+				continue
+			}
+			c.p.messagesSent.WithLabelValues(c.msgType).Inc()
+			c.p.messagesSentSize.WithLabelValues(c.msgType).Add(float64(len(b)))
+		}
+	}
+}
+
+func (c *RedisChannel) Broadcast(b []byte) {
+	b, err := proto.Marshal(&clusterpb.Part{Key: c.key, Data: b})
+	if err != nil {
+		c.p.logger.Error("error marshalling broadcast into proto", "err", err, "channel", c.channel)
+		return
+	}
+	select {
+	case c.msgc <- b:
+	default:
+		// This is not the end of the world, we will catch up when we do a full state sync.
+		c.p.messagesPublishFailures.WithLabelValues(c.msgType, reasonBufferOverflow).Inc()
+		c.p.logger.Warn("buffer full, droping message", "channel", c.channel)
+	}
+}
diff --git a/pkg/services/ngalert/notifier/redis_channel_test.go b/pkg/services/ngalert/notifier/redis_channel_test.go
new file mode 100644
index 00000000000..62353e39b09
--- /dev/null
+++ b/pkg/services/ngalert/notifier/redis_channel_test.go
@@ -0,0 +1,64 @@
+package notifier
+
+import (
+	"context"
+	"testing"
+
+	"github.com/alicebob/miniredis/v2"
+	"github.com/prometheus/alertmanager/cluster/clusterpb"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/redis/go-redis/v9"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewRedisChannel(t *testing.T) {
+	mr, err := miniredis.Run()
+	require.NoError(t, err)
+	defer mr.Close()
+
+	rdb := redis.NewClient(&redis.Options{
+		Addr: mr.Addr(),
+	})
+
+	p := &redisPeer{
+		redis: rdb,
+	}
+
+	channel := newRedisChannel(p, "testKey", "testChannel", "testType")
+	require.NotNil(t, channel)
+}
+
+func TestBroadcastAndHandleMessages(t *testing.T) {
+	const channelName = "testChannel"
+
+	mr, err := miniredis.Run()
+	require.NoError(t, err)
+	defer mr.Close()
+
+	rdb := redis.NewClient(&redis.Options{
+		Addr: mr.Addr(),
+	})
+
+	p := &redisPeer{
+		redis:            rdb,
+		messagesSent:     prometheus.NewCounterVec(prometheus.CounterOpts{}, []string{update}),
+		messagesSentSize: prometheus.NewCounterVec(prometheus.CounterOpts{}, []string{update}),
+	}
+
+	channel := newRedisChannel(p, "testKey", channelName, "testType").(*RedisChannel)
+
+	pubSub := rdb.Subscribe(context.Background(), channelName)
+	msgs := pubSub.Channel()
+
+	msg := []byte("test message")
+	channel.Broadcast(msg)
+
+	receivedMsg := <-msgs
+
+	var part clusterpb.Part
+	err = part.Unmarshal([]byte(receivedMsg.Payload))
+	require.NoError(t, err)
+
+	require.Equal(t, channelName, receivedMsg.Channel)
+	require.Equal(t, msg, part.Data)
+}
diff --git a/pkg/services/ngalert/notifier/redis_peer.go b/pkg/services/ngalert/notifier/redis_peer.go
new file mode 100644
index 00000000000..53f8b0ebdf9
--- /dev/null
+++ b/pkg/services/ngalert/notifier/redis_peer.go
@@ -0,0 +1,564 @@
+package notifier
+
+import (
+	"context"
+	"fmt"
+	"sort"
+	"strconv"
+	"sync"
+	"time"
+
+	"github.com/gogo/protobuf/proto"
+	"github.com/google/uuid"
+	"github.com/prometheus/alertmanager/cluster"
+	"github.com/prometheus/alertmanager/cluster/clusterpb"
+	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/redis/go-redis/v9"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+)
+
+type redisConfig struct {
+	addr     string
+	username string
+	password string
+	db       int
+	name     string
+	prefix   string
+}
+
+const (
+	peerPattern             = "*"
+	fullState               = "full_state"
+	fullStateChannel        = fullState
+	fullStateChannelReq     = fullStateChannel + ":request"
+	update                  = "update"
+	redisServerLabel        = "redis-server"
+	networkRetryIntervalMin = time.Millisecond * 100
+	networkRetryIntervalMax = time.Second * 10
+	membersSyncInterval     = time.Second * 5
+	waitForMsgIdle          = time.Millisecond * 100
+	reasonBufferOverflow    = "buffer_overflow"
+	reasonRedisIssue        = "redis_issue"
+	heartbeatInterval       = time.Second * 5
+	heartbeatTimeout        = time.Minute
+	// The duration we want to return the members if the network is down.
+	membersValidFor = time.Minute
+)
+
+type redisPeer struct {
+	name      string
+	redis     *redis.Client
+	prefix    string
+	logger    log.Logger
+	states    map[string]cluster.State
+	subs      map[string]*redis.PubSub
+	statesMtx sync.RWMutex
+
+	readyc    chan struct{}
+	shutdownc chan struct{}
+
+	pushPullInterval time.Duration
+
+	messagesReceived        *prometheus.CounterVec
+	messagesReceivedSize    *prometheus.CounterVec
+	messagesSent            *prometheus.CounterVec
+	messagesSentSize        *prometheus.CounterVec
+	messagesPublishFailures *prometheus.CounterVec
+	nodePingDuration        *prometheus.HistogramVec
+	nodePingFailures        prometheus.Counter
+
+	// List of active members of the cluster. Should be accessed through the Members function.
+	members    []string
+	membersMtx sync.Mutex
+	// The time when we fetched the members from redis the last time successfully.
+	membersFetchedAt time.Time
+}
+
+func newRedisPeer(cfg redisConfig, logger log.Logger, reg prometheus.Registerer,
+	pushPullInterval time.Duration) (*redisPeer, error) {
+	name := "peer-" + uuid.New().String()
+	// If a specific name is provided, overwrite default one.
+	if cfg.name != "" {
+		name = cfg.name
+	}
+	rdb := redis.NewClient(&redis.Options{
+		Addr:     cfg.addr,
+		Username: cfg.username,
+		Password: cfg.password,
+		DB:       cfg.db,
+	})
+	cmd := rdb.Ping(context.Background())
+	if cmd.Err() != nil {
+		return nil, fmt.Errorf("failed to ping redis: %w", cmd.Err())
+	}
+	// Make sure that the prefix uses a colon at the end as deliminator.
+	if cfg.prefix != "" && cfg.prefix[len(cfg.prefix)-1] != ':' {
+		cfg.prefix = cfg.prefix + ":"
+	}
+	p := &redisPeer{
+		name:             name,
+		redis:            rdb,
+		logger:           logger,
+		states:           map[string]cluster.State{},
+		subs:             map[string]*redis.PubSub{},
+		pushPullInterval: pushPullInterval,
+		readyc:           make(chan struct{}),
+		shutdownc:        make(chan struct{}),
+		prefix:           cfg.prefix,
+		members:          make([]string, 0),
+	}
+
+	// The metrics for the redis peer are exactly the same as for the official
+	// upstream Memberlist implementation. Three metrics that doesn't make sense
+	// for redis are not available: messagesPruned, messagesQueued, nodeAlive.
+	messagesReceived := prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: "alertmanager_cluster_messages_received_total",
+		Help: "Total number of cluster messages received.",
+	}, []string{"msg_type"})
+	messagesReceivedSize := prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: "alertmanager_cluster_messages_received_size_total",
+		Help: "Total size of cluster messages received.",
+	}, []string{"msg_type"})
+	messagesSent := prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: "alertmanager_cluster_messages_sent_total",
+		Help: "Total number of cluster messages sent.",
+	}, []string{"msg_type"})
+	messagesSentSize := prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: "alertmanager_cluster_messages_sent_size_total",
+		Help: "Total size of cluster messages sent.",
+	}, []string{"msg_type"})
+	messagesPublishFailures := prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: "alertmanager_cluster_messages_publish_failures_total",
+		Help: "Total number of messages that failed to be published.",
+	}, []string{"msg_type", "reason"})
+	gossipClusterMembers := prometheus.NewGaugeFunc(prometheus.GaugeOpts{
+		Name: "alertmanager_cluster_members",
+		Help: "Number indicating current number of members in cluster.",
+	}, func() float64 {
+		return float64(p.ClusterSize())
+	})
+	peerPosition := prometheus.NewGaugeFunc(prometheus.GaugeOpts{
+		Name: "alertmanager_peer_position",
+		Help: "Position the Alertmanager instance believes it's in. The position determines a peer's behavior in the cluster.",
+	}, func() float64 {
+		return float64(p.Position())
+	})
+	healthScore := prometheus.NewGaugeFunc(prometheus.GaugeOpts{
+		Name: "alertmanager_cluster_health_score",
+		Help: "Health score of the cluster. Lower values are better and zero means 'totally healthy'.",
+	}, func() float64 {
+		return float64(p.GetHealthScore())
+	})
+	nodePingDuration := prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		Name:    "alertmanager_cluster_pings_seconds",
+		Help:    "Histogram of latencies for ping messages.",
+		Buckets: []float64{.005, .01, .025, .05, .1, .25, .5},
+	}, []string{"peer"},
+	)
+	nodePingFailures := prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "alertmanager_cluster_pings_failures_total",
+		Help: "Total number of failed pings.",
+	})
+
+	messagesReceived.WithLabelValues(fullState)
+	messagesReceivedSize.WithLabelValues(fullState)
+	messagesReceived.WithLabelValues(update)
+	messagesReceivedSize.WithLabelValues(update)
+	messagesSent.WithLabelValues(fullState)
+	messagesSentSize.WithLabelValues(fullState)
+	messagesSent.WithLabelValues(update)
+	messagesSentSize.WithLabelValues(update)
+	messagesPublishFailures.WithLabelValues(fullState, reasonRedisIssue)
+	messagesPublishFailures.WithLabelValues(update, reasonRedisIssue)
+	messagesPublishFailures.WithLabelValues(update, reasonBufferOverflow)
+
+	reg.MustRegister(messagesReceived, messagesReceivedSize, messagesSent, messagesSentSize,
+		gossipClusterMembers, peerPosition, healthScore, nodePingDuration, nodePingFailures,
+		messagesPublishFailures,
+	)
+
+	p.messagesReceived = messagesReceived
+	p.messagesReceivedSize = messagesReceivedSize
+	p.messagesSent = messagesSent
+	p.messagesSentSize = messagesSentSize
+	p.messagesPublishFailures = messagesPublishFailures
+	p.nodePingDuration = nodePingDuration
+	p.nodePingFailures = nodePingFailures
+
+	p.subs[fullStateChannel] = p.redis.Subscribe(context.Background(), p.withPrefix(fullStateChannel))
+	p.subs[fullStateChannelReq] = p.redis.Subscribe(context.Background(), p.withPrefix(fullStateChannelReq))
+
+	go p.heartbeatLoop()
+	go p.membersSyncLoop()
+	go p.fullStateSyncPublishLoop()
+	go p.fullStateSyncReceiveLoop()
+	go p.fullStateReqReceiveLoop()
+
+	return p, nil
+}
+
+func (p *redisPeer) withPrefix(str string) string {
+	return p.prefix + str
+}
+
+func (p *redisPeer) heartbeatLoop() {
+	ticker := time.NewTicker(heartbeatInterval)
+	for {
+		select {
+		case <-ticker.C:
+			startTime := time.Now()
+			cmd := p.redis.Set(context.Background(), p.withPrefix(p.name), time.Now().Unix(), time.Minute*5)
+			reqDur := time.Since(startTime)
+			if cmd.Err() != nil {
+				p.nodePingFailures.Inc()
+				p.logger.Error("error setting the heartbeat key", "err", cmd.Err(), "peer", p.withPrefix(p.name))
+				continue
+			}
+			p.nodePingDuration.WithLabelValues(redisServerLabel).Observe(reqDur.Seconds())
+		case <-p.shutdownc:
+			ticker.Stop()
+			return
+		}
+	}
+}
+
+func (p *redisPeer) membersSyncLoop() {
+	ticker := time.NewTicker(membersSyncInterval)
+	for {
+		select {
+		case <-ticker.C:
+			p.membersSync()
+		case <-p.shutdownc:
+			ticker.Stop()
+			return
+		}
+	}
+}
+
+func (p *redisPeer) membersSync() {
+	startTime := time.Now()
+	// The 100 is a hint for the server, how many records there might be for the
+	// provided pattern. It _might_ only return the first 100 records, which should
+	// be more than enough for our use case.
+	// More here: https://redis.io/commands/scan/
+	members, _, err := p.redis.Scan(context.Background(), 0, p.withPrefix(peerPattern), 100).Result()
+	if err != nil {
+		p.logger.Error("error getting keys from redis", "err", err, "pattern", p.withPrefix(peerPattern))
+		// To prevent a spike of duplicate messages, we return for the duration of
+		// membersValidFor the last known members and only empty the list if we do
+		// not eventually recover.
+		if p.membersFetchedAt.Before(time.Now().Add(-membersValidFor)) {
+			p.membersMtx.Lock()
+			p.members = []string{}
+			p.membersMtx.Unlock()
+			return
+		}
+		p.logger.Warn("fetching members from redis failed, falling back to last known members", "last_known", p.members)
+		return
+	}
+	// This might happen on startup, when no value is in the store yet.
+	if len(members) == 0 {
+		p.membersMtx.Lock()
+		p.members = []string{}
+		p.membersMtx.Unlock()
+		return
+	}
+	values := p.redis.MGet(context.Background(), members...)
+	if values.Err() != nil {
+		p.logger.Error("error getting values from redis", "err", values.Err(), "keys", members)
+	}
+	// After getting the list of possible members from redis, we filter
+	// those out that have failed to send a heartbeat during the heartbeatTimeout.
+	peers := p.filterUnhealthyMembers(members, values.Val())
+	sort.Strings(peers)
+	dur := time.Since(startTime)
+	p.logger.Debug("membership sync done", "duration_ms", dur.Milliseconds())
+	p.membersMtx.Lock()
+	p.members = peers
+	p.membersMtx.Unlock()
+	p.membersFetchedAt = time.Now()
+}
+
+// filterUnhealthyMembers will filter out the members that have failed to send
+// a heartbeat since heartbeatTimeout.
+func (p *redisPeer) filterUnhealthyMembers(members []string, values []interface{}) []string {
+	peers := []string{}
+	for i, peer := range members {
+		val := values[i]
+		if val == nil {
+			continue
+		}
+		ts, err := strconv.ParseInt(val.(string), 10, 64)
+		if err != nil {
+			p.logger.Error("error parsing timestamp value", "err", err, "peer", peer, "val", val)
+			continue
+		}
+		tm := time.Unix(ts, 0)
+		if tm.Before(time.Now().Add(-heartbeatTimeout)) {
+			continue
+		}
+		peers = append(peers, peer)
+	}
+	return peers
+}
+
+func (p *redisPeer) Position() int {
+	for i, peer := range p.Members() {
+		if peer == p.withPrefix(p.name) {
+			p.logger.Debug("cluster position found", "name", p.name, "position", i)
+			return i
+		}
+	}
+	p.logger.Warn("failed to look up position, falling back to position 0")
+	return 0
+}
+
+// Returns the known size of the Cluster. This also includes dead nodes that
+// haven't timeout yet.
+func (p *redisPeer) ClusterSize() int {
+	scan := p.redis.Scan(context.Background(), 0, p.withPrefix(peerPattern), 100)
+	if scan.Err() != nil {
+		p.logger.Error("error getting keys from redis", "err", scan.Err(), "pattern", p.withPrefix(peerPattern))
+		return 0
+	}
+	members, _ := scan.Val()
+	return len(members)
+}
+
+// If the cluster is healthy it should return 0, otherwise the number of
+// unhealthy nodes.
+func (p *redisPeer) GetHealthScore() int {
+	size := p.ClusterSize()
+	members := len(p.Members())
+	if size > members {
+		return size - members
+	}
+	return 0
+}
+
+// Members returns a list of active cluster Members.
+func (p *redisPeer) Members() []string {
+	p.membersMtx.Lock()
+	defer p.membersMtx.Unlock()
+	return p.members
+}
+
+func (p *redisPeer) WaitReady(ctx context.Context) error {
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-p.readyc:
+		return nil
+	}
+}
+
+// Settle is mostly copied from uptream.
+// Ref: https://github.com/prometheus/alertmanager/blob/2888649b473970400c0bd375fdd563486dc80481/cluster/cluster.go#L674-L712
+func (p *redisPeer) Settle(ctx context.Context, interval time.Duration) {
+	const NumOkayRequired = 3
+	p.logger.Info("Waiting for gossip to settle...", "interval", interval)
+	start := time.Now()
+	nPeers := 0
+	nOkay := 0
+	totalPolls := 0
+	for {
+		select {
+		case <-ctx.Done():
+			elapsed := time.Since(start)
+			p.logger.Info("gossip not settled but continuing anyway", "polls", totalPolls, "elapsed", elapsed)
+			close(p.readyc)
+			return
+		case <-time.After(interval):
+		}
+		elapsed := time.Since(start)
+		n := len(p.Members())
+		if nOkay >= NumOkayRequired {
+			p.logger.Info("gossip settled; proceeding", "elapsed", elapsed)
+			break
+		}
+		if n == nPeers {
+			nOkay++
+			p.logger.Debug("gossip looks settled", "elapsed", elapsed)
+		} else {
+			nOkay = 0
+			p.logger.Info("gossip not settled", "polls", totalPolls, "before", nPeers, "now", n, "elapsed", elapsed)
+		}
+		nPeers = n
+		totalPolls++
+	}
+	p.requestFullState()
+	close(p.readyc)
+}
+
+func (p *redisPeer) AddState(key string, state cluster.State, _ prometheus.Registerer) cluster.ClusterChannel {
+	p.statesMtx.Lock()
+	defer p.statesMtx.Unlock()
+	p.states[key] = state
+	// As we also want to get the state from other nodes, we subscribe to the key.
+	sub := p.redis.Subscribe(context.Background(), p.withPrefix(key))
+	go p.receiveLoop(key, sub)
+	p.subs[key] = sub
+	return newRedisChannel(p, key, p.withPrefix(key), update)
+}
+
+func (p *redisPeer) receiveLoop(name string, channel *redis.PubSub) {
+	for {
+		select {
+		case <-p.shutdownc:
+			return
+		case data := <-channel.Channel():
+			p.mergePartialState([]byte(data.Payload))
+		default:
+			time.Sleep(waitForMsgIdle)
+		}
+	}
+}
+
+func (p *redisPeer) mergePartialState(buf []byte) {
+	p.messagesReceived.WithLabelValues(update).Inc()
+	p.messagesReceivedSize.WithLabelValues(update).Add(float64(len(buf)))
+
+	var part clusterpb.Part
+	if err := proto.Unmarshal(buf, &part); err != nil {
+		p.logger.Warn("error decoding the received broadcast message", "err", err)
+		return
+	}
+
+	p.statesMtx.RLock()
+	s, ok := p.states[part.Key]
+	p.statesMtx.RUnlock()
+
+	if !ok {
+		return
+	}
+	if err := s.Merge(part.Data); err != nil {
+		p.logger.Warn("error merging the received broadcast message", "err", err, "key", part.Key)
+		return
+	}
+	p.logger.Debug("partial state was successfully merged", "key", part.Key)
+}
+
+func (p *redisPeer) fullStateReqReceiveLoop() {
+	for {
+		select {
+		case <-p.shutdownc:
+			return
+		case data := <-p.subs[fullStateChannelReq].Channel():
+			// The payload of a full state request is the name of the peer that is
+			// requesting the full state. In case we received our own request, we
+			// can just ignore it. Redis pub/sub fanouts to all clients, regardless
+			// if a client was also the publisher.
+			if data.Payload == p.name {
+				continue
+			}
+			p.fullStateSyncPublish()
+		default:
+			time.Sleep(waitForMsgIdle)
+		}
+	}
+}
+
+func (p *redisPeer) fullStateSyncReceiveLoop() {
+	for {
+		select {
+		case <-p.shutdownc:
+			return
+		case data := <-p.subs[fullStateChannel].Channel():
+			p.mergeFullState([]byte(data.Payload))
+		default:
+			time.Sleep(waitForMsgIdle)
+		}
+	}
+}
+
+func (p *redisPeer) mergeFullState(buf []byte) {
+	p.messagesReceived.WithLabelValues(fullState).Inc()
+	p.messagesReceivedSize.WithLabelValues(fullState).Add(float64(len(buf)))
+
+	var fs clusterpb.FullState
+	if err := proto.Unmarshal(buf, &fs); err != nil {
+		p.logger.Warn("error unmarshaling the received remote state", "err", err)
+		return
+	}
+
+	p.statesMtx.RLock()
+	defer p.statesMtx.RUnlock()
+	for _, part := range fs.Parts {
+		s, ok := p.states[part.Key]
+		if !ok {
+			p.logger.Warn("received", "unknown state key", "len", len(buf), "key", part.Key)
+			continue
+		}
+		if err := s.Merge(part.Data); err != nil {
+			p.logger.Warn("error merging the received remote state", "err", err, "key", part.Key)
+			return
+		}
+	}
+	p.logger.Debug("full state was successfully merged")
+}
+
+func (p *redisPeer) fullStateSyncPublish() {
+	pub := p.redis.Publish(context.Background(), p.withPrefix(fullStateChannel), p.LocalState())
+	if pub.Err() != nil {
+		p.messagesPublishFailures.WithLabelValues(fullState, reasonRedisIssue).Inc()
+		p.logger.Error("error publishing a message to redis", "err", pub.Err(), "channel", p.withPrefix(fullStateChannel))
+	}
+}
+
+func (p *redisPeer) fullStateSyncPublishLoop() {
+	ticker := time.NewTicker(p.pushPullInterval)
+	for {
+		select {
+		case <-ticker.C:
+			p.fullStateSyncPublish()
+		case <-p.shutdownc:
+			ticker.Stop()
+			return
+		}
+	}
+}
+
+func (p *redisPeer) requestFullState() {
+	pub := p.redis.Publish(context.Background(), p.withPrefix(fullStateChannelReq), p.name)
+	if pub.Err() != nil {
+		p.messagesPublishFailures.WithLabelValues(fullState, reasonRedisIssue).Inc()
+		p.logger.Error("error publishing a message to redis", "err", pub.Err(), "channel", p.withPrefix(fullStateChannelReq))
+	}
+}
+
+func (p *redisPeer) LocalState() []byte {
+	p.statesMtx.RLock()
+	defer p.statesMtx.RUnlock()
+	all := &clusterpb.FullState{
+		Parts: make([]clusterpb.Part, 0, len(p.states)),
+	}
+
+	for key, s := range p.states {
+		b, err := s.MarshalBinary()
+		if err != nil {
+			p.logger.Warn("error encoding the local state", "err", err, "key", key)
+		}
+		all.Parts = append(all.Parts, clusterpb.Part{Key: key, Data: b})
+	}
+	b, err := proto.Marshal(all)
+	if err != nil {
+		p.logger.Warn("error encoding the local state to proto", "err", err)
+	}
+	p.messagesSent.WithLabelValues(fullState).Inc()
+	p.messagesSentSize.WithLabelValues(fullState).Add(float64(len(b)))
+	return b
+}
+
+func (p *redisPeer) Shutdown() {
+	p.logger.Info("Stopping redis peer...")
+	close(p.shutdownc)
+	p.fullStateSyncPublish()
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+	del := p.redis.Del(ctx, p.withPrefix(p.name))
+	if del.Err() != nil {
+		p.logger.Error("error deleting the redis key on shutdown", "err", del.Err(), "key", p.withPrefix(p.name))
+	}
+}
diff --git a/pkg/setting/setting_unified_alerting.go b/pkg/setting/setting_unified_alerting.go
index bf80548abbf..63b75b51578 100644
--- a/pkg/setting/setting_unified_alerting.go
+++ b/pkg/setting/setting_unified_alerting.go
@@ -71,6 +71,12 @@ type UnifiedAlertingSettings struct {
 	HAPeerTimeout                  time.Duration
 	HAGossipInterval               time.Duration
 	HAPushPullInterval             time.Duration
+	HARedisAddr                    string
+	HARedisPeerName                string
+	HARedisPrefix                  string
+	HARedisUsername                string
+	HARedisPassword                string
+	HARedisDB                      int
 	MaxAttempts                    int64
 	MinInterval                    time.Duration
 	EvaluationTimeout              time.Duration
@@ -224,6 +230,12 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
 	}
 	uaCfg.HAListenAddr = ua.Key("ha_listen_address").MustString(alertmanagerDefaultClusterAddr)
 	uaCfg.HAAdvertiseAddr = ua.Key("ha_advertise_address").MustString("")
+	uaCfg.HARedisAddr = ua.Key("ha_redis_address").MustString("")
+	uaCfg.HARedisPeerName = ua.Key("ha_redis_peer_name").MustString("")
+	uaCfg.HARedisPrefix = ua.Key("ha_redis_prefix").MustString("")
+	uaCfg.HARedisUsername = ua.Key("ha_redis_username").MustString("")
+	uaCfg.HARedisPassword = ua.Key("ha_redis_password").MustString("")
+	uaCfg.HARedisDB = ua.Key("ha_redis_db").MustInt(0)
 	peers := ua.Key("ha_peers").MustString("")
 	uaCfg.HAPeers = make([]string, 0)
 	if peers != "" {

From 8548218776557afe9d683e71c348898030f73e03 Mon Sep 17 00:00:00 2001
From: Misi <mgyongyosi@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:28:14 +0200
Subject: [PATCH 252/729] Devenv: Add prometheus_oauth2_proxy_azure devenv
 (#66825)

Add prometheus_oauth2_proxy_azure devenv
---
 .../prometheus_oauth2_proxy_azure/README.md   | 25 +++++++++++++++++
 .../docker-compose.yaml                       | 27 +++++++++++++++++++
 .../oauth2-proxy.example.cfg                  | 13 +++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/README.md
 create mode 100644 devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/docker-compose.yaml
 create mode 100644 devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/oauth2-proxy.example.cfg

diff --git a/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/README.md b/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/README.md
new file mode 100644
index 00000000000..e8af6516516
--- /dev/null
+++ b/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/README.md
@@ -0,0 +1,25 @@
+# Prometheus behind an OAuth2-proxy
+
+## How to setup OAuth2-proxy
+
+1. Make a copy of `oauth2-proxy.example.cfg` and rename it to `oauth2-proxy.cfg`
+1. Fill in the required information (`azure client id`, `azure client secret`, `azure tenant id`)
+1. Start the containers by executing `make devenv sources="prometheus,auth/prometheus_oauth2_proxy_azure"`
+> If you would like to test the login flow from the browser then you need to setup TLS or start a tunnel. I usually use a tunnel (`cloudflared tunnel --url http://localhost:4180`). Do not forget to set the Redirect URIs on Azure's App Registration page
+
+## How to add a new Prometheus datasource with Azure Authentication enabled
+
+1. Navigate to Grafana and login
+1. Add a new Prometheus datasource
+1. On the new Prometheus datasource page
+   1. Set the URL
+   1. Enable Azure Authentication
+   1. Fill in the required fields of the `Azure Authentication` section
+   1. Click `Save & test` 
+   1. You should get a "Data source is working" message
+
+If you check the logs of OAuth2-proxy, you should see similar lines to this:
+```
+2023-04-19 11:29:40 172.31.0.1:55602 - d96b832a-170a-41eb-a974-6558c5ce4454 - - [2023/04/19 09:29:40] some-random-tunnel-address.trycloudflare.com GET / "/api/v1/status/buildinfo" HTTP/1.1 "Grafana/10.0.0-pre" 200 187 0.016
+2023-04-19 11:29:41 172.31.0.1:55602 - db27c56a-ccd6-4cdb-a040-318113781abf - 65ac87f4-931f-4e46-9761-f8bf1ad36b48 [2023/04/19 09:29:41] some-random-tunnel-address.trycloudflare.com POST / "/api/v1/query" HTTP/1.1 "Grafana/10.0.0-pre" 200 103 0.003
+```
\ No newline at end of file
diff --git a/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/docker-compose.yaml b/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/docker-compose.yaml
new file mode 100644
index 00000000000..817adf1bb83
--- /dev/null
+++ b/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/docker-compose.yaml
@@ -0,0 +1,27 @@
+  oauth2proxy:
+    container_name: oauth2-proxy
+    image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0
+    command: --config /oauth2-proxy.cfg
+    # command: [
+    #   "--provider=azure",
+    #   "--cookie-secret=SECRETSECRET1234",
+    #   "--client-id=<azure client id>",
+    #   "--client-secret=<azure client secret>",
+    #   "--azure-tenant=<azure tenant id>",
+    #   "--oidc-issuer-url=https://login.microsoftonline.com/<azure tenant id>/v2.0",
+    #   "--email-domain=*",
+    #   "--http-address=0.0.0.0:4180",
+    #   "--ssl-upstream-insecure-skip-verify=true",
+    #   "--upstream=http://local-prometheus:9090/",
+    #   "--skip-jwt-bearer-tokens=true",
+    #   "--extra-jwt-issuers=https://sts.windows.net/<azure tenant id>/=https://prometheus.monitor.azure.com",
+    #   "--skip-auth-route=/api/v1/status/buildinfo",
+    # ]
+    ports:
+      - 4180:4180
+    hostname: oauth2-proxy
+    volumes:
+      - "./docker/blocks/auth/prometheus_oauth2_proxy_azure/oauth2-proxy.cfg:/oauth2-proxy.cfg"
+    extra_hosts:
+      - "local-prometheus:host-gateway"
+    restart: unless-stopped
diff --git a/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/oauth2-proxy.example.cfg b/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/oauth2-proxy.example.cfg
new file mode 100644
index 00000000000..dc9771bb076
--- /dev/null
+++ b/devenv/docker/blocks/auth/prometheus_oauth2_proxy_azure/oauth2-proxy.example.cfg
@@ -0,0 +1,13 @@
+provider="azure"
+cookie_secret="SECRETSECRET1234"
+client_id="<azure client id>"
+client_secret="<azure client secret>"
+azure_tenant="<azure tenant id>"
+oidc_issuer_url="https://login.microsoftonline.com/<azure tenant id>/v2.0"
+email_domains=["*"]
+http_address="0.0.0.0:4180"
+ssl_upstream_insecure_skip_verify="true"
+upstreams=[ "http://local-prometheus:9090/" ]
+skip_jwt_bearer_tokens="true"
+extra_jwt_issuers="https://sts.windows.net/<azure tenant id>/=https://prometheus.monitor.azure.com"
+skip_auth_routes=[ "/api/v1/status/buildinfo" ]

From c161b28f2975906f10d0223005a86f2a07f0cf27 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Wed, 19 Apr 2023 16:32:20 +0100
Subject: [PATCH 253/729] AzureMonitor: Ensure dimension labels are consistent
 (#66783)

Ensure dimension labels are consistent
---
 .../components/MetricsQueryEditor/DimensionFields.test.tsx | 2 +-
 .../components/MetricsQueryEditor/DimensionFields.tsx      | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx
index 6fc76be570d..8c367e8c6b6 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx
@@ -140,7 +140,7 @@ describe(`Azure Monitor QueryEditor`, () => {
           {
             ...mockPanelData.series[0].fields[0],
             name: 'Test Dimension 1',
-            labels: { testdimension1: 'testlabel' },
+            labels: { Testdimension1: 'testlabel' },
           },
         ],
       },
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx
index b0342efe96a..8e2d227ba05 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx
@@ -33,10 +33,11 @@ const useDimensionLabels = (data: PanelData | undefined, query: AzureMonitorQuer
       for (const label of labels) {
         // Labels only exist for series that have a dimension selected
         for (const [dimension, value] of Object.entries(label)) {
-          if (labelsObj[dimension]) {
-            labelsObj[dimension].add(value);
+          const dimensionLower = dimension.toLowerCase();
+          if (labelsObj[dimensionLower]) {
+            labelsObj[dimensionLower].add(value);
           } else {
-            labelsObj[dimension] = new Set([value]);
+            labelsObj[dimensionLower] = new Set([value]);
           }
         }
       }

From 772d00b28f9dd1778449c10c8fe75df612a0876f Mon Sep 17 00:00:00 2001
From: Ezequiel Victorero <ezequiel.victorero@grafana.com>
Date: Wed, 19 Apr 2023 12:32:44 -0300
Subject: [PATCH 254/729] PublicDashboards: RBAC update docs (#66529)

---
 .../custom-role-actions-scopes/index.md             |  1 +
 .../rbac-fixed-basic-role-definitions/index.md      | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md b/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
index 5176af499f4..8a87869b795 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
@@ -54,6 +54,7 @@ The following list contains role-based access control actions.
 | `dashboards.insights:read`           | n/a                                                                                     | Read dashboard insights data and see presence indicators.                                                                                                                                        |
 | `dashboards.permissions:read`        | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read permissions for one or more dashboards.                                                                                                                                                     |
 | `dashboards.permissions:write`       | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update permissions for one or more dashboards.                                                                                                                                                   |
+| `dashboards.public:write`            | `dashboards:*`<br>`dashboards:uid:*`                                                    | Write public dashboard configuration.                                                                                                                                                            |
 | `dashboards:read`                    | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read one or more dashboards.                                                                                                                                                                     |
 | `dashboards:write`                   | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update one or more dashboards.                                                                                                                                                                   |
 | `datasources.caching:read`           | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source query caching settings.                                                                                                                                                         |
diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
index 907ac6a92f8..9c7b74af1f3 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
@@ -17,12 +17,12 @@ The following tables list permissions associated with basic and fixed roles.
 
 ## Basic role assignments
 
-| Basic role    | Associated fixed roles                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Description                                                                                                        |
-| ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
-| Grafana Admin | `fixed:roles:reader`<br>`fixed:roles:writer`<br>`fixed:users:reader`<br>`fixed:users:writer`<br>`fixed:org.users:reader`<br>`fixed:org.users:writer`<br>`fixed:ldap:reader`<br>`fixed:ldap:writer`<br>`fixed:stats:reader`<br>`fixed:settings:reader`<br>`fixed:settings:writer`<br>`fixed:provisioning:writer`<br>`fixed:organization:reader`<br>`fixed:organization:maintainer`<br>`fixed:licensing:reader`<br>`fixed:licensing:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:maintainer`                                                                                                                                                                                                              | Default [Grafana server administrator]({{< relref "../#grafana-server-administrators" >}}) assignments.            |
-| Admin         | `fixed:reports:reader`<br>`fixed:reports:writer`<br>`fixed:datasources:reader`<br>`fixed:datasources:writer`<br>`fixed:organization:writer`<br>`fixed:datasources.permissions:reader`<br>`fixed:datasources.permissions:writer`<br>`fixed:teams:writer`<br>`fixed:dashboards:reader`<br>`fixed:dashboards:writer`<br>`fixed:dashboards.permissions:reader`<br>`fixed:dashboards.permissions:writer`<br>`fixed:folders:reader`<br>`fixed:folders:writer`<br>`fixed:folders.permissions:reader`<br>`fixed:folders.permissions:writer`<br>`fixed:alerting:writer`<br>`fixed:apikeys:reader`<br>`fixed:apikeys:writer`<br>`fixed:alerting.provisioning:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:writer` | Default [Grafana organization administrator]({{< relref "../#organization-users-and-permissions" >}}) assignments. |
-| Editor        | `fixed:datasources:explorer`<br>`fixed:dashboards:creator`<br>`fixed:folders:creator`<br>`fixed:annotations:writer`<br>`fixed:teams:creator` if the `editors_can_admin` configuration flag is enabled<br>`fixed:alerting:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | Default [Editor]({{< relref "../#organization-users-and-permissions" >}}) assignments.                             |
-| Viewer        | `fixed:datasources:id:reader`<br>`fixed:organization:reader`<br>`fixed:annotations:reader`<br>`fixed:annotations.dashboard:writer`<br>`fixed:alerting:reader`<br>`fixed:plugins.app:reader`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Default [Viewer]({{< relref "../#organization-users-and-permissions" >}}) assignments.                             |
+| Basic role    | Associated fixed roles                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | Description                                                                                                        |
+| ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
+| Grafana Admin | `fixed:roles:reader`<br>`fixed:roles:writer`<br>`fixed:users:reader`<br>`fixed:users:writer`<br>`fixed:org.users:reader`<br>`fixed:org.users:writer`<br>`fixed:ldap:reader`<br>`fixed:ldap:writer`<br>`fixed:stats:reader`<br>`fixed:settings:reader`<br>`fixed:settings:writer`<br>`fixed:provisioning:writer`<br>`fixed:organization:reader`<br>`fixed:organization:maintainer`<br>`fixed:licensing:reader`<br>`fixed:licensing:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:maintainer`                                                                                                                                                                                                                                                  | Default [Grafana server administrator]({{< relref "../#grafana-server-administrators" >}}) assignments.            |
+| Admin         | `fixed:reports:reader`<br>`fixed:reports:writer`<br>`fixed:datasources:reader`<br>`fixed:datasources:writer`<br>`fixed:organization:writer`<br>`fixed:datasources.permissions:reader`<br>`fixed:datasources.permissions:writer`<br>`fixed:teams:writer`<br>`fixed:dashboards:reader`<br>`fixed:dashboards:writer`<br>`fixed:dashboards.permissions:reader`<br>`fixed:dashboards.permissions:writer`<br>`fixed:dashboards.public:writer`<br>`fixed:folders:reader`<br>`fixed:folders:writer`<br>`fixed:folders.permissions:reader`<br>`fixed:folders.permissions:writer`<br>`fixed:alerting:writer`<br>`fixed:apikeys:reader`<br>`fixed:apikeys:writer`<br>`fixed:alerting.provisioning:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:writer` | Default [Grafana organization administrator]({{< relref "../#organization-users-and-permissions" >}}) assignments. |
+| Editor        | `fixed:datasources:explorer`<br>`fixed:dashboards:creator`<br>`fixed:folders:creator`<br>`fixed:annotations:writer`<br>`fixed:teams:creator` if the `editors_can_admin` configuration flag is enabled<br>`fixed:alerting:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | Default [Editor]({{< relref "../#organization-users-and-permissions" >}}) assignments.                             |
+| Viewer        | `fixed:datasources:id:reader`<br>`fixed:organization:reader`<br>`fixed:annotations:reader`<br>`fixed:annotations.dashboard:writer`<br>`fixed:alerting:reader`<br>`fixed:plugins.app:reader`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Default [Viewer]({{< relref "../#organization-users-and-permissions" >}}) assignments.                             |
 
 ## Fixed role definitions
 
@@ -46,6 +46,7 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:dashboards.insights:reader`     | `dashboards.insights:read`                                                                                                                                                                                                                                           | Read dashboard insights data and see presence indicators.                                                                                                                                                                                                                             |
 | `fixed:dashboards.permissions:reader`  | `dashboards.permissions:read`                                                                                                                                                                                                                                        | Read all dashboard permissions.                                                                                                                                                                                                                                                       |
 | `fixed:dashboards.permissions:writer`  | All permissions from `fixed:dashboards.permissions:reader` and <br>`dashboards.permissions:write`                                                                                                                                                                    | Read and update all dashboard permissions.                                                                                                                                                                                                                                            |
+| `fixed:dashboards.public:writer`       | `dashboards.public:write`                                                                                                                                                                                                                                            | Create, update, delete or pause a public dashboard.                                                                                                                                                                                                                                   |
 | `fixed:dashboards:reader`              | `dashboards:read`                                                                                                                                                                                                                                                    | Read all dashboards.                                                                                                                                                                                                                                                                  |
 | `fixed:dashboards:writer`              | All permissions from `fixed:dashboards:reader` and <br>`dashboards:write`<br>`dashboards:edit`<br>`dashboards:delete`<br>`dashboards:create`<br>`dashboards.permissions:read`<br>`dashboards.permissions:write`                                                      | Read, create, update, and delete all dashboards.                                                                                                                                                                                                                                      |
 | `fixed:datasources.caching:reader`     | `datasources.caching:read`                                                                                                                                                                                                                                           | Read data source query caching settings.                                                                                                                                                                                                                                              |

From 035bf2914601e79ad147002c1e898ecdf54c590e Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Wed, 19 Apr 2023 16:34:19 +0100
Subject: [PATCH 255/729] RBAC: Remove the option to disable RBAC and add
 automated permission migrations for instances that had RBAC disabled (#66652)

* RBAC: Stop reading enabeld from ini file and always set to true

* Migrations: Add a migration for rbac to reset data migrations if rbac
was disabled

* If rbac was disabled we reset the data and data migrations that rbac
  has to perform to get it to a correct state

* Migrator: Store migration logs on migrator and add function to clear it from the
in-memory stored logs

* update tests

---------

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
---
 .../accesscontrol/disabled_migration.go       | 87 +++++++++++++++++++
 .../migrations/accesscontrol/test/ac_test.go  |  8 +-
 .../sqlstore/migrations/migrations.go         |  1 +
 .../sqlstore/migrations/migrations_test.go    |  3 +-
 .../migrations/ualert/migration_test.go       |  3 +-
 pkg/services/sqlstore/migrator/migrator.go    | 12 ++-
 pkg/setting/setting.go                        |  2 +-
 7 files changed, 110 insertions(+), 6 deletions(-)
 create mode 100644 pkg/services/sqlstore/migrations/accesscontrol/disabled_migration.go

diff --git a/pkg/services/sqlstore/migrations/accesscontrol/disabled_migration.go b/pkg/services/sqlstore/migrations/accesscontrol/disabled_migration.go
new file mode 100644
index 00000000000..482966fa0f4
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/accesscontrol/disabled_migration.go
@@ -0,0 +1,87 @@
+package accesscontrol
+
+import (
+	"fmt"
+
+	"xorm.io/xorm"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+const (
+	disabledMigrationID                     = "rbac disabled migrator"
+	teamMigrationID                         = "teams permissions migration"
+	dashboardMigrationID                    = "dashboard permissions"
+	dashboardsUIDMigrationID                = "dashboard permissions uid scopes"
+	datasourceMigrationID                   = "data source permissions"
+	datasourceUIDMigrationID                = "data source uid permissions"
+	managedPermissionsMigrationID           = "managed permissions migration"
+	alertFolderMigrationID                  = "managed folder permissions alert actions repeated migration"
+	managedPermissionsEnterpriseMigrationID = "managed permissions migration enterprise"
+)
+
+var migrations = [...]string{
+	teamMigrationID,
+	dashboardMigrationID,
+	dashboardsUIDMigrationID,
+	datasourceMigrationID,
+	datasourceUIDMigrationID,
+	managedPermissionsMigrationID,
+	alertFolderMigrationID,
+	managedPermissionsEnterpriseMigrationID,
+}
+
+func AddDisabledMigrator(mg *migrator.Migrator) {
+	mg.AddMigration(disabledMigrationID, &DisabledMigrator{})
+}
+
+type DisabledMigrator struct {
+	migrator.MigrationBase
+}
+
+func (m *DisabledMigrator) SQL(dialect migrator.Dialect) string {
+	return CodeMigrationSQL
+}
+
+func (m *DisabledMigrator) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
+	enabled := mg.Cfg.Raw.Section("rbac").Key("enabled").MustBool(true)
+	if enabled {
+		// if the flag is enabled we skip the reset of data migrations
+		mg.Logger.Debug("skip reset of rbac data migrations")
+		return nil
+	}
+
+	if _, err := sess.Exec("DELETE FROM builtin_role WHERE role_id IN (SELECT id FROM role WHERE name LIKE 'managed:%')"); err != nil {
+		return fmt.Errorf("failed to remove basic role bindings: %w", err)
+	}
+
+	if _, err := sess.Exec("DELETE FROM team_role WHERE role_id IN (SELECT id FROM role WHERE name LIKE 'managed:%')"); err != nil {
+		return fmt.Errorf("failed to remove team role bindings: %w", err)
+	}
+
+	if _, err := sess.Exec("DELETE FROM user_role where role_id IN (SELECT id FROM role WHERE name LIKE 'managed:%')"); err != nil {
+		return fmt.Errorf("failed to remove user role bindings: %w", err)
+	}
+
+	if _, err := sess.Exec("DELETE FROM permission WHERE role_id IN (SELECT id FROM role WHERE name LIKE 'managed:%');"); err != nil {
+		return fmt.Errorf("failed to remove managed rbac permission: %w", err)
+	}
+
+	if _, err := sess.Exec("DELETE FROM role WHERE name LIKE 'managed:%';"); err != nil {
+		return fmt.Errorf("failed to remove managed rbac roles: %w", err)
+	}
+
+	params := []interface{}{"DELETE FROM migration_log WHERE migration_id IN (?, ?, ?, ?, ?, ?, ?, ?)"}
+	for _, m := range migrations {
+		params = append(params, m)
+	}
+
+	if _, err := sess.Exec(params...); err != nil {
+		return fmt.Errorf("failed to remove managed permissions migrations: %w", err)
+	}
+
+	// Note: we also need to clear migration from the in-memory representation of migration log
+	mg.RemoveMigrationLogs(migrations[:]...)
+
+	return nil
+}
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
index 0c5ae95ae3d..0dcae982257 100644
--- a/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
+++ b/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
 	"xorm.io/xorm"
 
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -153,6 +154,7 @@ func TestMigrations(t *testing.T) {
 			config: &setting.Cfg{
 				EditorsCanAdmin:        true,
 				IsFeatureToggleEnabled: func(key string) bool { return key == "accesscontrol" },
+				Raw:                    ini.Empty(),
 			},
 			expectedRolePerms: map[string][]rawPermission{
 				"managed:users:1:permissions": {{Action: "teams:read", Scope: team1Scope}},
@@ -181,6 +183,7 @@ func TestMigrations(t *testing.T) {
 			desc: "without editors can admin",
 			config: &setting.Cfg{
 				IsFeatureToggleEnabled: func(key string) bool { return key == "accesscontrol" },
+				Raw:                    ini.Empty(),
 			},
 			expectedRolePerms: map[string][]rawPermission{
 				"managed:users:1:permissions": {{Action: "teams:read", Scope: team1Scope}},
@@ -256,7 +259,10 @@ func setupTestDB(t *testing.T) *xorm.Engine {
 	err = migrator.NewDialect(x).CleanDB()
 	require.NoError(t, err)
 
-	mg := migrator.NewMigrator(x, &setting.Cfg{Logger: log.New("acmigration.test")})
+	mg := migrator.NewMigrator(x, &setting.Cfg{
+		Logger: log.New("acmigration.test"),
+		Raw:    ini.Empty(),
+	})
 	migrations := &migrations.OSSMigrations{}
 	migrations.AddMigration(mg)
 
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 659cfff71e1..b24b2531659 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -61,6 +61,7 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
 	accesscontrol.AddMigration(mg)
 	addQueryHistoryMigrations(mg)
 
+	accesscontrol.AddDisabledMigrator(mg)
 	accesscontrol.AddTeamMembershipMigrations(mg)
 	accesscontrol.AddDashboardPermissionsMigrator(mg)
 	accesscontrol.AddAlertingPermissionsMigrator(mg)
diff --git a/pkg/services/sqlstore/migrations/migrations_test.go b/pkg/services/sqlstore/migrations/migrations_test.go
index 96218fb3c93..7645e21cfb8 100644
--- a/pkg/services/sqlstore/migrations/migrations_test.go
+++ b/pkg/services/sqlstore/migrations/migrations_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/go-sql-driver/mysql"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
 	"xorm.io/xorm"
 
 	. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
@@ -33,7 +34,7 @@ func TestMigrations(t *testing.T) {
 	_, err = x.SQL(query).Get(&result)
 	require.Error(t, err)
 
-	mg := NewMigrator(x, &setting.Cfg{})
+	mg := NewMigrator(x, &setting.Cfg{Raw: ini.Empty()})
 	migrations := &OSSMigrations{}
 	migrations.AddMigration(mg)
 	expectedMigrations := mg.GetMigrationIDs(true)
diff --git a/pkg/services/sqlstore/migrations/ualert/migration_test.go b/pkg/services/sqlstore/migrations/ualert/migration_test.go
index 7e4c51d59fe..9f6b62891d7 100644
--- a/pkg/services/sqlstore/migrations/ualert/migration_test.go
+++ b/pkg/services/sqlstore/migrations/ualert/migration_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/prometheus/alertmanager/pkg/labels"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
 	"xorm.io/xorm"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -629,7 +630,7 @@ func setupTestDB(t *testing.T) *xorm.Engine {
 	err = migrator.NewDialect(x).CleanDB()
 	require.NoError(t, err)
 
-	mg := migrator.NewMigrator(x, &setting.Cfg{})
+	mg := migrator.NewMigrator(x, &setting.Cfg{Raw: ini.Empty()})
 	migrations := &migrations.OSSMigrations{}
 	migrations.AddMigration(mg)
 
diff --git a/pkg/services/sqlstore/migrator/migrator.go b/pkg/services/sqlstore/migrator/migrator.go
index a9ab04d987c..0223e7ba52f 100644
--- a/pkg/services/sqlstore/migrator/migrator.go
+++ b/pkg/services/sqlstore/migrator/migrator.go
@@ -27,6 +27,7 @@ type Migrator struct {
 	Logger       log.Logger
 	Cfg          *setting.Cfg
 	isLocked     atomic.Bool
+	logMap       map[string]MigrationLog
 }
 
 type MigrationLog struct {
@@ -97,9 +98,16 @@ func (mg *Migrator) GetMigrationLog() (map[string]MigrationLog, error) {
 		logMap[logItem.MigrationID] = logItem
 	}
 
+	mg.logMap = logMap
 	return logMap, nil
 }
 
+func (mg *Migrator) RemoveMigrationLogs(migrationsIDs ...string) {
+	for _, id := range migrationsIDs {
+		delete(mg.logMap, id)
+	}
+}
+
 func (mg *Migrator) Start(isDatabaseLockingEnabled bool, lockAttemptTimeout int) (err error) {
 	if !isDatabaseLockingEnabled {
 		return mg.run()
@@ -128,7 +136,7 @@ func (mg *Migrator) Start(isDatabaseLockingEnabled bool, lockAttemptTimeout int)
 func (mg *Migrator) run() (err error) {
 	mg.Logger.Info("Starting DB migrations")
 
-	logMap, err := mg.GetMigrationLog()
+	_, err = mg.GetMigrationLog()
 	if err != nil {
 		return err
 	}
@@ -138,7 +146,7 @@ func (mg *Migrator) run() (err error) {
 	start := time.Now()
 	for _, m := range mg.migrations {
 		m := m
-		_, exists := logMap[m.Id()]
+		_, exists := mg.logMap[m.Id()]
 		if exists {
 			mg.Logger.Debug("Skipping migration: Already executed", "id", m.Id())
 			migrationsSkipped++
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 06732a6d056..0ddd92535ee 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -1564,7 +1564,7 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
 
 func readAccessControlSettings(iniFile *ini.File, cfg *Cfg) {
 	rbac := iniFile.Section("rbac")
-	cfg.RBACEnabled = rbac.Key("enabled").MustBool(true)
+	cfg.RBACEnabled = true
 	cfg.RBACPermissionCache = rbac.Key("permission_cache").MustBool(true)
 	cfg.RBACPermissionValidationEnabled = rbac.Key("permission_validation_enabled").MustBool(false)
 	cfg.RBACResetBasicRoles = rbac.Key("reset_basic_roles").MustBool(false)

From d1a918489e27181b204f1677681b9c69a6aa1a3f Mon Sep 17 00:00:00 2001
From: Kristina <kristina.durivage@grafana.com>
Date: Wed, 19 Apr 2023 10:40:25 -0500
Subject: [PATCH 256/729] Explore: Remove click tracking for external links
 (#66801)

Remove click tracking for external links
---
 .../app/features/explore/utils/links.test.ts  | 10 +-------
 public/app/features/explore/utils/links.ts    | 24 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/public/app/features/explore/utils/links.test.ts b/public/app/features/explore/utils/links.test.ts
index f8bd1fa9e2c..5c1b5938768 100644
--- a/public/app/features/explore/utils/links.test.ts
+++ b/public/app/features/explore/utils/links.test.ts
@@ -57,15 +57,7 @@ describe('explore links utils', () => {
 
       expect(links[0].href).toBe('http://regionalhost');
       expect(links[0].title).toBe('external');
-      expect(links[0].onClick).toBeDefined();
-
-      links[0].onClick!({});
-
-      expect(reportInteraction).toBeCalledWith('grafana_data_link_clicked', {
-        app: CoreApp.Explore,
-        internal: false,
-        origin: DataLinkConfigOrigin.Datasource,
-      });
+      expect(links[0].onClick).not.toBeDefined();
     });
 
     it('returns generates title for external link', () => {
diff --git a/public/app/features/explore/utils/links.ts b/public/app/features/explore/utils/links.ts
index 881fb025b12..a8686e12d68 100644
--- a/public/app/features/explore/utils/links.ts
+++ b/public/app/features/explore/utils/links.ts
@@ -122,30 +122,6 @@ export const getFieldLinksForExplore = (options: {
         if (!linkModel.title) {
           linkModel.title = getTitleFromHref(linkModel.href);
         }
-
-        // Take over the onClick to report the click, then either call the original onClick or navigate to the URL
-        // Note: it is likely that an external link that opens in the same tab will not be reported, as the browser redirect might cancel reporting the interaction
-        const origOnClick = linkModel.onClick;
-
-        linkModel.onClick = (...args) => {
-          reportInteraction(DATA_LINK_USAGE_KEY, {
-            origin: link.origin || DataLinkConfigOrigin.Datasource,
-            app: CoreApp.Explore,
-            internal: false,
-          });
-
-          if (origOnClick) {
-            origOnClick?.apply(...args);
-          } else {
-            // for external links without an onClick, we want to duplicate default href behavior since onClick stops it
-            if (linkModel.target === '_blank') {
-              window.open(linkModel.href);
-            } else {
-              window.location.href = linkModel.href;
-            }
-          }
-        };
-
         return linkModel;
       } else {
         let internalLinkSpecificVars: ScopedVars = {};

From c96b704af3e61095b9580f0b502309738be5adb4 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 19 Apr 2023 18:02:37 +0200
Subject: [PATCH 257/729] Loki: Update log context UI (#66848)

* Loki: Update log context UI

* Update copy
---
 .../loki/components/LokiContextUi.test.tsx    | 64 +++++++++++++++++--
 .../loki/components/LokiContextUi.tsx         | 31 ++++++---
 2 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
index 0dc2ae6495b..eabc5968e5e 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
@@ -37,6 +37,10 @@ const setupProps = (): LokiContextUiProps => {
       },
     } as unknown as LogRowModel,
     onClose: jest.fn(),
+    origQuery: {
+      expr: '{label1="value1"} | logfmt',
+      refId: 'A',
+    },
   };
 
   return defaults;
@@ -78,7 +82,14 @@ describe('LokiContextUi', () => {
   it('renders and shows executed query text', async () => {
     const props = setupProps();
     render(<LokiContextUi {...props} />);
-    expect(await screen.findByText(/Executed log context query:/)).toBeInTheDocument();
+    await waitFor(() => {
+      // We should see the query text (it is split into multiple spans)
+      expect(screen.getByText('{')).toBeInTheDocument();
+      expect(screen.getByText('label1')).toBeInTheDocument();
+      expect(screen.getByText('=')).toBeInTheDocument();
+      expect(screen.getByText('"value1"')).toBeInTheDocument();
+      expect(screen.getByText('}')).toBeInTheDocument();
+    });
   });
 
   it('initialize context filters', async () => {
@@ -139,10 +150,8 @@ describe('LokiContextUi', () => {
   it('displays executed query even if context ui closed', async () => {
     const props = setupProps();
     render(<LokiContextUi {...props} />);
-    // We start with the context ui open
-    expect(await screen.findByText(/Executed log context query:/)).toBeInTheDocument();
-    // We click on it to close
-    await userEvent.click(screen.getByText(/Executed log context query:/));
+    // We start with the context ui open and click on it to close
+    await userEvent.click(screen.getAllByRole('button')[0]);
     await waitFor(() => {
       // We should see the query text (it is split into multiple spans)
       expect(screen.getByText('{')).toBeInTheDocument();
@@ -152,4 +161,49 @@ describe('LokiContextUi', () => {
       expect(screen.getByText('}')).toBeInTheDocument();
     });
   });
+
+  it('does not show parsed labels section if origQuery has 0 parsers', async () => {
+    const props = setupProps();
+    const newProps = {
+      ...props,
+      origQuery: {
+        expr: '{label1="value1"}',
+        refId: 'A',
+      },
+    };
+    render(<LokiContextUi {...newProps} />);
+    await waitFor(() => {
+      expect(screen.queryByText('Refine the search')).not.toBeInTheDocument();
+    });
+  });
+
+  it('shows parsed labels section if origQuery has 1 parser', async () => {
+    const props = setupProps();
+    const newProps = {
+      ...props,
+      origQuery: {
+        expr: '{label1="value1"} | logfmt',
+        refId: 'A',
+      },
+    };
+    render(<LokiContextUi {...newProps} />);
+    await waitFor(() => {
+      expect(screen.getByText('Refine the search')).toBeInTheDocument();
+    });
+  });
+
+  it('does not show parsed labels section if origQuery has 2 parsers', async () => {
+    const props = setupProps();
+    const newProps = {
+      ...props,
+      origQuery: {
+        expr: '{label1="value1"} | logfmt | json',
+        refId: 'A',
+      },
+    };
+    render(<LokiContextUi {...newProps} />);
+    await waitFor(() => {
+      expect(screen.queryByText('Refine the search')).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index ba82209170d..61a32acf93e 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -4,12 +4,13 @@ import { useAsync } from 'react-use';
 
 import { GrafanaTheme2, LogRowModel, SelectableValue } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
-import { Collapse, Label, LoadingPlaceholder, MultiSelect, Tag, Tooltip, useStyles2 } from '@grafana/ui';
+import { Collapse, Icon, Label, LoadingPlaceholder, MultiSelect, Tag, Tooltip, useStyles2 } from '@grafana/ui';
 import store from 'app/core/store';
 
 import { RawQuery } from '../../prometheus/querybuilder/shared/RawQuery';
 import { LogContextProvider } from '../LogContextProvider';
 import { escapeLabelValueInSelector } from '../languageUtils';
+import { isQueryWithParser } from '../queryUtils';
 import { lokiGrammar } from '../syntax';
 import { ContextFilter, LokiQuery } from '../types';
 
@@ -56,12 +57,18 @@ function getStyles(theme: GrafanaTheme2) {
     query: css`
       text-align: start;
       line-break: anywhere;
-      margin-top: ${theme.spacing(0.5)};
+      margin-top: -${theme.spacing(0.25)};
     `,
     ui: css`
       background-color: ${theme.colors.background.secondary};
       padding: ${theme.spacing(2)};
     `,
+    rawQuery: css`
+      display: inline;
+    `,
+    queryDescription: css`
+      margin-left: ${theme.spacing(0.5)};
+    `,
   };
 }
 
@@ -155,6 +162,9 @@ export function LokiContextUi(props: LokiContextUiProps) {
     };
   }, []);
 
+  // Currently we support adding of parser and showing parsed labels only if there is 1 parser
+  const showParsedLabels = origQuery && isQueryWithParser(origQuery.expr).parserCount === 1 && parsedLabels.length > 0;
+
   return (
     <div className={styles.wrapper}>
       <LoadingPlaceholder text="" className={`${styles.loadingPlaceholder} ${loading ? '' : styles.hidden}`} />
@@ -167,7 +177,6 @@ export function LokiContextUi(props: LokiContextUiProps) {
         }}
         label={
           <div className={styles.query}>
-            <Label>Executed log context query:</Label>
             <RawQuery
               lang={{ grammar: lokiGrammar, name: 'loki' }}
               query={logContextProvider.processContextFiltersToExpr(
@@ -175,14 +184,18 @@ export function LokiContextUi(props: LokiContextUiProps) {
                 contextFilters.filter(({ enabled }) => enabled),
                 origQuery
               )}
+              className={styles.rawQuery}
             />
+            <Tooltip content="Initially executed log context query is created from all labels defining the stream for the selected log line. Use editor bellow to customize log context query.">
+              <Icon name="info-circle" size="sm" className={styles.queryDescription} />
+            </Tooltip>
           </div>
         }
       >
         <div className={styles.ui}>
           <Tooltip
             content={
-              'This feature is experimental and only works on log queries containing no more than 1 parser (logfmt, json).'
+              'This feature is experimental and may change in the future. Currently it supports using parser and extracted labels for queries with no more than 1 parser (e.g. logfmt, json). Please report any issues in the Grafana GitHub repository.'
             }
             placement="top"
           >
@@ -190,9 +203,9 @@ export function LokiContextUi(props: LokiContextUiProps) {
           </Tooltip>{' '}
           <Label
             className={styles.label}
-            description="Context query is created from all labels defining the stream for the selected log line. Select labels to be included in log context query."
+            description="By removing some of the selected label filters, you can broaden your search."
           >
-            1. Select labels
+            Widen the search
           </Label>
           <MultiSelect
             options={realLabels.map(contextFilterToSelectFilter)}
@@ -226,13 +239,13 @@ export function LokiContextUi(props: LokiContextUiProps) {
               );
             }}
           />
-          {parsedLabels.length > 0 && (
+          {showParsedLabels && (
             <>
               <Label
                 className={styles.label}
-                description={`By using parser, you are able to filter for extracted labels. Select extracted labels to be included in log context query.`}
+                description={`By using parser in your original query, you are able to filter for extracted labels. Refine your search by applying extracted labels from selected log line.`}
               >
-                2. Add extracted label filters
+                Refine the search
               </Label>
               <MultiSelect
                 options={parsedLabels.map(contextFilterToSelectFilter)}

From 3634079b8fc6f050e550b1a127df91d4f20afc0c Mon Sep 17 00:00:00 2001
From: Alexander Weaver <weaver.alex.d@gmail.com>
Date: Wed, 19 Apr 2023 14:22:19 -0500
Subject: [PATCH 258/729] Alerting: Attach hash of instance labels to state
 history log lines (#65968)

* Add instanceID which is hash of labels

* Rename field to fingerprint

* Move to prometheus style signature

* Appease linter
---
 pkg/services/ngalert/state/historian/core.go  |  8 ++++++++
 pkg/services/ngalert/state/historian/loki.go  |  5 ++++-
 .../ngalert/state/historian/loki_test.go      | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/pkg/services/ngalert/state/historian/core.go b/pkg/services/ngalert/state/historian/core.go
index 5fff26fdfd8..f0eb45fe43f 100644
--- a/pkg/services/ngalert/state/historian/core.go
+++ b/pkg/services/ngalert/state/historian/core.go
@@ -1,10 +1,12 @@
 package historian
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	prometheus "github.com/prometheus/common/model"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
@@ -42,6 +44,12 @@ func removePrivateLabels(labels data.Labels) data.Labels {
 	return result
 }
 
+// labelFingerprint calculates a stable Prometheus-style signature for a label set.
+func labelFingerprint(labels data.Labels) string {
+	sig := prometheus.LabelsToSignature(labels)
+	return fmt.Sprintf("%016x", sig)
+}
+
 // panelKey uniquely identifies a panel.
 type panelKey struct {
 	orgID   int64
diff --git a/pkg/services/ngalert/state/historian/loki.go b/pkg/services/ngalert/state/historian/loki.go
index 1f8ff0e8196..b4610033879 100644
--- a/pkg/services/ngalert/state/historian/loki.go
+++ b/pkg/services/ngalert/state/historian/loki.go
@@ -255,6 +255,7 @@ func statesToStream(rule history_model.RuleMeta, states []state.StateTransition,
 			continue
 		}
 
+		sanitizedLabels := removePrivateLabels(state.Labels)
 		entry := lokiEntry{
 			SchemaVersion:  1,
 			Previous:       state.PreviousFormatted(),
@@ -263,7 +264,8 @@ func statesToStream(rule history_model.RuleMeta, states []state.StateTransition,
 			Condition:      rule.Condition,
 			DashboardUID:   rule.DashboardUID,
 			PanelID:        rule.PanelID,
-			InstanceLabels: removePrivateLabels(state.Labels),
+			Fingerprint:    labelFingerprint(sanitizedLabels),
+			InstanceLabels: sanitizedLabels,
 		}
 		if state.State.State == eval.Error {
 			entry.Error = state.Error.Error()
@@ -306,6 +308,7 @@ type lokiEntry struct {
 	Condition     string           `json:"condition"`
 	DashboardUID  string           `json:"dashboardUID"`
 	PanelID       int64            `json:"panelID"`
+	Fingerprint   string           `json:"fingerprint"`
 	// InstanceLabels is exactly the set of labels associated with the alert instance in Alertmanager.
 	// These should not be conflated with labels associated with log streams.
 	InstanceLabels map[string]string `json:"labels"`
diff --git a/pkg/services/ngalert/state/historian/loki_test.go b/pkg/services/ngalert/state/historian/loki_test.go
index b2c6a9b5ece..02b084b519d 100644
--- a/pkg/services/ngalert/state/historian/loki_test.go
+++ b/pkg/services/ngalert/state/historian/loki_test.go
@@ -154,6 +154,25 @@ func TestRemoteLokiBackend(t *testing.T) {
 			entry := requireSingleEntry(t, res)
 			require.Equal(t, rule.Condition, entry.Condition)
 		})
+
+		t.Run("stores fingerprint of instance labels", func(t *testing.T) {
+			rule := createTestRule()
+			l := log.NewNopLogger()
+			states := singleFromNormal(&state.State{
+				State: eval.Alerting,
+				Labels: data.Labels{
+					"statelabel": "labelvalue",
+					"labeltwo":   "labelvalue",
+					"labelthree": "labelvalue",
+				},
+			})
+
+			res := statesToStream(rule, states, nil, l)
+
+			entry := requireSingleEntry(t, res)
+			exp := labelFingerprint(states[0].Labels)
+			require.Equal(t, exp, entry.Fingerprint)
+		})
 	})
 
 	t.Run("selector string", func(t *testing.T) {

From e0c5b4f0e0c2ef04b469e59359cdec210919d926 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 19 Apr 2023 20:44:07 +0100
Subject: [PATCH 259/729] NestedFolders: Basic item selection (#66843)

* NestedFolders: Item selection state

* Select children in state

* Unselect parents when children are unselected

* remove unneeded comment

* tests

* tidy test a little bit

* tidy test a little bit

* tidy test a little bit

* tidy test a little bit

* tidy test a little bit
---
 .../src/selectors/pages.ts                    |   6 +
 .../components/BrowseView.test.tsx            | 139 ++++++++++++++++++
 .../components/BrowseView.tsx                 | 135 +++++++++++++++--
 .../components/DashboardsTree.test.tsx        |  54 ++++++-
 .../components/DashboardsTree.tsx             |  69 +++++++--
 .../fixtures/dashboardsTreeItem.fixture.ts    |  86 ++++++++++-
 .../app/features/browse-dashboards/types.ts   |   7 +-
 public/app/features/search/service/folders.ts |   1 +
 public/app/features/search/service/utils.ts   |   1 +
 public/app/features/search/types.ts           |   6 +-
 10 files changed, 462 insertions(+), 42 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/components/BrowseView.test.tsx

diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index 9336f53ad6b..33b7b282711 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -269,6 +269,12 @@ export const Pages = {
     interval: 'Playlist interval',
     itemDelete: 'Delete playlist item',
   },
+  BrowseDashbards: {
+    table: {
+      row: (uid: string) => `data-testid ${uid} row`,
+      checkbox: (uid: string) => `data-testid ${uid} checkbox`,
+    },
+  },
   Search: {
     url: '/?search=openn',
     FolderView: {
diff --git a/public/app/features/browse-dashboards/components/BrowseView.test.tsx b/public/app/features/browse-dashboards/components/BrowseView.test.tsx
new file mode 100644
index 00000000000..cb84d927bd7
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseView.test.tsx
@@ -0,0 +1,139 @@
+import { getByLabelText, render as rtlRender, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { Router } from 'react-router-dom';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { locationService } from '@grafana/runtime';
+
+import { wellFormedTree } from '../fixtures/dashboardsTreeItem.fixture';
+
+import { BrowseView } from './BrowseView';
+
+const [mockTree, { folderA, folderA_folderA, folderA_folderB, folderA_folderB_dashbdB, dashbdD }] = wellFormedTree();
+
+function render(...args: Parameters<typeof rtlRender>) {
+  const [ui, options] = args;
+
+  rtlRender(<Router history={locationService.getHistory()}>{ui}</Router>, options);
+}
+
+jest.mock('app/features/search/service/folders', () => {
+  return {
+    getFolderChildren(parentUID?: string) {
+      const childrenForUID = mockTree
+        .filter((v) => v.item.kind !== 'ui-empty-folder' && v.item.parentUID === parentUID)
+        .map((v) => v.item);
+
+      return Promise.resolve(childrenForUID);
+    },
+  };
+});
+
+describe('browse-dashboards BrowseView', () => {
+  const WIDTH = 800;
+  const HEIGHT = 600;
+
+  it('expands and collapses a folder', async () => {
+    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    await screen.findByText(folderA.item.title);
+
+    await expandFolder(folderA.item.uid);
+    expect(screen.queryByText(folderA_folderA.item.title)).toBeInTheDocument();
+
+    await collapseFolder(folderA.item.uid);
+    expect(screen.queryByText(folderA_folderA.item.title)).not.toBeInTheDocument();
+  });
+
+  it('checks items when selected', async () => {
+    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+
+    const checkbox = await screen.findByTestId(selectors.pages.BrowseDashbards.table.checkbox(dashbdD.item.uid));
+    expect(checkbox).not.toBeChecked();
+
+    await userEvent.click(checkbox);
+    expect(checkbox).toBeChecked();
+  });
+
+  it('checks all descendants when a folder is selected', async () => {
+    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    await screen.findByText(folderA.item.title);
+
+    // First expand then click folderA
+    await expandFolder(folderA.item.uid);
+    await clickCheckbox(folderA.item.uid);
+
+    // All the visible items in it should be checked now
+    const directChildren = mockTree.filter(
+      (v) => v.item.kind !== 'ui-empty-folder' && v.item.parentUID === folderA.item.uid
+    );
+
+    for (const child of directChildren) {
+      const childCheckbox = screen.queryByTestId(selectors.pages.BrowseDashbards.table.checkbox(child.item.uid));
+      expect(childCheckbox).toBeChecked();
+    }
+  });
+
+  it('checks descendants loaded after a folder is selected', async () => {
+    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    await screen.findByText(folderA.item.title);
+
+    // First expand then click folderA
+    await expandFolder(folderA.item.uid);
+    await clickCheckbox(folderA.item.uid);
+
+    // When additional children are loaded (by expanding a folder), those items
+    // should also be selected
+    await expandFolder(folderA_folderB.item.uid);
+
+    const grandchildren = mockTree.filter(
+      (v) => v.item.kind !== 'ui-empty-folder' && v.item.parentUID === folderA_folderB.item.uid
+    );
+
+    for (const child of grandchildren) {
+      const childCheckbox = screen.queryByTestId(selectors.pages.BrowseDashbards.table.checkbox(child.item.uid));
+      expect(childCheckbox).toBeChecked();
+    }
+  });
+
+  it('unchecks ancestors when unselecting an item', async () => {
+    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    await screen.findByText(folderA.item.title);
+
+    await expandFolder(folderA.item.uid);
+    await expandFolder(folderA_folderB.item.uid);
+
+    await clickCheckbox(folderA.item.uid);
+    await clickCheckbox(folderA_folderB_dashbdB.item.uid);
+
+    const itemCheckbox = screen.queryByTestId(
+      selectors.pages.BrowseDashbards.table.checkbox(folderA_folderB_dashbdB.item.uid)
+    );
+    expect(itemCheckbox).not.toBeChecked();
+
+    const parentCheckbox = screen.queryByTestId(
+      selectors.pages.BrowseDashbards.table.checkbox(folderA_folderB.item.uid)
+    );
+    expect(parentCheckbox).not.toBeChecked();
+
+    const grandparentCheckbox = screen.queryByTestId(selectors.pages.BrowseDashbards.table.checkbox(folderA.item.uid));
+    expect(grandparentCheckbox).not.toBeChecked();
+  });
+});
+
+async function expandFolder(uid: string) {
+  const row = screen.getByTestId(selectors.pages.BrowseDashbards.table.row(uid));
+  const expandButton = getByLabelText(row, 'Expand folder');
+  await userEvent.click(expandButton);
+}
+
+async function collapseFolder(uid: string) {
+  const row = screen.getByTestId(selectors.pages.BrowseDashbards.table.row(uid));
+  const expandButton = getByLabelText(row, 'Collapse folder');
+  await userEvent.click(expandButton);
+}
+
+async function clickCheckbox(uid: string) {
+  const checkbox = screen.getByTestId(selectors.pages.BrowseDashbards.table.checkbox(uid));
+  await userEvent.click(checkbox);
+}
diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
index c8b03b53350..d10d1bb3f15 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -1,7 +1,8 @@
+import produce from 'immer';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { getFolderChildren } from 'app/features/search/service/folders';
-import { DashboardViewItem } from 'app/features/search/types';
+import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
 import { DashboardsTreeItem } from '../types';
 
@@ -16,19 +17,45 @@ interface BrowseViewProps {
 export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
   const [openFolders, setOpenFolders] = useState<Record<string, boolean>>({ [folderUID ?? '$$root']: true });
 
+  const [selectedItems, setSelectedItems] = useState<
+    Record<DashboardViewItemKind, Record<string, boolean | undefined>>
+  >({
+    folder: {},
+    dashboard: {},
+    panel: {},
+  });
+
   // Rather than storing an actual tree structure (requiring traversing the tree to update children), instead
   // we keep track of children for each UID and then later combine them in the format required to display them
   const [childrenByUID, setChildrenByUID] = useState<Record<string, DashboardViewItem[] | undefined>>({});
 
-  async function loadChildrenForUID(uid: string | undefined) {
-    const folderKey = uid ?? '$$root';
+  const loadChildrenForUID = useCallback(
+    async (uid: string | undefined) => {
+      const folderKey = uid ?? '$$root';
 
-    const childItems = await getFolderChildren(uid, undefined, true);
-    setChildrenByUID((v) => ({ ...v, [folderKey]: childItems }));
-  }
+      const childItems = await getFolderChildren(uid, undefined, true);
+      setChildrenByUID((v) => ({ ...v, [folderKey]: childItems }));
+
+      // If the parent is already selected, mark these items as selected also
+      const parentIsSelected = selectedItems.folder[folderKey];
+      if (parentIsSelected) {
+        setSelectedItems((currentState) =>
+          produce(currentState, (draft) => {
+            for (const child of childItems) {
+              draft[child.kind][child.uid] = true;
+            }
+          })
+        );
+      }
+    },
+    [selectedItems]
+  );
 
   useEffect(() => {
     loadChildrenForUID(folderUID);
+    // No need to depend on loadChildrenForUID - we only want this to run
+    // when folderUID changes (initial page view)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [folderUID]);
 
   const flatTree = useMemo(
@@ -36,15 +63,66 @@ export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
     [folderUID, childrenByUID, openFolders]
   );
 
-  const handleFolderClick = useCallback((uid: string, folderIsOpen: boolean) => {
-    if (folderIsOpen) {
-      loadChildrenForUID(uid);
-    }
+  const handleFolderClick = useCallback(
+    (uid: string, newState: boolean) => {
+      if (newState) {
+        loadChildrenForUID(uid);
+      }
 
-    setOpenFolders((v) => ({ ...v, [uid]: folderIsOpen }));
-  }, []);
+      setOpenFolders((old) => ({ ...old, [uid]: newState }));
+    },
+    [loadChildrenForUID]
+  );
 
-  return <DashboardsTree items={flatTree} width={width} height={height} onFolderClick={handleFolderClick} />;
+  const handleItemSelectionChange = useCallback(
+    (item: DashboardViewItem, newState: boolean) => {
+      // Recursively set selection state for this item and all descendants
+      setSelectedItems((old) =>
+        produce(old, (draft) => {
+          function markChildren(kind: DashboardViewItemKind, uid: string) {
+            draft[kind][uid] = newState;
+            if (kind !== 'folder') {
+              return;
+            }
+
+            let children = childrenByUID[uid] ?? [];
+            for (const child of children) {
+              markChildren(child.kind, child.uid);
+            }
+          }
+
+          markChildren(item.kind, item.uid);
+
+          // If we're unselecting an item, unselect all ancestors also
+          if (!newState) {
+            let nextParentUID = item.parentUID;
+
+            while (nextParentUID) {
+              const parent = findItem(childrenByUID, nextParentUID);
+              if (!parent) {
+                break;
+              }
+
+              draft[parent.kind][parent.uid] = false;
+              nextParentUID = parent.parentUID;
+            }
+          }
+        })
+      );
+    },
+    [childrenByUID]
+  );
+
+  return (
+    <DashboardsTree
+      items={flatTree}
+      width={width}
+      height={height}
+      selectedItems={selectedItems}
+      onFolderClick={handleFolderClick}
+      onItemSelectionChange={handleItemSelectionChange}
+    />
+  );
 }
 
 // Creates a flat list of items, with nested children indicated by its increasing level
@@ -54,17 +132,22 @@ function createFlatTree(
   openFolders: Record<string, boolean>,
   level = 0
 ): DashboardsTreeItem[] {
-  function mapItem(item: DashboardViewItem, level: number): DashboardsTreeItem[] {
+  function mapItem(item: DashboardViewItem, parentUID: string | undefined, level: number): DashboardsTreeItem[] {
     const mappedChildren = createFlatTree(item.uid, childrenByUID, openFolders, level + 1);
 
     const isOpen = Boolean(openFolders[item.uid]);
     const emptyFolder = childrenByUID[item.uid]?.length === 0;
     if (isOpen && emptyFolder) {
-      mappedChildren.push({ isOpen: false, level: level + 1, item: { kind: 'ui-empty-folder' } });
+      mappedChildren.push({
+        isOpen: false,
+        level: level + 1,
+        item: { kind: 'ui-empty-folder', uid: item.uid + '-empty-folder' },
+      });
     }
 
     const thisItem = {
       item,
+      parentUID,
       level,
       isOpen,
     };
@@ -76,5 +159,25 @@ function createFlatTree(
   const isOpen = Boolean(openFolders[folderKey]);
   const items = (isOpen && childrenByUID[folderKey]) || [];
 
-  return items.flatMap((item) => mapItem(item, level));
+  return items.flatMap((item) => mapItem(item, rootFolderUID, level));
+}
+
+function findItem(
+  childrenByUID: Record<string, DashboardViewItem[] | undefined>,
+  uid: string
+): DashboardViewItem | undefined {
+  for (const parentUID in childrenByUID) {
+    const children = childrenByUID[parentUID];
+    if (!children) {
+      continue;
+    }
+
+    for (const child of children) {
+      if (child.uid === uid) {
+        return child;
+      }
+    }
+  }
+
+  return undefined;
 }
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
index e50d99e06ba..e773a2dc669 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
@@ -19,25 +19,58 @@ describe('browse-dashboards DashboardsTree', () => {
   const WIDTH = 800;
   const HEIGHT = 600;
 
-  const folder = wellFormedFolder();
+  const folder = wellFormedFolder(1);
   const emptyFolderIndicator = wellFormedEmptyFolder();
-  const dashboard = wellFormedDashboard();
+  const dashboard = wellFormedDashboard(2);
+  const noop = () => {};
+  const selectedItems = {
+    folder: {},
+    dashboard: {},
+    panel: {},
+  };
 
   it('renders a dashboard item', () => {
-    render(<DashboardsTree items={[dashboard]} width={WIDTH} height={HEIGHT} onFolderClick={() => {}} />);
+    render(
+      <DashboardsTree
+        items={[dashboard]}
+        selectedItems={selectedItems}
+        width={WIDTH}
+        height={HEIGHT}
+        onFolderClick={noop}
+        onItemSelectionChange={noop}
+      />
+    );
     expect(screen.queryByText(dashboard.item.title)).toBeInTheDocument();
     expect(screen.queryByText('Dashboard')).toBeInTheDocument();
   });
 
   it('renders a folder item', () => {
-    render(<DashboardsTree items={[folder]} width={WIDTH} height={HEIGHT} onFolderClick={() => {}} />);
+    render(
+      <DashboardsTree
+        items={[folder]}
+        selectedItems={selectedItems}
+        width={WIDTH}
+        height={HEIGHT}
+        onFolderClick={noop}
+        onItemSelectionChange={noop}
+      />
+    );
     expect(screen.queryByText(folder.item.title)).toBeInTheDocument();
     expect(screen.queryByText('Folder')).toBeInTheDocument();
   });
 
   it('calls onFolderClick when a folder button is clicked', async () => {
     const handler = jest.fn();
-    render(<DashboardsTree items={[folder]} width={WIDTH} height={HEIGHT} onFolderClick={handler} />);
+    render(
+      <DashboardsTree
+        items={[folder]}
+        selectedItems={selectedItems}
+        width={WIDTH}
+        height={HEIGHT}
+        onFolderClick={handler}
+        onItemSelectionChange={noop}
+      />
+    );
     const folderButton = screen.getByLabelText('Collapse folder');
     await userEvent.click(folderButton);
 
@@ -45,7 +78,16 @@ describe('browse-dashboards DashboardsTree', () => {
   });
 
   it('renders empty folder indicators', () => {
-    render(<DashboardsTree items={[emptyFolderIndicator]} width={WIDTH} height={HEIGHT} onFolderClick={() => {}} />);
+    render(
+      <DashboardsTree
+        items={[emptyFolderIndicator]}
+        selectedItems={selectedItems}
+        width={WIDTH}
+        height={HEIGHT}
+        onFolderClick={noop}
+        onItemSelectionChange={noop}
+      />
+    );
     expect(screen.queryByText('Empty folder')).toBeInTheDocument();
     expect(screen.queryByText(emptyFolderIndicator.item.kind)).not.toBeInTheDocument();
   });
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
index ed1eb6cbe20..7f5f58cda59 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
@@ -4,9 +4,11 @@ import { CellProps, Column, TableInstance, useTable } from 'react-table';
 import { FixedSizeList as List } from 'react-window';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { Checkbox, useStyles2 } from '@grafana/ui';
+import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
-import { DashboardsTreeItem, INDENT_AMOUNT_CSS_VAR } from '../types';
+import { DashboardsTreeItem, DashboardTreeSelection, INDENT_AMOUNT_CSS_VAR } from '../types';
 
 import { NameCell } from './NameCell';
 import { TypeCell } from './TypeCell';
@@ -15,28 +17,56 @@ interface DashboardsTreeProps {
   items: DashboardsTreeItem[];
   width: number;
   height: number;
+  selectedItems: DashboardTreeSelection;
   onFolderClick: (uid: string, newOpenState: boolean) => void;
+  onItemSelectionChange: (item: DashboardViewItem, newState: boolean) => void;
 }
 
 type DashboardsTreeColumn = Column<DashboardsTreeItem>;
+type DashboardsTreeCellProps = CellProps<DashboardsTreeItem, unknown> & {
+  // Note: userProps for cell renderers (e.g. second argument in `cell.render('Cell', foo)` )
+  // aren't typed, so we must be careful when accessing this
+  selectedItems?: DashboardsTreeProps['selectedItems'];
+};
 
 const HEADER_HEIGHT = 35;
 const ROW_HEIGHT = 35;
 
-export function DashboardsTree({ items, width, height, onFolderClick }: DashboardsTreeProps) {
+export function DashboardsTree({
+  items,
+  width,
+  height,
+  selectedItems,
+  onFolderClick,
+  onItemSelectionChange,
+}: DashboardsTreeProps) {
   const styles = useStyles2(getStyles);
 
   const tableColumns = useMemo(() => {
     const checkboxColumn: DashboardsTreeColumn = {
       id: 'checkbox',
       Header: () => <Checkbox value={false} />,
-      Cell: () => <Checkbox value={false} />,
+      Cell: ({ row: { original: row }, selectedItems }: DashboardsTreeCellProps) => {
+        const item = row.item;
+        if (item.kind === 'ui-empty-folder' || !selectedItems) {
+          return <></>;
+        }
+
+        const isSelected = selectedItems?.[item.kind][item.uid] ?? false;
+        return (
+          <Checkbox
+            data-testid={selectors.pages.BrowseDashbards.table.checkbox(item.uid)}
+            value={isSelected}
+            onChange={(ev) => onItemSelectionChange(item, ev.currentTarget.checked)}
+          />
+        );
+      },
     };
 
     const nameColumn: DashboardsTreeColumn = {
       id: 'name',
       Header: <span style={{ paddingLeft: 20 }}>Name</span>,
-      Cell: (props: CellProps<DashboardsTreeItem, unknown>) => <NameCell {...props} onFolderClick={onFolderClick} />,
+      Cell: (props: DashboardsTreeCellProps) => <NameCell {...props} onFolderClick={onFolderClick} />,
     };
 
     const typeColumn: DashboardsTreeColumn = {
@@ -46,11 +76,18 @@ export function DashboardsTree({ items, width, height, onFolderClick }: Dashboar
     };
 
     return [checkboxColumn, nameColumn, typeColumn];
-  }, [onFolderClick]);
+  }, [onItemSelectionChange, onFolderClick]);
 
   const table = useTable({ columns: tableColumns, data: items });
   const { getTableProps, getTableBodyProps, headerGroups } = table;
 
+  const virtualData = useMemo(() => {
+    return {
+      table,
+      selectedItems,
+    };
+  }, [table, selectedItems]);
+
   return (
     <div {...getTableProps()} className={styles.tableRoot} role="table">
       {headerGroups.map((headerGroup) => {
@@ -75,10 +112,11 @@ export function DashboardsTree({ items, width, height, onFolderClick }: Dashboar
 
       <div {...getTableBodyProps()}>
         <List
+          className="virtual list"
           height={height - HEADER_HEIGHT}
           width={width}
           itemCount={items.length}
-          itemData={table}
+          itemData={virtualData}
           itemSize={ROW_HEIGHT}
         >
           {VirtualListRow}
@@ -91,24 +129,32 @@ export function DashboardsTree({ items, width, height, onFolderClick }: Dashboar
 interface VirtualListRowProps {
   index: number;
   style: React.CSSProperties;
-  data: TableInstance<DashboardsTreeItem>;
+  data: {
+    table: TableInstance<DashboardsTreeItem>;
+    selectedItems: Record<DashboardViewItemKind, Record<string, boolean | undefined>>;
+  };
 }
 
-function VirtualListRow({ index, style, data: table }: VirtualListRowProps) {
+function VirtualListRow({ index, style, data }: VirtualListRowProps) {
   const styles = useStyles2(getStyles);
+  const { table, selectedItems } = data;
   const { rows, prepareRow } = table;
 
   const row = rows[index];
   prepareRow(row);
 
   return (
-    <div {...row.getRowProps({ style })} className={cx(styles.row, styles.bodyRow)}>
+    <div
+      {...row.getRowProps({ style })}
+      className={cx(styles.row, styles.bodyRow)}
+      data-testid={selectors.pages.BrowseDashbards.table.row(row.original.item.uid)}
+    >
       {row.cells.map((cell) => {
         const { key, ...cellProps } = cell.getCellProps();
 
         return (
           <div key={key} {...cellProps} className={styles.cell}>
-            {cell.render('Cell')}
+            {cell.render('Cell', { selectedItems })}
           </div>
         );
       })}
@@ -121,8 +167,7 @@ const getStyles = (theme: GrafanaTheme2) => {
 
   return {
     tableRoot: css({
-      // The Indented component uses this css variable to indent items to their position
-      // in the tree
+      // Responsively
       [INDENT_AMOUNT_CSS_VAR]: theme.spacing(1),
 
       [theme.breakpoints.up('md')]: {
diff --git a/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts b/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
index 6f3c33f5502..a40bd2264c0 100644
--- a/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
+++ b/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
@@ -2,39 +2,117 @@ import { Chance } from 'chance';
 
 import { DashboardViewItem } from 'app/features/search/types';
 
-import { DashboardsTreeItem } from '../types';
+import { DashboardsTreeItem, UIDashboardViewItem } from '../types';
+
+export function wellFormedEmptyFolder(
+  seed = 1,
+  partial?: Partial<DashboardsTreeItem<UIDashboardViewItem>>
+): DashboardsTreeItem<UIDashboardViewItem> {
+  const random = Chance(seed);
 
-export function wellFormedEmptyFolder(): DashboardsTreeItem {
   return {
     item: {
       kind: 'ui-empty-folder',
+      uid: random.guid(),
     },
     level: 0,
     isOpen: false,
+    ...partial,
   };
 }
 
-export function wellFormedDashboard(random = Chance(1)): DashboardsTreeItem<DashboardViewItem> {
+export function wellFormedDashboard(
+  seed = 1,
+  partial?: Partial<DashboardsTreeItem<DashboardViewItem>>,
+  itemPartial?: Partial<DashboardViewItem>
+): DashboardsTreeItem<DashboardViewItem> {
+  const random = Chance(seed);
+
   return {
     item: {
       kind: 'dashboard',
       title: random.sentence({ words: 3 }),
       uid: random.guid(),
       tags: [random.word()],
+      ...itemPartial,
     },
     level: 0,
     isOpen: false,
+    ...partial,
   };
 }
 
-export function wellFormedFolder(random = Chance(2)): DashboardsTreeItem<DashboardViewItem> {
+export function wellFormedFolder(
+  seed = 1,
+  partial?: Partial<DashboardsTreeItem<DashboardViewItem>>,
+  itemPartial?: Partial<DashboardViewItem>
+): DashboardsTreeItem<DashboardViewItem> {
+  const random = Chance(seed);
+
   return {
     item: {
       kind: 'folder',
       title: random.sentence({ words: 3 }),
       uid: random.guid(),
+      ...itemPartial,
     },
     level: 0,
     isOpen: true,
+    ...partial,
   };
 }
+
+export function wellFormedTree() {
+  let seed = 1;
+
+  // prettier-ignore so its easier to see the tree structure
+  /* prettier-ignore */ const folderA = wellFormedFolder(seed++);
+  /* prettier-ignore */ const folderA_folderA = wellFormedFolder(seed++, { level: 1}, { parentUID: folderA.item.uid });
+  /* prettier-ignore */ const folderA_folderB = wellFormedFolder(seed++, { level: 1}, { parentUID: folderA.item.uid });
+  /* prettier-ignore */ const folderA_folderB_dashbdA = wellFormedDashboard(seed++, { level: 2}, { parentUID: folderA_folderB.item.uid });
+  /* prettier-ignore */ const folderA_folderB_dashbdB = wellFormedDashboard(seed++, { level: 2}, { parentUID: folderA_folderB.item.uid });
+  /* prettier-ignore */ const folderA_folderC = wellFormedFolder(seed++, { level: 1},{ parentUID: folderA.item.uid });
+  /* prettier-ignore */ const folderA_folderC_dashbdA = wellFormedDashboard(seed++, { level: 2}, { parentUID: folderA_folderC.item.uid });
+  /* prettier-ignore */ const folderA_folderC_dashbdB = wellFormedDashboard(seed++, { level: 2}, { parentUID: folderA_folderC.item.uid });
+  /* prettier-ignore */ const folderA_dashbdD = wellFormedDashboard(seed++, { level: 1}, { parentUID: folderA.item.uid });
+  /* prettier-ignore */ const folderB = wellFormedFolder(seed++);
+  /* prettier-ignore */ const folderB_empty = wellFormedEmptyFolder(seed++);
+  /* prettier-ignore */ const folderC = wellFormedFolder(seed++);
+  /* prettier-ignore */ const dashbdD = wellFormedDashboard(seed++);
+  /* prettier-ignore */ const dashbdE = wellFormedDashboard(seed++);
+
+  return [
+    [
+      folderA,
+      folderA_folderA,
+      folderA_folderB,
+      folderA_folderB_dashbdA,
+      folderA_folderB_dashbdB,
+      folderA_folderC,
+      folderA_folderC_dashbdA,
+      folderA_folderC_dashbdB,
+      folderA_dashbdD,
+      folderB,
+      folderB_empty,
+      folderC,
+      dashbdD,
+      dashbdE,
+    ],
+    {
+      folderA,
+      folderA_folderA,
+      folderA_folderB,
+      folderA_folderB_dashbdA,
+      folderA_folderB_dashbdB,
+      folderA_folderC,
+      folderA_folderC_dashbdA,
+      folderA_folderC_dashbdB,
+      folderA_dashbdD,
+      folderB,
+      folderB_empty,
+      folderC,
+      dashbdD,
+      dashbdE,
+    },
+  ] as const;
+}
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
index 7779d4f9c0d..d9fe84c17b4 100644
--- a/public/app/features/browse-dashboards/types.ts
+++ b/public/app/features/browse-dashboards/types.ts
@@ -1,7 +1,8 @@
-import { DashboardViewItem as OrigDashboardViewItem } from 'app/features/search/types';
+import { DashboardViewItem as OrigDashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
-interface UIDashboardViewItem {
+export interface UIDashboardViewItem {
   kind: 'ui-empty-folder';
+  uid: string;
 }
 
 type DashboardViewItem = OrigDashboardViewItem | UIDashboardViewItem;
@@ -12,4 +13,6 @@ export interface DashboardsTreeItem<T extends DashboardViewItem = DashboardViewI
   isOpen: boolean;
 }
 
+export type DashboardTreeSelection = Record<DashboardViewItemKind, Record<string, boolean | undefined>>;
+
 export const INDENT_AMOUNT_CSS_VAR = '--dashboards-tree-indentation';
diff --git a/public/app/features/search/service/folders.ts b/public/app/features/search/service/folders.ts
index f6b3c39eb5d..5da1e8d0ccc 100644
--- a/public/app/features/search/service/folders.ts
+++ b/public/app/features/search/service/folders.ts
@@ -51,6 +51,7 @@ async function getChildFolders(parentUid?: string, parentTitle?: string): Promis
     uid: item.uid,
     title: item.title,
     parentTitle,
+    parentUID: parentUid,
     url: `/dashboards/f/${item.uid}/`,
   }));
 }
diff --git a/public/app/features/search/service/utils.ts b/public/app/features/search/service/utils.ts
index 357bbfe912e..923b1c5295a 100644
--- a/public/app/features/search/service/utils.ts
+++ b/public/app/features/search/service/utils.ts
@@ -81,6 +81,7 @@ export function queryResultToViewItem(
     if (parentInfo) {
       viewItem.parentTitle = parentInfo.name;
       viewItem.parentKind = parentInfo.kind;
+      viewItem.parentUID = parentUid;
     }
   }
 
diff --git a/public/app/features/search/types.ts b/public/app/features/search/types.ts
index d0f148da767..f6851f00df8 100644
--- a/public/app/features/search/types.ts
+++ b/public/app/features/search/types.ts
@@ -50,11 +50,13 @@ export interface DashboardSearchItem {
   folderUrl?: string;
 }
 
+export type DashboardViewItemKind = 'folder' | 'dashboard' | 'panel';
+
 /**
  * Type used in the folder view components
  */
 export interface DashboardViewItem {
-  kind: 'folder' | 'dashboard' | 'panel';
+  kind: DashboardViewItemKind;
   uid: string;
   title: string;
   url?: string;
@@ -62,7 +64,7 @@ export interface DashboardViewItem {
 
   icon?: string;
 
-  // Most commonly parent folder title, but can be dashboard if panelTitleSearch is enabled
+  parentUID?: string;
   parentTitle?: string;
   parentKind?: string;
 

From 47121e6e8a922473059706f18b4eb78187d09b88 Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Wed, 19 Apr 2023 20:52:08 +0100
Subject: [PATCH 260/729] Explore: make ExploreToolbar a function component
 (#66867)

---
 .../app/features/explore/ExploreToolbar.tsx   | 474 ++++++++----------
 1 file changed, 201 insertions(+), 273 deletions(-)

diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 317d7452275..73abdae0d93 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -1,6 +1,7 @@
-import { css } from '@emotion/css';
-import React, { lazy, PureComponent, RefObject, Suspense } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
+import { css, cx } from '@emotion/css';
+import { pick } from 'lodash';
+import React, { lazy, RefObject, Suspense, useMemo } from 'react';
+import { shallowEqual } from 'react-redux';
 
 import { DataSourceInstanceSettings, RawTimeRange } from '@grafana/data';
 import { config, DataSourcePicker, reportInteraction } from '@grafana/runtime';
@@ -10,7 +11,7 @@ import { contextSrv } from 'app/core/core';
 import { createAndCopyShortLink } from 'app/core/utils/shortLinks';
 import { AccessControlAction } from 'app/types';
 import { ExploreId } from 'app/types/explore';
-import { StoreState } from 'app/types/store';
+import { StoreState, useDispatch, useSelector } from 'app/types/store';
 
 import { DashNavButton } from '../dashboard/components/DashNav/DashNavButton';
 import { getTimeSrv } from '../dashboard/services/TimeSrv';
@@ -30,299 +31,226 @@ const AddToDashboard = lazy(() =>
   import('./AddToDashboard').then(({ AddToDashboard }) => ({ default: AddToDashboard }))
 );
 
-const getStyles = (exploreId: ExploreId, isLargerExploreId: boolean) => {
-  return {
-    rotateIcon: css({
-      '> div > svg': {
-        transform:
-          (exploreId === 'left' && isLargerExploreId) || (exploreId === 'right' && !isLargerExploreId)
-            ? 'rotate(180deg)'
-            : 'none',
-      },
-    }),
-  };
-};
+const rotateIcon = css({
+  '> div > svg': {
+    transform: 'rotate(180deg)',
+  },
+});
 
-interface OwnProps {
+interface Props {
   exploreId: ExploreId;
   onChangeTime: (range: RawTimeRange, changedByScanner?: boolean) => void;
   topOfViewRef: RefObject<HTMLDivElement>;
 }
 
-type Props = OwnProps & ConnectedProps<typeof connector>;
+export function ExploreToolbar({ exploreId, topOfViewRef, onChangeTime }: Props) {
+  const dispatch = useDispatch();
 
-class UnConnectedExploreToolbar extends PureComponent<Props> {
-  onChangeDatasource = async (dsSettings: DataSourceInstanceSettings) => {
-    const { changeDatasource, exploreId } = this.props;
-    changeDatasource(exploreId, dsSettings.uid, { importQueries: true });
-  };
+  const splitted = useSelector(isSplit);
+  const timeZone = useSelector((state: StoreState) => getTimeZone(state.user));
+  const fiscalYearStartMonth = useSelector((state: StoreState) => getFiscalYearStartMonth(state.user));
+  const { refreshInterval, loading, datasourceInstance, range, isLive, isPaused, syncedTimes } = useSelector(
+    (state: StoreState) => ({
+      ...pick(
+        state.explore[exploreId]!,
+        'refreshInterval',
+        'loading',
+        'datasourceInstance',
+        'range',
+        'isLive',
+        'isPaused'
+      ),
+      syncedTimes: state.explore.syncedTimes,
+    }),
+    shallowEqual
+  );
+  const isLargerPane = useSelector((state: StoreState) => state.explore.largerExploreId === exploreId);
+  const showSmallTimePicker = useSelector((state) => splitted || state.explore[exploreId]!.containerWidth < 1210);
+  const showSmallDataSourcePicker = useSelector(
+    (state) => state.explore[exploreId]!.containerWidth < (splitted ? 700 : 800)
+  );
 
-  onRunQuery = (loading = false) => {
-    const { runQueries, cancelQueries, exploreId } = this.props;
-    if (loading) {
-      return cancelQueries(exploreId);
-    } else {
-      return runQueries(exploreId);
-    }
-  };
+  const shouldRotateSplitIcon = useMemo(
+    () => (exploreId === 'left' && isLargerPane) || (exploreId === 'right' && !isLargerPane),
+    [isLargerPane, exploreId]
+  );
 
-  onChangeRefreshInterval = (item: string) => {
-    const { changeRefreshInterval, exploreId } = this.props;
-    changeRefreshInterval(exploreId, item);
-  };
-
-  onChangeTimeSync = () => {
-    const { syncTimes, exploreId } = this.props;
-    syncTimes(exploreId);
-  };
-
-  onCopyShortLink = async () => {
-    await createAndCopyShortLink(window.location.href);
+  const onCopyShortLink = () => {
+    createAndCopyShortLink(global.location.href);
     reportInteraction('grafana_explore_shortened_link_clicked');
   };
 
-  onOpenSplitView = () => {
-    const { split } = this.props;
-    split();
+  const onChangeDatasource = async (dsSettings: DataSourceInstanceSettings) => {
+    dispatch(changeDatasource(exploreId, dsSettings.uid, { importQueries: true }));
+  };
+
+  const onRunQuery = (loading = false) => {
+    if (loading) {
+      return dispatch(cancelQueries(exploreId));
+    } else {
+      return dispatch(runQueries(exploreId));
+    }
+  };
+
+  const onChangeTimeZone = (timezone: string) => dispatch(updateTimeZoneForSession(timezone));
+
+  const onOpenSplitView = () => {
+    dispatch(splitOpen());
     reportInteraction('grafana_explore_split_view_opened', { origin: 'menu' });
   };
 
-  onCloseSplitView = () => {
-    const { closeSplit, exploreId } = this.props;
-    closeSplit(exploreId);
+  const onCloseSplitView = () => {
+    dispatch(splitClose(exploreId));
     reportInteraction('grafana_explore_split_view_closed');
   };
 
-  renderRefreshPicker = (showSmallTimePicker: boolean) => {
-    const { loading, refreshInterval, isLive } = this.props;
-
-    let refreshPickerText: string | undefined = loading ? 'Cancel' : 'Run query';
-    let refreshPickerTooltip = undefined;
-    let refreshPickerWidth = '108px';
-    if (showSmallTimePicker) {
-      refreshPickerTooltip = refreshPickerText;
-      refreshPickerText = undefined;
-      refreshPickerWidth = '35px';
+  const onClickResize = () => {
+    if (isLargerPane) {
+      dispatch(evenPaneResizeAction());
+    } else {
+      dispatch(maximizePaneAction({ exploreId }));
     }
-
-    return (
-      <RefreshPicker
-        key="refreshPicker"
-        onIntervalChanged={this.onChangeRefreshInterval}
-        value={refreshInterval}
-        isLoading={loading}
-        text={refreshPickerText}
-        tooltip={refreshPickerTooltip}
-        intervals={getTimeSrv().getValidIntervals(defaultIntervals)}
-        isLive={isLive}
-        onRefresh={() => this.onRunQuery(loading)}
-        noIntervalPicker={isLive}
-        primary={true}
-        width={refreshPickerWidth}
-      />
-    );
   };
 
-  renderActions = () => {
-    const {
-      splitted,
-      isLive,
-      exploreId,
-      range,
-      timeZone,
-      fiscalYearStartMonth,
-      onChangeTime,
-      syncedTimes,
-      onChangeTimeZone,
-      onChangeFiscalYearStartMonth,
-      isPaused,
-      hasLiveOption,
-      containerWidth,
-      largerExploreId,
-    } = this.props;
-    const showSmallTimePicker = splitted || containerWidth < 1210;
-    const isLargerExploreId = largerExploreId === exploreId;
-    const styles = getStyles(exploreId, isLargerExploreId);
+  const onChangeTimeSync = () => {
+    dispatch(syncTimes(exploreId));
+  };
 
-    const showExploreToDashboard =
+  const onChangeFiscalYearStartMonth = (fiscalyearStartMonth: number) =>
+    dispatch(updateFiscalYearStartMonthForSession(fiscalyearStartMonth));
+
+  const onChangeRefreshInterval = (item: string) => {
+    dispatch(changeRefreshInterval(exploreId, item));
+  };
+
+  const showExploreToDashboard = useMemo(
+    () =>
       contextSrv.hasAccess(AccessControlAction.DashboardsCreate, contextSrv.isEditor) ||
-      contextSrv.hasAccess(AccessControlAction.DashboardsWrite, contextSrv.isEditor);
+      contextSrv.hasAccess(AccessControlAction.DashboardsWrite, contextSrv.isEditor),
+    []
+  );
 
-    const onClickResize = () => {
-      if (isLargerExploreId) {
-        this.props.evenPaneResizeAction();
-      } else {
-        this.props.maximizePaneAction({ exploreId: exploreId });
-      }
-    };
-
-    return [
-      !splitted ? (
-        <ToolbarButton
-          variant="canvas"
-          key="split"
-          tooltip="Split the pane"
-          onClick={this.onOpenSplitView}
-          icon="columns"
-          disabled={isLive}
-        >
-          Split
-        </ToolbarButton>
-      ) : (
-        <ButtonGroup key="split-controls">
-          <ToolbarButton
-            variant="canvas"
-            tooltip={`${isLargerExploreId ? 'Narrow' : 'Widen'} pane`}
-            onClick={onClickResize}
-            icon={isLargerExploreId ? 'gf-movepane-left' : 'gf-movepane-right'}
-            iconOnly={true}
-            className={styles.rotateIcon}
-          />
-          <ToolbarButton tooltip="Close split pane" onClick={this.onCloseSplitView} icon="times" variant="canvas">
-            Close
-          </ToolbarButton>
-        </ButtonGroup>
-      ),
-
-      showExploreToDashboard && (
-        <Suspense key="addToDashboard" fallback={null}>
-          <AddToDashboard exploreId={exploreId} />
-        </Suspense>
-      ),
-
-      !isLive && (
-        <ExploreTimeControls
-          key="timeControls"
-          exploreId={exploreId}
-          range={range}
-          timeZone={timeZone}
-          fiscalYearStartMonth={fiscalYearStartMonth}
-          onChangeTime={onChangeTime}
-          splitted={splitted}
-          syncedTimes={syncedTimes}
-          onChangeTimeSync={this.onChangeTimeSync}
-          hideText={showSmallTimePicker}
-          onChangeTimeZone={onChangeTimeZone}
-          onChangeFiscalYearStartMonth={onChangeFiscalYearStartMonth}
-        />
-      ),
-
-      this.renderRefreshPicker(showSmallTimePicker),
-
-      hasLiveOption && (
-        <LiveTailControls key="liveControls" exploreId={exploreId}>
-          {(c) => {
-            const controls = {
-              ...c,
-              start: () => {
-                reportInteraction('grafana_explore_logs_live_tailing_clicked', {
-                  datasourceType: this.props.datasourceType,
-                });
-                c.start();
-              },
-            };
-            return (
-              <LiveTailButton
-                splitted={splitted}
-                isLive={isLive}
-                isPaused={isPaused}
-                start={controls.start}
-                pause={controls.pause}
-                resume={controls.resume}
-                stop={controls.stop}
-              />
-            );
-          }}
-        </LiveTailControls>
-      ),
-    ].filter(Boolean);
-  };
-
-  render() {
-    const { datasourceMissing, exploreId, splitted, containerWidth, topOfViewRef, refreshInterval, loading } =
-      this.props;
-
-    const showSmallDataSourcePicker = (splitted ? containerWidth < 700 : containerWidth < 800) || false;
-
-    const shareButton = (
-      <DashNavButton
-        key="share"
-        tooltip="Copy shortened link"
-        icon="share-alt"
-        onClick={this.onCopyShortLink}
-        aria-label="Copy shortened link"
-      />
-    );
-
-    const getDataSourcePicker = () =>
-      !datasourceMissing && (
-        <DataSourcePicker
-          key={`${exploreId}-ds-picker`}
-          mixed={config.featureToggles.exploreMixedDatasource === true}
-          onChange={this.onChangeDatasource}
-          current={this.props.datasourceRef}
-          hideTextValue={showSmallDataSourcePicker}
-          width={showSmallDataSourcePicker ? 8 : undefined}
-        />
-      );
-
-    const toolbarLeftItems = [getDataSourcePicker()].filter(Boolean);
-
-    return (
+  return (
+    <div ref={topOfViewRef}>
+      {refreshInterval && <SetInterval func={onRunQuery} interval={refreshInterval} loading={loading} />}
       <div ref={topOfViewRef}>
-        {refreshInterval && <SetInterval func={this.onRunQuery} interval={refreshInterval} loading={loading} />}
-        <div ref={topOfViewRef}>
-          <AppChromeUpdate actions={[shareButton, <div style={{ flex: 1 }} key="spacer" />]} />
-        </div>
-        <PageToolbar aria-label="Explore toolbar" leftItems={toolbarLeftItems} forceShowLeftItems>
-          {this.renderActions()}
-        </PageToolbar>
+        <AppChromeUpdate
+          actions={[
+            <DashNavButton
+              key="share"
+              tooltip="Copy shortened link"
+              icon="share-alt"
+              onClick={onCopyShortLink}
+              aria-label="Copy shortened link"
+            />,
+            <div style={{ flex: 1 }} key="spacer" />,
+          ]}
+        />
       </div>
-    );
-  }
+      <PageToolbar
+        aria-label="Explore toolbar"
+        leftItems={[
+          <DataSourcePicker
+            key={`${exploreId}-ds-picker`}
+            mixed={config.featureToggles.exploreMixedDatasource === true}
+            onChange={onChangeDatasource}
+            current={datasourceInstance?.getRef()}
+            hideTextValue={showSmallDataSourcePicker}
+            width={showSmallDataSourcePicker ? 8 : undefined}
+          />,
+        ]}
+        forceShowLeftItems
+      >
+        {[
+          !splitted ? (
+            <ToolbarButton
+              variant="canvas"
+              key="split"
+              tooltip="Split the pane"
+              onClick={onOpenSplitView}
+              icon="columns"
+              disabled={isLive}
+            >
+              Split
+            </ToolbarButton>
+          ) : (
+            <ButtonGroup key="split-controls">
+              <ToolbarButton
+                variant="canvas"
+                tooltip={`${isLargerPane ? 'Narrow' : 'Widen'} pane`}
+                onClick={onClickResize}
+                icon={isLargerPane ? 'gf-movepane-left' : 'gf-movepane-right'}
+                iconOnly={true}
+                className={cx(shouldRotateSplitIcon && rotateIcon)}
+              />
+              <ToolbarButton tooltip="Close split pane" onClick={onCloseSplitView} icon="times" variant="canvas">
+                Close
+              </ToolbarButton>
+            </ButtonGroup>
+          ),
+          showExploreToDashboard && (
+            <Suspense key="addToDashboard" fallback={null}>
+              <AddToDashboard exploreId={exploreId} />
+            </Suspense>
+          ),
+          !isLive && (
+            <ExploreTimeControls
+              key="timeControls"
+              exploreId={exploreId}
+              range={range}
+              timeZone={timeZone}
+              fiscalYearStartMonth={fiscalYearStartMonth}
+              onChangeTime={onChangeTime}
+              splitted={splitted}
+              syncedTimes={syncedTimes}
+              onChangeTimeSync={onChangeTimeSync}
+              hideText={showSmallTimePicker}
+              onChangeTimeZone={onChangeTimeZone}
+              onChangeFiscalYearStartMonth={onChangeFiscalYearStartMonth}
+            />
+          ),
+          <RefreshPicker
+            key="refreshPicker"
+            onIntervalChanged={onChangeRefreshInterval}
+            value={refreshInterval}
+            isLoading={loading}
+            text={showSmallTimePicker ? undefined : loading ? 'Cancel' : 'Run query'}
+            tooltip={showSmallTimePicker ? (loading ? 'Cancel' : 'Run query') : undefined}
+            intervals={getTimeSrv().getValidIntervals(defaultIntervals)}
+            isLive={isLive}
+            onRefresh={() => onRunQuery(loading)}
+            noIntervalPicker={isLive}
+            primary={true}
+            width={(showSmallTimePicker ? 35 : 108) + 'px'}
+          />,
+          datasourceInstance?.meta.streaming && (
+            <LiveTailControls key="liveControls" exploreId={exploreId}>
+              {(c) => {
+                const controls = {
+                  ...c,
+                  start: () => {
+                    reportInteraction('grafana_explore_logs_live_tailing_clicked', {
+                      datasourceType: datasourceInstance?.type,
+                    });
+                    c.start();
+                  },
+                };
+                return (
+                  <LiveTailButton
+                    splitted={splitted}
+                    isLive={isLive}
+                    isPaused={isPaused}
+                    start={controls.start}
+                    pause={controls.pause}
+                    resume={controls.resume}
+                    stop={controls.stop}
+                  />
+                );
+              }}
+            </LiveTailControls>
+          ),
+        ].filter(Boolean)}
+      </PageToolbar>
+    </div>
+  );
 }
-
-const mapStateToProps = (state: StoreState, { exploreId }: OwnProps) => {
-  const { syncedTimes, largerExploreId } = state.explore;
-  const exploreItem = state.explore[exploreId]!;
-  const { datasourceInstance, datasourceMissing, range, refreshInterval, loading, isLive, isPaused, containerWidth } =
-    exploreItem;
-
-  const hasLiveOption = !!datasourceInstance?.meta?.streaming;
-
-  return {
-    datasourceMissing,
-    datasourceRef: datasourceInstance?.getRef(),
-    datasourceType: datasourceInstance?.type,
-    loading,
-    range,
-    timeZone: getTimeZone(state.user),
-    fiscalYearStartMonth: getFiscalYearStartMonth(state.user),
-    splitted: isSplit(state),
-    refreshInterval,
-    hasLiveOption,
-    isLive,
-    isPaused,
-    syncedTimes,
-    containerWidth,
-    largerExploreId,
-  };
-};
-
-const mapDispatchToProps = {
-  changeDatasource,
-  changeRefreshInterval,
-  cancelQueries,
-  runQueries,
-  closeSplit: splitClose,
-  split: splitOpen,
-  syncTimes,
-  onChangeTimeZone: updateTimeZoneForSession,
-  onChangeFiscalYearStartMonth: updateFiscalYearStartMonthForSession,
-  maximizePaneAction,
-  evenPaneResizeAction,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-export const ExploreToolbar = connector(UnConnectedExploreToolbar);

From 62a87885fc8812f175c0b9ba70ce0024529a387f Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matyax@gmail.com>
Date: Wed, 19 Apr 2023 22:43:46 +0200
Subject: [PATCH 261/729] Annotations: fix testid attribute (#66877)

---
 .../app/features/dashboard/components/SubMenu/Annotations.tsx  | 2 +-
 .../panel/timeseries/plugins/annotations/AnnotationMarker.tsx  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/app/features/dashboard/components/SubMenu/Annotations.tsx b/public/app/features/dashboard/components/SubMenu/Annotations.tsx
index 5d950ea06c3..02967e42066 100644
--- a/public/app/features/dashboard/components/SubMenu/Annotations.tsx
+++ b/public/app/features/dashboard/components/SubMenu/Annotations.tsx
@@ -22,7 +22,7 @@ export const Annotations = ({ annotations, onAnnotationChanged, events }: Props)
   }
 
   return (
-    <div data-testId={selectors.pages.Dashboard.SubMenu.Annotations.annotationsWrapper}>
+    <div data-testid={selectors.pages.Dashboard.SubMenu.Annotations.annotationsWrapper}>
       {visibleAnnotations.map((annotation) => (
         <AnnotationPicker
           events={events}
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
index 15e8d406351..72bc4d74da7 100644
--- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
@@ -102,7 +102,6 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
       />
     );
   }, [canEditAnnotations, canDeleteAnnotations, onAnnotationDelete, onAnnotationEdit, timeFormatter, annotation]);
-
   const isRegionAnnotation = Boolean(annotation.isRegion) && width > MIN_REGION_ANNOTATION_WIDTH;
 
   let left = `${width / 2}px`;
@@ -128,7 +127,7 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
         onMouseEnter={onMouseEnter}
         onMouseLeave={onMouseLeave}
         className={!isRegionAnnotation ? styles.markerWrapper : undefined}
-        data-testId={selectors.pages.SoloPanel.Annotations.marker}
+        data-testid={selectors.pages.SoloPanel.Annotations.marker}
       >
         {marker}
       </div>

From 0adacd1dd3c23b37753a693ec8b9dcecc1952bd3 Mon Sep 17 00:00:00 2001
From: Selene <selenepinillos@gmail.com>
Date: Thu, 20 Apr 2023 10:13:00 +0200
Subject: [PATCH 262/729] Chore: Update schema libraries to their latest
 versions and fixes (#66884)

Update thema, cuelang and necessary dependencies
---
 go.mod | 26 +++++++++----------
 go.sum | 79 +++++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/go.mod b/go.mod
index 0cada30c1a2..dea70c0cdda 100644
--- a/go.mod
+++ b/go.mod
@@ -16,10 +16,10 @@ replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.9
 replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
 
 // contains openapi encoder fixes. remove ASAP
-replace cuelang.org/go => github.com/sdboyer/cue v0.5.0-beta.2.0.20221218111347-341999f48bdb
+replace cuelang.org/go => github.com/sdboyer/cue v0.5.0-beta.2.0.20230419165817-251c3ae823d8
 
 // contains go generation fixes
-replace github.com/deepmap/oapi-codegen => github.com/spinillos/oapi-codegen v1.12.5-0.20230206122001-6a05ca88e18e
+replace github.com/deepmap/oapi-codegen => github.com/spinillos/oapi-codegen v1.12.5-0.20230417081915-2945b61c0b1c
 
 // For some insane reason, client-go seems to have a broken v12.0.0 tag on it that forces us to
 // hoist a replace statement.
@@ -80,7 +80,7 @@ require (
 	github.com/linkedin/goavro/v2 v2.10.0
 	github.com/m3db/prometheus_remote_client_golang v0.4.4
 	github.com/magefile/mage v1.14.0
-	github.com/mattn/go-isatty v0.0.16
+	github.com/mattn/go-isatty v0.0.17
 	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/matttproud/golang_protobuf_extensions v1.0.4
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
@@ -110,12 +110,12 @@ require (
 	go.opentelemetry.io/otel/exporters/jaeger v1.0.0
 	go.opentelemetry.io/otel/sdk v1.14.0
 	go.opentelemetry.io/otel/trace v1.14.0
-	golang.org/x/crypto v0.4.0
+	golang.org/x/crypto v0.6.0
 	golang.org/x/exp v0.0.0-20221211140036-ad323defaf05
 	golang.org/x/net v0.8.0
 	golang.org/x/oauth2 v0.6.0
 	golang.org/x/sync v0.1.0
-	golang.org/x/time v0.2.0
+	golang.org/x/time v0.3.0
 	golang.org/x/tools v0.7.0
 	gonum.org/v1/gonum v0.11.0
 	google.golang.org/api v0.104.0
@@ -126,7 +126,7 @@ require (
 	gopkg.in/mail.v2 v2.3.1
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
-	xorm.io/builder v0.3.6 // indirect
+	xorm.io/builder v0.3.6
 	xorm.io/core v0.7.3
 	xorm.io/xorm v0.8.2
 )
@@ -240,7 +240,7 @@ require (
 	github.com/bufbuild/connect-go v1.4.1
 	github.com/dlmiddlecote/sqlstats v1.0.2
 	github.com/drone/drone-cli v1.6.1
-	github.com/getkin/kin-openapi v0.112.0
+	github.com/getkin/kin-openapi v0.115.0
 	github.com/golang-migrate/migrate/v4 v4.7.0
 	github.com/google/go-github/v45 v45.2.0
 	github.com/grafana/codejen v0.0.3
@@ -262,14 +262,16 @@ require (
 	buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.4.1-20221222094228-8b1d3d0f62e6.1
 	buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.28.1-20221222094228-8b1d3d0f62e6.4
 	github.com/Masterminds/semver/v3 v3.1.1
+	github.com/alicebob/miniredis/v2 v2.30.1
 	github.com/dave/dst v0.27.2
 	github.com/go-jose/go-jose/v3 v3.0.0
 	github.com/grafana/cuetsy v0.1.8
 	github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad
 	github.com/grafana/dataplane/sdata v0.0.6
 	github.com/grafana/go-mssqldb v0.9.1
-	github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375
-	github.com/grafana/thema v0.0.0-20230302221249-6952e4a999b7
+	github.com/grafana/kindsys v0.0.0-20230414093523-5df3e256ebc0
+	github.com/grafana/thema v0.0.0-20230417103609-99b482c479fe
+	github.com/redis/go-redis/v9 v9.0.2
 	github.com/weaveworks/common v0.0.0-20230208133027-16871410fca4
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f
 )
@@ -282,8 +284,6 @@ require (
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
-	github.com/alicebob/miniredis v2.5.0+incompatible // indirect
-	github.com/alicebob/miniredis/v2 v2.30.1 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
@@ -323,7 +323,7 @@ require (
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
-	github.com/redis/go-redis/v9 v9.0.2 // indirect
+	github.com/perimeterx/marshmallow v1.1.4 // indirect
 	github.com/rivo/uniseg v0.3.4 // indirect
 	github.com/rueian/rueidis v0.0.100-go1.18 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -387,7 +387,7 @@ require (
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/klauspost/compress v1.15.13 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/labstack/echo/v4 v4.10.0 // indirect
+	github.com/labstack/echo/v4 v4.10.2 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
diff --git a/go.sum b/go.sum
index de9e60713a1..01a5de63f60 100644
--- a/go.sum
+++ b/go.sum
@@ -289,8 +289,6 @@ github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8V
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
-github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI=
-github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
 github.com/alicebob/miniredis/v2 v2.30.1 h1:HM1rlQjq1bm9yQcsawJqSZBJ9AYgxvjkMsNtddh90+g=
 github.com/alicebob/miniredis/v2 v2.30.1/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
@@ -446,6 +444,8 @@ github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bsm/ginkgo/v2 v2.5.0 h1:aOAnND1T40wEdAtkGSkvSICWeQ8L3UASX7YVCqQx+eQ=
+github.com/bsm/gomega v1.20.0 h1:JhAwLmtRzXFTx2AkALSLa8ijZafntmhSoU63Ok18Uq8=
 github.com/bsm/sarama-cluster v2.1.13+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM=
 github.com/bufbuild/connect-go v1.4.1 h1:6usL3JGjKhxQpvDlizP7u8VfjAr1JkckcAUbrdcbgNY=
 github.com/bufbuild/connect-go v1.4.1/go.mod h1:9iNvh/NOsfhNBUH5CtvXeVUskQO1xsrEviH7ZArwZ3I=
@@ -455,6 +455,8 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/buildkite/yaml v2.1.0+incompatible h1:xirI+ql5GzfikVNDmt+yeiXpf/v1Gt03qXTtT5WXdr8=
 github.com/buildkite/yaml v2.1.0+incompatible/go.mod h1:UoU8vbcwu1+vjZq01+KrpSeLBgQQIjL/H7Y6KwikUrI=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/cactus/go-statsd-client/statsd v0.0.0-20191106001114-12b4e2b38748/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI=
 github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds=
@@ -480,6 +482,8 @@ github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOo
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 h1:XCdvHbz3LhewBHN7+mQPx0sg/Hxil/1USnBmxkjHcmY=
 github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
 github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
@@ -792,8 +796,8 @@ github.com/gchaincl/sqlhooks v1.3.0/go.mod h1:9BypXnereMT0+Ys8WGWHqzgkkOfHIhyeUC
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM=
 github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
-github.com/getkin/kin-openapi v0.112.0 h1:lnLXx3bAG53EJVI4E/w0N8i1Y/vUZUEsnrXkgnfn7/Y=
-github.com/getkin/kin-openapi v0.112.0/go.mod h1:QtwUNt0PAAgIIBEvFWYfB7dfngxtAaqCX1zYHMZDeK8=
+github.com/getkin/kin-openapi v0.115.0 h1:c8WHRLVY3G8m9jQTy0/DnIuljgRwTCB5twZytQS4JyU=
+github.com/getkin/kin-openapi v0.115.0/go.mod h1:l5e9PaFUo9fyLJCPGQeXI2ML8c3P8BHOEV2VaAVf/pc=
 github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
 github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -804,7 +808,7 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.3/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
-github.com/gin-gonic/gin v1.8.2/go.mod h1:qw5AYuDrzRTnhvusDsrov+fDIxp9Dleuu12h8nfB398=
+github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k=
 github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@@ -988,15 +992,16 @@ github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUri
 github.com/go-openapi/validate v0.22.0 h1:b0QecH6VslW/TxtpKgzpO1SNG7GU2FsaqKdP1E2T50Y=
 github.com/go-openapi/validate v0.22.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY=
@@ -1013,6 +1018,8 @@ github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
+github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/go-zookeeper/zk v1.0.2 h1:4mx0EYENAdX/B/rbunjlt5+4RTA/a9SMHBRuSKdGxPM=
@@ -1047,7 +1054,7 @@ github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
 github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
 github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
@@ -1289,8 +1296,8 @@ github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW3
 github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk=
 github.com/grafana/grafana-plugin-sdk-go v0.159.0 h1:tjqzTe/wz+1zzaeHpOJvBvSvZFx/bJUSHj6WA8HJqhE=
 github.com/grafana/grafana-plugin-sdk-go v0.159.0/go.mod h1:7/F3lL/w3MGuZTwu0jam5oL/4zNOQmhs2k8WZ9VlzhI=
-github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375 h1:iWFjqAU5GjIV/HetIE/Me6VF3SRw29u5QviMVbJUVQo=
-github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375/go.mod h1:213a3clTiegHfheYcLPLeEyHv/azK/fAF67OEbzuLzw=
+github.com/grafana/kindsys v0.0.0-20230414093523-5df3e256ebc0 h1:Or8DllkxKq3+kLXAS/tkr5K2Yv745c6K2rRvslGWGd4=
+github.com/grafana/kindsys v0.0.0-20230414093523-5df3e256ebc0/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
 github.com/grafana/phlare/api v0.1.3 h1:mYTaE9mLsAW/uzPXlW/PQSLsZ4ojBFA+oAMfR/PDdw8=
 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=
@@ -1299,8 +1306,8 @@ github.com/grafana/saml v0.4.13-0.20230203140620-5f476db5c00a h1:aWSTt/pTOI4uGY9
 github.com/grafana/saml v0.4.13-0.20230203140620-5f476db5c00a/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=
-github.com/grafana/thema v0.0.0-20230302221249-6952e4a999b7/go.mod h1:T6q1RVzq5fzVbm+QBeIsTmVzuXlMaArp4wxfLvcaMV0=
+github.com/grafana/thema v0.0.0-20230417103609-99b482c479fe h1:Ws23A0XH6XYNaF/XhrOhNiC09rqGisvflCf0aHRhpTM=
+github.com/grafana/thema v0.0.0-20230417103609-99b482c479fe/go.mod h1:hjlPua8wL3HO188Qg6GhTeYOPaUOneC04sFYRtcxSNw=
 github.com/grafana/xorm v0.8.3-0.20220614223926-2fcda7565af6 h1:I9dh1MXGX0wGyxdV/Sl7+ugnki4Dfsy8lv2s5Yf887o=
 github.com/grafana/xorm v0.8.3-0.20220614223926-2fcda7565af6/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@@ -1592,6 +1599,7 @@ github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e
 github.com/klauspost/compress v1.15.13 h1:NFn1Wr8cfnenSJSA46lLq4wHCcBzKTSjnBIexDMMOV0=
 github.com/klauspost/compress v1.15.13/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
 github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/knadh/koanf v1.2.0/go.mod h1:xpPTwMhsA/aaQLAilyCCqfpEiY1gpa160AiCuWHJUjY=
@@ -1618,8 +1626,8 @@ github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLg
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/labstack/echo/v4 v4.10.0 h1:5CiyngihEO4HXsz3vVsJn7f8xAlWwRr3aY6Ih280ZKA=
-github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ=
+github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
+github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
 github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4=
@@ -1678,7 +1686,7 @@ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHef
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/matryer/moq v0.3.0/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFKH4s=
+github.com/matryer/moq v0.3.1/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFKH4s=
 github.com/mattermost/xml-roundtrip-validator v0.1.0 h1:RXbVD2UAl7A7nOTR4u7E3ILa4IbtvKBHw64LDsmu9hU=
 github.com/mattermost/xml-roundtrip-validator v0.1.0/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To=
 github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
@@ -1706,8 +1714,9 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
@@ -1933,6 +1942,8 @@ github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko
 github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
 github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
+github.com/perimeterx/marshmallow v1.1.4 h1:pZLDH9RjlLGGorbXhcaQLhfuV0pFMNfPO55FuFkxqLw=
+github.com/perimeterx/marshmallow v1.1.4/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
@@ -2102,8 +2113,8 @@ github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrY
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 h1:0roa6gXKgyta64uqh52AQG3wzZXH21unn+ltzQSXML0=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
-github.com/sdboyer/cue v0.5.0-beta.2.0.20221218111347-341999f48bdb h1:X6XJsprVDQnlG4vT5TVb+cRlGMU78L/IKej8Q6SDFGY=
-github.com/sdboyer/cue v0.5.0-beta.2.0.20221218111347-341999f48bdb/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
+github.com/sdboyer/cue v0.5.0-beta.2.0.20230419165817-251c3ae823d8 h1:R7AphSCwo1rqpRCftz9wn2azIGAtdgn1AjxTiSdFJ1o=
+github.com/sdboyer/cue v0.5.0-beta.2.0.20230419165817-251c3ae823d8/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
@@ -2184,8 +2195,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
-github.com/spinillos/oapi-codegen v1.12.5-0.20230206122001-6a05ca88e18e h1:u26eIR7m9RHWnWtmzBXwiFgmgNvbHCNdUnnS9tksUmc=
-github.com/spinillos/oapi-codegen v1.12.5-0.20230206122001-6a05ca88e18e/go.mod h1:rlTe8FCRfdpXt+2S5m4T281CO5fnzt1EhDDeW8ZvS1E=
+github.com/spinillos/oapi-codegen v1.12.5-0.20230417081915-2945b61c0b1c h1:u9EyGmVLczUaCNBvY4j9NItCJNaQRbEWGUR8fcu20Kk=
+github.com/spinillos/oapi-codegen v1.12.5-0.20230417081915-2945b61c0b1c/go.mod h1:WMhniMLAXaHHNYz+Nk+h35qYieaeUaASStrkdkHnBr8=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
@@ -2241,6 +2252,7 @@ github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZF
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f h1:A+MmlgpvrHLeUP8dkBVn4Pnf5Bp5Yk2OALm7SEJLLE8=
 github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f/go.mod h1:OBcG9bn7sHtXgarhUEb3OfCnNsgtGnkVf41ilSZ3K3E=
 github.com/uber-go/tally v3.3.15+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU=
@@ -2254,10 +2266,13 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK
 github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
 github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
+github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU=
+github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI=
 github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8/go.mod h1:fVle4kNr08ydeohzYafr20oZzbAkhQT39gKK/pFQ5M4=
 github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
@@ -2341,8 +2356,6 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 h1:k/gmLsJDWwWqbLCur2yWnJzwQEKRcAHXo6seXGuSwWw=
-github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
 github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE=
 github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
@@ -2482,6 +2495,7 @@ go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 gocloud.dev v0.25.0 h1:Y7vDq8xj7SyM848KXf32Krda2e6jQ4CLh/mTeCSqXtk=
 gocloud.dev v0.25.0/go.mod h1:7HegHVCYZrMiU3IE1qtnzf/vRrDwLYnRNR3EhWX8x9Y=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -2542,9 +2556,9 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
-golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2596,6 +2610,7 @@ golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2698,6 +2713,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -2918,6 +2935,7 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -2928,7 +2946,9 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2944,6 +2964,7 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2956,8 +2977,8 @@ golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.2.0 h1:52I/1L54xyEQAYdtcSuxtiT84KGYTBGXwayxmIpNJhE=
-golang.org/x/time v0.2.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -3052,7 +3073,7 @@ golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
-golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 3a013cbe480c4ebebe9e911df7122a34c8a90b4f Mon Sep 17 00:00:00 2001
From: Abdul <abdulhdr1@gmail.com>
Date: Thu, 20 Apr 2023 05:21:28 -0300
Subject: [PATCH 263/729] Explore: Clear live logs (#64237)

* feat: add clear logs to explorer's live logs

* refactor live logs pause/resume updating logic

* add tests for clearing live logs

* rm unused imports

* move `onClear` live logs logic to redux

* move clear logs tests to `query.test`

* use utils `sortLogsRows` and Button's icon props

* rename `filterLogRows` and add `clearedAt` as an arg

* mv clearedAt type closer to live tailing items and add jsdoc

* mv `filterLogRowsByTime` to `/utils` and use it at `LiveLogs` component

* make `Exit live` button consistent with other actions

* use `sortLogRows` and fix timestamp by id on `makeLogs`

* change clear live logs from based on timestamp to index on logRows

* assign `null` to `clearedAtIndex` on first batch of logs live

* move `isFirstStreaming` implementation to `clearLogs` reducer

* fix `clearLogs` tests

* Update public/app/features/explore/state/query.ts

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

---------

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
---
 public/app/features/explore/LiveLogs.test.tsx | 55 ++++++-------
 public/app/features/explore/LiveLogs.tsx      | 58 +++++++++-----
 public/app/features/explore/LogsContainer.tsx |  4 +
 .../features/explore/__mocks__/makeLogs.ts    | 32 ++++++++
 .../app/features/explore/state/query.test.ts  | 77 +++++++++++++++++++
 public/app/features/explore/state/query.ts    | 48 +++++++++++-
 public/app/features/explore/state/utils.ts    | 18 +++++
 .../features/explore/useLiveTailControls.ts   |  7 +-
 public/app/types/explore.ts                   |  6 ++
 9 files changed, 247 insertions(+), 58 deletions(-)
 create mode 100644 public/app/features/explore/__mocks__/makeLogs.ts

diff --git a/public/app/features/explore/LiveLogs.test.tsx b/public/app/features/explore/LiveLogs.test.tsx
index ceebb895113..854897b1361 100644
--- a/public/app/features/explore/LiveLogs.test.tsx
+++ b/public/app/features/explore/LiveLogs.test.tsx
@@ -1,9 +1,10 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { LogLevel, LogRowModel, MutableDataFrame } from '@grafana/data';
+import { LogRowModel } from '@grafana/data';
 
 import { LiveLogsWithTheme } from './LiveLogs';
+import { makeLogs } from './__mocks__/makeLogs';
 
 const setup = (rows: LogRowModel[]) =>
   render(
@@ -13,36 +14,16 @@ const setup = (rows: LogRowModel[]) =>
       stopLive={() => {}}
       onPause={() => {}}
       onResume={() => {}}
+      onClear={() => {}}
+      clearedAtIndex={null}
       isPaused={true}
     />
   );
 
-const makeLog = (overrides: Partial<LogRowModel>): LogRowModel => {
-  const uid = overrides.uid || '1';
-  const entry = `log message ${uid}`;
-  return {
-    uid,
-    entryFieldIndex: 0,
-    rowIndex: 0,
-    dataFrame: new MutableDataFrame(),
-    logLevel: LogLevel.debug,
-    entry,
-    hasAnsi: false,
-    hasUnescapedContent: false,
-    labels: {},
-    raw: entry,
-    timeFromNow: '',
-    timeEpochMs: 1,
-    timeEpochNs: '1000000',
-    timeLocal: '',
-    timeUtc: '',
-    ...overrides,
-  };
-};
-
 describe('LiveLogs', () => {
   it('renders logs', () => {
-    setup([makeLog({ uid: '1' }), makeLog({ uid: '2' }), makeLog({ uid: '3' })]);
+    const logRows = makeLogs(3);
+    setup(logRows);
 
     expect(screen.getByRole('cell', { name: 'log message 1' })).toBeInTheDocument();
     expect(screen.getByRole('cell', { name: 'log message 2' })).toBeInTheDocument();
@@ -50,14 +31,19 @@ describe('LiveLogs', () => {
   });
 
   it('renders new logs only when not paused', () => {
-    const { rerender } = setup([makeLog({ uid: '1' }), makeLog({ uid: '2' }), makeLog({ uid: '3' })]);
+    const logRows = makeLogs(6);
+    const firstLogs = logRows.slice(0, 3);
+    const secondLogs = logRows.slice(3, 6);
+    const { rerender } = setup(firstLogs);
 
     rerender(
       <LiveLogsWithTheme
-        logRows={[makeLog({ uid: '4' }), makeLog({ uid: '5' }), makeLog({ uid: '6' })]}
+        logRows={secondLogs}
         timeZone={'utc'}
         stopLive={() => {}}
         onPause={() => {}}
+        onClear={() => {}}
+        clearedAtIndex={null}
         onResume={() => {}}
         isPaused={true}
       />
@@ -72,11 +58,13 @@ describe('LiveLogs', () => {
 
     rerender(
       <LiveLogsWithTheme
-        logRows={[makeLog({ uid: '4' }), makeLog({ uid: '5' }), makeLog({ uid: '6' })]}
+        logRows={secondLogs}
         timeZone={'utc'}
         stopLive={() => {}}
         onPause={() => {}}
         onResume={() => {}}
+        onClear={() => {}}
+        clearedAtIndex={null}
         isPaused={false}
       />
     );
@@ -87,11 +75,12 @@ describe('LiveLogs', () => {
   });
 
   it('renders ansi logs', () => {
-    setup([
-      makeLog({ uid: '1' }),
-      makeLog({ hasAnsi: true, raw: 'log message \u001B[31m2\u001B[0m', uid: '2' }),
-      makeLog({ hasAnsi: true, raw: 'log message \u001B[33m3\u001B[0m', uid: '3' }),
-    ]);
+    const commonLog = makeLogs(1);
+    const firstAnsiLog = makeLogs(1, { hasAnsi: true, raw: 'log message \u001B[31m2\u001B[0m', uid: '2' });
+    const secondAnsiLog = makeLogs(1, { hasAnsi: true, raw: 'log message \u001B[33m3\u001B[0m', uid: '3' });
+    const logRows = [...commonLog, ...firstAnsiLog, ...secondAnsiLog];
+
+    setup(logRows);
 
     expect(screen.getByRole('cell', { name: 'log message 1' })).toBeInTheDocument();
     expect(screen.getByRole('cell', { name: 'log message 2' })).toBeInTheDocument();
diff --git a/public/app/features/explore/LiveLogs.tsx b/public/app/features/explore/LiveLogs.tsx
index d5cfb36ef03..5d258946562 100644
--- a/public/app/features/explore/LiveLogs.tsx
+++ b/public/app/features/explore/LiveLogs.tsx
@@ -2,13 +2,15 @@ import { css, cx } from '@emotion/css';
 import React, { PureComponent } from 'react';
 import tinycolor from 'tinycolor2';
 
-import { LogRowModel, TimeZone, dateTimeFormat, GrafanaTheme2 } from '@grafana/data';
-import { Icon, Button, Themeable2, withTheme2 } from '@grafana/ui';
+import { LogRowModel, TimeZone, dateTimeFormat, GrafanaTheme2, LogsSortOrder } from '@grafana/data';
+import { Button, Themeable2, withTheme2 } from '@grafana/ui';
 
 import { LogMessageAnsi } from '../logs/components/LogMessageAnsi';
 import { getLogRowStyles } from '../logs/components/getLogRowStyles';
+import { sortLogRows } from '../logs/utils';
 
 import { ElapsedTime } from './ElapsedTime';
+import { filterLogRowsByIndex } from './state/utils';
 
 const getStyles = (theme: GrafanaTheme2) => ({
   logsRowsLive: css`
@@ -57,6 +59,8 @@ export interface Props extends Themeable2 {
   stopLive: () => void;
   onPause: () => void;
   onResume: () => void;
+  onClear: () => void;
+  clearedAtIndex: number | null;
   isPaused: boolean;
 }
 
@@ -76,16 +80,22 @@ class LiveLogs extends PureComponent<Props, State> {
   }
 
   static getDerivedStateFromProps(nextProps: Props, state: State) {
-    if (!nextProps.isPaused) {
+    if (nextProps.isPaused && nextProps.clearedAtIndex) {
       return {
-        // We update what we show only if not paused. We keep any background subscriptions running and keep updating
-        // our state, but we do not show the updates, this allows us start again showing correct result after resuming
-        // without creating a gap in the log results.
-        logRowsToRender: nextProps.logRows,
+        logRowsToRender: filterLogRowsByIndex(nextProps.clearedAtIndex, state.logRowsToRender),
       };
-    } else {
+    }
+
+    if (nextProps.isPaused) {
       return null;
     }
+
+    return {
+      // We update what we show only if not paused. We keep any background subscriptions running and keep updating
+      // our state, but we do not show the updates, this allows us start again showing correct result after resuming
+      // without creating a gap in the log results.
+      logRowsToRender: nextProps.logRows,
+    };
   }
 
   /**
@@ -107,13 +117,13 @@ class LiveLogs extends PureComponent<Props, State> {
     let { logRowsToRender: rowsToRender = [] } = this.state;
     if (!isPaused) {
       // A perf optimisation here. Show just 100 rows when streaming and full length when the streaming is paused.
-      rowsToRender = rowsToRender.slice(-100);
+      rowsToRender = sortLogRows(rowsToRender, LogsSortOrder.Ascending).slice(-100);
     }
     return rowsToRender;
   };
 
   render() {
-    const { theme, timeZone, onPause, onResume, isPaused } = this.props;
+    const { theme, timeZone, onPause, onResume, onClear, isPaused } = this.props;
     const styles = getStyles(theme);
     const { logsRow, logsRowLocalTime, logsRowMessage } = getLogRowStyles(theme);
 
@@ -147,20 +157,26 @@ class LiveLogs extends PureComponent<Props, State> {
           </tbody>
         </table>
         <div className={styles.logsRowsIndicator}>
-          <Button variant="secondary" onClick={isPaused ? onResume : onPause} className={styles.button}>
-            <Icon name={isPaused ? 'play' : 'pause'} />
-            &nbsp;
+          <Button
+            icon={isPaused ? 'play' : 'pause'}
+            variant="secondary"
+            onClick={isPaused ? onResume : onPause}
+            className={styles.button}
+          >
             {isPaused ? 'Resume' : 'Pause'}
           </Button>
-          <Button variant="secondary" onClick={this.props.stopLive} className={styles.button}>
-            <Icon name="square-shape" size="lg" type="mono" />
-            &nbsp; Exit live mode
+          <Button icon="trash-alt" variant="secondary" onClick={onClear} className={styles.button}>
+            Clear logs
           </Button>
-          {isPaused || (
-            <span>
-              Last line received: <ElapsedTime resetKey={this.props.logRows} humanize={true} /> ago
-            </span>
-          )}
+          <Button icon="square-shape" variant="secondary" onClick={this.props.stopLive} className={styles.button}>
+            Exit live mode
+          </Button>
+          {isPaused ||
+            (this.rowsToRender().length > 0 && (
+              <span>
+                Last line received: <ElapsedTime resetKey={this.props.logRows} humanize={true} /> ago
+              </span>
+            ))}
         </div>
       </div>
     );
diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx
index eb98c9584b5..24211ee973b 100644
--- a/public/app/features/explore/LogsContainer.tsx
+++ b/public/app/features/explore/LogsContainer.tsx
@@ -137,6 +137,8 @@ class LogsContainer extends PureComponent<LogsContainerProps> {
                   isPaused={this.props.isPaused}
                   onPause={controls.pause}
                   onResume={controls.resume}
+                  onClear={controls.clear}
+                  clearedAtIndex={this.props.clearedAtIndex}
                 />
               )}
             </LiveTailControls>
@@ -195,6 +197,7 @@ function mapStateToProps(state: StoreState, { exploreId }: { exploreId: string }
     datasourceInstance,
     isLive,
     isPaused,
+    clearedAtIndex,
     range,
     absoluteRange,
     supplementaryQueries,
@@ -214,6 +217,7 @@ function mapStateToProps(state: StoreState, { exploreId }: { exploreId: string }
     datasourceInstance,
     isLive,
     isPaused,
+    clearedAtIndex,
     range,
     absoluteRange,
     logsVolume,
diff --git a/public/app/features/explore/__mocks__/makeLogs.ts b/public/app/features/explore/__mocks__/makeLogs.ts
new file mode 100644
index 00000000000..0aaf4d9f254
--- /dev/null
+++ b/public/app/features/explore/__mocks__/makeLogs.ts
@@ -0,0 +1,32 @@
+import { MutableDataFrame, LogLevel, LogRowModel, LogsSortOrder } from '@grafana/data';
+import { sortLogRows } from 'app/features/logs/utils';
+export const makeLogs = (numberOfLogsToCreate: number, overrides?: Partial<LogRowModel>): LogRowModel[] => {
+  const array: LogRowModel[] = [];
+
+  for (let i = 0; i < numberOfLogsToCreate; i++) {
+    const uuid = (i + 1).toString();
+    const entry = `log message ${uuid}`;
+    const timeInMs = overrides?.timeEpochMs || new Date().getTime();
+
+    array.push({
+      uid: uuid,
+      entryFieldIndex: 0,
+      rowIndex: 0,
+      dataFrame: new MutableDataFrame(),
+      logLevel: LogLevel.debug,
+      entry,
+      hasAnsi: false,
+      hasUnescapedContent: false,
+      labels: {},
+      raw: entry,
+      timeFromNow: '',
+      timeEpochMs: timeInMs + i,
+      timeEpochNs: (timeInMs * 1000000 + i).toString(),
+      timeLocal: '',
+      timeUtc: '',
+      ...overrides,
+    });
+  }
+
+  return sortLogRows(array, LogsSortOrder.Ascending);
+};
diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts
index d6a00955f8c..4e26abac682 100644
--- a/public/app/features/explore/state/query.test.ts
+++ b/public/app/features/explore/state/query.test.ts
@@ -22,6 +22,7 @@ import { ExploreId, ExploreItemState, StoreState, ThunkDispatch } from 'app/type
 import { reducerTester } from '../../../../test/core/redux/reducerTester';
 import { configureStore } from '../../../store/configureStore';
 import { setTimeSrv, TimeSrv } from '../../dashboard/services/TimeSrv';
+import { makeLogs } from '../__mocks__/makeLogs';
 import { supplementaryQueryTypes } from '../utils/supplementaryQueries';
 
 import { createDefaultInitialState } from './helpers';
@@ -41,6 +42,9 @@ import {
   setSupplementaryQueryEnabled,
   addQueryRow,
   cleanSupplementaryQueryDataProviderAction,
+  clearLogs,
+  queryStreamUpdatedAction,
+  QueryEndedPayload,
   changeQueries,
 } from './query';
 import * as actions from './query';
@@ -924,4 +928,77 @@ describe('reducer', () => {
       ).toBeUndefined();
     });
   });
+  describe('clear live logs', () => {
+    it('should clear current log rows', async () => {
+      const logRows = makeLogs(10);
+
+      const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
+        ...defaultInitialState,
+        explore: {
+          [ExploreId.left]: {
+            ...defaultInitialState.explore[ExploreId.left],
+            queryResponse: {
+              state: LoadingState.Streaming,
+            },
+            logsResult: {
+              hasUniqueLabels: false,
+              rows: logRows,
+            },
+          },
+        },
+      } as unknown as Partial<StoreState>);
+      expect(getState().explore[ExploreId.left].logsResult?.rows.length).toBe(logRows.length);
+
+      await dispatch(clearLogs({ exploreId: ExploreId.left }));
+
+      expect(getState().explore[ExploreId.left].logsResult?.rows.length).toBe(0);
+      expect(getState().explore[ExploreId.left].clearedAtIndex).toBe(logRows.length - 1);
+    });
+
+    it('should filter new log rows', async () => {
+      const oldLogRows = makeLogs(10);
+      const newLogRows = makeLogs(5);
+      const allLogRows = [...oldLogRows, ...newLogRows];
+
+      const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
+        ...defaultInitialState,
+        explore: {
+          [ExploreId.left]: {
+            ...defaultInitialState.explore[ExploreId.left],
+            isLive: true,
+            queryResponse: {
+              state: LoadingState.Streaming,
+            },
+            logsResult: {
+              hasUniqueLabels: false,
+              rows: oldLogRows,
+            },
+          },
+        },
+      } as unknown as Partial<StoreState>);
+
+      expect(getState().explore[ExploreId.left].logsResult?.rows.length).toBe(oldLogRows.length);
+
+      await dispatch(clearLogs({ exploreId: ExploreId.left }));
+      await dispatch(
+        queryStreamUpdatedAction({
+          exploreId: ExploreId.left,
+          response: {
+            request: true,
+            traceFrames: [],
+            nodeGraphFrames: [],
+            rawPrometheusFrames: [],
+            flameGraphFrames: [],
+            logsResult: {
+              hasUniqueLabels: false,
+              rows: allLogRows,
+            },
+          },
+        } as unknown as QueryEndedPayload)
+      );
+
+      expect(getState().explore[ExploreId.left].logsResult?.rows.length).toBe(newLogRows.length);
+      expect(getState().explore[ExploreId.left].clearedAtIndex).toBe(oldLogRows.length - 1);
+    });
+  });
 });
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 822f8fbc970..1b9ecacc758 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -61,7 +61,7 @@ import {
 import { addHistoryItem, historyUpdatedAction, loadRichHistory } from './history';
 import { stateSave } from './main';
 import { updateTime } from './time';
-import { createCacheKey, getResultsFromCache } from './utils';
+import { createCacheKey, getResultsFromCache, filterLogRowsByIndex } from './utils';
 
 //
 // Actions and Payloads
@@ -191,6 +191,10 @@ export interface SetPausedStatePayload {
 }
 export const setPausedStateAction = createAction<SetPausedStatePayload>('explore/setPausedState');
 
+export interface ClearLogsPayload {
+  exploreId: ExploreId;
+}
+export const clearLogs = createAction<ClearLogsPayload>('explore/clearLogs');
 /**
  * Start a scan for more results using the given scanner.
  * @param exploreId Explore area
@@ -1089,6 +1093,41 @@ export const queryReducer = (state: ExploreItemState, action: AnyAction): Explor
     };
   }
 
+  if (clearLogs.match(action)) {
+    if (!state.logsResult) {
+      return {
+        ...state,
+        clearedAtIndex: null,
+      };
+    }
+
+    // When in loading state, clear logs and set clearedAtIndex as null.
+    // Initially loaded logs will be fully replaced by incoming streamed logs, which may have a different length.
+    if (state.queryResponse.state === LoadingState.Loading) {
+      return {
+        ...state,
+        clearedAtIndex: null,
+        logsResult: {
+          ...state.logsResult,
+          rows: [],
+        },
+      };
+    }
+
+    const lastItemIndex = state.clearedAtIndex
+      ? state.clearedAtIndex + state.logsResult.rows.length
+      : state.logsResult.rows.length - 1;
+
+    return {
+      ...state,
+      clearedAtIndex: lastItemIndex,
+      logsResult: {
+        ...state.logsResult,
+        rows: [],
+      },
+    };
+  }
+
   return state;
 };
 
@@ -1113,7 +1152,6 @@ const getCorrelations = () => {
     }
   });
 };
-
 export const processQueryResponse = (
   state: ExploreItemState,
   action: PayloadAction<QueryEndedPayload>
@@ -1169,7 +1207,10 @@ export const processQueryResponse = (
     graphResult,
     tableResult,
     rawPrometheusResult,
-    logsResult,
+    logsResult:
+      state.isLive && logsResult
+        ? { ...logsResult, rows: filterLogRowsByIndex(state.clearedAtIndex, logsResult.rows) }
+        : logsResult,
     loading: loadingState === LoadingState.Loading || loadingState === LoadingState.Streaming,
     showLogs: !!logsResult,
     showMetrics: !!graphResult,
@@ -1178,5 +1219,6 @@ export const processQueryResponse = (
     showNodeGraph: !!nodeGraphFrames.length,
     showRawPrometheus: !!rawPrometheusFrames.length,
     showFlameGraph: !!flameGraphFrames.length,
+    clearedAtIndex: state.isLive ? state.clearedAtIndex : null,
   };
 };
diff --git a/public/app/features/explore/state/utils.ts b/public/app/features/explore/state/utils.ts
index 868c82df53a..3dd4d90efbf 100644
--- a/public/app/features/explore/state/utils.ts
+++ b/public/app/features/explore/state/utils.ts
@@ -8,6 +8,7 @@ import {
   getDefaultTimeRange,
   HistoryItem,
   LoadingState,
+  LogRowModel,
   PanelData,
 } from '@grafana/data';
 import { DataSourceRef } from '@grafana/schema';
@@ -58,6 +59,7 @@ export const makeExplorePaneState = (): ExploreItemState => ({
   tableResult: null,
   graphResult: null,
   logsResult: null,
+  clearedAtIndex: null,
   rawPrometheusResult: null,
   eventBridge: null as unknown as EventBusExtended,
   cache: [],
@@ -158,3 +160,19 @@ export function getResultsFromCache(
   const cacheValue = cacheIdx >= 0 ? cache[cacheIdx].value : undefined;
   return cacheValue;
 }
+
+export const filterLogRowsByIndex = (
+  clearedAtIndex: ExploreItemState['clearedAtIndex'],
+  logRows?: LogRowModel[]
+): LogRowModel[] => {
+  if (!logRows) {
+    return [];
+  }
+
+  if (clearedAtIndex) {
+    const filteredRows = logRows.slice(clearedAtIndex + 1);
+    return filteredRows;
+  }
+
+  return logRows;
+};
diff --git a/public/app/features/explore/useLiveTailControls.ts b/public/app/features/explore/useLiveTailControls.ts
index 6b9ed004d93..652e5aaf9a9 100644
--- a/public/app/features/explore/useLiveTailControls.ts
+++ b/public/app/features/explore/useLiveTailControls.ts
@@ -5,7 +5,7 @@ import { useDispatch } from 'app/types';
 
 import { ExploreId } from '../../types';
 
-import { setPausedStateAction, runQueries } from './state/query';
+import { setPausedStateAction, runQueries, clearLogs } from './state/query';
 import { changeRefreshInterval } from './state/time';
 
 /**
@@ -38,11 +38,16 @@ export function useLiveTailControls(exploreId: ExploreId) {
     dispatch(changeRefreshInterval(exploreId, RefreshPicker.liveOption.value));
   }, [exploreId, dispatch]);
 
+  const clear = useCallback(() => {
+    dispatch(clearLogs({ exploreId }));
+  }, [exploreId, dispatch]);
+
   return {
     pause,
     resume,
     stop,
     start,
+    clear,
   };
 }
 
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index 5d97a69b4d0..4c24e6d5e4f 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -175,6 +175,12 @@ export interface ExploreItemState {
    */
   isPaused: boolean;
 
+  /**
+   * Index of the last item in the list of logs
+   * when the live tailing views gets cleared.
+   */
+  clearedAtIndex: number | null;
+
   querySubscription?: Unsubscribable;
 
   queryResponse: ExplorePanelData;

From 4e10118c3ad57e203df5983f37e6030875ad9941 Mon Sep 17 00:00:00 2001
From: linoman <2051016+linoman@users.noreply.github.com>
Date: Thu, 20 Apr 2023 10:43:28 +0200
Subject: [PATCH 264/729] Add verbose settings (#65469)

* Add `settings.CurrentVerbose` function

* Add function to retrieve verbose settings

* Add `/settings-verbose` endpoint

* Restrict the verbose source types
---
 pkg/api/admin.go        | 62 +++++++++++++++++++++++++++++++++++++++++
 pkg/api/api.go          |  1 +
 pkg/setting/provider.go | 21 ++++++++++++--
 3 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/pkg/api/admin.go b/pkg/api/admin.go
index e85ca94c572..38dc042ac6d 100644
--- a/pkg/api/admin.go
+++ b/pkg/api/admin.go
@@ -33,6 +33,19 @@ func (hs *HTTPServer) AdminGetSettings(c *contextmodel.ReqContext) response.Resp
 	return response.JSON(http.StatusOK, settings)
 }
 
+func (hs *HTTPServer) AdminGetVerboseSettings(c *contextmodel.ReqContext) response.Response {
+	bag := hs.SettingsProvider.CurrentVerbose()
+	if bag == nil {
+		return response.JSON(http.StatusNotImplemented, make(map[string]string))
+	}
+
+	verboseSettings, err := hs.getAuthorizedVerboseSettings(c.Req.Context(), c.SignedInUser, bag)
+	if err != nil {
+		return response.Error(http.StatusForbidden, "Failed to authorize settings", err)
+	}
+	return response.JSON(http.StatusOK, verboseSettings)
+}
+
 // swagger:route GET /admin/stats admin adminGetStats
 //
 // Fetch Grafana Stats.
@@ -99,6 +112,55 @@ func (hs *HTTPServer) getAuthorizedSettings(ctx context.Context, user *user.Sign
 	return authorizedBag, nil
 }
 
+func (hs *HTTPServer) getAuthorizedVerboseSettings(ctx context.Context, user *user.SignedInUser, bag setting.VerboseSettingsBag) (setting.VerboseSettingsBag, error) {
+	if hs.AccessControl.IsDisabled() {
+		return bag, nil
+	}
+
+	eval := func(scope string) (bool, error) {
+		return hs.AccessControl.Evaluate(ctx, user, ac.EvalPermission(ac.ActionSettingsRead, scope))
+	}
+
+	ok, err := eval(ac.ScopeSettingsAll)
+	if err != nil {
+		return nil, err
+	}
+	if ok {
+		return bag, nil
+	}
+
+	authorizedBag := make(setting.VerboseSettingsBag)
+
+	for section, keys := range bag {
+		ok, err := eval(ac.Scope("settings", section, "*"))
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			authorizedBag[section] = keys
+			continue
+		}
+
+		for key := range keys {
+			ok, err := eval(ac.Scope("settings", section, key))
+			if err != nil {
+				return nil, err
+			}
+
+			if !ok {
+				continue
+			}
+
+			if _, exists := authorizedBag[section]; !exists {
+				authorizedBag[section] = make(map[string]map[setting.VerboseSourceType]string)
+			}
+			authorizedBag[section][key] = bag[section][key]
+		}
+	}
+
+	return authorizedBag, nil
+}
+
 // swagger:response adminGetSettingsResponse
 type GetSettingsResponse struct {
 	// in:body
diff --git a/pkg/api/api.go b/pkg/api/api.go
index e93bc997e7f..8a2a093fe8a 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -594,6 +594,7 @@ func (hs *HTTPServer) registerRoutes() {
 	// admin api
 	r.Group("/api/admin", func(adminRoute routing.RouteRegister) {
 		adminRoute.Get("/settings", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)), routing.Wrap(hs.AdminGetSettings))
+		adminRoute.Get("/settings-verbose", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)), routing.Wrap(hs.AdminGetVerboseSettings))
 		adminRoute.Get("/stats", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionServerStatsRead)), routing.Wrap(hs.AdminGetStats))
 		adminRoute.Post("/pause-all-alerts", reqGrafanaAdmin, routing.Wrap(hs.PauseAllAlerts(setting.AlertingEnabled)))
 
diff --git a/pkg/setting/provider.go b/pkg/setting/provider.go
index 27d04beba58..81440b728fe 100644
--- a/pkg/setting/provider.go
+++ b/pkg/setting/provider.go
@@ -36,6 +36,9 @@ type Provider interface {
 	// the current configured pairs of key/values for each
 	// configuration section.
 	Current() SettingsBag
+
+	CurrentVerbose() VerboseSettingsBag
+
 	// Update receives a SettingsBag with the pairs of key/values
 	// to be updated per section and a SettingsRemovals with the
 	// section keys to be removed.
@@ -92,6 +95,14 @@ type ReloadHandler interface {
 type SettingsBag map[string]map[string]string
 type SettingsRemovals map[string][]string
 
+type VerboseSourceType string
+type VerboseSettingsBag map[string]map[string]map[VerboseSourceType]string
+
+const (
+	DB     VerboseSourceType = "db"
+	System VerboseSourceType = "system"
+)
+
 func ProvideProvider(cfg *Cfg) *OSSImpl {
 	return &OSSImpl{
 		Cfg: cfg,
@@ -102,7 +113,7 @@ type OSSImpl struct {
 	Cfg *Cfg
 }
 
-func (o OSSImpl) Current() SettingsBag {
+func (o *OSSImpl) Current() SettingsBag {
 	settingsCopy := make(SettingsBag)
 
 	for _, section := range o.Cfg.Raw.Sections() {
@@ -115,6 +126,10 @@ func (o OSSImpl) Current() SettingsBag {
 	return settingsCopy
 }
 
+func (o *OSSImpl) CurrentVerbose() VerboseSettingsBag {
+	return nil
+}
+
 func (OSSImpl) Update(SettingsBag, SettingsRemovals) error {
 	return errors.New("oss settings provider do not have support for settings updates")
 }
@@ -127,9 +142,9 @@ func (o *OSSImpl) Section(section string) Section {
 	return &sectionImpl{section: o.Cfg.Raw.Section(section)}
 }
 
-func (OSSImpl) RegisterReloadHandler(string, ReloadHandler) {}
+func (*OSSImpl) RegisterReloadHandler(string, ReloadHandler) {}
 
-func (o OSSImpl) IsFeatureToggleEnabled(name string) bool {
+func (o *OSSImpl) IsFeatureToggleEnabled(name string) bool {
 	return o.Cfg.IsFeatureToggleEnabled(name)
 }
 

From a37bf1ac2a4d3b2f2c00935da1b85026de6cd3a2 Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Thu, 20 Apr 2023 10:24:41 +0100
Subject: [PATCH 265/729] RBAC: Update library element tests to use RBAC
 (#66782)

* update library element tests to use RBAC

* update bits of code to use RBAC

* update library panel tests

* linting

* more linting

* and more linting

* PR feedback
---
 pkg/services/libraryelements/database.go      |   4 +-
 pkg/services/libraryelements/guard.go         |   1 +
 .../libraryelements_get_all_test.go           |   4 +-
 .../libraryelements_get_test.go               |   4 +
 .../libraryelements_patch_test.go             |   6 +-
 .../libraryelements_permissions_test.go       | 559 ++++++++++--------
 .../libraryelements/libraryelements_test.go   |  95 ++-
 .../librarypanels/librarypanels_test.go       |  97 ++-
 8 files changed, 390 insertions(+), 380 deletions(-)

diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go
index ee7cf98325d..5c1613a1775 100644
--- a/pkg/services/libraryelements/database.go
+++ b/pkg/services/libraryelements/database.go
@@ -250,9 +250,7 @@ func getLibraryElements(c context.Context, store db.DB, cfg *setting.Cfg, signed
 		builder.Write(getFromLibraryElementDTOWithMeta(store.GetDialect()))
 		builder.Write(" INNER JOIN dashboard AS dashboard on le.folder_id = dashboard.id AND le.folder_id <> 0")
 		writeParamSelectorSQL(&builder, params...)
-		if signedInUser.OrgRole != org.RoleAdmin {
-			builder.WriteDashboardPermissionFilter(signedInUser, dashboards.PERMISSION_VIEW)
-		}
+		builder.WriteDashboardPermissionFilter(signedInUser, dashboards.PERMISSION_VIEW)
 		builder.Write(` OR dashboard.id=0`)
 		if err := session.SQL(builder.GetSQLString(), builder.GetParams()...).Find(&libraryElements); err != nil {
 			return err
diff --git a/pkg/services/libraryelements/guard.go b/pkg/services/libraryelements/guard.go
index b866b19fb49..bad8521fe38 100644
--- a/pkg/services/libraryelements/guard.go
+++ b/pkg/services/libraryelements/guard.go
@@ -32,6 +32,7 @@ func (l *LibraryElementService) requireSupportedElementKind(kindAsInt int64) err
 }
 
 func (l *LibraryElementService) requireEditPermissionsOnFolder(ctx context.Context, user *user.SignedInUser, folderID int64) error {
+	// TODO remove these special cases and handle General folder case in access control guardian
 	if isGeneralFolder(folderID) && user.HasRole(org.RoleEditor) {
 		return nil
 	}
diff --git a/pkg/services/libraryelements/libraryelements_get_all_test.go b/pkg/services/libraryelements/libraryelements_get_all_test.go
index d84b894bc6a..1b76dfc3e14 100644
--- a/pkg/services/libraryelements/libraryelements_get_all_test.go
+++ b/pkg/services/libraryelements/libraryelements_get_all_test.go
@@ -524,7 +524,7 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and folderFilter is set to existing folders, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			newFolder := createFolderWithACL(t, sc.sqlStore, "NewFolder", sc.user, []folderACLItem{})
+			newFolder := createFolder(t, sc, "NewFolder")
 			command := getCreatePanelCommand(newFolder.ID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
@@ -591,7 +591,7 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and folderFilter is set to a nonexistent folders, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			newFolder := createFolderWithACL(t, sc.sqlStore, "NewFolder", sc.user, []folderACLItem{})
+			newFolder := createFolder(t, sc, "NewFolder")
 			command := getCreatePanelCommand(newFolder.ID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
diff --git a/pkg/services/libraryelements/libraryelements_get_test.go b/pkg/services/libraryelements/libraryelements_get_test.go
index 376683d2e0c..c8a15c05b47 100644
--- a/pkg/services/libraryelements/libraryelements_get_test.go
+++ b/pkg/services/libraryelements/libraryelements_get_test.go
@@ -69,6 +69,8 @@ func TestGetLibraryElement(t *testing.T) {
 				}
 			}
 
+			sc.reqContext.SignedInUser.Permissions[sc.reqContext.OrgID][dashboards.ActionFoldersRead] = []string{dashboards.ScopeFoldersAll}
+
 			// by uid
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
 			resp := sc.service.getHandler(sc.reqContext)
@@ -164,6 +166,8 @@ func TestGetLibraryElement(t *testing.T) {
 				}
 			}
 
+			sc.reqContext.SignedInUser.Permissions[sc.reqContext.OrgID][dashboards.ActionFoldersRead] = []string{dashboards.ScopeFoldersAll}
+
 			// by uid
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
 			resp := sc.service.getHandler(sc.reqContext)
diff --git a/pkg/services/libraryelements/libraryelements_patch_test.go b/pkg/services/libraryelements/libraryelements_patch_test.go
index 785da3da74e..6aed30212ee 100644
--- a/pkg/services/libraryelements/libraryelements_patch_test.go
+++ b/pkg/services/libraryelements/libraryelements_patch_test.go
@@ -24,7 +24,7 @@ func TestPatchLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to patch a library panel that exists, it should succeed",
 		func(t *testing.T, sc scenarioContext) {
-			newFolder := createFolderWithACL(t, sc.sqlStore, "NewFolder", sc.user, []folderACLItem{})
+			newFolder := createFolder(t, sc, "NewFolder")
 			cmd := model.PatchLibraryElementCommand{
 				FolderID: newFolder.ID,
 				Name:     "Panel - New name",
@@ -89,7 +89,7 @@ func TestPatchLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with folder only, it should change folder successfully and return correct result",
 		func(t *testing.T, sc scenarioContext) {
-			newFolder := createFolderWithACL(t, sc.sqlStore, "NewFolder", sc.user, []folderACLItem{})
+			newFolder := createFolder(t, sc, "NewFolder")
 			cmd := model.PatchLibraryElementCommand{
 				FolderID: newFolder.ID,
 				Kind:     int64(model.PanelElement),
@@ -325,7 +325,7 @@ func TestPatchLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with a folder where a library panel with the same name already exists, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			newFolder := createFolderWithACL(t, sc.sqlStore, "NewFolder", sc.user, []folderACLItem{})
+			newFolder := createFolder(t, sc, "NewFolder")
 			command := getCreatePanelCommand(newFolder.ID, "Text - Library Panel")
 			sc.ctx.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
diff --git a/pkg/services/libraryelements/libraryelements_permissions_test.go b/pkg/services/libraryelements/libraryelements_permissions_test.go
index 036f5446622..662f823e649 100644
--- a/pkg/services/libraryelements/libraryelements_permissions_test.go
+++ b/pkg/services/libraryelements/libraryelements_permissions_test.go
@@ -3,6 +3,7 @@ package libraryelements
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -14,122 +15,7 @@ import (
 	"github.com/grafana/grafana/pkg/web"
 )
 
-func TestLibraryElementPermissions(t *testing.T) {
-	var defaultPermissions = []folderACLItem{}
-	var adminOnlyPermissions = []folderACLItem{{org.RoleAdmin, dashboards.PERMISSION_EDIT}}
-	var editorOnlyPermissions = []folderACLItem{{org.RoleEditor, dashboards.PERMISSION_EDIT}}
-	var editorAndViewerPermissions = []folderACLItem{{org.RoleEditor, dashboards.PERMISSION_EDIT}, {org.RoleViewer, dashboards.PERMISSION_EDIT}}
-	var viewerOnlyPermissions = []folderACLItem{{org.RoleViewer, dashboards.PERMISSION_EDIT}}
-	var everyonePermissions = []folderACLItem{{org.RoleAdmin, dashboards.PERMISSION_EDIT}, {org.RoleEditor, dashboards.PERMISSION_EDIT}, {org.RoleViewer, dashboards.PERMISSION_EDIT}}
-	var noPermissions = []folderACLItem{{org.RoleViewer, dashboards.PERMISSION_VIEW}}
-	var folderCases = [][]folderACLItem{
-		defaultPermissions,
-		adminOnlyPermissions,
-		editorOnlyPermissions,
-		editorAndViewerPermissions,
-		viewerOnlyPermissions,
-		everyonePermissions,
-		noPermissions,
-	}
-	var defaultDesc = "default permissions"
-	var adminOnlyDesc = "admin only permissions"
-	var editorOnlyDesc = "editor only permissions"
-	var editorAndViewerDesc = "editor and viewer permissions"
-	var viewerOnlyDesc = "viewer only permissions"
-	var everyoneDesc = "everyone has editor permissions"
-	var noDesc = "everyone has view permissions"
-	var accessCases = []struct {
-		role   org.RoleType
-		items  []folderACLItem
-		desc   string
-		status int
-	}{
-		{org.RoleAdmin, defaultPermissions, defaultDesc, 200},
-		{org.RoleAdmin, adminOnlyPermissions, adminOnlyDesc, 200},
-		{org.RoleAdmin, editorOnlyPermissions, editorOnlyDesc, 200},
-		{org.RoleAdmin, editorAndViewerPermissions, editorAndViewerDesc, 200},
-		{org.RoleAdmin, viewerOnlyPermissions, viewerOnlyDesc, 200},
-		{org.RoleAdmin, everyonePermissions, everyoneDesc, 200},
-		{org.RoleAdmin, noPermissions, noDesc, 200},
-
-		{org.RoleEditor, defaultPermissions, defaultDesc, 200},
-		{org.RoleEditor, adminOnlyPermissions, adminOnlyDesc, 403},
-		{org.RoleEditor, editorOnlyPermissions, editorOnlyDesc, 200},
-		{org.RoleEditor, editorAndViewerPermissions, editorAndViewerDesc, 200},
-		{org.RoleEditor, viewerOnlyPermissions, viewerOnlyDesc, 403},
-		{org.RoleEditor, everyonePermissions, everyoneDesc, 200},
-		{org.RoleEditor, noPermissions, noDesc, 403},
-
-		{org.RoleViewer, defaultPermissions, defaultDesc, 403},
-		{org.RoleViewer, adminOnlyPermissions, adminOnlyDesc, 403},
-		{org.RoleViewer, editorOnlyPermissions, editorOnlyDesc, 403},
-		{org.RoleViewer, editorAndViewerPermissions, editorAndViewerDesc, 200},
-		{org.RoleViewer, viewerOnlyPermissions, viewerOnlyDesc, 200},
-		{org.RoleViewer, everyonePermissions, everyoneDesc, 200},
-		{org.RoleViewer, noPermissions, noDesc, 403},
-	}
-
-	for _, testCase := range accessCases {
-		testScenario(t, fmt.Sprintf("When %s tries to create a library panel in a folder with %s, it should return correct status", testCase.role, testCase.desc),
-			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
-				sc.reqContext.SignedInUser.OrgRole = testCase.role
-
-				command := getCreatePanelCommand(folder.ID, "Library Panel Name")
-				sc.reqContext.Req.Body = mockRequestBody(command)
-				resp := sc.service.createHandler(sc.reqContext)
-				require.Equal(t, testCase.status, resp.Status())
-			})
-
-		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it to a folder with %s, it should return correct status", testCase.role, testCase.desc),
-			func(t *testing.T, sc scenarioContext) {
-				fromFolder := createFolderWithACL(t, sc.sqlStore, "Everyone", sc.user, everyonePermissions)
-				command := getCreatePanelCommand(fromFolder.ID, "Library Panel Name")
-				sc.reqContext.Req.Body = mockRequestBody(command)
-				resp := sc.service.createHandler(sc.reqContext)
-				result := validateAndUnMarshalResponse(t, resp)
-				toFolder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
-				sc.reqContext.SignedInUser.OrgRole = testCase.role
-
-				cmd := model.PatchLibraryElementCommand{FolderID: toFolder.ID, Version: 1, Kind: int64(model.PanelElement)}
-				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
-				sc.reqContext.Req.Body = mockRequestBody(cmd)
-				resp = sc.service.patchHandler(sc.reqContext)
-				require.Equal(t, testCase.status, resp.Status())
-			})
-
-		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it from a folder with %s, it should return correct status", testCase.role, testCase.desc),
-			func(t *testing.T, sc scenarioContext) {
-				fromFolder := createFolderWithACL(t, sc.sqlStore, "Everyone", sc.user, testCase.items)
-				command := getCreatePanelCommand(fromFolder.ID, "Library Panel Name")
-				sc.reqContext.Req.Body = mockRequestBody(command)
-				resp := sc.service.createHandler(sc.reqContext)
-				result := validateAndUnMarshalResponse(t, resp)
-				toFolder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, everyonePermissions)
-				sc.reqContext.SignedInUser.OrgRole = testCase.role
-
-				cmd := model.PatchLibraryElementCommand{FolderID: toFolder.ID, Version: 1, Kind: int64(model.PanelElement)}
-				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
-				sc.reqContext.Req.Body = mockRequestBody(cmd)
-				resp = sc.service.patchHandler(sc.reqContext)
-				require.Equal(t, testCase.status, resp.Status())
-			})
-
-		testScenario(t, fmt.Sprintf("When %s tries to delete a library panel in a folder with %s, it should return correct status", testCase.role, testCase.desc),
-			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
-				cmd := getCreatePanelCommand(folder.ID, "Library Panel Name")
-				sc.reqContext.Req.Body = mockRequestBody(cmd)
-				resp := sc.service.createHandler(sc.reqContext)
-				result := validateAndUnMarshalResponse(t, resp)
-				sc.reqContext.SignedInUser.OrgRole = testCase.role
-
-				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
-				resp = sc.service.deleteHandler(sc.reqContext)
-				require.Equal(t, testCase.status, resp.Status())
-			})
-	}
-
+func TestLibraryElementPermissionsGeneralFolder(t *testing.T) {
 	var generalFolderCases = []struct {
 		role   org.RoleType
 		status int
@@ -152,7 +38,7 @@ func TestLibraryElementPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it to the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, everyonePermissions)
+				folder := createFolder(t, sc, "Folder")
 				command := getCreatePanelCommand(folder.ID, "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(command)
 				resp := sc.service.createHandler(sc.reqContext)
@@ -168,7 +54,7 @@ func TestLibraryElementPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it from the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, everyonePermissions)
+				folder := createFolder(t, sc, "Folder")
 				command := getCreatePanelCommand(0, "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(command)
 				resp := sc.service.createHandler(sc.reqContext)
@@ -194,79 +80,6 @@ func TestLibraryElementPermissions(t *testing.T) {
 				resp = sc.service.deleteHandler(sc.reqContext)
 				require.Equal(t, testCase.status, resp.Status())
 			})
-	}
-
-	var missingFolderCases = []struct {
-		role org.RoleType
-	}{
-		{org.RoleAdmin},
-		{org.RoleEditor},
-		{org.RoleViewer},
-	}
-
-	for _, testCase := range missingFolderCases {
-		testScenario(t, fmt.Sprintf("When %s tries to create a library panel in a folder that doesn't exist, it should fail", testCase.role),
-			func(t *testing.T, sc scenarioContext) {
-				sc.reqContext.SignedInUser.OrgRole = testCase.role
-
-				command := getCreatePanelCommand(-100, "Library Panel Name")
-				sc.reqContext.Req.Body = mockRequestBody(command)
-				resp := sc.service.createHandler(sc.reqContext)
-				require.Equal(t, 404, resp.Status())
-			})
-
-		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it to a folder that doesn't exist, it should fail", testCase.role),
-			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, everyonePermissions)
-				command := getCreatePanelCommand(folder.ID, "Library Panel Name")
-				sc.reqContext.Req.Body = mockRequestBody(command)
-				resp := sc.service.createHandler(sc.reqContext)
-				result := validateAndUnMarshalResponse(t, resp)
-				sc.reqContext.SignedInUser.OrgRole = testCase.role
-
-				cmd := model.PatchLibraryElementCommand{FolderID: -100, Version: 1, Kind: int64(model.PanelElement)}
-				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
-				sc.reqContext.Req.Body = mockRequestBody(cmd)
-				resp = sc.service.patchHandler(sc.reqContext)
-				require.Equal(t, 404, resp.Status())
-			})
-	}
-
-	var getCases = []struct {
-		role     org.RoleType
-		statuses []int
-	}{
-		{org.RoleAdmin, []int{200, 200, 200, 200, 200, 200, 200}},
-		{org.RoleEditor, []int{200, 404, 200, 200, 200, 200, 200}},
-		{org.RoleViewer, []int{200, 404, 404, 200, 200, 200, 200}},
-	}
-
-	for _, testCase := range getCases {
-		testScenario(t, fmt.Sprintf("When %s tries to get a library panel, it should return correct response", testCase.role),
-			func(t *testing.T, sc scenarioContext) {
-				var results []libraryElement
-				for i, folderCase := range folderCases {
-					folder := createFolderWithACL(t, sc.sqlStore, fmt.Sprintf("Folder%v", i), sc.user, folderCase)
-					cmd := getCreatePanelCommand(folder.ID, fmt.Sprintf("Library Panel in Folder%v", i))
-					sc.reqContext.Req.Body = mockRequestBody(cmd)
-					resp := sc.service.createHandler(sc.reqContext)
-					result := validateAndUnMarshalResponse(t, resp)
-					result.Result.Meta.CreatedBy.Name = userInDbName
-					result.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
-					result.Result.Meta.UpdatedBy.Name = userInDbName
-					result.Result.Meta.UpdatedBy.AvatarUrl = userInDbAvatar
-					result.Result.Meta.FolderName = folder.Title
-					result.Result.Meta.FolderUID = folder.UID
-					results = append(results, result.Result)
-				}
-				sc.reqContext.SignedInUser.OrgRole = testCase.role
-
-				for i, result := range results {
-					sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.UID})
-					resp := sc.service.getHandler(sc.reqContext)
-					require.Equal(t, testCase.statuses[i], resp.Status())
-				}
-			})
 
 		testScenario(t, fmt.Sprintf("When %s tries to get a library panel from General folder, it should return correct response", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
@@ -292,73 +105,6 @@ func TestLibraryElementPermissions(t *testing.T) {
 					t.Fatalf("Result mismatch (-want +got):\n%s", diff)
 				}
 			})
-	}
-
-	var getAllCases = []struct {
-		role          org.RoleType
-		panels        int
-		folderIndexes []int
-	}{
-		{org.RoleAdmin, 7, []int{0, 1, 2, 3, 4, 5, 6}},
-		{org.RoleEditor, 6, []int{0, 2, 3, 4, 5, 6}},
-		{org.RoleViewer, 5, []int{0, 3, 4, 5, 6}},
-	}
-
-	for _, testCase := range getAllCases {
-		testScenario(t, fmt.Sprintf("When %s tries to get all library panels, it should return correct response", testCase.role),
-			func(t *testing.T, sc scenarioContext) {
-				var results []libraryElement
-				for i, folderCase := range folderCases {
-					folder := createFolderWithACL(t, sc.sqlStore, fmt.Sprintf("Folder%v", i), sc.user, folderCase)
-					cmd := getCreatePanelCommand(folder.ID, fmt.Sprintf("Library Panel in Folder%v", i))
-					sc.reqContext.Req.Body = mockRequestBody(cmd)
-					resp := sc.service.createHandler(sc.reqContext)
-					result := validateAndUnMarshalResponse(t, resp)
-					result.Result.Meta.CreatedBy.Name = userInDbName
-					result.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
-					result.Result.Meta.UpdatedBy.Name = userInDbName
-					result.Result.Meta.UpdatedBy.AvatarUrl = userInDbAvatar
-					result.Result.Meta.FolderName = folder.Title
-					result.Result.Meta.FolderUID = folder.UID
-					results = append(results, result.Result)
-				}
-				sc.reqContext.SignedInUser.OrgRole = testCase.role
-
-				resp := sc.service.getAllHandler(sc.reqContext)
-				require.Equal(t, 200, resp.Status())
-				var actual libraryElementsSearch
-				err := json.Unmarshal(resp.Body(), &actual)
-				require.NoError(t, err)
-				require.Equal(t, testCase.panels, len(actual.Result.Elements))
-				for _, folderIndex := range testCase.folderIndexes {
-					var folderID = int64(folderIndex + 2) // testScenario creates one folder and general folder doesn't count
-					var foundExists = false
-					var foundResult libraryElement
-					var actualExists = false
-					var actualResult libraryElement
-					for _, result := range results {
-						if result.FolderID == folderID {
-							foundExists = true
-							foundResult = result
-							break
-						}
-					}
-					require.Equal(t, foundExists, true)
-
-					for _, result := range actual.Result.Elements {
-						if result.FolderID == folderID {
-							actualExists = true
-							actualResult = result
-							break
-						}
-					}
-					require.Equal(t, actualExists, true)
-
-					if diff := cmp.Diff(foundResult, actualResult, getCompareOptions()...); diff != "" {
-						t.Fatalf("Result mismatch (-want +got):\n%s", diff)
-					}
-				}
-			})
 
 		testScenario(t, fmt.Sprintf("When %s tries to get all library panels from General folder, it should return correct response", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
@@ -385,3 +131,300 @@ func TestLibraryElementPermissions(t *testing.T) {
 			})
 	}
 }
+
+func TestLibraryElementCreatePermissions(t *testing.T) {
+	var accessCases = []struct {
+		permissions map[string][]string
+		desc        string
+		status      int
+	}{
+		{
+			desc: "can create library elements when granted write access to the correct folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("Folder")},
+				dashboards.ActionFoldersRead:  {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusOK,
+		},
+		{
+			desc: "can create library elements when granted write access to all folders",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+				dashboards.ActionFoldersRead:  {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusOK,
+		},
+		{
+			desc: "can't create library elements when granted write access to the wrong folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("Other_folder")},
+				dashboards.ActionFoldersRead:  {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusForbidden,
+		},
+		{
+			desc: "can't create library elements when granted read access to the right folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersRead: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("Folder")},
+			},
+			status: http.StatusForbidden,
+		},
+	}
+
+	for _, testCase := range accessCases {
+		testScenario(t, testCase.desc,
+			func(t *testing.T, sc scenarioContext) {
+				folder := createFolder(t, sc, "Folder")
+				sc.reqContext.SignedInUser.Permissions = map[int64]map[string][]string{
+					1: testCase.permissions,
+				}
+
+				command := getCreatePanelCommand(folder.ID, "Library Panel Name")
+				sc.reqContext.Req.Body = mockRequestBody(command)
+				resp := sc.service.createHandler(sc.reqContext)
+				require.Equal(t, testCase.status, resp.Status())
+			})
+	}
+}
+
+func TestLibraryElementPatchPermissions(t *testing.T) {
+	var accessCases = []struct {
+		permissions map[string][]string
+		desc        string
+		status      int
+	}{
+		{
+			desc: "can move library elements when granted write access to the source and destination folders",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("FromFolder"), dashboards.ScopeFoldersProvider.GetResourceScopeUID("ToFolder")},
+				dashboards.ActionFoldersRead:  {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusOK,
+		},
+		{
+			desc: "can move library elements when granted write access to all folders",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+				dashboards.ActionFoldersRead:  {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusOK,
+		},
+		{
+			desc: "can't move library elements when granted write access only to the source folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("FromFolder")},
+				dashboards.ActionFoldersRead:  {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusForbidden,
+		},
+		{
+			desc: "can't move library elements when granted write access to the destination folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("ToFolder")},
+				dashboards.ActionFoldersRead:  {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusForbidden,
+		},
+	}
+
+	for _, testCase := range accessCases {
+		testScenario(t, testCase.desc,
+			func(t *testing.T, sc scenarioContext) {
+				fromFolder := createFolder(t, sc, "FromFolder")
+				command := getCreatePanelCommand(fromFolder.ID, "Library Panel Name")
+				sc.reqContext.Req.Body = mockRequestBody(command)
+				resp := sc.service.createHandler(sc.reqContext)
+				result := validateAndUnMarshalResponse(t, resp)
+
+				toFolder := createFolder(t, sc, "ToFolder")
+
+				sc.reqContext.SignedInUser.Permissions = map[int64]map[string][]string{
+					1: testCase.permissions,
+				}
+
+				cmd := model.PatchLibraryElementCommand{FolderID: toFolder.ID, Version: 1, Kind: int64(model.PanelElement)}
+				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
+				sc.reqContext.Req.Body = mockRequestBody(cmd)
+				resp = sc.service.patchHandler(sc.reqContext)
+				require.Equal(t, testCase.status, resp.Status())
+			})
+	}
+}
+
+func TestLibraryElementDeletePermissions(t *testing.T) {
+	var accessCases = []struct {
+		permissions map[string][]string
+		desc        string
+		status      int
+	}{
+		{
+			desc: "can delete library elements when granted write access to the correct folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("Folder")},
+			},
+			status: http.StatusOK,
+		},
+		{
+			desc: "can delete library elements when granted write access to all folders",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusOK,
+		},
+		{
+			desc: "can't delete library elements when granted write access to the wrong folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("Other_folder")},
+			},
+			status: http.StatusForbidden,
+		},
+		{
+			desc: "can't delete library elements when granted read access to the right folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersRead: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("Folder")},
+			},
+			status: http.StatusForbidden,
+		},
+	}
+
+	for _, testCase := range accessCases {
+		testScenario(t, testCase.desc,
+			func(t *testing.T, sc scenarioContext) {
+				folder := createFolder(t, sc, "Folder")
+				command := getCreatePanelCommand(folder.ID, "Library Panel Name")
+				sc.reqContext.Req.Body = mockRequestBody(command)
+				resp := sc.service.createHandler(sc.reqContext)
+				result := validateAndUnMarshalResponse(t, resp)
+
+				sc.reqContext.SignedInUser.Permissions = map[int64]map[string][]string{
+					1: testCase.permissions,
+				}
+
+				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
+				resp = sc.service.deleteHandler(sc.reqContext)
+				require.Equal(t, testCase.status, resp.Status())
+			})
+	}
+}
+
+func TestLibraryElementsWithMissingFolders(t *testing.T) {
+	testScenario(t, "When a user tries to create a library panel in a folder that doesn't exist, it should fail",
+		func(t *testing.T, sc scenarioContext) {
+			command := getCreatePanelCommand(-100, "Library Panel Name")
+			sc.reqContext.Req.Body = mockRequestBody(command)
+			resp := sc.service.createHandler(sc.reqContext)
+			require.Equal(t, 404, resp.Status())
+		})
+
+	testScenario(t, "When a user tries to patch a library panel by moving it to a folder that doesn't exist, it should fail",
+		func(t *testing.T, sc scenarioContext) {
+			folder := createFolder(t, sc, "Folder")
+			command := getCreatePanelCommand(folder.ID, "Library Panel Name")
+			sc.reqContext.Req.Body = mockRequestBody(command)
+			resp := sc.service.createHandler(sc.reqContext)
+			result := validateAndUnMarshalResponse(t, resp)
+
+			cmd := model.PatchLibraryElementCommand{FolderID: -100, Version: 1, Kind: int64(model.PanelElement)}
+			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
+			sc.reqContext.Req.Body = mockRequestBody(cmd)
+			resp = sc.service.patchHandler(sc.reqContext)
+			require.Equal(t, 404, resp.Status())
+		})
+}
+
+func TestLibraryElementsGetPermissions(t *testing.T) {
+	var getCases = []struct {
+		permissions map[string][]string
+		desc        string
+		status      int
+	}{
+		{
+			desc: "can get a library element when granted read access to all folders",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersRead: {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			status: http.StatusOK,
+		},
+		{
+			desc: "can't list library element when granted read access to the wrong folder",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersRead: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("Other_folder")},
+			},
+			status: http.StatusNotFound,
+		},
+	}
+	for _, testCase := range getCases {
+		testScenario(t, testCase.desc,
+			func(t *testing.T, sc scenarioContext) {
+				folder := createFolder(t, sc, "Folder")
+				cmd := getCreatePanelCommand(folder.ID, "Library Panel")
+				sc.reqContext.Req.Body = mockRequestBody(cmd)
+				resp := sc.service.createHandler(sc.reqContext)
+				result := validateAndUnMarshalResponse(t, resp)
+				result.Result.Meta.CreatedBy.Name = userInDbName
+				result.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
+				result.Result.Meta.UpdatedBy.Name = userInDbName
+				result.Result.Meta.UpdatedBy.AvatarUrl = userInDbAvatar
+				result.Result.Meta.FolderName = folder.Title
+				result.Result.Meta.FolderUID = folder.UID
+
+				sc.reqContext.SignedInUser.OrgRole = org.RoleViewer
+				sc.reqContext.SignedInUser.Permissions = map[int64]map[string][]string{
+					1: testCase.permissions,
+				}
+
+				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
+				resp = sc.service.getHandler(sc.reqContext)
+				require.Equal(t, testCase.status, resp.Status())
+			})
+	}
+}
+
+func TestLibraryElementsGetAllPermissions(t *testing.T) {
+	var getCases = []struct {
+		permissions         map[string][]string
+		desc                string
+		status              int
+		expectedResultCount int
+	}{
+		{
+			desc: "can get all library elements when granted read access to all folders",
+			permissions: map[string][]string{
+				dashboards.ActionFoldersRead: {dashboards.ScopeFoldersProvider.GetResourceAllScope()},
+			},
+			expectedResultCount: 2,
+			status:              http.StatusOK,
+		},
+		{
+			desc:                "can't get any library element when doesn't have access to any folders",
+			permissions:         map[string][]string{},
+			expectedResultCount: 0,
+			status:              http.StatusOK,
+		},
+	}
+	for _, testCase := range getCases {
+		testScenario(t, testCase.desc,
+			func(t *testing.T, sc scenarioContext) {
+				for i := 1; i <= 2; i++ {
+					folder := createFolder(t, sc, fmt.Sprintf("Folder%d", i))
+					cmd := getCreatePanelCommand(folder.ID, fmt.Sprintf("Library Panel %d", i))
+					sc.reqContext.Req.Body = mockRequestBody(cmd)
+					resp := sc.service.createHandler(sc.reqContext)
+					result := validateAndUnMarshalResponse(t, resp)
+					result.Result.Meta.FolderUID = folder.UID
+				}
+
+				sc.reqContext.SignedInUser.OrgRole = org.RoleViewer
+				sc.reqContext.SignedInUser.Permissions = map[int64]map[string][]string{
+					1: testCase.permissions,
+				}
+
+				resp := sc.service.getAllHandler(sc.reqContext)
+				require.Equal(t, 200, resp.Status())
+				var actual libraryElementsSearch
+				err := json.Unmarshal(resp.Body(), &actual)
+				require.NoError(t, err)
+				require.Equal(t, testCase.expectedResultCount, len(actual.Result.Elements))
+			})
+	}
+}
diff --git a/pkg/services/libraryelements/libraryelements_test.go b/pkg/services/libraryelements/libraryelements_test.go
index 967d43cbe3d..32db4c162c7 100644
--- a/pkg/services/libraryelements/libraryelements_test.go
+++ b/pkg/services/libraryelements/libraryelements_test.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/api/response"
@@ -17,9 +18,11 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/db/dbtest"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/kinds/librarypanel"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -37,7 +40,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
-	"github.com/grafana/grafana/pkg/services/team/teamtest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
@@ -268,11 +270,6 @@ type scenarioContext struct {
 	sqlStore      db.DB
 }
 
-type folderACLItem struct {
-	roleType   org.RoleType
-	permission dashboards.PermissionType
-}
-
 func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash *dashboards.Dashboard, folderID int64) *dashboards.Dashboard {
 	dash.FolderID = folderID
 	dashItem := &dashboards.SaveDashboardDTO{
@@ -284,16 +281,16 @@ func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash
 	}
 
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	features := featuremgmt.WithFeatures()
 	cfg.IsFeatureToggleEnabled = features.IsEnabled
 	quotaService := quotatest.New(false, nil)
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	dashAlertExtractor := alerting.ProvideDashAlertExtractorService(nil, nil, nil)
-	ac := acmock.New()
+	ac := actest.FakeAccessControl{ExpectedEvaluate: true}
 	folderPermissions := acmock.NewMockedPermissionsService()
 	dashboardPermissions := acmock.NewMockedPermissionsService()
+	dashboardPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	service, err := dashboardservice.ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, dashAlertExtractor,
@@ -307,57 +304,34 @@ func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash
 	return dashboard
 }
 
-func createFolderWithACL(t *testing.T, sqlStore db.DB, title string, user user.SignedInUser,
-	items []folderACLItem) *folder.Folder {
+func createFolder(t *testing.T, sc scenarioContext, title string) *folder.Folder {
 	t.Helper()
 
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	features := featuremgmt.WithFeatures()
 	cfg.IsFeatureToggleEnabled = features.IsEnabled
-	ac := acmock.New()
+	ac := actest.FakeAccessControl{}
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sc.sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sc.sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 
-	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	folderStore := folderimpl.ProvideDashboardFolderStore(sc.sqlStore)
 	s := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, nil, features)
 	t.Logf("Creating folder with title and UID %q", title)
-	ctx := appcontext.WithUser(context.Background(), &user)
+	ctx := appcontext.WithUser(context.Background(), &sc.user)
 	folder, err := s.Create(ctx, &folder.CreateFolderCommand{
-		OrgID: user.OrgID, Title: title, UID: title, SignedInUser: &user,
+		OrgID: sc.user.OrgID, Title: title, UID: title, SignedInUser: &sc.user,
 	})
 	require.NoError(t, err)
 
-	updateFolderACL(t, dashboardStore, folder.ID, items)
+	// Set user permissions on the newly created folder so that they can interact with library elements stored in it
+	sc.reqContext.SignedInUser.Permissions[sc.user.OrgID][dashboards.ActionFoldersWrite] = append(sc.reqContext.SignedInUser.Permissions[sc.user.OrgID][dashboards.ActionFoldersWrite], dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.UID))
+	sc.reqContext.SignedInUser.Permissions[sc.user.OrgID][dashboards.ActionFoldersRead] = append(sc.reqContext.SignedInUser.Permissions[sc.user.OrgID][dashboards.ActionFoldersRead], dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.UID))
+	sc.reqContext.SignedInUser.Permissions[sc.user.OrgID][dashboards.ActionDashboardsCreate] = append(sc.reqContext.SignedInUser.Permissions[sc.user.OrgID][dashboards.ActionDashboardsCreate], dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.UID))
 
 	return folder
 }
 
-func updateFolderACL(t *testing.T, dashboardStore dashboards.Store, folderID int64, items []folderACLItem) {
-	t.Helper()
-
-	if len(items) == 0 {
-		return
-	}
-
-	var aclItems []*dashboards.DashboardACL
-	for _, item := range items {
-		role := item.roleType
-		permission := item.permission
-		aclItems = append(aclItems, &dashboards.DashboardACL{
-			DashboardID: folderID,
-			Role:        &role,
-			Permission:  permission,
-			Created:     time.Now(),
-			Updated:     time.Now(),
-		})
-	}
-
-	err := dashboardStore.UpdateDashboardACL(context.Background(), folderID, aclItems)
-	require.NoError(t, err)
-}
-
 func validateAndUnMarshalResponse(t *testing.T, resp response.Response) libraryElementResult {
 	t.Helper()
 
@@ -392,8 +366,23 @@ func validateAndUnMarshalArrayResponse(t *testing.T, resp response.Response) lib
 
 func scenarioWithPanel(t *testing.T, desc string, fn func(t *testing.T, sc scenarioContext)) {
 	t.Helper()
-	store := dbtest.NewFakeDB()
-	guardian.InitLegacyGuardian(setting.NewCfg(), store, &dashboards.FakeDashboardService{}, &teamtest.FakeService{})
+
+	sqlStore := db.InitTestDB(t)
+	ac := actest.FakeAccessControl{}
+	quotaService := quotatest.New(false, nil)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+	require.NoError(t, err)
+	features := featuremgmt.WithFeatures()
+	folderPermissions := acmock.NewMockedPermissionsService()
+	dashboardPermissions := acmock.NewMockedPermissionsService()
+	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	dashboardService, svcErr := dashboardservice.ProvideDashboardServiceImpl(
+		sqlStore.Cfg, dashboardStore, folderStore, nil,
+		features, folderPermissions, dashboardPermissions, ac,
+		foldertest.NewFakeService(),
+	)
+	require.NoError(t, svcErr)
+	guardian.InitAccessControlGuardian(sqlStore.Cfg, sqlStore, ac, folderPermissions, dashboardPermissions, dashboardService)
 
 	testScenario(t, desc, func(t *testing.T, sc scenarioContext) {
 		command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel")
@@ -421,6 +410,10 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 			OrgID:      orgID,
 			OrgRole:    role,
 			LastSeenAt: time.Now(),
+			// Allow user to create folders
+			Permissions: map[int64]map[string][]string{
+				1: {dashboards.ActionFoldersCreate: {}},
+			},
 		}
 		req := &http.Request{
 			Header: http.Header{
@@ -436,21 +429,21 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 		dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
 		require.NoError(t, err)
 		features := featuremgmt.WithFeatures()
-		ac := acmock.New().WithDisabled()
-		// TODO: Update tests to work with rbac
-		sqlStore.Cfg.RBACEnabled = false
+		ac := acimpl.ProvideAccessControl(sqlStore.Cfg)
 		folderPermissions := acmock.NewMockedPermissionsService()
+		folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 		dashboardPermissions := acmock.NewMockedPermissionsService()
 		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-		dashboardService, err := dashboardservice.ProvideDashboardServiceImpl(
+		dashService, dashSvcErr := dashboardservice.ProvideDashboardServiceImpl(
 			sqlStore.Cfg, dashboardStore, folderStore, nil,
 			features, folderPermissions, dashboardPermissions, ac,
 			foldertest.NewFakeService(),
 		)
-		require.NoError(t, err)
-		guardian.InitLegacyGuardian(sqlStore.Cfg, sqlStore, dashboardService, &teamtest.FakeService{})
+		require.NoError(t, dashSvcErr)
+		guardian.InitAccessControlGuardian(sqlStore.Cfg, sqlStore, ac, folderPermissions, dashboardPermissions, dashService)
 		service := LibraryElementService{
 			Cfg:           sqlStore.Cfg,
+			features:      featuremgmt.WithFeatures(),
 			SQLStore:      sqlStore,
 			folderService: folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardStore, folderStore, nil, features),
 		}
@@ -481,7 +474,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 			},
 		}
 
-		sc.folder = createFolderWithACL(t, sc.sqlStore, "ScenarioFolder", sc.user, []folderACLItem{})
+		sc.folder = createFolder(t, sc, "ScenarioFolder")
 
 		fn(t, sc)
 	})
diff --git a/pkg/services/librarypanels/librarypanels_test.go b/pkg/services/librarypanels/librarypanels_test.go
index 37130266d95..36765e66966 100644
--- a/pkg/services/librarypanels/librarypanels_test.go
+++ b/pkg/services/librarypanels/librarypanels_test.go
@@ -15,10 +15,11 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/db/dbtest"
 	"github.com/grafana/grafana/pkg/infra/slugify"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/kinds/librarypanel"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/dashboards"
@@ -36,7 +37,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
-	"github.com/grafana/grafana/pkg/services/team/teamtest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
@@ -609,11 +609,6 @@ type scenarioContext struct {
 	sqlStore       db.DB
 }
 
-type folderACLItem struct {
-	roleType   org.RoleType
-	permission dashboards.PermissionType
-}
-
 func toLibraryElement(t *testing.T, res model.LibraryElementDTO) libraryElement {
 	var libraryElementModel = libraryElementModel{}
 	err := json.Unmarshal(res.Model, &libraryElementModel)
@@ -699,17 +694,18 @@ func createDashboard(t *testing.T, sqlStore db.DB, user *user.SignedInUser, dash
 	}
 
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	dashAlertService := alerting.ProvideDashAlertExtractorService(nil, nil, nil)
-	ac := acmock.New()
+	ac := actest.FakeAccessControl{ExpectedEvaluate: true}
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	dashPermissionService := acmock.NewMockedPermissionsService()
+	dashPermissionService.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	service, err := dashboardservice.ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, dashAlertService,
-		featuremgmt.WithFeatures(), acmock.NewMockedPermissionsService(), acmock.NewMockedPermissionsService(), ac,
+		featuremgmt.WithFeatures(), acmock.NewMockedPermissionsService(), dashPermissionService, ac,
 		foldertest.NewFakeService(),
 	)
 	require.NoError(t, err)
@@ -719,68 +715,28 @@ func createDashboard(t *testing.T, sqlStore db.DB, user *user.SignedInUser, dash
 	return dashboard
 }
 
-func createFolderWithACL(t *testing.T, sqlStore db.DB, title string, user *user.SignedInUser,
-	items []folderACLItem) *folder.Folder {
+func createFolder(t *testing.T, sc scenarioContext, title string) *folder.Folder {
 	t.Helper()
 
-	ac := acmock.New()
+	ac := actest.FakeAccessControl{ExpectedEvaluate: true}
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	features := featuremgmt.WithFeatures()
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sc.sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sc.sqlStore, cfg), quotaService)
 	require.NoError(t, err)
-	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	folderStore := folderimpl.ProvideDashboardFolderStore(sc.sqlStore)
 	s := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, nil, features)
 
 	t.Logf("Creating folder with title and UID %q", title)
-	ctx := appcontext.WithUser(context.Background(), user)
-	folder, err := s.Create(ctx, &folder.CreateFolderCommand{OrgID: user.OrgID, Title: title, UID: title, SignedInUser: user})
+	ctx := appcontext.WithUser(context.Background(), sc.user)
+	folder, err := s.Create(ctx, &folder.CreateFolderCommand{OrgID: sc.user.OrgID, Title: title, UID: title, SignedInUser: sc.user})
 	require.NoError(t, err)
 
-	updateFolderACL(t, dashboardStore, folder.ID, items)
-
 	return folder
 }
 
-func updateFolderACL(t *testing.T, dashboardStore dashboards.Store, folderID int64, items []folderACLItem) {
-	t.Helper()
-
-	if len(items) == 0 {
-		return
-	}
-
-	var aclItems []*dashboards.DashboardACL
-	for _, item := range items {
-		role := item.roleType
-		permission := item.permission
-		aclItems = append(aclItems, &dashboards.DashboardACL{
-			DashboardID: folderID,
-			Role:        &role,
-			Permission:  permission,
-			Created:     time.Now(),
-			Updated:     time.Now(),
-		})
-	}
-
-	err := dashboardStore.UpdateDashboardACL(context.Background(), folderID, aclItems)
-	require.NoError(t, err)
-}
-
 func scenarioWithLibraryPanel(t *testing.T, desc string, fn func(t *testing.T, sc scenarioContext)) {
-	store := dbtest.NewFakeDB()
-
-	dashSvc := dashboards.NewFakeDashboardService(t)
-	var result *dashboards.Dashboard
-	dashSvc.On("GetDashboard", mock.Anything, mock.AnythingOfType("*dashboards.GetDashboardQuery")).Run(func(args mock.Arguments) {
-		q := args.Get(1).(*dashboards.GetDashboardQuery)
-		result = &dashboards.Dashboard{
-			ID:  q.ID,
-			UID: q.UID,
-		}
-	}).Return(result, nil)
-	guardian.InitLegacyGuardian(setting.NewCfg(), store, dashSvc, &teamtest.FakeService{})
 	t.Helper()
 
 	testScenario(t, desc, func(t *testing.T, sc scenarioContext) {
@@ -829,19 +785,28 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 	t.Helper()
 
 	t.Run(desc, func(t *testing.T) {
-		cfg := setting.NewCfg()
-		cfg.RBACEnabled = false
 		orgID := int64(1)
 		role := org.RoleAdmin
 		sqlStore, cfg := db.InitTestDBwithCfg(t)
 		quotaService := quotatest.New(false, nil)
+
+		ac := actest.FakeAccessControl{ExpectedEvaluate: true}
+		dashStore := &dashboards.FakeDashboardStore{}
+		dashStore.On("GetDashboard", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{ID: 1}, nil)
+		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+		dashAlertService := alerting.ProvideDashAlertExtractorService(nil, nil, nil)
+		dashPermissionService := acmock.NewMockedPermissionsService()
+		dashService, err := dashboardservice.ProvideDashboardServiceImpl(
+			setting.NewCfg(), dashStore, folderStore, dashAlertService,
+			featuremgmt.WithFeatures(), acmock.NewMockedPermissionsService(), dashPermissionService, ac,
+			foldertest.NewFakeService(),
+		)
+		require.NoError(t, err)
+		guardian.InitAccessControlGuardian(setting.NewCfg(), sqlStore, ac, acmock.NewMockedPermissionsService(), acmock.NewMockedPermissionsService(), dashService)
+
 		dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
 		require.NoError(t, err)
-
 		features := featuremgmt.WithFeatures()
-		ac := acmock.New()
-
-		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 		folderService := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, nil, features)
 
 		elementService := libraryelements.ProvideService(cfg, sqlStore, routing.NewRouteRegister(), folderService, featuremgmt.WithFeatures())
@@ -859,6 +824,12 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 			OrgID:      orgID,
 			OrgRole:    role,
 			LastSeenAt: time.Now(),
+			// Allow the user to create folders
+			Permissions: map[int64]map[string][]string{
+				orgID: {
+					dashboards.ActionFoldersRead: {dashboards.ScopeFoldersAll},
+				},
+			},
 		}
 
 		// deliberate difference between signed in user and user in db to make it crystal clear
@@ -884,7 +855,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 			sqlStore:       sqlStore,
 		}
 
-		foldr := createFolderWithACL(t, sc.sqlStore, "ScenarioFolder", sc.user, []folderACLItem{})
+		foldr := createFolder(t, sc, "ScenarioFolder")
 		sc.folder = &folder.Folder{
 			ID:        foldr.ID,
 			UID:       foldr.UID,

From 3edc246ca3ad7b01ab5378259894dff79e239d96 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Thu, 20 Apr 2023 11:34:24 +0200
Subject: [PATCH 266/729] Variables are available in the new DS picker and
 modal (#66923)

---
 .../datasources/components/picker/DataSourceDropdown.tsx     | 5 ++---
 .../datasources/components/picker/DataSourceModal.tsx        | 1 +
 .../datasources/components/picker/DataSourcePickerNG.tsx     | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index 8c563e11e00..a74e0d80111 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -146,11 +146,10 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
       <div className={styles.dataSourceList}>
         <CustomScrollbar>
           <DataSourceList
-            mixed
-            dashboard
+            {...props}
             current={current}
             onChange={changeCallback}
-            filter={(ds) => !ds.meta.builtIn && ds.name.includes(filterTerm ?? '')}
+            filter={(ds) => ds.name.includes(filterTerm ?? '')}
           ></DataSourceList>
         </CustomScrollbar>
       </div>
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index 99f86a0e7b4..9b8997a82a2 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -60,6 +60,7 @@ export function DataSourceModal({
             <DataSourceList
               dashboard={false}
               mixed={false}
+              variables
               // FIXME: Filter out the grafana data source in a hacky way
               filter={(ds) => ds.name.includes(search) && ds.name !== '-- Grafana --'}
               onChange={onChange}
diff --git a/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx b/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
index 9c71bc118d1..99aa7d3879c 100644
--- a/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
+++ b/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
@@ -81,6 +81,7 @@ export class DataSourcePicker extends PureComponent<DataSourcePickerProps, DataS
     return (
       <div>
         <DataSourceDropdown
+          {...this.props}
           datasources={this.getDatasources()}
           onChange={this.onChange}
           recentlyUsed={recentlyUsed}

From 82ac2bae5faa6de5d9f69b51825526ee20be7716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Thu, 20 Apr 2023 11:42:25 +0200
Subject: [PATCH 267/729] Elasticsearch: Handle multiple annotation structures
 (#66762)

elastic: fix annotation handling
---
 .../components/QueryEditor/AnnotationQueryEditor.tsx |  8 +++++++-
 .../plugins/datasource/elasticsearch/datasource.ts   | 12 +++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx
index 60d12b10cf4..413decf565e 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx
@@ -23,9 +23,15 @@ export function ElasticsearchAnnotationsQueryEditor(props: Props) {
         <ElasticSearchQueryField
           value={annotation.target?.query}
           onChange={(query) => {
+            const currentTarget = annotation.target ?? { refId: 'annotation_query' };
+            const newTarget = {
+              ...currentTarget,
+              query,
+            };
+
             onAnnotationChange({
               ...annotation,
-              query,
+              target: newTarget,
             });
           }}
         />
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index e1d887b9f6f..1bfc8aa9eb3 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -257,7 +257,17 @@ export class ElasticDatasource
     const annotation = options.annotation;
     const timeField = annotation.timeField || '@timestamp';
     const timeEndField = annotation.timeEndField || null;
-    const queryString = annotation.query;
+
+    // the `target.query` is the "new" location for the query.
+    // normally we would write this code as
+    // try-the-new-place-then-try-the-old-place,
+    // but we had the bug at
+    // https://github.com/grafana/grafana/issues/61107
+    // that may have stored annotations where
+    // both the old and the new place are set,
+    // and in that scenario the old place needs
+    // to have priority.
+    const queryString = annotation.query ?? annotation.target?.query;
     const tagsField = annotation.tagsField || 'tags';
     const textField = annotation.textField || null;
 

From 350de3f3bf8aab8e831deb453dfeab7501b88304 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Thu, 20 Apr 2023 11:42:34 +0200
Subject: [PATCH 268/729] Expressions/threshold: Fix incorrect thresholds args
 length (#66859)

---
 pkg/expr/threshold.go      | 11 ++++++
 pkg/expr/threshold_test.go | 69 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/pkg/expr/threshold.go b/pkg/expr/threshold.go
index 3d3b4f3e65c..588cd65e30f 100644
--- a/pkg/expr/threshold.go
+++ b/pkg/expr/threshold.go
@@ -30,6 +30,17 @@ var (
 )
 
 func NewThresholdCommand(refID, referenceVar, thresholdFunc string, conditions []float64) (*ThresholdCommand, error) {
+	switch thresholdFunc {
+	case ThresholdIsOutsideRange, ThresholdIsWithinRange:
+		if len(conditions) < 2 {
+			return nil, fmt.Errorf("incorrect number of arguments: got %d but need 2", len(conditions))
+		}
+	case ThresholdIsAbove, ThresholdIsBelow:
+		if len(conditions) < 1 {
+			return nil, fmt.Errorf("incorrect number of arguments: got %d but need 1", len(conditions))
+		}
+	}
+
 	return &ThresholdCommand{
 		RefID:         refID,
 		ReferenceVar:  referenceVar,
diff --git a/pkg/expr/threshold_test.go b/pkg/expr/threshold_test.go
index 9bb87144b2e..a903358a137 100644
--- a/pkg/expr/threshold_test.go
+++ b/pkg/expr/threshold_test.go
@@ -8,9 +8,72 @@ import (
 )
 
 func TestNewThresholdCommand(t *testing.T) {
-	cmd, err := NewThresholdCommand("B", "A", "is_above", []float64{})
-	require.Nil(t, err)
-	require.NotNil(t, cmd)
+	type testCase struct {
+		fn            string
+		args          []float64
+		shouldError   bool
+		expectedError string
+	}
+
+	cases := []testCase{
+		{
+			fn:          "gt",
+			args:        []float64{0},
+			shouldError: false,
+		},
+		{
+			fn:          "lt",
+			args:        []float64{0},
+			shouldError: false,
+		},
+		{
+			fn:          "within_range",
+			args:        []float64{0, 1},
+			shouldError: false,
+		},
+		{
+			fn:          "outside_range",
+			args:        []float64{0, 1},
+			shouldError: false,
+		},
+		{
+			fn:            "gt",
+			args:          []float64{},
+			shouldError:   true,
+			expectedError: "incorrect number of arguments",
+		},
+		{
+			fn:            "lt",
+			args:          []float64{},
+			shouldError:   true,
+			expectedError: "incorrect number of arguments",
+		},
+		{
+			fn:            "within_range",
+			args:          []float64{0},
+			shouldError:   true,
+			expectedError: "incorrect number of arguments",
+		},
+		{
+			fn:            "outside_range",
+			args:          []float64{0},
+			shouldError:   true,
+			expectedError: "incorrect number of arguments",
+		},
+	}
+
+	for _, tc := range cases {
+		cmd, err := NewThresholdCommand("B", "A", tc.fn, tc.args)
+
+		if tc.shouldError {
+			require.Nil(t, cmd)
+			require.NotNil(t, err)
+			require.Contains(t, err.Error(), tc.expectedError)
+		} else {
+			require.Nil(t, err)
+			require.NotNil(t, cmd)
+		}
+	}
 }
 
 func TestUnmarshalThresholdCommand(t *testing.T) {

From 6e8b17efd8a77d696b3ab0a49fd03f79c0311cec Mon Sep 17 00:00:00 2001
From: Andre Pereira <adrapereira@gmail.com>
Date: Thu, 20 Apr 2023 10:52:12 +0100
Subject: [PATCH 269/729] Tempo: TraceQL query builder QoL improvements
 (#66865)

* Remove focus on duration inputs to match the other selects

* Allow users to create options while they load

* Options without type default to not have quotes around them

* Fix #66571 - set query type to traceql when linking from logs to traces

* Fix test
---
 .../plugins/datasource/loki/getDerivedFields.ts  |  2 +-
 .../tempo/SearchTraceQLEditor/DurationInput.tsx  | 16 +++++++++++++++-
 .../tempo/SearchTraceQLEditor/SearchField.tsx    |  1 +
 .../tempo/SearchTraceQLEditor/utils.test.ts      |  5 ++++-
 .../tempo/SearchTraceQLEditor/utils.ts           |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/loki/getDerivedFields.ts b/public/app/plugins/datasource/loki/getDerivedFields.ts
index 6fae391a7ef..04e4a32ec8c 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.ts
@@ -49,7 +49,7 @@ function fieldFromDerivedFieldConfig(derivedFieldConfigs: DerivedFieldConfig[]):
         url: '',
         // This is hardcoded for Jaeger or Zipkin not way right now to specify datasource specific query object
         internal: {
-          query: { query: derivedFieldConfig.url },
+          query: { query: derivedFieldConfig.url, queryType: dsSettings?.type === 'tempo' ? 'traceql' : undefined },
           datasourceUid: derivedFieldConfig.datasourceUid,
           datasourceName: dsSettings?.name ?? 'Data source not found',
         },
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx
index b65d6033a9c..f636af6dca2 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx
@@ -1,6 +1,7 @@
+import { css } from '@emotion/css';
 import React from 'react';
 
-import { Select, HorizontalGroup, Input } from '@grafana/ui';
+import { Select, HorizontalGroup, Input, useStyles2 } from '@grafana/ui';
 
 import { TraceqlFilter } from '../dataquery.gen';
 
@@ -15,7 +16,18 @@ interface Props {
 
 const validationRegex = /^\d+(?:\.\d)?\d*(?:us|µs|ns|ms|s|m|h)$/;
 
+const getStyles = () => ({
+  noBoxShadow: css`
+    box-shadow: none;
+    *:focus {
+      box-shadow: none;
+    }
+  `,
+});
+
 const DurationInput = ({ filter, operators, updateFilter }: Props) => {
+  const styles = useStyles2(getStyles);
+
   let invalid = false;
   if (typeof filter.value === 'string') {
     invalid = filter.value ? !validationRegex.test(filter.value.concat('')) : false;
@@ -24,6 +36,7 @@ const DurationInput = ({ filter, operators, updateFilter }: Props) => {
   return (
     <HorizontalGroup spacing={'none'}>
       <Select
+        className={styles.noBoxShadow}
         inputId={`${filter.id}-operator`}
         options={operators.map(operatorSelectableValue)}
         value={filter.operator}
@@ -36,6 +49,7 @@ const DurationInput = ({ filter, operators, updateFilter }: Props) => {
         width={8}
       />
       <Input
+        className={styles.noBoxShadow}
         value={filter.value}
         onChange={(v) => {
           updateFilter({ ...filter, value: v.currentTarget.value });
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
index a5fb47c4740..3049ba3c375 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
@@ -170,6 +170,7 @@ const SearchField = ({
           aria-label={`select ${filter.id} value`}
           allowCustomValue={true}
           isMulti
+          allowCreateWhileLoading
         />
       )}
       {allowDelete && (
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.test.ts b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.test.ts
index 603cd113f10..51f9143e08b 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.test.ts
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.test.ts
@@ -21,8 +21,11 @@ describe('generateQueryFromFilters generates the correct query for', () => {
 
   it('a field with tag, operator and tag', () => {
     expect(generateQueryFromFilters([{ id: 'foo', tag: 'footag', value: 'foovalue', operator: '=' }])).toBe(
-      '{.footag="foovalue"}'
+      '{.footag=foovalue}'
     );
+    expect(
+      generateQueryFromFilters([{ id: 'foo', tag: 'footag', value: 'foovalue', operator: '=', valueType: 'string' }])
+    ).toBe('{.footag="foovalue"}');
   });
 
   it('a field with valueType as integer', () => {
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
index a0fcd660123..a49bbd94519 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
@@ -16,7 +16,7 @@ const valueHelper = (f: TraceqlFilter) => {
   if (Array.isArray(f.value) && f.value.length > 1) {
     return `"${f.value.join('|')}"`;
   }
-  if (!f.valueType || f.valueType === 'string') {
+  if (f.valueType === 'string') {
     return `"${f.value}"`;
   }
   return f.value;

From 739c7f1c68e75b22a78ddb86c22b7e1874997a14 Mon Sep 17 00:00:00 2001
From: Will Browne <wbrowne@users.noreply.github.com>
Date: Thu, 20 Apr 2023 10:52:59 +0100
Subject: [PATCH 270/729] Plugins: Simplify plugin file removal (#66115)

* make explicit class check when attempting to remove plugin

* simplify plugin file tracking

* fix test

* apply feedback

* fix linter
---
 pkg/api/plugins.go                            |   5 -
 .../grafana-cli/commands/install_command.go   |   4 +-
 pkg/plugins/ifaces.go                         |   4 +
 pkg/plugins/localfiles.go                     |  11 ++
 pkg/plugins/localfiles_test.go                | 143 ++++++++++++++----
 pkg/plugins/manager/fakes/fakes.go            |  42 ++---
 pkg/plugins/manager/installer.go              |  12 +-
 pkg/plugins/manager/installer_test.go         |  13 +-
 pkg/plugins/manager/loader/loader.go          |  26 ++--
 pkg/plugins/manager/loader/loader_test.go     |  51 ++-----
 pkg/plugins/plugins.go                        |   5 +-
 pkg/plugins/storage/fs.go                     |  53 +------
 pkg/plugins/storage/fs_test.go                |  85 +----------
 pkg/plugins/storage/ifaces.go                 |   6 +-
 pkg/plugins/storage/models.go                 |  14 +-
 15 files changed, 193 insertions(+), 281 deletions(-)

diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go
index c628009d458..7c424ad6bf3 100644
--- a/pkg/api/plugins.go
+++ b/pkg/api/plugins.go
@@ -22,7 +22,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/repo"
-	"github.com/grafana/grafana/pkg/plugins/storage"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
@@ -491,10 +490,6 @@ func (hs *HTTPServer) UninstallPlugin(c *contextmodel.ReqContext) response.Respo
 		if errors.Is(err, plugins.ErrUninstallCorePlugin) {
 			return response.Error(http.StatusForbidden, "Cannot uninstall a Core plugin", err)
 		}
-		if errors.Is(err, storage.ErrUninstallOutsideOfPluginDir) {
-			return response.Error(http.StatusForbidden, "Cannot uninstall a plugin outside of the plugins directory", err)
-		}
-
 		return response.Error(http.StatusInternalServerError, "Failed to uninstall plugin", err)
 	}
 	return response.JSON(http.StatusOK, []byte{})
diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index be8b7b75499..35a8cd2a0ec 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -84,7 +84,7 @@ func installPlugin(ctx context.Context, pluginID, version string, c utils.Comman
 	}
 
 	pluginFs := storage.FileSystem(services.Logger, c.PluginDirectory())
-	extractedArchive, err := pluginFs.Add(ctx, pluginID, archive.File)
+	extractedArchive, err := pluginFs.Extract(ctx, pluginID, archive.File)
 	if err != nil {
 		return err
 	}
@@ -96,7 +96,7 @@ func installPlugin(ctx context.Context, pluginID, version string, c utils.Comman
 			return fmt.Errorf("%v: %w", fmt.Sprintf("failed to download plugin %s from repository", dep.ID), err)
 		}
 
-		_, err = pluginFs.Add(ctx, dep.ID, d.File)
+		_, err = pluginFs.Extract(ctx, dep.ID, d.File)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/plugins/ifaces.go b/pkg/plugins/ifaces.go
index 6b0d6bc3499..9a523686310 100644
--- a/pkg/plugins/ifaces.go
+++ b/pkg/plugins/ifaces.go
@@ -58,6 +58,10 @@ type FS interface {
 	Files() []string
 }
 
+type FSRemover interface {
+	Remove() error
+}
+
 type FoundBundle struct {
 	Primary  FoundPlugin
 	Children []*FoundPlugin
diff --git a/pkg/plugins/localfiles.go b/pkg/plugins/localfiles.go
index 92708796a90..cb0b442f8d1 100644
--- a/pkg/plugins/localfiles.go
+++ b/pkg/plugins/localfiles.go
@@ -82,6 +82,17 @@ func (f LocalFS) Files() []string {
 	return files
 }
 
+func (f LocalFS) Remove() error {
+	// extra security check to ensure we only remove a directory that looks like a plugin
+	if _, err := os.Stat(filepath.Join(f.basePath, "plugin.json")); os.IsNotExist(err) {
+		if _, err = os.Stat(filepath.Join(f.basePath, "dist/plugin.json")); os.IsNotExist(err) {
+			return ErrUninstallInvalidPluginDir
+		}
+	}
+
+	return os.RemoveAll(f.basePath)
+}
+
 var _ fs.File = (*LocalFile)(nil)
 
 // LocalFile implements a fs.File for accessing the local filesystem.
diff --git a/pkg/plugins/localfiles_test.go b/pkg/plugins/localfiles_test.go
index ed66190c048..86ddc6d9ec8 100644
--- a/pkg/plugins/localfiles_test.go
+++ b/pkg/plugins/localfiles_test.go
@@ -3,44 +3,97 @@ package plugins
 import (
 	"io"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
-type tempFileScenario struct {
-	filePath string
-}
-
-func (s tempFileScenario) cleanup() error {
-	return os.Remove(s.filePath)
-}
-
-func (s tempFileScenario) newLocalFile() LocalFile {
-	return LocalFile{path: s.filePath}
-}
-
-func newTempFileScenario() (tempFileScenario, error) {
-	tf, err := os.CreateTemp(os.TempDir(), "*")
-	if err != nil {
-		return tempFileScenario{}, err
-	}
-	defer tf.Close() //nolint
-	if _, err := tf.Write([]byte("hello\n")); err != nil {
-		return tempFileScenario{}, err
-	}
-	return tempFileScenario{
-		filePath: tf.Name(),
-	}, nil
-}
-
-func newTempFileScenarioForTest(t *testing.T) tempFileScenario {
-	s, err := newTempFileScenario()
+func TestLocalFS_Remove(t *testing.T) {
+	pluginDir := t.TempDir()
+	pluginJSON := filepath.Join(pluginDir, "plugin.json")
+	//nolint:gosec
+	f, err := os.Create(pluginJSON)
 	require.NoError(t, err)
-	t.Cleanup(func() {
-		require.NoError(t, s.cleanup())
+	err = f.Close()
+	require.NoError(t, err)
+
+	fs := NewLocalFS(
+		map[string]struct{}{
+			"plugin.json": {},
+		},
+		pluginDir,
+	)
+
+	err = fs.Remove()
+	require.NoError(t, err)
+
+	_, err = os.Stat(pluginDir)
+	require.Error(t, err)
+	require.True(t, os.IsNotExist(err))
+
+	_, err = os.Stat(pluginJSON)
+	require.Error(t, err)
+	require.True(t, os.IsNotExist(err))
+
+	t.Run("Uninstall will search in nested dist folder for plugin.json", func(t *testing.T) {
+		pluginDistDir := filepath.Join(t.TempDir(), "dist")
+		err = os.Mkdir(pluginDistDir, os.ModePerm)
+		require.NoError(t, err)
+		pluginJSON = filepath.Join(pluginDistDir, "plugin.json")
+		//nolint:gosec
+		f, err = os.Create(pluginJSON)
+		require.NoError(t, err)
+		err = f.Close()
+		require.NoError(t, err)
+
+		pluginDir = filepath.Dir(pluginDistDir)
+
+		fs = NewLocalFS(
+			map[string]struct{}{
+				"dist/plugin.json": {},
+			},
+			pluginDir,
+		)
+
+		err = fs.Remove()
+		require.NoError(t, err)
+
+		_, err = os.Stat(pluginDir)
+		require.True(t, os.IsNotExist(err))
+
+		_, err = os.Stat(pluginJSON)
+		require.Error(t, err)
+		require.True(t, os.IsNotExist(err))
+	})
+
+	t.Run("Uninstall will not delete folder if cannot recognize plugin structure", func(t *testing.T) {
+		pluginDir = filepath.Join(t.TempDir(), "system32")
+		err = os.Mkdir(pluginDir, os.ModePerm)
+		require.NoError(t, err)
+		testFile := filepath.Join(pluginDir, "important.exe")
+		//nolint:gosec
+		f, err = os.Create(testFile)
+		require.NoError(t, err)
+		err = f.Close()
+		require.NoError(t, err)
+
+		fs = NewLocalFS(
+			map[string]struct{}{
+				"system32/important.exe": {},
+			},
+			pluginDir,
+		)
+
+		err = fs.Remove()
+		require.ErrorIs(t, err, ErrUninstallInvalidPluginDir)
+
+		_, err = os.Stat(pluginDir)
+		require.NoError(t, err)
+
+		_, err = os.Stat(testFile)
+		require.NoError(t, err)
 	})
-	return s
 }
 
 func TestLocalFile_Read(t *testing.T) {
@@ -141,3 +194,31 @@ func TestLocalFile_Close(t *testing.T) {
 		require.Error(t, f.Close())
 	})
 }
+
+type tempFileScenario struct {
+	filePath string
+}
+
+func (s tempFileScenario) newLocalFile() LocalFile {
+	return LocalFile{path: s.filePath}
+}
+
+func newTempFileScenario(t *testing.T) (tempFileScenario, error) {
+	tf, err := os.CreateTemp(t.TempDir(), "*")
+	if err != nil {
+		return tempFileScenario{}, err
+	}
+	defer tf.Close() //nolint
+	if _, err := tf.Write([]byte("hello\n")); err != nil {
+		return tempFileScenario{}, err
+	}
+	return tempFileScenario{
+		filePath: tf.Name(),
+	}, nil
+}
+
+func newTempFileScenarioForTest(t *testing.T) tempFileScenario {
+	s, err := newTempFileScenario(t)
+	require.NoError(t, err)
+	return s
+}
diff --git a/pkg/plugins/manager/fakes/fakes.go b/pkg/plugins/manager/fakes/fakes.go
index b94a40c7e78..51cea698f6a 100644
--- a/pkg/plugins/manager/fakes/fakes.go
+++ b/pkg/plugins/manager/fakes/fakes.go
@@ -232,42 +232,20 @@ func (r *FakePluginRepo) GetPluginDownloadOptions(ctx context.Context, pluginID,
 }
 
 type FakePluginStorage struct {
-	Store        map[string]struct{}
-	AddFunc      func(_ context.Context, pluginID string, z *zip.ReadCloser) (*storage.ExtractedPluginArchive, error)
-	RegisterFunc func(_ context.Context, pluginID, pluginDir string) error
-	RemoveFunc   func(_ context.Context, pluginID string) error
+	ExtractFunc func(_ context.Context, pluginID string, z *zip.ReadCloser) (*storage.ExtractedPluginArchive, error)
 }
 
 func NewFakePluginStorage() *FakePluginStorage {
-	return &FakePluginStorage{
-		Store: map[string]struct{}{},
-	}
+	return &FakePluginStorage{}
 }
 
-func (s *FakePluginStorage) Register(ctx context.Context, pluginID, pluginDir string) error {
-	s.Store[pluginID] = struct{}{}
-	if s.RegisterFunc != nil {
-		return s.RegisterFunc(ctx, pluginID, pluginDir)
-	}
-	return nil
-}
-
-func (s *FakePluginStorage) Add(ctx context.Context, pluginID string, z *zip.ReadCloser) (*storage.ExtractedPluginArchive, error) {
-	s.Store[pluginID] = struct{}{}
-	if s.AddFunc != nil {
-		return s.AddFunc(ctx, pluginID, z)
+func (s *FakePluginStorage) Extract(ctx context.Context, pluginID string, z *zip.ReadCloser) (*storage.ExtractedPluginArchive, error) {
+	if s.ExtractFunc != nil {
+		return s.ExtractFunc(ctx, pluginID, z)
 	}
 	return &storage.ExtractedPluginArchive{}, nil
 }
 
-func (s *FakePluginStorage) Remove(ctx context.Context, pluginID string) error {
-	delete(s.Store, pluginID)
-	if s.RemoveFunc != nil {
-		return s.RemoveFunc(ctx, pluginID)
-	}
-	return nil
-}
-
 type FakeProcessManager struct {
 	StartFunc func(_ context.Context, pluginID string) error
 	StopFunc  func(_ context.Context, pluginID string) error
@@ -363,7 +341,8 @@ func (f *FakeRoleRegistry) DeclarePluginRoles(_ context.Context, _ string, _ str
 }
 
 type FakePluginFiles struct {
-	OpenFunc func(name string) (fs.File, error)
+	OpenFunc   func(name string) (fs.File, error)
+	RemoveFunc func() error
 
 	base string
 }
@@ -389,6 +368,13 @@ func (f *FakePluginFiles) Files() []string {
 	return []string{}
 }
 
+func (f *FakePluginFiles) Remove() error {
+	if f.RemoveFunc != nil {
+		return f.RemoveFunc()
+	}
+	return nil
+}
+
 type FakeSourceRegistry struct {
 	ListFunc func(_ context.Context) []plugins.PluginSource
 }
diff --git a/pkg/plugins/manager/installer.go b/pkg/plugins/manager/installer.go
index d0bc465f175..2ecce8a18ae 100644
--- a/pkg/plugins/manager/installer.go
+++ b/pkg/plugins/manager/installer.go
@@ -18,7 +18,7 @@ var _ plugins.Installer = (*PluginInstaller)(nil)
 
 type PluginInstaller struct {
 	pluginRepo     repo.Service
-	pluginStorage  storage.Manager
+	pluginStorage  storage.ZipExtractor
 	pluginRegistry registry.Service
 	pluginLoader   loader.Service
 	log            log.Logger
@@ -30,7 +30,7 @@ func ProvideInstaller(cfg *config.Cfg, pluginRegistry registry.Service, pluginLo
 }
 
 func New(pluginRegistry registry.Service, pluginLoader loader.Service, pluginRepo repo.Service,
-	pluginStorage storage.Manager) *PluginInstaller {
+	pluginStorage storage.ZipExtractor) *PluginInstaller {
 	return &PluginInstaller{
 		pluginLoader:   pluginLoader,
 		pluginRegistry: pluginRegistry,
@@ -45,7 +45,7 @@ func (m *PluginInstaller) Add(ctx context.Context, pluginID, version string, opt
 
 	var pluginArchive *repo.PluginArchive
 	if plugin, exists := m.plugin(ctx, pluginID); exists {
-		if !plugin.IsExternalPlugin() {
+		if plugin.IsCorePlugin() || plugin.IsBundledPlugin() {
 			return plugins.ErrInstallCorePlugin
 		}
 
@@ -97,7 +97,7 @@ func (m *PluginInstaller) Add(ctx context.Context, pluginID, version string, opt
 		}
 	}
 
-	extractedArchive, err := m.pluginStorage.Add(ctx, pluginID, pluginArchive.File)
+	extractedArchive, err := m.pluginStorage.Extract(ctx, pluginID, pluginArchive.File)
 	if err != nil {
 		return err
 	}
@@ -111,7 +111,7 @@ func (m *PluginInstaller) Add(ctx context.Context, pluginID, version string, opt
 			return fmt.Errorf("%v: %w", fmt.Sprintf("failed to download plugin %s from repository", dep.ID), err)
 		}
 
-		depArchive, err := m.pluginStorage.Add(ctx, dep.ID, d.File)
+		depArchive, err := m.pluginStorage.Extract(ctx, dep.ID, d.File)
 		if err != nil {
 			return err
 		}
@@ -134,7 +134,7 @@ func (m *PluginInstaller) Remove(ctx context.Context, pluginID string) error {
 		return plugins.ErrPluginNotInstalled
 	}
 
-	if !plugin.IsExternalPlugin() {
+	if plugin.IsCorePlugin() || plugin.IsBundledPlugin() {
 		return plugins.ErrUninstallCorePlugin
 	}
 
diff --git a/pkg/plugins/manager/installer_test.go b/pkg/plugins/manager/installer_test.go
index d9dec824530..94769b29b6d 100644
--- a/pkg/plugins/manager/installer_test.go
+++ b/pkg/plugins/manager/installer_test.go
@@ -52,18 +52,13 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 		}
 
 		fs := &fakes.FakePluginStorage{
-			AddFunc: func(_ context.Context, id string, z *zip.ReadCloser) (*storage.ExtractedPluginArchive, error) {
+			ExtractFunc: func(_ context.Context, id string, z *zip.ReadCloser) (*storage.ExtractedPluginArchive, error) {
 				require.Equal(t, pluginID, id)
 				require.Equal(t, mockZipV1, z)
 				return &storage.ExtractedPluginArchive{
 					Path: zipNameV1,
 				}, nil
 			},
-			RegisterFunc: func(_ context.Context, pluginID, pluginDir string) error {
-				require.Equal(t, pluginV1.ID, pluginID)
-				return nil
-			},
-			Store: map[string]struct{}{},
 		}
 
 		inst := New(fakes.NewFakePluginRegistry(), loader, pluginRepo, fs)
@@ -112,17 +107,13 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 					File: mockZipV2,
 				}, nil
 			}
-			fs.AddFunc = func(_ context.Context, pluginID string, z *zip.ReadCloser) (*storage.ExtractedPluginArchive, error) {
+			fs.ExtractFunc = func(_ context.Context, pluginID string, z *zip.ReadCloser) (*storage.ExtractedPluginArchive, error) {
 				require.Equal(t, pluginV1.ID, pluginID)
 				require.Equal(t, mockZipV2, z)
 				return &storage.ExtractedPluginArchive{
 					Path: zipNameV2,
 				}, nil
 			}
-			fs.RegisterFunc = func(_ context.Context, pluginID, pluginDir string) error {
-				require.Equal(t, pluginV2.ID, pluginID)
-				return nil
-			}
 
 			err = inst.Add(context.Background(), pluginID, v2, plugins.CompatOpts{})
 			require.NoError(t, err)
diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go
index b515a0364a3..0ebce9e494a 100644
--- a/pkg/plugins/manager/loader/loader.go
+++ b/pkg/plugins/manager/loader/loader.go
@@ -18,7 +18,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/process"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
-	"github.com/grafana/grafana/pkg/plugins/storage"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -32,24 +31,23 @@ type Loader struct {
 	pluginInitializer   initializer.Initializer
 	signatureValidator  signature.Validator
 	signatureCalculator plugins.SignatureCalculator
-	pluginStorage       storage.Manager
 	assetPath           *assetpath.Service
 	log                 log.Logger
 	cfg                 *config.Cfg
-	errs                map[string]*plugins.SignatureError
+
+	errs map[string]*plugins.SignatureError
 }
 
 func ProvideService(cfg *config.Cfg, license plugins.Licensing, authorizer plugins.PluginLoaderAuthorizer,
 	pluginRegistry registry.Service, backendProvider plugins.BackendFactoryProvider, pluginFinder finder.Finder,
 	roleRegistry plugins.RoleRegistry, assetPath *assetpath.Service, signatureCalculator plugins.SignatureCalculator) *Loader {
 	return New(cfg, license, authorizer, pluginRegistry, backendProvider, process.NewManager(pluginRegistry),
-		storage.FileSystem(log.NewPrettyLogger("loader.fs"), cfg.PluginsPath), roleRegistry, assetPath,
-		pluginFinder, signatureCalculator)
+		roleRegistry, assetPath, pluginFinder, signatureCalculator)
 }
 
 func New(cfg *config.Cfg, license plugins.Licensing, authorizer plugins.PluginLoaderAuthorizer,
 	pluginRegistry registry.Service, backendProvider plugins.BackendFactoryProvider,
-	processManager process.Service, pluginStorage storage.Manager, roleRegistry plugins.RoleRegistry,
+	processManager process.Service, roleRegistry plugins.RoleRegistry,
 	assetPath *assetpath.Service, pluginFinder finder.Finder, signatureCalculator plugins.SignatureCalculator) *Loader {
 	return &Loader{
 		pluginFinder:        pluginFinder,
@@ -58,7 +56,6 @@ func New(cfg *config.Cfg, license plugins.Licensing, authorizer plugins.PluginLo
 		signatureValidator:  signature.NewValidator(authorizer),
 		signatureCalculator: signatureCalculator,
 		processManager:      processManager,
-		pluginStorage:       pluginStorage,
 		errs:                make(map[string]*plugins.SignatureError),
 		log:                 log.New("plugin.loader"),
 		roleRegistry:        roleRegistry,
@@ -201,7 +198,7 @@ func (l *Loader) Unload(ctx context.Context, pluginID string) error {
 		return plugins.ErrPluginNotInstalled
 	}
 
-	if !plugin.IsExternalPlugin() {
+	if plugin.IsCorePlugin() || plugin.IsBundledPlugin() {
 		return plugins.ErrUninstallCorePlugin
 	}
 
@@ -220,12 +217,6 @@ func (l *Loader) load(ctx context.Context, p *plugins.Plugin) error {
 		l.log.Info("Plugin registered", "pluginID", p.ID)
 	}
 
-	if p.IsExternalPlugin() {
-		if err := l.pluginStorage.Register(ctx, p.ID, p.FS.Base()); err != nil {
-			return err
-		}
-	}
-
 	return l.processManager.Start(ctx, p.ID)
 }
 
@@ -241,9 +232,12 @@ func (l *Loader) unload(ctx context.Context, p *plugins.Plugin) error {
 	}
 	l.log.Debug("Plugin unregistered", "pluginId", p.ID)
 
-	if err := l.pluginStorage.Remove(ctx, p.ID); err != nil {
-		return err
+	if remover, ok := p.FS.(plugins.FSRemover); ok {
+		if err := remover.Remove(); err != nil {
+			return err
+		}
 	}
+
 	return nil
 }
 
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index 2cc0663a8e8..d0dda4d4c51 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -457,12 +457,10 @@ func TestLoader_Load(t *testing.T) {
 	}
 	for _, tt := range tests {
 		reg := fakes.NewFakePluginRegistry()
-		storage := fakes.NewFakePluginStorage()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
 		l := newLoader(tt.cfg, func(l *Loader) {
 			l.pluginRegistry = reg
-			l.pluginStorage = storage
 			l.processManager = procMgr
 			l.pluginInitializer = initializer.New(tt.cfg, procPrvdr, &fakes.FakeLicensingService{})
 		})
@@ -480,7 +478,7 @@ func TestLoader_Load(t *testing.T) {
 				require.Equal(t, tt.pluginErrors[pluginErr.PluginID], pluginErr)
 			}
 
-			verifyState(t, tt.want, reg, procPrvdr, storage, procMgr)
+			verifyState(t, tt.want, reg, procPrvdr, procMgr)
 		})
 	}
 }
@@ -698,12 +696,10 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 
 		for _, tt := range tests {
 			reg := fakes.NewFakePluginRegistry()
-			storage := fakes.NewFakePluginStorage()
 			procPrvdr := fakes.NewFakeBackendProcessProvider()
 			procMgr := fakes.NewFakeProcessManager()
 			l := newLoader(tt.cfg, func(l *Loader) {
 				l.pluginRegistry = reg
-				l.pluginStorage = storage
 				l.processManager = procMgr
 				l.pluginInitializer = initializer.New(tt.cfg, procPrvdr, fakes.NewFakeLicensingService())
 			})
@@ -734,7 +730,7 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 				for _, pluginErr := range pluginErrs {
 					require.Equal(t, tt.pluginErrors[pluginErr.PluginID], pluginErr)
 				}
-				verifyState(t, tt.want, reg, procPrvdr, storage, procMgr)
+				verifyState(t, tt.want, reg, procPrvdr, procMgr)
 			})
 		}
 	})
@@ -824,12 +820,10 @@ func TestLoader_Load_RBACReady(t *testing.T) {
 		})
 		setting.AppUrl = "http://localhost:3000"
 		reg := fakes.NewFakePluginRegistry()
-		storage := fakes.NewFakePluginStorage()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
 		l := newLoader(tt.cfg, func(l *Loader) {
 			l.pluginRegistry = reg
-			l.pluginStorage = storage
 			l.processManager = procMgr
 			l.pluginInitializer = initializer.New(tt.cfg, procPrvdr, fakes.NewFakeLicensingService())
 		})
@@ -850,7 +844,7 @@ func TestLoader_Load_RBACReady(t *testing.T) {
 		pluginErrs := l.PluginErrors()
 		require.Len(t, pluginErrs, 0)
 
-		verifyState(t, tt.want, reg, procPrvdr, storage, procMgr)
+		verifyState(t, tt.want, reg, procPrvdr, procMgr)
 	}
 }
 
@@ -908,12 +902,10 @@ func TestLoader_Load_Signature_RootURL(t *testing.T) {
 		}
 
 		reg := fakes.NewFakePluginRegistry()
-		storage := fakes.NewFakePluginStorage()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
 		l := newLoader(&config.Cfg{}, func(l *Loader) {
 			l.pluginRegistry = reg
-			l.pluginStorage = storage
 			l.processManager = procMgr
 			l.pluginInitializer = initializer.New(&config.Cfg{}, procPrvdr, fakes.NewFakeLicensingService())
 		})
@@ -930,7 +922,7 @@ func TestLoader_Load_Signature_RootURL(t *testing.T) {
 		if !cmp.Equal(got, expected, compareOpts...) {
 			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
 		}
-		verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+		verifyState(t, expected, reg, procPrvdr, procMgr)
 	})
 }
 
@@ -994,12 +986,10 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
 		}
 
 		reg := fakes.NewFakePluginRegistry()
-		storage := fakes.NewFakePluginStorage()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
 		l := newLoader(&config.Cfg{}, func(l *Loader) {
 			l.pluginRegistry = reg
-			l.pluginStorage = storage
 			l.processManager = procMgr
 			l.pluginInitializer = initializer.New(&config.Cfg{}, procPrvdr, fakes.NewFakeLicensingService())
 		})
@@ -1017,7 +1007,7 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
 			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
 		}
 
-		verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+		verifyState(t, expected, reg, procPrvdr, procMgr)
 	})
 }
 
@@ -1086,7 +1076,6 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 		}
 
 		reg := fakes.NewFakePluginRegistry()
-		storage := fakes.NewFakePluginStorage()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		// Cause an initialization error
 		procPrvdr.BackendFactoryFunc = func(ctx context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
@@ -1100,7 +1089,6 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 		procMgr := fakes.NewFakeProcessManager()
 		l := newLoader(&config.Cfg{}, func(l *Loader) {
 			l.pluginRegistry = reg
-			l.pluginStorage = storage
 			l.processManager = procMgr
 			l.pluginInitializer = initializer.New(&config.Cfg{}, procPrvdr, fakes.NewFakeLicensingService())
 		})
@@ -1118,7 +1106,7 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
 		}
 
-		verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+		verifyState(t, expected, reg, procPrvdr, procMgr)
 	})
 }
 
@@ -1182,7 +1170,6 @@ func TestLoader_Load_UseAPIForManifestPublicKey(t *testing.T) {
 		}
 
 		reg := fakes.NewFakePluginRegistry()
-		storage := fakes.NewFakePluginStorage()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
 		apiCalled := false
@@ -1210,7 +1197,6 @@ func TestLoader_Load_UseAPIForManifestPublicKey(t *testing.T) {
 		cfg.GrafanaComURL = s.URL
 		l := newLoader(cfg, func(l *Loader) {
 			l.pluginRegistry = reg
-			l.pluginStorage = storage
 			l.processManager = procMgr
 			l.pluginInitializer = initializer.New(cfg, procPrvdr, fakes.NewFakeLicensingService())
 		})
@@ -1229,7 +1215,7 @@ func TestLoader_Load_UseAPIForManifestPublicKey(t *testing.T) {
 			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
 		}
 
-		verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+		verifyState(t, expected, reg, procPrvdr, procMgr)
 	})
 }
 
@@ -1311,12 +1297,10 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 
 	t.Run("Load nested External plugins", func(t *testing.T) {
 		reg := fakes.NewFakePluginRegistry()
-		storage := fakes.NewFakePluginStorage()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
 		l := newLoader(&config.Cfg{}, func(l *Loader) {
 			l.pluginRegistry = reg
-			l.pluginStorage = storage
 			l.processManager = procMgr
 			l.pluginInitializer = initializer.New(&config.Cfg{}, procPrvdr, fakes.NewFakeLicensingService())
 		})
@@ -1341,7 +1325,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
 		}
 
-		verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+		verifyState(t, expected, reg, procPrvdr, procMgr)
 
 		t.Run("Load will exclude plugins that already exist", func(t *testing.T) {
 			got, err := l.Load(context.Background(), &fakes.FakePluginSource{
@@ -1363,7 +1347,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 				t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
 			}
 
-			verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+			verifyState(t, expected, reg, procPrvdr, procMgr)
 		})
 	})
 
@@ -1493,12 +1477,10 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 		expected := []*plugins.Plugin{parent, child}
 
 		reg := fakes.NewFakePluginRegistry()
-		storage := fakes.NewFakePluginStorage()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
 		l := newLoader(&config.Cfg{}, func(l *Loader) {
 			l.pluginRegistry = reg
-			l.pluginStorage = storage
 			l.processManager = procMgr
 			l.pluginInitializer = initializer.New(&config.Cfg{}, procPrvdr, fakes.NewFakeLicensingService())
 		})
@@ -1521,7 +1503,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
 		}
 
-		verifyState(t, expected, reg, procPrvdr, storage, procMgr)
+		verifyState(t, expected, reg, procPrvdr, procMgr)
 	})
 }
 
@@ -1550,8 +1532,8 @@ func Test_setPathsBasedOnApp(t *testing.T) {
 
 func newLoader(cfg *config.Cfg, cbs ...func(loader *Loader)) *Loader {
 	l := New(cfg, &fakes.FakeLicensingService{}, signature.NewUnsignedAuthorizer(cfg), fakes.NewFakePluginRegistry(),
-		fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakePluginStorage(),
-		fakes.NewFakeRoleRegistry(), assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(), signature.ProvideService(cfg))
+		fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakeRoleRegistry(),
+		assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(), signature.ProvideService(cfg))
 
 	for _, cb := range cbs {
 		cb(l)
@@ -1561,7 +1543,7 @@ func newLoader(cfg *config.Cfg, cbs ...func(loader *Loader)) *Loader {
 }
 
 func verifyState(t *testing.T, ps []*plugins.Plugin, reg *fakes.FakePluginRegistry,
-	procPrvdr *fakes.FakeBackendProcessProvider, storage *fakes.FakePluginStorage, procMngr *fakes.FakeProcessManager) {
+	procPrvdr *fakes.FakeBackendProcessProvider, procMngr *fakes.FakeProcessManager) {
 	t.Helper()
 
 	for _, p := range ps {
@@ -1577,13 +1559,6 @@ func verifyState(t *testing.T, ps []*plugins.Plugin, reg *fakes.FakePluginRegist
 			require.Zero(t, procPrvdr.Invoked[p.ID])
 		}
 
-		_, exists := storage.Store[p.ID]
-		if p.IsExternalPlugin() {
-			require.True(t, exists)
-		} else {
-			require.False(t, exists)
-		}
-
 		require.Equal(t, 1, procMngr.Started[p.ID])
 		require.Zero(t, procMngr.Stopped[p.ID])
 	}
diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
index 8fc2af80a02..fd27a43c15c 100644
--- a/pkg/plugins/plugins.go
+++ b/pkg/plugins/plugins.go
@@ -21,8 +21,9 @@ import (
 )
 
 var (
-	ErrFileNotExist   = errors.New("file does not exist")
-	ErrPluginFileRead = errors.New("file could not be read")
+	ErrFileNotExist              = errors.New("file does not exist")
+	ErrPluginFileRead            = errors.New("file could not be read")
+	ErrUninstallInvalidPluginDir = errors.New("cannot recognize as plugin folder")
 )
 
 type Plugin struct {
diff --git a/pkg/plugins/storage/fs.go b/pkg/plugins/storage/fs.go
index 2d938d09968..f3468ab3f23 100644
--- a/pkg/plugins/storage/fs.go
+++ b/pkg/plugins/storage/fs.go
@@ -12,36 +12,27 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
-	"sync"
 
 	"github.com/grafana/grafana/pkg/plugins/log"
 )
 
-var _ Manager = (*FS)(nil)
+var _ ZipExtractor = (*FS)(nil)
 
 var reGitBuild = regexp.MustCompile("^[a-zA-Z0-9_.-]*/")
 
-var (
-	ErrUninstallOutsideOfPluginDir = errors.New("cannot uninstall a plugin outside of the plugins directory")
-	ErrUninstallInvalidPluginDir   = errors.New("cannot recognize as plugin folder")
-)
-
 type FS struct {
-	store      map[string]string
-	mu         sync.RWMutex
 	pluginsDir string
 	log        log.PrettyLogger
 }
 
 func FileSystem(logger log.PrettyLogger, pluginsDir string) *FS {
 	return &FS{
-		store:      make(map[string]string),
 		pluginsDir: pluginsDir,
 		log:        logger,
 	}
 }
 
-func (fs *FS) Add(ctx context.Context, pluginID string, pluginArchive *zip.ReadCloser) (
+func (fs *FS) Extract(ctx context.Context, pluginID string, pluginArchive *zip.ReadCloser) (
 	*ExtractedPluginArchive, error) {
 	pluginDir, err := fs.extractFiles(ctx, pluginArchive, pluginID)
 	if err != nil {
@@ -71,38 +62,6 @@ func (fs *FS) Add(ctx context.Context, pluginID string, pluginArchive *zip.ReadC
 	}, nil
 }
 
-func (fs *FS) Register(_ context.Context, pluginID, pluginDir string) error {
-	fs.mu.Lock()
-	fs.store[pluginID] = pluginDir
-	fs.mu.Unlock()
-
-	return nil
-}
-
-func (fs *FS) Remove(_ context.Context, pluginID string) error {
-	fs.mu.RLock()
-	pluginDir, exists := fs.store[pluginID]
-	fs.mu.RUnlock()
-	if !exists {
-		return fmt.Errorf("%s does not exist", pluginID)
-	}
-
-	// extra security check to ensure we only remove plugins that are located in the configured plugins directory
-	path, err := filepath.Rel(fs.pluginsDir, pluginDir)
-	if err != nil || strings.HasPrefix(path, ".."+string(filepath.Separator)) {
-		return ErrUninstallOutsideOfPluginDir
-	}
-
-	if _, err = os.Stat(filepath.Join(pluginDir, "plugin.json")); os.IsNotExist(err) {
-		if _, err = os.Stat(filepath.Join(pluginDir, "dist/plugin.json")); os.IsNotExist(err) {
-			return ErrUninstallInvalidPluginDir
-		}
-	}
-
-	fs.log.Infof("Uninstalling plugin %v", pluginDir)
-	return os.RemoveAll(pluginDir)
-}
-
 func (fs *FS) extractFiles(_ context.Context, pluginArchive *zip.ReadCloser, pluginID string) (string, error) {
 	installDir := filepath.Join(fs.pluginsDir, pluginID)
 	if _, err := os.Stat(installDir); !os.IsNotExist(err) {
@@ -261,7 +220,7 @@ func removeGitBuildFromName(filename, pluginID string) string {
 	return reGitBuild.ReplaceAllString(filename, pluginID+"/")
 }
 
-func toPluginDTO(pluginID, pluginDir string) (InstalledPlugin, error) {
+func toPluginDTO(pluginID, pluginDir string) (installedPlugin, error) {
 	distPluginDataPath := filepath.Join(pluginDir, "dist", "plugin.json")
 
 	// It's safe to ignore gosec warning G304 since the file path suffix is hardcoded
@@ -273,17 +232,17 @@ func toPluginDTO(pluginID, pluginDir string) (InstalledPlugin, error) {
 		// nolint:gosec
 		data, err = os.ReadFile(pluginDataPath)
 		if err != nil {
-			return InstalledPlugin{}, fmt.Errorf("could not find dist/plugin.json or plugin.json for %s in %s", pluginID, pluginDir)
+			return installedPlugin{}, fmt.Errorf("could not find dist/plugin.json or plugin.json for %s in %s", pluginID, pluginDir)
 		}
 	}
 
-	res := InstalledPlugin{}
+	res := installedPlugin{}
 	if err = json.Unmarshal(data, &res); err != nil {
 		return res, err
 	}
 
 	if res.ID == "" {
-		return InstalledPlugin{}, fmt.Errorf("could not find valid plugin %s in %s", pluginID, pluginDir)
+		return installedPlugin{}, fmt.Errorf("could not find valid plugin %s in %s", pluginID, pluginDir)
 	}
 
 	if res.Info.Version == "" {
diff --git a/pkg/plugins/storage/fs_test.go b/pkg/plugins/storage/fs_test.go
index e55e69842e2..cc9169a8bb9 100644
--- a/pkg/plugins/storage/fs_test.go
+++ b/pkg/plugins/storage/fs_test.go
@@ -25,7 +25,7 @@ func TestAdd(t *testing.T) {
 	pluginID := "test-app"
 
 	fs := FileSystem(&fakeLogger{}, testDir)
-	archive, err := fs.Add(context.Background(), pluginID, zipFile(t, "./testdata/plugin-with-symlinks.zip"))
+	archive, err := fs.Extract(context.Background(), pluginID, zipFile(t, "./testdata/plugin-with-symlinks.zip"))
 	require.NotNil(t, archive)
 	require.NoError(t, err)
 
@@ -48,89 +48,6 @@ func TestAdd(t *testing.T) {
 	require.Equal(t, files[5].Name(), "text.txt")
 }
 
-func TestRemove(t *testing.T) {
-	pluginDir := t.TempDir()
-	pluginJSON := filepath.Join(pluginDir, "plugin.json")
-	//nolint:gosec
-	_, err := os.Create(pluginJSON)
-	require.NoError(t, err)
-
-	pluginID := "test-datasource"
-	i := &FS{
-		pluginsDir: filepath.Dir(pluginDir),
-		store: map[string]string{
-			pluginID: pluginDir,
-		},
-		log: &fakeLogger{},
-	}
-
-	err = i.Remove(context.Background(), pluginID)
-	require.NoError(t, err)
-
-	_, err = os.Stat(pluginDir)
-	require.True(t, os.IsNotExist(err))
-
-	t.Run("Uninstall will search in nested dir folder for plugin.json", func(t *testing.T) {
-		pluginDistDir := filepath.Join(t.TempDir(), "dist")
-		err = os.Mkdir(pluginDistDir, os.ModePerm)
-		require.NoError(t, err)
-		pluginJSON = filepath.Join(pluginDistDir, "plugin.json")
-		//nolint:gosec
-		_, err = os.Create(pluginJSON)
-		require.NoError(t, err)
-
-		pluginDir = filepath.Dir(pluginDistDir)
-
-		i = &FS{
-			pluginsDir: filepath.Dir(pluginDir),
-			store: map[string]string{
-				pluginID: pluginDir,
-			},
-			log: &fakeLogger{},
-		}
-
-		err = i.Remove(context.Background(), pluginID)
-		require.NoError(t, err)
-
-		_, err = os.Stat(pluginDir)
-		require.True(t, os.IsNotExist(err))
-	})
-
-	t.Run("Uninstall will not delete folder if cannot recognize plugin structure", func(t *testing.T) {
-		pluginDir = t.TempDir()
-		i = &FS{
-			pluginsDir: filepath.Dir(pluginDir),
-			store: map[string]string{
-				pluginID: pluginDir,
-			},
-			log: &fakeLogger{},
-		}
-
-		err = i.Remove(context.Background(), pluginID)
-		require.EqualError(t, err, "cannot recognize as plugin folder")
-
-		_, err = os.Stat(pluginDir)
-		require.False(t, os.IsNotExist(err))
-	})
-
-	t.Run("Uninstall will not delete folder if plugin's directory is not a subdirectory of specified plugins directory", func(t *testing.T) {
-		pluginDir = t.TempDir()
-		i = &FS{
-			pluginsDir: "/some/other/path",
-			store: map[string]string{
-				pluginID: pluginDir,
-			},
-			log: &fakeLogger{},
-		}
-
-		err = i.Remove(context.Background(), pluginID)
-		require.EqualError(t, err, "cannot uninstall a plugin outside of the plugins directory")
-
-		_, err = os.Stat(pluginDir)
-		require.False(t, os.IsNotExist(err))
-	})
-}
-
 func TestExtractFiles(t *testing.T) {
 	pluginsDir := setupFakePluginsDir(t)
 
diff --git a/pkg/plugins/storage/ifaces.go b/pkg/plugins/storage/ifaces.go
index f77a9cece07..027827cf89d 100644
--- a/pkg/plugins/storage/ifaces.go
+++ b/pkg/plugins/storage/ifaces.go
@@ -5,8 +5,6 @@ import (
 	"context"
 )
 
-type Manager interface {
-	Add(ctx context.Context, pluginID string, rc *zip.ReadCloser) (*ExtractedPluginArchive, error)
-	Register(ctx context.Context, pluginID, pluginDir string) error
-	Remove(ctx context.Context, pluginID string) error
+type ZipExtractor interface {
+	Extract(ctx context.Context, pluginID string, rc *zip.ReadCloser) (*ExtractedPluginArchive, error)
 }
diff --git a/pkg/plugins/storage/models.go b/pkg/plugins/storage/models.go
index 5d0b6dbebb8..d758b18660f 100644
--- a/pkg/plugins/storage/models.go
+++ b/pkg/plugins/storage/models.go
@@ -22,27 +22,27 @@ type Dependency struct {
 	Version string
 }
 
-type InstalledPlugin struct {
+type installedPlugin struct {
 	ID           string       `json:"id"`
 	Name         string       `json:"name"`
 	Type         string       `json:"type"`
-	Info         PluginInfo   `json:"info"`
-	Dependencies Dependencies `json:"dependencies"`
+	Info         pluginInfo   `json:"info"`
+	Dependencies dependencies `json:"dependencies"`
 }
 
-type Dependencies struct {
+type dependencies struct {
 	GrafanaVersion string             `json:"grafanaVersion"`
-	Plugins        []PluginDependency `json:"plugins"`
+	Plugins        []pluginDependency `json:"plugins"`
 }
 
-type PluginDependency struct {
+type pluginDependency struct {
 	ID      string `json:"id"`
 	Type    string `json:"type"`
 	Name    string `json:"name"`
 	Version string `json:"version"`
 }
 
-type PluginInfo struct {
+type pluginInfo struct {
 	Version string `json:"version"`
 	Updated string `json:"updated"`
 }

From 9ff221098db54ca78eb3bb9bca3853bebd73b493 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Thu, 20 Apr 2023 11:10:12 +0100
Subject: [PATCH 271/729] Navigation: refactor `RemoveEmptySection...` logic
 into main navtree code (#66878)

refactor RemoveEmptySection logic into main navtree code
---
 pkg/api/index.go                              |   3 +-
 pkg/services/navtree/models.go                |  61 +-------
 pkg/services/navtree/models_test.go           |  39 -----
 pkg/services/navtree/navtreeimpl/admin.go     | 146 ++++++++----------
 .../navtree/navtreeimpl/applinks_test.go      |   6 +-
 pkg/services/navtree/navtreeimpl/navtree.go   |   8 +-
 6 files changed, 73 insertions(+), 190 deletions(-)

diff --git a/pkg/api/index.go b/pkg/api/index.go
index 16cdd4557fd..1173bdcb957 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -166,8 +166,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 
 	hs.HooksService.RunIndexDataHooks(&data, c)
 
-	// This will remove empty cfg or admin sections and move sections around
-	data.NavTree.RemoveEmptySectionsAndApplyNewInformationArchitecture()
+	data.NavTree.ApplyAdminIA()
 	data.NavTree.Sort()
 
 	return &data, nil
diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index a2313976b10..d5988a94369 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -30,10 +30,8 @@ const (
 
 const (
 	NavIDRoot               = "root"
-	NavIDDashboards         = "dashboards"
-	NavIDDashboardsBrowse   = "dashboards/browse"
+	NavIDDashboards         = "dashboards/browse"
 	NavIDCfg                = "cfg" // NavIDCfg is the id for org configuration navigation node
-	NavIDAdmin              = "admin"
 	NavIDAlertsAndIncidents = "alerts-and-incidents"
 	NavIDAlerting           = "alerting"
 	NavIDAlertingLegacy     = "alerting-legacy"
@@ -90,44 +88,6 @@ func (root *NavTreeRoot) FindById(id string) *NavLink {
 	return FindById(root.Children, id)
 }
 
-func (root *NavTreeRoot) RemoveEmptySectionsAndApplyNewInformationArchitecture() {
-	// Remove server admin node if it has no children or set the url to first child
-	if node := root.FindById(NavIDAdmin); node != nil {
-		if len(node.Children) == 0 {
-			root.RemoveSection(node)
-		} else {
-			node.Url = node.Children[0].Url
-		}
-	}
-
-	ApplyAdminIA(root)
-
-	// Move reports into dashboards
-	if reports := root.FindById(NavIDReporting); reports != nil {
-		if dashboards := root.FindById(NavIDDashboards); dashboards != nil {
-			reports.SortWeight = 0
-			dashboards.Children = append(dashboards.Children, reports)
-			root.RemoveSection(reports)
-		}
-	}
-
-	// Change id of dashboards
-	if dashboards := root.FindById(NavIDDashboards); dashboards != nil {
-		dashboards.Id = "dashboards/browse"
-	}
-
-	// Remove top level cfg / administration node if it has no children
-	if node := root.FindById(NavIDCfg); node != nil {
-		if len(node.Children) == 0 {
-			root.RemoveSection(node)
-		}
-	}
-
-	if len(root.Children) < 1 {
-		root.Children = make([]*NavLink, 0)
-	}
-}
-
 func (root *NavTreeRoot) Sort() {
 	Sort(root.Children)
 }
@@ -155,28 +115,19 @@ func Sort(nodes []*NavLink) {
 	}
 }
 
-func ApplyAdminIA(root *NavTreeRoot) {
+func (root *NavTreeRoot) ApplyAdminIA() {
 	orgAdminNode := root.FindById(NavIDCfg)
 
 	if orgAdminNode != nil {
-		orgAdminNode.Url = "/admin"
-		orgAdminNode.Text = "Administration"
-
 		adminNodeLinks := []*NavLink{}
 
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("datasources"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("plugins"))
-		if globalUsers := root.FindById("global-users"); globalUsers != nil {
-			globalUsers.Text = "Users"
-			adminNodeLinks = append(adminNodeLinks, globalUsers)
-		}
+		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-users"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("teams"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("serviceaccounts"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("apikeys"))
-		if orgSettings := root.FindById("org-settings"); orgSettings != nil {
-			orgSettings.Text = "Default preferences"
-			adminNodeLinks = append(adminNodeLinks, orgSettings)
-		}
+		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("org-settings"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("authentication"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("server-settings"))
 		adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-orgs"))
@@ -197,10 +148,6 @@ func ApplyAdminIA(root *NavTreeRoot) {
 			root.RemoveSection(orgAdminNode)
 		}
 	}
-
-	if serverAdminNode := root.FindById(NavIDAdmin); serverAdminNode != nil {
-		root.RemoveSection(serverAdminNode)
-	}
 }
 
 func AppendIfNotNil(children []*NavLink, newChild *NavLink) []*NavLink {
diff --git a/pkg/services/navtree/models_test.go b/pkg/services/navtree/models_test.go
index 06ded8cd6da..dfdc5560c70 100644
--- a/pkg/services/navtree/models_test.go
+++ b/pkg/services/navtree/models_test.go
@@ -7,45 +7,6 @@ import (
 )
 
 func TestNavTreeRoot(t *testing.T) {
-	t.Run("Should remove empty admin and server admin sections", func(t *testing.T) {
-		treeRoot := NavTreeRoot{
-			Children: []*NavLink{
-				{Id: NavIDCfg},
-				{Id: NavIDAdmin},
-			},
-		}
-
-		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture()
-
-		require.Equal(t, 0, len(treeRoot.Children))
-	})
-
-	t.Run("Should create 3 new sections in the Admin node", func(t *testing.T) {
-		treeRoot := NavTreeRoot{
-			Children: []*NavLink{
-				{Id: NavIDCfg},
-				{Id: NavIDAdmin, Children: []*NavLink{{Id: "upgrading"}, {Id: "plugins"}, {Id: "teams"}}},
-			},
-		}
-
-		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture()
-
-		require.Equal(t, "Administration", treeRoot.Children[0].Text)
-	})
-
-	t.Run("Should move reports into Dashboards", func(t *testing.T) {
-		treeRoot := NavTreeRoot{
-			Children: []*NavLink{
-				{Id: NavIDDashboards},
-				{Id: NavIDReporting},
-			},
-		}
-
-		treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture()
-
-		require.Equal(t, NavIDReporting, treeRoot.Children[0].Children[0].Id)
-	})
-
 	t.Run("Sorting by index", func(t *testing.T) {
 		treeRoot := NavTreeRoot{
 			Children: []*NavLink{
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index 4bc69dc6d11..e4fe9f95b98 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -12,10 +12,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 )
 
-func (s *ServiceImpl) getOrgAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink, error) {
+func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink, error) {
 	var configNodes []*navtree.NavLink
-
 	hasAccess := ac.HasAccess(s.accessControl, c)
+	hasGlobalAccess := ac.HasGlobalAccess(s.accessControl, s.accesscontrolService, c)
+	orgsAccessEvaluator := ac.EvalPermission(ac.ActionOrgsRead)
+	authConfigUIAvailable := s.license.FeatureEnabled("saml") && s.features.IsEnabled(featuremgmt.FlagAuthenticationConfigUI)
+
 	if hasAccess(ac.ReqOrgAdmin, datasources.ConfigurationPageAccess) {
 		configNodes = append(configNodes, &navtree.NavLink{
 			Text:     "Data sources",
@@ -26,26 +29,6 @@ func (s *ServiceImpl) getOrgAdminNode(c *contextmodel.ReqContext) (*navtree.NavL
 		})
 	}
 
-	if s.features.IsEnabled(featuremgmt.FlagCorrelations) && hasAccess(ac.ReqOrgAdmin, correlations.ConfigurationPageAccess) {
-		configNodes = append(configNodes, &navtree.NavLink{
-			Text:     "Correlations",
-			Icon:     "gf-glue",
-			SubTitle: "Add and configure correlations",
-			Id:       "correlations",
-			Url:      s.cfg.AppSubURL + "/datasources/correlations",
-		})
-	}
-
-	if hasAccess(s.ReqCanAdminTeams, ac.TeamsAccessEvaluator) {
-		configNodes = append(configNodes, &navtree.NavLink{
-			Text:     "Teams",
-			Id:       "teams",
-			SubTitle: "Groups of users that have common dashboard and permission needs",
-			Icon:     "users-alt",
-			Url:      s.cfg.AppSubURL + "/org/teams",
-		})
-	}
-
 	// FIXME: while we don't have a permissions for listing plugins the legacy check has to stay as a default
 	if pluginaccesscontrol.ReqCanAdminPlugins(s.cfg)(c) || hasAccess(pluginaccesscontrol.ReqCanAdminPlugins(s.cfg), pluginaccesscontrol.AdminAccessEvaluator) {
 		configNodes = append(configNodes, &navtree.NavLink{
@@ -57,13 +40,29 @@ func (s *ServiceImpl) getOrgAdminNode(c *contextmodel.ReqContext) (*navtree.NavL
 		})
 	}
 
-	if hasAccess(ac.ReqOrgAdmin, ac.OrgPreferencesAccessEvaluator) {
+	if hasAccess(ac.ReqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionOrgUsersRead), ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll))) {
 		configNodes = append(configNodes, &navtree.NavLink{
-			Text:     "Preferences",
-			Id:       "org-settings",
-			SubTitle: "Manage preferences across an organization",
-			Icon:     "sliders-v-alt",
-			Url:      s.cfg.AppSubURL + "/org",
+			Text: "Users", SubTitle: "Manage users in Grafana", Id: "global-users", Url: s.cfg.AppSubURL + "/admin/users", Icon: "user",
+		})
+	}
+
+	if hasAccess(s.ReqCanAdminTeams, ac.TeamsAccessEvaluator) {
+		configNodes = append(configNodes, &navtree.NavLink{
+			Text:     "Teams",
+			Id:       "teams",
+			SubTitle: "Groups of users that have common dashboard and permission needs",
+			Icon:     "users-alt",
+			Url:      s.cfg.AppSubURL + "/org/teams",
+		})
+	}
+
+	if enableServiceAccount(s, c) {
+		configNodes = append(configNodes, &navtree.NavLink{
+			Text:     "Service accounts",
+			Id:       "serviceaccounts",
+			SubTitle: "Use service accounts to run automated workloads in Grafana",
+			Icon:     "gf-service-account",
+			Url:      s.cfg.AppSubURL + "/org/serviceaccounts",
 		})
 	}
 
@@ -81,43 +80,18 @@ func (s *ServiceImpl) getOrgAdminNode(c *contextmodel.ReqContext) (*navtree.NavL
 		})
 	}
 
-	if enableServiceAccount(s, c) {
+	if hasAccess(ac.ReqOrgAdmin, ac.OrgPreferencesAccessEvaluator) {
 		configNodes = append(configNodes, &navtree.NavLink{
-			Text:     "Service accounts",
-			Id:       "serviceaccounts",
-			SubTitle: "Use service accounts to run automated workloads in Grafana",
-			Icon:     "gf-service-account",
-			Url:      s.cfg.AppSubURL + "/org/serviceaccounts",
+			Text:     "Default preferences",
+			Id:       "org-settings",
+			SubTitle: "Manage preferences across an organization",
+			Icon:     "sliders-v-alt",
+			Url:      s.cfg.AppSubURL + "/org",
 		})
 	}
 
-	configNode := &navtree.NavLink{
-		Id:         navtree.NavIDCfg,
-		Text:       "Configuration",
-		SubTitle:   "Organization: " + c.OrgName,
-		Icon:       "cog",
-		SortWeight: navtree.WeightConfig,
-		Children:   configNodes,
-	}
-
-	return configNode, nil
-}
-
-func (s *ServiceImpl) getServerAdminNode(c *contextmodel.ReqContext) *navtree.NavLink {
-	hasAccess := ac.HasAccess(s.accessControl, c)
-	hasGlobalAccess := ac.HasGlobalAccess(s.accessControl, s.accesscontrolService, c)
-	orgsAccessEvaluator := ac.EvalPermission(ac.ActionOrgsRead)
-	adminNavLinks := []*navtree.NavLink{}
-
-	if hasAccess(ac.ReqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionOrgUsersRead), ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll))) {
-		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
-			Text: "Users", SubTitle: "Manage users in Grafana", Id: "global-users", Url: s.cfg.AppSubURL + "/admin/users", Icon: "user",
-		})
-	}
-
-	authConfigUIAvailable := s.license.FeatureEnabled("saml") && s.features.IsEnabled(featuremgmt.FlagAuthenticationConfigUI)
 	if authConfigUIAvailable && hasAccess(ac.ReqGrafanaAdmin, evalAuthenticationSettings()) {
-		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
+		configNodes = append(configNodes, &navtree.NavLink{
 			Text:     "Authentication",
 			Id:       "authentication",
 			SubTitle: "Manage your auth settings and configure single sign-on",
@@ -126,15 +100,31 @@ func (s *ServiceImpl) getServerAdminNode(c *contextmodel.ReqContext) *navtree.Na
 		})
 	}
 
+	if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)) {
+		configNodes = append(configNodes, &navtree.NavLink{
+			Text: "Settings", SubTitle: "View the settings defined in your Grafana config", Id: "server-settings", Url: s.cfg.AppSubURL + "/admin/settings", Icon: "sliders-v-alt",
+		})
+	}
+
 	if hasGlobalAccess(ac.ReqGrafanaAdmin, orgsAccessEvaluator) {
-		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
+		configNodes = append(configNodes, &navtree.NavLink{
 			Text: "Organizations", SubTitle: "Isolated instances of Grafana running on the same server", Id: "global-orgs", Url: s.cfg.AppSubURL + "/admin/orgs", Icon: "building",
 		})
 	}
 
-	if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)) {
-		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
-			Text: "Settings", SubTitle: "View the settings defined in your Grafana config", Id: "server-settings", Url: s.cfg.AppSubURL + "/admin/settings", Icon: "sliders-v-alt",
+	if s.features.IsEnabled(featuremgmt.FlagCorrelations) && hasAccess(ac.ReqOrgAdmin, correlations.ConfigurationPageAccess) {
+		configNodes = append(configNodes, &navtree.NavLink{
+			Text:     "Correlations",
+			Icon:     "gf-glue",
+			SubTitle: "Add and configure correlations",
+			Id:       "correlations",
+			Url:      s.cfg.AppSubURL + "/datasources/correlations",
+		})
+	}
+
+	if s.cfg.LDAPAuthEnabled && hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionLDAPStatusRead)) {
+		configNodes = append(configNodes, &navtree.NavLink{
+			Text: "LDAP", Id: "ldap", Url: s.cfg.AppSubURL + "/admin/ldap", Icon: "book",
 		})
 	}
 
@@ -146,28 +136,20 @@ func (s *ServiceImpl) getServerAdminNode(c *contextmodel.ReqContext) *navtree.Na
 			Icon:     "cube",
 			Url:      s.cfg.AppSubURL + "/admin/storage",
 		}
-		adminNavLinks = append(adminNavLinks, storage)
+		configNodes = append(configNodes, storage)
 	}
 
-	if s.cfg.LDAPAuthEnabled && hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionLDAPStatusRead)) {
-		adminNavLinks = append(adminNavLinks, &navtree.NavLink{
-			Text: "LDAP", Id: "ldap", Url: s.cfg.AppSubURL + "/admin/ldap", Icon: "book",
-		})
+	configNode := &navtree.NavLink{
+		Id:         navtree.NavIDCfg,
+		Text:       "Administration",
+		SubTitle:   "Organization: " + c.OrgName,
+		Icon:       "cog",
+		SortWeight: navtree.WeightConfig,
+		Children:   configNodes,
+		Url:        "/admin",
 	}
 
-	adminNode := &navtree.NavLink{
-		Text:       "Server admin",
-		Id:         navtree.NavIDAdmin,
-		Icon:       "shield",
-		SortWeight: navtree.WeightAdmin,
-		Children:   adminNavLinks,
-	}
-
-	if len(adminNavLinks) > 0 {
-		adminNode.Url = adminNavLinks[0].Url
-	}
-
-	return adminNode
+	return configNode, nil
 }
 
 func (s *ServiceImpl) ReqCanAdminTeams(c *contextmodel.ReqContext) bool {
diff --git a/pkg/services/navtree/navtreeimpl/applinks_test.go b/pkg/services/navtree/navtreeimpl/applinks_test.go
index 4ca7c92eea9..114010a4b84 100644
--- a/pkg/services/navtree/navtreeimpl/applinks_test.go
+++ b/pkg/services/navtree/navtreeimpl/applinks_test.go
@@ -178,19 +178,19 @@ func TestAddAppLinks(t *testing.T) {
 	// This can be done by using `[navigation.app_sections]` in the INI config
 	t.Run("Should move apps that have specific nav id configured to correct section", func(t *testing.T) {
 		service.navigationAppConfig = map[string]NavigationAppConfig{
-			"test-app1": {SectionID: navtree.NavIDAdmin},
+			"test-app1": {SectionID: navtree.NavIDCfg},
 		}
 
 		treeRoot := navtree.NavTreeRoot{}
 		treeRoot.AddSection(&navtree.NavLink{
-			Id: navtree.NavIDAdmin,
+			Id: navtree.NavIDCfg,
 		})
 
 		err := service.addAppLinks(&treeRoot, reqCtx)
 		require.NoError(t, err)
 
 		// Check if the plugin gets moved over to the "Admin" section
-		adminNode := treeRoot.FindById(navtree.NavIDAdmin)
+		adminNode := treeRoot.FindById(navtree.NavIDCfg)
 		require.NotNil(t, adminNode)
 		require.Len(t, adminNode.Children, 1)
 		require.Equal(t, "plugin-page-test-app1", adminNode.Children[0].Id)
diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index f36d5d23530..2c6c18c8699 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -149,7 +149,7 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, hasEditPerm bool, p
 		}
 	}
 
-	orgAdminNode, err := s.getOrgAdminNode(c)
+	orgAdminNode, err := s.getAdminNode(c)
 
 	if orgAdminNode != nil {
 		treeRoot.AddSection(orgAdminNode)
@@ -157,12 +157,6 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, hasEditPerm bool, p
 		return nil, err
 	}
 
-	serverAdminNode := s.getServerAdminNode(c)
-
-	if serverAdminNode != nil {
-		treeRoot.AddSection(serverAdminNode)
-	}
-
 	s.addHelpLinks(treeRoot, c)
 
 	if err := s.addAppLinks(treeRoot, c); err != nil {

From a7e74f6d6dede432d947eb044d4e11c13560f707 Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Thu, 20 Apr 2023 12:11:13 +0200
Subject: [PATCH 272/729] DataSourcePicker: Refactor and collapse the
 DataSourceDropdown components (#66820)

* clean up the components and convert to functional components

* Create hooks for getting DS

* remove focus style override from input

---------

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
---
 .../components/picker/DataSourceDropdown.tsx  |  36 +++---
 .../components/picker/DataSourceList.tsx      | 108 +++++-------------
 .../components/picker/DataSourceLogo.tsx      |  27 ++---
 .../components/picker/DataSourceModal.tsx     |   3 +-
 .../components/picker/DataSourcePicker.tsx    |   8 +-
 .../components/picker/DataSourcePickerNG.tsx  |  96 ----------------
 .../DataSourcePickerWithHistory.test.ts       |  27 -----
 .../picker/DataSourcePickerWithHistory.tsx    |  55 ---------
 .../datasources/components/picker/types.ts    |  40 +------
 .../datasources/components/picker/utils.ts    |  23 +++-
 10 files changed, 83 insertions(+), 340 deletions(-)
 delete mode 100644 public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
 delete mode 100644 public/app/features/datasources/components/picker/DataSourcePickerWithHistory.test.ts
 delete mode 100644 public/app/features/datasources/components/picker/DataSourcePickerWithHistory.tsx

diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index a74e0d80111..f2f1f91e45d 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -12,10 +12,10 @@ import { Button, CustomScrollbar, Icon, Input, ModalsController, Portal, useStyl
 import { DataSourceList } from './DataSourceList';
 import { DataSourceLogo, DataSourceLogoPlaceHolder } from './DataSourceLogo';
 import { DataSourceModal } from './DataSourceModal';
-import { PickerContentProps, DataSourceDrawerProps } from './types';
-import { dataSourceName as dataSourceLabel } from './utils';
+import { PickerContentProps, DataSourceDropdownProps } from './types';
+import { dataSourceLabel, useGetDatasource } from './utils';
 
-export function DataSourceDropdown(props: DataSourceDrawerProps) {
+export function DataSourceDropdown(props: DataSourceDropdownProps) {
   const { current, onChange, ...restProps } = props;
 
   const [isOpen, setOpen] = useState(false);
@@ -23,6 +23,8 @@ export function DataSourceDropdown(props: DataSourceDrawerProps) {
   const [selectorElement, setSelectorElement] = useState<HTMLDivElement | null>();
   const [filterTerm, setFilterTerm] = useState<string>();
 
+  const currentDataSourceInstanceSettings = useGetDatasource(current);
+
   const popper = usePopper(markerElement, selectorElement, {
     placement: 'bottom-start',
   });
@@ -51,10 +53,15 @@ export function DataSourceDropdown(props: DataSourceDrawerProps) {
       {isOpen ? (
         <FocusScope contain autoFocus restoreFocus>
           <Input
-            prefix={filterTerm ? <DataSourceLogoPlaceHolder /> : <DataSourceLogo dataSource={current} />}
+            prefix={
+              filterTerm ? (
+                <DataSourceLogoPlaceHolder />
+              ) : (
+                <DataSourceLogo dataSource={currentDataSourceInstanceSettings} />
+              )
+            }
             suffix={<Icon name={filterTerm ? 'search' : 'angle-down'} />}
-            placeholder={dataSourceLabel(current)}
-            className={styles.input}
+            placeholder={dataSourceLabel(currentDataSourceInstanceSettings)}
             onChange={(e) => {
               setFilterTerm(e.currentTarget.value);
             }}
@@ -73,7 +80,7 @@ export function DataSourceDropdown(props: DataSourceDrawerProps) {
                 onClose={() => {
                   setOpen(false);
                 }}
-                current={current}
+                current={currentDataSourceInstanceSettings}
                 style={popper.styles.popper}
                 ref={setSelectorElement}
                 {...restProps}
@@ -90,10 +97,10 @@ export function DataSourceDropdown(props: DataSourceDrawerProps) {
           }}
         >
           <Input
-            className={styles.markerInput}
-            prefix={<DataSourceLogo dataSource={current} />}
+            className={styles.input}
+            prefix={<DataSourceLogo dataSource={currentDataSourceInstanceSettings} />}
             suffix={<Icon name="angle-down" />}
-            value={dataSourceLabel(current)}
+            value={dataSourceLabel(currentDataSourceInstanceSettings)}
             onFocus={() => {
               setOpen(true);
             }}
@@ -113,11 +120,6 @@ function getStylesDropdown(theme: GrafanaTheme2) {
       cursor: pointer;
     `,
     input: css`
-      input:focus {
-        box-shadow: none;
-      }
-    `,
-    markerInput: css`
       input {
         cursor: pointer;
       }
@@ -149,7 +151,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
             {...props}
             current={current}
             onChange={changeCallback}
-            filter={(ds) => ds.name.includes(filterTerm ?? '')}
+            filter={(ds) => ds.name.toLowerCase().includes(filterTerm?.toLowerCase() ?? '')}
           ></DataSourceList>
         </CustomScrollbar>
       </div>
@@ -169,8 +171,6 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
               onClick={() => {
                 onClose();
                 showModal(DataSourceModal, {
-                  datasources: props.datasources,
-                  recentlyUsed: props.recentlyUsed,
                   enableFileUpload: props.enableFileUpload,
                   fileUploadOptions: props.fileUploadOptions,
                   current,
diff --git a/public/app/features/datasources/components/picker/DataSourceList.tsx b/public/app/features/datasources/components/picker/DataSourceList.tsx
index 408f8aa4c9c..a199a793c7b 100644
--- a/public/app/features/datasources/components/picker/DataSourceList.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceList.tsx
@@ -1,10 +1,9 @@
-import React, { PureComponent } from 'react';
+import React from 'react';
 
 import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
-import { getDataSourceSrv } from '@grafana/runtime';
 
 import { DataSourceCard } from './DataSourceCard';
-import { isDataSourceMatch } from './utils';
+import { isDataSourceMatch, useGetDatasources } from './utils';
 
 /**
  * Component props description for the {@link DataSourceList}
@@ -14,7 +13,8 @@ import { isDataSourceMatch } from './utils';
 export interface DataSourceListProps {
   className?: string;
   onChange: (ds: DataSourceInstanceSettings) => void;
-  current: DataSourceRef | string | null; // uid
+  current: DataSourceRef | DataSourceInstanceSettings | string | null | undefined;
+  /** Would be nicer if these parameters were part of a filtering object */
   tracing?: boolean;
   mixed?: boolean;
   dashboard?: boolean;
@@ -32,88 +32,34 @@ export interface DataSourceListProps {
   onClear?: () => void;
 }
 
-/**
- * Component state description for the {@link DataSourceList}
- *
- * @internal
- */
-export interface DataSourceListState {
-  error?: string;
-}
+export function DataSourceList(props: DataSourceListProps) {
+  const { className, current, onChange } = props;
+  // QUESTION: Should we use data from the Redux store as admin DS view does?
+  const dataSources = useGetDatasources({
+    alerting: props.alerting,
+    annotations: props.annotations,
+    dashboard: props.dashboard,
+    logs: props.logs,
+    metrics: props.metrics,
+    mixed: props.mixed,
+    pluginId: props.pluginId,
+    tracing: props.tracing,
+    type: props.type,
+    variables: props.variables,
+  });
 
-/**
- * Component to be able to select a datasource from the list of installed and enabled
- * datasources in the current Grafana instance.
- *
- * @internal
- */
-export class DataSourceList extends PureComponent<DataSourceListProps, DataSourceListState> {
-  dataSourceSrv = getDataSourceSrv();
-
-  static defaultProps: Partial<DataSourceListProps> = {
-    filter: () => true,
-  };
-
-  state: DataSourceListState = {};
-
-  constructor(props: DataSourceListProps) {
-    super(props);
-  }
-
-  componentDidMount() {
-    const { current } = this.props;
-    const dsSettings = this.dataSourceSrv.getInstanceSettings(current);
-    if (!dsSettings) {
-      this.setState({ error: 'Could not find data source ' + current });
-    }
-  }
-
-  onChange = (item: DataSourceInstanceSettings) => {
-    const dsSettings = this.dataSourceSrv.getInstanceSettings(item);
-
-    if (dsSettings) {
-      this.props.onChange(dsSettings);
-      this.setState({ error: undefined });
-    }
-  };
-
-  getDataSourceOptions() {
-    const { alerting, tracing, metrics, mixed, dashboard, variables, annotations, pluginId, type, filter, logs } =
-      this.props;
-
-    const options = this.dataSourceSrv.getList({
-      alerting,
-      tracing,
-      metrics,
-      logs,
-      dashboard,
-      mixed,
-      variables,
-      annotations,
-      pluginId,
-      filter,
-      type,
-    });
-
-    return options;
-  }
-
-  render() {
-    const { className, current } = this.props;
-    // QUESTION: Should we use data from the Redux store as admin DS view does?
-    const options = this.getDataSourceOptions();
-
-    return (
-      <div className={className}>
-        {options.map((ds) => (
+  return (
+    <div className={className}>
+      {dataSources
+        .filter((ds) => (props.filter ? props.filter(ds) : true))
+        .map((ds) => (
           <DataSourceCard
             key={ds.uid}
             ds={ds}
-            onClick={this.onChange.bind(this, ds)}
+            onClick={() => onChange(ds)}
             selected={!!isDataSourceMatch(ds, current)}
           />
         ))}
-      </div>
-    );
-  }
+    </div>
+  );
 }
diff --git a/public/app/features/datasources/components/picker/DataSourceLogo.tsx b/public/app/features/datasources/components/picker/DataSourceLogo.tsx
index cb05adb3c37..55b3857892c 100644
--- a/public/app/features/datasources/components/picker/DataSourceLogo.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceLogo.tsx
@@ -2,11 +2,10 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { DataSourceInstanceSettings, DataSourceJsonData, GrafanaTheme2 } from '@grafana/data';
-import { DataSourceRef } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
 
 export interface DataSourceLogoProps {
-  dataSource: DataSourceInstanceSettings<DataSourceJsonData> | string | DataSourceRef | null | undefined;
+  dataSource: DataSourceInstanceSettings<DataSourceJsonData> | undefined;
 }
 
 export function DataSourceLogo(props: DataSourceLogoProps) {
@@ -14,24 +13,16 @@ export function DataSourceLogo(props: DataSourceLogoProps) {
   const styles = useStyles2(getStyles);
 
   if (!dataSource) {
-    return null;
+    return DataSourceLogoPlaceHolder();
   }
 
-  if (typeof dataSource === 'string') {
-    return null;
-  }
-
-  if ('name' in dataSource) {
-    return (
-      <img
-        className={styles.pickerDSLogo}
-        alt={`${dataSource.meta.name} logo`}
-        src={dataSource.meta.info.logos.small}
-      ></img>
-    );
-  }
-
-  return null;
+  return (
+    <img
+      className={styles.pickerDSLogo}
+      alt={`${dataSource.meta.name} logo`}
+      src={dataSource.meta.info.logos.small}
+    ></img>
+  );
 }
 
 export function DataSourceLogoPlaceHolder() {
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index 9b8997a82a2..6c0a191923f 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -21,7 +21,6 @@ interface DataSourceModalProps {
   onChange: (ds: DataSourceInstanceSettings) => void;
   current: DataSourceRef | string | null | undefined;
   onDismiss: () => void;
-  datasources: DataSourceInstanceSettings[];
   recentlyUsed?: string[];
   enableFileUpload?: boolean;
   fileUploadOptions?: DropzoneOptions;
@@ -62,7 +61,7 @@ export function DataSourceModal({
               mixed={false}
               variables
               // FIXME: Filter out the grafana data source in a hacky way
-              filter={(ds) => ds.name.includes(search) && ds.name !== '-- Grafana --'}
+              filter={(ds) => ds.name.toLowerCase().includes(search.toLowerCase()) && ds.name !== '-- Grafana --'}
               onChange={onChange}
               current={current}
             />
diff --git a/public/app/features/datasources/components/picker/DataSourcePicker.tsx b/public/app/features/datasources/components/picker/DataSourcePicker.tsx
index 83677a1fd1e..b67a348a9a9 100644
--- a/public/app/features/datasources/components/picker/DataSourcePicker.tsx
+++ b/public/app/features/datasources/components/picker/DataSourcePicker.tsx
@@ -6,10 +6,10 @@ import {
 } from '@grafana/runtime';
 import { config } from 'app/core/config';
 
-import { DataSourcePickerWithHistory } from './DataSourcePickerWithHistory';
-import { DataSourcePickerWithHistoryProps } from './types';
+import { DataSourceDropdown } from './DataSourceDropdown';
+import { DataSourceDropdownProps } from './types';
 
-type DataSourcePickerProps = DeprecatedDataSourcePickerProps | DataSourcePickerWithHistoryProps;
+type DataSourcePickerProps = DeprecatedDataSourcePickerProps | DataSourceDropdownProps;
 
 /**
  * DataSourcePicker is a wrapper around the old DataSourcePicker and the new one.
@@ -20,6 +20,6 @@ export function DataSourcePicker(props: DataSourcePickerProps) {
   return !config.featureToggles.advancedDataSourcePicker ? (
     <DeprecatedDataSourcePicker {...props} />
   ) : (
-    <DataSourcePickerWithHistory {...props} />
+    <DataSourceDropdown {...props} />
   );
 }
diff --git a/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx b/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
deleted file mode 100644
index 99aa7d3879c..00000000000
--- a/public/app/features/datasources/components/picker/DataSourcePickerNG.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, { PureComponent } from 'react';
-
-// Components
-
-import { DataSourceInstanceSettings, DataSourceRef, getDataSourceUID } from '@grafana/data';
-import { getDataSourceSrv } from '@grafana/runtime';
-import { DataSourceJsonData } from '@grafana/schema';
-
-import { DataSourceDropdown } from './DataSourceDropdown';
-import { DataSourcePickerProps } from './types';
-
-/**
- * Component state description for the {@link DataSourcePicker}
- *
- * @internal
- */
-export interface DataSourcePickerState {
-  error?: string;
-}
-
-/**
- * Component to be able to select a datasource from the list of installed and enabled
- * datasources in the current Grafana instance.
- *
- * @internal
- */
-export class DataSourcePicker extends PureComponent<DataSourcePickerProps, DataSourcePickerState> {
-  dataSourceSrv = getDataSourceSrv();
-
-  state: DataSourcePickerState = {};
-
-  componentDidMount() {
-    const { current } = this.props;
-    const dsSettings = this.dataSourceSrv.getInstanceSettings(current);
-    if (!dsSettings) {
-      this.setState({ error: 'Could not find data source ' + current });
-    }
-  }
-
-  onChange = (ds: DataSourceInstanceSettings<DataSourceJsonData>) => {
-    this.props.onChange(ds);
-    this.setState({ error: undefined });
-  };
-
-  private getCurrentDs(): DataSourceInstanceSettings<DataSourceJsonData> | string | DataSourceRef | null | undefined {
-    const { current, noDefault } = this.props;
-    if (!current && noDefault) {
-      return;
-    }
-
-    const ds = this.dataSourceSrv.getInstanceSettings(current);
-    if (ds) {
-      return ds;
-    }
-
-    return getDataSourceUID(current);
-  }
-
-  getDatasources() {
-    const { alerting, tracing, metrics, mixed, dashboard, variables, annotations, pluginId, type, filter, logs } =
-      this.props;
-
-    return this.dataSourceSrv.getList({
-      alerting,
-      tracing,
-      metrics,
-      logs,
-      dashboard,
-      mixed,
-      variables,
-      annotations,
-      pluginId,
-      filter,
-      type,
-    });
-  }
-
-  render() {
-    const { recentlyUsed, fileUploadOptions, enableFileUpload, onClickAddCSV } = this.props;
-
-    return (
-      <div>
-        <DataSourceDropdown
-          {...this.props}
-          datasources={this.getDatasources()}
-          onChange={this.onChange}
-          recentlyUsed={recentlyUsed}
-          current={this.getCurrentDs()}
-          fileUploadOptions={fileUploadOptions}
-          enableFileUpload={enableFileUpload}
-          onClickAddCSV={onClickAddCSV}
-        />
-      </div>
-    );
-  }
-}
diff --git a/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.test.ts b/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.test.ts
deleted file mode 100644
index 752deb96927..00000000000
--- a/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { updateHistory } from './DataSourcePickerWithHistory';
-
-describe('DataSourcePickerWithHistory', () => {
-  describe('updateHistory', () => {
-    const early = { uid: 'b', lastUse: '2023-02-27T13:39:08.318Z' };
-    const later = { uid: 'a', lastUse: '2023-02-28T13:39:08.318Z' };
-
-    it('should add an item to the history', () => {
-      expect(updateHistory([], early)).toEqual([early]);
-    });
-
-    it('should sort later entries first', () => {
-      expect(updateHistory([early], later)).toEqual([later, early]);
-    });
-
-    it('should update an already existing history item with the new lastUsed date', () => {
-      const laterB = { uid: early.uid, lastUse: later.lastUse };
-      expect(updateHistory([early], laterB)).toEqual([laterB]);
-    });
-
-    it('should keep the three latest items in history', () => {
-      const evenLater = { uid: 'c', lastUse: '2023-03-01T13:39:08.318Z' };
-      const latest = { uid: 'd', lastUse: '2023-03-02T13:39:08.318Z' };
-      expect(updateHistory([early, later, evenLater], latest)).toEqual([latest, evenLater, later]);
-    });
-  });
-});
diff --git a/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.tsx b/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.tsx
deleted file mode 100644
index b9ea0335415..00000000000
--- a/public/app/features/datasources/components/picker/DataSourcePickerWithHistory.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react';
-
-import { dateTime } from '@grafana/data';
-import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
-
-import { DataSourcePicker } from './DataSourcePickerNG';
-import { DataSourcePickerHistoryItem, DataSourcePickerWithHistoryProps } from './types';
-
-const DS_PICKER_STORAGE_KEY = 'DATASOURCE_PICKER';
-
-export const DataSourcePickerWithHistory = (props: DataSourcePickerWithHistoryProps) => {
-  return (
-    <LocalStorageValueProvider<DataSourcePickerHistoryItem[]>
-      defaultValue={[]}
-      storageKey={props.localStorageKey ?? DS_PICKER_STORAGE_KEY}
-    >
-      {(rawValues, onSaveToStore) => {
-        return (
-          <DataSourcePicker
-            {...props}
-            recentlyUsed={rawValues.map((dsi) => dsi.uid)} //Filter recently to have a time cutoff
-            onChange={(ds) => {
-              onSaveToStore(updateHistory(rawValues, { uid: ds.uid, lastUse: dateTime(new Date()).toISOString() }));
-              props.onChange(ds);
-            }}
-          ></DataSourcePicker>
-        );
-      }}
-    </LocalStorageValueProvider>
-  );
-};
-
-export function updateHistory(values: DataSourcePickerHistoryItem[], newValue: DataSourcePickerHistoryItem) {
-  const newHistory = values;
-  const existingIndex = newHistory.findIndex((dpi) => dpi.uid === newValue.uid);
-  if (existingIndex !== -1) {
-    newHistory[existingIndex] = newValue;
-  } else {
-    newHistory.push(newValue);
-  }
-
-  newHistory.sort((a, b) => {
-    const al = dateTime(a.lastUse);
-    const bl = dateTime(b.lastUse);
-    if (al.isBefore(bl)) {
-      return 1;
-    } else if (bl.isBefore(al)) {
-      return -1;
-    } else {
-      return 0;
-    }
-  });
-
-  return newHistory.slice(0, 3);
-}
diff --git a/public/app/features/datasources/components/picker/types.ts b/public/app/features/datasources/components/picker/types.ts
index b6e3101c261..4dc7dd36a4e 100644
--- a/public/app/features/datasources/components/picker/types.ts
+++ b/public/app/features/datasources/components/picker/types.ts
@@ -4,8 +4,7 @@ import { DropzoneOptions } from 'react-dropzone';
 import { DataSourceInstanceSettings } from '@grafana/data';
 import { DataSourceJsonData, DataSourceRef } from '@grafana/schema';
 
-export interface DataSourceDrawerProps {
-  datasources: Array<DataSourceInstanceSettings<DataSourceJsonData>>;
+export interface DataSourceDropdownProps {
   onChange: (ds: DataSourceInstanceSettings<DataSourceJsonData>) => void;
   current: DataSourceInstanceSettings<DataSourceJsonData> | string | DataSourceRef | null | undefined;
   enableFileUpload?: boolean;
@@ -14,44 +13,9 @@ export interface DataSourceDrawerProps {
   recentlyUsed?: string[];
 }
 
-export interface PickerContentProps extends DataSourceDrawerProps {
+export interface PickerContentProps extends DataSourceDropdownProps {
   style: React.CSSProperties;
   filterTerm?: string;
   onClose: () => void;
   onDismiss: () => void;
 }
-
-export interface DataSourcePickerProps {
-  onChange: (ds: DataSourceInstanceSettings) => void;
-  current: DataSourceRef | string | null; // uid
-  tracing?: boolean;
-  recentlyUsed?: string[];
-  mixed?: boolean;
-  dashboard?: boolean;
-  metrics?: boolean;
-  type?: string | string[];
-  annotations?: boolean;
-  variables?: boolean;
-  alerting?: boolean;
-  pluginId?: string;
-  /** If true,we show only DSs with logs; and if true, pluginId shouldnt be passed in */
-  logs?: boolean;
-  // Does not set the default data source if there is no value.
-  noDefault?: boolean;
-  inputId?: string;
-  filter?: (dataSource: DataSourceInstanceSettings) => boolean;
-  onClear?: () => void;
-  disabled?: boolean;
-  enableFileUpload?: boolean;
-  fileUploadOptions?: DropzoneOptions;
-  onClickAddCSV?: () => void;
-}
-
-export interface DataSourcePickerWithHistoryProps extends Omit<DataSourcePickerProps, 'recentlyUsed'> {
-  localStorageKey?: string;
-}
-
-export interface DataSourcePickerHistoryItem {
-  lastUse: string;
-  uid: string;
-}
diff --git a/public/app/features/datasources/components/picker/utils.ts b/public/app/features/datasources/components/picker/utils.ts
index 257dca80a84..61b7abeb5c7 100644
--- a/public/app/features/datasources/components/picker/utils.ts
+++ b/public/app/features/datasources/components/picker/utils.ts
@@ -1,4 +1,5 @@
 import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceRef } from '@grafana/data';
+import { GetDataSourceListFilters, getDataSourceSrv } from '@grafana/runtime';
 
 export function isDataSourceMatch(
   ds: DataSourceInstanceSettings | undefined,
@@ -16,7 +17,7 @@ export function isDataSourceMatch(
   return ds.uid === current.uid;
 }
 
-export function dataSourceName(
+export function dataSourceLabel(
   dataSource: DataSourceInstanceSettings<DataSourceJsonData> | string | DataSourceRef | null | undefined
 ) {
   if (!dataSource) {
@@ -37,3 +38,23 @@ export function dataSourceName(
 
   return 'Unknown';
 }
+
+export function useGetDatasources(filters: GetDataSourceListFilters) {
+  const dataSourceSrv = getDataSourceSrv();
+
+  return dataSourceSrv.getList(filters);
+}
+
+export function useGetDatasource(dataSource: string | DataSourceRef | DataSourceInstanceSettings | null | undefined) {
+  const dataSourceSrv = getDataSourceSrv();
+
+  if (!dataSource) {
+    return undefined;
+  }
+
+  if (typeof dataSource === 'string') {
+    return dataSourceSrv.getInstanceSettings(dataSource);
+  }
+
+  return dataSourceSrv.getInstanceSettings(dataSource);
+}

From 883dcc81c0ac0f40a129aafb9f6654f2d6581916 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Thu, 20 Apr 2023 11:24:40 +0100
Subject: [PATCH 273/729] Alerting: Add tests for Evaluate (#66739)

---
 pkg/services/ngalert/eval/eval_test.go | 57 ++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go
index d0c31aa0ebc..3d1eb8cb620 100644
--- a/pkg/services/ngalert/eval/eval_test.go
+++ b/pkg/services/ngalert/eval/eval_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/expr"
@@ -547,6 +548,62 @@ func TestValidate(t *testing.T) {
 	}
 }
 
+func TestEvaluate(t *testing.T) {
+	cases := []struct {
+		name     string
+		cond     models.Condition
+		resp     backend.QueryDataResponse
+		expected Results
+		error    string
+	}{{
+		name: "is no data with no frames",
+		cond: models.Condition{
+			Data: []models.AlertQuery{{
+				RefID:         "A",
+				DatasourceUID: "test",
+			}},
+		},
+		resp: backend.QueryDataResponse{
+			Responses: backend.Responses{
+				"A": {Frames: nil},
+			},
+		},
+		expected: Results{{
+			State: NoData,
+			Instance: data.Labels{
+				"datasource_uid": "test",
+				"ref_id":         "A",
+			},
+		}},
+	}}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			ev := conditionEvaluator{
+				pipeline: nil,
+				expressionService: &fakeExpressionService{
+					hook: func(ctx context.Context, now time.Time, pipeline expr.DataPipeline) (*backend.QueryDataResponse, error) {
+						return &tc.resp, nil
+					},
+				},
+				condition: tc.cond,
+			}
+			results, err := ev.Evaluate(context.Background(), time.Now())
+			if tc.error != "" {
+				require.EqualError(t, err, tc.error)
+			} else {
+				require.NoError(t, err)
+				require.Len(t, results, len(tc.expected))
+				for i := range results {
+					tc.expected[i].EvaluatedAt = results[i].EvaluatedAt
+					tc.expected[i].EvaluationDuration = results[i].EvaluationDuration
+					assert.Equal(t, tc.expected[i], results[i])
+				}
+			}
+		})
+	}
+}
+
 func TestEvaluateRaw(t *testing.T) {
 	t.Run("should timeout if request takes too long", func(t *testing.T) {
 		unexpectedResponse := &backend.QueryDataResponse{}

From b1129a4375241e87c61900a796fe130f3781bf0d Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Thu, 20 Apr 2023 11:32:14 +0100
Subject: [PATCH 274/729] grafana/e2e: Include wait in `selectOption` (#66894)

Update e2e select with wait
---
 packages/grafana-e2e/src/flows/configurePanel.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/grafana-e2e/src/flows/configurePanel.ts b/packages/grafana-e2e/src/flows/configurePanel.ts
index c6225fb4a0d..983510e683a 100644
--- a/packages/grafana-e2e/src/flows/configurePanel.ts
+++ b/packages/grafana-e2e/src/flows/configurePanel.ts
@@ -113,6 +113,13 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
     e2e().intercept(chartData.method, chartData.route).as('chartData');
 
     if (dataSourceName) {
+      e2e.components.DataSourcePicker.container().within(() => {
+        e2e()
+          .get('[class$="-input-suffix"]')
+          .then((element) => {
+            Cypress.dom.isAttached(element);
+          });
+      });
       selectOption({
         container: e2e.components.DataSourcePicker.container(),
         optionText: dataSourceName,

From 4089514432b221b558b44b1d6792fc452c126144 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Thu, 20 Apr 2023 12:36:22 +0200
Subject: [PATCH 275/729] Auth: Make GitHub auth's allowed_organizations be
 case insensitive (#66879)

* Auth: Make GitHub auth's allowed_organizations be case insensitive

* Apply code suggestion to use strings.EqualFold
---
 pkg/login/social/github_oauth.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/login/social/github_oauth.go b/pkg/login/social/github_oauth.go
index f170d6d9194..4d04f412321 100644
--- a/pkg/login/social/github_oauth.go
+++ b/pkg/login/social/github_oauth.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"regexp"
+	"strings"
 
 	"golang.org/x/oauth2"
 
@@ -67,7 +68,7 @@ func (s *SocialGithub) IsOrganizationMember(client *http.Client, organizationsUr
 
 	for _, allowedOrganization := range s.allowedOrganizations {
 		for _, organization := range organizations {
-			if organization == allowedOrganization {
+			if strings.EqualFold(organization, allowedOrganization) {
 				return true
 			}
 		}

From 9b529ef0cde187ce8e5c70acf00d4bdc86f651b0 Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Thu, 20 Apr 2023 13:06:35 +0200
Subject: [PATCH 276/729] Docs: adds legacy wording to api docs (#66937)

adds legacy wording to api docs
---
 docs/sources/developers/http_api/alerting.md                  | 4 ++--
 .../developers/http_api/alerting_notification_channels.md     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/sources/developers/http_api/alerting.md b/docs/sources/developers/http_api/alerting.md
index 312a79519d8..19a42956e54 100644
--- a/docs/sources/developers/http_api/alerting.md
+++ b/docs/sources/developers/http_api/alerting.md
@@ -13,9 +13,9 @@ keywords:
 title: 'Alerting HTTP API '
 ---
 
-# Alerting API
+# Legacy Alerting API
 
-> **Note:** Starting with v9.0, the Alerting HTTP API is deprecated. It will be removed in a future release.
+> **Note:** Starting with v9.0, the Legacy Alerting HTTP API is deprecated. It will be removed in a future release.
 
 This topic is relevant for the [legacy dashboard alerts](https://grafana.com/docs/grafana/v8.5/alerting/old-alerting/) only.
 
diff --git a/docs/sources/developers/http_api/alerting_notification_channels.md b/docs/sources/developers/http_api/alerting_notification_channels.md
index ea8d4cac8ea..8a2e8b5ed29 100644
--- a/docs/sources/developers/http_api/alerting_notification_channels.md
+++ b/docs/sources/developers/http_api/alerting_notification_channels.md
@@ -14,7 +14,9 @@ keywords:
 title: 'Alerting Notification Channels HTTP API '
 ---
 
-# Alerting Notification Channels API
+# Legacy Alerting Notification Channels API
+
+> **Note:** Starting with v9.0, the Legacy Alerting Notification Channels API is deprecated. It will be removed in a future release.
 
 This page documents the Alerting Notification Channels API.
 

From 4d2570ad7231dd020e4d58b24458751f12654ffc Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Thu, 20 Apr 2023 13:14:19 +0200
Subject: [PATCH 277/729] Docs: updates time ranges and alert rule doc (#66760)

---
 .../create-grafana-managed-rule.md            | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index 173e3897f4c..cbef5608d54 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -8,32 +8,45 @@ keywords:
   - guide
   - rules
   - create
-title: Create Grafana managed alert rules
+title: Create Grafana-managed alert rules
 weight: 400
 ---
 
-# Create a Grafana managed alerting rule
+# Create Grafana-managed alert rules
 
-Grafana allows you to create alerting rules that query one or more data sources, reduce or transform the results and compare them to each other or to fixed thresholds. When these are executed, Grafana sends notifications to the contact point. For information on Grafana Alerting, see [About Grafana Alerting]({{< relref "../" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
+Grafana-managed rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of our supported data sources. In addition to supporting multiple data sources, you can also add expressions to transform your data and set alert conditions. Using images in alert notifications is also supported. This is the only type of rule that allows alerting from multiple data sources in a single rule definition.
+
+Multiple alert instances can be created as a result of one alert rule (also known as a multi-dimensional alerting).
+
+For information on Grafana Alerting, see [Introduction to Grafana Alerting](/docs/grafana/next/alerting/fundamentals/), which explains the key concepts and features of Grafana Alerting.
 
 Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
 
 _Refer to [Add Grafana managed rule]({{< relref "#add-grafana-managed-rule" >}}) (following) for current instructions._
 
-## Add Grafana managed rule
+To create a Grafana-managed alert rule, complete the following steps.
 
 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Alert rules**.
-1. Click **+ Create alert rule**. The new alerting rule page opens where the **Grafana managed alerts** option is selected by default.
-1. In Step 1, add the rule name.
+2. Click **Alert rules**.
+3. Click **+ Create alert rule**. The new alert rule page opens where the **Grafana managed alerts** option is selected by default.
+4. In Step 1, add the rule name.
    - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
-1. In Step 2, add queries and expressions to evaluate, and then select the alert condition.
+5. In Step 2, add queries and expressions to evaluate, and then select the alert condition.
+
    - For queries, select a data source from the dropdown.
+   - Specify a [time range](/docs/grafana/latest/dashboards/use-dashboards/?pg=blog&plcmt=body-txt#time-units-and-relative-ranges).
+
+     **Note:**
+     Grafana Alerting only supports fixed relative time ranges, for example, `now-24hr: now`.
+
+     It does not support absolute time ranges: `2021-12-02 00:00:00 to 2021-12-05 23:59:592` or semi-relative time ranges: `now/d to: now`.
+
    - Add one or more [queries]({{< relref "/docs/grafana/latest/panels-visualizations/query-transform-data#add-a-query" >}}) or [expressions]({{< relref "/docs/grafana/latest/panels-visualizations/query-transform-data/expression-queries" >}}).
    - For each expression, select either **Classic condition** to create a single alert rule, or choose from the **Math**, **Reduce**, and **Resample** options to generate separate alert for each series. For details on these options, see [Single and multi dimensional rule](#single-and-multi-dimensional-rule).
    - Click **Run queries** to verify that the query is successful.
    - Next, select the query or expression for your alert condition.
-1. In Step 3, specify the alert evaluation interval.
+
+6. In Step 3, specify the alert evaluation interval.
 
    - From the **Condition** dropdown, select the query or expression to trigger the alert rule.
    - For **Evaluate every**, specify the frequency of evaluation. Must be a multiple of 10 seconds. For examples, `1m`, `30s`.
@@ -46,17 +59,17 @@ _Refer to [Add Grafana managed rule]({{< relref "#add-grafana-managed-rule" >}})
 
      You can pause alert rule evaluation to prevent noisy alerting while tuning your alerts. Pausing stops alert rule evaluation and does not create any alert instances. This is different to mute timings, which stop notifications from being delivered, but still allow for alert rule evaluation and the creation of alert instances.
 
-1. In Step 4, add the storage location, rule group, as well as additional metadata associated with the rule.
+7. In Step 4, add the storage location, rule group, as well as additional metadata associated with the rule.
    - From the **Folder** dropdown, select the folder where you want to store the rule.
    - For **Group**, specify a pre-defined group. Newly created rules are appended to the end of the group. Rules within a group are run sequentially at a regular interval, with the same evaluation time.
    - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
-1. In Step 5, add custom labels.
+8. In Step 5, add custom labels.
    - Add custom labels selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value .
-1. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
-1. Next, create a for the rule.
+9. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
+10. Next, create a for the rule.
 
-### Single and multi dimensional rule
+### Single and multi-dimensional rule
 
 For Grafana managed alerts, you can create a rule with a classic condition or you can create a multi-dimensional rule.
 
@@ -64,7 +77,9 @@ For Grafana managed alerts, you can create a rule with a classic condition or yo
 
 Use the classic condition expression to create a rule that triggers a single alert when its condition is met. For a query that returns multiple series, Grafana does not track the alert state of each series. As a result, Grafana sends only a single alert even when alert conditions are met for multiple series.
 
-**Multi dimensional rule**
+For more information, see [expressions documentation]({{< relref "/docs/grafana/latest/panels-visualizations/query-transform-data/expression-queries" >}}).
+
+**Multi-dimensional rule**
 
 To generate a separate alert for each series, create a multi-dimensional rule. Use `Math`, `Reduce`, or `Resample` expressions to create a multi-dimensional rule. For example:
 
@@ -75,10 +90,6 @@ To generate a separate alert for each series, create a multi-dimensional rule. U
 
 > **Note:** Grafana does not support alert queries with template variables. More information is available at <https://community.grafana.com/t/template-variables-are-not-supported-in-alert-queries-while-setting-up-alert/2514>.
 
-#### Rule with classic condition
-
-For more information, see [expressions documentation]({{< relref "/docs/grafana/latest/panels-visualizations/query-transform-data/expression-queries" >}}).
-
 ### Configure no data and error handling
 
 Configure alerting behavior when your alert rule evaluation returns no data or an error.

From 40c7b3126ea414c4cd5f95081d0735b1acae43b4 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Thu, 20 Apr 2023 13:44:19 +0200
Subject: [PATCH 278/729] Prompt DS modal when the user adds the first panel to
 a dashboard (#66911)

* Prompt DS modal when the user adds the first panel to a dashboard

* Rename state prop and use toggle

* Change modal size

* Avoid flickering for dashboard modal when changing number of results

* When editing panel 1, only display when new dashboard
---
 .../components/picker/DataSourceDropdown.tsx  |   3 +-
 .../components/picker/DataSourceModal.tsx     | 109 +++++++++---------
 .../features/query/components/QueryGroup.tsx  |  65 ++++++++---
 3 files changed, 101 insertions(+), 76 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index f2f1f91e45d..e2dcd6831a3 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -8,6 +8,7 @@ import { usePopper } from 'react-popper';
 import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
 import { DataSourceJsonData } from '@grafana/schema';
 import { Button, CustomScrollbar, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
+import config from 'app/core/config';
 
 import { DataSourceList } from './DataSourceList';
 import { DataSourceLogo, DataSourceLogoPlaceHolder } from './DataSourceLogo';
@@ -157,7 +158,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
       </div>
 
       <div className={styles.footer}>
-        {onClickAddCSV && (
+        {onClickAddCSV && config.featureToggles.editPanelCSVDragAndDrop && (
           <Button variant="secondary" size="sm" onClick={clickAddCSVCallback}>
             Add csv or spreadsheet
           </Button>
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index 6c0a191923f..142b6a4c20b 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -43,64 +43,62 @@ export function DataSourceModal({
       closeOnBackdropClick={true}
       isOpen={true}
       className={styles.modal}
+      contentClassName={styles.modalContent}
       onClickBackdrop={onDismiss}
       onDismiss={onDismiss}
     >
-      <div className={styles.modalContent}>
-        <div className={styles.leftColumn}>
-          <Input
-            className={styles.searchInput}
-            value={search}
-            prefix={<Icon name="search" />}
-            placeholder="Search data source"
-            onChange={(e) => setSearch(e.currentTarget.value)}
+      <div className={styles.leftColumn}>
+        <Input
+          className={styles.searchInput}
+          value={search}
+          prefix={<Icon name="search" />}
+          placeholder="Search data source"
+          onChange={(e) => setSearch(e.currentTarget.value)}
+        />
+        <CustomScrollbar>
+          <DataSourceList
+            dashboard={false}
+            mixed={false}
+            variables
+            filter={(ds) => ds.name.includes(search) && !ds.meta.builtIn}
+            onChange={onChange}
+            current={current}
           />
-          <CustomScrollbar>
-            <DataSourceList
-              dashboard={false}
-              mixed={false}
-              variables
-              // FIXME: Filter out the grafana data source in a hacky way
-              filter={(ds) => ds.name.toLowerCase().includes(search.toLowerCase()) && ds.name !== '-- Grafana --'}
-              onChange={onChange}
-              current={current}
-            />
-          </CustomScrollbar>
+        </CustomScrollbar>
+      </div>
+      <div className={styles.rightColumn}>
+        <div className={styles.builtInDataSources}>
+          <DataSourceList
+            className={styles.builtInDataSourceList}
+            filter={(ds) => !!ds.meta.builtIn}
+            dashboard
+            mixed
+            onChange={onChange}
+            current={current}
+          />
+          {enableFileUpload && (
+            <FileDropzone
+              readAs="readAsArrayBuffer"
+              fileListRenderer={() => undefined}
+              options={{
+                maxSize: DFImport.maxFileSize,
+                multiple: false,
+                accept: DFImport.acceptedFiles,
+                ...fileUploadOptions,
+                onDrop: (...args) => {
+                  fileUploadOptions?.onDrop?.(...args);
+                  onDismiss();
+                },
+              }}
+            >
+              <FileDropzoneDefaultChildren />
+            </FileDropzone>
+          )}
         </div>
-        <div className={styles.rightColumn}>
-          <div className={styles.builtInDataSources}>
-            <DataSourceList
-              className={styles.builtInDataSourceList}
-              filter={(ds) => !!ds.meta.builtIn}
-              dashboard
-              mixed
-              onChange={onChange}
-              current={current}
-            />
-            {enableFileUpload && (
-              <FileDropzone
-                readAs="readAsArrayBuffer"
-                fileListRenderer={() => undefined}
-                options={{
-                  maxSize: DFImport.maxFileSize,
-                  multiple: false,
-                  accept: DFImport.acceptedFiles,
-                  ...fileUploadOptions,
-                  onDrop: (...args) => {
-                    fileUploadOptions?.onDrop?.(...args);
-                    onDismiss();
-                  },
-                }}
-              >
-                <FileDropzoneDefaultChildren />
-              </FileDropzone>
-            )}
-          </div>
-          <div className={styles.dsCTAs}>
-            <LinkButton variant="secondary" href={`datasources/new`}>
-              Configure a new data source
-            </LinkButton>
-          </div>
+        <div className={styles.dsCTAs}>
+          <LinkButton variant="secondary" href={`datasources/new`}>
+            Configure a new data source
+          </LinkButton>
         </div>
       </div>
     </Modal>
@@ -112,12 +110,12 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
     modal: css`
       width: 80%;
       height: 80%;
+      max-width: 1200px;
+      max-height: 900px;
     `,
     modalContent: css`
       display: flex;
       flex-direction: row;
-      justify-content: space-between;
-      align-items: stretch;
       height: 100%;
     `,
     leftColumn: css`
@@ -133,7 +131,6 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
       flex-direction: column;
       width: 50%;
       height: 100%;
-      padding: ${theme.spacing(1)};
       justify-items: space-evenly;
       align-items: stretch;
       padding-left: ${theme.spacing(1)};
diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index eefdb6404a0..42233e2aa06 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -15,13 +15,14 @@ import {
   PanelData,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { getDataSourceSrv } from '@grafana/runtime';
+import { getDataSourceSrv, locationService } from '@grafana/runtime';
 import { Button, CustomScrollbar, HorizontalGroup, InlineFormLabel, Modal, stylesFactory } from '@grafana/ui';
 import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp';
 import config from 'app/core/config';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { addQuery, queryIsEmpty } from 'app/core/utils/query';
 import * as DFImport from 'app/features/dataframe-import';
+import { DataSourceModal } from 'app/features/datasources/components/picker/DataSourceModal';
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
 import { DashboardQueryEditor, isSharedDashboardQuery } from 'app/plugins/datasource/dashboard';
@@ -51,6 +52,7 @@ interface State {
   isLoadingHelp: boolean;
   isPickerOpen: boolean;
   isAddingMixed: boolean;
+  isDataSourceModalOpen: boolean;
   data: PanelData;
   isHelpOpen: boolean;
   defaultDataSource?: DataSourceApi;
@@ -69,6 +71,7 @@ export class QueryGroup extends PureComponent<Props, State> {
   querySubscription: Unsubscribable | null = null;
 
   state: State = {
+    isDataSourceModalOpen: false,
     isLoadingHelp: false,
     helpContent: null,
     isPickerOpen: false,
@@ -116,6 +119,11 @@ export class QueryGroup extends PureComponent<Props, State> {
           dataSource: { ...options.dataSource },
           savedQueryUid: options.savedQueryUid,
         },
+        // TODO: Detect the first panel added into a new dashboard better.
+        // This is flaky in case the UID is generated differently
+        isDataSourceModalOpen:
+          locationService.getLocation().pathname === '/dashboard/new' &&
+          locationService.getSearchObject().editPanel === '1',
       });
     } catch (error) {
       console.log('failed to load data source', error);
@@ -213,24 +221,7 @@ export class QueryGroup extends PureComponent<Props, State> {
           <InlineFormLabel htmlFor="data-source-picker" width={'auto'}>
             Data source
           </InlineFormLabel>
-          <div className={styles.dataSourceRowItem}>
-            <DataSourcePicker
-              onChange={this.onChangeDataSource}
-              current={options.dataSource}
-              metrics={true}
-              mixed={true}
-              dashboard={true}
-              variables={true}
-              enableFileUpload={config.featureToggles.editPanelCSVDragAndDrop}
-              fileUploadOptions={{
-                onDrop: this.onFileDrop,
-                maxSize: DFImport.maxFileSize,
-                multiple: false,
-                accept: DFImport.acceptedFiles,
-              }}
-              onClickAddCSV={this.onClickAddCSV}
-            />
-          </div>
+          <div className={styles.dataSourceRowItem}>{this.renderDataSourcePickerWithPrompt()}</div>
           {dataSource && (
             <>
               <div className={styles.dataSourceRowItem}>
@@ -290,6 +281,42 @@ export class QueryGroup extends PureComponent<Props, State> {
     );
   };
 
+  renderDataSourcePickerWithPrompt = () => {
+    const { isDataSourceModalOpen } = this.state;
+
+    const commonProps = {
+      enableFileUpload: config.featureToggles.editPanelCSVDragAndDrop,
+      fileUploadOptions: {
+        onDrop: this.onFileDrop,
+        maxSize: DFImport.maxFileSize,
+        multiple: false,
+        accept: DFImport.acceptedFiles,
+      },
+      current: this.props.options.dataSource,
+      onChange: (ds: DataSourceInstanceSettings) => {
+        this.onChangeDataSource(ds);
+        this.setState({ isDataSourceModalOpen: false });
+      },
+    };
+    const onDismiss = () => this.setState({ isDataSourceModalOpen: false });
+
+    return (
+      <>
+        {isDataSourceModalOpen && config.featureToggles.advancedDataSourcePicker && (
+          <DataSourceModal {...commonProps} onDismiss={onDismiss}></DataSourceModal>
+        )}
+        <DataSourcePicker
+          {...commonProps}
+          metrics={true}
+          mixed={true}
+          dashboard={true}
+          variables={true}
+          onClickAddCSV={this.onClickAddCSV}
+        />
+      </>
+    );
+  };
+
   onAddMixedQuery = (datasource: any) => {
     this.onAddQuery({ datasource: datasource.name });
     this.setState({ isAddingMixed: false });

From 1e53a87d766447a9202a02aecc9e7d4f19160cd4 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 20 Apr 2023 14:21:14 +0200
Subject: [PATCH 279/729] Log Context: Add button to open the context query in
 a split view (#66777)

* add show context button

* improve type definition

* change to default `maxLines`

* remove context query

* add provider to tests

* add test for split view button

* improve documentation

* add tests for `getLogRowContextQuery`

* refactor LogsContainer functions

* fix spelling

* add `contextQuery` as state

* fix tests

* fix lint

* do not use callIfDefined

* make button secondary
---
 .betterer.results                             |   3 -
 packages/grafana-data/src/types/logs.ts       |   5 +
 public/app/features/explore/Logs.tsx          |   3 +
 public/app/features/explore/LogsContainer.tsx |  40 +++--
 .../log-context/LogRowContextModal.test.tsx   | 149 ++++++++++++++++--
 .../log-context/LogRowContextModal.tsx        |  56 ++++++-
 .../loki/LogContextProvider.test.ts           |  22 +++
 .../datasource/loki/LogContextProvider.ts     |  31 +++-
 .../app/plugins/datasource/loki/datasource.ts |   8 +
 9 files changed, 282 insertions(+), 35 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index f86842f8765..9a24af4f7f9 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2759,9 +2759,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/features/explore/LogsContainer.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/explore/LogsMetaRow.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts
index 8b180435628..a1a9966052c 100644
--- a/packages/grafana-data/src/types/logs.ts
+++ b/packages/grafana-data/src/types/logs.ts
@@ -131,6 +131,11 @@ export interface DataSourceWithLogsContextSupport<TQuery extends DataQuery = Dat
    */
   getLogRowContext: (row: LogRowModel, options?: LogRowContextOptions, query?: TQuery) => Promise<DataQueryResponse>;
 
+  /**
+   * Retrieve the context query object for a given log row. This is currently used to open LogContext queries in a split view.
+   */
+  getLogRowContextQuery?: (row: LogRowModel, options?: LogRowContextOptions, query?: TQuery) => Promise<TQuery | null>;
+
   /**
    * This method can be used to show "context" button based on runtime conditions (for example row model data or plugin settings, etc.)
    */
diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index c748e8f0361..41dd9d50c13 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -79,6 +79,7 @@ interface Props extends Themeable2 {
   onStartScanning?: () => void;
   onStopScanning?: () => void;
   getRowContext?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<any>;
+  getRowContextQuery?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQuery | null>;
   getLogRowContextUi?: (row: LogRowModel, runContextQuery?: () => void) => React.ReactNode;
   getFieldLinks: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   addResultsToCache: () => void;
@@ -377,6 +378,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
       exploreId,
       getRowContext,
       getLogRowContextUi,
+      getRowContextQuery,
     } = this.props;
 
     const {
@@ -412,6 +414,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
             row={contextRow}
             onClose={this.onCloseContext}
             getRowContext={getRowContext}
+            getRowContextQuery={getRowContextQuery}
             getLogRowContextUi={getLogRowContextUi}
             logsSortOrder={logsSortOrder}
             timeZone={timeZone}
diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx
index 24211ee973b..67d89101449 100644
--- a/public/app/features/explore/LogsContainer.tsx
+++ b/public/app/features/explore/LogsContainer.tsx
@@ -14,7 +14,11 @@ import {
   DataFrame,
   SupplementaryQueryType,
   DataQueryResponse,
+  LogRowContextOptions,
+  DataSourceWithLogsContextSupport,
+  DataSourceApi,
 } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
 import { Collapse } from '@grafana/ui';
 import { StoreState } from 'app/types';
 import { ExploreId, ExploreItemState } from 'app/types/explore';
@@ -49,28 +53,45 @@ class LogsContainer extends PureComponent<LogsContainerProps> {
     updateTimeRange({ exploreId, absoluteRange });
   };
 
-  getLogRowContext = async (row: LogRowModel, options?: any): Promise<DataQueryResponse | []> => {
+  private getQuery(
+    logsQueries: DataQuery[] | undefined,
+    row: LogRowModel,
+    datasourceInstance: DataSourceApi<DataQuery> & DataSourceWithLogsContextSupport<DataQuery>
+  ) {
+    // we need to find the query, and we need to be very sure that it's a query
+    // from this datasource
+    return (logsQueries ?? []).find(
+      (q) => q.refId === row.dataFrame.refId && q.datasource != null && q.datasource.type === datasourceInstance.type
+    );
+  }
+
+  getLogRowContext = async (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQueryResponse | []> => {
     const { datasourceInstance, logsQueries } = this.props;
 
     if (hasLogsContextSupport(datasourceInstance)) {
-      // we need to find the query, and we need to be very sure that
-      // it's a query from this datasource
-      const query = (logsQueries ?? []).find(
-        (q) => q.refId === row.dataFrame.refId && q.datasource != null && q.datasource.type === datasourceInstance.type
-      );
+      const query = this.getQuery(logsQueries, row, datasourceInstance);
       return datasourceInstance.getLogRowContext(row, options, query);
     }
 
     return [];
   };
 
+  getLogRowContextQuery = async (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQuery | null> => {
+    const { datasourceInstance, logsQueries } = this.props;
+
+    if (hasLogsContextSupport(datasourceInstance) && datasourceInstance.getLogRowContextQuery) {
+      const query = this.getQuery(logsQueries, row, datasourceInstance);
+      return datasourceInstance.getLogRowContextQuery(row, options, query);
+    }
+
+    return null;
+  };
+
   getLogRowContextUi = (row: LogRowModel, runContextQuery?: () => void): React.ReactNode => {
     const { datasourceInstance, logsQueries } = this.props;
 
     if (hasLogsContextUiSupport(datasourceInstance) && datasourceInstance.getLogRowContextUi) {
-      const query = (logsQueries ?? []).find(
-        (q) => q.refId === row.dataFrame.refId && q.datasource != null && q.datasource.type === datasourceInstance.type
-      );
+      const query = this.getQuery(logsQueries, row, datasourceInstance);
       return datasourceInstance.getLogRowContextUi(row, runContextQuery, query);
     }
 
@@ -174,6 +195,7 @@ class LogsContainer extends PureComponent<LogsContainerProps> {
             scanRange={range.raw}
             showContextToggle={this.showContextToggle}
             getRowContext={this.getLogRowContext}
+            getRowContextQuery={this.getLogRowContextQuery}
             getLogRowContextUi={this.getLogRowContextUi}
             getFieldLinks={this.getFieldLinks}
             addResultsToCache={() => addResultsToCache(exploreId)}
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
index 69ab23f7c36..5a4e6e2e5be 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
@@ -1,7 +1,8 @@
-import { render, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
+import { render } from 'test/redux-rtl';
 
 import { createLogRow } from '../__mocks__/logRow';
 
@@ -9,6 +10,18 @@ import { LogRowContextModal } from './LogRowContextModal';
 
 const getRowContext = jest.fn().mockResolvedValue({ data: { fields: [], rows: [] } });
 
+const dispatchMock = jest.fn();
+jest.mock('app/types', () => ({
+  ...jest.requireActual('app/types'),
+  useDispatch: () => dispatchMock,
+}));
+
+const splitOpen = Symbol('splitOpen');
+jest.mock('app/features/explore/state/main', () => ({
+  ...jest.requireActual('app/features/explore/state/main'),
+  splitOpen: () => splitOpen,
+}));
+
 const row = createLogRow({ uid: '1' });
 
 const timeZone = 'UTC';
@@ -24,12 +37,20 @@ describe('LogRowContextModal', () => {
     jest.clearAllMocks();
   });
 
-  it('should not render modal when it is closed', () => {
-    render(
-      <LogRowContextModal row={row} open={false} onClose={() => {}} getRowContext={getRowContext} timeZone={timeZone} />
-    );
+  it('should not render modal when it is closed', async () => {
+    act(() => {
+      render(
+        <LogRowContextModal
+          row={row}
+          open={false}
+          onClose={() => {}}
+          getRowContext={getRowContext}
+          timeZone={timeZone}
+        />
+      );
+    });
 
-    expect(screen.queryByText('Log context')).not.toBeInTheDocument();
+    await waitFor(() => expect(screen.queryByText('Log context')).not.toBeInTheDocument());
   });
 
   it('should render modal when it is open', async () => {
@@ -48,12 +69,20 @@ describe('LogRowContextModal', () => {
     await waitFor(() => expect(screen.queryByText('Log context')).toBeInTheDocument());
   });
 
-  it('should call getRowContext on open and change of row', () => {
-    render(
-      <LogRowContextModal row={row} open={false} onClose={() => {}} getRowContext={getRowContext} timeZone={timeZone} />
-    );
+  it('should call getRowContext on open and change of row', async () => {
+    act(() => {
+      render(
+        <LogRowContextModal
+          row={row}
+          open={false}
+          onClose={() => {}}
+          getRowContext={getRowContext}
+          timeZone={timeZone}
+        />
+      );
+    });
 
-    expect(getRowContext).not.toHaveBeenCalled();
+    await waitFor(() => expect(getRowContext).not.toHaveBeenCalled());
   });
   it('should call getRowContext on open', async () => {
     act(() => {
@@ -97,4 +126,102 @@ describe('LogRowContextModal', () => {
 
     await waitFor(() => expect(getRowContext).toHaveBeenCalledTimes(4));
   });
+
+  it('should show a split view button', async () => {
+    const getRowContextQuery = jest.fn().mockResolvedValue({ datasource: { uid: 'test-uid' } });
+
+    render(
+      <LogRowContextModal
+        row={row}
+        open={true}
+        onClose={() => {}}
+        getRowContext={getRowContext}
+        getRowContextQuery={getRowContextQuery}
+        timeZone={timeZone}
+      />
+    );
+
+    await waitFor(() =>
+      expect(
+        screen.getByRole('button', {
+          name: /open in split view/i,
+        })
+      ).toBeInTheDocument()
+    );
+  });
+
+  it('should not show a split view button', async () => {
+    render(
+      <LogRowContextModal row={row} open={true} onClose={() => {}} getRowContext={getRowContext} timeZone={timeZone} />
+    );
+
+    expect(
+      screen.queryByRole('button', {
+        name: /open in split view/i,
+      })
+    ).not.toBeInTheDocument();
+  });
+
+  it('should call getRowContextQuery', async () => {
+    const getRowContextQuery = jest.fn().mockResolvedValue({ datasource: { uid: 'test-uid' } });
+    render(
+      <LogRowContextModal
+        row={row}
+        open={true}
+        onClose={() => {}}
+        getRowContext={getRowContext}
+        getRowContextQuery={getRowContextQuery}
+        timeZone={timeZone}
+      />
+    );
+
+    await waitFor(() => expect(getRowContextQuery).toHaveBeenCalledTimes(1));
+  });
+
+  it('should close modal', async () => {
+    const getRowContextQuery = jest.fn().mockResolvedValue({ datasource: { uid: 'test-uid' } });
+    const onClose = jest.fn();
+    render(
+      <LogRowContextModal
+        row={row}
+        open={true}
+        onClose={onClose}
+        getRowContext={getRowContext}
+        getRowContextQuery={getRowContextQuery}
+        timeZone={timeZone}
+      />
+    );
+
+    const splitViewButton = await screen.findByRole('button', {
+      name: /open in split view/i,
+    });
+
+    await userEvent.click(splitViewButton);
+
+    expect(onClose).toHaveBeenCalled();
+  });
+
+  it('should dispatch splitOpen', async () => {
+    const getRowContextQuery = jest.fn().mockResolvedValue({ datasource: { uid: 'test-uid' } });
+    const onClose = jest.fn();
+
+    render(
+      <LogRowContextModal
+        row={row}
+        open={true}
+        onClose={onClose}
+        getRowContext={getRowContext}
+        getRowContextQuery={getRowContextQuery}
+        timeZone={timeZone}
+      />
+    );
+
+    const splitViewButton = await screen.findByRole('button', {
+      name: /open in split view/i,
+    });
+
+    await userEvent.click(splitViewButton);
+
+    await waitFor(() => expect(dispatchMock).toHaveBeenCalledWith(splitOpen));
+  });
 });
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
index f7965a9c07a..18e54d5012b 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -1,6 +1,6 @@
 import { css, cx } from '@emotion/css';
-import React, { useEffect, useLayoutEffect, useState } from 'react';
-import { useAsyncFn } from 'react-use';
+import React, { useCallback, useEffect, useLayoutEffect, useState } from 'react';
+import { useAsync, useAsyncFn } from 'react-use';
 
 import {
   DataQueryResponse,
@@ -12,13 +12,16 @@ import {
   LogsDedupStrategy,
   LogsSortOrder,
   SelectableValue,
+  rangeUtil,
 } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { TimeZone } from '@grafana/schema';
-import { LoadingBar, Modal, useTheme2 } from '@grafana/ui';
+import { DataQuery, TimeZone } from '@grafana/schema';
+import { Button, LoadingBar, Modal, useTheme2 } from '@grafana/ui';
 import { dataFrameToLogsModel } from 'app/core/logsModel';
 import store from 'app/core/store';
+import { splitOpen } from 'app/features/explore/state/main';
 import { SETTINGS_KEYS } from 'app/features/explore/utils/logs';
+import { useDispatch } from 'app/types';
 
 import { LogRows } from '../LogRows';
 
@@ -104,6 +107,8 @@ interface LogRowContextModalProps {
   timeZone: TimeZone;
   onClose: () => void;
   getRowContext: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQueryResponse>;
+
+  getRowContextQuery?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQuery | null>;
   logsSortOrder?: LogsSortOrder | null;
   runContextQuery?: () => void;
   getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
@@ -113,10 +118,11 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
   row,
   open,
   logsSortOrder,
+  timeZone,
   getLogRowContextUi,
+  getRowContextQuery,
   onClose,
   getRowContext,
-  timeZone,
 }) => {
   const scrollElement = React.createRef<HTMLDivElement>();
   const entryElement = React.createRef<HTMLTableRowElement>();
@@ -125,12 +131,28 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
   // first.
   const preEntryElement = React.createRef<HTMLTableRowElement>();
 
+  const dispatch = useDispatch();
   const theme = useTheme2();
   const styles = getStyles(theme);
   const [context, setContext] = useState<{ after: LogRowModel[]; before: LogRowModel[] }>({ after: [], before: [] });
   const [limit, setLimit] = useState<number>(LoadMoreOptions[0].value!);
   const [loadingWidth, setLoadingWidth] = useState(0);
   const [loadMoreOption, setLoadMoreOption] = useState<SelectableValue<number>>(LoadMoreOptions[0]);
+  const [contextQuery, setContextQuery] = useState<DataQuery | null>(null);
+
+  const getFullTimeRange = useCallback(() => {
+    const { before, after } = context;
+    const allRows = [...before, row, ...after].sort((a, b) => a.timeEpochMs - b.timeEpochMs);
+    const first = allRows[0];
+    const last = allRows[allRows.length - 1];
+    return rangeUtil.convertRawToRange(
+      {
+        from: first.timeUtc,
+        to: last.timeUtc,
+      },
+      'utc'
+    );
+  }, [context, row]);
 
   const onChangeLimitOption = (option: SelectableValue<number>) => {
     setLoadMoreOption(option);
@@ -215,6 +237,11 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
     }
   }, [scrollElement]);
 
+  useAsync(async () => {
+    const contextQuery = getRowContextQuery ? await getRowContextQuery(row) : null;
+    setContextQuery(contextQuery);
+  }, [getRowContextQuery, row]);
+
   return (
     <Modal
       isOpen={open}
@@ -300,6 +327,25 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
           Showing {context.before.length} lines {logsSortOrder === LogsSortOrder.Descending ? 'after' : 'before'} match.
         </div>
       </div>
+      {contextQuery?.datasource?.uid && (
+        <Modal.ButtonRow>
+          <Button
+            variant="secondary"
+            onClick={async () => {
+              dispatch(
+                splitOpen({
+                  queries: [contextQuery],
+                  range: getFullTimeRange(),
+                  datasourceUid: contextQuery.datasource!.uid!,
+                })
+              );
+              onClose();
+            }}
+          >
+            Open in split view
+          </Button>
+        </Modal.ButtonRow>
+      )}
     </Modal>
   );
 };
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
index d2db8aa9e5a..fed7355522d 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
@@ -71,6 +71,28 @@ describe('LogContextProvider', () => {
     });
   });
 
+  describe('getLogRowContextQuery', () => {
+    it('should call getInitContextFilters if no appliedContextFilters', async () => {
+      const query = await logContextProvider.getLogRowContextQuery(defaultLogRow, {
+        limit: 10,
+        direction: LogRowContextQueryDirection.Backward,
+      });
+      expect(query.expr).toBe('{bar="baz"}');
+    });
+
+    it('should not call getInitContextFilters if appliedContextFilters', async () => {
+      logContextProvider.appliedContextFilters = [
+        { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
+        { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
+      ];
+      const query = await logContextProvider.getLogRowContextQuery(defaultLogRow, {
+        limit: 10,
+        direction: LogRowContextQueryDirection.Backward,
+      });
+      expect(query.expr).toBe('{bar="baz",xyz="abc"}');
+    });
+  });
+
   describe('prepareLogRowContextQueryTarget', () => {
     describe('query with no parser', () => {
       const query = {
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
index cbd4eb47981..bc719e4b40c 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -33,13 +33,9 @@ export class LogContextProvider {
     this.appliedContextFilters = [];
   }
 
-  getLogRowContext = async (
-    row: LogRowModel,
-    options?: LogRowContextOptions,
-    origQuery?: DataQuery
-  ): Promise<{ data: DataFrame[] }> => {
+  private async getQueryAndRange(row: LogRowModel, options?: LogRowContextOptions, origQuery?: DataQuery) {
     const direction = (options && options.direction) || LogRowContextQueryDirection.Backward;
-    const limit = (options && options.limit) || 10;
+    const limit = (options && options.limit) || this.datasource.maxLines;
 
     // This happens only on initial load, when user haven't applied any filters yet
     // We need to get the initial filters from the row labels
@@ -48,7 +44,27 @@ export class LogContextProvider {
       this.appliedContextFilters = filters;
     }
 
-    const { query, range } = await this.prepareLogRowContextQueryTarget(row, limit, direction, origQuery);
+    return await this.prepareLogRowContextQueryTarget(row, limit, direction, origQuery);
+  }
+
+  getLogRowContextQuery = async (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    origQuery?: DataQuery
+  ): Promise<LokiQuery> => {
+    const { query } = await this.getQueryAndRange(row, options, origQuery);
+
+    return query;
+  };
+
+  getLogRowContext = async (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    origQuery?: DataQuery
+  ): Promise<{ data: DataFrame[] }> => {
+    const direction = (options && options.direction) || LogRowContextQueryDirection.Backward;
+
+    const { query, range } = await this.getQueryAndRange(row, options, origQuery);
 
     const processResults = (result: DataQueryResponse): DataQueryResponse => {
       const frames: DataFrame[] = result.data;
@@ -101,6 +117,7 @@ export class LogContextProvider {
       refId: `${REF_ID_STARTER_LOG_ROW_CONTEXT}${row.dataFrame.refId || ''}`,
       maxLines: limit,
       direction: queryDirection,
+      datasource: { uid: this.datasource.uid, type: this.datasource.type },
     };
 
     const fieldCache = new FieldCache(row.dataFrame);
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 095abaa655e..0fc565b0b49 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -657,6 +657,14 @@ export class LokiDatasource
     return await this.logContextProvider.getLogRowContext(row, options, origQuery);
   };
 
+  getLogRowContextQuery = async (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    origQuery?: DataQuery
+  ): Promise<DataQuery> => {
+    return await this.logContextProvider.getLogRowContextQuery(row, options, origQuery);
+  };
+
   getLogRowContextUi(row: LogRowModel, runContextQuery: () => void, origQuery: DataQuery): React.ReactNode {
     return this.logContextProvider.getLogRowContextUi(row, runContextQuery, origQuery);
   }

From 1917857186197f40db93e2f580b216000c87aaa8 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Thu, 20 Apr 2023 13:23:04 +0100
Subject: [PATCH 280/729] docs: add migration guide and notes for upcoming
 react 18 upgrade (#66656)

* add information to what's new about upcoming react 18 upgrade

* update structure

* Apply suggestions from code review

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* add docs to plugin migration guide

* add link to forum discussion

* apply suggestions from review

---------

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
---
 .../migration-guide/v9.x-v10.x/_index.md      | 26 +++++++++++++++++++
 docs/sources/whatsnew/whats-new-in-v9-5.md    | 12 +++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 docs/sources/developers/plugins/migration-guide/v9.x-v10.x/_index.md

diff --git a/docs/sources/developers/plugins/migration-guide/v9.x-v10.x/_index.md b/docs/sources/developers/plugins/migration-guide/v9.x-v10.x/_index.md
new file mode 100644
index 00000000000..5e6fe5011d6
--- /dev/null
+++ b/docs/sources/developers/plugins/migration-guide/v9.x-v10.x/_index.md
@@ -0,0 +1,26 @@
+---
+description: Guide for migrating plugins from Grafana v9.x to v10.x
+keywords:
+  - grafana
+  - plugins
+  - migration
+  - plugin
+  - documentation
+title: Migrating plugins from Grafana 9.x to 10.x
+menutitle: v9.x to v10.x
+weight: 1900
+---
+
+# Migrating plugins from Grafana version 9.x to 10.x
+
+## Verifying plugin behaviour with React 18
+
+Grafana 10 includes our upgrade to React 18 and use of the new React client rendering API. These changes were delivered to the core `grafana` repo with [PR 64428](https://github.com/grafana/grafana/pull/64428).
+
+Whilst this brings us many significant benefits, there's a potential for this to impact the way your plugin works. In particular, there could be unintended side effects caused by the changes around improving consistency with `useEffect` timings and automatic batching of state updates.
+
+Recommended actions:
+
+- Review the React 18 [upgrade docs](https://react.dev/blog/2022/03/08/react-18-upgrade-guide)
+- Test your plugins against one of the latest [grafana-dev docker images](https://hub.docker.com/r/grafana/grafana-dev/tags?page=1) (for example, [this one](https://hub.docker.com/layers/grafana/grafana-dev/10.0.0-111404pre/images/sha256-ac78acf54b44bd2ce7e68b796b1df47030da7f35e53b02bc3eec3f4de05f780f?context=explore))
+- Add a comment to the [forum discussion](https://community.grafana.com/t/grafana-10-is-upgrading-to-react-18/86051) if your plugin is impacted in any way. Either to socialise the changes needed for your plugin or to reach out and ask for help yourself.
diff --git a/docs/sources/whatsnew/whats-new-in-v9-5.md b/docs/sources/whatsnew/whats-new-in-v9-5.md
index 443ba0de231..fb8139c7782 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-5.md
@@ -190,3 +190,15 @@ We updated the reporting UI to better fit the new navigation style, adding a hor
 _Experimental in Grafana Open Source and Enterprise._
 
 This feature adds support for using JWT tokens to store rendering keys instead of relying on “remote caching”. It covers most rendering use cases, though some still rely on the remote cache as a store. You can enable this by enabling the feature flag `renderAuthJWT` in the `custom.ini` configuration file.
+
+## Note for plugin developers
+
+One of the major changes coming in Grafana 10 will be our upgrade to React 18 and use of the new React client rendering API. There are many significant benefits we gain from this: access to new React features like [transitions](https://react.dev/reference/react/useTransition) and concurrent rendering, as well as other general performance and security improvements. These changes have now been delivered to the core `grafana` repo with [PR 64428](https://github.com/grafana/grafana/pull/64428).
+
+As with any major upgrade, there's a potential for this to impact the way your plugin works. In particular, there could be unintended side effects caused by the changes around improving consistency with `useEffect` timings and automatic batching of state updates.
+
+Recommended actions:
+
+- Review the React 18 [upgrade docs](https://react.dev/blog/2022/03/08/react-18-upgrade-guide)
+- Test your plugins against one of the latest [grafana-dev docker images](https://hub.docker.com/r/grafana/grafana-dev/tags?page=1) (for example, [this one](https://hub.docker.com/layers/grafana/grafana-dev/10.0.0-111404pre/images/sha256-ac78acf54b44bd2ce7e68b796b1df47030da7f35e53b02bc3eec3f4de05f780f?context=explore))
+- Add a comment to the [forum discussion](https://community.grafana.com/t/grafana-10-is-upgrading-to-react-18/86051) if your plugin is impacted in any way. Either to socialise the changes needed for your plugin or to reach out and ask for help yourself.

From bec18e390e41a5473af7f69e4fe106e2904ed005 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 20 Apr 2023 14:36:04 +0200
Subject: [PATCH 281/729] Log Context: Add feedback button (#66910)

* add feedback link

* add feedback button to `Modal.ButtonRow`
---
 .../log-context/LogRowContextModal.tsx        | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
index 18e54d5012b..92ffd38fc66 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -16,7 +16,7 @@ import {
 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { DataQuery, TimeZone } from '@grafana/schema';
-import { Button, LoadingBar, Modal, useTheme2 } from '@grafana/ui';
+import { Icon, Button, LoadingBar, Modal, useTheme2 } from '@grafana/ui';
 import { dataFrameToLogsModel } from 'app/core/logsModel';
 import store from 'app/core/store';
 import { splitOpen } from 'app/features/explore/state/main';
@@ -93,6 +93,13 @@ const getStyles = (theme: GrafanaTheme2) => {
     paddingBottom: css`
       padding-bottom: ${theme.spacing(1)};
     `,
+    link: css`
+      color: ${theme.colors.text.secondary};
+      font-size: ${theme.typography.bodySmall.fontSize};
+      :hover {
+        color: ${theme.colors.text.link};
+      }
+    `,
   };
 };
 
@@ -327,8 +334,18 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
           Showing {context.before.length} lines {logsSortOrder === LogsSortOrder.Descending ? 'after' : 'before'} match.
         </div>
       </div>
-      {contextQuery?.datasource?.uid && (
-        <Modal.ButtonRow>
+
+      <Modal.ButtonRow>
+        <a
+          href="https://forms.gle/Tsk4pN7vD95aBRbb7"
+          className={styles.link}
+          title="We recently reworked the Log Context UI, please let us know how we can further improve it."
+          target="_blank"
+          rel="noreferrer noopener"
+        >
+          <Icon name="comment-alt-message" /> Give feedback
+        </a>
+        {contextQuery?.datasource?.uid && (
           <Button
             variant="secondary"
             onClick={async () => {
@@ -344,8 +361,8 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
           >
             Open in split view
           </Button>
-        </Modal.ButtonRow>
-      )}
+        )}
+      </Modal.ButtonRow>
     </Modal>
   );
 };

From 78d7b6c0c9faf66253bc8df20207160f0b98f038 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 20 Apr 2023 14:34:35 +0100
Subject: [PATCH 282/729] NestedFolders: Backend nested-dashboards route
 (#66955)

* NestedFolders: Add backend route for temp browse dashboards page

* tweak 'preview new ui' badge

* tweak 'preview new ui' badge
---
 pkg/api/api.go                                            | 6 ++++++
 .../app/features/search/components/DashboardListPage.tsx  | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 8a2a093fe8a..8f3c59cf7e5 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -152,6 +152,12 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/dashboards/*", reqSignedIn, hs.Index)
 	r.Get("/goto/:uid", reqSignedIn, hs.redirectFromShortURL, hs.Index)
 
+	// Temporary routes for the work-in-progress new Browse Dashboards views
+	if hs.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
+		r.Get("/nested-dashboards/", reqSignedIn, hs.Index)
+		r.Get("/nested-dashboards/*", reqSignedIn, hs.Index)
+	}
+
 	if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) {
 		// list public dashboards
 		r.Get("/public-dashboards/list", reqSignedIn, hs.Index)
diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx
index 12bdd25350f..5f018a14708 100644
--- a/public/app/features/search/components/DashboardListPage.tsx
+++ b/public/app/features/search/components/DashboardListPage.tsx
@@ -4,7 +4,7 @@ import { useAsync } from 'react-use';
 
 import { locationUtil, NavModelItem } from '@grafana/data';
 import { config, locationService } from '@grafana/runtime';
-import { Badge, Link } from '@grafana/ui';
+import { Badge, Link, Tooltip } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { FolderDTO } from 'app/types';
 
@@ -47,7 +47,11 @@ export const DashboardListPage = memo(({ match, location }: Props) => {
       actions={
         config.featureToggles.nestedFolders && (
           <Link href="/nested-dashboards">
-            <Badge icon="folder" color="blue" text="Try WIP nested folders UI" />
+            <Tooltip content="New Browse Dashboards for nested folders is still under development and may be missing features">
+              <span>
+                <Badge icon="folder" color="blue" text="Preview new Browse Dashboards" />
+              </span>
+            </Tooltip>
           </Link>
         )
       }

From 35342a3c76f483826e03b6f3bf89d9fef4983a2f Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Thu, 20 Apr 2023 14:38:20 +0100
Subject: [PATCH 283/729] Alerting: Fix DatasourceUID and RefID missing for
 DatasourceNoData alerts (#66733)

This commit fixes a bug where DatasourceUID and RefID annotations are
missing for DatasourceNoData alerts in Grafana 9.5. This bug affects
datasource plugins that have moved to using the data plane contract.
---
 pkg/services/ngalert/eval/eval.go      | 23 ++++++++++++++++++-----
 pkg/services/ngalert/eval/eval_test.go | 20 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/pkg/services/ngalert/eval/eval.go b/pkg/services/ngalert/eval/eval.go
index 8311dea2bee..3a0f2313158 100644
--- a/pkg/services/ngalert/eval/eval.go
+++ b/pkg/services/ngalert/eval/eval.go
@@ -321,14 +321,27 @@ func queryDataResponseToExecutionResults(c models.Condition, execResp *backend.Q
 
 	result := ExecutionResults{Results: make(map[string]data.Frames)}
 	for refID, res := range execResp.Responses {
-		if len(res.Frames) == 0 {
-			// to ensure that NoData is consistent with Results we do not initialize NoData
-			// unless there is at least one RefID that returned no data
+		// There are two possible frame formats for No Data:
+		//
+		// 1. A response with no frames
+		// 2. A response with 1 frame but no fields
+		//
+		// The first format is not documented in the data plane contract but needs to be
+		// supported for older datasource plugins. The second format is documented in
+		// https://github.com/grafana/grafana-plugin-sdk-go/blob/main/data/contract_docs/contract.md
+		// and is what datasource plugins should use going forward.
+		if len(res.Frames) <= 1 {
+			// To make sure NoData is nil when Results are also nil we wait to initialize
+			// NoData until there is at least one query or expression that returned no data
 			if result.NoData == nil {
 				result.NoData = make(map[string]string)
 			}
-			if s, ok := datasourceUIDsForRefIDs[refID]; ok && s != datasourceExprUID {
-				result.NoData[refID] = s
+			hasNoFrames := len(res.Frames) == 0
+			hasNoFields := len(res.Frames) == 1 && len(res.Frames[0].Fields) == 0
+			if hasNoFrames || hasNoFields {
+				if s, ok := datasourceUIDsForRefIDs[refID]; ok && s != datasourceExprUID {
+					result.NoData[refID] = s
+				}
 			}
 		}
 
diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go
index 3d1eb8cb620..5708bfe927e 100644
--- a/pkg/services/ngalert/eval/eval_test.go
+++ b/pkg/services/ngalert/eval/eval_test.go
@@ -575,6 +575,26 @@ func TestEvaluate(t *testing.T) {
 				"ref_id":         "A",
 			},
 		}},
+	}, {
+		name: "is no data for one frame with no fields",
+		cond: models.Condition{
+			Data: []models.AlertQuery{{
+				RefID:         "A",
+				DatasourceUID: "test",
+			}},
+		},
+		resp: backend.QueryDataResponse{
+			Responses: backend.Responses{
+				"A": {Frames: []*data.Frame{{Fields: nil}}},
+			},
+		},
+		expected: Results{{
+			State: NoData,
+			Instance: data.Labels{
+				"datasource_uid": "test",
+				"ref_id":         "A",
+			},
+		}},
 	}}
 
 	for _, tc := range cases {

From c903d1546f97c014ba2630209251238f144fd8fc Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 20 Apr 2023 15:42:44 +0200
Subject: [PATCH 284/729] Log Context: Add feature tracking (#66912)

add feature tracking
---
 public/app/features/explore/Logs.tsx                 |  8 ++++++++
 .../components/log-context/LogRowContextModal.tsx    | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index 41dd9d50c13..bf96418700a 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -313,11 +313,19 @@ class UnthemedLogs extends PureComponent<Props, State> {
       contextOpen: true,
       contextRow: row,
     });
+    reportInteraction('grafana_explore_logs_log_context_opened', {
+      datasourceType: row.datasourceType,
+      logRowUid: row.uid,
+    });
     this.onCloseContext = () => {
       this.setState({
         contextOpen: false,
         contextRow: undefined,
       });
+      reportInteraction('grafana_explore_logs_log_context_closed', {
+        datasourceType: row.datasourceType,
+        logRowUid: row.uid,
+      });
       onClose();
     };
   };
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
index 92ffd38fc66..4f30b7e1657 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -14,7 +14,7 @@ import {
   SelectableValue,
   rangeUtil,
 } from '@grafana/data';
-import { config } from '@grafana/runtime';
+import { config, reportInteraction } from '@grafana/runtime';
 import { DataQuery, TimeZone } from '@grafana/schema';
 import { Icon, Button, LoadingBar, Modal, useTheme2 } from '@grafana/ui';
 import { dataFrameToLogsModel } from 'app/core/logsModel';
@@ -342,6 +342,12 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
           title="We recently reworked the Log Context UI, please let us know how we can further improve it."
           target="_blank"
           rel="noreferrer noopener"
+          onClick={() => {
+            reportInteraction('grafana_explore_logs_log_context_give_feedback_clicked', {
+              datasourceType: row.datasourceType,
+              logRowUid: row.uid,
+            });
+          }}
         >
           <Icon name="comment-alt-message" /> Give feedback
         </a>
@@ -357,6 +363,10 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
                 })
               );
               onClose();
+              reportInteraction('grafana_explore_logs_log_context_open_split_view_clicked', {
+                datasourceType: row.datasourceType,
+                logRowUid: row.uid,
+              });
             }}
           >
             Open in split view

From 7e765c870a41eb99c862f14c947249dc3f36da78 Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@grafana.com>
Date: Fri, 21 Apr 2023 00:24:02 +1000
Subject: [PATCH 285/729] Utils: Reimplement util.GetRandomString to avoid
 modulo bias (#64481)

* reimplement GetRandomString, add tests that results are unbiased
---
 pkg/util/encoding.go      | 43 +++++++++++++------
 pkg/util/encoding_test.go | 87 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 13 deletions(-)

diff --git a/pkg/util/encoding.go b/pkg/util/encoding.go
index 853ad7a7e34..159f7255b5a 100644
--- a/pkg/util/encoding.go
+++ b/pkg/util/encoding.go
@@ -13,22 +13,39 @@ import (
 	"golang.org/x/crypto/pbkdf2"
 )
 
-// GetRandomString generate random string by specify chars.
-// source: https://github.com/gogits/gogs/blob/9ee80e3e5426821f03a4e99fad34418f5c736413/modules/base/tool.go#L58
-func GetRandomString(n int, alphabets ...byte) (string, error) {
-	const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-	var bytes = make([]byte, n)
-	if _, err := rand.Read(bytes); err != nil {
-		return "", err
-	}
+const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 
-	for i, b := range bytes {
-		if len(alphabets) == 0 {
-			bytes[i] = alphanum[b%byte(len(alphanum))]
-		} else {
-			bytes[i] = alphabets[b%byte(len(alphabets))]
+// GetRandomString generates a random alphanumeric string of the specified length,
+// optionally using only specified characters
+func GetRandomString(n int, alphabets ...byte) (string, error) {
+	chars := alphanum
+	if len(alphabets) > 0 {
+		chars = string(alphabets)
+	}
+	cnt := len(chars)
+	max := 255 / cnt * cnt
+
+	bytes := make([]byte, n)
+
+	randread := n * 5 / 4
+	randbytes := make([]byte, randread)
+
+	for i := 0; i < n; {
+		if _, err := rand.Read(randbytes); err != nil {
+			return "", err
+		}
+
+		for j := 0; i < n && j < randread; j++ {
+			b := int(randbytes[j])
+			if b >= max {
+				continue
+			}
+
+			bytes[i] = chars[b%cnt]
+			i++
 		}
 	}
+
 	return string(bytes), nil
 }
 
diff --git a/pkg/util/encoding_test.go b/pkg/util/encoding_test.go
index 4bb5f345ca3..30d41152833 100644
--- a/pkg/util/encoding_test.go
+++ b/pkg/util/encoding_test.go
@@ -1,6 +1,7 @@
 package util
 
 import (
+	"math"
 	"strings"
 	"testing"
 
@@ -130,3 +131,89 @@ func TestDecodeQuotedPrintable(t *testing.T) {
 		assert.Equal(t, str_out, val)
 	})
 }
+
+func TestGetRandomString(t *testing.T) {
+	charset := "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+	chars := len(charset)
+	length := 20
+	rounds := 50_000
+
+	// Generate random strings and count the frequency of each character
+	m := make(map[string]int)
+	for i := 0; i < rounds; i++ {
+		r, err := GetRandomString(length)
+		require.NoError(t, err)
+
+		for _, c := range r {
+			m[string(c)]++
+		}
+	}
+
+	// Find lowest and highest frequencies
+	min := rounds * length
+	max := 0
+
+	// Calculate chi-squared statistic
+	expected := float64(rounds) * float64(length) / float64(chars)
+	chiSquared := 0.0
+
+	for _, char := range charset {
+		if m[string(char)] < min {
+			min = m[string(char)]
+		}
+		if m[string(char)] > max {
+			max = m[string(char)]
+		}
+		chiSquared += math.Pow(float64(m[string(char)])-expected, 2) / expected
+	}
+
+	// Ensure there is no more than 10% variance between lowest and highest frequency characters
+	assert.LessOrEqual(t, float64(max-min)/float64(min), 0.1, "Variance between lowest and highest frequency characters must be no more than 10%")
+
+	// Ensure chi-squared value is lower than the critical bound
+	// 99.99% probability for 61 degrees of freedom
+	assert.Less(t, chiSquared, 110.8397, "Chi squared value must be less than the 99.99% critical bound")
+}
+
+func TestGetRandomDigits(t *testing.T) {
+	charset := "0123456789"
+	chars := len(charset)
+	length := 20
+	rounds := 50_000
+
+	// Generate random strings and count the frequency of each character
+	m := make(map[string]int)
+	for i := 0; i < rounds; i++ {
+		r, err := GetRandomString(length, []byte(charset)...)
+		require.NoError(t, err)
+
+		for _, c := range r {
+			m[string(c)]++
+		}
+	}
+
+	// Find lowest and highest frequencies
+	min := rounds * length
+	max := 0
+
+	// Calculate chi-squared statistic
+	expected := float64(rounds) * float64(length) / float64(chars)
+	chiSquared := 0.0
+
+	for _, char := range charset {
+		if m[string(char)] < min {
+			min = m[string(char)]
+		}
+		if m[string(char)] > max {
+			max = m[string(char)]
+		}
+		chiSquared += math.Pow(float64(m[string(char)])-expected, 2) / expected
+	}
+
+	// Ensure there is no more than 10% variance between lowest and highest frequency characters
+	assert.LessOrEqual(t, float64(max-min)/float64(min), 0.1, "Variance between lowest and highest frequency characters must be no more than 10%")
+
+	// Ensure chi-squared value is lower than the critical bound
+	// 99.99% probability for 9 degrees of freedom
+	assert.Less(t, chiSquared, 33.7199, "Chi squared value must be less than the 99.99% critical bound")
+}

From 2f0f5ca09e7f79b5136ada9070b93a4d20b8114d Mon Sep 17 00:00:00 2001
From: Polina Boneva <13227501+polibb@users.noreply.github.com>
Date: Thu, 20 Apr 2023 17:35:29 +0300
Subject: [PATCH 286/729] [Chore] Dashboard: Add i18n for creating a panel,
 row, library panel, and pasted panel (#66234)

* add translation keys for empty dashboard redesign

* run yarn i18n:extract; rephrase one trans key because of [warning] Found translation key already mapped to a map or parent of new key already mapped to a string: dashboard.toolbar.add.visualization

* reduce to 3-step locale phrase IDs

* extract phrase IDs
---
 .../AddLibraryPanelWidget.tsx                 |  5 ++-
 .../AddPanelButton/AddPanelButton.tsx         |  3 +-
 .../AddPanelButton/AddPanelMenu.tsx           |  9 +++--
 .../dashboard/dashgrid/DashboardEmpty.tsx     | 31 ++++++++++-----
 public/locales/de-DE/grafana.json             | 38 ++++++++++++-------
 public/locales/en-US/grafana.json             | 38 ++++++++++++-------
 public/locales/es-ES/grafana.json             | 38 ++++++++++++-------
 public/locales/fr-FR/grafana.json             | 38 ++++++++++++-------
 public/locales/pseudo-LOCALE/grafana.json     | 38 ++++++++++++-------
 public/locales/zh-Hans/grafana.json           | 38 ++++++++++++-------
 10 files changed, 182 insertions(+), 94 deletions(-)

diff --git a/public/app/features/dashboard/components/AddLibraryPanelWidget/AddLibraryPanelWidget.tsx b/public/app/features/dashboard/components/AddLibraryPanelWidget/AddLibraryPanelWidget.tsx
index befdbbc235d..1f93101f57b 100644
--- a/public/app/features/dashboard/components/AddLibraryPanelWidget/AddLibraryPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddLibraryPanelWidget/AddLibraryPanelWidget.tsx
@@ -5,6 +5,7 @@ import tinycolor from 'tinycolor2';
 import { GrafanaTheme2 } from '@grafana/data';
 import { LibraryPanel } from '@grafana/schema';
 import { IconButton, useStyles2 } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
 
 import {
   LibraryPanelsSearch,
@@ -42,7 +43,9 @@ export const AddLibraryPanelWidget = ({ panel, dashboard }: Props) => {
     <div className={styles.wrapper}>
       <div className={cx('panel-container', styles.callToAction)}>
         <div className={cx(styles.headerRow, 'grid-drag-handle')}>
-          <span>Add panel from panel library</span>
+          <span>
+            <Trans i18nKey="library-panel.add-widget.title">Add panel from panel library</Trans>
+          </span>
           <div className="flex-grow-1" />
           <IconButton aria-label="Close 'Add Panel' widget" name="times" onClick={onCancelAddPanel} />
         </div>
diff --git a/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx b/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
index a5f77e79c30..0352cfdd282 100644
--- a/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
+++ b/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
@@ -4,6 +4,7 @@ import React, { useState } from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Dropdown, Button, useTheme2, Icon } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
 import { DashboardModel } from 'app/features/dashboard/state';
 
 import { AddPanelMenu } from './AddPanelMenu';
@@ -30,7 +31,7 @@ export const AddPanelButton = ({ dashboard }: Props) => {
         className={cx(styles.button, styles.buttonIcon, styles.buttonText)}
         data-testid={selectors.components.PageToolbar.itemButton('Add panel button')}
       >
-        Add
+        <Trans i18nKey="dashboard.toolbar.add">Add</Trans>
         <Icon name={isMenuOpen ? 'angle-up' : 'angle-down'} size="lg" />
       </Button>
     </Dropdown>
diff --git a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
index 60a7205d589..e4c636bf0b2 100644
--- a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
+++ b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
@@ -3,6 +3,7 @@ import React, { useMemo } from 'react';
 import { selectors } from '@grafana/e2e-selectors';
 import { locationService, reportInteraction } from '@grafana/runtime';
 import { Menu } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 import { DashboardModel } from 'app/features/dashboard/state';
 import {
   getCopiedPanelPlugin,
@@ -23,7 +24,7 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
     <Menu>
       <Menu.Item
         key="add-visualisation"
-        label="Visualization"
+        label={t('dashboard.add-menu.visualization', 'Visualization')}
         testId={selectors.components.PageToolbar.itemButton('Add new visualization menu item')}
         onClick={() => {
           reportInteraction('Create new panel');
@@ -33,7 +34,7 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
       />
       <Menu.Item
         key="add-row"
-        label="Row"
+        label={t('dashboard.add-menu.row', 'Row')}
         testId={selectors.components.PageToolbar.itemButton('Add new row menu item')}
         onClick={() => {
           reportInteraction('Create new row');
@@ -42,7 +43,7 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
       />
       <Menu.Item
         key="add-panel-lib"
-        label="Import from library"
+        label={t('dashboard.add-menu.import', 'Import from library')}
         testId={selectors.components.PageToolbar.itemButton('Add new panel from panel library menu item')}
         onClick={() => {
           reportInteraction('Add a panel from the panel library');
@@ -51,7 +52,7 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
       />
       <Menu.Item
         key="add-panel-clipboard"
-        label="Paste panel"
+        label={t('dashboard.add-menu.paste-panel', 'Paste panel')}
         testId={selectors.components.PageToolbar.itemButton('Add new panel from clipboard menu item')}
         onClick={() => {
           reportInteraction('Paste panel from clipboard');
diff --git a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
index e9a7f988c9b..62223b15cf1 100644
--- a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { locationService, reportInteraction } from '@grafana/runtime';
 import { Button, useStyles2 } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { onAddLibraryPanel, onCreateNewPanel, onCreateNewRow } from 'app/features/dashboard/utils/dashboard';
 
@@ -20,11 +21,15 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
       <div className={cx(styles.centeredContent, styles.wrapper)}>
         <div className={cx(styles.containerBox, styles.centeredContent, styles.visualizationContainer)}>
           <h1 className={cx(styles.headerSection, styles.headerBig)}>
-            Start your new dashboard by adding a visualization
+            <Trans i18nKey="dashboard.empty.add-visualization-header">
+              Start your new dashboard by adding a visualization
+            </Trans>
           </h1>
           <div className={cx(styles.bodySection, styles.bodyBig)}>
-            Select a data source and then query and visualize your data with charts, stats and tables or create lists,
-            markdowns and other widgets.
+            <Trans i18nKey="dashboard.empty.add-visualization-body">
+              Select a data source and then query and visualize your data with charts, stats and tables or create lists,
+              markdowns and other widgets.
+            </Trans>
           </div>
           <Button
             size="lg"
@@ -37,14 +42,16 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
             }}
             disabled={!canCreate}
           >
-            Add visualization
+            <Trans i18nKey="dashboard.empty.add-visualization-button">Add visualization</Trans>
           </Button>
         </div>
         <div className={cx(styles.centeredContent, styles.others)}>
           <div className={cx(styles.containerBox, styles.centeredContent, styles.rowContainer)}>
-            <h3 className={cx(styles.headerSection, styles.headerSmall)}>Add a row</h3>
+            <h3 className={cx(styles.headerSection, styles.headerSmall)}>
+              <Trans i18nKey="dashboard.empty.add-row-header">Add a row</Trans>
+            </h3>
             <div className={cx(styles.bodySection, styles.bodySmall)}>
-              Group your visualizations into expandable sections.
+              <Trans i18nKey="dashboard.empty.add-row-body">Group your visualizations into expandable sections.</Trans>
             </div>
             <Button
               icon="plus"
@@ -56,13 +63,17 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
               }}
               disabled={!canCreate}
             >
-              Add row
+              <Trans i18nKey="dashboard.empty.add-row-button">Add row</Trans>
             </Button>
           </div>
           <div className={cx(styles.containerBox, styles.centeredContent, styles.libraryContainer)}>
-            <h3 className={cx(styles.headerSection, styles.headerSmall)}>Import panel</h3>
+            <h3 className={cx(styles.headerSection, styles.headerSmall)}>
+              <Trans i18nKey="dashboard.empty.add-import-header">Import panel</Trans>
+            </h3>
             <div className={cx(styles.bodySection, styles.bodySmall)}>
-              Import visualizations that are shared with other dashboards.
+              <Trans i18nKey="dashboard.empty.add-import-body">
+                Import visualizations that are shared with other dashboards.
+              </Trans>
             </div>
             <Button
               icon="plus"
@@ -74,7 +85,7 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
               }}
               disabled={!canCreate}
             >
-              Import library panel
+              <Trans i18nKey="dashboard.empty.add-import-button">Import library panel</Trans>
             </Button>
           </div>
         </div>
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 1363c933979..a42b6ef2842 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -30,6 +30,23 @@
     "save": "Speichern"
   },
   "dashboard": {
+    "add-menu": {
+      "import": "",
+      "paste-panel": "",
+      "row": "",
+      "visualization": ""
+    },
+    "empty": {
+      "add-import-body": "",
+      "add-import-button": "",
+      "add-import-header": "",
+      "add-row-body": "",
+      "add-row-button": "",
+      "add-row-header": "",
+      "add-visualization-body": "",
+      "add-visualization-button": "",
+      "add-visualization-header": ""
+    },
     "inspect": {
       "data-tab": "Daten",
       "error-tab": "Fehler",
@@ -75,6 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "Statistiken zu Datenquellen",
+      "data-traceids": "",
       "processing-time": "Datenverarbeitungszeit",
       "queries": "Anzahl der Abfragen",
       "request-time": "Gesamte Anfragezeit",
@@ -82,6 +100,7 @@
       "table-title": "Statistiken"
     },
     "toolbar": {
+      "add": "",
       "add-panel": "Panel hinzufügen",
       "mark-favorite": "Als Favorit markieren",
       "open-original": "Original-Dashboard öffnen",
@@ -92,7 +111,6 @@
       "save": "Dashboard speichern",
       "settings": "Dashboard-Einstellungen",
       "share": "Dashboard oder Panel teilen",
-      "tv-button": "Zyklus-Ansichtsmodus",
       "unmark-favorite": "Markierung als Favorit entfernen"
     }
   },
@@ -123,6 +141,9 @@
       "folder": "In Ordner speichern",
       "folder-description": "Berechtigungen des Bibliotheks-Panels werden von den Ordnerberechtigungen übernommen",
       "name": "Name des Bibliotheks-Panels"
+    },
+    "add-widget": {
+      "title": ""
     }
   },
   "library-panels": {
@@ -185,8 +206,7 @@
       "title": "Apps"
     },
     "config": {
-      "title": "Verwaltung",
-      "titleBeforeTopnav": "Konfiguration"
+      "title": "Verwaltung"
     },
     "correlations": {
       "subtitle": "Füge Korrelationen hinzu und konfiguriere sie",
@@ -224,8 +244,7 @@
     },
     "global-users": {
       "subtitle": "Benutzer in Grafana verwalten",
-      "title": "Benutzer",
-      "titleBeforeTopnav": "Benutzer"
+      "title": "Benutzer"
     },
     "help": {
       "title": "Hilfe"
@@ -241,9 +260,6 @@
       "subtitle": "Wiederverwendbare Panels, die zu mehreren Dashboards hinzugefügt werden können",
       "title": "Bibliotheks-Panels"
     },
-    "manage-dashboards": {
-      "title": "Durchsuchen"
-    },
     "manage-folder": {
       "subtitle": ""
     },
@@ -262,8 +278,7 @@
     },
     "org-settings": {
       "subtitle": "Verwalte Einstellungen in der gesamten Organisation",
-      "title": "Standardeinstellungen",
-      "titleBeforeTopnav": "Einstellungen"
+      "title": "Standardeinstellungen"
     },
     "playlists": {
       "subtitle": "Gruppen von Dashboards, die in einer bestimmten Reihenfolge angezeigt werden",
@@ -282,7 +297,6 @@
     "profile/settings": {
       "title": "Profil"
     },
-    "profile/switch-org": "Organisation wechseln",
     "public": {
       "title": ""
     },
@@ -303,7 +317,6 @@
       "subtitle": "Verwende Servicekonten, um automatisierte Arbeitsabläufe in Grafana auszuführen",
       "title": "Servicekonten"
     },
-    "sign-in": "Anmelden",
     "sign-out": {
       "title": "Abmelden"
     },
@@ -399,7 +412,6 @@
       "sort-placeholder": "",
       "starred": "Hervorgehoben",
       "view-as-folders": "",
-      "view-as-grid": "",
       "view-as-list": ""
     },
     "dashboard-actions": {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index a545f7f697a..b5c1856b3ec 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -30,6 +30,23 @@
     "save": "Save"
   },
   "dashboard": {
+    "add-menu": {
+      "import": "Import from library",
+      "paste-panel": "Paste panel",
+      "row": "Row",
+      "visualization": "Visualization"
+    },
+    "empty": {
+      "add-import-body": "Import visualizations that are shared with other dashboards.",
+      "add-import-button": "Import library panel",
+      "add-import-header": "Import panel",
+      "add-row-body": "Group your visualizations into expandable sections.",
+      "add-row-button": "Add row",
+      "add-row-header": "Add a row",
+      "add-visualization-body": "Select a data source and then query and visualize your data with charts, stats and tables or create lists, markdowns and other widgets.",
+      "add-visualization-button": "Add visualization",
+      "add-visualization-header": "Start your new dashboard by adding a visualization"
+    },
     "inspect": {
       "data-tab": "Data",
       "error-tab": "Error",
@@ -75,6 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "Data source stats",
+      "data-traceids": "Trace IDs",
       "processing-time": "Data processing time",
       "queries": "Number of queries",
       "request-time": "Total request time",
@@ -82,6 +100,7 @@
       "table-title": "Stats"
     },
     "toolbar": {
+      "add": "Add",
       "add-panel": "Add panel",
       "mark-favorite": "Mark as favorite",
       "open-original": "Open original dashboard",
@@ -92,7 +111,6 @@
       "save": "Save dashboard",
       "settings": "Dashboard settings",
       "share": "Share dashboard or panel",
-      "tv-button": "Cycle view mode",
       "unmark-favorite": "Unmark as favorite"
     }
   },
@@ -123,6 +141,9 @@
       "folder": "Save in folder",
       "folder-description": "Library panel permissions are derived from the folder permissions",
       "name": "Library panel name"
+    },
+    "add-widget": {
+      "title": "Add panel from panel library"
     }
   },
   "library-panels": {
@@ -185,8 +206,7 @@
       "title": "Apps"
     },
     "config": {
-      "title": "Administration",
-      "titleBeforeTopnav": "Configuration"
+      "title": "Administration"
     },
     "correlations": {
       "subtitle": "Add and configure correlations",
@@ -224,8 +244,7 @@
     },
     "global-users": {
       "subtitle": "Manage users in Grafana",
-      "title": "Users",
-      "titleBeforeTopnav": "Users"
+      "title": "Users"
     },
     "help": {
       "title": "Help"
@@ -241,9 +260,6 @@
       "subtitle": "Reusable panels that can be added to multiple dashboards",
       "title": "Library panels"
     },
-    "manage-dashboards": {
-      "title": "Browse"
-    },
     "manage-folder": {
       "subtitle": "Manage folder dashboards and permissions"
     },
@@ -262,8 +278,7 @@
     },
     "org-settings": {
       "subtitle": "Manage preferences across an organization",
-      "title": "Default preferences",
-      "titleBeforeTopnav": "Preferences"
+      "title": "Default preferences"
     },
     "playlists": {
       "subtitle": "Groups of dashboards that are displayed in a sequence",
@@ -282,7 +297,6 @@
     "profile/settings": {
       "title": "Profile"
     },
-    "profile/switch-org": "Switch organization",
     "public": {
       "title": "Public dashboards"
     },
@@ -303,7 +317,6 @@
       "subtitle": "Use service accounts to run automated workloads in Grafana",
       "title": "Service accounts"
     },
-    "sign-in": "Sign in",
     "sign-out": {
       "title": "Sign out"
     },
@@ -399,7 +412,6 @@
       "sort-placeholder": "Sort",
       "starred": "Starred",
       "view-as-folders": "View by folders",
-      "view-as-grid": "Grid view",
       "view-as-list": "View as list"
     },
     "dashboard-actions": {
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index b6b46e9b5c3..6f68b2c9163 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -30,6 +30,23 @@
     "save": "Guardar"
   },
   "dashboard": {
+    "add-menu": {
+      "import": "",
+      "paste-panel": "",
+      "row": "",
+      "visualization": ""
+    },
+    "empty": {
+      "add-import-body": "",
+      "add-import-button": "",
+      "add-import-header": "",
+      "add-row-body": "",
+      "add-row-button": "",
+      "add-row-header": "",
+      "add-visualization-body": "",
+      "add-visualization-button": "",
+      "add-visualization-header": ""
+    },
     "inspect": {
       "data-tab": "Datos",
       "error-tab": "Error",
@@ -75,6 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "Estadísticas de origen de datos",
+      "data-traceids": "",
       "processing-time": "Tiempo de procesamiento de datos",
       "queries": "Número de consultas",
       "request-time": "Tiempo total de solicitud",
@@ -82,6 +100,7 @@
       "table-title": "Estadísticas"
     },
     "toolbar": {
+      "add": "",
       "add-panel": "Añadir panel",
       "mark-favorite": "Marcar como favorito",
       "open-original": "Abrir el panel de control original",
@@ -92,7 +111,6 @@
       "save": "Guardar panel de control",
       "settings": "Ajustes del panel de control",
       "share": "Compartir panel o panel de control",
-      "tv-button": "Alternar entre los modos de vista",
       "unmark-favorite": "Deshacer marca como favorito"
     }
   },
@@ -123,6 +141,9 @@
       "folder": "Guardar en carpeta",
       "folder-description": "Los permisos del panel de librería se derivan de los permisos de la carpeta",
       "name": "Nombre del panel de librería"
+    },
+    "add-widget": {
+      "title": ""
     }
   },
   "library-panels": {
@@ -185,8 +206,7 @@
       "title": "Aplicaciones"
     },
     "config": {
-      "title": "Administración",
-      "titleBeforeTopnav": "Configuración"
+      "title": "Administración"
     },
     "correlations": {
       "subtitle": "Añadir y configurar correlaciones",
@@ -224,8 +244,7 @@
     },
     "global-users": {
       "subtitle": "Gestionar usuarios de Grafana",
-      "title": "Usuarios",
-      "titleBeforeTopnav": "Usuarios"
+      "title": "Usuarios"
     },
     "help": {
       "title": "Ayuda"
@@ -241,9 +260,6 @@
       "subtitle": "Paneles reutilizables que se pueden añadir a varios paneles de control",
       "title": "Paneles de librería"
     },
-    "manage-dashboards": {
-      "title": "Navegar"
-    },
     "manage-folder": {
       "subtitle": ""
     },
@@ -262,8 +278,7 @@
     },
     "org-settings": {
       "subtitle": "Gestionar las preferencias en una organización",
-      "title": "Preferencias por defecto",
-      "titleBeforeTopnav": "Preferencias"
+      "title": "Preferencias por defecto"
     },
     "playlists": {
       "subtitle": "Grupos de paneles de control que se muestran en una secuencia",
@@ -282,7 +297,6 @@
     "profile/settings": {
       "title": "Perfil"
     },
-    "profile/switch-org": "Cambiar de organización",
     "public": {
       "title": ""
     },
@@ -303,7 +317,6 @@
       "subtitle": "Use cuentas de servicio para ejecutar cargas de trabajo automatizadas en Grafana",
       "title": "Cuentas de servicios"
     },
-    "sign-in": "Iniciar sesión",
     "sign-out": {
       "title": "Cerrar sesión"
     },
@@ -399,7 +412,6 @@
       "sort-placeholder": "",
       "starred": "Destacado",
       "view-as-folders": "",
-      "view-as-grid": "",
       "view-as-list": ""
     },
     "dashboard-actions": {
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 810359fe7de..a25d4e8a0f8 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -30,6 +30,23 @@
     "save": "Enregistrer"
   },
   "dashboard": {
+    "add-menu": {
+      "import": "",
+      "paste-panel": "",
+      "row": "",
+      "visualization": ""
+    },
+    "empty": {
+      "add-import-body": "",
+      "add-import-button": "",
+      "add-import-header": "",
+      "add-row-body": "",
+      "add-row-button": "",
+      "add-row-header": "",
+      "add-visualization-body": "",
+      "add-visualization-button": "",
+      "add-visualization-header": ""
+    },
     "inspect": {
       "data-tab": "Données",
       "error-tab": "Erreur",
@@ -75,6 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "Statistiques de source de données",
+      "data-traceids": "",
       "processing-time": "Durée de traitement des données",
       "queries": "Nombre de requêtes",
       "request-time": "Durée totale de la requête",
@@ -82,6 +100,7 @@
       "table-title": "Statistiques"
     },
     "toolbar": {
+      "add": "",
       "add-panel": "Ajouter un panneau",
       "mark-favorite": "Marquer comme favori",
       "open-original": "Ouvrir le tableau de bord d'origine",
@@ -92,7 +111,6 @@
       "save": "Enregistrer le tableau de bord",
       "settings": "Paramètres du tableau de bord",
       "share": "Partager le tableau de bord ou le panneau",
-      "tv-button": "Mode de vue par cycle",
       "unmark-favorite": "Supprimer des favoris"
     }
   },
@@ -123,6 +141,9 @@
       "folder": "Enregistrer dans le dossier",
       "folder-description": "Les autorisations du panneau de bibliothèque sont dérivées des autorisations du dossier",
       "name": "Nom du panneau de bibliothèque"
+    },
+    "add-widget": {
+      "title": ""
     }
   },
   "library-panels": {
@@ -185,8 +206,7 @@
       "title": "Applications"
     },
     "config": {
-      "title": "Administration",
-      "titleBeforeTopnav": "Configuration"
+      "title": "Administration"
     },
     "correlations": {
       "subtitle": "Ajouter et configurer des corrélations",
@@ -224,8 +244,7 @@
     },
     "global-users": {
       "subtitle": "Gérer les utilisateurs dans Grafana",
-      "title": "Utilisateurs",
-      "titleBeforeTopnav": "Utilisateurs"
+      "title": "Utilisateurs"
     },
     "help": {
       "title": "Aide"
@@ -241,9 +260,6 @@
       "subtitle": "Panneaux réutilisables pouvant être ajoutés à plusieurs tableaux de bord",
       "title": "Panneaux de bibliothèque"
     },
-    "manage-dashboards": {
-      "title": "Parcourir"
-    },
     "manage-folder": {
       "subtitle": ""
     },
@@ -262,8 +278,7 @@
     },
     "org-settings": {
       "subtitle": "Gérer les préférences au sein d'une organisation",
-      "title": "Préférences par défaut",
-      "titleBeforeTopnav": "Préférences"
+      "title": "Préférences par défaut"
     },
     "playlists": {
       "subtitle": "Groupes de tableaux de bord affichés dans une séquence",
@@ -282,7 +297,6 @@
     "profile/settings": {
       "title": "Profil"
     },
-    "profile/switch-org": "Passer à une autre organisation",
     "public": {
       "title": ""
     },
@@ -303,7 +317,6 @@
       "subtitle": "Utiliser des comptes de service pour exécuter des charges de travail automatisées dans Grafana",
       "title": "Comptes de service"
     },
-    "sign-in": "Se connecter",
     "sign-out": {
       "title": "Se déconnecter"
     },
@@ -399,7 +412,6 @@
       "sort-placeholder": "",
       "starred": "Favoris",
       "view-as-folders": "",
-      "view-as-grid": "",
       "view-as-list": ""
     },
     "dashboard-actions": {
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 76e3fd328fd..1338df2928a 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -30,6 +30,23 @@
     "save": "Ŝävę"
   },
   "dashboard": {
+    "add-menu": {
+      "import": "Ĩmpőřŧ ƒřőm ľįþřäřy",
+      "paste-panel": "Päşŧę päʼnęľ",
+      "row": "Ŗőŵ",
+      "visualization": "Vįşūäľįžäŧįőʼn"
+    },
+    "empty": {
+      "add-import-body": "Ĩmpőřŧ vįşūäľįžäŧįőʼnş ŧĥäŧ äřę şĥäřęđ ŵįŧĥ őŧĥęř đäşĥþőäřđş.",
+      "add-import-button": "Ĩmpőřŧ ľįþřäřy päʼnęľ",
+      "add-import-header": "Ĩmpőřŧ päʼnęľ",
+      "add-row-body": "Ğřőūp yőūř vįşūäľįžäŧįőʼnş įʼnŧő ęχpäʼnđäþľę şęčŧįőʼnş.",
+      "add-row-button": "Åđđ řőŵ",
+      "add-row-header": "Åđđ ä řőŵ",
+      "add-visualization-body": "Ŝęľęčŧ ä đäŧä şőūřčę äʼnđ ŧĥęʼn qūęřy äʼnđ vįşūäľįžę yőūř đäŧä ŵįŧĥ čĥäřŧş, şŧäŧş äʼnđ ŧäþľęş őř čřęäŧę ľįşŧş, mäřĸđőŵʼnş äʼnđ őŧĥęř ŵįđģęŧş.",
+      "add-visualization-button": "Åđđ vįşūäľįžäŧįőʼn",
+      "add-visualization-header": "Ŝŧäřŧ yőūř ʼnęŵ đäşĥþőäřđ þy äđđįʼnģ ä vįşūäľįžäŧįőʼn"
+    },
     "inspect": {
       "data-tab": "Đäŧä",
       "error-tab": "Ēřřőř",
@@ -75,6 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "Đäŧä şőūřčę şŧäŧş",
+      "data-traceids": "Ŧřäčę ĨĐş",
       "processing-time": "Đäŧä přőčęşşįʼnģ ŧįmę",
       "queries": "Ńūmþęř őƒ qūęřįęş",
       "request-time": "Ŧőŧäľ řęqūęşŧ ŧįmę",
@@ -82,6 +100,7 @@
       "table-title": "Ŝŧäŧş"
     },
     "toolbar": {
+      "add": "Åđđ",
       "add-panel": "Åđđ päʼnęľ",
       "mark-favorite": "Mäřĸ äş ƒävőřįŧę",
       "open-original": "Øpęʼn őřįģįʼnäľ đäşĥþőäřđ",
@@ -92,7 +111,6 @@
       "save": "Ŝävę đäşĥþőäřđ",
       "settings": "Đäşĥþőäřđ şęŧŧįʼnģş",
       "share": "Ŝĥäřę đäşĥþőäřđ őř päʼnęľ",
-      "tv-button": "Cyčľę vįęŵ mőđę",
       "unmark-favorite": "Ůʼnmäřĸ äş ƒävőřįŧę"
     }
   },
@@ -123,6 +141,9 @@
       "folder": "Ŝävę įʼn ƒőľđęř",
       "folder-description": "Ŀįþřäřy päʼnęľ pęřmįşşįőʼnş äřę đęřįvęđ ƒřőm ŧĥę ƒőľđęř pęřmįşşįőʼnş",
       "name": "Ŀįþřäřy päʼnęľ ʼnämę"
+    },
+    "add-widget": {
+      "title": "Åđđ päʼnęľ ƒřőm päʼnęľ ľįþřäřy"
     }
   },
   "library-panels": {
@@ -185,8 +206,7 @@
       "title": "Åppş"
     },
     "config": {
-      "title": "Åđmįʼnįşŧřäŧįőʼn",
-      "titleBeforeTopnav": "Cőʼnƒįģūřäŧįőʼn"
+      "title": "Åđmįʼnįşŧřäŧįőʼn"
     },
     "correlations": {
       "subtitle": "Åđđ äʼnđ čőʼnƒįģūřę čőřřęľäŧįőʼnş",
@@ -224,8 +244,7 @@
     },
     "global-users": {
       "subtitle": "Mäʼnäģę ūşęřş įʼn Ğřäƒäʼnä",
-      "title": "Ůşęřş",
-      "titleBeforeTopnav": "Ůşęřş"
+      "title": "Ůşęřş"
     },
     "help": {
       "title": "Ħęľp"
@@ -241,9 +260,6 @@
       "subtitle": "Ŗęūşäþľę päʼnęľş ŧĥäŧ čäʼn þę äđđęđ ŧő mūľŧįpľę đäşĥþőäřđş",
       "title": "Ŀįþřäřy päʼnęľş"
     },
-    "manage-dashboards": {
-      "title": "ßřőŵşę"
-    },
     "manage-folder": {
       "subtitle": "Mäʼnäģę ƒőľđęř đäşĥþőäřđş äʼnđ pęřmįşşįőʼnş"
     },
@@ -262,8 +278,7 @@
     },
     "org-settings": {
       "subtitle": "Mäʼnäģę přęƒęřęʼnčęş äčřőşş äʼn őřģäʼnįžäŧįőʼn",
-      "title": "Đęƒäūľŧ přęƒęřęʼnčęş",
-      "titleBeforeTopnav": "Přęƒęřęʼnčęş"
+      "title": "Đęƒäūľŧ přęƒęřęʼnčęş"
     },
     "playlists": {
       "subtitle": "Ğřőūpş őƒ đäşĥþőäřđş ŧĥäŧ äřę đįşpľäyęđ įʼn ä şęqūęʼnčę",
@@ -282,7 +297,6 @@
     "profile/settings": {
       "title": "Přőƒįľę"
     },
-    "profile/switch-org": "Ŝŵįŧčĥ őřģäʼnįžäŧįőʼn",
     "public": {
       "title": "Pūþľįč đäşĥþőäřđş"
     },
@@ -303,7 +317,6 @@
       "subtitle": "Ůşę şęřvįčę äččőūʼnŧş ŧő řūʼn äūŧőmäŧęđ ŵőřĸľőäđş įʼn Ğřäƒäʼnä",
       "title": "Ŝęřvįčę äččőūʼnŧş"
     },
-    "sign-in": "Ŝįģʼn įʼn",
     "sign-out": {
       "title": "Ŝįģʼn őūŧ"
     },
@@ -399,7 +412,6 @@
       "sort-placeholder": "Ŝőřŧ",
       "starred": "Ŝŧäřřęđ",
       "view-as-folders": "Vįęŵ þy ƒőľđęřş",
-      "view-as-grid": "Ğřįđ vįęŵ",
       "view-as-list": "Vįęŵ äş ľįşŧ"
     },
     "dashboard-actions": {
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 0eb84e7750c..af27b8ef6d2 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -30,6 +30,23 @@
     "save": "保存"
   },
   "dashboard": {
+    "add-menu": {
+      "import": "",
+      "paste-panel": "",
+      "row": "",
+      "visualization": ""
+    },
+    "empty": {
+      "add-import-body": "",
+      "add-import-button": "",
+      "add-import-header": "",
+      "add-row-body": "",
+      "add-row-button": "",
+      "add-row-header": "",
+      "add-visualization-body": "",
+      "add-visualization-button": "",
+      "add-visualization-header": ""
+    },
     "inspect": {
       "data-tab": "数据",
       "error-tab": "错误",
@@ -75,6 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "数据源统计信息",
+      "data-traceids": "",
       "processing-time": "数据处理时间",
       "queries": "查询数",
       "request-time": "总请求时间",
@@ -82,6 +100,7 @@
       "table-title": "统计信息"
     },
     "toolbar": {
+      "add": "",
       "add-panel": "添加面板",
       "mark-favorite": "标记为收藏",
       "open-original": "打开原始仪表板",
@@ -92,7 +111,6 @@
       "save": "保存仪表板",
       "settings": "仪表板设置",
       "share": "分享仪表板或面板",
-      "tv-button": "循环视图模式",
       "unmark-favorite": "取消标记为收藏"
     }
   },
@@ -123,6 +141,9 @@
       "folder": "保存在文件夹中",
       "folder-description": "库面板权限沿用自文件夹权限",
       "name": "库面板名称"
+    },
+    "add-widget": {
+      "title": ""
     }
   },
   "library-panels": {
@@ -185,8 +206,7 @@
       "title": "应用"
     },
     "config": {
-      "title": "管理",
-      "titleBeforeTopnav": "配置"
+      "title": "管理"
     },
     "correlations": {
       "subtitle": "添加并配置相关性",
@@ -224,8 +244,7 @@
     },
     "global-users": {
       "subtitle": "在 Grafana 中管理用户",
-      "title": "用户",
-      "titleBeforeTopnav": "用户"
+      "title": "用户"
     },
     "help": {
       "title": "帮助"
@@ -241,9 +260,6 @@
       "subtitle": "可重复使用的面板，可以添加到多个仪表板",
       "title": "库面板"
     },
-    "manage-dashboards": {
-      "title": "浏览"
-    },
     "manage-folder": {
       "subtitle": ""
     },
@@ -262,8 +278,7 @@
     },
     "org-settings": {
       "subtitle": "管理整个组织的首选项",
-      "title": "默认首选项",
-      "titleBeforeTopnav": "首选项"
+      "title": "默认首选项"
     },
     "playlists": {
       "subtitle": "以序列显示的仪表板组",
@@ -282,7 +297,6 @@
     "profile/settings": {
       "title": "个人资料"
     },
-    "profile/switch-org": "切换组织",
     "public": {
       "title": ""
     },
@@ -303,7 +317,6 @@
       "subtitle": "使用服务帐户在 Grafana 中运行自动化工作负载",
       "title": "服务帐户"
     },
-    "sign-in": "登录",
     "sign-out": {
       "title": "退出登录"
     },
@@ -399,7 +412,6 @@
       "sort-placeholder": "",
       "starred": "已加星标",
       "view-as-folders": "",
-      "view-as-grid": "",
       "view-as-list": ""
     },
     "dashboard-actions": {

From b16a8bd6a80e349cc0eca1afa8ff776a6a60db4e Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Thu, 20 Apr 2023 15:40:45 +0100
Subject: [PATCH 287/729] grafana/e2e: Put E2E select updates in selectOption
 (#66972)

Put E2E select updates in selectOption and force
---
 packages/grafana-e2e/src/flows/configurePanel.ts | 7 -------
 packages/grafana-e2e/src/flows/selectOption.ts   | 7 ++++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/grafana-e2e/src/flows/configurePanel.ts b/packages/grafana-e2e/src/flows/configurePanel.ts
index 983510e683a..c6225fb4a0d 100644
--- a/packages/grafana-e2e/src/flows/configurePanel.ts
+++ b/packages/grafana-e2e/src/flows/configurePanel.ts
@@ -113,13 +113,6 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
     e2e().intercept(chartData.method, chartData.route).as('chartData');
 
     if (dataSourceName) {
-      e2e.components.DataSourcePicker.container().within(() => {
-        e2e()
-          .get('[class$="-input-suffix"]')
-          .then((element) => {
-            Cypress.dom.isAttached(element);
-          });
-      });
       selectOption({
         container: e2e.components.DataSourcePicker.container(),
         optionText: dataSourceName,
diff --git a/packages/grafana-e2e/src/flows/selectOption.ts b/packages/grafana-e2e/src/flows/selectOption.ts
index 703fc9ad4a1..d47918c9fb5 100644
--- a/packages/grafana-e2e/src/flows/selectOption.ts
+++ b/packages/grafana-e2e/src/flows/selectOption.ts
@@ -19,7 +19,12 @@ export const selectOption = (config: SelectOptionConfig): any => {
 
   container.within(() => {
     if (clickToOpen) {
-      e2e().get('[class$="-input-suffix"]').click();
+      e2e()
+        .get('[class$="-input-suffix"]', { timeout: 1000 })
+        .then((element) => {
+          expect(Cypress.dom.isAttached(element)).to.eq(true);
+          e2e().get('[class$="-input-suffix"]', { timeout: 1000 }).click({ force: true });
+        });
     }
   });
 

From 7688ac67128ac23b1742c6061cda49e01a0768ed Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Thu, 20 Apr 2023 17:47:19 +0300
Subject: [PATCH 288/729] Swagger: Fix and update specifications with the
 latest changes (#66847)

---
 public/api-merged.json | 173 ++++++++++++++++++++++++++++++++++-----
 public/openapi3.json   | 179 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 317 insertions(+), 35 deletions(-)

diff --git a/public/api-merged.json b/public/api-merged.json
index b2859bf29fc..82aeb49bfd7 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -3276,7 +3276,7 @@
     },
     "/auth/keys": {
       "get": {
-        "description": "Will return auth keys.",
+        "description": "Will return auth keys.\n\nDeprecated: true.\n\nDeprecated. Please use GET /api/serviceaccounts and GET /api/serviceaccounts/{id}/tokens instead\nsee https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
         "tags": [
           "api_keys"
         ],
@@ -3316,6 +3316,7 @@
         ],
         "summary": "Creates an API key.",
         "operationId": "addAPIkey",
+        "deprecated": true,
         "parameters": [
           {
             "name": "Body",
@@ -3350,11 +3351,13 @@
     },
     "/auth/keys/{id}": {
       "delete": {
+        "description": "Deletes an API key.\nDeprecated. See: https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
         "tags": [
           "api_keys"
         ],
         "summary": "Delete API key.",
         "operationId": "deleteAPIkey",
+        "deprecated": true,
         "parameters": [
           {
             "type": "integer",
@@ -9467,6 +9470,48 @@
             "$ref": "#/responses/internalServerError"
           }
         }
+      },
+      "delete": {
+        "tags": [
+          "sync_team_groups",
+          "enterprise"
+        ],
+        "summary": "Remove External Group.",
+        "operationId": "removeTeamGroupApiQuery",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "groupId",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "teamId",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
       }
     },
     "/teams/{teamId}/groups/{groupId}": {
@@ -9477,6 +9522,7 @@
         ],
         "summary": "Remove External Group.",
         "operationId": "removeTeamGroupApi",
+        "deprecated": true,
         "parameters": [
           {
             "type": "string",
@@ -11325,9 +11371,9 @@
         "execErrState": {
           "type": "string",
           "enum": [
+            "OK",
             "Alerting",
-            "Error",
-            "OK"
+            "Error"
           ]
         },
         "for": {
@@ -12754,6 +12800,9 @@
       "description": "DataLink define what",
       "type": "object",
       "properties": {
+        "internal": {
+          "$ref": "#/definitions/InternalDataLink"
+        },
         "targetBlank": {
           "type": "boolean"
         },
@@ -13054,9 +13103,9 @@
       "format": "int64"
     },
     "Duration": {
+      "description": "A Duration represents the elapsed time between two instants\nas an int64 nanosecond count. The representation limits the\nlargest representable duration to approximately 290 years.",
       "type": "integer",
-      "format": "int64",
-      "title": "Duration is a type used for marshalling durations."
+      "format": "int64"
     },
     "EmailConfig": {
       "type": "object",
@@ -13278,6 +13327,9 @@
       }
     },
     "EvalQueriesResponse": {},
+    "ExplorePanelsState": {
+      "description": "This is an object constructed with the keys as the values of the enum VisType and the value being a bag of properties"
+    },
     "ExtendedReceiver": {
       "type": "object",
       "properties": {
@@ -13942,6 +13994,34 @@
         }
       }
     },
+    "GettableHistoricUserConfig": {
+      "type": "object",
+      "properties": {
+        "alertmanager_config": {
+          "$ref": "#/definitions/GettableApiAlertingConfig"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "last_applied": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "template_file_provenances": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/Provenance"
+          }
+        },
+        "template_files": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "GettableNGalertConfig": {
       "type": "object",
       "properties": {
@@ -14373,6 +14453,31 @@
       "format": "int64",
       "title": "InspectType is a type for the Inspect property of a Notice."
     },
+    "InternalDataLink": {
+      "description": "InternalDataLink definition to allow Explore links to be constructed in the backend",
+      "type": "object",
+      "properties": {
+        "datasourceName": {
+          "type": "string"
+        },
+        "datasourceUid": {
+          "type": "string"
+        },
+        "panelsState": {
+          "$ref": "#/definitions/ExplorePanelsState"
+        },
+        "query": {},
+        "timeRange": {
+          "$ref": "#/definitions/TimeRange"
+        },
+        "transformations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LinkTransformationConfig"
+          }
+        }
+      }
+    },
     "Item": {
       "type": "object",
       "title": "Item defines model for Item.",
@@ -14768,6 +14873,23 @@
         }
       }
     },
+    "LinkTransformationConfig": {
+      "type": "object",
+      "properties": {
+        "expression": {
+          "type": "string"
+        },
+        "field": {
+          "type": "string"
+        },
+        "mapValue": {
+          "type": "string"
+        },
+        "type": {
+          "$ref": "#/definitions/SupportedTransformationTypes"
+        }
+      }
+    },
     "MassDeleteAnnotationsCmd": {
       "type": "object",
       "properties": {
@@ -16065,9 +16187,9 @@
         "execErrState": {
           "type": "string",
           "enum": [
+            "OK",
             "Alerting",
-            "Error",
-            "OK"
+            "Error"
           ]
         },
         "folderUID": {
@@ -17563,6 +17685,9 @@
         }
       }
     },
+    "SupportedTransformationTypes": {
+      "type": "string"
+    },
     "SyncResult": {
       "type": "object",
       "title": "SyncResult holds the result of a sync with LDAP. This gives us information on which users were updated and how.",
@@ -18007,17 +18132,16 @@
       }
     },
     "TimeRange": {
-      "description": "For example, 4:00PM to End of the day would Begin at 1020 and End at 1440.",
+      "description": "Redefining this to avoid an import cycle",
       "type": "object",
-      "title": "TimeRange represents a range of minutes within a 1440 minute day, exclusive of the End minute. A day consists of 1440 minutes.",
       "properties": {
-        "EndMinute": {
-          "type": "integer",
-          "format": "int64"
+        "from": {
+          "type": "string",
+          "format": "date-time"
         },
-        "StartMinute": {
-          "type": "integer",
-          "format": "int64"
+        "to": {
+          "type": "string",
+          "format": "date-time"
         }
       }
     },
@@ -18218,9 +18342,8 @@
       "type": "string"
     },
     "URL": {
-      "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.",
       "type": "object",
-      "title": "A URL represents a parsed URL (technically, a URI reference).",
+      "title": "URL is a custom URL type that allows validation at configuration load time.",
       "properties": {
         "ForceQuery": {
           "type": "boolean"
@@ -19058,6 +19181,7 @@
       }
     },
     "alertGroup": {
+      "description": "AlertGroup alert group",
       "type": "object",
       "required": [
         "alerts",
@@ -19186,6 +19310,7 @@
       }
     },
     "gettableAlert": {
+      "description": "GettableAlert gettable alert",
       "type": "object",
       "required": [
         "labels",
@@ -19241,13 +19366,13 @@
       }
     },
     "gettableAlerts": {
-      "description": "GettableAlerts gettable alerts",
       "type": "array",
       "items": {
         "$ref": "#/definitions/gettableAlert"
       }
     },
     "gettableSilence": {
+      "description": "GettableSilence gettable silence",
       "type": "object",
       "required": [
         "comment",
@@ -19296,12 +19421,14 @@
       }
     },
     "gettableSilences": {
+      "description": "GettableSilences gettable silences",
       "type": "array",
       "items": {
         "$ref": "#/definitions/gettableSilence"
       }
     },
     "integration": {
+      "description": "Integration integration",
       "type": "object",
       "required": [
         "name",
@@ -19445,6 +19572,7 @@
       }
     },
     "postableSilence": {
+      "description": "PostableSilence postable silence",
       "type": "object",
       "required": [
         "comment",
@@ -19596,6 +19724,15 @@
     }
   },
   "responses": {
+    "GettableHistoricUserConfigs": {
+      "description": "(empty)",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/GettableHistoricUserConfig"
+        }
+      }
+    },
     "SMTPNotEnabledError": {
       "description": "(empty)"
     },
diff --git a/public/openapi3.json b/public/openapi3.json
index 02f4b97b5c0..814a35f50c3 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -1,6 +1,19 @@
 {
   "components": {
     "responses": {
+      "GettableHistoricUserConfigs": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "items": {
+                "$ref": "#/components/schemas/GettableHistoricUserConfig"
+              },
+              "type": "array"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "SMTPNotEnabledError": {
         "description": "(empty)"
       },
@@ -2447,9 +2460,9 @@
           },
           "execErrState": {
             "enum": [
+              "OK",
               "Alerting",
-              "Error",
-              "OK"
+              "Error"
             ],
             "type": "string"
           },
@@ -3878,6 +3891,9 @@
       "DataLink": {
         "description": "DataLink define what",
         "properties": {
+          "internal": {
+            "$ref": "#/components/schemas/InternalDataLink"
+          },
           "targetBlank": {
             "type": "boolean"
           },
@@ -4179,8 +4195,8 @@
         "type": "integer"
       },
       "Duration": {
+        "description": "A Duration represents the elapsed time between two instants\nas an int64 nanosecond count. The representation limits the\nlargest representable duration to approximately 290 years.",
         "format": "int64",
-        "title": "Duration is a type used for marshalling durations.",
         "type": "integer"
       },
       "EmailConfig": {
@@ -4403,6 +4419,9 @@
         "type": "object"
       },
       "EvalQueriesResponse": {},
+      "ExplorePanelsState": {
+        "description": "This is an object constructed with the keys as the values of the enum VisType and the value being a bag of properties"
+      },
       "ExtendedReceiver": {
         "properties": {
           "email_configs": {
@@ -5067,6 +5086,34 @@
         },
         "type": "object"
       },
+      "GettableHistoricUserConfig": {
+        "properties": {
+          "alertmanager_config": {
+            "$ref": "#/components/schemas/GettableApiAlertingConfig"
+          },
+          "id": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "last_applied": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "template_file_provenances": {
+            "additionalProperties": {
+              "$ref": "#/components/schemas/Provenance"
+            },
+            "type": "object"
+          },
+          "template_files": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      },
       "GettableNGalertConfig": {
         "properties": {
           "alertmanagersChoice": {
@@ -5498,6 +5545,31 @@
         "title": "InspectType is a type for the Inspect property of a Notice.",
         "type": "integer"
       },
+      "InternalDataLink": {
+        "description": "InternalDataLink definition to allow Explore links to be constructed in the backend",
+        "properties": {
+          "datasourceName": {
+            "type": "string"
+          },
+          "datasourceUid": {
+            "type": "string"
+          },
+          "panelsState": {
+            "$ref": "#/components/schemas/ExplorePanelsState"
+          },
+          "query": {},
+          "timeRange": {
+            "$ref": "#/components/schemas/TimeRange"
+          },
+          "transformations": {
+            "items": {
+              "$ref": "#/components/schemas/LinkTransformationConfig"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
       "Item": {
         "properties": {
           "title": {
@@ -5893,6 +5965,23 @@
         "title": "LibraryElementSearchResult is the search result for entities.",
         "type": "object"
       },
+      "LinkTransformationConfig": {
+        "properties": {
+          "expression": {
+            "type": "string"
+          },
+          "field": {
+            "type": "string"
+          },
+          "mapValue": {
+            "type": "string"
+          },
+          "type": {
+            "$ref": "#/components/schemas/SupportedTransformationTypes"
+          }
+        },
+        "type": "object"
+      },
       "MassDeleteAnnotationsCmd": {
         "properties": {
           "annotationId": {
@@ -7176,9 +7265,9 @@
           },
           "execErrState": {
             "enum": [
+              "OK",
               "Alerting",
-              "Error",
-              "OK"
+              "Error"
             ],
             "type": "string"
           },
@@ -8686,6 +8775,9 @@
         },
         "type": "object"
       },
+      "SupportedTransformationTypes": {
+        "type": "string"
+      },
       "SyncResult": {
         "properties": {
           "Elapsed": {
@@ -9130,18 +9222,17 @@
         "type": "object"
       },
       "TimeRange": {
-        "description": "For example, 4:00PM to End of the day would Begin at 1020 and End at 1440.",
+        "description": "Redefining this to avoid an import cycle",
         "properties": {
-          "EndMinute": {
-            "format": "int64",
-            "type": "integer"
+          "from": {
+            "format": "date-time",
+            "type": "string"
           },
-          "StartMinute": {
-            "format": "int64",
-            "type": "integer"
+          "to": {
+            "format": "date-time",
+            "type": "string"
           }
         },
-        "title": "TimeRange represents a range of minutes within a 1440 minute day, exclusive of the End minute. A day consists of 1440 minutes.",
         "type": "object"
       },
       "TimeRangeDTO": {
@@ -9341,7 +9432,6 @@
         "type": "string"
       },
       "URL": {
-        "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.",
         "properties": {
           "ForceQuery": {
             "type": "boolean"
@@ -9377,7 +9467,7 @@
             "$ref": "#/components/schemas/Userinfo"
           }
         },
-        "title": "A URL represents a parsed URL (technically, a URI reference).",
+        "title": "URL is a custom URL type that allows validation at configuration load time.",
         "type": "object"
       },
       "UpdateAlertNotificationCommand": {
@@ -10181,6 +10271,7 @@
         "type": "object"
       },
       "alertGroup": {
+        "description": "AlertGroup alert group",
         "properties": {
           "alerts": {
             "description": "alerts",
@@ -10309,6 +10400,7 @@
         "type": "object"
       },
       "gettableAlert": {
+        "description": "GettableAlert gettable alert",
         "properties": {
           "annotations": {
             "$ref": "#/components/schemas/labelSet"
@@ -10364,13 +10456,13 @@
         "type": "object"
       },
       "gettableAlerts": {
-        "description": "GettableAlerts gettable alerts",
         "items": {
           "$ref": "#/components/schemas/gettableAlert"
         },
         "type": "array"
       },
       "gettableSilence": {
+        "description": "GettableSilence gettable silence",
         "properties": {
           "comment": {
             "description": "comment",
@@ -10419,12 +10511,14 @@
         "type": "object"
       },
       "gettableSilences": {
+        "description": "GettableSilences gettable silences",
         "items": {
           "$ref": "#/components/schemas/gettableSilence"
         },
         "type": "array"
       },
       "integration": {
+        "description": "Integration integration",
         "properties": {
           "lastNotifyAttempt": {
             "description": "A timestamp indicating the last attempt to deliver a notification regardless of the outcome.\nFormat: date-time",
@@ -10568,6 +10662,7 @@
         "type": "array"
       },
       "postableSilence": {
+        "description": "PostableSilence postable silence",
         "properties": {
           "comment": {
             "description": "comment",
@@ -14352,7 +14447,7 @@
     },
     "/auth/keys": {
       "get": {
-        "description": "Will return auth keys.",
+        "description": "Will return auth keys.\n\nDeprecated: true.\n\nDeprecated. Please use GET /api/serviceaccounts and GET /api/serviceaccounts/{id}/tokens instead\nsee https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
         "operationId": "getAPIkeys",
         "parameters": [
           {
@@ -14388,6 +14483,7 @@
         ]
       },
       "post": {
+        "deprecated": true,
         "description": "Will return details of the created API key.",
         "operationId": "addAPIkey",
         "requestBody": {
@@ -14429,6 +14525,8 @@
     },
     "/auth/keys/{id}": {
       "delete": {
+        "deprecated": true,
+        "description": "Deletes an API key.\nDeprecated. See: https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
         "operationId": "deleteAPIkey",
         "parameters": [
           {
@@ -20912,6 +21010,52 @@
       }
     },
     "/teams/{teamId}/groups": {
+      "delete": {
+        "operationId": "removeTeamGroupApiQuery",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "groupId",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "teamId",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Remove External Group.",
+        "tags": [
+          "sync_team_groups",
+          "enterprise"
+        ]
+      },
       "get": {
         "operationId": "getTeamGroupsApi",
         "parameters": [
@@ -21004,6 +21148,7 @@
     },
     "/teams/{teamId}/groups/{groupId}": {
       "delete": {
+        "deprecated": true,
         "operationId": "removeTeamGroupApi",
         "parameters": [
           {

From 24696d593b978e822dc8ed2abdb494d48e71dc37 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Thu, 20 Apr 2023 17:47:51 +0300
Subject: [PATCH 289/729] Nested folders: Fix error response codes (#66943)

* Nested folders: Fix error response codes

Fix error handling
---
 pkg/services/folder/folderimpl/folder.go   | 4 ++--
 pkg/services/folder/folderimpl/sqlstore.go | 2 +-
 pkg/services/folder/model.go               | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 8b169b453f5..c9d0d5d172b 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -558,7 +558,7 @@ func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*fol
 
 	// current folder height + current folder + parent folder + parent folder depth should be less than or equal 8
 	if folderHeight+len(parents)+2 > folder.MaxNestedFolderDepth {
-		return nil, folder.ErrMaximumDepthReached
+		return nil, folder.ErrMaximumDepthReached.Errorf("failed to move folder")
 	}
 
 	// if the current folder is already a parent of newparent, we should return error
@@ -775,7 +775,7 @@ func (s *Service) validateParent(ctx context.Context, orgID int64, parentUID str
 	}
 
 	if len(ancestors) == folder.MaxNestedFolderDepth {
-		return folder.ErrMaximumDepthReached
+		return folder.ErrMaximumDepthReached.Errorf("failed to validate parent folder")
 	}
 
 	// Create folder under itself is not allowed
diff --git a/pkg/services/folder/folderimpl/sqlstore.go b/pkg/services/folder/folderimpl/sqlstore.go
index 12691f5d056..30d1256dd70 100644
--- a/pkg/services/folder/folderimpl/sqlstore.go
+++ b/pkg/services/folder/folderimpl/sqlstore.go
@@ -284,7 +284,7 @@ func (ss *sqlStore) getParentsMySQL(ctx context.Context, cmd folder.GetParentsQu
 			folders = append(folders, f)
 			uid = f.ParentUID
 			if len(folders) > folder.MaxNestedFolderDepth {
-				return folder.ErrFolderTooDeep
+				return folder.ErrMaximumDepthReached.Errorf("failed to get parent folders iteratively")
 			}
 		}
 		return nil
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index ee656d74ed3..a33caa7c100 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -11,7 +11,6 @@ var ErrMaximumDepthReached = errutil.NewBase(errutil.StatusBadRequest, "folder.m
 var ErrBadRequest = errutil.NewBase(errutil.StatusBadRequest, "folder.bad-request")
 var ErrDatabaseError = errutil.NewBase(errutil.StatusInternal, "folder.database-error")
 var ErrInternal = errutil.NewBase(errutil.StatusInternal, "folder.internal")
-var ErrFolderTooDeep = errutil.NewBase(errutil.StatusInternal, "folder.too-deep")
 var ErrCircularReference = errutil.NewBase(errutil.StatusBadRequest, "folder.circular-reference", errutil.WithPublicMessage("Circular reference detected"))
 var ErrTargetRegistrySrvConflict = errutil.NewBase(errutil.StatusInternal, "folder.target-registry-srv-conflict")
 

From b24ba7b7ae5fed6be9d2507d5eb185113f9c4d12 Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Thu, 20 Apr 2023 09:59:18 -0500
Subject: [PATCH 290/729] FieldValues: Use plain arrays instead of Vector (part
 3 of 2) (#66612)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 .betterer.results                             |   6 +-
 .../plugins/working-with-data-frames.md       |   4 +-
 .../src/dataframe/ArrayDataFrame.test.ts      |   1 +
 .../src/dataframe/ArrayDataFrame.ts           |   4 +-
 .../src/field/getFieldDisplayValuesProxy.ts   |   2 +-
 .../matchers/valueMatchers/equalMatchers.ts   |   4 +-
 .../matchers/valueMatchers/nullMatchers.ts    |   4 +-
 .../matchers/valueMatchers/numericMatchers.ts |   8 +-
 .../matchers/valueMatchers/rangeMatchers.ts   |   2 +-
 .../matchers/valueMatchers/regexMatchers.ts   |   2 +-
 .../src/transformations/transformers/merge.ts |   4 +-
 .../transformers/seriesToRows.ts              |   4 +-
 packages/grafana-data/src/types/vector.ts     |  26 +++--
 .../src/utils/queryResponse.ts                |   2 +-
 .../uPlot/config/UPlotConfigBuilder.ts        |   2 +-
 .../uPlot/plugins/TooltipPlugin.tsx           |   8 +-
 .../components/AppChrome/AppChrome.test.tsx   |  14 +--
 .../core/components/TimelineChart/utils.ts    |   4 +-
 public/app/core/logsModel.ts                  |  14 +--
 .../components/expressions/Expression.tsx     |   6 +-
 .../unified/components/expressions/util.ts    |   6 +-
 .../unified/components/rule-editor/preview.ts |   5 +-
 .../components/AnnotationResultMapper.tsx     |   2 +-
 .../annotations/standardAnnotationSupport.ts  |   2 +-
 .../actions/dashboardActions.test.ts          |  14 +--
 .../app/features/explore/LogsSample.test.tsx  |  17 +--
 .../explore/TraceView/utils/transform.ts      |   2 +-
 .../app/features/explore/state/query.test.ts  |   3 +-
 .../features/explore/utils/decorators.test.ts |   6 +-
 .../getRawPrometheusListItemsFromDataFrame.ts |   4 +-
 .../app/features/explore/utils/links.test.ts  |  25 ++--
 public/app/features/explore/utils/links.ts    |   6 +-
 .../logs/components/LogDetails.test.tsx       |   2 +-
 .../features/logs/components/LogDetails.tsx   |   6 +-
 .../logs/components/logParser.test.ts         |  16 +--
 .../app/features/logs/components/logParser.ts |   6 +-
 public/app/features/logs/utils.ts             |   4 +-
 .../components/PanelDataErrorView.test.tsx    |   6 +-
 .../panel/panellinks/linkSuppliers.test.ts    |   2 +-
 .../panel/panellinks/linkSuppliers.ts         |   4 +-
 .../features/plugins/sql/ResponseParser.ts    |   4 +-
 .../page/components/FolderSection.test.tsx    |  26 ++---
 .../page/components/RootFolderView.test.tsx   |  10 +-
 .../components/SearchResultsCards.test.tsx    |  30 ++---
 .../components/SearchResultsTable.test.tsx    |  22 ++--
 .../page/components/SearchResultsTable.tsx    |   2 +-
 .../page/components/SearchView.test.tsx       |  10 +-
 .../search/page/components/columns.tsx        |  26 ++---
 .../features/search/service/frontend.test.ts  |   6 +-
 .../app/features/search/service/frontend.ts   |  10 +-
 public/app/features/search/service/sql.ts     |  16 +--
 .../features/storage/StorageFolderPage.tsx    |   2 +-
 public/app/features/storage/StoragePage.tsx   |  11 +-
 public/app/features/templating/dataMacros.ts  |   4 +-
 .../fieldToConfigMapping.ts                   |   2 +-
 .../app/features/variables/query/operators.ts |   8 +-
 .../cloudwatch/__mocks__/logsTestContext.ts   |   7 +-
 .../query-runner/CloudWatchLogsQueryRunner.ts |   6 +-
 .../cloudwatch/utils/logsRetry.test.ts        |  10 +-
 .../elasticsearch/ElasticResponse.test.ts     |  70 ++++++------
 .../elasticsearch/ElasticResponse.ts          |   2 +-
 .../datasource/elasticsearch/datasource.ts    |   4 +-
 .../grafana/components/QueryEditor.tsx        |   2 +-
 .../datasource/graphite/datasource.test.ts    |   2 +-
 .../plugins/datasource/graphite/datasource.ts |   4 +-
 .../plugins/datasource/influxdb/datasource.ts |   5 +-
 .../datasource/influxdb/response_parser.ts    |   4 +-
 .../datasource/loki/LogContextProvider.ts     |   2 +-
 .../loki/backendResultTransformer.test.ts     |  22 ++--
 .../loki/configuration/DebugSection.tsx       |   4 +-
 .../datasource/loki/datasource.test.ts        |  37 +++---
 .../datasource/loki/getDerivedFields.test.ts  |   4 +-
 .../datasource/loki/getDerivedFields.ts       |   8 +-
 .../datasource/loki/makeTableFrames.test.ts   |  44 +++----
 .../datasource/loki/makeTableFrames.ts        |  22 ++--
 public/app/plugins/datasource/loki/mocks.ts   |  37 +++---
 .../datasource/loki/queryHints.test.ts        |  20 ++--
 .../datasource/loki/responseUtils.test.ts     |  50 ++++----
 .../plugins/datasource/loki/responseUtils.ts  |  23 ++--
 .../datasource/loki/sortDataFrame.test.ts     |  32 +++---
 .../plugins/datasource/loki/sortDataFrame.ts  |   4 +-
 .../plugins/datasource/mssql/datasource.ts    |   8 +-
 .../plugins/datasource/postgres/datasource.ts |  10 +-
 .../datasource/prometheus/datasource.test.ts  |  34 +++---
 .../datasource/prometheus/datasource.tsx      |   4 +-
 .../prometheus/querycache/QueryCache.test.ts  |  12 +-
 .../prometheus/querycache/QueryCache.ts       |  14 +--
 .../querycache/QueryCacheTestData.ts          |  18 ++-
 .../prometheus/result_transformer.test.ts     | 107 ++++++++----------
 .../prometheus/result_transformer.ts          |  28 ++---
 .../datasource/tempo/datasource.test.ts       |  29 +++--
 .../plugins/datasource/tempo/datasource.ts    |  10 +-
 .../datasource/tempo/resultTransformer.ts     |   2 +-
 .../datasource/testdata/nodeGraphUtils.ts     |  35 +++---
 .../plugins/panel/barchart/BarChartPanel.tsx  |   6 +-
 .../app/plugins/panel/barchart/utils.test.ts  |   2 +-
 .../TopTable/FlameGraphTopTableContainer.tsx  |   2 +-
 .../panel/geomap/components/DataHoverRows.tsx |   2 +-
 .../panel/geomap/components/DataHoverView.tsx |   2 +-
 .../panel/geomap/components/MarkersLegend.tsx |   2 +-
 .../panel/geomap/layers/data/routeLayer.tsx   |   2 +-
 public/app/plugins/panel/graph/graph.ts       |   4 +-
 .../plugins/panel/heatmap/HeatmapPanel.tsx    |   2 +-
 public/app/plugins/panel/nodeGraph/layout.ts  |   4 +-
 .../status-history/StatusHistoryTooltip.tsx   |   6 +-
 .../timeseries/plugins/ContextMenuPlugin.tsx  |   4 +-
 .../timeseries/plugins/ExemplarMarker.tsx     |   2 +-
 .../timeseries/plugins/ExemplarsPlugin.tsx    |   8 +-
 .../app/plugins/panel/xychart/TooltipView.tsx |  10 +-
 109 files changed, 594 insertions(+), 648 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 9a24af4f7f9..51c721f7b70 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4627,9 +4627,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
     ],
-    "public/app/plugins/datasource/loki/getDerivedFields.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/datasource/loki/queryUtils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -5089,7 +5086,8 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/testdata/nodeGraphUtils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "public/app/plugins/datasource/testdata/runStreams.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
diff --git a/docs/sources/developers/plugins/working-with-data-frames.md b/docs/sources/developers/plugins/working-with-data-frames.md
index 3de739f1abf..ac56e08f77f 100644
--- a/docs/sources/developers/plugins/working-with-data-frames.md
+++ b/docs/sources/developers/plugins/working-with-data-frames.md
@@ -72,7 +72,7 @@ const y = frame.fields.find((field) => field.name === yField);
 const size = frame.fields.find((field) => field.name === sizeField);
 
 for (let i = 0; i < frame.length; i++) {
-  const row = [x?.values.get(i), y?.values.get(i), size?.values.get(i)];
+  const row = [x?.values[i], y?.values[i], size?.values[i]];
 
   // ...
 }
@@ -100,7 +100,7 @@ const valueField = frame.fields.find((field) => field.type === FieldType.number)
 return (
   <div>
     {valueField
-      ? valueField.values.toArray().map((value) => {
+      ? valueField.values.map((value) => {
           const displayValue = valueField.display!(value);
           return (
             <p style={{ color: displayValue.color }}>
diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts b/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
index c0980c39481..e9ae03e3dd8 100644
--- a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
@@ -24,6 +24,7 @@ describe('Array DataFrame', () => {
 
     // Check map
     expect(frame.map((row) => row.name)).toEqual(expectedNames);
+    expect(frame[0].name).toEqual(input[0].name);
 
     let names: string[] = [];
     for (const row of frame) {
diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts b/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
index 36ea2d43fc1..fcf665a6282 100644
--- a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
@@ -1,4 +1,4 @@
-import { QueryResultMeta } from '../types';
+import { makeArrayIndexableVector, QueryResultMeta } from '../types';
 import { Field, FieldType, DataFrame } from '../types/dataFrame';
 import { FunctionalVector } from '../vector/FunctionalVector';
 import { vectorToArray } from '../vector/vectorToArray';
@@ -15,6 +15,7 @@ class ArrayPropertyVector<T = any> extends FunctionalVector<T> {
 
   constructor(private source: any[], private prop: string) {
     super();
+    return makeArrayIndexableVector(this);
   }
 
   get length(): number {
@@ -64,6 +65,7 @@ export class ArrayDataFrame<T = any> extends FunctionalVector<T> implements Data
     } else {
       this.setFieldsFromObject(first);
     }
+    return makeArrayIndexableVector(this);
   }
 
   /**
diff --git a/packages/grafana-data/src/field/getFieldDisplayValuesProxy.ts b/packages/grafana-data/src/field/getFieldDisplayValuesProxy.ts
index d39fc47292f..73686e7643f 100644
--- a/packages/grafana-data/src/field/getFieldDisplayValuesProxy.ts
+++ b/packages/grafana-data/src/field/getFieldDisplayValuesProxy.ts
@@ -49,7 +49,7 @@ export function getFieldDisplayValuesProxy(options: {
         // TODO: we could supply the field here for the getDisplayProcessor fallback but we would also need theme which
         //  we do not have access to here
         const displayProcessor = field.display ?? getDisplayProcessor();
-        const raw = field.values.get(options.rowIndex);
+        const raw = field.values[options.rowIndex];
         const disp = displayProcessor(raw);
         disp.toString = () => formattedValueToString(disp);
         return disp;
diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts b/packages/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts
index 3b9e4c3721a..bdf66e71de6 100644
--- a/packages/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts
+++ b/packages/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts
@@ -10,7 +10,7 @@ const isEqualValueMatcher: ValueMatcherInfo<BasicValueMatcherOptions> = {
   description: 'Match where value for given field is equal to options value.',
   get: (options) => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       // eslint-disable-next-line eqeqeq
       return value == options.value;
     };
@@ -28,7 +28,7 @@ const isNotEqualValueMatcher: ValueMatcherInfo<BasicValueMatcherOptions> = {
   description: 'Match where value for given field is not equal to options value.',
   get: (options) => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       // eslint-disable-next-line eqeqeq
       return value != options.value;
     };
diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts b/packages/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts
index 10e78201dbf..ba50ee3edfe 100644
--- a/packages/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts
+++ b/packages/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts
@@ -10,7 +10,7 @@ const isNullValueMatcher: ValueMatcherInfo<ValueMatcherOptions> = {
   description: 'Match where value for given field is null.',
   get: () => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       return value == null;
     };
   },
@@ -27,7 +27,7 @@ const isNotNullValueMatcher: ValueMatcherInfo<ValueMatcherOptions> = {
   description: 'Match where value for given field is not null.',
   get: () => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       return value != null;
     };
   },
diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts b/packages/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts
index e2f24e6d98f..be8873175a3 100644
--- a/packages/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts
+++ b/packages/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts
@@ -10,7 +10,7 @@ const isGreaterValueMatcher: ValueMatcherInfo<BasicValueMatcherOptions<number>>
   description: 'Match when field value is greater than option.',
   get: (options) => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       if (isNaN(value)) {
         return false;
       }
@@ -30,7 +30,7 @@ const isGreaterOrEqualValueMatcher: ValueMatcherInfo<BasicValueMatcherOptions<nu
   description: 'Match when field value is greater than or equal to option.',
   get: (options) => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       if (isNaN(value)) {
         return false;
       }
@@ -50,7 +50,7 @@ const isLowerValueMatcher: ValueMatcherInfo<BasicValueMatcherOptions<number>> =
   description: 'Match when field value is lower than option.',
   get: (options) => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       if (isNaN(value)) {
         return false;
       }
@@ -70,7 +70,7 @@ const isLowerOrEqualValueMatcher: ValueMatcherInfo<BasicValueMatcherOptions<numb
   description: 'Match when field value is lower or equal than option.',
   get: (options) => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       if (isNaN(value)) {
         return false;
       }
diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts b/packages/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts
index 45c438c1830..a2f051945e4 100644
--- a/packages/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts
+++ b/packages/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts
@@ -10,7 +10,7 @@ const isBetweenValueMatcher: ValueMatcherInfo<RangeValueMatcherOptions<number>>
   description: 'Match when field value is between given option values.',
   get: (options) => {
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       if (isNaN(value)) {
         return false;
       }
diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts b/packages/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts
index 92ec6582f33..d5b9fb8fab9 100644
--- a/packages/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts
+++ b/packages/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts
@@ -12,7 +12,7 @@ const regexValueMatcher: ValueMatcherInfo<BasicValueMatcherOptions<string>> = {
     const regex = new RegExp(options.value);
 
     return (valueIndex: number, field: Field) => {
-      const value = field.values.get(valueIndex);
+      const value = field.values[valueIndex];
       return regex.test(value);
     };
   },
diff --git a/packages/grafana-data/src/transformations/transformers/merge.ts b/packages/grafana-data/src/transformations/transformers/merge.ts
index eb4c8933d45..d1f23459922 100644
--- a/packages/grafana-data/src/transformations/transformers/merge.ts
+++ b/packages/grafana-data/src/transformations/transformers/merge.ts
@@ -138,7 +138,7 @@ const createKeyFactory = (
 
   return (frameIndex: number, valueIndex: number): string => {
     return factoryIndex[frameIndex].reduce((key: string, fieldIndex: number) => {
-      return key + data[frameIndex].fields[fieldIndex].values.get(valueIndex);
+      return key + data[frameIndex].fields[fieldIndex].values[valueIndex];
     }, '');
   };
 };
@@ -173,7 +173,7 @@ const createValueMapper = (
         continue;
       }
 
-      value[fieldName] = field.values.get(valueIndex);
+      value[fieldName] = field.values[valueIndex];
     }
 
     return value;
diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
index ee0ddda0787..69bb9ecef63 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
@@ -75,9 +75,9 @@ export const seriesToRowsTransformer: DataTransformerInfo<SeriesToRowsTransforme
             const valueFieldIndex = timeFieldIndex === 0 ? 1 : 0;
 
             dataFrame.add({
-              [TIME_SERIES_TIME_FIELD_NAME]: frame.fields[timeFieldIndex].values.get(valueIndex),
+              [TIME_SERIES_TIME_FIELD_NAME]: frame.fields[timeFieldIndex].values[valueIndex],
               [TIME_SERIES_METRIC_FIELD_NAME]: getFrameDisplayName(frame),
-              [TIME_SERIES_VALUE_FIELD_NAME]: frame.fields[valueFieldIndex].values.get(valueIndex),
+              [TIME_SERIES_VALUE_FIELD_NAME]: frame.fields[valueFieldIndex].values[valueIndex],
             });
           }
         }
diff --git a/packages/grafana-data/src/types/vector.ts b/packages/grafana-data/src/types/vector.ts
index b63c7542490..b13e730d86a 100644
--- a/packages/grafana-data/src/types/vector.ts
+++ b/packages/grafana-data/src/types/vector.ts
@@ -1,12 +1,12 @@
 declare global {
   interface Array<T> {
-    /** @deprecated this only exists to help migrate Vector to Array */
+    /** @deprecated Use [idx]. This only exists to help migrate Vector to Array */
     get(idx: number): T;
-    /** @deprecated this only exists to help migrate Vector to Array */
+    /** @deprecated Use [idx]. This only exists to help migrate Vector to Array */
     set(idx: number, value: T): void;
-    /** @deprecated this only exists to help migrate Vector to Array */
+    /** @deprecated Use .push(value). This only exists to help migrate Vector to Array */
     add(value: T): void;
-    /** @deprecated this only exists to help migrate Vector to Array */
+    /** @deprecated this is not necessary.  This only exists to help migrate Vector to Array */
     toArray(): T[];
   }
 }
@@ -108,17 +108,21 @@ export interface MutableVector<T = any> extends ReadWriteVector<T> {}
 export function makeArrayIndexableVector<T extends Vector>(v: T): T {
   return new Proxy(v, {
     get(target: Vector, property: string, receiver: Vector) {
-      const idx = +property;
-      if (String(idx) === property) {
-        return target.get(idx);
+      if (typeof property !== 'symbol') {
+        const idx = +property;
+        if (String(idx) === property) {
+          return target.get(idx);
+        }
       }
       return Reflect.get(target, property, receiver);
     },
     set(target: Vector, property: string, value: any, receiver: Vector) {
-      const idx = +property;
-      if (String(idx) === property) {
-        target.set(idx, value);
-        return true;
+      if (typeof property !== 'symbol') {
+        const idx = +property;
+        if (String(idx) === property) {
+          target.set(idx, value);
+          return true;
+        }
       }
       return Reflect.set(target, property, value, receiver);
     },
diff --git a/packages/grafana-runtime/src/utils/queryResponse.ts b/packages/grafana-runtime/src/utils/queryResponse.ts
index 707550f9909..19b0d4b9e7f 100644
--- a/packages/grafana-runtime/src/utils/queryResponse.ts
+++ b/packages/grafana-runtime/src/utils/queryResponse.ts
@@ -234,7 +234,7 @@ export function frameToMetricFindValue(frame: DataFrame): MetricFindValue[] {
   }
   if (field) {
     for (let i = 0; i < field.values.length; i++) {
-      values.push({ text: '' + field.values.get(i) });
+      values.push({ text: '' + field.values[i] });
     }
   }
   return values;
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
index f3c8a3824d4..4ca237b890e 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
@@ -220,7 +220,7 @@ export class UPlotConfigBuilder {
         // interpolate for gradients/thresholds
         if (typeof s !== 'string') {
           let field = this.frames![0].fields[seriesIdx];
-          s = field.display!(field.values.get(u.cursor.idxs![seriesIdx]!)).color!;
+          s = field.display!(field.values[u.cursor.idxs![seriesIdx]!]).color!;
         }
 
         return s + alphaHex;
diff --git a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx
index f41b5072090..6e6e2a06713 100644
--- a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx
+++ b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx
@@ -183,7 +183,7 @@ export const TooltipPlugin = ({
   const xFieldFmt = xField.display || getDisplayProcessor({ field: xField, timeZone, theme });
   let tooltip: React.ReactNode = null;
 
-  let xVal = xFieldFmt(xField!.values.get(focusedPointIdx)).text;
+  let xVal = xFieldFmt(xField!.values[focusedPointIdx]).text;
 
   if (!renderTooltip) {
     // when interacting with a point in single mode
@@ -195,9 +195,9 @@ export const TooltipPlugin = ({
       }
 
       const dataIdx = focusedPointIdxs?.[focusedSeriesIdx] ?? focusedPointIdx;
-      xVal = xFieldFmt(xField!.values.get(dataIdx)).text;
+      xVal = xFieldFmt(xField!.values[dataIdx]).text;
       const fieldFmt = field.display || getDisplayProcessor({ field, timeZone, theme });
-      const display = fieldFmt(field.values.get(dataIdx));
+      const display = fieldFmt(field.values[dataIdx]);
 
       tooltip = (
         <SeriesTable
@@ -232,7 +232,7 @@ export const TooltipPlugin = ({
           continue;
         }
 
-        const v = otherProps.data.fields[i].values.get(focusedPointIdxs[i]!);
+        const v = otherProps.data.fields[i].values[focusedPointIdxs[i]!];
         const display = field.display!(v);
 
         sortIdx.push(v);
diff --git a/public/app/core/components/AppChrome/AppChrome.test.tsx b/public/app/core/components/AppChrome/AppChrome.test.tsx
index 7c2074ef6e8..35ed48715a5 100644
--- a/public/app/core/components/AppChrome/AppChrome.test.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.test.tsx
@@ -4,7 +4,7 @@ import React, { ReactNode } from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
-import { ArrayVector, DataFrame, DataFrameView, FieldType, NavModelItem } from '@grafana/data';
+import { DataFrame, DataFrameView, FieldType, NavModelItem } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from 'app/features/search/service';
@@ -23,12 +23,12 @@ const pageNav: NavModelItem = {
 
 const searchData: DataFrame = {
   fields: [
-    { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-    { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-    { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-    { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-    { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector([]) },
-    { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+    { name: 'kind', type: FieldType.string, config: {}, values: [] },
+    { name: 'name', type: FieldType.string, config: {}, values: [] },
+    { name: 'uid', type: FieldType.string, config: {}, values: [] },
+    { name: 'url', type: FieldType.string, config: {}, values: [] },
+    { name: 'tags', type: FieldType.other, config: {}, values: [] },
+    { name: 'location', type: FieldType.string, config: {}, values: [] },
   ],
   length: 0,
 };
diff --git a/public/app/core/components/TimelineChart/utils.ts b/public/app/core/components/TimelineChart/utils.ts
index eac440639e9..16872dd3b14 100644
--- a/public/app/core/components/TimelineChart/utils.ts
+++ b/public/app/core/components/TimelineChart/utils.ts
@@ -611,13 +611,13 @@ export function findNextStateIndex(field: Field, datapointIdx: number) {
     return null;
   }
 
-  const startValue = field.values.get(datapointIdx);
+  const startValue = field.values[datapointIdx];
 
   while (end === undefined) {
     if (rightPointer >= field.values.length) {
       return null;
     }
-    const rightValue = field.values.get(rightPointer);
+    const rightValue = field.values[rightPointer];
 
     if (rightValue === undefined || rightValue === startValue) {
       rightPointer++;
diff --git a/public/app/core/logsModel.ts b/public/app/core/logsModel.ts
index f1b5ea7a980..ed8bc923316 100644
--- a/public/app/core/logsModel.ts
+++ b/public/app/core/logsModel.ts
@@ -329,7 +329,7 @@ function getAllLabels(fields: LogFields): Labels[] {
   const { stringField, labelsField } = fields;
 
   if (labelsField !== undefined) {
-    return labelsField.values.toArray();
+    return labelsField.values;
   } else {
     return [stringField.labels ?? {}];
   }
@@ -342,7 +342,7 @@ function getLabelsForFrameRow(fields: LogFields, index: number): Labels {
   const { stringField, labelsField } = fields;
 
   if (labelsField !== undefined) {
-    return labelsField.values.get(index);
+    return labelsField.values[index];
   } else {
     return stringField.labels ?? {};
   }
@@ -407,13 +407,13 @@ export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[
     const { timeField, timeNanosecondField, stringField, logLevelField, idField, series } = info;
 
     for (let j = 0; j < series.length; j++) {
-      const ts = timeField.values.get(j);
+      const ts = timeField.values[j];
       const time = toUtc(ts);
-      const tsNs = timeNanosecondField ? timeNanosecondField.values.get(j) : undefined;
+      const tsNs = timeNanosecondField ? timeNanosecondField.values[j] : undefined;
       const timeEpochNs = tsNs ? tsNs : time.valueOf() + '000000';
 
       // In edge cases, this can be undefined. If undefined, we want to replace it with empty string.
-      const messageValue: unknown = stringField.values.get(j) ?? '';
+      const messageValue: unknown = stringField.values[j] ?? '';
       // This should be string but sometimes isn't (eg elastic) because the dataFrame is not strongly typed.
       const message: string = typeof messageValue === 'string' ? messageValue : JSON.stringify(messageValue);
 
@@ -433,7 +433,7 @@ export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[
       }
 
       let logLevel = LogLevel.unknown;
-      const logLevelKey = (logLevelField && logLevelField.values.get(j)) || (labels && labels['level']);
+      const logLevelKey = (logLevelField && logLevelField.values[j]) || (labels && labels['level']);
       if (logLevelKey) {
         logLevel = getLogLevelFromKey(logLevelKey);
       } else {
@@ -459,7 +459,7 @@ export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[
         entry,
         raw: message,
         labels: labels || {},
-        uid: idField ? idField.values.get(j) : j.toString(),
+        uid: idField ? idField.values[j] : j.toString(),
         datasourceType,
       });
     }
diff --git a/public/app/features/alerting/unified/components/expressions/Expression.tsx b/public/app/features/alerting/unified/components/expressions/Expression.tsx
index fd9b3fb44b9..739979f43b7 100644
--- a/public/app/features/alerting/unified/components/expressions/Expression.tsx
+++ b/public/app/features/alerting/unified/components/expressions/Expression.tsx
@@ -329,10 +329,10 @@ const TimeseriesRow: FC<FrameProps & { index: number }> = ({ frame, index }) =>
   const displayNameFromDS = valueField.config?.displayNameFromDS;
   const name = displayNameFromDS ?? (hasLabels ? formatLabels(valueField.labels ?? {}) : 'Series ' + index);
 
-  const timestamps = frame.fields[0].values.toArray();
+  const timestamps = frame.fields[0].values;
 
-  const getTimestampFromIndex = (index: number) => frame.fields[0].values.get(index);
-  const getValueFromIndex = (index: number) => frame.fields[1].values.get(index);
+  const getTimestampFromIndex = (index: number) => frame.fields[0].values[index];
+  const getValueFromIndex = (index: number) => frame.fields[1].values[index];
 
   return (
     <div className={styles.expression.resultsRow}>
diff --git a/public/app/features/alerting/unified/components/expressions/util.ts b/public/app/features/alerting/unified/components/expressions/util.ts
index ffa21753f28..1ca20292c9d 100644
--- a/public/app/features/alerting/unified/components/expressions/util.ts
+++ b/public/app/features/alerting/unified/components/expressions/util.ts
@@ -17,7 +17,7 @@ const getSeriesName = (frame: DataFrame): string => {
 };
 
 const getSeriesValue = (frame: DataFrame) => {
-  const value = frame.fields[0]?.values.get(0);
+  const value = frame.fields[0]?.values[0];
 
   if (Number.isFinite(value)) {
     return roundDecimals(value, 5);
@@ -33,9 +33,7 @@ const formatLabels = (labels: Labels): string => {
 };
 
 const isEmptySeries = (series: DataFrame[]): boolean => {
-  const isEmpty = series.every((serie) =>
-    serie.fields.every((field) => field.values.toArray().every((value) => value == null))
-  );
+  const isEmpty = series.every((serie) => serie.fields.every((field) => field.values.every((value) => value == null)));
 
   return isEmpty;
 };
diff --git a/public/app/features/alerting/unified/components/rule-editor/preview.ts b/public/app/features/alerting/unified/components/rule-editor/preview.ts
index 1e535d3c4b2..04b08ae156c 100644
--- a/public/app/features/alerting/unified/components/rule-editor/preview.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/preview.ts
@@ -26,10 +26,7 @@ export function mapDataFrameToAlertPreview({ fields }: DataFrame): AlertPreview
   const instances: AlertPreviewInstance[] = [];
 
   for (let index = 0; index < instanceStatusCount; index++) {
-    const labelValues = labelIndexes.map((labelIndex) => [
-      fields[labelIndex].name,
-      fields[labelIndex].values.get(index),
-    ]);
+    const labelValues = labelIndexes.map((labelIndex) => [fields[labelIndex].name, fields[labelIndex].values[index]]);
     const state = fields[stateFieldIndex]?.values?.get(index);
     const info = fields[infoFieldIndex]?.values?.get(index);
 
diff --git a/public/app/features/annotations/components/AnnotationResultMapper.tsx b/public/app/features/annotations/components/AnnotationResultMapper.tsx
index fabef95b7e4..e59a758f094 100644
--- a/public/app/features/annotations/components/AnnotationResultMapper.tsx
+++ b/public/app/features/annotations/components/AnnotationResultMapper.tsx
@@ -57,7 +57,7 @@ export class AnnotationFieldMapper extends PureComponent<Props, State> {
             description += '...';
             break;
           }
-          description += f.values.get(i);
+          description += f.values[i];
         }
 
         if (description.length > 50) {
diff --git a/public/app/features/annotations/standardAnnotationSupport.ts b/public/app/features/annotations/standardAnnotationSupport.ts
index 880c9b04db6..2eb298a04e4 100644
--- a/public/app/features/annotations/standardAnnotationSupport.ts
+++ b/public/app/features/annotations/standardAnnotationSupport.ts
@@ -223,7 +223,7 @@ export function getAnnotationsFromData(
           if (f.text) {
             v = f.text; // TODO support templates!
           } else if (f.field) {
-            v = f.field.values.get(i);
+            v = f.field.values[i];
             if (v !== undefined && f.regex) {
               const match = f.regex.exec(v);
               if (match) {
diff --git a/public/app/features/commandPalette/actions/dashboardActions.test.ts b/public/app/features/commandPalette/actions/dashboardActions.test.ts
index 9675b0d9027..cb96ea07581 100644
--- a/public/app/features/commandPalette/actions/dashboardActions.test.ts
+++ b/public/app/features/commandPalette/actions/dashboardActions.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, DataFrameView, FieldType } from '@grafana/data';
+import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { ContextSrv, contextSrv } from 'app/core/services/context_srv';
 import impressionSrv from 'app/core/services/impression_srv';
@@ -13,12 +13,12 @@ describe('dashboardActions', () => {
 
   const searchData: DataFrame = {
     fields: [
-      { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector(['dashboard']) },
-      { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector(['My dashboard 1']) },
-      { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector(['my-dashboard-1']) },
-      { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector(['/my-dashboard-1']) },
-      { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector([['foo', 'bar']]) },
-      { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector(['my-folder-1']) },
+      { name: 'kind', type: FieldType.string, config: {}, values: ['dashboard'] },
+      { name: 'name', type: FieldType.string, config: {}, values: ['My dashboard 1'] },
+      { name: 'uid', type: FieldType.string, config: {}, values: ['my-dashboard-1'] },
+      { name: 'url', type: FieldType.string, config: {}, values: ['/my-dashboard-1'] },
+      { name: 'tags', type: FieldType.other, config: {}, values: [['foo', 'bar']] },
+      { name: 'location', type: FieldType.string, config: {}, values: ['my-folder-1'] },
     ],
     meta: {
       custom: {
diff --git a/public/app/features/explore/LogsSample.test.tsx b/public/app/features/explore/LogsSample.test.tsx
index 8c76cedcf57..61bf838c98e 100644
--- a/public/app/features/explore/LogsSample.test.tsx
+++ b/public/app/features/explore/LogsSample.test.tsx
@@ -2,14 +2,7 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { ComponentProps } from 'react';
 
-import {
-  ArrayVector,
-  FieldType,
-  LoadingState,
-  MutableDataFrame,
-  SupplementaryQueryType,
-  DataSourceApi,
-} from '@grafana/data';
+import { FieldType, LoadingState, MutableDataFrame, SupplementaryQueryType, DataSourceApi } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 
 import { LogsSamplePanel } from './LogsSamplePanel';
@@ -43,20 +36,20 @@ const sampleDataFrame = new MutableDataFrame({
     {
       name: 'labels',
       type: FieldType.other,
-      values: new ArrayVector([
+      values: [
         { place: 'luna', source: 'data' },
         { place: 'luna', source: 'data' },
-      ]),
+      ],
     },
     {
       name: 'Time',
       type: FieldType.time,
-      values: new ArrayVector(['2022-02-22T09:28:11.352440161Z', '2022-02-22T14:42:50.991981292Z']),
+      values: ['2022-02-22T09:28:11.352440161Z', '2022-02-22T14:42:50.991981292Z'],
     },
     {
       name: 'Line',
       type: FieldType.string,
-      values: new ArrayVector(['line1 ', 'line2']),
+      values: ['line1 ', 'line2'],
     },
   ],
 });
diff --git a/public/app/features/explore/TraceView/utils/transform.ts b/public/app/features/explore/TraceView/utils/transform.ts
index e7f1582af83..07f5d2a144e 100644
--- a/public/app/features/explore/TraceView/utils/transform.ts
+++ b/public/app/features/explore/TraceView/utils/transform.ts
@@ -9,7 +9,7 @@ export function transformDataFrames(frame?: DataFrame): Trace | null {
   let data: TraceResponse =
     frame.fields.length === 1
       ? // For backward compatibility when we sent whole json response in a single field/value
-        frame.fields[0].values.get(0)
+        frame.fields[0].values[0]
       : transformTraceDataFrame(frame);
   return transformTraceData(data);
 }
diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts
index 4e26abac682..c764e0dbc29 100644
--- a/public/app/features/explore/state/query.test.ts
+++ b/public/app/features/explore/state/query.test.ts
@@ -4,7 +4,6 @@ import { thunkTester } from 'test/core/thunk/thunkTester';
 import { assertIsDefined } from 'test/helpers/asserts';
 
 import {
-  ArrayVector,
   DataQueryResponse,
   DataSourceApi,
   DataSourceJsonData,
@@ -111,7 +110,7 @@ function setupQueryResponse(state: StoreState) {
       error: { message: 'test error' },
       data: [
         new MutableDataFrame({
-          fields: [{ name: 'test', values: new ArrayVector() }],
+          fields: [{ name: 'test', values: [] }],
           meta: {
             preferredVisualisationType: 'graph',
           },
diff --git a/public/app/features/explore/utils/decorators.test.ts b/public/app/features/explore/utils/decorators.test.ts
index 154717f1434..cca227e2816 100644
--- a/public/app/features/explore/utils/decorators.test.ts
+++ b/public/app/features/explore/utils/decorators.test.ts
@@ -267,9 +267,9 @@ describe('decorateWithTableResult', () => {
     expect(tableResult?.fields[0].name).toBe('Time');
     expect(tableResult?.fields[1].name).toBe('A-series');
     expect(tableResult?.fields[2].name).toBe('B-series');
-    expect(tableResult?.fields[0].values.toArray()).toEqual([100, 200, 300]);
-    expect(tableResult?.fields[1].values.toArray()).toEqual([4, 5, 6]);
-    expect(tableResult?.fields[2].values.toArray()).toEqual([4, 5, 6]);
+    expect(tableResult?.fields[0].values).toEqual([100, 200, 300]);
+    expect(tableResult?.fields[1].values).toEqual([4, 5, 6]);
+    expect(tableResult?.fields[2].values).toEqual([4, 5, 6]);
   });
 
   it('should not override fields display property when filled', async () => {
diff --git a/public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.ts b/public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.ts
index bf1a9794368..8d70d0c2c79 100644
--- a/public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.ts
+++ b/public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.ts
@@ -18,7 +18,7 @@ export const getRawPrometheusListItemsFromDataFrame = (dataFrame: DataFrame): in
   const newFields = dataFrame.fields.filter((field) => !['Time'].includes(field.name));
 
   // Get name from each series
-  let metricNames: string[] = newFields.find((field) => field.name === '__name__')?.values.toArray() ?? [];
+  let metricNames: string[] = newFields.find((field) => field.name === '__name__')?.values ?? [];
   if (!metricNames.length && newFields.length && newFields[0].values.length) {
     // These results do not have series labels
     // Matching the native prometheus UI which appears to only show the permutations of the first field in the query result.
@@ -38,7 +38,7 @@ export const getRawPrometheusListItemsFromDataFrame = (dataFrame: DataFrame): in
       if (label !== 'Time') {
         // Initialize the objects
         if (typeof field?.display === 'function') {
-          const stringValue = formattedValueToString(field?.display(field.values.get(i)));
+          const stringValue = formattedValueToString(field?.display(field.values[i]));
           if (stringValue) {
             formattedMetric[label] = stringValue;
           } else if (label.includes('Value #')) {
diff --git a/public/app/features/explore/utils/links.test.ts b/public/app/features/explore/utils/links.test.ts
index 5c1b5938768..1108e240b47 100644
--- a/public/app/features/explore/utils/links.test.ts
+++ b/public/app/features/explore/utils/links.test.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   CoreApp,
   DataFrame,
   DataLink,
@@ -211,7 +210,7 @@ describe('explore links utils', () => {
       const { field, range, dataFrame } = setup(noHyphenLink, true, {
         name: 'fluxDimensions',
         type: FieldType.string,
-        values: new ArrayVector([ROW_WITH_TEXT_VALUE.value, ROW_WITH_NULL_VALUE.value]),
+        values: [ROW_WITH_TEXT_VALUE.value, ROW_WITH_NULL_VALUE.value],
         config: {
           links: [noHyphenLink],
         },
@@ -242,7 +241,7 @@ describe('explore links utils', () => {
         {
           name: 'fluxDimensions',
           type: FieldType.string,
-          values: new ArrayVector([ROW_WITH_TEXT_VALUE.value, ROW_WITH_NULL_VALUE.value]),
+          values: [ROW_WITH_TEXT_VALUE.value, ROW_WITH_NULL_VALUE.value],
           config: {
             links: [noHyphenLink],
           },
@@ -251,7 +250,7 @@ describe('explore links utils', () => {
           {
             name: 'fluxDimension2',
             type: FieldType.string,
-            values: new ArrayVector(['foo2', ROW_WITH_NULL_VALUE.value]),
+            values: ['foo2', ROW_WITH_NULL_VALUE.value],
             config: {
               links: [noHyphenLink],
             },
@@ -286,7 +285,7 @@ describe('explore links utils', () => {
       const { field, range, dataFrame } = setup(transformationLink, true, {
         name: 'msg',
         type: FieldType.string,
-        values: new ArrayVector(['application=foo host=dev-001', 'application=bar host=prod-003']),
+        values: ['application=foo host=dev-001', 'application=bar host=prod-003'],
         config: {
           links: [transformationLink],
         },
@@ -335,7 +334,7 @@ describe('explore links utils', () => {
       const { field, range, dataFrame } = setup(transformationLink, true, {
         name: 'msg',
         type: FieldType.string,
-        values: new ArrayVector(['fieldA=asparagus fieldB=banana', 'fieldA=broccoli fieldB=apple']),
+        values: ['fieldA=asparagus fieldB=banana', 'fieldA=broccoli fieldB=apple'],
         config: {
           links: [transformationLink],
         },
@@ -374,7 +373,7 @@ describe('explore links utils', () => {
       const { field, range, dataFrame } = setup(transformationLink, true, {
         name: 'msg',
         type: FieldType.string,
-        values: new ArrayVector(['application=foo online=true', 'application=bar online=false']),
+        values: ['application=foo online=true', 'application=bar online=false'],
         config: {
           links: [transformationLink],
         },
@@ -417,7 +416,7 @@ describe('explore links utils', () => {
         {
           name: 'fieldWithLink',
           type: FieldType.string,
-          values: new ArrayVector(['application=link', 'application=link2']),
+          values: ['application=link', 'application=link2'],
           config: {
             links: [transformationLink],
           },
@@ -426,7 +425,7 @@ describe('explore links utils', () => {
           {
             name: 'fieldNamedInTransformation',
             type: FieldType.string,
-            values: new ArrayVector(['application=transform', 'application=transform2']),
+            values: ['application=transform', 'application=transform2'],
             config: {},
           },
         ]
@@ -470,7 +469,7 @@ describe('explore links utils', () => {
       const { field, range, dataFrame } = setup(transformationLink, true, {
         name: 'msg',
         type: FieldType.string,
-        values: new ArrayVector(['foo loki prod', 'dev bar grafana', 'prod grafana foo']),
+        values: ['foo loki prod', 'dev bar grafana', 'prod grafana foo'],
         config: {
           links: [transformationLink],
         },
@@ -545,7 +544,7 @@ describe('explore links utils', () => {
       const { field, range, dataFrame } = setup(transformationLink, true, {
         name: 'msg',
         type: FieldType.string,
-        values: new ArrayVector(['application=foo host=dev-001']),
+        values: ['application=foo host=dev-001'],
         config: {
           links: [transformationLink],
         },
@@ -570,7 +569,7 @@ describe('explore links utils', () => {
       const { field, range, dataFrame } = setup(transformationLink, true, {
         name: 'msg',
         type: FieldType.string,
-        values: new ArrayVector(['application=foo host=dev-001']),
+        values: ['application=foo host=dev-001'],
         config: {
           links: [transformationLink],
         },
@@ -712,7 +711,7 @@ function setup(
   const field: Field<string | null> = {
     name: 'flux-dimensions',
     type: FieldType.string,
-    values: new ArrayVector([ROW_WITH_TEXT_VALUE.value, ROW_WITH_NULL_VALUE.value]),
+    values: [ROW_WITH_TEXT_VALUE.value, ROW_WITH_NULL_VALUE.value],
     config: {
       links: [link],
     },
diff --git a/public/app/features/explore/utils/links.ts b/public/app/features/explore/utils/links.ts
index a8686e12d68..2e92ebedbaf 100644
--- a/public/app/features/explore/utils/links.ts
+++ b/public/app/features/explore/utils/links.ts
@@ -71,7 +71,7 @@ export const getFieldLinksForExplore = (options: {
   const scopedVars: ScopedVars = { ...(vars || {}) };
   scopedVars['__value'] = {
     value: {
-      raw: field.values.get(rowIndex),
+      raw: field.values[rowIndex],
     },
     text: 'Raw value',
   };
@@ -130,9 +130,9 @@ export const getFieldLinksForExplore = (options: {
             let fieldValue;
             if (transformation.field) {
               const transformField = dataFrame?.fields.find((field) => field.name === transformation.field);
-              fieldValue = transformField?.values.get(rowIndex);
+              fieldValue = transformField?.values[rowIndex];
             } else {
-              fieldValue = field.values.get(rowIndex);
+              fieldValue = field.values[rowIndex];
             }
 
             internalLinkSpecificVars = {
diff --git a/public/app/features/logs/components/LogDetails.test.tsx b/public/app/features/logs/components/LogDetails.test.tsx
index 4ac7009a90d..53e7a80b523 100644
--- a/public/app/features/logs/components/LogDetails.test.tsx
+++ b/public/app/features/logs/components/LogDetails.test.tsx
@@ -98,7 +98,7 @@ describe('LogDetails', () => {
           if (field.config && field.config.links) {
             return field.config.links.map((link) => {
               return {
-                href: link.url.replace('${__value.text}', field.values.get(rowIndex)),
+                href: link.url.replace('${__value.text}', field.values[rowIndex]),
                 title: link.title,
                 target: '_blank',
                 origin: field,
diff --git a/public/app/features/logs/components/LogDetails.tsx b/public/app/features/logs/components/LogDetails.tsx
index 1289b23991f..2f8a2cbba35 100644
--- a/public/app/features/logs/components/LogDetails.tsx
+++ b/public/app/features/logs/components/LogDetails.tsx
@@ -117,7 +117,7 @@ class UnThemedLogDetails extends PureComponent<Props> {
                       onClickHideField={onClickHideField}
                       onClickFilterOutLabel={onClickFilterOutLabel}
                       onClickFilterLabel={onClickFilterLabel}
-                      getStats={() => calculateStats(row.dataFrame.fields[fieldIndex].values.toArray())}
+                      getStats={() => calculateStats(row.dataFrame.fields[fieldIndex].values)}
                       displayedFields={displayedFields}
                       wrapLogMessage={wrapLogMessage}
                       row={row}
@@ -144,7 +144,7 @@ class UnThemedLogDetails extends PureComponent<Props> {
                       links={links}
                       onClickShowField={onClickShowField}
                       onClickHideField={onClickHideField}
-                      getStats={() => calculateStats(row.dataFrame.fields[fieldIndex].values.toArray())}
+                      getStats={() => calculateStats(row.dataFrame.fields[fieldIndex].values)}
                       displayedFields={displayedFields}
                       wrapLogMessage={wrapLogMessage}
                       row={row}
@@ -163,7 +163,7 @@ class UnThemedLogDetails extends PureComponent<Props> {
                       links={links}
                       onClickShowField={onClickShowField}
                       onClickHideField={onClickHideField}
-                      getStats={() => calculateStats(row.dataFrame.fields[fieldIndex].values.toArray())}
+                      getStats={() => calculateStats(row.dataFrame.fields[fieldIndex].values)}
                       displayedFields={displayedFields}
                       wrapLogMessage={wrapLogMessage}
                       row={row}
diff --git a/public/app/features/logs/components/logParser.test.ts b/public/app/features/logs/components/logParser.test.ts
index 0a97c1281e4..474f8cbe630 100644
--- a/public/app/features/logs/components/logParser.test.ts
+++ b/public/app/features/logs/components/logParser.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, FieldType, MutableDataFrame } from '@grafana/data';
+import { FieldType, MutableDataFrame } from '@grafana/data';
 import { ExploreFieldLinkModel } from 'app/features/explore/utils/links';
 
 import { createLogRow } from './__mocks__/logRow';
@@ -17,7 +17,7 @@ describe('logParser', () => {
               name: 'labels',
               type: FieldType.other,
               config: {},
-              values: new ArrayVector([{ place: 'luna', source: 'data' }]),
+              values: [{ place: 'luna', source: 'data' }],
             },
           ],
         }),
@@ -39,7 +39,7 @@ describe('logParser', () => {
               name: 'labels',
               type: FieldType.string,
               config: {},
-              values: new ArrayVector([{ place: 'luna', source: 'data' }]),
+              values: [{ place: 'luna', source: 'data' }],
             },
           ],
         }),
@@ -60,7 +60,7 @@ describe('logParser', () => {
               name: 'id',
               type: FieldType.string,
               config: {},
-              values: new ArrayVector(['1659620138401000000_8b1f7688_']),
+              values: ['1659620138401000000_8b1f7688_'],
             },
           ],
         }),
@@ -129,7 +129,7 @@ describe('logParser', () => {
           config: { links: [] },
           name: 'Line',
           type: FieldType.string,
-          values: new ArrayVector(['a', 'b']),
+          values: ['a', 'b'],
         },
         title: 'test',
         target: '_self',
@@ -163,7 +163,7 @@ describe('logParser', () => {
           config: { links: [] },
           name: 'Line',
           type: FieldType.string,
-          values: new ArrayVector(['a', 'b']),
+          values: ['a', 'b'],
         },
         title: 'test',
         target: '_self',
@@ -186,12 +186,12 @@ const testStringField = {
   name: 'test_field_string',
   type: FieldType.string,
   config: {},
-  values: new ArrayVector(['abc']),
+  values: ['abc'],
 };
 
 const testFieldWithNullValue = {
   name: 'test_field_null',
   type: FieldType.string,
   config: {},
-  values: new ArrayVector([null]),
+  values: [null],
 };
diff --git a/public/app/features/logs/components/logParser.ts b/public/app/features/logs/components/logParser.ts
index dc2676ccdc9..5950bb14c2e 100644
--- a/public/app/features/logs/components/logParser.ts
+++ b/public/app/features/logs/components/logParser.ts
@@ -71,7 +71,7 @@ export const getDataframeFields = memoizeOne(
         const links = getFieldLinks ? getFieldLinks(field, row.rowIndex, row.dataFrame) : [];
         return {
           keys: [field.name],
-          values: [field.values.get(row.rowIndex).toString()],
+          values: [field.values[row.rowIndex].toString()],
           links: links,
           fieldIndex: field.index,
         };
@@ -93,7 +93,7 @@ function shouldRemoveField(field: Field, index: number, row: LogRowModel) {
   if (
     field.name === firstTimeField?.name &&
     field.type === FieldType.time &&
-    field.values.get(0) === firstTimeField.values.get(0)
+    field.values[0] === firstTimeField.values[0]
   ) {
     return true;
   }
@@ -102,7 +102,7 @@ function shouldRemoveField(field: Field, index: number, row: LogRowModel) {
     return true;
   }
   // field that has empty value (we want to keep 0 or empty string)
-  if (field.values.get(row.rowIndex) == null) {
+  if (field.values[row.rowIndex] == null) {
     return true;
   }
   return false;
diff --git a/public/app/features/logs/utils.ts b/public/app/features/logs/utils.ts
index 9e164c18e22..8e064d43c3c 100644
--- a/public/app/features/logs/utils.ts
+++ b/public/app/features/logs/utils.ts
@@ -223,8 +223,8 @@ export const mergeLogsVolumeDataFrames = (dataFrames: DataFrame[]): { dataFrames
     };
 
     for (let pointIndex = 0; pointIndex < length; pointIndex++) {
-      const time: number = timeField.values.get(pointIndex);
-      const value: number = valueField.values.get(pointIndex);
+      const time: number = timeField.values[pointIndex];
+      const value: number = valueField.values[pointIndex];
       aggregated[level] ??= {};
       aggregated[level][time] = (aggregated[level][time] || 0) + value;
 
diff --git a/public/app/features/panel/components/PanelDataErrorView.test.tsx b/public/app/features/panel/components/PanelDataErrorView.test.tsx
index a55025757ca..b049a44ecd3 100644
--- a/public/app/features/panel/components/PanelDataErrorView.test.tsx
+++ b/public/app/features/panel/components/PanelDataErrorView.test.tsx
@@ -3,7 +3,7 @@ import { defaultsDeep } from 'lodash';
 import React from 'react';
 import { Provider } from 'react-redux';
 
-import { ArrayVector, FieldType, getDefaultTimeRange, LoadingState } from '@grafana/data';
+import { FieldType, getDefaultTimeRange, LoadingState } from '@grafana/data';
 import { PanelDataErrorViewProps } from '@grafana/runtime';
 import { configureStore } from 'app/store/configureStore';
 
@@ -28,7 +28,7 @@ describe('PanelDataErrorView', () => {
                 name: 'time',
                 type: FieldType.time,
                 config: {},
-                values: new ArrayVector([]),
+                values: [],
               },
             ],
             length: 0,
@@ -39,7 +39,7 @@ describe('PanelDataErrorView', () => {
                 name: 'value',
                 type: FieldType.number,
                 config: {},
-                values: new ArrayVector([]),
+                values: [],
               },
             ],
             length: 0,
diff --git a/public/app/features/panel/panellinks/linkSuppliers.test.ts b/public/app/features/panel/panellinks/linkSuppliers.test.ts
index 6e5f22f5fa8..c109581ae42 100644
--- a/public/app/features/panel/panellinks/linkSuppliers.test.ts
+++ b/public/app/features/panel/panellinks/linkSuppliers.test.ts
@@ -108,7 +108,7 @@ describe('getFieldLinksSupplier', () => {
       view: new DataFrameView(data),
       rowIndex,
       colIndex,
-      display: field.display!(field.values.get(rowIndex)),
+      display: field.display!(field.values[rowIndex]),
       hasLinks: true,
     };
 
diff --git a/public/app/features/panel/panellinks/linkSuppliers.ts b/public/app/features/panel/panellinks/linkSuppliers.ts
index f34da404f94..f3057cd3b51 100644
--- a/public/app/features/panel/panellinks/linkSuppliers.ts
+++ b/public/app/features/panel/panellinks/linkSuppliers.ts
@@ -85,10 +85,10 @@ export const getFieldLinksSupplier = (value: FieldDisplay): LinkModelSupplier<Fi
             const { timeField } = getTimeField(dataFrame);
             scopedVars['__value'] = {
               value: {
-                raw: field.values.get(value.rowIndex),
+                raw: field.values[value.rowIndex],
                 numeric: value.display.numeric,
                 text: formattedValueToString(value.display),
-                time: timeField ? timeField.values.get(value.rowIndex) : undefined,
+                time: timeField ? timeField.values[value.rowIndex] : undefined,
               },
               text: 'Value',
             };
diff --git a/public/app/features/plugins/sql/ResponseParser.ts b/public/app/features/plugins/sql/ResponseParser.ts
index fcb12f4e913..3c6589d3124 100644
--- a/public/app/features/plugins/sql/ResponseParser.ts
+++ b/public/app/features/plugins/sql/ResponseParser.ts
@@ -11,11 +11,11 @@ export class ResponseParser implements ResponseParserType {
 
     if (textField && valueField) {
       for (let i = 0; i < textField.values.length; i++) {
-        values.push({ text: '' + textField.values.get(i), value: '' + valueField.values.get(i) });
+        values.push({ text: '' + textField.values[i], value: '' + valueField.values[i] });
       }
     } else {
       for (const field of frame.fields) {
-        for (const value of field.values.toArray()) {
+        for (const value of field.values) {
           values.push({ text: value });
         }
       }
diff --git a/public/app/features/search/page/components/FolderSection.test.tsx b/public/app/features/search/page/components/FolderSection.test.tsx
index e22d99cc9a2..cd2d3483715 100644
--- a/public/app/features/search/page/components/FolderSection.test.tsx
+++ b/public/app/features/search/page/components/FolderSection.test.tsx
@@ -2,7 +2,7 @@ import { render, screen, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { ArrayVector, DataFrame, DataFrameView, FieldType } from '@grafana/data';
+import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
 
 import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from '../../service';
 import { DashboardSearchItemType, DashboardViewItem } from '../../types';
@@ -29,12 +29,12 @@ describe('FolderSection', () => {
   describe('when there are no results', () => {
     const emptySearchData: DataFrame = {
       fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector([]) },
-        { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+        { name: 'kind', type: FieldType.string, config: {}, values: [] },
+        { name: 'name', type: FieldType.string, config: {}, values: [] },
+        { name: 'uid', type: FieldType.string, config: {}, values: [] },
+        { name: 'url', type: FieldType.string, config: {}, values: [] },
+        { name: 'tags', type: FieldType.other, config: {}, values: [] },
+        { name: 'location', type: FieldType.string, config: {}, values: [] },
       ],
       length: 0,
     };
@@ -95,12 +95,12 @@ describe('FolderSection', () => {
   describe('when there are results', () => {
     const searchData: DataFrame = {
       fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector([DashboardSearchItemType.DashDB]) },
-        { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector(['My dashboard 1']) },
-        { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector(['my-dashboard-1']) },
-        { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector(['/my-dashboard-1']) },
-        { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector([['foo', 'bar']]) },
-        { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector(['my-folder-1']) },
+        { name: 'kind', type: FieldType.string, config: {}, values: [DashboardSearchItemType.DashDB] },
+        { name: 'name', type: FieldType.string, config: {}, values: ['My dashboard 1'] },
+        { name: 'uid', type: FieldType.string, config: {}, values: ['my-dashboard-1'] },
+        { name: 'url', type: FieldType.string, config: {}, values: ['/my-dashboard-1'] },
+        { name: 'tags', type: FieldType.other, config: {}, values: [['foo', 'bar']] },
+        { name: 'location', type: FieldType.string, config: {}, values: ['my-folder-1'] },
       ],
       meta: {
         custom: {
diff --git a/public/app/features/search/page/components/RootFolderView.test.tsx b/public/app/features/search/page/components/RootFolderView.test.tsx
index 16fdd9c85f0..d49324a7bc1 100644
--- a/public/app/features/search/page/components/RootFolderView.test.tsx
+++ b/public/app/features/search/page/components/RootFolderView.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen, act } from '@testing-library/react';
 import React from 'react';
 
-import { ArrayVector, DataFrame, DataFrameView, FieldType } from '@grafana/data';
+import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
 import { ContextSrv, setContextSrv } from '../../../../core/services/context_srv';
@@ -30,11 +30,11 @@ describe('RootFolderView', () => {
         name: 'kind',
         type: FieldType.string,
         config: {},
-        values: new ArrayVector([DashboardSearchItemType.DashFolder]),
+        values: [DashboardSearchItemType.DashFolder],
       },
-      { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector(['My folder 1']) },
-      { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector(['my-folder-1']) },
-      { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector(['/my-folder-1']) },
+      { name: 'name', type: FieldType.string, config: {}, values: ['My folder 1'] },
+      { name: 'uid', type: FieldType.string, config: {}, values: ['my-folder-1'] },
+      { name: 'url', type: FieldType.string, config: {}, values: ['/my-folder-1'] },
     ],
     length: 1,
   };
diff --git a/public/app/features/search/page/components/SearchResultsCards.test.tsx b/public/app/features/search/page/components/SearchResultsCards.test.tsx
index d7bae65ae0d..941a8035464 100644
--- a/public/app/features/search/page/components/SearchResultsCards.test.tsx
+++ b/public/app/features/search/page/components/SearchResultsCards.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { Subject } from 'rxjs';
 
-import { ArrayVector, DataFrame, DataFrameView, FieldType } from '@grafana/data';
+import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
 
 import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from '../../service';
 import { DashboardSearchItemType } from '../../types';
@@ -19,14 +19,14 @@ describe('SearchResultsCards', () => {
   describe('when there is data', () => {
     const searchData: DataFrame = {
       fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector([DashboardSearchItemType.DashDB]) },
-        { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector(['my-dashboard-1']) },
-        { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector(['My dashboard 1']) },
-        { name: 'panel_type', type: FieldType.string, config: {}, values: new ArrayVector(['']) },
-        { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector(['/my-dashboard-1']) },
-        { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector([['foo', 'bar']]) },
-        { name: 'ds_uid', type: FieldType.other, config: {}, values: new ArrayVector(['']) },
-        { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector(['folder0/my-dashboard-1']) },
+        { name: 'kind', type: FieldType.string, config: {}, values: [DashboardSearchItemType.DashDB] },
+        { name: 'uid', type: FieldType.string, config: {}, values: ['my-dashboard-1'] },
+        { name: 'name', type: FieldType.string, config: {}, values: ['My dashboard 1'] },
+        { name: 'panel_type', type: FieldType.string, config: {}, values: [''] },
+        { name: 'url', type: FieldType.string, config: {}, values: ['/my-dashboard-1'] },
+        { name: 'tags', type: FieldType.other, config: {}, values: [['foo', 'bar']] },
+        { name: 'ds_uid', type: FieldType.other, config: {}, values: [''] },
+        { name: 'location', type: FieldType.string, config: {}, values: ['folder0/my-dashboard-1'] },
       ],
       meta: {
         custom: {
@@ -90,12 +90,12 @@ describe('SearchResultsCards', () => {
   describe('when there is no data', () => {
     const emptySearchData: DataFrame = {
       fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector([]) },
-        { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+        { name: 'kind', type: FieldType.string, config: {}, values: [] },
+        { name: 'name', type: FieldType.string, config: {}, values: [] },
+        { name: 'uid', type: FieldType.string, config: {}, values: [] },
+        { name: 'url', type: FieldType.string, config: {}, values: [] },
+        { name: 'tags', type: FieldType.other, config: {}, values: [] },
+        { name: 'location', type: FieldType.string, config: {}, values: [] },
       ],
       length: 0,
     };
diff --git a/public/app/features/search/page/components/SearchResultsTable.test.tsx b/public/app/features/search/page/components/SearchResultsTable.test.tsx
index 734fd824188..fafa6abdf96 100644
--- a/public/app/features/search/page/components/SearchResultsTable.test.tsx
+++ b/public/app/features/search/page/components/SearchResultsTable.test.tsx
@@ -2,15 +2,7 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { Subject } from 'rxjs';
 
-import {
-  applyFieldOverrides,
-  ArrayVector,
-  createTheme,
-  DataFrame,
-  DataFrameView,
-  FieldType,
-  toDataFrame,
-} from '@grafana/data';
+import { applyFieldOverrides, createTheme, DataFrame, DataFrameView, FieldType, toDataFrame } from '@grafana/data';
 
 import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from '../../service';
 import { DashboardSearchItemType } from '../../types';
@@ -121,12 +113,12 @@ describe('SearchResultsTable', () => {
   describe('when there is no data', () => {
     const emptySearchData: DataFrame = {
       fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector([]) },
-        { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector([]) },
-        { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector([]) },
+        { name: 'kind', type: FieldType.string, config: {}, values: [] },
+        { name: 'name', type: FieldType.string, config: {}, values: [] },
+        { name: 'uid', type: FieldType.string, config: {}, values: [] },
+        { name: 'url', type: FieldType.string, config: {}, values: [] },
+        { name: 'tags', type: FieldType.other, config: {}, values: [] },
+        { name: 'location', type: FieldType.string, config: {}, values: [] },
       ],
       length: 0,
     };
diff --git a/public/app/features/search/page/components/SearchResultsTable.tsx b/public/app/features/search/page/components/SearchResultsTable.tsx
index a1de8901c66..1801a8ac5e1 100644
--- a/public/app/features/search/page/components/SearchResultsTable.tsx
+++ b/public/app/features/search/page/components/SearchResultsTable.tsx
@@ -108,7 +108,7 @@ export const SearchResultsTable = React.memo(
         const row = rows[rowIndex];
         prepareRow(row);
 
-        const url = response.view.fields.url?.values.get(rowIndex);
+        const url = response.view.fields.url?.values[rowIndex];
         let className = styles.rowContainer;
         if (rowIndex === highlightIndex.y) {
           className += ' ' + styles.selectedRow;
diff --git a/public/app/features/search/page/components/SearchView.test.tsx b/public/app/features/search/page/components/SearchView.test.tsx
index 8c594887eca..9f0954f18f2 100644
--- a/public/app/features/search/page/components/SearchView.test.tsx
+++ b/public/app/features/search/page/components/SearchView.test.tsx
@@ -5,7 +5,7 @@ import { Provider } from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import { Observable } from 'rxjs';
 
-import { ArrayVector, DataFrame, DataFrameView, FieldType } from '@grafana/data';
+import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
 import { config } from '@grafana/runtime';
 
 import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from '../../service';
@@ -50,11 +50,11 @@ describe('SearchView', () => {
         name: 'kind',
         type: FieldType.string,
         config: {},
-        values: new ArrayVector([DashboardSearchItemType.DashFolder]),
+        values: [DashboardSearchItemType.DashFolder],
       },
-      { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector(['My folder 1']) },
-      { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector(['my-folder-1']) },
-      { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector(['/my-folder-1']) },
+      { name: 'name', type: FieldType.string, config: {}, values: ['My folder 1'] },
+      { name: 'uid', type: FieldType.string, config: {}, values: ['my-folder-1'] },
+      { name: 'url', type: FieldType.string, config: {}, values: ['/my-folder-1'] },
     ],
     length: 1,
   };
diff --git a/public/app/features/search/page/components/columns.tsx b/public/app/features/search/page/components/columns.tsx
index 8c7c71c0547..831b338c40f 100644
--- a/public/app/features/search/page/components/columns.tsx
+++ b/public/app/features/search/page/components/columns.tsx
@@ -92,8 +92,8 @@ export const generateColumns = (
         );
       },
       Cell: (p) => {
-        const uid = uidField.values.get(p.row.index);
-        const kind = kindField ? kindField.values.get(p.row.index) : 'dashboard'; // HACK for now
+        const uid = uidField.values[p.row.index];
+        const kind = kindField ? kindField.values[p.row.index] : 'dashboard'; // HACK for now
         const selected = selection(kind, uid);
         const hasUID = uid != null; // Panels don't have UID! Likely should not be shown on pages with manage options
         return (
@@ -120,7 +120,7 @@ export const generateColumns = (
   columns.push({
     Cell: (p) => {
       let classNames = cx(styles.nameCellStyle);
-      let name = access.name.values.get(p.row.index);
+      let name = access.name.values[p.row.index];
       if (!name?.length) {
         const loading = p.row.index >= response.view.dataFrame.length;
         name = loading ? 'Loading...' : 'Missing title'; // normal for panels
@@ -166,7 +166,7 @@ export const generateColumns = (
     availableWidth -= width;
     columns.push({
       Cell: (p) => {
-        const parts = (access.location?.values.get(p.row.index) ?? '').split('/');
+        const parts = (access.location?.values[p.row.index] ?? '').split('/');
         return (
           <div {...p.cellProps} className={cx(styles.locationCellStyle)}>
             {parts.map((p) => {
@@ -226,8 +226,8 @@ export const generateColumns = (
         new ShowModalReactEvent({
           component: ExplainScorePopup,
           props: {
-            name: access.name.values.get(row),
-            explain: access.explain.values.get(row),
+            name: access.name.values[row],
+            explain: access.explain.values[row],
             frame: response.view.dataFrame,
             row: row,
           },
@@ -255,7 +255,7 @@ export const generateColumns = (
 
 function hasValue(f: Field): boolean {
   for (let i = 0; i < f.values.length; i++) {
-    if (f.values.get(i) != null) {
+    if (f.values[i] != null) {
       return true;
     }
   }
@@ -276,7 +276,7 @@ function makeDataSourceColumn(
     field,
     Header: t('search.results-table.datasource-header', 'Data source'),
     Cell: (p) => {
-      const dslist = field.values.get(p.row.index);
+      const dslist = field.values[p.row.index];
       if (!dslist?.length) {
         return null;
       }
@@ -325,7 +325,7 @@ function makeTypeColumn(
     Header: t('search.results-table.type-header', 'Type'),
     Cell: (p) => {
       const i = p.row.index;
-      const kind = kindField?.values.get(i) ?? 'dashboard';
+      const kind = kindField?.values[i] ?? 'dashboard';
       let icon: IconName = 'apps';
       let txt = 'Dashboard';
       if (kind) {
@@ -342,7 +342,7 @@ function makeTypeColumn(
 
           case 'panel':
             icon = `${PluginIconName.panel}`;
-            const type = typeField.values.get(i);
+            const type = typeField.values[i];
             if (type) {
               txt = type;
               const info = config.panels[txt];
@@ -384,7 +384,7 @@ function makeTagsColumn(
 ): TableColumn {
   return {
     Cell: (p) => {
-      const tags = field.values.get(p.row.index);
+      const tags = field.values[p.row.index];
       return tags ? (
         <div {...p.cellProps}>
           <TagList className={tagListClass} tags={tags} onClick={onTagSelected} />
@@ -409,8 +409,8 @@ function getDisplayValue({
   index: number;
   getDisplay: DisplayProcessor;
 }) {
-  const value = sortField.values.get(index);
-  if (['folder', 'panel'].includes(kind.values.get(index)) && value === 0) {
+  const value = sortField.values[index];
+  if (['folder', 'panel'].includes(kind.values[index]) && value === 0) {
     return '-';
   }
   return formattedValueToString(getDisplay(value));
diff --git a/public/app/features/search/service/frontend.test.ts b/public/app/features/search/service/frontend.test.ts
index dbb64328381..5ea2fd7f0cd 100644
--- a/public/app/features/search/service/frontend.test.ts
+++ b/public/app/features/search/service/frontend.test.ts
@@ -25,7 +25,7 @@ describe('FrontendSearcher', () => {
     };
     const results = await frontendSearcher.search(query);
 
-    expect(results.view.fields.name.values.toArray()).toMatchInlineSnapshot(`
+    expect(results.view.fields.name.values).toMatchInlineSnapshot(`
       [
         "foo cat",
         "bar dog",
@@ -43,7 +43,7 @@ describe('FrontendSearcher', () => {
     };
     const results = await frontendSearcher.search(query);
 
-    expect(results.view.fields.name.values.toArray()).toMatchInlineSnapshot(`
+    expect(results.view.fields.name.values).toMatchInlineSnapshot(`
       [
         "bar dog",
         "cow baz",
@@ -60,7 +60,7 @@ describe('FrontendSearcher', () => {
     };
     const results = await frontendSearcher.search(query);
 
-    expect(results.view.fields.name.values.toArray()).toMatchInlineSnapshot(`
+    expect(results.view.fields.name.values).toMatchInlineSnapshot(`
       [
         "bar dog",
       ]
diff --git a/public/app/features/search/service/frontend.ts b/public/app/features/search/service/frontend.ts
index 51b5af4c657..35b79c795e3 100644
--- a/public/app/features/search/service/frontend.ts
+++ b/public/app/features/search/service/frontend.ts
@@ -1,6 +1,6 @@
 import uFuzzy from '@leeoniya/ufuzzy';
 
-import { DataFrameView, SelectableValue, ArrayVector } from '@grafana/data';
+import { DataFrameView, SelectableValue } from '@grafana/data';
 import { TermCount } from 'app/core/components/TagFilter/TagFilter';
 
 import { DashboardQueryResult, GrafanaSearcher, QueryResponse, SearchQuery } from '.';
@@ -94,12 +94,12 @@ class FullResultCache {
   });
 
   constructor(private full: DataFrameView<DashboardQueryResult>) {
-    this.names = this.full.fields.name.values.toArray();
+    this.names = this.full.fields.name.values;
 
     // Copy with empty values
     this.empty = new DataFrameView<DashboardQueryResult>({
       ...this.full.dataFrame, // copy folder metadata
-      fields: this.full.dataFrame.fields.map((v) => ({ ...v, values: new ArrayVector([]) })),
+      fields: this.full.dataFrame.fields.map((v) => ({ ...v, values: [] })),
       length: 0, // for now
     });
   }
@@ -119,7 +119,7 @@ class FullResultCache {
     let [idxs, info, order] = this.ufuzzy.search(haystack, query, true);
 
     for (let c = 0; c < allFields.length; c++) {
-      let src = allFields[c].values.toArray();
+      let src = allFields[c].values;
       let dst = values[c];
 
       // <= 1000 matches (ranked)
@@ -140,7 +140,7 @@ class FullResultCache {
 
     // mutates the search object
     this.empty.dataFrame.fields.forEach((f, idx) => {
-      f.values = new ArrayVector(values[idx]); // or just set it?
+      f.values = values[idx]; // or just set it?
     });
     this.empty.dataFrame.length = this.empty.dataFrame.fields[0].values.length;
 
diff --git a/public/app/features/search/service/sql.ts b/public/app/features/search/service/sql.ts
index c5c57502eed..e7c8b1b530c 100644
--- a/public/app/features/search/service/sql.ts
+++ b/public/app/features/search/service/sql.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, DataFrameView, FieldType, getDisplayProcessor, SelectableValue } from '@grafana/data';
+import { DataFrame, DataFrameView, FieldType, getDisplayProcessor, SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { TermCount } from 'app/core/components/TagFilter/TagFilter';
 import { backendSrv } from 'app/core/services/backend_srv';
@@ -182,12 +182,12 @@ export class SQLSearcher implements GrafanaSearcher {
 
     const data: DataFrame = {
       fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: new ArrayVector(kind) },
-        { name: 'name', type: FieldType.string, config: {}, values: new ArrayVector(name) },
-        { name: 'uid', type: FieldType.string, config: {}, values: new ArrayVector(uid) },
-        { name: 'url', type: FieldType.string, config: {}, values: new ArrayVector(url) },
-        { name: 'tags', type: FieldType.other, config: {}, values: new ArrayVector(tags) },
-        { name: 'location', type: FieldType.string, config: {}, values: new ArrayVector(location) },
+        { name: 'kind', type: FieldType.string, config: {}, values: kind },
+        { name: 'name', type: FieldType.string, config: {}, values: name },
+        { name: 'uid', type: FieldType.string, config: {}, values: uid },
+        { name: 'url', type: FieldType.string, config: {}, values: url },
+        { name: 'tags', type: FieldType.other, config: {}, values: tags },
+        { name: 'location', type: FieldType.string, config: {}, values: location },
       ],
       length: name.length,
       meta: {
@@ -206,7 +206,7 @@ export class SQLSearcher implements GrafanaSearcher {
         name: sortMetaName, // Used in display
         type: FieldType.number,
         config: {},
-        values: new ArrayVector(sortBy),
+        values: sortBy,
       });
     }
 
diff --git a/public/app/features/storage/StorageFolderPage.tsx b/public/app/features/storage/StorageFolderPage.tsx
index 9ce2d424e61..63f2512ee30 100644
--- a/public/app/features/storage/StorageFolderPage.tsx
+++ b/public/app/features/storage/StorageFolderPage.tsx
@@ -21,7 +21,7 @@ export function StorageFolderPage(props: Props) {
 
   const renderListing = () => {
     if (listing.value) {
-      const names = listing.value.fields[0].values.toArray();
+      const names = listing.value.fields[0].values;
       return names.map((item: string) => {
         let name = item;
         const isFolder = name.indexOf('.') < 0;
diff --git a/public/app/features/storage/StoragePage.tsx b/public/app/features/storage/StoragePage.tsx
index b4c8c19e2c4..f8b3b690a2f 100644
--- a/public/app/features/storage/StoragePage.tsx
+++ b/public/app/features/storage/StoragePage.tsx
@@ -68,7 +68,7 @@ export default function StoragePage(props: Props) {
           frame.fields[0] = {
             ...name,
             getLinks: (cfg: ValueLinkConfig) => {
-              const n = name.values.get(cfg.valueRowIndex ?? 0);
+              const n = name.values[cfg.valueRowIndex ?? 0];
               const p = path + '/' + n;
               return [
                 {
@@ -93,7 +93,7 @@ export default function StoragePage(props: Props) {
     if (listing.value) {
       const length = listing.value.length;
       if (length === 1) {
-        const first = listing.value.fields[0].values.get(0) as string;
+        const first = listing.value.fields[0].values[0] as string;
         isFolder = !path.endsWith(first);
       } else {
         // TODO: handle files/folders which do not exist
@@ -104,12 +104,7 @@ export default function StoragePage(props: Props) {
   }, [path, listing]);
 
   const fileNames = useMemo(() => {
-    return (
-      listing.value?.fields
-        ?.find((f) => f.name === 'name')
-        ?.values?.toArray()
-        ?.filter((v) => typeof v === 'string') ?? []
-    );
+    return listing.value?.fields?.find((f) => f.name === 'name')?.values.filter((v) => typeof v === 'string') ?? [];
   }, [listing]);
 
   const renderView = () => {
diff --git a/public/app/features/templating/dataMacros.ts b/public/app/features/templating/dataMacros.ts
index 5eac406a39f..66a05d2ace6 100644
--- a/public/app/features/templating/dataMacros.ts
+++ b/public/app/features/templating/dataMacros.ts
@@ -54,10 +54,10 @@ function getValueForValueMacro(match: string, fieldPath?: string, scopedVars?: S
 
   if (fieldPath === 'time') {
     const timeField = frame.fields.find((f) => f.type === FieldType.time);
-    return timeField ? timeField.values.get(rowIndex) : undefined;
+    return timeField ? timeField.values[rowIndex] : undefined;
   }
 
-  const value = field.values.get(rowIndex);
+  const value = field.values[rowIndex];
   if (fieldPath === 'raw') {
     return value;
   }
diff --git a/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts b/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts
index 36995d4085d..5c81ccc6327 100644
--- a/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts
+++ b/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts
@@ -53,7 +53,7 @@ export function getFieldConfigFromFrame(
       continue;
     }
 
-    const configValue = field.values.get(rowIndex);
+    const configValue = field.values[rowIndex];
 
     if (configValue === null || configValue === undefined) {
       continue;
diff --git a/public/app/features/variables/query/operators.ts b/public/app/features/variables/query/operators.ts
index f42d00ca4db..16ccb1a73fd 100644
--- a/public/app/features/variables/query/operators.ts
+++ b/public/app/features/variables/query/operators.ts
@@ -72,10 +72,10 @@ export function toMetricFindValues(): OperatorFunction<PanelData, MetricFindValu
 
         for (const frame of frames) {
           for (let index = 0; index < frame.length; index++) {
-            const expandable = expandableIndex !== -1 ? frame.fields[expandableIndex].values.get(index) : undefined;
-            const string = frame.fields[stringIndex].values.get(index);
-            const text = textIndex !== -1 ? frame.fields[textIndex].values.get(index) : null;
-            const value = valueIndex !== -1 ? frame.fields[valueIndex].values.get(index) : null;
+            const expandable = expandableIndex !== -1 ? frame.fields[expandableIndex].values[index] : undefined;
+            const string = frame.fields[stringIndex].values[index];
+            const text = textIndex !== -1 ? frame.fields[textIndex].values[index] : null;
+            const value = valueIndex !== -1 ? frame.fields[valueIndex].values[index] : null;
 
             if (valueIndex === -1 && textIndex === -1) {
               metrics.push({ text: string, value: string, expandable });
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
index 81dc4d7e6a6..51e37149546 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
@@ -4,7 +4,6 @@ import {
   DataFrame,
   dataFrameToJSON,
   MutableDataFrame,
-  ArrayVector,
   DataSourceInstanceSettings,
   DataSourceJsonData,
   DataSourceRef,
@@ -35,15 +34,15 @@ export function setupForLogs() {
     fields: [
       {
         name: '@message',
-        values: new ArrayVector(['something']),
+        values: ['something'],
       },
       {
         name: '@timestamp',
-        values: new ArrayVector([1]),
+        values: [1],
       },
       {
         name: '@xrayTraceId',
-        values: new ArrayVector(['1-613f0d6b-3e7cb34375b60662359611bd']),
+        values: ['1-613f0d6b-3e7cb34375b60662359611bd'],
       },
     ],
     meta: { custom: { Status: CloudWatchLogsQueryStatus.Complete } },
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
index 0f4beed4989..6731c499e3b 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
@@ -128,7 +128,7 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
         // This queries for the results
         this.logsQuery(
           frames.map((dataFrame) => ({
-            queryId: dataFrame.fields[0].values.get(0),
+            queryId: dataFrame.fields[0].values[0],
             region: dataFrame.meta?.custom?.['Region'] ?? 'default',
             refId: dataFrame.refId!,
             statsGroups: logQueries.find((target) => target.refId === dataFrame.refId)?.statsGroups,
@@ -350,8 +350,8 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
       limit,
       startFromHead: direction !== LogRowContextQueryDirection.Backward,
       region: query?.region,
-      logGroupName: parseLogGroupName(logField!.values.get(row.rowIndex)),
-      logStreamName: logStreamField!.values.get(row.rowIndex),
+      logGroupName: parseLogGroupName(logField!.values[row.rowIndex]),
+      logStreamName: logStreamField!.values[row.rowIndex],
     };
 
     if (direction === LogRowContextQueryDirection.Backward) {
diff --git a/public/app/plugins/datasource/cloudwatch/utils/logsRetry.test.ts b/public/app/plugins/datasource/cloudwatch/utils/logsRetry.test.ts
index 2df16be208d..43d56688da6 100644
--- a/public/app/plugins/datasource/cloudwatch/utils/logsRetry.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/utils/logsRetry.test.ts
@@ -120,8 +120,8 @@ describe('runWithRetry', () => {
     // dataframe fields
     expect(values.length).toBe(1);
     expect(values[0].frames.length).toBe(2);
-    expect(values[0].frames[0].fields[0].values.get(0)).toBe('A');
-    expect(values[0].frames[1].fields[0].values.get(0)).toBe('B');
+    expect(values[0].frames[0].fields[0].values[0]).toBe('A');
+    expect(values[0].frames[1].fields[0].values[0]).toBe('B');
   });
 
   it('sends data and also error if only one query gets limit error', async () => {
@@ -145,7 +145,7 @@ describe('runWithRetry', () => {
     expect(queryFunc).nthCalledWith(1, targets);
     expect(values.length).toBe(1);
     expect(values[0].frames.length).toBe(1);
-    expect(values[0].frames[0].fields[0].values.get(0)).toBe('A');
+    expect(values[0].frames[0].fields[0].values[0]).toBe('A');
     expect(values[0].error).toEqual({ message: 'Some queries timed out: LimitExceededException' });
   });
 
@@ -190,8 +190,8 @@ describe('runWithRetry', () => {
     expect(queryFunc).nthCalledWith(3, [targetC]);
     expect(values.length).toBe(1);
     expect(values[0].frames.length).toBe(2);
-    expect(values[0].frames[0].fields[0].values.get(0)).toBe('A');
-    expect(values[0].frames[1].fields[0].values.get(0)).toBe('B');
+    expect(values[0].frames[0].fields[0].values[0]).toBe('A');
+    expect(values[0].frames[1].fields[0].values[0]).toBe('B');
     expect(values[0].error).toEqual({ message: 'Some queries timed out: LimitExceededException' });
   });
 });
diff --git a/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts b/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
index 6f19818be05..e72e6b87a8c 100644
--- a/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
@@ -315,8 +315,8 @@ describe('ElasticResponse', () => {
       const frame = result.data[0];
       expect(frame.name).toBe('Count');
       expect(frame.length).toBe(2);
-      expect(getTimeField(frame).values.get(0)).toBe(1000);
-      expect(getValueField(frame).values.get(0)).toBe(10);
+      expect(getTimeField(frame).values[0]).toBe(1000);
+      expect(getValueField(frame).values[0]).toBe(10);
     });
   });
 
@@ -367,11 +367,11 @@ describe('ElasticResponse', () => {
       const frame1 = result.data[0];
       const frame2 = result.data[1];
       expect(frame1.length).toBe(2);
-      expect(getValueField(frame1).values.get(0)).toBe(10);
-      expect(getTimeField(frame1).values.get(0)).toBe(1000);
+      expect(getValueField(frame1).values[0]).toBe(10);
+      expect(getTimeField(frame1).values[0]).toBe(1000);
 
       expect(frame2.name).toBe('Average value');
-      expect(getValueField(frame2).values.toArray()).toEqual([88, 99]);
+      expect(getValueField(frame2).values).toEqual([88, 99]);
     });
   });
 
@@ -546,9 +546,9 @@ describe('ElasticResponse', () => {
       expect(result.data[0].length).toBe(2);
       expect(result.data[0].name).toBe('p75 @value');
       expect(result.data[1].name).toBe('p90 @value');
-      expect(getValueField(result.data[0]).values.get(0)).toBe(3.3);
-      expect(getTimeField(result.data[0]).values.get(0)).toBe(1000);
-      expect(getValueField(result.data[1]).values.get(1)).toBe(4.5);
+      expect(getValueField(result.data[0]).values[0]).toBe(3.3);
+      expect(getTimeField(result.data[0]).values[0]).toBe(1000);
+      expect(getValueField(result.data[1]).values[1]).toBe(4.5);
     });
   });
 
@@ -629,8 +629,8 @@ describe('ElasticResponse', () => {
       expect(result.data[0].name).toBe('server1 Max @value');
       expect(result.data[1].name).toBe('server1 Std Dev Upper @value');
 
-      expect(getValueField(result.data[0]).values.get(0)).toBe(10.2);
-      expect(getValueField(result.data[1]).values.get(0)).toBe(3);
+      expect(getValueField(result.data[0]).values[0]).toBe(10.2);
+      expect(getValueField(result.data[1]).values[0]).toBe(3);
     });
   });
 
@@ -688,20 +688,20 @@ describe('ElasticResponse', () => {
       const firstSeries = result.data[0];
       expect(firstSeries.name).toBe('Top Metrics @value');
       expect(firstSeries.length).toBe(2);
-      expect(getTimeField(firstSeries).values.toArray()).toEqual([
+      expect(getTimeField(firstSeries).values).toEqual([
         new Date('2021-01-01T00:00:00.000Z').valueOf(),
         new Date('2021-01-01T00:00:10.000Z').valueOf(),
       ]);
-      expect(getValueField(firstSeries).values.toArray()).toEqual([1, 1]);
+      expect(getValueField(firstSeries).values).toEqual([1, 1]);
 
       const secondSeries = result.data[1];
       expect(secondSeries.name).toBe('Top Metrics @anotherValue');
       expect(secondSeries.length).toBe(2);
-      expect(getTimeField(secondSeries).values.toArray()).toEqual([
+      expect(getTimeField(secondSeries).values).toEqual([
         new Date('2021-01-01T00:00:00.000Z').valueOf(),
         new Date('2021-01-01T00:00:10.000Z').valueOf(),
       ]);
-      expect(getValueField(secondSeries).values.toArray()).toEqual([2, 2]);
+      expect(getValueField(secondSeries).values).toEqual([2, 2]);
     });
   });
 
@@ -1044,9 +1044,9 @@ describe('ElasticResponse', () => {
       expect(field2.name).toBe('p75 value');
       expect(field3.name).toBe('p90 value');
 
-      expect(field1.values.toArray()).toEqual(['id1', 'id2']);
-      expect(field2.values.toArray()).toEqual([3.3, 2.3]);
-      expect(field3.values.toArray()).toEqual([5.5, 4.5]);
+      expect(field1.values).toEqual(['id1', 'id2']);
+      expect(field2.values).toEqual([3.3, 2.3]);
+      expect(field3.values).toEqual([5.5, 4.5]);
     });
   });
 
@@ -1088,9 +1088,9 @@ describe('ElasticResponse', () => {
     it('should include field in metric name', () => {
       expect(result.data[0].length).toBe(1);
       expect(result.data[0].fields.length).toBe(3);
-      expect(result.data[0].fields[0].values.toArray()).toEqual(['server-1']);
-      expect(result.data[0].fields[1].values.toArray()).toEqual([1000]);
-      expect(result.data[0].fields[2].values.toArray()).toEqual([3000]);
+      expect(result.data[0].fields[0].values).toEqual(['server-1']);
+      expect(result.data[0].fields[1].values).toEqual([1000]);
+      expect(result.data[0].fields[2].values).toEqual([3000]);
     });
   });
 
@@ -1139,7 +1139,7 @@ describe('ElasticResponse', () => {
       expect(fields.length).toBe(1);
       const field = fields[0];
       expect(field.type === FieldType.other);
-      const values = field.values.toArray();
+      const values = field.values;
       expect(values.length).toBe(2);
       expect(values[0].sourceProp).toBe('asd');
       expect(values[0].fieldProp).toBe('field');
@@ -1206,12 +1206,12 @@ describe('ElasticResponse', () => {
       expect(result.data[0].name).toBe('Sum @value');
       expect(result.data[1].name).toBe('Max @value');
       expect(result.data[2].name).toBe('Sum @value * Max @value');
-      expect(getValueField(result.data[0]).values.get(0)).toBe(2);
-      expect(getValueField(result.data[1]).values.get(0)).toBe(3);
-      expect(getValueField(result.data[2]).values.get(0)).toBe(6);
-      expect(getValueField(result.data[0]).values.get(1)).toBe(3);
-      expect(getValueField(result.data[1]).values.get(1)).toBe(4);
-      expect(getValueField(result.data[2]).values.get(1)).toBe(12);
+      expect(getValueField(result.data[0]).values[0]).toBe(2);
+      expect(getValueField(result.data[1]).values[0]).toBe(3);
+      expect(getValueField(result.data[2]).values[0]).toBe(6);
+      expect(getValueField(result.data[0]).values[1]).toBe(3);
+      expect(getValueField(result.data[1]).values[1]).toBe(4);
+      expect(getValueField(result.data[2]).values[1]).toBe(12);
     });
   });
 
@@ -1286,11 +1286,11 @@ describe('ElasticResponse', () => {
       expect(frame.length).toBe(2);
       const { fields } = frame;
       expect(fields.length).toBe(5);
-      expect(fields[0].values.toArray()).toEqual([1000, 2000]);
-      expect(fields[1].values.toArray()).toEqual([2, 3]);
-      expect(fields[2].values.toArray()).toEqual([3, 4]);
-      expect(fields[3].values.toArray()).toEqual([6, 12]);
-      expect(fields[4].values.toArray()).toEqual([24, 48]);
+      expect(fields[0].values).toEqual([1000, 2000]);
+      expect(fields[1].values).toEqual([2, 3]);
+      expect(fields[2].values).toEqual([3, 4]);
+      expect(fields[3].values).toEqual([6, 12]);
+      expect(fields[4].values).toEqual([24, 48]);
     });
   });
 
@@ -1338,7 +1338,7 @@ describe('ElasticResponse', () => {
     it('should have time field values in DateTime format', () => {
       const timeField = result.data[0].fields.find((field) => field.name === '@timestamp');
       expect(timeField).toBeDefined();
-      expect(timeField?.values.get(0)).toBe(1546300800000);
+      expect(timeField?.values[0]).toBe(1546300800000);
     });
   });
 
@@ -1467,14 +1467,14 @@ describe('ElasticResponse', () => {
       const result = new ElasticResponse(targets, response).getLogs(undefined, 'level');
       const fieldCache = new FieldCache(result.data[0]);
       const field = fieldCache.getFieldByName('level');
-      expect(field?.values.toArray()).toEqual(['debug', 'error']);
+      expect(field?.values).toEqual(['debug', 'error']);
     });
 
     it('should re map levels field to new field', () => {
       const result = new ElasticResponse(targets, response).getLogs(undefined, 'fields.lvl');
       const fieldCache = new FieldCache(result.data[0]);
       const field = fieldCache.getFieldByName('level');
-      expect(field?.values.toArray()).toEqual(['debug', 'info']);
+      expect(field?.values).toEqual(['debug', 'info']);
     });
 
     it('should correctly guess field types', () => {
diff --git a/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts b/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts
index 5a4d2502862..cd74a7147b8 100644
--- a/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts
+++ b/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts
@@ -604,7 +604,7 @@ export class ElasticResponse {
 
     for (let frame of dataFrame) {
       for (let field of frame.fields) {
-        if (field.type === FieldType.time && typeof field.values.get(0) !== 'number') {
+        if (field.type === FieldType.time && typeof field.values[0] !== 'number') {
           field.values = convertFieldType(field, { destinationType: FieldType.time }).values;
         }
       }
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 1bfc8aa9eb3..cdf73047d0b 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -528,7 +528,7 @@ export class ElasticDatasource
       );
     } else {
       const sortField = row.dataFrame.fields.find((f) => f.name === 'sort');
-      const searchAfter = sortField?.values.get(row.rowIndex) || [row.timeEpochMs];
+      const searchAfter = sortField?.values[row.rowIndex] || [row.timeEpochMs];
       const sort = options?.direction === LogRowContextQueryDirection.Forward ? 'asc' : 'desc';
 
       const header =
@@ -1125,7 +1125,7 @@ export class ElasticDatasource
         // Sorting of results in the context query
         sortDirection: direction === LogRowContextQueryDirection.Backward ? 'desc' : 'asc',
         // Used to get the next log lines before/after the current log line using sort field of selected log line
-        searchAfter: row.dataFrame.fields.find((f) => f.name === 'sort')?.values.get(row.rowIndex) ?? [row.timeEpochMs],
+        searchAfter: row.dataFrame.fields.find((f) => f.name === 'sort')?.values[row.rowIndex] ?? [row.timeEpochMs],
       },
     };
 
diff --git a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
index 2578bba448b..b26b7689976 100644
--- a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
@@ -134,7 +134,7 @@ export class UnthemedQueryEditor extends PureComponent<Props, State> {
           next: (rsp) => {
             if (rsp.data.length) {
               const names = (rsp.data[0] as DataFrame).fields[0];
-              const folders = names.values.toArray().map((v) => ({
+              const folders = names.values.map((v) => ({
                 value: v,
                 label: v,
               }));
diff --git a/public/app/plugins/datasource/graphite/datasource.test.ts b/public/app/plugins/datasource/graphite/datasource.test.ts
index dbb59dd4c1d..61c5a314c0e 100644
--- a/public/app/plugins/datasource/graphite/datasource.test.ts
+++ b/public/app/plugins/datasource/graphite/datasource.test.ts
@@ -178,7 +178,7 @@ describe('graphiteDatasource', () => {
     it('should convert to millisecond resolution', async () => {
       await expect(response).toEmitValuesWith((values: any) => {
         const results = values[0];
-        expect(results.data[0].fields[1].values.get(0)).toBe(10);
+        expect(results.data[0].fields[1].values[0]).toBe(10);
       });
     });
   });
diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index ee3a4f7f6c0..98260c728ce 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -376,8 +376,8 @@ export class GraphiteDatasource
               const target = result.data[i];
 
               for (let y = 0; y < target.length; y++) {
-                const time = target.fields[0].values.get(y);
-                const value = target.fields[1].values.get(y);
+                const time = target.fields[0].values[y];
+                const value = target.fields[1].values[y];
 
                 if (!value) {
                   continue;
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 04d9dda778f..2a2a8838564 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -4,7 +4,6 @@ import { catchError, map } from 'rxjs/operators';
 
 import {
   AnnotationEvent,
-  ArrayVector,
   DataFrame,
   DataQueryError,
   DataQueryRequest,
@@ -89,7 +88,7 @@ function timeSeriesToDataFrame(timeSeries: TimeSeries): DataFrame {
     name: TIME_SERIES_TIME_FIELD_NAME,
     type: FieldType.time,
     config: {},
-    values: new ArrayVector<number>(times),
+    values: times,
   };
 
   const valueField = {
@@ -98,7 +97,7 @@ function timeSeriesToDataFrame(timeSeries: TimeSeries): DataFrame {
     config: {
       displayNameFromDS: timeSeries.title,
     },
-    values: new ArrayVector<unknown>(values),
+    values: values,
     labels: timeSeries.tags,
   };
 
diff --git a/public/app/plugins/datasource/influxdb/response_parser.ts b/public/app/plugins/datasource/influxdb/response_parser.ts
index e8e5c0d5946..44ceb65c32d 100644
--- a/public/app/plugins/datasource/influxdb/response_parser.ts
+++ b/public/app/plugins/datasource/influxdb/response_parser.ts
@@ -234,12 +234,12 @@ function getTableCols(dfs: DataFrame[], table: TableModel, target: InfluxQuery):
 }
 
 function getTableRows(dfs: DataFrame[], table: TableModel, labels: string[]): TableModel {
-  const values = dfs[0].fields[0].values.toArray();
+  const values = dfs[0].fields[0].values;
 
   for (let i = 0; i < values.length; i++) {
     const time = values[i];
     const metrics = dfs.map((df: DataFrame) => {
-      return df.fields[1] ? df.fields[1].values.toArray()[i] : null;
+      return df.fields[1] ? df.fields[1].values[i] : null;
     });
     if (metrics.indexOf(null) < 0) {
       table.rows.push([time, ...labels, ...metrics]);
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
index bc719e4b40c..47a47fd1f56 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -125,7 +125,7 @@ export class LogContextProvider {
     if (tsField === undefined) {
       throw new Error('loki: data frame missing time-field, should never happen');
     }
-    const tsValue = tsField.values.get(row.rowIndex);
+    const tsValue = tsField.values[row.rowIndex];
     const timestamp = toUtc(tsValue);
 
     const range =
diff --git a/public/app/plugins/datasource/loki/backendResultTransformer.test.ts b/public/app/plugins/datasource/loki/backendResultTransformer.test.ts
index 897f9e6fb6e..b323bfb4c34 100644
--- a/public/app/plugins/datasource/loki/backendResultTransformer.test.ts
+++ b/public/app/plugins/datasource/loki/backendResultTransformer.test.ts
@@ -1,6 +1,6 @@
 import { cloneDeep } from 'lodash';
 
-import { ArrayVector, DataFrame, DataQueryResponse, Field, FieldType } from '@grafana/data';
+import { DataFrame, DataQueryResponse, Field, FieldType } from '@grafana/data';
 
 import { transformBackendResult } from './backendResultTransformer';
 
@@ -31,34 +31,34 @@ const inputFrame: DataFrame = {
       name: 'Time',
       type: FieldType.time,
       config: {},
-      values: new ArrayVector([1645030244810, 1645030247027]),
+      values: [1645030244810, 1645030247027],
     },
     {
       name: 'Line',
       type: FieldType.string,
       config: {},
-      values: new ArrayVector(['line1', 'line2']),
+      values: ['line1', 'line2'],
     },
     {
       name: 'labels',
       type: FieldType.other,
       config: {},
-      values: new ArrayVector([
+      values: [
         { level: 'info', code: '41🌙' },
         { level: 'error', code: '41🌙' },
-      ]),
+      ],
     },
     {
       name: 'tsNs',
       type: FieldType.string,
       config: {},
-      values: new ArrayVector(['1645030244810757120', '1645030247027735040']),
+      values: ['1645030244810757120', '1645030247027735040'],
     },
     {
       name: 'id',
       type: FieldType.string,
       config: {},
-      values: new ArrayVector(['id1', 'id2']),
+      values: ['id1', 'id2'],
     },
   ],
   length: 5,
@@ -132,13 +132,13 @@ describe('loki backendResultTransformer', () => {
         {
           name: 'time',
           config: {},
-          values: new ArrayVector([1]),
+          values: [1],
           type: FieldType.time,
         },
         {
           name: 'line',
           config: {},
-          values: new ArrayVector(['line1']),
+          values: ['line1'],
           type: FieldType.string,
         },
       ],
@@ -167,10 +167,10 @@ describe('loki backendResultTransformer', () => {
       name: 'labels',
       type: FieldType.string,
       config: {},
-      values: new ArrayVector([
+      values: [
         { level: 'info', code: '41🌙', __error__: 'LogfmtParserErr' },
         { level: 'error', code: '41🌙' },
-      ]),
+      ],
     };
     const response: DataQueryResponse = { data: [clonedFrame] };
 
diff --git a/public/app/plugins/datasource/loki/configuration/DebugSection.tsx b/public/app/plugins/datasource/loki/configuration/DebugSection.tsx
index a5eeb577400..fba01027639 100644
--- a/public/app/plugins/datasource/loki/configuration/DebugSection.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DebugSection.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import cx from 'classnames';
 import React, { ReactNode, useState } from 'react';
 
-import { ArrayVector, Field, FieldType, LinkModel } from '@grafana/data';
+import { Field, FieldType, LinkModel } from '@grafana/data';
 import { LegacyForms } from '@grafana/ui';
 
 import { getFieldLinksForExplore } from '../../../../features/explore/utils/links';
@@ -102,7 +102,7 @@ function makeDebugFields(derivedFields: DerivedFieldConfig[], debugText: string)
             field: {
               name: '',
               type: FieldType.string,
-              values: new ArrayVector([value]),
+              values: [value],
               config: {
                 links: [{ title: '', url: field.url }],
               },
diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index 312ec7729d6..2f789da2dd0 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -5,7 +5,6 @@ import { getQueryOptions } from 'test/helpers/getQueryOptions';
 import {
   AbstractLabelOperator,
   AnnotationQueryRequest,
-  ArrayVector,
   CoreApp,
   DataFrame,
   dataFrameToJSON,
@@ -57,19 +56,19 @@ const testFrame: DataFrame = {
       name: 'Time',
       type: FieldType.time,
       config: {},
-      values: new ArrayVector([1, 2]),
+      values: [1, 2],
     },
     {
       name: 'Line',
       type: FieldType.string,
       config: {},
-      values: new ArrayVector(['line1', 'line2']),
+      values: ['line1', 'line2'],
     },
     {
       name: 'labels',
       type: FieldType.other,
       config: {},
-      values: new ArrayVector([
+      values: [
         {
           label: 'value',
           label2: 'value ',
@@ -79,19 +78,19 @@ const testFrame: DataFrame = {
           label2: 'value2',
           label3: ' ',
         },
-      ]),
+      ],
     },
     {
       name: 'tsNs',
       type: FieldType.string,
       config: {},
-      values: new ArrayVector(['1000000', '2000000']),
+      values: ['1000000', '2000000'],
     },
     {
       name: 'id',
       type: FieldType.string,
       config: {},
-      values: new ArrayVector(['id1', 'id2']),
+      values: ['id1', 'id2'],
     },
   ],
   length: 2,
@@ -400,19 +399,19 @@ describe('LokiDatasource', () => {
             name: 'Time',
             type: FieldType.time,
             config: {},
-            values: new ArrayVector([1, 2]),
+            values: [1, 2],
           },
           {
             name: 'Line',
             type: FieldType.string,
             config: {},
-            values: new ArrayVector(['hello', 'hello 2']),
+            values: ['hello', 'hello 2'],
           },
           {
             name: 'labels',
             type: FieldType.other,
             config: {},
-            values: new ArrayVector([
+            values: [
               {
                 label: 'value',
                 label2: 'value ',
@@ -422,19 +421,19 @@ describe('LokiDatasource', () => {
                 label2: 'value2',
                 label3: ' ',
               },
-            ]),
+            ],
           },
           {
             name: 'tsNs',
             type: FieldType.string,
             config: {},
-            values: new ArrayVector(['1000000', '2000000']),
+            values: ['1000000', '2000000'],
           },
           {
             name: 'id',
             type: FieldType.string,
             config: {},
-            values: new ArrayVector(['id1', 'id2']),
+            values: ['id1', 'id2'],
           },
         ],
         length: 2,
@@ -457,37 +456,37 @@ describe('LokiDatasource', () => {
             name: 'Time',
             type: FieldType.time,
             config: {},
-            values: new ArrayVector([1]),
+            values: [1],
           },
           {
             name: 'Line',
             type: FieldType.string,
             config: {},
-            values: new ArrayVector(['hello']),
+            values: ['hello'],
           },
           {
             name: 'labels',
             type: FieldType.other,
             config: {},
-            values: new ArrayVector([
+            values: [
               {
                 label: 'value',
                 label2: 'value2',
                 label3: 'value3',
               },
-            ]),
+            ],
           },
           {
             name: 'tsNs',
             type: FieldType.string,
             config: {},
-            values: new ArrayVector(['1000000']),
+            values: ['1000000'],
           },
           {
             name: 'id',
             type: FieldType.string,
             config: {},
-            values: new ArrayVector(['id1']),
+            values: ['id1'],
           },
         ],
         length: 1,
diff --git a/public/app/plugins/datasource/loki/getDerivedFields.test.ts b/public/app/plugins/datasource/loki/getDerivedFields.test.ts
index 6853c097c38..4091d70e09a 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.test.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.test.ts
@@ -39,14 +39,14 @@ describe('getDerivedFields', () => {
     ]);
     expect(newFields.length).toBe(2);
     const trace1 = newFields.find((f) => f.name === 'trace1');
-    expect(trace1!.values.toArray()).toEqual([null, '1234', null]);
+    expect(trace1!.values).toEqual([null, '1234', null]);
     expect(trace1!.config.links![0]).toEqual({
       url: 'http://localhost/${__value.raw}',
       title: '',
     });
 
     const trace2 = newFields.find((f) => f.name === 'trace2');
-    expect(trace2!.values.toArray()).toEqual([null, null, 'foo']);
+    expect(trace2!.values).toEqual([null, null, 'foo']);
     expect(trace2!.config.links!.length).toBe(2);
     expect(trace2!.config.links![0]).toEqual({
       title: '',
diff --git a/public/app/plugins/datasource/loki/getDerivedFields.ts b/public/app/plugins/datasource/loki/getDerivedFields.ts
index 04e4a32ec8c..3a87fe92259 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.ts
@@ -1,6 +1,6 @@
 import { groupBy } from 'lodash';
 
-import { FieldType, DataFrame, ArrayVector, DataLink, Field } from '@grafana/data';
+import { FieldType, DataFrame, DataLink, Field } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
 
 import { DerivedFieldConfig } from './types';
@@ -22,7 +22,7 @@ export function getDerivedFields(dataFrame: DataFrame, derivedFieldConfigs: Deri
     throw new Error('invalid logs-dataframe, string-field missing');
   }
 
-  lineField.values.toArray().forEach((line) => {
+  lineField.values.forEach((line) => {
     for (const field of newFields) {
       const logMatch = line.match(derivedFieldsGrouped[field.name][0].matcherRegex);
       field.values.add(logMatch && logMatch[1]);
@@ -35,7 +35,7 @@ export function getDerivedFields(dataFrame: DataFrame, derivedFieldConfigs: Deri
 /**
  * Transform derivedField config into dataframe field with config that contains link.
  */
-function fieldFromDerivedFieldConfig(derivedFieldConfigs: DerivedFieldConfig[]): Field<any, ArrayVector> {
+function fieldFromDerivedFieldConfig(derivedFieldConfigs: DerivedFieldConfig[]): Field {
   const dataSourceSrv = getDataSourceSrv();
 
   const dataLinks = derivedFieldConfigs.reduce<DataLink[]>((acc, derivedFieldConfig) => {
@@ -72,6 +72,6 @@ function fieldFromDerivedFieldConfig(derivedFieldConfigs: DerivedFieldConfig[]):
       links: dataLinks,
     },
     // We are adding values later on
-    values: new ArrayVector<string>([]),
+    values: [],
   };
 }
diff --git a/public/app/plugins/datasource/loki/makeTableFrames.test.ts b/public/app/plugins/datasource/loki/makeTableFrames.test.ts
index 2fbb072e24b..fbe8536e21d 100644
--- a/public/app/plugins/datasource/loki/makeTableFrames.test.ts
+++ b/public/app/plugins/datasource/loki/makeTableFrames.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 
 import { makeTableFrames } from './makeTableFrames';
 
@@ -13,7 +13,7 @@ const frame1: DataFrame = {
       name: 'Time',
       type: FieldType.time,
       config: {},
-      values: new ArrayVector([1645029699311]),
+      values: [1645029699311],
     },
     {
       name: 'Value',
@@ -26,7 +26,7 @@ const frame1: DataFrame = {
       config: {
         displayNameFromDS: '{level="error", location="moon", protocol="http"}',
       },
-      values: new ArrayVector([23]),
+      values: [23],
     },
   ],
   length: 1,
@@ -43,7 +43,7 @@ const frame2: DataFrame = {
       name: 'Time',
       type: FieldType.time,
       config: {},
-      values: new ArrayVector([1645029699311]),
+      values: [1645029699311],
     },
     {
       name: 'Value',
@@ -56,7 +56,7 @@ const frame2: DataFrame = {
       config: {
         displayNameFromDS: '{level="info", location="moon", protocol="http"}',
       },
-      values: new ArrayVector([45]),
+      values: [45],
     },
   ],
   length: 1,
@@ -73,7 +73,7 @@ const frame3: DataFrame = {
       name: 'Time',
       type: FieldType.time,
       config: {},
-      values: new ArrayVector([1645029699311]),
+      values: [1645029699311],
     },
     {
       name: 'Value',
@@ -86,7 +86,7 @@ const frame3: DataFrame = {
       config: {
         displayNameFromDS: '{level="error", location="moon", protocol="http"}',
       },
-      values: new ArrayVector([72]),
+      values: [72],
     },
   ],
   length: 1,
@@ -95,11 +95,11 @@ const frame3: DataFrame = {
 const outputSingle = [
   {
     fields: [
-      { config: {}, name: 'Time', type: 'time', values: new ArrayVector([1645029699311]) },
-      { config: { filterable: true }, name: 'level', type: 'string', values: new ArrayVector(['error']) },
-      { config: { filterable: true }, name: 'location', type: 'string', values: new ArrayVector(['moon']) },
-      { config: { filterable: true }, name: 'protocol', type: 'string', values: new ArrayVector(['http']) },
-      { config: {}, name: 'Value #A', type: 'number', values: new ArrayVector([23]) },
+      { config: {}, name: 'Time', type: 'time', values: [1645029699311] },
+      { config: { filterable: true }, name: 'level', type: 'string', values: ['error'] },
+      { config: { filterable: true }, name: 'location', type: 'string', values: ['moon'] },
+      { config: { filterable: true }, name: 'protocol', type: 'string', values: ['http'] },
+      { config: {}, name: 'Value #A', type: 'number', values: [23] },
     ],
     length: 1,
     meta: { preferredVisualisationType: 'table' },
@@ -110,11 +110,11 @@ const outputSingle = [
 const outputMulti = [
   {
     fields: [
-      { config: {}, name: 'Time', type: 'time', values: new ArrayVector([1645029699311, 1645029699311]) },
-      { config: { filterable: true }, name: 'level', type: 'string', values: new ArrayVector(['error', 'info']) },
-      { config: { filterable: true }, name: 'location', type: 'string', values: new ArrayVector(['moon', 'moon']) },
-      { config: { filterable: true }, name: 'protocol', type: 'string', values: new ArrayVector(['http', 'http']) },
-      { config: {}, name: 'Value #A', type: 'number', values: new ArrayVector([23, 45]) },
+      { config: {}, name: 'Time', type: 'time', values: [1645029699311, 1645029699311] },
+      { config: { filterable: true }, name: 'level', type: 'string', values: ['error', 'info'] },
+      { config: { filterable: true }, name: 'location', type: 'string', values: ['moon', 'moon'] },
+      { config: { filterable: true }, name: 'protocol', type: 'string', values: ['http', 'http'] },
+      { config: {}, name: 'Value #A', type: 'number', values: [23, 45] },
     ],
     length: 2,
     meta: { preferredVisualisationType: 'table' },
@@ -122,11 +122,11 @@ const outputMulti = [
   },
   {
     fields: [
-      { config: {}, name: 'Time', type: 'time', values: new ArrayVector([1645029699311]) },
-      { config: { filterable: true }, name: 'level', type: 'string', values: new ArrayVector(['error']) },
-      { config: { filterable: true }, name: 'location', type: 'string', values: new ArrayVector(['moon']) },
-      { config: { filterable: true }, name: 'protocol', type: 'string', values: new ArrayVector(['http']) },
-      { config: {}, name: 'Value #B', type: 'number', values: new ArrayVector([72]) },
+      { config: {}, name: 'Time', type: 'time', values: [1645029699311] },
+      { config: { filterable: true }, name: 'level', type: 'string', values: ['error'] },
+      { config: { filterable: true }, name: 'location', type: 'string', values: ['moon'] },
+      { config: { filterable: true }, name: 'protocol', type: 'string', values: ['http'] },
+      { config: {}, name: 'Value #B', type: 'number', values: [72] },
     ],
     length: 1,
     meta: { preferredVisualisationType: 'table' },
diff --git a/public/app/plugins/datasource/loki/makeTableFrames.ts b/public/app/plugins/datasource/loki/makeTableFrames.ts
index 5baf3721b41..217f3e9058a 100644
--- a/public/app/plugins/datasource/loki/makeTableFrames.ts
+++ b/public/app/plugins/datasource/loki/makeTableFrames.ts
@@ -1,6 +1,6 @@
 import { groupBy } from 'lodash';
 
-import { DataFrame, Field, FieldType, ArrayVector } from '@grafana/data';
+import { DataFrame, Field, FieldType } from '@grafana/data';
 
 export function makeTableFrames(instantMetricFrames: DataFrame[]): DataFrame[] {
   // first we remove frames that have no refId
@@ -12,15 +12,15 @@ export function makeTableFrames(instantMetricFrames: DataFrame[]): DataFrame[] {
   return Object.entries(framesByRefId).map(([refId, frames]) => makeTableFrame(frames, refId));
 }
 
-type NumberField = Field<number, ArrayVector<number>>;
-type StringField = Field<string, ArrayVector<string>>;
+type NumberField = Field<number, number[]>;
+type StringField = Field<string, string[]>;
 
 function makeTableFrame(instantMetricFrames: DataFrame[], refId: string): DataFrame {
-  const tableTimeField: NumberField = { name: 'Time', config: {}, values: new ArrayVector(), type: FieldType.time };
+  const tableTimeField: NumberField = { name: 'Time', config: {}, values: [], type: FieldType.time };
   const tableValueField: NumberField = {
     name: `Value #${refId}`,
     config: {},
-    values: new ArrayVector(),
+    values: [],
     type: FieldType.number,
   };
 
@@ -34,7 +34,7 @@ function makeTableFrame(instantMetricFrames: DataFrame[], refId: string): DataFr
   const labelFields: StringField[] = sortedLabelNames.map((labelName) => ({
     name: labelName,
     config: { filterable: true },
-    values: new ArrayVector(),
+    values: [],
     type: FieldType.string,
   }));
 
@@ -45,15 +45,15 @@ function makeTableFrame(instantMetricFrames: DataFrame[], refId: string): DataFr
       return;
     }
 
-    const timeArray = timeField.values.toArray();
-    const valueArray = valueField.values.toArray();
+    const timeArray = timeField.values;
+    const valueArray = valueField.values;
 
     for (let x of timeArray) {
-      tableTimeField.values.add(x);
+      tableTimeField.values.push(x);
     }
 
     for (let x of valueArray) {
-      tableValueField.values.add(x);
+      tableValueField.values.push(x);
     }
 
     const labels = valueField.labels ?? {};
@@ -62,7 +62,7 @@ function makeTableFrame(instantMetricFrames: DataFrame[], refId: string): DataFr
       const text = labels[f.name] ?? '';
       // we insert the labels as many times as we have values
       for (let i = 0; i < valueArray.length; i++) {
-        f.values.add(text);
+        f.values.push(text);
       }
     }
   });
diff --git a/public/app/plugins/datasource/loki/mocks.ts b/public/app/plugins/datasource/loki/mocks.ts
index f0b3d288ce0..1507eb05f55 100644
--- a/public/app/plugins/datasource/loki/mocks.ts
+++ b/public/app/plugins/datasource/loki/mocks.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   DataFrame,
   DataFrameType,
   DataSourceInstanceSettings,
@@ -117,38 +116,38 @@ export function getMockFrames() {
         name: 'Time',
         type: FieldType.time,
         config: {},
-        values: new ArrayVector([3, 4]),
+        values: [3, 4],
       },
       {
         name: 'Line',
         type: FieldType.string,
         config: {},
-        values: new ArrayVector(['line1', 'line2']),
+        values: ['line1', 'line2'],
       },
       {
         name: 'labels',
         type: FieldType.other,
         config: {},
-        values: new ArrayVector([
+        values: [
           {
             label: 'value',
           },
           {
             otherLabel: 'other value',
           },
-        ]),
+        ],
       },
       {
         name: 'tsNs',
         type: FieldType.string,
         config: {},
-        values: new ArrayVector(['3000000', '4000000']),
+        values: ['3000000', '4000000'],
       },
       {
         name: 'id',
         type: FieldType.string,
         config: {},
-        values: new ArrayVector(['id1', 'id2']),
+        values: ['id1', 'id2'],
       },
     ],
     meta: {
@@ -170,35 +169,35 @@ export function getMockFrames() {
         name: 'Time',
         type: FieldType.time,
         config: {},
-        values: new ArrayVector([1, 2]),
+        values: [1, 2],
       },
       {
         name: 'Line',
         type: FieldType.string,
         config: {},
-        values: new ArrayVector(['line3', 'line4']),
+        values: ['line3', 'line4'],
       },
       {
         name: 'labels',
         type: FieldType.other,
         config: {},
-        values: new ArrayVector([
+        values: [
           {
             otherLabel: 'other value',
           },
-        ]),
+        ],
       },
       {
         name: 'tsNs',
         type: FieldType.string,
         config: {},
-        values: new ArrayVector(['1000000', '2000000']),
+        values: ['1000000', '2000000'],
       },
       {
         name: 'id',
         type: FieldType.string,
         config: {},
-        values: new ArrayVector(['id3', 'id4']),
+        values: ['id3', 'id4'],
       },
     ],
     meta: {
@@ -220,13 +219,13 @@ export function getMockFrames() {
         name: 'Time',
         type: FieldType.time,
         config: {},
-        values: new ArrayVector([3000000, 4000000]),
+        values: [3000000, 4000000],
       },
       {
         name: 'Value',
         type: FieldType.number,
         config: {},
-        values: new ArrayVector([5, 4]),
+        values: [5, 4],
         labels: {
           level: 'debug',
         },
@@ -249,13 +248,13 @@ export function getMockFrames() {
         name: 'Time',
         type: FieldType.time,
         config: {},
-        values: new ArrayVector([1000000, 2000000]),
+        values: [1000000, 2000000],
       },
       {
         name: 'Value',
         type: FieldType.number,
         config: {},
-        values: new ArrayVector([6, 7]),
+        values: [6, 7],
         labels: {
           level: 'debug',
         },
@@ -279,13 +278,13 @@ export function getMockFrames() {
         name: 'Time',
         type: FieldType.time,
         config: {},
-        values: new ArrayVector([3000000, 4000000]),
+        values: [3000000, 4000000],
       },
       {
         name: 'Value',
         type: FieldType.number,
         config: {},
-        values: new ArrayVector([6, 7]),
+        values: [6, 7],
         labels: {
           level: 'error',
         },
diff --git a/public/app/plugins/datasource/loki/queryHints.test.ts b/public/app/plugins/datasource/loki/queryHints.test.ts
index a84507848c0..2b02ca04745 100644
--- a/public/app/plugins/datasource/loki/queryHints.test.ts
+++ b/public/app/plugins/datasource/loki/queryHints.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 
 import { getQueryHints } from './queryHints';
 
@@ -12,7 +12,7 @@ describe('getQueryHints', () => {
           name: 'Line',
           type: FieldType.string,
           config: {},
-          values: new ArrayVector(['{"foo": "bar", "bar": "baz"}', '{"foo": "bar", "bar": "baz"}']),
+          values: ['{"foo": "bar", "bar": "baz"}', '{"foo": "bar", "bar": "baz"}'],
         },
       ],
     };
@@ -39,7 +39,7 @@ describe('getQueryHints', () => {
           name: 'Line',
           type: FieldType.string,
           config: {},
-          values: new ArrayVector(['foo="bar" bar="baz"', 'foo="bar" bar="baz"']),
+          values: ['foo="bar" bar="baz"', 'foo="bar" bar="baz"'],
         },
       ],
     };
@@ -66,7 +66,7 @@ describe('getQueryHints', () => {
           name: 'Line',
           type: FieldType.string,
           config: {},
-          values: new ArrayVector(['{"foo": "bar", "bar": "baz"}', 'foo="bar" bar="baz"']),
+          values: ['{"foo": "bar", "bar": "baz"}', 'foo="bar" bar="baz"'],
         },
       ],
     };
@@ -99,7 +99,7 @@ describe('getQueryHints', () => {
           name: 'Line',
           type: FieldType.string,
           config: {},
-          values: new ArrayVector(['{"_entry": "bar", "bar": "baz"}']),
+          values: ['{"_entry": "bar", "bar": "baz"}'],
         },
       ],
     };
@@ -139,13 +139,13 @@ describe('getQueryHints', () => {
             name: 'Line',
             type: FieldType.string,
             config: {},
-            values: new ArrayVector(['{"foo": "bar", "bar": "baz"}', 'foo="bar" bar="baz"']),
+            values: ['{"foo": "bar", "bar": "baz"}', 'foo="bar" bar="baz"'],
           },
           {
             name: 'labels',
             type: FieldType.other,
             config: {},
-            values: new ArrayVector([labelVariable, { job: 'baz', foo: 'bar' }]),
+            values: [labelVariable, { job: 'baz', foo: 'bar' }],
           },
         ],
       };
@@ -172,7 +172,7 @@ describe('getQueryHints', () => {
           name: 'Line',
           type: FieldType.string,
           config: {},
-          values: new ArrayVector(['{"foo": "bar", "bar": "baz"}', 'foo="bar" bar="baz"']),
+          values: ['{"foo": "bar", "bar": "baz"}', 'foo="bar" bar="baz"'],
         },
       ],
     };
@@ -199,7 +199,7 @@ describe('getQueryHints', () => {
           name: 'Line',
           type: FieldType.string,
           config: {},
-          values: new ArrayVector(['{"foo": "bar", "bar": "baz"}', 'foo="bar" bar="baz"']),
+          values: ['{"foo": "bar", "bar": "baz"}', 'foo="bar" bar="baz"'],
         },
       ],
     };
@@ -226,7 +226,7 @@ describe('getQueryHints', () => {
           name: 'labels',
           type: FieldType.other,
           config: {},
-          values: new ArrayVector([{ __error__: 'some error', job: 'a' }]),
+          values: [{ __error__: 'some error', job: 'a' }],
         },
       ],
     };
diff --git a/public/app/plugins/datasource/loki/responseUtils.test.ts b/public/app/plugins/datasource/loki/responseUtils.test.ts
index 81286ccb372..cde7de2956e 100644
--- a/public/app/plugins/datasource/loki/responseUtils.test.ts
+++ b/public/app/plugins/datasource/loki/responseUtils.test.ts
@@ -1,6 +1,6 @@
 import { cloneDeep } from 'lodash';
 
-import { ArrayVector, DataQueryResponse, QueryResultMetaStat, DataFrame, FieldType } from '@grafana/data';
+import { DataQueryResponse, QueryResultMetaStat, DataFrame, FieldType } from '@grafana/data';
 
 import { getMockFrames } from './mocks';
 import {
@@ -21,19 +21,19 @@ const frame: DataFrame = {
       name: 'Time',
       config: {},
       type: FieldType.time,
-      values: new ArrayVector([1]),
+      values: [1],
     },
     {
       name: 'labels',
       config: {},
       type: FieldType.other,
-      values: new ArrayVector([{ level: 'info' }]),
+      values: [{ level: 'info' }],
     },
     {
       name: 'Line',
       config: {},
       type: FieldType.string,
-      values: new ArrayVector(['line1']),
+      values: ['line1'],
     },
   ],
 };
@@ -41,7 +41,7 @@ const frame: DataFrame = {
 describe('dataFrameHasParsingError', () => {
   it('handles frame with parsing error', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([{ level: 'info', __error__: 'error' }]);
+    input.fields[1].values = [{ level: 'info', __error__: 'error' }];
     expect(dataFrameHasLokiError(input)).toBe(true);
   });
   it('handles frame without parsing error', () => {
@@ -53,12 +53,12 @@ describe('dataFrameHasParsingError', () => {
 describe('dataFrameHasLevelLabel', () => {
   it('returns true if level label is present', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([{ level: 'info' }]);
+    input.fields[1].values = [{ level: 'info' }];
     expect(dataFrameHasLevelLabel(input)).toBe(true);
   });
   it('returns false if level label is present', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([{ foo: 'bar' }]);
+    input.fields[1].values = [{ foo: 'bar' }];
     expect(dataFrameHasLevelLabel(input)).toBe(false);
   });
 });
@@ -66,17 +66,17 @@ describe('dataFrameHasLevelLabel', () => {
 describe('extractLevelLikeLabelFromDataFrame', () => {
   it('returns label if lvl label is present', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([{ lvl: 'info' }]);
+    input.fields[1].values = [{ lvl: 'info' }];
     expect(extractLevelLikeLabelFromDataFrame(input)).toBe('lvl');
   });
   it('returns label if level-like label is present', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([{ error_level: 'info' }]);
+    input.fields[1].values = [{ error_level: 'info' }];
     expect(extractLevelLikeLabelFromDataFrame(input)).toBe('error_level');
   });
   it('returns undefined if no level-like label is present', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([{ foo: 'info' }]);
+    input.fields[1].values = [{ foo: 'info' }];
     expect(extractLevelLikeLabelFromDataFrame(input)).toBe(null);
   });
 });
@@ -88,12 +88,12 @@ describe('extractLogParserFromDataFrame', () => {
   });
   it('identifies JSON', () => {
     const input = cloneDeep(frame);
-    input.fields[2].values = new ArrayVector(['{"a":"b"}']);
+    input.fields[2].values = ['{"a":"b"}'];
     expect(extractLogParserFromDataFrame(input)).toEqual({ hasJSON: true, hasLogfmt: false, hasPack: false });
   });
   it('identifies logfmt', () => {
     const input = cloneDeep(frame);
-    input.fields[2].values = new ArrayVector(['a=b']);
+    input.fields[2].values = ['a=b'];
     expect(extractLogParserFromDataFrame(input)).toEqual({ hasJSON: false, hasLogfmt: true, hasPack: false });
   });
 });
@@ -101,7 +101,7 @@ describe('extractLogParserFromDataFrame', () => {
 describe('extractLabelKeysFromDataFrame', () => {
   it('returns empty by default', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([]);
+    input.fields[1].values = [];
     expect(extractLabelKeysFromDataFrame(input)).toEqual([]);
   });
   it('extracts label keys', () => {
@@ -113,12 +113,12 @@ describe('extractLabelKeysFromDataFrame', () => {
 describe('extractUnwrapLabelKeysFromDataFrame', () => {
   it('returns empty by default', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([]);
+    input.fields[1].values = [];
     expect(extractUnwrapLabelKeysFromDataFrame(input)).toEqual([]);
   });
   it('extracts possible unwrap label keys', () => {
     const input = cloneDeep(frame);
-    input.fields[1].values = new ArrayVector([{ number: 13 }]);
+    input.fields[1].values = [{ number: 13 }];
     expect(extractUnwrapLabelKeysFromDataFrame(input)).toEqual(['number']);
   });
 });
@@ -152,19 +152,19 @@ describe('combineResponses', () => {
               config: {},
               name: 'Time',
               type: 'time',
-              values: new ArrayVector([1, 2, 3, 4]),
+              values: [1, 2, 3, 4],
             },
             {
               config: {},
               name: 'Line',
               type: 'string',
-              values: new ArrayVector(['line3', 'line4', 'line1', 'line2']),
+              values: ['line3', 'line4', 'line1', 'line2'],
             },
             {
               config: {},
               name: 'labels',
               type: 'other',
-              values: new ArrayVector([
+              values: [
                 {
                   otherLabel: 'other value',
                 },
@@ -174,19 +174,19 @@ describe('combineResponses', () => {
                 {
                   otherLabel: 'other value',
                 },
-              ]),
+              ],
             },
             {
               config: {},
               name: 'tsNs',
               type: 'string',
-              values: new ArrayVector(['1000000', '2000000', '3000000', '4000000']),
+              values: ['1000000', '2000000', '3000000', '4000000'],
             },
             {
               config: {},
               name: 'id',
               type: 'string',
-              values: new ArrayVector(['id3', 'id4', 'id1', 'id2']),
+              values: ['id3', 'id4', 'id1', 'id2'],
             },
           ],
           length: 4,
@@ -224,13 +224,13 @@ describe('combineResponses', () => {
               config: {},
               name: 'Time',
               type: 'time',
-              values: new ArrayVector([1000000, 2000000, 3000000, 4000000]),
+              values: [1000000, 2000000, 3000000, 4000000],
             },
             {
               config: {},
               name: 'Value',
               type: 'number',
-              values: new ArrayVector([6, 7, 5, 4]),
+              values: [6, 7, 5, 4],
               labels: {
                 level: 'debug',
               },
@@ -269,13 +269,13 @@ describe('combineResponses', () => {
               config: {},
               name: 'Time',
               type: 'time',
-              values: new ArrayVector([1000000, 2000000, 3000000, 4000000]),
+              values: [1000000, 2000000, 3000000, 4000000],
             },
             {
               config: {},
               name: 'Value',
               type: 'number',
-              values: new ArrayVector([6, 7, 5, 4]),
+              values: [6, 7, 5, 4],
               labels: {
                 level: 'debug',
               },
diff --git a/public/app/plugins/datasource/loki/responseUtils.ts b/public/app/plugins/datasource/loki/responseUtils.ts
index bebdd5dea11..7207851bbb9 100644
--- a/public/app/plugins/datasource/loki/responseUtils.ts
+++ b/public/app/plugins/datasource/loki/responseUtils.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   DataFrame,
   DataFrameType,
   DataQueryResponse,
@@ -16,12 +15,12 @@ import { isBytesString } from './languageUtils';
 import { isLogLineJSON, isLogLineLogfmt, isLogLinePacked } from './lineParser';
 
 export function dataFrameHasLokiError(frame: DataFrame): boolean {
-  const labelSets: Labels[] = frame.fields.find((f) => f.name === 'labels')?.values.toArray() ?? [];
+  const labelSets: Labels[] = frame.fields.find((f) => f.name === 'labels')?.values ?? [];
   return labelSets.some((labels) => labels.__error__ !== undefined);
 }
 
 export function dataFrameHasLevelLabel(frame: DataFrame): boolean {
-  const labelSets: Labels[] = frame.fields.find((f) => f.name === 'labels')?.values.toArray() ?? [];
+  const labelSets: Labels[] = frame.fields.find((f) => f.name === 'labels')?.values ?? [];
   return labelSets.some((labels) => labels.level !== undefined);
 }
 
@@ -35,7 +34,7 @@ export function extractLogParserFromDataFrame(frame: DataFrame): {
     return { hasJSON: false, hasLogfmt: false, hasPack: false };
   }
 
-  const logLines: string[] = lineField.values.toArray();
+  const logLines: string[] = lineField.values;
 
   let hasJSON = false;
   let hasLogfmt = false;
@@ -57,7 +56,7 @@ export function extractLogParserFromDataFrame(frame: DataFrame): {
 
 export function extractLabelKeysFromDataFrame(frame: DataFrame): string[] {
   const labelsArray: Array<{ [key: string]: string }> | undefined =
-    frame?.fields?.find((field) => field.name === 'labels')?.values.toArray() ?? [];
+    frame?.fields?.find((field) => field.name === 'labels')?.values ?? [];
 
   if (!labelsArray?.length) {
     return [];
@@ -68,7 +67,7 @@ export function extractLabelKeysFromDataFrame(frame: DataFrame): string[] {
 
 export function extractUnwrapLabelKeysFromDataFrame(frame: DataFrame): string[] {
   const labelsArray: Array<{ [key: string]: string }> | undefined =
-    frame?.fields?.find((field) => field.name === 'labels')?.values.toArray() ?? [];
+    frame?.fields?.find((field) => field.name === 'labels')?.values ?? [];
 
   if (!labelsArray?.length) {
     return [];
@@ -94,7 +93,7 @@ export function extractHasErrorLabelFromDataFrame(frame: DataFrame): boolean {
     return false;
   }
 
-  const labels: Array<{ [key: string]: string }> = labelField.values.toArray();
+  const labels: Array<{ [key: string]: string }> = labelField.values;
   return labels.some((label) => label['__error__']);
 }
 
@@ -106,7 +105,7 @@ export function extractLevelLikeLabelFromDataFrame(frame: DataFrame): string | n
 
   // Depending on number of labels, this can be pretty heavy operation.
   // Let's just look at first 2 lines If needed, we can introduce more later.
-  const labelsArray: Array<{ [key: string]: string }> = labelField.values.toArray().slice(0, 2);
+  const labelsArray: Array<{ [key: string]: string }> = labelField.values.slice(0, 2);
   let levelLikeLabel: string | null = null;
 
   // Find first level-like label
@@ -203,9 +202,7 @@ export function combineResponses(currentResult: DataQueryResponse | null, newRes
 function combineFrames(dest: DataFrame, source: DataFrame) {
   const totalFields = dest.fields.length;
   for (let i = 0; i < totalFields; i++) {
-    dest.fields[i].values = new ArrayVector(
-      [].concat.apply(source.fields[i].values.toArray(), dest.fields[i].values.toArray())
-    );
+    dest.fields[i].values = [].concat.apply(source.fields[i].values, dest.fields[i].values);
   }
   dest.length += source.length;
   dest.meta = {
@@ -251,9 +248,9 @@ export function cloneQueryResponse(response: DataQueryResponse): DataQueryRespon
 function cloneDataFrame(frame: DataQueryResponseData): DataQueryResponseData {
   return {
     ...frame,
-    fields: frame.fields.map((field: Field<unknown, ArrayVector>) => ({
+    fields: frame.fields.map((field: Field) => ({
       ...field,
-      values: new ArrayVector(field.values.toArray()),
+      values: field.values,
     })),
   };
 }
diff --git a/public/app/plugins/datasource/loki/sortDataFrame.test.ts b/public/app/plugins/datasource/loki/sortDataFrame.test.ts
index 987c78ce3f3..53fc94fd481 100644
--- a/public/app/plugins/datasource/loki/sortDataFrame.test.ts
+++ b/public/app/plugins/datasource/loki/sortDataFrame.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 
 import { sortDataFrameByTime, SortDirection } from './sortDataFrame';
 
@@ -9,19 +9,19 @@ const inputFrame: DataFrame = {
       name: 'time',
       type: FieldType.time,
       config: {},
-      values: new ArrayVector([1005, 1001, 1004, 1002, 1003]),
+      values: [1005, 1001, 1004, 1002, 1003],
     },
     {
       name: 'value',
       type: FieldType.string,
       config: {},
-      values: new ArrayVector(['line5', 'line1', 'line4', 'line2', 'line3']),
+      values: ['line5', 'line1', 'line4', 'line2', 'line3'],
     },
     {
       name: 'tsNs',
       type: FieldType.time,
       config: {},
-      values: new ArrayVector([`1005000000`, `1001000000`, `1004000000`, `1002000000`, `1003000000`]),
+      values: [`1005000000`, `1001000000`, `1004000000`, `1002000000`, `1003000000`],
     },
   ],
   length: 5,
@@ -31,23 +31,23 @@ describe('loki sortDataFrame', () => {
   it('sorts a dataframe ascending', () => {
     const sortedFrame = sortDataFrameByTime(inputFrame, SortDirection.Ascending);
     expect(sortedFrame.length).toBe(5);
-    const timeValues = sortedFrame.fields[0].values.toArray();
-    const lineValues = sortedFrame.fields[1].values.toArray();
-    const tsNsValues = sortedFrame.fields[2].values.toArray();
+    const timeValues = sortedFrame.fields[0].values;
+    const lineValues = sortedFrame.fields[1].values;
+    const tsNsValues = sortedFrame.fields[2].values;
 
-    expect(timeValues).toStrictEqual([1001, 1002, 1003, 1004, 1005]);
-    expect(lineValues).toStrictEqual(['line1', 'line2', 'line3', 'line4', 'line5']);
-    expect(tsNsValues).toStrictEqual([`1001000000`, `1002000000`, `1003000000`, `1004000000`, `1005000000`]);
+    expect(timeValues).toEqual([1001, 1002, 1003, 1004, 1005]);
+    expect(lineValues).toEqual(['line1', 'line2', 'line3', 'line4', 'line5']);
+    expect(tsNsValues).toEqual([`1001000000`, `1002000000`, `1003000000`, `1004000000`, `1005000000`]);
   });
   it('sorts a dataframe descending', () => {
     const sortedFrame = sortDataFrameByTime(inputFrame, SortDirection.Descending);
     expect(sortedFrame.length).toBe(5);
-    const timeValues = sortedFrame.fields[0].values.toArray();
-    const lineValues = sortedFrame.fields[1].values.toArray();
-    const tsNsValues = sortedFrame.fields[2].values.toArray();
+    const timeValues = sortedFrame.fields[0].values;
+    const lineValues = sortedFrame.fields[1].values;
+    const tsNsValues = sortedFrame.fields[2].values;
 
-    expect(timeValues).toStrictEqual([1005, 1004, 1003, 1002, 1001]);
-    expect(lineValues).toStrictEqual(['line5', 'line4', 'line3', 'line2', 'line1']);
-    expect(tsNsValues).toStrictEqual([`1005000000`, `1004000000`, `1003000000`, `1002000000`, `1001000000`]);
+    expect(timeValues).toEqual([1005, 1004, 1003, 1002, 1001]);
+    expect(lineValues).toEqual(['line5', 'line4', 'line3', 'line2', 'line1']);
+    expect(tsNsValues).toEqual([`1005000000`, `1004000000`, `1003000000`, `1002000000`, `1001000000`]);
   });
 });
diff --git a/public/app/plugins/datasource/loki/sortDataFrame.ts b/public/app/plugins/datasource/loki/sortDataFrame.ts
index dba69738950..54a7db6e9d5 100644
--- a/public/app/plugins/datasource/loki/sortDataFrame.ts
+++ b/public/app/plugins/datasource/loki/sortDataFrame.ts
@@ -16,7 +16,7 @@ export enum SortDirection {
 // - the first row will become the second
 // - the second row will become the third
 function makeIndex(field: Field<string>, dir: SortDirection): number[] {
-  const fieldValues: string[] = field.values.toArray();
+  const fieldValues: string[] = field.values;
 
   // we first build an array which is [0,1,2,3....]
   const index = Array(fieldValues.length);
@@ -65,7 +65,7 @@ export function sortDataFrameByTime(frame: DataFrame, dir: SortDirection): DataF
     ...rest,
     fields: fields.map((field) => ({
       ...field,
-      values: new SortedVector(field.values, index),
+      values: new SortedVector(field.values, index).toArray(),
     })),
   };
 
diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts
index 5f85575d54b..9c1bca08857 100644
--- a/public/app/plugins/datasource/mssql/datasource.ts
+++ b/public/app/plugins/datasource/mssql/datasource.ts
@@ -23,13 +23,13 @@ export class MssqlDatasource extends SqlDatasource {
 
   async fetchDatasets(): Promise<string[]> {
     const datasets = await this.runSql<{ name: string[] }>(showDatabases(), { refId: 'datasets' });
-    return datasets.fields.name?.values.toArray().flat() ?? [];
+    return datasets.fields.name?.values.flat() ?? [];
   }
 
   async fetchTables(dataset?: string): Promise<string[]> {
     // We get back the table name with the schema as well. like dbo.table
     const tables = await this.runSql<{ schemaAndName: string[] }>(getSchemaAndName(dataset), { refId: 'tables' });
-    return tables.fields.schemaAndName?.values.toArray().flat() ?? [];
+    return tables.fields.schemaAndName?.values.flat() ?? [];
   }
 
   async fetchFields(query: SQLQuery): Promise<SQLSelectableValue[]> {
@@ -42,8 +42,8 @@ export class MssqlDatasource extends SqlDatasource {
     });
     const result: SQLSelectableValue[] = [];
     for (let i = 0; i < schema.length; i++) {
-      const column = schema.fields.column.values.get(i);
-      const type = schema.fields.type.values.get(i);
+      const column = schema.fields.column.values[i];
+      const type = schema.fields.type.values[i];
       result.push({ label: column, value: column, type, icon: getIcon(type), raqbFieldType: getRAQBType(type) });
     }
     return result;
diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts
index af6d2e97e87..602dd9504c6 100644
--- a/public/app/plugins/datasource/postgres/datasource.ts
+++ b/public/app/plugins/datasource/postgres/datasource.ts
@@ -24,7 +24,7 @@ export class PostgresDatasource extends SqlDatasource {
 
   async getVersion(): Promise<string> {
     const value = await this.runSql<{ version: number }>(getVersion());
-    const results = value.fields.version?.values.toArray();
+    const results = value.fields.version?.values;
 
     if (!results) {
       return '';
@@ -35,7 +35,7 @@ export class PostgresDatasource extends SqlDatasource {
 
   async getTimescaleDBVersion(): Promise<string | undefined> {
     const value = await this.runSql<{ extversion: string }>(getTimescaleDBVersion());
-    const results = value.fields.extversion?.values.toArray();
+    const results = value.fields.extversion?.values;
 
     if (!results) {
       return undefined;
@@ -46,7 +46,7 @@ export class PostgresDatasource extends SqlDatasource {
 
   async fetchTables(): Promise<string[]> {
     const tables = await this.runSql<{ table: string[] }>(showTables(), { refId: 'tables' });
-    return tables.fields.table?.values.toArray().flat() ?? [];
+    return tables.fields.table?.values.flat() ?? [];
   }
 
   getSqlLanguageDefinition(db: DB): LanguageDefinition {
@@ -70,8 +70,8 @@ export class PostgresDatasource extends SqlDatasource {
     const schema = await this.runSql<{ column: string; type: string }>(getSchema(query.table), { refId: 'columns' });
     const result: SQLSelectableValue[] = [];
     for (let i = 0; i < schema.length; i++) {
-      const column = schema.fields.column.values.get(i);
-      const type = schema.fields.type.values.get(i);
+      const column = schema.fields.column.values[i];
+      const type = schema.fields.type.values[i];
       result.push({ label: column, value: column, type, ...getFieldConfig(type) });
     }
     return result;
diff --git a/public/app/plugins/datasource/prometheus/datasource.test.ts b/public/app/plugins/datasource/prometheus/datasource.test.ts
index 4ac51646a40..60c78de49a5 100644
--- a/public/app/plugins/datasource/prometheus/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.test.ts
@@ -396,9 +396,9 @@ describe('PrometheusDatasource', () => {
       ds.performTimeSeriesQuery = jest.fn().mockReturnValue(of(responseMock));
       await expect(ds.query(query)).toEmitValuesWith((result) => {
         const results = result[0].data;
-        expect(results[0].fields[1].values.toArray()).toEqual([10, 10]);
-        expect(results[0].fields[2].values.toArray()).toEqual([10, 0]);
-        expect(results[0].fields[3].values.toArray()).toEqual([5, 0]);
+        expect(results[0].fields[1].values).toEqual([10, 10]);
+        expect(results[0].fields[2].values).toEqual([10, 0]);
+        expect(results[0].fields[3].values).toEqual([5, 0]);
       });
     });
 
@@ -1018,27 +1018,27 @@ describe('PrometheusDatasource2', () => {
     });
 
     it('should fill null until first datapoint in response', () => {
-      expect(results.data[0].fields[0].values.get(0)).toBe(start * 1000);
-      expect(results.data[0].fields[1].values.get(0)).toBe(null);
-      expect(results.data[0].fields[0].values.get(1)).toBe((start + step * 1) * 1000);
-      expect(results.data[0].fields[1].values.get(1)).toBe(3846);
+      expect(results.data[0].fields[0].values[0]).toBe(start * 1000);
+      expect(results.data[0].fields[1].values[0]).toBe(null);
+      expect(results.data[0].fields[0].values[1]).toBe((start + step * 1) * 1000);
+      expect(results.data[0].fields[1].values[1]).toBe(3846);
     });
 
     it('should fill null after last datapoint in response', () => {
       const length = (end - start) / step + 1;
-      expect(results.data[0].fields[0].values.get(length - 2)).toBe((end - step * 1) * 1000);
-      expect(results.data[0].fields[1].values.get(length - 2)).toBe(3848);
-      expect(results.data[0].fields[0].values.get(length - 1)).toBe(end * 1000);
-      expect(results.data[0].fields[1].values.get(length - 1)).toBe(null);
+      expect(results.data[0].fields[0].values[length - 2]).toBe((end - step * 1) * 1000);
+      expect(results.data[0].fields[1].values[length - 2]).toBe(3848);
+      expect(results.data[0].fields[0].values[length - 1]).toBe(end * 1000);
+      expect(results.data[0].fields[1].values[length - 1]).toBe(null);
     });
 
     it('should fill null at gap between series', () => {
-      expect(results.data[0].fields[0].values.get(2)).toBe((start + step * 2) * 1000);
-      expect(results.data[0].fields[1].values.get(2)).toBe(null);
-      expect(results.data[1].fields[0].values.get(1)).toBe((start + step * 1) * 1000);
-      expect(results.data[1].fields[1].values.get(1)).toBe(null);
-      expect(results.data[1].fields[0].values.get(3)).toBe((start + step * 3) * 1000);
-      expect(results.data[1].fields[1].values.get(3)).toBe(null);
+      expect(results.data[0].fields[0].values[2]).toBe((start + step * 2) * 1000);
+      expect(results.data[0].fields[1].values[2]).toBe(null);
+      expect(results.data[1].fields[0].values[1]).toBe((start + step * 1) * 1000);
+      expect(results.data[1].fields[1].values[1]).toBe(null);
+      expect(results.data[1].fields[0].values[3]).toBe((start + step * 3) * 1000);
+      expect(results.data[1].fields[1].values[3]).toBe(null);
     });
   });
 
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index 991a6a9bc1f..7546ff3af29 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -866,10 +866,10 @@ export class PrometheusDatasource
       const timeValueTuple: Array<[number, number]> = [];
 
       let idx = 0;
-      valueField.values.toArray().forEach((value: string) => {
+      valueField.values.forEach((value: string) => {
         let timeStampValue: number;
         let valueValue: number;
-        const time = timeField.values.get(idx);
+        const time = timeField.values[idx];
 
         // If we want to use value as a time, we use value as timeStampValue and valueValue will be 1
         if (options.annotation.useValueForTime) {
diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCache.test.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCache.test.ts
index dfb18147f41..ac1d331b5c9 100644
--- a/public/app/plugins/datasource/prometheus/querycache/QueryCache.test.ts
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCache.test.ts
@@ -268,7 +268,7 @@ describe('QueryCache', function () {
       // All of the new values should be the ones that were stored, this is overkill
       secondFrames.forEach((frame, frameIdx) => {
         frame.fields.forEach((field, fieldIdx) => {
-          secondFrames[frameIdx].fields[fieldIdx].values.toArray().forEach((value) => {
+          secondFrames[frameIdx].fields[fieldIdx].values.forEach((value) => {
             expect(secondStoredFrames[frameIdx].fields[fieldIdx].values).toContain(value);
           });
         });
@@ -394,12 +394,8 @@ describe('QueryCache', function () {
 
     // Since the step is 15s, and the request was 30 seconds later, we should have 2 extra frames, but we should evict the first two, so we should get the same length
     expect(firstMergedLength).toEqual(secondMergedLength);
-    expect(firstQueryResult[0].fields[0].values.toArray()[2]).toEqual(
-      secondQueryResult[0].fields[0].values.toArray()[0]
-    );
-    expect(firstQueryResult[0].fields[0].values.toArray()[0] + 30000).toEqual(
-      secondQueryResult[0].fields[0].values.toArray()[0]
-    );
+    expect(firstQueryResult[0].fields[0].values[2]).toEqual(secondQueryResult[0].fields[0].values[0]);
+    expect(firstQueryResult[0].fields[0].values[0] + 30000).toEqual(secondQueryResult[0].fields[0].values[0]);
 
     cache.set(targetIdentity, `'1=1'|${interval}|${JSON.stringify(thirdRange.raw)}`);
 
@@ -418,7 +414,7 @@ describe('QueryCache', function () {
     );
 
     const cachedAfterThird = storage.cache.get(targetIdentity);
-    const storageLengthAfterThirdQuery = cachedAfterThird?.frames[0].fields[0].values.toArray().length;
+    const storageLengthAfterThirdQuery = cachedAfterThird?.frames[0].fields[0].values.length;
     expect(storageLengthAfterThirdQuery).toEqual(20);
   });
 
diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
index 2ba7ca76c42..7284da83ad8 100644
--- a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
@@ -1,5 +1,4 @@
 import {
-  ArrayVector,
   DataFrame,
   DataQueryRequest,
   dateTime,
@@ -360,16 +359,15 @@ export class QueryCache {
 
             // amend & re-cache
             // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-            let prevTable: Table = cachedFrame.fields.map((field) => field.values.toArray()) as Table;
+            let prevTable: Table = cachedFrame.fields.map((field) => field.values) as Table;
             // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-            let nextTable: Table = respFrame.fields.map((field) => field.values.toArray()) as Table;
+            let nextTable: Table = respFrame.fields.map((field) => field.values) as Table;
 
             let amendedTable = amendTable(prevTable, nextTable);
             if (amendedTable) {
               for (let i = 0; i < amendedTable.length; i++) {
-                cachedFrame.fields[i].values = new ArrayVector(amendedTable[i]);
+                cachedFrame.fields[i].values = amendedTable[i];
               }
-
               cachedFrame.length = cachedFrame.fields[0].values.length;
             }
           }
@@ -380,13 +378,13 @@ export class QueryCache {
 
         cachedFrames.forEach((frame) => {
           // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          let table: Table = frame.fields.map((field) => field.values.toArray()) as Table;
+          let table: Table = frame.fields.map((field) => field.values) as Table;
 
           let trimmed = trimTable(table, newFrom, newTo);
 
           if (trimmed[0].length > 0) {
             for (let i = 0; i < trimmed.length; i++) {
-              frame.fields[i].values = new ArrayVector(trimmed[i]);
+              frame.fields[i].values = trimmed[i];
             }
             nonEmptyCachedFrames.push(frame);
           }
@@ -409,7 +407,7 @@ export class QueryCache {
           config: {
             ...field.config, // prevents mutatative exemplars links (re)enrichment
           },
-          values: new ArrayVector(field.values.toArray().slice()),
+          values: field.values.slice(),
         })),
       }));
     }
diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCacheTestData.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCacheTestData.ts
index 6ab436640c4..ec4d5154bf2 100644
--- a/public/app/plugins/datasource/prometheus/querycache/QueryCacheTestData.ts
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCacheTestData.ts
@@ -1,20 +1,18 @@
 import { clone } from 'lodash';
 
-import { ArrayVector } from '@grafana/data/src';
-
 /**
  *
  * @param length - Number of values to add
  * @param start - First timestamp (ms)
  * @param step - step duration (ms)
  */
-export const getMockTimeFrameArray = (length: number, start: number, step: number): ArrayVector => {
-  let timeValues = [];
+export const getMockTimeFrameArray = (length: number, start: number, step: number) => {
+  let timeValues: number[] = [];
   for (let i = 0; i < length; i++) {
     timeValues.push(start + i * step);
   }
 
-  return new ArrayVector(timeValues);
+  return timeValues;
 };
 
 /**
@@ -22,8 +20,8 @@ export const getMockTimeFrameArray = (length: number, start: number, step: numbe
  * @param values
  * @param high
  */
-export const getMockValueFrameArray = (length: number, values = 0): ArrayVector => {
-  return new ArrayVector(Array(length).fill(values));
+export const getMockValueFrameArray = (length: number, values = 0): number[] => {
+  return Array(length).fill(values);
 };
 
 const timeFrameWithMissingValuesInMiddle = getMockTimeFrameArray(721, 1675262550000, 30000);
@@ -31,9 +29,9 @@ const timeFrameWithMissingValuesAtStart = getMockTimeFrameArray(721, 16752625500
 const timeFrameWithMissingValuesAtEnd = getMockTimeFrameArray(721, 1675262550000, 30000);
 
 // Deleting some out the middle
-timeFrameWithMissingValuesInMiddle.toArray().splice(360, 721 - 684);
-timeFrameWithMissingValuesAtStart.toArray().splice(0, 721 - 684);
-timeFrameWithMissingValuesAtEnd.toArray().splice(721 - 684, 721 - 684);
+timeFrameWithMissingValuesInMiddle.splice(360, 721 - 684);
+timeFrameWithMissingValuesAtStart.splice(0, 721 - 684);
+timeFrameWithMissingValuesAtEnd.splice(721 - 684, 721 - 684);
 
 const mockLabels = {
   __name__: 'cortex_request_duration_seconds_bucket',
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
index 4a47088bdb3..ede4c6e7089 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
@@ -366,9 +366,9 @@ describe('Prometheus Result Transformer', () => {
 
       const series = transformV2(response, options, {});
       expect(series.data[0].fields.length).toEqual(4);
-      expect(series.data[0].fields[1].values.toArray()).toEqual([10, 10, 0]);
-      expect(series.data[0].fields[2].values.toArray()).toEqual([10, 0, 30]);
-      expect(series.data[0].fields[3].values.toArray()).toEqual([10, 0, 10]);
+      expect(series.data[0].fields[1].values).toEqual([10, 10, 0]);
+      expect(series.data[0].fields[2].values).toEqual([10, 0, 30]);
+      expect(series.data[0].fields[3].values).toEqual([10, 0, 10]);
       expect(series.data[0].fields[1].name).toEqual('1');
       expect(series.data[0].fields[2].name).toEqual('2');
       expect(series.data[0].fields[3].name).toEqual('+Inf');
@@ -467,9 +467,9 @@ describe('Prometheus Result Transformer', () => {
 
       const series = transformV2(response, options, {});
       expect(series.data[0].fields.length).toEqual(4);
-      expect(series.data[0].fields[1].values.toArray()).toEqual([10, 10, 0]);
-      expect(series.data[0].fields[2].values.toArray()).toEqual([10, 0, 30]);
-      expect(series.data[0].fields[3].values.toArray()).toEqual([10, 0, 10]);
+      expect(series.data[0].fields[1].values).toEqual([10, 10, 0]);
+      expect(series.data[0].fields[2].values).toEqual([10, 0, 30]);
+      expect(series.data[0].fields[3].values).toEqual([10, 0, 10]);
     });
 
     it('results with heatmap format and multiple histograms should be grouped and de-accumulated by non-le labels', () => {
@@ -600,17 +600,17 @@ describe('Prometheus Result Transformer', () => {
 
       const series = transformV2(response, options, {});
       expect(series.data[0].fields.length).toEqual(4);
-      expect(series.data[0].fields[1].values.toArray()).toEqual([10, 10, 0]);
-      expect(series.data[0].fields[2].values.toArray()).toEqual([10, 0, 30]);
-      expect(series.data[0].fields[3].values.toArray()).toEqual([10, 0, 10]);
+      expect(series.data[0].fields[1].values).toEqual([10, 10, 0]);
+      expect(series.data[0].fields[2].values).toEqual([10, 0, 30]);
+      expect(series.data[0].fields[3].values).toEqual([10, 0, 10]);
 
-      expect(series.data[1].fields[1].values.toArray()).toEqual([0, 10, 10]);
-      expect(series.data[1].fields[2].values.toArray()).toEqual([20, 0, 30]);
-      expect(series.data[1].fields[3].values.toArray()).toEqual([10, 0, 20]);
+      expect(series.data[1].fields[1].values).toEqual([0, 10, 10]);
+      expect(series.data[1].fields[2].values).toEqual([20, 0, 30]);
+      expect(series.data[1].fields[3].values).toEqual([10, 0, 20]);
 
-      expect(series.data[2].fields[1].values.toArray()).toEqual([30, 30, 60]);
-      expect(series.data[2].fields[2].values.toArray()).toEqual([0, 10, 0]);
-      expect(series.data[2].fields[3].values.toArray()).toEqual([10, 0, 0]);
+      expect(series.data[2].fields[1].values).toEqual([30, 30, 60]);
+      expect(series.data[2].fields[2].values).toEqual([0, 10, 0]);
+      expect(series.data[2].fields[3].values).toEqual([10, 0, 0]);
     });
 
     it('Retains exemplar frames when data returned is a heatmap', () => {
@@ -667,14 +667,7 @@ describe('Prometheus Result Transformer', () => {
       const series = transformV2(response, options, {});
       expect(series.data[0].fields.length).toEqual(2);
       expect(series.data.length).toEqual(2);
-      expect(series.data[1].fields[2].values.toArray()).toEqual([
-        'hello',
-        'doctor',
-        'name',
-        'continue',
-        'yesterday',
-        'tomorrow',
-      ]);
+      expect(series.data[1].fields[2].values).toEqual(['hello', 'doctor', 'name', 'continue', 'yesterday', 'tomorrow']);
       expect(series.data[1].fields.length).toEqual(3);
     });
 
@@ -765,9 +758,9 @@ describe('Prometheus Result Transformer', () => {
       expect(tableDf.fields.length).toBe(4);
       expect(tableDf.fields[0].name).toBe('Time');
       expect(tableDf.fields[1].name).toBe('label1');
-      expect(tableDf.fields[1].values.get(0)).toBe('value1');
+      expect(tableDf.fields[1].values[0]).toBe('value1');
       expect(tableDf.fields[2].name).toBe('label2');
-      expect(tableDf.fields[2].values.get(0)).toBe('value2');
+      expect(tableDf.fields[2].values[0]).toBe('value2');
       expect(tableDf.fields[3].name).toBe('Value');
     });
 
@@ -789,9 +782,9 @@ describe('Prometheus Result Transformer', () => {
       expect(tableDf.fields.length).toBe(4);
       expect(tableDf.fields[0].name).toBe('Time');
       expect(tableDf.fields[1].name).toBe('label1');
-      expect(tableDf.fields[1].values.get(0)).toBe('value1');
+      expect(tableDf.fields[1].values[0]).toBe('value1');
       expect(tableDf.fields[2].name).toBe('label2');
-      expect(tableDf.fields[2].values.get(0)).toBe('value2');
+      expect(tableDf.fields[2].values[0]).toBe('value2');
       expect(tableDf.fields[3].name).toBe('Value');
     });
 
@@ -824,16 +817,16 @@ describe('Prometheus Result Transformer', () => {
       expect(transformedTableDataFrames[0].fields.length).toBe(4);
       expect(transformedTableDataFrames[0].fields[0].name).toBe('Time');
       expect(transformedTableDataFrames[0].fields[1].name).toBe('label1');
-      expect(transformedTableDataFrames[0].fields[1].values.get(0)).toBe(value1);
+      expect(transformedTableDataFrames[0].fields[1].values[0]).toBe(value1);
       expect(transformedTableDataFrames[0].fields[2].name).toBe('label2');
-      expect(transformedTableDataFrames[0].fields[2].values.get(0)).toBe(value2);
+      expect(transformedTableDataFrames[0].fields[2].values[0]).toBe(value2);
       expect(transformedTableDataFrames[0].fields[3].name).toBe('Value #A');
 
       // Expect the invalid/empty results not to throw an error and to return empty arrays
       expect(transformedTableDataFrames[1].fields[1].labels).toBe(undefined);
       expect(transformedTableDataFrames[1].fields[1].name).toBe('Value #B');
-      expect(transformedTableDataFrames[1].fields[1].values.toArray()).toEqual([]);
-      expect(transformedTableDataFrames[1].fields[0].values.toArray()).toEqual([]);
+      expect(transformedTableDataFrames[1].fields[1].values).toEqual([]);
+      expect(transformedTableDataFrames[1].fields[0].values).toEqual([]);
     });
   });
 
@@ -901,22 +894,20 @@ describe('Prometheus Result Transformer', () => {
             format: 'table',
           },
         });
-        expect(result[0].fields[0].values.toArray()).toEqual([
-          1443454528000, 1443454530000, 1443454529000, 1443454531000,
-        ]);
+        expect(result[0].fields[0].values).toEqual([1443454528000, 1443454530000, 1443454529000, 1443454531000]);
         expect(result[0].fields[0].name).toBe('Time');
         expect(result[0].fields[0].type).toBe(FieldType.time);
-        expect(result[0].fields[1].values.toArray()).toEqual(['test', 'test', 'test2', 'test2']);
+        expect(result[0].fields[1].values).toEqual(['test', 'test', 'test2', 'test2']);
         expect(result[0].fields[1].name).toBe('__name__');
         expect(result[0].fields[1].config.filterable).toBe(true);
         expect(result[0].fields[1].type).toBe(FieldType.string);
-        expect(result[0].fields[2].values.toArray()).toEqual(['', '', 'localhost:8080', 'localhost:8080']);
+        expect(result[0].fields[2].values).toEqual(['', '', 'localhost:8080', 'localhost:8080']);
         expect(result[0].fields[2].name).toBe('instance');
         expect(result[0].fields[2].type).toBe(FieldType.string);
-        expect(result[0].fields[3].values.toArray()).toEqual(['testjob', 'testjob', 'otherjob', 'otherjob']);
+        expect(result[0].fields[3].values).toEqual(['testjob', 'testjob', 'otherjob', 'otherjob']);
         expect(result[0].fields[3].name).toBe('job');
         expect(result[0].fields[3].type).toBe(FieldType.string);
-        expect(result[0].fields[4].values.toArray()).toEqual([3846, 3848, 3847, 3849]);
+        expect(result[0].fields[4].values).toEqual([3846, 3848, 3847, 3849]);
         expect(result[0].fields[4].name).toEqual('Value');
         expect(result[0].fields[4].type).toBe(FieldType.number);
         expect(result[0].refId).toBe('A');
@@ -952,13 +943,13 @@ describe('Prometheus Result Transformer', () => {
 
       it('should return data frame', () => {
         const result = transform({ data: response } as any, { ...options, target: { format: 'table' } });
-        expect(result[0].fields[0].values.toArray()).toEqual([1443454528000]);
+        expect(result[0].fields[0].values).toEqual([1443454528000]);
         expect(result[0].fields[0].name).toBe('Time');
-        expect(result[0].fields[1].values.toArray()).toEqual(['test']);
+        expect(result[0].fields[1].values).toEqual(['test']);
         expect(result[0].fields[1].name).toBe('__name__');
-        expect(result[0].fields[2].values.toArray()).toEqual(['testjob']);
+        expect(result[0].fields[2].values).toEqual(['testjob']);
         expect(result[0].fields[2].name).toBe('job');
-        expect(result[0].fields[3].values.toArray()).toEqual([3846]);
+        expect(result[0].fields[3].values).toEqual([3846]);
         expect(result[0].fields[3].name).toEqual('Value');
       });
 
@@ -976,7 +967,7 @@ describe('Prometheus Result Transformer', () => {
           },
         };
         const result = transform({ data: response } as any, { ...options, target: { format: 'table' } });
-        expect(result[0].fields[1].values.toArray()).toEqual([102]);
+        expect(result[0].fields[1].values).toEqual([102]);
         expect(result[0].fields[1].type).toEqual(FieldType.number);
       });
     });
@@ -1046,10 +1037,10 @@ describe('Prometheus Result Transformer', () => {
         ]);
 
         const result = transform({ data: response } as any, { query: options, target: options } as any);
-        expect(result[0].fields[0].values.toArray()).toEqual([1445000010000, 1445000020000, 1445000030000]);
-        expect(result[0].fields[1].values.toArray()).toEqual([10, 10, 0]);
-        expect(result[0].fields[2].values.toArray()).toEqual([10, 0, 30]);
-        expect(result[0].fields[3].values.toArray()).toEqual([10, 0, 10]);
+        expect(result[0].fields[0].values).toEqual([1445000010000, 1445000020000, 1445000030000]);
+        expect(result[0].fields[1].values).toEqual([10, 10, 0]);
+        expect(result[0].fields[2].values).toEqual([10, 0, 30]);
+        expect(result[0].fields[3].values).toEqual([10, 0, 10]);
       });
 
       it('should handle missing datapoints', () => {
@@ -1078,9 +1069,9 @@ describe('Prometheus Result Transformer', () => {
           },
         ]);
         const result = transform({ data: response } as any, { query: options, target: options } as any);
-        expect(result[0].fields[1].values.toArray()).toEqual([1, 2]);
-        expect(result[0].fields[2].values.toArray()).toEqual([1, 3, 1]);
-        expect(result[0].fields[3].values.toArray()).toEqual([1, 2]);
+        expect(result[0].fields[1].values).toEqual([1, 2]);
+        expect(result[0].fields[2].values).toEqual([1, 3, 1]);
+        expect(result[0].fields[3].values).toEqual([1, 2]);
       });
     });
 
@@ -1137,8 +1128,8 @@ describe('Prometheus Result Transformer', () => {
             end: 2,
           },
         });
-        expect(result[0].fields[0].values.toArray()).toEqual([0, 1000, 2000]);
-        expect(result[0].fields[1].values.toArray()).toEqual([10, 10, 0]);
+        expect(result[0].fields[0].values).toEqual([0, 1000, 2000]);
+        expect(result[0].fields[1].values).toEqual([10, 10, 0]);
         expect(result[0].name).toBe('test{job="testjob"}');
       });
 
@@ -1148,8 +1139,8 @@ describe('Prometheus Result Transformer', () => {
           query: { step: 1, start: 0, end: 2 },
         });
 
-        expect(result[0].fields[0].values.toArray()).toEqual([0, 1000, 2000]);
-        expect(result[0].fields[1].values.toArray()).toEqual([null, 10, 0]);
+        expect(result[0].fields[0].values).toEqual([0, 1000, 2000]);
+        expect(result[0].fields[1].values).toEqual([null, 10, 0]);
       });
 
       it('should use __name__ label as series name', () => {
@@ -1242,8 +1233,8 @@ describe('Prometheus Result Transformer', () => {
         };
 
         const result = transform({ data: response } as any, { ...options, query: { step: 2, start: 0, end: 8 } });
-        expect(result[0].fields[0].values.toArray()).toEqual([0, 2000, 4000, 6000, 8000]);
-        expect(result[0].fields[1].values.toArray()).toEqual([null, null, 10, null, 10]);
+        expect(result[0].fields[0].values).toEqual([0, 2000, 4000, 6000, 8000]);
+        expect(result[0].fields[1].values).toEqual([null, null, 10, null, 10]);
       });
     });
 
@@ -1262,7 +1253,7 @@ describe('Prometheus Result Transformer', () => {
             ...options,
             target: { format: 'table' },
           });
-          expect(result[0].fields[1].values.toArray()).toEqual([Number.POSITIVE_INFINITY]);
+          expect(result[0].fields[1].values).toEqual([Number.POSITIVE_INFINITY]);
         });
       });
 
@@ -1290,7 +1281,7 @@ describe('Prometheus Result Transformer', () => {
               ...options,
               target: { format: 'table' },
             });
-            expect(result[0].fields[3].values.toArray()).toEqual([Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY]);
+            expect(result[0].fields[3].values).toEqual([Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY]);
           });
         });
       });
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index 027d215bdf7..936acc351e4 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -3,7 +3,6 @@ import { flatten, forOwn, groupBy, partition } from 'lodash';
 
 import {
   ArrayDataFrame,
-  ArrayVector,
   CoreApp,
   DataFrame,
   DataFrameType,
@@ -226,7 +225,7 @@ export function transformDFToTable(dfs: DataFrame[]): DataFrame[] {
               name: label,
               config: { filterable: true },
               type: numberField ? FieldType.number : FieldType.string,
-              values: new ArrayVector(),
+              values: [],
             });
           }
         });
@@ -234,10 +233,10 @@ export function transformDFToTable(dfs: DataFrame[]): DataFrame[] {
 
     // Fill valueField, timeField and labelFields with values
     dataFramesByRefId[refId].forEach((df) => {
-      const timeFields = df.fields[0]?.values ?? new ArrayVector();
-      const dataFields = df.fields[1]?.values ?? new ArrayVector();
-      timeFields.toArray().forEach((value) => timeField.values.add(value));
-      dataFields.toArray().forEach((value) => {
+      const timeFields = df.fields[0]?.values ?? [];
+      const dataFields = df.fields[1]?.values ?? [];
+      timeFields.forEach((value) => timeField.values.add(value));
+      dataFields.forEach((value) => {
         valueField.values.add(parseSampleValue(value));
         const labelsForField = df.fields[1].labels ?? {};
         labelFields.forEach((field) => field.values.add(getLabelValue(labelsForField, field.name)));
@@ -515,12 +514,13 @@ function transformMetricDataToTable(md: MatrixOrVectorResult[], options: Transfo
       // Labels have string field type, otherwise table tries to figure out the type which can result in unexpected results
       // Only "le" label has a number field type
       const numberField = label === HISTOGRAM_QUANTILE_LABEL_NAME;
-      return {
+      const field: Field = {
         name: label,
         config: { filterable: true },
         type: numberField ? FieldType.number : FieldType.string,
-        values: new ArrayVector(),
+        values: [],
       };
+      return field;
     });
   const valueField = getValueField({ data: [], valueName: valueText });
 
@@ -528,12 +528,12 @@ function transformMetricDataToTable(md: MatrixOrVectorResult[], options: Transfo
     if (isMatrixData(d)) {
       d.values.forEach((val) => {
         timeField.values.add(val[0] * 1000);
-        metricFields.forEach((metricField) => metricField.values.add(getLabelValue(d.metric, metricField.name)));
+        metricFields.forEach((metricField) => metricField.values.push(getLabelValue(d.metric, metricField.name)));
         valueField.values.add(parseSampleValue(val[1]));
       });
     } else {
       timeField.values.add(d.value[0] * 1000);
-      metricFields.forEach((metricField) => metricField.values.add(getLabelValue(d.metric, metricField.name)));
+      metricFields.forEach((metricField) => metricField.values.push(getLabelValue(d.metric, metricField.name)));
       valueField.values.add(parseSampleValue(d.value[1]));
     }
   });
@@ -561,7 +561,7 @@ function getTimeField(data: PromValue[], isMs = false): MutableField {
     name: TIME_SERIES_TIME_FIELD_NAME,
     type: FieldType.time,
     config: {},
-    values: new ArrayVector<number>(data.map((val) => (isMs ? val[0] : val[0] * 1000))),
+    values: data.map((val) => (isMs ? val[0] : val[0] * 1000)),
   };
 }
 
@@ -588,7 +588,7 @@ function getValueField({
       displayNameFromDS,
     },
     labels,
-    values: new ArrayVector<number | null>(data.map((val) => (parseValue ? parseSampleValue(val[1]) : val[1]))),
+    values: data.map((val) => (parseValue ? parseSampleValue(val[1]) : val[1])),
   };
 }
 
@@ -660,8 +660,8 @@ function transformToHistogramOverTime(seriesList: DataFrame[]) {
     }
 
     for (let j = 0; j < topSeries.values.length; j++) {
-      const bottomPoint = bottomSeries.values.get(j) || [0];
-      topSeries.values.toArray()[j] -= bottomPoint;
+      const bottomPoint = bottomSeries.values[j] || [0];
+      topSeries.values[j] -= bottomPoint;
     }
   }
 
diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts
index f55f93e9696..788a139fcd3 100644
--- a/public/app/plugins/datasource/tempo/datasource.test.ts
+++ b/public/app/plugins/datasource/tempo/datasource.test.ts
@@ -2,7 +2,6 @@ import { lastValueFrom, Observable, of } from 'rxjs';
 import { createFetchResponse } from 'test/helpers/createFetchResponse';
 
 import {
-  ArrayVector,
   DataFrame,
   dataFrameToJSON,
   DataSourceInstanceSettings,
@@ -144,7 +143,7 @@ describe('Tempo data source', () => {
     expect(
       (response.data[0] as DataFrame).fields.map((f) => ({
         name: f.name,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toMatchObject([
       { name: 'traceID', values: ['04450900759028499335'] },
@@ -162,7 +161,7 @@ describe('Tempo data source', () => {
     expect(
       (response.data[1] as DataFrame).fields.map((f) => ({
         name: f.name,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toMatchObject([
       { name: 'id', values: ['4322526419282105830'] },
@@ -176,7 +175,7 @@ describe('Tempo data source', () => {
     expect(
       (response.data[2] as DataFrame).fields.map((f) => ({
         name: f.name,
-        values: f.values.toArray(),
+        values: f.values,
       }))
     ).toMatchObject([
       { name: 'id', values: [] },
@@ -196,7 +195,7 @@ describe('Tempo data source', () => {
     const field = response.data[0].fields[0];
     expect(field.name).toBe('traceID');
     expect(field.type).toBe(FieldType.string);
-    expect(field.values.get(0)).toBe('60ba2abb44f13eae');
+    expect(field.values[0]).toBe('60ba2abb44f13eae');
     expect(field.values.length).toBe(6);
   });
 
@@ -457,14 +456,14 @@ describe('Tempo service graph view', () => {
 
     // Service Graph view
     expect(response.data[0].fields[0].name).toBe('Name');
-    expect(response.data[0].fields[0].values.toArray().length).toBe(2);
-    expect(response.data[0].fields[0].values.toArray()[0]).toBe('HTTP Client');
-    expect(response.data[0].fields[0].values.toArray()[1]).toBe('HTTP GET - root');
+    expect(response.data[0].fields[0].values.length).toBe(2);
+    expect(response.data[0].fields[0].values[0]).toBe('HTTP Client');
+    expect(response.data[0].fields[0].values[1]).toBe('HTTP GET - root');
 
     expect(response.data[0].fields[1].name).toBe('Rate');
-    expect(response.data[0].fields[1].values.toArray().length).toBe(2);
-    expect(response.data[0].fields[1].values.toArray()[0]).toBe(12.75164671814457);
-    expect(response.data[0].fields[1].values.toArray()[1]).toBe(12.121331111401608);
+    expect(response.data[0].fields[1].values.length).toBe(2);
+    expect(response.data[0].fields[1].values[0]).toBe(12.75164671814457);
+    expect(response.data[0].fields[1].values[1]).toBe(12.121331111401608);
     expect(response.data[0].fields[1].config.decimals).toBe(2);
     expect(response.data[0].fields[1].config.links[0].title).toBe('Rate');
     expect(response.data[0].fields[1].config.links[0].internal.query.expr).toBe(
@@ -474,9 +473,9 @@ describe('Tempo service graph view', () => {
     expect(response.data[0].fields[1].config.links[0].internal.query.exemplar).toBe(true);
     expect(response.data[0].fields[1].config.links[0].internal.query.instant).toBe(false);
 
-    expect(response.data[0].fields[2].values.toArray().length).toBe(2);
-    expect(response.data[0].fields[2].values.toArray()[0]).toBe(12.75164671814457);
-    expect(response.data[0].fields[2].values.toArray()[1]).toBe(12.121331111401608);
+    expect(response.data[0].fields[2].values.length).toBe(2);
+    expect(response.data[0].fields[2].values[0]).toBe(12.75164671814457);
+    expect(response.data[0].fields[2].values[1]).toBe(12.121331111401608);
     expect(response.data[0].fields[2].config.color.mode).toBe('continuous-BlPu');
     expect(response.data[0].fields[2].config.custom.cellOptions.mode).toBe(BarGaugeDisplayMode.Lcd);
     expect(response.data[0].fields[2].config.custom.cellOptions.type).toBe(TableCellDisplayMode.Gauge);
@@ -678,7 +677,7 @@ describe('Tempo service graph view', () => {
               filterable: true,
             },
             type: 'string',
-            values: new ArrayVector(['HTTP Client', 'HTTP GET', 'HTTP GET - root', 'HTTP POST', 'HTTP POST - post']),
+            values: ['HTTP Client', 'HTTP GET', 'HTTP GET - root', 'HTTP POST', 'HTTP POST - post'],
           },
         ],
       },
diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index 14e2598a55e..8f63c11ae5f 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -597,7 +597,7 @@ function errorAndDurationQuery(
   let serviceGraphViewMetrics = [];
   let errorRateBySpanName = '';
   let durationsBySpanName: string[] = [];
-  const spanNames = rateResponse.data[0][0]?.fields[1]?.values.toArray() ?? [];
+  const spanNames = rateResponse.data[0][0]?.fields[1]?.values ?? [];
 
   if (spanNames.length > 0) {
     errorRateBySpanName = buildExpr(errorRateMetric, 'span_name=~"' + spanNames.join('|') + '"', request);
@@ -797,8 +797,8 @@ function getServiceGraphView(
   }
 
   if (errorRate.length > 0 && errorRate[0].fields?.length > 2) {
-    const errorRateNames = errorRate[0].fields[1]?.values.toArray() ?? [];
-    const errorRateValues = errorRate[0].fields[2]?.values.toArray() ?? [];
+    const errorRateNames = errorRate[0].fields[1]?.values ?? [];
+    const errorRateValues = errorRate[0].fields[2]?.values ?? [];
     let errorRateObj: any = {};
     errorRateNames.map((name: string, index: number) => {
       errorRateObj[name] = { value: errorRateValues[index] };
@@ -848,7 +848,7 @@ function getServiceGraphView(
     duration.map((d) => {
       const delimiter = d.refId?.includes('span_name=~"') ? 'span_name=~"' : 'span_name="';
       const name = d.refId?.split(delimiter)[1].split('"}')[0];
-      durationObj[name] = { value: d.fields[1].values.toArray()[0] };
+      durationObj[name] = { value: d.fields[1].values[0] };
     });
 
     df.fields.push({
@@ -918,7 +918,7 @@ export function getRateAlignedValues(
   rateResp: DataQueryResponseData[],
   objToAlign: { [x: string]: { value: string } }
 ) {
-  const rateNames = rateResp[0]?.fields[1]?.values.toArray() ?? [];
+  const rateNames = rateResp[0]?.fields[1]?.values ?? [];
   let values: string[] = [];
 
   for (let i = 0; i < rateNames.length; i++) {
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.ts b/public/app/plugins/datasource/tempo/resultTransformer.ts
index 568d3fff6f3..ef2e663fb0a 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.ts
@@ -85,7 +85,7 @@ export function createTableFrame(
             const match = (line as string).match(traceRegex);
             if (match) {
               const traceId = match[1];
-              const time = timeField ? timeField.values.get(i) : null;
+              const time = timeField ? timeField.values[i] : null;
               tableFrame.fields[0].values.add(time);
               tableFrame.fields[1].values.add(traceId);
               tableFrame.fields[2].values.add(line);
diff --git a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts b/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
index 1b1ffe5149c..620e685846e 100644
--- a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
+++ b/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
@@ -1,11 +1,4 @@
-import {
-  ArrayVector,
-  FieldColorModeId,
-  FieldDTO,
-  FieldType,
-  MutableDataFrame,
-  NodeGraphDataFrameFieldNames,
-} from '@grafana/data';
+import { FieldColorModeId, FieldDTO, FieldType, MutableDataFrame, NodeGraphDataFrameFieldNames } from '@grafana/data';
 
 import { nodes, edges } from './testData/serviceMapResponse';
 
@@ -51,9 +44,9 @@ export function generateRandomNodes(count = 10) {
     nodes[sourceIndex].edges.push(nodes[targetIndex].id);
   }
 
-  const nodeFields: Record<string, Omit<FieldDTO, 'name'> & { values: ArrayVector }> = {
+  const nodeFields: Record<string, Omit<FieldDTO, 'name'> & { values: any[] }> = {
     [NodeGraphDataFrameFieldNames.id]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
       config: {
         links: [
@@ -70,35 +63,35 @@ export function generateRandomNodes(count = 10) {
       },
     },
     [NodeGraphDataFrameFieldNames.title]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
     [NodeGraphDataFrameFieldNames.subTitle]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
     [NodeGraphDataFrameFieldNames.mainStat]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
       config: { displayName: 'Transactions per second' },
     },
     [NodeGraphDataFrameFieldNames.secondaryStat]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
       config: { displayName: 'Average duration' },
     },
     [NodeGraphDataFrameFieldNames.arc + 'success']: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
       config: { color: { fixedColor: 'green', mode: FieldColorModeId.Fixed }, displayName: 'Success' },
     },
     [NodeGraphDataFrameFieldNames.arc + 'errors']: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.number,
       config: { color: { fixedColor: 'red', mode: FieldColorModeId.Fixed }, displayName: 'Errors' },
     },
     [NodeGraphDataFrameFieldNames.icon]: {
-      values: new ArrayVector(),
+      values: [],
       type: FieldType.string,
     },
   };
@@ -115,10 +108,10 @@ export function generateRandomNodes(count = 10) {
   const edgesFrame = new MutableDataFrame({
     name: 'edges',
     fields: [
-      { name: NodeGraphDataFrameFieldNames.id, values: new ArrayVector(), type: FieldType.string },
-      { name: NodeGraphDataFrameFieldNames.source, values: new ArrayVector(), type: FieldType.string },
-      { name: NodeGraphDataFrameFieldNames.target, values: new ArrayVector(), type: FieldType.string },
-      { name: NodeGraphDataFrameFieldNames.mainStat, values: new ArrayVector(), type: FieldType.number },
+      { name: NodeGraphDataFrameFieldNames.id, values: [], type: FieldType.string },
+      { name: NodeGraphDataFrameFieldNames.source, values: [], type: FieldType.string },
+      { name: NodeGraphDataFrameFieldNames.target, values: [], type: FieldType.string },
+      { name: NodeGraphDataFrameFieldNames.mainStat, values: [], type: FieldType.number },
     ],
     meta: { preferredVisualisationType: 'nodeGraph' },
   });
diff --git a/public/app/plugins/panel/barchart/BarChartPanel.tsx b/public/app/plugins/panel/barchart/BarChartPanel.tsx
index bc3f795acb6..5ca2d8543d5 100644
--- a/public/app/plugins/panel/barchart/BarChartPanel.tsx
+++ b/public/app/plugins/panel/barchart/BarChartPanel.tsx
@@ -220,7 +220,7 @@ export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZ
   };
 
   const rawValue = (seriesIdx: number, valueIdx: number) => {
-    return frame0Ref.current!.fields[seriesIdx].values.get(valueIdx);
+    return frame0Ref.current!.fields[seriesIdx].values[valueIdx];
   };
 
   // Color by value
@@ -233,7 +233,7 @@ export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZ
     const disp = colorByField.display!;
     fillOpacity = (colorByField.config.custom.fillOpacity ?? 100) / 100;
     // gradientMode? ignore?
-    getColor = (seriesIdx: number, valueIdx: number) => disp(colorByFieldRef.current?.values.get(valueIdx)).color!;
+    getColor = (seriesIdx: number, valueIdx: number) => disp(colorByFieldRef.current?.values[valueIdx]).color!;
   } else {
     const hasPerBarColor = frame0Ref.current!.fields.some((f) => {
       const fromThresholds =
@@ -261,7 +261,7 @@ export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZ
 
       getColor = (seriesIdx: number, valueIdx: number) => {
         let field = frame0Ref.current!.fields[seriesIdx];
-        return field.display!(field.values.get(valueIdx)).color!;
+        return field.display!(field.values[valueIdx]).color!;
       };
     }
   }
diff --git a/public/app/plugins/panel/barchart/utils.test.ts b/public/app/plugins/panel/barchart/utils.test.ts
index 3662ca3df36..e5282267f2d 100644
--- a/public/app/plugins/panel/barchart/utils.test.ts
+++ b/public/app/plugins/panel/barchart/utils.test.ts
@@ -109,7 +109,7 @@ describe('BarChart utils', () => {
         valueSize: 10,
       },
       fullHighlight: false,
-      rawValue: (seriesIdx: number, valueIdx: number) => frame.fields[seriesIdx].values.get(valueIdx),
+      rawValue: (seriesIdx: number, valueIdx: number) => frame.fields[seriesIdx].values[valueIdx],
     };
 
     it.each([VizOrientation.Auto, VizOrientation.Horizontal, VizOrientation.Vertical])('orientation', (v) => {
diff --git a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
index bb54ebb775b..13cdc4f7368 100644
--- a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
+++ b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.tsx
@@ -97,7 +97,7 @@ function buildTableDataFrame(
           url: '',
           onClick: (e: DataLinkClickEvent) => {
             const field: Field = e.origin.field;
-            const value = field.values.get(e.origin.rowIndex);
+            const value = field.values[e.origin.rowIndex];
             onSymbolClick(value);
           },
         },
diff --git a/public/app/plugins/panel/geomap/components/DataHoverRows.tsx b/public/app/plugins/panel/geomap/components/DataHoverRows.tsx
index fbea7a4fc4d..7bc10cfd4fa 100644
--- a/public/app/plugins/panel/geomap/components/DataHoverRows.tsx
+++ b/public/app/plugins/panel/geomap/components/DataHoverRows.tsx
@@ -73,7 +73,7 @@ export const generateLabel = (feature: FeatureLike, idx: number): string | React
         if (!first) {
           first = k;
         }
-        props[k] = f.values.get(rowIndex);
+        props[k] = f.values[rowIndex];
       }
     }
   }
diff --git a/public/app/plugins/panel/geomap/components/DataHoverView.tsx b/public/app/plugins/panel/geomap/components/DataHoverView.tsx
index a7e1633f1ab..0765f184b8b 100644
--- a/public/app/plugins/panel/geomap/components/DataHoverView.tsx
+++ b/public/app/plugins/panel/geomap/components/DataHoverView.tsx
@@ -45,7 +45,7 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
   const linkLookup = new Set<string>();
 
   for (const f of orderedVisibleFields) {
-    const v = f.values.get(rowIndex);
+    const v = f.values[rowIndex];
     const disp = f.display ? f.display(v) : { text: `${v}`, numeric: +v };
     if (f.getLinks) {
       f.getLinks({ calculatedValue: disp, valueRowIndex: rowIndex }).forEach((link) => {
diff --git a/public/app/plugins/panel/geomap/components/MarkersLegend.tsx b/public/app/plugins/panel/geomap/components/MarkersLegend.tsx
index f9e0c75ccf8..4fac7e82e70 100644
--- a/public/app/plugins/panel/geomap/components/MarkersLegend.tsx
+++ b/public/app/plugins/panel/geomap/components/MarkersLegend.tsx
@@ -43,7 +43,7 @@ export function MarkersLegend(props: MarkersLegendProps) {
     }
 
     const rowIndex = props.rowIndex as number; // eslint-disable-line
-    return colorField.values.get(rowIndex);
+    return colorField.values[rowIndex];
   }, [hoverEvent, colorField]);
 
   if (!styleConfig) {
diff --git a/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx b/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
index 068d9d58fb0..8c952a71c05 100644
--- a/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
@@ -234,7 +234,7 @@ export const routeLayer: MapLayerRegistryItem<RouteConfig> = {
                 if (pointIdx !== null) {
                   const out = getGeometryField(frame, location);
                   if (out.field) {
-                    crosshairFeature.setGeometry(out.field.values.get(pointIdx));
+                    crosshairFeature.setGeometry(out.field.values[pointIdx]);
                     crosshairFeature.setStyle(crosshairStyle);
                   }
                 }
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 5b609a70f3e..57f4f2a8760 100644
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -321,7 +321,7 @@ class GraphElement {
           field: { config: fieldConfig, type: FieldType.number },
           theme: config.theme2,
           timeZone: this.dashboard.getTimezone(),
-        })(field.values.get(dataIndex));
+        })(field.values[dataIndex]);
         linksSupplier = links.length
           ? getFieldLinksSupplier({
               display: fieldDisplay,
@@ -365,7 +365,7 @@ class GraphElement {
       return dataIndex;
     }
 
-    const field = timeField.values.get(dataIndex);
+    const field = timeField.values[dataIndex];
 
     if (field === ts) {
       return dataIndex;
diff --git a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
index af101be9bc9..c6c8c18cf44 100644
--- a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
@@ -158,7 +158,7 @@ export const HeatmapPanel = ({
     let hoverValue: number | undefined = undefined;
     // seriesIdx: 1 is heatmap layer; 2 is exemplar layer
     if (hover && info.heatmap.fields && hover.seriesIdx === 1) {
-      hoverValue = countField.values.get(hover.dataIdx);
+      hoverValue = countField.values[hover.dataIdx];
     }
 
     return (
diff --git a/public/app/plugins/panel/nodeGraph/layout.ts b/public/app/plugins/panel/nodeGraph/layout.ts
index 36c3e6beabd..75878526068 100644
--- a/public/app/plugins/panel/nodeGraph/layout.ts
+++ b/public/app/plugins/panel/nodeGraph/layout.ts
@@ -196,8 +196,8 @@ function gridLayout(
 
   if (sort) {
     nodes.sort((node1, node2) => {
-      const val1 = sort!.field.values.get(node1.dataFrameRowIndex);
-      const val2 = sort!.field.values.get(node2.dataFrameRowIndex);
+      const val1 = sort!.field.values[node1.dataFrameRowIndex];
+      const val2 = sort!.field.values[node2.dataFrameRowIndex];
 
       // Let's pretend we don't care about type of the stats for a while (they can be strings)
       return sort!.ascending ? val1 - val2 : val2 - val1;
diff --git a/public/app/plugins/panel/status-history/StatusHistoryTooltip.tsx b/public/app/plugins/panel/status-history/StatusHistoryTooltip.tsx
index 9e89cecaf65..f9ed786ab2c 100644
--- a/public/app/plugins/panel/status-history/StatusHistoryTooltip.tsx
+++ b/public/app/plugins/panel/status-history/StatusHistoryTooltip.tsx
@@ -38,7 +38,7 @@ export const StatusHistoryTooltip = ({
   const linkLookup = new Set<string>();
 
   if (field.getLinks) {
-    const v = field.values.get(datapointIdx);
+    const v = field.values[datapointIdx];
     const disp = field.display ? field.display(v) : { text: `${v}`, numeric: +v };
     field.getLinks({ calculatedValue: disp, valueRowIndex: datapointIdx }).forEach((link) => {
       const key = `${link.title}/${link.href}`;
@@ -54,7 +54,7 @@ export const StatusHistoryTooltip = ({
 
   const dataFrameFieldIndex = field.state?.origin;
   const fieldFmt = field.display || getDisplayProcessor({ field, timeZone, theme });
-  const value = field.values.get(datapointIdx!);
+  const value = field.values[datapointIdx!];
   const display = fieldFmt(value);
   const fieldDisplayName = dataFrameFieldIndex
     ? getFieldDisplayName(
@@ -67,7 +67,7 @@ export const StatusHistoryTooltip = ({
   return (
     <div>
       <div style={{ fontSize: theme.typography.bodySmall.fontSize }}>
-        <strong>{xFieldFmt(xField.values.get(datapointIdx)).text}</strong>
+        <strong>{xFieldFmt(xField.values[datapointIdx]).text}</strong>
         <br />
         <SeriesTableRow label={display.text} color={display.color || FALLBACK_COLOR} isActive />
         {fieldDisplayName}
diff --git a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
index 3a28507a14c..ae2c0fb777e 100644
--- a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
@@ -243,7 +243,7 @@ export const ContextMenuView = ({
     if (seriesIdx && dataIdx !== null) {
       const field = data.fields[seriesIdx];
 
-      const displayValue = field.display!(field.values.get(dataIdx));
+      const displayValue = field.display!(field.values[dataIdx]);
 
       const hasLinks = field.config.links && field.config.links.length > 0;
 
@@ -271,7 +271,7 @@ export const ContextMenuView = ({
       // eslint-disable-next-line react/display-name
       renderHeader = () => (
         <GraphContextMenuHeader
-          timestamp={xFieldFmt(xField.values.get(dataIdx)).text}
+          timestamp={xFieldFmt(xField.values[dataIdx]).text}
           displayValue={displayValue}
           seriesColor={displayValue.color!}
           displayName={getFieldDisplayName(field, data, otherProps.frames)}
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
index 8caccc4d442..ba1d5c723af 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
@@ -161,7 +161,7 @@ export const ExemplarMarker = ({
               <table className={styles.exemplarsTable}>
                 <tbody>
                   {orderedDataFrameFields.map((field, i) => {
-                    const value = field.values.get(dataFrameFieldIndex.fieldIndex);
+                    const value = field.values[dataFrameFieldIndex.fieldIndex];
                     const links = field.config.links?.length
                       ? getFieldLinks(field, dataFrameFieldIndex.fieldIndex)
                       : undefined;
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
index 46892b323f5..aa787148c96 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
@@ -55,7 +55,7 @@ export const ExemplarsPlugin = ({
     const yMin = plotInstance.current.scales[yScale].min;
     const yMax = plotInstance.current.scales[yScale].max;
 
-    let y = value.values.get(dataFrameFieldIndex.fieldIndex);
+    let y = value.values[dataFrameFieldIndex.fieldIndex];
     // To not to show exemplars outside of the graph we set the y value to min if it is smaller and max if it is bigger than the size of the graph
     if (yMin != null && y < yMin) {
       y = yMin;
@@ -66,7 +66,7 @@ export const ExemplarsPlugin = ({
     }
 
     return {
-      x: plotInstance.current.valToPos(time.values.get(dataFrameFieldIndex.fieldIndex), 'x'),
+      x: plotInstance.current.valToPos(time.values[dataFrameFieldIndex.fieldIndex], 'x'),
       y: plotInstance.current.valToPos(y, yScale),
     };
   }, []);
@@ -159,7 +159,7 @@ const getExemplarColor = (
     });
     if (fields.length) {
       const hasMatch = fields.every((field, index, fields) => {
-        const value = field.values.get(dataFrameFieldIndex.fieldIndex);
+        const value = field.values[dataFrameFieldIndex.fieldIndex];
         return visibleLabel.labels[field.name] === value;
       });
 
@@ -204,7 +204,7 @@ const showExemplarMarker = (
           showMarker = visibleSeries.labels.some((series) => {
             return Object.keys(series.labels).every((label) => {
               const value = series.labels[label];
-              return fields.find((field) => field.values.get(dataFrameFieldIndex.fieldIndex) === value);
+              return fields.find((field) => field.values[dataFrameFieldIndex.fieldIndex] === value);
             });
           });
         }
diff --git a/public/app/plugins/panel/xychart/TooltipView.tsx b/public/app/plugins/panel/xychart/TooltipView.tsx
index f3ebd1ef821..93e00fb2ab2 100644
--- a/public/app/plugins/panel/xychart/TooltipView.tsx
+++ b/public/app/plugins/panel/xychart/TooltipView.tsx
@@ -84,8 +84,8 @@ export const TooltipView = ({
     extraFacets = {
       colorFacetFieldName,
       sizeFacetFieldName,
-      colorFacetValue: colorFacet?.values.get(rowIndex),
-      sizeFacetValue: sizeFacet?.values.get(rowIndex),
+      colorFacetValue: colorFacet?.values[rowIndex],
+      sizeFacetValue: sizeFacet?.values[rowIndex],
     };
 
     extraFields = extraFields.filter((f) => f !== colorFacet && f !== sizeFacet);
@@ -93,7 +93,7 @@ export const TooltipView = ({
 
   yValue = {
     name: getFieldDisplayName(yField, frame),
-    val: yField.values.get(rowIndex),
+    val: yField.values[rowIndex],
     field: yField,
     color: series.pointColor(frame) as string,
   };
@@ -107,7 +107,7 @@ export const TooltipView = ({
         <tbody>
           <tr>
             <th>{getFieldDisplayName(xField, frame)}</th>
-            <td>{fmt(xField, xField.values.get(rowIndex))}</td>
+            <td>{fmt(xField, xField.values[rowIndex])}</td>
           </tr>
           <tr>
             <th>{yValue.name}:</th>
@@ -128,7 +128,7 @@ export const TooltipView = ({
           {extraFields.map((field, i) => (
             <tr key={i}>
               <th>{getFieldDisplayName(field, frame)}:</th>
-              <td>{fmt(field, field.values.get(rowIndex))}</td>
+              <td>{fmt(field, field.values[rowIndex])}</td>
             </tr>
           ))}
           {links.length > 0 && (

From c11baa3ead24e1df529529eef4e39e53d6e718e0 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matyax@gmail.com>
Date: Thu, 20 Apr 2023 17:06:47 +0200
Subject: [PATCH 291/729] Stats Inspector: Prevent long stats from being hidden
 (#66866)

* Stats Inspector: Prevent stats from being hidden

* Inspect stats: inline container styles
---
 public/app/features/inspector/InspectStatsTab.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/app/features/inspector/InspectStatsTab.tsx b/public/app/features/inspector/InspectStatsTab.tsx
index 3977cffcb2b..16886e34262 100644
--- a/public/app/features/inspector/InspectStatsTab.tsx
+++ b/public/app/features/inspector/InspectStatsTab.tsx
@@ -1,3 +1,4 @@
+import { css } from '@emotion/css';
 import React from 'react';
 
 import { PanelData, QueryResultMetaStat, TimeZone } from '@grafana/data';
@@ -17,7 +18,6 @@ export const InspectStatsTab = ({ data, timeZone }: InspectStatsTabProps) => {
   if (!data.request) {
     return null;
   }
-
   let stats: QueryResultMetaStat[] = [];
 
   const requestTime = data.request.endTime ? data.request.endTime - data.request.startTime : -1;
@@ -64,7 +64,7 @@ export const InspectStatsTab = ({ data, timeZone }: InspectStatsTabProps) => {
   const traceIdsStatsTableName = t('dashboard.inspect-stats.data-traceids', 'Trace IDs');
 
   return (
-    <div aria-label={selectors.components.PanelInspector.Stats.content}>
+    <div aria-label={selectors.components.PanelInspector.Stats.content} className={containerStyles}>
       <InspectStatsTable timeZone={timeZone} name={statsTableName} stats={stats} />
       <InspectStatsTable timeZone={timeZone} name={dataStatsTableName} stats={dataStats} />
       {config.featureToggles.showTraceId && (
@@ -73,3 +73,8 @@ export const InspectStatsTab = ({ data, timeZone }: InspectStatsTabProps) => {
     </div>
   );
 };
+
+const containerStyles = css`
+  height: 100%;
+  overflow-y: scroll;
+`;

From 74d3d3cf4a4435eafed704183ab351ccda5052c9 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 20 Apr 2023 17:22:09 +0200
Subject: [PATCH 292/729] Log Context: Improve loading indicator (#66979)

* remove loadingplaceholder

* lint
---
 .../datasource/loki/components/LokiContextUi.tsx      | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index 61a32acf93e..f91e3417e22 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -4,7 +4,7 @@ import { useAsync } from 'react-use';
 
 import { GrafanaTheme2, LogRowModel, SelectableValue } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
-import { Collapse, Icon, Label, LoadingPlaceholder, MultiSelect, Tag, Tooltip, useStyles2 } from '@grafana/ui';
+import { Collapse, Icon, Label, MultiSelect, Tag, Tooltip, useStyles2 } from '@grafana/ui';
 import store from 'app/core/store';
 
 import { RawQuery } from '../../prometheus/querybuilder/shared/RawQuery';
@@ -34,12 +34,6 @@ function getStyles(theme: GrafanaTheme2) {
       flex: 1;
       gap: ${theme.spacing(0.5)};
     `,
-    loadingPlaceholder: css`
-      margin-bottom: 0px;
-      float: right;
-      display: inline;
-      margin-left: auto;
-    `,
     textWrapper: css`
       display: flex;
       align-items: center;
@@ -167,7 +161,6 @@ export function LokiContextUi(props: LokiContextUiProps) {
 
   return (
     <div className={styles.wrapper}>
-      <LoadingPlaceholder text="" className={`${styles.loadingPlaceholder} ${loading ? '' : styles.hidden}`} />
       <Collapse
         collapsible={true}
         isOpen={isOpen}
@@ -208,6 +201,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
             Widen the search
           </Label>
           <MultiSelect
+            isLoading={loading}
             options={realLabels.map(contextFilterToSelectFilter)}
             value={realLabelsEnabled.map(contextFilterToSelectFilter)}
             closeMenuOnSelect={true}
@@ -248,6 +242,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
                 Refine the search
               </Label>
               <MultiSelect
+                isLoading={loading}
                 options={parsedLabels.map(contextFilterToSelectFilter)}
                 value={parsedLabelsEnabled.map(contextFilterToSelectFilter)}
                 closeMenuOnSelect={true}

From 3518f8ec53ccaf32f31d0376dd1a2474048fdd67 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 20 Apr 2023 16:37:00 +0100
Subject: [PATCH 293/729] NestedFolders: Refactor BrowseView state into redux
 (#66898)

* refactor all state into redux

* add tests for reducers

* added comments
---
 public/app/core/reducers/root.ts              |   2 +
 .../api/browseDashboardsAPI.ts                |   2 +-
 .../components/BrowseView.test.tsx            |   9 +-
 .../components/BrowseView.tsx                 | 172 +++-------------
 .../components/DashboardsTree.test.tsx        |  10 +-
 .../browse-dashboards/state/actions.ts        |  10 +
 .../features/browse-dashboards/state/hooks.ts |  72 +++++++
 .../features/browse-dashboards/state/index.ts |   3 +
 .../browse-dashboards/state/reducers.test.ts  | 190 ++++++++++++++++++
 .../browse-dashboards/state/reducers.ts       | 107 ++++++++++
 .../features/browse-dashboards/state/slice.ts |  37 ++++
 .../app/features/browse-dashboards/types.ts   |  15 +-
 12 files changed, 464 insertions(+), 165 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/state/actions.ts
 create mode 100644 public/app/features/browse-dashboards/state/hooks.ts
 create mode 100644 public/app/features/browse-dashboards/state/index.ts
 create mode 100644 public/app/features/browse-dashboards/state/reducers.test.ts
 create mode 100644 public/app/features/browse-dashboards/state/reducers.ts
 create mode 100644 public/app/features/browse-dashboards/state/slice.ts

diff --git a/public/app/core/reducers/root.ts b/public/app/core/reducers/root.ts
index 71b150f6cd2..68ac180d36c 100644
--- a/public/app/core/reducers/root.ts
+++ b/public/app/core/reducers/root.ts
@@ -6,6 +6,7 @@ import alertingReducers from 'app/features/alerting/state/reducers';
 import apiKeysReducers from 'app/features/api-keys/state/reducers';
 import authConfigReducers from 'app/features/auth-config/state/reducers';
 import { browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
+import browseDashboardsReducers from 'app/features/browse-dashboards/state/slice';
 import { publicDashboardApi } from 'app/features/dashboard/api/publicDashboardApi';
 import panelEditorReducers from 'app/features/dashboard/components/PanelEditor/state/reducers';
 import dashboardReducers from 'app/features/dashboard/state/reducers';
@@ -41,6 +42,7 @@ const rootReducers = {
   ...userReducers,
   ...invitesReducers,
   ...organizationReducers,
+  ...browseDashboardsReducers,
   ...ldapReducers,
   ...importDashboardReducers,
   ...panelEditorReducers,
diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index c87d45ef6fd..3fe6e34364a 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -29,7 +29,7 @@ function createBackendSrvBaseQuery({ baseURL }: { baseURL: string }): BaseQueryF
 }
 
 export const browseDashboardsAPI = createApi({
-  reducerPath: 'browse-dashboards',
+  reducerPath: 'browseDashboardsAPI',
   baseQuery: createBackendSrvBaseQuery({ baseURL: '/api' }),
   endpoints: (builder) => ({
     getFolder: builder.query<FolderDTO, string>({
diff --git a/public/app/features/browse-dashboards/components/BrowseView.test.tsx b/public/app/features/browse-dashboards/components/BrowseView.test.tsx
index cb84d927bd7..dcba29461f8 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.test.tsx
@@ -1,10 +1,9 @@
 import { getByLabelText, render as rtlRender, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { Router } from 'react-router-dom';
+import { TestProvider } from 'test/helpers/TestProvider';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { locationService } from '@grafana/runtime';
 
 import { wellFormedTree } from '../fixtures/dashboardsTreeItem.fixture';
 
@@ -12,10 +11,8 @@ import { BrowseView } from './BrowseView';
 
 const [mockTree, { folderA, folderA_folderA, folderA_folderB, folderA_folderB_dashbdB, dashbdD }] = wellFormedTree();
 
-function render(...args: Parameters<typeof rtlRender>) {
-  const [ui, options] = args;
-
-  rtlRender(<Router history={locationService.getHistory()}>{ui}</Router>, options);
+function render(...[ui, options]: Parameters<typeof rtlRender>) {
+  rtlRender(<TestProvider>{ui}</TestProvider>, options);
 }
 
 jest.mock('app/features/search/service/folders', () => {
diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
index d10d1bb3f15..233dd22998a 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -1,10 +1,15 @@
-import produce from 'immer';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect } from 'react';
 
-import { getFolderChildren } from 'app/features/search/service/folders';
-import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
+import { DashboardViewItem } from 'app/features/search/types';
+import { useDispatch } from 'app/types';
 
-import { DashboardsTreeItem } from '../types';
+import {
+  useFlatTreeState,
+  useSelectedItemsState,
+  fetchChildren,
+  setFolderOpenState,
+  setItemSelectionState,
+} from '../state';
 
 import { DashboardsTree } from './DashboardsTree';
 
@@ -15,102 +20,30 @@ interface BrowseViewProps {
 }
 
 export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
-  const [openFolders, setOpenFolders] = useState<Record<string, boolean>>({ [folderUID ?? '$$root']: true });
-
-  const [selectedItems, setSelectedItems] = useState<
-    Record<DashboardViewItemKind, Record<string, boolean | undefined>>
-  >({
-    folder: {},
-    dashboard: {},
-    panel: {},
-  });
-
-  // Rather than storing an actual tree structure (requiring traversing the tree to update children), instead
-  // we keep track of children for each UID and then later combine them in the format required to display them
-  const [childrenByUID, setChildrenByUID] = useState<Record<string, DashboardViewItem[] | undefined>>({});
-
-  const loadChildrenForUID = useCallback(
-    async (uid: string | undefined) => {
-      const folderKey = uid ?? '$$root';
-
-      const childItems = await getFolderChildren(uid, undefined, true);
-      setChildrenByUID((v) => ({ ...v, [folderKey]: childItems }));
-
-      // If the parent is already selected, mark these items as selected also
-      const parentIsSelected = selectedItems.folder[folderKey];
-      if (parentIsSelected) {
-        setSelectedItems((currentState) =>
-          produce(currentState, (draft) => {
-            for (const child of childItems) {
-              draft[child.kind][child.uid] = true;
-            }
-          })
-        );
-      }
-    },
-    [selectedItems]
-  );
+  const dispatch = useDispatch();
+  const flatTree = useFlatTreeState(folderUID);
+  const selectedItems = useSelectedItemsState();
 
   useEffect(() => {
-    loadChildrenForUID(folderUID);
-    // No need to depend on loadChildrenForUID - we only want this to run
-    // when folderUID changes (initial page view)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [folderUID]);
-
-  const flatTree = useMemo(
-    () => createFlatTree(folderUID, childrenByUID, openFolders),
-    [folderUID, childrenByUID, openFolders]
-  );
+    dispatch(fetchChildren(folderUID));
+  }, [dispatch, folderUID]);
 
   const handleFolderClick = useCallback(
-    (uid: string, newState: boolean) => {
-      if (newState) {
-        loadChildrenForUID(uid);
-      }
+    (clickedFolderUID: string, isOpen: boolean) => {
+      dispatch(setFolderOpenState({ folderUID: clickedFolderUID, isOpen }));
 
-      setOpenFolders((old) => ({ ...old, [uid]: newState }));
+      if (isOpen) {
+        dispatch(fetchChildren(clickedFolderUID));
+      }
     },
-    [loadChildrenForUID]
+    [dispatch]
   );
 
   const handleItemSelectionChange = useCallback(
-    (item: DashboardViewItem, newState: boolean) => {
-      // Recursively set selection state for this item and all descendants
-      setSelectedItems((old) =>
-        produce(old, (draft) => {
-          function markChildren(kind: DashboardViewItemKind, uid: string) {
-            draft[kind][uid] = newState;
-            if (kind !== 'folder') {
-              return;
-            }
-
-            let children = childrenByUID[uid] ?? [];
-            for (const child of children) {
-              markChildren(child.kind, child.uid);
-            }
-          }
-
-          markChildren(item.kind, item.uid);
-
-          // If we're unselecting an item, unselect all ancestors also
-          if (!newState) {
-            let nextParentUID = item.parentUID;
-
-            while (nextParentUID) {
-              const parent = findItem(childrenByUID, nextParentUID);
-              if (!parent) {
-                break;
-              }
-
-              draft[parent.kind][parent.uid] = false;
-              nextParentUID = parent.parentUID;
-            }
-          }
-        })
-      );
+    (item: DashboardViewItem, isSelected: boolean) => {
+      dispatch(setItemSelectionState({ item, isSelected }));
     },
-    [childrenByUID]
+    [dispatch]
   );
 
   return (
@@ -124,60 +57,3 @@ export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
     />
   );
 }
-
-// Creates a flat list of items, with nested children indicated by its increasing level
-function createFlatTree(
-  rootFolderUID: string | undefined,
-  childrenByUID: Record<string, DashboardViewItem[] | undefined>,
-  openFolders: Record<string, boolean>,
-  level = 0
-): DashboardsTreeItem[] {
-  function mapItem(item: DashboardViewItem, parentUID: string | undefined, level: number): DashboardsTreeItem[] {
-    const mappedChildren = createFlatTree(item.uid, childrenByUID, openFolders, level + 1);
-
-    const isOpen = Boolean(openFolders[item.uid]);
-    const emptyFolder = childrenByUID[item.uid]?.length === 0;
-    if (isOpen && emptyFolder) {
-      mappedChildren.push({
-        isOpen: false,
-        level: level + 1,
-        item: { kind: 'ui-empty-folder', uid: item.uid + '-empty-folder' },
-      });
-    }
-
-    const thisItem = {
-      item,
-      parentUID,
-      level,
-      isOpen,
-    };
-
-    return [thisItem, ...mappedChildren];
-  }
-
-  const folderKey = rootFolderUID ?? '$$root';
-  const isOpen = Boolean(openFolders[folderKey]);
-  const items = (isOpen && childrenByUID[folderKey]) || [];
-
-  return items.flatMap((item) => mapItem(item, rootFolderUID, level));
-}
-
-function findItem(
-  childrenByUID: Record<string, DashboardViewItem[] | undefined>,
-  uid: string
-): DashboardViewItem | undefined {
-  for (const parentUID in childrenByUID) {
-    const children = childrenByUID[parentUID];
-    if (!children) {
-      continue;
-    }
-
-    for (const child of children) {
-      if (child.uid === uid) {
-        return child;
-      }
-    }
-  }
-
-  return undefined;
-}
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
index e773a2dc669..1ac147c290a 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
@@ -1,18 +1,14 @@
 import { render as rtlRender, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { Router } from 'react-router-dom';
-
-import { locationService } from '@grafana/runtime';
+import { TestProvider } from 'test/helpers/TestProvider';
 
 import { wellFormedDashboard, wellFormedEmptyFolder, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
 
 import { DashboardsTree } from './DashboardsTree';
 
-function render(...args: Parameters<typeof rtlRender>) {
-  const [ui, options] = args;
-
-  rtlRender(<Router history={locationService.getHistory()}>{ui}</Router>, options);
+function render(...[ui, options]: Parameters<typeof rtlRender>) {
+  rtlRender(<TestProvider>{ui}</TestProvider>, options);
 }
 
 describe('browse-dashboards DashboardsTree', () => {
diff --git a/public/app/features/browse-dashboards/state/actions.ts b/public/app/features/browse-dashboards/state/actions.ts
new file mode 100644
index 00000000000..98fa760a937
--- /dev/null
+++ b/public/app/features/browse-dashboards/state/actions.ts
@@ -0,0 +1,10 @@
+import { createAsyncThunk } from '@reduxjs/toolkit';
+
+import { getFolderChildren } from 'app/features/search/service/folders';
+
+export const fetchChildren = createAsyncThunk(
+  'browseDashboards/fetchChildren',
+  async (parentUID: string | undefined) => {
+    return await getFolderChildren(parentUID, undefined, true);
+  }
+);
diff --git a/public/app/features/browse-dashboards/state/hooks.ts b/public/app/features/browse-dashboards/state/hooks.ts
new file mode 100644
index 00000000000..d5fb06ea59c
--- /dev/null
+++ b/public/app/features/browse-dashboards/state/hooks.ts
@@ -0,0 +1,72 @@
+import { createSelector } from 'reselect';
+
+import { DashboardViewItem } from 'app/features/search/types';
+import { useSelector, StoreState } from 'app/types';
+
+import { DashboardsTreeItem } from '../types';
+
+const flatTreeSelector = createSelector(
+  (wholeState: StoreState) => wholeState.browseDashboards.rootItems,
+  (wholeState: StoreState) => wholeState.browseDashboards.childrenByParentUID,
+  (wholeState: StoreState) => wholeState.browseDashboards.openFolders,
+  (wholeState: StoreState, rootFolderUID: string | undefined) => rootFolderUID,
+  (rootItems, childrenByParentUID, openFolders, folderUID) => {
+    return createFlatTree(folderUID, rootItems, childrenByParentUID, openFolders);
+  }
+);
+
+export function useFlatTreeState(folderUID: string | undefined) {
+  return useSelector((state) => flatTreeSelector(state, folderUID));
+}
+
+export function useSelectedItemsState() {
+  return useSelector((wholeState: StoreState) => wholeState.browseDashboards.selectedItems);
+}
+
+/**
+ * Creates a list of items, with level indicating it's 'nested' in the tree structure
+ *
+ * @param folderUID The UID of the folder being viewed, or undefined if at root Browse Dashboards page
+ * @param rootItems Array of loaded items at the root level (without a parent). If viewing a folder, we expect this to be empty and unused
+ * @param childrenByUID Arrays of children keyed by their parent UID
+ * @param openFolders Object of UID to whether that item is expanded or not
+ * @param level level of item in the tree. Only to be specified when called recursively.
+ */
+function createFlatTree(
+  folderUID: string | undefined,
+  rootItems: DashboardViewItem[],
+  childrenByUID: Record<string, DashboardViewItem[] | undefined>,
+  openFolders: Record<string, boolean>,
+  level = 0
+): DashboardsTreeItem[] {
+  function mapItem(item: DashboardViewItem, parentUID: string | undefined, level: number): DashboardsTreeItem[] {
+    const mappedChildren = createFlatTree(item.uid, rootItems, childrenByUID, openFolders, level + 1);
+
+    const isOpen = Boolean(openFolders[item.uid]);
+    const emptyFolder = childrenByUID[item.uid]?.length === 0;
+    if (isOpen && emptyFolder) {
+      mappedChildren.push({
+        isOpen: false,
+        level: level + 1,
+        item: { kind: 'ui-empty-folder', uid: item.uid + '-empty-folder' },
+      });
+    }
+
+    const thisItem = {
+      item,
+      parentUID,
+      level,
+      isOpen,
+    };
+
+    return [thisItem, ...mappedChildren];
+  }
+
+  const isOpen = (folderUID && openFolders[folderUID]) || level === 0;
+
+  const items = folderUID
+    ? (isOpen && childrenByUID[folderUID]) || [] // keep seperate lines
+    : rootItems;
+
+  return items.flatMap((item) => mapItem(item, folderUID, level));
+}
diff --git a/public/app/features/browse-dashboards/state/index.ts b/public/app/features/browse-dashboards/state/index.ts
new file mode 100644
index 00000000000..c5779d55154
--- /dev/null
+++ b/public/app/features/browse-dashboards/state/index.ts
@@ -0,0 +1,3 @@
+export * from './slice';
+export * from './actions';
+export * from './hooks';
diff --git a/public/app/features/browse-dashboards/state/reducers.test.ts b/public/app/features/browse-dashboards/state/reducers.test.ts
new file mode 100644
index 00000000000..9c9cbde83c3
--- /dev/null
+++ b/public/app/features/browse-dashboards/state/reducers.test.ts
@@ -0,0 +1,190 @@
+import { wellFormedDashboard, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
+import { BrowseDashboardsState } from '../types';
+
+import { extraReducerFetchChildrenFulfilled, setFolderOpenState, setItemSelectionState } from './reducers';
+
+function createInitialState(): BrowseDashboardsState {
+  return {
+    rootItems: [],
+    childrenByParentUID: {},
+    openFolders: {},
+    selectedItems: {
+      dashboard: {},
+      folder: {},
+      panel: {},
+    },
+  };
+}
+
+describe('browse-dashboards reducers', () => {
+  describe('extraReducerFetchChildrenFulfilled', () => {
+    it('updates state correctly for root items', () => {
+      const state = createInitialState();
+      const children = [
+        wellFormedFolder(1).item,
+        wellFormedFolder(2).item,
+        wellFormedFolder(3).item,
+        wellFormedDashboard(4).item,
+      ];
+
+      const action = {
+        payload: children,
+        type: 'action-type',
+        meta: {
+          arg: undefined,
+          requestId: 'abc-123',
+          requestStatus: 'fulfilled' as const,
+        },
+      };
+
+      extraReducerFetchChildrenFulfilled(state, action);
+
+      expect(state.rootItems).toEqual(children);
+    });
+
+    it('updates state correctly for items in folders', () => {
+      const state = createInitialState();
+      const parentFolder = wellFormedFolder(1).item;
+      const children = [wellFormedFolder(2).item, wellFormedDashboard(3).item];
+
+      const action = {
+        payload: children,
+        type: 'action-type',
+        meta: {
+          arg: parentFolder.uid,
+          requestId: 'abc-123',
+          requestStatus: 'fulfilled' as const,
+        },
+      };
+
+      extraReducerFetchChildrenFulfilled(state, action);
+
+      expect(state.childrenByParentUID).toEqual({ [parentFolder.uid]: children });
+    });
+
+    it('marks children as selected if the parent is selected', () => {
+      const parentFolder = wellFormedFolder(1).item;
+
+      const state = createInitialState();
+      state.selectedItems.folder[parentFolder.uid] = true;
+
+      const childFolder = wellFormedFolder(2).item;
+      const childDashboard = wellFormedDashboard(3).item;
+
+      const action = {
+        payload: [childFolder, childDashboard],
+        type: 'action-type',
+        meta: {
+          arg: parentFolder.uid,
+          requestId: 'abc-123',
+          requestStatus: 'fulfilled' as const,
+        },
+      };
+
+      extraReducerFetchChildrenFulfilled(state, action);
+
+      expect(state.selectedItems).toEqual({
+        dashboard: {
+          [childDashboard.uid]: true,
+        },
+        folder: {
+          [parentFolder.uid]: true,
+          [childFolder.uid]: true,
+        },
+        panel: {},
+      });
+    });
+  });
+
+  describe('setFolderOpenState', () => {
+    it('updates state correctly', () => {
+      const state = createInitialState();
+      const folderUID = 'abc-123';
+      setFolderOpenState(state, { type: 'setFolderOpenState', payload: { folderUID, isOpen: true } });
+
+      expect(state.openFolders).toEqual({ [folderUID]: true });
+    });
+  });
+
+  describe('setItemSelectionState', () => {
+    it('marks items as selected', () => {
+      const state = createInitialState();
+      const dashboard = wellFormedDashboard().item;
+
+      setItemSelectionState(state, { type: 'setItemSelectionState', payload: { item: dashboard, isSelected: true } });
+
+      expect(state.selectedItems).toEqual({
+        dashboard: {
+          [dashboard.uid]: true,
+        },
+        folder: {},
+        panel: {},
+      });
+    });
+
+    it('marks descendants as selected when the parent folder is selected', () => {
+      const state = createInitialState();
+
+      const parentFolder = wellFormedFolder(1).item;
+      const childDashboard = wellFormedDashboard(2, {}, { parentUID: parentFolder.uid }).item;
+      const childFolder = wellFormedFolder(3, {}, { parentUID: parentFolder.uid }).item;
+      const grandchildDashboard = wellFormedDashboard(4, {}, { parentUID: childFolder.uid }).item;
+
+      state.childrenByParentUID[parentFolder.uid] = [childDashboard, childFolder];
+      state.childrenByParentUID[childFolder.uid] = [grandchildDashboard];
+
+      setItemSelectionState(state, {
+        type: 'setItemSelectionState',
+        payload: { item: parentFolder, isSelected: true },
+      });
+
+      expect(state.selectedItems).toEqual({
+        dashboard: {
+          [childDashboard.uid]: true,
+          [grandchildDashboard.uid]: true,
+        },
+        folder: {
+          [parentFolder.uid]: true,
+          [childFolder.uid]: true,
+        },
+        panel: {},
+      });
+    });
+
+    it('unselects parents when items are unselected', () => {
+      const state = createInitialState();
+
+      const parentFolder = wellFormedFolder(1).item;
+      const childDashboard = wellFormedDashboard(2, {}, { parentUID: parentFolder.uid }).item;
+      const childFolder = wellFormedFolder(3, {}, { parentUID: parentFolder.uid }).item;
+      const grandchildDashboard = wellFormedDashboard(4, {}, { parentUID: childFolder.uid }).item;
+
+      state.rootItems = [parentFolder];
+      state.childrenByParentUID[parentFolder.uid] = [childDashboard, childFolder];
+      state.childrenByParentUID[childFolder.uid] = [grandchildDashboard];
+
+      state.selectedItems.dashboard[childDashboard.uid] = true;
+      state.selectedItems.dashboard[grandchildDashboard.uid] = true;
+      state.selectedItems.folder[parentFolder.uid] = true;
+      state.selectedItems.folder[childFolder.uid] = true;
+
+      // Unselect the deepest grandchild dashboard
+      setItemSelectionState(state, {
+        type: 'setItemSelectionState',
+        payload: { item: grandchildDashboard, isSelected: false },
+      });
+
+      expect(state.selectedItems).toEqual({
+        dashboard: {
+          [childDashboard.uid]: true,
+          [grandchildDashboard.uid]: false,
+        },
+        folder: {
+          [parentFolder.uid]: false,
+          [childFolder.uid]: false,
+        },
+        panel: {},
+      });
+    });
+  });
+});
diff --git a/public/app/features/browse-dashboards/state/reducers.ts b/public/app/features/browse-dashboards/state/reducers.ts
new file mode 100644
index 00000000000..85b75ca675d
--- /dev/null
+++ b/public/app/features/browse-dashboards/state/reducers.ts
@@ -0,0 +1,107 @@
+import { PayloadAction } from '@reduxjs/toolkit';
+
+import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
+
+import { BrowseDashboardsState } from '../types';
+
+import { fetchChildren } from './actions';
+
+type FetchChildrenAction = ReturnType<typeof fetchChildren.fulfilled>;
+
+export function extraReducerFetchChildrenFulfilled(state: BrowseDashboardsState, action: FetchChildrenAction) {
+  const parentUID = action.meta.arg;
+  const children = action.payload;
+
+  if (!parentUID) {
+    state.rootItems = children;
+    return;
+  }
+
+  state.childrenByParentUID[parentUID] = children;
+
+  // If the parent of the items we've loaded are selected, we must select all these items also
+  const parentIsSelected = state.selectedItems.folder[parentUID];
+  if (parentIsSelected) {
+    for (const child of children) {
+      state.selectedItems[child.kind][child.uid] = true;
+    }
+  }
+}
+
+export function setFolderOpenState(
+  state: BrowseDashboardsState,
+  action: PayloadAction<{ folderUID: string; isOpen: boolean }>
+) {
+  const { folderUID, isOpen } = action.payload;
+  state.openFolders[folderUID] = isOpen;
+}
+
+export function setItemSelectionState(
+  state: BrowseDashboardsState,
+  action: PayloadAction<{ item: DashboardViewItem; isSelected: boolean }>
+) {
+  const { item, isSelected } = action.payload;
+
+  function markChildren(kind: DashboardViewItemKind, uid: string) {
+    state.selectedItems[kind][uid] = isSelected;
+
+    if (kind !== 'folder') {
+      return;
+    }
+
+    let children = state.childrenByParentUID[uid] ?? [];
+    for (const child of children) {
+      markChildren(child.kind, child.uid);
+    }
+  }
+
+  markChildren(item.kind, item.uid);
+
+  // If we're unselecting an item, unselect all ancestors (parent, grandparent, etc) also
+  // so we can later show a UI-only 'mixed' checkbox
+  if (!isSelected) {
+    let nextParentUID = item.parentUID;
+
+    // this is like a recursive climb up the parents of the tree while we have a
+    // parentUID (we've hit a root dashboard/folder)
+    while (nextParentUID) {
+      const parent = findItem(state.rootItems, state.childrenByParentUID, nextParentUID);
+
+      // This case should not happen, but a find can theortically return undefined, and it
+      // helps limit infinite loops
+      if (!parent) {
+        break;
+      }
+
+      state.selectedItems[parent.kind][parent.uid] = false;
+      nextParentUID = parent.parentUID;
+    }
+  }
+}
+
+function findItem(
+  rootItems: DashboardViewItem[],
+  childrenByUID: Record<string, DashboardViewItem[] | undefined>,
+  uid: string
+): DashboardViewItem | undefined {
+  for (const item of rootItems) {
+    if (item.uid === uid) {
+      return item;
+    }
+  }
+
+  for (const parentUID in childrenByUID) {
+    const children = childrenByUID[parentUID];
+    if (!children) {
+      continue;
+    }
+
+    for (const child of children) {
+      if (child.uid === uid) {
+        return child;
+      }
+    }
+  }
+
+  return undefined;
+}
diff --git a/public/app/features/browse-dashboards/state/slice.ts b/public/app/features/browse-dashboards/state/slice.ts
new file mode 100644
index 00000000000..564f1fc4db7
--- /dev/null
+++ b/public/app/features/browse-dashboards/state/slice.ts
@@ -0,0 +1,37 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+import { BrowseDashboardsState } from '../types';
+
+import { fetchChildren } from './actions';
+import * as allReducers from './reducers';
+
+const { extraReducerFetchChildrenFulfilled, ...baseReducers } = allReducers;
+
+const initialState: BrowseDashboardsState = {
+  rootItems: [],
+  childrenByParentUID: {},
+  openFolders: {},
+  selectedItems: {
+    dashboard: {},
+    folder: {},
+    panel: {},
+  },
+};
+
+const browseDashboardsSlice = createSlice({
+  name: 'browseDashboards',
+  initialState,
+  reducers: baseReducers,
+
+  extraReducers: (builder) => {
+    builder.addCase(fetchChildren.fulfilled, extraReducerFetchChildrenFulfilled);
+  },
+});
+
+export const browseDashboardsReducer = browseDashboardsSlice.reducer;
+
+export const { setFolderOpenState, setItemSelectionState } = browseDashboardsSlice.actions;
+
+export default {
+  browseDashboards: browseDashboardsReducer,
+};
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
index d9fe84c17b4..499927f979f 100644
--- a/public/app/features/browse-dashboards/types.ts
+++ b/public/app/features/browse-dashboards/types.ts
@@ -1,13 +1,22 @@
-import { DashboardViewItem as OrigDashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
+import { DashboardViewItem as DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
+
+export interface BrowseDashboardsState {
+  rootItems: DashboardViewItem[];
+  childrenByParentUID: Record<string, DashboardViewItem[] | undefined>;
+  selectedItems: DashboardTreeSelection;
+
+  // Only folders can ever be open or closed, so no need to seperate this by kind
+  openFolders: Record<string, boolean>;
+}
 
 export interface UIDashboardViewItem {
   kind: 'ui-empty-folder';
   uid: string;
 }
 
-type DashboardViewItem = OrigDashboardViewItem | UIDashboardViewItem;
+type DashboardViewItemWithUIItems = DashboardViewItem | UIDashboardViewItem;
 
-export interface DashboardsTreeItem<T extends DashboardViewItem = DashboardViewItem> {
+export interface DashboardsTreeItem<T extends DashboardViewItemWithUIItems = DashboardViewItemWithUIItems> {
   item: T;
   level: number;
   isOpen: boolean;

From ce0f1803c05fd6367062e9850b53ecc103028a2d Mon Sep 17 00:00:00 2001
From: Vardan Torosyan <vardants@gmail.com>
Date: Thu, 20 Apr 2023 18:37:50 +0200
Subject: [PATCH 294/729] Require access to all settings for the nav item
 (#66990)

---
 pkg/services/navtree/navtreeimpl/admin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index e4fe9f95b98..c85838492f4 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -100,7 +100,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
 		})
 	}
 
-	if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)) {
+	if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)) {
 		configNodes = append(configNodes, &navtree.NavLink{
 			Text: "Settings", SubTitle: "View the settings defined in your Grafana config", Id: "server-settings", Url: s.cfg.AppSubURL + "/admin/settings", Icon: "sliders-v-alt",
 		})

From 2e55f26e534a211c88152e5827a30784551426c0 Mon Sep 17 00:00:00 2001
From: Alex Khomenko <Clarity-89@users.noreply.github.com>
Date: Thu, 20 Apr 2023 19:39:02 +0300
Subject: [PATCH 295/729] Cloudwatch: Fix nested recursive type (#66950)

* Cloudwatch: Fix nested recursive type

* Cloudwatch: Update exports
---
 pkg/plugins/codegen/jenny_plugingotypes.go    |  1 +
 .../kinds/dataquery/types_dataquery_gen.go    | 57 ++++++++++++++++---
 .../cloudwatch/__mocks__/sqlUtils.ts          |  4 +-
 .../datasource/cloudwatch/dataquery.cue       |  3 +-
 .../datasource/cloudwatch/dataquery.gen.ts    |  5 +-
 .../datasource/cloudwatch/expressions.ts      |  9 +--
 6 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/pkg/plugins/codegen/jenny_plugingotypes.go b/pkg/plugins/codegen/jenny_plugingotypes.go
index cc34c610352..c631b8f0598 100644
--- a/pkg/plugins/codegen/jenny_plugingotypes.go
+++ b/pkg/plugins/codegen/jenny_plugingotypes.go
@@ -41,6 +41,7 @@ func (j *pgoJenny) Generate(decl *pfs.PluginDecl) (*codejen.File, error) {
 			Group: decl.SchemaInterface.IsGroup(),
 			Config: &copenapi.Config{
 				ExpandReferences: true,
+				MaxCycleDepth:    10,
 			},
 		},
 		PackageName: slotname,
diff --git a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
index afd937176e8..0c7df705400 100644
--- a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
@@ -143,6 +143,16 @@ const (
 	QueryEditorArrayExpressionTypeOr  QueryEditorArrayExpressionType = "or"
 )
 
+// Defines values for QueryEditorExpressionExpressionsParametersType.
+const (
+	QueryEditorExpressionExpressionsParametersTypeFunctionParameter QueryEditorExpressionExpressionsParametersType = "functionParameter"
+)
+
+// Defines values for QueryEditorExpressionExpressionsPropertyType.
+const (
+	QueryEditorExpressionExpressionsPropertyTypeString QueryEditorExpressionExpressionsPropertyType = "string"
+)
+
 // Defines values for QueryEditorExpressionParametersType.
 const (
 	QueryEditorExpressionParametersTypeFunctionParameter QueryEditorExpressionParametersType = "functionParameter"
@@ -475,7 +485,8 @@ type CloudWatchMetricsQuerySqlGroupByExpressionsPropertyType string
 
 // CloudWatchMetricsQuerySqlGroupByExpressionsItem defines model for CloudWatchMetricsQuery.sql.groupBy.expressions.Item.
 type CloudWatchMetricsQuerySqlGroupByExpressionsItem struct {
-	Name *string `json:"name,omitempty"`
+	Expressions []interface{} `json:"expressions,omitempty"`
+	Name        *string       `json:"name,omitempty"`
 
 	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
 	Operator *struct {
@@ -517,7 +528,8 @@ type CloudWatchMetricsQuerySqlWhereExpressionsPropertyType string
 
 // CloudWatchMetricsQuerySqlWhereExpressionsItem defines model for CloudWatchMetricsQuery.sql.where.expressions.Item.
 type CloudWatchMetricsQuerySqlWhereExpressionsItem struct {
-	Name *string `json:"name,omitempty"`
+	Expressions []interface{} `json:"expressions,omitempty"`
+	Name        *string       `json:"name,omitempty"`
 
 	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
 	Operator *struct {
@@ -588,7 +600,8 @@ type QueryEditorArrayExpressionExpressionsPropertyType string
 
 // QueryEditorArrayExpressionExpressionsItem defines model for QueryEditorArrayExpression.expressions.Item.
 type QueryEditorArrayExpressionExpressionsItem struct {
-	Name *string `json:"name,omitempty"`
+	Expressions []interface{} `json:"expressions,omitempty"`
+	Name        *string       `json:"name,omitempty"`
 
 	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
 	Operator *struct {
@@ -610,9 +623,10 @@ type QueryEditorArrayExpressionExpressionsItem struct {
 // QueryEditorArrayExpressionType defines model for QueryEditorArrayExpression.Type.
 type QueryEditorArrayExpressionType string
 
-// QueryEditorArrayExpression is added in veneer
+// QueryEditorExpression defines model for QueryEditorExpression.
 type QueryEditorExpression struct {
-	Name *string `json:"name,omitempty"`
+	Expressions []QueryEditorExpressionExpressionsItem `json:"expressions,omitempty"`
+	Name        *string                                `json:"name,omitempty"`
 
 	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
 	Operator *struct {
@@ -631,6 +645,33 @@ type QueryEditorExpression struct {
 	union json.RawMessage
 }
 
+// QueryEditorExpressionExpressionsParametersType defines model for QueryEditorExpression.Expressions.Parameters.Type.
+type QueryEditorExpressionExpressionsParametersType string
+
+// QueryEditorExpressionExpressionsPropertyType defines model for QueryEditorExpression.Expressions.Property.Type.
+type QueryEditorExpressionExpressionsPropertyType string
+
+// QueryEditorExpressionExpressionsItem defines model for QueryEditorExpression.expressions.Item.
+type QueryEditorExpressionExpressionsItem struct {
+	Name *string `json:"name,omitempty"`
+
+	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
+	Operator *struct {
+		Name  *string      `json:"name,omitempty"`
+		Value *interface{} `json:"value,omitempty"`
+	} `json:"operator,omitempty"`
+	Parameters []struct {
+		Name *string                                        `json:"name,omitempty"`
+		Type QueryEditorExpressionExpressionsParametersType `json:"type"`
+	} `json:"parameters,omitempty"`
+	Property *struct {
+		Name *string                                      `json:"name,omitempty"`
+		Type QueryEditorExpressionExpressionsPropertyType `json:"type"`
+	} `json:"property,omitempty"`
+	Type  *interface{} `json:"type,omitempty"`
+	union json.RawMessage
+}
+
 // QueryEditorExpressionParametersType defines model for QueryEditorExpression.Parameters.Type.
 type QueryEditorExpressionParametersType string
 
@@ -790,7 +831,8 @@ type SQLExpressionGroupByExpressionsPropertyType string
 
 // SQLExpressionGroupByExpressionsItem defines model for SQLExpression.GroupBy.Expressions.Item.
 type SQLExpressionGroupByExpressionsItem struct {
-	Name *string `json:"name,omitempty"`
+	Expressions []interface{} `json:"expressions,omitempty"`
+	Name        *string       `json:"name,omitempty"`
 
 	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
 	Operator *struct {
@@ -832,7 +874,8 @@ type SQLExpressionWhereExpressionsPropertyType string
 
 // SQLExpressionWhereExpressionsItem defines model for SQLExpression.Where.Expressions.Item.
 type SQLExpressionWhereExpressionsItem struct {
-	Name *string `json:"name,omitempty"`
+	Expressions []interface{} `json:"expressions,omitempty"`
+	Name        *string       `json:"name,omitempty"`
 
 	// TS type is operator: QueryEditorOperator<QueryEditorOperatorValueType>, extended in veneer
 	Operator *struct {
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts
index 70a8e358eff..f593d43f4e4 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts
@@ -14,12 +14,12 @@ export function createArray(
   expressions: QueryEditorExpression[],
   type: QueryEditorExpressionType.And | QueryEditorExpressionType.Or = QueryEditorExpressionType.And
 ) {
-  const array = {
+  const array: QueryEditorArrayExpression = {
     type,
     expressions,
   };
 
-  return array as QueryEditorArrayExpression;
+  return array;
 }
 
 export function createOperator(property: string, operator: string, value?: string): QueryEditorOperatorExpression {
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.cue b/public/app/plugins/datasource/cloudwatch/dataquery.cue
index b6c7ce5c646..c6addead9d8 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.cue
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.cue
@@ -125,8 +125,7 @@ composableKinds: DataQuery: {
 							expressions: [...#QueryEditorExpression] | [...#QueryEditorArrayExpression]
 						} @cuetsy(kind="interface")
 
-						// QueryEditorArrayExpression is added in veneer
-						#QueryEditorExpression: #QueryEditorPropertyExpression | #QueryEditorGroupByExpression | #QueryEditorFunctionExpression | #QueryEditorFunctionParameterExpression | #QueryEditorOperatorExpression @cuetsy(kind="type")
+						#QueryEditorExpression: #QueryEditorArrayExpression | #QueryEditorPropertyExpression | #QueryEditorGroupByExpression | #QueryEditorFunctionExpression | #QueryEditorFunctionParameterExpression | #QueryEditorOperatorExpression @cuetsy(kind="type")
 
 						#CloudWatchLogsQuery: {
 							common.DataQuery
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
index 2f87b0bf4f5..eb31858f06b 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
@@ -143,10 +143,7 @@ export interface QueryEditorArrayExpression {
   type: (QueryEditorExpressionType.And | QueryEditorExpressionType.Or);
 }
 
-/**
- * QueryEditorArrayExpression is added in veneer
- */
-export type QueryEditorExpression = (QueryEditorPropertyExpression | QueryEditorGroupByExpression | QueryEditorFunctionExpression | QueryEditorFunctionParameterExpression | QueryEditorOperatorExpression);
+export type QueryEditorExpression = (QueryEditorArrayExpression | QueryEditorPropertyExpression | QueryEditorGroupByExpression | QueryEditorFunctionExpression | QueryEditorFunctionParameterExpression | QueryEditorOperatorExpression);
 
 export interface CloudWatchLogsQuery extends common.DataQuery {
   expression?: string;
diff --git a/public/app/plugins/datasource/cloudwatch/expressions.ts b/public/app/plugins/datasource/cloudwatch/expressions.ts
index a8e13f8fd8a..a7dce622813 100644
--- a/public/app/plugins/datasource/cloudwatch/expressions.ts
+++ b/public/app/plugins/datasource/cloudwatch/expressions.ts
@@ -2,9 +2,6 @@ import {
   QueryEditorOperatorExpression as QueryEditorOperatorExpressionBase,
   QueryEditorOperator as QueryEditorOperatorBase,
   QueryEditorOperatorValueType,
-  QueryEditorExpressionType,
-  QueryEditorExpression as QueryEditorExpressionBase,
-  QueryEditorArrayExpression,
 } from './dataquery.gen';
 export {
   QueryEditorPropertyType,
@@ -14,10 +11,10 @@ export {
   QueryEditorFunctionExpression,
   QueryEditorFunctionParameterExpression,
   QueryEditorArrayExpression,
+  QueryEditorExpressionType,
+  QueryEditorExpression,
 } from './dataquery.gen';
 
-export { QueryEditorExpressionType };
-
 export interface QueryEditorOperator<T extends QueryEditorOperatorValueType> extends QueryEditorOperatorBase {
   value?: T;
 }
@@ -25,5 +22,3 @@ export interface QueryEditorOperator<T extends QueryEditorOperatorValueType> ext
 export interface QueryEditorOperatorExpression extends QueryEditorOperatorExpressionBase {
   operator: QueryEditorOperator<QueryEditorOperatorValueType>;
 }
-
-export type QueryEditorExpression = QueryEditorArrayExpression | QueryEditorExpressionBase;

From f70f31744bf5b3aadbbbeb5e265a12c18e7babac Mon Sep 17 00:00:00 2001
From: Vardan Torosyan <vardants@gmail.com>
Date: Thu, 20 Apr 2023 18:58:50 +0200
Subject: [PATCH 296/729] Require access to all settings to read Grafana
 Settings (#66992)

* Require access to all settings to read Grafana Settings

* Handle PR comments
---
 pkg/api/api.go                            | 3 ++-
 pkg/services/navtree/navtreeimpl/admin.go | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 8f3c59cf7e5..0455e0a3537 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -103,7 +103,7 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/dashboard/import/", reqSignedIn, hs.Index)
 	r.Get("/configuration", reqGrafanaAdmin, hs.Index)
 	r.Get("/admin", reqOrgAdmin, hs.Index)
-	r.Get("/admin/settings", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)), hs.Index)
+	r.Get("/admin/settings", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)), hs.Index)
 	r.Get("/admin/users", authorize(reqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionOrgUsersRead), ac.EvalPermission(ac.ActionUsersRead, ac.ScopeGlobalUsersAll))), hs.Index)
 	r.Get("/admin/users/create", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionUsersCreate)), hs.Index)
 	r.Get("/admin/users/edit/:id", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionUsersRead)), hs.Index)
@@ -599,6 +599,7 @@ func (hs *HTTPServer) registerRoutes() {
 
 	// admin api
 	r.Group("/api/admin", func(adminRoute routing.RouteRegister) {
+		// There is additional filter which will ensure that user sees only settings that they are allowed to see, so we don't need provide additional scope here for ActionSettingsRead.
 		adminRoute.Get("/settings", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)), routing.Wrap(hs.AdminGetSettings))
 		adminRoute.Get("/settings-verbose", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)), routing.Wrap(hs.AdminGetVerboseSettings))
 		adminRoute.Get("/stats", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionServerStatsRead)), routing.Wrap(hs.AdminGetStats))
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index c85838492f4..5b8a9e398c9 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -128,7 +128,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
 		})
 	}
 
-	if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)) && s.features.IsEnabled(featuremgmt.FlagStorage) {
+	if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)) && s.features.IsEnabled(featuremgmt.FlagStorage) {
 		storage := &navtree.NavLink{
 			Text:     "Storage",
 			Id:       "storage",

From 4daf53fb0829c75fc85cba25eacc01bfe115c80e Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Thu, 20 Apr 2023 18:05:08 +0100
Subject: [PATCH 297/729] Docs: first pass at SAML UI docs (#65847)

* first pass at SAML UI docs

* doc updates

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* review feedback

* finish documentation for all the sections

* remove unneeded doc bit

* PR feedback

* cross-reference SAML UI docs from SAML config file docs

* extending the docs with the new fields and expaning the mapping section

* feedback

* add the permissions required to access SAML UI

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 .../configure-authentication/saml-ui/index.md | 91 +++++++++++++++++++
 .../configure-authentication/saml/index.md    | 15 +--
 2 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md

diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
new file mode 100644
index 00000000000..255aa74abed
--- /dev/null
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
@@ -0,0 +1,91 @@
+---
+description: Learn how to configure SAML authentication in Grafana's UI.
+menuTitle: Configure SAML using the UI
+title: Configure SAML authentication using the Grafana user interface
+weight: 1150
+---
+
+# Configure SAML authentication using the Grafana user interface
+
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../../introduction/grafana-enterprise/" >}}) version 10.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
+
+You can configure SAML authentication in Grafana through the user interface (UI) or the Grafana configuration file. For instructions on how to set up SAML using the Grafana configuration file, refer to [Configure SAML authentication using the configuration file]({{< relref "../saml/" >}}).
+
+The Grafana SAML UI provides the following advantages over configuring SAML in the Grafana configuration file:
+
+- It is accessible by Grafana Cloud users
+- SAML UI carries out input validation and provides useful feedback on the correctness of the configuration, making SAML setup easier
+- It doesn't require Grafana to be restarted after a configuration update
+- Access to the SAML UI only requires access to authentication settings, so it can be used by users with limited access to Grafana's configuration
+
+> **Note:** Configuration in the UI takes precedence over the configuration in the Grafana configuration file. SAML settings from the UI will override any SAML configuration set in the Grafana configuration file.
+
+## Before you begin
+
+To follow this guide, you need:
+
+- Knowledge of SAML authentication. Refer to [SAML authentication in Grafana]({{< relref "../saml/" >}}) for an overview of Grafana's SAML integration.
+- Permissions `settings:read` and `settings:write` with scope `settings:auth:*` that allow you to read and update authentication settings.
+
+  These permissions are granted by `fixed:authentication.config:writer` role.
+  By default, this role is granted to Grafana server administrator in self-hosted instances and to Organization admins in Grafana Cloud instances.
+
+- Grafana instance running Grafana version 10.0 or later with [Grafana Enterprise]({{< relref "../../../introduction/grafana-enterprise/" >}}) or [Grafana Cloud Pro or Advanced](/docs/grafana-cloud/) license.
+
+## Steps
+
+Follow these steps to configure and enable SAML integration:
+
+1. Sign in to Grafana and navigate to **Administration > Authentication > Configure SAML**.
+1. Complete the **General settings** fields.
+
+   For assistance, consult the following table for additional guidance about certain fields:
+
+| Field                                 | Description                                                                                                                                                                                                                                                    |
+| ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Allow signup**                      | If enabled, you can create new users through the SAML login. If disabled, then only existing Grafana users can log in with SAML.                                                                                                                               |
+| **Auto login**                        | If enabled, Grafana will attempt to automatically log in with SAML skipping the login screen.                                                                                                                                                                  |
+| **Single logout**                     | The SAML single logout feature enables users to log out from all applications associated with the current IdP session established using SAML SSO. For more information, refer to [SAML single logout documentation]]({{< relref "../saml/#single-logout" >}}). |
+| **Identity provider initiated login** | Enables users to log in to Grafana directly from the SAML IdP. For more information, refer to [IdP initiated login documentation]({{< relref "../saml/#idp-initiated-single-sign-on-sso" >}}).                                                                 |
+
+3. Click **Next: Key and certificate**.
+1. Provide a certificate and a private key that will be used by the service provider (Grafana) and the SAML IdP.
+
+   Use the [PKCS #8](https://en.wikipedia.org/wiki/PKCS_8) format to issue the private key.
+
+   For more information, refer to an [example on how to generate SAML credentials]({{< relref "../saml/#example-of-how-to-generate-saml-credentials" >}}).
+
+1. In the **Sign requests** field, specify whether you want the outgoing requests to be signed, and, if so, which signature algorithm should be used.
+
+   The SAML standard recommends using a digital signature for some types of messages, like authentication or logout requests to avoid [man-in-the-middle attacks](https://en.wikipedia.org/wiki/Man-in-the-middle_attack).
+
+1. Click **Next: Connect Grafana with Identity Provider** and complete the section.
+1. Click **Next: User mapping**.
+1. If you wish to [map user information from SAML assertions]({{< relref "../saml/#assertion-mapping" >}}), complete the **Assertion attributes mappings** section.
+
+   You also need to configure the **Groups attribute** field if you want to use team sync. Team sync automatically maps users to Grafana teams based on their SAML group membership.
+   Learn more about [team sync]({{< relref "../../configure-team-sync/" >}}) and [configuring team sync for SAML]({{< relref "../saml/#configure-team-sync" >}}).
+
+1. If you want to automatically assign users' roles based on their SAML roles, complete the **Role mapping** section.
+
+   First, you need to configure the **Role attribute** field to specify which SAML attribute should be used to retrieve SAML role information.
+   Then enter the SAML roles that you want to map to Grafana roles in **Role mapping** section. If you want to map multiple SAML roles to a Grafana role, separate them by a comma and a space. For example, `Editor: editor, developer`.
+
+   Role mapping will automatically update user's [basic role]({{< relref "../../../../administration/roles-and-permissions/access-control/#basic-roles" >}}) based on their SAML roles every time the user logs in to Grafana.
+   Learn more about [SAML role synchronization]({{< relref "../saml/#configure-role-sync" >}}).
+
+1. If you have multiple organizations and want to automatically add users to organizations, complete the **Org mapping section**.
+
+   First, you need to configure the **Org attribute** field to specify which SAML attribute should be used to retrieve SAML organization information.
+   Now fill in the **Org mapping** field with mappings from SAML organization to Grafana organization. For example, `Org mapping: Engineering:2, Sales:2` will map users who belong to `Engineering` or `Sales` organizations in SAML to Grafana organization with ID 2.
+   If you want users to have different roles in different organizations, you can additionally specify a role. For example, `Org mapping: Engineering:2:Editor` will map users who belong to `Engineering` organizations in SAML to Grafana organization with ID 2 and assign them Editor role.
+
+   Organization mapping will automatically update user's organization memberships (and roles, if they have been configured) based on their SAML organization every time the user logs in to Grafana.
+   Learn more about [SAML organization mapping]({{< relref "../saml/#configure-organization-mapping" >}}).
+
+1. If you want to limit the access to Grafana based on user's SAML organization membership, fill in the **Allowed organizations** field.
+1. Click **Next: Test and enable** and then click **Save and enable**.
+   1. If there are issues with your configuration, an error message will appear. Refer back to the previous steps to correct the issues and click on `Save and apply` on the top right corner once you are done.
+1. If there are no configuration issues, SAML integration status will change to `Enabled`.
+   Your SAML configuration is now enabled.
+1. To disable SAML integration, click `Disable` in the top right corner.
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
index c8e9aa21748..e3d0a6190db 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
@@ -8,19 +8,22 @@ aliases:
   - ../../../enterprise/saml/enable-saml/
   - ../../../enterprise/saml/set-up-saml-with-okta/
   - ../../../enterprise/saml/troubleshoot-saml/
-description: Learn how to configure SAML authentication in Grafana.
-menuTitle: Configure SAML authentication
-title: Configure SAML authentication in Grafana
+description: Learn how to configure SAML authentication in Grafana's configuration file.
+menuTitle: Configure SAML using the configuration file
+title: Configure SAML authentication using the configuration file
 weight: 1100
 ---
 
-# Configure SAML authentication in Grafana
+# Configure SAML authentication using the configuration file
+
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud).
 
 SAML authentication integration allows your Grafana users to log in by using an external SAML 2.0 Identity Provider (IdP). To enable this, Grafana becomes a Service Provider (SP) in the authentication flow, interacting with the IdP to exchange user information.
 
-The SAML single sign-on (SSO) standard is varied and flexible. Our implementation contains a subset of features needed to provide a smooth authentication experience into Grafana.
+You can configure SAML authentication in Grafana through the user interface (UI) or the Grafana configuration file. For instructions on how to set up SAML through Grafana's UI, refer to [Configure SAML authentication using the Grafana user interface]({{< relref "../saml-ui/" >}}).
+Both methods offer the same configuration options, but you might prefer using the Grafana configuration file if you want to keep all of Grafana's authentication settings in one place. Grafana Cloud users do not have access to Grafana configuration file, so they should configure SAML through Grafana's UI.
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud).
+> **Note:** Configuration in the UI takes precedence over the configuration in the Grafana configuration file. SAML settings from the UI will override any SAML configuration set in the Grafana configuration file.
 
 ## Supported SAML
 

From 405bda7e9981183d0a55f708804eeb99bc0f32e1 Mon Sep 17 00:00:00 2001
From: Kevin Minehart <kmineh0151@gmail.com>
Date: Thu, 20 Apr 2023 12:51:50 -0500
Subject: [PATCH 298/729] Packaging: Added deprecation warnings when running
 `grafana-cli` or `grafana-server`; the `grafana` command should be used
 instead. (#66976)

* Add grafana-cli and grafana-server deprecation warnings

* remove extra :
---
 pkg/util/cmd/cmd.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg/util/cmd/cmd.go b/pkg/util/cmd/cmd.go
index b0ec8b07501..85d9e8be1f2 100644
--- a/pkg/util/cmd/cmd.go
+++ b/pkg/util/cmd/cmd.go
@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"runtime"
 	"syscall"
+
+	"github.com/fatih/color"
 )
 
 func RunGrafanaCmd(subCmd string) int {
@@ -17,6 +19,13 @@ func RunGrafanaCmd(subCmd string) int {
 		return 1
 	}
 
+	switch filepath.Base(curr) {
+	case "grafana-server":
+		fmt.Printf("%s: %s\n", color.RedString("Deprecation warning"), "The standalone 'grafana-server' program is deprecated and will be removed in the future. Please update all uses of 'grafana-server' to 'grafana server'")
+	case "grafana-cli":
+		fmt.Printf("%s: %s\n", color.RedString("Deprecation warning"), "The standalone 'grafana-cli' program is deprecated and will be removed in the future. Please update all uses of 'grafana-cli' to 'grafana cli'")
+	}
+
 	executable := "grafana"
 	if runtime.GOOS == "windows" {
 		executable += ".exe"

From 607b94aaa2cde6e93c329ef0990733d2f1f85d07 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 20 Apr 2023 22:03:38 -0700
Subject: [PATCH 299/729] FieldValues: Use standard array functions (#67012)

---
 .betterer.results                             |  6 +++--
 .../src/dataframe/MutableDataFrame.ts         | 12 +++++-----
 .../grafana-data/src/field/fieldComparers.ts  | 11 ++++-----
 .../src/transformations/fieldReducer.ts       |  2 +-
 .../transformers/groupingToMatrix.ts          |  6 ++---
 .../transformers/joinDataFrames.ts            |  4 ++--
 packages/grafana-data/src/utils/flotPairs.ts  |  4 ++--
 .../src/components/Sparkline/Sparkline.tsx    |  2 +-
 .../unified/components/rule-editor/preview.ts |  4 ++--
 public/app/features/dimensions/utils.ts       |  2 +-
 .../hooks/useSearchKeyboardSelection.ts       |  2 +-
 .../page/components/ExplainScorePopup.tsx     |  4 ++--
 .../search/page/components/columns.tsx        |  2 +-
 public/app/features/search/service/bluge.ts   |  2 +-
 .../timeSeriesTableTransformer.ts             |  4 ++--
 .../datasource/loki/getDerivedFields.ts       |  2 +-
 .../loki/liveStreamsResultTransformer.ts      |  6 ++---
 .../prometheus/result_transformer.ts          | 14 +++++------
 .../datasource/tempo/resultTransformer.ts     |  6 ++---
 .../datasource/testdata/nodeGraphUtils.ts     | 24 +++++++++----------
 .../plugins/datasource/testdata/runStreams.ts |  4 ++--
 public/app/plugins/panel/nodeGraph/utils.ts   |  4 ++--
 .../state-timeline/StateTimelineTooltip.tsx   | 12 +++++-----
 23 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 51c721f7b70..e821ba95673 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -284,8 +284,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/transformations/transformers/histogram.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -293,6 +292,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
+    "packages/grafana-data/src/transformations/transformers/joinDataFrames.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
     "packages/grafana-data/src/transformations/transformers/merge.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.ts b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
index 84a58ab6498..77abfa58204 100644
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
@@ -119,7 +119,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
     // Make sure the field starts with a given length
     if (startLength) {
       while (field.values.length < startLength) {
-        field.values.add(MISSING_VALUE);
+        field.values.push(MISSING_VALUE);
       }
     } else {
       this.validate();
@@ -137,7 +137,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
     // Add empty elements until everything matches
     for (const field of this.fields) {
       while (field.values.length !== length) {
-        field.values.add(MISSING_VALUE);
+        field.values.push(MISSING_VALUE);
       }
     }
   }
@@ -191,7 +191,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
       if (f.type !== FieldType.string && isString(v)) {
         v = this.parseValue(f, v);
       }
-      f.values.add(v);
+      f.values.push(v);
     }
   }
 
@@ -227,7 +227,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
         val = MISSING_VALUE;
       }
 
-      field.values.add(val);
+      field.values.push(val);
     }
   }
 
@@ -238,7 +238,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
 
     const obj = (value as any) || {};
     for (const field of this.fields) {
-      field.values.set(index, obj[field.name]);
+      field.values[index] = obj[field.name];
     }
   }
 
@@ -248,7 +248,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
   get(idx: number): T {
     const v: any = {};
     for (const field of this.fields) {
-      v[field.name] = field.values.get(idx);
+      v[field.name] = field.values[idx];
     }
     return v as T;
   }
diff --git a/packages/grafana-data/src/field/fieldComparers.ts b/packages/grafana-data/src/field/fieldComparers.ts
index aa709e2ffb7..972b435cd35 100644
--- a/packages/grafana-data/src/field/fieldComparers.ts
+++ b/packages/grafana-data/src/field/fieldComparers.ts
@@ -2,7 +2,6 @@ import { isNumber } from 'lodash';
 
 import { dateTime, isDateTimeInput } from '../datetime';
 import { Field, FieldType } from '../types/dataFrame';
-import { Vector } from '../types/vector';
 
 type IndexComparer = (a: number, b: number) => number;
 
@@ -79,12 +78,12 @@ const falsyComparer = (a: unknown, b: unknown): number => {
   return 0;
 };
 
-const timestampIndexComparer = (values: Vector<number>, reverse: boolean): IndexComparer => {
+const timestampIndexComparer = (values: number[], reverse: boolean): IndexComparer => {
   let mult = reverse ? -1 : 1;
   return (a: number, b: number): number => mult * (values[a] - values[b]);
 };
 
-const timeIndexComparer = (values: Vector<unknown>, reverse: boolean): IndexComparer => {
+const timeIndexComparer = (values: unknown[], reverse: boolean): IndexComparer => {
   return (a: number, b: number): number => {
     const vA = values[a];
     const vB = values[b];
@@ -92,7 +91,7 @@ const timeIndexComparer = (values: Vector<unknown>, reverse: boolean): IndexComp
   };
 };
 
-const booleanIndexComparer = (values: Vector<boolean>, reverse: boolean): IndexComparer => {
+const booleanIndexComparer = (values: boolean[], reverse: boolean): IndexComparer => {
   return (a: number, b: number): number => {
     const vA = values[a];
     const vB = values[b];
@@ -100,7 +99,7 @@ const booleanIndexComparer = (values: Vector<boolean>, reverse: boolean): IndexC
   };
 };
 
-const numericIndexComparer = (values: Vector<number>, reverse: boolean): IndexComparer => {
+const numericIndexComparer = (values: number[], reverse: boolean): IndexComparer => {
   return (a: number, b: number): number => {
     const vA = values[a];
     const vB = values[b];
@@ -108,7 +107,7 @@ const numericIndexComparer = (values: Vector<number>, reverse: boolean): IndexCo
   };
 };
 
-const stringIndexComparer = (values: Vector<string>, reverse: boolean): IndexComparer => {
+const stringIndexComparer = (values: string[], reverse: boolean): IndexComparer => {
   return (a: number, b: number): number => {
     const vA = values[a];
     const vB = values[b];
diff --git a/packages/grafana-data/src/transformations/fieldReducer.ts b/packages/grafana-data/src/transformations/fieldReducer.ts
index a24a62d6af5..103dc14309e 100644
--- a/packages/grafana-data/src/transformations/fieldReducer.ts
+++ b/packages/grafana-data/src/transformations/fieldReducer.ts
@@ -290,7 +290,7 @@ export function doStandardCalcs(field: Field, ignoreNulls: boolean, nullAsZero:
     previousDeltaUp: true,
   };
 
-  const data = field.values.toArray(); // toArray() ensures we handle all vector types
+  const data = field.values;
   calcs.count = ignoreNulls ? data.length : data.filter((val) => val != null).length;
 
   const isNumberField = field.type === FieldType.number || FieldType.time;
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
index cbc4f8652f9..3b5721b7b99 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
@@ -2,7 +2,7 @@ import { map } from 'rxjs/operators';
 
 import { MutableDataFrame } from '../../dataframe';
 import { getFieldDisplayName } from '../../field/fieldState';
-import { DataFrame, DataTransformerInfo, Field, FieldType, SpecialValue, Vector } from '../../types';
+import { DataFrame, DataTransformerInfo, Field, FieldType, SpecialValue } from '../../types';
 import { fieldMatchers } from '../matchers';
 import { FieldMatcherID } from '../matchers/ids';
 
@@ -111,8 +111,8 @@ export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTr
     ),
 };
 
-function uniqueValues(values: Vector): any[] {
-  const unique = new Set();
+function uniqueValues<T>(values: T[]): T[] {
+  const unique = new Set<T>();
 
   for (let index = 0; index < values.length; index++) {
     unique.add(values[index]);
diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
index 39dfb3f0284..167a3f0ec50 100644
--- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
@@ -1,7 +1,7 @@
 import intersect from 'fast_array_intersect';
 
 import { getTimeField, sortDataFrame } from '../../dataframe';
-import { DataFrame, Field, FieldMatcher, FieldType, Vector } from '../../types';
+import { DataFrame, Field, FieldMatcher, FieldType } from '../../types';
 import { fieldMatchers } from '../matchers';
 import { FieldMatcherID } from '../matchers/ids';
 
@@ -351,7 +351,7 @@ export function join(tables: AlignedData[], nullModes?: number[][], mode: JoinMo
 
 // Test a few samples to see if the values are ascending
 // Only exported for tests
-export function isLikelyAscendingVector(data: Vector | [], samples = 50) {
+export function isLikelyAscendingVector(data: any[], samples = 50) {
   const len = data.length;
 
   // empty or single value
diff --git a/packages/grafana-data/src/utils/flotPairs.ts b/packages/grafana-data/src/utils/flotPairs.ts
index 4780b5c5db0..06cea3086a5 100644
--- a/packages/grafana-data/src/utils/flotPairs.ts
+++ b/packages/grafana-data/src/utils/flotPairs.ts
@@ -23,8 +23,8 @@ export function getFlotPairs({ xField, yField, nullValueMode }: FlotPairsOptions
   const pairs: any[][] = [];
 
   for (let i = 0; i < length; i++) {
-    const x = vX.get(i);
-    let y = vY.get(i);
+    const x = vX[i];
+    let y = vY[i];
 
     if (y === null) {
       if (ignoreNulls) {
diff --git a/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx b/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
index 4f60d99d03e..3604a975b4a 100644
--- a/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
+++ b/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
@@ -135,7 +135,7 @@ export class Sparkline extends PureComponent<SparklineProps, State> {
             return [sparkline.timeRange.from.valueOf(), sparkline.timeRange.to.valueOf()];
           }
           const vals = sparkline.x.values;
-          return [vals.get(0), vals.get(vals.length - 1)];
+          return [vals[0], vals[vals.length - 1]];
         }
         return [0, sparkline.y.values.length - 1];
       },
diff --git a/public/app/features/alerting/unified/components/rule-editor/preview.ts b/public/app/features/alerting/unified/components/rule-editor/preview.ts
index 04b08ae156c..e6a6376cbfd 100644
--- a/public/app/features/alerting/unified/components/rule-editor/preview.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/preview.ts
@@ -27,8 +27,8 @@ export function mapDataFrameToAlertPreview({ fields }: DataFrame): AlertPreview
 
   for (let index = 0; index < instanceStatusCount; index++) {
     const labelValues = labelIndexes.map((labelIndex) => [fields[labelIndex].name, fields[labelIndex].values[index]]);
-    const state = fields[stateFieldIndex]?.values?.get(index);
-    const info = fields[infoFieldIndex]?.values?.get(index);
+    const state = fields[stateFieldIndex]?.values?.[index];
+    const info = fields[infoFieldIndex]?.values?.[index];
 
     if (isGrafanaAlertState(state)) {
       instances.push({
diff --git a/public/app/features/dimensions/utils.ts b/public/app/features/dimensions/utils.ts
index 139386dc914..9b3c2bccd81 100644
--- a/public/app/features/dimensions/utils.ts
+++ b/public/app/features/dimensions/utils.ts
@@ -125,7 +125,7 @@ export function getLastNotNullFieldValue<T>(field: Field): T {
   const data = field.values;
   let idx = data.length - 1;
   while (idx >= 0) {
-    const v = data.get(idx--);
+    const v = data[idx--];
     if (v != null) {
       return v;
     }
diff --git a/public/app/features/search/hooks/useSearchKeyboardSelection.ts b/public/app/features/search/hooks/useSearchKeyboardSelection.ts
index 6533a6d7ebc..ee9a35f11c1 100644
--- a/public/app/features/search/hooks/useSearchKeyboardSelection.ts
+++ b/public/app/features/search/hooks/useSearchKeyboardSelection.ts
@@ -85,7 +85,7 @@ export function useSearchKeyboardNavigation(
               setHighlightIndex({ ...highlightIndexRef.current });
               break;
             }
-            const url = urlsRef.current.values?.get(idx) as string;
+            const url = urlsRef.current.values?.[idx] as string;
             if (url) {
               locationService.push(locationUtil.stripBaseFromUrl(url));
             }
diff --git a/public/app/features/search/page/components/ExplainScorePopup.tsx b/public/app/features/search/page/components/ExplainScorePopup.tsx
index c31b7159553..387118a181b 100644
--- a/public/app/features/search/page/components/ExplainScorePopup.tsx
+++ b/public/app/features/search/page/components/ExplainScorePopup.tsx
@@ -60,8 +60,8 @@ export function ExplainScorePopup({ name, explain, frame, row }: Props) {
             showLineNumbers={false}
             showMiniMap={false}
             value={(() => {
-              const allowedActions = frame.fields.find((f) => f.name === 'allowed_actions')?.values?.get(row);
-              const dsUids = frame.fields.find((f) => f.name === 'ds_uid')?.values?.get(row);
+              const allowedActions = frame.fields.find((f) => f.name === 'allowed_actions')?.values?.[row];
+              const dsUids = frame.fields.find((f) => f.name === 'ds_uid')?.values?.[row];
               return JSON.stringify({ dsUids: dsUids ?? [], allowedActions: allowedActions ?? [] }, null, 2);
             })()}
             readOnly={false}
diff --git a/public/app/features/search/page/components/columns.tsx b/public/app/features/search/page/components/columns.tsx
index 831b338c40f..67c82fad45a 100644
--- a/public/app/features/search/page/components/columns.tsx
+++ b/public/app/features/search/page/components/columns.tsx
@@ -240,7 +240,7 @@ export const generateColumns = (
       Cell: (p) => {
         return (
           <div {...p.cellProps} className={styles.explainItem} onClick={() => showExplainPopup(p.row.index)}>
-            {vals.get(p.row.index)}
+            {vals[p.row.index]}
           </div>
         );
       },
diff --git a/public/app/features/search/service/bluge.ts b/public/app/features/search/service/bluge.ts
index 23e5b10bc5b..547a430b47d 100644
--- a/public/app/features/search/service/bluge.ts
+++ b/public/app/features/search/service/bluge.ts
@@ -226,7 +226,7 @@ function getTermCountsFrom(frame: DataFrame): TermCount[] {
   const vals = frame.fields[1].values;
   const counts: TermCount[] = [];
   for (let i = 0; i < frame.length; i++) {
-    counts.push({ term: keys.get(i), count: vals.get(i) });
+    counts.push({ term: keys[i], count: vals[i] });
   }
   return counts;
 }
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
index 099c3a9acdc..a084a4c47ad 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
@@ -81,10 +81,10 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
     const labels = frame.fields[1].labels;
     for (const labelKey of Object.keys(labelFields)) {
       const labelValue = labels?.[labelKey] ?? null;
-      labelFields[labelKey].values.add(labelValue!);
+      labelFields[labelKey].values.push(labelValue!);
     }
 
-    frameField.values.add(frame);
+    frameField.values.push(frame);
   }
   return result;
 }
diff --git a/public/app/plugins/datasource/loki/getDerivedFields.ts b/public/app/plugins/datasource/loki/getDerivedFields.ts
index 3a87fe92259..bb17b33cd0f 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.ts
@@ -25,7 +25,7 @@ export function getDerivedFields(dataFrame: DataFrame, derivedFieldConfigs: Deri
   lineField.values.forEach((line) => {
     for (const field of newFields) {
       const logMatch = line.match(derivedFieldsGrouped[field.name][0].matcherRegex);
-      field.values.add(logMatch && logMatch[1]);
+      field.values.push(logMatch && logMatch[1]);
     }
   });
 
diff --git a/public/app/plugins/datasource/loki/liveStreamsResultTransformer.ts b/public/app/plugins/datasource/loki/liveStreamsResultTransformer.ts
index 79c0c79575a..a8275ca2f8e 100644
--- a/public/app/plugins/datasource/loki/liveStreamsResultTransformer.ts
+++ b/public/app/plugins/datasource/loki/liveStreamsResultTransformer.ts
@@ -38,9 +38,9 @@ export function appendResponseToBufferedData(response: LokiTailResponse, data: M
 
     // Add each line
     for (const [ts, line] of stream.values) {
-      tsField.values.add(new Date(parseInt(ts.slice(0, -6), 10)).toISOString());
-      lineField.values.add(line);
-      idField.values.add(createUid(ts, allLabelsString, line, usedUids, data.refId));
+      tsField.values.push(new Date(parseInt(ts.slice(0, -6), 10)).toISOString());
+      lineField.values.push(line);
+      idField.values.push(createUid(ts, allLabelsString, line, usedUids, data.refId));
     }
   }
 }
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index 936acc351e4..19e63367190 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -235,11 +235,11 @@ export function transformDFToTable(dfs: DataFrame[]): DataFrame[] {
     dataFramesByRefId[refId].forEach((df) => {
       const timeFields = df.fields[0]?.values ?? [];
       const dataFields = df.fields[1]?.values ?? [];
-      timeFields.forEach((value) => timeField.values.add(value));
+      timeFields.forEach((value) => timeField.values.push(value));
       dataFields.forEach((value) => {
-        valueField.values.add(parseSampleValue(value));
+        valueField.values.push(parseSampleValue(value));
         const labelsForField = df.fields[1].labels ?? {};
-        labelFields.forEach((field) => field.values.add(getLabelValue(labelsForField, field.name)));
+        labelFields.forEach((field) => field.values.push(getLabelValue(labelsForField, field.name)));
       });
     });
 
@@ -527,14 +527,14 @@ function transformMetricDataToTable(md: MatrixOrVectorResult[], options: Transfo
   md.forEach((d) => {
     if (isMatrixData(d)) {
       d.values.forEach((val) => {
-        timeField.values.add(val[0] * 1000);
+        timeField.values.push(val[0] * 1000);
         metricFields.forEach((metricField) => metricField.values.push(getLabelValue(d.metric, metricField.name)));
-        valueField.values.add(parseSampleValue(val[1]));
+        valueField.values.push(parseSampleValue(val[1]));
       });
     } else {
-      timeField.values.add(d.value[0] * 1000);
+      timeField.values.push(d.value[0] * 1000);
       metricFields.forEach((metricField) => metricField.values.push(getLabelValue(d.metric, metricField.name)));
-      valueField.values.add(parseSampleValue(d.value[1]));
+      valueField.values.push(parseSampleValue(d.value[1]));
     }
   });
 
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.ts b/public/app/plugins/datasource/tempo/resultTransformer.ts
index ef2e663fb0a..17be5d64cb9 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.ts
@@ -86,9 +86,9 @@ export function createTableFrame(
             if (match) {
               const traceId = match[1];
               const time = timeField ? timeField.values[i] : null;
-              tableFrame.fields[0].values.add(time);
-              tableFrame.fields[1].values.add(traceId);
-              tableFrame.fields[2].values.add(line);
+              tableFrame.fields[0].values.push(time);
+              tableFrame.fields[1].values.push(traceId);
+              tableFrame.fields[2].values.push(line);
               hasMatch = true;
             }
           }
diff --git a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts b/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
index 620e685846e..564b70cad70 100644
--- a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
+++ b/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
@@ -118,15 +118,15 @@ export function generateRandomNodes(count = 10) {
 
   const edgesSet = new Set();
   for (const node of nodes) {
-    nodeFields.id.values.add(node.id);
-    nodeFields.title.values.add(node.title);
-    nodeFields[NodeGraphDataFrameFieldNames.subTitle].values.add(node.subTitle);
-    nodeFields[NodeGraphDataFrameFieldNames.mainStat].values.add(node.stat1);
-    nodeFields[NodeGraphDataFrameFieldNames.secondaryStat].values.add(node.stat2);
-    nodeFields.arc__success.values.add(node.success);
-    nodeFields.arc__errors.values.add(node.error);
+    nodeFields.id.values.push(node.id);
+    nodeFields.title.values.push(node.title);
+    nodeFields[NodeGraphDataFrameFieldNames.subTitle].values.push(node.subTitle);
+    nodeFields[NodeGraphDataFrameFieldNames.mainStat].values.push(node.stat1);
+    nodeFields[NodeGraphDataFrameFieldNames.secondaryStat].values.push(node.stat2);
+    nodeFields.arc__success.values.push(node.success);
+    nodeFields.arc__errors.values.push(node.error);
     const rnd = Math.random();
-    nodeFields[NodeGraphDataFrameFieldNames.icon].values.add(rnd > 0.9 ? 'database' : rnd < 0.1 ? 'cloud' : '');
+    nodeFields[NodeGraphDataFrameFieldNames.icon].values.push(rnd > 0.9 ? 'database' : rnd < 0.1 ? 'cloud' : '');
     for (const edge of node.edges) {
       const id = `${node.id}--${edge}`;
       // We can have duplicate edges when we added some more by random
@@ -134,10 +134,10 @@ export function generateRandomNodes(count = 10) {
         continue;
       }
       edgesSet.add(id);
-      edgesFrame.fields[0].values.add(`${node.id}--${edge}`);
-      edgesFrame.fields[1].values.add(node.id);
-      edgesFrame.fields[2].values.add(edge);
-      edgesFrame.fields[3].values.add(Math.random() * 100);
+      edgesFrame.fields[0].values.push(`${node.id}--${edge}`);
+      edgesFrame.fields[1].values.push(node.id);
+      edgesFrame.fields[2].values.push(edge);
+      edgesFrame.fields[3].values.push(Math.random() * 100);
     }
   }
 
diff --git a/public/app/plugins/datasource/testdata/runStreams.ts b/public/app/plugins/datasource/testdata/runStreams.ts
index c9b11c9f122..a2b5a533f61 100644
--- a/public/app/plugins/datasource/testdata/runStreams.ts
+++ b/public/app/plugins/datasource/testdata/runStreams.ts
@@ -151,8 +151,8 @@ export function runLogsStream(
     let timeoutId: ReturnType<typeof setTimeout>;
 
     const pushNextEvent = () => {
-      data.fields[0].values.add(getRandomLine());
-      data.fields[1].values.add(Date.now());
+      data.fields[0].values.push(getRandomLine());
+      data.fields[1].values.push(Date.now());
 
       subscriber.next({
         data: [data],
diff --git a/public/app/plugins/panel/nodeGraph/utils.ts b/public/app/plugins/panel/nodeGraph/utils.ts
index e127db2c811..4fb8e5095a2 100644
--- a/public/app/plugins/panel/nodeGraph/utils.ts
+++ b/public/app/plugins/panel/nodeGraph/utils.ts
@@ -251,13 +251,13 @@ function normalizeStatsForNodes(nodesMap: { [id: string]: NodeDatumFromEdge }, e
 
       if (mainStatField) {
         newNode.mainStat = mainStatField;
-        mainStatValues.add(node.mainStatNumeric);
+        mainStatValues.push(node.mainStatNumeric);
         newNode.dataFrameRowIndex = index;
       }
 
       if (secondaryStatField) {
         newNode.secondaryStat = secondaryStatField;
-        secondaryStatValues.add(node.secondaryStatNumeric);
+        secondaryStatValues.push(node.secondaryStatNumeric);
         newNode.dataFrameRowIndex = index;
       }
       return newNode;
diff --git a/public/app/plugins/panel/state-timeline/StateTimelineTooltip.tsx b/public/app/plugins/panel/state-timeline/StateTimelineTooltip.tsx
index 901c6b553bb..345f0c8265b 100644
--- a/public/app/plugins/panel/state-timeline/StateTimelineTooltip.tsx
+++ b/public/app/plugins/panel/state-timeline/StateTimelineTooltip.tsx
@@ -41,7 +41,7 @@ export const StateTimelineTooltip = ({
   const linkLookup = new Set<string>();
 
   if (field.getLinks) {
-    const v = field.values.get(datapointIdx);
+    const v = field.values[datapointIdx];
     const disp = field.display ? field.display(v) : { text: `${v}`, numeric: +v };
     field.getLinks({ calculatedValue: disp, valueRowIndex: datapointIdx }).forEach((link) => {
       const key = `${link.title}/${link.href}`;
@@ -57,7 +57,7 @@ export const StateTimelineTooltip = ({
 
   const dataFrameFieldIndex = field.state?.origin;
   const fieldFmt = field.display || getDisplayProcessor({ field, timeZone, theme });
-  const value = field.values.get(datapointIdx!);
+  const value = field.values[datapointIdx!];
   const display = fieldFmt(value);
   const fieldDisplayName = dataFrameFieldIndex
     ? getFieldDisplayName(
@@ -70,10 +70,10 @@ export const StateTimelineTooltip = ({
   const nextStateIdx = findNextStateIndex(field, datapointIdx!);
   let nextStateTs;
   if (nextStateIdx) {
-    nextStateTs = xField.values.get(nextStateIdx!);
+    nextStateTs = xField.values[nextStateIdx!];
   }
 
-  const stateTs = xField.values.get(datapointIdx!);
+  const stateTs = xField.values[datapointIdx!];
 
   let toFragment = null;
   let durationFragment = null;
@@ -88,7 +88,7 @@ export const StateTimelineTooltip = ({
     );
     toFragment = (
       <>
-        {' to'} <strong>{xFieldFmt(xField.values.get(nextStateIdx!)).text}</strong>
+        {' to'} <strong>{xFieldFmt(xField.values[nextStateIdx!]).text}</strong>
       </>
     );
   }
@@ -99,7 +99,7 @@ export const StateTimelineTooltip = ({
         {fieldDisplayName}
         <br />
         <SeriesTableRow label={display.text} color={display.color || FALLBACK_COLOR} isActive />
-        From <strong>{xFieldFmt(xField.values.get(datapointIdx!)).text}</strong>
+        From <strong>{xFieldFmt(xField.values[datapointIdx!]).text}</strong>
         {toFragment}
         {durationFragment}
       </div>

From 400fae3bd6964a3ed0ed0fae6c676a85594ed6ee Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Fri, 21 Apr 2023 09:37:31 +0200
Subject: [PATCH 300/729] Alerting: Change tooltip error text in collapsed
 contact point table (#67022)

Change tooltip error message in collapsed contact point table
---
 .../components/receivers/ReceiversTable.tsx      | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
index 4e344582c5e..9a2937f9286 100644
--- a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
+++ b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
@@ -3,10 +3,10 @@ import React, { useMemo, useState } from 'react';
 
 import { dateTime, dateTimeFormat } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
-import { Button, ConfirmModal, Modal, useStyles2, Badge, Icon } from '@grafana/ui';
+import { Badge, Button, ConfirmModal, Icon, Modal, useStyles2 } from '@grafana/ui';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
-import { useDispatch, AccessControlAction, ContactPointsState, NotifiersState, ReceiversState } from 'app/types';
+import { AccessControlAction, ContactPointsState, NotifiersState, ReceiversState, useDispatch } from 'app/types';
 
 import { useGetContactPointsState } from '../../api/receiversApi';
 import { Authorize } from '../../components/Authorize';
@@ -84,11 +84,13 @@ interface ReceiverErrorProps {
   errorCount: number;
   errorDetail?: string;
   showErrorCount: boolean;
+  tooltip?: string;
 }
 
-function ReceiverError({ errorCount, errorDetail, showErrorCount }: ReceiverErrorProps) {
+function ReceiverError({ errorCount, errorDetail, showErrorCount, tooltip }: ReceiverErrorProps) {
   const text = showErrorCount ? `${errorCount} ${pluralize('error', errorCount)}` : 'Error';
-  return <Badge color="orange" icon="exclamation-triangle" text={text} tooltip={errorDetail ?? 'Error'} />;
+  const tooltipToRender = tooltip ?? errorDetail ?? 'Error';
+  return <Badge color="orange" icon="exclamation-triangle" text={text} tooltip={tooltipToRender} />;
 }
 interface NotifierHealthProps {
   errorsByNotifier: number;
@@ -115,7 +117,11 @@ function ReceiverHealth({ errorsByReceiver, someWithNoAttempt }: ReceiverHealthP
   const noErrorsColor = someWithNoAttempt ? 'orange' : 'green';
   const noErrorsText = someWithNoAttempt ? 'No attempts' : 'OK';
   return errorsByReceiver > 0 ? (
-    <ReceiverError errorCount={errorsByReceiver} showErrorCount={true} />
+    <ReceiverError
+      errorCount={errorsByReceiver}
+      showErrorCount={true}
+      tooltip="Expand the contact point to see error details."
+    />
   ) : (
     <Badge color={noErrorsColor} text={noErrorsText} tooltip="" />
   );

From 1f193f1badcf098783541e1077867bd575f47910 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 21 Apr 2023 08:39:49 +0100
Subject: [PATCH 301/729] Navigation IA: Update `Monitoring` to `Observability`
 (#66963)

* update monitoring -> observability

* update backend test
---
 pkg/services/navtree/navtreeimpl/applinks.go     | 16 +++++++++++++---
 .../navtree/navtreeimpl/applinks_test.go         |  4 ++--
 .../MegaMenu/navBarItem-translations.ts          |  2 +-
 .../connections/__mocks__/store.navIndex.mock.ts |  2 +-
 public/locales/en-US/grafana.json                |  2 +-
 public/locales/pseudo-LOCALE/grafana.json        |  2 +-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index 6c74399b50a..4a064d2846f 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -205,9 +205,9 @@ func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *n
 			})
 		case navtree.NavIDMonitoring:
 			treeRoot.AddSection(&navtree.NavLink{
-				Text:       "Monitoring",
+				Text:       "Observability",
 				Id:         navtree.NavIDMonitoring,
-				SubTitle:   "Monitoring and infrastructure apps",
+				SubTitle:   "Observability and infrastructure apps",
 				Icon:       "heart-rate",
 				SortWeight: navtree.WeightMonitoring,
 				Children:   []*navtree.NavLink{appLink},
@@ -256,6 +256,7 @@ func (s *ServiceImpl) readNavigationSettings() {
 	s.navigationAppConfig = map[string]NavigationAppConfig{
 		"grafana-k8s-app":                  {SectionID: navtree.NavIDMonitoring, SortWeight: 1, Text: "Kubernetes"},
 		"grafana-synthetic-monitoring-app": {SectionID: navtree.NavIDMonitoring, SortWeight: 2, Text: "Synthetics"},
+		"grafana-kowalski-app":             {SectionID: navtree.NavIDMonitoring, SortWeight: 3, Text: "Frontend"},
 		"grafana-oncall-app":               {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 1, Text: "OnCall"},
 		"grafana-incident-app":             {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 2, Text: "Incident"},
 		"grafana-ml-app":                   {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 3, Text: "Machine Learning"},
@@ -283,7 +284,16 @@ func (s *ServiceImpl) readNavigationSettings() {
 			}
 		}
 
-		s.navigationAppConfig[pluginId] = *appCfg
+		// Only apply the new values, don't completely overwrite the entry if it exists
+		if entry, ok := s.navigationAppConfig[pluginId]; ok {
+			entry.SectionID = appCfg.SectionID
+			if appCfg.SortWeight != 0 {
+				entry.SortWeight = appCfg.SortWeight
+			}
+			s.navigationAppConfig[pluginId] = entry
+		} else {
+			s.navigationAppConfig[pluginId] = *appCfg
+		}
 	}
 
 	for _, key := range appStandalonePages.Keys() {
diff --git a/pkg/services/navtree/navtreeimpl/applinks_test.go b/pkg/services/navtree/navtreeimpl/applinks_test.go
index 114010a4b84..3fdbc794931 100644
--- a/pkg/services/navtree/navtreeimpl/applinks_test.go
+++ b/pkg/services/navtree/navtreeimpl/applinks_test.go
@@ -203,7 +203,7 @@ func TestAddAppLinks(t *testing.T) {
 		require.Equal(t, "plugin-page-test-app3", appsNode.Children[1].Id)
 	})
 
-	t.Run("Should only add a 'Monitoring' section if a plugin exists that wants to live there", func(t *testing.T) {
+	t.Run("Should only add an 'Observability' section if a plugin exists that wants to live there", func(t *testing.T) {
 		service.navigationAppConfig = map[string]NavigationAppConfig{}
 
 		// Check if the Monitoring section is not there if no apps try to register to it
@@ -386,7 +386,7 @@ func TestReadingNavigationSettings(t *testing.T) {
 		require.Equal(t, "dashboards", service.navigationAppConfig["grafana-k8s-app"].SectionID)
 		require.Equal(t, "admin", service.navigationAppConfig["other-app"].SectionID)
 
-		require.Equal(t, int64(0), service.navigationAppConfig["grafana-k8s-app"].SortWeight)
+		require.Equal(t, int64(1), service.navigationAppConfig["grafana-k8s-app"].SortWeight)
 		require.Equal(t, int64(12), service.navigationAppConfig["other-app"].SortWeight)
 
 		require.Equal(t, "admin", service.navigationAppPathConfig["/a/grafana-k8s-app/foo"].SectionID)
diff --git a/public/app/core/components/AppChrome/MegaMenu/navBarItem-translations.ts b/public/app/core/components/AppChrome/MegaMenu/navBarItem-translations.ts
index a7e3602411a..1b1ca51d8da 100644
--- a/public/app/core/components/AppChrome/MegaMenu/navBarItem-translations.ts
+++ b/public/app/core/components/AppChrome/MegaMenu/navBarItem-translations.ts
@@ -101,7 +101,7 @@ export function getNavTitle(navId: string | undefined) {
     case 'upgrading':
       return t('nav.upgrading.title', 'Stats and license');
     case 'monitoring':
-      return t('nav.monitoring.title', 'Monitoring');
+      return t('nav.monitoring.title', 'Observability');
     case 'apps':
       return t('nav.apps.title', 'Apps');
     case 'alerts-and-incidents':
diff --git a/public/app/features/connections/__mocks__/store.navIndex.mock.ts b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
index f576aec4128..d944ccbf3ec 100644
--- a/public/app/features/connections/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
@@ -517,7 +517,7 @@ export const navIndex: NavIndex = {
   },
   monitoring: {
     id: 'monitoring',
-    text: 'Monitoring',
+    text: 'Observability',
     subTitle: 'Monitoring and infrastructure apps',
     icon: 'heart-rate',
     url: '/monitoring',
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index b5c1856b3ec..bd6610270a1 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -265,7 +265,7 @@
     },
     "monitoring": {
       "subtitle": "Monitoring and infrastructure apps",
-      "title": "Monitoring"
+      "title": "Observability"
     },
     "new": {
       "title": "New"
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 1338df2928a..d1305b90833 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -265,7 +265,7 @@
     },
     "monitoring": {
       "subtitle": "Mőʼnįŧőřįʼnģ äʼnđ įʼnƒřäşŧřūčŧūřę äppş",
-      "title": "Mőʼnįŧőřįʼnģ"
+      "title": "Øþşęřväþįľįŧy"
     },
     "new": {
       "title": "Ńęŵ"

From 29aaf429ad14e9bd72af7969a31846f6b164dcf5 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Fri, 21 Apr 2023 10:02:10 +0200
Subject: [PATCH 302/729] Plugins: Fix width for README pages with tables
 (#66872)

---
 .../admin/components/PluginDetailsBody.tsx     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/public/app/features/plugins/admin/components/PluginDetailsBody.tsx b/public/app/features/plugins/admin/components/PluginDetailsBody.tsx
index ecd4a44c7c8..58d503472af 100644
--- a/public/app/features/plugins/admin/components/PluginDetailsBody.tsx
+++ b/public/app/features/plugins/admin/components/PluginDetailsBody.tsx
@@ -119,5 +119,23 @@ export const getStyles = (theme: GrafanaTheme2) => ({
         text-decoration: underline;
       }
     }
+
+    table {
+      table-layout: fixed;
+      width: 100%;
+
+      td,
+      th {
+        overflow-x: auto;
+        padding: ${theme.spacing(0.5)} ${theme.spacing(1)};
+      }
+
+      table,
+      th,
+      td {
+        border: 1px solid ${theme.colors.border.medium};
+        border-collapse: collapse;
+      }
+    }
   `,
 });

From eddd4f4508693238160ee58b74fcd4cd7aa3b914 Mon Sep 17 00:00:00 2001
From: Matthew Jacobson <matthew.jacobson@grafana.com>
Date: Fri, 21 Apr 2023 04:35:12 -0400
Subject: [PATCH 303/729] Alerting: Add totalsFiltered to RuleResponse for
 hidden by filters count (#66883)

Alerting: Add totalsFiltered to RuleResponse to facilitate hidden by filters count

Currently, when both a limit_alerts and a matcher/state filter is applied, there is not enough information to determine how many alert instances were hidden by the filters. Only enough to determine the total hidden by the limit and filter combined.

This change adds a separate totalsFiltered field alongside the AlertRule totals that will contain the count of instances after filters but before limits.
---
 pkg/services/ngalert/api/api_prometheus.go    | 11 +++-
 .../ngalert/api/api_prometheus_test.go        | 58 ++++++++++++++++++-
 .../ngalert/api/tooling/definitions/prom.go   |  7 ++-
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/pkg/services/ngalert/api/api_prometheus.go b/pkg/services/ngalert/api/api_prometheus.go
index 46813a42b8d..4b5eba5334a 100644
--- a/pkg/services/ngalert/api/api_prometheus.go
+++ b/pkg/services/ngalert/api/api_prometheus.go
@@ -329,13 +329,15 @@ func (srv PrometheusSrv) toRuleGroup(groupKey ngmodels.AlertRuleGroupKey, folder
 
 		states := srv.manager.GetStatesForRuleUID(rule.OrgID, rule.UID)
 		totals := make(map[string]int64)
+		totalsFiltered := make(map[string]int64)
 		for _, alertState := range states {
 			activeAt := alertState.StartsAt
 			valString := ""
 			if alertState.State == eval.Alerting || alertState.State == eval.Pending {
 				valString = formatValues(alertState)
 			}
-			totals[strings.ToLower(alertState.State.String())] += 1
+			stateKey := strings.ToLower(alertState.State.String())
+			totals[stateKey] += 1
 			// Do not add error twice when execution error state is Error
 			if alertState.Error != nil && rule.ExecErrState != ngmodels.ErrorErrState {
 				totals["error"] += 1
@@ -389,6 +391,12 @@ func (srv PrometheusSrv) toRuleGroup(groupKey ngmodels.AlertRuleGroupKey, folder
 				continue
 			}
 
+			totalsFiltered[stateKey] += 1
+			// Do not add error twice when execution error state is Error
+			if alertState.Error != nil && rule.ExecErrState != ngmodels.ErrorErrState {
+				totalsFiltered["error"] += 1
+			}
+
 			alertingRule.Alerts = append(alertingRule.Alerts, alert)
 		}
 
@@ -408,6 +416,7 @@ func (srv PrometheusSrv) toRuleGroup(groupKey ngmodels.AlertRuleGroupKey, folder
 
 		alertingRule.Rule = newRule
 		alertingRule.Totals = totals
+		alertingRule.TotalsFiltered = totalsFiltered
 		newGroup.Rules = append(newGroup.Rules, alertingRule)
 		newGroup.Interval = float64(rule.IntervalSeconds)
 		// TODO yuri. Change that when scheduler will process alerts in groups
diff --git a/pkg/services/ngalert/api/api_prometheus_test.go b/pkg/services/ngalert/api/api_prometheus_test.go
index 97f8ce59b64..7990d4081b4 100644
--- a/pkg/services/ngalert/api/api_prometheus_test.go
+++ b/pkg/services/ngalert/api/api_prometheus_test.go
@@ -334,6 +334,9 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				"totals": {
 					"normal": 1
 				},
+				"totalsFiltered": {
+					"normal": 1
+				},
 				"labels": {
 					"__a_private_label_on_the_rule__": "a_value"
 				},
@@ -396,6 +399,9 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				"totals": {
 					"normal": 1
 				},
+				"totalsFiltered": {
+					"normal": 1
+				},
 				"labels": {
 					"__a_private_label_on_the_rule__": "a_value",
 					"__alert_rule_uid__": "RuleUID"
@@ -453,6 +459,9 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				"totals": {
 					"normal": 1
 				},
+				"totalsFiltered": {
+					"normal": 1
+				},
 				"labels": {
 					"__a_private_label_on_the_rule__": "a_value"
 				},
@@ -604,14 +613,17 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 		// The first rule should have an alerting and normal alert
 		r1 := rg.Rules[0]
 		require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, r1.Totals)
+		require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, r1.TotalsFiltered)
 		require.Len(t, r1.Alerts, 2)
 		// The second rule should have an alerting alert
 		r2 := rg.Rules[1]
 		require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, r2.Totals)
+		require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, r2.TotalsFiltered)
 		require.Len(t, r2.Alerts, 1)
 		// The last rule should have an error alert
 		r3 := rg.Rules[2]
 		require.Equal(t, map[string]int64{"error": 1}, r3.Totals)
+		require.Equal(t, map[string]int64{"error": 1}, r3.TotalsFiltered)
 		require.Len(t, r3.Alerts, 1)
 	})
 
@@ -851,6 +863,7 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				require.Len(t, rg.Rules, 1)
 				// Each rule should have two alerts
 				require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].Totals)
+				require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].TotalsFiltered)
 			}
 		})
 
@@ -878,6 +891,7 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 			rule := rg.Rules[0]
 			// The rule should have two alerts, but just one should be returned
 			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rule.Totals)
+			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rule.TotalsFiltered)
 			require.Len(t, rule.Alerts, 1)
 			// Firing alerts should have precedence over normal alerts
 			require.Equal(t, "Alerting", rule.Alerts[0].State)
@@ -965,12 +979,15 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 			// The first two rules should be firing and the last should be inactive
 			require.Equal(t, "firing", rg.Rules[0].State)
 			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].Totals)
+			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].TotalsFiltered)
 			require.Len(t, rg.Rules[0].Alerts, 2)
 			require.Equal(t, "firing", rg.Rules[1].State)
 			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].Totals)
+			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].TotalsFiltered)
 			require.Len(t, rg.Rules[1].Alerts, 1)
 			require.Equal(t, "inactive", rg.Rules[2].State)
 			require.Equal(t, map[string]int64{"error": 1}, rg.Rules[2].Totals)
+			require.Equal(t, map[string]int64{"error": 1}, rg.Rules[2].TotalsFiltered)
 			require.Len(t, rg.Rules[2].Alerts, 1)
 		})
 
@@ -1000,12 +1017,16 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 			// Both firing rules should be returned with their totals unchanged
 			require.Equal(t, "firing", rg.Rules[0].State)
 			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].Totals)
+
+			// After filtering the totals for normal are no longer included.
+			require.Equal(t, map[string]int64{"alerting": 1}, rg.Rules[0].TotalsFiltered)
 			// The first rule should have just 1 firing alert as the inactive alert
 			// has been removed by the filter for firing alerts
 			require.Len(t, rg.Rules[0].Alerts, 1)
 
 			require.Equal(t, "firing", rg.Rules[1].State)
 			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].Totals)
+			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].TotalsFiltered)
 			require.Len(t, rg.Rules[1].Alerts, 1)
 		})
 
@@ -1035,14 +1056,19 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 			// The first two rules should be firing and the last should be inactive
 			require.Equal(t, "firing", rg.Rules[0].State)
 			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].Totals)
+			require.Equal(t, map[string]int64{"alerting": 1, "normal": 1}, rg.Rules[0].TotalsFiltered)
 			require.Len(t, rg.Rules[0].Alerts, 2)
 			require.Equal(t, "firing", rg.Rules[1].State)
 			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].Totals)
+			require.Equal(t, map[string]int64{"alerting": 1, "error": 1}, rg.Rules[1].TotalsFiltered)
 			require.Len(t, rg.Rules[1].Alerts, 1)
 
-			// The last rule should have 1 alert as the filter includes errors too
+			// The last rule should have 1 alert.
 			require.Equal(t, "inactive", rg.Rules[2].State)
 			require.Equal(t, map[string]int64{"error": 1}, rg.Rules[2].Totals)
+
+			// The TotalsFiltered for error will be 0 out as the state filter does not include error.
+			require.Empty(t, rg.Rules[2].TotalsFiltered)
 			// The error alert has been removed as the filters are inactive and firing
 			require.Len(t, rg.Rules[2].Alerts, 0)
 		})
@@ -1120,6 +1146,10 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 			rg := res.Data.RuleGroups[0]
 			require.Len(t, rg.Rules, 1)
 			require.Len(t, rg.Rules[0].Alerts, 1)
+
+			require.Equal(t, map[string]int64{"normal": 1, "alerting": 1}, rg.Rules[0].Totals)
+			// There should be a totalFiltered of 1 though since the matcher matched a single instance.
+			require.Equal(t, map[string]int64{"normal": 1}, rg.Rules[0].TotalsFiltered)
 		})
 
 		t.Run("then with URL encoded regex matcher", func(t *testing.T) {
@@ -1187,6 +1217,32 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 			require.Len(t, rg.Rules, 1)
 			require.Len(t, rg.Rules[0].Alerts, 0)
 		})
+
+		t.Run("then with single matcher and limit_alerts", func(t *testing.T) {
+			r, err := http.NewRequest("GET", "/api/v1/rules?limit_alerts=0&matcher={\"name\":\"test\",\"isEqual\":true,\"value\":\"value1\"}", nil)
+			require.NoError(t, err)
+			c := &contextmodel.ReqContext{
+				Context: &web.Context{Req: r},
+				SignedInUser: &user.SignedInUser{
+					OrgID:   orgID,
+					OrgRole: org.RoleViewer,
+				},
+			}
+			resp := api.RouteGetRuleStatuses(c)
+			require.Equal(t, http.StatusOK, resp.Status())
+			var res apimodels.RuleResponse
+			require.NoError(t, json.Unmarshal(resp.Body(), &res))
+
+			// There should be no alerts since we limited to 0.
+			require.Len(t, res.Data.RuleGroups, 1)
+			rg := res.Data.RuleGroups[0]
+			require.Len(t, rg.Rules, 1)
+			require.Len(t, rg.Rules[0].Alerts, 0)
+
+			require.Equal(t, map[string]int64{"normal": 1, "alerting": 1}, rg.Rules[0].Totals)
+			// There should be a totalFiltered of 1 though since the matcher matched a single instance.
+			require.Equal(t, map[string]int64{"normal": 1}, rg.Rules[0].TotalsFiltered)
+		})
 	})
 }
 
diff --git a/pkg/services/ngalert/api/tooling/definitions/prom.go b/pkg/services/ngalert/api/tooling/definitions/prom.go
index 346280c33ce..97e03ee74c8 100644
--- a/pkg/services/ngalert/api/tooling/definitions/prom.go
+++ b/pkg/services/ngalert/api/tooling/definitions/prom.go
@@ -134,9 +134,10 @@ type AlertingRule struct {
 	// required: true
 	Annotations overrideLabels `json:"annotations,omitempty"`
 	// required: true
-	ActiveAt *time.Time       `json:"activeAt,omitempty"`
-	Alerts   []Alert          `json:"alerts,omitempty"`
-	Totals   map[string]int64 `json:"totals,omitempty"`
+	ActiveAt       *time.Time       `json:"activeAt,omitempty"`
+	Alerts         []Alert          `json:"alerts,omitempty"`
+	Totals         map[string]int64 `json:"totals,omitempty"`
+	TotalsFiltered map[string]int64 `json:"totalsFiltered,omitempty"`
 	Rule
 }
 

From 1ff9c47c7b2916d9ada2bd91d568e7f3c8413524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 21 Apr 2023 11:09:46 +0200
Subject: [PATCH 304/729] ThemeDemo: Add transparent to ThemeDemo (#66994)

---
 .../src/components/ThemeDemos/ThemeDemo.tsx          | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.tsx b/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.tsx
index 03827b83006..48d88651b6b 100644
--- a/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.tsx
+++ b/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.tsx
@@ -121,6 +121,7 @@ export const ThemeDemo = () => {
                   <td>name</td>
                   <td>main</td>
                   <td>shade (used for hover)</td>
+                  <td>transparent</td>
                   <td>border & text</td>
                 </tr>
               </thead>
@@ -250,6 +251,17 @@ export function RichColorDemo({ theme, color }: RichColorDemoProps) {
           {color.shade}
         </div>
       </td>
+      <td>
+        <div
+          className={css`
+            background: ${color.transparent};
+            border-radius: 4px;
+            padding: 8px;
+          `}
+        >
+          {color.shade}
+        </div>
+      </td>
       <td>
         <div
           className={css`

From 49624ca2ef09501b1899838ca7529561d2a40459 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Fri, 21 Apr 2023 11:25:03 +0200
Subject: [PATCH 305/729] Adjust styles for DS picker dropdown and modal
 (#67004)

Adjust styles for dropdown and modal
---
 .../components/picker/DataSourceCard.tsx      | 42 ++++++++++++++++---
 .../components/picker/DataSourceDropdown.tsx  | 11 ++---
 .../components/picker/DataSourceModal.tsx     |  4 +-
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceCard.tsx b/public/app/features/datasources/components/picker/DataSourceCard.tsx
index fd9c65234c2..2e4c5ddc799 100644
--- a/public/app/features/datasources/components/picker/DataSourceCard.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceCard.tsx
@@ -15,13 +15,15 @@ export function DataSourceCard({ ds, onClick, selected }: DataSourceCardProps) {
 
   return (
     <Card key={ds.uid} onClick={onClick} className={cx(styles.card, selected ? styles.selected : undefined)}>
-      <Card.Heading>{ds.name}</Card.Heading>
-      <Card.Meta className={styles.meta}>
-        {ds.meta.name}
-        {ds.meta.info.description}
-      </Card.Meta>
+      <Card.Heading className={styles.heading}>
+        <div className={styles.headingContent}>
+          <span className={styles.dsName}>{ds.name}</span>
+          <span className={styles.headingSeparator}>|</span>
+          <small className={styles.dsType}>{ds.meta.name}</small>
+        </div>
+      </Card.Heading>
       <Card.Figure>
-        <img src={ds.meta.info.logos.small} alt={`${ds.meta.name} Logo`} height="40" width="40" />
+        <img src={ds.meta.info.logos.small} alt={`${ds.meta.name} Logo`} height="32" width="32" />
       </Card.Figure>
       <Card.Tags>{ds.isDefault ? <TagList tags={['default']} /> : null}</Card.Tags>
     </Card>
@@ -38,6 +40,34 @@ function getStyles(theme: GrafanaTheme2) {
       // Move to list component
       margin-bottom: 0;
       border-radius: 0;
+      padding: ${theme.spacing(1.5)};
+    `,
+    heading: css`
+      width: 100%;
+      overflow: hidden;
+      // This is needed to enable ellipsis when text overlfows
+      > button {
+        width: 100%;
+      }
+    `,
+    headingContent: css`
+      color: ${theme.colors.text.secondary};
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    `,
+    dsName: css`
+      color: ${theme.colors.text.primary};
+    `,
+    dsType: css`
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    `,
+    headingSeparator: css`
+      margin: 0 ${theme.spacing(1)};
+      color: ${theme.colors.border.weak};
     `,
     selected: css`
       background-color: ${theme.colors.background.secondary};
diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index e2dcd6831a3..416951f0038 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -199,7 +199,7 @@ function getStylesPickerContent(theme: GrafanaTheme2) {
     container: css`
       display: flex;
       flex-direction: column;
-      height: 480px;
+      height: 412px;
       box-shadow: ${theme.shadows.z3};
       width: 480px;
       background: ${theme.colors.background.primary};
@@ -209,15 +209,16 @@ function getStylesPickerContent(theme: GrafanaTheme2) {
       background: ${theme.colors.background.secondary};
     `,
     dataSourceList: css`
-      height: 423px;
-      padding: 0 ${theme.spacing(2)};
+      flex: 1;
+      height: 100%;
     `,
     footer: css`
+      flex: 0;
       display: flex;
       justify-content: space-between;
-      padding: ${theme.spacing(2)};
+      padding: ${theme.spacing(1.5)};
       border-top: 1px solid ${theme.colors.border.weak};
-      height: 57px;
+      background-color: ${theme.colors.background.secondary};
     `,
   };
 }
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index 142b6a4c20b..da636b7aeae 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -123,7 +123,7 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
       flex-direction: column;
       width: 50%;
       height: 100%;
-      padding-right: ${theme.spacing(1)};
+      padding-right: ${theme.spacing(4)};
       border-right: 1px solid ${theme.colors.border.weak};
     `,
     rightColumn: css`
@@ -133,7 +133,7 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
       height: 100%;
       justify-items: space-evenly;
       align-items: stretch;
-      padding-left: ${theme.spacing(1)};
+      padding-left: ${theme.spacing(4)};
     `,
     builtInDataSources: css`
       flex: 1;

From ad082ed8363a79ac6acd4eea33e52f7040891ed0 Mon Sep 17 00:00:00 2001
From: David Harris <david.harris@grafana.com>
Date: Fri, 21 Apr 2023 10:26:13 +0100
Subject: [PATCH 306/729] doc: update signature requirement guidance (#67030)

This change better reflects the requirement on plugins to be signed, and removes ambiguity regarding whether unsigned plugins will be completely prohibited from working.
---
 docs/sources/developers/plugins/sign-a-plugin.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/sources/developers/plugins/sign-a-plugin.md b/docs/sources/developers/plugins/sign-a-plugin.md
index b006d1578b7..ebcff5a678a 100644
--- a/docs/sources/developers/plugins/sign-a-plugin.md
+++ b/docs/sources/developers/plugins/sign-a-plugin.md
@@ -4,9 +4,7 @@ title: Sign a plugin
 
 # Sign a plugin
 
-Signing a plugin allows Grafana to verify the authenticity of the plugin with [signature verification]({{< relref "../../administration/plugin-management#plugin-signatures" >}}). This gives users a way to make sure plugins haven't been tampered with. All Grafana Labs-authored backend plugins, including Enterprise plugins, are signed.
-
-> **Important:** Future versions of Grafana will require all plugins to be signed.
+Signing a plugin allows Grafana to verify the authenticity of the plugin with [signature verification]({{< relref "../../administration/plugin-management#plugin-signatures" >}}). This gives users a way to make sure plugins haven't been tampered with. By [default]({{< relref "../../administration/plugin-management#allow-unsigned-plugins" >}}), Grafana **requires** all plugins to be signed in order for them to be loaded. All Grafana Labs-authored backend plugins, including Enterprise plugins, are signed.
 
 Before you can sign your plugin, you need to decide whether you want to sign it as a _public_ or a _private_ plugin.
 

From 9271583091027fd1a82c32b2aca49c14d01bec29 Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Fri, 21 Apr 2023 10:40:46 +0100
Subject: [PATCH 307/729] Docs: Add definition for auth config writer role
 (#66957)

add definition for auth writer role
---
 .../access-control/rbac-fixed-basic-role-definitions/index.md  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
index 9c7b74af1f3..156230fe3e7 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
@@ -19,7 +19,7 @@ The following tables list permissions associated with basic and fixed roles.
 
 | Basic role    | Associated fixed roles                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | Description                                                                                                        |
 | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
-| Grafana Admin | `fixed:roles:reader`<br>`fixed:roles:writer`<br>`fixed:users:reader`<br>`fixed:users:writer`<br>`fixed:org.users:reader`<br>`fixed:org.users:writer`<br>`fixed:ldap:reader`<br>`fixed:ldap:writer`<br>`fixed:stats:reader`<br>`fixed:settings:reader`<br>`fixed:settings:writer`<br>`fixed:provisioning:writer`<br>`fixed:organization:reader`<br>`fixed:organization:maintainer`<br>`fixed:licensing:reader`<br>`fixed:licensing:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:maintainer`                                                                                                                                                                                                                                                  | Default [Grafana server administrator]({{< relref "../#grafana-server-administrators" >}}) assignments.            |
+| Grafana Admin | `fixed:roles:reader`<br>`fixed:roles:writer`<br>`fixed:users:reader`<br>`fixed:users:writer`<br>`fixed:org.users:reader`<br>`fixed:org.users:writer`<br>`fixed:ldap:reader`<br>`fixed:ldap:writer`<br>`fixed:stats:reader`<br>`fixed:settings:reader`<br>`fixed:settings:writer`<br>`fixed:provisioning:writer`<br>`fixed:organization:reader`<br>`fixed:organization:maintainer`<br>`fixed:licensing:reader`<br>`fixed:licensing:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:maintainer`<br>`fixed:authentication.config:writer`                                                                                                                                                                                                          | Default [Grafana server administrator]({{< relref "../#grafana-server-administrators" >}}) assignments.            |
 | Admin         | `fixed:reports:reader`<br>`fixed:reports:writer`<br>`fixed:datasources:reader`<br>`fixed:datasources:writer`<br>`fixed:organization:writer`<br>`fixed:datasources.permissions:reader`<br>`fixed:datasources.permissions:writer`<br>`fixed:teams:writer`<br>`fixed:dashboards:reader`<br>`fixed:dashboards:writer`<br>`fixed:dashboards.permissions:reader`<br>`fixed:dashboards.permissions:writer`<br>`fixed:dashboards.public:writer`<br>`fixed:folders:reader`<br>`fixed:folders:writer`<br>`fixed:folders.permissions:reader`<br>`fixed:folders.permissions:writer`<br>`fixed:alerting:writer`<br>`fixed:apikeys:reader`<br>`fixed:apikeys:writer`<br>`fixed:alerting.provisioning:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:writer` | Default [Grafana organization administrator]({{< relref "../#organization-users-and-permissions" >}}) assignments. |
 | Editor        | `fixed:datasources:explorer`<br>`fixed:dashboards:creator`<br>`fixed:folders:creator`<br>`fixed:annotations:writer`<br>`fixed:teams:creator` if the `editors_can_admin` configuration flag is enabled<br>`fixed:alerting:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | Default [Editor]({{< relref "../#organization-users-and-permissions" >}}) assignments.                             |
 | Viewer        | `fixed:datasources:id:reader`<br>`fixed:organization:reader`<br>`fixed:annotations:reader`<br>`fixed:annotations.dashboard:writer`<br>`fixed:alerting:reader`<br>`fixed:plugins.app:reader`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Default [Viewer]({{< relref "../#organization-users-and-permissions" >}}) assignments.                             |
@@ -42,6 +42,7 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:annotations:writer`             | All permissions from `fixed:annotations:reader` <br>`annotations:write` <br>`annotations.create`<br> `annotations:delete` for scope `annotations:type:*`                                                                                                             | Read, create, update and delete all annotations and annotation tags.                                                                                                                                                                                                                  |
 | `fixed:apikeys:reader`                 | `apikeys:read` for scope `apikeys:*`                                                                                                                                                                                                                                 | Read all api keys.                                                                                                                                                                                                                                                                    |
 | `fixed:apikeys:writer`                 | All permissions from `fixed:apikeys:reader` and <br> `apikeys:create` <br> `apikeys:delete` for scope `apikeys:*`                                                                                                                                                    | Read, create, delete all api keys.                                                                                                                                                                                                                                                    |
+| `fixed:authentication.config:writer`   | `settings:read` <br> `settings:write` for scopes `settings:auth:*` and `settings:auth.saml:*`                                                                                                                                                                        | Read and update authentication and SAML settings.                                                                                                                                                                                                                                     |
 | `fixed:dashboards:creator`             | `dashboards:create`<br>`folders:read`                                                                                                                                                                                                                                | Create dashboards.                                                                                                                                                                                                                                                                    |
 | `fixed:dashboards.insights:reader`     | `dashboards.insights:read`                                                                                                                                                                                                                                           | Read dashboard insights data and see presence indicators.                                                                                                                                                                                                                             |
 | `fixed:dashboards.permissions:reader`  | `dashboards.permissions:read`                                                                                                                                                                                                                                        | Read all dashboard permissions.                                                                                                                                                                                                                                                       |

From 3c0e896282a0ad67a7c444b5ff41bf3d973cbac5 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 21 Apr 2023 11:51:02 +0200
Subject: [PATCH 308/729] Loki: Change default state for log context ui to
 toggled (#67032)

---
 .../plugins/datasource/loki/components/LokiContextUi.tsx    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index f91e3417e22..0bd3ac716eb 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -76,7 +76,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
 
   const [initialized, setInitialized] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [isOpen, setIsOpen] = useState(store.getBool(IS_LOKI_LOG_CONTEXT_UI_OPEN, true));
+  const [isOpen, setIsOpen] = useState(store.getBool(IS_LOKI_LOG_CONTEXT_UI_OPEN, false));
 
   const timerHandle = React.useRef<number>();
   const previousInitialized = React.useRef<boolean>(false);
@@ -167,6 +167,10 @@ export function LokiContextUi(props: LokiContextUiProps) {
         onToggle={() => {
           store.set(IS_LOKI_LOG_CONTEXT_UI_OPEN, !isOpen);
           setIsOpen((isOpen) => !isOpen);
+          reportInteraction('grafana_explore_logs_loki_log_context_toggled', {
+            logRowUid: row.uid,
+            action: !isOpen ? 'open' : 'close',
+          });
         }}
         label={
           <div className={styles.query}>

From f3dbb7b34ae8492af1671dddc6b9cace42819af9 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Fri, 21 Apr 2023 10:59:40 +0100
Subject: [PATCH 309/729] AzureMonitor: Update ARG Subscription selection
 (#66890)

* Update ARG Subscription selection

- Filter out queries that do not contain at least one subscription
- Refactor SubscriptionField component
- Display error if no subscriptions are selected
- Update tests

* Fix test
---
 .../azure_resource_graph_datasource.ts        |  2 +-
 .../ArgQueryEditor/ArgQueryEditor.test.tsx    | 66 ++++++++++++-
 .../ArgQueryEditor/ArgQueryEditor.tsx         |  3 +-
 .../ArgQueryEditor/SubscriptionField.tsx      | 66 +++++++++++++
 .../components/SubscriptionField.tsx          | 94 -------------------
 .../VariableEditor/VariableEditor.test.tsx    |  2 +-
 6 files changed, 134 insertions(+), 99 deletions(-)
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx
 delete mode 100644 public/app/plugins/datasource/azuremonitor/components/SubscriptionField.tsx

diff --git a/public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.ts b/public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.ts
index bed9f6cc52c..c1e8c036e69 100644
--- a/public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.ts
@@ -12,7 +12,7 @@ export default class AzureResourceGraphDatasource extends DataSourceWithBackend<
   AzureDataSourceJsonData
 > {
   filterQuery(item: AzureMonitorQuery): boolean {
-    return !!item.azureResourceGraph?.query;
+    return !!item.azureResourceGraph?.query && !!item.subscriptions && item.subscriptions.length > 0;
   }
 
   applyTemplateVariables(target: AzureMonitorQuery, scopedVars: ScopedVars): AzureMonitorQuery {
diff --git a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx
index 2ec87df7808..3f5f31a1966 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx
@@ -1,4 +1,5 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import createMockDatasource from '../../__mocks__/datasource';
@@ -118,4 +119,67 @@ describe('ArgQueryEditor', () => {
     ).toHaveTextContent('$test');
     expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ subscriptions: ['$test'] }));
   });
+
+  it('should display an error if no subscription is selected', async () => {
+    const onChange = jest.fn();
+    const datasource = createMockDatasource({
+      getSubscriptions: jest.fn().mockResolvedValue([]),
+    });
+    const query = createMockQuery({
+      subscriptions: [],
+    });
+    render(
+      <ArgQueryEditor
+        {...defaultProps}
+        datasource={datasource}
+        onChange={onChange}
+        query={query}
+        variableOptionGroup={{ label: 'Template Variables', options: [] }}
+      />
+    );
+
+    expect(await waitFor(() => screen.getByText('At least one subscription must be chosen.'))).toBeInTheDocument();
+  });
+
+  it('should display an error if subscriptions are cleared', async () => {
+    const onChange = jest.fn();
+    const datasource = createMockDatasource({
+      getSubscriptions: jest.fn().mockResolvedValue([{ text: 'foo', value: 'test-subscription-value' }]),
+    });
+    const query = createMockQuery({
+      subscription: undefined,
+      subscriptions: ['test-subscription-value'],
+    });
+    const { rerender } = render(
+      <ArgQueryEditor
+        {...defaultProps}
+        query={query}
+        datasource={datasource}
+        onChange={onChange}
+        variableOptionGroup={{ label: 'Template Variables', options: [] }}
+      />
+    );
+
+    expect(datasource.getSubscriptions).toHaveBeenCalled();
+    expect(await waitFor(() => onChange)).toHaveBeenCalledWith(
+      expect.objectContaining({ subscriptions: ['test-subscription-value'] })
+    );
+    expect(await waitFor(() => screen.findByText('foo'))).toBeInTheDocument();
+
+    const clear = screen.getByLabelText('select-clear-value');
+    await userEvent.click(clear);
+
+    expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ subscriptions: [] }));
+
+    rerender(
+      <ArgQueryEditor
+        {...defaultProps}
+        datasource={datasource}
+        onChange={onChange}
+        query={{ ...query, subscriptions: [] }}
+        variableOptionGroup={{ label: 'Template Variables', options: [] }}
+      />
+    );
+    expect(await waitFor(() => screen.getByText('At least one subscription must be chosen.'))).toBeInTheDocument();
+  });
 });
diff --git a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx
index 488f1cf1211..78b685d491b 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx
@@ -6,9 +6,9 @@ import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/experimental';
 import Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import { AzureMonitorErrorish, AzureMonitorOption, AzureMonitorQuery } from '../../types';
-import SubscriptionField from '../SubscriptionField';
 
 import QueryField from './QueryField';
+import SubscriptionField from './SubscriptionField';
 
 interface ArgQueryEditorProps {
   query: AzureMonitorQuery;
@@ -81,7 +81,6 @@ const ArgQueryEditor = ({
         <EditorRow>
           <EditorFieldGroup>
             <SubscriptionField
-              multiSelect
               subscriptions={subscriptions}
               query={query}
               datasource={datasource}
diff --git a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx
new file mode 100644
index 00000000000..27b3a950034
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx
@@ -0,0 +1,66 @@
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { FieldValidationMessage, MultiSelect } from '@grafana/ui';
+
+import { selectors } from '../../e2e/selectors';
+import { AzureMonitorQuery, AzureQueryEditorFieldProps, AzureMonitorOption } from '../../types';
+import { findOptions } from '../../utils/common';
+import { Field } from '../Field';
+
+interface SubscriptionFieldProps extends AzureQueryEditorFieldProps {
+  onQueryChange: (newQuery: AzureMonitorQuery) => void;
+  subscriptions: AzureMonitorOption[];
+}
+
+const SubscriptionField = ({ query, subscriptions, variableOptionGroup, onQueryChange }: SubscriptionFieldProps) => {
+  const [error, setError] = useState<boolean>(false);
+  const [values, setValues] = useState<Array<SelectableValue<string>>>([]);
+  const options = useMemo(() => [...subscriptions, variableOptionGroup], [subscriptions, variableOptionGroup]);
+
+  useEffect(() => {
+    if (query.subscriptions && query.subscriptions.length > 0) {
+      setValues(findOptions([...subscriptions, ...variableOptionGroup.options], query.subscriptions));
+      setError(false);
+    } else {
+      setError(true);
+    }
+  }, [query.subscriptions, subscriptions, variableOptionGroup.options]);
+
+  const onChange = (change: Array<SelectableValue<string>>) => {
+    if (!change || change.length === 0) {
+      setValues([]);
+      onQueryChange({
+        ...query,
+        subscriptions: [],
+      });
+      setError(true);
+    } else {
+      const newSubs = change.map((c) => c.value ?? '');
+      onQueryChange({
+        ...query,
+        subscriptions: newSubs,
+      });
+      setValues(findOptions([...subscriptions, ...variableOptionGroup.options], newSubs));
+      setError(false);
+    }
+  };
+
+  return (
+    <Field label="Subscriptions" data-testid={selectors.components.queryEditor.argsQueryEditor.subscriptions.input}>
+      <>
+        <MultiSelect
+          isClearable
+          value={values}
+          inputId="azure-monitor-subscriptions-field"
+          onChange={onChange}
+          options={options}
+          width={38}
+        />
+        {error ? <FieldValidationMessage>At least one subscription must be chosen.</FieldValidationMessage> : null}
+      </>
+    </Field>
+  );
+};
+
+export default SubscriptionField;
diff --git a/public/app/plugins/datasource/azuremonitor/components/SubscriptionField.tsx b/public/app/plugins/datasource/azuremonitor/components/SubscriptionField.tsx
deleted file mode 100644
index 396bed8b410..00000000000
--- a/public/app/plugins/datasource/azuremonitor/components/SubscriptionField.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import React, { useCallback, useMemo } from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { Select, MultiSelect } from '@grafana/ui';
-
-import { selectors } from '../e2e/selectors';
-import { AzureMonitorQuery, AzureQueryEditorFieldProps, AzureMonitorOption, AzureQueryType } from '../types';
-import { findOptions } from '../utils/common';
-
-import { Field } from './Field';
-
-interface SubscriptionFieldProps extends AzureQueryEditorFieldProps {
-  onQueryChange: (newQuery: AzureMonitorQuery) => void;
-  subscriptions: AzureMonitorOption[];
-  multiSelect?: boolean;
-}
-
-const SubscriptionField = ({
-  query,
-  subscriptions,
-  variableOptionGroup,
-  onQueryChange,
-  multiSelect = false,
-}: SubscriptionFieldProps) => {
-  const handleChange = useCallback(
-    (change: SelectableValue<string>) => {
-      if (!change.value) {
-        return;
-      }
-
-      let newQuery: AzureMonitorQuery = {
-        ...query,
-        subscription: change.value,
-      };
-
-      if (query.queryType === AzureQueryType.AzureMonitor) {
-        newQuery.azureMonitor = {
-          ...newQuery.azureMonitor,
-          resources: undefined,
-          metricNamespace: undefined,
-          metricName: undefined,
-          aggregation: undefined,
-          timeGrain: '',
-          dimensionFilters: [],
-        };
-      }
-
-      onQueryChange(newQuery);
-    },
-    [query, onQueryChange]
-  );
-
-  const onSubscriptionsChange = useCallback(
-    (change: Array<SelectableValue<string>>) => {
-      if (!change) {
-        return;
-      }
-
-      onQueryChange({
-        ...query,
-        subscriptions: change.map((c) => c.value ?? ''),
-      });
-    },
-    [query, onQueryChange]
-  );
-
-  const options = useMemo(() => [...subscriptions, variableOptionGroup], [subscriptions, variableOptionGroup]);
-
-  return multiSelect ? (
-    <Field label="Subscriptions" data-testid={selectors.components.queryEditor.argsQueryEditor.subscriptions.input}>
-      <MultiSelect
-        isClearable
-        value={findOptions([...subscriptions, ...variableOptionGroup.options], query.subscriptions)}
-        inputId="azure-monitor-subscriptions-field"
-        onChange={onSubscriptionsChange}
-        options={options}
-        width={38}
-      />
-    </Field>
-  ) : (
-    <Field label="Subscription" data-testid={selectors.components.queryEditor.argsQueryEditor.subscriptions.input}>
-      <Select
-        value={query.subscription}
-        inputId="azure-monitor-subscriptions-field"
-        onChange={handleChange}
-        options={options}
-        width={38}
-        allowCustomValue
-      />
-    </Field>
-  );
-};
-
-export default SubscriptionField;
diff --git a/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx
index 7947503f9b8..de3b4cfd9db 100644
--- a/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx
@@ -100,7 +100,7 @@ describe('VariableEditor:', () => {
     it('should render', async () => {
       render(<VariableEditor {...ARGqueryProps} />);
       await waitFor(() => screen.queryByTestId('mockeditor'));
-      expect(screen.queryByLabelText('Subscriptions')).toBeInTheDocument();
+      await waitFor(() => screen.queryByLabelText('Subscriptions'));
       expect(screen.queryByText('Resource Graph')).toBeInTheDocument();
       expect(screen.queryByLabelText('Select subscription')).not.toBeInTheDocument();
       expect(screen.queryByLabelText('Select query type')).not.toBeInTheDocument();

From 9f1fe51edc778f9d67d2acbad498196ff4f5ae9c Mon Sep 17 00:00:00 2001
From: Konrad Lalik <konrad.lalik@grafana.com>
Date: Fri, 21 Apr 2023 12:07:06 +0200
Subject: [PATCH 310/729] Alerting: Fix filtering when panel variables are in
 use (#66977)

Fix alert instances filtering when panel variables are in use
---
 .../panel/alertlist/UnifiedAlertList.tsx      | 21 ++++-
 .../panel/alertlist/UnifiedalertList.test.tsx | 78 +++++++++++++++++--
 public/app/plugins/panel/alertlist/util.ts    | 14 ++--
 3 files changed, 98 insertions(+), 15 deletions(-)

diff --git a/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx b/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
index d6b42e78033..dbfed7f94a9 100644
--- a/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
+++ b/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
@@ -106,6 +106,13 @@ export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
     );
   }
 
+  const { options, replaceVariables } = props;
+  const parsedOptions: UnifiedAlertListOptions = {
+    ...props.options,
+    alertName: replaceVariables(options.alertName),
+    alertInstanceLabelFilter: replaceVariables(options.alertInstanceLabelFilter),
+  };
+
   return (
     <CustomScrollbar autoHeightMin="100%" autoHeightMax="100%">
       <div className={styles.container}>
@@ -124,10 +131,10 @@ export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
             />
           )}
           {props.options.viewMode === ViewMode.List && props.options.groupMode === GroupMode.Custom && haveResults && (
-            <GroupedModeView rules={rules} options={props.options} />
+            <GroupedModeView rules={rules} options={parsedOptions} />
           )}
           {props.options.viewMode === ViewMode.List && props.options.groupMode === GroupMode.Default && haveResults && (
-            <UngroupedModeView rules={rules} options={props.options} />
+            <UngroupedModeView rules={rules} options={parsedOptions} />
           )}
         </section>
       </div>
@@ -209,7 +216,15 @@ function filterRules(props: PanelProps<UnifiedAlertListOptions>, rules: Combined
   // when we display a rule with 0 instances
   filteredRules = filteredRules.reduce<CombinedRuleWithLocation[]>((rules, rule) => {
     const alertingRule = getAlertingRule(rule);
-    const filteredAlerts = alertingRule ? filterAlerts(options, alertingRule.alerts ?? []) : [];
+    const filteredAlerts = alertingRule
+      ? filterAlerts(
+          {
+            stateFilter: options.stateFilter,
+            alertInstanceLabelFilter: replaceVariables(options.alertInstanceLabelFilter),
+          },
+          alertingRule.alerts ?? []
+        )
+      : [];
     if (filteredAlerts.length) {
       // We intentionally don't set alerts to filteredAlerts
       // because later we couldn't display that some alerts are hidden (ref AlertInstances filtering)
diff --git a/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx b/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
index ed2a5cc6a94..2ae4648c602 100644
--- a/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
+++ b/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
@@ -1,14 +1,26 @@
 import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Provider } from 'react-redux';
+import { byRole, byText } from 'testing-library-selector';
 
 import { getDefaultTimeRange, LoadingState, PanelProps, FieldConfigSource } from '@grafana/data';
 import { TimeRangeUpdatedEvent } from '@grafana/runtime';
 import { DashboardSrv, setDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
-import { configureStore } from 'app/store/configureStore';
+
+import { contextSrv } from '../../../core/services/context_srv';
+import {
+  mockPromAlert,
+  mockPromAlertingRule,
+  mockPromRuleGroup,
+  mockPromRuleNamespace,
+  mockUnifiedAlertingStore,
+} from '../../../features/alerting/unified/mocks';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../../features/alerting/unified/utils/datasource';
 
 import { UnifiedAlertList } from './UnifiedAlertList';
 import { UnifiedAlertListOptions, SortOrder, GroupMode, ViewMode } from './types';
+import * as utils from './util';
 
 jest.mock('app/features/alerting/unified/api/alertmanager');
 
@@ -60,14 +72,36 @@ const dashboard = {
   },
 };
 
-const renderPanel = (options: UnifiedAlertListOptions = defaultOptions) => {
-  const store = configureStore();
+const renderPanel = (options: Partial<UnifiedAlertListOptions> = defaultOptions) => {
+  const store = mockUnifiedAlertingStore({
+    promRules: {
+      grafana: {
+        loading: false,
+        dispatched: true,
+        result: [
+          mockPromRuleNamespace({
+            name: 'ns1',
+            groups: [
+              mockPromRuleGroup({
+                name: 'group1',
+                rules: [
+                  mockPromAlertingRule({
+                    name: 'rule1',
+                    alerts: [mockPromAlert({ labels: { severity: 'critical' } })],
+                  }),
+                ],
+              }),
+            ],
+          }),
+        ],
+      },
+    },
+  });
 
   const dashSrv: unknown = { getCurrent: () => dashboard };
   setDashboardSrv(dashSrv as DashboardSrv);
 
-  defaultProps.options = options;
-  const props = { ...defaultProps };
+  const props = { ...defaultProps, options: { ...defaultOptions, ...options } };
 
   return render(
     <Provider store={store}>
@@ -82,4 +116,38 @@ describe('UnifiedAlertList', () => {
     expect(dashboard.events.subscribe).toHaveBeenCalledTimes(1);
     expect(dashboard.events.subscribe.mock.calls[0][0]).toEqual(TimeRangeUpdatedEvent);
   });
+
+  it('should replace option variables before filtering', async () => {
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
+    const filterAlertsSpy = jest.spyOn(utils, 'filterAlerts');
+
+    const replaceVarsSpy = jest.spyOn(defaultProps, 'replaceVariables').mockReturnValue('severity=critical');
+
+    const user = userEvent.setup();
+
+    renderPanel({
+      alertInstanceLabelFilter: '$label',
+      dashboardAlerts: false,
+      alertName: '',
+      datasource: GRAFANA_RULES_SOURCE_NAME,
+      folder: undefined,
+    });
+
+    expect(byText('rule1').get()).toBeInTheDocument();
+
+    const expandElement = byText('1 instance').get();
+
+    await user.click(expandElement);
+
+    const tagsElement = await byRole('list', { name: 'Tags' }).find();
+    expect(await byRole('listitem').find(tagsElement)).toHaveTextContent('severity=critical');
+
+    expect(replaceVarsSpy).toHaveBeenLastCalledWith('$label');
+    expect(filterAlertsSpy).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        alertInstanceLabelFilter: 'severity=critical',
+      }),
+      expect.anything()
+    );
+  });
 });
diff --git a/public/app/plugins/panel/alertlist/util.ts b/public/app/plugins/panel/alertlist/util.ts
index 258b4c519df..47479c7004e 100644
--- a/public/app/plugins/panel/alertlist/util.ts
+++ b/public/app/plugins/panel/alertlist/util.ts
@@ -1,20 +1,21 @@
 import { isEmpty } from 'lodash';
 
-import { Labels, PanelProps } from '@grafana/data';
+import { Labels } from '@grafana/data';
 import { labelsMatchMatchers, parseMatchers } from 'app/features/alerting/unified/utils/alertmanager';
-import { replaceVariables } from 'app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils';
 import { Alert, hasAlertState } from 'app/types/unified-alerting';
 import { GrafanaAlertState, PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
 import { UnifiedAlertListOptions } from './types';
 
 function hasLabelFilter(alertInstanceLabelFilter: string, labels: Labels) {
-  const replacedLabelFilter = replaceVariables(alertInstanceLabelFilter);
-  const matchers = parseMatchers(replacedLabelFilter);
+  const matchers = parseMatchers(alertInstanceLabelFilter);
   return labelsMatchMatchers(labels, matchers);
 }
 
-export function filterAlerts(options: PanelProps<UnifiedAlertListOptions>['options'], alerts: Alert[]): Alert[] {
+export function filterAlerts(
+  options: Pick<UnifiedAlertListOptions, 'stateFilter' | 'alertInstanceLabelFilter'>,
+  alerts: Alert[]
+): Alert[] {
   const { stateFilter, alertInstanceLabelFilter } = options;
 
   if (isEmpty(stateFilter)) {
@@ -31,8 +32,7 @@ export function filterAlerts(options: PanelProps<UnifiedAlertListOptions>['optio
         (stateFilter.normal && hasAlertState(alert, GrafanaAlertState.Normal)) ||
         (stateFilter.error && hasAlertState(alert, GrafanaAlertState.Error)) ||
         (stateFilter.inactive && hasAlertState(alert, PromAlertingRuleState.Inactive))) &&
-      ((alertInstanceLabelFilter && hasLabelFilter(options.alertInstanceLabelFilter, alert.labels)) ||
-        !alertInstanceLabelFilter)
+      (alertInstanceLabelFilter ? hasLabelFilter(options.alertInstanceLabelFilter, alert.labels) : true)
     );
   });
 }

From 9a29dd7d6e14746c7ba4977b8d07df20c9beb0c4 Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Fri, 21 Apr 2023 11:29:52 +0100
Subject: [PATCH 311/729] Docs: Documentation updates for nested folder
 permissions (#66599)

doc updates for nested folder permissions
---
 .../roles-and-permissions/_index.md           |   6 +-
 .../custom-role-actions-scopes/index.md       | 248 +++++++++---------
 .../index.md                                  |   4 +-
 .../manage-dashboard-permissions/index.md     |  22 +-
 docs/sources/developers/http_api/folder.md    |   9 +-
 5 files changed, 151 insertions(+), 138 deletions(-)

diff --git a/docs/sources/administration/roles-and-permissions/_index.md b/docs/sources/administration/roles-and-permissions/_index.md
index f4d3199881b..ac87f3a608b 100644
--- a/docs/sources/administration/roles-and-permissions/_index.md
+++ b/docs/sources/administration/roles-and-permissions/_index.md
@@ -92,14 +92,14 @@ The following table lists permissions for each role.
 
 ## Dashboard permissions
 
-When you want to extend a viewer's ability to edit and save dashboard changes or limit an editor's permission to modify a dashboard, you can assign permissions to dashboards and dashboard folders. For example, you might want a certain viewer to be able to edit a dashboard. While that user can _see_ all dashboards, you can grant them access to _update_ only one of them.
+When you want to extend a viewer's ability to edit and save dashboard changes or limit an editor's permission to modify a dashboard, you can assign permissions to dashboards and folders. For example, you might want a certain viewer to be able to edit a dashboard. While that user can _see_ all dashboards, you can grant them access to _update_ only one of them.
 
 > Important: The dashboard permissions you specify override the organization permissions you assign to the user for the selected entity.
 
 You can specify the following permissions to dashboards and folders.
 
-- **Admin**: Can create, edit, or delete a dashboard. Can edit or delete a folder. Administrators can also change dashboard and folder permissions.
-- **Edit**: Can create, edit, or delete a dashboard. Can edit or delete a folder. Editors _cannot_ change folder or dashboard permissions.
+- **Admin**: Can create, edit, or delete a dashboard. Can edit or delete a folder, and create dashboards and subfolders in a folder. Administrators can also change dashboard and folder permissions.
+- **Edit**: Can create, edit, or delete a dashboard. Can edit or delete a folder, and create dashboards and subfolders in a folder. Editors _cannot_ change folder or dashboard permissions.
 - **View**: Can only view dashboards and folders.
 
 > Important: When a user creates a dashboard or a folder, he is set as **Admin** of it.
diff --git a/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md b/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
index 8a87869b795..373075b078c 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
@@ -23,129 +23,129 @@ To learn more about the Grafana resources to which you can apply RBAC, refer to
 
 The following list contains role-based access control actions.
 
-| Action                               | Applicable scope                                                                        | Description                                                                                                                                                                                      |
-| ------------------------------------ | --------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `alert.instances.external:read`      | `datasources:*`<br>`datasources:uid:*`                                                  | Read alerts and silences in data sources that support alerting.                                                                                                                                  |
-| `alert.instances.external:write`     | `datasources:*`<br>`datasources:uid:*`                                                  | Manage alerts and silences in data sources that support alerting.                                                                                                                                |
-| `alert.instances:create`             | n/a                                                                                     | Create silences in the current organization.                                                                                                                                                     |
-| `alert.instances:read`               | n/a                                                                                     | Read alerts and silences in the current organization.                                                                                                                                            |
-| `alert.instances:write`              | n/a                                                                                     | Update and expire silences in the current organization.                                                                                                                                          |
-| `alert.notifications.external:read`  | `datasources:*`<br>`datasources:uid:*`                                                  | Read templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                   |
-| `alert.notifications.external:write` | `datasources:*`<br>`datasources:uid:*`                                                  | Manage templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                 |
-| `alert.notifications:write`          | n/a                                                                                     | Manage templates, contact points, notification policies, and mute timings in the current organization.                                                                                           |
-| `alert.notifications:read`           | n/a                                                                                     | Read all templates, contact points, notification policies, and mute timings in the current organization.                                                                                         |
-| `alert.rules.external:read`          | `datasources:*`<br>`datasources:uid:*`                                                  | Read alert rules in data sources that support alerting (Prometheus, Mimir, and Loki)                                                                                                             |
-| `alert.rules.external:write`         | `datasources:*`<br>`datasources:uid:*`                                                  | Create, update, and delete alert rules in data sources that support alerting (Mimir and Loki).                                                                                                   |
-| `alert.rules:create`                 | `folders:*`<br>`folders:uid:*`                                                          | Create Grafana alert rules in a folder. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.rules:delete`                 | `folders:*`<br>`folders:uid:*`                                                          | Delete Grafana alert rules in a folder. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.rules:read`                   | `folders:*`<br>`folders:uid:*`                                                          | Read Grafana alert rules in a folder. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query.   |
-| `alert.rules:write`                  | `folders:*`<br>`folders:uid:*`                                                          | Update Grafana alert rules in a folder. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.provisioning:read`            | n/a                                                                                     | Read all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and datasource are not required.                                                           |
-| `alert.provisioning:write`           | n/a                                                                                     | Update all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and datasource are not required.                                                         |
-| `annotations:create`                 | `annotations:*`<br>`annotations:type:*`                                                 | Create annotations.                                                                                                                                                                              |
-| `annotations:delete`                 | `annotations:*`<br>`annotations:type:*`                                                 | Delete annotations.                                                                                                                                                                              |
-| `annotations:read`                   | `annotations:*`<br>`annotations:type:*`                                                 | Read annotations and annotation tags.                                                                                                                                                            |
-| `annotations:write`                  | `annotations:*`<br>`annotations:type:*`                                                 | Update annotations.                                                                                                                                                                              |
-| `apikeys:create`                     | n/a                                                                                     | Create API keys.                                                                                                                                                                                 |
-| `apikeys:read`                       | `apikeys:*`<br>`apikeys:id:*`                                                           | Read API keys.                                                                                                                                                                                   |
-| `apikeys:delete`                     | `apikeys:*`<br>`apikeys:id:*`                                                           | Delete API keys.                                                                                                                                                                                 |
-| `dashboards:create`                  | `folders:*`<br>`folders:uid:*`                                                          | Create dashboards in one or more folders.                                                                                                                                                        |
-| `dashboards:delete`                  | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Delete one or more dashboards.                                                                                                                                                                   |
-| `dashboards.insights:read`           | n/a                                                                                     | Read dashboard insights data and see presence indicators.                                                                                                                                        |
-| `dashboards.permissions:read`        | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read permissions for one or more dashboards.                                                                                                                                                     |
-| `dashboards.permissions:write`       | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update permissions for one or more dashboards.                                                                                                                                                   |
-| `dashboards.public:write`            | `dashboards:*`<br>`dashboards:uid:*`                                                    | Write public dashboard configuration.                                                                                                                                                            |
-| `dashboards:read`                    | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read one or more dashboards.                                                                                                                                                                     |
-| `dashboards:write`                   | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update one or more dashboards.                                                                                                                                                                   |
-| `datasources.caching:read`           | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source query caching settings.                                                                                                                                                         |
-| `datasources.caching:write`          | `datasources:*`<br>`datasources:uid:*`                                                  | Update data source query caching settings.                                                                                                                                                       |
-| `datasources:create`                 | n/a                                                                                     | Create data sources.                                                                                                                                                                             |
-| `datasources:delete`                 | `datasources:*`<br>`datasources:uid:*`                                                  | Delete data sources.                                                                                                                                                                             |
-| `datasources:explore`                | n/a                                                                                     | Enable access to the **Explore** tab.                                                                                                                                                            |
-| `datasources.id:read`                | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source IDs.                                                                                                                                                                            |
-| `datasources.insights:read`          | n/a                                                                                     | Read data sources insights data.                                                                                                                                                                 |
-| `datasources.permissions:read`       | `datasources:*`<br>`datasources:uid:*`                                                  | List data source permissions.                                                                                                                                                                    |
-| `datasources.permissions:write`      | `datasources:*`<br>`datasources:uid:*`                                                  | Update data source permissions.                                                                                                                                                                  |
-| `datasources:query`                  | `datasources:*`<br>`datasources:uid:*`                                                  | Query data sources.                                                                                                                                                                              |
-| `datasources:read`                   | `datasources:*`<br>`datasources:uid:*`                                                  | List data sources.                                                                                                                                                                               |
-| `datasources:write`                  | `datasources:*`<br>`datasources:uid:*`                                                  | Update data sources.                                                                                                                                                                             |
-| `folders.permissions:read`           | `folders:*`<br>`folders:uid:*`                                                          | Read permissions for one or more folders.                                                                                                                                                        |
-| `folders.permissions:write`          | `folders:*`<br>`folders:uid:*`                                                          | Update permissions for one or more folders.                                                                                                                                                      |
-| `folders:create`                     | n/a                                                                                     | Create folders.                                                                                                                                                                                  |
-| `folders:delete`                     | `folders:*`<br>`folders:uid:*`                                                          | Delete one or more folders.                                                                                                                                                                      |
-| `folders:read`                       | `folders:*`<br>`folders:uid:*`                                                          | Read one or more folders.                                                                                                                                                                        |
-| `folders:write`                      | `folders:*`<br>`folders:uid:*`                                                          | Update one or more folders.                                                                                                                                                                      |
-| `ldap.config:reload`                 | n/a                                                                                     | Reload the LDAP configuration.                                                                                                                                                                   |
-| `ldap.status:read`                   | n/a                                                                                     | Verify the availability of the LDAP server or servers.                                                                                                                                           |
-| `ldap.user:read`                     | n/a                                                                                     | Read users via LDAP.                                                                                                                                                                             |
-| `ldap.user:sync`                     | n/a                                                                                     | Sync users via LDAP.                                                                                                                                                                             |
-| `licensing.reports:read`             | n/a                                                                                     | Get custom permission reports.                                                                                                                                                                   |
-| `licensing:delete`                   | n/a                                                                                     | Delete the license token.                                                                                                                                                                        |
-| `licensing:read`                     | n/a                                                                                     | Read licensing information.                                                                                                                                                                      |
-| `licensing:write`                    | n/a                                                                                     | Update the license token.                                                                                                                                                                        |
-| `org.users:write`                    | `users:*` <br> `users:id:*`                                                             | Update the organization role (`Viewer`, `Editor`, or `Admin`) of a user.                                                                                                                         |
-| `org.users:add`                      | `users:*`                                                                               | Add a user to an organization or invite a new user to an organization.                                                                                                                           |
-| `org.users:read`                     | `users:*` <br> `users:id:*`                                                             | Get user profiles within an organization.                                                                                                                                                        |
-| `org.users:remove`                   | `users:*` <br> `users:id:*`                                                             | Remove a user from an organization.                                                                                                                                                              |
-| `org:create`                         | n/a                                                                                     | Create an organization.                                                                                                                                                                          |
-| `orgs.preferences:read`              | `orgs:*` <br> `orgs:id:*`                                                               | Read organization preferences.                                                                                                                                                                   |
-| `orgs.preferences:write`             | `orgs:*` <br> `orgs:id:*`                                                               | Update organization preferences.                                                                                                                                                                 |
-| `orgs.quotas:read`                   | `orgs:*` <br> `orgs:id:*`                                                               | Read organization quotas.                                                                                                                                                                        |
-| `orgs.quotas:write`                  | `orgs:*` <br> `orgs:id:*`                                                               | Update organization quotas.                                                                                                                                                                      |
-| `orgs:delete`                        | `orgs:*` <br> `orgs:id:*`                                                               | Delete one or more organizations.                                                                                                                                                                |
-| `orgs:read`                          | `orgs:*` <br> `orgs:id:*`                                                               | Read one or more organizations.                                                                                                                                                                  |
-| `orgs:write`                         | `orgs:*` <br> `orgs:id:*`                                                               | Update one or more organizations.                                                                                                                                                                |
-| `plugins.app:access`                 | `plugins:*` <br> `plugins:id:*`                                                         | Access one or more application plugins (still enforcing the organization role)                                                                                                                   |
-| `plugins:install`                    | n/a                                                                                     | Install and uninstall plugins.                                                                                                                                                                   |
-| `plugins:write`                      | `plugins:*` <br> `plugins:id:*`                                                         | Edit settings for one or more plugins.                                                                                                                                                           |
-| `provisioning:reload`                | `provisioners:*`                                                                        | Reload provisioning files. To find the exact scope for specific provisioner, see [Scope definitions]({{< relref "#scope-definitions" >}}).                                                       |
-| `reports:create`                     | n/a                                                                                     | Create reports.                                                                                                                                                                                  |
-| `reports:write`                      | `reports:*` <br> `reports:id:*`                                                         | Update reports.                                                                                                                                                                                  |
-| `reports.settings:read`              | n/a                                                                                     | Read report settings.                                                                                                                                                                            |
-| `reports.settings:write`             | n/a                                                                                     | Update report settings.                                                                                                                                                                          |
-| `reports:delete`                     | `reports:*` <br> `reports:id:*`                                                         | Delete reports.                                                                                                                                                                                  |
-| `reports:read`                       | `reports:*`                                                                             | List all available reports or get a specific report.                                                                                                                                             |
-| `reports:send`                       | `reports:*`                                                                             | Send a report email.                                                                                                                                                                             |
-| `roles:delete`                       | `permissions:type:delegate`                                                             | Delete a custom role.                                                                                                                                                                            |
-| `roles:read`                         | `roles:*` <br> `roles:uid:*`                                                            | List roles and read a specific with its permissions.                                                                                                                                             |
-| `roles:write`                        | `permissions:type:delegate`                                                             | Create or update a custom role.                                                                                                                                                                  |
-| `roles:write`                        | `permissions:type:escalate`                                                             | Reset basic roles to their default permissions.                                                                                                                                                  |
-| `server.stats:read`                  | n/a                                                                                     | Read Grafana instance statistics.                                                                                                                                                                |
-| `serviceaccounts:write`              | `serviceaccounts:*`                                                                     | Create Grafana service accounts.                                                                                                                                                                 |
-| `serviceaccounts:create`             | n/a                                                                                     | Update Grafana service accounts.                                                                                                                                                                 |
-| `serviceaccounts:delete`             | `serviceaccounts:*`                                                                     | Delete Grafana service accounts.                                                                                                                                                                 |
-| `serviceaccounts:read`               | `serviceaccounts:*`                                                                     | Read Grafana service accounts.                                                                                                                                                                   |
-| `serviceaccounts.permissions:write`  | `serviceaccounts:*`                                                                     | Update Grafana service account permissions to control who can do what with the service account.                                                                                                  |
-| `serviceaccounts.permissions:read`   | `serviceaccounts:*`                                                                     | Read Grafana service account permissions to see who can do what with the service account.                                                                                                        |
-| `settings:read`                      | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Read the [Grafana configuration settings]({{< relref "../../../../setup-grafana/configure-grafana/" >}})                                                                                         |
-| `settings:write`                     | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Update any Grafana configuration settings that can be [updated at runtime]({{< relref "../../../../setup-grafana/configure-grafana/settings-updates-at-runtime" >}}).                            |
-| `status:accesscontrol`               | `services:accesscontrol`                                                                | Get access-control enabled status.                                                                                                                                                               |
-| `teams.permissions:read`             | `teams:*`<br>`teams:id:*`                                                               | Read members and External Group Synchronization setup for teams.                                                                                                                                 |
-| `teams.permissions:write`            | `teams:*`<br>`teams:id:*`                                                               | Add, remove and update members and manage External Group Synchronization setup for teams.                                                                                                        |
-| `teams.roles:add`                    | `permissions:type:delegate`                                                             | Assign a role to a team.                                                                                                                                                                         |
-| `teams.roles:read`                   | `teams:*`                                                                               | List roles assigned directly to a team.                                                                                                                                                          |
-| `teams.roles:remove`                 | `permissions:type:delegate`                                                             | Unassign a role from a team.                                                                                                                                                                     |
-| `teams:create`                       | n/a                                                                                     | Create teams.                                                                                                                                                                                    |
-| `teams:delete`                       | `teams:*`<br>`teams:id:*`                                                               | Delete one or more teams.                                                                                                                                                                        |
-| `teams:read`                         | `teams:*`<br>`teams:id:*`                                                               | Read one or more teams and team preferences.                                                                                                                                                     |
-| `teams:write`                        | `teams:*`<br>`teams:id:*`                                                               | Update one or more teams and team preferences.                                                                                                                                                   |
-| `users.authtoken:read`               | `global.users:*` <br> `global.users:id:*`                                               | List authentication tokens that are assigned to a user.                                                                                                                                          |
-| `users.authtoken:write`              | `global.users:*` <br> `global.users:id:*`                                               | Update authentication tokens that are assigned to a user.                                                                                                                                        |
-| `users.password:write`               | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s password.                                                                                                                                                                        |
-| `users.permissions:read`             | `users:*`                                                                               | List permissions of a user.                                                                                                                                                                      |
-| `users.permissions:write`            | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s organization-level permissions.                                                                                                                                                  |
-| `users.quotas:read`                  | `global.users:*` <br> `global.users:id:*`                                               | List a user’s quotas.                                                                                                                                                                            |
-| `users.quotas:write`                 | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s quotas.                                                                                                                                                                          |
-| `users.roles:add`                    | `permissions:type:delegate`                                                             | Assign a role to a user or a service account.                                                                                                                                                    |
-| `users.roles:read`                   | `users:*`                                                                               | List roles assigned directly to a user or a service account.                                                                                                                                     |
-| `users.roles:remove`                 | `permissions:type:delegate`                                                             | Unassign a role from a user or a service account.                                                                                                                                                |
-| `users:create`                       | n/a                                                                                     | Create a user.                                                                                                                                                                                   |
-| `users:delete`                       | `global.users:*` <br> `global.users:id:*`                                               | Delete a user.                                                                                                                                                                                   |
-| `users:disable`                      | `global.users:*` <br> `global.users:id:*`                                               | Disable a user.                                                                                                                                                                                  |
-| `users:enable`                       | `global.users:*` <br> `global.users:id:*`                                               | Enable a user.                                                                                                                                                                                   |
-| `users:logout`                       | `global.users:*` <br> `global.users:id:*`                                               | Sign out a user.                                                                                                                                                                                 |
-| `users:read`                         | `global.users:*`                                                                        | Read or search user profiles.                                                                                                                                                                    |
-| `users:write`                        | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s profile.                                                                                                                                                                         |
+| Action                               | Applicable scope                                                                        | Description                                                                                                                                                                                                         |
+| ------------------------------------ | --------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `alert.instances.external:read`      | `datasources:*`<br>`datasources:uid:*`                                                  | Read alerts and silences in data sources that support alerting.                                                                                                                                                     |
+| `alert.instances.external:write`     | `datasources:*`<br>`datasources:uid:*`                                                  | Manage alerts and silences in data sources that support alerting.                                                                                                                                                   |
+| `alert.instances:create`             | n/a                                                                                     | Create silences in the current organization.                                                                                                                                                                        |
+| `alert.instances:read`               | n/a                                                                                     | Read alerts and silences in the current organization.                                                                                                                                                               |
+| `alert.instances:write`              | n/a                                                                                     | Update and expire silences in the current organization.                                                                                                                                                             |
+| `alert.notifications.external:read`  | `datasources:*`<br>`datasources:uid:*`                                                  | Read templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                      |
+| `alert.notifications.external:write` | `datasources:*`<br>`datasources:uid:*`                                                  | Manage templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                    |
+| `alert.notifications:write`          | n/a                                                                                     | Manage templates, contact points, notification policies, and mute timings in the current organization.                                                                                                              |
+| `alert.notifications:read`           | n/a                                                                                     | Read all templates, contact points, notification policies, and mute timings in the current organization.                                                                                                            |
+| `alert.rules.external:read`          | `datasources:*`<br>`datasources:uid:*`                                                  | Read alert rules in data sources that support alerting (Prometheus, Mimir, and Loki)                                                                                                                                |
+| `alert.rules.external:write`         | `datasources:*`<br>`datasources:uid:*`                                                  | Create, update, and delete alert rules in data sources that support alerting (Mimir and Loki).                                                                                                                      |
+| `alert.rules:create`                 | `folders:*`<br>`folders:uid:*`                                                          | Create Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
+| `alert.rules:delete`                 | `folders:*`<br>`folders:uid:*`                                                          | Delete Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
+| `alert.rules:read`                   | `folders:*`<br>`folders:uid:*`                                                          | Read Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query.   |
+| `alert.rules:write`                  | `folders:*`<br>`folders:uid:*`                                                          | Update Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
+| `alert.provisioning:read`            | n/a                                                                                     | Read all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and datasource are not required.                                                                              |
+| `alert.provisioning:write`           | n/a                                                                                     | Update all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and datasource are not required.                                                                            |
+| `annotations:create`                 | `annotations:*`<br>`annotations:type:*`                                                 | Create annotations.                                                                                                                                                                                                 |
+| `annotations:delete`                 | `annotations:*`<br>`annotations:type:*`                                                 | Delete annotations.                                                                                                                                                                                                 |
+| `annotations:read`                   | `annotations:*`<br>`annotations:type:*`                                                 | Read annotations and annotation tags.                                                                                                                                                                               |
+| `annotations:write`                  | `annotations:*`<br>`annotations:type:*`                                                 | Update annotations.                                                                                                                                                                                                 |
+| `apikeys:create`                     | n/a                                                                                     | Create API keys.                                                                                                                                                                                                    |
+| `apikeys:read`                       | `apikeys:*`<br>`apikeys:id:*`                                                           | Read API keys.                                                                                                                                                                                                      |
+| `apikeys:delete`                     | `apikeys:*`<br>`apikeys:id:*`                                                           | Delete API keys.                                                                                                                                                                                                    |
+| `dashboards:create`                  | `folders:*`<br>`folders:uid:*`                                                          | Create dashboards in one or more folders and their subfolders.                                                                                                                                                      |
+| `dashboards:delete`                  | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Delete one or more dashboards.                                                                                                                                                                                      |
+| `dashboards.insights:read`           | n/a                                                                                     | Read dashboard insights data and see presence indicators.                                                                                                                                                           |
+| `dashboards.permissions:read`        | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read permissions for one or more dashboards.                                                                                                                                                                        |
+| `dashboards.permissions:write`       | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update permissions for one or more dashboards.                                                                                                                                                                      |
+| `dashboards:read`                    | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read one or more dashboards.                                                                                                                                                                                        |
+| `dashboards:write`                   | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update one or more dashboards.                                                                                                                                                                                      |
+| `dashboards.public:write`            | `dashboards:*`<br>`dashboards:uid:*`                                                    | Write public dashboard configuration.                                                                                                                                                                               |
+| `datasources.caching:read`           | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source query caching settings.                                                                                                                                                                            |
+| `datasources.caching:write`          | `datasources:*`<br>`datasources:uid:*`                                                  | Update data source query caching settings.                                                                                                                                                                          |
+| `datasources:create`                 | n/a                                                                                     | Create data sources.                                                                                                                                                                                                |
+| `datasources:delete`                 | `datasources:*`<br>`datasources:uid:*`                                                  | Delete data sources.                                                                                                                                                                                                |
+| `datasources:explore`                | n/a                                                                                     | Enable access to the **Explore** tab.                                                                                                                                                                               |
+| `datasources.id:read`                | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source IDs.                                                                                                                                                                                               |
+| `datasources.insights:read`          | n/a                                                                                     | Read data sources insights data.                                                                                                                                                                                    |
+| `datasources.permissions:read`       | `datasources:*`<br>`datasources:uid:*`                                                  | List data source permissions.                                                                                                                                                                                       |
+| `datasources.permissions:write`      | `datasources:*`<br>`datasources:uid:*`                                                  | Update data source permissions.                                                                                                                                                                                     |
+| `datasources:query`                  | `datasources:*`<br>`datasources:uid:*`                                                  | Query data sources.                                                                                                                                                                                                 |
+| `datasources:read`                   | `datasources:*`<br>`datasources:uid:*`                                                  | List data sources.                                                                                                                                                                                                  |
+| `datasources:write`                  | `datasources:*`<br>`datasources:uid:*`                                                  | Update data sources.                                                                                                                                                                                                |
+| `folders.permissions:read`           | `folders:*`<br>`folders:uid:*`                                                          | Read permissions for one or more folders and their subfolders.                                                                                                                                                      |
+| `folders.permissions:write`          | `folders:*`<br>`folders:uid:*`                                                          | Update permissions for one or more folders and their subfolders.                                                                                                                                                    |
+| `folders:create`                     | n/a                                                                                     | Create folders in the root level. If granted together with `folders:write`, also allows creating subfolders under all folders that the user can update.                                                             |
+| `folders:delete`                     | `folders:*`<br>`folders:uid:*`                                                          | Delete one or more folders and their subfolders.                                                                                                                                                                    |
+| `folders:read`                       | `folders:*`<br>`folders:uid:*`                                                          | Read one or more folders and their subfolders.                                                                                                                                                                      |
+| `folders:write`                      | `folders:*`<br>`folders:uid:*`                                                          | Update one or more folders and their subfolders. If granted together with `folders:create` permission, also allows creating subfolders under these folders.                                                         |
+| `ldap.config:reload`                 | n/a                                                                                     | Reload the LDAP configuration.                                                                                                                                                                                      |
+| `ldap.status:read`                   | n/a                                                                                     | Verify the availability of the LDAP server or servers.                                                                                                                                                              |
+| `ldap.user:read`                     | n/a                                                                                     | Read users via LDAP.                                                                                                                                                                                                |
+| `ldap.user:sync`                     | n/a                                                                                     | Sync users via LDAP.                                                                                                                                                                                                |
+| `licensing.reports:read`             | n/a                                                                                     | Get custom permission reports.                                                                                                                                                                                      |
+| `licensing:delete`                   | n/a                                                                                     | Delete the license token.                                                                                                                                                                                           |
+| `licensing:read`                     | n/a                                                                                     | Read licensing information.                                                                                                                                                                                         |
+| `licensing:write`                    | n/a                                                                                     | Update the license token.                                                                                                                                                                                           |
+| `org.users:write`                    | `users:*` <br> `users:id:*`                                                             | Update the organization role (`Viewer`, `Editor`, or `Admin`) of a user.                                                                                                                                            |
+| `org.users:add`                      | `users:*`                                                                               | Add a user to an organization or invite a new user to an organization.                                                                                                                                              |
+| `org.users:read`                     | `users:*` <br> `users:id:*`                                                             | Get user profiles within an organization.                                                                                                                                                                           |
+| `org.users:remove`                   | `users:*` <br> `users:id:*`                                                             | Remove a user from an organization.                                                                                                                                                                                 |
+| `org:create`                         | n/a                                                                                     | Create an organization.                                                                                                                                                                                             |
+| `orgs.preferences:read`              | `orgs:*` <br> `orgs:id:*`                                                               | Read organization preferences.                                                                                                                                                                                      |
+| `orgs.preferences:write`             | `orgs:*` <br> `orgs:id:*`                                                               | Update organization preferences.                                                                                                                                                                                    |
+| `orgs.quotas:read`                   | `orgs:*` <br> `orgs:id:*`                                                               | Read organization quotas.                                                                                                                                                                                           |
+| `orgs.quotas:write`                  | `orgs:*` <br> `orgs:id:*`                                                               | Update organization quotas.                                                                                                                                                                                         |
+| `orgs:delete`                        | `orgs:*` <br> `orgs:id:*`                                                               | Delete one or more organizations.                                                                                                                                                                                   |
+| `orgs:read`                          | `orgs:*` <br> `orgs:id:*`                                                               | Read one or more organizations.                                                                                                                                                                                     |
+| `orgs:write`                         | `orgs:*` <br> `orgs:id:*`                                                               | Update one or more organizations.                                                                                                                                                                                   |
+| `plugins.app:access`                 | `plugins:*` <br> `plugins:id:*`                                                         | Access one or more application plugins (still enforcing the organization role)                                                                                                                                      |
+| `plugins:install`                    | n/a                                                                                     | Install and uninstall plugins.                                                                                                                                                                                      |
+| `plugins:write`                      | `plugins:*` <br> `plugins:id:*`                                                         | Edit settings for one or more plugins.                                                                                                                                                                              |
+| `provisioning:reload`                | `provisioners:*`                                                                        | Reload provisioning files. To find the exact scope for specific provisioner, see [Scope definitions]({{< relref "#scope-definitions" >}}).                                                                          |
+| `reports:create`                     | n/a                                                                                     | Create reports.                                                                                                                                                                                                     |
+| `reports:write`                      | `reports:*` <br> `reports:id:*`                                                         | Update reports.                                                                                                                                                                                                     |
+| `reports.settings:read`              | n/a                                                                                     | Read report settings.                                                                                                                                                                                               |
+| `reports.settings:write`             | n/a                                                                                     | Update report settings.                                                                                                                                                                                             |
+| `reports:delete`                     | `reports:*` <br> `reports:id:*`                                                         | Delete reports.                                                                                                                                                                                                     |
+| `reports:read`                       | `reports:*`                                                                             | List all available reports or get a specific report.                                                                                                                                                                |
+| `reports:send`                       | `reports:*`                                                                             | Send a report email.                                                                                                                                                                                                |
+| `roles:delete`                       | `permissions:type:delegate`                                                             | Delete a custom role.                                                                                                                                                                                               |
+| `roles:read`                         | `roles:*` <br> `roles:uid:*`                                                            | List roles and read a specific with its permissions.                                                                                                                                                                |
+| `roles:write`                        | `permissions:type:delegate`                                                             | Create or update a custom role.                                                                                                                                                                                     |
+| `roles:write`                        | `permissions:type:escalate`                                                             | Reset basic roles to their default permissions.                                                                                                                                                                     |
+| `server.stats:read`                  | n/a                                                                                     | Read Grafana instance statistics.                                                                                                                                                                                   |
+| `serviceaccounts:write`              | `serviceaccounts:*`                                                                     | Create Grafana service accounts.                                                                                                                                                                                    |
+| `serviceaccounts:create`             | n/a                                                                                     | Update Grafana service accounts.                                                                                                                                                                                    |
+| `serviceaccounts:delete`             | `serviceaccounts:*`                                                                     | Delete Grafana service accounts.                                                                                                                                                                                    |
+| `serviceaccounts:read`               | `serviceaccounts:*`                                                                     | Read Grafana service accounts.                                                                                                                                                                                      |
+| `serviceaccounts.permissions:write`  | `serviceaccounts:*`                                                                     | Update Grafana service account permissions to control who can do what with the service account.                                                                                                                     |
+| `serviceaccounts.permissions:read`   | `serviceaccounts:*`                                                                     | Read Grafana service account permissions to see who can do what with the service account.                                                                                                                           |
+| `settings:read`                      | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Read the [Grafana configuration settings]({{< relref "../../../../setup-grafana/configure-grafana/" >}})                                                                                                            |
+| `settings:write`                     | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Update any Grafana configuration settings that can be [updated at runtime]({{< relref "../../../../setup-grafana/configure-grafana/settings-updates-at-runtime" >}}).                                               |
+| `status:accesscontrol`               | `services:accesscontrol`                                                                | Get access-control enabled status.                                                                                                                                                                                  |
+| `teams.permissions:read`             | `teams:*`<br>`teams:id:*`                                                               | Read members and External Group Synchronization setup for teams.                                                                                                                                                    |
+| `teams.permissions:write`            | `teams:*`<br>`teams:id:*`                                                               | Add, remove and update members and manage External Group Synchronization setup for teams.                                                                                                                           |
+| `teams.roles:add`                    | `permissions:type:delegate`                                                             | Assign a role to a team.                                                                                                                                                                                            |
+| `teams.roles:read`                   | `teams:*`                                                                               | List roles assigned directly to a team.                                                                                                                                                                             |
+| `teams.roles:remove`                 | `permissions:type:delegate`                                                             | Unassign a role from a team.                                                                                                                                                                                        |
+| `teams:create`                       | n/a                                                                                     | Create teams.                                                                                                                                                                                                       |
+| `teams:delete`                       | `teams:*`<br>`teams:id:*`                                                               | Delete one or more teams.                                                                                                                                                                                           |
+| `teams:read`                         | `teams:*`<br>`teams:id:*`                                                               | Read one or more teams and team preferences.                                                                                                                                                                        |
+| `teams:write`                        | `teams:*`<br>`teams:id:*`                                                               | Update one or more teams and team preferences.                                                                                                                                                                      |
+| `users.authtoken:read`               | `global.users:*` <br> `global.users:id:*`                                               | List authentication tokens that are assigned to a user.                                                                                                                                                             |
+| `users.authtoken:write`              | `global.users:*` <br> `global.users:id:*`                                               | Update authentication tokens that are assigned to a user.                                                                                                                                                           |
+| `users.password:write`               | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s password.                                                                                                                                                                                           |
+| `users.permissions:read`             | `users:*`                                                                               | List permissions of a user.                                                                                                                                                                                         |
+| `users.permissions:write`            | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s organization-level permissions.                                                                                                                                                                     |
+| `users.quotas:read`                  | `global.users:*` <br> `global.users:id:*`                                               | List a user’s quotas.                                                                                                                                                                                               |
+| `users.quotas:write`                 | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s quotas.                                                                                                                                                                                             |
+| `users.roles:add`                    | `permissions:type:delegate`                                                             | Assign a role to a user or a service account.                                                                                                                                                                       |
+| `users.roles:read`                   | `users:*`                                                                               | List roles assigned directly to a user or a service account.                                                                                                                                                        |
+| `users.roles:remove`                 | `permissions:type:delegate`                                                             | Unassign a role from a user or a service account.                                                                                                                                                                   |
+| `users:create`                       | n/a                                                                                     | Create a user.                                                                                                                                                                                                      |
+| `users:delete`                       | `global.users:*` <br> `global.users:id:*`                                               | Delete a user.                                                                                                                                                                                                      |
+| `users:disable`                      | `global.users:*` <br> `global.users:id:*`                                               | Disable a user.                                                                                                                                                                                                     |
+| `users:enable`                       | `global.users:*` <br> `global.users:id:*`                                               | Enable a user.                                                                                                                                                                                                      |
+| `users:logout`                       | `global.users:*` <br> `global.users:id:*`                                               | Sign out a user.                                                                                                                                                                                                    |
+| `users:read`                         | `global.users:*`                                                                        | Read or search user profiles.                                                                                                                                                                                       |
+| `users:write`                        | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s profile.                                                                                                                                                                                            |
 
 ### Grafana OnCall action definitions (beta)
 
@@ -194,7 +194,7 @@ The following list contains role-based access control scopes.
 | `apikeys:*`<br>`apikeys:id:*`                   | Restrict an action to a set of API keys. For example, `apikeys:*` matches any API key, `apikey:id:1` matches the API key whose id is `1`.                                                                                                          |
 | `dashboards:*`<br>`dashboards:uid:*`            | Restrict an action to a set of dashboards. For example, `dashboards:*` matches any dashboard, and `dashboards:uid:1` matches the dashboard whose UID is `1`.                                                                                       |
 | `datasources:*`<br>`datasources:uid:*`          | Restrict an action to a set of data sources. For example, `datasources:*` matches any data source, and `datasources:uid:1` matches the data source whose UID is `1`.                                                                               |
-| `folders:*`<br>`folders:uid:*`                  | Restrict an action to a set of folders. For example, `folders:*` matches any folder, and `folders:uid:1` matches the folder whose UID is `1`.                                                                                                      |
+| `folders:*`<br>`folders:uid:*`                  | Restrict an action to a set of folders. For example, `folders:*` matches any folder, and `folders:uid:1` matches the folder whose UID is `1`. Note that permissions granted to a folder cascade down to subfolders located under it                |
 | `global.users:*` <br> `global.users:id:*`       | Restrict an action to a set of global users. For example, `global.users:*` matches any user and `global.users:id:1` matches the user whose ID is `1`.                                                                                              |
 | `orgs:*` <br> `orgs:id:*`                       | Restrict an action to a set of organizations. For example, `orgs:*` matches any organization and `orgs:id:1` matches the organization whose ID is `1`.                                                                                             |
 | `permissions:type:delegate`                     | The scope is only applicable for roles associated with the Access Control itself and indicates that you can delegate your permissions only, or a subset of it, by creating a new role or making an assignment.                                     |
diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
index 156230fe3e7..5816de6580d 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
@@ -61,9 +61,9 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:datasources:writer`             | All permissions from `fixed:datasources:reader` and <br>`datasources:create`<br>`datasources:write`<br>`datasources:delete`                                                                                                                                          | Read, query, create, delete, or update a data source.                                                                                                                                                                                                                                 |
 | `fixed:folders.permissions:reader`     | `folders.permissions:read`                                                                                                                                                                                                                                           | Read all folder permissions.                                                                                                                                                                                                                                                          |
 | `fixed:folders.permissions:writer`     | All permissions from `fixed:folders.permissions:reader` and <br>`folders.permissions:write`                                                                                                                                                                          | Read and update all folder permissions.                                                                                                                                                                                                                                               |
-| `fixed:folders:creator`                | `folders:create`                                                                                                                                                                                                                                                     | Create folders.                                                                                                                                                                                                                                                                       |
+| `fixed:folders:creator`                | `folders:create`                                                                                                                                                                                                                                                     | Create folders in the root level. If granted together with `folders:write` permission, also allows creating subfolders under all folders.                                                                                                                                             |
 | `fixed:folders:reader`                 | `folders:read`<br>`dashboards:read`                                                                                                                                                                                                                                  | Read all folders and dashboards.                                                                                                                                                                                                                                                      |
-| `fixed:folders:writer`                 | All permissions from `fixed:dashboards:writer` and <br>`folders:read`<br>`folders:write`<br>`folders:create`<br>`folders:delete`<br>`folders.permissions:read`<br>`folders.permissions:write`                                                                        | Read, create, update, and delete all folders and dashboards.                                                                                                                                                                                                                          |
+| `fixed:folders:writer`                 | All permissions from `fixed:dashboards:writer` and <br>`folders:read`<br>`folders:write`<br>`folders:create`<br>`folders:delete`<br>`folders.permissions:read`<br>`folders.permissions:write`                                                                        | Read, create, update, and delete all folders and dashboards. If granted together with `fixed:folders:creator`, allows creating subfolders under all folders.                                                                                                                          |
 | `fixed:ldap:reader`                    | `ldap.user:read`<br>`ldap.status:read`                                                                                                                                                                                                                               | Read the LDAP configuration and LDAP status information.                                                                                                                                                                                                                              |
 | `fixed:ldap:writer`                    | All permissions from `fixed:ldap:reader` and <br>`ldap.user:sync`<br>`ldap.config:reload`                                                                                                                                                                            | Read and update the LDAP configuration, and read LDAP status information.                                                                                                                                                                                                             |
 | `fixed:licensing:reader`               | `licensing:read`<br>`licensing.reports:read`                                                                                                                                                                                                                         | Read licensing information and licensing reports.                                                                                                                                                                                                                                     |
diff --git a/docs/sources/administration/user-management/manage-dashboard-permissions/index.md b/docs/sources/administration/user-management/manage-dashboard-permissions/index.md
index 47b17d4f9ac..fe2458c0c0c 100644
--- a/docs/sources/administration/user-management/manage-dashboard-permissions/index.md
+++ b/docs/sources/administration/user-management/manage-dashboard-permissions/index.md
@@ -8,13 +8,13 @@ weight: 500
 
 # Manage dashboard permissions
 
-Dashboard and dasboard folder permissions enable you to grant a viewer the ability to edit and save dashboard changes, or limit an editor's permission to modify a dashboard.
+Dashboard and folder permissions enable you to grant a viewer the ability to edit and save dashboard changes, or limit an editor's permission to modify a dashboard.
 
 For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../../roles-and-permissions/#dashboard-permissions" >}}).
 
-## Grant dashboard folder permissions
+## Grant folder permissions
 
-When you grant user permissions for folders, that setting applies to all dashboards contained in the folder. Consider using this approach to assigning dashboard permissions when you have users or teams who require access to groups of related dashboards.
+When you grant user permissions for folders, that setting applies to all dashboards and subfolders contained in the folder. Consider using this approach to assigning dashboard and folder permissions when you have users or teams who require access to groups of related dashboards or folders.
 
 ### Before you begin
 
@@ -33,13 +33,13 @@ When you grant user permissions for folders, that setting applies to all dashboa
 
 ## Grant dashboard permissions
 
-When you grant dashboard folder permissions, that setting applies to all dashboards in the folder. For a more granular approach to assigning permissions, you can also assign user permissions to individual dashboards.
+When you grant folder permissions, that setting applies to all dashboards and subfolders in the folder. For a more granular approach to assigning permissions, you can also assign user permissions to individual dashboards.
 
 For example, if a user with the viewer organization role requires editor (or admin) access to a dashboard, you can assign those elevated permissions on an individual basis.
 
 > **Note**: If you have assigned a user dashboard folder permissions, you cannot also assign the user permission to dashboards contained in the folder.
 
-Grant dashboard permissions when you want to restrict or enhance dashboard access for users who do not have permissions defined in the associated dashboard folder.
+Grant dashboard permissions when you want to restrict or enhance dashboard access for users who do not have permissions defined in the associated folder.
 
 ### Before you begin
 
@@ -102,7 +102,7 @@ Edit dashboard permissions when you are want to enhance or restrict a user's acc
 Grafana applies the highest permission a given user has to access a resource like a dashboard, so if you want to prevent a user from accessing a folder or dashboard you need to consider the user's organization role, folder permissions, and dashboard permissions.
 
 - You cannot override organization administrator permissions. Organization administrators have access to all organization resources.
-- User permissions set for a dashboard folder propagate to dashboards contained in the folder.
+- User permissions set for a folder propagate to all dashboards and subfolders contained in a folder. Permissions also cascade down to all dashboards and folders under the subfolders, and so on.
 - A lower permission level does not affect access if a more general rule exists with a higher permission.
 
 Refer to the following examples to understand how organization and dashboard permissions impact a user's access to dashboards.
@@ -141,4 +141,14 @@ Dashboard permissions settings:
 
 Result: You receive an error message that cannot override a higher permission with a lower permission in the same dashboard. User1 has administrator permissions.
 
+### Example 4
+
+In this example, user1 has the viewer organization role.
+
+Folder permissions settings:
+
+- user1 is set to `edit`, which is inherited from the permissions set in grandparent folder
+
+Result: User1 has editor permissions for the folder because user1 has permissions on a folder that contains this folder.
+
 > Refer to [Role-based access Control]({{< relref "../../roles-and-permissions/access-control/" >}}) in Grafana Enterprise to understand how to use RBAC permissions to restrict access to dashboards, folders, administrative functions, and other resources.
diff --git a/docs/sources/developers/http_api/folder.md b/docs/sources/developers/http_api/folder.md
index 860513fbb8b..e4525e632d5 100644
--- a/docs/sources/developers/http_api/folder.md
+++ b/docs/sources/developers/http_api/folder.md
@@ -135,9 +135,12 @@ Creates a new folder.
 
 See note in the [introduction]({{< ref "#folder-api" >}}) for an explanation.
 
-| Action           | Scope |
-| ---------------- | ----- |
-| `folders:create` | n/a   |
+`folders:create` allows creating folders in the root level. To create a subfolder, `folders:write` scoped to the parent folder is required in addition to `folders:create`.
+
+| Action           | Scope       |
+| ---------------- | ----------- |
+| `folders:create` | n/a         |
+| `folders:write`  | `folders:*` |
 
 **Example Request**:
 

From 6522bb377e1bc4b64fe0aebd7e34ec2111859e11 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Fri, 21 Apr 2023 11:31:24 +0100
Subject: [PATCH 312/729] Tracing: Rename feature toggle (#66833)

Rename feature toggle so something more specific so new work can use older feature toggle name
---
 docs/sources/datasources/jaeger/_index.md     |   2 +-
 docs/sources/datasources/tempo/_index.md      |   2 +-
 docs/sources/datasources/zipkin/_index.md     |   2 +-
 docs/sources/explore/trace-integration.md     |   2 +-
 .../feature-toggles/index.md                  |   2 +-
 .../src/types/featureToggles.gen.ts           |   2 +-
 pkg/services/featuremgmt/registry.go          |   4 +-
 pkg/services/featuremgmt/toggles_gen.csv      |   2 +-
 pkg/services/featuremgmt/toggles_gen.go       |   6 +-
 .../features/explore/TraceView/TraceView.tsx  |  24 ++--
 .../explore/TraceView/TraceViewContainer.tsx  |   4 +-
 .../NewTracePageHeader.test.tsx               |   2 +-
 .../explore/TraceView/components/index.ts     |   2 +-
 .../components/utils/filter-spans.test.ts     | 130 ++++++++++--------
 .../components/utils/filter-spans.tsx         |   4 +-
 .../explore/TraceView/useSearch.test.ts       |  10 +-
 .../features/explore/TraceView/useSearch.ts   |  14 +-
 .../app/plugins/panel/traces/TracesPanel.tsx  |   2 +-
 18 files changed, 120 insertions(+), 96 deletions(-)

diff --git a/docs/sources/datasources/jaeger/_index.md b/docs/sources/datasources/jaeger/_index.md
index 091e8934989..7d26e429ec4 100644
--- a/docs/sources/datasources/jaeger/_index.md
+++ b/docs/sources/datasources/jaeger/_index.md
@@ -295,7 +295,7 @@ If the file has multiple traces, Grafana visualizes its first trace.
 
 ## Span Filters
 
-> **Note:** This feature is behind the `newTraceView` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
+> **Note:** This feature is behind the `newTraceViewHeader` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
 > If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
 
 ![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters.png)
diff --git a/docs/sources/datasources/tempo/_index.md b/docs/sources/datasources/tempo/_index.md
index 820f9bbe4db..3a3dd770f96 100644
--- a/docs/sources/datasources/tempo/_index.md
+++ b/docs/sources/datasources/tempo/_index.md
@@ -359,7 +359,7 @@ To open a query in Tempo with the span name of that row automatically set in the
 
 ## Span Filters
 
-> **Note:** This feature is behind the `newTraceView` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
+> **Note:** This feature is behind the `newTraceViewHeader` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
 > If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
 
 ![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters.png)
diff --git a/docs/sources/datasources/zipkin/_index.md b/docs/sources/datasources/zipkin/_index.md
index c3de7290d6e..308552fe7fa 100644
--- a/docs/sources/datasources/zipkin/_index.md
+++ b/docs/sources/datasources/zipkin/_index.md
@@ -264,7 +264,7 @@ If the file has multiple traces, Grafana visualizes its first trace.
 
 ## Span Filters
 
-> **Note:** This feature is behind the `newTraceView` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
+> **Note:** This feature is behind the `newTraceViewHeader` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
 > If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
 
 ![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters.png)
diff --git a/docs/sources/explore/trace-integration.md b/docs/sources/explore/trace-integration.md
index 69b1e90231f..15f743d58ca 100644
--- a/docs/sources/explore/trace-integration.md
+++ b/docs/sources/explore/trace-integration.md
@@ -42,7 +42,7 @@ Shows condensed view or the trace timeline. Drag your mouse over the minimap to
 
 ### Span Filters
 
-> **Note:** This feature is behind the `newTraceView` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
+> **Note:** This feature is behind the `newTraceViewHeader` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}).
 > If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
 
 ![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters.png)
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index b0cb06aab05..a4b50479e7c 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -70,7 +70,7 @@ Alpha features might be changed or removed without prior notice.
 | `publicDashboardsEmailSharing`     | Enables public dashboard sharing to be restricted to only allowed emails                                                                                                                            |
 | `lokiLive`                         | Support WebSocket streaming for loki (early prototype)                                                                                                                                              |
 | `storage`                          | Configurable storage for dashboards, datasources, and resources                                                                                                                                     |
-| `newTraceView`                     | Shows the new trace view design                                                                                                                                                                     |
+| `newTraceViewHeader`               | Shows the new trace view header                                                                                                                                                                     |
 | `datasourceQueryMultiStatus`       | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                    |
 | `traceToMetrics`                   | Enable trace to metrics links                                                                                                                                                                       |
 | `prometheusWideSeries`             | Enable wide series responses in the Prometheus datasource                                                                                                                                           |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index e31c4cca901..9eedfbb439f 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -33,7 +33,7 @@ export interface FeatureToggles {
   storage?: boolean;
   k8s?: boolean;
   exploreMixedDatasource?: boolean;
-  newTraceView?: boolean;
+  newTraceViewHeader?: boolean;
   correlations?: boolean;
   cloudWatchDynamicLabels?: boolean;
   datasourceQueryMultiStatus?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index ebbf9866eaf..89e93e6d614 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -105,8 +105,8 @@ var (
 			Owner:        grafanaExploreSquad,
 		},
 		{
-			Name:         "newTraceView",
-			Description:  "Shows the new trace view design",
+			Name:         "newTraceViewHeader",
+			Description:  "Shows the new trace view header",
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityTracesAndProfilingSquad,
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 6ff2620cad0..d9c0df0a89b 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -14,7 +14,7 @@ migrationLocking,beta,@grafana/backend-platform,false,false,false,false
 storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
 k8s,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
 exploreMixedDatasource,beta,@grafana/explore-squad,false,false,false,true
-newTraceView,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
+newTraceViewHeader,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
 correlations,beta,@grafana/explore-squad,false,false,false,false
 cloudWatchDynamicLabels,stable,@grafana/aws-plugins,false,false,false,false
 datasourceQueryMultiStatus,alpha,@grafana/plugins-platform-backend,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index f5bcadbce47..d3defd21235 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -67,9 +67,9 @@ const (
 	// Enable mixed datasource in Explore
 	FlagExploreMixedDatasource = "exploreMixedDatasource"
 
-	// FlagNewTraceView
-	// Shows the new trace view design
-	FlagNewTraceView = "newTraceView"
+	// FlagNewTraceViewHeader
+	// Shows the new trace view header
+	FlagNewTraceViewHeader = "newTraceViewHeader"
 
 	// FlagCorrelations
 	// Correlations page
diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index 5e9a44b5873..1d2c655f79a 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -41,7 +41,7 @@ import { createSpanLinkFactory } from './createSpanLink';
 import { useChildrenState } from './useChildrenState';
 import { useDetailState } from './useDetailState';
 import { useHoverIndentGuide } from './useHoverIndentGuide';
-import { useSearchNewTraceView } from './useSearch';
+import { useSearchNewTraceViewHeader } from './useSearch';
 import { useViewRange } from './useViewRange';
 
 const getStyles = (theme: GrafanaTheme2) => ({
@@ -94,8 +94,10 @@ export function TraceView(props: Props) {
   const { removeHoverIndentGuideId, addHoverIndentGuideId, hoverIndentGuideIds } = useHoverIndentGuide();
   const { viewRange, updateViewRangeTime, updateNextViewRangeTime } = useViewRange();
   const { expandOne, collapseOne, childrenToggle, collapseAll, childrenHiddenIDs, expandAll } = useChildrenState();
-  const { newTraceViewSearch, setNewTraceViewSearch, spanFilterMatches } = useSearchNewTraceView(traceProp?.spans);
-  const [newTraceViewFocusedSpanIdForSearch, setNewTraceViewFocusedSpanIdForSearch] = useState('');
+  const { newTraceViewHeaderSearch, setNewTraceViewHeaderSearch, spanFilterMatches } = useSearchNewTraceViewHeader(
+    traceProp?.spans
+  );
+  const [newTraceViewHeaderFocusedSpanIdForSearch, setNewTraceViewHeaderFocusedSpanIdForSearch] = useState('');
   const [showSpanFilters, setShowSpanFilters] = useToggle(false);
   const [headerHeight, setHeaderHeight] = useState(0);
 
@@ -152,17 +154,17 @@ export function TraceView(props: Props) {
     <>
       {props.dataFrames?.length && traceProp ? (
         <>
-          {config.featureToggles.newTraceView ? (
+          {config.featureToggles.newTraceViewHeader ? (
             <>
               <NewTracePageHeader
                 trace={traceProp}
                 timeZone={timeZone}
-                search={newTraceViewSearch}
-                setSearch={setNewTraceViewSearch}
+                search={newTraceViewHeaderSearch}
+                setSearch={setNewTraceViewHeaderSearch}
                 showSpanFilters={showSpanFilters}
                 setShowSpanFilters={setShowSpanFilters}
-                focusedSpanIdForSearch={newTraceViewFocusedSpanIdForSearch}
-                setFocusedSpanIdForSearch={setNewTraceViewFocusedSpanIdForSearch}
+                focusedSpanIdForSearch={newTraceViewHeaderFocusedSpanIdForSearch}
+                setFocusedSpanIdForSearch={setNewTraceViewHeaderFocusedSpanIdForSearch}
                 spanFilterMatches={spanFilterMatches}
                 datasourceType={datasourceType}
                 setHeaderHeight={setHeaderHeight}
@@ -186,7 +188,7 @@ export function TraceView(props: Props) {
           <TraceTimelineViewer
             registerAccessors={noop}
             scrollToFirstVisibleSpan={noop}
-            findMatchesIDs={config.featureToggles.newTraceView ? spanFilterMatches : spanFindMatches}
+            findMatchesIDs={config.featureToggles.newTraceViewHeader ? spanFilterMatches : spanFindMatches}
             trace={traceProp}
             datasourceType={datasourceType}
             spanBarOptions={spanBarOptions?.spanBar}
@@ -220,7 +222,9 @@ export function TraceView(props: Props) {
             scrollElement={scrollElement}
             focusedSpanId={focusedSpanId}
             focusedSpanIdForSearch={
-              config.featureToggles.newTraceView ? newTraceViewFocusedSpanIdForSearch : props.focusedSpanIdForSearch!
+              config.featureToggles.newTraceViewHeader
+                ? newTraceViewHeaderFocusedSpanIdForSearch
+                : props.focusedSpanIdForSearch!
             }
             createFocusSpanLink={createFocusSpanLink}
             topOfViewRef={topOfViewRef}
diff --git a/public/app/features/explore/TraceView/TraceViewContainer.tsx b/public/app/features/explore/TraceView/TraceViewContainer.tsx
index feb8df59faf..b11e1d4263d 100644
--- a/public/app/features/explore/TraceView/TraceViewContainer.tsx
+++ b/public/app/features/explore/TraceView/TraceViewContainer.tsx
@@ -33,7 +33,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: flex;
     flex-direction: column;
     flex: 1 1 0;
-    padding: ${config.featureToggles.newTraceView ? 0 : theme.spacing(theme.components.panel.padding)};
+    padding: ${config.featureToggles.newTraceViewHeader ? 0 : theme.spacing(theme.components.panel.padding)};
   `,
 });
 
@@ -57,7 +57,7 @@ export function TraceViewContainer(props: Props) {
 
   return (
     <div className={style.container}>
-      {!config.featureToggles.newTraceView && (
+      {!config.featureToggles.newTraceViewHeader && (
         <TracePageSearchBar
           navigable={true}
           searchValue={search}
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
index d68935d294b..64db99647b1 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
@@ -42,7 +42,7 @@ const setup = () => {
 
 describe('NewTracePageHeader test', () => {
   it('should render the new trace header', () => {
-    config.featureToggles.newTraceView = true;
+    config.featureToggles.newTraceViewHeader = true;
     setup();
 
     const header = document.querySelector('header');
diff --git a/public/app/features/explore/TraceView/components/index.ts b/public/app/features/explore/TraceView/components/index.ts
index 334855a9ebc..5412992f8d8 100644
--- a/public/app/features/explore/TraceView/components/index.ts
+++ b/public/app/features/explore/TraceView/components/index.ts
@@ -6,5 +6,5 @@ export * from './types';
 export * from './TraceTimelineViewer/types';
 export { default as DetailState } from './TraceTimelineViewer/SpanDetail/DetailState';
 export { default as transformTraceData } from './model/transform-trace-data';
-export { filterSpansNewTraceView, filterSpans } from './utils/filter-spans';
+export { filterSpansNewTraceViewHeader, filterSpans } from './utils/filter-spans';
 export * from './Theme';
diff --git a/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts b/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
index 65fe9d37d88..ed733b88a4c 100644
--- a/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
+++ b/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
@@ -15,7 +15,7 @@
 import { defaultFilters, defaultTagFilter } from '../../useSearch';
 import { TraceSpan } from '../types';
 
-import { filterSpans, filterSpansNewTraceView } from './filter-spans';
+import { filterSpans, filterSpansNewTraceViewHeader } from './filter-spans';
 
 describe('filterSpans', () => {
   // span0 contains strings that end in 0 or 1
@@ -110,46 +110,51 @@ describe('filterSpans', () => {
   const spans = [span0, span2] as TraceSpan[];
 
   it('should return `undefined` if spans is falsy', () => {
-    expect(filterSpansNewTraceView({ ...defaultFilters, spanName: 'operationName' }, null)).toBe(undefined);
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, spanName: 'operationName' }, null)).toBe(undefined);
   });
 
   // Service / span name
   it('should return spans whose serviceName match a filter', () => {
-    expect(filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName0' }, spans)).toEqual(
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, serviceName: 'serviceName0' }, spans)).toEqual(
       new Set([spanID0])
     );
-    expect(filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName2' }, spans)).toEqual(
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, serviceName: 'serviceName2' }, spans)).toEqual(
       new Set([spanID2])
     );
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName2', serviceNameOperator: '!=' }, spans)
+      filterSpansNewTraceViewHeader(
+        { ...defaultFilters, serviceName: 'serviceName2', serviceNameOperator: '!=' },
+        spans
+      )
     ).toEqual(new Set([spanID0]));
   });
 
   it('should return spans whose operationName match a filter', () => {
-    expect(filterSpansNewTraceView({ ...defaultFilters, spanName: 'operationName0' }, spans)).toEqual(
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, spanName: 'operationName0' }, spans)).toEqual(
       new Set([spanID0])
     );
-    expect(filterSpansNewTraceView({ ...defaultFilters, spanName: 'operationName2' }, spans)).toEqual(
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, spanName: 'operationName2' }, spans)).toEqual(
       new Set([spanID2])
     );
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, spanName: 'operationName2', spanNameOperator: '!=' }, spans)
+      filterSpansNewTraceViewHeader({ ...defaultFilters, spanName: 'operationName2', spanNameOperator: '!=' }, spans)
     ).toEqual(new Set([spanID0]));
   });
 
   // Durations
   it('should return spans whose duration match a filter', () => {
-    expect(filterSpansNewTraceView({ ...defaultFilters, from: '2ms' }, spans)).toEqual(new Set([spanID0, spanID2]));
-    expect(filterSpansNewTraceView({ ...defaultFilters, from: '3.05ms' }, spans)).toEqual(new Set([spanID2]));
-    expect(filterSpansNewTraceView({ ...defaultFilters, from: '3.05ms', fromOperator: '>=' }, spans)).toEqual(
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, from: '2ms' }, spans)).toEqual(
+      new Set([spanID0, spanID2])
+    );
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, from: '3.05ms' }, spans)).toEqual(new Set([spanID2]));
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, from: '3.05ms', fromOperator: '>=' }, spans)).toEqual(
       new Set([spanID0, spanID2])
     );
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, from: '3.05ms', fromOperator: '>=', to: '4ms' }, spans)
+      filterSpansNewTraceViewHeader({ ...defaultFilters, from: '3.05ms', fromOperator: '>=', to: '4ms' }, spans)
     ).toEqual(new Set([spanID0]));
-    expect(filterSpansNewTraceView({ ...defaultFilters, to: '4ms' }, spans)).toEqual(new Set([spanID0]));
-    expect(filterSpansNewTraceView({ ...defaultFilters, to: '5ms', toOperator: '<=' }, spans)).toEqual(
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, to: '4ms' }, spans)).toEqual(new Set([spanID0]));
+    expect(filterSpansNewTraceViewHeader({ ...defaultFilters, to: '5ms', toOperator: '<=' }, spans)).toEqual(
       new Set([spanID0, spanID2])
     );
   });
@@ -157,16 +162,16 @@ describe('filterSpans', () => {
   // Tags
   it('should return spans whose tags kv.key match a filter', () => {
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1' }] }, spans)
+      filterSpansNewTraceViewHeader({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1' }] }, spans)
     ).toEqual(new Set([spanID0, spanID2]));
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey0' }] }, spans)
+      filterSpansNewTraceViewHeader({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey0' }] }, spans)
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey2' }] }, spans)
+      filterSpansNewTraceViewHeader({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey2' }] }, spans)
     ).toEqual(new Set([spanID2]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey2', operator: '!=' }] },
         spans
       )
@@ -175,16 +180,25 @@ describe('filterSpans', () => {
 
   it('should return spans whose process.tags kv.key match a filter', () => {
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey1' }] }, spans)
+      filterSpansNewTraceViewHeader(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey1' }] },
+        spans
+      )
     ).toEqual(new Set([spanID0, spanID2]));
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey0' }] }, spans)
+      filterSpansNewTraceViewHeader(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey0' }] },
+        spans
+      )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey2' }] }, spans)
+      filterSpansNewTraceViewHeader(
+        { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey2' }] },
+        spans
+      )
     ).toEqual(new Set([spanID2]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'processTagKey2', operator: '!=' }] },
         spans
       )
@@ -193,16 +207,16 @@ describe('filterSpans', () => {
 
   it('should return spans whose logs have a field whose kv.key match a filter', () => {
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey1' }] }, spans)
+      filterSpansNewTraceViewHeader({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey1' }] }, spans)
     ).toEqual(new Set([spanID0, spanID2]));
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey0' }] }, spans)
+      filterSpansNewTraceViewHeader({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey0' }] }, spans)
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey2' }] }, spans)
+      filterSpansNewTraceViewHeader({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey2' }] }, spans)
     ).toEqual(new Set([spanID2]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey2', operator: '!=' }] },
         spans
       )
@@ -212,7 +226,7 @@ describe('filterSpans', () => {
   it('should return no spans when logs is null', () => {
     const nullSpan = { ...span0, logs: null };
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey1' }] }, [
+      filterSpansNewTraceViewHeader({ ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'logFieldKey1' }] }, [
         nullSpan,
       ] as unknown as TraceSpan[])
     ).toEqual(new Set([]));
@@ -220,13 +234,13 @@ describe('filterSpans', () => {
 
   it("should return spans whose tags' kv.key and kv.value match a filter", () => {
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1' }] },
         spans
       )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1', operator: '!=' }] },
         spans
       )
@@ -235,19 +249,19 @@ describe('filterSpans', () => {
 
   it("should not return spans whose tags' kv.key match a filter but kv.value/operator does not match", () => {
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1', operator: '!=' }] },
         spans
       )
     ).toEqual(new Set());
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey2', operator: '!=' }] },
         spans
       )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, tags: [{ ...defaultTagFilter, key: 'tagKey1', value: 'tagValue1', operator: '!=' }] },
         spans
       )
@@ -257,7 +271,7 @@ describe('filterSpans', () => {
   it('should return spans with multiple tag filters', () => {
     // tags in same span
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -269,7 +283,7 @@ describe('filterSpans', () => {
       )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -281,7 +295,7 @@ describe('filterSpans', () => {
       )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -295,7 +309,7 @@ describe('filterSpans', () => {
 
     // tags in different spans
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -307,7 +321,7 @@ describe('filterSpans', () => {
       )
     ).toEqual(new Set());
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -321,7 +335,7 @@ describe('filterSpans', () => {
 
     // values in different spans
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -333,7 +347,7 @@ describe('filterSpans', () => {
       )
     ).toEqual(new Set());
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -345,7 +359,7 @@ describe('filterSpans', () => {
       )
     ).toEqual(new Set());
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -357,7 +371,7 @@ describe('filterSpans', () => {
       )
     ).toEqual(new Set());
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           tags: [
@@ -374,13 +388,19 @@ describe('filterSpans', () => {
   it('should return spans with multiple filters', () => {
     // service name + span name
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName0' }, spans)
+      filterSpansNewTraceViewHeader(
+        { ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName0' },
+        spans
+      )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView({ ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName2' }, spans)
+      filterSpansNewTraceViewHeader(
+        { ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName2' },
+        spans
+      )
     ).toEqual(new Set([]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName2', spanNameOperator: '!=' },
         spans
       )
@@ -388,19 +408,19 @@ describe('filterSpans', () => {
 
     // service name + span name + duration
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName0', from: '2ms' },
         spans
       )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, serviceName: 'serviceName0', spanName: 'operationName0', to: '2ms' },
         spans
       )
     ).toEqual(new Set([]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, serviceName: 'serviceName2', spanName: 'operationName2', to: '6ms' },
         spans
       )
@@ -408,31 +428,31 @@ describe('filterSpans', () => {
 
     // service name + tag key
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, serviceName: 'serviceName0', tags: [{ ...defaultTagFilter, key: 'tagKey0' }] },
         spans
       )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, serviceName: 'serviceName0', tags: [{ ...defaultTagFilter, key: 'tagKey1' }] },
         spans
       )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, serviceName: 'serviceName2', tags: [{ ...defaultTagFilter, key: 'tagKey1' }] },
         spans
       )
     ).toEqual(new Set([spanID2]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, serviceName: 'serviceName2', tags: [{ ...defaultTagFilter, key: 'tagKey2' }] },
         spans
       )
     ).toEqual(new Set([spanID2]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           serviceName: 'serviceName0',
@@ -444,13 +464,13 @@ describe('filterSpans', () => {
 
     // duration + tag
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, from: '2ms', tags: [{ ...defaultTagFilter, key: 'tagKey0' }] },
         spans
       )
     ).toEqual(new Set([spanID0]));
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         { ...defaultFilters, to: '5ms', toOperator: '<=', tags: [{ ...defaultTagFilter, key: 'tagKey2' }] },
         spans
       )
@@ -458,7 +478,7 @@ describe('filterSpans', () => {
 
     // all
     expect(
-      filterSpansNewTraceView(
+      filterSpansNewTraceViewHeader(
         {
           ...defaultFilters,
           serviceName: 'serviceName0',
diff --git a/public/app/features/explore/TraceView/components/utils/filter-spans.tsx b/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
index a9e5c5be92c..e3d4735c769 100644
--- a/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
+++ b/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
@@ -17,7 +17,7 @@ import { TNil, TraceKeyValuePair, TraceSpan } from '../types';
 
 // filter spans where all filters added need to be true for each individual span that is returned
 // i.e. the more filters added -> the more specific that the returned results are
-export function filterSpansNewTraceView(searchProps: SearchProps, spans: TraceSpan[] | TNil) {
+export function filterSpansNewTraceViewHeader(searchProps: SearchProps, spans: TraceSpan[] | TNil) {
   if (!spans) {
     return undefined;
   }
@@ -151,7 +151,7 @@ export const convertTimeFilter = (time: string) => {
   return undefined;
 };
 
-// legacy code that will be removed when the newTraceView feature flag is removed
+// legacy code that will be removed when the Header feature flag is removed
 export function filterSpans(textFilter: string, spans: TraceSpan[] | TNil) {
   if (!spans) {
     return undefined;
diff --git a/public/app/features/explore/TraceView/useSearch.test.ts b/public/app/features/explore/TraceView/useSearch.test.ts
index e144f8fa733..683de3c11fe 100644
--- a/public/app/features/explore/TraceView/useSearch.test.ts
+++ b/public/app/features/explore/TraceView/useSearch.test.ts
@@ -1,7 +1,7 @@
 import { act, renderHook } from '@testing-library/react';
 
 import { TraceSpan } from './components';
-import { defaultFilters, useSearch, useSearchNewTraceView } from './useSearch';
+import { defaultFilters, useSearch, useSearchNewTraceViewHeader } from './useSearch';
 
 describe('useSearch', () => {
   const spans = [
@@ -28,15 +28,15 @@ describe('useSearch', () => {
   ];
 
   it('returns matching span IDs', async () => {
-    const { result } = renderHook(() => useSearchNewTraceView(spans));
-    act(() => result.current.setNewTraceViewSearch({ ...defaultFilters, serviceName: 'service1' }));
+    const { result } = renderHook(() => useSearchNewTraceViewHeader(spans));
+    act(() => result.current.setNewTraceViewHeaderSearch({ ...defaultFilters, serviceName: 'service1' }));
     expect(result.current.spanFilterMatches?.size).toBe(1);
     expect(result.current.spanFilterMatches?.has('span1')).toBe(true);
   });
 
   it('works without spans', async () => {
-    const { result } = renderHook(() => useSearchNewTraceView());
-    act(() => result.current.setNewTraceViewSearch({ ...defaultFilters, serviceName: 'service1' }));
+    const { result } = renderHook(() => useSearchNewTraceViewHeader());
+    act(() => result.current.setNewTraceViewHeaderSearch({ ...defaultFilters, serviceName: 'service1' }));
     expect(result.current.spanFilterMatches).toBe(undefined);
   });
 
diff --git a/public/app/features/explore/TraceView/useSearch.ts b/public/app/features/explore/TraceView/useSearch.ts
index 2339f8a246a..a67327eb72e 100644
--- a/public/app/features/explore/TraceView/useSearch.ts
+++ b/public/app/features/explore/TraceView/useSearch.ts
@@ -1,7 +1,7 @@
 import { useMemo, useState } from 'react';
 import { v4 as uuidv4 } from 'uuid';
 
-import { filterSpansNewTraceView, filterSpans, TraceSpan } from './components';
+import { filterSpansNewTraceViewHeader, filterSpans, TraceSpan } from './components';
 
 export interface SearchProps {
   serviceName?: string;
@@ -41,16 +41,16 @@ export const defaultFilters = {
  * Controls the state of search input that highlights spans if they match the search string.
  * @param spans
  */
-export function useSearchNewTraceView(spans?: TraceSpan[]) {
-  const [newTraceViewSearch, setNewTraceViewSearch] = useState<SearchProps>(defaultFilters);
+export function useSearchNewTraceViewHeader(spans?: TraceSpan[]) {
+  const [newTraceViewHeaderSearch, setNewTraceViewHeaderSearch] = useState<SearchProps>(defaultFilters);
   const spanFilterMatches: Set<string> | undefined = useMemo(() => {
-    return spans && filterSpansNewTraceView(newTraceViewSearch, spans);
-  }, [newTraceViewSearch, spans]);
+    return spans && filterSpansNewTraceViewHeader(newTraceViewHeaderSearch, spans);
+  }, [newTraceViewHeaderSearch, spans]);
 
-  return { newTraceViewSearch, setNewTraceViewSearch, spanFilterMatches };
+  return { newTraceViewHeaderSearch, setNewTraceViewHeaderSearch, spanFilterMatches };
 }
 
-// legacy code that will be removed when the newTraceView feature flag is removed
+// legacy code that will be removed when the newTraceViewHeader feature flag is removed
 export function useSearch(spans?: TraceSpan[]) {
   const [search, setSearch] = useState('');
   const spanFindMatches: Set<string> | undefined = useMemo(() => {
diff --git a/public/app/plugins/panel/traces/TracesPanel.tsx b/public/app/plugins/panel/traces/TracesPanel.tsx
index 46ec26476d9..cd4ed2a644f 100644
--- a/public/app/plugins/panel/traces/TracesPanel.tsx
+++ b/public/app/plugins/panel/traces/TracesPanel.tsx
@@ -39,7 +39,7 @@ export const TracesPanel = ({ data }: PanelProps) => {
   return (
     <div className={styles.wrapper}>
       <div ref={topOfViewRef}></div>
-      {!config.featureToggles.newTraceView ? (
+      {!config.featureToggles.newTraceViewHeader ? (
         <TracePageSearchBar
           navigable={true}
           searchValue={search}

From 0eca9950a013b44e9677ea1dabfee369be1a15aa Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 21 Apr 2023 11:49:58 +0100
Subject: [PATCH 313/729] NestedFolders: Show Tags in Browse Dashboards
 (#67029)

* NestedFolders: Show tags in Browse Dashboards view

* tests
---
 .../components/DashboardsTree.test.tsx        |  2 +
 .../components/DashboardsTree.tsx             | 37 ++++++++++------
 .../browse-dashboards/components/TagsCell.tsx | 27 ++++++++++++
 .../components/customFlexTableLayout.ts       | 44 +++++++++++++++++++
 4 files changed, 96 insertions(+), 14 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/components/TagsCell.tsx
 create mode 100644 public/app/features/browse-dashboards/components/customFlexTableLayout.ts

diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
index 1ac147c290a..42847fc3c2a 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
@@ -2,6 +2,7 @@ import { render as rtlRender, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
+import { assertIsDefined } from 'test/helpers/asserts';
 
 import { wellFormedDashboard, wellFormedEmptyFolder, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
 
@@ -38,6 +39,7 @@ describe('browse-dashboards DashboardsTree', () => {
     );
     expect(screen.queryByText(dashboard.item.title)).toBeInTheDocument();
     expect(screen.queryByText('Dashboard')).toBeInTheDocument();
+    expect(screen.queryByText(assertIsDefined(dashboard.item.tags)[0])).toBeInTheDocument();
   });
 
   it('renders a folder item', () => {
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
index 7f5f58cda59..11cf3529c80 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
@@ -11,7 +11,9 @@ import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/ty
 import { DashboardsTreeItem, DashboardTreeSelection, INDENT_AMOUNT_CSS_VAR } from '../types';
 
 import { NameCell } from './NameCell';
+import { TagsCell } from './TagsCell';
 import { TypeCell } from './TypeCell';
+import { useCustomFlexLayout } from './customFlexTableLayout';
 
 interface DashboardsTreeProps {
   items: DashboardsTreeItem[];
@@ -45,6 +47,7 @@ export function DashboardsTree({
   const tableColumns = useMemo(() => {
     const checkboxColumn: DashboardsTreeColumn = {
       id: 'checkbox',
+      width: 0,
       Header: () => <Checkbox value={false} />,
       Cell: ({ row: { original: row }, selectedItems }: DashboardsTreeCellProps) => {
         const item = row.item;
@@ -65,20 +68,29 @@ export function DashboardsTree({
 
     const nameColumn: DashboardsTreeColumn = {
       id: 'name',
+      width: 3,
       Header: <span style={{ paddingLeft: 20 }}>Name</span>,
       Cell: (props: DashboardsTreeCellProps) => <NameCell {...props} onFolderClick={onFolderClick} />,
     };
 
     const typeColumn: DashboardsTreeColumn = {
       id: 'type',
+      width: 1,
       Header: 'Type',
       Cell: TypeCell,
     };
 
-    return [checkboxColumn, nameColumn, typeColumn];
+    const tagsColumns: DashboardsTreeColumn = {
+      id: 'tags',
+      width: 2,
+      Header: 'Tags',
+      Cell: TagsCell,
+    };
+
+    return [checkboxColumn, nameColumn, typeColumn, tagsColumns];
   }, [onItemSelectionChange, onFolderClick]);
 
-  const table = useTable({ columns: tableColumns, data: items });
+  const table = useTable({ columns: tableColumns, data: items }, useCustomFlexLayout);
   const { getTableProps, getTableBodyProps, headerGroups } = table;
 
   const virtualData = useMemo(() => {
@@ -112,7 +124,6 @@ export function DashboardsTree({
 
       <div {...getTableBodyProps()}>
         <List
-          className="virtual list"
           height={height - HEADER_HEIGHT}
           width={width}
           itemCount={items.length}
@@ -163,8 +174,6 @@ function VirtualListRow({ index, style, data }: VirtualListRowProps) {
 }
 
 const getStyles = (theme: GrafanaTheme2) => {
-  const columnSizing = 'auto 2fr 1fr';
-
   return {
     tableRoot: css({
       // Responsively
@@ -175,17 +184,10 @@ const getStyles = (theme: GrafanaTheme2) => {
       },
     }),
 
-    cell: css({
-      padding: theme.spacing(1),
-      whiteSpace: 'nowrap',
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-    }),
+    // Column flex properties (cell sizing) are set by customFlexTableLayout.ts
 
     row: css({
-      display: 'grid',
-      gridTemplateColumns: columnSizing,
-      alignItems: 'center',
+      gap: theme.spacing(1),
     }),
 
     headerRow: css({
@@ -201,6 +203,13 @@ const getStyles = (theme: GrafanaTheme2) => {
       },
     }),
 
+    cell: css({
+      padding: theme.spacing(1),
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+    }),
+
     link: css({
       '&:hover': {
         textDecoration: 'underline',
diff --git a/public/app/features/browse-dashboards/components/TagsCell.tsx b/public/app/features/browse-dashboards/components/TagsCell.tsx
new file mode 100644
index 00000000000..52c279dce36
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/TagsCell.tsx
@@ -0,0 +1,27 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { CellProps } from 'react-table';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { TagList, useStyles2 } from '@grafana/ui';
+
+import { DashboardsTreeItem } from '../types';
+
+export function TagsCell({ row: { original: data } }: CellProps<DashboardsTreeItem, unknown>) {
+  const styles = useStyles2(getStyles);
+  const item = data.item;
+  if (item.kind === 'ui-empty-folder') {
+    return <></>;
+  }
+
+  return <TagList className={styles.tagList} tags={item.tags ?? []} />;
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    // TagList is annoying and has weird default alignment
+    tagList: css({
+      justifyContent: 'flex-start',
+    }),
+  };
+}
diff --git a/public/app/features/browse-dashboards/components/customFlexTableLayout.ts b/public/app/features/browse-dashboards/components/customFlexTableLayout.ts
new file mode 100644
index 00000000000..0f4f0af1211
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/customFlexTableLayout.ts
@@ -0,0 +1,44 @@
+import { Hooks, UseTableColumnProps } from 'react-table';
+
+/**
+ * Simplified flex layout module for react-table.
+ * Uses the width of the column as the flex grow amount - the ratio of width between all columns
+ *
+ * Width of 0 for 'auto' width - useful for columns of fixed with that should shrink to the size
+ * of content
+ *
+ * Originally based on https://github.com/TanStack/table/blob/v7/src/plugin-hooks/useFlexLayout.js
+ */
+export function useCustomFlexLayout<D extends object>(hooks: Hooks<D>) {
+  hooks.getRowProps.push((props) => [props, getRowStyles()]);
+  hooks.getHeaderGroupProps.push((props) => [props, getRowStyles()]);
+  hooks.getFooterGroupProps.push((props) => [props, getRowStyles()]);
+  hooks.getHeaderProps.push((props, { column }) => [props, getColumnStyleProps(column)]);
+  hooks.getCellProps.push((props, { cell }) => [props, getColumnStyleProps(cell.column)]);
+  hooks.getFooterProps.push((props, { column }) => [props, getColumnStyleProps(column)]);
+}
+
+useCustomFlexLayout.pluginName = 'useCustomFlexLayout';
+
+function getColumnStyleProps<D extends object>(column: UseTableColumnProps<D>) {
+  return {
+    style: {
+      flex:
+        column.totalWidth === 0
+          ? // if width: 0, prevent the column from growing (or shrinking), and set basis to auto to
+            // fit column to the width of its content
+            '0 0 auto'
+          : // Otherwise, grow the content to a size in proportion to the other column widths
+            `${column.totalWidth} 0 0`,
+    },
+  };
+}
+
+function getRowStyles() {
+  return {
+    style: {
+      display: 'flex',
+      flex: '1 0 auto',
+    },
+  };
+}

From b7f047c8ddd5682ea649853ada8d83b778a0959b Mon Sep 17 00:00:00 2001
From: Gabriel MABILLE <gamab@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:03:13 +0200
Subject: [PATCH 314/729] Fix: Hide invite when disabled login form is set
 (#67031)

* FIX: Hide Invite Button with external user management

* Hide also when login form is disabled

* add tests and readability

---------

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
---
 public/app/features/users/UsersActionBar.test.tsx | 15 +++++++++++++++
 public/app/features/users/UsersActionBar.tsx      |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/public/app/features/users/UsersActionBar.test.tsx b/public/app/features/users/UsersActionBar.test.tsx
index d366e61e155..787a44d11d9 100644
--- a/public/app/features/users/UsersActionBar.test.tsx
+++ b/public/app/features/users/UsersActionBar.test.tsx
@@ -2,6 +2,8 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { mockToolkitActionCreator } from 'test/core/redux/mocks';
 
+import { config } from 'app/core/config';
+
 import { Props, UsersActionBarUnconnected } from './UsersActionBar';
 import { searchQueryChanged } from './state/reducers';
 
@@ -62,4 +64,17 @@ describe('Render', () => {
 
     expect(screen.getByRole('link', { name: 'someUrl' })).toHaveAttribute('href', 'some/url');
   });
+
+  it('should not show invite button when disableLoginForm is set', () => {
+    const originalDisableLoginForm = config.disableLoginForm;
+    config.disableLoginForm = true;
+
+    setup({
+      canInvite: true,
+    });
+
+    expect(screen.queryByRole('link', { name: 'Invite' })).not.toBeInTheDocument();
+    // Reset the disableLoginForm mock to its original value
+    config.disableLoginForm = originalDisableLoginForm;
+  });
 });
diff --git a/public/app/features/users/UsersActionBar.tsx b/public/app/features/users/UsersActionBar.tsx
index 24bd045ad7d..e6ea3115f98 100644
--- a/public/app/features/users/UsersActionBar.tsx
+++ b/public/app/features/users/UsersActionBar.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { RadioButtonGroup, LinkButton, FilterInput } from '@grafana/ui';
+import config from 'app/core/config';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction, StoreState } from 'app/types';
 
@@ -48,6 +49,8 @@ export const UsersActionBarUnconnected = ({
     { label: `Pending Invites (${pendingInvitesCount})`, value: 'invites' },
   ];
   const canAddToOrg: boolean = contextSrv.hasAccess(AccessControlAction.OrgUsersAdd, canInvite);
+  // backend rejects invitations if the login form is disabled
+  const showInviteButton: boolean = canAddToOrg && !config.disableLoginForm;
 
   return (
     <div className="page-action-bar" data-testid="users-action-bar">
@@ -63,7 +66,7 @@ export const UsersActionBarUnconnected = ({
           <RadioButtonGroup value={showInvites ? 'invites' : 'users'} options={options} onChange={onShowInvites} />
         </div>
       )}
-      {canAddToOrg && <LinkButton href="org/users/invite">Invite</LinkButton>}
+      {showInviteButton && <LinkButton href="org/users/invite">Invite</LinkButton>}
       {externalUserMngLinkUrl && (
         <LinkButton href={externalUserMngLinkUrl} target="_blank" rel="noopener">
           {externalUserMngLinkName}

From 1d0387dcc2d1cfdae2bb55f0e1a98c6d54fe9067 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 21 Apr 2023 12:17:04 +0100
Subject: [PATCH 315/729] NestedFolders: Make TagsCell return null when showing
 nothing (#67041)

---
 .../app/features/browse-dashboards/components/TagsCell.tsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/features/browse-dashboards/components/TagsCell.tsx b/public/app/features/browse-dashboards/components/TagsCell.tsx
index 52c279dce36..cb82a101949 100644
--- a/public/app/features/browse-dashboards/components/TagsCell.tsx
+++ b/public/app/features/browse-dashboards/components/TagsCell.tsx
@@ -10,11 +10,11 @@ import { DashboardsTreeItem } from '../types';
 export function TagsCell({ row: { original: data } }: CellProps<DashboardsTreeItem, unknown>) {
   const styles = useStyles2(getStyles);
   const item = data.item;
-  if (item.kind === 'ui-empty-folder') {
-    return <></>;
+  if (item.kind === 'ui-empty-folder' || !item.tags) {
+    return null;
   }
 
-  return <TagList className={styles.tagList} tags={item.tags ?? []} />;
+  return <TagList className={styles.tagList} tags={item.tags} />;
 }
 
 function getStyles(theme: GrafanaTheme2) {

From c742503d2c99d638b9d982ff5077d0b24c484bf1 Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:24:43 +0200
Subject: [PATCH 316/729] Docs: Updates intro alerting topics (#66958)

* Updates intro alerting topics

* taking out cortex

* Adds choice table for alert rules type

* updates with Vikas feedback
---
 docs/sources/alerting/_index.md               | 87 +++++++++++--------
 docs/sources/alerting/fundamentals/_index.md  | 56 ++++++------
 .../fundamentals/alert-rules/_index.md        |  4 +-
 .../alert-rules/alert-rule-types.md           | 65 +++++++++++---
 4 files changed, 133 insertions(+), 79 deletions(-)

diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index 24e284a3a04..a8d24318f7e 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -13,7 +13,13 @@ weight: 114
 
 # Alerting
 
-Grafana Alerting allows you to learn about problems in your systems moments after they occur. Create, manage, and take action on your alerts in a single, consolidated view, and improve your team’s ability to identify and resolve issues quickly.
+Grafana Alerting allows you to learn about problems in your systems moments after they occur.
+
+Monitor your incoming metrics data or log entries and set up your Alerting system to watch for specific events or circumstances and then send notifications when those things are found.
+
+In this way, you eliminate the need for manual monitoring and provide a first line of defense against system outages or changes that could turn into major incidents.
+
+Using Grafana Alerting, you create queries and expressions from multiple data sources — no matter where your data is stored — giving you the flexibility to combine your data and alert on your metrics and logs in new and unique ways. You can then create, manage, and take action on your alerts from a single, consolidated view, and improve your team’s ability to identify and resolve issues quickly.
 
 Grafana Alerting is available for Grafana OSS, Grafana Enterprise, or Grafana Cloud. With Mimir and Loki alert rules you can run alert expressions closer to your data and at massive scale, all managed by the Grafana UI you are already familiar with.
 
@@ -21,33 +27,7 @@ Watch this video to learn more about Grafana Alerting: {{< vimeo 720001629 >}}
 
 _Refer to [Manage your alert rules]({{< relref "../alerting/alerting-rules/" >}}) for current instructions._
 
-## Overview
-
-The following diagram gives you an overview of how Grafana Alerting works and introduces you to some of the key concepts that work together and form the core of our flexible and powerful alerting engine.
-
-{{< figure src="/static/img/docs/alerting/unified/about-alerting-flow-diagram-latest.png" caption="Grafana Alerting overview" >}}
-
-1. Alert rules
-
-   Set evaluation criteria that determines whether an alert instance will fire. An alert rule consists of one or more queries and expressions, a condition, the frequency of evaluation, and optionally, the duration over which the condition is met.
-
-   Grafana managed alerts support multi-dimensional alerting, which means that each alert rule can create multiple alert instances. This is exceptionally powerful if you are observing multiple series in a single expression.
-
-   Once an alert rule has been created, they go through various states and transitions. The state and health of alert rules help you understand several key status indicators about your alerts.
-
-1. Labels
-
-   Match an alert rule and its instances to notification policies and silences. They can also be used to group your alerts by severity.
-
-1. Notification policies
-
-   Set where, when, and how the alerts get routed. Each notification policy specifies a set of label matchers to indicate which alerts they are responsible for. A notification policy has a contact point assigned to it that consists of one or more notifiers.
-
-1. Contact points
-
-   Define how your contacts are notified when an alert fires. We support a multitude of ChatOps tools to ensure the alerts come to your team.
-
-## Features
+## Key features and benefits
 
 **One page for all alerts**
 
@@ -55,24 +35,55 @@ A single Grafana Alerting page consolidates both Grafana-managed alerts and aler
 
 **Multi-dimensional alerts**
 
-Alert rules can create multiple individual alert instances per alert rule, known as multi-dimensional alerts, giving you the power and flexibility to gain visibility into your entire system with just a single alert.
+Alert rules can create multiple individual alert instances per alert rule, known as multi-dimensional alerts, giving you the power and flexibility to gain visibility into your entire system with just a single alert rule. You do this by adding labels to your query to specify which component is being monitored and generate multiple alert instances for a single alert rule. For example, if you want to monitor each server in a cluster, a multi-dimensional alert will alert on each CPU, whereas a standard alert will alert on the overall server.
 
-**Routing alerts**
+**Route alerts**
 
 Route each alert instance to a specific contact point based on labels you define. Notification policies are the set of rules for where, when, and how the alerts are routed to contact points.
 
-**Silencing alerts**
+**Silence alerts**
 
-Silences allow you to stop receiving persistent notifications from one or more alerting rules. You can also partially pause an alert based on certain criteria. Silences have their own dedicated section for better organization and visibility, so that you can scan your paused alert rules without cluttering the main alerting view.
+Silences stop notifications from getting created and last for only a specified window of time.
+Silences allow you to stop receiving persistent notifications from one or more alert rules. You can also partially pause an alert based on certain criteria. Silences have their own dedicated section for better organization and visibility, so that you can scan your paused alert rules without cluttering the main alerting view.
 
 **Mute timings**
 
-With mute timings, you can specify a time interval when you don’t want new notifications to be generated or sent. You can also freeze alert notifications for recurring periods of time, such as during a maintenance period.
+A mute timing is a recurring interval of time when no new notifications for a policy are generated or sent. Use them to prevent alerts from firing a specific and reoccurring period, for example, a regular maintenance period.
+
+Similar to silences, mute timings do not prevent alert rules from being evaluated, nor do they stop alert instances from being shown in the user interface. They only prevent notifications from being created.
+
+## Design your Alerting system
+
+Monitoring complex IT systems and understanding whether everything is up and running correctly is a difficult task. Setting up an effective alert management system is therefore essential to inform you when things are going wrong before they start to impact your business outcomes.
+
+Designing and configuring an alert management set up that works takes time.
+
+Here are some tips on how to create an effective alert management set up for your business:
+
+**Which are the key metrics for your business that you want to monitor and alert on?**
+
+- Find events that are important to know about and not so trivial or frequent that recipients ignore them.
+
+- Alerts should only be created for big events that require immediate attention or intervention.
+
+- Consider quality over quantity.
+
+**Which type of Alerting do you want to use?**
+
+- Choose between Grafana-managed Alerting or Grafana Mimir or Loki-managed Alerting; or both.
+
+**How do you want to organize your alerts and notifications?**
+
+- Be selective about who you set to receive alerts. Consider sending them to whoever is on call or a specific Slack channel.
+- Automate as far as possible using the Alerting API or alerts as code (Terraform).
+
+**How can you reduce alert fatigue?**
+
+- Avoid noisy, unnecessary alerts by using silences, mute timings, or pausing alert rule evaluation.
+- Continually tune your alert rules to review effectiveness. Remove alert rules to avoid duplication or ineffective alerts.
+- Think carefully about priority and severity levels.
+- Continually review your thresholds and evaluation rules.
 
 ## Useful links
 
-- [Fundamental concepts]({{< relref "/docs/grafana/latest/alerting/fundamentals" >}}) of Grafana Alerting.
-
-- [Role-based access control]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control" >}}) in Grafana Enterprise.
-
-- [High availability]({{< relref "/docs/grafana/latest/alerting/fundamentals/high-availability" >}})
+- [Introduction to Alerting]({{< relref "/docs/grafana/latest/alerting/fundamentals" >}})
diff --git a/docs/sources/alerting/fundamentals/_index.md b/docs/sources/alerting/fundamentals/_index.md
index e2015a7d441..0fd28e28610 100644
--- a/docs/sources/alerting/fundamentals/_index.md
+++ b/docs/sources/alerting/fundamentals/_index.md
@@ -10,42 +10,40 @@ weight: 105
 
 Whether you’re starting or expanding your implementation of Grafana Alerting, learn more about the key concepts and available features that help you create, manage, and take action on your alerts and improve your team’s ability to resolve issues quickly.
 
-First of all, let’s look at the different alert rule types that Grafana Alerting offers.
+The following diagram gives you an overview of how Grafana Alerting works and introduces you to some of the key concepts that work together and form the core of our flexible and powerful alerting engine.
 
-## Alert rule types
+{{< figure src="/media/docs/alerting/how-alerting-works.png" max-width="750px" caption="How Alerting works" >}}
 
-### Grafana-managed rules
+You can either create your alerting resources (alert rules, notification policies, and so on) directly in the Grafana UI, using provisioning, or in your Grafana Mimir or Loki instances.
 
-Grafana-managed rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of our supported data sources.
-In addition to supporting multiple data sources, you can also add expressions to transform your data and set alert conditions.
-This is the only type of rule that allows alerting from multiple data sources in a single rule definition.
+**Alert rules**
 
-### Mimir and Loki rules
+An alert rule is a set of evaluation criteria for when an alert rule should fire. An alert rule consists of one or more queries and expressions, a condition, and the duration over which the condition needs to be met to start firing.
 
-To create Mimir or Loki alerts you must have a compatible Prometheus or Loki data source. You can check if your data source supports rule creation via Grafana by testing the data source and observing if the ruler API is supported.
+Add annotations to your alert rule to provide additional information about the alert rule and add labels to uniquely identify your alert rule and configure alert routing. Labels link alert rules to notification policies, so you can easily manage which policy should handle which alerts and who gets notified.
 
-### Recording rules
+Once alert rules are created, they go through various states and transitions. An alert rule can produce multiple alert instances - one alert instance for each time series.
 
-Recording rules are only available for compatible Prometheus or Loki data sources.
-A recording rule allows you to pre-compute frequently needed or computationally expensive expressions and save their result as a new set of time series. This is useful if you want to run alerts on aggregated data or if you have dashboards that query computationally expensive expressions repeatedly.
-Grafana Enterprise offers an alternative to recorded rules in the form of [recorded queries](https://grafana.com/docs/grafana/v9.0/enterprise/recorded-queries/) that can be executed against any data source.
+The alert rule state is determined by the “worst case” state of the alert instances produced and the states can be Normal, Pending, or Firing. For example, if one alert instance is firing, the alert rule state will also be firing.
 
-## Key concepts and features
+The alert rule health is determined by the status of the evaluation of the alert rule, which can be Ok, Error, and NoData.
 
-The following table includes a list of key concepts, features and their definitions, designed to help you make the most of Grafana Alerting.
+**Alert instances**
 
-| Key concept or feature    | Definition                                                                                                                                                                                                                                                                             |
-| ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Data sources for Alerting | Select data sources you want to query and visualize metrics, logs and traces from.                                                                                                                                                                                                     |
-| Provisioning for Alerting | Manage your alerting resources and provision them into your Grafana system using file provisioning or Terraform.                                                                                                                                                                       |
-| Scheduler                 | Evaluates your alert rules; think of it as the component that periodically runs your query against data sources. It is only applicable to Grafana-managed rules.                                                                                                                       |
-| Alertmanager              | Manages the routing and grouping of alert instances.                                                                                                                                                                                                                                   |
-| Alert rule                | A set of evaluation criteria for when an alert rule should fire. An alert rule consists of one or more queries and expressions, a condition, the frequency of evaluation, and the duration over which the condition is met. An alert rule can produce multiple alert instances.        |
-| Alert instance            | An alert instance is created when an alert rule fires. An alert rule can create one or more alert instances. When multiple instances are created as a result of one alert rule, this is referred to as a multi-dimensional alert.                                                      |
-| Alert group               | The Alertmanager groups alert instances by default using the labels for the root notification policy. This controls de-duplication and groups of alert instances which are sent to contact points.                                                                                     |
-| Contact point             | Define how your contacts are notified when an alert rule fires.                                                                                                                                                                                                                        |
-| Message templating        | Create reusable custom templates and use them in contact points.                                                                                                                                                                                                                       |
-| Notification policy       | Set of rules for where, when, and how the alerts are grouped and routed to contact points.                                                                                                                                                                                             |
-| Labels and label matchers | Labels uniquely identify alert rules. They link alert rules to notification policies and silences, determining which policy should handle them and which alert rules should be silenced.                                                                                               |
-| Silences                  | Stop notifications from one or more alert instances. The difference between a silence and a mute timing is that a silence only lasts for only a specified window of time whereas a mute timing is meant to be recurring on a schedule. Uses label matchers to silence alert instances. |
-| Mute timings              | Specify a time interval when you don’t want new notifications to be generated or sent. You can also freeze alert notifications for recurring periods of time, such as during a maintenance period. Must be linked to an existing notification policy.                                  |
+For Grafana-managed alert rules, multiple alert instances can be created as a result of one alert rule (also known as a multi-dimensional alerting).
+
+Both Grafana-managed alert and Mimir or Loki-managed alert instances can be in Normal, Pending, Alerting, No Data, Error states.
+
+**Note:** For Mimir or Loki-managed alert rules, alert instances are only created when the threshold condition defined in an alert rule is breached.
+
+Alerting alert instances are grouped by labels according to the notification policy. This controls de-duplication and groups alert instances to send to your contact points.
+
+**Notification policy**
+
+Set where, when, and how firing alert instances get routed.
+
+Each notification policy contains a set of label matchers to indicate which alerts rules or instances it is responsible for. It also has a contact point assigned to it that consists of one or more contact point types, such as Slack or email. Contact points define how your contacts are notified when an alert instance fires.
+
+Use message templates for your notifications to create reusable custom templates and use them in contact points.
+
+Add silences to stop notifications from one or more alert instances or use mute timings to specify time intervals when you don’t want new notifications to be generated or sent out. The difference between the two being that a silence only lasts for only a specified window of time whereas a mute timing recurs on a schedule, for example, during a maintenance period.
diff --git a/docs/sources/alerting/fundamentals/alert-rules/_index.md b/docs/sources/alerting/fundamentals/alert-rules/_index.md
index 79271341ddf..a9739504407 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/_index.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/_index.md
@@ -8,9 +8,9 @@ title: Alert rules
 weight: 101
 ---
 
-# About alert rules
+# Alert rules
 
-An alerting rule is a set of evaluation criteria that determines whether an alert instance will fire. The rule consists of one or more queries and expressions, a condition, the frequency of evaluation, and optionally, the duration over which the condition is met.
+An alert rule is a set of evaluation criteria for when an alert rule should fire. An alert rule consists of one or more queries and expressions, a condition, and the duration over which the condition needs to be met to start firing.
 
 While queries and expressions select the data set to evaluate, a condition sets the threshold that an alert must meet or exceed to create an alert.
 
diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
index 4d5e94d2e11..f966c2f8a5e 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
@@ -10,24 +10,69 @@ weight: 102
 
 # Alert rule types
 
-Grafana supports several alert rule types, the following sections will explain their merits and demerits and help you choose the right alert type for your use case.
+Grafana supports several different alert rule types. Learn more about each of the alert rule types, how they work, and decide which one is best for your use case.
 
-## Grafana managed rules
+## Grafana-managed alert rules
 
-Grafana-managed rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of your existing data sources.
+Grafana-managed alert rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of our supported data sources.
 
-In addition to supporting any data source, you can add [expressions]({{< relref "/docs/grafana/latest/panels-visualizations/query-transform-data/expression-queries" >}}) to transform your data and express alert conditions.
+In addition to supporting multiple data sources, you can also add expressions to transform your data and set alert conditions. Using images in alert notifications is also supported. This is the only type of rule that allows alerting from multiple data sources in a single rule definition.
 
-## Mimir, Loki and Cortex rules
+The following diagram shows how Grafana-managed alerting works.
 
-To create Mimir, Loki or Cortex alerts you must have a compatible Prometheus data source. You can check if your data source is compatible by testing the data source and checking the details if the ruler API is supported.
+{{< figure src="/media/docs/alerting/grafana-managed-rule.png" max-width="750px" caption="How Alerting works" >}}
 
-{{< figure src="/static/img/docs/alerting/unified/mimir-datasource-check.png" caption="Successfully connected to a Mimir Prometheus datasource" max-width="40%" >}}
+1. Alert rules are created within Grafana based on one or more data sources.
+
+1. Alert rules are evaluated by the Alert Rule Evaluation Engine from within Grafana.
+
+1. Alerts are delivered using the internal Grafana Alertmanager.
+
+**Note:**
+
+You can also configure alerts to be delivered using an external Alertmanager; or use both internal and external alertmanagers.
+For more information, see Add an external Alertmanager.
+
+## Grafana Mimir or Loki-managed alert rules
+
+To create Grafana Mimir or Grafana Loki-managed alert rules, you must have a compatible Prometheus or Loki data source.
+
+You can check if your data source supports rule creation via Grafana by testing the data source and observing if the Ruler API is supported.
+
+For more information on the Ruler API, refer to [Ruler API](docs/loki/latest/api/#ruler).
+
+The following diagram shows how Grafana Mimir or Grafana Loki-managed alerting works.
+
+{{< figure src="/media/docs/alerting/loki-mimir-rule.png" max-width="750px" caption="How Alerting works" >}}
+
+1. Alert rules are created and stored within the data source itself.
+1. Alert rules can only be created based on Prometheus data.
+1. Alert rule evaluation and delivery is distributed across multiple nodes for high availability and fault tolerance.
 
 ## Recording rules
 
-Recording rules are only available for compatible Prometheus data sources like Mimir, Loki and Cortex.
+Recording rules are only available for compatible Prometheus or Loki data sources.
 
-A recording rule allows you to save an expression's result to a new set of time series. This is useful if you want to run alerts on aggregated data or if you have dashboards that query the same expression repeatedly.
+A recording rule allows you to pre-compute frequently needed or computationally expensive expressions and save their result as a new set of time series. This is useful if you want to run alerts on aggregated data or if you have dashboards that query computationally expensive expressions repeatedly.
 
-Read more about [recording rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) in Prometheus.
+Grafana Enterprise offers an alternative to recorded rules in the form of recorded queries that can be executed against any data source.
+
+For more information on recording rules in Prometheus, refer to [recording rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/).
+
+## Choose an alert rule type
+
+When choosing which alert rule type to use, consider the following comparison between Grafana-managed alert rules and Grafana Mimir or Loki alert rules.
+
+| Feature                                                                 | Grafana-managed alert rule                                                                                                   | Loki/Mimir-managed alert rule                                                                                                                           |
+| ----------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Create alert rules based on data from any of our supported data sources | Yes                                                                                                                          | No: You can only create alert rules that are based on Prometheus data. The data source must have the Ruler API enabled.                                 |
+| Mix and match data sources                                              | Yes                                                                                                                          | No                                                                                                                                                      |
+| Includes support for recording rules                                    | No                                                                                                                           | Yes                                                                                                                                                     |
+| Add expressions to transform your data and set alert conditions         | Yes                                                                                                                          | No                                                                                                                                                      |
+| Use images in alert notifications                                       | Yes                                                                                                                          | No                                                                                                                                                      |
+| Scaling                                                                 | More resource intensive, depend on the database, and are likely to suffer from transient errors. They only scale vertically. | Store alert rules within the data source itself and allow for “infinite” scaling. Generate and send alert notifications from the location of your data. |
+| Alert rule evaluation and delivery                                      | Alert rule evaluation and delivery is done from within Grafana, using an external Alertmanager; or both.                     | Alert rule evaluation and alert delivery is distributed, meaning there is no single point of failure.                                                   |
+
+**Note:**
+
+If you are using non-Prometheus data, we recommend choosing Grafana-managed alert rules. Otherwise, choose Grafana Mimir or Grafana Loki alert rules where possible.

From 53d5a996b8f860e3327e88fda822b97f320d3a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Fri, 21 Apr 2023 13:37:04 +0200
Subject: [PATCH 317/729] Elasticsearch: Update required database version to
 7.16 (#66928)

elasticsearch: update database requirements
---
 docs/sources/datasources/elasticsearch/_index.md     | 2 +-
 public/app/plugins/datasource/elasticsearch/utils.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/datasources/elasticsearch/_index.md b/docs/sources/datasources/elasticsearch/_index.md
index f4ea2a05b62..5d34fb26e20 100644
--- a/docs/sources/datasources/elasticsearch/_index.md
+++ b/docs/sources/datasources/elasticsearch/_index.md
@@ -30,7 +30,7 @@ Once you've added the Elasticsearch data source, you can [configure it]({{< relr
 
 This data source supports these versions of Elasticsearch:
 
-- v7.10+
+- v7.16+
 - v8.x
 
 ## Configure the data source
diff --git a/public/app/plugins/datasource/elasticsearch/utils.ts b/public/app/plugins/datasource/elasticsearch/utils.ts
index 345a484dc1d..029fafc737a 100644
--- a/public/app/plugins/datasource/elasticsearch/utils.ts
+++ b/public/app/plugins/datasource/elasticsearch/utils.ts
@@ -92,7 +92,7 @@ export const getScriptValue = (metric: MetricAggregationWithInlineScript) =>
   (typeof metric.settings?.script === 'object' ? metric.settings?.script?.inline : metric.settings?.script) || '';
 
 export const isSupportedVersion = (version: SemVer): boolean => {
-  if (gte(version, '7.10.0')) {
+  if (gte(version, '7.16.0')) {
     return true;
   }
 
@@ -100,4 +100,4 @@ export const isSupportedVersion = (version: SemVer): boolean => {
 };
 
 export const unsupportedVersionMessage =
-  'Support for Elasticsearch versions after their end-of-life (currently versions < 7.10) was removed. Using unsupported version of Elasticsearch may lead to unexpected and incorrect results.';
+  'Support for Elasticsearch versions after their end-of-life (currently versions < 7.16) was removed. Using unsupported version of Elasticsearch may lead to unexpected and incorrect results.';

From 34110f68b77cd8e8aec4bcadc4137902bcaf6fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 21 Apr 2023 14:15:09 +0200
Subject: [PATCH 318/729] EmptyDashboard: Fix wrong font weight (#66555)

---
 public/app/features/dashboard/dashgrid/DashboardEmpty.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
index 62223b15cf1..e5ce1303a3a 100644
--- a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
@@ -141,7 +141,7 @@ function getStyles(theme: GrafanaTheme2) {
     }),
     headerSection: css({
       label: 'header-section',
-      fontWeight: 600,
+      fontWeight: theme.typography.fontWeightMedium,
       textAlign: 'center',
     }),
     headerBig: css({

From cebdb499125bc5408167575ddbfd41fd80cad82a Mon Sep 17 00:00:00 2001
From: Grafana I18n Bot <110095610+grafana-i18n-bot@users.noreply.github.com>
Date: Fri, 21 Apr 2023 15:03:12 +0200
Subject: [PATCH 319/729] I18n: Crowdin sync (#67043)

* New translations grafana.json (French)

* New translations grafana.json (Spanish)

* New translations grafana.json (German)

* New translations grafana.json (Chinese Simplified)
---
 public/locales/de-DE/grafana.json   | 102 ++++++++++++-------------
 public/locales/es-ES/grafana.json   | 104 +++++++++++++-------------
 public/locales/fr-FR/grafana.json   | 112 ++++++++++++++--------------
 public/locales/zh-Hans/grafana.json | 106 +++++++++++++-------------
 4 files changed, 212 insertions(+), 212 deletions(-)

diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index a42b6ef2842..64b8d30c147 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -12,12 +12,12 @@
       "light-theme": "Hell"
     },
     "search-box": {
-      "placeholder": ""
+      "placeholder": "Suche oder springe zu ..."
     },
     "section": {
       "actions": "Aktionen",
       "dashboard-search-results": "Dashboards",
-      "folder-search-results": "",
+      "folder-search-results": "Ordner",
       "pages": "Seiten",
       "preferences": "Einstellungen",
       "recent-dashboards": "Kürzliche Dashboards"
@@ -31,21 +31,21 @@
   },
   "dashboard": {
     "add-menu": {
-      "import": "",
-      "paste-panel": "",
-      "row": "",
-      "visualization": ""
+      "import": "Aus Bibliothek importieren",
+      "paste-panel": "Panel einfügen",
+      "row": "Zeile",
+      "visualization": "Visualisierung"
     },
     "empty": {
-      "add-import-body": "",
-      "add-import-button": "",
-      "add-import-header": "",
-      "add-row-body": "",
-      "add-row-button": "",
-      "add-row-header": "",
-      "add-visualization-body": "",
-      "add-visualization-button": "",
-      "add-visualization-header": ""
+      "add-import-body": "Visualisierungen importieren, die mit anderen Dashboards geteilt werden.",
+      "add-import-button": "Bibliotheks-Panel importieren",
+      "add-import-header": "Panel importieren",
+      "add-row-body": "Gruppieren Sie Ihre Visualisierungen in erweiterbare Abschnitte.",
+      "add-row-button": "Zeile hinzufügen",
+      "add-row-header": "Eine Zeile hinzufügen",
+      "add-visualization-body": "Wählen Sie eine Datenquelle aus und visualisieren und fragen Sie dann Ihre Daten mit Diagrammen, Statistiken und Tabellen ab oder erstellen Sie Listen, Markierungen und andere Widgets.",
+      "add-visualization-button": "Visualisierung hinzufügen",
+      "add-visualization-header": "Starten Sie Ihr neues Dashboard, indem Sie eine Visualisierung hinzufügen"
     },
     "inspect": {
       "data-tab": "Daten",
@@ -92,7 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "Statistiken zu Datenquellen",
-      "data-traceids": "",
+      "data-traceids": "IDs nachverfolgen",
       "processing-time": "Datenverarbeitungszeit",
       "queries": "Anzahl der Abfragen",
       "request-time": "Gesamte Anfragezeit",
@@ -100,7 +100,7 @@
       "table-title": "Statistiken"
     },
     "toolbar": {
-      "add": "",
+      "add": "Hinzufügen",
       "add-panel": "Panel hinzufügen",
       "mark-favorite": "Als Favorit markieren",
       "open-original": "Original-Dashboard öffnen",
@@ -128,9 +128,9 @@
   },
   "grafana-ui": {
     "segment-async": {
-      "error": "",
-      "loading": "",
-      "no-options": ""
+      "error": "Fehler beim Laden der Optionen",
+      "loading": "Optionen werden geladen ...",
+      "no-options": "Keine Optionen gefunden"
     }
   },
   "library-panel": {
@@ -143,7 +143,7 @@
       "name": "Name des Bibliotheks-Panels"
     },
     "add-widget": {
-      "title": ""
+      "title": "Panel aus Panel-Bibliothek hinzufügen"
     }
   },
   "library-panels": {
@@ -186,7 +186,7 @@
       "title": "Warnregeln"
     },
     "alerting-receivers": {
-      "subtitle": "",
+      "subtitle": "Wählen Sie, wie Ihre Kontaktpunkte benachrichtigen werden, wenn eine Warninstanz auslöst",
       "title": "Kontaktpunkte"
     },
     "alerting-silences": {
@@ -195,7 +195,7 @@
     },
     "alerts-and-incidents": {
       "subtitle": "Warn- und Vorfallmanagement-Apps",
-      "title": "Warnungen & Vorfälle"
+      "title": "Warnungen und IRM"
     },
     "api-keys": {
       "subtitle": "Verwalte und erstelle API-Schlüssel, die für die Interaktion mit HTTP-APIs von Grafana verwendet werden",
@@ -216,7 +216,7 @@
       "title": "Erstellen"
     },
     "create-alert": {
-      "title": ""
+      "title": "Alarmregel erstellen"
     },
     "create-dashboard": {
       "title": "Dashboard"
@@ -225,7 +225,7 @@
       "title": "Ordner"
     },
     "create-import": {
-      "title": ""
+      "title": "Dashboard importieren"
     },
     "dashboards": {
       "subtitle": "Erstelle und verwalte Dashboards, um deine Daten zu visualisieren",
@@ -261,11 +261,11 @@
       "title": "Bibliotheks-Panels"
     },
     "manage-folder": {
-      "subtitle": ""
+      "subtitle": "Ordner-Dashboards und Berechtigungen verwalten"
     },
     "monitoring": {
       "subtitle": "Überwachungs- und Infrastruktur-Apps",
-      "title": "Überwachung"
+      "title": "Beobachtbarkeit"
     },
     "new": {
       "title": "Neu"
@@ -298,13 +298,13 @@
       "title": "Profil"
     },
     "public": {
-      "title": ""
+      "title": "Öffentliche Dashboards"
     },
     "scenes": {
       "title": "Szenen"
     },
     "search": {
-      "placeholderCommandPalette": ""
+      "placeholderCommandPalette": "Suche oder springe zu ..."
     },
     "search-dashboards": {
       "title": "Dashboards durchsuchen"
@@ -355,9 +355,9 @@
       "tv-alert": "Drücke ESC, um den Kiosk-Modus zu verlassen"
     },
     "toolbar": {
-      "enable-kiosk": "",
-      "toggle-menu": "",
-      "toggle-search-bar": ""
+      "enable-kiosk": "Kiosk-Modus aktivieren",
+      "toggle-menu": "Menü umschalten",
+      "toggle-search-bar": "Obere Suchleiste umschalten"
     }
   },
   "news": {
@@ -407,12 +407,12 @@
   },
   "search": {
     "actions": {
-      "include-panels": "",
-      "remove-datasource-filter": "",
-      "sort-placeholder": "",
+      "include-panels": "Panels einschließen",
+      "remove-datasource-filter": "Datenquelle: {{datasource}}",
+      "sort-placeholder": "Sortieren",
       "starred": "Hervorgehoben",
-      "view-as-folders": "",
-      "view-as-list": ""
+      "view-as-folders": "Nach Ordnern anzeigen",
+      "view-as-list": "Als Liste anzeigen"
     },
     "dashboard-actions": {
       "import": "Importieren",
@@ -421,26 +421,26 @@
       "new-folder": "Neuer Ordner"
     },
     "folder-view": {
-      "go-to-folder": "",
-      "select-folder": ""
+      "go-to-folder": "Zum Ordner",
+      "select-folder": "Ordner auswählen"
     },
     "result-kind": {
       "dashboard": "Dashboard",
       "folder": "Ordner",
-      "panel": ""
+      "panel": "Panel"
     },
     "results-table": {
-      "datasource-header": "",
-      "location-header": "",
+      "datasource-header": "Datenquelle",
+      "location-header": "Standort",
       "name-header": "Name",
-      "tags-header": "",
+      "tags-header": "Tags",
       "type-dashboard": "Dashboard",
       "type-folder": "Ordner",
-      "type-header": ""
+      "type-header": "Typ"
     },
     "search-input": {
-      "include-panels-placeholder": "",
-      "placeholder": ""
+      "include-panels-placeholder": "Nach Dashboards und Panels suchen",
+      "placeholder": "Nach Dashboards suchen"
     }
   },
   "share-modal": {
@@ -536,14 +536,14 @@
       "dark-label": "Dunkel",
       "default-label": "Standard",
       "light-label": "Hell",
-      "system-label": ""
+      "system-label": "System"
     },
     "title": "Einstellungen"
   },
   "tag-filter": {
-    "loading": "",
-    "no-tags": "",
-    "placeholder": ""
+    "loading": "Wird geladen ...",
+    "no-tags": "Keine Tags gefunden",
+    "placeholder": "Nach Tag filtern"
   },
   "time-picker": {
     "absolute": {
@@ -621,7 +621,7 @@
   },
   "variable": {
     "adhoc": {
-      "placeholder": ""
+      "placeholder": "Wert auswählen"
     },
     "dropdown": {
       "placeholder": "Variablenwert eingeben"
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 6f68b2c9163..13d9356b4d8 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -12,15 +12,15 @@
       "light-theme": "Claro"
     },
     "search-box": {
-      "placeholder": ""
+      "placeholder": "Buscar o saltar a..."
     },
     "section": {
       "actions": "Acciones",
       "dashboard-search-results": "Paneles de control",
-      "folder-search-results": "",
+      "folder-search-results": "Carpetas",
       "pages": "Páginas",
       "preferences": "Preferencias",
-      "recent-dashboards": ""
+      "recent-dashboards": "Paneles de control recientes"
     }
   },
   "common": {
@@ -31,21 +31,21 @@
   },
   "dashboard": {
     "add-menu": {
-      "import": "",
-      "paste-panel": "",
-      "row": "",
-      "visualization": ""
+      "import": "Importar de la biblioteca",
+      "paste-panel": "Pegar panel",
+      "row": "Fila",
+      "visualization": "Visualización"
     },
     "empty": {
-      "add-import-body": "",
-      "add-import-button": "",
-      "add-import-header": "",
-      "add-row-body": "",
-      "add-row-button": "",
-      "add-row-header": "",
-      "add-visualization-body": "",
-      "add-visualization-button": "",
-      "add-visualization-header": ""
+      "add-import-body": "Importar las visualizaciones que se compartan con otros paneles de control.",
+      "add-import-button": "Importar el panel de la biblioteca",
+      "add-import-header": "Importar panel",
+      "add-row-body": "Agrupa tus visualizaciones en secciones ampliables.",
+      "add-row-button": "Añadir fila",
+      "add-row-header": "Añadir una fila",
+      "add-visualization-body": "Selecciona una fuente de datos y luego consulta y visualiza tus datos con gráficos, estadísticas y tablas o cree listas, anotaciones y otros widgets.",
+      "add-visualization-button": "Añadir visualización",
+      "add-visualization-header": "Comienza tu nuevo panel de control añadiendo una visualización"
     },
     "inspect": {
       "data-tab": "Datos",
@@ -92,7 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "Estadísticas de origen de datos",
-      "data-traceids": "",
+      "data-traceids": "Trazar ID",
       "processing-time": "Tiempo de procesamiento de datos",
       "queries": "Número de consultas",
       "request-time": "Tiempo total de solicitud",
@@ -100,7 +100,7 @@
       "table-title": "Estadísticas"
     },
     "toolbar": {
-      "add": "",
+      "add": "Añadir",
       "add-panel": "Añadir panel",
       "mark-favorite": "Marcar como favorito",
       "open-original": "Abrir el panel de control original",
@@ -128,9 +128,9 @@
   },
   "grafana-ui": {
     "segment-async": {
-      "error": "",
-      "loading": "",
-      "no-options": ""
+      "error": "No se han podido cargar las opciones",
+      "loading": "Cargando las opciones...",
+      "no-options": "No se ha encontrado ninguna opción"
     }
   },
   "library-panel": {
@@ -143,7 +143,7 @@
       "name": "Nombre del panel de librería"
     },
     "add-widget": {
-      "title": ""
+      "title": "Añadir panel de la biblioteca de paneles"
     }
   },
   "library-panels": {
@@ -186,7 +186,7 @@
       "title": "Reglas de alerta"
     },
     "alerting-receivers": {
-      "subtitle": "",
+      "subtitle": "Elige cómo notificar tus puntos de contacto cuando se dispara una instancia de alerta",
       "title": "Puntos de contacto"
     },
     "alerting-silences": {
@@ -195,7 +195,7 @@
     },
     "alerts-and-incidents": {
       "subtitle": "Aplicaciones de gestión de alertas e incidentes",
-      "title": "Alertas e incidentes"
+      "title": "Alertas e IRM"
     },
     "api-keys": {
       "subtitle": "Administrar y crear claves de API que se utilizan para interactuar con las API de HTTP de Grafana",
@@ -216,7 +216,7 @@
       "title": "Crear"
     },
     "create-alert": {
-      "title": ""
+      "title": "Crear regla de alerta"
     },
     "create-dashboard": {
       "title": "Panel de control"
@@ -225,7 +225,7 @@
       "title": "Carpeta"
     },
     "create-import": {
-      "title": ""
+      "title": "Importar panel de control"
     },
     "dashboards": {
       "subtitle": "Cree y administre paneles de control para visualizar sus datos",
@@ -261,11 +261,11 @@
       "title": "Paneles de librería"
     },
     "manage-folder": {
-      "subtitle": ""
+      "subtitle": "Gestionar paneles de control de carpetas y permisos"
     },
     "monitoring": {
       "subtitle": "Aplicaciones de supervisión e infraestructura",
-      "title": "Seguimiento"
+      "title": "Observabilidad"
     },
     "new": {
       "title": "Nuevo"
@@ -298,13 +298,13 @@
       "title": "Perfil"
     },
     "public": {
-      "title": ""
+      "title": "Paneles de control públicos"
     },
     "scenes": {
       "title": "Escenas"
     },
     "search": {
-      "placeholderCommandPalette": ""
+      "placeholderCommandPalette": "Buscar o saltar a..."
     },
     "search-dashboards": {
       "title": "Buscar paneles de control"
@@ -355,9 +355,9 @@
       "tv-alert": "Pulse ESC para salir del modo de quiosco"
     },
     "toolbar": {
-      "enable-kiosk": "",
-      "toggle-menu": "",
-      "toggle-search-bar": ""
+      "enable-kiosk": "Activar el modo de quiosco",
+      "toggle-menu": "Activar o desactivar menú",
+      "toggle-search-bar": "Activar o desactivar la barra de búsqueda superior"
     }
   },
   "news": {
@@ -407,12 +407,12 @@
   },
   "search": {
     "actions": {
-      "include-panels": "",
-      "remove-datasource-filter": "",
-      "sort-placeholder": "",
+      "include-panels": "Incluir paneles",
+      "remove-datasource-filter": "Fuente de datos: {{datasource}}",
+      "sort-placeholder": "Ordenar",
       "starred": "Destacado",
-      "view-as-folders": "",
-      "view-as-list": ""
+      "view-as-folders": "Ver por carpetas",
+      "view-as-list": "Ver como lista"
     },
     "dashboard-actions": {
       "import": "Importar",
@@ -421,26 +421,26 @@
       "new-folder": "Nueva carpeta"
     },
     "folder-view": {
-      "go-to-folder": "",
-      "select-folder": ""
+      "go-to-folder": "Ir a la carpeta",
+      "select-folder": "Seleccionar carpeta"
     },
     "result-kind": {
       "dashboard": "Panel de control",
       "folder": "Carpeta",
-      "panel": ""
+      "panel": "Panel"
     },
     "results-table": {
-      "datasource-header": "",
-      "location-header": "",
+      "datasource-header": "Fuente de datos",
+      "location-header": "Ubicación",
       "name-header": "Nombre",
-      "tags-header": "",
+      "tags-header": "Etiquetas",
       "type-dashboard": "Panel de control",
       "type-folder": "Carpeta",
-      "type-header": ""
+      "type-header": "Tipo"
     },
     "search-input": {
-      "include-panels-placeholder": "",
-      "placeholder": ""
+      "include-panels-placeholder": "Buscar paneles de control y paneles",
+      "placeholder": "Buscar paneles de control"
     }
   },
   "share-modal": {
@@ -536,14 +536,14 @@
       "dark-label": "Oscuro",
       "default-label": "Por defecto",
       "light-label": "Claro",
-      "system-label": ""
+      "system-label": "Sistema"
     },
     "title": "Preferencias"
   },
   "tag-filter": {
-    "loading": "",
-    "no-tags": "",
-    "placeholder": ""
+    "loading": "Cargando...",
+    "no-tags": "No se ha encontrado ninguna etiqueta",
+    "placeholder": "Filtrar por etiqueta"
   },
   "time-picker": {
     "absolute": {
@@ -621,7 +621,7 @@
   },
   "variable": {
     "adhoc": {
-      "placeholder": ""
+      "placeholder": "Seleccionar valor"
     },
     "dropdown": {
       "placeholder": "Introducir el valor de la variable"
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index a25d4e8a0f8..5172e23636e 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -12,12 +12,12 @@
       "light-theme": "Clair"
     },
     "search-box": {
-      "placeholder": ""
+      "placeholder": "Rechercher ou aller à..."
     },
     "section": {
       "actions": "Actions",
       "dashboard-search-results": "Tableaux de bord",
-      "folder-search-results": "",
+      "folder-search-results": "Dossiers",
       "pages": "Pages",
       "preferences": "Préférences",
       "recent-dashboards": "Tableaux de bord récents"
@@ -31,21 +31,21 @@
   },
   "dashboard": {
     "add-menu": {
-      "import": "",
-      "paste-panel": "",
-      "row": "",
-      "visualization": ""
+      "import": "Importer depuis la bibliothèque",
+      "paste-panel": "Coller le panneau",
+      "row": "Ligne",
+      "visualization": "Visualisation"
     },
     "empty": {
-      "add-import-body": "",
-      "add-import-button": "",
-      "add-import-header": "",
-      "add-row-body": "",
-      "add-row-button": "",
-      "add-row-header": "",
-      "add-visualization-body": "",
-      "add-visualization-button": "",
-      "add-visualization-header": ""
+      "add-import-body": "Importer des visualisations partagées avec d'autres tableaux de bord.",
+      "add-import-button": "Importer un panneau de la bibliothèque",
+      "add-import-header": "Importer un panneau",
+      "add-row-body": "Regroupez vos visualisations en sections extensibles.",
+      "add-row-button": "Ajouter une ligne",
+      "add-row-header": "Ajouter une ligne",
+      "add-visualization-body": "Sélectionnez une source de données, puis examinez et visualisez vos données avec des graphiques, des statistiques et des tableaux ou créez des listes, des markdowns et d'autres widgets.",
+      "add-visualization-button": "Ajouter une visualisation",
+      "add-visualization-header": "Commencez votre nouveau tableau de bord en ajoutant une visualisation"
     },
     "inspect": {
       "data-tab": "Données",
@@ -55,7 +55,7 @@
       "query-tab": "Requête",
       "stats-tab": "Statistiques",
       "subtitle": "{{queryCount}} requêtes avec un délai total de requête de {{formatted}}",
-      "title": "Inspecter\u00a0: {{panelTitle}}"
+      "title": "Inspecter : {{panelTitle}}"
     },
     "inspect-data": {
       "data-options": "Options de données",
@@ -85,14 +85,14 @@
       "panel-json-description": "Le modèle enregistré dans le tableau de bord JSON qui configure comment tout fonctionne.",
       "panel-json-label": "Panneau JSON",
       "select-source": "Sélectionner la source",
-      "unknown": "Objet inconnu\u00a0: {{show}}"
+      "unknown": "Objet inconnu : {{show}}"
     },
     "inspect-meta": {
       "no-inspector": "Pas d'inspecteur de métadonnées"
     },
     "inspect-stats": {
       "data-title": "Statistiques de source de données",
-      "data-traceids": "",
+      "data-traceids": "ID de suivi",
       "processing-time": "Durée de traitement des données",
       "queries": "Nombre de requêtes",
       "request-time": "Durée totale de la requête",
@@ -100,7 +100,7 @@
       "table-title": "Statistiques"
     },
     "toolbar": {
-      "add": "",
+      "add": "Ajouter",
       "add-panel": "Ajouter un panneau",
       "mark-favorite": "Marquer comme favori",
       "open-original": "Ouvrir le tableau de bord d'origine",
@@ -118,7 +118,7 @@
     "contact-admin": "Veuillez contacter votre administrateur pour configurer les sources de données.",
     "explanation": "Pour visualiser vos données, vous devrez d’abord les connecter.",
     "new-dashboard": "Nouveau tableau de bord",
-    "preferred": "Connectez votre source de données préférée\u00a0:",
+    "preferred": "Connectez votre source de données préférée :",
     "sampleData": "Ou établissez un nouveau tableau de bord avec des exemples de données",
     "viewAll": "Afficher tout",
     "welcome": "Bienvenue aux tableaux de bord Grafana !"
@@ -128,9 +128,9 @@
   },
   "grafana-ui": {
     "segment-async": {
-      "error": "",
-      "loading": "",
-      "no-options": ""
+      "error": "Échec du chargement des options",
+      "loading": "Chargement des options...",
+      "no-options": "Aucune option trouvée"
     }
   },
   "library-panel": {
@@ -143,12 +143,12 @@
       "name": "Nom du panneau de bibliothèque"
     },
     "add-widget": {
-      "title": ""
+      "title": "Ajouter un panneau depuis la bibliothèque de panneau"
     }
   },
   "library-panels": {
     "save": {
-      "error": "Erreur lors de l'enregistrement du panneau de bibliothèque\u00a0: \"{{errorMsg}}\"",
+      "error": "Erreur lors de l'enregistrement du panneau de bibliothèque : \"{{errorMsg}}\"",
       "success": "Panneau de bibliothèque enregistré"
     }
   },
@@ -186,7 +186,7 @@
       "title": "Règles d'alerte"
     },
     "alerting-receivers": {
-      "subtitle": "",
+      "subtitle": "Choisissez comment informer vos points de contact quand une instance d'alerte se déclenche",
       "title": "Points de contact"
     },
     "alerting-silences": {
@@ -195,7 +195,7 @@
     },
     "alerts-and-incidents": {
       "subtitle": "Applications de gestion des incidents et des alertes",
-      "title": "Alertes et incidents"
+      "title": "Alertes et IRM"
     },
     "api-keys": {
       "subtitle": "Gérer et créer des clés API utilisées pour interagir avec les API HTTP de Grafana",
@@ -216,7 +216,7 @@
       "title": "Créer"
     },
     "create-alert": {
-      "title": ""
+      "title": "Créer une règle d’alerte"
     },
     "create-dashboard": {
       "title": "Tableau de bord"
@@ -225,7 +225,7 @@
       "title": "Dossier"
     },
     "create-import": {
-      "title": ""
+      "title": "Importer un tableau de bord"
     },
     "dashboards": {
       "subtitle": "Créer et gérer des tableaux de bord pour visualiser vos données",
@@ -261,11 +261,11 @@
       "title": "Panneaux de bibliothèque"
     },
     "manage-folder": {
-      "subtitle": ""
+      "subtitle": "Gérer les tableaux de bord et les autorisations des dossiers"
     },
     "monitoring": {
       "subtitle": "Applications de suivi et d'infrastructure",
-      "title": "Suivi"
+      "title": "Observabilité"
     },
     "new": {
       "title": "Nouveau"
@@ -298,13 +298,13 @@
       "title": "Profil"
     },
     "public": {
-      "title": ""
+      "title": "Tableaux de bord publics"
     },
     "scenes": {
       "title": "Scènes"
     },
     "search": {
-      "placeholderCommandPalette": ""
+      "placeholderCommandPalette": "Rechercher ou aller à..."
     },
     "search-dashboards": {
       "title": "Rechercher dans les tableaux de bord"
@@ -355,9 +355,9 @@
       "tv-alert": "Appuyez sur ESC pour quitter le mode kiosque"
     },
     "toolbar": {
-      "enable-kiosk": "",
-      "toggle-menu": "",
-      "toggle-search-bar": ""
+      "enable-kiosk": "Activer le mode kiosque",
+      "toggle-menu": "Afficher/Masquer le menu",
+      "toggle-search-bar": "Afficher/Masquer la barre de recherche"
     }
   },
   "news": {
@@ -407,12 +407,12 @@
   },
   "search": {
     "actions": {
-      "include-panels": "",
-      "remove-datasource-filter": "",
-      "sort-placeholder": "",
+      "include-panels": "Inclure des panneaux",
+      "remove-datasource-filter": "Source de données : {{datasource}}",
+      "sort-placeholder": "Trier",
       "starred": "Favoris",
-      "view-as-folders": "",
-      "view-as-list": ""
+      "view-as-folders": "Voir par dossier",
+      "view-as-list": "Voir en tant que liste"
     },
     "dashboard-actions": {
       "import": "Importer",
@@ -421,26 +421,26 @@
       "new-folder": "Nouveau dossier"
     },
     "folder-view": {
-      "go-to-folder": "",
-      "select-folder": ""
+      "go-to-folder": "Aller dans le dossier",
+      "select-folder": "Sélectionner un dossier"
     },
     "result-kind": {
       "dashboard": "Tableau de bord",
       "folder": "Dossier",
-      "panel": ""
+      "panel": "Panneau"
     },
     "results-table": {
-      "datasource-header": "",
-      "location-header": "",
+      "datasource-header": "Source de données",
+      "location-header": "Emplacement",
       "name-header": "Nom",
-      "tags-header": "",
+      "tags-header": "Étiquettes",
       "type-dashboard": "Tableau de bord",
       "type-folder": "Dossier",
-      "type-header": ""
+      "type-header": "Type"
     },
     "search-input": {
-      "include-panels-placeholder": "",
-      "placeholder": ""
+      "include-panels-placeholder": "Rechercher des tableaux de bord et des panneaux",
+      "placeholder": "Rechercher des tableaux de bord"
     }
   },
   "share-modal": {
@@ -495,7 +495,7 @@
       "info-text-1": "Un instantané est un moyen instantané de partager publiquement un tableau de bord interactif. Lors de la création, nous supprimons les données sensibles telles que les requêtes (métrique, modèle et annotation) et les liens du panneau, pour ne laisser que les métriques visibles et les noms de séries intégrés dans votre tableau de bord.",
       "info-text-2": "N'oubliez pas que votre instantané <1>peut être consulté par une personne</1> qui dispose du lien et qui peut accéder à l'URL. Partagez judicieusement.",
       "local-button": "Instantané local",
-      "mistake-message": "Avez-vous commis une erreur\u00a0? ",
+      "mistake-message": "Avez-vous commis une erreur ? ",
       "name": "Nom de l'instantané",
       "timeout": "Délai d’expiration (secondes)",
       "timeout-description": "Vous devrez peut-être configurer la valeur du délai d'expiration si la collecte des métriques de votre tableau de bord prend beaucoup de temps.",
@@ -536,14 +536,14 @@
       "dark-label": "Sombre",
       "default-label": "Par défaut",
       "light-label": "Clair",
-      "system-label": ""
+      "system-label": "Système"
     },
     "title": "Préférences"
   },
   "tag-filter": {
-    "loading": "",
-    "no-tags": "",
-    "placeholder": ""
+    "loading": "Chargement en cours...",
+    "no-tags": "Aucune étiquette trouvée",
+    "placeholder": "Filtrer par étiquette"
   },
   "time-picker": {
     "absolute": {
@@ -621,7 +621,7 @@
   },
   "variable": {
     "adhoc": {
-      "placeholder": ""
+      "placeholder": "Sélectionner une valeur"
     },
     "dropdown": {
       "placeholder": "Entrer la valeur de la variable"
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index af27b8ef6d2..2416e4bc54a 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -12,15 +12,15 @@
       "light-theme": "浅色"
     },
     "search-box": {
-      "placeholder": ""
+      "placeholder": "搜索或跳转至..."
     },
     "section": {
       "actions": "操作",
       "dashboard-search-results": "仪表板",
-      "folder-search-results": "",
+      "folder-search-results": "文件夹",
       "pages": "页面",
       "preferences": "首选项",
-      "recent-dashboards": ""
+      "recent-dashboards": "最近的仪表板"
     }
   },
   "common": {
@@ -31,21 +31,21 @@
   },
   "dashboard": {
     "add-menu": {
-      "import": "",
-      "paste-panel": "",
-      "row": "",
-      "visualization": ""
+      "import": "从库导入",
+      "paste-panel": "粘贴面板",
+      "row": "行",
+      "visualization": "可视化"
     },
     "empty": {
-      "add-import-body": "",
-      "add-import-button": "",
-      "add-import-header": "",
-      "add-row-body": "",
-      "add-row-button": "",
-      "add-row-header": "",
-      "add-visualization-body": "",
-      "add-visualization-button": "",
-      "add-visualization-header": ""
+      "add-import-body": "导入与其他仪表板共享的可视化。",
+      "add-import-button": "导入库面板",
+      "add-import-header": "导入面板",
+      "add-row-body": "将您的可视化分组成可扩展部分。",
+      "add-row-button": "添加行",
+      "add-row-header": "添加一行",
+      "add-visualization-body": "选择一个数据源，然后用图表、统计信息和表格查询您的数据以及将其可视化，或创建列表、Markdown 和其他小部件。",
+      "add-visualization-button": "添加可视化",
+      "add-visualization-header": "通过添加可视化开始您的新仪表板"
     },
     "inspect": {
       "data-tab": "数据",
@@ -92,7 +92,7 @@
     },
     "inspect-stats": {
       "data-title": "数据源统计信息",
-      "data-traceids": "",
+      "data-traceids": "轨迹 ID",
       "processing-time": "数据处理时间",
       "queries": "查询数",
       "request-time": "总请求时间",
@@ -100,7 +100,7 @@
       "table-title": "统计信息"
     },
     "toolbar": {
-      "add": "",
+      "add": "添加",
       "add-panel": "添加面板",
       "mark-favorite": "标记为收藏",
       "open-original": "打开原始仪表板",
@@ -128,9 +128,9 @@
   },
   "grafana-ui": {
     "segment-async": {
-      "error": "",
-      "loading": "",
-      "no-options": ""
+      "error": "加载选项失败",
+      "loading": "正在加载选项...",
+      "no-options": "未找到选项"
     }
   },
   "library-panel": {
@@ -143,7 +143,7 @@
       "name": "库面板名称"
     },
     "add-widget": {
-      "title": ""
+      "title": "从面板库中添加面板"
     }
   },
   "library-panels": {
@@ -186,7 +186,7 @@
       "title": "警报规则"
     },
     "alerting-receivers": {
-      "subtitle": "",
+      "subtitle": "选择当警报实例触发时如何通知联系人",
       "title": "联络点"
     },
     "alerting-silences": {
@@ -195,7 +195,7 @@
     },
     "alerts-and-incidents": {
       "subtitle": "警报和事件管理应用",
-      "title": "警报和事件"
+      "title": "警报和 IRM"
     },
     "api-keys": {
       "subtitle": "管理和创建用于与 Grafana HTTP API 交互的 API 密钥",
@@ -216,7 +216,7 @@
       "title": "创建"
     },
     "create-alert": {
-      "title": ""
+      "title": "创建警报规则"
     },
     "create-dashboard": {
       "title": "仪表板"
@@ -225,7 +225,7 @@
       "title": "文件夹"
     },
     "create-import": {
-      "title": ""
+      "title": "导入仪表板"
     },
     "dashboards": {
       "subtitle": "创建并管理仪表板，以将您的数据可视化",
@@ -261,11 +261,11 @@
       "title": "库面板"
     },
     "manage-folder": {
-      "subtitle": ""
+      "subtitle": "管理文件夹仪表板和权限"
     },
     "monitoring": {
       "subtitle": "监控和基础设施应用",
-      "title": "正在监控"
+      "title": "可观测性"
     },
     "new": {
       "title": "新建"
@@ -298,13 +298,13 @@
       "title": "个人资料"
     },
     "public": {
-      "title": ""
+      "title": "公共仪表板"
     },
     "scenes": {
       "title": "场景"
     },
     "search": {
-      "placeholderCommandPalette": ""
+      "placeholderCommandPalette": "搜索或跳转至..."
     },
     "search-dashboards": {
       "title": "搜索仪表板"
@@ -355,9 +355,9 @@
       "tv-alert": "按 ESC 退出 kiosk 模式"
     },
     "toolbar": {
-      "enable-kiosk": "",
-      "toggle-menu": "",
-      "toggle-search-bar": ""
+      "enable-kiosk": "启用 kiosk 模式",
+      "toggle-menu": "切换菜单",
+      "toggle-search-bar": "切换顶部搜索栏"
     }
   },
   "news": {
@@ -407,12 +407,12 @@
   },
   "search": {
     "actions": {
-      "include-panels": "",
-      "remove-datasource-filter": "",
-      "sort-placeholder": "",
+      "include-panels": "包括面板",
+      "remove-datasource-filter": "数据源：{{datasource}}",
+      "sort-placeholder": "排序",
       "starred": "已加星标",
-      "view-as-folders": "",
-      "view-as-list": ""
+      "view-as-folders": "按文件夹查看",
+      "view-as-list": "以列表形式查看"
     },
     "dashboard-actions": {
       "import": "导入",
@@ -421,26 +421,26 @@
       "new-folder": "新建文件夹"
     },
     "folder-view": {
-      "go-to-folder": "",
-      "select-folder": ""
+      "go-to-folder": "前往文件夹",
+      "select-folder": "选择文件夹"
     },
     "result-kind": {
       "dashboard": "仪表板",
       "folder": "文件夹",
-      "panel": ""
+      "panel": "面板"
     },
     "results-table": {
-      "datasource-header": "",
-      "location-header": "",
-      "name-header": "姓名",
-      "tags-header": "",
+      "datasource-header": "数据源",
+      "location-header": "位置",
+      "name-header": "名称",
+      "tags-header": "标签",
       "type-dashboard": "仪表板",
       "type-folder": "文件夹",
-      "type-header": ""
+      "type-header": "类型"
     },
     "search-input": {
-      "include-panels-placeholder": "",
-      "placeholder": ""
+      "include-panels-placeholder": "搜索仪表板和面板",
+      "placeholder": "搜索仪表板"
     }
   },
   "share-modal": {
@@ -536,14 +536,14 @@
       "dark-label": "深色",
       "default-label": "默认",
       "light-label": "浅色",
-      "system-label": ""
+      "system-label": "系统"
     },
     "title": "首选项"
   },
   "tag-filter": {
-    "loading": "",
-    "no-tags": "",
-    "placeholder": ""
+    "loading": "加载中...",
+    "no-tags": "未找到标签",
+    "placeholder": "按标签筛选"
   },
   "time-picker": {
     "absolute": {
@@ -621,7 +621,7 @@
   },
   "variable": {
     "adhoc": {
-      "placeholder": ""
+      "placeholder": "选择值"
     },
     "dropdown": {
       "placeholder": "输入变量值"

From 0f9c6be3f0a50e8ff6000714a893992eca4d3465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 21 Apr 2023 15:32:47 +0200
Subject: [PATCH 320/729] QueryGroup: Cleanup leftovers from hackathons
 (#67048)

---
 .betterer.results                             |   4 -
 .../features/query/components/QueryGroup.tsx  |  21 +---
 .../query/components/SavedQueryPicker.tsx     | 116 ------------------
 public/app/features/sandbox/TestStuffPage.tsx |   1 -
 public/app/types/query.ts                     |   1 -
 5 files changed, 1 insertion(+), 142 deletions(-)
 delete mode 100644 public/app/features/query/components/SavedQueryPicker.tsx

diff --git a/.betterer.results b/.betterer.results
index e821ba95673..a4cb078f9fd 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -3206,10 +3206,6 @@ exports[`better eslint`] = {
     "public/app/features/query/components/QueryGroupOptions.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/query/components/SavedQueryPicker.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
-    ],
     "public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index 42233e2aa06..069678445ec 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -27,7 +27,7 @@ import { DataSourcePicker } from 'app/features/datasources/components/picker/Dat
 import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
 import { DashboardQueryEditor, isSharedDashboardQuery } from 'app/plugins/datasource/dashboard';
 import { GrafanaQuery, GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
-import { QueryGroupDataSource, QueryGroupOptions } from 'app/types';
+import { QueryGroupOptions } from 'app/types';
 
 import { PanelQueryRunner } from '../state/PanelQueryRunner';
 import { updateQueries } from '../state/updateQueries';
@@ -57,12 +57,6 @@ interface State {
   isHelpOpen: boolean;
   defaultDataSource?: DataSourceApi;
   scrollElement?: HTMLDivElement;
-  savedQueryUid?: string | null;
-  initialState: {
-    queries: DataQuery[];
-    dataSource?: QueryGroupDataSource;
-    savedQueryUid?: string | null;
-  };
 }
 
 export class QueryGroup extends PureComponent<Props, State> {
@@ -78,11 +72,6 @@ export class QueryGroup extends PureComponent<Props, State> {
     isAddingMixed: false,
     isHelpOpen: false,
     queries: [],
-    savedQueryUid: null,
-    initialState: {
-      queries: [],
-      savedQueryUid: null,
-    },
     data: {
       state: LoadingState.NotStarted,
       series: [],
@@ -113,12 +102,6 @@ export class QueryGroup extends PureComponent<Props, State> {
         dataSource: ds,
         dsSettings,
         defaultDataSource,
-        savedQueryUid: options.savedQueryUid,
-        initialState: {
-          queries: options.queries.map((q) => ({ ...q })),
-          dataSource: { ...options.dataSource },
-          savedQueryUid: options.savedQueryUid,
-        },
         // TODO: Detect the first panel added into a new dashboard better.
         // This is flaky in case the UID is generated differently
         isDataSourceModalOpen:
@@ -152,7 +135,6 @@ export class QueryGroup extends PureComponent<Props, State> {
     const dataSource = await this.dataSourceSrv.get(newSettings.name);
     this.onChange({
       queries,
-      savedQueryUid: null,
       dataSource: {
         name: newSettings.name,
         uid: newSettings.uid,
@@ -163,7 +145,6 @@ export class QueryGroup extends PureComponent<Props, State> {
 
     this.setState({
       queries,
-      savedQueryUid: null,
       dataSource: dataSource,
       dsSettings: newSettings,
     });
diff --git a/public/app/features/query/components/SavedQueryPicker.tsx b/public/app/features/query/components/SavedQueryPicker.tsx
deleted file mode 100644
index 83f827c5f51..00000000000
--- a/public/app/features/query/components/SavedQueryPicker.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-// Libraries
-import React, { useMemo } from 'react';
-// Components
-import { useAsync } from 'react-use';
-import { AsyncState } from 'react-use/lib/useAsyncFn';
-
-import { DataSourceInstanceSettings, isUnsignedPluginSignature, SelectableValue } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { getDataSourceSrv } from '@grafana/runtime/src';
-import { HorizontalGroup, PluginSignatureBadge, Select } from '@grafana/ui';
-
-import { getGrafanaSearcher, QueryResponse, SearchQuery } from '../../search/service';
-
-export type SavedQueryPickerProps = {
-  onChange: (savedQueryUid: string | null) => void;
-  current?: string | null; // type
-  hideTextValue?: boolean;
-  onBlur?: () => void;
-  autoFocus?: boolean;
-  openMenuOnFocus?: boolean;
-  placeholder?: string;
-  tracing?: boolean;
-  mixed?: boolean;
-  dashboard?: boolean;
-  metrics?: boolean;
-  type?: string | string[];
-  annotations?: boolean;
-  variables?: boolean;
-  alerting?: boolean;
-  pluginId?: string;
-  /** If true,we show only DSs with logs; and if true, pluginId shouldnt be passed in */
-  logs?: boolean;
-  width?: number;
-  inputId?: string;
-  filter?: (dataSource: DataSourceInstanceSettings) => boolean;
-  onClear?: () => void;
-};
-
-function getSavedQueryPickerOptions(results: AsyncState<QueryResponse>): Array<SelectableValue<string>> {
-  if (results?.loading) {
-    return [];
-  }
-
-  if (!results?.value?.totalRows) {
-    return [];
-  }
-
-  const hits = results.value.view.toArray();
-
-  return hits.map((h) => {
-    const dsSettings = h.ds_uid?.length ? getDataSourceSrv().getInstanceSettings(h.ds_uid[0]) : undefined;
-
-    return {
-      value: h.uid,
-      label: h.name,
-      imgUrl: dsSettings?.meta.info.logos.small,
-      meta: dsSettings?.meta,
-    };
-  });
-}
-
-export const SavedQueryPicker = (props: SavedQueryPickerProps) => {
-  const { autoFocus, onBlur, onChange, current, openMenuOnFocus, placeholder, width, inputId } = props;
-
-  const searchQuery = useMemo<SearchQuery>(() => {
-    // TODO: ensure we fetch all saved queries?
-    const query: SearchQuery = {
-      query: '*',
-      explain: true,
-      kind: ['query'],
-    };
-
-    return query;
-  }, []);
-
-  const results = useAsync(async () => {
-    return getGrafanaSearcher().search(searchQuery);
-  }, [searchQuery]);
-
-  const options = getSavedQueryPickerOptions(results);
-
-  return (
-    <div aria-label={selectors.components.DataSourcePicker.container}>
-      <Select
-        aria-label={selectors.components.DataSourcePicker.inputV2}
-        inputId={inputId || 'data-source-picker'}
-        className="ds-picker select-container"
-        isMulti={false}
-        isClearable={true}
-        backspaceRemovesValue={true}
-        options={options}
-        autoFocus={autoFocus}
-        onBlur={onBlur}
-        width={width}
-        value={current}
-        onChange={(newValue) => {
-          onChange(newValue?.value ?? null);
-        }}
-        openMenuOnFocus={openMenuOnFocus}
-        maxMenuHeight={500}
-        placeholder={placeholder ?? 'Select query from the library'}
-        noOptionsMessage="No queries found"
-        getOptionLabel={(o) => {
-          if (o.meta && isUnsignedPluginSignature(o.meta.signature)) {
-            return (
-              <HorizontalGroup align="center" justify="space-between">
-                <span>{o.label}</span> <PluginSignatureBadge status={o.meta.signature} />
-              </HorizontalGroup>
-            );
-          }
-          return o.label || '';
-        }}
-      />
-    </div>
-  );
-};
diff --git a/public/app/features/sandbox/TestStuffPage.tsx b/public/app/features/sandbox/TestStuffPage.tsx
index c2ecb21ec12..4cdb3a5b7ec 100644
--- a/public/app/features/sandbox/TestStuffPage.tsx
+++ b/public/app/features/sandbox/TestStuffPage.tsx
@@ -143,7 +143,6 @@ export function getDefaultState(): State {
         name: 'gdev-testdata',
       },
       maxDataPoints: 100,
-      savedQueryUid: null,
     },
   };
 }
diff --git a/public/app/types/query.ts b/public/app/types/query.ts
index 0b794ec2186..96568d2dcf2 100644
--- a/public/app/types/query.ts
+++ b/public/app/types/query.ts
@@ -3,7 +3,6 @@ import { DataQuery, DataSourceRef } from '@grafana/data';
 export interface QueryGroupOptions {
   queries: DataQuery[];
   dataSource: QueryGroupDataSource;
-  savedQueryUid?: string | null;
   maxDataPoints?: number | null;
   minInterval?: string | null;
   cacheTimeout?: string | null;

From 94294a72c884aa37653f2d7e977b582095c44093 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Fri, 21 Apr 2023 14:44:48 +0100
Subject: [PATCH 321/729] Tracing: Update e2e test (#66960)

Update e2e test
---
 e2e/various-suite/trace-view-scrolling.spec.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/e2e/various-suite/trace-view-scrolling.spec.ts b/e2e/various-suite/trace-view-scrolling.spec.ts
index 5fd3cfdae0f..4828849d0a7 100644
--- a/e2e/various-suite/trace-view-scrolling.spec.ts
+++ b/e2e/various-suite/trace-view-scrolling.spec.ts
@@ -4,7 +4,7 @@ describe('Trace view', () => {
   it('Can lazy load big traces', () => {
     e2e.flows.login('admin', 'admin');
     e2e()
-      .intercept('GET', '**/api/traces/long-trace', {
+      .intercept('GET', '**/api/traces/trace', {
         fixture: 'long-trace-response.json',
       })
       .as('longTrace');
@@ -13,7 +13,9 @@ describe('Trace view', () => {
 
     e2e.components.DataSourcePicker.container().should('be.visible').type('gdev-jaeger{enter}');
 
-    e2e.components.QueryField.container().should('be.visible').type('long-trace');
+    e2e().wait(500);
+
+    e2e.components.QueryField.container().should('be.visible').type('trace', { delay: 100 });
 
     e2e().wait(500);
 

From 5d7433d820b6571f26506d565e89e4f914b9b91d Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Fri, 21 Apr 2023 15:05:11 +0100
Subject: [PATCH 322/729] RBAC: Make access control metadata for folders work
 with nested folders (#66464)

* remove metadata for single folder listing

* extendTests

* remove ac metadata from dash and folder search results

* remove test

* remove one more test

* put ac metadata back for single folder API responses

* extend tests

* remove ac metadata from folder frontend object

* undo unneeded change

* PR feedback

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
---
 pkg/api/dtos/folder.go                        |   9 +-
 pkg/api/folder.go                             |  40 +++++--
 pkg/api/folder_test.go                        |  64 +++++------
 pkg/api/search.go                             |  42 +-------
 pkg/api/search_test.go                        | 101 ------------------
 .../core/components/Select/FolderPicker.tsx   |  10 +-
 .../components/rule-editor/FolderAndGroup.tsx |  35 +-----
 .../rule-editor/RuleFolderPicker.tsx          |   6 +-
 .../manage-dashboards/state/actions.ts        |   7 +-
 public/app/types/acl.ts                       |   6 ++
 10 files changed, 87 insertions(+), 233 deletions(-)
 delete mode 100644 pkg/api/search_test.go

diff --git a/pkg/api/dtos/folder.go b/pkg/api/dtos/folder.go
index 618a64a0d45..a35167db214 100644
--- a/pkg/api/dtos/folder.go
+++ b/pkg/api/dtos/folder.go
@@ -27,9 +27,8 @@ type Folder struct {
 }
 
 type FolderSearchHit struct {
-	Id            int64                  `json:"id"`
-	Uid           string                 `json:"uid"`
-	Title         string                 `json:"title"`
-	AccessControl accesscontrol.Metadata `json:"accessControl,omitempty"`
-	ParentUID     string                 `json:"parentUid,omitempty"`
+	Id        int64  `json:"id"`
+	Uid       string `json:"uid"`
+	Title     string `json:"title"`
+	ParentUID string `json:"parentUid,omitempty"`
 }
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index ab233d61f6d..e856cc26c9d 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -54,10 +54,8 @@ func (hs *HTTPServer) GetFolders(c *contextmodel.ReqContext) response.Response {
 		return apierrors.ToFolderErrorResponse(err)
 	}
 
-	uids := make(map[string]bool, len(folders))
 	result := make([]dtos.FolderSearchHit, 0)
 	for _, f := range folders {
-		uids[f.UID] = true
 		result = append(result, dtos.FolderSearchHit{
 			Id:        f.ID,
 			Uid:       f.UID,
@@ -66,13 +64,6 @@ func (hs *HTTPServer) GetFolders(c *contextmodel.ReqContext) response.Response {
 		})
 	}
 
-	metadata := hs.getMultiAccessControlMetadata(c, c.OrgID, dashboards.ScopeFoldersPrefix, uids)
-	if len(metadata) > 0 {
-		for i := range result {
-			result[i].AccessControl = metadata[result[i].Uid]
-		}
-	}
-
 	return response.JSON(http.StatusOK, result)
 }
 
@@ -318,6 +309,8 @@ func (hs *HTTPServer) newToFolderDto(c *contextmodel.ReqContext, g guardian.Dash
 		updater = hs.getUserLogin(c.Req.Context(), folder.UpdatedBy)
 	}
 
+	acMetadata, _ := hs.getFolderACMetadata(c, folder)
+
 	return dtos.Folder{
 		Id:            folder.ID,
 		Uid:           folder.UID,
@@ -333,11 +326,38 @@ func (hs *HTTPServer) newToFolderDto(c *contextmodel.ReqContext, g guardian.Dash
 		UpdatedBy:     updater,
 		Updated:       folder.Updated,
 		Version:       folder.Version,
-		AccessControl: hs.getAccessControlMetadata(c, c.OrgID, dashboards.ScopeFoldersPrefix, folder.UID),
+		AccessControl: acMetadata,
 		ParentUID:     folder.ParentUID,
 	}
 }
 
+func (hs *HTTPServer) getFolderACMetadata(c *contextmodel.ReqContext, f *folder.Folder) (accesscontrol.Metadata, error) {
+	if hs.AccessControl.IsDisabled() || !c.QueryBool("accesscontrol") {
+		return nil, nil
+	}
+
+	parents, err := hs.folderService.GetParents(c.Req.Context(), folder.GetParentsQuery{UID: f.UID, OrgID: c.OrgID})
+	if err != nil {
+		return nil, err
+	}
+
+	folderIDs := map[string]bool{f.UID: true}
+	for _, p := range parents {
+		folderIDs[p.UID] = true
+	}
+
+	allMetadata := hs.getMultiAccessControlMetadata(c, c.OrgID, dashboards.ScopeFoldersPrefix, folderIDs)
+	metadata := allMetadata[f.UID]
+
+	// Flatten metadata - if any parent has a permission, the child folder inherits it
+	for _, md := range allMetadata {
+		for action := range md {
+			metadata[action] = true
+		}
+	}
+	return metadata, nil
+}
+
 func (hs *HTTPServer) searchFolders(c *contextmodel.ReqContext) ([]*folder.Folder, error) {
 	searchQuery := search.Query{
 		SignedInUser: c.SignedInUser,
diff --git a/pkg/api/folder_test.go b/pkg/api/folder_test.go
index 6640397e63e..196023bb6ec 100644
--- a/pkg/api/folder_test.go
+++ b/pkg/api/folder_test.go
@@ -271,6 +271,7 @@ func testDescription(description string, expectedErr error) string {
 func TestHTTPServer_FolderMetadata(t *testing.T) {
 	setUpRBACGuardian(t)
 	folderService := &foldertest.FakeService{}
+	features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
 	server := SetupAPITestServer(t, func(hs *HTTPServer) {
 		hs.Cfg = &setting.Cfg{
 			RBACEnabled: true,
@@ -280,35 +281,7 @@ func TestHTTPServer_FolderMetadata(t *testing.T) {
 		hs.SearchService = &mockSearchService{
 			ExpectedResult: model.HitList{},
 		}
-	})
-
-	t.Run("Should attach access control metadata to multiple folders", func(t *testing.T) {
-		folderService.ExpectedFolders = []*folder.Folder{{UID: "1"}, {UID: "2"}, {UID: "3"}}
-
-		req := server.NewGetRequest("/api/folders?accesscontrol=true")
-		webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{
-			1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersAll},
-				{Action: dashboards.ActionFoldersWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("2")},
-			}),
-		}})
-
-		res, err := server.Send(req)
-		require.NoError(t, err)
-		defer func() { require.NoError(t, res.Body.Close()) }()
-		assert.Equal(t, http.StatusOK, res.StatusCode)
-
-		body := []dtos.FolderSearchHit{}
-		require.NoError(t, json.NewDecoder(res.Body).Decode(&body))
-
-		for _, f := range body {
-			assert.True(t, f.AccessControl[dashboards.ActionFoldersRead])
-			if f.Uid == "2" {
-				assert.True(t, f.AccessControl[dashboards.ActionFoldersWrite])
-			} else {
-				assert.False(t, f.AccessControl[dashboards.ActionFoldersWrite])
-			}
-		}
+		hs.Features = features
 	})
 
 	t.Run("Should attach access control metadata to folder response", func(t *testing.T) {
@@ -334,7 +307,38 @@ func TestHTTPServer_FolderMetadata(t *testing.T) {
 		assert.True(t, body.AccessControl[dashboards.ActionFoldersWrite])
 	})
 
-	t.Run("Should attach access control metadata to folder response", func(t *testing.T) {
+	t.Run("Should attach access control metadata to folder response with permissions cascading from nested folders", func(t *testing.T) {
+		folderService.ExpectedFolder = &folder.Folder{UID: "folderUid"}
+		folderService.ExpectedFolders = []*folder.Folder{{UID: "parentUid"}}
+		features = featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
+		defer func() {
+			features = featuremgmt.WithFeatures()
+			folderService.ExpectedFolders = nil
+		}()
+
+		req := server.NewGetRequest("/api/folders/folderUid?accesscontrol=true")
+		webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{
+			1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{
+				{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersAll},
+				{Action: dashboards.ActionFoldersWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("parentUid")},
+				{Action: dashboards.ActionDashboardsCreate, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("folderUid")},
+			}),
+		}})
+
+		res, err := server.Send(req)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, res.StatusCode)
+		defer func() { require.NoError(t, res.Body.Close()) }()
+
+		body := dtos.Folder{}
+		require.NoError(t, json.NewDecoder(res.Body).Decode(&body))
+
+		assert.True(t, body.AccessControl[dashboards.ActionFoldersRead])
+		assert.True(t, body.AccessControl[dashboards.ActionFoldersWrite])
+		assert.True(t, body.AccessControl[dashboards.ActionDashboardsCreate])
+	})
+
+	t.Run("Should not attach access control metadata to folder response", func(t *testing.T) {
 		folderService.ExpectedFolder = &folder.Folder{UID: "folderUid"}
 
 		req := server.NewGetRequest("/api/folders/folderUid")
diff --git a/pkg/api/search.go b/pkg/api/search.go
index 3c7cd61ae51..6602a002235 100644
--- a/pkg/api/search.go
+++ b/pkg/api/search.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/search"
@@ -88,46 +87,7 @@ func (hs *HTTPServer) Search(c *contextmodel.ReqContext) response.Response {
 
 	defer c.TimeRequest(metrics.MApiDashboardSearch)
 
-	if !c.QueryBool("accesscontrol") {
-		return response.JSON(http.StatusOK, hits)
-	}
-
-	return hs.searchHitsWithMetadata(c, hits)
-}
-
-func (hs *HTTPServer) searchHitsWithMetadata(c *contextmodel.ReqContext, hits model.HitList) response.Response {
-	folderUIDs := make(map[string]bool)
-	dashboardUIDs := make(map[string]bool)
-
-	for _, hit := range hits {
-		if hit.Type == model.DashHitFolder {
-			folderUIDs[hit.UID] = true
-		} else {
-			dashboardUIDs[hit.UID] = true
-			folderUIDs[hit.FolderUID] = true
-		}
-	}
-
-	folderMeta := hs.getMultiAccessControlMetadata(c, c.OrgID, dashboards.ScopeFoldersPrefix, folderUIDs)
-	dashboardMeta := hs.getMultiAccessControlMetadata(c, c.OrgID, dashboards.ScopeDashboardsPrefix, dashboardUIDs)
-
-	// search hit with access control metadata attached
-	type hitWithMeta struct {
-		*model.Hit
-		AccessControl accesscontrol.Metadata `json:"accessControl,omitempty"`
-	}
-	hitsWithMeta := make([]hitWithMeta, 0, len(hits))
-	for _, hit := range hits {
-		var meta accesscontrol.Metadata
-		if hit.Type == model.DashHitFolder {
-			meta = folderMeta[hit.UID]
-		} else {
-			meta = accesscontrol.MergeMeta("dashboards", dashboardMeta[hit.UID], folderMeta[hit.FolderUID])
-		}
-		hitsWithMeta = append(hitsWithMeta, hitWithMeta{hit, meta})
-	}
-
-	return response.JSON(http.StatusOK, hitsWithMeta)
+	return response.JSON(http.StatusOK, hits)
 }
 
 // swagger:route GET /search/sorting search listSortOptions
diff --git a/pkg/api/search_test.go b/pkg/api/search_test.go
deleted file mode 100644
index 68b5a656868..00000000000
--- a/pkg/api/search_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/search/model"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web/webtest"
-)
-
-func TestHTTPServer_Search(t *testing.T) {
-	type testCase struct {
-		desc             string
-		includeMetadata  bool
-		permissions      []accesscontrol.Permission
-		expectedMetadata map[int64]map[string]struct{}
-	}
-
-	type withMeta struct {
-		model.Hit
-		AccessControl accesscontrol.Metadata `json:"accessControl,omitempty"`
-	}
-
-	tests := []testCase{
-		{
-			desc:            "should attach metadata to response",
-			includeMetadata: true,
-			expectedMetadata: map[int64]map[string]struct{}{
-				1: {dashboards.ActionFoldersRead: {}},
-				2: {dashboards.ActionFoldersRead: {}, dashboards.ActionFoldersWrite: {}, dashboards.ActionDashboardsWrite: {}},
-				3: {dashboards.ActionDashboardsRead: {}, dashboards.ActionDashboardsWrite: {}},
-			},
-			permissions: []accesscontrol.Permission{
-				{Action: "folders:read", Scope: "folders:*"},
-				{Action: "folders:write", Scope: "folders:uid:folder2"},
-				{Action: "dashboards:read", Scope: "dashboards:*"},
-				{Action: "dashboards:write", Scope: "folders:uid:folder2"},
-			},
-		},
-		{
-			desc:             "not attach metadata",
-			includeMetadata:  false,
-			expectedMetadata: map[int64]map[string]struct{}{},
-			permissions: []accesscontrol.Permission{
-				{Action: "folders:read", Scope: "folders:*"},
-				{Action: "folders:write", Scope: "folders:uid:folder2"},
-				{Action: "dashboards:read", Scope: "dashboards:*"},
-				{Action: "dashboards:write", Scope: "folders:uid:folder2"},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.desc, func(t *testing.T) {
-			server := SetupAPITestServer(t, func(hs *HTTPServer) {
-				hs.Cfg = setting.NewCfg()
-				hs.SearchService = &mockSearchService{ExpectedResult: model.HitList{
-					{ID: 1, UID: "folder1", Title: "folder1", Type: model.DashHitFolder},
-					{ID: 2, UID: "folder2", Title: "folder2", Type: model.DashHitFolder},
-					{ID: 3, UID: "dash3", Title: "dash3", FolderUID: "folder2", Type: model.DashHitDB},
-				}}
-			})
-
-			url := "/api/search"
-			if tt.includeMetadata {
-				url += "?accesscontrol=true"
-			}
-
-			res, err := server.Send(
-				webtest.RequestWithSignedInUser(
-					server.NewGetRequest(url), userWithPermissions(1, tt.permissions),
-				),
-			)
-			require.NoError(t, err)
-
-			var result []withMeta
-			require.NoError(t, json.NewDecoder(res.Body).Decode(&result))
-
-			for _, r := range result {
-				if !tt.includeMetadata {
-					assert.Nil(t, r.AccessControl)
-					continue
-				}
-
-				assert.Len(t, r.AccessControl, len(tt.expectedMetadata[r.ID]))
-				for action := range r.AccessControl {
-					_, ok := tt.expectedMetadata[r.ID][action]
-					assert.True(t, ok)
-				}
-			}
-
-			require.NoError(t, res.Body.Close())
-		})
-	}
-}
diff --git a/public/app/core/components/Select/FolderPicker.tsx b/public/app/core/components/Select/FolderPicker.tsx
index dc615f0f326..e3d9bca1557 100644
--- a/public/app/core/components/Select/FolderPicker.tsx
+++ b/public/app/core/components/Select/FolderPicker.tsx
@@ -11,7 +11,7 @@ import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import { createFolder, getFolderByUid, searchFolders } from 'app/features/manage-dashboards/state/actions';
 import { DashboardSearchHit } from 'app/features/search/types';
-import { AccessControlAction, PermissionLevelString } from 'app/types';
+import { AccessControlAction, PermissionLevelString, SearchQueryType } from 'app/types';
 
 export type FolderPickerFilter = (hits: DashboardSearchHit[]) => DashboardSearchHit[];
 
@@ -40,7 +40,7 @@ export interface Props {
   allowEmpty?: boolean;
   showRoot?: boolean;
   onClear?: () => void;
-  accessControlMetadata?: boolean;
+  searchQueryType?: SearchQueryType;
   customAdd?: CustomAdd;
   folderWarning?: FolderWarning;
 
@@ -73,7 +73,7 @@ export function FolderPicker(props: Props) {
     rootName = 'General',
     showRoot = true,
     skipInitialLoad,
-    accessControlMetadata,
+    searchQueryType,
     customAdd,
     folderWarning,
   } = props;
@@ -89,7 +89,7 @@ export function FolderPicker(props: Props) {
 
   const getOptions = useCallback(
     async (query: string) => {
-      const searchHits = await searchFolders(query, permissionLevel, accessControlMetadata);
+      const searchHits = await searchFolders(query, permissionLevel, searchQueryType);
       const resultsAfterMapAndFilter = mapSearchHitsToOptions(searchHits, filter);
       const options: Array<SelectableValue<string>> = resultsAfterMapAndFilter;
 
@@ -122,7 +122,7 @@ export function FolderPicker(props: Props) {
       permissionLevel,
       rootName,
       showRoot,
-      accessControlMetadata,
+      searchQueryType,
       filter,
       enableCreateNew,
       customAdd,
diff --git a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
index 2aabb21e8b1..2a078322785 100644
--- a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
@@ -6,9 +6,7 @@ import { useFormContext } from 'react-hook-form';
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
 import { AsyncSelect, Field, InputControl, Label, LoadingPlaceholder, useStyles2 } from '@grafana/ui';
-import { FolderPickerFilter } from 'app/core/components/Select/FolderPicker';
 import { contextSrv } from 'app/core/core';
-import { DashboardSearchHit } from 'app/features/search/types';
 import { AccessControlAction, useDispatch } from 'app/types';
 
 import { useCombinedRuleNamespaces } from '../../hooks/useCombinedRuleNamespaces';
@@ -20,7 +18,7 @@ import { isGrafanaRulerRule } from '../../utils/rules';
 import { InfoIcon } from '../InfoIcon';
 
 import { MINUTE } from './AlertRuleForm';
-import { containsSlashes, Folder, RuleFolderPicker } from './RuleFolderPicker';
+import { Folder, RuleFolderPicker } from './RuleFolderPicker';
 import { checkForPathSeparator } from './util';
 
 export const SLICE_GROUP_RESULTS_TO = 1000;
@@ -51,35 +49,6 @@ export const useGetGroupOptionsFromFolder = (folderTitle: string) => {
   return { groupOptions, loading: groupfoldersForGrafana?.loading };
 };
 
-const useRuleFolderFilter = (existingRuleForm: RuleForm | null) => {
-  const isSearchHitAvailable = useCallback(
-    (hit: DashboardSearchHit) => {
-      const rbacDisabledFallback = contextSrv.hasEditPermissionInFolders;
-
-      const canCreateRuleInFolder = contextSrv.hasAccessInMetadata(
-        AccessControlAction.AlertingRuleCreate,
-        hit,
-        rbacDisabledFallback
-      );
-
-      const canUpdateInCurrentFolder =
-        existingRuleForm &&
-        hit.folderId === existingRuleForm.id &&
-        contextSrv.hasAccessInMetadata(AccessControlAction.AlertingRuleUpdate, hit, rbacDisabledFallback);
-      return canCreateRuleInFolder || canUpdateInCurrentFolder;
-    },
-    [existingRuleForm]
-  );
-
-  return useCallback<FolderPickerFilter>(
-    (folderHits) =>
-      folderHits
-        .filter(isSearchHitAvailable)
-        .filter((value: DashboardSearchHit) => !containsSlashes(value.title ?? '')),
-    [isSearchHitAvailable]
-  );
-};
-
 export function FolderAndGroup({ initialFolder }: FolderAndGroupProps) {
   const {
     formState: { errors },
@@ -89,7 +58,6 @@ export function FolderAndGroup({ initialFolder }: FolderAndGroupProps) {
 
   const styles = useStyles2(getStyles);
   const dispatch = useDispatch();
-  const folderFilter = useRuleFolderFilter(initialFolder);
 
   const folder = watch('folder');
   const group = watch('group');
@@ -165,7 +133,6 @@ export function FolderAndGroup({ initialFolder }: FolderAndGroupProps) {
               {...field}
               enableCreateNew={contextSrv.hasPermission(AccessControlAction.FoldersCreate)}
               enableReset={true}
-              filter={folderFilter}
               onChange={({ title, uid }) => {
                 field.onChange({ title, uid });
                 if (!groupIsInGroupOptions(selectedGroup.value ?? '')) {
diff --git a/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx b/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx
index 51e0c24c2c6..73798d29ab1 100644
--- a/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx
@@ -5,7 +5,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
 import { Icon, Tooltip, useStyles2 } from '@grafana/ui';
 import { FolderPicker, Props as FolderPickerProps } from 'app/core/components/Select/FolderPicker';
-import { PermissionLevelString } from 'app/types';
+import { PermissionLevelString, SearchQueryType } from 'app/types';
 
 import { FolderWarning, CustomAdd } from '../../../../../core/components/Select/FolderPicker';
 
@@ -54,9 +54,9 @@ export function RuleFolderPicker(props: RuleFolderPickerProps) {
       allowEmpty={true}
       initialTitle={value?.title}
       initialFolderUid={value?.uid}
-      accessControlMetadata
+      searchQueryType={SearchQueryType.AlertFolder}
       {...props}
-      permissionLevel={PermissionLevelString.View}
+      permissionLevel={PermissionLevelString.Edit}
       customAdd={customAdd}
       folderWarning={folderWarning}
     />
diff --git a/public/app/features/manage-dashboards/state/actions.ts b/public/app/features/manage-dashboards/state/actions.ts
index 582f407fb4b..c244a5193b8 100644
--- a/public/app/features/manage-dashboards/state/actions.ts
+++ b/public/app/features/manage-dashboards/state/actions.ts
@@ -4,7 +4,7 @@ import { notifyApp } from 'app/core/actions';
 import { createErrorNotification } from 'app/core/copy/appNotification';
 import { SaveDashboardCommand } from 'app/features/dashboard/components/SaveDashboard/types';
 import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
-import { DashboardDTO, FolderInfo, PermissionLevelString, ThunkResult } from 'app/types';
+import { DashboardDTO, FolderInfo, PermissionLevelString, SearchQueryType, ThunkResult } from 'app/types';
 
 import { LibraryElementExport } from '../../dashboard/components/DashExportModal/DashboardExporter';
 import { getLibraryPanel } from '../../library-panels/state/api';
@@ -316,13 +316,12 @@ export const SLICE_FOLDER_RESULTS_TO = 1000;
 export function searchFolders(
   query: any,
   permission?: PermissionLevelString,
-  withAccessControl = false
+  type: SearchQueryType = SearchQueryType.Folder
 ): Promise<DashboardSearchHit[]> {
   return getBackendSrv().get('/api/search', {
     query,
-    type: 'dash-folder',
+    type: type,
     permission,
-    accesscontrol: withAccessControl,
     limit: SLICE_FOLDER_RESULTS_TO,
   });
 }
diff --git a/public/app/types/acl.ts b/public/app/types/acl.ts
index f603bf5dd20..7643349df33 100644
--- a/public/app/types/acl.ts
+++ b/public/app/types/acl.ts
@@ -74,6 +74,12 @@ export enum PermissionLevelString {
   Admin = 'Admin',
 }
 
+export enum SearchQueryType {
+  Folder = 'dash-folder',
+  Dashboard = 'dash-db',
+  AlertFolder = 'dash-folder-alerting',
+}
+
 export enum DataSourcePermissionLevel {
   Query = 1,
   Admin = 2,

From b6953763f4048c7e1e15e20c8602322baab0e34c Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Fri, 21 Apr 2023 15:08:52 +0100
Subject: [PATCH 323/729] RBAC: Update dashboardIntegrationFolder tests to use
 RBAC (#66845)

* wip

* tests fixed

* clean up tests

* updated tests since evaluation only happens on scenario setup

* delete debugging files
---
 .../dashboard_service_integration_test.go     | 60 ++++++++++++-------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/pkg/services/dashboards/service/dashboard_service_integration_test.go b/pkg/services/dashboards/service/dashboard_service_integration_test.go
index 19230e3be24..793881519af 100644
--- a/pkg/services/dashboards/service/dashboard_service_integration_test.go
+++ b/pkg/services/dashboards/service/dashboard_service_integration_test.go
@@ -5,10 +5,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/alerting/models"
@@ -21,7 +24,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
-	"github.com/grafana/grafana/pkg/services/team/teamtest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -815,29 +817,32 @@ type permissionScenarioFunc func(t *testing.T, sc *permissionScenarioContext)
 func permissionScenario(t *testing.T, desc string, canSave bool, fn permissionScenarioFunc) {
 	t.Helper()
 
-	mock := &guardian.FakeDashboardGuardian{
+	guardianMock := &guardian.FakeDashboardGuardian{
 		CanSaveValue: canSave,
 	}
 
 	t.Run(desc, func(t *testing.T) {
 		cfg := setting.NewCfg()
-		cfg.RBACEnabled = false
 		cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 		sqlStore := db.InitTestDB(t)
 		quotaService := quotatest.New(false, nil)
+		ac := actest.FakeAccessControl{ExpectedEvaluate: true}
 		dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 		require.NoError(t, err)
 		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-		service, err := ProvideDashboardServiceImpl(
+		folderPermissions := accesscontrolmock.NewMockedPermissionsService()
+		folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
+		dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
+		dashboardService, err := ProvideDashboardServiceImpl(
 			cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 			featuremgmt.WithFeatures(),
-			accesscontrolmock.NewMockedPermissionsService(),
-			accesscontrolmock.NewMockedPermissionsService(),
-			accesscontrolmock.New(),
+			folderPermissions,
+			dashboardPermissions,
+			ac,
 			foldertest.NewFakeService(),
 		)
 		require.NoError(t, err)
-		guardian.InitLegacyGuardian(cfg, sqlStore, service, &teamtest.FakeService{})
+		guardian.InitAccessControlGuardian(cfg, sqlStore, ac, folderPermissions, dashboardPermissions, dashboardService)
 
 		savedFolder := saveTestFolder(t, "Saved folder", testOrgID, sqlStore)
 		savedDashInFolder := saveTestDashboard(t, "Saved dash in folder", testOrgID, savedFolder.ID, sqlStore)
@@ -863,10 +868,10 @@ func permissionScenario(t *testing.T, desc string, canSave bool, fn permissionSc
 		t.Cleanup(func() {
 			guardian.New = origNewDashboardGuardian
 		})
-		guardian.MockDashboardGuardian(mock)
+		guardian.MockDashboardGuardian(guardianMock)
 
 		sc := &permissionScenarioContext{
-			dashboardGuardianMock:    mock,
+			dashboardGuardianMock:    guardianMock,
 			sqlStore:                 sqlStore,
 			savedDashInFolder:        savedDashInFolder,
 			otherSavedFolder:         otherSavedFolder,
@@ -884,18 +889,22 @@ func callSaveWithResult(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSt
 
 	dto := toSaveDashboardDto(cmd)
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	folderPermissions := accesscontrolmock.NewMockedPermissionsService()
+	folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
+
+	dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
+	dashboardPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	service, err := ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 		featuremgmt.WithFeatures(),
-		accesscontrolmock.NewMockedPermissionsService(),
-		accesscontrolmock.NewMockedPermissionsService(),
-		accesscontrolmock.New(),
+		folderPermissions,
+		dashboardPermissions,
+		actest.FakeAccessControl{},
 		foldertest.NewFakeService(),
 	)
 	require.NoError(t, err)
@@ -908,7 +917,6 @@ func callSaveWithResult(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSt
 func callSaveWithError(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlStore db.DB) error {
 	dto := toSaveDashboardDto(cmd)
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
@@ -919,7 +927,7 @@ func callSaveWithError(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSto
 		featuremgmt.WithFeatures(),
 		accesscontrolmock.NewMockedPermissionsService(),
 		accesscontrolmock.NewMockedPermissionsService(),
-		accesscontrolmock.New(),
+		actest.FakeAccessControl{},
 		foldertest.NewFakeService(),
 	)
 	require.NoError(t, err)
@@ -948,24 +956,25 @@ func saveTestDashboard(t *testing.T, title string, orgID, folderID int64, sqlSto
 			OrgRole: org.RoleAdmin,
 		},
 	}
-
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
+	dashboardPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	service, err := ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 		featuremgmt.WithFeatures(),
 		accesscontrolmock.NewMockedPermissionsService(),
-		accesscontrolmock.NewMockedPermissionsService(),
-		accesscontrolmock.New(),
+		dashboardPermissions,
+		actest.FakeAccessControl{},
 		foldertest.NewFakeService(),
 	)
 	require.NoError(t, err)
 	res, err := service.SaveDashboard(context.Background(), &dto, false)
+
 	require.NoError(t, err)
 
 	return res
@@ -987,24 +996,29 @@ func saveTestFolder(t *testing.T, title string, orgID int64, sqlStore db.DB) *da
 		OrgID:     orgID,
 		Dashboard: cmd.GetDashboardModel(),
 		User: &user.SignedInUser{
+			OrgID:   orgID,
 			UserID:  1,
 			OrgRole: org.RoleAdmin,
+			Permissions: map[int64]map[string][]string{
+				orgID: {dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersAll}, dashboards.ActionDashboardsWrite: {dashboards.ScopeDashboardsAll}},
+			},
 		},
 	}
 
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
 	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
+	folderPermissions := accesscontrolmock.NewMockedPermissionsService()
+	folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	service, err := ProvideDashboardServiceImpl(
 		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
 		featuremgmt.WithFeatures(),
+		folderPermissions,
 		accesscontrolmock.NewMockedPermissionsService(),
-		accesscontrolmock.NewMockedPermissionsService(),
-		accesscontrolmock.New(),
+		actest.FakeAccessControl{},
 		foldertest.NewFakeService(),
 	)
 	require.NoError(t, err)

From 7cb4d655845b8062b7fcf680d24e902c7ea11407 Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Fri, 21 Apr 2023 09:12:28 -0500
Subject: [PATCH 324/729] Prometheus: Add Victoria metrics to Prometheus type
 dropdown in datasource config (#66984)

* add VictoriaMetrics to prometheus type dropdown
---
 docs/sources/datasources/prometheus/_index.md |  44 +++++++-------
 .../grafana-ui/src/components/Badge/Badge.tsx |   2 +-
 .../configuration/PromFlavorVersions.ts       |  11 ++++
 .../prometheus/configuration/PromSettings.tsx |  54 ++++++++++--------
 .../datasource/prometheus/datasource.tsx      |   5 ++
 .../datasource/prometheus/img/vm_logo.png     | Bin 0 -> 4595 bytes
 public/app/types/unified-alerting-dto.ts      |   1 +
 7 files changed, 70 insertions(+), 47 deletions(-)
 create mode 100644 public/app/plugins/datasource/prometheus/img/vm_logo.png

diff --git a/docs/sources/datasources/prometheus/_index.md b/docs/sources/datasources/prometheus/_index.md
index 2a95f1ba839..205c5aa6bc3 100644
--- a/docs/sources/datasources/prometheus/_index.md
+++ b/docs/sources/datasources/prometheus/_index.md
@@ -45,28 +45,28 @@ To configure basic settings for the data source, complete the following steps:
 
 1.  Set the data source's basic configuration options:
 
-    | Name                            | Description                                                                                                                                                                                                                                                                                                     |
-    | ------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-    | `Name`                          | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                                                                                           |
-    | `Default`                       | Default data source that is pre-selected for new panels.                                                                                                                                                                                                                                                        |
-    | `URL`                           | The URL of your Prometheus server, for example, `http://prometheus.example.org:9090`.                                                                                                                                                                                                                           |
-    | `Access`                        | Only Server access mode is functional. If Server mode is already selected this option is hidden. Otherwise change to Server mode to prevent errors.                                                                                                                                                             |
-    | `Basic Auth`                    | Enable basic authentication to the Prometheus data source.                                                                                                                                                                                                                                                      |
-    | `User`                          | User name for basic authentication.                                                                                                                                                                                                                                                                             |
-    | `Password`                      | Password for basic authentication.                                                                                                                                                                                                                                                                              |
-    | `Manage alerts via Alerting UI` | Toggle whether to enable Alertmanager integration for this data source.                                                                                                                                                                                                                                         |
-    | `Scrape interval`               | Set this to the typical scrape and evaluation interval configured in Prometheus. Defaults to 15s.                                                                                                                                                                                                               |
-    | `HTTP method`                   | Use either POST or GET HTTP method to query your data source. POST is the recommended and pre-selected method as it allows bigger queries. Change this to GET if you have a Prometheus version older than 2.1 or if POST requests are restricted in your network.                                               |
-    | `Type`                          | The type of your Prometheus server; `Prometheus`, `Cortex`, `Thanos`, `Mimir`. When selected, the **Version** field attempts to populate automatically using the Prometheus [buildinfo](https://semver.org/) API. Some Prometheus types, such as Cortex, don't support this API and must be manually populated. |
-    | `Version`                       | The version of your Prometheus server, note that this field is not visible until the Prometheus type is selected.                                                                                                                                                                                               |
-    | `Disable metrics lookup`        | Checking this option will disable the metrics chooser and metric/label support in the query field's autocomplete. This helps if you have performance issues with bigger Prometheus instances.                                                                                                                   |
-    | `Custom query parameters`       | Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup`, or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'.                                                                                                         |
-    | **Exemplars configuration**     |                                                                                                                                                                                                                                                                                                                 |
-    | `Internal link`                 | Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select the backend tracing data store for your exemplar data.                                                                                                                                             |
-    | `Data source`                   | _(Visible only if you enable `Internal link`)_ Selects the backend tracing data store for your exemplar data.                                                                                                                                                                                                   |
-    | `URL`                           | _(Visible only if you disable `Internal link`)_ Defines the external link's full URL. You can interpolate the value from the field by using the [`${__value.raw}` macro]({{< relref "../..//panels-visualizations/configure-data-links/#value-variables" >}}).                                                  |
-    | `URL Label`                     | _(Optional)_ Adds a custom display label to override the value of the `Label name` field.                                                                                                                                                                                                                       |
-    | `Label name`                    | Adds a name for the exemplar traceID property.                                                                                                                                                                                                                                                                  |
+    | Name                            | Description                                                                                                                                                                                                                                                                                                                                                                                                          |
+    | ------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+    | `Name`                          | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                                                                                                                                                                                                |
+    | `Default`                       | Default data source that is pre-selected for new panels.                                                                                                                                                                                                                                                                                                                                                             |
+    | `URL`                           | The URL of your Prometheus server, for example, `http://prometheus.example.org:9090`.                                                                                                                                                                                                                                                                                                                                |
+    | `Access`                        | Only Server access mode is functional. If Server mode is already selected this option is hidden. Otherwise change to Server mode to prevent errors.                                                                                                                                                                                                                                                                  |
+    | `Basic Auth`                    | Enable basic authentication to the Prometheus data source.                                                                                                                                                                                                                                                                                                                                                           |
+    | `User`                          | User name for basic authentication.                                                                                                                                                                                                                                                                                                                                                                                  |
+    | `Password`                      | Password for basic authentication.                                                                                                                                                                                                                                                                                                                                                                                   |
+    | `Manage alerts via Alerting UI` | Toggle whether to enable Alertmanager integration for this data source.                                                                                                                                                                                                                                                                                                                                              |
+    | `Scrape interval`               | Set this to the typical scrape and evaluation interval configured in Prometheus. Defaults to 15s.                                                                                                                                                                                                                                                                                                                    |
+    | `HTTP method`                   | Use either POST or GET HTTP method to query your data source. POST is the recommended and pre-selected method as it allows bigger queries. Change this to GET if you have a Prometheus version older than 2.1 or if POST requests are restricted in your network.                                                                                                                                                    |
+    | `Type`                          | The type of your Prometheus server; `Prometheus`, `Cortex`, `Thanos`, `Mimir`. When selected, the **Version** field attempts to populate automatically using the Prometheus [buildinfo](https://prometheus.io/docs/prometheus/latest/querying/api/#build-information) API. Some Prometheus types, such as Cortex or VictoriaMetrics, don't support this API or provide version info, and must be manually populated. |
+    | `Version`                       | The version of your Prometheus server, note that this field is not visible until the Prometheus type is selected.                                                                                                                                                                                                                                                                                                    |
+    | `Disable metrics lookup`        | Checking this option will disable the metrics chooser and metric/label support in the query field's autocomplete. This helps if you have performance issues with bigger Prometheus instances.                                                                                                                                                                                                                        |
+    | `Custom query parameters`       | Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup`, or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'.                                                                                                                                                                                                              |
+    | **Exemplars configuration**     |                                                                                                                                                                                                                                                                                                                                                                                                                      |
+    | `Internal link`                 | Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select the backend tracing data store for your exemplar data.                                                                                                                                                                                                                                                  |
+    | `Data source`                   | _(Visible only if you enable `Internal link`)_ Selects the backend tracing data store for your exemplar data.                                                                                                                                                                                                                                                                                                        |
+    | `URL`                           | _(Visible only if you disable `Internal link`)_ Defines the external link's full URL. You can interpolate the value from the field by using the [`${__value.raw}` macro]({{< relref "../..//panels-visualizations/configure-data-links/#value-variables" >}}).                                                                                                                                                       |
+    | `URL Label`                     | _(Optional)_ Adds a custom display label to override the value of the `Label name` field.                                                                                                                                                                                                                                                                                                                            |
+    | `Label name`                    | Adds a name for the exemplar traceID property.                                                                                                                                                                                                                                                                                                                                                                       |
 
 ### Provision the data source
 
diff --git a/packages/grafana-ui/src/components/Badge/Badge.tsx b/packages/grafana-ui/src/components/Badge/Badge.tsx
index e97bcd10526..faf9e5f7125 100644
--- a/packages/grafana-ui/src/components/Badge/Badge.tsx
+++ b/packages/grafana-ui/src/components/Badge/Badge.tsx
@@ -9,7 +9,7 @@ import { IconName } from '../../types';
 import { Icon } from '../Icon/Icon';
 import { Tooltip } from '../Tooltip/Tooltip';
 
-export type BadgeColor = 'blue' | 'red' | 'green' | 'orange' | 'purple';
+export type BadgeColor = 'blue' | 'red' | 'green' | 'orange' | 'purple' | 'black';
 
 export interface BadgeProps extends HTMLAttributes<HTMLDivElement> {
   text: React.ReactNode;
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromFlavorVersions.ts b/public/app/plugins/datasource/prometheus/configuration/PromFlavorVersions.ts
index eb113762df4..457b857d77d 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromFlavorVersions.ts
+++ b/public/app/plugins/datasource/prometheus/configuration/PromFlavorVersions.ts
@@ -77,4 +77,15 @@ export const PromFlavorVersions: { [index: string]: Array<{ value?: string; labe
     { value: '1.13.0', label: '1.13.x' },
     { value: '1.14.0', label: '> 1.13.x' },
   ],
+  VictoriaMetrics: [
+    { value: '1.23.0', label: '< 1.24.0' },
+    { value: '1.24.0', label: '>= 1.24.x' },
+    { value: '1.30.0', label: '1.3x' },
+    { value: '1.40.0', label: '1.4x' },
+    { value: '1.50.0', label: '1.5x' },
+    { value: '1.60.0', label: '1.6x' },
+    { value: '1.70.0', label: '1.7x' },
+    { value: '1.80.0', label: '1.8x' },
+    { value: '1.90.0', label: '>= 1.9x' },
+  ],
 };
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
index b6594c2738c..77d064c35f0 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
@@ -56,6 +56,7 @@ const prometheusFlavorSelectItems: PrometheusSelectItemsType = [
   { value: PromApplication.Cortex, label: PromApplication.Cortex },
   { value: PromApplication.Mimir, label: PromApplication.Mimir },
   { value: PromApplication.Thanos, label: PromApplication.Thanos },
+  { value: PromApplication.VictoriaMetrics, label: PromApplication.VictoriaMetrics },
 ];
 
 type Props = Pick<DataSourcePluginOptionsEditorProps<PromOptions>, 'options' | 'onOptionsChange'>;
@@ -118,32 +119,37 @@ const setPrometheusVersion = (
   // This will save the current state of the form, as the url is needed for this API call to function
   onUpdate(options)
     .then((updatedOptions) => {
-      getBackendSrv()
-        .get(`/api/datasources/uid/${updatedOptions.uid}/resources/version-detect`)
-        .then((rawResponse: PromBuildInfoResponse) => {
-          const rawVersionStringFromApi = rawResponse.data?.version ?? '';
-          if (rawVersionStringFromApi && semver.valid(rawVersionStringFromApi)) {
-            const parsedVersion = getVersionString(rawVersionStringFromApi, updatedOptions.jsonData.prometheusType);
-            // If we got a successful response, let's update the backend with the version right away if it's new
-            if (parsedVersion) {
-              onUpdate({
-                ...updatedOptions,
-                jsonData: {
-                  ...updatedOptions.jsonData,
-                  prometheusVersion: parsedVersion,
-                },
-              }).then((updatedUpdatedOptions) => {
-                onOptionsChange(updatedUpdatedOptions);
-              });
+      // Not seeing version info in buildinfo response from VictoriaMetrics, and Cortex doesn't support yet, users will need to manually select version
+      if (
+        updatedOptions.jsonData.prometheusType !== PromApplication.VictoriaMetrics &&
+        updatedOptions.jsonData.prometheusType !== PromApplication.Cortex
+      ) {
+        getBackendSrv()
+          .get(`/api/datasources/uid/${updatedOptions.uid}/resources/version-detect`)
+          .then((rawResponse: PromBuildInfoResponse) => {
+            const rawVersionStringFromApi = rawResponse.data?.version ?? '';
+            if (rawVersionStringFromApi && semver.valid(rawVersionStringFromApi)) {
+              const parsedVersion = getVersionString(rawVersionStringFromApi, updatedOptions.jsonData.prometheusType);
+              // If we got a successful response, let's update the backend with the version right away if it's new
+              if (parsedVersion) {
+                onUpdate({
+                  ...updatedOptions,
+                  jsonData: {
+                    ...updatedOptions.jsonData,
+                    prometheusVersion: parsedVersion,
+                  },
+                }).then((updatedUpdatedOptions) => {
+                  onOptionsChange(updatedUpdatedOptions);
+                });
+              }
+            } else {
+              unableToDeterminePrometheusVersion();
             }
-          } else {
-            unableToDeterminePrometheusVersion();
-          }
-        });
+          })
+          .catch(unableToDeterminePrometheusVersion);
+      }
     })
-    .catch((error) => {
-      unableToDeterminePrometheusVersion(error);
-    });
+    .catch(unableToDeterminePrometheusVersion);
 };
 
 export const PromSettings = (props: Props) => {
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index 7546ff3af29..cd003fc7b6e 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -173,6 +173,8 @@ export class PrometheusDatasource
       this._isDatasourceVersionGreaterOrEqualTo('2.0.0', PromApplication.Mimir) ||
       // https://github.com/cortexproject/cortex/discussions/4542
       this._isDatasourceVersionGreaterOrEqualTo('1.11.0', PromApplication.Cortex) ||
+      //https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.24.0
+      this._isDatasourceVersionGreaterOrEqualTo('1.24.0', PromApplication.VictoriaMetrics) ||
       // https://github.com/thanos-io/thanos/pull/3566
       //https://github.com/thanos-io/thanos/releases/tag/v0.18.0
       this._isDatasourceVersionGreaterOrEqualTo('0.18.0', PromApplication.Thanos)
@@ -992,6 +994,7 @@ export class PrometheusDatasource
       [PromApplication.Mimir]: '/public/app/plugins/datasource/prometheus/img/mimir_logo.svg',
       [PromApplication.Prometheus]: '/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg',
       [PromApplication.Thanos]: '/public/app/plugins/datasource/prometheus/img/thanos_logo.svg',
+      [PromApplication.VictoriaMetrics]: '/public/app/plugins/datasource/prometheus/img/vm_logo.svg',
     };
 
     const COLORS: Record<PromApplication, BadgeColor> = {
@@ -999,6 +1002,7 @@ export class PrometheusDatasource
       [PromApplication.Mimir]: 'orange',
       [PromApplication.Prometheus]: 'red',
       [PromApplication.Thanos]: 'purple', // Purple hex taken from thanos.io
+      [PromApplication.VictoriaMetrics]: 'black',
     };
 
     const AppDisplayNames: Record<PromApplication, string> = {
@@ -1006,6 +1010,7 @@ export class PrometheusDatasource
       [PromApplication.Mimir]: 'Mimir',
       [PromApplication.Prometheus]: 'Prometheus',
       [PromApplication.Thanos]: 'Thanos',
+      [PromApplication.VictoriaMetrics]: 'VictoriaMetrics',
     };
 
     const application = this.datasourceConfigurationPrometheusFlavor ?? buildInfo.application;
diff --git a/public/app/plugins/datasource/prometheus/img/vm_logo.png b/public/app/plugins/datasource/prometheus/img/vm_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf9f8e33df0ceaa1d3114612fa4e0859b2708b7a
GIT binary patch
literal 4595
zcmb_gX*kqv)c?<7PsXkx##l=s#n_h`lU;^~7^0F4Gugsqof+GZHKgoe>}zGu7EvU5
z?AgjLWed@W*YkdSKffRDbALGJ{+;VO*YDitT)*fWX4g5{;p_kaa2gt*u_rhAzr)IW
zVmq~O_W=NRlObBqij?`oA-G&*>>r)w^<|$!7eB|RO$UlE=!X`{3y@TDdY2epm|h^S
ziu@*Vv6SZvU-?@xHiH|`i&kJZYVKzhGfQX$td^oOOtHelC%axC^}9~TZ?kxXt)&m|
z9Q1$G4*fCqQSbiVRPfmR^I%-h`b_X;oz;nr{!cS%_t!UO0@pXPHS%+HD=lD%Wm(ol
zA3o@NHFofV2ouOVo(ia4*CS`<BXmFg|F~0%i0w?wE{EBBsJH`-gNby#ZRw9Zii_86
ztR!`od3#qb?bbfgxg2GSBv%3{y__=pW{o3m{l4m10kw7&T+Cs1YB8l&B`Nu`=Oymg
z<I&+pC7?Y<7zNwn-8l7gHy|sZWyaRtUXv3DW2^j!hp__Y-lVqsfmbrr4e+<=)@8Mn
zfR?y$5);UtLQCTvlma#(z-K7H0+L6P)qvvOL>s%s^cVJ3Q9u#fS4rSCs2xJyK+ct+
zcZg8cSaej4oz}~S2GWIyMA@;7lyXZ-98|ZY;If@V{$K+bsMOC}1HQt6eQu!P6tDyv
znnv{gNPVSkaM3k&yD>_Y9XRF$7;IZ=0BPp;-_GcvzN^r(NcKtA8!B=kw?mGI1;gf$
zb`9XG5xPA7ljOhtSpWJz-Fe?^wnKT#m?%q^eue&0->T*lbWRMX1puBfAp5QCpCbC=
zVrbvC*O%&OKngFuSU4ZV3fs^l%k9Rcjuu9Nugp>K4BhUADxzFMK%BS*7kJRDYC1$W
zs5%ll)cOeSwTObpT{PGkqrIQjvS||4=?6RooS3On=-B&Q=!ef>vm1;f(XdU+2u{>P
zs{?i?RQbafbT)9EEy(6!aa1*{Q`tqyY7Cndx((9VyJ6JTYJFa;E3I^2WqX8qT$kJ+
zh$LTg#nFPY_2k(96<52mD>}{$?s9Nyv}-{j)pKF)nk+eW7J`7*UR<!V<Kj(j2x|(|
zWTbFjGs0+E)=Ss-OJtVJ4(YH+HlW+RepVc6qf#89vIFGi-)p^etGOkbCYnqx(V5Q&
zPtGLB<*Z!VGd<ttd~Gr89z`HpYk1X9$FXcg<$PDY5enZKbR5WJxZoH~(_Ulg$np;Q
zp47&c!3uZ}r6hjs+qJ8Rr)8X~xo2$vtABvLz&$8-ptrf^Jr(m{Hk=3rELYbaHk<d4
zto6}Ik3~2x!s}kbV)i@tX4aTGdN?yGgg+6GWTQsC#i6WEuWH?PGuXYFGw)tzi%cEp
z&s<4+gBZt`v!=Jw57ha`N9l#WN&Ke^1Vokvt_EF==e+RI1wIju-mr74Z_6W^XWk!C
zbTT$Rubk0ew$Lr99NJ3xr}c$f178pici%abU;4^pQ<(`&$)Vd@ObeMmy2^T|RR!iW
zUU7Xe%yjIp0W;ej)32oFzj28xa4;z~-`yB0kv(rSE?pN#OzA}taV0@}mtsU;-;>Q~
z0x_G((Y0qhGiNUs8WsizU6cFi$5_-8x}}d+h_+TV<=JtLKjxY2sxz$j_)-weI)U1=
zcw$gaHiaUPVEXX&j7kQ%rohcFb&78NG%ZcA1<~*{&vlm1Fn6RSn7}caqO|1R5j8He
zXSxk9X9YTxz^4QwXzDc50CnvsUxbSn<mh;`9`JK7&hiFl^7olI!sBsg>sB)mWG^E4
z&a8<e@g&vf;;uD-R<G>fUlm&f!8^bq)0atl)mbz@Ba_6;2U#9nEm+MZ-k%HZeOu0_
z@9G~_c55SMq}_#6Ib0{zIxt{zd6ti0bIGde@v7=4>iSWf&qG+mEm#mMpdCpIXlQ^9
zl_xdzj6HGBdtvI@)d@^~tb4_!qCl810)&!uOX^c#j-C#`;{uFaGxOz|UN0~-TaRL7
zJwF&ds-S)7zV}Oc-ws2#^W>sv%(!*kb7Fntb_Wl5B|P!<Bdug|&txB8J7~;zwzMd`
zTTT6DIZ1C*7n(S7F-H#5$(hzamS~+V@?g#>h3Jf%aH-R(*v7xBEa?G{!gRS?Sntn>
zaEf{yj0Z4nPEqHl^8Ujph+>`nE!HU;APi)xb5WB7NM>Ho?d!N#Gg8IO|BkEFB@y{E
z284dqdc>^ct}?FNhJfbeuVB9q&{o2op;B_DMHUhW?Lp7X-)CM?Uj5U#xL9=^u;CsY
z97720N{(y5c^vxhxfBOp`fw*B607WDFcSQ~4Qe`D#D-(Nu^oI|&EC02TWPSegR{LQ
zwcIQjxY)2BEP*Xx#puCAVt|ko+FnkWbuLr(U;Az$icBS;E`s<(UR;gHv}*Xwq-Wy#
zgtD_f_Wf`(0^%j-QEQhL`S(a09dr!?(DS|cxu-W+I)c45pS!*Y<Q#c8?LgbNRFW>c
zq#opI^6Tgw2bJjEvVe&ntc6!HWZ1WEO>_e1;*644Q?YdK&bhg{V*%l7FS+Xvt;>|f
z_85WOTVGD`tPnDkK!;h&jE&^^=lmz2=E%9KUb8GcWJkEOkInOAsXX&XdesuPm~D7J
zX5NGQYm3rM8g{*?@^INWwRh>=yLXGR{BKJ-RKVm3Z$bOthPpw`ucxkX>-$%j2k329
z#*V7ng%H(0Ws&z8wEgba9K3@l%8GxBALHACe{!9&!*4e9n@7r%<P~>gJx`xVqGePZ
zl#K5CtBITuN2#CLp{U&o!{RgtIIwolOE^;m?0^3xlOX89?tM#oJTTZwN9?C-%iK#B
zOq(F6IMDL6Xr%sUGk8STAyp8nleY6gdK^t&Xia?8<bh<ryvORs6Z9B{VzeIXoHKr@
zc$>pSLq@)A(De|;v-No=?CyD;C-&`Loiyb@r*Z=$#T!P1ckz%?vwFsW&#pRh&U*f`
zNl-%b6ceJU%(_Zv<fmVP5H$|ttQnf?Oi))gOifRc1P_dHZ~2}9n_r1FosY{E`$heV
z>enQPS6C(-DHEPCD;cHT3RrDQIXC<q>%sR^NMhHm<Glqi>#F{#;@lcbF2n%8xMcpN
zQ#f+Eb$+V%p7#VEJa7i<^<OA|kEQL_NKE(r6YdgbEoIC@DhFK&X0``ISdR(!dL1UT
z|NE^gCH}*~`Pc-7hIIuFwtta3BZQbhe)+JzC-Wyr2IpNS?+6d^>do_C-Af8q-qSGQ
zuY-|~8|^_q@K@kCOFMb|oeNAI`QfBwi!*qt1>gNNL`e60#XL4#mT2VMDN*^bNLvw$
z^!9wi9+etmH+It&B+2O3epywxF%-@TrBMJGr)L(7heKW=A(_K#jH3teb@=vWt7}qc
zFfXv*^Et<Y4dSDe{O)Th6}qu%av3t4yLL+yUi2pB5N~I68@~I&%W(PQ1}PT@DqdHz
zrUn#zQxzNaSx<ou#%wTHbW6&jS3DzUsv_6qhiz#7DEr?ZPB^WwY=IOSws@2<@XhBy
zBhvd>;kwsHuV+LWQ4M!~w5FFFd^_i%rmg_}HSQXa-*+ln7HbrI=f&WDSS)mqMBCKd
zz+I&-U)~8x`I>0B`Kfp|^toJq?SpA4jG|Dzr*?PFmReAy_@;AdV9?L;$XC8m7D!n}
zd#g}FGYD5mcIp&zE->D}bY1MW50%~J(OO~Z(DHszI5X=xT_t&5KAI9j;^oegCWo<;
zi(;lOpyoEuIs0^X7XNF9cT@=s8R4ShtZ_1~P3vap!(4HG_c*5nK`4$mE_uh2%L%!j
zEp=ugjH8mFua=!D{XHh;5Yg})5PkX$@w4NJy6VEf65m_`WR7^qdwg0^CWp=xDED2o
zy)&flwYxMm#Nzz1y^HuP>ZB8#BVHsSnp##>2LN3nfm*!LhC((uK2epW`<^Q)P}N;v
zPZK-4l4`kbsF^jd)JSNJ6d5prR=lf2K0xv4$vl$&X5|C{MXDe|a7SkBn(C;{$ig*k
z9UYxncrv2Y`O&_%#llN(h%azcMN}+f^lEK;=i-#iy`og%9)KV``M%D@;N6S;fSpsb
zMYIy(TpR>+n0n}7if>dm-tS+;t}^v_&7>qD;PrD-vu!zfD}syrjZ4h&0Rr-m`-WSt
z+aYC7rfyB#-EE=LxwZTMeZ9i0FeA+8Y}T*xkKVf2^_`Wbf$gzZH9c$Q578K^t0tQC
zb58;(wEIaMbz>R4*KkT+?%LPr`=SJ6HZPsYr!{7|fjll94t1ImunQa}I}nLb=IB<*
zo|gq<-)dyPEL~L4(XR6ztqS$AI<FN+tIAQ-$C>|X&40UDI4@)NCZ%S=M|Sh$K$~#N
z7v<=d@CFAS<BH;->H?O}tiIL?vbBbyW7$%>-6$?&x&udLpnv3y7>koVB}`Vy2O^=S
zb47F+-dkg^EU@WcussA7Z87siO*)N-`pM_+>6MsbtZVpFx$4Rd&d_>3m=*o%ooez;
z01YZ2=JYX4?y`3ecC}7+wAod^-|+7l2TO@YRbv{1tA1joBW`ID?Fn1<nGg+;LdrYi
zhL`g!Y64qfPPmf@HO$xO^h(AgZGSmWSQ1t9Ru;$B4xxwq`|HiIK~hZ7>5NE#x3h?P
z;R2yRF^HMFN{IKS#f3`XFk+d}Cf$?l@FPZbh;WNZ1i|CLMXO5Ck@|BQq0M3Rw`KW}
zLb)9#e~S&eUu`0mZ2Q6KltfgGRg)JUze*!ElHqkc0MEIbC&TAE8@5_>m#V8ED5IbL
zS`$3&mfZ8ixKS=Tx01nxeiKaPtA*qaFU9gHyE|P5wKr@np71Q1hU<ZPtLyDJw!FZO
zo&6Onno6oN|8j}b0b@!Szk+!%n%agVRDYia@YPv>(@cBhnszBH)Q>v)8>@4wK2z0e
z?${b1>|#fP&uvsXwjKGVV(|md)Q*Y;V`xVmT-3?rx=Hp77m%$Gn^Mr-=#`<n*-VN&
zv8D8XL$~-8^%a#at^0a-wRhk1v@Nr0oiW+Q=Wh>;Ee&(9Po6wdO@mrQ!E|oqWK52&
zK0HmAq{WAQ`a1EpLmaG{VpiacT=8(0q}n~U6$hRfiWF&NP4BwxHWv?9oH2)uR8&!c
zjhwQPTk8*-8N3^N#+@t5zNS5myr5RX(^OUe9rTTuytB7phc!uND!$SF*pECQlN62V
z^|pZ#HwAF}+3sd0Q=ZuD^D#!#)>R|SdHjhrIya=0LUtfo+Ek;zbP;1-lC>y1n`iUb
zgJV++vUvAd1VWLcDPtxU?Wj*?rx#HYRFZkx=gIrH?B%m2a@7-rTWsi18n7YyYT{K@
zl|F4_CpfgKf9TDKVjmQ!80_Ik4YLa<6}mb*3+Y|>1JmLFs@^Yq09|X8m4FXIy<dKm
z6r~$0_2@jSf#6*f*Py`kANkh(xxTy(vf*au-PcsgmgL4O#Of^GL0ic3<F!)znV`e{
zt^8M0+sdP0kgiQvB&V?acRzJ=xvsVD#P*<~oDxWEAnLaL0r#L!ZNT5cyFKyr3f_;B
zqwF9=jYnu&?7S^?ut3oVB=$Qf6t`{nD&97WsX!dw;$1lOsNhzaLu9A(z>0{YT0WC#
zys-8>6Xp4B=YH>X_jh(kKoXkoz}6xAM>J(XQG9bs!yP<OaMK-1E^xYHQ+8Ir>$kHj
z6aF)Ug`~boIoUggZ23si@9bhgPlV{i50e-_L;sn}XasLkNSlH=B*`^nYc%0?Fta<@
z{W$<HwBD3L2l1A_iN9s@-POeatq_Kt9D6Gg%CkTLoJ=Nq<1lwwVAIin2Z-#ueQ*v;
z;)aRs1s^9z?&<tGsd%CwSXU{)qXOsuA=hrYy)7-U<?iDmvzBz<2b5ZfNIpj_gV2w(
z`6Qhv02Po;RQPz+=q81O_Wv$f{2x7}=a>Zmj*lJgM%|P*uB$o`a{xnqGj!!uC+hzI
DYdMIW

literal 0
HcmV?d00001

diff --git a/public/app/types/unified-alerting-dto.ts b/public/app/types/unified-alerting-dto.ts
index 487d8cda0a3..e01a9af3404 100644
--- a/public/app/types/unified-alerting-dto.ts
+++ b/public/app/types/unified-alerting-dto.ts
@@ -64,6 +64,7 @@ export enum PromApplication {
   Mimir = 'Mimir',
   Prometheus = 'Prometheus',
   Thanos = 'Thanos',
+  VictoriaMetrics = 'VictoriaMetrics',
 }
 
 export interface PromBuildInfoResponse {

From bbce69f295fb80c6bf759f6b1a0688b5e21d438e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?=
 <JohnnyQQQQ@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:16:27 +0200
Subject: [PATCH 325/729] Alerting: Use configured headers for external
 alertmanager (#63819)

---
 pkg/services/ngalert/sender/notifier.go     | 609 ++++++++++++++++++++
 pkg/services/ngalert/sender/notifier_ext.go | 199 +++++++
 pkg/services/ngalert/sender/router.go       |  31 +-
 pkg/services/ngalert/sender/router_test.go  |   8 +-
 pkg/services/ngalert/sender/sender.go       |  64 +-
 5 files changed, 889 insertions(+), 22 deletions(-)
 create mode 100644 pkg/services/ngalert/sender/notifier.go
 create mode 100644 pkg/services/ngalert/sender/notifier_ext.go

diff --git a/pkg/services/ngalert/sender/notifier.go b/pkg/services/ngalert/sender/notifier.go
new file mode 100644
index 00000000000..19fcf21c690
--- /dev/null
+++ b/pkg/services/ngalert/sender/notifier.go
@@ -0,0 +1,609 @@
+// THIS FILE IS COPIED FROM UPSTREAM
+//
+// https://github.com/prometheus/prometheus/blob/d437f0bb6b53ec8594a43b871f92252980b13ddd/notifier/notifier.go
+//
+// Copyright 2013 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// nolint
+package sender
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"path"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
+	"github.com/go-openapi/strfmt"
+	"github.com/pkg/errors"
+	"github.com/prometheus/alertmanager/api/v2/models"
+	"github.com/prometheus/client_golang/prometheus"
+	config_util "github.com/prometheus/common/config"
+	"github.com/prometheus/common/model"
+	"github.com/prometheus/common/version"
+
+	"github.com/prometheus/prometheus/config"
+	"github.com/prometheus/prometheus/discovery/targetgroup"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/model/relabel"
+)
+
+const (
+	contentTypeJSON = "application/json"
+)
+
+// String constants for instrumentation.
+const (
+	namespace         = "prometheus"
+	subsystem         = "notifications"
+	alertmanagerLabel = "alertmanager"
+)
+
+var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
+
+// Alert is a generic representation of an alert in the Prometheus eco-system.
+type Alert struct {
+	// Label value pairs for purpose of aggregation, matching, and disposition
+	// dispatching. This must minimally include an "alertname" label.
+	Labels labels.Labels `json:"labels"`
+
+	// Extra key/value information which does not define alert identity.
+	Annotations labels.Labels `json:"annotations"`
+
+	// The known time range for this alert. Both ends are optional.
+	StartsAt     time.Time `json:"startsAt,omitempty"`
+	EndsAt       time.Time `json:"endsAt,omitempty"`
+	GeneratorURL string    `json:"generatorURL,omitempty"`
+}
+
+// Name returns the name of the alert. It is equivalent to the "alertname" label.
+func (a *Alert) Name() string {
+	return a.Labels.Get(labels.AlertName)
+}
+
+// Hash returns a hash over the alert. It is equivalent to the alert labels hash.
+func (a *Alert) Hash() uint64 {
+	return a.Labels.Hash()
+}
+
+func (a *Alert) String() string {
+	s := fmt.Sprintf("%s[%s]", a.Name(), fmt.Sprintf("%016x", a.Hash())[:7])
+	if a.Resolved() {
+		return s + "[resolved]"
+	}
+	return s + "[active]"
+}
+
+// Resolved returns true iff the activity interval ended in the past.
+func (a *Alert) Resolved() bool {
+	return a.ResolvedAt(time.Now())
+}
+
+// ResolvedAt returns true iff the activity interval ended before
+// the given timestamp.
+func (a *Alert) ResolvedAt(ts time.Time) bool {
+	if a.EndsAt.IsZero() {
+		return false
+	}
+	return !a.EndsAt.After(ts)
+}
+
+// Manager is responsible for dispatching alert notifications to an
+// alert manager service.
+type Manager struct {
+	queue []*Alert
+	opts  *Options
+
+	metrics *alertMetrics
+
+	more   chan struct{}
+	mtx    sync.RWMutex
+	ctx    context.Context
+	cancel func()
+
+	alertmanagers map[string]*alertmanagerSet
+	logger        log.Logger
+}
+
+// Options are the configurable parameters of a Handler.
+type Options struct {
+	QueueCapacity  int
+	ExternalLabels labels.Labels
+	RelabelConfigs []*relabel.Config
+	// Used for sending HTTP requests to the Alertmanager.
+	Do func(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error)
+
+	Registerer prometheus.Registerer
+}
+
+type alertMetrics struct {
+	latency                 *prometheus.SummaryVec
+	errors                  *prometheus.CounterVec
+	sent                    *prometheus.CounterVec
+	dropped                 prometheus.Counter
+	queueLength             prometheus.GaugeFunc
+	queueCapacity           prometheus.Gauge
+	alertmanagersDiscovered prometheus.GaugeFunc
+}
+
+func newAlertMetrics(r prometheus.Registerer, queueCap int, queueLen, alertmanagersDiscovered func() float64) *alertMetrics {
+	m := &alertMetrics{
+		latency: prometheus.NewSummaryVec(prometheus.SummaryOpts{
+			Namespace:  namespace,
+			Subsystem:  subsystem,
+			Name:       "latency_seconds",
+			Help:       "Latency quantiles for sending alert notifications.",
+			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
+		},
+			[]string{alertmanagerLabel},
+		),
+		errors: prometheus.NewCounterVec(prometheus.CounterOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Name:      "errors_total",
+			Help:      "Total number of errors sending alert notifications.",
+		},
+			[]string{alertmanagerLabel},
+		),
+		sent: prometheus.NewCounterVec(prometheus.CounterOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Name:      "sent_total",
+			Help:      "Total number of alerts sent.",
+		},
+			[]string{alertmanagerLabel},
+		),
+		dropped: prometheus.NewCounter(prometheus.CounterOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Name:      "dropped_total",
+			Help:      "Total number of alerts dropped due to errors when sending to Alertmanager.",
+		}),
+		queueLength: prometheus.NewGaugeFunc(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Name:      "queue_length",
+			Help:      "The number of alert notifications in the queue.",
+		}, queueLen),
+		queueCapacity: prometheus.NewGauge(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Name:      "queue_capacity",
+			Help:      "The capacity of the alert notifications queue.",
+		}),
+		alertmanagersDiscovered: prometheus.NewGaugeFunc(prometheus.GaugeOpts{
+			Name: "prometheus_notifications_alertmanagers_discovered",
+			Help: "The number of alertmanagers discovered and active.",
+		}, alertmanagersDiscovered),
+	}
+
+	m.queueCapacity.Set(float64(queueCap))
+
+	if r != nil {
+		r.MustRegister(
+			m.latency,
+			m.errors,
+			m.sent,
+			m.dropped,
+			m.queueLength,
+			m.queueCapacity,
+			m.alertmanagersDiscovered,
+		)
+	}
+
+	return m
+}
+
+func do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
+	if client == nil {
+		client = http.DefaultClient
+	}
+	return client.Do(req.WithContext(ctx))
+}
+
+// NewManager is the manager constructor.
+func NewManager(o *Options, logger log.Logger) *Manager {
+	ctx, cancel := context.WithCancel(context.Background())
+
+	if o.Do == nil {
+		o.Do = do
+	}
+	if logger == nil {
+		logger = log.NewNopLogger()
+	}
+
+	n := &Manager{
+		queue:  make([]*Alert, 0, o.QueueCapacity),
+		ctx:    ctx,
+		cancel: cancel,
+		more:   make(chan struct{}, 1),
+		opts:   o,
+		logger: logger,
+	}
+
+	queueLenFunc := func() float64 { return float64(n.queueLen()) }
+	alertmanagersDiscoveredFunc := func() float64 { return float64(len(n.Alertmanagers())) }
+
+	n.metrics = newAlertMetrics(
+		o.Registerer,
+		o.QueueCapacity,
+		queueLenFunc,
+		alertmanagersDiscoveredFunc,
+	)
+
+	return n
+}
+
+const maxBatchSize = 64
+
+func (n *Manager) queueLen() int {
+	n.mtx.RLock()
+	defer n.mtx.RUnlock()
+
+	return len(n.queue)
+}
+
+func (n *Manager) nextBatch() []*Alert {
+	n.mtx.Lock()
+	defer n.mtx.Unlock()
+
+	var alerts []*Alert
+
+	if len(n.queue) > maxBatchSize {
+		alerts = append(make([]*Alert, 0, maxBatchSize), n.queue[:maxBatchSize]...)
+		n.queue = n.queue[maxBatchSize:]
+	} else {
+		alerts = append(make([]*Alert, 0, len(n.queue)), n.queue...)
+		n.queue = n.queue[:0]
+	}
+
+	return alerts
+}
+
+// Run dispatches notifications continuously.
+func (n *Manager) Run(tsets <-chan map[string][]*targetgroup.Group) {
+
+	for {
+		select {
+		case <-n.ctx.Done():
+			return
+		case ts := <-tsets:
+			n.reload(ts)
+		case <-n.more:
+		}
+		alerts := n.nextBatch()
+
+		if !n.sendAll(alerts...) {
+			n.metrics.dropped.Add(float64(len(alerts)))
+		}
+		// If the queue still has items left, kick off the next iteration.
+		if n.queueLen() > 0 {
+			n.setMore()
+		}
+	}
+}
+
+func (n *Manager) reload(tgs map[string][]*targetgroup.Group) {
+	n.mtx.Lock()
+	defer n.mtx.Unlock()
+
+	for id, tgroup := range tgs {
+		am, ok := n.alertmanagers[id]
+		if !ok {
+			level.Error(n.logger).Log("msg", "couldn't sync alert manager set", "err", fmt.Sprintf("invalid id:%v", id))
+			continue
+		}
+		am.sync(tgroup)
+	}
+}
+
+// Send queues the given notification requests for processing.
+// Panics if called on a handler that is not running.
+func (n *Manager) Send(alerts ...*Alert) {
+	n.mtx.Lock()
+	defer n.mtx.Unlock()
+
+	// Attach external labels before relabelling and sending.
+	for _, a := range alerts {
+		lb := labels.NewBuilder(a.Labels)
+
+		for _, l := range n.opts.ExternalLabels {
+			if a.Labels.Get(l.Name) == "" {
+				lb.Set(l.Name, l.Value)
+			}
+		}
+
+		a.Labels = lb.Labels()
+	}
+
+	alerts = n.relabelAlerts(alerts)
+	if len(alerts) == 0 {
+		return
+	}
+
+	// Queue capacity should be significantly larger than a single alert
+	// batch could be.
+	if d := len(alerts) - n.opts.QueueCapacity; d > 0 {
+		alerts = alerts[d:]
+
+		level.Warn(n.logger).Log("msg", "Alert batch larger than queue capacity, dropping alerts", "num_dropped", d)
+		n.metrics.dropped.Add(float64(d))
+	}
+
+	// If the queue is full, remove the oldest alerts in favor
+	// of newer ones.
+	if d := (len(n.queue) + len(alerts)) - n.opts.QueueCapacity; d > 0 {
+		n.queue = n.queue[d:]
+
+		level.Warn(n.logger).Log("msg", "Alert notification queue full, dropping alerts", "num_dropped", d)
+		n.metrics.dropped.Add(float64(d))
+	}
+	n.queue = append(n.queue, alerts...)
+
+	// Notify sending goroutine that there are alerts to be processed.
+	n.setMore()
+}
+
+func (n *Manager) relabelAlerts(alerts []*Alert) []*Alert {
+	var relabeledAlerts []*Alert
+
+	for _, alert := range alerts {
+		labels := relabel.Process(alert.Labels, n.opts.RelabelConfigs...)
+		if labels != nil {
+			alert.Labels = labels
+			relabeledAlerts = append(relabeledAlerts, alert)
+		}
+	}
+	return relabeledAlerts
+}
+
+// setMore signals that the alert queue has items.
+func (n *Manager) setMore() {
+	// If we cannot send on the channel, it means the signal already exists
+	// and has not been consumed yet.
+	select {
+	case n.more <- struct{}{}:
+	default:
+	}
+}
+
+// Alertmanagers returns a slice of Alertmanager URLs.
+func (n *Manager) Alertmanagers() []*url.URL {
+	n.mtx.RLock()
+	amSets := n.alertmanagers
+	n.mtx.RUnlock()
+
+	var res []*url.URL
+
+	for _, ams := range amSets {
+		ams.mtx.RLock()
+		for _, am := range ams.ams {
+			res = append(res, am.url())
+		}
+		ams.mtx.RUnlock()
+	}
+
+	return res
+}
+
+// DroppedAlertmanagers returns a slice of Alertmanager URLs.
+func (n *Manager) DroppedAlertmanagers() []*url.URL {
+	n.mtx.RLock()
+	amSets := n.alertmanagers
+	n.mtx.RUnlock()
+
+	var res []*url.URL
+
+	for _, ams := range amSets {
+		ams.mtx.RLock()
+		for _, dam := range ams.droppedAms {
+			res = append(res, dam.url())
+		}
+		ams.mtx.RUnlock()
+	}
+
+	return res
+}
+
+func alertsToOpenAPIAlerts(alerts []*Alert) models.PostableAlerts {
+	openAPIAlerts := models.PostableAlerts{}
+	for _, a := range alerts {
+		start := strfmt.DateTime(a.StartsAt)
+		end := strfmt.DateTime(a.EndsAt)
+		openAPIAlerts = append(openAPIAlerts, &models.PostableAlert{
+			Annotations: labelsToOpenAPILabelSet(a.Annotations),
+			EndsAt:      end,
+			StartsAt:    start,
+			Alert: models.Alert{
+				GeneratorURL: strfmt.URI(a.GeneratorURL),
+				Labels:       labelsToOpenAPILabelSet(a.Labels),
+			},
+		})
+	}
+
+	return openAPIAlerts
+}
+
+func labelsToOpenAPILabelSet(modelLabelSet labels.Labels) models.LabelSet {
+	apiLabelSet := models.LabelSet{}
+	for _, label := range modelLabelSet {
+		apiLabelSet[label.Name] = label.Value
+	}
+
+	return apiLabelSet
+}
+
+// Stop shuts down the notification handler.
+func (n *Manager) Stop() {
+	level.Info(n.logger).Log("msg", "Stopping notification manager...")
+	n.cancel()
+}
+
+// alertmanager holds Alertmanager endpoint information.
+type alertmanager interface {
+	url() *url.URL
+}
+
+type alertmanagerLabels struct {
+	labels.Labels
+}
+
+const pathLabel = "__alerts_path__"
+
+func (a alertmanagerLabels) url() *url.URL {
+	return &url.URL{
+		Scheme: a.Get(model.SchemeLabel),
+		Host:   a.Get(model.AddressLabel),
+		Path:   a.Get(pathLabel),
+	}
+}
+
+func newAlertmanagerSet(cfg *config.AlertmanagerConfig, logger log.Logger, metrics *alertMetrics) (*alertmanagerSet, error) {
+	client, err := config_util.NewClientFromConfig(cfg.HTTPClientConfig, "alertmanager")
+	if err != nil {
+		return nil, err
+	}
+	s := &alertmanagerSet{
+		client:  client,
+		cfg:     cfg,
+		logger:  logger,
+		metrics: metrics,
+	}
+	return s, nil
+}
+
+// sync extracts a deduplicated set of Alertmanager endpoints from a list
+// of target groups definitions.
+func (s *alertmanagerSet) sync(tgs []*targetgroup.Group) {
+	allAms := []alertmanager{}
+	allDroppedAms := []alertmanager{}
+
+	for _, tg := range tgs {
+		ams, droppedAms, err := alertmanagerFromGroup(tg, s.cfg)
+		if err != nil {
+			level.Error(s.logger).Log("msg", "Creating discovered Alertmanagers failed", "err", err)
+			continue
+		}
+		allAms = append(allAms, ams...)
+		allDroppedAms = append(allDroppedAms, droppedAms...)
+	}
+
+	s.mtx.Lock()
+	defer s.mtx.Unlock()
+	// Set new Alertmanagers and deduplicate them along their unique URL.
+	s.ams = []alertmanager{}
+	s.droppedAms = []alertmanager{}
+	s.droppedAms = append(s.droppedAms, allDroppedAms...)
+	seen := map[string]struct{}{}
+
+	for _, am := range allAms {
+		us := am.url().String()
+		if _, ok := seen[us]; ok {
+			continue
+		}
+
+		// This will initialize the Counters for the AM to 0.
+		s.metrics.sent.WithLabelValues(us)
+		s.metrics.errors.WithLabelValues(us)
+
+		seen[us] = struct{}{}
+		s.ams = append(s.ams, am)
+	}
+}
+
+func postPath(pre string, v config.AlertmanagerAPIVersion) string {
+	alertPushEndpoint := fmt.Sprintf("/api/%v/alerts", string(v))
+	return path.Join("/", pre, alertPushEndpoint)
+}
+
+// alertmanagerFromGroup extracts a list of alertmanagers from a target group
+// and an associated AlertmanagerConfig.
+func alertmanagerFromGroup(tg *targetgroup.Group, cfg *config.AlertmanagerConfig) ([]alertmanager, []alertmanager, error) {
+	var res []alertmanager
+	var droppedAlertManagers []alertmanager
+
+	for _, tlset := range tg.Targets {
+		lbls := make([]labels.Label, 0, len(tlset)+2+len(tg.Labels))
+
+		for ln, lv := range tlset {
+			lbls = append(lbls, labels.Label{Name: string(ln), Value: string(lv)})
+		}
+		// Set configured scheme as the initial scheme label for overwrite.
+		lbls = append(lbls, labels.Label{Name: model.SchemeLabel, Value: cfg.Scheme})
+		lbls = append(lbls, labels.Label{Name: pathLabel, Value: postPath(cfg.PathPrefix, cfg.APIVersion)})
+
+		// Combine target labels with target group labels.
+		for ln, lv := range tg.Labels {
+			if _, ok := tlset[ln]; !ok {
+				lbls = append(lbls, labels.Label{Name: string(ln), Value: string(lv)})
+			}
+		}
+
+		lset := relabel.Process(labels.New(lbls...), cfg.RelabelConfigs...)
+		if lset == nil {
+			droppedAlertManagers = append(droppedAlertManagers, alertmanagerLabels{lbls})
+			continue
+		}
+
+		lb := labels.NewBuilder(lset)
+
+		// addPort checks whether we should add a default port to the address.
+		// If the address is not valid, we don't append a port either.
+		addPort := func(s string) bool {
+			// If we can split, a port exists and we don't have to add one.
+			if _, _, err := net.SplitHostPort(s); err == nil {
+				return false
+			}
+			// If adding a port makes it valid, the previous error
+			// was not due to an invalid address and we can append a port.
+			_, _, err := net.SplitHostPort(s + ":1234")
+			return err == nil
+		}
+		addr := lset.Get(model.AddressLabel)
+		// If it's an address with no trailing port, infer it based on the used scheme.
+		if addPort(addr) {
+			// Addresses reaching this point are already wrapped in [] if necessary.
+			switch lset.Get(model.SchemeLabel) {
+			case "http", "":
+				addr = addr + ":80"
+			case "https":
+				addr = addr + ":443"
+			default:
+				return nil, nil, errors.Errorf("invalid scheme: %q", cfg.Scheme)
+			}
+			lb.Set(model.AddressLabel, addr)
+		}
+
+		if err := config.CheckTargetAddress(model.LabelValue(addr)); err != nil {
+			return nil, nil, err
+		}
+
+		// Meta labels are deleted after relabelling. Other internal labels propagate to
+		// the target which decides whether they will be part of their label set.
+		for _, l := range lset {
+			if strings.HasPrefix(l.Name, model.MetaLabelPrefix) {
+				lb.Del(l.Name)
+			}
+		}
+
+		res = append(res, alertmanagerLabels{lset})
+	}
+	return res, droppedAlertManagers, nil
+}
diff --git a/pkg/services/ngalert/sender/notifier_ext.go b/pkg/services/ngalert/sender/notifier_ext.go
new file mode 100644
index 00000000000..7b94c45e0cd
--- /dev/null
+++ b/pkg/services/ngalert/sender/notifier_ext.go
@@ -0,0 +1,199 @@
+// This extension file contains all changed functions that would normally be
+// in notifier.go. This helps us to keep track of the changes compared
+// to upstream.
+// Changes are denoted explicitly by a comment with the prefix "Extension:"
+
+// nolint
+package sender
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"sync"
+	"time"
+
+	"go.uber.org/atomic"
+
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
+	"github.com/pkg/errors"
+	"github.com/prometheus/prometheus/config"
+)
+
+// ApplyConfig updates the status state as the new config requires.
+// Extension: add new parameter headers.
+func (n *Manager) ApplyConfig(conf *config.Config, headers map[string]map[string]string) error {
+	n.mtx.Lock()
+	defer n.mtx.Unlock()
+
+	n.opts.ExternalLabels = conf.GlobalConfig.ExternalLabels
+	n.opts.RelabelConfigs = conf.AlertingConfig.AlertRelabelConfigs
+
+	amSets := make(map[string]*alertmanagerSet)
+
+	for k, cfg := range conf.AlertingConfig.AlertmanagerConfigs.ToMap() {
+		ams, err := newAlertmanagerSet(cfg, n.logger, n.metrics)
+		if err != nil {
+			return err
+		}
+		// Extension: set the headers to the alertmanager set.
+		if headers, ok := headers[k]; ok {
+			ams.headers = headers
+		}
+		amSets[k] = ams
+	}
+
+	n.alertmanagers = amSets
+
+	return nil
+}
+
+// alertmanagerSet contains a set of Alertmanagers discovered via a group of service
+// discovery definitions that have a common configuration on how alerts should be sent.
+type alertmanagerSet struct {
+	cfg    *config.AlertmanagerConfig
+	client *http.Client
+
+	// Extension: headers that should be used for the http requests to the alertmanagers.
+	headers map[string]string
+
+	metrics *alertMetrics
+
+	mtx        sync.RWMutex
+	ams        []alertmanager
+	droppedAms []alertmanager
+	logger     log.Logger
+}
+
+// sendAll sends the alerts to all configured Alertmanagers concurrently.
+// It returns true if the alerts could be sent successfully to at least one Alertmanager.
+func (n *Manager) sendAll(alerts ...*Alert) bool {
+	if len(alerts) == 0 {
+		return true
+	}
+
+	begin := time.Now()
+
+	// v1Payload and v2Payload represent 'alerts' marshaled for Alertmanager API
+	// v1 or v2. Marshaling happens below. Reference here is for caching between
+	// for loop iterations.
+	var v1Payload, v2Payload []byte
+
+	n.mtx.RLock()
+	amSets := n.alertmanagers
+	n.mtx.RUnlock()
+
+	var (
+		wg         sync.WaitGroup
+		numSuccess atomic.Uint64
+	)
+	for _, ams := range amSets {
+		var (
+			payload []byte
+			err     error
+		)
+
+		ams.mtx.RLock()
+
+		switch ams.cfg.APIVersion {
+		case config.AlertmanagerAPIVersionV1:
+			{
+				if v1Payload == nil {
+					v1Payload, err = json.Marshal(alerts)
+					if err != nil {
+						level.Error(n.logger).Log("msg", "Encoding alerts for Alertmanager API v1 failed", "err", err)
+						ams.mtx.RUnlock()
+						return false
+					}
+				}
+
+				payload = v1Payload
+			}
+		case config.AlertmanagerAPIVersionV2:
+			{
+				if v2Payload == nil {
+					openAPIAlerts := alertsToOpenAPIAlerts(alerts)
+
+					v2Payload, err = json.Marshal(openAPIAlerts)
+					if err != nil {
+						level.Error(n.logger).Log("msg", "Encoding alerts for Alertmanager API v2 failed", "err", err)
+						ams.mtx.RUnlock()
+						return false
+					}
+				}
+
+				payload = v2Payload
+			}
+		default:
+			{
+				level.Error(n.logger).Log(
+					"msg", fmt.Sprintf("Invalid Alertmanager API version '%v', expected one of '%v'", ams.cfg.APIVersion, config.SupportedAlertmanagerAPIVersions),
+					"err", err,
+				)
+				ams.mtx.RUnlock()
+				return false
+			}
+		}
+
+		for _, am := range ams.ams {
+			wg.Add(1)
+
+			ctx, cancel := context.WithTimeout(n.ctx, time.Duration(ams.cfg.Timeout))
+			defer cancel()
+
+			// Extension: added headers parameter.
+			go func(client *http.Client, url string, headers map[string]string) {
+				if err := n.sendOne(ctx, client, url, payload, headers); err != nil {
+					level.Error(n.logger).Log("alertmanager", url, "count", len(alerts), "msg", "Error sending alert", "err", err)
+					n.metrics.errors.WithLabelValues(url).Inc()
+				} else {
+					numSuccess.Inc()
+				}
+				n.metrics.latency.WithLabelValues(url).Observe(time.Since(begin).Seconds())
+				n.metrics.sent.WithLabelValues(url).Add(float64(len(alerts)))
+
+				wg.Done()
+			}(ams.client, am.url().String(), ams.headers)
+		}
+
+		ams.mtx.RUnlock()
+	}
+
+	wg.Wait()
+
+	return numSuccess.Load() > 0
+}
+
+// Extension: added headers parameter.
+func (n *Manager) sendOne(ctx context.Context, c *http.Client, url string, b []byte, headers map[string]string) error {
+	req, err := http.NewRequest("POST", url, bytes.NewReader(b))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("User-Agent", userAgent)
+	req.Header.Set("Content-Type", contentTypeJSON)
+	// Extension: set headers.
+	for k, v := range headers {
+		req.Header.Set(k, v)
+	}
+	resp, err := n.opts.Do(ctx, c, req)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		io.Copy(ioutil.Discard, resp.Body)
+		resp.Body.Close()
+	}()
+
+	// Any HTTP status 2xx is OK.
+	if resp.StatusCode/100 != 2 {
+		return errors.Errorf("bad response status %s", resp.Status)
+	}
+
+	return nil
+}
diff --git a/pkg/services/ngalert/sender/router.go b/pkg/services/ngalert/sender/router.go
index ed36e5bd76a..56302f7eadf 100644
--- a/pkg/services/ngalert/sender/router.go
+++ b/pkg/services/ngalert/sender/router.go
@@ -128,8 +128,12 @@ func (d *AlertsRouter) SyncAndApplyConfigFromDatabase() error {
 		redactedAMs := buildRedactedAMs(d.logger, alertmanagers, cfg.OrgID)
 		d.logger.Debug("Alertmanagers found in the configuration", "alertmanagers", redactedAMs)
 
+		var hashes []string
+		for _, cfg := range alertmanagers {
+			hashes = append(hashes, cfg.SHA256())
+		}
 		// We have a running sender, check if we need to apply a new config.
-		amHash := asSHA256(alertmanagers)
+		amHash := asSHA256(hashes)
 		if ok {
 			if d.externalAlertmanagersCfgHash[cfg.OrgID] == amHash {
 				d.logger.Debug("Sender configuration is the same as the one running, no-op", "org", cfg.OrgID, "alertmanagers", redactedAMs)
@@ -184,10 +188,10 @@ func (d *AlertsRouter) SyncAndApplyConfigFromDatabase() error {
 	return nil
 }
 
-func buildRedactedAMs(l log.Logger, alertmanagers []string, ordId int64) []string {
+func buildRedactedAMs(l log.Logger, alertmanagers []externalAMcfg, ordId int64) []string {
 	var redactedAMs []string
 	for _, am := range alertmanagers {
-		parsedAM, err := url.Parse(am)
+		parsedAM, err := url.Parse(am.amURL)
 		if err != nil {
 			l.Error("Failed to parse alertmanager string", "org", ordId, "error", err)
 			continue
@@ -204,8 +208,10 @@ func asSHA256(strings []string) string {
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
 
-func (d *AlertsRouter) alertmanagersFromDatasources(orgID int64) ([]string, error) {
-	var alertmanagers []string
+func (d *AlertsRouter) alertmanagersFromDatasources(orgID int64) ([]externalAMcfg, error) {
+	var (
+		alertmanagers []externalAMcfg
+	)
 	// We might have alertmanager datasources that are acting as external
 	// alertmanager, let's fetch them.
 	query := &datasources.GetDataSourcesByTypeQuery{
@@ -230,7 +236,20 @@ func (d *AlertsRouter) alertmanagersFromDatasources(orgID int64) ([]string, erro
 				"error", err)
 			continue
 		}
-		alertmanagers = append(alertmanagers, amURL)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+		headers, err := d.datasourceService.CustomHeaders(ctx, ds)
+		cancel()
+		if err != nil {
+			d.logger.Error("Failed to get headers for external alertmanager",
+				"org", ds.OrgID,
+				"uid", ds.UID,
+				"error", err)
+			continue
+		}
+		alertmanagers = append(alertmanagers, externalAMcfg{
+			amURL:   amURL,
+			headers: headers,
+		})
 	}
 	return alertmanagers, nil
 }
diff --git a/pkg/services/ngalert/sender/router_test.go b/pkg/services/ngalert/sender/router_test.go
index 4310f0f3c8b..1447224bd9f 100644
--- a/pkg/services/ngalert/sender/router_test.go
+++ b/pkg/services/ngalert/sender/router_test.go
@@ -589,7 +589,13 @@ func TestAlertManagers_buildRedactedAMs(t *testing.T) {
 
 	for _, tt := range tc {
 		t.Run(tt.name, func(t *testing.T) {
-			require.Equal(t, tt.expected, buildRedactedAMs(&fakeLogger, tt.amUrls, tt.orgId))
+			var cfgs []externalAMcfg
+			for _, url := range tt.amUrls {
+				cfgs = append(cfgs, externalAMcfg{
+					amURL: url,
+				})
+			}
+			require.Equal(t, tt.expected, buildRedactedAMs(&fakeLogger, cfgs, tt.orgId))
 			require.Equal(t, tt.errCalls, fakeLogger.ErrorLogs.Calls)
 			require.Equal(t, tt.errLog, fakeLogger.ErrorLogs.Message)
 		})
diff --git a/pkg/services/ngalert/sender/sender.go b/pkg/services/ngalert/sender/sender.go
index 43bc1a1b6f6..8e09015a463 100644
--- a/pkg/services/ngalert/sender/sender.go
+++ b/pkg/services/ngalert/sender/sender.go
@@ -19,7 +19,6 @@ import (
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/discovery"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/prometheus/prometheus/notifier"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -35,12 +34,40 @@ type ExternalAlertmanager struct {
 	logger log.Logger
 	wg     sync.WaitGroup
 
-	manager *notifier.Manager
+	manager *Manager
 
 	sdCancel  context.CancelFunc
 	sdManager *discovery.Manager
 }
 
+type externalAMcfg struct {
+	amURL   string
+	headers map[string]string
+}
+
+func (cfg *externalAMcfg) SHA256() string {
+	return asSHA256([]string{cfg.headerString(), cfg.amURL})
+}
+
+// headersString transforms all the headers in a sorted way as a
+// single string so it can be used for hashing and comparing.
+func (cfg *externalAMcfg) headerString() string {
+	var result strings.Builder
+
+	headerKeys := make([]string, 0, len(cfg.headers))
+	for key := range cfg.headers {
+		headerKeys = append(headerKeys, key)
+	}
+
+	sort.Strings(headerKeys)
+
+	for _, key := range headerKeys {
+		result.WriteString(fmt.Sprintf("%s:%s", key, cfg.headers[key]))
+	}
+
+	return result.String()
+}
+
 func NewExternalAlertmanagerSender() *ExternalAlertmanager {
 	l := log.New("ngalert.sender.external-alertmanager")
 	sdCtx, sdCancel := context.WithCancel(context.Background())
@@ -49,10 +76,10 @@ func NewExternalAlertmanagerSender() *ExternalAlertmanager {
 		sdCancel: sdCancel,
 	}
 
-	s.manager = notifier.NewManager(
+	s.manager = NewManager(
 		// Injecting a new registry here means these metrics are not exported.
 		// Once we fix the individual Alertmanager metrics we should fix this scenario too.
-		&notifier.Options{QueueCapacity: defaultMaxQueueCapacity, Registerer: prometheus.NewRegistry()},
+		&Options{QueueCapacity: defaultMaxQueueCapacity, Registerer: prometheus.NewRegistry()},
 		s.logger,
 	)
 
@@ -62,8 +89,8 @@ func NewExternalAlertmanagerSender() *ExternalAlertmanager {
 }
 
 // ApplyConfig syncs a configuration with the sender.
-func (s *ExternalAlertmanager) ApplyConfig(orgId, id int64, alertmanagers []string) error {
-	notifierCfg, err := buildNotifierConfig(alertmanagers)
+func (s *ExternalAlertmanager) ApplyConfig(orgId, id int64, alertmanagers []externalAMcfg) error {
+	notifierCfg, headers, err := buildNotifierConfig(alertmanagers)
 	if err != nil {
 		return err
 	}
@@ -71,7 +98,7 @@ func (s *ExternalAlertmanager) ApplyConfig(orgId, id int64, alertmanagers []stri
 	s.logger = s.logger.New("org", orgId, "cfg", id)
 
 	s.logger.Info("Synchronizing config with external Alertmanager group")
-	if err := s.manager.ApplyConfig(notifierCfg); err != nil {
+	if err := s.manager.ApplyConfig(notifierCfg, headers); err != nil {
 		return err
 	}
 
@@ -106,7 +133,7 @@ func (s *ExternalAlertmanager) SendAlerts(alerts apimodels.PostableAlerts) {
 	if len(alerts.PostableAlerts) == 0 {
 		return
 	}
-	as := make([]*notifier.Alert, 0, len(alerts.PostableAlerts))
+	as := make([]*Alert, 0, len(alerts.PostableAlerts))
 	for _, a := range alerts.PostableAlerts {
 		na := s.alertToNotifierAlert(a)
 		as = append(as, na)
@@ -133,12 +160,13 @@ func (s *ExternalAlertmanager) DroppedAlertmanagers() []*url.URL {
 	return s.manager.DroppedAlertmanagers()
 }
 
-func buildNotifierConfig(alertmanagers []string) (*config.Config, error) {
+func buildNotifierConfig(alertmanagers []externalAMcfg) (*config.Config, map[string]map[string]string, error) {
 	amConfigs := make([]*config.AlertmanagerConfig, 0, len(alertmanagers))
-	for _, amURL := range alertmanagers {
-		u, err := url.Parse(amURL)
+	headers := map[string]map[string]string{}
+	for i, am := range alertmanagers {
+		u, err := url.Parse(am.amURL)
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 
 		sdConfig := discovery.Configs{
@@ -157,6 +185,12 @@ func buildNotifierConfig(alertmanagers []string) (*config.Config, error) {
 			ServiceDiscoveryConfigs: sdConfig,
 		}
 
+		if am.headers != nil {
+			// The key has the same format as the AlertmanagerConfigs.ToMap() would generate
+			// so we can use it later on when working with the alertmanager config map.
+			headers[fmt.Sprintf("config-%d", i)] = am.headers
+		}
+
 		// Check the URL for basic authentication information first
 		if u.User != nil {
 			amConfig.HTTPClientConfig.BasicAuth = &common_config.BasicAuth{
@@ -176,12 +210,12 @@ func buildNotifierConfig(alertmanagers []string) (*config.Config, error) {
 		},
 	}
 
-	return notifierConfig, nil
+	return notifierConfig, headers, nil
 }
 
-func (s *ExternalAlertmanager) alertToNotifierAlert(alert models.PostableAlert) *notifier.Alert {
+func (s *ExternalAlertmanager) alertToNotifierAlert(alert models.PostableAlert) *Alert {
 	// Prometheus alertmanager has stricter rules for annotations/labels than grafana's internal alertmanager, so we sanitize invalid keys.
-	return &notifier.Alert{
+	return &Alert{
 		Labels:       s.sanitizeLabelSet(alert.Alert.Labels),
 		Annotations:  s.sanitizeLabelSet(alert.Annotations),
 		StartsAt:     time.Time(alert.StartsAt),

From 1cad819670f5e5e87e2f908817da10bde5cea865 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 21 Apr 2023 15:18:40 +0100
Subject: [PATCH 326/729] Nested folders: Add dummy Move/Delete actions 
 (#67051)

* slight refactor, show actions on selection

* add unit tests

* refactor logic into custom selector + hook
---
 .../BrowseDashboardsPage.test.tsx             | 91 +++++++++++++++++++
 .../BrowseDashboardsPage.tsx                  | 17 +++-
 .../components/BrowseActions.test.tsx         | 13 +++
 .../components/BrowseActions.tsx              | 64 ++++++-------
 .../components/BrowseFilters.tsx              | 34 +++++++
 .../features/browse-dashboards/state/hooks.ts | 13 +++
 6 files changed, 196 insertions(+), 36 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions.test.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BrowseFilters.tsx

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
new file mode 100644
index 00000000000..29f63d4ea30
--- /dev/null
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
@@ -0,0 +1,91 @@
+import { render as rtlRender, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React, { ComponentProps } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
+import { TestProvider } from 'test/helpers/TestProvider';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
+
+import BrowseDashboardsPage, { Props } from './BrowseDashboardsPage';
+import { wellFormedTree } from './fixtures/dashboardsTreeItem.fixture';
+const [mockTree, { dashbdD }] = wellFormedTree();
+
+jest.mock('react-virtualized-auto-sizer', () => {
+  return {
+    __esModule: true,
+    default(props: ComponentProps<typeof AutoSizer>) {
+      return <div>{props.children({ width: 800, height: 600 })}</div>;
+    },
+  };
+});
+
+function render(...[ui, options]: Parameters<typeof rtlRender>) {
+  rtlRender(
+    <TestProvider
+      storeState={{
+        navIndex: {
+          'dashboards/browse': {
+            text: 'Dashboards',
+            id: 'dashboards/browse',
+          },
+        },
+      }}
+    >
+      {ui}
+    </TestProvider>,
+    options
+  );
+}
+
+jest.mock('app/features/search/service/folders', () => {
+  return {
+    getFolderChildren(parentUID?: string) {
+      const childrenForUID = mockTree
+        .filter((v) => v.item.kind !== 'ui-empty-folder' && v.item.parentUID === parentUID)
+        .map((v) => v.item);
+
+      return Promise.resolve(childrenForUID);
+    },
+  };
+});
+
+describe('browse-dashboards BrowseDashboardsPage', () => {
+  let props: Props;
+
+  beforeEach(() => {
+    props = {
+      ...getRouteComponentProps(),
+    };
+  });
+
+  it('displays a search input', async () => {
+    render(<BrowseDashboardsPage {...props} />);
+    expect(await screen.findByPlaceholderText('Search box')).toBeInTheDocument();
+  });
+
+  it('displays the filters and hides the actions initially', async () => {
+    render(<BrowseDashboardsPage {...props} />);
+
+    expect(await screen.findByText('Sort')).toBeInTheDocument();
+    expect(await screen.findByText('Filter by tag')).toBeInTheDocument();
+
+    expect(screen.queryByRole('button', { name: 'Move' })).not.toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'Delete' })).not.toBeInTheDocument();
+  });
+
+  it('selecting an item hides the filters and shows the actions instead', async () => {
+    render(<BrowseDashboardsPage {...props} />);
+
+    const checkbox = await screen.findByTestId(selectors.pages.BrowseDashbards.table.checkbox(dashbdD.item.uid));
+    await userEvent.click(checkbox);
+
+    // Check the filters are now hidden
+    expect(screen.queryByText('Filter by tag')).not.toBeInTheDocument();
+    expect(screen.queryByText('Sort')).not.toBeInTheDocument();
+
+    // Check the actions are now visible
+    expect(screen.getByRole('button', { name: 'Move' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Delete' })).toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index eccb6dac905..dc6fe30d9c9 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -2,8 +2,9 @@ import { css } from '@emotion/css';
 import React, { memo, useMemo } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
+import { GrafanaTheme2 } from '@grafana/data';
 import { locationSearchToObject } from '@grafana/runtime';
-import { useStyles2 } from '@grafana/ui';
+import { Input, useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
@@ -12,15 +13,17 @@ import { parseRouteParams } from '../search/utils';
 
 import { skipToken, useGetFolderQuery } from './api/browseDashboardsAPI';
 import { BrowseActions } from './components/BrowseActions';
+import { BrowseFilters } from './components/BrowseFilters';
 import { BrowseView } from './components/BrowseView';
 import { SearchView } from './components/SearchView';
+import { useHasSelection } from './state';
 
 export interface BrowseDashboardsPageRouteParams {
   uid?: string;
   slug?: string;
 }
 
-interface Props extends GrafanaRouteComponentProps<BrowseDashboardsPageRouteParams> {}
+export interface Props extends GrafanaRouteComponentProps<BrowseDashboardsPageRouteParams> {}
 
 // New Browse/Manage/Search Dashboards views for nested folders
 
@@ -34,11 +37,14 @@ const BrowseDashboardsPage = memo(({ match, location }: Props) => {
 
   const { data: folderDTO } = useGetFolderQuery(folderUID ?? skipToken);
   const navModel = useMemo(() => (folderDTO ? buildNavModel(folderDTO) : undefined), [folderDTO]);
+  const hasSelection = useHasSelection();
 
   return (
     <Page navId="dashboards/browse" pageNav={navModel}>
       <Page.Contents className={styles.pageContents}>
-        <BrowseActions />
+        <Input placeholder="Search box" />
+
+        {hasSelection ? <BrowseActions /> : <BrowseFilters />}
 
         <div className={styles.subView}>
           <AutoSizer>
@@ -56,11 +62,12 @@ const BrowseDashboardsPage = memo(({ match, location }: Props) => {
   );
 });
 
-const getStyles = () => ({
+const getStyles = (theme: GrafanaTheme2) => ({
   pageContents: css({
     display: 'grid',
-    gridTemplateRows: 'auto 1fr',
+    gridTemplateRows: 'auto auto 1fr',
     height: '100%',
+    rowGap: theme.spacing(1),
   }),
 
   // AutoSizer needs an element to measure the full height available
diff --git a/public/app/features/browse-dashboards/components/BrowseActions.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions.test.tsx
new file mode 100644
index 00000000000..ee56379c92b
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions.test.tsx
@@ -0,0 +1,13 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { BrowseActions } from './BrowseActions';
+
+describe('browse-dashboards BrowseActions', () => {
+  it('displays Move and Delete buttons', () => {
+    render(<BrowseActions />);
+
+    expect(screen.getByRole('button', { name: 'Move' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Delete' })).toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/browse-dashboards/components/BrowseActions.tsx b/public/app/features/browse-dashboards/components/BrowseActions.tsx
index cf05c7d856e..602707cf35e 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions.tsx
@@ -1,39 +1,41 @@
-import React, { useMemo } from 'react';
+import { css } from '@emotion/css';
+import React from 'react';
 
-import { Input } from '@grafana/ui';
-import { ActionRow } from 'app/features/search/page/components/ActionRow';
-import { SearchLayout } from 'app/features/search/types';
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, useStyles2 } from '@grafana/ui';
+
+export interface Props {}
 
 export function BrowseActions() {
-  const fakeState = useMemo(() => {
-    return {
-      query: '',
-      tag: [],
-      starred: false,
-      layout: SearchLayout.Folders,
-      eventTrackingNamespace: 'manage_dashboards' as const,
-    };
-  }, []);
+  const styles = useStyles2(getStyles);
+
+  const onMove = () => {
+    // TODO real implemenation, stub for now
+    console.log('onMoveClicked');
+  };
+
+  const onDelete = () => {
+    // TODO real implementation, stub for now
+    console.log('onDeleteClicked');
+  };
 
   return (
-    <div>
-      <Input placeholder="Search box" />
-
-      <br />
-
-      <ActionRow
-        includePanels={false}
-        state={fakeState}
-        getTagOptions={() => Promise.resolve([])}
-        getSortOptions={() => Promise.resolve([])}
-        onLayoutChange={() => {}}
-        onSortChange={() => {}}
-        onStarredFilterChange={() => {}}
-        onTagFilterChange={() => {}}
-        onDatasourceChange={() => {}}
-        onPanelTypeChange={() => {}}
-        onSetIncludePanels={() => {}}
-      />
+    <div className={styles.row} data-testid="manage-actions">
+      <Button onClick={onMove} variant="secondary">
+        Move
+      </Button>
+      <Button onClick={onDelete} variant="destructive">
+        Delete
+      </Button>
     </div>
   );
 }
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  row: css({
+    display: 'flex',
+    flexDirection: 'row',
+    gap: theme.spacing(1),
+    marginBottom: theme.spacing(2),
+  }),
+});
diff --git a/public/app/features/browse-dashboards/components/BrowseFilters.tsx b/public/app/features/browse-dashboards/components/BrowseFilters.tsx
new file mode 100644
index 00000000000..36fef5bc4fd
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseFilters.tsx
@@ -0,0 +1,34 @@
+import React, { useMemo } from 'react';
+
+import { ActionRow } from 'app/features/search/page/components/ActionRow';
+import { SearchLayout } from 'app/features/search/types';
+
+export function BrowseFilters() {
+  const fakeState = useMemo(() => {
+    return {
+      query: '',
+      tag: [],
+      starred: false,
+      layout: SearchLayout.Folders,
+      eventTrackingNamespace: 'manage_dashboards' as const,
+    };
+  }, []);
+
+  return (
+    <div>
+      <ActionRow
+        includePanels={false}
+        state={fakeState}
+        getTagOptions={() => Promise.resolve([])}
+        getSortOptions={() => Promise.resolve([])}
+        onLayoutChange={() => {}}
+        onSortChange={() => {}}
+        onStarredFilterChange={() => {}}
+        onTagFilterChange={() => {}}
+        onDatasourceChange={() => {}}
+        onPanelTypeChange={() => {}}
+        onSetIncludePanels={() => {}}
+      />
+    </div>
+  );
+}
diff --git a/public/app/features/browse-dashboards/state/hooks.ts b/public/app/features/browse-dashboards/state/hooks.ts
index d5fb06ea59c..e09bdb5e38d 100644
--- a/public/app/features/browse-dashboards/state/hooks.ts
+++ b/public/app/features/browse-dashboards/state/hooks.ts
@@ -15,10 +15,23 @@ const flatTreeSelector = createSelector(
   }
 );
 
+const hasSelectionSelector = createSelector(
+  (wholeState: StoreState) => wholeState.browseDashboards.selectedItems,
+  (selectedItems) => {
+    return Object.values(selectedItems).some((selectedItem) =>
+      Object.values(selectedItem).some((isSelected) => isSelected)
+    );
+  }
+);
+
 export function useFlatTreeState(folderUID: string | undefined) {
   return useSelector((state) => flatTreeSelector(state, folderUID));
 }
 
+export function useHasSelection() {
+  return useSelector((state) => hasSelectionSelector(state));
+}
+
 export function useSelectedItemsState() {
   return useSelector((wholeState: StoreState) => wholeState.browseDashboards.selectedItems);
 }

From d419402a4344674a68c42205c41f010c5dd0240d Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Fri, 21 Apr 2023 17:07:11 +0200
Subject: [PATCH 327/729] DataSourcePicker: Add recently used from local
 storage to ds picker (#66985)

* Add recently used from local storage to ds picker
---
 .../components/picker/DataSourceDropdown.tsx  |  6 +-
 .../components/picker/DataSourceList.tsx      | 24 ++++++-
 .../components/picker/utils.test.ts           | 67 ++++++++++++++++++-
 .../datasources/components/picker/utils.ts    | 57 ++++++++++++----
 public/app/features/datasources/hooks.ts      | 57 ++++++++++++++++
 5 files changed, 191 insertions(+), 20 deletions(-)
 create mode 100644 public/app/features/datasources/hooks.ts

diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index 416951f0038..01436e506e8 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -10,11 +10,13 @@ import { DataSourceJsonData } from '@grafana/schema';
 import { Button, CustomScrollbar, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
 import config from 'app/core/config';
 
+import { useDatasource } from '../../hooks';
+
 import { DataSourceList } from './DataSourceList';
 import { DataSourceLogo, DataSourceLogoPlaceHolder } from './DataSourceLogo';
 import { DataSourceModal } from './DataSourceModal';
 import { PickerContentProps, DataSourceDropdownProps } from './types';
-import { dataSourceLabel, useGetDatasource } from './utils';
+import { dataSourceLabel } from './utils';
 
 export function DataSourceDropdown(props: DataSourceDropdownProps) {
   const { current, onChange, ...restProps } = props;
@@ -24,7 +26,7 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
   const [selectorElement, setSelectorElement] = useState<HTMLDivElement | null>();
   const [filterTerm, setFilterTerm] = useState<string>();
 
-  const currentDataSourceInstanceSettings = useGetDatasource(current);
+  const currentDataSourceInstanceSettings = useDatasource(current);
 
   const popper = usePopper(markerElement, selectorElement, {
     placement: 'bottom-start',
diff --git a/public/app/features/datasources/components/picker/DataSourceList.tsx b/public/app/features/datasources/components/picker/DataSourceList.tsx
index a199a793c7b..afefb30f4b8 100644
--- a/public/app/features/datasources/components/picker/DataSourceList.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceList.tsx
@@ -1,9 +1,12 @@
 import React from 'react';
 
 import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
+import { getTemplateSrv } from '@grafana/runtime';
+
+import { useDatasources, useRecentlyUsedDataSources } from '../../hooks';
 
 import { DataSourceCard } from './DataSourceCard';
-import { isDataSourceMatch, useGetDatasources } from './utils';
+import { getDataSourceCompareFn, isDataSourceMatch } from './utils';
 
 /**
  * Component props description for the {@link DataSourceList}
@@ -35,7 +38,7 @@ export interface DataSourceListProps {
 export function DataSourceList(props: DataSourceListProps) {
   const { className, current, onChange } = props;
   // QUESTION: Should we use data from the Redux store as admin DS view does?
-  const dataSources = useGetDatasources({
+  const dataSources = useDatasources({
     alerting: props.alerting,
     annotations: props.annotations,
     dashboard: props.dashboard,
@@ -48,18 +51,33 @@ export function DataSourceList(props: DataSourceListProps) {
     variables: props.variables,
   });
 
+  const [recentlyUsedDataSources, pushRecentlyUsedDataSource] = useRecentlyUsedDataSources();
+
   return (
     <div className={className}>
       {dataSources
         .filter((ds) => (props.filter ? props.filter(ds) : true))
+        .sort(getDataSourceCompareFn(current, recentlyUsedDataSources, getDataSourceVariableIDs()))
         .map((ds) => (
           <DataSourceCard
             key={ds.uid}
             ds={ds}
-            onClick={() => onChange(ds)}
+            onClick={() => {
+              pushRecentlyUsedDataSource(ds);
+              onChange(ds);
+            }}
             selected={!!isDataSourceMatch(ds, current)}
           />
         ))}
     </div>
   );
 }
+
+function getDataSourceVariableIDs() {
+  const templateSrv = getTemplateSrv();
+  /** Unforunately there is no easy way to identify data sources that are variables. The uid of the data source will be the name of the variable in a templating syntax $([name]) **/
+  return templateSrv
+    .getVariables()
+    .filter((v) => v.type === 'datasource')
+    .map((v) => `\${${v.id}}`);
+}
diff --git a/public/app/features/datasources/components/picker/utils.test.ts b/public/app/features/datasources/components/picker/utils.test.ts
index 8462309c539..163ca0f371f 100644
--- a/public/app/features/datasources/components/picker/utils.test.ts
+++ b/public/app/features/datasources/components/picker/utils.test.ts
@@ -1,6 +1,6 @@
 import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
 
-import { isDataSourceMatch } from './utils';
+import { isDataSourceMatch, getDataSourceCompareFn } from './utils';
 
 describe('isDataSourceMatch', () => {
   const dataSourceInstanceSettings = { uid: 'a' } as DataSourceInstanceSettings;
@@ -28,3 +28,68 @@ describe('isDataSourceMatch', () => {
     expect(isDataSourceMatch(dataSourceInstanceSettings, { uid: 'b' } as DataSourceRef)).toBeFalsy();
   });
 });
+
+describe('getDataSouceCompareFn', () => {
+  const dataSources = [
+    { uid: 'c', name: 'c', meta: { builtIn: false } },
+    { uid: 'a', name: 'a', meta: { builtIn: true } },
+    { uid: 'b', name: 'b', meta: { builtIn: false } },
+  ] as DataSourceInstanceSettings[];
+
+  it('sorts built in datasources last and other data sources alphabetically', () => {
+    dataSources.sort(getDataSourceCompareFn(undefined, [], []));
+    expect(dataSources).toEqual([
+      { uid: 'b', name: 'b', meta: { builtIn: false } },
+      { uid: 'c', name: 'c', meta: { builtIn: false } },
+      { uid: 'a', name: 'a', meta: { builtIn: true } },
+    ] as DataSourceInstanceSettings[]);
+  });
+
+  it('sorts the current datasource before others', () => {
+    dataSources.sort(getDataSourceCompareFn('c', [], []));
+    expect(dataSources).toEqual([
+      { uid: 'c', name: 'c', meta: { builtIn: false } },
+      { uid: 'b', name: 'b', meta: { builtIn: false } },
+      { uid: 'a', name: 'a', meta: { builtIn: true } },
+    ] as DataSourceInstanceSettings[]);
+  });
+
+  it('sorts recently used datasources first', () => {
+    dataSources.sort(getDataSourceCompareFn(undefined, ['c', 'a'], []));
+    expect(dataSources).toEqual([
+      { uid: 'a', name: 'a', meta: { builtIn: true } },
+      { uid: 'c', name: 'c', meta: { builtIn: false } },
+      { uid: 'b', name: 'b', meta: { builtIn: false } },
+    ] as DataSourceInstanceSettings[]);
+  });
+
+  it('sorts variables before other datasources', () => {
+    dataSources.sort(getDataSourceCompareFn(undefined, [], ['c', 'b']));
+    expect(dataSources).toEqual([
+      { uid: 'b', name: 'b', meta: { builtIn: false } },
+      { uid: 'c', name: 'c', meta: { builtIn: false } },
+      { uid: 'a', name: 'a', meta: { builtIn: true } },
+    ] as DataSourceInstanceSettings[]);
+  });
+
+  it('sorts datasources current -> recently used -> variables -> others -> built in', () => {
+    const dataSources = [
+      { uid: 'a', name: 'a', meta: { builtIn: true } },
+      { uid: 'b', name: 'b', meta: { builtIn: false } },
+      { uid: 'c', name: 'c', meta: { builtIn: false } },
+      { uid: 'e', name: 'e', meta: { builtIn: false } },
+      { uid: 'd', name: 'd', meta: { builtIn: false } },
+      { uid: 'f', name: 'f', meta: { builtIn: false } },
+    ] as DataSourceInstanceSettings[];
+
+    dataSources.sort(getDataSourceCompareFn('c', ['b', 'e'], ['d']));
+    expect(dataSources).toEqual([
+      { uid: 'c', name: 'c', meta: { builtIn: false } },
+      { uid: 'e', name: 'e', meta: { builtIn: false } },
+      { uid: 'b', name: 'b', meta: { builtIn: false } },
+      { uid: 'd', name: 'd', meta: { builtIn: false } },
+      { uid: 'f', name: 'f', meta: { builtIn: false } },
+      { uid: 'a', name: 'a', meta: { builtIn: true } },
+    ] as DataSourceInstanceSettings[]);
+  });
+});
diff --git a/public/app/features/datasources/components/picker/utils.ts b/public/app/features/datasources/components/picker/utils.ts
index 61b7abeb5c7..fdca19ecf15 100644
--- a/public/app/features/datasources/components/picker/utils.ts
+++ b/public/app/features/datasources/components/picker/utils.ts
@@ -1,5 +1,4 @@
 import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceRef } from '@grafana/data';
-import { GetDataSourceListFilters, getDataSourceSrv } from '@grafana/runtime';
 
 export function isDataSourceMatch(
   ds: DataSourceInstanceSettings | undefined,
@@ -39,22 +38,52 @@ export function dataSourceLabel(
   return 'Unknown';
 }
 
-export function useGetDatasources(filters: GetDataSourceListFilters) {
-  const dataSourceSrv = getDataSourceSrv();
+export function getDataSourceCompareFn(
+  current: DataSourceRef | DataSourceInstanceSettings | string | null | undefined,
+  recentlyUsedDataSources: string[],
+  dataSourceVariablesIDs: string[]
+) {
+  const cmpDataSources = (a: DataSourceInstanceSettings, b: DataSourceInstanceSettings) => {
+    // Sort the current ds before everything else.
+    if (current && isDataSourceMatch(a, current)) {
+      return -1;
+    } else if (current && isDataSourceMatch(b, current)) {
+      return 1;
+    }
 
-  return dataSourceSrv.getList(filters);
-}
+    // Sort recently used data sources by latest used, but after current.
+    const aIndex = recentlyUsedDataSources.indexOf(a.uid);
+    const bIndex = recentlyUsedDataSources.indexOf(b.uid);
+    if (aIndex > -1 && aIndex > bIndex) {
+      return -1;
+    }
+    if (bIndex > -1 && bIndex > aIndex) {
+      return 1;
+    }
 
-export function useGetDatasource(dataSource: string | DataSourceRef | DataSourceInstanceSettings | null | undefined) {
-  const dataSourceSrv = getDataSourceSrv();
+    // Sort variables before the rest. Variables sorted alphabetically by name.
+    const aIsVariable = dataSourceVariablesIDs.includes(a.uid);
+    const bIsVariable = dataSourceVariablesIDs.includes(b.uid);
+    if (aIsVariable && !bIsVariable) {
+      return -1;
+    } else if (bIsVariable && !aIsVariable) {
+      return 1;
+    } else if (bIsVariable && aIsVariable) {
+      return a.name < b.name ? -1 : 1;
+    }
 
-  if (!dataSource) {
-    return undefined;
-  }
+    // Sort built in DataSources to the bottom and alphabetically by name.
+    if (a.meta.builtIn && !b.meta.builtIn) {
+      return 1;
+    } else if (b.meta.builtIn && !a.meta.builtIn) {
+      return -1;
+    } else if (a.meta.builtIn && b.meta.builtIn) {
+      return a.name < b.name ? -1 : 1;
+    }
 
-  if (typeof dataSource === 'string') {
-    return dataSourceSrv.getInstanceSettings(dataSource);
-  }
+    // Sort the rest alphabetically by name.
+    return a.name < b.name ? -1 : 1;
+  };
 
-  return dataSourceSrv.getInstanceSettings(dataSource);
+  return cmpDataSources;
 }
diff --git a/public/app/features/datasources/hooks.ts b/public/app/features/datasources/hooks.ts
new file mode 100644
index 00000000000..b0985ed5863
--- /dev/null
+++ b/public/app/features/datasources/hooks.ts
@@ -0,0 +1,57 @@
+import { useCallback } from 'react';
+import { useLocalStorage } from 'react-use';
+
+import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
+import { GetDataSourceListFilters, getDataSourceSrv } from '@grafana/runtime';
+
+export const LOCAL_STORAGE_KEY = 'grafana.features.datasources.components.picker.DataSourceDropDown.history';
+
+/**
+ * Stores the uid of the last 5 data sources selected by the user. The last UID is the one most recently used.
+ */
+export function useRecentlyUsedDataSources(): [string[], (ds: DataSourceInstanceSettings) => void] {
+  const [value = [], setStorage] = useLocalStorage<string[]>(LOCAL_STORAGE_KEY, []);
+
+  const pushRecentlyUsedDataSource = useCallback(
+    (ds: DataSourceInstanceSettings) => {
+      if (ds.meta.builtIn) {
+        // Prevent storing the built in datasources (-- Grafana --, -- Mixed --,  -- Dashboard --)
+        return;
+      }
+      if (value.includes(ds.uid)) {
+        // Prevent storing multiple copies of the same data source, put it at the front of the array instead.
+        value.splice(
+          value.findIndex((dsUid) => ds.uid === dsUid),
+          1
+        );
+        setStorage([...value, ds.uid]);
+      } else {
+        setStorage([...value, ds.uid].slice(1, 6));
+      }
+    },
+    [value, setStorage]
+  );
+
+  return [value, pushRecentlyUsedDataSource];
+}
+
+export function useDatasources(filters: GetDataSourceListFilters) {
+  const dataSourceSrv = getDataSourceSrv();
+  const dataSources = dataSourceSrv.getList(filters);
+
+  return dataSources;
+}
+
+export function useDatasource(dataSource: string | DataSourceRef | DataSourceInstanceSettings | null | undefined) {
+  const dataSourceSrv = getDataSourceSrv();
+
+  if (!dataSource) {
+    return undefined;
+  }
+
+  if (typeof dataSource === 'string') {
+    return dataSourceSrv.getInstanceSettings(dataSource);
+  }
+
+  return dataSourceSrv.getInstanceSettings(dataSource);
+}

From 6abd75b69cb967b6cfca3351c6a3bcfa3dd94935 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Fri, 21 Apr 2023 17:21:02 +0200
Subject: [PATCH 328/729] Log Context: Add `wrap lines` button to easier wrap
 lines (#67047)

* add wrap lines button

* change default to 50 lines

* fix test

* change css classes
---
 public/app/features/explore/utils/logs.ts     |  1 +
 .../log-context/LogContextButtons.tsx         | 33 ++++++++++++++++---
 .../log-context/LogRowContextModal.test.tsx   |  2 +-
 .../log-context/LogRowContextModal.tsx        | 23 +++++++++----
 4 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/public/app/features/explore/utils/logs.ts b/public/app/features/explore/utils/logs.ts
index 5263867039a..d156da0c080 100644
--- a/public/app/features/explore/utils/logs.ts
+++ b/public/app/features/explore/utils/logs.ts
@@ -4,4 +4,5 @@ export const SETTINGS_KEYS = {
   wrapLogMessage: 'grafana.explore.logs.wrapLogMessage',
   prettifyLogMessage: 'grafana.explore.logs.prettifyLogMessage',
   logsSortOrder: 'grafana.explore.logs.sortOrder',
+  logContextWrapLogMessage: 'grafana.explore.logs.logContext.wrapLogMessage',
 };
diff --git a/public/app/features/logs/components/log-context/LogContextButtons.tsx b/public/app/features/logs/components/log-context/LogContextButtons.tsx
index d9c6b419480..a7db0994b75 100644
--- a/public/app/features/logs/components/log-context/LogContextButtons.tsx
+++ b/public/app/features/logs/components/log-context/LogContextButtons.tsx
@@ -1,12 +1,13 @@
 import { css } from '@emotion/css';
-import React from 'react';
+import React, { useCallback } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { ButtonGroup, ButtonSelect, useStyles2 } from '@grafana/ui';
+import { reportInteraction } from '@grafana/runtime';
+import { ButtonGroup, ButtonSelect, InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui';
 
 const getStyles = () => {
   return {
-    logSamplesButton: css`
+    buttonGroup: css`
       display: inline-flex;
     `,
   };
@@ -24,14 +25,36 @@ export type Props = {
   option: SelectableValue<number>;
   onChangeOption: (item: SelectableValue<number>) => void;
   position?: 'top' | 'bottom';
+
+  wrapLines?: boolean;
+  onChangeWrapLines?: (wrapLines: boolean) => void;
 };
 
 export const LogContextButtons = (props: Props) => {
-  const { option, onChangeOption } = props;
+  const { option, onChangeOption, wrapLines, onChangeWrapLines, position } = props;
+  const internalOnChangeWrapLines = useCallback(
+    (event: React.FormEvent<HTMLInputElement>) => {
+      if (onChangeWrapLines) {
+        const state = event.currentTarget.checked;
+        reportInteraction('grafana_explore_logs_log_context_toggle_lines_clicked', {
+          state,
+        });
+        onChangeWrapLines(state);
+      }
+    },
+    [onChangeWrapLines]
+  );
   const styles = useStyles2(getStyles);
 
   return (
-    <ButtonGroup className={styles.logSamplesButton}>
+    <ButtonGroup className={styles.buttonGroup}>
+      {position === 'top' && onChangeWrapLines && (
+        <InlineFieldRow>
+          <InlineField label="Wrap lines">
+            <InlineSwitch value={wrapLines} onChange={internalOnChangeWrapLines} />
+          </InlineField>
+        </InlineFieldRow>
+      )}
       <ButtonSelect variant="canvas" value={option} options={LoadMoreOptions} onChange={onChangeOption} />
     </ButtonGroup>
   );
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
index 5a4e6e2e5be..6161d600cd2 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
@@ -114,7 +114,7 @@ describe('LogRowContextModal', () => {
     await waitFor(() => expect(getRowContext).toHaveBeenCalledTimes(2));
 
     const tenLinesButton = screen.getByRole('button', {
-      name: /10 lines/i,
+      name: /50 lines/i,
     });
     await userEvent.click(tenLinesButton);
     const twentyLinesButton = screen.getByRole('menuitemradio', {
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
index 4f30b7e1657..bcfec8fe92b 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -142,10 +142,15 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
   const theme = useTheme2();
   const styles = getStyles(theme);
   const [context, setContext] = useState<{ after: LogRowModel[]; before: LogRowModel[] }>({ after: [], before: [] });
-  const [limit, setLimit] = useState<number>(LoadMoreOptions[0].value!);
+  // LoadMoreOptions[2] refers to 50 lines
+  const defaultLimit = LoadMoreOptions[2];
+  const [limit, setLimit] = useState<number>(defaultLimit.value!);
   const [loadingWidth, setLoadingWidth] = useState(0);
-  const [loadMoreOption, setLoadMoreOption] = useState<SelectableValue<number>>(LoadMoreOptions[0]);
+  const [loadMoreOption, setLoadMoreOption] = useState<SelectableValue<number>>(defaultLimit);
   const [contextQuery, setContextQuery] = useState<DataQuery | null>(null);
+  const [wrapLines, setWrapLines] = useState(
+    store.getBool(SETTINGS_KEYS.logContextWrapLogMessage, store.getBool(SETTINGS_KEYS.wrapLogMessage, true))
+  );
 
   const getFullTimeRange = useCallback(() => {
     const { before, after } = context;
@@ -265,7 +270,13 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
           Showing {context.after.length} lines {logsSortOrder === LogsSortOrder.Ascending ? 'after' : 'before'} match.
         </div>
         <div>
-          <LogContextButtons onChangeOption={onChangeLimitOption} option={loadMoreOption} />
+          <LogContextButtons
+            position="top"
+            wrapLines={wrapLines}
+            onChangeWrapLines={setWrapLines}
+            onChangeOption={onChangeLimitOption}
+            option={loadMoreOption}
+          />
         </div>
       </div>
       <div className={loading ? '' : styles.hidden}>
@@ -281,7 +292,7 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
                   dedupStrategy={LogsDedupStrategy.none}
                   showLabels={store.getBool(SETTINGS_KEYS.showLabels, false)}
                   showTime={store.getBool(SETTINGS_KEYS.showTime, true)}
-                  wrapLogMessage={store.getBool(SETTINGS_KEYS.wrapLogMessage, true)}
+                  wrapLogMessage={wrapLines}
                   prettifyLogMessage={store.getBool(SETTINGS_KEYS.prettifyLogMessage, false)}
                   enableLogDetails={true}
                   timeZone={timeZone}
@@ -299,7 +310,7 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
                   dedupStrategy={LogsDedupStrategy.none}
                   showLabels={store.getBool(SETTINGS_KEYS.showLabels, false)}
                   showTime={store.getBool(SETTINGS_KEYS.showTime, true)}
-                  wrapLogMessage={store.getBool(SETTINGS_KEYS.wrapLogMessage, true)}
+                  wrapLogMessage={wrapLines}
                   prettifyLogMessage={store.getBool(SETTINGS_KEYS.prettifyLogMessage, false)}
                   enableLogDetails={true}
                   timeZone={timeZone}
@@ -316,7 +327,7 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
                   dedupStrategy={LogsDedupStrategy.none}
                   showLabels={store.getBool(SETTINGS_KEYS.showLabels, false)}
                   showTime={store.getBool(SETTINGS_KEYS.showTime, true)}
-                  wrapLogMessage={store.getBool(SETTINGS_KEYS.wrapLogMessage, true)}
+                  wrapLogMessage={wrapLines}
                   prettifyLogMessage={store.getBool(SETTINGS_KEYS.prettifyLogMessage, false)}
                   enableLogDetails={true}
                   timeZone={timeZone}

From d02aee24795aecc09efa6d81e35b25d8f151bb25 Mon Sep 17 00:00:00 2001
From: David Harris <david.harris@grafana.com>
Date: Fri, 21 Apr 2023 16:46:46 +0100
Subject: [PATCH 329/729] docs: typo (#67062)

---
 .../plugins/add-distributed-tracing-for-backend-plugins.md  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md b/docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md
index 17ea19108ea..c454cd55c20 100644
--- a/docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md
+++ b/docs/sources/developers/plugins/add-distributed-tracing-for-backend-plugins.md
@@ -33,7 +33,7 @@ tracing = true
 
 > **Note:** Make sure you are using at least grafana-plugin-sdk-go v0.157.0. You can update with `go get -u github.com/grafana/grafana-plugin-sdk-go`.
 
-When OpenTelemetry tracing is enabled on the main Grafana instance and tracing is enabeld for a plugin,
+When OpenTelemetry tracing is enabled on the main Grafana instance and tracing is enabled for a plugin,
 the OpenTelemetry endpoint address and propagation format will be passed to the plugin during startup,
 which will be used to configure a global tracer.
 
@@ -93,9 +93,9 @@ which will be used to configure a global tracer.
 
    If tracing is disabled in Grafana, `backend.DefaultTracer()` returns a no-op tracer.
 
-### Tracing GRPC calls
+### Tracing gRPC calls
 
-A new span is created automatically for each GRPC call (`QueryData`, `CheckHealth`, etc), both on Grafana's side and
+A new span is created automatically for each gRPC call (`QueryData`, `CheckHealth`, etc), both on Grafana's side and
 on the plugin's side.
 
 This also injects the trace context into the `context.Context` passed to those methods.

From a29cfe5d460865b1f41724c61dba5f10e4a9801b Mon Sep 17 00:00:00 2001
From: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:03:49 -0400
Subject: [PATCH 330/729] Caching: Consolidate resource cache checking and
 updating in plugin middleware (#67002)

* Update the HandleResourceRequest function to mimic the HandleQueryRequest function

* Remove CacheResourceResponse function from interface

* revert additional thing I missed
---
 pkg/api/http_server.go                        |  5 +--
 pkg/api/plugin_resource.go                    | 13 +-----
 pkg/api/plugin_resource_test.go               |  1 -
 pkg/api/plugins_test.go                       | 22 +++-------
 .../manager/client/clienttest/clienttest.go   | 17 +++++++
 pkg/services/caching/fake_caching_service.go  |  8 +---
 pkg/services/caching/service.go               | 22 ++++++----
 .../clientmiddleware/caching_middleware.go    | 24 +++++++---
 .../caching_middleware_test.go                | 44 ++++++++++++++-----
 9 files changed, 92 insertions(+), 64 deletions(-)

diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index b9b84af22ed..093eac80840 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -41,7 +41,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/services/caching"
 	"github.com/grafana/grafana/pkg/services/cleanup"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/correlations"
@@ -208,7 +207,6 @@ type HTTPServer struct {
 	statsService         stats.Service
 	authnService         authn.Service
 	starApi              *starApi.API
-	cachingService       caching.CachingService
 }
 
 type ServerOptions struct {
@@ -250,7 +248,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	accesscontrolService accesscontrol.Service, navTreeService navtree.Service,
 	annotationRepo annotations.Repository, tagService tag.Service, searchv2HTTPService searchV2.SearchHTTPService, oauthTokenService oauthtoken.OAuthTokenService,
 	statsService stats.Service, authnService authn.Service, pluginsCDNService *pluginscdn.Service,
-	starApi *starApi.API, cachingService caching.CachingService,
+	starApi *starApi.API,
 
 ) (*HTTPServer, error) {
 	web.Env = cfg.Env
@@ -355,7 +353,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		authnService:                 authnService,
 		pluginsCDNService:            pluginsCDNService,
 		starApi:                      starApi,
-		cachingService:               cachingService,
 	}
 	if hs.Listener != nil {
 		hs.log.Debug("Using provided listener")
diff --git a/pkg/api/plugin_resource.go b/pkg/api/plugin_resource.go
index 5ebe91cb86e..2b69379b920 100644
--- a/pkg/api/plugin_resource.go
+++ b/pkg/api/plugin_resource.go
@@ -15,7 +15,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/util/proxyutil"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -130,7 +129,7 @@ func (hs *HTTPServer) makePluginResourceRequest(w http.ResponseWriter, req *http
 
 	var flushStreamErr error
 	go func() {
-		flushStreamErr = hs.flushStream(req.Context(), crReq, stream, w)
+		flushStreamErr = hs.flushStream(stream, w)
 		wg.Done()
 	}()
 
@@ -141,10 +140,8 @@ func (hs *HTTPServer) makePluginResourceRequest(w http.ResponseWriter, req *http
 	return flushStreamErr
 }
 
-func (hs *HTTPServer) flushStream(ctx context.Context, req *backend.CallResourceRequest, stream callResourceClientResponseStream, w http.ResponseWriter) error {
+func (hs *HTTPServer) flushStream(stream callResourceClientResponseStream, w http.ResponseWriter) error {
 	processedStreams := 0
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
 	for {
 		resp, err := stream.Recv()
 		if errors.Is(err, io.EOF) {
@@ -200,12 +197,6 @@ func (hs *HTTPServer) flushStream(ctx context.Context, req *backend.CallResource
 
 		if _, err := w.Write(resp.Body); err != nil {
 			hs.log.Error("Failed to write resource response", "err", err)
-		} else if hs.Features.IsEnabled(featuremgmt.FlagUseCachingService) {
-			// Placing the new service implementation behind a feature flag until it is known to be stable
-
-			// The enterprise implementation of this function will use the headers and status of the first response,
-			// And append the body of any subsequent responses. It waits for the context to be canceled before caching the cumulative result.
-			hs.cachingService.CacheResourceResponse(ctx, req, resp)
 		}
 
 		if flusher, ok := w.(http.Flusher); ok {
diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index ff34565961e..3aeb39a8bd6 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -78,7 +78,6 @@ func TestCallResource(t *testing.T) {
 		hs.QuotaService = quotatest.New(false, nil)
 		hs.pluginStore = ps
 		hs.pluginClient = pluginClient.ProvideService(reg, pCfg)
-		hs.cachingService = &caching.OSSCachingService{}
 	})
 
 	t.Run("Test successful response is received for valid request", func(t *testing.T) {
diff --git a/pkg/api/plugins_test.go b/pkg/api/plugins_test.go
index 1ce73b89d67..9de3a41e4cc 100644
--- a/pkg/api/plugins_test.go
+++ b/pkg/api/plugins_test.go
@@ -30,9 +30,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/store"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/caching"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
@@ -373,11 +371,9 @@ func Test_GetPluginAssets(t *testing.T) {
 
 func TestMakePluginResourceRequest(t *testing.T) {
 	hs := HTTPServer{
-		Cfg:            setting.NewCfg(),
-		log:            log.New(),
-		pluginClient:   &fakePluginClient{},
-		cachingService: &caching.OSSCachingService{},
-		Features:       &featuremgmt.FeatureManager{},
+		Cfg:          setting.NewCfg(),
+		log:          log.New(),
+		pluginClient: &fakePluginClient{},
 	}
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 
@@ -403,8 +399,6 @@ func TestMakePluginResourceRequestSetCookieNotPresent(t *testing.T) {
 		pluginClient: &fakePluginClient{
 			headers: map[string][]string{"Set-Cookie": {"monster"}},
 		},
-		cachingService: &caching.OSSCachingService{},
-		Features:       &featuremgmt.FeatureManager{},
 	}
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	resp := httptest.NewRecorder()
@@ -439,8 +433,6 @@ func TestMakePluginResourceRequestContentTypeUnique(t *testing.T) {
 						"x-another": {"hello"},
 					},
 				},
-				cachingService: &caching.OSSCachingService{},
-				Features:       &featuremgmt.FeatureManager{},
 			}
 			req := httptest.NewRequest(http.MethodGet, "/", nil)
 			resp := httptest.NewRecorder()
@@ -464,11 +456,9 @@ func TestMakePluginResourceRequestContentTypeEmpty(t *testing.T) {
 		statusCode: http.StatusNoContent,
 	}
 	hs := HTTPServer{
-		Cfg:            setting.NewCfg(),
-		log:            log.New(),
-		pluginClient:   pluginClient,
-		cachingService: &caching.OSSCachingService{},
-		Features:       &featuremgmt.FeatureManager{},
+		Cfg:          setting.NewCfg(),
+		log:          log.New(),
+		pluginClient: pluginClient,
 	}
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	resp := httptest.NewRecorder()
diff --git a/pkg/plugins/manager/client/clienttest/clienttest.go b/pkg/plugins/manager/client/clienttest/clienttest.go
index 32995bfa38f..6b3be014cdf 100644
--- a/pkg/plugins/manager/client/clienttest/clienttest.go
+++ b/pkg/plugins/manager/client/clienttest/clienttest.go
@@ -179,6 +179,9 @@ type ClientDecoratorTest struct {
 	SubscribeStreamCtx context.Context
 	PublishStreamReq   *backend.PublishStreamRequest
 	PublishStreamCtx   context.Context
+
+	// When CallResource is called, the sender will be called with these values
+	callResourceResponses []*backend.CallResourceResponse
 }
 
 type ClientDecoratorTestOption func(*ClientDecoratorTest)
@@ -197,6 +200,13 @@ func NewClientDecoratorTest(t *testing.T, opts ...ClientDecoratorTestOption) *Cl
 		CallResourceFunc: func(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 			cdt.CallResourceReq = req
 			cdt.CallResourceCtx = ctx
+			if cdt.callResourceResponses != nil {
+				for _, r := range cdt.callResourceResponses {
+					if err := sender.Send(r); err != nil {
+						return err
+					}
+				}
+			}
 			return nil
 		},
 		CheckHealthFunc: func(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
@@ -262,3 +272,10 @@ func WithMiddlewares(middlewares ...plugins.ClientMiddleware) ClientDecoratorTes
 		cdt.Middlewares = append(cdt.Middlewares, middlewares...)
 	})
 }
+
+// WithResourceResponses can be used to make the test client send simulated resource responses back over the sender stream
+func WithResourceResponses(responses []*backend.CallResourceResponse) ClientDecoratorTestOption {
+	return ClientDecoratorTestOption(func(cdt *ClientDecoratorTest) {
+		cdt.callResourceResponses = responses
+	})
+}
diff --git a/pkg/services/caching/fake_caching_service.go b/pkg/services/caching/fake_caching_service.go
index c4cb7434425..522be45f02f 100644
--- a/pkg/services/caching/fake_caching_service.go
+++ b/pkg/services/caching/fake_caching_service.go
@@ -11,20 +11,16 @@ import (
 type FakeOSSCachingService struct {
 	calls                  map[string]int
 	ReturnHit              bool
-	ReturnResourceResponse *backend.CallResourceResponse
+	ReturnResourceResponse CachedResourceDataResponse
 	ReturnQueryResponse    CachedQueryDataResponse
 }
 
-func (f *FakeOSSCachingService) CacheResourceResponse(ctx context.Context, req *backend.CallResourceRequest, resp *backend.CallResourceResponse) {
-	f.calls["CacheResourceResponse"]++
-}
-
 func (f *FakeOSSCachingService) HandleQueryRequest(ctx context.Context, req *backend.QueryDataRequest) (bool, CachedQueryDataResponse) {
 	f.calls["HandleQueryRequest"]++
 	return f.ReturnHit, f.ReturnQueryResponse
 }
 
-func (f *FakeOSSCachingService) HandleResourceRequest(ctx context.Context, req *backend.CallResourceRequest) (bool, *backend.CallResourceResponse) {
+func (f *FakeOSSCachingService) HandleResourceRequest(ctx context.Context, req *backend.CallResourceRequest) (bool, CachedResourceDataResponse) {
 	f.calls["HandleResourceRequest"]++
 	return f.ReturnHit, f.ReturnResourceResponse
 }
diff --git a/pkg/services/caching/service.go b/pkg/services/caching/service.go
index 57be8735c78..6f37099fe15 100644
--- a/pkg/services/caching/service.go
+++ b/pkg/services/caching/service.go
@@ -16,6 +16,7 @@ const (
 )
 
 type CacheQueryResponseFn func(context.Context, *backend.QueryDataResponse)
+type CacheResourceResponseFn func(context.Context, *backend.CallResourceResponse)
 
 type CachedQueryDataResponse struct {
 	// The cached data response associated with a query, or nil if no cached data is found
@@ -25,6 +26,15 @@ type CachedQueryDataResponse struct {
 	UpdateCacheFn CacheQueryResponseFn
 }
 
+type CachedResourceDataResponse struct {
+	// The cached response associated with a resource request, or nil if no cached data is found
+	Response *backend.CallResourceResponse
+	// A function that should be used to cache a CallResourceResponse for a given resource request.
+	// It can be set to nil by the method implementation (if there is an error, for example), so it should be checked before being called.
+	// Because plugins can send multiple responses asyncronously, the implementation should be able to handle multiple calls to this function for one request.
+	UpdateCacheFn CacheResourceResponseFn
+}
+
 func ProvideCachingService() *OSSCachingService {
 	return &OSSCachingService{}
 }
@@ -36,10 +46,7 @@ type CachingService interface {
 	HandleQueryRequest(context.Context, *backend.QueryDataRequest) (bool, CachedQueryDataResponse)
 	// HandleResourceRequest uses a CallResourceRequest to check the cache for any existing results for that request. If none are found, it should return false.
 	// This function may populate any response headers (accessible through the context) with the cache status using the X-Cache header.
-	HandleResourceRequest(context.Context, *backend.CallResourceRequest) (bool, *backend.CallResourceResponse)
-	// CacheResourceResponse is used to cache resource responses for a resource request.
-	// Because plugins can send multiple responses asyncronously, the implementation should be able to handle multiple calls to this function for one request.
-	CacheResourceResponse(context.Context, *backend.CallResourceRequest, *backend.CallResourceResponse)
+	HandleResourceRequest(context.Context, *backend.CallResourceRequest) (bool, CachedResourceDataResponse)
 }
 
 // Implementation of interface - does nothing
@@ -50,11 +57,8 @@ func (s *OSSCachingService) HandleQueryRequest(ctx context.Context, req *backend
 	return false, CachedQueryDataResponse{}
 }
 
-func (s *OSSCachingService) HandleResourceRequest(ctx context.Context, req *backend.CallResourceRequest) (bool, *backend.CallResourceResponse) {
-	return false, nil
-}
-
-func (s *OSSCachingService) CacheResourceResponse(ctx context.Context, req *backend.CallResourceRequest, resp *backend.CallResourceResponse) {
+func (s *OSSCachingService) HandleResourceRequest(ctx context.Context, req *backend.CallResourceRequest) (bool, CachedResourceDataResponse) {
+	return false, CachedResourceDataResponse{}
 }
 
 var _ CachingService = &OSSCachingService{}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
index a86f5921dce..e9e0b50bc0b 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
@@ -100,7 +100,7 @@ func (m *CachingMiddleware) CallResource(ctx context.Context, req *backend.CallR
 	start := time.Now()
 
 	// First look in the resource cache if enabled
-	hit, resp := m.caching.HandleResourceRequest(ctx, req)
+	hit, cr := m.caching.HandleResourceRequest(ctx, req)
 
 	defer func() {
 		// record request duration if caching was used
@@ -114,13 +114,21 @@ func (m *CachingMiddleware) CallResource(ctx context.Context, req *backend.CallR
 
 	// Cache hit; send the response and return
 	if hit {
-		return sender.Send(resp)
+		return sender.Send(cr.Response)
 	}
 
 	// Cache miss; do the actual request
-	// The call to update the cache happens in /pkg/api/plugin_resource.go in the flushStream() func
-	// TODO: Implement updating the cache from this method
-	return m.next.CallResource(ctx, req, sender)
+	// If there is no update cache func, just pass in the original sender
+	if cr.UpdateCacheFn == nil {
+		return m.next.CallResource(ctx, req, sender)
+	}
+	// Otherwise, intercept the responses in a wrapped sender so we can cache them first
+	cacheSender := cachedSenderFunc(func(res *backend.CallResourceResponse) error {
+		cr.UpdateCacheFn(ctx, res)
+		return sender.Send(res)
+	})
+
+	return m.next.CallResource(ctx, req, cacheSender)
 }
 
 func (m *CachingMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
@@ -142,3 +150,9 @@ func (m *CachingMiddleware) PublishStream(ctx context.Context, req *backend.Publ
 func (m *CachingMiddleware) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
 	return m.next.RunStream(ctx, req, sender)
 }
+
+type cachedSenderFunc func(res *backend.CallResourceResponse) error
+
+func (fn cachedSenderFunc) Send(res *backend.CallResourceResponse) error {
+	return fn(res)
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware_test.go
index 54cf5e2103c..dcfe60ec525 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware_test.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware_test.go
@@ -97,10 +97,30 @@ func TestCachingMiddleware(t *testing.T) {
 		req, err := http.NewRequest(http.MethodGet, "/resource/blah", nil)
 		require.NoError(t, err)
 
+		// This is the response returned by the HandleResourceRequest call
+		// Track whether the update cache fn was called, depending on what the response headers are in the cache request
+		var updateCacheCalled bool
+		dataResponse := caching.CachedResourceDataResponse{
+			Response: &backend.CallResourceResponse{
+				Status: 200,
+				Body:   []byte("bogus"),
+			},
+			UpdateCacheFn: func(ctx context.Context, rdr *backend.CallResourceResponse) {
+				updateCacheCalled = true
+			},
+		}
+
+		// This is the response sent via the passed-in sender when there is a cache miss
+		simulatedPluginResponse := &backend.CallResourceResponse{
+			Status: 201,
+			Body:   []byte("bogus"),
+		}
+
 		cs := caching.NewFakeOSSCachingService()
 		cdt := clienttest.NewClientDecoratorTest(t,
 			clienttest.WithReqContext(req, &user.SignedInUser{}),
 			clienttest.WithMiddlewares(NewCachingMiddleware(cs)),
+			clienttest.WithResourceResponses([]*backend.CallResourceResponse{simulatedPluginResponse}),
 		)
 
 		jsonDataMap := map[string]interface{}{}
@@ -121,11 +141,6 @@ func TestCachingMiddleware(t *testing.T) {
 			PluginContext: pluginCtx,
 		}
 
-		resourceResponse := &backend.CallResourceResponse{
-			Status: 200,
-			Body:   []byte("bogus"),
-		}
-
 		var sentResponse *backend.CallResourceResponse
 		var storeOneResponseCallResourceSender = callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
 			sentResponse = res
@@ -139,32 +154,37 @@ func TestCachingMiddleware(t *testing.T) {
 			})
 
 			cs.ReturnHit = true
-			cs.ReturnResourceResponse = resourceResponse
+			cs.ReturnResourceResponse = dataResponse
 
 			err := cdt.Decorator.CallResource(req.Context(), crr, storeOneResponseCallResourceSender)
 			assert.NoError(t, err)
 			// Cache service is called once
 			cs.AssertCalls(t, "HandleResourceRequest", 1)
-			// Equals the mocked response was sent
+			// The mocked cached response was sent
 			assert.NotNil(t, sentResponse)
-			assert.Equal(t, resourceResponse, sentResponse)
+			assert.Equal(t, dataResponse.Response, sentResponse)
+			// Cache was not updated by the middleware
+			assert.False(t, updateCacheCalled)
 		})
 
-		t.Run("If cache returns a miss, resource call is issued", func(t *testing.T) {
+		t.Run("If cache returns a miss, resource call is issued and the update cache function is called", func(t *testing.T) {
 			t.Cleanup(func() {
 				sentResponse = nil
 				cs.Reset()
 			})
 
 			cs.ReturnHit = false
-			cs.ReturnResourceResponse = resourceResponse
+			cs.ReturnResourceResponse = dataResponse
 
 			err := cdt.Decorator.CallResource(req.Context(), crr, storeOneResponseCallResourceSender)
 			assert.NoError(t, err)
 			// Cache service is called once
 			cs.AssertCalls(t, "HandleResourceRequest", 1)
-			// Nil response was sent
-			assert.Nil(t, sentResponse)
+			// Simulated plugin response was sent
+			assert.NotNil(t, sentResponse)
+			assert.Equal(t, simulatedPluginResponse, sentResponse)
+			// Since it was a miss, the middleware called the update func
+			assert.True(t, updateCacheCalled)
 		})
 	})
 

From 329d94044891b6a7ec0df5cf9b3d84c0ccbb38fd Mon Sep 17 00:00:00 2001
From: Virginia Cepeda <virginia.cepeda@grafana.com>
Date: Fri, 21 Apr 2023 14:27:39 -0300
Subject: [PATCH 331/729] Alerting: fix condition to distinguish multiple
 datasources type in dropdown (#67065)

* Add function to check if a datasource is managing alerts

* Use helper function to get datasources that manage alerts
---
 .../rules/MultipleDataSourcePicker.tsx        | 18 ++++-----
 .../alerting/unified/utils/datasource.test.ts | 39 +++++++++++++++++++
 .../alerting/unified/utils/datasource.ts      |  4 ++
 3 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 public/app/features/alerting/unified/utils/datasource.test.ts

diff --git a/public/app/features/alerting/unified/components/rules/MultipleDataSourcePicker.tsx b/public/app/features/alerting/unified/components/rules/MultipleDataSourcePicker.tsx
index 4e6942011b0..119d0fc8ec0 100644
--- a/public/app/features/alerting/unified/components/rules/MultipleDataSourcePicker.tsx
+++ b/public/app/features/alerting/unified/components/rules/MultipleDataSourcePicker.tsx
@@ -12,6 +12,8 @@ import { getDataSourceSrv, DataSourcePickerState, DataSourcePickerProps } from '
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
 import { ActionMeta, HorizontalGroup, PluginSignatureBadge, MultiSelect } from '@grafana/ui';
 
+import { isDataSourceManagingAlerts } from '../../utils/datasource';
+
 export interface MultipleDataSourcePickerProps extends Omit<DataSourcePickerProps, 'onChange' | 'current'> {
   onChange: (ds: DataSourceInstanceSettings, action: 'add' | 'remove') => void;
   current: string[] | undefined;
@@ -102,17 +104,15 @@ export const MultipleDataSourcePicker = (props: MultipleDataSourcePickerProps) =
       type,
     });
 
-    const alertManagingDs = dataSources
-      .filter((ds) => ds.jsonData.manageAlerts)
-      .map((ds) => ({
-        value: ds.name,
-        label: `${ds.name}${ds.isDefault ? ' (default)' : ''}`,
-        imgUrl: ds.meta.info.logos.small,
-        meta: ds.meta,
-      }));
+    const alertManagingDs = dataSources.filter(isDataSourceManagingAlerts).map((ds) => ({
+      value: ds.name,
+      label: `${ds.name}${ds.isDefault ? ' (default)' : ''}`,
+      imgUrl: ds.meta.info.logos.small,
+      meta: ds.meta,
+    }));
 
     const nonAlertManagingDs = dataSources
-      .filter((ds) => !ds.jsonData.manageAlerts)
+      .filter((ds) => !isDataSourceManagingAlerts(ds))
       .map((ds) => ({
         value: ds.name,
         label: `${ds.name}${ds.isDefault ? ' (default)' : ''}`,
diff --git a/public/app/features/alerting/unified/utils/datasource.test.ts b/public/app/features/alerting/unified/utils/datasource.test.ts
new file mode 100644
index 00000000000..3c10151be9f
--- /dev/null
+++ b/public/app/features/alerting/unified/utils/datasource.test.ts
@@ -0,0 +1,39 @@
+import { mockDataSource } from '../mocks';
+
+import { isDataSourceManagingAlerts } from './datasource';
+
+describe('isDataSourceManagingAlerts', () => {
+  it('should return true when the prop is set as true', () => {
+    expect(
+      isDataSourceManagingAlerts(
+        mockDataSource({
+          jsonData: {
+            manageAlerts: true,
+          },
+        })
+      )
+    ).toBe(true);
+  });
+
+  it('should return true when the prop is undefined', () => {
+    expect(
+      isDataSourceManagingAlerts(
+        mockDataSource({
+          jsonData: {},
+        })
+      )
+    ).toBe(true);
+  });
+});
+
+it('should return false when the prop is set as false', () => {
+  expect(
+    isDataSourceManagingAlerts(
+      mockDataSource({
+        jsonData: {
+          manageAlerts: false,
+        },
+      })
+    )
+  ).toBe(false);
+});
diff --git a/public/app/features/alerting/unified/utils/datasource.ts b/public/app/features/alerting/unified/utils/datasource.ts
index 0d309b1cca5..23b234dbecc 100644
--- a/public/app/features/alerting/unified/utils/datasource.ts
+++ b/public/app/features/alerting/unified/utils/datasource.ts
@@ -191,3 +191,7 @@ export function getDefaultOrFirstCompatibleDataSource(): DataSourceInstanceSetti
 
   return defaultIsCompatible ? defaultDataSource : getFirstCompatibleDataSource();
 }
+
+export function isDataSourceManagingAlerts(ds: DataSourceInstanceSettings<DataSourceJsonData>) {
+  return ds.jsonData.manageAlerts !== false; //if this prop is undefined it defaults to true
+}

From 0b246942aed87be26de610841b148997702aab1c Mon Sep 17 00:00:00 2001
From: Ezequiel Victorero <ezequiel.victorero@grafana.com>
Date: Fri, 21 Apr 2023 14:46:27 -0300
Subject: [PATCH 332/729] PublicDashboards: Remove flaky test (#67061)

---
 .../SharePublicDashboard/SharePublicDashboard.test.tsx    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
index 842d3b6370c..5ac752ff596 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
@@ -144,14 +144,6 @@ describe('SharePublic', () => {
     await renderSharePublicDashboard();
     expect(screen.getByText('Last 6 hours')).toBeInTheDocument();
   });
-  it('renders default absolute time in input 2', async () => {
-    mockDashboard.time = { from: '2022-08-30T03:00:00.000Z', to: '2022-09-04T02:59:59.000Z' };
-    //@ts-ignore
-    mockDashboard.originalTime = { from: '2022-08-30T06:00:00.000Z', to: '2022-09-04T06:59:59.000Z' };
-
-    await renderSharePublicDashboard();
-    expect(screen.getByText('2022-08-30 00:00:00 to 2022-09-04 00:59:59')).toBeInTheDocument();
-  });
   it('when modal is opened, then checkboxes are enabled but create button is disabled', async () => {
     server.use(getNonExistentPublicDashboardResponse());
     await renderSharePublicDashboard();

From a2b97547a6fec749791d02a44de781a29205b6fa Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Fri, 21 Apr 2023 19:24:23 +0100
Subject: [PATCH 333/729] AzureMonitor: Correct series name accounting for
 dimensions (#67050)

Correct displayName accounting for dimensions
---
 .../metrics/azuremonitor-datasource.go        |  26 +--
 .../metrics/azuremonitor-datasource_test.go   |  57 +++++-
 ...onitor-response-multi-with-dimensions.json | 180 ++++++++++++++++++
 3 files changed, 245 insertions(+), 18 deletions(-)
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json

diff --git a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
index b4240d11d9a..9a121988629 100644
--- a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
+++ b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
@@ -317,9 +317,12 @@ func (e *AzureMonitorDatasource) parseResponse(amr types.AzureMonitorResponse, q
 				Unit: toGrafanaUnit(amr.Value[0].Unit),
 			})
 		}
-		resourceID, ok := labels["microsoft.resourceid"]
+
+		resourceIdLabel := "microsoft.resourceid"
+		resourceID, ok := labels[resourceIdLabel]
 		if !ok {
-			resourceID = labels["Microsoft.ResourceId"]
+			resourceIdLabel = "Microsoft.ResourceId"
+			resourceID = labels[resourceIdLabel]
 		}
 		resourceIDSlice := strings.Split(resourceID, "/")
 		resourceName := ""
@@ -331,18 +334,15 @@ func (e *AzureMonitorDatasource) parseResponse(amr types.AzureMonitorResponse, q
 			resourceName = extractResourceNameFromMetricsURL(query.URL)
 			resourceID = extractResourceIDFromMetricsURL(query.URL)
 		}
-		displayName := ""
-		if query.Alias != "" {
-			displayName = formatAzureMonitorLegendKey(query.Alias, resourceName,
-				amr.Value[0].Name.LocalizedValue, "", "", amr.Namespace, amr.Value[0].ID, labels)
-		} else if len(labels) > 0 {
-			// If labels are set, it will be used as the legend so we need to set a more user-friendly name
-			displayName = amr.Value[0].Name.LocalizedValue
-			if resourceName != "" {
-				displayName += " " + resourceName
-			}
+		if _, ok := labels[resourceIdLabel]; ok {
+			delete(labels, resourceIdLabel)
+			labels["resourceName"] = resourceName
 		}
-		if displayName != "" {
+
+		if query.Alias != "" {
+			displayName := formatAzureMonitorLegendKey(query.Alias, resourceName,
+				amr.Value[0].Name.LocalizedValue, "", "", amr.Namespace, amr.Value[0].ID, labels)
+
 			if dataField.Config != nil {
 				dataField.Config.DisplayName = displayName
 			} else {
diff --git a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
index ba7fffefa1c..fd60ee8e4b8 100644
--- a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
@@ -371,6 +371,9 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 	averageLink := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
 		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C` +
 		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D`)
+	averageLink2 := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
+		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C` +
+		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D`)
 	totalLink := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
 		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C` +
 		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D`)
@@ -502,7 +505,7 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
 					data.NewField("Blob Count", data.Labels{"blobtype": "PageBlob"},
 						[]*float64{util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), nil}).
-						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}, DisplayName: "Blob Count grafana"})),
+						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}})),
 
 				data.NewFrame("",
 					data.NewField("Time", nil,
@@ -510,7 +513,7 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
 					data.NewField("Blob Count", data.Labels{"blobtype": "BlockBlob"},
 						[]*float64{util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), nil}).
-						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}, DisplayName: "Blob Count grafana"})),
+						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}})),
 
 				data.NewFrame("",
 					data.NewField("Time", nil,
@@ -518,7 +521,7 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
 					data.NewField("Blob Count", data.Labels{"blobtype": "Azure Data Lake Storage"},
 						[]*float64{util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), nil}).
-						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}, DisplayName: "Blob Count grafana"})),
+						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}})),
 			},
 		},
 		{
@@ -686,9 +689,53 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					data.NewField("Time", nil,
 						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
 					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Percentage CPU", data.Labels{"microsoft.resourceid": "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana"}, []*float64{
+					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana"}, []*float64{
 						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink}, DisplayName: "Percentage CPU grafana"}),
+					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink}}),
+				),
+			},
+		},
+		{
+			name:         "multiple time series response with multiple dimensions",
+			responseFile: "10-azure-monitor-response-multi-with-dimensions.json",
+			mockQuery: &types.AzureMonitorQuery{
+				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/providers/microsoft.insights/metrics",
+				Params: url.Values{
+					"aggregation": {"Average"},
+				},
+			},
+			expectedFrames: data.Frames{
+				data.NewFrame("",
+					data.NewField("Time", nil,
+						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
+					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
+					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana", "Test Dimension": "value-1"}, []*float64{
+						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
+					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink}}),
+				),
+				data.NewFrame("",
+					data.NewField("Time", nil,
+						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
+					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
+					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana", "Test Dimension": "value-2"}, []*float64{
+						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
+					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink}}),
+				),
+				data.NewFrame("",
+					data.NewField("Time", nil,
+						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
+					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink2}}),
+					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana-1", "Test Dimension": "value-1"}, []*float64{
+						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
+					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink2}}),
+				),
+				data.NewFrame("",
+					data.NewField("Time", nil,
+						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
+					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink2}}),
+					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana-1", "Test Dimension": "value-3"}, []*float64{
+						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
+					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink2}}),
 				),
 			},
 		},
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json b/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json
new file mode 100644
index 00000000000..e2cc65ac53d
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json
@@ -0,0 +1,180 @@
+{
+	"cost": 1439,
+	"timespan": "2022-09-28T15:33:05Z/2022-09-29T15:33:05Z",
+	"interval": "PT5M",
+	"value": [
+		{
+			"id": "subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/providers/Microsoft.Insights/metrics/Percentage CPU",
+			"type": "Microsoft.Insights/metrics",
+			"name": {
+				"value": "Percentage CPU",
+				"localizedValue": "Percentage CPU"
+			},
+			"unit": "Percent",
+			"timeseries": [
+				{
+					"metadatavalues": [
+						{
+							"name": {
+								"value": "microsoft.resourceid",
+								"localizedValue": "microsoft.resourceid"
+							},
+							"value": "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana"
+						},
+						{
+							"name": {
+								"value": "test-dimension",
+								"localizedValue": "Test Dimension"
+							},
+							"value": "value-1"
+						}
+					],
+					"data": [
+                        {
+                            "timeStamp": "2019-02-08T10:13:00Z",
+                            "average": 2.0875
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:14:00Z",
+                            "average": 2.1525
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:15:00Z",
+                            "average": 2.155
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:16:00Z",
+                            "average": 3.6925
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:17:00Z",
+                            "average": 2.44
+                          }
+                    ]
+				},
+				{
+					"metadatavalues": [
+						{
+							"name": {
+								"value": "microsoft.resourceid",
+								"localizedValue": "microsoft.resourceid"
+							},
+							"value": "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana"
+						},
+						{
+							"name": {
+								"value": "test-dimension",
+								"localizedValue": "Test Dimension"
+							},
+							"value": "value-2"
+						}
+					],
+					"data": [
+                        {
+                            "timeStamp": "2019-02-08T10:13:00Z",
+                            "average": 2.0875
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:14:00Z",
+                            "average": 2.1525
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:15:00Z",
+                            "average": 2.155
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:16:00Z",
+                            "average": 3.6925
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:17:00Z",
+                            "average": 2.44
+                          }
+                    ]
+				},
+				{
+					"metadatavalues": [
+						{
+							"name": {
+								"value": "microsoft.resourceid",
+								"localizedValue": "microsoft.resourceid"
+							},
+							"value": "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana-1"
+						},
+						{
+							"name": {
+								"value": "test-dimension",
+								"localizedValue": "Test Dimension"
+							},
+							"value": "value-1"
+						}
+					],
+					"data": [
+                        {
+                            "timeStamp": "2019-02-08T10:13:00Z",
+                            "average": 2.0875
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:14:00Z",
+                            "average": 2.1525
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:15:00Z",
+                            "average": 2.155
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:16:00Z",
+                            "average": 3.6925
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:17:00Z",
+                            "average": 2.44
+                          }
+                    ]
+				},
+				{
+					"metadatavalues": [
+						{
+							"name": {
+								"value": "microsoft.resourceid",
+								"localizedValue": "microsoft.resourceid"
+							},
+							"value": "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana-1"
+						},
+						{
+							"name": {
+								"value": "test-dimension",
+								"localizedValue": "Test Dimension"
+							},
+							"value": "value-3"
+						}
+					],
+					"data": [
+                        {
+                            "timeStamp": "2019-02-08T10:13:00Z",
+                            "average": 2.0875
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:14:00Z",
+                            "average": 2.1525
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:15:00Z",
+                            "average": 2.155
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:16:00Z",
+                            "average": 3.6925
+                          },
+                          {
+                            "timeStamp": "2019-02-08T10:17:00Z",
+                            "average": 2.44
+                          }
+                    ]
+				}
+			]
+		}
+	],
+	"namespace": "Microsoft.Compute/virtualMachines",
+	"resourceregion": "northeurope"
+}

From faad4b92adba175ff2bc2f467c460ce899da1bca Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Fri, 21 Apr 2023 15:25:50 -0500
Subject: [PATCH 334/729] GrafanaDS: Add support for annotation time regions
 (#65462)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
Co-authored-by: Adela Almasan <adela.almasan@grafana.com>
---
 .betterer.results                             |   5 +-
 .../DateTimePickers/TimeZonePicker.tsx        |   8 +-
 public/app/core/utils/timeRegions.test.ts     | 146 +++++-
 public/app/core/utils/timeRegions.ts          |  50 +-
 .../components/AnnotationQueryEditor.tsx      | 128 +++--
 .../grafana/components/TimePickerInput.tsx    | 189 +++++++
 .../grafana/components/TimeRegionEditor.tsx   | 191 +++++++
 .../plugins/datasource/grafana/datasource.ts  |  27 +-
 .../datasource/grafana/timeRegions.test.ts    | 490 ++++++++++++++++++
 .../plugins/datasource/grafana/timeRegions.ts |  48 ++
 .../app/plugins/datasource/grafana/types.ts   |   3 +
 .../panel/timeseries/TimeSeriesPanel.tsx      |  29 +-
 12 files changed, 1231 insertions(+), 83 deletions(-)
 create mode 100644 public/app/plugins/datasource/grafana/components/TimePickerInput.tsx
 create mode 100644 public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx
 create mode 100644 public/app/plugins/datasource/grafana/timeRegions.test.ts
 create mode 100644 public/app/plugins/datasource/grafana/timeRegions.ts

diff --git a/.betterer.results b/.betterer.results
index a4cb078f9fd..1bd25927cc8 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4204,9 +4204,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Do not use any type assertions.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
+      [0, 0, 0, "Do not use any type assertions.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Do not use any type assertions.", "12"]
     ],
     "public/app/plugins/datasource/graphite/components/FunctionEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.tsx
index 87ef42fd9e0..093a2ebde95 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.tsx
@@ -27,6 +27,8 @@ export interface Props {
   includeInternal?: boolean | InternalTimeZones[];
   disabled?: boolean;
   inputId?: string;
+  menuShouldPortal?: boolean;
+  openMenuOnFocus?: boolean;
 }
 
 export const TimeZonePicker = (props: Props) => {
@@ -39,6 +41,8 @@ export const TimeZonePicker = (props: Props) => {
     includeInternal = false,
     disabled = false,
     inputId,
+    menuShouldPortal = false,
+    openMenuOnFocus = true,
   } = props;
   const groupedTimeZones = useTimeZones(includeInternal);
   const selected = useSelectedTimeZone(groupedTimeZones, value);
@@ -61,8 +65,8 @@ export const TimeZonePicker = (props: Props) => {
       value={selected}
       placeholder={t('time-picker.zone.select-search-input', 'Type to search (country, city, abbreviation)')}
       autoFocus={autoFocus}
-      menuShouldPortal={false}
-      openMenuOnFocus={true}
+      menuShouldPortal={menuShouldPortal}
+      openMenuOnFocus={openMenuOnFocus}
       width={width}
       filterOption={filterBySearchIndex}
       options={groupedTimeZones}
diff --git a/public/app/core/utils/timeRegions.test.ts b/public/app/core/utils/timeRegions.test.ts
index 643883a2707..9805e28824f 100644
--- a/public/app/core/utils/timeRegions.test.ts
+++ b/public/app/core/utils/timeRegions.test.ts
@@ -1,40 +1,160 @@
 import { dateTime, TimeRange } from '@grafana/data';
+import { TimeRegionConfig } from 'app/core/utils/timeRegions';
 
-import { calculateTimesWithin, TimeRegionConfig } from './timeRegions';
+import { calculateTimesWithin } from './timeRegions';
 
+// note: calculateTimesWithin always returns time ranges in UTC
 describe('timeRegions', () => {
   describe('day of week', () => {
-    it('4 sundays in january 2021', () => {
+    it('returns regions with 4 Mondays in March 2023', () => {
       const cfg: TimeRegionConfig = {
         fromDayOfWeek: 1,
-        from: '12:00',
       };
+
       const tr: TimeRange = {
-        from: dateTime('2021-01-00', 'YYYY-MM-dd'),
-        to: dateTime('2021-02-00', 'YYYY-MM-dd'),
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-31'),
         raw: {
           to: '',
           from: '',
         },
       };
+
       const regions = calculateTimesWithin(cfg, tr);
       expect(regions).toMatchInlineSnapshot(`
         [
           {
-            "from": 1609779600000,
-            "to": 1609779600000,
+            "from": 1678060800000,
+            "to": 1678147199000,
           },
           {
-            "from": 1610384400000,
-            "to": 1610384400000,
+            "from": 1678665600000,
+            "to": 1678751999000,
           },
           {
-            "from": 1610989200000,
-            "to": 1610989200000,
+            "from": 1679270400000,
+            "to": 1679356799000,
           },
           {
-            "from": 1611594000000,
-            "to": 1611594000000,
+            "from": 1679875200000,
+            "to": 1679961599000,
+          },
+        ]
+      `);
+    });
+  });
+  describe('day and time of week', () => {
+    it('returns regions with 4 Mondays at 20:00 in March 2023', () => {
+      const cfg: TimeRegionConfig = {
+        fromDayOfWeek: 1,
+        from: '20:00',
+      };
+
+      const tr: TimeRange = {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-31'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      };
+
+      const regions = calculateTimesWithin(cfg, tr);
+      expect(regions).toMatchInlineSnapshot(`
+        [
+          {
+            "from": 1678132800000,
+            "to": 1678132800000,
+          },
+          {
+            "from": 1678737600000,
+            "to": 1678737600000,
+          },
+          {
+            "from": 1679342400000,
+            "to": 1679342400000,
+          },
+          {
+            "from": 1679947200000,
+            "to": 1679947200000,
+          },
+        ]
+      `);
+    });
+  });
+  describe('day of week range', () => {
+    it('returns regions with days range', () => {
+      const cfg: TimeRegionConfig = {
+        fromDayOfWeek: 1,
+        toDayOfWeek: 3,
+      };
+
+      const tr: TimeRange = {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-31'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      };
+
+      const regions = calculateTimesWithin(cfg, tr);
+      expect(regions).toMatchInlineSnapshot(`
+        [
+          {
+            "from": 1678060800000,
+            "to": 1678319999000,
+          },
+          {
+            "from": 1678665600000,
+            "to": 1678924799000,
+          },
+          {
+            "from": 1679270400000,
+            "to": 1679529599000,
+          },
+          {
+            "from": 1679875200000,
+            "to": 1680134399000,
+          },
+        ]
+      `);
+    });
+    it('returns regions with days/times range', () => {
+      const cfg: TimeRegionConfig = {
+        fromDayOfWeek: 1,
+        from: '20:00',
+        toDayOfWeek: 2,
+        to: '10:00',
+      };
+
+      const tr: TimeRange = {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-31'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      };
+
+      const regions = calculateTimesWithin(cfg, tr);
+      expect(regions).toMatchInlineSnapshot(`
+        [
+          {
+            "from": 1678132800000,
+            "to": 1678183200000,
+          },
+          {
+            "from": 1678737600000,
+            "to": 1678788000000,
+          },
+          {
+            "from": 1679342400000,
+            "to": 1679392800000,
+          },
+          {
+            "from": 1679947200000,
+            "to": 1679997600000,
           },
         ]
       `);
diff --git a/public/app/core/utils/timeRegions.ts b/public/app/core/utils/timeRegions.ts
index 329453cf014..363519021dd 100644
--- a/public/app/core/utils/timeRegions.ts
+++ b/public/app/core/utils/timeRegions.ts
@@ -6,6 +6,8 @@ export interface TimeRegionConfig {
 
   to?: string;
   toDayOfWeek?: number; // 1-7
+
+  timezone?: string;
 }
 
 interface ParsedTime {
@@ -32,8 +34,8 @@ export function calculateTimesWithin(cfg: TimeRegionConfig, tRange: TimeRange):
   }
 
   const hRange = {
-    from: parseTimeRange(timeRegion.from),
-    to: parseTimeRange(timeRegion.to),
+    from: parseTimeOfDay(timeRegion.from),
+    to: parseTimeOfDay(timeRegion.to),
   };
 
   if (!timeRegion.fromDayOfWeek && timeRegion.toDayOfWeek) {
@@ -78,10 +80,11 @@ export function calculateTimesWithin(cfg: TimeRegionConfig, tRange: TimeRange):
 
   const regions: AbsoluteTimeRange[] = [];
 
-  const fromStart = dateTime(tRange.from);
+  const fromStart = dateTime(tRange.from).utc();
   fromStart.set('hour', 0);
   fromStart.set('minute', 0);
   fromStart.set('second', 0);
+  fromStart.set('millisecond', 0);
   fromStart.add(hRange.from.h, 'hours');
   fromStart.add(hRange.from.m, 'minutes');
   fromStart.add(hRange.from.s, 'seconds');
@@ -95,7 +98,7 @@ export function calculateTimesWithin(cfg: TimeRegionConfig, tRange: TimeRange):
       break;
     }
 
-    const fromEnd = dateTime(fromStart);
+    const fromEnd = dateTime(fromStart).utc();
 
     if (fromEnd.hour) {
       if (hRange.from.h <= hRange.to.h) {
@@ -134,35 +137,36 @@ export function calculateTimesWithin(cfg: TimeRegionConfig, tRange: TimeRange):
   return regions;
 }
 
-function parseTimeRange(str?: string): ParsedTime {
+export function parseTimeOfDay(str?: string): ParsedTime {
   const result: ParsedTime = {};
   if (!str?.length) {
     return result;
   }
 
-  const timeRegex = /^([\d]+):?(\d{2})?/;
-  const match = timeRegex.exec(str);
-
-  if (!match) {
+  const match = str.split(':');
+  if (!match?.length) {
     return result;
   }
 
+  result.h = Math.min(23, Math.max(0, Number(match[0])));
   if (match.length > 1) {
-    result.h = Number(match[1]);
-    result.m = 0;
-
-    if (match.length > 2 && match[2] !== undefined) {
-      result.m = Number(match[2]);
-    }
-
-    if (result.h > 23) {
-      result.h = 23;
-    }
-
-    if (result.m > 59) {
-      result.m = 59;
+    result.m = Math.min(60, Math.max(0, Number(match[1])));
+    if (match.length > 2) {
+      result.s = Math.min(60, Math.max(0, Number(match[2])));
     }
   }
-
   return result;
 }
+
+export function formatTimeOfDayString(t?: ParsedTime): string {
+  if (!t || (t.h == null && t.m == null && t.s == null)) {
+    return '';
+  }
+
+  let str = String(t.h ?? 0).padStart(2, '0') + ':' + String(t.m ?? 0).padStart(2, '0');
+  if (t.s != null) {
+    str += String(t.s ?? 0).padStart(2, '0');
+  }
+
+  return str;
+}
diff --git a/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
index 477d282fa61..0894f13ab2b 100644
--- a/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
@@ -1,12 +1,16 @@
 import { css } from '@emotion/css';
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { SelectableValue } from '@grafana/data';
-import { Field, FieldSet, Select, Switch } from '@grafana/ui';
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Field, FieldSet, Select, Switch, useStyles2 } from '@grafana/ui';
 import { TagFilter } from 'app/core/components/TagFilter/TagFilter';
+import { TimeRegionConfig } from 'app/core/utils/timeRegions';
 import { getAnnotationTags } from 'app/features/annotations/api';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 
-import { GrafanaAnnotationQuery, GrafanaAnnotationType, GrafanaQuery } from '../types';
+import { GrafanaAnnotationQuery, GrafanaAnnotationType, GrafanaQuery, GrafanaQueryType } from '../types';
+
+import { TimeRegionEditor } from './TimeRegionEditor';
 
 const matchTooltipContent = 'Enabling this returns annotations that match any of the tags specified below';
 
@@ -14,7 +18,7 @@ const tagsTooltipContent = (
   <div>Specify a list of tags to match. To specify a key and value tag use `key:value` syntax.</div>
 );
 
-const annotationTypes = [
+const annotationTypes: Array<SelectableValue<GrafanaAnnotationType>> = [
   {
     label: 'Dashboard',
     value: GrafanaAnnotationType.Dashboard,
@@ -27,6 +31,19 @@ const annotationTypes = [
   },
 ];
 
+const queryTypes: Array<SelectableValue<GrafanaQueryType>> = [
+  {
+    label: 'Annotations & Alerts',
+    value: GrafanaQueryType.Annotations,
+    description: 'Show annotations or alerts managed by grafana',
+  },
+  {
+    label: 'Time regions',
+    value: GrafanaQueryType.TimeRegions,
+    description: 'Configure a repeating time region',
+  },
+];
+
 const limitOptions = [10, 50, 100, 200, 300, 500, 1000, 2000].map((limit) => ({
   label: String(limit),
   value: limit,
@@ -39,8 +56,10 @@ interface Props {
 
 export default function AnnotationQueryEditor({ query, onChange }: Props) {
   const annotationQuery = query as GrafanaAnnotationQuery;
-  const { limit, matchAny, tags, type } = annotationQuery;
-  const styles = getStyles();
+  const { limit, matchAny, tags, type, queryType } = annotationQuery;
+  let grafanaQueryType = queryType ?? GrafanaQueryType.Annotations;
+  const defaultTimezone = useMemo(() => getDashboardSrv().dashboard?.getTimezone(), []);
+  const styles = useStyles2(getStyles);
 
   const onFilterByChange = (newValue: SelectableValue<GrafanaAnnotationType>) =>
     onChange({
@@ -66,49 +85,86 @@ export default function AnnotationQueryEditor({ query, onChange }: Props) {
       tags,
     });
 
+  const onQueryTypeChange = (newValue: SelectableValue<GrafanaQueryType>) => {
+    const newQuery: GrafanaAnnotationQuery = { ...annotationQuery, queryType: newValue.value! };
+    if (newQuery.queryType === GrafanaQueryType.TimeRegions) {
+      if (!newQuery.timeRegion) {
+        newQuery.timeRegion = {
+          timezone: defaultTimezone,
+        };
+      }
+    } else {
+      delete newQuery.timeRegion;
+    }
+
+    onChange(newQuery);
+  };
+  const onTimeRegionChange = (timeRegion?: TimeRegionConfig) => {
+    onChange({
+      ...annotationQuery,
+      timeRegion,
+    });
+  };
+
   return (
     <FieldSet className={styles.container}>
-      <Field label="Filter by">
+      <Field label="Query type">
         <Select
-          inputId="grafana-annotations__filter-by"
-          options={annotationTypes}
-          value={type}
-          onChange={onFilterByChange}
+          inputId="grafana-annotations__query-type"
+          options={queryTypes}
+          value={grafanaQueryType}
+          onChange={onQueryTypeChange}
         />
       </Field>
-      <Field label="Max limit">
-        <Select
-          inputId="grafana-annotations__limit"
-          width={16}
-          options={limitOptions}
-          value={limit}
-          onChange={onMaxLimitChange}
-        />
-      </Field>
-      {type === GrafanaAnnotationType.Tags && (
+      {grafanaQueryType === GrafanaQueryType.Annotations && (
         <>
-          <Field label="Match any" description={matchTooltipContent}>
-            <Switch id="grafana-annotations__match-any" value={matchAny} onChange={onMatchAnyChange} />
-          </Field>
-          <Field label="Tags" description={tagsTooltipContent}>
-            <TagFilter
-              allowCustomValue
-              inputId="grafana-annotations__tags"
-              onChange={onTagsChange}
-              tagOptions={getAnnotationTags}
-              tags={tags ?? []}
+          <Field label="Filter by">
+            <Select
+              inputId="grafana-annotations__filter-by"
+              options={annotationTypes}
+              value={type}
+              onChange={onFilterByChange}
             />
           </Field>
+          <Field label="Max limit">
+            <Select
+              inputId="grafana-annotations__limit"
+              width={16}
+              options={limitOptions}
+              value={limit}
+              onChange={onMaxLimitChange}
+            />
+          </Field>
+          {type === GrafanaAnnotationType.Tags && (
+            <>
+              <Field label="Match any" description={matchTooltipContent}>
+                <Switch id="grafana-annotations__match-any" value={matchAny} onChange={onMatchAnyChange} />
+              </Field>
+              <Field label="Tags" description={tagsTooltipContent}>
+                <TagFilter
+                  allowCustomValue
+                  inputId="grafana-annotations__tags"
+                  onChange={onTagsChange}
+                  tagOptions={getAnnotationTags}
+                  tags={tags ?? []}
+                />
+              </Field>
+            </>
+          )}
         </>
       )}
+      {grafanaQueryType === GrafanaQueryType.TimeRegions && annotationQuery.timeRegion && (
+        <TimeRegionEditor value={annotationQuery.timeRegion} onChange={onTimeRegionChange} />
+      )}
     </FieldSet>
   );
 }
 
-const getStyles = () => {
+const getStyles = (theme: GrafanaTheme2) => {
   return {
-    container: css`
-      max-width: 600px;
-    `,
+    container: css({
+      maxWidth: theme.spacing(60),
+      marginBottom: theme.spacing(2),
+    }),
   };
 };
diff --git a/public/app/plugins/datasource/grafana/components/TimePickerInput.tsx b/public/app/plugins/datasource/grafana/components/TimePickerInput.tsx
new file mode 100644
index 00000000000..00d9fe07671
--- /dev/null
+++ b/public/app/plugins/datasource/grafana/components/TimePickerInput.tsx
@@ -0,0 +1,189 @@
+import { css, cx } from '@emotion/css';
+import { Moment } from 'moment';
+import TimePicker from 'rc-time-picker';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { FormInputSize, Icon, useStyles2 } from '@grafana/ui';
+import { inputSizes } from '@grafana/ui/src/components/Forms/commonStyles';
+import { focusCss } from '@grafana/ui/src/themes/mixins';
+
+export interface Props {
+  onChange: (value: Moment) => void;
+  value?: Moment;
+  defaultValue?: Moment;
+  showHour?: boolean;
+  showSeconds?: boolean;
+  minuteStep?: number;
+  size?: FormInputSize;
+  disabled?: boolean;
+  disabledHours?: () => number[];
+  disabledMinutes?: () => number[];
+  disabledSeconds?: () => number[];
+  placeholder?: string;
+  format?: string;
+  allowEmpty?: boolean;
+  width?: number;
+}
+
+export const POPUP_CLASS_NAME = 'time-of-day-picker-panel';
+
+// @TODO fix TimeOfDayPicker and switch?
+export const TimePickerInput = ({
+  minuteStep = 1,
+  showHour = true,
+  showSeconds = false,
+  onChange,
+  value,
+  size = 'auto',
+  disabled,
+  disabledHours,
+  disabledMinutes,
+  disabledSeconds,
+  placeholder,
+  format = 'HH:mm',
+  defaultValue = undefined,
+  allowEmpty = false,
+  width,
+}: Props) => {
+  const styles = useStyles2(getStyles);
+
+  const getWidth = () => {
+    if (width) {
+      return css`
+        width: ${width}px;
+      `;
+    }
+
+    return inputSizes()[size];
+  };
+
+  return (
+    <TimePicker
+      value={value}
+      defaultValue={defaultValue}
+      onChange={(v) => onChange(v)}
+      showHour={showHour}
+      showSecond={showSeconds}
+      format={format}
+      allowEmpty={allowEmpty}
+      className={cx(getWidth(), styles.input)}
+      popupClassName={cx(styles.picker, POPUP_CLASS_NAME)}
+      minuteStep={minuteStep}
+      inputIcon={<Caret wrapperStyle={styles.caretWrapper} />}
+      disabled={disabled}
+      disabledHours={disabledHours}
+      disabledMinutes={disabledMinutes}
+      disabledSeconds={disabledSeconds}
+      placeholder={placeholder}
+    />
+  );
+};
+
+interface CaretProps {
+  wrapperStyle?: string;
+}
+
+const Caret = ({ wrapperStyle = '' }: CaretProps) => {
+  return (
+    <div className={wrapperStyle}>
+      <Icon name="angle-down" />
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  const bgColor = theme.components.input.background;
+  const menuShadowColor = theme.v1.palette.black;
+  const optionBgHover = theme.colors.background.secondary;
+  const borderRadius = theme.shape.borderRadius(1);
+  const borderColor = theme.components.input.borderColor;
+
+  return {
+    caretWrapper: css`
+      position: absolute;
+      right: 8px;
+      top: 50%;
+      transform: translateY(-50%);
+      display: inline-block;
+      text-align: right;
+      color: ${theme.colors.text.secondary};
+    `,
+    picker: css`
+      .rc-time-picker-panel-select {
+        font-size: 14px;
+        background-color: ${bgColor};
+        border-color: ${borderColor};
+        li {
+          outline-width: 2px;
+          &.rc-time-picker-panel-select-option-selected {
+            background-color: inherit;
+            border: 1px solid ${theme.v1.palette.orange};
+            border-radius: ${borderRadius};
+          }
+
+          &:hover {
+            background: ${optionBgHover};
+          }
+
+          &.rc-time-picker-panel-select-option-disabled {
+            color: ${theme.colors.action.disabledText};
+          }
+        }
+      }
+
+      .rc-time-picker-panel-inner {
+        box-shadow: 0px 4px 4px ${menuShadowColor};
+        background-color: ${bgColor};
+        border-color: ${borderColor};
+        border-radius: ${borderRadius};
+        margin-top: 3px;
+
+        .rc-time-picker-panel-input-wrap {
+          margin-right: 2px;
+
+          &,
+          .rc-time-picker-panel-input {
+            background-color: ${bgColor};
+            padding-top: 2px;
+          }
+        }
+
+        .rc-time-picker-panel-combobox {
+          display: flex;
+        }
+      }
+    `,
+    input: css`
+      .rc-time-picker-input {
+        background-color: ${bgColor};
+        border-radius: ${borderRadius};
+        border-color: ${borderColor};
+        height: ${theme.spacing(4)};
+
+        &:focus {
+          ${focusCss(theme)}
+        }
+
+        &:disabled {
+          background-color: ${theme.colors.action.disabledBackground};
+          color: ${theme.colors.action.disabledText};
+          border: 1px solid ${theme.colors.action.disabledBackground};
+          &:focus {
+            box-shadow: none;
+          }
+        }
+      }
+
+      .rc-time-picker-clear {
+        position: absolute;
+        right: 20px;
+        top: 50%;
+        cursor: pointer;
+        overflow: hidden;
+        transform: translateY(-50%);
+        color: ${theme.colors.text.secondary};
+      }
+    `,
+  };
+};
diff --git a/public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx b/public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx
new file mode 100644
index 00000000000..932609afecb
--- /dev/null
+++ b/public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx
@@ -0,0 +1,191 @@
+import { css } from '@emotion/css';
+import moment, { Moment } from 'moment/moment';
+import React, { useState } from 'react';
+
+import { getTimeZoneInfo, GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Button, Field, FieldSet, HorizontalGroup, Select, TimeZonePicker, useStyles2 } from '@grafana/ui';
+import { TimeZoneOffset } from '@grafana/ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOffset';
+import { TimeZoneTitle } from '@grafana/ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneTitle';
+import { TimeRegionConfig } from 'app/core/utils/timeRegions';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+
+import { TimePickerInput } from './TimePickerInput';
+
+interface Props {
+  value: TimeRegionConfig;
+  onChange: (value?: TimeRegionConfig) => void;
+}
+
+const days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'].map((v, idx) => {
+  return {
+    label: v,
+    value: idx + 1,
+  };
+});
+export const TimeRegionEditor = ({ value, onChange }: Props) => {
+  const styles = useStyles2(getStyles);
+  const timestamp = Date.now();
+  const timezoneInfo = getTimeZoneInfo(value.timezone ?? 'utc', timestamp);
+  const isDashboardTimezone = getDashboardSrv().getCurrent()?.getTimezone() === value.timezone;
+
+  const [isEditing, setEditing] = useState(false);
+
+  const onToggleChangeTimezone = () => {
+    setEditing(!isEditing);
+  };
+
+  const getTime = (time: string | undefined): Moment | undefined => {
+    if (!time) {
+      return undefined;
+    }
+
+    const date = moment();
+
+    if (time) {
+      const match = time.split(':');
+      date.set('hour', parseInt(match[0], 10));
+      date.set('minute', parseInt(match[1], 10));
+    }
+
+    return date;
+  };
+
+  const getToPlaceholder = () => {
+    let placeholder = 'Everyday';
+    if (value.fromDayOfWeek && !value.toDayOfWeek) {
+      placeholder = days[value.fromDayOfWeek - 1].label;
+    }
+
+    return placeholder;
+  };
+
+  const renderTimezonePicker = () => {
+    const timezone = (
+      <>
+        <TimeZoneTitle title={timezoneInfo?.name} />
+        <TimeZoneOffset timeZone={value.timezone} timestamp={timestamp} />
+      </>
+    );
+
+    if (isDashboardTimezone) {
+      return <>Dashboard timezone ({timezone})</>;
+    }
+
+    return timezone;
+  };
+
+  const onTimeChange = (v: Moment, field: string) => {
+    const time = v ? v.format('HH:mm') : undefined;
+    if (field === 'from') {
+      onChange({ ...value, from: time });
+    } else {
+      onChange({ ...value, to: time });
+    }
+  };
+
+  const onTimezoneChange = (v: string | undefined) => {
+    onChange({ ...value, timezone: v });
+  };
+
+  const onFromDayOfWeekChange = (v: SelectableValue<number>) => {
+    const fromDayOfWeek = v ? v.value : undefined;
+    const toDayOfWeek = v ? value.toDayOfWeek : undefined; // clear if everyday
+    onChange({ ...value, fromDayOfWeek, toDayOfWeek });
+  };
+
+  const onToDayOfWeekChange = (v: SelectableValue<number>) => {
+    onChange({ ...value, toDayOfWeek: v ? v.value : undefined });
+  };
+
+  const renderTimezone = () => {
+    if (isEditing) {
+      return (
+        <TimeZonePicker
+          value={value.timezone}
+          includeInternal={true}
+          onChange={(v) => onTimezoneChange(v)}
+          onBlur={() => setEditing(false)}
+          menuShouldPortal={true}
+          openMenuOnFocus={false}
+          width={100}
+          autoFocus
+        />
+      );
+    }
+
+    return (
+      <div className={styles.timezoneContainer}>
+        <div className={styles.timezone}>{renderTimezonePicker()}</div>
+        <Button variant="secondary" onClick={onToggleChangeTimezone} size="sm">
+          Change timezone
+        </Button>
+      </div>
+    );
+  };
+
+  return (
+    <FieldSet className={styles.wrapper}>
+      <Field label="From">
+        <HorizontalGroup spacing="xs">
+          <Select
+            options={days}
+            isClearable
+            placeholder="Everyday"
+            value={value.fromDayOfWeek ?? null}
+            onChange={(v) => onFromDayOfWeekChange(v)}
+            width={20}
+          />
+          <TimePickerInput
+            value={getTime(value.from)}
+            onChange={(v) => onTimeChange(v, 'from')}
+            allowEmpty={true}
+            placeholder="HH:mm"
+            width={100}
+          />
+        </HorizontalGroup>
+      </Field>
+      <Field label="To">
+        <HorizontalGroup spacing="xs">
+          {(value.fromDayOfWeek || value.toDayOfWeek) && (
+            <Select
+              options={days}
+              isClearable
+              placeholder={getToPlaceholder()}
+              value={value.toDayOfWeek ?? null}
+              onChange={(v) => onToDayOfWeekChange(v)}
+              width={20}
+            />
+          )}
+          <TimePickerInput
+            value={getTime(value.to)}
+            onChange={(v) => onTimeChange(v, 'to')}
+            allowEmpty={true}
+            placeholder="HH:mm"
+            width={100}
+          />
+        </HorizontalGroup>
+      </Field>
+      <Field label="Timezone">{renderTimezone()}</Field>
+    </FieldSet>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    wrapper: css({
+      maxWidth: theme.spacing(60),
+      marginBottom: theme.spacing(2),
+    }),
+    timezoneContainer: css`
+      padding: 5px;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 12px;
+    `,
+    timezone: css`
+      margin-right: 5px;
+    `,
+  };
+};
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index d453d362986..b9e22bdfe78 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -30,6 +30,7 @@ import { migrateDatasourceNameToRef } from 'app/features/dashboard/state/Dashboa
 import { getDashboardSrv } from '../../../features/dashboard/services/DashboardSrv';
 
 import AnnotationQueryEditor from './components/AnnotationQueryEditor';
+import { doTimeRegionQuery } from './timeRegions';
 import { GrafanaAnnotationQuery, GrafanaAnnotationType, GrafanaQuery, GrafanaQueryType } from './types';
 
 let counter = 100;
@@ -96,12 +97,25 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
       if (target.queryType === GrafanaQueryType.Snapshot) {
         results.push(
           of({
+            // NOTE refId is intentionally missing because:
+            // 1) there is only one snapshot
+            // 2) the payload will reference original refIds
             data: (target.snapshot ?? []).map((v) => dataFrameFromJSON(v)),
             state: LoadingState.Done,
           })
         );
         continue;
       }
+      if (target.queryType === GrafanaQueryType.TimeRegions) {
+        const frame = doTimeRegionQuery('', target.timeRegion!, request.range, request.timezone);
+        results.push(
+          of({
+            data: frame ? [frame] : [],
+            state: LoadingState.Done,
+          })
+        );
+        continue;
+      }
       if (target.queryType === GrafanaQueryType.LiveMeasurements) {
         let channel = templateSrv.replace(target.channel, request.scopedVars);
         const { filter } = target;
@@ -177,7 +191,17 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
   }
 
   async getAnnotations(options: AnnotationQueryRequest<GrafanaQuery>): Promise<DataQueryResponse> {
-    const templateSrv = getTemplateSrv();
+    const query = options.annotation.target as GrafanaQuery;
+    if (query?.queryType === GrafanaQueryType.TimeRegions) {
+      const frame = doTimeRegionQuery(
+        options.annotation.name,
+        query.timeRegion!,
+        options.range,
+        getDashboardSrv().getCurrent()?.timezone // Annotation queries don't include the timezone
+      );
+      return Promise.resolve({ data: frame ? [frame] : [] });
+    }
+
     const annotation = options.annotation as unknown as AnnotationQuery<GrafanaAnnotationQuery>;
     const target = annotation.target!;
     const params: any = {
@@ -202,6 +226,7 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
       if (!Array.isArray(target.tags) || target.tags.length === 0) {
         return Promise.resolve({ data: [] });
       }
+      const templateSrv = getTemplateSrv();
       const delimiter = '__delimiter__';
       const tags = [];
       for (const t of params.tags) {
diff --git a/public/app/plugins/datasource/grafana/timeRegions.test.ts b/public/app/plugins/datasource/grafana/timeRegions.test.ts
new file mode 100644
index 00000000000..f5502fec661
--- /dev/null
+++ b/public/app/plugins/datasource/grafana/timeRegions.test.ts
@@ -0,0 +1,490 @@
+import { dateTime, toDataFrameDTO } from '@grafana/data';
+
+import { doTimeRegionQuery } from './timeRegions';
+
+describe('grafana data source', () => {
+  it('supports time region query', () => {
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, toDayOfWeek: 2 },
+      {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-31'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'utc'
+    );
+
+    expect(toDataFrameDTO(frame!)).toMatchInlineSnapshot(`
+      {
+        "fields": [
+          {
+            "config": {},
+            "labels": undefined,
+            "name": "time",
+            "type": "time",
+            "values": [
+              1678060800000,
+              1678665600000,
+              1679270400000,
+              1679875200000,
+            ],
+          },
+          {
+            "config": {},
+            "labels": undefined,
+            "name": "timeEnd",
+            "type": "time",
+            "values": [
+              1678233599000,
+              1678838399000,
+              1679443199000,
+              1680047999000,
+            ],
+          },
+          {
+            "config": {},
+            "labels": undefined,
+            "name": "text",
+            "type": "string",
+            "values": [
+              "test",
+              "test",
+              "test",
+              "test",
+            ],
+          },
+        ],
+        "meta": undefined,
+        "name": undefined,
+        "refId": undefined,
+      }
+    `);
+  });
+
+  it('handles timezone conversion UTC-UTC', () => {
+    // region TZ = UTC
+    // dashboard TZ = UTC
+    // Mon Mar 06 2023 00:00:00 GMT+0000 -> Mon Mar 06 2023 23:59:59 GMT+0000
+
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, timezone: 'utc' },
+      {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-08'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'utc'
+    );
+
+    expect(toDataFrameDTO(frame!).fields).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "time",
+          "type": "time",
+          "values": [
+            1678060800000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "timeEnd",
+          "type": "time",
+          "values": [
+            1678147199000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "text",
+          "type": "string",
+          "values": [
+            "test",
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('handles timezone conversion browser-UTC', () => {
+    // region TZ = browser (Pacific/Easter)
+    // dashboard TZ = UTC
+    // Mon Mar 06 2023 00:00:00 GMT-0600 -> Mon Mar 06 2023 23:59:59 GMT-0600
+    // Mon Mar 06 2023 06:00:00 GMT+0000 -> Mon Mar 06 2023 05:59:59 GMT+0000
+
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, timezone: 'browser' },
+      {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-08'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'utc'
+    );
+
+    expect(toDataFrameDTO(frame!).fields).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "time",
+          "type": "time",
+          "values": [
+            1678078800000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "timeEnd",
+          "type": "time",
+          "values": [
+            1678165199000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "text",
+          "type": "string",
+          "values": [
+            "test",
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('handles timezone conversion CST-UTC', () => {
+    // region TZ = America/Chicago (CST)
+    // dashboard TZ = UTC
+    // Mon Mar 06 2023 00:00:00 GMT-0600 -> Mon Mar 06 2023 23:59:59 GMT-0600 (CDT)
+    // Mon Mar 06 2023 06:00:00 GMT+0000 -> Tue Mar 07 2023 05:59:59 GMT+0000
+
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, timezone: 'America/Chicago' },
+      {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-08'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'utc'
+    );
+
+    expect(toDataFrameDTO(frame!).fields).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "time",
+          "type": "time",
+          "values": [
+            1678082400000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "timeEnd",
+          "type": "time",
+          "values": [
+            1678168799000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "text",
+          "type": "string",
+          "values": [
+            "test",
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('handles timezone conversion Europe/Amsterdam-UTC', () => {
+    // region TZ = Europe/Amsterdam
+    // dashboard TZ = UTC
+    // Mon Mar 06 2023 00:00:00 GMT+0100 -> Mon Mar 06 2023 23:59:59 GMT+0100 (Europe/Amsterdam)
+    // Sun Mar 05 2023 23:00:00 GMT+0000 -> Mon Mar 06 2023 22:59:59 GMT+0000
+
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, timezone: 'Europe/Amsterdam' },
+      {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-08'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'utc'
+    );
+
+    expect(toDataFrameDTO(frame!).fields).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "time",
+          "type": "time",
+          "values": [
+            1678057200000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "timeEnd",
+          "type": "time",
+          "values": [
+            1678143599000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "text",
+          "type": "string",
+          "values": [
+            "test",
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('handles timezone conversion Asia/Hovd-UTC', () => {
+    // region TZ = Asia/Hovd
+    // dashboard TZ = UTC
+    // Mon Mar 06 2023 00:00:00 GMT+0700 -> Mon Mar 06 2023 23:59:59 GMT+0700 (Asia/Hovd)
+    // Sun Mar 05 2023 17:00:00 GMT+0000 -> Mon Mar 06 2023 16:59:59 GMT+0000
+
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, timezone: 'Asia/Hovd' },
+      {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-08'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'utc'
+    );
+
+    expect(toDataFrameDTO(frame!).fields).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "time",
+          "type": "time",
+          "values": [
+            1678035600000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "timeEnd",
+          "type": "time",
+          "values": [
+            1678121999000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "text",
+          "type": "string",
+          "values": [
+            "test",
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('handles timezone conversion UTC-Asia/Dubai', () => {
+    // region TZ = UTC
+    // dashboard TZ = Asia/Dubai
+    // Mon Mar 06 2023 00:00:00 GMT+0000 -> Mon Mar 06 2023 23:59:59 GMT+0000 (UTC)
+    // Mon Mar 06 2023 04:00:00 GMT+0400 -> Mon Mar 06 2023 03:59:59 GMT+0400 (Asia/Dubai)
+
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, timezone: 'utc' },
+      {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-08'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'Asia/Dubai'
+    );
+
+    expect(toDataFrameDTO(frame!).fields).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "time",
+          "type": "time",
+          "values": [
+            1678060800000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "timeEnd",
+          "type": "time",
+          "values": [
+            1678147199000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "text",
+          "type": "string",
+          "values": [
+            "test",
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('handles timezone conversion UTC-CST', () => {
+    // region TZ = UTC
+    // dashboard TZ = 'America/Chicago'
+    // Mon Mar 06 2023 08:00:00 GMT+0000 -> Mon Mar 06 2023 08:00:00 GMT+0000 (UTC)
+    // Mon Mar 06 2023 02:00:00 GMT-0600 -> Mon Mar 06 2023 02:00:00 GMT-0600 (CST)
+
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, from: '08:00', timezone: 'utc' },
+      {
+        from: dateTime('2023-03-01'),
+        to: dateTime('2023-03-08'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'America/Chicago'
+    );
+
+    expect(toDataFrameDTO(frame!).fields).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "time",
+          "type": "time",
+          "values": [
+            1678089600000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "timeEnd",
+          "type": "time",
+          "values": [
+            1678089600000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "text",
+          "type": "string",
+          "values": [
+            "test",
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('handles timezone conversion UTC-CDT', () => {
+    // region TZ = UTC
+    // dashboard TZ = 'America/Chicago'
+    // Mon Apr 03 2023 08:00:00 GMT+0000 -> Mon Apr 03 2023 08:00:00 GMT+0000 (UTC)
+    // Mon Apr 03 2023 03:00:00 GMT-0500 -> Mon Apr 03 2023 03:00:00 GMT-0500 (CDT)
+
+    const frame = doTimeRegionQuery(
+      'test',
+      { fromDayOfWeek: 1, from: '08:00', timezone: 'utc' },
+      {
+        from: dateTime('2023-03-30'),
+        to: dateTime('2023-04-06'),
+        raw: {
+          to: '',
+          from: '',
+        },
+      },
+      'America/Chicago'
+    );
+
+    expect(toDataFrameDTO(frame!).fields).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "time",
+          "type": "time",
+          "values": [
+            1680508800000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "timeEnd",
+          "type": "time",
+          "values": [
+            1680508800000,
+          ],
+        },
+        {
+          "config": {},
+          "labels": undefined,
+          "name": "text",
+          "type": "string",
+          "values": [
+            "test",
+          ],
+        },
+      ]
+    `);
+  });
+});
diff --git a/public/app/plugins/datasource/grafana/timeRegions.ts b/public/app/plugins/datasource/grafana/timeRegions.ts
new file mode 100644
index 00000000000..8c7f000ba2a
--- /dev/null
+++ b/public/app/plugins/datasource/grafana/timeRegions.ts
@@ -0,0 +1,48 @@
+import { TimeRange, DataFrame, FieldType, getTimeZoneInfo } from '@grafana/data';
+import { TimeRegionConfig, calculateTimesWithin } from 'app/core/utils/timeRegions';
+
+export function doTimeRegionQuery(
+  name: string,
+  config: TimeRegionConfig,
+  range: TimeRange,
+  tz: string
+): DataFrame | undefined {
+  if (!config) {
+    return undefined;
+  }
+  const regions = calculateTimesWithin(config, range); // UTC
+  if (!regions.length) {
+    return undefined;
+  }
+
+  const times: number[] = [];
+  const timesEnd: number[] = [];
+  const texts: string[] = [];
+
+  const regionTimezone = config.timezone ?? tz;
+
+  for (const region of regions) {
+    let from = region.from;
+    let to = region.to;
+
+    const info = getTimeZoneInfo(regionTimezone, from);
+    if (info) {
+      const offset = info.offsetInMins * 60 * 1000;
+      from += offset;
+      to += offset;
+    }
+
+    times.push(from);
+    timesEnd.push(to);
+    texts.push(name);
+  }
+
+  return {
+    fields: [
+      { name: 'time', type: FieldType.time, values: times, config: {} },
+      { name: 'timeEnd', type: FieldType.time, values: timesEnd, config: {} },
+      { name: 'text', type: FieldType.string, values: texts, config: {} },
+    ],
+    length: times.length,
+  };
+}
diff --git a/public/app/plugins/datasource/grafana/types.ts b/public/app/plugins/datasource/grafana/types.ts
index 46c05a22409..b26c07c1db8 100644
--- a/public/app/plugins/datasource/grafana/types.ts
+++ b/public/app/plugins/datasource/grafana/types.ts
@@ -1,6 +1,7 @@
 import { DataFrameJSON } from '@grafana/data';
 import { LiveDataFilter } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
+import { TimeRegionConfig } from 'app/core/utils/timeRegions';
 import { SearchQuery } from 'app/features/search/service';
 
 //----------------------------------------------
@@ -11,6 +12,7 @@ export enum GrafanaQueryType {
   LiveMeasurements = 'measurements',
   Annotations = 'annotations',
   Snapshot = 'snapshot',
+  TimeRegions = 'timeRegions',
 
   // backend
   RandomWalk = 'randomWalk',
@@ -27,6 +29,7 @@ export interface GrafanaQuery extends DataQuery {
   path?: string; // for list and read
   search?: SearchQuery;
   snapshot?: DataFrameJSON[];
+  timeRegion?: TimeRegionConfig;
   file?: GrafanaQueryFile;
 }
 
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index 85d6d67c45a..d75d81c34c6 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { Field, PanelProps } from '@grafana/data';
+import { DataFrame, Field, PanelProps } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
 import { TooltipDisplayMode } from '@grafana/schema';
 import { KeyboardPlugin, TimeSeries, TooltipPlugin, usePanelContext, ZoomPlugin } from '@grafana/ui';
@@ -37,6 +37,25 @@ export const TimeSeriesPanel = ({
     return getFieldLinksForExplore({ field, rowIndex, splitOpenFn: onSplitOpen, range: timeRange });
   };
 
+  const { annotations, exemplars } = useMemo(() => {
+    let annotations: DataFrame[] | null = null;
+    let exemplars: DataFrame[] | null = null;
+
+    if (data?.annotations?.length) {
+      annotations = [];
+      exemplars = [];
+      for (let frame of data.annotations) {
+        if (frame.name === 'exemplar') {
+          exemplars.push(frame);
+        } else {
+          annotations.push(frame);
+        }
+      }
+    }
+
+    return { annotations, exemplars };
+  }, [data.annotations]);
+
   const frames = useMemo(() => prepareGraphableFields(data.series, config.theme2, timeRange), [data, timeRange]);
   const timezones = useMemo(() => getTimezones(options.timezone, timeZone), [options.timezone, timeZone]);
 
@@ -88,9 +107,7 @@ export const TimeSeriesPanel = ({
               />
             )}
             {/* Renders annotation markers*/}
-            {data.annotations && (
-              <AnnotationsPlugin annotations={data.annotations} config={config} timeZone={timeZone} />
-            )}
+            {annotations && <AnnotationsPlugin annotations={annotations} config={config} timeZone={timeZone} />}
             {/* Enables annotations creation*/}
             {enableAnnotationCreation ? (
               <AnnotationEditorPlugin data={alignedDataFrame} timeZone={timeZone} config={config}>
@@ -132,11 +149,11 @@ export const TimeSeriesPanel = ({
                 defaultItems={[]}
               />
             )}
-            {data.annotations && (
+            {exemplars && (
               <ExemplarsPlugin
                 visibleSeries={getVisibleLabels(config, frames)}
                 config={config}
-                exemplars={data.annotations}
+                exemplars={exemplars}
                 timeZone={timeZone}
                 getFieldLinks={getFieldLinks}
               />

From b992bdb62dca2b3007767b34934047c537a9d43a Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Fri, 21 Apr 2023 15:50:45 -0500
Subject: [PATCH 335/729] Annotations: Avoid crash when listing panels (that
 are rows) (#66869)

---
 .../components/AnnotationSettings/AnnotationSettingsEdit.tsx  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
index c02049a8be3..2cf14413013 100644
--- a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
+++ b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
@@ -142,6 +142,10 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
   const panels: Array<SelectableValue<number>> = useMemo(
     () =>
       dashboard?.panels
+        // Filtering out rows at the moment, revisit to only include panels that support annotations
+        // However the information to know if a panel supports annotations requires it to be already loaded
+        // panel.plugin?.dataSupport?.annotations
+        .filter((panel) => config.panels[panel.type])
         .map((panel) => ({
           value: panel.id,
           label: panel.title ?? `Panel ${panel.id}`,

From d120c05608bd2ae18d07501f03cbe3d1370aa0bc Mon Sep 17 00:00:00 2001
From: Shirley <4163034+fridgepoet@users.noreply.github.com>
Date: Sat, 22 Apr 2023 11:28:34 +0200
Subject: [PATCH 336/729] CloudWatch: Fix test on metric stat editor statistic
 field (#67064)

---
 .../cloudwatch/__mocks__/CloudWatchDataSource.ts       | 10 +++++++++-
 .../MetricStatEditor/MetricStatEditor.test.tsx         |  9 ++++-----
 .../components/MetricStatEditor/MetricStatEditor.tsx   |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts
index 72221bc968a..f58543dbdce 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts
@@ -1,6 +1,7 @@
 import { of } from 'rxjs';
 
 import {
+  CustomVariableModel,
   DataSourceInstanceSettings,
   DataSourcePluginMeta,
   PluginMetaInfo,
@@ -11,7 +12,6 @@ import { getBackendSrv, setBackendSrv } from '@grafana/runtime';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 import { initialCustomVariableModelState } from 'app/features/variables/custom/reducer';
-import { CustomVariableModel } from 'app/features/variables/types';
 
 import { CloudWatchDatasource } from '../datasource';
 import { CloudWatchJsonData } from '../types';
@@ -256,3 +256,11 @@ export const accountIdVariable: CustomVariableModel = {
   options: [{ value: 'templatedRegion', text: 'templatedRegion', selected: true }],
   multi: false,
 };
+
+export const statisticVariable: CustomVariableModel = {
+  ...initialCustomVariableModelState,
+  id: 'statistic',
+  name: 'statistic',
+  current: { value: 'some stat', text: 'some stat', selected: true },
+  multi: false,
+};
diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/MetricStatEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/MetricStatEditor.test.tsx
index 9393625583b..bc1126972f3 100644
--- a/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/MetricStatEditor.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/MetricStatEditor.test.tsx
@@ -6,13 +6,13 @@ import selectEvent from 'react-select-event';
 import { config } from '@grafana/runtime';
 
 import { MetricStatEditor } from '..';
-import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource';
+import { setupMockedDataSource, statisticVariable } from '../../__mocks__/CloudWatchDataSource';
 import { validMetricSearchBuilderQuery } from '../../__mocks__/queries';
 import { MetricStat } from '../../types';
 
 const originalFeatureToggleValue = config.featureToggles.cloudWatchCrossAccountQuerying;
 const ds = setupMockedDataSource({
-  variables: [],
+  variables: [statisticVariable],
 });
 
 ds.datasource.resources.getNamespaces = jest.fn().mockResolvedValue([]);
@@ -40,9 +40,8 @@ describe('MetricStatEditor', () => {
     config.featureToggles.cloudWatchCrossAccountQuerying = originalFeatureToggleValue;
   });
   describe('statistics field', () => {
-    test.each([['Average', 'p23.23', 'p34', '$statistic']])('should accept valid values', async (statistic) => {
+    test.each(['Average', 'p23.23', 'p34', '$statistic'])('should accept valid values', async (statistic) => {
       const onChange = jest.fn();
-      props.datasource.getVariables = jest.fn().mockReturnValue(['$statistic']);
 
       render(<MetricStatEditor {...props} onChange={onChange} />);
 
@@ -54,7 +53,7 @@ describe('MetricStatEditor', () => {
       expect(onChange).toHaveBeenCalledWith({ ...props.metricStat, statistic });
     });
 
-    test.each([['CustomStat', 'p23,23', '$statistic']])('should not accept invalid values', async (statistic) => {
+    test.each(['CustomStat', 'p23,23', '$someUnknownValue'])('should not accept invalid values', async (statistic) => {
       const onChange = jest.fn();
 
       render(<MetricStatEditor {...props} onChange={onChange} />);
diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/MetricStatEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/MetricStatEditor.tsx
index 6604fa3a1b0..abfe5b6f40c 100644
--- a/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/MetricStatEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/MetricStatEditor/MetricStatEditor.tsx
@@ -117,7 +117,7 @@ export function MetricStatEditor({
                   !statistic ||
                   (!standardStatistics.includes(statistic) &&
                     !/^p\d{2}(?:\.\d{1,2})?$/.test(statistic) &&
-                    !statistic.startsWith('$'))
+                    !datasource.templateSrv.containsTemplate(statistic))
                 ) {
                   return;
                 }

From 24c754334f78d0f08c245fbdfde4a275e26570c0 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Sat, 22 Apr 2023 14:07:44 +0200
Subject: [PATCH 337/729] Loki: Update content for log context ui (#66978)

* Loki: Update content for context ui

* Update

* Update public/app/plugins/datasource/loki/components/LokiContextUi.tsx

Co-authored-by: J Stickler <julie.stickler@grafana.com>

* Update public/app/plugins/datasource/loki/components/LokiContextUi.tsx

Co-authored-by: J Stickler <julie.stickler@grafana.com>

* Update public/app/plugins/datasource/loki/components/LokiContextUi.tsx

Co-authored-by: J Stickler <julie.stickler@grafana.com>

* Update public/app/plugins/datasource/loki/components/LokiContextUi.tsx

Co-authored-by: J Stickler <julie.stickler@grafana.com>

---------

Co-authored-by: J Stickler <julie.stickler@grafana.com>
---
 .../plugins/datasource/loki/components/LokiContextUi.tsx  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index 0bd3ac716eb..afd70bbe4ca 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -183,7 +183,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
               )}
               className={styles.rawQuery}
             />
-            <Tooltip content="Initially executed log context query is created from all labels defining the stream for the selected log line. Use editor bellow to customize log context query.">
+            <Tooltip content="The initial log context query is created from all labels defining the stream for the selected log line. Use the editor below to customize the log context query.">
               <Icon name="info-circle" size="sm" className={styles.queryDescription} />
             </Tooltip>
           </div>
@@ -192,7 +192,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
         <div className={styles.ui}>
           <Tooltip
             content={
-              'This feature is experimental and may change in the future. Currently it supports using parser and extracted labels for queries with no more than 1 parser (e.g. logfmt, json). Please report any issues in the Grafana GitHub repository.'
+              'This feature is experimental and may change in the future. Currently it supports using a parser and extracted labels for queries with no more than 1 parser (for example, logfmt, json). Please report any issues in the grafana GitHub repository.'
             }
             placement="top"
           >
@@ -200,7 +200,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
           </Tooltip>{' '}
           <Label
             className={styles.label}
-            description="By removing some of the selected label filters, you can broaden your search."
+            description="The initial log context query is created from all labels defining the stream for the selected log line. You can broaden your search by removing one or more of the label filters."
           >
             Widen the search
           </Label>
@@ -241,7 +241,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
             <>
               <Label
                 className={styles.label}
-                description={`By using parser in your original query, you are able to filter for extracted labels. Refine your search by applying extracted labels from selected log line.`}
+                description={`By using a parser in your original query, you can use filters for extracted labels. Refine your search by applying extracted labels created from the selected log line.`}
               >
                 Refine the search
               </Label>

From 9c6feac6cc3d2a4ea09a54b9f1bb5934c04ca437 Mon Sep 17 00:00:00 2001
From: Gabriel MABILLE <gamab@users.noreply.github.com>
Date: Mon, 24 Apr 2023 09:02:42 +0200
Subject: [PATCH 338/729] FIX: Make dashboards navlink accessible with only
 folders permissions (#67049)

---
 pkg/services/navtree/navtreeimpl/navtree.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index 2c6c18c8699..b8544cffc3a 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -95,7 +95,10 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, hasEditPerm bool, p
 		})
 	}
 
-	if c.IsPublicDashboardView || hasAccess(ac.ReqSignedIn, ac.EvalAny(ac.EvalPermission(dashboards.ActionDashboardsRead), ac.EvalPermission(dashboards.ActionDashboardsCreate))) {
+	if c.IsPublicDashboardView || hasAccess(ac.ReqSignedIn, ac.EvalAny(
+		ac.EvalPermission(dashboards.ActionFoldersRead), ac.EvalPermission(dashboards.ActionFoldersCreate),
+		ac.EvalPermission(dashboards.ActionDashboardsRead), ac.EvalPermission(dashboards.ActionDashboardsCreate)),
+	) {
 		dashboardChildLinks := s.buildDashboardNavLinks(c, hasEditPerm)
 
 		dashboardLink := &navtree.NavLink{

From fe5a07f3368e113ace58d7cbf07b063888cf5f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20Toulet?=
 <35176601+AgnesToulet@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:27:49 +0100
Subject: [PATCH 339/729] Rendering: Fix panel rendered count on error (#67027)

Rendering: fix panel rendered count on error
---
 public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
index 931f2aa676d..08a09b9c45b 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
@@ -445,7 +445,7 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
   };
 
   shouldSignalRenderingCompleted(loadingState: LoadingState, pluginMeta: PanelPluginMeta) {
-    return loadingState === LoadingState.Done || pluginMeta.skipDataQuery;
+    return loadingState === LoadingState.Done || loadingState === LoadingState.Error || pluginMeta.skipDataQuery;
   }
 
   skipFirstRender(loadingState: LoadingState) {

From 91704cf7de8dadce795e58f34b95870dd5dd975f Mon Sep 17 00:00:00 2001
From: Konrad Lalik <konrad.lalik@grafana.com>
Date: Mon, 24 Apr 2023 09:28:11 +0200
Subject: [PATCH 340/729] Alerting: Loki-based alert state history modal
 (#66595)

* adds alertstatehistory backend config to grafanaBootData

* add alertStateHistory api

* show different ASH modal when using loki implementation

* group log lines by instance (unique set of labels)
Co-Authored-By: Konrad Lalik <konrad.lalik@grafana.com>

* render log lines for each instance
Co-Authored-By: Konrad Lalik <konrad.lalik@grafana.com>

* Add visual improvements to the log record of state changes

* Add values to log records

* compute common labels and show unique labels

* Add state changes visualization

* fix common labels extraction

* Code cleanup

* Add timespan-based log record view

* WIP

* scroll to timestamp - poc

* Use SortedVector for timestamp field

* add conditional accessor for frames

* update some of the log formats and styles

* Timestamp-based visualization with scrolling

* minor improvements

* Split Loki's state history viewer into multiple files

* Add memoization to prevent graph rerender on filter updates

* make chart size shrink when fewer instances

* style updates

* show warning when instances are hidden

* Add basic label-based filtering

* Improve label-based filtering

* Add regex validation

* Improve no instances message when everything was filtered out

* Update warning message

* Move timeline viewer to a separate file, refactor handling timeline pointer changes

* Remove unused component, add comments

* Fix test snapshot, fix type error

* adds tests for common.ts

* Add tests for converting log records into data frames

* Add basic component test, fix type guards

* Use a constant for timeseries limit

* Improve a11y, update component test

* Memoize AlertStateTag, migrate from deprecated ArrayVector

* Update public/app/features/alerting/unified/components/rules/state-history/common.ts

* Move helper hook into a separate file. Add Search input component

* Change the limit of visible time series on the timeline

* Add LogRecordViewer perf improvements, refactor timeline cursor events tracking

* Use callback to pass timeline refs

* Add grouping tests for the log record viewer

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 packages/grafana-data/src/types/config.ts     |   2 +
 packages/grafana-runtime/src/config.ts        |   2 +-
 pkg/api/dtos/frontend_settings.go             |   3 +-
 pkg/api/frontendsettings.go                   |   4 +
 .../alerting/unified/AlertsFolderView.tsx     |   9 +-
 .../alerting/unified/api/stateHistoryApi.ts   |  16 ++
 .../alerting/unified/components/StateTag.tsx  |  12 +-
 .../components/rules/AlertStateTag.tsx        |   8 +-
 .../rules/RuleDetailsActionButtons.tsx        |  11 +-
 .../state-history/LogRecordViewer.test.tsx    |  35 +++
 .../rules/state-history/LogRecordViewer.tsx   | 174 +++++++++++++
 .../rules/state-history/LogTimelineViewer.tsx | 104 ++++++++
 .../state-history/LokiStateHistory.test.tsx   |  99 +++++++
 .../rules/state-history/LokiStateHistory.tsx  | 241 ++++++++++++++++++
 .../{ => state-history}/StateHistory.test.tsx |   0
 .../{ => state-history}/StateHistory.tsx      |  11 +-
 .../__snapshots__/StateHistory.test.tsx.snap  |   0
 .../rules/state-history/common.test.ts        |  50 ++++
 .../components/rules/state-history/common.ts  |  39 +++
 .../useRuleHistoryRecords.test.tsx            | 104 ++++++++
 .../state-history/useRuleHistoryRecords.tsx   | 155 +++++++++++
 .../unified/hooks/useStateHistoryModal.tsx    |  77 +++++-
 .../alerting/unified/utils/alertmanager.ts    |  20 +-
 23 files changed, 1139 insertions(+), 37 deletions(-)
 create mode 100644 public/app/features/alerting/unified/api/stateHistoryApi.ts
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.test.tsx
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/LogTimelineViewer.tsx
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.test.tsx
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx
 rename public/app/features/alerting/unified/components/rules/{ => state-history}/StateHistory.test.tsx (100%)
 rename public/app/features/alerting/unified/components/rules/{ => state-history}/StateHistory.tsx (96%)
 rename public/app/features/alerting/unified/components/rules/{ => state-history}/__snapshots__/StateHistory.test.tsx.snap (100%)
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/common.test.ts
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/common.ts
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/useRuleHistoryRecords.test.tsx
 create mode 100644 public/app/features/alerting/unified/components/rules/state-history/useRuleHistoryRecords.tsx

diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index c73fe2f00cf..2ab9070db16 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -74,6 +74,8 @@ export interface GrafanaJavascriptAgentConfig {
 
 export interface UnifiedAlertingConfig {
   minInterval: string;
+  // will be undefined if alerStateHistory is not enabled
+  alertStateHistoryBackend?: string;
 }
 
 /** Supported OAuth services
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index 1c184974d8a..9bcaaddc3d0 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -133,7 +133,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
   geomapDefaultBaseLayerConfig?: MapLayerOptions;
   geomapDisableCustomBaseLayer?: boolean;
   unifiedAlertingEnabled = false;
-  unifiedAlerting = { minInterval: '' };
+  unifiedAlerting = { minInterval: '', alertStateHistoryBackend: undefined };
   applicationInsightsConnectionString?: string;
   applicationInsightsEndpointUrl?: string;
   recordedQueries = {
diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go
index 73ecd137331..4eeaeae98f2 100644
--- a/pkg/api/dtos/frontend_settings.go
+++ b/pkg/api/dtos/frontend_settings.go
@@ -61,7 +61,8 @@ type FrontendSettingsReportingDTO struct {
 }
 
 type FrontendSettingsUnifiedAlertingDTO struct {
-	MinInterval string `json:"minInterval"`
+	MinInterval              string `json:"minInterval"`
+	AlertStateHistoryBackend string `json:"alertStateHistoryBackend,omitempty"`
 }
 
 // Enterprise-only
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 91f9830de86..98c3da08cee 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -218,6 +218,10 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		SnapshotEnabled: hs.Cfg.SnapshotEnabled,
 	}
 
+	if hs.Cfg.UnifiedAlerting.StateHistory.Enabled {
+		frontendSettings.UnifiedAlerting.AlertStateHistoryBackend = hs.Cfg.UnifiedAlerting.StateHistory.Backend
+	}
+
 	if hs.Cfg.UnifiedAlerting.Enabled != nil {
 		frontendSettings.UnifiedAlertingEnabled = *hs.Cfg.UnifiedAlerting.Enabled
 	}
diff --git a/public/app/features/alerting/unified/AlertsFolderView.tsx b/public/app/features/alerting/unified/AlertsFolderView.tsx
index 32b7b55e684..060ed9b3708 100644
--- a/public/app/features/alerting/unified/AlertsFolderView.tsx
+++ b/public/app/features/alerting/unified/AlertsFolderView.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { isEqual, orderBy, uniqWith } from 'lodash';
+import { orderBy } from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { useDebounce } from 'react-use';
 
@@ -15,7 +15,7 @@ import { useCombinedRuleNamespaces } from './hooks/useCombinedRuleNamespaces';
 import { usePagination } from './hooks/usePagination';
 import { useURLSearchParams } from './hooks/useURLSearchParams';
 import { fetchPromRulesAction, fetchRulerRulesAction } from './state/actions';
-import { labelsMatchMatchers, matchersToString, parseMatcher, parseMatchers } from './utils/alertmanager';
+import { combineMatcherStrings, labelsMatchMatchers, parseMatchers } from './utils/alertmanager';
 import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
 import { createViewLink } from './utils/misc';
 
@@ -38,10 +38,7 @@ export const AlertsFolderView = ({ folder }: Props) => {
   const dispatch = useDispatch();
 
   const onTagClick = (tagName: string) => {
-    const matchers = parseMatchers(labelFilter);
-    const tagMatcherField = parseMatcher(tagName);
-    const uniqueMatchers = uniqWith([...matchers, tagMatcherField], isEqual);
-    const matchersString = matchersToString(uniqueMatchers);
+    const matchersString = combineMatcherStrings(labelFilter, tagName);
     setLabelFilter(matchersString);
   };
 
diff --git a/public/app/features/alerting/unified/api/stateHistoryApi.ts b/public/app/features/alerting/unified/api/stateHistoryApi.ts
new file mode 100644
index 00000000000..1374595da4b
--- /dev/null
+++ b/public/app/features/alerting/unified/api/stateHistoryApi.ts
@@ -0,0 +1,16 @@
+import { getUnixTime } from 'date-fns';
+
+import { DataFrameJSON } from '@grafana/data';
+
+import { alertingApi } from './alertingApi';
+
+export const stateHistoryApi = alertingApi.injectEndpoints({
+  endpoints: (build) => ({
+    getRuleHistory: build.query<DataFrameJSON, { ruleUid: string; from: number; to?: number }>({
+      query: ({ ruleUid, from, to = getUnixTime(new Date()) }) => ({
+        url: '/api/v1/rules/history',
+        params: { ruleUID: ruleUid, from, to },
+      }),
+    }),
+  }),
+});
diff --git a/public/app/features/alerting/unified/components/StateTag.tsx b/public/app/features/alerting/unified/components/StateTag.tsx
index d60a2af4f9a..e3e03d6ad63 100644
--- a/public/app/features/alerting/unified/components/StateTag.tsx
+++ b/public/app/features/alerting/unified/components/StateTag.tsx
@@ -9,12 +9,17 @@ export type State = 'good' | 'bad' | 'warning' | 'neutral' | 'info';
 type Props = {
   state: State;
   size?: 'md' | 'sm';
+  muted?: boolean;
 };
 
-export const StateTag = ({ children, state, size = 'md' }: React.PropsWithChildren<Props>) => {
+export const StateTag = ({ children, state, size = 'md', muted = false }: React.PropsWithChildren<Props>) => {
   const styles = useStyles2(getStyles);
 
-  return <span className={cx(styles.common, styles[state], styles[size])}>{children || state}</span>;
+  return (
+    <span className={cx(styles.common, styles[state], styles[size], { [styles.muted]: muted })}>
+      {children || state}
+    </span>
+  );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
@@ -61,4 +66,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     padding: ${theme.spacing(0.3, 0.5)};
     min-width: 52px;
   `,
+  muted: css`
+    opacity: 0.5;
+  `,
 });
diff --git a/public/app/features/alerting/unified/components/rules/AlertStateTag.tsx b/public/app/features/alerting/unified/components/rules/AlertStateTag.tsx
index 0a2ac6281d7..e33609d38ab 100644
--- a/public/app/features/alerting/unified/components/rules/AlertStateTag.tsx
+++ b/public/app/features/alerting/unified/components/rules/AlertStateTag.tsx
@@ -9,10 +9,12 @@ interface Props {
   state: PromAlertingRuleState | GrafanaAlertState | GrafanaAlertStateWithReason | AlertState;
   size?: 'md' | 'sm';
   isPaused?: boolean;
+  muted?: boolean;
 }
 
-export const AlertStateTag = ({ state, isPaused = false, size = 'md' }: Props) => (
-  <StateTag state={alertStateToState(state)} size={size}>
+export const AlertStateTag = React.memo(({ state, isPaused = false, size = 'md', muted = false }: Props) => (
+  <StateTag state={alertStateToState(state)} size={size} muted={muted}>
     {alertStateToReadable(state)} {isPaused ? ' (Paused)' : ''}
   </StateTag>
-);
+));
+AlertStateTag.displayName = 'AlertStateTag';
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
index 025850f592f..adfdbe9504e 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
@@ -37,8 +37,7 @@ interface Props {
 export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Props) => {
   const style = useStyles2(getStyles);
   const { namespace, group, rulerRule } = rule;
-  const alertId = isGrafanaRulerRule(rule.rulerRule) ? rule.rulerRule.grafana_alert.id ?? '' : '';
-  const { StateHistoryModal, showStateHistoryModal } = useStateHistoryModal(alertId);
+  const { StateHistoryModal, showStateHistoryModal } = useStateHistoryModal();
   const dispatch = useDispatch();
   const location = useLocation();
   const notifyApp = useAppNotification();
@@ -159,10 +158,14 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
     );
   }
 
-  if (alertId) {
+  if (isGrafanaRulerRule(rule.rulerRule)) {
     buttons.push(
       <Fragment key="history">
-        <Button size="sm" icon="history" onClick={() => showStateHistoryModal()}>
+        <Button
+          size="sm"
+          icon="history"
+          onClick={() => isGrafanaRulerRule(rule.rulerRule) && showStateHistoryModal(rule.rulerRule)}
+        >
           Show state history
         </Button>
         {StateHistoryModal}
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.test.tsx b/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.test.tsx
new file mode 100644
index 00000000000..48bd6548508
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.test.tsx
@@ -0,0 +1,35 @@
+import { getByTestId, render } from '@testing-library/react';
+import React from 'react';
+import { byRole } from 'testing-library-selector';
+
+import { LogRecordViewerByTimestamp } from './LogRecordViewer';
+import { LogRecord } from './common';
+
+const ui = {
+  log: byRole('list', { name: 'State history by timestamp' }),
+};
+
+describe('LogRecordViewerByTimestamp', () => {
+  it('should group the same timestamps into one group', () => {
+    const records: LogRecord[] = [
+      { timestamp: 1681739580000, line: { current: 'Alerting', previous: 'Pending', labels: { foo: 'bar' } } },
+      { timestamp: 1681739580000, line: { current: 'Alerting', previous: 'Pending', labels: { severity: 'warning' } } },
+      { timestamp: 1681739600000, line: { current: 'Normal', previous: 'Alerting', labels: { foo: 'bar' } } },
+      { timestamp: 1681739600000, line: { current: 'Normal', previous: 'Alerting', labels: { severity: 'warning' } } },
+    ];
+
+    render(<LogRecordViewerByTimestamp records={records} commonLabels={[]} />);
+
+    const logElement = ui.log.get();
+    expect(logElement).toBeInTheDocument();
+
+    const entry1 = getByTestId(logElement, 1681739580000);
+    const entry2 = getByTestId(logElement, 1681739600000);
+
+    expect(entry1).toHaveTextContent('foo=bar');
+    expect(entry1).toHaveTextContent('severity=warning');
+
+    expect(entry2).toHaveTextContent('foo=bar');
+    expect(entry2).toHaveTextContent('severity=warning');
+  });
+});
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx b/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx
new file mode 100644
index 00000000000..45fe627aa0c
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx
@@ -0,0 +1,174 @@
+import { css } from '@emotion/css';
+import { formatDistanceToNowStrict } from 'date-fns';
+import { groupBy, uniqueId } from 'lodash';
+import React, { useEffect } from 'react';
+
+import { dateTimeFormat, GrafanaTheme2 } from '@grafana/data';
+import { Stack } from '@grafana/experimental';
+import { Icon, TagList, useStyles2 } from '@grafana/ui';
+
+import { Label } from '../../Label';
+import { AlertStateTag } from '../AlertStateTag';
+
+import { LogRecord, omitLabels } from './common';
+
+interface LogRecordViewerProps {
+  records: LogRecord[];
+  commonLabels: Array<[string, string]>;
+  onRecordsRendered?: (timestampRefs: Map<number, HTMLElement>) => void;
+  onLabelClick?: (label: string) => void;
+}
+
+export const LogRecordViewerByTimestamp = React.memo(
+  ({ records, commonLabels, onLabelClick, onRecordsRendered }: LogRecordViewerProps) => {
+    const styles = useStyles2(getStyles);
+
+    // groupBy has been replaced by the reduce to avoid back and forth conversion of timestamp from number to string
+    const groupedLines = records.reduce((acc, current) => {
+      const tsGroup = acc.get(current.timestamp);
+      if (tsGroup) {
+        tsGroup.push(current);
+      } else {
+        acc.set(current.timestamp, [current]);
+      }
+
+      return acc;
+    }, new Map<number, LogRecord[]>());
+
+    const timestampRefs = new Map<number, HTMLElement>();
+    useEffect(() => {
+      onRecordsRendered && onRecordsRendered(timestampRefs);
+    });
+
+    return (
+      <ul className={styles.logsScrollable} aria-label="State history by timestamp">
+        {Array.from(groupedLines.entries()).map(([key, records]) => {
+          return (
+            <li
+              id={key.toString(10)}
+              key={key}
+              data-testid={key}
+              ref={(element) => element && timestampRefs.set(key, element)}
+            >
+              <Timestamp time={key} />
+              <div className={styles.logsContainer}>
+                {records.map(({ line }) => (
+                  <React.Fragment key={uniqueId()}>
+                    <AlertStateTag state={line.previous} size="sm" muted />
+                    <Icon name="arrow-right" size="sm" />
+                    <AlertStateTag state={line.current} />
+                    <Stack direction="row">{line.values && <AlertInstanceValues record={line.values} />}</Stack>
+                    <div>
+                      {line.labels && (
+                        <TagList
+                          tags={omitLabels(Object.entries(line.labels), commonLabels).map(
+                            ([key, value]) => `${key}=${value}`
+                          )}
+                          onClick={onLabelClick}
+                        />
+                      )}
+                    </div>
+                  </React.Fragment>
+                ))}
+              </div>
+            </li>
+          );
+        })}
+      </ul>
+    );
+  }
+);
+LogRecordViewerByTimestamp.displayName = 'LogRecordViewerByTimestamp';
+
+export function LogRecordViewerByInstance({ records, commonLabels }: LogRecordViewerProps) {
+  const styles = useStyles2(getStyles);
+
+  const groupedLines = groupBy(records, (record: LogRecord) => {
+    return JSON.stringify(record.line.labels);
+  });
+
+  return (
+    <>
+      {Object.entries(groupedLines).map(([key, records]) => {
+        return (
+          <Stack direction="column" key={key}>
+            <h4>
+              <TagList
+                tags={omitLabels(Object.entries(records[0].line.labels ?? {}), commonLabels).map(
+                  ([key, value]) => `${key}=${value}`
+                )}
+              />
+            </h4>
+            <div className={styles.logsContainer}>
+              {records.map(({ line, timestamp }) => (
+                <div key={uniqueId()}>
+                  <AlertStateTag state={line.previous} size="sm" muted />
+                  <Icon name="arrow-right" size="sm" />
+                  <AlertStateTag state={line.current} />
+                  <Stack direction="row">{line.values && <AlertInstanceValues record={line.values} />}</Stack>
+                  <div>{dateTimeFormat(timestamp)}</div>
+                </div>
+              ))}
+            </div>
+          </Stack>
+        );
+      })}
+    </>
+  );
+}
+
+interface TimestampProps {
+  time: number; // epoch timestamp
+}
+
+const Timestamp = ({ time }: TimestampProps) => {
+  const dateTime = new Date(time);
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.timestampWrapper}>
+      <Stack direction="row" alignItems="center" gap={1}>
+        <Icon name="clock-nine" size="sm" />
+        <span className={styles.timestampText}>{dateTimeFormat(dateTime)}</span>
+        <small>({formatDistanceToNowStrict(dateTime)} ago)</small>
+      </Stack>
+    </div>
+  );
+};
+
+const AlertInstanceValues = React.memo(({ record }: { record: Record<string, number> }) => {
+  const values = Object.entries(record);
+
+  return (
+    <>
+      {values.map(([key, value]) => (
+        <Label key={key} label={key} value={value} />
+      ))}
+    </>
+  );
+});
+AlertInstanceValues.displayName = 'AlertInstanceValues';
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  logsContainer: css`
+    display: grid;
+    grid-template-columns: max-content max-content max-content auto max-content;
+    gap: ${theme.spacing(2, 1)};
+    align-items: center;
+  `,
+  logsScrollable: css`
+    height: 500px;
+    overflow: scroll;
+
+    flex: 1;
+  `,
+  timestampWrapper: css`
+    color: ${theme.colors.text.secondary};
+    padding: ${theme.spacing(1)} 0;
+  `,
+  timestampText: css`
+    color: ${theme.colors.text.primary};
+    font-size: ${theme.typography.bodySmall.fontSize};
+    font-weight: ${theme.typography.fontWeightBold};
+  `,
+});
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LogTimelineViewer.tsx b/public/app/features/alerting/unified/components/rules/state-history/LogTimelineViewer.tsx
new file mode 100644
index 00000000000..74f351fbe07
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/LogTimelineViewer.tsx
@@ -0,0 +1,104 @@
+import { noop } from 'lodash';
+import React, { useEffect, useRef } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
+import { BehaviorSubject } from 'rxjs';
+
+import { DataFrame, TimeRange } from '@grafana/data';
+import { VisibilityMode } from '@grafana/schema';
+import { LegendDisplayMode, UPlotConfigBuilder, useTheme2 } from '@grafana/ui';
+import { TimelineChart } from 'app/core/components/TimelineChart/TimelineChart';
+import { TimelineMode } from 'app/core/components/TimelineChart/utils';
+
+interface LogTimelineViewerProps {
+  frames: DataFrame[];
+  timeRange: TimeRange;
+  onPointerMove?: (seriesIdx: number, pointerIdx: number) => void;
+}
+
+export const LogTimelineViewer = React.memo(({ frames, timeRange, onPointerMove = noop }: LogTimelineViewerProps) => {
+  const theme = useTheme2();
+  const { setupCursorTracking } = useCursorTimelinePosition(onPointerMove);
+
+  return (
+    <AutoSizer disableHeight>
+      {({ width }) => (
+        <TimelineChart
+          frames={frames}
+          timeRange={timeRange}
+          timeZone={'browser'}
+          mode={TimelineMode.Changes}
+          height={18 * frames.length + 50}
+          width={width}
+          showValue={VisibilityMode.Never}
+          theme={theme}
+          rowHeight={0.8}
+          legend={{
+            calcs: [],
+            displayMode: LegendDisplayMode.List,
+            placement: 'bottom',
+            showLegend: true,
+          }}
+          legendItems={[
+            { label: 'Normal', color: theme.colors.success.main, yAxis: 1 },
+            { label: 'Pending', color: theme.colors.warning.main, yAxis: 1 },
+            { label: 'Alerting', color: theme.colors.error.main, yAxis: 1 },
+            { label: 'NoData', color: theme.colors.info.main, yAxis: 1 },
+          ]}
+        >
+          {(builder) => {
+            setupCursorTracking(builder);
+            return null;
+          }}
+        </TimelineChart>
+      )}
+    </AutoSizer>
+  );
+});
+
+function useCursorTimelinePosition(onPointerMove: (seriesIdx: number, pointIdx: number) => void) {
+  const pointerSubject = useRef(
+    new BehaviorSubject<{ seriesIdx: number; pointIdx: number }>({ seriesIdx: 0, pointIdx: 0 })
+  );
+
+  useEffect(() => {
+    const subscription = pointerSubject.current.subscribe(({ seriesIdx, pointIdx }) => {
+      onPointerMove && onPointerMove(seriesIdx, pointIdx);
+    });
+
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [onPointerMove]);
+
+  // Applies cursor tracking to the UPlot chart
+  const setupCursorTracking = (builder: UPlotConfigBuilder) => {
+    builder.setSync();
+    const interpolator = builder.getTooltipInterpolator();
+
+    // I found this in TooltipPlugin.tsx
+    if (interpolator) {
+      builder.addHook('setCursor', (u) => {
+        interpolator(
+          (seriesIdx) => {
+            if (seriesIdx) {
+              const currentPointer = pointerSubject.current.getValue();
+              pointerSubject.current.next({ ...currentPointer, seriesIdx });
+            }
+          },
+          (pointIdx) => {
+            if (pointIdx) {
+              const currentPointer = pointerSubject.current.getValue();
+              pointerSubject.current.next({ ...currentPointer, pointIdx });
+            }
+          },
+          () => {},
+          u
+        );
+      });
+    }
+  };
+
+  return { setupCursorTracking };
+}
+
+LogTimelineViewer.displayName = 'LogTimelineViewer';
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.test.tsx b/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.test.tsx
new file mode 100644
index 00000000000..865e87cb4a5
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.test.tsx
@@ -0,0 +1,99 @@
+import { render, waitFor } from '@testing-library/react';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import React from 'react';
+import { byRole, byText } from 'testing-library-selector';
+import 'whatwg-fetch';
+
+import { DataFrameJSON } from '@grafana/data';
+import { setBackendSrv } from '@grafana/runtime';
+
+import { TestProvider } from '../../../../../../../test/helpers/TestProvider';
+import { backendSrv } from '../../../../../../core/services/backend_srv';
+
+import LokiStateHistory from './LokiStateHistory';
+
+const server = setupServer();
+
+beforeAll(() => {
+  setBackendSrv(backendSrv);
+  server.listen({ onUnhandledRequest: 'error' });
+
+  server.use(
+    rest.get('/api/v1/rules/history', (req, res, ctx) =>
+      res(
+        ctx.json<DataFrameJSON>({
+          data: {
+            values: [
+              [1681739580000, 1681739580000, 1681739580000],
+              [
+                {
+                  previous: 'Normal',
+                  current: 'Pending',
+                  values: {
+                    B: 0.010344684900897919,
+                    C: 1,
+                  },
+                  labels: {
+                    handler: '/api/prometheus/grafana/api/v1/rules',
+                  },
+                },
+                {
+                  previous: 'Normal',
+                  current: 'Pending',
+                  values: {
+                    B: 0.010344684900897919,
+                    C: 1,
+                  },
+                  dashboardUID: '',
+                  panelID: 0,
+                  labels: {
+                    handler: '/api/live/ws',
+                  },
+                },
+                {
+                  previous: 'Normal',
+                  current: 'Pending',
+                  values: {
+                    B: 0.010344684900897919,
+                    C: 1,
+                  },
+                  labels: {
+                    handler: '/api/folders/:uid/',
+                  },
+                },
+              ],
+            ],
+          },
+        })
+      )
+    )
+  );
+});
+
+afterAll(() => {
+  server.close();
+});
+
+window.HTMLElement.prototype.scrollIntoView = jest.fn();
+
+const ui = {
+  loadingIndicator: byText('Loading...'),
+  timestampViewer: byRole('list', { name: 'State history by timestamp' }),
+  record: byRole('listitem'),
+};
+
+describe('LokiStateHistory', () => {
+  it('should render history records', async () => {
+    render(<LokiStateHistory ruleUID="ABC123" />, { wrapper: TestProvider });
+
+    await waitFor(() => expect(ui.loadingIndicator.query()).not.toBeInTheDocument());
+
+    const timestampViewerElement = ui.timestampViewer.get();
+    expect(timestampViewerElement).toBeInTheDocument();
+
+    expect(timestampViewerElement).toHaveTextContent('/api/prometheus/grafana/api/v1/rules');
+    expect(timestampViewerElement).toHaveTextContent('/api/live/ws');
+    expect(timestampViewerElement).toHaveTextContent('/api/folders/:uid/');
+  });
+});
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx b/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx
new file mode 100644
index 00000000000..36c3937a496
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx
@@ -0,0 +1,241 @@
+import { css } from '@emotion/css';
+import { isEmpty, sortBy, take, uniq } from 'lodash';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
+import { useForm } from 'react-hook-form';
+
+import { DataFrame, dateTime, GrafanaTheme2, TimeRange } from '@grafana/data';
+import { Stack } from '@grafana/experimental';
+import { Alert, Button, Field, Icon, Input, Label, TagList, Tooltip, useStyles2 } from '@grafana/ui';
+
+import { stateHistoryApi } from '../../../api/stateHistoryApi';
+import { combineMatcherStrings } from '../../../utils/alertmanager';
+import { HoverCard } from '../../HoverCard';
+
+import { LogRecordViewerByTimestamp } from './LogRecordViewer';
+import { LogTimelineViewer } from './LogTimelineViewer';
+import { useRuleHistoryRecords } from './useRuleHistoryRecords';
+
+interface Props {
+  ruleUID: string;
+}
+
+const MAX_TIMELINE_SERIES = 12;
+
+const LokiStateHistory = ({ ruleUID }: Props) => {
+  const styles = useStyles2(getStyles);
+  const [instancesFilter, setInstancesFilter] = useState('');
+  const logsRef = useRef<Map<number, HTMLElement>>(new Map<number, HTMLElement>());
+
+  const { getValues, setValue, register, handleSubmit } = useForm({ defaultValues: { query: '' } });
+
+  const { useGetRuleHistoryQuery } = stateHistoryApi;
+  const timeRange = useMemo(() => getDefaultTimeRange(), []);
+  const {
+    currentData: stateHistory,
+    isLoading,
+    isError,
+    error,
+  } = useGetRuleHistoryQuery({ ruleUid: ruleUID, from: timeRange.from.unix(), to: timeRange.to.unix() });
+
+  const { dataFrames, historyRecords, commonLabels, totalRecordsCount } = useRuleHistoryRecords(
+    stateHistory,
+    instancesFilter
+  );
+
+  const { frameSubset, frameSubsetTimestamps } = useFrameSubset(dataFrames);
+
+  const onLogRecordLabelClick = useCallback(
+    (label: string) => {
+      const matcherString = combineMatcherStrings(getValues('query'), label);
+      setInstancesFilter(matcherString);
+      setValue('query', matcherString);
+    },
+    [setInstancesFilter, setValue, getValues]
+  );
+
+  const onFilterCleared = useCallback(() => {
+    setInstancesFilter('');
+    setValue('query', '');
+  }, [setInstancesFilter, setValue]);
+
+  const onTimelinePointerMove = useCallback(
+    (seriesIdx: number, pointIdx: number) => {
+      const timestamp = frameSubsetTimestamps[pointIdx];
+
+      const refToScroll = logsRef.current.get(timestamp);
+      refToScroll?.scrollIntoView({ behavior: 'smooth', block: 'start' });
+    },
+    [frameSubsetTimestamps]
+  );
+
+  if (isLoading) {
+    return <div>Loading...</div>;
+  }
+  if (isError) {
+    return (
+      <Alert title="Error fetching the state history" severity="error">
+        {error instanceof Error ? error.message : 'Unable to fetch alert state history'}
+      </Alert>
+    );
+  }
+
+  const hasMoreInstances = frameSubset.length < dataFrames.length;
+  const emptyStateMessage =
+    totalRecordsCount > 0
+      ? `No matches were found for the given filters among the ${totalRecordsCount} instances`
+      : 'No state transitions have occurred in the last 60 minutes';
+
+  return (
+    <div className={styles.fullSize}>
+      <form onSubmit={handleSubmit((data) => setInstancesFilter(data.query))}>
+        <SearchFieldInput
+          {...register('query')}
+          showClearFilterSuffix={!!instancesFilter}
+          onClearFilterClick={onFilterCleared}
+        />
+        <input type="submit" hidden />
+      </form>
+      {!isEmpty(commonLabels) && (
+        <div className={styles.commonLabels}>
+          <Stack gap={1} alignItems="center">
+            <strong>Common labels</strong>
+            <Tooltip content="Common labels are the ones attached to all of the alert instances">
+              <Icon name="info-circle" />
+            </Tooltip>
+          </Stack>
+          <TagList tags={commonLabels.map((label) => label.join('='))} />
+        </div>
+      )}
+      {isEmpty(frameSubset) ? (
+        <>
+          <div className={styles.emptyState}>
+            {emptyStateMessage}
+            {totalRecordsCount > 0 && (
+              <Button variant="secondary" type="button" onClick={onFilterCleared}>
+                Clear filters
+              </Button>
+            )}
+          </div>
+        </>
+      ) : (
+        <>
+          <div className={styles.graphWrapper}>
+            <LogTimelineViewer frames={frameSubset} timeRange={timeRange} onPointerMove={onTimelinePointerMove} />
+          </div>
+          {hasMoreInstances && (
+            <div className={styles.moreInstancesWarning}>
+              <Stack direction="row" alignItems="center" gap={1}>
+                <Icon name="exclamation-triangle" size="sm" />
+                <small>{`Only showing ${frameSubset.length} out of ${dataFrames.length} instances. Click on the labels to narrow down the results`}</small>
+              </Stack>
+            </div>
+          )}
+          <LogRecordViewerByTimestamp
+            records={historyRecords}
+            commonLabels={commonLabels}
+            onRecordsRendered={(recordRefs) => (logsRef.current = recordRefs)}
+            onLabelClick={onLogRecordLabelClick}
+          />
+        </>
+      )}
+    </div>
+  );
+};
+
+function useFrameSubset(frames: DataFrame[]) {
+  return useMemo(() => {
+    const frameSubset = take(frames, MAX_TIMELINE_SERIES);
+    const frameSubsetTimestamps = sortBy(uniq(frameSubset.flatMap((frame) => frame.fields[0].values)));
+
+    return { frameSubset, frameSubsetTimestamps };
+  }, [frames]);
+}
+
+interface SearchFieldInputProps extends Omit<React.ComponentProps<typeof Input>, 'prefix' | 'suffix' | 'placeholder'> {
+  showClearFilterSuffix: boolean;
+  onClearFilterClick: () => void;
+}
+
+const SearchFieldInput = React.forwardRef<HTMLInputElement, SearchFieldInputProps>(
+  ({ showClearFilterSuffix, onClearFilterClick, ...rest }: SearchFieldInputProps, ref) => {
+    return (
+      <Field
+        label={
+          <Label htmlFor="instancesSearchInput">
+            <Stack gap={0.5}>
+              <span>Filter instances</span>
+              <HoverCard
+                content={
+                  <>
+                    Use label matcher expression (like <code>{'{foo=bar}'}</code>) or click on an instance label to
+                    filter instances
+                  </>
+                }
+              >
+                <Icon name="info-circle" size="sm" />
+              </HoverCard>
+            </Stack>
+          </Label>
+        }
+      >
+        <Input
+          id="instancesSearchInput"
+          prefix={<Icon name="search" />}
+          suffix={
+            showClearFilterSuffix && (
+              <Button fill="text" icon="times" size="sm" onClick={onClearFilterClick}>
+                Clear
+              </Button>
+            )
+          }
+          placeholder="Filter instances"
+          ref={ref}
+          {...rest}
+        />
+      </Field>
+    );
+  }
+);
+SearchFieldInput.displayName = 'SearchFieldInput';
+
+function getDefaultTimeRange(): TimeRange {
+  const fromDateTime = dateTime().subtract(1, 'h');
+  const toDateTime = dateTime();
+  return {
+    from: fromDateTime,
+    to: toDateTime,
+    raw: { from: fromDateTime, to: toDateTime },
+  };
+}
+
+export const getStyles = (theme: GrafanaTheme2) => ({
+  fullSize: css`
+    min-width: 100%;
+    height: 100%;
+
+    display: flex;
+    flex-direction: column;
+  `,
+  graphWrapper: css`
+    padding: ${theme.spacing()} 0;
+  `,
+  emptyState: css`
+    color: ${theme.colors.text.secondary};
+
+    display: flex;
+    flex-direction: column;
+    gap: ${theme.spacing(2)};
+    align-items: center;
+    margin: auto auto;
+  `,
+  moreInstancesWarning: css`
+    color: ${theme.colors.warning.text};
+    padding: ${theme.spacing()};
+  `,
+  commonLabels: css`
+    display: grid;
+    grid-template-columns: max-content auto;
+  `,
+});
+
+export default LokiStateHistory;
diff --git a/public/app/features/alerting/unified/components/rules/StateHistory.test.tsx b/public/app/features/alerting/unified/components/rules/state-history/StateHistory.test.tsx
similarity index 100%
rename from public/app/features/alerting/unified/components/rules/StateHistory.test.tsx
rename to public/app/features/alerting/unified/components/rules/state-history/StateHistory.test.tsx
diff --git a/public/app/features/alerting/unified/components/rules/StateHistory.tsx b/public/app/features/alerting/unified/components/rules/state-history/StateHistory.tsx
similarity index 96%
rename from public/app/features/alerting/unified/components/rules/StateHistory.tsx
rename to public/app/features/alerting/unified/components/rules/state-history/StateHistory.tsx
index e484cb412e3..cf9e78e7a56 100644
--- a/public/app/features/alerting/unified/components/rules/StateHistory.tsx
+++ b/public/app/features/alerting/unified/components/rules/state-history/StateHistory.tsx
@@ -8,11 +8,10 @@ import { Alert, Field, Icon, Input, Label, LoadingPlaceholder, Tooltip, useStyle
 import { StateHistoryItem, StateHistoryItemData } from 'app/types/unified-alerting';
 import { GrafanaAlertStateWithReason, PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
-import { useManagedAlertStateHistory } from '../../hooks/useManagedAlertStateHistory';
-import { AlertLabel } from '../AlertLabel';
-import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../DynamicTable';
-
-import { AlertStateTag } from './AlertStateTag';
+import { useManagedAlertStateHistory } from '../../../hooks/useManagedAlertStateHistory';
+import { AlertLabel } from '../../AlertLabel';
+import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../../DynamicTable';
+import { AlertStateTag } from '../AlertStateTag';
 
 type StateHistoryRowItem = {
   id: string;
@@ -202,4 +201,4 @@ const getStyles = (theme: GrafanaTheme2) => ({
   `,
 });
 
-export { StateHistory };
+export default StateHistory;
diff --git a/public/app/features/alerting/unified/components/rules/__snapshots__/StateHistory.test.tsx.snap b/public/app/features/alerting/unified/components/rules/state-history/__snapshots__/StateHistory.test.tsx.snap
similarity index 100%
rename from public/app/features/alerting/unified/components/rules/__snapshots__/StateHistory.test.tsx.snap
rename to public/app/features/alerting/unified/components/rules/state-history/__snapshots__/StateHistory.test.tsx.snap
diff --git a/public/app/features/alerting/unified/components/rules/state-history/common.test.ts b/public/app/features/alerting/unified/components/rules/state-history/common.test.ts
new file mode 100644
index 00000000000..a061efccb70
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/common.test.ts
@@ -0,0 +1,50 @@
+import { extractCommonLabels, Label, omitLabels } from './common';
+
+test('extractCommonLabels', () => {
+  const labels: Label[][] = [
+    [
+      ['foo', 'bar'],
+      ['baz', 'qux'],
+    ],
+    [
+      ['foo', 'bar'],
+      ['baz', 'qux'],
+      ['potato', 'tomato'],
+    ],
+  ];
+
+  expect(extractCommonLabels(labels)).toStrictEqual([
+    ['foo', 'bar'],
+    ['baz', 'qux'],
+  ]);
+});
+
+test('extractCommonLabels with no common labels', () => {
+  const labels: Label[][] = [[['foo', 'bar']], [['potato', 'tomato']]];
+
+  expect(extractCommonLabels(labels)).toStrictEqual([]);
+});
+
+test('omitLabels', () => {
+  const labels: Label[] = [
+    ['foo', 'bar'],
+    ['baz', 'qux'],
+    ['potato', 'tomato'],
+  ];
+  const commonLabels: Label[] = [
+    ['foo', 'bar'],
+    ['baz', 'qux'],
+  ];
+
+  expect(omitLabels(labels, commonLabels)).toStrictEqual([['potato', 'tomato']]);
+});
+
+test('omitLabels with no common labels', () => {
+  const labels: Label[] = [['potato', 'tomato']];
+  const commonLabels: Label[] = [
+    ['foo', 'bar'],
+    ['baz', 'qux'],
+  ];
+
+  expect(omitLabels(labels, commonLabels)).toStrictEqual(labels);
+});
diff --git a/public/app/features/alerting/unified/components/rules/state-history/common.ts b/public/app/features/alerting/unified/components/rules/state-history/common.ts
new file mode 100644
index 00000000000..f797fa1f8a5
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/common.ts
@@ -0,0 +1,39 @@
+import { isEqual, uniqBy } from 'lodash';
+
+import { GrafanaAlertStateWithReason } from 'app/types/unified-alerting-dto';
+
+export interface Line {
+  previous: GrafanaAlertStateWithReason;
+  current: GrafanaAlertStateWithReason;
+  values?: Record<string, number>;
+  labels?: Record<string, string>;
+}
+
+export interface LogRecord {
+  timestamp: number;
+  line: Line;
+}
+
+export type Label = [string, string];
+
+// omit "common" labels from "labels"
+export function omitLabels(labels: Label[], common: Label[]): Label[] {
+  return labels.filter((label) => {
+    return !common.find((commonLabel) => JSON.stringify(commonLabel) === JSON.stringify(label));
+  });
+}
+
+// find all common labels by looking at which ones occur in every record, then create a unique array of items for those
+export function extractCommonLabels(labels: Label[][]): Label[] {
+  const flatLabels = labels.flatMap((label) => label);
+
+  const commonLabels = uniqBy(
+    flatLabels.filter((label) => {
+      const count = flatLabels.filter((l) => isEqual(label, l)).length;
+      return count === Object.keys(labels).length;
+    }),
+    (label) => JSON.stringify(label)
+  );
+
+  return commonLabels;
+}
diff --git a/public/app/features/alerting/unified/components/rules/state-history/useRuleHistoryRecords.test.tsx b/public/app/features/alerting/unified/components/rules/state-history/useRuleHistoryRecords.test.tsx
new file mode 100644
index 00000000000..fdcdc7e9d31
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/useRuleHistoryRecords.test.tsx
@@ -0,0 +1,104 @@
+import { createTheme, FieldType } from '@grafana/data';
+
+import { LogRecord } from './common';
+import { logRecordsToDataFrame } from './useRuleHistoryRecords';
+
+describe('logRecordsToDataFrame', () => {
+  const theme = createTheme();
+
+  it('should convert instance history records into a data frame', () => {
+    const instanceLabels = { foo: 'bar', severity: 'critical', cluster: 'dev-us' };
+    const records: LogRecord[] = [
+      {
+        timestamp: 1000000,
+        line: { previous: 'Normal', current: 'Alerting', labels: instanceLabels },
+      },
+    ];
+
+    const frame = logRecordsToDataFrame(JSON.stringify(instanceLabels), records, [], theme);
+
+    expect(frame.fields).toHaveLength(2);
+
+    const timeField = frame.fields[0];
+    const stateChangeField = frame.fields[1];
+
+    expect(timeField.name).toBe('time');
+    expect(timeField.type).toBe(FieldType.time);
+
+    expect(stateChangeField.name).toBe('state');
+    expect(stateChangeField.type).toBe(FieldType.string);
+    // There should be an artificial element at the end meaning Date.now()
+    // It exist to draw the state change from when it happened to the current time
+    expect(timeField.values).toHaveLength(2);
+    expect(timeField.values[0]).toBe(1000000);
+
+    expect(stateChangeField.values).toHaveLength(2);
+    expect(stateChangeField.values).toEqual(['Alerting', 'Alerting']);
+  });
+
+  it('should configure value to color mappings', () => {
+    const instanceLabels = { foo: 'bar', severity: 'critical', cluster: 'dev-us' };
+    const records: LogRecord[] = [
+      {
+        timestamp: 1000000,
+        line: { previous: 'Normal', current: 'Alerting', labels: instanceLabels },
+      },
+    ];
+
+    const frame = logRecordsToDataFrame(JSON.stringify(instanceLabels), records, [], theme);
+
+    const stateField = frame.fields[1];
+    expect(stateField.config.mappings).toHaveLength(1);
+    expect(stateField.config.mappings![0].options).toMatchObject({
+      Alerting: {
+        color: theme.colors.error.main,
+      },
+      Pending: {
+        color: theme.colors.warning.main,
+      },
+      Normal: {
+        color: theme.colors.success.main,
+      },
+      NoData: {
+        color: theme.colors.info.main,
+      },
+    });
+  });
+
+  it('should return correct data frame summary', () => {
+    const instanceLabels = { foo: 'bar', severity: 'critical', cluster: 'dev-us' };
+    const records: LogRecord[] = [
+      {
+        timestamp: 1000000,
+        line: { previous: 'Normal', current: 'Alerting', labels: instanceLabels },
+      },
+    ];
+
+    const frame = logRecordsToDataFrame(JSON.stringify(instanceLabels), records, [], theme);
+
+    expect(frame.fields).toHaveLength(2);
+    expect(frame).toHaveLength(2);
+  });
+
+  it('should have only unique labels in display name', () => {
+    const instanceLabels = { foo: 'bar', severity: 'critical', cluster: 'dev-us' };
+    const records: LogRecord[] = [
+      {
+        timestamp: 1000000,
+        line: { previous: 'Normal', current: 'Alerting', labels: instanceLabels },
+      },
+    ];
+
+    const frame = logRecordsToDataFrame(
+      JSON.stringify(instanceLabels),
+      records,
+      [
+        ['foo', 'bar'],
+        ['cluster', 'dev-us'],
+      ],
+      theme
+    );
+
+    expect(frame.fields[1].config.displayName).toBe('severity=critical');
+  });
+});
diff --git a/public/app/features/alerting/unified/components/rules/state-history/useRuleHistoryRecords.tsx b/public/app/features/alerting/unified/components/rules/state-history/useRuleHistoryRecords.tsx
new file mode 100644
index 00000000000..67efa185b3a
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/state-history/useRuleHistoryRecords.tsx
@@ -0,0 +1,155 @@
+import { groupBy } from 'lodash';
+import { useMemo } from 'react';
+
+import {
+  DataFrame,
+  DataFrameJSON,
+  Field as DataFrameField,
+  FieldType,
+  getDisplayProcessor,
+  GrafanaTheme2,
+} from '@grafana/data';
+import { fieldIndexComparer } from '@grafana/data/src/field/fieldComparers';
+import { MappingType, ThresholdsMode } from '@grafana/schema';
+import { useTheme2 } from '@grafana/ui';
+
+import { labelsMatchMatchers, parseMatchers } from '../../../utils/alertmanager';
+
+import { extractCommonLabels, Line, LogRecord, omitLabels } from './common';
+
+export function useRuleHistoryRecords(stateHistory?: DataFrameJSON, filter?: string) {
+  const theme = useTheme2();
+
+  return useMemo(() => {
+    // merge timestamp with "line"
+    const tsValues = stateHistory?.data?.values[0] ?? [];
+    const timestamps: number[] = isNumbers(tsValues) ? tsValues : [];
+    const lines = stateHistory?.data?.values[1] ?? [];
+
+    const logRecords = timestamps.reduce((acc: LogRecord[], timestamp: number, index: number) => {
+      const line = lines[index];
+      // values property can be undefined for some instance states (e.g. NoData)
+      if (isLine(line)) {
+        acc.push({ timestamp, line });
+      }
+
+      return acc;
+    }, []);
+
+    // group all records by alert instance (unique set of labels)
+    const logRecordsByInstance = groupBy(logRecords, (record: LogRecord) => {
+      return JSON.stringify(record.line.labels);
+    });
+
+    // CommonLabels should not be affected by the filter
+    // find common labels so we can extract those from the instances
+    const groupLabels = Object.keys(logRecordsByInstance);
+    const groupLabelsArray: Array<Array<[string, string]>> = groupLabels.map((label) => {
+      return Object.entries(JSON.parse(label));
+    });
+
+    const commonLabels = extractCommonLabels(groupLabelsArray);
+
+    const filterMatchers = filter ? parseMatchers(filter) : [];
+    const filteredGroupedLines = Object.entries(logRecordsByInstance).filter(([key]) => {
+      const labels = JSON.parse(key);
+      return labelsMatchMatchers(labels, filterMatchers);
+    });
+
+    const dataFrames: DataFrame[] = filteredGroupedLines.map<DataFrame>(([key, records]) => {
+      return logRecordsToDataFrame(key, records, commonLabels, theme);
+    });
+
+    return {
+      historyRecords: logRecords.filter(({ line }) => line.labels && labelsMatchMatchers(line.labels, filterMatchers)),
+      dataFrames,
+      commonLabels,
+      totalRecordsCount: logRecords.length,
+    };
+  }, [stateHistory, filter, theme]);
+}
+
+export function isNumbers(value: unknown[]): value is number[] {
+  return value.every((v) => typeof v === 'number');
+}
+
+export function isLine(value: unknown): value is Line {
+  return typeof value === 'object' && value !== null && 'current' in value && 'previous' in value;
+}
+
+// Each alert instance is represented by a data frame
+// Each frame consists of two fields: timestamp and state change
+export function logRecordsToDataFrame(
+  instanceLabels: string,
+  records: LogRecord[],
+  commonLabels: Array<[string, string]>,
+  theme: GrafanaTheme2
+): DataFrame {
+  const parsedInstanceLabels = Object.entries<string>(JSON.parse(instanceLabels));
+
+  // There is an artificial element at the end meaning Date.now()
+  // It exist to draw the state change from when it happened to the current time
+  const timeField: DataFrameField = {
+    name: 'time',
+    type: FieldType.time,
+    values: [...records.map((record) => record.timestamp), Date.now()],
+    config: { displayName: 'Time', custom: { fillOpacity: 100 } },
+  };
+
+  const timeIndex = timeField.values.map((_, index) => index);
+  timeIndex.sort(fieldIndexComparer(timeField));
+
+  const stateValues = [...records.map((record) => record.line.current), records.at(-1)?.line.current];
+
+  const frame: DataFrame = {
+    fields: [
+      {
+        ...timeField,
+        values: timeField.values.map((_, i) => timeField.values[timeIndex[i]]),
+      },
+      {
+        name: 'state',
+        type: FieldType.string,
+        values: stateValues.map((_, i) => stateValues[timeIndex[i]]),
+        config: {
+          displayName: omitLabels(parsedInstanceLabels, commonLabels)
+            .map(([key, label]) => `${key}=${label}`)
+            .join(', '),
+          color: { mode: 'thresholds' },
+          custom: { fillOpacity: 100 },
+          mappings: [
+            {
+              type: MappingType.ValueToText,
+              options: {
+                Alerting: {
+                  color: theme.colors.error.main,
+                },
+                Pending: {
+                  color: theme.colors.warning.main,
+                },
+                Normal: {
+                  color: theme.colors.success.main,
+                },
+                NoData: {
+                  color: theme.colors.info.main,
+                },
+              },
+            },
+          ],
+          thresholds: {
+            mode: ThresholdsMode.Absolute,
+            steps: [],
+          },
+        },
+      },
+    ],
+    length: timeField.values.length,
+    name: instanceLabels,
+  };
+
+  frame.fields.forEach((field) => {
+    field.display = getDisplayProcessor({ field, theme });
+  });
+
+  return frame;
+}
diff --git a/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx b/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx
index 1e0a5a425f9..c3c66d175a2 100644
--- a/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx
+++ b/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx
@@ -1,32 +1,83 @@
-import React, { useMemo, useState } from 'react';
+import { css } from '@emotion/css';
+import React, { lazy, Suspense, useCallback, useMemo, useState } from 'react';
 
-import { Modal } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Modal, useStyles2 } from '@grafana/ui';
+import { RulerGrafanaRuleDTO } from 'app/types/unified-alerting-dto';
 
-import { StateHistory } from '../components/rules/StateHistory';
+const AnnotationsStateHistory = lazy(() => import('../components/rules/state-history/StateHistory'));
+const LokiStateHistory = lazy(() => import('../components/rules/state-history/LokiStateHistory'));
 
-function useStateHistoryModal(alertId: string) {
+enum StateHistoryImplementation {
+  Loki = 'loki',
+  Annotations = 'annotations',
+}
+
+function useStateHistoryModal() {
   const [showModal, setShowModal] = useState<boolean>(false);
+  const [rule, setRule] = useState<RulerGrafanaRuleDTO | undefined>();
 
-  const StateHistoryModal = useMemo(
-    () => (
+  const styles = useStyles2(getStyles);
+
+  const implementation =
+    config.unifiedAlerting.alertStateHistoryBackend === StateHistoryImplementation.Loki
+      ? StateHistoryImplementation.Loki
+      : StateHistoryImplementation.Annotations;
+
+  const dismissModal = useCallback(() => {
+    setRule(undefined);
+    setShowModal(false);
+  }, []);
+
+  const openModal = useCallback((rule: RulerGrafanaRuleDTO) => {
+    setRule(rule);
+    setShowModal(true);
+  }, []);
+
+  const StateHistoryModal = useMemo(() => {
+    if (!rule) {
+      return null;
+    }
+
+    return (
       <Modal
         isOpen={showModal}
-        onDismiss={() => setShowModal(false)}
+        onDismiss={dismissModal}
         closeOnBackdropClick={true}
         closeOnEscape={true}
         title="State history"
+        className={styles.modal}
+        contentClassName={styles.modalContent}
       >
-        <StateHistory alertId={alertId} />
+        <Suspense fallback={'Loading...'}>
+          {implementation === StateHistoryImplementation.Loki && <LokiStateHistory ruleUID={rule.grafana_alert.uid} />}
+          {implementation === StateHistoryImplementation.Annotations && (
+            <AnnotationsStateHistory alertId={rule.grafana_alert.id ?? ''} />
+          )}
+        </Suspense>
       </Modal>
-    ),
-    [alertId, showModal]
-  );
+    );
+  }, [rule, showModal, dismissModal, implementation, styles]);
 
   return {
     StateHistoryModal,
-    showStateHistoryModal: () => setShowModal(true),
-    hideStateHistoryModal: () => setShowModal(false),
+    showStateHistoryModal: openModal,
+    hideStateHistoryModal: dismissModal,
   };
 }
 
+const getStyles = (theme: GrafanaTheme2) => ({
+  modal: css`
+    width: 80%;
+    height: 80%;
+    min-width: 800px;
+  `,
+  modalContent: css`
+    height: 100%;
+    width: 100%;
+    padding: ${theme.spacing(2)};
+  `,
+});
+
 export { useStateHistoryModal };
diff --git a/public/app/features/alerting/unified/utils/alertmanager.ts b/public/app/features/alerting/unified/utils/alertmanager.ts
index 836efd206e9..578549da500 100644
--- a/public/app/features/alerting/unified/utils/alertmanager.ts
+++ b/public/app/features/alerting/unified/utils/alertmanager.ts
@@ -1,3 +1,5 @@
+import { isEqual, uniqWith } from 'lodash';
+
 import { SelectableValue } from '@grafana/data';
 import {
   AlertManagerCortexConfig,
@@ -173,7 +175,7 @@ export function parseMatchers(matcherQueryString: string): Matcher[] {
     const isRegex = operator === MatcherOperator.regex || operator === MatcherOperator.notRegex;
     matchers.push({
       name: key,
-      value: value.trim(),
+      value: isRegex ? getValidRegexString(value.trim()) : value.trim(),
       isEqual,
       isRegex,
     });
@@ -183,6 +185,16 @@ export function parseMatchers(matcherQueryString: string): Matcher[] {
   return matchers;
 }
 
+function getValidRegexString(regex: string): string {
+  // Regexes provided by users might be invalid, so we need to catch the error
+  try {
+    new RegExp(regex);
+    return regex;
+  } catch (error) {
+    return '';
+  }
+}
+
 export function labelsMatchMatchers(labels: Labels, matchers: Matcher[]): boolean {
   return matchers.every(({ name, value, isRegex, isEqual }) => {
     return Object.entries(labels).some(([labelKey, labelValue]) => {
@@ -206,6 +218,12 @@ export function labelsMatchMatchers(labels: Labels, matchers: Matcher[]): boolea
   });
 }
 
+export function combineMatcherStrings(...matcherStrings: string[]): string {
+  const matchers = matcherStrings.map(parseMatchers).flat();
+  const uniqueMatchers = uniqWith(matchers, isEqual);
+  return matchersToString(uniqueMatchers);
+}
+
 export function getAllAlertmanagerDataSources() {
   return getAllDataSources().filter((ds) => ds.type === DataSourceType.Alertmanager);
 }

From 2767d5b1c200f7bb96635039c91999d852b72ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Mon, 24 Apr 2023 09:50:39 +0200
Subject: [PATCH 341/729] devenv: loki: improved fake data generation (#66966)

---
 devenv/docker/blocks/loki/data/data.js | 42 +++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/devenv/docker/blocks/loki/data/data.js b/devenv/docker/blocks/loki/data/data.js
index 8462deed770..8989b7a4164 100644
--- a/devenv/docker/blocks/loki/data/data.js
+++ b/devenv/docker/blocks/loki/data/data.js
@@ -63,6 +63,11 @@ async function lokiSendLogLine(timestampNs, line, tags) {
   await jsonRequest(data, 'POST', url, 204);
 }
 
+function getSineValue(counter, loopLength) {
+  // we try to make a sine-wave, where one full "loop" takes loopLength steps
+  return Math.sin((Math.PI * 2 * counter) / loopLength);
+}
+
 function getRandomLogItem(counter) {
   const randomText = `${Math.trunc(Math.random() * 1000 * 1000 * 1000)}`;
   const maybeAnsiText = Math.random() < 0.5 ? 'with ANSI \u001b[31mpart of the text\u001b[0m' : '';
@@ -70,6 +75,7 @@ function getRandomLogItem(counter) {
     _entry: `log text ${maybeAnsiText} [${randomText}]`,
     counter: counter.toString(),
     float: Math.random() > 0.2 ? (Math.trunc(100000 * Math.random())/1000).toString() : 'NaN',
+    wave: getSineValue(counter, 20), // let's loop in 20 steps
     label: chooseRandomElement(['val1', 'val2', 'val3']),
     level: chooseRandomElement(['debug','info', 'info', 'info', 'info', 'warning', 'error', 'error']),
   };
@@ -151,8 +157,15 @@ function getRandomNanosecPart() {
   return Math.trunc(Math.random()*1000000).toString().padStart(6, '0')
 }
 
+const sharedLabels = {
+  source: 'data',
+  instance: 'server\\1',
+  job: '"grafana/data"'
+};
 
-async function main() {
+let globalCounter = 0;
+
+async function sendOldLogs() {
   const delays = calculateDelays(DAYS * POINTS_PER_DAY);
   const timeRange = DAYS * 24 * 60 * 60 * 1000;
   let timestampMs = new Date().getTime() - timeRange;
@@ -160,12 +173,33 @@ async function main() {
     const delay = delays[i];
     timestampMs += Math.trunc(delay * timeRange);
     const timestampNs = `${timestampMs}${getRandomNanosecPart()}`;
-    const item = getRandomLogItem(i + 1)
-    await lokiSendLogLine(timestampNs, JSON.stringify(item), {place:'moon', source: 'data', instance: 'server\\1', job: '"grafana/data"'});
-    await lokiSendLogLine(timestampNs, logFmtLine(item), {place:'luna', source: 'data', instance: 'server\\2', job: '"grafana/data"'});
+    globalCounter += 1;
+    const item = getRandomLogItem(globalCounter)
+    await lokiSendLogLine(timestampNs, JSON.stringify(item), {place:'moon', ...sharedLabels});
+    await lokiSendLogLine(timestampNs, logFmtLine(item), {place:'luna', ...sharedLabels});
   };
 }
 
+async function sendNewLogs() {
+  while(true) {
+    globalCounter += 1;
+    const nowMs = new Date().getTime();
+    const timestampNs = `${nowMs}${getRandomNanosecPart()}`;
+    const item = getRandomLogItem(globalCounter)
+    await lokiSendLogLine(timestampNs, JSON.stringify(item), {place:'moon', ...sharedLabels});
+    await lokiSendLogLine(timestampNs, logFmtLine(item), {place:'luna', ...sharedLabels});
+    const sleepDuration  = 200 + Math.random() * 800; // between 0.2 and 1 seconds
+    await sleep(sleepDuration);
+  }
+}
+
+async function main() {
+  // first we send logs to build a last-7-days log-data
+  await sendOldLogs();
+  // then keep sending new data forever
+  await sendNewLogs();
+}
+
 // when running in docker, we catch the needed stop-signal, to shutdown fast
 process.on('SIGTERM', () => {
   console.log('shutdown requested');

From 57701fd2f28f95f545569e6173b90050dc0e2913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 24 Apr 2023 09:55:55 +0200
Subject: [PATCH 342/729] ServeFromSubPath: Redirect to URL with subpath when
 subpath missing (#66724)

* ServeFromSubPath: Redirect to URL with subpath when subpath missing

* Review fixes

* Added tests

* Use constant

* change to useMiddleware

* Update pkg/middleware/subpath_redirect.go

---------

Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
---
 pkg/api/http_server.go                  |  2 ++
 pkg/middleware/subpath_redirect.go      | 26 +++++++++++++++
 pkg/middleware/subpath_redirect_test.go | 43 +++++++++++++++++++++++++
 pkg/middleware/testing.go               |  3 ++
 4 files changed, 74 insertions(+)
 create mode 100644 pkg/middleware/subpath_redirect.go
 create mode 100644 pkg/middleware/subpath_redirect_test.go

diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 093eac80840..b8dcc68310c 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -602,6 +602,7 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
 
 	if hs.Cfg.ServeFromSubPath && hs.Cfg.AppSubURL != "" {
 		m.SetURLPrefix(hs.Cfg.AppSubURL)
+		m.UseMiddleware(middleware.SubPathRedirect(hs.Cfg))
 	}
 
 	m.UseMiddleware(web.Renderer(filepath.Join(hs.Cfg.StaticRootPath, "views"), "[[", "]]"))
@@ -616,6 +617,7 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
 
 	m.UseMiddleware(hs.ContextHandler.Middleware)
 	m.Use(middleware.OrgRedirect(hs.Cfg, hs.userService))
+
 	if !hs.Features.IsEnabled(featuremgmt.FlagAuthnService) {
 		m.Use(accesscontrol.LoadPermissionsMiddleware(hs.accesscontrolService))
 	}
diff --git a/pkg/middleware/subpath_redirect.go b/pkg/middleware/subpath_redirect.go
new file mode 100644
index 00000000000..2395399ad42
--- /dev/null
+++ b/pkg/middleware/subpath_redirect.go
@@ -0,0 +1,26 @@
+package middleware
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+// SubPathRedirect Redirects URLs that are missing the configured subpath to an URL that contains the subpath.
+func SubPathRedirect(cfg *setting.Cfg) web.Middleware {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
+			// Direct to url with subpath if the request is missing the subpath and is not an API request.
+			if !strings.HasPrefix(req.RequestURI, cfg.AppSubURL) && !strings.HasPrefix(req.RequestURI, "/api") {
+				newURL := fmt.Sprintf("%s%s", cfg.AppURL, strings.TrimPrefix(req.RequestURI, "/"))
+				http.Redirect(rw, req, newURL, http.StatusMovedPermanently)
+				return
+			}
+
+			next.ServeHTTP(rw, req)
+		})
+	}
+}
diff --git a/pkg/middleware/subpath_redirect_test.go b/pkg/middleware/subpath_redirect_test.go
new file mode 100644
index 00000000000..ef2fd2c40f6
--- /dev/null
+++ b/pkg/middleware/subpath_redirect_test.go
@@ -0,0 +1,43 @@
+package middleware
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSubPathRedirect(t *testing.T) {
+	testSubPathRedirect(t, "/", "http://localhost:3000/subpath/")
+	testSubPathRedirect(t, "/admin/my/page", "http://localhost:3000/subpath/admin/my/page")
+	testSubPathRedirect(t, "/api/users", "")
+}
+
+func testSubPathRedirect(t *testing.T, url string, expectedRedirect string) {
+	middlewareScenario(t, "GET url without subpath", func(t *testing.T, sc *scenarioContext) {
+		sc.cfg.AppSubURL = "/subpath"
+		sc.cfg.AppURL = "http://localhost:3000/subpath/"
+
+		sc.m.UseMiddleware(SubPathRedirect(sc.cfg))
+		sc.m.Get("/api/users", sc.defaultHandler)
+
+		sc.fakeReqWithParams("GET", url, map[string]string{}).exec()
+
+		if expectedRedirect != "" {
+			assert.Equal(t, 301, sc.resp.Code)
+
+			// nolint:bodyclose
+			resp := sc.resp.Result()
+			t.Cleanup(func() {
+				err := resp.Body.Close()
+				assert.NoError(t, err)
+			})
+			redirectURL, err := resp.Location()
+			require.NoError(t, err)
+
+			assert.Equal(t, expectedRedirect, redirectURL.String())
+		} else {
+			assert.Equal(t, 200, sc.resp.Code)
+		}
+	})
+}
diff --git a/pkg/middleware/testing.go b/pkg/middleware/testing.go
index 555d4d4f727..9c928d624c0 100644
--- a/pkg/middleware/testing.go
+++ b/pkg/middleware/testing.go
@@ -99,7 +99,10 @@ func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map
 	for k, v := range queryParams {
 		q.Add(k, v)
 	}
+
 	req.URL.RawQuery = q.Encode()
+	req.RequestURI = req.URL.RequestURI()
+
 	require.NoError(sc.t, err)
 
 	reqCtx := &contextmodel.ReqContext{

From 28a641aa50ecdf952376fe8a58b1a7ff157afdd7 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 24 Apr 2023 10:57:05 +0300
Subject: [PATCH 343/729] Authentication UI: Fix permissions for saving
 settings (#67086)

Fix permissions for saving settings
---
 public/app/features/auth-config/state/actions.ts | 2 +-
 public/app/types/accessControl.ts                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/auth-config/state/actions.ts b/public/app/features/auth-config/state/actions.ts
index b231c2c0bed..07ab3512c1c 100644
--- a/public/app/features/auth-config/state/actions.ts
+++ b/public/app/features/auth-config/state/actions.ts
@@ -48,7 +48,7 @@ export function loadProviderStatuses(): ThunkResult<void> {
 
 export function saveSettings(data: UpdateSettingsQuery): ThunkResult<Promise<boolean>> {
   return async (dispatch) => {
-    if (contextSrv.hasPermission(AccessControlAction.SettingsRead)) {
+    if (contextSrv.hasPermission(AccessControlAction.SettingsWrite)) {
       try {
         await lastValueFrom(
           getBackendSrv().fetch({
diff --git a/public/app/types/accessControl.ts b/public/app/types/accessControl.ts
index d608586854b..16e7a96165e 100644
--- a/public/app/types/accessControl.ts
+++ b/public/app/types/accessControl.ts
@@ -130,6 +130,7 @@ export enum AccessControlAction {
 
   // Settings
   SettingsRead = 'settings:read',
+  SettingsWrite = 'settings:write',
 }
 
 export interface Role {

From 94cf94ff68ba3d5cf64e58a03a39af8d09f74419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 24 Apr 2023 10:20:47 +0200
Subject: [PATCH 344/729] AppNotificationList: Improves position now that
 topnav is live (#66959)

* AppNotificationList: Improves position now that topnav is live

* update pos
---
 .../AppNotifications/AppNotificationItem.tsx  | 12 ++-
 .../AppNotifications/AppNotificationList.tsx  | 87 +++++++++----------
 public/sass/components/_alerts.scss           |  9 --
 3 files changed, 49 insertions(+), 59 deletions(-)

diff --git a/public/app/core/components/AppNotifications/AppNotificationItem.tsx b/public/app/core/components/AppNotifications/AppNotificationItem.tsx
index 3ec1a2b59a2..167b2546009 100644
--- a/public/app/core/components/AppNotifications/AppNotificationItem.tsx
+++ b/public/app/core/components/AppNotifications/AppNotificationItem.tsx
@@ -20,6 +20,8 @@ export default function AppNotificationItem({ appNotification, onClearNotificati
     }, timeoutMap[appNotification.severity]);
   });
 
+  const hasBody = appNotification.component || appNotification.text || appNotification.traceId;
+
   return (
     <Alert
       severity={appNotification.severity}
@@ -27,10 +29,12 @@ export default function AppNotificationItem({ appNotification, onClearNotificati
       onRemove={() => onClearNotification(appNotification.id)}
       elevated
     >
-      <div className={styles.wrapper}>
-        <span>{appNotification.component || appNotification.text}</span>
-        {appNotification.traceId && <span className={styles.trace}>Trace ID: {appNotification.traceId}</span>}
-      </div>
+      {hasBody && (
+        <div className={styles.wrapper}>
+          <span>{appNotification.component || appNotification.text}</span>
+          {appNotification.traceId && <span className={styles.trace}>Trace ID: {appNotification.traceId}</span>}
+        </div>
+      )}
     </Alert>
   );
 }
diff --git a/public/app/core/components/AppNotifications/AppNotificationList.tsx b/public/app/core/components/AppNotifications/AppNotificationList.tsx
index 82723c43cb6..b27736e2ee0 100644
--- a/public/app/core/components/AppNotifications/AppNotificationList.tsx
+++ b/public/app/core/components/AppNotifications/AppNotificationList.tsx
@@ -1,12 +1,12 @@
-import React, { PureComponent } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
+import { css } from '@emotion/css';
+import React, { useEffect } from 'react';
 
-import { AppEvents } from '@grafana/data';
-import { VerticalGroup } from '@grafana/ui';
+import { AppEvents, GrafanaTheme2 } from '@grafana/data';
+import { useStyles2, VerticalGroup } from '@grafana/ui';
 import { notifyApp, hideAppNotification } from 'app/core/actions';
 import appEvents from 'app/core/app_events';
 import { selectVisible } from 'app/core/reducers/appNotification';
-import { StoreState } from 'app/types';
+import { useSelector, useDispatch } from 'app/types';
 
 import {
   createErrorNotification,
@@ -16,53 +16,48 @@ import {
 
 import AppNotificationItem from './AppNotificationItem';
 
-export interface OwnProps {}
-
-const mapStateToProps = (state: StoreState, props: OwnProps) => ({
-  appNotifications: selectVisible(state.appNotifications),
-});
-
-const mapDispatchToProps = {
-  notifyApp,
-  hideAppNotification,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-export type Props = OwnProps & ConnectedProps<typeof connector>;
-
-export class AppNotificationListUnConnected extends PureComponent<Props> {
-  componentDidMount() {
-    const { notifyApp } = this.props;
+export function AppNotificationList() {
+  const appNotifications = useSelector((state) => selectVisible(state.appNotifications));
+  const dispatch = useDispatch();
+  const styles = useStyles2(getStyles);
 
+  useEffect(() => {
     appEvents.on(AppEvents.alertWarning, (payload) => notifyApp(createWarningNotification(...payload)));
     appEvents.on(AppEvents.alertSuccess, (payload) => notifyApp(createSuccessNotification(...payload)));
     appEvents.on(AppEvents.alertError, (payload) => notifyApp(createErrorNotification(...payload)));
-  }
+  }, []);
 
-  onClearAppNotification = (id: string) => {
-    this.props.hideAppNotification(id);
+  const onClearAppNotification = (id: string) => {
+    dispatch(hideAppNotification(id));
   };
 
-  render() {
-    const { appNotifications } = this.props;
-
-    return (
-      <div className="page-alert-list">
-        <VerticalGroup>
-          {appNotifications.map((appNotification, index) => {
-            return (
-              <AppNotificationItem
-                key={`${appNotification.id}-${index}`}
-                appNotification={appNotification}
-                onClearNotification={(id) => this.onClearAppNotification(id)}
-              />
-            );
-          })}
-        </VerticalGroup>
-      </div>
-    );
-  }
+  return (
+    <div className={styles.wrapper}>
+      <VerticalGroup>
+        {appNotifications.map((appNotification, index) => {
+          return (
+            <AppNotificationItem
+              key={`${appNotification.id}-${index}`}
+              appNotification={appNotification}
+              onClearNotification={onClearAppNotification}
+            />
+          );
+        })}
+      </VerticalGroup>
+    </div>
+  );
 }
 
-export const AppNotificationList = connector(AppNotificationListUnConnected);
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    wrapper: css({
+      label: 'app-notifications-list',
+      zIndex: theme.zIndex.portal,
+      minWidth: 400,
+      maxWidth: 600,
+      position: 'fixed',
+      right: 6,
+      top: 88,
+    }),
+  };
+}
diff --git a/public/sass/components/_alerts.scss b/public/sass/components/_alerts.scss
index d884c587e36..47d9894d079 100644
--- a/public/sass/components/_alerts.scss
+++ b/public/sass/components/_alerts.scss
@@ -37,15 +37,6 @@
   border-color: $alert-warning-bg;
 }
 
-.page-alert-list {
-  z-index: 8000;
-  min-width: 400px;
-  max-width: 600px;
-  position: fixed;
-  right: 10px;
-  top: 60px;
-}
-
 .alert-close {
   padding: 0 0 0 $space-md;
   border: none;

From af9bf81102932766e28ac9f184bf76ae6dea7f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 24 Apr 2023 10:52:12 +0200
Subject: [PATCH 345/729] AppChrome: Fix scrollbar issue for small (mobile) 
 breakpoint (#67058)

---
 public/app/core/components/AppChrome/AppChrome.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index 2ab7cc8ad84..f140eaa06a9 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -109,6 +109,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     pageContainer: css({
       label: 'page-container',
       flexGrow: 1,
+      minHeight: 0,
     }),
   };
 };

From cd8f6a59b9203a31bd4a73fa38f1753e1c5a260a Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Mon, 24 Apr 2023 11:38:58 +0100
Subject: [PATCH 346/729] Docs: add support bundle section to the config
 snippet (#67059)

add support bundle section to the config snippet
---
 docs/sources/troubleshooting/support-bundles/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/sources/troubleshooting/support-bundles/index.md b/docs/sources/troubleshooting/support-bundles/index.md
index ff5d794d3c5..8d4a41d2c49 100644
--- a/docs/sources/troubleshooting/support-bundles/index.md
+++ b/docs/sources/troubleshooting/support-bundles/index.md
@@ -57,9 +57,10 @@ To generate a support bundle and send the support bundle to Grafana Labs via a s
 
 ## Support bundle configuration
 
-You can configure the following settings for support bundles:
+You can configure the following settings for support bundles in the Grafana configuration file:
 
 ```ini
+[support_bundles]
 # Enable support bundle creation (default: true)
 enabled = true
 # Only server admins can generate and view support bundles. When set to false, organization admins can generate and view support bundles (default: true)

From 07373705d9b64c6db74333433e61707556a6aaf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Mon, 24 Apr 2023 12:42:42 +0200
Subject: [PATCH 347/729] Grafana UI: Improve AutoSaveField component (#66751)

---
 .../AutoSaveField/AutoSaveField.tsx           | 33 ++++---
 .../AutoSaveField/EllipsisAnimated.tsx        | 91 +++++++++++++++++++
 .../components/InlineToast/InlineToast.tsx    |  2 +-
 3 files changed, 112 insertions(+), 14 deletions(-)
 create mode 100644 packages/grafana-ui/src/components/AutoSaveField/EllipsisAnimated.tsx

diff --git a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx
index cd4d5308941..9aa84af51e0 100644
--- a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx
+++ b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx
@@ -1,20 +1,12 @@
+import { css } from '@emotion/css';
 import { debounce } from 'lodash';
 import React, { useCallback, useMemo, useRef } from 'react';
 
+import { useStyles2 } from '../../themes';
 import { Field, FieldProps } from '../Forms/Field';
 import { InlineToast } from '../InlineToast/InlineToast';
 
-/**
-1.- Use the Input component as a base
-2.- Just save if there is any change and when it loses focus
-3.- Set the loading to true while the backend is saving
-4.- Be aware of the backend response. If there is an error show a proper message and return the focus to the input.
-5.- Add aria-live="polite" and check how it works in a screen-reader.
-Debounce instead of working with onBlur?
-import debouncePromise from 'debounce-promise';
-or
-import { debounce} from 'lodash';
- */
+import { EllipsisAnimated } from './EllipsisAnimated';
 
 const SHOW_SUCCESS_DURATION = 2 * 1000;
 
@@ -88,20 +80,22 @@ export function AutoSaveField<T = string>(props: Props<T>) {
   const lodashDebounce = useMemo(() => debounce(handleChange, 600, { leading: false }), [handleChange]);
   //We never want to pass false to field, because it won't be deleted with deleteUndefinedProps() being false
   const isInvalid = invalid || fieldState.showError || undefined;
-  const isLoading = loading || fieldState.isLoading || undefined;
   /**
    * use Field around input to pass the error message
    * use InlineToast.tsx to show the save message
    */
+  const styles = useStyles2(getStyles);
+
   return (
     <>
       <Field
         {...restProps}
-        loading={isLoading}
+        loading={loading || undefined}
         invalid={isInvalid}
         disabled={disabled}
         error={error || (fieldState.showError && saveErrorMessage)}
         ref={fieldRef}
+        className={styles.widthFitContent}
       >
         {React.cloneElement(
           children((newValue) => {
@@ -109,6 +103,11 @@ export function AutoSaveField<T = string>(props: Props<T>) {
           })
         )}
       </Field>
+      {fieldState.isLoading && (
+        <InlineToast referenceElement={fieldRef.current} placement="right" alternativePlacement="bottom">
+          Saving <EllipsisAnimated />
+        </InlineToast>
+      )}
       {fieldState.showSuccess && (
         <InlineToast
           suffixIcon={'check'}
@@ -124,3 +123,11 @@ export function AutoSaveField<T = string>(props: Props<T>) {
 }
 
 AutoSaveField.displayName = 'AutoSaveField';
+
+const getStyles = () => {
+  return {
+    widthFitContent: css({
+      width: 'fit-content',
+    }),
+  };
+};
diff --git a/packages/grafana-ui/src/components/AutoSaveField/EllipsisAnimated.tsx b/packages/grafana-ui/src/components/AutoSaveField/EllipsisAnimated.tsx
new file mode 100644
index 00000000000..1a91db3120d
--- /dev/null
+++ b/packages/grafana-ui/src/components/AutoSaveField/EllipsisAnimated.tsx
@@ -0,0 +1,91 @@
+import { css, keyframes } from '@emotion/css';
+import React from 'react';
+
+import { useStyles2 } from '../../themes';
+
+export const EllipsisAnimated = React.memo(() => {
+  const styles = useStyles2(getStyles);
+  return (
+    <div className={styles.ellipsis}>
+      <span className={styles.firstDot}>.</span>
+      <span className={styles.secondDot}>.</span>
+      <span className={styles.thirdDot}>.</span>
+    </div>
+  );
+});
+
+EllipsisAnimated.displayName = 'EllipsisAnimated';
+
+const getStyles = () => {
+  return {
+    ellipsis: css({
+      display: 'inline',
+    }),
+    firstDot: css({
+      animation: `${firstDot} 2s linear infinite`,
+    }),
+    secondDot: css({
+      animation: `${secondDot} 2s linear infinite`,
+    }),
+    thirdDot: css({
+      animation: `${thirdDot} 2s linear infinite`,
+    }),
+  };
+};
+
+const firstDot = keyframes`
+  0% {
+    opacity: 1;
+  }
+  65% {
+    opacity: 1;
+  }
+  66% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 0;
+  }
+  `;
+
+const secondDot = keyframes`
+  0% {
+    opacity: 0;
+  }
+  21% {
+    opacity: 0.5;
+  }
+  22% {
+    opacity: 1;
+  }
+  65% {
+    opacity: 1;
+  }
+  66% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 0;
+  }
+  `;
+
+const thirdDot = keyframes`
+  0% {
+    opacity: 0;
+  }
+  43% {
+    opacity: 0.5;
+  }
+  44% {
+    opacity: 1;
+  }
+  65% {
+    opacity: 1;
+  }
+  66% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 0;
+  }
+  `;
diff --git a/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx b/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
index 67fa6dab9a4..8488682a3d2 100644
--- a/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
+++ b/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
@@ -15,7 +15,7 @@ export interface InlineToastProps {
   suffixIcon?: IconName;
   referenceElement: HTMLElement | null;
   placement: BasePlacement;
-  // Placement to use if there is not enough space to show the full toast with the original placement
+  /** Placement to use if there is not enough space to show the full toast with the original placement*/
   alternativePlacement?: BasePlacement;
 }
 

From 2521fa94485ccbc4eb47180f71882f2378c3d113 Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:48:57 +0200
Subject: [PATCH 348/729] Docs: Fixes alert rule type table (#67090)

* Fixes alert rule type table

* adds responsive table markdown

* adds responsive table

* updates image text

* Adds word breaks

* fix responsive table
---
 .../alert-rules/alert-rule-types.md           | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
index f966c2f8a5e..92e09d34ab7 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
@@ -20,7 +20,7 @@ In addition to supporting multiple data sources, you can also add expressions to
 
 The following diagram shows how Grafana-managed alerting works.
 
-{{< figure src="/media/docs/alerting/grafana-managed-rule.png" max-width="750px" caption="How Alerting works" >}}
+{{< figure src="/media/docs/alerting/grafana-managed-rule.png" max-width="750px" caption="Grafana-managed alerting" >}}
 
 1. Alert rules are created within Grafana based on one or more data sources.
 
@@ -43,7 +43,7 @@ For more information on the Ruler API, refer to [Ruler API](docs/loki/latest/api
 
 The following diagram shows how Grafana Mimir or Grafana Loki-managed alerting works.
 
-{{< figure src="/media/docs/alerting/loki-mimir-rule.png" max-width="750px" caption="How Alerting works" >}}
+{{< figure src="/media/docs/alerting/loki-mimir-rule.png" max-width="750px" caption="Grafana Mimir/Loki-managed alerting" >}}
 
 1. Alert rules are created and stored within the data source itself.
 1. Alert rules can only be created based on Prometheus data.
@@ -63,15 +63,18 @@ For more information on recording rules in Prometheus, refer to [recording rules
 
 When choosing which alert rule type to use, consider the following comparison between Grafana-managed alert rules and Grafana Mimir or Loki alert rules.
 
-| Feature                                                                 | Grafana-managed alert rule                                                                                                   | Loki/Mimir-managed alert rule                                                                                                                           |
+{{< responsive-table >}}
+| <div style="width:200px">Feature</div> | <div style="width:200px">Grafana-managed alert rule</div> | <div style="width:200px">Loki/Mimir-managed alert rule |
 | ----------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Create alert rules based on data from any of our supported data sources | Yes                                                                                                                          | No: You can only create alert rules that are based on Prometheus data. The data source must have the Ruler API enabled.                                 |
-| Mix and match data sources                                              | Yes                                                                                                                          | No                                                                                                                                                      |
-| Includes support for recording rules                                    | No                                                                                                                           | Yes                                                                                                                                                     |
-| Add expressions to transform your data and set alert conditions         | Yes                                                                                                                          | No                                                                                                                                                      |
-| Use images in alert notifications                                       | Yes                                                                                                                          | No                                                                                                                                                      |
-| Scaling                                                                 | More resource intensive, depend on the database, and are likely to suffer from transient errors. They only scale vertically. | Store alert rules within the data source itself and allow for “infinite” scaling. Generate and send alert notifications from the location of your data. |
-| Alert rule evaluation and delivery                                      | Alert rule evaluation and delivery is done from within Grafana, using an external Alertmanager; or both.                     | Alert rule evaluation and alert delivery is distributed, meaning there is no single point of failure.                                                   |
+| Create alert rules<wbr /> based on data from any of our supported data sources | Yes | No: You can only create alert rules that are based on Prometheus data. The data source must have the Ruler API enabled. |
+| Mix and match data sources | Yes | No |
+| Includes support for recording rules | No | Yes |
+| Add expressions to transform<wbr /> your data and set alert conditions | Yes | No |
+| Use images in alert notifications | Yes | No |
+| Scaling | More resource intensive, depend on the database, and are likely to suffer from transient errors. They only scale vertically. | Store alert rules within the data source itself and allow for “infinite” scaling. Generate and send alert notifications from the location of your data. |
+| Alert rule evaluation and delivery | Alert rule evaluation and delivery is done from within Grafana, using an external Alertmanager; or both. | Alert rule evaluation and alert delivery is distributed, meaning there is no single point of failure. |
+
+{{< /responsive-table >}}
 
 **Note:**
 

From 86be40555f72dd9e9f1604fe2afd4e98fcaa7dd5 Mon Sep 17 00:00:00 2001
From: Bruno <brunotj2015@hotmail.com>
Date: Mon, 24 Apr 2023 09:46:56 -0300
Subject: [PATCH 349/729] Chore: use native async fs.readFile in
 json-file-to-job-output script (#66686)

---
 .../workflows/scripts/json-file-to-job-output.js    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/scripts/json-file-to-job-output.js b/.github/workflows/scripts/json-file-to-job-output.js
index 0f6dd1e65ff..f176f79aa5b 100644
--- a/.github/workflows/scripts/json-file-to-job-output.js
+++ b/.github/workflows/scripts/json-file-to-job-output.js
@@ -1,7 +1,7 @@
 module.exports = async ({ core, filePath }) => {
     try {
-        const fs = require('fs');
-        const content = await readFile(fs, filePath);
+        const fs = require('fs').promises;
+        const content = await fs.readFile(filepath)
         const result = JSON.parse(content);
     
         core.startGroup('Parsing json file...');
@@ -15,13 +15,4 @@ module.exports = async ({ core, filePath }) => {
     } catch (error) {
         core.restFailed(error.message);
     }
-}
-
-async function readFile(fs, path) {
-    return new Promise((resolve, reject) => {
-        fs.readFile(path, (error, data) => {
-            if (error) return reject(error);
-            return resolve(data);
-        });
-    });
 }
\ No newline at end of file

From 5f16cd5124ca3ab81afd3d2dddf484591d3022f0 Mon Sep 17 00:00:00 2001
From: Sarah Zinger <sarah.zinger@grafana.com>
Date: Mon, 24 Apr 2023 08:47:29 -0400
Subject: [PATCH 350/729] Cloudwatch Logs: Clarify Cloudwatch Logs Limits
 (#67072)

Clarify Cloudwatch Logs Limits
---
 .../cloudwatch/components/ConfigEditor.tsx        |  4 ++--
 .../components/LogGroups/LogGroupsSelector.tsx    | 15 +++++++++++++--
 .../datasource/cloudwatch/components/styles.ts    |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
index 70dc5dc1104..55861707828 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
@@ -74,9 +74,9 @@ export const ConfigEditor = (props: Props) => {
       <h3 className="page-heading">CloudWatch Logs</h3>
       <div className="gf-form-group">
         <InlineField
-          label="Timeout"
+          label="Retry Timeout"
           labelWidth={28}
-          tooltip='Custom timeout for CloudWatch Logs insights queries which have max concurrency limits. Default is 15 minutes. Must be a valid duration string, such as "15m" "30s" "2000ms" etc.'
+          tooltip='Cloudwatch Logs allows for a maximum of 30 concurrent queries. If Grafana hits a concurrent max query error from Cloudwatch Logs it will auto-retry requesting a query for up to 30min. This retry timeout strategy is configurable. Must be a valid duration string, such as "15m" "30s" "2000ms" etc.'
           invalid={Boolean(logsTimeoutError)}
         >
           <Input
diff --git a/public/app/plugins/datasource/cloudwatch/components/LogGroups/LogGroupsSelector.tsx b/public/app/plugins/datasource/cloudwatch/components/LogGroups/LogGroupsSelector.tsx
index a9949551ea4..e4e53f8e92a 100644
--- a/public/app/plugins/datasource/cloudwatch/components/LogGroups/LogGroupsSelector.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/LogGroups/LogGroupsSelector.tsx
@@ -139,11 +139,22 @@ export const LogGroupsSelector = ({
         <div>
           {!isLoading && selectableLogGroups.length >= 25 && (
             <>
-              <Label className={styles.limitLabel}>
+              <div className={styles.limitLabel}>
                 <Icon name="info-circle"></Icon>
                 Only the first 50 results can be shown. If you do not see an expected log group, try narrowing down your
                 search.
-              </Label>
+                <p>
+                  A{' '}
+                  <a
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/cloudwatch_limits_cwl.html"
+                  >
+                    maximum{' '}
+                  </a>{' '}
+                  of 50 Cloudwatch log groups can be queried at one time.
+                </p>
+              </div>
               <Space layout="block" v={1} />
             </>
           )}
diff --git a/public/app/plugins/datasource/cloudwatch/components/styles.ts b/public/app/plugins/datasource/cloudwatch/components/styles.ts
index 6a5da27adde..4d69dd7a07e 100644
--- a/public/app/plugins/datasource/cloudwatch/components/styles.ts
+++ b/public/app/plugins/datasource/cloudwatch/components/styles.ts
@@ -26,6 +26,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     svg: {
       marginRight: theme.spacing(0.5),
     },
+    fontSize: 12,
   }),
 
   logGroupCountLabel: css({

From d4715a6f043c6622e8a04435d16fe8b9d6a72e7b Mon Sep 17 00:00:00 2001
From: Bruno <brunotj2015@hotmail.com>
Date: Mon, 24 Apr 2023 10:11:08 -0300
Subject: [PATCH 351/729] CSRF middleware: Add flag to skip login cookie check
 (#66806)

* CSRF middleware: add flag to skip login cookie check

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 conf/defaults.ini                             |   3 +
 conf/sample.ini                               |   3 +
 .../setup-grafana/configure-grafana/_index.md |   4 +
 pkg/middleware/csrf/csrf.go                   |  14 +-
 pkg/middleware/csrf/csrf_test.go              | 151 ++++++++++++++----
 pkg/server/wire.go                            |   1 +
 6 files changed, 141 insertions(+), 35 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 14eda0a60a3..086c84d7348 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -369,6 +369,9 @@ content_security_policy_report_only_template = """script-src 'self' 'unsafe-eval
 # Controls if old angular plugins are supported or not. This will be disabled by default in future release
 angular_support_enabled = true
 
+# The CSRF check will be executed even if the request has no login cookie.
+csrf_always_check = false
+
 [security.encryption]
 # Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
 # Please note that small values may cause performance issues due to a high frequency decryption operations.
diff --git a/conf/sample.ini b/conf/sample.ini
index 69b6dccfda1..d1d788a982b 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -375,6 +375,9 @@
 # List of allowed headers to be set by the user, separated by spaces. Suggested to use for if authentication lives behind reverse proxies.
 ;csrf_additional_headers =
 
+# The CSRF check will be executed even if the request has no login cookie.
+;csrf_always_check = false
+
 [security.encryption]
 # Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
 # Please note that small values may cause performance issues due to a high frequency decryption operations.
diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md
index 1d1e3f96fe1..6072beb2ca1 100644
--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -679,6 +679,10 @@ List of additional allowed URLs to pass by the CSRF check. Suggested when authen
 
 List of allowed headers to be set by the user. Suggested to use for if authentication lives behind reverse proxies.
 
+### csrf_always_check
+
+Set to `true` to execute the CSRF check even if the login cookie is not in a request (default `false`).
+
 ## [snapshots]
 
 ### enabled
diff --git a/pkg/middleware/csrf/csrf.go b/pkg/middleware/csrf/csrf.go
index 85ca6069837..b03dee95d7d 100644
--- a/pkg/middleware/csrf/csrf.go
+++ b/pkg/middleware/csrf/csrf.go
@@ -24,9 +24,10 @@ type CSRF struct {
 	trustedOrigins map[string]struct{}
 	headers        map[string]struct{}
 	safeEndpoints  map[string]struct{}
+	alwaysCheck    bool
 }
 
-func ProvideCSRFFilter(cfg *setting.Cfg) Service {
+func ProvideCSRFFilter(cfg *setting.Cfg) *CSRF {
 	c := &CSRF{
 		cfg:            cfg,
 		trustedOrigins: map[string]struct{}{},
@@ -36,6 +37,7 @@ func ProvideCSRFFilter(cfg *setting.Cfg) Service {
 
 	additionalHeaders := cfg.SectionWithEnvOverrides("security").Key("csrf_additional_headers").Strings(" ")
 	trustedOrigins := cfg.SectionWithEnvOverrides("security").Key("csrf_trusted_origins").Strings(" ")
+	c.alwaysCheck = cfg.SectionWithEnvOverrides("security").Key("csrf_always_check").MustBool(false)
 
 	for _, header := range additionalHeaders {
 		c.headers[header] = struct{}{}
@@ -71,10 +73,14 @@ func (c *CSRF) check(r *http.Request) error {
 	// (GET is excluded because it may have side effects in some APIs)
 	safeMethods := []string{"HEAD", "OPTIONS", "TRACE"}
 
-	// If request has no login cookie - skip CSRF checks
-	if _, err := r.Cookie(c.cfg.LoginCookieName); errors.Is(err, http.ErrNoCookie) {
-		return nil
+	// If the CSRF checks can be skipped.
+	if !c.alwaysCheck {
+		// If request has no login cookie - skip CSRF checks
+		if _, err := r.Cookie(c.cfg.LoginCookieName); errors.Is(err, http.ErrNoCookie) {
+			return nil
+		}
 	}
+
 	// Skip CSRF checks for "safe" methods
 	for _, method := range safeMethods {
 		if r.Method == method {
diff --git a/pkg/middleware/csrf/csrf_test.go b/pkg/middleware/csrf/csrf_test.go
index 470f20613ae..1214ff0e998 100644
--- a/pkg/middleware/csrf/csrf_test.go
+++ b/pkg/middleware/csrf/csrf_test.go
@@ -106,6 +106,7 @@ func TestCSRF_Check(t *testing.T) {
 	tests := []struct {
 		name           string
 		request        *http.Request
+		getCfg         func() *setting.Cfg
 		addtHeader     map[string]struct{}
 		trustedOrigins map[string]struct{}
 		safeEndpoints  map[string]struct{}
@@ -113,70 +114,116 @@ func TestCSRF_Check(t *testing.T) {
 		expectedStatus int
 	}{
 		{
-			name:       "base case",
-			request:    postRequest(t, "", nil),
+			name: "base case",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:    postRequest(t, "", nil, true),
 			expectedOK: true,
 		},
 		{
-			name:           "base with null origin header",
-			request:        postRequest(t, "", map[string]string{"Origin": "null"}),
+			name: "base with null origin header",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:        postRequest(t, "", map[string]string{"Origin": "null"}, true),
 			expectedStatus: http.StatusForbidden,
 		},
 		{
-			name:       "grafana.org",
-			request:    postRequest(t, "grafana.org", map[string]string{"Origin": "https://grafana.org"}),
+			name: "grafana.org",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:    postRequest(t, "grafana.org", map[string]string{"Origin": "https://grafana.org"}, true),
 			expectedOK: true,
 		},
 		{
-			name:           "grafana.org with X-Forwarded-Host",
-			request:        postRequest(t, "grafana.localhost", map[string]string{"X-Forwarded-Host": "grafana.org", "Origin": "https://grafana.org"}),
+			name: "grafana.org with X-Forwarded-Host",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:        postRequest(t, "grafana.localhost", map[string]string{"X-Forwarded-Host": "grafana.org", "Origin": "https://grafana.org"}, true),
 			expectedStatus: http.StatusForbidden,
 		},
 		{
-			name:       "grafana.org with X-Forwarded-Host and header trusted",
-			request:    postRequest(t, "grafana.localhost", map[string]string{"X-Forwarded-Host": "grafana.org", "Origin": "https://grafana.org"}),
+			name: "grafana.org with X-Forwarded-Host and header trusted",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:    postRequest(t, "grafana.localhost", map[string]string{"X-Forwarded-Host": "grafana.org", "Origin": "https://grafana.org"}, true),
 			addtHeader: map[string]struct{}{"X-Forwarded-Host": {}},
 			expectedOK: true,
 		},
 		{
-			name:           "grafana.org from grafana.com",
-			request:        postRequest(t, "grafana.org", map[string]string{"Origin": "https://grafana.com"}),
+			name: "grafana.org from grafana.com",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:        postRequest(t, "grafana.org", map[string]string{"Origin": "https://grafana.com"}, true),
 			expectedStatus: http.StatusForbidden,
 		},
 		{
-			name:           "grafana.org from grafana.com explicit trust for grafana.com",
-			request:        postRequest(t, "grafana.org", map[string]string{"Origin": "https://grafana.com"}),
+			name: "grafana.org from grafana.com explicit trust for grafana.com",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:        postRequest(t, "grafana.org", map[string]string{"Origin": "https://grafana.com"}, true),
 			trustedOrigins: map[string]struct{}{"grafana.com": {}},
 			expectedOK:     true,
 		},
 		{
-			name:           "grafana.org from grafana.com with X-Forwarded-Host and header trusted",
-			request:        postRequest(t, "grafana.localhost", map[string]string{"X-Forwarded-Host": "grafana.org", "Origin": "https://grafana.com"}),
+			name: "grafana.org from grafana.com with X-Forwarded-Host and header trusted",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:        postRequest(t, "grafana.localhost", map[string]string{"X-Forwarded-Host": "grafana.org", "Origin": "https://grafana.com"}, true),
 			addtHeader:     map[string]struct{}{"X-Forwarded-Host": {}},
 			trustedOrigins: map[string]struct{}{"grafana.com": {}},
 			expectedOK:     true,
 		},
 		{
-			name:          "safe endpoint",
-			request:       postRequest(t, "example.org/foo/bar", map[string]string{"Origin": "null"}),
+			name: "safe endpoint",
+			getCfg: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			request:       postRequest(t, "example.org/foo/bar", map[string]string{"Origin": "null"}, true),
 			safeEndpoints: map[string]struct{}{"foo/bar": {}},
 			expectedOK:    true,
 		},
+		{
+			name: "grafana.org with X-Forwarded-Host; will skip csrf check if login cookie is not present; without login cookie, should return nil because login cookie is not present",
+			getCfg: func() *setting.Cfg {
+				cfg := setting.NewCfg()
+				cfg.SectionWithEnvOverrides("security").Key("csrf_always_check").SetValue("false")
+				return cfg
+			},
+			request:    postRequest(t, "grafana.localhost", map[string]string{"X-Forwarded-Host": "grafana.org", "Origin": "https://grafana.org"}, false),
+			expectedOK: true,
+		},
+		{
+			name: "grafana.org with X-Forwarded-Host; will perform csrf check even if login cookie is not present, should return error because host name does not match origin",
+			getCfg: func() *setting.Cfg {
+				cfg := setting.NewCfg()
+				cfg.SectionWithEnvOverrides("security").Key("csrf_always_check").SetValue("true")
+				return cfg
+			},
+			request:        postRequest(t, "grafana.localhost", map[string]string{"X-Forwarded-Host": "grafana.org", "Origin": "https://grafana.org"}, false),
+			expectedStatus: http.StatusForbidden,
+		},
 	}
 
 	for _, tc := range tests {
 		tc := tc
 
 		t.Run(tc.name, func(t *testing.T) {
-			c := CSRF{
-				cfg:            setting.NewCfg(),
-				trustedOrigins: tc.trustedOrigins,
-				headers:        tc.addtHeader,
-				safeEndpoints:  tc.safeEndpoints,
-			}
-			c.cfg.LoginCookieName = "LoginCookie"
+			csrf := ProvideCSRFFilter(tc.getCfg())
+			csrf.trustedOrigins = tc.trustedOrigins
+			csrf.headers = tc.addtHeader
+			csrf.safeEndpoints = tc.safeEndpoints
+			csrf.cfg.LoginCookieName = "LoginCookie"
+
+			err := csrf.check(tc.request)
 
-			err := c.check(tc.request)
 			if tc.expectedOK {
 				require.NoError(t, err)
 			} else {
@@ -189,7 +236,7 @@ func TestCSRF_Check(t *testing.T) {
 	}
 }
 
-func postRequest(t testing.TB, hostname string, headers map[string]string) *http.Request {
+func postRequest(t testing.TB, hostname string, headers map[string]string, withLoginCookie bool) *http.Request {
 	t.Helper()
 	urlParts := strings.SplitN(hostname, "/", 2)
 
@@ -202,10 +249,12 @@ func postRequest(t testing.TB, hostname string, headers map[string]string) *http
 
 	r.Host = urlParts[0]
 
-	r.AddCookie(&http.Cookie{
-		Name:  "LoginCookie",
-		Value: "this should not be important",
-	})
+	if withLoginCookie {
+		r.AddCookie(&http.Cookie{
+			Name:  "LoginCookie",
+			Value: "this should not be important",
+		})
+	}
 
 	for k, v := range headers {
 		r.Header.Set(k, v)
@@ -240,3 +289,43 @@ func csrfScenario(t *testing.T, cookieName, method, origin, host string) *httpte
 	handler.ServeHTTP(rr, req)
 	return rr
 }
+
+func TestProvideCSRFFilter(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		getInput            func() *setting.Cfg
+		expectedAlwaysCheck bool
+	}{
+		{
+			getInput: func() *setting.Cfg {
+				return setting.NewCfg()
+			},
+			// Should default to false when config value is not set.
+			expectedAlwaysCheck: false,
+		},
+		{
+			getInput: func() *setting.Cfg {
+				cfg := setting.NewCfg()
+				cfg.SectionWithEnvOverrides("security").Key("csrf_always_check").SetValue("false")
+				return cfg
+			},
+			// Should be false when config value is set to false.
+			expectedAlwaysCheck: false,
+		},
+		{
+			getInput: func() *setting.Cfg {
+				cfg := setting.NewCfg()
+				cfg.SectionWithEnvOverrides("security").Key("csrf_always_check").SetValue("true")
+				return cfg
+			},
+			// Should be true when config value is set to true.
+			expectedAlwaysCheck: true,
+		},
+	}
+
+	for _, tc := range tests {
+		csrf := ProvideCSRFFilter(tc.getInput())
+		assert.Equal(t, tc.expectedAlwaysCheck, csrf.alwaysCheck)
+	}
+}
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 8882bb443e6..4f3a7b625f8 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -312,6 +312,7 @@ var wireBasicSet = wire.NewSet(
 	cuectx.GrafanaCUEContext,
 	cuectx.GrafanaThemaRuntime,
 	csrf.ProvideCSRFFilter,
+	wire.Bind(new(csrf.Service), new(*csrf.CSRF)),
 	ossaccesscontrol.ProvideTeamPermissions,
 	wire.Bind(new(accesscontrol.TeamPermissionsService), new(*ossaccesscontrol.TeamPermissionsService)),
 	ossaccesscontrol.ProvideFolderPermissions,

From 990b3c07ab4e8db651616c84fbef67132dfeb9f1 Mon Sep 17 00:00:00 2001
From: Andre Pereira <adrapereira@gmail.com>
Date: Mon, 24 Apr 2023 14:11:28 +0100
Subject: [PATCH 352/729] Tempo: Add kind to TraceQL intrinsics (#65111)

* Add kind to TraceQL intrinsics

* Fix after merging main

* Fix intrinsics array reference after merge

* Dispatch error message when TraceQL autocomplete fails to retrieve tag values
---
 .../SearchTraceQLEditor/TraceQLSearch.tsx     |  5 ++--
 .../tempo/SearchTraceQLEditor/utils.ts        |  4 +--
 .../tempo/configuration/TraceQLSearchTags.tsx |  4 +--
 .../tempo/traceql/autocomplete.test.ts        |  9 +++---
 .../datasource/tempo/traceql/autocomplete.ts  | 29 ++++++++++++++-----
 .../datasource/tempo/traceql/traceql.ts       |  4 +--
 6 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx
index dfe9e398dbe..9148c90fcd2 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx
@@ -13,8 +13,7 @@ import { RawQuery } from '../../prometheus/querybuilder/shared/RawQuery';
 import { TraceqlFilter } from '../dataquery.gen';
 import { TempoDatasource } from '../datasource';
 import { TempoQueryBuilderOptions } from '../traceql/TempoQueryBuilderOptions';
-import { CompletionProvider } from '../traceql/autocomplete';
-import { traceqlGrammar } from '../traceql/traceql';
+import { intrinsics, traceqlGrammar } from '../traceql/traceql';
 import { TempoQuery } from '../types';
 
 import DurationInput from './DurationInput';
@@ -102,7 +101,7 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
   // filter out tags that already exist in the static fields
   const staticTags = datasource.search?.filters?.map((f) => f.tag) || [];
   staticTags.push('duration');
-  const filteredTags = [...CompletionProvider.intrinsics, ...tags].filter((t) => !staticTags.includes(t));
+  const filteredTags = [...intrinsics, ...tags].filter((t) => !staticTags.includes(t));
 
   // Dynamic filters are all filters that don't match the ID of a filter in the datasource configuration
   // The duration tag is a special case since its selector is hard-coded
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
index a49bbd94519..088018a68f3 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
@@ -3,7 +3,7 @@ import { startCase } from 'lodash';
 import { SelectableValue } from '@grafana/data';
 
 import { TraceqlFilter, TraceqlSearchScope } from '../dataquery.gen';
-import { CompletionProvider } from '../traceql/autocomplete';
+import { intrinsics } from '../traceql/traceql';
 
 export const generateQueryFromFilters = (filters: TraceqlFilter[]) => {
   return `{${filters
@@ -23,7 +23,7 @@ const valueHelper = (f: TraceqlFilter) => {
 };
 const scopeHelper = (f: TraceqlFilter) => {
   // Intrinsic fields don't have a scope
-  if (CompletionProvider.intrinsics.find((t) => t === f.tag)) {
+  if (intrinsics.find((t) => t === f.tag)) {
     return '';
   }
   return (
diff --git a/public/app/plugins/datasource/tempo/configuration/TraceQLSearchTags.tsx b/public/app/plugins/datasource/tempo/configuration/TraceQLSearchTags.tsx
index b90e61a2783..30ffaa7198f 100644
--- a/public/app/plugins/datasource/tempo/configuration/TraceQLSearchTags.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/TraceQLSearchTags.tsx
@@ -8,7 +8,7 @@ import TagsInput from '../SearchTraceQLEditor/TagsInput';
 import { replaceAt } from '../SearchTraceQLEditor/utils';
 import { TraceqlFilter, TraceqlSearchScope } from '../dataquery.gen';
 import { TempoDatasource } from '../datasource';
-import { CompletionProvider } from '../traceql/autocomplete';
+import { intrinsics } from '../traceql/traceql';
 import { TempoJsonData } from '../types';
 
 interface Props extends DataSourcePluginOptionsEditorProps<TempoJsonData> {
@@ -94,7 +94,7 @@ export function TraceQLSearchTags({ options, onOptionsChange, datasource }: Prop
           filters={options.jsonData.search?.filters || []}
           datasource={datasource}
           setError={() => {}}
-          tags={[...CompletionProvider.intrinsics, ...(tags || [])]}
+          tags={[...intrinsics, ...(tags || [])]}
           isTagsLoading={loading}
           hideValues={true}
         />
diff --git a/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts b/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
index 1533b21cb76..9524505d16b 100644
--- a/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
+++ b/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
@@ -6,6 +6,7 @@ import TempoLanguageProvider from '../language_provider';
 import { TempoJsonData } from '../types';
 
 import { CompletionProvider } from './autocomplete';
+import { intrinsics, scopes } from './traceql';
 
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
@@ -19,8 +20,8 @@ describe('CompletionProvider', () => {
       {} as monacoTypes.Position
     );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
-      ...CompletionProvider.scopes.map((s) => expect.objectContaining({ label: s, insertText: s })),
-      ...CompletionProvider.intrinsics.map((s) => expect.objectContaining({ label: s, insertText: s })),
+      ...scopes.map((s) => expect.objectContaining({ label: s, insertText: s })),
+      ...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: s })),
       expect.objectContaining({ label: 'bar', insertText: '.bar' }),
       expect.objectContaining({ label: 'foo', insertText: '.foo' }),
     ]);
@@ -116,8 +117,8 @@ describe('CompletionProvider', () => {
       {} as monacoTypes.Position
     );
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
-      ...CompletionProvider.scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
-      ...CompletionProvider.intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
+      ...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
+      ...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
       expect.objectContaining({ label: 'bar', insertText: '{ .bar' }),
       expect.objectContaining({ label: 'foo', insertText: '{ .foo' }),
     ]);
diff --git a/public/app/plugins/datasource/tempo/traceql/autocomplete.ts b/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
index dc0eab1c857..7aafd911edb 100644
--- a/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
+++ b/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
@@ -1,8 +1,14 @@
 import { SelectableValue } from '@grafana/data';
+import { isFetchError } from '@grafana/runtime';
 import type { Monaco, monacoTypes } from '@grafana/ui';
 
+import { createErrorNotification } from '../../../../core/copy/appNotification';
+import { notifyApp } from '../../../../core/reducers/appNotification';
+import { dispatch } from '../../../../store/store';
 import TempoLanguageProvider from '../language_provider';
 
+import { intrinsics, scopes } from './traceql';
+
 interface Props {
   languageProvider: TempoLanguageProvider;
 }
@@ -21,9 +27,6 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
   }
 
   triggerCharacters = ['{', '.', '[', '(', '=', '~', ' ', '"'];
-
-  static readonly intrinsics: string[] = ['duration', 'name', 'status'];
-  static readonly scopes: string[] = ['resource', 'span'];
   static readonly operators: string[] = ['=', '-', '+', '<', '>', '>=', '<=', '=~'];
   static readonly logicalOps: string[] = ['&&', '||'];
 
@@ -139,7 +142,17 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
           type: 'OPERATOR',
         }));
       case 'SPANSET_IN_VALUE':
-        const tagValues = await this.getTagValues(situation.tagName);
+        let tagValues;
+        try {
+          tagValues = await this.getTagValues(situation.tagName);
+        } catch (error) {
+          if (isFetchError(error)) {
+            dispatch(notifyApp(createErrorNotification(error.data.error, new Error(error.data.message))));
+          } else if (error instanceof Error) {
+            dispatch(notifyApp(createErrorNotification('Error', error)));
+          }
+        }
+
         const items: Completion[] = [];
 
         const getInsertionText = (val: SelectableValue<string>): string => {
@@ -149,7 +162,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
           return val.type === 'string' ? `"${val.label}"` : val.label!;
         };
 
-        tagValues.forEach((val) => {
+        tagValues?.forEach((val) => {
           if (val?.label) {
             items.push({
               label: val.label,
@@ -181,7 +194,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
   }
 
   private getIntrinsicsCompletions(prepend?: string): Completion[] {
-    return CompletionProvider.intrinsics.map((key) => ({
+    return intrinsics.map((key) => ({
       label: key,
       insertText: (prepend || '') + key,
       type: 'KEYWORD',
@@ -189,7 +202,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
   }
 
   private getScopesCompletions(prepend?: string): Completion[] {
-    return CompletionProvider.scopes.map((key) => ({
+    return scopes.map((key) => ({
       label: key,
       insertText: (prepend || '') + key,
       type: 'SCOPE',
@@ -242,7 +255,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
       if (!op) {
         // There's no operator so we check if the name is one of the known scopes
         // { resource.|
-        if (CompletionProvider.scopes.filter((w) => w === nameMatched?.groups?.word) && nameMatched?.groups?.post_dot) {
+        if (scopes.filter((w) => w === nameMatched?.groups?.word) && nameMatched?.groups?.post_dot) {
           return {
             type: 'SPANSET_IN_NAME_SCOPE',
           };
diff --git a/public/app/plugins/datasource/tempo/traceql/traceql.ts b/public/app/plugins/datasource/tempo/traceql/traceql.ts
index 1ace5ecb793..74a89a56abd 100644
--- a/public/app/plugins/datasource/tempo/traceql/traceql.ts
+++ b/public/app/plugins/datasource/tempo/traceql/traceql.ts
@@ -26,9 +26,9 @@ export const operators = ['=', '!=', '>', '<', '>=', '<=', '=~'];
 export const stringOperators = ['=', '!=', '=~'];
 export const numberOperators = ['=', '!=', '>', '<', '>=', '<='];
 
-const intrinsics = ['duration', 'name', 'status', 'parent'];
+export const intrinsics = ['duration', 'kind', 'name', 'status'];
 
-const scopes: string[] = ['resource', 'span'];
+export const scopes: string[] = ['resource', 'span'];
 
 const keywords = intrinsics.concat(scopes);
 

From fd434cab58b98f35225b0a77f255e8f07d56e206 Mon Sep 17 00:00:00 2001
From: Arati R <33031346+suntala@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:57:28 +0200
Subject: [PATCH 353/729] NestedFolders: Add API endpoint for descendant count
 in a folder (#66550)

* Add CountInFolder to RegistryService interface
* Add folder children counts api route
* Update fake GetFolderChildrenCounts
* Add test for getting folder children counts
* Add validation to folder children counts handler
* Update openapi specs
* Update pkg/services/folder/folderimpl/folder.go
Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>

---------

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
---
 pkg/api/api.go                                |   1 +
 pkg/api/folder.go                             |  34 +
 pkg/services/dashboards/dashboard.go          |   3 +-
 .../dashboards/dashboard_service_mock.go      | 594 +++++++++++++++++-
 .../dashboards/service/dashboard_service.go   |  12 +-
 .../service/dashboard_service_test.go         |   2 +-
 pkg/services/folder/folderimpl/folder.go      |  22 +
 pkg/services/folder/folderimpl/folder_test.go |  61 ++
 pkg/services/folder/foldertest/foldertest.go  |  11 +-
 pkg/services/folder/model.go                  |  11 +
 pkg/services/folder/registry.go               |   5 +-
 pkg/services/folder/service.go                |   1 +
 public/api-merged.json                        |  47 ++
 public/openapi3.json                          |  53 ++
 14 files changed, 821 insertions(+), 36 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 0455e0a3537..c19239757b6 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -458,6 +458,7 @@ func (hs *HTTPServer) registerRoutes() {
 				folderUidRoute.Put("/", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersWrite, uidScope)), routing.Wrap(hs.UpdateFolder))
 				folderUidRoute.Post("/move", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersWrite, uidScope)), routing.Wrap(hs.MoveFolder))
 				folderUidRoute.Delete("/", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersDelete, uidScope)), routing.Wrap(hs.DeleteFolder))
+				folderUidRoute.Get("/counts", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersRead, uidScope)), routing.Wrap(hs.GetFolderChildrenCounts))
 
 				folderUidRoute.Group("/permissions", func(folderPermissionRoute routing.RouteRegister) {
 					folderPermissionRoute.Get("/", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersPermissionsRead, uidScope)), routing.Wrap(hs.GetFolderPermissionList))
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index e856cc26c9d..0f7e8db7261 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -294,6 +294,26 @@ func (hs *HTTPServer) DeleteFolder(c *contextmodel.ReqContext) response.Response
 	return response.JSON(http.StatusOK, "")
 }
 
+// swagger:route GET /folders/{folder_uid}/counts folders getFolderChildrenCounts
+//
+// Gets the count of each descendant of a folder by kind. The folder is identified by UID.
+//
+// Responses:
+// 200: getFolderChildrenCountsResponse
+// 401: unauthorisedError
+// 403: forbiddenError
+// 404: notFoundError
+// 500: internalServerError
+func (hs *HTTPServer) GetFolderChildrenCounts(c *contextmodel.ReqContext) response.Response {
+	uid := web.Params(c.Req)[":uid"]
+	counts, err := hs.folderService.GetChildrenCounts(c.Req.Context(), &folder.GetChildrenCountsQuery{OrgID: c.OrgID, UID: &uid, SignedInUser: c.SignedInUser})
+	if err != nil {
+		return apierrors.ToFolderErrorResponse(err)
+	}
+
+	return response.JSON(http.StatusOK, counts)
+}
+
 func (hs *HTTPServer) newToFolderDto(c *contextmodel.ReqContext, g guardian.DashboardGuardian, folder *folder.Folder) dtos.Folder {
 	canEdit, _ := g.CanEdit()
 	canSave, _ := g.CanSave()
@@ -499,3 +519,17 @@ type DeleteFolderResponse struct {
 		Message string `json:"message"`
 	} `json:"body"`
 }
+
+// swagger:parameters getFolderChildrenCounts
+type GetFolderChildrenCountsParams struct {
+	// in:path
+	// required:true
+	FolderUID string `json:"folder_uid"`
+}
+
+// swagger:response getFolderChildrenCountsResponse
+type GetFolderChildrenCountsResponse struct {
+	// The response message
+	// in: body
+	Body folder.ChildrenCounts `json:"body"`
+}
diff --git a/pkg/services/dashboards/dashboard.go b/pkg/services/dashboards/dashboard.go
index 5cab7bb3170..54eccd29b18 100644
--- a/pkg/services/dashboards/dashboard.go
+++ b/pkg/services/dashboards/dashboard.go
@@ -7,6 +7,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/search/model"
+	"github.com/grafana/grafana/pkg/services/user"
 )
 
 // DashboardService is a service for operating on dashboards.
@@ -29,7 +30,7 @@ type DashboardService interface {
 	SearchDashboards(ctx context.Context, query *FindPersistedDashboardsQuery) (model.HitList, error)
 	UpdateDashboardACL(ctx context.Context, uid int64, items []*DashboardACL) error
 	DeleteACLByUser(ctx context.Context, userID int64) error
-	CountDashboardsInFolder(ctx context.Context, query *CountDashboardsInFolderQuery) (int64, error)
+	CountInFolder(ctx context.Context, orgID int64, uid string, user *user.SignedInUser) (int64, error)
 }
 
 // PluginService is a service for operating on plugin dashboards.
diff --git a/pkg/services/dashboards/dashboard_service_mock.go b/pkg/services/dashboards/dashboard_service_mock.go
index 0c374caa14a..e8884177e9a 100644
--- a/pkg/services/dashboards/dashboard_service_mock.go
+++ b/pkg/services/dashboards/dashboard_service_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.16.0. DO NOT EDIT.
+// Code generated by mockery v2.23.2. DO NOT EDIT.
 
 package dashboards
 
@@ -9,6 +9,8 @@ import (
 	mock "github.com/stretchr/testify/mock"
 
 	model "github.com/grafana/grafana/pkg/services/search/model"
+
+	user "github.com/grafana/grafana/pkg/services/user"
 )
 
 // FakeDashboardService is an autogenerated mock type for the DashboardService type
@@ -16,11 +18,23 @@ type FakeDashboardService struct {
 	mock.Mock
 }
 
+type FakeDashboardService_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *FakeDashboardService) EXPECT() *FakeDashboardService_Expecter {
+	return &FakeDashboardService_Expecter{mock: &_m.Mock}
+}
+
 // BuildSaveDashboardCommand provides a mock function with given fields: ctx, dto, shouldValidateAlerts, validateProvisionedDashboard
 func (_m *FakeDashboardService) BuildSaveDashboardCommand(ctx context.Context, dto *SaveDashboardDTO, shouldValidateAlerts bool, validateProvisionedDashboard bool) (*SaveDashboardCommand, error) {
 	ret := _m.Called(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
 
 	var r0 *SaveDashboardCommand
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO, bool, bool) (*SaveDashboardCommand, error)); ok {
+		return rf(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO, bool, bool) *SaveDashboardCommand); ok {
 		r0 = rf(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
 	} else {
@@ -29,7 +43,6 @@ func (_m *FakeDashboardService) BuildSaveDashboardCommand(ctx context.Context, d
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *SaveDashboardDTO, bool, bool) error); ok {
 		r1 = rf(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
 	} else {
@@ -39,20 +52,54 @@ func (_m *FakeDashboardService) BuildSaveDashboardCommand(ctx context.Context, d
 	return r0, r1
 }
 
-// CountDashboardsInFolder provides a mock function with given fields: ctx, query
-func (_m *FakeDashboardService) CountDashboardsInFolder(ctx context.Context, query *CountDashboardsInFolderQuery) (int64, error) {
-	ret := _m.Called(ctx, query)
+// FakeDashboardService_BuildSaveDashboardCommand_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'BuildSaveDashboardCommand'
+type FakeDashboardService_BuildSaveDashboardCommand_Call struct {
+	*mock.Call
+}
+
+// BuildSaveDashboardCommand is a helper method to define mock.On call
+//   - ctx context.Context
+//   - dto *SaveDashboardDTO
+//   - shouldValidateAlerts bool
+//   - validateProvisionedDashboard bool
+func (_e *FakeDashboardService_Expecter) BuildSaveDashboardCommand(ctx interface{}, dto interface{}, shouldValidateAlerts interface{}, validateProvisionedDashboard interface{}) *FakeDashboardService_BuildSaveDashboardCommand_Call {
+	return &FakeDashboardService_BuildSaveDashboardCommand_Call{Call: _e.mock.On("BuildSaveDashboardCommand", ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)}
+}
+
+func (_c *FakeDashboardService_BuildSaveDashboardCommand_Call) Run(run func(ctx context.Context, dto *SaveDashboardDTO, shouldValidateAlerts bool, validateProvisionedDashboard bool)) *FakeDashboardService_BuildSaveDashboardCommand_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*SaveDashboardDTO), args[2].(bool), args[3].(bool))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_BuildSaveDashboardCommand_Call) Return(_a0 *SaveDashboardCommand, _a1 error) *FakeDashboardService_BuildSaveDashboardCommand_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_BuildSaveDashboardCommand_Call) RunAndReturn(run func(context.Context, *SaveDashboardDTO, bool, bool) (*SaveDashboardCommand, error)) *FakeDashboardService_BuildSaveDashboardCommand_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CountInFolder provides a mock function with given fields: ctx, orgID, uid, _a3
+func (_m *FakeDashboardService) CountInFolder(ctx context.Context, orgID int64, uid string, _a3 *user.SignedInUser) (int64, error) {
+	ret := _m.Called(ctx, orgID, uid, _a3)
 
 	var r0 int64
-	if rf, ok := ret.Get(0).(func(context.Context, *CountDashboardsInFolderQuery) int64); ok {
-		r0 = rf(ctx, query)
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string, *user.SignedInUser) (int64, error)); ok {
+		return rf(ctx, orgID, uid, _a3)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string, *user.SignedInUser) int64); ok {
+		r0 = rf(ctx, orgID, uid, _a3)
 	} else {
 		r0 = ret.Get(0).(int64)
 	}
 
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *CountDashboardsInFolderQuery) error); ok {
-		r1 = rf(ctx, query)
+	if rf, ok := ret.Get(1).(func(context.Context, int64, string, *user.SignedInUser) error); ok {
+		r1 = rf(ctx, orgID, uid, _a3)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -60,6 +107,37 @@ func (_m *FakeDashboardService) CountDashboardsInFolder(ctx context.Context, que
 	return r0, r1
 }
 
+// FakeDashboardService_CountInFolder_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CountInFolder'
+type FakeDashboardService_CountInFolder_Call struct {
+	*mock.Call
+}
+
+// CountInFolder is a helper method to define mock.On call
+//   - ctx context.Context
+//   - orgID int64
+//   - uid string
+//   - _a3 *user.SignedInUser
+func (_e *FakeDashboardService_Expecter) CountInFolder(ctx interface{}, orgID interface{}, uid interface{}, _a3 interface{}) *FakeDashboardService_CountInFolder_Call {
+	return &FakeDashboardService_CountInFolder_Call{Call: _e.mock.On("CountInFolder", ctx, orgID, uid, _a3)}
+}
+
+func (_c *FakeDashboardService_CountInFolder_Call) Run(run func(ctx context.Context, orgID int64, uid string, _a3 *user.SignedInUser)) *FakeDashboardService_CountInFolder_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64), args[2].(string), args[3].(*user.SignedInUser))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_CountInFolder_Call) Return(_a0 int64, _a1 error) *FakeDashboardService_CountInFolder_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_CountInFolder_Call) RunAndReturn(run func(context.Context, int64, string, *user.SignedInUser) (int64, error)) *FakeDashboardService_CountInFolder_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // DeleteACLByUser provides a mock function with given fields: ctx, userID
 func (_m *FakeDashboardService) DeleteACLByUser(ctx context.Context, userID int64) error {
 	ret := _m.Called(ctx, userID)
@@ -74,6 +152,35 @@ func (_m *FakeDashboardService) DeleteACLByUser(ctx context.Context, userID int6
 	return r0
 }
 
+// FakeDashboardService_DeleteACLByUser_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteACLByUser'
+type FakeDashboardService_DeleteACLByUser_Call struct {
+	*mock.Call
+}
+
+// DeleteACLByUser is a helper method to define mock.On call
+//   - ctx context.Context
+//   - userID int64
+func (_e *FakeDashboardService_Expecter) DeleteACLByUser(ctx interface{}, userID interface{}) *FakeDashboardService_DeleteACLByUser_Call {
+	return &FakeDashboardService_DeleteACLByUser_Call{Call: _e.mock.On("DeleteACLByUser", ctx, userID)}
+}
+
+func (_c *FakeDashboardService_DeleteACLByUser_Call) Run(run func(ctx context.Context, userID int64)) *FakeDashboardService_DeleteACLByUser_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_DeleteACLByUser_Call) Return(_a0 error) *FakeDashboardService_DeleteACLByUser_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardService_DeleteACLByUser_Call) RunAndReturn(run func(context.Context, int64) error) *FakeDashboardService_DeleteACLByUser_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // DeleteDashboard provides a mock function with given fields: ctx, dashboardId, orgId
 func (_m *FakeDashboardService) DeleteDashboard(ctx context.Context, dashboardId int64, orgId int64) error {
 	ret := _m.Called(ctx, dashboardId, orgId)
@@ -88,11 +195,45 @@ func (_m *FakeDashboardService) DeleteDashboard(ctx context.Context, dashboardId
 	return r0
 }
 
+// FakeDashboardService_DeleteDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteDashboard'
+type FakeDashboardService_DeleteDashboard_Call struct {
+	*mock.Call
+}
+
+// DeleteDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - dashboardId int64
+//   - orgId int64
+func (_e *FakeDashboardService_Expecter) DeleteDashboard(ctx interface{}, dashboardId interface{}, orgId interface{}) *FakeDashboardService_DeleteDashboard_Call {
+	return &FakeDashboardService_DeleteDashboard_Call{Call: _e.mock.On("DeleteDashboard", ctx, dashboardId, orgId)}
+}
+
+func (_c *FakeDashboardService_DeleteDashboard_Call) Run(run func(ctx context.Context, dashboardId int64, orgId int64)) *FakeDashboardService_DeleteDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64), args[2].(int64))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_DeleteDashboard_Call) Return(_a0 error) *FakeDashboardService_DeleteDashboard_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardService_DeleteDashboard_Call) RunAndReturn(run func(context.Context, int64, int64) error) *FakeDashboardService_DeleteDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // FindDashboards provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) FindDashboards(ctx context.Context, query *FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []DashboardSearchProjection
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *FindPersistedDashboardsQuery) []DashboardSearchProjection); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -101,7 +242,6 @@ func (_m *FakeDashboardService) FindDashboards(ctx context.Context, query *FindP
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *FindPersistedDashboardsQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -111,11 +251,44 @@ func (_m *FakeDashboardService) FindDashboards(ctx context.Context, query *FindP
 	return r0, r1
 }
 
+// FakeDashboardService_FindDashboards_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FindDashboards'
+type FakeDashboardService_FindDashboards_Call struct {
+	*mock.Call
+}
+
+// FindDashboards is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *FindPersistedDashboardsQuery
+func (_e *FakeDashboardService_Expecter) FindDashboards(ctx interface{}, query interface{}) *FakeDashboardService_FindDashboards_Call {
+	return &FakeDashboardService_FindDashboards_Call{Call: _e.mock.On("FindDashboards", ctx, query)}
+}
+
+func (_c *FakeDashboardService_FindDashboards_Call) Run(run func(ctx context.Context, query *FindPersistedDashboardsQuery)) *FakeDashboardService_FindDashboards_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*FindPersistedDashboardsQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_FindDashboards_Call) Return(_a0 []DashboardSearchProjection, _a1 error) *FakeDashboardService_FindDashboards_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_FindDashboards_Call) RunAndReturn(run func(context.Context, *FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error)) *FakeDashboardService_FindDashboards_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboard provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) GetDashboard(ctx context.Context, query *GetDashboardQuery) (*Dashboard, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 *Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardQuery) (*Dashboard, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardQuery) *Dashboard); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -124,7 +297,6 @@ func (_m *FakeDashboardService) GetDashboard(ctx context.Context, query *GetDash
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -134,11 +306,44 @@ func (_m *FakeDashboardService) GetDashboard(ctx context.Context, query *GetDash
 	return r0, r1
 }
 
+// FakeDashboardService_GetDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboard'
+type FakeDashboardService_GetDashboard_Call struct {
+	*mock.Call
+}
+
+// GetDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardQuery
+func (_e *FakeDashboardService_Expecter) GetDashboard(ctx interface{}, query interface{}) *FakeDashboardService_GetDashboard_Call {
+	return &FakeDashboardService_GetDashboard_Call{Call: _e.mock.On("GetDashboard", ctx, query)}
+}
+
+func (_c *FakeDashboardService_GetDashboard_Call) Run(run func(ctx context.Context, query *GetDashboardQuery)) *FakeDashboardService_GetDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboard_Call) Return(_a0 *Dashboard, _a1 error) *FakeDashboardService_GetDashboard_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboard_Call) RunAndReturn(run func(context.Context, *GetDashboardQuery) (*Dashboard, error)) *FakeDashboardService_GetDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboardACLInfoList provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) GetDashboardACLInfoList(ctx context.Context, query *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []*DashboardACLInfoDTO
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardACLInfoListQuery) []*DashboardACLInfoDTO); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -147,7 +352,6 @@ func (_m *FakeDashboardService) GetDashboardACLInfoList(ctx context.Context, que
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardACLInfoListQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -157,11 +361,44 @@ func (_m *FakeDashboardService) GetDashboardACLInfoList(ctx context.Context, que
 	return r0, r1
 }
 
+// FakeDashboardService_GetDashboardACLInfoList_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboardACLInfoList'
+type FakeDashboardService_GetDashboardACLInfoList_Call struct {
+	*mock.Call
+}
+
+// GetDashboardACLInfoList is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardACLInfoListQuery
+func (_e *FakeDashboardService_Expecter) GetDashboardACLInfoList(ctx interface{}, query interface{}) *FakeDashboardService_GetDashboardACLInfoList_Call {
+	return &FakeDashboardService_GetDashboardACLInfoList_Call{Call: _e.mock.On("GetDashboardACLInfoList", ctx, query)}
+}
+
+func (_c *FakeDashboardService_GetDashboardACLInfoList_Call) Run(run func(ctx context.Context, query *GetDashboardACLInfoListQuery)) *FakeDashboardService_GetDashboardACLInfoList_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardACLInfoListQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboardACLInfoList_Call) Return(_a0 []*DashboardACLInfoDTO, _a1 error) *FakeDashboardService_GetDashboardACLInfoList_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboardACLInfoList_Call) RunAndReturn(run func(context.Context, *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error)) *FakeDashboardService_GetDashboardACLInfoList_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboardTags provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) GetDashboardTags(ctx context.Context, query *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []*DashboardTagCloudItem
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardTagsQuery) []*DashboardTagCloudItem); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -170,7 +407,6 @@ func (_m *FakeDashboardService) GetDashboardTags(ctx context.Context, query *Get
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardTagsQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -180,11 +416,44 @@ func (_m *FakeDashboardService) GetDashboardTags(ctx context.Context, query *Get
 	return r0, r1
 }
 
+// FakeDashboardService_GetDashboardTags_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboardTags'
+type FakeDashboardService_GetDashboardTags_Call struct {
+	*mock.Call
+}
+
+// GetDashboardTags is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardTagsQuery
+func (_e *FakeDashboardService_Expecter) GetDashboardTags(ctx interface{}, query interface{}) *FakeDashboardService_GetDashboardTags_Call {
+	return &FakeDashboardService_GetDashboardTags_Call{Call: _e.mock.On("GetDashboardTags", ctx, query)}
+}
+
+func (_c *FakeDashboardService_GetDashboardTags_Call) Run(run func(ctx context.Context, query *GetDashboardTagsQuery)) *FakeDashboardService_GetDashboardTags_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardTagsQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboardTags_Call) Return(_a0 []*DashboardTagCloudItem, _a1 error) *FakeDashboardService_GetDashboardTags_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboardTags_Call) RunAndReturn(run func(context.Context, *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error)) *FakeDashboardService_GetDashboardTags_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboardUIDByID provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) GetDashboardUIDByID(ctx context.Context, query *GetDashboardRefByIDQuery) (*DashboardRef, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 *DashboardRef
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardRefByIDQuery) (*DashboardRef, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardRefByIDQuery) *DashboardRef); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -193,7 +462,6 @@ func (_m *FakeDashboardService) GetDashboardUIDByID(ctx context.Context, query *
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardRefByIDQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -203,11 +471,44 @@ func (_m *FakeDashboardService) GetDashboardUIDByID(ctx context.Context, query *
 	return r0, r1
 }
 
+// FakeDashboardService_GetDashboardUIDByID_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboardUIDByID'
+type FakeDashboardService_GetDashboardUIDByID_Call struct {
+	*mock.Call
+}
+
+// GetDashboardUIDByID is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardRefByIDQuery
+func (_e *FakeDashboardService_Expecter) GetDashboardUIDByID(ctx interface{}, query interface{}) *FakeDashboardService_GetDashboardUIDByID_Call {
+	return &FakeDashboardService_GetDashboardUIDByID_Call{Call: _e.mock.On("GetDashboardUIDByID", ctx, query)}
+}
+
+func (_c *FakeDashboardService_GetDashboardUIDByID_Call) Run(run func(ctx context.Context, query *GetDashboardRefByIDQuery)) *FakeDashboardService_GetDashboardUIDByID_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardRefByIDQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboardUIDByID_Call) Return(_a0 *DashboardRef, _a1 error) *FakeDashboardService_GetDashboardUIDByID_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboardUIDByID_Call) RunAndReturn(run func(context.Context, *GetDashboardRefByIDQuery) (*DashboardRef, error)) *FakeDashboardService_GetDashboardUIDByID_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetDashboards provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) GetDashboards(ctx context.Context, query *GetDashboardsQuery) ([]*Dashboard, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 []*Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardsQuery) ([]*Dashboard, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardsQuery) []*Dashboard); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -216,7 +517,6 @@ func (_m *FakeDashboardService) GetDashboards(ctx context.Context, query *GetDas
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardsQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -226,18 +526,50 @@ func (_m *FakeDashboardService) GetDashboards(ctx context.Context, query *GetDas
 	return r0, r1
 }
 
+// FakeDashboardService_GetDashboards_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDashboards'
+type FakeDashboardService_GetDashboards_Call struct {
+	*mock.Call
+}
+
+// GetDashboards is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *GetDashboardsQuery
+func (_e *FakeDashboardService_Expecter) GetDashboards(ctx interface{}, query interface{}) *FakeDashboardService_GetDashboards_Call {
+	return &FakeDashboardService_GetDashboards_Call{Call: _e.mock.On("GetDashboards", ctx, query)}
+}
+
+func (_c *FakeDashboardService_GetDashboards_Call) Run(run func(ctx context.Context, query *GetDashboardsQuery)) *FakeDashboardService_GetDashboards_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*GetDashboardsQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboards_Call) Return(_a0 []*Dashboard, _a1 error) *FakeDashboardService_GetDashboards_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_GetDashboards_Call) RunAndReturn(run func(context.Context, *GetDashboardsQuery) ([]*Dashboard, error)) *FakeDashboardService_GetDashboards_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // HasAdminPermissionInDashboardsOrFolders provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *folder.HasAdminPermissionInDashboardsOrFoldersQuery) (bool, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *folder.HasAdminPermissionInDashboardsOrFoldersQuery) (bool, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *folder.HasAdminPermissionInDashboardsOrFoldersQuery) bool); ok {
 		r0 = rf(ctx, query)
 	} else {
 		r0 = ret.Get(0).(bool)
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *folder.HasAdminPermissionInDashboardsOrFoldersQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -247,18 +579,50 @@ func (_m *FakeDashboardService) HasAdminPermissionInDashboardsOrFolders(ctx cont
 	return r0, r1
 }
 
+// FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'HasAdminPermissionInDashboardsOrFolders'
+type FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call struct {
+	*mock.Call
+}
+
+// HasAdminPermissionInDashboardsOrFolders is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *folder.HasAdminPermissionInDashboardsOrFoldersQuery
+func (_e *FakeDashboardService_Expecter) HasAdminPermissionInDashboardsOrFolders(ctx interface{}, query interface{}) *FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call {
+	return &FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call{Call: _e.mock.On("HasAdminPermissionInDashboardsOrFolders", ctx, query)}
+}
+
+func (_c *FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call) Run(run func(ctx context.Context, query *folder.HasAdminPermissionInDashboardsOrFoldersQuery)) *FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*folder.HasAdminPermissionInDashboardsOrFoldersQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call) Return(_a0 bool, _a1 error) *FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call) RunAndReturn(run func(context.Context, *folder.HasAdminPermissionInDashboardsOrFoldersQuery) (bool, error)) *FakeDashboardService_HasAdminPermissionInDashboardsOrFolders_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // HasEditPermissionInFolders provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) HasEditPermissionInFolders(ctx context.Context, query *folder.HasEditPermissionInFoldersQuery) (bool, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *folder.HasEditPermissionInFoldersQuery) (bool, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *folder.HasEditPermissionInFoldersQuery) bool); ok {
 		r0 = rf(ctx, query)
 	} else {
 		r0 = ret.Get(0).(bool)
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *folder.HasEditPermissionInFoldersQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -268,11 +632,44 @@ func (_m *FakeDashboardService) HasEditPermissionInFolders(ctx context.Context,
 	return r0, r1
 }
 
+// FakeDashboardService_HasEditPermissionInFolders_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'HasEditPermissionInFolders'
+type FakeDashboardService_HasEditPermissionInFolders_Call struct {
+	*mock.Call
+}
+
+// HasEditPermissionInFolders is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *folder.HasEditPermissionInFoldersQuery
+func (_e *FakeDashboardService_Expecter) HasEditPermissionInFolders(ctx interface{}, query interface{}) *FakeDashboardService_HasEditPermissionInFolders_Call {
+	return &FakeDashboardService_HasEditPermissionInFolders_Call{Call: _e.mock.On("HasEditPermissionInFolders", ctx, query)}
+}
+
+func (_c *FakeDashboardService_HasEditPermissionInFolders_Call) Run(run func(ctx context.Context, query *folder.HasEditPermissionInFoldersQuery)) *FakeDashboardService_HasEditPermissionInFolders_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*folder.HasEditPermissionInFoldersQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_HasEditPermissionInFolders_Call) Return(_a0 bool, _a1 error) *FakeDashboardService_HasEditPermissionInFolders_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_HasEditPermissionInFolders_Call) RunAndReturn(run func(context.Context, *folder.HasEditPermissionInFoldersQuery) (bool, error)) *FakeDashboardService_HasEditPermissionInFolders_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // ImportDashboard provides a mock function with given fields: ctx, dto
 func (_m *FakeDashboardService) ImportDashboard(ctx context.Context, dto *SaveDashboardDTO) (*Dashboard, error) {
 	ret := _m.Called(ctx, dto)
 
 	var r0 *Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO) (*Dashboard, error)); ok {
+		return rf(ctx, dto)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO) *Dashboard); ok {
 		r0 = rf(ctx, dto)
 	} else {
@@ -281,7 +678,6 @@ func (_m *FakeDashboardService) ImportDashboard(ctx context.Context, dto *SaveDa
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *SaveDashboardDTO) error); ok {
 		r1 = rf(ctx, dto)
 	} else {
@@ -291,6 +687,35 @@ func (_m *FakeDashboardService) ImportDashboard(ctx context.Context, dto *SaveDa
 	return r0, r1
 }
 
+// FakeDashboardService_ImportDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ImportDashboard'
+type FakeDashboardService_ImportDashboard_Call struct {
+	*mock.Call
+}
+
+// ImportDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - dto *SaveDashboardDTO
+func (_e *FakeDashboardService_Expecter) ImportDashboard(ctx interface{}, dto interface{}) *FakeDashboardService_ImportDashboard_Call {
+	return &FakeDashboardService_ImportDashboard_Call{Call: _e.mock.On("ImportDashboard", ctx, dto)}
+}
+
+func (_c *FakeDashboardService_ImportDashboard_Call) Run(run func(ctx context.Context, dto *SaveDashboardDTO)) *FakeDashboardService_ImportDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*SaveDashboardDTO))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_ImportDashboard_Call) Return(_a0 *Dashboard, _a1 error) *FakeDashboardService_ImportDashboard_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_ImportDashboard_Call) RunAndReturn(run func(context.Context, *SaveDashboardDTO) (*Dashboard, error)) *FakeDashboardService_ImportDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // MakeUserAdmin provides a mock function with given fields: ctx, orgID, userID, dashboardID, setViewAndEditPermissions
 func (_m *FakeDashboardService) MakeUserAdmin(ctx context.Context, orgID int64, userID int64, dashboardID int64, setViewAndEditPermissions bool) error {
 	ret := _m.Called(ctx, orgID, userID, dashboardID, setViewAndEditPermissions)
@@ -305,11 +730,47 @@ func (_m *FakeDashboardService) MakeUserAdmin(ctx context.Context, orgID int64,
 	return r0
 }
 
+// FakeDashboardService_MakeUserAdmin_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'MakeUserAdmin'
+type FakeDashboardService_MakeUserAdmin_Call struct {
+	*mock.Call
+}
+
+// MakeUserAdmin is a helper method to define mock.On call
+//   - ctx context.Context
+//   - orgID int64
+//   - userID int64
+//   - dashboardID int64
+//   - setViewAndEditPermissions bool
+func (_e *FakeDashboardService_Expecter) MakeUserAdmin(ctx interface{}, orgID interface{}, userID interface{}, dashboardID interface{}, setViewAndEditPermissions interface{}) *FakeDashboardService_MakeUserAdmin_Call {
+	return &FakeDashboardService_MakeUserAdmin_Call{Call: _e.mock.On("MakeUserAdmin", ctx, orgID, userID, dashboardID, setViewAndEditPermissions)}
+}
+
+func (_c *FakeDashboardService_MakeUserAdmin_Call) Run(run func(ctx context.Context, orgID int64, userID int64, dashboardID int64, setViewAndEditPermissions bool)) *FakeDashboardService_MakeUserAdmin_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64), args[2].(int64), args[3].(int64), args[4].(bool))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_MakeUserAdmin_Call) Return(_a0 error) *FakeDashboardService_MakeUserAdmin_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardService_MakeUserAdmin_Call) RunAndReturn(run func(context.Context, int64, int64, int64, bool) error) *FakeDashboardService_MakeUserAdmin_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // SaveDashboard provides a mock function with given fields: ctx, dto, allowUiUpdate
 func (_m *FakeDashboardService) SaveDashboard(ctx context.Context, dto *SaveDashboardDTO, allowUiUpdate bool) (*Dashboard, error) {
 	ret := _m.Called(ctx, dto, allowUiUpdate)
 
 	var r0 *Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO, bool) (*Dashboard, error)); ok {
+		return rf(ctx, dto, allowUiUpdate)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO, bool) *Dashboard); ok {
 		r0 = rf(ctx, dto, allowUiUpdate)
 	} else {
@@ -318,7 +779,6 @@ func (_m *FakeDashboardService) SaveDashboard(ctx context.Context, dto *SaveDash
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *SaveDashboardDTO, bool) error); ok {
 		r1 = rf(ctx, dto, allowUiUpdate)
 	} else {
@@ -328,11 +788,45 @@ func (_m *FakeDashboardService) SaveDashboard(ctx context.Context, dto *SaveDash
 	return r0, r1
 }
 
+// FakeDashboardService_SaveDashboard_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveDashboard'
+type FakeDashboardService_SaveDashboard_Call struct {
+	*mock.Call
+}
+
+// SaveDashboard is a helper method to define mock.On call
+//   - ctx context.Context
+//   - dto *SaveDashboardDTO
+//   - allowUiUpdate bool
+func (_e *FakeDashboardService_Expecter) SaveDashboard(ctx interface{}, dto interface{}, allowUiUpdate interface{}) *FakeDashboardService_SaveDashboard_Call {
+	return &FakeDashboardService_SaveDashboard_Call{Call: _e.mock.On("SaveDashboard", ctx, dto, allowUiUpdate)}
+}
+
+func (_c *FakeDashboardService_SaveDashboard_Call) Run(run func(ctx context.Context, dto *SaveDashboardDTO, allowUiUpdate bool)) *FakeDashboardService_SaveDashboard_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*SaveDashboardDTO), args[2].(bool))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_SaveDashboard_Call) Return(_a0 *Dashboard, _a1 error) *FakeDashboardService_SaveDashboard_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_SaveDashboard_Call) RunAndReturn(run func(context.Context, *SaveDashboardDTO, bool) (*Dashboard, error)) *FakeDashboardService_SaveDashboard_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // SearchDashboards provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) SearchDashboards(ctx context.Context, query *FindPersistedDashboardsQuery) (model.HitList, error) {
 	ret := _m.Called(ctx, query)
 
 	var r0 model.HitList
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *FindPersistedDashboardsQuery) (model.HitList, error)); ok {
+		return rf(ctx, query)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *FindPersistedDashboardsQuery) model.HitList); ok {
 		r0 = rf(ctx, query)
 	} else {
@@ -341,7 +835,6 @@ func (_m *FakeDashboardService) SearchDashboards(ctx context.Context, query *Fin
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *FindPersistedDashboardsQuery) error); ok {
 		r1 = rf(ctx, query)
 	} else {
@@ -351,6 +844,35 @@ func (_m *FakeDashboardService) SearchDashboards(ctx context.Context, query *Fin
 	return r0, r1
 }
 
+// FakeDashboardService_SearchDashboards_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SearchDashboards'
+type FakeDashboardService_SearchDashboards_Call struct {
+	*mock.Call
+}
+
+// SearchDashboards is a helper method to define mock.On call
+//   - ctx context.Context
+//   - query *FindPersistedDashboardsQuery
+func (_e *FakeDashboardService_Expecter) SearchDashboards(ctx interface{}, query interface{}) *FakeDashboardService_SearchDashboards_Call {
+	return &FakeDashboardService_SearchDashboards_Call{Call: _e.mock.On("SearchDashboards", ctx, query)}
+}
+
+func (_c *FakeDashboardService_SearchDashboards_Call) Run(run func(ctx context.Context, query *FindPersistedDashboardsQuery)) *FakeDashboardService_SearchDashboards_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*FindPersistedDashboardsQuery))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_SearchDashboards_Call) Return(_a0 model.HitList, _a1 error) *FakeDashboardService_SearchDashboards_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FakeDashboardService_SearchDashboards_Call) RunAndReturn(run func(context.Context, *FindPersistedDashboardsQuery) (model.HitList, error)) *FakeDashboardService_SearchDashboards_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // UpdateDashboardACL provides a mock function with given fields: ctx, uid, items
 func (_m *FakeDashboardService) UpdateDashboardACL(ctx context.Context, uid int64, items []*DashboardACL) error {
 	ret := _m.Called(ctx, uid, items)
@@ -365,6 +887,36 @@ func (_m *FakeDashboardService) UpdateDashboardACL(ctx context.Context, uid int6
 	return r0
 }
 
+// FakeDashboardService_UpdateDashboardACL_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateDashboardACL'
+type FakeDashboardService_UpdateDashboardACL_Call struct {
+	*mock.Call
+}
+
+// UpdateDashboardACL is a helper method to define mock.On call
+//   - ctx context.Context
+//   - uid int64
+//   - items []*DashboardACL
+func (_e *FakeDashboardService_Expecter) UpdateDashboardACL(ctx interface{}, uid interface{}, items interface{}) *FakeDashboardService_UpdateDashboardACL_Call {
+	return &FakeDashboardService_UpdateDashboardACL_Call{Call: _e.mock.On("UpdateDashboardACL", ctx, uid, items)}
+}
+
+func (_c *FakeDashboardService_UpdateDashboardACL_Call) Run(run func(ctx context.Context, uid int64, items []*DashboardACL)) *FakeDashboardService_UpdateDashboardACL_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(int64), args[2].([]*DashboardACL))
+	})
+	return _c
+}
+
+func (_c *FakeDashboardService_UpdateDashboardACL_Call) Return(_a0 error) *FakeDashboardService_UpdateDashboardACL_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FakeDashboardService_UpdateDashboardACL_Call) RunAndReturn(run func(context.Context, int64, []*DashboardACL) error) *FakeDashboardService_UpdateDashboardACL_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 type mockConstructorTestingTNewFakeDashboardService interface {
 	mock.TestingT
 	Cleanup(func())
diff --git a/pkg/services/dashboards/service/dashboard_service.go b/pkg/services/dashboards/service/dashboard_service.go
index 4c2650452e6..1dd16df8d06 100644
--- a/pkg/services/dashboards/service/dashboard_service.go
+++ b/pkg/services/dashboards/service/dashboard_service.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 
-	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/alerting"
@@ -633,18 +632,13 @@ func (dr *DashboardServiceImpl) DeleteACLByUser(ctx context.Context, userID int6
 	return dr.dashboardStore.DeleteACLByUser(ctx, userID)
 }
 
-func (dr DashboardServiceImpl) CountDashboardsInFolder(ctx context.Context, query *dashboards.CountDashboardsInFolderQuery) (int64, error) {
-	u, err := appcontext.User(ctx)
+func (dr DashboardServiceImpl) CountInFolder(ctx context.Context, orgID int64, uid string, u *user.SignedInUser) (int64, error) {
+	folder, err := dr.folderService.Get(ctx, &folder.GetFolderQuery{UID: &uid, OrgID: orgID, SignedInUser: u})
 	if err != nil {
 		return 0, err
 	}
 
-	folder, err := dr.folderService.Get(ctx, &folder.GetFolderQuery{UID: &query.FolderUID, OrgID: u.OrgID, SignedInUser: u})
-	if err != nil {
-		return 0, err
-	}
-
-	return dr.dashboardStore.CountDashboardsInFolder(ctx, &dashboards.CountDashboardsInFolderRequest{FolderID: folder.ID, OrgID: u.OrgID})
+	return dr.dashboardStore.CountDashboardsInFolder(ctx, &dashboards.CountDashboardsInFolderRequest{FolderID: folder.ID, OrgID: orgID})
 }
 
 func (dr *DashboardServiceImpl) DeleteInFolder(ctx context.Context, orgID int64, UID string) error {
diff --git a/pkg/services/dashboards/service/dashboard_service_test.go b/pkg/services/dashboards/service/dashboard_service_test.go
index 50774fd5727..6c435914484 100644
--- a/pkg/services/dashboards/service/dashboard_service_test.go
+++ b/pkg/services/dashboards/service/dashboard_service_test.go
@@ -236,7 +236,7 @@ func TestDashboardService(t *testing.T) {
 			usr := &user.SignedInUser{UserID: 1}
 			ctx := appcontext.WithUser(context.Background(), usr)
 
-			count, err := service.CountDashboardsInFolder(ctx, &dashboards.CountDashboardsInFolderQuery{FolderUID: "i am a folder"})
+			count, err := service.CountInFolder(ctx, 1, "i am a folder", usr)
 			require.NoError(t, err)
 			require.Equal(t, int64(3), count)
 		})
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index c9d0d5d172b..cde1174ce9c 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -623,6 +623,28 @@ func (s *Service) nestedFolderDelete(ctx context.Context, cmd *folder.DeleteFold
 	return result, nil
 }
 
+func (s *Service) GetChildrenCounts(ctx context.Context, cmd *folder.GetChildrenCountsQuery) (folder.ChildrenCounts, error) {
+	if cmd.SignedInUser == nil {
+		return nil, folder.ErrBadRequest.Errorf("missing signed-in user")
+	}
+	if *cmd.UID == "" {
+		return nil, folder.ErrBadRequest.Errorf("missing UID")
+	}
+	if cmd.OrgID < 1 {
+		return nil, folder.ErrBadRequest.Errorf("invalid orgID")
+	}
+
+	countsMap := make(folder.ChildrenCounts, len(s.registry))
+	for _, v := range s.registry {
+		c, err := v.CountInFolder(ctx, cmd.OrgID, *cmd.UID, cmd.SignedInUser)
+		if err != nil {
+			return nil, err
+		}
+		countsMap[v.Kind()] += c
+	}
+	return countsMap, nil
+}
+
 // MakeUserAdmin is copy of DashboardServiceImpl.MakeUserAdmin
 func (s *Service) MakeUserAdmin(ctx context.Context, orgID int64, userID, folderID int64, setViewAndEditPermissions bool) error {
 	rtEditor := org.RoleEditor
diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go
index 77a123d1d56..323c45453a1 100644
--- a/pkg/services/folder/folderimpl/folder_test.go
+++ b/pkg/services/folder/folderimpl/folder_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -22,6 +23,7 @@ import (
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
+	"github.com/grafana/grafana/pkg/services/dashboards/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/folder/foldertest"
@@ -930,6 +932,65 @@ func TestNestedFolderService(t *testing.T) {
 	})
 }
 
+func TestGetChildrenCounts(t *testing.T) {
+	g := guardian.New
+	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true})
+	t.Cleanup(func() {
+		guardian.New = g
+	})
+
+	folderId := rand.Int63()
+	folderUID := util.GenerateShortUID()
+	f := folder.NewFolder("Folder", "")
+	f.ID = folderId
+	f.UID = folderUID
+	f.OrgID = orgID
+
+	nestedFolderStore := NewFakeStore()
+	nestedFolderStore.ExpectedFolder = f
+
+	dashStore := dashboards.FakeDashboardStore{}
+	dashboardCount := int64(2)
+	countCmd := dashboards.CountDashboardsInFolderRequest{
+		FolderID: f.ID,
+		OrgID:    f.OrgID,
+	}
+	dashStore.On("CountDashboardsInFolder", mock.Anything, &countCmd).Return(dashboardCount, nil)
+
+	dashboardFolderStore := foldertest.NewFakeFolderStore(t)
+	dashboardFolderStore.On("GetFolderByUID", mock.Anything, orgID, folderUID).Return(f, nil)
+
+	cfg := setting.NewCfg()
+	cfg.RBACEnabled = false
+	features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
+	folderService := &Service{
+		cfg:                  cfg,
+		store:                nestedFolderStore,
+		dashboardStore:       &dashStore,
+		dashboardFolderStore: dashboardFolderStore,
+		features:             features,
+		log:                  log.New("test-folder-service"),
+		accessControl:        acimpl.ProvideAccessControl(cfg),
+		registry:             make(map[string]folder.RegistryService),
+	}
+
+	ac := acmock.New()
+	folderPermissions := acmock.NewMockedPermissionsService()
+	dashboardPermissions := acmock.NewMockedPermissionsService()
+	_, err := service.ProvideDashboardServiceImpl(cfg, &dashStore, dashboardFolderStore, nil, features, folderPermissions, dashboardPermissions, ac, folderService)
+	require.NoError(t, err)
+
+	signedInUser := user.SignedInUser{UserID: 1, OrgID: orgID}
+	ctx := appcontext.WithUser(context.Background(), &signedInUser)
+	res, err := folderService.GetChildrenCounts(ctx, &folder.GetChildrenCountsQuery{
+		SignedInUser: usr,
+		UID:          &folderUID,
+		OrgID:        orgID,
+	})
+	require.NoError(t, err)
+	require.Equal(t, res["dashboard"], dashboardCount)
+}
+
 func CreateSubtreeInStore(t *testing.T, store *sqlStore, service *Service, depth int, prefix string, cmd folder.CreateFolderCommand) []string {
 	t.Helper()
 
diff --git a/pkg/services/folder/foldertest/foldertest.go b/pkg/services/folder/foldertest/foldertest.go
index 684cdf0bd6c..9468186147a 100644
--- a/pkg/services/folder/foldertest/foldertest.go
+++ b/pkg/services/folder/foldertest/foldertest.go
@@ -7,9 +7,10 @@ import (
 )
 
 type FakeService struct {
-	ExpectedFolders []*folder.Folder
-	ExpectedFolder  *folder.Folder
-	ExpectedError   error
+	ExpectedFolders        []*folder.Folder
+	ExpectedFolder         *folder.Folder
+	ExpectedError          error
+	ExpectedChildrenCounts map[string]int64
 }
 
 func NewFakeService() *FakeService {
@@ -49,3 +50,7 @@ func (s *FakeService) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (
 func (s *FakeService) RegisterService(service folder.RegistryService) error {
 	return s.ExpectedError
 }
+
+func (s *FakeService) GetChildrenCounts(ctx context.Context, cmd *folder.GetChildrenCountsQuery) (folder.ChildrenCounts, error) {
+	return s.ExpectedChildrenCounts, s.ExpectedError
+}
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index a33caa7c100..87dbb54ae10 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -160,3 +160,14 @@ type HasEditPermissionInFoldersQuery struct {
 type HasAdminPermissionInDashboardsOrFoldersQuery struct {
 	SignedInUser *user.SignedInUser
 }
+
+// GetChildrenCountsQuery captures the information required by the folder service
+// to return the count of children in a folder.
+type GetChildrenCountsQuery struct {
+	UID   *string
+	OrgID int64
+
+	SignedInUser *user.SignedInUser `json:"-"`
+}
+
+type ChildrenCounts map[string]int64
diff --git a/pkg/services/folder/registry.go b/pkg/services/folder/registry.go
index 7aa088a38c9..0692957b9fd 100644
--- a/pkg/services/folder/registry.go
+++ b/pkg/services/folder/registry.go
@@ -2,9 +2,12 @@ package folder
 
 import (
 	"context"
+
+	"github.com/grafana/grafana/pkg/services/user"
 )
 
 type RegistryService interface {
-	DeleteInFolder(ctx context.Context, orgID int64, UID string) error
+	DeleteInFolder(ctx context.Context, orgID int64, uid string) error
+	CountInFolder(ctx context.Context, orgID int64, uid string, user *user.SignedInUser) (int64, error)
 	Kind() string
 }
diff --git a/pkg/services/folder/service.go b/pkg/services/folder/service.go
index 06028c96783..720f9dd5eed 100644
--- a/pkg/services/folder/service.go
+++ b/pkg/services/folder/service.go
@@ -26,6 +26,7 @@ type Service interface {
 	// Move changes a folder's parent folder to the requested new parent.
 	Move(ctx context.Context, cmd *MoveFolderCommand) (*Folder, error)
 	RegisterService(service RegistryService) error
+	GetChildrenCounts(ctx context.Context, cmd *GetChildrenCountsQuery) (ChildrenCounts, error)
 }
 
 // FolderStore is a folder store.
diff --git a/public/api-merged.json b/public/api-merged.json
index 82aeb49bfd7..a54985c3b32 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -5648,6 +5648,40 @@
         }
       }
     },
+    "/folders/{folder_uid}/counts": {
+      "get": {
+        "tags": [
+          "folders"
+        ],
+        "summary": "Gets the count of each descendant of a folder by kind. The folder is identified by UID.",
+        "operationId": "getFolderChildrenCounts",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "folder_uid",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getFolderChildrenCountsResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
     "/folders/{folder_uid}/move": {
       "post": {
         "tags": [
@@ -13552,6 +13586,13 @@
         }
       }
     },
+    "FolderChildrenCounts": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "integer",
+        "format": "int64"
+      }
+    },
     "FolderSearchHit": {
       "type": "object",
       "properties": {
@@ -20295,6 +20336,12 @@
         "$ref": "#/definitions/DataSourceList"
       }
     },
+    "getFolderChildrenCountsResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/FolderChildrenCounts"
+      }
+    },
     "getFolderPermissionListResponse": {
       "description": "(empty)",
       "schema": {
diff --git a/public/openapi3.json b/public/openapi3.json
index 814a35f50c3..c8243bc8671 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -792,6 +792,16 @@
         },
         "description": "(empty)"
       },
+      "getFolderChildrenCountsResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/FolderChildrenCounts"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "getFolderPermissionListResponse": {
         "content": {
           "application/json": {
@@ -4644,6 +4654,13 @@
         },
         "type": "object"
       },
+      "FolderChildrenCounts": {
+        "additionalProperties": {
+          "format": "int64",
+          "type": "integer"
+        },
+        "type": "object"
+      },
       "FolderSearchHit": {
         "properties": {
           "accessControl": {
@@ -17002,6 +17019,42 @@
         ]
       }
     },
+    "/folders/{folder_uid}/counts": {
+      "get": {
+        "operationId": "getFolderChildrenCounts",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "folder_uid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getFolderChildrenCountsResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Gets the count of each descendant of a folder by kind. The folder is identified by UID.",
+        "tags": [
+          "folders"
+        ]
+      }
+    },
     "/folders/{folder_uid}/move": {
       "post": {
         "operationId": "moveFolder",

From c5ea3cd7e04b0b7b80d462d46e95ec438fd9aad6 Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Mon, 24 Apr 2023 10:28:57 -0400
Subject: [PATCH 354/729] Prometheus: remove part of flaky e2e test (#67116)

remove elements of flaky e2e test

This test only checks 'undo' in the code editor and then checks if the query builder is present. The test is timing out when looking for the query builder. There should be a second test to check if undo works in the query builder so I'm removing the query builder check. I will add an issue to create a test for 'undo' in the query builder.
---
 e2e/various-suite/query-editor.spec.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/e2e/various-suite/query-editor.spec.ts b/e2e/various-suite/query-editor.spec.ts
index 7c73ea39154..525b053216e 100644
--- a/e2e/various-suite/query-editor.spec.ts
+++ b/e2e/various-suite/query-editor.spec.ts
@@ -30,11 +30,6 @@ e2e.scenario({
 
     cy.contains(queryText).should('be.visible');
 
-    cy.get('body').click();
     e2e.components.Alert.alertV2('error').should('not.be.visible');
-
-    cy.contains('label', 'Builder').click();
-
-    cy.get('[data-testid="operations.0.wrapper"]').should('be.visible');
   },
 });

From efd0e9cbea4a6c4c51337f14004f2df2f876fdb1 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:46:31 +0300
Subject: [PATCH 355/729] Datagrid Panel: Edit data within your dashboards
 (#66353)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* Datagrid WIP: snapshotting when data edited, better UI for adding column/rows, refactors

* wip

* WIP

* wip

* Add series selector

* Delete selection on key press

* wip

* Multiple row select and delete

* wip

* draggable rows/columns, better column width calculator

* bug fixes

* scrollbars

* add feature flag

* bugfixes

* bugfixes

* bugfixes

* bugfixes

* Add possibility to rename column

* Input fixes

* bugfixes

* bugfixes

* performance optimisations

* WIP component refactoring and optimisations

* comment bit of code to remove error for testing

* fix column move and payload types

* WIP refactors and tests

* e2e tests

* queryGroup subscription refactor

* queryGroup - add component on update, fix failing tests

* refactor querygroup

* querygroup refactor

* tests

* fix codeowners validation

* lint fixes

* revert convertFieldType modification in favor of already merged mod + re-add mistakenly deleted line

* remove //ts-ignores

* Minor style tweaks

* fix

* align colors with theme

* fixes

* refactor

* add test for convertFieldType transformer and write todo

---------

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .betterer.results                             |  19 +
 .github/CODEOWNERS                            |   1 +
 .../datagrid_metric_values.json               |  79 +++
 devenv/jsonnet/dev-dashboards.libsonnet       |   7 +
 .../feature-toggles/index.md                  |   1 +
 .../datagrid-data-change.spec.ts              |  34 +
 .../datagrid-editing-features.spec.ts         | 150 +++++
 package.json                                  |   4 +
 .../transformers/convertFieldType.test.ts     |  21 +
 .../transformers/convertFieldType.ts          |   2 +-
 .../src/types/featureToggles.gen.ts           |   1 +
 .../manager/manager_integration_test.go       |   1 +
 pkg/plugins/pfs/corelist/corelist_load_gen.go |   1 +
 pkg/plugins/plugindef/plugindef.cue           |   2 +-
 pkg/services/featuremgmt/registry.go          |   7 +
 pkg/services/featuremgmt/toggles_gen.csv      |   1 +
 pkg/services/featuremgmt/toggles_gen.go       |   4 +
 .../api/plugins/data/expectedListResp.json    |  36 ++
 .../app/features/plugins/built_in_plugins.ts  |   2 +
 .../features/query/components/QueryGroup.tsx  |  26 +-
 .../panel/datagrid/DataGridPanel.test.tsx     | 601 ++++++++++++++++++
 .../plugins/panel/datagrid/DataGridPanel.tsx  | 281 ++++++++
 public/app/plugins/panel/datagrid/README.md   |   5 +
 .../panel/datagrid/components/AddColumn.tsx   |  35 +
 .../components/DatagridContextMenu.tsx        | 247 +++++++
 .../datagrid/components/RenameColumnCell.tsx  |  71 +++
 .../panel/datagrid/components/SimpleInput.tsx |  36 ++
 .../panel/datagrid/featureFlagUtils.tsx       |   5 +
 .../panel/datagrid/img/icn-table-panel.svg    |   1 +
 public/app/plugins/panel/datagrid/module.tsx  |  24 +
 .../app/plugins/panel/datagrid/panelcfg.cue   |  33 +
 .../plugins/panel/datagrid/panelcfg.gen.ts    |  19 +
 public/app/plugins/panel/datagrid/plugin.json |  17 +
 public/app/plugins/panel/datagrid/state.ts    | 299 +++++++++
 .../app/plugins/panel/datagrid/utils.test.ts  | 122 ++++
 public/app/plugins/panel/datagrid/utils.ts    | 310 +++++++++
 yarn.lock                                     |  70 +-
 37 files changed, 2565 insertions(+), 10 deletions(-)
 create mode 100644 devenv/dev-dashboards/panel-datagrid/datagrid_metric_values.json
 create mode 100644 e2e/datagrid-suite/datagrid-data-change.spec.ts
 create mode 100644 e2e/datagrid-suite/datagrid-editing-features.spec.ts
 create mode 100644 public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
 create mode 100644 public/app/plugins/panel/datagrid/DataGridPanel.tsx
 create mode 100644 public/app/plugins/panel/datagrid/README.md
 create mode 100644 public/app/plugins/panel/datagrid/components/AddColumn.tsx
 create mode 100644 public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
 create mode 100644 public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx
 create mode 100644 public/app/plugins/panel/datagrid/components/SimpleInput.tsx
 create mode 100644 public/app/plugins/panel/datagrid/featureFlagUtils.tsx
 create mode 100644 public/app/plugins/panel/datagrid/img/icn-table-panel.svg
 create mode 100644 public/app/plugins/panel/datagrid/module.tsx
 create mode 100644 public/app/plugins/panel/datagrid/panelcfg.cue
 create mode 100644 public/app/plugins/panel/datagrid/panelcfg.gen.ts
 create mode 100644 public/app/plugins/panel/datagrid/plugin.json
 create mode 100644 public/app/plugins/panel/datagrid/state.ts
 create mode 100644 public/app/plugins/panel/datagrid/utils.test.ts
 create mode 100644 public/app/plugins/panel/datagrid/utils.ts

diff --git a/.betterer.results b/.betterer.results
index 1bd25927cc8..4595a7489a6 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5230,6 +5230,25 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/dashlist/module.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
+    "public/app/plugins/panel/datagrid/DataGridPanel.test.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/plugins/panel/datagrid/components/SimpleInput.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/plugins/panel/datagrid/state.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "7"]
+    ],
     "public/app/plugins/panel/debug/CursorView.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bc933311d41..370bbf53dca 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -389,6 +389,7 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/panel/bargauge/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/dashlist/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/debug/ @ryantxu
+/public/app/plugins/panel/datagrid/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/gauge/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/gettingstarted/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/graph/ @grafana/dataviz-squad
diff --git a/devenv/dev-dashboards/panel-datagrid/datagrid_metric_values.json b/devenv/dev-dashboards/panel-datagrid/datagrid_metric_values.json
new file mode 100644
index 00000000000..9ee8da0fd5d
--- /dev/null
+++ b/devenv/dev-dashboards/panel-datagrid/datagrid_metric_values.json
@@ -0,0 +1,79 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "selectedSeries": 0
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "1,20,90,30,5,0"
+        },
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "B",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "5,10,20,30,40,50"
+        }
+      ],
+      "title": "Datagrid with CSV metric values",
+      "type": "datagrid"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Datagrid example",
+  "version": 0,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/jsonnet/dev-dashboards.libsonnet b/devenv/jsonnet/dev-dashboards.libsonnet
index c2eeaeaad97..c3d6cd99acb 100644
--- a/devenv/jsonnet/dev-dashboards.libsonnet
+++ b/devenv/jsonnet/dev-dashboards.libsonnet
@@ -163,6 +163,13 @@ local dashboard = grafana.dashboard;
         id: 0,
       }
     },
+    dashboard.new('datagrid_metric_values', import '../dev-dashboards/panel-datagrid/datagrid_metric_values.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
     dashboard.new('demo1', import '../dev-dashboards/datasource-testdata/demo1.json') +
     resource.addMetadata('folder', 'dev-dashboards') +
     {
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index a4b50479e7c..382742cbb39 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -56,6 +56,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `alertingNoNormalState`              | Stop maintaining state of alerts that are not firing                                                                                                                                         |
 | `renderAuthJWT`                      | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
 | `enableElasticsearchBackendQuerying` | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                              |
+| `enableDatagridEditing`              | Enables the edit functionality in the datagrid panel                                                                                                                                         |
 
 ## Alpha feature toggles
 
diff --git a/e2e/datagrid-suite/datagrid-data-change.spec.ts b/e2e/datagrid-suite/datagrid-data-change.spec.ts
new file mode 100644
index 00000000000..df61fca4751
--- /dev/null
+++ b/e2e/datagrid-suite/datagrid-data-change.spec.ts
@@ -0,0 +1,34 @@
+import { e2e } from '@grafana/e2e';
+
+const DASHBOARD_ID = 'a70ecb44-6c31-412d-ae74-d6306303ce37';
+const DATAGRID_SELECT_SERIES = 'Datagrid Select series';
+
+e2e.scenario({
+  describeName: 'Datagrid data changes',
+  itName: 'Tests changing data in the grid',
+  addScenarioDataSource: false,
+  addScenarioDashBoard: false,
+  skipScenario: false,
+  scenario: () => {
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { editPanel: 1 } });
+
+    // Check that the data is series A
+    e2e.components.PanelEditor.OptionsPane.fieldLabel(DATAGRID_SELECT_SERIES).should('be.visible');
+    cy.get('[data-testid="glide-cell-2-0"]').should('have.text', '1');
+    cy.get('[data-testid="glide-cell-2-1"]').should('have.text', '20');
+    cy.get('[data-testid="glide-cell-2-2"]').should('have.text', '90');
+
+    // Change the series to B
+    e2e.components.PanelEditor.OptionsPane.fieldLabel(DATAGRID_SELECT_SERIES).find('input').type('B {enter}');
+    cy.get('[data-testid="glide-cell-2-3"]').should('have.text', '30');
+    cy.get('[data-testid="glide-cell-2-4"]').should('have.text', '40');
+    cy.get('[data-testid="glide-cell-2-5"]').should('have.text', '50');
+
+    // Edit datagrid which triggers a snapshot query
+    cy.get('.dvn-scroller').click(200, 100);
+    cy.get('[data-testid="glide-cell-2-1"]').should('have.attr', 'aria-selected', 'true');
+    cy.get('body').type('123455{enter}', { delay: 1000 });
+
+    cy.get('[data-testid="query-editor-row"]').contains('Spreadsheet or snapshot');
+  },
+});
diff --git a/e2e/datagrid-suite/datagrid-editing-features.spec.ts b/e2e/datagrid-suite/datagrid-editing-features.spec.ts
new file mode 100644
index 00000000000..f1972fd6457
--- /dev/null
+++ b/e2e/datagrid-suite/datagrid-editing-features.spec.ts
@@ -0,0 +1,150 @@
+import { e2e } from '@grafana/e2e';
+
+const DASHBOARD_ID = 'a70ecb44-6c31-412d-ae74-d6306303ce37';
+const DATAGRID_CANVAS = 'data-grid-canvas';
+
+e2e.scenario({
+  describeName: 'Datagrid data changes',
+  itName: 'Tests changing data in the grid',
+  addScenarioDataSource: false,
+  addScenarioDashBoard: false,
+  skipScenario: false,
+  scenario: () => {
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { editPanel: 1 } });
+
+    // Edit datagrid which triggers a snapshot query
+    cy.get('.dvn-scroller').click(200, 100);
+    cy.get('[data-testid="glide-cell-2-1"]').should('have.attr', 'aria-selected', 'true');
+    cy.get('body').type('1{enter}');
+
+    // Delete a cell
+    cy.get('.dvn-scroller').click(200, 200);
+    cy.get('body').type('{del}');
+    cy.get('[data-testid="glide-cell-2-4"]').should('have.text', 0);
+
+    // Delete a selection
+    cy.get('.dvn-scroller').click(50, 100, { shiftKey: true });
+    cy.get('body').type('{del}');
+    cy.get('[data-testid="glide-cell-2-3"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-2-2"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-2-1"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-2-0"]').should('have.text', 1);
+    cy.get('[data-testid="glide-cell-1-3"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-1-2"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-1-1"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-1-0"]').should('not.have.text', '');
+
+    // Clear column through context menu
+    cy.get('.dvn-scroller').rightclick(200, 100);
+    cy.get('[aria-label="Context menu"]').click(100, 120); // click clear column
+    cy.get('[data-testid="glide-cell-2-0"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-2-4"]').should('have.text', 0);
+
+    // Clear row through context menu
+    cy.get('.dvn-scroller').click(200, 220);
+    cy.get('body').type('1123{enter}', { delay: 500 });
+    cy.get('.dvn-scroller').rightclick(200, 220);
+    cy.get('[aria-label="Context menu"]').click(100, 100); // click clear row
+    cy.get('[data-testid="glide-cell-1-4"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-2-4"]').should('have.text', 0);
+
+    // get the data back
+    cy.reload();
+
+    // Clear row through row selector
+    cy.get('.dvn-scroller').click(20, 190, { waitForAnimations: true });
+    cy.get('.dvn-scroller').click(20, 90, { shiftKey: true, waitForAnimations: true }); // with shift to select all rows between clicks
+    cy.get('body').type('{del}');
+    cy.get('[data-testid="glide-cell-1-4"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-1-3"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-1-2"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-1-1"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-2-4"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-2-3"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-2-2"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-2-1"]').should('have.text', 0);
+    cy.wait(1000);
+    cy.reload();
+    cy.get('.dvn-scroller').click(20, 190, { waitForAnimations: true });
+    cy.get('.dvn-scroller').click(20, 90, { commandKey: true, waitForAnimations: true }); // with cmd to select only clicked rows
+    cy.get('body').type('{del}');
+    cy.get('[data-testid="glide-cell-1-1"]').should('have.text', '');
+    cy.get('[data-testid="glide-cell-2-1"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-2-4"]').should('have.text', 0);
+    cy.get('[data-testid="glide-cell-1-4"]').should('have.text', '');
+
+    // Remove all data
+    cy.get('.dvn-scroller').rightclick(100, 100);
+    cy.get('body').click(150, 420);
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] th`).should('have.length', 0);
+
+    cy.reload();
+
+    // Delete column through header dropdown menu
+    cy.get('.dvn-scroller').click(250, 15); // click header dropdown
+    cy.get('body').click(450, 420); // click delete column
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] th`).should('have.length', 1);
+
+    // Delete row through context menu
+    cy.get('.dvn-scroller').rightclick(100, 100);
+    cy.get('[aria-label="Context menu"]').click(10, 10);
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] tbody tr`).should('have.length', 6); // there are 5 data rows + 1 for the add new row btns
+
+    // Delete rows through row selector
+    cy.get('.dvn-scroller').click(20, 190, { waitForAnimations: true });
+    cy.get('.dvn-scroller').click(20, 90, { shiftKey: true, waitForAnimations: true }); // with shift to select all rows between clicks
+    cy.get('.dvn-scroller').rightclick(100, 100);
+    cy.get('[aria-label="Context menu"]').click(10, 10);
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] tbody tr`).should('have.length', 2); // there are 1 data rows + 1 for the add new row btns
+    cy.reload();
+    cy.get('.dvn-scroller').click(20, 190, { waitForAnimations: true });
+    cy.get('.dvn-scroller').click(20, 90, { commandKey: true, waitForAnimations: true }); // with shift to select all rows between clicks
+    cy.get('.dvn-scroller').rightclick(40, 90);
+    cy.get('[aria-label="Context menu"]').click(10, 10);
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] tbody tr`).should('have.length', 5); // there are 5 data rows + 1 for the add new row btns
+
+    // Delete column through context menu
+    cy.get('.dvn-scroller').rightclick(100, 100);
+    cy.get('[aria-label="Context menu"]').click(10, 50);
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] th`).should('have.length', 1);
+
+    cy.reload();
+    cy.wait(3000);
+
+    // Add a new column
+    cy.get('body').click(350, 200).type('New Column{enter}');
+    cy.get('body')
+      .click(350, 230)
+      .type('Value 1{enter}')
+      .type('Value 2{enter}')
+      .type('Value 3{enter}')
+      .type('Value 4{enter}')
+      .type('Value 5{enter}')
+      .type('Value 6{enter}');
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] th`).should('have.length', 3);
+
+    // Rename a column
+    cy.get('.dvn-scroller').click(250, 15); // click header dropdown
+    cy.get('body').click(450, 380).type('{selectall}{backspace}Renamed column{enter}');
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] th`).contains('Renamed column');
+
+    // Change column field type
+    cy.get('.dvn-scroller').click(250, 15);
+    cy.get('[aria-label="Context menu"]').click(50, 50);
+    cy.get('.dvn-scroller').click(200, 100);
+    cy.get('body').type('Str Value{enter}');
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] tr`).contains('Str Value');
+
+    // Select all rows through row selection
+    cy.get('.dvn-scroller').click(10, 10, { waitForAnimations: true });
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] [aria-selected="true"]`).should('have.length', 6);
+
+    // Add a new row
+    cy.get('.dvn-scroller').click(200, 250);
+    cy.get('body').type('123');
+    cy.get('.dvn-scroller').click(50, 250);
+    cy.get('body').type('Val{enter}');
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] tbody tr`).contains('Val');
+    cy.get(`[data-testid="${DATAGRID_CANVAS}"] tbody tr`).should('have.length', 8);
+  },
+});
diff --git a/package.json b/package.json
index 0e3fbdef90e..bc82aae9c75 100644
--- a/package.json
+++ b/package.json
@@ -134,6 +134,7 @@
     "@types/jsurl": "^1.2.28",
     "@types/lodash": "4.14.191",
     "@types/logfmt": "^1.2.3",
+    "@types/marked": "^4",
     "@types/mousetrap": "1.6.11",
     "@types/node": "18.14.6",
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.0.9",
@@ -250,6 +251,7 @@
     "@daybrush/utils": "1.10.2",
     "@emotion/css": "11.10.6",
     "@emotion/react": "11.10.6",
+    "@glideapps/glide-data-grid": "^5.2.1",
     "@grafana/aws-sdk": "0.0.44",
     "@grafana/data": "workspace:*",
     "@grafana/e2e-selectors": "workspace:*",
@@ -340,6 +342,7 @@
     "logfmt": "^1.3.2",
     "lru-cache": "7.17.0",
     "lru-memoize": "^1.1.0",
+    "marked": "^4.3.0",
     "memoize-one": "6.0.0",
     "moment": "2.29.4",
     "moment-timezone": "0.5.41",
@@ -379,6 +382,7 @@
     "react-popper-tooltip": "4.4.2",
     "react-redux": "7.2.6",
     "react-resizable": "3.0.4",
+    "react-responsive-carousel": "^3.2.23",
     "react-router-dom": "5.3.3",
     "react-select": "5.7.0",
     "react-split-pane": "0.1.92",
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
index fd4618119cb..432ae01e9fe 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
@@ -100,6 +100,27 @@ describe('field convert type', () => {
   });
 });
 
+it('can convert proper numeric strings to numbers, but also treat edge-cases', () => {
+  const options = { targetField: 'stringy nums', destinationType: FieldType.number };
+
+  //there are scenarios where string fields have numeric values, or the strings are non-numeric and cannot pe converted
+  const stringyNumbers = {
+    name: 'stringy nums',
+    type: FieldType.string,
+    values: ['10', '1asd2', '30', 14, 10, '23', '', null],
+    config: {},
+  };
+
+  const numbers = convertFieldType(stringyNumbers, options);
+
+  expect(numbers).toEqual({
+    name: 'stringy nums',
+    type: FieldType.number,
+    values: [10, null, 30, 14, 10, 23, 0, 0],
+    config: {},
+  });
+});
+
 it('can convert strings with commas to numbers', () => {
   const options = { targetField: 'stringy nums', destinationType: FieldType.number };
 
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
index 07ca981597b..9beb8cfdd5c 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
@@ -147,7 +147,7 @@ function fieldToNumberField(field: Field): Field {
   for (let n = 0; n < numValues.length; n++) {
     let toBeConverted = numValues[n];
 
-    if (valuesAsStrings && toBeConverted != null) {
+    if (valuesAsStrings && toBeConverted != null && typeof toBeConverted === 'string') {
       // some numbers returned from datasources have commas
       // strip the commas, coerce the string to a number
       toBeConverted = toBeConverted.replace(/,/g, '');
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 9eedfbb439f..23af2306117 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -98,4 +98,5 @@ export interface FeatureToggles {
   pluginsAPIManifestKey?: boolean;
   advancedDataSourcePicker?: boolean;
   opensearchDetectVersion?: boolean;
+  enableDatagridEditing?: boolean;
 }
diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go
index 52ec0f71d09..d98e34ccfb6 100644
--- a/pkg/plugins/manager/manager_integration_test.go
+++ b/pkg/plugins/manager/manager_integration_test.go
@@ -192,6 +192,7 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *store.Serv
 		"trend":          {},
 		"welcome":        {},
 		"xychart":        {},
+		"datagrid":       {},
 	}
 
 	expDataSources := map[string]struct{}{
diff --git a/pkg/plugins/pfs/corelist/corelist_load_gen.go b/pkg/plugins/pfs/corelist/corelist_load_gen.go
index 6215b3177b1..b2110db4a63 100644
--- a/pkg/plugins/pfs/corelist/corelist_load_gen.go
+++ b/pkg/plugins/pfs/corelist/corelist_load_gen.go
@@ -57,6 +57,7 @@ func corePlugins(rt *thema.Runtime) []pfs.ParsedPlugin {
 		parsePluginOrPanic("public/app/plugins/panel/barchart", "barchart", rt),
 		parsePluginOrPanic("public/app/plugins/panel/bargauge", "bargauge", rt),
 		parsePluginOrPanic("public/app/plugins/panel/dashlist", "dashlist", rt),
+		parsePluginOrPanic("public/app/plugins/panel/datagrid", "datagrid", rt),
 		parsePluginOrPanic("public/app/plugins/panel/debug", "debug", rt),
 		parsePluginOrPanic("public/app/plugins/panel/flamegraph", "flamegraph", rt),
 		parsePluginOrPanic("public/app/plugins/panel/gauge", "gauge", rt),
diff --git a/pkg/plugins/plugindef/plugindef.cue b/pkg/plugins/plugindef/plugindef.cue
index 75f75f5d94d..bfdb0cfe50b 100644
--- a/pkg/plugins/plugindef/plugindef.cue
+++ b/pkg/plugins/plugindef/plugindef.cue
@@ -17,7 +17,7 @@ seqs: [
 				// grafana.com, then the plugin `id` has to follow the naming
 				// conventions.
 				id: string & strings.MinRunes(1)
-				id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|gauge|geomap|gettingstarted|graph|heatmap|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|trend|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|testdata|zipkin|phlare|parca)$"
+				id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|datagrid|gauge|geomap|gettingstarted|graph|heatmap|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|trend|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|testdata|zipkin|phlare|parca)$"
 
 				// Human-readable name of the plugin that is shown to the user in
 				// the UI.
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 89e93e6d614..f6b2b264bce 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -532,5 +532,12 @@ var (
 			FrontendOnly: true,
 			Owner:        awsPluginsSquad,
 		},
+		{
+			Name:         "enableDatagridEditing",
+			Description:  "Enables the edit functionality in the datagrid panel",
+			FrontendOnly: true,
+			State:        FeatureStateBeta,
+			Owner:        grafanaBiSquad,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index d9c0df0a89b..1a2f988bf46 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -79,3 +79,4 @@ authenticationConfigUI,alpha,@grafana/grafana-authnz-team,false,false,false,fals
 pluginsAPIManifestKey,alpha,@grafana/plugins-platform-backend,false,false,false,false
 advancedDataSourcePicker,alpha,@grafana/dashboards-squad,false,false,false,true
 opensearchDetectVersion,alpha,@grafana/aws-plugins,false,false,false,true
+enableDatagridEditing,beta,@grafana/grafana-bi-squad,false,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index d3defd21235..4912944f700 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -326,4 +326,8 @@ const (
 	// FlagOpensearchDetectVersion
 	// Enable version detection in OpenSearch
 	FlagOpensearchDetectVersion = "opensearchDetectVersion"
+
+	// FlagEnableDatagridEditing
+	// Enables the edit functionality in the datagrid panel
+	FlagEnableDatagridEditing = "enableDatagridEditing"
 )
diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json
index 3454fbf29a5..4303ab01d9a 100644
--- a/pkg/tests/api/plugins/data/expectedListResp.json
+++ b/pkg/tests/api/plugins/data/expectedListResp.json
@@ -386,6 +386,42 @@
     "signatureType": "",
     "signatureOrg": ""
   },
+  {
+    "name": "Datagrid",
+    "type": "panel",
+    "id": "datagrid",
+    "enabled": true,
+    "pinned": false,
+    "info": {
+      "author": {
+        "name": "Grafana Labs",
+        "url": "https://grafana.com"
+      },
+      "description": "",
+      "links": null,
+      "logos": {
+        "small": "public/app/plugins/panel/datagrid/img/icn-table-panel.svg",
+        "large": "public/app/plugins/panel/datagrid/img/icn-table-panel.svg"
+      },
+      "build": {},
+      "screenshots": null,
+      "version": "",
+      "updated": ""
+    },
+    "dependencies": {
+      "grafanaDependency": "",
+      "grafanaVersion": "*",
+      "plugins": []
+    },
+    "latestVersion": "",
+    "hasUpdate": false,
+    "defaultNavUrl": "/plugins/datagrid/",
+    "category": "",
+    "state": "beta",
+    "signature": "internal",
+    "signatureType": "",
+    "signatureOrg": ""
+  },
   {
     "name": "Elasticsearch",
     "type": "datasource",
diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts
index b1acdb9214e..1b46e9f83af 100644
--- a/public/app/features/plugins/built_in_plugins.ts
+++ b/public/app/features/plugins/built_in_plugins.ts
@@ -49,6 +49,7 @@ import * as barChartPanel from 'app/plugins/panel/barchart/module';
 import * as barGaugePanel from 'app/plugins/panel/bargauge/module';
 import * as candlestickPanel from 'app/plugins/panel/candlestick/module';
 import * as dashListPanel from 'app/plugins/panel/dashlist/module';
+import * as dataGridPanel from 'app/plugins/panel/datagrid/module';
 import * as debugPanel from 'app/plugins/panel/debug/module';
 import * as flamegraphPanel from 'app/plugins/panel/flamegraph/module';
 import * as gaugePanel from 'app/plugins/panel/gauge/module';
@@ -125,6 +126,7 @@ const builtInPlugins: any = {
   'app/plugins/panel/news/module': newsPanel,
   'app/plugins/panel/live/module': livePanel,
   'app/plugins/panel/stat/module': statPanel,
+  'app/plugins/panel/datagrid/module': dataGridPanel,
   'app/plugins/panel/debug/module': debugPanel,
   'app/plugins/panel/flamegraph/module': flamegraphPanel,
   'app/plugins/panel/gettingstarted/module': gettingStartedPanel,
diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index 069678445ec..54bd6c25e87 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -86,6 +86,25 @@ export class QueryGroup extends PureComponent<Props, State> {
       next: (data: PanelData) => this.onPanelDataUpdate(data),
     });
 
+    this.setNewQueriesAndDatasource(options);
+  }
+
+  componentWillUnmount() {
+    if (this.querySubscription) {
+      this.querySubscription.unsubscribe();
+      this.querySubscription = null;
+    }
+  }
+
+  async componentDidUpdate() {
+    const { options } = this.props;
+
+    if (this.state.dataSource && options.dataSource.uid !== this.state.dataSource?.uid) {
+      this.setNewQueriesAndDatasource(options);
+    }
+  }
+
+  async setNewQueriesAndDatasource(options: QueryGroupOptions) {
     try {
       const ds = await this.dataSourceSrv.get(options.dataSource);
       const dsSettings = this.dataSourceSrv.getInstanceSettings(options.dataSource);
@@ -113,13 +132,6 @@ export class QueryGroup extends PureComponent<Props, State> {
     }
   }
 
-  componentWillUnmount() {
-    if (this.querySubscription) {
-      this.querySubscription.unsubscribe();
-      this.querySubscription = null;
-    }
-  }
-
   onPanelDataUpdate(data: PanelData) {
     this.setState({ data });
   }
diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
new file mode 100644
index 00000000000..6cda826821e
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
@@ -0,0 +1,601 @@
+import { render, screen, fireEvent, act, waitFor } from '@testing-library/react';
+import * as React from 'react';
+
+import { ArrayVector, DataFrame, dateTime, EventBus, FieldType, LoadingState, MutableDataFrame } from '@grafana/data';
+
+import { DataGridPanel, DataGridProps } from './DataGridPanel';
+import * as utils from './utils';
+
+jest.mock('./featureFlagUtils', () => {
+  return {
+    isDatagridEditEnabled: jest.fn().mockReturnValue(true),
+  };
+});
+
+jest.mock('./utils', () => {
+  const originalModule = jest.requireActual('./utils');
+  return {
+    ...originalModule,
+    deleteRows: jest.fn(),
+    clearCellsFromRangeSelection: jest.fn(),
+    publishSnapshot: jest.fn(),
+  };
+});
+
+describe('DataGrid', () => {
+  describe('when there is no data', () => {
+    it('renders without error', () => {
+      window.ResizeObserver = jest.fn().mockImplementation(() => ({
+        observe: jest.fn(),
+        unobserve: jest.fn(),
+        disconnect: jest.fn(),
+      }));
+
+      const props = buildPanelProps();
+
+      render(<DataGridPanel {...props} />);
+
+      expect(screen.getByText(/Unable to render data/i)).toBeInTheDocument();
+    });
+  });
+  describe('when there is data', () => {
+    let props: DataGridProps;
+
+    beforeEach(() => {
+      dataGridMocks();
+
+      props = buildPanelProps({
+        fields: [
+          { name: 'A', type: FieldType.number, values: [1, 2, 3, 4], config: {} },
+          { name: 'B', type: FieldType.string, values: ['a', 'b', 'c', 'd'], config: {} },
+          { name: 'C', type: FieldType.string, values: ['a', 'b', 'c', 'd'], config: {} },
+        ],
+        length: 4,
+      });
+    });
+
+    afterEach(() => {
+      jest.clearAllTimers();
+      jest.clearAllMocks();
+    });
+
+    it('converts dataframe values to cell values properly', () => {
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />);
+      prep(false);
+
+      expect(screen.getByTestId('glide-cell-1-0')).toHaveTextContent('1');
+      expect(screen.getByTestId('glide-cell-2-1')).toHaveTextContent('b');
+      expect(screen.getByTestId('glide-cell-3-2')).toHaveTextContent('c');
+      expect(screen.getByTestId('glide-cell-3-3')).toHaveTextContent('d');
+    });
+
+    it('should open context menu on right click', async () => {
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      const scroller = prep();
+
+      if (!scroller) {
+        return;
+      }
+
+      screen.getByTestId('data-grid-canvas');
+      fireEvent.contextMenu(scroller, {
+        clientX: 30,
+        clientY: 36 + 32 + 16,
+      });
+
+      expect(screen.getByLabelText('Context menu')).toBeInTheDocument();
+
+      // on right clicking row checkboxes, only row options should be open
+      expect(screen.getByText('Delete row')).toBeInTheDocument();
+      expect(screen.getByText('Clear row')).toBeInTheDocument();
+      expect(screen.getByText('Remove all data')).toBeInTheDocument();
+      expect(screen.getByText('Search...')).toBeInTheDocument();
+
+      // no column options should be available at this point
+      expect(screen.queryByText('Delete column')).not.toBeInTheDocument();
+
+      // click on a column cell should show both row and column options
+      fireEvent.contextMenu(scroller, {
+        clientX: 50,
+        clientY: 36 + 32 + 16,
+      });
+
+      expect(screen.getByText('Delete row')).toBeInTheDocument();
+      expect(screen.getByText('Clear row')).toBeInTheDocument();
+      expect(screen.getByText('Delete column')).toBeInTheDocument();
+      expect(screen.getByText('Clear column')).toBeInTheDocument();
+      expect(screen.getByText('Remove all data')).toBeInTheDocument();
+      expect(screen.getByText('Search...')).toBeInTheDocument();
+
+      // click on header cell should show only column options
+      fireEvent.contextMenu(scroller, {
+        clientX: 50,
+        clientY: 36,
+      });
+
+      expect(screen.getByText('Delete column')).toBeInTheDocument();
+      expect(screen.getByText('Clear column')).toBeInTheDocument();
+      expect(screen.getByText('Remove all data')).toBeInTheDocument();
+      expect(screen.getByText('Search...')).toBeInTheDocument();
+
+      // no row options should be available at this point
+      expect(screen.queryByText('Delete row')).not.toBeInTheDocument();
+    });
+    it('should show correct deletion values when selection multiple rows', async () => {
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      const scroller = prep();
+
+      if (!scroller) {
+        return;
+      }
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+
+      sendClick(canvas, {
+        clientX: 30,
+        clientY: 36 + 32 + 16,
+        shiftKey: true,
+      });
+
+      sendClick(canvas, {
+        clientX: 30,
+        clientY: 36 + 32 + 16 + 30,
+        shiftKey: true,
+      });
+
+      fireEvent.contextMenu(scroller, {
+        clientX: 30,
+        clientY: 36 + 32 + 16 + 30,
+      });
+
+      expect(screen.queryByText('Delete 2 rows')).toBeInTheDocument();
+    });
+
+    it('should show correct deletion values when selection multiple columns', async () => {
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      const scroller = prep();
+
+      if (!scroller) {
+        return;
+      }
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+
+      sendClick(canvas, {
+        clientX: 40,
+        clientY: 36,
+        shiftKey: true,
+      });
+
+      sendClick(canvas, {
+        clientX: 120,
+        clientY: 36,
+        shiftKey: true,
+      });
+
+      fireEvent.contextMenu(scroller, {
+        clientX: 120,
+        clientY: 36,
+      });
+
+      expect(screen.queryByText('Delete 2 columns')).toBeInTheDocument();
+    });
+
+    it('editing a cell triggers publishing the snapshot', async () => {
+      const spy = jest.spyOn(utils, 'publishSnapshot');
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      prep();
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+      //click on cell
+      sendClick(canvas, {
+        clientX: 50,
+        clientY: 36 + 32 + 16,
+      });
+
+      //press key, this will open the overlay input and set it to the pressed key value
+      fireEvent.keyDown(canvas, {
+        keyCode: 74,
+        key: '9',
+      });
+
+      const expectedField = {
+        ...props.data.series[0].fields[0],
+      };
+      expectedField.values = new ArrayVector([1, 9, 3, 4]);
+
+      await waitFor(() => {
+        const overlay = screen.getByDisplayValue('9');
+
+        // press enter to commit the value and close the overlay
+        jest.useFakeTimers();
+        fireEvent.keyDown(overlay, {
+          key: 'Enter',
+        });
+
+        act(() => {
+          jest.runAllTimers();
+        });
+
+        expect(spy).toHaveBeenCalledWith(
+          expect.objectContaining({
+            fields: expect.arrayContaining([expectedField]),
+          }),
+          1
+        );
+      });
+    });
+
+    it('should not be able to a edit cell when there is a grid selection', async () => {
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      prep();
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+      //2 clicks with shift to select multiple cells
+      sendClick(canvas, {
+        clientX: 50,
+        clientY: 36 + 32 + 16,
+        shiftKey: true,
+      });
+
+      sendClick(canvas, {
+        clientX: 120,
+        clientY: 36 + 32 + 40,
+        shiftKey: true,
+      });
+
+      // keydown to trigger overlay input on cell edit. since
+      // there is a selection the overlay should not be visible
+      fireEvent.keyDown(canvas, {
+        keyCode: 74,
+        key: '1',
+      });
+
+      await waitFor(() => {
+        expect(screen.queryByDisplayValue('1')).not.toBeInTheDocument();
+      });
+    });
+    it('should add a new column', async () => {
+      const spy = jest.spyOn(utils, 'publishSnapshot');
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      prep();
+
+      const addColumnBtn = screen.getByText('+');
+
+      fireEvent.click(addColumnBtn);
+
+      const columnInput = screen.getByTestId('column-input');
+
+      fireEvent.change(columnInput, {
+        target: { value: 'newColumn' },
+      });
+
+      fireEvent.blur(columnInput);
+
+      expect(spy).toBeCalledWith(
+        expect.objectContaining({
+          fields: expect.arrayContaining([
+            expect.objectContaining({
+              name: 'newColumn',
+              type: 'string',
+              values: new ArrayVector(['', '', '', '']),
+            }),
+          ]),
+        }),
+        1
+      );
+    });
+    it('should not add a new column if input is empty', async () => {
+      const spy = jest.spyOn(utils, 'publishSnapshot');
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      prep();
+
+      const addColumnBtn = screen.getByText('+');
+
+      fireEvent.click(addColumnBtn);
+
+      const columnInput = screen.getByTestId('column-input');
+
+      fireEvent.blur(columnInput);
+
+      expect(spy).not.toBeCalled();
+    });
+    it('should add a new row', async () => {
+      const spy = jest.spyOn(utils, 'publishSnapshot');
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      prep();
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+
+      sendClick(canvas, {
+        clientX: 60,
+        clientY: 36 + 32 * 5, //click add row
+      });
+
+      expect(spy).toBeCalled();
+    });
+
+    it('should close context menu on right click', async () => {
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      const scroller = prep();
+
+      if (!scroller) {
+        return;
+      }
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+      fireEvent.contextMenu(scroller, {
+        clientX: 30,
+        clientY: 36 + 32 + 16,
+      });
+
+      expect(screen.getByLabelText('Context menu')).toBeInTheDocument();
+
+      sendClick(canvas, {
+        clientX: 30,
+        clientY: 36 + 32 + 16,
+      });
+
+      expect(screen.queryByLabelText('Context menu')).not.toBeInTheDocument();
+    });
+
+    it('should clear cell when cell is selected and delete button clicked', async () => {
+      const spyClearingCells = jest.spyOn(utils, 'clearCellsFromRangeSelection');
+      const spyDeleteRows = jest.spyOn(utils, 'deleteRows');
+      const spy = jest.spyOn(utils, 'publishSnapshot');
+
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      const scroller = prep();
+
+      if (!scroller) {
+        return;
+      }
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+      sendClick(canvas, {
+        clientX: 60,
+        clientY: 36 + 32 + 16,
+      });
+
+      fireEvent.keyDown(canvas, {
+        key: 'Delete',
+      });
+
+      expect(spy).toBeCalled();
+      expect(spyClearingCells).toBeCalled();
+      expect(spyDeleteRows).not.toBeCalled();
+    });
+
+    it('should clear row when row is selected delete button clicked', async () => {
+      const spyClearingCells = jest.spyOn(utils, 'clearCellsFromRangeSelection');
+      const spyDeleteRows = jest.spyOn(utils, 'deleteRows');
+      const spy = jest.spyOn(utils, 'publishSnapshot');
+
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      prep();
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+      sendClick(canvas, {
+        clientX: 30,
+        clientY: 36 + 32 + 16,
+      });
+
+      fireEvent.keyDown(canvas, {
+        key: 'Delete',
+      });
+
+      expect(spy).toBeCalled();
+      expect(spyClearingCells).not.toBeCalled();
+      expect(spyDeleteRows).toBeCalled();
+    });
+
+    it('should move column when column dragged and dropped', async () => {
+      const spy = jest.spyOn(utils, 'publishSnapshot');
+
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      prep();
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+
+      fireEvent.mouseDown(canvas, {
+        clientX: 50,
+        clientY: 36,
+      });
+
+      fireEvent.mouseMove(canvas, {
+        clientX: 120,
+        clientY: 36,
+      });
+
+      fireEvent.mouseUp(canvas);
+
+      const df = new MutableDataFrame(props.data.series[0]);
+
+      df.fields = [df.fields[1], df.fields[0], df.fields[2]];
+      const received = spy.mock.calls[spy.mock.calls.length - 1][0].fields.map((f) => f.name);
+
+      expect(received).toEqual(df.fields.map((f) => f.name));
+    });
+
+    it('should move row when row dragged and dropped', async () => {
+      const spy = jest.spyOn(utils, 'publishSnapshot');
+
+      jest.useFakeTimers();
+      render(<DataGridPanel {...props} />, {
+        wrapper: Context,
+      });
+      prep();
+
+      const canvas = screen.getByTestId('data-grid-canvas');
+
+      fireEvent.mouseDown(canvas, {
+        clientX: 30,
+        clientY: 36 + 16,
+      });
+
+      fireEvent.mouseMove(canvas, {
+        clientX: 30,
+        clientY: 36 + 32 + 32 + 16,
+      });
+
+      fireEvent.mouseUp(canvas);
+
+      const received: DataFrame = spy.mock.calls[spy.mock.calls.length - 1][0];
+
+      expect(received.fields[0].values[0]).toEqual(2);
+      expect(received.fields[0].values[1]).toEqual(3);
+      expect(received.fields[0].values[2]).toEqual(1);
+      expect(received.fields[0].values[3]).toEqual(4);
+
+      expect(received.fields[1].values[0]).toEqual('b');
+      expect(received.fields[1].values[1]).toEqual('c');
+      expect(received.fields[1].values[2]).toEqual('a');
+      expect(received.fields[1].values[3]).toEqual('d');
+
+      expect(received.fields[2].values[0]).toEqual('b');
+      expect(received.fields[2].values[1]).toEqual('c');
+      expect(received.fields[2].values[2]).toEqual('a');
+      expect(received.fields[2].values[3]).toEqual('d');
+    });
+  });
+});
+
+const buildPanelProps = (...df: DataFrame[]) => {
+  const timeRange = {
+    from: dateTime(),
+    to: dateTime(),
+    raw: {
+      from: dateTime(),
+      to: dateTime(),
+    },
+  };
+
+  return {
+    id: 1,
+    title: 'DataGrid',
+    options: { selectedSeries: 0 },
+    data: {
+      series: df,
+      state: LoadingState.Done,
+      timeRange,
+    },
+    timeRange,
+    timeZone: 'browser',
+    width: 500,
+    height: 500,
+    transparent: false,
+    renderCounter: 0,
+    onOptionsChange: jest.fn(),
+    onFieldConfigChange: jest.fn(),
+    onChangeTimeRange: jest.fn(),
+    replaceVariables: jest.fn(),
+    eventBus: {} as EventBus,
+    fieldConfig: {
+      defaults: {},
+      overrides: [],
+    },
+  };
+};
+
+const prep = (resetTimers = true) => {
+  const scroller = document.getElementsByClassName('dvn-scroller').item(0);
+  if (scroller !== null) {
+    jest.spyOn(scroller, 'clientWidth', 'get').mockImplementation(() => 1000);
+    jest.spyOn(scroller, 'clientHeight', 'get').mockImplementation(() => 1000);
+  }
+
+  act(() => {
+    jest.runAllTimers();
+  });
+  if (resetTimers) {
+    jest.useRealTimers();
+  } else {
+    act(() => {
+      jest.runAllTimers();
+    });
+  }
+
+  return scroller;
+};
+
+const dataGridMocks = () => {
+  window.ResizeObserver = jest.fn().mockImplementation(() => ({
+    observe: jest.fn(),
+    unobserve: jest.fn(),
+    disconnect: jest.fn(),
+  }));
+
+  Element.prototype.scrollTo = jest.fn();
+  Element.prototype.scrollBy = jest.fn();
+  Element.prototype.getBoundingClientRect = () => ({
+    bottom: 1000,
+    height: 1000,
+    left: 0,
+    right: 1000,
+    top: 0,
+    width: 1000,
+    x: 0,
+    y: 0,
+    toJSON: () => '',
+  });
+  Object.defineProperties(HTMLElement.prototype, {
+    offsetWidth: {
+      get() {
+        return 1000;
+      },
+    },
+  });
+  Image.prototype.decode = jest.fn();
+};
+
+const sendClick = (el: Element | Node | Document | Window, options?: {}): void => {
+  fireEvent.mouseDown(el, options);
+  fireEvent.mouseUp(el, options);
+  fireEvent.click(el, options);
+};
+
+const Context = (p: any) => {
+  return (
+    <>
+      {p.children}
+      <div id="grafana-portal-container"></div>
+    </>
+  );
+};
diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
new file mode 100644
index 00000000000..7e0ba377af4
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
@@ -0,0 +1,281 @@
+import DataEditor, {
+  GridCell,
+  Item,
+  GridColumn,
+  EditableGridCell,
+  GridSelection,
+  CellClickedEventArgs,
+  Rectangle,
+  HeaderClickedEventArgs,
+} from '@glideapps/glide-data-grid';
+import React, { useEffect, useReducer } from 'react';
+
+import { ArrayVector, Field, MutableDataFrame, PanelProps, FieldType } from '@grafana/data';
+import { PanelDataErrorView } from '@grafana/runtime';
+import { useTheme2 } from '@grafana/ui';
+
+import '@glideapps/glide-data-grid/dist/index.css';
+
+import { AddColumn } from './components/AddColumn';
+import { DatagridContextMenu } from './components/DatagridContextMenu';
+import { RenameColumnCell } from './components/RenameColumnCell';
+import { isDatagridEditEnabled } from './featureFlagUtils';
+import { PanelOptions } from './panelcfg.gen';
+import { DatagridActionType, datagridReducer, initialState } from './state';
+import {
+  clearCellsFromRangeSelection,
+  deleteRows,
+  EMPTY_CELL,
+  getGridCellKind,
+  getGridTheme,
+  publishSnapshot,
+  RIGHT_ELEMENT_PROPS,
+  TRAILING_ROW_OPTIONS,
+  getStyles,
+  ROW_MARKER_BOTH,
+  ROW_MARKER_NUMBER,
+  hasGridSelection,
+} from './utils';
+
+export interface DataGridProps extends PanelProps<PanelOptions> {}
+
+export function DataGridPanel({ options, data, id, fieldConfig, width, height }: DataGridProps) {
+  const [state, dispatch] = useReducer(datagridReducer, initialState);
+  const {
+    columns,
+    contextMenuData,
+    renameColumnInputData,
+    gridSelection,
+    columnFreezeIndex,
+    toggleSearch,
+    isResizeInProgress,
+  } = state;
+
+  const frame = data.series[options.selectedSeries ?? 0];
+
+  const theme = useTheme2();
+  const gridTheme = getGridTheme(theme);
+
+  useEffect(() => {
+    if (!frame) {
+      return;
+    }
+
+    dispatch({ type: DatagridActionType.updateColumns, payload: { frame } });
+  }, [frame]);
+
+  const getCellContent = ([col, row]: Item): GridCell => {
+    const field: Field = frame.fields[col];
+
+    if (!field || row > frame.length) {
+      return EMPTY_CELL;
+    }
+
+    return getGridCellKind(field, row, hasGridSelection(gridSelection));
+  };
+
+  const onCellEdited = (cell: Item, newValue: EditableGridCell) => {
+    const [col, row] = cell;
+    const field: Field = frame.fields[col];
+
+    if (!field) {
+      return;
+    }
+
+    const values = field.values.toArray();
+
+    values[row] = newValue.data;
+    field.values = new ArrayVector(values);
+
+    publishSnapshot(new MutableDataFrame(frame), id);
+  };
+
+  const onColumnInputBlur = (columnName: string) => {
+    const len = frame.length ?? 0;
+    const newFrame = new MutableDataFrame(frame);
+
+    const field: Field = {
+      name: columnName,
+      type: FieldType.string,
+      config: {},
+      values: new ArrayVector(new Array(len).fill('')),
+    };
+
+    newFrame.addField(field);
+
+    publishSnapshot(newFrame, id);
+  };
+
+  const addNewRow = () => {
+    //TODO use .appendRow() after fieldValues refactor is finished
+    const newFrame = new MutableDataFrame(frame);
+
+    newFrame.fields.map((field) => {
+      field.values = new ArrayVector([...field.values.toArray(), null]);
+    });
+
+    publishSnapshot(newFrame, id);
+  };
+
+  const onColumnResize = (column: GridColumn, width: number, columnIndex: number, newSizeWithGrow: number) => {
+    dispatch({ type: DatagridActionType.columnResizeStart, payload: { columnIndex, width } });
+  };
+
+  //Hack used to allow resizing last column, near add column btn. This is a workaround for a bug in the grid component
+  const onColumnResizeEnd = (column: GridColumn, newSize: number, colIndex: number, newSizeWithGrow: number) => {
+    dispatch({ type: DatagridActionType.columnResizeEnd });
+  };
+
+  const closeContextMenu = () => {
+    dispatch({ type: DatagridActionType.closeContextMenu });
+  };
+
+  const onDeletePressed = (selection: GridSelection) => {
+    if (selection.current && selection.current.range) {
+      publishSnapshot(clearCellsFromRangeSelection(frame, selection.current.range), id);
+      return true;
+    }
+
+    if (selection.rows) {
+      publishSnapshot(deleteRows(frame, selection.rows.toArray()), id);
+      return true;
+    }
+
+    return false;
+  };
+
+  const onCellContextMenu = (cell: Item, event: CellClickedEventArgs) => {
+    event.preventDefault();
+    dispatch({ type: DatagridActionType.openCellContextMenu, payload: { event, cell } });
+  };
+
+  const onHeaderContextMenu = (columnIndex: number, event: HeaderClickedEventArgs) => {
+    event.preventDefault();
+    dispatch({ type: DatagridActionType.openHeaderContextMenu, payload: { event, columnIndex } });
+  };
+
+  const onHeaderMenuClick = (col: number, screenPosition: Rectangle) => {
+    dispatch({
+      type: DatagridActionType.openHeaderDropdownMenu,
+      payload: { screenPosition, columnIndex: col, value: frame.fields[col].name },
+    });
+  };
+
+  const onColumnMove = (from: number, to: number) => {
+    const newFrame = new MutableDataFrame(frame);
+    const field = newFrame.fields[from];
+    newFrame.fields.splice(from, 1);
+    newFrame.fields.splice(to, 0, field);
+
+    dispatch({ type: DatagridActionType.columnMove, payload: { from, to } });
+    publishSnapshot(newFrame, id);
+  };
+
+  const onRowMove = (from: number, to: number) => {
+    const newFrame = new MutableDataFrame(frame);
+
+    for (const field of newFrame.fields) {
+      const values = field.values.toArray();
+      const value = values[from];
+      values.splice(from, 1);
+      values.splice(to, 0, value);
+      field.values = new ArrayVector(values);
+    }
+
+    publishSnapshot(newFrame, id);
+  };
+
+  const onColumnRename = () => {
+    dispatch({ type: DatagridActionType.showColumnRenameInput });
+  };
+
+  const onRenameInputBlur = (columnName: string, columnIdx: number) => {
+    const newFrame = new MutableDataFrame(frame);
+    newFrame.fields[columnIdx].name = columnName;
+
+    dispatch({ type: DatagridActionType.hideColumnRenameInput });
+    publishSnapshot(newFrame, id);
+  };
+
+  const onSearchClose = () => {
+    dispatch({ type: DatagridActionType.closeSearch });
+  };
+
+  const onGridSelectionChange = (selection: GridSelection) => {
+    dispatch({ type: DatagridActionType.multipleCellsSelected, payload: { selection } });
+  };
+
+  if (!frame) {
+    return <PanelDataErrorView panelId={id} fieldConfig={fieldConfig} data={data} />;
+  }
+
+  if (!document.getElementById('portal')) {
+    const portal = document.createElement('div');
+    portal.id = 'portal';
+    document.body.appendChild(portal);
+  }
+
+  const styles = getStyles(theme, isResizeInProgress);
+
+  return (
+    <>
+      <DataEditor
+        className={styles.dataEditor}
+        getCellContent={getCellContent}
+        columns={columns}
+        rows={frame.length}
+        width={width}
+        height={height}
+        initialSize={[width, height]}
+        theme={gridTheme}
+        smoothScrollX
+        smoothScrollY
+        overscrollY={50}
+        onCellEdited={isDatagridEditEnabled() ? onCellEdited : undefined}
+        getCellsForSelection={isDatagridEditEnabled() ? true : undefined}
+        showSearch={isDatagridEditEnabled() ? toggleSearch : false}
+        onSearchClose={onSearchClose}
+        onPaste={isDatagridEditEnabled() ? true : undefined}
+        gridSelection={gridSelection}
+        onGridSelectionChange={isDatagridEditEnabled() ? onGridSelectionChange : undefined}
+        onRowAppended={isDatagridEditEnabled() ? addNewRow : undefined}
+        onDelete={isDatagridEditEnabled() ? onDeletePressed : undefined}
+        rowMarkers={isDatagridEditEnabled() ? ROW_MARKER_BOTH : ROW_MARKER_NUMBER}
+        onColumnResize={onColumnResize}
+        onColumnResizeEnd={onColumnResizeEnd}
+        onCellContextMenu={isDatagridEditEnabled() ? onCellContextMenu : undefined}
+        onHeaderContextMenu={isDatagridEditEnabled() ? onHeaderContextMenu : undefined}
+        onHeaderMenuClick={isDatagridEditEnabled() ? onHeaderMenuClick : undefined}
+        trailingRowOptions={TRAILING_ROW_OPTIONS}
+        rightElement={
+          isDatagridEditEnabled() ? (
+            <AddColumn onColumnInputBlur={onColumnInputBlur} divStyle={styles.addColumnDiv} />
+          ) : null
+        }
+        rightElementProps={RIGHT_ELEMENT_PROPS}
+        freezeColumns={columnFreezeIndex}
+        onRowMoved={isDatagridEditEnabled() ? onRowMove : undefined}
+        onColumnMoved={isDatagridEditEnabled() ? onColumnMove : undefined}
+      />
+      {contextMenuData.isContextMenuOpen && (
+        <DatagridContextMenu
+          menuData={contextMenuData}
+          data={frame}
+          saveData={(data) => publishSnapshot(data, id)}
+          closeContextMenu={closeContextMenu}
+          dispatch={dispatch}
+          gridSelection={gridSelection}
+          columnFreezeIndex={columnFreezeIndex}
+          renameColumnClicked={onColumnRename}
+        />
+      )}
+      {renameColumnInputData.isInputOpen ? (
+        <RenameColumnCell
+          onColumnInputBlur={onRenameInputBlur}
+          renameColumnData={renameColumnInputData}
+          classStyle={styles.renameColumnInput}
+        />
+      ) : null}
+    </>
+  );
+}
diff --git a/public/app/plugins/panel/datagrid/README.md b/public/app/plugins/panel/datagrid/README.md
new file mode 100644
index 00000000000..1490cced2c9
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/README.md
@@ -0,0 +1,5 @@
+# Datagrid Panel - Native Plugin
+
+This Datagrid panel is **included** with Grafana.
+
+The datagrid panel allows users to edit their data.
diff --git a/public/app/plugins/panel/datagrid/components/AddColumn.tsx b/public/app/plugins/panel/datagrid/components/AddColumn.tsx
new file mode 100644
index 00000000000..215b902cbb1
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/components/AddColumn.tsx
@@ -0,0 +1,35 @@
+import React, { useState } from 'react';
+
+import { SimpleInput } from './SimpleInput';
+
+interface AddColumnProps {
+  divStyle: string;
+  onColumnInputBlur: (columnName: string) => void;
+}
+
+export const AddColumn = ({ divStyle, onColumnInputBlur }: AddColumnProps) => {
+  const [showInput, setShowInput] = useState<boolean>(false);
+
+  const setupColumnInput = () => {
+    setShowInput(true);
+  };
+
+  const onBlur = (e: React.FocusEvent<HTMLInputElement>) => {
+    const columnName = e.target.value;
+    if (columnName) {
+      onColumnInputBlur(columnName);
+    }
+
+    setShowInput(false);
+  };
+
+  return (
+    <div className={divStyle}>
+      {showInput ? (
+        <SimpleInput placeholder="Column Name" onBlur={onBlur} />
+      ) : (
+        <button onClick={setupColumnInput}>+</button>
+      )}
+    </div>
+  );
+};
diff --git a/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx b/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
new file mode 100644
index 00000000000..2189a3a1693
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
@@ -0,0 +1,247 @@
+import { GridSelection } from '@glideapps/glide-data-grid';
+import { capitalize } from 'lodash';
+import React from 'react';
+
+import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+import { convertFieldType } from '@grafana/data/src/transformations/transformers/convertFieldType';
+import { ContextMenu, MenuGroup, MenuItem } from '@grafana/ui';
+import { MenuDivider } from '@grafana/ui/src/components/Menu/MenuDivider';
+
+import { DatagridAction, DatagridActionType } from '../state';
+import { cleanStringFieldAfterConversion, DatagridContextMenuData, deleteRows, EMPTY_DF } from '../utils';
+
+interface ContextMenuProps {
+  menuData: DatagridContextMenuData;
+  data: DataFrame;
+  saveData: (data: DataFrame) => void;
+  dispatch: React.Dispatch<DatagridAction>;
+  closeContextMenu: () => void;
+  gridSelection: GridSelection;
+  columnFreezeIndex: number;
+  renameColumnClicked: () => void;
+}
+
+export const DatagridContextMenu = ({
+  menuData,
+  data,
+  saveData,
+  closeContextMenu,
+  dispatch,
+  gridSelection,
+  columnFreezeIndex,
+  renameColumnClicked,
+}: ContextMenuProps) => {
+  let selectedRows: number[] = [];
+  let selectedColumns: number[] = [];
+  const { row, column, x, y, isHeaderMenu } = menuData;
+
+  if (gridSelection.rows) {
+    selectedRows = gridSelection.rows.toArray();
+  }
+
+  if (gridSelection.columns) {
+    selectedColumns = gridSelection.columns.toArray();
+  }
+
+  let rowDeletionLabel = 'Delete row';
+  if (selectedRows.length && selectedRows.length > 1) {
+    rowDeletionLabel = `Delete ${selectedRows.length} rows`;
+  }
+
+  let columnDeletionLabel = 'Delete column';
+  if (selectedColumns.length && selectedColumns.length > 1) {
+    columnDeletionLabel = `Delete ${selectedColumns.length} columns`;
+  }
+
+  const showDeleteRow = (row !== undefined && row >= 0) || selectedRows.length;
+  const showDeleteColumn = (column !== undefined && column >= 0) || selectedColumns.length;
+  const showClearRow = row !== undefined && row >= 0 && !selectedRows.length;
+  const showClearColumn = column !== undefined && column >= 0 && !selectedColumns.length;
+
+  const renderContextMenuItems = () => (
+    <>
+      {showDeleteRow ? (
+        <MenuItem
+          label={rowDeletionLabel}
+          onClick={() => {
+            if (selectedRows.length) {
+              saveData(deleteRows(data, selectedRows, true));
+              dispatch({ type: DatagridActionType.gridSelectionCleared });
+              return;
+            }
+
+            if (row !== undefined && row >= 0) {
+              saveData(deleteRows(data, [row], true));
+            }
+          }}
+        />
+      ) : null}
+      {showDeleteColumn ? (
+        <MenuItem
+          label={columnDeletionLabel}
+          onClick={() => {
+            if (selectedColumns.length) {
+              saveData({
+                ...data,
+                fields: data.fields.filter((_, index) => !selectedColumns.includes(index)),
+              });
+              return;
+            }
+
+            if (column !== undefined && column >= 0) {
+              saveData({
+                ...data,
+                fields: data.fields.filter((_, index) => index !== column),
+              });
+            }
+          }}
+        />
+      ) : null}
+      {showDeleteColumn || showDeleteRow ? <MenuDivider /> : null}
+      {showClearRow ? (
+        <MenuItem
+          label="Clear row"
+          onClick={() => {
+            saveData(deleteRows(data, [row]));
+          }}
+        />
+      ) : null}
+      {showClearColumn ? (
+        <MenuItem
+          label="Clear column"
+          onClick={() => {
+            const field = data.fields[column];
+            field.values = new ArrayVector(field.values.toArray().map(() => null));
+
+            saveData({
+              ...data,
+            });
+          }}
+        />
+      ) : null}
+      {showClearRow || showClearColumn ? <MenuDivider /> : null}
+      <MenuItem
+        label="Remove all data"
+        onClick={() => {
+          saveData(EMPTY_DF);
+        }}
+      />
+      <MenuItem label="Search..." onClick={() => dispatch({ type: DatagridActionType.openSearch })} />
+    </>
+  );
+
+  const renderHeaderMenuItems = () => {
+    if (column === null || column === undefined) {
+      return null;
+    }
+
+    const fieldType = data.fields[column].type;
+    const fieldTypeConversionData: Array<{
+      label: string;
+      options: {
+        targetField: string;
+        destinationType: FieldType;
+      };
+    }> = [];
+
+    const addToConversionData = (fieldType: FieldType) => {
+      fieldTypeConversionData.push({
+        label: capitalize(fieldType),
+        options: {
+          targetField: data.fields[column].name,
+          destinationType: fieldType,
+        },
+      });
+    };
+
+    if (fieldType === FieldType.string) {
+      addToConversionData(FieldType.number);
+      addToConversionData(FieldType.boolean);
+    } else if (fieldType === FieldType.number) {
+      addToConversionData(FieldType.string);
+      addToConversionData(FieldType.boolean);
+    } else if (fieldType === FieldType.boolean) {
+      addToConversionData(FieldType.number);
+      addToConversionData(FieldType.string);
+    } else {
+      addToConversionData(FieldType.string);
+      addToConversionData(FieldType.number);
+      addToConversionData(FieldType.boolean);
+    }
+
+    let columnFreezeLabel = 'Set column freeze position';
+    const columnIndex = column + 1;
+    if (columnFreezeIndex === columnIndex) {
+      columnFreezeLabel = 'Unset column freeze';
+    }
+
+    return (
+      <>
+        {fieldTypeConversionData.length ? (
+          <MenuGroup label="Set field type">
+            {fieldTypeConversionData.map((conversionData, index) => (
+              <MenuItem
+                key={index}
+                label={conversionData.label}
+                onClick={() => {
+                  const field = convertFieldType(data.fields[column], conversionData.options);
+                  if (conversionData.options.destinationType === FieldType.string) {
+                    cleanStringFieldAfterConversion(field);
+                  }
+
+                  const copy = {
+                    name: data.name,
+                    fields: [...data.fields],
+                    length: data.length,
+                  };
+                  copy.fields[column] = field;
+
+                  saveData(copy);
+                }}
+              />
+            ))}
+          </MenuGroup>
+        ) : null}
+        <MenuDivider />
+        <MenuItem
+          label={columnFreezeLabel}
+          onClick={() => {
+            if (columnFreezeIndex === columnIndex) {
+              dispatch({ type: DatagridActionType.columnFreezeReset });
+            } else {
+              dispatch({ type: DatagridActionType.columnFreezeChanged, payload: { columnIndex } });
+            }
+          }}
+        />
+        <MenuItem label="Rename column" onClick={renameColumnClicked} />
+        <MenuDivider />
+        <MenuItem
+          label={columnDeletionLabel}
+          onClick={() => {
+            if (selectedColumns.length) {
+              saveData({
+                ...data,
+                fields: data.fields.filter((_, index) => !selectedColumns.includes(index)),
+              });
+              return;
+            }
+
+            saveData({
+              ...data,
+              fields: data.fields.filter((_, index) => index !== column),
+            });
+          }}
+        />
+      </>
+    );
+  };
+
+  return (
+    <ContextMenu
+      renderMenuItems={isHeaderMenu ? renderHeaderMenuItems : renderContextMenuItems}
+      x={x!}
+      y={y!}
+      onClose={closeContextMenu}
+    />
+  );
+};
diff --git a/public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx b/public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx
new file mode 100644
index 00000000000..5e1f98d976e
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx
@@ -0,0 +1,71 @@
+import React, { useLayoutEffect, useRef, useState } from 'react';
+
+import { Portal } from '@grafana/ui';
+
+import { RenameColumnInputData } from '../utils';
+
+interface RenameColumnProps {
+  renameColumnData: RenameColumnInputData;
+  onColumnInputBlur: (columnName: string, columnIdx: number) => void;
+  classStyle?: string;
+}
+
+export const RenameColumnCell = ({ renameColumnData, onColumnInputBlur, classStyle }: RenameColumnProps) => {
+  const { x, y, width, height, inputValue, columnIdx } = renameColumnData;
+  const [styles, setStyles] = useState({});
+  const [value, setValue] = useState<string>(inputValue!);
+  const ref = useRef<HTMLInputElement>(null);
+
+  useLayoutEffect(() => {
+    ref.current?.focus();
+
+    const rect = ref.current?.getBoundingClientRect();
+    if (rect) {
+      const collisions = {
+        right: window.innerWidth < x! + rect.width,
+        bottom: window.innerHeight < y! + rect.height,
+      };
+
+      setStyles({
+        position: 'fixed',
+        left: collisions.right ? x! - rect.width : x!,
+        top: collisions.bottom ? y! - rect.height : y!,
+        width: width,
+        height: height,
+      });
+    }
+  }, [height, width, x, y]);
+
+  const onBlur = (e: React.FocusEvent<HTMLInputElement>) => {
+    const columnName = e.target.value;
+    if (columnName) {
+      onColumnInputBlur(columnName, columnIdx!);
+    }
+  };
+
+  const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setValue(e.target.value);
+  };
+
+  const onKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === 'Enter') {
+      const target = e.target as HTMLInputElement;
+      target.blur();
+    }
+  };
+
+  return (
+    <Portal>
+      <input
+        type="text"
+        className={classStyle}
+        value={value}
+        onBlur={onBlur}
+        ref={ref}
+        style={styles}
+        onChange={onChange}
+        onKeyDown={onKeyDown}
+      />
+    </Portal>
+  );
+};
diff --git a/public/app/plugins/panel/datagrid/components/SimpleInput.tsx b/public/app/plugins/panel/datagrid/components/SimpleInput.tsx
new file mode 100644
index 00000000000..e5e8b7bf305
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/components/SimpleInput.tsx
@@ -0,0 +1,36 @@
+import React, { useRef, useEffect } from 'react';
+
+interface InputProps {
+  onBlur: (e: React.FocusEvent<HTMLInputElement>) => void;
+  placeholder: string;
+}
+
+export const SimpleInput = ({ onBlur, placeholder }: InputProps) => {
+  const ref = useRef<HTMLInputElement>(null);
+
+  useEffect(() => {
+    if (!ref.current) {
+      return;
+    }
+
+    ref.current.focus();
+  });
+
+  const onKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === 'Enter') {
+      const target = e.target as HTMLInputElement;
+      target.blur();
+    }
+  };
+
+  return (
+    <input
+      type="text"
+      placeholder={placeholder}
+      onBlur={onBlur}
+      ref={ref}
+      onKeyDown={onKeyDown}
+      data-testid="column-input"
+    />
+  );
+};
diff --git a/public/app/plugins/panel/datagrid/featureFlagUtils.tsx b/public/app/plugins/panel/datagrid/featureFlagUtils.tsx
new file mode 100644
index 00000000000..e2fed546cf0
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/featureFlagUtils.tsx
@@ -0,0 +1,5 @@
+import { config } from '@grafana/runtime';
+
+export const isDatagridEditEnabled = () => {
+  return config.featureToggles.enableDatagridEditing;
+};
diff --git a/public/app/plugins/panel/datagrid/img/icn-table-panel.svg b/public/app/plugins/panel/datagrid/img/icn-table-panel.svg
new file mode 100644
index 00000000000..21846a8d38f
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/img/icn-table-panel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 79.8 78.47"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-2);}.cls-3{fill:url(#linear-gradient-3);}.cls-4{fill:#84aff1;}.cls-5{fill:#3865ab;}</style><linearGradient id="linear-gradient" y1="6.25" x2="23.93" y2="6.25" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2cc0c"/><stop offset="1" stop-color="#ff9830"/></linearGradient><linearGradient id="linear-gradient-2" x1="55.87" y1="6.25" x2="79.8" y2="6.25" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-3" x1="27.93" y1="6.25" x2="51.87" y2="6.25" xlink:href="#linear-gradient"/></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M0,1V12.49H23.93V0H1A1,1,0,0,0,0,1Z"/><path class="cls-2" d="M55.87,12.49H79.8V1a1,1,0,0,0-1-1H55.87Z"/><rect class="cls-3" x="27.93" width="23.93" height="12.49"/><rect class="cls-4" x="27.93" y="16.49" width="23.93" height="12.49"/><rect class="cls-4" y="16.49" width="23.93" height="12.49"/><rect class="cls-4" x="55.87" y="16.49" width="23.93" height="12.49"/><rect class="cls-5" x="55.87" y="32.99" width="23.93" height="12.5"/><rect class="cls-5" x="27.93" y="32.99" width="23.93" height="12.5"/><rect class="cls-5" y="32.99" width="23.93" height="12.5"/><rect class="cls-4" x="27.93" y="49.48" width="23.93" height="12.49"/><rect class="cls-4" x="55.87" y="49.48" width="23.93" height="12.49"/><rect class="cls-4" y="49.48" width="23.93" height="12.49"/><rect class="cls-5" x="27.93" y="65.98" width="23.93" height="12.49"/><path class="cls-5" d="M79.8,77.47V66H55.87V78.47H78.8A1,1,0,0,0,79.8,77.47Z"/><path class="cls-5" d="M23.93,78.47V66H0V77.47a1,1,0,0,0,1,1Z"/></g></g></svg>
\ No newline at end of file
diff --git a/public/app/plugins/panel/datagrid/module.tsx b/public/app/plugins/panel/datagrid/module.tsx
new file mode 100644
index 00000000000..5331bab25d3
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/module.tsx
@@ -0,0 +1,24 @@
+import { PanelPlugin } from '@grafana/data';
+
+import { DataGridPanel } from './DataGridPanel';
+import { defaultPanelOptions, PanelOptions } from './panelcfg.gen';
+
+export const plugin = new PanelPlugin<PanelOptions>(DataGridPanel).setPanelOptions((builder, context) => {
+  const seriesOptions = context.data.map((frame, idx) => ({ value: idx, label: frame.refId }));
+
+  if (
+    context.options &&
+    !seriesOptions.map((s: { value: number }) => s.value).includes(context.options.selectedSeries ?? 0)
+  ) {
+    context.options.selectedSeries = defaultPanelOptions.selectedSeries!;
+  }
+
+  return builder.addSelect({
+    path: 'selectedSeries',
+    name: 'Select series',
+    defaultValue: defaultPanelOptions.selectedSeries,
+    settings: {
+      options: seriesOptions,
+    },
+  });
+});
diff --git a/public/app/plugins/panel/datagrid/panelcfg.cue b/public/app/plugins/panel/datagrid/panelcfg.cue
new file mode 100644
index 00000000000..6928432b6cc
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/panelcfg.cue
@@ -0,0 +1,33 @@
+// Copyright 2021 Grafana Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package grafanaplugin
+
+composableKinds: PanelCfg: {
+	maturity: "experimental"
+
+	lineage: {
+		seqs: [
+			{
+				schemas: [
+					{
+						PanelOptions: {
+							selectedSeries: int32 & >=0 | *0
+						} @cuetsy(kind="interface")
+					},
+				]
+			},
+		]
+	}
+}
diff --git a/public/app/plugins/panel/datagrid/panelcfg.gen.ts b/public/app/plugins/panel/datagrid/panelcfg.gen.ts
new file mode 100644
index 00000000000..e8c62517a7e
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/panelcfg.gen.ts
@@ -0,0 +1,19 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     public/app/plugins/gen.go
+// Using jennies:
+//     TSTypesJenny
+//     PluginTSTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+export const PanelCfgModelVersion = Object.freeze([0, 0]);
+
+export interface PanelOptions {
+  selectedSeries: number;
+}
+
+export const defaultPanelOptions: Partial<PanelOptions> = {
+  selectedSeries: 0,
+};
diff --git a/public/app/plugins/panel/datagrid/plugin.json b/public/app/plugins/panel/datagrid/plugin.json
new file mode 100644
index 00000000000..aed7de85972
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/plugin.json
@@ -0,0 +1,17 @@
+{
+  "type": "panel",
+  "name": "Datagrid",
+  "id": "datagrid",
+  "state": "beta",
+
+  "info": {
+    "author": {
+      "name": "Grafana Labs",
+      "url": "https://grafana.com"
+    },
+    "logos": {
+      "small": "img/icn-table-panel.svg",
+      "large": "img/icn-table-panel.svg"
+    }
+  }
+}
diff --git a/public/app/plugins/panel/datagrid/state.ts b/public/app/plugins/panel/datagrid/state.ts
new file mode 100644
index 00000000000..a55f5cc43c8
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/state.ts
@@ -0,0 +1,299 @@
+import {
+  CellClickedEventArgs,
+  GridColumnIcon,
+  GridSelection,
+  HeaderClickedEventArgs,
+  Item,
+  Rectangle,
+  SizedGridColumn,
+} from '@glideapps/glide-data-grid';
+
+import { DataFrame, Field, FieldType, getFieldDisplayName } from '@grafana/data';
+
+import { isDatagridEditEnabled } from './featureFlagUtils';
+import {
+  DatagridContextMenuData,
+  DEFAULT_CONTEXT_MENU,
+  DEFAULT_RENAME_INPUT_DATA,
+  EMPTY_GRID_SELECTION,
+  getCellWidth,
+  RenameColumnInputData,
+} from './utils';
+
+interface DatagridState {
+  columns: SizedGridColumn[];
+  contextMenuData: DatagridContextMenuData;
+  renameColumnInputData: RenameColumnInputData;
+  gridSelection: GridSelection;
+  columnFreezeIndex: number;
+  toggleSearch: boolean;
+  isResizeInProgress: boolean;
+}
+
+interface UpdateColumnsPayload {
+  frame: DataFrame;
+}
+
+interface ColumnResizeStartPayload {
+  columnIndex: number;
+  width: number;
+}
+
+interface OpenCellContextMenuPayload {
+  event: CellClickedEventArgs;
+  cell: Item;
+}
+
+interface OpenHeaderContextMenuPayload {
+  event: HeaderClickedEventArgs;
+  columnIndex: number;
+}
+
+interface OpenHeaderDropdownMenuPayload {
+  screenPosition: Rectangle;
+  columnIndex: number;
+  value: string;
+}
+
+interface ColumnMovePayload {
+  from: number;
+  to: number;
+}
+
+interface MultipleCellsSelectedPayload {
+  selection: GridSelection;
+}
+
+interface ColumnFreezeChangedPayload {
+  columnIndex: number;
+}
+
+export interface DatagridAction {
+  type: DatagridActionType;
+  payload?:
+    | UpdateColumnsPayload
+    | ColumnResizeStartPayload
+    | OpenCellContextMenuPayload
+    | OpenHeaderContextMenuPayload
+    | OpenHeaderDropdownMenuPayload
+    | ColumnMovePayload
+    | MultipleCellsSelectedPayload
+    | ColumnFreezeChangedPayload;
+}
+
+export enum DatagridActionType {
+  columnResizeStart = 'columnResizeStart',
+  columnResizeEnd = 'columnResizeEnd',
+  columnMove = 'columnMove',
+  updateColumns = 'updateColumns',
+  showColumnRenameInput = 'showColumnRenameInput',
+  hideColumnRenameInput = 'hideColumnRenameInput',
+  openCellContextMenu = 'openCellContextMenu',
+  openHeaderContextMenu = 'openHeaderContextMenu',
+  openHeaderDropdownMenu = 'openHeaderDropdownMenu',
+  closeContextMenu = 'closeContextMenu',
+  multipleCellsSelected = 'multipleCellsSelected',
+  gridSelectionCleared = 'gridSelectionCleared',
+  columnFreezeReset = 'columnFreezeReset',
+  columnFreezeChanged = 'columnFreezeChanged',
+  openSearch = 'openSearch',
+  closeSearch = 'closeSearch',
+}
+
+export const initialState: DatagridState = {
+  columns: [],
+  contextMenuData: DEFAULT_CONTEXT_MENU,
+  renameColumnInputData: DEFAULT_RENAME_INPUT_DATA,
+  gridSelection: EMPTY_GRID_SELECTION,
+  columnFreezeIndex: 0,
+  toggleSearch: false,
+  isResizeInProgress: false,
+};
+
+const typeToIconMap: Map<string, GridColumnIcon> = new Map([
+  [FieldType.number, GridColumnIcon.HeaderNumber],
+  [FieldType.string, GridColumnIcon.HeaderTextTemplate],
+  [FieldType.boolean, GridColumnIcon.HeaderBoolean],
+  [FieldType.time, GridColumnIcon.HeaderDate],
+  [FieldType.other, GridColumnIcon.HeaderReference],
+]);
+
+export const datagridReducer = (state: DatagridState, action: DatagridAction): DatagridState => {
+  let columns: SizedGridColumn[] = [];
+
+  switch (action.type) {
+    case DatagridActionType.columnResizeStart:
+      columns = [...state.columns];
+      const columnResizeStartPayload: ColumnResizeStartPayload = action.payload as ColumnResizeStartPayload;
+
+      columns[columnResizeStartPayload.columnIndex] = {
+        ...state.columns[columnResizeStartPayload.columnIndex],
+        width: columnResizeStartPayload.width,
+      };
+
+      return {
+        ...state,
+        columns,
+        isResizeInProgress: true,
+      };
+    case DatagridActionType.columnMove:
+      columns = [...state.columns];
+      const columnMovePayload: ColumnMovePayload = action.payload as ColumnMovePayload;
+
+      const widthFrom = state.columns[columnMovePayload.from].width;
+
+      let fromColumn = columns.splice(columnMovePayload.from, 1)[0];
+
+      fromColumn = {
+        ...fromColumn,
+        width: widthFrom,
+      };
+
+      columns.splice(columnMovePayload.to, 0, fromColumn);
+
+      return {
+        ...state,
+        columns,
+      };
+    case DatagridActionType.columnResizeEnd:
+      return {
+        ...state,
+        isResizeInProgress: false,
+      };
+    case DatagridActionType.updateColumns:
+      const updateColumnsPayload: UpdateColumnsPayload = action.payload as UpdateColumnsPayload;
+
+      columns = [
+        ...updateColumnsPayload.frame.fields.map((field: Field, index: number) => {
+          const displayName = getFieldDisplayName(field, updateColumnsPayload.frame);
+          return {
+            title: displayName,
+            width: state.columns[index]?.width ?? getCellWidth(field),
+            icon: typeToIconMap.get(field.type),
+            hasMenu: isDatagridEditEnabled(),
+            trailingRowOptions: { targetColumn: --index },
+          };
+        }),
+      ];
+
+      return {
+        ...state,
+        columns,
+      };
+    case DatagridActionType.showColumnRenameInput:
+      return {
+        ...state,
+        renameColumnInputData: {
+          ...state.renameColumnInputData,
+          isInputOpen: true,
+        },
+      };
+    case DatagridActionType.hideColumnRenameInput:
+      return {
+        ...state,
+        renameColumnInputData: {
+          ...state.renameColumnInputData,
+          isInputOpen: false,
+        },
+      };
+    case DatagridActionType.openCellContextMenu:
+      const openCellContextMenuPayload: OpenCellContextMenuPayload = action.payload as OpenCellContextMenuPayload;
+      const cellEvent: CellClickedEventArgs = openCellContextMenuPayload.event;
+      const cell: Item = openCellContextMenuPayload.cell;
+
+      return {
+        ...state,
+        contextMenuData: {
+          x: cellEvent.bounds.x + cellEvent.localEventX,
+          y: cellEvent.bounds.y + cellEvent.localEventY,
+          column: cell[0] === -1 ? undefined : cell[0], //row numbers,
+          row: cell[1],
+          isContextMenuOpen: true,
+          isHeaderMenu: false,
+        },
+      };
+    case DatagridActionType.openHeaderContextMenu:
+      const openHeaderContextMenuPayload: OpenHeaderContextMenuPayload = action.payload as OpenHeaderContextMenuPayload;
+      const headerEvent: HeaderClickedEventArgs = openHeaderContextMenuPayload.event;
+
+      return {
+        ...state,
+        contextMenuData: {
+          x: headerEvent.bounds.x + headerEvent.localEventX,
+          y: headerEvent.bounds.y + headerEvent.localEventY,
+          column: openHeaderContextMenuPayload.columnIndex,
+          row: undefined, //header
+          isContextMenuOpen: true,
+          isHeaderMenu: false,
+        },
+      };
+    case DatagridActionType.openHeaderDropdownMenu:
+      const openHeaderDropdownMenuPayload: OpenHeaderDropdownMenuPayload =
+        action.payload as OpenHeaderDropdownMenuPayload;
+      const screenPosition: Rectangle = openHeaderDropdownMenuPayload.screenPosition;
+
+      return {
+        ...state,
+        contextMenuData: {
+          x: screenPosition.x + screenPosition.width,
+          y: screenPosition.y + screenPosition.height,
+          column: openHeaderDropdownMenuPayload.columnIndex,
+          row: undefined, //header
+          isContextMenuOpen: true,
+          isHeaderMenu: true,
+        },
+        renameColumnInputData: {
+          x: screenPosition.x,
+          y: screenPosition.y,
+          width: screenPosition.width,
+          height: screenPosition.height,
+          columnIdx: openHeaderDropdownMenuPayload.columnIndex,
+          isInputOpen: false,
+          inputValue: openHeaderDropdownMenuPayload.value,
+        },
+      };
+    case DatagridActionType.closeContextMenu:
+      return {
+        ...state,
+        contextMenuData: {
+          isContextMenuOpen: false,
+        },
+      };
+    case DatagridActionType.closeSearch:
+      return {
+        ...state,
+        toggleSearch: false,
+      };
+    case DatagridActionType.openSearch:
+      return {
+        ...state,
+        toggleSearch: true,
+      };
+    case DatagridActionType.multipleCellsSelected:
+      const multipleCellsSelectedPayload: MultipleCellsSelectedPayload = action.payload as MultipleCellsSelectedPayload;
+
+      return {
+        ...state,
+        gridSelection: multipleCellsSelectedPayload.selection,
+      };
+    case DatagridActionType.gridSelectionCleared:
+      return {
+        ...state,
+        gridSelection: EMPTY_GRID_SELECTION,
+      };
+    case DatagridActionType.columnFreezeReset:
+      return {
+        ...state,
+        columnFreezeIndex: 0,
+      };
+    case DatagridActionType.columnFreezeChanged:
+      const columnFreezeChangedPayload: ColumnFreezeChangedPayload = action.payload as ColumnFreezeChangedPayload;
+
+      return {
+        ...state,
+        columnFreezeIndex: columnFreezeChangedPayload.columnIndex,
+      };
+    default:
+      return state;
+  }
+};
diff --git a/public/app/plugins/panel/datagrid/utils.test.ts b/public/app/plugins/panel/datagrid/utils.test.ts
new file mode 100644
index 00000000000..9face79dd1f
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/utils.test.ts
@@ -0,0 +1,122 @@
+import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+
+import { clearCellsFromRangeSelection, deleteRows } from './utils';
+
+describe('when deleting rows', () => {
+  let df: DataFrame;
+
+  beforeEach(() => {
+    df = {
+      name: 'test',
+      length: 5,
+      fields: [
+        {
+          name: 'test1',
+          type: FieldType.string,
+          values: new ArrayVector(['a', 'b', 'c', 'd', 'e']),
+          config: {},
+        },
+        {
+          name: 'test2',
+          type: FieldType.number,
+          values: new ArrayVector([1, 2, 3, 4, 5]),
+          config: {},
+        },
+        {
+          name: 'test3',
+          type: FieldType.string,
+          values: new ArrayVector(['a', 'b', 'c', 'd', 'e']),
+          config: {},
+        },
+      ],
+    };
+  });
+
+  it('should return same dataframe if no rows are selected', () => {
+    const newDf = deleteRows(df, []);
+    expect(newDf.fields).toEqual(df.fields);
+  });
+
+  it('should soft delete selected rows', () => {
+    const newDf = deleteRows(df, [1, 3]);
+
+    expect(newDf.fields[0].values.toArray()).toEqual(['a', null, 'c', null, 'e']);
+    expect(newDf.fields[1].values.toArray()).toEqual([1, null, 3, null, 5]);
+    expect(newDf.fields[2].values.toArray()).toEqual(['a', null, 'c', null, 'e']);
+    expect(newDf.length).toEqual(5);
+  });
+
+  it('should remove selected rows', () => {
+    let newDf = deleteRows(df, [1, 3], true);
+
+    expect(newDf.fields[0].values.toArray()).toEqual(['a', 'c', 'e']);
+    expect(newDf.fields[1].values.toArray()).toEqual([1, 3, 5]);
+    expect(newDf.fields[2].values.toArray()).toEqual(['a', 'c', 'e']);
+    expect(newDf.length).toEqual(3);
+
+    newDf = deleteRows(df, [2], true);
+
+    expect(newDf.fields[0].values.toArray()).toEqual(['a', 'c']);
+    expect(newDf.fields[1].values.toArray()).toEqual([1, 3]);
+    expect(newDf.fields[2].values.toArray()).toEqual(['a', 'c']);
+    expect(newDf.length).toEqual(2);
+  });
+
+  it('should remove all rows when all rows are selected', () => {
+    const newDf = deleteRows(df, [0, 1, 2, 3, 4], true);
+
+    expect(newDf.fields[0].values.toArray()).toEqual([]);
+    expect(newDf.fields[1].values.toArray()).toEqual([]);
+    expect(newDf.fields[2].values.toArray()).toEqual([]);
+    expect(newDf.length).toEqual(0);
+  });
+});
+
+describe('when clearing cells from range selection', () => {
+  let df: DataFrame;
+
+  beforeEach(() => {
+    df = {
+      name: 'test',
+      length: 5,
+      fields: [
+        {
+          name: 'test1',
+          type: FieldType.string,
+          values: new ArrayVector(['a', 'b', 'c', 'd', 'e']),
+          config: {},
+        },
+        {
+          name: 'test2',
+          type: FieldType.number,
+          values: new ArrayVector([1, 2, 3, 4, 5]),
+          config: {},
+        },
+        {
+          name: 'test3',
+          type: FieldType.string,
+          values: new ArrayVector(['a', 'b', 'c', 'd', 'e']),
+          config: {},
+        },
+      ],
+    };
+  });
+
+  it('should clear cells from range selection', () => {
+    const newDf = clearCellsFromRangeSelection(df, { x: 0, y: 0, width: 2, height: 2 });
+
+    expect(newDf.fields[0].values.toArray()).toEqual([null, null, 'c', 'd', 'e']);
+    expect(newDf.fields[1].values.toArray()).toEqual([null, null, 3, 4, 5]);
+    expect(newDf.fields[2].values.toArray()).toEqual(['a', 'b', 'c', 'd', 'e']);
+    expect(newDf.length).toEqual(5);
+  });
+
+  it('should clear single cell when only one is selected', () => {
+    const newDf = clearCellsFromRangeSelection(df, { x: 1, y: 1, width: 1, height: 1 });
+
+    expect(newDf.fields[0].values.toArray()).toEqual(['a', 'b', 'c', 'd', 'e']);
+    expect(newDf.fields[1].values.toArray()).toEqual([1, null, 3, 4, 5]);
+    expect(newDf.fields[2].values.toArray()).toEqual(['a', 'b', 'c', 'd', 'e']);
+    expect(newDf.length).toEqual(5);
+  });
+});
diff --git a/public/app/plugins/panel/datagrid/utils.ts b/public/app/plugins/panel/datagrid/utils.ts
new file mode 100644
index 00000000000..993cecc1798
--- /dev/null
+++ b/public/app/plugins/panel/datagrid/utils.ts
@@ -0,0 +1,310 @@
+import { css } from '@emotion/css';
+import { CompactSelection, GridCell, GridCellKind, GridSelection, Theme } from '@glideapps/glide-data-grid';
+
+import {
+  ArrayVector,
+  DataFrame,
+  DataFrameJSON,
+  dataFrameToJSON,
+  MutableDataFrame,
+  Field,
+  GrafanaTheme2,
+  FieldType,
+} from '@grafana/data';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { GrafanaQuery, GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
+
+import { isDatagridEditEnabled } from './featureFlagUtils';
+
+const HEADER_FONT_FAMILY = '600 13px Inter';
+const CELL_FONT_FAMILY = '400 13px Inter';
+const TEXT_CANVAS = document.createElement('canvas');
+
+export const CELL_PADDING = 20;
+export const MAX_COLUMN_WIDTH = 300;
+export const ICON_AND_MENU_WIDTH = 65;
+export const ROW_MARKER_BOTH = 'both';
+export const ROW_MARKER_NUMBER = 'number';
+export const DEFAULT_CONTEXT_MENU = { isContextMenuOpen: false };
+export const DEFAULT_RENAME_INPUT_DATA = { isInputOpen: false };
+
+export const EMPTY_DF = {
+  name: 'A',
+  fields: [],
+  length: 0,
+};
+
+export const GRAFANA_DS = {
+  type: 'grafana',
+  uid: 'grafana',
+};
+
+export const EMPTY_CELL: GridCell = {
+  kind: GridCellKind.Text,
+  data: '',
+  allowOverlay: true,
+  readonly: false,
+  displayData: '',
+};
+
+export const EMPTY_GRID_SELECTION = {
+  columns: CompactSelection.empty(),
+  rows: CompactSelection.empty(),
+};
+
+export const TRAILING_ROW_OPTIONS = {
+  sticky: false,
+  tint: true,
+};
+
+export const RIGHT_ELEMENT_PROPS = {
+  fill: true,
+  sticky: false,
+};
+
+export interface DatagridContextMenuData {
+  x?: number;
+  y?: number;
+  column?: number;
+  row?: number;
+  isHeaderMenu?: boolean;
+  isContextMenuOpen: boolean;
+}
+
+export interface RenameColumnInputData {
+  x?: number;
+  y?: number;
+  width?: number;
+  height?: number;
+  isInputOpen: boolean;
+  inputValue?: string;
+  columnIdx?: number;
+}
+
+interface CellRange {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+export const getTextWidth = (text: string, isHeader = false): number => {
+  const context = TEXT_CANVAS.getContext('2d');
+  context!.font = isHeader ? HEADER_FONT_FAMILY : CELL_FONT_FAMILY;
+  const metrics = context!.measureText(text);
+  return metrics.width;
+};
+
+export const getCellWidth = (field: Field): number => {
+  //If header is longer than cell text, get header width that will always fully show the header text
+  //otherwise get the longest cell text width if it's shorter than the max column width, or the max column width
+  return Math.max(
+    getTextWidth(field.name, true) + ICON_AND_MENU_WIDTH, //header text
+    Math.min(
+      MAX_COLUMN_WIDTH,
+      field.values.toArray().reduce((acc: number, val: string | number) => {
+        const textWidth = getTextWidth(val?.toString() ?? '');
+
+        if (textWidth > acc) {
+          return textWidth;
+        }
+
+        return acc;
+      }, 0) + CELL_PADDING //cell text
+    )
+  );
+};
+
+export const deleteRows = (gridData: DataFrame, rows: number[], hardDelete = false): DataFrame => {
+  for (const field of gridData.fields) {
+    const valuesArray = field.values.toArray();
+
+    //delete from the end of the array to avoid index shifting
+    for (let i = rows.length - 1; i >= 0; i--) {
+      if (hardDelete) {
+        valuesArray.splice(rows[i], 1);
+      } else {
+        valuesArray.splice(rows[i], 1, null);
+      }
+    }
+
+    field.values = new ArrayVector(valuesArray);
+  }
+
+  return new MutableDataFrame(gridData);
+};
+
+export const clearCellsFromRangeSelection = (gridData: DataFrame, range: CellRange): DataFrame => {
+  const colFrom: number = range.x;
+  const rowFrom: number = range.y;
+  const colTo: number = range.x + range.width - 1;
+
+  for (let i = colFrom; i <= colTo; i++) {
+    const field = gridData.fields[i];
+
+    const valuesArray = field.values.toArray();
+    valuesArray.splice(rowFrom, range.height, ...new Array(range.height).fill(null));
+    field.values = new ArrayVector(valuesArray);
+  }
+
+  return new MutableDataFrame(gridData);
+};
+
+export const publishSnapshot = (data: DataFrame, panelID: number): void => {
+  if (!isDatagridEditEnabled()) {
+    return;
+  }
+
+  const snapshot: DataFrameJSON[] = [dataFrameToJSON(data)];
+  const dashboard = getDashboardSrv().getCurrent();
+  const panelModel = dashboard?.getPanelById(panelID);
+
+  const query: GrafanaQuery = {
+    refId: 'A',
+    queryType: GrafanaQueryType.Snapshot,
+    snapshot,
+    datasource: GRAFANA_DS,
+  };
+
+  panelModel!.updateQueries({
+    dataSource: GRAFANA_DS,
+    queries: [query],
+  });
+
+  panelModel!.refresh();
+};
+
+//Converting an array of nulls or undefineds returns them as strings and prints them in the cells instead of empty cells. Thus the cleanup func
+export const cleanStringFieldAfterConversion = (field: Field): void => {
+  const valuesArray = field.values.toArray();
+  field.values = new ArrayVector(valuesArray.map((val) => (val === 'undefined' || val === 'null' ? null : val)));
+  return;
+};
+
+export function getGridTheme(theme: GrafanaTheme2): Partial<Theme> {
+  return {
+    accentColor: theme.colors.primary.main,
+    accentFg: theme.colors.secondary.main,
+    textDark: theme.colors.text.primary,
+    textMedium: theme.colors.text.secondary,
+    textLight: theme.colors.text.secondary,
+    textBubble: theme.colors.text.primary,
+    textHeader: theme.colors.text.primary,
+    bgCell: theme.colors.background.primary,
+    bgCellMedium: theme.colors.background.primary,
+    bgHeader: theme.colors.background.primary,
+    bgHeaderHasFocus: theme.colors.background.secondary,
+    bgHeaderHovered: theme.colors.background.secondary,
+    linkColor: theme.colors.text.link,
+    fontFamily: theme.typography.fontFamily,
+    headerFontStyle: `${theme.typography.fontWeightMedium} ${theme.typography.fontSize}px`,
+    fgIconHeader: theme.colors.secondary.contrastText,
+    bgIconHeader: theme.colors.secondary.main,
+  };
+}
+
+export const getGridCellKind = (field: Field, row: number, hasGridSelection = false): GridCell => {
+  const value = field.values.get(row);
+
+  switch (field.type) {
+    case FieldType.boolean:
+      return {
+        kind: GridCellKind.Boolean,
+        data: value ? value : false,
+        allowOverlay: false,
+        readonly: false,
+      };
+    case FieldType.number:
+      return {
+        kind: GridCellKind.Number,
+        data: value ? value : 0,
+        allowOverlay: isDatagridEditEnabled()! && !hasGridSelection,
+        readonly: false,
+        displayData: value !== null && value !== undefined ? value.toString() : '',
+      };
+    case FieldType.string:
+      return {
+        kind: GridCellKind.Text,
+        data: value ? value : '',
+        allowOverlay: isDatagridEditEnabled()! && !hasGridSelection,
+        readonly: false,
+        displayData: value !== null && value !== undefined ? value.toString() : '',
+      };
+    default:
+      return {
+        kind: GridCellKind.Text,
+        data: value ? value : '',
+        allowOverlay: isDatagridEditEnabled()! && !hasGridSelection,
+        readonly: false,
+        displayData: value !== null && value !== undefined ? value.toString() : '',
+      };
+  }
+};
+
+export const getStyles = (theme: GrafanaTheme2, isResizeInProgress: boolean) => {
+  return {
+    dataEditor: css`
+      .dvn-scroll-inner > div:nth-child(2) {
+        pointer-events: none !important;
+      }
+      scrollbar-color: ${theme.colors.background.secondary} ${theme.colors.background.primary};
+      ::-webkit-scrollbar {
+        width: 10px;
+        height: 10px;
+      }
+      ::-webkit-scrollbar-track {
+        background: ${theme.colors.background.primary};
+      }
+      ::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+      }
+      ::-webkit-scrollbar-corner {
+        display: none;
+      }
+    `,
+    addColumnDiv: css`
+      width: 120px;
+      display: flex;
+      flex-direction: column;
+      background-color: ${theme.colors.background.primary};
+      button {
+        pointer-events: ${isResizeInProgress ? 'none' : 'auto'};
+        border: none;
+        outline: none;
+        height: 37px;
+        font-size: 20px;
+        background-color: ${theme.colors.background.primary};
+        color: ${theme.colors.text.primary};
+        border-right: 1px solid ${theme.components.panel.borderColor};
+        border-bottom: 1px solid ${theme.components.panel.borderColor};
+        transition: background-color 200ms;
+        cursor: pointer;
+        :hover {
+          background-color: ${theme.colors.secondary.shade};
+        }
+      }
+      input {
+        height: 37px;
+        border: 1px solid ${theme.colors.primary.main};
+        :focus {
+          outline: none;
+        }
+      }
+    `,
+    renameColumnInput: css`
+      height: 37px;
+      border: 1px solid ${theme.colors.primary.main};
+      :focus {
+        outline: none;
+      }
+    `,
+  };
+};
+
+export const hasGridSelection = (gridSelection: GridSelection): boolean => {
+  if (!gridSelection.current) {
+    return false;
+  }
+
+  return gridSelection.current.range && gridSelection.current.range.height > 1 && gridSelection.current.range.width > 1;
+};
diff --git a/yarn.lock b/yarn.lock
index 7a8ba31c3ab..e36c41e01f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2984,6 +2984,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@glideapps/glide-data-grid@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "@glideapps/glide-data-grid@npm:5.2.1"
+  dependencies:
+    canvas-hypertxt: ^0.0.7
+    react-number-format: ^5.0.0
+  peerDependencies:
+    lodash: ^4.17.19
+    marked: ^4.0.10
+    react: ^16.12.0 || 17.x || 18.x
+    react-dom: ^16.12.0 || 17.x || 18.x
+    react-responsive-carousel: ^3.2.7
+  checksum: a91d4049e7c6e1db8a8c00326adbc71c52f90d66398e9ea4b85218b8cf9ffd421a18188cb6e5abf6765ebcc73b376389222e42a87dd5ec441a22f8f197775e7c
+  languageName: node
+  linkType: hard
+
 "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource":
   version: 0.0.0-use.local
   resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
@@ -9795,7 +9811,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/marked@npm:4.0.8":
+"@types/marked@npm:4.0.8, @types/marked@npm:^4":
   version: 4.0.8
   resolution: "@types/marked@npm:4.0.8"
   checksum: 68278fa7acaa5d920cdc239d675b5daf842e0ad4779e4848cd617d9baf2ac1afccb5a264c331e37d80031d647e1640cb983cd31e73d45b28552670b4853fad8e
@@ -13661,6 +13677,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"canvas-hypertxt@npm:^0.0.7":
+  version: 0.0.7
+  resolution: "canvas-hypertxt@npm:0.0.7"
+  checksum: 161ee134a4c7f0f75d569c432ee906b19661824cb8b959a7ce932b9cca0eb05cd42937a40ac6b6105f2f591046d714c5f13c1f8bbb0b1d0002eb600ee2dbb9a3
+  languageName: node
+  linkType: hard
+
 "canvg@npm:^3.0.6":
   version: 3.0.10
   resolution: "canvg@npm:3.0.10"
@@ -20132,6 +20155,7 @@ __metadata:
     "@emotion/css": 11.10.6
     "@emotion/eslint-plugin": 11.10.0
     "@emotion/react": 11.10.6
+    "@glideapps/glide-data-grid": ^5.2.1
     "@grafana/aws-sdk": 0.0.44
     "@grafana/data": "workspace:*"
     "@grafana/e2e": "workspace:*"
@@ -20210,6 +20234,7 @@ __metadata:
     "@types/jsurl": ^1.2.28
     "@types/lodash": 4.14.191
     "@types/logfmt": ^1.2.3
+    "@types/marked": ^4
     "@types/mousetrap": 1.6.11
     "@types/node": 18.14.6
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.0.9"
@@ -20334,6 +20359,7 @@ __metadata:
     logfmt: ^1.3.2
     lru-cache: 7.17.0
     lru-memoize: ^1.1.0
+    marked: ^4.3.0
     memoize-one: 6.0.0
     mini-css-extract-plugin: 2.7.2
     moment: 2.29.4
@@ -20384,6 +20410,7 @@ __metadata:
     react-redux: 7.2.6
     react-refresh: 0.14.0
     react-resizable: 3.0.4
+    react-responsive-carousel: ^3.2.23
     react-router-dom: 5.3.3
     react-select: 5.7.0
     react-select-event: 5.5.1
@@ -25343,6 +25370,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"marked@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "marked@npm:4.3.0"
+  bin:
+    marked: bin/marked.js
+  checksum: 0db6817893952c3ec710eb9ceafb8468bf5ae38cb0f92b7b083baa13d70b19774674be04db5b817681fa7c5c6a088f61300815e4dd75a59696f4716ad69f6260
+  languageName: node
+  linkType: hard
+
 "matcher-collection@npm:^2.0.0":
   version: 2.0.1
   resolution: "matcher-collection@npm:2.0.1"
@@ -30849,6 +30885,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-easy-swipe@npm:^0.0.21":
+  version: 0.0.21
+  resolution: "react-easy-swipe@npm:0.0.21"
+  dependencies:
+    prop-types: ^15.5.8
+  checksum: 225f12a9dd410db1c790220867ab1eb58e2ef0a2bdae8541330805fc5b9905e242ab307b019f9aaed76473849a753f363baff03fa8a77e7a1860d7b41dc83ec0
+  languageName: node
+  linkType: hard
+
 "react-element-to-jsx-string@npm:^14.3.4":
   version: 14.3.4
   resolution: "react-element-to-jsx-string@npm:14.3.4"
@@ -31059,6 +31104,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-number-format@npm:^5.0.0":
+  version: 5.1.4
+  resolution: "react-number-format@npm:5.1.4"
+  dependencies:
+    prop-types: ^15.7.2
+  peerDependencies:
+    react: ^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
+  checksum: 770a1e86cd05d9df28aa5e6a12c5731351dd4a301464edd0ac5dcbc68d2f07eae37781ff14f6153566cbb7cccb28f13f0826d1844600d25ae6e12da060814282
+  languageName: node
+  linkType: hard
+
 "react-popper-tooltip@npm:4.4.2":
   version: 4.4.2
   resolution: "react-popper-tooltip@npm:4.4.2"
@@ -31155,6 +31212,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-responsive-carousel@npm:^3.2.23":
+  version: 3.2.23
+  resolution: "react-responsive-carousel@npm:3.2.23"
+  dependencies:
+    classnames: ^2.2.5
+    prop-types: ^15.5.8
+    react-easy-swipe: ^0.0.21
+  checksum: 8a5b915f140a05425554a0c108c60a0b103dae49808486d39147df09c832ad712c7d7f4a66f0d0c39529ca095b4a327f0cc440d91b5f7a39ab13076931f74bd0
+  languageName: node
+  linkType: hard
+
 "react-router-dom@npm:5.3.3":
   version: 5.3.3
   resolution: "react-router-dom@npm:5.3.3"

From 0b2f7db2241e3952db485e00e9949851e10478f9 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:02:55 +0200
Subject: [PATCH 356/729] Elasticsearch: Deprecate index setting for annotation
 queries (#67046)

* Elasticsearch: Deprecate index setting for annotation queries

* Update comment
---
 .../datasource/elasticsearch/datasource.ts    |  6 +++--
 .../datasource/elasticsearch/tracking.ts      | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index cdf73047d0b..6de79c1b9e0 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -52,7 +52,7 @@ import {
 } from './components/QueryEditor/MetricAggregationsEditor/aggregations';
 import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils';
 import { defaultBucketAgg, hasMetricOfType } from './queryDef';
-import { trackQuery } from './tracking';
+import { trackAnnotationQuery, trackQuery } from './tracking';
 import {
   Logs,
   BucketAggregation,
@@ -321,7 +321,8 @@ export class ElasticDatasource
       ignore_unavailable: true,
     };
 
-    // old elastic annotations had index specified on them
+    // @deprecated
+    // Field annotation.index is deprecated and will be removed in the future
     if (annotation.index) {
       header.index = annotation.index;
     } else {
@@ -330,6 +331,7 @@ export class ElasticDatasource
 
     const payload = JSON.stringify(header) + '\n' + JSON.stringify(data) + '\n';
 
+    trackAnnotationQuery(annotation);
     return lastValueFrom(
       this.post('_msearch', payload).pipe(
         map((res) => {
diff --git a/public/app/plugins/datasource/elasticsearch/tracking.ts b/public/app/plugins/datasource/elasticsearch/tracking.ts
index ac14a4a1ed1..720a7eef24c 100644
--- a/public/app/plugins/datasource/elasticsearch/tracking.ts
+++ b/public/app/plugins/datasource/elasticsearch/tracking.ts
@@ -140,3 +140,25 @@ export function trackQuery(
     });
   }
 }
+
+export function trackAnnotationQuery(annotation: {
+  target: ElasticsearchQuery;
+  timeField?: string;
+  timeEndField?: string;
+  query?: string;
+  tagsField?: string;
+  textField?: string;
+  index?: string;
+  [key: string]: unknown;
+}): void {
+  reportInteraction('grafana_elasticsearch_annotation_query_executed', {
+    grafana_version: config.buildInfo.version,
+    has_target_query: !!annotation.target?.query,
+    has_query: !!annotation.query,
+    has_time_field: !!annotation.timeField,
+    has_time_end_field: !!annotation.timeEndField,
+    has_tags_field: !!annotation.tagsField,
+    has_text_field: !!annotation.textField,
+    has_index: !!annotation.index,
+  });
+}

From 362936b00253c26dff8eb0a32f1c76d00320b7d9 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:13:52 +0200
Subject: [PATCH 357/729] Build: Force same version of @emotion/react via
 webpack config (#66822)

---
 scripts/webpack/webpack.common.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/webpack/webpack.common.js b/scripts/webpack/webpack.common.js
index cff93efbcd8..5413e9cc763 100644
--- a/scripts/webpack/webpack.common.js
+++ b/scripts/webpack/webpack.common.js
@@ -22,6 +22,9 @@ module.exports = {
       // some of data source plugins use global Prism object to add the language definition
       // we want to have same Prism object in core and in grafana/ui
       prismjs: require.resolve('prismjs'),
+      // some sub-dependencies use a different version of @emotion/react and generate warnings
+      // in the browser about @emotion/react loaded twice. We want to only load it once
+      '@emotion/react': require.resolve('@emotion/react'),
     },
     modules: ['node_modules', path.resolve('public')],
     fallback: {

From 872e79f687640ddfe42d73f98908a9dee721a0f5 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:18:42 +0200
Subject: [PATCH 358/729] Toolkit: Remove `plugin:dev` and `plugin:test`
 (#67125)

---
 packages/grafana-toolkit/src/cli/index.ts     | 44 -------------------
 .../src/cli/tasks/plugin.dev.ts               | 22 ----------
 .../src/cli/tasks/plugin.tests.ts             |  8 ----
 3 files changed, 74 deletions(-)
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin.tests.ts

diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index e5aaa1d8195..593fb9bb3fd 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -5,9 +5,7 @@ import { nodeVersionCheckerTask } from './tasks/nodeVersionChecker';
 import { buildPackageTask } from './tasks/package.build';
 import { pluginBuildTask } from './tasks/plugin.build';
 import { ciBuildPluginTask, ciPackagePluginTask, ciPluginReportTask } from './tasks/plugin.ci';
-import { pluginDevTask } from './tasks/plugin.dev';
 import { pluginSignTask } from './tasks/plugin.sign';
-import { pluginTestTask } from './tasks/plugin.tests';
 import { pluginUpdateTask } from './tasks/plugin.update';
 import { getToolkitVersion, githubPublishTask } from './tasks/plugin.utils';
 import { bundleManagedTask } from './tasks/plugin/bundle.managed';
@@ -121,48 +119,6 @@ export const run = (includeInternalScripts = false) => {
       });
     });
 
-  program
-    .command('plugin:dev')
-    .option('-w, --watch', 'Run plugin development mode with watch enabled')
-    .description('[Deprecated] Starts plugin dev mode')
-    .action(async (cmd) => {
-      console.log(chalk.yellow('\n⚠️  DEPRECATED. This command is deprecated and will be removed in v10. ⚠️'));
-      console.log(
-        'Please migrate to grafana create-plugin https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin\n'
-      );
-
-      await execTask(pluginDevTask)({
-        watch: !!cmd.watch,
-        silent: true,
-      });
-    });
-
-  program
-    .command('plugin:test')
-    .option('-u, --updateSnapshot', 'Run snapshots update')
-    .option('--coverage', 'Run code coverage')
-    .option('--watch', 'Run tests in interactive watch mode')
-    .option('--testPathPattern <regex>', 'Run only tests with a path that matches the regex')
-    .option('--testNamePattern <regex>', 'Run only tests with a name that matches the regex')
-    .option('--maxWorkers <num>|<string>', 'Limit number of workers spawned')
-    .description('[Deprecated] Executes plugin tests')
-    .action(async (cmd) => {
-      console.log(chalk.yellow('\n⚠️  DEPRECATED. This command is deprecated and will be removed in v10. ⚠️'));
-      console.log(
-        'Please migrate to grafana create-plugin https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin\n'
-      );
-
-      await execTask(pluginTestTask)({
-        updateSnapshot: !!cmd.updateSnapshot,
-        coverage: !!cmd.coverage,
-        watch: !!cmd.watch,
-        testPathPattern: cmd.testPathPattern,
-        testNamePattern: cmd.testNamePattern,
-        maxWorkers: cmd.maxWorkers,
-        silent: true,
-      });
-    });
-
   program
     .command('plugin:sign')
     .option('--signatureType <type>', 'Signature Type')
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts
deleted file mode 100644
index 78f363aa827..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useSpinner } from '../utils/useSpinner';
-
-import { lintPlugin } from './plugin.build';
-import { bundlePlugin as bundleFn, PluginBundleOptions } from './plugin/bundle';
-import { Task, TaskRunner } from './task';
-
-const bundlePlugin = (options: PluginBundleOptions) =>
-  useSpinner('Bundling plugin in dev mode', () => bundleFn(options));
-
-const pluginDevRunner: TaskRunner<PluginBundleOptions> = async (options) => {
-  if (options.watch) {
-    await bundleFn(options);
-  } else {
-    // Always fix lint in dev mode
-    await lintPlugin({ fix: true });
-
-    const result = await bundlePlugin(options);
-    return result;
-  }
-};
-
-export const pluginDevTask = new Task<PluginBundleOptions>('Dev plugin', pluginDevRunner);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.tests.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.tests.ts
deleted file mode 100644
index ff75d91d1d6..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.tests.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { testPlugin, PluginTestOptions } from './plugin/tests';
-import { Task, TaskRunner } from './task';
-
-const pluginTestRunner: TaskRunner<PluginTestOptions> = async (options) => {
-  await testPlugin(options);
-};
-
-export const pluginTestTask = new Task<PluginTestOptions>('Test plugin', pluginTestRunner);

From 3c655821e8d95e51611f353cb6ebc2a0811b1de8 Mon Sep 17 00:00:00 2001
From: Jack Baldry <jack.baldry@grafana.com>
Date: Mon, 24 Apr 2023 16:23:33 +0100
Subject: [PATCH 359/729] Update make-docs script (#66841)

Update centralized make-docs procedure

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
---
 .gitignore     |   1 -
 docs/docs.mk   |  44 ++++--
 docs/make-docs | 359 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 395 insertions(+), 9 deletions(-)
 create mode 100755 docs/make-docs

diff --git a/.gitignore b/.gitignore
index c09a8139879..fbfb6a6396f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -191,4 +191,3 @@ public/api-spec.json
 deployment_tools_config.json
 
 .betterer.cache
-/docs/make-docs
diff --git a/docs/docs.mk b/docs/docs.mk
index 2ef7063d00d..7c7072085be 100644
--- a/docs/docs.mk
+++ b/docs/docs.mk
@@ -14,7 +14,12 @@ MAKEFLAGS += --no-builtin-rule
 .PHONY: help
 help: ## Display this help.
 help:
-	@awk 'BEGIN {FS = ": ##"; printf "Usage:\n  make <target>\n\nTargets:\n"} /^[a-zA-Z0-9_\.\-\/%]+: ##/ { printf "  %-45s %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
+	@awk 'BEGIN { \
+		FS = ": ##"; \
+		printf "Usage:\n  make <target>\n\nTargets:\n" \
+	} \
+	/^[a-zA-Z0-9_\.\-\/%]+: ##/ { printf "  %-15s %s\n", $$1, $$2 }' \
+	$(MAKEFILE_LIST)
 
 GIT_ROOT := $(shell git rev-parse --show-toplevel)
 
@@ -25,26 +30,38 @@ $(error "PROJECTS variable must be defined in variables.mk")
 endif
 
 # First project is considered the primary one used for doc-validator.
-PRIMARY_PROJECT := $(firstword $(subst /,-,$(PROJECTS)))
+PRIMARY_PROJECT := $(subst /,-,$(firstword $(subst :, ,$(firstword $(PROJECTS)))))
 
 # Name for the container.
+ifeq ($(origin DOCS_CONTAINER), undefined)
 export DOCS_CONTAINER := $(PRIMARY_PROJECT)-docs
+endif
 
 # Host port to publish container port to.
+ifeq ($(origin DOCS_HOST_PORT), undefined)
 export DOCS_HOST_PORT := 3002
+endif
 
 # Container image used to perform Hugo build.
+ifeq ($(origin DOCS_IMAGE), undefined)
 export DOCS_IMAGE := grafana/docs-base:latest
+endif
 
 # Container image used for doc-validator linting.
+ifeq ($(origin DOC_VALIDATOR_IMAGE), undefined)
 export DOC_VALIDATOR_IMAGE := grafana/doc-validator:latest
+endif
 
 # PATH-like list of directories within which to find projects.
 # If all projects are checked out into the same directory, ~/repos/ for example, then the default should work.
+ifeq ($(origin REPOS_PATH), undefined)
 export REPOS_PATH := $(realpath $(GIT_ROOT)/..)
+endif
 
 # How to treat Hugo relref errors.
+ifeq ($(origin HUGO_REFLINKSERRORLEVEL), undefined)
 export HUGO_REFLINKSERRORLEVEL := WARNING
+endif
 
 .PHONY: docs-rm
 docs-rm: ## Remove the docs container.
@@ -56,27 +73,38 @@ docs-pull: ## Pull documentation base image.
 
 make-docs: ## Fetch the latest make-docs script.
 make-docs:
-	curl -s -LO https://raw.githubusercontent.com/grafana/writers-toolkit/main/scripts/make-docs
-	chmod +x make-docs
+	if [[ ! -f "$(PWD)/make-docs" ]]; then
+		echo 'WARN: No make-docs script found in the working directory. Run `make update` to download it.' >&2
+		exit 1
+	fi
 
 .PHONY: docs
-docs: ## Serve documentation locally.
+docs: ## Serve documentation locally, which includes pulling the latest `DOCS_IMAGE` (default: `grafana/docs-base:latest`) container image. See also `docs-no-pull`.
 docs: docs-pull make-docs
 	$(PWD)/make-docs $(PROJECTS)
 
 .PHONY: docs-no-pull
-docs-no-pull: ## Serve documentation locally without pulling the latest docs-base image.
+docs-no-pull: ## Serve documentation locally without pulling the `DOCS_IMAGE` (default: `grafana/docs-base:latest`) container image.
 docs-no-pull: make-docs
 	$(PWD)/make-docs $(PROJECTS)
 
+.PHONY: docs-debug
+docs-debug: ## Run Hugo web server with debugging enabled. TODO: support all SERVER_FLAGS defined in website Makefile.
+docs-debug: make-docs
+	WEBSITE_EXEC='hugo server --debug' $(PWD)/make-docs $(PROJECTS)
+
 .PHONY: doc-validator
 doc-validator: ## Run docs-validator on the entire docs folder.
+doc-validator: make-docs
 	DOCS_IMAGE=$(DOC_VALIDATOR_IMAGE) $(PWD)/make-docs $(PROJECTS)
 
 .PHONY: doc-validator/%
 doc-validator/%: ## Run doc-validator on a specific path. To lint the path /docs/sources/administration, run 'make doc-validator/administration'.
-doc-validator/%:
+doc-validator/%: make-docs
 	DOCS_IMAGE=$(DOC_VALIDATOR_IMAGE) DOC_VALIDATOR_INCLUDE=$(subst doc-validator/,,$@) $(PWD)/make-docs $(PROJECTS)
 
-docs.mk: ## Fetch the latest version of this Makefile from Writers' Toolkit.
+.PHONY: update
+update: ## Fetch the latest version of this Makefile and the `make-docs` script from Writers' Toolkit.
 	curl -s -LO https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk
+	curl -s -LO https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs
+	chmod +x make-docs
diff --git a/docs/make-docs b/docs/make-docs
new file mode 100755
index 00000000000..b8350109abc
--- /dev/null
+++ b/docs/make-docs
@@ -0,0 +1,359 @@
+#!/bin/sh
+# The source of this file is https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs.
+
+set -ef
+
+readonly DOCS_CONTAINER="${DOCS_CONTAINER:-make-docs}"
+readonly DOCS_HOST_PORT="${DOCS_HOST_PORT:-3002}"
+readonly DOCS_IMAGE="${DOCS_IMAGE:-grafana/docs-base:latest}"
+
+readonly DOC_VALIDATOR_INCLUDE="${DOC_VALIDATOR_INCLUDE:-.+\.md$}"
+
+readonly HUGO_REFLINKSERRORLEVEL="${HUGO_REFLINKSERRORLEVEL:-WARNING}"
+readonly WEBSITE_EXEC="${WEBSITE_EXEC:-make server}"
+# If set, the docs-base image will run a prebuild script that sets up Hugo mounts.
+readonly WEBSITE_MOUNTS="${WEBSITE_MOUNTS:-}"
+
+PODMAN="$(if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)"
+
+about() {
+  cat <<EOF
+Test documentation locally with multiple source repositories.
+
+The REPOS_PATH environment variable is a colon (:) separated list of paths in which to look for project repositories.
+EOF
+}
+
+usage() {
+  cat <<EOF
+Usage:
+  REPOS_PATH=<PATH[:<PATH>...]> $0 [<PROJECT>[:<VERSION>[:<REPO>[:<DIR>]]]...]
+
+Examples:
+  REPOS_PATH=~/ext/grafana/ $0 writers-toolkit tempo:latest helm-charts/mimir-distributed:latest:mimir:docs/sources/mimir-distributed
+EOF
+}
+
+if [ $# -lt 1 ]; then
+  cat <<EOF >&2
+ERRR: arguments required but not supplied.
+
+$(about)
+
+$(usage)
+EOF
+  exit 1
+fi
+
+readonly REPOS_PATH="${REPOS_PATH:-$(realpath "$(git rev-parse --show-toplevel)/..")}"
+
+if [ -z "${REPOS_PATH}" ]; then
+  cat <<EOF >&2
+ERRR: REPOS_PATH environment variable is required but has not been provided.
+
+$(usage)
+EOF
+  exit 1
+fi
+
+SOURCES_as_code='as-code-docs'
+SOURCES_enterprise_metrics='backend-enterprise'
+SOURCES_enterprise_metrics_='backend-enterprise'
+SOURCES_grafana_cloud='cloud-docs'
+SOURCES_grafana_cloud_k6='k6-docs'
+SOURCES_helm_charts_mimir_distributed='mimir'
+SOURCES_helm_charts_tempo_distributed='tempo'
+SOURCES_opentelemetry='opentelemetry-docs'
+
+VERSIONS_as_code='UNVERSIONED'
+VERSIONS_grafana_cloud='UNVERSIONED'
+VERSIONS_grafana_cloud_k6='UNVERSIONED'
+VERSIONS_opentelemetry='UNVERSIONED'
+VERSIONS_technical_documentation='UNVERSIONED'
+VERSIONS_writers_toolkit='UNVERSIONED'
+
+PATHS_helm_charts_mimir_distributed='docs/sources/helm-charts/mimir-distributed'
+PATHS_helm_charts_tempo_distributed='docs/sources/helm-charts/tempo-distributed'
+PATHS_mimir='docs/sources/mimir'
+PATHS_tempo='docs/sources/tempo'
+
+# identifier STR
+# Replace characters that are not valid in an identifier with underscores.
+identifier() {
+  echo "$1" | tr -C '[:alnum:]_\n' '_'
+}
+
+# aget ARRAY KEY
+# Get the value of KEY from associative array ARRAY.
+# Characters that are not valid in an identifier are replaced with underscores.
+aget() {
+  eval echo '$'"$(identifier "$1")_$(identifier "$2")"
+}
+
+# new_proj populates a new project structure.
+new_proj() {
+  _project="$1"
+  _version="$2"
+  _repo="$3"
+  _path="$4"
+
+  # If version is not set, use the script mapping of project to default versions if it exists.
+  # Fallback to 'latest'.
+  if [ -z "${_version}" ]; then
+    if [ -z "$(aget VERSIONS "${_project}")" ]; then
+      _version=latest
+    else
+      _version="$(aget VERSIONS "${_project}")"
+    fi
+  fi
+
+  # If repo is not set, use the script mapping of project to repo name if it exists.
+  # Fallback to using the project name.
+  if [ -z "${_repo}" ]; then
+    if [ -z "$(aget SOURCES "${_project}")" ]; then
+      _repo="${_project}"
+    else
+      _repo="$(aget SOURCES "${_project}")"
+    fi
+  fi
+
+  # If path is not set, use the script mapping of project to docs sources path if it exists.
+  # Fallback to using 'docs/sources'.
+  if [ -z "${_path}" ]; then
+    if [ -z "$(aget PATHS "${_project}")" ]; then
+      _path="docs/sources"
+    else
+      _path="$(aget PATHS "${_project}")"
+    fi
+  fi
+
+  echo "${_project}:${_version}:${_repo}:${_path}"
+  unset _project _version _repo _path
+}
+
+# proj_url returns the webserver URL for a project.
+# It expects a complete project structure as input.
+proj_url() {
+  IFS=: read -r _project _version _ _ <<POSIX_HERESTRING
+$1
+POSIX_HERESTRING
+
+  if [ -z "${_version}" ] || [ "${_version}" = 'UNVERSIONED' ]; then
+    echo "http://localhost:${DOCS_HOST_PORT}/docs/${_project}/"
+  else
+    echo "http://localhost:${DOCS_HOST_PORT}/docs/${_project}/${_version}/"
+  fi
+
+  unset _project _version
+}
+
+# proj_ver returns the version for a project.
+# It expects a complete project structure as input.
+proj_ver() {
+  IFS=: read -r _ _ver _ _ <<POSIX_HERESTRING
+$1
+POSIX_HERESTRING
+
+  echo "${_ver}"
+  unset _ver
+}
+
+# proj_dst returns the container path to content source for a project.
+# It expects a complete project structure as input.
+proj_dst() {
+  IFS=: read -r _project _version _ _ <<POSIX_HERESTRING
+$1
+POSIX_HERESTRING
+
+  if [ -z "${_version}" ] || [ "${_version}" = 'UNVERSIONED' ]; then
+    echo "/hugo/content/docs/${_project}"
+  else
+    echo "/hugo/content/docs/${_project}/${_version}"
+  fi
+  unset _project _version
+}
+
+# proj_src returns the host path to content source for a project.
+# It expects a complete project structure as input.
+# It looks for the provided repository name in each of the paths specified in the REPOS_PATH environment variable.
+proj_src() {
+  IFS=: read -r _ _ _repo _path <<POSIX_HERESTRING
+$1
+POSIX_HERESTRING
+
+  IFS=:
+  for lookup in ${REPOS_PATH}; do
+    if [ -d "${lookup}/${_repo}" ]; then
+      echo "${lookup}/${_repo}/${_path}"
+      unset _path _repo
+      return
+    fi
+  done
+  unset IFS
+
+  echo "ERRR: could not find project '${_repo}' in any of the paths in REPOS_PATH '${REPOS_PATH}'." >&2
+  echo "NOTE: you must have a checkout of the project '${_repo}' at '${REPOS_PATH##:*}/${_repo}'." >&2
+  echo "NOTE: if you have cloned the repository into a directory with a different name, consider changing it to ${_repo}." >&2
+  unset _path _repo
+  exit 1
+}
+
+# proj_canonical returns the canonical absolute path partial URI for a project.
+# It expects a complete project structure as input.
+proj_canonical() {
+  IFS=: read -r _project _version _ _ <<POSIX_HERESTRING
+$1
+POSIX_HERESTRING
+
+  if [ -z "${_version}" ] || [ "${_version}" = 'UNVERSIONED' ]; then
+    echo "/docs/${_project}"
+  else
+    echo "/docs/${_project}/${_version}"
+  fi
+  unset _project _version
+}
+
+proj_to_url_src_dst_ver() {
+  _url="$(proj_url "$1")"
+  _src="$(proj_src "$1")"
+  _dst="$(proj_dst "$1")"
+  _ver="$(proj_ver "$1")"
+
+  echo "${_url}^${_src}^${_dst}^${_ver}"
+  unset _url _src _dst _ver
+}
+
+url_src_dst_vers() {
+  for arg in "$@"; do
+    IFS=: read -r _project _version _repo _path <<POSIX_HERESTRING
+$arg
+POSIX_HERESTRING
+
+    case "${_project}" in
+      # Workaround for arbitrary mounts where the version field is expected to be the local directory
+      # and the repo field is expected to be the container directory.
+      arbitrary)
+        echo "${_project}^${_version}^${_repo}^" # TODO
+        ;;
+      logs)
+        proj_to_url_src_dst_ver "$(new_proj loki "${_version}")"
+        proj_to_url_src_dst_ver "$(new_proj enterprise-logs "${_version}")"
+        ;;
+      metrics)
+        proj_to_url_src_dst_ver "$(new_proj mimir "${_version}")"
+        proj_to_url_src_dst_ver "$(new_proj helm-charts/mimir-distributed "${_version}")"
+        proj_to_url_src_dst_ver "$(new_proj enterprise-metrics "${_version}")"
+        ;;
+      traces)
+        proj_to_url_src_dst_ver "$(new_proj tempo "${_version}")"
+        proj_to_url_src_dst_ver "$(new_proj enterprise-traces "${_version}")"
+        ;;
+      *)
+        proj_to_url_src_dst_ver "$(new_proj "${_project}" "${_version}" "${_repo}" "${_path}")"
+        ;;
+    esac
+  done
+
+  unset _project _version _repo _path
+}
+
+url_src_dst_vers="$(url_src_dst_vers "$@")"
+
+volumes=""
+redirects=""
+
+for x in ${url_src_dst_vers}; do
+  IFS='^' read -r _url _src _dst _ver <<POSIX_HERESTRING
+$x
+POSIX_HERESTRING
+
+  if [ "${_url}" != "arbitrary" ]; then
+    if [ ! -f "${_src}/_index.md" ]; then
+      echo "ERRR: Index file '${_src}/_index.md' does not exist." >&2
+      echo "Is '${_src}' the correct source directory?" >&2
+      exit 1
+    fi
+  fi
+
+  echo "DEBG: Mounting '${_src}' at container path '${_dst}'" >&2
+  if [ -z "${volumes}" ]; then
+    volumes="--volume=${_src}:${_dst}"
+  else
+    volumes="${volumes} --volume=${_src}:${_dst}"
+  fi
+
+  if [ -n "${_ver}" ] && [ "${_ver}" != 'UNVERSIONED' ]; then
+    if [ -z "${redirects}" ]; then
+      redirects="${_dst}^${_ver}"
+    else
+      redirects="${redirects} ${_dst}^${_ver}"
+    fi
+  fi
+  unset _url _src _dst _ver
+done
+
+IFS=':' read -r image _ <<POSIX_HERESTRING
+${DOCS_IMAGE}
+POSIX_HERESTRING
+
+if [ "${image}" = "grafana/doc-validator" ]; then
+  echo
+  "${PODMAN}" run \
+    --init \
+    --interactive \
+    --name "${DOCS_CONTAINER}" \
+    --platform linux/amd64 \
+    --rm \
+    --tty \
+    ${volumes} \
+    "${DOCS_IMAGE}" \
+    --skip-image-validation \
+    --include="${DOC_VALIDATOR_INCLUDE}" \
+    /hugo/content/docs \
+    "$(proj_canonical "$(new_proj "$1")")"
+else
+
+  cat <<EOF >/tmp/make-docs-entrypoint
+#!/usr/bin/env bash
+for redirect in ${redirects}; do
+  IFS='^' read -r path ver <<<"\${redirect}"
+  echo -e "---\\nredirectURL: \"\${path/\/hugo\/content/}\"\\ntype: redirect\\n---\\n" > "\${path/\${ver}/_index.md}"
+
+  if [[ -n "${WEBSITE_MOUNTS}" ]]; then
+    unset WEBSITE_SKIP_MOUNTS
+  fi
+done
+
+${WEBSITE_EXEC}
+EOF
+  chmod +x /tmp/make-docs-entrypoint
+  volumes="${volumes} --volume=/tmp/make-docs-entrypoint:/entrypoint"
+  readonly volumes
+
+  echo
+  echo "Documentation will be served at the following URLs:"
+  for x in ${url_src_dst_vers}; do
+    IFS='^' read -r url _ _ <<POSIX_HERESTRING
+$x
+POSIX_HERESTRING
+
+    if [ -n "${url}" ]; then
+      echo "  ${url}"
+    fi
+  done
+
+  echo
+  "${PODMAN}" run \
+    --env "HUGO_REFLINKSERRORLEVEL=${HUGO_REFLINKSERRORLEVEL}" \
+    --init \
+    --interactive \
+    --name "${DOCS_CONTAINER}" \
+    --platform linux/amd64 \
+    --publish "${DOCS_HOST_PORT}:3002" \
+    --publish "3003:3003" \
+    --rm \
+    --tty \
+    ${volumes} \
+    "${DOCS_IMAGE}" \
+    /entrypoint
+fi

From e2e243d1b6ac0d2d17df1b738407576b9a5e4724 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:26:04 +0200
Subject: [PATCH 360/729] Elasticsearch: Fix processing of duplicated metric
 types and field (#66973)

* Elasticsearch: Fix processing of duplicated metric types and field

* Fix lint

* Fix linting
---
 pkg/tsdb/elasticsearch/response_parser.go     | 15 +++++-
 .../elasticsearch/response_parser_test.go     | 48 +++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/elasticsearch/response_parser.go b/pkg/tsdb/elasticsearch/response_parser.go
index 4ffe2346977..fd32aef692d 100644
--- a/pkg/tsdb/elasticsearch/response_parser.go
+++ b/pkg/tsdb/elasticsearch/response_parser.go
@@ -1255,13 +1255,24 @@ func addOtherMetricsToFields(fields *[]*data.Field, bucket *simplejson.Json, met
 	otherMetrics := make([]*MetricAgg, 0)
 
 	for _, m := range target.Metrics {
-		if m.Type == metric.Type {
+		// To other metrics we add metric of the same type that are not the current metric
+		if m.ID != metric.ID && m.Type == metric.Type {
 			otherMetrics = append(otherMetrics, m)
 		}
 	}
 
-	if len(otherMetrics) > 1 {
+	if len(otherMetrics) > 0 {
 		metricName += " " + metric.Field
+
+		// We check if we have metric with the same type and same field name
+		// If so, append metric.ID to the metric name
+		for _, m := range otherMetrics {
+			if m.Field == metric.Field {
+				metricName += " " + metric.ID
+				break
+			}
+		}
+
 		if metric.Type == "bucket_script" {
 			// Use the formula in the column name
 			metricName = metric.Settings.Get("script").MustString("")
diff --git a/pkg/tsdb/elasticsearch/response_parser_test.go b/pkg/tsdb/elasticsearch/response_parser_test.go
index 2b3bb0c345d..fb186ac1f64 100644
--- a/pkg/tsdb/elasticsearch/response_parser_test.go
+++ b/pkg/tsdb/elasticsearch/response_parser_test.go
@@ -124,6 +124,54 @@ func TestResponseParser(t *testing.T) {
 			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average value")
 		})
 
+		t.Run("Query with duplicated avg metric creates unique field name", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+					"metrics": [{"type": "avg", "field": "value", "id": "1" }, {"type": "avg", "field": "value", "id": "4" }],
+          "bucketAggs": [{ "type": "terms", "field": "label", "id": "3" }]
+				}`,
+			}
+			response := `{
+        "responses": [
+          {
+            "aggregations": {
+              "3": {
+                "buckets": [
+                  {
+                    "1": { "value": 88 },
+										"4": { "value": 88 },
+                    "doc_count": 10,
+                    "key": "val1"
+                  },
+                  {
+                    "1": { "value": 99 },
+										"4": { "value": 99 },
+                    "doc_count": 15,
+                    "key": "val2"
+                  }
+                ]
+              }
+            }
+          }
+        ]
+			}`
+			result, err := parseTestResponse(targets, response)
+			require.NoError(t, err)
+			require.Len(t, result.Responses, 1)
+
+			queryRes := result.Responses["A"]
+			require.NotNil(t, queryRes)
+			dataframes := queryRes.Frames
+			require.NoError(t, err)
+			require.Len(t, dataframes, 1)
+
+			frame := dataframes[0]
+			require.Len(t, frame.Fields, 3)
+			require.Equal(t, frame.Fields[0].Name, "label")
+			require.Equal(t, frame.Fields[1].Name, "Average value 1")
+			require.Equal(t, frame.Fields[2].Name, "Average value 4")
+		})
+
 		t.Run("Single group by query one metric", func(t *testing.T) {
 			targets := map[string]string{
 				"A": `{

From 2fb1c64e80fb2457052765423074f79908692c33 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:27:43 +0200
Subject: [PATCH 361/729] Loki: Enable new log context query editor (#67131)

Loki: Enable new log context editor
---
 .../setup-grafana/configure-grafana/feature-toggles/index.md   | 2 +-
 pkg/services/featuremgmt/registry.go                           | 3 ++-
 pkg/services/featuremgmt/toggles_gen.csv                       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 382742cbb39..710bb0b2bc3 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -34,6 +34,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `emptyDashboardPage`                | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                             | Yes                |
 | `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling                                                                                                                                         |                    |
 | `logsSampleInExplore`               | Enables access to the logs sample feature in Explore                                                                                                                         | Yes                |
+| `logsContextDatasourceUi`           | Allow datasource to provide custom UI for context view                                                                                                                       | Yes                |
 | `useCachingService`                 | When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation                |                    |
 
 ## Beta feature toggles
@@ -88,7 +89,6 @@ Alpha features might be changed or removed without prior notice.
 | `authnService`                     | Use new auth service to perform authentication                                                                                                                                                      |
 | `alertingBacktesting`              | Rule backtesting API for alerting                                                                                                                                                                   |
 | `editPanelCSVDragAndDrop`          | Enables drag and drop for CSV and Excel files                                                                                                                                                       |
-| `logsContextDatasourceUi`          | Allow datasource to provide custom UI for context view                                                                                                                                              |
 | `lokiQuerySplitting`               | Split large interval queries into subqueries with smaller time intervals                                                                                                                            |
 | `lokiQuerySplittingConfig`         | Give users the option to configure split durations for Loki queries                                                                                                                                 |
 | `individualCookiePreferences`      | Support overriding cookie preferences per user                                                                                                                                                      |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index f6b2b264bce..b1f2bab21b1 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -354,9 +354,10 @@ var (
 		{
 			Name:         "logsContextDatasourceUi",
 			Description:  "Allow datasource to provide custom UI for context view",
-			State:        FeatureStateAlpha,
+			State:        FeatureStateStable,
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityLogsSquad,
+			Expression:   "true", // turned on by default
 		},
 		{
 			Name:         "lokiQuerySplitting",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 1a2f988bf46..dea4dac80d6 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -51,7 +51,7 @@ alertingBacktesting,alpha,@grafana/alerting-squad,false,false,false,false
 editPanelCSVDragAndDrop,alpha,@grafana/grafana-bi-squad,false,false,false,true
 alertingNoNormalState,beta,@grafana/alerting-squad,false,false,false,false
 logsSampleInExplore,stable,@grafana/observability-logs,false,false,false,true
-logsContextDatasourceUi,alpha,@grafana/observability-logs,false,false,false,true
+logsContextDatasourceUi,stable,@grafana/observability-logs,false,false,false,true
 lokiQuerySplitting,alpha,@grafana/observability-logs,false,false,false,true
 lokiQuerySplittingConfig,alpha,@grafana/observability-logs,false,false,false,true
 individualCookiePreferences,alpha,@grafana/backend-platform,false,false,false,false

From 69e5a2bdf923cad0ab9d31a98625a4fc968a3139 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Mon, 24 Apr 2023 16:32:04 +0100
Subject: [PATCH 362/729] NestedFolders: Basic search view (#67093)

* First stab and reusing SearchView for new Browse Dashboards

* NestedFolders: Basic SearchView

* last bits of cleanup
---
 .../BrowseDashboardsPage.tsx                  |  2 +-
 .../components/SearchView.tsx                 | 92 +++++++++++++++++--
 .../browse-dashboards/state/reducers.ts       |  5 +-
 .../app/features/browse-dashboards/types.ts   |  4 +-
 4 files changed, 90 insertions(+), 13 deletions(-)

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index dc6fe30d9c9..976df59e66b 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -50,7 +50,7 @@ const BrowseDashboardsPage = memo(({ match, location }: Props) => {
           <AutoSizer>
             {({ width, height }) =>
               searchState.query ? (
-                <SearchView searchState={searchState} />
+                <SearchView width={width} height={height} folderUID={folderUID} />
               ) : (
                 <BrowseView width={width} height={height} folderUID={folderUID} />
               )
diff --git a/public/app/features/browse-dashboards/components/SearchView.tsx b/public/app/features/browse-dashboards/components/SearchView.tsx
index b789d99a6e9..481fc7926b0 100644
--- a/public/app/features/browse-dashboards/components/SearchView.tsx
+++ b/public/app/features/browse-dashboards/components/SearchView.tsx
@@ -1,17 +1,91 @@
-import React from 'react';
+import React, { useCallback, useEffect } from 'react';
 
-import { parseRouteParams } from 'app/features/search/utils';
+import { Spinner } from '@grafana/ui';
+import { useKeyNavigationListener } from 'app/features/search/hooks/useSearchKeyboardSelection';
+import { SearchResultsProps, SearchResultsTable } from 'app/features/search/page/components/SearchResultsTable';
+import { getSearchStateManager } from 'app/features/search/state/SearchStateManager';
+import { DashboardViewItemKind } from 'app/features/search/types';
+import { useDispatch, useSelector } from 'app/types';
+
+import { setItemSelectionState } from '../state';
 
 interface SearchViewProps {
-  searchState: ReturnType<typeof parseRouteParams>;
+  height: number;
+  width: number;
+  folderUID: string | undefined;
 }
 
-export function SearchView({ searchState }: SearchViewProps) {
-  return (
-    <div>
-      <p>SearchView</p>
+export function SearchView({ folderUID, width, height }: SearchViewProps) {
+  const dispatch = useDispatch();
+  const selectedItems = useSelector((wholeState) => wholeState.browseDashboards.selectedItems);
 
-      <pre>{JSON.stringify(searchState, null, 2)}</pre>
-    </div>
+  const { keyboardEvents } = useKeyNavigationListener();
+
+  const stateManager = getSearchStateManager();
+  useEffect(() => stateManager.initStateFromUrl(folderUID), [folderUID, stateManager]);
+
+  const state = stateManager.useState();
+  const value = state.result;
+
+  const selectionChecker = useCallback(
+    (kind: string | undefined, uid: string): boolean => {
+      if (!kind || kind === '*') {
+        return false;
+      }
+
+      return selectedItems[assertDashboardViewItemKind(kind)][uid] ?? false;
+    },
+    [selectedItems]
   );
+
+  const clearSelection = useCallback(() => {
+    console.log('TODO: clearSelection');
+  }, []);
+
+  const handleItemSelectionChange = useCallback(
+    (kind: string, uid: string) => {
+      const newIsSelected = !selectionChecker(kind, uid);
+
+      dispatch(
+        setItemSelectionState({ item: { kind: assertDashboardViewItemKind(kind), uid }, isSelected: newIsSelected })
+      );
+    },
+    [selectionChecker, dispatch]
+  );
+
+  if (!value) {
+    return (
+      <div>
+        <Spinner />
+      </div>
+    );
+  }
+
+  const props: SearchResultsProps = {
+    response: value,
+    selection: selectionChecker,
+    selectionToggle: handleItemSelectionChange,
+    clearSelection,
+    width: width,
+    height: height,
+    onTagSelected: stateManager.onAddTag,
+    keyboardEvents,
+    onDatasourceChange: state.datasource ? stateManager.onDatasourceChange : undefined,
+    onClickItem: stateManager.onSearchItemClicked,
+  };
+
+  return <SearchResultsTable {...props} />;
+}
+
+function assertDashboardViewItemKind(kind: string): DashboardViewItemKind {
+  switch (kind) {
+    case 'folder':
+      return 'folder';
+    case 'dashboard':
+      return 'dashboard';
+    case 'panel':
+      return 'panel';
+  }
+
+  throw new Error('Unsupported kind' + kind);
 }
diff --git a/public/app/features/browse-dashboards/state/reducers.ts b/public/app/features/browse-dashboards/state/reducers.ts
index 85b75ca675d..5d6f6674163 100644
--- a/public/app/features/browse-dashboards/state/reducers.ts
+++ b/public/app/features/browse-dashboards/state/reducers.ts
@@ -38,7 +38,10 @@ export function setFolderOpenState(
 
 export function setItemSelectionState(
   state: BrowseDashboardsState,
-  action: PayloadAction<{ item: DashboardViewItem; isSelected: boolean }>
+
+  // SearchView doesn't use DashboardViewItemKind (yet), so we pick just the specific properties
+  // we're interested in
+  action: PayloadAction<{ item: Pick<DashboardViewItem, 'kind' | 'uid' | 'parentUID'>; isSelected: boolean }>
 ) {
   const { item, isSelected } = action.payload;
 
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
index 499927f979f..e3b08f17d6c 100644
--- a/public/app/features/browse-dashboards/types.ts
+++ b/public/app/features/browse-dashboards/types.ts
@@ -1,5 +1,7 @@
 import { DashboardViewItem as DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
+export type DashboardTreeSelection = Record<DashboardViewItemKind, Record<string, boolean | undefined>>;
+
 export interface BrowseDashboardsState {
   rootItems: DashboardViewItem[];
   childrenByParentUID: Record<string, DashboardViewItem[] | undefined>;
@@ -22,6 +24,4 @@ export interface DashboardsTreeItem<T extends DashboardViewItemWithUIItems = Das
   isOpen: boolean;
 }
 
-export type DashboardTreeSelection = Record<DashboardViewItemKind, Record<string, boolean | undefined>>;
-
 export const INDENT_AMOUNT_CSS_VAR = '--dashboards-tree-indentation';

From 67ca91ece3b7470ec36ada6c92b3661efec3d5b7 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:36:30 +0200
Subject: [PATCH 363/729] Loki: Fix incorrect evaluation of real and extracted
 labels in context (#67112)

* Loki: Fix incorrect evaluation of real/extracted labels in context

* Add tests

* Improve caching and add more tests

* Use mockResolvedValue

* Flip logic for getInitContextFiltersFromLabels

* Update to logic to use fetchSeriesLabels for queries with more than 1 parser
---
 .../datasource/loki/LanguageProvider.ts       |  2 -
 .../loki/LogContextProvider.test.ts           | 89 +++++++++++++++++--
 .../datasource/loki/LogContextProvider.ts     | 57 ++++++------
 .../loki/components/LokiContextUi.tsx         |  2 +-
 .../app/plugins/datasource/loki/datasource.ts |  7 +-
 .../app/plugins/datasource/loki/queryUtils.ts |  8 ++
 6 files changed, 127 insertions(+), 38 deletions(-)

diff --git a/public/app/plugins/datasource/loki/LanguageProvider.ts b/public/app/plugins/datasource/loki/LanguageProvider.ts
index 6d28137a9f5..0021395d1f3 100644
--- a/public/app/plugins/datasource/loki/LanguageProvider.ts
+++ b/public/app/plugins/datasource/loki/LanguageProvider.ts
@@ -399,8 +399,6 @@ export default class LokiLanguageProvider extends LanguageProvider {
     const cacheKey = this.generateCacheKey(url, start, end, interpolatedMatch);
     let value = this.seriesCache.get(cacheKey);
     if (!value) {
-      // Clear value when requesting new one. Empty object being truthy also makes sure we don't request twice.
-      this.seriesCache.set(cacheKey, {});
       const params = { 'match[]': interpolatedMatch, start, end };
       const data = await this.request(url, params);
       const { values } = processLabels(data);
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
index fed7355522d..16bad0e1480 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
@@ -15,6 +15,7 @@ import { LokiQuery } from './types';
 
 const defaultLanguageProviderMock = {
   start: jest.fn(),
+  fetchSeriesLabels: jest.fn(() => ({ bar: ['baz'], xyz: ['abc'] })),
   getLabelKeys: jest.fn(() => ['bar', 'xyz']),
 } as unknown as LokiLanguageProvider;
 
@@ -41,23 +42,38 @@ describe('LogContextProvider', () => {
   let logContextProvider: LogContextProvider;
   beforeEach(() => {
     logContextProvider = new LogContextProvider(defaultDatasourceMock);
-    logContextProvider.getInitContextFiltersFromLabels = jest.fn(() =>
-      Promise.resolve([{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }])
-    );
   });
 
   describe('getLogRowContext', () => {
     it('should call getInitContextFilters if no appliedContextFilters', async () => {
+      logContextProvider.getInitContextFiltersFromLabels = jest
+        .fn()
+        .mockResolvedValue([{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }]);
+
       expect(logContextProvider.appliedContextFilters).toHaveLength(0);
-      await logContextProvider.getLogRowContext(defaultLogRow, {
-        limit: 10,
-        direction: LogRowContextQueryDirection.Backward,
-      });
+      await logContextProvider.getLogRowContext(
+        defaultLogRow,
+        {
+          limit: 10,
+          direction: LogRowContextQueryDirection.Backward,
+        },
+        {
+          expr: '{bar="baz"}',
+        } as LokiQuery
+      );
       expect(logContextProvider.getInitContextFiltersFromLabels).toBeCalled();
+      expect(logContextProvider.getInitContextFiltersFromLabels).toHaveBeenCalledWith(
+        { bar: 'baz', foo: 'uniqueParsedLabel', xyz: 'abc' },
+        { expr: '{bar="baz"}' }
+      );
       expect(logContextProvider.appliedContextFilters).toHaveLength(1);
     });
 
     it('should not call getInitContextFilters if appliedContextFilters', async () => {
+      logContextProvider.getInitContextFiltersFromLabels = jest
+        .fn()
+        .mockResolvedValue([{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }]);
+
       logContextProvider.appliedContextFilters = [
         { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
         { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
@@ -73,6 +89,10 @@ describe('LogContextProvider', () => {
 
   describe('getLogRowContextQuery', () => {
     it('should call getInitContextFilters if no appliedContextFilters', async () => {
+      logContextProvider.getInitContextFiltersFromLabels = jest
+        .fn()
+        .mockResolvedValue([{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }]);
+
       const query = await logContextProvider.getLogRowContextQuery(defaultLogRow, {
         limit: 10,
         direction: LogRowContextQueryDirection.Backward,
@@ -180,4 +200,59 @@ describe('LogContextProvider', () => {
       expect(contextQuery.query.expr).toEqual(`{bar="baz"}`);
     });
   });
+
+  describe('getInitContextFiltersFromLabels', () => {
+    describe('query with no parser', () => {
+      const queryWithoutParser = {
+        expr: '{bar="baz"}',
+      } as LokiQuery;
+
+      it('should correctly create contextFilters', async () => {
+        const filters = await logContextProvider.getInitContextFiltersFromLabels(
+          defaultLogRow.labels,
+          queryWithoutParser
+        );
+        expect(filters).toEqual([
+          { enabled: true, fromParser: false, label: 'bar', value: 'baz' },
+          { enabled: false, fromParser: true, label: 'foo', value: 'uniqueParsedLabel' },
+          { enabled: true, fromParser: false, label: 'xyz', value: 'abc' },
+        ]);
+      });
+
+      it('should return empty contextFilters if no query', async () => {
+        const filters = await logContextProvider.getInitContextFiltersFromLabels(defaultLogRow.labels, undefined);
+        expect(filters).toEqual([]);
+      });
+
+      it('should return empty contextFilters if no labels', async () => {
+        const filters = await logContextProvider.getInitContextFiltersFromLabels({}, queryWithoutParser);
+        expect(filters).toEqual([]);
+      });
+    });
+
+    describe('query with parser', () => {
+      const queryWithParser = {
+        expr: '{bar="baz"} | logfmt',
+      } as LokiQuery;
+
+      it('should correctly create contextFilters', async () => {
+        const filters = await logContextProvider.getInitContextFiltersFromLabels(defaultLogRow.labels, queryWithParser);
+        expect(filters).toEqual([
+          { enabled: true, fromParser: false, label: 'bar', value: 'baz' },
+          { enabled: false, fromParser: true, label: 'foo', value: 'uniqueParsedLabel' },
+          { enabled: true, fromParser: false, label: 'xyz', value: 'abc' },
+        ]);
+      });
+
+      it('should return empty contextFilters if no query', async () => {
+        const filters = await logContextProvider.getInitContextFiltersFromLabels(defaultLogRow.labels, undefined);
+        expect(filters).toEqual([]);
+      });
+
+      it('should return empty contextFilters if no labels', async () => {
+        const filters = await logContextProvider.getInitContextFiltersFromLabels({}, queryWithParser);
+        expect(filters).toEqual([]);
+      });
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
index 47a47fd1f56..7e8fa8adb05 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -1,3 +1,4 @@
+import { isEmpty } from 'lodash';
 import { catchError, lastValueFrom, of, switchMap } from 'rxjs';
 
 import {
@@ -13,13 +14,13 @@ import {
   LogRowContextQueryDirection,
   LogRowContextOptions,
 } from '@grafana/data';
-import { DataQuery, Labels } from '@grafana/schema';
+import { Labels } from '@grafana/schema';
 
 import { LokiContextUi } from './components/LokiContextUi';
 import { LokiDatasource, makeRequest, REF_ID_STARTER_LOG_ROW_CONTEXT } from './datasource';
 import { escapeLabelValueInExactSelector } from './languageUtils';
 import { addLabelToQuery, addParserToQuery } from './modifyQuery';
-import { getParserFromQuery, isLokiQuery, isQueryWithParser } from './queryUtils';
+import { getParserFromQuery, getStreamSelectorsFromQuery, isQueryWithParser } from './queryUtils';
 import { sortDataFrameByTime, SortDirection } from './sortDataFrame';
 import { ContextFilter, LokiQuery, LokiQueryDirection, LokiQueryType } from './types';
 
@@ -33,14 +34,15 @@ export class LogContextProvider {
     this.appliedContextFilters = [];
   }
 
-  private async getQueryAndRange(row: LogRowModel, options?: LogRowContextOptions, origQuery?: DataQuery) {
+  private async getQueryAndRange(row: LogRowModel, options?: LogRowContextOptions, origQuery?: LokiQuery) {
     const direction = (options && options.direction) || LogRowContextQueryDirection.Backward;
     const limit = (options && options.limit) || this.datasource.maxLines;
-
     // This happens only on initial load, when user haven't applied any filters yet
     // We need to get the initial filters from the row labels
     if (this.appliedContextFilters.length === 0) {
-      const filters = (await this.getInitContextFiltersFromLabels(row.labels)).filter((filter) => filter.enabled);
+      const filters = (await this.getInitContextFiltersFromLabels(row.labels, origQuery)).filter(
+        (filter) => filter.enabled
+      );
       this.appliedContextFilters = filters;
     }
 
@@ -50,7 +52,7 @@ export class LogContextProvider {
   getLogRowContextQuery = async (
     row: LogRowModel,
     options?: LogRowContextOptions,
-    origQuery?: DataQuery
+    origQuery?: LokiQuery
   ): Promise<LokiQuery> => {
     const { query } = await this.getQueryAndRange(row, options, origQuery);
 
@@ -60,10 +62,9 @@ export class LogContextProvider {
   getLogRowContext = async (
     row: LogRowModel,
     options?: LogRowContextOptions,
-    origQuery?: DataQuery
+    origQuery?: LokiQuery
   ): Promise<{ data: DataFrame[] }> => {
     const direction = (options && options.direction) || LogRowContextQueryDirection.Backward;
-
     const { query, range } = await this.getQueryAndRange(row, options, origQuery);
 
     const processResults = (result: DataQueryResponse): DataQueryResponse => {
@@ -98,14 +99,9 @@ export class LogContextProvider {
     row: LogRowModel,
     limit: number,
     direction: LogRowContextQueryDirection,
-    origQuery?: DataQuery
+    origQuery?: LokiQuery
   ): Promise<{ query: LokiQuery; range: TimeRange }> {
-    let originalLokiQuery: LokiQuery | undefined = undefined;
-    // Type guard for LokiQuery
-    if (origQuery && isLokiQuery(origQuery)) {
-      originalLokiQuery = origQuery;
-    }
-    const expr = this.processContextFiltersToExpr(row, this.appliedContextFilters, originalLokiQuery);
+    const expr = this.processContextFiltersToExpr(row, this.appliedContextFilters, origQuery);
     const contextTimeBuffer = 2 * 60 * 60 * 1000; // 2h buffer
 
     const queryDirection =
@@ -154,7 +150,7 @@ export class LogContextProvider {
     };
   }
 
-  getLogRowContextUi(row: LogRowModel, runContextQuery?: () => void, originalQuery?: DataQuery): React.ReactNode {
+  getLogRowContextUi(row: LogRowModel, runContextQuery?: () => void, origQuery?: LokiQuery): React.ReactNode {
     const updateFilter = (contextFilters: ContextFilter[]) => {
       this.appliedContextFilters = contextFilters;
 
@@ -170,12 +166,6 @@ export class LogContextProvider {
         this.appliedContextFilters = [];
       });
 
-    let origQuery: LokiQuery | undefined = undefined;
-    // Type guard for LokiQuery
-    if (originalQuery && isLokiQuery(originalQuery)) {
-      origQuery = originalQuery;
-    }
-
     return LokiContextUi({
       row,
       origQuery,
@@ -218,9 +208,25 @@ export class LogContextProvider {
     return expr;
   };
 
-  getInitContextFiltersFromLabels = async (labels: Labels) => {
-    await this.datasource.languageProvider.start();
-    const allLabels = this.datasource.languageProvider.getLabelKeys();
+  getInitContextFiltersFromLabels = async (labels: Labels, query?: LokiQuery) => {
+    if (!query || isEmpty(labels)) {
+      return [];
+    }
+
+    let allLabels: string[] = [];
+    if (!isQueryWithParser(query.expr).queryWithParser) {
+      // If there is no parser, we use getLabelKeys because it has better caching
+      // and all labels should already be fetched
+      await this.datasource.languageProvider.start();
+      allLabels = this.datasource.languageProvider.getLabelKeys();
+    } else {
+      // If we have parser, we use fetchSeriesLabels to fetch actual labels for selected stream
+      const stream = getStreamSelectorsFromQuery(query.expr);
+      // We are using stream[0] as log query can always have just 1 stream selector
+      const series = await this.datasource.languageProvider.fetchSeriesLabels(stream[0]);
+      allLabels = Object.keys(series);
+    }
+
     const contextFilters: ContextFilter[] = [];
     Object.entries(labels).forEach(([label, value]) => {
       const filter: ContextFilter = {
@@ -229,6 +235,7 @@ export class LogContextProvider {
         enabled: allLabels.includes(label),
         fromParser: !allLabels.includes(label),
       };
+
       contextFilters.push(filter);
     });
 
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index afd70bbe4ca..36211d885db 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -123,7 +123,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
 
   useAsync(async () => {
     setLoading(true);
-    const contextFilters = await logContextProvider.getInitContextFiltersFromLabels(row.labels);
+    const contextFilters = await logContextProvider.getInitContextFiltersFromLabels(row.labels, origQuery);
     setContextFilters(contextFilters);
     setInitialized(true);
     setLoading(false);
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 0fc565b0b49..674c382489e 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -70,6 +70,7 @@ import { getQueryHints } from './queryHints';
 import { runSplitQuery } from './querySplitting';
 import {
   getLogQueryFromMetricsQuery,
+  getLokiQueryFromDataQuery,
   getNormalizedLokiQuery,
   getStreamSelectorsFromQuery,
   isLogsQuery,
@@ -654,7 +655,7 @@ export class LokiDatasource
     options?: LogRowContextOptions,
     origQuery?: DataQuery
   ): Promise<{ data: DataFrame[] }> => {
-    return await this.logContextProvider.getLogRowContext(row, options, origQuery);
+    return await this.logContextProvider.getLogRowContext(row, options, getLokiQueryFromDataQuery(origQuery));
   };
 
   getLogRowContextQuery = async (
@@ -662,11 +663,11 @@ export class LokiDatasource
     options?: LogRowContextOptions,
     origQuery?: DataQuery
   ): Promise<DataQuery> => {
-    return await this.logContextProvider.getLogRowContextQuery(row, options, origQuery);
+    return await this.logContextProvider.getLogRowContextQuery(row, options, getLokiQueryFromDataQuery(origQuery));
   };
 
   getLogRowContextUi(row: LogRowModel, runContextQuery: () => void, origQuery: DataQuery): React.ReactNode {
-    return this.logContextProvider.getLogRowContextUi(row, runContextQuery, origQuery);
+    return this.logContextProvider.getLogRowContextUi(row, runContextQuery, getLokiQueryFromDataQuery(origQuery));
   }
 
   testDatasource(): Promise<{ status: string; message: string }> {
diff --git a/public/app/plugins/datasource/loki/queryUtils.ts b/public/app/plugins/datasource/loki/queryUtils.ts
index 9ad5b5a2c7b..1fd2a91d6ec 100644
--- a/public/app/plugins/datasource/loki/queryUtils.ts
+++ b/public/app/plugins/datasource/loki/queryUtils.ts
@@ -314,3 +314,11 @@ export const isLokiQuery = (query: DataQuery): query is LokiQuery => {
   const lokiQuery = query as LokiQuery;
   return lokiQuery.expr !== undefined;
 };
+
+export const getLokiQueryFromDataQuery = (query?: DataQuery): LokiQuery | undefined => {
+  if (!query || !isLokiQuery(query)) {
+    return undefined;
+  }
+
+  return query;
+};

From 4e492ae725de458887c791c51049cc970c7fe50c Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 24 Apr 2023 16:41:32 +0100
Subject: [PATCH 364/729] Navigation: Unify `Page` component (#66951)

* remove old page component

* add test to check initDashboard is only called once (prevent variables loading twice)

* add help node

* update unit tests

* remove last mentions of topnav

* fix unit tests

* remove unused props from ButtonRow interface

* remove prop from test
---
 .betterer.results                             |   3 +-
 public/app/app.ts                             |   2 +-
 .../components/AppChrome/AppChrome.test.tsx   |   2 +-
 public/app/core/components/Page/Page.test.tsx |  44 ++++--
 public/app/core/components/Page/Page.tsx      | 128 +++++++++--------
 .../app/core/components/Page/PageContents.tsx |   6 +-
 .../{PageNew => Page}/PageHeader.tsx          |   3 +-
 .../components/{PageNew => Page}/PageTabs.tsx |   0
 .../{PageNew => Page}/PluginPage.tsx          |   2 +-
 .../app/core/components/PageNew/Page.test.tsx |  85 -----------
 public/app/core/components/PageNew/Page.tsx   | 132 ------------------
 .../core/components/PageNew/PageContents.tsx  |  16 ---
 .../connections/pages/EditDataSourcePage.tsx  |   7 +-
 .../AccessControlDashboardPermissions.tsx     |   2 +-
 .../DashboardPermissions.tsx                  |   2 +-
 .../DashboardSettings/AnnotationsSettings.tsx |   2 +-
 .../DashboardSettings/DashboardSettings.tsx   |   2 +-
 .../DashboardSettings/GeneralSettings.tsx     |   2 +-
 .../DashboardSettings/JsonEditorSettings.tsx  |   2 +-
 .../DashboardSettings/LinksSettings.tsx       |   2 +-
 .../DashboardSettings/VersionsSettings.tsx    |   2 +-
 .../containers/DashboardPage.test.tsx         |  49 +++++++
 .../datasources/components/ButtonRow.test.tsx |   4 +-
 .../datasources/components/ButtonRow.tsx      |  21 +--
 .../datasources/components/EditDataSource.tsx |  11 +-
 .../pages/DataSourcesListPage.test.tsx        |  14 +-
 .../pages/EditDataSourcePage.test.tsx         |  22 ---
 .../datasources/pages/EditDataSourcePage.tsx  |   7 +-
 .../editor/VariableEditorContainer.tsx        |   2 +-
 29 files changed, 177 insertions(+), 399 deletions(-)
 rename public/app/core/components/{PageNew => Page}/PageHeader.tsx (98%)
 rename public/app/core/components/{PageNew => Page}/PageTabs.tsx (100%)
 rename public/app/core/components/{PageNew => Page}/PluginPage.tsx (94%)
 delete mode 100644 public/app/core/components/PageNew/Page.test.tsx
 delete mode 100644 public/app/core/components/PageNew/Page.tsx
 delete mode 100644 public/app/core/components/PageNew/PageContents.tsx

diff --git a/.betterer.results b/.betterer.results
index 4595a7489a6..40fec2dce99 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2686,8 +2686,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
     "public/app/features/datasources/components/ButtonRow.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
     "public/app/features/datasources/components/DataSourceReadOnlyMessage.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
diff --git a/public/app/app.ts b/public/app/app.ts
index 8a8422f743d..1ea3967a202 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -51,7 +51,7 @@ import { AppWrapper } from './AppWrapper';
 import appEvents from './core/app_events';
 import { AppChromeService } from './core/components/AppChrome/AppChromeService';
 import { getAllOptionEditors, getAllStandardFieldConfigs } from './core/components/OptionsUI/registry';
-import { PluginPage } from './core/components/PageNew/PluginPage';
+import { PluginPage } from './core/components/Page/PluginPage';
 import { GrafanaContextType } from './core/context/GrafanaContext';
 import { initializeI18n } from './core/internationalization';
 import { interceptLinkClicks } from './core/navigation/patch/interceptLinkClicks';
diff --git a/public/app/core/components/AppChrome/AppChrome.test.tsx b/public/app/core/components/AppChrome/AppChrome.test.tsx
index 35ed48715a5..92390c093f8 100644
--- a/public/app/core/components/AppChrome/AppChrome.test.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.test.tsx
@@ -9,7 +9,7 @@ import { config } from '@grafana/runtime';
 import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from 'app/features/search/service';
 
-import { Page } from '../PageNew/Page';
+import { Page } from '../Page/Page';
 
 import { AppChrome } from './AppChrome';
 
diff --git a/public/app/core/components/Page/Page.test.tsx b/public/app/core/components/Page/Page.test.tsx
index afa5e7b99c8..e7962be5cf1 100644
--- a/public/app/core/components/Page/Page.test.tsx
+++ b/public/app/core/components/Page/Page.test.tsx
@@ -1,23 +1,28 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
+import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
-import { NavModelItem } from '@grafana/data';
+import { NavModelItem, PageLayoutType } from '@grafana/data';
 import { config } from '@grafana/runtime';
+import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 
 import { Page } from './Page';
 import { PageProps } from './types';
 
 const pageNav: NavModelItem = {
-  text: 'Main title',
+  text: 'pageNav title',
   children: [
-    { text: 'Child1', url: '1', active: true },
-    { text: 'Child2', url: '2' },
+    { text: 'pageNav child1', url: '1', active: true },
+    { text: 'pageNav child2', url: '2' },
   ],
 };
-
 const setup = (props: Partial<PageProps>) => {
   config.bootData.navTree = [
+    {
+      id: HOME_NAV_ID,
+      text: 'Home',
+    },
     {
       text: 'Section name',
       id: 'section',
@@ -29,13 +34,17 @@ const setup = (props: Partial<PageProps>) => {
     },
   ];
 
-  return render(
-    <TestProvider>
+  const context = getGrafanaContextMock();
+
+  const renderResult = render(
+    <TestProvider grafanaContext={context}>
       <Page {...props}>
         <div data-testid="page-children">Children</div>
       </Page>
     </TestProvider>
   );
+
+  return { renderResult, context };
 };
 
 describe('Render', () => {
@@ -51,14 +60,25 @@ describe('Render', () => {
   it('should render header when pageNav supplied', async () => {
     setup({ pageNav });
 
-    expect(screen.getByRole('heading', { name: 'Main title' })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: 'pageNav title' })).toBeInTheDocument();
     expect(screen.getAllByRole('tab').length).toBe(2);
   });
 
-  it('should get header nav model from redux navIndex', async () => {
-    setup({ navId: 'child1' });
+  it('should update chrome with section, pageNav and layout', async () => {
+    const { context } = setup({ navId: 'child1', pageNav, layout: PageLayoutType.Canvas });
+    expect(context.chrome.state.getValue().sectionNav.node.id).toBe('child1');
+    expect(context.chrome.state.getValue().pageNav).toBe(pageNav);
+    expect(context.chrome.state.getValue().layout).toBe(PageLayoutType.Canvas);
+  });
 
-    expect(screen.getByRole('heading', { name: 'Section name' })).toBeInTheDocument();
-    expect(screen.getAllByRole('tab').length).toBe(2);
+  it('should update document title', async () => {
+    setup({ navId: 'child1', pageNav });
+    expect(document.title).toBe('pageNav title - Child1 - Section name - Grafana');
+  });
+
+  it('should not include hideFromBreadcrumb nodes in title', async () => {
+    pageNav.children![0].hideFromBreadcrumbs = true;
+    setup({ navId: 'child1', pageNav });
+    expect(document.title).toBe('pageNav title - Child1 - Section name - Grafana');
   });
 });
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index 9d5b594809b..df666b44ed9 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -1,35 +1,32 @@
 // Libraries
 import { css, cx } from '@emotion/css';
-import React, { useEffect } from 'react';
+import React, { useLayoutEffect } from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { CustomScrollbar, useStyles2 } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 
-import { Footer } from '../Footer/Footer';
-import { PageHeader } from '../PageHeader/PageHeader';
-import { Page as NewPage } from '../PageNew/Page';
-
 import { PageContents } from './PageContents';
+import { PageHeader } from './PageHeader';
+import { PageTabs } from './PageTabs';
 import { PageType } from './types';
 import { usePageNav } from './usePageNav';
 import { usePageTitle } from './usePageTitle';
 
-export const OldPage: PageType = ({
+export const Page: PageType = ({
   navId,
   navModel: oldNavProp,
   pageNav,
+  renderTitle,
+  actions,
+  subTitle,
   children,
   className,
-  toolbar,
-  scrollRef,
-  scrollTop,
-  layout = PageLayoutType.Standard,
-  renderTitle,
-  subTitle,
-  actions,
   info,
+  layout = PageLayoutType.Standard,
+  toolbar,
+  scrollTop,
+  scrollRef,
   ...otherProps
 }) => {
   const styles = useStyles2(getStyles);
@@ -38,48 +35,46 @@ export const OldPage: PageType = ({
 
   usePageTitle(navModel, pageNav);
 
-  const pageHeaderNav = pageNav ?? navModel?.main;
+  const pageHeaderNav = pageNav ?? navModel?.node;
 
-  useEffect(() => {
+  // We use useLayoutEffect here to make sure that the chrome is updated before the page is rendered
+  // This prevents flickering sectionNav when going from dashbaord to settings for example
+  useLayoutEffect(() => {
     if (navModel) {
-      // This is needed for chrome to update it's chromeless state
       chrome.update({
         sectionNav: navModel,
+        pageNav: pageNav,
+        layout: layout,
       });
-    } else {
-      // Need to trigger a chrome state update for the route change to be processed
-      chrome.update({});
     }
-  }, [navModel, chrome]);
+  }, [navModel, pageNav, chrome, layout]);
 
   return (
     <div className={cx(styles.wrapper, className)} {...otherProps}>
       {layout === PageLayoutType.Standard && (
         <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
-          <div className={cx('page-scrollbar-content', className)}>
+          <div className={styles.pageInner}>
             {pageHeaderNav && (
               <PageHeader
                 actions={actions}
-                info={info}
                 navItem={pageHeaderNav}
                 renderTitle={renderTitle}
+                info={info}
                 subTitle={subTitle}
               />
             )}
-            {children}
-            <Footer />
+            {pageNav && pageNav.children && <PageTabs navItem={pageNav} />}
+            <div className={styles.pageContent}>{children}</div>
           </div>
         </CustomScrollbar>
       )}
       {layout === PageLayoutType.Canvas && (
-        <>
-          {toolbar}
-          <div className={styles.scrollWrapper}>
-            <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
-              <div className={cx(styles.content, !toolbar && styles.contentWithoutToolbar)}>{children}</div>
-            </CustomScrollbar>
+        <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
+          <div className={styles.canvasContent}>
+            {toolbar}
+            {children}
           </div>
-        </>
+        </CustomScrollbar>
       )}
       {layout === PageLayoutType.Custom && (
         <>
@@ -91,33 +86,46 @@ export const OldPage: PageType = ({
   );
 };
 
-OldPage.Contents = PageContents;
+Page.Contents = PageContents;
 
-export const Page: PageType = config.featureToggles.topnav ? NewPage : OldPage;
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    wrapper: css({
+      label: 'page-wrapper',
+      height: '100%',
+      display: 'flex',
+      flex: '1 1 0',
+      flexDirection: 'column',
+      minHeight: 0,
+    }),
+    pageContent: css({
+      label: 'page-content',
+      flexGrow: 1,
+    }),
+    pageInner: css({
+      label: 'page-inner',
+      padding: theme.spacing(2),
+      borderRadius: theme.shape.borderRadius(1),
+      border: `1px solid ${theme.colors.border.weak}`,
+      borderBottom: 'none',
+      background: theme.colors.background.primary,
+      display: 'flex',
+      flexDirection: 'column',
+      flexGrow: 1,
+      margin: theme.spacing(0, 0, 0, 0),
 
-const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css({
-    width: '100%',
-    height: '100%',
-    display: 'flex',
-    flex: '1 1 0',
-    flexDirection: 'column',
-    minHeight: 0,
-  }),
-  scrollWrapper: css({
-    width: '100%',
-    flexGrow: 1,
-    minHeight: 0,
-    display: 'flex',
-  }),
-  content: css({
-    display: 'flex',
-    flexDirection: 'column',
-    padding: theme.spacing(0, 2, 2, 2),
-    flexBasis: '100%',
-    flexGrow: 1,
-  }),
-  contentWithoutToolbar: css({
-    padding: theme.spacing(2),
-  }),
-});
+      [theme.breakpoints.up('md')]: {
+        margin: theme.spacing(2, 2, 0, 1),
+        padding: theme.spacing(3),
+      },
+    }),
+    canvasContent: css({
+      label: 'canvas-content',
+      display: 'flex',
+      flexDirection: 'column',
+      padding: theme.spacing(2),
+      flexBasis: '100%',
+      flexGrow: 1,
+    }),
+  };
+};
diff --git a/public/app/core/components/Page/PageContents.tsx b/public/app/core/components/Page/PageContents.tsx
index 55ec042e789..1246443139a 100644
--- a/public/app/core/components/Page/PageContents.tsx
+++ b/public/app/core/components/Page/PageContents.tsx
@@ -1,8 +1,6 @@
 // Libraries
-import { cx } from '@emotion/css';
 import React from 'react';
 
-// Components
 import PageLoader from '../PageLoader/PageLoader';
 
 interface Props {
@@ -12,5 +10,7 @@ interface Props {
 }
 
 export const PageContents = ({ isLoading, children, className }: Props) => {
-  return <div className={cx('page-container', 'page-body', className)}>{isLoading ? <PageLoader /> : children}</div>;
+  let content = className ? <div className={className}>{children}</div> : children;
+
+  return <>{isLoading ? <PageLoader /> : content}</>;
 };
diff --git a/public/app/core/components/PageNew/PageHeader.tsx b/public/app/core/components/Page/PageHeader.tsx
similarity index 98%
rename from public/app/core/components/PageNew/PageHeader.tsx
rename to public/app/core/components/Page/PageHeader.tsx
index 55fcdd552d4..7e3b7aa3e8e 100644
--- a/public/app/core/components/PageNew/PageHeader.tsx
+++ b/public/app/core/components/Page/PageHeader.tsx
@@ -4,9 +4,10 @@ import React from 'react';
 import { NavModelItem, GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 
-import { PageInfoItem } from '../Page/types';
 import { PageInfo } from '../PageInfo/PageInfo';
 
+import { PageInfoItem } from './types';
+
 export interface Props {
   navItem: NavModelItem;
   renderTitle?: (title: string) => React.ReactNode;
diff --git a/public/app/core/components/PageNew/PageTabs.tsx b/public/app/core/components/Page/PageTabs.tsx
similarity index 100%
rename from public/app/core/components/PageNew/PageTabs.tsx
rename to public/app/core/components/Page/PageTabs.tsx
diff --git a/public/app/core/components/PageNew/PluginPage.tsx b/public/app/core/components/Page/PluginPage.tsx
similarity index 94%
rename from public/app/core/components/PageNew/PluginPage.tsx
rename to public/app/core/components/Page/PluginPage.tsx
index 2872786852a..694c6729fa5 100644
--- a/public/app/core/components/PageNew/PluginPage.tsx
+++ b/public/app/core/components/Page/PluginPage.tsx
@@ -3,7 +3,7 @@ import React, { useContext } from 'react';
 import { PluginPageProps } from '@grafana/runtime';
 import { PluginPageContext } from 'app/features/plugins/components/PluginPageContext';
 
-import { Page } from '../Page/Page';
+import { Page } from './Page';
 
 export function PluginPage({ actions, children, info, pageNav, layout, renderTitle, subTitle }: PluginPageProps) {
   const context = useContext(PluginPageContext);
diff --git a/public/app/core/components/PageNew/Page.test.tsx b/public/app/core/components/PageNew/Page.test.tsx
deleted file mode 100644
index 53068a201de..00000000000
--- a/public/app/core/components/PageNew/Page.test.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { TestProvider } from 'test/helpers/TestProvider';
-import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
-
-import { NavModelItem, PageLayoutType } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { HOME_NAV_ID } from 'app/core/reducers/navModel';
-
-import { PageProps } from '../Page/types';
-
-import { Page } from './Page';
-
-const pageNav: NavModelItem = {
-  text: 'pageNav title',
-  children: [
-    { text: 'pageNav child1', url: '1', active: true },
-    { text: 'pageNav child2', url: '2' },
-  ],
-};
-const setup = (props: Partial<PageProps>) => {
-  config.bootData.navTree = [
-    {
-      id: HOME_NAV_ID,
-      text: 'Home',
-    },
-    {
-      text: 'Section name',
-      id: 'section',
-      url: 'section',
-      children: [
-        { text: 'Child1', id: 'child1', url: 'section/child1' },
-        { text: 'Child2', id: 'child2', url: 'section/child2' },
-      ],
-    },
-  ];
-
-  const context = getGrafanaContextMock();
-
-  const renderResult = render(
-    <TestProvider grafanaContext={context}>
-      <Page {...props}>
-        <div data-testid="page-children">Children</div>
-      </Page>
-    </TestProvider>
-  );
-
-  return { renderResult, context };
-};
-
-describe('Render', () => {
-  it('should render component with emtpy Page container', async () => {
-    setup({});
-    const children = await screen.findByTestId('page-children');
-    expect(children).toBeInTheDocument();
-
-    const pageHeader = screen.queryByRole('heading');
-    expect(pageHeader).not.toBeInTheDocument();
-  });
-
-  it('should render header when pageNav supplied', async () => {
-    setup({ pageNav });
-
-    expect(screen.getByRole('heading', { name: 'pageNav title' })).toBeInTheDocument();
-    expect(screen.getAllByRole('tab').length).toBe(2);
-  });
-
-  it('should update chrome with section, pageNav and layout', async () => {
-    const { context } = setup({ navId: 'child1', pageNav, layout: PageLayoutType.Canvas });
-    expect(context.chrome.state.getValue().sectionNav.node.id).toBe('child1');
-    expect(context.chrome.state.getValue().pageNav).toBe(pageNav);
-    expect(context.chrome.state.getValue().layout).toBe(PageLayoutType.Canvas);
-  });
-
-  it('should update document title', async () => {
-    setup({ navId: 'child1', pageNav });
-    expect(document.title).toBe('pageNav title - Child1 - Section name - Grafana');
-  });
-
-  it('should not include hideFromBreadcrumb nodes in title', async () => {
-    pageNav.children![0].hideFromBreadcrumbs = true;
-    setup({ navId: 'child1', pageNav });
-    expect(document.title).toBe('pageNav title - Child1 - Section name - Grafana');
-  });
-});
diff --git a/public/app/core/components/PageNew/Page.tsx b/public/app/core/components/PageNew/Page.tsx
deleted file mode 100644
index fd8e3c5f65e..00000000000
--- a/public/app/core/components/PageNew/Page.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-// Libraries
-import { css, cx } from '@emotion/css';
-import React, { useLayoutEffect } from 'react';
-
-import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
-import { CustomScrollbar, useStyles2 } from '@grafana/ui';
-import { useGrafana } from 'app/core/context/GrafanaContext';
-
-import { PageType } from '../Page/types';
-import { usePageNav } from '../Page/usePageNav';
-import { usePageTitle } from '../Page/usePageTitle';
-
-import { PageContents } from './PageContents';
-import { PageHeader } from './PageHeader';
-import { PageTabs } from './PageTabs';
-
-export const Page: PageType = ({
-  navId,
-  navModel: oldNavProp,
-  pageNav,
-  renderTitle,
-  actions,
-  subTitle,
-  children,
-  className,
-  info,
-  layout = PageLayoutType.Standard,
-  toolbar,
-  scrollTop,
-  scrollRef,
-  ...otherProps
-}) => {
-  const styles = useStyles2(getStyles);
-  const navModel = usePageNav(navId, oldNavProp);
-  const { chrome } = useGrafana();
-
-  usePageTitle(navModel, pageNav);
-
-  const pageHeaderNav = pageNav ?? navModel?.node;
-
-  // We use useLayoutEffect here to make sure that the chrome is updated before the page is rendered
-  // This prevents flickering sectionNav when going from dashbaord to settings for example
-  useLayoutEffect(() => {
-    if (navModel) {
-      chrome.update({
-        sectionNav: navModel,
-        pageNav: pageNav,
-        layout: layout,
-      });
-    }
-  }, [navModel, pageNav, chrome, layout]);
-
-  return (
-    <div className={cx(styles.wrapper, className)} {...otherProps}>
-      {layout === PageLayoutType.Standard && (
-        <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
-          <div className={styles.pageInner}>
-            {pageHeaderNav && (
-              <PageHeader
-                actions={actions}
-                navItem={pageHeaderNav}
-                renderTitle={renderTitle}
-                info={info}
-                subTitle={subTitle}
-              />
-            )}
-            {pageNav && pageNav.children && <PageTabs navItem={pageNav} />}
-            <div className={styles.pageContent}>{children}</div>
-          </div>
-        </CustomScrollbar>
-      )}
-      {layout === PageLayoutType.Canvas && (
-        <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
-          <div className={styles.canvasContent}>
-            {toolbar}
-            {children}
-          </div>
-        </CustomScrollbar>
-      )}
-      {layout === PageLayoutType.Custom && (
-        <>
-          {toolbar}
-          {children}
-        </>
-      )}
-    </div>
-  );
-};
-
-Page.Contents = PageContents;
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    wrapper: css({
-      label: 'page-wrapper',
-      height: '100%',
-      display: 'flex',
-      flex: '1 1 0',
-      flexDirection: 'column',
-      minHeight: 0,
-    }),
-    pageContent: css({
-      label: 'page-content',
-      flexGrow: 1,
-    }),
-    pageInner: css({
-      label: 'page-inner',
-      padding: theme.spacing(2),
-      borderRadius: theme.shape.borderRadius(1),
-      border: `1px solid ${theme.colors.border.weak}`,
-      borderBottom: 'none',
-      background: theme.colors.background.primary,
-      display: 'flex',
-      flexDirection: 'column',
-      flexGrow: 1,
-      margin: theme.spacing(0, 0, 0, 0),
-
-      [theme.breakpoints.up('md')]: {
-        margin: theme.spacing(2, 2, 0, 1),
-        padding: theme.spacing(3),
-      },
-    }),
-    canvasContent: css({
-      label: 'canvas-content',
-      display: 'flex',
-      flexDirection: 'column',
-      padding: theme.spacing(2),
-      flexBasis: '100%',
-      flexGrow: 1,
-    }),
-  };
-};
diff --git a/public/app/core/components/PageNew/PageContents.tsx b/public/app/core/components/PageNew/PageContents.tsx
deleted file mode 100644
index 1246443139a..00000000000
--- a/public/app/core/components/PageNew/PageContents.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-// Libraries
-import React from 'react';
-
-import PageLoader from '../PageLoader/PageLoader';
-
-interface Props {
-  isLoading?: boolean;
-  children: React.ReactNode;
-  className?: string;
-}
-
-export const PageContents = ({ isLoading, children, className }: Props) => {
-  let content = className ? <div className={className}>{children}</div> : children;
-
-  return <>{isLoading ? <PageLoader /> : content}</>;
-};
diff --git a/public/app/features/connections/pages/EditDataSourcePage.tsx b/public/app/features/connections/pages/EditDataSourcePage.tsx
index 2f66e87f6db..b27417e66ec 100644
--- a/public/app/features/connections/pages/EditDataSourcePage.tsx
+++ b/public/app/features/connections/pages/EditDataSourcePage.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 
-import { config } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { EditDataSource } from 'app/features/datasources/components/EditDataSource';
 import { EditDataSourceActions } from 'app/features/datasources/components/EditDataSourceActions';
@@ -16,11 +15,7 @@ export function EditDataSourcePage() {
   const { navId, pageNav } = useDataSourceSettingsNav();
 
   return (
-    <Page
-      navId={navId}
-      pageNav={pageNav}
-      actions={config.featureToggles.topnav ? <EditDataSourceActions uid={uid} /> : undefined}
-    >
+    <Page navId={navId} pageNav={pageNav} actions={<EditDataSourceActions uid={uid} />}>
       <Page.Contents>
         <EditDataSource uid={uid} pageId={pageId} />
       </Page.Contents>
diff --git a/public/app/features/dashboard/components/DashboardPermissions/AccessControlDashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/AccessControlDashboardPermissions.tsx
index 7fd8611b5e9..a06413a1338 100644
--- a/public/app/features/dashboard/components/DashboardPermissions/AccessControlDashboardPermissions.tsx
+++ b/public/app/features/dashboard/components/DashboardPermissions/AccessControlDashboardPermissions.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { Permissions } from 'app/core/components/AccessControl';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types';
 
diff --git a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
index 3c6cd2ff0b0..89ba108750c 100644
--- a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
+++ b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
@@ -3,7 +3,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { Tooltip, Icon, Button } from '@grafana/ui';
 import { SlideDown } from 'app/core/components/Animations/SlideDown';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 import AddPermission from 'app/core/components/PermissionList/AddPermission';
 import PermissionList from 'app/core/components/PermissionList/PermissionList';
 import PermissionsInfo from 'app/core/components/PermissionList/PermissionsInfo';
diff --git a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.tsx
index 0c6157c976c..a4db2c16c52 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { AnnotationQuery, getDataSourceRef, NavModelItem } from '@grafana/data';
 import { getDataSourceSrv, locationService } from '@grafana/runtime';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 
 import { DashboardModel } from '../../state';
 import { AnnotationSettingsEdit, AnnotationSettingsList, newAnnotationName } from '../AnnotationSettings';
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
index 8ba6072b32c..624230aefd8 100644
--- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
@@ -7,7 +7,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { locationService } from '@grafana/runtime';
 import { Button, ToolbarButtonRow } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 import config from 'app/core/config';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction } from 'app/types';
diff --git a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
index 7e16893f6bc..c1f7b4697bf 100644
--- a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
@@ -3,7 +3,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { TimeZone } from '@grafana/data';
 import { CollapsableSection, Field, Input, RadioButtonGroup, TagsInput } from '@grafana/ui';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { FolderPicker } from 'app/core/components/Select/FolderPicker';
 import { updateTimeZoneDashboard, updateWeekStartDashboard } from 'app/features/dashboard/state/actions';
 
diff --git a/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx
index 2f864ee0e30..9d0920a677e 100644
--- a/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx
@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Button, CodeEditor, useStyles2 } from '@grafana/ui';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
 
 import { getDashboardSrv } from '../../services/DashboardSrv';
diff --git a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx
index d550f9789c1..10cd657c92f 100644
--- a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 
 import { NavModelItem } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 
 import { LinkSettingsEdit, LinkSettingsList } from '../LinksSettings';
 import { newLink } from '../LinksSettings/LinkSettingsEdit';
diff --git a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx
index 5068bc95b77..8af74edb60f 100644
--- a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 
 import { Spinner, HorizontalGroup } from '@grafana/ui';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 
 import {
   historySrv,
diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx
index d2abb8f84f1..0fe6cfef4a9 100644
--- a/public/app/features/dashboard/containers/DashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx
@@ -1,10 +1,12 @@
 import { render, screen, waitFor } from '@testing-library/react';
+import { KBarProvider } from 'kbar';
 import React from 'react';
 import { Provider } from 'react-redux';
 import { match, Router } from 'react-router-dom';
 import { useEffectOnce } from 'react-use';
 import { AutoSizerProps } from 'react-virtualized-auto-sizer';
 import { mockToolkitActionCreator } from 'test/core/redux/mocks';
+import { TestProvider } from 'test/helpers/TestProvider';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { createTheme } from '@grafana/data';
@@ -12,6 +14,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { config, locationService, setDataSourceSrv } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
 import { notifyApp } from 'app/core/actions';
+import { AppChrome } from 'app/core/components/AppChrome/AppChrome';
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
 import { RouteDescriptor } from 'app/core/navigation/types';
@@ -58,6 +61,9 @@ jest.mock('app/core/core', () => ({
       return { unsubscribe: () => {} };
     },
   },
+  contextSrv: {
+    user: { orgId: 1 },
+  },
 }));
 
 jest.mock('react-virtualized-auto-sizer', () => {
@@ -92,6 +98,10 @@ function setup(propOverrides?: Partial<Props>) {
   config.bootData.navTree = [
     { text: 'Dashboards', id: 'dashboards/browse' },
     { text: 'Home', id: HOME_NAV_ID },
+    {
+      text: 'Help',
+      id: 'help',
+    },
   ];
 
   const store = configureStore();
@@ -177,6 +187,45 @@ describe('DashboardPage', () => {
         expect(document.title).toBe('My dashboard - Dashboards - Grafana');
       });
     });
+
+    it('only calls initDashboard once when wrapped in AppChrome', async () => {
+      const props: Props = {
+        ...getRouteComponentProps({
+          match: { params: { slug: 'my-dash', uid: '11' } } as unknown as match,
+          route: { routeName: DashboardRoutes.Normal } as RouteDescriptor,
+        }),
+        navIndex: {
+          'dashboards/browse': {
+            text: 'Dashboards',
+            id: 'dashboards/browse',
+            parentItem: { text: 'Home', id: HOME_NAV_ID },
+          },
+          [HOME_NAV_ID]: { text: 'Home', id: HOME_NAV_ID },
+        },
+        initPhase: DashboardInitPhase.Completed,
+        initError: null,
+        initDashboard: mockInitDashboard,
+        notifyApp: mockToolkitActionCreator(notifyApp),
+        cleanUpDashboardAndVariables: mockCleanUpDashboardAndVariables,
+        cancelVariables: jest.fn(),
+        templateVarsChangedInUrl: jest.fn(),
+        dashboard: getTestDashboard(),
+        theme: createTheme(),
+      };
+
+      render(
+        <KBarProvider>
+          <TestProvider>
+            <AppChrome>
+              <UnthemedDashboardPage {...props} />
+            </AppChrome>
+          </TestProvider>
+        </KBarProvider>
+      );
+
+      await screen.findByText('My dashboard');
+      expect(mockInitDashboard).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('When going into view mode', () => {
diff --git a/public/app/features/datasources/components/ButtonRow.test.tsx b/public/app/features/datasources/components/ButtonRow.test.tsx
index dc2208f5092..0d9147452bd 100644
--- a/public/app/features/datasources/components/ButtonRow.test.tsx
+++ b/public/app/features/datasources/components/ButtonRow.test.tsx
@@ -8,9 +8,7 @@ import { ButtonRow, Props } from './ButtonRow';
 const setup = (propOverrides?: object) => {
   const props: Props = {
     canSave: false,
-    canDelete: false,
     onSubmit: jest.fn(),
-    onDelete: jest.fn(),
     onTest: jest.fn(),
     exploreUrl: '/explore',
   };
@@ -24,7 +22,7 @@ describe('<ButtonRow>', () => {
   it('should render component', () => {
     setup();
 
-    expect(screen.getByRole('button', { name: selectors.pages.DataSource.delete })).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'Explore' })).toBeInTheDocument();
   });
   it('should render save & test', () => {
     setup({ canSave: true });
diff --git a/public/app/features/datasources/components/ButtonRow.tsx b/public/app/features/datasources/components/ButtonRow.tsx
index d1c40f885be..9d581bd8cc4 100644
--- a/public/app/features/datasources/components/ButtonRow.tsx
+++ b/public/app/features/datasources/components/ButtonRow.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { config } from '@grafana/runtime';
 import { Button, LinkButton } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types';
@@ -9,36 +8,18 @@ import { AccessControlAction } from 'app/types';
 export interface Props {
   exploreUrl: string;
   canSave: boolean;
-  canDelete: boolean;
-  onDelete: () => void;
   onSubmit: (event: React.MouseEvent<HTMLButtonElement>) => void;
   onTest: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
 }
 
-export function ButtonRow({ canSave, canDelete, onDelete, onSubmit, onTest, exploreUrl }: Props) {
+export function ButtonRow({ canSave, onSubmit, onTest, exploreUrl }: Props) {
   const canExploreDataSources = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore);
 
   return (
     <div className="gf-form-button-row">
-      {!config.featureToggles.topnav && (
-        <Button variant="secondary" fill="solid" type="button" onClick={() => history.back()}>
-          Back
-        </Button>
-      )}
       <LinkButton variant="secondary" fill="solid" href={exploreUrl} disabled={!canExploreDataSources}>
         Explore
       </LinkButton>
-      {!config.featureToggles.topnav && (
-        <Button
-          type="button"
-          variant="destructive"
-          disabled={!canDelete}
-          onClick={onDelete}
-          aria-label={selectors.pages.DataSource.delete}
-        >
-          Delete
-        </Button>
-      )}
       {canSave && (
         <Button
           type="submit"
diff --git a/public/app/features/datasources/components/EditDataSource.tsx b/public/app/features/datasources/components/EditDataSource.tsx
index 011b36cc76d..aa985ac08e3 100644
--- a/public/app/features/datasources/components/EditDataSource.tsx
+++ b/public/app/features/datasources/components/EditDataSource.tsx
@@ -108,7 +108,7 @@ export function EditDataSourceView({
   onUpdate,
 }: ViewProps) {
   const { plugin, loadError, testingStatus, loading } = dataSourceSettings;
-  const { readOnly, hasWriteRights, hasDeleteRights } = dataSourceRights;
+  const { readOnly, hasWriteRights } = dataSourceRights;
   const hasDataSource = dataSource.id > 0;
 
   const dsi = getDataSourceSrv()?.getInstanceSettings(dataSource.uid);
@@ -175,14 +175,7 @@ export function EditDataSourceView({
 
       <DataSourceTestingStatus testingStatus={testingStatus} />
 
-      <ButtonRow
-        onSubmit={onSubmit}
-        onDelete={onDelete}
-        onTest={onTest}
-        exploreUrl={exploreUrl}
-        canSave={!readOnly && hasWriteRights}
-        canDelete={!readOnly && hasDeleteRights}
-      />
+      <ButtonRow onSubmit={onSubmit} onTest={onTest} exploreUrl={exploreUrl} canSave={!readOnly && hasWriteRights} />
     </form>
   );
 }
diff --git a/public/app/features/datasources/pages/DataSourcesListPage.test.tsx b/public/app/features/datasources/pages/DataSourcesListPage.test.tsx
index cb9beddb927..de0a4b9670b 100644
--- a/public/app/features/datasources/pages/DataSourcesListPage.test.tsx
+++ b/public/app/features/datasources/pages/DataSourcesListPage.test.tsx
@@ -44,10 +44,7 @@ describe('Render', () => {
   it('should render component', async () => {
     setup({ isSortAscending: true });
 
-    expect(await screen.findByRole('heading', { name: 'Configuration' })).toBeInTheDocument();
-    expect(await screen.findByRole('link', { name: 'Documentation' })).toBeInTheDocument();
-    expect(await screen.findByRole('link', { name: 'Support' })).toBeInTheDocument();
-    expect(await screen.findByRole('link', { name: 'Community' })).toBeInTheDocument();
+    expect(await screen.findByRole('heading', { name: 'Data sources' })).toBeInTheDocument();
     expect(await screen.findByRole('link', { name: 'Add data source' })).toBeInTheDocument();
 
     // Should not show button in page header when the list is empty
@@ -62,10 +59,7 @@ describe('Render', () => {
     it('should disable the "Add data source" button if user has no permissions', async () => {
       setup({ isSortAscending: true });
 
-      expect(await screen.findByRole('heading', { name: 'Configuration' })).toBeInTheDocument();
-      expect(await screen.findByRole('link', { name: 'Documentation' })).toBeInTheDocument();
-      expect(await screen.findByRole('link', { name: 'Support' })).toBeInTheDocument();
-      expect(await screen.findByRole('link', { name: 'Community' })).toBeInTheDocument();
+      expect(await screen.findByRole('heading', { name: 'Data sources' })).toBeInTheDocument();
       expect(await screen.findByRole('link', { name: 'Add data source' })).toHaveStyle('pointer-events: none');
     });
 
@@ -129,7 +123,7 @@ describe('Render', () => {
       const dataSourceItems = await screen.findAllByRole('heading');
 
       expect(dataSourceItems).toHaveLength(6);
-      expect(dataSourceItems[0]).toHaveTextContent('Configuration');
+      expect(dataSourceItems[0]).toHaveTextContent('Data sources');
       expect(dataSourceItems[1]).toHaveTextContent('dataSource-0');
       expect(dataSourceItems[2]).toHaveTextContent('dataSource-1');
     });
@@ -141,7 +135,7 @@ describe('Render', () => {
       const dataSourceItems = await screen.findAllByRole('heading');
 
       expect(dataSourceItems).toHaveLength(6);
-      expect(dataSourceItems[0]).toHaveTextContent('Configuration');
+      expect(dataSourceItems[0]).toHaveTextContent('Data sources');
       expect(dataSourceItems[1]).toHaveTextContent('dataSource-4');
       expect(dataSourceItems[2]).toHaveTextContent('dataSource-3');
     });
diff --git a/public/app/features/datasources/pages/EditDataSourcePage.test.tsx b/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
index 149ef0f29b5..c3fd01b8346 100644
--- a/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
+++ b/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
@@ -5,7 +5,6 @@ import { TestProvider } from 'test/helpers/TestProvider';
 
 import { LayoutModes } from '@grafana/data';
 import { setAngularLoader } from '@grafana/runtime';
-import config from 'app/core/config';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
 import { configureStore } from 'app/store/configureStore';
 
@@ -58,7 +57,6 @@ describe('<EditDataSourcePage>', () => {
   const dataSourceMeta = getMockDataSourceMeta();
   const dataSourceSettings = getMockDataSourceSettingsState();
   let store: Store;
-  const topnavValue = config.featureToggles.topnav;
 
   beforeAll(() => {
     setAngularLoader({
@@ -96,12 +94,7 @@ describe('<EditDataSourcePage>', () => {
     });
   });
 
-  afterAll(() => {
-    config.featureToggles.topnav = topnavValue;
-  });
-
   it('should render the edit page without an issue', async () => {
-    config.featureToggles.topnav = false;
     setup(uid, store);
 
     expect(screen.queryByText('Loading ...')).not.toBeInTheDocument();
@@ -109,23 +102,8 @@ describe('<EditDataSourcePage>', () => {
     // Title
     expect(screen.queryByText(name)).toBeVisible();
 
-    // Buttons
-    expect(screen.queryByRole('button', { name: /Back/i })).toBeVisible();
-    expect(screen.queryByRole('button', { name: /Delete/i })).toBeVisible();
-    expect(screen.queryByRole('button', { name: /Save (.*) test/i })).toBeVisible();
-    expect(screen.queryByRole('link', { name: /Explore/i })).toBeVisible();
-
-    // wait for the rest of the async processes to finish
-    expect(await screen.findByText(name)).toBeVisible();
-  });
-
-  it('should show updated action buttons when topnav is on', async () => {
-    config.featureToggles.topnav = true;
-    setup(uid, store);
-
     await waitFor(() => {
       // Buttons
-      expect(screen.queryAllByRole('button', { name: /Back/i })).toHaveLength(0);
       expect(screen.queryByRole('button', { name: /Delete/i })).toBeVisible();
       expect(screen.queryByRole('button', { name: /Save (.*) test/i })).toBeVisible();
       expect(screen.queryByRole('link', { name: /Build a dashboard/i })).toBeVisible();
diff --git a/public/app/features/datasources/pages/EditDataSourcePage.tsx b/public/app/features/datasources/pages/EditDataSourcePage.tsx
index b9804fc970d..c9d0e86e180 100644
--- a/public/app/features/datasources/pages/EditDataSourcePage.tsx
+++ b/public/app/features/datasources/pages/EditDataSourcePage.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 
-import { config } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
@@ -17,11 +16,7 @@ export function EditDataSourcePage(props: Props) {
   const nav = useDataSourceSettingsNav(uid, pageId);
 
   return (
-    <Page
-      navId="datasources"
-      pageNav={nav.main}
-      actions={config.featureToggles.topnav ? <EditDataSourceActions uid={uid} /> : undefined}
-    >
+    <Page navId="datasources" pageNav={nav.main} actions={<EditDataSourceActions uid={uid} />}>
       <Page.Contents>
         <EditDataSource uid={uid} pageId={pageId} />
       </Page.Contents>
diff --git a/public/app/features/variables/editor/VariableEditorContainer.tsx b/public/app/features/variables/editor/VariableEditorContainer.tsx
index 08cd5a564fe..6e2e6a0d802 100644
--- a/public/app/features/variables/editor/VariableEditorContainer.tsx
+++ b/public/app/features/variables/editor/VariableEditorContainer.tsx
@@ -3,7 +3,7 @@ import { connect, ConnectedProps } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import { locationService } from '@grafana/runtime';
-import { Page } from 'app/core/components/PageNew/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { SettingsPageProps } from 'app/features/dashboard/components/DashboardSettings/types';
 
 import { StoreState, ThunkDispatch } from '../../../types';

From 68a277b53b79d76cb7485b325fa835ac4d92a26a Mon Sep 17 00:00:00 2001
From: Kevin Yu <kevinwcyu@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:57:39 -0700
Subject: [PATCH 365/729] CloudWatch: Add field level comments to schema
 (#66900)

* CloudWatch: Add field level comments to schema

* update comments

* pr comments

* remove unneeded test
---
 .../kinds/dataquery/types_dataquery_gen.go    | 245 +++++++++++++-----
 .../models/cloudwatch_query_test.go           |  10 -
 .../datasource/cloudwatch/dataquery.cue       | 104 +++++---
 .../datasource/cloudwatch/dataquery.gen.ts    | 127 ++++++++-
 4 files changed, 384 insertions(+), 102 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
index 0c7df705400..f0b62e3612d 100644
--- a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
@@ -286,29 +286,54 @@ const (
 	SQLExpressionWhereTypeOr  SQLExpressionWhereType = "or"
 )
 
-// CloudWatchAnnotationQuery defines model for CloudWatchAnnotationQuery.
+// Shape of a CloudWatch Annotation query
 type CloudWatchAnnotationQuery struct {
-	AccountId       *string `json:"accountId,omitempty"`
-	ActionPrefix    *string `json:"actionPrefix,omitempty"`
+	// The ID of the AWS account to query for the metric, specifying `all` will query all accounts that the monitoring account is permitted to query.
+	AccountId *string `json:"accountId,omitempty"`
+
+	// Use this parameter to filter the results of the operation to only those alarms
+	// that use a certain alarm action. For example, you could specify the ARN of
+	// an SNS topic to find all alarms that send notifications to that topic.
+	// e.g. `arn:aws:sns:us-east-1:123456789012:my-app-` would match `arn:aws:sns:us-east-1:123456789012:my-app-action`
+	// but not match `arn:aws:sns:us-east-1:123456789012:your-app-action`
+	ActionPrefix *string `json:"actionPrefix,omitempty"`
+
+	// An alarm name prefix. If you specify this parameter, you receive information
+	// about all alarms that have names that start with this prefix.
+	// e.g. `my-team-service-` would match `my-team-service-high-cpu` but not match `your-team-service-high-cpu`
 	AlarmNamePrefix *string `json:"alarmNamePrefix,omitempty"`
 
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
 	// TODO this shouldn't be unknown but DataSourceRef | null
-	Datasource *interface{}           `json:"datasource,omitempty"`
+	Datasource *interface{} `json:"datasource,omitempty"`
+
+	// The dimensions of the metric
 	Dimensions map[string]interface{} `json:"dimensions,omitempty"`
 
 	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	// Note this does not always imply that the query should not be executed since
 	// the results from a hidden query may be used as the input to other queries (SSE etc)
-	Hide           *bool                              `json:"hide,omitempty"`
-	MatchExact     *bool                              `json:"matchExact,omitempty"`
-	MetricName     *string                            `json:"metricName,omitempty"`
-	Namespace      string                             `json:"namespace"`
-	Period         *string                            `json:"period,omitempty"`
-	PrefixMatching *bool                              `json:"prefixMatching,omitempty"`
-	QueryMode      CloudWatchAnnotationQueryQueryMode `json:"queryMode"`
+	Hide *bool `json:"hide,omitempty"`
+
+	// Only show metrics that exactly match all defined dimension names.
+	MatchExact *bool `json:"matchExact,omitempty"`
+
+	// Name of the metric
+	MetricName *string `json:"metricName,omitempty"`
+
+	// A namespace is a container for CloudWatch metrics. Metrics in different namespaces are isolated from each other, so that metrics from different applications are not mistakenly aggregated into the same statistics. For example, Amazon EC2 uses the AWS/EC2 namespace.
+	Namespace string `json:"namespace"`
+
+	// The length of time associated with a specific Amazon CloudWatch statistic. Can be specified by a number of seconds, 'auto', or as a duration string e.g. '15m' being 15 minutes
+	Period *string `json:"period,omitempty"`
+
+	// Enable matching on the prefix of the action name or alarm name, specify the prefixes with actionPrefix and/or alarmNamePrefix
+	PrefixMatching *bool `json:"prefixMatching,omitempty"`
+
+	// Whether a query is a Metrics, Logs, or Annotations query
+	QueryMode CloudWatchAnnotationQueryQueryMode `json:"queryMode"`
 
 	// Specify the query flavor
 	// TODO make this required and give it a default
@@ -317,28 +342,34 @@ type CloudWatchAnnotationQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId     string  `json:"refId"`
-	Region    string  `json:"region"`
+	RefId string `json:"refId"`
+
+	// AWS region to query for the metric
+	Region string `json:"region"`
+
+	// Metric data aggregations over specified periods of time. For detailed definitions of the statistics supported by CloudWatch, see https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Statistics-definitions.html.
 	Statistic *string `json:"statistic,omitempty"`
 
 	// @deprecated use statistic
 	Statistics []string `json:"statistics,omitempty"`
 }
 
-// CloudWatchAnnotationQueryQueryMode defines model for CloudWatchAnnotationQuery.QueryMode.
+// Whether a query is a Metrics, Logs, or Annotations query
 type CloudWatchAnnotationQueryQueryMode string
 
 // CloudWatchDataQuery defines model for CloudWatchDataQuery.
 type CloudWatchDataQuery = map[string]interface{}
 
-// CloudWatchLogsQuery defines model for CloudWatchLogsQuery.
+// Shape of a CloudWatch Logs query
 type CloudWatchLogsQuery struct {
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *interface{} `json:"datasource,omitempty"`
-	Expression *string      `json:"expression,omitempty"`
+
+	// The CloudWatch Logs Insights query to execute
+	Expression *string `json:"expression,omitempty"`
 
 	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	// Note this does not always imply that the query should not be executed since
@@ -346,14 +377,25 @@ type CloudWatchLogsQuery struct {
 	Hide *bool  `json:"hide,omitempty"`
 	Id   string `json:"id"`
 
-	// LogGroupNames deprecated, use logGroups instead
+	// @deprecated use logGroups
 	LogGroupNames []string `json:"logGroupNames,omitempty"`
-	LogGroups     []struct {
-		AccountId    *string `json:"accountId,omitempty"`
+
+	// Log groups to query
+	LogGroups []struct {
+		// AccountId of the log group
+		AccountId *string `json:"accountId,omitempty"`
+
+		// Label of the log group
 		AccountLabel *string `json:"accountLabel,omitempty"`
-		Arn          string  `json:"arn"`
-		Name         string  `json:"name"`
+
+		// ARN of the log group
+		Arn string `json:"arn"`
+
+		// Name of the log group
+		Name string `json:"name"`
 	} `json:"logGroups,omitempty"`
+
+	// Whether a query is a Metrics, Logs, or Annotations query
 	QueryMode CloudWatchLogsQueryQueryMode `json:"queryMode"`
 
 	// Specify the query flavor
@@ -363,24 +405,33 @@ type CloudWatchLogsQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId       string   `json:"refId"`
-	Region      string   `json:"region"`
+	RefId string `json:"refId"`
+
+	// AWS region to query for the logs
+	Region string `json:"region"`
+
+	// Fields to group the results by, this field is automatically populated whenever the query is updated
 	StatsGroups []string `json:"statsGroups,omitempty"`
 }
 
-// CloudWatchLogsQueryQueryMode defines model for CloudWatchLogsQuery.QueryMode.
+// Whether a query is a Metrics, Logs, or Annotations query
 type CloudWatchLogsQueryQueryMode string
 
-// CloudWatchMetricsQuery defines model for CloudWatchMetricsQuery.
+// Shape of a CloudWatch Metrics query
 type CloudWatchMetricsQuery struct {
+	// The ID of the AWS account to query for the metric, specifying `all` will query all accounts that the monitoring account is permitted to query.
 	AccountId *string `json:"accountId,omitempty"`
-	Alias     *string `json:"alias,omitempty"`
+
+	// To be deprecated. Use label
+	Alias *string `json:"alias,omitempty"`
 
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
 	// TODO this shouldn't be unknown but DataSourceRef | null
-	Datasource *interface{}           `json:"datasource,omitempty"`
+	Datasource *interface{} `json:"datasource,omitempty"`
+
+	// The dimensions of the metric
 	Dimensions map[string]interface{} `json:"dimensions,omitempty"`
 
 	// Math expression query
@@ -391,16 +442,32 @@ type CloudWatchMetricsQuery struct {
 	// the results from a hidden query may be used as the input to other queries (SSE etc)
 	Hide *bool `json:"hide,omitempty"`
 
-	// Id common props
-	Id               string                                  `json:"id"`
-	Label            *string                                 `json:"label,omitempty"`
-	MatchExact       *bool                                   `json:"matchExact,omitempty"`
+	// ID can be used to reference other queries in math expressions. The ID can include numbers, letters, and underscore, and must start with a lowercase letter.
+	Id string `json:"id"`
+
+	// Change the time series legend names using dynamic labels. See https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/graph-dynamic-labels.html for more details.
+	Label *string `json:"label,omitempty"`
+
+	// Only show metrics that exactly match all defined dimension names.
+	MatchExact *bool `json:"matchExact,omitempty"`
+
+	// Whether to use the query builder or code editor to create the query
 	MetricEditorMode *CloudWatchMetricsQueryMetricEditorMode `json:"metricEditorMode,omitempty"`
-	MetricName       *string                                 `json:"metricName,omitempty"`
-	MetricQueryType  *CloudWatchMetricsQueryMetricQueryType  `json:"metricQueryType,omitempty"`
-	Namespace        string                                  `json:"namespace"`
-	Period           *string                                 `json:"period,omitempty"`
-	QueryMode        *CloudWatchMetricsQueryQueryMode        `json:"queryMode,omitempty"`
+
+	// Name of the metric
+	MetricName *string `json:"metricName,omitempty"`
+
+	// Whether to use a metric search or metric query. Metric query is referred to as "Metrics Insights" in the AWS console.
+	MetricQueryType *CloudWatchMetricsQueryMetricQueryType `json:"metricQueryType,omitempty"`
+
+	// A namespace is a container for CloudWatch metrics. Metrics in different namespaces are isolated from each other, so that metrics from different applications are not mistakenly aggregated into the same statistics. For example, Amazon EC2 uses the AWS/EC2 namespace.
+	Namespace string `json:"namespace"`
+
+	// The length of time associated with a specific Amazon CloudWatch statistic. Can be specified by a number of seconds, 'auto', or as a duration string e.g. '15m' being 15 minutes
+	Period *string `json:"period,omitempty"`
+
+	// Whether a query is a Metrics, Logs, or Annotations query
+	QueryMode *CloudWatchMetricsQueryQueryMode `json:"queryMode,omitempty"`
 
 	// Specify the query flavor
 	// TODO make this required and give it a default
@@ -409,15 +476,26 @@ type CloudWatchMetricsQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId  string `json:"refId"`
+	RefId string `json:"refId"`
+
+	// AWS region to query for the metric
 	Region string `json:"region"`
-	Sql    *struct {
-		From    *CloudWatchMetricsQuerySqlFrom `json:"from,omitempty"`
+
+	// When the metric query type is `metricQueryType` is set to `Query` and the `metricEditorMode` is set to `Builder`, this field is used to build up an object representation of a SQL query.
+	Sql *struct {
+		// FROM part of the SQL expression
+		From *CloudWatchMetricsQuerySqlFrom `json:"from,omitempty"`
+
+		// GROUP BY part of the SQL expression
 		GroupBy *struct {
 			Expressions []CloudWatchMetricsQuerySqlGroupByExpressionsItem `json:"expressions"`
 			Type        CloudWatchMetricsQuerySqlGroupByType              `json:"type"`
 		} `json:"groupBy,omitempty"`
-		Limit   *int64 `json:"limit,omitempty"`
+
+		// LIMIT part of the SQL expression
+		Limit *int64 `json:"limit,omitempty"`
+
+		// ORDER BY part of the SQL expression
 		OrderBy *struct {
 			Name       *string `json:"name,omitempty"`
 			Parameters []struct {
@@ -426,8 +504,12 @@ type CloudWatchMetricsQuery struct {
 			} `json:"parameters,omitempty"`
 			Type CloudWatchMetricsQuerySqlOrderByType `json:"type"`
 		} `json:"orderBy,omitempty"`
+
+		// The sort order of the SQL expression, `ASC` or `DESC`
 		OrderByDirection *string `json:"orderByDirection,omitempty"`
-		Select           *struct {
+
+		// SELECT part of the SQL expression
+		Select *struct {
 			Name       *string `json:"name,omitempty"`
 			Parameters []struct {
 				Name *string                                       `json:"name,omitempty"`
@@ -435,25 +517,31 @@ type CloudWatchMetricsQuery struct {
 			} `json:"parameters,omitempty"`
 			Type CloudWatchMetricsQuerySqlSelectType `json:"type"`
 		} `json:"select,omitempty"`
+
+		// WHERE part of the SQL expression
 		Where *struct {
 			Expressions []CloudWatchMetricsQuerySqlWhereExpressionsItem `json:"expressions"`
 			Type        CloudWatchMetricsQuerySqlWhereType              `json:"type"`
 		} `json:"where,omitempty"`
 	} `json:"sql,omitempty"`
+
+	// When the metric query type is `metricQueryType` is set to `Query`, this field is used to specify the query string.
 	SqlExpression *string `json:"sqlExpression,omitempty"`
-	Statistic     *string `json:"statistic,omitempty"`
+
+	// Metric data aggregations over specified periods of time. For detailed definitions of the statistics supported by CloudWatch, see https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Statistics-definitions.html.
+	Statistic *string `json:"statistic,omitempty"`
 
 	// @deprecated use statistic
 	Statistics []string `json:"statistics,omitempty"`
 }
 
-// CloudWatchMetricsQueryMetricEditorMode defines model for CloudWatchMetricsQuery.MetricEditorMode.
+// Whether to use the query builder or code editor to create the query
 type CloudWatchMetricsQueryMetricEditorMode int
 
-// CloudWatchMetricsQueryMetricQueryType defines model for CloudWatchMetricsQuery.MetricQueryType.
+// Whether to use a metric search or metric query. Metric query is referred to as "Metrics Insights" in the AWS console.
 type CloudWatchMetricsQueryMetricQueryType int
 
-// CloudWatchMetricsQueryQueryMode defines model for CloudWatchMetricsQuery.QueryMode.
+// Whether a query is a Metrics, Logs, or Annotations query
 type CloudWatchMetricsQueryQueryMode string
 
 // CloudWatchMetricsQuerySqlFromParametersType defines model for CloudWatchMetricsQuery.Sql.From.Parameters.Type.
@@ -462,7 +550,7 @@ type CloudWatchMetricsQuerySqlFromParametersType string
 // CloudWatchMetricsQuerySqlFromPropertyType defines model for CloudWatchMetricsQuery.Sql.From.Property.Type.
 type CloudWatchMetricsQuerySqlFromPropertyType string
 
-// CloudWatchMetricsQuerySqlFrom defines model for CloudWatchMetricsQuery.Sql.From.
+// FROM part of the SQL expression
 type CloudWatchMetricsQuerySqlFrom struct {
 	Name       *string `json:"name,omitempty"`
 	Parameters []struct {
@@ -554,15 +642,22 @@ type CloudWatchMetricsQuerySqlWhereType string
 // CloudWatchQueryMode defines model for CloudWatchQueryMode.
 type CloudWatchQueryMode string
 
-// Dimensions defines model for Dimensions.
+// A name/value pair that is part of the identity of a metric. For example, you can get statistics for a specific EC2 instance by specifying the InstanceId dimension when you search for metrics.
 type Dimensions map[string]interface{}
 
 // LogGroup defines model for LogGroup.
 type LogGroup struct {
-	AccountId    *string `json:"accountId,omitempty"`
+	// AccountId of the log group
+	AccountId *string `json:"accountId,omitempty"`
+
+	// Label of the log group
 	AccountLabel *string `json:"accountLabel,omitempty"`
-	Arn          string  `json:"arn"`
-	Name         string  `json:"name"`
+
+	// ARN of the log group
+	Arn string `json:"arn"`
+
+	// Name of the log group
+	Name string `json:"name"`
 }
 
 // MetricEditorMode defines model for MetricEditorMode.
@@ -573,14 +668,29 @@ type MetricQueryType int
 
 // MetricStat defines model for MetricStat.
 type MetricStat struct {
-	AccountId  *string                `json:"accountId,omitempty"`
+	// The ID of the AWS account to query for the metric, specifying `all` will query all accounts that the monitoring account is permitted to query.
+	AccountId *string `json:"accountId,omitempty"`
+
+	// The dimensions of the metric
 	Dimensions map[string]interface{} `json:"dimensions,omitempty"`
-	MatchExact *bool                  `json:"matchExact,omitempty"`
-	MetricName *string                `json:"metricName,omitempty"`
-	Namespace  string                 `json:"namespace"`
-	Period     *string                `json:"period,omitempty"`
-	Region     string                 `json:"region"`
-	Statistic  *string                `json:"statistic,omitempty"`
+
+	// Only show metrics that exactly match all defined dimension names.
+	MatchExact *bool `json:"matchExact,omitempty"`
+
+	// Name of the metric
+	MetricName *string `json:"metricName,omitempty"`
+
+	// A namespace is a container for CloudWatch metrics. Metrics in different namespaces are isolated from each other, so that metrics from different applications are not mistakenly aggregated into the same statistics. For example, Amazon EC2 uses the AWS/EC2 namespace.
+	Namespace string `json:"namespace"`
+
+	// The length of time associated with a specific Amazon CloudWatch statistic. Can be specified by a number of seconds, 'auto', or as a duration string e.g. '15m' being 15 minutes
+	Period *string `json:"period,omitempty"`
+
+	// AWS region to query for the metric
+	Region string `json:"region"`
+
+	// Metric data aggregations over specified periods of time. For detailed definitions of the statistics supported by CloudWatch, see https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Statistics-definitions.html.
+	Statistic *string `json:"statistic,omitempty"`
 
 	// @deprecated use statistic
 	Statistics []string `json:"statistics,omitempty"`
@@ -773,12 +883,19 @@ type QueryEditorPropertyExpressionType string
 
 // SQLExpression defines model for SQLExpression.
 type SQLExpression struct {
-	From    *SQLExpressionFrom `json:"from,omitempty"`
+	// FROM part of the SQL expression
+	From *SQLExpressionFrom `json:"from,omitempty"`
+
+	// GROUP BY part of the SQL expression
 	GroupBy *struct {
 		Expressions []SQLExpressionGroupByExpressionsItem `json:"expressions"`
 		Type        SQLExpressionGroupByType              `json:"type"`
 	} `json:"groupBy,omitempty"`
-	Limit   *int64 `json:"limit,omitempty"`
+
+	// LIMIT part of the SQL expression
+	Limit *int64 `json:"limit,omitempty"`
+
+	// ORDER BY part of the SQL expression
 	OrderBy *struct {
 		Name       *string `json:"name,omitempty"`
 		Parameters []struct {
@@ -787,8 +904,12 @@ type SQLExpression struct {
 		} `json:"parameters,omitempty"`
 		Type SQLExpressionOrderByType `json:"type"`
 	} `json:"orderBy,omitempty"`
+
+	// The sort order of the SQL expression, `ASC` or `DESC`
 	OrderByDirection *string `json:"orderByDirection,omitempty"`
-	Select           *struct {
+
+	// SELECT part of the SQL expression
+	Select *struct {
 		Name       *string `json:"name,omitempty"`
 		Parameters []struct {
 			Name *string                           `json:"name,omitempty"`
@@ -796,6 +917,8 @@ type SQLExpression struct {
 		} `json:"parameters,omitempty"`
 		Type SQLExpressionSelectType `json:"type"`
 	} `json:"select,omitempty"`
+
+	// WHERE part of the SQL expression
 	Where *struct {
 		Expressions []SQLExpressionWhereExpressionsItem `json:"expressions"`
 		Type        SQLExpressionWhereType              `json:"type"`
@@ -808,7 +931,7 @@ type SQLExpressionFromParametersType string
 // SQLExpressionFromPropertyType defines model for SQLExpression.From.Property.Type.
 type SQLExpressionFromPropertyType string
 
-// SQLExpressionFrom defines model for SQLExpression.From.
+// FROM part of the SQL expression
 type SQLExpressionFrom struct {
 	Name       *string `json:"name,omitempty"`
 	Parameters []struct {
diff --git a/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go b/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
index cc9b0f243e9..8901397f203 100644
--- a/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
+++ b/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
@@ -289,16 +289,6 @@ func TestCloudWatchQuery(t *testing.T) {
 	})
 }
 
-func TestQueryJSON(t *testing.T) {
-	jsonString := []byte(`{
-		"type": "timeSeriesQuery"
-	}`)
-	var res metricsDataQuery
-	err := json.Unmarshal(jsonString, &res)
-	require.NoError(t, err)
-	assert.Equal(t, "timeSeriesQuery", res.Type)
-}
-
 func TestRequestParser(t *testing.T) {
 	t.Run("legacy statistics field is migrated: migrates first stat only", func(t *testing.T) {
 		oldQuery := []backend.DataQuery{
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.cue b/public/app/plugins/datasource/cloudwatch/dataquery.cue
index c6addead9d8..e4248e20b6b 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.cue
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.cue
@@ -31,49 +31,73 @@ composableKinds: DataQuery: {
 				schemas: [
 					{
 						#MetricStat: {
-							region:      string
-							namespace:   string
+							// AWS region to query for the metric
+							region: string
+							// A namespace is a container for CloudWatch metrics. Metrics in different namespaces are isolated from each other, so that metrics from different applications are not mistakenly aggregated into the same statistics. For example, Amazon EC2 uses the AWS/EC2 namespace.
+							namespace: string
+							// Name of the metric
 							metricName?: string
+							// The dimensions of the metric
 							dimensions?: #Dimensions
+							// Only show metrics that exactly match all defined dimension names.
 							matchExact?: bool
-							period?:     string
-							accountId?:  string
-							statistic?:  string
+							// The length of time associated with a specific Amazon CloudWatch statistic. Can be specified by a number of seconds, 'auto', or as a duration string e.g. '15m' being 15 minutes
+							period?: string
+							// The ID of the AWS account to query for the metric, specifying `all` will query all accounts that the monitoring account is permitted to query.
+							accountId?: string
+							// Metric data aggregations over specified periods of time. For detailed definitions of the statistics supported by CloudWatch, see https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Statistics-definitions.html.
+							statistic?: string
 							// @deprecated use statistic
 							statistics?: [...string]
 						} @cuetsy(kind="interface")
 
+						// A name/value pair that is part of the identity of a metric. For example, you can get statistics for a specific EC2 instance by specifying the InstanceId dimension when you search for metrics.
 						#Dimensions: {[string]: string | [...string]} @cuetsy(kind="type")
 
+						// Shape of a CloudWatch Metrics query
 						#CloudWatchMetricsQuery: {
 							common.DataQuery
 							#MetricStat
-							queryMode?:        #CloudWatchQueryMode
-							metricQueryType?:  #MetricQueryType
+
+							// Whether a query is a Metrics, Logs, or Annotations query
+							queryMode?: #CloudWatchQueryMode
+							// Whether to use a metric search or metric query. Metric query is referred to as "Metrics Insights" in the AWS console.
+							metricQueryType?: #MetricQueryType
+							// Whether to use the query builder or code editor to create the query
 							metricEditorMode?: #MetricEditorMode
-							// common props
-							id:     string
+							// ID can be used to reference other queries in math expressions. The ID can include numbers, letters, and underscore, and must start with a lowercase letter.
+							id: string
+							// To be deprecated. Use label
 							alias?: string
+							// Change the time series legend names using dynamic labels. See https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/graph-dynamic-labels.html for more details.
 							label?: string
 							// Math expression query
-							expression?:    string
+							expression?: string
+							// When the metric query type is `metricQueryType` is set to `Query`, this field is used to specify the query string.
 							sqlExpression?: string
-							sql?:           #SQLExpression
+							// When the metric query type is `metricQueryType` is set to `Query` and the `metricEditorMode` is set to `Builder`, this field is used to build up an object representation of a SQL query.
+							sql?: #SQLExpression
 						} @cuetsy(kind="interface")
 
 						#CloudWatchQueryMode: "Metrics" | "Logs" | "Annotations" @cuetsy(kind="type")
 						#MetricQueryType:     0 | 1                              @cuetsy(kind="enum", memberNames="Search|Query")
 						#MetricEditorMode:    0 | 1                              @cuetsy(kind="enum", memberNames="Builder|Code")
 						#SQLExpression: {
-							select?:           #QueryEditorFunctionExpression
-							from?:             #QueryEditorPropertyExpression | #QueryEditorFunctionExpression
-							where?:            #QueryEditorArrayExpression
-							groupBy?:          #QueryEditorArrayExpression
-							orderBy?:          #QueryEditorFunctionExpression
+							// SELECT part of the SQL expression
+							select?: #QueryEditorFunctionExpression
+							// FROM part of the SQL expression
+							from?: #QueryEditorPropertyExpression | #QueryEditorFunctionExpression
+							// WHERE part of the SQL expression
+							where?: #QueryEditorArrayExpression
+							// GROUP BY part of the SQL expression
+							groupBy?: #QueryEditorArrayExpression
+							// ORDER BY part of the SQL expression
+							orderBy?: #QueryEditorFunctionExpression
+							// The sort order of the SQL expression, `ASC` or `DESC`
 							orderByDirection?: string
-							limit?:            int64
+							// LIMIT part of the SQL expression
+							limit?: int64
 						} @cuetsy(kind="interface")
-
 						#QueryEditorFunctionExpression: {
 							type:  #QueryEditorExpressionType & "function"
 							name?: string
@@ -127,33 +151,55 @@ composableKinds: DataQuery: {
 
 						#QueryEditorExpression: #QueryEditorArrayExpression | #QueryEditorPropertyExpression | #QueryEditorGroupByExpression | #QueryEditorFunctionExpression | #QueryEditorFunctionParameterExpression | #QueryEditorOperatorExpression @cuetsy(kind="type")
 
+						// Shape of a CloudWatch Logs query
 						#CloudWatchLogsQuery: {
 							common.DataQuery
-							queryMode:   #CloudWatchQueryMode
-							id:          string
-							region:      string
+
+							// Whether a query is a Metrics, Logs, or Annotations query
+							queryMode: #CloudWatchQueryMode
+							id:        string
+							// AWS region to query for the logs
+							region: string
+							// The CloudWatch Logs Insights query to execute
 							expression?: string
+							// Fields to group the results by, this field is automatically populated whenever the query is updated
 							statsGroups?: [...string]
+							// Log groups to query
 							logGroups?: [...#LogGroup]
-							// deprecated, use logGroups instead
+							// @deprecated use logGroups
 							logGroupNames?: [...string]
 						} @cuetsy(kind="interface")
-
 						#LogGroup: {
-							arn:           string
-							name:          string
-							accountId?:    string
+							// ARN of the log group
+							arn: string
+							// Name of the log group
+							name: string
+							// AccountId of the log group
+							accountId?: string
+							// Label of the log group
 							accountLabel?: string
 						} @cuetsy(kind="interface")
 
 						#CloudWatchQueryMode: "Metrics" | "Logs" | "Annotations" @cuetsy(kind="type")
 
+						// Shape of a CloudWatch Annotation query
 						#CloudWatchAnnotationQuery: {
 							common.DataQuery
 							#MetricStat
-							queryMode:        #CloudWatchQueryMode
-							prefixMatching?:  bool
-							actionPrefix?:    string
+
+							// Whether a query is a Metrics, Logs, or Annotations query
+							queryMode: #CloudWatchQueryMode
+							// Enable matching on the prefix of the action name or alarm name, specify the prefixes with actionPrefix and/or alarmNamePrefix
+							prefixMatching?: bool
+							// Use this parameter to filter the results of the operation to only those alarms
+							// that use a certain alarm action. For example, you could specify the ARN of
+							// an SNS topic to find all alarms that send notifications to that topic.
+							// e.g. `arn:aws:sns:us-east-1:123456789012:my-app-` would match `arn:aws:sns:us-east-1:123456789012:my-app-action`
+							// but not match `arn:aws:sns:us-east-1:123456789012:your-app-action`
+							actionPrefix?: string
+							// An alarm name prefix. If you specify this parameter, you receive information
+							// about all alarms that have names that start with this prefix.
+							// e.g. `my-team-service-` would match `my-team-service-high-cpu` but not match `your-team-service-high-cpu`
 							alarmNamePrefix?: string
 						} @cuetsy(kind="interface")
 
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
index eb31858f06b..32d3bc67012 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
@@ -13,13 +13,37 @@ import * as common from '@grafana/schema';
 export const DataQueryModelVersion = Object.freeze([0, 0]);
 
 export interface MetricStat {
+  /**
+   * The ID of the AWS account to query for the metric, specifying `all` will query all accounts that the monitoring account is permitted to query.
+   */
   accountId?: string;
+  /**
+   * The dimensions of the metric
+   */
   dimensions?: Dimensions;
+  /**
+   * Only show metrics that exactly match all defined dimension names.
+   */
   matchExact?: boolean;
+  /**
+   * Name of the metric
+   */
   metricName?: string;
+  /**
+   * A namespace is a container for CloudWatch metrics. Metrics in different namespaces are isolated from each other, so that metrics from different applications are not mistakenly aggregated into the same statistics. For example, Amazon EC2 uses the AWS/EC2 namespace.
+   */
   namespace: string;
+  /**
+   * The length of time associated with a specific Amazon CloudWatch statistic. Can be specified by a number of seconds, 'auto', or as a duration string e.g. '15m' being 15 minutes
+   */
   period?: string;
+  /**
+   * AWS region to query for the metric
+   */
   region: string;
+  /**
+   * Metric data aggregations over specified periods of time. For detailed definitions of the statistics supported by CloudWatch, see https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Statistics-definitions.html.
+   */
   statistic?: string;
   /**
    * @deprecated use statistic
@@ -31,23 +55,50 @@ export const defaultMetricStat: Partial<MetricStat> = {
   statistics: [],
 };
 
+/**
+ * A name/value pair that is part of the identity of a metric. For example, you can get statistics for a specific EC2 instance by specifying the InstanceId dimension when you search for metrics.
+ */
 export type Dimensions = Record<string, (string | Array<string>)>;
 
+/**
+ * Shape of a CloudWatch Metrics query
+ */
 export interface CloudWatchMetricsQuery extends common.DataQuery, MetricStat {
+  /**
+   * To be deprecated. Use label
+   */
   alias?: string;
   /**
    * Math expression query
    */
   expression?: string;
   /**
-   * common props
+   * ID can be used to reference other queries in math expressions. The ID can include numbers, letters, and underscore, and must start with a lowercase letter.
    */
   id: string;
+  /**
+   * Change the time series legend names using dynamic labels. See https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/graph-dynamic-labels.html for more details.
+   */
   label?: string;
+  /**
+   * Whether to use the query builder or code editor to create the query
+   */
   metricEditorMode?: MetricEditorMode;
+  /**
+   * Whether to use a metric search or metric query. Metric query is referred to as "Metrics Insights" in the AWS console.
+   */
   metricQueryType?: MetricQueryType;
+  /**
+   * Whether a query is a Metrics, Logs, or Annotations query
+   */
   queryMode?: CloudWatchQueryMode;
+  /**
+   * When the metric query type is `metricQueryType` is set to `Query` and the `metricEditorMode` is set to `Builder`, this field is used to build up an object representation of a SQL query.
+   */
   sql?: SQLExpression;
+  /**
+   * When the metric query type is `metricQueryType` is set to `Query`, this field is used to specify the query string.
+   */
   sqlExpression?: string;
 }
 
@@ -64,12 +115,33 @@ export enum MetricEditorMode {
 }
 
 export interface SQLExpression {
+  /**
+   * FROM part of the SQL expression
+   */
   from?: (QueryEditorPropertyExpression | QueryEditorFunctionExpression);
+  /**
+   * GROUP BY part of the SQL expression
+   */
   groupBy?: QueryEditorArrayExpression;
+  /**
+   * LIMIT part of the SQL expression
+   */
   limit?: number;
+  /**
+   * ORDER BY part of the SQL expression
+   */
   orderBy?: QueryEditorFunctionExpression;
+  /**
+   * The sort order of the SQL expression, `ASC` or `DESC`
+   */
   orderByDirection?: string;
+  /**
+   * SELECT part of the SQL expression
+   */
   select?: QueryEditorFunctionExpression;
+  /**
+   * WHERE part of the SQL expression
+   */
   where?: QueryEditorArrayExpression;
 }
 
@@ -145,16 +217,34 @@ export interface QueryEditorArrayExpression {
 
 export type QueryEditorExpression = (QueryEditorArrayExpression | QueryEditorPropertyExpression | QueryEditorGroupByExpression | QueryEditorFunctionExpression | QueryEditorFunctionParameterExpression | QueryEditorOperatorExpression);
 
+/**
+ * Shape of a CloudWatch Logs query
+ */
 export interface CloudWatchLogsQuery extends common.DataQuery {
+  /**
+   * The CloudWatch Logs Insights query to execute
+   */
   expression?: string;
   id: string;
   /**
-   * deprecated, use logGroups instead
+   * @deprecated use logGroups
    */
   logGroupNames?: Array<string>;
+  /**
+   * Log groups to query
+   */
   logGroups?: Array<LogGroup>;
+  /**
+   * Whether a query is a Metrics, Logs, or Annotations query
+   */
   queryMode: CloudWatchQueryMode;
+  /**
+   * AWS region to query for the logs
+   */
   region: string;
+  /**
+   * Fields to group the results by, this field is automatically populated whenever the query is updated
+   */
   statsGroups?: Array<string>;
 }
 
@@ -165,16 +255,49 @@ export const defaultCloudWatchLogsQuery: Partial<CloudWatchLogsQuery> = {
 };
 
 export interface LogGroup {
+  /**
+   * AccountId of the log group
+   */
   accountId?: string;
+  /**
+   * Label of the log group
+   */
   accountLabel?: string;
+  /**
+   * ARN of the log group
+   */
   arn: string;
+  /**
+   * Name of the log group
+   */
   name: string;
 }
 
+/**
+ * Shape of a CloudWatch Annotation query
+ */
 export interface CloudWatchAnnotationQuery extends common.DataQuery, MetricStat {
+  /**
+   * Use this parameter to filter the results of the operation to only those alarms
+   * that use a certain alarm action. For example, you could specify the ARN of
+   * an SNS topic to find all alarms that send notifications to that topic.
+   * e.g. `arn:aws:sns:us-east-1:123456789012:my-app-` would match `arn:aws:sns:us-east-1:123456789012:my-app-action`
+   * but not match `arn:aws:sns:us-east-1:123456789012:your-app-action`
+   */
   actionPrefix?: string;
+  /**
+   * An alarm name prefix. If you specify this parameter, you receive information
+   * about all alarms that have names that start with this prefix.
+   * e.g. `my-team-service-` would match `my-team-service-high-cpu` but not match `your-team-service-high-cpu`
+   */
   alarmNamePrefix?: string;
+  /**
+   * Enable matching on the prefix of the action name or alarm name, specify the prefixes with actionPrefix and/or alarmNamePrefix
+   */
   prefixMatching?: boolean;
+  /**
+   * Whether a query is a Metrics, Logs, or Annotations query
+   */
   queryMode: CloudWatchQueryMode;
 }
 

From 9effb9a708697f5d718df2c7bce7e5466251d964 Mon Sep 17 00:00:00 2001
From: Steve Simpson <steve.simpson@grafana.com>
Date: Mon, 24 Apr 2023 18:18:44 +0200
Subject: [PATCH 366/729] Alerting: Allow hooking into request handler
 functions. (#67000)

* Alerting: Allow hooking into request handler functions.

Adds a facility to AlertNG for hooking into API handlers, allowing the
replacement of request handlers for specific paths. One of goals of this
approach was to allow hooking as late as possible in the request, e.g.
after all middleware has been applied, to simplfiy usage.

* Update pkg/services/ngalert/api/hooks.go

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Update pkg/services/ngalert/api/hooks.go

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Update pkg/services/ngalert/ngalert.go

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Fixes to review comments

* Fix passing logger in

---------

Co-authored-by: gotjosh <josue.abreu@gmail.com>
---
 pkg/services/ngalert/api/api.go               |  3 ++
 .../api/generated_base_api_alertmanager.go    | 50 +++++++++---------
 .../api/generated_base_api_configuration.go   | 10 ++--
 .../ngalert/api/generated_base_api_history.go |  2 +-
 .../api/generated_base_api_prometheus.go      |  8 +--
 .../api/generated_base_api_provisioning.go    | 52 +++++++++----------
 .../ngalert/api/generated_base_api_ruler.go   | 24 ++++-----
 .../ngalert/api/generated_base_api_testing.go |  8 +--
 pkg/services/ngalert/api/hooks.go             | 43 +++++++++++++++
 .../templates/controller-api.mustache         |  2 +-
 pkg/services/ngalert/ngalert.go               | 14 +++--
 11 files changed, 135 insertions(+), 81 deletions(-)
 create mode 100644 pkg/services/ngalert/api/hooks.go

diff --git a/pkg/services/ngalert/api/api.go b/pkg/services/ngalert/api/api.go
index f99a6e12d45..1c6e54fa257 100644
--- a/pkg/services/ngalert/api/api.go
+++ b/pkg/services/ngalert/api/api.go
@@ -85,6 +85,9 @@ type API struct {
 	Historian            Historian
 
 	AppUrl *url.URL
+
+	// Hooks can be used to replace API handlers for specific paths.
+	Hooks *Hooks
 }
 
 // RegisterAPIEndpoints registers API handlers
diff --git a/pkg/services/ngalert/api/generated_base_api_alertmanager.go b/pkg/services/ngalert/api/generated_base_api_alertmanager.go
index c4fff9c3238..145b0c33ea4 100644
--- a/pkg/services/ngalert/api/generated_base_api_alertmanager.go
+++ b/pkg/services/ngalert/api/generated_base_api_alertmanager.go
@@ -190,7 +190,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/alertmanager/grafana/api/v2/silences",
-				srv.RouteCreateGrafanaSilence,
+				api.Hooks.Wrap(srv.RouteCreateGrafanaSilence),
 				m,
 			),
 		)
@@ -200,7 +200,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/alertmanager/{DatasourceUID}/api/v2/silences",
-				srv.RouteCreateSilence,
+				api.Hooks.Wrap(srv.RouteCreateSilence),
 				m,
 			),
 		)
@@ -210,7 +210,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/alertmanager/{DatasourceUID}/config/api/v1/alerts",
-				srv.RouteDeleteAlertingConfig,
+				api.Hooks.Wrap(srv.RouteDeleteAlertingConfig),
 				m,
 			),
 		)
@@ -220,7 +220,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/alertmanager/grafana/config/api/v1/alerts",
-				srv.RouteDeleteGrafanaAlertingConfig,
+				api.Hooks.Wrap(srv.RouteDeleteGrafanaAlertingConfig),
 				m,
 			),
 		)
@@ -230,7 +230,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/alertmanager/grafana/api/v2/silence/{SilenceId}",
-				srv.RouteDeleteGrafanaSilence,
+				api.Hooks.Wrap(srv.RouteDeleteGrafanaSilence),
 				m,
 			),
 		)
@@ -240,7 +240,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId}",
-				srv.RouteDeleteSilence,
+				api.Hooks.Wrap(srv.RouteDeleteSilence),
 				m,
 			),
 		)
@@ -250,7 +250,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/{DatasourceUID}/api/v2/alerts/groups",
-				srv.RouteGetAMAlertGroups,
+				api.Hooks.Wrap(srv.RouteGetAMAlertGroups),
 				m,
 			),
 		)
@@ -260,7 +260,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/{DatasourceUID}/api/v2/alerts",
-				srv.RouteGetAMAlerts,
+				api.Hooks.Wrap(srv.RouteGetAMAlerts),
 				m,
 			),
 		)
@@ -270,7 +270,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/{DatasourceUID}/api/v2/status",
-				srv.RouteGetAMStatus,
+				api.Hooks.Wrap(srv.RouteGetAMStatus),
 				m,
 			),
 		)
@@ -280,7 +280,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/{DatasourceUID}/config/api/v1/alerts",
-				srv.RouteGetAlertingConfig,
+				api.Hooks.Wrap(srv.RouteGetAlertingConfig),
 				m,
 			),
 		)
@@ -290,7 +290,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/grafana/api/v2/alerts/groups",
-				srv.RouteGetGrafanaAMAlertGroups,
+				api.Hooks.Wrap(srv.RouteGetGrafanaAMAlertGroups),
 				m,
 			),
 		)
@@ -300,7 +300,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/grafana/api/v2/alerts",
-				srv.RouteGetGrafanaAMAlerts,
+				api.Hooks.Wrap(srv.RouteGetGrafanaAMAlerts),
 				m,
 			),
 		)
@@ -310,7 +310,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/grafana/api/v2/status",
-				srv.RouteGetGrafanaAMStatus,
+				api.Hooks.Wrap(srv.RouteGetGrafanaAMStatus),
 				m,
 			),
 		)
@@ -320,7 +320,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/grafana/config/api/v1/alerts",
-				srv.RouteGetGrafanaAlertingConfig,
+				api.Hooks.Wrap(srv.RouteGetGrafanaAlertingConfig),
 				m,
 			),
 		)
@@ -330,7 +330,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/grafana/config/history",
-				srv.RouteGetGrafanaAlertingConfigHistory,
+				api.Hooks.Wrap(srv.RouteGetGrafanaAlertingConfigHistory),
 				m,
 			),
 		)
@@ -340,7 +340,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/grafana/config/api/v1/receivers",
-				srv.RouteGetGrafanaReceivers,
+				api.Hooks.Wrap(srv.RouteGetGrafanaReceivers),
 				m,
 			),
 		)
@@ -350,7 +350,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/grafana/api/v2/silence/{SilenceId}",
-				srv.RouteGetGrafanaSilence,
+				api.Hooks.Wrap(srv.RouteGetGrafanaSilence),
 				m,
 			),
 		)
@@ -360,7 +360,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/grafana/api/v2/silences",
-				srv.RouteGetGrafanaSilences,
+				api.Hooks.Wrap(srv.RouteGetGrafanaSilences),
 				m,
 			),
 		)
@@ -370,7 +370,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId}",
-				srv.RouteGetSilence,
+				api.Hooks.Wrap(srv.RouteGetSilence),
 				m,
 			),
 		)
@@ -380,7 +380,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/alertmanager/{DatasourceUID}/api/v2/silences",
-				srv.RouteGetSilences,
+				api.Hooks.Wrap(srv.RouteGetSilences),
 				m,
 			),
 		)
@@ -390,7 +390,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/alertmanager/{DatasourceUID}/api/v2/alerts",
-				srv.RoutePostAMAlerts,
+				api.Hooks.Wrap(srv.RoutePostAMAlerts),
 				m,
 			),
 		)
@@ -400,7 +400,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/alertmanager/{DatasourceUID}/config/api/v1/alerts",
-				srv.RoutePostAlertingConfig,
+				api.Hooks.Wrap(srv.RoutePostAlertingConfig),
 				m,
 			),
 		)
@@ -410,7 +410,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/alertmanager/grafana/config/api/v1/alerts",
-				srv.RoutePostGrafanaAlertingConfig,
+				api.Hooks.Wrap(srv.RoutePostGrafanaAlertingConfig),
 				m,
 			),
 		)
@@ -420,7 +420,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/alertmanager/grafana/config/history/{id}/_activate",
-				srv.RoutePostGrafanaAlertingConfigHistoryActivate,
+				api.Hooks.Wrap(srv.RoutePostGrafanaAlertingConfigHistoryActivate),
 				m,
 			),
 		)
@@ -430,7 +430,7 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/alertmanager/grafana/config/api/v1/receivers/test",
-				srv.RoutePostTestGrafanaReceivers,
+				api.Hooks.Wrap(srv.RoutePostTestGrafanaReceivers),
 				m,
 			),
 		)
diff --git a/pkg/services/ngalert/api/generated_base_api_configuration.go b/pkg/services/ngalert/api/generated_base_api_configuration.go
index c0685d12a1c..abb1bbc87ae 100644
--- a/pkg/services/ngalert/api/generated_base_api_configuration.go
+++ b/pkg/services/ngalert/api/generated_base_api_configuration.go
@@ -55,7 +55,7 @@ func (api *API) RegisterConfigurationApiEndpoints(srv ConfigurationApi, m *metri
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/v1/ngalert/admin_config",
-				srv.RouteDeleteNGalertConfig,
+				api.Hooks.Wrap(srv.RouteDeleteNGalertConfig),
 				m,
 			),
 		)
@@ -65,7 +65,7 @@ func (api *API) RegisterConfigurationApiEndpoints(srv ConfigurationApi, m *metri
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/ngalert/alertmanagers",
-				srv.RouteGetAlertmanagers,
+				api.Hooks.Wrap(srv.RouteGetAlertmanagers),
 				m,
 			),
 		)
@@ -75,7 +75,7 @@ func (api *API) RegisterConfigurationApiEndpoints(srv ConfigurationApi, m *metri
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/ngalert/admin_config",
-				srv.RouteGetNGalertConfig,
+				api.Hooks.Wrap(srv.RouteGetNGalertConfig),
 				m,
 			),
 		)
@@ -85,7 +85,7 @@ func (api *API) RegisterConfigurationApiEndpoints(srv ConfigurationApi, m *metri
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/ngalert",
-				srv.RouteGetStatus,
+				api.Hooks.Wrap(srv.RouteGetStatus),
 				m,
 			),
 		)
@@ -95,7 +95,7 @@ func (api *API) RegisterConfigurationApiEndpoints(srv ConfigurationApi, m *metri
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/v1/ngalert/admin_config",
-				srv.RoutePostNGalertConfig,
+				api.Hooks.Wrap(srv.RoutePostNGalertConfig),
 				m,
 			),
 		)
diff --git a/pkg/services/ngalert/api/generated_base_api_history.go b/pkg/services/ngalert/api/generated_base_api_history.go
index 8f352d366c8..f8a616d2894 100644
--- a/pkg/services/ngalert/api/generated_base_api_history.go
+++ b/pkg/services/ngalert/api/generated_base_api_history.go
@@ -32,7 +32,7 @@ func (api *API) RegisterHistoryApiEndpoints(srv HistoryApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/rules/history",
-				srv.RouteGetStateHistory,
+				api.Hooks.Wrap(srv.RouteGetStateHistory),
 				m,
 			),
 		)
diff --git a/pkg/services/ngalert/api/generated_base_api_prometheus.go b/pkg/services/ngalert/api/generated_base_api_prometheus.go
index a4f04e25199..34b584d7a83 100644
--- a/pkg/services/ngalert/api/generated_base_api_prometheus.go
+++ b/pkg/services/ngalert/api/generated_base_api_prometheus.go
@@ -49,7 +49,7 @@ func (api *API) RegisterPrometheusApiEndpoints(srv PrometheusApi, m *metrics.API
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/prometheus/{DatasourceUID}/api/v1/alerts",
-				srv.RouteGetAlertStatuses,
+				api.Hooks.Wrap(srv.RouteGetAlertStatuses),
 				m,
 			),
 		)
@@ -59,7 +59,7 @@ func (api *API) RegisterPrometheusApiEndpoints(srv PrometheusApi, m *metrics.API
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/prometheus/grafana/api/v1/alerts",
-				srv.RouteGetGrafanaAlertStatuses,
+				api.Hooks.Wrap(srv.RouteGetGrafanaAlertStatuses),
 				m,
 			),
 		)
@@ -69,7 +69,7 @@ func (api *API) RegisterPrometheusApiEndpoints(srv PrometheusApi, m *metrics.API
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/prometheus/grafana/api/v1/rules",
-				srv.RouteGetGrafanaRuleStatuses,
+				api.Hooks.Wrap(srv.RouteGetGrafanaRuleStatuses),
 				m,
 			),
 		)
@@ -79,7 +79,7 @@ func (api *API) RegisterPrometheusApiEndpoints(srv PrometheusApi, m *metrics.API
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/prometheus/{DatasourceUID}/api/v1/rules",
-				srv.RouteGetRuleStatuses,
+				api.Hooks.Wrap(srv.RouteGetRuleStatuses),
 				m,
 			),
 		)
diff --git a/pkg/services/ngalert/api/generated_base_api_provisioning.go b/pkg/services/ngalert/api/generated_base_api_provisioning.go
index f3e6ed66c32..6921fbc2007 100644
--- a/pkg/services/ngalert/api/generated_base_api_provisioning.go
+++ b/pkg/services/ngalert/api/generated_base_api_provisioning.go
@@ -212,7 +212,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/v1/provisioning/alert-rules/{UID}",
-				srv.RouteDeleteAlertRule,
+				api.Hooks.Wrap(srv.RouteDeleteAlertRule),
 				m,
 			),
 		)
@@ -222,7 +222,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/v1/provisioning/contact-points/{UID}",
-				srv.RouteDeleteContactpoints,
+				api.Hooks.Wrap(srv.RouteDeleteContactpoints),
 				m,
 			),
 		)
@@ -232,7 +232,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/v1/provisioning/mute-timings/{name}",
-				srv.RouteDeleteMuteTiming,
+				api.Hooks.Wrap(srv.RouteDeleteMuteTiming),
 				m,
 			),
 		)
@@ -242,7 +242,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/v1/provisioning/templates/{name}",
-				srv.RouteDeleteTemplate,
+				api.Hooks.Wrap(srv.RouteDeleteTemplate),
 				m,
 			),
 		)
@@ -252,7 +252,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/alert-rules/{UID}",
-				srv.RouteGetAlertRule,
+				api.Hooks.Wrap(srv.RouteGetAlertRule),
 				m,
 			),
 		)
@@ -262,7 +262,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/alert-rules/{UID}/export",
-				srv.RouteGetAlertRuleExport,
+				api.Hooks.Wrap(srv.RouteGetAlertRuleExport),
 				m,
 			),
 		)
@@ -272,7 +272,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}",
-				srv.RouteGetAlertRuleGroup,
+				api.Hooks.Wrap(srv.RouteGetAlertRuleGroup),
 				m,
 			),
 		)
@@ -282,7 +282,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export",
-				srv.RouteGetAlertRuleGroupExport,
+				api.Hooks.Wrap(srv.RouteGetAlertRuleGroupExport),
 				m,
 			),
 		)
@@ -292,7 +292,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/alert-rules",
-				srv.RouteGetAlertRules,
+				api.Hooks.Wrap(srv.RouteGetAlertRules),
 				m,
 			),
 		)
@@ -302,7 +302,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/alert-rules/export",
-				srv.RouteGetAlertRulesExport,
+				api.Hooks.Wrap(srv.RouteGetAlertRulesExport),
 				m,
 			),
 		)
@@ -312,7 +312,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/contact-points",
-				srv.RouteGetContactpoints,
+				api.Hooks.Wrap(srv.RouteGetContactpoints),
 				m,
 			),
 		)
@@ -322,7 +322,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/mute-timings/{name}",
-				srv.RouteGetMuteTiming,
+				api.Hooks.Wrap(srv.RouteGetMuteTiming),
 				m,
 			),
 		)
@@ -332,7 +332,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/mute-timings",
-				srv.RouteGetMuteTimings,
+				api.Hooks.Wrap(srv.RouteGetMuteTimings),
 				m,
 			),
 		)
@@ -342,7 +342,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/policies",
-				srv.RouteGetPolicyTree,
+				api.Hooks.Wrap(srv.RouteGetPolicyTree),
 				m,
 			),
 		)
@@ -352,7 +352,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/templates/{name}",
-				srv.RouteGetTemplate,
+				api.Hooks.Wrap(srv.RouteGetTemplate),
 				m,
 			),
 		)
@@ -362,7 +362,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/v1/provisioning/templates",
-				srv.RouteGetTemplates,
+				api.Hooks.Wrap(srv.RouteGetTemplates),
 				m,
 			),
 		)
@@ -372,7 +372,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/v1/provisioning/alert-rules",
-				srv.RoutePostAlertRule,
+				api.Hooks.Wrap(srv.RoutePostAlertRule),
 				m,
 			),
 		)
@@ -382,7 +382,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/v1/provisioning/contact-points",
-				srv.RoutePostContactpoints,
+				api.Hooks.Wrap(srv.RoutePostContactpoints),
 				m,
 			),
 		)
@@ -392,7 +392,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/v1/provisioning/mute-timings",
-				srv.RoutePostMuteTiming,
+				api.Hooks.Wrap(srv.RoutePostMuteTiming),
 				m,
 			),
 		)
@@ -402,7 +402,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPut,
 				"/api/v1/provisioning/alert-rules/{UID}",
-				srv.RoutePutAlertRule,
+				api.Hooks.Wrap(srv.RoutePutAlertRule),
 				m,
 			),
 		)
@@ -412,7 +412,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPut,
 				"/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}",
-				srv.RoutePutAlertRuleGroup,
+				api.Hooks.Wrap(srv.RoutePutAlertRuleGroup),
 				m,
 			),
 		)
@@ -422,7 +422,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPut,
 				"/api/v1/provisioning/contact-points/{UID}",
-				srv.RoutePutContactpoint,
+				api.Hooks.Wrap(srv.RoutePutContactpoint),
 				m,
 			),
 		)
@@ -432,7 +432,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPut,
 				"/api/v1/provisioning/mute-timings/{name}",
-				srv.RoutePutMuteTiming,
+				api.Hooks.Wrap(srv.RoutePutMuteTiming),
 				m,
 			),
 		)
@@ -442,7 +442,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPut,
 				"/api/v1/provisioning/policies",
-				srv.RoutePutPolicyTree,
+				api.Hooks.Wrap(srv.RoutePutPolicyTree),
 				m,
 			),
 		)
@@ -452,7 +452,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodPut,
 				"/api/v1/provisioning/templates/{name}",
-				srv.RoutePutTemplate,
+				api.Hooks.Wrap(srv.RoutePutTemplate),
 				m,
 			),
 		)
@@ -462,7 +462,7 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/v1/provisioning/policies",
-				srv.RouteResetPolicyTree,
+				api.Hooks.Wrap(srv.RouteResetPolicyTree),
 				m,
 			),
 		)
diff --git a/pkg/services/ngalert/api/generated_base_api_ruler.go b/pkg/services/ngalert/api/generated_base_api_ruler.go
index b5687db2a3f..1142093103b 100644
--- a/pkg/services/ngalert/api/generated_base_api_ruler.go
+++ b/pkg/services/ngalert/api/generated_base_api_ruler.go
@@ -119,7 +119,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}",
-				srv.RouteDeleteGrafanaRuleGroupConfig,
+				api.Hooks.Wrap(srv.RouteDeleteGrafanaRuleGroupConfig),
 				m,
 			),
 		)
@@ -129,7 +129,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/ruler/grafana/api/v1/rules/{Namespace}",
-				srv.RouteDeleteNamespaceGrafanaRulesConfig,
+				api.Hooks.Wrap(srv.RouteDeleteNamespaceGrafanaRulesConfig),
 				m,
 			),
 		)
@@ -139,7 +139,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}",
-				srv.RouteDeleteNamespaceRulesConfig,
+				api.Hooks.Wrap(srv.RouteDeleteNamespaceRulesConfig),
 				m,
 			),
 		)
@@ -149,7 +149,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodDelete,
 				"/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname}",
-				srv.RouteDeleteRuleGroupConfig,
+				api.Hooks.Wrap(srv.RouteDeleteRuleGroupConfig),
 				m,
 			),
 		)
@@ -159,7 +159,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}",
-				srv.RouteGetGrafanaRuleGroupConfig,
+				api.Hooks.Wrap(srv.RouteGetGrafanaRuleGroupConfig),
 				m,
 			),
 		)
@@ -169,7 +169,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/ruler/grafana/api/v1/rules",
-				srv.RouteGetGrafanaRulesConfig,
+				api.Hooks.Wrap(srv.RouteGetGrafanaRulesConfig),
 				m,
 			),
 		)
@@ -179,7 +179,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/ruler/grafana/api/v1/rules/{Namespace}",
-				srv.RouteGetNamespaceGrafanaRulesConfig,
+				api.Hooks.Wrap(srv.RouteGetNamespaceGrafanaRulesConfig),
 				m,
 			),
 		)
@@ -189,7 +189,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}",
-				srv.RouteGetNamespaceRulesConfig,
+				api.Hooks.Wrap(srv.RouteGetNamespaceRulesConfig),
 				m,
 			),
 		)
@@ -199,7 +199,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname}",
-				srv.RouteGetRulegGroupConfig,
+				api.Hooks.Wrap(srv.RouteGetRulegGroupConfig),
 				m,
 			),
 		)
@@ -209,7 +209,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodGet,
 				"/api/ruler/{DatasourceUID}/api/v1/rules",
-				srv.RouteGetRulesConfig,
+				api.Hooks.Wrap(srv.RouteGetRulesConfig),
 				m,
 			),
 		)
@@ -219,7 +219,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/ruler/grafana/api/v1/rules/{Namespace}",
-				srv.RoutePostNameGrafanaRulesConfig,
+				api.Hooks.Wrap(srv.RoutePostNameGrafanaRulesConfig),
 				m,
 			),
 		)
@@ -229,7 +229,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}",
-				srv.RoutePostNameRulesConfig,
+				api.Hooks.Wrap(srv.RoutePostNameRulesConfig),
 				m,
 			),
 		)
diff --git a/pkg/services/ngalert/api/generated_base_api_testing.go b/pkg/services/ngalert/api/generated_base_api_testing.go
index 6b3e104efab..342d0460b5f 100644
--- a/pkg/services/ngalert/api/generated_base_api_testing.go
+++ b/pkg/services/ngalert/api/generated_base_api_testing.go
@@ -68,7 +68,7 @@ func (api *API) RegisterTestingApiEndpoints(srv TestingApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/v1/rule/backtest",
-				srv.BacktestConfig,
+				api.Hooks.Wrap(srv.BacktestConfig),
 				m,
 			),
 		)
@@ -78,7 +78,7 @@ func (api *API) RegisterTestingApiEndpoints(srv TestingApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/v1/eval",
-				srv.RouteEvalQueries,
+				api.Hooks.Wrap(srv.RouteEvalQueries),
 				m,
 			),
 		)
@@ -88,7 +88,7 @@ func (api *API) RegisterTestingApiEndpoints(srv TestingApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/v1/rule/test/{DatasourceUID}",
-				srv.RouteTestRuleConfig,
+				api.Hooks.Wrap(srv.RouteTestRuleConfig),
 				m,
 			),
 		)
@@ -98,7 +98,7 @@ func (api *API) RegisterTestingApiEndpoints(srv TestingApi, m *metrics.API) {
 			metrics.Instrument(
 				http.MethodPost,
 				"/api/v1/rule/test/grafana",
-				srv.RouteTestRuleGrafanaConfig,
+				api.Hooks.Wrap(srv.RouteTestRuleGrafanaConfig),
 				m,
 			),
 		)
diff --git a/pkg/services/ngalert/api/hooks.go b/pkg/services/ngalert/api/hooks.go
new file mode 100644
index 00000000000..8b6c4dad804
--- /dev/null
+++ b/pkg/services/ngalert/api/hooks.go
@@ -0,0 +1,43 @@
+package api
+
+import (
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/infra/log"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+)
+
+type RequestHandlerFunc func(*contextmodel.ReqContext) response.Response
+
+type Hooks struct {
+	logger log.Logger
+	hooks  map[string]RequestHandlerFunc
+}
+
+// NewHooks creates an empty set of request handler hooks. Hooks can be used
+// to replace handlers for specific paths.
+func NewHooks(logger log.Logger) *Hooks {
+	return &Hooks{
+		logger: logger,
+		hooks:  make(map[string]RequestHandlerFunc),
+	}
+}
+
+// Add creates a new request hook for a path, causing requests to the path to
+// be handled by the hook function, and not the original handler.
+func (h *Hooks) Set(path string, hook RequestHandlerFunc) {
+	h.logger.Info("setting hook override for the specified route", "path", path)
+	h.hooks[path] = hook
+}
+
+// Wrap returns a new handler which will intercept paths with hooks configured,
+// and invoke the hooked in handler instead. If no hook is configured for a path,
+// then the given handler is invoked.
+func (h *Hooks) Wrap(next RequestHandlerFunc) RequestHandlerFunc {
+	return func(req *contextmodel.ReqContext) response.Response {
+		if hook, ok := h.hooks[req.Context.Req.URL.Path]; ok {
+			h.logger.Debug("hook defined - invoking new handler", "path", req.Context.Req.URL.Path)
+			return hook(req)
+		}
+		return next(req)
+	}
+}
diff --git a/pkg/services/ngalert/api/tooling/swagger-codegen/templates/controller-api.mustache b/pkg/services/ngalert/api/tooling/swagger-codegen/templates/controller-api.mustache
index 7a7f7498108..7e15282fa38 100644
--- a/pkg/services/ngalert/api/tooling/swagger-codegen/templates/controller-api.mustache
+++ b/pkg/services/ngalert/api/tooling/swagger-codegen/templates/controller-api.mustache
@@ -40,7 +40,7 @@ func (api *API) Register{{classname}}Endpoints(srv {{classname}}, m *metrics.API
 		metrics.Instrument(
 			http.Method{{httpMethod}},
 			"{{{path}}}",
-			srv.{{nickname}},
+			api.Hooks.Wrap(srv.{{nickname}}),
 			m,
 		),
   ){{/operation}}{{/operations}}
diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go
index 08f3c256fe2..7e4477bdb3d 100644
--- a/pkg/services/ngalert/ngalert.go
+++ b/pkg/services/ngalert/ngalert.go
@@ -127,6 +127,7 @@ type AlertNG struct {
 	stateManager        *state.Manager
 	folderService       folder.Service
 	dashboardService    dashboards.DashboardService
+	api                 *api.API
 
 	// Alerting notification services
 	MultiOrgAlertmanager *notifier.MultiOrgAlertmanager
@@ -246,7 +247,7 @@ func (ng *AlertNG) init() error {
 		int64(ng.Cfg.UnifiedAlerting.DefaultRuleEvaluationInterval.Seconds()),
 		int64(ng.Cfg.UnifiedAlerting.BaseInterval.Seconds()), ng.Log)
 
-	api := api.API{
+	ng.api = &api.API{
 		Cfg:                  ng.Cfg,
 		DatasourceCache:      ng.DataSourceCache,
 		DatasourceService:    ng.DataSourceService,
@@ -271,8 +272,9 @@ func (ng *AlertNG) init() error {
 		FeatureManager:       ng.FeatureToggles,
 		AppUrl:               appUrl,
 		Historian:            history,
+		Hooks:                api.NewHooks(ng.Log),
 	}
-	api.RegisterAPIEndpoints(ng.Metrics.GetAPIMetrics())
+	ng.api.RegisterAPIEndpoints(ng.Metrics.GetAPIMetrics())
 
 	defaultLimits, err := readQuotaConfig(ng.Cfg)
 	if err != nil {
@@ -282,7 +284,7 @@ func (ng *AlertNG) init() error {
 	if err := ng.QuotaService.RegisterQuotaReporter(&quota.NewUsageReporter{
 		TargetSrv:     models.QuotaTargetSrv,
 		DefaultLimits: defaultLimits,
-		Reporter:      api.Usage,
+		Reporter:      ng.api.Usage,
 	}); err != nil {
 		return err
 	}
@@ -349,6 +351,12 @@ func (ng *AlertNG) IsDisabled() bool {
 	return !ng.Cfg.UnifiedAlerting.IsEnabled()
 }
 
+// GetHooks returns a facility for replacing handlers for paths. The handler hook for a path
+// is invoked after all other middleware is invoked (authentication, instrumentation).
+func (ng *AlertNG) GetHooks() *api.Hooks {
+	return ng.api.Hooks
+}
+
 func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
 	limits := &quota.Map{}
 

From dcf53dbb3b06ee4a3dd4ec27aaecf7c4223ce861 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 24 Apr 2023 17:53:28 +0100
Subject: [PATCH 367/729] ConfirmModal: make button styling consistent 
 (#67142)

* stop using fill="outline" for confirm modal dismiss button

* kick drone
---
 .../grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
index 44af4995199..432deafa452 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
@@ -97,7 +97,7 @@ export const ConfirmModal = ({
         ) : null}
       </div>
       <Modal.ButtonRow>
-        <Button variant={dismissVariant} onClick={onDismiss} fill="outline">
+        <Button variant={dismissVariant} onClick={onDismiss}>
           {dismissText}
         </Button>
         <Button

From e57e0769ca6238962cda15e6c8e75eb66022b41e Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Mon, 24 Apr 2023 13:29:54 -0400
Subject: [PATCH 368/729] Prometheus: Enable prometheusDataplane by default
 (#67100)

* Prometheus: Enable prometheusDataplane by default
and related mitigation toggle dataplaneFrontendFallback
original PRs with the toggles:
 - https://github.com/grafana/grafana/pull/65237
 - https://github.com/grafana/grafana/pull/62694
---
 .../feature-toggles/index.md                  | 130 +++++++++---------
 .../src/types/featureToggles.gen.ts           |   4 +-
 pkg/services/featuremgmt/registry.go          |  30 ++--
 pkg/services/featuremgmt/toggles_gen.csv      |   6 +-
 pkg/services/featuremgmt/toggles_gen.go       |  16 +--
 5 files changed, 94 insertions(+), 92 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 710bb0b2bc3..d8b6ea6be81 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -19,23 +19,25 @@ This page contains a list of available feature toggles. To learn how to turn on
 
 Some stable features are enabled by default. You can disable a stable feature by setting the feature flag to "false" in the configuration.
 
-| Feature toggle name                 | Description                                                                                                                                                                  | Enabled by default |
-| ----------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| `disableEnvelopeEncryption`         | Disable envelope encryption (emergency only)                                                                                                                                 |                    |
-| `database_metrics`                  | Add Prometheus metrics for database tables                                                                                                                                   |                    |
-| `featureHighlights`                 | Highlight Grafana Enterprise features                                                                                                                                        |                    |
-| `cloudWatchDynamicLabels`           | Use dynamic labels instead of alias patterns in CloudWatch datasource                                                                                                        | Yes                |
-| `dataConnectionsConsole`            | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | Yes                |
-| `internationalization`              | Enables internationalization                                                                                                                                                 | Yes                |
-| `topnav`                            | Enables new top navigation and page layouts                                                                                                                                  | Yes                |
-| `cloudWatchCrossAccountQuerying`    | Enables cross-account querying in CloudWatch datasources                                                                                                                     | Yes                |
-| `newPanelChromeUI`                  | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu                                                                                          | Yes                |
-| `accessTokenExpirationCheck`        | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                         |                    |
-| `emptyDashboardPage`                | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                             | Yes                |
-| `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling                                                                                                                                         |                    |
-| `logsSampleInExplore`               | Enables access to the logs sample feature in Explore                                                                                                                         | Yes                |
-| `logsContextDatasourceUi`           | Allow datasource to provide custom UI for context view                                                                                                                       | Yes                |
-| `useCachingService`                 | When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation                |                    |
+| Feature toggle name                 | Description                                                                                                                                                                                         | Enabled by default |
+| ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| `disableEnvelopeEncryption`         | Disable envelope encryption (emergency only)                                                                                                                                                        |                    |
+| `database_metrics`                  | Add Prometheus metrics for database tables                                                                                                                                                          |                    |
+| `featureHighlights`                 | Highlight Grafana Enterprise features                                                                                                                                                               |                    |
+| `cloudWatchDynamicLabels`           | Use dynamic labels instead of alias patterns in CloudWatch datasource                                                                                                                               | Yes                |
+| `dataConnectionsConsole`            | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.                        | Yes                |
+| `internationalization`              | Enables internationalization                                                                                                                                                                        | Yes                |
+| `topnav`                            | Enables new top navigation and page layouts                                                                                                                                                         | Yes                |
+| `cloudWatchCrossAccountQuerying`    | Enables cross-account querying in CloudWatch datasources                                                                                                                                            | Yes                |
+| `newPanelChromeUI`                  | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu                                                                                                                 | Yes                |
+| `accessTokenExpirationCheck`        | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                                                |                    |
+| `emptyDashboardPage`                | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                                                    | Yes                |
+| `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling                                                                                                                                                                |                    |
+| `logsSampleInExplore`               | Enables access to the logs sample feature in Explore                                                                                                                                                | Yes                |
+| `logsContextDatasourceUi`           | Allow datasource to provide custom UI for context view                                                                                                                                              | Yes                |
+| `prometheusDataplane`               | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from 'Value' to the value of the `__name__` label when present. | Yes                |
+| `dataplaneFrontendFallback`         | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                | Yes                |
+| `useCachingService`                 | When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation                                       |                    |
 
 ## Beta feature toggles
 
@@ -64,54 +66,52 @@ Some stable features are enabled by default. You can disable a stable feature by
 These features are early in their development lifecycle and so are not yet supported in Grafana Cloud.
 Alpha features might be changed or removed without prior notice.
 
-| Feature toggle name                | Description                                                                                                                                                                                         |
-| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `live-service-web-worker`          | This will use a webworker thread to processes events rather than the main thread                                                                                                                    |
-| `queryOverLive`                    | Use Grafana Live WebSocket to execute backend queries                                                                                                                                               |
-| `publicDashboards`                 | Enables public access to dashboards                                                                                                                                                                 |
-| `publicDashboardsEmailSharing`     | Enables public dashboard sharing to be restricted to only allowed emails                                                                                                                            |
-| `lokiLive`                         | Support WebSocket streaming for loki (early prototype)                                                                                                                                              |
-| `storage`                          | Configurable storage for dashboards, datasources, and resources                                                                                                                                     |
-| `newTraceViewHeader`               | Shows the new trace view header                                                                                                                                                                     |
-| `datasourceQueryMultiStatus`       | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                    |
-| `traceToMetrics`                   | Enable trace to metrics links                                                                                                                                                                       |
-| `prometheusWideSeries`             | Enable wide series responses in the Prometheus datasource                                                                                                                                           |
-| `canvasPanelNesting`               | Allow elements nesting                                                                                                                                                                              |
-| `scenes`                           | Experimental framework to build interactive dashboards                                                                                                                                              |
-| `disableSecretsCompatibility`      | Disable duplicated secret storage in legacy tables                                                                                                                                                  |
-| `logRequestsInstrumentedAsUnknown` | Logs the path for requests that are instrumented as unknown                                                                                                                                         |
-| `redshiftAsyncQueryDataSupport`    | Enable async query data support for Redshift                                                                                                                                                        |
-| `athenaAsyncQueryDataSupport`      | Enable async query data support for Athena                                                                                                                                                          |
-| `showDashboardValidationWarnings`  | Show warnings when dashboards do not validate against the schema                                                                                                                                    |
-| `mysqlAnsiQuotes`                  | Use double quotes to escape keyword in a MySQL query                                                                                                                                                |
-| `showTraceId`                      | Show trace ids for requests                                                                                                                                                                         |
-| `datasourceOnboarding`             | Enable data source onboarding page                                                                                                                                                                  |
-| `authnService`                     | Use new auth service to perform authentication                                                                                                                                                      |
-| `alertingBacktesting`              | Rule backtesting API for alerting                                                                                                                                                                   |
-| `editPanelCSVDragAndDrop`          | Enables drag and drop for CSV and Excel files                                                                                                                                                       |
-| `lokiQuerySplitting`               | Split large interval queries into subqueries with smaller time intervals                                                                                                                            |
-| `lokiQuerySplittingConfig`         | Give users the option to configure split durations for Loki queries                                                                                                                                 |
-| `individualCookiePreferences`      | Support overriding cookie preferences per user                                                                                                                                                      |
-| `onlyExternalOrgRoleSync`          | Prohibits a user from changing organization roles synced with external auth providers                                                                                                               |
-| `traceqlSearch`                    | Enables the 'TraceQL Search' tab for the Tempo datasource which provides a UI to generate TraceQL queries                                                                                           |
-| `prometheusMetricEncyclopedia`     | Replaces the Prometheus query builder metric select option with a paginated and filterable component                                                                                                |
-| `timeSeriesTable`                  | Enable time series table transformer & sparkline cell type                                                                                                                                          |
-| `prometheusResourceBrowserCache`   | Displays browser caching options in Prometheus data source configuration                                                                                                                            |
-| `influxdbBackendMigration`         | Query InfluxDB InfluxQL without the proxy                                                                                                                                                           |
-| `clientTokenRotation`              | Replaces the current in-request token rotation so that the client initiates the rotation                                                                                                            |
-| `prometheusDataplane`              | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from 'Value' to the value of the `__name__` label when present. |
-| `lokiMetricDataplane`              | Changes responses from Loki to be compliant with the dataplane specification.                                                                                                                       |
-| `alertStateHistoryLokiSecondary`   | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.                                                                                        |
-| `alertStateHistoryLokiPrimary`     | Enable a remote Loki instance as the primary source for state history reads.                                                                                                                        |
-| `alertStateHistoryLokiOnly`        | Disable Grafana alerts from emitting annotations when a remote Loki instance is available.                                                                                                          |
-| `disableSSEDataplane`              | Disables dataplane specific processing in server side expressions.                                                                                                                                  |
-| `unifiedRequestLog`                | Writes error logs to the request logger                                                                                                                                                             |
-| `pyroscopeFlameGraph`              | Changes flame graph to pyroscope one                                                                                                                                                                |
-| `dataplaneFrontendFallback`        | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                |
-| `authenticationConfigUI`           | Enables authentication configuration UI                                                                                                                                                             |
-| `pluginsAPIManifestKey`            | Use grafana.com API to retrieve the public manifest key                                                                                                                                             |
-| `advancedDataSourcePicker`         | Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode                                                                                      |
-| `opensearchDetectVersion`          | Enable version detection in OpenSearch                                                                                                                                                              |
+| Feature toggle name                | Description                                                                                                    |
+| ---------------------------------- | -------------------------------------------------------------------------------------------------------------- |
+| `live-service-web-worker`          | This will use a webworker thread to processes events rather than the main thread                               |
+| `queryOverLive`                    | Use Grafana Live WebSocket to execute backend queries                                                          |
+| `publicDashboards`                 | Enables public access to dashboards                                                                            |
+| `publicDashboardsEmailSharing`     | Enables public dashboard sharing to be restricted to only allowed emails                                       |
+| `lokiLive`                         | Support WebSocket streaming for loki (early prototype)                                                         |
+| `storage`                          | Configurable storage for dashboards, datasources, and resources                                                |
+| `newTraceViewHeader`               | Shows the new trace view header                                                                                |
+| `datasourceQueryMultiStatus`       | Introduce HTTP 207 Multi Status for api/ds/query                                                               |
+| `traceToMetrics`                   | Enable trace to metrics links                                                                                  |
+| `prometheusWideSeries`             | Enable wide series responses in the Prometheus datasource                                                      |
+| `canvasPanelNesting`               | Allow elements nesting                                                                                         |
+| `scenes`                           | Experimental framework to build interactive dashboards                                                         |
+| `disableSecretsCompatibility`      | Disable duplicated secret storage in legacy tables                                                             |
+| `logRequestsInstrumentedAsUnknown` | Logs the path for requests that are instrumented as unknown                                                    |
+| `redshiftAsyncQueryDataSupport`    | Enable async query data support for Redshift                                                                   |
+| `athenaAsyncQueryDataSupport`      | Enable async query data support for Athena                                                                     |
+| `showDashboardValidationWarnings`  | Show warnings when dashboards do not validate against the schema                                               |
+| `mysqlAnsiQuotes`                  | Use double quotes to escape keyword in a MySQL query                                                           |
+| `showTraceId`                      | Show trace ids for requests                                                                                    |
+| `datasourceOnboarding`             | Enable data source onboarding page                                                                             |
+| `authnService`                     | Use new auth service to perform authentication                                                                 |
+| `alertingBacktesting`              | Rule backtesting API for alerting                                                                              |
+| `editPanelCSVDragAndDrop`          | Enables drag and drop for CSV and Excel files                                                                  |
+| `lokiQuerySplitting`               | Split large interval queries into subqueries with smaller time intervals                                       |
+| `lokiQuerySplittingConfig`         | Give users the option to configure split durations for Loki queries                                            |
+| `individualCookiePreferences`      | Support overriding cookie preferences per user                                                                 |
+| `onlyExternalOrgRoleSync`          | Prohibits a user from changing organization roles synced with external auth providers                          |
+| `traceqlSearch`                    | Enables the 'TraceQL Search' tab for the Tempo datasource which provides a UI to generate TraceQL queries      |
+| `prometheusMetricEncyclopedia`     | Replaces the Prometheus query builder metric select option with a paginated and filterable component           |
+| `timeSeriesTable`                  | Enable time series table transformer & sparkline cell type                                                     |
+| `prometheusResourceBrowserCache`   | Displays browser caching options in Prometheus data source configuration                                       |
+| `influxdbBackendMigration`         | Query InfluxDB InfluxQL without the proxy                                                                      |
+| `clientTokenRotation`              | Replaces the current in-request token rotation so that the client initiates the rotation                       |
+| `lokiMetricDataplane`              | Changes responses from Loki to be compliant with the dataplane specification.                                  |
+| `disableSSEDataplane`              | Disables dataplane specific processing in server side expressions.                                             |
+| `alertStateHistoryLokiSecondary`   | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.   |
+| `alertStateHistoryLokiPrimary`     | Enable a remote Loki instance as the primary source for state history reads.                                   |
+| `alertStateHistoryLokiOnly`        | Disable Grafana alerts from emitting annotations when a remote Loki instance is available.                     |
+| `unifiedRequestLog`                | Writes error logs to the request logger                                                                        |
+| `pyroscopeFlameGraph`              | Changes flame graph to pyroscope one                                                                           |
+| `authenticationConfigUI`           | Enables authentication configuration UI                                                                        |
+| `pluginsAPIManifestKey`            | Use grafana.com API to retrieve the public manifest key                                                        |
+| `advancedDataSourcePicker`         | Enable a new data source picker with contextual information, recently used order, CSV upload and advanced mode |
+| `opensearchDetectVersion`          | Enable version detection in OpenSearch                                                                         |
 
 ## Development feature toggles
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 23af2306117..cc5d17e0578 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -83,15 +83,15 @@ export interface FeatureToggles {
   clientTokenRotation?: boolean;
   prometheusDataplane?: boolean;
   lokiMetricDataplane?: boolean;
+  dataplaneFrontendFallback?: boolean;
+  disableSSEDataplane?: boolean;
   alertStateHistoryLokiSecondary?: boolean;
   alertStateHistoryLokiPrimary?: boolean;
   alertStateHistoryLokiOnly?: boolean;
-  disableSSEDataplane?: boolean;
   unifiedRequestLog?: boolean;
   renderAuthJWT?: boolean;
   pyroscopeFlameGraph?: boolean;
   externalServiceAuth?: boolean;
-  dataplaneFrontendFallback?: boolean;
   useCachingService?: boolean;
   enableElasticsearchBackendQuerying?: boolean;
   authenticationConfigUI?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index b1f2bab21b1..03c2322dbb0 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -429,7 +429,8 @@ var (
 		{
 			Name:        "prometheusDataplane",
 			Description: "Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from 'Value' to the value of the `__name__` label when present.",
-			State:       FeatureStateAlpha,
+			Expression:  "true",
+			State:       FeatureStateStable,
 			Owner:       grafanaObservabilityMetricsSquad,
 		},
 		{
@@ -438,6 +439,20 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaObservabilityLogsSquad,
 		},
+		{
+			Name:         "dataplaneFrontendFallback",
+			Description:  "Support dataplane contract field name change for transformations and field name matchers where the name is different",
+			State:        FeatureStateStable,
+			FrontendOnly: true,
+			Expression:   "true",
+			Owner:        grafanaObservabilityMetricsSquad,
+		},
+		{
+			Name:        "disableSSEDataplane",
+			Description: "Disables dataplane specific processing in server side expressions.",
+			State:       FeatureStateAlpha,
+			Owner:       grafanaObservabilityMetricsSquad,
+		},
 		{
 			Name:        "alertStateHistoryLokiSecondary",
 			Description: "Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.",
@@ -456,12 +471,6 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaAlertingSquad,
 		},
-		{
-			Name:        "disableSSEDataplane",
-			Description: "Disables dataplane specific processing in server side expressions.",
-			State:       FeatureStateAlpha,
-			Owner:       grafanaObservabilityMetricsSquad,
-		},
 		{
 			Name:        "unifiedRequestLog",
 			Description: "Writes error logs to the request logger",
@@ -487,13 +496,6 @@ var (
 			RequiresDevMode: true,
 			Owner:           grafanaAuthnzSquad,
 		},
-		{
-			Name:         "dataplaneFrontendFallback",
-			Description:  "Support dataplane contract field name change for transformations and field name matchers where the name is different",
-			State:        FeatureStateAlpha,
-			FrontendOnly: true,
-			Owner:        grafanaObservabilityMetricsSquad,
-		},
 		{
 			Name:            "useCachingService",
 			Description:     "When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index dea4dac80d6..1e6bc7d7401 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -62,17 +62,17 @@ timeSeriesTable,alpha,@grafana/app-o11y,false,false,false,true
 prometheusResourceBrowserCache,alpha,@grafana/observability-metrics,false,false,false,true
 influxdbBackendMigration,alpha,@grafana/observability-metrics,false,false,false,true
 clientTokenRotation,alpha,@grafana/grafana-authnz-team,false,false,false,false
-prometheusDataplane,alpha,@grafana/observability-metrics,false,false,false,false
+prometheusDataplane,stable,@grafana/observability-metrics,false,false,false,false
 lokiMetricDataplane,alpha,@grafana/observability-logs,false,false,false,false
+dataplaneFrontendFallback,stable,@grafana/observability-metrics,false,false,false,true
+disableSSEDataplane,alpha,@grafana/observability-metrics,false,false,false,false
 alertStateHistoryLokiSecondary,alpha,@grafana/alerting-squad,false,false,false,false
 alertStateHistoryLokiPrimary,alpha,@grafana/alerting-squad,false,false,false,false
 alertStateHistoryLokiOnly,alpha,@grafana/alerting-squad,false,false,false,false
-disableSSEDataplane,alpha,@grafana/observability-metrics,false,false,false,false
 unifiedRequestLog,alpha,@grafana/backend-platform,false,false,false,false
 renderAuthJWT,beta,@grafana/grafana-as-code,false,false,false,false
 pyroscopeFlameGraph,alpha,@grafana/observability-traces-and-profiling,false,false,false,false
 externalServiceAuth,alpha,@grafana/grafana-authnz-team,true,false,false,false
-dataplaneFrontendFallback,alpha,@grafana/observability-metrics,false,false,false,true
 useCachingService,stable,@grafana/grafana-operator-experience-squad,false,false,true,false
 enableElasticsearchBackendQuerying,beta,@grafana/observability-logs,false,false,false,false
 authenticationConfigUI,alpha,@grafana/grafana-authnz-team,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 4912944f700..24c98397d6e 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -267,6 +267,14 @@ const (
 	// Changes responses from Loki to be compliant with the dataplane specification.
 	FlagLokiMetricDataplane = "lokiMetricDataplane"
 
+	// FlagDataplaneFrontendFallback
+	// Support dataplane contract field name change for transformations and field name matchers where the name is different
+	FlagDataplaneFrontendFallback = "dataplaneFrontendFallback"
+
+	// FlagDisableSSEDataplane
+	// Disables dataplane specific processing in server side expressions.
+	FlagDisableSSEDataplane = "disableSSEDataplane"
+
 	// FlagAlertStateHistoryLokiSecondary
 	// Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.
 	FlagAlertStateHistoryLokiSecondary = "alertStateHistoryLokiSecondary"
@@ -279,10 +287,6 @@ const (
 	// Disable Grafana alerts from emitting annotations when a remote Loki instance is available.
 	FlagAlertStateHistoryLokiOnly = "alertStateHistoryLokiOnly"
 
-	// FlagDisableSSEDataplane
-	// Disables dataplane specific processing in server side expressions.
-	FlagDisableSSEDataplane = "disableSSEDataplane"
-
 	// FlagUnifiedRequestLog
 	// Writes error logs to the request logger
 	FlagUnifiedRequestLog = "unifiedRequestLog"
@@ -299,10 +303,6 @@ const (
 	// Starts an OAuth2 authentication provider for external services
 	FlagExternalServiceAuth = "externalServiceAuth"
 
-	// FlagDataplaneFrontendFallback
-	// Support dataplane contract field name change for transformations and field name matchers where the name is different
-	FlagDataplaneFrontendFallback = "dataplaneFrontendFallback"
-
 	// FlagUseCachingService
 	// When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation
 	FlagUseCachingService = "useCachingService"

From a6577cc6fd5978936359698acacfbc9b25e72a1d Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Mon, 24 Apr 2023 12:59:27 -0500
Subject: [PATCH 369/729] Revert "Prometheus: Add Victoria metrics to
 Prometheus type dropdown in datasource config" (#67150)

Revert "Prometheus: Add Victoria metrics to Prometheus type dropdown in datasource config (#66984)"

This reverts commit 7cb4d655845b8062b7fcf680d24e902c7ea11407.
---
 docs/sources/datasources/prometheus/_index.md |  44 +++++++-------
 .../grafana-ui/src/components/Badge/Badge.tsx |   2 +-
 .../configuration/PromFlavorVersions.ts       |  11 ----
 .../prometheus/configuration/PromSettings.tsx |  54 ++++++++----------
 .../datasource/prometheus/datasource.tsx      |   5 --
 .../datasource/prometheus/img/vm_logo.png     | Bin 4595 -> 0 bytes
 public/app/types/unified-alerting-dto.ts      |   1 -
 7 files changed, 47 insertions(+), 70 deletions(-)
 delete mode 100644 public/app/plugins/datasource/prometheus/img/vm_logo.png

diff --git a/docs/sources/datasources/prometheus/_index.md b/docs/sources/datasources/prometheus/_index.md
index 205c5aa6bc3..2a95f1ba839 100644
--- a/docs/sources/datasources/prometheus/_index.md
+++ b/docs/sources/datasources/prometheus/_index.md
@@ -45,28 +45,28 @@ To configure basic settings for the data source, complete the following steps:
 
 1.  Set the data source's basic configuration options:
 
-    | Name                            | Description                                                                                                                                                                                                                                                                                                                                                                                                          |
-    | ------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-    | `Name`                          | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                                                                                                                                                                                                |
-    | `Default`                       | Default data source that is pre-selected for new panels.                                                                                                                                                                                                                                                                                                                                                             |
-    | `URL`                           | The URL of your Prometheus server, for example, `http://prometheus.example.org:9090`.                                                                                                                                                                                                                                                                                                                                |
-    | `Access`                        | Only Server access mode is functional. If Server mode is already selected this option is hidden. Otherwise change to Server mode to prevent errors.                                                                                                                                                                                                                                                                  |
-    | `Basic Auth`                    | Enable basic authentication to the Prometheus data source.                                                                                                                                                                                                                                                                                                                                                           |
-    | `User`                          | User name for basic authentication.                                                                                                                                                                                                                                                                                                                                                                                  |
-    | `Password`                      | Password for basic authentication.                                                                                                                                                                                                                                                                                                                                                                                   |
-    | `Manage alerts via Alerting UI` | Toggle whether to enable Alertmanager integration for this data source.                                                                                                                                                                                                                                                                                                                                              |
-    | `Scrape interval`               | Set this to the typical scrape and evaluation interval configured in Prometheus. Defaults to 15s.                                                                                                                                                                                                                                                                                                                    |
-    | `HTTP method`                   | Use either POST or GET HTTP method to query your data source. POST is the recommended and pre-selected method as it allows bigger queries. Change this to GET if you have a Prometheus version older than 2.1 or if POST requests are restricted in your network.                                                                                                                                                    |
-    | `Type`                          | The type of your Prometheus server; `Prometheus`, `Cortex`, `Thanos`, `Mimir`. When selected, the **Version** field attempts to populate automatically using the Prometheus [buildinfo](https://prometheus.io/docs/prometheus/latest/querying/api/#build-information) API. Some Prometheus types, such as Cortex or VictoriaMetrics, don't support this API or provide version info, and must be manually populated. |
-    | `Version`                       | The version of your Prometheus server, note that this field is not visible until the Prometheus type is selected.                                                                                                                                                                                                                                                                                                    |
-    | `Disable metrics lookup`        | Checking this option will disable the metrics chooser and metric/label support in the query field's autocomplete. This helps if you have performance issues with bigger Prometheus instances.                                                                                                                                                                                                                        |
-    | `Custom query parameters`       | Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup`, or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'.                                                                                                                                                                                                              |
-    | **Exemplars configuration**     |                                                                                                                                                                                                                                                                                                                                                                                                                      |
-    | `Internal link`                 | Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select the backend tracing data store for your exemplar data.                                                                                                                                                                                                                                                  |
-    | `Data source`                   | _(Visible only if you enable `Internal link`)_ Selects the backend tracing data store for your exemplar data.                                                                                                                                                                                                                                                                                                        |
-    | `URL`                           | _(Visible only if you disable `Internal link`)_ Defines the external link's full URL. You can interpolate the value from the field by using the [`${__value.raw}` macro]({{< relref "../..//panels-visualizations/configure-data-links/#value-variables" >}}).                                                                                                                                                       |
-    | `URL Label`                     | _(Optional)_ Adds a custom display label to override the value of the `Label name` field.                                                                                                                                                                                                                                                                                                                            |
-    | `Label name`                    | Adds a name for the exemplar traceID property.                                                                                                                                                                                                                                                                                                                                                                       |
+    | Name                            | Description                                                                                                                                                                                                                                                                                                     |
+    | ------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+    | `Name`                          | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                                                                                           |
+    | `Default`                       | Default data source that is pre-selected for new panels.                                                                                                                                                                                                                                                        |
+    | `URL`                           | The URL of your Prometheus server, for example, `http://prometheus.example.org:9090`.                                                                                                                                                                                                                           |
+    | `Access`                        | Only Server access mode is functional. If Server mode is already selected this option is hidden. Otherwise change to Server mode to prevent errors.                                                                                                                                                             |
+    | `Basic Auth`                    | Enable basic authentication to the Prometheus data source.                                                                                                                                                                                                                                                      |
+    | `User`                          | User name for basic authentication.                                                                                                                                                                                                                                                                             |
+    | `Password`                      | Password for basic authentication.                                                                                                                                                                                                                                                                              |
+    | `Manage alerts via Alerting UI` | Toggle whether to enable Alertmanager integration for this data source.                                                                                                                                                                                                                                         |
+    | `Scrape interval`               | Set this to the typical scrape and evaluation interval configured in Prometheus. Defaults to 15s.                                                                                                                                                                                                               |
+    | `HTTP method`                   | Use either POST or GET HTTP method to query your data source. POST is the recommended and pre-selected method as it allows bigger queries. Change this to GET if you have a Prometheus version older than 2.1 or if POST requests are restricted in your network.                                               |
+    | `Type`                          | The type of your Prometheus server; `Prometheus`, `Cortex`, `Thanos`, `Mimir`. When selected, the **Version** field attempts to populate automatically using the Prometheus [buildinfo](https://semver.org/) API. Some Prometheus types, such as Cortex, don't support this API and must be manually populated. |
+    | `Version`                       | The version of your Prometheus server, note that this field is not visible until the Prometheus type is selected.                                                                                                                                                                                               |
+    | `Disable metrics lookup`        | Checking this option will disable the metrics chooser and metric/label support in the query field's autocomplete. This helps if you have performance issues with bigger Prometheus instances.                                                                                                                   |
+    | `Custom query parameters`       | Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup`, or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'.                                                                                                         |
+    | **Exemplars configuration**     |                                                                                                                                                                                                                                                                                                                 |
+    | `Internal link`                 | Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select the backend tracing data store for your exemplar data.                                                                                                                                             |
+    | `Data source`                   | _(Visible only if you enable `Internal link`)_ Selects the backend tracing data store for your exemplar data.                                                                                                                                                                                                   |
+    | `URL`                           | _(Visible only if you disable `Internal link`)_ Defines the external link's full URL. You can interpolate the value from the field by using the [`${__value.raw}` macro]({{< relref "../..//panels-visualizations/configure-data-links/#value-variables" >}}).                                                  |
+    | `URL Label`                     | _(Optional)_ Adds a custom display label to override the value of the `Label name` field.                                                                                                                                                                                                                       |
+    | `Label name`                    | Adds a name for the exemplar traceID property.                                                                                                                                                                                                                                                                  |
 
 ### Provision the data source
 
diff --git a/packages/grafana-ui/src/components/Badge/Badge.tsx b/packages/grafana-ui/src/components/Badge/Badge.tsx
index faf9e5f7125..e97bcd10526 100644
--- a/packages/grafana-ui/src/components/Badge/Badge.tsx
+++ b/packages/grafana-ui/src/components/Badge/Badge.tsx
@@ -9,7 +9,7 @@ import { IconName } from '../../types';
 import { Icon } from '../Icon/Icon';
 import { Tooltip } from '../Tooltip/Tooltip';
 
-export type BadgeColor = 'blue' | 'red' | 'green' | 'orange' | 'purple' | 'black';
+export type BadgeColor = 'blue' | 'red' | 'green' | 'orange' | 'purple';
 
 export interface BadgeProps extends HTMLAttributes<HTMLDivElement> {
   text: React.ReactNode;
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromFlavorVersions.ts b/public/app/plugins/datasource/prometheus/configuration/PromFlavorVersions.ts
index 457b857d77d..eb113762df4 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromFlavorVersions.ts
+++ b/public/app/plugins/datasource/prometheus/configuration/PromFlavorVersions.ts
@@ -77,15 +77,4 @@ export const PromFlavorVersions: { [index: string]: Array<{ value?: string; labe
     { value: '1.13.0', label: '1.13.x' },
     { value: '1.14.0', label: '> 1.13.x' },
   ],
-  VictoriaMetrics: [
-    { value: '1.23.0', label: '< 1.24.0' },
-    { value: '1.24.0', label: '>= 1.24.x' },
-    { value: '1.30.0', label: '1.3x' },
-    { value: '1.40.0', label: '1.4x' },
-    { value: '1.50.0', label: '1.5x' },
-    { value: '1.60.0', label: '1.6x' },
-    { value: '1.70.0', label: '1.7x' },
-    { value: '1.80.0', label: '1.8x' },
-    { value: '1.90.0', label: '>= 1.9x' },
-  ],
 };
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
index 77d064c35f0..b6594c2738c 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
@@ -56,7 +56,6 @@ const prometheusFlavorSelectItems: PrometheusSelectItemsType = [
   { value: PromApplication.Cortex, label: PromApplication.Cortex },
   { value: PromApplication.Mimir, label: PromApplication.Mimir },
   { value: PromApplication.Thanos, label: PromApplication.Thanos },
-  { value: PromApplication.VictoriaMetrics, label: PromApplication.VictoriaMetrics },
 ];
 
 type Props = Pick<DataSourcePluginOptionsEditorProps<PromOptions>, 'options' | 'onOptionsChange'>;
@@ -119,37 +118,32 @@ const setPrometheusVersion = (
   // This will save the current state of the form, as the url is needed for this API call to function
   onUpdate(options)
     .then((updatedOptions) => {
-      // Not seeing version info in buildinfo response from VictoriaMetrics, and Cortex doesn't support yet, users will need to manually select version
-      if (
-        updatedOptions.jsonData.prometheusType !== PromApplication.VictoriaMetrics &&
-        updatedOptions.jsonData.prometheusType !== PromApplication.Cortex
-      ) {
-        getBackendSrv()
-          .get(`/api/datasources/uid/${updatedOptions.uid}/resources/version-detect`)
-          .then((rawResponse: PromBuildInfoResponse) => {
-            const rawVersionStringFromApi = rawResponse.data?.version ?? '';
-            if (rawVersionStringFromApi && semver.valid(rawVersionStringFromApi)) {
-              const parsedVersion = getVersionString(rawVersionStringFromApi, updatedOptions.jsonData.prometheusType);
-              // If we got a successful response, let's update the backend with the version right away if it's new
-              if (parsedVersion) {
-                onUpdate({
-                  ...updatedOptions,
-                  jsonData: {
-                    ...updatedOptions.jsonData,
-                    prometheusVersion: parsedVersion,
-                  },
-                }).then((updatedUpdatedOptions) => {
-                  onOptionsChange(updatedUpdatedOptions);
-                });
-              }
-            } else {
-              unableToDeterminePrometheusVersion();
+      getBackendSrv()
+        .get(`/api/datasources/uid/${updatedOptions.uid}/resources/version-detect`)
+        .then((rawResponse: PromBuildInfoResponse) => {
+          const rawVersionStringFromApi = rawResponse.data?.version ?? '';
+          if (rawVersionStringFromApi && semver.valid(rawVersionStringFromApi)) {
+            const parsedVersion = getVersionString(rawVersionStringFromApi, updatedOptions.jsonData.prometheusType);
+            // If we got a successful response, let's update the backend with the version right away if it's new
+            if (parsedVersion) {
+              onUpdate({
+                ...updatedOptions,
+                jsonData: {
+                  ...updatedOptions.jsonData,
+                  prometheusVersion: parsedVersion,
+                },
+              }).then((updatedUpdatedOptions) => {
+                onOptionsChange(updatedUpdatedOptions);
+              });
             }
-          })
-          .catch(unableToDeterminePrometheusVersion);
-      }
+          } else {
+            unableToDeterminePrometheusVersion();
+          }
+        });
     })
-    .catch(unableToDeterminePrometheusVersion);
+    .catch((error) => {
+      unableToDeterminePrometheusVersion(error);
+    });
 };
 
 export const PromSettings = (props: Props) => {
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index cd003fc7b6e..7546ff3af29 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -173,8 +173,6 @@ export class PrometheusDatasource
       this._isDatasourceVersionGreaterOrEqualTo('2.0.0', PromApplication.Mimir) ||
       // https://github.com/cortexproject/cortex/discussions/4542
       this._isDatasourceVersionGreaterOrEqualTo('1.11.0', PromApplication.Cortex) ||
-      //https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.24.0
-      this._isDatasourceVersionGreaterOrEqualTo('1.24.0', PromApplication.VictoriaMetrics) ||
       // https://github.com/thanos-io/thanos/pull/3566
       //https://github.com/thanos-io/thanos/releases/tag/v0.18.0
       this._isDatasourceVersionGreaterOrEqualTo('0.18.0', PromApplication.Thanos)
@@ -994,7 +992,6 @@ export class PrometheusDatasource
       [PromApplication.Mimir]: '/public/app/plugins/datasource/prometheus/img/mimir_logo.svg',
       [PromApplication.Prometheus]: '/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg',
       [PromApplication.Thanos]: '/public/app/plugins/datasource/prometheus/img/thanos_logo.svg',
-      [PromApplication.VictoriaMetrics]: '/public/app/plugins/datasource/prometheus/img/vm_logo.svg',
     };
 
     const COLORS: Record<PromApplication, BadgeColor> = {
@@ -1002,7 +999,6 @@ export class PrometheusDatasource
       [PromApplication.Mimir]: 'orange',
       [PromApplication.Prometheus]: 'red',
       [PromApplication.Thanos]: 'purple', // Purple hex taken from thanos.io
-      [PromApplication.VictoriaMetrics]: 'black',
     };
 
     const AppDisplayNames: Record<PromApplication, string> = {
@@ -1010,7 +1006,6 @@ export class PrometheusDatasource
       [PromApplication.Mimir]: 'Mimir',
       [PromApplication.Prometheus]: 'Prometheus',
       [PromApplication.Thanos]: 'Thanos',
-      [PromApplication.VictoriaMetrics]: 'VictoriaMetrics',
     };
 
     const application = this.datasourceConfigurationPrometheusFlavor ?? buildInfo.application;
diff --git a/public/app/plugins/datasource/prometheus/img/vm_logo.png b/public/app/plugins/datasource/prometheus/img/vm_logo.png
deleted file mode 100644
index bf9f8e33df0ceaa1d3114612fa4e0859b2708b7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4595
zcmb_gX*kqv)c?<7PsXkx##l=s#n_h`lU;^~7^0F4Gugsqof+GZHKgoe>}zGu7EvU5
z?AgjLWed@W*YkdSKffRDbALGJ{+;VO*YDitT)*fWX4g5{;p_kaa2gt*u_rhAzr)IW
zVmq~O_W=NRlObBqij?`oA-G&*>>r)w^<|$!7eB|RO$UlE=!X`{3y@TDdY2epm|h^S
ziu@*Vv6SZvU-?@xHiH|`i&kJZYVKzhGfQX$td^oOOtHelC%axC^}9~TZ?kxXt)&m|
z9Q1$G4*fCqQSbiVRPfmR^I%-h`b_X;oz;nr{!cS%_t!UO0@pXPHS%+HD=lD%Wm(ol
zA3o@NHFofV2ouOVo(ia4*CS`<BXmFg|F~0%i0w?wE{EBBsJH`-gNby#ZRw9Zii_86
ztR!`od3#qb?bbfgxg2GSBv%3{y__=pW{o3m{l4m10kw7&T+Cs1YB8l&B`Nu`=Oymg
z<I&+pC7?Y<7zNwn-8l7gHy|sZWyaRtUXv3DW2^j!hp__Y-lVqsfmbrr4e+<=)@8Mn
zfR?y$5);UtLQCTvlma#(z-K7H0+L6P)qvvOL>s%s^cVJ3Q9u#fS4rSCs2xJyK+ct+
zcZg8cSaej4oz}~S2GWIyMA@;7lyXZ-98|ZY;If@V{$K+bsMOC}1HQt6eQu!P6tDyv
znnv{gNPVSkaM3k&yD>_Y9XRF$7;IZ=0BPp;-_GcvzN^r(NcKtA8!B=kw?mGI1;gf$
zb`9XG5xPA7ljOhtSpWJz-Fe?^wnKT#m?%q^eue&0->T*lbWRMX1puBfAp5QCpCbC=
zVrbvC*O%&OKngFuSU4ZV3fs^l%k9Rcjuu9Nugp>K4BhUADxzFMK%BS*7kJRDYC1$W
zs5%ll)cOeSwTObpT{PGkqrIQjvS||4=?6RooS3On=-B&Q=!ef>vm1;f(XdU+2u{>P
zs{?i?RQbafbT)9EEy(6!aa1*{Q`tqyY7Cndx((9VyJ6JTYJFa;E3I^2WqX8qT$kJ+
zh$LTg#nFPY_2k(96<52mD>}{$?s9Nyv}-{j)pKF)nk+eW7J`7*UR<!V<Kj(j2x|(|
zWTbFjGs0+E)=Ss-OJtVJ4(YH+HlW+RepVc6qf#89vIFGi-)p^etGOkbCYnqx(V5Q&
zPtGLB<*Z!VGd<ttd~Gr89z`HpYk1X9$FXcg<$PDY5enZKbR5WJxZoH~(_Ulg$np;Q
zp47&c!3uZ}r6hjs+qJ8Rr)8X~xo2$vtABvLz&$8-ptrf^Jr(m{Hk=3rELYbaHk<d4
zto6}Ik3~2x!s}kbV)i@tX4aTGdN?yGgg+6GWTQsC#i6WEuWH?PGuXYFGw)tzi%cEp
z&s<4+gBZt`v!=Jw57ha`N9l#WN&Ke^1Vokvt_EF==e+RI1wIju-mr74Z_6W^XWk!C
zbTT$Rubk0ew$Lr99NJ3xr}c$f178pici%abU;4^pQ<(`&$)Vd@ObeMmy2^T|RR!iW
zUU7Xe%yjIp0W;ej)32oFzj28xa4;z~-`yB0kv(rSE?pN#OzA}taV0@}mtsU;-;>Q~
z0x_G((Y0qhGiNUs8WsizU6cFi$5_-8x}}d+h_+TV<=JtLKjxY2sxz$j_)-weI)U1=
zcw$gaHiaUPVEXX&j7kQ%rohcFb&78NG%ZcA1<~*{&vlm1Fn6RSn7}caqO|1R5j8He
zXSxk9X9YTxz^4QwXzDc50CnvsUxbSn<mh;`9`JK7&hiFl^7olI!sBsg>sB)mWG^E4
z&a8<e@g&vf;;uD-R<G>fUlm&f!8^bq)0atl)mbz@Ba_6;2U#9nEm+MZ-k%HZeOu0_
z@9G~_c55SMq}_#6Ib0{zIxt{zd6ti0bIGde@v7=4>iSWf&qG+mEm#mMpdCpIXlQ^9
zl_xdzj6HGBdtvI@)d@^~tb4_!qCl810)&!uOX^c#j-C#`;{uFaGxOz|UN0~-TaRL7
zJwF&ds-S)7zV}Oc-ws2#^W>sv%(!*kb7Fntb_Wl5B|P!<Bdug|&txB8J7~;zwzMd`
zTTT6DIZ1C*7n(S7F-H#5$(hzamS~+V@?g#>h3Jf%aH-R(*v7xBEa?G{!gRS?Sntn>
zaEf{yj0Z4nPEqHl^8Ujph+>`nE!HU;APi)xb5WB7NM>Ho?d!N#Gg8IO|BkEFB@y{E
z284dqdc>^ct}?FNhJfbeuVB9q&{o2op;B_DMHUhW?Lp7X-)CM?Uj5U#xL9=^u;CsY
z97720N{(y5c^vxhxfBOp`fw*B607WDFcSQ~4Qe`D#D-(Nu^oI|&EC02TWPSegR{LQ
zwcIQjxY)2BEP*Xx#puCAVt|ko+FnkWbuLr(U;Az$icBS;E`s<(UR;gHv}*Xwq-Wy#
zgtD_f_Wf`(0^%j-QEQhL`S(a09dr!?(DS|cxu-W+I)c45pS!*Y<Q#c8?LgbNRFW>c
zq#opI^6Tgw2bJjEvVe&ntc6!HWZ1WEO>_e1;*644Q?YdK&bhg{V*%l7FS+Xvt;>|f
z_85WOTVGD`tPnDkK!;h&jE&^^=lmz2=E%9KUb8GcWJkEOkInOAsXX&XdesuPm~D7J
zX5NGQYm3rM8g{*?@^INWwRh>=yLXGR{BKJ-RKVm3Z$bOthPpw`ucxkX>-$%j2k329
z#*V7ng%H(0Ws&z8wEgba9K3@l%8GxBALHACe{!9&!*4e9n@7r%<P~>gJx`xVqGePZ
zl#K5CtBITuN2#CLp{U&o!{RgtIIwolOE^;m?0^3xlOX89?tM#oJTTZwN9?C-%iK#B
zOq(F6IMDL6Xr%sUGk8STAyp8nleY6gdK^t&Xia?8<bh<ryvORs6Z9B{VzeIXoHKr@
zc$>pSLq@)A(De|;v-No=?CyD;C-&`Loiyb@r*Z=$#T!P1ckz%?vwFsW&#pRh&U*f`
zNl-%b6ceJU%(_Zv<fmVP5H$|ttQnf?Oi))gOifRc1P_dHZ~2}9n_r1FosY{E`$heV
z>enQPS6C(-DHEPCD;cHT3RrDQIXC<q>%sR^NMhHm<Glqi>#F{#;@lcbF2n%8xMcpN
zQ#f+Eb$+V%p7#VEJa7i<^<OA|kEQL_NKE(r6YdgbEoIC@DhFK&X0``ISdR(!dL1UT
z|NE^gCH}*~`Pc-7hIIuFwtta3BZQbhe)+JzC-Wyr2IpNS?+6d^>do_C-Af8q-qSGQ
zuY-|~8|^_q@K@kCOFMb|oeNAI`QfBwi!*qt1>gNNL`e60#XL4#mT2VMDN*^bNLvw$
z^!9wi9+etmH+It&B+2O3epywxF%-@TrBMJGr)L(7heKW=A(_K#jH3teb@=vWt7}qc
zFfXv*^Et<Y4dSDe{O)Th6}qu%av3t4yLL+yUi2pB5N~I68@~I&%W(PQ1}PT@DqdHz
zrUn#zQxzNaSx<ou#%wTHbW6&jS3DzUsv_6qhiz#7DEr?ZPB^WwY=IOSws@2<@XhBy
zBhvd>;kwsHuV+LWQ4M!~w5FFFd^_i%rmg_}HSQXa-*+ln7HbrI=f&WDSS)mqMBCKd
zz+I&-U)~8x`I>0B`Kfp|^toJq?SpA4jG|Dzr*?PFmReAy_@;AdV9?L;$XC8m7D!n}
zd#g}FGYD5mcIp&zE->D}bY1MW50%~J(OO~Z(DHszI5X=xT_t&5KAI9j;^oegCWo<;
zi(;lOpyoEuIs0^X7XNF9cT@=s8R4ShtZ_1~P3vap!(4HG_c*5nK`4$mE_uh2%L%!j
zEp=ugjH8mFua=!D{XHh;5Yg})5PkX$@w4NJy6VEf65m_`WR7^qdwg0^CWp=xDED2o
zy)&flwYxMm#Nzz1y^HuP>ZB8#BVHsSnp##>2LN3nfm*!LhC((uK2epW`<^Q)P}N;v
zPZK-4l4`kbsF^jd)JSNJ6d5prR=lf2K0xv4$vl$&X5|C{MXDe|a7SkBn(C;{$ig*k
z9UYxncrv2Y`O&_%#llN(h%azcMN}+f^lEK;=i-#iy`og%9)KV``M%D@;N6S;fSpsb
zMYIy(TpR>+n0n}7if>dm-tS+;t}^v_&7>qD;PrD-vu!zfD}syrjZ4h&0Rr-m`-WSt
z+aYC7rfyB#-EE=LxwZTMeZ9i0FeA+8Y}T*xkKVf2^_`Wbf$gzZH9c$Q578K^t0tQC
zb58;(wEIaMbz>R4*KkT+?%LPr`=SJ6HZPsYr!{7|fjll94t1ImunQa}I}nLb=IB<*
zo|gq<-)dyPEL~L4(XR6ztqS$AI<FN+tIAQ-$C>|X&40UDI4@)NCZ%S=M|Sh$K$~#N
z7v<=d@CFAS<BH;->H?O}tiIL?vbBbyW7$%>-6$?&x&udLpnv3y7>koVB}`Vy2O^=S
zb47F+-dkg^EU@WcussA7Z87siO*)N-`pM_+>6MsbtZVpFx$4Rd&d_>3m=*o%ooez;
z01YZ2=JYX4?y`3ecC}7+wAod^-|+7l2TO@YRbv{1tA1joBW`ID?Fn1<nGg+;LdrYi
zhL`g!Y64qfPPmf@HO$xO^h(AgZGSmWSQ1t9Ru;$B4xxwq`|HiIK~hZ7>5NE#x3h?P
z;R2yRF^HMFN{IKS#f3`XFk+d}Cf$?l@FPZbh;WNZ1i|CLMXO5Ck@|BQq0M3Rw`KW}
zLb)9#e~S&eUu`0mZ2Q6KltfgGRg)JUze*!ElHqkc0MEIbC&TAE8@5_>m#V8ED5IbL
zS`$3&mfZ8ixKS=Tx01nxeiKaPtA*qaFU9gHyE|P5wKr@np71Q1hU<ZPtLyDJw!FZO
zo&6Onno6oN|8j}b0b@!Szk+!%n%agVRDYia@YPv>(@cBhnszBH)Q>v)8>@4wK2z0e
z?${b1>|#fP&uvsXwjKGVV(|md)Q*Y;V`xVmT-3?rx=Hp77m%$Gn^Mr-=#`<n*-VN&
zv8D8XL$~-8^%a#at^0a-wRhk1v@Nr0oiW+Q=Wh>;Ee&(9Po6wdO@mrQ!E|oqWK52&
zK0HmAq{WAQ`a1EpLmaG{VpiacT=8(0q}n~U6$hRfiWF&NP4BwxHWv?9oH2)uR8&!c
zjhwQPTk8*-8N3^N#+@t5zNS5myr5RX(^OUe9rTTuytB7phc!uND!$SF*pECQlN62V
z^|pZ#HwAF}+3sd0Q=ZuD^D#!#)>R|SdHjhrIya=0LUtfo+Ek;zbP;1-lC>y1n`iUb
zgJV++vUvAd1VWLcDPtxU?Wj*?rx#HYRFZkx=gIrH?B%m2a@7-rTWsi18n7YyYT{K@
zl|F4_CpfgKf9TDKVjmQ!80_Ik4YLa<6}mb*3+Y|>1JmLFs@^Yq09|X8m4FXIy<dKm
z6r~$0_2@jSf#6*f*Py`kANkh(xxTy(vf*au-PcsgmgL4O#Of^GL0ic3<F!)znV`e{
zt^8M0+sdP0kgiQvB&V?acRzJ=xvsVD#P*<~oDxWEAnLaL0r#L!ZNT5cyFKyr3f_;B
zqwF9=jYnu&?7S^?ut3oVB=$Qf6t`{nD&97WsX!dw;$1lOsNhzaLu9A(z>0{YT0WC#
zys-8>6Xp4B=YH>X_jh(kKoXkoz}6xAM>J(XQG9bs!yP<OaMK-1E^xYHQ+8Ir>$kHj
z6aF)Ug`~boIoUggZ23si@9bhgPlV{i50e-_L;sn}XasLkNSlH=B*`^nYc%0?Fta<@
z{W$<HwBD3L2l1A_iN9s@-POeatq_Kt9D6Gg%CkTLoJ=Nq<1lwwVAIin2Z-#ueQ*v;
z;)aRs1s^9z?&<tGsd%CwSXU{)qXOsuA=hrYy)7-U<?iDmvzBz<2b5ZfNIpj_gV2w(
z`6Qhv02Po;RQPz+=q81O_Wv$f{2x7}=a>Zmj*lJgM%|P*uB$o`a{xnqGj!!uC+hzI
DYdMIW

diff --git a/public/app/types/unified-alerting-dto.ts b/public/app/types/unified-alerting-dto.ts
index e01a9af3404..487d8cda0a3 100644
--- a/public/app/types/unified-alerting-dto.ts
+++ b/public/app/types/unified-alerting-dto.ts
@@ -64,7 +64,6 @@ export enum PromApplication {
   Mimir = 'Mimir',
   Prometheus = 'Prometheus',
   Thanos = 'Thanos',
-  VictoriaMetrics = 'VictoriaMetrics',
 }
 
 export interface PromBuildInfoResponse {

From c4c747cca6a3cb58e8fb54d11adbc8129ab817d7 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:51:15 -0500
Subject: [PATCH 370/729] e2e: Update annotation marker selector (#67135)

---
 e2e/various-suite/filter-annotations.spec.ts                | 2 +-
 e2e/various-suite/query-editor.spec.ts                      | 2 +-
 packages/grafana-e2e-selectors/src/selectors/pages.ts       | 6 +++---
 .../timeseries/plugins/annotations/AnnotationMarker.tsx     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/e2e/various-suite/filter-annotations.spec.ts b/e2e/various-suite/filter-annotations.spec.ts
index c6b17f33950..4233ba2cb66 100644
--- a/e2e/various-suite/filter-annotations.spec.ts
+++ b/e2e/various-suite/filter-annotations.spec.ts
@@ -55,7 +55,7 @@ e2e.scenario({
     e2e.components.Panels.Panel.title('Panel one')
       .should('exist')
       .within(() => {
-        e2e.pages.SoloPanel.Annotations.marker().should('exist').should('have.length', 4);
+        e2e.pages.Dashboard.Annotations.marker().should('exist').should('have.length', 4);
       });
   },
 });
diff --git a/e2e/various-suite/query-editor.spec.ts b/e2e/various-suite/query-editor.spec.ts
index 525b053216e..0f1ab90e98d 100644
--- a/e2e/various-suite/query-editor.spec.ts
+++ b/e2e/various-suite/query-editor.spec.ts
@@ -2,7 +2,7 @@ import { e2e } from '@grafana/e2e';
 
 e2e.scenario({
   describeName: 'Query editor',
-  itName: 'Undo should work in query editor for prometheus.',
+  itName: 'Undo should work in query editor for prometheus -- test CI.',
   addScenarioDataSource: false,
   addScenarioDashBoard: false,
   skipScenario: false,
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index 33b7b282711..b7f1ca5448b 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -177,6 +177,9 @@ export const Pages = {
         },
       },
     },
+    Annotations: {
+      marker: 'data-testid annotation-marker',
+    },
   },
   Dashboards: {
     url: '/dashboards',
@@ -249,9 +252,6 @@ export const Pages = {
   },
   SoloPanel: {
     url: (page: string) => `/d-solo/${page}`,
-    Annotations: {
-      marker: 'data-testid annotation-marker',
-    },
   },
   PluginsList: {
     page: 'Plugins list page',
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
index 72bc4d74da7..0b111de0cef 100644
--- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
@@ -127,7 +127,7 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
         onMouseEnter={onMouseEnter}
         onMouseLeave={onMouseLeave}
         className={!isRegionAnnotation ? styles.markerWrapper : undefined}
-        data-testid={selectors.pages.SoloPanel.Annotations.marker}
+        data-testid={selectors.pages.Dashboard.Annotations.marker}
       >
         {marker}
       </div>

From 57d3027cb008e8e646357c9bb6b07947142f79a8 Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:24:12 -0500
Subject: [PATCH 371/729] Prometheus: Default cache value in UI doesn't match
 functional default (#67159)

* add disabled state style, set correct default value to match default functionality
---
 .../datasource/prometheus/configuration/PromSettings.tsx     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
index b6594c2738c..eeabf4a8591 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
@@ -357,7 +357,10 @@ export const PromSettings = (props: Props) => {
                     className={`width-25`}
                     onChange={onChangeHandler('cacheLevel', options, onOptionsChange)}
                     options={cacheValueOptions}
-                    value={cacheValueOptions.find((o) => o.value === options.jsonData.cacheLevel)}
+                    disabled={options.readOnly}
+                    value={
+                      cacheValueOptions.find((o) => o.value === options.jsonData.cacheLevel) ?? PrometheusCacheLevel.Low
+                    }
                   />
                 }
               />

From cd205e3f466d6649fc1dbe463f6a01085cd8cba1 Mon Sep 17 00:00:00 2001
From: matt abrams <37156449+zuchka@users.noreply.github.com>
Date: Mon, 24 Apr 2023 12:38:00 -1000
Subject: [PATCH 372/729] Update index.md (#64783)

fix typo
---
 docs/sources/tutorials/create-alerts-from-flux-queries/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/tutorials/create-alerts-from-flux-queries/index.md b/docs/sources/tutorials/create-alerts-from-flux-queries/index.md
index 405b4f861cd..a039afbf5dc 100644
--- a/docs/sources/tutorials/create-alerts-from-flux-queries/index.md
+++ b/docs/sources/tutorials/create-alerts-from-flux-queries/index.md
@@ -27,7 +27,7 @@ For Example 1, let's consider the following scenario: we are monitoring one tank
 
 We want to write a Grafana alert that will trigger whenever the temperature in tank `A5` crosses the lower threshold of 30 °C or the upper threshold of 60 °C.
 
-To do this, we'll: 1. create a Grafana alert rule. 1. add a Flux query. 1. add expressions to the alert rule.
+To do this, we'll: create a Grafana alert rule, add a Flux query, and then add expressions to the alert rule.
 
 ### Create a Grafana Alert rule
 

From 1a347bfb7bc2dbe00e87f5130b057c8bebf9c676 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:38:30 -0500
Subject: [PATCH 373/729] Timeseries: Revert annotations rendering changes
 (#67166)

---
 .../panel/timeseries/TimeSeriesPanel.tsx      | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index d75d81c34c6..85d6d67c45a 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { DataFrame, Field, PanelProps } from '@grafana/data';
+import { Field, PanelProps } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
 import { TooltipDisplayMode } from '@grafana/schema';
 import { KeyboardPlugin, TimeSeries, TooltipPlugin, usePanelContext, ZoomPlugin } from '@grafana/ui';
@@ -37,25 +37,6 @@ export const TimeSeriesPanel = ({
     return getFieldLinksForExplore({ field, rowIndex, splitOpenFn: onSplitOpen, range: timeRange });
   };
 
-  const { annotations, exemplars } = useMemo(() => {
-    let annotations: DataFrame[] | null = null;
-    let exemplars: DataFrame[] | null = null;
-
-    if (data?.annotations?.length) {
-      annotations = [];
-      exemplars = [];
-      for (let frame of data.annotations) {
-        if (frame.name === 'exemplar') {
-          exemplars.push(frame);
-        } else {
-          annotations.push(frame);
-        }
-      }
-    }
-
-    return { annotations, exemplars };
-  }, [data.annotations]);
-
   const frames = useMemo(() => prepareGraphableFields(data.series, config.theme2, timeRange), [data, timeRange]);
   const timezones = useMemo(() => getTimezones(options.timezone, timeZone), [options.timezone, timeZone]);
 
@@ -107,7 +88,9 @@ export const TimeSeriesPanel = ({
               />
             )}
             {/* Renders annotation markers*/}
-            {annotations && <AnnotationsPlugin annotations={annotations} config={config} timeZone={timeZone} />}
+            {data.annotations && (
+              <AnnotationsPlugin annotations={data.annotations} config={config} timeZone={timeZone} />
+            )}
             {/* Enables annotations creation*/}
             {enableAnnotationCreation ? (
               <AnnotationEditorPlugin data={alignedDataFrame} timeZone={timeZone} config={config}>
@@ -149,11 +132,11 @@ export const TimeSeriesPanel = ({
                 defaultItems={[]}
               />
             )}
-            {exemplars && (
+            {data.annotations && (
               <ExemplarsPlugin
                 visibleSeries={getVisibleLabels(config, frames)}
                 config={config}
-                exemplars={exemplars}
+                exemplars={data.annotations}
                 timeZone={timeZone}
                 getFieldLinks={getFieldLinks}
               />

From 117636e8cae4b1d810e791715e0c9c59f4495066 Mon Sep 17 00:00:00 2001
From: Alexander Weaver <weaver.alex.d@gmail.com>
Date: Mon, 24 Apr 2023 20:23:23 -0500
Subject: [PATCH 374/729] Alerting: Fix panic when reparenting receivers to
 groups following an attempted rename via Provisioning (#67167)

---
 .../ngalert/provisioning/contactpoints.go     |   2 +-
 .../provisioning/contactpoints_test.go        | 286 ++++++++++++++++++
 2 files changed, 287 insertions(+), 1 deletion(-)

diff --git a/pkg/services/ngalert/provisioning/contactpoints.go b/pkg/services/ngalert/provisioning/contactpoints.go
index 60b61df460c..64d238f4093 100644
--- a/pkg/services/ngalert/provisioning/contactpoints.go
+++ b/pkg/services/ngalert/provisioning/contactpoints.go
@@ -453,7 +453,7 @@ groupLoop:
 
 				// Otherwise, we only want to rename the receiver we are touching... NOT all of them.
 				// Check to see whether a different group with the name we want already exists.
-				for i, candidateExistingGroup := range cfg.AlertmanagerConfig.Receivers {
+				for _, candidateExistingGroup := range cfg.AlertmanagerConfig.Receivers {
 					// If so, put our modified receiver into that group. Done!
 					if candidateExistingGroup.Name == target.Name {
 						// Drop it from the old group...
diff --git a/pkg/services/ngalert/provisioning/contactpoints_test.go b/pkg/services/ngalert/provisioning/contactpoints_test.go
index 5f331b686d7..5b775ca5473 100644
--- a/pkg/services/ngalert/provisioning/contactpoints_test.go
+++ b/pkg/services/ngalert/provisioning/contactpoints_test.go
@@ -493,6 +493,292 @@ func TestStitchReceivers(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "rename to another, larger group",
+			initial: &definitions.PostableUserConfig{
+				AlertmanagerConfig: definitions.PostableApiAlertingConfig{
+					Config: definitions.Config{
+						Route: &definitions.Route{
+							Receiver: "receiver-1",
+							Routes: []*definitions.Route{
+								{
+									Receiver: "receiver-1",
+								},
+							},
+						},
+					},
+					Receivers: []*definitions.PostableApiReceiver{
+						{
+							Receiver: config.Receiver{
+								Name: "receiver-1",
+							},
+							PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+								GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+									{
+										UID:  "1",
+										Name: "receiver-1",
+										Type: "slack",
+									},
+									{
+										UID:  "2",
+										Name: "receiver-1",
+										Type: "slack",
+									},
+								},
+							},
+						},
+						{
+							Receiver: config.Receiver{
+								Name: "receiver-2",
+							},
+							PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+								GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+									{
+										UID:  "3",
+										Name: "receiver-2",
+										Type: "slack",
+									},
+									{
+										UID:  "4",
+										Name: "receiver-2",
+										Type: "slack",
+									},
+									{
+										UID:  "5",
+										Name: "receiver-2",
+										Type: "slack",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			new: &definitions.PostableGrafanaReceiver{
+				UID:  "2",
+				Name: "receiver-2",
+				Type: "slack",
+			},
+			expModified: true,
+			expCfg: definitions.PostableApiAlertingConfig{
+				Config: definitions.Config{
+					Route: &definitions.Route{
+						Receiver: "receiver-1",
+						Routes: []*definitions.Route{
+							{
+								Receiver: "receiver-1",
+							},
+						},
+					},
+				},
+				Receivers: []*definitions.PostableApiReceiver{
+					{
+						Receiver: config.Receiver{
+							Name: "receiver-1",
+						},
+						PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+							GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+								{
+									UID:  "1",
+									Name: "receiver-1",
+									Type: "slack",
+								},
+							},
+						},
+					},
+					{
+						Receiver: config.Receiver{
+							Name: "receiver-2",
+						},
+						PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+							GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+								{
+									UID:  "3",
+									Name: "receiver-2",
+									Type: "slack",
+								},
+								{
+									UID:  "4",
+									Name: "receiver-2",
+									Type: "slack",
+								},
+								{
+									UID:  "5",
+									Name: "receiver-2",
+									Type: "slack",
+								},
+								{
+									UID:  "2",
+									Name: "receiver-2",
+									Type: "slack",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "rename when there are many groups",
+			initial: &definitions.PostableUserConfig{
+				AlertmanagerConfig: definitions.PostableApiAlertingConfig{
+					Config: definitions.Config{
+						Route: &definitions.Route{
+							Receiver: "receiver-1",
+							Routes: []*definitions.Route{
+								{
+									Receiver: "receiver-1",
+								},
+							},
+						},
+					},
+					Receivers: []*definitions.PostableApiReceiver{
+						{
+							Receiver: config.Receiver{
+								Name: "receiver-1",
+							},
+							PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+								GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+									{
+										UID:  "1",
+										Name: "receiver-1",
+										Type: "slack",
+									},
+									{
+										UID:  "2",
+										Name: "receiver-1",
+										Type: "slack",
+									},
+								},
+							},
+						},
+						{
+							Receiver: config.Receiver{
+								Name: "receiver-2",
+							},
+							PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+								GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+									{
+										UID:  "3",
+										Name: "receiver-2",
+										Type: "slack",
+									},
+								},
+							},
+						},
+						{
+							Receiver: config.Receiver{
+								Name: "receiver-3",
+							},
+							PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+								GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+									{
+										UID:  "4",
+										Name: "receiver-4",
+										Type: "slack",
+									},
+								},
+							},
+						},
+						{
+							Receiver: config.Receiver{
+								Name: "receiver-4",
+							},
+							PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+								GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+									{
+										UID:  "5",
+										Name: "receiver-4",
+										Type: "slack",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			new: &definitions.PostableGrafanaReceiver{
+				UID:  "2",
+				Name: "receiver-4",
+				Type: "slack",
+			},
+			expModified: true,
+			expCfg: definitions.PostableApiAlertingConfig{
+				Config: definitions.Config{
+					Route: &definitions.Route{
+						Receiver: "receiver-1",
+						Routes: []*definitions.Route{
+							{
+								Receiver: "receiver-1",
+							},
+						},
+					},
+				},
+				Receivers: []*definitions.PostableApiReceiver{
+					{
+						Receiver: config.Receiver{
+							Name: "receiver-1",
+						},
+						PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+							GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+								{
+									UID:  "1",
+									Name: "receiver-1",
+									Type: "slack",
+								},
+							},
+						},
+					},
+					{
+						Receiver: config.Receiver{
+							Name: "receiver-2",
+						},
+						PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+							GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+								{
+									UID:  "3",
+									Name: "receiver-2",
+									Type: "slack",
+								},
+							},
+						},
+					},
+					{
+						Receiver: config.Receiver{
+							Name: "receiver-3",
+						},
+						PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+							GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+								{
+									UID:  "4",
+									Name: "receiver-4",
+									Type: "slack",
+								},
+							},
+						},
+					},
+					{
+						Receiver: config.Receiver{
+							Name: "receiver-4",
+						},
+						PostableGrafanaReceivers: definitions.PostableGrafanaReceivers{
+							GrafanaManagedReceivers: []*definitions.PostableGrafanaReceiver{
+								{
+									UID:  "5",
+									Name: "receiver-4",
+									Type: "slack",
+								},
+								{
+									UID:  "2",
+									Name: "receiver-4",
+									Type: "slack",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
 		{
 			name: "rename to a name that doesn't exist, creates new group and moves",
 			new: &definitions.PostableGrafanaReceiver{

From 1324434dfb2bb5471f676d6aab6284f86e964a91 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 25 Apr 2023 07:26:12 +0100
Subject: [PATCH 375/729] Datagrid: Fix untyped code (#67148)

---
 .betterer.results                             |  19 ---
 .../panel/datagrid/DataGridPanel.test.tsx     |   4 +-
 .../datagrid/components/RenameColumnCell.tsx  |   2 +-
 .../panel/datagrid/components/SimpleInput.tsx |   2 +-
 public/app/plugins/panel/datagrid/state.ts    | 137 ++++++++++++------
 5 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 40fec2dce99..aa85a9c3e05 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5229,25 +5229,6 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/dashlist/module.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/datagrid/DataGridPanel.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/panel/datagrid/components/SimpleInput.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/panel/datagrid/state.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"]
-    ],
     "public/app/plugins/panel/debug/CursorView.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
index 6cda826821e..49bc1ffae58 100644
--- a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
@@ -591,10 +591,10 @@ const sendClick = (el: Element | Node | Document | Window, options?: {}): void =
   fireEvent.click(el, options);
 };
 
-const Context = (p: any) => {
+const Context = (props: { children: React.ReactNode }) => {
   return (
     <>
-      {p.children}
+      {props.children}
       <div id="grafana-portal-container"></div>
     </>
   );
diff --git a/public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx b/public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx
index 5e1f98d976e..27ea203ee0f 100644
--- a/public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx
+++ b/public/app/plugins/panel/datagrid/components/RenameColumnCell.tsx
@@ -49,7 +49,7 @@ export const RenameColumnCell = ({ renameColumnData, onColumnInputBlur, classSty
 
   const onKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
     if (e.key === 'Enter') {
-      const target = e.target as HTMLInputElement;
+      const target = e.currentTarget;
       target.blur();
     }
   };
diff --git a/public/app/plugins/panel/datagrid/components/SimpleInput.tsx b/public/app/plugins/panel/datagrid/components/SimpleInput.tsx
index e5e8b7bf305..8d8e4e77a7d 100644
--- a/public/app/plugins/panel/datagrid/components/SimpleInput.tsx
+++ b/public/app/plugins/panel/datagrid/components/SimpleInput.tsx
@@ -18,7 +18,7 @@ export const SimpleInput = ({ onBlur, placeholder }: InputProps) => {
 
   const onKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
     if (e.key === 'Enter') {
-      const target = e.target as HTMLInputElement;
+      const target = e.currentTarget;
       target.blur();
     }
   };
diff --git a/public/app/plugins/panel/datagrid/state.ts b/public/app/plugins/panel/datagrid/state.ts
index a55f5cc43c8..28d7db07807 100644
--- a/public/app/plugins/panel/datagrid/state.ts
+++ b/public/app/plugins/panel/datagrid/state.ts
@@ -30,56 +30,110 @@ interface DatagridState {
   isResizeInProgress: boolean;
 }
 
-interface UpdateColumnsPayload {
-  frame: DataFrame;
+interface UpdateColumnsAction {
+  type: DatagridActionType.updateColumns;
+  payload: {
+    frame: DataFrame;
+  };
 }
 
-interface ColumnResizeStartPayload {
-  columnIndex: number;
-  width: number;
+interface ColumnResizeStartAction {
+  type: DatagridActionType.columnResizeStart;
+  payload: {
+    columnIndex: number;
+    width: number;
+  };
 }
 
-interface OpenCellContextMenuPayload {
-  event: CellClickedEventArgs;
-  cell: Item;
+interface OpenCellContextMenuAction {
+  type: DatagridActionType.openCellContextMenu;
+  payload: {
+    event: CellClickedEventArgs;
+    cell: Item;
+  };
 }
 
-interface OpenHeaderContextMenuPayload {
-  event: HeaderClickedEventArgs;
-  columnIndex: number;
+interface OpenHeaderContextMenuAction {
+  type: DatagridActionType.openHeaderContextMenu;
+  payload: {
+    event: HeaderClickedEventArgs;
+    columnIndex: number;
+  };
 }
 
-interface OpenHeaderDropdownMenuPayload {
-  screenPosition: Rectangle;
-  columnIndex: number;
-  value: string;
+interface OpenHeaderDropdownMenuAction {
+  type: DatagridActionType.openHeaderDropdownMenu;
+  payload: {
+    screenPosition: Rectangle;
+    columnIndex: number;
+    value: string;
+  };
 }
 
-interface ColumnMovePayload {
-  from: number;
-  to: number;
+interface ColumnMoveAction {
+  type: DatagridActionType.columnMove;
+  payload: {
+    from: number;
+    to: number;
+  };
 }
 
-interface MultipleCellsSelectedPayload {
-  selection: GridSelection;
+interface MultipleCellsSelectedAction {
+  type: DatagridActionType.multipleCellsSelected;
+  payload: {
+    selection: GridSelection;
+  };
 }
 
-interface ColumnFreezeChangedPayload {
-  columnIndex: number;
+interface ColumnFreezeChangedAction {
+  type: DatagridActionType.columnFreezeChanged;
+  payload: {
+    columnIndex: number;
+  };
 }
 
-export interface DatagridAction {
-  type: DatagridActionType;
-  payload?:
-    | UpdateColumnsPayload
-    | ColumnResizeStartPayload
-    | OpenCellContextMenuPayload
-    | OpenHeaderContextMenuPayload
-    | OpenHeaderDropdownMenuPayload
-    | ColumnMovePayload
-    | MultipleCellsSelectedPayload
-    | ColumnFreezeChangedPayload;
+interface ColumnResizeEndAction {
+  type: DatagridActionType.columnResizeEnd;
 }
+interface ShowColumnRenameInputAction {
+  type: DatagridActionType.showColumnRenameInput;
+}
+interface HideColumnRenameInputAction {
+  type: DatagridActionType.hideColumnRenameInput;
+}
+interface CloseContextMenuAction {
+  type: DatagridActionType.closeContextMenu;
+}
+interface CloseSearchAction {
+  type: DatagridActionType.closeSearch;
+}
+interface OpenSearchAction {
+  type: DatagridActionType.openSearch;
+}
+interface GridSelectionClearedAction {
+  type: DatagridActionType.gridSelectionCleared;
+}
+interface ColumnFreezeResetAction {
+  type: DatagridActionType.columnFreezeReset;
+}
+
+export type DatagridAction =
+  | UpdateColumnsAction
+  | ColumnResizeStartAction
+  | OpenCellContextMenuAction
+  | OpenHeaderContextMenuAction
+  | OpenHeaderDropdownMenuAction
+  | ColumnMoveAction
+  | MultipleCellsSelectedAction
+  | ColumnFreezeChangedAction
+  | ColumnResizeEndAction
+  | ShowColumnRenameInputAction
+  | HideColumnRenameInputAction
+  | CloseContextMenuAction
+  | CloseSearchAction
+  | OpenSearchAction
+  | GridSelectionClearedAction
+  | ColumnFreezeResetAction;
 
 export enum DatagridActionType {
   columnResizeStart = 'columnResizeStart',
@@ -124,7 +178,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
   switch (action.type) {
     case DatagridActionType.columnResizeStart:
       columns = [...state.columns];
-      const columnResizeStartPayload: ColumnResizeStartPayload = action.payload as ColumnResizeStartPayload;
+      const columnResizeStartPayload = action.payload;
 
       columns[columnResizeStartPayload.columnIndex] = {
         ...state.columns[columnResizeStartPayload.columnIndex],
@@ -138,7 +192,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
       };
     case DatagridActionType.columnMove:
       columns = [...state.columns];
-      const columnMovePayload: ColumnMovePayload = action.payload as ColumnMovePayload;
+      const columnMovePayload = action.payload;
 
       const widthFrom = state.columns[columnMovePayload.from].width;
 
@@ -161,7 +215,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
         isResizeInProgress: false,
       };
     case DatagridActionType.updateColumns:
-      const updateColumnsPayload: UpdateColumnsPayload = action.payload as UpdateColumnsPayload;
+      const updateColumnsPayload = action.payload;
 
       columns = [
         ...updateColumnsPayload.frame.fields.map((field: Field, index: number) => {
@@ -197,7 +251,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
         },
       };
     case DatagridActionType.openCellContextMenu:
-      const openCellContextMenuPayload: OpenCellContextMenuPayload = action.payload as OpenCellContextMenuPayload;
+      const openCellContextMenuPayload = action.payload;
       const cellEvent: CellClickedEventArgs = openCellContextMenuPayload.event;
       const cell: Item = openCellContextMenuPayload.cell;
 
@@ -213,7 +267,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
         },
       };
     case DatagridActionType.openHeaderContextMenu:
-      const openHeaderContextMenuPayload: OpenHeaderContextMenuPayload = action.payload as OpenHeaderContextMenuPayload;
+      const openHeaderContextMenuPayload = action.payload;
       const headerEvent: HeaderClickedEventArgs = openHeaderContextMenuPayload.event;
 
       return {
@@ -228,8 +282,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
         },
       };
     case DatagridActionType.openHeaderDropdownMenu:
-      const openHeaderDropdownMenuPayload: OpenHeaderDropdownMenuPayload =
-        action.payload as OpenHeaderDropdownMenuPayload;
+      const openHeaderDropdownMenuPayload = action.payload;
       const screenPosition: Rectangle = openHeaderDropdownMenuPayload.screenPosition;
 
       return {
@@ -270,7 +323,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
         toggleSearch: true,
       };
     case DatagridActionType.multipleCellsSelected:
-      const multipleCellsSelectedPayload: MultipleCellsSelectedPayload = action.payload as MultipleCellsSelectedPayload;
+      const multipleCellsSelectedPayload = action.payload;
 
       return {
         ...state,
@@ -287,7 +340,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
         columnFreezeIndex: 0,
       };
     case DatagridActionType.columnFreezeChanged:
-      const columnFreezeChangedPayload: ColumnFreezeChangedPayload = action.payload as ColumnFreezeChangedPayload;
+      const columnFreezeChangedPayload = action.payload;
 
       return {
         ...state,

From 3bc002cd27a6b4c93b243a1ccb04aadc89ec4e8f Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Tue, 25 Apr 2023 10:33:47 +0300
Subject: [PATCH 376/729] API: Add add deprecation notice for getting folder by
 sequential ID (#67091)

* API: Add deprecation notice

* Update Swagger/openAPI
---
 pkg/api/folder.go      | 5 ++++-
 public/api-merged.json | 6 ++----
 public/openapi3.json   | 6 ++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 0f7e8db7261..c2154956db6 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -96,7 +96,10 @@ func (hs *HTTPServer) GetFolderByUID(c *contextmodel.ReqContext) response.Respon
 //
 // Get folder by id.
 //
-// Returns the folder identified by id.
+// Returns the folder identified by id. This is deprecated.
+// Please refer to [updated API](#/folders/getFolderByUID) instead
+//
+// Deprecated: true
 //
 // Responses:
 // 200: folderResponse
diff --git a/public/api-merged.json b/public/api-merged.json
index a54985c3b32..c0d177f2a0b 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -5490,12 +5490,13 @@
     },
     "/folders/id/{folder_id}": {
       "get": {
-        "description": "Returns the folder identified by id.",
+        "description": "Returns the folder identified by id. This is deprecated.\nPlease refer to [updated API](#/folders/getFolderByUID) instead",
         "tags": [
           "folders"
         ],
         "summary": "Get folder by id.",
         "operationId": "getFolderByID",
+        "deprecated": true,
         "parameters": [
           {
             "type": "integer",
@@ -13596,9 +13597,6 @@
     "FolderSearchHit": {
       "type": "object",
       "properties": {
-        "accessControl": {
-          "$ref": "#/definitions/Metadata"
-        },
         "id": {
           "type": "integer",
           "format": "int64"
diff --git a/public/openapi3.json b/public/openapi3.json
index c8243bc8671..82c55adce95 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -4663,9 +4663,6 @@
       },
       "FolderSearchHit": {
         "properties": {
-          "accessControl": {
-            "$ref": "#/components/schemas/Metadata"
-          },
           "id": {
             "format": "int64",
             "type": "integer"
@@ -16848,7 +16845,8 @@
     },
     "/folders/id/{folder_id}": {
       "get": {
-        "description": "Returns the folder identified by id.",
+        "deprecated": true,
+        "description": "Returns the folder identified by id. This is deprecated.\nPlease refer to [updated API](#/folders/getFolderByUID) instead",
         "operationId": "getFolderByID",
         "parameters": [
           {

From 5c2a344ce17058ca5c6c54df1f995816311c3916 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Tue, 25 Apr 2023 08:56:06 +0100
Subject: [PATCH 377/729] Traces: Order keys in span filter select (#66689)

* Order logs keys last

* Add tests
---
 .../SpanFilters/SpanFilters.test.tsx            | 17 +++++++++++++++++
 .../TracePageHeader/SpanFilters/SpanFilters.tsx | 15 ++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
index 857398e7739..eef40e507b1 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
@@ -151,6 +151,23 @@ describe('SpanFilters', () => {
     await selectAndCheckValue(user, tagValue, 'TagValue0');
   });
 
+  it('should order tag filters', async () => {
+    render(<SpanFiltersWithProps />);
+    const tagKey = screen.getByLabelText('Select tag key');
+
+    await user.click(tagKey);
+    jest.advanceTimersByTime(1000);
+    await waitFor(() => {
+      const container = screen.getByText('TagKey0').parentElement?.parentElement?.parentElement;
+      expect(container?.childNodes[0].textContent).toBe('ProcessKey0');
+      expect(container?.childNodes[1].textContent).toBe('ProcessKey1');
+      expect(container?.childNodes[2].textContent).toBe('TagKey0');
+      expect(container?.childNodes[3].textContent).toBe('TagKey1');
+      expect(container?.childNodes[4].textContent).toBe('LogKey0');
+      expect(container?.childNodes[5].textContent).toBe('LogKey1');
+    });
+  });
+
   it('should allow adding/removing tags', async () => {
     render(<SpanFiltersWithProps />);
     expect(screen.getAllByLabelText('Select tag key').length).toBe(1);
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
index 829c1778fb5..504668a5105 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
@@ -112,7 +112,8 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
 
   const getTagKeys = () => {
     if (!tagKeys) {
-      const keys: string[] = [];
+      let keys: string[] = [];
+      let logKeys: string[] = [];
 
       trace.spans.forEach((span) => {
         span.tags.forEach((tag) => {
@@ -124,18 +125,18 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
         if (span.logs !== null) {
           span.logs.forEach((log) => {
             log.fields.forEach((field) => {
-              keys.push(field.key);
+              logKeys.push(field.key);
             });
           });
         }
       });
+      keys = uniq(keys).sort();
+      logKeys = uniq(logKeys).sort();
 
       setTagKeys(
-        uniq(keys)
-          .sort()
-          .map((name) => {
-            return toOption(name);
-          })
+        [...keys, ...logKeys].map((name) => {
+          return toOption(name);
+        })
       );
     }
   };

From 7dbcd5ecd09d5ea0bd4e8c5cb704f6571e16db6f Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Tue, 25 Apr 2023 11:22:20 +0300
Subject: [PATCH 378/729] NestedFolders: Return full folder hierarchy in Folder
 response (#66835)

* Delete redundant struct

* Include parent folders in DTO

* Add test

* Update swagger
---
 pkg/api/dtos/folder.go       |  2 +
 pkg/api/folder.go            | 81 ++++++++++++++++++++-------------
 pkg/api/folder_test.go       | 86 ++++++++++++++++++++++++++++++++++++
 pkg/services/folder/model.go |  6 ---
 public/api-merged.json       |  7 +++
 public/openapi3.json         |  7 +++
 6 files changed, 153 insertions(+), 36 deletions(-)

diff --git a/pkg/api/dtos/folder.go b/pkg/api/dtos/folder.go
index a35167db214..6a8152343e4 100644
--- a/pkg/api/dtos/folder.go
+++ b/pkg/api/dtos/folder.go
@@ -24,6 +24,8 @@ type Folder struct {
 	AccessControl accesscontrol.Metadata `json:"accessControl,omitempty"`
 	// only used if nested folders are enabled
 	ParentUID string `json:"parentUid,omitempty"`
+	// the parent folders starting from the root going down
+	Parents []Folder `json:"parents,omitempty"`
 }
 
 type FolderSearchHit struct {
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index c2154956db6..ad15d5371ad 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -316,42 +316,63 @@ func (hs *HTTPServer) GetFolderChildrenCounts(c *contextmodel.ReqContext) respon
 
 	return response.JSON(http.StatusOK, counts)
 }
+func (hs *HTTPServer) newToFolderDto(c *contextmodel.ReqContext, g guardian.DashboardGuardian, f *folder.Folder) dtos.Folder {
+	ctx := c.Req.Context()
+	toDTO := func(f *folder.Folder) dtos.Folder {
+		canEdit, _ := g.CanEdit()
+		canSave, _ := g.CanSave()
+		canAdmin, _ := g.CanAdmin()
+		canDelete, _ := g.CanDelete()
 
-func (hs *HTTPServer) newToFolderDto(c *contextmodel.ReqContext, g guardian.DashboardGuardian, folder *folder.Folder) dtos.Folder {
-	canEdit, _ := g.CanEdit()
-	canSave, _ := g.CanSave()
-	canAdmin, _ := g.CanAdmin()
-	canDelete, _ := g.CanDelete()
+		// Finding creator and last updater of the folder
+		updater, creator := anonString, anonString
+		if f.CreatedBy > 0 {
+			creator = hs.getUserLogin(ctx, f.CreatedBy)
+		}
+		if f.UpdatedBy > 0 {
+			updater = hs.getUserLogin(ctx, f.UpdatedBy)
+		}
 
-	// Finding creator and last updater of the folder
-	updater, creator := anonString, anonString
-	if folder.CreatedBy > 0 {
-		creator = hs.getUserLogin(c.Req.Context(), folder.CreatedBy)
-	}
-	if folder.UpdatedBy > 0 {
-		updater = hs.getUserLogin(c.Req.Context(), folder.UpdatedBy)
+		acMetadata, _ := hs.getFolderACMetadata(c, f)
+
+		return dtos.Folder{
+			Id:            f.ID,
+			Uid:           f.UID,
+			Title:         f.Title,
+			Url:           f.URL,
+			HasACL:        f.HasACL,
+			CanSave:       canSave,
+			CanEdit:       canEdit,
+			CanAdmin:      canAdmin,
+			CanDelete:     canDelete,
+			CreatedBy:     creator,
+			Created:       f.Created,
+			UpdatedBy:     updater,
+			Updated:       f.Updated,
+			Version:       f.Version,
+			AccessControl: acMetadata,
+			ParentUID:     f.ParentUID,
+		}
 	}
 
-	acMetadata, _ := hs.getFolderACMetadata(c, folder)
+	folderDTO := toDTO(f)
 
-	return dtos.Folder{
-		Id:            folder.ID,
-		Uid:           folder.UID,
-		Title:         folder.Title,
-		Url:           folder.URL,
-		HasACL:        folder.HasACL,
-		CanSave:       canSave,
-		CanEdit:       canEdit,
-		CanAdmin:      canAdmin,
-		CanDelete:     canDelete,
-		CreatedBy:     creator,
-		Created:       folder.Created,
-		UpdatedBy:     updater,
-		Updated:       folder.Updated,
-		Version:       folder.Version,
-		AccessControl: acMetadata,
-		ParentUID:     folder.ParentUID,
+	if !hs.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
+		return folderDTO
 	}
+
+	parents, err := hs.folderService.GetParents(ctx, folder.GetParentsQuery{UID: f.UID, OrgID: f.OrgID})
+	if err != nil {
+		// log the error instead of failing
+		hs.log.Error("failed to fetch folder parents", "folder", f.UID, "org", f.OrgID, "error", err)
+	}
+
+	folderDTO.Parents = make([]dtos.Folder, 0, len(parents))
+	for _, f := range parents {
+		folderDTO.Parents = append(folderDTO.Parents, toDTO(f))
+	}
+
+	return folderDTO
 }
 
 func (hs *HTTPServer) getFolderACMetadata(c *contextmodel.ReqContext, f *folder.Folder) (accesscontrol.Metadata, error) {
diff --git a/pkg/api/folder_test.go b/pkg/api/folder_test.go
index 196023bb6ec..7d3b12f8808 100644
--- a/pkg/api/folder_test.go
+++ b/pkg/api/folder_test.go
@@ -422,3 +422,89 @@ func TestFolderMoveAPIEndpoint(t *testing.T) {
 		})
 	}
 }
+
+func TestFolderGetAPIEndpoint(t *testing.T) {
+	folderService := &foldertest.FakeService{
+		ExpectedFolder: &folder.Folder{
+			ID:    1,
+			UID:   "uid",
+			Title: "uid title",
+		},
+		ExpectedFolders: []*folder.Folder{
+			{
+				UID:   "parent",
+				Title: "parent title",
+			},
+			{
+				UID:   "subfolder",
+				Title: "subfolder title",
+			},
+		},
+	}
+	setUpRBACGuardian(t)
+
+	type testCase struct {
+		description          string
+		URL                  string
+		features             *featuremgmt.FeatureManager
+		expectedCode         int
+		expectedParentUIDs   []string
+		expectedParentTitles []string
+		permissions          []accesscontrol.Permission
+	}
+	tcs := []testCase{
+		{
+			description:          "get folder by UID should return parent folders if nested folder are enabled",
+			URL:                  "/api/folders/uid",
+			expectedCode:         http.StatusOK,
+			features:             featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+			expectedParentUIDs:   []string{"parent", "subfolder"},
+			expectedParentTitles: []string{"parent title", "subfolder title"},
+			permissions: []accesscontrol.Permission{
+				{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("uid")},
+			},
+		},
+		{
+			description:          "get folder by UID should not return parent folders if nested folder are disabled",
+			URL:                  "/api/folders/uid",
+			expectedCode:         http.StatusOK,
+			features:             featuremgmt.WithFeatures(),
+			expectedParentUIDs:   []string{},
+			expectedParentTitles: []string{},
+			permissions: []accesscontrol.Permission{
+				{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("uid")},
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		srv := SetupAPITestServer(t, func(hs *HTTPServer) {
+			hs.Cfg = &setting.Cfg{
+				RBACEnabled: true,
+			}
+			hs.Features = tc.features
+			hs.folderService = folderService
+		})
+
+		t.Run(tc.description, func(t *testing.T) {
+			req := srv.NewGetRequest(tc.URL)
+			req = webtest.RequestWithSignedInUser(req, userWithPermissions(1, tc.permissions))
+			resp, err := srv.Send(req)
+			require.NoError(t, err)
+			require.Equal(t, tc.expectedCode, resp.StatusCode)
+
+			folder := dtos.Folder{}
+			err = json.NewDecoder(resp.Body).Decode(&folder)
+			require.NoError(t, err)
+
+			require.Equal(t, len(folder.Parents), len(tc.expectedParentUIDs))
+			require.Equal(t, len(folder.Parents), len(tc.expectedParentTitles))
+
+			for i := 0; i < len(tc.expectedParentUIDs); i++ {
+				assert.Equal(t, tc.expectedParentUIDs[i], folder.Parents[i].Uid)
+				assert.Equal(t, tc.expectedParentTitles[i], folder.Parents[i].Title)
+			}
+			require.NoError(t, resp.Body.Close())
+		})
+	}
+}
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index 87dbb54ae10..1040c7a8088 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -48,12 +48,6 @@ func (f *Folder) IsGeneral() bool {
 	return f.ID == GeneralFolder.ID && f.Title == GeneralFolder.Title
 }
 
-type FolderDTO struct {
-	Folder
-
-	Children []FolderDTO
-}
-
 // NewFolder tales a title and returns a Folder with the Created and Updated
 // fields set to the current time.
 func NewFolder(title string, description string) *Folder {
diff --git a/public/api-merged.json b/public/api-merged.json
index c0d177f2a0b..93e06f99ba1 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -13565,6 +13565,13 @@
           "description": "only used if nested folders are enabled",
           "type": "string"
         },
+        "parents": {
+          "description": "the parent folders starting from the root going down",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Folder"
+          }
+        },
         "title": {
           "type": "string"
         },
diff --git a/public/openapi3.json b/public/openapi3.json
index 82c55adce95..635e242ae6e 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -4631,6 +4631,13 @@
             "description": "only used if nested folders are enabled",
             "type": "string"
           },
+          "parents": {
+            "description": "the parent folders starting from the root going down",
+            "items": {
+              "$ref": "#/components/schemas/Folder"
+            },
+            "type": "array"
+          },
           "title": {
             "type": "string"
           },

From 4d474e8e4fa15279c9ae7029a1a95f62c73f8075 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Tue, 25 Apr 2023 10:41:31 +0200
Subject: [PATCH 379/729] Fix icon size for data source picker list item
 (#67144)

---
 .../components/picker/DataSourceCard.tsx      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceCard.tsx b/public/app/features/datasources/components/picker/DataSourceCard.tsx
index 2e4c5ddc799..8c365909ab3 100644
--- a/public/app/features/datasources/components/picker/DataSourceCard.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceCard.tsx
@@ -17,13 +17,13 @@ export function DataSourceCard({ ds, onClick, selected }: DataSourceCardProps) {
     <Card key={ds.uid} onClick={onClick} className={cx(styles.card, selected ? styles.selected : undefined)}>
       <Card.Heading className={styles.heading}>
         <div className={styles.headingContent}>
-          <span className={styles.dsName}>{ds.name}</span>
-          <span className={styles.headingSeparator}>|</span>
-          <small className={styles.dsType}>{ds.meta.name}</small>
+          <span className={styles.name}>{ds.name}</span>
+          <span className={styles.separator}>|</span>
+          <small className={styles.type}>{ds.meta.name}</small>
         </div>
       </Card.Heading>
-      <Card.Figure>
-        <img src={ds.meta.info.logos.small} alt={`${ds.meta.name} Logo`} height="32" width="32" />
+      <Card.Figure className={styles.logo}>
+        <img src={ds.meta.info.logos.small} alt={`${ds.meta.name} Logo`} />
       </Card.Figure>
       <Card.Tags>{ds.isDefault ? <TagList tags={['default']} /> : null}</Card.Tags>
     </Card>
@@ -57,15 +57,19 @@ function getStyles(theme: GrafanaTheme2) {
       text-overflow: ellipsis;
       white-space: nowrap;
     `,
-    dsName: css`
+    logo: css`
+      width: 32px;
+      height: 32px;
+    `,
+    name: css`
       color: ${theme.colors.text.primary};
     `,
-    dsType: css`
+    type: css`
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
     `,
-    headingSeparator: css`
+    separator: css`
       margin: 0 ${theme.spacing(1)};
       color: ${theme.colors.border.weak};
     `,

From 44035ecbb2ae2807b9923bcf068e2e8993397a75 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Tue, 25 Apr 2023 10:42:04 +0200
Subject: [PATCH 380/729] Advanced DS Picker open Connections page when toggle
 is enabled (#67139)

---
 .../datasources/components/picker/DataSourceModal.tsx     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index da636b7aeae..a51c04b04e6 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -13,7 +13,10 @@ import {
   Input,
   Icon,
 } from '@grafana/ui';
+import { config } from 'app/core/config';
+import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants';
 import * as DFImport from 'app/features/dataframe-import';
+import { DATASOURCES_ROUTES } from 'app/features/datasources/constants';
 
 import { DataSourceList } from './DataSourceList';
 
@@ -35,6 +38,9 @@ export function DataSourceModal({
 }: DataSourceModalProps) {
   const styles = useStyles2(getDataSourceModalStyles);
   const [search, setSearch] = useState('');
+  const newDataSourceURL = config.featureToggles.dataConnectionsConsole
+    ? CONNECTIONS_ROUTES.DataSourcesNew
+    : DATASOURCES_ROUTES.New;
 
   return (
     <Modal
@@ -96,7 +102,7 @@ export function DataSourceModal({
           )}
         </div>
         <div className={styles.dsCTAs}>
-          <LinkButton variant="secondary" href={`datasources/new`}>
+          <LinkButton variant="secondary" href={newDataSourceURL}>
             Configure a new data source
           </LinkButton>
         </div>

From 64ee42d01ef779647e04fc88aa46673db38773f3 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Tue, 25 Apr 2023 11:19:20 +0200
Subject: [PATCH 381/729] Alerting: Add limits and move state and label
 matching filters to the BE (#66267)

* WIP

* Add instance totals to combined rule. Use totals to display instances stats in the UI

* WIP

* add global summaries, fix TS errors

* fix useCombined test

* fix test

* use activeAt from rule when available

* Fix NaN in global stats

* Add no data total to global summary

* Add totals recalculation for filtered rules

* Fix instances totals, remove instances filtering from alert list view

* Update tests

* Fetch alerts considering filtering label matchers

* WIP - Fetch alerts appending state filter to endpoint

* Fix multiple values for state in request being applyied

* fix test

* Calculate hidden by for grafana managed alerts

* Use INSTANCES_DISPLAY_LIMIT constant for limiting alert instances instead of 1

* Rename matchers parameter according to API changes

* Fix calculating total number of grafana instances

* Rename matcher prop after previous change

* Display button to remove max instances limit

* Change matcher query param to be an array of strings

* Add test for paramsWithMatcherAndState method

* Refactor matcher to be an string array to be consistent with state

* Use matcher query string as matcher object type (encoded JSON)

* Avoind encoding matcher parameters twice

* fix tests

* Enable toggle for the limit/show all button and restore limit and filters when we come back from custom view

* Move getMatcherListFromString method to utils/alertmanager.ts

* Fix limit toggle button being shown when it's not necessary

* Use filteredTotals from be response to calculate hidden by count

* Fix variables not being replaced correctly

* Fix total shown to be all the instances filtered without limits

* Adress some PR review comments

* Move paramsWithMatcherAndState inside prometheusUrlBuilder method

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
Co-authored-by: Virginia Cepeda <virginia.cepeda@grafana.com>
---
 .../unified/AlertsFolderView.test.tsx         |   5 +
 .../unified/PanelAlertTabContent.test.tsx     |  14 +-
 .../unified/RedirectToRuleViewer.test.tsx     |   8 +-
 .../features/alerting/unified/RuleList.tsx    |  15 +-
 .../features/alerting/unified/RuleViewer.tsx  |   6 +-
 .../alerting/unified/api/prometheus.test.ts   |  38 ++++
 .../alerting/unified/api/prometheus.ts        |  50 ++++-
 .../rule-editor/GrafanaEvaluationBehavior.tsx |   2 +-
 .../rules/EditRuleGroupModal.test.tsx         |   9 +-
 .../unified/components/rules/RuleDetails.tsx  |   2 +-
 .../RuleDetailsMatchingInstances.test.tsx     |  10 +-
 .../rules/RuleDetailsMatchingInstances.tsx    |  60 ++++--
 .../rules/RuleListGroupView.test.tsx          |   2 +
 .../unified/components/rules/RuleState.tsx    |   2 +-
 .../unified/components/rules/RuleStats.tsx    | 190 +++++++++---------
 .../components/rules/RulesGroup.test.tsx      |   3 +
 .../unified/components/rules/RulesGroup.tsx   |   4 +-
 .../hooks/useCombinedRuleNamespaces.test.ts   |   6 +
 .../hooks/useCombinedRuleNamespaces.ts        | 114 ++++++++++-
 .../unified/hooks/useFilteredRules.ts         |  25 ++-
 public/app/features/alerting/unified/mocks.ts |   8 +-
 .../alerting/unified/state/actions.ts         |  31 ++-
 .../alerting/unified/utils/alertmanager.ts    |   6 +-
 .../alerting/unified/utils/query.test.ts      |   6 +
 .../panel/alertlist/AlertInstances.tsx        |  79 +++++++-
 .../panel/alertlist/UnifiedAlertList.tsx      |  98 +++++++--
 .../panel/alertlist/UnifiedalertList.test.tsx |  15 +-
 public/app/plugins/panel/alertlist/types.ts   |   2 +-
 .../unified-alerting/UngroupedView.tsx        |  31 ++-
 public/app/types/unified-alerting-dto.ts      |   7 +-
 public/app/types/unified-alerting.ts          |  26 +++
 31 files changed, 685 insertions(+), 189 deletions(-)
 create mode 100644 public/app/features/alerting/unified/api/prometheus.test.ts

diff --git a/public/app/features/alerting/unified/AlertsFolderView.test.tsx b/public/app/features/alerting/unified/AlertsFolderView.test.tsx
index 7c09245f377..f7de4aedb8d 100644
--- a/public/app/features/alerting/unified/AlertsFolderView.test.tsx
+++ b/public/app/features/alerting/unified/AlertsFolderView.test.tsx
@@ -58,6 +58,7 @@ describe('AlertsFolderView tests', () => {
             mockCombinedRule({ name: 'Test Alert 2' }),
             mockCombinedRule({ name: 'Test Alert 3' }),
           ],
+          totals: {},
         },
         {
           name: 'group2',
@@ -66,6 +67,7 @@ describe('AlertsFolderView tests', () => {
             mockCombinedRule({ name: 'Test Alert 5' }),
             mockCombinedRule({ name: 'Test Alert 6' }),
           ],
+          totals: {},
         },
       ],
     };
@@ -104,6 +106,7 @@ describe('AlertsFolderView tests', () => {
             mockCombinedRule({ name: 'Test Alert from other folder 1' }),
             mockCombinedRule({ name: 'Test Alert from other folder 2' }),
           ],
+          totals: {},
         },
       ],
     };
@@ -132,6 +135,7 @@ describe('AlertsFolderView tests', () => {
         {
           name: 'default',
           rules: [mockCombinedRule({ name: 'CPU Alert' }), mockCombinedRule({ name: 'RAM usage alert' })],
+          totals: {},
         },
       ],
     };
@@ -166,6 +170,7 @@ describe('AlertsFolderView tests', () => {
             mockCombinedRule({ name: 'CPU Alert', labels: {} }),
             mockCombinedRule({ name: 'RAM usage alert', labels: { severity: 'critical' } }),
           ],
+          totals: {},
         },
       ],
     };
diff --git a/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx b/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx
index 7745083f61a..c350e122493 100644
--- a/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx
+++ b/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx
@@ -319,10 +319,16 @@ describe('PanelAlertTabContent', () => {
         panelId: panel.id,
       }
     );
-    expect(mocks.api.fetchRules).toHaveBeenCalledWith(GRAFANA_RULES_SOURCE_NAME, {
-      dashboardUID: dashboard.uid,
-      panelId: panel.id,
-    });
+    expect(mocks.api.fetchRules).toHaveBeenCalledWith(
+      GRAFANA_RULES_SOURCE_NAME,
+      {
+        dashboardUID: dashboard.uid,
+        panelId: panel.id,
+      },
+      undefined,
+      undefined,
+      undefined
+    );
   });
 
   it('Update NewRuleFromPanel button url when template changes', async () => {
diff --git a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx
index 2dcbcf1a381..36d917e6dca 100644
--- a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx
+++ b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx
@@ -10,8 +10,8 @@ import { CombinedRule, Rule } from '../../../types/unified-alerting';
 import { PromRuleType } from '../../../types/unified-alerting-dto';
 
 import { RedirectToRuleViewer } from './RedirectToRuleViewer';
-import { useCombinedRulesMatching } from './hooks/useCombinedRule';
 import * as combinedRuleHooks from './hooks/useCombinedRule';
+import { useCombinedRulesMatching } from './hooks/useCombinedRule';
 import { getRulesSourceByName } from './utils/datasource';
 
 jest.mock('./hooks/useCombinedRule');
@@ -119,6 +119,7 @@ const mockedRules: CombinedRule[] = [
     group: {
       name: 'test',
       rules: [],
+      totals: {},
     },
     promRule: {
       health: 'ok',
@@ -140,6 +141,8 @@ const mockedRules: CombinedRule[] = [
         readOnly: false,
       },
     },
+    instanceTotals: {},
+    filteredInstanceTotals: {},
   },
   {
     name: 'Cloud test alert',
@@ -149,6 +152,7 @@ const mockedRules: CombinedRule[] = [
     group: {
       name: 'test',
       rules: [],
+      totals: {},
     },
     promRule: {
       health: 'ok',
@@ -170,5 +174,7 @@ const mockedRules: CombinedRule[] = [
         readOnly: false,
       },
     },
+    instanceTotals: {},
+    filteredInstanceTotals: {},
   },
 ];
diff --git a/public/app/features/alerting/unified/RuleList.tsx b/public/app/features/alerting/unified/RuleList.tsx
index ca3236c7be4..1a566e19dc6 100644
--- a/public/app/features/alerting/unified/RuleList.tsx
+++ b/public/app/features/alerting/unified/RuleList.tsx
@@ -15,6 +15,7 @@ import { CombinedRuleNamespace } from '../../../types/unified-alerting';
 import { LogMessages } from './Analytics';
 import { AlertingPageWrapper } from './components/AlertingPageWrapper';
 import { NoRulesSplash } from './components/rules/NoRulesCTA';
+import { INSTANCES_DISPLAY_LIMIT } from './components/rules/RuleDetails';
 import { RuleListErrors } from './components/rules/RuleListErrors';
 import { RuleListGroupView } from './components/rules/RuleListGroupView';
 import { RuleListStateView } from './components/rules/RuleListStateView';
@@ -34,6 +35,9 @@ const VIEWS = {
   state: RuleListStateView,
 };
 
+// make sure we ask for 1 more so we show the "show x more" button
+const LIMIT_ALERTS = INSTANCES_DISPLAY_LIMIT + 1;
+
 const RuleList = withErrorBoundary(
   () => {
     const dispatch = useDispatch();
@@ -68,17 +72,18 @@ const RuleList = withErrorBoundary(
     );
     const allPromEmpty = promRequests.every(([_, state]) => state.dispatched && state?.result?.length === 0);
 
+    const limitAlerts = hasActiveFilters ? undefined : LIMIT_ALERTS;
     // Trigger data refresh only when the RULE_LIST_POLL_INTERVAL_MS elapsed since the previous load FINISHED
     const [_, fetchRules] = useAsyncFn(async () => {
       if (!loading) {
-        await dispatch(fetchAllPromAndRulerRulesAction());
+        await dispatch(fetchAllPromAndRulerRulesAction(false, { limitAlerts }));
       }
-    }, [loading]);
+    }, [loading, limitAlerts, dispatch]);
 
     // fetch rules, then poll every RULE_LIST_POLL_INTERVAL_MS
     useEffect(() => {
-      dispatch(fetchAllPromAndRulerRulesAction());
-    }, [dispatch]);
+      dispatch(fetchAllPromAndRulerRulesAction(false, { limitAlerts }));
+    }, [dispatch, limitAlerts]);
     useInterval(fetchRules, RULE_LIST_POLL_INTERVAL_MS);
 
     // Show splash only when we loaded all of the data sources and none of them has alerts
@@ -108,7 +113,7 @@ const RuleList = withErrorBoundary(
                     {expandAll ? 'Collapse all' : 'Expand all'}
                   </Button>
                 )}
-                <RuleStats namespaces={filteredNamespaces} includeTotal />
+                <RuleStats namespaces={filteredNamespaces} />
               </div>
               <Stack direction="row" gap={0.5}>
                 {canReadProvisioning && (
diff --git a/public/app/features/alerting/unified/RuleViewer.tsx b/public/app/features/alerting/unified/RuleViewer.tsx
index 1737b144d92..5878dad64bf 100644
--- a/public/app/features/alerting/unified/RuleViewer.tsx
+++ b/public/app/features/alerting/unified/RuleViewer.tsx
@@ -199,7 +199,11 @@ export function RuleViewer({ match }: RuleViewerProps) {
           </div>
         </div>
         <div>
-          <RuleDetailsMatchingInstances rule={rule} pagination={{ itemsPerPage: DEFAULT_PER_PAGE_PAGINATION }} />
+          <RuleDetailsMatchingInstances
+            rule={rule}
+            pagination={{ itemsPerPage: DEFAULT_PER_PAGE_PAGINATION }}
+            enableFiltering
+          />
         </div>
       </RuleViewerLayoutContent>
       <Collapse
diff --git a/public/app/features/alerting/unified/api/prometheus.test.ts b/public/app/features/alerting/unified/api/prometheus.test.ts
new file mode 100644
index 00000000000..ec51ba751fe
--- /dev/null
+++ b/public/app/features/alerting/unified/api/prometheus.test.ts
@@ -0,0 +1,38 @@
+import { paramsWithMatcherAndState } from './prometheus';
+
+const matcher = [{ name: 'severity', isRegex: false, isEqual: true, value: 'critical' }];
+const matcherToJson = matcher.map((m) => JSON.stringify(m));
+const matchers = [...matcher, { name: 'label1', isRegex: false, isEqual: true, value: 'hello there' }];
+const matchersToJson = matchers.map((m) => JSON.stringify(m));
+
+describe('paramsWithMatcherAndState method', () => {
+  it('Should return same params object with no changes if there are no states nor matchers', () => {
+    const params: Record<string, string | string[]> = { hello: 'there', bye: 'bye' };
+    expect(paramsWithMatcherAndState(params)).toStrictEqual(params);
+  });
+  it('Should return params object with state if there are states and no matchers', () => {
+    const params: Record<string, string | string[]> = { hello: 'there', bye: 'bye' };
+    const state: string[] = ['firing', 'pending'];
+    expect(paramsWithMatcherAndState(params, state)).toStrictEqual({ ...params, state: state });
+  });
+  it('Should return params object with state if there are matchers and no states', () => {
+    const params: Record<string, string | string[]> = { hello: 'there', bye: 'bye' };
+    expect(paramsWithMatcherAndState(params, undefined, matcher)).toStrictEqual({
+      ...params,
+      matcher: matcherToJson,
+    });
+    expect(paramsWithMatcherAndState(params, undefined, matchers)).toStrictEqual({
+      ...params,
+      matcher: matchersToJson,
+    });
+  });
+  it('Should return params object with stateand matchers if there are states and matchers', () => {
+    const params: Record<string, string | string[]> = { hello: 'there', bye: 'bye' };
+    const state: string[] = ['firing', 'pending'];
+    expect(paramsWithMatcherAndState(params, state, matchers)).toStrictEqual({
+      ...params,
+      state: state,
+      matcher: matchersToJson,
+    });
+  });
+});
diff --git a/public/app/features/alerting/unified/api/prometheus.ts b/public/app/features/alerting/unified/api/prometheus.ts
index b14373b5fc7..1e7a88c7d0f 100644
--- a/public/app/features/alerting/unified/api/prometheus.ts
+++ b/public/app/features/alerting/unified/api/prometheus.ts
@@ -1,6 +1,7 @@
 import { lastValueFrom } from 'rxjs';
 
 import { getBackendSrv } from '@grafana/runtime';
+import { Matcher } from 'app/plugins/datasource/alertmanager/types';
 import { RuleNamespace } from 'app/types/unified-alerting';
 import { PromRulesResponse } from 'app/types/unified-alerting-dto';
 
@@ -13,19 +14,27 @@ export interface FetchPromRulesFilter {
 
 export interface PrometheusDataSourceConfig {
   dataSourceName: string;
+  limitAlerts?: number;
 }
 
 export function prometheusUrlBuilder(dataSourceConfig: PrometheusDataSourceConfig) {
-  const { dataSourceName } = dataSourceConfig;
+  const { dataSourceName, limitAlerts } = dataSourceConfig;
 
   return {
-    rules: (filter?: FetchPromRulesFilter) => {
+    rules: (filter?: FetchPromRulesFilter, state?: string[], matcher?: Matcher[]) => {
       const searchParams = new URLSearchParams();
+
+      // if we're fetching for Grafana managed rules, we should add a limit to the number of alert instances
+      // we do this because the response is large otherwise and we don't show all of them in the UI anyway.
+      if (dataSourceName === GRAFANA_RULES_SOURCE_NAME && limitAlerts) {
+        searchParams.set('limit_alerts', String(limitAlerts));
+      }
+
       const params = prepareRulesFilterQueryParams(searchParams, filter);
 
       return {
         url: `/api/prometheus/${getDatasourceAPIUid(dataSourceName)}/api/v1/rules`,
-        params: params,
+        params: paramsWithMatcherAndState(params, state, matcher),
       };
     },
   };
@@ -45,17 +54,46 @@ export function prepareRulesFilterQueryParams(
   return Object.fromEntries(params);
 }
 
-export async function fetchRules(dataSourceName: string, filter?: FetchPromRulesFilter): Promise<RuleNamespace[]> {
+export function paramsWithMatcherAndState(
+  params: Record<string, string | string[]>,
+  state?: string[],
+  matchers?: Matcher[]
+) {
+  let paramsResult = { ...params };
+
+  if (state?.length) {
+    paramsResult = { ...paramsResult, state };
+  }
+
+  if (matchers?.length) {
+    const matcherToJsonString: string[] = matchers.map((m) => JSON.stringify(m));
+    paramsResult = {
+      ...paramsResult,
+      matcher: matcherToJsonString,
+    };
+  }
+
+  return paramsResult;
+}
+
+export async function fetchRules(
+  dataSourceName: string,
+  filter?: FetchPromRulesFilter,
+  limitAlerts?: number,
+  matcher?: Matcher[],
+  state?: string[]
+): Promise<RuleNamespace[]> {
   if (filter?.dashboardUID && dataSourceName !== GRAFANA_RULES_SOURCE_NAME) {
     throw new Error('Filtering by dashboard UID is only supported for Grafana Managed rules.');
   }
 
-  const { url, params } = prometheusUrlBuilder({ dataSourceName }).rules(filter);
+  const { url, params } = prometheusUrlBuilder({ dataSourceName, limitAlerts }).rules(filter, state, matcher);
 
+  // adding state param here instead of adding it in prometheusUrlBuilder, for being a possible multiple query param
   const response = await lastValueFrom(
     getBackendSrv().fetch<PromRulesResponse>({
       url,
-      params,
+      params: params,
       showErrorAlert: false,
       showSuccessAlert: false,
     })
diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
index a1d5feab2b2..94bb9d33f1a 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
@@ -162,7 +162,7 @@ function FolderGroupAndEvaluationInterval({
     rulesSource: GRAFANA_RULES_SOURCE_NAME,
     groups: [],
   };
-  const emptyGroup: CombinedRuleGroup = { name: groupName, interval: evaluateEvery, rules: [] };
+  const emptyGroup: CombinedRuleGroup = { name: groupName, interval: evaluateEvery, rules: [], totals: {} };
 
   return (
     <div>
diff --git a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.test.tsx b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.test.tsx
index 79c54e4023f..77631b55177 100644
--- a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.test.tsx
@@ -60,7 +60,7 @@ describe('EditGroupModal', () => {
     const namespace = mockCombinedRuleNamespace({
       name: 'my-alerts',
       rulesSource: mockDataSource(),
-      groups: [{ name: 'default-group', interval: '90s', rules: [] }],
+      groups: [{ name: 'default-group', interval: '90s', rules: [], totals: {} }],
     });
 
     const group = namespace.groups[0];
@@ -100,7 +100,9 @@ describe('EditGroupModal component on cloud alert rules', () => {
     const promNs = mockCombinedRuleNamespace({
       name: 'prometheus-ns',
       rulesSource: promDsSettings,
-      groups: [{ name: 'default-group', interval: '90s', rules: [alertingRule, recordingRule1, recordingRule2] }],
+      groups: [
+        { name: 'default-group', interval: '90s', rules: [alertingRule, recordingRule1, recordingRule2], totals: {} },
+      ],
     });
 
     const group = promNs.groups[0];
@@ -121,7 +123,7 @@ describe('EditGroupModal component on cloud alert rules', () => {
     const promNs = mockCombinedRuleNamespace({
       name: 'prometheus-ns',
       rulesSource: promDsSettings,
-      groups: [{ name: 'default-group', interval: '90s', rules: [recordingRule1, recordingRule2] }],
+      groups: [{ name: 'default-group', interval: '90s', rules: [recordingRule1, recordingRule2], totals: {} }],
     });
 
     const group = promNs.groups[0];
@@ -154,6 +156,7 @@ describe('EditGroupModal component on grafana-managed alert rules', () => {
             rulerRule: mockRulerAlertingRule({ alert: 'high-memory' }),
           }),
         ],
+        totals: {},
       },
     ],
   };
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetails.tsx b/public/app/features/alerting/unified/components/rules/RuleDetails.tsx
index 7899ac4ac30..c38efc5bd45 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetails.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetails.tsx
@@ -25,7 +25,7 @@ interface Props {
 // The limit is set to 15 in order to upkeep the good performance
 // and to encourage users to go to the rule details page to see the rest of the instances
 // We don't want to paginate the instances list on the alert list page
-const INSTANCES_DISPLAY_LIMIT = 15;
+export const INSTANCES_DISPLAY_LIMIT = 15;
 
 export const RuleDetails = ({ rule }: Props) => {
   const styles = useStyles2(getStyles);
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
index 4c7cfd599b7..d3d5b197067 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
@@ -32,7 +32,7 @@ describe('RuleDetailsMatchingInstances', () => {
     it('For Grafana Managed rules instances filter should contain five states', () => {
       const rule = mockCombinedRule();
 
-      render(<RuleDetailsMatchingInstances rule={rule} />);
+      render(<RuleDetailsMatchingInstances rule={rule} enableFiltering />);
 
       const stateFilter = ui.stateFilter.get();
       expect(stateFilter).toBeInTheDocument();
@@ -69,7 +69,7 @@ describe('RuleDetailsMatchingInstances', () => {
         [GrafanaAlertState.Error]: ui.grafanaStateButton.error,
       };
 
-      render(<RuleDetailsMatchingInstances rule={rule} />);
+      render(<RuleDetailsMatchingInstances rule={rule} enableFiltering />);
 
       await userEvent.click(buttons[state].get());
 
@@ -82,7 +82,7 @@ describe('RuleDetailsMatchingInstances', () => {
         namespace: mockPromNamespace(),
       });
 
-      render(<RuleDetailsMatchingInstances rule={rule} />);
+      render(<RuleDetailsMatchingInstances rule={rule} enableFiltering />);
 
       const stateFilter = ui.stateFilter.get();
       expect(stateFilter).toBeInTheDocument();
@@ -108,7 +108,7 @@ describe('RuleDetailsMatchingInstances', () => {
           }),
         });
 
-        render(<RuleDetailsMatchingInstances rule={rule} />);
+        render(<RuleDetailsMatchingInstances rule={rule} enableFiltering />);
 
         await userEvent.click(ui.cloudStateButton[state].get());
 
@@ -122,7 +122,7 @@ describe('RuleDetailsMatchingInstances', () => {
 function mockPromNamespace(): CombinedRuleNamespace {
   return {
     rulesSource: mockDataSource(),
-    groups: [{ name: 'Prom rules group', rules: [] }],
+    groups: [{ name: 'Prom rules group', rules: [], totals: {} }],
     name: 'Prometheus-test',
   };
 }
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
index f9bbf24de4b..c52170a4d6c 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
@@ -1,5 +1,5 @@
 import { css, cx } from '@emotion/css';
-import { countBy } from 'lodash';
+import { countBy, sum } from 'lodash';
 import React, { useMemo, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
@@ -20,11 +20,13 @@ import { isAlertingRule } from '../../utils/rules';
 import { DetailsField } from '../DetailsField';
 
 import { AlertInstancesTable } from './AlertInstancesTable';
+import { getComponentsFromStats } from './RuleStats';
 
 interface Props {
   rule: CombinedRule;
   pagination?: PaginationProps;
   itemsDisplayLimit?: number;
+  enableFiltering?: boolean;
 }
 
 interface ShowMoreStats {
@@ -52,9 +54,10 @@ function ShowMoreInstances(props: { ruleViewPageLink: string; stats: ShowMoreSta
 
 export function RuleDetailsMatchingInstances(props: Props): JSX.Element | null {
   const {
-    rule: { promRule, namespace },
+    rule: { promRule, namespace, instanceTotals },
     itemsDisplayLimit = Number.POSITIVE_INFINITY,
     pagination,
+    enableFiltering = false,
   } = props;
 
   const [queryString, setQueryString] = useState<string>();
@@ -82,40 +85,45 @@ export function RuleDetailsMatchingInstances(props: Props): JSX.Element | null {
 
   const visibleInstances = alerts.slice(0, itemsDisplayLimit);
 
+  // Count All By State is used only when filtering is enabled and we have access to all instances
   const countAllByState = countBy(promRule.alerts, (alert) => mapStateWithReasonToBaseState(alert.state));
-  const hiddenItemsCount = alerts.length - visibleInstances.length;
+  const totalInstancesCount = sum(Object.values(instanceTotals));
+  const hiddenInstancesCount = totalInstancesCount - visibleInstances.length;
 
   const stats: ShowMoreStats = {
-    totalItemsCount: alerts.length,
+    totalItemsCount: totalInstancesCount,
     visibleItemsCount: visibleInstances.length,
   };
 
   const ruleViewPageLink = createViewLink(namespace.rulesSource, props.rule, location.pathname + location.search);
+  const statsComponents = getComponentsFromStats(instanceTotals);
 
-  const footerRow = hiddenItemsCount ? (
+  const footerRow = hiddenInstancesCount ? (
     <ShowMoreInstances stats={stats} ruleViewPageLink={ruleViewPageLink} />
   ) : undefined;
 
   return (
     <DetailsField label="Matching instances" horizontal={true}>
-      <div className={cx(styles.flexRow, styles.spaceBetween)}>
-        <div className={styles.flexRow}>
-          <MatcherFilter
-            className={styles.rowChild}
-            key={queryStringKey}
-            defaultQueryString={queryString}
-            onFilterChange={(value) => setQueryString(value)}
-          />
-          <AlertInstanceStateFilter
-            className={styles.rowChild}
-            filterType={stateFilterType}
-            stateFilter={alertState}
-            onStateFilterChange={setAlertState}
-            itemPerStateStats={countAllByState}
-          />
+      {enableFiltering && (
+        <div className={cx(styles.flexRow, styles.spaceBetween)}>
+          <div className={styles.flexRow}>
+            <MatcherFilter
+              className={styles.rowChild}
+              key={queryStringKey}
+              defaultQueryString={queryString}
+              onFilterChange={(value) => setQueryString(value)}
+            />
+            <AlertInstanceStateFilter
+              className={styles.rowChild}
+              filterType={stateFilterType}
+              stateFilter={alertState}
+              onStateFilterChange={setAlertState}
+              itemPerStateStats={countAllByState}
+            />
+          </div>
         </div>
-      </div>
-
+      )}
+      {!enableFiltering && <div className={styles.stats}>{statsComponents}</div>}
       <AlertInstancesTable instances={visibleInstances} pagination={pagination} footerRow={footerRow} />
     </DetailsField>
   );
@@ -164,5 +172,13 @@ const getStyles = (theme: GrafanaTheme2) => {
       align-items: center;
       width: 100%;
     `,
+    instancesContainer: css`
+      margin-bottom: ${theme.spacing(2)};
+    `,
+    stats: css`
+      display: flex;
+      gap: ${theme.spacing(1)};
+      padding: ${theme.spacing(1, 0)};
+    `,
   };
 };
diff --git a/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx b/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx
index 82ffb120c84..9d0c05fac86 100644
--- a/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx
@@ -116,6 +116,7 @@ function getGrafanaNamespace(): CombinedRuleNamespace {
       {
         name: 'default',
         rules: [mockCombinedRule()],
+        totals: {},
       },
     ],
   };
@@ -129,6 +130,7 @@ function getCloudNamespace(): CombinedRuleNamespace {
       {
         name: 'Prom group',
         rules: [mockCombinedRule()],
+        totals: {},
       },
     ],
   };
diff --git a/public/app/features/alerting/unified/components/rules/RuleState.tsx b/public/app/features/alerting/unified/components/rules/RuleState.tsx
index a16c8324ead..11d95a99982 100644
--- a/public/app/features/alerting/unified/components/rules/RuleState.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleState.tsx
@@ -31,7 +31,7 @@ export const RuleState = ({ rule, isDeleting, isCreating, isPaused }: Props) =>
       promRule.state !== PromAlertingRuleState.Inactive
     ) {
       // find earliest alert
-      const firstActiveAt = getFirstActiveAt(promRule);
+      const firstActiveAt = promRule.activeAt ? new Date(promRule.activeAt) : getFirstActiveAt(promRule);
 
       // calculate time elapsed from earliest alert
       if (firstActiveAt) {
diff --git a/public/app/features/alerting/unified/components/rules/RuleStats.tsx b/public/app/features/alerting/unified/components/rules/RuleStats.tsx
index 11fb219cef5..46148dee699 100644
--- a/public/app/features/alerting/unified/components/rules/RuleStats.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleStats.tsx
@@ -1,121 +1,77 @@
+import { isUndefined, omitBy, sum } from 'lodash';
 import pluralize from 'pluralize';
-import React, { Fragment, useState } from 'react';
-import { useDebounce } from 'react-use';
+import React, { Fragment } from 'react';
 
 import { Stack } from '@grafana/experimental';
 import { Badge } from '@grafana/ui';
-import { CombinedRule, CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-alerting';
+import {
+  AlertGroupTotals,
+  AlertInstanceTotalState,
+  CombinedRuleGroup,
+  CombinedRuleNamespace,
+} from 'app/types/unified-alerting';
 import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
-import { isAlertingRule, isRecordingRule, isRecordingRulerRule, isGrafanaRulerRulePaused } from '../../utils/rules';
-
 interface Props {
-  includeTotal?: boolean;
-  group?: CombinedRuleGroup;
-  namespaces?: CombinedRuleNamespace[];
+  namespaces: CombinedRuleNamespace[];
 }
 
-const emptyStats = {
-  total: 0,
+// All available states for a rule need to be initialized to prevent NaN values when adding a number and undefined
+const emptyStats: Required<AlertGroupTotals> = {
   recording: 0,
-  [PromAlertingRuleState.Firing]: 0,
+  alerting: 0,
   [PromAlertingRuleState.Pending]: 0,
   [PromAlertingRuleState.Inactive]: 0,
   paused: 0,
   error: 0,
-} as const;
+  nodata: 0,
+};
 
-export const RuleStats = ({ group, namespaces, includeTotal }: Props) => {
-  const evaluationInterval = group?.interval;
-  const [calculated, setCalculated] = useState(emptyStats);
+export const RuleStats = ({ namespaces }: Props) => {
+  const stats = { ...emptyStats };
 
-  // Performance optimization allowing reducing number of stats calculation
-  // The problem occurs when we load many data sources.
-  // Then redux store gets updated multiple times in a pretty short period, triggering calculating stats many times.
-  // debounce allows to skip calculations which results would be abandoned in milliseconds
-  useDebounce(
-    () => {
-      const stats = { ...emptyStats };
-
-      const calcRule = (rule: CombinedRule) => {
-        if (rule.promRule && isAlertingRule(rule.promRule)) {
-          if (isGrafanaRulerRulePaused(rule)) {
-            stats.paused += 1;
-          }
-          stats[rule.promRule.state] += 1;
-        }
-        if (ruleHasError(rule)) {
-          stats.error += 1;
-        }
-        if (
-          (rule.promRule && isRecordingRule(rule.promRule)) ||
-          (rule.rulerRule && isRecordingRulerRule(rule.rulerRule))
-        ) {
-          stats.recording += 1;
-        }
-        stats.total += 1;
-      };
-
-      if (group) {
-        group.rules.forEach(calcRule);
+  // sum all totals for all namespaces
+  namespaces.forEach(({ groups }) => {
+    groups.forEach((group) => {
+      const groupTotals = omitBy(group.totals, isUndefined);
+      for (let key in groupTotals) {
+        // @ts-ignore
+        stats[key] += groupTotals[key];
       }
+    });
+  });
 
-      if (namespaces) {
-        namespaces.forEach((namespace) => namespace.groups.forEach((group) => group.rules.forEach(calcRule)));
-      }
+  const statsComponents = getComponentsFromStats(stats);
+  const hasStats = Boolean(statsComponents.length);
 
-      setCalculated(stats);
-    },
-    400,
-    [group, namespaces]
+  const total = sum(Object.values(stats));
+
+  statsComponents.unshift(
+    <Fragment key="total">
+      {total} {pluralize('rule', total)}
+    </Fragment>
   );
 
-  const statsComponents: React.ReactNode[] = [];
+  return (
+    <Stack direction="row">
+      {hasStats && (
+        <div>
+          <Stack gap={0.5}>{statsComponents}</Stack>
+        </div>
+      )}
+    </Stack>
+  );
+};
 
-  if (includeTotal) {
-    statsComponents.push(
-      <Fragment key="total">
-        {calculated.total} {pluralize('rule', calculated.total)}
-      </Fragment>
-    );
-  }
+interface RuleGroupStatsProps {
+  group: CombinedRuleGroup;
+}
 
-  if (calculated[PromAlertingRuleState.Firing]) {
-    statsComponents.push(
-      <Badge color="red" key="firing" text={`${calculated[PromAlertingRuleState.Firing]} firing`} />
-    );
-  }
-
-  if (calculated.error) {
-    statsComponents.push(<Badge color="red" key="errors" text={`${calculated.error} errors`} />);
-  }
-
-  if (calculated[PromAlertingRuleState.Pending]) {
-    statsComponents.push(
-      <Badge color={'orange'} key="pending" text={`${calculated[PromAlertingRuleState.Pending]} pending`} />
-    );
-  }
-
-  if (calculated[PromAlertingRuleState.Inactive] && calculated.paused) {
-    statsComponents.push(
-      <Badge
-        color="green"
-        key="paused"
-        text={`${calculated[PromAlertingRuleState.Inactive]} normal (${calculated.paused} paused)`}
-      />
-    );
-  }
-
-  if (calculated[PromAlertingRuleState.Inactive] && !calculated.paused) {
-    statsComponents.push(
-      <Badge color="green" key="inactive" text={`${calculated[PromAlertingRuleState.Inactive]} normal`} />
-    );
-  }
-
-  if (calculated.recording) {
-    statsComponents.push(<Badge color="purple" key="recording" text={`${calculated.recording} recording`} />);
-  }
+export const RuleGroupStats = ({ group }: RuleGroupStatsProps) => {
+  const stats = group.totals;
+  const evaluationInterval = group?.interval;
 
+  const statsComponents = getComponentsFromStats(stats);
   const hasStats = Boolean(statsComponents.length);
 
   return (
@@ -135,6 +91,48 @@ export const RuleStats = ({ group, namespaces, includeTotal }: Props) => {
   );
 };
 
-function ruleHasError(rule: CombinedRule) {
-  return rule.promRule?.health === 'err' || rule.promRule?.health === 'error';
+export function getComponentsFromStats(
+  stats: Partial<Record<AlertInstanceTotalState | 'paused' | 'recording', number>>
+) {
+  const statsComponents: React.ReactNode[] = [];
+
+  if (stats[AlertInstanceTotalState.Alerting]) {
+    statsComponents.push(<Badge color="red" key="firing" text={`${stats[AlertInstanceTotalState.Alerting]} firing`} />);
+  }
+
+  if (stats.error) {
+    statsComponents.push(<Badge color="red" key="errors" text={`${stats.error} errors`} />);
+  }
+
+  if (stats.nodata) {
+    statsComponents.push(<Badge color="blue" key="nodata" text={`${stats.nodata} no data`} />);
+  }
+
+  if (stats[AlertInstanceTotalState.Pending]) {
+    statsComponents.push(
+      <Badge color={'orange'} key="pending" text={`${stats[AlertInstanceTotalState.Pending]} pending`} />
+    );
+  }
+
+  if (stats[AlertInstanceTotalState.Normal] && stats.paused) {
+    statsComponents.push(
+      <Badge
+        color="green"
+        key="paused"
+        text={`${stats[AlertInstanceTotalState.Normal]} normal (${stats.paused} paused)`}
+      />
+    );
+  }
+
+  if (stats[AlertInstanceTotalState.Normal] && !stats.paused) {
+    statsComponents.push(
+      <Badge color="green" key="inactive" text={`${stats[AlertInstanceTotalState.Normal]} normal`} />
+    );
+  }
+
+  if (stats.recording) {
+    statsComponents.push(<Badge color="purple" key="recording" text={`${stats.recording} recording`} />);
+  }
+
+  return statsComponents;
 }
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
index 0d4f7277d13..fd6fcdb9112 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
@@ -62,6 +62,7 @@ describe('Rules group tests', () => {
     const group: CombinedRuleGroup = {
       name: 'TestGroup',
       rules: [mockCombinedRule()],
+      totals: {},
     };
 
     const namespace: CombinedRuleNamespace = {
@@ -89,6 +90,7 @@ describe('Rules group tests', () => {
     const group: CombinedRuleGroup = {
       name: 'TestGroup',
       rules: [mockCombinedRule()],
+      totals: {},
     };
 
     const namespace: CombinedRuleNamespace = {
@@ -147,6 +149,7 @@ describe('Rules group tests', () => {
     const group: CombinedRuleGroup = {
       name: 'TestGroup',
       rules: [mockCombinedRule()],
+      totals: {},
     };
 
     const namespace: CombinedRuleNamespace = {
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
index 3e6a5b51493..b0cd0856f07 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
@@ -23,7 +23,7 @@ import { RuleLocation } from '../RuleLocation';
 import { ActionIcon } from './ActionIcon';
 import { EditCloudGroupModal } from './EditRuleGroupModal';
 import { ReorderCloudGroupModal } from './ReorderRuleGroupModal';
-import { RuleStats } from './RuleStats';
+import { RuleGroupStats } from './RuleStats';
 import { RulesTable } from './RulesTable';
 
 type ViewMode = 'grouped' | 'list';
@@ -217,7 +217,7 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
         }
         <div className={styles.spacer} />
         <div className={styles.headerStats}>
-          <RuleStats group={group} />
+          <RuleGroupStats group={group} />
         </div>
         {isProvisioned && (
           <>
diff --git a/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.test.ts b/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.test.ts
index 544b2837855..bbffb07382b 100644
--- a/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.test.ts
+++ b/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.test.ts
@@ -8,22 +8,26 @@ describe('flattenGrafanaManagedRules', () => {
     const ungroupedGroup1 = {
       name: 'my-rule',
       rules: [{ name: 'my-rule' }],
+      totals: {},
     } as CombinedRuleGroup;
 
     const ungroupedGroup2 = {
       name: 'another-rule',
       rules: [{ name: 'another-rule' }],
+      totals: {},
     } as CombinedRuleGroup;
 
     // the rules from both these groups should go in their own group name
     const group1 = {
       name: 'group1',
       rules: [{ name: 'rule-1' }, { name: 'rule-2' }],
+      totals: {},
     } as CombinedRuleGroup;
 
     const group2 = {
       name: 'group2',
       rules: [{ name: 'rule-1' }, { name: 'rule-2' }],
+      totals: {},
     } as CombinedRuleGroup;
 
     const namespace1 = {
@@ -45,6 +49,7 @@ describe('flattenGrafanaManagedRules', () => {
       {
         name: 'default',
         rules: sortRulesByName([...ungroupedGroup1.rules, ...ungroupedGroup2.rules, ...group1.rules, ...group2.rules]),
+        totals: {},
       },
     ]);
 
@@ -52,6 +57,7 @@ describe('flattenGrafanaManagedRules', () => {
       {
         name: 'default',
         rules: ungroupedGroup1.rules,
+        totals: {},
       },
     ]);
   });
diff --git a/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts b/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts
index 6a463c7a451..9a903261b26 100644
--- a/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts
+++ b/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts
@@ -1,7 +1,11 @@
-import { isEqual } from 'lodash';
+import { countBy, isEqual } from 'lodash';
 import { useMemo, useRef } from 'react';
 
 import {
+  AlertGroupTotals,
+  AlertingRule,
+  AlertInstanceTotals,
+  AlertInstanceTotalState,
   CombinedRule,
   CombinedRuleGroup,
   CombinedRuleNamespace,
@@ -10,7 +14,12 @@ import {
   RuleNamespace,
   RulesSource,
 } from 'app/types/unified-alerting';
-import { RulerRuleDTO, RulerRuleGroupDTO, RulerRulesConfigDTO } from 'app/types/unified-alerting-dto';
+import {
+  PromAlertingRuleState,
+  RulerRuleDTO,
+  RulerRuleGroupDTO,
+  RulerRulesConfigDTO,
+} from 'app/types/unified-alerting-dto';
 
 import {
   getAllRulesSources,
@@ -18,7 +27,13 @@ import {
   isCloudRulesSource,
   isGrafanaRulesSource,
 } from '../utils/datasource';
-import { isAlertingRule, isAlertingRulerRule, isRecordingRulerRule } from '../utils/rules';
+import {
+  isAlertingRule,
+  isAlertingRulerRule,
+  isGrafanaRulerRule,
+  isRecordingRule,
+  isRecordingRulerRule,
+} from '../utils/rules';
 
 import { useUnifiedAlertingSelector } from './useUnifiedAlertingSelector';
 
@@ -104,6 +119,7 @@ export function flattenGrafanaManagedRules(namespaces: CombinedRuleNamespace[])
     newNamespace.groups.push({
       name: 'default',
       rules: sortRulesByName(namespace.groups.flatMap((group) => group.rules)),
+      totals: calculateAllGroupsTotals(namespace.groups),
     });
 
     return newNamespace;
@@ -116,11 +132,18 @@ export function sortRulesByName(rules: CombinedRule[]) {
 
 function addRulerGroupsToCombinedNamespace(namespace: CombinedRuleNamespace, groups: RulerRuleGroupDTO[] = []): void {
   namespace.groups = groups.map((group) => {
+    const numRecordingRules = group.rules.filter((rule) => isRecordingRulerRule(rule)).length;
+    const numPaused = group.rules.filter((rule) => isGrafanaRulerRule(rule) && rule.grafana_alert.is_paused).length;
+
     const combinedGroup: CombinedRuleGroup = {
       name: group.name,
       interval: group.interval,
       source_tenants: group.source_tenants,
       rules: [],
+      totals: {
+        paused: numPaused,
+        recording: numRecordingRules,
+      },
     };
     combinedGroup.rules = group.rules.map((rule) => rulerRuleToCombinedRule(rule, namespace, combinedGroup));
     return combinedGroup;
@@ -137,11 +160,18 @@ function addPromGroupsToCombinedNamespace(namespace: CombinedRuleNamespace, grou
       combinedGroup = {
         name: group.name,
         rules: [],
+        totals: calculateGroupTotals(group),
       };
       namespace.groups.push(combinedGroup);
       existingGroupsByName.set(group.name, combinedGroup);
     }
 
+    // combine totals from ruler with totals from prometheus state API
+    combinedGroup.totals = {
+      ...combinedGroup.totals,
+      ...calculateGroupTotals(group),
+    };
+
     const combinedRulesByName = new Map<string, CombinedRule[]>();
     combinedGroup!.rules.forEach((r) => {
       // Prometheus rules do not have to be unique by name
@@ -153,6 +183,8 @@ function addPromGroupsToCombinedNamespace(namespace: CombinedRuleNamespace, grou
       const existingRule = getExistingRuleInGroup(rule, combinedRulesByName, namespace.rulesSource);
       if (existingRule) {
         existingRule.promRule = rule;
+        existingRule.instanceTotals = isAlertingRule(rule) ? calculateRuleTotals(rule) : {};
+        existingRule.filteredInstanceTotals = isAlertingRule(rule) ? calculateRuleFilteredTotals(rule) : {};
       } else {
         combinedGroup!.rules.push(promRuleToCombinedRule(rule, namespace, combinedGroup!));
       }
@@ -160,6 +192,74 @@ function addPromGroupsToCombinedNamespace(namespace: CombinedRuleNamespace, grou
   });
 }
 
+export function calculateRuleTotals(rule: Pick<AlertingRule, 'alerts' | 'totals'>): AlertInstanceTotals {
+  const result = countBy(rule.alerts, 'state');
+
+  if (rule.totals) {
+    const { normal, ...totals } = rule.totals;
+    return { ...totals, inactive: normal };
+  }
+
+  return {
+    alerting: result[AlertInstanceTotalState.Alerting],
+    pending: result[AlertInstanceTotalState.Pending],
+    inactive: result[AlertInstanceTotalState.Normal],
+    nodata: result[AlertInstanceTotalState.NoData],
+    error: result[AlertInstanceTotalState.Error] + result['err'], // Prometheus uses "err" instead of "error"
+  };
+}
+
+export function calculateRuleFilteredTotals(
+  rule: Pick<AlertingRule, 'alerts' | 'totalsFiltered'>
+): AlertInstanceTotals {
+  if (rule.totalsFiltered) {
+    const { normal, ...totals } = rule.totalsFiltered;
+    return { ...totals, inactive: normal };
+  }
+  return {};
+}
+
+export function calculateGroupTotals(group: Pick<RuleGroup, 'rules' | 'totals'>): AlertGroupTotals {
+  if (group.totals) {
+    const { firing, ...totals } = group.totals;
+
+    return {
+      ...totals,
+      alerting: firing,
+    };
+  }
+
+  const countsByState = countBy(group.rules, (rule) => isAlertingRule(rule) && rule.state);
+  const countsByHealth = countBy(group.rules, (rule) => rule.health);
+  const recordingCount = group.rules.filter((rule) => isRecordingRule(rule)).length;
+
+  return {
+    alerting: countsByState[PromAlertingRuleState.Firing],
+    error: countsByHealth.error,
+    nodata: countsByHealth.nodata,
+    inactive: countsByState[PromAlertingRuleState.Inactive],
+    pending: countsByState[PromAlertingRuleState.Pending],
+    recording: recordingCount,
+  };
+}
+
+function calculateAllGroupsTotals(groups: CombinedRuleGroup[]): AlertGroupTotals {
+  const totals: Record<string, number> = {};
+
+  groups.forEach((group) => {
+    const groupTotals = group.totals;
+    Object.entries(groupTotals).forEach(([key, value]) => {
+      if (!totals[key]) {
+        totals[key] = 0;
+      }
+
+      totals[key] += value;
+    });
+  });
+
+  return totals;
+}
+
 function promRuleToCombinedRule(rule: Rule, namespace: CombinedRuleNamespace, group: CombinedRuleGroup): CombinedRule {
   return {
     name: rule.name,
@@ -169,6 +269,8 @@ function promRuleToCombinedRule(rule: Rule, namespace: CombinedRuleNamespace, gr
     promRule: rule,
     namespace: namespace,
     group,
+    instanceTotals: isAlertingRule(rule) ? calculateRuleTotals(rule) : {},
+    filteredInstanceTotals: isAlertingRule(rule) ? calculateRuleFilteredTotals(rule) : {},
   };
 }
 
@@ -186,6 +288,8 @@ function rulerRuleToCombinedRule(
         rulerRule: rule,
         namespace,
         group,
+        instanceTotals: {},
+        filteredInstanceTotals: {},
       }
     : isRecordingRulerRule(rule)
     ? {
@@ -196,6 +300,8 @@ function rulerRuleToCombinedRule(
         rulerRule: rule,
         namespace,
         group,
+        instanceTotals: {},
+        filteredInstanceTotals: {},
       }
     : {
         name: rule.grafana_alert.title,
@@ -205,6 +311,8 @@ function rulerRuleToCombinedRule(
         rulerRule: rule,
         namespace,
         group,
+        instanceTotals: {},
+        filteredInstanceTotals: {},
       };
 }
 
diff --git a/public/app/features/alerting/unified/hooks/useFilteredRules.ts b/public/app/features/alerting/unified/hooks/useFilteredRules.ts
index 2979c6a78cc..aea4ba65c3e 100644
--- a/public/app/features/alerting/unified/hooks/useFilteredRules.ts
+++ b/public/app/features/alerting/unified/hooks/useFilteredRules.ts
@@ -5,7 +5,7 @@ import { useCallback, useEffect, useMemo } from 'react';
 
 import { getDataSourceSrv } from '@grafana/runtime';
 import { Matcher } from 'app/plugins/datasource/alertmanager/types';
-import { CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-alerting';
+import { CombinedRuleGroup, CombinedRuleNamespace, Rule } from 'app/types/unified-alerting';
 import { isPromAlertingRuleState, PromRuleType, RulerGrafanaRuleDTO } from 'app/types/unified-alerting-dto';
 
 import { applySearchFilterToQuery, getSearchFilterFromQuery, RulesFilter } from '../search/rulesSearchParser';
@@ -13,6 +13,7 @@ import { labelsMatchMatchers, matcherToMatcherField, parseMatcher, parseMatchers
 import { isCloudRulesSource } from '../utils/datasource';
 import { getRuleHealth, isAlertingRule, isGrafanaRulerRule, isPromRuleType } from '../utils/rules';
 
+import { calculateGroupTotals, calculateRuleFilteredTotals, calculateRuleTotals } from './useCombinedRuleNamespaces';
 import { useURLSearchParams } from './useURLSearchParams';
 
 export function useRulesFilter() {
@@ -74,7 +75,27 @@ export function useRulesFilter() {
 }
 
 export const useFilteredRules = (namespaces: CombinedRuleNamespace[], filterState: RulesFilter) => {
-  return useMemo(() => filterRules(namespaces, filterState), [namespaces, filterState]);
+  return useMemo(() => {
+    const filteredRules = filterRules(namespaces, filterState);
+
+    // Totals recalculation is a workaround for the lack of server-side filtering
+    filteredRules.forEach((namespace) => {
+      namespace.groups.forEach((group) => {
+        group.rules.forEach((rule) => {
+          if (isAlertingRule(rule.promRule)) {
+            rule.instanceTotals = calculateRuleTotals(rule.promRule);
+            rule.filteredInstanceTotals = calculateRuleFilteredTotals(rule.promRule);
+          }
+        });
+
+        group.totals = calculateGroupTotals({
+          rules: group.rules.map((r) => r.promRule).filter((r): r is Rule => !!r),
+        });
+      });
+    });
+
+    return filteredRules;
+  }, [namespaces, filterState]);
 };
 
 // Options details can be found here https://github.com/leeoniya/uFuzzy#options
diff --git a/public/app/features/alerting/unified/mocks.ts b/public/app/features/alerting/unified/mocks.ts
index 9a8bc0a82bd..34007712684 100644
--- a/public/app/features/alerting/unified/mocks.ts
+++ b/public/app/features/alerting/unified/mocks.ts
@@ -170,6 +170,7 @@ export const mockPromAlertingRule = (partial: Partial<AlertingRule> = {}): Alert
     },
     state: PromAlertingRuleState.Firing,
     health: 'OK',
+    totalsFiltered: { alerting: 1 },
     ...partial,
   };
 };
@@ -512,16 +513,19 @@ export const mockCombinedRule = (partial?: Partial<CombinedRule>): CombinedRule
   group: {
     name: 'mockCombinedRuleGroup',
     rules: [],
+    totals: {},
   },
   namespace: {
     name: 'mockCombinedNamespace',
-    groups: [{ name: 'mockCombinedRuleGroup', rules: [] }],
+    groups: [{ name: 'mockCombinedRuleGroup', rules: [], totals: {} }],
     rulesSource: 'grafana',
   },
   labels: {},
   annotations: {},
   promRule: mockPromAlertingRule(),
   rulerRule: mockRulerAlertingRule(),
+  instanceTotals: {},
+  filteredInstanceTotals: {},
   ...partial,
 });
 
@@ -596,7 +600,7 @@ export function mockAlertQuery(query: Partial<AlertQuery>): AlertQuery {
 }
 
 export function mockCombinedRuleGroup(name: string, rules: CombinedRule[]): CombinedRuleGroup {
-  return { name, rules };
+  return { name, rules, totals: {} };
 }
 
 export function mockCombinedRuleNamespace(namespace: Partial<CombinedRuleNamespace>): CombinedRuleNamespace {
diff --git a/public/app/features/alerting/unified/state/actions.ts b/public/app/features/alerting/unified/state/actions.ts
index be215b06619..e2835e7aff6 100644
--- a/public/app/features/alerting/unified/state/actions.ts
+++ b/public/app/features/alerting/unified/state/actions.ts
@@ -8,6 +8,7 @@ import {
   AlertmanagerGroup,
   ExternalAlertmanagerConfig,
   ExternalAlertmanagersResponse,
+  Matcher,
   Receiver,
   Silence,
   SilenceCreatePayload,
@@ -101,7 +102,19 @@ function getDataSourceRulerConfig(getState: () => unknown, rulesSourceName: stri
 export const fetchPromRulesAction = createAsyncThunk(
   'unifiedalerting/fetchPromRules',
   async (
-    { rulesSourceName, filter }: { rulesSourceName: string; filter?: FetchPromRulesFilter },
+    {
+      rulesSourceName,
+      filter,
+      limitAlerts,
+      matcher,
+      state,
+    }: {
+      rulesSourceName: string;
+      filter?: FetchPromRulesFilter;
+      limitAlerts?: number;
+      matcher?: Matcher[];
+      state?: string[];
+    },
     thunkAPI
   ): Promise<RuleNamespace[]> => {
     await thunkAPI.dispatch(fetchRulesSourceBuildInfoAction({ rulesSourceName }));
@@ -111,7 +124,7 @@ export const fetchPromRulesAction = createAsyncThunk(
       thunk: 'unifiedalerting/fetchPromRules',
     });
 
-    return await withSerializedError(fetchRulesWithLogging(rulesSourceName, filter));
+    return await withSerializedError(fetchRulesWithLogging(rulesSourceName, filter, limitAlerts, matcher, state));
   }
 );
 
@@ -339,7 +352,17 @@ export const fetchRulesSourceBuildInfoAction = createAsyncThunk(
   }
 );
 
-export function fetchAllPromAndRulerRulesAction(force = false): ThunkResult<Promise<void>> {
+interface FetchPromRulesRulesActionProps {
+  filter?: FetchPromRulesFilter;
+  limitAlerts?: number;
+  matcher?: Matcher[];
+  state?: string[];
+}
+
+export function fetchAllPromAndRulerRulesAction(
+  force = false,
+  options: FetchPromRulesRulesActionProps = {}
+): ThunkResult<Promise<void>> {
   return async (dispatch, getStore) => {
     const allStartLoadingTs = performance.now();
 
@@ -359,7 +382,7 @@ export function fetchAllPromAndRulerRulesAction(force = false): ThunkResult<Prom
           (force || !rulerRules[rulesSourceName]?.loading) && Boolean(dataSourceConfig.rulerConfig);
 
         await Promise.allSettled([
-          shouldLoadProm && dispatch(fetchPromRulesAction({ rulesSourceName })),
+          shouldLoadProm && dispatch(fetchPromRulesAction({ rulesSourceName, ...options })),
           shouldLoadRuler && dispatch(fetchRulerRulesAction({ rulesSourceName })),
         ]);
       })
diff --git a/public/app/features/alerting/unified/utils/alertmanager.ts b/public/app/features/alerting/unified/utils/alertmanager.ts
index 578549da500..96a12752b91 100644
--- a/public/app/features/alerting/unified/utils/alertmanager.ts
+++ b/public/app/features/alerting/unified/utils/alertmanager.ts
@@ -3,12 +3,12 @@ import { isEqual, uniqWith } from 'lodash';
 import { SelectableValue } from '@grafana/data';
 import {
   AlertManagerCortexConfig,
-  MatcherOperator,
-  Route,
   Matcher,
+  MatcherOperator,
+  ObjectMatcher,
+  Route,
   TimeInterval,
   TimeRange,
-  ObjectMatcher,
 } from 'app/plugins/datasource/alertmanager/types';
 import { Labels } from 'app/types/unified-alerting-dto';
 
diff --git a/public/app/features/alerting/unified/utils/query.test.ts b/public/app/features/alerting/unified/utils/query.test.ts
index 875ecedfa29..21191b71f88 100644
--- a/public/app/features/alerting/unified/utils/query.test.ts
+++ b/public/app/features/alerting/unified/utils/query.test.ts
@@ -16,6 +16,7 @@ describe('alertRuleToQueries', () => {
       group: {
         name: 'Prom up alert',
         rules: [],
+        totals: {},
       },
       namespace: {
         rulesSource: GRAFANA_RULES_SOURCE_NAME,
@@ -28,6 +29,8 @@ describe('alertRuleToQueries', () => {
         labels: {},
         grafana_alert: grafanaAlert,
       },
+      instanceTotals: {},
+      filteredInstanceTotals: {},
     };
 
     const result = alertRuleToQueries(combinedRule);
@@ -43,6 +46,7 @@ describe('alertRuleToQueries', () => {
       group: {
         name: 'test',
         rules: [],
+        totals: {},
       },
       namespace: {
         name: 'prom test alerts',
@@ -58,6 +62,8 @@ describe('alertRuleToQueries', () => {
           readOnly: false,
         },
       },
+      instanceTotals: {},
+      filteredInstanceTotals: {},
     };
 
     const result = alertRuleToQueries(combinedRule);
diff --git a/public/app/plugins/panel/alertlist/AlertInstances.tsx b/public/app/plugins/panel/alertlist/AlertInstances.tsx
index 6c1edec5eb3..7437268bcad 100644
--- a/public/app/plugins/panel/alertlist/AlertInstances.tsx
+++ b/public/app/plugins/panel/alertlist/AlertInstances.tsx
@@ -4,8 +4,9 @@ import pluralize from 'pluralize';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { GrafanaTheme2, PanelProps } from '@grafana/data';
-import { clearButtonStyles, Icon, useStyles2 } from '@grafana/ui';
+import { Button, clearButtonStyles, Icon, useStyles2 } from '@grafana/ui';
 import { AlertInstancesTable } from 'app/features/alerting/unified/components/rules/AlertInstancesTable';
+import { INSTANCES_DISPLAY_LIMIT } from 'app/features/alerting/unified/components/rules/RuleDetails';
 import { sortAlerts } from 'app/features/alerting/unified/utils/misc';
 import { Alert } from 'app/types/unified-alerting';
 
@@ -17,9 +18,20 @@ import { filterAlerts } from './util';
 interface Props {
   alerts: Alert[];
   options: PanelProps<UnifiedAlertListOptions>['options'];
+  grafanaTotalInstances?: number;
+  grafanaFilteredInstancesTotal?: number;
+  handleInstancesLimit?: (limit: boolean) => void;
+  limitInstances?: boolean;
 }
 
-export const AlertInstances = ({ alerts, options }: Props) => {
+export const AlertInstances = ({
+  alerts,
+  options,
+  grafanaTotalInstances,
+  handleInstancesLimit,
+  limitInstances,
+  grafanaFilteredInstancesTotal,
+}: Props) => {
   // when custom grouping is enabled, we will always uncollapse the list of alert instances
   const defaultShowInstances = options.groupMode === GroupMode.Custom ? true : options.showInstances;
   const [displayInstances, setDisplayInstances] = useState<boolean>(defaultShowInstances);
@@ -36,8 +48,13 @@ export const AlertInstances = ({ alerts, options }: Props) => {
     (): Alert[] => filterAlerts(options, sortAlerts(options.sortOrder, alerts)) ?? [],
     [alerts, options]
   );
+  const isGrafanaAlert = grafanaTotalInstances !== undefined;
 
-  const hiddenInstances = alerts.length - filteredAlerts.length;
+  const hiddenInstancesForGrafanaAlerts =
+    grafanaTotalInstances && grafanaFilteredInstancesTotal ? grafanaTotalInstances - grafanaFilteredInstancesTotal : 0;
+  const hiddenInstancesForNonGrafanaAlerts = alerts.length - filteredAlerts.length;
+
+  const hiddenInstances = isGrafanaAlert ? hiddenInstancesForGrafanaAlerts : hiddenInstancesForNonGrafanaAlerts;
 
   const uncollapsible = filteredAlerts.length > 0;
   const toggleShowInstances = uncollapsible ? toggleDisplayInstances : noop;
@@ -48,6 +65,49 @@ export const AlertInstances = ({ alerts, options }: Props) => {
     }
   }, [filteredAlerts]);
 
+  const onShowAllClick = async () => {
+    if (!handleInstancesLimit) {
+      return;
+    }
+    handleInstancesLimit(false);
+    setDisplayInstances(true);
+  };
+
+  const onShowLimitedClick = async () => {
+    if (!handleInstancesLimit) {
+      return;
+    }
+    handleInstancesLimit(true);
+    setDisplayInstances(true);
+  };
+  const totalInstancesNumber = limitInstances ? grafanaFilteredInstancesTotal : filteredAlerts.length;
+  const limitStatus = limitInstances
+    ? `Showing ${INSTANCES_DISPLAY_LIMIT} of ${grafanaTotalInstances} instances`
+    : `Showing all ${grafanaTotalInstances} instances`;
+
+  const limitButtonLabel = limitInstances
+    ? 'View all instances'
+    : `Limit the result to ${INSTANCES_DISPLAY_LIMIT} instances`;
+
+  const instancesLimitedAndOverflowed =
+    grafanaTotalInstances &&
+    INSTANCES_DISPLAY_LIMIT === filteredAlerts.length &&
+    grafanaTotalInstances > filteredAlerts.length;
+  const instancesNotLimitedAndoverflowed =
+    grafanaTotalInstances && INSTANCES_DISPLAY_LIMIT < filteredAlerts.length && !limitInstances;
+
+  const footerRow =
+    instancesLimitedAndOverflowed || instancesNotLimitedAndoverflowed ? (
+      <div className={styles.footerRow}>
+        <div>{limitStatus}</div>
+        {
+          <Button size="sm" variant="secondary" onClick={limitInstances ? onShowAllClick : onShowLimitedClick}>
+            {limitButtonLabel}
+          </Button>
+        }
+      </div>
+    ) : undefined;
+
   return (
     <div>
       {options.groupMode === GroupMode.Default && (
@@ -56,7 +116,7 @@ export const AlertInstances = ({ alerts, options }: Props) => {
           onClick={() => toggleShowInstances()}
         >
           {uncollapsible && <Icon name={displayInstances ? 'angle-down' : 'angle-right'} size={'md'} />}
-          <span>{`${filteredAlerts.length} ${pluralize('instance', filteredAlerts.length)}`}</span>
+          <span>{`${totalInstancesNumber} ${pluralize('instance', totalInstancesNumber)}`}</span>
           {hiddenInstances > 0 && <span>, {`${hiddenInstances} hidden by filters`}</span>}
         </button>
       )}
@@ -64,14 +124,23 @@ export const AlertInstances = ({ alerts, options }: Props) => {
         <AlertInstancesTable
           instances={filteredAlerts}
           pagination={{ itemsPerPage: 2 * DEFAULT_PER_PAGE_PAGINATION }}
+          footerRow={footerRow}
         />
       )}
     </div>
   );
 };
 
-const getStyles = (_: GrafanaTheme2) => ({
+const getStyles = (theme: GrafanaTheme2) => ({
   clickable: css`
     cursor: pointer;
   `,
+  footerRow: css`
+    display: flex;
+    flex-direction: column;
+    gap: ${theme.spacing(1)};
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+  `,
 });
diff --git a/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx b/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
index dbfed7f94a9..da19f2c8352 100644
--- a/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
+++ b/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import { sortBy } from 'lodash';
 import React, { useEffect, useMemo } from 'react';
-import { useEffectOnce } from 'react-use';
+import { useEffectOnce, useToggle } from 'react-use';
 
 import { GrafanaTheme2, PanelProps } from '@grafana/data';
 import { TimeRangeUpdatedEvent } from '@grafana/runtime';
@@ -18,9 +18,11 @@ import {
 import { config } from 'app/core/config';
 import { contextSrv } from 'app/core/services/context_srv';
 import alertDef from 'app/features/alerting/state/alertDef';
+import { INSTANCES_DISPLAY_LIMIT } from 'app/features/alerting/unified/components/rules/RuleDetails';
 import { useCombinedRuleNamespaces } from 'app/features/alerting/unified/hooks/useCombinedRuleNamespaces';
 import { useUnifiedAlertingSelector } from 'app/features/alerting/unified/hooks/useUnifiedAlertingSelector';
 import { fetchAllPromAndRulerRulesAction } from 'app/features/alerting/unified/state/actions';
+import { parseMatchers } from 'app/features/alerting/unified/utils/alertmanager';
 import { Annotation } from 'app/features/alerting/unified/utils/constants';
 import {
   getAllRulesSourceNames,
@@ -37,14 +39,26 @@ import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 import { getAlertingRule } from '../../../features/alerting/unified/utils/rules';
 import { AlertingRule, CombinedRuleWithLocation } from '../../../types/unified-alerting';
 
-import { GroupMode, SortOrder, UnifiedAlertListOptions, ViewMode } from './types';
+import { GroupMode, SortOrder, StateFilter, UnifiedAlertListOptions, ViewMode } from './types';
 import GroupedModeView from './unified-alerting/GroupedView';
 import UngroupedModeView from './unified-alerting/UngroupedView';
 import { filterAlerts } from './util';
 
+function getStateList(state: StateFilter) {
+  const reducer = (list: string[], [stateKey, value]: [string, boolean]) => {
+    if (Boolean(value)) {
+      return [...list, stateKey];
+    } else {
+      return list;
+    }
+  };
+  return Object.entries(state).reduce(reducer, []);
+}
+
 export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
   const dispatch = useDispatch();
   const rulesDataSourceNames = useMemo(getAllRulesSourceNames, []);
+  const [limitInstances, toggleLimit] = useToggle(true);
 
   // backwards compat for "Inactive" state filter
   useEffect(() => {
@@ -60,14 +74,74 @@ export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
     dashboard = getDashboardSrv().getCurrent();
   });
 
+  const stateList = useMemo(() => getStateList(props.options.stateFilter), [props.options.stateFilter]);
+  const { options, replaceVariables } = props;
+  const parsedOptions: UnifiedAlertListOptions = {
+    ...props.options,
+    alertName: replaceVariables(options.alertName),
+    alertInstanceLabelFilter: replaceVariables(options.alertInstanceLabelFilter),
+  };
+
+  const matcherList = useMemo(
+    () => parseMatchers(parsedOptions.alertInstanceLabelFilter),
+    [parsedOptions.alertInstanceLabelFilter]
+  );
+
+  useEffect(() => {
+    if (props.options.groupMode === GroupMode.Default) {
+      dispatch(
+        fetchAllPromAndRulerRulesAction(false, {
+          limitAlerts: limitInstances ? INSTANCES_DISPLAY_LIMIT : undefined,
+          matcher: matcherList,
+          state: stateList,
+        })
+      );
+    }
+  }, [props.options.groupMode, limitInstances, dispatch, matcherList, stateList]);
+
   useEffect(() => {
     //we need promRules and rulerRules for getting the uid when creating the alert link in panel in case of being a rulerRule.
-    dispatch(fetchAllPromAndRulerRulesAction());
-    const sub = dashboard?.events.subscribe(TimeRangeUpdatedEvent, () => dispatch(fetchAllPromAndRulerRulesAction()));
+    dispatch(
+      fetchAllPromAndRulerRulesAction(false, {
+        limitAlerts: limitInstances ? INSTANCES_DISPLAY_LIMIT : undefined,
+        matcher: matcherList,
+        state: stateList,
+      })
+    );
+    const sub = dashboard?.events.subscribe(TimeRangeUpdatedEvent, () =>
+      dispatch(
+        fetchAllPromAndRulerRulesAction(false, {
+          limitAlerts: limitInstances ? INSTANCES_DISPLAY_LIMIT : undefined,
+          matcher: matcherList,
+          state: stateList,
+        })
+      )
+    );
     return () => {
       sub?.unsubscribe();
     };
-  }, [dispatch, dashboard]);
+  }, [dispatch, dashboard, matcherList, stateList, toggleLimit, limitInstances]);
+
+  const handleInstancesLimit = (limit: boolean) => {
+    if (limit) {
+      dispatch(
+        fetchAllPromAndRulerRulesAction(false, {
+          limitAlerts: INSTANCES_DISPLAY_LIMIT,
+          matcher: matcherList,
+          state: stateList,
+        })
+      );
+      toggleLimit(true);
+    } else {
+      dispatch(
+        fetchAllPromAndRulerRulesAction(false, {
+          matcher: matcherList,
+          state: stateList,
+        })
+      );
+      toggleLimit(false);
+    }
+  };
 
   const { prom, ruler } = useUnifiedAlertingSelector((state) => ({
     prom: state.promRules[GRAFANA_RULES_SOURCE_NAME] || initialAsyncRequestState,
@@ -106,13 +180,6 @@ export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
     );
   }
 
-  const { options, replaceVariables } = props;
-  const parsedOptions: UnifiedAlertListOptions = {
-    ...props.options,
-    alertName: replaceVariables(options.alertName),
-    alertInstanceLabelFilter: replaceVariables(options.alertInstanceLabelFilter),
-  };
-
   return (
     <CustomScrollbar autoHeightMin="100%" autoHeightMax="100%">
       <div className={styles.container}>
@@ -134,7 +201,12 @@ export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
             <GroupedModeView rules={rules} options={parsedOptions} />
           )}
           {props.options.viewMode === ViewMode.List && props.options.groupMode === GroupMode.Default && haveResults && (
-            <UngroupedModeView rules={rules} options={parsedOptions} />
+            <UngroupedModeView
+              rules={rules}
+              options={parsedOptions}
+              handleInstancesLimit={handleInstancesLimit}
+              limitInstances={limitInstances}
+            />
           )}
         </section>
       </div>
diff --git a/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx b/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
index 2ae4648c602..1ff3972f11c 100644
--- a/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
+++ b/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
@@ -1,10 +1,10 @@
-import { render } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Provider } from 'react-redux';
 import { byRole, byText } from 'testing-library-selector';
 
-import { getDefaultTimeRange, LoadingState, PanelProps, FieldConfigSource } from '@grafana/data';
+import { FieldConfigSource, getDefaultTimeRange, LoadingState, PanelProps } from '@grafana/data';
 import { TimeRangeUpdatedEvent } from '@grafana/runtime';
 import { DashboardSrv, setDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 
@@ -19,7 +19,7 @@ import {
 import { GRAFANA_RULES_SOURCE_NAME } from '../../../features/alerting/unified/utils/datasource';
 
 import { UnifiedAlertList } from './UnifiedAlertList';
-import { UnifiedAlertListOptions, SortOrder, GroupMode, ViewMode } from './types';
+import { GroupMode, SortOrder, UnifiedAlertListOptions, ViewMode } from './types';
 import * as utils from './util';
 
 jest.mock('app/features/alerting/unified/api/alertmanager');
@@ -88,6 +88,8 @@ const renderPanel = (options: Partial<UnifiedAlertListOptions> = defaultOptions)
                   mockPromAlertingRule({
                     name: 'rule1',
                     alerts: [mockPromAlert({ labels: { severity: 'critical' } })],
+                    totals: { alerting: 1 },
+                    totalsFiltered: { alerting: 1 },
                   }),
                 ],
               }),
@@ -112,6 +114,7 @@ const renderPanel = (options: Partial<UnifiedAlertListOptions> = defaultOptions)
 
 describe('UnifiedAlertList', () => {
   it('subscribes to the dashboard refresh interval', async () => {
+    jest.spyOn(defaultProps, 'replaceVariables').mockReturnValue('severity=critical');
     await renderPanel();
     expect(dashboard.events.subscribe).toHaveBeenCalledTimes(1);
     expect(dashboard.events.subscribe.mock.calls[0][0]).toEqual(TimeRangeUpdatedEvent);
@@ -125,7 +128,7 @@ describe('UnifiedAlertList', () => {
 
     const user = userEvent.setup();
 
-    renderPanel({
+    await renderPanel({
       alertInstanceLabelFilter: '$label',
       dashboardAlerts: false,
       alertName: '',
@@ -135,6 +138,10 @@ describe('UnifiedAlertList', () => {
 
     expect(byText('rule1').get()).toBeInTheDocument();
 
+    await waitFor(() => {
+      expect(screen.getByText('1 instance')).toBeInTheDocument();
+    });
+
     const expandElement = byText('1 instance').get();
 
     await user.click(expandElement);
diff --git a/public/app/plugins/panel/alertlist/types.ts b/public/app/plugins/panel/alertlist/types.ts
index c94f5de97e1..a0e07fd4516 100644
--- a/public/app/plugins/panel/alertlist/types.ts
+++ b/public/app/plugins/panel/alertlist/types.ts
@@ -42,7 +42,7 @@ export interface AlertListOptions {
   folderId: number;
 }
 
-interface StateFilter {
+export interface StateFilter {
   firing: boolean;
   pending: boolean;
   inactive?: boolean; // backwards compat
diff --git a/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx b/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx
index 7a0c0ecffad..882b8c810e6 100644
--- a/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx
+++ b/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx
@@ -17,7 +17,8 @@ import {
 import { createUrl } from 'app/features/alerting/unified/utils/url';
 import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
-import { AlertingRule, CombinedRuleWithLocation } from '../../../../types/unified-alerting';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../../../features/alerting/unified/utils/datasource';
+import { AlertingRule, AlertInstanceTotalState, CombinedRuleWithLocation } from '../../../../types/unified-alerting';
 import { AlertInstances } from '../AlertInstances';
 import { getStyles } from '../UnifiedAlertList';
 import { UnifiedAlertListOptions } from '../types';
@@ -25,9 +26,17 @@ import { UnifiedAlertListOptions } from '../types';
 type Props = {
   rules: CombinedRuleWithLocation[];
   options: UnifiedAlertListOptions;
+  handleInstancesLimit?: (limit: boolean) => void;
+  limitInstances: boolean;
 };
 
-const UngroupedModeView = ({ rules, options }: Props) => {
+function getGrafanaInstancesTotal(totals: Partial<Record<AlertInstanceTotalState, number>>) {
+  return Object.values(totals)
+    .filter((total) => total !== undefined)
+    .reduce((total, currentTotal) => total + currentTotal, 0);
+}
+
+const UngroupedModeView = ({ rules, options, handleInstancesLimit, limitInstances }: Props) => {
   const styles = useStyles2(getStyles);
   const stateStyle = useStyles2(getStateTagStyles);
   const { href: returnTo } = useLocation();
@@ -46,6 +55,15 @@ const UngroupedModeView = ({ rules, options }: Props) => {
           const indentifier = fromCombinedRule(ruleWithLocation.dataSourceName, ruleWithLocation);
           const strIndentifier = stringifyIdentifier(indentifier);
 
+          const grafanaInstancesTotal =
+            ruleWithLocation.dataSourceName === GRAFANA_RULES_SOURCE_NAME
+              ? getGrafanaInstancesTotal(ruleWithLocation.instanceTotals)
+              : undefined;
+          const grafanaFilteredInstancesTotal =
+            ruleWithLocation.dataSourceName === GRAFANA_RULES_SOURCE_NAME
+              ? getGrafanaInstancesTotal(ruleWithLocation.filteredInstanceTotals)
+              : undefined;
+
           const href = createUrl(
             `/alerting/${encodeURIComponent(dataSourceName)}/${encodeURIComponent(strIndentifier)}/view`,
             { returnTo: returnTo ?? '' }
@@ -96,7 +114,14 @@ const UngroupedModeView = ({ rules, options }: Props) => {
                       )}
                     </div>
                   </div>
-                  <AlertInstances alerts={alertingRule.alerts ?? []} options={options} />
+                  <AlertInstances
+                    alerts={alertingRule.alerts ?? []}
+                    options={options}
+                    grafanaTotalInstances={grafanaInstancesTotal}
+                    grafanaFilteredInstancesTotal={grafanaFilteredInstancesTotal}
+                    handleInstancesLimit={handleInstancesLimit}
+                    limitInstances={limitInstances}
+                  />
                 </div>
               </li>
             );
diff --git a/public/app/types/unified-alerting-dto.ts b/public/app/types/unified-alerting-dto.ts
index 487d8cda0a3..cdd0de5efd7 100644
--- a/public/app/types/unified-alerting-dto.ts
+++ b/public/app/types/unified-alerting-dto.ts
@@ -2,6 +2,8 @@
 
 import { DataQuery, RelativeTimeRange } from '@grafana/data';
 
+import { AlertGroupTotals } from './unified-alerting';
+
 export type Labels = Record<string, string>;
 export type Annotations = Record<string, string>;
 
@@ -153,7 +155,10 @@ export interface PromResponse<T> {
   warnings?: string[];
 }
 
-export type PromRulesResponse = PromResponse<{ groups: PromRuleGroupDTO[] }>;
+export type PromRulesResponse = PromResponse<{
+  groups: PromRuleGroupDTO[];
+  totals?: AlertGroupTotals;
+}>;
 
 // Ruler rule DTOs
 interface RulerRuleBaseDTO {
diff --git a/public/app/types/unified-alerting.ts b/public/app/types/unified-alerting.ts
index 927e5c5226c..cc160c87336 100644
--- a/public/app/types/unified-alerting.ts
+++ b/public/app/types/unified-alerting.ts
@@ -45,6 +45,9 @@ export interface AlertingRule extends RuleBase {
   };
   state: PromAlertingRuleState;
   type: PromRuleType.Alerting;
+  totals?: Partial<Record<Lowercase<GrafanaAlertState>, number>>;
+  totalsFiltered?: Partial<Record<Lowercase<GrafanaAlertState>, number>>;
+  activeAt?: string; // ISO timestamp
 }
 
 export interface RecordingRule extends RuleBase {
@@ -59,10 +62,16 @@ export type Rule = AlertingRule | RecordingRule;
 
 export type BaseRuleGroup = { name: string };
 
+type TotalsWithoutAlerting = Exclude<AlertInstanceTotalState, AlertInstanceTotalState.Alerting>;
+enum FiringTotal {
+  Firing = 'firing',
+}
 export interface RuleGroup {
   name: string;
   interval: number;
   rules: Rule[];
+  // totals only exist for Grafana Managed rules
+  totals?: Partial<Record<TotalsWithoutAlerting | FiringTotal, number>>;
 }
 
 export interface RuleNamespace {
@@ -89,13 +98,30 @@ export interface CombinedRule {
   rulerRule?: RulerRuleDTO;
   group: CombinedRuleGroup;
   namespace: CombinedRuleNamespace;
+  instanceTotals: AlertInstanceTotals;
+  filteredInstanceTotals: AlertInstanceTotals;
 }
 
+// export type AlertInstanceState = PromAlertingRuleState | 'nodata' | 'error';
+export enum AlertInstanceTotalState {
+  Alerting = 'alerting',
+  Pending = 'pending',
+  Normal = 'inactive',
+  NoData = 'nodata',
+  Error = 'error',
+}
+
+export type AlertInstanceTotals = Partial<Record<AlertInstanceTotalState, number>>;
+
+// AlertGroupTotals also contain the amount of recording and paused rules
+export type AlertGroupTotals = Partial<Record<AlertInstanceTotalState | 'paused' | 'recording', number>>;
+
 export interface CombinedRuleGroup {
   name: string;
   interval?: string;
   source_tenants?: string[];
   rules: CombinedRule[];
+  totals: AlertGroupTotals;
 }
 
 export interface CombinedRuleNamespace {

From 714d2a4154bae5126c5cb24511a0b8ff79e33108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 25 Apr 2023 11:46:58 +0200
Subject: [PATCH 382/729] AppNotifications: Fixes issue with missing app
 notifications (#67190)

---
 .../components/AppNotifications/AppNotificationList.tsx   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/core/components/AppNotifications/AppNotificationList.tsx b/public/app/core/components/AppNotifications/AppNotificationList.tsx
index b27736e2ee0..467255ff354 100644
--- a/public/app/core/components/AppNotifications/AppNotificationList.tsx
+++ b/public/app/core/components/AppNotifications/AppNotificationList.tsx
@@ -22,10 +22,10 @@ export function AppNotificationList() {
   const styles = useStyles2(getStyles);
 
   useEffect(() => {
-    appEvents.on(AppEvents.alertWarning, (payload) => notifyApp(createWarningNotification(...payload)));
-    appEvents.on(AppEvents.alertSuccess, (payload) => notifyApp(createSuccessNotification(...payload)));
-    appEvents.on(AppEvents.alertError, (payload) => notifyApp(createErrorNotification(...payload)));
-  }, []);
+    appEvents.on(AppEvents.alertWarning, (payload) => dispatch(notifyApp(createWarningNotification(...payload))));
+    appEvents.on(AppEvents.alertSuccess, (payload) => dispatch(notifyApp(createSuccessNotification(...payload))));
+    appEvents.on(AppEvents.alertError, (payload) => dispatch(notifyApp(createErrorNotification(...payload))));
+  }, [dispatch]);
 
   const onClearAppNotification = (id: string) => {
     dispatch(hideAppNotification(id));

From 0d0c6401e396e6a92ae62fbd3e6059e300c8d661 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Tue, 25 Apr 2023 11:52:59 +0200
Subject: [PATCH 383/729] Toolkit: Remove deprecated `searchTestData` (#67134)

---
 .betterer.results                             |  14 ---
 packages/grafana-toolkit/src/cli/index.ts     |  14 ---
 .../src/cli/tasks/searchTestDataSetup.ts      | 117 ------------------
 3 files changed, 145 deletions(-)
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts

diff --git a/.betterer.results b/.betterer.results
index aa85a9c3e05..278d3a84a8a 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -896,20 +896,6 @@ exports[`better eslint`] = {
     "packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
-    ],
     "packages/grafana-toolkit/src/cli/tasks/task.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index 593fb9bb3fd..037288731f0 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -9,7 +9,6 @@ import { pluginSignTask } from './tasks/plugin.sign';
 import { pluginUpdateTask } from './tasks/plugin.update';
 import { getToolkitVersion, githubPublishTask } from './tasks/plugin.utils';
 import { bundleManagedTask } from './tasks/plugin/bundle.managed';
-import { searchTestDataSetupTask } from './tasks/searchTestDataSetup';
 import { templateTask } from './tasks/template';
 import { toolkitBuildTask } from './tasks/toolkit.build';
 import { execTask } from './utils/execTask';
@@ -65,19 +64,6 @@ export const run = (includeInternalScripts = false) => {
         );
         await execTask(toolkitBuildTask)({});
       });
-
-    program
-      .command('searchTestData')
-      .option('-c, --count <number_of_dashboards>', 'Specify number of dashboards')
-      .description('[deprecated] Setup test data for search')
-      .action(async (cmd) => {
-        console.log(
-          chalk.yellow.bold(
-            `⚠️ This command is deprecated and will be removed in v10. No further support will be provided. ⚠️`
-          )
-        );
-        await execTask(searchTestDataSetupTask)({ count: cmd.count });
-      });
   }
 
   program.option('-v, --version', 'Toolkit version').action(async () => {
diff --git a/packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts b/packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts
deleted file mode 100644
index 6f8fc346e6d..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import axios from 'axios';
-
-import { Task, TaskRunner } from './task';
-
-interface SearchTestDataSetupOptions {
-  count: number;
-}
-
-const client = axios.create({
-  baseURL: 'http://localhost:3000/api',
-  auth: {
-    username: 'admin',
-    password: 'admin2',
-  },
-});
-
-export async function getUser(user: any): Promise<any> {
-  console.log('Creating user ' + user.name);
-  const search = await client.get('/users/search', {
-    params: { query: user.login },
-  });
-
-  if (search.data.totalCount === 1) {
-    user.id = search.data.users[0].id;
-    return user;
-  }
-
-  const rsp = await client.post('/admin/users', user);
-  user.id = rsp.data.id;
-  return user;
-}
-
-export async function getTeam(team: any): Promise<any> {
-  // delete if exists
-  const teams = await client.get('/teams/search');
-  for (const existing of teams.data.teams) {
-    if (existing.name === team.name) {
-      console.log('Team exists, deleting');
-      await client.delete('/teams/' + existing.id);
-    }
-  }
-
-  console.log('Creating team ' + team.name);
-  const teamRsp = await client.post(`/teams`, team);
-  team.id = teamRsp.data.teamId;
-  return team;
-}
-
-export async function addToTeam(team: any, user: any): Promise<any> {
-  console.log(`Adding user ${user.name} to team ${team.name}`);
-  await client.post(`/teams/${team.id}/members`, { userId: user.id });
-}
-
-export async function setDashboardAcl(dashboardId: any, aclList: any) {
-  console.log('Setting Dashboard ACL ' + dashboardId);
-  await client.post(`/dashboards/id/${dashboardId}/permissions`, { items: aclList });
-}
-
-const searchTestDataSetupRunner: TaskRunner<SearchTestDataSetupOptions> = async ({ count }) => {
-  const user1 = await getUser({
-    name: 'searchTestUser1',
-    email: 'searchTestUser@team.com',
-    login: 'searchTestUser1',
-    password: '12345',
-  });
-
-  const team1 = await getTeam({ name: 'searchTestTeam1', email: 'searchtestdata@team.com' });
-  addToTeam(team1, user1);
-
-  // create or update folder
-  const folder: any = {
-    uid: 'search-test-data',
-    title: 'Search test data folder',
-    version: 1,
-  };
-
-  try {
-    await client.delete(`/folders/${folder.uid}`);
-  } catch (err) {}
-
-  console.log('Creating folder');
-
-  const rsp = await client.post(`/folders`, folder);
-  folder.id = rsp.data.id;
-  folder.url = rsp.data.url;
-
-  await setDashboardAcl(folder.id, []);
-
-  console.log('Creating dashboards');
-
-  const dashboards: any = [];
-
-  for (let i = 0; i < count; i++) {
-    const dashboard: any = {
-      uid: 'search-test-dash-' + i.toString().padStart(5, '0'),
-      title: 'Search test dash ' + i.toString().padStart(5, '0'),
-    };
-
-    const rsp = await client.post(`/dashboards/db`, {
-      dashboard: dashboard,
-      folderId: folder.id,
-      overwrite: true,
-    });
-
-    dashboard.id = rsp.data.id;
-    dashboard.url = rsp.data.url;
-
-    console.log('Created dashboard ' + dashboard.title);
-    dashboards.push(dashboard);
-    await setDashboardAcl(dashboard.id, [{ userId: 0, teamId: team1.id, permission: 4 }]);
-  }
-};
-
-export const searchTestDataSetupTask = new Task<SearchTestDataSetupOptions>(
-  'Search test data setup',
-  searchTestDataSetupRunner
-);

From b93f26f29d03c6d538cc99cf273b8b9c452d5b6a Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Tue, 25 Apr 2023 11:10:00 +0100
Subject: [PATCH 384/729] RBAC: Update TestIntegrationFolderService remove RBAC
 setting (#67052)

* remove the RBAC configuration setting

* add back tests
---
 pkg/services/folder/folderimpl/folder_test.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go
index 323c45453a1..80e29f72c4f 100644
--- a/pkg/services/folder/folderimpl/folder_test.go
+++ b/pkg/services/folder/folderimpl/folder_test.go
@@ -64,7 +64,6 @@ func TestIntegrationFolderService(t *testing.T) {
 		folderStore := foldertest.NewFakeFolderStore(t)
 
 		cfg := setting.NewCfg()
-		cfg.RBACEnabled = true
 		features := featuremgmt.WithFeatures()
 
 		service := &Service{
@@ -451,7 +450,6 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
 	dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
 
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	folderService := &Service{
 		cfg:                  cfg,
 		store:                nestedFolderStore,
@@ -1033,7 +1031,6 @@ func setup(t *testing.T, dashStore dashboards.Store, dashboardFolderStore folder
 
 	// nothing enabled yet
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 	return &Service{
 		cfg:                  cfg,
 		log:                  log.New("test-folder-service"),

From 9b3ddae424fa8c47232cc9f8b263b59a746e2c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 25 Apr 2023 12:46:07 +0200
Subject: [PATCH 385/729] Loki: Enable dataplane-compliant metric data by
 default (#67137)

loki: enable dataplane-compliant metric data by default
---
 .../setup-grafana/configure-grafana/feature-toggles/index.md | 2 +-
 pkg/services/featuremgmt/registry.go                         | 5 +++--
 pkg/services/featuremgmt/toggles_gen.csv                     | 2 +-
 pkg/services/featuremgmt/toggles_gen.go                      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index d8b6ea6be81..1abd57a3d97 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -36,6 +36,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `logsSampleInExplore`               | Enables access to the logs sample feature in Explore                                                                                                                                                | Yes                |
 | `logsContextDatasourceUi`           | Allow datasource to provide custom UI for context view                                                                                                                                              | Yes                |
 | `prometheusDataplane`               | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from 'Value' to the value of the `__name__` label when present. | Yes                |
+| `lokiMetricDataplane`               | Changes metric responses from Loki to be compliant with the dataplane specification.                                                                                                                | Yes                |
 | `dataplaneFrontendFallback`         | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                | Yes                |
 | `useCachingService`                 | When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation                                       |                    |
 
@@ -101,7 +102,6 @@ Alpha features might be changed or removed without prior notice.
 | `prometheusResourceBrowserCache`   | Displays browser caching options in Prometheus data source configuration                                       |
 | `influxdbBackendMigration`         | Query InfluxDB InfluxQL without the proxy                                                                      |
 | `clientTokenRotation`              | Replaces the current in-request token rotation so that the client initiates the rotation                       |
-| `lokiMetricDataplane`              | Changes responses from Loki to be compliant with the dataplane specification.                                  |
 | `disableSSEDataplane`              | Disables dataplane specific processing in server side expressions.                                             |
 | `alertStateHistoryLokiSecondary`   | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.   |
 | `alertStateHistoryLokiPrimary`     | Enable a remote Loki instance as the primary source for state history reads.                                   |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 03c2322dbb0..e9dd1654c40 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -435,8 +435,9 @@ var (
 		},
 		{
 			Name:        "lokiMetricDataplane",
-			Description: "Changes responses from Loki to be compliant with the dataplane specification.",
-			State:       FeatureStateAlpha,
+			Description: "Changes metric responses from Loki to be compliant with the dataplane specification.",
+			State:       FeatureStateStable,
+			Expression:  "true",
 			Owner:       grafanaObservabilityLogsSquad,
 		},
 		{
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 1e6bc7d7401..cd9e05e9489 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -63,7 +63,7 @@ prometheusResourceBrowserCache,alpha,@grafana/observability-metrics,false,false,
 influxdbBackendMigration,alpha,@grafana/observability-metrics,false,false,false,true
 clientTokenRotation,alpha,@grafana/grafana-authnz-team,false,false,false,false
 prometheusDataplane,stable,@grafana/observability-metrics,false,false,false,false
-lokiMetricDataplane,alpha,@grafana/observability-logs,false,false,false,false
+lokiMetricDataplane,stable,@grafana/observability-logs,false,false,false,false
 dataplaneFrontendFallback,stable,@grafana/observability-metrics,false,false,false,true
 disableSSEDataplane,alpha,@grafana/observability-metrics,false,false,false,false
 alertStateHistoryLokiSecondary,alpha,@grafana/alerting-squad,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 24c98397d6e..3848bc3527b 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -264,7 +264,7 @@ const (
 	FlagPrometheusDataplane = "prometheusDataplane"
 
 	// FlagLokiMetricDataplane
-	// Changes responses from Loki to be compliant with the dataplane specification.
+	// Changes metric responses from Loki to be compliant with the dataplane specification.
 	FlagLokiMetricDataplane = "lokiMetricDataplane"
 
 	// FlagDataplaneFrontendFallback

From 9d7c3a101de4d7dca04bd5fdaafc27eed21fe8b5 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Tue, 25 Apr 2023 13:01:49 +0200
Subject: [PATCH 386/729] Chore: Use KVStore for the manifest public key
 (#66839)

---
 pkg/api/plugin_resource_test.go               |   4 +-
 pkg/plugins/ifaces.go                         |   9 +
 pkg/plugins/manager/loader/loader_test.go     | 119 +----------
 .../manager/manager_integration_test.go       |   4 +-
 pkg/plugins/manager/signature/manifest.go     |  22 +-
 .../manager/signature/manifest_test.go        |  24 ++-
 .../signature/manifestverifier/verifier.go    | 191 ++++++++++++++----
 .../manifestverifier/verifier_test.go         | 124 +++++++++---
 .../backgroundsvcs/background_services.go     |   3 +
 .../pluginsintegration/keystore/keystore.go   |  74 +++++++
 .../pluginsintegration/pluginsintegration.go  |   3 +
 11 files changed, 374 insertions(+), 203 deletions(-)
 create mode 100644 pkg/services/pluginsintegration/keystore/keystore.go

diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index 3aeb39a8bd6..a2d3c93111f 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
@@ -35,6 +36,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
@@ -65,7 +67,7 @@ func TestCallResource(t *testing.T) {
 	reg := registry.ProvideService()
 	l := loader.ProvideService(pCfg, fakes.NewFakeLicensingService(), signature.NewUnsignedAuthorizer(pCfg),
 		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(),
-		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg))
+		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
 	srcs := sources.ProvideService(cfg, pCfg)
 	ps, err := store.ProvideService(reg, srcs, l)
 	require.NoError(t, err)
diff --git a/pkg/plugins/ifaces.go b/pkg/plugins/ifaces.go
index 9a523686310..a4ce3c6f736 100644
--- a/pkg/plugins/ifaces.go
+++ b/pkg/plugins/ifaces.go
@@ -148,3 +148,12 @@ type FeatureToggles interface {
 type SignatureCalculator interface {
 	Calculate(ctx context.Context, src PluginSource, plugin FoundPlugin) (Signature, error)
 }
+
+type KeyStore interface {
+	Get(ctx context.Context, key string) (string, bool, error)
+	Set(ctx context.Context, key string, value string) error
+	Del(ctx context.Context, key string) error
+	ListKeys(ctx context.Context) ([]string, error)
+	GetLastUpdated(ctx context.Context) (*time.Time, error)
+	SetLastUpdated(ctx context.Context) error
+}
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index d0dda4d4c51..0fa139bd86b 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -2,10 +2,7 @@ package loader
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"net/http"
-	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"sort"
@@ -15,6 +12,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/config"
@@ -24,10 +22,9 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/initializer"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
-	"github.com/grafana/grafana/pkg/plugins/manager/signature/manifestverifier"
 	"github.com/grafana/grafana/pkg/plugins/manager/sources"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -1110,115 +1107,6 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 	})
 }
 
-func TestLoader_Load_UseAPIForManifestPublicKey(t *testing.T) {
-	t.Run("Load plugin using API manifest", func(t *testing.T) {
-		pluginDir, err := filepath.Abs("../testdata/test-app")
-		if err != nil {
-			t.Errorf("could not construct absolute path of plugin dir")
-			return
-		}
-		expected := []*plugins.Plugin{
-			{
-				JSONData: plugins.JSONData{
-					ID:   "test-app",
-					Type: "app",
-					Name: "Test App",
-					Info: plugins.Info{
-						Author: plugins.InfoLink{
-							Name: "Test Inc.",
-							URL:  "http://test.com",
-						},
-						Description: "Official Grafana Test App & Dashboard bundle",
-						Version:     "1.0.0",
-						Links: []plugins.InfoLink{
-							{Name: "Project site", URL: "http://project.com"},
-							{Name: "License & Terms", URL: "http://license.com"},
-						},
-						Logos: plugins.Logos{
-							Small: "public/plugins/test-app/img/logo_small.png",
-							Large: "public/plugins/test-app/img/logo_large.png",
-						},
-						Screenshots: []plugins.Screenshots{
-							{Path: "public/plugins/test-app/img/screenshot1.png", Name: "img1"},
-							{Path: "public/plugins/test-app/img/screenshot2.png", Name: "img2"},
-						},
-						Updated: "2015-02-10",
-					},
-					Dependencies: plugins.Dependencies{
-						GrafanaVersion: "3.x.x",
-						Plugins: []plugins.Dependency{
-							{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
-							{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
-						},
-					},
-					Includes: []*plugins.Includes{
-						{Name: "Nginx Connections", Path: "dashboards/connections.json", Type: "dashboard", Role: "Viewer", Slug: "nginx-connections"},
-						{Name: "Nginx Memory", Path: "dashboards/memory.json", Type: "dashboard", Role: "Viewer", Slug: "nginx-memory"},
-						{Name: "Nginx Panel", Type: "panel", Role: "Viewer", Slug: "nginx-panel"},
-						{Name: "Nginx Datasource", Type: "datasource", Role: "Viewer", Slug: "nginx-datasource"},
-					},
-					Backend: false,
-				},
-				FS:            plugins.NewLocalFS(filesInDir(t, pluginDir), pluginDir),
-				Class:         plugins.External,
-				Signature:     plugins.SignatureValid,
-				SignatureType: plugins.GrafanaSignature,
-				SignatureOrg:  "Grafana Labs",
-				Module:        "plugins/test-app/module",
-				BaseURL:       "public/plugins/test-app",
-			},
-		}
-
-		reg := fakes.NewFakePluginRegistry()
-		procPrvdr := fakes.NewFakeBackendProcessProvider()
-		procMgr := fakes.NewFakeProcessManager()
-		apiCalled := false
-		cfg := &config.Cfg{Features: featuremgmt.WithFeatures([]interface{}{"pluginsAPIManifestKey"}...)}
-		s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if r.URL.Path == "/api/plugins/ci/keys" {
-				w.WriteHeader(http.StatusOK)
-				// Use the hardcoded key
-				k, err := manifestverifier.New(&config.Cfg{}, log.New("test")).GetPublicKey("7e4d0c6a708866e7")
-				require.NoError(t, err)
-				data := struct {
-					Items []manifestverifier.ManifestKeys `json:"items"`
-				}{
-					Items: []manifestverifier.ManifestKeys{{PublicKey: k, KeyID: "7e4d0c6a708866e7"}},
-				}
-				b, err := json.Marshal(data)
-				require.NoError(t, err)
-				_, err = w.Write(b)
-				require.NoError(t, err)
-				apiCalled = true
-				return
-			}
-			w.WriteHeader(http.StatusNotFound)
-		}))
-		cfg.GrafanaComURL = s.URL
-		l := newLoader(cfg, func(l *Loader) {
-			l.pluginRegistry = reg
-			l.processManager = procMgr
-			l.pluginInitializer = initializer.New(cfg, procPrvdr, fakes.NewFakeLicensingService())
-		})
-		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
-			PluginClassFunc: func(ctx context.Context) plugins.Class {
-				return plugins.External
-			},
-			PluginURIsFunc: func(ctx context.Context) []string {
-				return []string{pluginDir}
-			},
-		})
-		require.NoError(t, err)
-		require.True(t, apiCalled)
-
-		if !cmp.Equal(got, expected, compareOpts...) {
-			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
-		}
-
-		verifyState(t, expected, reg, procPrvdr, procMgr)
-	})
-}
-
 func TestLoader_Load_NestedPlugins(t *testing.T) {
 	rootDir, err := filepath.Abs("../")
 	if err != nil {
@@ -1533,7 +1421,8 @@ func Test_setPathsBasedOnApp(t *testing.T) {
 func newLoader(cfg *config.Cfg, cbs ...func(loader *Loader)) *Loader {
 	l := New(cfg, &fakes.FakeLicensingService{}, signature.NewUnsignedAuthorizer(cfg), fakes.NewFakePluginRegistry(),
 		fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakeRoleRegistry(),
-		assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(), signature.ProvideService(cfg))
+		assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(),
+		signature.ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
 
 	for _, cb := range cbs {
 		cb(l)
diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go
index d98e34ccfb6..1e20c169614 100644
--- a/pkg/plugins/manager/manager_integration_test.go
+++ b/pkg/plugins/manager/manager_integration_test.go
@@ -14,6 +14,7 @@ import (
 	"gopkg.in/ini.v1"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
@@ -31,6 +32,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	plicensing "github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
 	"github.com/grafana/grafana/pkg/services/searchV2"
 	"github.com/grafana/grafana/pkg/setting"
@@ -117,7 +119,7 @@ func TestIntegrationPluginManager(t *testing.T) {
 	lic := plicensing.ProvideLicensing(cfg, &licensing.OSSLicensingService{Cfg: cfg})
 	l := loader.ProvideService(pCfg, lic, signature.NewUnsignedAuthorizer(pCfg),
 		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(),
-		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg))
+		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
 	srcs := sources.ProvideService(cfg, pCfg)
 	ps, err := store.ProvideService(reg, srcs, l)
 	require.NoError(t, err)
diff --git a/pkg/plugins/manager/signature/manifest.go b/pkg/plugins/manager/signature/manifest.go
index 7fe263ed9ed..2f4bbcf853f 100644
--- a/pkg/plugins/manager/signature/manifest.go
+++ b/pkg/plugins/manager/signature/manifest.go
@@ -58,17 +58,25 @@ type Signature struct {
 
 var _ plugins.SignatureCalculator = &Signature{}
 
-func ProvideService(cfg *config.Cfg) *Signature {
+func ProvideService(cfg *config.Cfg, kv plugins.KeyStore) *Signature {
 	log := log.New("plugin.signature")
 	return &Signature{
-		verifier: manifestverifier.New(cfg, log),
+		verifier: manifestverifier.New(cfg, log, kv),
 		mlog:     log,
 	}
 }
 
+func (s *Signature) IsDisabled() bool {
+	return s.verifier.IsDisabled()
+}
+
+func (s *Signature) Run(ctx context.Context) error {
+	return s.verifier.Run(ctx)
+}
+
 // readPluginManifest attempts to read and verify the plugin manifest
 // if any error occurs or the manifest is not valid, this will return an error
-func (s *Signature) readPluginManifest(body []byte) (*PluginManifest, error) {
+func (s *Signature) readPluginManifest(ctx context.Context, body []byte) (*PluginManifest, error) {
 	block, _ := clearsign.Decode(body)
 	if block == nil {
 		return nil, errors.New("unable to decode manifest")
@@ -81,7 +89,7 @@ func (s *Signature) readPluginManifest(body []byte) (*PluginManifest, error) {
 		return nil, fmt.Errorf("%v: %w", "Error parsing manifest JSON", err)
 	}
 
-	if err = s.validateManifest(manifest, block); err != nil {
+	if err = s.validateManifest(ctx, manifest, block); err != nil {
 		return nil, err
 	}
 
@@ -131,7 +139,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 		}, nil
 	}
 
-	manifest, err := s.readPluginManifest(byteValue)
+	manifest, err := s.readPluginManifest(ctx, byteValue)
 	if err != nil {
 		s.mlog.Debug("Plugin signature invalid", "id", plugin.JSONData.ID, "err", err)
 		return plugins.Signature{
@@ -286,7 +294,7 @@ func (r invalidFieldErr) Error() string {
 	return fmt.Sprintf("valid manifest field %s is required", r.field)
 }
 
-func (s *Signature) validateManifest(m PluginManifest, block *clearsign.Block) error {
+func (s *Signature) validateManifest(ctx context.Context, m PluginManifest, block *clearsign.Block) error {
 	if len(m.Plugin) == 0 {
 		return invalidFieldErr{field: "plugin"}
 	}
@@ -314,5 +322,5 @@ func (s *Signature) validateManifest(m PluginManifest, block *clearsign.Block) e
 		}
 	}
 
-	return s.verifier.Verify(m.KeyID, block)
+	return s.verifier.Verify(ctx, m.KeyID, block)
 }
diff --git a/pkg/plugins/manager/signature/manifest_test.go b/pkg/plugins/manager/signature/manifest_test.go
index 3a1e887ffa8..5c9d78f7d37 100644
--- a/pkg/plugins/manager/signature/manifest_test.go
+++ b/pkg/plugins/manager/signature/manifest_test.go
@@ -10,9 +10,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -49,8 +51,8 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
 -----END PGP SIGNATURE-----`
 
 	t.Run("valid manifest", func(t *testing.T) {
-		s := ProvideService(&config.Cfg{})
-		manifest, err := s.readPluginManifest([]byte(txt))
+		s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		manifest, err := s.readPluginManifest(context.Background(), []byte(txt))
 
 		require.NoError(t, err)
 		require.NotNil(t, manifest)
@@ -66,8 +68,8 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
 
 	t.Run("invalid manifest", func(t *testing.T) {
 		modified := strings.ReplaceAll(txt, "README.md", "xxxxxxxxxx")
-		s := ProvideService(&config.Cfg{})
-		_, err := s.readPluginManifest([]byte(modified))
+		s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		_, err := s.readPluginManifest(context.Background(), []byte(modified))
 		require.Error(t, err)
 	})
 }
@@ -104,8 +106,8 @@ khdr/tZ1PDgRxMqB/u+Vtbpl0xSxgblnrDOYMSI=
 -----END PGP SIGNATURE-----`
 
 	t.Run("valid manifest", func(t *testing.T) {
-		s := ProvideService(&config.Cfg{})
-		manifest, err := s.readPluginManifest([]byte(txt))
+		s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		manifest, err := s.readPluginManifest(context.Background(), []byte(txt))
 
 		require.NoError(t, err)
 		require.NotNil(t, manifest)
@@ -158,7 +160,7 @@ func TestCalculate(t *testing.T) {
 			setting.AppUrl = tc.appURL
 
 			basePath := filepath.Join(parentDir, "testdata/non-pvt-with-root-url/plugin")
-			s := ProvideService(&config.Cfg{})
+			s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
 			sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 				PluginClassFunc: func(ctx context.Context) plugins.Class {
 					return plugins.External
@@ -189,7 +191,7 @@ func TestCalculate(t *testing.T) {
 		basePath := "../testdata/renderer-added-file/plugin"
 
 		runningWindows = true
-		s := ProvideService(&config.Cfg{})
+		s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
 		sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
 				return plugins.External
@@ -238,7 +240,7 @@ func TestCalculate(t *testing.T) {
 
 				basePath := "../testdata/app-with-child/dist"
 
-				s := ProvideService(&config.Cfg{})
+				s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
 				sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 					PluginClassFunc: func(ctx context.Context) plugins.Class {
 						return plugins.External
@@ -683,8 +685,8 @@ func Test_validateManifest(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			s := ProvideService(&config.Cfg{})
-			err := s.validateManifest(*tc.manifest, nil)
+			s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+			err := s.validateManifest(context.Background(), *tc.manifest, nil)
 			require.Errorf(t, err, tc.expectedErr)
 		})
 	}
diff --git a/pkg/plugins/manager/signature/manifestverifier/verifier.go b/pkg/plugins/manager/signature/manifestverifier/verifier.go
index a5cd6ce57cb..4424b8a8e42 100644
--- a/pkg/plugins/manager/signature/manifestverifier/verifier.go
+++ b/pkg/plugins/manager/signature/manifestverifier/verifier.go
@@ -2,6 +2,7 @@ package manifestverifier
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -14,10 +15,16 @@ import (
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
 	"github.com/ProtonMail/go-crypto/openpgp/packet"
+	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
+
+	// Only used for getting the feature flag value
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
+const publicKeySyncInterval = 10 * 24 * time.Hour // 10 days
+
 // ManifestKeys is the database representation of public keys
 // used to verify plugin manifests.
 type ManifestKeys struct {
@@ -30,20 +37,82 @@ type ManifestVerifier struct {
 	cfg  *config.Cfg
 	mlog log.Logger
 
-	lock       sync.Mutex
-	cli        http.Client
-	publicKeys map[string]ManifestKeys
+	lock    sync.Mutex
+	cli     http.Client
+	kv      plugins.KeyStore
+	hasKeys bool
 }
 
-func New(cfg *config.Cfg, mlog log.Logger) *ManifestVerifier {
-	return &ManifestVerifier{
-		cfg:        cfg,
-		publicKeys: map[string]ManifestKeys{},
-		mlog:       mlog,
-		cli:        makeHttpClient(),
+func New(cfg *config.Cfg, mlog log.Logger, kv plugins.KeyStore) *ManifestVerifier {
+	pmv := &ManifestVerifier{
+		cfg:  cfg,
+		mlog: mlog,
+		cli:  makeHttpClient(),
+		kv:   kv,
 	}
+	return pmv
 }
 
+// IsDisabled disables dynamic retrieval of public keys from the API server.
+func (pmv *ManifestVerifier) IsDisabled() bool {
+	return pmv.cfg == nil || pmv.cfg.Features == nil || !pmv.cfg.Features.IsEnabled(featuremgmt.FlagPluginsAPIManifestKey)
+}
+
+func (pmv *ManifestVerifier) Run(ctx context.Context) error {
+	// do an initial update if necessary
+	err := pmv.updateKeys(ctx)
+	if err != nil {
+		pmv.mlog.Error("Error downloading plugin manifest keys", "error", err)
+	}
+
+	// calculate initial send delay
+	lastUpdated, err := pmv.kv.GetLastUpdated(ctx)
+	if err != nil {
+		return err
+	}
+	nextSendInterval := time.Until(lastUpdated.Add(publicKeySyncInterval))
+	if nextSendInterval < time.Minute {
+		nextSendInterval = time.Minute
+	}
+
+	downloadKeysTicker := time.NewTicker(nextSendInterval)
+	defer downloadKeysTicker.Stop()
+
+	select {
+	case <-downloadKeysTicker.C:
+		err = pmv.updateKeys(ctx)
+		if err != nil {
+			pmv.mlog.Error("Error downloading plugin manifest keys", "error", err)
+		}
+
+		if nextSendInterval != publicKeySyncInterval {
+			nextSendInterval = publicKeySyncInterval
+			downloadKeysTicker.Reset(nextSendInterval)
+		}
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+
+	return ctx.Err()
+}
+
+func (pmv *ManifestVerifier) updateKeys(ctx context.Context) error {
+	pmv.lock.Lock()
+	defer pmv.lock.Unlock()
+
+	lastUpdated, err := pmv.kv.GetLastUpdated(ctx)
+	if err != nil {
+		return err
+	}
+	if time.Since(*lastUpdated) < publicKeySyncInterval {
+		// Cache is still valid
+		return nil
+	}
+
+	return pmv.downloadKeys(ctx)
+}
+
+const publicKeyID = "7e4d0c6a708866e7"
 const publicKeyText = `-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: OpenPGP.js v4.10.1
 Comment: https://openpgpjs.org
@@ -68,40 +137,24 @@ N1c5v9v/4h6qeA==
 -----END PGP PUBLIC KEY BLOCK-----
 `
 
-// getPublicKey loads public keys from:
-//   - The hard-coded value if the feature flag is not enabled.
-//   - A cached value from memory if it has been already retrieved.
-//   - The Grafana.com API if the database is empty.
-func (pmv *ManifestVerifier) GetPublicKey(keyID string) (string, error) {
-	if pmv.cfg == nil || pmv.cfg.Features == nil || !pmv.cfg.Features.IsEnabled("pluginsAPIManifestKey") {
-		return publicKeyText, nil
-	}
-
-	pmv.lock.Lock()
-	defer pmv.lock.Unlock()
-
-	key, exist := pmv.publicKeys[keyID]
-	if exist {
-		return key.PublicKey, nil
-	}
-
-	// Retrieve the key from the API and store it in the database
+// Retrieve the key from the API and store it in the database
+func (pmv *ManifestVerifier) downloadKeys(ctx context.Context) error {
 	var data struct {
 		Items []ManifestKeys
 	}
 
 	url, err := url.JoinPath(pmv.cfg.GrafanaComURL, "/api/plugins/ci/keys") // nolint:gosec URL is provided by config
 	if err != nil {
-		return "", err
+		return err
 	}
-	req, err := http.NewRequest(http.MethodGet, url, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	resp, err := pmv.cli.Do(req)
 	if err != nil {
-		return "", err
+		return err
 	}
 	defer func() {
 		err := resp.Body.Close()
@@ -111,27 +164,89 @@ func (pmv *ManifestVerifier) GetPublicKey(keyID string) (string, error) {
 	}()
 
 	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
-		return "", err
+		return err
 	}
 
 	if len(data.Items) == 0 {
-		return "", errors.New("missing public key")
+		return errors.New("missing public key")
 	}
 
+	cachedKeys, err := pmv.kv.ListKeys(ctx)
+	if err != nil {
+		return err
+	}
+
+	shouldKeep := make(map[string]bool)
 	for _, key := range data.Items {
-		pmv.publicKeys[key.KeyID] = key
+		err = pmv.kv.Set(ctx, key.KeyID, key.PublicKey)
+		if err != nil {
+			return err
+		}
+		shouldKeep[key.KeyID] = true
 	}
 
-	key, exist = pmv.publicKeys[keyID]
+	// Delete keys that are no longer in the API
+	for _, key := range cachedKeys {
+		if !shouldKeep[key] {
+			err = pmv.kv.Del(ctx, key)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// Update the last updated timestamp
+	return pmv.kv.SetLastUpdated(ctx)
+}
+
+func (pmv *ManifestVerifier) ensureKeys(ctx context.Context) error {
+	if pmv.hasKeys {
+		return nil
+	}
+	keys, err := pmv.kv.ListKeys(ctx)
+	if err != nil {
+		return err
+	}
+	if len(keys) == 0 {
+		// Populate with the default key
+		err := pmv.kv.Set(ctx, publicKeyID, publicKeyText)
+		if err != nil {
+			return err
+		}
+	}
+	pmv.hasKeys = true
+	return nil
+}
+
+// getPublicKey loads public keys from:
+//   - The hard-coded value if the feature flag is not enabled.
+//   - A cached value from kv storage if it has been already retrieved. This cache is populated from the grafana.com API.
+func (pmv *ManifestVerifier) getPublicKey(ctx context.Context, keyID string) (string, error) {
+	if pmv.IsDisabled() {
+		return publicKeyText, nil
+	}
+
+	pmv.lock.Lock()
+	defer pmv.lock.Unlock()
+
+	err := pmv.ensureKeys(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	key, exist, err := pmv.kv.Get(ctx, keyID)
+	if err != nil {
+		return "", err
+	}
 	if exist {
-		return key.PublicKey, nil
+		return key, nil
 	}
 
 	return "", fmt.Errorf("missing public key for %s", keyID)
 }
 
-func (pmv *ManifestVerifier) Verify(keyID string, block *clearsign.Block) error {
-	publicKey, err := pmv.GetPublicKey(keyID)
+func (pmv *ManifestVerifier) Verify(ctx context.Context, keyID string, block *clearsign.Block) error {
+	publicKey, err := pmv.getPublicKey(ctx, keyID)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/plugins/manager/signature/manifestverifier/verifier_test.go b/pkg/plugins/manager/signature/manifestverifier/verifier_test.go
index 116d447b3d2..2d5ed092d22 100644
--- a/pkg/plugins/manager/signature/manifestverifier/verifier_test.go
+++ b/pkg/plugins/manager/signature/manifestverifier/verifier_test.go
@@ -1,22 +1,26 @@
 package manifestverifier
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
+	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Verify(t *testing.T) {
 	t.Run("it should verify a manifest with the default key", func(t *testing.T) {
-		v := New(&config.Cfg{}, log.New("test"))
+		v := New(&config.Cfg{}, log.New("test"), keystore.ProvideService(kvstore.NewFakeKVStore()))
 
 		body, err := os.ReadFile("../../testdata/test-app/MANIFEST.txt")
 		if err != nil {
@@ -28,47 +32,107 @@ func Test_Verify(t *testing.T) {
 			t.Fatal("failed to decode")
 		}
 
-		err = v.Verify("7e4d0c6a708866e7", block)
+		err = v.Verify(context.Background(), "7e4d0c6a708866e7", block)
 		require.NoError(t, err)
 	})
+}
 
+func setFakeAPIServer(t *testing.T, publicKey string, keyID string) (*httptest.Server, chan bool) {
+	done := make(chan bool)
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/api/plugins/ci/keys" {
+			w.WriteHeader(http.StatusOK)
+			data := struct {
+				Items []ManifestKeys `json:"items"`
+			}{
+				Items: []ManifestKeys{{PublicKey: publicKey, KeyID: keyID}},
+			}
+			b, err := json.Marshal(data)
+			if err != nil {
+				t.Fatal(err)
+			}
+			_, err = w.Write(b)
+			if err != nil {
+				t.Fatal(err)
+			}
+			require.NoError(t, err)
+			done <- true
+			return
+		}
+		w.WriteHeader(http.StatusNotFound)
+		done <- true
+	})), done
+}
+func Test_PublicKeyUpdate(t *testing.T) {
 	t.Run("it should verify a manifest with the API key", func(t *testing.T) {
 		cfg := &config.Cfg{
-			Features: featuremgmt.WithFeatures([]interface{}{"pluginsAPIManifestKey"}...),
+			Features: featuremgmt.WithFeatures([]interface{}{featuremgmt.FlagPluginsAPIManifestKey}...),
 		}
-		v := New(cfg, log.New("test"))
-		apiCalled := false
-		s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if r.URL.Path == "/api/plugins/ci/keys" {
-				w.WriteHeader(http.StatusOK)
-				data := struct {
-					Items []ManifestKeys `json:"items"`
-				}{
-					Items: []ManifestKeys{{PublicKey: publicKeyText, KeyID: "7e4d0c6a708866e7"}},
-				}
-				b, err := json.Marshal(data)
-				require.NoError(t, err)
-				_, err = w.Write(b)
-				require.NoError(t, err)
-				apiCalled = true
-				return
-			}
-			w.WriteHeader(http.StatusNotFound)
-		}))
+		expectedKey := "fake"
+		s, done := setFakeAPIServer(t, expectedKey, "7e4d0c6a708866e7")
 		cfg.GrafanaComURL = s.URL
+		v := New(cfg, log.New("test"), keystore.ProvideService(kvstore.NewFakeKVStore()))
+		go func() {
+			err := v.Run(context.Background())
+			require.NoError(t, err)
+		}()
+		<-done
 
-		body, err := os.ReadFile("../../testdata/test-app/MANIFEST.txt")
-		if err != nil {
-			t.Fatal(err)
+		// wait for the lock to be free
+		v.lock.Lock()
+		defer v.lock.Unlock()
+		res, found, err := v.kv.Get(context.Background(), "7e4d0c6a708866e7")
+		require.NoError(t, err)
+		require.Equal(t, true, found)
+		require.Equal(t, expectedKey, res)
+	})
+
+	t.Run("it should update the latest update date", func(t *testing.T) {
+		cfg := &config.Cfg{
+			Features: featuremgmt.WithFeatures([]interface{}{featuremgmt.FlagPluginsAPIManifestKey}...),
 		}
+		expectedKey := "fake"
+		s, done := setFakeAPIServer(t, expectedKey, "7e4d0c6a708866e7")
+		cfg.GrafanaComURL = s.URL
+		v := New(cfg, log.New("test"), keystore.ProvideService(kvstore.NewFakeKVStore()))
+		go func() {
+			err := v.Run(context.Background())
+			require.NoError(t, err)
+		}()
+		<-done
+
+		// wait for the lock to be free
+		v.lock.Lock()
+		defer v.lock.Unlock()
+		ti, err := v.kv.GetLastUpdated(context.Background())
+		require.NoError(t, err)
+		require.Less(t, time.Time{}, *ti)
+	})
 
-		block, _ := clearsign.Decode(body)
-		if block == nil {
-			t.Fatal("failed to decode")
+	t.Run("it should remove old keys", func(t *testing.T) {
+		cfg := &config.Cfg{
+			Features: featuremgmt.WithFeatures([]interface{}{featuremgmt.FlagPluginsAPIManifestKey}...),
 		}
+		expectedKey := "fake"
+		s, done := setFakeAPIServer(t, expectedKey, "other")
+		cfg.GrafanaComURL = s.URL
+		v := New(cfg, log.New("test"), keystore.ProvideService(kvstore.NewFakeKVStore()))
+		go func() {
+			err := v.Run(context.Background())
+			require.NoError(t, err)
+		}()
+		<-done
+
+		// wait for the lock to be free
+		v.lock.Lock()
+		defer v.lock.Unlock()
+		_, found, err := v.kv.Get(context.Background(), "7e4d0c6a708866e7")
+		require.NoError(t, err)
+		require.Equal(t, false, found)
 
-		err = v.Verify("7e4d0c6a708866e7", block)
+		res, found, err := v.kv.Get(context.Background(), "other")
 		require.NoError(t, err)
-		require.Equal(t, true, apiCalled)
+		require.Equal(t, true, found)
+		require.Equal(t, expectedKey, res)
 	})
 }
diff --git a/pkg/server/backgroundsvcs/background_services.go b/pkg/server/backgroundsvcs/background_services.go
index 70e25fb1465..1900d9e455f 100644
--- a/pkg/server/backgroundsvcs/background_services.go
+++ b/pkg/server/backgroundsvcs/background_services.go
@@ -8,6 +8,7 @@ import (
 	uss "github.com/grafana/grafana/pkg/infra/usagestats/service"
 	"github.com/grafana/grafana/pkg/infra/usagestats/statscollector"
 	"github.com/grafana/grafana/pkg/plugins/manager/process"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/auth"
@@ -50,6 +51,7 @@ func ProvideBackgroundServiceRegistry(
 	grpcServerProvider grpcserver.Provider, secretMigrationProvider secretsMigrations.SecretMigrationProvider, loginAttemptService *loginattemptimpl.Service,
 	bundleService *supportbundlesimpl.Service,
 	publicDashboardsMetric *publicdashboardsmetric.Service,
+	signature *signature.Signature,
 	// Need to make sure these are initialized, is there a better place to put them?
 	_ dashboardsnapshots.Service, _ *alerting.AlertNotificationService,
 	_ serviceaccounts.Service, _ *guardian.Provider,
@@ -86,6 +88,7 @@ func ProvideBackgroundServiceRegistry(
 		loginAttemptService,
 		bundleService,
 		publicDashboardsMetric,
+		signature,
 	)
 }
 
diff --git a/pkg/services/pluginsintegration/keystore/keystore.go b/pkg/services/pluginsintegration/keystore/keystore.go
new file mode 100644
index 00000000000..80b5bf5c4ff
--- /dev/null
+++ b/pkg/services/pluginsintegration/keystore/keystore.go
@@ -0,0 +1,74 @@
+package keystore
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/kvstore"
+	"github.com/grafana/grafana/pkg/plugins"
+)
+
+// Service is a service for storing and retrieving public keys.
+type Service struct {
+	kv *kvstore.NamespacedKVStore
+}
+
+const (
+	prefix         = "key-"
+	lastUpdatedKey = "last_updated"
+)
+
+var _ plugins.KeyStore = (*Service)(nil)
+
+func ProvideService(kv kvstore.KVStore) *Service {
+	return &Service{
+		kv: kvstore.WithNamespace(kv, 0, "plugin.publickeys"),
+	}
+}
+
+func (s *Service) Get(ctx context.Context, key string) (string, bool, error) {
+	return s.kv.Get(ctx, prefix+key)
+}
+
+func (s *Service) Set(ctx context.Context, key string, value string) error {
+	return s.kv.Set(ctx, prefix+key, value)
+}
+
+func (s *Service) Del(ctx context.Context, key string) error {
+	return s.kv.Del(ctx, prefix+key)
+}
+
+func (s *Service) GetLastUpdated(ctx context.Context) (*time.Time, error) {
+	lastUpdated := &time.Time{}
+	if val, ok, err := s.kv.Get(ctx, lastUpdatedKey); err != nil {
+		return nil, fmt.Errorf("failed to get last updated time: %v", err)
+	} else if ok {
+		if parsed, err := time.Parse(time.RFC3339, val); err != nil {
+			return nil, fmt.Errorf("failed to parse last updated time: %v", err)
+		} else {
+			lastUpdated = &parsed
+		}
+	}
+	return lastUpdated, nil
+}
+
+func (s *Service) SetLastUpdated(ctx context.Context) error {
+	lastUpdated := time.Now()
+	if err := s.kv.Set(ctx, lastUpdatedKey, lastUpdated.Format(time.RFC3339)); err != nil {
+		return fmt.Errorf("failed to update last updated time: %v", err)
+	}
+	return nil
+}
+
+func (s *Service) ListKeys(ctx context.Context) ([]string, error) {
+	keys, err := s.kv.Keys(ctx, prefix)
+	if err != nil {
+		return nil, err
+	}
+	res := make([]string, 0, len(keys))
+	for _, key := range keys {
+		res = append(res, key.Key)
+	}
+	return res, nil
+}
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index bc4ab99eb47..12770e78a81 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -26,6 +26,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/oauthtoken"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
@@ -68,6 +69,8 @@ var WireSet = wire.NewSet(
 	wire.Bind(new(plugins.FileStore), new(*filestore.Service)),
 	wire.Bind(new(plugins.SignatureCalculator), new(*signature.Signature)),
 	signature.ProvideService,
+	wire.Bind(new(plugins.KeyStore), new(*keystore.Service)),
+	keystore.ProvideService,
 )
 
 // WireExtensionSet provides a wire.ProviderSet of plugin providers that can be

From b3aaf544a6f27fc1d152d67600d110b3c26460c8 Mon Sep 17 00:00:00 2001
From: Misi <mgyongyosi@users.noreply.github.com>
Date: Tue, 25 Apr 2023 13:13:55 +0200
Subject: [PATCH 387/729] Auth: Add authentication config frontend routes to
 api.go (#66931)

* Add auth config frontend routes to api.go

* Remove SAML related endpoints

* Fix routes

* Enable authconfig for Enterprise, Cloud Pro and Advanced

* Fix

* Update public/app/routes/routes.tsx

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>

---------

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
---
 pkg/api/api.go               |  4 ++++
 public/app/routes/routes.tsx | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index c19239757b6..72f86ea6a34 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -224,6 +224,10 @@ func (hs *HTTPServer) registerRoutes() {
 		r.Get("/user/auth-tokens/rotate", routing.Wrap(hs.RotateUserAuthTokenRedirect))
 	}
 
+	if hs.License.FeatureEnabled("saml") && hs.Features.IsEnabled(featuremgmt.FlagAuthenticationConfigUI) {
+		r.Get("/admin/authentication/", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)), hs.Index)
+	}
+
 	// authed api
 	r.Group("/api", func(apiRoute routing.RouteRegister) {
 		// user (signed in)
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index a41e7ee3f06..96ed930aa70 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -309,11 +309,12 @@ export function getAppRoutes(): RouteDescriptor[] {
     // ADMIN
     {
       path: '/admin/authentication',
-      component: config.featureToggles.authenticationConfigUI
-        ? SafeDynamicImport(
-            () => import(/* webpackChunkName: "AdminAuthentication" */ 'app/features/auth-config/AuthConfigPage')
-          )
-        : () => <Redirect to="/admin" />,
+      component:
+        config.featureToggles.authenticationConfigUI && config.licenseInfo.enabledFeatures?.saml
+          ? SafeDynamicImport(
+              () => import(/* webpackChunkName: "AdminAuthentication" */ 'app/features/auth-config/AuthConfigPage')
+            )
+          : () => <Redirect to="/admin" />,
     },
     {
       path: '/admin',

From a5e31575408d267346faea5dcc5be747682a0034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Tue, 25 Apr 2023 14:05:49 +0200
Subject: [PATCH 388/729] Docs: Fix help docs for SQL datasources (#66749)

Fix example queries for SQL datasources
---
 .../datasources/mssql/query-editor/index.md        | 14 +++++++-------
 docs/sources/datasources/mysql/_index.md           |  8 ++++----
 docs/sources/datasources/postgres/_index.md        |  8 ++++----
 public/app/plugins/datasource/mysql/CheatSheet.tsx |  4 ++--
 .../app/plugins/datasource/postgres/CheatSheet.tsx |  8 ++++----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/sources/datasources/mssql/query-editor/index.md b/docs/sources/datasources/mssql/query-editor/index.md
index 82ef3581b3a..a50c05944db 100644
--- a/docs/sources/datasources/mssql/query-editor/index.md
+++ b/docs/sources/datasources/mssql/query-editor/index.md
@@ -236,12 +236,12 @@ To optionally customize the default series name formatting, refer to [Standard o
 
 ```sql
 SELECT
-  $__timeGroup(time_date_time, '5m') as time,
+  $__timeGroupAlias(time_date_time, '5m'),
   min("value_double"),
   'min' as metric
 FROM test_data
 WHERE $__timeFilter(time_date_time)
-GROUP BY $__timeGroup(time_date_time, '5m')
+GROUP BY time
 ORDER BY 1
 ```
 
@@ -260,18 +260,18 @@ Data frame result:
 
 ### Time series query examples
 
-**Using the fill parameter in the $\_\_timeGroup macro to convert null values to be zero instead:**
+**Using the fill parameter in the $\_\_timeGroupAlias macro to convert null values to be zero instead:**
 
 ```sql
 SELECT
-  $__timeGroup(createdAt, '5m', 0) as time,
+  $__timeGroupAlias(createdAt, '5m', 0),
   sum(value) as value,
   hostname
 FROM test_data
 WHERE
   $__timeFilter(createdAt)
 GROUP BY
-  $__timeGroup(createdAt, '5m', 0),
+  time,
   hostname
 ORDER BY 1
 ```
@@ -295,12 +295,12 @@ Data frame result:
 
 ```sql
 SELECT
-  $__timeGroup(time_date_time, '5m'),
+  $__timeGroupAlias(time_date_time, '5m'),
   min(value_double) as min_value,
   max(value_double) as max_value
 FROM test_data
 WHERE $__timeFilter(time_date_time)
-GROUP BY $__timeGroup(time_date_time, '5m')
+GROUP BY time
 ORDER BY 1
 ```
 
diff --git a/docs/sources/datasources/mysql/_index.md b/docs/sources/datasources/mysql/_index.md
index 33ad8a30578..835cb3e7810 100644
--- a/docs/sources/datasources/mysql/_index.md
+++ b/docs/sources/datasources/mysql/_index.md
@@ -283,7 +283,7 @@ To optionally customize the default series name formatting, refer to [Standard o
 
 ```sql
 SELECT
-  $__timeGroup(time_date_time,'5m'),
+  $__timeGroupAlias(time_date_time,'5m'),
   min(value_double),
   'min' as metric
 FROM test_data
@@ -305,11 +305,11 @@ Data frame result:
 +---------------------+-----------------+
 ```
 
-**Example using the fill parameter in the $\_\_timeGroup macro to convert null values to be zero instead:**
+**Example using the fill parameter in the $\_\_timeGroupAlias macro to convert null values to be zero instead:**
 
 ```sql
 SELECT
-  $__timeGroup(createdAt,'5m',0),
+  $__timeGroupAlias(createdAt,'5m',0),
   sum(value_double) as value,
   hostname
 FROM test_data
@@ -338,7 +338,7 @@ Data frame result:
 
 ```sql
 SELECT
-  $__timeGroup(time_date_time,'5m'),
+  $__timeGroupAlias(time_date_time,'5m'),
   min(value_double) as min_value,
   max(value_double) as max_value
 FROM test_data
diff --git a/docs/sources/datasources/postgres/_index.md b/docs/sources/datasources/postgres/_index.md
index 82db22b8908..ef3960fefe3 100644
--- a/docs/sources/datasources/postgres/_index.md
+++ b/docs/sources/datasources/postgres/_index.md
@@ -235,7 +235,7 @@ To optionally customize the default series name formatting, refer to [Standard o
 
 ```sql
 SELECT
-  $__timeGroup("time_date_time",'5m'),
+  $__timeGroupAlias("time_date_time",'5m'),
   min("value_double"),
   'min' as metric
 FROM test_data
@@ -257,11 +257,11 @@ Data frame result:
 +---------------------+-----------------+
 ```
 
-**Example using the fill parameter in the $\_\_timeGroup macro to convert null values to be zero instead:**
+**Example using the fill parameter in the $\_\_timeGroupAlias macro to convert null values to be zero instead:**
 
 ```sql
 SELECT
-  $__timeGroup("createdAt",'5m',0),
+  $__timeGroupAlias("createdAt",'5m',0),
   sum(value) as value,
   hostname
 FROM test_data
@@ -290,7 +290,7 @@ Data frame result:
 
 ```sql
 SELECT
-  $__timeGroup("time_date_time",'5m'),
+  $__timeGroupAlias("time_date_time",'5m'),
   min("value_double") as "min_value",
   max("value_double") as "max_value"
 FROM test_data
diff --git a/public/app/plugins/datasource/mysql/CheatSheet.tsx b/public/app/plugins/datasource/mysql/CheatSheet.tsx
index 290b1d8f06b..febfdbdad2a 100644
--- a/public/app/plugins/datasource/mysql/CheatSheet.tsx
+++ b/public/app/plugins/datasource/mysql/CheatSheet.tsx
@@ -48,10 +48,10 @@ export function CheatSheet() {
         </li>
         <li>
           $__timeGroupAlias(column,&apos;5m&apos;) -&gt; cast(cast(UNIX_TIMESTAMP(column)/(300) as signed)*300 as
-          signed) AS &quote;time&quote;
+          signed) AS &quot;time&quot;
         </li>
         <li>$__unixEpochGroup(column,&apos;5m&apos;) -&gt; column DIV 300 * 300</li>
-        <li>$__unixEpochGroupAlias(column,&apos;5m&apos;) -&gt; column DIV 300 * 300 AS &quote;time&quote;</li>
+        <li>$__unixEpochGroupAlias(column,&apos;5m&apos;) -&gt; column DIV 300 * 300 AS &quot;time&quot;</li>
       </ul>
       <p>Example of group by and order by with $__timeGroup:</p>
       <pre>
diff --git a/public/app/plugins/datasource/postgres/CheatSheet.tsx b/public/app/plugins/datasource/postgres/CheatSheet.tsx
index b7403ced10c..8608b33cd81 100644
--- a/public/app/plugins/datasource/postgres/CheatSheet.tsx
+++ b/public/app/plugins/datasource/postgres/CheatSheet.tsx
@@ -32,8 +32,8 @@ export function CheatSheet() {
       </ul>
       Macros:
       <ul className={styles.ulPadding}>
-        <li>$__time(column) -&gt; column as &quote;time&quote;</li>
-        <li>$__timeEpoch -&gt; extract(epoch from column) as &quote;time&quote;</li>
+        <li>$__time(column) -&gt; column as &quot;time&quot;</li>
+        <li>$__timeEpoch -&gt; extract(epoch from column) as &quot;time&quot;</li>
         <li>
           $__timeFilter(column) -&gt; column BETWEEN &apos;2017-04-21T05:01:17Z&apos; AND
           &apos;2017-04-21T05:01:17Z&apos;
@@ -49,10 +49,10 @@ export function CheatSheet() {
         </li>
         <li>
           $__timeGroupAlias(column,&apos;5m&apos;) -&gt; (extract(epoch from column)/300)::bigint*300 AS
-          &quote;time&quote;
+          &quot;time&quot;
         </li>
         <li>$__unixEpochGroup(column,&apos;5m&apos;) -&gt; floor(column/300)*300</li>
-        <li>$__unixEpochGroupAlias(column,&apos;5m&apos;) -&gt; floor(column/300)*300 AS &quote;time&quote;</li>
+        <li>$__unixEpochGroupAlias(column,&apos;5m&apos;) -&gt; floor(column/300)*300 AS &quot;time&quot;</li>
       </ul>
       <p>Example of group by and order by with $__timeGroup:</p>
       <pre>

From c7aafea3700343a38729cde98f6a63e1c0866ad0 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Tue, 25 Apr 2023 14:24:16 +0200
Subject: [PATCH 389/729] Toolkit: Remove deprecated `plugin:sign` command
 (#67130)

---
 packages/grafana-toolkit/src/cli/index.ts     | 14 ++-----
 .../src/cli/tasks/plugin.sign.ts              | 42 -------------------
 2 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts

diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index 037288731f0..dbf7d8e7ab0 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -5,7 +5,6 @@ import { nodeVersionCheckerTask } from './tasks/nodeVersionChecker';
 import { buildPackageTask } from './tasks/package.build';
 import { pluginBuildTask } from './tasks/plugin.build';
 import { ciBuildPluginTask, ciPackagePluginTask, ciPluginReportTask } from './tasks/plugin.ci';
-import { pluginSignTask } from './tasks/plugin.sign';
 import { pluginUpdateTask } from './tasks/plugin.update';
 import { getToolkitVersion, githubPublishTask } from './tasks/plugin.utils';
 import { bundleManagedTask } from './tasks/plugin/bundle.managed';
@@ -123,17 +122,12 @@ export const run = (includeInternalScripts = false) => {
       },
       []
     )
-    .description('[Deprecated] Create a plugin signature')
-    .action(async (cmd) => {
+    .description('[removed] Use grafana sign-plugin instead')
+    .action(() => {
       console.log(
-        chalk.yellow('\n⚠️  DEPRECATED. This command is deprecated and will be removed in v10. ⚠️') +
-          '\nPlease migrate to grafana sign-plugin https://github.com/grafana/plugin-tools/tree/main/packages/sign-plugin'
+        'No longer supported. Use grafana sign-plugin https://github.com/grafana/plugin-tools/tree/main/packages/sign-plugin\n'
       );
-      await execTask(pluginSignTask)({
-        signatureType: cmd.signatureType,
-        rootUrls: cmd.rootUrls,
-        silent: true,
-      });
+      process.exit(1);
     });
 
   program
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts
deleted file mode 100644
index bec898243f1..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import path from 'path';
-
-import { assertRootUrlIsValid } from '../../config/utils/pluginValidation';
-import { buildManifest, signManifest, saveManifest } from '../../plugins/manifest';
-
-import { getToolkitVersion } from './plugin.utils';
-import { Task, TaskRunner } from './task';
-interface PluginSignOptions {
-  signatureType?: string;
-  rootUrls?: string[];
-}
-
-const pluginSignRunner: TaskRunner<PluginSignOptions> = async ({ signatureType, rootUrls }) => {
-  const distContentDir = path.resolve('dist');
-
-  try {
-    console.log('Building manifest...');
-    const manifest = await buildManifest(distContentDir);
-    // console.log(manifest);
-
-    console.log('Signing manifest...');
-    if (signatureType) {
-      manifest.signatureType = signatureType;
-    }
-    if (rootUrls && rootUrls.length > 0) {
-      rootUrls.forEach(assertRootUrlIsValid);
-      manifest.rootUrls = rootUrls;
-    }
-
-    manifest.toolkit = { version: getToolkitVersion() };
-    const signedManifest = await signManifest(manifest);
-
-    console.log('Saving signed manifest...');
-    await saveManifest(distContentDir, signedManifest);
-
-    console.log('Signed successfully');
-  } catch (err) {
-    console.warn(err);
-  }
-};
-
-export const pluginSignTask = new Task<PluginSignOptions>('plugin:sign task', pluginSignRunner);

From 6ca7d8fa37b944b04a9bf026b380611cc5849bd8 Mon Sep 17 00:00:00 2001
From: Sarah Zinger <sarah.zinger@grafana.com>
Date: Tue, 25 Apr 2023 08:27:30 -0400
Subject: [PATCH 390/729] Docs: Clarify backport milestone (#67117)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
---
 .github/bot.md                   | 2 +-
 contribute/merge-pull-request.md | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/bot.md b/.github/bot.md
index c08f03d1953..ec745bcf93a 100644
--- a/.github/bot.md
+++ b/.github/bot.md
@@ -23,7 +23,7 @@ Metrics are configured in [metrics-collector.json](https://github.com/grafana/gr
 ## Backport PR
 
 To automatically backport a PR to a release branch like v7.3.x add a label named `backport v7.3.x`. The label name should follow the pattern `backport <branch-name>`. Once merged grafanabot will automatically 
-try to cherry-pick the PR merge commit into that branch and open a PR. It will sync the milestone with the source PR so make sure the source PR also is assigned the milestone for the patch release. If the PR is already merged you can still add this label and trigger the backport automation. 
+try to cherry-pick the PR merge commit into that branch and open a PR. You must then add the milestone to your backport PR.
 
 If there are merge conflicts the bot will write a comment on the source PR saying the cherry-pick failed. In this case you have to do the cherry pick and backport PR manually. 
 
diff --git a/contribute/merge-pull-request.md b/contribute/merge-pull-request.md
index 69e2781fd4b..681f4ffe774 100644
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -44,6 +44,8 @@ A milestone **should** be added to every pull request. Several things in the Gra
 
 This makes it easier to track what changes go into a certain release. Without this information, release managers have to go through git commits which is not an efficient process.
 
+Always assign the milestone for the version that a PR is merged into. PRs targetting `main` should use the next minor (or major) version and backport PRs should use the same value than the target branch.
+
 ### Include in changelog and release notes?
 
 At Grafana we generate the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) and [release notes](https://grafana.com/docs/grafana/latest/release-notes/) based on merged pull requests. Including changes in the changelog/release notes is very important to provide a somewhat complete picture of what changes a Grafana release actually includes.

From de18ed665919701683a2125023ecea3e64f07caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 25 Apr 2023 14:55:50 +0200
Subject: [PATCH 391/729] PanelContext: Add functionality to update data from
 panel (#66993)

---
 .../components/PanelChrome/PanelContext.ts    |  7 +++
 .../dashboard/dashgrid/PanelStateWrapper.tsx  |  7 +++
 .../scenes/dashboard/DashboardsLoader.test.ts |  2 -
 .../app/plugins/datasource/grafana/utils.ts   | 56 +++++++++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 public/app/plugins/datasource/grafana/utils.ts

diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts b/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts
index 309f3cc1b81..336ca47e105 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts
@@ -8,6 +8,7 @@ import {
   ThresholdsConfig,
   SplitOpen,
   CoreApp,
+  DataFrame,
 } from '@grafana/data';
 
 import { AdHocFilterItem } from '../Table/types';
@@ -82,6 +83,12 @@ export interface PanelContext {
    * Called when a panel is changing the sort order of the legends.
    */
   onToggleLegendSort?: (sortBy: string) => void;
+
+  /**
+   * Optional, only some contexts support this. This action can be cancelled by user which will result
+   * in a the Promise resolving to a false value.
+   */
+  onUpdateData?: (frames: DataFrame[]) => Promise<boolean>;
 }
 
 export const PanelContextRoot = React.createContext<PanelContext>({
diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
index 08a09b9c45b..9d5f2f13b2d 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
@@ -8,6 +8,7 @@ import {
   AnnotationEventUIModel,
   CoreApp,
   DashboardCursorSync,
+  DataFrame,
   EventFilterOptions,
   FieldConfigSource,
   getDataSourceRef,
@@ -42,6 +43,7 @@ import { InspectTab } from 'app/features/inspector/types';
 import { getPanelLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { applyFilterFromTable } from 'app/features/variables/adhoc/actions';
+import { onUpdatePanelSnapshotData } from 'app/plugins/datasource/grafana/utils';
 import { changeSeriesColorConfigFactory } from 'app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory';
 import { dispatch } from 'app/store/store';
 import { RenderEvent } from 'app/types/events';
@@ -116,6 +118,7 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
         canEditAnnotations: props.dashboard.canEditAnnotations.bind(props.dashboard),
         canDeleteAnnotations: props.dashboard.canDeleteAnnotations.bind(props.dashboard),
         onAddAdHocFilter: this.onAddAdHocFilter,
+        onUpdateData: this.onUpdateData,
       },
       data: this.getInitialPanelDataState(),
     };
@@ -146,6 +149,10 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
     return CoreApp.Dashboard;
   }
 
+  onUpdateData = (frames: DataFrame[]): Promise<boolean> => {
+    return onUpdatePanelSnapshotData(this.props.panel, frames);
+  };
+
   onSeriesColorChange = (label: string, color: string) => {
     this.onFieldConfigChange(changeSeriesColorConfigFactory(label, color, this.props.panel.fieldConfig));
   };
diff --git a/public/app/features/scenes/dashboard/DashboardsLoader.test.ts b/public/app/features/scenes/dashboard/DashboardsLoader.test.ts
index 8d758d979c2..f99c01732c4 100644
--- a/public/app/features/scenes/dashboard/DashboardsLoader.test.ts
+++ b/public/app/features/scenes/dashboard/DashboardsLoader.test.ts
@@ -99,8 +99,6 @@ describe('DashboardLoader', () => {
       const loader = new DashboardLoader({});
       await loader.load('fake-dash');
       expect(loader.state.dashboard).toBeInstanceOf(DashboardScene);
-      // @ts-expect-error - private
-      expect(loader.state.dashboard?.urlSyncManager).toBeDefined();
       expect(loader.state.isLoading).toBe(false);
     });
   });
diff --git a/public/app/plugins/datasource/grafana/utils.ts b/public/app/plugins/datasource/grafana/utils.ts
new file mode 100644
index 00000000000..ec9b6ff321c
--- /dev/null
+++ b/public/app/plugins/datasource/grafana/utils.ts
@@ -0,0 +1,56 @@
+import { DataFrame, DataFrameJSON, dataFrameToJSON } from '@grafana/data';
+import appEvents from 'app/core/app_events';
+import { GRAFANA_DATASOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
+import { PanelModel } from 'app/features/dashboard/state';
+import { ShowConfirmModalEvent } from 'app/types/events';
+
+import { GrafanaQuery, GrafanaQueryType } from './types';
+
+/**
+ * Will show a confirm modal if the current panel does not have a snapshot query.
+ * If the confirm modal is shown, and the user aborts the promise will resolve with a false value,
+ * otherwise it will resolve with a true value.
+ */
+export function onUpdatePanelSnapshotData(panel: PanelModel, frames: DataFrame[]): Promise<boolean> {
+  return new Promise<boolean>((resolve) => {
+    if (panel.datasource?.uid === GRAFANA_DATASOURCE_NAME) {
+      updateSnapshotData(frames, panel);
+      resolve(true);
+      return;
+    }
+
+    appEvents.publish(
+      new ShowConfirmModalEvent({
+        title: 'Change to panel embedded data',
+        text: 'If you want to change the data shown in this panel Grafana will need to remove the panels current query and replace it with a snapshot of the current data. This enabled you to edit the data',
+        yesText: 'Continue',
+        icon: 'pen',
+        onConfirm: () => {
+          updateSnapshotData(frames, panel);
+          resolve(true);
+        },
+        onDismiss: () => {
+          resolve(false);
+        },
+      })
+    );
+  });
+}
+
+function updateSnapshotData(frames: DataFrame[], panel: PanelModel) {
+  const snapshot: DataFrameJSON[] = frames.map((f) => dataFrameToJSON(f));
+
+  const query: GrafanaQuery = {
+    refId: 'A',
+    queryType: GrafanaQueryType.Snapshot,
+    snapshot,
+    datasource: { uid: GRAFANA_DATASOURCE_NAME },
+  };
+
+  panel.updateQueries({
+    dataSource: { uid: GRAFANA_DATASOURCE_NAME },
+    queries: [query],
+  });
+
+  panel.refresh();
+}

From 29d3b79a0b37032540f1bec3abe9f8daac18b40e Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 25 Apr 2023 06:33:16 -0700
Subject: [PATCH 392/729] DataGrid: Avoid MutableDataFrame where possible
 (#67174)

* avoid mutable

* remove mutableDataFrame from utils also

* fix build and add couple more testss

---------

Co-authored-by: Victor Marin <victor.marin@grafana.com>
---
 .../plugins/panel/datagrid/DataGridPanel.tsx  | 75 +++++++++----------
 .../app/plugins/panel/datagrid/utils.test.ts  | 27 +++++++
 public/app/plugins/panel/datagrid/utils.ts    | 23 +++---
 3 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
index 7e0ba377af4..f99370c49ad 100644
--- a/public/app/plugins/panel/datagrid/DataGridPanel.tsx
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
@@ -10,7 +10,7 @@ import DataEditor, {
 } from '@glideapps/glide-data-grid';
 import React, { useEffect, useReducer } from 'react';
 
-import { ArrayVector, Field, MutableDataFrame, PanelProps, FieldType } from '@grafana/data';
+import { Field, PanelProps, FieldType } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
 import { useTheme2 } from '@grafana/ui';
 
@@ -85,36 +85,37 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
     const values = field.values.toArray();
 
     values[row] = newValue.data;
-    field.values = new ArrayVector(values);
+    field.values = values;
 
-    publishSnapshot(new MutableDataFrame(frame), id);
+    publishSnapshot(frame, id);
   };
 
   const onColumnInputBlur = (columnName: string) => {
     const len = frame.length ?? 0;
-    const newFrame = new MutableDataFrame(frame);
-
-    const field: Field = {
-      name: columnName,
-      type: FieldType.string,
-      config: {},
-      values: new ArrayVector(new Array(len).fill('')),
-    };
-
-    newFrame.addField(field);
-
-    publishSnapshot(newFrame, id);
+    publishSnapshot(
+      {
+        ...frame,
+        fields: [
+          ...frame.fields,
+          {
+            name: columnName,
+            type: FieldType.string,
+            config: {},
+            values: new Array(len).fill(''),
+          },
+        ],
+      },
+      id
+    );
   };
 
   const addNewRow = () => {
-    //TODO use .appendRow() after fieldValues refactor is finished
-    const newFrame = new MutableDataFrame(frame);
-
-    newFrame.fields.map((field) => {
-      field.values = new ArrayVector([...field.values.toArray(), null]);
+    const fields = frame.fields.map((f) => {
+      const values = f.values.slice(); // copy
+      values.push(null);
+      return { ...f, values };
     });
-
-    publishSnapshot(newFrame, id);
+    publishSnapshot({ ...frame, fields, length: frame.length + 1 }, id);
   };
 
   const onColumnResize = (column: GridColumn, width: number, columnIndex: number, newSizeWithGrow: number) => {
@@ -162,27 +163,25 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
   };
 
   const onColumnMove = (from: number, to: number) => {
-    const newFrame = new MutableDataFrame(frame);
-    const field = newFrame.fields[from];
-    newFrame.fields.splice(from, 1);
-    newFrame.fields.splice(to, 0, field);
+    const fields = frame.fields.map((f) => f);
+    const field = fields[from];
+    fields.splice(from, 1);
+    fields.splice(to, 0, field);
 
     dispatch({ type: DatagridActionType.columnMove, payload: { from, to } });
-    publishSnapshot(newFrame, id);
+    publishSnapshot({ ...frame, fields }, id);
   };
 
   const onRowMove = (from: number, to: number) => {
-    const newFrame = new MutableDataFrame(frame);
+    const fields = frame.fields.map((f) => ({ ...f, values: f.values.slice() }));
 
-    for (const field of newFrame.fields) {
-      const values = field.values.toArray();
-      const value = values[from];
-      values.splice(from, 1);
-      values.splice(to, 0, value);
-      field.values = new ArrayVector(values);
+    for (const field of fields) {
+      const value = field.values[from];
+      field.values.splice(from, 1);
+      field.values.splice(to, 0, value);
     }
 
-    publishSnapshot(newFrame, id);
+    publishSnapshot({ ...frame, fields }, id);
   };
 
   const onColumnRename = () => {
@@ -190,11 +189,11 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
   };
 
   const onRenameInputBlur = (columnName: string, columnIdx: number) => {
-    const newFrame = new MutableDataFrame(frame);
-    newFrame.fields[columnIdx].name = columnName;
+    const fields = frame.fields.map((f) => f);
+    fields[columnIdx].name = columnName;
 
     dispatch({ type: DatagridActionType.hideColumnRenameInput });
-    publishSnapshot(newFrame, id);
+    publishSnapshot({ ...frame, fields }, id);
   };
 
   const onSearchClose = () => {
diff --git a/public/app/plugins/panel/datagrid/utils.test.ts b/public/app/plugins/panel/datagrid/utils.test.ts
index 9face79dd1f..3d493c2106a 100644
--- a/public/app/plugins/panel/datagrid/utils.test.ts
+++ b/public/app/plugins/panel/datagrid/utils.test.ts
@@ -70,6 +70,20 @@ describe('when deleting rows', () => {
     expect(newDf.fields[2].values.toArray()).toEqual([]);
     expect(newDf.length).toEqual(0);
   });
+
+  it('should do nothing if there are no fields', () => {
+    const newDf = deleteRows(
+      {
+        name: 'emptyDataframe',
+        fields: [],
+        length: 0,
+      },
+      [0, 1, 2, 3, 4],
+      true
+    );
+
+    expect(newDf.length).toEqual(0);
+  });
 });
 
 describe('when clearing cells from range selection', () => {
@@ -119,4 +133,17 @@ describe('when clearing cells from range selection', () => {
     expect(newDf.fields[2].values.toArray()).toEqual(['a', 'b', 'c', 'd', 'e']);
     expect(newDf.length).toEqual(5);
   });
+
+  it('should do nothing if there are no fields', () => {
+    const newDf = clearCellsFromRangeSelection(
+      {
+        name: 'emptyDataframe',
+        fields: [],
+        length: 0,
+      },
+      { x: 0, y: 0, width: 0, height: 0 }
+    );
+
+    expect(newDf.length).toEqual(0);
+  });
 });
diff --git a/public/app/plugins/panel/datagrid/utils.ts b/public/app/plugins/panel/datagrid/utils.ts
index 993cecc1798..5cb6cf08724 100644
--- a/public/app/plugins/panel/datagrid/utils.ts
+++ b/public/app/plugins/panel/datagrid/utils.ts
@@ -1,16 +1,7 @@
 import { css } from '@emotion/css';
 import { CompactSelection, GridCell, GridCellKind, GridSelection, Theme } from '@glideapps/glide-data-grid';
 
-import {
-  ArrayVector,
-  DataFrame,
-  DataFrameJSON,
-  dataFrameToJSON,
-  MutableDataFrame,
-  Field,
-  GrafanaTheme2,
-  FieldType,
-} from '@grafana/data';
+import { ArrayVector, DataFrame, DataFrameJSON, dataFrameToJSON, Field, GrafanaTheme2, FieldType } from '@grafana/data';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { GrafanaQuery, GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 
@@ -131,7 +122,11 @@ export const deleteRows = (gridData: DataFrame, rows: number[], hardDelete = fal
     field.values = new ArrayVector(valuesArray);
   }
 
-  return new MutableDataFrame(gridData);
+  return {
+    ...gridData,
+    fields: [...gridData.fields],
+    length: gridData.fields[0]?.values.length ?? 0,
+  };
 };
 
 export const clearCellsFromRangeSelection = (gridData: DataFrame, range: CellRange): DataFrame => {
@@ -147,7 +142,11 @@ export const clearCellsFromRangeSelection = (gridData: DataFrame, range: CellRan
     field.values = new ArrayVector(valuesArray);
   }
 
-  return new MutableDataFrame(gridData);
+  return {
+    ...gridData,
+    fields: [...gridData.fields],
+    length: gridData.fields[0]?.values.length ?? 0,
+  };
 };
 
 export const publishSnapshot = (data: DataFrame, panelID: number): void => {

From 2f1a08511a66d088ec503c041725152e41317076 Mon Sep 17 00:00:00 2001
From: Polina Boneva <13227501+polibb@users.noreply.github.com>
Date: Tue, 25 Apr 2023 17:06:54 +0300
Subject: [PATCH 393/729] [Chore] Dashboard: Update analytic events for new
 panel/row/import/pasted panel (#67205)

update analytic events for new panel/row/import/pasted panel
---
 .../dashboard/components/AddPanelButton/AddPanelMenu.tsx  | 8 ++++----
 public/app/features/dashboard/dashgrid/DashboardEmpty.tsx | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
index e4c636bf0b2..f7f69edb45e 100644
--- a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
+++ b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
@@ -27,7 +27,7 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
         label={t('dashboard.add-menu.visualization', 'Visualization')}
         testId={selectors.components.PageToolbar.itemButton('Add new visualization menu item')}
         onClick={() => {
-          reportInteraction('Create new panel');
+          reportInteraction('dashboards_toolbar_add_clicked', { item: 'add_visualization' });
           const id = onCreateNewPanel(dashboard);
           locationService.partial({ editPanel: id });
         }}
@@ -37,7 +37,7 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
         label={t('dashboard.add-menu.row', 'Row')}
         testId={selectors.components.PageToolbar.itemButton('Add new row menu item')}
         onClick={() => {
-          reportInteraction('Create new row');
+          reportInteraction('dashboards_toolbar_add_clicked', { item: 'add_row' });
           onCreateNewRow(dashboard);
         }}
       />
@@ -46,7 +46,7 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
         label={t('dashboard.add-menu.import', 'Import from library')}
         testId={selectors.components.PageToolbar.itemButton('Add new panel from panel library menu item')}
         onClick={() => {
-          reportInteraction('Add a panel from the panel library');
+          reportInteraction('dashboards_toolbar_add_clicked', { item: 'import_from_library' });
           onAddLibraryPanel(dashboard);
         }}
       />
@@ -55,7 +55,7 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
         label={t('dashboard.add-menu.paste-panel', 'Paste panel')}
         testId={selectors.components.PageToolbar.itemButton('Add new panel from clipboard menu item')}
         onClick={() => {
-          reportInteraction('Paste panel from clipboard');
+          reportInteraction('dashboards_toolbar_add_clicked', { item: 'paste_panel' });
           onPasteCopiedPanel(dashboard, copiedPanelPlugin);
         }}
         disabled={!copiedPanelPlugin}
diff --git a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
index e5ce1303a3a..19070bda0cd 100644
--- a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
@@ -36,7 +36,7 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
             icon="plus"
             aria-label="Add new panel"
             onClick={() => {
-              reportInteraction('Create new panel');
+              reportInteraction('dashboards_emptydashboard_clicked', { item: 'add_visualization' });
               const id = onCreateNewPanel(dashboard);
               locationService.partial({ editPanel: id });
             }}
@@ -58,7 +58,7 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
               fill="outline"
               aria-label="Add new row"
               onClick={() => {
-                reportInteraction('Create new row');
+                reportInteraction('dashboards_emptydashboard_clicked', { item: 'add_row' });
                 onCreateNewRow(dashboard);
               }}
               disabled={!canCreate}
@@ -80,7 +80,7 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
               fill="outline"
               aria-label="Add new panel from panel library"
               onClick={() => {
-                reportInteraction('Add a panel from the panel library');
+                reportInteraction('dashboards_emptydashboard_clicked', { item: 'import_from_library' });
                 onAddLibraryPanel(dashboard);
               }}
               disabled={!canCreate}

From 63777ea368f02657ac5871a24d7c55d31137bb23 Mon Sep 17 00:00:00 2001
From: Andrej Ocenas <mr.ocenas@gmail.com>
Date: Tue, 25 Apr 2023 16:08:18 +0200
Subject: [PATCH 394/729] Phlare: Support both Phlare and Pyroscope backends
 (#66989)

---
 .github/CODEOWNERS                            |   1 +
 .../blocks/pyroscope/docker-compose.yaml      |   6 +
 pkg/tests/api/plugins/api_plugins_test.go     |   4 +
 .../api/plugins/data/expectedListResp.json    |  95 +++---
 pkg/tsdb/phlare/client.go                     |  66 +++++
 pkg/tsdb/phlare/instance.go                   | 209 ++++++++-----
 pkg/tsdb/phlare/instance_test.go              |   6 +-
 .../kinds/dataquery/types_dataquery_gen.go    |   4 +-
 pkg/tsdb/phlare/phlareClient.go               | 164 ++++++++++
 pkg/tsdb/phlare/phlareClient_test.go          | 109 +++++++
 pkg/tsdb/phlare/pyroscopeClient.go            | 279 ++++++++++++++++++
 pkg/tsdb/phlare/query.go                      |  95 ++----
 pkg/tsdb/phlare/query_test.go                 | 205 +++++--------
 .../datasource/phlare/ConfigEditor.tsx        |  86 +++++-
 .../phlare/QueryEditor/LabelsEditor.tsx       |  36 ++-
 .../phlare/QueryEditor/QueryEditor.test.tsx   |  16 +-
 .../phlare/QueryEditor/QueryEditor.tsx        | 163 +++++++---
 .../phlare/QueryEditor/QueryOptions.tsx       |  27 +-
 .../phlare/QueryEditor/autocomplete.test.ts   |  40 +--
 .../phlare/QueryEditor/autocomplete.ts        |  68 ++---
 .../datasource/phlare/dataquery.gen.ts        |   4 +-
 .../plugins/datasource/phlare/datasource.ts   |  19 +-
 .../phlare/img/grafana_pyroscope_icon.svg     |  15 +
 .../phlare/img/phlare_icon_color.svg          |   1 -
 .../app/plugins/datasource/phlare/plugin.json |  10 +-
 public/app/plugins/datasource/phlare/types.ts |  17 +-
 26 files changed, 1249 insertions(+), 496 deletions(-)
 create mode 100644 devenv/docker/blocks/pyroscope/docker-compose.yaml
 create mode 100644 pkg/tsdb/phlare/client.go
 create mode 100644 pkg/tsdb/phlare/phlareClient.go
 create mode 100644 pkg/tsdb/phlare/phlareClient_test.go
 create mode 100644 pkg/tsdb/phlare/pyroscopeClient.go
 create mode 100644 public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg
 delete mode 100644 public/app/plugins/datasource/phlare/img/phlare_icon_color.svg

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 370bbf53dca..887be3290ce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -193,6 +193,7 @@
 /devenv/docker/blocks/postgres_tests/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/prometheus/ @grafana/observability-metrics
 /devenv/docker/blocks/prometheus_random_data/ @grafana/observability-metrics
+/devenv/docker/blocks/pyroscope/ @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/redis/ @bergquist
 /devenv/docker/blocks/sensugo/ @grafana/backend-platform
 /devenv/docker/blocks/slow_proxy/ @bergquist
diff --git a/devenv/docker/blocks/pyroscope/docker-compose.yaml b/devenv/docker/blocks/pyroscope/docker-compose.yaml
new file mode 100644
index 00000000000..8a8a31a3219
--- /dev/null
+++ b/devenv/docker/blocks/pyroscope/docker-compose.yaml
@@ -0,0 +1,6 @@
+  pyroscope:
+    image: "pyroscope/pyroscope:latest"
+    command:
+      - "server"
+    ports:
+      - "4040:4040"
diff --git a/pkg/tests/api/plugins/api_plugins_test.go b/pkg/tests/api/plugins/api_plugins_test.go
index ccdfbd2f94d..8b6de85888e 100644
--- a/pkg/tests/api/plugins/api_plugins_test.go
+++ b/pkg/tests/api/plugins/api_plugins_test.go
@@ -76,6 +76,10 @@ func TestIntegrationPlugins(t *testing.T) {
 		})
 	})
 
+	//
+	// NOTE:
+	// If this test is failing due to changes in plugins just rerun with updateSnapshotFlag = true at the top.
+	//
 	t.Run("List", func(t *testing.T) {
 		testCases := []testCase{
 			{
diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json
index 4303ab01d9a..e0120dc9bae 100644
--- a/pkg/tests/api/plugins/data/expectedListResp.json
+++ b/pkg/tests/api/plugins/data/expectedListResp.json
@@ -643,6 +643,47 @@
     "signatureType": "",
     "signatureOrg": ""
   },
+  {
+    "name": "Grafana Pyroscope",
+    "type": "datasource",
+    "id": "phlare",
+    "enabled": true,
+    "pinned": false,
+    "info": {
+      "author": {
+        "name": "Grafana Labs",
+        "url": "https://www.grafana.com"
+      },
+      "description": "Supports Phlare and Pyroscope backends, horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation systems.",
+      "links": [
+        {
+          "name": "GitHub Project",
+          "url": "https://github.com/grafana/phlare"
+        }
+      ],
+      "logos": {
+        "small": "public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg",
+        "large": "public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg"
+      },
+      "build": {},
+      "screenshots": null,
+      "version": "",
+      "updated": ""
+    },
+    "dependencies": {
+      "grafanaDependency": "",
+      "grafanaVersion": "*",
+      "plugins": []
+    },
+    "latestVersion": "",
+    "hasUpdate": false,
+    "defaultNavUrl": "/plugins/phlare/",
+    "category": "profiling",
+    "state": "",
+    "signature": "internal",
+    "signatureType": "",
+    "signatureOrg": ""
+  },
   {
     "name": "Graph (old)",
     "type": "panel",
@@ -1137,7 +1178,8 @@
     "signature": "internal",
     "signatureType": "",
     "signatureOrg": ""
-  },{
+  },
+  {
     "name": "Parca",
     "type": "datasource",
     "id": "parca",
@@ -1149,10 +1191,12 @@
         "url": "https://www.grafana.com"
       },
       "description": "Continuous profiling for analysis of CPU and memory usage, down to the line number and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.",
-      "links": [{
-        "name": "GitHub Project",
-        "url": "https://github.com/parca-dev/parca"
-      }],
+      "links": [
+        {
+          "name": "GitHub Project",
+          "url": "https://github.com/parca-dev/parca"
+        }
+      ],
       "logos": {
         "small": "public/app/plugins/datasource/parca/img/logo-small.svg",
         "large": "public/app/plugins/datasource/parca/img/logo-small.svg"
@@ -1176,45 +1220,6 @@
     "signatureType": "",
     "signatureOrg": ""
   },
-  {
-    "name": "Phlare",
-    "type": "datasource",
-    "id": "phlare",
-    "enabled": true,
-    "pinned": false,
-    "info": {
-      "author": {
-        "name": "Grafana Labs",
-        "url": "https://www.grafana.com"
-      },
-      "description": "Horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system. OSS profiling solution from Grafana Labs.",
-      "links": [{
-        "name": "GitHub Project",
-        "url": "https://github.com/grafana/phlare"
-      }],
-      "logos": {
-        "small": "public/app/plugins/datasource/phlare/img/phlare_icon_color.svg",
-        "large": "public/app/plugins/datasource/phlare/img/phlare_icon_color.svg"
-      },
-      "build": {},
-      "screenshots": null,
-      "version": "",
-      "updated": ""
-    },
-    "dependencies": {
-      "grafanaDependency": "",
-      "grafanaVersion": "*",
-      "plugins": []
-    },
-    "latestVersion": "",
-    "hasUpdate": false,
-    "defaultNavUrl": "/plugins/phlare/",
-    "category": "profiling",
-    "state": "",
-    "signature": "internal",
-    "signatureType": "",
-    "signatureOrg": ""
-  },
   {
     "name": "Pie chart",
     "type": "panel",
@@ -1806,4 +1811,4 @@
     "signatureType": "",
     "signatureOrg": ""
   }
-]
+]
\ No newline at end of file
diff --git a/pkg/tsdb/phlare/client.go b/pkg/tsdb/phlare/client.go
new file mode 100644
index 00000000000..3414122b74b
--- /dev/null
+++ b/pkg/tsdb/phlare/client.go
@@ -0,0 +1,66 @@
+package phlare
+
+import (
+	"context"
+	"net/http"
+)
+
+type ProfilingClient interface {
+	ProfileTypes(context.Context) ([]*ProfileType, error)
+	LabelNames(ctx context.Context, query string, start int64, end int64) ([]string, error)
+	LabelValues(ctx context.Context, query string, label string, start int64, end int64) ([]string, error)
+	GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error)
+	GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64) (*ProfileResponse, error)
+}
+
+type ProfileType struct {
+	ID    string `json:"id"`
+	Label string `json:"label"`
+}
+
+func getClient(backendType string, httpClient *http.Client, url string) ProfilingClient {
+	if backendType == "pyroscope" {
+		return NewPyroscopeClient(httpClient, url)
+	}
+
+	// We treat unset value as phlare
+	return NewPhlareClient(httpClient, url)
+}
+
+type Flamebearer struct {
+	Names   []string
+	Levels  []*Level
+	Total   int64
+	MaxSelf int64
+}
+
+type Level struct {
+	Values []int64
+}
+
+type Series struct {
+	Labels []*LabelPair
+	Points []*Point
+}
+
+type LabelPair struct {
+	Name  string
+	Value string
+}
+
+type Point struct {
+	Value float64
+	// Milliseconds unix timestamp
+	Timestamp int64
+}
+
+type ProfileResponse struct {
+	Flamebearer *Flamebearer
+	Units       string
+}
+
+type SeriesResponse struct {
+	Series []*Series
+	Units  string
+	Label  string
+}
diff --git a/pkg/tsdb/phlare/instance.go b/pkg/tsdb/phlare/instance.go
index 332873de203..04f101f123c 100644
--- a/pkg/tsdb/phlare/instance.go
+++ b/pkg/tsdb/phlare/instance.go
@@ -3,18 +3,16 @@ package phlare
 import (
 	"context"
 	"encoding/json"
+	"fmt"
+	"net/http"
 	"net/url"
-	"strings"
+	"strconv"
 	"time"
 
-	"github.com/bufbuild/connect-go"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
-	querierv1 "github.com/grafana/phlare/api/gen/proto/go/querier/v1"
-	"github.com/grafana/phlare/api/gen/proto/go/querier/v1/querierv1connect"
-	typesv1 "github.com/grafana/phlare/api/gen/proto/go/types/v1"
 )
 
 var (
@@ -26,7 +24,13 @@ var (
 
 // PhlareDatasource is a datasource for querying application performance profiles.
 type PhlareDatasource struct {
-	client querierv1connect.QuerierServiceClient
+	httpClient *http.Client
+	client     ProfilingClient
+	settings   backend.DataSourceInstanceSettings
+}
+
+type JsonData struct {
+	BackendType string `json:"backendType"`
 }
 
 // NewPhlareDatasource creates a new datasource instance.
@@ -40,93 +44,152 @@ func NewPhlareDatasource(httpClientProvider httpclient.Provider, settings backen
 		return nil, err
 	}
 
+	var jsonData *JsonData
+	err = json.Unmarshal(settings.JSONData, &jsonData)
+	if err != nil {
+		return nil, err
+	}
+
 	return &PhlareDatasource{
-		client: querierv1connect.NewQuerierServiceClient(httpClient, settings.URL),
+		httpClient: httpClient,
+		client:     getClient(jsonData.BackendType, httpClient, settings.URL),
+		settings:   settings,
 	}, nil
 }
 
 func (d *PhlareDatasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	logger.Debug("CallResource", "Path", req.Path, "Method", req.Method, "Body", req.Body)
 	if req.Path == "profileTypes" {
-		return d.callProfileTypes(ctx, req, sender)
+		return d.profileTypes(ctx, req, sender)
 	}
 	if req.Path == "labelNames" {
-		return d.callLabelNames(ctx, req, sender)
+		return d.labelNames(ctx, req, sender)
 	}
-	if req.Path == "series" {
-		return d.callSeries(ctx, req, sender)
+	if req.Path == "labelValues" {
+		return d.labelValues(ctx, req, sender)
+	}
+	if req.Path == "backendType" {
+		return d.backendType(ctx, req, sender)
 	}
 	return sender.Send(&backend.CallResourceResponse{
 		Status: 404,
 	})
 }
 
-func (d *PhlareDatasource) callProfileTypes(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	res, err := d.client.ProfileTypes(ctx, connect.NewRequest(&querierv1.ProfileTypesRequest{}))
+func (d *PhlareDatasource) profileTypes(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	types, err := d.client.ProfileTypes(ctx)
 	if err != nil {
 		return err
 	}
-	var data []byte
-	if res.Msg.ProfileTypes == nil {
-		// Let's make sure we send at least empty array if we don't have any types
-		data, err = json.Marshal([]*typesv1.ProfileType{})
+	bodyData, err := json.Marshal(types)
+	if err != nil {
+		return err
+	}
+	err = sender.Send(&backend.CallResourceResponse{Body: bodyData, Headers: req.Headers, Status: 200})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *PhlareDatasource) labelNames(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	u, err := url.Parse(req.URL)
+	if err != nil {
+		return err
+	}
+	query := u.Query()
+	start, err := strconv.ParseInt(query["start"][0], 10, 64)
+	if err != nil {
+		return err
+	}
+	end, err := strconv.ParseInt(query["end"][0], 10, 64)
+	if err != nil {
+		return err
+	}
+
+	res, err := d.client.LabelNames(ctx, query["query"][0], start, end)
+	if err != nil {
+		return fmt.Errorf("error calling LabelNames: %v", err)
+	}
+	data, err := json.Marshal(res)
+	if err != nil {
+		return err
+	}
+	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+type LabelValuesPayload struct {
+	Query string
+	Label string
+	Start int64
+	End   int64
+}
+
+func (d *PhlareDatasource) labelValues(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	u, err := url.Parse(req.URL)
+	if err != nil {
+		return err
+	}
+	query := u.Query()
+	start, err := strconv.ParseInt(query["start"][0], 10, 64)
+	if err != nil {
+		return err
+	}
+	end, err := strconv.ParseInt(query["end"][0], 10, 64)
+	if err != nil {
+		return err
+	}
+
+	res, err := d.client.LabelValues(ctx, query["query"][0], query["label"][0], start, end)
+	if err != nil {
+		return fmt.Errorf("error calling LabelValues: %v", err)
+	}
+	data, err := json.Marshal(res)
+	if err != nil {
+		return err
+	}
+	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+type BackendTypeRespBody struct {
+	BackendType string `json:"backendType"` // "phlare" or "pyroscope"
+}
+
+// backendType is a simplistic test to figure out if we are speaking to phlare or pyroscope backend
+func (d *PhlareDatasource) backendType(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	u, err := url.Parse(req.URL)
+	if err != nil {
+		return err
+	}
+	query := u.Query()
+	body := &BackendTypeRespBody{BackendType: "unknown"}
+
+	pyroClient := getClient("pyroscope", d.httpClient, query["url"][0])
+	_, err = pyroClient.ProfileTypes(ctx)
+
+	if err == nil {
+		body.BackendType = "pyroscope"
 	} else {
-		data, err = json.Marshal(res.Msg.ProfileTypes)
-	}
-	if err != nil {
-		return err
-	}
-	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-type SeriesRequestJson struct {
-	Matchers []string `json:"matchers"`
-}
-
-func (d *PhlareDatasource) callSeries(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	parsedUrl, err := url.Parse(req.URL)
-	if err != nil {
-		return err
-	}
-	matchers, ok := parsedUrl.Query()["matchers"]
-	if !ok {
-		matchers = []string{"{}"}
+		phlareClient := getClient("phlare", d.httpClient, d.settings.URL)
+		_, err := phlareClient.ProfileTypes(ctx)
+		if err == nil {
+			body.BackendType = "phlare"
+		}
 	}
 
-	res, err := d.client.Series(ctx, connect.NewRequest(&querierv1.SeriesRequest{Matchers: matchers}))
+	data, err := json.Marshal(body)
 	if err != nil {
 		return err
 	}
 
-	for _, val := range res.Msg.LabelsSet {
-		withoutPrivate := withoutPrivateLabels(val.Labels)
-		val.Labels = withoutPrivate
-	}
-
-	data, err := json.Marshal(res.Msg.LabelsSet)
-	if err != nil {
-		return err
-	}
-	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *PhlareDatasource) callLabelNames(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	res, err := d.client.LabelNames(ctx, connect.NewRequest(&querierv1.LabelNamesRequest{}))
-	if err != nil {
-		return err
-	}
-	data, err := json.Marshal(res.Msg.Names)
-	if err != nil {
-		return err
-	}
 	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
 	if err != nil {
 		return err
@@ -166,7 +229,7 @@ func (d *PhlareDatasource) CheckHealth(ctx context.Context, _ *backend.CheckHeal
 	status := backend.HealthStatusOk
 	message := "Data source is working"
 
-	if _, err := d.client.ProfileTypes(ctx, connect.NewRequest(&querierv1.ProfileTypesRequest{})); err != nil {
+	if _, err := d.client.ProfileTypes(ctx); err != nil {
 		status = backend.HealthStatusError
 		message = err.Error()
 	}
@@ -239,13 +302,3 @@ func (d *PhlareDatasource) PublishStream(_ context.Context, _ *backend.PublishSt
 		Status: backend.PublishStreamStatusPermissionDenied,
 	}, nil
 }
-
-func withoutPrivateLabels(labels []*typesv1.LabelPair) []*typesv1.LabelPair {
-	res := make([]*typesv1.LabelPair, 0, len(labels))
-	for _, l := range labels {
-		if !strings.HasPrefix(l.Name, "__") {
-			res = append(res, l)
-		}
-	}
-	return res
-}
diff --git a/pkg/tsdb/phlare/instance_test.go b/pkg/tsdb/phlare/instance_test.go
index cba4d3fb409..9849e843b04 100644
--- a/pkg/tsdb/phlare/instance_test.go
+++ b/pkg/tsdb/phlare/instance_test.go
@@ -40,9 +40,9 @@ func Test_CallResource(t *testing.T) {
 			context.Background(),
 			&backend.CallResourceRequest{
 				PluginContext: backend.PluginContext{},
-				Path:          "series",
+				Path:          "profileTypes",
 				Method:        "GET",
-				URL:           "series?matchers=%7B%7D",
+				URL:           "profileTypes",
 				Headers:       nil,
 				Body:          nil,
 			},
@@ -50,7 +50,7 @@ func Test_CallResource(t *testing.T) {
 		)
 		require.NoError(t, err)
 		require.Equal(t, 200, sender.Resp.Status)
-		require.Equal(t, `[{"labels":[{"name":"instance","value":"127.0.0.1"},{"name":"job","value":"default"}]}]`, string(sender.Resp.Body))
+		require.Equal(t, `[{"id":"type:1","label":"cpu"},{"id":"type:2","label":"memory"}]`, string(sender.Resp.Body))
 	})
 }
 
diff --git a/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go
index 9f84d4839ee..1b4ff0173ac 100644
--- a/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go
@@ -16,8 +16,8 @@ const (
 	PhlareQueryTypeProfile PhlareQueryType = "profile"
 )
 
-// PhlareDataQuery defines model for PhlareDataQuery.
-type PhlareDataQuery struct {
+// GrafanaPyroscopeDataQuery defines model for GrafanaPyroscopeDataQuery.
+type GrafanaPyroscopeDataQuery struct {
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
diff --git a/pkg/tsdb/phlare/phlareClient.go b/pkg/tsdb/phlare/phlareClient.go
new file mode 100644
index 00000000000..39e0dd218f7
--- /dev/null
+++ b/pkg/tsdb/phlare/phlareClient.go
@@ -0,0 +1,164 @@
+package phlare
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/bufbuild/connect-go"
+	querierv1 "github.com/grafana/phlare/api/gen/proto/go/querier/v1"
+	"github.com/grafana/phlare/api/gen/proto/go/querier/v1/querierv1connect"
+)
+
+type PhlareClient struct {
+	connectClient querierv1connect.QuerierServiceClient
+}
+
+func NewPhlareClient(httpClient *http.Client, url string) *PhlareClient {
+	return &PhlareClient{
+		connectClient: querierv1connect.NewQuerierServiceClient(httpClient, url),
+	}
+}
+
+func (c *PhlareClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
+	res, err := c.connectClient.ProfileTypes(ctx, connect.NewRequest(&querierv1.ProfileTypesRequest{}))
+	if err != nil {
+		return nil, err
+	}
+	if res.Msg.ProfileTypes == nil {
+		// Let's make sure we send at least empty array if we don't have any types
+		return []*ProfileType{}, nil
+	} else {
+		pTypes := make([]*ProfileType, len(res.Msg.ProfileTypes))
+		for i, pType := range res.Msg.ProfileTypes {
+			pTypes[i] = &ProfileType{
+				ID:    pType.ID,
+				Label: pType.Name + " - " + pType.SampleType,
+			}
+		}
+		return pTypes, nil
+	}
+}
+
+func (c *PhlareClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
+	req := connect.NewRequest(&querierv1.SelectSeriesRequest{
+		ProfileTypeID: profileTypeID,
+		LabelSelector: labelSelector,
+		Start:         start,
+		End:           end,
+		Step:          step,
+		GroupBy:       groupBy,
+	})
+
+	resp, err := c.connectClient.SelectSeries(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	series := make([]*Series, len(resp.Msg.Series))
+
+	for i, s := range resp.Msg.Series {
+		labels := make([]*LabelPair, len(s.Labels))
+		for i, l := range s.Labels {
+			labels[i] = &LabelPair{
+				Name:  l.Name,
+				Value: l.Value,
+			}
+		}
+
+		points := make([]*Point, len(s.Points))
+		for i, p := range s.Points {
+			points[i] = &Point{
+				Value:     p.Value,
+				Timestamp: p.Timestamp,
+			}
+		}
+
+		series[i] = &Series{
+			Labels: labels,
+			Points: points,
+		}
+	}
+
+	parts := strings.Split(profileTypeID, ":")
+
+	return &SeriesResponse{
+		Series: series,
+		Units:  getUnits(profileTypeID),
+		Label:  parts[1],
+	}, nil
+}
+
+func (c *PhlareClient) GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64) (*ProfileResponse, error) {
+	req := &connect.Request[querierv1.SelectMergeStacktracesRequest]{
+		Msg: &querierv1.SelectMergeStacktracesRequest{
+			ProfileTypeID: profileTypeID,
+			LabelSelector: labelSelector,
+			Start:         start,
+			End:           end,
+		},
+	}
+
+	resp, err := c.connectClient.SelectMergeStacktraces(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	levels := make([]*Level, len(resp.Msg.Flamegraph.Levels))
+	for i, level := range resp.Msg.Flamegraph.Levels {
+		levels[i] = &Level{
+			Values: level.Values,
+		}
+	}
+
+	return &ProfileResponse{
+		Flamebearer: &Flamebearer{
+			Names:   resp.Msg.Flamegraph.Names,
+			Levels:  levels,
+			Total:   resp.Msg.Flamegraph.Total,
+			MaxSelf: resp.Msg.Flamegraph.MaxSelf,
+		},
+		Units: getUnits(profileTypeID),
+	}, nil
+}
+
+func getUnits(profileTypeID string) string {
+	parts := strings.Split(profileTypeID, ":")
+	unit := parts[2]
+	if unit == "nanoseconds" {
+		return "ns"
+	}
+	if unit == "count" {
+		return "short"
+	}
+	return unit
+}
+
+func (c *PhlareClient) LabelNames(ctx context.Context, query string, start int64, end int64) ([]string, error) {
+	resp, err := c.connectClient.LabelNames(ctx, connect.NewRequest(&querierv1.LabelNamesRequest{}))
+	if err != nil {
+		return nil, fmt.Errorf("error seding LabelNames request %v", err)
+	}
+
+	var filtered []string
+	for _, label := range resp.Msg.Names {
+		if !isPrivateLabel(label) {
+			filtered = append(filtered, label)
+		}
+	}
+
+	return filtered, nil
+}
+
+func (c *PhlareClient) LabelValues(ctx context.Context, query string, label string, start int64, end int64) ([]string, error) {
+	resp, err := c.connectClient.LabelValues(ctx, connect.NewRequest(&querierv1.LabelValuesRequest{Name: label}))
+	if err != nil {
+		return nil, err
+	}
+	return resp.Msg.Names, nil
+}
+
+func isPrivateLabel(label string) bool {
+	return strings.HasPrefix(label, "__")
+}
diff --git a/pkg/tsdb/phlare/phlareClient_test.go b/pkg/tsdb/phlare/phlareClient_test.go
new file mode 100644
index 00000000000..f594a253b32
--- /dev/null
+++ b/pkg/tsdb/phlare/phlareClient_test.go
@@ -0,0 +1,109 @@
+package phlare
+
+import (
+	"context"
+	"testing"
+
+	"github.com/bufbuild/connect-go"
+	googlev1 "github.com/grafana/phlare/api/gen/proto/go/google/v1"
+	querierv1 "github.com/grafana/phlare/api/gen/proto/go/querier/v1"
+	typesv1 "github.com/grafana/phlare/api/gen/proto/go/types/v1"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_PhlareClient(t *testing.T) {
+	connectClient := &FakePhlareConnectClient{}
+	client := &PhlareClient{
+		connectClient: connectClient,
+	}
+
+	t.Run("GetSeries", func(t *testing.T) {
+		resp, err := client.GetSeries(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, []string{}, 15)
+		require.Nil(t, err)
+
+		series := &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{{Name: "foo", Value: "bar"}}, Points: []*Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
+			},
+			Units: "short",
+			Label: "alloc_objects",
+		}
+		require.Equal(t, series, resp)
+	})
+
+	t.Run("GetProfile", func(t *testing.T) {
+		resp, err := client.GetProfile(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100)
+		require.Nil(t, err)
+
+		series := &ProfileResponse{
+			Flamebearer: &Flamebearer{
+				Names: []string{"foo", "bar", "baz"},
+				Levels: []*Level{
+					{Values: []int64{0, 10, 0, 0}},
+					{Values: []int64{0, 9, 0, 1}},
+					{Values: []int64{0, 8, 8, 2}},
+				},
+				Total:   100,
+				MaxSelf: 56,
+			},
+			Units: "short",
+		}
+		require.Equal(t, series, resp)
+	})
+}
+
+type FakePhlareConnectClient struct {
+	Req interface{}
+}
+
+func (f *FakePhlareConnectClient) ProfileTypes(ctx context.Context, c *connect.Request[querierv1.ProfileTypesRequest]) (*connect.Response[querierv1.ProfileTypesResponse], error) {
+	panic("implement me")
+}
+
+func (f *FakePhlareConnectClient) LabelValues(ctx context.Context, c *connect.Request[querierv1.LabelValuesRequest]) (*connect.Response[querierv1.LabelValuesResponse], error) {
+	panic("implement me")
+}
+
+func (f *FakePhlareConnectClient) LabelNames(context.Context, *connect.Request[querierv1.LabelNamesRequest]) (*connect.Response[querierv1.LabelNamesResponse], error) {
+	panic("implement me")
+}
+
+func (f *FakePhlareConnectClient) Series(ctx context.Context, c *connect.Request[querierv1.SeriesRequest]) (*connect.Response[querierv1.SeriesResponse], error) {
+	panic("implement me")
+}
+
+func (f *FakePhlareConnectClient) SelectMergeStacktraces(ctx context.Context, c *connect.Request[querierv1.SelectMergeStacktracesRequest]) (*connect.Response[querierv1.SelectMergeStacktracesResponse], error) {
+	f.Req = c
+	return &connect.Response[querierv1.SelectMergeStacktracesResponse]{
+		Msg: &querierv1.SelectMergeStacktracesResponse{
+			Flamegraph: &querierv1.FlameGraph{
+				Names: []string{"foo", "bar", "baz"},
+				Levels: []*querierv1.Level{
+					{Values: []int64{0, 10, 0, 0}},
+					{Values: []int64{0, 9, 0, 1}},
+					{Values: []int64{0, 8, 8, 2}},
+				},
+				Total:   100,
+				MaxSelf: 56,
+			},
+		},
+	}, nil
+}
+
+func (f *FakePhlareConnectClient) SelectSeries(ctx context.Context, req *connect.Request[querierv1.SelectSeriesRequest]) (*connect.Response[querierv1.SelectSeriesResponse], error) {
+	f.Req = req
+	return &connect.Response[querierv1.SelectSeriesResponse]{
+		Msg: &querierv1.SelectSeriesResponse{
+			Series: []*typesv1.Series{
+				{
+					Labels: []*typesv1.LabelPair{{Name: "foo", Value: "bar"}},
+					Points: []*typesv1.Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}},
+				},
+			},
+		},
+	}, nil
+}
+
+func (f *FakePhlareConnectClient) SelectMergeProfile(ctx context.Context, c *connect.Request[querierv1.SelectMergeProfileRequest]) (*connect.Response[googlev1.Profile], error) {
+	panic("implement me")
+}
diff --git a/pkg/tsdb/phlare/pyroscopeClient.go b/pkg/tsdb/phlare/pyroscopeClient.go
new file mode 100644
index 00000000000..00bab8acde2
--- /dev/null
+++ b/pkg/tsdb/phlare/pyroscopeClient.go
@@ -0,0 +1,279 @@
+package phlare
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+)
+
+type PyroscopeClient struct {
+	httpClient *http.Client
+	URL        string
+}
+
+type App struct {
+	Name string `json:"name"`
+}
+
+func NewPyroscopeClient(httpClient *http.Client, url string) *PyroscopeClient {
+	return &PyroscopeClient{
+		httpClient: httpClient,
+		URL:        url,
+	}
+}
+
+func (c *PyroscopeClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
+	resp, err := c.httpClient.Get(c.URL + "/api/apps")
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			logger.Error("failed to close response body", "err", err)
+		}
+	}()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	var apps []App
+
+	err = json.Unmarshal(body, &apps)
+	if err != nil {
+		return nil, err
+	}
+
+	var profileTypes []*ProfileType
+	for _, app := range apps {
+		profileTypes = append(profileTypes, &ProfileType{
+			ID:    app.Name,
+			Label: app.Name,
+		})
+	}
+
+	return profileTypes, nil
+}
+
+type PyroscopeProfileResponse struct {
+	Flamebearer *PyroFlamebearer  `json:"flamebearer"`
+	Metadata    *Metadata         `json:"metadata"`
+	Groups      map[string]*Group `json:"groups"`
+}
+
+type Metadata struct {
+	Units string `json:"units"`
+}
+
+type Group struct {
+	StartTime     int64   `json:"startTime"`
+	Samples       []int64 `json:"samples"`
+	DurationDelta int64   `json:"durationDelta"`
+}
+
+type PyroFlamebearer struct {
+	Levels   [][]int64 `json:"levels"`
+	MaxSelf  int64     `json:"maxSelf"`
+	NumTicks int64     `json:"numTicks"`
+	Names    []string  `json:"names"`
+}
+
+func (c *PyroscopeClient) getProfileData(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string) (*PyroscopeProfileResponse, error) {
+	params := url.Values{}
+	params.Add("from", strconv.FormatInt(start, 10))
+	params.Add("until", strconv.FormatInt(end, 10))
+	params.Add("query", profileTypeID+labelSelector)
+	params.Add("format", "json")
+	if len(groupBy) > 0 {
+		params.Add("groupBy", groupBy[0])
+	}
+
+	url := c.URL + "/render?" + params.Encode()
+	logger.Debug("calling /render", "url", url)
+
+	resp, err := c.httpClient.Get(url)
+	if err != nil {
+		return nil, fmt.Errorf("error calling /render api: %v", err)
+	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			logger.Error("failed to close response body", "err", err)
+		}
+	}()
+
+	var respData *PyroscopeProfileResponse
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("error reading response body: %v", err)
+	}
+
+	err = json.Unmarshal(body, &respData)
+	if err != nil {
+		logger.Debug("flamegraph data", "body", string(body))
+		return nil, fmt.Errorf("error decoding flamegraph data: %v", err)
+	}
+
+	return respData, nil
+}
+
+func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64) (*ProfileResponse, error) {
+	respData, err := c.getProfileData(ctx, profileTypeID, labelSelector, start, end, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	mappedLevels := make([]*Level, len(respData.Flamebearer.Levels))
+	for i, level := range respData.Flamebearer.Levels {
+		mappedLevels[i] = &Level{
+			Values: level,
+		}
+	}
+
+	units := "short"
+	if respData.Metadata.Units == "bytes" {
+		units = "bytes"
+	}
+	if respData.Metadata.Units == "samples" {
+		units = "ms"
+	}
+
+	return &ProfileResponse{
+		Flamebearer: &Flamebearer{
+			Names:   respData.Flamebearer.Names,
+			Levels:  mappedLevels,
+			Total:   respData.Flamebearer.NumTicks,
+			MaxSelf: respData.Flamebearer.MaxSelf,
+		},
+		Units: units,
+	}, nil
+}
+
+func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
+	// This is super ineffective at the moment. We need 2 different APIs one for profile one for series (timeline) data
+	// but Pyro returns all in single response. This currently does the simplest thing and calls the same API 2 times
+	// and gets the part of the response it needs.
+	respData, err := c.getProfileData(ctx, profileTypeID, labelSelector, start, end, groupBy)
+	if err != nil {
+		return nil, err
+	}
+
+	stepMillis := int64(step * 1000)
+	var series []*Series
+
+	if len(respData.Groups) == 1 {
+		series = []*Series{processGroup(respData.Groups["*"], stepMillis, nil)}
+	} else {
+		for key, val := range respData.Groups {
+			// If we have a group by, we don't want the * group
+			if key != "*" {
+				label := &LabelPair{
+					Name:  groupBy[0],
+					Value: key,
+				}
+
+				series = append(series, processGroup(val, stepMillis, label))
+			}
+		}
+	}
+
+	return &SeriesResponse{Series: series}, nil
+}
+
+// processGroup turns group timeline data into the Series format. Pyro does not seem to have a way to define step, so we
+// always get the data in specific step, and we have to aggregate a bit into s step size we need.
+func processGroup(group *Group, step int64, label *LabelPair) *Series {
+	series := &Series{}
+	if label != nil {
+		series.Labels = []*LabelPair{label}
+	}
+
+	durationDeltaMillis := group.DurationDelta * 1000
+	timestamp := group.StartTime * 1000
+	value := int64(0)
+
+	for i, sample := range group.Samples {
+		pointsLen := int64(len(series.Points))
+		// Check if the timestamp of the sample is more than next timestamp in the series. If so we create a new point
+		// with the value we have so far.
+		if int64(i)*durationDeltaMillis > step*pointsLen+1 {
+			series.Points = append(series.Points, &Point{
+				Value:     float64(value),
+				Timestamp: timestamp + step*pointsLen,
+			})
+			value = 0
+		}
+
+		value += sample
+	}
+
+	return series
+}
+
+func (c *PyroscopeClient) LabelNames(ctx context.Context, query string, start int64, end int64) ([]string, error) {
+	params := url.Values{}
+	// Seems like this should be seconds instead of millis for other endpoints
+	params.Add("from", strconv.FormatInt(start/1000, 10))
+	params.Add("until", strconv.FormatInt(end/1000, 10))
+	params.Add("query", query)
+	resp, err := c.httpClient.Get(c.URL + "/labels?" + params.Encode())
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			logger.Error("failed to close response body", "err", err)
+		}
+	}()
+
+	var names []string
+	err = json.NewDecoder(resp.Body).Decode(&names)
+	if err != nil {
+		return nil, err
+	}
+
+	var filtered []string
+	for _, label := range names {
+		// Using the same func from Phlare client, works but should do separate one probably
+		if !isPrivateLabel(label) {
+			filtered = append(filtered, label)
+		}
+	}
+
+	return filtered, nil
+}
+
+func (c *PyroscopeClient) LabelValues(ctx context.Context, query string, label string, start int64, end int64) ([]string, error) {
+	params := url.Values{}
+	// Seems like this should be seconds instead of millis for other endpoints
+	params.Add("from", strconv.FormatInt(start/1000, 10))
+	params.Add("until", strconv.FormatInt(end/1000, 10))
+	params.Add("label", label)
+	params.Add("query", query)
+	resp, err := c.httpClient.Get(c.URL + "/labels?" + params.Encode())
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			logger.Error("failed to close response body", "err", err)
+		}
+	}()
+	var values []string
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(body, &values)
+	if err != nil {
+		logger.Debug("response", "body", string(body))
+		return nil, fmt.Errorf("error unmarshaling response %v", err)
+	}
+
+	return values, nil
+}
diff --git a/pkg/tsdb/phlare/query.go b/pkg/tsdb/phlare/query.go
index 9e55e037f5c..3b926217110 100644
--- a/pkg/tsdb/phlare/query.go
+++ b/pkg/tsdb/phlare/query.go
@@ -5,22 +5,19 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
-	"strings"
 	"time"
 
-	"github.com/bufbuild/connect-go"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/live"
 	"github.com/grafana/grafana/pkg/tsdb/phlare/kinds/dataquery"
-	querierv1 "github.com/grafana/phlare/api/gen/proto/go/querier/v1"
 	"github.com/xlab/treeprint"
 )
 
 type queryModel struct {
 	WithStreaming bool
-	dataquery.PhlareDataQuery
+	dataquery.GrafanaPyroscopeDataQuery
 }
 
 type dsJsonModel struct {
@@ -60,36 +57,34 @@ func (d *PhlareDatasource) query(ctx context.Context, pCtx backend.PluginContext
 				logger.Debug("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep)
 			}
 		}
-		req := connect.NewRequest(&querierv1.SelectSeriesRequest{
-			ProfileTypeID: qm.ProfileTypeId,
-			LabelSelector: qm.LabelSelector,
-			Start:         query.TimeRange.From.UnixMilli(),
-			End:           query.TimeRange.To.UnixMilli(),
-			Step:          math.Max(query.Interval.Seconds(), parsedInterval.Seconds()),
-			GroupBy:       qm.GroupBy,
-		})
-
-		logger.Debug("Sending SelectSeriesRequest", "request", req, "queryModel", qm)
-		seriesResp, err := d.client.SelectSeries(ctx, req)
+		logger.Debug("Sending SelectSeriesRequest", "queryModel", qm)
+		seriesResp, err := d.client.GetSeries(
+			ctx,
+			qm.ProfileTypeId,
+			qm.LabelSelector,
+			query.TimeRange.From.UnixMilli(),
+			query.TimeRange.To.UnixMilli(),
+			qm.GroupBy,
+			math.Max(query.Interval.Seconds(), parsedInterval.Seconds()),
+		)
 		if err != nil {
 			logger.Error("Querying SelectSeries()", "err", err)
 			response.Error = err
 			return response
 		}
 		// add the frames to the response.
-		response.Frames = append(response.Frames, seriesToDataFrames(seriesResp, qm.ProfileTypeId)...)
+		response.Frames = append(response.Frames, seriesToDataFrames(seriesResp)...)
 	}
 
 	if query.QueryType == queryTypeProfile || query.QueryType == queryTypeBoth {
-		req := makeRequest(qm, query)
-		logger.Debug("Sending SelectMergeStacktracesRequest", "request", req, "queryModel", qm)
-		resp, err := d.client.SelectMergeStacktraces(ctx, req)
+		logger.Debug("Calling GetProfile", "queryModel", qm)
+		prof, err := d.client.GetProfile(ctx, qm.ProfileTypeId, qm.LabelSelector, query.TimeRange.From.UnixMilli(), query.TimeRange.To.UnixMilli())
 		if err != nil {
-			logger.Error("Querying SelectMergeStacktraces()", "err", err)
+			logger.Error("Error GetProfile()", "err", err)
 			response.Error = err
 			return response
 		}
-		frame := responseToDataFrames(resp.Msg, qm.ProfileTypeId)
+		frame := responseToDataFrames(prof)
 		response.Frames = append(response.Frames, frame)
 
 		// If query called with streaming on then return a channel
@@ -108,23 +103,12 @@ func (d *PhlareDatasource) query(ctx context.Context, pCtx backend.PluginContext
 	return response
 }
 
-func makeRequest(qm queryModel, query backend.DataQuery) *connect.Request[querierv1.SelectMergeStacktracesRequest] {
-	return &connect.Request[querierv1.SelectMergeStacktracesRequest]{
-		Msg: &querierv1.SelectMergeStacktracesRequest{
-			ProfileTypeID: qm.ProfileTypeId,
-			LabelSelector: qm.LabelSelector,
-			Start:         query.TimeRange.From.UnixMilli(),
-			End:           query.TimeRange.To.UnixMilli(),
-		},
-	}
-}
-
 // responseToDataFrames turns Phlare response to data.Frame. We encode the data into a nested set format where we have
 // [level, value, label] columns and by ordering the items in a depth first traversal order we can recreate the whole
 // tree back.
-func responseToDataFrames(resp *querierv1.SelectMergeStacktracesResponse, profileTypeID string) *data.Frame {
-	tree := levelsToTree(resp.Flamegraph.Levels, resp.Flamegraph.Names)
-	return treeToNestedSetDataFrame(tree, profileTypeID)
+func responseToDataFrames(resp *ProfileResponse) *data.Frame {
+	tree := levelsToTree(resp.Flamebearer.Levels, resp.Flamebearer.Names)
+	return treeToNestedSetDataFrame(tree, resp.Units)
 }
 
 // START_OFFSET is offset of the bar relative to previous sibling
@@ -153,7 +137,11 @@ type ProfileTree struct {
 
 // levelsToTree converts flamebearer format into a tree. This is needed to then convert it into nested set format
 // dataframe. This should be temporary, and ideally we should get some sort of tree struct directly from Phlare API.
-func levelsToTree(levels []*querierv1.Level, names []string) *ProfileTree {
+func levelsToTree(levels []*Level, names []string) *ProfileTree {
+	if len(levels) == 0 {
+		return nil
+	}
+
 	tree := &ProfileTree{
 		Start: 0,
 		Value: levels[0].Values[VALUE_OFFSET],
@@ -278,7 +266,7 @@ type CustomMeta struct {
 // where ordering the items in depth first order and knowing the level/depth of each item we can recreate the
 // parent - child relationship without explicitly needing parent/child column, and we can later just iterate over the
 // dataFrame to again basically walking depth first over the tree/profile.
-func treeToNestedSetDataFrame(tree *ProfileTree, profileTypeID string) *data.Frame {
+func treeToNestedSetDataFrame(tree *ProfileTree, unit string) *data.Frame {
 	frame := data.NewFrame("response")
 	frame.Meta = &data.FrameMeta{PreferredVisualization: "flamegraph"}
 
@@ -287,9 +275,8 @@ func treeToNestedSetDataFrame(tree *ProfileTree, profileTypeID string) *data.Fra
 	selfField := data.NewField("self", nil, []int64{})
 
 	// profileTypeID should encode the type of the profile with unit being the 3rd part
-	parts := strings.Split(profileTypeID, ":")
-	valueField.Config = &data.FieldConfig{Unit: normalizeUnit(parts[2])}
-	selfField.Config = &data.FieldConfig{Unit: normalizeUnit(parts[2])}
+	valueField.Config = &data.FieldConfig{Unit: unit}
+	selfField.Config = &data.FieldConfig{Unit: unit}
 	frame.Fields = data.Fields{levelField, valueField, selfField}
 
 	labelField := NewEnumField("label", nil)
@@ -366,10 +353,10 @@ func walkTree(tree *ProfileTree, fn func(tree *ProfileTree)) {
 	}
 }
 
-func seriesToDataFrames(seriesResp *connect.Response[querierv1.SelectSeriesResponse], profileTypeID string) []*data.Frame {
-	frames := make([]*data.Frame, 0, len(seriesResp.Msg.Series))
+func seriesToDataFrames(resp *SeriesResponse) []*data.Frame {
+	frames := make([]*data.Frame, 0, len(resp.Series))
 
-	for _, series := range seriesResp.Msg.Series {
+	for _, series := range resp.Series {
 		// We create separate data frames as the series may not have the same length
 		frame := data.NewFrame("series")
 		frame.Meta = &data.FrameMeta{PreferredVisualization: "graph"}
@@ -378,21 +365,13 @@ func seriesToDataFrames(seriesResp *connect.Response[querierv1.SelectSeriesRespo
 		timeField := data.NewField("time", nil, []time.Time{})
 		fields = append(fields, timeField)
 
-		label := ""
-		unit := ""
-		parts := strings.Split(profileTypeID, ":")
-		if len(parts) == 5 {
-			label = parts[1] // sample type e.g. cpu, goroutine, alloc_objects
-			unit = normalizeUnit(parts[2])
-		}
-
 		labels := make(map[string]string)
 		for _, label := range series.Labels {
 			labels[label.Name] = label.Value
 		}
 
-		valueField := data.NewField(label, labels, []float64{})
-		valueField.Config = &data.FieldConfig{Unit: unit}
+		valueField := data.NewField(resp.Label, labels, []float64{})
+		valueField.Config = &data.FieldConfig{Unit: resp.Units}
 
 		for _, point := range series.Points {
 			timeField.Append(time.UnixMilli(point.Timestamp))
@@ -405,13 +384,3 @@ func seriesToDataFrames(seriesResp *connect.Response[querierv1.SelectSeriesRespo
 	}
 	return frames
 }
-
-func normalizeUnit(unit string) string {
-	if unit == "nanoseconds" {
-		return "ns"
-	}
-	if unit == "count" {
-		return "short"
-	}
-	return unit
-}
diff --git a/pkg/tsdb/phlare/query_test.go b/pkg/tsdb/phlare/query_test.go
index 35183fb6286..cc95e376ab7 100644
--- a/pkg/tsdb/phlare/query_test.go
+++ b/pkg/tsdb/phlare/query_test.go
@@ -5,14 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bufbuild/connect-go"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/require"
-
-	googlev1 "github.com/grafana/phlare/api/gen/proto/go/google/v1"
-	querierv1 "github.com/grafana/phlare/api/gen/proto/go/querier/v1"
-	typesv1 "github.com/grafana/phlare/api/gen/proto/go/types/v1"
 )
 
 // This is where the tests for the datasource backend live.
@@ -60,9 +55,9 @@ func Test_query(t *testing.T) {
 		dataQuery.QueryType = queryTypeMetrics
 		resp := ds.query(context.Background(), pCtx, *dataQuery)
 		require.Nil(t, resp.Error)
-		r, ok := client.Req.(*connect.Request[querierv1.SelectSeriesRequest])
+		step, ok := client.Args[5].(float64)
 		require.True(t, ok)
-		require.Equal(t, float64(30), r.Msg.Step)
+		require.Equal(t, float64(30), step)
 	})
 
 	t.Run("query metrics uses default min step", func(t *testing.T) {
@@ -75,9 +70,9 @@ func Test_query(t *testing.T) {
 		}
 		resp := ds.query(context.Background(), pCtxNoMinStep, *dataQuery)
 		require.Nil(t, resp.Error)
-		r, ok := client.Req.(*connect.Request[querierv1.SelectSeriesRequest])
+		step, ok := client.Args[5].(float64)
 		require.True(t, ok)
-		require.Equal(t, float64(15), r.Msg.Step)
+		require.Equal(t, float64(15), step)
 	})
 
 	t.Run("query metrics uses group by", func(t *testing.T) {
@@ -86,9 +81,9 @@ func Test_query(t *testing.T) {
 		dataQuery.JSON = []byte(`{"profileTypeId":"memory:alloc_objects:count:space:bytes","labelSelector":"{app=\\\"baz\\\"}","groupBy":["app","instance"]}`)
 		resp := ds.query(context.Background(), pCtx, *dataQuery)
 		require.Nil(t, resp.Error)
-		r, ok := client.Req.(*connect.Request[querierv1.SelectSeriesRequest])
+		groupBy, ok := client.Args[4].([]string)
 		require.True(t, ok)
-		require.Equal(t, []string{"app", "instance"}, r.Msg.GroupBy)
+		require.Equal(t, []string{"app", "instance"}, groupBy)
 	})
 }
 
@@ -116,20 +111,19 @@ func fieldValues[T any](field *data.Field) []T {
 
 // This is where the tests for the datasource backend live.
 func Test_profileToDataFrame(t *testing.T) {
-	resp := &connect.Response[querierv1.SelectMergeStacktracesResponse]{
-		Msg: &querierv1.SelectMergeStacktracesResponse{
-			Flamegraph: &querierv1.FlameGraph{
-				Names: []string{"func1", "func2", "func3"},
-				Levels: []*querierv1.Level{
-					{Values: []int64{0, 20, 1, 2}},
-					{Values: []int64{0, 10, 3, 1, 4, 5, 5, 2}},
-				},
-				Total:   987,
-				MaxSelf: 123,
+	profile := &ProfileResponse{
+		Flamebearer: &Flamebearer{
+			Names: []string{"func1", "func2", "func3"},
+			Levels: []*Level{
+				{Values: []int64{0, 20, 1, 2}},
+				{Values: []int64{0, 10, 3, 1, 4, 5, 5, 2}},
 			},
+			Total:   987,
+			MaxSelf: 123,
 		},
+		Units: "short",
 	}
-	frame := responseToDataFrames(resp.Msg, "memory:alloc_objects:count:space:bytes")
+	frame := responseToDataFrames(profile)
 	require.Equal(t, 4, len(frame.Fields))
 	require.Equal(t, data.NewField("level", nil, []int64{0, 1, 1}), frame.Fields[0])
 	require.Equal(t, data.NewField("value", nil, []int64{20, 10, 5}).SetConfig(&data.FieldConfig{Unit: "short"}), frame.Fields[1])
@@ -142,7 +136,7 @@ func Test_profileToDataFrame(t *testing.T) {
 // This is where the tests for the datasource backend live.
 func Test_levelsToTree(t *testing.T) {
 	t.Run("simple", func(t *testing.T) {
-		levels := []*querierv1.Level{
+		levels := []*Level{
 			{Values: []int64{0, 100, 0, 0}},
 			{Values: []int64{0, 40, 0, 1, 0, 30, 0, 2}},
 			{Values: []int64{0, 15, 0, 3}},
@@ -162,7 +156,7 @@ func Test_levelsToTree(t *testing.T) {
 	})
 
 	t.Run("medium", func(t *testing.T) {
-		levels := []*querierv1.Level{
+		levels := []*Level{
 			{Values: []int64{0, 100, 0, 0}},
 			{Values: []int64{0, 40, 0, 1, 0, 30, 0, 2, 0, 30, 0, 3}},
 			{Values: []int64{0, 20, 0, 4, 50, 10, 0, 5}},
@@ -200,7 +194,7 @@ func Test_treeToNestedDataFrame(t *testing.T) {
 			},
 		}
 
-		frame := treeToNestedSetDataFrame(tree, "memory:alloc_objects:count:space:bytes")
+		frame := treeToNestedSetDataFrame(tree, "short")
 
 		labelConfig := &data.FieldConfig{
 			TypeConfig: &data.FieldTypeConfig{
@@ -219,7 +213,7 @@ func Test_treeToNestedDataFrame(t *testing.T) {
 	})
 
 	t.Run("nil profile tree", func(t *testing.T) {
-		frame := treeToNestedSetDataFrame(nil, "memory:alloc_objects:count:space:bytes")
+		frame := treeToNestedSetDataFrame(nil, "short")
 		require.Equal(t, 4, len(frame.Fields))
 		require.Equal(t, 0, frame.Fields[0].Len())
 	})
@@ -227,40 +221,41 @@ func Test_treeToNestedDataFrame(t *testing.T) {
 
 func Test_seriesToDataFrame(t *testing.T) {
 	t.Run("single series", func(t *testing.T) {
-		resp := &connect.Response[querierv1.SelectSeriesResponse]{
-			Msg: &querierv1.SelectSeriesResponse{
-				Series: []*typesv1.Series{
-					{Labels: []*typesv1.LabelPair{}, Points: []*typesv1.Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
-				},
+		series := &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
 			},
+			Units: "short",
+			Label: "samples",
 		}
-		frames := seriesToDataFrames(resp, "process_cpu:samples:count:cpu:nanoseconds")
+		frames := seriesToDataFrames(series)
 		require.Equal(t, 2, len(frames[0].Fields))
 		require.Equal(t, data.NewField("time", nil, []time.Time{time.UnixMilli(1000), time.UnixMilli(2000)}), frames[0].Fields[0])
 		require.Equal(t, data.NewField("samples", map[string]string{}, []float64{30, 10}).SetConfig(&data.FieldConfig{Unit: "short"}), frames[0].Fields[1])
 
 		// with a label pair, the value field should name itself with a label pair name and not the profile type
-		resp = &connect.Response[querierv1.SelectSeriesResponse]{
-			Msg: &querierv1.SelectSeriesResponse{
-				Series: []*typesv1.Series{
-					{Labels: []*typesv1.LabelPair{{Name: "app", Value: "bar"}}, Points: []*typesv1.Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
-				},
+		series = &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{{Name: "app", Value: "bar"}}, Points: []*Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
 			},
+			Units: "short",
+			Label: "samples",
 		}
-		frames = seriesToDataFrames(resp, "process_cpu:samples:count:cpu:nanoseconds")
+
+		frames = seriesToDataFrames(series)
 		require.Equal(t, data.NewField("samples", map[string]string{"app": "bar"}, []float64{30, 10}).SetConfig(&data.FieldConfig{Unit: "short"}), frames[0].Fields[1])
 	})
 
 	t.Run("single series", func(t *testing.T) {
-		resp := &connect.Response[querierv1.SelectSeriesResponse]{
-			Msg: &querierv1.SelectSeriesResponse{
-				Series: []*typesv1.Series{
-					{Labels: []*typesv1.LabelPair{{Name: "foo", Value: "bar"}}, Points: []*typesv1.Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
-					{Labels: []*typesv1.LabelPair{{Name: "foo", Value: "baz"}}, Points: []*typesv1.Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
-				},
+		resp := &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{{Name: "foo", Value: "bar"}}, Points: []*Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
+				{Labels: []*LabelPair{{Name: "foo", Value: "baz"}}, Points: []*Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
 			},
+			Units: "short",
+			Label: "samples",
 		}
-		frames := seriesToDataFrames(resp, "process_cpu:samples:count:cpu:nanoseconds")
+		frames := seriesToDataFrames(resp)
 		require.Equal(t, 2, len(frames))
 		require.Equal(t, 2, len(frames[0].Fields))
 		require.Equal(t, 2, len(frames[1].Fields))
@@ -270,100 +265,56 @@ func Test_seriesToDataFrame(t *testing.T) {
 }
 
 type FakeClient struct {
-	Req interface{}
+	Args []interface{}
 }
 
-func (f *FakeClient) ProfileTypes(ctx context.Context, c *connect.Request[querierv1.ProfileTypesRequest]) (*connect.Response[querierv1.ProfileTypesResponse], error) {
-	panic("implement me")
-}
-
-func (f *FakeClient) LabelValues(ctx context.Context, c *connect.Request[querierv1.LabelValuesRequest]) (*connect.Response[querierv1.LabelValuesResponse], error) {
-	panic("implement me")
-}
-
-func (f *FakeClient) LabelNames(context.Context, *connect.Request[querierv1.LabelNamesRequest]) (*connect.Response[querierv1.LabelNamesResponse], error) {
-	panic("implement me")
-}
-
-func (f *FakeClient) Series(ctx context.Context, c *connect.Request[querierv1.SeriesRequest]) (*connect.Response[querierv1.SeriesResponse], error) {
-	return &connect.Response[querierv1.SeriesResponse]{
-		Msg: &querierv1.SeriesResponse{
-			LabelsSet: []*typesv1.Labels{{
-				Labels: []*typesv1.LabelPair{
-					{
-						Name:  "__unit__",
-						Value: "cpu",
-					},
-					{
-						Name:  "instance",
-						Value: "127.0.0.1",
-					},
-					{
-						Name:  "job",
-						Value: "default",
-					},
-				},
-			}},
+func (f *FakeClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
+	return []*ProfileType{
+		{
+			ID:    "type:1",
+			Label: "cpu",
+		},
+		{
+			ID:    "type:2",
+			Label: "memory",
 		},
 	}, nil
 }
 
-func (f *FakeClient) SelectMergeStacktraces(ctx context.Context, c *connect.Request[querierv1.SelectMergeStacktracesRequest]) (*connect.Response[querierv1.SelectMergeStacktracesResponse], error) {
-	f.Req = c
-	return &connect.Response[querierv1.SelectMergeStacktracesResponse]{
-		Msg: &querierv1.SelectMergeStacktracesResponse{
-			Flamegraph: &querierv1.FlameGraph{
-				Names: []string{"foo", "bar", "baz"},
-				Levels: []*querierv1.Level{
-					{Values: []int64{0, 10, 0, 0}},
-					{Values: []int64{0, 9, 0, 1}},
-					{Values: []int64{0, 8, 8, 2}},
-				},
-				Total:   100,
-				MaxSelf: 56,
+func (f *FakeClient) LabelValues(ctx context.Context, query string, label string, start int64, end int64) ([]string, error) {
+	panic("implement me")
+}
+
+func (f *FakeClient) LabelNames(ctx context.Context, query string, start int64, end int64) ([]string, error) {
+	panic("implement me")
+}
+
+func (f *FakeClient) GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64) (*ProfileResponse, error) {
+	return &ProfileResponse{
+		Flamebearer: &Flamebearer{
+			Names: []string{"foo", "bar", "baz"},
+			Levels: []*Level{
+				{Values: []int64{0, 10, 0, 0}},
+				{Values: []int64{0, 9, 0, 1}},
+				{Values: []int64{0, 8, 8, 2}},
 			},
+			Total:   100,
+			MaxSelf: 56,
 		},
+		Units: "count",
 	}, nil
 }
 
-func (f *FakeClient) SelectSeries(ctx context.Context, req *connect.Request[querierv1.SelectSeriesRequest]) (*connect.Response[querierv1.SelectSeriesResponse], error) {
-	f.Req = req
-	return &connect.Response[querierv1.SelectSeriesResponse]{
-		Msg: &querierv1.SelectSeriesResponse{
-			Series: []*typesv1.Series{
-				{
-					Labels: []*typesv1.LabelPair{{Name: "foo", Value: "bar"}},
-					Points: []*typesv1.Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}},
-				},
-			},
-		},
-	}, nil
-}
-
-func (f *FakeClient) SelectMergeProfile(ctx context.Context, c *connect.Request[querierv1.SelectMergeProfileRequest]) (*connect.Response[googlev1.Profile], error) {
-	f.Req = c
-	p := &googlev1.Profile{
-		SampleType: []*googlev1.ValueType{
-			{Type: 1, Unit: 2},
-		},
-		Sample: []*googlev1.Sample{
+func (f *FakeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
+	f.Args = []interface{}{profileTypeID, labelSelector, start, end, groupBy, step}
+	return &SeriesResponse{
+		Series: []*Series{
 			{
-				Value: []int64{1},
-				LocationId: []uint64{
-					1, 2,
-				},
+				Labels: []*LabelPair{{Name: "foo", Value: "bar"}},
+				Points: []*Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}},
 			},
 		},
-		Mapping: []*googlev1.Mapping{{Id: 1}},
-		Location: []*googlev1.Location{
-			{Id: 1, MappingId: 1, Line: []*googlev1.Line{{FunctionId: 1}}},
-			{Id: 2, MappingId: 1, Line: []*googlev1.Line{{FunctionId: 2}}},
-		},
-		Function: []*googlev1.Function{
-			{Id: 1, Name: 3},
-			{Id: 2, Name: 4},
-		},
-		StringTable: []string{"", "cpu", "nanoseconds", "foo", "bar"},
-	}
-	return connect.NewResponse(p), nil
+		Units: "count",
+		Label: "test",
+	}, nil
 }
diff --git a/public/app/plugins/datasource/phlare/ConfigEditor.tsx b/public/app/plugins/datasource/phlare/ConfigEditor.tsx
index 05ac5f9cb13..510e83763e6 100644
--- a/public/app/plugins/datasource/phlare/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/phlare/ConfigEditor.tsx
@@ -1,15 +1,52 @@
 import React from 'react';
+import { useAsyncFn, useDebounce } from 'react-use';
 
-import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { DataSourceHttpSettings, EventsWithValidation, LegacyForms, regexValidation } from '@grafana/ui';
+import { DataSourcePluginOptionsEditorProps, SelectableValue } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { Alert, DataSourceHttpSettings, EventsWithValidation, LegacyForms, regexValidation } from '@grafana/ui';
 import { config } from 'app/core/config';
 
-import { PhlareDataSourceOptions } from './types';
+import { PhlareDataSource } from './datasource';
+import { BackendType, PhlareDataSourceOptions } from './types';
 
 interface Props extends DataSourcePluginOptionsEditorProps<PhlareDataSourceOptions> {}
 
 export const ConfigEditor = (props: Props) => {
   const { options, onOptionsChange } = props;
+  const [mismatchedBackendType, setMismatchedBackendType] = React.useState<BackendType | undefined>();
+
+  const dataSourceSrv = getDataSourceSrv();
+
+  const [, getBackendType] = useAsyncFn(async () => {
+    if (!options.url) {
+      return;
+    }
+    const ds = await dataSourceSrv.get({ type: options.type, uid: options.uid });
+    if (!(ds instanceof PhlareDataSource)) {
+      // Should not happen, makes TS happy
+      throw new Error('Datasource is not a PhlareDataSource');
+    }
+
+    const { backendType } = await ds.getBackendType(options.url);
+    if (backendType === 'unknown') {
+      setMismatchedBackendType(undefined);
+      return;
+    }
+
+    // If user already has something selected don't overwrite but show warning.
+    if (options.jsonData.backendType) {
+      if (backendType !== options.jsonData.backendType) {
+        setMismatchedBackendType(backendType);
+      } else {
+        setMismatchedBackendType(undefined);
+      }
+      return;
+    }
+
+    onOptionsChange({ ...options, jsonData: { ...options.jsonData, backendType } });
+  }, [options]);
+
+  useDebounce(getBackendType, 500, [options]);
 
   return (
     <>
@@ -57,7 +94,50 @@ export const ConfigEditor = (props: Props) => {
             />
           </div>
         </div>
+
+        <div className="gf-form-inline">
+          <div className="gf-form">
+            <LegacyForms.FormField
+              label="Backend type"
+              labelWidth={13}
+              inputEl={
+                <LegacyForms.Select<BackendType>
+                  allowCustomValue={false}
+                  value={options.jsonData.backendType ? backendTypeOptions[options.jsonData.backendType] : undefined}
+                  options={Object.values(backendTypeOptions)}
+                  onChange={(option) => {
+                    onOptionsChange({
+                      ...options,
+                      jsonData: {
+                        ...options.jsonData,
+                        backendType: option.value,
+                      },
+                    });
+                  }}
+                />
+              }
+              tooltip="Select what type of backend you use. This datasource supports both Phlare and Pyroscope backends."
+            />
+          </div>
+        </div>
+        {mismatchedBackendType && (
+          <Alert
+            title={`"${options.jsonData.backendType}" option is selected but it seems like you are using "${mismatchedBackendType}" backend.`}
+            severity="warning"
+          />
+        )}
       </div>
     </>
   );
 };
+
+const backendTypeOptions: Record<BackendType, SelectableValue<BackendType>> = {
+  phlare: {
+    label: 'Phlare',
+    value: 'phlare',
+  },
+  pyroscope: {
+    label: 'Pyroscope',
+    value: 'pyroscope',
+  },
+};
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/LabelsEditor.tsx b/public/app/plugins/datasource/phlare/QueryEditor/LabelsEditor.tsx
index 4468ef83d0c..4846b59bc3b 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/LabelsEditor.tsx
+++ b/public/app/plugins/datasource/phlare/QueryEditor/LabelsEditor.tsx
@@ -1,11 +1,10 @@
 import { css } from '@emotion/css';
 import React, { useEffect, useRef } from 'react';
-import { useLatest } from 'react-use';
+import { useAsync, useLatest } from 'react-use';
 
 import { CodeEditor, Monaco, useStyles2, monacoTypes } from '@grafana/ui';
 
 import { languageDefinition } from '../phlareql';
-import { SeriesMessage } from '../types';
 
 import { CompletionProvider } from './autocomplete';
 
@@ -13,11 +12,12 @@ interface Props {
   value: string;
   onChange: (val: string) => void;
   onRunQuery: (value: string) => void;
-  series?: SeriesMessage;
+  labels?: string[];
+  getLabelValues: (label: string) => Promise<string[]>;
 }
 
 export function LabelsEditor(props: Props) {
-  const setupAutocompleteFn = useAutocomplete(props.series);
+  const setupAutocompleteFn = useAutocomplete(props.getLabelValues, props.labels);
   const styles = useStyles2(getStyles);
 
   const onRunQueryRef = useLatest(props.onRunQuery);
@@ -92,15 +92,17 @@ const EDITOR_HEIGHT_OFFSET = 2;
 /**
  * Hook that returns function that will set up monaco autocomplete for the label selector
  */
-function useAutocomplete(series?: SeriesMessage) {
-  const providerRef = useRef<CompletionProvider>(new CompletionProvider());
+function useAutocomplete(getLabelValues: (label: string) => Promise<string[]>, labels?: string[]) {
+  const providerRef = useRef<CompletionProvider>();
+  if (providerRef.current === undefined) {
+    providerRef.current = new CompletionProvider();
+  }
 
-  useEffect(() => {
-    if (series) {
-      // When we have the value we will pass it to the CompletionProvider
-      providerRef.current.setSeries(series);
+  useAsync(async () => {
+    if (providerRef.current) {
+      providerRef.current.init(labels || [], getLabelValues);
     }
-  }, [series]);
+  }, [labels, getLabelValues]);
 
   const autocompleteDisposeFun = useRef<(() => void) | null>(null);
   useEffect(() => {
@@ -112,11 +114,13 @@ function useAutocomplete(series?: SeriesMessage) {
 
   // This should be run in monaco onEditorDidMount
   return (editor: monacoTypes.editor.IStandaloneCodeEditor, monaco: Monaco) => {
-    providerRef.current.editor = editor;
-    providerRef.current.monaco = monaco;
+    if (providerRef.current) {
+      providerRef.current.editor = editor;
+      providerRef.current.monaco = monaco;
 
-    const { dispose } = monaco.languages.registerCompletionItemProvider(langId, providerRef.current);
-    autocompleteDisposeFun.current = dispose;
+      const { dispose } = monaco.languages.registerCompletionItemProvider(langId, providerRef.current);
+      autocompleteDisposeFun.current = dispose;
+    }
   };
 }
 
@@ -138,7 +142,7 @@ const getStyles = () => {
   return {
     queryField: css`
       flex: 1;
-      // Not exactly sure but without this the editor doe not shrink after resizing (so you can make it bigger but not
+      // Not exactly sure but without this the editor does not shrink after resizing (so you can make it bigger but not
       // smaller). At the same time this does not actually make the editor 100px because it has flex 1 so I assume
       // this should sort of act as a flex-basis (but flex-basis does not work for this). So yeah CSS magic.
       width: 100px;
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
index 95356fa90f1..d9d67521d8e 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
@@ -76,20 +76,12 @@ function setup(options: { props: Partial<Props> } = { props: {} }) {
 
   ds.getProfileTypes = jest.fn().mockResolvedValue([
     {
-      name: 'process_cpu',
-      ID: 'process_cpu:cpu',
-      period_type: 'day',
-      period_unit: 's',
-      sample_unit: 'ms',
-      sample_type: 'cpu',
+      label: 'process_cpu - cpu',
+      id: 'process_cpu:cpu',
     },
     {
-      name: 'memory',
-      ID: 'memory:memory',
-      period_type: 'day',
-      period_unit: 's',
-      sample_unit: 'ms',
-      sample_type: 'memory',
+      label: 'memory',
+      id: 'memory:memory',
     },
   ] as ProfileTypeMessage[]);
 
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.tsx b/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.tsx
index f9dcfad0339..ea464e2825d 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.tsx
+++ b/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.tsx
@@ -1,13 +1,13 @@
 import { defaults } from 'lodash';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useAsync } from 'react-use';
 
-import { CoreApp, QueryEditorProps } from '@grafana/data';
+import { CoreApp, QueryEditorProps, TimeRange } from '@grafana/data';
 import { ButtonCascader, CascaderOption } from '@grafana/ui';
 
-import { defaultPhlare, defaultPhlareQueryType, Phlare } from '../dataquery.gen';
+import { defaultGrafanaPyroscope, defaultPhlareQueryType, GrafanaPyroscope } from '../dataquery.gen';
 import { PhlareDataSource } from '../datasource';
-import { PhlareDataSourceOptions, ProfileTypeMessage, Query } from '../types';
+import { BackendType, PhlareDataSourceOptions, ProfileTypeMessage, Query } from '../types';
 
 import { EditorRow } from './EditorRow';
 import { EditorRows } from './EditorRows';
@@ -16,44 +16,32 @@ import { QueryOptions } from './QueryOptions';
 
 export type Props = QueryEditorProps<PhlareDataSource, Query, PhlareDataSourceOptions>;
 
-export const defaultQuery: Partial<Phlare> = {
-  ...defaultPhlare,
+export const defaultQuery: Partial<GrafanaPyroscope> = {
+  ...defaultGrafanaPyroscope,
   queryType: defaultPhlareQueryType,
 };
 
 export function QueryEditor(props: Props) {
-  const profileTypes = useProfileTypes(props.datasource);
-
-  function onProfileTypeChange(value: string[], selectedOptions: CascaderOption[]) {
-    if (selectedOptions.length === 0) {
-      return;
-    }
-
-    const id = selectedOptions[selectedOptions.length - 1].value;
-
-    if (typeof id !== 'string') {
-      throw new Error('id is not string');
-    }
-
-    props.onChange({ ...props.query, profileTypeId: id });
-  }
-
-  function onLabelSelectorChange(value: string) {
-    props.onChange({ ...props.query, labelSelector: value });
-  }
+  let query = normalizeQuery(props.query, props.app);
 
   function handleRunQuery(value: string) {
     props.onChange({ ...props.query, labelSelector: value });
     props.onRunQuery();
   }
 
-  const seriesResult = useAsync(() => {
-    return props.datasource.getSeries();
-  }, [props.datasource]);
-
+  const { profileTypes, onProfileTypeChange, selectedProfileName } = useProfileTypes(
+    props.datasource,
+    props.query,
+    props.onChange,
+    props.datasource.backendType
+  );
+  const { labels, getLabelValues, onLabelSelectorChange } = useLabels(
+    props.range,
+    props.datasource,
+    props.query,
+    props.onChange
+  );
   const cascaderOptions = useCascaderOptions(profileTypes);
-  const selectedProfileName = useProfileName(profileTypes, props.query.profileTypeId);
-  let query = normalizeQuery(props.query, props.app);
 
   return (
     <EditorRows>
@@ -65,61 +53,144 @@ export function QueryEditor(props: Props) {
           value={query.labelSelector}
           onChange={onLabelSelectorChange}
           onRunQuery={handleRunQuery}
-          series={seriesResult.value}
+          labels={labels}
+          getLabelValues={getLabelValues}
         />
       </EditorRow>
       <EditorRow>
-        <QueryOptions query={query} onQueryChange={props.onChange} app={props.app} series={seriesResult.value} />
+        <QueryOptions query={query} onQueryChange={props.onChange} app={props.app} labels={labels} />
       </EditorRow>
     </EditorRows>
   );
 }
 
+function useLabels(
+  range: TimeRange | undefined,
+  datasource: PhlareDataSource,
+  query: Query,
+  onChange: (value: Query) => void
+) {
+  // Round to nearest 5 seconds. If the range is something like last 1h then every render the range values change slightly
+  // and what ever has range as dependency is rerun. So this effectively debounces the queries.
+  const unpreciseRange = {
+    to: Math.ceil((range?.to.valueOf() || 0) / 5000) * 5000,
+    from: Math.floor((range?.from.valueOf() || 0) / 5000) * 5000,
+  };
+
+  const labelsResult = useAsync(() => {
+    return datasource.getLabelNames(query.profileTypeId + query.labelSelector, unpreciseRange.from, unpreciseRange.to);
+  }, [datasource, query.profileTypeId, query.labelSelector, unpreciseRange.to, unpreciseRange.from]);
+
+  // Create a function with range and query already baked in so we don't have to send those everywhere
+  const getLabelValues = useCallback(
+    (label: string) => {
+      return datasource.getLabelValues(
+        query.profileTypeId + query.labelSelector,
+        label,
+        unpreciseRange.from,
+        unpreciseRange.to
+      );
+    },
+    [query, datasource, unpreciseRange.to, unpreciseRange.from]
+  );
+
+  const onLabelSelectorChange = useCallback(
+    (value: string) => {
+      onChange({ ...query, labelSelector: value });
+    },
+    [onChange, query]
+  );
+
+  return { labels: labelsResult.value, getLabelValues, onLabelSelectorChange };
+}
+
 // Turn profileTypes into cascader options
 function useCascaderOptions(profileTypes: ProfileTypeMessage[]) {
   return useMemo(() => {
     let mainTypes = new Map<string, CascaderOption>();
     // Classify profile types by name then sample type.
     for (let profileType of profileTypes) {
-      if (!mainTypes.has(profileType.name)) {
-        mainTypes.set(profileType.name, {
-          label: profileType.name,
-          value: profileType.ID,
+      let parts: string[];
+      // Phlare uses : as delimiter while Pyro uses .
+      if (profileType.id.indexOf(':') > -1) {
+        parts = profileType.id.split(':');
+      } else {
+        parts = profileType.id.split('.');
+        const last = parts.pop()!;
+        parts = [parts.join('.'), last];
+      }
+
+      const [name, type] = parts;
+
+      if (!mainTypes.has(name)) {
+        mainTypes.set(name, {
+          label: name,
+          value: profileType.id,
           children: [],
         });
       }
-      mainTypes.get(profileType.name)?.children?.push({
-        label: profileType.sample_type,
-        value: profileType.ID,
+      mainTypes.get(name)?.children?.push({
+        label: type,
+        value: profileType.id,
       });
     }
     return Array.from(mainTypes.values());
   }, [profileTypes]);
 }
 
-function useProfileTypes(datasource: PhlareDataSource) {
+function useProfileTypes(
+  datasource: PhlareDataSource,
+  query: Query,
+  onChange: (value: Query) => void,
+  backendType: BackendType = 'phlare'
+) {
   const [profileTypes, setProfileTypes] = useState<ProfileTypeMessage[]>([]);
+
   useEffect(() => {
     (async () => {
       const profileTypes = await datasource.getProfileTypes();
       setProfileTypes(profileTypes);
     })();
   }, [datasource]);
-  return profileTypes;
+
+  const onProfileTypeChange = useCallback(
+    (value: string[], selectedOptions: CascaderOption[]) => {
+      if (selectedOptions.length === 0) {
+        return;
+      }
+
+      const id = selectedOptions[selectedOptions.length - 1].value;
+
+      // Probably cannot happen but makes TS happy
+      if (typeof id !== 'string') {
+        throw new Error('id is not string');
+      }
+
+      onChange({ ...query, profileTypeId: id });
+    },
+    [onChange, query]
+  );
+
+  const selectedProfileName = useProfileName(profileTypes, query.profileTypeId, backendType);
+
+  return { profileTypes, onProfileTypeChange, selectedProfileName };
 }
 
-function useProfileName(profileTypes: ProfileTypeMessage[], profileTypeId: string) {
+function useProfileName(profileTypes: ProfileTypeMessage[], profileTypeId: string, backendType: BackendType) {
   return useMemo(() => {
     if (!profileTypes) {
       return 'Loading';
     }
-    const profile = profileTypes.find((type) => type.ID === profileTypeId);
+    const profile = profileTypes.find((type) => type.id === profileTypeId);
     if (!profile) {
+      if (backendType === 'pyroscope') {
+        return 'Select application';
+      }
       return 'Select a profile type';
     }
 
-    return profile.name + ' - ' + profile.sample_type;
-  }, [profileTypeId, profileTypes]);
+    return profile.label;
+  }, [profileTypeId, profileTypes, backendType]);
 }
 
 export function normalizeQuery(query: Query, app?: CoreApp | string) {
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx b/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx
index f4f0ba82ffb..56cb059cba9 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx
+++ b/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx
@@ -5,7 +5,7 @@ import { useToggle } from 'react-use';
 import { CoreApp, GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { Icon, useStyles2, RadioButtonGroup, MultiSelect } from '@grafana/ui';
 
-import { Query, SeriesMessage } from '../types';
+import { Query } from '../types';
 
 import { EditorField } from './EditorField';
 import { Stack } from './Stack';
@@ -14,7 +14,7 @@ export interface Props {
   query: Query;
   onQueryChange: (query: Query) => void;
   app?: CoreApp;
-  series?: SeriesMessage;
+  labels?: string[];
 }
 
 const typeOptions: Array<{ value: Query['queryType']; label: string; description: string }> = [
@@ -30,28 +30,19 @@ function getTypeOptions(app?: CoreApp) {
   return typeOptions.filter((option) => option.value !== 'both');
 }
 
-function getGroupByOptions(series?: SeriesMessage) {
-  let options: SelectableValue[] = [];
-  if (series) {
-    const labels = series.flatMap((val) => {
-      return val.labels.map((l) => l.name);
-    });
-    options = Array.from(new Set(labels)).map((l) => ({
-      label: l,
-      value: l,
-    }));
-  }
-  return options;
-}
-
 /**
  * Base on QueryOptionGroup component from grafana/ui but that is not available yet.
  */
-export function QueryOptions({ query, onQueryChange, app, series }: Props) {
+export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
   const [isOpen, toggleOpen] = useToggle(false);
   const styles = useStyles2(getStyles);
   const typeOptions = getTypeOptions(app);
-  const groupByOptions = getGroupByOptions(series);
+  const groupByOptions = labels
+    ? labels.map((l) => ({
+        label: l,
+        value: l,
+      }))
+    : [];
 
   return (
     <Stack gap={0} direction="column">
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.test.ts b/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.test.ts
index a729d5919c6..2ea8ddb29cb 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.test.ts
+++ b/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.test.ts
@@ -1,56 +1,62 @@
 import { monacoTypes, Monaco } from '@grafana/ui';
 
-import { SeriesMessage } from '../types';
-
 import { CompletionProvider } from './autocomplete';
 
 describe('CompletionProvider', () => {
-  it('suggests labels', () => {
+  it('suggests labels', async () => {
     const { provider, model } = setup('{}', 1, defaultLabels);
-    const result = provider.provideCompletionItems(model, {} as monacoTypes.Position);
+    const result = await provider.provideCompletionItems(model, {} as monacoTypes.Position);
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       expect.objectContaining({ label: 'foo', insertText: 'foo' }),
     ]);
   });
 
-  it('suggests label names with quotes', () => {
+  it('suggests label names with quotes', async () => {
     const { provider, model } = setup('{foo=}', 6, defaultLabels);
-    const result = provider.provideCompletionItems(model, {} as monacoTypes.Position);
+    const result = await provider.provideCompletionItems(model, {} as monacoTypes.Position);
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       expect.objectContaining({ label: 'bar', insertText: '"bar"' }),
     ]);
   });
 
-  it('suggests label names without quotes', () => {
+  it('suggests label names without quotes', async () => {
     const { provider, model } = setup('{foo="}', 7, defaultLabels);
-    const result = provider.provideCompletionItems(model, {} as monacoTypes.Position);
+    const result = await provider.provideCompletionItems(model, {} as monacoTypes.Position);
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       expect.objectContaining({ label: 'bar', insertText: 'bar' }),
     ]);
   });
 
-  it('suggests nothing without labels', () => {
+  it('suggests nothing without labels', async () => {
     const { provider, model } = setup('{foo="}', 7, []);
-    const result = provider.provideCompletionItems(model, {} as monacoTypes.Position);
+    const result = await provider.provideCompletionItems(model, {} as monacoTypes.Position);
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([]);
   });
 
-  it('suggests labels on empty input', () => {
+  it('suggests labels on empty input', async () => {
     const { provider, model } = setup('', 0, defaultLabels);
-    const result = provider.provideCompletionItems(model, {} as monacoTypes.Position);
+    const result = await provider.provideCompletionItems(model, {} as monacoTypes.Position);
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
       expect.objectContaining({ label: 'foo', insertText: '{foo="' }),
     ]);
   });
 });
 
-const defaultLabels = [{ labels: [{ name: 'foo', value: 'bar' }] }];
+const defaultLabels = ['foo'];
 
-function setup(value: string, offset: number, series?: SeriesMessage) {
+function setup(value: string, offset: number, labels: string[] = []) {
   const provider = new CompletionProvider();
-  if (series) {
-    provider.setSeries(series);
-  }
+  provider.init(labels, (label) => {
+    if (labels.length === 0) {
+      return Promise.resolve([]);
+    }
+    const val = { foo: 'bar' }[label];
+    const result = [];
+    if (val) {
+      result.push(val);
+    }
+    return Promise.resolve(result);
+  });
   const model = makeModel(value, offset);
   provider.monaco = {
     Range: {
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.ts b/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.ts
index 3e61a2d92f3..4db137df402 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.ts
+++ b/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.ts
@@ -1,7 +1,5 @@
 import { monacoTypes, Monaco } from '@grafana/ui';
 
-import { SeriesMessage } from '../types';
-
 /**
  * Class that implements CompletionItemProvider interface and allows us to provide suggestion for the Monaco
  * autocomplete system.
@@ -16,7 +14,13 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
   monaco: Monaco | undefined;
   editor: monacoTypes.editor.IStandaloneCodeEditor | undefined;
 
-  private labels: { [label: string]: Set<string> } = {};
+  private labels: string[] = [];
+  private getLabelValues: (label: string) => Promise<string[]> = () => Promise.resolve([]);
+
+  init(labels: string[], getLabelValues: (label: string) => Promise<string[]>) {
+    this.labels = labels;
+    this.getLabelValues = getLabelValues;
+  }
 
   provideCompletionItems(
     model: monacoTypes.editor.ITextModel,
@@ -35,39 +39,21 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
 
     const { range, offset } = getRangeAndOffset(this.monaco, model, position);
     const situation = getSituation(model.getValue(), offset);
-    const completionItems = this.getCompletions(situation);
 
-    // monaco by-default alphabetically orders the items.
-    // to stop it, we use a number-as-string sortkey,
-    // so that monaco keeps the order we use
-    const maxIndexDigits = completionItems.length.toString().length;
-    const suggestions: monacoTypes.languages.CompletionItem[] = completionItems.map((item, index) => ({
-      kind: getMonacoCompletionItemKind(item.type, this.monaco!),
-      label: item.label,
-      insertText: item.insertText,
-      sortText: index.toString().padStart(maxIndexDigits, '0'), // to force the order we have
-      range,
-    }));
-    return { suggestions };
-  }
-
-  /**
-   * We expect the data directly from the request and transform it here. We do some deduplication and turn them into
-   * object for quicker search as we usually need either a list of label names or values or particular label.
-   */
-  setSeries(series: SeriesMessage) {
-    this.labels = series.reduce<{ [label: string]: Set<string> }>((acc, serie) => {
-      const seriesLabels = serie.labels.reduce<{ [label: string]: Set<string> }>((acc, labelValue) => {
-        acc[labelValue.name] = acc[labelValue.name] || new Set();
-        acc[labelValue.name].add(labelValue.value);
-        return acc;
-      }, {});
-
-      for (const label of Object.keys(seriesLabels)) {
-        acc[label] = new Set([...(acc[label] || []), ...seriesLabels[label]]);
-      }
-      return acc;
-    }, {});
+    return this.getCompletions(situation).then((completionItems) => {
+      // monaco by-default alphabetically orders the items.
+      // to stop it, we use a number-as-string sortkey,
+      // so that monaco keeps the order we use
+      const maxIndexDigits = completionItems.length.toString().length;
+      const suggestions: monacoTypes.languages.CompletionItem[] = completionItems.map((item, index) => ({
+        kind: getMonacoCompletionItemKind(item.type, this.monaco!),
+        label: item.label,
+        insertText: item.insertText,
+        sortText: index.toString().padStart(maxIndexDigits, '0'), // to force the order we have
+        range,
+      }));
+      return { suggestions };
+    });
   }
 
   /**
@@ -75,17 +61,14 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
    * @param situation
    * @private
    */
-  private getCompletions(situation: Situation): Completion[] {
-    if (!Object.keys(this.labels).length) {
-      return [];
-    }
+  private async getCompletions(situation: Situation): Promise<Completion[]> {
     switch (situation.type) {
       // Not really sure what would make sense to suggest in this case so just leave it
       case 'UNKNOWN': {
         return [];
       }
       case 'EMPTY': {
-        return Object.keys(this.labels).map((key) => {
+        return this.labels.map((key) => {
           return {
             label: key,
             insertText: `{${key}="`,
@@ -94,7 +77,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
         });
       }
       case 'IN_LABEL_NAME':
-        return Object.keys(this.labels).map((key) => {
+        return this.labels.map((key) => {
           return {
             label: key,
             insertText: key,
@@ -102,7 +85,8 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
           };
         });
       case 'IN_LABEL_VALUE':
-        return Array.from(this.labels[situation.labelName].values()).map((key) => {
+        let values = await this.getLabelValues(situation.labelName);
+        return values.map((key) => {
           return {
             label: key,
             insertText: situation.betweenQuotes ? key : `"${key}"`,
diff --git a/public/app/plugins/datasource/phlare/dataquery.gen.ts b/public/app/plugins/datasource/phlare/dataquery.gen.ts
index d1a33cd4347..0d4936d7867 100644
--- a/public/app/plugins/datasource/phlare/dataquery.gen.ts
+++ b/public/app/plugins/datasource/phlare/dataquery.gen.ts
@@ -16,7 +16,7 @@ export type PhlareQueryType = ('metrics' | 'profile' | 'both');
 
 export const defaultPhlareQueryType: PhlareQueryType = 'both';
 
-export interface Phlare extends common.DataQuery {
+export interface GrafanaPyroscope extends common.DataQuery {
   /**
    * Allows to group the results.
    */
@@ -31,7 +31,7 @@ export interface Phlare extends common.DataQuery {
   profileTypeId: string;
 }
 
-export const defaultPhlare: Partial<Phlare> = {
+export const defaultGrafanaPyroscope: Partial<GrafanaPyroscope> = {
   groupBy: [],
   labelSelector: '{}',
 };
diff --git a/public/app/plugins/datasource/phlare/datasource.ts b/public/app/plugins/datasource/phlare/datasource.ts
index cb5d7c93c7f..4cf80c31e71 100644
--- a/public/app/plugins/datasource/phlare/datasource.ts
+++ b/public/app/plugins/datasource/phlare/datasource.ts
@@ -13,14 +13,17 @@ import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/run
 import { extractLabelMatchers, toPromLikeExpr } from '../prometheus/language_utils';
 
 import { normalizeQuery } from './QueryEditor/QueryEditor';
-import { PhlareDataSourceOptions, Query, ProfileTypeMessage, SeriesMessage } from './types';
+import { PhlareDataSourceOptions, Query, ProfileTypeMessage, BackendType } from './types';
 
 export class PhlareDataSource extends DataSourceWithBackend<Query, PhlareDataSourceOptions> {
+  backendType: BackendType;
+
   constructor(
     instanceSettings: DataSourceInstanceSettings<PhlareDataSourceOptions>,
     private readonly templateSrv: TemplateSrv = getTemplateSrv()
   ) {
     super(instanceSettings);
+    this.backendType = instanceSettings.jsonData.backendType ?? 'phlare';
   }
 
   query(request: DataQueryRequest<Query>): Observable<DataQueryResponse> {
@@ -49,13 +52,17 @@ export class PhlareDataSource extends DataSourceWithBackend<Query, PhlareDataSou
     return await super.getResource('profileTypes');
   }
 
-  async getSeries(): Promise<SeriesMessage> {
-    // For now, we send empty matcher to get all the series
-    return await super.getResource('series', { matchers: ['{}'] });
+  async getLabelNames(query: string, start: number, end: number): Promise<string[]> {
+    return await super.getResource('labelNames', { query, start, end });
   }
 
-  async getLabelNames(): Promise<string[]> {
-    return await super.getResource('labelNames');
+  async getLabelValues(query: string, label: string, start: number, end: number): Promise<string[]> {
+    return await super.getResource('labelValues', { label, query, start, end });
+  }
+
+  // We need the URL here because it may not be saved on the backend yet when used from config page.
+  async getBackendType(url: string): Promise<{ backendType: BackendType | 'unknown' }> {
+    return await super.getResource('backendType', { url });
   }
 
   applyTemplateVariables(query: Query, scopedVars: ScopedVars): Query {
diff --git a/public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg b/public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg
new file mode 100644
index 00000000000..7bd26e3cc1d
--- /dev/null
+++ b/public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg
@@ -0,0 +1,15 @@
+<svg width="202" height="274" viewBox="0 0 202 274" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_5625_1672)">
+<path d="M201.516 173.165C201.516 171.508 201.474 169.862 201.389 168.226C201.368 167.719 201.316 167.223 201.284 166.716C201.21 165.555 201.136 164.384 201.02 163.233C200.967 162.695 200.893 162.178 200.83 161.639C200.703 160.51 200.566 159.391 200.397 158.272C200.323 157.776 200.228 157.291 200.154 156.795C199.964 155.644 199.764 154.494 199.542 153.364C199.521 153.238 199.5 153.111 199.479 152.984C199.416 152.678 199.331 152.372 199.268 152.055C199.015 150.863 198.74 149.67 198.445 148.498C198.35 148.139 198.255 147.781 198.16 147.411C197.822 146.155 197.474 144.91 197.094 143.675C197.009 143.4 196.925 143.126 196.83 142.851C196.407 141.521 195.964 140.202 195.489 138.904C195.426 138.735 195.362 138.556 195.299 138.387C194.771 136.972 194.223 135.568 193.631 134.175C193.621 134.144 193.61 134.112 193.589 134.08C193.579 134.059 193.568 134.027 193.558 134.006C189.093 123.472 183.045 116.052 176.416 107.165L173.503 103.228L147.622 66.9082C147.622 66.9082 135.357 82.8462 118.1 102.647C136.751 49.8302 100.758 0 100.758 0L18.1018 115.651H18.1229C17.8696 116.031 17.6268 116.411 17.3735 116.781C17.3208 116.854 17.268 116.918 17.2258 116.992C17.1519 117.097 17.0885 117.213 17.0147 117.329C16.2758 118.427 15.5581 119.546 14.8614 120.675C14.7031 120.929 14.5448 121.182 14.397 121.446C13.7321 122.554 13.0882 123.673 12.4655 124.802C12.3282 125.056 12.1805 125.298 12.0538 125.552C11.3677 126.818 10.7133 128.095 10.08 129.394C10.0273 129.499 9.97447 129.605 9.9217 129.71C8.5601 132.539 7.32517 135.452 6.22745 138.418C6.09023 138.777 5.97413 139.157 5.83691 139.516C5.44638 140.603 5.07695 141.69 4.72864 142.788C4.57031 143.284 4.42254 143.78 4.27477 144.287C3.97923 145.279 3.69425 146.271 3.41982 147.274C3.27205 147.823 3.13483 148.372 2.99762 148.921C2.75485 149.902 2.52265 150.894 2.31155 151.886C2.22711 152.256 2.13211 152.625 2.05823 152.995C2.01601 153.185 1.9949 153.385 1.95268 153.575C1.74158 154.631 1.56214 155.697 1.38271 156.773C1.29827 157.27 1.20327 157.755 1.12939 158.251C0.897175 159.803 0.69663 161.365 0.52775 162.938C0.50664 163.128 0.496085 163.328 0.48553 163.518C0.348315 164.901 0.242765 166.305 0.16888 167.708C0.137215 168.289 0.12666 168.869 0.10555 169.45C0.06333 170.484 0.031665 171.519 0.02111 172.564C0.02111 172.796 0 173.039 0 173.271C0 173.693 0.031665 174.105 0.031665 174.527C0.04222 175.509 0.06333 176.49 0.10555 177.482C0.12666 178.126 0.16888 178.76 0.200545 179.393C0.23221 179.857 0.23221 180.311 0.27443 180.776C0.31665 181.367 0.390535 181.958 0.44331 182.549C0.496085 183.098 0.538305 183.636 0.601635 184.185C0.728295 185.388 0.88662 186.581 1.0555 187.763C1.10828 188.164 1.16105 188.555 1.22438 188.956C1.43548 190.275 1.66769 191.594 1.93157 192.893C1.97379 193.104 2.00545 193.325 2.04767 193.537C2.05823 193.6 2.07934 193.663 2.08989 193.726C2.38543 195.173 2.72319 196.597 3.08206 198.012C3.12428 198.16 3.15595 198.318 3.18761 198.466C3.98979 201.558 4.93974 204.598 6.0269 207.575C6.35411 208.472 6.71298 209.348 7.06129 210.235C7.27239 210.752 7.46238 211.279 7.68404 211.797C7.76848 211.997 7.84236 212.208 7.9268 212.409C8.30678 213.306 8.71843 214.182 9.13007 215.058C9.25673 215.333 9.37284 215.607 9.4995 215.871C10.0695 217.085 10.6711 218.277 11.2833 219.46C11.3361 219.576 11.3994 219.681 11.4522 219.797C13.2043 223.143 15.1253 226.394 17.2258 229.508C20.8461 234.87 24.9837 239.862 29.5434 244.422C34.1032 248.982 39.0957 253.109 44.4577 256.729C46.4842 258.101 48.5847 259.368 50.7062 260.592C50.759 260.624 50.8118 260.656 50.8645 260.687C52.0256 261.352 53.1972 261.996 54.3794 262.608C54.6327 262.735 54.886 262.872 55.1393 262.999C56.1737 263.527 57.2081 264.033 58.253 264.529C58.7175 264.751 59.1924 264.962 59.6674 265.173C60.3007 265.458 60.9235 265.764 61.5568 266.028C61.7995 266.134 62.0528 266.218 62.3062 266.324C63.0556 266.63 63.8155 266.925 64.5649 267.221C65.2088 267.474 65.8526 267.728 66.5071 267.97C67.8264 268.445 69.1564 268.899 70.4968 269.321C70.613 269.364 70.7291 269.406 70.8452 269.438C77.0832 271.38 83.5639 272.731 90.2347 273.417C90.4775 273.438 90.7097 273.459 90.9524 273.48C91.8602 273.565 92.7679 273.67 93.6862 273.733C93.9712 273.755 94.2562 273.733 94.5411 273.755C96.5888 273.881 98.647 273.966 100.737 273.966C100.98 273.966 101.222 273.945 101.465 273.945C102.046 273.945 102.626 273.913 103.207 273.902C105.254 273.85 107.281 273.744 109.297 273.575C109.751 273.533 110.215 273.512 110.669 273.47C112.949 273.248 115.197 272.931 117.424 272.562C118.058 272.456 118.702 272.34 119.335 272.224C119.894 272.118 120.454 272.034 121.013 271.918C122.66 271.58 124.296 271.2 125.911 270.789C126.28 270.694 126.639 270.577 127.008 270.472C128.887 269.965 130.745 269.395 132.581 268.783C133.225 268.572 133.88 268.361 134.513 268.129C136.339 267.485 138.144 266.799 139.917 266.039C140.075 265.975 140.234 265.891 140.392 265.828C141.036 265.553 141.68 265.247 142.313 264.962C143.812 264.287 145.279 263.569 146.736 262.82C147.358 262.503 147.992 262.197 148.604 261.859C150.24 260.972 151.844 260.022 153.427 259.051L132.719 230.015C123.082 235.63 111.904 238.86 99.9664 238.86C63.9633 238.86 34.6732 209.57 34.6732 173.566C34.6732 137.563 63.9633 108.273 99.9664 108.273C135.97 108.273 165.26 137.563 165.26 173.566C165.26 191.288 158.146 207.374 146.641 219.154L167.582 248.528C167.867 248.275 168.152 248.032 168.437 247.779L168.458 247.8C174.4 242.406 179.667 236.295 184.185 229.635C184.206 229.603 184.238 229.571 184.259 229.529C184.259 229.519 184.28 229.497 184.28 229.487C185.114 228.262 185.905 227.006 186.686 225.74C186.781 225.581 186.876 225.434 186.971 225.275C187.7 224.083 188.386 222.869 189.061 221.644C189.198 221.402 189.325 221.159 189.462 220.927C190.096 219.755 190.697 218.573 191.278 217.38C191.436 217.064 191.584 216.747 191.742 216.43C192.291 215.29 192.808 214.129 193.315 212.968C193.389 212.789 193.484 212.609 193.558 212.43C193.642 212.219 193.726 212.008 193.811 211.797C194.275 210.678 194.719 209.559 195.141 208.419C195.32 207.955 195.479 207.48 195.647 207.005C196.038 205.918 196.407 204.83 196.756 203.733C196.925 203.184 197.094 202.635 197.252 202.086C197.569 201.041 197.875 199.996 198.149 198.93C198.318 198.297 198.466 197.664 198.624 197.02C198.867 196.017 199.11 195.014 199.321 194.001C199.352 193.843 199.395 193.695 199.426 193.537C199.542 192.967 199.627 192.386 199.732 191.816C199.912 190.866 200.091 189.927 200.239 188.977C200.376 188.132 200.471 187.267 200.587 186.412C200.703 185.557 200.83 184.702 200.914 183.836C201.02 182.792 201.094 181.725 201.168 180.67C201.221 179.984 201.294 179.298 201.326 178.601C201.421 176.87 201.463 175.129 201.463 173.376C201.463 173.345 201.463 173.313 201.463 173.271C201.463 173.271 201.463 173.208 201.463 173.176L201.516 173.165ZM99.9875 125.911C73.7161 125.911 52.3422 147.284 52.3422 173.556C52.3422 199.827 73.7161 221.201 99.9875 221.201C126.259 221.201 147.633 199.827 147.633 173.556C147.633 147.284 126.259 125.911 99.9875 125.911Z" fill="url(#paint0_linear_5625_1672)"/>
+<path d="M66.7076 173.799H60.5329C60.5329 152.203 78.107 134.629 99.7025 134.629V140.804C81.5057 140.804 66.7076 155.602 66.7076 173.799Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_5625_1672" x1="100.758" y1="336.008" x2="100.758" y2="7.3885" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFEF00"/>
+<stop offset="1" stop-color="#ED5A27"/>
+</linearGradient>
+<clipPath id="clip0_5625_1672">
+<rect width="202" height="274" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/app/plugins/datasource/phlare/img/phlare_icon_color.svg b/public/app/plugins/datasource/phlare/img/phlare_icon_color.svg
deleted file mode 100644
index 77ec7133c6e..00000000000
--- a/public/app/plugins/datasource/phlare/img/phlare_icon_color.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 140.07 151.15"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-8);}.cls-3{fill:url(#linear-gradient-3);}.cls-4{fill:url(#linear-gradient-4);}.cls-5{fill:url(#linear-gradient-2);}.cls-6{fill:url(#linear-gradient-6);}.cls-7{fill:url(#linear-gradient-7);}.cls-8{fill:url(#linear-gradient-5);}</style><linearGradient id="linear-gradient" x1="556.29" y1="168.71" x2="674.41" y2="28.91" gradientTransform="translate(-556.16) skewX(-8)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffef00"/><stop offset="1" stop-color="#ed5a27"/></linearGradient><linearGradient id="linear-gradient-2" x1="524.45" y1="141.81" x2="642.57" y2="2.01" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-3" x1="546.04" y1="160.05" x2="664.16" y2="20.25" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-4" x1="561.98" y1="173.52" x2="680.1" y2="33.71" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-5" x1="535.6" y1="121.34" x2="655.87" y2="118.41" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-6" x1="536.16" y1="144.33" x2="656.43" y2="141.41" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-7" x1="613.28" y1="33.92" x2="517.45" y2="-5.31" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-8" x1="613.28" y1="33.92" x2="517.45" y2="-5.31" xlink:href="#linear-gradient"/></defs><g id="Layer_1-2"><g><g><path class="cls-1" d="M126.18,82.3c6.34-7.66,10.91-16.78,12.86-26.62h-39.74c-2.18,5.73-7.94,10.01-14.09,10.01H13.33l-2.34,16.61H126.18Z"/><path class="cls-5" d="M42.55,13.99l6.66,2.7h81.13C122.18,6.5,109.49,.12,94.43,.12H29.32c2.23,6.34,6.94,11.32,13.23,13.87Z"/><path class="cls-3" d="M48.24,22.87l-7.32,2.66c-7.06,2.57-13.22,7.62-17.23,14.04H88.89c6.12,0,10.65,4.23,11.26,9.92h39.75c.8-9.84-1.22-18.96-5.43-26.62H48.24Z"/><path class="cls-4" d="M10.13,88.48l-2.11,15.01-.23,1.65H79.67c15.1,0,29.63-6.41,40.66-16.66H10.13Z"/><polygon class="cls-8" points="44.06 128.3 46.45 111.32 6.92 111.32 4.53 128.3 44.06 128.3"/><polygon class="cls-6" points="3.66 134.48 1.32 151.15 40.85 151.15 43.19 134.48 3.66 134.48"/></g><g><path class="cls-7" d="M39.52,19.76C30.96,16.29,24.74,9.05,22.54,0,17.8,9.05,9.53,16.29,0,19.76c8.56,3.47,14.78,10.72,16.98,19.76,4.74-9.05,13-16.29,22.54-19.76Z"/><path class="cls-2" d="M22.54,0c2.2,9.05,8.43,16.29,16.98,19.76-9.53,3.47-17.8,10.72-22.54,19.76C14.78,30.48,8.56,23.23,0,19.76,9.53,16.29,17.8,9.05,22.54,0"/></g></g></g></svg>
\ No newline at end of file
diff --git a/public/app/plugins/datasource/phlare/plugin.json b/public/app/plugins/datasource/phlare/plugin.json
index cd4de7432ad..3ec4ed4eb3b 100644
--- a/public/app/plugins/datasource/phlare/plugin.json
+++ b/public/app/plugins/datasource/phlare/plugin.json
@@ -1,6 +1,6 @@
 {
   "type": "datasource",
-  "name": "Phlare",
+  "name": "Grafana Pyroscope",
   "id": "phlare",
   "category": "profiling",
 
@@ -13,15 +13,15 @@
   "backend": true,
 
   "info": {
-    "description": "Horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system. OSS profiling solution from Grafana Labs.",
+    "description": "Supports Phlare and Pyroscope backends, horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation systems.",
     "author": {
       "name": "Grafana Labs",
       "url": "https://www.grafana.com"
     },
-    "keywords": ["grafana", "datasource", "phlare", "flamegraph"],
+    "keywords": ["grafana", "datasource", "phlare", "flamegraph", "profiling", "continuous profiling", "pyroscope"],
     "logos": {
-      "small": "img/phlare_icon_color.svg",
-      "large": "img/phlare_icon_color.svg"
+      "small": "img/grafana_pyroscope_icon.svg",
+      "large": "img/grafana_pyroscope_icon.svg"
     },
     "links": [
       {
diff --git a/public/app/plugins/datasource/phlare/types.ts b/public/app/plugins/datasource/phlare/types.ts
index 5a52c698e01..52957305684 100644
--- a/public/app/plugins/datasource/phlare/types.ts
+++ b/public/app/plugins/datasource/phlare/types.ts
@@ -1,25 +1,22 @@
 import { DataSourceJsonData } from '@grafana/data';
 
-import { Phlare as PhlareBase, PhlareQueryType } from './dataquery.gen';
+import { GrafanaPyroscope, PhlareQueryType } from './dataquery.gen';
 
-export interface Query extends PhlareBase {
+export interface Query extends GrafanaPyroscope {
   queryType: PhlareQueryType;
 }
 
 export interface ProfileTypeMessage {
-  ID: string;
-  name: string;
-  period_type: string;
-  period_unit: string;
-  sample_type: string;
-  sample_unit: string;
+  id: string;
+  label: string;
 }
 
-export type SeriesMessage = Array<{ labels: Array<{ name: string; value: string }> }>;
-
 /**
  * These are options configured for each DataSource instance.
  */
 export interface PhlareDataSourceOptions extends DataSourceJsonData {
   minStep?: string;
+  backendType?: BackendType; // if not set we assume it's phlare
 }
+
+export type BackendType = 'phlare' | 'pyroscope';

From fe23c76250b586b9ccb8ac96807834d413a40491 Mon Sep 17 00:00:00 2001
From: Polina Boneva <13227501+polibb@users.noreply.github.com>
Date: Tue, 25 Apr 2023 17:18:58 +0300
Subject: [PATCH 395/729] Dashboard: New panel in a dashboard is not deleted
 after "Discard"-ing changes in Panel Edit (#66476)

* add isNew notPersistedProperty to PanelModel

* if panel is newly created and user "Discard"s it, the panel is removed entirely

* add Todo's for when we remove the emptyDashboardPage FF

* add isNew to new panel after file dropping on dashboard page

* handle the "Apply" case

* CSV file dropping is not relevant to a new panel bc it doesnt open edit page
---
 .../components/AddPanelWidget/AddPanelWidget.tsx     |  1 +
 .../components/PanelEditor/state/actions.ts          | 12 +++++++++++-
 .../features/dashboard/containers/DashboardPage.tsx  |  1 +
 .../features/dashboard/dashgrid/DashboardGrid.tsx    |  1 +
 .../app/features/dashboard/state/DashboardModel.ts   |  1 +
 public/app/features/dashboard/state/PanelModel.ts    |  2 ++
 public/app/features/dashboard/utils/dashboard.ts     |  1 +
 7 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index becd09aa7d7..06803d80127 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -77,6 +77,7 @@ export const AddPanelWidgetUnconnected = ({ panel, dashboard }: Props) => {
       title: 'Panel Title',
       datasource: panel.datasource,
       gridPos: { x: gridPos.x, y: gridPos.y, w: gridPos.w, h: gridPos.h },
+      isNew: true,
     };
 
     dashboard.addPanel(newPanel);
diff --git a/public/app/features/dashboard/components/PanelEditor/state/actions.ts b/public/app/features/dashboard/components/PanelEditor/state/actions.ts
index 2a2bbff694c..e01fda2c028 100644
--- a/public/app/features/dashboard/components/PanelEditor/state/actions.ts
+++ b/public/app/features/dashboard/components/PanelEditor/state/actions.ts
@@ -1,6 +1,7 @@
 import { pick } from 'lodash';
 
 import store from 'app/core/store';
+import { removePanel } from 'app/features/dashboard/utils/panel';
 import { cleanUpPanelState } from 'app/features/panel/state/actions';
 import { panelModelAndPluginReady } from 'app/features/panel/state/reducers';
 import { ThunkResult } from 'app/types';
@@ -113,9 +114,9 @@ export function exitPanelEditor(): ThunkResult<void> {
       dashboard.exitPanelEditor();
     }
 
+    const sourcePanel = getSourcePanel();
     if (hasPanelChangedInPanelEdit(panel) && !shouldDiscardChanges) {
       const modifiedSaveModel = panel.getSaveModel();
-      const sourcePanel = getSourcePanel();
       const panelTypeChanged = sourcePanel.type !== panel.type;
 
       dispatch(updateDuplicateLibraryPanels(panel, dashboard));
@@ -144,6 +145,15 @@ export function exitPanelEditor(): ThunkResult<void> {
       }, 20);
     }
 
+    // A new panel is only new until the first time we exit the panel editor
+    if (sourcePanel.isNew) {
+      if (!shouldDiscardChanges) {
+        delete sourcePanel.isNew;
+      } else {
+        dashboard && removePanel(dashboard, sourcePanel, true);
+      }
+    }
+
     dispatch(cleanUpPanelState(panel.key));
     dispatch(closeEditor());
   };
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index febdac4d4b6..d05e2bcac58 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -351,6 +351,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
     return updateStatePageNavFromProps(props, updatedState);
   }
 
+  // Todo: Remove this when we remove the emptyDashboardPage toggle
   onAddPanel = () => {
     const { dashboard } = this.props;
 
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
index f1c7ced4404..efdfc481df9 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
@@ -185,6 +185,7 @@ export class DashboardGrid extends PureComponent<Props, State> {
       return <DashboardRow key={panel.key} panel={panel} dashboard={this.props.dashboard} />;
     }
 
+    // Todo: Remove this when we remove the emptyDashboardPage toggle
     if (panel.type === 'add-panel') {
       return <AddPanelWidget key={panel.key} panel={panel} dashboard={this.props.dashboard} />;
     }
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index 16067227c18..588b42dfb6b 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -293,6 +293,7 @@ export class DashboardModel implements TimeModel {
   }
 
   private getPanelSaveModels() {
+    // Todo: Remove panel.type === 'add-panel' when we remove the emptyDashboardPage toggle
     return this.panels
       .filter(
         (panel) =>
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index a38cafe238d..dff99dbd546 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -66,6 +66,7 @@ const notPersistedProperties: { [str: string]: boolean } = {
   getDisplayTitle: true,
   dataSupport: true,
   key: true,
+  isNew: true,
 };
 
 // For angular panels we need to clean up properties when changing type
@@ -189,6 +190,7 @@ export class PanelModel implements DataConfigSource, IPanelModel {
   hasRefreshed?: boolean;
   cacheTimeout?: string | null;
   queryCachingTTL?: number | null;
+  isNew?: boolean;
 
   cachedPluginOptions: Record<string, PanelOptionsCache> = {};
   legend?: { show: boolean; sort?: string; sortDesc?: boolean };
diff --git a/public/app/features/dashboard/utils/dashboard.ts b/public/app/features/dashboard/utils/dashboard.ts
index 13fe36eecaa..3b31aec7c09 100644
--- a/public/app/features/dashboard/utils/dashboard.ts
+++ b/public/app/features/dashboard/utils/dashboard.ts
@@ -12,6 +12,7 @@ export function onCreateNewPanel(dashboard: DashboardModel): number | undefined
     type: 'timeseries',
     title: 'Panel Title',
     gridPos: calculateNewPanelGridPos(dashboard),
+    isNew: true,
   };
 
   dashboard.addPanel(newPanel);

From 39a3d85514553e87bd17e516bcf97373e14ad9f6 Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Tue, 25 Apr 2023 10:23:23 -0400
Subject: [PATCH 396/729] Graphite: Variable editor add definition to onChange
 (#66895)

add definition to onChange
---
 .../components/GraphiteVariableEditor.tsx         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/graphite/components/GraphiteVariableEditor.tsx b/public/app/plugins/datasource/graphite/components/GraphiteVariableEditor.tsx
index 1a9c0488830..fdf421e27ca 100644
--- a/public/app/plugins/datasource/graphite/components/GraphiteVariableEditor.tsx
+++ b/public/app/plugins/datasource/graphite/components/GraphiteVariableEditor.tsx
@@ -8,7 +8,7 @@ import { convertToGraphiteQueryObject } from './helpers';
 
 interface Props {
   query: GraphiteQuery | string;
-  onChange: (query: GraphiteQuery) => void;
+  onChange: (query: GraphiteQuery, definition: string) => void;
 }
 
 const GRAPHITE_QUERY_VARIABLE_TYPE_OPTIONS = [
@@ -36,10 +36,13 @@ export const GraphiteVariableEditor = (props: Props) => {
             });
 
             if (value.target) {
-              onChange({
-                ...value,
-                queryType: selectableValue.value,
-              });
+              onChange(
+                {
+                  ...value,
+                  queryType: selectableValue.value,
+                },
+                value.target ?? ''
+              );
             }
           }}
         />
@@ -48,7 +51,7 @@ export const GraphiteVariableEditor = (props: Props) => {
         <Input
           aria-label="Variable editor query input"
           value={value.target}
-          onBlur={() => onChange(value)}
+          onBlur={() => onChange(value, value.target ?? '')}
           onChange={(e) => {
             setValue({
               ...value,

From 93348c2a178df16632c3a436880fd02f440768d2 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 25 Apr 2023 07:47:22 -0700
Subject: [PATCH 397/729] Spreadsheet: Convert to DataFrame (#67170)

---
 public/app/core/utils/sheet.test.ts | 183 ++++++++++++++++++++++++++++
 public/app/core/utils/sheet.ts      | 176 ++++++++++++++++++++++++--
 2 files changed, 351 insertions(+), 8 deletions(-)
 create mode 100644 public/app/core/utils/sheet.test.ts

diff --git a/public/app/core/utils/sheet.test.ts b/public/app/core/utils/sheet.test.ts
new file mode 100644
index 00000000000..cb8b46ecfeb
--- /dev/null
+++ b/public/app/core/utils/sheet.test.ts
@@ -0,0 +1,183 @@
+import { utils } from 'xlsx';
+
+import { DataFrame } from '@grafana/data';
+
+import { workSheetToFrame } from './sheet';
+
+describe('sheets', () => {
+  it('will use first row as names', () => {
+    const sheet = utils.aoa_to_sheet([
+      ['Number', 'String', 'Bool', 'Date', 'Object'],
+      [1, 'A', true, Date.UTC(2020, 1, 1), { hello: 'world' }],
+      [2, 'B', false, Date.UTC(2020, 1, 2), { hello: 'world' }],
+    ]);
+    const frame = workSheetToFrame(sheet);
+
+    expect(toSnapshotFrame(frame)).toMatchInlineSnapshot(`
+      [
+        {
+          "name": "Number",
+          "type": "number",
+          "values": [
+            1,
+            2,
+          ],
+        },
+        {
+          "name": "String",
+          "type": "string",
+          "values": [
+            "A",
+            "B",
+          ],
+        },
+        {
+          "name": "Bool",
+          "type": "boolean",
+          "values": [
+            true,
+            false,
+          ],
+        },
+        {
+          "name": "Date",
+          "type": "number",
+          "values": [
+            1580515200000,
+            1580601600000,
+          ],
+        },
+        {
+          "name": "Object",
+          "type": "string",
+          "values": [
+            undefined,
+            undefined,
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('will use calculated data when cells are typed', () => {
+    const sheet = utils.aoa_to_sheet([
+      [1, 'A', true, Date.UTC(2020, 1, 1), { hello: 'world' }],
+      [2, 'B', false, Date.UTC(2020, 1, 2), { hello: 'world' }],
+      [3, 'C', true, Date.UTC(2020, 1, 3), { hello: 'world' }],
+    ]);
+    const frame = workSheetToFrame(sheet);
+
+    expect(toSnapshotFrame(frame)).toMatchInlineSnapshot(`
+      [
+        {
+          "name": "A",
+          "type": "number",
+          "values": [
+            1,
+            2,
+            3,
+          ],
+        },
+        {
+          "name": "B",
+          "type": "string",
+          "values": [
+            "A",
+            "B",
+            "C",
+          ],
+        },
+        {
+          "name": "C",
+          "type": "boolean",
+          "values": [
+            true,
+            false,
+            true,
+          ],
+        },
+        {
+          "name": "D",
+          "type": "number",
+          "values": [
+            1580515200000,
+            1580601600000,
+            1580688000000,
+          ],
+        },
+        {
+          "name": "E",
+          "type": "string",
+          "values": [
+            undefined,
+            undefined,
+            undefined,
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('is OK with nulls and undefineds, and misalignment', () => {
+    const sheet = utils.aoa_to_sheet([
+      [null, 'A', true],
+      [2, 'B', null, Date.UTC(2020, 1, 2), { hello: 'world' }],
+      [3, 'C', true, undefined, { hello: 'world' }],
+    ]);
+    const frame = workSheetToFrame(sheet);
+
+    expect(toSnapshotFrame(frame)).toMatchInlineSnapshot(`
+      [
+        {
+          "name": "A",
+          "type": "number",
+          "values": [
+            undefined,
+            2,
+            3,
+          ],
+        },
+        {
+          "name": "B",
+          "type": "string",
+          "values": [
+            "A",
+            "B",
+            "C",
+          ],
+        },
+        {
+          "name": "C",
+          "type": "boolean",
+          "values": [
+            true,
+            undefined,
+            true,
+          ],
+        },
+        {
+          "name": "D",
+          "type": "number",
+          "values": [
+            undefined,
+            1580601600000,
+            undefined,
+          ],
+        },
+        {
+          "name": "E",
+          "type": "string",
+          "values": [
+            undefined,
+            undefined,
+            undefined,
+          ],
+        },
+      ]
+    `);
+  });
+});
+
+function toSnapshotFrame(frame: DataFrame) {
+  return frame.fields.map((f) => ({ name: f.name, values: f.values, type: f.type }));
+}
diff --git a/public/app/core/utils/sheet.ts b/public/app/core/utils/sheet.ts
index 5771b772283..a97d31c2b33 100644
--- a/public/app/core/utils/sheet.ts
+++ b/public/app/core/utils/sheet.ts
@@ -1,12 +1,172 @@
-import { read, utils } from 'xlsx';
+import { read, utils, WorkSheet, WorkBook, Range, ColInfo, CellObject, ExcelDataType } from 'xlsx';
 
-import { ArrayDataFrame, DataFrame } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 
 export function readSpreadsheet(file: ArrayBuffer): DataFrame[] {
-  const wb = read(file, { type: 'buffer' });
-  return wb.SheetNames.map((name) => {
-    const frame = new ArrayDataFrame(utils.sheet_to_json(wb.Sheets[name]));
-    frame.name = name;
-    return frame;
-  });
+  return workBookToFrames(read(file, { type: 'buffer' }));
+}
+
+export function workBookToFrames(wb: WorkBook): DataFrame[] {
+  return wb.SheetNames.map((name) => workSheetToFrame(wb.Sheets[name], name));
+}
+
+export function workSheetToFrame(sheet: WorkSheet, name?: string): DataFrame {
+  const columns = sheetAsColumns(sheet);
+  if (!columns?.length) {
+    return {
+      fields: [],
+      name: name,
+      length: 0,
+    };
+  }
+
+  return {
+    fields: columns.map((c, idx) => {
+      let type = FieldType.string;
+      let values: unknown[] = [];
+      switch (c.type ?? 's') {
+        case 'b':
+          type = FieldType.boolean;
+          values = c.data.map((v) => (v?.v == null ? v?.v : Boolean(v.v)));
+          break;
+
+        case 'n':
+          type = FieldType.number;
+          values = c.data.map((v) => (v?.v == null ? v?.v : +v.v));
+          break;
+
+        case 'd':
+          type = FieldType.time;
+          values = c.data.map((v) => (v?.v == null ? v?.v : +v.v)); // ???
+          break;
+
+        default:
+          type = FieldType.string;
+          values = c.data.map((v) => (v?.v == null ? v?.v : utils.format_cell(v)));
+          break;
+      }
+
+      return {
+        name: c.name,
+        config: {}, // TODO? we could apply decimal formatting from worksheet
+        type,
+        values,
+      };
+    }),
+    name: name,
+    length: columns[0].data.length,
+  };
+}
+
+interface ColumnData {
+  index: number;
+  name: string;
+  info?: ColInfo;
+  data: CellObject[];
+  type?: ExcelDataType;
+}
+
+function sheetAsColumns(sheet: WorkSheet): ColumnData[] | null {
+  const r = sheet['!ref'];
+  if (!r) {
+    return null;
+  }
+  const columnInfo = sheet['!cols'];
+  const cols: ColumnData[] = [];
+  const range = safe_decode_range(r);
+  const types = new Set<ExcelDataType>();
+  let firstRowIsHeader = true;
+
+  for (let c = range.s.c; c <= range.e.c; ++c) {
+    types.clear();
+    const info = columnInfo?.[c] ?? {};
+    if (info.hidden) {
+      continue; // skip the column
+    }
+    const field: ColumnData = {
+      index: c,
+      name: utils.encode_col(c),
+      data: [],
+      info,
+    };
+    const pfix = utils.encode_col(c);
+    for (let r = range.s.r; r <= range.e.r; ++r) {
+      const cell = sheet[pfix + utils.encode_row(r)];
+      if (cell) {
+        if (field.data.length) {
+          types.add(cell.t);
+        } else if (cell.t !== 's') {
+          firstRowIsHeader = false;
+        }
+      }
+      field.data.push(cell);
+    }
+    cols.push(field);
+    if (types.size === 1) {
+      field.type = Array.from(types)[0];
+    }
+  }
+
+  if (firstRowIsHeader) {
+    return cols.map((c) => {
+      const first = c.data[0];
+      if (first?.v) {
+        c.name = utils.format_cell(first);
+      }
+      c.data = c.data.slice(1);
+      return c;
+    });
+  }
+  return cols;
+}
+
+/**
+ * Copied from Apache 2 licensed sheetjs:
+ * https://git.sheetjs.com/sheetjs/sheetjs/src/branch/master/xlsx.flow.js#L4338
+ */
+function safe_decode_range(range: string): Range {
+  let o = { s: { c: 0, r: 0 }, e: { c: 0, r: 0 } };
+  let idx = 0,
+    i = 0,
+    cc = 0;
+  let len = range.length;
+  for (idx = 0; i < len; ++i) {
+    if ((cc = range.charCodeAt(i) - 64) < 1 || cc > 26) {
+      break;
+    }
+    idx = 26 * idx + cc;
+  }
+  o.s.c = --idx;
+
+  for (idx = 0; i < len; ++i) {
+    if ((cc = range.charCodeAt(i) - 48) < 0 || cc > 9) {
+      break;
+    }
+    idx = 10 * idx + cc;
+  }
+  o.s.r = --idx;
+
+  if (i === len || cc !== 10) {
+    o.e.c = o.s.c;
+    o.e.r = o.s.r;
+    return o;
+  }
+  ++i;
+
+  for (idx = 0; i !== len; ++i) {
+    if ((cc = range.charCodeAt(i) - 64) < 1 || cc > 26) {
+      break;
+    }
+    idx = 26 * idx + cc;
+  }
+  o.e.c = --idx;
+
+  for (idx = 0; i !== len; ++i) {
+    if ((cc = range.charCodeAt(i) - 48) < 0 || cc > 9) {
+      break;
+    }
+    idx = 10 * idx + cc;
+  }
+  o.e.r = --idx;
+  return o;
 }

From bb66f14c1d089b12d32e1afc7bccc7fc2e937e5e Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 25 Apr 2023 16:22:36 +0100
Subject: [PATCH 398/729] NestedFolders: Rename 'General' to 'Dashboards' in
 FolderPicker (#67113)

---
 public/app/core/components/Select/FolderPicker.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/core/components/Select/FolderPicker.tsx b/public/app/core/components/Select/FolderPicker.tsx
index e3d9bca1557..96b9f0be4de 100644
--- a/public/app/core/components/Select/FolderPicker.tsx
+++ b/public/app/core/components/Select/FolderPicker.tsx
@@ -5,6 +5,7 @@ import { useAsync } from 'react-use';
 
 import { AppEvents, SelectableValue, GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { config } from '@grafana/runtime';
 import { useStyles2, ActionMeta, Input, InputActionMeta, AsyncVirtualizedSelect } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
 import { t } from 'app/core/internationalization';
@@ -70,7 +71,7 @@ export function FolderPicker(props: Props) {
     initialFolderUid,
     initialTitle = '',
     permissionLevel = PermissionLevelString.Edit,
-    rootName = 'General',
+    rootName: rootNameProp,
     showRoot = true,
     skipInitialLoad,
     searchQueryType,
@@ -78,6 +79,8 @@ export function FolderPicker(props: Props) {
     folderWarning,
   } = props;
 
+  const rootName = rootNameProp ?? config.featureToggles.nestedFolders ? 'Dashboards' : 'General';
+
   const [folder, setFolder] = useState<SelectedFolder | null>(null);
   const [isCreatingNew, setIsCreatingNew] = useState(false);
   const [inputValue, setInputValue] = useState('');

From e6e741546ffb8fd4d11e7a1e765d49f831f0bd18 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 25 Apr 2023 17:08:40 +0100
Subject: [PATCH 399/729] Nested folders: Create basic Move/Delete modals 
 (#67140)

* add modal scaffolding

* add some unit tests

* remove dummy api, add some TODO comments

* small test refactor

* another small test refactor

* fix unit tests due to aria-label/data-testid change
---
 .betterer.results                             |   3 -
 .../src/selectors/pages.ts                    |   2 +-
 .../ConfirmModal/ConfirmModal.test.tsx        |   7 +-
 .../components/ConfirmModal/ConfirmModal.tsx  |   2 +-
 .../grafana-ui/src/components/Modal/Modal.tsx |   2 +-
 .../admin/AlertmanagerConfig.test.tsx         |   2 +-
 .../BrowseDashboardsPage.tsx                  |   2 +-
 .../components/BrowseActions.tsx              |  41 -------
 .../BrowseActions.test.tsx                    |   7 +-
 .../BrowseActions/BrowseActions.tsx           |  67 ++++++++++++
 .../BrowseActions/DeleteModal.test.tsx        |  72 +++++++++++++
 .../components/BrowseActions/DeleteModal.tsx  |  62 +++++++++++
 .../BrowseActions/MoveModal.test.tsx          | 101 ++++++++++++++++++
 .../components/BrowseActions/MoveModal.tsx    |  65 +++++++++++
 .../components/BrowseActions/utils.test.ts    |  23 ++++
 .../components/BrowseActions/utils.ts         |  26 +++++
 .../folders/FolderSettingsPage.test.tsx       |   2 +-
 .../components/ConfirmDeleteModal.test.tsx    |   5 +-
 .../ServiceAccountsListPage.test.tsx          |   4 +-
 .../LogGroups/SelectedLogGroups.test.tsx      |   2 +-
 20 files changed, 436 insertions(+), 61 deletions(-)
 delete mode 100644 public/app/features/browse-dashboards/components/BrowseActions.tsx
 rename public/app/features/browse-dashboards/components/{ => BrowseActions}/BrowseActions.test.tsx (59%)
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions/utils.test.ts
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions/utils.ts

diff --git a/.betterer.results b/.betterer.results
index 278d3a84a8a..34133989d8f 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -962,9 +962,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
-    "packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index b7f1ca5448b..95cd03e5b25 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -38,7 +38,7 @@ export const Pages = {
     dataSourcePluginsV2: (pluginName: string) => `Add new data source ${pluginName}`,
   },
   ConfirmModal: {
-    delete: 'Confirm Modal Danger Button',
+    delete: 'data-testid Confirm Modal Danger Button',
   },
   AddDashboard: {
     url: '/dashboard/new',
diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
index 8c7a2f93c88..7cd0cf04d9f 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, within } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { ConfirmModal } from './ConfirmModal';
@@ -23,8 +23,7 @@ describe('ConfirmModal', () => {
     expect(screen.getByText('Some Body')).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Dismiss Text' })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Alternative Text' })).toBeInTheDocument();
-    const button = screen.getByRole('button', { name: 'Confirm Modal Danger Button' });
-    expect(within(button).getByText('Please Confirm')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeInTheDocument();
   });
 
   it('should render nothing when isOpen is false', () => {
@@ -43,6 +42,6 @@ describe('ConfirmModal', () => {
     expect(screen.queryByText('Some Body')).not.toBeInTheDocument();
     expect(screen.queryByRole('button', { name: 'Dismiss Text' })).not.toBeInTheDocument();
     expect(screen.queryByRole('button', { name: 'Alternative Text' })).not.toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'Confirm Modal Danger Button' })).not.toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'Confirm' })).not.toBeInTheDocument();
   });
 });
diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
index 432deafa452..361d0bb8385 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
@@ -105,7 +105,7 @@ export const ConfirmModal = ({
           onClick={onConfirm}
           disabled={disabled}
           ref={buttonRef}
-          aria-label={selectors.pages.ConfirmModal.delete}
+          data-testid={selectors.pages.ConfirmModal.delete}
         >
           {confirmText}
         </Button>
diff --git a/packages/grafana-ui/src/components/Modal/Modal.tsx b/packages/grafana-ui/src/components/Modal/Modal.tsx
index 14000353ec2..599dedb87a7 100644
--- a/packages/grafana-ui/src/components/Modal/Modal.tsx
+++ b/packages/grafana-ui/src/components/Modal/Modal.tsx
@@ -84,7 +84,7 @@ export function Modal(props: PropsWithChildren<Props>) {
               typeof title !== 'string' && title
             }
             <div className={styles.modalHeaderClose}>
-              <IconButton aria-label="Close dialogue" name="times" size="xl" onClick={onDismiss} />
+              <IconButton aria-label="Close dialog" name="times" size="xl" onClick={onDismiss} />
             </div>
           </div>
           <div className={cx(styles.modalContent, contentClassName)}>{children}</div>
diff --git a/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx b/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
index 5b6df00d2f9..1d4a4abff06 100644
--- a/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
+++ b/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
@@ -75,7 +75,7 @@ const dataSources = {
 };
 
 const ui = {
-  confirmButton: byRole('button', { name: /Confirm Modal Danger Button/ }),
+  confirmButton: byRole('button', { name: /Yes, reset configuration/ }),
   resetButton: byRole('button', { name: /Reset configuration/ }),
   saveButton: byRole('button', { name: /Save/ }),
   configInput: byLabelText<HTMLTextAreaElement>(/Configuration/),
diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index 976df59e66b..34c13125aa3 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -12,7 +12,7 @@ import { buildNavModel } from '../folders/state/navModel';
 import { parseRouteParams } from '../search/utils';
 
 import { skipToken, useGetFolderQuery } from './api/browseDashboardsAPI';
-import { BrowseActions } from './components/BrowseActions';
+import { BrowseActions } from './components/BrowseActions/BrowseActions';
 import { BrowseFilters } from './components/BrowseFilters';
 import { BrowseView } from './components/BrowseView';
 import { SearchView } from './components/SearchView';
diff --git a/public/app/features/browse-dashboards/components/BrowseActions.tsx b/public/app/features/browse-dashboards/components/BrowseActions.tsx
deleted file mode 100644
index 602707cf35e..00000000000
--- a/public/app/features/browse-dashboards/components/BrowseActions.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { Button, useStyles2 } from '@grafana/ui';
-
-export interface Props {}
-
-export function BrowseActions() {
-  const styles = useStyles2(getStyles);
-
-  const onMove = () => {
-    // TODO real implemenation, stub for now
-    console.log('onMoveClicked');
-  };
-
-  const onDelete = () => {
-    // TODO real implementation, stub for now
-    console.log('onDeleteClicked');
-  };
-
-  return (
-    <div className={styles.row} data-testid="manage-actions">
-      <Button onClick={onMove} variant="secondary">
-        Move
-      </Button>
-      <Button onClick={onDelete} variant="destructive">
-        Delete
-      </Button>
-    </div>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  row: css({
-    display: 'flex',
-    flexDirection: 'row',
-    gap: theme.spacing(1),
-    marginBottom: theme.spacing(2),
-  }),
-});
diff --git a/public/app/features/browse-dashboards/components/BrowseActions.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.test.tsx
similarity index 59%
rename from public/app/features/browse-dashboards/components/BrowseActions.test.tsx
rename to public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.test.tsx
index ee56379c92b..376600e007d 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.test.tsx
@@ -1,8 +1,13 @@
-import { render, screen } from '@testing-library/react';
+import { render as rtlRender, screen } from '@testing-library/react';
 import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
 
 import { BrowseActions } from './BrowseActions';
 
+function render(...[ui, options]: Parameters<typeof rtlRender>) {
+  rtlRender(<TestProvider>{ui}</TestProvider>, options);
+}
+
 describe('browse-dashboards BrowseActions', () => {
   it('displays Move and Delete buttons', () => {
     render(<BrowseActions />);
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
new file mode 100644
index 00000000000..9d5aca6f4d4
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
@@ -0,0 +1,67 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, useStyles2 } from '@grafana/ui';
+import appEvents from 'app/core/app_events';
+import { ShowModalReactEvent } from 'app/types/events';
+
+import { useSelectedItemsState } from '../../state';
+
+import { DeleteModal } from './DeleteModal';
+import { MoveModal } from './MoveModal';
+
+export interface Props {}
+
+export function BrowseActions() {
+  const styles = useStyles2(getStyles);
+  const selectedItems = useSelectedItemsState();
+
+  const onMove = () => {
+    appEvents.publish(
+      new ShowModalReactEvent({
+        component: MoveModal,
+        props: {
+          selectedItems,
+          onConfirm: (moveTarget: string) => {
+            console.log(`MoveModal onConfirm clicked with target ${moveTarget}!`);
+          },
+        },
+      })
+    );
+  };
+
+  const onDelete = () => {
+    appEvents.publish(
+      new ShowModalReactEvent({
+        component: DeleteModal,
+        props: {
+          selectedItems,
+          onConfirm: () => {
+            console.log('DeleteModal onConfirm clicked!');
+          },
+        },
+      })
+    );
+  };
+
+  return (
+    <div className={styles.row} data-testid="manage-actions">
+      <Button onClick={onMove} variant="secondary">
+        Move
+      </Button>
+      <Button onClick={onDelete} variant="destructive">
+        Delete
+      </Button>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  row: css({
+    display: 'flex',
+    flexDirection: 'row',
+    gap: theme.spacing(1),
+    marginBottom: theme.spacing(2),
+  }),
+});
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
new file mode 100644
index 00000000000..95d1f53993f
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
@@ -0,0 +1,72 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { DeleteModal, Props } from './DeleteModal';
+
+describe('browse-dashboards DeleteModal', () => {
+  const mockOnDismiss = jest.fn();
+  const mockOnConfirm = jest.fn();
+
+  const defaultProps: Props = {
+    isOpen: true,
+    onConfirm: mockOnConfirm,
+    onDismiss: mockOnDismiss,
+    selectedItems: {
+      folder: {},
+      dashboard: {},
+      panel: {},
+    },
+  };
+
+  it('renders a dialog with the correct title', async () => {
+    render(<DeleteModal {...defaultProps} />);
+
+    expect(await screen.findByRole('dialog', { name: 'Delete Compute Resources' })).toBeInTheDocument();
+  });
+
+  it('displays a `Delete` button', async () => {
+    render(<DeleteModal {...defaultProps} />);
+
+    expect(await screen.findByRole('button', { name: 'Delete' })).toBeInTheDocument();
+  });
+
+  it('displays a `Cancel` button', async () => {
+    render(<DeleteModal {...defaultProps} />);
+
+    expect(await screen.findByRole('button', { name: 'Cancel' })).toBeInTheDocument();
+  });
+
+  it('only enables the `Delete` button if the confirmation text is typed', async () => {
+    render(<DeleteModal {...defaultProps} />);
+
+    const confirmationInput = await screen.findByPlaceholderText('Type Delete to confirm');
+    await userEvent.type(confirmationInput, 'Delete');
+
+    expect(await screen.findByRole('button', { name: 'Delete' })).toBeEnabled();
+  });
+
+  it('calls onConfirm when clicking the `Delete` button', async () => {
+    render(<DeleteModal {...defaultProps} />);
+
+    const confirmationInput = await screen.findByPlaceholderText('Type Delete to confirm');
+    await userEvent.type(confirmationInput, 'Delete');
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Delete' }));
+    expect(mockOnConfirm).toHaveBeenCalled();
+  });
+
+  it('calls onDismiss when clicking the `Cancel` button', async () => {
+    render(<DeleteModal {...defaultProps} />);
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Cancel' }));
+    expect(mockOnDismiss).toHaveBeenCalled();
+  });
+
+  it('calls onDismiss when clicking the X', async () => {
+    render(<DeleteModal {...defaultProps} />);
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Close dialog' }));
+    expect(mockOnDismiss).toHaveBeenCalled();
+  });
+});
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
new file mode 100644
index 00000000000..6bba8ea1839
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
@@ -0,0 +1,62 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2, isTruthy } from '@grafana/data';
+import { ConfirmModal, useStyles2 } from '@grafana/ui';
+
+import { DashboardTreeSelection } from '../../types';
+
+import { buildBreakdownString } from './utils';
+
+export interface Props {
+  isOpen: boolean;
+  onConfirm: () => void;
+  onDismiss: () => void;
+  selectedItems: DashboardTreeSelection;
+}
+
+export const DeleteModal = ({ onConfirm, onDismiss, selectedItems, ...props }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  // TODO abstract all this counting logic out
+  const folderCount = Object.values(selectedItems.folder).filter(isTruthy).length;
+  const dashboardCount = Object.values(selectedItems.dashboard).filter(isTruthy).length;
+  // hardcoded values for now
+  // TODO replace with dummy API
+  const libraryPanelCount = 1;
+  const alertRuleCount = 1;
+
+  const onDelete = () => {
+    onConfirm();
+    onDismiss();
+  };
+
+  return (
+    <ConfirmModal
+      body={
+        <div className={styles.modalBody}>
+          This action will delete the following content:
+          <p className={styles.breakdown}>
+            {buildBreakdownString(folderCount, dashboardCount, libraryPanelCount, alertRuleCount)}
+          </p>
+        </div>
+      }
+      confirmationText="Delete"
+      confirmText="Delete"
+      onDismiss={onDismiss}
+      onConfirm={onDelete}
+      title="Delete Compute Resources"
+      {...props}
+    />
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  breakdown: css({
+    ...theme.typography.bodySmall,
+    color: theme.colors.text.secondary,
+  }),
+  modalBody: css({
+    ...theme.typography.body,
+  }),
+});
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
new file mode 100644
index 00000000000..21f37c6aad9
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
@@ -0,0 +1,101 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
+
+import * as api from 'app/features/manage-dashboards/state/actions';
+import { DashboardSearchHit } from 'app/features/search/types';
+
+import { MoveModal, Props } from './MoveModal';
+
+describe('browse-dashboards MoveModal', () => {
+  const mockOnDismiss = jest.fn();
+  const mockOnConfirm = jest.fn();
+  const mockFolders = [
+    { title: 'General', uid: '' } as DashboardSearchHit,
+    { title: 'Folder 1', uid: 'wfTJJL5Wz' } as DashboardSearchHit,
+  ];
+  let props: Props;
+
+  beforeEach(() => {
+    props = {
+      isOpen: true,
+      onConfirm: mockOnConfirm,
+      onDismiss: mockOnDismiss,
+      selectedItems: {
+        folder: {},
+        dashboard: {},
+        panel: {},
+      },
+    };
+
+    // mock the searchFolders api call so the folder picker has some folders in it
+    jest.spyOn(api, 'searchFolders').mockResolvedValue(mockFolders);
+  });
+
+  it('renders a dialog with the correct title', async () => {
+    render(<MoveModal {...props} />);
+
+    expect(await screen.findByRole('dialog', { name: 'Move' })).toBeInTheDocument();
+  });
+
+  it('displays a `Move` button', async () => {
+    render(<MoveModal {...props} />);
+
+    expect(await screen.findByRole('button', { name: 'Move' })).toBeInTheDocument();
+  });
+
+  it('displays a `Cancel` button', async () => {
+    render(<MoveModal {...props} />);
+
+    expect(await screen.findByRole('button', { name: 'Cancel' })).toBeInTheDocument();
+  });
+
+  it('displays a folder picker', async () => {
+    render(<MoveModal {...props} />);
+
+    expect(await screen.findByRole('combobox', { name: 'Select a folder' })).toBeInTheDocument();
+  });
+
+  it('displays a warning about permissions if a folder is selected', async () => {
+    props.selectedItems.folder = {
+      myFolderUid: true,
+    };
+    render(<MoveModal {...props} />);
+
+    expect(await screen.findByText('Moving this item may change its permissions.')).toBeInTheDocument();
+  });
+
+  it('only enables the `Move` button if a folder is selected', async () => {
+    render(<MoveModal {...props} />);
+
+    expect(await screen.findByRole('button', { name: 'Move' })).toBeDisabled();
+    const folderPicker = await screen.findByRole('combobox', { name: 'Select a folder' });
+
+    await selectOptionInTest(folderPicker, mockFolders[1].title);
+    expect(await screen.findByRole('button', { name: 'Move' })).toBeEnabled();
+  });
+
+  it('calls onConfirm when clicking the `Move` button', async () => {
+    render(<MoveModal {...props} />);
+    const folderPicker = await screen.findByRole('combobox', { name: 'Select a folder' });
+
+    await selectOptionInTest(folderPicker, mockFolders[1].title);
+    await userEvent.click(await screen.findByRole('button', { name: 'Move' }));
+    expect(mockOnConfirm).toHaveBeenCalledWith(mockFolders[1].uid);
+  });
+
+  it('calls onDismiss when clicking the `Cancel` button', async () => {
+    render(<MoveModal {...props} />);
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Cancel' }));
+    expect(mockOnDismiss).toHaveBeenCalled();
+  });
+
+  it('calls onDismiss when clicking the X', async () => {
+    render(<MoveModal {...props} />);
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Close dialog' }));
+    expect(mockOnDismiss).toHaveBeenCalled();
+  });
+});
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
new file mode 100644
index 00000000000..8c8ac827dd2
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
@@ -0,0 +1,65 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+
+import { GrafanaTheme2, isTruthy } from '@grafana/data';
+import { Alert, Button, Field, Modal, useStyles2 } from '@grafana/ui';
+import { FolderPicker } from 'app/core/components/Select/FolderPicker';
+
+import { DashboardTreeSelection } from '../../types';
+
+import { buildBreakdownString } from './utils';
+
+export interface Props {
+  isOpen: boolean;
+  onConfirm: (targetFolderUid: string) => void;
+  onDismiss: () => void;
+  selectedItems: DashboardTreeSelection;
+}
+
+export const MoveModal = ({ onConfirm, onDismiss, selectedItems, ...props }: Props) => {
+  const [moveTarget, setMoveTarget] = useState<string>();
+  const styles = useStyles2(getStyles);
+
+  // TODO abstract all this counting logic out
+  const folderCount = Object.values(selectedItems.folder).filter(isTruthy).length;
+  const dashboardCount = Object.values(selectedItems.dashboard).filter(isTruthy).length;
+  // hardcoded values for now
+  // TODO replace with dummy API
+  const libraryPanelCount = 1;
+  const alertRuleCount = 1;
+
+  const onMove = () => {
+    if (moveTarget !== undefined) {
+      onConfirm(moveTarget);
+    }
+    onDismiss();
+  };
+
+  return (
+    <Modal title="Move" onDismiss={onDismiss} {...props}>
+      {folderCount > 0 && <Alert severity="warning" title="Moving this item may change its permissions." />}
+      This action will move the following content:
+      <p className={styles.breakdown}>
+        {buildBreakdownString(folderCount, dashboardCount, libraryPanelCount, alertRuleCount)}
+      </p>
+      <Field label="Folder name">
+        <FolderPicker allowEmpty onChange={({ uid }) => setMoveTarget(uid)} />
+      </Field>
+      <Modal.ButtonRow>
+        <Button onClick={onDismiss} variant="secondary">
+          Cancel
+        </Button>
+        <Button disabled={moveTarget === undefined} onClick={onMove} variant="primary">
+          Move
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  breakdown: css({
+    ...theme.typography.bodySmall,
+    color: theme.colors.text.secondary,
+  }),
+});
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/utils.test.ts b/public/app/features/browse-dashboards/components/BrowseActions/utils.test.ts
new file mode 100644
index 00000000000..eb3fc3c911b
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions/utils.test.ts
@@ -0,0 +1,23 @@
+import { buildBreakdownString } from './utils';
+
+describe('browse-dashboards utils', () => {
+  describe('buildBreakdownString', () => {
+    it.each`
+      folderCount | dashboardCount | libraryPanelCount | alertRuleCount | expected
+      ${0}        | ${0}           | ${0}              | ${0}           | ${'0 items'}
+      ${1}        | ${0}           | ${0}              | ${0}           | ${'1 item: 1 folder'}
+      ${2}        | ${0}           | ${0}              | ${0}           | ${'2 items: 2 folders'}
+      ${0}        | ${1}           | ${0}              | ${0}           | ${'1 item: 1 dashboard'}
+      ${0}        | ${2}           | ${0}              | ${0}           | ${'2 items: 2 dashboards'}
+      ${1}        | ${0}           | ${1}              | ${1}           | ${'3 items: 1 folder, 1 library panel, 1 alert rule'}
+      ${2}        | ${0}           | ${3}              | ${4}           | ${'9 items: 2 folders, 3 library panels, 4 alert rules'}
+      ${1}        | ${1}           | ${1}              | ${1}           | ${'4 items: 1 folder, 1 dashboard, 1 library panel, 1 alert rule'}
+      ${1}        | ${2}           | ${3}              | ${4}           | ${'10 items: 1 folder, 2 dashboards, 3 library panels, 4 alert rules'}
+    `(
+      'returns the correct message for the various inputs',
+      ({ folderCount, dashboardCount, libraryPanelCount, alertRuleCount, expected }) => {
+        expect(buildBreakdownString(folderCount, dashboardCount, libraryPanelCount, alertRuleCount)).toEqual(expected);
+      }
+    );
+  });
+});
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/utils.ts b/public/app/features/browse-dashboards/components/BrowseActions/utils.ts
new file mode 100644
index 00000000000..829c16ae1f2
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions/utils.ts
@@ -0,0 +1,26 @@
+export function buildBreakdownString(
+  folderCount: number,
+  dashboardCount: number,
+  libraryPanelCount: number,
+  alertRuleCount: number
+) {
+  const total = folderCount + dashboardCount + libraryPanelCount + alertRuleCount;
+  const parts = [];
+  if (folderCount) {
+    parts.push(`${folderCount} ${folderCount === 1 ? 'folder' : 'folders'}`);
+  }
+  if (dashboardCount) {
+    parts.push(`${dashboardCount} ${dashboardCount === 1 ? 'dashboard' : 'dashboards'}`);
+  }
+  if (libraryPanelCount) {
+    parts.push(`${libraryPanelCount} ${libraryPanelCount === 1 ? 'library panel' : 'library panels'}`);
+  }
+  if (alertRuleCount) {
+    parts.push(`${alertRuleCount} ${alertRuleCount === 1 ? 'alert rule' : 'alert rules'}`);
+  }
+  let breakdownString = `${total} ${total === 1 ? 'item' : 'items'}`;
+  if (parts.length > 0) {
+    breakdownString += `: ${parts.join(', ')}`;
+  }
+  return breakdownString;
+}
diff --git a/public/app/features/folders/FolderSettingsPage.test.tsx b/public/app/features/folders/FolderSettingsPage.test.tsx
index 21c1dbd3f2d..18b0e40ead8 100644
--- a/public/app/features/folders/FolderSettingsPage.test.tsx
+++ b/public/app/features/folders/FolderSettingsPage.test.tsx
@@ -184,7 +184,7 @@ describe('FolderSettingsPage', () => {
     await userEvent.click(deleteButton);
     const deleteModal = screen.getByRole('dialog', { name: 'Delete' });
     expect(deleteModal).toBeInTheDocument();
-    const deleteButtonModal = within(deleteModal).getByRole('button', { name: 'Confirm Modal Danger Button' });
+    const deleteButtonModal = within(deleteModal).getByRole('button', { name: 'Delete' });
     await userEvent.click(deleteButtonModal);
     expect(mockDeleteFolder).toHaveBeenCalledWith(mockFolder.uid);
   });
diff --git a/public/app/features/search/page/components/ConfirmDeleteModal.test.tsx b/public/app/features/search/page/components/ConfirmDeleteModal.test.tsx
index ac48422fb8e..46ba8c50910 100644
--- a/public/app/features/search/page/components/ConfirmDeleteModal.test.tsx
+++ b/public/app/features/search/page/components/ConfirmDeleteModal.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, within } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { config } from 'app/core/config';
@@ -14,8 +14,7 @@ describe('ConfirmModal', () => {
     expect(screen.getByRole('heading', { name: 'Delete' })).toBeInTheDocument();
     expect(screen.getByText('Do you want to delete the 2 selected dashboards?')).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
-    const button = screen.getByRole('button', { name: 'Confirm Modal Danger Button' });
-    expect(within(button).getByText('Delete')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Delete' })).toBeInTheDocument();
 
     expect(screen.queryByPlaceholderText('Type delete to confirm')).not.toBeInTheDocument();
   });
diff --git a/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx b/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
index ee941a3d043..8ccb8387f81 100644
--- a/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
@@ -135,7 +135,7 @@ describe('ServiceAccountsListPage tests', () => {
 
     const user = userEvent.setup();
     await user.click(screen.getByRole('button', { name: /Disable/ }));
-    await user.click(screen.getByLabelText(/Confirm Modal Danger Button/));
+    await user.click(screen.getByRole('button', { name: 'Disable service account' }));
 
     expect(updateServiceAccountMock).toHaveBeenCalledWith({
       ...getDefaultServiceAccount(),
@@ -152,7 +152,7 @@ describe('ServiceAccountsListPage tests', () => {
 
     const user = userEvent.setup();
     await user.click(screen.getByLabelText(/Delete service account/));
-    await user.click(screen.getByLabelText(/Confirm Modal Danger Button/));
+    await user.click(screen.getByRole('button', { name: 'Delete' }));
 
     expect(deleteServiceAccountMock).toHaveBeenCalledWith(42);
   });
diff --git a/public/app/plugins/datasource/cloudwatch/components/LogGroups/SelectedLogGroups.test.tsx b/public/app/plugins/datasource/cloudwatch/components/LogGroups/SelectedLogGroups.test.tsx
index 43b9830fb76..01dcae351f9 100644
--- a/public/app/plugins/datasource/cloudwatch/components/LogGroups/SelectedLogGroups.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/LogGroups/SelectedLogGroups.test.tsx
@@ -68,7 +68,7 @@ describe('SelectedLogsGroups', () => {
       await waitFor(() =>
         expect(screen.getByText('Are you sure you want to clear all log groups?')).toBeInTheDocument()
       );
-      await waitFor(() => userEvent.click(screen.getByLabelText('Confirm Modal Danger Button')));
+      await waitFor(() => userEvent.click(screen.getByRole('button', { name: 'Yes' })));
       expect(defaultProps.onChange).toHaveBeenCalledWith([]);
     });
   });

From 2a67b8ad32a49d13b94af173fcceba9efbdbfa3b Mon Sep 17 00:00:00 2001
From: Alexa V <239999+axelavargas@users.noreply.github.com>
Date: Tue, 25 Apr 2023 18:16:46 +0200
Subject: [PATCH 400/729] Panel Header Fix: Implement new Panel Header on
 Angular Panels (#66826)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
---
 .../dashboard/dashgrid/PanelChromeAngular.tsx |  86 +++++++++----
 .../dashboard/dashgrid/PanelStateWrapper.tsx  |  94 ++------------
 .../dashboard/utils/getPanelChromeProps.tsx   | 120 ++++++++++++++++++
 3 files changed, 193 insertions(+), 107 deletions(-)
 create mode 100644 public/app/features/dashboard/utils/getPanelChromeProps.tsx

diff --git a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
index fd1ceed7030..47d9f581ef9 100644
--- a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
@@ -6,6 +6,7 @@ import { Subscription } from 'rxjs';
 import { getDefaultTimeRange, LoadingState, PanelData, PanelPlugin } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { AngularComponent, getAngularLoader, locationService } from '@grafana/runtime';
+import { PanelChrome } from '@grafana/ui';
 import config from 'app/core/config';
 import { PANEL_BORDER } from 'app/core/constants';
 import { setPanelAngularComponent } from 'app/features/panel/state/reducers';
@@ -15,8 +16,10 @@ import { StoreState } from 'app/types';
 import { isSoloRoute } from '../../../routes/utils';
 import { getTimeSrv, TimeSrv } from '../services/TimeSrv';
 import { DashboardModel, PanelModel } from '../state';
+import { getPanelChromeProps } from '../utils/getPanelChromeProps';
 
 import { PanelHeader } from './PanelHeader/PanelHeader';
+import { PanelHeaderMenuWrapperNew } from './PanelHeader/PanelHeaderMenuWrapper';
 
 interface OwnProps {
   panel: PanelModel;
@@ -27,6 +30,7 @@ interface OwnProps {
   isInView: boolean;
   width: number;
   height: number;
+  hideMenu?: boolean;
 }
 
 interface ConnectedProps {
@@ -58,7 +62,6 @@ export class PanelChromeAngularUnconnected extends PureComponent<Props, State> {
   timeSrv: TimeSrv = getTimeSrv();
   scopeProps?: AngularScopeProps;
   subs = new Subscription();
-
   constructor(props: Props) {
     super(props);
     this.state = {
@@ -179,9 +182,10 @@ export class PanelChromeAngularUnconnected extends PureComponent<Props, State> {
     const { dashboard, panel, isViewing, isEditing, plugin } = this.props;
     const { errorMessage, data } = this.state;
     const { transparent } = panel;
-
     const alertState = data.alertState?.state;
 
+    const panelChromeProps = getPanelChromeProps({ ...this.props, data });
+
     const containerClassNames = classNames({
       'panel-container': true,
       'panel-container--absolute': isSoloRoute(locationService.getLocation().pathname),
@@ -196,29 +200,63 @@ export class PanelChromeAngularUnconnected extends PureComponent<Props, State> {
       'panel-content--no-padding': plugin.noPadding,
     });
 
-    return (
-      <div
-        className={containerClassNames}
-        data-testid={selectors.components.Panels.Panel.title(panel.title)}
-        aria-label={selectors.components.Panels.Panel.containerByTitle(panel.title)}
-      >
-        <PanelHeader
-          panel={panel}
-          dashboard={dashboard}
-          title={panel.title}
-          description={panel.description}
-          links={panel.links}
-          error={errorMessage}
-          isViewing={isViewing}
-          isEditing={isEditing}
-          data={data}
-          alertState={alertState}
-        />
-        <div className={panelContentClassNames}>
-          <div ref={(element) => (this.element = element)} className="panel-height-helper" />
+    if (config.featureToggles.newPanelChromeUI) {
+      // Shift the hover menu down if it's on the top row so it doesn't get clipped by topnav
+      const hoverHeaderOffset = (panel.gridPos?.y ?? 0) === 0 ? -16 : undefined;
+
+      const menu = (
+        <div data-testid="panel-dropdown">
+          <PanelHeaderMenuWrapperNew panel={panel} dashboard={dashboard} loadingState={data.state} />
         </div>
-      </div>
-    );
+      );
+
+      return (
+        <PanelChrome
+          width={this.props.width}
+          height={this.props.height}
+          title={panelChromeProps.title}
+          loadingState={data.state}
+          statusMessage={errorMessage}
+          statusMessageOnClick={panelChromeProps.onOpenErrorInspect}
+          description={panelChromeProps.description}
+          titleItems={panelChromeProps.titleItems}
+          menu={this.props.hideMenu ? undefined : menu}
+          dragClass={panelChromeProps.dragClass}
+          dragClassCancel="grid-drag-cancel"
+          padding={panelChromeProps.padding}
+          hoverHeaderOffset={hoverHeaderOffset}
+          hoverHeader={panelChromeProps.hasOverlayHeader()}
+          displayMode={transparent ? 'transparent' : 'default'}
+          onCancelQuery={panelChromeProps.onCancelQuery}
+        >
+          {() => <div ref={(element) => (this.element = element)} className="panel-height-helper" />}
+        </PanelChrome>
+      );
+    } else {
+      return (
+        <div
+          className={containerClassNames}
+          data-testid={selectors.components.Panels.Panel.title(panel.title)}
+          aria-label={selectors.components.Panels.Panel.containerByTitle(panel.title)}
+        >
+          <PanelHeader
+            panel={panel}
+            dashboard={dashboard}
+            title={panel.title}
+            description={panel.description}
+            links={panel.links}
+            error={errorMessage}
+            isViewing={isViewing}
+            isEditing={isEditing}
+            data={data}
+            alertState={alertState}
+          />
+          <div className={panelContentClassNames}>
+            <div ref={(element) => (this.element = element)} className="panel-height-helper" />
+          </div>
+        </div>
+      );
+    }
   }
 }
 
diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
index 9d5f2f13b2d..a05518aacde 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
@@ -13,34 +13,29 @@ import {
   FieldConfigSource,
   getDataSourceRef,
   getDefaultTimeRange,
-  LinkModel,
   LoadingState,
   PanelData,
   PanelPlugin,
   PanelPluginMeta,
   PluginContextProvider,
-  renderMarkdown,
   TimeRange,
   toDataFrameDTO,
   toUtc,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { getTemplateSrv, config, locationService, RefreshEvent, reportInteraction } from '@grafana/runtime';
+import { config, locationService, RefreshEvent } from '@grafana/runtime';
 import { VizLegendOptions } from '@grafana/schema';
 import {
   ErrorBoundary,
   PanelChrome,
   PanelContext,
   PanelContextProvider,
-  PanelPadding,
   SeriesVisibilityChangeMode,
   AdHocFilterItem,
 } from '@grafana/ui';
 import { PANEL_BORDER } from 'app/core/constants';
 import { profiler } from 'app/core/profiler';
 import { applyPanelTimeOverrides } from 'app/features/dashboard/utils/panel';
-import { InspectTab } from 'app/features/inspector/types';
-import { getPanelLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { applyFilterFromTable } from 'app/features/variables/adhoc/actions';
 import { onUpdatePanelSnapshotData } from 'app/plugins/datasource/grafana/utils';
@@ -53,11 +48,11 @@ import { deleteAnnotation, saveAnnotation, updateAnnotation } from '../../annota
 import { getDashboardQueryRunner } from '../../query/state/DashboardQueryRunner/DashboardQueryRunner';
 import { getTimeSrv, TimeSrv } from '../services/TimeSrv';
 import { DashboardModel, PanelModel } from '../state';
+import { getPanelChromeProps } from '../utils/getPanelChromeProps';
 import { loadSnapshotData } from '../utils/loadSnapshotData';
 
 import { PanelHeader } from './PanelHeader/PanelHeader';
 import { PanelHeaderMenuWrapperNew } from './PanelHeader/PanelHeaderMenuWrapper';
-import { PanelHeaderTitleItems } from './PanelHeader/PanelHeaderTitleItems';
 import { seriesVisibilityConfigFactory } from './SeriesVisibilityConfigFactory';
 import { liveTimer } from './liveTimer';
 
@@ -91,7 +86,6 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
   private readonly timeSrv: TimeSrv = getTimeSrv();
   private subs = new Subscription();
   private eventFilter: EventFilterOptions = { onlyLocal: true };
-  private descriptionInteractionReported = false;
 
   constructor(props: Props) {
     super(props);
@@ -605,53 +599,6 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
     return !panel.hasTitle();
   }
 
-  onShowPanelDescription = () => {
-    const { panel } = this.props;
-    const descriptionMarkdown = getTemplateSrv().replace(panel.description, panel.scopedVars);
-    const interpolatedDescription = renderMarkdown(descriptionMarkdown);
-
-    if (!this.descriptionInteractionReported) {
-      // Description rendering function can be called multiple times due to re-renders but we want to report the interaction once.
-      reportInteraction('dashboards_panelheader_description_displayed');
-      this.descriptionInteractionReported = true;
-    }
-
-    return interpolatedDescription;
-  };
-
-  onShowPanelLinks = (): LinkModel[] => {
-    const { panel } = this.props;
-    const linkSupplier = getPanelLinksSupplier(panel);
-    if (linkSupplier) {
-      const panelLinks = linkSupplier && linkSupplier.getLinks(panel.replaceVariables);
-
-      return panelLinks.map((panelLink) => ({
-        ...panelLink,
-        onClick: (...args) => {
-          reportInteraction('dashboards_panelheader_datalink_clicked', { has_multiple_links: panelLinks.length > 1 });
-          panelLink.onClick?.(...args);
-        },
-      }));
-    }
-    return [];
-  };
-
-  onOpenInspector = (e: React.SyntheticEvent, tab: string) => {
-    e.stopPropagation();
-    locationService.partial({ inspect: this.props.panel.id, inspectTab: tab });
-  };
-
-  onOpenErrorInspect = (e: React.SyntheticEvent) => {
-    e.stopPropagation();
-    locationService.partial({ inspect: this.props.panel.id, inspectTab: InspectTab.Error });
-    reportInteraction('dashboards_panelheader_statusmessage_clicked');
-  };
-
-  onCancelQuery = () => {
-    this.props.panel.getQueryRunner().cancelQuery();
-    reportInteraction('dashboards_panelheader_cancelquery_clicked', { data_state: this.state.data.state });
-  };
-
   render() {
     const { dashboard, panel, isViewing, isEditing, width, height, plugin } = this.props;
     const { errorMessage, data } = this.state;
@@ -668,27 +615,8 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
       [`panel-alert-state--${alertState}`]: alertState !== undefined,
     });
 
-    const title = panel.getDisplayTitle();
-    const padding: PanelPadding = plugin.noPadding ? 'none' : 'md';
+    const panelChromeProps = getPanelChromeProps({ ...this.props, data });
 
-    const showTitleItems =
-      (panel.links && panel.links.length > 0 && this.onShowPanelLinks) ||
-      (data.series.length > 0 && data.series.some((v) => (v.meta?.notices?.length ?? 0) > 0)) ||
-      (data.request && data.request.timeInfo) ||
-      alertState;
-
-    const titleItems = showTitleItems && (
-      <PanelHeaderTitleItems
-        key="title-items"
-        alertState={alertState}
-        data={data}
-        panelId={panel.id}
-        panelLinks={panel.links}
-        onShowPanelLinks={this.onShowPanelLinks}
-      />
-    );
-
-    const dragClass = !(isViewing || isEditing) ? 'grid-drag-handle' : '';
     if (config.featureToggles.newPanelChromeUI) {
       // Shift the hover menu down if it's on the top row so it doesn't get clipped by topnav
       const hoverHeaderOffset = (panel.gridPos?.y ?? 0) === 0 ? -16 : undefined;
@@ -703,20 +631,20 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
         <PanelChrome
           width={width}
           height={height}
-          title={title}
+          title={panelChromeProps.title}
           loadingState={data.state}
           statusMessage={errorMessage}
-          statusMessageOnClick={this.onOpenErrorInspect}
-          description={!!panel.description ? this.onShowPanelDescription : undefined}
-          titleItems={titleItems}
+          statusMessageOnClick={panelChromeProps.onOpenErrorInspect}
+          description={panelChromeProps.description}
+          titleItems={panelChromeProps.titleItems}
           menu={this.props.hideMenu ? undefined : menu}
-          dragClass={dragClass}
+          dragClass={panelChromeProps.dragClass}
           dragClassCancel="grid-drag-cancel"
-          padding={padding}
+          padding={panelChromeProps.padding}
           hoverHeaderOffset={hoverHeaderOffset}
-          hoverHeader={this.hasOverlayHeader()}
+          hoverHeader={panelChromeProps.hasOverlayHeader()}
           displayMode={transparent ? 'transparent' : 'default'}
-          onCancelQuery={this.onCancelQuery}
+          onCancelQuery={panelChromeProps.onCancelQuery}
         >
           {(innerWidth, innerHeight) => (
             <>
diff --git a/public/app/features/dashboard/utils/getPanelChromeProps.tsx b/public/app/features/dashboard/utils/getPanelChromeProps.tsx
new file mode 100644
index 00000000000..fb4a68d5c99
--- /dev/null
+++ b/public/app/features/dashboard/utils/getPanelChromeProps.tsx
@@ -0,0 +1,120 @@
+import React from 'react';
+
+import { LinkModel, PanelData, PanelPlugin, renderMarkdown } from '@grafana/data';
+import { getTemplateSrv, locationService, reportInteraction } from '@grafana/runtime';
+import { PanelPadding } from '@grafana/ui';
+import { InspectTab } from 'app/features/inspector/types';
+import { getPanelLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers';
+
+import { PanelHeaderTitleItems } from '../dashgrid/PanelHeader/PanelHeaderTitleItems';
+import { DashboardModel, PanelModel } from '../state';
+
+interface CommonProps {
+  panel: PanelModel;
+  data: PanelData;
+  dashboard: DashboardModel;
+  plugin: PanelPlugin;
+  isViewing: boolean;
+  isEditing: boolean;
+  isInView: boolean;
+  width: number;
+  height: number;
+  hideMenu?: boolean;
+}
+
+export function getPanelChromeProps(props: CommonProps) {
+  let descriptionInteractionReported = false;
+
+  function hasOverlayHeader() {
+    // always show normal header if we have time override
+    if (props.data.request && props.data.request.timeInfo) {
+      return false;
+    }
+
+    return !props.panel.hasTitle();
+  }
+
+  const onShowPanelDescription = () => {
+    const descriptionMarkdown = getTemplateSrv().replace(props.panel.description, props.panel.scopedVars);
+    const interpolatedDescription = renderMarkdown(descriptionMarkdown);
+
+    if (!descriptionInteractionReported) {
+      // Description rendering function can be called multiple times due to re-renders but we want to report the interaction once.
+      reportInteraction('dashboards_panelheader_description_displayed');
+      descriptionInteractionReported = true;
+    }
+
+    return interpolatedDescription;
+  };
+
+  const onShowPanelLinks = (): LinkModel[] => {
+    const linkSupplier = getPanelLinksSupplier(props.panel);
+    if (!linkSupplier) {
+      return [];
+    }
+    const panelLinks = linkSupplier && linkSupplier.getLinks(props.panel.replaceVariables);
+
+    return panelLinks.map((panelLink) => ({
+      ...panelLink,
+      onClick: (...args) => {
+        reportInteraction('dashboards_panelheader_datalink_clicked', { has_multiple_links: panelLinks.length > 1 });
+        panelLink.onClick?.(...args);
+      },
+    }));
+  };
+
+  const onOpenInspector = (e: React.SyntheticEvent, tab: string) => {
+    e.stopPropagation();
+    locationService.partial({ inspect: props.panel.id, inspectTab: tab });
+  };
+
+  const onOpenErrorInspect = (e: React.SyntheticEvent) => {
+    e.stopPropagation();
+    locationService.partial({ inspect: props.panel.id, inspectTab: InspectTab.Error });
+    reportInteraction('dashboards_panelheader_statusmessage_clicked');
+  };
+
+  const onCancelQuery = () => {
+    props.panel.getQueryRunner().cancelQuery();
+    reportInteraction('dashboards_panelheader_cancelquery_clicked', { data_state: props.data.state });
+  };
+
+  const padding: PanelPadding = props.plugin.noPadding ? 'none' : 'md';
+  const alertState = props.data.alertState?.state;
+
+  const showTitleItems =
+    (props.panel.links && props.panel.links.length > 0 && onShowPanelLinks) ||
+    (props.data.series.length > 0 && props.data.series.some((v) => (v.meta?.notices?.length ?? 0) > 0)) ||
+    (props.data.request && props.data.request.timeInfo) ||
+    alertState;
+
+  const titleItems = showTitleItems && (
+    <PanelHeaderTitleItems
+      alertState={alertState}
+      data={props.data}
+      panelId={props.panel.id}
+      panelLinks={props.panel.links}
+      onShowPanelLinks={onShowPanelLinks}
+    />
+  );
+
+  const description = props.panel.description ? onShowPanelDescription() : undefined;
+
+  const dragClass = !(props.isViewing || props.isEditing) ? 'grid-drag-handle' : '';
+
+  const title = props.panel.getDisplayTitle();
+
+  return {
+    hasOverlayHeader,
+    onShowPanelDescription,
+    onShowPanelLinks,
+    onOpenInspector,
+    onOpenErrorInspect,
+    onCancelQuery,
+    padding,
+    description,
+    dragClass,
+    title,
+    titleItems,
+  };
+}

From 1421f388aeda7e7c0d733184d9ec51e346843569 Mon Sep 17 00:00:00 2001
From: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
Date: Tue, 25 Apr 2023 13:05:37 -0400
Subject: [PATCH 401/729] Caching: Fix concurrent HTTP Header read/write in
 caching middleware (#67231)

read the response header synchronously, defer the metric only
---
 .../clientmiddleware/caching_middleware.go    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
index e9e0b50bc0b..194b92832db 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
@@ -56,16 +56,16 @@ func (m *CachingMiddleware) QueryData(ctx context.Context, req *backend.QueryDat
 	// First look in the query cache if enabled
 	hit, cr := m.caching.HandleQueryRequest(ctx, req)
 
-	defer func() {
-		// record request duration if caching was used
-		if ch := reqCtx.Resp.Header().Get(caching.XCacheHeader); ch != "" {
+	// record request duration if caching was used
+	if ch := reqCtx.Resp.Header().Get(caching.XCacheHeader); ch != "" {
+		defer func() {
 			QueryCachingRequestHistogram.With(prometheus.Labels{
 				"datasource_type": req.PluginContext.DataSourceInstanceSettings.Type,
 				"cache":           ch,
 				"query_type":      getQueryType(reqCtx),
 			}).Observe(time.Since(start).Seconds())
-		}
-	}()
+		}()
+	}
 
 	// Cache hit; return the response
 	if hit {
@@ -102,15 +102,15 @@ func (m *CachingMiddleware) CallResource(ctx context.Context, req *backend.CallR
 	// First look in the resource cache if enabled
 	hit, cr := m.caching.HandleResourceRequest(ctx, req)
 
-	defer func() {
-		// record request duration if caching was used
-		if ch := reqCtx.Resp.Header().Get(caching.XCacheHeader); ch != "" {
+	// record request duration if caching was used
+	if ch := reqCtx.Resp.Header().Get(caching.XCacheHeader); ch != "" {
+		defer func() {
 			ResourceCachingRequestHistogram.With(prometheus.Labels{
 				"plugin_id": req.PluginContext.PluginID,
 				"cache":     ch,
 			}).Observe(time.Since(start).Seconds())
-		}
-	}()
+		}()
+	}
 
 	// Cache hit; send the response and return
 	if hit {

From 12e5101b91497dbc4bfaf30c41427eff2137a061 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Tue, 25 Apr 2023 12:31:45 -0500
Subject: [PATCH 402/729] Canvas: Connection properties based on data (#64360)

Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
---
 .betterer.results                             |  3 +
 public/app/features/canvas/element.ts         |  4 +-
 public/app/features/canvas/runtime/scene.tsx  |  2 +
 .../app/plugins/panel/canvas/CanvasPanel.tsx  | 43 ++++++++-
 .../plugins/panel/canvas/ConnectionSVG.tsx    | 96 ++++++++++++-------
 .../app/plugins/panel/canvas/Connections.tsx  | 50 +++++++++-
 .../panel/canvas/editor/connectionEditor.tsx  | 42 ++++++++
 .../plugins/panel/canvas/editor/options.ts    | 43 ++++++++-
 public/app/plugins/panel/canvas/module.tsx    | 13 +++
 public/app/plugins/panel/canvas/types.ts      |  4 +-
 public/app/plugins/panel/canvas/utils.ts      | 22 ++++-
 11 files changed, 272 insertions(+), 50 deletions(-)
 create mode 100644 public/app/plugins/panel/canvas/editor/connectionEditor.tsx

diff --git a/.betterer.results b/.betterer.results
index 34133989d8f..ae38d94c5e2 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5193,6 +5193,9 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/canvas/editor/TreeNavigationEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
+    "public/app/plugins/panel/canvas/editor/connectionEditor.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
     "public/app/plugins/panel/canvas/editor/elementEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
diff --git a/public/app/features/canvas/element.ts b/public/app/features/canvas/element.ts
index e2634ea9229..13a5358006b 100644
--- a/public/app/features/canvas/element.ts
+++ b/public/app/features/canvas/element.ts
@@ -4,7 +4,7 @@ import { RegistryItem } from '@grafana/data';
 import { PanelOptionsSupplier } from '@grafana/data/src/panel/PanelPlugin';
 import { config } from 'app/core/config';
 
-import { DimensionContext } from '../dimensions/context';
+import { DimensionContext, ColorDimensionConfig, ScaleDimensionConfig } from '../dimensions';
 
 import { BackgroundConfig, Constraint, LineConfig, Placement } from './types';
 
@@ -46,6 +46,8 @@ export interface CanvasConnection {
   target: ConnectionCoordinates;
   targetName?: string;
   path: ConnectionPath;
+  color?: ColorDimensionConfig;
+  size?: ScaleDimensionConfig;
   // See https://github.com/anseki/leader-line#options for more examples of more properties
 }
 
diff --git a/public/app/features/canvas/runtime/scene.tsx b/public/app/features/canvas/runtime/scene.tsx
index 39034cdb554..d6a534cc67a 100644
--- a/public/app/features/canvas/runtime/scene.tsx
+++ b/public/app/features/canvas/runtime/scene.tsx
@@ -144,6 +144,8 @@ export class Scene {
         this.initMoveable(destroySelecto, enableEditing);
         this.currentLayer = this.root;
         this.selection.next([]);
+        this.connections.select(undefined);
+        this.connections.updateState();
       }
     });
     return this.root;
diff --git a/public/app/plugins/panel/canvas/CanvasPanel.tsx b/public/app/plugins/panel/canvas/CanvasPanel.tsx
index 16d86b6c6de..0b80d268ae7 100644
--- a/public/app/plugins/panel/canvas/CanvasPanel.tsx
+++ b/public/app/plugins/panel/canvas/CanvasPanel.tsx
@@ -12,7 +12,7 @@ import { PanelEditEnteredEvent, PanelEditExitedEvent } from 'app/types/events';
 import { InlineEdit } from './InlineEdit';
 import { SetBackground } from './SetBackground';
 import { PanelOptions } from './models.gen';
-import { AnchorPoint, CanvasTooltipPayload } from './types';
+import { AnchorPoint, CanvasTooltipPayload, ConnectionState } from './types';
 
 interface Props extends PanelProps<PanelOptions> {}
 
@@ -27,6 +27,7 @@ interface State {
 export interface InstanceState {
   scene: Scene;
   selected: ElementState[];
+  selectedConnection?: ConnectionState;
 }
 
 export interface SelectionAction {
@@ -113,20 +114,56 @@ export class CanvasPanel extends Component<Props, State> {
       this.subs.add(
         this.scene.selection.subscribe({
           next: (v) => {
+            if (v.length) {
+              activeCanvasPanel = this;
+              activePanelSubject.next({ panel: this });
+            }
+
+            canvasInstances.forEach((canvasInstance) => {
+              if (canvasInstance !== activeCanvasPanel) {
+                canvasInstance.scene.clearCurrentSelection(true);
+                canvasInstance.scene.connections.select(undefined);
+              }
+            });
+
             this.panelContext.onInstanceStateChange!({
               scene: this.scene,
               selected: v,
               layer: this.scene.root,
             });
+          },
+        })
+      );
 
-            activeCanvasPanel = this;
-            activePanelSubject.next({ panel: this });
+      this.subs.add(
+        this.scene.connections.selection.subscribe({
+          next: (v) => {
+            if (!this.context.instanceState) {
+              return;
+            }
+
+            this.panelContext.onInstanceStateChange!({
+              scene: this.scene,
+              selected: this.context.instanceState.selected,
+              selectedConnection: v,
+              layer: this.scene.root,
+            });
+
+            if (v) {
+              activeCanvasPanel = this;
+              activePanelSubject.next({ panel: this });
+            }
 
             canvasInstances.forEach((canvasInstance) => {
               if (canvasInstance !== activeCanvasPanel) {
                 canvasInstance.scene.clearCurrentSelection(true);
+                canvasInstance.scene.connections.select(undefined);
               }
             });
+
+            setTimeout(() => {
+              this.forceUpdate();
+            });
           },
         })
       );
diff --git a/public/app/plugins/panel/canvas/ConnectionSVG.tsx b/public/app/plugins/panel/canvas/ConnectionSVG.tsx
index 63e98a7bc88..e2146895cfd 100644
--- a/public/app/plugins/panel/canvas/ConnectionSVG.tsx
+++ b/public/app/plugins/panel/canvas/ConnectionSVG.tsx
@@ -1,14 +1,12 @@
 import { css } from '@emotion/css';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 import { config } from 'app/core/config';
-import { CanvasConnection } from 'app/features/canvas/element';
-import { ElementState } from 'app/features/canvas/runtime/element';
 import { Scene } from 'app/features/canvas/runtime/scene';
 
-import { getConnections } from './utils';
+import { ConnectionState } from './types';
 
 type Props = {
   setSVGRef: (anchorElement: SVGSVGElement) => void;
@@ -17,16 +15,18 @@ type Props = {
 };
 
 let idCounter = 0;
+const htmlElementTypes = ['input', 'textarea'];
+
 export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
   const styles = useStyles2(getStyles);
 
   const headId = Date.now() + '_' + idCounter++;
-  const CONNECTION_LINE_ID = 'connectionLineId';
-  const CONNECTION_HEAD_ID = useMemo(() => `head-${headId}`, [headId]);
+  const CONNECTION_LINE_ID = useMemo(() => `connectionLineId-${headId}`, [headId]);
   const EDITOR_HEAD_ID = useMemo(() => `editorHead-${headId}`, [headId]);
   const defaultArrowColor = config.theme2.colors.text.primary;
+  const defaultArrowSize = 2;
 
-  const [selectedConnection, setSelectedConnection] = useState<CanvasConnection | undefined>(undefined);
+  const [selectedConnection, setSelectedConnection] = useState<ConnectionState | undefined>(undefined);
 
   // Need to use ref to ensure state is not stale in event handler
   const selectedConnectionRef = useRef(selectedConnection);
@@ -34,24 +34,36 @@ export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
     selectedConnectionRef.current = selectedConnection;
   });
 
-  const [selectedConnectionSource, setSelectedConnectionSource] = useState<ElementState | undefined>(undefined);
-  const selectedConnectionSourceRef = useRef(selectedConnectionSource);
   useEffect(() => {
-    selectedConnectionSourceRef.current = selectedConnectionSource;
-  });
+    if (scene.panel.context.instanceState?.selectedConnection) {
+      setSelectedConnection(scene.panel.context.instanceState?.selectedConnection);
+    }
+  }, [scene.panel.context.instanceState?.selectedConnection]);
 
   const onKeyUp = (e: KeyboardEvent) => {
+    const target = e.target;
+
+    if (!(target instanceof HTMLElement)) {
+      return;
+    }
+
+    if (htmlElementTypes.indexOf(target.nodeName.toLowerCase()) > -1) {
+      return;
+    }
+
     // Backspace (8) or delete (46)
     if (e.keyCode === 8 || e.keyCode === 46) {
-      if (selectedConnectionRef.current && selectedConnectionSourceRef.current) {
-        selectedConnectionSourceRef.current.options.connections =
-          selectedConnectionSourceRef.current.options.connections?.filter(
-            (connection) => connection !== selectedConnectionRef.current
+      if (selectedConnectionRef.current && selectedConnectionRef.current.source) {
+        selectedConnectionRef.current.source.options.connections =
+          selectedConnectionRef.current.source.options.connections?.filter(
+            (connection) => connection !== selectedConnectionRef.current?.info
           );
-        selectedConnectionSourceRef.current.onChange(selectedConnectionSourceRef.current.options);
+        selectedConnectionRef.current.source.onChange(selectedConnectionRef.current.source.options);
 
         setSelectedConnection(undefined);
-        setSelectedConnectionSource(undefined);
+        scene.connections.select(undefined);
+        scene.connections.updateState();
+        scene.save();
       }
     } else {
       // Prevent removing event listener if key is not delete
@@ -71,28 +83,36 @@ export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
 
     if (shouldResetSelectedConnection) {
       setSelectedConnection(undefined);
-      setSelectedConnectionSource(undefined);
+      scene.connections.select(undefined);
     }
   };
 
-  const selectConnection = (connection: CanvasConnection, source: ElementState) => {
+  const selectConnection = (connection: ConnectionState) => {
     if (scene.isEditingEnabled) {
       setSelectedConnection(connection);
-      setSelectedConnectionSource(source);
+      scene.connections.select(connection);
 
       document.addEventListener('keyup', onKeyUp);
       scene.selecto!.rootContainer!.addEventListener('click', clearSelectedConnection);
     }
   };
 
-  // Flat list of all connections
-  const findConnections = useCallback(() => {
-    return getConnections(scene.byName);
-  }, [scene.byName]);
+  // @TODO revisit, currently returning last row index for field
+  const getRowIndex = (fieldName: string | undefined) => {
+    if (fieldName) {
+      const series = scene.context.getPanelData()?.series[0];
+      const field = series?.fields.find((f) => (f.name = fieldName));
+      const data = field?.values;
+
+      return data ? data.length - 1 : 0;
+    }
+
+    return 0;
+  };
 
   // Figure out target and then target's relative coordinates drawing (if no target do parent)
   const renderConnections = () => {
-    return findConnections().map((v, idx) => {
+    return scene.connections.state.map((v, idx) => {
       const { source, target, info } = v;
       const sourceRect = source.div?.getBoundingClientRect();
       const parent = source.div?.parentElement;
@@ -129,13 +149,21 @@ export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
         y2 = parentVerticalCenter - (info.target.y * parentRect.height) / 2;
       }
 
-      const isSelected = selectedConnection === info;
-      const selectedStyles = { stroke: '#44aaff', strokeWidth: 3 };
+      const isSelected = selectedConnection === v && scene.panel.context.instanceState.selectedConnection;
+
+      const strokeColor = info.color ? scene.context.getColor(info.color).value() : defaultArrowColor;
+      const lastRowIndex = getRowIndex(info.size?.field);
+
+      const strokeWidth = info.size ? scene.context.getScale(info.size).get(lastRowIndex) : defaultArrowSize;
+
       const connectionCursorStyle = scene.isEditingEnabled ? 'grab' : '';
+      const selectedStyles = { stroke: '#44aaff', strokeOpacity: 0.6, strokeWidth: strokeWidth + 5 };
+
+      const CONNECTION_HEAD_ID = `connectionHead-${headId + Math.random()}`;
 
       return (
         <svg className={styles.connection} key={idx}>
-          <g onClick={() => selectConnection(info, source)}>
+          <g onClick={() => selectConnection(v)}>
             <defs>
               <marker
                 id={CONNECTION_HEAD_ID}
@@ -144,17 +172,18 @@ export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
                 refX="10"
                 refY="3.5"
                 orient="auto"
-                stroke={defaultArrowColor}
+                stroke={strokeColor}
               >
-                <polygon points="0 0, 10 3.5, 0 7" fill={defaultArrowColor} />
+                <polygon points="0 0, 10 3.5, 0 7" fill={strokeColor} />
               </marker>
             </defs>
             <line
               id={`${CONNECTION_LINE_ID}_transparent`}
               cursor={connectionCursorStyle}
-              stroke="transparent"
               pointerEvents="auto"
+              stroke="transparent"
               strokeWidth={15}
+              style={isSelected ? selectedStyles : {}}
               x1={x1}
               y1={y1}
               x2={x2}
@@ -162,15 +191,14 @@ export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
             />
             <line
               id={CONNECTION_LINE_ID}
-              stroke={defaultArrowColor}
+              stroke={strokeColor}
               pointerEvents="auto"
-              strokeWidth={2}
+              strokeWidth={strokeWidth}
               markerEnd={`url(#${CONNECTION_HEAD_ID})`}
               x1={x1}
               y1={y1}
               x2={x2}
               y2={y2}
-              style={isSelected ? selectedStyles : {}}
               cursor={connectionCursorStyle}
             />
           </g>
diff --git a/public/app/plugins/panel/canvas/Connections.tsx b/public/app/plugins/panel/canvas/Connections.tsx
index fa106ad31e1..6edda793f76 100644
--- a/public/app/plugins/panel/canvas/Connections.tsx
+++ b/public/app/plugins/panel/canvas/Connections.tsx
@@ -1,12 +1,15 @@
 import React from 'react';
+import { BehaviorSubject } from 'rxjs';
 
-import { ConnectionPath } from 'app/features/canvas';
+import { config } from '@grafana/runtime';
+import { CanvasConnection, ConnectionPath } from 'app/features/canvas';
 import { ElementState } from 'app/features/canvas/runtime/element';
 import { Scene } from 'app/features/canvas/runtime/scene';
 
 import { CONNECTION_ANCHOR_ALT, ConnectionAnchors, CONNECTION_ANCHOR_HIGHLIGHT_OFFSET } from './ConnectionAnchors';
 import { ConnectionSVG } from './ConnectionSVG';
-import { isConnectionSource, isConnectionTarget } from './utils';
+import { ConnectionState } from './types';
+import { getConnections, isConnectionSource, isConnectionTarget } from './utils';
 
 export class Connections {
   scene: Scene;
@@ -17,11 +20,35 @@ export class Connections {
   connectionTarget?: ElementState;
   isDrawingConnection?: boolean;
   didConnectionLeaveHighlight?: boolean;
+  state: ConnectionState[] = [];
+  readonly selection = new BehaviorSubject<ConnectionState | undefined>(undefined);
 
   constructor(scene: Scene) {
     this.scene = scene;
+    this.updateState();
   }
 
+  select = (connection: ConnectionState | undefined) => {
+    if (connection === this.selection.value) {
+      return;
+    }
+    this.selection.next(connection);
+  };
+
+  updateState = () => {
+    const s = this.selection.value;
+    this.state = getConnections(this.scene.byName);
+
+    if (s) {
+      for (let c of this.state) {
+        if (c.source === s.source && c.index === s.index) {
+          this.selection.next(c);
+          break;
+        }
+      }
+    }
+  };
+
   setConnectionAnchorRef = (anchorElement: HTMLDivElement) => {
     this.connectionAnchorDiv = anchorElement;
   };
@@ -174,8 +201,14 @@ export class Connections {
             y: targetY,
           },
           targetName: targetName,
-          color: 'white',
-          size: 10,
+          color: {
+            fixed: config.theme2.colors.text.primary,
+          },
+          size: {
+            fixed: 2,
+            min: 1,
+            max: 10,
+          },
           path: ConnectionPath.Straight,
         };
 
@@ -199,6 +232,8 @@ export class Connections {
       }
 
       this.isDrawingConnection = false;
+      this.updateState();
+      this.scene.save();
     }
   };
 
@@ -224,6 +259,13 @@ export class Connections {
     this.scene.selecto?.rootContainer?.addEventListener('mousemove', this.connectionListener);
   };
 
+  onChange = (current: ConnectionState, update: CanvasConnection) => {
+    const connections = current.source.options.connections?.splice(0) ?? [];
+    connections[current.index] = update;
+    current.source.onChange({ ...current.source.options, connections });
+    this.updateState();
+  };
+
   // used for moveable actions
   connectionsNeedUpdate = (element: ElementState): boolean => {
     return isConnectionSource(element) || isConnectionTarget(element, this.scene.byName);
diff --git a/public/app/plugins/panel/canvas/editor/connectionEditor.tsx b/public/app/plugins/panel/canvas/editor/connectionEditor.tsx
new file mode 100644
index 00000000000..49689915cac
--- /dev/null
+++ b/public/app/plugins/panel/canvas/editor/connectionEditor.tsx
@@ -0,0 +1,42 @@
+import { get as lodashGet } from 'lodash';
+
+import { NestedPanelOptions, NestedValueAccess } from '@grafana/data/src/utils/OptionsUIBuilders';
+import { CanvasConnection } from 'app/features/canvas';
+import { Scene } from 'app/features/canvas/runtime/scene';
+import { setOptionImmutably } from 'app/features/dashboard/components/PanelEditor/utils';
+
+import { ConnectionState } from '../types';
+
+import { optionBuilder } from './options';
+
+export interface CanvasConnectionEditorOptions {
+  connection: ConnectionState;
+  scene: Scene;
+  category?: string[];
+}
+
+export function getConnectionEditor(opts: CanvasConnectionEditorOptions): NestedPanelOptions<CanvasConnection> {
+  return {
+    category: opts.category,
+    path: '--', // not used!
+
+    values: (parent: NestedValueAccess) => ({
+      getValue: (path: string) => {
+        return lodashGet(opts.connection.info, path);
+      },
+      // TODO: Fix this any (maybe a dimension supplier?)
+      onChange: (path: string, value: any) => {
+        console.log(value, typeof value);
+        let options = opts.connection.info;
+        options = setOptionImmutably(options, path, value);
+        opts.scene.connections.onChange(opts.connection, options);
+      },
+    }),
+
+    build: (builder, context) => {
+      const ctx = { ...context, options: opts.connection.info };
+      optionBuilder.addColor(builder, ctx);
+      optionBuilder.addSize(builder, ctx);
+    },
+  };
+}
diff --git a/public/app/plugins/panel/canvas/editor/options.ts b/public/app/plugins/panel/canvas/editor/options.ts
index 2e81e17b821..12858d18c7b 100644
--- a/public/app/plugins/panel/canvas/editor/options.ts
+++ b/public/app/plugins/panel/canvas/editor/options.ts
@@ -1,11 +1,13 @@
 import { PanelOptionsSupplier } from '@grafana/data/src/panel/PanelPlugin';
-import { CanvasElementOptions } from 'app/features/canvas';
-import { ColorDimensionEditor, ResourceDimensionEditor } from 'app/features/dimensions/editors';
+import { CanvasConnection, CanvasElementOptions } from 'app/features/canvas';
+import { ColorDimensionEditor, ResourceDimensionEditor, ScaleDimensionEditor } from 'app/features/dimensions/editors';
 import { BackgroundSizeEditor } from 'app/features/dimensions/editors/BackgroundSizeEditor';
 
 interface OptionSuppliers {
   addBackground: PanelOptionsSupplier<CanvasElementOptions>;
   addBorder: PanelOptionsSupplier<CanvasElementOptions>;
+  addColor: PanelOptionsSupplier<CanvasConnection>;
+  addSize: PanelOptionsSupplier<CanvasConnection>;
 }
 
 const getCategoryName = (str: string, type: string | undefined) => {
@@ -81,4 +83,41 @@ export const optionBuilder: OptionSuppliers = {
       });
     }
   },
+
+  addColor: (builder, context) => {
+    const category = ['Color'];
+    builder.addCustomEditor({
+      category,
+      id: 'color',
+      path: 'color',
+      name: 'Color',
+      editor: ColorDimensionEditor,
+      settings: {},
+      defaultValue: {
+        // Configured values
+        fixed: '',
+      },
+    });
+  },
+
+  addSize: (builder, context) => {
+    const category = ['Size'];
+    builder.addCustomEditor({
+      category,
+      id: 'size',
+      path: 'size',
+      name: 'Size',
+      editor: ScaleDimensionEditor,
+      settings: {
+        min: 1,
+        max: 10,
+      },
+      defaultValue: {
+        // Configured values
+        fixed: 2,
+        min: 1,
+        max: 10,
+      },
+    });
+  },
 };
diff --git a/public/app/plugins/panel/canvas/module.tsx b/public/app/plugins/panel/canvas/module.tsx
index 092afb38e0a..5e3fe07af0e 100644
--- a/public/app/plugins/panel/canvas/module.tsx
+++ b/public/app/plugins/panel/canvas/module.tsx
@@ -2,6 +2,7 @@ import { FieldConfigProperty, PanelOptionsEditorBuilder, PanelPlugin } from '@gr
 import { FrameState } from 'app/features/canvas/runtime/frame';
 
 import { CanvasPanel, InstanceState } from './CanvasPanel';
+import { getConnectionEditor } from './editor/connectionEditor';
 import { getElementEditor } from './editor/elementEditor';
 import { getLayerEditor } from './editor/layerEditor';
 import { canvasMigrationHandler } from './migrations';
@@ -44,6 +45,8 @@ export const plugin = new PanelPlugin<PanelOptions>(CanvasPanel)
       builder.addNestedOptions(getLayerEditor(state));
 
       const selection = state.selected;
+      const connectionSelection = state.selectedConnection;
+
       if (selection?.length === 1) {
         const element = selection[0];
         if (!(element instanceof FrameState)) {
@@ -56,5 +59,15 @@ export const plugin = new PanelPlugin<PanelOptions>(CanvasPanel)
           );
         }
       }
+
+      if (connectionSelection) {
+        builder.addNestedOptions(
+          getConnectionEditor({
+            category: ['Selected connection'],
+            connection: connectionSelection,
+            scene: state.scene,
+          })
+        );
+      }
     }
   });
diff --git a/public/app/plugins/panel/canvas/types.ts b/public/app/plugins/panel/canvas/types.ts
index 1e7b5958baf..aea23f571af 100644
--- a/public/app/plugins/panel/canvas/types.ts
+++ b/public/app/plugins/panel/canvas/types.ts
@@ -20,6 +20,7 @@ export interface DropNode extends DragNode {
 export enum InlineEditTabs {
   ElementManagement = 'element-management',
   SelectedElement = 'selected-element',
+  SelectedConnection = 'selected-connection',
 }
 
 export type AnchorPoint = {
@@ -33,7 +34,8 @@ export interface CanvasTooltipPayload {
   isOpen?: boolean;
 }
 
-export interface ConnectionInfo {
+export interface ConnectionState {
+  index: number; // array index from the source
   source: ElementState;
   target: ElementState;
   info: CanvasConnection;
diff --git a/public/app/plugins/panel/canvas/utils.ts b/public/app/plugins/panel/canvas/utils.ts
index 4422882e97f..26fac0ec0a6 100644
--- a/public/app/plugins/panel/canvas/utils.ts
+++ b/public/app/plugins/panel/canvas/utils.ts
@@ -1,3 +1,5 @@
+import { isNumber, isString } from 'lodash';
+
 import { AppEvents, Field, LinkModel, PluginState, SelectableValue } from '@grafana/data';
 import { hasAlphaPanels } from 'app/core/config';
 
@@ -16,7 +18,7 @@ import { FrameState } from '../../../features/canvas/runtime/frame';
 import { Scene, SelectionParams } from '../../../features/canvas/runtime/scene';
 import { DimensionContext } from '../../../features/dimensions';
 
-import { AnchorPoint, ConnectionInfo } from './types';
+import { AnchorPoint, ConnectionState } from './types';
 
 export function doSelect(scene: Scene, element: ElementState | FrameState) {
   try {
@@ -139,19 +141,29 @@ export function isConnectionTarget(element: ElementState, sceneByName: Map<strin
 }
 
 export function getConnections(sceneByName: Map<string, ElementState>) {
-  const connections: ConnectionInfo[] = [];
+  const connections: ConnectionState[] = [];
   for (let v of sceneByName.values()) {
     if (v.options.connections) {
-      for (let c of v.options.connections) {
+      v.options.connections.forEach((c, index) => {
+        // @TODO Remove after v10.x
+        if (isString(c.color)) {
+          c.color = { fixed: c.color };
+        }
+
+        if (isNumber(c.size)) {
+          c.size = { fixed: 2, min: 1, max: 10 };
+        }
+
         const target = c.targetName ? sceneByName.get(c.targetName) : v.parent;
         if (target) {
           connections.push({
+            index,
             source: v,
             target,
             info: c,
           });
         }
-      }
+      });
     }
   }
 
@@ -159,7 +171,7 @@ export function getConnections(sceneByName: Map<string, ElementState>) {
 }
 
 export function getConnectionsByTarget(element: ElementState, scene: Scene) {
-  return getConnections(scene.byName).filter((connection) => connection.target === element);
+  return scene.connections.state.filter((connection) => connection.target === element);
 }
 
 export function updateConnectionsForSource(element: ElementState, scene: Scene) {

From a8b4a4bb45ae5b595f8016ec554a99c546970e5f Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Tue, 25 Apr 2023 13:39:46 -0400
Subject: [PATCH 403/729] Alerting: Update alerting module to
 20230418161049-5f374e58cb32 + refactoring (#66622)

* update to alerting 20230418161049-5f374e58cb32
* rename renamed structs in https://github.com/grafana/alerting/pull/73
* update ValidateContactPoint to use BuildReceiverConfiguration
* update logger factory according to changes
* rewrite integration builder
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
---
 go.mod                                        |  2 +-
 go.sum                                        |  4 +
 pkg/services/ngalert/api/api_alertmanager.go  |  4 +-
 .../ngalert/api/api_alertmanager_test.go      | 12 +--
 pkg/services/ngalert/notifier/alertmanager.go | 94 ++++++++-----------
 pkg/services/ngalert/notifier/compat.go       | 16 ++--
 pkg/services/ngalert/notifier/compat_test.go  | 14 +--
 pkg/services/ngalert/notifier/config.go       | 15 +--
 pkg/services/ngalert/notifier/email_test.go   | 43 +++------
 pkg/services/ngalert/notifier/log.go          |  4 +-
 .../ngalert/notifier/multiorg_alertmanager.go |  5 +-
 pkg/services/ngalert/notifier/receivers.go    |  8 +-
 .../ngalert/notifier/receivers_test.go        | 35 +++----
 pkg/services/ngalert/notifier/sender.go       |  4 -
 pkg/services/ngalert/provisioning/compat.go   | 22 +++++
 .../ngalert/provisioning/contactpoints.go     | 28 ++----
 .../alerting/contact_point_types.go           |  2 +-
 .../sqlstore/migrations/ualert/ualert.go      |  4 +-
 .../sqlstore/migrations/ualert/ualert_test.go |  2 +-
 .../api_alertmanager_configuration_test.go    |  2 +-
 .../alerting/api_notification_channel_test.go | 51 +++++-----
 pkg/tests/api/alerting/testing.go             |  6 +-
 22 files changed, 179 insertions(+), 198 deletions(-)
 create mode 100644 pkg/services/ngalert/provisioning/compat.go

diff --git a/go.mod b/go.mod
index dea70c0cdda..355a0e5944f 100644
--- a/go.mod
+++ b/go.mod
@@ -63,7 +63,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/google/wire v0.5.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/grafana/alerting v0.0.0-20230315185333-d1e3c68ac064
+	github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32
 	github.com/grafana/grafana-aws-sdk v0.12.0
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
 	github.com/grafana/grafana-plugin-sdk-go v0.159.0
diff --git a/go.sum b/go.sum
index 01a5de63f60..e9f1b8a0af6 100644
--- a/go.sum
+++ b/go.sum
@@ -1272,6 +1272,10 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grafana/alerting v0.0.0-20230315185333-d1e3c68ac064 h1:MtsWzSTav7NGKolO+TaJQUcyR7VY0YpUROVsJX8ktIU=
 github.com/grafana/alerting v0.0.0-20230315185333-d1e3c68ac064/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
+github.com/grafana/alerting v0.0.0-20230410151633-4a7ecc241d72 h1:WuQGIUeDIyPviylMaMD1d2nEYIiD/icHYO0rc/AH8kQ=
+github.com/grafana/alerting v0.0.0-20230410151633-4a7ecc241d72/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
+github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32 h1:LdPoVBj+CA5oHLeUejDzqy8/c4Fa0UfTtCcOHka0Jws=
+github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
 github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
 github.com/grafana/cuetsy v0.1.8 h1:l0AKXfHr0clu6qPirirDzNC/W5mqq5gG7iruOVolG34=
diff --git a/pkg/services/ngalert/api/api_alertmanager.go b/pkg/services/ngalert/api/api_alertmanager.go
index 88dd9eb96f9..3c3c18b6fd0 100644
--- a/pkg/services/ngalert/api/api_alertmanager.go
+++ b/pkg/services/ngalert/api/api_alertmanager.go
@@ -406,8 +406,8 @@ func statusForTestReceivers(v []notifier.TestReceiverResult) int {
 		for _, next := range receiver.Configs {
 			if next.Error != nil {
 				var (
-					invalidReceiverErr alertingNotify.InvalidReceiverError
-					receiverTimeoutErr alertingNotify.ReceiverTimeoutError
+					invalidReceiverErr alertingNotify.IntegrationValidationError
+					receiverTimeoutErr alertingNotify.IntegrationTimeoutError
 				)
 				if errors.As(next.Error, &invalidReceiverErr) {
 					numBadRequests += 1
diff --git a/pkg/services/ngalert/api/api_alertmanager_test.go b/pkg/services/ngalert/api/api_alertmanager_test.go
index 5fed1c2c87f..94c29dfbf2d 100644
--- a/pkg/services/ngalert/api/api_alertmanager_test.go
+++ b/pkg/services/ngalert/api/api_alertmanager_test.go
@@ -108,7 +108,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test1",
 				UID:    "uid1",
 				Status: "failed",
-				Error:  alertingNotify.InvalidReceiverError{},
+				Error:  alertingNotify.IntegrationValidationError{},
 			}},
 		}, {
 			Name: "test2",
@@ -116,7 +116,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test2",
 				UID:    "uid2",
 				Status: "failed",
-				Error:  alertingNotify.InvalidReceiverError{},
+				Error:  alertingNotify.IntegrationValidationError{},
 			}},
 		}}))
 	})
@@ -128,7 +128,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test1",
 				UID:    "uid1",
 				Status: "failed",
-				Error:  alertingNotify.ReceiverTimeoutError{},
+				Error:  alertingNotify.IntegrationTimeoutError{},
 			}},
 		}, {
 			Name: "test2",
@@ -136,7 +136,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test2",
 				UID:    "uid2",
 				Status: "failed",
-				Error:  alertingNotify.ReceiverTimeoutError{},
+				Error:  alertingNotify.IntegrationTimeoutError{},
 			}},
 		}}))
 	})
@@ -148,7 +148,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test1",
 				UID:    "uid1",
 				Status: "failed",
-				Error:  alertingNotify.InvalidReceiverError{},
+				Error:  alertingNotify.IntegrationValidationError{},
 			}},
 		}, {
 			Name: "test2",
@@ -156,7 +156,7 @@ func TestStatusForTestReceivers(t *testing.T) {
 				Name:   "test2",
 				UID:    "uid2",
 				Status: "failed",
-				Error:  alertingNotify.ReceiverTimeoutError{},
+				Error:  alertingNotify.IntegrationTimeoutError{},
 			}},
 		}}))
 	})
diff --git a/pkg/services/ngalert/notifier/alertmanager.go b/pkg/services/ngalert/notifier/alertmanager.go
index 1f26f219888..e5304520110 100644
--- a/pkg/services/ngalert/notifier/alertmanager.go
+++ b/pkg/services/ngalert/notifier/alertmanager.go
@@ -3,9 +3,7 @@ package notifier
 import (
 	"context"
 	"crypto/md5"
-	"encoding/base64"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"path/filepath"
 	"strconv"
@@ -54,7 +52,7 @@ type Alertmanager struct {
 	fileStore           *FileStore
 	NotificationService notifications.Service
 
-	decryptFn receivers.GetDecryptedValueFn
+	decryptFn alertingNotify.GetDecryptedValueFn
 	orgID     int64
 }
 
@@ -84,7 +82,7 @@ func (m maintenanceOptions) MaintenanceFunc(state alertingNotify.State) (int64,
 }
 
 func newAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store AlertingStore, kvStore kvstore.KVStore,
-	peer alertingNotify.ClusterPeer, decryptFn receivers.GetDecryptedValueFn, ns notifications.Service,
+	peer alertingNotify.ClusterPeer, decryptFn alertingNotify.GetDecryptedValueFn, ns notifications.Service,
 	m *metrics.Alertmanager) (*Alertmanager, error) {
 	workingPath := filepath.Join(cfg.DataPath, workingDir, strconv.Itoa(int(orgID)))
 	fileStore := NewFileStore(orgID, kvStore, workingPath)
@@ -317,7 +315,7 @@ func (am *Alertmanager) WorkingDirPath() string {
 }
 
 // buildIntegrationsMap builds a map of name to the list of Grafana integration notifiers off of a list of receiver config.
-func (am *Alertmanager) buildIntegrationsMap(receivers []*apimodels.PostableApiReceiver, templates *alertingNotify.Template) (map[string][]*alertingNotify.Integration, error) {
+func (am *Alertmanager) buildIntegrationsMap(receivers []*alertingNotify.APIReceiver, templates *alertingTemplates.Template) (map[string][]*alertingNotify.Integration, error) {
 	integrationsMap := make(map[string][]*alertingNotify.Integration, len(receivers))
 	for _, receiver := range receivers {
 		integrations, err := am.buildReceiverIntegrations(receiver, templates)
@@ -331,66 +329,48 @@ func (am *Alertmanager) buildIntegrationsMap(receivers []*apimodels.PostableApiR
 }
 
 // buildReceiverIntegrations builds a list of integration notifiers off of a receiver config.
-func (am *Alertmanager) buildReceiverIntegrations(receiver *apimodels.PostableApiReceiver, tmpl *alertingNotify.Template) ([]*alertingNotify.Integration, error) {
-	integrations := make([]*alertingNotify.Integration, 0, len(receiver.GrafanaManagedReceivers))
-	for i, r := range receiver.GrafanaManagedReceivers {
-		n, err := am.buildReceiverIntegration(PostableGrafanaReceiverToGrafanaReceiver(r), tmpl)
-		if err != nil {
-			return nil, err
-		}
-		integrations = append(integrations, alertingNotify.NewIntegration(n, n, r.Type, i))
+func (am *Alertmanager) buildReceiverIntegrations(receiver *alertingNotify.APIReceiver, tmpl *alertingTemplates.Template) ([]*alertingNotify.Integration, error) {
+	receiverCfg, err := alertingNotify.BuildReceiverConfiguration(context.Background(), receiver, am.decryptFn)
+	if err != nil {
+		return nil, err
+	}
+	s := &sender{am.NotificationService}
+	img := newImageStore(am.Store)
+	integrations, err := alertingNotify.BuildReceiverIntegrations(
+		receiverCfg,
+		tmpl,
+		img,
+		LoggerFactory,
+		func(n receivers.Metadata) (receivers.WebhookSender, error) {
+			return s, nil
+		},
+		func(n receivers.Metadata) (receivers.EmailSender, error) {
+			return s, nil
+		},
+		am.orgID,
+		setting.BuildVersion,
+	)
+	if err != nil {
+		return nil, err
 	}
 	return integrations, nil
 }
 
-func (am *Alertmanager) buildReceiverIntegration(r *alertingNotify.GrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.NotificationChannel, error) {
-	// secure settings are already encrypted at this point
-	secureSettings := make(map[string][]byte, len(r.SecureSettings))
-
-	for k, v := range r.SecureSettings {
-		d, err := base64.StdEncoding.DecodeString(v)
-		if err != nil {
-			return nil, alertingNotify.InvalidReceiverError{
-				Receiver: r,
-				Err:      errors.New("failed to decode secure setting"),
-			}
-		}
-		secureSettings[k] = d
+func (am *Alertmanager) buildReceiverIntegration(r *alertingNotify.GrafanaIntegrationConfig, tmpl *alertingTemplates.Template) (*alertingNotify.Integration, error) {
+	apiReceiver := &alertingNotify.APIReceiver{
+		GrafanaIntegrations: alertingNotify.GrafanaIntegrations{
+			Integrations: []*alertingNotify.GrafanaIntegrationConfig{r},
+		},
 	}
-
-	var (
-		cfg = &receivers.NotificationChannelConfig{
-			UID:                   r.UID,
-			OrgID:                 am.orgID,
-			Name:                  r.Name,
-			Type:                  r.Type,
-			DisableResolveMessage: r.DisableResolveMessage,
-			Settings:              r.Settings,
-			SecureSettings:        secureSettings,
-		}
-	)
-	factoryConfig, err := receivers.NewFactoryConfig(cfg, NewNotificationSender(am.NotificationService), am.decryptFn, tmpl, newImageStore(am.Store), LoggerFactory, setting.BuildVersion)
+	integrations, err := am.buildReceiverIntegrations(apiReceiver, tmpl)
 	if err != nil {
-		return nil, alertingNotify.InvalidReceiverError{
-			Receiver: r,
-			Err:      err,
-		}
+		return nil, err
 	}
-	receiverFactory, exists := alertingNotify.Factory(r.Type)
-	if !exists {
-		return nil, alertingNotify.InvalidReceiverError{
-			Receiver: r,
-			Err:      fmt.Errorf("notifier %s is not supported", r.Type),
-		}
+	if len(integrations) == 0 {
+		// This should not happen, but it is better to return some error rather than having a panic.
+		return nil, fmt.Errorf("failed to build integration")
 	}
-	n, err := receiverFactory(factoryConfig)
-	if err != nil {
-		return nil, alertingNotify.InvalidReceiverError{
-			Receiver: r,
-			Err:      err,
-		}
-	}
-	return n, nil
+	return integrations[0], nil
 }
 
 // PutAlerts receives the alerts and then sends them through the corresponding route based on whenever the alert has a receiver embedded or not
diff --git a/pkg/services/ngalert/notifier/compat.go b/pkg/services/ngalert/notifier/compat.go
index 90c4807d8f3..41bcb1cab87 100644
--- a/pkg/services/ngalert/notifier/compat.go
+++ b/pkg/services/ngalert/notifier/compat.go
@@ -8,8 +8,8 @@ import (
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 )
 
-func PostableGrafanaReceiverToGrafanaReceiver(p *apimodels.PostableGrafanaReceiver) *alertingNotify.GrafanaReceiver {
-	return &alertingNotify.GrafanaReceiver{
+func PostableGrafanaReceiverToGrafanaIntegrationConfig(p *apimodels.PostableGrafanaReceiver) *alertingNotify.GrafanaIntegrationConfig {
+	return &alertingNotify.GrafanaIntegrationConfig{
 		UID:                   p.UID,
 		Name:                  p.Name,
 		Type:                  p.Type,
@@ -20,16 +20,16 @@ func PostableGrafanaReceiverToGrafanaReceiver(p *apimodels.PostableGrafanaReceiv
 }
 
 func PostableApiReceiverToApiReceiver(r *apimodels.PostableApiReceiver) *alertingNotify.APIReceiver {
-	receivers := alertingNotify.GrafanaReceivers{
-		Receivers: make([]*alertingNotify.GrafanaReceiver, 0, len(r.GrafanaManagedReceivers)),
+	integrations := alertingNotify.GrafanaIntegrations{
+		Integrations: make([]*alertingNotify.GrafanaIntegrationConfig, 0, len(r.GrafanaManagedReceivers)),
 	}
-	for _, receiver := range r.GrafanaManagedReceivers {
-		receivers.Receivers = append(receivers.Receivers, PostableGrafanaReceiverToGrafanaReceiver(receiver))
+	for _, cfg := range r.GrafanaManagedReceivers {
+		integrations.Integrations = append(integrations.Integrations, PostableGrafanaReceiverToGrafanaIntegrationConfig(cfg))
 	}
 
 	return &alertingNotify.APIReceiver{
-		ConfigReceiver:   r.Receiver,
-		GrafanaReceivers: receivers,
+		ConfigReceiver:      r.Receiver,
+		GrafanaIntegrations: integrations,
 	}
 }
 
diff --git a/pkg/services/ngalert/notifier/compat_test.go b/pkg/services/ngalert/notifier/compat_test.go
index 46d95b37405..b3a2ff8508a 100644
--- a/pkg/services/ngalert/notifier/compat_test.go
+++ b/pkg/services/ngalert/notifier/compat_test.go
@@ -11,7 +11,7 @@ import (
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 )
 
-func TestPostableGrafanaReceiverToGrafanaReceiver(t *testing.T) {
+func TestPostableGrafanaReceiverToGrafanaIntegrationConfig(t *testing.T) {
 	r := &apimodels.PostableGrafanaReceiver{
 		UID:                   "test-uid",
 		Name:                  "test-name",
@@ -22,8 +22,8 @@ func TestPostableGrafanaReceiverToGrafanaReceiver(t *testing.T) {
 			"test": "data",
 		},
 	}
-	actual := PostableGrafanaReceiverToGrafanaReceiver(r)
-	require.Equal(t, alertingNotify.GrafanaReceiver{
+	actual := PostableGrafanaReceiverToGrafanaIntegrationConfig(r)
+	require.Equal(t, alertingNotify.GrafanaIntegrationConfig{
 		UID:                   "test-uid",
 		Name:                  "test-name",
 		Type:                  "slack",
@@ -43,7 +43,7 @@ func TestPostableApiReceiverToApiReceiver(t *testing.T) {
 			},
 		}
 		actual := PostableApiReceiverToApiReceiver(r)
-		require.Empty(t, actual.Receivers)
+		require.Empty(t, actual.Integrations)
 		require.Equal(t, r.Receiver, actual.ConfigReceiver)
 	})
 	t.Run("converts receivers", func(t *testing.T) {
@@ -77,10 +77,10 @@ func TestPostableApiReceiverToApiReceiver(t *testing.T) {
 			},
 		}
 		actual := PostableApiReceiverToApiReceiver(r)
-		require.Len(t, actual.Receivers, 2)
+		require.Len(t, actual.Integrations, 2)
 		require.Equal(t, r.Receiver, actual.ConfigReceiver)
-		require.Equal(t, *PostableGrafanaReceiverToGrafanaReceiver(r.GrafanaManagedReceivers[0]), *actual.Receivers[0])
-		require.Equal(t, *PostableGrafanaReceiverToGrafanaReceiver(r.GrafanaManagedReceivers[1]), *actual.Receivers[1])
+		require.Equal(t, *PostableGrafanaReceiverToGrafanaIntegrationConfig(r.GrafanaManagedReceivers[0]), *actual.Integrations[0])
+		require.Equal(t, *PostableGrafanaReceiverToGrafanaIntegrationConfig(r.GrafanaManagedReceivers[1]), *actual.Integrations[1])
 	})
 }
 
diff --git a/pkg/services/ngalert/notifier/config.go b/pkg/services/ngalert/notifier/config.go
index 01ecab34017..5acb73c390d 100644
--- a/pkg/services/ngalert/notifier/config.go
+++ b/pkg/services/ngalert/notifier/config.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 
 	alertingNotify "github.com/grafana/alerting/notify"
+	alertingTemplates "github.com/grafana/alerting/templates"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	api "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -94,14 +95,14 @@ type AlertingConfiguration struct {
 	AlertmanagerConfig    api.PostableApiAlertingConfig
 	RawAlertmanagerConfig []byte
 
-	AlertmanagerTemplates *alertingNotify.Template
+	AlertmanagerTemplates *alertingTemplates.Template
 
-	IntegrationsFunc         func(receivers []*api.PostableApiReceiver, templates *alertingNotify.Template) (map[string][]*alertingNotify.Integration, error)
-	ReceiverIntegrationsFunc func(r *alertingNotify.GrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.NotificationChannel, error)
+	IntegrationsFunc         func(receivers []*alertingNotify.APIReceiver, templates *alertingTemplates.Template) (map[string][]*alertingNotify.Integration, error)
+	ReceiverIntegrationsFunc func(r *alertingNotify.GrafanaIntegrationConfig, tmpl *alertingTemplates.Template) (*alertingNotify.Integration, error)
 }
 
-func (a AlertingConfiguration) BuildReceiverIntegrationsFunc() func(next *alertingNotify.GrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.Notifier, error) {
-	return func(next *alertingNotify.GrafanaReceiver, tmpl *alertingNotify.Template) (alertingNotify.Notifier, error) {
+func (a AlertingConfiguration) BuildReceiverIntegrationsFunc() func(next *alertingNotify.GrafanaIntegrationConfig, tmpl *alertingTemplates.Template) (alertingNotify.Notifier, error) {
+	return func(next *alertingNotify.GrafanaIntegrationConfig, tmpl *alertingTemplates.Template) (alertingNotify.Notifier, error) {
 		return a.ReceiverIntegrationsFunc(next, tmpl)
 	}
 }
@@ -119,14 +120,14 @@ func (a AlertingConfiguration) MuteTimeIntervals() []alertingNotify.MuteTimeInte
 }
 
 func (a AlertingConfiguration) ReceiverIntegrations() (map[string][]*alertingNotify.Integration, error) {
-	return a.IntegrationsFunc(a.AlertmanagerConfig.Receivers, a.AlertmanagerTemplates)
+	return a.IntegrationsFunc(PostableApiAlertingConfigToApiReceivers(a.AlertmanagerConfig), a.AlertmanagerTemplates)
 }
 
 func (a AlertingConfiguration) RoutingTree() *alertingNotify.Route {
 	return a.AlertmanagerConfig.Route.AsAMRoute()
 }
 
-func (a AlertingConfiguration) Templates() *alertingNotify.Template {
+func (a AlertingConfiguration) Templates() *alertingTemplates.Template {
 	return a.AlertmanagerTemplates
 }
 
diff --git a/pkg/services/ngalert/notifier/email_test.go b/pkg/services/ngalert/notifier/email_test.go
index 7bcd66a10a2..1fe36a4a3bc 100644
--- a/pkg/services/ngalert/notifier/email_test.go
+++ b/pkg/services/ngalert/notifier/email_test.go
@@ -2,7 +2,6 @@ package notifier
 
 import (
 	"context"
-	"encoding/json"
 	"net/url"
 	"os"
 	"testing"
@@ -188,40 +187,20 @@ func TestEmailNotifierIntegration(t *testing.T) {
 	}
 }
 
-func createSut(t *testing.T, messageTmpl string, subjectTmpl string, emailTmpl *template.Template, ns receivers.NotificationSender) *alertingEmail.Notifier {
+func createSut(t *testing.T, messageTmpl string, subjectTmpl string, emailTmpl *template.Template, ns receivers.EmailSender) *alertingEmail.Notifier {
 	t.Helper()
-
-	jsonData := map[string]interface{}{
-		"addresses":   "someops@example.com;somedev@example.com",
-		"singleEmail": true,
+	if subjectTmpl == "" {
+		subjectTmpl = alertingTemplates.DefaultMessageTitleEmbed
 	}
-	if messageTmpl != "" {
-		jsonData["message"] = messageTmpl
-	}
-
-	if subjectTmpl != "" {
-		jsonData["subject"] = subjectTmpl
-	}
-	bytes, err := json.Marshal(jsonData)
-	require.NoError(t, err)
-
-	fc := receivers.FactoryConfig{
-		Config: &receivers.NotificationChannelConfig{
-			Name:     "ops",
-			Type:     "alertingEmail",
-			Settings: json.RawMessage(bytes),
+	return alertingEmail.New(alertingEmail.Config{
+		SingleEmail: true,
+		Addresses: []string{
+			"someops@example.com",
+			"somedev@example.com",
 		},
-		NotificationService: ns,
-		DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string {
-			return fallback
-		},
-		ImageStore: &images.UnavailableImageStore{},
-		Template:   emailTmpl,
-		Logger:     &alertingLogging.FakeLogger{},
-	}
-	emailNotifier, err := alertingEmail.New(fc)
-	require.NoError(t, err)
-	return emailNotifier
+		Message: messageTmpl,
+		Subject: subjectTmpl,
+	}, receivers.Metadata{}, emailTmpl, ns, &images.UnavailableImageStore{}, &alertingLogging.FakeLogger{})
 }
 
 func getSingleSentMessage(t *testing.T, ns *emailSender) *notifications.Message {
diff --git a/pkg/services/ngalert/notifier/log.go b/pkg/services/ngalert/notifier/log.go
index a48477d8abe..aed0addd87f 100644
--- a/pkg/services/ngalert/notifier/log.go
+++ b/pkg/services/ngalert/notifier/log.go
@@ -6,8 +6,8 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 )
 
-var LoggerFactory alertingLogging.LoggerFactory = func(ctx ...interface{}) alertingLogging.Logger {
-	return &logWrapper{log.New(ctx...)}
+var LoggerFactory alertingLogging.LoggerFactory = func(logger string, ctx ...interface{}) alertingLogging.Logger {
+	return &logWrapper{log.New(append([]interface{}{logger}, ctx...)...)}
 }
 
 type logWrapper struct {
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager.go b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
index 1713a118468..8b687c2d9ac 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
@@ -13,7 +13,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	alertingNotify "github.com/grafana/alerting/notify"
-	"github.com/grafana/alerting/receivers"
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -49,14 +48,14 @@ type MultiOrgAlertmanager struct {
 	orgStore    store.OrgStore
 	kvStore     kvstore.KVStore
 
-	decryptFn receivers.GetDecryptedValueFn
+	decryptFn alertingNotify.GetDecryptedValueFn
 
 	metrics *metrics.MultiOrgAlertmanager
 	ns      notifications.Service
 }
 
 func NewMultiOrgAlertmanager(cfg *setting.Cfg, configStore AlertingStore, orgStore store.OrgStore,
-	kvStore kvstore.KVStore, provStore provisioning.ProvisioningStore, decryptFn receivers.GetDecryptedValueFn,
+	kvStore kvstore.KVStore, provStore provisioning.ProvisioningStore, decryptFn alertingNotify.GetDecryptedValueFn,
 	m *metrics.MultiOrgAlertmanager, ns notifications.Service, l log.Logger, s secrets.Service,
 ) (*MultiOrgAlertmanager, error) {
 	moa := &MultiOrgAlertmanager{
diff --git a/pkg/services/ngalert/notifier/receivers.go b/pkg/services/ngalert/notifier/receivers.go
index f473a035a33..5cc12f15f86 100644
--- a/pkg/services/ngalert/notifier/receivers.go
+++ b/pkg/services/ngalert/notifier/receivers.go
@@ -35,9 +35,9 @@ type TestReceiverConfigResult struct {
 func (am *Alertmanager) TestReceivers(ctx context.Context, c apimodels.TestReceiversConfigBodyParams) (*TestReceiversResult, error) {
 	receivers := make([]*alertingNotify.APIReceiver, 0, len(c.Receivers))
 	for _, r := range c.Receivers {
-		greceivers := make([]*alertingNotify.GrafanaReceiver, 0, len(r.GrafanaManagedReceivers))
+		integrations := make([]*alertingNotify.GrafanaIntegrationConfig, 0, len(r.GrafanaManagedReceivers))
 		for _, gr := range r.PostableGrafanaReceivers.GrafanaManagedReceivers {
-			greceivers = append(greceivers, &alertingNotify.GrafanaReceiver{
+			integrations = append(integrations, &alertingNotify.GrafanaIntegrationConfig{
 				UID:                   gr.UID,
 				Name:                  gr.Name,
 				Type:                  gr.Type,
@@ -48,8 +48,8 @@ func (am *Alertmanager) TestReceivers(ctx context.Context, c apimodels.TestRecei
 		}
 		receivers = append(receivers, &alertingNotify.APIReceiver{
 			ConfigReceiver: r.Receiver,
-			GrafanaReceivers: alertingNotify.GrafanaReceivers{
-				Receivers: greceivers,
+			GrafanaIntegrations: alertingNotify.GrafanaIntegrations{
+				Integrations: integrations,
 			},
 		})
 	}
diff --git a/pkg/services/ngalert/notifier/receivers_test.go b/pkg/services/ngalert/notifier/receivers_test.go
index 2c3b3102946..6ee01b9b9fe 100644
--- a/pkg/services/ngalert/notifier/receivers_test.go
+++ b/pkg/services/ngalert/notifier/receivers_test.go
@@ -11,19 +11,20 @@ import (
 )
 
 func TestInvalidReceiverError_Error(t *testing.T) {
-	e := alertingNotify.InvalidReceiverError{
-		Receiver: &alertingNotify.GrafanaReceiver{
+	e := alertingNotify.IntegrationValidationError{
+		Integration: &alertingNotify.GrafanaIntegrationConfig{
 			Name: "test",
+			Type: "test-type",
 			UID:  "uid",
 		},
 		Err: errors.New("this is an error"),
 	}
-	require.Equal(t, "the receiver is invalid: this is an error", e.Error())
+	require.Equal(t, `failed to validate integration "test" (UID uid) of type "test-type": this is an error`, e.Error())
 }
 
 func TestReceiverTimeoutError_Error(t *testing.T) {
-	e := alertingNotify.ReceiverTimeoutError{
-		Receiver: &alertingNotify.GrafanaReceiver{
+	e := alertingNotify.IntegrationTimeoutError{
+		Integration: &alertingNotify.GrafanaIntegrationConfig{
 			Name: "test",
 			UID:  "uid",
 		},
@@ -44,18 +45,18 @@ func (e timeoutError) Timeout() bool {
 
 func TestProcessNotifierError(t *testing.T) {
 	t.Run("assert ReceiverTimeoutError is returned for context deadline exceeded", func(t *testing.T) {
-		r := &alertingNotify.GrafanaReceiver{
+		r := &alertingNotify.GrafanaIntegrationConfig{
 			Name: "test",
 			UID:  "uid",
 		}
-		require.Equal(t, alertingNotify.ReceiverTimeoutError{
-			Receiver: r,
-			Err:      context.DeadlineExceeded,
-		}, alertingNotify.ProcessNotifierError(r, context.DeadlineExceeded))
+		require.Equal(t, alertingNotify.IntegrationTimeoutError{
+			Integration: r,
+			Err:         context.DeadlineExceeded,
+		}, alertingNotify.ProcessIntegrationError(r, context.DeadlineExceeded))
 	})
 
 	t.Run("assert ReceiverTimeoutError is returned for *url.Error timeout", func(t *testing.T) {
-		r := &alertingNotify.GrafanaReceiver{
+		r := &alertingNotify.GrafanaIntegrationConfig{
 			Name: "test",
 			UID:  "uid",
 		}
@@ -64,18 +65,18 @@ func TestProcessNotifierError(t *testing.T) {
 			URL: "https://grafana.net",
 			Err: timeoutError{},
 		}
-		require.Equal(t, alertingNotify.ReceiverTimeoutError{
-			Receiver: r,
-			Err:      urlError,
-		}, alertingNotify.ProcessNotifierError(r, urlError))
+		require.Equal(t, alertingNotify.IntegrationTimeoutError{
+			Integration: r,
+			Err:         urlError,
+		}, alertingNotify.ProcessIntegrationError(r, urlError))
 	})
 
 	t.Run("assert unknown error is returned unmodified", func(t *testing.T) {
-		r := &alertingNotify.GrafanaReceiver{
+		r := &alertingNotify.GrafanaIntegrationConfig{
 			Name: "test",
 			UID:  "uid",
 		}
 		err := errors.New("this is an error")
-		require.Equal(t, err, alertingNotify.ProcessNotifierError(r, err))
+		require.Equal(t, err, alertingNotify.ProcessIntegrationError(r, err))
 	})
 }
diff --git a/pkg/services/ngalert/notifier/sender.go b/pkg/services/ngalert/notifier/sender.go
index 13fcebba592..11c17c12d8a 100644
--- a/pkg/services/ngalert/notifier/sender.go
+++ b/pkg/services/ngalert/notifier/sender.go
@@ -50,7 +50,3 @@ func (s sender) SendEmail(ctx context.Context, cmd *receivers.SendEmailSettings)
 		},
 	})
 }
-
-func NewNotificationSender(ns notifications.Service) receivers.NotificationSender {
-	return &sender{ns: ns}
-}
diff --git a/pkg/services/ngalert/provisioning/compat.go b/pkg/services/ngalert/provisioning/compat.go
new file mode 100644
index 00000000000..edd9a23bc15
--- /dev/null
+++ b/pkg/services/ngalert/provisioning/compat.go
@@ -0,0 +1,22 @@
+package provisioning
+
+import (
+	alertingNotify "github.com/grafana/alerting/notify"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+)
+
+func EmbeddedContactPointToGrafanaIntegrationConfig(e definitions.EmbeddedContactPoint) (alertingNotify.GrafanaIntegrationConfig, error) {
+	data, err := e.Settings.MarshalJSON()
+	if err != nil {
+		return alertingNotify.GrafanaIntegrationConfig{}, err
+	}
+	return alertingNotify.GrafanaIntegrationConfig{
+		UID:                   e.UID,
+		Name:                  e.Name,
+		Type:                  e.Type,
+		DisableResolveMessage: e.DisableResolveMessage,
+		Settings:              data,
+		SecureSettings:        nil,
+	}, nil
+}
diff --git a/pkg/services/ngalert/provisioning/contactpoints.go b/pkg/services/ngalert/provisioning/contactpoints.go
index 64d238f4093..13183c298f8 100644
--- a/pkg/services/ngalert/provisioning/contactpoints.go
+++ b/pkg/services/ngalert/provisioning/contactpoints.go
@@ -7,9 +7,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/grafana/alerting/logging"
 	alertingNotify "github.com/grafana/alerting/notify"
-	"github.com/grafana/alerting/receivers"
 	"github.com/prometheus/alertmanager/config"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -18,7 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier/channels_config"
 	"github.com/grafana/grafana/pkg/services/secrets"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -136,7 +133,7 @@ func (ecp *ContactPointService) getContactPointDecrypted(ctx context.Context, or
 
 func (ecp *ContactPointService) CreateContactPoint(ctx context.Context, orgID int64,
 	contactPoint apimodels.EmbeddedContactPoint, provenance models.Provenance) (apimodels.EmbeddedContactPoint, error) {
-	if err := ValidateContactPoint(contactPoint, ecp.encryptionService.GetDecryptedValue); err != nil {
+	if err := ValidateContactPoint(ctx, contactPoint, ecp.encryptionService.GetDecryptedValue); err != nil {
 		return apimodels.EmbeddedContactPoint{}, fmt.Errorf("%w: %s", ErrValidation, err.Error())
 	}
 
@@ -257,7 +254,7 @@ func (ecp *ContactPointService) UpdateContactPoint(ctx context.Context, orgID in
 	}
 
 	// validate merged values
-	if err := ValidateContactPoint(contactPoint, ecp.encryptionService.GetDecryptedValue); err != nil {
+	if err := ValidateContactPoint(ctx, contactPoint, ecp.encryptionService.GetDecryptedValue); err != nil {
 		return fmt.Errorf("%w: %s", ErrValidation, err.Error())
 	}
 
@@ -500,28 +497,23 @@ func replaceReferences(oldName, newName string, routes ...*apimodels.Route) {
 	}
 }
 
-func ValidateContactPoint(e apimodels.EmbeddedContactPoint, decryptFunc receivers.GetDecryptedValueFn) error {
+func ValidateContactPoint(ctx context.Context, e apimodels.EmbeddedContactPoint, decryptFunc alertingNotify.GetDecryptedValueFn) error {
 	if e.Type == "" {
 		return fmt.Errorf("type should not be an empty string")
 	}
 	if e.Settings == nil {
 		return fmt.Errorf("settings should not be empty")
 	}
-	factory, exists := alertingNotify.Factory(e.Type)
-	if !exists {
-		return fmt.Errorf("unknown type '%s'", e.Type)
-	}
-	jsonBytes, err := e.Settings.MarshalJSON()
+	integration, err := EmbeddedContactPointToGrafanaIntegrationConfig(e)
 	if err != nil {
 		return err
 	}
-	cfg, _ := receivers.NewFactoryConfig(&receivers.NotificationChannelConfig{
-		Settings: jsonBytes,
-		Type:     e.Type,
-	}, nil, decryptFunc, nil, nil, func(ctx ...interface{}) logging.Logger {
-		return &logging.FakeLogger{}
-	}, setting.BuildVersion)
-	if _, err := factory(cfg); err != nil {
+	_, err = alertingNotify.BuildReceiverConfiguration(ctx, &alertingNotify.APIReceiver{
+		GrafanaIntegrations: alertingNotify.GrafanaIntegrations{
+			Integrations: []*alertingNotify.GrafanaIntegrationConfig{&integration},
+		},
+	}, decryptFunc)
+	if err != nil {
 		return err
 	}
 	return nil
diff --git a/pkg/services/provisioning/alerting/contact_point_types.go b/pkg/services/provisioning/alerting/contact_point_types.go
index 8fe5d2ac3db..391c9ff1fc2 100644
--- a/pkg/services/provisioning/alerting/contact_point_types.go
+++ b/pkg/services/provisioning/alerting/contact_point_types.go
@@ -95,7 +95,7 @@ func (config *ReceiverV1) mapToModel(name string) (definitions.EmbeddedContactPo
 	}
 	// As the values are not encrypted when coming from disk files,
 	// we can simply return the fallback for validation.
-	err := provisioning.ValidateContactPoint(cp, func(_ context.Context, _ map[string][]byte, _, fallback string) string {
+	err := provisioning.ValidateContactPoint(context.Background(), cp, func(_ context.Context, _ map[string][]byte, _, fallback string) string {
 		return fallback
 	})
 	if err != nil {
diff --git a/pkg/services/sqlstore/migrations/ualert/ualert.go b/pkg/services/sqlstore/migrations/ualert/ualert.go
index 535c6395006..a7a4a83a759 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert.go
@@ -480,7 +480,7 @@ func (m *migration) validateAlertmanagerConfig(config *PostableUserConfig) error
 				return err
 			}
 			var (
-				cfg = &alertingNotify.GrafanaReceiver{
+				cfg = &alertingNotify.GrafanaIntegrationConfig{
 					UID:                   gr.UID,
 					Name:                  gr.Name,
 					Type:                  gr.Type,
@@ -504,7 +504,7 @@ func (m *migration) validateAlertmanagerConfig(config *PostableUserConfig) error
 				return fallback
 			}
 			_, err = alertingNotify.BuildReceiverConfiguration(context.Background(), &alertingNotify.APIReceiver{
-				GrafanaReceivers: alertingNotify.GrafanaReceivers{Receivers: []*alertingNotify.GrafanaReceiver{cfg}},
+				GrafanaIntegrations: alertingNotify.GrafanaIntegrations{Integrations: []*alertingNotify.GrafanaIntegrationConfig{cfg}},
 			}, decryptFunc)
 			if err != nil {
 				return err
diff --git a/pkg/services/sqlstore/migrations/ualert/ualert_test.go b/pkg/services/sqlstore/migrations/ualert/ualert_test.go
index ef2086ccb54..98a56c07c6f 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert_test.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert_test.go
@@ -72,7 +72,7 @@ func Test_validateAlertmanagerConfig(t *testing.T) {
 					SecureSettings: map[string]string{"url": invalidUri},
 				},
 			},
-			err: fmt.Errorf("failed to validate receiver \"SlackWithBadURL\" of type \"slack\": failed to parse notifier SlackWithBadURL (UID: test-uid): invalid URL %q", invalidUri),
+			err: fmt.Errorf("failed to validate integration \"SlackWithBadURL\" (UID test-uid) of type \"slack\": invalid URL %q", invalidUri),
 		},
 		{
 			name: "when a slack receiver has an invalid recipient - it should not error",
diff --git a/pkg/tests/api/alerting/api_alertmanager_configuration_test.go b/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
index e6eb902872c..9ab9a901f6f 100644
--- a/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
+++ b/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
@@ -102,7 +102,7 @@ func TestIntegrationAlertmanagerConfigurationIsTransactional(t *testing.T) {
 		require.NoError(t, err)
 		var res map[string]interface{}
 		require.NoError(t, json.Unmarshal(b, &res))
-		require.Equal(t, `failed to save and apply Alertmanager configuration: failed to build integration map: the receiver is invalid: failed to validate receiver "slack.receiver" of type "slack": token must be specified when using the Slack chat API`, res["message"])
+		require.Regexp(t, `^failed to save and apply Alertmanager configuration: failed to build integration map: failed to validate integration "slack.receiver" \(UID [^\)]+\) of type "slack": token must be specified when using the Slack chat API`, res["message"])
 		resp = getRequest(t, alertConfigURL, http.StatusOK) // nolint
 
 		require.JSONEq(t, defaultAlertmanagerConfigJSON, getBody(t, resp.Body))
diff --git a/pkg/tests/api/alerting/api_notification_channel_test.go b/pkg/tests/api/alerting/api_notification_channel_test.go
index c6bd1f5bb4e..2990e0d21ee 100644
--- a/pkg/tests/api/alerting/api_notification_channel_test.go
+++ b/pkg/tests/api/alerting/api_notification_channel_test.go
@@ -205,32 +205,34 @@ func TestIntegrationTestReceivers(t *testing.T) {
 		require.NoError(t, json.Unmarshal(b, &result))
 		require.Len(t, result.Receivers, 1)
 		require.Len(t, result.Receivers[0].Configs, 1)
+		require.Regexp(t, `failed to validate integration "receiver-1" \(UID[^\)]+\) of type "email": could not find addresses in settings`, result.Receivers[0].Configs[0].Error)
 
 		expectedJSON := fmt.Sprintf(`{
-		"alert": {
-			"annotations": {
-				"summary": "Notification test",
-				"__value_string__": "[ metric='foo' labels={instance=bar} value=10 ]"
-			},
-			"labels": {
-				"alertname": "TestAlert",
-				"instance": "Grafana"
-			}
-		},
-		"receivers": [{
-			"name":"receiver-1",
-			"grafana_managed_receiver_configs": [
-				{
-					"name": "receiver-1",
-					"uid": "%s",
-					"status": "failed",
-					"error": "the receiver is invalid: failed to validate receiver \"receiver-1\" of type \"email\": could not find addresses in settings"
+			"alert": {
+				"annotations": {
+					"summary": "Notification test",
+					"__value_string__": "[ metric='foo' labels={instance=bar} value=10 ]"
+				},
+				"labels": {
+					"alertname": "TestAlert",
+					"instance": "Grafana"
 				}
-			]
-		}],
-		"notified_at": "%s"
-	}`,
+			},
+			"receivers": [{
+				"name":"receiver-1",
+				"grafana_managed_receiver_configs": [
+					{
+						"name": "receiver-1",
+						"uid": "%s",
+						"status": "failed",
+						"error": %q
+					}
+				]
+			}],
+			"notified_at": "%s"
+		}`,
 			result.Receivers[0].Configs[0].UID,
+			result.Receivers[0].Configs[0].Error,
 			result.NotifiedAt.Format(time.RFC3339Nano))
 		require.JSONEq(t, expectedJSON, string(b))
 	})
@@ -392,6 +394,7 @@ func TestIntegrationTestReceivers(t *testing.T) {
 		require.Len(t, result.Receivers, 2)
 		require.Len(t, result.Receivers[0].Configs, 1)
 		require.Len(t, result.Receivers[1].Configs, 1)
+		require.Regexp(t, `failed to validate integration "receiver-1" \(UID[^\)]+\) of type "email": could not find addresses in settings`, result.Receivers[0].Configs[0].Error)
 
 		expectedJSON := fmt.Sprintf(`{
 		"alert": {
@@ -411,7 +414,7 @@ func TestIntegrationTestReceivers(t *testing.T) {
 					"name": "receiver-1",
 					"uid": "%s",
 					"status": "failed",
-					"error": "the receiver is invalid: failed to validate receiver \"receiver-1\" of type \"email\": could not find addresses in settings"
+					"error": %q
 				}
 			]
 		}, {
@@ -428,6 +431,7 @@ func TestIntegrationTestReceivers(t *testing.T) {
 		"notified_at": "%s"
 	}`,
 			result.Receivers[0].Configs[0].UID,
+			result.Receivers[0].Configs[0].Error,
 			result.Receivers[1].Configs[0].UID,
 			result.NotifiedAt.Format(time.RFC3339Nano))
 		require.JSONEq(t, expectedJSON, string(b))
@@ -1056,6 +1060,7 @@ func (nc *mockNotificationChannel) ServeHTTP(res http.ResponseWriter, req *http.
 	body := getBody(nc.t, req.Body)
 
 	nc.receivedNotifications[key] = append(nc.receivedNotifications[key], body)
+	res.Header().Set("Content-Type", "application/json")
 	res.WriteHeader(http.StatusOK)
 	fmt.Fprint(res, nc.responses[paths[0]])
 }
diff --git a/pkg/tests/api/alerting/testing.go b/pkg/tests/api/alerting/testing.go
index ce6eaf000ab..ee759178674 100644
--- a/pkg/tests/api/alerting/testing.go
+++ b/pkg/tests/api/alerting/testing.go
@@ -10,11 +10,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana/pkg/expr"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/expr"
+
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/quota"
@@ -75,7 +76,8 @@ func postRequest(t *testing.T, url string, body string, expStatusCode int) *http
 	if expStatusCode != resp.StatusCode {
 		b, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		t.Fatal(string(b))
+		t.Log(string(b))
+		require.Equal(t, expStatusCode, resp.StatusCode)
 	}
 	return resp
 }

From 73920b1e34c14f00072632bdc37f4b76d7f1603b Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Tue, 25 Apr 2023 19:44:32 +0200
Subject: [PATCH 404/729] Plugins: Refactor cleaning of call resource response
 headers (#67145)

First part of #66889 moving cleaning of call resource response headers
within plugin management client.
---
 pkg/api/plugin_resource.go                    |  17 ---
 pkg/api/plugins_test.go                       |  27 +---
 pkg/plugins/manager/client/client.go          |  49 +++++++-
 pkg/plugins/manager/client/client_test.go     | 117 +++++++++++++++++-
 .../clientmiddleware/caching_middleware.go    |   8 +-
 .../resource_response_middleware.go           |  65 ++++++++++
 .../resource_response_middleware_test.go      |  41 ++++++
 .../clientmiddleware/testing.go               |   6 -
 .../clientmiddleware/utils.go                 |  11 ++
 .../pluginsintegration/pluginsintegration.go  |   1 +
 10 files changed, 283 insertions(+), 59 deletions(-)
 create mode 100644 pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware.go
 create mode 100644 pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware_test.go
 create mode 100644 pkg/services/pluginsintegration/clientmiddleware/utils.go

diff --git a/pkg/api/plugin_resource.go b/pkg/api/plugin_resource.go
index 2b69379b920..89bb1884da3 100644
--- a/pkg/api/plugin_resource.go
+++ b/pkg/api/plugin_resource.go
@@ -161,7 +161,6 @@ func (hs *HTTPServer) flushStream(stream callResourceClientResponseStream, w htt
 
 		// Expected that headers and status are only part of first stream
 		if processedStreams == 0 {
-			var hasContentType bool
 			for k, values := range resp.Headers {
 				// Convert the keys to the canonical format of MIME headers.
 				// This ensures that we can safely add/overwrite headers
@@ -169,15 +168,6 @@ func (hs *HTTPServer) flushStream(stream callResourceClientResponseStream, w htt
 				// and be sure they won't be present multiple times in the response.
 				k = textproto.CanonicalMIMEHeaderKey(k)
 
-				switch k {
-				case "Set-Cookie":
-					// Due to security reasons we don't want to forward
-					// cookies from a backend plugin to clients/browsers.
-					continue
-				case "Content-Type":
-					hasContentType = true
-				}
-
 				for _, v := range values {
 					// TODO: Figure out if we should use Set here instead
 					// nolint:gocritic
@@ -185,13 +175,6 @@ func (hs *HTTPServer) flushStream(stream callResourceClientResponseStream, w htt
 				}
 			}
 
-			// Make sure a content type always is returned in response
-			if !hasContentType && resp.Status != http.StatusNoContent {
-				w.Header().Set("Content-Type", "application/json")
-			}
-
-			proxyutil.SetProxyResponseHeaders(w.Header())
-
 			w.WriteHeader(resp.Status)
 		}
 
diff --git a/pkg/api/plugins_test.go b/pkg/api/plugins_test.go
index 9de3a41e4cc..9dce4ff7ee9 100644
--- a/pkg/api/plugins_test.go
+++ b/pkg/api/plugins_test.go
@@ -388,30 +388,9 @@ func TestMakePluginResourceRequest(t *testing.T) {
 		}
 	}
 
-	require.Equal(t, resp.Header().Get("Content-Type"), "application/json")
-	require.Equal(t, "sandbox", resp.Header().Get("Content-Security-Policy"))
-}
-
-func TestMakePluginResourceRequestSetCookieNotPresent(t *testing.T) {
-	hs := HTTPServer{
-		Cfg: setting.NewCfg(),
-		log: log.New(),
-		pluginClient: &fakePluginClient{
-			headers: map[string][]string{"Set-Cookie": {"monster"}},
-		},
-	}
-	req := httptest.NewRequest(http.MethodGet, "/", nil)
-	resp := httptest.NewRecorder()
-	pCtx := backend.PluginContext{}
-	err := hs.makePluginResourceRequest(resp, req, pCtx)
-	require.NoError(t, err)
-
-	for {
-		if resp.Flushed {
-			break
-		}
-	}
-	require.Empty(t, resp.Header().Values("Set-Cookie"), "Set-Cookie header should not be present")
+	res := resp.Result()
+	require.NoError(t, res.Body.Close())
+	require.Equal(t, http.StatusOK, res.StatusCode)
 }
 
 func TestMakePluginResourceRequestContentTypeUnique(t *testing.T) {
diff --git a/pkg/plugins/manager/client/client.go b/pkg/plugins/manager/client/client.go
index a1bd1e864f6..1a3cf03d373 100644
--- a/pkg/plugins/manager/client/client.go
+++ b/pkg/plugins/manager/client/client.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net/http"
 	"net/textproto"
 	"strings"
 
@@ -16,6 +17,12 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 )
 
+const (
+	setCookieHeaderName   = "Set-Cookie"
+	contentTypeHeaderName = "Content-Type"
+	defaultContentType    = "application/json"
+)
+
 var _ plugins.Client = (*Service)(nil)
 
 type Service struct {
@@ -99,13 +106,22 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 	}, totalBytes, func() error {
 		removeConnectionHeaders(req.Headers)
 		removeHopByHopHeaders(req.Headers)
+		removeNonAllowedHeaders(req.Headers)
 
+		processedStreams := 0
 		wrappedSender := callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
-			if res != nil && len(res.Headers) > 0 {
-				removeConnectionHeaders(res.Headers)
-				removeHopByHopHeaders(res.Headers)
+			// Expected that headers and status are only part of first stream
+			if processedStreams == 0 && res != nil {
+				if len(res.Headers) > 0 {
+					removeConnectionHeaders(res.Headers)
+					removeHopByHopHeaders(res.Headers)
+					removeNonAllowedHeaders(res.Headers)
+				}
+
+				ensureContentTypeHeader(res)
 			}
 
+			processedStreams++
 			return sender.Send(res)
 		})
 
@@ -293,6 +309,33 @@ func removeHopByHopHeaders(h map[string][]string) {
 	}
 }
 
+func removeNonAllowedHeaders(h map[string][]string) {
+	for k := range h {
+		if textproto.CanonicalMIMEHeaderKey(k) == setCookieHeaderName {
+			delete(h, k)
+		}
+	}
+}
+
+// ensureContentTypeHeader makes sure a content type always is returned in response.
+func ensureContentTypeHeader(res *backend.CallResourceResponse) {
+	if res == nil {
+		return
+	}
+
+	var hasContentType bool
+	for k := range res.Headers {
+		if textproto.CanonicalMIMEHeaderKey(k) == contentTypeHeaderName {
+			hasContentType = true
+			break
+		}
+	}
+
+	if !hasContentType && res.Status != http.StatusNoContent {
+		res.Headers[contentTypeHeaderName] = []string{defaultContentType}
+	}
+}
+
 type callResourceResponseSenderFunc func(res *backend.CallResourceResponse) error
 
 func (fn callResourceResponseSenderFunc) Send(res *backend.CallResourceResponse) error {
diff --git a/pkg/plugins/manager/client/client_test.go b/pkg/plugins/manager/client/client_test.go
index 45ae51d35d5..fe308710c1e 100644
--- a/pkg/plugins/manager/client/client_test.go
+++ b/pkg/plugins/manager/client/client_test.go
@@ -136,7 +136,6 @@ func TestCallResource(t *testing.T) {
 		res := responses[0]
 		require.Equal(t, http.StatusOK, res.Status)
 		require.Equal(t, []byte(backendResponse), res.Body)
-		require.Len(t, res.Headers, 1)
 		require.Equal(t, "should not be deleted", actualReq.Headers["X-Custom"][0])
 	})
 
@@ -200,9 +199,123 @@ func TestCallResource(t *testing.T) {
 		res := responses[0]
 		require.Equal(t, http.StatusOK, res.Status)
 		require.Equal(t, []byte(backendResponse), res.Body)
-		require.Len(t, res.Headers, 1)
 		require.Equal(t, "should not be deleted", actualReq.Headers["X-Custom"][0])
 	})
+
+	t.Run("Should remove non-allowed response headers", func(t *testing.T) {
+		resHeaders := map[string][]string{
+			setCookieHeaderName: {"monster"},
+			"X-Custom":          {"should not be deleted"},
+		}
+
+		req := &backend.CallResourceRequest{
+			PluginContext: backend.PluginContext{
+				PluginID: "pid",
+			},
+		}
+
+		responses := []*backend.CallResourceResponse{}
+		sender := callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
+			responses = append(responses, res)
+			return nil
+		})
+
+		p.RegisterClient(&fakePluginBackend{
+			crr: func(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+				return sender.Send(&backend.CallResourceResponse{
+					Headers: resHeaders,
+					Status:  http.StatusOK,
+					Body:    []byte(backendResponse),
+				})
+			},
+		})
+		err := registry.Add(context.Background(), p)
+		require.NoError(t, err)
+
+		client := ProvideService(registry, &config.Cfg{})
+
+		err = client.CallResource(context.Background(), req, sender)
+		require.NoError(t, err)
+
+		require.Len(t, responses, 1)
+		res := responses[0]
+		require.Equal(t, http.StatusOK, res.Status)
+		require.Equal(t, []byte(backendResponse), res.Body)
+		require.Empty(t, res.Headers[setCookieHeaderName])
+		require.Equal(t, "should not be deleted", res.Headers["X-Custom"][0])
+	})
+
+	t.Run("Should ensure content type header", func(t *testing.T) {
+		tcs := []struct {
+			contentType    string
+			responseStatus int
+			expContentType string
+		}{
+			{
+				contentType:    "",
+				responseStatus: http.StatusOK,
+				expContentType: defaultContentType,
+			},
+			{
+				contentType:    "text/plain",
+				responseStatus: http.StatusOK,
+				expContentType: "text/plain",
+			},
+			{
+				contentType:    "",
+				responseStatus: http.StatusNoContent,
+				expContentType: "",
+			},
+		}
+
+		for _, tc := range tcs {
+			t.Run(fmt.Sprintf("content type=%s, status=%d, exp=%s", tc.contentType, tc.responseStatus, tc.expContentType), func(t *testing.T) {
+				resHeaders := map[string][]string{}
+
+				if tc.contentType != "" {
+					resHeaders[contentTypeHeaderName] = []string{tc.contentType}
+				}
+
+				req := &backend.CallResourceRequest{
+					PluginContext: backend.PluginContext{
+						PluginID: "pid",
+					},
+				}
+
+				responses := []*backend.CallResourceResponse{}
+				sender := callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
+					responses = append(responses, res)
+					return nil
+				})
+
+				p.RegisterClient(&fakePluginBackend{
+					crr: func(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+						return sender.Send(&backend.CallResourceResponse{
+							Headers: resHeaders,
+							Status:  tc.responseStatus,
+							Body:    []byte(backendResponse),
+						})
+					},
+				})
+				err := registry.Add(context.Background(), p)
+				require.NoError(t, err)
+
+				client := ProvideService(registry, &config.Cfg{})
+
+				err = client.CallResource(context.Background(), req, sender)
+				require.NoError(t, err)
+
+				require.Len(t, responses, 1)
+				res := responses[0]
+
+				if tc.expContentType != "" {
+					require.Equal(t, tc.expContentType, res.Headers[contentTypeHeaderName][0])
+				} else {
+					require.Empty(t, res.Headers[contentTypeHeaderName])
+				}
+			})
+		}
+	})
 }
 
 type fakePluginBackend struct {
diff --git a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
index 194b92832db..c902604d4c1 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
@@ -123,7 +123,7 @@ func (m *CachingMiddleware) CallResource(ctx context.Context, req *backend.CallR
 		return m.next.CallResource(ctx, req, sender)
 	}
 	// Otherwise, intercept the responses in a wrapped sender so we can cache them first
-	cacheSender := cachedSenderFunc(func(res *backend.CallResourceResponse) error {
+	cacheSender := callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
 		cr.UpdateCacheFn(ctx, res)
 		return sender.Send(res)
 	})
@@ -150,9 +150,3 @@ func (m *CachingMiddleware) PublishStream(ctx context.Context, req *backend.Publ
 func (m *CachingMiddleware) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
 	return m.next.RunStream(ctx, req, sender)
 }
-
-type cachedSenderFunc func(res *backend.CallResourceResponse) error
-
-func (fn cachedSenderFunc) Send(res *backend.CallResourceResponse) error {
-	return fn(res)
-}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware.go
new file mode 100644
index 00000000000..31d3095a4a7
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware.go
@@ -0,0 +1,65 @@
+package clientmiddleware
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/util/proxyutil"
+)
+
+// NewResourceResponseMiddleware creates a new plugins.ClientMiddleware
+// that will enforce HTTP header rules for backend.CallResourceResponse's.
+func NewResourceResponseMiddleware() plugins.ClientMiddleware {
+	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+		return &ResourceResponseMiddleware{
+			next: next,
+		}
+	})
+}
+
+type ResourceResponseMiddleware struct {
+	next plugins.Client
+}
+
+func (m *ResourceResponseMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	return m.next.QueryData(ctx, req)
+}
+
+func (m *ResourceResponseMiddleware) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	if req == nil || sender == nil {
+		return m.next.CallResource(ctx, req, sender)
+	}
+
+	processedStreams := 0
+	wrappedSender := callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
+		if processedStreams == 0 {
+			proxyutil.SetProxyResponseHeaders(res.Headers)
+		}
+
+		processedStreams++
+		return sender.Send(res)
+	})
+
+	return m.next.CallResource(ctx, req, wrappedSender)
+}
+
+func (m *ResourceResponseMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	return m.next.CheckHealth(ctx, req)
+}
+
+func (m *ResourceResponseMiddleware) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
+	return m.next.CollectMetrics(ctx, req)
+}
+
+func (m *ResourceResponseMiddleware) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	return m.next.SubscribeStream(ctx, req)
+}
+
+func (m *ResourceResponseMiddleware) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	return m.next.PublishStream(ctx, req)
+}
+
+func (m *ResourceResponseMiddleware) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	return m.next.RunStream(ctx, req, sender)
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware_test.go
new file mode 100644
index 00000000000..2e0fcf60f4b
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware_test.go
@@ -0,0 +1,41 @@
+package clientmiddleware
+
+import (
+	"context"
+	"net/http"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/plugins/manager/client/clienttest"
+	"github.com/stretchr/testify/require"
+)
+
+func TestResourceResponseMiddleware(t *testing.T) {
+	t.Run("Should set proxy response headers when calling CallResource", func(t *testing.T) {
+		crResp := &backend.CallResourceResponse{
+			Status: http.StatusOK,
+			Headers: map[string][]string{
+				"X-Custom": {"Should not be deleted"},
+			},
+		}
+		cdt := clienttest.NewClientDecoratorTest(t,
+			clienttest.WithMiddlewares(NewResourceResponseMiddleware()),
+			clienttest.WithResourceResponses([]*backend.CallResourceResponse{crResp}),
+		)
+
+		var sentResponse *backend.CallResourceResponse
+		sender := callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
+			sentResponse = res
+			return nil
+		})
+
+		err := cdt.Decorator.CallResource(context.Background(), &backend.CallResourceRequest{
+			PluginContext: backend.PluginContext{},
+		}, sender)
+		require.NoError(t, err)
+
+		require.NotNil(t, sentResponse)
+		require.Equal(t, "sandbox", sentResponse.Headers["Content-Security-Policy"][0])
+		require.Equal(t, "Should not be deleted", sentResponse.Headers["X-Custom"][0])
+	})
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/testing.go b/pkg/services/pluginsintegration/clientmiddleware/testing.go
index d26c462f388..6f5f06806e0 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/testing.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/testing.go
@@ -2,12 +2,6 @@ package clientmiddleware
 
 import "github.com/grafana/grafana-plugin-sdk-go/backend"
 
-type callResourceResponseSenderFunc func(res *backend.CallResourceResponse) error
-
-func (fn callResourceResponseSenderFunc) Send(res *backend.CallResourceResponse) error {
-	return fn(res)
-}
-
 var nopCallResourceSender = callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
 	return nil
 })
diff --git a/pkg/services/pluginsintegration/clientmiddleware/utils.go b/pkg/services/pluginsintegration/clientmiddleware/utils.go
new file mode 100644
index 00000000000..dc1f768532f
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/utils.go
@@ -0,0 +1,11 @@
+package clientmiddleware
+
+import (
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+)
+
+type callResourceResponseSenderFunc func(res *backend.CallResourceResponse) error
+
+func (fn callResourceResponseSenderFunc) Send(res *backend.CallResourceResponse) error {
+	return fn(res)
+}
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index 12770e78a81..c057567102f 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -114,6 +114,7 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken
 		clientmiddleware.NewClearAuthHeadersMiddleware(),
 		clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
 		clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
+		clientmiddleware.NewResourceResponseMiddleware(),
 	}
 
 	// Placing the new service implementation behind a feature flag until it is known to be stable

From 96a191e6436331f2c16181279813799e5d5945a6 Mon Sep 17 00:00:00 2001
From: Kate Brenner <32871890+katebrenner@users.noreply.github.com>
Date: Tue, 25 Apr 2023 12:19:19 -0600
Subject: [PATCH 405/729] Add link to building backend datasource (#63535)

* add link to building backend datasource

* Update docs/sources/tutorials/build-a-data-source-plugin/index.md

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>

* Add punctuation.

---------

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
---
 docs/sources/tutorials/build-a-data-source-plugin/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/sources/tutorials/build-a-data-source-plugin/index.md b/docs/sources/tutorials/build-a-data-source-plugin/index.md
index 271f019f4b0..700e621d4fa 100644
--- a/docs/sources/tutorials/build-a-data-source-plugin/index.md
+++ b/docs/sources/tutorials/build-a-data-source-plugin/index.md
@@ -38,6 +38,8 @@ In this tutorial, you'll:
 
 {{< docs/shared lookup="tutorials/create-plugin.md" source="grafana" version="latest" >}}
 
+To learn how to create a backend data source plugin, see [Build a data source backend plugin](/docs/grafana/latest/tutorials/build-a-data-source-backend-plugin).
+
 ## Anatomy of a plugin
 
 {{< docs/shared lookup="tutorials/plugin-anatomy.md" source="grafana" version="latest" >}}

From 17b8d28cae8d2ef431756d7679836d0d5ab47351 Mon Sep 17 00:00:00 2001
From: Kate Brenner <32871890+katebrenner@users.noreply.github.com>
Date: Tue, 25 Apr 2023 12:20:14 -0600
Subject: [PATCH 406/729] Update build a datasource plugin tutorial (#66381)

* update tutorial

* add punctuation
---
 .../sources/shared/tutorials/create-plugin.md |  4 +--
 .../build-a-data-source-plugin/index.md       | 32 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/docs/sources/shared/tutorials/create-plugin.md b/docs/sources/shared/tutorials/create-plugin.md
index 671154e09ba..4feda888c0a 100755
--- a/docs/sources/shared/tutorials/create-plugin.md
+++ b/docs/sources/shared/tutorials/create-plugin.md
@@ -31,10 +31,10 @@ Grafana [create-plugin tool](https://www.npmjs.com/package/@grafana/create-plugi
    ```
 
 1. Restart the Grafana server for Grafana to discover your plugin.
-1. Open Grafana and go to **Configuration** -> **Plugins**. Make sure that your plugin is there.
+1. Open Grafana and go to **Connections** -> **Connect Data**. Make sure that your data source is there.
 
 By default, Grafana logs whenever it discovers a plugin:
 
 ```
-INFO[01-01|12:00:00] Registering plugin       logger=plugins name=my-plugin
+INFO[01-01|12:00:00] Plugin registered       logger=plugin.loader pluginID=my-plugin
 ```
diff --git a/docs/sources/tutorials/build-a-data-source-plugin/index.md b/docs/sources/tutorials/build-a-data-source-plugin/index.md
index 700e621d4fa..f6a68a867ab 100644
--- a/docs/sources/tutorials/build-a-data-source-plugin/index.md
+++ b/docs/sources/tutorials/build-a-data-source-plugin/index.md
@@ -70,7 +70,7 @@ async testDatasource()
 
 ## Data frames
 
-Nowadays there are countless of different databases, each with their own ways of querying data. To be able to support all the different data formats, Grafana consolidates the data into a unified data structure called _data frames_.
+Nowadays there are countless different databases, each with their own ways of querying data. To be able to support all the different data formats, Grafana consolidates the data into a unified data structure called _data frames_.
 
 Let's see how to create and return a data frame from the `query` method. In this step, you'll change the code in the starter plugin to return a [sine wave](https://en.wikipedia.org/wiki/Sine_wave).
 
@@ -98,6 +98,14 @@ Let's see how to create and return a data frame from the `query` method. In this
    const query = defaults(target, defaultQuery);
    ```
 
+1. Create a default query at the top of datasource.ts:
+
+   ```ts
+   export const defaultQuery: Partial<MyQuery> = {
+     constant: 6.5,
+   };
+   ```
+
 1. Create a data frame with a time field and a number field:
 
    ```ts
@@ -190,19 +198,19 @@ Now that you've defined the query model you wish to support, the next step is to
    **QueryEditor.tsx**
 
    ```ts
-   const query = defaults(this.props.query, defaultQuery);
    const { queryText, constant, frequency } = query;
    ```
 
    ```ts
-   <FormField width={4} value={frequency} onChange={this.onFrequencyChange} label="Frequency" type="number" />
+   <InlineField label="Frequency" labelWidth={16}>
+     <Input onChange={onFrequencyChange} value={frequency} />
+   </InlineField>
    ```
 
 1. Add a event listener for the new property.
 
    ```ts
-   onFrequencyChange = (event: ChangeEvent<HTMLInputElement>) => {
-     const { onChange, query, onRunQuery } = this.props;
+   const onFrequencyChange = (event: ChangeEvent<HTMLInputElement>) => {
      onChange({ ...query, frequency: parseFloat(event.target.value) });
      // executes the query
      onRunQuery();
@@ -255,21 +263,15 @@ Just like query editor, the form field in the config editor calls the registered
    **ConfigEditor.tsx**
 
    ```ts
-   <div className="gf-form">
-     <FormField
-       label="Resolution"
-       onChange={this.onResolutionChange}
-       value={jsonData.resolution || ''}
-       placeholder="Enter a number"
-     />
-   </div>
+   <InlineField label="Resolution" labelWidth={12}>
+     <Input onChange={onResolutionChange} value={jsonData.resolution || ''} placeholder="Enter a number" width={40} />
+   </InlineField>
    ```
 
 1. Add a event listener for the new option.
 
    ```ts
-   onResolutionChange = (event: ChangeEvent<HTMLInputElement>) => {
-     const { onOptionsChange, options } = this.props;
+   const onResolutionChange = (event: ChangeEvent<HTMLInputElement>) => {
      const jsonData = {
        ...options.jsonData,
        resolution: parseFloat(event.target.value),

From ad964a0e1da32261852f6b59baa74ed2785c8a78 Mon Sep 17 00:00:00 2001
From: Stefan Dunkler <stefan.dun@gmail.com>
Date: Tue, 25 Apr 2023 20:32:40 +0200
Subject: [PATCH 407/729] Update Screenshot (#67233)

---
 .../panels-visualizations/visualizations/traces/index.md        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/panels-visualizations/visualizations/traces/index.md b/docs/sources/panels-visualizations/visualizations/traces/index.md
index d41ea94a2b5..20537e35f69 100644
--- a/docs/sources/panels-visualizations/visualizations/traces/index.md
+++ b/docs/sources/panels-visualizations/visualizations/traces/index.md
@@ -23,4 +23,4 @@ For more information about traces and how to use them, refer to the following do
 - [Tracing in Explore]({{< relref "../../../explore/trace-integration/" >}})
 - [Getting started with Tempo](/docs/tempo/latest/getting-started)
 
-{{< figure src="/static/img/docs/explore/explore-trace-view-full-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the trace view" >}}
+{{< figure src="/static/img/docs/explore/trace-view-9-4.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the trace view" >}}

From 581cc85ba53f3aa4bae8ee89af96fea0b0608439 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Tue, 25 Apr 2023 21:07:16 +0200
Subject: [PATCH 408/729] Add analytics to new DS picker and onboarding
 experience (#67060)

* Add analytics to ds picker advanced mode

* Add analytics to ds picker dropdown
---
 .../components/picker/DataSourceDropdown.tsx  | 28 ++++++---
 .../components/picker/DataSourceModal.tsx     | 63 +++++++++++++++++--
 2 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index 01436e506e8..29c9c63b814 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -6,6 +6,7 @@ import React, { useCallback, useRef, useState } from 'react';
 import { usePopper } from 'react-popper';
 
 import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 import { DataSourceJsonData } from '@grafana/schema';
 import { Button, CustomScrollbar, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
 import config from 'app/core/config';
@@ -18,6 +19,14 @@ import { DataSourceModal } from './DataSourceModal';
 import { PickerContentProps, DataSourceDropdownProps } from './types';
 import { dataSourceLabel } from './utils';
 
+const INTERACTION_EVENT_NAME = 'dashboards_dspicker_clicked';
+const INTERACTION_ITEM = {
+  OPEN_DROPDOWN: 'open_dspicker',
+  SELECT_DS: 'select_ds',
+  ADD_FILE: 'add_file',
+  OPEN_ADVANCED_DS_PICKER: 'open_advanced_ds_picker',
+};
+
 export function DataSourceDropdown(props: DataSourceDropdownProps) {
   const { current, onChange, ...restProps } = props;
 
@@ -25,6 +34,10 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
   const [markerElement, setMarkerElement] = useState<HTMLInputElement | null>();
   const [selectorElement, setSelectorElement] = useState<HTMLDivElement | null>();
   const [filterTerm, setFilterTerm] = useState<string>();
+  const openDropdown = () => {
+    reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_DROPDOWN });
+    setOpen(true);
+  };
 
   const currentDataSourceInstanceSettings = useDatasource(current);
 
@@ -93,20 +106,13 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
           </Portal>
         </FocusScope>
       ) : (
-        <div
-          className={styles.trigger}
-          onClick={() => {
-            setOpen(true);
-          }}
-        >
+        <div className={styles.trigger} onClick={openDropdown}>
           <Input
             className={styles.input}
             prefix={<DataSourceLogo dataSource={currentDataSourceInstanceSettings} />}
             suffix={<Icon name="angle-down" />}
             value={dataSourceLabel(currentDataSourceInstanceSettings)}
-            onFocus={() => {
-              setOpen(true);
-            }}
+            onFocus={openDropdown}
           />
         </div>
       )}
@@ -135,6 +141,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
   const changeCallback = useCallback(
     (ds: DataSourceInstanceSettings<DataSourceJsonData>) => {
       onChange(ds);
+      reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.SELECT_DS, ds_type: ds.type });
     },
     [onChange]
   );
@@ -142,6 +149,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
   const clickAddCSVCallback = useCallback(() => {
     onClickAddCSV?.();
     onClose();
+    reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.ADD_FILE });
   }, [onClickAddCSV, onClose]);
 
   const styles = useStyles2(getStylesPickerContent);
@@ -176,6 +184,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
                 showModal(DataSourceModal, {
                   enableFileUpload: props.enableFileUpload,
                   fileUploadOptions: props.fileUploadOptions,
+                  reportedInteractionFrom: 'ds_picker',
                   current,
                   onDismiss: hideModal,
                   onChange: (ds) => {
@@ -183,6 +192,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
                     hideModal();
                   },
                 });
+                reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_ADVANCED_DS_PICKER });
               }}
             >
               Open advanced data source picker
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index a51c04b04e6..4c18c10b66a 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -1,8 +1,10 @@
 import { css } from '@emotion/css';
+import { once } from 'lodash';
 import React, { useState } from 'react';
 import { DropzoneOptions } from 'react-dropzone';
 
 import { DataSourceInstanceSettings, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 import {
   Modal,
   FileDropzone,
@@ -20,6 +22,15 @@ import { DATASOURCES_ROUTES } from 'app/features/datasources/constants';
 
 import { DataSourceList } from './DataSourceList';
 
+const INTERACTION_EVENT_NAME = 'dashboards_dspickermodal_clicked';
+const INTERACTION_ITEM = {
+  SELECT_DS: 'select_ds',
+  UPLOAD_FILE: 'upload_file',
+  CONFIG_NEW_DS: 'config_new_ds',
+  SEARCH: 'search',
+  DISMISS: 'dismiss',
+};
+
 interface DataSourceModalProps {
   onChange: (ds: DataSourceInstanceSettings) => void;
   current: DataSourceRef | string | null | undefined;
@@ -27,6 +38,7 @@ interface DataSourceModalProps {
   recentlyUsed?: string[];
   enableFileUpload?: boolean;
   fileUploadOptions?: DropzoneOptions;
+  reportedInteractionFrom?: string;
 }
 
 export function DataSourceModal({
@@ -35,13 +47,36 @@ export function DataSourceModal({
   onChange,
   current,
   onDismiss,
+  reportedInteractionFrom,
 }: DataSourceModalProps) {
   const styles = useStyles2(getDataSourceModalStyles);
   const [search, setSearch] = useState('');
+  const analyticsInteractionSrc = reportedInteractionFrom || 'modal';
   const newDataSourceURL = config.featureToggles.dataConnectionsConsole
     ? CONNECTIONS_ROUTES.DataSourcesNew
     : DATASOURCES_ROUTES.New;
 
+  const onDismissModal = () => {
+    onDismiss();
+    reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.DISMISS, src: analyticsInteractionSrc });
+  };
+  const onChangeDataSource = (ds: DataSourceInstanceSettings) => {
+    onChange(ds);
+    reportInteraction(INTERACTION_EVENT_NAME, {
+      item: INTERACTION_ITEM.SELECT_DS,
+      ds_type: ds.type,
+      src: analyticsInteractionSrc,
+    });
+  };
+  // Memoizing to keep once() cached so it avoids reporting multiple times
+  const reportSearchUsageOnce = React.useMemo(
+    () =>
+      once(() => {
+        reportInteraction(INTERACTION_EVENT_NAME, { item: 'search', src: analyticsInteractionSrc });
+      }),
+    [analyticsInteractionSrc]
+  );
+
   return (
     <Modal
       title="Select data source"
@@ -50,8 +85,8 @@ export function DataSourceModal({
       isOpen={true}
       className={styles.modal}
       contentClassName={styles.modalContent}
-      onClickBackdrop={onDismiss}
-      onDismiss={onDismiss}
+      onClickBackdrop={onDismissModal}
+      onDismiss={onDismissModal}
     >
       <div className={styles.leftColumn}>
         <Input
@@ -59,7 +94,10 @@ export function DataSourceModal({
           value={search}
           prefix={<Icon name="search" />}
           placeholder="Search data source"
-          onChange={(e) => setSearch(e.currentTarget.value)}
+          onChange={(e) => {
+            setSearch(e.currentTarget.value);
+            reportSearchUsageOnce();
+          }}
         />
         <CustomScrollbar>
           <DataSourceList
@@ -67,7 +105,7 @@ export function DataSourceModal({
             mixed={false}
             variables
             filter={(ds) => ds.name.includes(search) && !ds.meta.builtIn}
-            onChange={onChange}
+            onChange={onChangeDataSource}
             current={current}
           />
         </CustomScrollbar>
@@ -79,7 +117,7 @@ export function DataSourceModal({
             filter={(ds) => !!ds.meta.builtIn}
             dashboard
             mixed
-            onChange={onChange}
+            onChange={onChangeDataSource}
             current={current}
           />
           {enableFileUpload && (
@@ -94,6 +132,10 @@ export function DataSourceModal({
                 onDrop: (...args) => {
                   fileUploadOptions?.onDrop?.(...args);
                   onDismiss();
+                  reportInteraction(INTERACTION_EVENT_NAME, {
+                    item: INTERACTION_ITEM.UPLOAD_FILE,
+                    src: analyticsInteractionSrc,
+                  });
                 },
               }}
             >
@@ -102,7 +144,16 @@ export function DataSourceModal({
           )}
         </div>
         <div className={styles.dsCTAs}>
-          <LinkButton variant="secondary" href={newDataSourceURL}>
+          <LinkButton
+            variant="secondary"
+            href={newDataSourceURL}
+            onClick={() => {
+              reportInteraction(INTERACTION_EVENT_NAME, {
+                item: INTERACTION_ITEM.CONFIG_NEW_DS,
+                src: analyticsInteractionSrc,
+              });
+            }}
+          >
             Configure a new data source
           </LinkButton>
         </div>

From ff617722182aa75421bb4df3d69d069844839d82 Mon Sep 17 00:00:00 2001
From: oneoneonepig <oneoneonepig@users.noreply.github.com>
Date: Wed, 26 Apr 2023 03:13:26 +0800
Subject: [PATCH 409/729] Doc: Fix typo (#66929)

Update index.md
---
 .../setup-grafana/image-rendering/troubleshooting/index.md      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/setup-grafana/image-rendering/troubleshooting/index.md b/docs/sources/setup-grafana/image-rendering/troubleshooting/index.md
index 20d075dfcaf..0abf7cf64a3 100644
--- a/docs/sources/setup-grafana/image-rendering/troubleshooting/index.md
+++ b/docs/sources/setup-grafana/image-rendering/troubleshooting/index.md
@@ -114,7 +114,7 @@ If this happens, then you have to add the certificate to the trust store. If you
 
 ```
 [root@server ~]# [ -d /usr/share/grafana/.pki/nssdb ] || mkdir -p /usr/share/grafana/.pki/nssdb
-[root@merver ~]# certutil -d sql:/usr/share/grafana/.pki/nssdb -A -n internal-root-ca -t C -i /etc/pki/tls/certs/internal-root-ca.crt.pem
+[root@server ~]# certutil -d sql:/usr/share/grafana/.pki/nssdb -A -n internal-root-ca -t C -i /etc/pki/tls/certs/internal-root-ca.crt.pem
 [root@server ~]# chown -R grafana: /usr/share/grafana/.pki/nssdb
 ```
 

From 6e4fe51fe8f0da7719eb933ef77c6e8b46dae126 Mon Sep 17 00:00:00 2001
From: Sarah Zinger <sarah.zinger@grafana.com>
Date: Tue, 25 Apr 2023 16:07:58 -0400
Subject: [PATCH 410/729] Cloudwatch Logs: Update Cheatsheet (#67161)

Cloudwatch: Update Cheatsheet
---
 .../cloudwatch/components/LogsCheatSheet.tsx  | 327 +++++++++++++-----
 1 file changed, 243 insertions(+), 84 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/components/LogsCheatSheet.tsx b/public/app/plugins/datasource/cloudwatch/components/LogsCheatSheet.tsx
index f0d816e6941..880639b00b3 100644
--- a/public/app/plugins/datasource/cloudwatch/components/LogsCheatSheet.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/LogsCheatSheet.tsx
@@ -1,9 +1,9 @@
 import { css, cx } from '@emotion/css';
 import { stripIndent, stripIndents } from 'common-tags';
 import Prism from 'prismjs';
-import React, { PureComponent } from 'react';
+import React, { useState } from 'react';
 
-import { QueryEditorHelpProps } from '@grafana/data';
+import { Collapse } from '@grafana/ui';
 import { flattenTokens } from '@grafana/ui/src/slate-plugins/slate-prism';
 
 import tokenizer from '../language/cloudwatch-logs/syntax';
@@ -12,12 +12,13 @@ import { CloudWatchQuery } from '../types';
 interface QueryExample {
   category: string;
   examples: Array<{
-    title: string;
+    title?: string;
+    description?: string;
     expr: string;
   }>;
 }
 
-const CLIQ_EXAMPLES: QueryExample[] = [
+const QUERIES: QueryExample[] = [
   {
     category: 'Lambda',
     examples: [
@@ -28,19 +29,19 @@ const CLIQ_EXAMPLES: QueryExample[] = [
       },
       {
         title: 'Determine the amount of overprovisioned memory',
-        expr: stripIndent`
-        filter @type = "REPORT" |
-        stats max(@memorySize / 1024 / 1024) as provisonedMemoryMB,
-              min(@maxMemoryUsed / 1024 / 1024) as smallestMemoryRequestMB,
-              avg(@maxMemoryUsed / 1024 / 1024) as avgMemoryUsedMB,
-              max(@maxMemoryUsed / 1024 / 1024) as maxMemoryUsedMB,
-              provisonedMemoryMB - maxMemoryUsedMB as overProvisionedMB`,
+        expr: stripIndent`filter @type = "REPORT"
+        | stats max(@memorySize / 1000 / 1000) as provisionedMemoryMB,
+          min(@maxMemoryUsed / 1000 / 1000) as smallestMemoryRequestMB,
+          avg(@maxMemoryUsed / 1000 / 1000) as avgMemoryUsedMB,
+          max(@maxMemoryUsed / 1000 / 1000) as maxMemoryUsedMB,
+          provisionedMemoryMB - maxMemoryUsedMB as overProvisionedMB
+        `,
       },
       {
         title: 'Find the most expensive requests',
-        expr: stripIndents`filter @type = "REPORT" |
-                           fields @requestId, @billedDuration |
-                           sort by @billedDuration desc`,
+        expr: stripIndents`filter @type = "REPORT"
+        | fields @requestId, @billedDuration
+        | sort by @billedDuration desc`,
       },
     ],
   },
@@ -69,6 +70,18 @@ const CLIQ_EXAMPLES: QueryExample[] = [
                            sort numRejections desc |
                            limit 20`,
       },
+      {
+        title: 'Find the top 15 packet transfers across hosts',
+        expr: stripIndents`stats sum(packets) as packetsTransferred by srcAddr, dstAddr
+        | sort packetsTransferred  desc
+        | limit 15`,
+      },
+      {
+        title: 'Find the IP addresses where flow records were skipped during the capture window',
+        expr: stripIndents`filter logStatus="SKIPDATA"
+        | stats count(*) by bin(1h) as t
+        | sort t`,
+      },
     ],
   },
   {
@@ -91,6 +104,26 @@ const CLIQ_EXAMPLES: QueryExample[] = [
         expr: stripIndents`filter eventName="CreateUser" |
                            fields awsRegion, requestParameters.userName, responseElements.user.arn`,
       },
+      {
+        title: 'Find EC2 hosts that were started or stopped in a given AWS Region',
+        expr: stripIndents`filter (eventName="StartInstances" or eventName="StopInstances") and region="us-east-2"`,
+      },
+      {
+        title: 'Find the number of records where an exception occurred while invoking the UpdateTrail API',
+        expr: stripIndents`filter eventName="UpdateTrail" and ispresent(errorCode) | stats count(*) by errorCode, errorMessage`,
+      },
+      {
+        title: 'Find log entries where TLS 1.0 or 1.1 was used',
+        expr: stripIndents`filter tlsDetails.tlsVersion in [ "TLSv1", "TLSv1.1" ]
+        | stats count(*) as numOutdatedTlsCalls by userIdentity.accountId, recipientAccountId, eventSource, eventName, awsRegion, tlsDetails.tlsVersion, tlsDetails.cipherSuite, userAgent
+        | sort eventSource, eventName, awsRegion, tlsDetails.tlsVersion`,
+      },
+      {
+        title: 'Find the number of calls per service that used TLS versions 1.0 or 1.1',
+        expr: stripIndents`filter tlsDetails.tlsVersion in [ "TLSv1", "TLSv1.1" ]
+        | stats count(*) as numOutdatedTlsCalls by eventSource
+        | sort numOutdatedTlsCalls desc`,
+      },
     ],
   },
   {
@@ -112,6 +145,49 @@ const CLIQ_EXAMPLES: QueryExample[] = [
         title: 'List of log events that are not exceptions',
         expr: 'fields @message | filter @message not like /Exception/',
       },
+      {
+        title: 'To parse and count fields',
+        expr: stripIndents`fields @timestamp, @message
+        | filter @message like /User ID/
+        | parse @message "User ID: *" as @userId
+        | stats count(*) by @userId`,
+      },
+      {
+        title: 'To Identify faults on any API calls',
+        expr: stripIndents`filter Operation = <operation> AND Fault > 0
+        | fields @timestamp, @logStream as instanceId, ExceptionMessage`,
+      },
+      {
+        title:
+          'To get the number of exceptions logged every 5 minutes using regex where exception is not case sensitive',
+        expr: stripIndents`filter @message like /(?i)Exception/
+        | stats count(*) as exceptionCount by bin(5m)
+        | sort exceptionCount desc`,
+      },
+      {
+        title: 'To parse ephemeral fields using a glob expression',
+        expr: stripIndents`parse @message "user=*, method:*, latency := *" as @user, @method, @latency
+        | stats avg(@latency) by @method, @user`,
+      },
+      {
+        title: 'To parse ephemeral fields using a glob expression using regular expression',
+        expr: stripIndents`parse @message /user=(?<user2>.*?), method:(?<method2>.*?), latency := (?<latency2>.*?)/
+        | stats avg(latency2) by @method2, @user2`,
+      },
+      {
+        title: 'To extract ephemeral fields and display field for events that contain an ERROR string',
+        expr: stripIndents`fields @message
+        | parse @message "* [*] *" as loggingTime, loggingType, loggingMessage
+        | filter loggingType IN ["ERROR"]
+        | display loggingMessage, loggingType = "ERROR" as isError`,
+      },
+      {
+        title: 'To trim whitespaces from query results',
+        expr: stripIndents`fields trim(@message) as trimmedMessage
+        | parse trimmedMessage "[*] * * Retrieving CloudWatch Metrics for AccountID : *, CloudWatch Metric : *, Resource Type : *, ResourceID : *" as level, time, logId, accountId, metric, type, resourceId
+        | display level, time, logId, accountId, metric, type, resourceId
+        | filter level like "INFO"`,
+      },
     ],
   },
   {
@@ -126,7 +202,7 @@ const CLIQ_EXAMPLES: QueryExample[] = [
         expr: 'filter responseCode="SERVFAIL" | stats count(*) by queryName',
       },
       {
-        title: 'Number of requests received every 10  minutes by edge location',
+        title: 'Top 10 DNS resolver IPs with highest number of requests',
         expr: 'stats count(*) as numRequests by resolverIp | sort numRequests desc | limit 10',
       },
     ],
@@ -193,6 +269,68 @@ const CLIQ_EXAMPLES: QueryExample[] = [
   },
 ];
 
+const COMMANDS: QueryExample[] = [
+  {
+    category: 'fields',
+    examples: [
+      {
+        description:
+          'Retrieve one or more log fields. You can also use functions and operations such as abs(a+b), sqrt(a/b), log(a)+log(b), strlen(trim()), datefloor(), isPresent(), and others in this command.',
+        expr: 'fields @log, @logStream, @message, @timestamp',
+      },
+    ],
+  },
+  {
+    category: 'filter',
+    examples: [
+      {
+        description:
+          'Retrieve log fields based on one or more conditions. You can use comparison operators such as =, !=, >, >=, <, <=, boolean operators such as and, or, and not, and regular expressions in this command.',
+        expr: 'filter @message like /(?i)(Exception|error|fail|5dd)/',
+      },
+    ],
+  },
+  {
+    category: 'stats',
+    examples: [
+      {
+        description: 'Calculate aggregate statistics such as sum(), avg(), count(), min() and max() for log fields.',
+        expr: 'stats count() by bin(5m)',
+      },
+    ],
+  },
+  {
+    category: 'sort',
+    examples: [
+      {
+        description: 'Sort the log fields in ascending or descending order.',
+        expr: 'sort @timestamp asc',
+      },
+    ],
+  },
+  {
+    category: 'limit',
+    examples: [
+      {
+        description: 'Limit the number of log events returned by a query.',
+        expr: 'limit 10',
+      },
+    ],
+  },
+  {
+    category: 'parse',
+    examples: [
+      {
+        description:
+          'Create one or more ephemeral fields, which can be further processed by the query. The following example will extract the ephemeral fields host, identity, dateTimeString, httpVerb, url, protocol, statusCode, bytes from @message, and return the url, max(bytes), and avg(bytes) fields sorted by max(bytes) in descending order.',
+        expr: stripIndents`parse '* - * [*] "* * *" * *' as host, identity, dateTimeString, httpVerb, url, protocol, statusCode, bytes
+        | stats max(bytes) as maxBytes, avg(bytes) by url
+        | sort maxBytes desc`,
+      },
+    ],
+  },
+];
+
 function renderHighlightedMarkup(code: string, keyPrefix: string) {
   const grammar = tokenizer;
   const tokens = flattenTokens(Prism.tokenize(code, grammar));
@@ -220,83 +358,104 @@ const link = css`
   text-decoration: underline;
 `;
 
-export default class LogsCheatSheet extends PureComponent<
-  QueryEditorHelpProps<CloudWatchQuery>,
-  { userExamples: string[] }
-> {
-  onClickExample(query: CloudWatchQuery) {
-    this.props.onClickExample(query);
-  }
-  renderExpression(expr: string, keyPrefix: string) {
-    return (
-      <button
-        type="button"
-        className="cheat-sheet-item__example"
-        key={expr}
-        onClick={() =>
-          this.onClickExample({
-            refId: this.props.query.refId ?? 'A',
-            expression: expr,
-            queryMode: 'Logs',
-            region: this.props.query.region,
-            id: this.props.query.refId ?? 'A',
-            logGroupNames: 'logGroupNames' in this.props.query ? this.props.query.logGroupNames : [],
-            logGroups: 'logGroups' in this.props.query ? this.props.query.logGroups : [],
-          })
-        }
+type Props = {
+  onClickExample: (query: CloudWatchQuery) => void;
+  query: CloudWatchQuery;
+};
+
+const LogsCheatSheet = (props: Props) => {
+  const [isCommandsOpen, setIsCommandsOpen] = useState(false);
+  const [isQueriesOpen, setIsQueriesOpen] = useState(false);
+
+  return (
+    <div>
+      <h3>CloudWatch Logs cheat sheet</h3>
+      <Collapse
+        label="Commands"
+        collapsible={true}
+        isOpen={isCommandsOpen}
+        onToggle={(isOpen) => setIsCommandsOpen(isOpen)}
       >
-        <pre>{renderHighlightedMarkup(expr, keyPrefix)}</pre>
-      </button>
-    );
-  }
-
-  renderLogsCheatSheet() {
-    return (
-      <div>
-        <h2>CloudWatch Logs Cheat Sheet</h2>
-        {CLIQ_EXAMPLES.map((cat, i) => (
-          <div key={`${cat.category}-${i}`}>
-            <div className={`cheat-sheet-item__title ${cx(exampleCategory)}`}>{cat.category}</div>
-            {cat.examples.map((item, j) => (
-              <div className="cheat-sheet-item" key={`item-${j}`}>
-                <h4>{item.title}</h4>
-                {this.renderExpression(item.expr, `item-${j}`)}
-              </div>
-            ))}
-          </div>
-        ))}
-      </div>
-    );
-  }
-
-  render() {
-    return (
-      <div>
-        <h3>CloudWatch Logs cheat sheet</h3>
-        {CLIQ_EXAMPLES.map((cat, i) => (
+        <>
+          {COMMANDS.map((cat, i) => (
+            <div key={`cat-${i}`}>
+              <h5>{cat.category}</h5>
+              {cat.examples.map((item, j) => (
+                <div key={`item-${j}`}>
+                  <p>{item.description}</p>
+                  <button
+                    type="button"
+                    className="cheat-sheet-item__example"
+                    key={item.expr}
+                    onClick={() =>
+                      props.onClickExample({
+                        refId: props.query.refId ?? 'A',
+                        expression: item.expr,
+                        queryMode: 'Logs',
+                        region: props.query.region,
+                        id: props.query.refId ?? 'A',
+                        logGroupNames: 'logGroupNames' in props.query ? props.query.logGroupNames : [],
+                        logGroups: 'logGroups' in props.query ? props.query.logGroups : [],
+                      })
+                    }
+                  >
+                    <pre>{renderHighlightedMarkup(item.expr, `item-${j}`)}</pre>
+                  </button>
+                </div>
+              ))}
+            </div>
+          ))}
+        </>
+      </Collapse>
+      <Collapse
+        label="Queries"
+        collapsible={true}
+        isOpen={isQueriesOpen}
+        onToggle={(isOpen) => setIsQueriesOpen(isOpen)}
+      >
+        {QUERIES.map((cat, i) => (
           <div key={`cat-${i}`}>
             <div className={`cheat-sheet-item__title ${cx(exampleCategory)}`}>{cat.category}</div>
             {cat.examples.map((item, j) => (
               <div className="cheat-sheet-item" key={`item-${j}`}>
                 <h4>{item.title}</h4>
-                {this.renderExpression(item.expr, `item-${j}`)}
+                <button
+                  type="button"
+                  className="cheat-sheet-item__example"
+                  key={item.expr}
+                  onClick={() =>
+                    props.onClickExample({
+                      refId: props.query.refId ?? 'A',
+                      expression: item.expr,
+                      queryMode: 'Logs',
+                      region: props.query.region,
+                      id: props.query.refId ?? 'A',
+                      logGroupNames: 'logGroupNames' in props.query ? props.query.logGroupNames : [],
+                      logGroups: 'logGroups' in props.query ? props.query.logGroups : [],
+                    })
+                  }
+                >
+                  <pre>{renderHighlightedMarkup(item.expr, `item-${j}`)}</pre>
+                </button>
               </div>
             ))}
           </div>
         ))}
-        <div>
-          If you are seeing masked data, you may have CloudWatch logs data protection enabled.{' '}
-          <a
-            className={cx(link)}
-            href="https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/#cloudwatch-logs-data-protection"
-            target="_blank"
-            rel="noreferrer"
-          >
-            See documentation for details
-          </a>
-          .
-        </div>
+      </Collapse>
+      <div>
+        Note: If you are seeing masked data, you may have CloudWatch logs data protection enabled.{' '}
+        <a
+          className={cx(link)}
+          href="https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/#cloudwatch-logs-data-protection"
+          target="_blank"
+          rel="noreferrer"
+        >
+          See documentation for details
+        </a>
+        .
       </div>
-    );
-  }
-}
+    </div>
+  );
+};
+
+export default LogsCheatSheet;

From 926abcf6aa943662a54c0f82aa39b09f9b512265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 26 Apr 2023 07:03:44 +0200
Subject: [PATCH 411/729] Scenes: Update scenes to v6 (#67110)

* Scenes: Update scenes to v6

* Fix test
---
 package.json                                       |  2 +-
 public/app/features/scenes/ScenePage.tsx           |  3 ++-
 .../features/scenes/dashboard/DashboardScene.tsx   | 14 +-------------
 .../features/scenes/dashboard/DashboardsLoader.ts  |  3 ++-
 yarn.lock                                          | 12 ++++++------
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index bc82aae9c75..2ac4b9dc47d 100644
--- a/package.json
+++ b/package.json
@@ -262,7 +262,7 @@
     "@grafana/lezer-logql": "0.1.3",
     "@grafana/monaco-logql": "^0.0.7",
     "@grafana/runtime": "workspace:*",
-    "@grafana/scenes": "^0.3.0",
+    "@grafana/scenes": "^0.6.0",
     "@grafana/schema": "workspace:*",
     "@grafana/ui": "workspace:*",
     "@kusto/monaco-kusto": "5.3.6",
diff --git a/public/app/features/scenes/ScenePage.tsx b/public/app/features/scenes/ScenePage.tsx
index b755d11491b..eacdd2ae720 100644
--- a/public/app/features/scenes/ScenePage.tsx
+++ b/public/app/features/scenes/ScenePage.tsx
@@ -1,6 +1,7 @@
 // Libraries
 import React, { useEffect, useState } from 'react';
 
+import { getUrlSyncManager } from '@grafana/scenes';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
 import { getSceneByTitle } from './scenes';
@@ -13,7 +14,7 @@ export const ScenePage = (props: Props) => {
 
   useEffect(() => {
     if (scene && !isInitialized) {
-      scene.initUrlSync();
+      getUrlSyncManager().initSync(scene);
       setInitialized(true);
     }
   }, [isInitialized, scene]);
diff --git a/public/app/features/scenes/dashboard/DashboardScene.tsx b/public/app/features/scenes/dashboard/DashboardScene.tsx
index 88ab5308405..2f0d2967dc7 100644
--- a/public/app/features/scenes/dashboard/DashboardScene.tsx
+++ b/public/app/features/scenes/dashboard/DashboardScene.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
-import { UrlSyncManager, SceneObjectBase, SceneComponentProps, SceneObject, SceneObjectState } from '@grafana/scenes';
+import { SceneObjectBase, SceneComponentProps, SceneObject, SceneObjectState } from '@grafana/scenes';
 import { ToolbarButton, useStyles2 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { Page } from 'app/core/components/Page/Page';
@@ -18,18 +18,6 @@ interface DashboardSceneState extends SceneObjectState {
 
 export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
   public static Component = DashboardSceneRenderer;
-  private urlSyncManager?: UrlSyncManager;
-
-  /**
-   * It's better to do this before activate / mount to not trigger unnessary re-renders
-   */
-  public initUrlSync() {
-    if (!this.urlSyncManager) {
-      this.urlSyncManager = new UrlSyncManager(this);
-    }
-
-    this.urlSyncManager.initSync();
-  }
 }
 
 function DashboardSceneRenderer({ model }: SceneComponentProps<DashboardScene>) {
diff --git a/public/app/features/scenes/dashboard/DashboardsLoader.ts b/public/app/features/scenes/dashboard/DashboardsLoader.ts
index 0d3c537e1dd..ef173ca8595 100644
--- a/public/app/features/scenes/dashboard/DashboardsLoader.ts
+++ b/public/app/features/scenes/dashboard/DashboardsLoader.ts
@@ -23,6 +23,7 @@ import {
   SceneDataTransformer,
   SceneGridItem,
   SceneDataProvider,
+  getUrlSyncManager,
 } from '@grafana/scenes';
 import { StateManagerBase } from 'app/core/services/StateManagerBase';
 import { dashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
@@ -75,7 +76,7 @@ export class DashboardLoader extends StateManagerBase<DashboardLoaderState> {
 
     // We initialize URL sync here as it better to do that before mounting and doing any rendering.
     // But would be nice to have a conditional around this so you can pre-load dashboards without url sync.
-    dashboard.initUrlSync();
+    getUrlSyncManager().initSync(dashboard);
 
     this.cache[rsp.dashboard.uid] = dashboard;
     this.setState({ dashboard, isLoading: false });
diff --git a/yarn.lock b/yarn.lock
index e36c41e01f9..20f98a90e43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3342,9 +3342,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/scenes@npm:^0.3.0":
-  version: 0.0.0-use.local
-  resolution: "@grafana/scenes@npm:0.3.0"
+"@grafana/scenes@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@grafana/scenes@npm:0.6.0"
   dependencies:
     "@grafana/e2e-selectors": canary
     "@grafana/experimental": 1.0.1
@@ -3352,9 +3352,9 @@ __metadata:
     react-use: 17.4.0
     react-virtualized-auto-sizer: 1.0.7
     uuid: ^9.0.0
-  checksum: 3610cedcc150b9d6e3d6948056bb1bbbfe58d7fa0ff6e762eec6619bb0940504db867ea87e56160f27e4d93772f6203493bf87d353a1b18d2664e74a03f03a05
+  checksum: 7197abac93ba84711900b526f0caa648b0b9f0c0e2edea2fbc125c1f192d6a3dae52389007cf82cbdf06a7b8019e5c03b5efa635f12ebc51eab5852cddf6427e
   languageName: node
-  linkType: soft
+  linkType: hard
 
 "@grafana/schema@10.0.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
   version: 0.0.0-use.local
@@ -20169,7 +20169,7 @@ __metadata:
     "@grafana/lezer-logql": 0.1.3
     "@grafana/monaco-logql": ^0.0.7
     "@grafana/runtime": "workspace:*"
-    "@grafana/scenes": ^0.3.0
+    "@grafana/scenes": ^0.6.0
     "@grafana/schema": "workspace:*"
     "@grafana/toolkit": "workspace:*"
     "@grafana/tsconfig": ^1.2.0-rc1

From 044d7f61c7e507845eb476e9e306957ee0b9295c Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Wed, 26 Apr 2023 09:08:32 +0200
Subject: [PATCH 412/729] DataSourcePicker: fix flickering datasource dropdown
 (#67206)

* fix flickering

* refactor onClose/onOpen

* do not set value of input, make the placeholder look like the value instead

* Show search icon when the dropdown is open

---------

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
---
 .../components/picker/DataSourceDropdown.tsx  | 103 +++++++++---------
 1 file changed, 49 insertions(+), 54 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index 29c9c63b814..2ae3ac8900f 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -1,6 +1,5 @@
 import { css } from '@emotion/css';
 import { useDialog } from '@react-aria/dialog';
-import { FocusScope } from '@react-aria/focus';
 import { useOverlay } from '@react-aria/overlays';
 import React, { useCallback, useRef, useState } from 'react';
 import { usePopper } from 'react-popper';
@@ -37,6 +36,7 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
   const openDropdown = () => {
     reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_DROPDOWN });
     setOpen(true);
+    markerElement?.focus();
   };
 
   const currentDataSourceInstanceSettings = useDatasource(current);
@@ -45,13 +45,15 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
     placement: 'bottom-start',
   });
 
+  const onClose = useCallback(() => {
+    setOpen(false);
+    markerElement?.blur();
+  }, [setOpen, markerElement]);
+
   const ref = useRef<HTMLDivElement>(null);
   const { overlayProps, underlayProps } = useOverlay(
     {
-      onClose: () => {
-        setFilterTerm(undefined);
-        setOpen(false);
-      },
+      onClose: onClose,
       isDismissable: true,
       isOpen,
       shouldCloseOnInteractOutside: (element) => {
@@ -66,56 +68,46 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
 
   return (
     <div className={styles.container}>
+      <div tabIndex={0} onFocus={openDropdown} role={'button'} className={styles.trigger} onClick={openDropdown}>
+        <Input
+          className={isOpen ? undefined : styles.input}
+          prefix={
+            filterTerm && isOpen ? (
+              <DataSourceLogoPlaceHolder />
+            ) : (
+              <DataSourceLogo dataSource={currentDataSourceInstanceSettings} />
+            )
+          }
+          suffix={<Icon name={isOpen ? 'search' : 'angle-down'} />}
+          placeholder={dataSourceLabel(currentDataSourceInstanceSettings)}
+          onFocus={openDropdown}
+          onClick={openDropdown}
+          onChange={(e) => {
+            setFilterTerm(e.currentTarget.value);
+          }}
+          ref={setMarkerElement}
+        ></Input>
+      </div>
       {isOpen ? (
-        <FocusScope contain autoFocus restoreFocus>
-          <Input
-            prefix={
-              filterTerm ? (
-                <DataSourceLogoPlaceHolder />
-              ) : (
-                <DataSourceLogo dataSource={currentDataSourceInstanceSettings} />
-              )
-            }
-            suffix={<Icon name={filterTerm ? 'search' : 'angle-down'} />}
-            placeholder={dataSourceLabel(currentDataSourceInstanceSettings)}
-            onChange={(e) => {
-              setFilterTerm(e.currentTarget.value);
-            }}
-            ref={setMarkerElement}
-          ></Input>
-          <Portal>
-            <div {...underlayProps} />
-            <div ref={ref} {...overlayProps} {...dialogProps}>
-              <PickerContent
-                filterTerm={filterTerm}
-                onChange={(ds: DataSourceInstanceSettings<DataSourceJsonData>) => {
-                  setFilterTerm(undefined);
-                  setOpen(false);
-                  onChange(ds);
-                }}
-                onClose={() => {
-                  setOpen(false);
-                }}
-                current={currentDataSourceInstanceSettings}
-                style={popper.styles.popper}
-                ref={setSelectorElement}
-                {...restProps}
-                onDismiss={() => {}}
-              ></PickerContent>
-            </div>
-          </Portal>
-        </FocusScope>
-      ) : (
-        <div className={styles.trigger} onClick={openDropdown}>
-          <Input
-            className={styles.input}
-            prefix={<DataSourceLogo dataSource={currentDataSourceInstanceSettings} />}
-            suffix={<Icon name="angle-down" />}
-            value={dataSourceLabel(currentDataSourceInstanceSettings)}
-            onFocus={openDropdown}
-          />
-        </div>
-      )}
+        <Portal>
+          <div {...underlayProps} />
+          <div ref={ref} {...overlayProps} {...dialogProps}>
+            <PickerContent
+              filterTerm={filterTerm}
+              onChange={(ds: DataSourceInstanceSettings<DataSourceJsonData>) => {
+                onClose();
+                onChange(ds);
+              }}
+              onClose={onClose}
+              current={currentDataSourceInstanceSettings}
+              style={popper.styles.popper}
+              ref={setSelectorElement}
+              {...restProps}
+              onDismiss={onClose}
+            ></PickerContent>
+          </div>
+        </Portal>
+      ) : null}
     </div>
   );
 }
@@ -132,6 +124,9 @@ function getStylesDropdown(theme: GrafanaTheme2) {
       input {
         cursor: pointer;
       }
+      input::placeholder {
+        color: ${theme.colors.text.primary};
+      }
     `,
   };
 }

From c41c638b5289557895f9c908d07a5f1d3eb3883b Mon Sep 17 00:00:00 2001
From: Konrad Lalik <konrad.lalik@grafana.com>
Date: Wed, 26 Apr 2023 10:27:37 +0200
Subject: [PATCH 413/729] Alerting: Fix silences preview (#66000)

* Use alertmanager /alerts endpoint to show preview of instances affected by silence

* Fix debounce dependency, add no instances warning

* Rename silences preview component

* Fix the preview file name, use IsNulLDate to check the date

* Fix valid matchers condition

* Cleanup

* Remove unused code
---
 .../alerting/unified/api/alertmanagerApi.ts   |  29 ++++
 .../unified/components/DynamicTable.tsx       |   7 +-
 .../silences/MatchedSilencedRules.tsx         | 128 -----------------
 .../silences/SilencedInstancesPreview.tsx     | 129 ++++++++++++++++++
 .../components/silences/SilencesEditor.tsx    |  25 +++-
 .../alerting/unified/utils/matchers.test.ts   |  59 +-------
 .../alerting/unified/utils/matchers.ts        |  63 +--------
 7 files changed, 187 insertions(+), 253 deletions(-)
 delete mode 100644 public/app/features/alerting/unified/components/silences/MatchedSilencedRules.tsx
 create mode 100644 public/app/features/alerting/unified/components/silences/SilencedInstancesPreview.tsx

diff --git a/public/app/features/alerting/unified/api/alertmanagerApi.ts b/public/app/features/alerting/unified/api/alertmanagerApi.ts
index 66f6d760422..762c79bb662 100644
--- a/public/app/features/alerting/unified/api/alertmanagerApi.ts
+++ b/public/app/features/alerting/unified/api/alertmanagerApi.ts
@@ -1,10 +1,13 @@
 import {
+  AlertmanagerAlert,
   AlertmanagerChoice,
   AlertManagerCortexConfig,
   ExternalAlertmanagerConfig,
   ExternalAlertmanagers,
   ExternalAlertmanagersResponse,
+  Matcher,
 } from '../../../../plugins/datasource/alertmanager/types';
+import { matcherToOperator } from '../utils/alertmanager';
 import { getDatasourceAPIUid, GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
 
 import { alertingApi } from './alertingApi';
@@ -16,8 +19,34 @@ export interface AlertmanagersChoiceResponse {
   numExternalAlertmanagers: number;
 }
 
+interface AlertmanagerAlertsFilter {
+  active?: boolean;
+  silenced?: boolean;
+  inhibited?: boolean;
+  unprocessed?: boolean;
+  matchers?: Matcher[];
+}
+
+// Based on https://github.com/prometheus/alertmanager/blob/main/api/v2/openapi.yaml
 export const alertmanagerApi = alertingApi.injectEndpoints({
   endpoints: (build) => ({
+    getAlertmanagerAlerts: build.query<
+      AlertmanagerAlert[],
+      { amSourceName: string; filter?: AlertmanagerAlertsFilter }
+    >({
+      query: ({ amSourceName, filter }) => {
+        // TODO Add support for active, silenced, inhibited, unprocessed filters
+        const filterMatchers = filter?.matchers
+          ?.filter((matcher) => matcher.name && matcher.value)
+          .map((matcher) => `${matcher.name}${matcherToOperator(matcher)}${matcher.value}`);
+
+        return {
+          url: `/api/alertmanager/${getDatasourceAPIUid(amSourceName)}/api/v2/alerts`,
+          params: { filter: filterMatchers },
+        };
+      },
+    }),
+
     getAlertmanagerChoiceStatus: build.query<AlertmanagersChoiceResponse, void>({
       query: () => ({ url: '/api/v1/ngalert' }),
       providesTags: ['AlertmanagerChoice'],
diff --git a/public/app/features/alerting/unified/components/DynamicTable.tsx b/public/app/features/alerting/unified/components/DynamicTable.tsx
index deae6c1a7eb..29ee2eeac96 100644
--- a/public/app/features/alerting/unified/components/DynamicTable.tsx
+++ b/public/app/features/alerting/unified/components/DynamicTable.tsx
@@ -17,6 +17,7 @@ export interface DynamicTableColumnProps<T = unknown> {
 
   renderCell: (item: DynamicTableItemProps<T>, index: number) => ReactNode;
   size?: number | string;
+  className?: string;
 }
 
 export interface DynamicTableItemProps<T = unknown> {
@@ -134,7 +135,11 @@ export const DynamicTable = <T extends object>({
                 </div>
               )}
               {cols.map((col) => (
-                <div className={cx(styles.cell, styles.bodyCell)} data-column={col.label} key={`${item.id}-${col.id}`}>
+                <div
+                  className={cx(styles.cell, styles.bodyCell, col.className)}
+                  data-column={col.label}
+                  key={`${item.id}-${col.id}`}
+                >
                   {col.renderCell(item, index)}
                 </div>
               ))}
diff --git a/public/app/features/alerting/unified/components/silences/MatchedSilencedRules.tsx b/public/app/features/alerting/unified/components/silences/MatchedSilencedRules.tsx
deleted file mode 100644
index 3042d066ec5..00000000000
--- a/public/app/features/alerting/unified/components/silences/MatchedSilencedRules.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useEffect, useState } from 'react';
-import { useFormContext } from 'react-hook-form';
-import { useDebounce } from 'react-use';
-
-import { dateTime, GrafanaTheme2 } from '@grafana/data';
-import { Badge, useStyles2 } from '@grafana/ui';
-import { useDispatch } from 'app/types';
-import { Alert, AlertingRule } from 'app/types/unified-alerting';
-
-import { useCombinedRuleNamespaces } from '../../hooks/useCombinedRuleNamespaces';
-import { fetchAllPromAndRulerRulesAction } from '../../state/actions';
-import { MatcherFieldValue, SilenceFormFields } from '../../types/silence-form';
-import { findAlertInstancesWithMatchers } from '../../utils/matchers';
-import { isAlertingRule } from '../../utils/rules';
-import { AlertLabels } from '../AlertLabels';
-import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../DynamicTable';
-import { AlertStateTag } from '../rules/AlertStateTag';
-
-type MatchedRulesTableItemProps = DynamicTableItemProps<{
-  matchedInstance: Alert;
-}>;
-type MatchedRulesTableColumnProps = DynamicTableColumnProps<{ matchedInstance: Alert }>;
-
-export const MatchedSilencedRules = () => {
-  const [matchedAlertRules, setMatchedAlertRules] = useState<MatchedRulesTableItemProps[]>([]);
-  const formApi = useFormContext<SilenceFormFields>();
-  const dispatch = useDispatch();
-  const { watch } = formApi;
-  const matchers: MatcherFieldValue[] = watch('matchers');
-  const styles = useStyles2(getStyles);
-  const columns = useColumns();
-
-  useEffect(() => {
-    dispatch(fetchAllPromAndRulerRulesAction());
-  }, [dispatch]);
-
-  const combinedNamespaces = useCombinedRuleNamespaces();
-  useDebounce(
-    () => {
-      const matchedInstances = combinedNamespaces.flatMap((namespace) => {
-        return namespace.groups.flatMap((group) => {
-          return group.rules
-            .map((combinedRule) => combinedRule.promRule)
-            .filter((rule): rule is AlertingRule => isAlertingRule(rule))
-            .flatMap((rule) => findAlertInstancesWithMatchers(rule.alerts ?? [], matchers));
-        });
-      });
-      setMatchedAlertRules(matchedInstances);
-    },
-    500,
-    [combinedNamespaces, matchers]
-  );
-
-  return (
-    <div>
-      <h4 className={styles.title}>
-        Affected alert instances
-        {matchedAlertRules.length > 0 ? (
-          <Badge className={styles.badge} color="blue" text={matchedAlertRules.length} />
-        ) : null}
-      </h4>
-      <div className={styles.table}>
-        {matchers.every((matcher) => !matcher.value && !matcher.name) ? (
-          <span>Add a valid matcher to see affected alerts</span>
-        ) : (
-          <DynamicTable
-            items={matchedAlertRules}
-            isExpandable={false}
-            cols={columns}
-            pagination={{ itemsPerPage: 5 }}
-          />
-        )}
-      </div>
-    </div>
-  );
-};
-
-function useColumns(): MatchedRulesTableColumnProps[] {
-  return [
-    {
-      id: 'state',
-      label: 'State',
-      renderCell: function renderStateTag({ data: { matchedInstance } }) {
-        return <AlertStateTag state={matchedInstance.state} />;
-      },
-      size: '160px',
-    },
-    {
-      id: 'labels',
-      label: 'Labels',
-      renderCell: function renderName({ data: { matchedInstance } }) {
-        return <AlertLabels labels={matchedInstance.labels} />;
-      },
-      size: 'auto',
-    },
-    {
-      id: 'created',
-      label: 'Created',
-      renderCell: function renderSummary({ data: { matchedInstance } }) {
-        return (
-          <>
-            {matchedInstance.activeAt.startsWith('0001')
-              ? '-'
-              : dateTime(matchedInstance.activeAt).format('YYYY-MM-DD HH:mm:ss')}
-          </>
-        );
-      },
-      size: '180px',
-    },
-  ];
-}
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  table: css`
-    max-width: ${theme.breakpoints.values.lg}px;
-  `,
-  moreMatches: css`
-    margin-top: ${theme.spacing(1)};
-  `,
-  title: css`
-    display: flex;
-    align-items: center;
-  `,
-  badge: css`
-    margin-left: ${theme.spacing(1)};
-  `,
-});
diff --git a/public/app/features/alerting/unified/components/silences/SilencedInstancesPreview.tsx b/public/app/features/alerting/unified/components/silences/SilencedInstancesPreview.tsx
new file mode 100644
index 00000000000..8c1b4490b29
--- /dev/null
+++ b/public/app/features/alerting/unified/components/silences/SilencedInstancesPreview.tsx
@@ -0,0 +1,129 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { dateTime, GrafanaTheme2 } from '@grafana/data';
+import { Alert, Badge, LoadingPlaceholder, useStyles2 } from '@grafana/ui';
+import { AlertmanagerAlert, Matcher } from 'app/plugins/datasource/alertmanager/types';
+
+import { alertmanagerApi } from '../../api/alertmanagerApi';
+import { isNullDate } from '../../utils/time';
+import { AlertLabels } from '../AlertLabels';
+import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../DynamicTable';
+
+import { AmAlertStateTag } from './AmAlertStateTag';
+
+interface Props {
+  amSourceName: string;
+  matchers: Matcher[];
+}
+
+export const SilencedInstancesPreview = ({ amSourceName, matchers }: Props) => {
+  const { useGetAlertmanagerAlertsQuery } = alertmanagerApi;
+  const styles = useStyles2(getStyles);
+  const columns = useColumns();
+
+  // By default the form contains an empty matcher - with empty name and value and = operator
+  // We don't want to fetch previews for empty matchers as it results in all alerts returned
+  const hasValidMatchers = matchers.some((matcher) => matcher.value && matcher.name);
+
+  const {
+    currentData: alerts = [],
+    isFetching,
+    isError,
+  } = useGetAlertmanagerAlertsQuery(
+    { amSourceName, filter: { matchers } },
+    { skip: !hasValidMatchers, refetchOnMountOrArgChange: true }
+  );
+
+  const tableItemAlerts = alerts.map<DynamicTableItemProps<AlertmanagerAlert>>((alert) => ({
+    id: alert.fingerprint,
+    data: alert,
+  }));
+
+  return (
+    <div>
+      <h4 className={styles.title}>
+        Affected alert instances
+        {tableItemAlerts.length > 0 ? (
+          <Badge className={styles.badge} color="blue" text={tableItemAlerts.length} />
+        ) : null}
+      </h4>
+      {!hasValidMatchers && <span>Add a valid matcher to see affected alerts</span>}
+      {isError && (
+        <Alert title="Preview not available" severity="error">
+          Error occured when generating affected alerts preview. Are you matchers valid?
+        </Alert>
+      )}
+      {isFetching && <LoadingPlaceholder text="Loading..." />}
+      {!isFetching && !isError && hasValidMatchers && (
+        <div className={styles.table}>
+          {tableItemAlerts.length > 0 ? (
+            <DynamicTable
+              items={tableItemAlerts}
+              isExpandable={false}
+              cols={columns}
+              pagination={{ itemsPerPage: 10 }}
+            />
+          ) : (
+            <span>No matching alert instances found</span>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
+
+function useColumns(): Array<DynamicTableColumnProps<AlertmanagerAlert>> {
+  const styles = useStyles2(getStyles);
+
+  return [
+    {
+      id: 'state',
+      label: 'State',
+      renderCell: function renderStateTag({ data }) {
+        return <AmAlertStateTag state={data.status.state} />;
+      },
+      size: '120px',
+      className: styles.stateColumn,
+    },
+    {
+      id: 'labels',
+      label: 'Labels',
+      renderCell: function renderName({ data }) {
+        return <AlertLabels labels={data.labels} className={styles.alertLabels} />;
+      },
+      size: 'auto',
+    },
+    {
+      id: 'created',
+      label: 'Created',
+      renderCell: function renderSummary({ data }) {
+        return <>{isNullDate(data.startsAt) ? '-' : dateTime(data.startsAt).format('YYYY-MM-DD HH:mm:ss')}</>;
+      },
+      size: '180px',
+    },
+  ];
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  table: css`
+    max-width: ${theme.breakpoints.values.lg}px;
+  `,
+  moreMatches: css`
+    margin-top: ${theme.spacing(1)};
+  `,
+  title: css`
+    display: flex;
+    align-items: center;
+  `,
+  badge: css`
+    margin-left: ${theme.spacing(1)};
+  `,
+  stateColumn: css`
+    display: flex;
+    align-items: center;
+  `,
+  alertLabels: css`
+    justify-content: flex-start;
+  `,
+});
diff --git a/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx b/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
index 3d1bb015b9d..7f6c3269146 100644
--- a/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
+++ b/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
@@ -1,5 +1,5 @@
 import { css, cx } from '@emotion/css';
-import { pickBy } from 'lodash';
+import { isEqual, pickBy } from 'lodash';
 import React, { useMemo, useState } from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useDebounce } from 'react-use';
@@ -16,7 +16,7 @@ import {
 import { config } from '@grafana/runtime';
 import { Button, Field, FieldSet, Input, LinkButton, TextArea, useStyles2 } from '@grafana/ui';
 import { useCleanup } from 'app/core/hooks/useCleanup';
-import { MatcherOperator, Silence, SilenceCreatePayload } from 'app/plugins/datasource/alertmanager/types';
+import { Matcher, MatcherOperator, Silence, SilenceCreatePayload } from 'app/plugins/datasource/alertmanager/types';
 import { useDispatch } from 'app/types';
 
 import { useURLSearchParams } from '../../hooks/useURLSearchParams';
@@ -28,9 +28,9 @@ import { parseQueryParamMatchers } from '../../utils/matchers';
 import { makeAMLink } from '../../utils/misc';
 import { initialAsyncRequestState } from '../../utils/redux';
 
-import { MatchedSilencedRules } from './MatchedSilencedRules';
 import MatchersField from './MatchersField';
 import { SilencePeriod } from './SilencePeriod';
+import { SilencedInstancesPreview } from './SilencedInstancesPreview';
 
 interface Props {
   silence?: Silence;
@@ -104,6 +104,9 @@ export const SilencesEditor = ({ silence, alertManagerSourceName }: Props) => {
   const formAPI = useForm({ defaultValues });
   const dispatch = useDispatch();
   const styles = useStyles2(getStyles);
+  const [matchersForPreview, setMatchersForPreview] = useState<Matcher[]>(
+    defaultValues.matchers.map(matcherFieldToMatcher)
+  );
 
   const { loading } = useUnifiedAlertingSelector((state) => state.updateSilence);
 
@@ -138,6 +141,7 @@ export const SilencesEditor = ({ silence, alertManagerSourceName }: Props) => {
   const duration = watch('duration');
   const startsAt = watch('startsAt');
   const endsAt = watch('endsAt');
+  const matcherFields = watch('matchers');
 
   // Keep duration and endsAt in sync
   const [prevDuration, setPrevDuration] = useState(duration);
@@ -164,6 +168,19 @@ export const SilencesEditor = ({ silence, alertManagerSourceName }: Props) => {
     700,
     [clearErrors, duration, endsAt, prevDuration, setValue, startsAt]
   );
+
+  useDebounce(
+    () => {
+      // React-hook-form watch does not return referentialy equal values so this trick is needed
+      const newMatchers = matcherFields.filter((m) => m.name && m.value).map(matcherFieldToMatcher);
+      if (!isEqual(matchersForPreview, newMatchers)) {
+        setMatchersForPreview(newMatchers);
+      }
+    },
+    700,
+    [matcherFields]
+  );
+
   const userLogged = Boolean(config.bootData.user.isSignedIn && config.bootData.user.name);
 
   return (
@@ -221,7 +238,7 @@ export const SilencesEditor = ({ silence, alertManagerSourceName }: Props) => {
               />
             </Field>
           )}
-          <MatchedSilencedRules />
+          <SilencedInstancesPreview amSourceName={alertManagerSourceName} matchers={matchersForPreview} />
         </FieldSet>
         <div className={styles.flexRow}>
           {loading && (
diff --git a/public/app/features/alerting/unified/utils/matchers.test.ts b/public/app/features/alerting/unified/utils/matchers.test.ts
index 09a54217fb7..ae5b64b105e 100644
--- a/public/app/features/alerting/unified/utils/matchers.test.ts
+++ b/public/app/features/alerting/unified/utils/matchers.test.ts
@@ -1,8 +1,4 @@
-import { MatcherOperator } from 'app/plugins/datasource/alertmanager/types';
-
-import { mockPromAlert } from '../mocks';
-
-import { getMatcherQueryParams, findAlertInstancesWithMatchers, parseQueryParamMatchers } from './matchers';
+import { getMatcherQueryParams, parseQueryParamMatchers } from './matchers';
 
 describe('Unified Alerting matchers', () => {
   describe('getMatcherQueryParams tests', () => {
@@ -37,57 +33,4 @@ describe('Unified Alerting matchers', () => {
       expect(matchers[0].value).toBe('TestData 1');
     });
   });
-
-  describe('matchLabelsToMatchers', () => {
-    it('should match for equal', () => {
-      const matchers = [{ name: 'foo', value: 'bar', operator: MatcherOperator.equal }];
-      const alerts = [mockPromAlert({ labels: { foo: 'bar' } }), mockPromAlert({ labels: { foo: 'baz' } })];
-      const matchedAlerts = findAlertInstancesWithMatchers(alerts, matchers);
-
-      expect(matchedAlerts).toHaveLength(1);
-    });
-
-    it('should match for not equal', () => {
-      const matchers = [{ name: 'foo', value: 'bar', operator: MatcherOperator.notEqual }];
-      const alerts = [mockPromAlert({ labels: { foo: 'bar' } }), mockPromAlert({ labels: { foo: 'baz' } })];
-
-      const matchedAlerts = findAlertInstancesWithMatchers(alerts, matchers);
-      expect(matchedAlerts).toHaveLength(1);
-    });
-
-    it('should match for regex', () => {
-      const matchers = [{ name: 'foo', value: 'b{1}a.*', operator: MatcherOperator.regex }];
-      const alerts = [
-        mockPromAlert({ labels: { foo: 'bbr' } }),
-        mockPromAlert({ labels: { foo: 'aba' } }), // This does not match because the regex is implicitly anchored.
-        mockPromAlert({ labels: { foo: 'ba' } }),
-        mockPromAlert({ labels: { foo: 'bar' } }),
-        mockPromAlert({ labels: { foo: 'baz' } }),
-        mockPromAlert({ labels: { foo: 'bas' } }),
-      ];
-
-      const matchedAlerts = findAlertInstancesWithMatchers(alerts, matchers);
-      expect(matchedAlerts).toHaveLength(4);
-      expect(matchedAlerts.map((instance) => instance.data.matchedInstance.labels.foo)).toEqual([
-        'ba',
-        'bar',
-        'baz',
-        'bas',
-      ]);
-    });
-
-    it('should not match regex', () => {
-      const matchers = [{ name: 'foo', value: 'ba{3}', operator: MatcherOperator.notRegex }];
-      const alerts = [
-        mockPromAlert({ labels: { foo: 'bar' } }),
-        mockPromAlert({ labels: { foo: 'baz' } }),
-        mockPromAlert({ labels: { foo: 'baaa' } }),
-        mockPromAlert({ labels: { foo: 'bas' } }),
-      ];
-
-      const matchedAlerts = findAlertInstancesWithMatchers(alerts, matchers);
-      expect(matchedAlerts).toHaveLength(3);
-      expect(matchedAlerts.map((instance) => instance.data.matchedInstance.labels.foo)).toEqual(['bar', 'baz', 'bas']);
-    });
-  });
 });
diff --git a/public/app/features/alerting/unified/utils/matchers.ts b/public/app/features/alerting/unified/utils/matchers.ts
index d8889638f58..7ca37819719 100644
--- a/public/app/features/alerting/unified/utils/matchers.ts
+++ b/public/app/features/alerting/unified/utils/matchers.ts
@@ -1,10 +1,7 @@
 import { uniqBy } from 'lodash';
 
 import { Labels } from '@grafana/data';
-import { Matcher, MatcherOperator } from 'app/plugins/datasource/alertmanager/types';
-import { Alert } from 'app/types/unified-alerting';
-
-import { MatcherFieldValue } from '../types/silence-form';
+import { Matcher } from 'app/plugins/datasource/alertmanager/types';
 
 import { parseMatcher } from './alertmanager';
 
@@ -29,61 +26,3 @@ export const getMatcherQueryParams = (labels: Labels) => {
 
   return matcherUrlParams;
 };
-
-interface MatchedInstance {
-  id: string;
-  data: {
-    matchedInstance: Alert;
-  };
-}
-
-export const findAlertInstancesWithMatchers = (
-  instances: Alert[],
-  matchers: MatcherFieldValue[]
-): MatchedInstance[] => {
-  const anchorRegex = (regexpString: string): RegExp => {
-    // Silence matchers are always fully anchored in the Alertmanager: https://github.com/prometheus/alertmanager/pull/748
-    if (!regexpString.startsWith('^')) {
-      regexpString = '^' + regexpString;
-    }
-    if (!regexpString.endsWith('$')) {
-      regexpString = regexpString + '$';
-    }
-    return new RegExp(regexpString);
-  };
-
-  const matchesInstance = (instance: Alert, matcher: MatcherFieldValue) => {
-    return Object.entries(instance.labels).some(([key, value]) => {
-      if (!matcher.name || !matcher.value) {
-        return false;
-      }
-      if (matcher.name !== key) {
-        return false;
-      }
-      switch (matcher.operator) {
-        case MatcherOperator.equal:
-          return matcher.value === value;
-        case MatcherOperator.notEqual:
-          return matcher.value !== value;
-        case MatcherOperator.regex:
-          const regex = anchorRegex(matcher.value);
-          return regex.test(value);
-        case MatcherOperator.notRegex:
-          const negregex = anchorRegex(matcher.value);
-          return !negregex.test(value);
-        default:
-          return false;
-      }
-    });
-  };
-
-  const filteredInstances = instances.filter((instance) => {
-    return matchers.every((matcher) => matchesInstance(instance, matcher));
-  });
-  const mappedInstances = filteredInstances.map((instance) => ({
-    id: `${instance.activeAt}-${instance.value}`,
-    data: { matchedInstance: instance },
-  }));
-
-  return mappedInstances;
-};

From 106eceab55627cb7d41acab2517f39a0d344e1bb Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 26 Apr 2023 11:03:07 +0200
Subject: [PATCH 414/729] Loki: Remove experimental badge for context ui
 (#67219)

* Loki: Remove experimental badge

* Remove unused styles
---
 .../datasource/loki/components/LokiContextUi.tsx    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index 36211d885db..73bfc016bbd 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -4,7 +4,7 @@ import { useAsync } from 'react-use';
 
 import { GrafanaTheme2, LogRowModel, SelectableValue } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
-import { Collapse, Icon, Label, MultiSelect, Tag, Tooltip, useStyles2 } from '@grafana/ui';
+import { Collapse, Icon, Label, MultiSelect, Tooltip, useStyles2 } from '@grafana/ui';
 import store from 'app/core/store';
 
 import { RawQuery } from '../../prometheus/querybuilder/shared/RawQuery';
@@ -41,9 +41,6 @@ function getStyles(theme: GrafanaTheme2) {
     hidden: css`
       visibility: hidden;
     `,
-    tag: css`
-      padding: ${theme.spacing(0.25)} ${theme.spacing(0.75)};
-    `,
     label: css`
       max-width: 100%;
       margin: ${theme.spacing(2)} 0;
@@ -190,14 +187,6 @@ export function LokiContextUi(props: LokiContextUiProps) {
         }
       >
         <div className={styles.ui}>
-          <Tooltip
-            content={
-              'This feature is experimental and may change in the future. Currently it supports using a parser and extracted labels for queries with no more than 1 parser (for example, logfmt, json). Please report any issues in the grafana GitHub repository.'
-            }
-            placement="top"
-          >
-            <Tag className={styles.tag} name={'Experimental feature'} colorIndex={1} />
-          </Tooltip>{' '}
           <Label
             className={styles.label}
             description="The initial log context query is created from all labels defining the stream for the selected log line. You can broaden your search by removing one or more of the label filters."

From 4cbd3728339dfd120a444fb6131de95ff791cf92 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Wed, 26 Apr 2023 12:14:57 +0300
Subject: [PATCH 415/729] Chore: update latest.json to 9.5.1 (#67263)

---
 latest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/latest.json b/latest.json
index bdb193dc663..b789bb2e2c8 100644
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,4 @@
 {
-  "stable": "9.4.7",
-  "testing": "9.4.7"
+  "stable": "9.5.1",
+  "testing": "9.5.1"
 }

From d5bad429dd54facdc0bac76ce1d3ea335328d56d Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 26 Apr 2023 10:18:29 +0100
Subject: [PATCH 416/729] Changelog: Updated changelog for 9.4.9 (#67264)

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c35d787414..225050f64d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<!-- 9.4.9 START -->
+
+# 9.4.9 (2023-04-24)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.20.3. [#66264](https://github.com/grafana/grafana/pull/66264), [@sakjur](https://github.com/sakjur)
+
+<!-- 9.4.9 END -->
 <!-- 9.4.7 START -->
 
 # 9.4.7 (2023-03-16)

From cc8a06c61b23d93cd1f74b3de85d0864ce7d4fdc Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 26 Apr 2023 10:21:42 +0100
Subject: [PATCH 417/729] Changelog: Updated changelog for 9.5.0 (#67266)

---
 CHANGELOG.md | 254 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 254 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 225050f64d4..502f105cf02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,257 @@
+<!-- 9.5.0 START -->
+
+# 9.5.0 (2023-04-04)
+
+### Features and enhancements
+
+- **API keys:** Add deprecation to api keys. [#65948](https://github.com/grafana/grafana/pull/65948), [@eleijonmarck](https://github.com/eleijonmarck)
+- **API:** Enable serving Swagger UI by default and add docs and guidelines. [#63489](https://github.com/grafana/grafana/pull/63489), [@papagian](https://github.com/papagian)
+- **API:** Permit Cache-Control (browser caching) for datasource resources. [#62033](https://github.com/grafana/grafana/pull/62033), [@kylebrandt](https://github.com/kylebrandt)
+- **Accessibility:** Make row actions keyboard accessible. [#63367](https://github.com/grafana/grafana/pull/63367), [@ashharrison90](https://github.com/ashharrison90)
+- **Admin/Plugins:** Set category filter in connections link. [#64393](https://github.com/grafana/grafana/pull/64393), [@mikkancso](https://github.com/mikkancso)
+- **Alerting:** Add CustomDetails field in PagerDuty contact point. [#64860](https://github.com/grafana/grafana/pull/64860), [@santihernandezc](https://github.com/santihernandezc)
+- **Alerting:** Add dashboard and panel links to rule and instance annotations. [#63243](https://github.com/grafana/grafana/pull/63243), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Add filter and remove funcs for custom labels and annotations. [#63437](https://github.com/grafana/grafana/pull/63437), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Add fuzzy search to alert list view. [#63931](https://github.com/grafana/grafana/pull/63931), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Add metrics for active receiver and integrations. [#64050](https://github.com/grafana/grafana/pull/64050), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Better printing of labels. [#63348](https://github.com/grafana/grafana/pull/63348), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Create new state history "fanout" backend that dispatches to multiple other backends at once. [#64774](https://github.com/grafana/grafana/pull/64774), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Enable preview for recording rules. [#63260](https://github.com/grafana/grafana/pull/63260), [@VikaCep](https://github.com/VikaCep)
+- **Alerting:** Fetch all applied alerting configurations. [#65728](https://github.com/grafana/grafana/pull/65728), [@santihernandezc](https://github.com/santihernandezc)
+- **Alerting:** Introduce proper feature toggles for common state history backend combinations. [#65497](https://github.com/grafana/grafana/pull/65497), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Make time range query parameters not required when querying Loki. [#62985](https://github.com/grafana/grafana/pull/62985), [@alexweav](https://github.com/alexweav)
+- **Alerting:** New notification policies view. [#61952](https://github.com/grafana/grafana/pull/61952), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** No longer index state history log streams by instance labels. [#65474](https://github.com/grafana/grafana/pull/65474), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Respect "For" Duration for NoData alerts. [#65574](https://github.com/grafana/grafana/pull/65574), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Support filtering rules by multiple datasources. [#64355](https://github.com/grafana/grafana/pull/64355), [@VikaCep](https://github.com/VikaCep)
+- **Alerting:** Switch to snappy-compressed-protobuf for outgoing push requests to Loki. [#65077](https://github.com/grafana/grafana/pull/65077), [@alexweav](https://github.com/alexweav)
+- **Angular:** Prevent angular from loading when disabled. [#65755](https://github.com/grafana/grafana/pull/65755), [@torkelo](https://github.com/torkelo)
+- **Auth:** Add Generic oauth skip org role sync setting. [#62418](https://github.com/grafana/grafana/pull/62418), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Auth:** Add feature flag to move token rotation to client. [#65060](https://github.com/grafana/grafana/pull/65060), [@kalleep](https://github.com/kalleep)
+- **Auth:** Show user sync external Authentication status. [#62721](https://github.com/grafana/grafana/pull/62721), [@lokeswaran-aj](https://github.com/lokeswaran-aj)
+- **Backend:** Use sdk version 0.148.0. [#62822](https://github.com/grafana/grafana/pull/62822), [@kylebrandt](https://github.com/kylebrandt)
+- **Chore:** Add stat for remote cache config. [#64276](https://github.com/grafana/grafana/pull/64276), [@DanCech](https://github.com/DanCech)
+- **Chore:** Replace short UID generation with more standard UUIDs. [#62731](https://github.com/grafana/grafana/pull/62731), [@ryantxu](https://github.com/ryantxu)
+- **Chore:** Use DOMPurify to sanitize strings rather than js-xss. [#62787](https://github.com/grafana/grafana/pull/62787), [@KristianGrafana](https://github.com/KristianGrafana)
+- **CloudMonitoring:** Add possibility to use path for private key. [#65252](https://github.com/grafana/grafana/pull/65252), [@zoltanbedi](https://github.com/zoltanbedi)
+- **CloudWatch Logs:** Update default timeout to 30m. [#63155](https://github.com/grafana/grafana/pull/63155), [@ashnove](https://github.com/ashnove)
+- **CloudWatch:** Add AWS/IotSiteWise namespace and metrics. [#63534](https://github.com/grafana/grafana/pull/63534), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch:** Add account support to variable queries. [#63822](https://github.com/grafana/grafana/pull/63822), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch:** Make deeplinks work for us-gov and china regions. [#64080](https://github.com/grafana/grafana/pull/64080), [@iwysiu](https://github.com/iwysiu)
+- **Cloudwatch:** Add MeteredIOBytes metric for EFS. [#64793](https://github.com/grafana/grafana/pull/64793), [@xlagg5](https://github.com/xlagg5)
+- **Command Palette:** Display dashboard location. [#63807](https://github.com/grafana/grafana/pull/63807), [@ashharrison90](https://github.com/ashharrison90)
+- **Command palette:** Enable folder searching. [#62663](https://github.com/grafana/grafana/pull/62663), [@ashharrison90](https://github.com/ashharrison90)
+- **Connections:** Turn on feature toggle by default. [#64885](https://github.com/grafana/grafana/pull/64885), [@mikkancso](https://github.com/mikkancso)
+- **Cookies:** Provide a mechanism for per user control over cookies. [#61566](https://github.com/grafana/grafana/pull/61566), [@sakjur](https://github.com/sakjur)
+- **Dashboard Datasource:** Update Query List & Improve UX. [#64429](https://github.com/grafana/grafana/pull/64429), [@codeincarnate](https://github.com/codeincarnate)
+- **Dashboard:** Add a feature that creates a table panel when a spreadsheet file is dropped on the dashboard. [#62688](https://github.com/grafana/grafana/pull/62688), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Dashboard:** Add new visualization/row/library panel/pasted panel is now a dropdown menu. [#65361](https://github.com/grafana/grafana/pull/65361), [@polibb](https://github.com/polibb)
+- **Dashboard:** Add value format for requests per minute. [#62258](https://github.com/grafana/grafana/pull/62258), [@dwradcliffe](https://github.com/dwradcliffe)
+- **Dashboard:** Empty/No Panels dashboard with a new design. [#65161](https://github.com/grafana/grafana/pull/65161), [@polibb](https://github.com/polibb)
+- **Dashboard:** When dashboard is not found show message instead of empty page. [#65508](https://github.com/grafana/grafana/pull/65508), [@polibb](https://github.com/polibb)
+- **Dashboards:** Enable feature flag `newPanelChromeUI` by default. [#65593](https://github.com/grafana/grafana/pull/65593), [@axelavargas](https://github.com/axelavargas)
+- **Dataplane:** Support timeSeriesLong without transform. [#62732](https://github.com/grafana/grafana/pull/62732), [@bohandley](https://github.com/bohandley)
+- **Datasources:** Add user_agent header customization for outgoing HTTP requests. [#63769](https://github.com/grafana/grafana/pull/63769), [@zhichli](https://github.com/zhichli)
+- **Datasources:** Use getDefaultQuery in annotations editors. [#61870](https://github.com/grafana/grafana/pull/61870), [@idastambuk](https://github.com/idastambuk)
+- **Docs:** Add documentation on how to debug backend plugins. [#64814](https://github.com/grafana/grafana/pull/64814), [@xnyo](https://github.com/xnyo)
+- **Docs:** Deprecate dashboard previews. [#65698](https://github.com/grafana/grafana/pull/65698), [@ArturWierzbicki](https://github.com/ArturWierzbicki)
+- **Elasticsearch:** Detect Elasticsearch version. [#63341](https://github.com/grafana/grafana/pull/63341), [@gabor](https://github.com/gabor)
+- **Elasticsearch:** Run Explore queries trough data source backend. [#65339](https://github.com/grafana/grafana/pull/65339), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Explore:** Add range option to internal data links. [#64063](https://github.com/grafana/grafana/pull/64063), [@connorlindsey](https://github.com/connorlindsey)
+- **Explore:** Add transformations to correlation data links. [#61799](https://github.com/grafana/grafana/pull/61799), [@gelicia](https://github.com/gelicia)
+- **Explore:** Support mixed data sources for supplementary query. [#63036](https://github.com/grafana/grafana/pull/63036), [@ifrost](https://github.com/ifrost)
+- **Extensions:** Expose an enum for available placements. [#64586](https://github.com/grafana/grafana/pull/64586), [@leventebalogh](https://github.com/leventebalogh)
+- **Feat:** Changing link destination for get more plugins. [#63517](https://github.com/grafana/grafana/pull/63517), [@tolzhabayev](https://github.com/tolzhabayev)
+- **Feat:** Linking to plugin details page rather than externally for new datasources. [#63499](https://github.com/grafana/grafana/pull/63499), [@tolzhabayev](https://github.com/tolzhabayev)
+- **FieldMatchers:** Add match by value (reducer). [#64477](https://github.com/grafana/grafana/pull/64477), [@leeoniya](https://github.com/leeoniya)
+- **Flame graph:** Add context menu. [#62705](https://github.com/grafana/grafana/pull/62705), [@joey-grafana](https://github.com/joey-grafana)
+- **Flame graph:** Add metadata above flame graph. [#61921](https://github.com/grafana/grafana/pull/61921), [@joey-grafana](https://github.com/joey-grafana)
+- **Geomap:** Improve tooltip url for photos layer. [#63487](https://github.com/grafana/grafana/pull/63487), [@adela-almasan](https://github.com/adela-almasan)
+- **Geomap:** Release night / day layer. [#63435](https://github.com/grafana/grafana/pull/63435), [@adela-almasan](https://github.com/adela-almasan)
+- **InfluxDB:** Move database information into jsondata. [#62308](https://github.com/grafana/grafana/pull/62308), [@itsmylife](https://github.com/itsmylife)
+- **Jaeger and Zipkin:** Config & docs upgrade. [#64250](https://github.com/grafana/grafana/pull/64250), [@joey-grafana](https://github.com/joey-grafana)
+- **LDAP:** Allow setting minimum TLS version and accepted ciphers. [#63646](https://github.com/grafana/grafana/pull/63646), [@Jguer](https://github.com/Jguer)
+- **Licensing:** Allow server admin user to log in even if the active user limit is reached. (Enterprise)
+- **Live:** Remove (alpha) ability to configure live pipelines. [#65138](https://github.com/grafana/grafana/pull/65138), [@ryantxu](https://github.com/ryantxu)
+- **Logger:** Add feature toggle for errors in HTTP request logs. [#64425](https://github.com/grafana/grafana/pull/64425), [@sakjur](https://github.com/sakjur)
+- **Login:** Allow custom name and icon for social providers. [#63297](https://github.com/grafana/grafana/pull/63297), [@jkroepke](https://github.com/jkroepke)
+- **Logs Panel:** Refactor style generation to improve rendering performance. [#62599](https://github.com/grafana/grafana/pull/62599), [@matyax](https://github.com/matyax)
+- **Logs:** Add millisecond to timestamp in log line. [#64372](https://github.com/grafana/grafana/pull/64372), [@svennergr](https://github.com/svennergr)
+- **Logs:** Rename dedup to deduplicate. [#62944](https://github.com/grafana/grafana/pull/62944), [@gwdawson](https://github.com/gwdawson)
+- **Loki Query Editor:** Make Monaco the default editor. [#62247](https://github.com/grafana/grafana/pull/62247), [@matyax](https://github.com/matyax)
+- **Loki:** Add `unpack` query builder hint. [#65608](https://github.com/grafana/grafana/pull/65608), [@svennergr](https://github.com/svennergr)
+- **Loki:** Add descriptions to query builder operations. [#64046](https://github.com/grafana/grafana/pull/64046), [@gwdawson](https://github.com/gwdawson)
+- **Loki:** Add placeholder to the loki query editor. [#62773](https://github.com/grafana/grafana/pull/62773), [@gwdawson](https://github.com/gwdawson)
+- **Loki:** Always fetch for new label keys in the QueryBuilder. [#64597](https://github.com/grafana/grafana/pull/64597), [@svennergr](https://github.com/svennergr)
+- **Loki:** Display error with label filter conflicts. [#63109](https://github.com/grafana/grafana/pull/63109), [@gwdawson](https://github.com/gwdawson)
+- **Loki:** Improve the display of loki query stats. [#63623](https://github.com/grafana/grafana/pull/63623), [@gwdawson](https://github.com/gwdawson)
+- **MSSQL/Postgres:** List views in table dropdown as well. [#62867](https://github.com/grafana/grafana/pull/62867), [@zoltanbedi](https://github.com/zoltanbedi)
+- **MSSQL:** Update forked go-mssqldb dependency. [#65658](https://github.com/grafana/grafana/pull/65658), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
+- **Metrics:** Update comment to mention folders instead of dashboards. [#63312](https://github.com/grafana/grafana/pull/63312), [@monteiro-renato](https://github.com/monteiro-renato)
+- **Navigation:** Enable new navigation by default. [#65335](https://github.com/grafana/grafana/pull/65335), [@ashharrison90](https://github.com/ashharrison90)
+- **NodeGraph:** Support icons for nodes. [#60989](https://github.com/grafana/grafana/pull/60989), [@aocenas](https://github.com/aocenas)
+- **Notifications:** Enable display of trace ID by default. [#64884](https://github.com/grafana/grafana/pull/64884), [@ashharrison90](https://github.com/ashharrison90)
+- **Packaging:** Start Grafana service after InfluxDB. [#64090](https://github.com/grafana/grafana/pull/64090), [@MichaIng](https://github.com/MichaIng)
+- **Panel Header:** Add CancelQuery option to panel header. [#64796](https://github.com/grafana/grafana/pull/64796), [@axelavargas](https://github.com/axelavargas)
+- **Panel:** Show multiple errors info in the inspector. [#64340](https://github.com/grafana/grafana/pull/64340), [@andresmgot](https://github.com/andresmgot)
+- **PanelChrome:** Add option to show actions on the right side (actions = leftItems). [#65762](https://github.com/grafana/grafana/pull/65762), [@torkelo](https://github.com/torkelo)
+- **Phlare:** Allow variables in labelSelector (in query). [#64324](https://github.com/grafana/grafana/pull/64324), [@joey-grafana](https://github.com/joey-grafana)
+- **Plugin:** Skip preloading disabled app plugins. [#63083](https://github.com/grafana/grafana/pull/63083), [@mckn](https://github.com/mckn)
+- **Plugins:** Add optional logger for plugin requests sent to backend plugins. [#62981](https://github.com/grafana/grafana/pull/62981), [@bergquist](https://github.com/bergquist)
+- **Plugins:** Extend panel menu with commands from plugins. [#63802](https://github.com/grafana/grafana/pull/63802), [@mckn](https://github.com/mckn)
+- **Plugins:** Extend panel menu with links from plugins. [#63089](https://github.com/grafana/grafana/pull/63089), [@jackw](https://github.com/jackw)
+- **Plugins:** Improve instrumentation by adding metrics and tracing. [#61035](https://github.com/grafana/grafana/pull/61035), [@xnyo](https://github.com/xnyo)
+- **Plugins:** Support for distributed tracing in backend plugins SDK. [#63714](https://github.com/grafana/grafana/pull/63714), [@xnyo](https://github.com/xnyo)
+- **Plugins:** Support for link extensions. [#61663](https://github.com/grafana/grafana/pull/61663), [@mckn](https://github.com/mckn)
+- **Profiling:** Enable flame graph & Phlare/Parca data sources for all users. [#63488](https://github.com/grafana/grafana/pull/63488), [@joey-grafana](https://github.com/joey-grafana)
+- **Prometheus Datasource:** Improve Prom query variable editor. [#58292](https://github.com/grafana/grafana/pull/58292), [@bohandley](https://github.com/bohandley)
+- **Prometheus Metrics:** Add missing stat_total_teams metric. [#65133](https://github.com/grafana/grafana/pull/65133), [@gamab](https://github.com/gamab)
+- **Prometheus/Loki:** Run query explicitly instead of onblur in panel edit. [#64815](https://github.com/grafana/grafana/pull/64815), [@torkelo](https://github.com/torkelo)
+- **Prometheus:** Browser resource caching. [#60711](https://github.com/grafana/grafana/pull/60711), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Prometheus:** Improve prometheus query variable editor. [#63529](https://github.com/grafana/grafana/pull/63529), [@bohandley](https://github.com/bohandley)
+- **Prometheus:** Use $\_\_rate_interval for rate queries generated by metric browser. [#65386](https://github.com/grafana/grafana/pull/65386), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Pubdash:** Email sharing handle dashboard deleted. [#64247](https://github.com/grafana/grafana/pull/64247), [@owensmallwood](https://github.com/owensmallwood)
+- **Pubdash:** Email sharing handle dashboard deleted. (Enterprise)
+- **PublicDashboards:** Backfills share column with default value. [#63407](https://github.com/grafana/grafana/pull/63407), [@owensmallwood](https://github.com/owensmallwood)
+- **PublicDashboards:** Configuration modal redesign. [#63211](https://github.com/grafana/grafana/pull/63211), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Email sharing. [#63762](https://github.com/grafana/grafana/pull/63762), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Email sharing. (Enterprise)
+- **PublicDashboards:** Enable creation when dashboard has template variables. [#64560](https://github.com/grafana/grafana/pull/64560), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Paused or deleted public dashboard screen. [#63970](https://github.com/grafana/grafana/pull/63970), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Viewer can request and claim magic link. (Enterprise)
+- **QueryHistory:** Improve handling of mixed datasource entries. [#62214](https://github.com/grafana/grafana/pull/62214), [@Elfo404](https://github.com/Elfo404)
+- **Rendering:** Experimental support to use JWTs as auth method. [#60841](https://github.com/grafana/grafana/pull/60841), [@joanlopez](https://github.com/joanlopez)
+- **Reports:** Improve the UI for the new navigation. (Enterprise)
+- **SQL Datasources:** Add back help content. [#65383](https://github.com/grafana/grafana/pull/65383), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Schema:** Remove exclusion for timeseries and update imports. [#65242](https://github.com/grafana/grafana/pull/65242), [@ryantxu](https://github.com/ryantxu)
+- **Search:** Improvements for starred dashboard search. [#64758](https://github.com/grafana/grafana/pull/64758), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Select:** Show icon in the grafana/ui Select component. [#63827](https://github.com/grafana/grafana/pull/63827), [@ryantxu](https://github.com/ryantxu)
+- **Service accounts:** Creation logic simplification. [#63884](https://github.com/grafana/grafana/pull/63884), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Service accounts:** Remove Add API keys buttons and remove one state of migrating for API keys tab. [#63411](https://github.com/grafana/grafana/pull/63411), [@eleijonmarck](https://github.com/eleijonmarck)
+- **SplitOpen:** Update API to accept multiple queries. [#62245](https://github.com/grafana/grafana/pull/62245), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Stat Panel:** Add an option for a non-gradient/solid background. [#65052](https://github.com/grafana/grafana/pull/65052), [@baldm0mma](https://github.com/baldm0mma)
+- **Stat:** Add ability to remove default single-color background gradient. [#64353](https://github.com/grafana/grafana/pull/64353), [@baldm0mma](https://github.com/baldm0mma)
+- **SupportBundles:** Add OAuth bundle collectors. [#64810](https://github.com/grafana/grafana/pull/64810), [@Jguer](https://github.com/Jguer)
+- **Table Panel:** Add ability to use text color for value or hide value in gauge cell. [#61477](https://github.com/grafana/grafana/pull/61477), [@torkelo](https://github.com/torkelo)
+- **Table:** Introduce sparkline cell type. [#63182](https://github.com/grafana/grafana/pull/63182), [@domasx2](https://github.com/domasx2)
+- **Tempo:** Config and doc updates. [#64017](https://github.com/grafana/grafana/pull/64017), [@joey-grafana](https://github.com/joey-grafana)
+- **Tempo:** Update service graph view and docs. [#64875](https://github.com/grafana/grafana/pull/64875), [@joey-grafana](https://github.com/joey-grafana)
+- **TraceView:** Add key and url escaping of json tag values. [#64331](https://github.com/grafana/grafana/pull/64331), [@aocenas](https://github.com/aocenas)
+- **TraceView:** Reworked header. [#63105](https://github.com/grafana/grafana/pull/63105), [@joey-grafana](https://github.com/joey-grafana)
+- **Tracing:** Add more detail to HTTP Outgoing Request. [#64757](https://github.com/grafana/grafana/pull/64757), [@bboreham](https://github.com/bboreham)
+- **Tracing:** Docs and config improvements for Tempo/Jaeger/Zipkin. [#65255](https://github.com/grafana/grafana/pull/65255), [@joey-grafana](https://github.com/joey-grafana)
+- **Tracing:** Support multiple OTel propagators. [#61199](https://github.com/grafana/grafana/pull/61199), [@hairyhenderson](https://github.com/hairyhenderson)
+- **Transformations:** Support time format when converting time to strings. [#63826](https://github.com/grafana/grafana/pull/63826), [@ryantxu](https://github.com/ryantxu)
+- **Transformers:** Support adding the row index using calculate field transformer. [#65148](https://github.com/grafana/grafana/pull/65148), [@ryantxu](https://github.com/ryantxu)
+- **Units:** Format currency with negative before the symbol. [#65152](https://github.com/grafana/grafana/pull/65152), [@ryantxu](https://github.com/ryantxu)
+
+### Bug fixes
+
+- **API:** Fix "Updated by" Column in dashboard versions table. [#65351](https://github.com/grafana/grafana/pull/65351), [@papagian](https://github.com/papagian)
+- **AccessControl:** Allow editors to access GET /api/datasources. [#66343](https://github.com/grafana/grafana/pull/66343), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Alerting:** Add "backend" label to state history writes metrics. [#65395](https://github.com/grafana/grafana/pull/65395), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Add alert instance labels to Loki log lines in addition to stream labels. [#65403](https://github.com/grafana/grafana/pull/65403), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Elide requests to Loki if nothing should be recorded. [#65011](https://github.com/grafana/grafana/pull/65011), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Fix DatasourceUID and RefID missing for DatasourceNoData alerts. [#66733](https://github.com/grafana/grafana/pull/66733), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Fix ambiguous handling of equals in labels when bucketing Loki state history streams. [#65013](https://github.com/grafana/grafana/pull/65013), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Fix attachment of external labels to Loki state history log streams. [#65140](https://github.com/grafana/grafana/pull/65140), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Fix creating a recording rule when having multiple datasources. [#66415](https://github.com/grafana/grafana/pull/66415), [@VikaCep](https://github.com/VikaCep)
+- **Alerting:** Fix explore link in alert detail view. [#66106](https://github.com/grafana/grafana/pull/66106), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix share URL for Prometheus rules on subpath. [#66752](https://github.com/grafana/grafana/pull/66752), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix stats that display alert count when using unified alerting. [#64852](https://github.com/grafana/grafana/pull/64852), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Hide mute timing actions when dealing with vanilla prometheus. [#66457](https://github.com/grafana/grafana/pull/66457), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Paginate result previews. [#65257](https://github.com/grafana/grafana/pull/65257), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Prometheus-compatible Alertmanager timings editor. [#64526](https://github.com/grafana/grafana/pull/64526), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Update scheduler to get updates only from database. [#64635](https://github.com/grafana/grafana/pull/64635), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Use a completely isolated context for state history writes. [#64989](https://github.com/grafana/grafana/pull/64989), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Use displayNameFromDS if available in preview. [#65342](https://github.com/grafana/grafana/pull/65342), [@gillesdemey](https://github.com/gillesdemey)
+- **Annotation List:** Fix panel not updating when variable is changed. [#65899](https://github.com/grafana/grafana/pull/65899), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **Annotations:** Ignore unique constraint violations for tags. [#65935](https://github.com/grafana/grafana/pull/65935), [@sakjur](https://github.com/sakjur)
+- **Auth:** Fix orgrole picker disabled if isSynced user. [#64033](https://github.com/grafana/grafana/pull/64033), [@eleijonmarck](https://github.com/eleijonmarck)
+- **AzureMonitor:** Fix Log Analytics portal links. [#65482](https://github.com/grafana/grafana/pull/65482), [@aangelisc](https://github.com/aangelisc)
+- **BrowseDashboards:** Fix move to General folder not working. [#65653](https://github.com/grafana/grafana/pull/65653), [@joshhunt](https://github.com/joshhunt)
+- **Catalog:** Show install error with incompatible version. [#65059](https://github.com/grafana/grafana/pull/65059), [@andresmgot](https://github.com/andresmgot)
+- **Chore:** Update Grafana to use Alertmanager v0.25.1-0.20230308154952-78fedf89728b. [#64778](https://github.com/grafana/grafana/pull/64778), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **CloudMonitoring:** Add project selector for MQL editor[fix]. [#65567](https://github.com/grafana/grafana/pull/65567), [@alyssabull](https://github.com/alyssabull)
+- **CloudWatch Logs:** Fix running logs queries with expressions. [#65306](https://github.com/grafana/grafana/pull/65306), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch Logs:** Fix to make log queries use a relative time if available. [#65236](https://github.com/grafana/grafana/pull/65236), [@kevinwcyu](https://github.com/kevinwcyu)
+- **CloudWatch Logs:** Revert "Queries in an expression should run synchronously (#64443)". [#65036](https://github.com/grafana/grafana/pull/65036), [@fridgepoet](https://github.com/fridgepoet)
+- **CloudWatch:** Fix cachedQueries insights not being updated for metric queries. [#65495](https://github.com/grafana/grafana/pull/65495), [@kevinwcyu](https://github.com/kevinwcyu)
+- **Cloudwatch:** Pass refId from query for expression queries. [#66147](https://github.com/grafana/grafana/pull/66147), [@idastambuk](https://github.com/idastambuk)
+- **Dashboards:** Evaluate provisioned dashboard titles in a backwards compatible way. [#65184](https://github.com/grafana/grafana/pull/65184), [@sakjur](https://github.com/sakjur)
+- **Dashboards:** Fix Mobile support dashboard issues on new iOS 16.3. [#65542](https://github.com/grafana/grafana/pull/65542), [@axelavargas](https://github.com/axelavargas)
+- **Dashboards:** Fix broken internal data links. [#66567](https://github.com/grafana/grafana/pull/66567), [@ifrost](https://github.com/ifrost)
+- **Database:** Don't sleep 10ms before every request. [#64832](https://github.com/grafana/grafana/pull/64832), [@bboreham](https://github.com/bboreham)
+- **Elasticsearch:** Fix processing of response with multiple group by for alerting. [#65165](https://github.com/grafana/grafana/pull/65165), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Elasticsearch:** Handle multiple annotation structures. [#66762](https://github.com/grafana/grafana/pull/66762), [@gabor](https://github.com/gabor)
+- **Email:** Mark HTML comments as "safe" in email templates. [#64546](https://github.com/grafana/grafana/pull/64546), [@gillesdemey](https://github.com/gillesdemey)
+- **Emails:** Preserve HTML comments. (Enterprise)
+- **ErrorHandling:** Fixes issues with bad error messages. [#63775](https://github.com/grafana/grafana/pull/63775), [@torkelo](https://github.com/torkelo)
+- **ErrorView:** Better detection of no-data responses. [#65477](https://github.com/grafana/grafana/pull/65477), [@leeoniya](https://github.com/leeoniya)
+- **Explore:** Make `DataSourcePicker` visible on small screens. [#65149](https://github.com/grafana/grafana/pull/65149), [@abdulhdr1](https://github.com/abdulhdr1)
+- **Fix:** DataLinks from data sources override user defined data link. [#65996](https://github.com/grafana/grafana/pull/65996), [@axelavargas](https://github.com/axelavargas)
+- **Fix:** Top table rendering and update docs. [#64497](https://github.com/grafana/grafana/pull/64497), [@joey-grafana](https://github.com/joey-grafana)
+- **Frontend:** Fix broken links in /plugins when pathname has a trailing slash. [#64348](https://github.com/grafana/grafana/pull/64348), [@gassiss](https://github.com/gassiss)
+- **Geomap:** Fix route layer zoom behavior. [#63409](https://github.com/grafana/grafana/pull/63409), [@drew08t](https://github.com/drew08t)
+- **Google Cloud Monitoring:** Fix project variable. [#66524](https://github.com/grafana/grafana/pull/66524), [@asimpson](https://github.com/asimpson)
+- **HeatMap:** Sort y buckets when all bucket names are numeric. [#65322](https://github.com/grafana/grafana/pull/65322), [@leeoniya](https://github.com/leeoniya)
+- **InfluxDB:** Fix querying with hardcoded retention policy. [#66466](https://github.com/grafana/grafana/pull/66466), [@itsmylife](https://github.com/itsmylife)
+- **InfluxDB:** Fix sending retention policy with InfluxQL queries. [#63820](https://github.com/grafana/grafana/pull/63820), [@itsmylife](https://github.com/itsmylife)
+- **KVStore:** Include database field in migration. [#62790](https://github.com/grafana/grafana/pull/62790), [@zoltanbedi](https://github.com/zoltanbedi)
+- **LDAP:** Always synchronize Server Admin role through role sync if role sync is enabled. [#58820](https://github.com/grafana/grafana/pull/58820), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Library panels:** Ensure pagination controls are always correctly displayed. [#65283](https://github.com/grafana/grafana/pull/65283), [@ashharrison90](https://github.com/ashharrison90)
+- **Loki:** Fix autocomplete situations with multiple escaped quotes. [#65520](https://github.com/grafana/grafana/pull/65520), [@svennergr](https://github.com/svennergr)
+- **MegaMenu:** Fixes mega menu showing scroll indicator when it shouldn't. [#65452](https://github.com/grafana/grafana/pull/65452), [@torkelo](https://github.com/torkelo)
+- **Navigation:** Redirect to root page when switching organization. [#66655](https://github.com/grafana/grafana/pull/66655), [@ashharrison90](https://github.com/ashharrison90)
+- **Navigation:** Scrolled hamburger menu links now navigate correctly in Safari. [#66261](https://github.com/grafana/grafana/pull/66261), [@ashharrison90](https://github.com/ashharrison90)
+- **NestedFolders:** Fix nested folder deletion. [#63572](https://github.com/grafana/grafana/pull/63572), [@ying-jeanne](https://github.com/ying-jeanne)
+- **New Panel Header:** Fix when clicking submenu item the parent menu item onClick get's triggered. [#65691](https://github.com/grafana/grafana/pull/65691), [@axelavargas](https://github.com/axelavargas)
+- **Phlare:** Fix error when there are no profileTypes to send from backend. [#65455](https://github.com/grafana/grafana/pull/65455), [@aocenas](https://github.com/aocenas)
+- **PieChart:** Show long labels properly. [#65699](https://github.com/grafana/grafana/pull/65699), [@mdvictor](https://github.com/mdvictor)
+- **PluginExtensions:** Fixed issue with incorrect type being exposed when configuring an extension. [#65910](https://github.com/grafana/grafana/pull/65910), [@mckn](https://github.com/mckn)
+- **Plugins:** Ensure proxy route bodies are valid JSON. [#61771](https://github.com/grafana/grafana/pull/61771), [@wbrowne](https://github.com/wbrowne)
+- **Plugins:** Fix width for README pages with tables. [#66872](https://github.com/grafana/grafana/pull/66872), [@andresmgot](https://github.com/andresmgot)
+- **Plugins:** Markdown fetch retry with lowercase. [#65384](https://github.com/grafana/grafana/pull/65384), [@wbrowne](https://github.com/wbrowne)
+- **Plugins:** Skip instrumenting plugin build info for core and bundled plugins. [#66105](https://github.com/grafana/grafana/pull/66105), [@wbrowne](https://github.com/wbrowne)
+- **PublicDashboards:** Query collapsed panels inside rows. [#64779](https://github.com/grafana/grafana/pull/64779), [@evictorero](https://github.com/evictorero)
+- **Query Splitting:** Fix for handling queries with no requestId. [#66161](https://github.com/grafana/grafana/pull/66161), [@domasx2](https://github.com/domasx2)
+- **SQL Datasources:** Fix variable throwing error if query returns no data. [#65937](https://github.com/grafana/grafana/pull/65937), [@mdvictor](https://github.com/mdvictor)
+- **SQL Datasources:** Prevent Call Stack Overflows with Large Numbers of Values for Variable. [#64937](https://github.com/grafana/grafana/pull/64937), [@codeincarnate](https://github.com/codeincarnate)
+- **SQLStore:** Fix SQLite error propagation if query retries are disabled. [#64904](https://github.com/grafana/grafana/pull/64904), [@papagian](https://github.com/papagian)
+- **Stat Panel:** Fix issue with clipping text values. [#64300](https://github.com/grafana/grafana/pull/64300), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **Table Panel:** Fix panel migration for options cell type. [#66305](https://github.com/grafana/grafana/pull/66305), [@ryantxu](https://github.com/ryantxu)
+- **Table:** Fix migrations from old angular table for cell color modes. [#65760](https://github.com/grafana/grafana/pull/65760), [@torkelo](https://github.com/torkelo)
+- **Table:** Fixes issue with pagination summary causing scrollbar. [#65189](https://github.com/grafana/grafana/pull/65189), [@torkelo](https://github.com/torkelo)
+- **Table:** Fixes table panel gauge alignment. [#64994](https://github.com/grafana/grafana/pull/64994), [@torkelo](https://github.com/torkelo)
+- **TablePanel:** Fix table cells overflowing when there are multiple data links. [#65711](https://github.com/grafana/grafana/pull/65711), [@oscarkilhed](https://github.com/oscarkilhed)
+- **TablePanel:** fix footer bug; no footer calculated values after "hidden" column override. [#64269](https://github.com/grafana/grafana/pull/64269), [@baldm0mma](https://github.com/baldm0mma)
+- **Team sync:** Fix apply query string instead of param. (Enterprise)
+- **Templating:** Allow percent encoding of variable with custom all. [#65266](https://github.com/grafana/grafana/pull/65266), [@dprokop](https://github.com/dprokop)
+- **Tempo:** Set default limit if none is provided for traceql queries. [#65039](https://github.com/grafana/grafana/pull/65039), [@domasx2](https://github.com/domasx2)
+- **TimeSeries:** Don't extend stepped interpolation to graph edges. [#65657](https://github.com/grafana/grafana/pull/65657), [@leeoniya](https://github.com/leeoniya)
+- **TimeSeries:** Improve stacking direction heuristic. [#65499](https://github.com/grafana/grafana/pull/65499), [@leeoniya](https://github.com/leeoniya)
+- **Trace View:** Update the queryType to traceql for checking if same trace when clicking span link. [#66645](https://github.com/grafana/grafana/pull/66645), [@ericmustin](https://github.com/ericmustin)
+- **TraceView:** Don't require preferredVisualisationType to render. [#64920](https://github.com/grafana/grafana/pull/64920), [@aocenas](https://github.com/aocenas)
+- **Utils:** Reimplement util.GetRandomString to avoid modulo bias. [#64481](https://github.com/grafana/grafana/pull/64481), [@DanCech](https://github.com/DanCech)
+- **XYChart:** Add all dataset columns in tooltip. [#65027](https://github.com/grafana/grafana/pull/65027), [@mdvictor](https://github.com/mdvictor)
+
+### Breaking changes
+
+`default` named retention policies won't be used to query. Users who have a `default` named retention policy in their `influxdb` database, have to rename it to something else. Having `default` named retention policy is not breaking anything. We will make sure to use the actual default retention policy under the hood. To change the hardcoded retention policy in the `dashboard.json`, users must they select the right retention policy from dropdown and save the panel/dashboard. Issue [#66466](https://github.com/grafana/grafana/issues/66466)
+
+Grafana Alerting rules with `NoDataState` configuration set to `Alerting` will now respect "For" duration. Issue [#65574](https://github.com/grafana/grafana/issues/65574)
+
+Users who use LDAP role sync to only sync Viewer, Editor and Admin roles, but grant Grafana Server Admin role manually will not be able to do that anymore. After this change, LDAP role sync will override any manual changes to Grafana Server Admin role assignments. If `grafana_admin` is left unset in [LDAP role mapping configuration](https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-authentication/ldap/#group-mappings), it will default to false. Issue [#58820](https://github.com/grafana/grafana/issues/58820)
+
+### Plugin development fixes & changes
+
+- **DateTimePicker:** Can now select time correctly. [#65428](https://github.com/grafana/grafana/pull/65428), [@eledobleefe](https://github.com/eledobleefe)
+- **Grafana UI:** Fix tooltip prop of button component. [#64765](https://github.com/grafana/grafana/pull/64765), [@suleymanbariseser](https://github.com/suleymanbariseser)
+- **DateTimePicker:** Add min date support to calendar. [#64632](https://github.com/grafana/grafana/pull/64632), [@nevermind89x](https://github.com/nevermind89x)
+- **GrafanaUI:** Implement new component Toggletip. [#64459](https://github.com/grafana/grafana/pull/64459), [@yduartep](https://github.com/yduartep)
+- **ContextMenu:** Fix padding and show border based on items. [#63948](https://github.com/grafana/grafana/pull/63948), [@aocenas](https://github.com/aocenas)
+
+<!-- 9.5.0 END -->
 <!-- 9.4.9 START -->
 
 # 9.4.9 (2023-04-24)

From f0bdaed5b420b0e080371ce348e26bd6a914d641 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 26 Apr 2023 10:36:45 +0100
Subject: [PATCH 418/729] Changelog: Updated changelog for 9.5.1 (#67267)

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 502f105cf02..a0adf28c400 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<!-- 9.5.1 START -->
+
+# 9.5.1 (2023-04-24)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.20.3. [#66264](https://github.com/grafana/grafana/pull/66264), [@sakjur](https://github.com/sakjur)
+
+<!-- 9.5.1 END -->
 <!-- 9.5.0 START -->
 
 # 9.5.0 (2023-04-04)

From c54d2133a7dd74c347c5e1cc8d8fe853475c6cd8 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Wed, 26 Apr 2023 11:45:34 +0200
Subject: [PATCH 419/729] Build: Setup webpack configuration for direct-input
 bundled datasource (#67199)

---
 .../internal/input-datasource/.gitignore      |   1 +
 .../__mocks__/d3-interpolate.ts               |   1 +
 .../internal/input-datasource/jest.config.js  |  26 +++-
 .../internal/input-datasource/package.json    |  25 +--
 .../internal/input-datasource/tsconfig.json   |   8 +
 .../input-datasource/webpack.config.ts        | 146 ++++++++++++++++++
 yarn.lock                                     |  34 ++--
 7 files changed, 198 insertions(+), 43 deletions(-)
 create mode 100644 plugins-bundled/internal/input-datasource/.gitignore
 create mode 100644 plugins-bundled/internal/input-datasource/__mocks__/d3-interpolate.ts
 create mode 100644 plugins-bundled/internal/input-datasource/webpack.config.ts

diff --git a/plugins-bundled/internal/input-datasource/.gitignore b/plugins-bundled/internal/input-datasource/.gitignore
new file mode 100644
index 00000000000..61c3bc75a05
--- /dev/null
+++ b/plugins-bundled/internal/input-datasource/.gitignore
@@ -0,0 +1 @@
+.yarn
diff --git a/plugins-bundled/internal/input-datasource/__mocks__/d3-interpolate.ts b/plugins-bundled/internal/input-datasource/__mocks__/d3-interpolate.ts
new file mode 100644
index 00000000000..f053ebf7976
--- /dev/null
+++ b/plugins-bundled/internal/input-datasource/__mocks__/d3-interpolate.ts
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/plugins-bundled/internal/input-datasource/jest.config.js b/plugins-bundled/internal/input-datasource/jest.config.js
index bcf17c9087d..88c2dfafc09 100644
--- a/plugins-bundled/internal/input-datasource/jest.config.js
+++ b/plugins-bundled/internal/input-datasource/jest.config.js
@@ -1,8 +1,18 @@
-// This file is needed because it is used by vscode and other tools that
-// call `jest` directly.  However, unless you are doing anything special
-// do not edit this file
-
-const standard = require('@grafana/toolkit/src/config/jest.plugin.config');
-
-// This process will use the same config that `yarn test` is using
-module.exports = standard.jestConfig();
+module.exports = {
+  testEnvironment: 'jest-environment-jsdom',
+  preset: 'ts-jest',
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    '^.+\\.(t|j)sx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+        isolatedModules: true,
+        allowJs: true,
+      },
+    ],
+  },
+  moduleNameMapper: {
+    '^d3-interpolate$': '<rootDir>/__mocks__/d3-interpolate.ts',
+  },
+};
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index aa6567a463a..fd04cac7c97 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -8,27 +8,28 @@
     "url": "http://github.com/grafana/grafana.git"
   },
   "scripts": {
-    "build": "grafana-toolkit plugin:build",
-    "test": "grafana-toolkit plugin:test",
-    "dev": "grafana-toolkit plugin:dev",
-    "watch": "grafana-toolkit plugin:dev --watch"
+    "build": "yarn test && webpack -c webpack.config.ts --env production",
+    "dev": "webpack -w -c webpack.config.ts --env development",
+    "test": "jest -c jest.config.js"
   },
   "author": "Grafana Labs",
   "devDependencies": {
-    "@grafana/toolkit": "10.0.0-pre",
     "@types/jest": "26.0.15",
-    "@types/lodash": "4.14.149",
     "@types/react": "18.0.28",
-    "lodash": "4.17.21"
+    "copy-webpack-plugin": "11.0.0",
+    "eslint-webpack-plugin": "4.0.0",
+    "fork-ts-checker-webpack-plugin": "8.0.0",
+    "jest": "29.3.1",
+    "jest-environment-jsdom": "29.3.1",
+    "ts-jest": "29.0.5",
+    "ts-loader": "9.3.1",
+    "ts-node": "10.9.1",
+    "webpack": "5.76.0"
   },
   "dependencies": {
     "@grafana/data": "10.0.0-pre",
     "@grafana/ui": "10.0.0-pre",
-    "jquery": "3.5.1",
     "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "react-hook-form": "7.5.3",
-    "react-router-dom": "5.3.3",
-    "tslib": "2.4.0"
+    "tslib": "2.5.0"
   }
 }
diff --git a/plugins-bundled/internal/input-datasource/tsconfig.json b/plugins-bundled/internal/input-datasource/tsconfig.json
index a1bf2d01c58..2be6ec78f05 100644
--- a/plugins-bundled/internal/input-datasource/tsconfig.json
+++ b/plugins-bundled/internal/input-datasource/tsconfig.json
@@ -4,5 +4,13 @@
   "compilerOptions": {
     "rootDir": "./src",
     "baseUrl": "./src"
+  },
+  "ts-node": {
+    "compilerOptions": {
+      "module": "commonjs",
+      "target": "es5",
+      "esModuleInterop": true
+    },
+    "transpileOnly": true
   }
 }
diff --git a/plugins-bundled/internal/input-datasource/webpack.config.ts b/plugins-bundled/internal/input-datasource/webpack.config.ts
new file mode 100644
index 00000000000..1620a0b9d4d
--- /dev/null
+++ b/plugins-bundled/internal/input-datasource/webpack.config.ts
@@ -0,0 +1,146 @@
+import CopyWebpackPlugin from 'copy-webpack-plugin';
+import ESLintPlugin from 'eslint-webpack-plugin';
+import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
+import path from 'path';
+import { Configuration } from 'webpack';
+
+const SOURCE_DIR = path.resolve(__dirname, 'src');
+const DIST_DIR = path.resolve(__dirname, 'dist');
+const PLUGIN_ID = require(path.join(SOURCE_DIR, 'plugin.json')).id;
+
+const config = async (env: Record<string, string>): Promise<Configuration> => ({
+  cache: {
+    type: 'filesystem',
+    buildDependencies: {
+      config: [__filename],
+    },
+  },
+
+  context: path.join(process.cwd(), SOURCE_DIR),
+
+  devtool: env.production ? 'source-map' : 'eval-source-map',
+
+  entry: {
+    module: path.join(SOURCE_DIR, 'module.ts'),
+  },
+
+  externals: [
+    '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',
+    'react-router-dom',
+    'd3',
+    'angular',
+    '@grafana/ui',
+    '@grafana/runtime',
+    '@grafana/data',
+
+    // 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.substring(prefix.length);
+
+      if (request && hasPrefix(request)) {
+        return callback(undefined, stripPrefix(request));
+      }
+
+      callback();
+    },
+  ],
+
+  mode: env.production ? 'production' : 'development',
+
+  module: {
+    rules: [
+      {
+        exclude: /(node_modules)/,
+        test: /\.[tj]sx?$/,
+        use: {
+          loader: 'ts-loader',
+        },
+      },
+      {
+        test: /\.(png|jpe?g|gif|svg)$/,
+        type: 'asset/resource',
+        generator: {
+          // Keep publicPath relative for host.com/grafana/ deployments
+          publicPath: `public/plugins/${PLUGIN_ID}/img/`,
+          outputPath: 'img/',
+          filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
+        },
+      },
+      {
+        test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
+        type: 'asset/resource',
+        generator: {
+          // Keep publicPath relative for host.com/grafana/ deployments
+          publicPath: `public/plugins/${PLUGIN_ID}/fonts`,
+          outputPath: 'fonts/',
+          filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
+        },
+      },
+    ],
+  },
+
+  output: {
+    clean: {
+      keep: new RegExp(`.*?_(amd64|arm(64)?)(.exe)?`),
+    },
+    filename: '[name].js',
+    library: {
+      type: 'amd',
+    },
+    path: DIST_DIR,
+    publicPath: '/',
+  },
+
+  plugins: [
+    new CopyWebpackPlugin({
+      patterns: [
+        { from: '../README.md', to: '.', force: true, context: SOURCE_DIR },
+        { from: 'plugin.json', to: '.', context: SOURCE_DIR },
+        { from: '**/*.json', to: '.', context: SOURCE_DIR },
+        { from: '**/*.svg', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
+        { from: '**/*.png', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
+        { from: '**/*.html', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
+        { from: 'img/**/*', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
+        { from: 'libs/**/*', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
+        { from: 'static/**/*', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
+      ],
+    }),
+    new ForkTsCheckerWebpackPlugin({
+      async: Boolean(env.development),
+      issue: {
+        include: [{ file: '**/*.{ts,tsx}' }],
+      },
+      typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
+    }),
+    new ESLintPlugin({
+      extensions: ['.ts', '.tsx'],
+      lintDirtyModulesOnly: Boolean(env.development), // don't lint on start, only lint changed files
+    }),
+  ],
+
+  resolve: {
+    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+    // handle resolving "rootDir" paths
+    modules: [path.resolve(process.cwd(), 'src'), 'node_modules'],
+    unsafeCache: true,
+  },
+});
+
+export default config;
diff --git a/yarn.lock b/yarn.lock
index 20f98a90e43..a24b50d212f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3005,18 +3005,20 @@ __metadata:
   resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
   dependencies:
     "@grafana/data": 10.0.0-pre
-    "@grafana/toolkit": 10.0.0-pre
     "@grafana/ui": 10.0.0-pre
     "@types/jest": 26.0.15
-    "@types/lodash": 4.14.149
     "@types/react": 18.0.28
-    jquery: 3.5.1
-    lodash: 4.17.21
+    copy-webpack-plugin: 11.0.0
+    eslint-webpack-plugin: 4.0.0
+    fork-ts-checker-webpack-plugin: 8.0.0
+    jest: 29.3.1
+    jest-environment-jsdom: 29.3.1
     react: 18.2.0
-    react-dom: 18.2.0
-    react-hook-form: 7.5.3
-    react-router-dom: 5.3.3
-    tslib: 2.4.0
+    ts-jest: 29.0.5
+    ts-loader: 9.3.1
+    ts-node: 10.9.1
+    tslib: 2.5.0
+    webpack: 5.76.0
   languageName: unknown
   linkType: soft
 
@@ -3375,7 +3377,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/toolkit@10.0.0-pre, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
+"@grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
   version: 0.0.0-use.local
   resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit"
   dependencies:
@@ -9760,13 +9762,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:4.14.149":
-  version: 4.14.149
-  resolution: "@types/lodash@npm:4.14.149"
-  checksum: 6caf68cf38d9672851490cdb0a9ef25a90495c05903ca16e62d1d78ebb8b12ee46b20c2a5e29b7667612baedca0087c10f56debc305e486aba08b3dbefb93865
-  languageName: node
-  linkType: hard
-
 "@types/lodash@npm:4.14.181":
   version: 4.14.181
   resolution: "@types/lodash@npm:4.14.181"
@@ -24036,13 +24031,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jquery@npm:3.5.1":
-  version: 3.5.1
-  resolution: "jquery@npm:3.5.1"
-  checksum: 813047b852511ca1ecfaa7b2568aba1d7270a92e5c74962b308792a401adf041869a3b2a6858b0b7a02f6684947fb93171e40cbb4460831977a937b40b0e15ce
-  languageName: node
-  linkType: hard
-
 "jquery@npm:3.6.3":
   version: 3.6.3
   resolution: "jquery@npm:3.6.3"

From 258f11f08d8b9379ca816501922e27d690b04b85 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 26 Apr 2023 11:20:10 +0100
Subject: [PATCH 420/729] Nested folders: deduplicate selection of children
 (#67229)

* scaffold out dedupe logic, use mock api to get descendant info

* rename methods

* use for..of

* some renaming for clarity
---
 .../api/browseDashboardsAPI.ts                | 57 ++++++++++++++++++-
 .../BrowseActions/BrowseActions.tsx           |  4 +-
 .../BrowseActions/DeleteModal.test.tsx        |  7 ++-
 .../components/BrowseActions/DeleteModal.tsx  | 25 ++++----
 .../BrowseActions/MoveModal.test.tsx          |  7 ++-
 .../components/BrowseActions/MoveModal.tsx    | 28 ++++-----
 .../components/BrowseView.tsx                 |  4 +-
 .../features/browse-dashboards/state/hooks.ts | 56 +++++++++++++++++-
 8 files changed, 152 insertions(+), 36 deletions(-)

diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index 3fe6e34364a..a3e0ca101a7 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -1,9 +1,12 @@
 import { BaseQueryFn, createApi } from '@reduxjs/toolkit/query/react';
 import { lastValueFrom } from 'rxjs';
 
+import { isTruthy } from '@grafana/data';
 import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
 import { FolderDTO } from 'app/types';
 
+import { DashboardTreeSelection } from '../types';
+
 interface RequestOptions extends BackendSrvRequest {
   manageError?: (err: unknown) => { error: unknown };
   showErrorAlert?: boolean;
@@ -35,8 +38,60 @@ export const browseDashboardsAPI = createApi({
     getFolder: builder.query<FolderDTO, string>({
       query: (folderUID) => ({ url: `/folders/${folderUID}` }),
     }),
+    getAffectedItems: builder.query<
+      // TODO move to folder types file once structure is finalised
+      {
+        folder: number;
+        dashboard: number;
+        libraryPanel: number;
+        alertRule: number;
+      },
+      DashboardTreeSelection
+    >({
+      queryFn: async (selectedItems) => {
+        const folderUIDs = Object.keys(selectedItems.folder).filter((uid) => selectedItems.folder[uid]);
+        // Mock descendant count
+        // TODO convert to real implementation
+        const mockDescendantCount = {
+          folder: 1,
+          dashboard: 1,
+          libraryPanel: 1,
+          alertRule: 1,
+        };
+        const promises = folderUIDs.map((id) => {
+          return new Promise<typeof mockDescendantCount>((resolve, reject) => {
+            // Artificial delay to simulate network request
+            setTimeout(() => {
+              resolve(mockDescendantCount);
+              // reject(new Error('Uh oh!'));
+            }, 1000);
+          });
+        });
+
+        const results = await Promise.all(promises);
+        const aggregatedResults = results.reduce(
+          (acc, val) => ({
+            folder: acc.folder + val.folder,
+            dashboard: acc.dashboard + val.dashboard,
+            libraryPanel: acc.libraryPanel + val.libraryPanel,
+            alertRule: acc.alertRule + val.alertRule,
+          }),
+          {
+            folder: 0,
+            dashboard: 0,
+            libraryPanel: 0,
+            alertRule: 0,
+          }
+        );
+
+        // Add in the top level selected items
+        aggregatedResults.folder += Object.values(selectedItems.folder).filter(isTruthy).length;
+        aggregatedResults.dashboard += Object.values(selectedItems.dashboard).filter(isTruthy).length;
+        return { data: aggregatedResults };
+      },
+    }),
   }),
 });
 
-export const { useGetFolderQuery } = browseDashboardsAPI;
+export const { useGetFolderQuery, useGetAffectedItemsQuery } = browseDashboardsAPI;
 export { skipToken } from '@reduxjs/toolkit/query/react';
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
index 9d5aca6f4d4..235cddea5b4 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
@@ -6,7 +6,7 @@ import { Button, useStyles2 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
 import { ShowModalReactEvent } from 'app/types/events';
 
-import { useSelectedItemsState } from '../../state';
+import { useActionSelectionState } from '../../state';
 
 import { DeleteModal } from './DeleteModal';
 import { MoveModal } from './MoveModal';
@@ -15,7 +15,7 @@ export interface Props {}
 
 export function BrowseActions() {
   const styles = useStyles2(getStyles);
-  const selectedItems = useSelectedItemsState();
+  const selectedItems = useActionSelectionState();
 
   const onMove = () => {
     appEvents.publish(
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
index 95d1f53993f..aec7aef75b3 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
@@ -1,9 +1,14 @@
-import { render, screen } from '@testing-library/react';
+import { render as rtlRender, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
 
 import { DeleteModal, Props } from './DeleteModal';
 
+function render(...[ui, options]: Parameters<typeof rtlRender>) {
+  rtlRender(<TestProvider>{ui}</TestProvider>, options);
+}
+
 describe('browse-dashboards DeleteModal', () => {
   const mockOnDismiss = jest.fn();
   const mockOnConfirm = jest.fn();
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
index 6bba8ea1839..332688bb22e 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
@@ -1,9 +1,10 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2, isTruthy } from '@grafana/data';
-import { ConfirmModal, useStyles2 } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { Alert, ConfirmModal, Spinner, useStyles2 } from '@grafana/ui';
 
+import { useGetAffectedItemsQuery } from '../../api/browseDashboardsAPI';
 import { DashboardTreeSelection } from '../../types';
 
 import { buildBreakdownString } from './utils';
@@ -17,14 +18,7 @@ export interface Props {
 
 export const DeleteModal = ({ onConfirm, onDismiss, selectedItems, ...props }: Props) => {
   const styles = useStyles2(getStyles);
-
-  // TODO abstract all this counting logic out
-  const folderCount = Object.values(selectedItems.folder).filter(isTruthy).length;
-  const dashboardCount = Object.values(selectedItems.dashboard).filter(isTruthy).length;
-  // hardcoded values for now
-  // TODO replace with dummy API
-  const libraryPanelCount = 1;
-  const alertRuleCount = 1;
+  const { data, isFetching, isLoading, error } = useGetAffectedItemsQuery(selectedItems);
 
   const onDelete = () => {
     onConfirm();
@@ -36,9 +30,13 @@ export const DeleteModal = ({ onConfirm, onDismiss, selectedItems, ...props }: P
       body={
         <div className={styles.modalBody}>
           This action will delete the following content:
-          <p className={styles.breakdown}>
-            {buildBreakdownString(folderCount, dashboardCount, libraryPanelCount, alertRuleCount)}
-          </p>
+          <div className={styles.breakdown}>
+            <>
+              {data && buildBreakdownString(data.folder, data.dashboard, data.libraryPanel, data.alertRule)}
+              {(isFetching || isLoading) && <Spinner size={12} />}
+              {error && <Alert severity="error" title="Unable to retrieve descendant information" />}
+            </>
+          </div>
         </div>
       }
       confirmationText="Delete"
@@ -55,6 +53,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
   breakdown: css({
     ...theme.typography.bodySmall,
     color: theme.colors.text.secondary,
+    marginBottom: theme.spacing(2),
   }),
   modalBody: css({
     ...theme.typography.body,
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
index 21f37c6aad9..a5ae8362f95 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
@@ -1,6 +1,7 @@
-import { render, screen } from '@testing-library/react';
+import { render as rtlRender, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
 import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
 import * as api from 'app/features/manage-dashboards/state/actions';
@@ -8,6 +9,10 @@ import { DashboardSearchHit } from 'app/features/search/types';
 
 import { MoveModal, Props } from './MoveModal';
 
+function render(...[ui, options]: Parameters<typeof rtlRender>) {
+  rtlRender(<TestProvider>{ui}</TestProvider>, options);
+}
+
 describe('browse-dashboards MoveModal', () => {
   const mockOnDismiss = jest.fn();
   const mockOnConfirm = jest.fn();
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
index 8c8ac827dd2..54dcefb868d 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
@@ -1,10 +1,11 @@
 import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
-import { GrafanaTheme2, isTruthy } from '@grafana/data';
-import { Alert, Button, Field, Modal, useStyles2 } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { Alert, Button, Field, Modal, Spinner, useStyles2 } from '@grafana/ui';
 import { FolderPicker } from 'app/core/components/Select/FolderPicker';
 
+import { useGetAffectedItemsQuery } from '../../api/browseDashboardsAPI';
 import { DashboardTreeSelection } from '../../types';
 
 import { buildBreakdownString } from './utils';
@@ -19,14 +20,8 @@ export interface Props {
 export const MoveModal = ({ onConfirm, onDismiss, selectedItems, ...props }: Props) => {
   const [moveTarget, setMoveTarget] = useState<string>();
   const styles = useStyles2(getStyles);
-
-  // TODO abstract all this counting logic out
-  const folderCount = Object.values(selectedItems.folder).filter(isTruthy).length;
-  const dashboardCount = Object.values(selectedItems.dashboard).filter(isTruthy).length;
-  // hardcoded values for now
-  // TODO replace with dummy API
-  const libraryPanelCount = 1;
-  const alertRuleCount = 1;
+  const selectedFolders = Object.keys(selectedItems.folder).filter((uid) => selectedItems.folder[uid]);
+  const { data, isFetching, isLoading, error } = useGetAffectedItemsQuery(selectedItems);
 
   const onMove = () => {
     if (moveTarget !== undefined) {
@@ -37,11 +32,15 @@ export const MoveModal = ({ onConfirm, onDismiss, selectedItems, ...props }: Pro
 
   return (
     <Modal title="Move" onDismiss={onDismiss} {...props}>
-      {folderCount > 0 && <Alert severity="warning" title="Moving this item may change its permissions." />}
+      {selectedFolders.length > 0 && <Alert severity="warning" title="Moving this item may change its permissions." />}
       This action will move the following content:
-      <p className={styles.breakdown}>
-        {buildBreakdownString(folderCount, dashboardCount, libraryPanelCount, alertRuleCount)}
-      </p>
+      <div className={styles.breakdown}>
+        <>
+          {data && buildBreakdownString(data.folder, data.dashboard, data.libraryPanel, data.alertRule)}
+          {(isFetching || isLoading) && <Spinner size={12} />}
+          {error && <Alert severity="error" title="Unable to retrieve descendant information" />}
+        </>
+      </div>
       <Field label="Folder name">
         <FolderPicker allowEmpty onChange={({ uid }) => setMoveTarget(uid)} />
       </Field>
@@ -61,5 +60,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
   breakdown: css({
     ...theme.typography.bodySmall,
     color: theme.colors.text.secondary,
+    marginBottom: theme.spacing(2),
   }),
 });
diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
index 233dd22998a..8245f789213 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -5,7 +5,7 @@ import { useDispatch } from 'app/types';
 
 import {
   useFlatTreeState,
-  useSelectedItemsState,
+  useCheckboxSelectionState,
   fetchChildren,
   setFolderOpenState,
   setItemSelectionState,
@@ -22,7 +22,7 @@ interface BrowseViewProps {
 export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
   const dispatch = useDispatch();
   const flatTree = useFlatTreeState(folderUID);
-  const selectedItems = useSelectedItemsState();
+  const selectedItems = useCheckboxSelectionState();
 
   useEffect(() => {
     dispatch(fetchChildren(folderUID));
diff --git a/public/app/features/browse-dashboards/state/hooks.ts b/public/app/features/browse-dashboards/state/hooks.ts
index e09bdb5e38d..dd6a78319bc 100644
--- a/public/app/features/browse-dashboards/state/hooks.ts
+++ b/public/app/features/browse-dashboards/state/hooks.ts
@@ -3,7 +3,7 @@ import { createSelector } from 'reselect';
 import { DashboardViewItem } from 'app/features/search/types';
 import { useSelector, StoreState } from 'app/types';
 
-import { DashboardsTreeItem } from '../types';
+import { DashboardsTreeItem, DashboardTreeSelection } from '../types';
 
 const flatTreeSelector = createSelector(
   (wholeState: StoreState) => wholeState.browseDashboards.rootItems,
@@ -24,6 +24,14 @@ const hasSelectionSelector = createSelector(
   }
 );
 
+const selectedItemsForActionsSelector = createSelector(
+  (wholeState: StoreState) => wholeState.browseDashboards.selectedItems,
+  (wholeState: StoreState) => wholeState.browseDashboards.childrenByParentUID,
+  (selectedItems, childrenByParentUID) => {
+    return getSelectedItemsForActions(selectedItems, childrenByParentUID);
+  }
+);
+
 export function useFlatTreeState(folderUID: string | undefined) {
   return useSelector((state) => flatTreeSelector(state, folderUID));
 }
@@ -32,10 +40,14 @@ export function useHasSelection() {
   return useSelector((state) => hasSelectionSelector(state));
 }
 
-export function useSelectedItemsState() {
+export function useCheckboxSelectionState() {
   return useSelector((wholeState: StoreState) => wholeState.browseDashboards.selectedItems);
 }
 
+export function useActionSelectionState() {
+  return useSelector((state) => selectedItemsForActionsSelector(state));
+}
+
 /**
  * Creates a list of items, with level indicating it's 'nested' in the tree structure
  *
@@ -83,3 +95,43 @@ function createFlatTree(
 
   return items.flatMap((item) => mapItem(item, folderUID, level));
 }
+
+/**
+ * Returns a DashboardTreeSelection but unselects any selected folder's children.
+ * This is useful when making backend requests to move or delete items.
+ * In this case, we only need to move/delete the parent folder and it will cascade to the children.
+ * @param selectedItemsState Overall selection state
+ * @param childrenByParentUID Arrays of children keyed by their parent UID
+ */
+function getSelectedItemsForActions(
+  selectedItemsState: DashboardTreeSelection,
+  childrenByParentUID: Record<string, DashboardViewItem[] | undefined>
+): Omit<DashboardTreeSelection, 'panel'> {
+  // Take a copy of the selected items to work with
+  // We don't care about panels here, only dashboards and folders can be moved or deleted
+  const result: Omit<DashboardTreeSelection, 'panel'> = {
+    dashboard: { ...selectedItemsState.dashboard },
+    folder: { ...selectedItemsState.folder },
+  };
+
+  // Loop over selected folders in the input
+  for (const folderUID of Object.keys(selectedItemsState.folder)) {
+    const isSelected = selectedItemsState.folder[folderUID];
+    if (isSelected) {
+      // Unselect any children in the output
+      const children = childrenByParentUID[folderUID];
+      if (children) {
+        for (const child of children) {
+          if (child.kind === 'dashboard') {
+            result.dashboard[child.uid] = false;
+          }
+          if (child.kind === 'folder') {
+            result.folder[child.uid] = false;
+          }
+        }
+      }
+    }
+  }
+
+  return result;
+}

From a4f1206811080721c3aaa676e4749b0d7201f184 Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Wed, 26 Apr 2023 12:27:32 +0200
Subject: [PATCH 421/729] DataSourcePicker: Fix datasource picker input not
 clearing on close (#67248)

Fix datasource picker input not clearing on close
---
 .../datasources/components/picker/DataSourceDropdown.tsx        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index 2ae3ac8900f..d7665765aab 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -46,6 +46,7 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
   });
 
   const onClose = useCallback(() => {
+    setFilterTerm('');
     setOpen(false);
     markerElement?.blur();
   }, [setOpen, markerElement]);
@@ -82,6 +83,7 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
           placeholder={dataSourceLabel(currentDataSourceInstanceSettings)}
           onFocus={openDropdown}
           onClick={openDropdown}
+          value={filterTerm}
           onChange={(e) => {
             setFilterTerm(e.currentTarget.value);
           }}

From c962d3175bf40625ce846e9ff53947b79112a016 Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Wed, 26 Apr 2023 11:49:29 +0100
Subject: [PATCH 422/729] Docs: troubleshooting guide for RBAC (#67147)

* docs on how to reset permissions

* remove unneeded cascade
---
 .../access-control/troubleshooting/index.md   | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 docs/sources/administration/roles-and-permissions/access-control/troubleshooting/index.md

diff --git a/docs/sources/administration/roles-and-permissions/access-control/troubleshooting/index.md b/docs/sources/administration/roles-and-permissions/access-control/troubleshooting/index.md
new file mode 100644
index 00000000000..ecae3532a2f
--- /dev/null
+++ b/docs/sources/administration/roles-and-permissions/access-control/troubleshooting/index.md
@@ -0,0 +1,90 @@
+---
+aliases:
+  - ../../../enterprise/access-control/troubleshooting/
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+description: RBAC troubleshooting guide.
+menuTitle: Troubleshooting RBAC
+title: Troubleshooting RBAC
+weight: 80
+---
+
+# Troubleshooting RBAC
+
+In this section, you’ll learn about logs that are available for RBAC and you’ll find the most common RBAC issues.
+
+## Enable debug logging
+
+You can enable debug log messages for RBAC in the Grafana configuration file. Debug logs are added to the Grafana server logs.
+
+```bash
+[log]
+filters = accesscontrol:debug accesscontrol.evaluator:debug dashboard.permissions:debug
+```
+
+## Enable audit logging
+
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.3 and later, and [Grafana Cloud Advanced](/docs/grafana-cloud).
+
+You can enable auditing in the Grafana configuration file.
+
+```bash
+[auditing]
+enabled = true
+```
+
+All permission and role updates, and role assignments are added to audit logs.
+Learn more about [access control audit logs]({{< relref "../../../../setup-grafana/configure-security/audit-grafana/#access-control" >}}).
+
+## Missing dashboard, folder or data source permissions
+
+[Dashboard and folder permissions]({{< relref "../../#dashboard-permissions" >}}) and [data source permissions]({{< relref "../../#data-source-permissions" >}}) can go out of sync if a Grafana instance version is upgraded, downgraded and then upgraded again.
+This happens when an instance is downgraded from a version that uses RBAC to a version that uses the legacy access control, and dashboard, folder or data source permissions are updated.
+These permission updates will not be applied to RBAC, so permissions will be out of sync when the instance is next upgraded to a version with RBAC.
+
+> **Note:** the steps provided below will set all dashboard, folder and data source permissions to what they are set to with the legacy access control.
+> If you have made dashboard, folder or data source permission updates with RBAC enabled, these updates will be wiped.
+
+To resynchronize the permissions:
+
+1. make a backup of your database
+1. run the following SQL queries
+   ```sql
+   DELETE
+   FROM builtin_role
+   where role_id IN (SELECT id
+                     FROM role
+                     WHERE name LIKE 'managed:%');
+   DELETE
+   FROM team_role
+   where role_id IN (SELECT id
+                     FROM role
+                     WHERE name LIKE 'managed:%');
+   DELETE
+   FROM user_role
+   where role_id IN (SELECT id
+                     FROM role
+                     WHERE name LIKE 'managed:%');
+   DELETE
+   FROM permission
+   where role_id IN (SELECT id
+                     FROM role
+                     WHERE name LIKE 'managed:%');
+   DELETE
+   FROM role
+   WHERE name LIKE 'managed:%';
+   DELETE
+   FROM migration_log
+   WHERE migration_id IN ('teams permissions migration',
+                          'dashboard permissions',
+                          'dashboard permissions uid scopes',
+                          'data source permissions',
+                          'data source uid permissions',
+                          'managed permissions migration',
+                          'managed folder permissions alert actions repeated migration',
+                          'managed permissions migration enterprise');
+   ```
+1. restart your Grafana instance

From d51e63520cad6779728cf53bfaaf89048cfea9a7 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Wed, 26 Apr 2023 13:26:07 +0200
Subject: [PATCH 423/729] Loki: Fix log samples using `instant` queries
 (#67271)

change log samples queryType to always be `range`
---
 public/app/plugins/datasource/loki/datasource.test.ts | 7 +++----
 public/app/plugins/datasource/loki/datasource.ts      | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index 2f789da2dd0..ff23e68c88c 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -932,8 +932,7 @@ describe('LokiDatasource', () => {
           )
         ).toEqual({
           expr: 'sum by (level) (count_over_time({label=value}[$__interval]))',
-          instant: false,
-          queryType: 'range',
+          queryType: LokiQueryType.Range,
           refId: 'log-volume-A',
           supportingQueryType: SupportingQueryType.LogsVolume,
         });
@@ -997,7 +996,7 @@ describe('LokiDatasource', () => {
           )
         ).toEqual({
           expr: '{label=value}',
-          queryType: 'instant',
+          queryType: LokiQueryType.Range,
           refId: 'log-sample-A',
           maxLines: 20,
         });
@@ -1015,7 +1014,7 @@ describe('LokiDatasource', () => {
           )
         ).toEqual({
           expr: '{label=value}',
-          queryType: 'instant',
+          queryType: LokiQueryType.Range,
           refId: 'log-sample-A',
           maxLines: 5,
         });
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 674c382489e..e63e7ed127f 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -193,7 +193,7 @@ export class LokiDatasource
         return {
           ...normalizedQuery,
           refId: `${REF_ID_STARTER_LOG_VOLUME}${normalizedQuery.refId}`,
-          instant: false,
+          queryType: LokiQueryType.Range,
           supportingQueryType: SupportingQueryType.LogsVolume,
           expr: `sum by (level) (count_over_time(${expr}[$__interval]))`,
         };
@@ -206,6 +206,7 @@ export class LokiDatasource
         }
         return {
           ...normalizedQuery,
+          queryType: LokiQueryType.Range,
           refId: `${REF_ID_STARTER_LOG_SAMPLE}${normalizedQuery.refId}`,
           expr: getLogQueryFromMetricsQuery(expr),
           maxLines: Number.isNaN(Number(options.limit)) ? this.maxLines : Number(options.limit),

From a62cb960890909796aca8f637a5b840354c31d6c Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Wed, 26 Apr 2023 13:41:31 +0200
Subject: [PATCH 424/729] QueryGroup: Fix infinite loop in edit mode (#67273)

---
 public/app/features/query/components/QueryGroup.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index 54bd6c25e87..c3cb601104c 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -99,7 +99,8 @@ export class QueryGroup extends PureComponent<Props, State> {
   async componentDidUpdate() {
     const { options } = this.props;
 
-    if (this.state.dataSource && options.dataSource.uid !== this.state.dataSource?.uid) {
+    const currentDS = await getDataSourceSrv().get(options.dataSource);
+    if (this.state.dataSource && currentDS.uid !== this.state.dataSource?.uid) {
       this.setNewQueriesAndDatasource(options);
     }
   }

From 47aa8c76545a7dbe99a498ca3a88110f9331c4af Mon Sep 17 00:00:00 2001
From: Juan Cabanas <juan.cabanas@grafana.com>
Date: Wed, 26 Apr 2023 09:06:38 -0300
Subject: [PATCH 425/729] PublicDashboards: HoverWidget in panel fix (#66685)

Hover widget modified for public dashboards.
---
 .../src/selectors/components.ts               |  4 ++
 .../components/PanelChrome/HoverWidget.tsx    |  8 ++-
 .../containers/PublicDashboardPage.test.tsx   | 71 ++++++++++++++++++-
 .../containers/PublicDashboardPage.tsx        |  2 +-
 .../dashboard/dashgrid/DashboardGrid.tsx      | 11 +--
 .../dashboard/dashgrid/DashboardPanel.tsx     | 16 ++++-
 .../dashboard/dashgrid/PanelChromeAngular.tsx |  1 +
 .../dashboard/dashgrid/PanelStateWrapper.tsx  |  1 +
 .../dashboard/utils/getPanelChromeProps.tsx   |  4 +-
 9 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/grafana-e2e-selectors/src/selectors/components.ts
index b53074f8d0f..1e303539e32 100644
--- a/packages/grafana-e2e-selectors/src/selectors/components.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/components.ts
@@ -77,6 +77,10 @@ export const Components = {
       containerByTitle: (title: string) => `${title} panel`,
       headerCornerInfo: (mode: string) => `Panel header ${mode}`,
       loadingBar: () => `Panel loading bar`,
+      HoverWidget: {
+        container: 'data-test-id hover-header-container',
+        dragIcon: 'data-testid drag-icon',
+      },
     },
     Visualization: {
       Graph: {
diff --git a/packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx b/packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx
index 6a78d7d9389..3105d991c54 100644
--- a/packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx
@@ -2,6 +2,7 @@ import { css, cx } from '@emotion/css';
 import React, { ReactElement, useCallback, useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 
 import { useStyles2 } from '../../themes';
 import { Icon } from '../Icon/Icon';
@@ -16,6 +17,8 @@ interface Props {
   dragClass?: string;
 }
 
+const selectors = e2eSelectors.components.Panels.Panel.HoverWidget;
+
 export function HoverWidget({ menu, title, dragClass, children, offset = -32 }: Props) {
   const styles = useStyles2(getStyles);
   const draggableRef = useRef<HTMLDivElement>(null);
@@ -39,7 +42,7 @@ export function HoverWidget({ menu, title, dragClass, children, offset = -32 }:
     <div
       className={cx(styles.container, { 'show-on-hover': !menuOpen })}
       style={{ top: `${offset}px` }}
-      data-testid="hover-header-container"
+      data-testid={selectors.container}
     >
       {dragClass && (
         <div
@@ -47,11 +50,12 @@ export function HoverWidget({ menu, title, dragClass, children, offset = -32 }:
           onPointerDown={onPointerDown}
           onPointerUp={onPointerUp}
           ref={draggableRef}
+          data-testid={selectors.dragIcon}
         >
           <Icon name="expand-arrows" className={styles.draggableIcon} />
         </div>
       )}
-      {!title && <h6 className={cx(styles.untitled, styles.draggable, dragClass)}>Untitled</h6>}
+      {!title && <h6 className={cx(styles.untitled, { [styles.draggable]: !!dragClass }, dragClass)}>Untitled</h6>}
       {children}
       {menu && (
         <PanelMenu
diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
index df4ad02b0b7..61194d5f504 100644
--- a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
@@ -1,4 +1,5 @@
 import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Provider } from 'react-redux';
 import { Router } from 'react-router-dom';
@@ -8,11 +9,12 @@ import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { locationService } from '@grafana/runtime';
-import { Dashboard, DashboardCursorSync } from '@grafana/schema/src';
+import { Dashboard, DashboardCursorSync, FieldConfigSource, ThresholdsMode, Panel } from '@grafana/schema/src';
+import config from 'app/core/config';
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
-import { DashboardInitPhase, DashboardMeta, DashboardRoutes } from 'app/types';
 import * as appTypes from 'app/types';
+import { DashboardInitPhase, DashboardMeta, DashboardRoutes } from 'app/types';
 
 import { SafeDynamicImport } from '../../../core/components/DynamicImports/SafeDynamicImport';
 import { configureStore } from '../../../store/configureStore';
@@ -125,6 +127,9 @@ const getTestDashboard = (overrides?: Partial<Dashboard>, metaOverrides?: Partia
 
 describe('PublicDashboardPage', () => {
   beforeEach(() => {
+    config.featureToggles.publicDashboards = true;
+    config.featureToggles.newPanelChromeUI = true;
+
     jest.clearAllMocks();
   });
 
@@ -175,6 +180,68 @@ describe('PublicDashboardPage', () => {
         expect(screen.queryByTestId(publicDashboardSelector.NotAvailable.container)).not.toBeInTheDocument();
       });
     });
+
+    it('Should render panel with hover widget but without drag icon when panel title is undefined', async () => {
+      const fieldConfig: FieldConfigSource = {
+        defaults: {
+          thresholds: {
+            mode: ThresholdsMode.Absolute,
+            steps: [
+              {
+                color: 'green',
+                value: 1,
+              },
+              {
+                color: 'red',
+                value: 80,
+              },
+            ],
+          },
+        },
+        overrides: [],
+      };
+      const panels: Panel[] = [
+        {
+          id: 1,
+          fieldConfig,
+          gridPos: {
+            h: 8,
+            w: 12,
+            x: 0,
+            y: 0,
+          },
+          options: {},
+          title: undefined,
+          type: 'timeseries',
+          repeatDirection: 'h',
+          transformations: [],
+          transparent: false,
+        },
+      ];
+
+      const newState = {
+        dashboard: {
+          getModel: () => getTestDashboard({ panels }),
+          initError: null,
+          initPhase: DashboardInitPhase.Completed,
+          permissions: [],
+        },
+      };
+      setup(undefined, newState);
+
+      await waitFor(() => {
+        expect(screen.getByTestId(selectors.Panels.Panel.HoverWidget.container)).toBeInTheDocument();
+      });
+      await userEvent.hover(screen.getByTestId(selectors.Panels.Panel.HoverWidget.container));
+      expect(screen.queryByTestId(selectors.Panels.Panel.HoverWidget.dragIcon)).not.toBeInTheDocument();
+    });
+
+    it('Should render panel without hover widget when panel title is not undefined', async () => {
+      setup(undefined, newState);
+      await waitFor(() => {
+        expect(screen.queryByTestId(selectors.Panels.Panel.HoverWidget.container)).not.toBeInTheDocument();
+      });
+    });
   });
 
   describe('Given a public dashboard with time range enabled', () => {
diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.tsx
index bf4ee765c2a..12e5fa6cda8 100644
--- a/public/app/features/dashboard/containers/PublicDashboardPage.tsx
+++ b/public/app/features/dashboard/containers/PublicDashboardPage.tsx
@@ -122,7 +122,7 @@ const PublicDashboardPage = (props: Props) => {
 const getStyles = (theme: GrafanaTheme2) => ({
   gridContainer: css({
     flex: 1,
-    padding: theme.spacing(0, 2, 2, 2),
+    padding: theme.spacing(2, 2, 2, 2),
     overflow: 'auto',
   }),
 });
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
index efdfc481df9..532f1e3b824 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
@@ -142,7 +142,7 @@ export class DashboardGrid extends PureComponent<Props, State> {
     return { top, bottom: this.lastPanelBottom };
   }
 
-  renderPanels(gridWidth: number) {
+  renderPanels(gridWidth: number, isDashboardDraggable: boolean) {
     const panelElements = [];
 
     // Reset last panel bottom
@@ -171,7 +171,7 @@ export class DashboardGrid extends PureComponent<Props, State> {
           isViewing={panel.isViewing}
         >
           {(width: number, height: number) => {
-            return this.renderPanel(panel, width, height);
+            return this.renderPanel(panel, width, height, isDashboardDraggable);
           }}
         </GrafanaGridItem>
       );
@@ -180,7 +180,7 @@ export class DashboardGrid extends PureComponent<Props, State> {
     return panelElements;
   }
 
-  renderPanel(panel: PanelModel, width: number, height: number) {
+  renderPanel(panel: PanelModel, width: number, height: number, isDraggable: boolean) {
     if (panel.type === 'row') {
       return <DashboardRow key={panel.key} panel={panel} dashboard={this.props.dashboard} />;
     }
@@ -202,6 +202,7 @@ export class DashboardGrid extends PureComponent<Props, State> {
         dashboard={this.props.dashboard}
         isEditing={panel.isEditing}
         isViewing={panel.isViewing}
+        isDraggable={isDraggable}
         width={width}
         height={height}
         hideMenu={this.props.hidePanelMenus}
@@ -258,7 +259,7 @@ export class DashboardGrid extends PureComponent<Props, State> {
                     onResizeStop={this.onResizeStop}
                     onLayoutChange={this.onLayoutChange}
                   >
-                    {this.renderPanels(width)}
+                    {this.renderPanels(width, draggable)}
                   </ReactGridLayout>
                 </div>
               ) : (
@@ -290,7 +291,7 @@ export class DashboardGrid extends PureComponent<Props, State> {
                   onResizeStop={this.onResizeStop}
                   onLayoutChange={this.onLayoutChange}
                 >
-                  {this.renderPanels(width)}
+                  {this.renderPanels(width, draggable)}
                 </ReactGridLayout>
               </div>
             );
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index 3e6a31f5b5a..89da60bb032 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -17,6 +17,7 @@ export interface OwnProps {
   dashboard: DashboardModel;
   isEditing: boolean;
   isViewing: boolean;
+  isDraggable?: boolean;
   width: number;
   height: number;
   lazy?: boolean;
@@ -72,7 +73,18 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
   };
 
   renderPanel = ({ isInView }: { isInView: boolean }) => {
-    const { dashboard, panel, isViewing, isEditing, width, height, plugin, timezone, hideMenu } = this.props;
+    const {
+      dashboard,
+      panel,
+      isViewing,
+      isEditing,
+      width,
+      height,
+      plugin,
+      timezone,
+      hideMenu,
+      isDraggable = true,
+    } = this.props;
 
     if (!plugin) {
       return null;
@@ -87,6 +99,7 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
           isViewing={isViewing}
           isEditing={isEditing}
           isInView={isInView}
+          isDraggable={isDraggable}
           width={width}
           height={height}
         />
@@ -101,6 +114,7 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
         isViewing={isViewing}
         isEditing={isEditing}
         isInView={isInView}
+        isDraggable={isDraggable}
         width={width}
         height={height}
         onInstanceStateChange={this.onInstanceStateChange}
diff --git a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
index 47d9f581ef9..435341e227d 100644
--- a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
@@ -28,6 +28,7 @@ interface OwnProps {
   isViewing: boolean;
   isEditing: boolean;
   isInView: boolean;
+  isDraggable?: boolean;
   width: number;
   height: number;
   hideMenu?: boolean;
diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
index a05518aacde..a593580c61e 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
@@ -65,6 +65,7 @@ export interface Props {
   isViewing: boolean;
   isEditing: boolean;
   isInView: boolean;
+  isDraggable?: boolean;
   width: number;
   height: number;
   onInstanceStateChange: (value: any) => void;
diff --git a/public/app/features/dashboard/utils/getPanelChromeProps.tsx b/public/app/features/dashboard/utils/getPanelChromeProps.tsx
index fb4a68d5c99..90cf4261878 100644
--- a/public/app/features/dashboard/utils/getPanelChromeProps.tsx
+++ b/public/app/features/dashboard/utils/getPanelChromeProps.tsx
@@ -17,6 +17,7 @@ interface CommonProps {
   isViewing: boolean;
   isEditing: boolean;
   isInView: boolean;
+  isDraggable?: boolean;
   width: number;
   height: number;
   hideMenu?: boolean;
@@ -100,7 +101,8 @@ export function getPanelChromeProps(props: CommonProps) {
 
   const description = props.panel.description ? onShowPanelDescription() : undefined;
 
-  const dragClass = !(props.isViewing || props.isEditing) ? 'grid-drag-handle' : '';
+  const dragClass =
+    !(props.isViewing || props.isEditing) && Boolean(props.isDraggable ?? true) ? 'grid-drag-handle' : '';
 
   const title = props.panel.getDisplayTitle();
 

From 9599e8003b3476dbc6629d43b60e5c9eeee45b85 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:43:20 +0300
Subject: [PATCH 426/729] Datagrid: Switch to panel context update (#67221)

* WIP

* Switch Datagrid to use PanelContext onUpdateData

* PR modifications

* refactor

* block panel if not enabled
---
 .../datagrid_metric_values.json               |  1 +
 .../datagrid-data-change.spec.ts              |  8 +-
 .../datagrid-editing-features.spec.ts         | 13 ++-
 .../app/plugins/datasource/grafana/utils.ts   |  2 +-
 .../panel/datagrid/DataGridPanel.test.tsx     | 38 ++++----
 .../plugins/panel/datagrid/DataGridPanel.tsx  | 95 ++++++++++++-------
 .../panel/datagrid/featureFlagUtils.tsx       |  2 +-
 public/app/plugins/panel/datagrid/state.ts    |  4 +-
 .../app/plugins/panel/datagrid/utils.test.ts  |  2 +-
 public/app/plugins/panel/datagrid/utils.ts    | 92 +++++++++---------
 10 files changed, 147 insertions(+), 110 deletions(-)

diff --git a/devenv/dev-dashboards/panel-datagrid/datagrid_metric_values.json b/devenv/dev-dashboards/panel-datagrid/datagrid_metric_values.json
index 9ee8da0fd5d..6fb2f433102 100644
--- a/devenv/dev-dashboards/panel-datagrid/datagrid_metric_values.json
+++ b/devenv/dev-dashboards/panel-datagrid/datagrid_metric_values.json
@@ -75,5 +75,6 @@
   "timezone": "",
   "title": "Datagrid example",
   "version": 0,
+  "uid": "c01bf42b-b783-4447-a304-8554cee1843b",
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/e2e/datagrid-suite/datagrid-data-change.spec.ts b/e2e/datagrid-suite/datagrid-data-change.spec.ts
index df61fca4751..f4409e32220 100644
--- a/e2e/datagrid-suite/datagrid-data-change.spec.ts
+++ b/e2e/datagrid-suite/datagrid-data-change.spec.ts
@@ -1,6 +1,6 @@
 import { e2e } from '@grafana/e2e';
 
-const DASHBOARD_ID = 'a70ecb44-6c31-412d-ae74-d6306303ce37';
+const DASHBOARD_ID = 'c01bf42b-b783-4447-a304-8554cee1843b';
 const DATAGRID_SELECT_SERIES = 'Datagrid Select series';
 
 e2e.scenario({
@@ -27,8 +27,10 @@ e2e.scenario({
     // Edit datagrid which triggers a snapshot query
     cy.get('.dvn-scroller').click(200, 100);
     cy.get('[data-testid="glide-cell-2-1"]').should('have.attr', 'aria-selected', 'true');
-    cy.get('body').type('123455{enter}', { delay: 1000 });
+    cy.get('body').type('12{enter}', { delay: 500 });
 
-    cy.get('[data-testid="query-editor-row"]').contains('Spreadsheet or snapshot');
+    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+
+    cy.get('[data-testid="query-editor-row"]').contains('Snapshot');
   },
 });
diff --git a/e2e/datagrid-suite/datagrid-editing-features.spec.ts b/e2e/datagrid-suite/datagrid-editing-features.spec.ts
index f1972fd6457..e71d1f31967 100644
--- a/e2e/datagrid-suite/datagrid-editing-features.spec.ts
+++ b/e2e/datagrid-suite/datagrid-editing-features.spec.ts
@@ -1,6 +1,6 @@
 import { e2e } from '@grafana/e2e';
 
-const DASHBOARD_ID = 'a70ecb44-6c31-412d-ae74-d6306303ce37';
+const DASHBOARD_ID = 'c01bf42b-b783-4447-a304-8554cee1843b';
 const DATAGRID_CANVAS = 'data-grid-canvas';
 
 e2e.scenario({
@@ -15,7 +15,9 @@ e2e.scenario({
     // Edit datagrid which triggers a snapshot query
     cy.get('.dvn-scroller').click(200, 100);
     cy.get('[data-testid="glide-cell-2-1"]').should('have.attr', 'aria-selected', 'true');
-    cy.get('body').type('1{enter}');
+    cy.get('body').type('123{enter}', { delay: 500 });
+
+    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
 
     // Delete a cell
     cy.get('.dvn-scroller').click(200, 200);
@@ -55,6 +57,7 @@ e2e.scenario({
     cy.get('.dvn-scroller').click(20, 190, { waitForAnimations: true });
     cy.get('.dvn-scroller').click(20, 90, { shiftKey: true, waitForAnimations: true }); // with shift to select all rows between clicks
     cy.get('body').type('{del}');
+    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
     cy.get('[data-testid="glide-cell-1-4"]').should('have.text', '');
     cy.get('[data-testid="glide-cell-1-3"]').should('have.text', '');
     cy.get('[data-testid="glide-cell-1-2"]').should('have.text', '');
@@ -68,6 +71,9 @@ e2e.scenario({
     cy.get('.dvn-scroller').click(20, 190, { waitForAnimations: true });
     cy.get('.dvn-scroller').click(20, 90, { commandKey: true, waitForAnimations: true }); // with cmd to select only clicked rows
     cy.get('body').type('{del}');
+
+    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+
     cy.get('[data-testid="glide-cell-1-1"]').should('have.text', '');
     cy.get('[data-testid="glide-cell-2-1"]').should('have.text', 0);
     cy.get('[data-testid="glide-cell-2-4"]').should('have.text', 0);
@@ -83,6 +89,7 @@ e2e.scenario({
     // Delete column through header dropdown menu
     cy.get('.dvn-scroller').click(250, 15); // click header dropdown
     cy.get('body').click(450, 420); // click delete column
+    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
     cy.get(`[data-testid="${DATAGRID_CANVAS}"] th`).should('have.length', 1);
 
     // Delete row through context menu
@@ -101,6 +108,7 @@ e2e.scenario({
     cy.get('.dvn-scroller').click(20, 90, { commandKey: true, waitForAnimations: true }); // with shift to select all rows between clicks
     cy.get('.dvn-scroller').rightclick(40, 90);
     cy.get('[aria-label="Context menu"]').click(10, 10);
+    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
     cy.get(`[data-testid="${DATAGRID_CANVAS}"] tbody tr`).should('have.length', 5); // there are 5 data rows + 1 for the add new row btns
 
     // Delete column through context menu
@@ -113,6 +121,7 @@ e2e.scenario({
 
     // Add a new column
     cy.get('body').click(350, 200).type('New Column{enter}');
+    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
     cy.get('body')
       .click(350, 230)
       .type('Value 1{enter}')
diff --git a/public/app/plugins/datasource/grafana/utils.ts b/public/app/plugins/datasource/grafana/utils.ts
index ec9b6ff321c..1e7972f5888 100644
--- a/public/app/plugins/datasource/grafana/utils.ts
+++ b/public/app/plugins/datasource/grafana/utils.ts
@@ -22,7 +22,7 @@ export function onUpdatePanelSnapshotData(panel: PanelModel, frames: DataFrame[]
     appEvents.publish(
       new ShowConfirmModalEvent({
         title: 'Change to panel embedded data',
-        text: 'If you want to change the data shown in this panel Grafana will need to remove the panels current query and replace it with a snapshot of the current data. This enabled you to edit the data',
+        text: 'If you want to change the data shown in this panel Grafana will need to remove the panels current query and replace it with a snapshot of the current data. This enables you to edit the data.',
         yesText: 'Continue',
         icon: 'pen',
         onConfirm: () => {
diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
index 49bc1ffae58..d2e13269bf7 100644
--- a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
@@ -1,14 +1,14 @@
 import { render, screen, fireEvent, act, waitFor } from '@testing-library/react';
 import * as React from 'react';
 
-import { ArrayVector, DataFrame, dateTime, EventBus, FieldType, LoadingState, MutableDataFrame } from '@grafana/data';
+import { ArrayVector, DataFrame, dateTime, EventBus, Field, FieldType, LoadingState } from '@grafana/data';
 
 import { DataGridPanel, DataGridProps } from './DataGridPanel';
 import * as utils from './utils';
 
 jest.mock('./featureFlagUtils', () => {
   return {
-    isDatagridEditEnabled: jest.fn().mockReturnValue(true),
+    isDatagridEnabled: jest.fn().mockReturnValue(true),
   };
 });
 
@@ -18,7 +18,7 @@ jest.mock('./utils', () => {
     ...originalModule,
     deleteRows: jest.fn(),
     clearCellsFromRangeSelection: jest.fn(),
-    publishSnapshot: jest.fn(),
+    updateSnapshot: jest.fn(),
   };
 });
 
@@ -192,7 +192,7 @@ describe('DataGrid', () => {
     });
 
     it('editing a cell triggers publishing the snapshot', async () => {
-      const spy = jest.spyOn(utils, 'publishSnapshot');
+      const spy = jest.spyOn(utils, 'updateSnapshot');
       jest.useFakeTimers();
       render(<DataGridPanel {...props} />, {
         wrapper: Context,
@@ -215,7 +215,7 @@ describe('DataGrid', () => {
       const expectedField = {
         ...props.data.series[0].fields[0],
       };
-      expectedField.values = new ArrayVector([1, 9, 3, 4]);
+      expectedField.values = [1, 9, 3, 4];
 
       await waitFor(() => {
         const overlay = screen.getByDisplayValue('9');
@@ -234,7 +234,7 @@ describe('DataGrid', () => {
           expect.objectContaining({
             fields: expect.arrayContaining([expectedField]),
           }),
-          1
+          undefined
         );
       });
     });
@@ -272,7 +272,7 @@ describe('DataGrid', () => {
       });
     });
     it('should add a new column', async () => {
-      const spy = jest.spyOn(utils, 'publishSnapshot');
+      const spy = jest.spyOn(utils, 'updateSnapshot');
       jest.useFakeTimers();
       render(<DataGridPanel {...props} />, {
         wrapper: Context,
@@ -301,11 +301,12 @@ describe('DataGrid', () => {
             }),
           ]),
         }),
-        1
+        undefined
       );
     });
+
     it('should not add a new column if input is empty', async () => {
-      const spy = jest.spyOn(utils, 'publishSnapshot');
+      const spy = jest.spyOn(utils, 'updateSnapshot');
       jest.useFakeTimers();
       render(<DataGridPanel {...props} />, {
         wrapper: Context,
@@ -322,8 +323,9 @@ describe('DataGrid', () => {
 
       expect(spy).not.toBeCalled();
     });
+
     it('should add a new row', async () => {
-      const spy = jest.spyOn(utils, 'publishSnapshot');
+      const spy = jest.spyOn(utils, 'updateSnapshot');
       jest.useFakeTimers();
       render(<DataGridPanel {...props} />, {
         wrapper: Context,
@@ -368,9 +370,9 @@ describe('DataGrid', () => {
     });
 
     it('should clear cell when cell is selected and delete button clicked', async () => {
+      const spy = jest.spyOn(utils, 'updateSnapshot');
       const spyClearingCells = jest.spyOn(utils, 'clearCellsFromRangeSelection');
       const spyDeleteRows = jest.spyOn(utils, 'deleteRows');
-      const spy = jest.spyOn(utils, 'publishSnapshot');
 
       jest.useFakeTimers();
       render(<DataGridPanel {...props} />, {
@@ -398,9 +400,9 @@ describe('DataGrid', () => {
     });
 
     it('should clear row when row is selected delete button clicked', async () => {
+      const spy = jest.spyOn(utils, 'updateSnapshot');
       const spyClearingCells = jest.spyOn(utils, 'clearCellsFromRangeSelection');
       const spyDeleteRows = jest.spyOn(utils, 'deleteRows');
-      const spy = jest.spyOn(utils, 'publishSnapshot');
 
       jest.useFakeTimers();
       render(<DataGridPanel {...props} />, {
@@ -424,8 +426,7 @@ describe('DataGrid', () => {
     });
 
     it('should move column when column dragged and dropped', async () => {
-      const spy = jest.spyOn(utils, 'publishSnapshot');
-
+      const spy = jest.spyOn(utils, 'updateSnapshot');
       jest.useFakeTimers();
       render(<DataGridPanel {...props} />, {
         wrapper: Context,
@@ -446,17 +447,18 @@ describe('DataGrid', () => {
 
       fireEvent.mouseUp(canvas);
 
-      const df = new MutableDataFrame(props.data.series[0]);
+      const df = {
+        ...props.data.series[0],
+      };
 
       df.fields = [df.fields[1], df.fields[0], df.fields[2]];
-      const received = spy.mock.calls[spy.mock.calls.length - 1][0].fields.map((f) => f.name);
+      const received = spy.mock.calls[spy.mock.calls.length - 1][0].fields.map((f: Field) => f.name);
 
       expect(received).toEqual(df.fields.map((f) => f.name));
     });
 
     it('should move row when row dragged and dropped', async () => {
-      const spy = jest.spyOn(utils, 'publishSnapshot');
-
+      const spy = jest.spyOn(utils, 'updateSnapshot');
       jest.useFakeTimers();
       render(<DataGridPanel {...props} />, {
         wrapper: Context,
diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
index f99370c49ad..dc72717ce5c 100644
--- a/public/app/plugins/panel/datagrid/DataGridPanel.tsx
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
@@ -10,16 +10,16 @@ import DataEditor, {
 } from '@glideapps/glide-data-grid';
 import React, { useEffect, useReducer } from 'react';
 
-import { Field, PanelProps, FieldType } from '@grafana/data';
+import { Field, PanelProps, FieldType, DataFrame } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
-import { useTheme2 } from '@grafana/ui';
+import { usePanelContext, useTheme2 } from '@grafana/ui';
 
 import '@glideapps/glide-data-grid/dist/index.css';
 
 import { AddColumn } from './components/AddColumn';
 import { DatagridContextMenu } from './components/DatagridContextMenu';
 import { RenameColumnCell } from './components/RenameColumnCell';
-import { isDatagridEditEnabled } from './featureFlagUtils';
+import { isDatagridEnabled } from './featureFlagUtils';
 import { PanelOptions } from './panelcfg.gen';
 import { DatagridActionType, datagridReducer, initialState } from './state';
 import {
@@ -28,19 +28,21 @@ import {
   EMPTY_CELL,
   getGridCellKind,
   getGridTheme,
-  publishSnapshot,
   RIGHT_ELEMENT_PROPS,
   TRAILING_ROW_OPTIONS,
   getStyles,
   ROW_MARKER_BOTH,
   ROW_MARKER_NUMBER,
   hasGridSelection,
+  updateSnapshot,
 } from './utils';
 
 export interface DataGridProps extends PanelProps<PanelOptions> {}
 
 export function DataGridPanel({ options, data, id, fieldConfig, width, height }: DataGridProps) {
   const [state, dispatch] = useReducer(datagridReducer, initialState);
+  const { onUpdateData } = usePanelContext();
+
   const {
     columns,
     contextMenuData,
@@ -74,9 +76,23 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
     return getGridCellKind(field, row, hasGridSelection(gridSelection));
   };
 
-  const onCellEdited = (cell: Item, newValue: EditableGridCell) => {
+  const onCellEdited = async (cell: Item, newValue: EditableGridCell) => {
+    // if there are rows selected, return early, we don't want to edit any cell
+    if (hasGridSelection(gridSelection)) {
+      return;
+    }
+
     const [col, row] = cell;
-    const field: Field = frame.fields[col];
+    const frameCopy = {
+      ...frame,
+      fields: frame.fields.map((f) => {
+        return {
+          ...f,
+          values: [...f.values],
+        };
+      }),
+    };
+    const field: Field = frameCopy.fields[col];
 
     if (!field) {
       return;
@@ -85,14 +101,14 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
     const values = field.values.toArray();
 
     values[row] = newValue.data;
-    field.values = values;
+    field.values = [...values];
 
-    publishSnapshot(frame, id);
+    updateSnapshot(frameCopy, onUpdateData);
   };
 
   const onColumnInputBlur = (columnName: string) => {
     const len = frame.length ?? 0;
-    publishSnapshot(
+    updateSnapshot(
       {
         ...frame,
         fields: [
@@ -105,7 +121,7 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
           },
         ],
       },
-      id
+      onUpdateData
     );
   };
 
@@ -115,7 +131,8 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
       values.push(null);
       return { ...f, values };
     });
-    publishSnapshot({ ...frame, fields, length: frame.length + 1 }, id);
+
+    updateSnapshot({ ...frame, fields, length: frame.length + 1 }, onUpdateData);
   };
 
   const onColumnResize = (column: GridColumn, width: number, columnIndex: number, newSizeWithGrow: number) => {
@@ -133,12 +150,12 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
 
   const onDeletePressed = (selection: GridSelection) => {
     if (selection.current && selection.current.range) {
-      publishSnapshot(clearCellsFromRangeSelection(frame, selection.current.range), id);
+      updateSnapshot(clearCellsFromRangeSelection(frame, selection.current.range), onUpdateData);
       return true;
     }
 
     if (selection.rows) {
-      publishSnapshot(deleteRows(frame, selection.rows.toArray()), id);
+      updateSnapshot(deleteRows(frame, selection.rows.toArray()), onUpdateData);
       return true;
     }
 
@@ -162,14 +179,17 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
     });
   };
 
-  const onColumnMove = (from: number, to: number) => {
+  const onColumnMove = async (from: number, to: number) => {
     const fields = frame.fields.map((f) => f);
     const field = fields[from];
     fields.splice(from, 1);
     fields.splice(to, 0, field);
 
-    dispatch({ type: DatagridActionType.columnMove, payload: { from, to } });
-    publishSnapshot({ ...frame, fields }, id);
+    const hasUpdated = await updateSnapshot({ ...frame, fields }, onUpdateData);
+
+    if (hasUpdated) {
+      dispatch({ type: DatagridActionType.columnMove, payload: { from, to } });
+    }
   };
 
   const onRowMove = (from: number, to: number) => {
@@ -181,7 +201,7 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
       field.values.splice(to, 0, value);
     }
 
-    publishSnapshot({ ...frame, fields }, id);
+    updateSnapshot({ ...frame, fields }, onUpdateData);
   };
 
   const onColumnRename = () => {
@@ -193,7 +213,8 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
     fields[columnIdx].name = columnName;
 
     dispatch({ type: DatagridActionType.hideColumnRenameInput });
-    publishSnapshot({ ...frame, fields }, id);
+
+    updateSnapshot({ ...frame, fields }, onUpdateData);
   };
 
   const onSearchClose = () => {
@@ -204,10 +225,18 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
     dispatch({ type: DatagridActionType.multipleCellsSelected, payload: { selection } });
   };
 
+  const onContextMenuSave = (data: DataFrame) => {
+    updateSnapshot(data, onUpdateData);
+  };
+
   if (!frame) {
     return <PanelDataErrorView panelId={id} fieldConfig={fieldConfig} data={data} />;
   }
 
+  if (!isDatagridEnabled()) {
+    return <PanelDataErrorView panelId={id} message="Datagrid is not enabled" fieldConfig={fieldConfig} data={data} />;
+  }
+
   if (!document.getElementById('portal')) {
     const portal = document.createElement('div');
     portal.id = 'portal';
@@ -230,37 +259,37 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
         smoothScrollX
         smoothScrollY
         overscrollY={50}
-        onCellEdited={isDatagridEditEnabled() ? onCellEdited : undefined}
-        getCellsForSelection={isDatagridEditEnabled() ? true : undefined}
-        showSearch={isDatagridEditEnabled() ? toggleSearch : false}
+        onCellEdited={isDatagridEnabled() ? onCellEdited : undefined}
+        getCellsForSelection={isDatagridEnabled() ? true : undefined}
+        showSearch={isDatagridEnabled() ? toggleSearch : false}
         onSearchClose={onSearchClose}
-        onPaste={isDatagridEditEnabled() ? true : undefined}
+        onPaste={isDatagridEnabled() ? true : undefined}
         gridSelection={gridSelection}
-        onGridSelectionChange={isDatagridEditEnabled() ? onGridSelectionChange : undefined}
-        onRowAppended={isDatagridEditEnabled() ? addNewRow : undefined}
-        onDelete={isDatagridEditEnabled() ? onDeletePressed : undefined}
-        rowMarkers={isDatagridEditEnabled() ? ROW_MARKER_BOTH : ROW_MARKER_NUMBER}
+        onGridSelectionChange={isDatagridEnabled() ? onGridSelectionChange : undefined}
+        onRowAppended={isDatagridEnabled() ? addNewRow : undefined}
+        onDelete={isDatagridEnabled() ? onDeletePressed : undefined}
+        rowMarkers={isDatagridEnabled() ? ROW_MARKER_BOTH : ROW_MARKER_NUMBER}
         onColumnResize={onColumnResize}
         onColumnResizeEnd={onColumnResizeEnd}
-        onCellContextMenu={isDatagridEditEnabled() ? onCellContextMenu : undefined}
-        onHeaderContextMenu={isDatagridEditEnabled() ? onHeaderContextMenu : undefined}
-        onHeaderMenuClick={isDatagridEditEnabled() ? onHeaderMenuClick : undefined}
+        onCellContextMenu={isDatagridEnabled() ? onCellContextMenu : undefined}
+        onHeaderContextMenu={isDatagridEnabled() ? onHeaderContextMenu : undefined}
+        onHeaderMenuClick={isDatagridEnabled() ? onHeaderMenuClick : undefined}
         trailingRowOptions={TRAILING_ROW_OPTIONS}
         rightElement={
-          isDatagridEditEnabled() ? (
+          isDatagridEnabled() ? (
             <AddColumn onColumnInputBlur={onColumnInputBlur} divStyle={styles.addColumnDiv} />
           ) : null
         }
         rightElementProps={RIGHT_ELEMENT_PROPS}
         freezeColumns={columnFreezeIndex}
-        onRowMoved={isDatagridEditEnabled() ? onRowMove : undefined}
-        onColumnMoved={isDatagridEditEnabled() ? onColumnMove : undefined}
+        onRowMoved={isDatagridEnabled() ? onRowMove : undefined}
+        onColumnMoved={isDatagridEnabled() ? onColumnMove : undefined}
       />
       {contextMenuData.isContextMenuOpen && (
         <DatagridContextMenu
           menuData={contextMenuData}
           data={frame}
-          saveData={(data) => publishSnapshot(data, id)}
+          saveData={onContextMenuSave}
           closeContextMenu={closeContextMenu}
           dispatch={dispatch}
           gridSelection={gridSelection}
diff --git a/public/app/plugins/panel/datagrid/featureFlagUtils.tsx b/public/app/plugins/panel/datagrid/featureFlagUtils.tsx
index e2fed546cf0..0b41f53c114 100644
--- a/public/app/plugins/panel/datagrid/featureFlagUtils.tsx
+++ b/public/app/plugins/panel/datagrid/featureFlagUtils.tsx
@@ -1,5 +1,5 @@
 import { config } from '@grafana/runtime';
 
-export const isDatagridEditEnabled = () => {
+export const isDatagridEnabled = () => {
   return config.featureToggles.enableDatagridEditing;
 };
diff --git a/public/app/plugins/panel/datagrid/state.ts b/public/app/plugins/panel/datagrid/state.ts
index 28d7db07807..65840df7afe 100644
--- a/public/app/plugins/panel/datagrid/state.ts
+++ b/public/app/plugins/panel/datagrid/state.ts
@@ -10,7 +10,7 @@ import {
 
 import { DataFrame, Field, FieldType, getFieldDisplayName } from '@grafana/data';
 
-import { isDatagridEditEnabled } from './featureFlagUtils';
+import { isDatagridEnabled } from './featureFlagUtils';
 import {
   DatagridContextMenuData,
   DEFAULT_CONTEXT_MENU,
@@ -224,7 +224,7 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
             title: displayName,
             width: state.columns[index]?.width ?? getCellWidth(field),
             icon: typeToIconMap.get(field.type),
-            hasMenu: isDatagridEditEnabled(),
+            hasMenu: isDatagridEnabled(),
             trailingRowOptions: { targetColumn: --index },
           };
         }),
diff --git a/public/app/plugins/panel/datagrid/utils.test.ts b/public/app/plugins/panel/datagrid/utils.test.ts
index 3d493c2106a..79144a21426 100644
--- a/public/app/plugins/panel/datagrid/utils.test.ts
+++ b/public/app/plugins/panel/datagrid/utils.test.ts
@@ -54,7 +54,7 @@ describe('when deleting rows', () => {
     expect(newDf.fields[2].values.toArray()).toEqual(['a', 'c', 'e']);
     expect(newDf.length).toEqual(3);
 
-    newDf = deleteRows(df, [2], true);
+    newDf = deleteRows(newDf, [2], true);
 
     expect(newDf.fields[0].values.toArray()).toEqual(['a', 'c']);
     expect(newDf.fields[1].values.toArray()).toEqual([1, 3]);
diff --git a/public/app/plugins/panel/datagrid/utils.ts b/public/app/plugins/panel/datagrid/utils.ts
index 5cb6cf08724..3545dc3af86 100644
--- a/public/app/plugins/panel/datagrid/utils.ts
+++ b/public/app/plugins/panel/datagrid/utils.ts
@@ -1,11 +1,9 @@
 import { css } from '@emotion/css';
 import { CompactSelection, GridCell, GridCellKind, GridSelection, Theme } from '@glideapps/glide-data-grid';
 
-import { ArrayVector, DataFrame, DataFrameJSON, dataFrameToJSON, Field, GrafanaTheme2, FieldType } from '@grafana/data';
-import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
-import { GrafanaQuery, GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
+import { DataFrame, Field, GrafanaTheme2, FieldType } from '@grafana/data';
 
-import { isDatagridEditEnabled } from './featureFlagUtils';
+import { isDatagridEnabled } from './featureFlagUtils';
 
 const HEADER_FONT_FAMILY = '600 13px Inter';
 const CELL_FONT_FAMILY = '400 13px Inter';
@@ -25,11 +23,6 @@ export const EMPTY_DF = {
   length: 0,
 };
 
-export const GRAFANA_DS = {
-  type: 'grafana',
-  uid: 'grafana',
-};
-
 export const EMPTY_CELL: GridCell = {
   kind: GridCellKind.Text,
   data: '',
@@ -79,6 +72,17 @@ interface CellRange {
   height: number;
 }
 
+export async function updateSnapshot(
+  frame: DataFrame,
+  updateData?: (frames: DataFrame[]) => Promise<boolean>
+): Promise<boolean> {
+  if (updateData && isDatagridEnabled()) {
+    return await updateData([frame]);
+  }
+
+  return false;
+}
+
 export const getTextWidth = (text: string, isHeader = false): number => {
   const context = TEXT_CANVAS.getContext('2d');
   context!.font = isHeader ? HEADER_FONT_FAMILY : CELL_FONT_FAMILY;
@@ -107,7 +111,12 @@ export const getCellWidth = (field: Field): number => {
 };
 
 export const deleteRows = (gridData: DataFrame, rows: number[], hardDelete = false): DataFrame => {
-  for (const field of gridData.fields) {
+  const copy = {
+    ...gridData,
+    fields: gridData.fields.map((field) => ({ ...field, values: field.values.slice() })),
+  };
+
+  for (const field of copy.fields) {
     const valuesArray = field.values.toArray();
 
     //delete from the end of the array to avoid index shifting
@@ -119,13 +128,12 @@ export const deleteRows = (gridData: DataFrame, rows: number[], hardDelete = fal
       }
     }
 
-    field.values = new ArrayVector(valuesArray);
+    field.values = [...valuesArray];
   }
 
   return {
-    ...gridData,
-    fields: [...gridData.fields],
-    length: gridData.fields[0]?.values.length ?? 0,
+    ...copy,
+    length: copy.fields[0]?.values.length ?? 0,
   };
 };
 
@@ -133,50 +141,29 @@ export const clearCellsFromRangeSelection = (gridData: DataFrame, range: CellRan
   const colFrom: number = range.x;
   const rowFrom: number = range.y;
   const colTo: number = range.x + range.width - 1;
+  const copy = {
+    ...gridData,
+    fields: gridData.fields.map((field) => ({ ...field, values: field.values.slice() })),
+  };
 
   for (let i = colFrom; i <= colTo; i++) {
-    const field = gridData.fields[i];
+    const field = copy.fields[i];
 
     const valuesArray = field.values.toArray();
     valuesArray.splice(rowFrom, range.height, ...new Array(range.height).fill(null));
-    field.values = new ArrayVector(valuesArray);
+    field.values = [...valuesArray];
   }
 
   return {
-    ...gridData,
-    fields: [...gridData.fields],
-    length: gridData.fields[0]?.values.length ?? 0,
+    ...copy,
+    length: copy.fields[0]?.values.length ?? 0,
   };
 };
 
-export const publishSnapshot = (data: DataFrame, panelID: number): void => {
-  if (!isDatagridEditEnabled()) {
-    return;
-  }
-
-  const snapshot: DataFrameJSON[] = [dataFrameToJSON(data)];
-  const dashboard = getDashboardSrv().getCurrent();
-  const panelModel = dashboard?.getPanelById(panelID);
-
-  const query: GrafanaQuery = {
-    refId: 'A',
-    queryType: GrafanaQueryType.Snapshot,
-    snapshot,
-    datasource: GRAFANA_DS,
-  };
-
-  panelModel!.updateQueries({
-    dataSource: GRAFANA_DS,
-    queries: [query],
-  });
-
-  panelModel!.refresh();
-};
-
 //Converting an array of nulls or undefineds returns them as strings and prints them in the cells instead of empty cells. Thus the cleanup func
 export const cleanStringFieldAfterConversion = (field: Field): void => {
   const valuesArray = field.values.toArray();
-  field.values = new ArrayVector(valuesArray.map((val) => (val === 'undefined' || val === 'null' ? null : val)));
+  field.values = valuesArray.map((val) => (val === 'undefined' || val === 'null' ? null : val));
   return;
 };
 
@@ -217,7 +204,7 @@ export const getGridCellKind = (field: Field, row: number, hasGridSelection = fa
       return {
         kind: GridCellKind.Number,
         data: value ? value : 0,
-        allowOverlay: isDatagridEditEnabled()! && !hasGridSelection,
+        allowOverlay: isDatagridEnabled()! && !hasGridSelection,
         readonly: false,
         displayData: value !== null && value !== undefined ? value.toString() : '',
       };
@@ -225,7 +212,7 @@ export const getGridCellKind = (field: Field, row: number, hasGridSelection = fa
       return {
         kind: GridCellKind.Text,
         data: value ? value : '',
-        allowOverlay: isDatagridEditEnabled()! && !hasGridSelection,
+        allowOverlay: isDatagridEnabled()! && !hasGridSelection,
         readonly: false,
         displayData: value !== null && value !== undefined ? value.toString() : '',
       };
@@ -233,7 +220,7 @@ export const getGridCellKind = (field: Field, row: number, hasGridSelection = fa
       return {
         kind: GridCellKind.Text,
         data: value ? value : '',
-        allowOverlay: isDatagridEditEnabled()! && !hasGridSelection,
+        allowOverlay: isDatagridEnabled()! && !hasGridSelection,
         readonly: false,
         displayData: value !== null && value !== undefined ? value.toString() : '',
       };
@@ -301,9 +288,16 @@ export const getStyles = (theme: GrafanaTheme2, isResizeInProgress: boolean) =>
 };
 
 export const hasGridSelection = (gridSelection: GridSelection): boolean => {
-  if (!gridSelection.current) {
+  if (gridSelection.rows.length || gridSelection.columns.length) {
+    return true;
+  }
+
+  if (gridSelection.current === undefined) {
     return false;
   }
 
-  return gridSelection.current.range && gridSelection.current.range.height > 1 && gridSelection.current.range.width > 1;
+  return (
+    gridSelection.current.range &&
+    !(gridSelection.current.range.height === 1 && gridSelection.current.range.width === 1)
+  );
 };

From e899d2bc7e8060ab12dbf1763e6aca401adf31aa Mon Sep 17 00:00:00 2001
From: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:00:34 +0200
Subject: [PATCH 427/729] Fix issue-labeled.yml GH workflow (#67283)

---
 .github/teams.yml                   |  1 -
 .github/workflows/issue-labeled.yml | 16 ----------------
 2 files changed, 17 deletions(-)

diff --git a/.github/teams.yml b/.github/teams.yml
index 00259652bee..38b8e264661 100644
--- a/.github/teams.yml
+++ b/.github/teams.yml
@@ -7,5 +7,4 @@ test:
 
 # Alerting team
 area/alerting:
-  github-board: 52
   channel-label: C02B9MXQE0J
diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml
index ac8c19754ae..dada3acf164 100644
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -14,18 +14,12 @@ jobs:
       - name: "Determine which team to notify"
         run: |
           # Default to null values.
-          BOARD="null"
           CHANNEL="null"
 
           echo "${{ github.event.label.name }} label added"
           export CURRENT_LABEL="${{ github.event.label.name }}" # Enable the use of the label in yq evaluations
           # yq is installed by default in ubuntu-latest
           if [[ $(yq e 'keys | .[] | select(. == env(CURRENT_LABEL))' teams.yml ) ]]; then
-            # Check if we have a board set to use.
-            if [[ $(yq '.[env(CURRENT_LABEL)] | has("github-board")' teams.yml ) == true ]]; then
-              BOARD=$(yq '.[env(CURRENT_LABEL)].github-board' teams.yml)
-              echo "Ready to add issue to Grafana board ${BOARD}"
-            fi
             # Check if we have a channel set to notify on comments.
             if [[ $(yq '.[env(CURRENT_LABEL)] | has("channel-label")' teams.yml ) == true ]]; then
               CHANNEL=$(yq '.[env(CURRENT_LABEL)].channel-label' teams.yml)
@@ -34,18 +28,8 @@ jobs:
           fi
 
           # set environment for next step
-          echo "BOARD=${BOARD}" >> $GITHUB_ENV
           echo "CHANNEL=${CHANNEL}" >> $GITHUB_ENV
 
-      - name: "Add to GitHub board"
-        if: ${{ env.BOARD != 'null' }}
-        uses: leonsteinhaeuser/project-beta-automations@v2.1.0
-        with:
-          project_id: ${{ env.BOARD }}
-          organization: grafana
-          resource_node_id: ${{ github.event.issue.node_id }}
-          gh_token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: "Prepare payload"
         uses: frabert/replace-string-action@v2.0
         id: preparePayload

From 22713186cb776b23c724ee55f445053131c2e90d Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:01:32 +0200
Subject: [PATCH 428/729] Toolkit: Remove `plugin:ci-build` `plugin:ci-package`
 `plugin:ci-report` and related files (#67212)

---
 .betterer.results                             |  28 --
 packages/grafana-toolkit/package.json         |   1 -
 packages/grafana-toolkit/src/cli/index.ts     |  62 -----
 .../src/cli/tasks/plugin.ci.ts                | 258 ------------------
 .../src/cli/tasks/plugin.update.ts            |  24 --
 .../src/cli/tasks/plugin/bundle.managed.ts    |  34 ---
 packages/grafana-toolkit/src/plugins/env.ts   | 137 ----------
 packages/grafana-toolkit/src/plugins/index.ts |   3 -
 .../grafana-toolkit/src/plugins/manifest.ts   |  91 ------
 packages/grafana-toolkit/src/plugins/types.ts | 104 -------
 packages/grafana-toolkit/src/plugins/utils.ts | 132 ---------
 .../grafana-toolkit/src/plugins/workflow.ts   | 100 -------
 yarn.lock                                     |  10 -
 13 files changed, 984 deletions(-)
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin.update.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts
 delete mode 100644 packages/grafana-toolkit/src/plugins/manifest.ts
 delete mode 100644 packages/grafana-toolkit/src/plugins/types.ts
 delete mode 100644 packages/grafana-toolkit/src/plugins/utils.ts
 delete mode 100644 packages/grafana-toolkit/src/plugins/workflow.ts

diff --git a/.betterer.results b/.betterer.results
index ae38d94c5e2..449693d7e46 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -885,17 +885,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "packages/grafana-toolkit/src/cli/tasks/task.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -925,28 +919,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-toolkit/src/plugins/manifest.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"]
-    ],
-    "packages/grafana-toolkit/src/plugins/types.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "packages/grafana-toolkit/src/plugins/utils.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "packages/grafana-toolkit/src/plugins/workflow.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
     "packages/grafana-ui/src/components/Card/Card.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index c4ab0b6a77d..6d36ce4b905 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -94,7 +94,6 @@
     "less": "^4.1.2",
     "less-loader": "^10.2.0",
     "lodash": "^4.17.21",
-    "md5-file": "^5.0.0",
     "mini-css-extract-plugin": "^2.6.0",
     "ora": "^5.4.1",
     "postcss": "^8.4.12",
diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index dbf7d8e7ab0..0507f026aba 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -4,10 +4,7 @@ import { program } from 'commander';
 import { nodeVersionCheckerTask } from './tasks/nodeVersionChecker';
 import { buildPackageTask } from './tasks/package.build';
 import { pluginBuildTask } from './tasks/plugin.build';
-import { ciBuildPluginTask, ciPackagePluginTask, ciPluginReportTask } from './tasks/plugin.ci';
-import { pluginUpdateTask } from './tasks/plugin.update';
 import { getToolkitVersion, githubPublishTask } from './tasks/plugin.utils';
-import { bundleManagedTask } from './tasks/plugin/bundle.managed';
 import { templateTask } from './tasks/template';
 import { toolkitBuildTask } from './tasks/toolkit.build';
 import { execTask } from './utils/execTask';
@@ -130,53 +127,6 @@ export const run = (includeInternalScripts = false) => {
       process.exit(1);
     });
 
-  program
-    .command('plugin:ci-build')
-    .option('--finish', 'move all results to the jobs folder', false)
-    .option('--maxJestWorkers <num>|<string>', 'Limit number of Jest workers spawned')
-    .description('[deprecated] Build the plugin, leaving results in /dist and /coverage')
-    .action(async (cmd) => {
-      await execTask(ciBuildPluginTask)({
-        finish: cmd.finish,
-        maxJestWorkers: cmd.maxJestWorkers,
-      });
-    });
-
-  program
-    .command('plugin:ci-package')
-    .option('--signatureType <type>', 'Signature Type')
-    .option('--rootUrls <urls...>', 'Root URLs')
-    .option('--signing-admin', 'Use the admin API endpoint for signing the manifest. (deprecated)', false)
-    .description('[deprecated] Create a zip packages for the plugin')
-    .action(async (cmd) => {
-      await execTask(ciPackagePluginTask)({
-        signatureType: cmd.signatureType,
-        rootUrls: cmd.rootUrls,
-      });
-    });
-
-  program
-    .command('plugin:ci-report')
-    .description('[deprecated] Build a report for this whole process')
-    .option('--upload', 'upload packages also')
-    .action(async (cmd) => {
-      await execTask(ciPluginReportTask)({
-        upload: cmd.upload,
-      });
-    });
-
-  program
-    .command('plugin:bundle-managed')
-    .description('[Deprecated] Builds managed plugins')
-    .action(async (cmd) => {
-      console.log(
-        chalk.yellow.bold(
-          `⚠️ This command is deprecated and will be removed in v10. No further support will be provided. ⚠️`
-        )
-      );
-      await execTask(bundleManagedTask)({});
-    });
-
   program
     .command('plugin:github-publish')
     .option('--dryrun', 'Do a dry run only', false)
@@ -197,18 +147,6 @@ export const run = (includeInternalScripts = false) => {
       });
     });
 
-  program
-    .command('plugin:update-circleci')
-    .description('[Deprecated] Update plugin')
-    .action(async (cmd) => {
-      console.log(
-        chalk.yellow.bold(
-          `⚠️ This command is deprecated and will be removed in v10. No further support will be provided. ⚠️`
-        )
-      );
-      await execTask(pluginUpdateTask)({});
-    });
-
   program.on('command:*', () => {
     console.error('Invalid command: %s\nSee --help for a list of available commands.', program.args.join(' '));
     process.exit(1);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
deleted file mode 100644
index 53078e4185e..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-import execa = require('execa');
-import fs from 'fs-extra';
-import path = require('path');
-import rimrafCallback from 'rimraf';
-import { promisify } from 'util';
-
-import { getPluginId } from '../../config/utils/getPluginId';
-import { assertRootUrlIsValid, getPluginJson } from '../../config/utils/pluginValidation';
-import {
-  getJobFolder,
-  writeJobStats,
-  getCiFolder,
-  getPluginBuildInfo,
-  getPullRequestNumber,
-  getCircleDownloadBaseURL,
-} from '../../plugins/env';
-import { buildManifest, signManifest, saveManifest } from '../../plugins/manifest';
-import { PluginPackageDetails, PluginBuildReport } from '../../plugins/types';
-import { getPackageDetails, getGrafanaVersions, readGitLog } from '../../plugins/utils';
-import { agregateWorkflowInfo, agregateCoverageInfo, agregateTestInfo } from '../../plugins/workflow';
-
-import { pluginBuildRunner } from './plugin.build';
-import { Task, TaskRunner } from './task';
-const rimraf = promisify(rimrafCallback);
-
-export interface PluginCIOptions {
-  finish?: boolean;
-  upload?: boolean;
-  signatureType?: string;
-  rootUrls?: string[];
-  maxJestWorkers?: string;
-}
-
-/**
- * 1. BUILD
- *
- *  when platform exists it is building backend, otherwise frontend
- *
- *  Each build writes data:
- *   ~/ci/jobs/build_xxx/
- *
- *  Anything that should be put into the final zip file should be put in:
- *   ~/ci/jobs/build_xxx/dist
- *
- * @deprecated -- this task was written with a specific circle-ci build in mind.  That system
- * has been replaced with Drone, and this is no longer the best practice.  Any new work
- * should be defined in the grafana build pipeline tool or drone configs directly.
- */
-const buildPluginRunner: TaskRunner<PluginCIOptions> = async ({ finish, maxJestWorkers }) => {
-  const start = Date.now();
-
-  if (finish) {
-    const workDir = getJobFolder();
-    await rimraf(workDir);
-    fs.mkdirSync(workDir);
-
-    // Move local folders to the scoped job folder
-    for (const name of ['dist', 'coverage']) {
-      const dir = path.resolve(process.cwd(), name);
-      if (fs.existsSync(dir)) {
-        fs.moveSync(dir, path.resolve(workDir, name));
-      }
-    }
-    writeJobStats(start, workDir);
-  } else {
-    // Do regular build process with coverage
-    await pluginBuildRunner({ coverage: true, maxJestWorkers });
-  }
-};
-
-export const ciBuildPluginTask = new Task<PluginCIOptions>('Build Plugin', buildPluginRunner);
-
-/**
- * 2. Package
- *
- *  Take everything from `~/ci/job/{any}/dist` and
- *  1. merge it into: `~/ci/dist`
- *  2. zip it into packages in `~/ci/packages`
- *  3. prepare grafana environment in: `~/ci/grafana-test-env`
- *
- *
- * @deprecated -- this task was written with a specific circle-ci build in mind.  That system
- * has been replaced with Drone, and this is no longer the best practice.  Any new work
- * should be defined in the grafana build pipeline tool or drone configs directly.
- */
-const packagePluginRunner: TaskRunner<PluginCIOptions> = async ({ signatureType, rootUrls }) => {
-  const start = Date.now();
-  const ciDir = getCiFolder();
-  const packagesDir = path.resolve(ciDir, 'packages');
-  const distDir = path.resolve(ciDir, 'dist');
-  const docsDir = path.resolve(ciDir, 'docs');
-  const jobsDir = path.resolve(ciDir, 'jobs');
-
-  fs.exists(jobsDir, (jobsDirExists) => {
-    if (!jobsDirExists) {
-      throw new Error('You must run plugin:ci-build prior to running plugin:ci-package');
-    }
-  });
-
-  const grafanaEnvDir = path.resolve(ciDir, 'grafana-test-env');
-  await execa('rimraf', [packagesDir, distDir, grafanaEnvDir]);
-  fs.mkdirSync(packagesDir);
-  fs.mkdirSync(distDir);
-
-  // Updating the dist dir to have a pluginId named directory in it
-  // The zip needs to contain the plugin code wrapped in directory with a pluginId name
-  const distContentDir = path.resolve(distDir, getPluginId());
-  fs.mkdirSync(grafanaEnvDir);
-
-  console.log('Build Dist Folder');
-
-  // 1. Check for a local 'dist' folder
-  const d = path.resolve(process.cwd(), 'dist');
-  if (fs.existsSync(d)) {
-    await execa('cp', ['-rn', d + '/.', distContentDir]);
-  }
-
-  // 2. Look for any 'dist' folders under ci/job/XXX/dist
-  const dirs = fs.readdirSync(path.resolve(ciDir, 'jobs'));
-  for (const j of dirs) {
-    const contents = path.resolve(ciDir, 'jobs', j, 'dist');
-    if (fs.existsSync(contents)) {
-      try {
-        await execa('cp', ['-rn', contents + '/.', distContentDir]);
-      } catch (er) {
-        throw new Error('Duplicate files found in dist folders');
-      }
-    }
-  }
-
-  console.log('Save the source info in plugin.json');
-  const pluginJsonFile = path.resolve(distContentDir, 'plugin.json');
-  const pluginInfo = getPluginJson(pluginJsonFile);
-  pluginInfo.info.build = await getPluginBuildInfo();
-  fs.writeFileSync(pluginJsonFile, JSON.stringify(pluginInfo, null, 2), { encoding: 'utf-8' });
-
-  // Write a MANIFEST.txt file in the dist folder
-  try {
-    const manifest = await buildManifest(distContentDir);
-    if (signatureType) {
-      manifest.signatureType = signatureType;
-    }
-    if (rootUrls && rootUrls.length > 0) {
-      rootUrls.forEach(assertRootUrlIsValid);
-      manifest.rootUrls = rootUrls;
-    }
-    const signedManifest = await signManifest(manifest);
-    await saveManifest(distContentDir, signedManifest);
-  } catch (err) {
-    console.warn(`Error signing manifest: ${distContentDir}`, err);
-  }
-
-  console.log('Building ZIP');
-  let zipName = pluginInfo.id + '-' + pluginInfo.info.version + '.zip';
-  let zipFile = path.resolve(packagesDir, zipName);
-  await execa('zip', ['-r', zipFile, '.'], { cwd: distDir });
-
-  const zipStats = fs.statSync(zipFile);
-  if (zipStats.size < 100) {
-    throw new Error('Invalid zip file: ' + zipFile);
-  }
-
-  // Make a copy so it is easy for report to read
-  await execa('cp', [pluginJsonFile, distDir]);
-
-  const info: PluginPackageDetails = {
-    plugin: await getPackageDetails(zipFile, distDir),
-  };
-
-  console.log('Setup Grafana Environment');
-  let p = path.resolve(grafanaEnvDir, 'plugins', pluginInfo.id);
-  fs.mkdirSync(p, { recursive: true });
-  await execa('unzip', [zipFile, '-d', p]);
-
-  // If docs exist, zip them into packages
-  if (fs.existsSync(docsDir)) {
-    console.log('Creating documentation zip');
-    zipName = pluginInfo.id + '-' + pluginInfo.info.version + '-docs.zip';
-    zipFile = path.resolve(packagesDir, zipName);
-    await execa('zip', ['-r', zipFile, '.'], { cwd: docsDir });
-
-    info.docs = await getPackageDetails(zipFile, docsDir);
-  }
-
-  p = path.resolve(packagesDir, 'info.json');
-  fs.writeFileSync(p, JSON.stringify(info, null, 2), { encoding: 'utf-8' });
-
-  // Write the custom settings
-  p = path.resolve(grafanaEnvDir, 'custom.ini');
-  const customIniBody =
-    `# Autogenerated by @grafana/toolkit \n` +
-    `[paths] \n` +
-    `plugins = ${path.resolve(grafanaEnvDir, 'plugins')}\n` +
-    `\n`; // empty line
-  fs.writeFileSync(p, customIniBody, { encoding: 'utf-8' });
-
-  writeJobStats(start, getJobFolder());
-};
-
-export const ciPackagePluginTask = new Task<PluginCIOptions>('Bundle Plugin', packagePluginRunner);
-
-/**
- * 4. Report
- *
- *  Create a report from all the previous steps
- *
- * @deprecated -- this task was written with a specific circle-ci build in mind.  That system
- * has been replaced with Drone, and this is no longer the best practice.  Any new work
- * should be defined in the grafana build pipeline tool or drone configs directly.
- */
-const pluginReportRunner: TaskRunner<PluginCIOptions> = async ({ upload }) => {
-  const ciDir = path.resolve(process.cwd(), 'ci');
-  const packageDir = path.resolve(ciDir, 'packages');
-  const packageInfo = require(path.resolve(packageDir, 'info.json')) as PluginPackageDetails;
-
-  const pluginJsonFile = path.resolve(ciDir, 'dist', 'plugin.json');
-  console.log('Load info from: ' + pluginJsonFile);
-
-  const pluginMeta = getPluginJson(pluginJsonFile);
-  const report: PluginBuildReport = {
-    plugin: pluginMeta,
-    packages: packageInfo,
-    workflow: agregateWorkflowInfo(),
-    coverage: agregateCoverageInfo(),
-    tests: agregateTestInfo(),
-    artifactsBaseURL: await getCircleDownloadBaseURL(),
-    grafanaVersion: getGrafanaVersions(),
-    git: await readGitLog(),
-  };
-  const pr = getPullRequestNumber();
-  if (pr) {
-    report.pullRequest = pr;
-  }
-
-  // Save the report to disk
-  const file = path.resolve(ciDir, 'report.json');
-  fs.writeFileSync(file, JSON.stringify(report, null, 2), { encoding: 'utf-8' });
-
-  const GRAFANA_API_KEY = process.env.GRAFANA_API_KEY;
-  if (!GRAFANA_API_KEY) {
-    console.log('Enter a GRAFANA_API_KEY to upload the plugin report');
-    return;
-  }
-  const url = `https://grafana.com/api/plugins/${report.plugin.id}/ci`;
-
-  console.log('Sending report to:', url);
-  const axios = require('axios');
-  const info = await axios.post(url, report, {
-    headers: { Authorization: 'Bearer ' + GRAFANA_API_KEY },
-  });
-  if (info.status === 200) {
-    console.log('OK: ', info.data);
-  } else {
-    console.warn('Error: ', info);
-  }
-};
-
-export const ciPluginReportTask = new Task<PluginCIOptions>('Generate Plugin Report', pluginReportRunner);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.update.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.update.ts
deleted file mode 100644
index fee3286b395..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.update.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import fs = require('fs');
-import path = require('path');
-
-import { useSpinner } from '../utils/useSpinner';
-
-import { Task, TaskRunner } from './task';
-
-interface UpdatePluginTask {}
-
-const updateCiConfig = () =>
-  useSpinner('Updating CircleCI config', async () => {
-    const ciConfigPath = path.join(process.cwd(), '.circleci');
-    if (!fs.existsSync(ciConfigPath)) {
-      fs.mkdirSync(ciConfigPath);
-    }
-
-    const sourceFile = require.resolve('@grafana/toolkit/config/circleci/config.yml');
-    const destFile = path.join(ciConfigPath, 'config.yml');
-    fs.copyFileSync(sourceFile, destFile);
-  });
-
-const pluginUpdateRunner: TaskRunner<UpdatePluginTask> = () => updateCiConfig();
-
-export const pluginUpdateTask = new Task<UpdatePluginTask>('Update Plugin', pluginUpdateRunner);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts
deleted file mode 100644
index 7ffd6c32d6d..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import execa = require('execa');
-import { promises as fs } from 'fs';
-
-import { Task, TaskRunner } from '../task';
-
-interface BundeManagedOptions {}
-
-const MANAGED_PLUGINS_PATH = `${process.cwd()}/plugins-bundled`;
-const MANAGED_PLUGINS_SCOPES = ['internal', 'external'];
-
-const bundleManagedPluginsRunner: TaskRunner<BundeManagedOptions> = async () => {
-  await Promise.all(
-    MANAGED_PLUGINS_SCOPES.map(async (scope) => {
-      try {
-        const plugins = await fs.readdir(`${MANAGED_PLUGINS_PATH}/${scope}`);
-        if (plugins.length > 0) {
-          for (const plugin of plugins) {
-            try {
-              console.log(`[${scope}]: ${plugin} building...`);
-              await execa('yarn', ['build'], { cwd: `${MANAGED_PLUGINS_PATH}/${scope}/${plugin}` });
-              console.log(`[${scope}]: ${plugin} bundled`);
-            } catch (e: any) {
-              console.log(e.stdout);
-            }
-          }
-        }
-      } catch (e) {
-        console.log(e);
-      }
-    })
-  );
-};
-
-export const bundleManagedTask = new Task<BundeManagedOptions>('Bundle managed plugins', bundleManagedPluginsRunner);
diff --git a/packages/grafana-toolkit/src/plugins/env.ts b/packages/grafana-toolkit/src/plugins/env.ts
index f79b68d449d..56b9e126351 100644
--- a/packages/grafana-toolkit/src/plugins/env.ts
+++ b/packages/grafana-toolkit/src/plugins/env.ts
@@ -1,106 +1,6 @@
-import execa from 'execa';
 import fs from 'fs';
 import path from 'path';
 
-import { PluginBuildInfo } from '@grafana/data';
-
-import { JobInfo } from './types';
-
-const getJobFromProcessArgv = () => {
-  const arg = process.argv[2];
-  if (arg && arg.startsWith('plugin:ci-')) {
-    const task = arg.substring('plugin:ci-'.length);
-    if ('build' === task) {
-      if ('--backend' === process.argv[3] && process.argv[4]) {
-        return task + '_' + process.argv[4];
-      }
-      return 'build_plugin';
-    }
-    return task;
-  }
-  return 'unknown_job';
-};
-
-export const job =
-  (process.env.DRONE_STEP_NAME ? process.env.DRONE_STEP_NAME : process.env.CIRCLE_JOB) || getJobFromProcessArgv();
-
-export const getPluginBuildInfo = async (): Promise<PluginBuildInfo> => {
-  if (process.env.CI === 'true') {
-    let repo: string | undefined;
-    let branch: string | undefined;
-    let hash: string | undefined;
-    let build: number | undefined;
-    let pr: number | undefined;
-    if (process.env.DRONE === 'true') {
-      repo = process.env.DRONE_REPO_LINK;
-      branch = process.env.DRONE_BRANCH;
-      hash = process.env.DRONE_COMMIT_SHA;
-      build = parseInt(process.env.DRONE_BUILD_NUMBER || '', 10);
-      pr = parseInt(process.env.DRONE_PULL_REQUEST || '', 10);
-    } else if (process.env.CIRCLECI === 'true') {
-      repo = process.env.CIRCLE_REPOSITORY_URL;
-      branch = process.env.CIRCLE_BRANCH;
-      hash = process.env.CIRCLE_SHA1;
-      build = parseInt(process.env.CIRCLE_BUILD_NUM || '', 10);
-      const url = process.env.CIRCLE_PULL_REQUEST || '';
-      const idx = url.lastIndexOf('/') + 1;
-      pr = parseInt(url.substring(idx), 10);
-    }
-
-    const info: PluginBuildInfo = {
-      time: Date.now(),
-      repo,
-      branch,
-      hash,
-    };
-    if (pr) {
-      info.pr = pr;
-    }
-    if (build) {
-      info.number = build;
-    }
-    return info;
-  }
-
-  const branch = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
-  const hash = await execa('git', ['rev-parse', 'HEAD']);
-  return {
-    time: Date.now(),
-    branch: branch.stdout,
-    hash: hash.stdout,
-  };
-};
-
-export const getBuildNumber = (): number | undefined => {
-  if (process.env.DRONE === 'true') {
-    return parseInt(process.env.DRONE_BUILD_NUMBER || '', 10);
-  } else if (process.env.CIRCLECI === 'true') {
-    return parseInt(process.env.CIRCLE_BUILD_NUM || '', 10);
-  }
-
-  return undefined;
-};
-
-export const getPullRequestNumber = (): number | undefined => {
-  if (process.env.DRONE === 'true') {
-    return parseInt(process.env.DRONE_PULL_REQUEST || '', 10);
-  } else if (process.env.CIRCLECI === 'true') {
-    const url = process.env.CIRCLE_PULL_REQUEST || '';
-    const idx = url.lastIndexOf('/') + 1;
-    return parseInt(url.substring(idx), 10);
-  }
-
-  return undefined;
-};
-
-export const getJobFolder = () => {
-  const dir = path.resolve(process.cwd(), 'ci', 'jobs', job);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-  return dir;
-};
-
 export const getCiFolder = () => {
   const dir = path.resolve(process.cwd(), 'ci');
   if (!fs.existsSync(dir)) {
@@ -108,40 +8,3 @@ export const getCiFolder = () => {
   }
   return dir;
 };
-
-export const writeJobStats = (startTime: number, workDir: string) => {
-  const endTime = Date.now();
-  const stats: JobInfo = {
-    job,
-    startTime,
-    endTime,
-    elapsed: endTime - startTime,
-    buildNumber: getBuildNumber(),
-  };
-  const f = path.resolve(workDir, 'job.json');
-  fs.writeFile(f, JSON.stringify(stats, null, 2), (err) => {
-    if (err) {
-      throw new Error('Unable to stats: ' + f);
-    }
-  });
-};
-
-// https://circleci.com/api/v1.1/project/github/NatelEnergy/grafana-discrete-panel/latest/artifacts
-export async function getCircleDownloadBaseURL(): Promise<string | undefined> {
-  try {
-    const axios = require('axios');
-    const repo = process.env.CIRCLE_PROJECT_REPONAME;
-    const user = process.env.CIRCLE_PROJECT_USERNAME;
-    let url = `https://circleci.com/api/v1.1/project/github/${user}/${repo}/latest/artifacts`;
-    const rsp = await axios.get(url);
-    for (const s of rsp.data) {
-      const { path, url } = s;
-      if (url && path && path.endsWith('report.json')) {
-        return url.substring(url.length - 'report.json'.length);
-      }
-    }
-  } catch (e) {
-    console.log('Error reading CircleCI artifact URL', e);
-  }
-  return undefined;
-}
diff --git a/packages/grafana-toolkit/src/plugins/index.ts b/packages/grafana-toolkit/src/plugins/index.ts
index c302e909020..c1532d6d2e4 100644
--- a/packages/grafana-toolkit/src/plugins/index.ts
+++ b/packages/grafana-toolkit/src/plugins/index.ts
@@ -1,4 +1 @@
 export * from './env';
-export * from './utils';
-export * from './workflow';
-export * from './types';
diff --git a/packages/grafana-toolkit/src/plugins/manifest.ts b/packages/grafana-toolkit/src/plugins/manifest.ts
deleted file mode 100644
index 17c1f052170..00000000000
--- a/packages/grafana-toolkit/src/plugins/manifest.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import crypto from 'crypto';
-import fs from 'fs';
-import path from 'path';
-
-import { ManifestInfo } from './types';
-
-const MANIFEST_FILE = 'MANIFEST.txt';
-
-async function* walk(dir: string, baseDir: string): AsyncGenerator<string, any, any> {
-  for await (const d of await (fs.promises as any).opendir(dir)) {
-    const entry = path.posix.join(dir, d.name);
-    if (d.isDirectory()) {
-      yield* await walk(entry, baseDir);
-    } else if (d.isFile()) {
-      yield path.posix.relative(baseDir, entry);
-    } else if (d.isSymbolicLink()) {
-      const realPath = await (fs.promises as any).realpath(entry);
-      if (!realPath.startsWith(baseDir)) {
-        throw new Error(
-          `symbolic link ${path.posix.relative(
-            baseDir,
-            entry
-          )} targets a file outside of the base directory: ${baseDir}`
-        );
-      }
-      // if resolved symlink target is a file include it in the manifest
-      const stats = await (fs.promises as any).stat(realPath);
-      if (stats.isFile()) {
-        yield path.posix.relative(baseDir, entry);
-      }
-    }
-  }
-}
-
-export async function buildManifest(dir: string): Promise<ManifestInfo> {
-  const pluginJson = JSON.parse(fs.readFileSync(path.join(dir, 'plugin.json'), { encoding: 'utf8' }));
-
-  const manifest = {
-    plugin: pluginJson.id,
-    version: pluginJson.info.version,
-    files: {},
-  } as ManifestInfo;
-
-  for await (const p of await walk(dir, dir)) {
-    if (p === MANIFEST_FILE) {
-      continue;
-    }
-
-    manifest.files[p] = crypto
-      .createHash('sha256')
-      .update(fs.readFileSync(path.join(dir, p)))
-      .digest('hex');
-  }
-
-  return manifest;
-}
-
-export async function signManifest(manifest: ManifestInfo): Promise<string> {
-  const GRAFANA_API_KEY = process.env.GRAFANA_API_KEY;
-  if (!GRAFANA_API_KEY) {
-    throw new Error('You must enter a GRAFANA_API_KEY to sign the plugin manifest');
-  }
-
-  const GRAFANA_COM_URL = process.env.GRAFANA_COM_URL || 'https://grafana.com/api';
-  const url = GRAFANA_COM_URL + '/plugins/ci/sign';
-
-  const axios = require('axios');
-
-  try {
-    const info = await axios.post(url, manifest, {
-      headers: { Authorization: 'Bearer ' + GRAFANA_API_KEY },
-    });
-    if (info.status !== 200) {
-      console.warn('Error: ', info);
-      throw new Error('Error signing manifest');
-    }
-
-    return info.data;
-  } catch (err: any) {
-    if (err.response?.data?.message) {
-      throw new Error('Error signing manifest: ' + err.response.data.message);
-    }
-
-    throw new Error('Error signing manifest: ' + err.message);
-  }
-}
-
-export async function saveManifest(dir: string, signedManifest: string): Promise<boolean> {
-  fs.writeFileSync(path.join(dir, MANIFEST_FILE), signedManifest);
-  return true;
-}
diff --git a/packages/grafana-toolkit/src/plugins/types.ts b/packages/grafana-toolkit/src/plugins/types.ts
deleted file mode 100644
index 296cbc8252a..00000000000
--- a/packages/grafana-toolkit/src/plugins/types.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { PluginMeta, KeyValue } from '@grafana/data';
-
-export interface PluginPackageDetails {
-  plugin: ZipFileInfo;
-  docs?: ZipFileInfo;
-}
-
-export interface PluginBuildReport {
-  plugin: PluginMeta;
-  packages: PluginPackageDetails;
-  workflow: WorkflowInfo;
-  coverage: CoverageInfo[];
-  tests: TestResultsInfo[];
-  git?: GitLogInfo;
-  pullRequest?: number;
-  artifactsBaseURL?: string;
-  grafanaVersion?: KeyValue<string>;
-}
-
-export interface JobInfo {
-  job?: string;
-  startTime: number;
-  endTime: number;
-  elapsed: number;
-  status?: string;
-  buildNumber?: number;
-}
-
-export interface WorkflowInfo extends JobInfo {
-  workflowId?: string;
-  jobs: JobInfo[];
-  user?: string;
-  repo?: string;
-}
-
-export interface CoverageDetails {
-  total: number;
-  covered: number;
-  skipped: number;
-  pct: number;
-}
-
-export interface CoverageInfo {
-  job: string;
-  summary: { [key: string]: CoverageDetails };
-  report?: string; // path to report
-}
-
-export interface TestResultsInfo {
-  job: string;
-  grafana?: any;
-  error?: string;
-  passed: number;
-  failed: number;
-  screenshots: string[];
-}
-
-export interface CountAndSize {
-  count: number;
-  bytes: number;
-}
-
-export interface ExtensionSize {
-  [key: string]: CountAndSize;
-}
-
-export interface ZipFileInfo {
-  name: string;
-  size: number;
-  contents: ExtensionSize;
-  sha1?: string;
-  md5?: string;
-}
-
-interface UserInfo {
-  name: string;
-  email: string;
-  time?: number;
-}
-
-export interface GitLogInfo {
-  commit: string;
-  tree: string;
-  subject: string;
-  body?: string;
-  notes?: string;
-  author: UserInfo;
-  commiter: UserInfo;
-}
-
-export interface ManifestInfo {
-  // time: number;  << filled in by the server
-  // keyId: string; << filled in by the server
-  // signedByOrg: string; << filled in by the server
-  // signedByOrgName: string; << filled in by the server
-  signatureType?: string; // filled in by the server if not specified
-  rootUrls?: string[]; // for private signatures
-  plugin: string;
-  version: string;
-  files: Record<string, string>;
-  toolkit?: {
-    version: string;
-  };
-}
diff --git a/packages/grafana-toolkit/src/plugins/utils.ts b/packages/grafana-toolkit/src/plugins/utils.ts
deleted file mode 100644
index e968fc31fd0..00000000000
--- a/packages/grafana-toolkit/src/plugins/utils.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import execa from 'execa';
-import fs from 'fs';
-import path from 'path';
-
-import { KeyValue } from '@grafana/data';
-
-import { ExtensionSize, ZipFileInfo, GitLogInfo } from './types';
-
-const md5File = require('md5-file');
-
-export function getGrafanaVersions(): KeyValue<string> {
-  const dir = path.resolve(process.cwd(), 'node_modules', '@grafana');
-  const versions: KeyValue = {};
-  try {
-    fs.readdirSync(dir).forEach((file) => {
-      const json = require(path.resolve(dir, file, 'package.json'));
-      versions[file] = json.version;
-    });
-  } catch (err) {
-    console.warn('Error reading toolkit versions', err);
-  }
-  return versions;
-}
-
-export function getFileSizeReportInFolder(dir: string, info?: ExtensionSize): ExtensionSize {
-  const acc: ExtensionSize = info ? info : {};
-
-  const files = fs.readdirSync(dir);
-  if (files) {
-    files.forEach((file) => {
-      const newbase = path.join(dir, file);
-      const stat = fs.statSync(newbase);
-      if (stat.isDirectory()) {
-        getFileSizeReportInFolder(newbase, info);
-      } else {
-        let ext = '_none_';
-        const idx = file.lastIndexOf('.');
-        if (idx > 0) {
-          ext = file.substring(idx + 1).toLowerCase();
-        }
-        const current = acc[ext];
-        if (current) {
-          current.count += 1;
-          current.bytes += stat.size;
-        } else {
-          acc[ext] = { bytes: stat.size, count: 1 };
-        }
-      }
-    });
-  }
-  return acc;
-}
-
-export async function getPackageDetails(zipFile: string, zipSrc: string, writeChecksum = true): Promise<ZipFileInfo> {
-  const zipStats = fs.statSync(zipFile);
-  if (zipStats.size < 100) {
-    throw new Error('Invalid zip file: ' + zipFile);
-  }
-  const info: ZipFileInfo = {
-    name: path.basename(zipFile),
-    size: zipStats.size,
-    contents: getFileSizeReportInFolder(zipSrc),
-  };
-  try {
-    const exe = await execa('shasum', [zipFile]);
-    const idx = exe.stdout.indexOf(' ');
-    const sha1 = exe.stdout.substring(0, idx);
-    if (writeChecksum) {
-      fs.writeFile(zipFile + '.sha1', sha1, (err) => {});
-    }
-    info.sha1 = sha1;
-  } catch {
-    console.warn('Unable to read SHA1 Checksum');
-  }
-  try {
-    info.md5 = md5File.sync(zipFile);
-  } catch {
-    console.warn('Unable to read MD5 Checksum');
-  }
-  return info;
-}
-
-export function findImagesInFolder(dir: string, prefix = '', append?: string[]): string[] {
-  const imgs = append || [];
-
-  const files = fs.readdirSync(dir);
-  if (files) {
-    files.forEach((file) => {
-      if (file.endsWith('.png')) {
-        imgs.push(file);
-      }
-    });
-  }
-
-  return imgs;
-}
-
-export async function readGitLog(): Promise<GitLogInfo | undefined> {
-  try {
-    let exe = await execa('git', [
-      'log',
-      '-1', // last line
-      '--pretty=format:{%n  "commit": "%H",%n  "tree": "%T",%n  "subject": "%s",%n  "author": {%n    "name": "%aN",%n    "email": "%aE",%n    "time":"%at"  },%n  "commiter": {%n    "name": "%cN",%n    "email": "%cE",%n    "time":"%ct"  }%n}',
-    ]);
-    const info = JSON.parse(exe.stdout) as GitLogInfo;
-
-    // Read the body
-    exe = await execa('git', [
-      'log',
-      '-1', // last line
-      '--pretty=format:%b', // Just the body (with newlines!)
-    ]);
-    if (exe.stdout && exe.stdout.length) {
-      info.body = exe.stdout.trim();
-    }
-
-    // Read any commit notes
-    exe = await execa('git', [
-      'log',
-      '-1', // last line
-      '--pretty=format:%N', // commit notes (with newlines!)
-    ]);
-    if (exe.stdout && exe.stdout.length) {
-      info.notes = exe.stdout.trim();
-    }
-
-    return info;
-  } catch (err) {
-    console.warn('Error REading Git log info', err);
-  }
-  return undefined;
-}
diff --git a/packages/grafana-toolkit/src/plugins/workflow.ts b/packages/grafana-toolkit/src/plugins/workflow.ts
deleted file mode 100644
index ea653836841..00000000000
--- a/packages/grafana-toolkit/src/plugins/workflow.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-
-import { getBuildNumber, getCiFolder } from './env';
-import { JobInfo, WorkflowInfo, CoverageInfo, TestResultsInfo } from './types';
-
-export const agregateWorkflowInfo = (): WorkflowInfo => {
-  const now = Date.now();
-  const workflow: WorkflowInfo = {
-    jobs: [],
-    startTime: now,
-    endTime: now,
-    workflowId: process.env.CIRCLE_WORKFLOW_ID,
-    repo: process.env.CIRCLE_PROJECT_REPONAME,
-    user: process.env.CIRCLE_PROJECT_USERNAME,
-    buildNumber: getBuildNumber(),
-    elapsed: 0,
-  };
-
-  const jobsFolder = path.resolve(getCiFolder(), 'jobs');
-  if (fs.existsSync(jobsFolder)) {
-    const files = fs.readdirSync(jobsFolder);
-    if (files && files.length) {
-      files.forEach((file) => {
-        const p = path.resolve(jobsFolder, file, 'job.json');
-        if (fs.existsSync(p)) {
-          const job = require(p) as JobInfo;
-          workflow.jobs.push(job);
-          if (job.startTime < workflow.startTime) {
-            workflow.startTime = job.startTime;
-          }
-          if (job.endTime > workflow.endTime) {
-            workflow.endTime = job.endTime;
-          }
-        } else {
-          console.log('Missing Job info: ', p);
-        }
-      });
-    } else {
-      console.log('NO JOBS IN: ', jobsFolder);
-    }
-  }
-
-  workflow.elapsed = workflow.endTime - workflow.startTime;
-  return workflow;
-};
-
-export const agregateCoverageInfo = (): CoverageInfo[] => {
-  const coverage: CoverageInfo[] = [];
-  const ciDir = getCiFolder();
-  const jobsFolder = path.resolve(ciDir, 'jobs');
-  if (fs.existsSync(jobsFolder)) {
-    const files = fs.readdirSync(jobsFolder);
-    if (files && files.length) {
-      files.forEach((file) => {
-        const dir = path.resolve(jobsFolder, file, 'coverage');
-        if (fs.existsSync(dir)) {
-          const s = path.resolve(dir, 'coverage-summary.json');
-          const r = path.resolve(dir, 'lcov-report', 'index.html');
-          if (fs.existsSync(s)) {
-            const raw = require(s);
-            const info: CoverageInfo = {
-              job: file,
-              summary: raw.total,
-            };
-            if (fs.existsSync(r)) {
-              info.report = r.substring(ciDir.length);
-            }
-            coverage.push(info);
-          }
-        }
-      });
-    } else {
-      console.log('NO JOBS IN: ', jobsFolder);
-    }
-  }
-  return coverage;
-};
-
-export const agregateTestInfo = (): TestResultsInfo[] => {
-  const tests: TestResultsInfo[] = [];
-  const ciDir = getCiFolder();
-  const jobsFolder = path.resolve(ciDir, 'jobs');
-  if (fs.existsSync(jobsFolder)) {
-    const files = fs.readdirSync(jobsFolder);
-    if (files && files.length) {
-      files.forEach((file) => {
-        if (file.startsWith('test')) {
-          const summary = path.resolve(jobsFolder, file, 'results.json');
-          if (fs.existsSync(summary)) {
-            tests.push(require(summary) as TestResultsInfo);
-          }
-        }
-      });
-    } else {
-      console.log('NO Jobs IN: ', jobsFolder);
-    }
-  }
-  return tests;
-};
diff --git a/yarn.lock b/yarn.lock
index a24b50d212f..c49e4cbe802 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3436,7 +3436,6 @@ __metadata:
     less: ^4.1.2
     less-loader: ^10.2.0
     lodash: ^4.17.21
-    md5-file: ^5.0.0
     mini-css-extract-plugin: ^2.6.0
     ora: ^5.4.1
     postcss: ^8.4.12
@@ -25384,15 +25383,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"md5-file@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "md5-file@npm:5.0.0"
-  bin:
-    md5-file: cli.js
-  checksum: c606a00ff58adf5428e8e2f36d86e5d3c7029f9688126faca302cd83b5e92cac183a62e1d1f05fae7c2614e80f993326fd0a8d6a3a913c41ec7ea0eefc25aa76
-  languageName: node
-  linkType: hard
-
 "mdast-squeeze-paragraphs@npm:^4.0.0":
   version: 4.0.0
   resolution: "mdast-squeeze-paragraphs@npm:4.0.0"

From f48ef6ea50b64b9beee887bfa8ac459c60ff0b50 Mon Sep 17 00:00:00 2001
From: Emil Tullstedt <emil.tullstedt@grafana.com>
Date: Wed, 26 Apr 2023 15:02:01 +0200
Subject: [PATCH 429/729] Chore: Upgrade github.com/docker/docker dependency
 (#67098)

---
 go.mod | 12 ++++--------
 go.sum |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index 355a0e5944f..973665796c3 100644
--- a/go.mod
+++ b/go.mod
@@ -7,13 +7,10 @@ go 1.19
 // Also, use our fork with fixes for unimplemented methods (required for Go 1.16).
 replace github.com/denisenkom/go-mssqldb => github.com/grafana/go-mssqldb v0.9.2
 
-// Avoid using v2.0.0+incompatible Redigo used by dependencies as the latest maintained branch of Redigo is v1.
-replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.9
-
 // Override docker/docker to avoid:
 // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires
 // github.com/docker/docker@v0.0.0-00010101000000-000000000000: invalid version: unknown revision 000000000000
-replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
+replace github.com/docker/docker => github.com/moby/moby v23.0.4+incompatible
 
 // contains openapi encoder fixes. remove ASAP
 replace cuelang.org/go => github.com/sdboyer/cue v0.5.0-beta.2.0.20230419165817-251c3ae823d8
@@ -87,7 +84,7 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/alertmanager v0.25.0
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/client_model v0.3.0
@@ -126,7 +123,7 @@ require (
 	gopkg.in/mail.v2 v2.3.1
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
-	xorm.io/builder v0.3.6
+	xorm.io/builder v0.3.6 // indirect
 	xorm.io/core v0.7.3
 	xorm.io/xorm v0.8.2
 )
@@ -288,7 +285,6 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
 	github.com/buildkite/yaml v2.1.0+incompatible // indirect
-	github.com/containerd/containerd v1.6.8 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -371,7 +367,7 @@ require (
 	github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
-	github.com/docker/docker v20.10.21+incompatible
+	github.com/docker/docker v23.0.4+incompatible
 	github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
diff --git a/go.sum b/go.sum
index e9f1b8a0af6..afe2f78b780 100644
--- a/go.sum
+++ b/go.sum
@@ -546,8 +546,6 @@ github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09Zvgq
 github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
 github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
 github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
-github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs=
-github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@@ -1788,14 +1786,15 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mjibson/esc v0.2.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1OPs=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
-github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs=
-github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/moby/moby v23.0.4+incompatible h1:A/pe8vi9KIKhNbzR0G3wW4ACKDsMgXILBveMqiJNa8M=
+github.com/moby/moby v23.0.4+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
+github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc=
 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
@@ -3251,6 +3250,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
+gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

From a576bd4f2667073521ac44248f1922c979069848 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Wed, 26 Apr 2023 15:07:51 +0200
Subject: [PATCH 430/729] DataSourcePicker: Tweak styles (#67280)

---
 .../components/picker/DataSourceCard.tsx      |  8 ++++++
 .../components/picker/DataSourceDropdown.tsx  | 27 +++++++++++--------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceCard.tsx b/public/app/features/datasources/components/picker/DataSourceCard.tsx
index 8c365909ab3..b68c08622df 100644
--- a/public/app/features/datasources/components/picker/DataSourceCard.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceCard.tsx
@@ -60,6 +60,14 @@ function getStyles(theme: GrafanaTheme2) {
     logo: css`
       width: 32px;
       height: 32px;
+      padding-right: ${theme.spacing(1.5)};
+      display: flex;
+      align-items: center;
+
+      > img {
+        max-height: 100%;
+        min-width: 32px;
+      }
     `,
     name: css`
       color: ${theme.colors.text.primary};
diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index d7665765aab..585c5665098 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -7,7 +7,7 @@ import { usePopper } from 'react-popper';
 import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { DataSourceJsonData } from '@grafana/schema';
-import { Button, CustomScrollbar, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
+import { Button, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
 import config from 'app/core/config';
 
 import { useDatasource } from '../../hooks';
@@ -43,6 +43,14 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
 
   const popper = usePopper(markerElement, selectorElement, {
     placement: 'bottom-start',
+    modifiers: [
+      {
+        name: 'offset',
+        options: {
+          offset: [0, 4],
+        },
+      },
+    ],
   });
 
   const onClose = useCallback(() => {
@@ -154,14 +162,12 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
   return (
     <div style={props.style} ref={ref} className={styles.container}>
       <div className={styles.dataSourceList}>
-        <CustomScrollbar>
-          <DataSourceList
-            {...props}
-            current={current}
-            onChange={changeCallback}
-            filter={(ds) => ds.name.toLowerCase().includes(filterTerm?.toLowerCase() ?? '')}
-          ></DataSourceList>
-        </CustomScrollbar>
+        <DataSourceList
+          {...props}
+          current={current}
+          onChange={changeCallback}
+          filter={(ds) => ds.name.toLowerCase().includes(filterTerm?.toLowerCase() ?? '')}
+        ></DataSourceList>
       </div>
 
       <div className={styles.footer}>
@@ -209,7 +215,6 @@ function getStylesPickerContent(theme: GrafanaTheme2) {
       display: flex;
       flex-direction: column;
       height: 412px;
-      box-shadow: ${theme.shadows.z3};
       width: 480px;
       background: ${theme.colors.background.primary};
       box-shadow: ${theme.shadows.z3};
@@ -219,7 +224,7 @@ function getStylesPickerContent(theme: GrafanaTheme2) {
     `,
     dataSourceList: css`
       flex: 1;
-      height: 100%;
+      overflow: scroll;
     `,
     footer: css`
       flex: 0;

From 4b3aead2d053d655a3730ad855ff2141229f9cf3 Mon Sep 17 00:00:00 2001
From: Juan Cabanas <juan.cabanas@grafana.com>
Date: Wed, 26 Apr 2023 10:46:21 -0300
Subject: [PATCH 431/729] DataLinks: encoded URL fixed (#66418)

---
 packages/grafana-data/src/field/fieldOverrides.ts | 2 +-
 public/app/features/panel/panellinks/link_srv.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-data/src/field/fieldOverrides.ts b/packages/grafana-data/src/field/fieldOverrides.ts
index f3b248a5000..7247638d1d6 100644
--- a/packages/grafana-data/src/field/fieldOverrides.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.ts
@@ -421,7 +421,7 @@ export const getLinksSupplier =
 
       if (href) {
         href = locationUtil.assureBaseUrl(href.replace(/\n/g, ''));
-        href = replaceVariables(href, dataLinkScopedVars, VariableFormatID.PercentEncode);
+        href = replaceVariables(href, dataLinkScopedVars, VariableFormatID.UriEncode);
         href = locationUtil.processUrl(href);
       }
 
diff --git a/public/app/features/panel/panellinks/link_srv.ts b/public/app/features/panel/panellinks/link_srv.ts
index 1d2037e8a98..538b4e4f1fb 100644
--- a/public/app/features/panel/panellinks/link_srv.ts
+++ b/public/app/features/panel/panellinks/link_srv.ts
@@ -305,7 +305,7 @@ export class LinkSrv implements LinkService {
     };
 
     if (replaceVariables) {
-      info.href = replaceVariables(info.href, undefined, VariableFormatID.PercentEncode);
+      info.href = replaceVariables(info.href, undefined, VariableFormatID.UriEncode);
       info.title = replaceVariables(link.title);
     }
 

From a420040c73cbca863341e755b3b83020df81200b Mon Sep 17 00:00:00 2001
From: Todd Treece <360020+toddtreece@users.noreply.github.com>
Date: Wed, 26 Apr 2023 09:52:13 -0400
Subject: [PATCH 432/729] Chore: Remove CRD generation (#67286)

---
 .../feature-toggles/index.md                  |   1 -
 kinds/gen.go                                  |   3 -
 .../src/types/featureToggles.gen.ts           |   1 -
 pkg/codegen/jenny_crd_reg.go                  |  63 -----
 pkg/codegen/jenny_crd_types.go                |  51 ----
 pkg/codegen/jenny_crd_yaml.go                 | 215 ----------------
 pkg/codegen/tmpl/core_crd_registry.tmpl       |  66 -----
 pkg/codegen/tmpl/core_crd_types.tmpl          |  25 --
 pkg/kinds/dashboard/crd/dashboard.crd.yml     |  36 ---
 pkg/kinds/dashboard/crd/dashboard_crd_gen.go  |  34 ---
 .../librarypanel/crd/librarypanel.crd.yml     | 122 ---------
 .../librarypanel/crd/librarypanel_crd_gen.go  |  34 ---
 pkg/kinds/playlist/crd/playlist.crd.yml       |  82 -------
 pkg/kinds/playlist/crd/playlist_crd_gen.go    |  34 ---
 pkg/kinds/preferences/crd/preferences.crd.yml |  56 -----
 .../preferences/crd/preferences_crd_gen.go    |  34 ---
 .../crd/publicdashboard.crd.yml               |  56 -----
 .../crd/publicdashboard_crd_gen.go            |  34 ---
 .../serviceaccount/crd/serviceaccount.crd.yml |  94 -------
 .../crd/serviceaccount_crd_gen.go             |  34 ---
 pkg/kinds/team/crd/team.crd.yml               |  77 ------
 pkg/kinds/team/crd/team_crd_gen.go            |  34 ---
 pkg/registry/corecrd/registry.go              |  27 --
 pkg/registry/corecrd/registry_gen.go          | 231 ------------------
 pkg/services/featuremgmt/registry.go          |   7 -
 pkg/services/featuremgmt/toggles_gen.csv      |   1 -
 pkg/services/featuremgmt/toggles_gen.go       |   4 -
 27 files changed, 1456 deletions(-)
 delete mode 100644 pkg/codegen/jenny_crd_reg.go
 delete mode 100644 pkg/codegen/jenny_crd_types.go
 delete mode 100644 pkg/codegen/jenny_crd_yaml.go
 delete mode 100644 pkg/codegen/tmpl/core_crd_registry.tmpl
 delete mode 100644 pkg/codegen/tmpl/core_crd_types.tmpl
 delete mode 100644 pkg/kinds/dashboard/crd/dashboard.crd.yml
 delete mode 100644 pkg/kinds/dashboard/crd/dashboard_crd_gen.go
 delete mode 100644 pkg/kinds/librarypanel/crd/librarypanel.crd.yml
 delete mode 100644 pkg/kinds/librarypanel/crd/librarypanel_crd_gen.go
 delete mode 100644 pkg/kinds/playlist/crd/playlist.crd.yml
 delete mode 100644 pkg/kinds/playlist/crd/playlist_crd_gen.go
 delete mode 100644 pkg/kinds/preferences/crd/preferences.crd.yml
 delete mode 100644 pkg/kinds/preferences/crd/preferences_crd_gen.go
 delete mode 100644 pkg/kinds/publicdashboard/crd/publicdashboard.crd.yml
 delete mode 100644 pkg/kinds/publicdashboard/crd/publicdashboard_crd_gen.go
 delete mode 100644 pkg/kinds/serviceaccount/crd/serviceaccount.crd.yml
 delete mode 100644 pkg/kinds/serviceaccount/crd/serviceaccount_crd_gen.go
 delete mode 100644 pkg/kinds/team/crd/team.crd.yml
 delete mode 100644 pkg/kinds/team/crd/team_crd_gen.go
 delete mode 100644 pkg/registry/corecrd/registry.go
 delete mode 100644 pkg/registry/corecrd/registry_gen.go

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 1abd57a3d97..bc03c5b2b41 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -119,6 +119,5 @@ The following toggles require explicitly setting Grafana's [app mode]({{< relref
 
 | Feature toggle name   | Description                                                    |
 | --------------------- | -------------------------------------------------------------- |
-| `k8s`                 | Explore native k8s integrations                                |
 | `entityStore`         | SQL-based entity store (requires storage flag also)            |
 | `externalServiceAuth` | Starts an OAuth2 authentication provider for external services |
diff --git a/kinds/gen.go b/kinds/gen.go
index bd6bb368c95..ade2ff9fc01 100644
--- a/kinds/gen.go
+++ b/kinds/gen.go
@@ -43,9 +43,6 @@ func main() {
 		codegen.BaseCoreRegistryJenny(filepath.Join("pkg", "registry", "corekind"), cuectx.GoCoreKindParentPath),
 		codegen.LatestMajorsOrXJenny(cuectx.TSCoreKindParentPath, codegen.TSTypesJenny{}),
 		codegen.TSVeneerIndexJenny(filepath.Join("packages", "grafana-schema", "src")),
-		codegen.CRDTypesJenny(cuectx.GoCoreKindParentPath),
-		codegen.YamlCRDJenny(cuectx.GoCoreKindParentPath),
-		codegen.CRDKindRegistryJenny(filepath.Join("pkg", "registry", "corecrd")),
 		codegen.DocsJenny(filepath.Join("docs", "sources", "developers", "kinds", "core")),
 	)
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index cc5d17e0578..120b95f96ef 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -31,7 +31,6 @@ export interface FeatureToggles {
   featureHighlights?: boolean;
   migrationLocking?: boolean;
   storage?: boolean;
-  k8s?: boolean;
   exploreMixedDatasource?: boolean;
   newTraceViewHeader?: boolean;
   correlations?: boolean;
diff --git a/pkg/codegen/jenny_crd_reg.go b/pkg/codegen/jenny_crd_reg.go
deleted file mode 100644
index fab3aa5bf1e..00000000000
--- a/pkg/codegen/jenny_crd_reg.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"fmt"
-	"path/filepath"
-
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// CRDKindRegistryJenny generates a static registry of the CRD representations
-// of core Grafana kinds, layered on top of the publicly consumable generated
-// registry in pkg/corekinds.
-//
-// Path should be the relative path to the directory that will contain the
-// generated registry.
-func CRDKindRegistryJenny(path string) ManyToOne {
-	return &crdregjenny{
-		path: path,
-	}
-}
-
-type crdregjenny struct {
-	path string
-}
-
-func (j *crdregjenny) JennyName() string {
-	return "CRDKindRegistryJenny"
-}
-
-func (j *crdregjenny) Generate(kinds ...kindsys.Kind) (*codejen.File, error) {
-	cores := make([]kindsys.Core, 0, len(kinds))
-	for _, d := range kinds {
-		if corekind, is := d.(kindsys.Core); is {
-			cores = append(cores, corekind)
-		}
-	}
-	if len(cores) == 0 {
-		return nil, nil
-	}
-
-	buf := new(bytes.Buffer)
-	if err := tmpls.Lookup("core_crd_registry.tmpl").Execute(buf, tvars_kind_registry{
-		PackageName:       "corecrd",
-		KindPackagePrefix: filepath.ToSlash(filepath.Join("github.com/grafana/grafana", cuectx.GoCoreKindParentPath)),
-		Kinds:             cores,
-	}); err != nil {
-		return nil, fmt.Errorf("failed executing core crd registry template: %w", err)
-	}
-
-	b, err := postprocessGoFile(genGoFile{
-		path: j.path,
-		in:   buf.Bytes(),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return codejen.NewFile(filepath.Join(j.path, "registry_gen.go"), b, j), nil
-}
diff --git a/pkg/codegen/jenny_crd_types.go b/pkg/codegen/jenny_crd_types.go
deleted file mode 100644
index 63cfd3e2b83..00000000000
--- a/pkg/codegen/jenny_crd_types.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"fmt"
-	"path/filepath"
-
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-)
-
-// CRDTypesJenny generates the OpenAPI CRD representation for a core
-// structured kind that is expected by Kubernetes controller machinery.
-func CRDTypesJenny(path string) OneToOne {
-	return crdTypesJenny{
-		parentpath: path,
-	}
-}
-
-type crdTypesJenny struct {
-	parentpath string
-}
-
-func (j crdTypesJenny) JennyName() string {
-	return "CRDTypesJenny"
-}
-
-func (j crdTypesJenny) Generate(kind kindsys.Kind) (*codejen.File, error) {
-	_, isCore := kind.(kindsys.Core)
-	_, isCustom := kind.(kindsys.Core)
-	if !(isCore || isCustom) {
-		return nil, nil
-	}
-
-	buf := new(bytes.Buffer)
-	if err := tmpls.Lookup("core_crd_types.tmpl").Execute(buf, kind); err != nil {
-		return nil, fmt.Errorf("failed executing crd types template: %w", err)
-	}
-
-	name := kind.Props().Common().MachineName
-	path := filepath.Join(j.parentpath, name, "crd", name+"_crd_gen.go")
-	b, err := postprocessGoFile(genGoFile{
-		path: path,
-		in:   buf.Bytes(),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return codejen.NewFile(path, b, j), nil
-}
diff --git a/pkg/codegen/jenny_crd_yaml.go b/pkg/codegen/jenny_crd_yaml.go
deleted file mode 100644
index 9abfb708d97..00000000000
--- a/pkg/codegen/jenny_crd_yaml.go
+++ /dev/null
@@ -1,215 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"fmt"
-	"path/filepath"
-
-	"cuelang.org/go/cue"
-	"cuelang.org/go/cue/ast"
-	"cuelang.org/go/encoding/openapi"
-	cueyaml "cuelang.org/go/pkg/encoding/yaml"
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys/k8ssys"
-	"github.com/grafana/thema"
-	goyaml "gopkg.in/yaml.v3"
-
-	"github.com/grafana/kindsys"
-)
-
-// TODO this jenny is quite sloppy, having been quickly adapted from app-sdk. It needs love
-
-// YamlCRDJenny generates a representation of a core structured kind in YAML CRD form.
-func YamlCRDJenny(path string) OneToOne {
-	return yamlCRDJenny{
-		parentpath: path,
-	}
-}
-
-type yamlCRDJenny struct {
-	parentpath string
-}
-
-func (yamlCRDJenny) JennyName() string {
-	return "YamlCRDJenny"
-}
-
-func (j yamlCRDJenny) Generate(k kindsys.Kind) (*codejen.File, error) {
-	kind, is := k.(kindsys.Core)
-	if !is {
-		return nil, nil
-	}
-
-	props := kind.Def().Properties
-	lin := kind.Lineage()
-
-	// We need to go through every schema, as they all have to be defined in the CRD
-	sch, err := lin.Schema(thema.SV(0, 0))
-	if err != nil {
-		return nil, err
-	}
-
-	resource := customResourceDefinition{
-		APIVersion: "apiextensions.k8s.io/v1",
-		Kind:       "CustomResourceDefinition",
-		Metadata: customResourceDefinitionMetadata{
-			Name: fmt.Sprintf("%s.%s", props.PluralMachineName, props.CRD.Group),
-		},
-		Spec: k8ssys.CustomResourceDefinitionSpec{
-			Group: props.CRD.Group,
-			Scope: props.CRD.Scope,
-			Names: k8ssys.CustomResourceDefinitionSpecNames{
-				Kind:   props.Name,
-				Plural: props.PluralMachineName,
-			},
-			Versions: make([]k8ssys.CustomResourceDefinitionSpecVersion, 0),
-		},
-	}
-	latest := lin.Latest().Version()
-
-	for sch != nil {
-		oapi, err := generateOpenAPI(sch, props)
-		if err != nil {
-			return nil, err
-		}
-
-		vstr := versionString(sch.Version())
-		if props.Maturity.Less(kindsys.MaturityStable) {
-			vstr = "v0-0alpha1"
-		}
-
-		ver, err := valueToCRDSpecVersion(oapi, vstr, sch.Version() == latest)
-		if err != nil {
-			return nil, err
-		}
-		if props.CRD.DummySchema {
-			ver.Schema = map[string]any{
-				"openAPIV3Schema": map[string]any{
-					"type": "object",
-					"properties": map[string]any{
-						"spec": map[string]any{
-							"type":                                 "object",
-							"x-kubernetes-preserve-unknown-fields": true,
-						},
-					},
-					"required": []any{
-						"spec",
-					},
-				},
-			}
-		}
-
-		resource.Spec.Versions = append(resource.Spec.Versions, ver)
-		sch = sch.Successor()
-	}
-	contents, err := goyaml.Marshal(resource)
-	if err != nil {
-		return nil, err
-	}
-	if props.CRD.DummySchema {
-		// Add a comment header for those with dummy schema
-		b := new(bytes.Buffer)
-		fmt.Fprintf(b, "# This CRD is generated with an empty schema body because Grafana's\n# code generators currently produce OpenAPI that Kubernetes will not\n# accept, despite being valid.\n\n%s", string(contents))
-		contents = b.Bytes()
-	}
-
-	return codejen.NewFile(filepath.Join(j.parentpath, props.MachineName, "crd", props.MachineName+".crd.yml"), contents, j), nil
-}
-
-// customResourceDefinition differs from k8ssys.CustomResourceDefinition in that it doesn't use the metav1
-// TypeMeta and ObjectMeta, as those do not contain YAML tags and get improperly serialized to YAML.
-// Since we don't need to use it with the kubernetes go-client, we don't need the extra functionality attached.
-//
-//nolint:lll
-type customResourceDefinition struct {
-	Kind       string                              `json:"kind,omitempty" yaml:"kind,omitempty" protobuf:"bytes,1,opt,name=kind"`
-	APIVersion string                              `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty" protobuf:"bytes,2,opt,name=apiVersion"`
-	Metadata   customResourceDefinitionMetadata    `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-	Spec       k8ssys.CustomResourceDefinitionSpec `json:"spec"`
-}
-
-type customResourceDefinitionMetadata struct {
-	Name string `json:"name,omitempty" yaml:"name" protobuf:"bytes,1,opt,name=name"`
-	// TODO: other fields as necessary for codegen
-}
-
-type cueOpenAPIEncoded struct {
-	Components cueOpenAPIEncodedComponents `json:"components"`
-}
-
-type cueOpenAPIEncodedComponents struct {
-	Schemas map[string]any `json:"schemas"`
-}
-
-func valueToCRDSpecVersion(str string, name string, stored bool) (k8ssys.CustomResourceDefinitionSpecVersion, error) {
-	// Decode the bytes back into an object where we can trim the openAPI clutter out
-	// and grab just the schema as a map[string]any (which is what k8s wants)
-	back := cueOpenAPIEncoded{}
-	err := goyaml.Unmarshal([]byte(str), &back)
-	if err != nil {
-		return k8ssys.CustomResourceDefinitionSpecVersion{}, err
-	}
-	if len(back.Components.Schemas) != 1 {
-		// There should only be one schema here...
-		// TODO: this may change with subresources--but subresources should have defined names
-		return k8ssys.CustomResourceDefinitionSpecVersion{}, fmt.Errorf("version %s has multiple schemas", name)
-	}
-	var def map[string]any
-	for _, v := range back.Components.Schemas {
-		ok := false
-		def, ok = v.(map[string]any)
-		if !ok {
-			return k8ssys.CustomResourceDefinitionSpecVersion{},
-				fmt.Errorf("error generating openapi schema - generated schema has invalid type")
-		}
-	}
-
-	return k8ssys.CustomResourceDefinitionSpecVersion{
-		Name:    name,
-		Served:  true,
-		Storage: stored,
-		Schema: map[string]any{
-			"openAPIV3Schema": map[string]any{
-				"properties": map[string]any{
-					"spec": def,
-				},
-				"required": []any{
-					"spec",
-				},
-				"type": "object",
-			},
-		},
-	}, nil
-}
-
-func versionString(version thema.SyntacticVersion) string {
-	return fmt.Sprintf("v%d-%d", version[0], version[1])
-}
-
-// Hoisting this out of thema until we resolve the proper approach there
-func generateOpenAPI(sch thema.Schema, props kindsys.CoreProperties) (string, error) {
-	ctx := sch.Underlying().Context()
-	v := ctx.CompileString(fmt.Sprintf("#%s: _", props.Name))
-	defpath := cue.MakePath(cue.Def(props.Name))
-	defsch := v.FillPath(defpath, sch.Underlying())
-
-	cfg := &openapi.Config{
-		NameFunc: func(v cue.Value, path cue.Path) string {
-			if path.String() == defpath.String() {
-				return props.Name
-			}
-			return ""
-		},
-		Info: ast.NewStruct( // doesn't matter, we're throwing it away
-			"title", ast.NewString(props.Name),
-			"version", ast.NewString("0.0"),
-		),
-	}
-
-	f, err := openapi.Generate(defsch, cfg)
-	if err != nil {
-		return "", err
-	}
-
-	return cueyaml.Marshal(sch.Lineage().Runtime().Context().BuildFile(f))
-}
diff --git a/pkg/codegen/tmpl/core_crd_registry.tmpl b/pkg/codegen/tmpl/core_crd_registry.tmpl
deleted file mode 100644
index f30bb443232..00000000000
--- a/pkg/codegen/tmpl/core_crd_registry.tmpl
+++ /dev/null
@@ -1,66 +0,0 @@
-package {{ .PackageName }}
-
-import (
-	"encoding/json"
-	"fmt"
-
-	{{range .Kinds }}
-	{{ .Props.MachineName }} "{{ $.KindPackagePrefix }}/{{ .Props.MachineName }}/crd"{{end}}
-	"github.com/grafana/kindsys"
-	"github.com/grafana/kindsys/k8ssys"
-	"github.com/grafana/grafana/pkg/registry/corekind"
-	"gopkg.in/yaml.v3"
-)
-
-// Registry is a list of all of Grafana's core structured kinds, wrapped in a
-// standard [k8ssys.CRD] interface that makes them usable for interactions
-// with certain Kubernetes controller and apimachinery libraries.
-//
-// There are two access methods: individually via literal named methods, or as
-// a slice returned from All() method.
-//
-// Prefer the individual named methods for use cases where the particular kind(s)
-// that are needed are known to the caller. Prefer All() when performing operations
-// generically across all kinds.
-type Registry struct {
-	all [{{ len .Kinds }}]k8ssys.Kind
-}
-
-{{range $i, $k := .Kinds }}
-// {{ .Props.Name }} returns the [k8ssys.Kind] instance for the {{ .Props.Name }} kind.
-func (r *Registry) {{ .Props.Name }}() k8ssys.Kind {
-	return r.all[{{ $i }}]
-}
-{{end}}
-
-func doNewRegistry(breg *corekind.Base) *Registry {
-	var err error
-	var b []byte
-	var kk k8ssys.Kind
-	reg := &Registry{}
-
-{{range $i, $k := .Kinds }}
-  kk = k8ssys.Kind{
-    GrafanaKind: breg.{{ $k.Props.Name }}(),
-    Object: &{{ $k.Props.MachineName }}.{{ $k.Props.Name }}{},
-    ObjectList: &{{ $k.Props.MachineName }}.{{ $k.Props.Name }}List{},
-  }
-  // TODO Having the committed form on disk in YAML is worth doing this for now...but fix this silliness
-  map{{ $i }} := make(map[string]any)
-  err = yaml.Unmarshal({{ $k.Props.MachineName }}.CRDYaml, map{{ $i }})
-  if err != nil {
-    panic(fmt.Sprintf("generated CRD YAML for {{ $k.Props.Name }} failed to unmarshal: %s", err))
-  }
-  b, err = json.Marshal(map{{ $i }})
-  if err != nil {
-    panic(fmt.Sprintf("could not re-marshal CRD JSON for {{ $k.Props.Name }}: %s", err))
-  }
-  err = json.Unmarshal(b, &kk.Schema)
-  if err != nil {
-    panic(fmt.Sprintf("could not unmarshal CRD JSON for {{ $k.Props.Name }}: %s", err))
-  }
-  reg.all[{{ $i }}] = kk
-{{end}}
-
-	return reg
-}
diff --git a/pkg/codegen/tmpl/core_crd_types.tmpl b/pkg/codegen/tmpl/core_crd_types.tmpl
deleted file mode 100644
index f7d66402f82..00000000000
--- a/pkg/codegen/tmpl/core_crd_types.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-package crd
-
-import (
-  _ "embed"
-
-  "github.com/grafana/grafana/pkg/kinds/{{ .Props.MachineName }}"
-  "github.com/grafana/kindsys/k8ssys"
-)
-
-// The CRD YAML representation of the {{ .Props.Name }} kind.
-//
-//go:embed {{ .Props.MachineName }}.crd.yml
-var CRDYaml []byte
-
-// {{ .Props.Name }} is the Go CRD representation of a single {{ .Props.Name }} object.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type {{ .Props.Name }} struct {
-  k8ssys.Base[{{ .Props.MachineName }}.{{ .Props.Name }}]
-}
-
-// {{ .Props.Name }}List is the Go CRD representation of a list {{ .Props.Name }} objects.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type {{ .Props.Name }}List struct {
-  k8ssys.ListBase[{{ .Props.MachineName }}.{{ .Props.Name }}]
-}
diff --git a/pkg/kinds/dashboard/crd/dashboard.crd.yml b/pkg/kinds/dashboard/crd/dashboard.crd.yml
deleted file mode 100644
index 69bb59bbcaf..00000000000
--- a/pkg/kinds/dashboard/crd/dashboard.crd.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Code generated - EDITING IS FUTILE. DO NOT EDIT.
-#
-# Generated by:
-#     kinds/gen.go
-# Using jennies:
-#     YamlCRDJenny
-#
-# Run 'make gen-cue' from repository root to regenerate.
-
-# This CRD is generated with an empty schema body because Grafana's
-# code generators currently produce OpenAPI that Kubernetes will not
-# accept, despite being valid.
-
-kind: CustomResourceDefinition
-apiVersion: apiextensions.k8s.io/v1
-metadata:
-    name: dashboards.dashboard.core.grafana.com
-spec:
-    group: dashboard.core.grafana.com
-    versions:
-        - name: v0-0alpha1
-          served: true
-          storage: true
-          schema:
-            openAPIV3Schema:
-                properties:
-                    spec:
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                required:
-                    - spec
-                type: object
-    names:
-        kind: Dashboard
-        plural: dashboards
-    scope: Namespaced
diff --git a/pkg/kinds/dashboard/crd/dashboard_crd_gen.go b/pkg/kinds/dashboard/crd/dashboard_crd_gen.go
deleted file mode 100644
index a9a5af9730d..00000000000
--- a/pkg/kinds/dashboard/crd/dashboard_crd_gen.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CRDTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package crd
-
-import (
-	_ "embed"
-
-	"github.com/grafana/grafana/pkg/kinds/dashboard"
-	"github.com/grafana/kindsys/k8ssys"
-)
-
-// The CRD YAML representation of the Dashboard kind.
-//
-//go:embed dashboard.crd.yml
-var CRDYaml []byte
-
-// Dashboard is the Go CRD representation of a single Dashboard object.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type Dashboard struct {
-	k8ssys.Base[dashboard.Dashboard]
-}
-
-// DashboardList is the Go CRD representation of a list Dashboard objects.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type DashboardList struct {
-	k8ssys.ListBase[dashboard.Dashboard]
-}
diff --git a/pkg/kinds/librarypanel/crd/librarypanel.crd.yml b/pkg/kinds/librarypanel/crd/librarypanel.crd.yml
deleted file mode 100644
index 387b40fc12a..00000000000
--- a/pkg/kinds/librarypanel/crd/librarypanel.crd.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-# Code generated - EDITING IS FUTILE. DO NOT EDIT.
-#
-# Generated by:
-#     kinds/gen.go
-# Using jennies:
-#     YamlCRDJenny
-#
-# Run 'make gen-cue' from repository root to regenerate.
-
-kind: CustomResourceDefinition
-apiVersion: apiextensions.k8s.io/v1
-metadata:
-    name: librarypanels.librarypanel.core.grafana.com
-spec:
-    group: librarypanel.core.grafana.com
-    versions:
-        - name: v0-0alpha1
-          served: true
-          storage: true
-          schema:
-            openAPIV3Schema:
-                properties:
-                    spec:
-                        properties:
-                            description:
-                                description: Panel description
-                                type: string
-                            folderUid:
-                                description: Folder UID
-                                type: string
-                            meta:
-                                description: Object storage metadata
-                                properties:
-                                    connectedDashboards:
-                                        format: int64
-                                        type: integer
-                                    created:
-                                        format: date-time
-                                        type: string
-                                    createdBy:
-                                        properties:
-                                            avatarUrl:
-                                                type: string
-                                            id:
-                                                format: int64
-                                                type: integer
-                                            name:
-                                                type: string
-                                        required:
-                                            - id
-                                            - name
-                                            - avatarUrl
-                                        type: object
-                                    folderName:
-                                        type: string
-                                    folderUid:
-                                        type: string
-                                    updated:
-                                        format: date-time
-                                        type: string
-                                    updatedBy:
-                                        properties:
-                                            avatarUrl:
-                                                type: string
-                                            id:
-                                                format: int64
-                                                type: integer
-                                            name:
-                                                type: string
-                                        required:
-                                            - id
-                                            - name
-                                            - avatarUrl
-                                        type: object
-                                required:
-                                    - folderName
-                                    - folderUid
-                                    - connectedDashboards
-                                    - created
-                                    - updated
-                                    - createdBy
-                                    - updatedBy
-                                type: object
-                            model:
-                                description: |-
-                                    TODO: should be the same panel schema defined in dashboard
-                                    Typescript: Omit<Panel, 'gridPos' | 'id' | 'libraryPanel'>;
-                                type: object
-                            name:
-                                description: Panel name (also saved in the model)
-                                minLength: 1
-                                type: string
-                            schemaVersion:
-                                description: Dashboard version when this was saved (zero if unknown)
-                                maximum: 65535
-                                minimum: 0
-                                type: integer
-                            type:
-                                description: The panel type (from inside the model)
-                                minLength: 1
-                                type: string
-                            uid:
-                                description: Library element UID
-                                type: string
-                            version:
-                                description: panel version, incremented each time the dashboard is updated.
-                                format: int64
-                                type: integer
-                        required:
-                            - uid
-                            - name
-                            - type
-                            - version
-                            - model
-                        type: object
-                required:
-                    - spec
-                type: object
-    names:
-        kind: LibraryPanel
-        plural: librarypanels
-    scope: Namespaced
diff --git a/pkg/kinds/librarypanel/crd/librarypanel_crd_gen.go b/pkg/kinds/librarypanel/crd/librarypanel_crd_gen.go
deleted file mode 100644
index 3f538a327bf..00000000000
--- a/pkg/kinds/librarypanel/crd/librarypanel_crd_gen.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CRDTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package crd
-
-import (
-	_ "embed"
-
-	"github.com/grafana/grafana/pkg/kinds/librarypanel"
-	"github.com/grafana/kindsys/k8ssys"
-)
-
-// The CRD YAML representation of the LibraryPanel kind.
-//
-//go:embed librarypanel.crd.yml
-var CRDYaml []byte
-
-// LibraryPanel is the Go CRD representation of a single LibraryPanel object.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type LibraryPanel struct {
-	k8ssys.Base[librarypanel.LibraryPanel]
-}
-
-// LibraryPanelList is the Go CRD representation of a list LibraryPanel objects.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type LibraryPanelList struct {
-	k8ssys.ListBase[librarypanel.LibraryPanel]
-}
diff --git a/pkg/kinds/playlist/crd/playlist.crd.yml b/pkg/kinds/playlist/crd/playlist.crd.yml
deleted file mode 100644
index 192d8945ce8..00000000000
--- a/pkg/kinds/playlist/crd/playlist.crd.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-# Code generated - EDITING IS FUTILE. DO NOT EDIT.
-#
-# Generated by:
-#     kinds/gen.go
-# Using jennies:
-#     YamlCRDJenny
-#
-# Run 'make gen-cue' from repository root to regenerate.
-
-kind: CustomResourceDefinition
-apiVersion: apiextensions.k8s.io/v1
-metadata:
-    name: playlists.playlist.core.grafana.com
-spec:
-    group: playlist.core.grafana.com
-    versions:
-        - name: v0-0alpha1
-          served: true
-          storage: true
-          schema:
-            openAPIV3Schema:
-                properties:
-                    spec:
-                        properties:
-                            interval:
-                                default: 5m
-                                description: |-
-                                    Interval sets the time between switching views in a playlist.
-                                    FIXME: Is this based on a standardized format or what options are available? Can datemath be used?
-                                type: string
-                            items:
-                                description: |-
-                                    The ordered list of items that the playlist will iterate over.
-                                    FIXME! This should not be optional, but changing it makes the godegen awkward
-                                items:
-                                    properties:
-                                        title:
-                                            description: Title is an unused property -- it will be removed in the future
-                                            type: string
-                                        type:
-                                            description: Type of the item.
-                                            enum:
-                                                - dashboard_by_uid
-                                                - dashboard_by_id
-                                                - dashboard_by_tag
-                                            type: string
-                                        value:
-                                            description: |-
-                                                Value depends on type and describes the playlist item.
-
-                                                 - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This
-                                                 is not portable as the numerical identifier is non-deterministic between different instances.
-                                                 Will be replaced by dashboard_by_uid in the future. (deprecated)
-                                                 - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All
-                                                 dashboards behind the tag will be added to the playlist.
-                                                 - dashboard_by_uid: The value is the dashboard UID
-                                            type: string
-                                    required:
-                                        - type
-                                        - value
-                                    type: object
-                                type: array
-                            name:
-                                description: Name of the playlist.
-                                type: string
-                            uid:
-                                description: |-
-                                    Unique playlist identifier. Generated on creation, either by the
-                                    creator of the playlist of by the application.
-                                type: string
-                        required:
-                            - uid
-                            - name
-                            - interval
-                        type: object
-                required:
-                    - spec
-                type: object
-    names:
-        kind: Playlist
-        plural: playlists
-    scope: Namespaced
diff --git a/pkg/kinds/playlist/crd/playlist_crd_gen.go b/pkg/kinds/playlist/crd/playlist_crd_gen.go
deleted file mode 100644
index b05148c5a5a..00000000000
--- a/pkg/kinds/playlist/crd/playlist_crd_gen.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CRDTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package crd
-
-import (
-	_ "embed"
-
-	"github.com/grafana/grafana/pkg/kinds/playlist"
-	"github.com/grafana/kindsys/k8ssys"
-)
-
-// The CRD YAML representation of the Playlist kind.
-//
-//go:embed playlist.crd.yml
-var CRDYaml []byte
-
-// Playlist is the Go CRD representation of a single Playlist object.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type Playlist struct {
-	k8ssys.Base[playlist.Playlist]
-}
-
-// PlaylistList is the Go CRD representation of a list Playlist objects.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type PlaylistList struct {
-	k8ssys.ListBase[playlist.Playlist]
-}
diff --git a/pkg/kinds/preferences/crd/preferences.crd.yml b/pkg/kinds/preferences/crd/preferences.crd.yml
deleted file mode 100644
index 5afabc84e8c..00000000000
--- a/pkg/kinds/preferences/crd/preferences.crd.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Code generated - EDITING IS FUTILE. DO NOT EDIT.
-#
-# Generated by:
-#     kinds/gen.go
-# Using jennies:
-#     YamlCRDJenny
-#
-# Run 'make gen-cue' from repository root to regenerate.
-
-kind: CustomResourceDefinition
-apiVersion: apiextensions.k8s.io/v1
-metadata:
-    name: preferencess.preferences.core.grafana.com
-spec:
-    group: preferences.core.grafana.com
-    versions:
-        - name: v0-0alpha1
-          served: true
-          storage: true
-          schema:
-            openAPIV3Schema:
-                properties:
-                    spec:
-                        properties:
-                            homeDashboardUID:
-                                description: UID for the home dashboard
-                                type: string
-                            language:
-                                description: Selected language (beta)
-                                type: string
-                            queryHistory:
-                                description: Explore query history preferences
-                                properties:
-                                    homeTab:
-                                        description: 'one of: '''' | ''query'' | ''starred'';'
-                                        type: string
-                                type: object
-                            theme:
-                                description: light, dark, empty is default
-                                type: string
-                            timezone:
-                                description: |-
-                                    The timezone selection
-                                    TODO: this should use the timezone defined in common
-                                type: string
-                            weekStart:
-                                description: day of the week (sunday, monday, etc)
-                                type: string
-                        type: object
-                required:
-                    - spec
-                type: object
-    names:
-        kind: Preferences
-        plural: preferencess
-    scope: Namespaced
diff --git a/pkg/kinds/preferences/crd/preferences_crd_gen.go b/pkg/kinds/preferences/crd/preferences_crd_gen.go
deleted file mode 100644
index 7ccaa2380a7..00000000000
--- a/pkg/kinds/preferences/crd/preferences_crd_gen.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CRDTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package crd
-
-import (
-	_ "embed"
-
-	"github.com/grafana/grafana/pkg/kinds/preferences"
-	"github.com/grafana/kindsys/k8ssys"
-)
-
-// The CRD YAML representation of the Preferences kind.
-//
-//go:embed preferences.crd.yml
-var CRDYaml []byte
-
-// Preferences is the Go CRD representation of a single Preferences object.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type Preferences struct {
-	k8ssys.Base[preferences.Preferences]
-}
-
-// PreferencesList is the Go CRD representation of a list Preferences objects.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type PreferencesList struct {
-	k8ssys.ListBase[preferences.Preferences]
-}
diff --git a/pkg/kinds/publicdashboard/crd/publicdashboard.crd.yml b/pkg/kinds/publicdashboard/crd/publicdashboard.crd.yml
deleted file mode 100644
index 70fb2292b93..00000000000
--- a/pkg/kinds/publicdashboard/crd/publicdashboard.crd.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Code generated - EDITING IS FUTILE. DO NOT EDIT.
-#
-# Generated by:
-#     kinds/gen.go
-# Using jennies:
-#     YamlCRDJenny
-#
-# Run 'make gen-cue' from repository root to regenerate.
-
-kind: CustomResourceDefinition
-apiVersion: apiextensions.k8s.io/v1
-metadata:
-    name: publicdashboards.publicdashboard.core.grafana.com
-spec:
-    group: publicdashboard.core.grafana.com
-    versions:
-        - name: v0-0alpha1
-          served: true
-          storage: true
-          schema:
-            openAPIV3Schema:
-                properties:
-                    spec:
-                        properties:
-                            accessToken:
-                                description: Unique public access token
-                                type: string
-                            annotationsEnabled:
-                                description: Flag that indicates if annotations are enabled
-                                type: boolean
-                            dashboardUid:
-                                description: Dashboard unique identifier referenced by this public dashboard
-                                type: string
-                            isEnabled:
-                                description: Flag that indicates if the public dashboard is enabled
-                                type: boolean
-                            timeSelectionEnabled:
-                                description: Flag that indicates if the time range picker is enabled
-                                type: boolean
-                            uid:
-                                description: Unique public dashboard identifier
-                                type: string
-                        required:
-                            - uid
-                            - dashboardUid
-                            - isEnabled
-                            - annotationsEnabled
-                            - timeSelectionEnabled
-                        type: object
-                required:
-                    - spec
-                type: object
-    names:
-        kind: PublicDashboard
-        plural: publicdashboards
-    scope: Namespaced
diff --git a/pkg/kinds/publicdashboard/crd/publicdashboard_crd_gen.go b/pkg/kinds/publicdashboard/crd/publicdashboard_crd_gen.go
deleted file mode 100644
index c59e2fc1f5b..00000000000
--- a/pkg/kinds/publicdashboard/crd/publicdashboard_crd_gen.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CRDTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package crd
-
-import (
-	_ "embed"
-
-	"github.com/grafana/grafana/pkg/kinds/publicdashboard"
-	"github.com/grafana/kindsys/k8ssys"
-)
-
-// The CRD YAML representation of the PublicDashboard kind.
-//
-//go:embed publicdashboard.crd.yml
-var CRDYaml []byte
-
-// PublicDashboard is the Go CRD representation of a single PublicDashboard object.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type PublicDashboard struct {
-	k8ssys.Base[publicdashboard.PublicDashboard]
-}
-
-// PublicDashboardList is the Go CRD representation of a list PublicDashboard objects.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type PublicDashboardList struct {
-	k8ssys.ListBase[publicdashboard.PublicDashboard]
-}
diff --git a/pkg/kinds/serviceaccount/crd/serviceaccount.crd.yml b/pkg/kinds/serviceaccount/crd/serviceaccount.crd.yml
deleted file mode 100644
index 31c2131b9e8..00000000000
--- a/pkg/kinds/serviceaccount/crd/serviceaccount.crd.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-# Code generated - EDITING IS FUTILE. DO NOT EDIT.
-#
-# Generated by:
-#     kinds/gen.go
-# Using jennies:
-#     YamlCRDJenny
-#
-# Run 'make gen-cue' from repository root to regenerate.
-
-kind: CustomResourceDefinition
-apiVersion: apiextensions.k8s.io/v1
-metadata:
-    name: serviceaccounts.serviceaccount.core.grafana.com
-spec:
-    group: serviceaccount.core.grafana.com
-    versions:
-        - name: v0-0alpha1
-          served: true
-          storage: true
-          schema:
-            openAPIV3Schema:
-                properties:
-                    spec:
-                        properties:
-                            accessControl:
-                                additionalProperties:
-                                    type: boolean
-                                description: AccessControl metadata associated with a given resource.
-                                type: object
-                            avatarUrl:
-                                description: |-
-                                    AvatarUrl is the service account's avatar URL. It allows the frontend to display a picture in front
-                                    of the service account.
-                                type: string
-                            created:
-                                description: Created indicates when the service account was created.
-                                format: date-time
-                                type: string
-                            id:
-                                description: ID is the unique identifier of the service account in the database.
-                                format: int64
-                                type: integer
-                            isDisabled:
-                                description: IsDisabled indicates if the service account is disabled.
-                                type: boolean
-                            login:
-                                description: Login of the service account.
-                                type: string
-                            name:
-                                description: Name of the service account.
-                                type: string
-                            orgId:
-                                description: OrgId is the ID of an organisation the service account belongs to.
-                                format: int64
-                                type: integer
-                            role:
-                                description: Role is the Grafana organization role of the service account which can be 'Viewer', 'Editor', 'Admin'.
-                                enum:
-                                    - Admin
-                                    - Editor
-                                    - Viewer
-                                type: string
-                            teams:
-                                description: Teams is a list of teams the service account belongs to.
-                                items:
-                                    type: string
-                                type: array
-                            tokens:
-                                description: |-
-                                    Tokens is the number of active tokens for the service account.
-                                    Tokens are used to authenticate the service account against Grafana.
-                                format: int64
-                                type: integer
-                            updated:
-                                description: Updated indicates when the service account was updated.
-                                format: date-time
-                                type: string
-                        required:
-                            - id
-                            - orgId
-                            - name
-                            - login
-                            - isDisabled
-                            - role
-                            - tokens
-                            - avatarUrl
-                        type: object
-                required:
-                    - spec
-                type: object
-    names:
-        kind: ServiceAccount
-        plural: serviceaccounts
-    scope: Namespaced
diff --git a/pkg/kinds/serviceaccount/crd/serviceaccount_crd_gen.go b/pkg/kinds/serviceaccount/crd/serviceaccount_crd_gen.go
deleted file mode 100644
index 33f3564a798..00000000000
--- a/pkg/kinds/serviceaccount/crd/serviceaccount_crd_gen.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CRDTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package crd
-
-import (
-	_ "embed"
-
-	"github.com/grafana/grafana/pkg/kinds/serviceaccount"
-	"github.com/grafana/kindsys/k8ssys"
-)
-
-// The CRD YAML representation of the ServiceAccount kind.
-//
-//go:embed serviceaccount.crd.yml
-var CRDYaml []byte
-
-// ServiceAccount is the Go CRD representation of a single ServiceAccount object.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type ServiceAccount struct {
-	k8ssys.Base[serviceaccount.ServiceAccount]
-}
-
-// ServiceAccountList is the Go CRD representation of a list ServiceAccount objects.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type ServiceAccountList struct {
-	k8ssys.ListBase[serviceaccount.ServiceAccount]
-}
diff --git a/pkg/kinds/team/crd/team.crd.yml b/pkg/kinds/team/crd/team.crd.yml
deleted file mode 100644
index de995049e83..00000000000
--- a/pkg/kinds/team/crd/team.crd.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-# Code generated - EDITING IS FUTILE. DO NOT EDIT.
-#
-# Generated by:
-#     kinds/gen.go
-# Using jennies:
-#     YamlCRDJenny
-#
-# Run 'make gen-cue' from repository root to regenerate.
-
-kind: CustomResourceDefinition
-apiVersion: apiextensions.k8s.io/v1
-metadata:
-    name: teams.team.core.grafana.com
-spec:
-    group: team.core.grafana.com
-    versions:
-        - name: v0-0alpha1
-          served: true
-          storage: true
-          schema:
-            openAPIV3Schema:
-                properties:
-                    spec:
-                        properties:
-                            accessControl:
-                                additionalProperties:
-                                    type: boolean
-                                description: AccessControl metadata associated with a given resource.
-                                type: object
-                            avatarUrl:
-                                description: AvatarUrl is the team's avatar URL.
-                                type: string
-                            created:
-                                description: Created indicates when the team was created.
-                                format: date-time
-                                type: string
-                            email:
-                                description: Email of the team.
-                                type: string
-                            memberCount:
-                                description: MemberCount is the number of the team members.
-                                format: int64
-                                type: integer
-                            name:
-                                description: Name of the team.
-                                type: string
-                            orgId:
-                                description: OrgId is the ID of an organisation the team belongs to.
-                                format: int64
-                                type: integer
-                            permission:
-                                description: TODO - it seems it's a team_member.permission, unlikely it should belong to the team kind
-                                enum:
-                                    - 0
-                                    - 1
-                                    - 2
-                                    - 4
-                                type: integer
-                            updated:
-                                description: Updated indicates when the team was updated.
-                                format: date-time
-                                type: string
-                        required:
-                            - orgId
-                            - name
-                            - memberCount
-                            - permission
-                            - created
-                            - updated
-                        type: object
-                required:
-                    - spec
-                type: object
-    names:
-        kind: Team
-        plural: teams
-    scope: Namespaced
diff --git a/pkg/kinds/team/crd/team_crd_gen.go b/pkg/kinds/team/crd/team_crd_gen.go
deleted file mode 100644
index a4f41c8d6ce..00000000000
--- a/pkg/kinds/team/crd/team_crd_gen.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CRDTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package crd
-
-import (
-	_ "embed"
-
-	"github.com/grafana/grafana/pkg/kinds/team"
-	"github.com/grafana/kindsys/k8ssys"
-)
-
-// The CRD YAML representation of the Team kind.
-//
-//go:embed team.crd.yml
-var CRDYaml []byte
-
-// Team is the Go CRD representation of a single Team object.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type Team struct {
-	k8ssys.Base[team.Team]
-}
-
-// TeamList is the Go CRD representation of a list Team objects.
-// It implements [runtime.Object], and is used in k8s scheme construction.
-type TeamList struct {
-	k8ssys.ListBase[team.Team]
-}
diff --git a/pkg/registry/corecrd/registry.go b/pkg/registry/corecrd/registry.go
deleted file mode 100644
index fa160c057e0..00000000000
--- a/pkg/registry/corecrd/registry.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package corecrd
-
-import (
-	"github.com/grafana/kindsys/k8ssys"
-	"github.com/grafana/thema"
-
-	"github.com/grafana/grafana/pkg/registry/corekind"
-)
-
-// New constructs a new [Registry].
-//
-// All calling code within grafana/grafana is expected to use Grafana's
-// singleton [thema.Runtime], returned from [cuectx.GrafanaThemaRuntime]. If nil
-// is passed, the singleton will be used.
-func New(rt *thema.Runtime) *Registry {
-	breg := corekind.NewBase(rt)
-	return doNewRegistry(breg)
-}
-
-// All returns a slice of all core Grafana CRDs in the registry.
-//
-// The returned slice is guaranteed to be alphabetically sorted by kind name.
-func (r *Registry) All() []k8ssys.Kind {
-	all := make([]k8ssys.Kind, len(r.all))
-	copy(all, r.all[:])
-	return all
-}
diff --git a/pkg/registry/corecrd/registry_gen.go b/pkg/registry/corecrd/registry_gen.go
deleted file mode 100644
index 0b07d7a910f..00000000000
--- a/pkg/registry/corecrd/registry_gen.go
+++ /dev/null
@@ -1,231 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CRDKindRegistryJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package corecrd
-
-import (
-	"encoding/json"
-	"fmt"
-
-	dashboard "github.com/grafana/grafana/pkg/kinds/dashboard/crd"
-	librarypanel "github.com/grafana/grafana/pkg/kinds/librarypanel/crd"
-	playlist "github.com/grafana/grafana/pkg/kinds/playlist/crd"
-	preferences "github.com/grafana/grafana/pkg/kinds/preferences/crd"
-	publicdashboard "github.com/grafana/grafana/pkg/kinds/publicdashboard/crd"
-	serviceaccount "github.com/grafana/grafana/pkg/kinds/serviceaccount/crd"
-	team "github.com/grafana/grafana/pkg/kinds/team/crd"
-	"github.com/grafana/grafana/pkg/registry/corekind"
-	"github.com/grafana/kindsys/k8ssys"
-	"gopkg.in/yaml.v3"
-)
-
-// Registry is a list of all of Grafana's core structured kinds, wrapped in a
-// standard [k8ssys.CRD] interface that makes them usable for interactions
-// with certain Kubernetes controller and apimachinery libraries.
-//
-// There are two access methods: individually via literal named methods, or as
-// a slice returned from All() method.
-//
-// Prefer the individual named methods for use cases where the particular kind(s)
-// that are needed are known to the caller. Prefer All() when performing operations
-// generically across all kinds.
-type Registry struct {
-	all [7]k8ssys.Kind
-}
-
-// Dashboard returns the [k8ssys.Kind] instance for the Dashboard kind.
-func (r *Registry) Dashboard() k8ssys.Kind {
-	return r.all[0]
-}
-
-// LibraryPanel returns the [k8ssys.Kind] instance for the LibraryPanel kind.
-func (r *Registry) LibraryPanel() k8ssys.Kind {
-	return r.all[1]
-}
-
-// Playlist returns the [k8ssys.Kind] instance for the Playlist kind.
-func (r *Registry) Playlist() k8ssys.Kind {
-	return r.all[2]
-}
-
-// Preferences returns the [k8ssys.Kind] instance for the Preferences kind.
-func (r *Registry) Preferences() k8ssys.Kind {
-	return r.all[3]
-}
-
-// PublicDashboard returns the [k8ssys.Kind] instance for the PublicDashboard kind.
-func (r *Registry) PublicDashboard() k8ssys.Kind {
-	return r.all[4]
-}
-
-// ServiceAccount returns the [k8ssys.Kind] instance for the ServiceAccount kind.
-func (r *Registry) ServiceAccount() k8ssys.Kind {
-	return r.all[5]
-}
-
-// Team returns the [k8ssys.Kind] instance for the Team kind.
-func (r *Registry) Team() k8ssys.Kind {
-	return r.all[6]
-}
-
-func doNewRegistry(breg *corekind.Base) *Registry {
-	var err error
-	var b []byte
-	var kk k8ssys.Kind
-	reg := &Registry{}
-
-	kk = k8ssys.Kind{
-		GrafanaKind: breg.Dashboard(),
-		Object:      &dashboard.Dashboard{},
-		ObjectList:  &dashboard.DashboardList{},
-	}
-	// TODO Having the committed form on disk in YAML is worth doing this for now...but fix this silliness
-	map0 := make(map[string]any)
-	err = yaml.Unmarshal(dashboard.CRDYaml, map0)
-	if err != nil {
-		panic(fmt.Sprintf("generated CRD YAML for Dashboard failed to unmarshal: %s", err))
-	}
-	b, err = json.Marshal(map0)
-	if err != nil {
-		panic(fmt.Sprintf("could not re-marshal CRD JSON for Dashboard: %s", err))
-	}
-	err = json.Unmarshal(b, &kk.Schema)
-	if err != nil {
-		panic(fmt.Sprintf("could not unmarshal CRD JSON for Dashboard: %s", err))
-	}
-	reg.all[0] = kk
-
-	kk = k8ssys.Kind{
-		GrafanaKind: breg.LibraryPanel(),
-		Object:      &librarypanel.LibraryPanel{},
-		ObjectList:  &librarypanel.LibraryPanelList{},
-	}
-	// TODO Having the committed form on disk in YAML is worth doing this for now...but fix this silliness
-	map1 := make(map[string]any)
-	err = yaml.Unmarshal(librarypanel.CRDYaml, map1)
-	if err != nil {
-		panic(fmt.Sprintf("generated CRD YAML for LibraryPanel failed to unmarshal: %s", err))
-	}
-	b, err = json.Marshal(map1)
-	if err != nil {
-		panic(fmt.Sprintf("could not re-marshal CRD JSON for LibraryPanel: %s", err))
-	}
-	err = json.Unmarshal(b, &kk.Schema)
-	if err != nil {
-		panic(fmt.Sprintf("could not unmarshal CRD JSON for LibraryPanel: %s", err))
-	}
-	reg.all[1] = kk
-
-	kk = k8ssys.Kind{
-		GrafanaKind: breg.Playlist(),
-		Object:      &playlist.Playlist{},
-		ObjectList:  &playlist.PlaylistList{},
-	}
-	// TODO Having the committed form on disk in YAML is worth doing this for now...but fix this silliness
-	map2 := make(map[string]any)
-	err = yaml.Unmarshal(playlist.CRDYaml, map2)
-	if err != nil {
-		panic(fmt.Sprintf("generated CRD YAML for Playlist failed to unmarshal: %s", err))
-	}
-	b, err = json.Marshal(map2)
-	if err != nil {
-		panic(fmt.Sprintf("could not re-marshal CRD JSON for Playlist: %s", err))
-	}
-	err = json.Unmarshal(b, &kk.Schema)
-	if err != nil {
-		panic(fmt.Sprintf("could not unmarshal CRD JSON for Playlist: %s", err))
-	}
-	reg.all[2] = kk
-
-	kk = k8ssys.Kind{
-		GrafanaKind: breg.Preferences(),
-		Object:      &preferences.Preferences{},
-		ObjectList:  &preferences.PreferencesList{},
-	}
-	// TODO Having the committed form on disk in YAML is worth doing this for now...but fix this silliness
-	map3 := make(map[string]any)
-	err = yaml.Unmarshal(preferences.CRDYaml, map3)
-	if err != nil {
-		panic(fmt.Sprintf("generated CRD YAML for Preferences failed to unmarshal: %s", err))
-	}
-	b, err = json.Marshal(map3)
-	if err != nil {
-		panic(fmt.Sprintf("could not re-marshal CRD JSON for Preferences: %s", err))
-	}
-	err = json.Unmarshal(b, &kk.Schema)
-	if err != nil {
-		panic(fmt.Sprintf("could not unmarshal CRD JSON for Preferences: %s", err))
-	}
-	reg.all[3] = kk
-
-	kk = k8ssys.Kind{
-		GrafanaKind: breg.PublicDashboard(),
-		Object:      &publicdashboard.PublicDashboard{},
-		ObjectList:  &publicdashboard.PublicDashboardList{},
-	}
-	// TODO Having the committed form on disk in YAML is worth doing this for now...but fix this silliness
-	map4 := make(map[string]any)
-	err = yaml.Unmarshal(publicdashboard.CRDYaml, map4)
-	if err != nil {
-		panic(fmt.Sprintf("generated CRD YAML for PublicDashboard failed to unmarshal: %s", err))
-	}
-	b, err = json.Marshal(map4)
-	if err != nil {
-		panic(fmt.Sprintf("could not re-marshal CRD JSON for PublicDashboard: %s", err))
-	}
-	err = json.Unmarshal(b, &kk.Schema)
-	if err != nil {
-		panic(fmt.Sprintf("could not unmarshal CRD JSON for PublicDashboard: %s", err))
-	}
-	reg.all[4] = kk
-
-	kk = k8ssys.Kind{
-		GrafanaKind: breg.ServiceAccount(),
-		Object:      &serviceaccount.ServiceAccount{},
-		ObjectList:  &serviceaccount.ServiceAccountList{},
-	}
-	// TODO Having the committed form on disk in YAML is worth doing this for now...but fix this silliness
-	map5 := make(map[string]any)
-	err = yaml.Unmarshal(serviceaccount.CRDYaml, map5)
-	if err != nil {
-		panic(fmt.Sprintf("generated CRD YAML for ServiceAccount failed to unmarshal: %s", err))
-	}
-	b, err = json.Marshal(map5)
-	if err != nil {
-		panic(fmt.Sprintf("could not re-marshal CRD JSON for ServiceAccount: %s", err))
-	}
-	err = json.Unmarshal(b, &kk.Schema)
-	if err != nil {
-		panic(fmt.Sprintf("could not unmarshal CRD JSON for ServiceAccount: %s", err))
-	}
-	reg.all[5] = kk
-
-	kk = k8ssys.Kind{
-		GrafanaKind: breg.Team(),
-		Object:      &team.Team{},
-		ObjectList:  &team.TeamList{},
-	}
-	// TODO Having the committed form on disk in YAML is worth doing this for now...but fix this silliness
-	map6 := make(map[string]any)
-	err = yaml.Unmarshal(team.CRDYaml, map6)
-	if err != nil {
-		panic(fmt.Sprintf("generated CRD YAML for Team failed to unmarshal: %s", err))
-	}
-	b, err = json.Marshal(map6)
-	if err != nil {
-		panic(fmt.Sprintf("could not re-marshal CRD JSON for Team: %s", err))
-	}
-	err = json.Unmarshal(b, &kk.Schema)
-	if err != nil {
-		panic(fmt.Sprintf("could not unmarshal CRD JSON for Team: %s", err))
-	}
-	reg.all[6] = kk
-
-	return reg
-}
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index e9dd1654c40..552ec7e3034 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -90,13 +90,6 @@ var (
 			State:       FeatureStateAlpha,
 			Owner:       grafanaAppPlatformSquad,
 		},
-		{
-			Name:            "k8s",
-			Description:     "Explore native k8s integrations",
-			State:           FeatureStateAlpha,
-			RequiresDevMode: true,
-			Owner:           grafanaAppPlatformSquad,
-		},
 		{
 			Name:         "exploreMixedDatasource",
 			Description:  "Enable mixed datasource in Explore",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index cd9e05e9489..07bee5a12b9 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -12,7 +12,6 @@ lokiLive,alpha,@grafana/observability-logs,false,false,false,false
 featureHighlights,stable,@grafana/grafana-as-code,false,false,false,false
 migrationLocking,beta,@grafana/backend-platform,false,false,false,false
 storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
-k8s,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
 exploreMixedDatasource,beta,@grafana/explore-squad,false,false,false,true
 newTraceViewHeader,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
 correlations,beta,@grafana/explore-squad,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 3848bc3527b..d7e369c0dc3 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -59,10 +59,6 @@ const (
 	// Configurable storage for dashboards, datasources, and resources
 	FlagStorage = "storage"
 
-	// FlagK8S
-	// Explore native k8s integrations
-	FlagK8S = "k8s"
-
 	// FlagExploreMixedDatasource
 	// Enable mixed datasource in Explore
 	FlagExploreMixedDatasource = "exploreMixedDatasource"

From d0ced39847c94a76047c2e79824f1ccb262e3a33 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 26 Apr 2023 16:07:15 +0200
Subject: [PATCH 433/729] Elasticsearch: Use array of strings as index in
 backend queries (#67276)

Elasticsearch: Use array of strings as indice in backend queries
---
 pkg/tsdb/elasticsearch/client/client.go      | 2 +-
 pkg/tsdb/elasticsearch/client/client_test.go | 2 +-
 pkg/tsdb/elasticsearch/snapshot_test.go      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/tsdb/elasticsearch/client/client.go b/pkg/tsdb/elasticsearch/client/client.go
index c96f51d396b..c14ffd6a8b0 100644
--- a/pkg/tsdb/elasticsearch/client/client.go
+++ b/pkg/tsdb/elasticsearch/client/client.go
@@ -207,7 +207,7 @@ func (c *baseClientImpl) createMultiSearchRequests(searchRequests []*SearchReque
 			header: map[string]interface{}{
 				"search_type":        "query_then_fetch",
 				"ignore_unavailable": true,
-				"index":              strings.Join(c.indices, ","),
+				"index":              c.indices,
 			},
 			body:     searchReq,
 			interval: searchReq.Interval,
diff --git a/pkg/tsdb/elasticsearch/client/client_test.go b/pkg/tsdb/elasticsearch/client/client_test.go
index 1c4895b7a5d..4d90fd71a7f 100644
--- a/pkg/tsdb/elasticsearch/client/client_test.go
+++ b/pkg/tsdb/elasticsearch/client/client_test.go
@@ -96,7 +96,7 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
 		jBody, err := simplejson.NewJson(bodyBytes)
 		require.NoError(t, err)
 
-		assert.Equal(t, "metrics-2018.05.15", jHeader.Get("index").MustString())
+		assert.Equal(t, []string{"metrics-2018.05.15"}, jHeader.Get("index").MustStringArray())
 		assert.True(t, jHeader.Get("ignore_unavailable").MustBool(false))
 		assert.Equal(t, "query_then_fetch", jHeader.Get("search_type").MustString())
 		assert.Empty(t, jHeader.Get("max_concurrent_shard_requests"))
diff --git a/pkg/tsdb/elasticsearch/snapshot_test.go b/pkg/tsdb/elasticsearch/snapshot_test.go
index ff021dbac8a..312d068f0e1 100644
--- a/pkg/tsdb/elasticsearch/snapshot_test.go
+++ b/pkg/tsdb/elasticsearch/snapshot_test.go
@@ -82,7 +82,7 @@ func TestRequestSnapshots(t *testing.T) {
 	queryHeader := []byte(`
 	{
 		"ignore_unavailable": true,
-		"index": "testdb-2022.11.14",
+		"index": ["testdb-2022.11.14"],
 		"search_type": "query_then_fetch"
 	}
 	`)

From 9796b6b0005c53f70eed6f26a7bf2c2212072019 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:42:25 +0100
Subject: [PATCH 434/729] NestedFolders: Connect Search input fields to state
 manager (#67193)

* NestedFolders: Connect Search input fields to state manager

* Fix tag list not loading

* Clear includePanels checkbox when leaving search

* fix test

* Fix extra right margin

* fix missing style

* cleanup

* fix placeholder

* fix test
---
 .../BrowseDashboardsPage.test.tsx             |  2 +-
 .../BrowseDashboardsPage.tsx                  | 38 ++++++++++++------
 .../components/BrowseFilters.tsx              | 40 +++++++++----------
 .../components/SearchView.tsx                 | 22 +++++-----
 .../search/components/ManageDashboardsNew.tsx |  8 +---
 .../search/page/components/ActionRow.tsx      | 37 ++++++++---------
 .../search/page/components/ManageActions.tsx  | 20 +++++-----
 .../search/page/components/SearchView.tsx     |  2 +-
 .../search/state/SearchStateManager.ts        | 22 ++++++++--
 public/app/features/search/tempI18nPhrases.ts | 10 +++++
 public/locales/en-US/grafana.json             |  4 +-
 public/locales/fr-FR/grafana.json             | 10 ++---
 public/locales/pseudo-LOCALE/grafana.json     |  4 +-
 13 files changed, 121 insertions(+), 98 deletions(-)
 create mode 100644 public/app/features/search/tempI18nPhrases.ts

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
index 29f63d4ea30..78d416cae1c 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
@@ -61,7 +61,7 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
 
   it('displays a search input', async () => {
     render(<BrowseDashboardsPage {...props} />);
-    expect(await screen.findByPlaceholderText('Search box')).toBeInTheDocument();
+    expect(await screen.findByPlaceholderText('Search for dashboards and folders')).toBeInTheDocument();
   });
 
   it('displays the filters and hides the actions initially', async () => {
diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index 34c13125aa3..336e109215f 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -1,15 +1,15 @@
 import { css } from '@emotion/css';
-import React, { memo, useMemo } from 'react';
+import React, { memo, useEffect, useMemo } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { locationSearchToObject } from '@grafana/runtime';
-import { Input, useStyles2 } from '@grafana/ui';
+import { FilterInput, useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
 import { buildNavModel } from '../folders/state/navModel';
-import { parseRouteParams } from '../search/utils';
+import { useSearchStateManager } from '../search/state/SearchStateManager';
+import { getSearchPlaceholder } from '../search/tempI18nPhrases';
 
 import { skipToken, useGetFolderQuery } from './api/browseDashboardsAPI';
 import { BrowseActions } from './components/BrowseActions/BrowseActions';
@@ -27,13 +27,22 @@ export interface Props extends GrafanaRouteComponentProps<BrowseDashboardsPageRo
 
 // New Browse/Manage/Search Dashboards views for nested folders
 
-const BrowseDashboardsPage = memo(({ match, location }: Props) => {
-  const styles = useStyles2(getStyles);
+const BrowseDashboardsPage = memo(({ match }: Props) => {
   const { uid: folderUID } = match.params;
 
-  const searchState = useMemo(() => {
-    return parseRouteParams(locationSearchToObject(location.search));
-  }, [location.search]);
+  const styles = useStyles2(getStyles);
+  const [searchState, stateManager] = useSearchStateManager();
+  const isSearching = stateManager.hasSearchFilters();
+
+  useEffect(() => stateManager.initStateFromUrl(folderUID), [folderUID, stateManager]);
+
+  useEffect(() => {
+    // Clear the search results when we leave SearchView to prevent old results flashing
+    // when starting a new search
+    if (!isSearching && searchState.result) {
+      stateManager.setState({ result: undefined, includePanels: undefined });
+    }
+  }, [isSearching, searchState.result, stateManager]);
 
   const { data: folderDTO } = useGetFolderQuery(folderUID ?? skipToken);
   const navModel = useMemo(() => (folderDTO ? buildNavModel(folderDTO) : undefined), [folderDTO]);
@@ -42,15 +51,20 @@ const BrowseDashboardsPage = memo(({ match, location }: Props) => {
   return (
     <Page navId="dashboards/browse" pageNav={navModel}>
       <Page.Contents className={styles.pageContents}>
-        <Input placeholder="Search box" />
+        <FilterInput
+          placeholder={getSearchPlaceholder(searchState.includePanels)}
+          value={searchState.query}
+          escapeRegex={false}
+          onChange={(e) => stateManager.onQueryChange(e)}
+        />
 
         {hasSelection ? <BrowseActions /> : <BrowseFilters />}
 
         <div className={styles.subView}>
           <AutoSizer>
             {({ width, height }) =>
-              searchState.query ? (
-                <SearchView width={width} height={height} folderUID={folderUID} />
+              isSearching ? (
+                <SearchView width={width} height={height} />
               ) : (
                 <BrowseView width={width} height={height} folderUID={folderUID} />
               )
diff --git a/public/app/features/browse-dashboards/components/BrowseFilters.tsx b/public/app/features/browse-dashboards/components/BrowseFilters.tsx
index 36fef5bc4fd..34fec506496 100644
--- a/public/app/features/browse-dashboards/components/BrowseFilters.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseFilters.tsx
@@ -1,33 +1,29 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 
 import { ActionRow } from 'app/features/search/page/components/ActionRow';
-import { SearchLayout } from 'app/features/search/types';
+import { getGrafanaSearcher } from 'app/features/search/service';
+import { useSearchStateManager } from 'app/features/search/state/SearchStateManager';
 
 export function BrowseFilters() {
-  const fakeState = useMemo(() => {
-    return {
-      query: '',
-      tag: [],
-      starred: false,
-      layout: SearchLayout.Folders,
-      eventTrackingNamespace: 'manage_dashboards' as const,
-    };
-  }, []);
+  const [searchState, stateManager] = useSearchStateManager();
 
   return (
     <div>
       <ActionRow
-        includePanels={false}
-        state={fakeState}
-        getTagOptions={() => Promise.resolve([])}
-        getSortOptions={() => Promise.resolve([])}
-        onLayoutChange={() => {}}
-        onSortChange={() => {}}
-        onStarredFilterChange={() => {}}
-        onTagFilterChange={() => {}}
-        onDatasourceChange={() => {}}
-        onPanelTypeChange={() => {}}
-        onSetIncludePanels={() => {}}
+        hideLayout
+        showStarredFilter
+        state={searchState}
+        getTagOptions={stateManager.getTagOptions}
+        getSortOptions={getGrafanaSearcher().getSortOptions}
+        sortPlaceholder={getGrafanaSearcher().sortPlaceholder}
+        includePanels={searchState.includePanels ?? false}
+        onLayoutChange={stateManager.onLayoutChange}
+        onStarredFilterChange={stateManager.onStarredFilterChange}
+        onSortChange={stateManager.onSortChange}
+        onTagFilterChange={stateManager.onTagFilterChange}
+        onDatasourceChange={stateManager.onDatasourceChange}
+        onPanelTypeChange={stateManager.onPanelTypeChange}
+        onSetIncludePanels={stateManager.onSetIncludePanels}
       />
     </div>
   );
diff --git a/public/app/features/browse-dashboards/components/SearchView.tsx b/public/app/features/browse-dashboards/components/SearchView.tsx
index 481fc7926b0..0af421731f4 100644
--- a/public/app/features/browse-dashboards/components/SearchView.tsx
+++ b/public/app/features/browse-dashboards/components/SearchView.tsx
@@ -1,9 +1,9 @@
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback } from 'react';
 
 import { Spinner } from '@grafana/ui';
 import { useKeyNavigationListener } from 'app/features/search/hooks/useSearchKeyboardSelection';
 import { SearchResultsProps, SearchResultsTable } from 'app/features/search/page/components/SearchResultsTable';
-import { getSearchStateManager } from 'app/features/search/state/SearchStateManager';
+import { useSearchStateManager } from 'app/features/search/state/SearchStateManager';
 import { DashboardViewItemKind } from 'app/features/search/types';
 import { useDispatch, useSelector } from 'app/types';
 
@@ -12,20 +12,16 @@ import { setItemSelectionState } from '../state';
 interface SearchViewProps {
   height: number;
   width: number;
-  folderUID: string | undefined;
 }
 
-export function SearchView({ folderUID, width, height }: SearchViewProps) {
+export function SearchView({ width, height }: SearchViewProps) {
   const dispatch = useDispatch();
   const selectedItems = useSelector((wholeState) => wholeState.browseDashboards.selectedItems);
 
   const { keyboardEvents } = useKeyNavigationListener();
+  const [searchState, stateManager] = useSearchStateManager();
 
-  const stateManager = getSearchStateManager();
-  useEffect(() => stateManager.initStateFromUrl(folderUID), [folderUID, stateManager]);
-
-  const state = stateManager.useState();
-  const value = state.result;
+  const value = searchState.result;
 
   const selectionChecker = useCallback(
     (kind: string | undefined, uid: string): boolean => {
@@ -55,12 +51,16 @@ export function SearchView({ folderUID, width, height }: SearchViewProps) {
 
   if (!value) {
     return (
-      <div>
+      <div style={{ width }}>
         <Spinner />
       </div>
     );
   }
 
+  if (value.totalRows === 0) {
+    return <div style={{ width }}>No search results</div>;
+  }
+
   const props: SearchResultsProps = {
     response: value,
     selection: selectionChecker,
@@ -70,7 +70,7 @@ export function SearchView({ folderUID, width, height }: SearchViewProps) {
     height: height,
     onTagSelected: stateManager.onAddTag,
     keyboardEvents,
-    onDatasourceChange: state.datasource ? stateManager.onDatasourceChange : undefined,
+    onDatasourceChange: searchState.datasource ? stateManager.onDatasourceChange : undefined,
     onClickItem: stateManager.onSearchItemClicked,
   };
 
diff --git a/public/app/features/search/components/ManageDashboardsNew.tsx b/public/app/features/search/components/ManageDashboardsNew.tsx
index bca54ec5a8e..a2065e5c953 100644
--- a/public/app/features/search/components/ManageDashboardsNew.tsx
+++ b/public/app/features/search/components/ManageDashboardsNew.tsx
@@ -3,13 +3,13 @@ import React, { useEffect } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2, FilterInput } from '@grafana/ui';
-import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import { FolderDTO, AccessControlAction } from 'app/types';
 
 import { useKeyNavigationListener } from '../hooks/useSearchKeyboardSelection';
 import { SearchView } from '../page/components/SearchView';
 import { getSearchStateManager } from '../state/SearchStateManager';
+import { getSearchPlaceholder } from '../tempI18nPhrases';
 
 import { DashboardActions } from './DashboardActions';
 
@@ -50,11 +50,7 @@ export const ManageDashboardsNew = React.memo(({ folder }: Props) => {
             // eslint-disable-next-line jsx-a11y/no-autofocus
             autoFocus
             spellCheck={false}
-            placeholder={
-              state.includePanels
-                ? t('search.search-input.include-panels-placeholder', 'Search for dashboards and panels')
-                : t('search.search-input.placeholder', 'Search for dashboards')
-            }
+            placeholder={getSearchPlaceholder(state.includePanels)}
             escapeRegex={false}
             className={styles.searchInput}
           />
diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx
index f9881c9351f..57fcc7a4b0b 100644
--- a/public/app/features/search/page/components/ActionRow.tsx
+++ b/public/app/features/search/page/components/ActionRow.tsx
@@ -105,25 +105,23 @@ export const ActionRow = ({
         )}
       </HorizontalGroup>
 
-      <div className={styles.rowContainer}>
-        <HorizontalGroup spacing="md" width="auto">
-          {!hideLayout && (
-            <RadioButtonGroup
-              options={getLayoutOptions()}
-              disabledOptions={disabledOptions}
-              onChange={onLayoutChange}
-              value={layout}
-            />
-          )}
-          <SortPicker
-            onChange={(change) => onSortChange(change?.value)}
-            value={state.sort}
-            getSortOptions={getSortOptions}
-            placeholder={sortPlaceholder || t('search.actions.sort-placeholder', 'Sort')}
-            isClearable
+      <HorizontalGroup spacing="md" width="auto">
+        {!hideLayout && (
+          <RadioButtonGroup
+            options={getLayoutOptions()}
+            disabledOptions={disabledOptions}
+            onChange={onLayoutChange}
+            value={layout}
           />
-        </HorizontalGroup>
-      </div>
+        )}
+        <SortPicker
+          onChange={(change) => onSortChange(change?.value)}
+          value={state.sort}
+          getSortOptions={getSortOptions}
+          placeholder={sortPlaceholder || t('search.actions.sort-placeholder', 'Sort')}
+          isClearable
+        />
+      </HorizontalGroup>
     </div>
   );
 };
@@ -143,9 +141,6 @@ export const getStyles = (theme: GrafanaTheme2) => {
         width: 100%;
       }
     `,
-    rowContainer: css`
-      margin-right: ${theme.v1.spacing.md};
-    `,
     checkboxWrapper: css`
       label {
         line-height: 1.2;
diff --git a/public/app/features/search/page/components/ManageActions.tsx b/public/app/features/search/page/components/ManageActions.tsx
index dd8dbe90a2c..563343d0d30 100644
--- a/public/app/features/search/page/components/ManageActions.tsx
+++ b/public/app/features/search/page/components/ManageActions.tsx
@@ -43,17 +43,15 @@ export function ManageActions({ items, folder, onChange, clearSelection }: Props
 
   return (
     <div className={styles.actionRow} data-testid="manage-actions">
-      <div className={styles.rowContainer}>
-        <HorizontalGroup spacing="md" width="auto">
-          <IconButton name="check-square" onClick={clearSelection} title="Uncheck everything" />
-          <Button disabled={!canMove} onClick={onMove} icon="exchange-alt" variant="secondary">
-            Move
-          </Button>
-          <Button disabled={!canDelete} onClick={onDelete} icon="trash-alt" variant="destructive">
-            Delete
-          </Button>
-        </HorizontalGroup>
-      </div>
+      <HorizontalGroup spacing="md" width="auto">
+        <IconButton name="check-square" onClick={clearSelection} title="Uncheck everything" />
+        <Button disabled={!canMove} onClick={onMove} icon="exchange-alt" variant="secondary">
+          Move
+        </Button>
+        <Button disabled={!canDelete} onClick={onDelete} icon="trash-alt" variant="destructive">
+          Delete
+        </Button>
+      </HorizontalGroup>
 
       {isDeleteModalOpen && (
         <ConfirmDeleteModal onDeleteItems={onChange} results={items} onDismiss={() => setIsDeleteModalOpen(false)} />
diff --git a/public/app/features/search/page/components/SearchView.tsx b/public/app/features/search/page/components/SearchView.tsx
index 71ea47e1e54..b1f65393187 100644
--- a/public/app/features/search/page/components/SearchView.tsx
+++ b/public/app/features/search/page/components/SearchView.tsx
@@ -115,7 +115,7 @@ export const SearchView = ({ showManage, folderDTO, hidePseudoFolders, keyboardE
     }
 
     return (
-      <div style={{ content: 'auto-sizer-wrapper', height: '100%', width: '100%' }}>
+      <div style={{ height: '100%', width: '100%' }}>
         <AutoSizer>
           {({ width, height }) => {
             const props: SearchResultsProps = {
diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index f4c77b248d3..47a57ade1ed 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -40,7 +40,7 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
   doSearchWithDebounce = debounce(() => this.doSearch(), 300);
   lastQuery?: SearchQuery;
 
-  initStateFromUrl(folderUid?: string) {
+  initStateFromUrl(folderUid?: string, doInitialSearch = true) {
     const stateFromUrl = parseRouteParams(locationService.getSearchObject());
 
     // Force list view when conditions are specified from the URL
@@ -54,8 +54,11 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
       eventTrackingNamespace: folderUid ? 'manage_dashboards' : 'dashboard_search',
     });
 
-    this.doSearch();
+    if (doInitialSearch && this.hasSearchFilters()) {
+      this.doSearch();
+    }
   }
+
   /**
    * Updates internal and url state, then triggers a new search
    */
@@ -162,7 +165,7 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
   };
 
   hasSearchFilters() {
-    return this.state.query || this.state.tag.length || this.state.starred || this.state.panel_type;
+    return this.state.query || this.state.tag.length || this.state.starred || this.state.panel_type || this.state.sort;
   }
 
   getSearchQuery() {
@@ -244,7 +247,11 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
 
   // This gets the possible tags from within the query results
   getTagOptions = (): Promise<TermCount[]> => {
-    return getGrafanaSearcher().tags(this.lastQuery!);
+    const query = this.lastQuery ?? {
+      kind: ['dashboard', 'folder'],
+      query: '*',
+    };
+    return getGrafanaSearcher().tags(query);
   };
 
   /**
@@ -299,3 +306,10 @@ export function getSearchStateManager() {
 
   return stateManager;
 }
+
+export function useSearchStateManager() {
+  const stateManager = getSearchStateManager();
+  const state = stateManager.useState();
+
+  return [state, stateManager] as const;
+}
diff --git a/public/app/features/search/tempI18nPhrases.ts b/public/app/features/search/tempI18nPhrases.ts
new file mode 100644
index 00000000000..07c2abbf0ef
--- /dev/null
+++ b/public/app/features/search/tempI18nPhrases.ts
@@ -0,0 +1,10 @@
+// Temporary place to collect phrases we reuse between new and old browse/search
+// TODO: remove this when new Browse Dashboards UI is no longer feature flagged
+
+import { t } from 'app/core/internationalization';
+
+export function getSearchPlaceholder(includePanels = false) {
+  return includePanels
+    ? t('search.search-input.include-panels-placeholder', 'Search for dashboards, folders, and panels')
+    : t('search.search-input.placeholder', 'Search for dashboards and folders');
+}
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index bd6610270a1..b8fc661ec47 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -439,8 +439,8 @@
       "type-header": "Type"
     },
     "search-input": {
-      "include-panels-placeholder": "Search for dashboards and panels",
-      "placeholder": "Search for dashboards"
+      "include-panels-placeholder": "Search for dashboards, folders, and panels",
+      "placeholder": "Search for dashboards and folders"
     }
   },
   "share-modal": {
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 5172e23636e..51b64acea2a 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -55,7 +55,7 @@
       "query-tab": "Requête",
       "stats-tab": "Statistiques",
       "subtitle": "{{queryCount}} requêtes avec un délai total de requête de {{formatted}}",
-      "title": "Inspecter : {{panelTitle}}"
+      "title": "Inspecter\u00a0: {{panelTitle}}"
     },
     "inspect-data": {
       "data-options": "Options de données",
@@ -85,7 +85,7 @@
       "panel-json-description": "Le modèle enregistré dans le tableau de bord JSON qui configure comment tout fonctionne.",
       "panel-json-label": "Panneau JSON",
       "select-source": "Sélectionner la source",
-      "unknown": "Objet inconnu : {{show}}"
+      "unknown": "Objet inconnu\u00a0: {{show}}"
     },
     "inspect-meta": {
       "no-inspector": "Pas d'inspecteur de métadonnées"
@@ -118,7 +118,7 @@
     "contact-admin": "Veuillez contacter votre administrateur pour configurer les sources de données.",
     "explanation": "Pour visualiser vos données, vous devrez d’abord les connecter.",
     "new-dashboard": "Nouveau tableau de bord",
-    "preferred": "Connectez votre source de données préférée :",
+    "preferred": "Connectez votre source de données préférée\u00a0:",
     "sampleData": "Ou établissez un nouveau tableau de bord avec des exemples de données",
     "viewAll": "Afficher tout",
     "welcome": "Bienvenue aux tableaux de bord Grafana !"
@@ -148,7 +148,7 @@
   },
   "library-panels": {
     "save": {
-      "error": "Erreur lors de l'enregistrement du panneau de bibliothèque : \"{{errorMsg}}\"",
+      "error": "Erreur lors de l'enregistrement du panneau de bibliothèque\u00a0: \"{{errorMsg}}\"",
       "success": "Panneau de bibliothèque enregistré"
     }
   },
@@ -495,7 +495,7 @@
       "info-text-1": "Un instantané est un moyen instantané de partager publiquement un tableau de bord interactif. Lors de la création, nous supprimons les données sensibles telles que les requêtes (métrique, modèle et annotation) et les liens du panneau, pour ne laisser que les métriques visibles et les noms de séries intégrés dans votre tableau de bord.",
       "info-text-2": "N'oubliez pas que votre instantané <1>peut être consulté par une personne</1> qui dispose du lien et qui peut accéder à l'URL. Partagez judicieusement.",
       "local-button": "Instantané local",
-      "mistake-message": "Avez-vous commis une erreur ? ",
+      "mistake-message": "Avez-vous commis une erreur\u00a0? ",
       "name": "Nom de l'instantané",
       "timeout": "Délai d’expiration (secondes)",
       "timeout-description": "Vous devrez peut-être configurer la valeur du délai d'expiration si la collecte des métriques de votre tableau de bord prend beaucoup de temps.",
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index d1305b90833..6bdd1c43a93 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -439,8 +439,8 @@
       "type-header": "Ŧypę"
     },
     "search-input": {
-      "include-panels-placeholder": "Ŝęäřčĥ ƒőř đäşĥþőäřđş äʼnđ päʼnęľş",
-      "placeholder": "Ŝęäřčĥ ƒőř đäşĥþőäřđş"
+      "include-panels-placeholder": "Ŝęäřčĥ ƒőř đäşĥþőäřđş, ƒőľđęřş, äʼnđ päʼnęľş",
+      "placeholder": "Ŝęäřčĥ ƒőř đäşĥþőäřđş äʼnđ ƒőľđęřş"
     }
   },
   "share-modal": {

From e1ab9cc9d8c5c060553238620acbc1b0ba0404a4 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 26 Apr 2023 08:30:57 -0700
Subject: [PATCH 435/729] Chore: Remove test type app mode (#66987)

---
 pkg/setting/setting.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 0ddd92535ee..99525b50361 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -47,7 +47,6 @@ const (
 	DefaultHTTPAddr  = "0.0.0.0"
 	Dev              = "development"
 	Prod             = "production"
-	Test             = "test"
 	ApplicationName  = "Grafana"
 )
 

From b0881daf234a0211cc5c486b2dd6402adf545695 Mon Sep 17 00:00:00 2001
From: Santiago <santiagohernandez.1997@gmail.com>
Date: Wed, 26 Apr 2023 13:06:18 -0300
Subject: [PATCH 436/729] Alerting: Use URLs in image annotations (#66804)

* use tokens or urls in image annotations

* improve tests, fix some comments

* fix empty tokens

* code review changes, check for url before checking for token (support old token formats)
---
 pkg/services/ngalert/notifier/images.go      | 38 +++++++++-------
 pkg/services/ngalert/notifier/images_test.go | 47 ++++++++++++++++++++
 pkg/services/ngalert/notifier/testing.go     |  4 ++
 pkg/services/ngalert/schedule/compat.go      | 12 ++++-
 pkg/services/ngalert/schedule/compat_test.go |  2 +-
 pkg/services/ngalert/state/manager.go        | 22 ++++-----
 pkg/services/ngalert/state/state_test.go     |  2 +-
 pkg/services/ngalert/store/image.go          | 21 +++++++++
 pkg/services/ngalert/store/image_test.go     | 21 ++++++++-
 pkg/services/ngalert/store/testing.go        | 12 +++++
 10 files changed, 146 insertions(+), 35 deletions(-)
 create mode 100644 pkg/services/ngalert/notifier/images_test.go

diff --git a/pkg/services/ngalert/notifier/images.go b/pkg/services/ngalert/notifier/images.go
index bbeec8b36bb..10a29b00663 100644
--- a/pkg/services/ngalert/notifier/images.go
+++ b/pkg/services/ngalert/notifier/images.go
@@ -2,7 +2,7 @@ package notifier
 
 import (
 	"context"
-	"errors"
+	"strings"
 
 	"github.com/grafana/alerting/images"
 
@@ -20,21 +20,27 @@ func newImageStore(store store.ImageStore) images.ImageStore {
 	}
 }
 
-func (i imageStore) GetImage(ctx context.Context, token string) (*images.Image, error) {
-	image, err := i.store.GetImage(ctx, token)
+func (i imageStore) GetImage(ctx context.Context, uri string) (*images.Image, error) {
+	var (
+		image *models.Image
+		err   error
+	)
+
+	// Check whether the uri is a URL or a token to know how to query the DB.
+	if strings.HasPrefix(uri, "http") {
+		image, err = i.store.GetImageByURL(ctx, uri)
+	} else {
+		token := strings.TrimPrefix(uri, "token://")
+		image, err = i.store.GetImage(ctx, token)
+	}
 	if err != nil {
-		if errors.Is(err, models.ErrImageNotFound) {
-			err = images.ErrImageNotFound
-		}
+		return nil, err
 	}
-	var result *images.Image
-	if image != nil {
-		result = &images.Image{
-			Token:     image.Token,
-			Path:      image.Path,
-			URL:       image.URL,
-			CreatedAt: image.CreatedAt,
-		}
-	}
-	return result, err
+
+	return &images.Image{
+		Token:     image.Token,
+		Path:      image.Path,
+		URL:       image.URL,
+		CreatedAt: image.CreatedAt,
+	}, nil
 }
diff --git a/pkg/services/ngalert/notifier/images_test.go b/pkg/services/ngalert/notifier/images_test.go
new file mode 100644
index 00000000000..ba67ba52cb2
--- /dev/null
+++ b/pkg/services/ngalert/notifier/images_test.go
@@ -0,0 +1,47 @@
+package notifier
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetImage(t *testing.T) {
+	fakeImageStore := store.NewFakeImageStore(t)
+	store := newImageStore(fakeImageStore)
+
+	t.Run("queries by token when it gets a token", func(tt *testing.T) {
+		img := models.Image{
+			Token: "test",
+			URL:   "http://localhost:1234",
+			Path:  "test.png",
+		}
+		err := fakeImageStore.SaveImage(context.Background(), &img)
+		require.NoError(tt, err)
+
+		savedImg, err := store.GetImage(context.Background(), "token://"+img.Token)
+		require.NoError(tt, err)
+		require.Equal(tt, savedImg.Token, img.Token)
+		require.Equal(tt, savedImg.URL, img.URL)
+		require.Equal(tt, savedImg.Path, img.Path)
+	})
+
+	t.Run("queries by URL when it gets a URL", func(tt *testing.T) {
+		img := models.Image{
+			Token: "test",
+			Path:  "test.png",
+			URL:   "https://test.com/test.png",
+		}
+		err := fakeImageStore.SaveImage(context.Background(), &img)
+		require.NoError(tt, err)
+
+		savedImg, err := store.GetImage(context.Background(), img.URL)
+		require.NoError(tt, err)
+		require.Equal(tt, savedImg.Token, img.Token)
+		require.Equal(tt, savedImg.URL, img.URL)
+		require.Equal(tt, savedImg.Path, img.Path)
+	})
+}
diff --git a/pkg/services/ngalert/notifier/testing.go b/pkg/services/ngalert/notifier/testing.go
index 8dd7e111765..31606030bf6 100644
--- a/pkg/services/ngalert/notifier/testing.go
+++ b/pkg/services/ngalert/notifier/testing.go
@@ -31,6 +31,10 @@ func (f *fakeConfigStore) GetImage(ctx context.Context, token string) (*models.I
 	return nil, models.ErrImageNotFound
 }
 
+func (f *fakeConfigStore) GetImageByURL(ctx context.Context, url string) (*models.Image, error) {
+	return nil, models.ErrImageNotFound
+}
+
 func (f *fakeConfigStore) GetImages(ctx context.Context, tokens []string) ([]models.Image, []string, error) {
 	return nil, nil, models.ErrImageNotFound
 }
diff --git a/pkg/services/ngalert/schedule/compat.go b/pkg/services/ngalert/schedule/compat.go
index 94f8a14b2a3..14c87ae663a 100644
--- a/pkg/services/ngalert/schedule/compat.go
+++ b/pkg/services/ngalert/schedule/compat.go
@@ -50,7 +50,7 @@ func stateToPostableAlert(alertState *state.State, appURL *url.URL) *models.Post
 	}
 
 	if alertState.Image != nil {
-		nA[alertingModels.ImageTokenAnnotation] = alertState.Image.Token
+		nA[alertingModels.ImageTokenAnnotation] = generateImageURI(alertState.Image)
 	}
 
 	if alertState.StateReason != "" {
@@ -167,3 +167,13 @@ func FromAlertsStateToStoppedAlert(firingStates []state.StateTransition, appURL
 	}
 	return alerts
 }
+
+// generateImageURI returns a string that serves as an identifier for the image.
+// It first checks if there is an image URL available, and if not,
+// it prefixes the image token with `token://` and uses it as the URI.
+func generateImageURI(image *ngModels.Image) string {
+	if image.URL != "" {
+		return image.URL
+	}
+	return "token://" + image.Token
+}
diff --git a/pkg/services/ngalert/schedule/compat_test.go b/pkg/services/ngalert/schedule/compat_test.go
index 419f79795ea..7e61fd3d055 100644
--- a/pkg/services/ngalert/schedule/compat_test.go
+++ b/pkg/services/ngalert/schedule/compat_test.go
@@ -130,7 +130,7 @@ func Test_stateToPostableAlert(t *testing.T) {
 					for k, v := range alertState.Annotations {
 						expected[k] = v
 					}
-					expected["__alertImageToken__"] = alertState.Image.Token
+					expected["__alertImageToken__"] = "token://" + alertState.Image.Token
 
 					require.Equal(t, expected, result.Annotations)
 				})
diff --git a/pkg/services/ngalert/state/manager.go b/pkg/services/ngalert/state/manager.go
index 5161ba957cf..15e4ff66a52 100644
--- a/pkg/services/ngalert/state/manager.go
+++ b/pkg/services/ngalert/state/manager.go
@@ -422,8 +422,6 @@ func translateInstanceState(state ngModels.InstanceStateType) eval.State {
 func (st *Manager) deleteStaleStatesFromCache(ctx context.Context, logger log.Logger, evaluatedAt time.Time, alertRule *ngModels.AlertRule) []StateTransition {
 	// If we are removing two or more stale series it makes sense to share the resolved image as the alert rule is the same.
 	// TODO: We will need to change this when we support images without screenshots as each series will have a different image
-	var resolvedImage *ngModels.Image
-
 	staleStates := st.cache.deleteRuleStates(alertRule.GetKey(), func(s *State) bool {
 		return stateIsStale(evaluatedAt, s.LastEvaluationTime, alertRule.IntervalSeconds)
 	})
@@ -441,19 +439,15 @@ func (st *Manager) deleteStaleStatesFromCache(ctx context.Context, logger log.Lo
 
 		if oldState == eval.Alerting {
 			s.Resolved = true
-			// If there is no resolved image for this rule then take one
-			if resolvedImage == nil {
-				image, err := takeImage(ctx, st.images, alertRule)
-				if err != nil {
-					logger.Warn("Failed to take an image",
-						"dashboard", alertRule.GetDashboardUID(),
-						"panel", alertRule.GetPanelID(),
-						"error", err)
-				} else if image != nil {
-					resolvedImage = image
-				}
+			image, err := takeImage(ctx, st.images, alertRule)
+			if err != nil {
+				logger.Warn("Failed to take an image",
+					"dashboard", alertRule.GetDashboardUID(),
+					"panel", alertRule.GetPanelID(),
+					"error", err)
+			} else if image != nil {
+				s.Image = image
 			}
-			s.Image = resolvedImage
 		}
 
 		record := StateTransition{
diff --git a/pkg/services/ngalert/state/state_test.go b/pkg/services/ngalert/state/state_test.go
index 95ced7f8fe3..9d4684e45bc 100644
--- a/pkg/services/ngalert/state/state_test.go
+++ b/pkg/services/ngalert/state/state_test.go
@@ -584,7 +584,7 @@ func TestShouldTakeImage(t *testing.T) {
 		name:          "should not take image for alerting state with image",
 		state:         eval.Alerting,
 		previousState: eval.Alerting,
-		previousImage: &ngmodels.Image{Path: "foo.png", URL: "https://example.com/foo.png"},
+		previousImage: &ngmodels.Image{URL: "https://example.com/foo.png"},
 	}}
 
 	for _, test := range tests {
diff --git a/pkg/services/ngalert/store/image.go b/pkg/services/ngalert/store/image.go
index 7d5a9f44b7b..095098138bb 100644
--- a/pkg/services/ngalert/store/image.go
+++ b/pkg/services/ngalert/store/image.go
@@ -20,6 +20,10 @@ type ImageStore interface {
 	// if the image has expired or if an image with the token does not exist.
 	GetImage(ctx context.Context, token string) (*models.Image, error)
 
+	// GetImageByURL looks for a image by its URL. It returns ErrImageNotFound
+	// if the image has expired or if there is no image associated with the URL.
+	GetImageByURL(ctx context.Context, url string) (*models.Image, error)
+
 	// GetImages returns all images that match the tokens. If one or more images
 	// have expired or do not exist then it also returns the unmatched tokens
 	// and an ErrImageNotFound error.
@@ -54,6 +58,23 @@ func (st DBstore) GetImage(ctx context.Context, token string) (*models.Image, er
 	return &image, nil
 }
 
+func (st DBstore) GetImageByURL(ctx context.Context, url string) (*models.Image, error) {
+	var image models.Image
+	if err := st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
+		exists, err := sess.Where("url = ? AND expires_at > ?", url, TimeNow().UTC()).Limit(1).Get(&image)
+		if err != nil {
+			return fmt.Errorf("failed to get image: %w", err)
+		} else if !exists {
+			return models.ErrImageNotFound
+		} else {
+			return nil
+		}
+	}); err != nil {
+		return nil, err
+	}
+	return &image, nil
+}
+
 func (st DBstore) GetImages(ctx context.Context, tokens []string) ([]models.Image, []string, error) {
 	var images []models.Image
 	if err := st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
diff --git a/pkg/services/ngalert/store/image_test.go b/pkg/services/ngalert/store/image_test.go
index 8002898d0ba..1f69e2ee7d1 100644
--- a/pkg/services/ngalert/store/image_test.go
+++ b/pkg/services/ngalert/store/image_test.go
@@ -30,7 +30,7 @@ func TestIntegrationSaveAndGetImage(t *testing.T) {
 	// create an image with a path on disk
 	image1 := models.Image{Path: "example.png"}
 	require.NoError(t, dbstore.SaveImage(ctx, &image1))
-	require.NotEqual(t, "", image1.Token)
+	require.NotEqual(t, image1.Token, "")
 
 	// image should not have expired
 	assert.False(t, image1.HasExpired())
@@ -49,7 +49,12 @@ func TestIntegrationSaveAndGetImage(t *testing.T) {
 	// create an image with a URL
 	image2 := models.Image{URL: "https://example.com/example.png"}
 	require.NoError(t, dbstore.SaveImage(ctx, &image2))
-	require.NotEqual(t, "", image2.Token)
+	require.NotEqual(t, image2.Token, "")
+
+	// create another image with the same URL
+	image3 := models.Image{URL: "https://example.com/example.png"}
+	require.NoError(t, dbstore.SaveImage(ctx, &image3))
+	require.NotEqual(t, image3.Token, "")
 
 	// image should not have expired
 	assert.False(t, image2.HasExpired())
@@ -60,12 +65,24 @@ func TestIntegrationSaveAndGetImage(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, image2, *result2)
 
+	// querying by URL should yield the same result even though we have two images with the same URL
+	result2, err = dbstore.GetImageByURL(ctx, image2.URL)
+	require.NoError(t, err)
+	assert.Equal(t, image2, *result2)
+
 	// expired image should not be returned
 	image1.ExpiresAt = time.Now().Add(-time.Second)
 	require.NoError(t, dbstore.SaveImage(ctx, &image1))
 	result1, err = dbstore.GetImage(ctx, image1.Token)
 	assert.EqualError(t, err, "image not found")
 	assert.Nil(t, result1)
+
+	// Querying by URL should yield the same result.
+	image2.ExpiresAt = time.Now().Add(-time.Second)
+	require.NoError(t, dbstore.SaveImage(ctx, &image1))
+	result2, err = dbstore.GetImage(ctx, image2.URL)
+	assert.EqualError(t, err, "image not found")
+	assert.Nil(t, result2)
 }
 
 func TestIntegrationGetImages(t *testing.T) {
diff --git a/pkg/services/ngalert/store/testing.go b/pkg/services/ngalert/store/testing.go
index 5480f443867..6d28dd7005e 100644
--- a/pkg/services/ngalert/store/testing.go
+++ b/pkg/services/ngalert/store/testing.go
@@ -49,6 +49,18 @@ func (s *FakeImageStore) GetImage(_ context.Context, token string) (*models.Imag
 	return nil, models.ErrImageNotFound
 }
 
+func (s *FakeImageStore) GetImageByURL(_ context.Context, url string) (*models.Image, error) {
+	s.mtx.Lock()
+	defer s.mtx.Unlock()
+	for _, image := range s.images {
+		if image.URL == url {
+			return image, nil
+		}
+	}
+
+	return nil, models.ErrImageNotFound
+}
+
 func (s *FakeImageStore) GetImages(_ context.Context, tokens []string) ([]models.Image, []string, error) {
 	s.mtx.Lock()
 	defer s.mtx.Unlock()

From c308118fc024eae0a7bf48a0b681e234e37262c3 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 26 Apr 2023 18:21:04 +0200
Subject: [PATCH 437/729] Elasticsearch: Move response parsing tests to 1 file
 (#67288)

* Organize tests

* Organize

* Fix lint

* Fix lint
---
 .../response_parser_frontend_test.go          | 1552 --------
 .../elasticsearch/response_parser_test.go     | 3506 ++++++++++++-----
 2 files changed, 2509 insertions(+), 2549 deletions(-)
 delete mode 100644 pkg/tsdb/elasticsearch/response_parser_frontend_test.go

diff --git a/pkg/tsdb/elasticsearch/response_parser_frontend_test.go b/pkg/tsdb/elasticsearch/response_parser_frontend_test.go
deleted file mode 100644
index e3b8f3d7305..00000000000
--- a/pkg/tsdb/elasticsearch/response_parser_frontend_test.go
+++ /dev/null
@@ -1,1552 +0,0 @@
-package elasticsearch
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/stretchr/testify/require"
-)
-
-func requireTimeValue(t *testing.T, expected int64, frame *data.Frame, index int) {
-	getField := func() *data.Field {
-		for _, field := range frame.Fields {
-			if field.Type() == data.FieldTypeTime {
-				return field
-			}
-		}
-		return nil
-	}
-
-	field := getField()
-	require.NotNil(t, field, "missing time-field")
-
-	require.Equal(t, time.UnixMilli(expected).UTC(), field.At(index), fmt.Sprintf("wrong time at index %v", index))
-}
-
-func requireNumberValue(t *testing.T, expected float64, frame *data.Frame, index int) {
-	getField := func() *data.Field {
-		for _, field := range frame.Fields {
-			if field.Type() == data.FieldTypeNullableFloat64 {
-				return field
-			}
-		}
-		return nil
-	}
-
-	field := getField()
-	require.NotNil(t, field, "missing number-field")
-
-	v := field.At(index).(*float64)
-
-	require.Equal(t, expected, *v, fmt.Sprintf("wrong number at index %v", index))
-}
-
-func requireFrameLength(t *testing.T, frame *data.Frame, expectedLength int) {
-	l, err := frame.RowLen()
-	require.NoError(t, err)
-	require.Equal(t, expectedLength, l, "wrong frame-length")
-}
-
-func requireStringAt(t *testing.T, expected string, field *data.Field, index int) {
-	v := field.At(index).(*string)
-	require.Equal(t, expected, *v, fmt.Sprintf("wrong string at index %v", index))
-}
-
-func requireFloatAt(t *testing.T, expected float64, field *data.Field, index int) {
-	v := field.At(index).(*float64)
-	require.Equal(t, expected, *v, fmt.Sprintf("wrong flaot at index %v", index))
-}
-
-func requireTimeSeriesName(t *testing.T, expected string, frame *data.Frame) {
-	getField := func() *data.Field {
-		for _, field := range frame.Fields {
-			if field.Type() != data.FieldTypeTime {
-				return field
-			}
-		}
-		return nil
-	}
-
-	field := getField()
-	require.NotNil(t, expected, field.Config)
-	require.Equal(t, expected, field.Config.DisplayNameFromDS)
-}
-
-func TestRefIdMatching(t *testing.T) {
-	require.NoError(t, nil)
-	query := []byte(`
-			[
-				{
-					"refId": "COUNT_GROUPBY_DATE_HISTOGRAM",
-					"metrics": [{ "type": "count", "id": "c_1" }],
-					"bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "c_2" }]
-				},
-				{
-					"refId": "COUNT_GROUPBY_HISTOGRAM",
-					"metrics": [{ "type": "count", "id": "h_3" }],
-					"bucketAggs": [{ "type": "histogram", "field": "bytes", "id": "h_4" }]
-				},
-				{
-					"refId": "RAW_DOC",
-					"metrics": [{ "type": "raw_document", "id": "r_5" }],
-					"bucketAggs": []
-				},
-				{
-					"refId": "PERCENTILE",
-					"metrics": [
-					{
-						"type": "percentiles",
-						"settings": { "percents": ["75", "90"] },
-						"id": "p_1"
-					}
-					],
-					"bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "p_3" }]
-				},
-				{
-					"refId": "EXTENDEDSTATS",
-					"metrics": [
-					{
-						"type": "extended_stats",
-						"meta": { "max": true, "std_deviation_bounds_upper": true },
-						"id": "e_1"
-					}
-					],
-					"bucketAggs": [
-					{ "type": "terms", "field": "host", "id": "e_3" },
-					{ "type": "date_histogram", "id": "e_4" }
-					]
-				},
-				{
-					"refId": "RAWDATA",
-					"metrics": [{ "type": "raw_data", "id": "6" }],
-					"bucketAggs": []
-				}
-			]
-			`)
-
-	response := []byte(`
-			{
-				"responses": [
-				  {
-					"aggregations": {
-					  "c_2": {
-						"buckets": [{"doc_count": 10, "key": 1000}]
-					  }
-					}
-				  },
-				  {
-					"aggregations": {
-					  "h_4": {
-						"buckets": [{ "doc_count": 1, "key": 1000 }]
-					  }
-					}
-				  },
-				  {
-					"hits": {
-					  "total": 2,
-					  "hits": [
-						{
-						  "_id": "5",
-						  "_type": "type",
-						  "_index": "index",
-						  "_source": { "sourceProp": "asd" },
-						  "fields": { "fieldProp": "field" }
-						},
-						{
-						  "_source": { "sourceProp": "asd2" },
-						  "fields": { "fieldProp": "field2" }
-						}
-					  ]
-					}
-				  },
-				  {
-					"aggregations": {
-					  "p_3": {
-						"buckets": [
-						  {
-							"p_1": { "values": { "75": 3.3, "90": 5.5 } },
-							"doc_count": 10,
-							"key": 1000
-						  },
-						  {
-							"p_1": { "values": { "75": 2.3, "90": 4.5 } },
-							"doc_count": 15,
-							"key": 2000
-						  }
-						]
-					  }
-					}
-				  },
-				  {
-					"aggregations": {
-					  "e_3": {
-						"buckets": [
-						  {
-							"key": "server1",
-							"e_4": {
-							  "buckets": [
-								{
-								  "e_1": {
-									"max": 10.2,
-									"min": 5.5,
-									"std_deviation_bounds": { "upper": 3, "lower": -2 }
-								  },
-								  "doc_count": 10,
-								  "key": 1000
-								}
-							  ]
-							}
-						  },
-						  {
-							"key": "server2",
-							"e_4": {
-							  "buckets": [
-								{
-								  "e_1": {
-									"max": 10.2,
-									"min": 5.5,
-									"std_deviation_bounds": { "upper": 3, "lower": -2 }
-								  },
-								  "doc_count": 10,
-								  "key": 1000
-								}
-							  ]
-							}
-						  }
-						]
-					  }
-					}
-				  },
-				  {
-					"hits": {
-					  "total": {
-						"relation": "eq",
-						"value": 1
-					  },
-					  "hits": [
-						{
-						  "_id": "6",
-						  "_type": "_doc",
-						  "_index": "index",
-						  "_source": { "sourceProp": "asd" }
-						}
-					  ]
-					}
-				  }
-				]
-			  }
-			`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	verifyFrames := func(name string, expectedLength int) {
-		r, found := result.response.Responses[name]
-		require.True(t, found, "not found: "+name)
-		require.NoError(t, r.Error)
-		require.Len(t, r.Frames, expectedLength, "length wrong for "+name)
-	}
-
-	verifyFrames("COUNT_GROUPBY_DATE_HISTOGRAM", 1)
-	verifyFrames("COUNT_GROUPBY_HISTOGRAM", 1)
-	verifyFrames("RAW_DOC", 1)
-	verifyFrames("PERCENTILE", 2)
-	verifyFrames("EXTENDEDSTATS", 4)
-	verifyFrames("RAWDATA", 1)
-}
-
-func TestSimpleQueryReturns1Frame(t *testing.T) {
-	query := []byte(`
-		[
-			{
-				"refId": "A",
-				"metrics": [{ "type": "count", "id": "1" }],
-				"bucketAggs": [
-				{ "type": "date_histogram", "field": "@timestamp", "id": "2" }
-				]
-			}
-			]
-		`)
-
-	response := []byte(`
-		{
-			"responses": [
-			  {
-				"aggregations": {
-				  "2": {
-					"buckets": [
-					  { "doc_count": 10, "key": 1000 },
-					  { "doc_count": 15, "key": 2000 }
-					]
-				  }
-				}
-			  }
-			]
-		  }
-		`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 1, "frame-count wrong")
-	frame := frames[0]
-	requireTimeSeriesName(t, "Count", frame)
-
-	requireFrameLength(t, frame, 2)
-	requireTimeValue(t, 1000, frame, 0)
-	requireNumberValue(t, 10, frame, 0)
-}
-
-func TestSimpleQueryCountAndAvg(t *testing.T) {
-	query := []byte(`
-	[
-		{
-			"refId": "A",
-			"metrics": [
-			{ "type": "count", "id": "1" },
-			{ "type": "avg", "field": "value", "id": "2" }
-			],
-			"bucketAggs": [
-			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
-			]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "3": {
-				"buckets": [
-				  { "2": { "value": 88 }, "doc_count": 10, "key": 1000 },
-				  { "2": { "value": 99 }, "doc_count": 15, "key": 2000 }
-				]
-			  }
-			}
-		  }
-		]
-	  }
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 2)
-
-	frame1 := frames[0]
-	frame2 := frames[1]
-
-	requireFrameLength(t, frame1, 2)
-	requireFrameLength(t, frame2, 2)
-
-	requireTimeValue(t, 1000, frame1, 0)
-	requireNumberValue(t, 10, frame1, 0)
-
-	requireTimeSeriesName(t, "Average value", frame2)
-
-	requireNumberValue(t, 88, frame2, 0)
-	requireNumberValue(t, 99, frame2, 1)
-}
-
-func TestSimpleGroupBy1Metric2Frames(t *testing.T) {
-	query := []byte(`
-	[
-		{
-			"refId": "A",
-			"metrics": [{ "type": "count", "id": "1" }],
-			"bucketAggs": [
-			{ "type": "terms", "field": "host", "id": "2" },
-			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
-			]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  {
-					"3": {
-					  "buckets": [
-						{ "doc_count": 1, "key": 1000 },
-						{ "doc_count": 3, "key": 2000 }
-					  ]
-					},
-					"doc_count": 4,
-					"key": "server1"
-				  },
-				  {
-					"3": {
-					  "buckets": [
-						{ "doc_count": 2, "key": 1000 },
-						{ "doc_count": 8, "key": 2000 }
-					  ]
-					},
-					"doc_count": 10,
-					"key": "server2"
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 2)
-
-	requireFrameLength(t, frames[0], 2)
-	requireTimeSeriesName(t, "server1", frames[0])
-	requireTimeSeriesName(t, "server2", frames[1])
-}
-
-func TestSimpleGroupBy2Metrics4Frames(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [
-			{ "type": "count", "id": "1" },
-			{ "type": "avg", "field": "@value", "id": "4" }
-		  ],
-		  "bucketAggs": [
-			{ "type": "terms", "field": "host", "id": "2" },
-			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
-		  ]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  {
-					"3": {
-					  "buckets": [
-						{ "4": { "value": 10 }, "doc_count": 1, "key": 1000 },
-						{ "4": { "value": 12 }, "doc_count": 3, "key": 2000 }
-					  ]
-					},
-					"doc_count": 4,
-					"key": "server1"
-				  },
-				  {
-					"3": {
-					  "buckets": [
-						{ "4": { "value": 20 }, "doc_count": 1, "key": 1000 },
-						{ "4": { "value": 32 }, "doc_count": 3, "key": 2000 }
-					  ]
-					},
-					"doc_count": 10,
-					"key": "server2"
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 4)
-	requireFrameLength(t, frames[0], 2)
-	requireTimeSeriesName(t, "server1 Count", frames[0])
-	requireTimeSeriesName(t, "server1 Average @value", frames[1])
-	requireTimeSeriesName(t, "server2 Count", frames[2])
-	requireTimeSeriesName(t, "server2 Average @value", frames[3])
-}
-
-func TestPercentiles2Frames(t *testing.T) {
-	query := []byte(`
-	[
-		{
-			"refId": "A",
-			"metrics": [
-			{
-				"type": "percentiles",
-				"settings": { "percents": ["75", "90"] },
-				"id": "1",
-				"field": "@value"
-			}
-			],
-			"bucketAggs": [
-			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
-			]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "3": {
-				"buckets": [
-				  {
-					"1": { "values": { "75": 3.3, "90": 5.5 } },
-					"doc_count": 10,
-					"key": 1000
-				  },
-				  {
-					"1": { "values": { "75": 2.3, "90": 4.5 } },
-					"doc_count": 15,
-					"key": 2000
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 2)
-
-	requireFrameLength(t, frames[0], 2)
-	requireTimeSeriesName(t, "p75 @value", frames[0])
-	requireTimeSeriesName(t, "p90 @value", frames[1])
-
-	requireNumberValue(t, 3.3, frames[0], 0)
-	requireTimeValue(t, 1000, frames[0], 0)
-	requireNumberValue(t, 4.5, frames[1], 1)
-}
-
-func TestExtendedStats4Frames(t *testing.T) {
-	query := []byte(`
-	[
-		{
-			"refId": "A",
-			"metrics": [
-			{
-				"type": "extended_stats",
-				"meta": { "max": true, "std_deviation_bounds_upper": true },
-				"id": "1",
-				"field": "@value"
-			}
-			],
-			"bucketAggs": [
-			{ "type": "terms", "field": "host", "id": "3" },
-			{ "type": "date_histogram", "id": "4" }
-			]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "3": {
-				"buckets": [
-				  {
-					"4": {
-					  "buckets": [
-						{
-						  "1": {
-							"max": 10.2,
-							"min": 5.5,
-							"std_deviation_bounds": { "upper": 3, "lower": -2 }
-						  },
-						  "doc_count": 10,
-						  "key": 1000
-						}
-					  ]
-					},
-					"key": "server1"
-				  },
-				  {
-					"4": {
-					  "buckets": [
-						{
-						  "1": {
-							"max": 10.2,
-							"min": 5.5,
-							"std_deviation_bounds": { "upper": 3, "lower": -2 }
-						  },
-						  "doc_count": 10,
-						  "key": 1000
-						}
-					  ]
-					},
-					"key": "server2"
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 4)
-	requireFrameLength(t, frames[0], 1)
-	requireTimeSeriesName(t, "server1 Max @value", frames[0])
-	requireTimeSeriesName(t, "server1 Std Dev Upper @value", frames[1])
-
-	requireNumberValue(t, 10.2, frames[0], 0)
-	requireNumberValue(t, 3, frames[1], 0)
-}
-
-func TestTopMetrics2Frames(t *testing.T) {
-	query := []byte(`
-	[
-		{
-			"refId": "A",
-			"metrics": [
-			{
-				"type": "top_metrics",
-				"settings": {
-				"order": "top",
-				"orderBy": "@timestamp",
-				"metrics": ["@value", "@anotherValue"]
-				},
-				"id": "1"
-			}
-			],
-			"bucketAggs": [{ "type": "date_histogram", "id": "2" }]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  {
-					"1": {
-					  "top": [
-						{
-						  "sort": ["2021-01-01T00:00:00.000Z"],
-						  "metrics": { "@value": 1, "@anotherValue": 2 }
-						}
-					  ]
-					},
-					"key": 1609459200000,
-					"key_as_string": "2021-01-01T00:00:00.000Z"
-				  },
-				  {
-					"1": {
-					  "top": [
-						{
-						  "sort": ["2021-01-01T00:00:10.000Z"],
-						  "metrics": { "@value": 1, "@anotherValue": 2 }
-						}
-					  ]
-					},
-					"key": 1609459210000,
-					"key_as_string": "2021-01-01T00:00:10.000Z"
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	time1, err := time.Parse(time.RFC3339, "2021-01-01T00:00:00.000Z")
-	require.NoError(t, err)
-	time2, err := time.Parse(time.RFC3339, "2021-01-01T00:00:10.000Z")
-	require.NoError(t, err)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 2)
-
-	frame1 := frames[0]
-	frame2 := frames[1]
-
-	requireTimeSeriesName(t, "Top Metrics @value", frame1)
-	requireFrameLength(t, frame1, 2)
-	requireTimeValue(t, time1.UTC().UnixMilli(), frame1, 0)
-	requireTimeValue(t, time2.UTC().UnixMilli(), frame1, 1)
-	requireNumberValue(t, 1, frame1, 0)
-	requireNumberValue(t, 1, frame1, 1)
-
-	requireTimeSeriesName(t, "Top Metrics @anotherValue", frame2)
-	requireFrameLength(t, frame2, 2)
-	requireTimeValue(t, time1.UTC().UnixMilli(), frame2, 0)
-	requireTimeValue(t, time2.UTC().UnixMilli(), frame2, 1)
-	requireNumberValue(t, 2, frame2, 0)
-	requireNumberValue(t, 2, frame2, 1)
-}
-
-func TestSingleGroupWithAliasPattern3Frames(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [{ "type": "count", "id": "1" }],
-		  "alias": "{{term @host}} {{metric}} and {{not_exist}} {{@host}}",
-		  "bucketAggs": [
-			{ "type": "terms", "field": "@host", "id": "2" },
-			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
-		  ]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  {
-					"3": {
-					  "buckets": [
-						{ "doc_count": 1, "key": 1000 },
-						{ "doc_count": 3, "key": 2000 }
-					  ]
-					},
-					"doc_count": 4,
-					"key": "server1"
-				  },
-				  {
-					"3": {
-					  "buckets": [
-						{ "doc_count": 2, "key": 1000 },
-						{ "doc_count": 8, "key": 2000 }
-					  ]
-					},
-					"doc_count": 10,
-					"key": "server2"
-				  },
-				  {
-					"3": {
-					  "buckets": [
-						{ "doc_count": 2, "key": 1000 },
-						{ "doc_count": 8, "key": 2000 }
-					  ]
-					},
-					"doc_count": 10,
-					"key": 0
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 3)
-
-	requireFrameLength(t, frames[0], 2)
-	requireTimeSeriesName(t, "server1 Count and {{not_exist}} server1", frames[0])
-	requireTimeSeriesName(t, "server2 Count and {{not_exist}} server2", frames[1])
-	requireTimeSeriesName(t, "0 Count and {{not_exist}} 0", frames[2])
-}
-
-func TestHistogramSimple(t *testing.T) {
-	query := []byte(`
-	[
-		{
-			"refId": "A",
-			"metrics": [{ "type": "count", "id": "1" }],
-			"bucketAggs": [{ "type": "histogram", "field": "bytes", "id": "3" }]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "3": {
-				"buckets": [
-				  { "doc_count": 1, "key": 1000 },
-				  { "doc_count": 3, "key": 2000 },
-				  { "doc_count": 2, "key": 1000 }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 1)
-	requireFrameLength(t, frames[0], 3)
-
-	fields := frames[0].Fields
-	require.Len(t, fields, 2)
-
-	field1 := fields[0]
-	field2 := fields[1]
-
-	require.Equal(t, "bytes", field1.Name)
-
-	trueValue := true
-	filterableConfig := data.FieldConfig{Filterable: &trueValue}
-
-	// we need to test that the only changed setting is `filterable`
-	require.Equal(t, filterableConfig, *field1.Config)
-	require.Equal(t, "Count", field2.Name)
-	// we need to test that the fieldConfig is "empty"
-	require.Nil(t, field2.Config)
-}
-
-func TestHistogramWith2FiltersAgg(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [{ "type": "count", "id": "1" }],
-		  "bucketAggs": [
-			{
-			  "id": "2",
-			  "type": "filters",
-			  "settings": {
-				"filters": [
-				  { "query": "@metric:cpu", "label": "" },
-				  { "query": "@metric:logins.count", "label": "" }
-				]
-			  }
-			},
-			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
-		  ]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": {
-				  "@metric:cpu": {
-					"3": {
-					  "buckets": [
-						{ "doc_count": 1, "key": 1000 },
-						{ "doc_count": 3, "key": 2000 }
-					  ]
-					}
-				  },
-				  "@metric:logins.count": {
-					"3": {
-					  "buckets": [
-						{ "doc_count": 2, "key": 1000 },
-						{ "doc_count": 8, "key": 2000 }
-					  ]
-					}
-				  }
-				}
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 2)
-	requireFrameLength(t, frames[0], 2)
-	requireTimeSeriesName(t, "@metric:cpu", frames[0])
-	requireTimeSeriesName(t, "@metric:logins.count", frames[1])
-}
-
-func TestTrimEdges(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [
-			{ "type": "avg", "id": "1", "field": "@value" },
-			{ "type": "count", "id": "3" }
-		  ],
-		  "bucketAggs": [
-			{
-			  "id": "2",
-			  "type": "date_histogram",
-			  "field": "host",
-			  "settings": { "trimEdges": "1" }
-			}
-		  ]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  { "1": { "value": 1000 }, "key": 1, "doc_count": 369 },
-				  { "1": { "value": 2000 }, "key": 2, "doc_count": 200 },
-				  { "1": { "value": 2000 }, "key": 3, "doc_count": 200 }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 2)
-
-	// should remove first and last value
-	requireFrameLength(t, frames[0], 1)
-}
-
-func TestTermsAggWithoutDateHistogram(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [
-			{ "type": "avg", "id": "1", "field": "@value" },
-			{ "type": "count", "id": "3" }
-		  ],
-		  "bucketAggs": [{ "id": "2", "type": "terms", "field": "host" }]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  { "1": { "value": 1000 }, "key": "server-1", "doc_count": 369 },
-				  { "1": { "value": 2000 }, "key": "server-2", "doc_count": 200 }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 1)
-
-	frame1 := frames[0]
-	requireFrameLength(t, frame1, 2)
-	require.Len(t, frame1.Fields, 3)
-
-	f1 := frame1.Fields[0]
-	f2 := frame1.Fields[1]
-	f3 := frame1.Fields[2]
-
-	requireStringAt(t, "server-1", f1, 0)
-	requireStringAt(t, "server-2", f1, 1)
-
-	requireFloatAt(t, 1000.0, f2, 0)
-	requireFloatAt(t, 2000.0, f2, 1)
-
-	requireFloatAt(t, 369.0, f3, 0)
-	requireFloatAt(t, 200.0, f3, 1)
-}
-
-func TestPercentilesWithoutDateHistogram(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [
-			{
-			  "type": "percentiles",
-			  "field": "value",
-			  "settings": { "percents": ["75", "90"] },
-			  "id": "1"
-			}
-		  ],
-		  "bucketAggs": [{ "type": "terms", "field": "id", "id": "3" }]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "3": {
-				"buckets": [
-				  {
-					"1": { "values": { "90": 5.5, "75": 3.3 } },
-					"doc_count": 10,
-					"key": "id1"
-				  },
-				  {
-					"1": { "values": { "75": 2.3, "90": 4.5 } },
-					"doc_count": 15,
-					"key": "id2"
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 1)
-	requireFrameLength(t, frames[0], 2)
-
-	require.Len(t, frames[0].Fields, 3)
-
-	f1 := frames[0].Fields[0]
-	f2 := frames[0].Fields[1]
-	f3 := frames[0].Fields[2]
-
-	require.Equal(t, "id", f1.Name)
-	require.Equal(t, "p75 value", f2.Name)
-	require.Equal(t, "p90 value", f3.Name)
-
-	requireStringAt(t, "id1", f1, 0)
-	requireStringAt(t, "id2", f1, 1)
-
-	requireFloatAt(t, 3.3, f2, 0)
-	requireFloatAt(t, 2.3, f2, 1)
-
-	requireFloatAt(t, 5.5, f3, 0)
-	requireFloatAt(t, 4.5, f3, 1)
-}
-
-func TestMultipleMetricsOfTheSameType(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [
-			{ "type": "avg", "id": "1", "field": "test" },
-			{ "type": "avg", "id": "2", "field": "test2" }
-		  ],
-		  "bucketAggs": [{ "id": "2", "type": "terms", "field": "host" }]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  {
-					"1": { "value": 1000 },
-					"2": { "value": 3000 },
-					"key": "server-1",
-					"doc_count": 369
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	  }
-		  
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.True(t, len(frames) > 0)
-	requireFrameLength(t, frames[0], 1)
-	require.Len(t, frames[0].Fields, 3)
-
-	requireStringAt(t, "server-1", frames[0].Fields[0], 0)
-	requireFloatAt(t, 1000.0, frames[0].Fields[1], 0)
-	requireFloatAt(t, 3000.0, frames[0].Fields[2], 0)
-}
-
-func TestRawDocumentQuery(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [{ "type": "raw_document", "id": "1" }],
-		  "bucketAggs": []
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-			{
-			"hits": {
-				"total": 100,
-				"hits": [
-				{
-					"_id": "1",
-					"_type": "type",
-					"_index": "index",
-					"_source": { "sourceProp": "asd" },
-					"fields": { "fieldProp": "field" }
-				},
-				{
-					"_source": { "sourceProp": "asd2" },
-					"fields": { "fieldProp": "field2" }
-				}
-				]
-			}
-			}
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 1)
-	fields := frames[0].Fields
-
-	require.Len(t, fields, 1)
-	f := fields[0]
-
-	require.Equal(t, data.FieldTypeNullableJSON, f.Type())
-	require.Equal(t, 2, f.Len())
-
-	v := f.At(0).(*json.RawMessage)
-	var jsonData map[string]interface{}
-	err = json.Unmarshal(*v, &jsonData)
-	require.NoError(t, err)
-
-	require.Equal(t, "asd", jsonData["sourceProp"])
-	require.Equal(t, "field", jsonData["fieldProp"])
-}
-
-func TestBucketScript(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [
-			{ "id": "1", "type": "sum", "field": "@value" },
-			{ "id": "3", "type": "max", "field": "@value" },
-			{
-			  "id": "4",
-			  "pipelineVariables": [
-				{ "name": "var1", "pipelineAgg": "1" },
-				{ "name": "var2", "pipelineAgg": "3" }
-			  ],
-			  "settings": { "script": "params.var1 * params.var2" },
-			  "type": "bucket_script"
-			}
-		  ],
-		  "bucketAggs": [
-			{ "type": "date_histogram", "field": "@timestamp", "id": "2" }
-		  ]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  {
-					"1": { "value": 2 },
-					"3": { "value": 3 },
-					"4": { "value": 6 },
-					"doc_count": 60,
-					"key": 1000
-				  },
-				  {
-					"1": { "value": 3 },
-					"3": { "value": 4 },
-					"4": { "value": 12 },
-					"doc_count": 60,
-					"key": 2000
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 3)
-	requireFrameLength(t, frames[0], 2)
-	requireTimeSeriesName(t, "Sum @value", frames[0])
-	requireTimeSeriesName(t, "Max @value", frames[1])
-	requireTimeSeriesName(t, "Sum @value * Max @value", frames[2])
-
-	requireNumberValue(t, 2, frames[0], 0)
-	requireNumberValue(t, 3, frames[1], 0)
-	requireNumberValue(t, 6, frames[2], 0)
-
-	requireNumberValue(t, 3, frames[0], 1)
-	requireNumberValue(t, 4, frames[1], 1)
-	requireNumberValue(t, 12, frames[2], 1)
-}
-
-func TestTwoBucketScripts(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [
-			{ "id": "1", "type": "sum", "field": "@value" },
-			{ "id": "3", "type": "max", "field": "@value" },
-			{
-			  "id": "4",
-			  "pipelineVariables": [
-				{ "name": "var1", "pipelineAgg": "1" },
-				{ "name": "var2", "pipelineAgg": "3" }
-			  ],
-			  "settings": { "script": "params.var1 * params.var2" },
-			  "type": "bucket_script"
-			},
-			{
-			  "id": "5",
-			  "pipelineVariables": [
-				{ "name": "var1", "pipelineAgg": "1" },
-				{ "name": "var2", "pipelineAgg": "3" }
-			  ],
-			  "settings": { "script": "params.var1 * params.var2 * 4" },
-			  "type": "bucket_script"
-			}
-		  ],
-		  "bucketAggs": [{ "type": "terms", "field": "@timestamp", "id": "2" }]
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {
-			  "2": {
-				"buckets": [
-				  {
-					"1": { "value": 2 },
-					"3": { "value": 3 },
-					"4": { "value": 6 },
-					"5": { "value": 24 },
-					"doc_count": 60,
-					"key": 1000
-				  },
-				  {
-					"1": { "value": 3 },
-					"3": { "value": 4 },
-					"4": { "value": 12 },
-					"5": { "value": 48 },
-					"doc_count": 60,
-					"key": 2000
-				  }
-				]
-			  }
-			}
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.True(t, len(frames) > 0)
-	requireFrameLength(t, frames[0], 2)
-
-	fields := frames[0].Fields
-	require.Len(t, fields, 5)
-
-	requireFloatAt(t, 1000.0, fields[0], 0)
-	requireFloatAt(t, 2000.0, fields[0], 1)
-	requireFloatAt(t, 2.0, fields[1], 0)
-	requireFloatAt(t, 3.0, fields[1], 1)
-	requireFloatAt(t, 3.0, fields[2], 0)
-	requireFloatAt(t, 4.0, fields[2], 1)
-	requireFloatAt(t, 6.0, fields[3], 0)
-	requireFloatAt(t, 12.0, fields[3], 1)
-	requireFloatAt(t, 24.0, fields[4], 0)
-	requireFloatAt(t, 48.0, fields[4], 1)
-}
-
-func TestLogs(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [{ "type": "logs"}],
-		  "bucketAggs": [
-			{
-			  "type": "date_histogram",
-			  "settings": { "interval": "auto" },
-			  "id": "2"
-			}
-		  ],
-		  "key": "Q-1561369883389-0.7611823271062786-0",
-		  "query": "hello AND message"
-		}
-	]
-`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"aggregations": {},
-			"hits": {
-			  "hits": [
-				{
-				  "_id": "fdsfs",
-				  "_type": "_doc",
-				  "_index": "mock-index",
-				  "_source": {
-					"testtime": "2019-06-24T09:51:19.765Z",
-					"host": "djisaodjsoad",
-					"number": 1,
-					"line": "hello, i am a message",
-					"level": "debug",
-					"fields": { "lvl": "debug" }
-				  },
-				  "highlight": {
-					"message": [
-					  "@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
-					]
-				  }
-				},
-				{
-				  "_id": "kdospaidopa",
-				  "_type": "_doc",
-				  "_index": "mock-index",
-				  "_source": {
-					"testtime": "2019-06-24T09:52:19.765Z",
-					"host": "dsalkdakdop",
-					"number": 2,
-					"line": "hello, i am also message",
-					"level": "error",
-					"fields": { "lvl": "info" }
-				  },
-				  "highlight": {
-					"message": [
-					  "@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
-					]
-				  }
-				}
-			  ]
-			}
-		  }
-		]
-	}
-`)
-
-	t.Run("response", func(t *testing.T) {
-		result, err := queryDataTest(query, response)
-		require.NoError(t, err)
-
-		require.Len(t, result.response.Responses, 1)
-		frames := result.response.Responses["A"].Frames
-		require.Len(t, frames, 1)
-
-		logsFrame := frames[0]
-
-		meta := logsFrame.Meta
-		require.Equal(t, map[string]interface{}{"searchWords": []string{"hello", "message"}}, meta.Custom)
-		require.Equal(t, data.VisTypeLogs, string(meta.PreferredVisualization))
-
-		logsFieldMap := make(map[string]*data.Field)
-		for _, field := range logsFrame.Fields {
-			logsFieldMap[field.Name] = field
-		}
-
-		require.Contains(t, logsFieldMap, "testtime")
-		require.Equal(t, data.FieldTypeNullableTime, logsFieldMap["testtime"].Type())
-
-		require.Contains(t, logsFieldMap, "host")
-		require.Equal(t, data.FieldTypeNullableString, logsFieldMap["host"].Type())
-
-		require.Contains(t, logsFieldMap, "line")
-		require.Equal(t, data.FieldTypeNullableString, logsFieldMap["line"].Type())
-
-		require.Contains(t, logsFieldMap, "number")
-		require.Equal(t, data.FieldTypeNullableFloat64, logsFieldMap["number"].Type())
-
-		require.Contains(t, logsFieldMap, "_source")
-		require.Equal(t, data.FieldTypeNullableJSON, logsFieldMap["_source"].Type())
-
-		requireStringAt(t, "fdsfs", logsFieldMap["_id"], 0)
-		requireStringAt(t, "kdospaidopa", logsFieldMap["_id"], 1)
-		requireStringAt(t, "_doc", logsFieldMap["_type"], 0)
-		requireStringAt(t, "_doc", logsFieldMap["_type"], 1)
-		requireStringAt(t, "mock-index", logsFieldMap["_index"], 0)
-		requireStringAt(t, "mock-index", logsFieldMap["_index"], 1)
-
-		actualJson1, err := json.Marshal(logsFieldMap["_source"].At(0).(*json.RawMessage))
-		require.NoError(t, err)
-		actualJson2, err := json.Marshal(logsFieldMap["_source"].At(1).(*json.RawMessage))
-		require.NoError(t, err)
-
-		expectedJson1 := `
-		{
-			"fields.lvl": "debug",
-			"host": "djisaodjsoad",
-			"level": "debug",
-			"line": "hello, i am a message",
-			"number": 1,
-			"testtime": "2019-06-24T09:51:19.765Z",
-			"line": "hello, i am a message"
-		}
-		`
-
-		expectedJson2 := `
-		{
-			"testtime": "2019-06-24T09:52:19.765Z",
-			"host": "dsalkdakdop",
-			"number": 2,
-			"line": "hello, i am also message",
-			"level": "error",
-			"fields.lvl": "info"
-		}`
-
-		require.JSONEq(t, expectedJson1, string(actualJson1))
-		require.JSONEq(t, expectedJson2, string(actualJson2))
-	})
-
-	t.Run("level field", func(t *testing.T) {
-		result, err := queryDataTest(query, response)
-		require.NoError(t, err)
-
-		require.Len(t, result.response.Responses, 1)
-		frames := result.response.Responses["A"].Frames
-		require.True(t, len(frames) > 0)
-
-		requireFrameLength(t, frames[0], 2)
-		fieldMap := make(map[string]*data.Field)
-		for _, field := range frames[0].Fields {
-			fieldMap[field.Name] = field
-		}
-
-		require.Contains(t, fieldMap, "level")
-		field := fieldMap["level"]
-
-		requireStringAt(t, "debug", field, 0)
-		requireStringAt(t, "error", field, 1)
-	})
-}
-
-func TestLogsEmptyResponse(t *testing.T) {
-	query := []byte(`
-	[
-		{
-		  "refId": "A",
-		  "metrics": [{ "type": "logs", "id": "2" }],
-		  "bucketAggs": [],
-		  "key": "Q-1561369883389-0.7611823271062786-0",
-		  "query": "hello AND message"
-		}
-	]
-	`)
-
-	response := []byte(`
-	{
-		"responses": [
-		  {
-			"hits": { "hits": [] },
-			"aggregations": {},
-			"status": 200
-		  }
-		]
-	}
-	`)
-
-	result, err := queryDataTest(query, response)
-	require.NoError(t, err)
-
-	require.Len(t, result.response.Responses, 1)
-	frames := result.response.Responses["A"].Frames
-	require.Len(t, frames, 1)
-}
diff --git a/pkg/tsdb/elasticsearch/response_parser_test.go b/pkg/tsdb/elasticsearch/response_parser_test.go
index fb186ac1f64..770e42e4b2c 100644
--- a/pkg/tsdb/elasticsearch/response_parser_test.go
+++ b/pkg/tsdb/elasticsearch/response_parser_test.go
@@ -18,58 +18,842 @@ import (
 
 var update = flag.Bool("update", true, "update golden files")
 
-func TestResponseParser(t *testing.T) {
-	t.Run("Elasticsearch response parser test", func(t *testing.T) {
-		t.Run("Simple query and count", func(t *testing.T) {
-			targets := map[string]string{
-				"A": `{
-					"metrics": [{ "type": "count", "id": "1" }],
-          "bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "2" }]
-				}`,
-			}
-			response := `{
-        "responses": [
-          {
-            "aggregations": {
-              "2": {
-                "buckets": [
-                  {
-                    "doc_count": 10,
-                    "key": 1000
-                  },
-                  {
-                    "doc_count": 15,
-                    "key": 2000
-                  }
-                ]
-              }
-            }
-          }
-        ]
-			}`
-			result, err := parseTestResponse(targets, response)
+func TestProcessLogsResponse(t *testing.T) {
+	t.Run("Simple log query response", func(t *testing.T) {
+		query := []byte(`
+				[
+					{
+					  "refId": "A",
+					  "metrics": [{ "type": "logs"}],
+					  "bucketAggs": [
+						{
+						  "type": "date_histogram",
+						  "settings": { "interval": "auto" },
+						  "id": "2"
+						}
+					  ],
+					  "key": "Q-1561369883389-0.7611823271062786-0",
+					  "query": "hello AND message"
+					}
+				]
+			`)
+
+		response := []byte(`
+				{
+					"responses": [
+					  {
+						"aggregations": {},
+						"hits": {
+						  "hits": [
+							{
+							  "_id": "fdsfs",
+							  "_type": "_doc",
+							  "_index": "mock-index",
+							  "_source": {
+								"testtime": "2019-06-24T09:51:19.765Z",
+								"host": "djisaodjsoad",
+								"number": 1,
+								"line": "hello, i am a message",
+								"level": "debug",
+								"fields": { "lvl": "debug" }
+							  },
+							  "highlight": {
+								"message": [
+								  "@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
+								]
+							  }
+							},
+							{
+							  "_id": "kdospaidopa",
+							  "_type": "_doc",
+							  "_index": "mock-index",
+							  "_source": {
+								"testtime": "2019-06-24T09:52:19.765Z",
+								"host": "dsalkdakdop",
+								"number": 2,
+								"line": "hello, i am also message",
+								"level": "error",
+								"fields": { "lvl": "info" }
+							  },
+							  "highlight": {
+								"message": [
+								  "@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
+								]
+							  }
+							}
+						  ]
+						}
+					  }
+					]
+				}
+			`)
+
+		t.Run("creates correct data frame fields", func(t *testing.T) {
+			result, err := queryDataTest(query, response)
 			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
 
-			queryRes := result.Responses["A"]
-			require.NotNil(t, queryRes)
-			dataframes := queryRes.Frames
-			require.Len(t, dataframes, 1)
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 1)
 
-			frame := dataframes[0]
-			require.Len(t, frame.Fields, 2)
+			logsFrame := frames[0]
 
-			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
-			require.Equal(t, frame.Fields[0].Len(), 2)
-			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
-			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
+			meta := logsFrame.Meta
+			require.Equal(t, map[string]interface{}{"searchWords": []string{"hello", "message"}}, meta.Custom)
+			require.Equal(t, data.VisTypeLogs, string(meta.PreferredVisualization))
+
+			logsFieldMap := make(map[string]*data.Field)
+			for _, field := range logsFrame.Fields {
+				logsFieldMap[field.Name] = field
+			}
+
+			require.Contains(t, logsFieldMap, "testtime")
+			require.Equal(t, data.FieldTypeNullableTime, logsFieldMap["testtime"].Type())
+
+			require.Contains(t, logsFieldMap, "host")
+			require.Equal(t, data.FieldTypeNullableString, logsFieldMap["host"].Type())
+
+			require.Contains(t, logsFieldMap, "line")
+			require.Equal(t, data.FieldTypeNullableString, logsFieldMap["line"].Type())
+
+			require.Contains(t, logsFieldMap, "number")
+			require.Equal(t, data.FieldTypeNullableFloat64, logsFieldMap["number"].Type())
+
+			require.Contains(t, logsFieldMap, "_source")
+			require.Equal(t, data.FieldTypeNullableJSON, logsFieldMap["_source"].Type())
+
+			requireStringAt(t, "fdsfs", logsFieldMap["_id"], 0)
+			requireStringAt(t, "kdospaidopa", logsFieldMap["_id"], 1)
+			requireStringAt(t, "_doc", logsFieldMap["_type"], 0)
+			requireStringAt(t, "_doc", logsFieldMap["_type"], 1)
+			requireStringAt(t, "mock-index", logsFieldMap["_index"], 0)
+			requireStringAt(t, "mock-index", logsFieldMap["_index"], 1)
+
+			actualJson1, err := json.Marshal(logsFieldMap["_source"].At(0).(*json.RawMessage))
+			require.NoError(t, err)
+			actualJson2, err := json.Marshal(logsFieldMap["_source"].At(1).(*json.RawMessage))
+			require.NoError(t, err)
+
+			expectedJson1 := `
+					{
+						"fields.lvl": "debug",
+						"host": "djisaodjsoad",
+						"level": "debug",
+						"line": "hello, i am a message",
+						"number": 1,
+						"testtime": "2019-06-24T09:51:19.765Z",
+						"line": "hello, i am a message"
+					}
+					`
+
+			expectedJson2 := `
+					{
+						"testtime": "2019-06-24T09:52:19.765Z",
+						"host": "dsalkdakdop",
+						"number": 2,
+						"line": "hello, i am also message",
+						"level": "error",
+						"fields.lvl": "info"
+					}`
+
+			require.JSONEq(t, expectedJson1, string(actualJson1))
+			require.JSONEq(t, expectedJson2, string(actualJson2))
 		})
 
-		t.Run("Simple query count & avg aggregation", func(t *testing.T) {
+		t.Run("creates correct level field", func(t *testing.T) {
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.True(t, len(frames) > 0)
+
+			requireFrameLength(t, frames[0], 2)
+			fieldMap := make(map[string]*data.Field)
+			for _, field := range frames[0].Fields {
+				fieldMap[field.Name] = field
+			}
+
+			require.Contains(t, fieldMap, "level")
+			field := fieldMap["level"]
+
+			requireStringAt(t, "debug", field, 0)
+			requireStringAt(t, "error", field, 1)
+		})
+	})
+	t.Run("Empty response", func(t *testing.T) {
+		query := []byte(`
+				[
+					{
+					  "refId": "A",
+					  "metrics": [{ "type": "logs", "id": "2" }],
+					  "bucketAggs": [],
+					  "key": "Q-1561369883389-0.7611823271062786-0",
+					  "query": "hello AND message"
+					}
+				]
+			`)
+
+		response := []byte(`
+			{
+				"responses": [
+				  {
+					"hits": { "hits": [] },
+					"aggregations": {},
+					"status": 200
+				  }
+				]
+			}
+		`)
+
+		result, err := queryDataTest(query, response)
+		require.NoError(t, err)
+
+		require.Len(t, result.response.Responses, 1)
+		frames := result.response.Responses["A"].Frames
+		require.Len(t, frames, 1)
+	})
+	t.Run("Log query with nested fields", func(t *testing.T) {
+		targets := map[string]string{
+			"A": `{
+					"metrics": [{ "type": "logs" }]
+				}`,
+		}
+
+		response := `{
+  			"responses":[
+  			  {
+  			    "hits":{
+  			      "total":{
+  			        "value":109,
+  			        "relation":"eq"
+  			      },
+  			      "max_score":null,
+  			      "hits":[
+  			        {
+  			          "_index":"logs-2023.02.08",
+  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
+  			          "_score":null,
+  			          "_source":{
+  			            "@timestamp":"2023-02-08T15:10:55.830Z",
+  			            "line":"log text  [479231733]",
+  			            "counter":"109",
+  			            "float":58.253758485091,
+  			            "label":"val1",
+  			            "lvl":"info",
+  			            "location":"17.089705232090438, 41.62861966340297",
+										"nested": {
+											"field": {
+												"double_nested": "value"
+											}
+										},
+  			            "shapes":[
+  			              {
+  			                "type":"triangle"
+  			              },
+  			              {
+  			                "type":"square"
+  			              }
+  			            ],
+										"xyz": null
+  			          },
+  			          "sort":[
+  			            1675869055830,
+  			            4
+  			          ]
+  			        },
+  			        {
+  			          "_index":"logs-2023.02.08",
+  			          "_id":"Fx2UMYYBfCQ-FCMjZyJ_",
+  			          "_score":null,
+  			          "_source":{
+  			            "@timestamp":"2023-02-08T15:10:54.835Z",
+  			            "line":"log text with ANSI \u001b[31mpart of the text\u001b[0m [493139080]",
+  			            "counter":"108",
+  			            "float":54.5977098233944,
+  			            "label":"val1",
+  			            "lvl":"info",
+  			            "location":"19.766305918490463, 40.42639175509792",
+										"nested": {
+											"field": {
+												"double_nested": "value"
+											}
+										},
+  			            "shapes":[
+  			              {
+  			                "type":"triangle"
+  			              },
+  			              {
+  			                "type":"square"
+  			              }
+  			            ],
+										"xyz": "def"
+  			          },
+  			          "sort":[
+  			            1675869054835,
+  			            7
+  			          ]
+  			        }
+  			      ]
+  			    },
+  			    "status":200
+  			  }
+  			]
+			}`
+
+		result, err := parseTestResponse(targets, response)
+		require.NoError(t, err)
+		require.Len(t, result.Responses, 1)
+
+		queryRes := result.Responses["A"]
+		require.NotNil(t, queryRes)
+		dataframes := queryRes.Frames
+		require.Len(t, dataframes, 1)
+		frame := dataframes[0]
+
+		require.Equal(t, 16, len(frame.Fields))
+		// Fields have the correct length
+		require.Equal(t, 2, frame.Fields[0].Len())
+		// First field is timeField
+		require.Equal(t, data.FieldTypeNullableTime, frame.Fields[0].Type())
+		// Second is log line
+		require.Equal(t, data.FieldTypeNullableString, frame.Fields[1].Type())
+		require.Equal(t, "line", frame.Fields[1].Name)
+		// Correctly renames lvl field to level
+		require.Equal(t, "level", frame.Fields[10].Name)
+		// Correctly uses string types
+		require.Equal(t, data.FieldTypeNullableString, frame.Fields[1].Type())
+		// Correctly detects float64 types
+		require.Equal(t, data.FieldTypeNullableFloat64, frame.Fields[7].Type())
+		// Correctly detects json types
+		require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[8].Type())
+		// Correctly flattens fields
+		require.Equal(t, "nested.field.double_nested", frame.Fields[12].Name)
+		require.Equal(t, data.FieldTypeNullableString, frame.Fields[12].Type())
+		// Correctly detects type even if first value is null
+		require.Equal(t, data.FieldTypeNullableString, frame.Fields[15].Type())
+	})
+
+	t.Run("Log query with highlight", func(t *testing.T) {
+		targets := map[string]string{
+			"A": `{
+					"metrics": [{ "type": "logs" }]
+				}`,
+		}
+
+		response := `{
+  			"responses":[
+  			  {
+  			    "hits":{
+  			      "total":{
+  			        "value":109,
+  			        "relation":"eq"
+  			      },
+  			      "max_score":null,
+  			      "hits":[
+  			        {
+  			          "_index":"logs-2023.02.08",
+  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
+  			          "_score":null,
+									"highlight": {
+										"line": [
+					  					"@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
+										],
+										"duplicated": ["@HIGHLIGHT@hello@/HIGHLIGHT@"]
+				  				},
+  			          "_source":{
+  			            "@timestamp":"2023-02-08T15:10:55.830Z",
+  			            "line":"log text  [479231733]"
+									}
+  			        },
+  			        {
+  			          "_index":"logs-2023.02.08",
+  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
+  			          "_score":null,
+									"highlight": {
+										"line": [
+					  					"@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
+										],
+										"duplicated": ["@HIGHLIGHT@hello@/HIGHLIGHT@"]
+				  				},
+  			          "_source":{
+  			            "@timestamp":"2023-02-08T15:10:55.830Z",
+  			            "line":"log text  [479231733]"
+									}
+  			        }
+  			      ]
+  			    },
+  			    "status":200
+  			  }
+  			]
+			}`
+
+		result, err := parseTestResponse(targets, response)
+		require.NoError(t, err)
+		require.Len(t, result.Responses, 1)
+
+		queryRes := result.Responses["A"]
+		require.NotNil(t, queryRes)
+		dataframes := queryRes.Frames
+		require.Len(t, dataframes, 1)
+		frame := dataframes[0]
+
+		customMeta := frame.Meta.Custom
+
+		require.Equal(t, map[string]interface{}{
+			"searchWords": []string{"hello", "message"},
+		}, customMeta)
+	})
+}
+
+func TestProcessRawDataResponse(t *testing.T) {
+	t.Run("Simple raw data query", func(t *testing.T) {
+		targets := map[string]string{
+			"A": `{
+					"metrics": [{ "type": "raw_data" }]
+				}`,
+		}
+
+		response := `{
+  			"responses":[
+  			  {
+  			    "hits":{
+  			      "total":{
+  			        "value":109,
+  			        "relation":"eq"
+  			      },
+  			      "max_score":null,
+  			      "hits":[
+  			        {
+  			          "_index":"logs-2023.02.08",
+  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
+  			          "_score":null,
+  			          "_source":{
+  			            "@timestamp":"2023-02-08T15:10:55.830Z",
+  			            "line":"log text  [479231733]",
+  			            "counter":"109",
+  			            "float":58.253758485091,
+  			            "label":"val1",
+  			            "level":"info",
+  			            "location":"17.089705232090438, 41.62861966340297",
+										"nested": {
+											"field": {
+												"double_nested": "value"
+											}
+										},
+  			            "shapes":[
+  			              {
+  			                "type":"triangle"
+  			              },
+  			              {
+  			                "type":"square"
+  			              }
+  			            ],
+										"xyz": null
+  			          },
+  			          "sort":[
+  			            1675869055830,
+  			            4
+  			          ]
+  			        },
+  			        {
+  			          "_index":"logs-2023.02.08",
+  			          "_id":"Fx2UMYYBfCQ-FCMjZyJ_",
+  			          "_score":null,
+  			          "_source":{
+  			            "@timestamp":"2023-02-08T15:10:54.835Z",
+  			            "line":"log text with ANSI \u001b[31mpart of the text\u001b[0m [493139080]",
+  			            "counter":"108",
+  			            "float":54.5977098233944,
+  			            "label":"val1",
+  			            "level":"info",
+  			            "location":"19.766305918490463, 40.42639175509792",
+										"nested": {
+											"field": {
+												"double_nested": "value"
+											}
+										},
+  			            "shapes":[
+  			              {
+  			                "type":"triangle"
+  			              },
+  			              {
+  			                "type":"square"
+  			              }
+  			            ],
+										"xyz": "def"
+  			          },
+  			          "sort":[
+  			            1675869054835,
+  			            7
+  			          ]
+  			        }
+  			      ]
+  			    },
+  			    "status":200
+  			  }
+  			]
+			}`
+
+		result, err := parseTestResponse(targets, response)
+		require.NoError(t, err)
+		require.Len(t, result.Responses, 1)
+
+		queryRes := result.Responses["A"]
+		require.NotNil(t, queryRes)
+		dataframes := queryRes.Frames
+		require.Len(t, dataframes, 1)
+		frame := dataframes[0]
+
+		require.Equal(t, 15, len(frame.Fields))
+		// Fields have the correct length
+		require.Equal(t, 2, frame.Fields[0].Len())
+		// First field is timeField
+		require.Equal(t, data.FieldTypeNullableTime, frame.Fields[0].Type())
+		// Correctly uses string types
+		require.Equal(t, data.FieldTypeNullableString, frame.Fields[1].Type())
+		// Correctly detects float64 types
+		require.Equal(t, data.FieldTypeNullableFloat64, frame.Fields[5].Type())
+		// Correctly detects json types
+		require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[6].Type())
+		// Correctly flattens fields
+		require.Equal(t, "nested.field.double_nested", frame.Fields[11].Name)
+		require.Equal(t, data.FieldTypeNullableString, frame.Fields[11].Type())
+		// Correctly detects type even if first value is null
+		require.Equal(t, data.FieldTypeNullableString, frame.Fields[14].Type())
+	})
+
+	t.Run("Raw data query filterable fields", func(t *testing.T) {
+		query := []byte(`
+				[
+					{
+						"refId": "A",
+						"metrics": [{ "type": "raw_data", "id": "1" }],
+						"bucketAggs": []
+					}
+				]
+			`)
+
+		response := []byte(`
+				{
+					"responses": [
+					  {
+						"hits": {
+						  "total": { "relation": "eq", "value": 1 },
+						  "hits": [
+							{
+							  "_id": "1",
+							  "_type": "_doc",
+							  "_index": "index",
+							  "_source": { "sourceProp": "asd" }
+							}
+						  ]
+						}
+					  }
+					]
+				}
+			`)
+
+		result, err := queryDataTest(query, response)
+		require.NoError(t, err)
+
+		require.Len(t, result.response.Responses, 1)
+		frames := result.response.Responses["A"].Frames
+		require.True(t, len(frames) > 0)
+
+		for _, field := range frames[0].Fields {
+			trueValue := true
+			filterableConfig := data.FieldConfig{Filterable: &trueValue}
+
+			// we need to test that the only changed setting is `filterable`
+			require.Equal(t, filterableConfig, *field.Config)
+		}
+	})
+}
+
+func TestProcessRawDocumentResponse(t *testing.T) {
+	t.Run("Simple raw document query", func(t *testing.T) {
+		query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [{ "type": "raw_document", "id": "1" }],
+		  "bucketAggs": []
+		}
+	]
+	`)
+
+		response := []byte(`
+	{
+		"responses": [
+			{
+			"hits": {
+				"total": 100,
+				"hits": [
+				{
+					"_id": "1",
+					"_type": "type",
+					"_index": "index",
+					"_source": { "sourceProp": "asd" },
+					"fields": { "fieldProp": "field" }
+				},
+				{
+					"_source": { "sourceProp": "asd2" },
+					"fields": { "fieldProp": "field2" }
+				}
+				]
+			}
+			}
+		]
+	}
+	`)
+
+		result, err := queryDataTest(query, response)
+		require.NoError(t, err)
+
+		require.Len(t, result.response.Responses, 1)
+		frames := result.response.Responses["A"].Frames
+		require.Len(t, frames, 1)
+		fields := frames[0].Fields
+
+		require.Len(t, fields, 1)
+		f := fields[0]
+
+		require.Equal(t, data.FieldTypeNullableJSON, f.Type())
+		require.Equal(t, 2, f.Len())
+
+		v := f.At(0).(*json.RawMessage)
+		var jsonData map[string]interface{}
+		err = json.Unmarshal(*v, &jsonData)
+		require.NoError(t, err)
+
+		require.Equal(t, "asd", jsonData["sourceProp"])
+		require.Equal(t, "field", jsonData["fieldProp"])
+	})
+	t.Run("More complex raw document query", func(t *testing.T) {
+		targets := map[string]string{
+			"A": `{
+					"metrics": [{ "type": "raw_document" }]
+				}`,
+		}
+
+		response := `{
+  			"responses":[
+  			  {
+  			    "hits":{
+  			      "total":{
+  			        "value":109,
+  			        "relation":"eq"
+  			      },
+  			      "max_score":null,
+  			      "hits":[
+  			        {
+  			          "_index":"logs-2023.02.08",
+  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
+  			          "_score":null,
+									"fields": {
+										"test_field":"A"
+									},
+  			          "_source":{
+  			            "@timestamp":"2023-02-08T15:10:55.830Z",
+  			            "line":"log text  [479231733]",
+  			            "counter":"109",
+  			            "float":58.253758485091,
+  			            "label":"val1",
+  			            "level":"info",
+  			            "location":"17.089705232090438, 41.62861966340297",
+										"nested": {
+											"field": {
+												"double_nested": "value"
+											}
+										}
+									}
+  			        },
+  			        {
+  			          "_index":"logs-2023.02.08",
+  			          "_id":"Fx2UMYYBfCQ-FCMjZyJ_",
+  			          "_score":null,
+									"fields": {
+										"test_field":"A"
+									},
+  			          "_source":{
+  			            "@timestamp":"2023-02-08T15:10:54.835Z",
+  			            "line":"log text with ANSI \u001b[31mpart of the text\u001b[0m [493139080]",
+  			            "counter":"108",
+  			            "float":54.5977098233944,
+  			            "label":"val1",
+  			            "level":"info",
+  			            "location":"19.766305918490463, 40.42639175509792",
+										"nested": {
+											"field": {
+												"double_nested": "value1"
+											}
+										}
+									}
+  			        }
+  			      ]
+  			    },
+  			    "status":200
+  			  }
+  			]
+			}`
+
+		result, err := parseTestResponse(targets, response)
+		require.NoError(t, err)
+		require.Len(t, result.Responses, 1)
+
+		queryRes := result.Responses["A"]
+		require.NotNil(t, queryRes)
+		dataframes := queryRes.Frames
+		require.Len(t, dataframes, 1)
+		frame := dataframes[0]
+
+		require.Equal(t, 1, len(frame.Fields))
+		//Fields have the correct length
+		require.Equal(t, 2, frame.Fields[0].Len())
+		// The only field is the raw document
+		require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[0].Type())
+		require.Equal(t, "A", frame.Fields[0].Name)
+	})
+}
+
+func TestProcessBuckets(t *testing.T) {
+	t.Run("Percentiles", func(t *testing.T) {
+		t.Run("Percentiles without date histogram", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [
+			{
+			  "type": "percentiles",
+			  "field": "value",
+			  "settings": { "percents": ["75", "90"] },
+			  "id": "1"
+			}
+		  ],
+		  "bucketAggs": [{ "type": "terms", "field": "id", "id": "3" }]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "3": {
+				"buckets": [
+				  {
+					"1": { "values": { "90": 5.5, "75": 3.3 } },
+					"doc_count": 10,
+					"key": "id1"
+				  },
+				  {
+					"1": { "values": { "75": 2.3, "90": 4.5 } },
+					"doc_count": 15,
+					"key": "id2"
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 1)
+			requireFrameLength(t, frames[0], 2)
+
+			require.Len(t, frames[0].Fields, 3)
+
+			f1 := frames[0].Fields[0]
+			f2 := frames[0].Fields[1]
+			f3 := frames[0].Fields[2]
+
+			require.Equal(t, "id", f1.Name)
+			require.Equal(t, "p75 value", f2.Name)
+			require.Equal(t, "p90 value", f3.Name)
+
+			requireStringAt(t, "id1", f1, 0)
+			requireStringAt(t, "id2", f1, 1)
+
+			requireFloatAt(t, 3.3, f2, 0)
+			requireFloatAt(t, 2.3, f2, 1)
+
+			requireFloatAt(t, 5.5, f3, 0)
+			requireFloatAt(t, 4.5, f3, 1)
+		})
+		t.Run("percentiles 2 frames", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+			"refId": "A",
+			"metrics": [
+			{
+				"type": "percentiles",
+				"settings": { "percents": ["75", "90"] },
+				"id": "1",
+				"field": "@value"
+			}
+			],
+			"bucketAggs": [
+			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
+			]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "3": {
+				"buckets": [
+				  {
+					"1": { "values": { "75": 3.3, "90": 5.5 } },
+					"doc_count": 10,
+					"key": 1000
+				  },
+				  {
+					"1": { "values": { "75": 2.3, "90": 4.5 } },
+					"doc_count": 15,
+					"key": 2000
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 2)
+
+			requireFrameLength(t, frames[0], 2)
+			requireTimeSeriesName(t, "p75 @value", frames[0])
+			requireTimeSeriesName(t, "p90 @value", frames[1])
+
+			requireNumberValue(t, 3.3, frames[0], 0)
+			requireTimeValue(t, 1000, frames[0], 0)
+			requireNumberValue(t, 4.5, frames[1], 1)
+		})
+
+		t.Run("With percentiles", func(t *testing.T) {
 			targets := map[string]string{
 				"A": `{
-					"metrics": [{ "type": "count", "id": "1" }, {"type": "avg", "field": "value", "id": "2" }],
+					"metrics": [{ "type": "percentiles", "settings": { "percents": [75, 90] }, "id": "1" }],
           "bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "3" }]
 				}`,
 			}
@@ -80,12 +864,12 @@ func TestResponseParser(t *testing.T) {
               "3": {
                 "buckets": [
                   {
-                    "2": { "value": 88 },
+                    "1": { "values": { "75": 3.3, "90": 5.5 } },
                     "doc_count": 10,
                     "key": 1000
                   },
                   {
-                    "2": { "value": 99 },
+                    "1": { "values": { "75": 2.3, "90": 4.5 } },
                     "doc_count": 15,
                     "key": 2000
                   }
@@ -107,52 +891,94 @@ func TestResponseParser(t *testing.T) {
 
 			frame := dataframes[0]
 			require.Len(t, frame.Fields, 2)
-
 			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "p75")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
-
 			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average value")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "p90")
+		})
+	})
+
+	t.Run("Histograms", func(t *testing.T) {
+		t.Run("Histogram simple", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+			"refId": "A",
+			"metrics": [{ "type": "count", "id": "1" }],
+			"bucketAggs": [{ "type": "histogram", "field": "bytes", "id": "3" }]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "3": {
+				"buckets": [
+				  { "doc_count": 1, "key": 1000 },
+				  { "doc_count": 3, "key": 2000 },
+				  { "doc_count": 2, "key": 1000 }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 1)
+			requireFrameLength(t, frames[0], 3)
+
+			fields := frames[0].Fields
+			require.Len(t, fields, 2)
+
+			field1 := fields[0]
+			field2 := fields[1]
+
+			require.Equal(t, "bytes", field1.Name)
+
+			trueValue := true
+			filterableConfig := data.FieldConfig{Filterable: &trueValue}
+
+			// we need to test that the only changed setting is `filterable`
+			require.Equal(t, filterableConfig, *field1.Config)
+			require.Equal(t, "Count", field2.Name)
+			// we need to test that the fieldConfig is "empty"
+			require.Nil(t, field2.Config)
 		})
 
-		t.Run("Query with duplicated avg metric creates unique field name", func(t *testing.T) {
+		t.Run("Histogram response", func(t *testing.T) {
 			targets := map[string]string{
 				"A": `{
-					"metrics": [{"type": "avg", "field": "value", "id": "1" }, {"type": "avg", "field": "value", "id": "4" }],
-          "bucketAggs": [{ "type": "terms", "field": "label", "id": "3" }]
+					"metrics": [{ "type": "count", "id": "1" }],
+         "bucketAggs": [{ "type": "histogram", "field": "bytes", "id": "3" }]
 				}`,
 			}
 			response := `{
         "responses": [
-          {
-            "aggregations": {
-              "3": {
-                "buckets": [
-                  {
-                    "1": { "value": 88 },
-										"4": { "value": 88 },
-                    "doc_count": 10,
-                    "key": "val1"
-                  },
-                  {
-                    "1": { "value": 99 },
-										"4": { "value": 99 },
-                    "doc_count": 15,
-                    "key": "val2"
-                  }
-                ]
-              }
-            }
-          }
+         {
+           "aggregations": {
+             "3": {
+               "buckets": [{ "doc_count": 1, "key": 1000 }, { "doc_count": 3, "key": 2000 }, { "doc_count": 2, "key": 3000 }]
+             }
+           }
+         }
         ]
 			}`
 			result, err := parseTestResponse(targets, response)
@@ -164,12 +990,611 @@ func TestResponseParser(t *testing.T) {
 			dataframes := queryRes.Frames
 			require.NoError(t, err)
 			require.Len(t, dataframes, 1)
+		})
+	})
+
+	t.Run("Terms", func(t *testing.T) {
+		t.Run("Terms with two bucket_script", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+					"metrics": [
+						{ "id": "1", "type": "sum", "field": "@value" },
+            			{ "id": "3", "type": "max", "field": "@value" },
+            			{
+              				"id": "4",
+              				"pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
+              				"settings": { "script": "params.var1 * params.var2" },
+              				"type": "bucket_script"
+						},
+            			{
+							"id": "5",
+							"pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
+							"settings": { "script": "params.var1 * params.var2 * 2" },
+							"type": "bucket_script"
+					  }
+					],
+          "bucketAggs": [{ "type": "terms", "field": "@timestamp", "id": "2" }]
+				}`,
+			}
+			response := `{
+				"responses": [
+					{
+						"aggregations": {
+						"2": {
+							"buckets": [
+							{
+								"1": { "value": 2 },
+								"3": { "value": 3 },
+								"4": { "value": 6 },
+								"5": { "value": 24 },
+								"doc_count": 60,
+								"key": 1000
+							},
+							{
+								"1": { "value": 3 },
+								"3": { "value": 4 },
+								"4": { "value": 12 },
+								"5": { "value": 48 },
+								"doc_count": 60,
+								"key": 2000
+							}
+							]
+						}
+						}
+					}
+				]
+			}`
+			result, err := parseTestResponse(targets, response)
+			require.NoError(t, err)
+			require.Len(t, result.Responses, 1)
+
+			queryRes := result.Responses["A"]
+			require.NotNil(t, queryRes)
+			dataframes := queryRes.Frames
+			require.NoError(t, err)
+			require.Len(t, dataframes, 1)
 
 			frame := dataframes[0]
-			require.Len(t, frame.Fields, 3)
-			require.Equal(t, frame.Fields[0].Name, "label")
-			require.Equal(t, frame.Fields[1].Name, "Average value 1")
-			require.Equal(t, frame.Fields[2].Name, "Average value 4")
+			require.Len(t, frame.Fields, 5)
+			require.Equal(t, frame.Fields[0].Name, "@timestamp")
+			require.Equal(t, frame.Fields[0].Len(), 2)
+			require.Equal(t, frame.Fields[1].Name, "Sum")
+			require.Equal(t, frame.Fields[1].Len(), 2)
+			require.Equal(t, frame.Fields[2].Name, "Max")
+			require.Equal(t, frame.Fields[2].Len(), 2)
+			require.Equal(t, frame.Fields[3].Name, "params.var1 * params.var2")
+			require.Equal(t, frame.Fields[3].Len(), 2)
+			require.Equal(t, frame.Fields[4].Name, "params.var1 * params.var2 * 2")
+			require.Equal(t, frame.Fields[4].Len(), 2)
+			require.Nil(t, frame.Fields[1].Config)
+		})
+
+		t.Run("With max and multiple terms agg", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+				"metrics": [
+					{
+						"type": "max",
+						"field": "counter",
+						"id": "1"
+					}
+				],
+				"bucketAggs": [{ "type": "terms", "field": "label", "id": "2" }, { "type": "terms", "field": "level", "id": "3" }]
+			}`,
+			}
+			response := `{
+			"responses": [{
+				"aggregations": {
+					"2": {
+						"buckets": [
+							{
+								"key": "val3",
+								"3": {
+									"buckets": [
+										{ "key": "info", "1": { "value": "299" } }, { "key": "error", "1": {"value": "300"} }
+									]
+								}
+							},
+							{
+								"key": "val2",
+								"3": {
+									"buckets": [
+										{"key": "info", "1": {"value": "300"}}, {"key": "error", "1": {"value": "298"} }
+									]
+								}
+							},
+							{
+								"key": "val1",
+								"3": {
+									"buckets": [
+										{"key": "info", "1": {"value": "299"}}, {"key": "error", "1": {"value": "296"} }
+									]
+								}
+							}
+						]
+					}
+				}
+			}]
+		}`
+
+			result, err := parseTestResponse(targets, response)
+			assert.Nil(t, err)
+			assert.Len(t, result.Responses, 1)
+			frames := result.Responses["A"].Frames
+			require.Len(t, frames, 1)
+			requireFrameLength(t, frames[0], 6)
+			require.Len(t, frames[0].Fields, 3)
+
+			f1 := frames[0].Fields[0]
+			f2 := frames[0].Fields[1]
+			f3 := frames[0].Fields[2]
+
+			require.Equal(t, "label", f1.Name)
+			require.Equal(t, "level", f2.Name)
+			require.Equal(t, "Max", f3.Name)
+
+			requireStringAt(t, "val3", f1, 0)
+			requireStringAt(t, "val3", f1, 1)
+			requireStringAt(t, "val2", f1, 2)
+			requireStringAt(t, "val2", f1, 3)
+			requireStringAt(t, "val1", f1, 4)
+			requireStringAt(t, "val1", f1, 5)
+
+			requireStringAt(t, "info", f2, 0)
+			requireStringAt(t, "error", f2, 1)
+			requireStringAt(t, "info", f2, 2)
+			requireStringAt(t, "error", f2, 3)
+			requireStringAt(t, "info", f2, 4)
+			requireStringAt(t, "error", f2, 5)
+
+			requireFloatAt(t, 299, f3, 0)
+			requireFloatAt(t, 300, f3, 1)
+			requireFloatAt(t, 300, f3, 2)
+			requireFloatAt(t, 298, f3, 3)
+			requireFloatAt(t, 299, f3, 4)
+			requireFloatAt(t, 296, f3, 5)
+		})
+
+		t.Run("Terms agg without date histogram", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [
+			{ "type": "avg", "id": "1", "field": "@value" },
+			{ "type": "count", "id": "3" }
+		  ],
+		  "bucketAggs": [{ "id": "2", "type": "terms", "field": "host" }]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  { "1": { "value": 1000 }, "key": "server-1", "doc_count": 369 },
+				  { "1": { "value": 2000 }, "key": "server-2", "doc_count": 200 }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 1)
+
+			frame1 := frames[0]
+			requireFrameLength(t, frame1, 2)
+			require.Len(t, frame1.Fields, 3)
+
+			f1 := frame1.Fields[0]
+			f2 := frame1.Fields[1]
+			f3 := frame1.Fields[2]
+
+			requireStringAt(t, "server-1", f1, 0)
+			requireStringAt(t, "server-2", f1, 1)
+
+			requireFloatAt(t, 1000.0, f2, 0)
+			requireFloatAt(t, 2000.0, f2, 1)
+
+			requireFloatAt(t, 369.0, f3, 0)
+			requireFloatAt(t, 200.0, f3, 1)
+		})
+	})
+
+	t.Run("Top metrics", func(t *testing.T) {
+		t.Run("Top metrics 2 frames", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+			"refId": "A",
+			"metrics": [
+			{
+				"type": "top_metrics",
+				"settings": {
+				"order": "top",
+				"orderBy": "@timestamp",
+				"metrics": ["@value", "@anotherValue"]
+				},
+				"id": "1"
+			}
+			],
+			"bucketAggs": [{ "type": "date_histogram", "id": "2" }]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  {
+					"1": {
+					  "top": [
+						{
+						  "sort": ["2021-01-01T00:00:00.000Z"],
+						  "metrics": { "@value": 1, "@anotherValue": 2 }
+						}
+					  ]
+					},
+					"key": 1609459200000,
+					"key_as_string": "2021-01-01T00:00:00.000Z"
+				  },
+				  {
+					"1": {
+					  "top": [
+						{
+						  "sort": ["2021-01-01T00:00:10.000Z"],
+						  "metrics": { "@value": 1, "@anotherValue": 2 }
+						}
+					  ]
+					},
+					"key": 1609459210000,
+					"key_as_string": "2021-01-01T00:00:10.000Z"
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			time1, err := time.Parse(time.RFC3339, "2021-01-01T00:00:00.000Z")
+			require.NoError(t, err)
+			time2, err := time.Parse(time.RFC3339, "2021-01-01T00:00:10.000Z")
+			require.NoError(t, err)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 2)
+
+			frame1 := frames[0]
+			frame2 := frames[1]
+
+			requireTimeSeriesName(t, "Top Metrics @value", frame1)
+			requireFrameLength(t, frame1, 2)
+			requireTimeValue(t, time1.UTC().UnixMilli(), frame1, 0)
+			requireTimeValue(t, time2.UTC().UnixMilli(), frame1, 1)
+			requireNumberValue(t, 1, frame1, 0)
+			requireNumberValue(t, 1, frame1, 1)
+
+			requireTimeSeriesName(t, "Top Metrics @anotherValue", frame2)
+			requireFrameLength(t, frame2, 2)
+			requireTimeValue(t, time1.UTC().UnixMilli(), frame2, 0)
+			requireTimeValue(t, time2.UTC().UnixMilli(), frame2, 1)
+			requireNumberValue(t, 2, frame2, 0)
+			requireNumberValue(t, 2, frame2, 1)
+		})
+
+		t.Run("With top_metrics and date_histogram agg", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+				"metrics": [
+					{
+						"type": "top_metrics",
+						"settings": {
+							"order": "desc",
+							"orderBy": "@timestamp",
+							"metrics": ["@value", "@anotherValue"]
+						},
+						"id": "1"
+					}
+				],
+				"bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "3" }]
+			}`,
+			}
+			response := `{
+			"responses": [{
+				"aggregations": {
+					"3": {
+						"buckets": [
+							{
+								"key": 1609459200000,
+								"key_as_string": "2021-01-01T00:00:00.000Z",
+								"1": {
+									"top": [
+										{ "sort": ["2021-01-01T00:00:00.000Z"], "metrics": { "@value": 1, "@anotherValue": 2 } }
+									]
+								}
+							},
+							{
+								"key": 1609459210000,
+								"key_as_string": "2021-01-01T00:00:10.000Z",
+								"1": {
+									"top": [
+										{ "sort": ["2021-01-01T00:00:10.000Z"], "metrics": { "@value": 1, "@anotherValue": 2 } }
+									]
+								}
+							}
+						]
+					}
+				}
+			}]
+		}`
+			result, err := parseTestResponse(targets, response)
+			assert.Nil(t, err)
+			assert.Len(t, result.Responses, 1)
+
+			queryRes := result.Responses["A"]
+			assert.NotNil(t, queryRes)
+			dataframes := queryRes.Frames
+			assert.NoError(t, err)
+			assert.Len(t, dataframes, 2)
+
+			frame := dataframes[0]
+			assert.Len(t, frame.Fields, 2)
+			require.Equal(t, frame.Fields[0].Len(), 2)
+			require.Equal(t, frame.Fields[1].Len(), 2)
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Top Metrics @value")
+			v, _ := frame.FloatAt(0, 0)
+			assert.Equal(t, 1609459200000., v)
+			v, _ = frame.FloatAt(1, 0)
+			assert.Equal(t, 1., v)
+
+			v, _ = frame.FloatAt(0, 1)
+			assert.Equal(t, 1609459210000., v)
+			v, _ = frame.FloatAt(1, 1)
+			assert.Equal(t, 1., v)
+
+			frame = dataframes[1]
+			l, _ := frame.MarshalJSON()
+			fmt.Println(string(l))
+			assert.Len(t, frame.Fields, 2)
+			require.Equal(t, frame.Fields[0].Len(), 2)
+			require.Equal(t, frame.Fields[1].Len(), 2)
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Top Metrics @anotherValue")
+			v, _ = frame.FloatAt(0, 0)
+			assert.Equal(t, 1609459200000., v)
+			v, _ = frame.FloatAt(1, 0)
+			assert.Equal(t, 2., v)
+
+			v, _ = frame.FloatAt(0, 1)
+			assert.Equal(t, 1609459210000., v)
+			v, _ = frame.FloatAt(1, 1)
+			assert.Equal(t, 2., v)
+		})
+
+		t.Run("With top_metrics and terms agg", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+				"metrics": [
+					{
+						"type": "top_metrics",
+						"settings": {
+							"order": "desc",
+							"orderBy": "@timestamp",
+							"metrics": ["@value", "@anotherValue"]
+						},
+						"id": "1"
+					}
+				],
+				"bucketAggs": [{ "type": "terms", "field": "id", "id": "3" }]
+			}`,
+			}
+			response := `{
+			"responses": [{
+				"aggregations": {
+					"3": {
+						"buckets": [
+							{
+								"key": "id1",
+								"1": {
+									"top": [
+										{ "sort": [10], "metrics": { "@value": 10, "@anotherValue": 2 } }
+									]
+								}
+							},
+							{
+								"key": "id2",
+								"1": {
+									"top": [
+										{ "sort": [5], "metrics": { "@value": 5, "@anotherValue": 2 } }
+									]
+								}
+							}
+						]
+					}
+				}
+			}]
+		}`
+
+			result, err := parseTestResponse(targets, response)
+			assert.Nil(t, err)
+			assert.Len(t, result.Responses, 1)
+			frames := result.Responses["A"].Frames
+			require.Len(t, frames, 1)
+			requireFrameLength(t, frames[0], 2)
+			require.Len(t, frames[0].Fields, 3)
+
+			f1 := frames[0].Fields[0]
+			f2 := frames[0].Fields[1]
+			f3 := frames[0].Fields[2]
+
+			require.Equal(t, "id", f1.Name)
+			require.Equal(t, "Top Metrics @value", f2.Name)
+			require.Equal(t, "Top Metrics @anotherValue", f3.Name)
+
+			requireStringAt(t, "id1", f1, 0)
+			requireStringAt(t, "id2", f1, 1)
+
+			requireFloatAt(t, 10, f2, 0)
+			requireFloatAt(t, 5, f2, 1)
+
+			requireFloatAt(t, 2, f3, 0)
+			requireFloatAt(t, 2, f3, 1)
+		})
+	})
+
+	t.Run("Group by", func(t *testing.T) {
+		t.Run("Simple group by 1 metric 2 frames", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+			"refId": "A",
+			"metrics": [{ "type": "count", "id": "1" }],
+			"bucketAggs": [
+			{ "type": "terms", "field": "host", "id": "2" },
+			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
+			]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  {
+					"3": {
+					  "buckets": [
+						{ "doc_count": 1, "key": 1000 },
+						{ "doc_count": 3, "key": 2000 }
+					  ]
+					},
+					"doc_count": 4,
+					"key": "server1"
+				  },
+				  {
+					"3": {
+					  "buckets": [
+						{ "doc_count": 2, "key": 1000 },
+						{ "doc_count": 8, "key": 2000 }
+					  ]
+					},
+					"doc_count": 10,
+					"key": "server2"
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 2)
+
+			requireFrameLength(t, frames[0], 2)
+			requireTimeSeriesName(t, "server1", frames[0])
+			requireTimeSeriesName(t, "server2", frames[1])
+		})
+
+		t.Run("Single group with alias pattern 3 frames", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [{ "type": "count", "id": "1" }],
+		  "alias": "{{term @host}} {{metric}} and {{not_exist}} {{@host}}",
+		  "bucketAggs": [
+			{ "type": "terms", "field": "@host", "id": "2" },
+			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
+		  ]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  {
+					"3": {
+					  "buckets": [
+						{ "doc_count": 1, "key": 1000 },
+						{ "doc_count": 3, "key": 2000 }
+					  ]
+					},
+					"doc_count": 4,
+					"key": "server1"
+				  },
+				  {
+					"3": {
+					  "buckets": [
+						{ "doc_count": 2, "key": 1000 },
+						{ "doc_count": 8, "key": 2000 }
+					  ]
+					},
+					"doc_count": 10,
+					"key": "server2"
+				  },
+				  {
+					"3": {
+					  "buckets": [
+						{ "doc_count": 2, "key": 1000 },
+						{ "doc_count": 8, "key": 2000 }
+					  ]
+					},
+					"doc_count": 10,
+					"key": 0
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 3)
+
+			requireFrameLength(t, frames[0], 2)
+			requireTimeSeriesName(t, "server1 Count and {{not_exist}} server1", frames[0])
+			requireTimeSeriesName(t, "server2 Count and {{not_exist}} server2", frames[1])
+			requireTimeSeriesName(t, "0 Count and {{not_exist}} 0", frames[2])
 		})
 
 		t.Run("Single group by query one metric", func(t *testing.T) {
@@ -319,28 +1744,108 @@ func TestResponseParser(t *testing.T) {
 			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Average @value")
 		})
 
-		t.Run("With percentiles", func(t *testing.T) {
+		t.Run("Simple group by 2 metrics 4 frames", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [
+			{ "type": "count", "id": "1" },
+			{ "type": "avg", "field": "@value", "id": "4" }
+		  ],
+		  "bucketAggs": [
+			{ "type": "terms", "field": "host", "id": "2" },
+			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
+		  ]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  {
+					"3": {
+					  "buckets": [
+						{ "4": { "value": 10 }, "doc_count": 1, "key": 1000 },
+						{ "4": { "value": 12 }, "doc_count": 3, "key": 2000 }
+					  ]
+					},
+					"doc_count": 4,
+					"key": "server1"
+				  },
+				  {
+					"3": {
+					  "buckets": [
+						{ "4": { "value": 20 }, "doc_count": 1, "key": 1000 },
+						{ "4": { "value": 32 }, "doc_count": 3, "key": 2000 }
+					  ]
+					},
+					"doc_count": 10,
+					"key": "server2"
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 4)
+			requireFrameLength(t, frames[0], 2)
+			requireTimeSeriesName(t, "server1 Count", frames[0])
+			requireTimeSeriesName(t, "server1 Average @value", frames[1])
+			requireTimeSeriesName(t, "server2 Count", frames[2])
+			requireTimeSeriesName(t, "server2 Average @value", frames[3])
+		})
+
+		t.Run("Single group by with alias pattern", func(t *testing.T) {
 			targets := map[string]string{
 				"A": `{
-					"metrics": [{ "type": "percentiles", "settings": { "percents": [75, 90] }, "id": "1" }],
-          "bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "3" }]
+					"alias": "{{term @host}} {{metric}} and {{not_exist}} {{@host}}",
+					"metrics": [{ "type": "count", "id": "1" }],
+          "bucketAggs": [
+						{ "type": "terms", "field": "@host", "id": "2" },
+						{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
+					]
 				}`,
 			}
 			response := `{
         "responses": [
           {
             "aggregations": {
-              "3": {
+              "2": {
                 "buckets": [
                   {
-                    "1": { "values": { "75": 3.3, "90": 5.5 } },
-                    "doc_count": 10,
-                    "key": 1000
+                    "3": {
+                      "buckets": [{ "doc_count": 1, "key": 1000 }, { "doc_count": 3, "key": 2000 }]
+                    },
+                    "doc_count": 4,
+                    "key": "server1"
                   },
                   {
-                    "1": { "values": { "75": 2.3, "90": 4.5 } },
-                    "doc_count": 15,
-                    "key": 2000
+                    "3": {
+                      "buckets": [{ "doc_count": 2, "key": 1000 }, { "doc_count": 8, "key": 2000 }]
+                    },
+                    "doc_count": 10,
+                    "key": "server2"
+                  },
+                  {
+                    "3": {
+                      "buckets": [{ "doc_count": 2, "key": 1000 }, { "doc_count": 8, "key": 2000 }]
+                    },
+                    "doc_count": 10,
+                    "key": 0
                   }
                 ]
               }
@@ -356,7 +1861,7 @@ func TestResponseParser(t *testing.T) {
 			require.NotNil(t, queryRes)
 			dataframes := queryRes.Frames
 			require.NoError(t, err)
-			require.Len(t, dataframes, 2)
+			require.Len(t, dataframes, 3)
 
 			frame := dataframes[0]
 			require.Len(t, frame.Fields, 2)
@@ -364,7 +1869,7 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "p75")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Count and {{not_exist}} server1")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -372,7 +1877,99 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "p90")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Count and {{not_exist}} server2")
+
+			frame = dataframes[2]
+			require.Len(t, frame.Fields, 2)
+			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
+			require.Equal(t, frame.Fields[0].Len(), 2)
+			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
+			require.Equal(t, frame.Fields[1].Len(), 2)
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "0 Count and {{not_exist}} 0")
+		})
+	})
+
+	t.Run("Extended stats", func(t *testing.T) {
+		t.Run("Extended stats 4 frames", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+			"refId": "A",
+			"metrics": [
+			{
+				"type": "extended_stats",
+				"meta": { "max": true, "std_deviation_bounds_upper": true },
+				"id": "1",
+				"field": "@value"
+			}
+			],
+			"bucketAggs": [
+			{ "type": "terms", "field": "host", "id": "3" },
+			{ "type": "date_histogram", "id": "4" }
+			]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "3": {
+				"buckets": [
+				  {
+					"4": {
+					  "buckets": [
+						{
+						  "1": {
+							"max": 10.2,
+							"min": 5.5,
+							"std_deviation_bounds": { "upper": 3, "lower": -2 }
+						  },
+						  "doc_count": 10,
+						  "key": 1000
+						}
+					  ]
+					},
+					"key": "server1"
+				  },
+				  {
+					"4": {
+					  "buckets": [
+						{
+						  "1": {
+							"max": 10.2,
+							"min": 5.5,
+							"std_deviation_bounds": { "upper": 3, "lower": -2 }
+						  },
+						  "doc_count": 10,
+						  "key": 1000
+						}
+					  ]
+					},
+					"key": "server2"
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 4)
+			requireFrameLength(t, frames[0], 1)
+			requireTimeSeriesName(t, "server1 Max @value", frames[0])
+			requireTimeSeriesName(t, "server1 Std Dev Upper @value", frames[1])
+
+			requireNumberValue(t, 10.2, frames[0], 0)
+			requireNumberValue(t, 3, frames[1], 0)
 		})
 
 		t.Run("With extended stats", func(t *testing.T) {
@@ -487,16 +2084,58 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[1].Len(), 1)
 			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Std Dev Upper")
 		})
+	})
 
-		t.Run("Single group by with alias pattern", func(t *testing.T) {
+	t.Run("Count", func(t *testing.T) {
+		t.Run("Simple query returns 1 frame", func(t *testing.T) {
+			query := []byte(`
+		[
+			{
+				"refId": "A",
+				"metrics": [{ "type": "count", "id": "1" }],
+				"bucketAggs": [
+				{ "type": "date_histogram", "field": "@timestamp", "id": "2" }
+				]
+			}
+			]
+		`)
+
+			response := []byte(`
+		{
+			"responses": [
+			  {
+				"aggregations": {
+				  "2": {
+					"buckets": [
+					  { "doc_count": 10, "key": 1000 },
+					  { "doc_count": 15, "key": 2000 }
+					]
+				  }
+				}
+			  }
+			]
+		  }
+		`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 1, "frame-count wrong")
+			frame := frames[0]
+			requireTimeSeriesName(t, "Count", frame)
+
+			requireFrameLength(t, frame, 2)
+			requireTimeValue(t, 1000, frame, 0)
+			requireNumberValue(t, 10, frame, 0)
+		})
+
+		t.Run("Simple count with date_histogram aggregation", func(t *testing.T) {
 			targets := map[string]string{
 				"A": `{
-					"alias": "{{term @host}} {{metric}} and {{not_exist}} {{@host}}",
 					"metrics": [{ "type": "count", "id": "1" }],
-          "bucketAggs": [
-						{ "type": "terms", "field": "@host", "id": "2" },
-						{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
-					]
+          "bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "2" }]
 				}`,
 			}
 			response := `{
@@ -506,25 +2145,60 @@ func TestResponseParser(t *testing.T) {
               "2": {
                 "buckets": [
                   {
-                    "3": {
-                      "buckets": [{ "doc_count": 1, "key": 1000 }, { "doc_count": 3, "key": 2000 }]
-                    },
-                    "doc_count": 4,
-                    "key": "server1"
+                    "doc_count": 10,
+                    "key": 1000
                   },
                   {
-                    "3": {
-                      "buckets": [{ "doc_count": 2, "key": 1000 }, { "doc_count": 8, "key": 2000 }]
-                    },
+                    "doc_count": 15,
+                    "key": 2000
+                  }
+                ]
+              }
+            }
+          }
+        ]
+			}`
+			result, err := parseTestResponse(targets, response)
+			require.NoError(t, err)
+			require.Len(t, result.Responses, 1)
+
+			queryRes := result.Responses["A"]
+			require.NotNil(t, queryRes)
+			dataframes := queryRes.Frames
+			require.Len(t, dataframes, 1)
+
+			frame := dataframes[0]
+			require.Len(t, frame.Fields, 2)
+
+			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
+			require.Equal(t, frame.Fields[0].Len(), 2)
+			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
+			require.Equal(t, frame.Fields[1].Len(), 2)
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
+		})
+
+		t.Run("Simple query count & avg aggregation", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+					"metrics": [{ "type": "count", "id": "1" }, {"type": "avg", "field": "value", "id": "2" }],
+          "bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "3" }]
+				}`,
+			}
+			response := `{
+        "responses": [
+          {
+            "aggregations": {
+              "3": {
+                "buckets": [
+                  {
+                    "2": { "value": 88 },
                     "doc_count": 10,
-                    "key": "server2"
+                    "key": 1000
                   },
                   {
-                    "3": {
-                      "buckets": [{ "doc_count": 2, "key": 1000 }, { "doc_count": 8, "key": 2000 }]
-                    },
-                    "doc_count": 10,
-                    "key": 0
+                    "2": { "value": 99 },
+                    "doc_count": 15,
+                    "key": 2000
                   }
                 ]
               }
@@ -540,49 +2214,58 @@ func TestResponseParser(t *testing.T) {
 			require.NotNil(t, queryRes)
 			dataframes := queryRes.Frames
 			require.NoError(t, err)
-			require.Len(t, dataframes, 3)
+			require.Len(t, dataframes, 2)
 
 			frame := dataframes[0]
 			require.Len(t, frame.Fields, 2)
+
 			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Count and {{not_exist}} server1")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
-			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
-			require.Equal(t, frame.Fields[0].Len(), 2)
-			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
-			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Count and {{not_exist}} server2")
 
-			frame = dataframes[2]
-			require.Len(t, frame.Fields, 2)
 			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "0 Count and {{not_exist}} 0")
+			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average value")
 		})
+	})
 
-		t.Run("Histogram response", func(t *testing.T) {
+	t.Run("Avg", func(t *testing.T) {
+		t.Run("Query with duplicated avg metric creates unique field name", func(t *testing.T) {
 			targets := map[string]string{
 				"A": `{
-					"metrics": [{ "type": "count", "id": "1" }],
-         "bucketAggs": [{ "type": "histogram", "field": "bytes", "id": "3" }]
+					"metrics": [{"type": "avg", "field": "value", "id": "1" }, {"type": "avg", "field": "value", "id": "4" }],
+          "bucketAggs": [{ "type": "terms", "field": "label", "id": "3" }]
 				}`,
 			}
 			response := `{
         "responses": [
-         {
-           "aggregations": {
-             "3": {
-               "buckets": [{ "doc_count": 1, "key": 1000 }, { "doc_count": 3, "key": 2000 }, { "doc_count": 2, "key": 3000 }]
-             }
-           }
-         }
+          {
+            "aggregations": {
+              "3": {
+                "buckets": [
+                  {
+                    "1": { "value": 88 },
+										"4": { "value": 88 },
+                    "doc_count": 10,
+                    "key": "val1"
+                  },
+                  {
+                    "1": { "value": 99 },
+										"4": { "value": 99 },
+                    "doc_count": 15,
+                    "key": "val2"
+                  }
+                ]
+              }
+            }
+          }
         ]
 			}`
 			result, err := parseTestResponse(targets, response)
@@ -594,6 +2277,79 @@ func TestResponseParser(t *testing.T) {
 			dataframes := queryRes.Frames
 			require.NoError(t, err)
 			require.Len(t, dataframes, 1)
+
+			frame := dataframes[0]
+			require.Len(t, frame.Fields, 3)
+			require.Equal(t, frame.Fields[0].Name, "label")
+			require.Equal(t, frame.Fields[1].Name, "Average value 1")
+			require.Equal(t, frame.Fields[2].Name, "Average value 4")
+		})
+	})
+
+	t.Run("Multiple bucket agg", func(t *testing.T) {
+		t.Run("Date histogram with 2 filters agg", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [{ "type": "count", "id": "1" }],
+		  "bucketAggs": [
+			{
+			  "id": "2",
+			  "type": "filters",
+			  "settings": {
+				"filters": [
+				  { "query": "@metric:cpu", "label": "" },
+				  { "query": "@metric:logins.count", "label": "" }
+				]
+			  }
+			},
+			{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
+		  ]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": {
+				  "@metric:cpu": {
+					"3": {
+					  "buckets": [
+						{ "doc_count": 1, "key": 1000 },
+						{ "doc_count": 3, "key": 2000 }
+					  ]
+					}
+				  },
+				  "@metric:logins.count": {
+					"3": {
+					  "buckets": [
+						{ "doc_count": 2, "key": 1000 },
+						{ "doc_count": 8, "key": 2000 }
+					  ]
+					}
+				  }
+				}
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 2)
+			requireFrameLength(t, frames[0], 2)
+			requireTimeSeriesName(t, "@metric:cpu", frames[0])
+			requireTimeSeriesName(t, "@metric:logins.count", frames[1])
 		})
 
 		t.Run("With two filters agg", func(t *testing.T) {
@@ -660,6 +2416,154 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[1].Len(), 2)
 			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "@metric:logins.count")
 		})
+	})
+
+	t.Run("With multiple metrics", func(t *testing.T) {
+		t.Run("Multiple metrics with the same type", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [
+			{ "type": "avg", "id": "1", "field": "test" },
+			{ "type": "avg", "id": "2", "field": "test2" }
+		  ],
+		  "bucketAggs": [{ "id": "2", "type": "terms", "field": "host" }]
+		}
+	]
+	`)
+
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  {
+					"1": { "value": 1000 },
+					"2": { "value": 3000 },
+					"key": "server-1",
+					"doc_count": 369
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	  }
+		  
+	`)
+
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.True(t, len(frames) > 0)
+			requireFrameLength(t, frames[0], 1)
+			require.Len(t, frames[0].Fields, 3)
+
+			requireStringAt(t, "server-1", frames[0].Fields[0], 0)
+			requireFloatAt(t, 1000.0, frames[0].Fields[1], 0)
+			requireFloatAt(t, 3000.0, frames[0].Fields[2], 0)
+		})
+
+		t.Run("Multiple metrics of same type", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+					"metrics": [{ "type": "avg", "field": "test", "id": "1" }, { "type": "avg", "field": "test2", "id": "2" }],
+          "bucketAggs": [{ "type": "terms", "field": "host", "id": "2" }]
+				}`,
+			}
+			response := `{
+        "responses": [
+          {
+            "aggregations": {
+              "2": {
+                "buckets": [
+                  {
+                    "1": { "value": 1000 },
+                    "2": { "value": 3000 },
+                    "key": "server-1",
+                    "doc_count": 369
+                  }
+                ]
+              }
+            }
+          }
+        ]
+			}`
+			result, err := parseTestResponse(targets, response)
+			require.NoError(t, err)
+			require.Len(t, result.Responses, 1)
+
+			queryRes := result.Responses["A"]
+			require.NotNil(t, queryRes)
+			dataframes := queryRes.Frames
+			require.NoError(t, err)
+			require.Len(t, dataframes, 1)
+
+			frame := dataframes[0]
+			require.Len(t, frame.Fields, 3)
+			require.Equal(t, frame.Fields[0].Name, "host")
+			require.Equal(t, frame.Fields[0].Len(), 1)
+			require.Equal(t, frame.Fields[1].Name, "Average test")
+			require.Equal(t, frame.Fields[1].Len(), 1)
+			require.Equal(t, frame.Fields[2].Name, "Average test2")
+			require.Equal(t, frame.Fields[2].Len(), 1)
+			require.Nil(t, frame.Fields[1].Config)
+		})
+
+		t.Run("No group by time", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+					"metrics": [{ "type": "avg", "id": "1" }, { "type": "count" }],
+         "bucketAggs": [{ "type": "terms", "field": "host", "id": "2" }]
+				}`,
+			}
+			response := `{
+        "responses": [
+         {
+           "aggregations": {
+             "2": {
+               "buckets": [
+                 {
+                   "1": { "value": 1000 },
+                   "key": "server-1",
+                   "doc_count": 369
+                 },
+                 {
+                   "1": { "value": 2000 },
+                   "key": "server-2",
+                   "doc_count": 200
+                 }
+               ]
+             }
+           }
+         }
+        ]
+			}`
+			result, err := parseTestResponse(targets, response)
+			require.NoError(t, err)
+			require.Len(t, result.Responses, 1)
+
+			queryRes := result.Responses["A"]
+			require.NotNil(t, queryRes)
+			dataframes := queryRes.Frames
+			require.NoError(t, err)
+			require.Len(t, dataframes, 1)
+
+			frame := dataframes[0]
+			require.Len(t, frame.Fields, 3)
+			require.Equal(t, frame.Fields[0].Name, "host")
+			require.Equal(t, frame.Fields[0].Len(), 2)
+			require.Equal(t, frame.Fields[1].Name, "Average")
+			require.Equal(t, frame.Fields[1].Len(), 2)
+			require.Equal(t, frame.Fields[2].Name, "Count")
+			require.Equal(t, frame.Fields[2].Len(), 2)
+			require.Nil(t, frame.Fields[1].Config)
+		})
 
 		t.Run("With drop first and last aggregation (numeric)", func(t *testing.T) {
 			targets := map[string]string{
@@ -796,7 +2700,9 @@ func TestResponseParser(t *testing.T) {
 			require.Equal(t, frame.Fields[1].Len(), 1)
 			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
 		})
+	})
 
+	t.Run("Trim edges", func(t *testing.T) {
 		t.Run("Larger trimEdges value", func(t *testing.T) {
 			targets := map[string]string{
 				"A": `{
@@ -839,106 +2745,11 @@ func TestResponseParser(t *testing.T) {
 
 			queryRes := result.Responses["A"]
 			require.NotNil(t, queryRes)
-
 			experimental.CheckGoldenJSONResponse(t, "testdata", "trimedges_string.golden", &queryRes, *update)
 		})
+	})
 
-		t.Run("No group by time", func(t *testing.T) {
-			targets := map[string]string{
-				"A": `{
-					"metrics": [{ "type": "avg", "id": "1" }, { "type": "count" }],
-         "bucketAggs": [{ "type": "terms", "field": "host", "id": "2" }]
-				}`,
-			}
-			response := `{
-        "responses": [
-         {
-           "aggregations": {
-             "2": {
-               "buckets": [
-                 {
-                   "1": { "value": 1000 },
-                   "key": "server-1",
-                   "doc_count": 369
-                 },
-                 {
-                   "1": { "value": 2000 },
-                   "key": "server-2",
-                   "doc_count": 200
-                 }
-               ]
-             }
-           }
-         }
-        ]
-			}`
-			result, err := parseTestResponse(targets, response)
-			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
-
-			queryRes := result.Responses["A"]
-			require.NotNil(t, queryRes)
-			dataframes := queryRes.Frames
-			require.NoError(t, err)
-			require.Len(t, dataframes, 1)
-
-			frame := dataframes[0]
-			require.Len(t, frame.Fields, 3)
-			require.Equal(t, frame.Fields[0].Name, "host")
-			require.Equal(t, frame.Fields[0].Len(), 2)
-			require.Equal(t, frame.Fields[1].Name, "Average")
-			require.Equal(t, frame.Fields[1].Len(), 2)
-			require.Equal(t, frame.Fields[2].Name, "Count")
-			require.Equal(t, frame.Fields[2].Len(), 2)
-			require.Nil(t, frame.Fields[1].Config)
-		})
-
-		t.Run("Multiple metrics of same type", func(t *testing.T) {
-			targets := map[string]string{
-				"A": `{
-					"metrics": [{ "type": "avg", "field": "test", "id": "1" }, { "type": "avg", "field": "test2", "id": "2" }],
-          "bucketAggs": [{ "type": "terms", "field": "host", "id": "2" }]
-				}`,
-			}
-			response := `{
-        "responses": [
-          {
-            "aggregations": {
-              "2": {
-                "buckets": [
-                  {
-                    "1": { "value": 1000 },
-                    "2": { "value": 3000 },
-                    "key": "server-1",
-                    "doc_count": 369
-                  }
-                ]
-              }
-            }
-          }
-        ]
-			}`
-			result, err := parseTestResponse(targets, response)
-			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
-
-			queryRes := result.Responses["A"]
-			require.NotNil(t, queryRes)
-			dataframes := queryRes.Frames
-			require.NoError(t, err)
-			require.Len(t, dataframes, 1)
-
-			frame := dataframes[0]
-			require.Len(t, frame.Fields, 3)
-			require.Equal(t, frame.Fields[0].Name, "host")
-			require.Equal(t, frame.Fields[0].Len(), 1)
-			require.Equal(t, frame.Fields[1].Name, "Average test")
-			require.Equal(t, frame.Fields[1].Len(), 1)
-			require.Equal(t, frame.Fields[2].Name, "Average test2")
-			require.Equal(t, frame.Fields[2].Len(), 1)
-			require.Nil(t, frame.Fields[1].Config)
-		})
-
+	t.Run("Bucket script", func(t *testing.T) {
 		t.Run("With bucket_script", func(t *testing.T) {
 			targets := map[string]string{
 				"A": `{
@@ -1016,504 +2827,68 @@ func TestResponseParser(t *testing.T) {
 			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Sum @value * Max @value")
 		})
 
-		t.Run("Terms with two bucket_script", func(t *testing.T) {
-			targets := map[string]string{
-				"A": `{
-					"metrics": [
-						{ "id": "1", "type": "sum", "field": "@value" },
-            			{ "id": "3", "type": "max", "field": "@value" },
-            			{
-              				"id": "4",
-              				"pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
-              				"settings": { "script": "params.var1 * params.var2" },
-              				"type": "bucket_script"
-						},
-            			{
-							"id": "5",
-							"pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
-							"settings": { "script": "params.var1 * params.var2 * 2" },
-							"type": "bucket_script"
-					  }
-					],
-          "bucketAggs": [{ "type": "terms", "field": "@timestamp", "id": "2" }]
-				}`,
-			}
-			response := `{
-				"responses": [
-					{
-						"aggregations": {
-						"2": {
-							"buckets": [
-							{
-								"1": { "value": 2 },
-								"3": { "value": 3 },
-								"4": { "value": 6 },
-								"5": { "value": 24 },
-								"doc_count": 60,
-								"key": 1000
-							},
-							{
-								"1": { "value": 3 },
-								"3": { "value": 4 },
-								"4": { "value": 12 },
-								"5": { "value": 48 },
-								"doc_count": 60,
-								"key": 2000
-							}
-							]
-						}
-						}
-					}
-				]
-			}`
-			result, err := parseTestResponse(targets, response)
-			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
-
-			queryRes := result.Responses["A"]
-			require.NotNil(t, queryRes)
-			dataframes := queryRes.Frames
-			require.NoError(t, err)
-			require.Len(t, dataframes, 1)
-
-			frame := dataframes[0]
-			require.Len(t, frame.Fields, 5)
-			require.Equal(t, frame.Fields[0].Name, "@timestamp")
-			require.Equal(t, frame.Fields[0].Len(), 2)
-			require.Equal(t, frame.Fields[1].Name, "Sum")
-			require.Equal(t, frame.Fields[1].Len(), 2)
-			require.Equal(t, frame.Fields[2].Name, "Max")
-			require.Equal(t, frame.Fields[2].Len(), 2)
-			require.Equal(t, frame.Fields[3].Name, "params.var1 * params.var2")
-			require.Equal(t, frame.Fields[3].Len(), 2)
-			require.Equal(t, frame.Fields[4].Name, "params.var1 * params.var2 * 2")
-			require.Equal(t, frame.Fields[4].Len(), 2)
-			require.Nil(t, frame.Fields[1].Config)
-		})
-
-		t.Run("Log query", func(t *testing.T) {
-			targets := map[string]string{
-				"A": `{
-					"metrics": [{ "type": "logs" }]
-				}`,
-			}
-
-			response := `{
-  			"responses":[
-  			  {
-  			    "hits":{
-  			      "total":{
-  			        "value":109,
-  			        "relation":"eq"
-  			      },
-  			      "max_score":null,
-  			      "hits":[
-  			        {
-  			          "_index":"logs-2023.02.08",
-  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
-  			          "_score":null,
-  			          "_source":{
-  			            "@timestamp":"2023-02-08T15:10:55.830Z",
-  			            "line":"log text  [479231733]",
-  			            "counter":"109",
-  			            "float":58.253758485091,
-  			            "label":"val1",
-  			            "lvl":"info",
-  			            "location":"17.089705232090438, 41.62861966340297",
-										"nested": {
-											"field": {
-												"double_nested": "value"
-											}
-										},
-  			            "shapes":[
-  			              {
-  			                "type":"triangle"
-  			              },
-  			              {
-  			                "type":"square"
-  			              }
-  			            ],
-										"xyz": null
-  			          },
-  			          "sort":[
-  			            1675869055830,
-  			            4
-  			          ]
-  			        },
-  			        {
-  			          "_index":"logs-2023.02.08",
-  			          "_id":"Fx2UMYYBfCQ-FCMjZyJ_",
-  			          "_score":null,
-  			          "_source":{
-  			            "@timestamp":"2023-02-08T15:10:54.835Z",
-  			            "line":"log text with ANSI \u001b[31mpart of the text\u001b[0m [493139080]",
-  			            "counter":"108",
-  			            "float":54.5977098233944,
-  			            "label":"val1",
-  			            "lvl":"info",
-  			            "location":"19.766305918490463, 40.42639175509792",
-										"nested": {
-											"field": {
-												"double_nested": "value"
-											}
-										},
-  			            "shapes":[
-  			              {
-  			                "type":"triangle"
-  			              },
-  			              {
-  			                "type":"square"
-  			              }
-  			            ],
-										"xyz": "def"
-  			          },
-  			          "sort":[
-  			            1675869054835,
-  			            7
-  			          ]
-  			        }
-  			      ]
-  			    },
-  			    "status":200
-  			  }
-  			]
-			}`
-
-			result, err := parseTestResponse(targets, response)
-			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
-
-			queryRes := result.Responses["A"]
-			require.NotNil(t, queryRes)
-			dataframes := queryRes.Frames
-			require.Len(t, dataframes, 1)
-			frame := dataframes[0]
-
-			require.Equal(t, 16, len(frame.Fields))
-			// Fields have the correct length
-			require.Equal(t, 2, frame.Fields[0].Len())
-			// First field is timeField
-			require.Equal(t, data.FieldTypeNullableTime, frame.Fields[0].Type())
-			// Second is log line
-			require.Equal(t, data.FieldTypeNullableString, frame.Fields[1].Type())
-			require.Equal(t, "line", frame.Fields[1].Name)
-			// Correctly renames lvl field to level
-			require.Equal(t, "level", frame.Fields[10].Name)
-			// Correctly uses string types
-			require.Equal(t, data.FieldTypeNullableString, frame.Fields[1].Type())
-			// Correctly detects float64 types
-			require.Equal(t, data.FieldTypeNullableFloat64, frame.Fields[7].Type())
-			// Correctly detects json types
-			require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[8].Type())
-			// Correctly flattens fields
-			require.Equal(t, "nested.field.double_nested", frame.Fields[12].Name)
-			require.Equal(t, data.FieldTypeNullableString, frame.Fields[12].Type())
-			// Correctly detects type even if first value is null
-			require.Equal(t, data.FieldTypeNullableString, frame.Fields[15].Type())
-		})
-
-		t.Run("Log query with highlight", func(t *testing.T) {
-			targets := map[string]string{
-				"A": `{
-					"metrics": [{ "type": "logs" }]
-				}`,
-			}
-
-			response := `{
-  			"responses":[
-  			  {
-  			    "hits":{
-  			      "total":{
-  			        "value":109,
-  			        "relation":"eq"
-  			      },
-  			      "max_score":null,
-  			      "hits":[
-  			        {
-  			          "_index":"logs-2023.02.08",
-  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
-  			          "_score":null,
-									"highlight": {
-										"line": [
-					  					"@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
-										],
-										"duplicated": ["@HIGHLIGHT@hello@/HIGHLIGHT@"]
-				  				},
-  			          "_source":{
-  			            "@timestamp":"2023-02-08T15:10:55.830Z",
-  			            "line":"log text  [479231733]"
-									}
-  			        },
-  			        {
-  			          "_index":"logs-2023.02.08",
-  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
-  			          "_score":null,
-									"highlight": {
-										"line": [
-					  					"@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
-										],
-										"duplicated": ["@HIGHLIGHT@hello@/HIGHLIGHT@"]
-				  				},
-  			          "_source":{
-  			            "@timestamp":"2023-02-08T15:10:55.830Z",
-  			            "line":"log text  [479231733]"
-									}
-  			        }
-  			      ]
-  			    },
-  			    "status":200
-  			  }
-  			]
-			}`
-
-			result, err := parseTestResponse(targets, response)
-			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
-
-			queryRes := result.Responses["A"]
-			require.NotNil(t, queryRes)
-			dataframes := queryRes.Frames
-			require.Len(t, dataframes, 1)
-			frame := dataframes[0]
-
-			customMeta := frame.Meta.Custom
-
-			require.Equal(t, map[string]interface{}{
-				"searchWords": []string{"hello", "message"},
-			}, customMeta)
-		})
-
-		t.Run("Raw document query", func(t *testing.T) {
-			targets := map[string]string{
-				"A": `{
-					"metrics": [{ "type": "raw_document" }]
-				}`,
-			}
-
-			response := `{
-  			"responses":[
-  			  {
-  			    "hits":{
-  			      "total":{
-  			        "value":109,
-  			        "relation":"eq"
-  			      },
-  			      "max_score":null,
-  			      "hits":[
-  			        {
-  			          "_index":"logs-2023.02.08",
-  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
-  			          "_score":null,
-									"fields": {
-										"test_field":"A"
-									},
-  			          "_source":{
-  			            "@timestamp":"2023-02-08T15:10:55.830Z",
-  			            "line":"log text  [479231733]",
-  			            "counter":"109",
-  			            "float":58.253758485091,
-  			            "label":"val1",
-  			            "level":"info",
-  			            "location":"17.089705232090438, 41.62861966340297",
-										"nested": {
-											"field": {
-												"double_nested": "value"
-											}
-										}
-									}
-  			        },
-  			        {
-  			          "_index":"logs-2023.02.08",
-  			          "_id":"Fx2UMYYBfCQ-FCMjZyJ_",
-  			          "_score":null,
-									"fields": {
-										"test_field":"A"
-									},
-  			          "_source":{
-  			            "@timestamp":"2023-02-08T15:10:54.835Z",
-  			            "line":"log text with ANSI \u001b[31mpart of the text\u001b[0m [493139080]",
-  			            "counter":"108",
-  			            "float":54.5977098233944,
-  			            "label":"val1",
-  			            "level":"info",
-  			            "location":"19.766305918490463, 40.42639175509792",
-										"nested": {
-											"field": {
-												"double_nested": "value1"
-											}
-										}
-									}
-  			        }
-  			      ]
-  			    },
-  			    "status":200
-  			  }
-  			]
-			}`
-
-			result, err := parseTestResponse(targets, response)
-			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
-
-			queryRes := result.Responses["A"]
-			require.NotNil(t, queryRes)
-			dataframes := queryRes.Frames
-			require.Len(t, dataframes, 1)
-			frame := dataframes[0]
-
-			require.Equal(t, 1, len(frame.Fields))
-			//Fields have the correct length
-			require.Equal(t, 2, frame.Fields[0].Len())
-			// The only field is the raw document
-			require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[0].Type())
-			require.Equal(t, "A", frame.Fields[0].Name)
-		})
-
-		t.Run("Raw data query", func(t *testing.T) {
-			targets := map[string]string{
-				"A": `{
-					"metrics": [{ "type": "raw_data" }]
-				}`,
-			}
-
-			response := `{
-  			"responses":[
-  			  {
-  			    "hits":{
-  			      "total":{
-  			        "value":109,
-  			        "relation":"eq"
-  			      },
-  			      "max_score":null,
-  			      "hits":[
-  			        {
-  			          "_index":"logs-2023.02.08",
-  			          "_id":"GB2UMYYBfCQ-FCMjayJa",
-  			          "_score":null,
-  			          "_source":{
-  			            "@timestamp":"2023-02-08T15:10:55.830Z",
-  			            "line":"log text  [479231733]",
-  			            "counter":"109",
-  			            "float":58.253758485091,
-  			            "label":"val1",
-  			            "level":"info",
-  			            "location":"17.089705232090438, 41.62861966340297",
-										"nested": {
-											"field": {
-												"double_nested": "value"
-											}
-										},
-  			            "shapes":[
-  			              {
-  			                "type":"triangle"
-  			              },
-  			              {
-  			                "type":"square"
-  			              }
-  			            ],
-										"xyz": null
-  			          },
-  			          "sort":[
-  			            1675869055830,
-  			            4
-  			          ]
-  			        },
-  			        {
-  			          "_index":"logs-2023.02.08",
-  			          "_id":"Fx2UMYYBfCQ-FCMjZyJ_",
-  			          "_score":null,
-  			          "_source":{
-  			            "@timestamp":"2023-02-08T15:10:54.835Z",
-  			            "line":"log text with ANSI \u001b[31mpart of the text\u001b[0m [493139080]",
-  			            "counter":"108",
-  			            "float":54.5977098233944,
-  			            "label":"val1",
-  			            "level":"info",
-  			            "location":"19.766305918490463, 40.42639175509792",
-										"nested": {
-											"field": {
-												"double_nested": "value"
-											}
-										},
-  			            "shapes":[
-  			              {
-  			                "type":"triangle"
-  			              },
-  			              {
-  			                "type":"square"
-  			              }
-  			            ],
-										"xyz": "def"
-  			          },
-  			          "sort":[
-  			            1675869054835,
-  			            7
-  			          ]
-  			        }
-  			      ]
-  			    },
-  			    "status":200
-  			  }
-  			]
-			}`
-
-			result, err := parseTestResponse(targets, response)
-			require.NoError(t, err)
-			require.Len(t, result.Responses, 1)
-
-			queryRes := result.Responses["A"]
-			require.NotNil(t, queryRes)
-			dataframes := queryRes.Frames
-			require.Len(t, dataframes, 1)
-			frame := dataframes[0]
-
-			require.Equal(t, 15, len(frame.Fields))
-			// Fields have the correct length
-			require.Equal(t, 2, frame.Fields[0].Len())
-			// First field is timeField
-			require.Equal(t, data.FieldTypeNullableTime, frame.Fields[0].Type())
-			// Correctly uses string types
-			require.Equal(t, data.FieldTypeNullableString, frame.Fields[1].Type())
-			// Correctly detects float64 types
-			require.Equal(t, data.FieldTypeNullableFloat64, frame.Fields[5].Type())
-			// Correctly detects json types
-			require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[6].Type())
-			// Correctly flattens fields
-			require.Equal(t, "nested.field.double_nested", frame.Fields[11].Name)
-			require.Equal(t, data.FieldTypeNullableString, frame.Fields[11].Type())
-			// Correctly detects type even if first value is null
-			require.Equal(t, data.FieldTypeNullableString, frame.Fields[14].Type())
-		})
-		t.Run("Raw data query filterable fields", func(t *testing.T) {
+		t.Run("Two bucket_script", func(t *testing.T) {
 			query := []byte(`
-				[
-					{
-						"refId": "A",
-						"metrics": [{ "type": "raw_data", "id": "1" }],
-						"bucketAggs": []
-					}
-				]
-			`)
+	[
+		{
+		  "refId": "A",
+		  "metrics": [
+			{ "id": "1", "type": "sum", "field": "@value" },
+			{ "id": "3", "type": "max", "field": "@value" },
+			{
+			  "id": "4",
+			  "pipelineVariables": [
+				{ "name": "var1", "pipelineAgg": "1" },
+				{ "name": "var2", "pipelineAgg": "3" }
+			  ],
+			  "settings": { "script": "params.var1 * params.var2" },
+			  "type": "bucket_script"
+			},
+			{
+			  "id": "5",
+			  "pipelineVariables": [
+				{ "name": "var1", "pipelineAgg": "1" },
+				{ "name": "var2", "pipelineAgg": "3" }
+			  ],
+			  "settings": { "script": "params.var1 * params.var2 * 4" },
+			  "type": "bucket_script"
+			}
+		  ],
+		  "bucketAggs": [{ "type": "terms", "field": "@timestamp", "id": "2" }]
+		}
+	]
+	`)
 
 			response := []byte(`
-				{
-					"responses": [
-					  {
-						"hits": {
-						  "total": { "relation": "eq", "value": 1 },
-						  "hits": [
-							{
-							  "_id": "1",
-							  "_type": "_doc",
-							  "_index": "index",
-							  "_source": { "sourceProp": "asd" }
-							}
-						  ]
-						}
-					  }
-					]
-				}
-			`)
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  {
+					"1": { "value": 2 },
+					"3": { "value": 3 },
+					"4": { "value": 6 },
+					"5": { "value": 24 },
+					"doc_count": 60,
+					"key": 1000
+				  },
+				  {
+					"1": { "value": 3 },
+					"3": { "value": 4 },
+					"4": { "value": 12 },
+					"5": { "value": 48 },
+					"doc_count": 60,
+					"key": 2000
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
 
 			result, err := queryDataTest(query, response)
 			require.NoError(t, err)
@@ -1521,298 +2896,282 @@ func TestResponseParser(t *testing.T) {
 			require.Len(t, result.response.Responses, 1)
 			frames := result.response.Responses["A"].Frames
 			require.True(t, len(frames) > 0)
+			requireFrameLength(t, frames[0], 2)
 
-			for _, field := range frames[0].Fields {
-				trueValue := true
-				filterableConfig := data.FieldConfig{Filterable: &trueValue}
+			fields := frames[0].Fields
+			require.Len(t, fields, 5)
 
-				// we need to test that the only changed setting is `filterable`
-				require.Equal(t, filterableConfig, *field.Config)
-			}
+			requireFloatAt(t, 1000.0, fields[0], 0)
+			requireFloatAt(t, 2000.0, fields[0], 1)
+			requireFloatAt(t, 2.0, fields[1], 0)
+			requireFloatAt(t, 3.0, fields[1], 1)
+			requireFloatAt(t, 3.0, fields[2], 0)
+			requireFloatAt(t, 4.0, fields[2], 1)
+			requireFloatAt(t, 6.0, fields[3], 0)
+			requireFloatAt(t, 12.0, fields[3], 1)
+			requireFloatAt(t, 24.0, fields[4], 0)
+			requireFloatAt(t, 48.0, fields[4], 1)
 		})
-	})
 
-	t.Run("With top_metrics and date_histogram agg", func(t *testing.T) {
-		targets := map[string]string{
-			"A": `{
-				"metrics": [
-					{
-						"type": "top_metrics",
-						"settings": {
-							"order": "desc",
-							"orderBy": "@timestamp",
-							"metrics": ["@value", "@anotherValue"]
-						},
-						"id": "1"
-					}
-				],
-				"bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "3" }]
-			}`,
+		t.Run("Bucket script", func(t *testing.T) {
+			query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [
+			{ "id": "1", "type": "sum", "field": "@value" },
+			{ "id": "3", "type": "max", "field": "@value" },
+			{
+			  "id": "4",
+			  "pipelineVariables": [
+				{ "name": "var1", "pipelineAgg": "1" },
+				{ "name": "var2", "pipelineAgg": "3" }
+			  ],
+			  "settings": { "script": "params.var1 * params.var2" },
+			  "type": "bucket_script"
+			}
+		  ],
+		  "bucketAggs": [
+			{ "type": "date_histogram", "field": "@timestamp", "id": "2" }
+		  ]
 		}
-		response := `{
-			"responses": [{
-				"aggregations": {
-					"3": {
-						"buckets": [
-							{
-								"key": 1609459200000,
-								"key_as_string": "2021-01-01T00:00:00.000Z",
-								"1": {
-									"top": [
-										{ "sort": ["2021-01-01T00:00:00.000Z"], "metrics": { "@value": 1, "@anotherValue": 2 } }
-									]
-								}
-							},
-							{
-								"key": 1609459210000,
-								"key_as_string": "2021-01-01T00:00:10.000Z",
-								"1": {
-									"top": [
-										{ "sort": ["2021-01-01T00:00:10.000Z"], "metrics": { "@value": 1, "@anotherValue": 2 } }
-									]
-								}
-							}
-						]
-					}
-				}
-			}]
-		}`
-		result, err := parseTestResponse(targets, response)
-		assert.Nil(t, err)
-		assert.Len(t, result.Responses, 1)
+	]
+	`)
 
-		queryRes := result.Responses["A"]
-		assert.NotNil(t, queryRes)
-		dataframes := queryRes.Frames
-		assert.NoError(t, err)
-		assert.Len(t, dataframes, 2)
+			response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  {
+					"1": { "value": 2 },
+					"3": { "value": 3 },
+					"4": { "value": 6 },
+					"doc_count": 60,
+					"key": 1000
+				  },
+				  {
+					"1": { "value": 3 },
+					"3": { "value": 4 },
+					"4": { "value": 12 },
+					"doc_count": 60,
+					"key": 2000
+				  }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
 
-		frame := dataframes[0]
-		assert.Len(t, frame.Fields, 2)
-		require.Equal(t, frame.Fields[0].Len(), 2)
-		require.Equal(t, frame.Fields[1].Len(), 2)
-		assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Top Metrics @value")
-		v, _ := frame.FloatAt(0, 0)
-		assert.Equal(t, 1609459200000., v)
-		v, _ = frame.FloatAt(1, 0)
-		assert.Equal(t, 1., v)
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
 
-		v, _ = frame.FloatAt(0, 1)
-		assert.Equal(t, 1609459210000., v)
-		v, _ = frame.FloatAt(1, 1)
-		assert.Equal(t, 1., v)
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 3)
+			requireFrameLength(t, frames[0], 2)
+			requireTimeSeriesName(t, "Sum @value", frames[0])
+			requireTimeSeriesName(t, "Max @value", frames[1])
+			requireTimeSeriesName(t, "Sum @value * Max @value", frames[2])
 
-		frame = dataframes[1]
-		l, _ := frame.MarshalJSON()
-		fmt.Println(string(l))
-		assert.Len(t, frame.Fields, 2)
-		require.Equal(t, frame.Fields[0].Len(), 2)
-		require.Equal(t, frame.Fields[1].Len(), 2)
-		assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Top Metrics @anotherValue")
-		v, _ = frame.FloatAt(0, 0)
-		assert.Equal(t, 1609459200000., v)
-		v, _ = frame.FloatAt(1, 0)
-		assert.Equal(t, 2., v)
+			requireNumberValue(t, 2, frames[0], 0)
+			requireNumberValue(t, 3, frames[1], 0)
+			requireNumberValue(t, 6, frames[2], 0)
 
-		v, _ = frame.FloatAt(0, 1)
-		assert.Equal(t, 1609459210000., v)
-		v, _ = frame.FloatAt(1, 1)
-		assert.Equal(t, 2., v)
-	})
-
-	t.Run("With top_metrics and terms agg", func(t *testing.T) {
-		targets := map[string]string{
-			"A": `{
-				"metrics": [
-					{
-						"type": "top_metrics",
-						"settings": {
-							"order": "desc",
-							"orderBy": "@timestamp",
-							"metrics": ["@value", "@anotherValue"]
-						},
-						"id": "1"
-					}
-				],
-				"bucketAggs": [{ "type": "terms", "field": "id", "id": "3" }]
-			}`,
-		}
-		response := `{
-			"responses": [{
-				"aggregations": {
-					"3": {
-						"buckets": [
-							{
-								"key": "id1",
-								"1": {
-									"top": [
-										{ "sort": [10], "metrics": { "@value": 10, "@anotherValue": 2 } }
-									]
-								}
-							},
-							{
-								"key": "id2",
-								"1": {
-									"top": [
-										{ "sort": [5], "metrics": { "@value": 5, "@anotherValue": 2 } }
-									]
-								}
-							}
-						]
-					}
-				}
-			}]
-		}`
-
-		result, err := parseTestResponse(targets, response)
-		assert.Nil(t, err)
-		assert.Len(t, result.Responses, 1)
-		frames := result.Responses["A"].Frames
-		require.Len(t, frames, 1)
-		requireFrameLength(t, frames[0], 2)
-		require.Len(t, frames[0].Fields, 3)
-
-		f1 := frames[0].Fields[0]
-		f2 := frames[0].Fields[1]
-		f3 := frames[0].Fields[2]
-
-		require.Equal(t, "id", f1.Name)
-		require.Equal(t, "Top Metrics @value", f2.Name)
-		require.Equal(t, "Top Metrics @anotherValue", f3.Name)
-
-		requireStringAt(t, "id1", f1, 0)
-		requireStringAt(t, "id2", f1, 1)
-
-		requireFloatAt(t, 10, f2, 0)
-		requireFloatAt(t, 5, f2, 1)
-
-		requireFloatAt(t, 2, f3, 0)
-		requireFloatAt(t, 2, f3, 1)
-	})
-
-	t.Run("With max and multiple terms agg", func(t *testing.T) {
-		targets := map[string]string{
-			"A": `{
-				"metrics": [
-					{
-						"type": "max",
-						"field": "counter",
-						"id": "1"
-					}
-				],
-				"bucketAggs": [{ "type": "terms", "field": "label", "id": "2" }, { "type": "terms", "field": "level", "id": "3" }]
-			}`,
-		}
-		response := `{
-			"responses": [{
-				"aggregations": {
-					"2": {
-						"buckets": [
-							{
-								"key": "val3",
-								"3": {
-									"buckets": [
-										{ "key": "info", "1": { "value": "299" } }, { "key": "error", "1": {"value": "300"} }
-									]
-								}
-							},
-							{
-								"key": "val2",
-								"3": {
-									"buckets": [
-										{"key": "info", "1": {"value": "300"}}, {"key": "error", "1": {"value": "298"} }
-									]
-								}
-							},
-							{
-								"key": "val1",
-								"3": {
-									"buckets": [
-										{"key": "info", "1": {"value": "299"}}, {"key": "error", "1": {"value": "296"} }
-									]
-								}
-							}
-						]
-					}
-				}
-			}]
-		}`
-
-		result, err := parseTestResponse(targets, response)
-		assert.Nil(t, err)
-		assert.Len(t, result.Responses, 1)
-		frames := result.Responses["A"].Frames
-		require.Len(t, frames, 1)
-		requireFrameLength(t, frames[0], 6)
-		require.Len(t, frames[0].Fields, 3)
-
-		f1 := frames[0].Fields[0]
-		f2 := frames[0].Fields[1]
-		f3 := frames[0].Fields[2]
-
-		require.Equal(t, "label", f1.Name)
-		require.Equal(t, "level", f2.Name)
-		require.Equal(t, "Max", f3.Name)
-
-		requireStringAt(t, "val3", f1, 0)
-		requireStringAt(t, "val3", f1, 1)
-		requireStringAt(t, "val2", f1, 2)
-		requireStringAt(t, "val2", f1, 3)
-		requireStringAt(t, "val1", f1, 4)
-		requireStringAt(t, "val1", f1, 5)
-
-		requireStringAt(t, "info", f2, 0)
-		requireStringAt(t, "error", f2, 1)
-		requireStringAt(t, "info", f2, 2)
-		requireStringAt(t, "error", f2, 3)
-		requireStringAt(t, "info", f2, 4)
-		requireStringAt(t, "error", f2, 5)
-
-		requireFloatAt(t, 299, f3, 0)
-		requireFloatAt(t, 300, f3, 1)
-		requireFloatAt(t, 300, f3, 2)
-		requireFloatAt(t, 298, f3, 3)
-		requireFloatAt(t, 299, f3, 4)
-		requireFloatAt(t, 296, f3, 5)
+			requireNumberValue(t, 3, frames[0], 1)
+			requireNumberValue(t, 4, frames[1], 1)
+			requireNumberValue(t, 12, frames[2], 1)
+		})
 	})
 }
 
-func parseTestResponse(tsdbQueries map[string]string, responseBody string) (*backend.QueryDataResponse, error) {
-	from := time.Date(2018, 5, 15, 17, 50, 0, 0, time.UTC)
-	to := time.Date(2018, 5, 15, 17, 55, 0, 0, time.UTC)
-	configuredFields := es.ConfiguredFields{
-		TimeField:       "@timestamp",
-		LogMessageField: "line",
-		LogLevelField:   "lvl",
-	}
-	timeRange := backend.TimeRange{
-		From: from,
-		To:   to,
-	}
-	tsdbQuery := backend.QueryDataRequest{
-		Queries: []backend.DataQuery{},
-	}
+func TestParseResponse(t *testing.T) {
+	t.Run("Correctly matches refId to response", func(t *testing.T) {
+		require.NoError(t, nil)
+		query := []byte(`
+			[
+				{
+					"refId": "COUNT_GROUPBY_DATE_HISTOGRAM",
+					"metrics": [{ "type": "count", "id": "c_1" }],
+					"bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "c_2" }]
+				},
+				{
+					"refId": "COUNT_GROUPBY_HISTOGRAM",
+					"metrics": [{ "type": "count", "id": "h_3" }],
+					"bucketAggs": [{ "type": "histogram", "field": "bytes", "id": "h_4" }]
+				},
+				{
+					"refId": "RAW_DOC",
+					"metrics": [{ "type": "raw_document", "id": "r_5" }],
+					"bucketAggs": []
+				},
+				{
+					"refId": "PERCENTILE",
+					"metrics": [
+					{
+						"type": "percentiles",
+						"settings": { "percents": ["75", "90"] },
+						"id": "p_1"
+					}
+					],
+					"bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "p_3" }]
+				},
+				{
+					"refId": "EXTENDEDSTATS",
+					"metrics": [
+					{
+						"type": "extended_stats",
+						"meta": { "max": true, "std_deviation_bounds_upper": true },
+						"id": "e_1"
+					}
+					],
+					"bucketAggs": [
+					{ "type": "terms", "field": "host", "id": "e_3" },
+					{ "type": "date_histogram", "id": "e_4" }
+					]
+				},
+				{
+					"refId": "RAWDATA",
+					"metrics": [{ "type": "raw_data", "id": "6" }],
+					"bucketAggs": []
+				}
+			]
+			`)
 
-	for refID, tsdbQueryBody := range tsdbQueries {
-		tsdbQuery.Queries = append(tsdbQuery.Queries, backend.DataQuery{
-			TimeRange: timeRange,
-			RefID:     refID,
-			JSON:      json.RawMessage(tsdbQueryBody),
-		})
-	}
+		response := []byte(`
+			{
+				"responses": [
+				  {
+					"aggregations": {
+					  "c_2": {
+						"buckets": [{"doc_count": 10, "key": 1000}]
+					  }
+					}
+				  },
+				  {
+					"aggregations": {
+					  "h_4": {
+						"buckets": [{ "doc_count": 1, "key": 1000 }]
+					  }
+					}
+				  },
+				  {
+					"hits": {
+					  "total": 2,
+					  "hits": [
+						{
+						  "_id": "5",
+						  "_type": "type",
+						  "_index": "index",
+						  "_source": { "sourceProp": "asd" },
+						  "fields": { "fieldProp": "field" }
+						},
+						{
+						  "_source": { "sourceProp": "asd2" },
+						  "fields": { "fieldProp": "field2" }
+						}
+					  ]
+					}
+				  },
+				  {
+					"aggregations": {
+					  "p_3": {
+						"buckets": [
+						  {
+							"p_1": { "values": { "75": 3.3, "90": 5.5 } },
+							"doc_count": 10,
+							"key": 1000
+						  },
+						  {
+							"p_1": { "values": { "75": 2.3, "90": 4.5 } },
+							"doc_count": 15,
+							"key": 2000
+						  }
+						]
+					  }
+					}
+				  },
+				  {
+					"aggregations": {
+					  "e_3": {
+						"buckets": [
+						  {
+							"key": "server1",
+							"e_4": {
+							  "buckets": [
+								{
+								  "e_1": {
+									"max": 10.2,
+									"min": 5.5,
+									"std_deviation_bounds": { "upper": 3, "lower": -2 }
+								  },
+								  "doc_count": 10,
+								  "key": 1000
+								}
+							  ]
+							}
+						  },
+						  {
+							"key": "server2",
+							"e_4": {
+							  "buckets": [
+								{
+								  "e_1": {
+									"max": 10.2,
+									"min": 5.5,
+									"std_deviation_bounds": { "upper": 3, "lower": -2 }
+								  },
+								  "doc_count": 10,
+								  "key": 1000
+								}
+							  ]
+							}
+						  }
+						]
+					  }
+					}
+				  },
+				  {
+					"hits": {
+					  "total": {
+						"relation": "eq",
+						"value": 1
+					  },
+					  "hits": [
+						{
+						  "_id": "6",
+						  "_type": "_doc",
+						  "_index": "index",
+						  "_source": { "sourceProp": "asd" }
+						}
+					  ]
+					}
+				  }
+				]
+			  }
+			`)
 
-	var response es.MultiSearchResponse
-	err := json.Unmarshal([]byte(responseBody), &response)
-	if err != nil {
-		return nil, err
-	}
+		result, err := queryDataTest(query, response)
+		require.NoError(t, err)
 
-	queries, err := parseQuery(tsdbQuery.Queries)
-	if err != nil {
-		return nil, err
-	}
+		verifyFrames := func(name string, expectedLength int) {
+			r, found := result.response.Responses[name]
+			require.True(t, found, "not found: "+name)
+			require.NoError(t, r.Error)
+			require.Len(t, r.Frames, expectedLength, "length wrong for "+name)
+		}
 
-	return parseResponse(response.Responses, queries, configuredFields)
+		verifyFrames("COUNT_GROUPBY_DATE_HISTOGRAM", 1)
+		verifyFrames("COUNT_GROUPBY_HISTOGRAM", 1)
+		verifyFrames("RAW_DOC", 1)
+		verifyFrames("PERCENTILE", 2)
+		verifyFrames("EXTENDEDSTATS", 4)
+		verifyFrames("RAWDATA", 1)
+	})
 }
 
 func TestLabelOrderInFieldName(t *testing.T) {
@@ -1957,3 +3316,156 @@ func TestFlatten(t *testing.T) {
 		require.Equal(t, map[string]interface{}{"nested11": map[string]interface{}{"nested12": "abc"}}, flattened["nested0.nested1.nested2.nested3.nested4.nested5.nested6.nested7.nested8.nested9.nested10"])
 	})
 }
+
+func TestTrimEdges(t *testing.T) {
+	query := []byte(`
+	[
+		{
+		  "refId": "A",
+		  "metrics": [
+			{ "type": "avg", "id": "1", "field": "@value" },
+			{ "type": "count", "id": "3" }
+		  ],
+		  "bucketAggs": [
+			{
+			  "id": "2",
+			  "type": "date_histogram",
+			  "field": "host",
+			  "settings": { "trimEdges": "1" }
+			}
+		  ]
+		}
+	]
+	`)
+
+	response := []byte(`
+	{
+		"responses": [
+		  {
+			"aggregations": {
+			  "2": {
+				"buckets": [
+				  { "1": { "value": 1000 }, "key": 1, "doc_count": 369 },
+				  { "1": { "value": 2000 }, "key": 2, "doc_count": 200 },
+				  { "1": { "value": 2000 }, "key": 3, "doc_count": 200 }
+				]
+			  }
+			}
+		  }
+		]
+	}
+	`)
+
+	result, err := queryDataTest(query, response)
+	require.NoError(t, err)
+
+	require.Len(t, result.response.Responses, 1)
+	frames := result.response.Responses["A"].Frames
+	require.Len(t, frames, 2)
+
+	// should remove first and last value
+	requireFrameLength(t, frames[0], 1)
+}
+
+func parseTestResponse(tsdbQueries map[string]string, responseBody string) (*backend.QueryDataResponse, error) {
+	from := time.Date(2018, 5, 15, 17, 50, 0, 0, time.UTC)
+	to := time.Date(2018, 5, 15, 17, 55, 0, 0, time.UTC)
+	configuredFields := es.ConfiguredFields{
+		TimeField:       "@timestamp",
+		LogMessageField: "line",
+		LogLevelField:   "lvl",
+	}
+	timeRange := backend.TimeRange{
+		From: from,
+		To:   to,
+	}
+	tsdbQuery := backend.QueryDataRequest{
+		Queries: []backend.DataQuery{},
+	}
+
+	for refID, tsdbQueryBody := range tsdbQueries {
+		tsdbQuery.Queries = append(tsdbQuery.Queries, backend.DataQuery{
+			TimeRange: timeRange,
+			RefID:     refID,
+			JSON:      json.RawMessage(tsdbQueryBody),
+		})
+	}
+
+	var response es.MultiSearchResponse
+	err := json.Unmarshal([]byte(responseBody), &response)
+	if err != nil {
+		return nil, err
+	}
+
+	queries, err := parseQuery(tsdbQuery.Queries)
+	if err != nil {
+		return nil, err
+	}
+
+	return parseResponse(response.Responses, queries, configuredFields)
+}
+
+func requireTimeValue(t *testing.T, expected int64, frame *data.Frame, index int) {
+	getField := func() *data.Field {
+		for _, field := range frame.Fields {
+			if field.Type() == data.FieldTypeTime {
+				return field
+			}
+		}
+		return nil
+	}
+
+	field := getField()
+	require.NotNil(t, field, "missing time-field")
+
+	require.Equal(t, time.UnixMilli(expected).UTC(), field.At(index), fmt.Sprintf("wrong time at index %v", index))
+}
+
+func requireNumberValue(t *testing.T, expected float64, frame *data.Frame, index int) {
+	getField := func() *data.Field {
+		for _, field := range frame.Fields {
+			if field.Type() == data.FieldTypeNullableFloat64 {
+				return field
+			}
+		}
+		return nil
+	}
+
+	field := getField()
+	require.NotNil(t, field, "missing number-field")
+
+	v := field.At(index).(*float64)
+
+	require.Equal(t, expected, *v, fmt.Sprintf("wrong number at index %v", index))
+}
+
+func requireFrameLength(t *testing.T, frame *data.Frame, expectedLength int) {
+	l, err := frame.RowLen()
+	require.NoError(t, err)
+	require.Equal(t, expectedLength, l, "wrong frame-length")
+}
+
+func requireStringAt(t *testing.T, expected string, field *data.Field, index int) {
+	v := field.At(index).(*string)
+	require.Equal(t, expected, *v, fmt.Sprintf("wrong string at index %v", index))
+}
+
+func requireFloatAt(t *testing.T, expected float64, field *data.Field, index int) {
+	v := field.At(index).(*float64)
+	require.Equal(t, expected, *v, fmt.Sprintf("wrong flaot at index %v", index))
+}
+
+func requireTimeSeriesName(t *testing.T, expected string, frame *data.Frame) {
+	getField := func() *data.Field {
+		for _, field := range frame.Fields {
+			if field.Type() != data.FieldTypeTime {
+				return field
+			}
+		}
+		return nil
+	}
+
+	field := getField()
+	require.NotNil(t, expected, field.Config)
+	require.Equal(t, expected, field.Config.DisplayNameFromDS)
+}

From d7bd06a87ea73e6dddd3092465a1bdb0d4598dfa Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Wed, 26 Apr 2023 12:10:55 -0500
Subject: [PATCH 438/729] Datasources: Add documentation around secure socks
 proxy (#66609)

---------

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
---
 .../configure-grafana/proxy/index.md          | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 docs/sources/setup-grafana/configure-grafana/proxy/index.md

diff --git a/docs/sources/setup-grafana/configure-grafana/proxy/index.md b/docs/sources/setup-grafana/configure-grafana/proxy/index.md
new file mode 100644
index 00000000000..a1d973a3d82
--- /dev/null
+++ b/docs/sources/setup-grafana/configure-grafana/proxy/index.md
@@ -0,0 +1,44 @@
+---
+description: Learn about proxy datasource connections through a secure socks proxy.
+keywords:
+  - proxy
+  - guide
+  - Grafana
+title: Configure a data source connection proxy
+menuTitle: Configure data source proxy
+weight: 1110
+---
+
+# Configure a data source connection proxy
+
+Grafana provides support for proxying data source connections through a Secure Socks5 Tunnel. This enables you to securely connect to data sources hosted in a different network than Grafana.
+
+To make use of this functionality, you need to deploy a socks5 proxy server that supports TLS on a machine exposed to the public internet within the same network as your data source. From there, Grafana establishes a mutually trusted connection from Grafana to the Proxy. Then the Proxy can proxy the Grafana connection to your private server without exposing your data sources to the public internet.
+
+## Known limitations
+
+- You can configure only one socks5 proxy per Grafana instance
+- All built-in core data sources are compatible, but not all external data sources are. For a list of supported data sources, refer to [private data source connect]({{< ref "/docs/grafana-cloud/data-configuration/configure-private-datasource-connect/#known-limitations" >}}).
+
+## Before you begin
+
+To complete this task, you must first deploy a socks proxy server that supports TLS, is publicly accessible, and is hosted within the same network as the data source.
+
+## Steps
+
+1. For Grafana to send data source connections to the socks5 server, use the following table to configure the `secure_socks_datasource_proxy` section of the `config.ini`:
+
+   | Key             | Description                                | Example                         |
+   | --------------- | ------------------------------------------ | ------------------------------- |
+   | `enabled`       | Enable this feature in Grafana             | true                            |
+   | `root_ca_cert`  | The file path of the root ca cert          | /etc/ca.crt                     |
+   | `client_key`    | The file path of the client private key    | /etc/client.key                 |
+   | `client_cert`   | The file path of the client public key     | /etc/client.crt                 |
+   | `server_name`   | The domain name of the proxy, used for SNI | proxy.grafana.svc.cluster.local |
+   | `proxy_address` | the address of the proxy                   | localhost:9090                  |
+
+1. Set up a data source and configure it to send data source connections through the proxy.
+
+   To configure your data sources to send connections through the proxy, `enableSecureSocksProxy=true` must be specified in the data source json. You can do this in the [API]({{< relref "../../../developers/http_api/data_source" >}}) or use [file based provisioning]({{< relref "../../../administration/provisioning/#data-sources" >}}).
+
+   Additionally, you can set the socks5 username and password by adding `secureSocksProxyUsername` in the data source json and `secureSocksProxyPassword` in the secure data source json.

From 3fc796dfe603bc8581d631e09163a84268e9e30c Mon Sep 17 00:00:00 2001
From: Kevin Minehart <kmineh0151@gmail.com>
Date: Wed, 26 Apr 2023 13:18:03 -0500
Subject: [PATCH 439/729] Docs: Update references of `grafana-cli` to `grafana
 cli` and `grafana-server` to `grafana server`. (#66981)

* Update grafana-cli to grafana cli in relevant docs/sources

* Update relevant docs to use 'grafana server' instead of 'grafana-server'
---
 docs/sources/cli.md                           | 52 +++++++++----------
 .../configure-tracing/index.md                |  6 +--
 .../configure-database-encryption/_index.md   |  6 +--
 .../encrypt-secrets-using-aws-kms/index.md    |  2 +-
 .../index.md                                  |  2 +-
 .../index.md                                  |  2 +-
 .../index.md                                  |  2 +-
 .../installation/docker/index.md              |  2 +-
 .../setup-grafana/installation/mac/index.md   |  2 +-
 .../setup-grafana/start-restart-grafana.md    | 10 ++--
 .../shared/upgrade/upgrade-common-tasks.md    |  2 +-
 11 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/docs/sources/cli.md b/docs/sources/cli.md
index 3e030da5fc1..622b72906cd 100644
--- a/docs/sources/cli.md
+++ b/docs/sources/cli.md
@@ -1,11 +1,11 @@
 ---
 aliases:
   - administration/cli/
-description: Guide to using grafana-cli
+description: Guide to using grafana cli
 keywords:
   - grafana
   - cli
-  - grafana-cli
+  - grafana cli
   - command line interface
 title: Grafana CLI
 weight: 400
@@ -18,12 +18,12 @@ Grafana CLI is a small executable that is bundled with Grafana server. It can be
 To list all commands and options:
 
 ```
-grafana-cli -h
+grafana cli -h
 ```
 
 ## Invoking Grafana CLI
 
-To invoke Grafana CLI, add the path to the grafana binaries in your `PATH` environment variable. Alternately, if your current directory is the `bin` directory, use `./grafana-cli`. Otherwise, you can specify full path to the CLI. For example, on Linux `/usr/share/grafana/bin/grafana-cli` and on Windows `C:\Program Files\GrafanaLabs\grafana\bin\grafana-cli.exe`.
+To invoke Grafana CLI, add the path to the grafana binaries in your `PATH` environment variable. Alternately, if your current directory is the `bin` directory, use `./grafana cli`. Otherwise, you can specify full path to the CLI. For example, on Linux `/usr/share/grafana/bin/grafana` and on Windows `C:\Program Files\GrafanaLabs\grafana\bin\grafana.exe`, and invoke it with `grafana cli`.
 
 > **Note:** Some commands, such as installing or removing plugins, require `sudo` on Linux. If you are on Windows, run Windows PowerShell as Administrator.
 
@@ -32,7 +32,7 @@ To invoke Grafana CLI, add the path to the grafana binaries in your `PATH` envir
 The general syntax for commands in Grafana CLI is:
 
 ```bash
-grafana-cli [global options] command [command options] [arguments...]
+grafana cli [global options] command [command options] [arguments...]
 ```
 
 ## Global options
@@ -48,7 +48,7 @@ Each global option applies only to the command in which it is used. For example,
 **Example:**
 
 ```bash
-grafana-cli -h
+grafana cli -h
 ```
 
 ### Display Grafana CLI version
@@ -58,7 +58,7 @@ grafana-cli -h
 **Example:**
 
 ```bash
-grafana-cli -v
+grafana cli -v
 ```
 
 ### Override default plugin directory
@@ -68,7 +68,7 @@ grafana-cli -v
 **Example:**
 
 ```bash
-grafana-cli --pluginsDir "/var/lib/grafana/devplugins" plugins install <plugin-id>
+grafana cli --pluginsDir "/var/lib/grafana/devplugins" plugins install <plugin-id>
 ```
 
 ### Override default plugin repo URL
@@ -78,7 +78,7 @@ grafana-cli --pluginsDir "/var/lib/grafana/devplugins" plugins install <plugin-i
 **Example:**
 
 ```bash
-grafana-cli --repo "https://example.com/plugins" plugins install <plugin-id>
+grafana cli --repo "https://example.com/plugins" plugins install <plugin-id>
 ```
 
 ### Override default plugin .zip URL
@@ -88,7 +88,7 @@ grafana-cli --repo "https://example.com/plugins" plugins install <plugin-id>
 **Example:**
 
 ```bash
-grafana-cli --pluginUrl https://company.com/grafana/plugins/<plugin-id>-<plugin-version>.zip plugins install <plugin-id>
+grafana cli --pluginUrl https://company.com/grafana/plugins/<plugin-id>-<plugin-version>.zip plugins install <plugin-id>
 ```
 
 ### Override Transport Layer Security
@@ -100,7 +100,7 @@ grafana-cli --pluginUrl https://company.com/grafana/plugins/<plugin-id>-<plugin-
 **Example:**
 
 ```bash
-grafana-cli --insecure --pluginUrl https://company.com/grafana/plugins/<plugin-id>-<plugin-version>.zip plugins install <plugin-id>
+grafana cli --insecure --pluginUrl https://company.com/grafana/plugins/<plugin-id>-<plugin-version>.zip plugins install <plugin-id>
 ```
 
 ### Enable debug logging
@@ -110,7 +110,7 @@ grafana-cli --insecure --pluginUrl https://company.com/grafana/plugins/<plugin-i
 **Example:**
 
 ```bash
-grafana-cli --debug plugins install <plugin-id>
+grafana cli --debug plugins install <plugin-id>
 ```
 
 ### Override a configuration setting
@@ -122,7 +122,7 @@ For example, you can use it to redirect logging to another file (maybe to log pl
 **Example:**
 
 ```bash
-grafana-cli --configOverrides cfg:default.paths.log=/dev/null plugins install <plugin-id>
+grafana cli --configOverrides cfg:default.paths.log=/dev/null plugins install <plugin-id>
 ```
 
 ### Override homepath value
@@ -132,7 +132,7 @@ Sets the path for the Grafana install/home path, defaults to working directory.
 **Example:**
 
 ```bash
-grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new password>
+grafana cli --homepath "/usr/share/grafana" admin reset-admin-password <new password>
 ```
 
 ### Override config file
@@ -142,7 +142,7 @@ grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new pass
 **Example:**
 
 ```bash
-grafana-cli --config "/etc/configuration/" admin reset-admin-password mynewpassword
+grafana cli --config "/etc/configuration/" admin reset-admin-password mynewpassword
 ```
 
 ## Plugins commands
@@ -154,43 +154,43 @@ All listed commands apply to the Grafana default repositories and directories. Y
 ### List available plugins
 
 ```bash
-grafana-cli plugins list-remote
+grafana cli plugins list-remote
 ```
 
 ### Install the latest version of a plugin
 
 ```bash
-grafana-cli plugins install <plugin-id>
+grafana cli plugins install <plugin-id>
 ```
 
 ### Install a specific version of a plugin
 
 ```bash
-grafana-cli plugins install <plugin-id> <version>
+grafana cli plugins install <plugin-id> <version>
 ```
 
 ### List installed plugins
 
 ```bash
-grafana-cli plugins ls
+grafana cli plugins ls
 ```
 
 ### Update all installed plugins
 
 ```bash
-grafana-cli plugins update-all
+grafana cli plugins update-all
 ```
 
 ### Update one plugin
 
 ```bash
-grafana-cli plugins update <plugin-id>
+grafana cli plugins update <plugin-id>
 ```
 
 ### Remove one plugin
 
 ```bash
-grafana-cli plugins remove <plugin-id>
+grafana cli plugins remove <plugin-id>
 ```
 
 ## Admin commands
@@ -200,12 +200,12 @@ Admin commands are only available in Grafana 4.1 and later.
 ### Show all admin commands
 
 ```bash
-grafana-cli admin
+grafana cli admin
 ```
 
 ### Reset admin password
 
-`grafana-cli admin reset-admin-password <new password>` resets the password for the admin user using the CLI. You might need to do this if you lose the admin password.
+`grafana cli admin reset-admin-password <new password>` resets the password for the admin user using the CLI. You might need to do this if you lose the admin password.
 
 If there are two flags being used to set the homepath and the config file path, then running the command returns this error:
 
@@ -214,7 +214,7 @@ If there are two flags being used to set the homepath and the config file path,
 To correct this, use the `--homepath` global option to specify the Grafana default homepath for this command:
 
 ```bash
-grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new password>
+grafana cli --homepath "/usr/share/grafana" admin reset-admin-password <new password>
 ```
 
 If you have not lost the admin password, we recommend that you change the user password either in the User Preferences or in the Server Admin > User tab.
@@ -230,5 +230,5 @@ If you need to set the password in a script, then you can use the [Grafana User
 **Example:**
 
 ```bash
-grafana-cli admin data-migration encrypt-datasource-passwords
+grafana cli admin data-migration encrypt-datasource-passwords
 ```
diff --git a/docs/sources/setup-grafana/configure-grafana/configure-tracing/index.md b/docs/sources/setup-grafana/configure-grafana/configure-tracing/index.md
index a89c05a815f..2a1bb76614d 100644
--- a/docs/sources/setup-grafana/configure-grafana/configure-tracing/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/configure-tracing/index.md
@@ -9,7 +9,7 @@ weight: 200
 
 # Configure tracing to troubleshoot Grafana
 
-You can set up the `grafana-server` process to enable certain diagnostics when it starts. This can be helpful
+You can set up the `grafana` server process to enable certain diagnostics when it starts. This can be helpful
 when investigating certain performance problems. It's _not_ recommended to have these enabled by default.
 
 ## Turn on profiling
@@ -18,7 +18,7 @@ The `grafana-server` can be started with the arguments `-profile` to enable prof
 `-profile-port` to override the default HTTP port (`6060`) where the `pprof` debugging endpoints are available. For example:
 
 ```bash
-./grafana-server -profile -profile-addr=0.0.0.0 -profile-port=8080
+./grafana server -profile -profile-addr=0.0.0.0 -profile-port=8080
 ```
 
 Note that `pprof` debugging endpoints are served on a different port than the Grafana HTTP server.
@@ -38,7 +38,7 @@ Refer to [Go command pprof](https://golang.org/cmd/pprof/) for more information
 The `grafana-server` can be started with the arguments `-tracing` to enable tracing and `-tracing-file` to override the default trace file (`trace.out`) where trace result is written to. For example:
 
 ```bash
-./grafana-server -tracing -tracing-file=/tmp/trace.out
+./grafana server -tracing -tracing-file=/tmp/trace.out
 ```
 
 You can configure or override profiling settings using environment variables:
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/_index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/_index.md
index 354df10bdb0..5384904b7af 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/_index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/_index.md
@@ -49,19 +49,19 @@ You can re-encrypt secrets in order to:
 - Move already existing secrets' encryption forward from legacy to envelope encryption.
 - Re-encrypt secrets after a [data keys rotation](#rotate-data-keys).
 
-To re-encrypt secrets, use the [Grafana CLI]({{< relref "../../../cli/" >}}) by running the `grafana-cli admin secrets-migration re-encrypt` command or the `/encryption/reencrypt-secrets` endpoint of the Grafana [Admin API]({{< relref "../../../developers/http_api/admin/#roll-back-secrets" >}}). It's safe to run more than once, more recommended under maintenance mode.
+To re-encrypt secrets, use the [Grafana CLI]({{< relref "../../../cli/" >}}) by running the `grafana cli admin secrets-migration re-encrypt` command or the `/encryption/reencrypt-secrets` endpoint of the Grafana [Admin API]({{< relref "../../../developers/http_api/admin/#roll-back-secrets" >}}). It's safe to run more than once, more recommended under maintenance mode.
 
 ### Roll back secrets
 
 You can roll back secrets encrypted with envelope encryption to legacy encryption. This might be necessary to downgrade to Grafana versions prior to v9.0 after an unsuccessful upgrade.
 
-To roll back secrets, use the [Grafana CLI]({{< relref "../../../cli/" >}}) by running the `grafana-cli admin secrets-migration rollback` command or the `/encryption/rollback-secrets` endpoint of the Grafana [Admin API]({{< relref "../../../developers/http_api/admin/#re-encrypt-secrets" >}}). It's safe to run more than once, more recommended under maintenance mode.
+To roll back secrets, use the [Grafana CLI]({{< relref "../../../cli/" >}}) by running the `grafana cli admin secrets-migration rollback` command or the `/encryption/rollback-secrets` endpoint of the Grafana [Admin API]({{< relref "../../../developers/http_api/admin/#re-encrypt-secrets" >}}). It's safe to run more than once, more recommended under maintenance mode.
 
 ### Re-encrypt data keys
 
 You can re-encrypt data keys encrypted with a specific key encryption key (KEK). This allows you to either re-encrypt existing data keys with a new KEK version (see [KMS integration](#kms-integration) rotation) or to re-encrypt them with a completely different KEK.
 
-To re-encrypt data keys, use the [Grafana CLI]({{< relref "../../../cli/" >}}) by running the `grafana-cli admin secrets-migration re-encrypt-data-keys` command or the `/encryption/reencrypt-data-keys` endpoint of the Grafana [Admin API]({{< relref "../../../developers/http_api/admin/#re-encrypt-data-encryption-keys" >}}). It's safe to run more than once, more recommended under maintenance mode.
+To re-encrypt data keys, use the [Grafana CLI]({{< relref "../../../cli/" >}}) by running the `grafana cli admin secrets-migration re-encrypt-data-keys` command or the `/encryption/reencrypt-data-keys` endpoint of the Grafana [Admin API]({{< relref "../../../developers/http_api/admin/#re-encrypt-data-encryption-keys" >}}). It's safe to run more than once, more recommended under maintenance mode.
 
 ### Rotate data keys
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/index.md
index 126db3aca5e..699694e1142 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/index.md
@@ -75,7 +75,7 @@ You can use an encryption key from AWS Key Management Service to encrypt secrets
 
 8. (Optional) From the command line and the root directory of Grafana, re-encrypt all of the secrets within the Grafana database with the new key using the following command:
 
-   `grafana-cli admin secrets-migration re-encrypt`
+   `grafana cli admin secrets-migration re-encrypt`
 
    If you do not re-encrypt existing secrets, then they will remain encrypted by the previous encryption key. Users will still be able to access them.
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/index.md
index 23067f55776..431745e0e66 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/index.md
@@ -73,7 +73,7 @@ You can use an encryption key from Azure Key Vault to encrypt secrets in the Gra
 
 10. (Optional) From the command line and the root directory of Grafana Enterprise, re-encrypt all of the secrets within the Grafana database with the new key using the following command:
 
-    `grafana-cli admin secrets-migration re-encrypt`
+    `grafana cli admin secrets-migration re-encrypt`
 
     If you do not re-encrypt existing secrets, then they will remain encrypted by the previous encryption key. Users will still be able to access them.
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/index.md
index 4d8ae318285..325e4a72df4 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/index.md
@@ -62,7 +62,7 @@ You can use an encryption key from Google Cloud Key Management Service to encryp
 
 9. (Optional) From the command line and the root directory of Grafana Enterprise, re-encrypt all of the secrets within the Grafana database with the new key using the following command:
 
-   `grafana-cli admin secrets-migration re-encrypt`
+   `grafana cli admin secrets-migration re-encrypt`
 
    If you do not re-encrypt existing secrets, then they will remain encrypted by the previous encryption key. Users will still be able to access them.
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/index.md
index 0872fbdff35..dd5a1edb504 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/index.md
@@ -69,7 +69,7 @@ You can use an encryption key from Hashicorp Vault to encrypt secrets in the Gra
 
 8. (Optional) From the command line and the root directory of Grafana Enterprise, re-encrypt all of the secrets within the Grafana database with the new key using the following command:
 
-   `grafana-cli admin secrets-migration re-encrypt`
+   `grafana cli admin secrets-migration re-encrypt`
 
    If you do not re-encrypt existing secrets, then they will remain encrypted by the previous encryption key. Users will still be able to access them.
 
diff --git a/docs/sources/setup-grafana/installation/docker/index.md b/docs/sources/setup-grafana/installation/docker/index.md
index 9a98d0a37c6..59477b2b7da 100644
--- a/docs/sources/setup-grafana/installation/docker/index.md
+++ b/docs/sources/setup-grafana/installation/docker/index.md
@@ -80,7 +80,7 @@ You can install official and community plugins listed on the Grafana [plugins pa
 
 ### Install official and community Grafana plugins
 
-Pass the plugins you want installed to Docker with the `GF_INSTALL_PLUGINS` environment variable as a comma-separated list. This sends each plugin name to `grafana-cli plugins install ${plugin}` and installs them when Grafana starts.
+Pass the plugins you want installed to Docker with the `GF_INSTALL_PLUGINS` environment variable as a comma-separated list. This sends each plugin name to `grafana cli plugins install ${plugin}` and installs them when Grafana starts.
 
 ```bash
 docker run -d \
diff --git a/docs/sources/setup-grafana/installation/mac/index.md b/docs/sources/setup-grafana/installation/mac/index.md
index 71b8c46828c..eb5602e9bf7 100644
--- a/docs/sources/setup-grafana/installation/mac/index.md
+++ b/docs/sources/setup-grafana/installation/mac/index.md
@@ -54,7 +54,7 @@ To install Grafana on macOS using the standalone binaries, complete the followin
 1. To start Grafana service, go to the directory and run the command:
 
    ```bash
-   ./bin/grafana-server
+   ./bin/grafana server
    ```
 
 ## Next steps
diff --git a/docs/sources/setup-grafana/start-restart-grafana.md b/docs/sources/setup-grafana/start-restart-grafana.md
index 578752c109b..b74a92790af 100644
--- a/docs/sources/setup-grafana/start-restart-grafana.md
+++ b/docs/sources/setup-grafana/start-restart-grafana.md
@@ -95,12 +95,12 @@ sudo service grafana-server restart
 
 ### Start the server using the binary
 
-The `grafana-server` binary .tar.gz needs the working directory to be the root install directory where the binary and the `public` folder are located.
+The `grafana` binary .tar.gz needs the working directory to be the root install directory where the binary and the `public` folder are located.
 
 To start the Grafana server, run the following command:
 
 ```bash
-./bin/grafana-server
+./bin/grafana server
 ```
 
 ## Docker
@@ -139,9 +139,9 @@ To restart the running container, use this command:
 
 Complete the following steps to start the Grafana server on Windows:
 
-1. Execute `grafana-server.exe`, which is located in the `bin` directory.
+1. Execute `grafana.exe server`; the `grafana` binary is located in the `bin` directory.
 
-   We recommend that you run `grafana-server.exe` from the command line.
+   We recommend that you run `grafana.exe server` from the command line.
 
    If you want to run Grafana as a Windows service, you can download [NSSM](https://nssm.cc/).
 
@@ -183,7 +183,7 @@ To restart Grafana:
 1. Run the command:
 
 ```bash
-./bin/grafana-server
+./bin/grafana server
 ```
 
 ## Next steps
diff --git a/docs/sources/shared/upgrade/upgrade-common-tasks.md b/docs/sources/shared/upgrade/upgrade-common-tasks.md
index bd964412efe..45d2428a466 100644
--- a/docs/sources/shared/upgrade/upgrade-common-tasks.md
+++ b/docs/sources/shared/upgrade/upgrade-common-tasks.md
@@ -183,5 +183,5 @@ can make older plugins stop working properly.
 Run the following command to update plugins:
 
 ```bash
-grafana-cli plugins update-all
+grafana cli plugins update-all
 ```

From b71ef9b6670c18f8e93cafc5d0ac97d08818239e Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Wed, 26 Apr 2023 20:51:55 +0100
Subject: [PATCH 440/729] Alerting: Update grafana/alerting to fix #67177
 (#67324)

---
 go.mod | 2 +-
 go.sum | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 973665796c3..a950fbf387a 100644
--- a/go.mod
+++ b/go.mod
@@ -60,7 +60,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/google/wire v0.5.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32
+	github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2
 	github.com/grafana/grafana-aws-sdk v0.12.0
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
 	github.com/grafana/grafana-plugin-sdk-go v0.159.0
diff --git a/go.sum b/go.sum
index afe2f78b780..9d33a7965f4 100644
--- a/go.sum
+++ b/go.sum
@@ -1274,6 +1274,8 @@ github.com/grafana/alerting v0.0.0-20230410151633-4a7ecc241d72 h1:WuQGIUeDIyPviy
 github.com/grafana/alerting v0.0.0-20230410151633-4a7ecc241d72/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
 github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32 h1:LdPoVBj+CA5oHLeUejDzqy8/c4Fa0UfTtCcOHka0Jws=
 github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
+github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2 h1:teRmmE08bSnvyh3e+adfv/6RA1ZZdhTCmNL9Ckfm1Rk=
+github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
 github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
 github.com/grafana/cuetsy v0.1.8 h1:l0AKXfHr0clu6qPirirDzNC/W5mqq5gG7iruOVolG34=

From d80d984b527b6ff66f96ff921d8635107e9cc7d8 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Wed, 26 Apr 2023 22:21:41 +0200
Subject: [PATCH 441/729] chore: add smokescreen e2e test for all panels
 (#66230)

---
 .../panels_smokescreen.spec.ts                | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 e2e/smoke-tests-suite/panels_smokescreen.spec.ts

diff --git a/e2e/smoke-tests-suite/panels_smokescreen.spec.ts b/e2e/smoke-tests-suite/panels_smokescreen.spec.ts
new file mode 100644
index 00000000000..49a1db6687d
--- /dev/null
+++ b/e2e/smoke-tests-suite/panels_smokescreen.spec.ts
@@ -0,0 +1,45 @@
+import { e2e } from '@grafana/e2e';
+import { GrafanaBootConfig } from '@grafana/runtime';
+
+e2e.scenario({
+  describeName: 'Panels smokescreen',
+  itName: 'Tests each panel type in the panel edit view to ensure no crash',
+  addScenarioDataSource: false,
+  addScenarioDashBoard: false,
+  skipScenario: false,
+  scenario: () => {
+    e2e.flows.addDashboard();
+
+    // TODO: Try and use e2e.flows.addPanel() instead of block below
+    try {
+      e2e.components.PageToolbar.itemButton('Add panel button').should('be.visible');
+      e2e.components.PageToolbar.itemButton('Add panel button').click();
+    } catch (e) {
+      // Depending on the screen size, the "Add panel" button might be hidden
+      e2e.components.PageToolbar.item('Show more items').click();
+      e2e.components.PageToolbar.item('Add panel button').last().click();
+    }
+    e2e.pages.AddDashboard.itemButton('Add new visualization menu item').should('be.visible');
+    e2e.pages.AddDashboard.itemButton('Add new visualization menu item').click();
+
+    e2e()
+      .window()
+      .then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
+        // Loop through every panel type and ensure no crash
+        Object.entries(win.grafanaBootData.settings.panels).forEach(([_, panel]) => {
+          // TODO: Remove Flame Graph check as part of addressing #66803
+          if (!panel.hideFromList && panel.state !== 'deprecated' && panel.name !== 'Flame Graph') {
+            e2e.components.PanelEditor.toggleVizPicker().click();
+            e2e.components.PluginVisualization.item(panel.name).scrollIntoView().should('be.visible').click();
+
+            // Wait for panel to load (TODO: Better way to do this?)
+            cy.wait(500);
+
+            e2e.components.PanelEditor.toggleVizPicker().should((e) => expect(e).to.contain(panel.name));
+            // TODO: Come up with better check / better failure messaging to clearly indicate which panel failed
+            cy.contains('An unexpected error happened').should('not.exist');
+          }
+        });
+      });
+  },
+});

From 81792a8dceda28695736dc0f27663a2e7f77c74f Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:46:18 -0500
Subject: [PATCH 442/729] Timeseries: Migrate legend hideFrom (#67305)

---
 .../panel/timeseries/migrations.test.ts       | 112 +++++++++++++++++-
 .../plugins/panel/timeseries/migrations.ts    |  33 ++++++
 2 files changed, 144 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/timeseries/migrations.test.ts b/public/app/plugins/panel/timeseries/migrations.test.ts
index 03815e8aa56..4da0458f154 100644
--- a/public/app/plugins/panel/timeseries/migrations.test.ts
+++ b/public/app/plugins/panel/timeseries/migrations.test.ts
@@ -1,6 +1,6 @@
 import { cloneDeep } from 'lodash';
 
-import { PanelModel, FieldConfigSource, FieldMatcherID } from '@grafana/data';
+import { PanelModel, FieldConfigSource, FieldMatcherID, ReducerID } from '@grafana/data';
 import { TooltipDisplayMode, SortOrder } from '@grafana/schema';
 
 import { graphPanelChangedHandler } from './migrations';
@@ -144,6 +144,116 @@ describe('Graph Migrations', () => {
       panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
       expect(panel.options.legend.width).toBe(200);
     });
+
+    test('hide allZeros', () => {
+      const old = {
+        angular: {
+          legend: {
+            show: true,
+            values: false,
+            min: false,
+            max: false,
+            current: false,
+            total: false,
+            avg: false,
+            hideZero: true,
+          },
+        },
+      };
+      const panel = {} as PanelModel;
+      panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
+      expect(panel.fieldConfig.overrides).toHaveLength(1);
+      expect(panel.fieldConfig.overrides[0].matcher.options.reducer).toBe(ReducerID.allIsZero);
+      expect(panel.fieldConfig.overrides).toMatchInlineSnapshot(`
+        [
+          {
+            "matcher": {
+              "id": "byValue",
+              "options": {
+                "op": "gte",
+                "reducer": "allIsZero",
+                "value": 0,
+              },
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": true,
+                  "tooltip": true,
+                  "viz": false,
+                },
+              },
+            ],
+          },
+        ]
+      `);
+    });
+
+    test('hide allZeros allNulls', () => {
+      const old = {
+        angular: {
+          legend: {
+            show: true,
+            values: false,
+            min: false,
+            max: false,
+            current: false,
+            total: false,
+            avg: false,
+            hideEmpty: true,
+            hideZero: true,
+          },
+        },
+      };
+      const panel = {} as PanelModel;
+      panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
+      expect(panel.fieldConfig.overrides).toHaveLength(2);
+      expect(panel.fieldConfig.overrides).toMatchInlineSnapshot(`
+        [
+          {
+            "matcher": {
+              "id": "byValue",
+              "options": {
+                "op": "gte",
+                "reducer": "allIsZero",
+                "value": 0,
+              },
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": true,
+                  "tooltip": true,
+                  "viz": false,
+                },
+              },
+            ],
+          },
+          {
+            "matcher": {
+              "id": "byValue",
+              "options": {
+                "op": "gte",
+                "reducer": "allIsNull",
+                "value": 0,
+              },
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": true,
+                  "tooltip": true,
+                  "viz": false,
+                },
+              },
+            ],
+          },
+        ]
+      `);
+    });
   });
 
   describe('stacking', () => {
diff --git a/public/app/plugins/panel/timeseries/migrations.ts b/public/app/plugins/panel/timeseries/migrations.ts
index a71d4c22f4a..9f1c774a94c 100644
--- a/public/app/plugins/panel/timeseries/migrations.ts
+++ b/public/app/plugins/panel/timeseries/migrations.ts
@@ -12,6 +12,7 @@ import {
   FieldType,
   NullValueMode,
   PanelTypeChangedHandler,
+  ReducerID,
   Threshold,
   ThresholdsMode,
 } from '@grafana/data';
@@ -30,6 +31,7 @@ import {
   StackingMode,
   SortOrder,
   GraphTransform,
+  ComparisonOperation,
 } from '@grafana/schema';
 
 import { defaultGraphConfig } from './config';
@@ -350,6 +352,14 @@ export function graphToTimeseriesOptions(angular: any): { fieldConfig: FieldConf
     if (angular.legend.sideWidth) {
       options.legend.width = angular.legend.sideWidth;
     }
+
+    if (legendConfig.hideZero) {
+      overrides.push(getLegendHideFromOverride(ReducerID.allIsZero));
+    }
+
+    if (legendConfig.hideEmpty) {
+      overrides.push(getLegendHideFromOverride(ReducerID.allIsNull));
+    }
   }
 
   const tooltipConfig = angular.tooltip;
@@ -614,3 +624,26 @@ function migrateHideFrom(panel: {
     });
   }
 }
+
+function getLegendHideFromOverride(reducer: ReducerID.allIsZero | ReducerID.allIsNull) {
+  return {
+    matcher: {
+      id: FieldMatcherID.byValue,
+      options: {
+        reducer: reducer,
+        op: ComparisonOperation.GTE,
+        value: 0,
+      },
+    },
+    properties: [
+      {
+        id: 'custom.hideFrom',
+        value: {
+          tooltip: true,
+          viz: false,
+          legend: true,
+        },
+      },
+    ],
+  };
+}

From fb45cb6237b7653e78f14f780455974939380fab Mon Sep 17 00:00:00 2001
From: Andre Pereira <adrapereira@gmail.com>
Date: Wed, 26 Apr 2023 22:21:29 +0100
Subject: [PATCH 443/729] Explore: Update table min height  (#67321)

* Set table min content height to 300px

* Cleanup code that changes height of table component
---
 packages/grafana-ui/src/components/Table/Table.tsx | 13 -------------
 public/app/features/explore/TableContainer.tsx     |  3 +--
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index 20ed1419989..2f59657fbd4 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -43,7 +43,6 @@ export const Table = memo((props: Props) => {
     data,
     subData,
     height,
-    maxHeight,
     onCellFilterAdded,
     width,
     columnMinWidth = COLUMN_MIN_WIDTH,
@@ -195,18 +194,6 @@ export const Table = memo((props: Props) => {
 
   const pageSize = Math.round(listHeight / tableStyles.rowHeight) - 1;
 
-  // Make sure we have room to show the sub-table
-  const expandedIndices = Object.keys(extendedState.expanded);
-  if (expandedIndices.length) {
-    const subTablesHeight = expandedIndices.reduce((sum, index) => {
-      const subLength = subData?.find((frame) => frame.meta?.custom?.parentRowIndex === parseInt(index, 10))?.length;
-      return subLength ? sum + tableStyles.rowHeight * (subLength + 1) : sum;
-    }, 0);
-    if (listHeight < subTablesHeight) {
-      listHeight = Math.min(listHeight + subTablesHeight, maxHeight || Number.MAX_SAFE_INTEGER);
-    }
-  }
-
   useEffect(() => {
     // Don't update the page size if it is less than 1
     if (pageSize <= 0) {
diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx
index 828dbeaebf4..600c4cdd7be 100644
--- a/public/app/features/explore/TableContainer.tsx
+++ b/public/app/features/explore/TableContainer.tsx
@@ -46,7 +46,7 @@ export class TableContainer extends PureComponent<Props> {
     }
 
     // tries to estimate table height
-    return Math.max(Math.min(600, mainFrame.length * 36) + 40 + 46);
+    return Math.min(600, Math.max(mainFrame.length * 36, 300) + 40 + 46);
   }
 
   render() {
@@ -103,7 +103,6 @@ export class TableContainer extends PureComponent<Props> {
                 subData={subFrames}
                 width={innerWidth}
                 height={innerHeight}
-                maxHeight={600}
                 onCellFilterAdded={onCellFilterAdded}
               />
             ) : (

From 353e11b7719f01cb31d3349da5e6f3be4c3a5440 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Wed, 26 Apr 2023 23:34:51 +0200
Subject: [PATCH 444/729] Trend: Promote to beta (#67323)

---
 .../api/plugins/data/expectedListResp.json    | 36 +++++++++++++++++++
 public/app/plugins/panel/trend/plugin.json    |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json
index e0120dc9bae..a43dfdfadf4 100644
--- a/pkg/tests/api/plugins/data/expectedListResp.json
+++ b/pkg/tests/api/plugins/data/expectedListResp.json
@@ -1698,6 +1698,42 @@
     "signatureType": "",
     "signatureOrg": ""
   },
+  {
+    "name": "Trend",
+    "type": "panel",
+    "id": "trend",
+    "enabled": true,
+    "pinned": false,
+    "info": {
+      "author": {
+        "name": "Grafana Labs",
+        "url": "https://grafana.com"
+      },
+      "description": "Like timeseries, but when x != time",
+      "links": null,
+      "logos": {
+        "small": "public/app/plugins/panel/trend/img/trend.svg",
+        "large": "public/app/plugins/panel/trend/img/trend.svg"
+      },
+      "build": {},
+      "screenshots": null,
+      "version": "",
+      "updated": ""
+    },
+    "dependencies": {
+      "grafanaDependency": "",
+      "grafanaVersion": "*",
+      "plugins": []
+    },
+    "latestVersion": "",
+    "hasUpdate": false,
+    "defaultNavUrl": "/plugins/trend/",
+    "category": "",
+    "state": "beta",
+    "signature": "internal",
+    "signatureType": "",
+    "signatureOrg": ""
+  },
   {
     "name": "Welcome",
     "type": "panel",
diff --git a/public/app/plugins/panel/trend/plugin.json b/public/app/plugins/panel/trend/plugin.json
index 91717e503bd..0433aa43064 100644
--- a/public/app/plugins/panel/trend/plugin.json
+++ b/public/app/plugins/panel/trend/plugin.json
@@ -3,7 +3,7 @@
   "name": "Trend",
   "id": "trend",
 
-  "state": "alpha",
+  "state": "beta",
 
   "info": {
     "description": "Like timeseries, but when x != time",

From 5c4ecf7a866964daf0110a9333c6ac4997202db8 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 26 Apr 2023 15:28:54 -0700
Subject: [PATCH 445/729] Chore: Stop using ArrayVector and MutableField
 (#67333)

---
 .../src/dataframe/MutableDataFrame.ts         |  7 +++---
 .../transformations/transformers/groupBy.ts   |  3 +--
 .../prometheus/result_transformer.ts          | 22 +++++++++----------
 .../components/DatagridContextMenu.tsx        |  5 ++---
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.ts b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
index 77abfa58204..94c8a599cde 100644
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
@@ -7,6 +7,7 @@ import { FunctionalVector } from '../vector/FunctionalVector';
 
 import { guessFieldTypeFromValue, guessFieldTypeForField, toDataFrameDTO } from './processDataFrame';
 
+/** @deprecated */
 export type MutableField<T = any> = Field<T>;
 
 type MutableVectorCreator = (buffer?: any[]) => any[];
@@ -65,14 +66,14 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
     return this.first.length;
   }
 
-  addFieldFor(value: unknown, name?: string): MutableField {
+  addFieldFor(value: unknown, name?: string): Field {
     return this.addField({
       name: name || '', // Will be filled in
       type: guessFieldTypeFromValue(value),
     });
   }
 
-  addField(f: Field | FieldDTO, startLength?: number): MutableField {
+  addField(f: Field | FieldDTO, startLength?: number): Field {
     let buffer: any[] | undefined = undefined;
 
     if (f.values) {
@@ -98,7 +99,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
       name = `Field ${this.fields.length + 1}`;
     }
 
-    const field: MutableField = {
+    const field: Field = {
       ...f,
       name,
       type,
diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.ts b/packages/grafana-data/src/transformations/transformers/groupBy.ts
index 03f24ff68b6..5f990c59ec0 100644
--- a/packages/grafana-data/src/transformations/transformers/groupBy.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupBy.ts
@@ -1,6 +1,5 @@
 import { map } from 'rxjs/operators';
 
-import { MutableField } from '../../dataframe/MutableDataFrame';
 import { guessFieldTypeForField } from '../../dataframe/processDataFrame';
 import { getFieldDisplayName } from '../../field/fieldState';
 import { DataFrame, Field, FieldType } from '../../types/dataFrame';
@@ -63,7 +62,7 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
 
           // Group the values by fields and groups so we can get all values for a
           // group for a given field.
-          const valuesByGroupKey = new Map<string, Record<string, MutableField>>();
+          const valuesByGroupKey = new Map<string, Record<string, Field>>();
           for (let rowIndex = 0; rowIndex < frame.length; rowIndex++) {
             const groupKey = String(groupByFields.map((field) => field.values[rowIndex]));
             const valuesByField = valuesByGroupKey.get(groupKey) ?? {};
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index 19e63367190..f430483e8c8 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -15,7 +15,6 @@ import {
   formatLabels,
   getDisplayProcessor,
   Labels,
-  MutableField,
   PreferredVisualisationType,
   ScopedVars,
   TIME_SERIES_TIME_FIELD_NAME,
@@ -208,7 +207,7 @@ export function transformDFToTable(dfs: DataFrame[]): DataFrame[] {
     const valueText = getValueText(refIds.length, refId);
     const valueField = getValueField({ data: [], valueName: valueText });
     const timeField = getTimeField([]);
-    const labelFields: MutableField[] = [];
+    const labelFields: Field[] = [];
 
     // Fill labelsFields with labels from dataFrames
     dataFramesByRefId[refId].forEach((df) => {
@@ -329,14 +328,13 @@ export function transform(
 
   // Return early if result type is scalar
   if (prometheusResult.resultType === 'scalar') {
-    return [
-      {
-        meta: options.meta,
-        refId: options.refId,
-        length: 1,
-        fields: [getTimeField([prometheusResult.result]), getValueField({ data: [prometheusResult.result] })],
-      },
-    ];
+    const df: DataFrame = {
+      meta: options.meta,
+      refId: options.refId,
+      length: 1,
+      fields: [getTimeField([prometheusResult.result]), getValueField({ data: [prometheusResult.result] })],
+    };
+    return [df];
   }
 
   // Return early again if the format is table, this needs special transformation.
@@ -556,7 +554,7 @@ function getLabelValue(metric: PromMetric, label: string): string | number {
   return '';
 }
 
-function getTimeField(data: PromValue[], isMs = false): MutableField {
+function getTimeField(data: PromValue[], isMs = false): Field<number> {
   return {
     name: TIME_SERIES_TIME_FIELD_NAME,
     type: FieldType.time,
@@ -579,7 +577,7 @@ function getValueField({
   parseValue = true,
   labels,
   displayNameFromDS,
-}: ValueFieldOptions): MutableField {
+}: ValueFieldOptions): Field {
   return {
     name: valueName,
     type: FieldType.number,
diff --git a/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx b/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
index 2189a3a1693..648fbd45160 100644
--- a/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
+++ b/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
@@ -2,7 +2,7 @@ import { GridSelection } from '@glideapps/glide-data-grid';
 import { capitalize } from 'lodash';
 import React from 'react';
 
-import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 import { convertFieldType } from '@grafana/data/src/transformations/transformers/convertFieldType';
 import { ContextMenu, MenuGroup, MenuItem } from '@grafana/ui';
 import { MenuDivider } from '@grafana/ui/src/components/Menu/MenuDivider';
@@ -111,8 +111,7 @@ export const DatagridContextMenu = ({
           label="Clear column"
           onClick={() => {
             const field = data.fields[column];
-            field.values = new ArrayVector(field.values.toArray().map(() => null));
-
+            field.values = field.values.map(() => null);
             saveData({
               ...data,
             });

From 2beee35567e69adc2c5bd287650942cb8ecb763b Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Wed, 26 Apr 2023 21:28:58 -0500
Subject: [PATCH 446/729] Timeseries: Time regions migration (#66998)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 .betterer.results                             | 23 ++---
 e2e/various-suite/graph-auto-migrate.spec.ts  | 52 +++++++++++
 .../src/selectors/pages.ts                    |  1 +
 packages/grafana-runtime/src/config.ts        |  2 +-
 public/app/core/components/Page/Page.tsx      |  3 +-
 .../app/plugins/panel/graph/tab_display.html  |  2 +-
 .../__snapshots__/migrations.test.ts.snap     | 31 +++++++
 .../panel/timeseries/migrations.test.ts       | 45 ++++++++++
 .../plugins/panel/timeseries/migrations.ts    | 90 ++++++++++++++++++-
 9 files changed, 234 insertions(+), 15 deletions(-)
 create mode 100644 e2e/various-suite/graph-auto-migrate.spec.ts

diff --git a/.betterer.results b/.betterer.results
index 449693d7e46..e7f154cafba 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5922,20 +5922,23 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Do not use any type assertions.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
+      [0, 0, 0, "Do not use any type assertions.", "9"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Do not use any type assertions.", "11"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
+      [0, 0, 0, "Do not use any type assertions.", "13"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"]
+      [0, 0, 0, "Do not use any type assertions.", "15"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "19"]
     ],
     "public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
diff --git a/e2e/various-suite/graph-auto-migrate.spec.ts b/e2e/various-suite/graph-auto-migrate.spec.ts
new file mode 100644
index 00000000000..319ba5bec25
--- /dev/null
+++ b/e2e/various-suite/graph-auto-migrate.spec.ts
@@ -0,0 +1,52 @@
+import { e2e } from '@grafana/e2e';
+const DASHBOARD_ID = 'XMjIZPmik';
+const DASHBOARD_NAME = 'Panel Tests - Graph Time Regions';
+
+e2e.scenario({
+  describeName: 'Auto-migrate graph panel',
+  itName: 'Annotation markers exist for time regions',
+  addScenarioDataSource: false,
+  addScenarioDashBoard: false,
+  skipScenario: false,
+  scenario: () => {
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID });
+    e2e().contains(DASHBOARD_NAME).should('be.visible');
+    cy.contains('uplot-main-div').should('not.exist');
+
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { '__feature.autoMigrateOldPanels': true } });
+
+    e2e().wait(1000);
+
+    e2e.components.Panels.Panel.title('Business Hours')
+      .should('exist')
+      .within(() => {
+        e2e.pages.Dashboard.Annotations.marker().should('exist');
+      });
+
+    e2e.components.Panels.Panel.title("Sunday's 20-23")
+      .should('exist')
+      .within(() => {
+        e2e.pages.Dashboard.Annotations.marker().should('exist');
+      });
+
+    e2e.components.Panels.Panel.title('Each day of week')
+      .should('exist')
+      .within(() => {
+        e2e.pages.Dashboard.Annotations.marker().should('exist');
+      });
+
+    e2e.pages.Dashboard.wrapper().children().children('.scrollbar-view').scrollTo('bottom');
+
+    e2e.components.Panels.Panel.title('05:00')
+      .should('exist')
+      .within(() => {
+        e2e.pages.Dashboard.Annotations.marker().should('exist');
+      });
+
+    e2e.components.Panels.Panel.title('From 22:00 to 00:30 (crossing midnight)')
+      .should('exist')
+      .within(() => {
+        e2e.pages.Dashboard.Annotations.marker().should('exist');
+      });
+  },
+});
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index 95cd03e5b25..d1c611cc547 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -49,6 +49,7 @@ export const Pages = {
   },
   Dashboard: {
     url: (uid: string) => `/d/${uid}`,
+    wrapper: 'data-testid dashboard-page-wrapper',
     DashNav: {
       /**
        * @deprecated use navV2 from Grafana 8.3 instead
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index 9bcaaddc3d0..1b89e4692f8 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -237,7 +237,7 @@ function overrideFeatureTogglesFromUrl(config: GrafanaBootConfig) {
     if (key.startsWith('__feature.')) {
       const featureToggles = config.featureToggles as Record<string, boolean>;
       const featureName = key.substring(10);
-      const toggleState = value === 'true';
+      const toggleState = value === 'true' || value === ''; // browser rewrites true as ''
       if (toggleState !== featureToggles[key]) {
         featureToggles[featureName] = toggleState;
         console.log(`Setting feature toggle ${featureName} = ${toggleState}`);
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index df666b44ed9..fd4c79749d8 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -3,6 +3,7 @@ import { css, cx } from '@emotion/css';
 import React, { useLayoutEffect } from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { CustomScrollbar, useStyles2 } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 
@@ -50,7 +51,7 @@ export const Page: PageType = ({
   }, [navModel, pageNav, chrome, layout]);
 
   return (
-    <div className={cx(styles.wrapper, className)} {...otherProps}>
+    <div className={cx(styles.wrapper, className)} {...otherProps} data-testid={selectors.pages.Dashboard.wrapper}>
       {layout === PageLayoutType.Standard && (
         <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
           <div className={styles.pageInner}>
diff --git a/public/app/plugins/panel/graph/tab_display.html b/public/app/plugins/panel/graph/tab_display.html
index c8d91f352f8..959dafeabaa 100644
--- a/public/app/plugins/panel/graph/tab_display.html
+++ b/public/app/plugins/panel/graph/tab_display.html
@@ -9,7 +9,7 @@
         Migrate
       </button>
     </p>
-    <p>Some features like colored time regions and negative transforms are not supported in the new panel yet.</p>    
+    <p>Some features are not supported in the new panel yet.</p>
   </div>
 
   <gf-form-switch
diff --git a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
index 5fbc82701a1..8c4bec6a30b 100644
--- a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
+++ b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
@@ -521,6 +521,37 @@ exports[`Graph Migrations stepped line 1`] = `
 }
 `;
 
+exports[`Graph Migrations time regions should migrate 1`] = `
+{
+  "alert": undefined,
+  "datasource": {
+    "type": "datasource",
+    "uid": "gdev-testdata",
+  },
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "points",
+        "spanNulls": false,
+      },
+    },
+    "overrides": [],
+  },
+  "options": {
+    "legend": {
+      "calcs": [],
+      "displayMode": "list",
+      "placement": "bottom",
+      "showLegend": true,
+    },
+    "tooltip": {
+      "mode": "single",
+      "sort": "none",
+    },
+  },
+}
+`;
+
 exports[`Graph Migrations transforms should preserve "constant" transform 1`] = `
 {
   "defaults": {
diff --git a/public/app/plugins/panel/timeseries/migrations.test.ts b/public/app/plugins/panel/timeseries/migrations.test.ts
index 4da0458f154..a266dc53985 100644
--- a/public/app/plugins/panel/timeseries/migrations.test.ts
+++ b/public/app/plugins/panel/timeseries/migrations.test.ts
@@ -2,17 +2,32 @@ import { cloneDeep } from 'lodash';
 
 import { PanelModel, FieldConfigSource, FieldMatcherID, ReducerID } from '@grafana/data';
 import { TooltipDisplayMode, SortOrder } from '@grafana/schema';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { DashboardModel, PanelModel as PanelModelState } from 'app/features/dashboard/state';
+import { createDashboardModelFixture } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures';
+import { GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 
 import { graphPanelChangedHandler } from './migrations';
 
 describe('Graph Migrations', () => {
   let prevFieldConfig: FieldConfigSource;
+  let dashboard: DashboardModel;
 
   beforeEach(() => {
     prevFieldConfig = {
       defaults: {},
       overrides: [],
     };
+
+    dashboard = createDashboardModelFixture({
+      id: 74,
+      version: 7,
+      annotations: {},
+      links: [],
+      panels: [],
+    });
+
+    getDashboardSrv().setCurrent(dashboard);
   });
 
   it('simple bars', () => {
@@ -82,6 +97,36 @@ describe('Graph Migrations', () => {
     expect(panel.fieldConfig.overrides[1].matcher.id).toBe(FieldMatcherID.byRegexp);
   });
 
+  describe('time regions', () => {
+    test('should migrate', () => {
+      const old = {
+        angular: {
+          timeRegions: [
+            {
+              colorMode: 'red',
+              fill: true,
+              fillColor: 'rgba(234, 112, 112, 0.12)',
+              fromDayOfWeek: 1,
+              line: true,
+              lineColor: 'rgba(237, 46, 24, 0.60)',
+              op: 'time',
+            },
+          ],
+        },
+      };
+
+      const panel = { datasource: { type: 'datasource', uid: 'gdev-testdata' } } as PanelModel;
+      dashboard.panels.push(new PanelModelState(panel));
+      panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
+      expect(dashboard.panels).toHaveLength(1);
+      expect(dashboard.annotations.list).toHaveLength(2); // built-in + time region
+      expect(
+        dashboard.annotations.list.filter((annotation) => annotation.target?.queryType === GrafanaQueryType.TimeRegions)
+      ).toHaveLength(1);
+      expect(panel).toMatchSnapshot();
+    });
+  });
+
   describe('legend', () => {
     test('without values', () => {
       const old = {
diff --git a/public/app/plugins/panel/timeseries/migrations.ts b/public/app/plugins/panel/timeseries/migrations.ts
index 9f1c774a94c..c1465405a44 100644
--- a/public/app/plugins/panel/timeseries/migrations.ts
+++ b/public/app/plugins/panel/timeseries/migrations.ts
@@ -31,12 +31,19 @@ import {
   StackingMode,
   SortOrder,
   GraphTransform,
+  AnnotationQuery,
   ComparisonOperation,
 } from '@grafana/schema';
+import { TimeRegionConfig } from 'app/core/utils/timeRegions';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { GrafanaQuery, GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 
 import { defaultGraphConfig } from './config';
 import { PanelOptions } from './panelcfg.gen';
 
+let dashboardRefreshDebouncer: ReturnType<typeof setTimeout> | null = null;
+
 /**
  * This is called when the panel changes from another panel
  */
@@ -48,10 +55,25 @@ export const graphPanelChangedHandler: PanelTypeChangedHandler = (
 ) => {
   // Changing from angular/flot panel to react/uPlot
   if (prevPluginId === 'graph' && prevOptions.angular) {
-    const { fieldConfig, options } = graphToTimeseriesOptions({
+    const { fieldConfig, options, annotations } = graphToTimeseriesOptions({
       ...prevOptions.angular,
       fieldConfig: prevFieldConfig,
+      panel: panel,
     });
+
+    const dashboard = getDashboardSrv().getCurrent();
+    if (dashboard && annotations?.length > 0) {
+      dashboard.annotations.list = [...dashboard.annotations.list, ...annotations];
+
+      // Trigger a full dashboard refresh when annotations change
+      if (dashboardRefreshDebouncer == null) {
+        dashboardRefreshDebouncer = setTimeout(() => {
+          dashboardRefreshDebouncer = null;
+          getTimeSrv().refreshTimeModel();
+        });
+      }
+    }
+
     panel.fieldConfig = fieldConfig; // Mutates the incoming panel
     panel.alert = prevOptions.angular.alert;
     return options;
@@ -63,7 +85,13 @@ export const graphPanelChangedHandler: PanelTypeChangedHandler = (
   return {};
 };
 
-export function graphToTimeseriesOptions(angular: any): { fieldConfig: FieldConfigSource; options: PanelOptions } {
+export function graphToTimeseriesOptions(angular: any): {
+  fieldConfig: FieldConfigSource;
+  options: PanelOptions;
+  annotations: AnnotationQuery[];
+} {
+  let annotations: AnnotationQuery[] = [];
+
   const overrides: ConfigOverrideRule[] = angular.fieldConfig?.overrides ?? [];
   const yaxes = angular.yaxes ?? [];
   let y1 = getFieldConfigFromOldAxis(yaxes[0]);
@@ -362,6 +390,55 @@ export function graphToTimeseriesOptions(angular: any): { fieldConfig: FieldConf
     }
   }
 
+  // timeRegions migration
+  if (angular.timeRegions?.length) {
+    let regions: any[] = angular.timeRegions.map((old: GraphTimeRegionConfig, idx: number) => ({
+      name: `T${idx + 1}`,
+      color: old.colorMode !== 'custom' ? old.colorMode : old.fillColor,
+      line: old.line,
+      fill: old.fill,
+      fromDayOfWeek: old.fromDayOfWeek,
+      toDayOfWeek: old.toDayOfWeek,
+      from: old.from,
+      to: old.to,
+    }));
+
+    regions.forEach((region: GraphTimeRegionConfig, idx: number) => {
+      const anno: AnnotationQuery<GrafanaQuery> = {
+        datasource: {
+          type: 'datasource',
+          uid: 'grafana',
+        },
+        enable: true,
+        hide: true, // don't show the toggle at the top of the dashboard
+        filter: {
+          exclude: false,
+          ids: [angular.panel.id],
+        },
+        iconColor: region.fillColor ?? (region as any).color,
+        name: `T${idx + 1}`,
+        target: {
+          queryType: GrafanaQueryType.TimeRegions,
+          refId: 'Anno',
+          timeRegion: {
+            fromDayOfWeek: region.fromDayOfWeek,
+            toDayOfWeek: region.toDayOfWeek,
+            from: region.from,
+            to: region.to,
+            timezone: 'utc', // graph panel was always UTC
+          },
+        },
+      };
+
+      if (region.fill) {
+        annotations.push(anno);
+      } else if (region.line) {
+        anno.iconColor = region.lineColor ?? 'white';
+        annotations.push(anno);
+      }
+    });
+  }
+
   const tooltipConfig = angular.tooltip;
   if (tooltipConfig) {
     if (tooltipConfig.shared !== undefined) {
@@ -479,9 +556,18 @@ export function graphToTimeseriesOptions(angular: any): { fieldConfig: FieldConf
       overrides,
     },
     options,
+    annotations,
   };
 }
 
+interface GraphTimeRegionConfig extends TimeRegionConfig {
+  colorMode: string;
+  fill: boolean;
+  fillColor: string;
+  line: boolean;
+  lineColor: string;
+}
+
 function getThresholdColor(threshold: AngularThreshold): string {
   if (threshold.colorMode === 'critical') {
     return 'red';

From 61e3bbb858af9bf692bff9b0464f0f820d4804d4 Mon Sep 17 00:00:00 2001
From: Levente Balogh <balogh.levente.hu@gmail.com>
Date: Thu, 27 Apr 2023 07:18:38 +0200
Subject: [PATCH 447/729] React Router: start migrating to v6 (#66921)

Chore: add the react-router-compat package
---
 package.json                                 |  2 +
 public/app/AppWrapper.tsx                    | 31 +++++++-------
 public/app/features/plugins/plugin_loader.ts | 19 ++++++++-
 yarn.lock                                    | 43 ++++++++++++++++++++
 4 files changed, 79 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 2ac4b9dc47d..1f096332438 100644
--- a/package.json
+++ b/package.json
@@ -287,6 +287,7 @@
     "@react-stately/menu": "3.4.1",
     "@react-stately/tree": "3.3.1",
     "@reduxjs/toolkit": "1.9.3",
+    "@remix-run/router": "^1.5.0",
     "@sentry/browser": "6.19.7",
     "@sentry/types": "6.19.7",
     "@sentry/utils": "6.19.7",
@@ -384,6 +385,7 @@
     "react-resizable": "3.0.4",
     "react-responsive-carousel": "^3.2.23",
     "react-router-dom": "5.3.3",
+    "react-router-dom-v5-compat": "^6.10.0",
     "react-select": "5.7.0",
     "react-split-pane": "0.1.92",
     "react-table": "7.8.0",
diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index b126832386e..9cf0b4d0aaf 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -1,7 +1,8 @@
 import { Action, KBarProvider } from 'kbar';
 import React, { ComponentType } from 'react';
 import { Provider } from 'react-redux';
-import { Router, Route, Redirect, Switch } from 'react-router-dom';
+import { Router, Redirect, Switch, RouteComponentProps } from 'react-router-dom';
+import { CompatRouter, CompatRoute } from 'react-router-dom-v5-compat';
 
 import { config, locationService, navigationLogger, reportInteraction } from '@grafana/runtime';
 import { ErrorBoundaryAlert, GlobalStyles, ModalRoot, ModalsProvider, PortalContainer } from '@grafana/ui';
@@ -56,12 +57,12 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
     const roles = route.roles ? route.roles() : [];
 
     return (
-      <Route
+      <CompatRoute
         exact={route.exact === undefined ? true : route.exact}
         sensitive={route.sensitive === undefined ? false : route.sensitive}
         path={route.path}
         key={route.path}
-        render={(props) => {
+        render={(props: RouteComponentProps) => {
           // TODO[Router]: test this logic
           if (roles?.length) {
             if (!roles.some((r: string) => contextSrv.hasRole(r))) {
@@ -105,17 +106,19 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
                   <GlobalStyles />
                   <div className="grafana-app">
                     <Router history={locationService.getHistory()}>
-                      <AppChrome>
-                        {pageBanners.map((Banner, index) => (
-                          <Banner key={index.toString()} />
-                        ))}
-                        <AngularRoot />
-                        <AppNotificationList />
-                        {ready && this.renderRoutes()}
-                        {bodyRenderHooks.map((Hook, index) => (
-                          <Hook key={index.toString()} />
-                        ))}
-                      </AppChrome>
+                      <CompatRouter>
+                        <AppChrome>
+                          {pageBanners.map((Banner, index) => (
+                            <Banner key={index.toString()} />
+                          ))}
+                          <AngularRoot />
+                          <AppNotificationList />
+                          {ready && this.renderRoutes()}
+                          {bodyRenderHooks.map((Hook, index) => (
+                            <Hook key={index.toString()} />
+                          ))}
+                        </AppChrome>
+                      </CompatRouter>
                     </Router>
                   </div>
                   <LiveConnectionWarning />
diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts
index 05a92288f8d..6c1981f245e 100644
--- a/public/app/features/plugins/plugin_loader.ts
+++ b/public/app/features/plugins/plugin_loader.ts
@@ -8,7 +8,8 @@ import prismjs from 'prismjs';
 import react from 'react';
 import reactDom from 'react-dom';
 import * as reactRedux from 'react-redux'; // eslint-disable-line no-restricted-imports
-import * as reactRouter from 'react-router-dom';
+import * as reactRouterDom from 'react-router-dom';
+import * as reactRouterCompat from 'react-router-dom-v5-compat';
 import * as redux from 'redux';
 import * as rxjs from 'rxjs';
 import * as rxjsOperators from 'rxjs/operators';
@@ -98,7 +99,21 @@ exposeToPlugin('jquery', jquery);
 exposeToPlugin('d3', d3);
 exposeToPlugin('rxjs', rxjs);
 exposeToPlugin('rxjs/operators', rxjsOperators);
-exposeToPlugin('react-router-dom', reactRouter);
+
+// Migration - React Router v5 -> v6
+// =================================
+// Plugins that still use "react-router-dom@v5" don't depend on react-router directly, so they will not use this import.
+// (The react-router-dom@v5 that we expose for them depends on the "react-router" package internally from core.)
+//
+// Plugins that would like update to "react-router-dom@v6" will need to bundle "react-router-dom",
+// however they cannot bundle "react-router" - this would mean that we have two instances of "react-router"
+// in the app, which would casue issues. As the "react-router-dom-v5-compat" package re-exports everything from "react-router-dom@v6"
+// which then re-exports everything from "react-router@v6", we are in the lucky state to be able to expose a compatible v6 version of the router to plugins by
+// just exposing "react-router-dom-v5-compat".
+//
+// (This means that we are exposing two versions of the same package).
+exposeToPlugin('react-router', reactRouterCompat); // react-router-dom@v6, react-router@v6 (included)
+exposeToPlugin('react-router-dom', reactRouterDom); // react-router-dom@v5
 
 // Experimental modules
 exposeToPlugin('prismjs', prismjs);
diff --git a/yarn.lock b/yarn.lock
index c49e4cbe802..ecfb4884782 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6886,6 +6886,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@remix-run/router@npm:1.5.0, @remix-run/router@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "@remix-run/router@npm:1.5.0"
+  checksum: 9c510c174af1553edd1f039ba16e7e3d34e04d53b3bac18814660e31cd0c48297ea4291ff86d0736b560123ebc63ecb62fa525829181d16a8dad15270d6672d7
+  languageName: node
+  linkType: hard
+
 "@rollup/plugin-commonjs@npm:23.0.2":
   version: 23.0.2
   resolution: "@rollup/plugin-commonjs@npm:23.0.2"
@@ -20195,6 +20202,7 @@ __metadata:
     "@react-types/overlays": 3.6.4
     "@react-types/shared": 3.16.0
     "@reduxjs/toolkit": 1.9.3
+    "@remix-run/router": ^1.5.0
     "@rtsao/plugin-proposal-class-properties": 7.0.1-patch.1
     "@sentry/browser": 6.19.7
     "@sentry/types": 6.19.7
@@ -20406,6 +20414,7 @@ __metadata:
     react-resizable: 3.0.4
     react-responsive-carousel: ^3.2.23
     react-router-dom: 5.3.3
+    react-router-dom-v5-compat: ^6.10.0
     react-select: 5.7.0
     react-select-event: 5.5.1
     react-simple-compat: 1.2.3
@@ -20867,6 +20876,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"history@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "history@npm:5.3.0"
+  dependencies:
+    "@babel/runtime": ^7.7.6
+  checksum: d73c35df49d19ac172f9547d30a21a26793e83f16a78386d99583b5bf1429cc980799fcf1827eb215d31816a6600684fba9686ce78104e23bd89ec239e7c726f
+  languageName: node
+  linkType: hard
+
 "hoist-non-react-statics@npm:3.3.2, hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2":
   version: 3.3.2
   resolution: "hoist-non-react-statics@npm:3.3.2"
@@ -31201,6 +31219,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-router-dom-v5-compat@npm:^6.10.0":
+  version: 6.10.0
+  resolution: "react-router-dom-v5-compat@npm:6.10.0"
+  dependencies:
+    history: ^5.3.0
+    react-router: 6.10.0
+  peerDependencies:
+    react: ">=16.8"
+    react-dom: ">=16.8"
+    react-router-dom: 4 || 5
+  checksum: 550c91cd5e70b8b115e965c7816694d6df19e9ac7d6c12ab4d3c805f9110d1143c8a335ba89f492d5e7e8b726309f5f907b9501b4df0f17ada3bda40a42a0800
+  languageName: node
+  linkType: hard
+
 "react-router-dom@npm:5.3.3":
   version: 5.3.3
   resolution: "react-router-dom@npm:5.3.3"
@@ -31238,6 +31270,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-router@npm:6.10.0":
+  version: 6.10.0
+  resolution: "react-router@npm:6.10.0"
+  dependencies:
+    "@remix-run/router": 1.5.0
+  peerDependencies:
+    react: ">=16.8"
+  checksum: c9fce46147c04257d7d6fa1f5bbfac96c5fdd0b15f26918bd12b2e5fe9143977c5a4452272f9b85795a22e29ec105a60d0bbe036118efc52b383d163cd8829ab
+  languageName: node
+  linkType: hard
+
 "react-select-event@npm:5.5.1":
   version: 5.5.1
   resolution: "react-select-event@npm:5.5.1"

From d949aa778b2696a3ebcdd5ee06d6e75b7a10a7e1 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Thu, 27 Apr 2023 08:19:58 +0100
Subject: [PATCH 448/729] Traces: Only show filtered spans (#66986)

* Only show filtered spans

* Add & update tests
---
 .../features/explore/TraceView/TraceView.tsx  |  4 ++
 .../TraceView/TraceViewContainer.test.tsx     | 60 ++++++++++++++-----
 .../NewTracePageHeader.test.tsx               |  2 +
 .../TracePageHeader/NewTracePageHeader.tsx    |  6 ++
 .../NewTracePageSearchBar.test.tsx            |  8 +++
 .../TracePageHeader/NewTracePageSearchBar.tsx | 33 +++++++++-
 .../SpanFilters/SpanFilters.test.tsx          |  2 +
 .../SpanFilters/SpanFilters.tsx               |  6 ++
 .../TraceTimelineViewer/ListView/index.tsx    |  2 +-
 .../TraceTimelineViewer/SpanBarRow.tsx        | 11 ++--
 .../VirtualizedTraceView.tsx                  | 23 +++++--
 .../components/TraceTimelineViewer/index.tsx  |  1 +
 12 files changed, 131 insertions(+), 27 deletions(-)

diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index 1d2c655f79a..2c2049d0974 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -99,6 +99,7 @@ export function TraceView(props: Props) {
   );
   const [newTraceViewHeaderFocusedSpanIdForSearch, setNewTraceViewHeaderFocusedSpanIdForSearch] = useState('');
   const [showSpanFilters, setShowSpanFilters] = useToggle(false);
+  const [showSpanFilterMatchesOnly, setShowSpanFilterMatchesOnly] = useState(false);
   const [headerHeight, setHeaderHeight] = useState(0);
 
   const styles = useStyles2(getStyles);
@@ -163,6 +164,8 @@ export function TraceView(props: Props) {
                 setSearch={setNewTraceViewHeaderSearch}
                 showSpanFilters={showSpanFilters}
                 setShowSpanFilters={setShowSpanFilters}
+                showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
+                setShowSpanFilterMatchesOnly={setShowSpanFilterMatchesOnly}
                 focusedSpanIdForSearch={newTraceViewHeaderFocusedSpanIdForSearch}
                 setFocusedSpanIdForSearch={setNewTraceViewHeaderFocusedSpanIdForSearch}
                 spanFilterMatches={spanFilterMatches}
@@ -226,6 +229,7 @@ export function TraceView(props: Props) {
                 ? newTraceViewHeaderFocusedSpanIdForSearch
                 : props.focusedSpanIdForSearch!
             }
+            showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
             createFocusSpanLink={createFocusSpanLink}
             topOfViewRef={topOfViewRef}
             topOfViewRefType={topOfViewRefType}
diff --git a/public/app/features/explore/TraceView/TraceViewContainer.test.tsx b/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
index d061560861d..86677a298e6 100644
--- a/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
+++ b/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
@@ -1,9 +1,10 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { createRef } from 'react';
 import { Provider } from 'react-redux';
 
 import { getDefaultTimeRange, LoadingState } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { ExploreId } from 'app/types';
 
 import { configureStore } from '../../../store/configureStore';
@@ -47,37 +48,48 @@ function renderTraceViewContainer(frames = [frameOld]) {
 }
 
 describe('TraceViewContainer', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+  beforeEach(() => {
+    jest.useFakeTimers();
+    // Need to use delay: null here to work with fakeTimers
+    // see https://github.com/testing-library/user-event/issues/833
+    user = userEvent.setup({ delay: null });
+  });
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
   it('toggles children visibility', async () => {
     renderTraceViewContainer();
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(3);
-    await userEvent.click(screen.getAllByText('', { selector: 'span[data-testid="SpanTreeOffset--indentGuide"]' })[0]);
+    await user.click(screen.getAllByText('', { selector: 'span[data-testid="SpanTreeOffset--indentGuide"]' })[0]);
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(1);
 
-    await userEvent.click(screen.getAllByText('', { selector: 'span[data-testid="SpanTreeOffset--indentGuide"]' })[0]);
+    await user.click(screen.getAllByText('', { selector: 'span[data-testid="SpanTreeOffset--indentGuide"]' })[0]);
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(3);
   });
 
   it('toggles collapses and expands one level of spans', async () => {
     renderTraceViewContainer();
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(3);
-    await userEvent.click(screen.getByLabelText('Collapse +1'));
+    await user.click(screen.getByLabelText('Collapse +1'));
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(2);
-    await userEvent.click(screen.getByLabelText('Expand +1'));
+    await user.click(screen.getByLabelText('Expand +1'));
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(3);
   });
 
   it('toggles collapses and expands all levels', async () => {
     renderTraceViewContainer();
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(3);
-    await userEvent.click(screen.getByLabelText('Collapse All'));
+    await user.click(screen.getByLabelText('Collapse All'));
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(1);
-    await userEvent.click(screen.getByLabelText('Expand All'));
+    await user.click(screen.getByLabelText('Expand All'));
     expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(3);
   });
 
   it('searches for spans', async () => {
     renderTraceViewContainer();
-    await userEvent.type(screen.getByPlaceholderText('Find...'), '1ed38015486087ca');
+    await user.type(screen.getByPlaceholderText('Find...'), '1ed38015486087ca');
     expect(
       screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[0].parentElement!.className
     ).toContain('rowMatchingFilter');
@@ -85,40 +97,58 @@ describe('TraceViewContainer', () => {
 
   it('can select next/prev results', async () => {
     renderTraceViewContainer();
-    await userEvent.type(screen.getByPlaceholderText('Find...'), 'logproto');
+    await user.type(screen.getByPlaceholderText('Find...'), 'logproto');
     const nextResultButton = screen.getByRole('button', { name: 'Next results button' });
     const prevResultButton = screen.getByRole('button', { name: 'Prev results button' });
     const suffix = screen.getByLabelText('Search bar suffix');
 
-    await userEvent.click(nextResultButton);
+    await user.click(nextResultButton);
     expect(suffix.textContent).toBe('1 of 2');
     expect(
       screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[1].parentElement!.className
     ).toContain('rowFocused');
-    await userEvent.click(nextResultButton);
+    await user.click(nextResultButton);
     expect(suffix.textContent).toBe('2 of 2');
     expect(
       screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[2].parentElement!.className
     ).toContain('rowFocused');
-    await userEvent.click(nextResultButton);
+    await user.click(nextResultButton);
     expect(suffix.textContent).toBe('1 of 2');
     expect(
       screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[1].parentElement!.className
     ).toContain('rowFocused');
-    await userEvent.click(prevResultButton);
+    await user.click(prevResultButton);
     expect(suffix.textContent).toBe('2 of 2');
     expect(
       screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[2].parentElement!.className
     ).toContain('rowFocused');
-    await userEvent.click(prevResultButton);
+    await user.click(prevResultButton);
     expect(suffix.textContent).toBe('1 of 2');
     expect(
       screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[1].parentElement!.className
     ).toContain('rowFocused');
-    await userEvent.click(prevResultButton);
+    await user.click(prevResultButton);
     expect(suffix.textContent).toBe('2 of 2');
     expect(
       screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[2].parentElement!.className
     ).toContain('rowFocused');
   });
+
+  it('show matches only works as expected', async () => {
+    config.featureToggles.newTraceViewHeader = true;
+    renderTraceViewContainer();
+    const spanFiltersButton = screen.getByRole('button', { name: 'Span Filters' });
+    await user.click(spanFiltersButton);
+
+    await user.click(screen.getByLabelText('Select tag key'));
+    const tagOption = screen.getByText('http.status_code');
+    await waitFor(() => expect(tagOption).toBeInTheDocument());
+    await user.click(tagOption);
+
+    expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(3);
+    const matchesSwitch = screen.getByRole('checkbox', { name: 'Show matches only switch' });
+    expect(matchesSwitch).toBeInTheDocument();
+    await user.click(matchesSwitch);
+    expect(screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' }).length).toBe(1);
+  });
 });
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
index 64db99647b1..eec1a45a7b2 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
@@ -30,6 +30,8 @@ const setup = () => {
     setSearch: jest.fn(),
     showSpanFilters: true,
     setShowSpanFilters: jest.fn(),
+    showSpanFilterMatchesOnly: false,
+    setShowSpanFilterMatchesOnly: jest.fn(),
     spanFilterMatches: undefined,
     focusedSpanIdForSearch: '',
     setFocusedSpanIdForSearch: jest.fn(),
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
index 835ff170d6b..1e0ffdcbb9f 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
@@ -39,6 +39,8 @@ export type TracePageHeaderProps = {
   setSearch: React.Dispatch<React.SetStateAction<SearchProps>>;
   showSpanFilters: boolean;
   setShowSpanFilters: (isOpen: boolean) => void;
+  showSpanFilterMatchesOnly: boolean;
+  setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
   focusedSpanIdForSearch: string;
   setFocusedSpanIdForSearch: React.Dispatch<React.SetStateAction<string>>;
   spanFilterMatches: Set<string> | undefined;
@@ -54,6 +56,8 @@ export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
     setSearch,
     showSpanFilters,
     setShowSpanFilters,
+    showSpanFilterMatchesOnly,
+    setShowSpanFilterMatchesOnly,
     focusedSpanIdForSearch,
     setFocusedSpanIdForSearch,
     spanFilterMatches,
@@ -131,6 +135,8 @@ export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
         trace={trace}
         showSpanFilters={showSpanFilters}
         setShowSpanFilters={setShowSpanFilters}
+        showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
+        setShowSpanFilterMatchesOnly={setShowSpanFilterMatchesOnly}
         search={search}
         setSearch={setSearch}
         spanFilterMatches={spanFilterMatches}
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
index fdc550211d9..4515b0bbbeb 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
@@ -22,6 +22,8 @@ import NewTracePageSearchBar, { TracePageSearchBarProps } from './NewTracePageSe
 const defaultProps = {
   search: defaultFilters,
   setFocusedSpanIdForSearch: jest.fn(),
+  showSpanFilterMatchesOnly: false,
+  setShowSpanFilterMatchesOnly: jest.fn(),
 };
 
 describe('<NewTracePageSearchBar>', () => {
@@ -51,4 +53,10 @@ describe('<NewTracePageSearchBar>', () => {
     expect((nextResButton as HTMLButtonElement)['disabled']).toBe(false);
     expect((prevResButton as HTMLButtonElement)['disabled']).toBe(false);
   });
+
+  it('renders show span filter matches only switch', async () => {
+    render(<NewTracePageSearchBar {...(defaultProps as unknown as TracePageSearchBarProps)} />);
+    const matchesSwitch = screen.getByRole('checkbox', { name: 'Show matches only switch' });
+    expect(matchesSwitch).toBeInTheDocument();
+  });
 });
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
index c0ffd8460d3..bf0ddd18a8b 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
@@ -16,7 +16,7 @@ import { css } from '@emotion/css';
 import React, { memo, Dispatch, SetStateAction, useEffect, useMemo } from 'react';
 
 import { config, reportInteraction } from '@grafana/runtime';
-import { Button, useStyles2 } from '@grafana/ui';
+import { Button, Switch, useStyles2 } from '@grafana/ui';
 
 import { SearchProps } from '../../useSearch';
 import { convertTimeFilter } from '../utils/filter-spans';
@@ -25,6 +25,8 @@ export type TracePageSearchBarProps = {
   search: SearchProps;
   setSearch: React.Dispatch<React.SetStateAction<SearchProps>>;
   spanFilterMatches: Set<string> | undefined;
+  showSpanFilterMatchesOnly: boolean;
+  setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
   focusedSpanIdForSearch: string;
   setFocusedSpanIdForSearch: Dispatch<SetStateAction<string>>;
   datasourceType: string;
@@ -32,7 +34,16 @@ export type TracePageSearchBarProps = {
 };
 
 export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProps) {
-  const { search, spanFilterMatches, focusedSpanIdForSearch, setFocusedSpanIdForSearch, datasourceType, reset } = props;
+  const {
+    search,
+    spanFilterMatches,
+    focusedSpanIdForSearch,
+    setFocusedSpanIdForSearch,
+    datasourceType,
+    reset,
+    showSpanFilterMatchesOnly,
+    setShowSpanFilterMatchesOnly,
+  } = props;
   const styles = useStyles2(getStyles);
 
   useEffect(() => {
@@ -108,6 +119,14 @@ export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProp
             >
               Reset
             </Button>
+            <div className={styles.matchesOnly}>
+              <Switch
+                value={showSpanFilterMatchesOnly}
+                onChange={(value) => setShowSpanFilterMatchesOnly(value.currentTarget.checked ?? false)}
+                label="Show matches only switch"
+              />
+              <span onClick={() => setShowSpanFilterMatchesOnly(!showSpanFilterMatchesOnly)}>Show matches only</span>
+            </div>
           </div>
           <div className={styles.nextPrevButtons}>
             <Button
@@ -142,6 +161,16 @@ export const getStyles = () => {
     searchBar: css`
       display: inline;
     `,
+    matchesOnly: css`
+      display: inline-flex;
+      margin: 0 0 0 10px;
+      vertical-align: middle;
+
+      span {
+        cursor: pointer;
+        margin: -3px 0 0 5px;
+      }
+    `,
     buttons: css`
       display: flex;
       justify-content: flex-end;
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
index eef40e507b1..6b1e409f4ec 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
@@ -43,6 +43,8 @@ describe('SpanFilters', () => {
       trace: trace,
       showSpanFilters: true,
       setShowSpanFilters: jest.fn(),
+      showSpanFilterMatchesOnly: false,
+      setShowSpanFilterMatchesOnly: jest.fn(),
       search: search,
       setSearch: setSearch,
       spanFilterMatches: undefined,
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
index 504668a5105..029701b8fdc 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
@@ -40,6 +40,8 @@ export type SpanFilterProps = {
   setSearch: React.Dispatch<React.SetStateAction<SearchProps>>;
   showSpanFilters: boolean;
   setShowSpanFilters: (isOpen: boolean) => void;
+  showSpanFilterMatchesOnly: boolean;
+  setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
   focusedSpanIdForSearch: string;
   setFocusedSpanIdForSearch: React.Dispatch<React.SetStateAction<string>>;
   spanFilterMatches: Set<string> | undefined;
@@ -53,6 +55,8 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
     setSearch,
     showSpanFilters,
     setShowSpanFilters,
+    showSpanFilterMatchesOnly,
+    setShowSpanFilterMatchesOnly,
     focusedSpanIdForSearch,
     setFocusedSpanIdForSearch,
     spanFilterMatches,
@@ -384,6 +388,8 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
           search={search}
           setSearch={setSearch}
           spanFilterMatches={spanFilterMatches}
+          showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
+          setShowSpanFilterMatchesOnly={setShowSpanFilterMatchesOnly}
           focusedSpanIdForSearch={focusedSpanIdForSearch}
           setFocusedSpanIdForSearch={setFocusedSpanIdForSearch}
           datasourceType={datasourceType}
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
index 6eebc812134..5074163be6b 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
@@ -461,7 +461,7 @@ export default class ListView extends React.Component<TListViewProps> {
           end = dataLength - 1;
         }
       } else {
-        start = this._startIndexDrawn;
+        start = this._startIndexDrawn > dataLength - 1 ? 0 : this._startIndexDrawn;
         end = this._endIndexDrawn > dataLength - 1 ? dataLength - 1 : this._endIndexDrawn;
       }
     }
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx
index 29ad671870e..7449aae04fc 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx
@@ -38,7 +38,7 @@ const nameWrapperMatchingFilterClassName = 'nameWrapperMatchingFilter';
 const viewClassName = 'jaegerView';
 const nameColumnClassName = 'nameColumn';
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
+const getStyles = stylesFactory((theme: GrafanaTheme2, showSpanFilterMatchesOnly: boolean) => {
   const animations = {
     label: 'flash',
     flash: keyframes`
@@ -50,6 +50,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
     }
   `,
   };
+  const backgroundColor = showSpanFilterMatchesOnly ? '' : autoColor(theme, '#fffce4');
 
   return {
     nameWrapper: css`
@@ -60,7 +61,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
     `,
     nameWrapperMatchingFilter: css`
       label: nameWrapperMatchingFilter;
-      background-color: ${autoColor(theme, '#fffce4')};
+      background-color: ${backgroundColor};
     `,
     nameColumn: css`
       label: nameColumn;
@@ -164,7 +165,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
     `,
     rowMatchingFilter: css`
       label: rowMatchingFilter;
-      background-color: ${autoColor(theme, '#fffbde')};
+      // background-color: ${autoColor(theme, '#fffbde')};
       &:hover .${nameWrapperClassName} {
         background: linear-gradient(
           90deg,
@@ -297,6 +298,7 @@ export type SpanBarRowProps = {
   isDetailExpanded: boolean;
   isMatchingFilter: boolean;
   isFocused: boolean;
+  showSpanFilterMatchesOnly: boolean;
   onDetailToggled: (spanID: string) => void;
   onChildrenToggled: (spanID: string) => void;
   numTicks: number;
@@ -360,6 +362,7 @@ export class UnthemedSpanBarRow extends React.PureComponent<SpanBarRowProps> {
       isChildrenExpanded,
       isDetailExpanded,
       isMatchingFilter,
+      showSpanFilterMatchesOnly,
       isFocused,
       numTicks,
       rpc,
@@ -388,7 +391,7 @@ export class UnthemedSpanBarRow extends React.PureComponent<SpanBarRowProps> {
     const viewBounds = getViewedBounds(span.startTime, span.startTime + span.duration);
     const viewStart = viewBounds.start;
     const viewEnd = viewBounds.end;
-    const styles = getStyles(theme);
+    const styles = getStyles(theme, showSpanFilterMatchesOnly);
 
     const labelDetail = `${serviceName}::${operationName}`;
     let longLabel;
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
index 583850d4a0b..179c9d69b4d 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
@@ -113,6 +113,7 @@ type TVirtualizedTraceViewOwnProps = {
   scrollElement?: Element;
   focusedSpanId?: string;
   focusedSpanIdForSearch: string;
+  showSpanFilterMatchesOnly: boolean;
   createFocusSpanLink: (traceId: string, spanId: string) => LinkModel;
   topOfViewRef?: RefObject<HTMLDivElement>;
   topOfViewRefType?: TopOfViewRefType;
@@ -134,11 +135,17 @@ const NUM_TICKS = 5;
 function generateRowStates(
   spans: TraceSpan[] | TNil,
   childrenHiddenIDs: Set<string>,
-  detailStates: Map<string, DetailState | TNil>
+  detailStates: Map<string, DetailState | TNil>,
+  findMatchesIDs: Set<string> | TNil,
+  showSpanFilterMatchesOnly: boolean
 ): RowState[] {
   if (!spans) {
     return [];
   }
+  if (showSpanFilterMatchesOnly && findMatchesIDs) {
+    spans = spans.filter((span) => findMatchesIDs.has(span.spanID));
+  }
+
   let collapseDepth = null;
   const rowStates = [];
   for (let i = 0; i < spans.length; i++) {
@@ -185,9 +192,13 @@ function getClipping(currentViewRange: [number, number]) {
 function generateRowStatesFromTrace(
   trace: Trace | TNil,
   childrenHiddenIDs: Set<string>,
-  detailStates: Map<string, DetailState | TNil>
+  detailStates: Map<string, DetailState | TNil>,
+  findMatchesIDs: Set<string> | TNil,
+  showSpanFilterMatchesOnly: boolean
 ): RowState[] {
-  return trace ? generateRowStates(trace.spans, childrenHiddenIDs, detailStates) : [];
+  return trace
+    ? generateRowStates(trace.spans, childrenHiddenIDs, detailStates, findMatchesIDs, showSpanFilterMatchesOnly)
+    : [];
 }
 
 const memoizedGenerateRowStates = memoizeOne(generateRowStatesFromTrace);
@@ -263,8 +274,8 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
   }
 
   getRowStates(): RowState[] {
-    const { childrenHiddenIDs, detailStates, trace } = this.props;
-    return memoizedGenerateRowStates(trace, childrenHiddenIDs, detailStates);
+    const { childrenHiddenIDs, detailStates, trace, findMatchesIDs, showSpanFilterMatchesOnly } = this.props;
+    return memoizedGenerateRowStates(trace, childrenHiddenIDs, detailStates, findMatchesIDs, showSpanFilterMatchesOnly);
   }
 
   getClipping(): { left: boolean; right: boolean } {
@@ -397,6 +408,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
       createSpanLink,
       focusedSpanId,
       focusedSpanIdForSearch,
+      showSpanFilterMatchesOnly,
       theme,
       datasourceType,
     } = this.props;
@@ -451,6 +463,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
           isDetailExpanded={isDetailExpanded}
           isMatchingFilter={isMatchingFilter}
           isFocused={isFocused}
+          showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
           numTicks={NUM_TICKS}
           onDetailToggled={detailToggle}
           onChildrenToggled={childrenToggle}
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
index ca8c8b69f0d..eae81d2f1f9 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
@@ -110,6 +110,7 @@ export type TProps = TExtractUiFindFromStateReturn & {
   scrollElement?: Element;
   focusedSpanId?: string;
   focusedSpanIdForSearch: string;
+  showSpanFilterMatchesOnly: boolean;
   createFocusSpanLink: (traceId: string, spanId: string) => LinkModel;
   topOfViewRef?: RefObject<HTMLDivElement>;
   topOfViewRefType?: TopOfViewRefType;

From f8992449342dd1cfa7f97b4275809f33b5c676c8 Mon Sep 17 00:00:00 2001
From: Horst Gutmann <horst.gutmann@grafana.com>
Date: Thu, 27 Apr 2023 09:37:52 +0200
Subject: [PATCH 449/729] CI: Use new update-changelog action in
 grafana-github-actions-go (#66723)

---
 .github/workflows/update-changelog.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 2566d11cf56..7419b80796a 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -5,21 +5,23 @@ on:
       version:
         required: true
         description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
+      skip_pr:
+        required: false
+        default: "0"
+      skip_community_post:
+        required: false
+        default: "0"
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v3
-        with:
-          repository: "grafana/grafana-github-actions"
-          path: ./actions
-          ref: main
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run update changelog (manually invoked)        
-        uses: ./actions/update-changelog
+      - name: Run update changelog (manually invoked)
+        uses: grafana/grafana-github-actions-go/update-changelog@main
         with:
           token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-          metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
-          grafanabotForumKey: ${{ secrets.GRAFANABOT_FORUM_KEY }}
+          version: ${{ inputs.version }}
+          metrics_api_key: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+          community_api_key: ${{ secrets.GRAFANABOT_FORUM_KEY }}
+          community_api_username: grafanabot
+          skip_pr: ${{ inputs.skip_pr }}
+          skip_community_post: ${{ inputs.skip_community_post }}

From dd6cda15112daf1176c6168e301f7577aadad268 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 27 Apr 2023 09:12:22 +0100
Subject: [PATCH 450/729] Changelog: Updated changelog for 9.5.1 (#67353)

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0adf28c400..6f2b1a90cf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,10 @@
 <!-- 9.5.1 START -->
 
-# 9.5.1 (2023-04-24)
+# 9.5.1 (2023-04-26)
 
 ### Features and enhancements
 
-- **Chore:** Upgrade Go to 1.20.3. [#66264](https://github.com/grafana/grafana/pull/66264), [@sakjur](https://github.com/sakjur)
+- **Chore:** Upgrade Go to 1.20.3. [#66831](https://github.com/grafana/grafana/issues/66831), [@sakjur](https://github.com/sakjur)
 
 <!-- 9.5.1 END -->
 <!-- 9.5.0 START -->

From dfc99cdd19a5a46f8ac47fae81d306965304d1d5 Mon Sep 17 00:00:00 2001
From: Uwe Sommerlatt <uwe.sommerlatt@gmail.com>
Date: Thu, 27 Apr 2023 10:25:34 +0200
Subject: [PATCH 451/729] Alerting: Fix misleading status code in provisioning
 API (#67331)

Fixes #66249
---
 pkg/services/ngalert/api/api_provisioning.go      | 3 +++
 pkg/services/ngalert/api/api_provisioning_test.go | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/pkg/services/ngalert/api/api_provisioning.go b/pkg/services/ngalert/api/api_provisioning.go
index be67dc59488..3785c421d20 100644
--- a/pkg/services/ngalert/api/api_provisioning.go
+++ b/pkg/services/ngalert/api/api_provisioning.go
@@ -266,6 +266,9 @@ func (srv *ProvisioningSrv) RouteGetAlertRules(c *contextmodel.ReqContext) respo
 func (srv *ProvisioningSrv) RouteRouteGetAlertRule(c *contextmodel.ReqContext, UID string) response.Response {
 	rule, provenace, err := srv.alertRules.GetAlertRule(c.Req.Context(), c.OrgID, UID)
 	if err != nil {
+		if errors.Is(err, alerting_models.ErrAlertRuleNotFound) {
+			return response.Empty(http.StatusNotFound)
+		}
 		return ErrResp(http.StatusInternalServerError, err, "")
 	}
 	return response.JSON(http.StatusOK, ProvisionedAlertRuleFromAlertRule(rule, provenace))
diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go
index a31e4cc4ab6..4e27bdd271e 100644
--- a/pkg/services/ngalert/api/api_provisioning_test.go
+++ b/pkg/services/ngalert/api/api_provisioning_test.go
@@ -307,6 +307,14 @@ func TestProvisioningApi(t *testing.T) {
 			require.Equal(t, 404, response.Status())
 		})
 
+		t.Run("are missing, GET returns 404", func(t *testing.T) {
+			sut := createProvisioningSrvSut(t)
+			rc := createTestRequestCtx()
+			response := sut.RouteRouteGetAlertRule(&rc, "does not exist")
+
+			require.Equal(t, 404, response.Status())
+		})
+
 		t.Run("have reached the rule quota, POST returns 403", func(t *testing.T) {
 			env := createTestEnv(t)
 			quotas := provisioning.MockQuotaChecker{}

From bfe1b6880018d1e5ab5bf8e7f7ce45a4d1349a75 Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Thu, 27 Apr 2023 10:26:15 +0200
Subject: [PATCH 452/729] Plugins: Fs: Add option to access unallowed files in
 dev mode (#66492)

* Plugins: Fs: Add option to access unallowed files in dev mode

* Plugins: Fs: allow accessing unallowed files only when in dev mode

* Plugins: Fs: Add ProvideLocalFinder

* Plugins: FS: Pass whole config in NewLocalFinder()

* Plugins: FS: Add AllowListLocalFS

* Plugins: FS: Fix some tests

* Plugins: FS: Update tests

* Plugins: FS: Removed dead code

* Plugins: FS: Add tests for AllowListFS

* Plugins: FS: Update comments

* Plugins: FS: Use variadic arguments for allow list rather than map

* Plugins: FS: Remove unnecessary log

* Plugins: FS: Do not escape plugin root dir

* Fix merge conflict

* Plugins: FS: Update comments

* Plugins: FS: PR review changes

* Fix merge conflict

* Fix tests

* Cleanup

* Fix flaky test

* Changes from PR review

* Lint

* Add comment to LocalFS.Remove

* Fix Windows

* Renamed devMode to production
---
 pkg/api/plugin_resource_test.go               |   2 +-
 pkg/api/plugins_test.go                       |  14 +-
 pkg/plugins/ifaces.go                         |   2 +-
 pkg/plugins/localfiles.go                     | 224 ++++++++++++++----
 pkg/plugins/localfiles_test.go                |  95 ++++++--
 pkg/plugins/manager/fakes/fakes.go            |   4 +-
 pkg/plugins/manager/loader/finder/local.go    |  84 ++-----
 .../manager/loader/finder/local_test.go       |  85 ++++---
 pkg/plugins/manager/loader/loader_test.go     | 181 +++++---------
 .../manager/manager_integration_test.go       |   2 +-
 pkg/plugins/manager/signature/manifest.go     |  15 +-
 .../manager/signature/manifest_test.go        | 150 +++++++-----
 pkg/plugins/test_utils.go                     |  82 +++++++
 .../pluginsintegration/pluginsintegration.go  |   2 +-
 14 files changed, 576 insertions(+), 366 deletions(-)
 create mode 100644 pkg/plugins/test_utils.go

diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index a2d3c93111f..deb9373d4fa 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -66,7 +66,7 @@ func TestCallResource(t *testing.T) {
 	require.NoError(t, err)
 	reg := registry.ProvideService()
 	l := loader.ProvideService(pCfg, fakes.NewFakeLicensingService(), signature.NewUnsignedAuthorizer(pCfg),
-		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(),
+		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(pCfg), fakes.NewFakeRoleRegistry(),
 		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
 	srcs := sources.ProvideService(cfg, pCfg)
 	ps, err := store.ProvideService(reg, srcs, l)
diff --git a/pkg/api/plugins_test.go b/pkg/api/plugins_test.go
index 9dce4ff7ee9..9cf95c431d2 100644
--- a/pkg/api/plugins_test.go
+++ b/pkg/api/plugins_test.go
@@ -277,7 +277,7 @@ func Test_GetPluginAssets(t *testing.T) {
 	requestedFile := filepath.Clean(tmpFile.Name())
 
 	t.Run("Given a request for an existing plugin file", func(t *testing.T) {
-		p := createPlugin(plugins.JSONData{ID: pluginID}, plugins.External, plugins.NewLocalFS(map[string]struct{}{requestedFile: {}}, filepath.Dir(requestedFile)))
+		p := createPlugin(plugins.JSONData{ID: pluginID}, plugins.External, plugins.NewLocalFS(filepath.Dir(requestedFile)))
 		pluginRegistry := &fakes.FakePluginRegistry{
 			Store: map[string]*plugins.Plugin{
 				p.ID: p,
@@ -295,7 +295,7 @@ func Test_GetPluginAssets(t *testing.T) {
 	})
 
 	t.Run("Given a request for a relative path", func(t *testing.T) {
-		p := createPlugin(plugins.JSONData{ID: pluginID}, plugins.External, plugins.NewLocalFS(map[string]struct{}{}, ""))
+		p := createPlugin(plugins.JSONData{ID: pluginID}, plugins.External, plugins.NewFakeFS())
 		pluginRegistry := &fakes.FakePluginRegistry{
 			Store: map[string]*plugins.Plugin{
 				p.ID: p,
@@ -312,9 +312,7 @@ func Test_GetPluginAssets(t *testing.T) {
 	})
 
 	t.Run("Given a request for an existing plugin file that is not listed as a signature covered file", func(t *testing.T) {
-		p := createPlugin(plugins.JSONData{ID: pluginID}, plugins.Core, plugins.NewLocalFS(map[string]struct{}{
-			requestedFile: {},
-		}, ""))
+		p := createPlugin(plugins.JSONData{ID: pluginID}, plugins.Core, plugins.NewLocalFS(filepath.Dir(requestedFile)))
 		pluginRegistry := &fakes.FakePluginRegistry{
 			Store: map[string]*plugins.Plugin{
 				p.ID: p,
@@ -332,7 +330,7 @@ func Test_GetPluginAssets(t *testing.T) {
 	})
 
 	t.Run("Given a request for an non-existing plugin file", func(t *testing.T) {
-		p := createPlugin(plugins.JSONData{ID: pluginID}, plugins.External, plugins.NewLocalFS(map[string]struct{}{}, ""))
+		p := createPlugin(plugins.JSONData{ID: pluginID}, plugins.External, plugins.NewFakeFS())
 		service := &fakes.FakePluginRegistry{
 			Store: map[string]*plugins.Plugin{
 				p.ID: p,
@@ -625,13 +623,13 @@ func Test_PluginsList_AccessControl(t *testing.T) {
 		ID: "test-app", Type: "app", Name: "test-app",
 		Info: plugins.Info{
 			Version: "1.0.0",
-		}}, plugins.External, plugins.NewLocalFS(map[string]struct{}{}, ""))
+		}}, plugins.External, plugins.NewFakeFS())
 	p2 := createPlugin(
 		plugins.JSONData{ID: "mysql", Type: "datasource", Name: "MySQL",
 			Info: plugins.Info{
 				Author:      plugins.InfoLink{Name: "Grafana Labs", URL: "https://grafana.com"},
 				Description: "Data source for MySQL databases",
-			}}, plugins.Core, plugins.NewLocalFS(map[string]struct{}{}, ""))
+			}}, plugins.Core, plugins.NewFakeFS())
 
 	pluginRegistry := &fakes.FakePluginRegistry{
 		Store: map[string]*plugins.Plugin{
diff --git a/pkg/plugins/ifaces.go b/pkg/plugins/ifaces.go
index a4ce3c6f736..b146f32bcd5 100644
--- a/pkg/plugins/ifaces.go
+++ b/pkg/plugins/ifaces.go
@@ -55,7 +55,7 @@ type FS interface {
 	fs.FS
 
 	Base() string
-	Files() []string
+	Files() ([]string, error)
 }
 
 type FSRemover interface {
diff --git a/pkg/plugins/localfiles.go b/pkg/plugins/localfiles.go
index cb0b442f8d1..8def6dd7503 100644
--- a/pkg/plugins/localfiles.go
+++ b/pkg/plugins/localfiles.go
@@ -2,6 +2,7 @@ package plugins
 
 import (
 	"errors"
+	"fmt"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -10,78 +11,152 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
-var _ fs.FS = (*LocalFS)(nil)
+var (
+	_ fs.File = &LocalFile{}
+
+	_ FS = &LocalFS{}
+	_ FS = &StaticFS{}
+)
 
 // LocalFS is a plugins.FS that allows accessing files on the local file system.
 type LocalFS struct {
-	// m is a map of relative file paths that can be accessed on the local filesystem.
-	// The path separator must be os-specific.
-	m map[string]*LocalFile
-
-	// basePath is the basePath that will be prepended to all the files (in m map) before accessing them.
+	// basePath is the basePath that will be prepended to all the files to get their absolute path.
 	basePath string
 }
 
-// NewLocalFS returns a new LocalFS that can access the specified files in the specified base path.
-// Both the map keys and basePath should use the os-specific path separator for Open() to work properly.
-func NewLocalFS(m map[string]struct{}, basePath string) LocalFS {
-	pfs := make(map[string]*LocalFile, len(m))
-	for k := range m {
-		pfs[k] = &LocalFile{
-			path: k,
+// NewLocalFS returns a new LocalFS that can access any file in the specified base path on the filesystem.
+// basePath must use os-specific path separator for Open() to work properly.
+func NewLocalFS(basePath string) LocalFS {
+	return LocalFS{basePath: basePath}
+}
+
+// fileIsAllowed takes an absolute path to a file and an os.FileInfo for that file, and it checks if access to that
+// file is allowed or not. Access to a file is allowed if the file is in the FS's Base() directory, and if it's a
+// symbolic link it should not end up outside the plugin's directory.
+func (f LocalFS) fileIsAllowed(basePath string, absolutePath string, info os.FileInfo) (bool, error) {
+	if info.Mode()&os.ModeSymlink == os.ModeSymlink {
+		symlinkPath, err := filepath.EvalSymlinks(absolutePath)
+		if err != nil {
+			return false, err
+		}
+
+		symlink, err := os.Stat(symlinkPath)
+		if err != nil {
+			return false, err
+		}
+
+		// verify that symlinked file is within plugin directory
+		p, err := filepath.Rel(basePath, symlinkPath)
+		if err != nil {
+			return false, err
+		}
+		if p == ".." || strings.HasPrefix(p, ".."+string(filepath.Separator)) {
+			return false, fmt.Errorf("file '%s' not inside of plugin directory", p)
+		}
+
+		// skip adding symlinked directories
+		if symlink.IsDir() {
+			return false, nil
 		}
 	}
 
-	return LocalFS{
-		m:        pfs,
-		basePath: basePath,
+	// skip directories
+	if info.IsDir() {
+		return false, nil
+	}
+
+	// verify that file is within plugin directory
+	file, err := filepath.Rel(f.Base(), absolutePath)
+	if err != nil {
+		return false, err
+	}
+	if strings.HasPrefix(file, ".."+string(filepath.Separator)) {
+		return false, fmt.Errorf("file '%s' not inside of plugin directory", file)
+	}
+	return true, nil
+}
+
+// walkFunc returns a filepath.WalkFunc that accumulates absolute file paths into acc by walking over f.Base().
+// f.fileIsAllowed is used as WalkFunc, see its documentation for more information on which files are collected.
+func (f LocalFS) walkFunc(basePath string, acc map[string]struct{}) filepath.WalkFunc {
+	return func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		ok, err := f.fileIsAllowed(basePath, path, info)
+		if err != nil {
+			return err
+		}
+		if !ok {
+			return nil
+		}
+		acc[path] = struct{}{}
+		return nil
 	}
 }
 
-// Open opens the specified file on the local filesystem, and returns the corresponding fs.File.
-// If a nil error is returned, the caller should take care of closing the returned file.
+// Open opens the specified file on the local filesystem.
+// The provided name must be a relative file name that uses os-specific path separators.
+// The function returns the corresponding fs.File for accessing the file on the local filesystem.
+// If a nil error is returned, the caller should take care of calling Close() the returned fs.File.
+// If the file does not exist, ErrFileNotExist is returned.
 func (f LocalFS) Open(name string) (fs.File, error) {
 	cleanPath, err := util.CleanRelativePath(name)
 	if err != nil {
 		return nil, err
 	}
-
-	if kv, exists := f.m[filepath.Join(f.basePath, cleanPath)]; exists {
-		if kv.f != nil {
-			return kv.f, nil
-		}
-		file, err := os.Open(kv.path)
-		if err != nil {
-			if errors.Is(err, fs.ErrNotExist) {
-				return nil, ErrFileNotExist
-			}
-			return nil, ErrPluginFileRead
-		}
-		return file, nil
+	basePath := f.Base()
+	absFn := filepath.Join(basePath, cleanPath)
+	finfo, err := os.Stat(absFn)
+	if err != nil {
+		return nil, ErrFileNotExist
 	}
-	return nil, ErrFileNotExist
+	// Make sure access to the file is allowed (symlink check, etc)
+	ok, err := f.fileIsAllowed(basePath, absFn, finfo)
+	if err != nil {
+		return nil, err
+	}
+	if !ok {
+		return nil, ErrFileNotExist
+	}
+	return &LocalFile{path: absFn}, nil
 }
 
 // Base returns the base path for the LocalFS.
+// The returned string uses os-specific path separator.
 func (f LocalFS) Base() string {
 	return f.basePath
 }
 
-// Files returns a slice of all the file paths in the LocalFS relative to the base path.
-// The returned strings use the same path separator as the
-func (f LocalFS) Files() []string {
-	var files []string
-	for p := range f.m {
-		r, err := filepath.Rel(f.basePath, p)
-		if strings.Contains(r, "..") || err != nil {
+// Files returns a slice of all the relative file paths on the LocalFS.
+// The returned strings can be passed to Open() to open those files.
+// The returned strings use os-specific path separator.
+func (f LocalFS) Files() ([]string, error) {
+	// Accumulate all files into filesMap by calling f.collectFilesFunc, which will write into the accumulator.
+	// Those are absolute because filepath.Walk uses absolute file paths.
+	absFilePaths := make(map[string]struct{})
+	if err := filepath.Walk(f.basePath, f.walkFunc(f.Base(), absFilePaths)); err != nil {
+		return nil, fmt.Errorf("walk: %w", err)
+	}
+	// Convert the accumulator into a slice of relative path strings
+	relFiles := make([]string, 0, len(absFilePaths))
+	base := f.Base()
+	for fn := range absFilePaths {
+		relPath, err := filepath.Rel(base, fn)
+		if err != nil {
+			return nil, err
+		}
+		clenRelPath, err := util.CleanRelativePath(relPath)
+		if strings.Contains(clenRelPath, "..") || err != nil {
 			continue
 		}
-		files = append(files, r)
+		relFiles = append(relFiles, clenRelPath)
 	}
-
-	return files
+	return relFiles, nil
 }
 
+// Remove removes a plugin from the local filesystem by deleting all files in the folder.
+// It returns ErrUninstallInvalidPluginDir is the plugin does not contain plugin.json nor dist/plugin.json.
 func (f LocalFS) Remove() error {
 	// extra security check to ensure we only remove a directory that looks like a plugin
 	if _, err := os.Stat(filepath.Join(f.basePath, "plugin.json")); os.IsNotExist(err) {
@@ -89,11 +164,72 @@ func (f LocalFS) Remove() error {
 			return ErrUninstallInvalidPluginDir
 		}
 	}
-
 	return os.RemoveAll(f.basePath)
 }
 
-var _ fs.File = (*LocalFile)(nil)
+// staticFilesMap is a set-like map that contains files that can be accessed from a plugins.FS.
+type staticFilesMap map[string]struct{}
+
+// isAllowed returns true if the provided path is allowed.
+// path is a string accepted by an FS Open() method.
+func (a staticFilesMap) isAllowed(path string) bool {
+	_, ok := a[path]
+	return ok
+}
+
+// newStaticFilesMap creates a new staticFilesMap from a list of allowed file paths.
+func newStaticFilesMap(files ...string) staticFilesMap {
+	m := staticFilesMap(make(map[string]struct{}, len(files)))
+	for _, k := range files {
+		m[k] = struct{}{}
+	}
+	return m
+}
+
+// StaticFS wraps an FS and allows accessing only the files in the allowList.
+// This is a more secure implementation of a FS suitable for production environments.
+// The keys of the allow list must be in the same format used by the underlying FS' Open() method.
+type StaticFS struct {
+	FS
+
+	// staticFilesMap is a map of allowed paths (accepted by FS.Open())
+	staticFilesMap staticFilesMap
+}
+
+// NewStaticFS returns a new StaticFS that can access the files on an underlying FS,
+// but only if they are also specified in a static list, which is constructed when creating the object
+// by calling Files() on the underlying FS.
+func NewStaticFS(fs FS) (StaticFS, error) {
+	files, err := fs.Files()
+	if err != nil {
+		return StaticFS{}, err
+	}
+	return StaticFS{
+		FS:             fs,
+		staticFilesMap: newStaticFilesMap(files...),
+	}, nil
+}
+
+// Open checks that name is an allowed file and, if so, it returns a fs.File to access it, by calling the
+// underlying FS' Open() method.
+// If access is denied, the function returns ErrFileNotExist.
+func (f StaticFS) Open(name string) (fs.File, error) {
+	// Ensure access to the file is allowed
+	if !f.staticFilesMap.isAllowed(name) {
+		return nil, ErrFileNotExist
+	}
+	// Use the wrapped FS to access the file
+	return f.FS.Open(name)
+}
+
+// Files returns a slice of all static file paths relative to the base path.
+func (f StaticFS) Files() ([]string, error) {
+	files := make([]string, 0, len(f.staticFilesMap))
+	for fn := range f.staticFilesMap {
+		files = append(files, fn)
+	}
+	return files, nil
+}
 
 // LocalFile implements a fs.File for accessing the local filesystem.
 type LocalFile struct {
diff --git a/pkg/plugins/localfiles_test.go b/pkg/plugins/localfiles_test.go
index 86ddc6d9ec8..af523cde9b7 100644
--- a/pkg/plugins/localfiles_test.go
+++ b/pkg/plugins/localfiles_test.go
@@ -1,9 +1,11 @@
 package plugins
 
 import (
+	"errors"
 	"io"
 	"os"
 	"path/filepath"
+	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -17,14 +19,7 @@ func TestLocalFS_Remove(t *testing.T) {
 	require.NoError(t, err)
 	err = f.Close()
 	require.NoError(t, err)
-
-	fs := NewLocalFS(
-		map[string]struct{}{
-			"plugin.json": {},
-		},
-		pluginDir,
-	)
-
+	fs := NewLocalFS(pluginDir)
 	err = fs.Remove()
 	require.NoError(t, err)
 
@@ -49,12 +44,7 @@ func TestLocalFS_Remove(t *testing.T) {
 
 		pluginDir = filepath.Dir(pluginDistDir)
 
-		fs = NewLocalFS(
-			map[string]struct{}{
-				"dist/plugin.json": {},
-			},
-			pluginDir,
-		)
+		fs = NewLocalFS(pluginDir)
 
 		err = fs.Remove()
 		require.NoError(t, err)
@@ -78,12 +68,7 @@ func TestLocalFS_Remove(t *testing.T) {
 		err = f.Close()
 		require.NoError(t, err)
 
-		fs = NewLocalFS(
-			map[string]struct{}{
-				"system32/important.exe": {},
-			},
-			pluginDir,
-		)
+		fs = NewLocalFS(pluginDir)
 
 		err = fs.Remove()
 		require.ErrorIs(t, err, ErrUninstallInvalidPluginDir)
@@ -222,3 +207,73 @@ func newTempFileScenarioForTest(t *testing.T) tempFileScenario {
 	require.NoError(t, err)
 	return s
 }
+
+func createDummyTempFile(dir, fn string) (err error) {
+	f, err := os.Create(filepath.Join(dir, fn)) // nolint: gosec
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if closeErr := f.Close(); closeErr != nil && err == nil {
+			err = closeErr
+		}
+	}()
+	_, err = f.WriteString(fn)
+	return
+}
+
+func TestStaticFS(t *testing.T) {
+	tmp := t.TempDir()
+	const allowedFn, deniedFn = "allowed.txt", "denied.txt"
+	require.NoError(t, createDummyTempFile(tmp, allowedFn))
+
+	localFS := NewLocalFS(tmp)
+	staticFS, err := NewStaticFS(localFS)
+	require.NoError(t, err)
+
+	t.Run("open allowed", func(t *testing.T) {
+		f, err := staticFS.Open(allowedFn)
+		require.NoError(t, err)
+		t.Cleanup(func() { require.NoError(t, f.Close()) })
+		b, err := io.ReadAll(f)
+		require.NoError(t, err)
+		require.Equal(t, []byte(allowedFn), b)
+	})
+
+	t.Run("open denied", func(t *testing.T) {
+		// Add file after initialization
+		require.NoError(t, createDummyTempFile(tmp, deniedFn))
+
+		// StaticFS should fail
+		_, err := staticFS.Open(deniedFn)
+		require.True(t, errors.Is(err, ErrFileNotExist))
+
+		// Underlying FS should succeed
+		f, err := localFS.Open(deniedFn)
+		require.NoError(t, err)
+		t.Cleanup(func() { require.NoError(t, f.Close()) })
+		b, err := io.ReadAll(f)
+		require.NoError(t, err)
+		require.Equal(t, []byte("denied.txt"), b)
+	})
+
+	t.Run("open not existing", func(t *testing.T) {
+		_, err := staticFS.Open("unknown.txt")
+		require.True(t, errors.Is(err, ErrFileNotExist))
+	})
+
+	t.Run("list files", func(t *testing.T) {
+		t.Run("underlying fs has extra files", func(t *testing.T) {
+			files, err := localFS.Files()
+			require.NoError(t, err)
+			sort.Strings(files)
+			require.Equal(t, []string{allowedFn, deniedFn}, files)
+		})
+
+		t.Run("staticfs filters underelying fs's files", func(t *testing.T) {
+			files, err := staticFS.Files()
+			require.NoError(t, err)
+			require.Equal(t, []string{allowedFn}, files)
+		})
+	})
+}
diff --git a/pkg/plugins/manager/fakes/fakes.go b/pkg/plugins/manager/fakes/fakes.go
index 51cea698f6a..73585979579 100644
--- a/pkg/plugins/manager/fakes/fakes.go
+++ b/pkg/plugins/manager/fakes/fakes.go
@@ -364,8 +364,8 @@ func (f *FakePluginFiles) Base() string {
 	return f.base
 }
 
-func (f *FakePluginFiles) Files() []string {
-	return []string{}
+func (f *FakePluginFiles) Files() ([]string, error) {
+	return []string{}, nil
 }
 
 func (f *FakePluginFiles) Remove() error {
diff --git a/pkg/plugins/manager/loader/finder/local.go b/pkg/plugins/manager/loader/finder/local.go
index 30752497e09..a3217697a60 100644
--- a/pkg/plugins/manager/loader/finder/local.go
+++ b/pkg/plugins/manager/loader/finder/local.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/fs"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -24,15 +25,21 @@ var (
 )
 
 type Local struct {
-	log log.Logger
+	log        log.Logger
+	production bool
 }
 
-func NewLocalFinder() *Local {
+func NewLocalFinder(cfg *config.Cfg) *Local {
 	return &Local{
-		log: log.New("local.finder"),
+		production: !cfg.DevMode,
+		log:        log.New("local.finder"),
 	}
 }
 
+func ProvideLocalFinder(cfg *config.Cfg) *Local {
+	return NewLocalFinder(cfg)
+}
+
 func (l *Local) Find(ctx context.Context, src plugins.PluginSource) ([]*plugins.FoundBundle, error) {
 	if len(src.PluginURIs(ctx)) == 0 {
 		return []*plugins.FoundBundle{}, nil
@@ -81,15 +88,21 @@ func (l *Local) Find(ctx context.Context, src plugins.PluginSource) ([]*plugins.
 
 	var res = make(map[string]*plugins.FoundBundle)
 	for pluginDir, data := range foundPlugins {
-		files, err := collectFilesWithin(pluginDir)
-		if err != nil {
-			return nil, err
+		var pluginFs plugins.FS
+		pluginFs = plugins.NewLocalFS(pluginDir)
+		if l.production {
+			// In prod, tighten up security by allowing access only to the files present up to this point.
+			// Any new file "sneaked in" won't be allowed and will acts as if the file did not exist.
+			var err error
+			pluginFs, err = plugins.NewStaticFS(pluginFs)
+			if err != nil {
+				return nil, err
+			}
 		}
-
 		res[pluginDir] = &plugins.FoundBundle{
 			Primary: plugins.FoundPlugin{
 				JSONData: data,
-				FS:       plugins.NewLocalFS(files, pluginDir),
+				FS:       pluginFs,
 			},
 		}
 	}
@@ -190,61 +203,6 @@ func (l *Local) getAbsPluginJSONPaths(path string) ([]string, error) {
 	return pluginJSONPaths, nil
 }
 
-func collectFilesWithin(dir string) (map[string]struct{}, error) {
-	files := map[string]struct{}{}
-	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if info.Mode()&os.ModeSymlink == os.ModeSymlink {
-			symlinkPath, err := filepath.EvalSymlinks(path)
-			if err != nil {
-				return err
-			}
-
-			symlink, err := os.Stat(symlinkPath)
-			if err != nil {
-				return err
-			}
-
-			// verify that symlinked file is within plugin directory
-			p, err := filepath.Rel(dir, symlinkPath)
-			if err != nil {
-				return err
-			}
-			if p == ".." || strings.HasPrefix(p, ".."+string(filepath.Separator)) {
-				return fmt.Errorf("file '%s' not inside of plugin directory", p)
-			}
-
-			// skip adding symlinked directories
-			if symlink.IsDir() {
-				return nil
-			}
-		}
-
-		// skip directories
-		if info.IsDir() {
-			return nil
-		}
-
-		// verify that file is within plugin directory
-		file, err := filepath.Rel(dir, path)
-		if err != nil {
-			return err
-		}
-		if strings.HasPrefix(file, ".."+string(filepath.Separator)) {
-			return fmt.Errorf("file '%s' not inside of plugin directory", file)
-		}
-
-		files[path] = struct{}{}
-
-		return nil
-	})
-
-	return files, err
-}
-
 func (l *Local) readFile(pluginJSONPath string) (io.ReadCloser, error) {
 	l.log.Debug("Loading plugin", "path", pluginJSONPath)
 
diff --git a/pkg/plugins/manager/loader/finder/local_test.go b/pkg/plugins/manager/loader/finder/local_test.go
index f1d240da749..e6b4f031e46 100644
--- a/pkg/plugins/manager/loader/finder/local_test.go
+++ b/pkg/plugins/manager/loader/finder/local_test.go
@@ -14,7 +14,10 @@ import (
 
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -23,6 +26,11 @@ func TestFinder_Find(t *testing.T) {
 	if err != nil {
 		require.NoError(t, err)
 	}
+
+	cfg := setting.NewCfg()
+	pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg, featuremgmt.WithFeatures())
+	require.NoError(t, err)
+
 	testCases := []struct {
 		name            string
 		pluginDirs      []string
@@ -55,10 +63,7 @@ func TestFinder_Find(t *testing.T) {
 							Backend:    true,
 							Executable: "test",
 						},
-						FS: plugins.NewLocalFS(map[string]struct{}{
-							filepath.Join(testData, "valid-v2-signature/plugin/plugin.json"):  {},
-							filepath.Join(testData, "valid-v2-signature/plugin/MANIFEST.txt"): {},
-						}, filepath.Join(testData, "valid-v2-signature/plugin")),
+						FS: mustNewStaticFSForTests(t, filepath.Join(testData, "valid-v2-signature/plugin")),
 					},
 				},
 			},
@@ -87,12 +92,7 @@ func TestFinder_Find(t *testing.T) {
 								Plugins:        []plugins.Dependency{},
 							},
 						},
-						FS: plugins.NewLocalFS(map[string]struct{}{
-							filepath.Join(testData, "duplicate-plugins/nested/plugin.json"):         {},
-							filepath.Join(testData, "duplicate-plugins/nested/MANIFEST.txt"):        {},
-							filepath.Join(testData, "duplicate-plugins/nested/nested/plugin.json"):  {},
-							filepath.Join(testData, "duplicate-plugins/nested/nested/MANIFEST.txt"): {},
-						}, filepath.Join(testData, "duplicate-plugins/nested")),
+						FS: mustNewStaticFSForTests(t, filepath.Join(testData, "duplicate-plugins/nested")),
 					},
 					Children: []*plugins.FoundPlugin{
 						{
@@ -114,10 +114,7 @@ func TestFinder_Find(t *testing.T) {
 									Plugins:        []plugins.Dependency{},
 								},
 							},
-							FS: plugins.NewLocalFS(map[string]struct{}{
-								filepath.Join(testData, "duplicate-plugins/nested/nested/plugin.json"):  {},
-								filepath.Join(testData, "duplicate-plugins/nested/nested/MANIFEST.txt"): {},
-							}, filepath.Join(testData, "duplicate-plugins/nested/nested")),
+							FS: mustNewStaticFSForTests(t, filepath.Join(testData, "duplicate-plugins/nested/nested")),
 						},
 					},
 				},
@@ -178,14 +175,7 @@ func TestFinder_Find(t *testing.T) {
 								{Name: "Nginx Datasource", Type: "datasource", Role: "Viewer"},
 							},
 						},
-						FS: plugins.NewLocalFS(map[string]struct{}{
-							filepath.Join(testData, "includes-symlinks/MANIFEST.txt"):                 {},
-							filepath.Join(testData, "includes-symlinks/dashboards/connections.json"):  {},
-							filepath.Join(testData, "includes-symlinks/dashboards/extra/memory.json"): {},
-							filepath.Join(testData, "includes-symlinks/plugin.json"):                  {},
-							filepath.Join(testData, "includes-symlinks/symlink_to_txt"):               {},
-							filepath.Join(testData, "includes-symlinks/text.txt"):                     {},
-						}, filepath.Join(testData, "includes-symlinks")),
+						FS: mustNewStaticFSForTests(t, filepath.Join(testData, "includes-symlinks")),
 					},
 				},
 			},
@@ -213,12 +203,7 @@ func TestFinder_Find(t *testing.T) {
 							Plugins:        []plugins.Dependency{},
 						},
 					},
-					FS: plugins.NewLocalFS(map[string]struct{}{
-						filepath.Join(testData, "duplicate-plugins/nested/plugin.json"):         {},
-						filepath.Join(testData, "duplicate-plugins/nested/MANIFEST.txt"):        {},
-						filepath.Join(testData, "duplicate-plugins/nested/nested/plugin.json"):  {},
-						filepath.Join(testData, "duplicate-plugins/nested/nested/MANIFEST.txt"): {},
-					}, filepath.Join(testData, "duplicate-plugins/nested")),
+					FS: mustNewStaticFSForTests(t, filepath.Join(testData, "duplicate-plugins/nested")),
 				},
 				Children: []*plugins.FoundPlugin{
 					{
@@ -240,10 +225,7 @@ func TestFinder_Find(t *testing.T) {
 								Plugins:        []plugins.Dependency{},
 							},
 						},
-						FS: plugins.NewLocalFS(map[string]struct{}{
-							filepath.Join(testData, "duplicate-plugins/nested/nested/plugin.json"):  {},
-							filepath.Join(testData, "duplicate-plugins/nested/nested/MANIFEST.txt"): {},
-						}, filepath.Join(testData, "duplicate-plugins/nested/nested")),
+						FS: mustNewStaticFSForTests(t, filepath.Join(testData, "duplicate-plugins/nested/nested")),
 					},
 				},
 			},
@@ -267,10 +249,7 @@ func TestFinder_Find(t *testing.T) {
 							State:   plugins.AlphaRelease,
 							Backend: true,
 						},
-						FS: plugins.NewLocalFS(map[string]struct{}{
-							filepath.Join(testData, "invalid-v1-signature/plugin/plugin.json"):  {},
-							filepath.Join(testData, "invalid-v1-signature/plugin/MANIFEST.txt"): {},
-						}, filepath.Join(testData, "invalid-v1-signature/plugin")),
+						FS: mustNewStaticFSForTests(t, filepath.Join(testData, "invalid-v1-signature/plugin")),
 					},
 				},
 			},
@@ -278,7 +257,7 @@ func TestFinder_Find(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			f := NewLocalFinder()
+			f := NewLocalFinder(pCfg)
 			pluginBundles, err := f.Find(context.Background(), &fakes.FakePluginSource{
 				PluginURIsFunc: func(ctx context.Context) []string {
 					return tc.pluginDirs
@@ -294,14 +273,18 @@ func TestFinder_Find(t *testing.T) {
 				return pluginBundles[i].Primary.JSONData.ID < pluginBundles[j].Primary.JSONData.ID
 			})
 
-			if !cmp.Equal(pluginBundles, tc.expectedBundles, localFSComparer) {
-				t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(pluginBundles, tc.expectedBundles, localFSComparer))
+			if !cmp.Equal(pluginBundles, tc.expectedBundles, fsComparer) {
+				t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(pluginBundles, tc.expectedBundles, fsComparer))
 			}
 		})
 	}
 }
 
 func TestFinder_getAbsPluginJSONPaths(t *testing.T) {
+	cfg := setting.NewCfg()
+	pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg, featuremgmt.WithFeatures())
+	require.NoError(t, err)
+
 	t.Run("When scanning a folder that doesn't exists shouldn't return an error", func(t *testing.T) {
 		origWalk := walk
 		walk = func(path string, followSymlinks, detectSymlinkInfiniteLoop bool, walkFn util.WalkFunc) error {
@@ -311,7 +294,7 @@ func TestFinder_getAbsPluginJSONPaths(t *testing.T) {
 			walk = origWalk
 		})
 
-		finder := NewLocalFinder()
+		finder := NewLocalFinder(pCfg)
 		paths, err := finder.getAbsPluginJSONPaths("test")
 		require.NoError(t, err)
 		require.Empty(t, paths)
@@ -326,7 +309,7 @@ func TestFinder_getAbsPluginJSONPaths(t *testing.T) {
 			walk = origWalk
 		})
 
-		finder := NewLocalFinder()
+		finder := NewLocalFinder(pCfg)
 		paths, err := finder.getAbsPluginJSONPaths("test")
 		require.NoError(t, err)
 		require.Empty(t, paths)
@@ -341,7 +324,7 @@ func TestFinder_getAbsPluginJSONPaths(t *testing.T) {
 			walk = origWalk
 		})
 
-		finder := NewLocalFinder()
+		finder := NewLocalFinder(pCfg)
 		paths, err := finder.getAbsPluginJSONPaths("test")
 		require.Error(t, err)
 		require.Empty(t, paths)
@@ -469,9 +452,15 @@ func TestFinder_readPluginJSON(t *testing.T) {
 	}
 }
 
-var localFSComparer = cmp.Comparer(func(fs1 plugins.LocalFS, fs2 plugins.LocalFS) bool {
-	fs1Files := fs1.Files()
-	fs2Files := fs2.Files()
+var fsComparer = cmp.Comparer(func(fs1 plugins.FS, fs2 plugins.FS) bool {
+	fs1Files, err := fs1.Files()
+	if err != nil {
+		panic(err)
+	}
+	fs2Files, err := fs2.Files()
+	if err != nil {
+		panic(err)
+	}
 
 	sort.SliceStable(fs1Files, func(i, j int) bool {
 		return fs1Files[i] < fs1Files[j]
@@ -483,3 +472,9 @@ var localFSComparer = cmp.Comparer(func(fs1 plugins.LocalFS, fs2 plugins.LocalFS
 
 	return cmp.Equal(fs1Files, fs2Files) && fs1.Base() == fs2.Base()
 })
+
+func mustNewStaticFSForTests(t *testing.T, dir string) plugins.FS {
+	sfs, err := plugins.NewStaticFS(plugins.NewLocalFS(dir))
+	require.NoError(t, err)
+	return sfs
+}
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index 0fa139bd86b..e96b6291313 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -3,7 +3,6 @@ package loader
 import (
 	"context"
 	"fmt"
-	"os"
 	"path/filepath"
 	"sort"
 	"testing"
@@ -28,13 +27,18 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-var compareOpts = []cmp.Option{cmpopts.IgnoreFields(plugins.Plugin{}, "client", "log"), localFSComparer}
+var compareOpts = []cmp.Option{cmpopts.IgnoreFields(plugins.Plugin{}, "client", "log"), fsComparer}
 
-var localFSComparer = cmp.Comparer(func(fs1 plugins.LocalFS, fs2 plugins.LocalFS) bool {
-	fs1Files := fs1.Files()
-	fs2Files := fs2.Files()
+var fsComparer = cmp.Comparer(func(fs1 plugins.FS, fs2 plugins.FS) bool {
+	fs1Files, err := fs1.Files()
+	if err != nil {
+		panic(err)
+	}
+	fs2Files, err := fs2.Files()
+	if err != nil {
+		panic(err)
+	}
 
-	finder.NewLocalFinder()
 	sort.SliceStable(fs1Files, func(i, j int) bool {
 		return fs1Files[i] < fs1Files[j]
 	})
@@ -108,9 +112,8 @@ func TestLoader_Load(t *testing.T) {
 					},
 					Module:  "app/plugins/datasource/cloudwatch/module",
 					BaseURL: "public/app/plugins/datasource/cloudwatch",
-					FS: plugins.NewLocalFS(
-						filesInDir(t, filepath.Join(corePluginDir, "app/plugins/datasource/cloudwatch")),
-						filepath.Join(corePluginDir, "app/plugins/datasource/cloudwatch")),
+
+					FS:        mustNewStaticFSForTests(t, filepath.Join(corePluginDir, "app/plugins/datasource/cloudwatch")),
 					Signature: plugins.SignatureInternal,
 					Class:     plugins.Core,
 				},
@@ -147,12 +150,9 @@ func TestLoader_Load(t *testing.T) {
 						Backend:    true,
 						State:      "alpha",
 					},
-					Module:  "plugins/test-datasource/module",
-					BaseURL: "public/plugins/test-datasource",
-					FS: plugins.NewLocalFS(
-						filesInDir(t, filepath.Join(parentDir, "testdata/valid-v2-signature/plugin/")),
-						filepath.Join(parentDir, "testdata/valid-v2-signature/plugin/"),
-					),
+					Module:        "plugins/test-datasource/module",
+					BaseURL:       "public/plugins/test-datasource",
+					FS:            mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/valid-v2-signature/plugin/")),
 					Signature:     "valid",
 					SignatureType: plugins.GrafanaSignature,
 					SignatureOrg:  "Grafana Labs",
@@ -226,20 +226,10 @@ func TestLoader_Load(t *testing.T) {
 							},
 						},
 					},
-					Class:   plugins.External,
-					Module:  "plugins/test-app/module",
-					BaseURL: "public/plugins/test-app",
-					FS: plugins.NewLocalFS(
-						map[string]struct{}{
-							filepath.Join(parentDir, "testdata/includes-symlinks", "/MANIFEST.txt"):                {},
-							filepath.Join(parentDir, "testdata/includes-symlinks", "dashboards/connections.json"):  {},
-							filepath.Join(parentDir, "testdata/includes-symlinks", "dashboards/extra/memory.json"): {},
-							filepath.Join(parentDir, "testdata/includes-symlinks", "plugin.json"):                  {},
-							filepath.Join(parentDir, "testdata/includes-symlinks", "symlink_to_txt"):               {},
-							filepath.Join(parentDir, "testdata/includes-symlinks", "text.txt"):                     {},
-						},
-						filepath.Join(parentDir, "testdata/includes-symlinks"),
-					),
+					Class:         plugins.External,
+					Module:        "plugins/test-app/module",
+					BaseURL:       "public/plugins/test-app",
+					FS:            mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/includes-symlinks")),
 					Signature:     "valid",
 					SignatureType: plugins.GrafanaSignature,
 					SignatureOrg:  "Grafana Labs",
@@ -276,13 +266,10 @@ func TestLoader_Load(t *testing.T) {
 						Backend: true,
 						State:   plugins.AlphaRelease,
 					},
-					Class:   plugins.External,
-					Module:  "plugins/test-datasource/module",
-					BaseURL: "public/plugins/test-datasource",
-					FS: plugins.NewLocalFS(
-						filesInDir(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
-						filepath.Join(parentDir, "testdata/unsigned-datasource/plugin"),
-					),
+					Class:     plugins.External,
+					Module:    "plugins/test-datasource/module",
+					BaseURL:   "public/plugins/test-datasource",
+					FS:        mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
 					Signature: "unsigned",
 				},
 			},
@@ -330,13 +317,10 @@ func TestLoader_Load(t *testing.T) {
 						Backend: true,
 						State:   plugins.AlphaRelease,
 					},
-					Class:   plugins.External,
-					Module:  "plugins/test-datasource/module",
-					BaseURL: "public/plugins/test-datasource",
-					FS: plugins.NewLocalFS(
-						filesInDir(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
-						filepath.Join(parentDir, "testdata/unsigned-datasource/plugin"),
-					),
+					Class:     plugins.External,
+					Module:    "plugins/test-datasource/module",
+					BaseURL:   "public/plugins/test-datasource",
+					FS:        mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
 					Signature: plugins.SignatureUnsigned,
 				},
 			},
@@ -440,14 +424,11 @@ func TestLoader_Load(t *testing.T) {
 					Backend: false,
 				},
 					DefaultNavURL: "/plugins/test-app/page/root-page-react",
-					FS: plugins.NewLocalFS(map[string]struct{}{
-						filepath.Join(parentDir, "testdata/test-app-with-includes", "dashboards/memory.json"): {},
-						filepath.Join(parentDir, "testdata/test-app-with-includes", "plugin.json"):            {},
-					}, filepath.Join(parentDir, "testdata/test-app-with-includes")),
-					Class:     plugins.External,
-					Signature: plugins.SignatureUnsigned,
-					Module:    "plugins/test-app/module",
-					BaseURL:   "public/plugins/test-app",
+					FS:            mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/test-app-with-includes")),
+					Class:         plugins.External,
+					Signature:     plugins.SignatureUnsigned,
+					Module:        "plugins/test-app/module",
+					BaseURL:       "public/plugins/test-app",
 				},
 			},
 		},
@@ -532,9 +513,7 @@ func TestLoader_Load_CustomSource(t *testing.T) {
 					Plugins:        []plugins.Dependency{},
 				},
 			},
-			FS: plugins.NewLocalFS(map[string]struct{}{
-				filepath.Join(parentDir, "testdata/cdn/plugin", "plugin.json"): {},
-			}, filepath.Join(parentDir, "testdata/cdn/plugin")),
+			FS:        mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/cdn/plugin")),
 			Class:     plugins.Bundled,
 			Signature: plugins.SignatureValid,
 			BaseURL:   "plugin-cdn/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel",
@@ -670,13 +649,10 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 							Executable: "test",
 							State:      plugins.AlphaRelease,
 						},
-						Class:   plugins.External,
-						Module:  "plugins/test-datasource/module",
-						BaseURL: "public/plugins/test-datasource",
-						FS: plugins.NewLocalFS(map[string]struct{}{
-							filepath.Join(parentDir, "testdata/valid-v2-pvt-signature/plugin/plugin.json"):  {},
-							filepath.Join(parentDir, "testdata/valid-v2-pvt-signature/plugin/MANIFEST.txt"): {},
-						}, filepath.Join(parentDir, "testdata/valid-v2-pvt-signature/plugin")),
+						Class:         plugins.External,
+						Module:        "plugins/test-datasource/module",
+						BaseURL:       "public/plugins/test-datasource",
+						FS:            mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/valid-v2-pvt-signature/plugin")),
 						Signature:     "valid",
 						SignatureType: plugins.PrivateSignature,
 						SignatureOrg:  "Will Browne",
@@ -795,10 +771,7 @@ func TestLoader_Load_RBACReady(t *testing.T) {
 						},
 						Backend: false,
 					},
-					FS: plugins.NewLocalFS(map[string]struct{}{
-						filepath.Join(pluginDir, "plugin.json"):  {},
-						filepath.Join(pluginDir, "MANIFEST.txt"): {},
-					}, pluginDir),
+					FS:            mustNewStaticFSForTests(t, pluginDir),
 					Class:         plugins.External,
 					Signature:     plugins.SignatureValid,
 					SignatureType: plugins.PrivateSignature,
@@ -885,10 +858,7 @@ func TestLoader_Load_Signature_RootURL(t *testing.T) {
 					Backend:      true,
 					Executable:   "test",
 				},
-				FS: plugins.NewLocalFS(map[string]struct{}{
-					filepath.Join(filepath.Join(parentDir, "/testdata/valid-v2-pvt-signature-root-url-uri/plugin"), "plugin.json"):  {},
-					filepath.Join(filepath.Join(parentDir, "/testdata/valid-v2-pvt-signature-root-url-uri/plugin"), "MANIFEST.txt"): {},
-				}, filepath.Join(parentDir, "/testdata/valid-v2-pvt-signature-root-url-uri/plugin")),
+				FS:            mustNewStaticFSForTests(t, filepath.Join(parentDir, "/testdata/valid-v2-pvt-signature-root-url-uri/plugin")),
 				Class:         plugins.External,
 				Signature:     plugins.SignatureValid,
 				SignatureType: plugins.PrivateSignature,
@@ -972,7 +942,7 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
 					},
 					Backend: false,
 				},
-				FS:            plugins.NewLocalFS(filesInDir(t, pluginDir), pluginDir),
+				FS:            mustNewStaticFSForTests(t, pluginDir),
 				Class:         plugins.External,
 				Signature:     plugins.SignatureValid,
 				SignatureType: plugins.GrafanaSignature,
@@ -1062,7 +1032,7 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 					},
 					Backend: false,
 				},
-				FS:            plugins.NewLocalFS(filesInDir(t, pluginDir1), pluginDir1),
+				FS:            mustNewStaticFSForTests(t, pluginDir1),
 				Class:         plugins.External,
 				Signature:     plugins.SignatureValid,
 				SignatureType: plugins.GrafanaSignature,
@@ -1137,10 +1107,9 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 			},
 			Backend: true,
 		},
-		Module:  "plugins/test-datasource/module",
-		BaseURL: "public/plugins/test-datasource",
-		FS: plugins.NewLocalFS(filesInDir(t, filepath.Join(rootDir, "testdata/nested-plugins/parent")),
-			filepath.Join(rootDir, "testdata/nested-plugins/parent")),
+		Module:        "plugins/test-datasource/module",
+		BaseURL:       "public/plugins/test-datasource",
+		FS:            mustNewStaticFSForTests(t, filepath.Join(rootDir, "testdata/nested-plugins/parent")),
 		Signature:     plugins.SignatureValid,
 		SignatureType: plugins.GrafanaSignature,
 		SignatureOrg:  "Grafana Labs",
@@ -1170,10 +1139,9 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 				Plugins:        []plugins.Dependency{},
 			},
 		},
-		Module:  "plugins/test-panel/module",
-		BaseURL: "public/plugins/test-panel",
-		FS: plugins.NewLocalFS(filesInDir(t, filepath.Join(rootDir, "testdata/nested-plugins/parent/nested")),
-			filepath.Join(rootDir, "testdata/nested-plugins/parent/nested")),
+		Module:        "plugins/test-panel/module",
+		BaseURL:       "public/plugins/test-panel",
+		FS:            mustNewStaticFSForTests(t, filepath.Join(rootDir, "testdata/nested-plugins/parent/nested")),
 		Signature:     plugins.SignatureValid,
 		SignatureType: plugins.GrafanaSignature,
 		SignatureOrg:  "Grafana Labs",
@@ -1310,10 +1278,9 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 				},
 				Backend: false,
 			},
-			Module:  "plugins/myorgid-simple-app/module",
-			BaseURL: "public/plugins/myorgid-simple-app",
-			FS: plugins.NewLocalFS(filesInDir(t, filepath.Join(rootDir, "testdata/app-with-child/dist")),
-				filepath.Join(rootDir, "testdata/app-with-child/dist")),
+			Module:        "plugins/myorgid-simple-app/module",
+			BaseURL:       "public/plugins/myorgid-simple-app",
+			FS:            mustNewStaticFSForTests(t, filepath.Join(rootDir, "testdata/app-with-child/dist")),
 			DefaultNavURL: "/plugins/myorgid-simple-app/page/root-page-react",
 			Signature:     plugins.SignatureValid,
 			SignatureType: plugins.GrafanaSignature,
@@ -1349,10 +1316,9 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 					Plugins:           []plugins.Dependency{},
 				},
 			},
-			Module:  "plugins/myorgid-simple-app/child/module",
-			BaseURL: "public/plugins/myorgid-simple-app",
-			FS: plugins.NewLocalFS(filesInDir(t, filepath.Join(rootDir, "testdata/app-with-child/dist/child")),
-				filepath.Join(rootDir, "testdata/app-with-child/dist/child")),
+			Module:          "plugins/myorgid-simple-app/child/module",
+			BaseURL:         "public/plugins/myorgid-simple-app",
+			FS:              mustNewStaticFSForTests(t, filepath.Join(rootDir, "testdata/app-with-child/dist/child")),
 			IncludedInAppID: parent.ID,
 			Signature:       plugins.SignatureValid,
 			SignatureType:   plugins.GrafanaSignature,
@@ -1421,7 +1387,7 @@ func Test_setPathsBasedOnApp(t *testing.T) {
 func newLoader(cfg *config.Cfg, cbs ...func(loader *Loader)) *Loader {
 	l := New(cfg, &fakes.FakeLicensingService{}, signature.NewUnsignedAuthorizer(cfg), fakes.NewFakePluginRegistry(),
 		fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakeRoleRegistry(),
-		assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(),
+		assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(cfg),
 		signature.ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
 
 	for _, cb := range cbs {
@@ -1453,39 +1419,8 @@ func verifyState(t *testing.T, ps []*plugins.Plugin, reg *fakes.FakePluginRegist
 	}
 }
 
-func filesInDir(t *testing.T, dir string) map[string]struct{} {
-	files, err := collectFilesWithin(dir)
-	if err != nil {
-		t.Logf("Could not collect plugin file info. Err: %v", err)
-		return map[string]struct{}{}
-	}
-	return files
-}
-
-func collectFilesWithin(dir string) (map[string]struct{}, error) {
-	files := map[string]struct{}{}
-	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// skip directories
-		if info.IsDir() {
-			return nil
-		}
-
-		// verify that file is within plugin directory
-		//file, err := filepath.Rel(dir, path)
-		//if err != nil {
-		//	return err
-		//}
-		//if strings.HasPrefix(file, ".."+string(filepath.Separator)) {
-		//	return fmt.Errorf("file '%s' not inside of plugin directory", file)
-		//}
-
-		files[path] = struct{}{}
-		return nil
-	})
-
-	return files, err
+func mustNewStaticFSForTests(t *testing.T, dir string) plugins.FS {
+	sfs, err := plugins.NewStaticFS(plugins.NewLocalFS(dir))
+	require.NoError(t, err)
+	return sfs
 }
diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go
index 1e20c169614..074cbdaa0db 100644
--- a/pkg/plugins/manager/manager_integration_test.go
+++ b/pkg/plugins/manager/manager_integration_test.go
@@ -118,7 +118,7 @@ func TestIntegrationPluginManager(t *testing.T) {
 	reg := registry.ProvideService()
 	lic := plicensing.ProvideLicensing(cfg, &licensing.OSSLicensingService{Cfg: cfg})
 	l := loader.ProvideService(pCfg, lic, signature.NewUnsignedAuthorizer(pCfg),
-		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(),
+		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(pCfg), fakes.NewFakeRoleRegistry(),
 		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
 	srcs := sources.ProvideService(cfg, pCfg)
 	ps, err := store.ProvideService(reg, srcs, l)
diff --git a/pkg/plugins/manager/signature/manifest.go b/pkg/plugins/manager/signature/manifest.go
index 2f4bbcf853f..992a9080566 100644
--- a/pkg/plugins/manager/signature/manifest.go
+++ b/pkg/plugins/manager/signature/manifest.go
@@ -17,6 +17,7 @@ import (
 
 	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
 	"github.com/gobwas/glob"
+
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
@@ -29,6 +30,9 @@ var (
 
 	// toSlash is filepath.ToSlash, but can be overwritten in tests path separators cross-platform
 	toSlash = filepath.ToSlash
+
+	// fromSlash is filepath.FromSlash, but can be overwritten in tests path separators cross-platform
+	fromSlash = filepath.FromSlash
 )
 
 // PluginManifest holds details for the file manifest
@@ -100,8 +104,11 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 	if defaultSignature, exists := src.DefaultSignature(ctx); exists {
 		return defaultSignature, nil
 	}
-
-	if len(plugin.FS.Files()) == 0 {
+	fsFiles, err := plugin.FS.Files()
+	if err != nil {
+		return plugins.Signature{}, fmt.Errorf("files: %w", err)
+	}
+	if len(fsFiles) == 0 {
 		s.mlog.Warn("No plugin file information in directory", "pluginID", plugin.JSONData.ID)
 		return plugins.Signature{
 			Status: plugins.SignatureInvalid,
@@ -190,7 +197,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 
 	// Track files missing from the manifest
 	var unsignedFiles []string
-	for _, f := range plugin.FS.Files() {
+	for _, f := range fsFiles {
 		// Ensure slashes are used, because MANIFEST.txt always uses slashes regardless of the filesystem
 		f = toSlash(f)
 
@@ -223,6 +230,8 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 }
 
 func verifyHash(mlog log.Logger, plugin plugins.FoundPlugin, path, hash string) error {
+	path = fromSlash(path)
+
 	// nolint:gosec
 	// We can ignore the gosec G304 warning on this one because `path` is based
 	// on the path provided in a manifest file for a plugin and not user input.
diff --git a/pkg/plugins/manager/signature/manifest_test.go b/pkg/plugins/manager/signature/manifest_test.go
index 5c9d78f7d37..069f7495136 100644
--- a/pkg/plugins/manager/signature/manifest_test.go
+++ b/pkg/plugins/manager/signature/manifest_test.go
@@ -2,6 +2,7 @@ package signature
 
 import (
 	"context"
+	"io/fs"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -172,10 +173,7 @@ func TestCalculate(t *testing.T) {
 						Version: "1.0.0",
 					},
 				},
-				FS: plugins.NewLocalFS(map[string]struct{}{
-					filepath.Join(basePath, "MANIFEST.txt"): {},
-					filepath.Join(basePath, "plugin.json"):  {},
-				}, basePath),
+				FS: mustNewStaticFSForTests(t, basePath),
 			})
 			require.NoError(t, err)
 			require.Equal(t, tc.expectedSignature, sig)
@@ -204,11 +202,7 @@ func TestCalculate(t *testing.T) {
 					Version: "1.0.0",
 				},
 			},
-			FS: plugins.NewLocalFS(map[string]struct{}{
-				filepath.Join(basePath, "MANIFEST.txt"):         {},
-				filepath.Join(basePath, "plugin.json"):          {},
-				filepath.Join(basePath, "chrome-win/debug.log"): {},
-			}, basePath),
+			FS: mustNewStaticFSForTests(t, basePath),
 		})
 		require.NoError(t, err)
 		require.Equal(t, plugins.Signature{
@@ -219,28 +213,51 @@ func TestCalculate(t *testing.T) {
 	})
 
 	t.Run("Signature verification should work with any path separator", func(t *testing.T) {
-		var toSlashUnix = newToSlash('/')
-		var toSlashWindows = newToSlash('\\')
+		const basePath = "../testdata/app-with-child/dist"
 
-		for _, tc := range []struct {
-			name    string
-			sep     string
-			toSlash func(string) string
+		platformWindows := fsPlatform{separator: '\\'}
+		platformUnix := fsPlatform{separator: '/'}
+
+		type testCase struct {
+			name      string
+			platform  fsPlatform
+			fsFactory func() (plugins.FS, error)
+		}
+		var testCases []testCase
+		for _, fsFactory := range []struct {
+			name string
+			f    func() (plugins.FS, error)
 		}{
-			{"unix", "/", toSlashUnix},
-			{"windows", "\\", toSlashWindows},
+			{"local fs", func() (plugins.FS, error) {
+				return plugins.NewLocalFS(basePath), nil
+			}},
+			{"static fs", func() (plugins.FS, error) {
+				return plugins.NewStaticFS(plugins.NewLocalFS(basePath))
+			}},
 		} {
+			testCases = append(testCases, []testCase{
+				{"unix " + fsFactory.name, platformUnix, fsFactory.f},
+				{"windows " + fsFactory.name, platformWindows, fsFactory.f},
+			}...)
+		}
+
+		for _, tc := range testCases {
 			t.Run(tc.name, func(t *testing.T) {
 				// Replace toSlash for cross-platform testing
 				oldToSlash := toSlash
+				oldFromSlash := fromSlash
 				t.Cleanup(func() {
 					toSlash = oldToSlash
+					fromSlash = oldFromSlash
 				})
-				toSlash = tc.toSlash
-
-				basePath := "../testdata/app-with-child/dist"
+				toSlash = tc.platform.toSlashFunc()
+				fromSlash = tc.platform.fromSlashFunc()
 
 				s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+				pfs, err := tc.fsFactory()
+				require.NoError(t, err)
+				pfs, err = newPathSeparatorOverrideFS(string(tc.platform.separator), pfs)
+				require.NoError(t, err)
 				sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 					PluginClassFunc: func(ctx context.Context) plugins.Class {
 						return plugins.External
@@ -253,11 +270,7 @@ func TestCalculate(t *testing.T) {
 							Version: "%VERSION%",
 						},
 					},
-					FS: newPathSeparatorOverrideFS(tc.sep, map[string]struct{}{
-						filepath.Join(basePath, "MANIFEST.txt"):      {},
-						filepath.Join(basePath, "plugin.json"):       {},
-						filepath.Join(basePath, "child/plugin.json"): {},
-					}, basePath),
+					FS: pfs,
 				})
 				require.NoError(t, err)
 				require.Equal(t, plugins.Signature{
@@ -270,20 +283,35 @@ func TestCalculate(t *testing.T) {
 	})
 }
 
-// newToSlash returns a new function that acts as filepath.ToSlash but for the specified os-separator.
+type fsPlatform struct {
+	separator rune
+}
+
+// toSlashFunc returns a new function that acts as filepath.ToSlash but for the specified os-separator.
 // This can be used to test filepath.ToSlash-dependant code cross-platform.
-func newToSlash(sep rune) func(string) string {
+func (p fsPlatform) toSlashFunc() func(string) string {
 	return func(path string) string {
-		if sep == '/' {
+		if p.separator == '/' {
 			return path
 		}
-		return strings.ReplaceAll(path, string(sep), "/")
+		return strings.ReplaceAll(path, string(p.separator), "/")
 	}
 }
 
-func TestNewToSlash(t *testing.T) {
+// fromSlashFunc returns a new function that acts as filepath.FromSlash but for the specified os-separator.
+// This can be used to test filepath.FromSlash-dependant code cross-platform.
+func (p fsPlatform) fromSlashFunc() func(string) string {
+	return func(path string) string {
+		if p.separator == '/' {
+			return path
+		}
+		return strings.ReplaceAll(path, "/", string(p.separator))
+	}
+}
+
+func TestFsPlatform(t *testing.T) {
 	t.Run("unix", func(t *testing.T) {
-		toSlashUnix := newToSlash('/')
+		toSlashUnix := fsPlatform{'/'}.toSlashFunc()
 		require.Equal(t, "folder", toSlashUnix("folder"))
 		require.Equal(t, "/folder", toSlashUnix("/folder"))
 		require.Equal(t, "/folder/file", toSlashUnix("/folder/file"))
@@ -291,39 +319,46 @@ func TestNewToSlash(t *testing.T) {
 	})
 
 	t.Run("windows", func(t *testing.T) {
-		toSlashWindows := newToSlash('\\')
+		toSlashWindows := fsPlatform{'\\'}.toSlashFunc()
 		require.Equal(t, "folder", toSlashWindows("folder"))
 		require.Equal(t, "C:/folder", toSlashWindows("C:\\folder"))
 		require.Equal(t, "folder/file.exe", toSlashWindows("folder\\file.exe"))
 	})
 }
 
-// fsPathSeparatorFiles embeds plugins.LocalFS and overrides the Files() behaviour so all the returned elements
+// fsPathSeparatorFiles embeds a plugins.FS and overrides the Files() behaviour so all the returned elements
 // have the specified path separator. This can be used to test Files() behaviour cross-platform.
 type fsPathSeparatorFiles struct {
-	plugins.LocalFS
+	plugins.FS
 
 	separator string
 }
 
 // newPathSeparatorOverrideFS returns a new fsPathSeparatorFiles. Sep is the separator that will be used ONLY for
-// the elements returned by Files(). Files and basePath MUST use the os-specific path separator (filepath.Separator)
-// if Open() is required to work for the test case.
-func newPathSeparatorOverrideFS(sep string, files map[string]struct{}, basePath string) fsPathSeparatorFiles {
+// the elements returned by Files().
+func newPathSeparatorOverrideFS(sep string, ufs plugins.FS) (fsPathSeparatorFiles, error) {
 	return fsPathSeparatorFiles{
-		LocalFS:   plugins.NewLocalFS(files, basePath),
+		FS:        ufs,
 		separator: sep,
-	}
+	}, nil
 }
 
-// Files returns LocalFS.Files(), but all path separators (filepath.Separator) are replaced with f.separator.
-func (f fsPathSeparatorFiles) Files() []string {
-	files := f.LocalFS.Files()
+// Files returns LocalFS.Files(), but all path separators for the current platform (filepath.Separator)
+// are replaced with f.separator.
+func (f fsPathSeparatorFiles) Files() ([]string, error) {
+	files, err := f.FS.Files()
+	if err != nil {
+		return nil, err
+	}
 	const osSepStr = string(filepath.Separator)
 	for i := 0; i < len(files); i++ {
 		files[i] = strings.ReplaceAll(files[i], osSepStr, f.separator)
 	}
-	return files
+	return files, nil
+}
+
+func (f fsPathSeparatorFiles) Open(name string) (fs.File, error) {
+	return f.FS.Open(strings.ReplaceAll(name, f.separator, string(filepath.Separator)))
 }
 
 func TestFSPathSeparatorFiles(t *testing.T) {
@@ -335,17 +370,18 @@ func TestFSPathSeparatorFiles(t *testing.T) {
 		{"windows", "\\"},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			fs := newPathSeparatorOverrideFS("/", map[string]struct{}{
-				"a": {},
-				strings.Join([]string{"a", "b", "c"}, tc.sep): {},
-			}, ".")
-			files := fs.Files()
-			filesMap := make(map[string]struct{}, len(files))
-			// Re-convert to map as the key order is not stable
-			for _, f := range files {
-				filesMap[f] = struct{}{}
-			}
-			require.Equal(t, filesMap, map[string]struct{}{"a": {}, strings.Join([]string{"a", "b", "c"}, tc.sep): {}})
+			pfs, err := newPathSeparatorOverrideFS(
+				"/", plugins.NewInMemoryFS(
+					map[string][]byte{"a": nil, strings.Join([]string{"a", "b", "c"}, tc.sep): nil},
+				),
+			)
+			require.NoError(t, err)
+			files, err := pfs.Files()
+			require.NoError(t, err)
+			exp := []string{"a", strings.Join([]string{"a", "b", "c"}, tc.sep)}
+			sort.Strings(files)
+			sort.Strings(exp)
+			require.Equal(t, exp, files)
 		})
 	}
 }
@@ -715,3 +751,9 @@ func createV2Manifest(t *testing.T, cbs ...func(*PluginManifest)) *PluginManifes
 
 	return m
 }
+
+func mustNewStaticFSForTests(t *testing.T, dir string) plugins.FS {
+	sfs, err := plugins.NewStaticFS(plugins.NewLocalFS(dir))
+	require.NoError(t, err)
+	return sfs
+}
diff --git a/pkg/plugins/test_utils.go b/pkg/plugins/test_utils.go
new file mode 100644
index 00000000000..5a5487cb19e
--- /dev/null
+++ b/pkg/plugins/test_utils.go
@@ -0,0 +1,82 @@
+package plugins
+
+import (
+	"bytes"
+	"io/fs"
+	"os"
+	"time"
+)
+
+var (
+	_ FS          = &inMemoryFS{}
+	_ fs.File     = &inMemoryFile{}
+	_ fs.FileInfo = &inMemoryFileInfo{}
+)
+
+// inMemoryFS is an FS that stores files in-memory.
+type inMemoryFS struct {
+	files map[string][]byte
+}
+
+// NewInMemoryFS returns a new FS with the specified files and content.
+// The provided value is a map from file name (keys) to file content (values).
+func NewInMemoryFS(files map[string][]byte) FS {
+	return &inMemoryFS{files: files}
+}
+
+func (f inMemoryFS) Base() string {
+	return ""
+}
+
+func (f inMemoryFS) Files() ([]string, error) {
+	fps := make([]string, 0, len(f.files))
+	for fn := range f.files {
+		fps = append(fps, fn)
+	}
+	return fps, nil
+}
+
+func (f inMemoryFS) Open(fn string) (fs.File, error) {
+	if _, ok := f.files[fn]; !ok {
+		return nil, ErrFileNotExist
+	}
+	return &inMemoryFile{path: fn, reader: bytes.NewReader(f.files[fn])}, nil
+}
+
+// NewFakeFS returns a new FS that always returns ErrFileNotExist when trying to Open() and empty Files().
+func NewFakeFS() FS {
+	return NewInMemoryFS(nil)
+}
+
+// inMemoryFile is a fs.File whose content is stored in memory.
+type inMemoryFile struct {
+	path   string
+	reader *bytes.Reader
+}
+
+func (f *inMemoryFile) Stat() (fs.FileInfo, error) {
+	return inMemoryFileInfo{
+		name: f.path,
+		size: f.reader.Size(),
+	}, nil
+}
+
+func (f *inMemoryFile) Read(b []byte) (int, error) {
+	return f.reader.Read(b)
+}
+
+func (f *inMemoryFile) Close() error {
+	return nil
+}
+
+type inMemoryFileInfo struct {
+	name string
+	size int64
+}
+
+func (f inMemoryFileInfo) Name() string       { return f.name }
+func (f inMemoryFileInfo) Size() int64        { return f.size }
+func (f inMemoryFileInfo) Mode() os.FileMode  { return 0444 } // Read for all
+func (f inMemoryFileInfo) ModTime() time.Time { return time.Time{} }
+func (f inMemoryFileInfo) IsDir() bool        { return false }
+func (f inMemoryFileInfo) Sys() interface{}   { return nil }
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index c057567102f..64c5daf6478 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -81,7 +81,7 @@ var WireExtensionSet = wire.NewSet(
 	signature.ProvideOSSAuthorizer,
 	wire.Bind(new(plugins.PluginLoaderAuthorizer), new(*signature.UnsignedPluginAuthorizer)),
 	wire.Bind(new(finder.Finder), new(*finder.Local)),
-	finder.NewLocalFinder,
+	finder.ProvideLocalFinder,
 )
 
 func ProvideClientDecorator(

From 69a14b9a5e4cddd9073b236bb40230351ef3395c Mon Sep 17 00:00:00 2001
From: Dmitry Filimonov <me@dfilimonov.com>
Date: Thu, 27 Apr 2023 01:50:11 -0700
Subject: [PATCH 453/729] Phlare: ability to set maxNodes parameter (#67017)

---
 go.mod                                        |   2 +-
 go.sum                                        |   8 +-
 pkg/tsdb/phlare/client.go                     |   2 +-
 .../kinds/dataquery/types_dataquery_gen.go    |   3 +
 pkg/tsdb/phlare/phlareClient.go               |   3 +-
 pkg/tsdb/phlare/phlareClient_test.go          |   3 +-
 pkg/tsdb/phlare/pyroscopeClient.go            |  13 +-
 pkg/tsdb/phlare/query.go                      | 115 ++++++++++--------
 pkg/tsdb/phlare/query_test.go                 |  10 +-
 .../phlare/QueryEditor/QueryEditor.test.tsx   |   1 +
 .../phlare/QueryEditor/QueryOptions.tsx       |  14 ++-
 .../plugins/datasource/phlare/dataquery.cue   |   2 +
 .../datasource/phlare/dataquery.gen.ts        |   4 +
 .../plugins/datasource/phlare/datasource.ts   |   1 +
 14 files changed, 113 insertions(+), 68 deletions(-)

diff --git a/go.mod b/go.mod
index a950fbf387a..035d3c70e2d 100644
--- a/go.mod
+++ b/go.mod
@@ -242,7 +242,7 @@ require (
 	github.com/google/go-github/v45 v45.2.0
 	github.com/grafana/codejen v0.0.3
 	github.com/grafana/dskit v0.0.0-20230202092222-880a7f8141cc
-	github.com/grafana/phlare/api v0.1.3
+	github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413
 	github.com/huandu/xstrings v1.3.1
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/matryer/is v1.4.0
diff --git a/go.sum b/go.sum
index 9d33a7965f4..727940e1869 100644
--- a/go.sum
+++ b/go.sum
@@ -1268,10 +1268,6 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/alerting v0.0.0-20230315185333-d1e3c68ac064 h1:MtsWzSTav7NGKolO+TaJQUcyR7VY0YpUROVsJX8ktIU=
-github.com/grafana/alerting v0.0.0-20230315185333-d1e3c68ac064/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
-github.com/grafana/alerting v0.0.0-20230410151633-4a7ecc241d72 h1:WuQGIUeDIyPviylMaMD1d2nEYIiD/icHYO0rc/AH8kQ=
-github.com/grafana/alerting v0.0.0-20230410151633-4a7ecc241d72/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
 github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32 h1:LdPoVBj+CA5oHLeUejDzqy8/c4Fa0UfTtCcOHka0Jws=
 github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
 github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2 h1:teRmmE08bSnvyh3e+adfv/6RA1ZZdhTCmNL9Ckfm1Rk=
@@ -1302,8 +1298,8 @@ github.com/grafana/grafana-plugin-sdk-go v0.159.0 h1:tjqzTe/wz+1zzaeHpOJvBvSvZFx
 github.com/grafana/grafana-plugin-sdk-go v0.159.0/go.mod h1:7/F3lL/w3MGuZTwu0jam5oL/4zNOQmhs2k8WZ9VlzhI=
 github.com/grafana/kindsys v0.0.0-20230414093523-5df3e256ebc0 h1:Or8DllkxKq3+kLXAS/tkr5K2Yv745c6K2rRvslGWGd4=
 github.com/grafana/kindsys v0.0.0-20230414093523-5df3e256ebc0/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
-github.com/grafana/phlare/api v0.1.3 h1:mYTaE9mLsAW/uzPXlW/PQSLsZ4ojBFA+oAMfR/PDdw8=
-github.com/grafana/phlare/api v0.1.3/go.mod h1:29vcLwFDmZBDce2jwFIMtzvof7fzPadT8VMKw9ks7FU=
+github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413 h1:bBzCezZNRyYlJpXTkyZdY4fpPxHZUdyeyRWzhtw/P6I=
+github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413/go.mod h1:IvwuGG9xa/h96UH/exgvsfy3zE+ZpctkNT9o5aaGdrU=
 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=
diff --git a/pkg/tsdb/phlare/client.go b/pkg/tsdb/phlare/client.go
index 3414122b74b..0651791ae50 100644
--- a/pkg/tsdb/phlare/client.go
+++ b/pkg/tsdb/phlare/client.go
@@ -10,7 +10,7 @@ type ProfilingClient interface {
 	LabelNames(ctx context.Context, query string, start int64, end int64) ([]string, error)
 	LabelValues(ctx context.Context, query string, label string, start int64, end int64) ([]string, error)
 	GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error)
-	GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64) (*ProfileResponse, error)
+	GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
 }
 
 type ProfileType struct {
diff --git a/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go
index 1b4ff0173ac..4f0d24785b2 100644
--- a/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go
@@ -35,6 +35,9 @@ type GrafanaPyroscopeDataQuery struct {
 	// Specifies the query label selectors.
 	LabelSelector string `json:"labelSelector"`
 
+	// Sets the maximum number of nodes in the flamegraph.
+	MaxNodes *int64 `json:"maxNodes,omitempty"`
+
 	// Specifies the type of profile to query.
 	ProfileTypeId string `json:"profileTypeId"`
 
diff --git a/pkg/tsdb/phlare/phlareClient.go b/pkg/tsdb/phlare/phlareClient.go
index 39e0dd218f7..5ec0a620e67 100644
--- a/pkg/tsdb/phlare/phlareClient.go
+++ b/pkg/tsdb/phlare/phlareClient.go
@@ -90,13 +90,14 @@ func (c *PhlareClient) GetSeries(ctx context.Context, profileTypeID string, labe
 	}, nil
 }
 
-func (c *PhlareClient) GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64) (*ProfileResponse, error) {
+func (c *PhlareClient) GetProfile(ctx context.Context, profileTypeID, labelSelector string, start, end int64, maxNodes *int64) (*ProfileResponse, error) {
 	req := &connect.Request[querierv1.SelectMergeStacktracesRequest]{
 		Msg: &querierv1.SelectMergeStacktracesRequest{
 			ProfileTypeID: profileTypeID,
 			LabelSelector: labelSelector,
 			Start:         start,
 			End:           end,
+			MaxNodes:      maxNodes,
 		},
 	}
 
diff --git a/pkg/tsdb/phlare/phlareClient_test.go b/pkg/tsdb/phlare/phlareClient_test.go
index f594a253b32..4f84ad29b17 100644
--- a/pkg/tsdb/phlare/phlareClient_test.go
+++ b/pkg/tsdb/phlare/phlareClient_test.go
@@ -32,7 +32,8 @@ func Test_PhlareClient(t *testing.T) {
 	})
 
 	t.Run("GetProfile", func(t *testing.T) {
-		resp, err := client.GetProfile(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100)
+		maxNodes := int64(-1)
+		resp, err := client.GetProfile(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, &maxNodes)
 		require.Nil(t, err)
 
 		series := &ProfileResponse{
diff --git a/pkg/tsdb/phlare/pyroscopeClient.go b/pkg/tsdb/phlare/pyroscopeClient.go
index 00bab8acde2..60b69473cbf 100644
--- a/pkg/tsdb/phlare/pyroscopeClient.go
+++ b/pkg/tsdb/phlare/pyroscopeClient.go
@@ -83,11 +83,14 @@ type PyroFlamebearer struct {
 	Names    []string  `json:"names"`
 }
 
-func (c *PyroscopeClient) getProfileData(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string) (*PyroscopeProfileResponse, error) {
+func (c *PyroscopeClient) getProfileData(ctx context.Context, profileTypeID, labelSelector string, start, end int64, maxNodes *int64, groupBy []string) (*PyroscopeProfileResponse, error) {
 	params := url.Values{}
 	params.Add("from", strconv.FormatInt(start, 10))
 	params.Add("until", strconv.FormatInt(end, 10))
 	params.Add("query", profileTypeID+labelSelector)
+	if maxNodes != nil {
+		params.Add("maxNodes", strconv.FormatInt(*maxNodes, 10))
+	}
 	params.Add("format", "json")
 	if len(groupBy) > 0 {
 		params.Add("groupBy", groupBy[0])
@@ -122,8 +125,8 @@ func (c *PyroscopeClient) getProfileData(ctx context.Context, profileTypeID stri
 	return respData, nil
 }
 
-func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64) (*ProfileResponse, error) {
-	respData, err := c.getProfileData(ctx, profileTypeID, labelSelector, start, end, nil)
+func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID, labelSelector string, start, end int64, maxNodes *int64) (*ProfileResponse, error) {
+	respData, err := c.getProfileData(ctx, profileTypeID, labelSelector, start, end, maxNodes, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -154,11 +157,11 @@ func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID string,
 	}, nil
 }
 
-func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
+func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
 	// This is super ineffective at the moment. We need 2 different APIs one for profile one for series (timeline) data
 	// but Pyro returns all in single response. This currently does the simplest thing and calls the same API 2 times
 	// and gets the part of the response it needs.
-	respData, err := c.getProfileData(ctx, profileTypeID, labelSelector, start, end, groupBy)
+	respData, err := c.getProfileData(ctx, profileTypeID, labelSelector, start, end, nil, groupBy)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/phlare/query.go b/pkg/tsdb/phlare/query.go
index 3b926217110..10e1dffc0bc 100644
--- a/pkg/tsdb/phlare/query.go
+++ b/pkg/tsdb/phlare/query.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
+	"sync"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -13,6 +14,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/live"
 	"github.com/grafana/grafana/pkg/tsdb/phlare/kinds/dataquery"
 	"github.com/xlab/treeprint"
+	"golang.org/x/sync/errgroup"
 )
 
 type queryModel struct {
@@ -41,63 +43,76 @@ func (d *PhlareDatasource) query(ctx context.Context, pCtx backend.PluginContext
 		return response
 	}
 
+	responseMutex := sync.Mutex{}
+	g, gCtx := errgroup.WithContext(ctx)
 	if query.QueryType == queryTypeMetrics || query.QueryType == queryTypeBoth {
-		var dsJson dsJsonModel
-		err = json.Unmarshal(pCtx.DataSourceInstanceSettings.JSONData, &dsJson)
-		if err != nil {
-			response.Error = fmt.Errorf("error unmarshaling datasource json model: %v", err)
-			return response
-		}
-
-		parsedInterval := time.Second * 15
-		if dsJson.MinStep != "" {
-			parsedInterval, err = gtime.ParseDuration(dsJson.MinStep)
+		g.Go(func() error {
+			var dsJson dsJsonModel
+			err = json.Unmarshal(pCtx.DataSourceInstanceSettings.JSONData, &dsJson)
 			if err != nil {
-				parsedInterval = time.Second * 15
-				logger.Debug("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep)
+				return fmt.Errorf("error unmarshaling datasource json model: %v", err)
 			}
-		}
-		logger.Debug("Sending SelectSeriesRequest", "queryModel", qm)
-		seriesResp, err := d.client.GetSeries(
-			ctx,
-			qm.ProfileTypeId,
-			qm.LabelSelector,
-			query.TimeRange.From.UnixMilli(),
-			query.TimeRange.To.UnixMilli(),
-			qm.GroupBy,
-			math.Max(query.Interval.Seconds(), parsedInterval.Seconds()),
-		)
-		if err != nil {
-			logger.Error("Querying SelectSeries()", "err", err)
-			response.Error = err
-			return response
-		}
-		// add the frames to the response.
-		response.Frames = append(response.Frames, seriesToDataFrames(seriesResp)...)
+
+			parsedInterval := time.Second * 15
+			if dsJson.MinStep != "" {
+				parsedInterval, err = gtime.ParseDuration(dsJson.MinStep)
+				if err != nil {
+					parsedInterval = time.Second * 15
+					logger.Debug("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep)
+				}
+			}
+			logger.Debug("Sending SelectSeriesRequest", "queryModel", qm)
+			seriesResp, err := d.client.GetSeries(
+				gCtx,
+				qm.ProfileTypeId,
+				qm.LabelSelector,
+				query.TimeRange.From.UnixMilli(),
+				query.TimeRange.To.UnixMilli(),
+				qm.GroupBy,
+				math.Max(query.Interval.Seconds(), parsedInterval.Seconds()),
+			)
+			if err != nil {
+				logger.Error("Querying SelectSeries()", "err", err)
+				return err
+			}
+			// add the frames to the response.
+			responseMutex.Lock()
+			response.Frames = append(response.Frames, seriesToDataFrames(seriesResp)...)
+			responseMutex.Unlock()
+			return nil
+		})
 	}
 
 	if query.QueryType == queryTypeProfile || query.QueryType == queryTypeBoth {
-		logger.Debug("Calling GetProfile", "queryModel", qm)
-		prof, err := d.client.GetProfile(ctx, qm.ProfileTypeId, qm.LabelSelector, query.TimeRange.From.UnixMilli(), query.TimeRange.To.UnixMilli())
-		if err != nil {
-			logger.Error("Error GetProfile()", "err", err)
-			response.Error = err
-			return response
-		}
-		frame := responseToDataFrames(prof)
-		response.Frames = append(response.Frames, frame)
-
-		// If query called with streaming on then return a channel
-		// to subscribe on a client-side and consume updates from a plugin.
-		// Feel free to remove this if you don't need streaming for your datasource.
-		if qm.WithStreaming {
-			channel := live.Channel{
-				Scope:     live.ScopeDatasource,
-				Namespace: pCtx.DataSourceInstanceSettings.UID,
-				Path:      "stream",
+		g.Go(func() error {
+			logger.Debug("Calling GetProfile", "queryModel", qm)
+			prof, err := d.client.GetProfile(gCtx, qm.ProfileTypeId, qm.LabelSelector, query.TimeRange.From.UnixMilli(), query.TimeRange.To.UnixMilli(), qm.MaxNodes)
+			if err != nil {
+				logger.Error("Error GetProfile()", "err", err)
+				return err
 			}
-			frame.SetMeta(&data.FrameMeta{Channel: channel.String()})
-		}
+			frame := responseToDataFrames(prof)
+			responseMutex.Lock()
+			response.Frames = append(response.Frames, frame)
+			responseMutex.Unlock()
+
+			// If query called with streaming on then return a channel
+			// to subscribe on a client-side and consume updates from a plugin.
+			// Feel free to remove this if you don't need streaming for your datasource.
+			if qm.WithStreaming {
+				channel := live.Channel{
+					Scope:     live.ScopeDatasource,
+					Namespace: pCtx.DataSourceInstanceSettings.UID,
+					Path:      "stream",
+				}
+				frame.SetMeta(&data.FrameMeta{Channel: channel.String()})
+			}
+			return nil
+		})
+	}
+
+	if err := g.Wait(); err != nil {
+		response.Error = g.Wait()
 	}
 
 	return response
diff --git a/pkg/tsdb/phlare/query_test.go b/pkg/tsdb/phlare/query_test.go
index cc95e376ab7..19ef1b922d6 100644
--- a/pkg/tsdb/phlare/query_test.go
+++ b/pkg/tsdb/phlare/query_test.go
@@ -28,6 +28,12 @@ func Test_query(t *testing.T) {
 		resp := ds.query(context.Background(), pCtx, *dataQuery)
 		require.Nil(t, resp.Error)
 		require.Equal(t, 2, len(resp.Frames))
+
+		// The order of the frames is not guaranteed, so we normalize it
+		if resp.Frames[0].Fields[0].Name == "level" {
+			resp.Frames[1], resp.Frames[0] = resp.Frames[0], resp.Frames[1]
+		}
+
 		require.Equal(t, "time", resp.Frames[0].Fields[0].Name)
 		require.Equal(t, data.NewField("level", nil, []int64{0, 1, 2}), resp.Frames[1].Fields[0])
 	})
@@ -289,7 +295,7 @@ func (f *FakeClient) LabelNames(ctx context.Context, query string, start int64,
 	panic("implement me")
 }
 
-func (f *FakeClient) GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64) (*ProfileResponse, error) {
+func (f *FakeClient) GetProfile(ctx context.Context, profileTypeID, labelSelector string, start, end int64, maxNodes *int64) (*ProfileResponse, error) {
 	return &ProfileResponse{
 		Flamebearer: &Flamebearer{
 			Names: []string{"foo", "bar", "baz"},
@@ -305,7 +311,7 @@ func (f *FakeClient) GetProfile(ctx context.Context, profileTypeID string, label
 	}, nil
 }
 
-func (f *FakeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
+func (f *FakeClient) GetSeries(ctx context.Context, profileTypeID, labelSelector string, start, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
 	f.Args = []interface{}{profileTypeID, labelSelector, start, end, groupBy, step}
 	return &SeriesResponse{
 		Series: []*Series{
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
index d9d67521d8e..728d5060c20 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx
@@ -92,6 +92,7 @@ function setup(options: { props: Partial<Props> } = { props: {} }) {
         labelSelector: '',
         profileTypeId: 'process_cpu:cpu',
         refId: 'A',
+        maxNodes: 1000,
         groupBy: [],
       }}
       datasource={ds}
diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx b/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx
index 56cb059cba9..8723716b98a 100644
--- a/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx
+++ b/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { useToggle } from 'react-use';
 
 import { CoreApp, GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Icon, useStyles2, RadioButtonGroup, MultiSelect } from '@grafana/ui';
+import { Icon, useStyles2, RadioButtonGroup, MultiSelect, Input } from '@grafana/ui';
 
 import { Query } from '../types';
 
@@ -91,6 +91,18 @@ export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
               }}
             />
           </EditorField>
+          <EditorField label={'Max Nodes'} tooltip={<>Sets the maximum number of nodes to return in the flamegraph.</>}>
+            <Input
+              value={query.maxNodes || ''}
+              type="number"
+              placeholder="16384"
+              onChange={(event: React.SyntheticEvent<HTMLInputElement>) => {
+                let newValue = parseInt(event.currentTarget.value, 10);
+                newValue = isNaN(newValue) ? 0 : newValue;
+                onQueryChange({ ...query, maxNodes: newValue });
+              }}
+            />
+          </EditorField>
         </div>
       )}
     </Stack>
diff --git a/public/app/plugins/datasource/phlare/dataquery.cue b/public/app/plugins/datasource/phlare/dataquery.cue
index f77dd20a9b6..1a766f8d182 100644
--- a/public/app/plugins/datasource/phlare/dataquery.cue
+++ b/public/app/plugins/datasource/phlare/dataquery.cue
@@ -39,6 +39,8 @@ composableKinds: DataQuery: {
 						profileTypeId: string
 						// Allows to group the results.
 						groupBy: [...string]
+						// Sets the maximum number of nodes in the flamegraph.
+						maxNodes?:        int64
 						#PhlareQueryType: "metrics" | "profile" | *"both" @cuetsy(kind="type")
 					},
 				]
diff --git a/public/app/plugins/datasource/phlare/dataquery.gen.ts b/public/app/plugins/datasource/phlare/dataquery.gen.ts
index 0d4936d7867..7be23baa6a2 100644
--- a/public/app/plugins/datasource/phlare/dataquery.gen.ts
+++ b/public/app/plugins/datasource/phlare/dataquery.gen.ts
@@ -25,6 +25,10 @@ export interface GrafanaPyroscope extends common.DataQuery {
    * Specifies the query label selectors.
    */
   labelSelector: string;
+  /**
+   * Sets the maximum number of nodes in the flamegraph.
+   */
+  maxNodes?: number;
   /**
    * Specifies the type of profile to query.
    */
diff --git a/public/app/plugins/datasource/phlare/datasource.ts b/public/app/plugins/datasource/phlare/datasource.ts
index 4cf80c31e71..21e4f31dfe9 100644
--- a/public/app/plugins/datasource/phlare/datasource.ts
+++ b/public/app/plugins/datasource/phlare/datasource.ts
@@ -82,6 +82,7 @@ export class PhlareDataSource extends DataSourceWithBackend<Query, PhlareDataSou
       labelSelector: toPromLikeExpr(labelBasedQuery),
       queryType: 'both',
       profileTypeId: '',
+      maxNodes: 16,
       groupBy: [''],
     };
   }

From e17496d79a19461be37b4004b3f6bdd74e8f625a Mon Sep 17 00:00:00 2001
From: Shirley <4163034+fridgepoet@users.noreply.github.com>
Date: Thu, 27 Apr 2023 11:19:45 +0200
Subject: [PATCH 454/729] CloudWatch: Deprecate dynamic labels feature toggle,
 remove support for Alias in backend (#66494)

---
 pkg/tsdb/cloudwatch/cloudwatch.go             |   2 -
 .../kinds/dataquery/types_dataquery_gen.go    |   3 +-
 .../cloudwatch/metric_data_input_builder.go   |   3 +-
 .../metric_data_input_builder_test.go         |   9 +-
 .../cloudwatch/metric_data_query_builder.go   |   3 +-
 .../metric_data_query_builder_test.go         |  40 ++---
 .../cloudwatch/models/cloudwatch_query.go     |  65 ++++----
 .../models/cloudwatch_query_test.go           | 150 +++++++----------
 pkg/tsdb/cloudwatch/response_parser.go        |  84 +---------
 pkg/tsdb/cloudwatch/response_parser_test.go   | 155 ++++--------------
 pkg/tsdb/cloudwatch/time_series_query.go      |   1 -
 pkg/tsdb/cloudwatch/time_series_query_test.go |  52 ++----
 .../datasource/cloudwatch/dataquery.cue       |   3 +-
 .../datasource/cloudwatch/dataquery.gen.ts    |   3 +-
 14 files changed, 162 insertions(+), 411 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 771698f3563..f1e62c28372 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"regexp"
 	"sync"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -51,7 +50,6 @@ const (
 )
 
 var logger = log.New("tsdb.cloudwatch")
-var aliasFormat = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`)
 
 func ProvideService(cfg *setting.Cfg, httpClientProvider httpclient.Provider, features featuremgmt.FeatureToggles) *CloudWatchService {
 	logger.Debug("Initializing")
diff --git a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
index f0b62e3612d..d442e211870 100644
--- a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
@@ -422,7 +422,8 @@ type CloudWatchMetricsQuery struct {
 	// The ID of the AWS account to query for the metric, specifying `all` will query all accounts that the monitoring account is permitted to query.
 	AccountId *string `json:"accountId,omitempty"`
 
-	// To be deprecated. Use label
+	// Deprecated: use label
+	// @deprecated use label
 	Alias *string `json:"alias,omitempty"`
 
 	// For mixed data sources the selected datasource is on the query level.
diff --git a/pkg/tsdb/cloudwatch/metric_data_input_builder.go b/pkg/tsdb/cloudwatch/metric_data_input_builder.go
index 962e628b5f4..ebb667c2610 100644
--- a/pkg/tsdb/cloudwatch/metric_data_input_builder.go
+++ b/pkg/tsdb/cloudwatch/metric_data_input_builder.go
@@ -7,7 +7,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
@@ -19,7 +18,7 @@ func (e *cloudWatchExecutor) buildMetricDataInput(logger log.Logger, startTime t
 		ScanBy:    aws.String("TimestampAscending"),
 	}
 
-	shouldSetLabelOptions := e.features.IsEnabled(featuremgmt.FlagCloudWatchDynamicLabels) && len(queries) > 0 && len(queries[0].TimezoneUTCOffset) > 0
+	shouldSetLabelOptions := len(queries) > 0 && len(queries[0].TimezoneUTCOffset) > 0
 
 	if shouldSetLabelOptions {
 		metricDataInput.LabelOptions = &cloudwatch.LabelOptions{
diff --git a/pkg/tsdb/cloudwatch/metric_data_input_builder_test.go b/pkg/tsdb/cloudwatch/metric_data_input_builder_test.go
index 24b441eeba2..320cd8109fd 100644
--- a/pkg/tsdb/cloudwatch/metric_data_input_builder_test.go
+++ b/pkg/tsdb/cloudwatch/metric_data_input_builder_test.go
@@ -20,17 +20,14 @@ func TestMetricDataInputBuilder(t *testing.T) {
 		name                 string
 		timezoneUTCOffset    string
 		expectedLabelOptions *cloudwatch.LabelOptions
-		featureEnabled       bool
 	}{
-		{name: "when timezoneUTCOffset is provided and feature is enabled", timezoneUTCOffset: "+1234", expectedLabelOptions: &cloudwatch.LabelOptions{Timezone: aws.String("+1234")}, featureEnabled: true},
-		{name: "when timezoneUTCOffset is not provided and feature is enabled", timezoneUTCOffset: "", expectedLabelOptions: nil, featureEnabled: true},
-		{name: "when timezoneUTCOffset is provided and feature is disabled", timezoneUTCOffset: "+1234", expectedLabelOptions: nil, featureEnabled: false},
-		{name: "when timezoneUTCOffset is not provided and feature is disabled", timezoneUTCOffset: "", expectedLabelOptions: nil, featureEnabled: false},
+		{name: "when timezoneUTCOffset is provided", timezoneUTCOffset: "+1234", expectedLabelOptions: &cloudwatch.LabelOptions{Timezone: aws.String("+1234")}},
+		{name: "when timezoneUTCOffset is not provided", timezoneUTCOffset: "", expectedLabelOptions: nil},
 	}
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchDynamicLabels, tc.featureEnabled))
+			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 			query := getBaseQuery()
 			query.TimezoneUTCOffset = tc.timezoneUTCOffset
 
diff --git a/pkg/tsdb/cloudwatch/metric_data_query_builder.go b/pkg/tsdb/cloudwatch/metric_data_query_builder.go
index 5552d7f3032..0a6fa90316b 100644
--- a/pkg/tsdb/cloudwatch/metric_data_query_builder.go
+++ b/pkg/tsdb/cloudwatch/metric_data_query_builder.go
@@ -10,7 +10,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
@@ -20,7 +19,7 @@ func (e *cloudWatchExecutor) buildMetricDataQuery(logger log.Logger, query *mode
 		ReturnData: aws.Bool(query.ReturnData),
 	}
 
-	if e.features.IsEnabled(featuremgmt.FlagCloudWatchDynamicLabels) && len(query.Label) > 0 {
+	if len(query.Label) > 0 {
 		mdq.Label = &query.Label
 	}
 
diff --git a/pkg/tsdb/cloudwatch/metric_data_query_builder_test.go b/pkg/tsdb/cloudwatch/metric_data_query_builder_test.go
index 84b827ec925..d075fdfd7fd 100644
--- a/pkg/tsdb/cloudwatch/metric_data_query_builder_test.go
+++ b/pkg/tsdb/cloudwatch/metric_data_query_builder_test.go
@@ -95,8 +95,8 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 			assert.Equal(t, `SUM([a,b])`, *mdq.Expression)
 		})
 
-		t.Run("should set label when dynamic labels feature toggle is enabled", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchDynamicLabels))
+		t.Run("should set label", func(t *testing.T) {
+			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 			query := getBaseQuery()
 			query.Label = "some label"
 
@@ -107,35 +107,19 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 			assert.Equal(t, "some label", *mdq.Label)
 		})
 
-		testCases := map[string]struct {
-			feature *featuremgmt.FeatureManager
-			label   string
-		}{
-			"should not set label when dynamic labels feature toggle is disabled": {
-				feature: featuremgmt.WithFeatures(),
-				label:   "some label",
-			},
-			"should not set label for empty string query label": {
-				feature: featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchDynamicLabels),
-				label:   "",
-			},
-		}
+		t.Run("should not set label for empty string query label", func(t *testing.T) {
+			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			query := getBaseQuery()
+			query.Label = ""
 
-		for name, tc := range testCases {
-			t.Run(name, func(t *testing.T) {
-				executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, tc.feature)
-				query := getBaseQuery()
-				query.Label = tc.label
+			mdq, err := executor.buildMetricDataQuery(logger, query)
 
-				mdq, err := executor.buildMetricDataQuery(logger, query)
-
-				assert.NoError(t, err)
-				assert.Nil(t, mdq.Label)
-			})
-		}
+			assert.NoError(t, err)
+			assert.Nil(t, mdq.Label)
+		})
 
 		t.Run(`should not specify accountId when it is "all"`, func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchDynamicLabels))
+			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 			query := &models.CloudWatchQuery{
 				Namespace:  "AWS/EC2",
 				MetricName: "CPUUtilization",
@@ -153,7 +137,7 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 		})
 
 		t.Run("should set accountId when it is specified", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchDynamicLabels))
+			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 			query := &models.CloudWatchQuery{
 				Namespace:  "AWS/EC2",
 				MetricName: "CPUUtilization",
diff --git a/pkg/tsdb/cloudwatch/models/cloudwatch_query.go b/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
index e88723e5cb4..7666e709c24 100644
--- a/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
+++ b/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
@@ -63,7 +63,6 @@ type CloudWatchQuery struct {
 	ReturnData        bool
 	Dimensions        map[string][]string
 	Period            int
-	Alias             string
 	Label             string
 	MatchExact        bool
 	UsedExpression    string
@@ -150,7 +149,7 @@ func (q *CloudWatchQuery) IsMultiValuedDimensionExpression() bool {
 	return false
 }
 
-func (q *CloudWatchQuery) BuildDeepLink(startTime time.Time, endTime time.Time, dynamicLabelEnabled bool) (string, error) {
+func (q *CloudWatchQuery) BuildDeepLink(startTime time.Time, endTime time.Time) (string, error) {
 	if q.IsMathExpression() || q.MetricQueryType == MetricQueryTypeQuery {
 		return "", nil
 	}
@@ -166,9 +165,7 @@ func (q *CloudWatchQuery) BuildDeepLink(startTime time.Time, endTime time.Time,
 
 	if q.isSearchExpression() {
 		metricExpressions := &metricExpression{Expression: q.UsedExpression}
-		if dynamicLabelEnabled {
-			metricExpressions.Label = q.Label
-		}
+		metricExpressions.Label = q.Label
 		link.Metrics = []interface{}{metricExpressions}
 	} else {
 		metricStat := []interface{}{q.Namespace, q.MetricName}
@@ -179,9 +176,7 @@ func (q *CloudWatchQuery) BuildDeepLink(startTime time.Time, endTime time.Time,
 			Stat:   q.Statistic,
 			Period: q.Period,
 		}
-		if dynamicLabelEnabled {
-			metricStatMeta.Label = q.Label
-		}
+		metricStatMeta.Label = q.Label
 		if q.AccountId != nil {
 			metricStatMeta.AccountId = *q.AccountId
 		}
@@ -221,7 +216,7 @@ type metricsDataQuery struct {
 
 // ParseMetricDataQueries decodes the metric data queries json, validates, sets default values and returns an array of CloudWatchQueries.
 // The CloudWatchQuery has a 1 to 1 mapping to a query editor row
-func ParseMetricDataQueries(dataQueries []backend.DataQuery, startTime time.Time, endTime time.Time, defaultRegion string, logger log.Logger, dynamicLabelsEnabled,
+func ParseMetricDataQueries(dataQueries []backend.DataQuery, startTime time.Time, endTime time.Time, defaultRegion string, logger log.Logger,
 	crossAccountQueryingEnabled bool) ([]*CloudWatchQuery, error) {
 	var metricDataQueries = make(map[string]metricsDataQuery)
 	for _, query := range dataQueries {
@@ -251,10 +246,6 @@ func ParseMetricDataQueries(dataQueries []backend.DataQuery, startTime time.Time
 			TimezoneUTCOffset: mdq.TimezoneUTCOffset,
 		}
 
-		if mdq.Alias != nil {
-			cwQuery.Alias = *mdq.Alias
-		}
-
 		if mdq.MetricName != nil {
 			cwQuery.MetricName = *mdq.MetricName
 		}
@@ -271,13 +262,17 @@ func ParseMetricDataQueries(dataQueries []backend.DataQuery, startTime time.Time
 			cwQuery.Expression = *mdq.Expression
 		}
 
+		if mdq.Label != nil {
+			cwQuery.Label = *mdq.Label
+		}
+
 		if err := cwQuery.validateAndSetDefaults(refId, mdq, startTime, endTime, defaultRegion, crossAccountQueryingEnabled); err != nil {
 			return nil, &QueryError{Err: err, RefID: refId}
 		}
 
 		cwQuery.applyMacros(startTime, endTime)
 
-		cwQuery.migrateLegacyQuery(mdq, dynamicLabelsEnabled)
+		cwQuery.migrateLegacyQuery(mdq)
 
 		result = append(result, cwQuery)
 	}
@@ -291,9 +286,9 @@ func (q *CloudWatchQuery) applyMacros(startTime, endTime time.Time) {
 	}
 }
 
-func (q *CloudWatchQuery) migrateLegacyQuery(query metricsDataQuery, dynamicLabelsEnabled bool) {
+func (q *CloudWatchQuery) migrateLegacyQuery(query metricsDataQuery) {
 	q.Statistic = getStatistic(query)
-	q.Label = getLabel(query, dynamicLabelsEnabled)
+	q.Label = getLabel(query)
 }
 
 func (q *CloudWatchQuery) validateAndSetDefaults(refId string, metricsDataQuery metricsDataQuery, startTime, endTime time.Time,
@@ -386,33 +381,33 @@ var aliasPatterns = map[string]string{
 
 var legacyAliasRegexp = regexp.MustCompile(`{{\s*(.+?)\s*}}`)
 
-func getLabel(query metricsDataQuery, dynamicLabelsEnabled bool) string {
+func getLabel(query metricsDataQuery) string {
+	deprecatedAlias := query.Alias //nolint:staticcheck
+
 	if query.Label != nil {
 		return *query.Label
 	}
-	if query.Alias != nil && *query.Alias == "" {
+	if deprecatedAlias != nil && *deprecatedAlias == "" {
 		return ""
 	}
 
 	var result string
-	if dynamicLabelsEnabled {
-		fullAliasField := ""
-		if query.Alias != nil {
-			fullAliasField = *query.Alias
-		}
-		matches := legacyAliasRegexp.FindAllStringSubmatch(fullAliasField, -1)
-
-		for _, groups := range matches {
-			fullMatch := groups[0]
-			subgroup := groups[1]
-			if dynamicLabel, ok := aliasPatterns[subgroup]; ok {
-				fullAliasField = strings.ReplaceAll(fullAliasField, fullMatch, dynamicLabel)
-			} else {
-				fullAliasField = strings.ReplaceAll(fullAliasField, fullMatch, fmt.Sprintf(`${PROP('Dim.%s')}`, subgroup))
-			}
-		}
-		result = fullAliasField
+	fullAliasField := ""
+	if deprecatedAlias != nil {
+		fullAliasField = *deprecatedAlias
 	}
+	matches := legacyAliasRegexp.FindAllStringSubmatch(fullAliasField, -1)
+
+	for _, groups := range matches {
+		fullMatch := groups[0]
+		subgroup := groups[1]
+		if dynamicLabel, ok := aliasPatterns[subgroup]; ok {
+			fullAliasField = strings.ReplaceAll(fullAliasField, fullMatch, dynamicLabel)
+		} else {
+			fullAliasField = strings.ReplaceAll(fullAliasField, fullMatch, fmt.Sprintf(`${PROP('Dim.%s')}`, subgroup))
+		}
+	}
+	result = fullAliasField
 	return result
 }
 
diff --git a/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go b/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
index 8901397f203..007a0af7015 100644
--- a/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
+++ b/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
@@ -8,12 +8,12 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/kindsys"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log/logtest"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
@@ -39,12 +39,12 @@ func TestCloudWatchQuery(t *testing.T) {
 				MetricEditorMode: MetricEditorModeBuilder,
 			}
 
-			deepLink, err := query.BuildDeepLink(startTime, endTime, false)
+			deepLink, err := query.BuildDeepLink(startTime, endTime)
 			require.NoError(t, err)
 			assert.Empty(t, deepLink)
 		})
 
-		t.Run("does not include label in case dynamic label is diabled", func(t *testing.T) {
+		t.Run("includes label and it's a metric stat query", func(t *testing.T) {
 			startTime := time.Now()
 			endTime := startTime.Add(2 * time.Hour)
 			query := &CloudWatchQuery{
@@ -63,36 +63,12 @@ func TestCloudWatchQuery(t *testing.T) {
 				MetricEditorMode: MetricEditorModeBuilder,
 			}
 
-			deepLink, err := query.BuildDeepLink(startTime, endTime, false)
+			deepLink, err := query.BuildDeepLink(startTime, endTime)
 			require.NoError(t, err)
-			assert.NotContains(t, deepLink, "label")
+			assert.Contains(t, deepLink, "label")
 		})
 
-		t.Run("includes label in case dynamic label is enabled and it's a metric stat query", func(t *testing.T) {
-			startTime := time.Now()
-			endTime := startTime.Add(2 * time.Hour)
-			query := &CloudWatchQuery{
-				RefId:      "A",
-				Region:     "us-east-1",
-				Expression: "",
-				Statistic:  "Average",
-				Period:     300,
-				Id:         "id1",
-				MatchExact: true,
-				Label:      "${PROP('Namespace')}",
-				Dimensions: map[string][]string{
-					"InstanceId": {"i-12345678"},
-				},
-				MetricQueryType:  MetricQueryTypeSearch,
-				MetricEditorMode: MetricEditorModeBuilder,
-			}
-
-			deepLink, err := query.BuildDeepLink(startTime, endTime, false)
-			require.NoError(t, err)
-			assert.NotContains(t, deepLink, "label")
-		})
-
-		t.Run("includes label in case dynamic label is enabled and it's a math expression query", func(t *testing.T) {
+		t.Run("includes label and it's a math expression query", func(t *testing.T) {
 			startTime := time.Now()
 			endTime := startTime.Add(2 * time.Hour)
 			query := &CloudWatchQuery{
@@ -108,9 +84,9 @@ func TestCloudWatchQuery(t *testing.T) {
 				MetricEditorMode: MetricEditorModeRaw,
 			}
 
-			deepLink, err := query.BuildDeepLink(startTime, endTime, false)
+			deepLink, err := query.BuildDeepLink(startTime, endTime)
 			require.NoError(t, err)
-			assert.NotContains(t, deepLink, "label")
+			assert.Contains(t, deepLink, "label")
 		})
 
 		t.Run("includes account id in case its a metric stat query and an account id is set", func(t *testing.T) {
@@ -133,7 +109,7 @@ func TestCloudWatchQuery(t *testing.T) {
 				MetricEditorMode: MetricEditorModeBuilder,
 			}
 
-			deepLink, err := query.BuildDeepLink(startTime, endTime, false)
+			deepLink, err := query.BuildDeepLink(startTime, endTime)
 			require.NoError(t, err)
 			assert.Contains(t, deepLink, "accountId%22%3A%22123456789")
 		})
@@ -155,7 +131,7 @@ func TestCloudWatchQuery(t *testing.T) {
 				MetricEditorMode: MetricEditorModeRaw,
 			}
 
-			deepLink, err := query.BuildDeepLink(startTime, endTime, false)
+			deepLink, err := query.BuildDeepLink(startTime, endTime)
 			require.NoError(t, err)
 			assert.NotContains(t, deepLink, "accountId%22%3A%22123456789")
 		})
@@ -311,7 +287,7 @@ func TestRequestParser(t *testing.T) {
 			},
 		}
 
-		migratedQueries, err := ParseMetricDataQueries(oldQuery, time.Now(), time.Now(), "us-east-2", logger, false, false)
+		migratedQueries, err := ParseMetricDataQueries(oldQuery, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.NoError(t, err)
 		require.Len(t, migratedQueries, 1)
 		require.NotNil(t, migratedQueries[0])
@@ -342,7 +318,7 @@ func TestRequestParser(t *testing.T) {
 			},
 		}
 
-		results, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		results, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, results, 1)
 		res := results[0]
@@ -385,7 +361,7 @@ func TestRequestParser(t *testing.T) {
 			},
 		}
 
-		results, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		results, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		assert.NoError(t, err)
 		require.Len(t, results, 1)
 		res := results[0]
@@ -418,7 +394,7 @@ func TestRequestParser(t *testing.T) {
 			},
 		}
 
-		_, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		_, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.Error(t, err)
 
 		assert.Equal(t, `error parsing query "", failed to parse dimensions: unknown type as dimension value`, err.Error())
@@ -447,7 +423,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			},
 		}
 
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		assert.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -479,7 +455,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			to := time.Now()
 			from := to.Local().Add(time.Minute * time.Duration(5))
 
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 60, res[0].Period)
@@ -489,7 +465,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			to := time.Now()
 			from := to.AddDate(0, 0, -1)
 
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 60, res[0].Period)
@@ -498,7 +474,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 		t.Run("Time range is 2 days", func(t *testing.T) {
 			to := time.Now()
 			from := to.AddDate(0, 0, -2)
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 300, res[0].Period)
@@ -508,7 +484,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			to := time.Now()
 			from := to.AddDate(0, 0, -7)
 
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 900, res[0].Period)
@@ -518,7 +494,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			to := time.Now()
 			from := to.AddDate(0, 0, -30)
 
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 3600, res[0].Period)
@@ -528,7 +504,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			to := time.Now()
 			from := to.AddDate(0, 0, -90)
 
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 21600, res[0].Period)
@@ -538,7 +514,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			to := time.Now()
 			from := to.AddDate(-1, 0, 0)
 
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.Nil(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 21600, res[0].Period)
@@ -548,7 +524,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			to := time.Now()
 			from := to.AddDate(-2, 0, 0)
 
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 86400, res[0].Period)
@@ -557,7 +533,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 		t.Run("Time range is 2 days, but 16 days ago", func(t *testing.T) {
 			to := time.Now().AddDate(0, 0, -14)
 			from := to.AddDate(0, 0, -2)
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 300, res[0].Period)
@@ -566,7 +542,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 		t.Run("Time range is 2 days, but 90 days ago", func(t *testing.T) {
 			to := time.Now().AddDate(0, 0, -88)
 			from := to.AddDate(0, 0, -2)
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 3600, res[0].Period)
@@ -575,7 +551,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 		t.Run("Time range is 2 days, but 456 days ago", func(t *testing.T) {
 			to := time.Now().AddDate(0, 0, -454)
 			from := to.AddDate(0, 0, -2)
-			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			assert.Equal(t, 21600, res[0].Period)
@@ -590,7 +566,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 				}`),
 			},
 		}
-		_, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		_, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.Error(t, err)
 		assert.Equal(t, `error parsing query "", failed to parse period as duration: time: invalid duration "invalid"`, err.Error())
 	})
@@ -605,7 +581,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
 			},
 		}
 
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		assert.NoError(t, err)
 
 		require.Len(t, res, 1)
@@ -692,7 +668,7 @@ func Test_ParseMetricDataQueries_query_type_and_metric_editor_mode_and_GMD_query
 					),
 				},
 			}
-			res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, false, false)
+			res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, false)
 			require.NoError(t, err)
 			require.Len(t, res, 1)
 			require.NotNil(t, res[0])
@@ -718,7 +694,7 @@ func Test_ParseMetricDataQueries_hide_and_ReturnData(t *testing.T) {
 				}`),
 			},
 		}
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -739,7 +715,7 @@ func Test_ParseMetricDataQueries_hide_and_ReturnData(t *testing.T) {
 				}`),
 			},
 		}
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -760,7 +736,7 @@ func Test_ParseMetricDataQueries_hide_and_ReturnData(t *testing.T) {
 				}`),
 			},
 		}
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -779,7 +755,7 @@ func Test_ParseMetricDataQueries_hide_and_ReturnData(t *testing.T) {
 				}`),
 			},
 		}
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -800,7 +776,7 @@ func Test_ParseMetricDataQueries_hide_and_ReturnData(t *testing.T) {
 				}`),
 			},
 		}
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -821,7 +797,7 @@ func Test_ParseMetricDataQueries_hide_and_ReturnData(t *testing.T) {
 				}`),
 			},
 		}
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -844,7 +820,7 @@ func Test_ParseMetricDataQueries_ID(t *testing.T) {
 				}`),
 			},
 		}
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -865,7 +841,7 @@ func Test_ParseMetricDataQueries_ID(t *testing.T) {
 				}`),
 			},
 		}
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), "us-east-2", logger, false)
 		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -882,7 +858,6 @@ func Test_ParseMetricDataQueries_sets_label_when_label_is_present_in_json_query(
 				   "region":"us-east-1",
 				   "namespace":"ec2",
 				   "metricName":"CPUUtilization",
-				   "alias":"some alias",
 				   "label":"some label",
 				   "dimensions":{"InstanceId":["test"]},
 				   "statistic":"Average",
@@ -892,11 +867,10 @@ func Test_ParseMetricDataQueries_sets_label_when_label_is_present_in_json_query(
 		},
 	}
 
-	res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, true, false)
+	res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, false)
 	assert.NoError(t, err)
 	require.Len(t, res, 1)
 	require.NotNil(t, res[0])
-	assert.Equal(t, "some alias", res[0].Alias) // untouched
 	assert.Equal(t, "some label", res[0].Label)
 }
 
@@ -936,12 +910,12 @@ func Test_migrateAliasToDynamicLabel_single_query_preserves_old_alias_and_create
 				},
 			}
 
-			assert.Equal(t, tc.expectedLabel, getLabel(queryToMigrate, true))
+			assert.Equal(t, tc.expectedLabel, getLabel(queryToMigrate))
 		})
 	}
 }
 func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
-	t.Run("migrates alias to label when label does not already exist and feature toggle enabled", func(t *testing.T) {
+	t.Run("migrates alias to label when label does not already exist", func(t *testing.T) {
 		query := []backend.DataQuery{
 			{
 				JSON: []byte(`{
@@ -958,13 +932,12 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
 			},
 		}
 
-		res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, true, false)
+		res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.NoError(t, err)
 
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
 
-		assert.Equal(t, "{{period}} {{any_other_word}}", res[0].Alias)
 		assert.Equal(t, "${PROP('Period')} ${PROP('Dim.any_other_word')}", res[0].Label)
 		assert.Equal(t, map[string][]string{"InstanceId": {"test"}}, res[0].Dimensions)
 		assert.Equal(t, true, res[0].ReturnData)
@@ -1005,7 +978,7 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
 			},
 		}
 
-		res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, true, false)
+		res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.NoError(t, err)
 		require.Len(t, res, 2)
 
@@ -1014,7 +987,6 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
 		})
 
 		require.NotNil(t, res[0])
-		assert.Equal(t, "{{period}} {{any_other_word}}", res[0].Alias)
 		assert.Equal(t, "${PROP('Period')} ${PROP('Dim.any_other_word')}", res[0].Label)
 		assert.Equal(t, map[string][]string{"InstanceId": {"test"}}, res[0].Dimensions)
 		assert.Equal(t, true, res[0].ReturnData)
@@ -1025,7 +997,6 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
 		assert.Equal(t, "Average", res[0].Statistic)
 
 		require.NotNil(t, res[1])
-		assert.Equal(t, "{{  label }}", res[1].Alias)
 		assert.Equal(t, "${LABEL}", res[1].Label)
 		assert.Equal(t, map[string][]string{"InstanceId": {"test"}}, res[1].Dimensions)
 		assert.Equal(t, true, res[1].ReturnData)
@@ -1042,19 +1013,11 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
 			dynamicLabelsFeatureToggleEnabled bool
 			expectedLabel                     string
 		}{
-			"when label already exists, feature toggle enabled": {
+			"when label already exists": {
 				labelJson:                         `"label":"some label",`,
 				dynamicLabelsFeatureToggleEnabled: true,
-				expectedLabel:                     "some label"},
-			"when label does not exist, feature toggle is disabled": {
-				labelJson:                         "",
-				dynamicLabelsFeatureToggleEnabled: false,
-				expectedLabel:                     "",
+				expectedLabel:                     "some label",
 			},
-			"when label already exists, feature toggle is disabled": {
-				labelJson:                         `"label":"some label",`,
-				dynamicLabelsFeatureToggleEnabled: false,
-				expectedLabel:                     "some label"},
 		}
 		for name, tc := range testCases {
 			t.Run(name, func(t *testing.T) {
@@ -1074,13 +1037,12 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
 				}`, tc.labelJson)),
 					},
 				}
-				res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, tc.dynamicLabelsFeatureToggleEnabled, false)
+				res, err := ParseMetricDataQueries(query, time.Now(), time.Now(), "us-east-2", logger, false)
 				assert.NoError(t, err)
 
 				require.Len(t, res, 1)
 				require.NotNil(t, res[0])
 
-				assert.Equal(t, "{{period}} {{any_other_word}}", res[0].Alias)
 				assert.Equal(t, tc.expectedLabel, res[0].Label)
 				assert.Equal(t, map[string][]string{"InstanceId": {"test"}}, res[0].Dimensions)
 				assert.Equal(t, true, res[0].ReturnData)
@@ -1101,7 +1063,7 @@ func Test_ParseMetricDataQueries_statistics_and_query_type_validation_and_MatchE
 				{
 					JSON: []byte("{}"),
 				},
-			}, time.Now(), time.Now(), "us-east-2", logger, false, false)
+			}, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.Error(t, err)
 		assert.Equal(t, `error parsing query "", query must have either statistic or statistics field`, err.Error())
 
@@ -1114,7 +1076,7 @@ func Test_ParseMetricDataQueries_statistics_and_query_type_validation_and_MatchE
 				{
 					JSON: []byte(`{"type":"some other type", "statistic":"Average", "matchExact":false}`),
 				},
-			}, time.Now(), time.Now(), "us-east-2", logger, false, false)
+			}, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.NoError(t, err)
 
 		assert.Empty(t, actual)
@@ -1126,7 +1088,7 @@ func Test_ParseMetricDataQueries_statistics_and_query_type_validation_and_MatchE
 				{
 					JSON: []byte(`{"statistic":"Average"}`),
 				},
-			}, time.Now(), time.Now(), "us-east-2", logger, false, false)
+			}, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.NoError(t, err)
 
 		assert.NotEmpty(t, actual)
@@ -1138,7 +1100,7 @@ func Test_ParseMetricDataQueries_statistics_and_query_type_validation_and_MatchE
 				{
 					JSON: []byte(`{"statistic":"Average"}`),
 				},
-			}, time.Now(), time.Now(), "us-east-2", logger, false, false)
+			}, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.NoError(t, err)
 
 		assert.Len(t, actual, 1)
@@ -1152,7 +1114,7 @@ func Test_ParseMetricDataQueries_statistics_and_query_type_validation_and_MatchE
 				{
 					JSON: []byte(`{"statistic":"Average","matchExact":false}`),
 				},
-			}, time.Now(), time.Now(), "us-east-2", logger, false, false)
+			}, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.NoError(t, err)
 
 		assert.Len(t, actual, 1)
@@ -1168,7 +1130,7 @@ func Test_ParseMetricDataQueries_account_Id(t *testing.T) {
 				{
 					JSON: []byte(`{"accountId":"some account id", "statistic":"Average"}`),
 				},
-			}, time.Now(), time.Now(), "us-east-2", logger, false, true)
+			}, time.Now(), time.Now(), "us-east-2", logger, true)
 		assert.NoError(t, err)
 
 		require.Len(t, actual, 1)
@@ -1183,7 +1145,7 @@ func Test_ParseMetricDataQueries_account_Id(t *testing.T) {
 				{
 					JSON: []byte(`{"accountId":"some account id", "statistic":"Average"}`),
 				},
-			}, time.Now(), time.Now(), "us-east-2", logger, false, false)
+			}, time.Now(), time.Now(), "us-east-2", logger, false)
 		assert.NoError(t, err)
 
 		require.Len(t, actual, 1)
@@ -1215,7 +1177,7 @@ func Test_ParseMetricDataQueries_default_region(t *testing.T) {
 		}
 
 		region := "us-east-2"
-		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), region, logger, false, false)
+		res, err := ParseMetricDataQueries(query, time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour), region, logger, false)
 		assert.NoError(t, err)
 		require.Len(t, res, 1)
 		require.NotNil(t, res[0])
@@ -1253,7 +1215,6 @@ func Test_ParseMetricDataQueries_ApplyMacros(t *testing.T) {
 								"region":"us-east-1",
 								"namespace":"ec2",
 								"metricName":"CPUUtilization",
-								"alias":"{{period}} {{any_other_word}}",
 								"dimensions":{"InstanceId":["test"]},
 								"statistic":"Average",
 								"period":"600",
@@ -1263,7 +1224,7 @@ func Test_ParseMetricDataQueries_ApplyMacros(t *testing.T) {
 								"metricEditorMode": 1
 							 }`),
 						},
-					}, tc.startTime, time.Now(), "us-east-1", logger, false, false)
+					}, tc.startTime, time.Now(), "us-east-1", logger, false)
 				assert.NoError(t, err)
 				assert.Equal(t, fmt.Sprintf("SEARCH('{AWS/EC2,InstanceId}', 'Average', %s)", tc.expectedPeriod), actual[0].Expression)
 			})
@@ -1279,7 +1240,6 @@ func Test_ParseMetricDataQueries_ApplyMacros(t *testing.T) {
 						"region":"us-east-1",
 						"namespace":"ec2",
 						"metricName":"CPUUtilization",
-						"alias":"{{period}} {{any_other_word}}",
 						"dimensions":{"InstanceId":["test"]},
 						"statistic":"Average",
 						"period":"600",
@@ -1289,7 +1249,7 @@ func Test_ParseMetricDataQueries_ApplyMacros(t *testing.T) {
 						"metricEditorMode": 1
 					 }`),
 				},
-			}, time.Now(), time.Now(), "us-east-1", logger, false, false)
+			}, time.Now(), time.Now(), "us-east-1", logger, false)
 		assert.NoError(t, err)
 		assert.Equal(t, "SEARCH('{AWS/EC2,InstanceId}', 'Average', $__period_auto)", actual[0].Expression)
 	})
diff --git a/pkg/tsdb/cloudwatch/response_parser.go b/pkg/tsdb/cloudwatch/response_parser.go
index 34c66d5c1a2..78b7154afa7 100644
--- a/pkg/tsdb/cloudwatch/response_parser.go
+++ b/pkg/tsdb/cloudwatch/response_parser.go
@@ -3,14 +3,12 @@ package cloudwatch
 import (
 	"fmt"
 	"sort"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
@@ -32,7 +30,7 @@ func (e *cloudWatchExecutor) parseResponse(startTime time.Time, endTime time.Tim
 		}
 
 		var err error
-		dataRes.Frames, err = buildDataFrames(startTime, endTime, response, queryRow, e.features.IsEnabled(featuremgmt.FlagCloudWatchDynamicLabels))
+		dataRes.Frames, err = buildDataFrames(startTime, endTime, response, queryRow)
 		if err != nil {
 			return nil, err
 		}
@@ -110,12 +108,12 @@ func getLabels(cloudwatchLabel string, query *models.CloudWatchQuery) data.Label
 }
 
 func buildDataFrames(startTime time.Time, endTime time.Time, aggregatedResponse models.QueryRowResponse,
-	query *models.CloudWatchQuery, dynamicLabelEnabled bool) (data.Frames, error) {
+	query *models.CloudWatchQuery) (data.Frames, error) {
 	frames := data.Frames{}
 	for _, metric := range aggregatedResponse.Metrics {
 		label := *metric.Label
 
-		deepLink, err := query.BuildDeepLink(startTime, endTime, dynamicLabelEnabled)
+		deepLink, err := query.BuildDeepLink(startTime, endTime)
 		if err != nil {
 			return nil, err
 		}
@@ -143,14 +141,10 @@ func buildDataFrames(startTime time.Time, endTime time.Time, aggregatedResponse
 				timeField := data.NewField(data.TimeSeriesTimeFieldName, nil, []*time.Time{})
 				valueField := data.NewField(data.TimeSeriesValueFieldName, labels, []*float64{})
 
-				frameName := label
-				if !dynamicLabelEnabled {
-					frameName = formatAlias(query, query.Statistic, labels, label)
-				}
-				valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: frameName, Links: createDataLinks(deepLink)})
+				valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: label, Links: createDataLinks(deepLink)})
 
 				emptyFrame := data.Frame{
-					Name: frameName,
+					Name: label,
 					Fields: []*data.Field{
 						timeField,
 						valueField,
@@ -175,14 +169,10 @@ func buildDataFrames(startTime time.Time, endTime time.Time, aggregatedResponse
 		timeField := data.NewField(data.TimeSeriesTimeFieldName, nil, timestamps)
 		valueField := data.NewField(data.TimeSeriesValueFieldName, labels, points)
 
-		frameName := label
-		if !dynamicLabelEnabled {
-			frameName = formatAlias(query, query.Statistic, labels, label)
-		}
-		valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: frameName, Links: createDataLinks(deepLink)})
+		valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: label, Links: createDataLinks(deepLink)})
 
 		frame := data.Frame{
-			Name: frameName,
+			Name: label,
 			Fields: []*data.Field{
 				timeField,
 				valueField,
@@ -213,66 +203,6 @@ func buildDataFrames(startTime time.Time, endTime time.Time, aggregatedResponse
 	return frames, nil
 }
 
-func formatAlias(query *models.CloudWatchQuery, stat string, dimensions map[string]string, label string) string {
-	region := query.Region
-	namespace := query.Namespace
-	metricName := query.MetricName
-	period := strconv.Itoa(query.Period)
-
-	if query.IsUserDefinedSearchExpression() {
-		pIndex := strings.LastIndex(query.Expression, ",")
-		period = strings.Trim(query.Expression[pIndex+1:], " )")
-		sIndex := strings.LastIndex(query.Expression[:pIndex], ",")
-		stat = strings.Trim(query.Expression[sIndex+1:pIndex], " '")
-	}
-
-	if len(query.Alias) == 0 && query.IsMathExpression() {
-		return query.Id
-	}
-	if len(query.Alias) == 0 && query.IsInferredSearchExpression() && !query.IsMultiValuedDimensionExpression() {
-		return label
-	}
-	if len(query.Alias) == 0 && query.MetricQueryType == models.MetricQueryTypeQuery {
-		return label
-	}
-
-	// common fields
-	commonFields := map[string]string{
-		"region": region,
-		"period": period,
-	}
-	if len(label) != 0 {
-		commonFields["label"] = label
-	}
-
-	// since the SQL query string is not (yet) parsed, we don't know what namespace, metric, statistic and labels it's using at this point
-	if query.MetricQueryType != models.MetricQueryTypeQuery {
-		commonFields["namespace"] = namespace
-		commonFields["metric"] = metricName
-		commonFields["stat"] = stat
-		for k, v := range dimensions {
-			commonFields[k] = v
-		}
-	}
-
-	result := aliasFormat.ReplaceAllFunc([]byte(query.Alias), func(in []byte) []byte {
-		labelName := strings.Replace(string(in), "{{", "", 1)
-		labelName = strings.Replace(labelName, "}}", "", 1)
-		labelName = strings.TrimSpace(labelName)
-		if val, exists := commonFields[labelName]; exists {
-			return []byte(val)
-		}
-
-		return in
-	})
-
-	if string(result) == "" {
-		return metricName + "_" + stat
-	}
-
-	return string(result)
-}
-
 func createDataLinks(link string) []data.DataLink {
 	dataLinks := []data.DataLink{}
 	if link != "" {
diff --git a/pkg/tsdb/cloudwatch/response_parser_test.go b/pkg/tsdb/cloudwatch/response_parser_test.go
index 5613268e5fd..1701bcce634 100644
--- a/pkg/tsdb/cloudwatch/response_parser_test.go
+++ b/pkg/tsdb/cloudwatch/response_parser_test.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
@@ -27,8 +26,6 @@ func loadGetMetricDataOutputsFromFile(filePath string) ([]*cloudwatch.GetMetricD
 }
 
 func TestCloudWatchResponseParser(t *testing.T) {
-	startTime := time.Now()
-	endTime := startTime.Add(2 * time.Hour)
 	t.Run("when aggregating multi-outputs response", func(t *testing.T) {
 		getMetricDataOutputs, err := loadGetMetricDataOutputsFromFile("./testdata/multiple-outputs-query-a.json")
 		require.NoError(t, err)
@@ -137,8 +134,12 @@ func TestCloudWatchResponseParser(t *testing.T) {
 			})
 		})
 	})
+}
 
-	t.Run("Expand dimension value using exact match", func(t *testing.T) {
+func Test_buildDataFrames_uses_response_label_as_frame_name(t *testing.T) {
+	startTime := time.Now()
+	endTime := startTime.Add(2 * time.Hour)
+	t.Run("using exact match", func(t *testing.T) {
 		timestamp := time.Unix(0, 0)
 		response := &models.QueryRowResponse{
 			Metrics: []*cloudwatch.MetricDataResult{
@@ -186,92 +187,28 @@ func TestCloudWatchResponseParser(t *testing.T) {
 			},
 			Statistic:        "Average",
 			Period:           60,
-			Alias:            "{{LoadBalancer}} Expanded",
 			MetricQueryType:  models.MetricQueryTypeSearch,
 			MetricEditorMode: models.MetricEditorModeBuilder,
 		}
-		frames, err := buildDataFrames(startTime, endTime, *response, query, false)
+		frames, err := buildDataFrames(startTime, endTime, *response, query)
 		require.NoError(t, err)
 
 		frame1 := frames[0]
-		assert.Equal(t, "lb1 Expanded", frame1.Name)
+		assert.Equal(t, "lb1", frame1.Name)
 		assert.Equal(t, "lb1", frame1.Fields[1].Labels["LoadBalancer"])
 
 		frame2 := frames[1]
-		assert.Equal(t, "lb2 Expanded", frame2.Name)
+		assert.Equal(t, "lb2", frame2.Name)
 		assert.Equal(t, "lb2", frame2.Fields[1].Labels["LoadBalancer"])
 	})
 
-	t.Run("Expand dimension value using substring", func(t *testing.T) {
-		timestamp := time.Unix(0, 0)
-		response := &models.QueryRowResponse{
-			Metrics: []*cloudwatch.MetricDataResult{
-				{
-					Id:    aws.String("id1"),
-					Label: aws.String("lb1 Sum"),
-					Timestamps: []*time.Time{
-						aws.Time(timestamp),
-						aws.Time(timestamp.Add(time.Minute)),
-						aws.Time(timestamp.Add(3 * time.Minute)),
-					},
-					Values: []*float64{
-						aws.Float64(10),
-						aws.Float64(20),
-						aws.Float64(30),
-					},
-					StatusCode: aws.String("Complete"),
-				},
-				{
-					Id:    aws.String("id2"),
-					Label: aws.String("lb2 Average"),
-					Timestamps: []*time.Time{
-						aws.Time(timestamp),
-						aws.Time(timestamp.Add(time.Minute)),
-						aws.Time(timestamp.Add(3 * time.Minute)),
-					},
-					Values: []*float64{
-						aws.Float64(10),
-						aws.Float64(20),
-						aws.Float64(30),
-					},
-					StatusCode: aws.String("Complete"),
-				},
-			}}
-
-		query := &models.CloudWatchQuery{
-			RefId:      "refId1",
-			Region:     "us-east-1",
-			Namespace:  "AWS/ApplicationELB",
-			MetricName: "TargetResponseTime",
-			Dimensions: map[string][]string{
-				"LoadBalancer": {"lb1", "lb2"},
-				"TargetGroup":  {"tg"},
-			},
-			Statistic:        "Average",
-			Period:           60,
-			Alias:            "{{LoadBalancer}} Expanded",
-			MetricQueryType:  models.MetricQueryTypeSearch,
-			MetricEditorMode: models.MetricEditorModeBuilder,
-		}
-		frames, err := buildDataFrames(startTime, endTime, *response, query, false)
-		require.NoError(t, err)
-
-		frame1 := frames[0]
-		assert.Equal(t, "lb1 Expanded", frame1.Name)
-		assert.Equal(t, "lb1", frame1.Fields[1].Labels["LoadBalancer"])
-
-		frame2 := frames[1]
-		assert.Equal(t, "lb2 Expanded", frame2.Name)
-		assert.Equal(t, "lb2", frame2.Fields[1].Labels["LoadBalancer"])
-	})
-
-	t.Run("Expand dimension value using wildcard", func(t *testing.T) {
+	t.Run("using wildcard", func(t *testing.T) {
 		timestamp := time.Unix(0, 0)
 		response := &models.QueryRowResponse{
 			Metrics: []*cloudwatch.MetricDataResult{
 				{
 					Id:    aws.String("lb3"),
-					Label: aws.String("lb3"),
+					Label: aws.String("some label lb3"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
 						aws.Time(timestamp.Add(time.Minute)),
@@ -286,7 +223,7 @@ func TestCloudWatchResponseParser(t *testing.T) {
 				},
 				{
 					Id:    aws.String("lb4"),
-					Label: aws.String("lb4"),
+					Label: aws.String("some label lb4"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
 						aws.Time(timestamp.Add(time.Minute)),
@@ -313,24 +250,23 @@ func TestCloudWatchResponseParser(t *testing.T) {
 			},
 			Statistic:        "Average",
 			Period:           60,
-			Alias:            "{{LoadBalancer}} Expanded",
 			MetricQueryType:  models.MetricQueryTypeSearch,
 			MetricEditorMode: models.MetricEditorModeBuilder,
 		}
-		frames, err := buildDataFrames(startTime, endTime, *response, query, false)
+		frames, err := buildDataFrames(startTime, endTime, *response, query)
 		require.NoError(t, err)
 
-		assert.Equal(t, "lb3 Expanded", frames[0].Name)
-		assert.Equal(t, "lb4 Expanded", frames[1].Name)
+		assert.Equal(t, "some label lb3", frames[0].Name)
+		assert.Equal(t, "some label lb4", frames[1].Name)
 	})
 
-	t.Run("Expand dimension value when no values are returned and a multi-valued template variable is used", func(t *testing.T) {
+	t.Run("when no values are returned and a multi-valued template variable is used", func(t *testing.T) {
 		timestamp := time.Unix(0, 0)
 		response := &models.QueryRowResponse{
 			Metrics: []*cloudwatch.MetricDataResult{
 				{
 					Id:    aws.String("lb3"),
-					Label: aws.String("lb3"),
+					Label: aws.String("some label"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
 						aws.Time(timestamp.Add(time.Minute)),
@@ -351,25 +287,24 @@ func TestCloudWatchResponseParser(t *testing.T) {
 			},
 			Statistic:        "Average",
 			Period:           60,
-			Alias:            "{{LoadBalancer}} Expanded",
 			MetricQueryType:  models.MetricQueryTypeSearch,
 			MetricEditorMode: models.MetricEditorModeBuilder,
 		}
-		frames, err := buildDataFrames(startTime, endTime, *response, query, false)
+		frames, err := buildDataFrames(startTime, endTime, *response, query)
 		require.NoError(t, err)
 
 		assert.Len(t, frames, 2)
-		assert.Equal(t, "lb1 Expanded", frames[0].Name)
-		assert.Equal(t, "lb2 Expanded", frames[1].Name)
+		assert.Equal(t, "some label", frames[0].Name)
+		assert.Equal(t, "some label", frames[1].Name)
 	})
 
-	t.Run("Expand dimension value when no values are returned and a multi-valued template variable and two single-valued dimensions are used", func(t *testing.T) {
+	t.Run("when no values are returned and a multi-valued template variable and two single-valued dimensions are used", func(t *testing.T) {
 		timestamp := time.Unix(0, 0)
 		response := &models.QueryRowResponse{
 			Metrics: []*cloudwatch.MetricDataResult{
 				{
 					Id:    aws.String("lb3"),
-					Label: aws.String("lb3"),
+					Label: aws.String("some label"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
 						aws.Time(timestamp.Add(time.Minute)),
@@ -393,25 +328,24 @@ func TestCloudWatchResponseParser(t *testing.T) {
 			},
 			Statistic:        "Average",
 			Period:           60,
-			Alias:            "{{LoadBalancer}} Expanded {{InstanceType}} - {{Resource}}",
 			MetricQueryType:  models.MetricQueryTypeSearch,
 			MetricEditorMode: models.MetricEditorModeBuilder,
 		}
-		frames, err := buildDataFrames(startTime, endTime, *response, query, false)
+		frames, err := buildDataFrames(startTime, endTime, *response, query)
 		require.NoError(t, err)
 
 		assert.Len(t, frames, 2)
-		assert.Equal(t, "lb1 Expanded micro - res", frames[0].Name)
-		assert.Equal(t, "lb2 Expanded micro - res", frames[1].Name)
+		assert.Equal(t, "some label", frames[0].Name)
+		assert.Equal(t, "some label", frames[1].Name)
 	})
 
-	t.Run("Should only expand certain fields when using SQL queries", func(t *testing.T) {
+	t.Run("when using SQL queries", func(t *testing.T) {
 		timestamp := time.Unix(0, 0)
 		response := &models.QueryRowResponse{
 			Metrics: []*cloudwatch.MetricDataResult{
 				{
 					Id:    aws.String("lb3"),
-					Label: aws.String("lb3"),
+					Label: aws.String("some label"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
 					},
@@ -433,20 +367,13 @@ func TestCloudWatchResponseParser(t *testing.T) {
 			},
 			Statistic:        "Average",
 			Period:           60,
-			Alias:            "{{LoadBalancer}} {{InstanceType}} {{metric}} {{namespace}} {{stat}} {{region}} {{period}}",
 			MetricQueryType:  models.MetricQueryTypeQuery,
 			MetricEditorMode: models.MetricEditorModeRaw,
 		}
-		frames, err := buildDataFrames(startTime, endTime, *response, query, false)
+		frames, err := buildDataFrames(startTime, endTime, *response, query)
 		require.NoError(t, err)
 
-		assert.False(t, strings.Contains(frames[0].Name, "AWS/ApplicationELB"))
-		assert.False(t, strings.Contains(frames[0].Name, "lb1"))
-		assert.False(t, strings.Contains(frames[0].Name, "micro"))
-		assert.False(t, strings.Contains(frames[0].Name, "AWS/ApplicationELB"))
-
-		assert.True(t, strings.Contains(frames[0].Name, "us-east-1"))
-		assert.True(t, strings.Contains(frames[0].Name, "60"))
+		assert.Equal(t, "some label", frames[0].Name)
 	})
 
 	t.Run("Parse cloudwatch response", func(t *testing.T) {
@@ -455,7 +382,7 @@ func TestCloudWatchResponseParser(t *testing.T) {
 			Metrics: []*cloudwatch.MetricDataResult{
 				{
 					Id:    aws.String("id1"),
-					Label: aws.String("lb"),
+					Label: aws.String("some label"),
 					Timestamps: []*time.Time{
 						aws.Time(timestamp),
 						aws.Time(timestamp.Add(time.Minute)),
@@ -482,15 +409,14 @@ func TestCloudWatchResponseParser(t *testing.T) {
 			},
 			Statistic:        "Average",
 			Period:           60,
-			Alias:            "{{namespace}}_{{metric}}_{{stat}}",
 			MetricQueryType:  models.MetricQueryTypeSearch,
 			MetricEditorMode: models.MetricEditorModeBuilder,
 		}
-		frames, err := buildDataFrames(startTime, endTime, *response, query, false)
+		frames, err := buildDataFrames(startTime, endTime, *response, query)
 		require.NoError(t, err)
 
 		frame := frames[0]
-		assert.Equal(t, "AWS/ApplicationELB_TargetResponseTime_Average", frame.Name)
+		assert.Equal(t, "some label", frame.Name)
 		assert.Equal(t, "Time", frame.Fields[0].Name)
 		assert.Equal(t, "lb", frame.Fields[1].Labels["LoadBalancer"])
 		assert.Equal(t, 10.0, *frame.Fields[1].At(0).(*float64))
@@ -499,23 +425,4 @@ func TestCloudWatchResponseParser(t *testing.T) {
 		assert.Equal(t, "Value", frame.Fields[1].Name)
 		assert.Equal(t, "", frame.Fields[1].Config.DisplayName)
 	})
-
-	t.Run("buildDataFrames should use response label as frame name when dynamic label is enabled", func(t *testing.T) {
-		response := &models.QueryRowResponse{
-			Metrics: []*cloudwatch.MetricDataResult{
-				{
-					Label:      aws.String("some response label"),
-					Timestamps: []*time.Time{},
-					Values:     []*float64{aws.Float64(10)},
-					StatusCode: aws.String("Complete"),
-				},
-			},
-		}
-
-		frames, err := buildDataFrames(startTime, endTime, *response, &models.CloudWatchQuery{}, true)
-
-		assert.NoError(t, err)
-		require.Len(t, frames, 1)
-		assert.Equal(t, "some response label", frames[0].Name)
-	})
 }
diff --git a/pkg/tsdb/cloudwatch/time_series_query.go b/pkg/tsdb/cloudwatch/time_series_query.go
index 32a839f0767..e53e7a056f9 100644
--- a/pkg/tsdb/cloudwatch/time_series_query.go
+++ b/pkg/tsdb/cloudwatch/time_series_query.go
@@ -37,7 +37,6 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger
 	}
 
 	requestQueries, err := models.ParseMetricDataQueries(req.Queries, startTime, endTime, instance.Settings.Region, logger,
-		e.features.IsEnabled(featuremgmt.FlagCloudWatchDynamicLabels),
 		e.features.IsEnabled(featuremgmt.FlagCloudWatchCrossAccountQuerying))
 	if err != nil {
 		return nil, err
diff --git a/pkg/tsdb/cloudwatch/time_series_query_test.go b/pkg/tsdb/cloudwatch/time_series_query_test.go
index 5ee82a2ae99..d51a3ca5e13 100644
--- a/pkg/tsdb/cloudwatch/time_series_query_test.go
+++ b/pkg/tsdb/cloudwatch/time_series_query_test.go
@@ -77,7 +77,6 @@ func TestTimeSeriesQuery(t *testing.T) {
 						},
 						"region": "us-east-2",
 						"id": "a",
-						"alias": "NetworkOut",
 						"statistics": [
 						  "Maximum"
 						],
@@ -104,7 +103,6 @@ func TestTimeSeriesQuery(t *testing.T) {
 						},
 						"region": "us-east-2",
 						"id": "b",
-						"alias": "NetworkIn",
 						"statistics": [
 						"Maximum"
 						],
@@ -275,7 +273,6 @@ type queryParameters struct {
 	MetricEditorMode dataquery.CloudWatchMetricsQueryMetricEditorMode `json:"metricEditorMode"`
 	Dimensions       queryDimensions                                  `json:"dimensions"`
 	Expression       string                                           `json:"expression"`
-	Alias            string                                           `json:"alias"`
 	Label            *string                                          `json:"label"`
 	Statistic        string                                           `json:"statistic"`
 	Period           string                                           `json:"period"`
@@ -300,7 +297,6 @@ func newTestQuery(t testing.TB, p queryParameters) json.RawMessage {
 		Expression string  `json:"expression"`
 		Region     string  `json:"region"`
 		ID         string  `json:"id"`
-		Alias      string  `json:"alias"`
 		Label      *string `json:"label"`
 		Statistic  string  `json:"statistic"`
 		Period     string  `json:"period"`
@@ -317,7 +313,6 @@ func newTestQuery(t testing.TB, p queryParameters) json.RawMessage {
 		MetricEditorMode: p.MetricEditorMode,
 		Dimensions:       p.Dimensions,
 		Expression:       p.Expression,
-		Alias:            p.Alias,
 		Label:            p.Label,
 		Statistic:        p.Statistic,
 		Period:           p.Period,
@@ -346,10 +341,10 @@ func Test_QueryData_timeSeriesQuery_GetMetricDataWithContext(t *testing.T) {
 		return DataSource{Settings: models.CloudWatchSettings{}}, nil
 	})
 
-	t.Run("passes query label as GetMetricData label when dynamic labels feature toggle is enabled", func(t *testing.T) {
+	t.Run("passes query label as GetMetricData label", func(t *testing.T) {
 		api = mocks.MetricsAPI{}
 		api.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatch.GetMetricDataOutput{}, nil)
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchDynamicLabels))
+		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 		query := newTestQuery(t, queryParameters{
 			Label: aws.String("${PROP('Period')} some words ${PROP('Dim.InstanceId')}"),
 		})
@@ -378,27 +373,17 @@ func Test_QueryData_timeSeriesQuery_GetMetricDataWithContext(t *testing.T) {
 	})
 
 	testCases := map[string]struct {
-		feature    *featuremgmt.FeatureManager
 		parameters queryParameters
 	}{
-		"should not pass GetMetricData label when query label is empty, dynamic labels is enabled": {
-			feature: featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchDynamicLabels),
-		},
-		"should not pass GetMetricData label when query label is empty string, dynamic labels is enabled": {
-			feature:    featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchDynamicLabels),
-			parameters: queryParameters{Label: aws.String("")},
-		},
-		"should not pass GetMetricData label when dynamic labels is disabled": {
-			feature:    featuremgmt.WithFeatures(),
-			parameters: queryParameters{Label: aws.String("${PROP('Period')} some words ${PROP('Dim.InstanceId')}")},
-		},
+		"should not pass GetMetricData label when query label is empty":        {},
+		"should not pass GetMetricData label when query label is empty string": {parameters: queryParameters{Label: aws.String("")}},
 	}
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
 			api = mocks.MetricsAPI{}
 			api.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatch.GetMetricDataOutput{}, nil)
-			executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, tc.feature)
+			executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 
 			_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 				PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -425,7 +410,7 @@ func Test_QueryData_timeSeriesQuery_GetMetricDataWithContext(t *testing.T) {
 	}
 }
 
-func Test_QueryData_response_data_frame_names(t *testing.T) {
+func Test_QueryData_response_data_frame_name_is_always_response_label(t *testing.T) {
 	origNewCWClient := NewCWClient
 	t.Cleanup(func() {
 		NewCWClient = origNewCWClient
@@ -449,11 +434,10 @@ func Test_QueryData_response_data_frame_names(t *testing.T) {
 	})
 	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
 
-	t.Run("where user defines search expression and alias is defined, then frame name prioritizes period and stat from expression over input", func(t *testing.T) {
+	t.Run("where user defines search expression", func(t *testing.T) {
 		query := newTestQuery(t, queryParameters{
-			MetricQueryType:  models.MetricQueryTypeSearch, // contributes to isUserDefinedSearchExpression = true
-			MetricEditorMode: models.MetricEditorModeRaw,   // contributes to isUserDefinedSearchExpression = true
-			Alias:            "{{period}} {{stat}}",
+			MetricQueryType:  models.MetricQueryTypeSearch,                                                 // contributes to isUserDefinedSearchExpression = true
+			MetricEditorMode: models.MetricEditorModeRaw,                                                   // contributes to isUserDefinedSearchExpression = true
 			Expression:       `SEARCH('{AWS/EC2,InstanceId} MetricName="CPUUtilization"', 'Average', 300)`, // period 300 and stat 'Average' parsed from this expression
 			Statistic:        "Maximum",                                                                    // stat parsed from expression takes precedence over 'Maximum'
 			Period:           "1200",                                                                       // period parsed from expression takes precedence over 1200
@@ -471,10 +455,10 @@ func Test_QueryData_response_data_frame_names(t *testing.T) {
 		})
 
 		assert.NoError(t, err)
-		assert.Equal(t, "300 Average", resp.Responses["A"].Frames[0].Name)
+		assert.Equal(t, labelFromGetMetricData, resp.Responses["A"].Frames[0].Name)
 	})
 
-	t.Run("where no alias is provided and query is math expression, then frame name is queryId", func(t *testing.T) {
+	t.Run("where query is math expression", func(t *testing.T) {
 		query := newTestQuery(t, queryParameters{
 			MetricQueryType:  models.MetricQueryTypeSearch,
 			MetricEditorMode: models.MetricEditorModeRaw,
@@ -492,10 +476,10 @@ func Test_QueryData_response_data_frame_names(t *testing.T) {
 		})
 
 		assert.NoError(t, err)
-		assert.Equal(t, queryId, resp.Responses["A"].Frames[0].Name)
+		assert.Equal(t, labelFromGetMetricData, resp.Responses["A"].Frames[0].Name)
 	})
 
-	t.Run("where no alias provided and query type is MetricQueryTypeQuery, then frame name is label", func(t *testing.T) {
+	t.Run("where query type is MetricQueryTypeQuery", func(t *testing.T) {
 		query := newTestQuery(t, queryParameters{
 			MetricQueryType: models.MetricQueryTypeQuery,
 		})
@@ -515,7 +499,7 @@ func Test_QueryData_response_data_frame_names(t *testing.T) {
 		assert.Equal(t, labelFromGetMetricData, resp.Responses["A"].Frames[0].Name)
 	})
 
-	// where query is inferred search expression and not multivalued dimension expression, then frame name is label
+	// where query is inferred search expression and not multivalued dimension expression
 	testCasesReturningLabel := map[string]queryParameters{
 		"with specific dimensions, matchExact false": {Dimensions: queryDimensions{[]string{"some-instance"}}, MatchExact: false},
 		"with wildcard dimensions, matchExact false": {Dimensions: queryDimensions{[]string{"*"}}, MatchExact: false},
@@ -542,7 +526,7 @@ func Test_QueryData_response_data_frame_names(t *testing.T) {
 		})
 	}
 
-	// complementary test cases to above return default of "metricName_stat"
+	// complementary test cases to above
 	testCasesReturningMetricStat := map[string]queryParameters{
 		"with specific dimensions, matchExact true": {
 			Dimensions: queryDimensions{[]string{"some-instance"}},
@@ -585,7 +569,7 @@ func Test_QueryData_response_data_frame_names(t *testing.T) {
 			})
 
 			assert.NoError(t, err)
-			assert.Equal(t, "CPUUtilization_Maximum", resp.Responses["A"].Frames[0].Name)
+			assert.Equal(t, labelFromGetMetricData, resp.Responses["A"].Frames[0].Name)
 		})
 	}
 }
@@ -627,7 +611,6 @@ func TestTimeSeriesQuery_CrossAccountQuerying(t *testing.T) {
 						},
 						"region": "us-east-2",
 						"id": "a",
-						"alias": "NetworkOut",
 						"statistic": "Maximum",
 						"period": "300",
 						"hide": false,
@@ -668,7 +651,6 @@ func TestTimeSeriesQuery_CrossAccountQuerying(t *testing.T) {
 						},
 						"region": "us-east-2",
 						"id": "a",
-						"alias": "NetworkOut",
 						"statistic": "Maximum",
 						"period": "300",
 						"hide": false,
@@ -710,7 +692,6 @@ func TestTimeSeriesQuery_CrossAccountQuerying(t *testing.T) {
 						},
 						"region": "us-east-2",
 						"id": "a",
-						"alias": "NetworkOut",
 						"statistic": "Maximum",
 						"period": "300",
 						"hide": false,
@@ -752,7 +733,6 @@ func TestTimeSeriesQuery_CrossAccountQuerying(t *testing.T) {
 						},
 						"region": "us-east-2",
 						"id": "a",
-						"alias": "NetworkOut",
 						"statistic": "Maximum",
 						"period": "300",
 						"hide": false,
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.cue b/public/app/plugins/datasource/cloudwatch/dataquery.cue
index e4248e20b6b..5ca33d0bbff 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.cue
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.cue
@@ -67,7 +67,8 @@ composableKinds: DataQuery: {
 							metricEditorMode?: #MetricEditorMode
 							// ID can be used to reference other queries in math expressions. The ID can include numbers, letters, and underscore, and must start with a lowercase letter.
 							id: string
-							// To be deprecated. Use label
+							// Deprecated: use label
+							// @deprecated use label
 							alias?: string
 							// Change the time series legend names using dynamic labels. See https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/graph-dynamic-labels.html for more details.
 							label?: string
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
index 32d3bc67012..c1a8751c66c 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
@@ -65,7 +65,8 @@ export type Dimensions = Record<string, (string | Array<string>)>;
  */
 export interface CloudWatchMetricsQuery extends common.DataQuery, MetricStat {
   /**
-   * To be deprecated. Use label
+   * Deprecated: use label
+   * @deprecated use label
    */
   alias?: string;
   /**

From 334ecd1be79a2cd51af4bc24a7822bf187893470 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 27 Apr 2023 10:29:26 +0100
Subject: [PATCH 455/729] NestedFolders: Select all for Browse and Search
 (#67227)

* NestedFolders: Select all for BrowseView and SearchView

* show fake indeterminate state for SearchView

* fix types

* Select search results as additional pages are loaded

* fix (de)select all between browse and search

* tests

* fix test

* fix test
---
 .../api/browseDashboardsAPI.ts                |  2 +-
 .../BrowseActions/DeleteModal.test.tsx        |  1 +
 .../BrowseActions/MoveModal.test.tsx          |  1 +
 .../components/BrowseView.tsx                 |  2 +
 .../components/DashboardsTree.test.tsx        |  5 ++
 .../components/DashboardsTree.tsx             | 19 +++--
 .../components/SearchView.tsx                 | 20 +++--
 .../features/browse-dashboards/state/hooks.ts |  4 +-
 .../browse-dashboards/state/reducers.test.ts  | 80 ++++++++++++++++++-
 .../browse-dashboards/state/reducers.ts       | 39 +++++++++
 .../features/browse-dashboards/state/slice.ts |  3 +-
 .../app/features/browse-dashboards/types.ts   |  4 +-
 .../components/SearchResultsTable.test.tsx    | 14 ++--
 .../page/components/SearchResultsTable.tsx    | 24 +++++-
 14 files changed, 196 insertions(+), 22 deletions(-)

diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index a3e0ca101a7..3802bdf9326 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -93,5 +93,5 @@ export const browseDashboardsAPI = createApi({
   }),
 });
 
-export const { useGetFolderQuery, useGetAffectedItemsQuery } = browseDashboardsAPI;
+export const { useGetFolderQuery, useLazyGetFolderQuery, useGetAffectedItemsQuery } = browseDashboardsAPI;
 export { skipToken } from '@reduxjs/toolkit/query/react';
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
index aec7aef75b3..d5fb11eec3d 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.test.tsx
@@ -18,6 +18,7 @@ describe('browse-dashboards DeleteModal', () => {
     onConfirm: mockOnConfirm,
     onDismiss: mockOnDismiss,
     selectedItems: {
+      $all: false,
       folder: {},
       dashboard: {},
       panel: {},
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
index a5ae8362f95..5ac7b077728 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
@@ -28,6 +28,7 @@ describe('browse-dashboards MoveModal', () => {
       onConfirm: mockOnConfirm,
       onDismiss: mockOnDismiss,
       selectedItems: {
+        $all: false,
         folder: {},
         dashboard: {},
         panel: {},
diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
index 8245f789213..e67c2fbc4e3 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -9,6 +9,7 @@ import {
   fetchChildren,
   setFolderOpenState,
   setItemSelectionState,
+  setAllSelection,
 } from '../state';
 
 import { DashboardsTree } from './DashboardsTree';
@@ -53,6 +54,7 @@ export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
       height={height}
       selectedItems={selectedItems}
       onFolderClick={handleFolderClick}
+      onAllSelectionChange={(newState) => dispatch(setAllSelection({ isSelected: newState }))}
       onItemSelectionChange={handleItemSelectionChange}
     />
   );
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
index 42847fc3c2a..65b498d29e0 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
@@ -21,6 +21,7 @@ describe('browse-dashboards DashboardsTree', () => {
   const dashboard = wellFormedDashboard(2);
   const noop = () => {};
   const selectedItems = {
+    $all: false,
     folder: {},
     dashboard: {},
     panel: {},
@@ -35,6 +36,7 @@ describe('browse-dashboards DashboardsTree', () => {
         height={HEIGHT}
         onFolderClick={noop}
         onItemSelectionChange={noop}
+        onAllSelectionChange={noop}
       />
     );
     expect(screen.queryByText(dashboard.item.title)).toBeInTheDocument();
@@ -51,6 +53,7 @@ describe('browse-dashboards DashboardsTree', () => {
         height={HEIGHT}
         onFolderClick={noop}
         onItemSelectionChange={noop}
+        onAllSelectionChange={noop}
       />
     );
     expect(screen.queryByText(folder.item.title)).toBeInTheDocument();
@@ -67,6 +70,7 @@ describe('browse-dashboards DashboardsTree', () => {
         height={HEIGHT}
         onFolderClick={handler}
         onItemSelectionChange={noop}
+        onAllSelectionChange={noop}
       />
     );
     const folderButton = screen.getByLabelText('Collapse folder');
@@ -84,6 +88,7 @@ describe('browse-dashboards DashboardsTree', () => {
         height={HEIGHT}
         onFolderClick={noop}
         onItemSelectionChange={noop}
+        onAllSelectionChange={noop}
       />
     );
     expect(screen.queryByText('Empty folder')).toBeInTheDocument();
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
index 11cf3529c80..10f2dee9f3a 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
@@ -1,6 +1,6 @@
 import { css, cx } from '@emotion/css';
 import React, { useMemo } from 'react';
-import { CellProps, Column, TableInstance, useTable } from 'react-table';
+import { CellProps, Column, HeaderProps, TableInstance, useTable } from 'react-table';
 import { FixedSizeList as List } from 'react-window';
 
 import { GrafanaTheme2 } from '@grafana/data';
@@ -21,15 +21,19 @@ interface DashboardsTreeProps {
   height: number;
   selectedItems: DashboardTreeSelection;
   onFolderClick: (uid: string, newOpenState: boolean) => void;
+  onAllSelectionChange: (newState: boolean) => void;
   onItemSelectionChange: (item: DashboardViewItem, newState: boolean) => void;
 }
 
 type DashboardsTreeColumn = Column<DashboardsTreeItem>;
-type DashboardsTreeCellProps = CellProps<DashboardsTreeItem, unknown> & {
+type DashboardTreeHeaderProps = HeaderProps<DashboardsTreeItem> & {
   // Note: userProps for cell renderers (e.g. second argument in `cell.render('Cell', foo)` )
   // aren't typed, so we must be careful when accessing this
   selectedItems?: DashboardsTreeProps['selectedItems'];
 };
+type DashboardsTreeCellProps = CellProps<DashboardsTreeItem, unknown> & {
+  selectedItems?: DashboardsTreeProps['selectedItems'];
+};
 
 const HEADER_HEIGHT = 35;
 const ROW_HEIGHT = 35;
@@ -40,6 +44,7 @@ export function DashboardsTree({
   height,
   selectedItems,
   onFolderClick,
+  onAllSelectionChange,
   onItemSelectionChange,
 }: DashboardsTreeProps) {
   const styles = useStyles2(getStyles);
@@ -48,7 +53,10 @@ export function DashboardsTree({
     const checkboxColumn: DashboardsTreeColumn = {
       id: 'checkbox',
       width: 0,
-      Header: () => <Checkbox value={false} />,
+      Header: ({ selectedItems }: DashboardTreeHeaderProps) => {
+        const isAllSelected = selectedItems?.$all ?? false;
+        return <Checkbox value={isAllSelected} onChange={(ev) => onAllSelectionChange(ev.currentTarget.checked)} />;
+      },
       Cell: ({ row: { original: row }, selectedItems }: DashboardsTreeCellProps) => {
         const item = row.item;
         if (item.kind === 'ui-empty-folder' || !selectedItems) {
@@ -56,6 +64,7 @@ export function DashboardsTree({
         }
 
         const isSelected = selectedItems?.[item.kind][item.uid] ?? false;
+
         return (
           <Checkbox
             data-testid={selectors.pages.BrowseDashbards.table.checkbox(item.uid)}
@@ -88,7 +97,7 @@ export function DashboardsTree({
     };
 
     return [checkboxColumn, nameColumn, typeColumn, tagsColumns];
-  }, [onItemSelectionChange, onFolderClick]);
+  }, [onItemSelectionChange, onAllSelectionChange, onFolderClick]);
 
   const table = useTable({ columns: tableColumns, data: items }, useCustomFlexLayout);
   const { getTableProps, getTableBodyProps, headerGroups } = table;
@@ -114,7 +123,7 @@ export function DashboardsTree({
 
               return (
                 <div key={key} {...headerProps} role="columnheader" className={styles.cell}>
-                  {column.render('Header')}
+                  {column.render('Header', { selectedItems })}
                 </div>
               );
             })}
diff --git a/public/app/features/browse-dashboards/components/SearchView.tsx b/public/app/features/browse-dashboards/components/SearchView.tsx
index 0af421731f4..92e985f4d0f 100644
--- a/public/app/features/browse-dashboards/components/SearchView.tsx
+++ b/public/app/features/browse-dashboards/components/SearchView.tsx
@@ -7,7 +7,7 @@ import { useSearchStateManager } from 'app/features/search/state/SearchStateMana
 import { DashboardViewItemKind } from 'app/features/search/types';
 import { useDispatch, useSelector } from 'app/types';
 
-import { setItemSelectionState } from '../state';
+import { setAllSelection, setItemSelectionState, useHasSelection } from '../state';
 
 interface SearchViewProps {
   height: number;
@@ -17,6 +17,7 @@ interface SearchViewProps {
 export function SearchView({ width, height }: SearchViewProps) {
   const dispatch = useDispatch();
   const selectedItems = useSelector((wholeState) => wholeState.browseDashboards.selectedItems);
+  const hasSelection = useHasSelection();
 
   const { keyboardEvents } = useKeyNavigationListener();
   const [searchState, stateManager] = useSearchStateManager();
@@ -25,18 +26,27 @@ export function SearchView({ width, height }: SearchViewProps) {
 
   const selectionChecker = useCallback(
     (kind: string | undefined, uid: string): boolean => {
-      if (!kind || kind === '*') {
+      if (!kind) {
+        return false;
+      }
+
+      // Currently, this indicates _some_ items are selected, not nessicarily all are
+      // selected.
+      if (kind === '*' && uid === '*') {
+        return hasSelection;
+      } else if (kind === '*') {
+        // Unsure how this case can happen
         return false;
       }
 
       return selectedItems[assertDashboardViewItemKind(kind)][uid] ?? false;
     },
-    [selectedItems]
+    [selectedItems, hasSelection]
   );
 
   const clearSelection = useCallback(() => {
-    console.log('TODO: clearSelection');
-  }, []);
+    dispatch(setAllSelection({ isSelected: false }));
+  }, [dispatch]);
 
   const handleItemSelectionChange = useCallback(
     (kind: string, uid: string) => {
diff --git a/public/app/features/browse-dashboards/state/hooks.ts b/public/app/features/browse-dashboards/state/hooks.ts
index dd6a78319bc..3bd672b0946 100644
--- a/public/app/features/browse-dashboards/state/hooks.ts
+++ b/public/app/features/browse-dashboards/state/hooks.ts
@@ -106,10 +106,10 @@ function createFlatTree(
 function getSelectedItemsForActions(
   selectedItemsState: DashboardTreeSelection,
   childrenByParentUID: Record<string, DashboardViewItem[] | undefined>
-): Omit<DashboardTreeSelection, 'panel'> {
+): Omit<DashboardTreeSelection, 'panel' | '$all'> {
   // Take a copy of the selected items to work with
   // We don't care about panels here, only dashboards and folders can be moved or deleted
-  const result: Omit<DashboardTreeSelection, 'panel'> = {
+  const result = {
     dashboard: { ...selectedItemsState.dashboard },
     folder: { ...selectedItemsState.folder },
   };
diff --git a/public/app/features/browse-dashboards/state/reducers.test.ts b/public/app/features/browse-dashboards/state/reducers.test.ts
index 9c9cbde83c3..32e5b3bbb99 100644
--- a/public/app/features/browse-dashboards/state/reducers.test.ts
+++ b/public/app/features/browse-dashboards/state/reducers.test.ts
@@ -1,7 +1,12 @@
 import { wellFormedDashboard, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
 import { BrowseDashboardsState } from '../types';
 
-import { extraReducerFetchChildrenFulfilled, setFolderOpenState, setItemSelectionState } from './reducers';
+import {
+  extraReducerFetchChildrenFulfilled,
+  setAllSelection,
+  setFolderOpenState,
+  setItemSelectionState,
+} from './reducers';
 
 function createInitialState(): BrowseDashboardsState {
   return {
@@ -9,6 +14,7 @@ function createInitialState(): BrowseDashboardsState {
     childrenByParentUID: {},
     openFolders: {},
     selectedItems: {
+      $all: false,
       dashboard: {},
       folder: {},
       panel: {},
@@ -84,6 +90,7 @@ describe('browse-dashboards reducers', () => {
       extraReducerFetchChildrenFulfilled(state, action);
 
       expect(state.selectedItems).toEqual({
+        $all: false,
         dashboard: {
           [childDashboard.uid]: true,
         },
@@ -114,6 +121,7 @@ describe('browse-dashboards reducers', () => {
       setItemSelectionState(state, { type: 'setItemSelectionState', payload: { item: dashboard, isSelected: true } });
 
       expect(state.selectedItems).toEqual({
+        $all: false,
         dashboard: {
           [dashboard.uid]: true,
         },
@@ -139,6 +147,7 @@ describe('browse-dashboards reducers', () => {
       });
 
       expect(state.selectedItems).toEqual({
+        $all: false,
         dashboard: {
           [childDashboard.uid]: true,
           [grandchildDashboard.uid]: true,
@@ -175,6 +184,7 @@ describe('browse-dashboards reducers', () => {
       });
 
       expect(state.selectedItems).toEqual({
+        $all: false,
         dashboard: {
           [childDashboard.uid]: true,
           [grandchildDashboard.uid]: false,
@@ -187,4 +197,72 @@ describe('browse-dashboards reducers', () => {
       });
     });
   });
+
+  describe('setAllSelection', () => {
+    it('selects all loaded items', () => {
+      const state = createInitialState();
+
+      let seed = 1;
+      const topLevelDashboard = wellFormedDashboard(seed++).item;
+      const topLevelFolder = wellFormedFolder(seed++).item;
+      const childDashboard = wellFormedDashboard(seed++, {}, { parentUID: topLevelFolder.uid }).item;
+      const childFolder = wellFormedFolder(seed++, {}, { parentUID: topLevelFolder.uid }).item;
+      const grandchildDashboard = wellFormedDashboard(seed++, {}, { parentUID: childFolder.uid }).item;
+
+      state.rootItems = [topLevelFolder, topLevelDashboard];
+      state.childrenByParentUID[topLevelFolder.uid] = [childDashboard, childFolder];
+      state.childrenByParentUID[childFolder.uid] = [grandchildDashboard];
+
+      state.selectedItems.folder[childFolder.uid] = false;
+      state.selectedItems.dashboard[grandchildDashboard.uid] = true;
+
+      setAllSelection(state, { type: 'setAllSelection', payload: { isSelected: true } });
+
+      expect(state.selectedItems).toEqual({
+        $all: true,
+        dashboard: {
+          [topLevelDashboard.uid]: true,
+          [childDashboard.uid]: true,
+          [grandchildDashboard.uid]: true,
+        },
+        folder: {
+          [topLevelFolder.uid]: true,
+          [childFolder.uid]: true,
+        },
+        panel: {},
+      });
+    });
+
+    it('deselects all items', () => {
+      const state = createInitialState();
+
+      let seed = 1;
+      const topLevelDashboard = wellFormedDashboard(seed++).item;
+      const topLevelFolder = wellFormedFolder(seed++).item;
+      const childDashboard = wellFormedDashboard(seed++, {}, { parentUID: topLevelFolder.uid }).item;
+      const childFolder = wellFormedFolder(seed++, {}, { parentUID: topLevelFolder.uid }).item;
+      const grandchildDashboard = wellFormedDashboard(seed++, {}, { parentUID: childFolder.uid }).item;
+
+      state.rootItems = [topLevelFolder, topLevelDashboard];
+      state.childrenByParentUID[topLevelFolder.uid] = [childDashboard, childFolder];
+      state.childrenByParentUID[childFolder.uid] = [grandchildDashboard];
+
+      state.selectedItems.folder[childFolder.uid] = false;
+      state.selectedItems.dashboard[grandchildDashboard.uid] = true;
+
+      setAllSelection(state, { type: 'setAllSelection', payload: { isSelected: false } });
+
+      // Deselecting only sets selection = false for things already selected
+      expect(state.selectedItems).toEqual({
+        $all: false,
+        dashboard: {
+          [grandchildDashboard.uid]: false,
+        },
+        folder: {
+          [childFolder.uid]: false,
+        },
+        panel: {},
+      });
+    });
+  });
 });
diff --git a/public/app/features/browse-dashboards/state/reducers.ts b/public/app/features/browse-dashboards/state/reducers.ts
index 5d6f6674163..ac79052360c 100644
--- a/public/app/features/browse-dashboards/state/reducers.ts
+++ b/public/app/features/browse-dashboards/state/reducers.ts
@@ -82,6 +82,45 @@ export function setItemSelectionState(
   }
 }
 
+export function setAllSelection(state: BrowseDashboardsState, action: PayloadAction<{ isSelected: boolean }>) {
+  const { isSelected } = action.payload;
+
+  state.selectedItems.$all = isSelected;
+
+  // Search works a bit differently so the state here does different things...
+  // In search:
+  //  - When "Selecting all", it sends individual state updates with setItemSelectionState.
+  //  - When "Deselecting all", it uses this setAllSelection. Search results aren't stored in
+  //    redux, so we just need to iterate over the selected items to flip them to false
+
+  if (isSelected) {
+    for (const folderUID in state.childrenByParentUID) {
+      const children = state.childrenByParentUID[folderUID] ?? [];
+
+      for (const child of children) {
+        state.selectedItems[child.kind][child.uid] = isSelected;
+      }
+    }
+
+    for (const child of state.rootItems) {
+      state.selectedItems[child.kind][child.uid] = isSelected;
+    }
+  } else {
+    // if deselecting only need to loop over what we've already selected
+    for (const kind in state.selectedItems) {
+      if (!(kind === 'dashboard' || kind === 'panel' || kind === 'folder')) {
+        continue;
+      }
+
+      const selection = state.selectedItems[kind];
+
+      for (const uid in selection) {
+        selection[uid] = isSelected;
+      }
+    }
+  }
+}
+
 function findItem(
   rootItems: DashboardViewItem[],
   childrenByUID: Record<string, DashboardViewItem[] | undefined>,
diff --git a/public/app/features/browse-dashboards/state/slice.ts b/public/app/features/browse-dashboards/state/slice.ts
index 564f1fc4db7..39db1edbdb9 100644
--- a/public/app/features/browse-dashboards/state/slice.ts
+++ b/public/app/features/browse-dashboards/state/slice.ts
@@ -15,6 +15,7 @@ const initialState: BrowseDashboardsState = {
     dashboard: {},
     folder: {},
     panel: {},
+    $all: false,
   },
 };
 
@@ -30,7 +31,7 @@ const browseDashboardsSlice = createSlice({
 
 export const browseDashboardsReducer = browseDashboardsSlice.reducer;
 
-export const { setFolderOpenState, setItemSelectionState } = browseDashboardsSlice.actions;
+export const { setFolderOpenState, setItemSelectionState, setAllSelection } = browseDashboardsSlice.actions;
 
 export default {
   browseDashboards: browseDashboardsReducer,
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
index e3b08f17d6c..7ace5982127 100644
--- a/public/app/features/browse-dashboards/types.ts
+++ b/public/app/features/browse-dashboards/types.ts
@@ -1,6 +1,8 @@
 import { DashboardViewItem as DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
-export type DashboardTreeSelection = Record<DashboardViewItemKind, Record<string, boolean | undefined>>;
+export type DashboardTreeSelection = Record<DashboardViewItemKind, Record<string, boolean | undefined>> & {
+  $all: boolean;
+};
 
 export interface BrowseDashboardsState {
   rootItems: DashboardViewItem[];
diff --git a/public/app/features/search/page/components/SearchResultsTable.test.tsx b/public/app/features/search/page/components/SearchResultsTable.test.tsx
index fafa6abdf96..979865b9f6a 100644
--- a/public/app/features/search/page/components/SearchResultsTable.test.tsx
+++ b/public/app/features/search/page/components/SearchResultsTable.test.tsx
@@ -53,7 +53,7 @@ describe('SearchResultsTable', () => {
       jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockSearchResult);
     });
 
-    it('shows the table with the correct accessible label', () => {
+    it('shows the table with the correct accessible label', async () => {
       render(
         <SearchResultsTable
           keyboardEvents={mockKeyboardEvents}
@@ -66,7 +66,8 @@ describe('SearchResultsTable', () => {
           width={1000}
         />
       );
-      expect(screen.getByRole('table', { name: 'Search results table' })).toBeInTheDocument();
+      const table = await screen.findByRole('table', { name: 'Search results table' });
+      expect(table).toBeInTheDocument();
     });
 
     it('has the correct row headers', async () => {
@@ -82,12 +83,13 @@ describe('SearchResultsTable', () => {
           width={1000}
         />
       );
+      await screen.findByRole('table');
       expect(screen.getByRole('columnheader', { name: 'Name' })).toBeInTheDocument();
       expect(screen.getByRole('columnheader', { name: 'Type' })).toBeInTheDocument();
       expect(screen.getByRole('columnheader', { name: 'Tags' })).toBeInTheDocument();
     });
 
-    it('displays the data correctly in the table', () => {
+    it('displays the data correctly in the table', async () => {
       render(
         <SearchResultsTable
           keyboardEvents={mockKeyboardEvents}
@@ -100,6 +102,7 @@ describe('SearchResultsTable', () => {
           width={1000}
         />
       );
+      await screen.findByRole('table');
 
       const rows = screen.getAllByRole('row');
 
@@ -134,7 +137,7 @@ describe('SearchResultsTable', () => {
       jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockEmptySearchResult);
     });
 
-    it('shows a "No data" message', () => {
+    it('shows a "No data" message', async () => {
       render(
         <SearchResultsTable
           keyboardEvents={mockKeyboardEvents}
@@ -147,8 +150,9 @@ describe('SearchResultsTable', () => {
           width={1000}
         />
       );
+      const noData = await screen.findByText('No data');
+      expect(noData).toBeInTheDocument();
       expect(screen.queryByRole('table', { name: 'Search results table' })).not.toBeInTheDocument();
-      expect(screen.getByText('No data')).toBeInTheDocument();
     });
   });
 });
diff --git a/public/app/features/search/page/components/SearchResultsTable.tsx b/public/app/features/search/page/components/SearchResultsTable.tsx
index 1801a8ac5e1..6ab728be20c 100644
--- a/public/app/features/search/page/components/SearchResultsTable.tsx
+++ b/public/app/features/search/page/components/SearchResultsTable.tsx
@@ -103,6 +103,28 @@ export const SearchResultsTable = React.memo(
 
     const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow } = useTable(options, useAbsoluteLayout);
 
+    const handleLoadMore = useCallback(
+      async (startIndex: number, endIndex: number) => {
+        await response.loadMoreItems(startIndex, endIndex);
+
+        // After we load more items, select them if the "select all" checkbox
+        // is selected
+        const isAllSelected = selection?.('*', '*');
+        if (!selectionToggle || !selection || !isAllSelected) {
+          return;
+        }
+
+        for (let index = startIndex; index < response.view.length; index++) {
+          const item = response.view.get(index);
+          const itemIsSelected = selection(item.kind, item.uid);
+          if (!itemIsSelected) {
+            selectionToggle(item.kind, item.uid);
+          }
+        }
+      },
+      [response, selection, selectionToggle]
+    );
+
     const RenderRow = useCallback(
       ({ index: rowIndex, style }: { index: number; style: CSSProperties }) => {
         const row = rows[rowIndex];
@@ -164,7 +186,7 @@ export const SearchResultsTable = React.memo(
             ref={infiniteLoaderRef}
             isItemLoaded={response.isItemLoaded}
             itemCount={rows.length}
-            loadMoreItems={response.loadMoreItems}
+            loadMoreItems={handleLoadMore}
           >
             {({ onItemsRendered, ref }) => (
               <FixedSizeList

From 7460a53ab958a31362966fe081279a13b4505a17 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 27 Apr 2023 11:06:11 +0100
Subject: [PATCH 456/729] Chore: Don't fail tests on console logs at all during
 local dev (#67313)

---
 public/test/setupTests.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/test/setupTests.ts b/public/test/setupTests.ts
index 31f322f1d4a..b345588c355 100644
--- a/public/test/setupTests.ts
+++ b/public/test/setupTests.ts
@@ -5,9 +5,13 @@ import { initReactI18next } from 'react-i18next';
 
 import { matchers } from './matchers';
 
-failOnConsole({
-  shouldFailOnLog: process.env.CI ? true : false,
-});
+if (process.env.CI) {
+  failOnConsole({
+    shouldFailOnLog: true,
+    shouldFailOnDebug: true,
+    shouldFailOnInfo: true,
+  });
+}
 
 expect.extend(matchers);
 

From 2dc5872bd68ce996e64551cd757bf8cfa41298c2 Mon Sep 17 00:00:00 2001
From: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Date: Thu, 27 Apr 2023 11:11:19 +0100
Subject: [PATCH 457/729] New Dashboard: Fix "build a dashboard" when empty
 dash page feature is enabled (#66816)

* New Dashboard: Fix "build a dashboard" when used with empty dash page feature

Closes #66659
---
 .../AddPanelButton/AddPanelMenu.tsx           |  8 ++++-
 .../containers/NewDashboardWithDS.tsx         | 32 ++++++++++++-------
 .../dashboard/dashgrid/DashboardEmpty.tsx     |  8 ++++-
 .../app/features/dashboard/state/reducers.ts  |  5 +++
 .../app/features/dashboard/utils/dashboard.ts |  3 +-
 public/app/types/dashboard.ts                 |  3 +-
 6 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
index f7f69edb45e..4ec49a60bfc 100644
--- a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
+++ b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
@@ -12,6 +12,9 @@ import {
   onCreateNewRow,
   onPasteCopiedPanel,
 } from 'app/features/dashboard/utils/dashboard';
+import { useDispatch, useSelector } from 'app/types';
+
+import { setInitialDatasource } from '../../state/reducers';
 
 interface Props {
   dashboard: DashboardModel;
@@ -19,6 +22,8 @@ interface Props {
 
 export const AddPanelMenu = ({ dashboard }: Props) => {
   const copiedPanelPlugin = useMemo(() => getCopiedPanelPlugin(), []);
+  const dispatch = useDispatch();
+  const initialDatasource = useSelector((state) => state.dashboard.initialDatasource);
 
   return (
     <Menu>
@@ -27,9 +32,10 @@ export const AddPanelMenu = ({ dashboard }: Props) => {
         label={t('dashboard.add-menu.visualization', 'Visualization')}
         testId={selectors.components.PageToolbar.itemButton('Add new visualization menu item')}
         onClick={() => {
+          const id = onCreateNewPanel(dashboard, initialDatasource);
           reportInteraction('dashboards_toolbar_add_clicked', { item: 'add_visualization' });
-          const id = onCreateNewPanel(dashboard);
           locationService.partial({ editPanel: id });
+          dispatch(setInitialDatasource(undefined));
         }}
       />
       <Menu.Item
diff --git a/public/app/features/dashboard/containers/NewDashboardWithDS.tsx b/public/app/features/dashboard/containers/NewDashboardWithDS.tsx
index 833d85fa0cc..56eddbcea30 100644
--- a/public/app/features/dashboard/containers/NewDashboardWithDS.tsx
+++ b/public/app/features/dashboard/containers/NewDashboardWithDS.tsx
@@ -1,14 +1,17 @@
 import React, { useEffect, useState } from 'react';
 
-import { getDataSourceSrv, locationService } from '@grafana/runtime';
+import { config, getDataSourceSrv, locationService } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+import { useDispatch } from 'app/types';
 
 import { getNewDashboardModelData, setDashboardToFetchFromLocalStorage } from '../state/initDashboard';
+import { setInitialDatasource } from '../state/reducers';
 
 export default function NewDashboardWithDS(props: GrafanaRouteComponentProps<{ datasourceUid: string }>) {
   const [error, setError] = useState<string | null>(null);
   const { datasourceUid } = props.match.params;
+  const dispatch = useDispatch();
 
   useEffect(() => {
     const ds = getDataSourceSrv().getInstanceSettings(datasourceUid);
@@ -17,19 +20,24 @@ export default function NewDashboardWithDS(props: GrafanaRouteComponentProps<{ d
       return;
     }
 
-    const newDashboard = getNewDashboardModelData();
-    const { dashboard } = newDashboard;
-    dashboard.panels[0] = {
-      ...dashboard.panels[0],
-      datasource: {
-        uid: ds.uid,
-        type: ds.type,
-      },
-    };
+    if (!config.featureToggles.emptyDashboardPage) {
+      const newDashboard = getNewDashboardModelData();
+      const { dashboard } = newDashboard;
+      dashboard.panels[0] = {
+        ...dashboard.panels[0],
+        datasource: {
+          uid: ds.uid,
+          type: ds.type,
+        },
+      };
+
+      setDashboardToFetchFromLocalStorage(newDashboard);
+    } else {
+      dispatch(setInitialDatasource(datasourceUid));
+    }
 
-    setDashboardToFetchFromLocalStorage(newDashboard);
     locationService.replace('/dashboard/new');
-  }, [datasourceUid]);
+  }, [datasourceUid, dispatch]);
 
   if (error) {
     return (
diff --git a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
index 19070bda0cd..581d8f5e3fe 100644
--- a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
@@ -7,6 +7,9 @@ import { Button, useStyles2 } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { onAddLibraryPanel, onCreateNewPanel, onCreateNewRow } from 'app/features/dashboard/utils/dashboard';
+import { useDispatch, useSelector } from 'app/types';
+
+import { setInitialDatasource } from '../state/reducers';
 
 export interface Props {
   dashboard: DashboardModel;
@@ -15,6 +18,8 @@ export interface Props {
 
 export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
   const styles = useStyles2(getStyles);
+  const dispatch = useDispatch();
+  const initialDatasource = useSelector((state) => state.dashboard.initialDatasource);
 
   return (
     <div className={styles.centeredContent}>
@@ -36,9 +41,10 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
             icon="plus"
             aria-label="Add new panel"
             onClick={() => {
+              const id = onCreateNewPanel(dashboard, initialDatasource);
               reportInteraction('dashboards_emptydashboard_clicked', { item: 'add_visualization' });
-              const id = onCreateNewPanel(dashboard);
               locationService.partial({ editPanel: id });
+              dispatch(setInitialDatasource(undefined));
             }}
             disabled={!canCreate}
           >
diff --git a/public/app/features/dashboard/state/reducers.ts b/public/app/features/dashboard/state/reducers.ts
index 03e536c5a68..c047aa9051f 100644
--- a/public/app/features/dashboard/state/reducers.ts
+++ b/public/app/features/dashboard/state/reducers.ts
@@ -14,6 +14,7 @@ export const initialState: DashboardState = {
   getModel: () => null,
   permissions: [],
   initError: null,
+  initialDatasource: undefined,
 };
 
 const dashboardSlice = createSlice({
@@ -53,6 +54,9 @@ const dashboardSlice = createSlice({
     addPanel: (state, action: PayloadAction<PanelModel>) => {
       //state.panels[action.payload.id] = { pluginId: action.payload.type };
     },
+    setInitialDatasource: (state, action: PayloadAction<string | undefined>) => {
+      state.initialDatasource = action.payload;
+    },
   },
 });
 
@@ -79,6 +83,7 @@ export const {
   dashboardInitServices,
   cleanUpDashboard,
   addPanel,
+  setInitialDatasource,
 } = dashboardSlice.actions;
 
 export const dashboardReducer = dashboardSlice.reducer;
diff --git a/public/app/features/dashboard/utils/dashboard.ts b/public/app/features/dashboard/utils/dashboard.ts
index 3b31aec7c09..bdd342d3c4d 100644
--- a/public/app/features/dashboard/utils/dashboard.ts
+++ b/public/app/features/dashboard/utils/dashboard.ts
@@ -7,11 +7,12 @@ import store from 'app/core/store';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
 import { calculateNewPanelGridPos } from 'app/features/dashboard/utils/panel';
 
-export function onCreateNewPanel(dashboard: DashboardModel): number | undefined {
+export function onCreateNewPanel(dashboard: DashboardModel, datasource?: string): number | undefined {
   const newPanel: Partial<PanelModel> = {
     type: 'timeseries',
     title: 'Panel Title',
     gridPos: calculateNewPanelGridPos(dashboard),
+    datasource: datasource ? { uid: datasource } : null,
     isNew: true,
   };
 
diff --git a/public/app/types/dashboard.ts b/public/app/types/dashboard.ts
index 7ab00843728..f984571ece9 100644
--- a/public/app/types/dashboard.ts
+++ b/public/app/types/dashboard.ts
@@ -1,5 +1,5 @@
 import { DataQuery } from '@grafana/data';
-import { Dashboard } from '@grafana/schema';
+import { Dashboard, DataSourceRef } from '@grafana/schema';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 
 import { DashboardAcl } from './acl';
@@ -101,6 +101,7 @@ export interface QueriesToUpdateOnDashboardLoad {
 export interface DashboardState {
   getModel: GetMutableDashboardModelFn;
   initPhase: DashboardInitPhase;
+  initialDatasource?: DataSourceRef['uid'];
   initError: DashboardInitError | null;
   permissions: DashboardAcl[];
 }

From 234ed2a6840aa23213012e60613a5fc7c6be6c7c Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Thu, 27 Apr 2023 11:23:17 +0100
Subject: [PATCH 458/729] RBAC: remove RBAC enabled for Alerting (#67274)

* WIP

* fix from review
---
 pkg/services/alerting/store_test.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkg/services/alerting/store_test.go b/pkg/services/alerting/store_test.go
index d81c7f49ce3..b612398922d 100644
--- a/pkg/services/alerting/store_test.go
+++ b/pkg/services/alerting/store_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/alerting/models"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -49,12 +50,12 @@ func TestIntegrationAlertingDataAccess(t *testing.T) {
 		ss := db.InitTestDB(t)
 		tagService := tagimpl.ProvideService(ss, ss.Cfg)
 		cfg := setting.NewCfg()
-		cfg.RBACEnabled = false
 		store = &sqlStore{
 			db:         ss,
 			log:        log.New(),
 			cfg:        cfg,
 			tagService: tagService,
+			features:   featuremgmt.WithFeatures(),
 		}
 
 		testDash = insertTestDashboard(t, store.db, "dashboard with alerts", 1, 0, false, "alert")
@@ -81,7 +82,10 @@ func TestIntegrationAlertingDataAccess(t *testing.T) {
 		setup(t)
 
 		// Get alert so we can use its ID in tests
-		alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, PanelID: 1, OrgID: 1, User: &user.SignedInUser{OrgRole: org.RoleAdmin}}
+		signedInUser := &user.SignedInUser{
+			OrgRole: org.RoleAdmin,
+		}
+		alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, PanelID: 1, OrgID: 1, User: signedInUser}
 		result, err2 := store.HandleAlertsQuery(context.Background(), &alertQuery)
 		require.Nil(t, err2)
 
@@ -159,7 +163,13 @@ func TestIntegrationAlertingDataAccess(t *testing.T) {
 
 	t.Run("Viewer can read alerts", func(t *testing.T) {
 		setup(t)
-		viewerUser := &user.SignedInUser{OrgRole: org.RoleViewer, OrgID: 1}
+		viewerUser := &user.SignedInUser{
+			OrgRole: org.RoleViewer,
+			OrgID:   1,
+			Permissions: map[int64]map[string][]string{
+				1: {dashboards.ActionFoldersRead: {dashboards.ScopeFoldersAll}, dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll}},
+			},
+		}
 		alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, PanelID: 1, OrgID: 1, User: viewerUser}
 		res, err2 := store.HandleAlertsQuery(context.Background(), &alertQuery)
 

From 33034280836b925b25f6135c9db3f475795af626 Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Thu, 27 Apr 2023 11:35:39 +0100
Subject: [PATCH 459/729] Provisioning: Fix provisioning issues with legacy
 alerting and data source permissions (#67308)

extend provisioner permissions
---
 pkg/services/dashboards/service/dashboard_service.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/services/dashboards/service/dashboard_service.go b/pkg/services/dashboards/service/dashboard_service.go
index 1dd16df8d06..7d565f6a583 100644
--- a/pkg/services/dashboards/service/dashboard_service.go
+++ b/pkg/services/dashboards/service/dashboard_service.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/guardian"
@@ -29,6 +30,7 @@ var (
 		{Action: dashboards.ActionFoldersWrite, Scope: dashboards.ScopeFoldersAll},
 		{Action: dashboards.ActionDashboardsCreate, Scope: dashboards.ScopeFoldersAll},
 		{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeFoldersAll},
+		{Action: datasources.ActionRead, Scope: datasources.ScopeAll},
 	}
 	// DashboardServiceImpl implements the DashboardService interface
 	_ dashboards.DashboardService             = (*DashboardServiceImpl)(nil)

From f28c962dc83f534b5eb5752d827c15603b8e2970 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 27 Apr 2023 12:40:38 +0200
Subject: [PATCH 460/729] Logs: Add documentation for Log Context (#67282)

* add documentation for log context

* Update docs/sources/explore/logs-integration.md

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Update docs/sources/explore/logs-integration.md

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Update docs/sources/explore/logs-integration.md

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* add bold for buttons

---------

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
---
 docs/sources/explore/logs-integration.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/sources/explore/logs-integration.md b/docs/sources/explore/logs-integration.md
index af9c3c4c194..9a1c63b990e 100644
--- a/docs/sources/explore/logs-integration.md
+++ b/docs/sources/explore/logs-integration.md
@@ -118,6 +118,16 @@ Explore replaces these sequences. When it does so, the option will change from "
 By using data links, you can turn any part of a log message into an internal or external link. The created link is visible as a button in the **Links** section inside the **Log details** view.
 {{< figure src="/static/img/docs/explore/data-link-9-4.png" max-width="800px" caption="Data link in Explore" >}}
 
+## Log context
+
+Log context is a feature that allows you to display additional lines of context surrounding a log entry that matches a particular search query. This can be helpful in understanding the log entry's context, and is similar to the `-C` parameter in the `grep` command.
+
+When using Log context in Grafana, you can configure the number of lines of context to display before and after the matching log entry. By default, the Log context feature will show the log entry itself along with the 50 lines before and after it. However, this can be adjusted as needed depending on the specific use case.
+
+You may encounter long lines of text that make it difficult to read and analyze the context around each log entry. This is where the **Wrap lines** toggle can come in handy. By enabling this toggle, Grafana will automatically wrap long lines of text so that they fit within the visible width of the viewer. This can make it easier to read and understand the log entries.
+
+The **Open in split view** button allows you to execute the context query for a log entry in a split screen in the Explore view. Clicking this button will open a new Explore pane with the context query displayed alongside the log entry, making it easier to analyze and understand the surrounding context.
+
 ## Toggle field visibility
 
 Expand a log line and click the eye icon to show or hide fields.

From 4b047b62a7d5230cf01b7b16046d26f501532e44 Mon Sep 17 00:00:00 2001
From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
Date: Thu, 27 Apr 2023 12:43:20 +0200
Subject: [PATCH 461/729] NestedFolders: Button for creating new dashboards and
 and folders (#67260)

* Add CreateNewButton and tests

* Add translation support

* Move reused phrases to temp common file

* Use just a simple button

---------

Co-authored-by: joshhunt <josh@trtr.co>
---
 .../BrowseDashboardsPage.tsx                  |  3 +-
 .../components/CreateNewButton.test.tsx       | 29 ++++++++++++
 .../components/CreateNewButton.tsx            | 45 +++++++++++++++++++
 .../search/components/DashboardActions.tsx    | 10 ++---
 public/app/features/search/tempI18nPhrases.ts | 16 +++++++
 5 files changed, 97 insertions(+), 6 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
 create mode 100644 public/app/features/browse-dashboards/components/CreateNewButton.tsx

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index 336e109215f..72fdbe3903b 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -15,6 +15,7 @@ import { skipToken, useGetFolderQuery } from './api/browseDashboardsAPI';
 import { BrowseActions } from './components/BrowseActions/BrowseActions';
 import { BrowseFilters } from './components/BrowseFilters';
 import { BrowseView } from './components/BrowseView';
+import { CreateNewButton } from './components/CreateNewButton';
 import { SearchView } from './components/SearchView';
 import { useHasSelection } from './state';
 
@@ -49,7 +50,7 @@ const BrowseDashboardsPage = memo(({ match }: Props) => {
   const hasSelection = useHasSelection();
 
   return (
-    <Page navId="dashboards/browse" pageNav={navModel}>
+    <Page navId="dashboards/browse" pageNav={navModel} actions={<CreateNewButton inFolder={folderUID} />}>
       <Page.Contents className={styles.pageContents}>
         <FilterInput
           placeholder={getSearchPlaceholder(searchState.includePanels)}
diff --git a/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx b/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
new file mode 100644
index 00000000000..7da67fe3a50
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
@@ -0,0 +1,29 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { CreateNewButton } from './CreateNewButton';
+
+async function renderAndOpen(folderUID?: string) {
+  render(<CreateNewButton inFolder={folderUID} />);
+  const newButton = screen.getByText('New');
+  await userEvent.click(newButton);
+}
+
+describe('NewActionsButton', () => {
+  it('should display the correct urls with a given folderUID', async () => {
+    await renderAndOpen('123');
+
+    expect(screen.getByText('New Dashboard')).toHaveAttribute('href', '/dashboard/new?folderUid=123');
+    expect(screen.getByText('New Folder')).toHaveAttribute('href', '/dashboards/folder/new?folderUid=123');
+    expect(screen.getByText('Import')).toHaveAttribute('href', '/dashboard/import?folderUid=123');
+  });
+
+  it('should display urls without params when there is no folderUID', async () => {
+    await renderAndOpen();
+
+    expect(screen.getByText('New Dashboard')).toHaveAttribute('href', '/dashboard/new');
+    expect(screen.getByText('New Folder')).toHaveAttribute('href', '/dashboards/folder/new');
+    expect(screen.getByText('Import')).toHaveAttribute('href', '/dashboard/import');
+  });
+});
diff --git a/public/app/features/browse-dashboards/components/CreateNewButton.tsx b/public/app/features/browse-dashboards/components/CreateNewButton.tsx
new file mode 100644
index 00000000000..01e32bf8fbb
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/CreateNewButton.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+
+import { Button, Dropdown, Icon, Menu, MenuItem } from '@grafana/ui';
+import {
+  getNewDashboardPhrase,
+  getNewFolderPhrase,
+  getImportPhrase,
+  getNewPhrase,
+} from 'app/features/search/tempI18nPhrases';
+
+interface Props {
+  /**
+   * Pass a folder UID in which the dashboard or folder will be created
+   */
+  inFolder?: string;
+}
+
+export function CreateNewButton({ inFolder }: Props) {
+  const newMenu = (
+    <Menu>
+      <MenuItem url={addFolderUidToUrl('/dashboard/new', inFolder)} label={getNewDashboardPhrase()} />
+      <MenuItem url={addFolderUidToUrl('/dashboards/folder/new', inFolder)} label={getNewFolderPhrase()} />
+      <MenuItem url={addFolderUidToUrl('/dashboard/import', inFolder)} label={getImportPhrase()} />
+    </Menu>
+  );
+
+  return (
+    <Dropdown overlay={newMenu}>
+      <Button>
+        {getNewPhrase()}
+        <Icon name="angle-down" />
+      </Button>
+    </Dropdown>
+  );
+}
+
+/**
+ *
+ * @param url without any parameters
+ * @param folderUid  folder id
+ * @returns url with paramter if folder is present
+ */
+function addFolderUidToUrl(url: string, folderUid: string | undefined) {
+  return folderUid ? url + '?folderUid=' + folderUid : url;
+}
diff --git a/public/app/features/search/components/DashboardActions.tsx b/public/app/features/search/components/DashboardActions.tsx
index 40ee16db4f7..12dc125b50e 100644
--- a/public/app/features/search/components/DashboardActions.tsx
+++ b/public/app/features/search/components/DashboardActions.tsx
@@ -2,10 +2,10 @@ import React, { useMemo, useState } from 'react';
 
 import { config, reportInteraction } from '@grafana/runtime';
 import { Menu, Dropdown, Button, Icon, HorizontalGroup } from '@grafana/ui';
-import { t } from 'app/core/internationalization';
 import { FolderDTO } from 'app/types';
 
 import { MoveToFolderModal } from '../page/components/MoveToFolderModal';
+import { getImportPhrase, getNewDashboardPhrase, getNewFolderPhrase, getNewPhrase } from '../tempI18nPhrases';
 
 export interface Props {
   folder: FolderDTO | undefined;
@@ -43,7 +43,7 @@ export const DashboardActions = ({ folder, canCreateFolders = false, canCreateDa
         {canCreateDashboards && (
           <Menu.Item
             url={actionUrl('new')}
-            label={t('search.dashboard-actions.new-dashboard', 'New Dashboard')}
+            label={getNewDashboardPhrase()}
             onClick={() =>
               reportInteraction('grafana_menu_item_clicked', { url: actionUrl('new'), from: '/dashboards' })
             }
@@ -52,7 +52,7 @@ export const DashboardActions = ({ folder, canCreateFolders = false, canCreateDa
         {canCreateFolders && (config.featureToggles.nestedFolders || !folder?.uid) && (
           <Menu.Item
             url={actionUrl('new_folder')}
-            label={t('search.dashboard-actions.new-folder', 'New Folder')}
+            label={getNewFolderPhrase()}
             onClick={() =>
               reportInteraction('grafana_menu_item_clicked', { url: actionUrl('new_folder'), from: '/dashboards' })
             }
@@ -61,7 +61,7 @@ export const DashboardActions = ({ folder, canCreateFolders = false, canCreateDa
         {canCreateDashboards && (
           <Menu.Item
             url={actionUrl('import')}
-            label={t('search.dashboard-actions.import', 'Import')}
+            label={getImportPhrase()}
             onClick={() =>
               reportInteraction('grafana_menu_item_clicked', { url: actionUrl('import'), from: '/dashboards' })
             }
@@ -82,7 +82,7 @@ export const DashboardActions = ({ folder, canCreateFolders = false, canCreateDa
           )}
           <Dropdown overlay={MenuActions} placement="bottom-start">
             <Button variant="primary">
-              {t('search.dashboard-actions.new', 'New')}
+              {getNewPhrase()}
               <Icon name="angle-down" />
             </Button>
           </Dropdown>
diff --git a/public/app/features/search/tempI18nPhrases.ts b/public/app/features/search/tempI18nPhrases.ts
index 07c2abbf0ef..83b99bf2570 100644
--- a/public/app/features/search/tempI18nPhrases.ts
+++ b/public/app/features/search/tempI18nPhrases.ts
@@ -8,3 +8,19 @@ export function getSearchPlaceholder(includePanels = false) {
     ? t('search.search-input.include-panels-placeholder', 'Search for dashboards, folders, and panels')
     : t('search.search-input.placeholder', 'Search for dashboards and folders');
 }
+
+export function getNewDashboardPhrase() {
+  return t('search.dashboard-actions.new-dashboard', 'New Dashboard');
+}
+
+export function getNewFolderPhrase() {
+  return t('search.dashboard-actions.new-folder', 'New Folder');
+}
+
+export function getImportPhrase() {
+  return t('search.dashboard-actions.import', 'Import');
+}
+
+export function getNewPhrase() {
+  return t('search.dashboard-actions.new', 'New');
+}

From a3d31e04202d329fedd1e99cfab5aaa2c11faf46 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 27 Apr 2023 12:44:16 +0200
Subject: [PATCH 462/729] Loki: Fix margin in Log Context (#67299)

* remove top margin

* also fix for parsed labels
---
 .../plugins/datasource/loki/components/LokiContextUi.tsx   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index 73bfc016bbd..d6c8a216d2a 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -43,7 +43,12 @@ function getStyles(theme: GrafanaTheme2) {
     `,
     label: css`
       max-width: 100%;
-      margin: ${theme.spacing(2)} 0;
+      &:first-of-type {
+        margin-bottom: ${theme.spacing(2)};
+      }
+      &:not(:first-of-type) {
+        margin: ${theme.spacing(2)} 0;
+      }
     `,
     query: css`
       text-align: start;

From 2306fb38dc6b791bc7a9f669027811309d038cf1 Mon Sep 17 00:00:00 2001
From: Khushi Jain <57278642+khushijain21@users.noreply.github.com>
Date: Thu, 27 Apr 2023 16:42:51 +0530
Subject: [PATCH 463/729] Search: Preserves search filters when navigating to
 another page (#67021)

---
 public/app/features/search/state/SearchStateManager.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index 47a57ade1ed..104511ad2e0 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -258,11 +258,6 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
    * When item is selected clear some filters and report interaction
    */
   onSearchItemClicked = (e: React.MouseEvent<HTMLElement>) => {
-    // Clear some filters only if we're not opening a search item in a new tab
-    if (!e.altKey && !e.ctrlKey && !e.metaKey) {
-      this.setState({ tag: [], starred: false, sort: undefined, query: '', folderUid: undefined });
-    }
-
     reportSearchResultInteraction(this.state.eventTrackingNamespace, {
       layout: this.state.layout,
       starred: this.state.starred,

From cefeef71348cd13d8fee12e7cbdb3990ba0dcd81 Mon Sep 17 00:00:00 2001
From: Emil Tullstedt <emil.tullstedt@grafana.com>
Date: Thu, 27 Apr 2023 13:30:11 +0200
Subject: [PATCH 464/729] Proxy: Improve header handling for reverse proxy
 (#67279)

---
 pkg/util/proxyutil/proxyutil.go          | 11 +++++++++++
 pkg/util/proxyutil/reverse_proxy.go      | 21 ++++++++++++++++++++-
 pkg/util/proxyutil/reverse_proxy_test.go |  7 ++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/pkg/util/proxyutil/proxyutil.go b/pkg/util/proxyutil/proxyutil.go
index 68ae725919a..6cccf55e37d 100644
--- a/pkg/util/proxyutil/proxyutil.go
+++ b/pkg/util/proxyutil/proxyutil.go
@@ -1,6 +1,7 @@
 package proxyutil
 
 import (
+	"fmt"
 	"net"
 	"net/http"
 	"sort"
@@ -75,6 +76,16 @@ func SetProxyResponseHeaders(header http.Header) {
 	header.Set("Content-Security-Policy", "sandbox")
 }
 
+// SetViaHeader adds Grafana's reverse proxy to the proxy chain.
+// Defined in RFC 9110 7.6.3 https://datatracker.ietf.org/doc/html/rfc9110#name-via
+func SetViaHeader(header http.Header, major, minor int) {
+	via := fmt.Sprintf("%d.%d grafana", major, minor)
+	if old := header.Get("Via"); old != "" {
+		via = fmt.Sprintf("%s, %s", via, old)
+	}
+	header.Set("Via", via)
+}
+
 // ApplyUserHeader Set the X-Grafana-User header if needed (and remove if not).
 func ApplyUserHeader(sendUserHeader bool, req *http.Request, user *user.SignedInUser) {
 	req.Header.Del(UserHeaderName)
diff --git a/pkg/util/proxyutil/reverse_proxy.go b/pkg/util/proxyutil/reverse_proxy.go
index 668015edf15..fd3c8ea95ec 100644
--- a/pkg/util/proxyutil/reverse_proxy.go
+++ b/pkg/util/proxyutil/reverse_proxy.go
@@ -79,11 +79,30 @@ func wrapDirector(d func(*http.Request)) func(req *http.Request) {
 	}
 }
 
+// deletedHeaders lists a number of headers that we don't want to
+// pass-through from the upstream when using a reverse proxy.
+//
+// These are related to the connection between Grafana and the proxy
+// or instructions that would alter how a browser will interact with
+// future requests to Grafana (such as enabling Strict Transport
+// Security)
+var deletedHeaders = []string{
+	"Alt-Svc",
+	"Close",
+	"Server",
+	"Set-Cookie",
+	"Strict-Transport-Security",
+}
+
 // modifyResponse enforces certain constraints on http.Response.
 func modifyResponse(logger glog.Logger) func(resp *http.Response) error {
 	return func(resp *http.Response) error {
-		resp.Header.Del("Set-Cookie")
+		for _, header := range deletedHeaders {
+			resp.Header.Del(header)
+		}
+
 		SetProxyResponseHeaders(resp.Header)
+		SetViaHeader(resp.Header, resp.ProtoMajor, resp.ProtoMinor)
 		return nil
 	}
 }
diff --git a/pkg/util/proxyutil/reverse_proxy_test.go b/pkg/util/proxyutil/reverse_proxy_test.go
index 602575d660f..ada4609f981 100644
--- a/pkg/util/proxyutil/reverse_proxy_test.go
+++ b/pkg/util/proxyutil/reverse_proxy_test.go
@@ -21,6 +21,8 @@ func TestReverseProxy(t *testing.T) {
 		upstream := newUpstreamServer(t, http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 			actualReq = req
 			http.SetCookie(w, &http.Cookie{Name: "test"})
+			w.Header().Set("Strict-Transport-Security", "max-age=31536000")
+			w.Header().Set("X-Custom-Hdr", "Ok!")
 			w.WriteHeader(http.StatusOK)
 		}))
 		t.Cleanup(upstream.Close)
@@ -52,11 +54,14 @@ func TestReverseProxy(t *testing.T) {
 		require.Empty(t, actualReq.Header.Get("Referer"))
 		require.Equal(t, "https://test.com/api", actualReq.Header.Get("X-Grafana-Referer"))
 		require.Equal(t, "value", actualReq.Header.Get("X-KEY"))
+		require.Empty(t, actualReq.Header.Get("Authorization"))
 		resp := rec.Result()
 		require.Empty(t, resp.Cookies())
 		require.Equal(t, "sandbox", resp.Header.Get("Content-Security-Policy"))
+		require.Contains(t, resp.Header, "X-Custom-Hdr")
+		require.NotContains(t, resp.Header, "Strict-Transport-Security")
+		require.Contains(t, resp.Header.Get("Via"), "grafana")
 		require.NoError(t, resp.Body.Close())
-		require.Empty(t, actualReq.Header.Get("Authorization"))
 	})
 
 	t.Run("When proxying a request using WithModifyResponse should call it before default ModifyResponse func", func(t *testing.T) {

From 6e950ca62a4dadbd392f01a95b8513fd237ffcfe Mon Sep 17 00:00:00 2001
From: dsotirakis <dimitrios.sotirakis@grafana.com>
Date: Mon, 20 Mar 2023 09:51:29 +0200
Subject: [PATCH 465/729] 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>
---
 go.mod                                          | 2 +-
 public/app/plugins/panel/geomap/utils/layers.ts | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 035d3c70e2d..065008ae58c 100644
--- a/go.mod
+++ b/go.mod
@@ -123,7 +123,7 @@ require (
 	gopkg.in/mail.v2 v2.3.1
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
-	xorm.io/builder v0.3.6 // indirect
+	xorm.io/builder v0.3.6
 	xorm.io/core v0.7.3
 	xorm.io/xorm v0.8.2
 )
diff --git a/public/app/plugins/panel/geomap/utils/layers.ts b/public/app/plugins/panel/geomap/utils/layers.ts
index 6e9d5995aa7..75a2357c388 100644
--- 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) {

From 96fdbbee90d55788f262233f2277e55e5caa794f Mon Sep 17 00:00:00 2001
From: Jo <joao.guerreiro@grafana.com>
Date: Mon, 3 Apr 2023 12:49:11 +0100
Subject: [PATCH 466/729] 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>
---
 pkg/services/authn/clients/jwt.go       | 15 +++++++++
 pkg/services/authn/clients/jwt_test.go  | 44 +++++++++++++++++++++++++
 pkg/services/contexthandler/auth_jwt.go | 24 +++++++++++---
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/pkg/services/authn/clients/jwt.go b/pkg/services/authn/clients/jwt.go
index a6474ba7176..cc65b7e4ed2 100644
--- 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)
diff --git a/pkg/services/authn/clients/jwt_test.go b/pkg/services/authn/clients/jwt_test.go
index 04a4c837bfe..f59aac88d8e 100644
--- 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)
+}
diff --git a/pkg/services/contexthandler/auth_jwt.go b/pkg/services/contexthandler/auth_jwt.go
index 9936d956c96..1d3d79640c3 100644
--- 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()
+		}
+	}
+}

From e17737ba872987aa837510e52f7b0c584e1a260b Mon Sep 17 00:00:00 2001
From: Misi <mgyongyosi@users.noreply.github.com>
Date: Mon, 3 Apr 2023 14:23:52 +0200
Subject: [PATCH 467/729] Chore: Update SAML lib (#824)

Update saml lib
---
 go.mod | 4 ++--
 go.sum | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 065008ae58c..5ec41b905c9 100644
--- a/go.mod
+++ b/go.mod
@@ -123,7 +123,7 @@ require (
 	gopkg.in/mail.v2 v2.3.1
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
-	xorm.io/builder v0.3.6
+	xorm.io/builder v0.3.6 // indirect
 	xorm.io/core v0.7.3
 	xorm.io/xorm v0.8.2
 )
@@ -401,7 +401,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
diff --git a/go.sum b/go.sum
index 727940e1869..76dbc1af720 100644
--- a/go.sum
+++ b/go.sum
@@ -1302,8 +1302,8 @@ github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413 h1:bBzCezZNRy
 github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413/go.mod h1:IvwuGG9xa/h96UH/exgvsfy3zE+ZpctkNT9o5aaGdrU=
 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-20230417103609-99b482c479fe h1:Ws23A0XH6XYNaF/XhrOhNiC09rqGisvflCf0aHRhpTM=

From d01ea9902c9cacab2758ff902d516f65987c0ba1 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Thu, 27 Apr 2023 15:07:27 +0300
Subject: [PATCH 468/729] fix add column btn styling (#67369)

---
 public/app/plugins/panel/datagrid/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/datagrid/utils.ts b/public/app/plugins/panel/datagrid/utils.ts
index 3545dc3af86..ab14d01f809 100644
--- a/public/app/plugins/panel/datagrid/utils.ts
+++ b/public/app/plugins/panel/datagrid/utils.ts
@@ -266,7 +266,7 @@ export const getStyles = (theme: GrafanaTheme2, isResizeInProgress: boolean) =>
         transition: background-color 200ms;
         cursor: pointer;
         :hover {
-          background-color: ${theme.colors.secondary.shade};
+          background-color: ${theme.colors.background.secondary};
         }
       }
       input {

From 3a8bb226bdd433f5e5db826be3bafa084fbd6137 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Thu, 27 Apr 2023 14:09:20 +0200
Subject: [PATCH 469/729] Logs: Use millisecond precision for open context in
 split view (#67385)

Log: Use millisecond precision for open context in split view
---
 .../log-context/LogRowContextModal.tsx        | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
index bcfec8fe92b..411b725c2fc 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -12,7 +12,8 @@ import {
   LogsDedupStrategy,
   LogsSortOrder,
   SelectableValue,
-  rangeUtil,
+  dateTime,
+  TimeRange,
 } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
 import { DataQuery, TimeZone } from '@grafana/schema';
@@ -23,6 +24,7 @@ import { splitOpen } from 'app/features/explore/state/main';
 import { SETTINGS_KEYS } from 'app/features/explore/utils/logs';
 import { useDispatch } from 'app/types';
 
+import { sortLogRows } from '../../utils';
 import { LogRows } from '../LogRows';
 
 import { LoadMoreOptions, LogContextButtons } from './LogContextButtons';
@@ -154,16 +156,26 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
 
   const getFullTimeRange = useCallback(() => {
     const { before, after } = context;
-    const allRows = [...before, row, ...after].sort((a, b) => a.timeEpochMs - b.timeEpochMs);
-    const first = allRows[0];
-    const last = allRows[allRows.length - 1];
-    return rangeUtil.convertRawToRange(
-      {
-        from: first.timeUtc,
-        to: last.timeUtc,
+    const allRows = sortLogRows([...before, row, ...after], LogsSortOrder.Ascending);
+    const fromMs = allRows[0].timeEpochMs;
+    let toMs = allRows[allRows.length - 1].timeEpochMs;
+    // In case we have a lot of logs and from and to have same millisecond
+    // we add 1 millisecond to toMs to make sure we have a range
+    if (fromMs === toMs) {
+      toMs += 1;
+    }
+    const from = dateTime(fromMs);
+    const to = dateTime(toMs);
+
+    const range: TimeRange = {
+      from,
+      to,
+      raw: {
+        from,
+        to,
       },
-      'utc'
-    );
+    };
+    return range;
   }, [context, row]);
 
   const onChangeLimitOption = (option: SelectableValue<number>) => {

From 886b91eca55d8e380a3068461ecb8640e1c5e4ca Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Thu, 27 Apr 2023 13:28:19 +0100
Subject: [PATCH 470/729] Tracing: Next/prev text for span filters (#67208)

* Next/prev text

* Tests

* Update test

* Updated state vars and also made other improvements
---
 .../features/explore/TraceView/TraceView.tsx  |  1 -
 .../TraceView/TraceViewContainer.test.tsx     | 50 ++++++++++
 .../NewTracePageHeader.test.tsx               |  1 -
 .../TracePageHeader/NewTracePageHeader.tsx    |  3 -
 .../NewTracePageSearchBar.test.tsx            | 99 +++++++++++++++----
 .../TracePageHeader/NewTracePageSearchBar.tsx | 72 ++++++++++----
 .../SpanFilters/SpanFilters.test.tsx          |  5 +-
 .../SpanFilters/SpanFilters.tsx               | 65 +++++-------
 8 files changed, 203 insertions(+), 93 deletions(-)

diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index 2c2049d0974..3de2d2da2ca 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -166,7 +166,6 @@ export function TraceView(props: Props) {
                 setShowSpanFilters={setShowSpanFilters}
                 showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
                 setShowSpanFilterMatchesOnly={setShowSpanFilterMatchesOnly}
-                focusedSpanIdForSearch={newTraceViewHeaderFocusedSpanIdForSearch}
                 setFocusedSpanIdForSearch={setNewTraceViewHeaderFocusedSpanIdForSearch}
                 spanFilterMatches={spanFilterMatches}
                 datasourceType={datasourceType}
diff --git a/public/app/features/explore/TraceView/TraceViewContainer.test.tsx b/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
index 86677a298e6..367d1176956 100644
--- a/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
+++ b/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
@@ -134,6 +134,56 @@ describe('TraceViewContainer', () => {
     ).toContain('rowFocused');
   });
 
+  it('can select next/prev results', async () => {
+    config.featureToggles.newTraceViewHeader = true;
+    renderTraceViewContainer();
+    const spanFiltersButton = screen.getByRole('button', { name: 'Span Filters' });
+    await user.click(spanFiltersButton);
+
+    const nextResultButton = screen.getByRole('button', { name: 'Next result button' });
+    const prevResultButton = screen.getByRole('button', { name: 'Prev result button' });
+    expect((nextResultButton as HTMLButtonElement)['disabled']).toBe(true);
+    expect((prevResultButton as HTMLButtonElement)['disabled']).toBe(true);
+
+    await user.click(screen.getByLabelText('Select tag key'));
+    const tagOption = screen.getByText('component');
+    await waitFor(() => expect(tagOption).toBeInTheDocument());
+    await user.click(tagOption);
+
+    await waitFor(() => {
+      expect(
+        screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[0].parentElement!.className
+      ).toContain('rowMatchingFilter');
+      expect(
+        screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[1].parentElement!.className
+      ).toContain('rowMatchingFilter');
+      expect(
+        screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[2].parentElement!.className
+      ).toContain('rowMatchingFilter');
+    });
+
+    expect((nextResultButton as HTMLButtonElement)['disabled']).toBe(false);
+    expect((prevResultButton as HTMLButtonElement)['disabled']).toBe(false);
+    await user.click(nextResultButton);
+    await waitFor(() => {
+      expect(
+        screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[0].parentElement!.className
+      ).toContain('rowFocused');
+    });
+    await user.click(nextResultButton);
+    await waitFor(() => {
+      expect(
+        screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[1].parentElement!.className
+      ).toContain('rowFocused');
+    });
+    await user.click(prevResultButton);
+    await waitFor(() => {
+      expect(
+        screen.queryAllByText('', { selector: 'div[data-testid="span-view"]' })[0].parentElement!.className
+      ).toContain('rowFocused');
+    });
+  });
+
   it('show matches only works as expected', async () => {
     config.featureToggles.newTraceViewHeader = true;
     renderTraceViewContainer();
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
index eec1a45a7b2..05b7ad0bee8 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
@@ -33,7 +33,6 @@ const setup = () => {
     showSpanFilterMatchesOnly: false,
     setShowSpanFilterMatchesOnly: jest.fn(),
     spanFilterMatches: undefined,
-    focusedSpanIdForSearch: '',
     setFocusedSpanIdForSearch: jest.fn(),
     datasourceType: 'tempo',
     setHeaderHeight: jest.fn(),
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
index 1e0ffdcbb9f..60c0e40a72d 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
@@ -41,7 +41,6 @@ export type TracePageHeaderProps = {
   setShowSpanFilters: (isOpen: boolean) => void;
   showSpanFilterMatchesOnly: boolean;
   setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
-  focusedSpanIdForSearch: string;
   setFocusedSpanIdForSearch: React.Dispatch<React.SetStateAction<string>>;
   spanFilterMatches: Set<string> | undefined;
   datasourceType: string;
@@ -58,7 +57,6 @@ export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
     setShowSpanFilters,
     showSpanFilterMatchesOnly,
     setShowSpanFilterMatchesOnly,
-    focusedSpanIdForSearch,
     setFocusedSpanIdForSearch,
     spanFilterMatches,
     datasourceType,
@@ -140,7 +138,6 @@ export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
         search={search}
         setSearch={setSearch}
         spanFilterMatches={spanFilterMatches}
-        focusedSpanIdForSearch={focusedSpanIdForSearch}
         setFocusedSpanIdForSearch={setFocusedSpanIdForSearch}
         datasourceType={datasourceType}
       />
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
index 4515b0bbbeb..ea43b80c2f1 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.test.tsx
@@ -12,25 +12,49 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { defaultFilters } from '../../useSearch';
 
-import NewTracePageSearchBar, { TracePageSearchBarProps } from './NewTracePageSearchBar';
-
-const defaultProps = {
-  search: defaultFilters,
-  setFocusedSpanIdForSearch: jest.fn(),
-  showSpanFilterMatchesOnly: false,
-  setShowSpanFilterMatchesOnly: jest.fn(),
-};
+import NewTracePageSearchBar, { getStyles } from './NewTracePageSearchBar';
 
 describe('<NewTracePageSearchBar>', () => {
+  let user: ReturnType<typeof userEvent.setup>;
+  beforeEach(() => {
+    jest.useFakeTimers();
+    // Need to use delay: null here to work with fakeTimers
+    // see https://github.com/testing-library/user-event/issues/833
+    user = userEvent.setup({ delay: null });
+  });
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  const NewTracePageSearchBarWithProps = (props: { matches: string[] | undefined }) => {
+    const searchBarProps = {
+      search: defaultFilters,
+      spanFilterMatches: props.matches ? new Set(props.matches) : undefined,
+      showSpanFilterMatchesOnly: false,
+      setShowSpanFilterMatchesOnly: jest.fn(),
+      setFocusedSpanIdForSearch: jest.fn(),
+      datasourceType: '',
+      reset: jest.fn(),
+      totalSpans: 100,
+    };
+
+    return <NewTracePageSearchBar {...searchBarProps} />;
+  };
+
+  it('should render', () => {
+    expect(() => render(<NewTracePageSearchBarWithProps matches={[]} />)).not.toThrow();
+  });
+
   it('renders buttons', () => {
-    render(<NewTracePageSearchBar {...(defaultProps as unknown as TracePageSearchBarProps)} />);
-    const nextResButton = screen.getByRole('button', { name: 'Next result button' });
-    const prevResButton = screen.getByRole('button', { name: 'Prev result button' });
+    render(<NewTracePageSearchBarWithProps matches={[]} />);
+    const nextResButton = screen.queryByRole('button', { name: 'Next result button' });
+    const prevResButton = screen.queryByRole('button', { name: 'Prev result button' });
     const resetFiltersButton = screen.getByRole('button', { name: 'Reset filters button' });
     expect(nextResButton).toBeInTheDocument();
     expect(prevResButton).toBeInTheDocument();
@@ -40,22 +64,55 @@ describe('<NewTracePageSearchBar>', () => {
     expect((resetFiltersButton as HTMLButtonElement)['disabled']).toBe(true);
   });
 
-  it('renders buttons that can be used to search if results found', () => {
-    const props = {
-      ...defaultProps,
-      spanFilterMatches: new Set(['2ed38015486087ca']),
-    };
-    render(<NewTracePageSearchBar {...(props as unknown as TracePageSearchBarProps)} />);
-    const nextResButton = screen.getByRole('button', { name: 'Next result button' });
-    const prevResButton = screen.getByRole('button', { name: 'Prev result button' });
+  it('renders total spans', async () => {
+    render(<NewTracePageSearchBarWithProps matches={undefined} />);
+    expect(screen.getByText('100 spans')).toBeDefined();
+  });
+
+  it('renders buttons that can be used to search if filters added', () => {
+    render(<NewTracePageSearchBarWithProps matches={['2ed38015486087ca']} />);
+    const nextResButton = screen.queryByRole('button', { name: 'Next result button' });
+    const prevResButton = screen.queryByRole('button', { name: 'Prev result button' });
     expect(nextResButton).toBeInTheDocument();
     expect(prevResButton).toBeInTheDocument();
     expect((nextResButton as HTMLButtonElement)['disabled']).toBe(false);
     expect((prevResButton as HTMLButtonElement)['disabled']).toBe(false);
+    expect(screen.getByText('1 match')).toBeDefined();
+  });
+
+  it('renders correctly when moving through matches', async () => {
+    render(<NewTracePageSearchBarWithProps matches={['1ed38015486087ca', '2ed38015486087ca', '3ed38015486087ca']} />);
+    const nextResButton = screen.queryByRole('button', { name: 'Next result button' });
+    const prevResButton = screen.queryByRole('button', { name: 'Prev result button' });
+    expect(screen.getByText('3 matches')).toBeDefined();
+    await user.click(nextResButton!);
+    expect(screen.getByText('1/3 matches')).toBeDefined();
+    await user.click(nextResButton!);
+    expect(screen.getByText('2/3 matches')).toBeDefined();
+    await user.click(nextResButton!);
+    expect(screen.getByText('3/3 matches')).toBeDefined();
+    await user.click(nextResButton!);
+    expect(screen.getByText('1/3 matches')).toBeDefined();
+    await user.click(prevResButton!);
+    expect(screen.getByText('3/3 matches')).toBeDefined();
+    await user.click(prevResButton!);
+    expect(screen.getByText('2/3 matches')).toBeDefined();
+  });
+
+  it('renders correctly when there are no matches i.e. too many filters added', async () => {
+    const { container } = render(<NewTracePageSearchBarWithProps matches={[]} />);
+    const styles = getStyles();
+    const tooltip = container.querySelector('.' + styles.matchesTooltip);
+    expect(screen.getByText('0 matches')).toBeDefined();
+    userEvent.hover(tooltip!);
+    jest.advanceTimersByTime(1000);
+    await waitFor(() => {
+      expect(screen.getByText(/0 span matches for the filters selected/)).toBeDefined();
+    });
   });
 
   it('renders show span filter matches only switch', async () => {
-    render(<NewTracePageSearchBar {...(defaultProps as unknown as TracePageSearchBarProps)} />);
+    render(<NewTracePageSearchBarWithProps matches={[]} />);
     const matchesSwitch = screen.getByRole('checkbox', { name: 'Show matches only switch' });
     expect(matchesSwitch).toBeInTheDocument();
   });
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
index bf0ddd18a8b..ce3d44da620 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageSearchBar.tsx
@@ -13,42 +13,50 @@
 // limitations under the License.
 
 import { css } from '@emotion/css';
-import React, { memo, Dispatch, SetStateAction, useEffect, useMemo } from 'react';
+import React, { memo, Dispatch, SetStateAction, useEffect, useMemo, useState } from 'react';
 
 import { config, reportInteraction } from '@grafana/runtime';
-import { Button, Switch, useStyles2 } from '@grafana/ui';
+import { Button, Icon, Switch, Tooltip, useStyles2 } from '@grafana/ui';
 
 import { SearchProps } from '../../useSearch';
 import { convertTimeFilter } from '../utils/filter-spans';
 
 export type TracePageSearchBarProps = {
   search: SearchProps;
-  setSearch: React.Dispatch<React.SetStateAction<SearchProps>>;
   spanFilterMatches: Set<string> | undefined;
   showSpanFilterMatchesOnly: boolean;
   setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
-  focusedSpanIdForSearch: string;
   setFocusedSpanIdForSearch: Dispatch<SetStateAction<string>>;
   datasourceType: string;
   reset: () => void;
+  totalSpans: number;
 };
 
 export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProps) {
   const {
     search,
     spanFilterMatches,
-    focusedSpanIdForSearch,
+    showSpanFilterMatchesOnly,
+    setShowSpanFilterMatchesOnly,
     setFocusedSpanIdForSearch,
     datasourceType,
     reset,
-    showSpanFilterMatchesOnly,
-    setShowSpanFilterMatchesOnly,
+    totalSpans,
   } = props;
+  const [currentSpanIndex, setCurrentSpanIndex] = useState(-1);
   const styles = useStyles2(getStyles);
 
   useEffect(() => {
+    setCurrentSpanIndex(-1);
     setFocusedSpanIdForSearch('');
-  }, [search, setFocusedSpanIdForSearch]);
+  }, [setFocusedSpanIdForSearch, spanFilterMatches]);
+
+  useEffect(() => {
+    if (spanFilterMatches) {
+      const spanMatches = Array.from(spanFilterMatches!);
+      setFocusedSpanIdForSearch(spanMatches[currentSpanIndex]);
+    }
+  }, [currentSpanIndex, setFocusedSpanIdForSearch, spanFilterMatches]);
 
   const nextResult = () => {
     reportInteraction('grafana_traces_trace_view_find_next_prev_clicked', {
@@ -57,17 +65,14 @@ export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProp
       direction: 'next',
     });
 
-    const spanMatches = Array.from(spanFilterMatches!);
-    const prevMatchedIndex = spanMatches.indexOf(focusedSpanIdForSearch);
-
     // new query || at end, go to start
-    if (prevMatchedIndex === -1 || prevMatchedIndex === spanMatches.length - 1) {
-      setFocusedSpanIdForSearch(spanMatches[0]);
+    if (currentSpanIndex === -1 || (spanFilterMatches && currentSpanIndex === spanFilterMatches.size - 1)) {
+      setCurrentSpanIndex(0);
       return;
     }
 
     // get next
-    setFocusedSpanIdForSearch(spanMatches[prevMatchedIndex + 1]);
+    setCurrentSpanIndex(currentSpanIndex + 1);
   };
 
   const prevResult = () => {
@@ -77,19 +82,17 @@ export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProp
       direction: 'prev',
     });
 
-    const spanMatches = Array.from(spanFilterMatches!);
-    const prevMatchedIndex = spanMatches.indexOf(focusedSpanIdForSearch);
-
     // new query || at start, go to end
-    if (prevMatchedIndex === -1 || prevMatchedIndex === 0) {
-      setFocusedSpanIdForSearch(spanMatches[spanMatches.length - 1]);
+    if (spanFilterMatches && (currentSpanIndex === -1 || currentSpanIndex === 0)) {
+      setCurrentSpanIndex(spanFilterMatches.size - 1);
       return;
     }
 
     // get prev
-    setFocusedSpanIdForSearch(spanMatches[prevMatchedIndex - 1]);
+    setCurrentSpanIndex(currentSpanIndex - 1);
   };
 
+  const buttonEnabled = spanFilterMatches && spanFilterMatches?.size > 0;
   const resetEnabled = useMemo(() => {
     return (
       (search.serviceName && search.serviceName !== '') ||
@@ -102,7 +105,26 @@ export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProp
       })
     );
   }, [search.serviceName, search.spanName, search.from, search.to, search.tags]);
-  const buttonEnabled = spanFilterMatches && spanFilterMatches?.size > 0;
+
+  const amountText = spanFilterMatches?.size === 1 ? 'match' : 'matches';
+  const matches =
+    spanFilterMatches?.size === 0 ? (
+      <>
+        <span>0 matches</span>
+        <Tooltip
+          content="There are 0 span matches for the filters selected. Please try removing some of the selected filters."
+          placement="left"
+        >
+          <span className={styles.matchesTooltip}>
+            <Icon name="info-circle" size="lg" />
+          </span>
+        </Tooltip>
+      </>
+    ) : currentSpanIndex !== -1 ? (
+      `${currentSpanIndex + 1}/${spanFilterMatches?.size} ${amountText}`
+    ) : (
+      `${spanFilterMatches?.size} ${amountText}`
+    );
 
   return (
     <div className={styles.searchBar}>
@@ -129,6 +151,7 @@ export default memo(function NewTracePageSearchBar(props: TracePageSearchBarProp
             </div>
           </div>
           <div className={styles.nextPrevButtons}>
+            <span className={styles.matches}>{spanFilterMatches ? matches : `${totalSpans} spans`}</span>
             <Button
               variant="secondary"
               disabled={!buttonEnabled}
@@ -187,5 +210,12 @@ export const getStyles = () => {
         margin-left: 8px;
       }
     `,
+    matches: css`
+      margin-right: 5px;
+    `,
+    matchesTooltip: css`
+      color: #aaa;
+      margin: -2px 0 0 10px;
+    `,
   };
 };
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
index 6b1e409f4ec..6610b84bdcf 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
@@ -45,10 +45,9 @@ describe('SpanFilters', () => {
       setShowSpanFilters: jest.fn(),
       showSpanFilterMatchesOnly: false,
       setShowSpanFilterMatchesOnly: jest.fn(),
-      search: search,
-      setSearch: setSearch,
+      search,
+      setSearch,
       spanFilterMatches: undefined,
-      focusedSpanIdForSearch: '',
       setFocusedSpanIdForSearch: jest.fn(),
       datasourceType: 'tempo',
     };
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
index 029701b8fdc..fe0f273c4c3 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
@@ -42,7 +42,6 @@ export type SpanFilterProps = {
   setShowSpanFilters: (isOpen: boolean) => void;
   showSpanFilterMatchesOnly: boolean;
   setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
-  focusedSpanIdForSearch: string;
   setFocusedSpanIdForSearch: React.Dispatch<React.SetStateAction<string>>;
   spanFilterMatches: Set<string> | undefined;
   datasourceType: string;
@@ -57,7 +56,6 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
     setShowSpanFilters,
     showSpanFilterMatchesOnly,
     setShowSpanFilterMatchesOnly,
-    focusedSpanIdForSearch,
     setFocusedSpanIdForSearch,
     spanFilterMatches,
     datasourceType,
@@ -89,13 +87,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
       const serviceNames = trace.spans.map((span) => {
         return span.process.serviceName;
       });
-      setServiceNames(
-        uniq(serviceNames)
-          .sort()
-          .map((name) => {
-            return toOption(name);
-          })
-      );
+      setServiceNames(uniq(serviceNames).sort().map(toOption));
     }
   };
 
@@ -104,13 +96,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
       const spanNames = trace.spans.map((span) => {
         return span.operationName;
       });
-      setSpanNames(
-        uniq(spanNames)
-          .sort()
-          .map((name) => {
-            return toOption(name);
-          })
-      );
+      setSpanNames(uniq(spanNames).sort().map(toOption));
     }
   };
 
@@ -137,11 +123,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
       keys = uniq(keys).sort();
       logKeys = uniq(logKeys).sort();
 
-      setTagKeys(
-        [...keys, ...logKeys].map((name) => {
-          return toOption(name);
-        })
-      );
+      setTagKeys([...keys, ...logKeys].map(toOption));
     }
   };
 
@@ -167,11 +149,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
       }
     });
 
-    return uniq(values)
-      .sort()
-      .map((name) => {
-        return toOption(name);
-      });
+    return uniq(values).sort().map(toOption);
   };
 
   const onTagChange = (tag: Tag, v: SelectableValue<string>) => {
@@ -228,9 +206,9 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
       content="Filter your spans below. The more filters, the more specific the filtered spans."
       placement="right"
     >
-      <span id="collapse-label">
+      <span className={styles.collapseLabel}>
         Span Filters
-        <Icon size="sm" name="info-circle" />
+        <Icon size="md" name="info-circle" />
       </span>
     </Tooltip>
   );
@@ -319,7 +297,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
                 <div key={i}>
                   <HorizontalGroup spacing={'xs'} width={'auto'}>
                     <Select
-                      aria-label={`Select tag key`}
+                      aria-label="Select tag key"
                       isClearable
                       key={tag.key}
                       onChange={(v) => onTagChange(tag, v)}
@@ -329,7 +307,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
                       value={tag.key || null}
                     />
                     <Select
-                      aria-label={`Select tag operator`}
+                      aria-label="Select tag operator"
                       onChange={(v) => {
                         setSearch({
                           ...search,
@@ -343,7 +321,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
                     />
                     <span className={styles.tagValues}>
                       <Select
-                        aria-label={`Select tag value`}
+                        aria-label="Select tag value"
                         isClearable
                         key={tag.value}
                         onChange={(v) => {
@@ -360,20 +338,20 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
                       />
                     </span>
                     <AccessoryButton
-                      aria-label={`Remove tag`}
-                      variant={'secondary'}
-                      icon={'times'}
+                      aria-label="Remove tag"
+                      variant="secondary"
+                      icon="times"
                       onClick={() => removeTag(tag.id)}
-                      title={'Remove tag'}
+                      title="Remove tag"
                     />
                     <span className={styles.addTag}>
                       {search?.tags?.length && i === search.tags.length - 1 && (
                         <AccessoryButton
                           aria-label="Add tag"
-                          variant={'secondary'}
-                          icon={'plus'}
+                          variant="secondary"
+                          icon="plus"
                           onClick={addTag}
-                          title={'Add tag'}
+                          title="Add tag"
                         />
                       )}
                     </span>
@@ -386,14 +364,13 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
 
         <NewTracePageSearchBar
           search={search}
-          setSearch={setSearch}
           spanFilterMatches={spanFilterMatches}
           showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
           setShowSpanFilterMatchesOnly={setShowSpanFilterMatchesOnly}
-          focusedSpanIdForSearch={focusedSpanIdForSearch}
           setFocusedSpanIdForSearch={setFocusedSpanIdForSearch}
           datasourceType={datasourceType}
           reset={reset}
+          totalSpans={trace.spans.length}
         />
       </Collapse>
     </div>
@@ -412,9 +389,11 @@ const getStyles = () => {
         border-left: none;
         border-right: none;
       }
-
-      #collapse-label svg {
-        margin: -1px 0 0 10px;
+    `,
+    collapseLabel: css`
+      svg {
+        color: #aaa;
+        margin: -2px 0 0 10px;
       }
     `,
     addTag: css`

From 69f1116f5953f26c4437592c9a06eba1be7f7ffc Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Thu, 27 Apr 2023 07:51:33 -0500
Subject: [PATCH 471/729] Prometheus: Fix flakey query cache test (#67388)

hardcode date to prevent test flake
---
 .../app/plugins/datasource/prometheus/language_utils.test.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/language_utils.test.ts b/public/app/plugins/datasource/prometheus/language_utils.test.ts
index efb9b8e21c6..a50e4e3b5b9 100644
--- a/public/app/plugins/datasource/prometheus/language_utils.test.ts
+++ b/public/app/plugins/datasource/prometheus/language_utils.test.ts
@@ -303,7 +303,7 @@ describe('getRangeSnapInterval', () => {
   it('will snap range to closest 10 minute', () => {
     const queryDurationMinutes = 60;
     const intervalSeconds = queryDurationMinutes * 60; // 10 minutes
-    const now = new Date().valueOf();
+    const now = 1680901009826;
     const nowPlusOneMinute = now + 1000 * 60;
     const nowPlusTwoMinute = now + 1000 * 60 * 2;
 
@@ -380,7 +380,7 @@ describe('getRangeSnapInterval', () => {
   it('will snap range to closest 60 minute', () => {
     const queryDurationMinutes = 120;
     const intervalSeconds = queryDurationMinutes * 60;
-    const now = new Date().valueOf();
+    const now = 1680901009826;
     const nowPlusOneMinute = now + 1000 * 60;
     const nowPlusTwoMinute = now + 1000 * 60 * 2;
 

From 6d8f9c5bf4484da5dbb3f7bd0bfb508a1c2c8f24 Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Thu, 27 Apr 2023 15:04:43 +0200
Subject: [PATCH 472/729] Chore: Remove opentracing and use opentelemetry
 instead (#67200)

* remove opentracing and use otel instead

* add various samplers for jaeger

* remove useless test that is covered in otel now

* we do not need a struct there

* remove old tests

* restore tests that parse various configurations

* check errors in tests

* Update pkg/infra/tracing/tracing_test.go

fix typo

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>

* add test for both legacy and new config formats

* use named constants

---------

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
---
 go.mod                                        |   5 +-
 go.sum                                        |   2 +
 pkg/infra/tracing/opentelemetry_tracing.go    | 338 -----------
 .../tracing/optentelemetry_tracing_test.go    |  89 ---
 pkg/infra/tracing/tracing.go                  | 545 +++++++++++-------
 pkg/infra/tracing/tracing_test.go             | 248 ++++----
 .../pluginsintegration/config/tracing.go      |   2 +-
 7 files changed, 489 insertions(+), 740 deletions(-)
 delete mode 100644 pkg/infra/tracing/opentelemetry_tracing.go
 delete mode 100644 pkg/infra/tracing/optentelemetry_tracing_test.go

diff --git a/go.mod b/go.mod
index 5ec41b905c9..6a91e3d4a8a 100644
--- a/go.mod
+++ b/go.mod
@@ -81,7 +81,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/matttproud/golang_protobuf_extensions v1.0.4
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
-	github.com/opentracing/opentracing-go v1.2.0
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pkg/errors v0.9.1
@@ -95,7 +95,7 @@ require (
 	github.com/stretchr/testify v1.8.2
 	github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
 	github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f
-	github.com/uber/jaeger-client-go v2.29.1+incompatible
+	github.com/uber/jaeger-client-go v2.29.1+incompatible // indirect
 	github.com/urfave/cli/v2 v2.24.4
 	github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae
 	github.com/yalue/merged_fs v1.2.2
@@ -271,6 +271,7 @@ require (
 	github.com/redis/go-redis/v9 v9.0.2
 	github.com/weaveworks/common v0.0.0-20230208133027-16871410fca4
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0
 )
 
 require (
diff --git a/go.sum b/go.sum
index 76dbc1af720..cc84fbc5f8a 100644
--- a/go.sum
+++ b/go.sum
@@ -2428,6 +2428,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.21.0/go.mod h1:JQAtechjxLEL81EjmbRwxBq/XEzGaHcsPuDHAx54hg4=
 go.opentelemetry.io/contrib/propagators/jaeger v1.15.0 h1:xdJjwy5t/8I+TZehMMQ+r2h50HREihH2oMUhimQ+jug=
 go.opentelemetry.io/contrib/propagators/jaeger v1.15.0/go.mod h1:tU0nwW4QTvKceNUP60/PQm0FI8zDSwey7gIFt3RR/yw=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0 h1:zRi6a8uX+cJGTPLXRPjFEzN27a26k5R7LiLK87ntXgg=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0/go.mod h1:pzJOLTppaPbiPjPZEwGRf0VWx6G07hhOqznjKXIMkEk=
 go.opentelemetry.io/contrib/zpages v0.0.0-20210722161726-7668016acb73/go.mod h1:NAkejuYm41lpyL43Fu1XdnCOYxN5NVV80/MJ03JQ/X8=
 go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I=
 go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg=
diff --git a/pkg/infra/tracing/opentelemetry_tracing.go b/pkg/infra/tracing/opentelemetry_tracing.go
deleted file mode 100644
index 8535233b8eb..00000000000
--- a/pkg/infra/tracing/opentelemetry_tracing.go
+++ /dev/null
@@ -1,338 +0,0 @@
-package tracing
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/go-kit/log/level"
-	"go.etcd.io/etcd/api/v3/version"
-	jaegerpropagator "go.opentelemetry.io/contrib/propagators/jaeger"
-	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/exporters/jaeger"
-	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
-	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
-	"go.opentelemetry.io/otel/propagation"
-	"go.opentelemetry.io/otel/sdk/resource"
-	tracesdk "go.opentelemetry.io/otel/sdk/trace"
-	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
-	trace "go.opentelemetry.io/otel/trace"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-const (
-	jaegerExporter string = "jaeger"
-	otlpExporter   string = "otlp"
-	noopExporter   string = "noop"
-
-	jaegerPropagator string = "jaeger"
-	w3cPropagator    string = "w3c"
-)
-
-type Opentelemetry struct {
-	Enabled       string
-	Address       string
-	Propagation   string
-	customAttribs []attribute.KeyValue
-
-	log log.Logger
-
-	tracerProvider tracerProvider
-	tracer         trace.Tracer
-
-	Cfg *setting.Cfg
-}
-
-type tracerProvider interface {
-	trace.TracerProvider
-
-	Shutdown(ctx context.Context) error
-}
-
-type OpentelemetrySpan struct {
-	span trace.Span
-}
-
-type EventValue struct {
-	Str string
-	Num int64
-}
-
-type otelErrHandler func(err error)
-
-func (o otelErrHandler) Handle(err error) {
-	o(err)
-}
-
-type noopTracerProvider struct {
-	trace.TracerProvider
-}
-
-func (noopTracerProvider) Shutdown(ctx context.Context) error {
-	return nil
-}
-
-func (ots *Opentelemetry) parseSettingsOpentelemetry() error {
-	section := ots.Cfg.Raw.Section("tracing.opentelemetry")
-	var err error
-	ots.customAttribs, err = splitCustomAttribs(section.Key("custom_attributes").MustString(""))
-	if err != nil {
-		return err
-	}
-
-	section = ots.Cfg.Raw.Section("tracing.opentelemetry.jaeger")
-	ots.Enabled = noopExporter
-
-	ots.Address = section.Key("address").MustString("")
-	ots.Propagation = section.Key("propagation").MustString("")
-	if ots.Address != "" {
-		ots.Enabled = jaegerExporter
-		return nil
-	}
-
-	section = ots.Cfg.Raw.Section("tracing.opentelemetry.otlp")
-	ots.Address = section.Key("address").MustString("")
-	if ots.Address != "" {
-		ots.Enabled = otlpExporter
-	}
-	ots.Propagation = section.Key("propagation").MustString("")
-	return nil
-}
-
-func (ots *Opentelemetry) OTelExporterEnabled() bool {
-	return ots.Enabled == otlpExporter
-}
-
-func splitCustomAttribs(s string) ([]attribute.KeyValue, error) {
-	res := []attribute.KeyValue{}
-
-	attribs := strings.Split(s, ",")
-	for _, v := range attribs {
-		parts := strings.SplitN(v, ":", 2)
-		if len(parts) > 1 {
-			res = append(res, attribute.String(parts[0], parts[1]))
-		} else if v != "" {
-			return nil, fmt.Errorf("custom attribute malformed - must be in 'key:value' form: %q", v)
-		}
-	}
-
-	return res, nil
-}
-
-func (ots *Opentelemetry) initJaegerTracerProvider() (*tracesdk.TracerProvider, error) {
-	// Create the Jaeger exporter
-	exp, err := jaeger.New(jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(ots.Address)))
-	if err != nil {
-		return nil, err
-	}
-
-	res, err := resource.New(
-		context.Background(),
-		resource.WithAttributes(
-			// TODO: why are these attributes different from ones added to the
-			// OTLP provider?
-			semconv.ServiceNameKey.String("grafana"),
-			attribute.String("environment", "production"),
-		),
-		resource.WithAttributes(ots.customAttribs...),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	tp := tracesdk.NewTracerProvider(
-		tracesdk.WithBatcher(exp),
-		tracesdk.WithResource(res),
-	)
-
-	return tp, nil
-}
-
-func (ots *Opentelemetry) initOTLPTracerProvider() (*tracesdk.TracerProvider, error) {
-	client := otlptracegrpc.NewClient(otlptracegrpc.WithEndpoint(ots.Address), otlptracegrpc.WithInsecure())
-	exp, err := otlptrace.New(context.Background(), client)
-	if err != nil {
-		return nil, err
-	}
-
-	return initTracerProvider(exp, ots.customAttribs...)
-}
-
-func initTracerProvider(exp tracesdk.SpanExporter, customAttribs ...attribute.KeyValue) (*tracesdk.TracerProvider, error) {
-	res, err := resource.New(
-		context.Background(),
-		resource.WithAttributes(
-			semconv.ServiceNameKey.String("grafana"),
-			semconv.ServiceVersionKey.String(version.Version),
-		),
-		resource.WithAttributes(customAttribs...),
-		resource.WithProcessRuntimeDescription(),
-		resource.WithTelemetrySDK(),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	tp := tracesdk.NewTracerProvider(
-		tracesdk.WithBatcher(exp),
-		tracesdk.WithSampler(tracesdk.ParentBased(
-			tracesdk.AlwaysSample(),
-		)),
-		tracesdk.WithResource(res),
-	)
-	return tp, nil
-}
-
-func (ots *Opentelemetry) initNoopTracerProvider() (tracerProvider, error) {
-	return &noopTracerProvider{TracerProvider: trace.NewNoopTracerProvider()}, nil
-}
-
-func (ots *Opentelemetry) initOpentelemetryTracer() error {
-	var tp tracerProvider
-	var err error
-	switch ots.Enabled {
-	case jaegerExporter:
-		tp, err = ots.initJaegerTracerProvider()
-		if err != nil {
-			return err
-		}
-	case otlpExporter:
-		tp, err = ots.initOTLPTracerProvider()
-		if err != nil {
-			return err
-		}
-	default:
-		tp, err = ots.initNoopTracerProvider()
-		if err != nil {
-			return err
-		}
-	}
-
-	// Register our TracerProvider as the global so any imported
-	// instrumentation in the future will default to using it
-	// only if tracing is enabled
-	if ots.Enabled != "" {
-		otel.SetTracerProvider(tp)
-	}
-
-	propagators := []propagation.TextMapPropagator{}
-	for _, p := range strings.Split(ots.Propagation, ",") {
-		switch p {
-		case w3cPropagator:
-			propagators = append(propagators, propagation.TraceContext{}, propagation.Baggage{})
-		case jaegerPropagator:
-			propagators = append(propagators, jaegerpropagator.Jaeger{})
-		case "":
-		default:
-			return fmt.Errorf("unsupported OpenTelemetry propagator: %q", p)
-		}
-	}
-
-	switch len(propagators) {
-	case 0:
-		otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(
-			propagation.TraceContext{}, propagation.Baggage{},
-		))
-	case 1:
-		otel.SetTextMapPropagator(propagators[0])
-	default:
-		otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagators...))
-	}
-
-	if ots.tracerProvider == nil {
-		ots.tracerProvider = tp
-	}
-
-	ots.tracer = otel.GetTracerProvider().Tracer("component-main")
-
-	return nil
-}
-
-func (ots *Opentelemetry) Run(ctx context.Context) error {
-	otel.SetErrorHandler(otelErrHandler(func(err error) {
-		err = level.Error(ots.log).Log("msg", "OpenTelemetry handler returned an error", "err", err)
-		if err != nil {
-			ots.log.Error("OpenTelemetry log returning error", err)
-		}
-	}))
-	<-ctx.Done()
-
-	ots.log.Info("Closing tracing")
-	if ots.tracerProvider == nil {
-		return nil
-	}
-	ctxShutdown, cancel := context.WithTimeout(ctx, time.Second*5)
-	defer cancel()
-
-	if err := ots.tracerProvider.Shutdown(ctxShutdown); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (ots *Opentelemetry) Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, Span) {
-	ctx, span := ots.tracer.Start(ctx, spanName, opts...)
-	opentelemetrySpan := OpentelemetrySpan{
-		span: span,
-	}
-
-	if traceID := span.SpanContext().TraceID(); traceID.IsValid() {
-		ctx = context.WithValue(ctx, traceKey{}, traceValue{traceID.String(), span.SpanContext().IsSampled()})
-	}
-
-	return ctx, opentelemetrySpan
-}
-
-func (ots *Opentelemetry) Inject(ctx context.Context, header http.Header, _ Span) {
-	otel.GetTextMapPropagator().Inject(ctx, propagation.HeaderCarrier(header))
-}
-
-func (s OpentelemetrySpan) End() {
-	s.span.End()
-}
-
-func (s OpentelemetrySpan) SetAttributes(key string, value interface{}, kv attribute.KeyValue) {
-	s.span.SetAttributes(kv)
-}
-
-func (s OpentelemetrySpan) SetName(name string) {
-	s.span.SetName(name)
-}
-
-func (s OpentelemetrySpan) SetStatus(code codes.Code, description string) {
-	s.span.SetStatus(code, description)
-}
-
-func (s OpentelemetrySpan) RecordError(err error, options ...trace.EventOption) {
-	s.span.RecordError(err, options...)
-}
-
-func (s OpentelemetrySpan) AddEvents(keys []string, values []EventValue) {
-	for i, v := range values {
-		if v.Str != "" {
-			s.span.AddEvent(keys[i], trace.WithAttributes(attribute.Key(keys[i]).String(v.Str)))
-		}
-		if v.Num != 0 {
-			s.span.AddEvent(keys[i], trace.WithAttributes(attribute.Key(keys[i]).Int64(v.Num)))
-		}
-	}
-}
-
-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
-}
diff --git a/pkg/infra/tracing/optentelemetry_tracing_test.go b/pkg/infra/tracing/optentelemetry_tracing_test.go
deleted file mode 100644
index 292025e300e..00000000000
--- a/pkg/infra/tracing/optentelemetry_tracing_test.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package tracing
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"go.opentelemetry.io/otel/attribute"
-
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestSplitCustomAttribs(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected []attribute.KeyValue
-	}{
-		{
-			input:    "key1:value:1",
-			expected: []attribute.KeyValue{attribute.String("key1", "value:1")},
-		},
-		{
-			input: "key1:value1,key2:value2",
-			expected: []attribute.KeyValue{
-				attribute.String("key1", "value1"),
-				attribute.String("key2", "value2"),
-			},
-		},
-		{
-			input:    "",
-			expected: []attribute.KeyValue{},
-		},
-	}
-
-	for _, test := range tests {
-		attribs, err := splitCustomAttribs(test.input)
-		assert.NoError(t, err)
-		assert.EqualValues(t, test.expected, attribs)
-	}
-}
-
-func TestSplitCustomAttribs_Malformed(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected []attribute.KeyValue
-	}{
-		{input: "key1=value1"},
-		{input: "key1"},
-	}
-
-	for _, test := range tests {
-		_, err := splitCustomAttribs(test.input)
-		assert.Error(t, err)
-	}
-}
-
-func TestOptentelemetry_ParseSettingsOpentelemetry(t *testing.T) {
-	cfg := setting.NewCfg()
-	otel := &Opentelemetry{Cfg: cfg}
-
-	otelsect := cfg.Raw.Section("tracing.opentelemetry")
-	jaegersect := cfg.Raw.Section("tracing.opentelemetry.jaeger")
-	otlpsect := cfg.Raw.Section("tracing.opentelemetry.otlp")
-
-	assert.NoError(t, otel.parseSettingsOpentelemetry())
-	assert.Equal(t, noopExporter, otel.Enabled)
-
-	otelsect.Key("custom_attributes")
-	assert.NoError(t, otel.parseSettingsOpentelemetry())
-	assert.Empty(t, otel.customAttribs)
-
-	otelsect.Key("custom_attributes").SetValue("key1:value1,key2:value2")
-	assert.NoError(t, otel.parseSettingsOpentelemetry())
-	expected := []attribute.KeyValue{
-		attribute.String("key1", "value1"),
-		attribute.String("key2", "value2"),
-	}
-	assert.Equal(t, expected, otel.customAttribs)
-
-	jaegersect.Key("address").SetValue("somehost:6831")
-	assert.NoError(t, otel.parseSettingsOpentelemetry())
-	assert.Equal(t, "somehost:6831", otel.Address)
-	assert.Equal(t, jaegerExporter, otel.Enabled)
-
-	jaegersect.Key("address").SetValue("")
-	otlpsect.Key("address").SetValue("somehost:4317")
-	assert.NoError(t, otel.parseSettingsOpentelemetry())
-	assert.Equal(t, "somehost:4317", otel.Address)
-	assert.Equal(t, otlpExporter, otel.Enabled)
-}
diff --git a/pkg/infra/tracing/tracing.go b/pkg/infra/tracing/tracing.go
index 145f540b1a4..ed12e9f7ba5 100644
--- a/pkg/infra/tracing/tracing.go
+++ b/pkg/infra/tracing/tracing.go
@@ -3,22 +3,30 @@ package tracing
 import (
 	"context"
 	"fmt"
-	"io"
+	"math"
+	"net"
 	"net/http"
 	"os"
 	"strings"
+	"sync"
+	"time"
 
-	opentracing "github.com/opentracing/opentracing-go"
-	"github.com/opentracing/opentracing-go/ext"
-	ol "github.com/opentracing/opentracing-go/log"
-	"github.com/uber/jaeger-client-go"
-	jaegercfg "github.com/uber/jaeger-client-go/config"
-	"github.com/uber/jaeger-client-go/zipkin"
+	"go.etcd.io/etcd/api/v3/version"
+	jaegerpropagator "go.opentelemetry.io/contrib/propagators/jaeger"
+	"go.opentelemetry.io/contrib/samplers/jaegerremote"
+	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/exporters/jaeger"
+	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
+	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
+	"go.opentelemetry.io/otel/propagation"
+	"go.opentelemetry.io/otel/sdk/resource"
+	tracesdk "go.opentelemetry.io/otel/sdk/trace"
+	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 	trace "go.opentelemetry.io/otel/trace"
 
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+	"github.com/go-kit/log/level"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -28,6 +36,48 @@ const (
 	envJaegerAgentPort = "JAEGER_AGENT_PORT"
 )
 
+const (
+	jaegerExporter string = "jaeger"
+	otlpExporter   string = "otlp"
+	noopExporter   string = "noop"
+
+	jaegerPropagator string = "jaeger"
+	w3cPropagator    string = "w3c"
+)
+
+type Opentelemetry struct {
+	enabled       string
+	Address       string
+	Propagation   string
+	customAttribs []attribute.KeyValue
+
+	sampler          string
+	samplerParam     float64
+	samplerRemoteURL string
+
+	log log.Logger
+
+	tracerProvider tracerProvider
+	tracer         trace.Tracer
+
+	Cfg *setting.Cfg
+}
+
+type tracerProvider interface {
+	trace.TracerProvider
+
+	Shutdown(ctx context.Context) error
+}
+
+type OpentelemetrySpan struct {
+	span trace.Span
+}
+
+type EventValue struct {
+	Str string
+	Num int64
+}
+
 // Tracer defines the service used to create new spans.
 type Tracer interface {
 	// Run implements registry.BackgroundService.
@@ -83,7 +133,7 @@ type Span interface {
 }
 
 func ProvideService(cfg *setting.Cfg) (Tracer, error) {
-	ts, ots, err := parseSettings(cfg)
+	ots, err := ParseSettings(cfg)
 	if err != nil {
 		return nil, err
 	}
@@ -95,43 +145,18 @@ func ProvideService(cfg *setting.Cfg) (Tracer, error) {
 
 		return nil, false
 	})
-
-	if ts.enabled {
-		return ts, ts.initJaegerGlobalTracer()
+	if err := ots.initOpentelemetryTracer(); err != nil {
+		return nil, err
 	}
-
-	return ots, ots.initOpentelemetryTracer()
+	return ots, nil
 }
 
-func parseSettings(cfg *setting.Cfg) (*Opentracing, *Opentelemetry, error) {
-	ts, err := parseSettingsOpentracing(cfg)
-	if err != nil {
-		return ts, nil, err
-	}
-	ots, err := ParseSettingsOpentelemetry(cfg)
-	return ts, ots, err
-}
-
-func parseSettingsOpentracing(cfg *setting.Cfg) (*Opentracing, error) {
-	ts := &Opentracing{
-		Cfg: cfg,
-		log: log.New("tracing"),
-	}
-	if err := ts.parseSettings(); err != nil {
-		return ts, err
-	}
-	if ts.enabled {
-		cfg.Logger.Warn("[Deprecated] the configuration setting 'tracing.jaeger' is deprecated, please use 'tracing.opentelemetry.jaeger' instead")
-	}
-	return ts, nil
-}
-
-func ParseSettingsOpentelemetry(cfg *setting.Cfg) (*Opentelemetry, error) {
+func ParseSettings(cfg *setting.Cfg) (*Opentelemetry, error) {
 	ots := &Opentelemetry{
 		Cfg: cfg,
 		log: log.New("tracing"),
 	}
-	err := ots.parseSettingsOpentelemetry()
+	err := ots.parseSettings()
 	return ots, err
 }
 
@@ -153,10 +178,6 @@ func TraceIDFromContext(c context.Context, requireSampled bool) string {
 // 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}
 	}
@@ -173,219 +194,345 @@ func ContextWithSpan(ctx context.Context, span Span) context.Context {
 	return ctx
 }
 
-type Opentracing struct {
-	enabled                  bool
-	address                  string
-	customTags               map[string]string
-	samplerType              string
-	samplerParam             float64
-	samplingServerURL        string
-	log                      log.Logger
-	closer                   io.Closer
-	zipkinPropagation        bool
-	disableSharedZipkinSpans bool
-
-	Cfg *setting.Cfg
+type noopTracerProvider struct {
+	trace.TracerProvider
 }
 
-type OpentracingSpan struct {
-	span opentracing.Span
-}
-
-func (ts *Opentracing) parseSettings() error {
-	var section, err = ts.Cfg.Raw.GetSection("tracing.jaeger")
-	if err != nil {
-		return err
-	}
-
-	ts.address = section.Key("address").MustString("")
-	if ts.address == "" {
-		host := os.Getenv(envJaegerAgentHost)
-		port := os.Getenv(envJaegerAgentPort)
-		if host != "" || port != "" {
-			ts.address = fmt.Sprintf("%s:%s", host, port)
-		}
-	}
-	if ts.address != "" {
-		ts.enabled = true
-	}
-
-	ts.customTags = splitTagSettings(section.Key("always_included_tag").MustString(""))
-	ts.samplerType = section.Key("sampler_type").MustString("")
-	ts.samplerParam = section.Key("sampler_param").MustFloat64(1)
-	ts.zipkinPropagation = section.Key("zipkin_propagation").MustBool(false)
-	ts.disableSharedZipkinSpans = section.Key("disable_shared_zipkin_spans").MustBool(false)
-	ts.samplingServerURL = section.Key("sampling_server_url").MustString("")
+func (noopTracerProvider) Shutdown(ctx context.Context) error {
 	return nil
 }
 
-func (ts *Opentracing) initJaegerCfg() (jaegercfg.Configuration, error) {
-	cfg := jaegercfg.Configuration{
-		ServiceName: "grafana",
-		Disabled:    !ts.enabled,
-		Sampler: &jaegercfg.SamplerConfig{
-			Type:              ts.samplerType,
-			Param:             ts.samplerParam,
-			SamplingServerURL: ts.samplingServerURL,
-		},
-		Reporter: &jaegercfg.ReporterConfig{
-			LogSpans:           false,
-			LocalAgentHostPort: ts.address,
-		},
-	}
-
-	_, err := cfg.FromEnv()
-	if err != nil {
-		return cfg, err
-	}
-	return cfg, nil
-}
-
-func (ts *Opentracing) initJaegerGlobalTracer() error {
-	cfg, err := ts.initJaegerCfg()
-	if err != nil {
-		return err
-	}
-
-	jLogger := &jaegerLogWrapper{logger: log.New("jaeger")}
-
-	options := []jaegercfg.Option{}
-	options = append(options, jaegercfg.Logger(jLogger))
-
-	for tag, value := range ts.customTags {
-		options = append(options, jaegercfg.Tag(tag, value))
-	}
-
-	if ts.zipkinPropagation {
-		zipkinPropagator := zipkin.NewZipkinB3HTTPHeaderPropagator()
-		options = append(options,
-			jaegercfg.Injector(opentracing.HTTPHeaders, zipkinPropagator),
-			jaegercfg.Extractor(opentracing.HTTPHeaders, zipkinPropagator),
-		)
-
-		if !ts.disableSharedZipkinSpans {
-			options = append(options, jaegercfg.ZipkinSharedRPCSpan(true))
+func (ots *Opentelemetry) parseSettings() error {
+	legacyAddress, legacyTags := "", ""
+	if section, err := ots.Cfg.Raw.GetSection("tracing.jaeger"); err == nil {
+		legacyAddress = section.Key("address").MustString("")
+		if legacyAddress == "" {
+			host, port := os.Getenv(envJaegerAgentHost), os.Getenv(envJaegerAgentPort)
+			if host != "" || port != "" {
+				legacyAddress = fmt.Sprintf("%s:%s", host, port)
+			}
 		}
+		legacyTags = section.Key("always_included_tag").MustString("")
+		ots.sampler = section.Key("sampler_type").MustString("")
+		ots.samplerParam = section.Key("sampler_param").MustFloat64(1)
+		ots.samplerRemoteURL = section.Key("sampling_server_url").MustString("")
 	}
-
-	tracer, closer, err := cfg.NewTracer(options...)
+	section := ots.Cfg.Raw.Section("tracing.opentelemetry")
+	var err error
+	// we default to legacy tag set (attributes) if the new config format is absent
+	ots.customAttribs, err = splitCustomAttribs(section.Key("custom_attributes").MustString(legacyTags))
 	if err != nil {
 		return err
 	}
 
-	opentracing.SetGlobalTracer(tracer)
+	section = ots.Cfg.Raw.Section("tracing.opentelemetry.jaeger")
+	ots.enabled = noopExporter
 
-	ts.closer = closer
+	// we default to legacy Jaeger agent address if the new config value is empty
+	ots.Address = section.Key("address").MustString(legacyAddress)
+	ots.Propagation = section.Key("propagation").MustString("")
+	if ots.Address != "" {
+		ots.enabled = jaegerExporter
+		return nil
+	}
+
+	section = ots.Cfg.Raw.Section("tracing.opentelemetry.otlp")
+	ots.Address = section.Key("address").MustString("")
+	if ots.Address != "" {
+		ots.enabled = otlpExporter
+	}
+	ots.Propagation = section.Key("propagation").MustString("")
 	return nil
 }
 
-func (ts *Opentracing) Run(ctx context.Context) error {
+func (ots *Opentelemetry) OTelExporterEnabled() bool {
+	return ots.enabled == otlpExporter
+}
+
+func splitCustomAttribs(s string) ([]attribute.KeyValue, error) {
+	res := []attribute.KeyValue{}
+
+	attribs := strings.Split(s, ",")
+	for _, v := range attribs {
+		parts := strings.SplitN(v, ":", 2)
+		if len(parts) > 1 {
+			res = append(res, attribute.String(parts[0], parts[1]))
+		} else if v != "" {
+			return nil, fmt.Errorf("custom attribute malformed - must be in 'key:value' form: %q", v)
+		}
+	}
+
+	return res, nil
+}
+
+func (ots *Opentelemetry) initJaegerTracerProvider() (*tracesdk.TracerProvider, error) {
+	var ep jaeger.EndpointOption
+	// Create the Jaeger exporter: address can be either agent address (host:port) or collector URL
+	if host, port, err := net.SplitHostPort(ots.Address); err == nil {
+		ep = jaeger.WithAgentEndpoint(jaeger.WithAgentHost(host), jaeger.WithAgentPort(port))
+	} else {
+		ep = jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(ots.Address))
+	}
+	exp, err := jaeger.New(ep)
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := resource.New(
+		context.Background(),
+		resource.WithAttributes(
+			// TODO: why are these attributes different from ones added to the
+			// OTLP provider?
+			semconv.ServiceNameKey.String("grafana"),
+			attribute.String("environment", "production"),
+		),
+		resource.WithAttributes(ots.customAttribs...),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	sampler := tracesdk.AlwaysSample()
+	if ots.sampler == "const" || ots.sampler == "probabilistic" {
+		sampler = tracesdk.TraceIDRatioBased(ots.samplerParam)
+	} else if ots.sampler == "rateLimiting" {
+		sampler = newRateLimiter(ots.samplerParam)
+	} else if ots.sampler == "remote" {
+		sampler = jaegerremote.New("grafana", jaegerremote.WithSamplingServerURL(ots.samplerRemoteURL),
+			jaegerremote.WithInitialSampler(tracesdk.TraceIDRatioBased(ots.samplerParam)))
+	} else if ots.sampler != "" {
+		return nil, fmt.Errorf("invalid sampler type: %s", ots.sampler)
+	}
+
+	tp := tracesdk.NewTracerProvider(
+		tracesdk.WithBatcher(exp),
+		tracesdk.WithResource(res),
+		tracesdk.WithSampler(sampler),
+	)
+
+	return tp, nil
+}
+
+func (ots *Opentelemetry) initOTLPTracerProvider() (*tracesdk.TracerProvider, error) {
+	client := otlptracegrpc.NewClient(otlptracegrpc.WithEndpoint(ots.Address), otlptracegrpc.WithInsecure())
+	exp, err := otlptrace.New(context.Background(), client)
+	if err != nil {
+		return nil, err
+	}
+
+	return initTracerProvider(exp, ots.customAttribs...)
+}
+
+func initTracerProvider(exp tracesdk.SpanExporter, customAttribs ...attribute.KeyValue) (*tracesdk.TracerProvider, error) {
+	res, err := resource.New(
+		context.Background(),
+		resource.WithAttributes(
+			semconv.ServiceNameKey.String("grafana"),
+			semconv.ServiceVersionKey.String(version.Version),
+		),
+		resource.WithAttributes(customAttribs...),
+		resource.WithProcessRuntimeDescription(),
+		resource.WithTelemetrySDK(),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	tp := tracesdk.NewTracerProvider(
+		tracesdk.WithBatcher(exp),
+		tracesdk.WithSampler(tracesdk.ParentBased(
+			tracesdk.AlwaysSample(),
+		)),
+		tracesdk.WithResource(res),
+	)
+	return tp, nil
+}
+
+func (ots *Opentelemetry) initNoopTracerProvider() (tracerProvider, error) {
+	return &noopTracerProvider{TracerProvider: trace.NewNoopTracerProvider()}, nil
+}
+
+func (ots *Opentelemetry) initOpentelemetryTracer() error {
+	var tp tracerProvider
+	var err error
+	switch ots.enabled {
+	case jaegerExporter:
+		tp, err = ots.initJaegerTracerProvider()
+		if err != nil {
+			return err
+		}
+	case otlpExporter:
+		tp, err = ots.initOTLPTracerProvider()
+		if err != nil {
+			return err
+		}
+	default:
+		tp, err = ots.initNoopTracerProvider()
+		if err != nil {
+			return err
+		}
+	}
+
+	// Register our TracerProvider as the global so any imported
+	// instrumentation in the future will default to using it
+	// only if tracing is enabled
+	if ots.enabled != "" {
+		otel.SetTracerProvider(tp)
+	}
+
+	propagators := []propagation.TextMapPropagator{}
+	for _, p := range strings.Split(ots.Propagation, ",") {
+		switch p {
+		case w3cPropagator:
+			propagators = append(propagators, propagation.TraceContext{}, propagation.Baggage{})
+		case jaegerPropagator:
+			propagators = append(propagators, jaegerpropagator.Jaeger{})
+		case "":
+		default:
+			return fmt.Errorf("unsupported OpenTelemetry propagator: %q", p)
+		}
+	}
+
+	switch len(propagators) {
+	case 0:
+		otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(
+			propagation.TraceContext{}, propagation.Baggage{},
+		))
+	case 1:
+		otel.SetTextMapPropagator(propagators[0])
+	default:
+		otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagators...))
+	}
+
+	if ots.tracerProvider == nil {
+		ots.tracerProvider = tp
+	}
+
+	ots.tracer = otel.GetTracerProvider().Tracer("component-main")
+
+	return nil
+}
+
+func (ots *Opentelemetry) Run(ctx context.Context) error {
+	otel.SetErrorHandler(otel.ErrorHandlerFunc(func(err error) {
+		err = level.Error(ots.log).Log("msg", "OpenTelemetry handler returned an error", "err", err)
+		if err != nil {
+			ots.log.Error("OpenTelemetry log returning error", err)
+		}
+	}))
 	<-ctx.Done()
 
-	if ts.closer != nil {
-		ts.log.Info("Closing tracing")
-		return ts.closer.Close()
+	ots.log.Info("Closing tracing")
+	if ots.tracerProvider == nil {
+		return nil
+	}
+	ctxShutdown, cancel := context.WithTimeout(ctx, time.Second*5)
+	defer cancel()
+
+	if err := ots.tracerProvider.Shutdown(ctxShutdown); err != nil {
+		return err
 	}
 
 	return nil
 }
 
-func (ts *Opentracing) Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, Span) {
-	span, ctx := opentracing.StartSpanFromContext(ctx, spanName)
-	opentracingSpan := OpentracingSpan{span: span}
-	if sctx, ok := span.Context().(jaeger.SpanContext); ok {
-		ctx = context.WithValue(ctx, traceKey{}, traceValue{sctx.TraceID().String(), sctx.IsSampled()})
+func (ots *Opentelemetry) Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, Span) {
+	ctx, span := ots.tracer.Start(ctx, spanName, opts...)
+	opentelemetrySpan := OpentelemetrySpan{
+		span: span,
 	}
-	return ctx, opentracingSpan
-}
 
-func (ts *Opentracing) Inject(ctx context.Context, header http.Header, span Span) {
-	opentracingSpan, ok := span.(OpentracingSpan)
-	if !ok {
-		logger.Error("Failed to cast opentracing span")
+	if traceID := span.SpanContext().TraceID(); traceID.IsValid() {
+		ctx = context.WithValue(ctx, traceKey{}, traceValue{traceID.String(), span.SpanContext().IsSampled()})
 	}
-	err := opentracing.GlobalTracer().Inject(
-		opentracingSpan.span.Context(),
-		opentracing.HTTPHeaders,
-		opentracing.HTTPHeadersCarrier(header))
 
-	if err != nil {
-		logger.Error("Failed to inject span context instance", "err", err)
-	}
+	return ctx, opentelemetrySpan
 }
 
-func (s OpentracingSpan) End() {
-	s.span.Finish()
+func (ots *Opentelemetry) Inject(ctx context.Context, header http.Header, _ Span) {
+	otel.GetTextMapPropagator().Inject(ctx, propagation.HeaderCarrier(header))
 }
 
-func (s OpentracingSpan) SetAttributes(key string, value interface{}, kv attribute.KeyValue) {
-	s.span.SetTag(key, value)
+func (s OpentelemetrySpan) End() {
+	s.span.End()
 }
 
-func (s OpentracingSpan) SetName(name string) {
-	s.span.SetOperationName(name)
+func (s OpentelemetrySpan) SetAttributes(key string, value interface{}, kv attribute.KeyValue) {
+	s.span.SetAttributes(kv)
 }
 
-func (s OpentracingSpan) SetStatus(code codes.Code, description string) {
-	if code == codes.Error {
-		ext.Error.Set(s.span, true)
-	}
+func (s OpentelemetrySpan) SetName(name string) {
+	s.span.SetName(name)
 }
 
-func (s OpentracingSpan) RecordError(err error, options ...trace.EventOption) {
-	ext.Error.Set(s.span, true)
+func (s OpentelemetrySpan) SetStatus(code codes.Code, description string) {
+	s.span.SetStatus(code, description)
 }
 
-func (s OpentracingSpan) AddEvents(keys []string, values []EventValue) {
-	fields := []ol.Field{}
+func (s OpentelemetrySpan) RecordError(err error, options ...trace.EventOption) {
+	s.span.RecordError(err, options...)
+}
+
+func (s OpentelemetrySpan) AddEvents(keys []string, values []EventValue) {
 	for i, v := range values {
 		if v.Str != "" {
-			field := ol.String(keys[i], v.Str)
-			fields = append(fields, field)
+			s.span.AddEvent(keys[i], trace.WithAttributes(attribute.Key(keys[i]).String(v.Str)))
 		}
 		if v.Num != 0 {
-			field := ol.Int64(keys[i], v.Num)
-			fields = append(fields, field)
+			s.span.AddEvent(keys[i], trace.WithAttributes(attribute.Key(keys[i]).Int64(v.Num)))
 		}
 	}
-	s.span.LogFields(fields...)
 }
 
-func (s OpentracingSpan) contextWithSpan(ctx context.Context) context.Context {
+func (s OpentelemetrySpan) contextWithSpan(ctx context.Context) context.Context {
 	if s.span != nil {
-		ctx = opentracing.ContextWithSpan(ctx, s.span)
+		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 sctx, ok := s.span.Context().(jaeger.SpanContext); ok {
-			ctx = context.WithValue(ctx, traceKey{}, traceValue{sctx.TraceID().String(), sctx.IsSampled()})
+		if traceID := s.span.SpanContext().TraceID(); traceID.IsValid() {
+			ctx = context.WithValue(ctx, traceKey{}, traceValue{traceID.String(), s.span.SpanContext().IsSampled()})
 		}
 	}
 	return ctx
 }
 
-func splitTagSettings(input string) map[string]string {
-	res := map[string]string{}
+type rateLimiter struct {
+	sync.Mutex
+	rps        float64
+	balance    float64
+	maxBalance float64
+	lastTick   time.Time
 
-	tags := strings.Split(input, ",")
-	for _, v := range tags {
-		kv := strings.Split(v, ":")
-		if len(kv) > 1 {
-			res[kv[0]] = kv[1]
-		}
+	now func() time.Time
+}
+
+func newRateLimiter(rps float64) *rateLimiter {
+	return &rateLimiter{
+		rps:        rps,
+		balance:    math.Max(rps, 1),
+		maxBalance: math.Max(rps, 1),
+		lastTick:   time.Now(),
+		now:        time.Now,
 	}
-
-	return res
 }
 
-type jaegerLogWrapper struct {
-	logger log.Logger
+func (rl *rateLimiter) ShouldSample(p tracesdk.SamplingParameters) tracesdk.SamplingResult {
+	rl.Lock()
+	defer rl.Unlock()
+	psc := trace.SpanContextFromContext(p.ParentContext)
+	if rl.balance >= 1 {
+		rl.balance -= 1
+		return tracesdk.SamplingResult{Decision: tracesdk.RecordAndSample, Tracestate: psc.TraceState()}
+	}
+	currentTime := rl.now()
+	elapsedTime := currentTime.Sub(rl.lastTick).Seconds()
+	rl.lastTick = currentTime
+	rl.balance = math.Min(rl.maxBalance, rl.balance+elapsedTime*rl.rps)
+	if rl.balance >= 1 {
+		rl.balance -= 1
+		return tracesdk.SamplingResult{Decision: tracesdk.RecordAndSample, Tracestate: psc.TraceState()}
+	}
+	return tracesdk.SamplingResult{Decision: tracesdk.Drop, Tracestate: psc.TraceState()}
 }
 
-func (jlw *jaegerLogWrapper) Error(msg string) {
-	jlw.logger.Error(msg)
-}
-
-func (jlw *jaegerLogWrapper) Infof(format string, args ...interface{}) {
-	msg := fmt.Sprintf(format, args...)
-	jlw.logger.Info(msg)
-}
+func (rl *rateLimiter) Description() string { return "RateLimitingSampler" }
diff --git a/pkg/infra/tracing/tracing_test.go b/pkg/infra/tracing/tracing_test.go
index 6c2a01b4c45..17bc34bcc72 100644
--- a/pkg/infra/tracing/tracing_test.go
+++ b/pkg/infra/tracing/tracing_test.go
@@ -5,137 +5,163 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/otel/attribute"
 
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-func TestGroupSplit(t *testing.T) {
+// TODO(zserge) Add proper tests for opentelemetry
+
+func TestSplitCustomAttribs(t *testing.T) {
 	tests := []struct {
 		input    string
-		expected map[string]string
+		expected []attribute.KeyValue
 	}{
 		{
-			input: "tag1:value1,tag2:value2",
-			expected: map[string]string{
-				"tag1": "value1",
-				"tag2": "value2",
+			input:    "key1:value:1",
+			expected: []attribute.KeyValue{attribute.String("key1", "value:1")},
+		},
+		{
+			input: "key1:value1,key2:value2",
+			expected: []attribute.KeyValue{
+				attribute.String("key1", "value1"),
+				attribute.String("key2", "value2"),
 			},
 		},
 		{
 			input:    "",
-			expected: map[string]string{},
-		},
-		{
-			input:    "tag1",
-			expected: map[string]string{},
+			expected: []attribute.KeyValue{},
 		},
 	}
 
 	for _, test := range tests {
-		tags := splitTagSettings(test.input)
-		for k, v := range test.expected {
-			value, exists := tags[k]
-			assert.Truef(t, exists, "Tag %q not found for input %q", k, test.input)
-			assert.Equalf(t, v, value, "Tag %q has wrong value for input %q", k, test.input)
-		}
+		attribs, err := splitCustomAttribs(test.input)
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.expected, attribs)
 	}
 }
 
-func TestInitJaegerCfg_Default(t *testing.T) {
-	ts := &Opentracing{}
-	cfg, err := ts.initJaegerCfg()
-	require.NoError(t, err)
+func TestSplitCustomAttribs_Malformed(t *testing.T) {
+	tests := []struct {
+		input string
+	}{
+		{input: "key1=value1"},
+		{input: "key1"},
+	}
 
-	assert.True(t, cfg.Disabled)
+	for _, test := range tests {
+		_, err := splitCustomAttribs(test.input)
+		assert.Error(t, err)
+	}
 }
 
-func TestInitJaegerCfg_Enabled(t *testing.T) {
-	ts := &Opentracing{enabled: true}
-	cfg, err := ts.initJaegerCfg()
-	require.NoError(t, err)
-
-	assert.False(t, cfg.Disabled)
-	assert.Equal(t, "localhost:6831", cfg.Reporter.LocalAgentHostPort)
-}
-
-func TestInitJaegerCfg_DisabledViaEnv(t *testing.T) {
-	err := os.Setenv("JAEGER_DISABLED", "true")
-	require.NoError(t, err)
-	defer func() {
-		err := os.Unsetenv("JAEGER_DISABLED")
-		require.NoError(t, err)
-	}()
-
-	ts := &Opentracing{enabled: true}
-	cfg, err := ts.initJaegerCfg()
-	require.NoError(t, err)
-
-	assert.True(t, cfg.Disabled)
-}
-
-func TestInitJaegerCfg_EnabledViaEnv(t *testing.T) {
-	err := os.Setenv("JAEGER_DISABLED", "false")
-	require.NoError(t, err)
-	defer func() {
-		err := os.Unsetenv("JAEGER_DISABLED")
-		require.NoError(t, err)
-	}()
-
-	ts := &Opentracing{enabled: false}
-	cfg, err := ts.initJaegerCfg()
-	require.NoError(t, err)
-
-	assert.False(t, cfg.Disabled)
-}
-
-func TestInitJaegerCfg_InvalidEnvVar(t *testing.T) {
-	err := os.Setenv("JAEGER_DISABLED", "totallybogus")
-	require.NoError(t, err)
-	defer func() {
-		err := os.Unsetenv("JAEGER_DISABLED")
-		require.NoError(t, err)
-	}()
-
-	ts := &Opentracing{}
-	_, err = ts.initJaegerCfg()
-	require.EqualError(t, err, "cannot parse env var JAEGER_DISABLED=totallybogus: strconv.ParseBool: parsing \"totallybogus\": invalid syntax")
-}
-
-func TestInitJaegerCfg_EnabledViaHost(t *testing.T) {
-	require.NoError(t, os.Setenv("JAEGER_AGENT_HOST", "example.com"))
-	defer func() {
-		require.NoError(t, os.Unsetenv("JAEGER_AGENT_HOST"))
-	}()
-
-	cfg := setting.NewCfg()
-	ts := &Opentracing{Cfg: cfg}
-	_, err := ts.Cfg.Raw.NewSection("tracing.jaeger")
-	require.NoError(t, err)
-	require.NoError(t, ts.parseSettings())
-	jaegerCfg, err := ts.initJaegerCfg()
-	require.NoError(t, err)
-
-	assert.False(t, jaegerCfg.Disabled)
-	assert.Equal(t, "example.com:6831", jaegerCfg.Reporter.LocalAgentHostPort)
-}
-
-func TestInitJaegerCfg_EnabledViaHostPort(t *testing.T) {
-	require.NoError(t, os.Setenv("JAEGER_AGENT_HOST", "example.com"))
-	require.NoError(t, os.Setenv("JAEGER_AGENT_PORT", "12345"))
-	defer func() {
-		require.NoError(t, os.Unsetenv("JAEGER_AGENT_HOST"))
-		require.NoError(t, os.Unsetenv("JAEGER_AGENT_PORT"))
-	}()
-
-	cfg := setting.NewCfg()
-	ts := &Opentracing{Cfg: cfg}
-	_, err := ts.Cfg.Raw.NewSection("tracing.jaeger")
-	require.NoError(t, err)
-	require.NoError(t, ts.parseSettings())
-	jaegerCfg, err := ts.initJaegerCfg()
-	require.NoError(t, err)
-
-	assert.False(t, jaegerCfg.Disabled)
-	assert.Equal(t, "example.com:12345", jaegerCfg.Reporter.LocalAgentHostPort)
+func TestTracingConfig(t *testing.T) {
+	for _, test := range []struct {
+		Name               string
+		Cfg                string
+		Env                map[string]string
+		ExpectedExporter   string
+		ExpectedAddress    string
+		ExpectedPropagator string
+		ExpectedAttrs      []attribute.KeyValue
+	}{
+		{
+			Name:             "default config uses noop exporter",
+			Cfg:              "",
+			ExpectedExporter: noopExporter,
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "custom attributes are parsed",
+			Cfg: `
+			[tracing.opentelemetry]
+			custom_attributes = key1:value1,key2:value2
+			`,
+			ExpectedExporter: noopExporter,
+			ExpectedAttrs:    []attribute.KeyValue{attribute.String("key1", "value1"), attribute.String("key2", "value2")},
+		},
+		{
+			Name: "jaeger address is parsed",
+			Cfg: `
+			[tracing.opentelemetry.jaeger]
+			address = jaeger.example.com:6831
+			`,
+			ExpectedExporter: jaegerExporter,
+			ExpectedAddress:  "jaeger.example.com:6831",
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "OTLP address is parsed",
+			Cfg: `
+			[tracing.opentelemetry.otlp]
+			address = otlp.example.com:4317
+			`,
+			ExpectedExporter: otlpExporter,
+			ExpectedAddress:  "otlp.example.com:4317",
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "legacy config format is supported",
+			Cfg: `
+			[tracing.jaeger]
+			address = jaeger.example.com:6831
+			`,
+			ExpectedExporter: jaegerExporter,
+			ExpectedAddress:  "jaeger.example.com:6831",
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "legacy env variables are supproted",
+			Cfg:  `[tracing.jaeger]`,
+			Env: map[string]string{
+				"JAEGER_AGENT_HOST": "example.com",
+				"JAEGER_AGENT_PORT": "12345",
+			},
+			ExpectedExporter: jaegerExporter,
+			ExpectedAddress:  "example.com:12345",
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "opentelemetry config format is prioritised over legacy jaeger",
+			Cfg: `
+			[tracing.jaeger]
+			address = foo.com:6831
+			custom_tags = a:b
+			[tracing.opentelemetry]
+			custom_attributes = c:d
+			[tracing.opentelemetry.jaeger]
+			address = bar.com:6831
+			`,
+			ExpectedExporter: jaegerExporter,
+			ExpectedAddress:  "bar.com:6831",
+			ExpectedAttrs:    []attribute.KeyValue{attribute.String("c", "d")},
+		},
+	} {
+		t.Run(test.Name, func(t *testing.T) {
+			// export envioronment variables
+			if test.Env != nil {
+				for k, v := range test.Env {
+					assert.NoError(t, os.Setenv(k, v))
+				}
+				defer func() {
+					for k := range test.Env {
+						assert.NoError(t, os.Unsetenv(k))
+					}
+				}()
+			}
+			// parse config sections
+			cfg := setting.NewCfg()
+			err := cfg.Raw.Append([]byte(test.Cfg))
+			assert.NoError(t, err)
+			// create tracer
+			tracer, err := ProvideService(cfg)
+			assert.NoError(t, err)
+			// make sure tracker is properly configured
+			otel := tracer.(*Opentelemetry)
+			assert.Equal(t, test.ExpectedExporter, otel.enabled)
+			assert.Equal(t, test.ExpectedAddress, otel.Address)
+			assert.Equal(t, test.ExpectedPropagator, otel.Propagation)
+			assert.Equal(t, test.ExpectedAttrs, otel.customAttribs)
+		})
+	}
 }
diff --git a/pkg/services/pluginsintegration/config/tracing.go b/pkg/services/pluginsintegration/config/tracing.go
index 1f5ad963a83..24e3230bd2b 100644
--- a/pkg/services/pluginsintegration/config/tracing.go
+++ b/pkg/services/pluginsintegration/config/tracing.go
@@ -11,7 +11,7 @@ import (
 // newTracingCfg creates a plugins tracing configuration based on the provided Grafana tracing config.
 // If OpenTelemetry (OTLP) is disabled, a zero-value OpenTelemetryCfg is returned.
 func newTracingCfg(grafanaCfg *setting.Cfg) (pCfg.Tracing, error) {
-	ots, err := tracing.ParseSettingsOpentelemetry(grafanaCfg)
+	ots, err := tracing.ParseSettings(grafanaCfg)
 	if err != nil {
 		return pCfg.Tracing{}, fmt.Errorf("parse settings: %w", err)
 	}

From 48933e121f5b573b8ea6168389bc24bae3543645 Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Thu, 27 Apr 2023 15:18:23 +0200
Subject: [PATCH 473/729] GrafanaUI: Add indeterminate state to Checkbox
 (#67312)

---
 .../src/components/Forms/Checkbox.mdx         | 29 ++++++-----
 .../src/components/Forms/Checkbox.story.tsx   | 28 +++++++++++
 .../src/components/Forms/Checkbox.tsx         | 48 +++++++++++++++++--
 3 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/packages/grafana-ui/src/components/Forms/Checkbox.mdx b/packages/grafana-ui/src/components/Forms/Checkbox.mdx
index 836c39381fe..6ae0beee73e 100644
--- a/packages/grafana-ui/src/components/Forms/Checkbox.mdx
+++ b/packages/grafana-ui/src/components/Forms/Checkbox.mdx
@@ -9,22 +9,27 @@ import { Checkbox } from './Checkbox';
 
 Checked represents true, un-checked represent false. So you can use them to select a binary option or multiple options in a set. `Checkbox` can be used in groups, where the single checkboxes have no dependencies. That means that selecting one doesn’t affect any other `Checkbox`. When adding a description to your `Checkbox`, write positive statements so that "checked" means "yes" and not "no". That way, you can avoid confusion.
 
-**DO:** [ ] Hide options
-**DON'T:** [ ] Do not show options
+- **DO:** [ ] Hide options
+- **DON'T:** [ ] Do not show options
 
 Checkboxes typically only trigger changes after sending a form. If your component should trigger a change immediately, it's better to use a toggle switch instead. Furthermore, checkboxes are not mutually exclusive. That means that selecting one will not disable the others or impact them in any other way. If you want to offer a mutually exclusive choice, use `RadioButtonGroup` or a `Select` dropdown.
 
-**DO:**
-Show series
-[ ] A-series
-[ ] B-series
-[ ] C-series
+**DO:** Show series
 
-**DON'T:**
-Show only
-[ ] A-series
-[ ] B-series
-[ ] C-series
+- [ ] A-series
+- [ ] B-series
+- [ ] C-series
+
+**DON'T:** Show only
+
+- [ ] A-series
+- [ ] B-series
+- [ ] C-series
+
+The indeterminate state of the checkbox should be used when there is a group of child checkboxes that are in a mix of checked and unchecked states. For instance when you have a list of checkboxes representing the columns of a table, and you want to allow the user to select which columns to display. If some of the columns are checked, and some are unchecked, then the parent checkbox should be in an indeterminate state. If all the columns are checked, then the parent should be checked. If none of the columns are checked, then the parent should be unchecked.
+It is discouraged to set both `indeterminate` and `checked` state as a checkboxs emit boolean values which can only ever be TRUE or FALSE, and if something is partially true, then it is false.
+
+- **DON'T:** `<Checkbox checked indeterminate />`
 
 ### Usage
 
diff --git a/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx b/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx
index 3606cc3d9a2..5d43c643df2 100644
--- a/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx
@@ -37,6 +37,7 @@ Basic.args = {
   label: 'Skip TLS cert validation',
   description: 'Set to true if you want to skip TLS cert validation',
   disabled: false,
+  indeterminate: false,
 };
 
 export const StackedList = () => {
@@ -78,6 +79,33 @@ InAField.args = {
   description:
     'Annotation queries can be toggled on or of at the top of the dashboard. With this option checked this toggle will be hidden.',
   disabled: false,
+  indeterminate: false,
+};
+
+export const AllStates: ComponentStory<typeof Checkbox> = (args) => {
+  const [checked, setChecked] = useState(false);
+  const onChange = useCallback(
+    (e: React.FormEvent<HTMLInputElement>) => setChecked(e.currentTarget.checked),
+    [setChecked]
+  );
+
+  return (
+    <div>
+      <VerticalGroup>
+        <Checkbox value={checked} onChange={onChange} {...args} />
+        <Checkbox value={true} label="Checked" />
+        <Checkbox value={false} label="Unchecked" />
+        <Checkbox value={false} indeterminate={true} label="Interdeterminate" />
+      </VerticalGroup>
+    </div>
+  );
+};
+
+AllStates.args = {
+  label: 'Props set from controls',
+  description: 'Set to true if you want to skip TLS cert validation',
+  disabled: false,
+  indeterminate: false,
 };
 
 export default meta;
diff --git a/packages/grafana-ui/src/components/Forms/Checkbox.tsx b/packages/grafana-ui/src/components/Forms/Checkbox.tsx
index b769c514137..af19c3675f6 100644
--- a/packages/grafana-ui/src/components/Forms/Checkbox.tsx
+++ b/packages/grafana-ui/src/components/Forms/Checkbox.tsx
@@ -9,15 +9,20 @@ import { getFocusStyles, getMouseFocusStyles } from '../../themes/mixins';
 import { getLabelStyles } from './Label';
 
 export interface CheckboxProps extends Omit<HTMLProps<HTMLInputElement>, 'value'> {
+  /** Label to display next to checkbox */
   label?: string;
+  /** Description to display under the label */
   description?: string;
+  /** Current value of the checkbox */
   value?: boolean;
-  // htmlValue allows to specify the input "value" attribute
+  /** htmlValue allows to specify the input "value" attribute */
   htmlValue?: string | number;
+  /** Sets the checkbox into a "mixed" state. This is only a visual change and does not affect the value. */
+  indeterminate?: boolean;
 }
 
 export const Checkbox = React.forwardRef<HTMLInputElement, CheckboxProps>(
-  ({ label, description, value, htmlValue, onChange, disabled, className, ...inputProps }, ref) => {
+  ({ label, description, value, htmlValue, onChange, disabled, className, indeterminate, ...inputProps }, ref) => {
     const handleOnChange = useCallback(
       (e: React.ChangeEvent<HTMLInputElement>) => {
         if (onChange) {
@@ -28,16 +33,19 @@ export const Checkbox = React.forwardRef<HTMLInputElement, CheckboxProps>(
     );
     const styles = useStyles2(getCheckboxStyles);
 
+    const ariaChecked = indeterminate ? 'mixed' : undefined;
+
     return (
       <label className={cx(styles.wrapper, className)}>
         <div className={styles.checkboxWrapper}>
           <input
             type="checkbox"
-            className={styles.input}
+            className={cx(styles.input, indeterminate && styles.inputIndeterminate)}
             checked={value}
             disabled={disabled}
             onChange={handleOnChange}
             value={htmlValue}
+            aria-checked={ariaChecked}
             {...inputProps}
             ref={ref}
           />
@@ -89,7 +97,6 @@ export const getCheckboxStyles = stylesFactory((theme: GrafanaTheme2) => {
        * for angular components styling
        * */
       &:checked + span {
-        background: blue;
         background: ${theme.colors.primary.main};
         border: none;
 
@@ -124,6 +131,39 @@ export const getCheckboxStyles = stylesFactory((theme: GrafanaTheme2) => {
         }
       }
     `,
+
+    inputIndeterminate: css`
+      &[aria-checked='mixed'] + span {
+        border: none;
+        background: ${theme.colors.primary.main};
+
+        &:hover {
+          background: ${theme.colors.primary.shade};
+        }
+
+        &:after {
+          content: '';
+          position: absolute;
+          z-index: 2;
+          left: 3px;
+          right: 3px;
+          top: calc(50% - 1.5px);
+          height: 3px;
+          border: 1.5px solid ${theme.colors.primary.contrastText};
+          background-color: ${theme.colors.primary.contrastText};
+          width: auto;
+          transform: none;
+        }
+      }
+      &:disabled[aria-checked='mixed'] + span {
+        background-color: ${theme.colors.action.disabledBackground};
+
+        &:after {
+          border-color: ${theme.colors.action.disabledText};
+        }
+      }
+    `,
+
     checkboxWrapper: css`
       display: flex;
       align-items: center;

From 5c32925f9f35e79a5ea66f1355279788cf503629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Thu, 27 Apr 2023 15:26:19 +0200
Subject: [PATCH 474/729] PostgreSQL: Fix tls certificate issue by downgrading
 lib/pq (#67372)

* PostgreSQL: Downgrade lib/pq

* Add comment
---
 go.mod | 5 ++++-
 go.sum | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 6a91e3d4a8a..043f4e97785 100644
--- a/go.mod
+++ b/go.mod
@@ -73,7 +73,7 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0
 	github.com/json-iterator/go v1.1.12
 	github.com/jung-kurt/gofpdf v1.16.2
-	github.com/lib/pq v1.10.7
+	github.com/lib/pq v1.10.6
 	github.com/linkedin/goavro/v2 v2.10.0
 	github.com/m3db/prometheus_remote_client_golang v0.4.4
 	github.com/magefile/mage v1.14.0
@@ -424,3 +424,6 @@ replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-aler
 replace google.golang.org/grpc => google.golang.org/grpc v1.45.0
 
 replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3
+
+// Use 1.10.6 of pq to avoid a change in 1.10.7 that has certificate validation issues. https://github.com/grafana/grafana/issues/65816
+replace github.com/lib/pq => github.com/lib/pq v1.10.6
diff --git a/go.sum b/go.sum
index cc84fbc5f8a..d5b00783ff0 100644
--- a/go.sum
+++ b/go.sum
@@ -1647,6 +1647,8 @@ github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
+github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=

From 0a9240aebae687410a7d25b81fe9cd761fbf87da Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Thu, 27 Apr 2023 09:43:54 -0400
Subject: [PATCH 475/729] Prometheus: Configuration page overhaul (#66198)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* organize layout, make design uniform, add doc link

* fix e2e test

* move overhauled config parts into prometheus code

* update tooltips with doc links

* clean component styles for section padding, top and bottom 32px

* make additional settings subsection headers h6

* use secondary gray for section descriptions

* fix merge issues

* change inlineswitch to switch only in prom settings because the other components are shared

* remove legacy formfield and input, replace with inlinefield and input from grafana-ui

* find more formfield and UI design fixes like changing inlineformlabel to inlinefield

* remove unused inline form label

* replace legacy duration validations with <FieldValidationMessage>

* fix styles secondary gray from theme

* change language, headings and datasource -> data source

* update alert setting styles with new component

* update prom url heading and tooltip

* update default editor tooltip and set builder as default editor

* update interval tooltip

* update prom type tooltip

* update custom query params tooltip

* update exemplar internal link tooltip

* fix inline form styling inconsistency

* allow for using the DataSourceHTTPSettings component without the connection string

* remove overhaul component, re-use dshtttps comp, and use connection input in config editor

* make tooltips interactive to click links

* consistent label width across the elements we can control for now, fix exemplar switch

* make connection url a component

* refactor onBlur validation

* remove unused component

* add tests for config validations

* add more meaningful health check

* fix e2e test

* fix e2e test

* fix e2e test

* add error handling for more url errors

* remove unnecessary conversion

* health check tests

* Clean up the health check

* health check unit tests

* health check unit tests improved

* make pretty for drone

* lint check go

* lint check go

* add required attr to connection component

* Update public/app/plugins/datasource/prometheus/configuration/Connection.tsx

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>

* fix read only issue for provisioned datasources

* validate multiple durations for incremental query setting

* use sentence case for headers

* use className consistently for styles

* add tests for url regex

* remove console logs

* only use query as healthcheck as the healthy api is not supported by Mimir

* fix exemplar e2e test

* remove overhaul prop from custom headers setting component

* remove connection section and use DatasourceHttpSettings connection with custom label and interactive tooltip

* add spaces back

* spaces

---------

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .betterer.results                             |   6 +-
 e2e/various-suite/exemplars.spec.ts           |   2 +-
 .../DataSourceHttpSettings.tsx                |  21 +-
 .../components/DataSourceSettings/types.ts    |   7 +-
 pkg/tsdb/prometheus/healthcheck.go            |  93 ++++
 pkg/tsdb/prometheus/healthcheck_test.go       | 125 +++++
 pkg/tsdb/prometheus/querydata/request.go      |   7 +
 .../AlertingSettingsOverhaul.tsx              |  56 +++
 .../configuration/AzureAuthSettings.tsx       |   4 +-
 .../configuration/ConfigEditor.test.tsx       |  93 ++++
 .../prometheus/configuration/ConfigEditor.tsx |  96 +++-
 .../configuration/ExemplarSetting.tsx         |  71 ++-
 .../configuration/ExemplarsSettings.tsx       |  12 +-
 .../configuration/PromSettings.test.tsx       |  55 +-
 .../prometheus/configuration/PromSettings.tsx | 472 ++++++++++--------
 .../datasource/prometheus/datasource.test.ts  |   5 -
 .../datasource/prometheus/datasource.tsx      |  38 --
 17 files changed, 818 insertions(+), 345 deletions(-)
 create mode 100644 pkg/tsdb/prometheus/healthcheck.go
 create mode 100644 pkg/tsdb/prometheus/healthcheck_test.go
 create mode 100644 public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx
 create mode 100644 public/app/plugins/datasource/prometheus/configuration/ConfigEditor.test.tsx

diff --git a/.betterer.results b/.betterer.results
index e7f154cafba..5e3d035af55 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4753,7 +4753,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Do not use any type assertions.", "22"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
@@ -4762,9 +4762,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "31"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "32"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "33"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "31"]
     ],
     "public/app/plugins/datasource/prometheus/language_provider.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/e2e/various-suite/exemplars.spec.ts b/e2e/various-suite/exemplars.spec.ts
index 7b6f5ad6e1a..d341878b4cc 100644
--- a/e2e/various-suite/exemplars.spec.ts
+++ b/e2e/various-suite/exemplars.spec.ts
@@ -4,7 +4,7 @@ const dataSourceName = 'PromExemplar';
 const addDataSource = () => {
   e2e.flows.addDataSource({
     type: 'Prometheus',
-    expectedAlertMessage: 'Error reading Prometheus',
+    expectedAlertMessage: 'saved',
     name: dataSourceName,
     form: () => {
       e2e.components.DataSource.Prometheus.configPage.exemplarsAddButton().click();
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
index d971c03a813..cf4a0a26981 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
@@ -73,6 +73,7 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
     azureAuthSettings,
     renderSigV4Editor,
     secureSocksDSProxyEnabled,
+    connectionElements,
   } = props;
   let urlTooltip;
   const [isAccessHelpVisible, setIsAccessHelpVisible] = useState(false);
@@ -93,6 +94,7 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
       urlTooltip = (
         <>
           Your access method is <em>Browser</em>, this means the URL needs to be accessible from the browser.
+          {connectionElements?.tooltip}
         </>
       );
       break;
@@ -101,11 +103,12 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
         <>
           Your access method is <em>Server</em>, this means the URL needs to be accessible from the grafana
           backend/server.
+          {connectionElements?.tooltip}
         </>
       );
       break;
     default:
-      urlTooltip = 'Specify a complete HTTP URL (for example http://your_server:8080)';
+      urlTooltip = <>Specify a complete HTTP URL (for example http://your_server:8080) {connectionElements?.tooltip}</>;
   }
 
   const accessSelect = (
@@ -143,14 +146,24 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
   const azureAuthEnabled: boolean =
     (azureAuthSettings?.azureAuthSupported && azureAuthSettings.getAzureAuthEnabled(dataSourceConfig)) || false;
 
+  const connectionLabel = connectionElements?.label ? connectionElements?.label : 'URL';
+
   return (
     <div className="gf-form-group">
       <>
         <h3 className="page-heading">HTTP</h3>
         <div className="gf-form-group">
-          <div className="gf-form">
-            <FormField label="URL" labelWidth={13} tooltip={urlTooltip} inputEl={urlInput} />
-          </div>
+          {defaultUrl && (
+            <div className="gf-form">
+              <FormField
+                interactive={connectionElements?.tooltip ? true : false}
+                label={connectionLabel}
+                labelWidth={13}
+                tooltip={urlTooltip}
+                inputEl={urlInput}
+              />
+            </div>
+          )}
 
           {showAccessOptions && (
             <>
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/types.ts b/packages/grafana-ui/src/components/DataSourceSettings/types.ts
index 2608fb6cefa..81d20df8f2a 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/types.ts
+++ b/packages/grafana-ui/src/components/DataSourceSettings/types.ts
@@ -30,7 +30,7 @@ export interface HttpSettingsBaseProps<JSONData extends DataSourceJsonData = any
 
 export interface HttpSettingsProps extends HttpSettingsBaseProps {
   /** The default url for the data source */
-  defaultUrl: string;
+  defaultUrl?: string;
   /** Show the http access help box */
   showAccessOptions?: boolean;
   /** Show the SigV4 auth toggle option */
@@ -41,4 +41,9 @@ export interface HttpSettingsProps extends HttpSettingsBaseProps {
   renderSigV4Editor?: React.ReactNode;
   /** Show the Secure Socks Datasource Proxy toggle option */
   secureSocksDSProxyEnabled?: boolean;
+  /** connection URL label and tooltip */
+  connectionElements?: {
+    label?: string;
+    tooltip?: React.ReactNode;
+  };
 }
diff --git a/pkg/tsdb/prometheus/healthcheck.go b/pkg/tsdb/prometheus/healthcheck.go
new file mode 100644
index 00000000000..8929d12c766
--- /dev/null
+++ b/pkg/tsdb/prometheus/healthcheck.go
@@ -0,0 +1,93 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/kindsys"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/tsdb/prometheus/kinds/dataquery"
+	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
+)
+
+const (
+	refID = "__healthcheck__"
+)
+
+var logger log.Logger = log.New("tsdb.prometheus")
+
+func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult,
+	error) {
+	logger := logger.FromContext(ctx)
+	ds, err := s.getInstance(req.PluginContext)
+
+	// check that the datasource exists
+	if err != nil {
+		return getHealthCheckMessage(logger, "error getting datasource info", err)
+	}
+
+	if ds == nil {
+		return getHealthCheckMessage(logger, "", errors.New("invalid datasource info received"))
+	}
+
+	return healthcheck(ctx, req, ds)
+}
+
+func healthcheck(ctx context.Context, req *backend.CheckHealthRequest, i *instance) (*backend.CheckHealthResult, error) {
+	qm := models.QueryModel{
+		LegendFormat: "",
+		UtcOffsetSec: 0,
+		PrometheusDataQuery: dataquery.PrometheusDataQuery{
+			Expr:    "1+1",
+			Instant: kindsys.Ptr(true),
+			RefId:   refID,
+		},
+	}
+	b, _ := json.Marshal(&qm)
+
+	query := backend.DataQuery{
+		RefID: refID,
+		TimeRange: backend.TimeRange{
+			From: time.Unix(1, 0).UTC(),
+			To:   time.Unix(4, 0).UTC(),
+		},
+		JSON: b,
+	}
+	resp, err := i.queryData.Execute(ctx, &backend.QueryDataRequest{
+		PluginContext: req.PluginContext,
+		Queries:       []backend.DataQuery{query},
+	})
+
+	if err != nil {
+		return getHealthCheckMessage(logger, "Your configuration has been saved but there is an error.", err)
+	}
+
+	if resp.Responses[refID].Error != nil {
+		return getHealthCheckMessage(logger, "Your configuration has been saved but there is an error.",
+			errors.New(resp.Responses[refID].Error.Error()))
+	}
+
+	return getHealthCheckMessage(logger, "Successfully saved the configuration and queried the Prometheus API.", nil)
+}
+
+func getHealthCheckMessage(logger log.Logger, message string, err error) (*backend.CheckHealthResult, error) {
+	if err == nil {
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusOk,
+			Message: message,
+		}, nil
+	}
+
+	logger.Warn("error performing prometheus healthcheck", "err", err.Error())
+	errorMessage := fmt.Sprintf("%s - %s", err.Error(), message)
+
+	return &backend.CheckHealthResult{
+		Status:  backend.HealthStatusError,
+		Message: errorMessage,
+	}, nil
+}
diff --git a/pkg/tsdb/prometheus/healthcheck_test.go b/pkg/tsdb/prometheus/healthcheck_test.go
new file mode 100644
index 00000000000..e4d8d060821
--- /dev/null
+++ b/pkg/tsdb/prometheus/healthcheck_test.go
@@ -0,0 +1,125 @@
+package prometheus
+
+import (
+	"context"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	sdkHttpClient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana/pkg/infra/httpclient"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/assert"
+)
+
+type healthCheckProvider[T http.RoundTripper] struct {
+	httpclient.Provider
+	RoundTripper *T
+}
+
+type healthCheckSuccessRoundTripper struct {
+}
+type healthCheckFailRoundTripper struct {
+}
+
+func (rt *healthCheckSuccessRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	return &http.Response{
+		Status:        "200",
+		StatusCode:    200,
+		Header:        nil,
+		Body:          nil,
+		ContentLength: 0,
+		Request:       req,
+	}, nil
+}
+
+func (rt *healthCheckFailRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	return &http.Response{
+		Status:        "400",
+		StatusCode:    400,
+		Header:        nil,
+		Body:          nil,
+		ContentLength: 0,
+		Request:       req,
+	}, nil
+}
+
+func (provider *healthCheckProvider[T]) New(opts ...sdkHttpClient.Options) (*http.Client, error) {
+	client := &http.Client{}
+	provider.RoundTripper = new(T)
+	client.Transport = *provider.RoundTripper
+	return client, nil
+}
+
+func (provider *healthCheckProvider[T]) GetTransport(opts ...sdkHttpClient.Options) (http.RoundTripper, error) {
+	return *new(T), nil
+}
+
+func getMockProvider[T http.RoundTripper]() *healthCheckProvider[T] {
+	return &healthCheckProvider[T]{
+		RoundTripper: new(T),
+	}
+}
+
+func Test_healthcheck(t *testing.T) {
+	t.Run("should do a successful health check", func(t *testing.T) {
+		httpProvider := getMockProvider[*healthCheckSuccessRoundTripper]()
+		s := &Service{
+			im: datasource.NewInstanceManager(newInstanceSettings(httpProvider, &setting.Cfg{}, &featuremgmt.FeatureManager{}, nil)),
+		}
+
+		req := &backend.CheckHealthRequest{
+			PluginContext: getPluginContext(),
+			Headers:       nil,
+		}
+
+		res, err := s.CheckHealth(context.Background(), req)
+		assert.NoError(t, err)
+		assert.Equal(t, backend.HealthStatusOk, res.Status)
+	})
+
+	t.Run("should return an error for an unsuccessful health check", func(t *testing.T) {
+		httpProvider := getMockProvider[*healthCheckFailRoundTripper]()
+		s := &Service{
+			im: datasource.NewInstanceManager(newInstanceSettings(httpProvider, &setting.Cfg{}, &featuremgmt.FeatureManager{}, nil)),
+		}
+
+		req := &backend.CheckHealthRequest{
+			PluginContext: getPluginContext(),
+			Headers:       nil,
+		}
+
+		res, err := s.CheckHealth(context.Background(), req)
+		assert.NoError(t, err)
+		assert.Equal(t, backend.HealthStatusError, res.Status)
+	})
+}
+
+func getPluginContext() backend.PluginContext {
+	return backend.PluginContext{
+		OrgID:                      0,
+		PluginID:                   "prometheus",
+		User:                       nil,
+		AppInstanceSettings:        nil,
+		DataSourceInstanceSettings: getPromInstanceSettings(),
+	}
+}
+func getPromInstanceSettings() *backend.DataSourceInstanceSettings {
+	return &backend.DataSourceInstanceSettings{
+		ID:                      0,
+		UID:                     "",
+		Type:                    "prometheus",
+		Name:                    "test-prometheus",
+		URL:                     "http://promurl:9090",
+		User:                    "",
+		Database:                "",
+		BasicAuthEnabled:        true,
+		BasicAuthUser:           "admin",
+		JSONData:                []byte("{}"),
+		DecryptedSecureJSONData: map[string]string{},
+		Updated:                 time.Time{},
+	}
+}
diff --git a/pkg/tsdb/prometheus/querydata/request.go b/pkg/tsdb/prometheus/querydata/request.go
index 130863fbd46..0aa0b7da27a 100644
--- a/pkg/tsdb/prometheus/querydata/request.go
+++ b/pkg/tsdb/prometheus/querydata/request.go
@@ -179,6 +179,13 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model
 		}
 	}
 
+	// This is only for health check fall back scenario
+	if res.StatusCode != 200 && q.RefId == "__healthcheck__" {
+		return backend.DataResponse{
+			Error: fmt.Errorf(res.Status),
+		}
+	}
+
 	defer func() {
 		err := res.Body.Close()
 		if err != nil {
diff --git a/public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx b/public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx
new file mode 100644
index 00000000000..9cb771912a9
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+
+import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
+import { InlineField, Switch, useTheme2 } from '@grafana/ui';
+
+import { docsTip, overhaulStyles } from './ConfigEditor';
+
+export interface Props<T extends DataSourceJsonData>
+  extends Pick<DataSourcePluginOptionsEditorProps<T>, 'options' | 'onOptionsChange'> {}
+
+export interface AlertingConfig extends DataSourceJsonData {
+  manageAlerts?: boolean;
+}
+
+export function AlertingSettingsOverhaul<T extends AlertingConfig>({
+  options,
+  onOptionsChange,
+}: Props<T>): JSX.Element {
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
+  return (
+    <>
+      <h6 className="page-heading">Alerting</h6>
+      <div className="gf-form-group">
+        <div className="gf-form-inline">
+          <div className="gf-form">
+            <InlineField
+              labelWidth={30}
+              label="Manage alerts via Alerting UI"
+              disabled={options.readOnly}
+              tooltip={
+                <>
+                  Manage alert rules for this data source. To manage other alerting resources, add an Alertmanager data
+                  source. {docsTip()}
+                </>
+              }
+              interactive={true}
+              className={styles.switchField}
+            >
+              <Switch
+                value={options.jsonData.manageAlerts !== false}
+                onChange={(event) =>
+                  onOptionsChange({
+                    ...options,
+                    jsonData: { ...options.jsonData, manageAlerts: event!.currentTarget.checked },
+                  })
+                }
+              />
+            </InlineField>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
index b7746369dab..9d5d90ec865 100644
--- a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
@@ -45,7 +45,7 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
 
   return (
     <>
-      <h6>Azure Authentication</h6>
+      <h6>Azure authentication</h6>
       <AzureCredentialsForm
         managedIdentityEnabled={config.azure.managedIdentityEnabled}
         credentials={credentials}
@@ -55,7 +55,7 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
       />
       {overrideAudienceAllowed && (
         <>
-          <h6>Azure Configuration</h6>
+          <h6>Azure configuration</h6>
           <div className="gf-form-group">
             <InlineFieldRow>
               <InlineField labelWidth={26} label="Override AAD audience" disabled={dataSourceConfig.readOnly}>
diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.test.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.test.tsx
new file mode 100644
index 00000000000..9ce9e66c563
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.test.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+
+import { FieldValidationMessage } from '@grafana/ui';
+
+import { validateInput } from './ConfigEditor';
+import { DURATION_REGEX, MULTIPLE_DURATION_REGEX } from './PromSettings';
+
+const VALID_URL_REGEX = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
+
+const error = <FieldValidationMessage>Value is not valid</FieldValidationMessage>;
+// replaces promSettingsValidationEvents to display a <FieldValidationMessage> onBlur for duration input errors
+describe('promSettings validateInput', () => {
+  it.each`
+    value    | expected
+    ${'1ms'} | ${true}
+    ${'1M'}  | ${true}
+    ${'1w'}  | ${true}
+    ${'1d'}  | ${true}
+    ${'1h'}  | ${true}
+    ${'1m'}  | ${true}
+    ${'1s'}  | ${true}
+    ${'1y'}  | ${true}
+  `(
+    "Single duration regex, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, DURATION_REGEX)).toBe(expected);
+    }
+  );
+
+  it.each`
+    value      | expected
+    ${'1M 2s'} | ${true}
+    ${'1w 2d'} | ${true}
+    ${'1d 2m'} | ${true}
+    ${'1h 2m'} | ${true}
+    ${'1m 2s'} | ${true}
+  `(
+    "Multiple duration regex, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, MULTIPLE_DURATION_REGEX)).toBe(expected);
+    }
+  );
+
+  it.each`
+    value     | expected
+    ${'1 ms'} | ${error}
+    ${'1x'}   | ${error}
+    ${' '}    | ${error}
+    ${'w'}    | ${error}
+    ${'1.0s'} | ${error}
+  `(
+    "when calling the rule with incorrect formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, DURATION_REGEX)).toStrictEqual(expected);
+    }
+  );
+
+  it.each`
+    value          | expected
+    ${'frp://'}    | ${error}
+    ${'htp://'}    | ${error}
+    ${'httpss:??'} | ${error}
+    ${'http@//'}   | ${error}
+    ${'http:||'}   | ${error}
+    ${'http://'}   | ${error}
+    ${'https://'}  | ${error}
+    ${'ftp://'}    | ${error}
+  `(
+    "Url incorrect formatting, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, VALID_URL_REGEX)).toStrictEqual(expected);
+    }
+  );
+
+  it.each`
+    value                | expected
+    ${'ftp://example'}   | ${true}
+    ${'http://example'}  | ${true}
+    ${'https://example'} | ${true}
+  `(
+    "Url correct formatting, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, VALID_URL_REGEX)).toBe(expected);
+    }
+  );
+
+  it('should display a custom validation message', () => {
+    const invalidDuration = 'invalid';
+    const customMessage = 'This is invalid';
+    const errorWithCustomMessage = <FieldValidationMessage>{customMessage}</FieldValidationMessage>;
+    expect(validateInput(invalidDuration, DURATION_REGEX, customMessage)).toStrictEqual(errorWithCustomMessage);
+  });
+});
diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
index 6470645ed3d..7df57461f82 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
@@ -1,19 +1,24 @@
+import { css } from '@emotion/css';
 import React, { useRef } from 'react';
 
 import { SIGV4ConnectionConfig } from '@grafana/aws-sdk';
-import { DataSourcePluginOptionsEditorProps, DataSourceSettings } from '@grafana/data';
-import { AlertingSettings, DataSourceHttpSettings, Alert } from '@grafana/ui';
+import { DataSourcePluginOptionsEditorProps, DataSourceSettings, GrafanaTheme2 } from '@grafana/data';
+import { Alert, DataSourceHttpSettings, FieldValidationMessage, useTheme2 } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 import { PromOptions } from '../types';
 
+import { AlertingSettingsOverhaul } from './AlertingSettingsOverhaul';
 import { AzureAuthSettings } from './AzureAuthSettings';
 import { hasCredentials, setDefaultCredentials, resetCredentials } from './AzureCredentialsConfig';
 import { PromSettings } from './PromSettings';
 
+export const PROM_CONFIG_LABEL_WIDTH = 30;
+
 export type Props = DataSourcePluginOptionsEditorProps<PromOptions>;
 export const ConfigEditor = (props: Props) => {
   const { options, onOptionsChange } = props;
+
   // use ref so this is evaluated only first time it renders and the select does not disappear suddenly.
   const showAccessOptions = useRef(props.options.access === 'direct');
 
@@ -25,14 +30,16 @@ export const ConfigEditor = (props: Props) => {
     azureSettingsUI: AzureAuthSettings,
   };
 
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
   return (
     <>
       {options.access === 'direct' && (
         <Alert title="Error" severity="error">
-          Browser access mode in the Prometheus datasource is no longer available. Switch to server access mode.
+          Browser access mode in the Prometheus data source is no longer available. Switch to server access mode.
         </Alert>
       )}
-
       <DataSourceHttpSettings
         defaultUrl="http://localhost:9090"
         dataSourceConfig={options}
@@ -42,11 +49,88 @@ export const ConfigEditor = (props: Props) => {
         azureAuthSettings={azureAuthSettings}
         renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
         secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
+        connectionElements={{
+          label: 'Prometheus server URL',
+          tooltip: docsTip(),
+        }}
       />
+      <>
+        <hr className={styles.hrTopSpace} />
+        <h3 className={styles.sectionHeaderPadding}>Additional settings</h3>
+        <p className={`${styles.secondaryGrey} ${styles.subsectionText}`}>
+          Additional settings are optional settings that can be configured for more control over your data source.
+        </p>
 
-      <AlertingSettings<PromOptions> options={options} onOptionsChange={onOptionsChange} />
+        <AlertingSettingsOverhaul<PromOptions> options={options} onOptionsChange={onOptionsChange} />
 
-      <PromSettings options={options} onOptionsChange={onOptionsChange} />
+        <PromSettings options={options} onOptionsChange={onOptionsChange} />
+      </>
     </>
   );
 };
+/**
+ * Use this to return a url in a tooltip in a field. Don't forget to make the field interactive to be able to click on the tooltip
+ * @param url
+ * @returns
+ */
+export function docsTip(url?: string) {
+  const docsUrl = 'https://grafana.com/docs/grafana/latest/datasources/prometheus/#configure-the-data-source';
+
+  return (
+    <a href={url ? url : docsUrl} target="_blank" rel="noopener noreferrer">
+      Visit docs for more details here.
+    </a>
+  );
+}
+
+export const validateInput = (
+  input: string,
+  pattern: string | RegExp,
+  errorMessage?: string
+): boolean | JSX.Element => {
+  const defaultErrorMessage = 'Value is not valid';
+  if (input && !input.match(pattern)) {
+    return <FieldValidationMessage>{errorMessage ? errorMessage : defaultErrorMessage}</FieldValidationMessage>;
+  } else {
+    return true;
+  }
+};
+
+export function overhaulStyles(theme: GrafanaTheme2) {
+  return {
+    additionalSettings: css`
+      margin-bottom: 25px;
+    `,
+    secondaryGrey: css`
+      color: ${theme.colors.secondary.text};
+      opacity: 65%;
+    `,
+    inlineError: css`
+      margin: 0px 0px 4px 245px;
+    `,
+    switchField: css`
+      align-items: center;
+    `,
+    sectionHeaderPadding: css`
+      padding-top: 32px;
+    `,
+    sectionBottomPadding: css`
+      padding-bottom: 28px;
+    `,
+    subsectionText: css`
+      font-size: 12px;
+    `,
+    hrBottomSpace: css`
+      margin-bottom: 56px;
+    `,
+    hrTopSpace: css`
+      margin-top: 50px;
+    `,
+    textUnderline: css`
+      text-decoration: underline;
+    `,
+    versionMargin: css`
+      margin-bottom: 12px;
+    `,
+  };
+}
diff --git a/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx b/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
index acc75e8e29b..ba13f98e692 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
@@ -1,12 +1,13 @@
-import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { DataSourcePicker } from '@grafana/runtime';
-import { Button, InlineField, InlineSwitch, Input } from '@grafana/ui';
+import { Button, InlineField, Input, Switch, useTheme2 } from '@grafana/ui';
 
 import { ExemplarTraceIdDestination } from '../types';
 
+import { docsTip, overhaulStyles, PROM_CONFIG_LABEL_WIDTH } from './ConfigEditor';
+
 type Props = {
   value: ExemplarTraceIdDestination;
   onChange: (value: ExemplarTraceIdDestination) => void;
@@ -17,38 +18,40 @@ type Props = {
 export default function ExemplarSetting({ value, onChange, onDelete, disabled }: Props) {
   const [isInternalLink, setIsInternalLink] = useState(Boolean(value.datasourceUid));
 
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
   return (
     <div className="gf-form-group">
-      <InlineField label="Internal link" labelWidth={24} disabled={disabled}>
+      <InlineField
+        label="Internal link"
+        labelWidth={PROM_CONFIG_LABEL_WIDTH}
+        disabled={disabled}
+        tooltip={
+          <>
+            Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select
+            the backend tracing data store for your exemplar data. {docsTip()}
+          </>
+        }
+        interactive={true}
+        className={styles.switchField}
+      >
         <>
-          <InlineSwitch
+          <Switch
             value={isInternalLink}
             aria-label={selectors.components.DataSource.Prometheus.configPage.internalLinkSwitch}
             onChange={(ev) => setIsInternalLink(ev.currentTarget.checked)}
           />
-          {!disabled && (
-            <Button
-              variant="destructive"
-              title="Remove link"
-              icon="times"
-              onClick={(event) => {
-                event.preventDefault();
-                onDelete();
-              }}
-              className={css`
-                margin-left: 8px;
-              `}
-            />
-          )}
         </>
       </InlineField>
 
       {isInternalLink ? (
         <InlineField
           label="Data source"
-          labelWidth={24}
-          tooltip="The data source the exemplar is going to navigate to."
+          labelWidth={PROM_CONFIG_LABEL_WIDTH}
+          tooltip={<>The data source the exemplar is going to navigate to. {docsTip()}</>}
           disabled={disabled}
+          interactive={true}
         >
           <DataSourcePicker
             tracing={true}
@@ -67,9 +70,10 @@ export default function ExemplarSetting({ value, onChange, onDelete, disabled }:
       ) : (
         <InlineField
           label="URL"
-          labelWidth={24}
-          tooltip="The URL of the trace backend the user would go to see its trace."
+          labelWidth={PROM_CONFIG_LABEL_WIDTH}
+          tooltip={<>The URL of the trace backend the user would go to see its trace. {docsTip()}</>}
           disabled={disabled}
+          interactive={true}
         >
           <Input
             placeholder="https://example.com/${__value.raw}"
@@ -89,9 +93,10 @@ export default function ExemplarSetting({ value, onChange, onDelete, disabled }:
 
       <InlineField
         label="URL Label"
-        labelWidth={24}
-        tooltip="Use to override the button label on the exemplar traceID field."
+        labelWidth={PROM_CONFIG_LABEL_WIDTH}
+        tooltip={<>Use to override the button label on the exemplar traceID field. {docsTip()}</>}
         disabled={disabled}
+        interactive={true}
       >
         <Input
           placeholder="Go to example.com"
@@ -108,9 +113,10 @@ export default function ExemplarSetting({ value, onChange, onDelete, disabled }:
       </InlineField>
       <InlineField
         label="Label name"
-        labelWidth={24}
-        tooltip="The name of the field in the labels object that should be used to get the traceID."
+        labelWidth={PROM_CONFIG_LABEL_WIDTH}
+        tooltip={<>The name of the field in the labels object that should be used to get the traceID. {docsTip()}</>}
         disabled={disabled}
+        interactive={true}
       >
         <Input
           placeholder="traceID"
@@ -125,6 +131,19 @@ export default function ExemplarSetting({ value, onChange, onDelete, disabled }:
           }
         />
       </InlineField>
+      {!disabled && (
+        <InlineField label="Remove exemplar link" labelWidth={PROM_CONFIG_LABEL_WIDTH} disabled={disabled}>
+          <Button
+            variant="destructive"
+            title="Remove exemplar link"
+            icon="times"
+            onClick={(event) => {
+              event.preventDefault();
+              onDelete();
+            }}
+          />
+        </InlineField>
+      )}
     </div>
   );
 }
diff --git a/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
index 7c8abc3ae80..b13f7105c18 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
@@ -2,10 +2,11 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { Button } from '@grafana/ui';
+import { Button, useTheme2 } from '@grafana/ui';
 
 import { ExemplarTraceIdDestination } from '../types';
 
+import { overhaulStyles } from './ConfigEditor';
 import ExemplarSetting from './ExemplarSetting';
 
 type Props = {
@@ -15,9 +16,11 @@ type Props = {
 };
 
 export function ExemplarsSettings({ options, onChange, disabled }: Props) {
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
   return (
-    <>
-      <h3 className="page-heading">Exemplars</h3>
+    <div className={styles.sectionBottomPadding}>
+      <h6 className="page-heading">Exemplars</h6>
 
       {options &&
         options.map((option, index) => {
@@ -57,8 +60,7 @@ export function ExemplarsSettings({ options, onChange, disabled }: Props) {
           Add
         </Button>
       )}
-
       {disabled && !options && <i>No exemplars configurations</i>}
-    </>
+    </div>
   );
 }
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx
index bf91f3d5be8..aea4755989e 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx
@@ -3,11 +3,10 @@ import React, { SyntheticEvent } from 'react';
 import { Provider } from 'react-redux';
 
 import { SelectableValue } from '@grafana/data';
-import { EventsWithValidation } from '@grafana/ui';
 
 import { configureStore } from '../../../../store/configureStore';
 
-import { getValueFromEventItem, promSettingsValidationEvents, PromSettings } from './PromSettings';
+import { getValueFromEventItem, PromSettings } from './PromSettings';
 import { createDefaultConfigOptions } from './mocks';
 
 describe('PromSettings', () => {
@@ -38,58 +37,6 @@ describe('PromSettings', () => {
     });
   });
 
-  describe('promSettingsValidationEvents', () => {
-    const validationEvents = promSettingsValidationEvents;
-
-    it('should have one event handlers', () => {
-      expect(Object.keys(validationEvents).length).toEqual(1);
-    });
-
-    it('should have an onBlur handler', () => {
-      expect(validationEvents.hasOwnProperty(EventsWithValidation.onBlur)).toBe(true);
-    });
-
-    it('should have one rule', () => {
-      expect(validationEvents[EventsWithValidation.onBlur].length).toEqual(1);
-    });
-
-    describe('when calling the rule with an empty string', () => {
-      it('then it should return true', () => {
-        expect(validationEvents[EventsWithValidation.onBlur][0].rule('')).toBe(true);
-      });
-    });
-
-    it.each`
-      value    | expected
-      ${'1ms'} | ${true}
-      ${'1M'}  | ${true}
-      ${'1w'}  | ${true}
-      ${'1d'}  | ${true}
-      ${'1h'}  | ${true}
-      ${'1m'}  | ${true}
-      ${'1s'}  | ${true}
-      ${'1y'}  | ${true}
-    `(
-      "when calling the rule with correct formatted value: '$value' then result should be '$expected'",
-      ({ value, expected }) => {
-        expect(validationEvents[EventsWithValidation.onBlur][0].rule(value)).toBe(expected);
-      }
-    );
-
-    it.each`
-      value     | expected
-      ${'1 ms'} | ${false}
-      ${'1x'}   | ${false}
-      ${' '}    | ${false}
-      ${'w'}    | ${false}
-      ${'1.0s'} | ${false}
-    `(
-      "when calling the rule with incorrect formatted value: '$value' then result should be '$expected'",
-      ({ value, expected }) => {
-        expect(validationEvents[EventsWithValidation.onBlur][0].rule(value)).toBe(expected);
-      }
-    );
-  });
   describe('PromSettings component', () => {
     const defaultProps = createDefaultConfigOptions();
 
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
index eeabf4a8591..07fb205f58f 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
@@ -1,24 +1,15 @@
-import React, { SyntheticEvent } from 'react';
+import React, { SyntheticEvent, useState } from 'react';
 import semver from 'semver/preload';
 
 import {
   DataSourcePluginOptionsEditorProps,
   DataSourceSettings as DataSourceSettingsType,
-  isValidDuration,
   onUpdateDatasourceJsonDataOptionChecked,
   SelectableValue,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime/src';
-import {
-  EventsWithValidation,
-  InlineField,
-  InlineFormLabel,
-  InlineSwitch,
-  LegacyForms,
-  regexValidation,
-  Select,
-} from '@grafana/ui';
+import { InlineField, Input, Select, Switch, useTheme2 } from '@grafana/ui';
 
 import config from '../../../../core/config';
 import { useUpdateDatasource } from '../../../../features/datasources/state';
@@ -27,11 +18,10 @@ import { QueryEditorMode } from '../querybuilder/shared/types';
 import { defaultPrometheusQueryOverlapWindow } from '../querycache/QueryCache';
 import { PrometheusCacheLevel, PromOptions } from '../types';
 
+import { docsTip, overhaulStyles, PROM_CONFIG_LABEL_WIDTH, validateInput } from './ConfigEditor';
 import { ExemplarsSettings } from './ExemplarsSettings';
 import { PromFlavorVersions } from './PromFlavorVersions';
 
-const { Input, FormField } = LegacyForms;
-
 const httpOptions = [
   { value: 'POST', label: 'POST' },
   { value: 'GET', label: 'GET' },
@@ -60,6 +50,13 @@ const prometheusFlavorSelectItems: PrometheusSelectItemsType = [
 
 type Props = Pick<DataSourcePluginOptionsEditorProps<PromOptions>, 'options' | 'onOptionsChange'>;
 
+// single duration input
+export const DURATION_REGEX = /^$|^\d+(ms|[Mwdhmsy])$/;
+
+// multiple duration input
+export const MULTIPLE_DURATION_REGEX = /(\d+)(.+)/;
+
+const durationError = 'Value is not valid, you can use number with time unit specifier: y, M, w, d, h, m, s';
 /**
  * Returns the closest version to what the user provided that we have in our PromFlavorVersions for the currently selected flavor
  * Bugs: It will only reject versions that are a major release apart, so Mimir 2.x might get selected for Prometheus 2.8 if the user selects an incorrect flavor
@@ -158,76 +155,132 @@ export const PromSettings = (props: Props) => {
     options.jsonData.httpMethod = 'POST';
   }
 
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
+  type ValidDuration = {
+    timeInterval: string;
+    queryTimeout: string;
+    incrementalQueryOverlapWindow: string;
+  };
+
+  const [validDuration, updateValidDuration] = useState<ValidDuration>({
+    timeInterval: '',
+    queryTimeout: '',
+    incrementalQueryOverlapWindow: '',
+  });
+
   return (
     <>
+      <h6 className="page-heading">Interval behaviour</h6>
       <div className="gf-form-group">
         {/* Scrape interval */}
         <div className="gf-form-inline">
           <div className="gf-form">
-            <FormField
+            <InlineField
               label="Scrape interval"
-              labelWidth={13}
-              inputEl={
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              tooltip={
+                <>
+                  This interval is how frequently Prometheus scrapes targets. Set this to the typical scrape and
+                  evaluation interval configured in your Prometheus config file. If you set this to a greater value than
+                  your Prometheus config file interval, Grafana will evaluate the data according to this interval and
+                  you will see less data points. Defaults to 15s. {docsTip()}
+                </>
+              }
+              interactive={true}
+              disabled={options.readOnly}
+            >
+              <>
                 <Input
-                  className="width-6"
+                  className="width-20"
                   value={options.jsonData.timeInterval}
                   spellCheck={false}
                   placeholder="15s"
                   onChange={onChangeHandler('timeInterval', options, onOptionsChange)}
-                  validationEvents={promSettingsValidationEvents}
-                  disabled={options.readOnly}
+                  onBlur={(e) => updateValidDuration({ ...validDuration, timeInterval: e.currentTarget.value })}
                 />
-              }
-              tooltip="Set this to the typical scrape and evaluation interval configured in Prometheus. Defaults to 15s."
-            />
+                {validateInput(validDuration.timeInterval, DURATION_REGEX, durationError)}
+              </>
+            </InlineField>
           </div>
         </div>
         {/* Query Timeout */}
         <div className="gf-form-inline">
           <div className="gf-form">
-            <FormField
+            <InlineField
               label="Query timeout"
-              labelWidth={13}
-              inputEl={
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              tooltip={<>Set the Prometheus query timeout. {docsTip()}</>}
+              interactive={true}
+              disabled={options.readOnly}
+            >
+              <>
                 <Input
-                  className="width-6"
+                  className="width-20"
                   value={options.jsonData.queryTimeout}
                   onChange={onChangeHandler('queryTimeout', options, onOptionsChange)}
                   spellCheck={false}
                   placeholder="60s"
-                  validationEvents={promSettingsValidationEvents}
-                  disabled={options.readOnly}
+                  onBlur={(e) => updateValidDuration({ ...validDuration, queryTimeout: e.currentTarget.value })}
                 />
-              }
-              tooltip="Set the Prometheus query timeout."
-            />
+                {validateInput(validDuration.queryTimeout, DURATION_REGEX, durationError)}
+              </>
+            </InlineField>
           </div>
         </div>
-        {/* HTTP Method */}
-        <div className="gf-form">
-          <InlineFormLabel
-            width={13}
-            tooltip="You can use either POST or GET HTTP method to query your Prometheus data source. POST is the recommended method as it allows bigger queries. Change this to GET if you have a Prometheus version older than 2.1 or if POST requests are restricted in your network."
-          >
-            HTTP method
-          </InlineFormLabel>
-          <Select
-            aria-label="Select HTTP method"
-            options={httpOptions}
-            value={httpOptions.find((o) => o.value === options.jsonData.httpMethod)}
-            onChange={onChangeHandler('httpMethod', options, onOptionsChange)}
-            className="width-6"
-            disabled={options.readOnly}
-          />
-        </div>
       </div>
 
-      <h3 className="page-heading">Type and version</h3>
+      <h6 className="page-heading">Query editor</h6>
+      <div className="gf-form-group">
+        <div className="gf-form">
+          <InlineField
+            label="Default editor"
+            labelWidth={PROM_CONFIG_LABEL_WIDTH}
+            tooltip={<>Set default editor option for all users of this data source. {docsTip()}</>}
+            interactive={true}
+            disabled={options.readOnly}
+          >
+            <Select
+              aria-label={`Default Editor (Code or Builder)`}
+              options={editorOptions}
+              value={
+                editorOptions.find((o) => o.value === options.jsonData.defaultEditor) ??
+                editorOptions.find((o) => o.value === QueryEditorMode.Builder)
+              }
+              onChange={onChangeHandler('defaultEditor', options, onOptionsChange)}
+              width={40}
+            />
+          </InlineField>
+        </div>
+        <div className="gf-form">
+          <InlineField
+            labelWidth={PROM_CONFIG_LABEL_WIDTH}
+            label="Disable metrics lookup"
+            tooltip={
+              <>
+                Checking this option will disable the metrics chooser and metric/label support in the query field&apos;s
+                autocomplete. This helps if you have performance issues with bigger Prometheus instances. {docsTip()}
+              </>
+            }
+            interactive={true}
+            disabled={options.readOnly}
+            className={styles.switchField}
+          >
+            <Switch
+              value={options.jsonData.disableMetricsLookup ?? false}
+              onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'disableMetricsLookup')}
+            />
+          </InlineField>
+        </div>
+      </div>
+
+      <h6 className="page-heading">Performance</h6>
       {!options.jsonData.prometheusType && !options.jsonData.prometheusVersion && options.readOnly && (
-        <div style={{ marginBottom: '12px' }}>
+        <div className={styles.versionMargin}>
           For more information on configuring prometheus type and version in data sources, see the{' '}
           <a
-            style={{ textDecoration: 'underline' }}
+            className={styles.textUnderline}
             href="https://grafana.com/docs/grafana/latest/administration/provisioning/"
           >
             provisioning documentation
@@ -236,182 +289,212 @@ export const PromSettings = (props: Props) => {
         </div>
       )}
       <div className="gf-form-group">
-        <div className="gf-form">
+        <div className="gf-form-inline">
           <div className="gf-form">
-            <FormField
+            <InlineField
               label="Prometheus type"
-              labelWidth={13}
-              inputEl={
-                <Select
-                  aria-label="Prometheus type"
-                  options={prometheusFlavorSelectItems}
-                  value={prometheusFlavorSelectItems.find((o) => o.value === options.jsonData.prometheusType)}
-                  onChange={onChangeHandler(
-                    'prometheusType',
-                    {
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              tooltip={
+                <>
+                  Set this to the type of your prometheus database, e.g. Prometheus, Cortex, Mimir or Thanos. Changing
+                  this field will save your current settings, and attempt to detect the version. Certain types of
+                  Prometheus support or do not support various APIs. For example, some types support regex matching for
+                  label queries to improve performance. Some types have an API for metadata. If you set this incorrectly
+                  you may experience odd behavior when querying metrics and labels. Please check your Prometheus
+                  documentation to ensure you enter the correct type. {docsTip()}
+                </>
+              }
+              interactive={true}
+              disabled={options.readOnly}
+            >
+              <Select
+                aria-label="Prometheus type"
+                options={prometheusFlavorSelectItems}
+                value={prometheusFlavorSelectItems.find((o) => o.value === options.jsonData.prometheusType)}
+                onChange={onChangeHandler(
+                  'prometheusType',
+                  {
+                    ...options,
+                    jsonData: { ...options.jsonData, prometheusVersion: undefined },
+                  },
+                  (options) => {
+                    // Check buildinfo api and set default version if we can
+                    setPrometheusVersion(options, onOptionsChange, onUpdate);
+                    return onOptionsChange({
                       ...options,
                       jsonData: { ...options.jsonData, prometheusVersion: undefined },
-                    },
-                    (options) => {
-                      // Check buildinfo api and set default version if we can
-                      setPrometheusVersion(options, onOptionsChange, onUpdate);
-                      return onOptionsChange({
-                        ...options,
-                        jsonData: { ...options.jsonData, prometheusVersion: undefined },
-                      });
-                    }
-                  )}
-                  width={20}
-                  disabled={options.readOnly}
-                />
-              }
-              tooltip="Set this to the type of your prometheus database, e.g. Prometheus, Cortex, Mimir or Thanos. Changing this field will save your current settings, and attempt to detect the version."
-            />
+                    });
+                  }
+                )}
+                width={40}
+              />
+            </InlineField>
           </div>
         </div>
-        <div className="gf-form">
-          {options.jsonData.prometheusType && (
-            <div className="gf-form">
-              <FormField
-                label={`${options.jsonData.prometheusType} version`}
-                labelWidth={13}
-                inputEl={
-                  <Select
-                    aria-label={`${options.jsonData.prometheusType} type`}
-                    options={PromFlavorVersions[options.jsonData.prometheusType]}
-                    value={PromFlavorVersions[options.jsonData.prometheusType]?.find(
-                      (o) => o.value === options.jsonData.prometheusVersion
-                    )}
-                    onChange={onChangeHandler('prometheusVersion', options, onOptionsChange)}
-                    width={20}
-                    disabled={options.readOnly}
-                  />
-                }
-                tooltip={`Use this to set the version of your ${options.jsonData.prometheusType} instance if it is not automatically configured.`}
-              />
-            </div>
-          )}
-        </div>
-      </div>
-
-      <h3 className="page-heading">Misc</h3>
-      <div className="gf-form-group">
-        <div className="gf-form">
-          <InlineField
-            labelWidth={28}
-            label="Disable metrics lookup"
-            tooltip="Checking this option will disable the metrics chooser and metric/label support in the query field's autocomplete. This helps if you have performance issues with bigger Prometheus instances."
-            disabled={options.readOnly}
-          >
-            <InlineSwitch
-              value={options.jsonData.disableMetricsLookup ?? false}
-              onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'disableMetricsLookup')}
-            />
-          </InlineField>
-        </div>
-        <div className="gf-form">
-          <FormField
-            label="Default editor"
-            labelWidth={14}
-            inputEl={
-              <Select
-                aria-label={`Default Editor (Code or Builder)`}
-                options={editorOptions}
-                value={editorOptions.find((o) => o.value === options.jsonData.defaultEditor)}
-                onChange={onChangeHandler('defaultEditor', options, onOptionsChange)}
-                width={20}
-                disabled={options.readOnly}
-              />
-            }
-            tooltip={`Set default editor option (builder/code) for all users of this datasource. If no option was selected, the default editor will be the "builder". If they switch to other option rather than the specified with this setting on the panel we always show the selected editor for that user.`}
-          />
-        </div>
         <div className="gf-form-inline">
-          <div className="gf-form max-width-30">
-            <FormField
-              label="Custom query parameters"
-              labelWidth={14}
-              tooltip="Add custom parameters to all Prometheus or Thanos queries."
-              inputEl={
-                <Input
-                  className="width-25"
-                  value={options.jsonData.customQueryParameters}
-                  onChange={onChangeHandler('customQueryParameters', options, onOptionsChange)}
-                  spellCheck={false}
-                  placeholder="Example: max_source_resolution=5m&timeout=10"
-                  disabled={options.readOnly}
+          {options.jsonData.prometheusType && (
+            <div className="gf-form">
+              <InlineField
+                label={`${options.jsonData.prometheusType} version`}
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    Use this to set the version of your {options.jsonData.prometheusType} instance if it is not
+                    automatically configured. {docsTip()}
+                  </>
+                }
+                interactive={true}
+                disabled={options.readOnly}
+              >
+                <Select
+                  aria-label={`${options.jsonData.prometheusType} type`}
+                  options={PromFlavorVersions[options.jsonData.prometheusType]}
+                  value={PromFlavorVersions[options.jsonData.prometheusType]?.find(
+                    (o) => o.value === options.jsonData.prometheusVersion
+                  )}
+                  onChange={onChangeHandler('prometheusVersion', options, onOptionsChange)}
+                  width={40}
                 />
-              }
-            />
-          </div>
+              </InlineField>
+            </div>
+          )}
         </div>
         {config.featureToggles.prometheusResourceBrowserCache && (
           <div className="gf-form-inline">
             <div className="gf-form max-width-30">
-              <FormField
+              <InlineField
                 label="Cache level"
-                labelWidth={14}
-                tooltip="Sets the browser caching level for editor queries. Higher cache settings are recommended for high cardinality data sources."
-                inputEl={
-                  <Select
-                    className={`width-25`}
-                    onChange={onChangeHandler('cacheLevel', options, onOptionsChange)}
-                    options={cacheValueOptions}
-                    disabled={options.readOnly}
-                    value={
-                      cacheValueOptions.find((o) => o.value === options.jsonData.cacheLevel) ?? PrometheusCacheLevel.Low
-                    }
-                  />
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    Sets the browser caching level for editor queries. Higher cache settings are recommended for high
+                    cardinality data sources.
+                  </>
                 }
-              />
+                interactive={true}
+                disabled={options.readOnly}
+              >
+                <Select
+                  width={40}
+                  onChange={onChangeHandler('cacheLevel', options, onOptionsChange)}
+                  options={cacheValueOptions}
+                  value={
+                    cacheValueOptions.find((o) => o.value === options.jsonData.cacheLevel) ?? PrometheusCacheLevel.Low
+                  }
+                />
+              </InlineField>
             </div>
           </div>
         )}
 
         <div className="gf-form-inline">
           <div className="gf-form max-width-30">
-            <FormField
+            <InlineField
               label="Incremental querying (beta)"
-              labelWidth={14}
-              tooltip="This feature will change the default behavior of relative queries to always request fresh data from the prometheus instance, instead query results will be cached, and only new records are requested. Turn this on to decrease database and network load."
-              inputEl={
-                <InlineSwitch
-                  value={options.jsonData.incrementalQuerying ?? false}
-                  onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'incrementalQuerying')}
-                  disabled={options.readOnly}
-                />
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              tooltip={
+                <>
+                  This feature will change the default behavior of relative queries to always request fresh data from
+                  the prometheus instance, instead query results will be cached, and only new records are requested.
+                  Turn this on to decrease database and network load.
+                </>
               }
-            />
+              interactive={true}
+              className={styles.switchField}
+              disabled={options.readOnly}
+            >
+              <Switch
+                value={options.jsonData.incrementalQuerying ?? false}
+                onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'incrementalQuerying')}
+              />
+            </InlineField>
           </div>
         </div>
 
         <div className="gf-form-inline">
           {options.jsonData.incrementalQuerying && (
-            <FormField
+            <InlineField
               label="Query overlap window"
-              labelWidth={14}
-              tooltip="Set a duration like 10m or 120s or 0s. Default of 10 minutes. This duration will be added to the duration of each incremental request."
-              inputEl={
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              tooltip={
+                <>
+                  Set a duration like 10m or 120s or 0s. Default of 10 minutes. This duration will be added to the
+                  duration of each incremental request.
+                </>
+              }
+              interactive={true}
+              disabled={options.readOnly}
+            >
+              <>
                 <Input
-                  validationEvents={{
-                    onBlur: [
-                      {
-                        rule: (value) => isValidDuration(value),
-                        errorMessage: 'Invalid duration. Example values: 100s, 10m',
-                      },
-                    ],
-                  }}
+                  onBlur={(e) =>
+                    updateValidDuration({ ...validDuration, incrementalQueryOverlapWindow: e.currentTarget.value })
+                  }
                   className="width-25"
                   value={options.jsonData.incrementalQueryOverlapWindow ?? defaultPrometheusQueryOverlapWindow}
                   onChange={onChangeHandler('incrementalQueryOverlapWindow', options, onOptionsChange)}
                   spellCheck={false}
-                  disabled={options.readOnly}
                 />
-              }
-            />
+                {validateInput(validDuration.incrementalQueryOverlapWindow, MULTIPLE_DURATION_REGEX, durationError)}
+              </>
+            </InlineField>
           )}
         </div>
       </div>
+
+      <h6 className="page-heading">Other</h6>
+      <div className="gf-form-group">
+        <div className="gf-form-inline">
+          <div className="gf-form max-width-30">
+            <InlineField
+              label="Custom query parameters"
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              tooltip={
+                <>
+                  Add custom parameters to the Prometheus query URL. For example timeout, partial_response, dedup, or
+                  max_source_resolution. Multiple parameters should be concatenated together with an ‘&’. {docsTip()}
+                </>
+              }
+              interactive={true}
+              disabled={options.readOnly}
+            >
+              <Input
+                className="width-20"
+                value={options.jsonData.customQueryParameters}
+                onChange={onChangeHandler('customQueryParameters', options, onOptionsChange)}
+                spellCheck={false}
+                placeholder="Example: max_source_resolution=5m&timeout=10"
+              />
+            </InlineField>
+          </div>
+        </div>
+        <div className="gf-form-inline">
+          {/* HTTP Method */}
+          <div className="gf-form">
+            <InlineField
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              tooltip={
+                <>
+                  You can use either POST or GET HTTP method to query your Prometheus data source. POST is the
+                  recommended method as it allows bigger queries. Change this to GET if you have a Prometheus version
+                  older than 2.1 or if POST requests are restricted in your network. {docsTip()}
+                </>
+              }
+              interactive={true}
+              label="HTTP method"
+              disabled={options.readOnly}
+            >
+              <Select
+                width={40}
+                aria-label="Select HTTP method"
+                options={httpOptions}
+                value={httpOptions.find((o) => o.value === options.jsonData.httpMethod)}
+                onChange={onChangeHandler('httpMethod', options, onOptionsChange)}
+              />
+            </InlineField>
+          </div>
+        </div>
+      </div>
       <ExemplarsSettings
         options={options.jsonData.exemplarTraceIdDestinations}
         onChange={(exemplarOptions) =>
@@ -427,15 +510,6 @@ export const PromSettings = (props: Props) => {
   );
 };
 
-export const promSettingsValidationEvents = {
-  [EventsWithValidation.onBlur]: [
-    regexValidation(
-      /^$|^\d+(ms|[Mwdhmsy])$/,
-      'Value is not valid, you can use number with time unit specifier: y, M, w, d, h, m, s'
-    ),
-  ],
-};
-
 export const getValueFromEventItem = (eventItem: SyntheticEvent<HTMLInputElement> | SelectableValue<string>) => {
   if (!eventItem) {
     return '';
diff --git a/public/app/plugins/datasource/prometheus/datasource.test.ts b/public/app/plugins/datasource/prometheus/datasource.test.ts
index 60c78de49a5..125d0b25592 100644
--- a/public/app/plugins/datasource/prometheus/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.test.ts
@@ -156,11 +156,6 @@ describe('PrometheusDatasource', () => {
       // tested. Checked manually that this ends up with throwing
       // await expect(directDs.metricFindQuery('label_names(foo)')).rejects.toBeDefined();
 
-      jest.spyOn(console, 'error').mockImplementation(() => {});
-      await expect(directDs.testDatasource()).resolves.toMatchObject({
-        message: expect.stringMatching('Browser access'),
-        status: 'error',
-      });
       await expect(
         directDs.annotationQuery({
           range: { ...range, raw: range },
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index 7546ff3af29..4b0c4937188 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -1051,44 +1051,6 @@ export class PrometheusDatasource
     );
   }
 
-  async testDatasource() {
-    const now = new Date().getTime();
-    const request: DataQueryRequest<PromQuery> = {
-      targets: [{ refId: 'test', expr: '1+1', instant: true }],
-      requestId: `${this.id}-health`,
-      scopedVars: {},
-      panelId: 0,
-      interval: '1m',
-      intervalMs: 60000,
-      maxDataPoints: 1,
-      range: {
-        from: dateTime(now - 1000),
-        to: dateTime(now),
-      },
-    } as DataQueryRequest<PromQuery>;
-
-    const buildInfo = await this.getBuildInfo();
-
-    return lastValueFrom(this.query(request))
-      .then((res: DataQueryResponse) => {
-        if (!res || !res.data || res.state !== LoadingState.Done) {
-          return { status: 'error', message: `Error reading Prometheus: ${res?.error?.message}` };
-        } else {
-          return {
-            status: 'success',
-            message: 'Data source is working',
-            details: buildInfo && {
-              verboseMessage: this.getBuildInfoMessage(buildInfo),
-            },
-          };
-        }
-      })
-      .catch((err: any) => {
-        console.error('Prometheus Error', err);
-        return { status: 'error', message: err.message };
-      });
-  }
-
   interpolateVariablesInQueries(queries: PromQuery[], scopedVars: ScopedVars): PromQuery[] {
     let expandedQueries = queries;
     if (queries && queries.length) {

From 1d99500b3ebee1756bf2e5a8765f1446d0c8afe0 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 27 Apr 2023 16:46:47 +0300
Subject: [PATCH 476/729] SAML UI: Fix permissions for
 fixed:authentication.config:writer role (#67290)

* SAML UI: Fix permissions for fixed:authentication.config:writer role

* Remove read permissions for auth settings
---
 .../rbac-fixed-basic-role-definitions/index.md            | 2 +-
 .../configure-authentication/saml-ui/index.md             | 2 +-
 pkg/services/accesscontrol/roles.go                       | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
index 5816de6580d..804ec775c0c 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
@@ -42,7 +42,7 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:annotations:writer`             | All permissions from `fixed:annotations:reader` <br>`annotations:write` <br>`annotations.create`<br> `annotations:delete` for scope `annotations:type:*`                                                                                                             | Read, create, update and delete all annotations and annotation tags.                                                                                                                                                                                                                  |
 | `fixed:apikeys:reader`                 | `apikeys:read` for scope `apikeys:*`                                                                                                                                                                                                                                 | Read all api keys.                                                                                                                                                                                                                                                                    |
 | `fixed:apikeys:writer`                 | All permissions from `fixed:apikeys:reader` and <br> `apikeys:create` <br> `apikeys:delete` for scope `apikeys:*`                                                                                                                                                    | Read, create, delete all api keys.                                                                                                                                                                                                                                                    |
-| `fixed:authentication.config:writer`   | `settings:read` <br> `settings:write` for scopes `settings:auth:*` and `settings:auth.saml:*`                                                                                                                                                                        | Read and update authentication and SAML settings.                                                                                                                                                                                                                                     |
+| `fixed:authentication.config:writer`   | `settings:read` for scope `settings:auth.saml:*` <br> `settings:write` for scope `settings:auth.saml:*`                                                                                                                                                              | Read and update authentication and SAML settings.                                                                                                                                                                                                                                     |
 | `fixed:dashboards:creator`             | `dashboards:create`<br>`folders:read`                                                                                                                                                                                                                                | Create dashboards.                                                                                                                                                                                                                                                                    |
 | `fixed:dashboards.insights:reader`     | `dashboards.insights:read`                                                                                                                                                                                                                                           | Read dashboard insights data and see presence indicators.                                                                                                                                                                                                                             |
 | `fixed:dashboards.permissions:reader`  | `dashboards.permissions:read`                                                                                                                                                                                                                                        | Read all dashboard permissions.                                                                                                                                                                                                                                                       |
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
index 255aa74abed..9b3cc4aaef3 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
@@ -25,7 +25,7 @@ The Grafana SAML UI provides the following advantages over configuring SAML in t
 To follow this guide, you need:
 
 - Knowledge of SAML authentication. Refer to [SAML authentication in Grafana]({{< relref "../saml/" >}}) for an overview of Grafana's SAML integration.
-- Permissions `settings:read` and `settings:write` with scope `settings:auth:*` that allow you to read and update authentication settings.
+- Permissions `settings:read` and `settings:write` with scope `settings:auth.saml:*` that allow you to read and update SAML authentication settings.
 
   These permissions are granted by `fixed:authentication.config:writer` role.
   By default, this role is granted to Grafana server administrator in self-hosted instances and to Organization admins in Grafana Cloud instances.
diff --git a/pkg/services/accesscontrol/roles.go b/pkg/services/accesscontrol/roles.go
index 1b02f2db662..c9dc935fe04 100644
--- a/pkg/services/accesscontrol/roles.go
+++ b/pkg/services/accesscontrol/roles.go
@@ -178,18 +178,10 @@ var (
 		Description: "Read and update authentication configuration and access configuration UI.",
 		Group:       "Settings",
 		Permissions: []Permission{
-			{
-				Action: ActionSettingsRead,
-				Scope:  ScopeSettingsAuth,
-			},
 			{
 				Action: ActionSettingsRead,
 				Scope:  ScopeSettingsSAML,
 			},
-			{
-				Action: ActionSettingsWrite,
-				Scope:  ScopeSettingsAuth,
-			},
 			{
 				Action: ActionSettingsWrite,
 				Scope:  ScopeSettingsSAML,

From 4b241311b372b1e0a5b45b7217eca391d7223a3a Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Thu, 27 Apr 2023 15:10:34 +0100
Subject: [PATCH 477/729] Nested folders: very naive implementations of
 move/delete (#67309)

* implement naive delete

* implement naive move

* use params object instead of appending to url
---
 .../BrowseDashboardsPage.tsx                  | 11 +--
 .../api/browseDashboardsAPI.ts                | 69 +++++++++++++++++-
 .../BrowseActions/BrowseActions.tsx           | 72 +++++++++++++++----
 3 files changed, 134 insertions(+), 18 deletions(-)

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index 72fdbe3903b..63421067dd9 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { memo, useEffect, useMemo } from 'react';
+import React, { memo, useEffect, useMemo, useState } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
@@ -29,6 +29,9 @@ export interface Props extends GrafanaRouteComponentProps<BrowseDashboardsPageRo
 // New Browse/Manage/Search Dashboards views for nested folders
 
 const BrowseDashboardsPage = memo(({ match }: Props) => {
+  // this is a complete hack to force a full rerender.
+  // TODO remove once we move everything to RTK query
+  const [rerender, setRerender] = useState(0);
   const { uid: folderUID } = match.params;
 
   const styles = useStyles2(getStyles);
@@ -59,15 +62,15 @@ const BrowseDashboardsPage = memo(({ match }: Props) => {
           onChange={(e) => stateManager.onQueryChange(e)}
         />
 
-        {hasSelection ? <BrowseActions /> : <BrowseFilters />}
+        {hasSelection ? <BrowseActions onActionComplete={() => setRerender(rerender + 1)} /> : <BrowseFilters />}
 
         <div className={styles.subView}>
           <AutoSizer>
             {({ width, height }) =>
               isSearching ? (
-                <SearchView width={width} height={height} />
+                <SearchView key={rerender} width={width} height={height} />
               ) : (
-                <BrowseView width={width} height={height} folderUID={folderUID} />
+                <BrowseView key={rerender} width={width} height={height} folderUID={folderUID} />
               )
             }
           </AutoSizer>
diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index 3802bdf9326..b5c879c0abb 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -3,7 +3,8 @@ import { lastValueFrom } from 'rxjs';
 
 import { isTruthy } from '@grafana/data';
 import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
-import { FolderDTO } from 'app/types';
+import { DeleteDashboardResponse } from 'app/features/manage-dashboards/types';
+import { DashboardDTO, FolderDTO } from 'app/types';
 
 import { DashboardTreeSelection } from '../types';
 
@@ -35,6 +36,62 @@ export const browseDashboardsAPI = createApi({
   reducerPath: 'browseDashboardsAPI',
   baseQuery: createBackendSrvBaseQuery({ baseURL: '/api' }),
   endpoints: (builder) => ({
+    deleteDashboard: builder.mutation<DeleteDashboardResponse, string>({
+      query: (dashboardUID) => ({
+        url: `/dashboards/uid/${dashboardUID}`,
+        method: 'DELETE',
+      }),
+    }),
+    deleteFolder: builder.mutation<void, string>({
+      query: (folderUID) => ({
+        url: `/folders/${folderUID}`,
+        method: 'DELETE',
+        params: {
+          forceDeleteRules: true,
+        },
+      }),
+    }),
+    // TODO we can define this return type properly
+    moveDashboard: builder.mutation<
+      unknown,
+      {
+        dashboardUID: string;
+        destinationUID: string;
+      }
+    >({
+      queryFn: async ({ dashboardUID, destinationUID }, _api, _extraOptions, baseQuery) => {
+        const fullDash: DashboardDTO = await getBackendSrv().get(`/api/dashboards/uid/${dashboardUID}`);
+
+        const options = {
+          dashboard: fullDash.dashboard,
+          folderUid: destinationUID,
+          overwrite: false,
+        };
+
+        return baseQuery({
+          url: '/dashboards/db',
+          method: 'POST',
+          data: {
+            message: '',
+            ...options,
+          },
+        });
+      },
+    }),
+    // TODO this doesn't return void, find where the correct type is
+    moveFolder: builder.mutation<
+      void,
+      {
+        folderUID: string;
+        destinationUID: string;
+      }
+    >({
+      query: ({ folderUID, destinationUID }) => ({
+        url: `/folders/${folderUID}/move`,
+        method: 'POST',
+        data: { parentUid: destinationUID },
+      }),
+    }),
     getFolder: builder.query<FolderDTO, string>({
       query: (folderUID) => ({ url: `/folders/${folderUID}` }),
     }),
@@ -93,5 +150,13 @@ export const browseDashboardsAPI = createApi({
   }),
 });
 
-export const { useGetFolderQuery, useLazyGetFolderQuery, useGetAffectedItemsQuery } = browseDashboardsAPI;
+export const {
+  useDeleteDashboardMutation,
+  useDeleteFolderMutation,
+  useGetAffectedItemsQuery,
+  useGetFolderQuery,
+  useLazyGetFolderQuery,
+  useMoveDashboardMutation,
+  useMoveFolderMutation,
+} = browseDashboardsAPI;
 export { skipToken } from '@reduxjs/toolkit/query/react';
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
index 235cddea5b4..4b40aad2740 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
@@ -6,40 +6,88 @@ import { Button, useStyles2 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
 import { ShowModalReactEvent } from 'app/types/events';
 
+import {
+  useDeleteDashboardMutation,
+  useDeleteFolderMutation,
+  useMoveDashboardMutation,
+  useMoveFolderMutation,
+} from '../../api/browseDashboardsAPI';
 import { useActionSelectionState } from '../../state';
 
 import { DeleteModal } from './DeleteModal';
 import { MoveModal } from './MoveModal';
 
-export interface Props {}
+export interface Props {
+  // this is a complete hack to force a full rerender.
+  // TODO remove once we move everything to RTK query
+  onActionComplete?: () => void;
+}
 
-export function BrowseActions() {
+export function BrowseActions({ onActionComplete }: Props) {
   const styles = useStyles2(getStyles);
   const selectedItems = useActionSelectionState();
+  const [deleteDashboard] = useDeleteDashboardMutation();
+  const [deleteFolder] = useDeleteFolderMutation();
+  const [moveFolder] = useMoveFolderMutation();
+  const [moveDashboard] = useMoveDashboardMutation();
+  const selectedDashboards = Object.keys(selectedItems.dashboard).filter((uid) => selectedItems.dashboard[uid]);
+  const selectedFolders = Object.keys(selectedItems.folder).filter((uid) => selectedItems.folder[uid]);
 
-  const onMove = () => {
+  const onDelete = async () => {
+    // Delete all the folders sequentially
+    // TODO error handling here
+    for (const folderUID of selectedFolders) {
+      await deleteFolder(folderUID).unwrap();
+    }
+
+    // Delete all the dashboards sequenetially
+    // TODO error handling here
+    for (const dashboardUID of selectedDashboards) {
+      await deleteDashboard(dashboardUID).unwrap();
+    }
+    onActionComplete?.();
+  };
+
+  const onMove = async (destinationUID: string) => {
+    // Move all the folders sequentially
+    // TODO error handling here
+    for (const folderUID of selectedFolders) {
+      await moveFolder({
+        folderUID,
+        destinationUID,
+      }).unwrap();
+    }
+
+    // Move all the dashboards sequentially
+    // TODO error handling here
+    for (const dashboardUID of selectedDashboards) {
+      await moveDashboard({
+        dashboardUID,
+        destinationUID,
+      }).unwrap();
+    }
+    onActionComplete?.();
+  };
+
+  const showMoveModal = () => {
     appEvents.publish(
       new ShowModalReactEvent({
         component: MoveModal,
         props: {
           selectedItems,
-          onConfirm: (moveTarget: string) => {
-            console.log(`MoveModal onConfirm clicked with target ${moveTarget}!`);
-          },
+          onConfirm: onMove,
         },
       })
     );
   };
 
-  const onDelete = () => {
+  const showDeleteModal = () => {
     appEvents.publish(
       new ShowModalReactEvent({
         component: DeleteModal,
         props: {
           selectedItems,
-          onConfirm: () => {
-            console.log('DeleteModal onConfirm clicked!');
-          },
+          onConfirm: onDelete,
         },
       })
     );
@@ -47,10 +95,10 @@ export function BrowseActions() {
 
   return (
     <div className={styles.row} data-testid="manage-actions">
-      <Button onClick={onMove} variant="secondary">
+      <Button onClick={showMoveModal} variant="secondary">
         Move
       </Button>
-      <Button onClick={onDelete} variant="destructive">
+      <Button onClick={showDeleteModal} variant="destructive">
         Delete
       </Button>
     </div>

From 7c5210a91591bee86b678bf898e65a52618ebc5a Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Thu, 27 Apr 2023 16:19:13 +0200
Subject: [PATCH 478/729] Plugins: Fix files with two dots in the name not
 being returned by LocalFS.Files() (#67395)

* Fix files with two dots in the name not being returned by LocalFS.Files()

* Renamed variable for consistency

* Add test

* Fix typo

* Fix wrong upperLevelPrefix value

* Removed unnecessary check in LocalFS.Files()
---
 pkg/plugins/localfiles.go      |  7 ++++---
 pkg/plugins/localfiles_test.go | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pkg/plugins/localfiles.go b/pkg/plugins/localfiles.go
index 8def6dd7503..5981d13256e 100644
--- a/pkg/plugins/localfiles.go
+++ b/pkg/plugins/localfiles.go
@@ -34,6 +34,7 @@ func NewLocalFS(basePath string) LocalFS {
 // file is allowed or not. Access to a file is allowed if the file is in the FS's Base() directory, and if it's a
 // symbolic link it should not end up outside the plugin's directory.
 func (f LocalFS) fileIsAllowed(basePath string, absolutePath string, info os.FileInfo) (bool, error) {
+	upperLevelPrefix := ".." + string(filepath.Separator)
 	if info.Mode()&os.ModeSymlink == os.ModeSymlink {
 		symlinkPath, err := filepath.EvalSymlinks(absolutePath)
 		if err != nil {
@@ -50,7 +51,7 @@ func (f LocalFS) fileIsAllowed(basePath string, absolutePath string, info os.Fil
 		if err != nil {
 			return false, err
 		}
-		if p == ".." || strings.HasPrefix(p, ".."+string(filepath.Separator)) {
+		if p == ".." || strings.HasPrefix(p, upperLevelPrefix) {
 			return false, fmt.Errorf("file '%s' not inside of plugin directory", p)
 		}
 
@@ -70,7 +71,7 @@ func (f LocalFS) fileIsAllowed(basePath string, absolutePath string, info os.Fil
 	if err != nil {
 		return false, err
 	}
-	if strings.HasPrefix(file, ".."+string(filepath.Separator)) {
+	if strings.HasPrefix(file, upperLevelPrefix) {
 		return false, fmt.Errorf("file '%s' not inside of plugin directory", file)
 	}
 	return true, nil
@@ -147,7 +148,7 @@ func (f LocalFS) Files() ([]string, error) {
 			return nil, err
 		}
 		clenRelPath, err := util.CleanRelativePath(relPath)
-		if strings.Contains(clenRelPath, "..") || err != nil {
+		if err != nil {
 			continue
 		}
 		relFiles = append(relFiles, clenRelPath)
diff --git a/pkg/plugins/localfiles_test.go b/pkg/plugins/localfiles_test.go
index af523cde9b7..8ad5903cd69 100644
--- a/pkg/plugins/localfiles_test.go
+++ b/pkg/plugins/localfiles_test.go
@@ -277,3 +277,26 @@ func TestStaticFS(t *testing.T) {
 		})
 	})
 }
+
+// TestFSTwoDotsInFileName ensures that LocalFS and StaticFS allow two dots in file names.
+// This makes sure that FSes do not believe that two dots in a file name (anywhere in the path)
+// represent a path traversal attempt.
+func TestFSTwoDotsInFileName(t *testing.T) {
+	tmp := t.TempDir()
+	const fn = "test..png"
+	require.NoError(t, createDummyTempFile(tmp, fn))
+
+	localFS := NewLocalFS(tmp)
+	staticFS, err := NewStaticFS(localFS)
+	require.NoError(t, err)
+
+	// Test both with localFS and staticFS
+
+	files, err := localFS.Files()
+	require.NoError(t, err)
+	require.Equal(t, []string{"test..png"}, files)
+
+	files, err = staticFS.Files()
+	require.NoError(t, err)
+	require.Equal(t, []string{"test..png"}, files)
+}

From 893bf08dcf11b899b21a0e1851078e76b9168e4b Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Thu, 27 Apr 2023 17:24:47 +0300
Subject: [PATCH 479/729] Nested folders: Fix API response ordering when
 fetching subfolders (#67258)

* Nested folders: Fix ordering when getting subfolders

* Update endpoint swagger description

* Modify test
---
 pkg/api/folder.go                              |  4 +++-
 pkg/services/folder/folderimpl/sqlstore.go     |  4 ++--
 .../folder/folderimpl/sqlstore_test.go         |  7 +++++--
 public/api-merged.json                         | 18 +++++++++---------
 public/openapi3.json                           | 18 +++++++++---------
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index ad15d5371ad..1f510d4396b 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -28,7 +28,9 @@ import (
 //
 // Returns all folders that the authenticated user has permission to view.
 // If nested folders are enabled, it expects an additional query parameter with the parent folder UID
-// and returns the immediate subfolders.
+// and returns the immediate subfolders that the authenticated user has permission to view.
+// If the parameter is not supplied then it returns immediate subfolders under the root
+// that the authenticated user has permission to view.
 //
 // Responses:
 // 200: getFoldersResponse
diff --git a/pkg/services/folder/folderimpl/sqlstore.go b/pkg/services/folder/folderimpl/sqlstore.go
index 30d1256dd70..badf2fc272a 100644
--- a/pkg/services/folder/folderimpl/sqlstore.go
+++ b/pkg/services/folder/folderimpl/sqlstore.go
@@ -239,10 +239,10 @@ func (ss *sqlStore) GetChildren(ctx context.Context, q folder.GetChildrenQuery)
 		sql := strings.Builder{}
 		args := make([]interface{}, 0, 2)
 		if q.UID == "" {
-			sql.Write([]byte("SELECT * FROM folder WHERE parent_uid IS NULL AND org_id=?"))
+			sql.Write([]byte("SELECT * FROM folder WHERE parent_uid IS NULL AND org_id=? ORDER BY title ASC"))
 			args = append(args, q.OrgID)
 		} else {
-			sql.Write([]byte("SELECT * FROM folder WHERE parent_uid=? AND org_id=?"))
+			sql.Write([]byte("SELECT * FROM folder WHERE parent_uid=? AND org_id=? ORDER BY title ASC"))
 			args = append(args, q.UID, q.OrgID)
 		}
 
diff --git a/pkg/services/folder/folderimpl/sqlstore_test.go b/pkg/services/folder/folderimpl/sqlstore_test.go
index d5a032dd3d6..b8f45eb85f1 100644
--- a/pkg/services/folder/folderimpl/sqlstore_test.go
+++ b/pkg/services/folder/folderimpl/sqlstore_test.go
@@ -3,6 +3,7 @@ package folderimpl
 import (
 	"context"
 	"fmt"
+	"sort"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -544,6 +545,7 @@ func TestIntegrationGetChildren(t *testing.T) {
 	require.NoError(t, err)
 
 	treeLeaves := CreateLeaves(t, folderStore, parent, 8)
+	sort.Strings(treeLeaves)
 
 	t.Cleanup(func() {
 		for _, uid := range treeLeaves {
@@ -768,9 +770,10 @@ func CreateLeaves(t *testing.T, store *sqlStore, parent *folder.Folder, num int)
 
 	leaves := make([]string, 0)
 	for i := 0; i < num; i++ {
+		uid := util.GenerateShortUID()
 		f, err := store.Create(context.Background(), folder.CreateFolderCommand{
-			Title:     fmt.Sprintf("folder-%d", i),
-			UID:       util.GenerateShortUID(),
+			Title:     fmt.Sprintf("folder-%s", uid),
+			UID:       uid,
 			OrgID:     parent.OrgID,
 			ParentUID: parent.UID,
 		})
diff --git a/public/api-merged.json b/public/api-merged.json
index 93e06f99ba1..8dec040b7ee 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -5404,7 +5404,7 @@
     },
     "/folders": {
       "get": {
-        "description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders.",
+        "description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders that the authenticated user has permission to view.\nIf the parameter is not supplied then it returns immediate subfolders under the root\nthat the authenticated user has permission to view.",
         "tags": [
           "folders"
         ],
@@ -11885,6 +11885,13 @@
         }
       }
     },
+    "ChildrenCounts": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "integer",
+        "format": "int64"
+      }
+    },
     "ConfFloat64": {
       "description": "ConfFloat64 is a float64. It Marshals float64 values of NaN of Inf\nto null.",
       "type": "number",
@@ -13594,13 +13601,6 @@
         }
       }
     },
-    "FolderChildrenCounts": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "integer",
-        "format": "int64"
-      }
-    },
     "FolderSearchHit": {
       "type": "object",
       "properties": {
@@ -20344,7 +20344,7 @@
     "getFolderChildrenCountsResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/FolderChildrenCounts"
+        "$ref": "#/definitions/ChildrenCounts"
       }
     },
     "getFolderPermissionListResponse": {
diff --git a/public/openapi3.json b/public/openapi3.json
index 635e242ae6e..bbdca11f0f6 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -796,7 +796,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/FolderChildrenCounts"
+              "$ref": "#/components/schemas/ChildrenCounts"
             }
           }
         },
@@ -2952,6 +2952,13 @@
         },
         "type": "object"
       },
+      "ChildrenCounts": {
+        "additionalProperties": {
+          "format": "int64",
+          "type": "integer"
+        },
+        "type": "object"
+      },
       "ConfFloat64": {
         "description": "ConfFloat64 is a float64. It Marshals float64 values of NaN of Inf\nto null.",
         "format": "double",
@@ -4661,13 +4668,6 @@
         },
         "type": "object"
       },
-      "FolderChildrenCounts": {
-        "additionalProperties": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "type": "object"
-      },
       "FolderSearchHit": {
         "properties": {
           "id": {
@@ -16759,7 +16759,7 @@
     },
     "/folders": {
       "get": {
-        "description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders.",
+        "description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders that the authenticated user has permission to view.\nIf the parameter is not supplied then it returns immediate subfolders under the root\nthat the authenticated user has permission to view.",
         "operationId": "getFolders",
         "parameters": [
           {

From e9971dd153f4c440bf40abdbc6f6a59bc2930586 Mon Sep 17 00:00:00 2001
From: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
Date: Thu, 27 Apr 2023 10:28:26 -0400
Subject: [PATCH 480/729] Docs: Create documentation for enterprise caching
 HTTP API (#67169)

* create http docs for query caching

* fix endpoints

* Update docs/sources/developers/http_api/query_and_resource_caching.md

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>

* run prettier

* super small change to reflect incoming API update

---------

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>
---
 docs/sources/developers/http_api/_index.md    |   1 +
 .../http_api/query_and_resource_caching.md    | 295 ++++++++++++++++++
 2 files changed, 296 insertions(+)
 create mode 100644 docs/sources/developers/http_api/query_and_resource_caching.md

diff --git a/docs/sources/developers/http_api/_index.md b/docs/sources/developers/http_api/_index.md
index 711aa1655bb..f84bb4c09d5 100644
--- a/docs/sources/developers/http_api/_index.md
+++ b/docs/sources/developers/http_api/_index.md
@@ -65,3 +65,4 @@ Grafana Enterprise includes all of the Grafana OSS APIs as well as those that fo
 - [External group sync API]({{< relref "external_group_sync/" >}})
 - [License API]({{< relref "licensing/" >}})
 - [Reporting API]({{< relref "reporting/" >}})
+- [Query and resource caching API]({{< relref "query_and_resource_caching/" >}})
diff --git a/docs/sources/developers/http_api/query_and_resource_caching.md b/docs/sources/developers/http_api/query_and_resource_caching.md
new file mode 100644
index 00000000000..84bfe4fdbee
--- /dev/null
+++ b/docs/sources/developers/http_api/query_and_resource_caching.md
@@ -0,0 +1,295 @@
+---
+aliases:
+  - ../../http_api/query_caching/
+  - ../../http_api/resource_caching/
+  - ../../http_api/caching/
+canonical: /docs/grafana/latest/developers/http_api/query_and_resource_caching/
+description: Grafana Enterprise Query and Resource Caching HTTP API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - caching
+  - query caching
+  - resource caching
+  - data source
+title: Query and Resource Caching HTTP API
+---
+
+# Query and resource caching API
+
+> **Note:** If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/custom-role-actions-scopes" >}}) for more information.
+
+## Enable caching for a data source
+
+`POST /api/datasources/:dataSourceUID/cache/enable`
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#query-and-resource-caching-api" >}}) for an explanation.
+
+| Action                    | Scope          |
+| ------------------------- | -------------- |
+| datasources.caching:write | datasources:\* |
+
+### Examples
+
+**Example Request**:
+
+```http
+POST /api/datasources/jZrmlLCGka/cache/enable HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+{
+   "message": "Data source cache enabled",
+   "dataSourceID": 1,
+   "dataSourceUID": "jZrmlLCGka",
+   "enabled": true,
+   "ttlQueriesMs": 300000,
+   "ttlResourcesMs": 300000,
+   "useDefaultTTL": true,
+   "defaultTTLMs": 300000,
+   "created": "2023-04-21T11:49:22-04:00",
+   "updated": "2023-04-24T16:30:29-04:00"
+}
+```
+
+#### Status codes
+
+| Code | Description                                                              |
+| ---- | ------------------------------------------------------------------------ |
+| 200  | Cache was successfully enabled for the data source                       |
+| 500  | Unexpected error. Refer to the body and/or server logs for more details. |
+
+## Disable caching for a data source
+
+`POST /api/datasources/:dataSourceUID/cache/disable`
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#query-and-resource-caching-api" >}}) for an explanation.
+
+| Action                    | Scope          |
+| ------------------------- | -------------- |
+| datasources.caching:write | datasources:\* |
+
+### Examples
+
+**Example Request**:
+
+```http
+POST /api/datasources/jZrmlLCGka/cache/disable HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+{
+   "message": "Data source cache disabled",
+   "dataSourceID": 1,
+   "dataSourceUID": "jZrmlLCGka",
+   "enabled": false,
+   "ttlQueriesMs": 300000,
+   "ttlResourcesMs": 300000,
+   "useDefaultTTL": true,
+   "defaultTTLMs": 0,
+   "created": "2023-04-21T11:49:22-04:00",
+   "updated": "2023-04-24T16:30:31-04:00"
+}
+```
+
+#### Status codes
+
+| Code | Description                                                              |
+| ---- | ------------------------------------------------------------------------ |
+| 200  | Cache was successfully enabled for the data source                       |
+| 500  | Unexpected error. Refer to the body and/or server logs for more details. |
+
+## Clean cache for all data sources
+
+`POST /api/datasources/:dataSourceUID/cache/clean`
+
+Will clean cached data for _all_ data sources with caching enabled. The `dataSourceUID` specified will only be used to return the configuration for that data source.
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#query-and-resource-caching-api" >}}) for an explanation.
+
+| Action                    | Scope          |
+| ------------------------- | -------------- |
+| datasources.caching:write | datasources:\* |
+
+### Examples
+
+**Example Request**:
+
+```http
+POST /api/datasources/jZrmlLCGka/cache/clean HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+{
+   "message": "Data source cache cleaned",
+   "dataSourceID": 1,
+   "dataSourceUID": "jZrmlLCGka",
+   "enabled": false,
+   "ttlQueriesMs": 300000,
+   "ttlResourcesMs": 300000,
+   "useDefaultTTL": true,
+   "defaultTTLMs": 0,
+   "created": "2023-04-21T11:49:22-04:00",
+   "updated": "2023-04-24T16:30:31-04:00"
+}
+```
+
+#### Status codes
+
+| Code | Description                                                              |
+| ---- | ------------------------------------------------------------------------ |
+| 200  | Cache was successfully enabled for the data source                       |
+| 500  | Unexpected error. Refer to the body and/or server logs for more details. |
+
+## Update cache configuration for a data source
+
+`POST /api/datasources/:dataSourceUID/cache`
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#query-and-resource-caching-api" >}}) for an explanation.
+
+| Action                    | Scope          |
+| ------------------------- | -------------- |
+| datasources.caching:write | datasources:\* |
+
+### Examples
+
+**Example Request**:
+
+```http
+POST /api/datasources/jZrmlLCGka/cache HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+{
+   "dataSourceID": 1,
+   "dataSourceUID": "jZrmlLCGka",
+   "enabled": true,
+   "useDefaultTTL": false,
+   "ttlQueriesMs": 60000,
+   "ttlResourcesMs": 300000,
+}
+```
+
+#### JSON Body Schema
+
+| Field name     | Data type | Description                                                                                                                                 |
+| -------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
+| dataSourceID   | number    | The ID of the data source to configure.                                                                                                     |
+| dataSourceUID  | string    | The UID of the data source to configure.                                                                                                    |
+| enabled        | boolean   | Whether or not to enable caching for this data source.                                                                                      |
+| useDefaultTTL  | boolean   | Whether the configured default TTL (Time-To-Live) should be used for both query and resource caching, instead of the user-specified values. |
+| ttlQueriesMs   | number    | The TTL to use for query caching, in milliseconds.                                                                                          |
+| ttlResourcesMs | number    | The TTL to use for resource caching, in milliseconds.                                                                                       |
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+{
+   "message": "Data source cache settings updated",
+   "dataSourceID": 1,
+   "dataSourceUID": "jZrmlLCGka",
+   "enabled": true,
+   "useDefaultTTL": false,
+   "ttlQueriesMs": 60000,
+   "ttlResourcesMs": 300000,
+   "defaultTTLMs": 300000,
+   "created": "2023-04-21T11:49:22-04:00",
+   "updated": "2023-04-24T17:03:40-04:00"
+}
+```
+
+#### Status codes
+
+| Code | Description                                                              |
+| ---- | ------------------------------------------------------------------------ |
+| 200  | Cache was successfully enabled for the data source                       |
+| 400  | Request errors (invalid json, missing or invalid fields, etc)            |
+| 500  | Unexpected error. Refer to the body and/or server logs for more details. |
+
+## Get cache configuration for a data source
+
+`GET /api/datasources/:dataSourceUID/cache`
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#query-and-resource-caching-api" >}}) for an explanation.
+
+| Action                   | Scope          |
+| ------------------------ | -------------- |
+| datasources.caching:read | datasources:\* |
+
+### Examples
+
+**Example Request**:
+
+```http
+GET /api/datasources/jZrmlLCGka/cache HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+{
+   "message": "Data source cache settings loaded",
+   "dataSourceID": 1,
+   "dataSourceUID": "jZrmlLCGka",
+   "enabled": true,
+   "useDefaultTTL": false,
+   "ttlQueriesMs": 60000,
+   "ttlResourcesMs": 300000,
+   "defaultTTLMs": 300000,
+   "created": "2023-04-21T11:49:22-04:00",
+   "updated": "2023-04-24T17:03:40-04:00"
+}
+```
+
+#### Status codes
+
+| Code | Description                                                              |
+| ---- | ------------------------------------------------------------------------ |
+| 200  | Cache was successfully enabled for the data source                       |
+| 500  | Unexpected error. Refer to the body and/or server logs for more details. |

From b94fceddad0e589472383e4d219f6820a53a24a5 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Thu, 27 Apr 2023 16:38:22 +0200
Subject: [PATCH 481/729] Alerting: Make Loki & Prometheus instant vector by
 default (#66797)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
---
 .../unified/GrafanaRuleQueryViewer.tsx        |  11 +-
 .../components/PanelPluginsButtonGroup.tsx    |  46 -----
 .../expressions/Expression.test.tsx           |  20 +-
 .../components/expressions/Expression.tsx     |  44 ++++-
 .../components/expressions/util.test.ts       |  22 ++-
 .../unified/components/expressions/util.ts    |  11 +-
 .../components/rule-editor/QueryWrapper.tsx   | 120 ++++++------
 .../rule-editor/RecordingRuleEditor.tsx       |   9 +-
 .../components/rule-editor/VizWrapper.tsx     | 174 +++++++-----------
 .../components/rule-editor/util.test.ts       |  50 +++++
 .../unified/components/rule-editor/util.ts    |  42 ++++-
 .../rule-viewer/RuleViewerVisualization.tsx   | 132 ++++---------
 .../features/explore/Graph/ExploreGraph.tsx   |  26 ++-
 .../features/explore/Graph/GraphContainer.tsx |  24 ++-
 .../explore/Graph/exploreGraphStyleUtils.ts   |  16 +-
 .../query/components/QueryEditorRow.tsx       |   5 +
 .../app/plugins/datasource/loki/datasource.ts |  16 ++
 .../datasource/prometheus/datasource.tsx      |  27 +++
 18 files changed, 435 insertions(+), 360 deletions(-)
 delete mode 100644 public/app/features/alerting/unified/components/PanelPluginsButtonGroup.tsx

diff --git a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
index 03bb94aadde..6fdab6e5aef 100644
--- a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
+++ b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
@@ -24,6 +24,7 @@ import {
 import alertDef, { EvalFunction } from '../state/alertDef';
 
 import { ExpressionResult } from './components/expressions/Expression';
+import { getThresholdsForQueries, ThresholdDefinition } from './components/rule-editor/util';
 import { RuleViewerVisualization } from './components/rule-viewer/RuleViewerVisualization';
 
 interface GrafanaRuleViewerProps {
@@ -46,6 +47,8 @@ export function GrafanaRuleQueryViewer({
   const expressions = queries.filter((q) => isExpressionQuery(q.model));
   const styles = useStyles2(getExpressionViewerStyles);
 
+  const thresholds = getThresholdsForQueries(queries);
+
   return (
     <Stack gap={2} direction="column">
       <div className={styles.maxWidthContainer}>
@@ -62,6 +65,7 @@ export function GrafanaRuleQueryViewer({
                 relativeTimeRange={relativeTimeRange}
                 evalTimeRange={evalTimeRanges[refId]}
                 dataSource={dataSource}
+                thresholds={thresholds[refId]}
                 queryData={evalDataByQuery[refId]}
                 onEvalTimeRangeChange={(timeRange) => onTimeRangeChange(refId, timeRange)}
               />
@@ -97,6 +101,7 @@ interface QueryPreviewProps extends Pick<AlertQuery, 'refId' | 'relativeTimeRang
   isAlertCondition: boolean;
   dataSource?: DataSourceInstanceSettings;
   queryData?: PanelData;
+  thresholds?: ThresholdDefinition;
   evalTimeRange?: RelativeTimeRange;
   onEvalTimeRangeChange: (timeRange: RelativeTimeRange) => void;
 }
@@ -104,6 +109,7 @@ interface QueryPreviewProps extends Pick<AlertQuery, 'refId' | 'relativeTimeRang
 export function QueryPreview({
   refId,
   relativeTimeRange,
+  thresholds,
   model,
   dataSource,
   queryData,
@@ -127,9 +133,10 @@ export function QueryPreview({
       {dataSource && (
         <RuleViewerVisualization
           refId={refId}
-          datasourceUid={dataSource.uid}
+          dsSettings={dataSource}
           model={model}
           data={queryData}
+          thresholds={thresholds}
           relativeTimeRange={evalTimeRange}
           onTimeRangeChange={onEvalTimeRangeChange}
           className={styles.visualization}
@@ -144,7 +151,7 @@ const getQueryPreviewStyles = (theme: GrafanaTheme2) => ({
     margin: ${theme.spacing(1)};
   `,
   contentBox: css`
-    flex: 1 0 100%; // RuleViewerVisualization uses AutoSizer which doesn't expand the box
+    flex: 1 0 100%;
   `,
   visualization: css`
     padding: ${theme.spacing(1)};
diff --git a/public/app/features/alerting/unified/components/PanelPluginsButtonGroup.tsx b/public/app/features/alerting/unified/components/PanelPluginsButtonGroup.tsx
deleted file mode 100644
index d5bada5d1fa..00000000000
--- a/public/app/features/alerting/unified/components/PanelPluginsButtonGroup.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { useMemo } from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { RadioButtonGroup } from '@grafana/ui';
-
-import { STAT, TABLE, TIMESERIES } from '../utils/constants';
-
-export type SupportedPanelPlugins = 'timeseries' | 'table' | 'stat';
-
-type Props = {
-  value: SupportedPanelPlugins;
-  onChange: (value: SupportedPanelPlugins) => void;
-  size?: 'sm' | 'md';
-};
-
-export function PanelPluginsButtonGroup(props: Props): JSX.Element | null {
-  const { value, onChange, size = 'md' } = props;
-  const panels = useMemo(() => getSupportedPanels(), []);
-
-  return <RadioButtonGroup options={panels} value={value} onChange={onChange} size={size} />;
-}
-
-function getSupportedPanels(): Array<SelectableValue<SupportedPanelPlugins>> {
-  return Object.values(config.panels).reduce((panels: Array<SelectableValue<SupportedPanelPlugins>>, panel) => {
-    if (isSupportedPanelPlugin(panel.id)) {
-      panels.push({
-        value: panel.id,
-        label: panel.name,
-        imgUrl: panel.info.logos.small,
-      });
-    }
-    return panels;
-  }, []);
-}
-
-function isSupportedPanelPlugin(id: string): id is SupportedPanelPlugins {
-  switch (id) {
-    case TIMESERIES:
-    case TABLE:
-    case STAT:
-      return true;
-    default:
-      return false;
-  }
-}
diff --git a/public/app/features/alerting/unified/components/expressions/Expression.test.tsx b/public/app/features/alerting/unified/components/expressions/Expression.test.tsx
index 7c4e2746940..326cd6a7acd 100644
--- a/public/app/features/alerting/unified/components/expressions/Expression.test.tsx
+++ b/public/app/features/alerting/unified/components/expressions/Expression.test.tsx
@@ -14,6 +14,20 @@ describe('TestResult', () => {
     }).not.toThrow();
   });
 
+  it('should show labels and values', () => {
+    const series: DataFrame[] = [
+      toDataFrame({ fields: [{ name: 'temp', values: [0.1234], labels: { label1: 'value1', label2: 'value2' } }] }),
+      toDataFrame({ fields: [{ name: 'temp', values: [0.5678], labels: { label1: 'value3', label2: 'value4' } }] }),
+    ];
+    render(<ExpressionResult series={series} />);
+
+    expect(screen.getByTitle('{label1=value1, label2=value2}')).toBeInTheDocument();
+    expect(screen.getByText('0.1234')).toBeInTheDocument();
+
+    expect(screen.getByTitle('{label1=value3, label2=value4}')).toBeInTheDocument();
+    expect(screen.getByText('0.5678')).toBeInTheDocument();
+  });
+
   it('should not paginate with less than PAGE_SIZE', () => {
     const series: DataFrame[] = [
       toDataFrame({
@@ -58,7 +72,11 @@ function makeSeries(n: number) {
       fields: [
         {
           name: 'temp',
-          values: [1],
+          values: [0.1234],
+          labels: {
+            label1: 'value1',
+            label2: 'value2',
+          },
         },
       ],
     })
diff --git a/public/app/features/alerting/unified/components/expressions/Expression.tsx b/public/app/features/alerting/unified/components/expressions/Expression.tsx
index 739979f43b7..4057a771ac8 100644
--- a/public/app/features/alerting/unified/components/expressions/Expression.tsx
+++ b/public/app/features/alerting/unified/components/expressions/Expression.tsx
@@ -19,7 +19,7 @@ import { Spacer } from '../Spacer';
 import { AlertStateTag } from '../rules/AlertStateTag';
 
 import { AlertConditionIndicator } from './AlertConditionIndicator';
-import { formatLabels, getSeriesName, getSeriesValue, isEmptySeries } from './util';
+import { formatLabels, getSeriesLabels, getSeriesName, getSeriesValue, isEmptySeries } from './util';
 
 interface ExpressionProps {
   isAlertCondition?: boolean;
@@ -302,16 +302,37 @@ const FrameRow: FC<FrameProps> = ({ frame, index, isAlertCondition }) => {
 
   const name = getSeriesName(frame) || 'Series ' + index;
   const value = getSeriesValue(frame);
+  const labelsRecord = getSeriesLabels(frame);
+  const labels = Object.entries(labelsRecord);
+  const hasLabels = labels.length > 0;
 
   const showFiring = isAlertCondition && value !== 0;
   const showNormal = isAlertCondition && value === 0;
 
+  const title = `${hasLabels ? '' : name}${hasLabels ? `{${formatLabels(labelsRecord)}}` : ''}`;
+
   return (
     <div className={styles.expression.resultsRow}>
       <Stack direction="row" gap={1} alignItems="center">
-        <span className={cx(styles.mutedText, styles.expression.resultLabel)} title={name}>
-          {name}
-        </span>
+        <div className={styles.expression.resultLabel} title={title}>
+          <span>{hasLabels ? '' : name}</span>
+          {hasLabels && (
+            <>
+              <span>{'{'}</span>
+              {labels.map(([key, value], index) => (
+                <span key={uniqueId()}>
+                  <span className={styles.expression.labelKey}>{key}</span>
+                  <span>=</span>
+                  <span>&quot;</span>
+                  <span className={styles.expression.labelValue}>{value}</span>
+                  <span>&quot;</span>
+                  {index < labels.length - 1 && <span>, </span>}
+                </span>
+              ))}
+              <span>{'}'}</span>
+            </>
+          )}
+        </div>
         <div className={styles.expression.resultValue}>{value}</div>
         {showFiring && <AlertStateTag state={PromAlertingRuleState.Firing} size="sm" />}
         {showNormal && <AlertStateTag state={PromAlertingRuleState.Inactive} size="sm" />}
@@ -397,6 +418,10 @@ const getStyles = (theme: GrafanaTheme2) => ({
       color: ${theme.colors.primary.text};
     `,
     results: css`
+      display: flex;
+      flex-direction: column;
+      flex-wrap: nowrap;
+
       border-top: solid 1px ${theme.colors.border.medium};
     `,
     noResults: css`
@@ -415,12 +440,21 @@ const getStyles = (theme: GrafanaTheme2) => ({
         background-color: ${theme.colors.background.canvas};
       }
     `,
+    labelKey: css`
+      color: ${theme.isDark ? '#73bf69' : '#56a64b'};
+    `,
+    labelValue: css`
+      color: ${theme.isDark ? '#ce9178' : '#a31515'};
+    `,
     resultValue: css`
-      color: ${theme.colors.text.maxContrast};
       text-align: right;
     `,
     resultLabel: css`
       flex: 1;
+      overflow-x: auto;
+
+      display: inline-block;
+      white-space: nowrap;
     `,
     noData: css`
       display: flex;
diff --git a/public/app/features/alerting/unified/components/expressions/util.test.ts b/public/app/features/alerting/unified/components/expressions/util.test.ts
index 30b022791da..7a20b352698 100644
--- a/public/app/features/alerting/unified/components/expressions/util.test.ts
+++ b/public/app/features/alerting/unified/components/expressions/util.test.ts
@@ -1,6 +1,6 @@
 import { DataFrame, FieldType, toDataFrame } from '@grafana/data';
 
-import { getSeriesName, formatLabels, getSeriesValue, isEmptySeries } from './util';
+import { getSeriesName, formatLabels, getSeriesValue, isEmptySeries, getSeriesLabels } from './util';
 
 const EMPTY_FRAME: DataFrame = toDataFrame([]);
 const NAMED_FRAME: DataFrame = {
@@ -17,7 +17,7 @@ const DATA_FRAME_LARGE_DECIMAL: DataFrame = toDataFrame({
 });
 
 const DATA_FRAME_WITH_LABELS: DataFrame = toDataFrame({
-  fields: [{ name: 'value', type: FieldType.number, values: [1, 2, 3], labels: { foo: 'bar' } }],
+  fields: [{ name: 'value', type: FieldType.number, values: [1, 2, 3], labels: { __name__: 'my-series', foo: 'bar' } }],
 });
 
 describe('formatLabels', () => {
@@ -51,16 +51,16 @@ describe('getSeriesName', () => {
   });
 
   it('should work with empty data frame', () => {
-    expect(getSeriesName(EMPTY_FRAME)).toBe('');
+    expect(getSeriesName(EMPTY_FRAME)).toBe(undefined);
   });
 
-  it('should work with labeled frame', () => {
+  it('should work with __name__ labeled frame', () => {
     const name = getSeriesName(DATA_FRAME_WITH_LABELS);
-    expect(name).toBe('foo=bar');
+    expect(name).toBe('my-series');
   });
 
   it('should work with NoData frames', () => {
-    expect(getSeriesName(EMPTY_FRAME)).toBe('');
+    expect(getSeriesName(EMPTY_FRAME)).toBe(undefined);
   });
 
   it('should give preference to displayNameFromDS', () => {
@@ -97,3 +97,13 @@ describe('getSeriesValue', () => {
     expect(getSeriesValue(DATA_FRAME_LARGE_DECIMAL)).toBe(1.23457);
   });
 });
+
+describe('getSeriesLabels', () => {
+  it('should work for dataframe with labels', () => {
+    expect(getSeriesLabels(DATA_FRAME_WITH_LABELS)).toStrictEqual({ __name__: 'my-series', foo: 'bar' });
+  });
+
+  it('should work for dataframe with no labels', () => {
+    expect(getSeriesLabels(EMPTY_FRAME)).toStrictEqual({});
+  });
+});
diff --git a/public/app/features/alerting/unified/components/expressions/util.ts b/public/app/features/alerting/unified/components/expressions/util.ts
index 1ca20292c9d..2375f61e820 100644
--- a/public/app/features/alerting/unified/components/expressions/util.ts
+++ b/public/app/features/alerting/unified/components/expressions/util.ts
@@ -9,11 +9,11 @@ import { DataFrame, Labels, roundDecimals } from '@grafana/data';
  * see https://github.com/Microsoft/TypeScript/issues/13778
  */
 
-const getSeriesName = (frame: DataFrame): string => {
+const getSeriesName = (frame: DataFrame): string | undefined => {
   const firstField = frame.fields[0];
 
   const displayNameFromDS = firstField?.config?.displayNameFromDS;
-  return displayNameFromDS ?? frame.name ?? formatLabels(firstField?.labels ?? {});
+  return displayNameFromDS ?? frame.name ?? firstField?.labels?.__name__;
 };
 
 const getSeriesValue = (frame: DataFrame) => {
@@ -26,6 +26,11 @@ const getSeriesValue = (frame: DataFrame) => {
   return value;
 };
 
+const getSeriesLabels = (frame: DataFrame): Record<string, string> => {
+  const firstField = frame.fields[0];
+  return firstField?.labels ?? {};
+};
+
 const formatLabels = (labels: Labels): string => {
   return Object.entries(labels)
     .map(([key, value]) => key + '=' + value)
@@ -38,4 +43,4 @@ const isEmptySeries = (series: DataFrame[]): boolean => {
   return isEmpty;
 };
 
-export { getSeriesName, getSeriesValue, formatLabels, isEmptySeries };
+export { getSeriesName, getSeriesValue, getSeriesLabels, formatLabels, isEmptySeries };
diff --git a/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx b/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
index 25232791e3b..ba365456a0d 100644
--- a/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
@@ -5,6 +5,7 @@ import React, { ChangeEvent, useState } from 'react';
 import {
   CoreApp,
   DataQuery,
+  DataSourceApi,
   DataSourceInstanceSettings,
   getDefaultRelativeTimeRange,
   GrafanaTheme2,
@@ -23,12 +24,9 @@ import {
   Tooltip,
   useStyles2,
 } from '@grafana/ui';
-import { isExpressionQuery } from 'app/features/expressions/guards';
 import { QueryEditorRow } from 'app/features/query/components/QueryEditorRow';
 import { AlertQuery } from 'app/types/unified-alerting-dto';
 
-import { TABLE, TIMESERIES } from '../../utils/constants';
-import { SupportedPanelPlugins } from '../PanelPluginsButtonGroup';
 import { AlertConditionIndicator } from '../expressions/AlertConditionIndicator';
 
 import { VizWrapper } from './VizWrapper';
@@ -81,8 +79,8 @@ export const QueryWrapper = ({
   onChangeQueryOptions,
 }: Props) => {
   const styles = useStyles2(getStyles);
-  const isExpression = isExpressionQuery(query.model);
-  const [pluginId, changePluginId] = useState<SupportedPanelPlugins>(isExpression ? TABLE : TIMESERIES);
+  const [dsInstance, setDsInstance] = useState<DataSourceApi>();
+  const defaults = dsInstance?.getDefaultQuery ? dsInstance.getDefaultQuery(CoreApp.UnifiedAlerting) : {};
 
   function SelectingDataSourceTooltip() {
     const styles = useStyles2(getStyles);
@@ -117,67 +115,65 @@ export const QueryWrapper = ({
       maxDataPoints: queryOptions.maxDataPoints,
     };
 
-    if (isExpressionQuery(query.model)) {
-      return null;
-    } else {
-      return (
-        <Stack direction="row" alignItems="baseline" gap={1}>
-          <SelectingDataSourceTooltip />
-          {onChangeTimeRange && (
-            <RelativeTimeRangePicker
-              timeRange={query.relativeTimeRange ?? getDefaultRelativeTimeRange()}
-              onChange={(range) => onChangeTimeRange(range, index)}
-            />
-          )}
-          <div className={styles.queryOptions}>
-            <MaxDataPointsOption
-              options={alertQueryOptions}
-              onChange={(options) => onChangeQueryOptions(options, index)}
-            />
-          </div>
-          <AlertConditionIndicator
-            onSetCondition={() => onSetCondition(query.refId)}
-            enabled={condition === query.refId}
-            error={error}
+    return (
+      <Stack direction="row" alignItems="baseline" gap={1}>
+        <SelectingDataSourceTooltip />
+        {onChangeTimeRange && (
+          <RelativeTimeRangePicker
+            timeRange={query.relativeTimeRange ?? getDefaultRelativeTimeRange()}
+            onChange={(range) => onChangeTimeRange(range, index)}
           />
-        </Stack>
-      );
-    }
+        )}
+        <div className={styles.queryOptions}>
+          <MaxDataPointsOption
+            options={alertQueryOptions}
+            onChange={(options) => onChangeQueryOptions(options, index)}
+          />
+        </div>
+        <AlertConditionIndicator
+          onSetCondition={() => onSetCondition(query.refId)}
+          enabled={condition === query.refId}
+          error={error}
+        />
+      </Stack>
+    );
   }
 
   return (
-    <div className={styles.wrapper}>
-      <QueryEditorRow<DataQuery>
-        alerting
-        dataSource={dsSettings}
-        onChangeDataSource={!isExpression ? (settings) => onChangeDataSource(settings, index) : undefined}
-        id={query.refId}
-        index={index}
-        key={query.refId}
-        data={data}
-        query={cloneDeep(query.model)}
-        onChange={(query) => onChangeQuery(query, index)}
-        onRemoveQuery={onRemoveQuery}
-        onAddQuery={() => onDuplicateQuery(cloneDeep(query))}
-        onRunQuery={onRunQueries}
-        queries={queries}
-        renderHeaderExtras={() => <HeaderExtras query={query} index={index} error={error} />}
-        app={CoreApp.UnifiedAlerting}
-        visualization={
-          data.state !== LoadingState.NotStarted ? (
-            <VizWrapper
-              data={data}
-              changePanel={changePluginId}
-              currentPanel={pluginId}
-              thresholds={thresholds}
-              thresholdsType={thresholdsType}
-              onThresholdsChange={onChangeThreshold ? (thresholds) => onChangeThreshold(thresholds, index) : undefined}
-            />
-          ) : null
-        }
-        hideDisableQuery={true}
-      />
-    </div>
+    <Stack direction="column" gap={0.5}>
+      <div className={styles.wrapper}>
+        <QueryEditorRow<DataQuery>
+          alerting
+          dataSource={dsSettings}
+          onDataSourceLoaded={setDsInstance}
+          onChangeDataSource={(settings) => onChangeDataSource(settings, index)}
+          id={query.refId}
+          index={index}
+          key={query.refId}
+          data={data}
+          query={{
+            ...defaults,
+            ...cloneDeep(query.model),
+          }}
+          onChange={(query) => onChangeQuery(query, index)}
+          onRemoveQuery={onRemoveQuery}
+          onAddQuery={() => onDuplicateQuery(cloneDeep(query))}
+          onRunQuery={onRunQueries}
+          queries={queries}
+          renderHeaderExtras={() => <HeaderExtras query={query} index={index} error={error} />}
+          app={CoreApp.UnifiedAlerting}
+          hideDisableQuery={true}
+        />
+      </div>
+      {data.state !== LoadingState.NotStarted && (
+        <VizWrapper
+          data={data}
+          thresholds={thresholds}
+          thresholdsType={thresholdsType}
+          onThresholdsChange={onChangeThreshold ? (thresholds) => onChangeThreshold(thresholds, index) : undefined}
+        />
+      )}
+    </Stack>
   );
 };
 
diff --git a/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx b/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
index cba32d4f669..3b5290d62b1 100644
--- a/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
@@ -7,12 +7,9 @@ import { getDataSourceSrv } from '@grafana/runtime';
 import { DataQuery, LoadingState } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { isExpressionQuery } from 'app/features/expressions/guards';
 import { AlertQuery } from 'app/types/unified-alerting-dto';
 
-import { TABLE, TIMESERIES } from '../../utils/constants';
 import { isPromOrLokiQuery } from '../../utils/rule-form';
-import { SupportedPanelPlugins } from '../PanelPluginsButtonGroup';
 
 import { VizWrapper } from './VizWrapper';
 
@@ -39,10 +36,6 @@ export const RecordingRuleEditor: FC<RecordingRuleEditorProps> = ({
 
   const styles = useStyles2(getStyles);
 
-  const isExpression = isExpressionQuery(queries[0]?.model);
-
-  const [pluginId, changePluginId] = useState<SupportedPanelPlugins>(isExpression ? TABLE : TIMESERIES);
-
   useEffect(() => {
     setData(panelData?.[queries[0]?.refId]);
   }, [panelData, queries]);
@@ -108,7 +101,7 @@ export const RecordingRuleEditor: FC<RecordingRuleEditorProps> = ({
 
       {data && (
         <div className={styles.vizWrapper}>
-          <VizWrapper data={data} currentPanel={pluginId} changePanel={changePluginId} />
+          <VizWrapper data={data} />
         </div>
       )}
     </>
diff --git a/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx b/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx
index 91c9585f953..22f31ccc3a0 100644
--- a/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx
@@ -1,136 +1,90 @@
 import { css } from '@emotion/css';
-import React, { useEffect, useMemo, useState } from 'react';
+import React from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
-import { FieldConfigSource, GrafanaTheme2, PanelData, ThresholdsConfig } from '@grafana/data';
-import { PanelRenderer } from '@grafana/runtime';
-import { GraphFieldConfig, GraphTresholdsStyleMode } from '@grafana/schema';
-import { PanelContext, PanelContextProvider, useStyles2 } from '@grafana/ui';
+import { GrafanaTheme2, isTimeSeriesFrames, PanelData, ThresholdsConfig } from '@grafana/data';
+import { GraphTresholdsStyleMode, LoadingState } from '@grafana/schema';
+import { useStyles2 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
-import { PanelOptions } from 'app/plugins/panel/table/panelcfg.gen';
+import { GraphContainer } from 'app/features/explore/Graph/GraphContainer';
 
-import { useVizHeight } from '../../hooks/useVizHeight';
-import { SupportedPanelPlugins, PanelPluginsButtonGroup } from '../PanelPluginsButtonGroup';
+import { ExpressionResult } from '../expressions/Expression';
+
+import { getStatusMessage } from './util';
 
 interface Props {
   data: PanelData;
-  currentPanel: SupportedPanelPlugins;
-  changePanel: (panel: SupportedPanelPlugins) => void;
   thresholds?: ThresholdsConfig;
   thresholdsType?: GraphTresholdsStyleMode;
   onThresholdsChange?: (thresholds: ThresholdsConfig) => void;
 }
 
-type PanelFieldConfig = FieldConfigSource<GraphFieldConfig>;
-
-export const VizWrapper = ({
-  data,
-  currentPanel,
-  changePanel,
-  thresholds,
-  thresholdsType = GraphTresholdsStyleMode.Line,
-}: Props) => {
-  const [options, setOptions] = useState<PanelOptions>({
-    frameIndex: 0,
-    showHeader: true,
-  });
-  const vizHeight = useVizHeight(data, currentPanel, options.frameIndex);
-  const styles = useStyles2(getStyles(vizHeight));
-
-  const [fieldConfig, setFieldConfig] = useState<PanelFieldConfig>(defaultFieldConfig(data, thresholds));
-
-  useEffect(() => {
-    setFieldConfig((fieldConfig) => ({
-      ...fieldConfig,
-      defaults: {
-        ...fieldConfig.defaults,
-        thresholds: thresholds,
-        unit: defaultUnit(data),
-        custom: {
-          ...fieldConfig.defaults.custom,
-          thresholdsStyle: {
-            mode: thresholdsType,
-          },
-        },
-      },
-    }));
-  }, [thresholds, setFieldConfig, data, thresholdsType]);
-
-  const context: PanelContext = useMemo(
-    () => ({
-      eventBus: appEvents,
-      canEditThresholds: false,
-      showThresholds: true,
-    }),
-    []
-  );
-
-  if (!options || !data) {
-    return null;
-  }
+/** The VizWrapper is just a simple component that renders either a table or a graph based on the type of data we receive from "PanelData" */
+export const VizWrapper = ({ data, thresholds, thresholdsType }: Props) => {
+  const styles = useStyles2(getStyles);
+  const isTimeSeriesData = isTimeSeriesFrames(data.series);
+  const statusMessage = getStatusMessage(data);
+  const thresholdsStyle = thresholdsType ? { mode: thresholdsType } : undefined;
+  const timeRange = {
+    from: data.timeRange.from.valueOf(),
+    to: data.timeRange.to.valueOf(),
+  };
 
   return (
     <div className={styles.wrapper}>
-      <div className={styles.buttonGroup}>
-        <PanelPluginsButtonGroup onChange={changePanel} value={currentPanel} />
-      </div>
-      <AutoSizer>
-        {({ width }) => {
-          if (width === 0) {
-            return null;
-          }
-          return (
-            <div style={{ height: `${vizHeight}px`, width: `${width}px` }}>
-              <PanelContextProvider value={context}>
-                <PanelRenderer
-                  height={vizHeight}
-                  width={width}
-                  data={data}
-                  pluginId={currentPanel}
-                  title="title"
-                  onOptionsChange={setOptions}
-                  options={options}
-                  fieldConfig={fieldConfig}
-                />
-              </PanelContextProvider>
-            </div>
-          );
-        }}
+      <AutoSizer disableHeight>
+        {({ width }) => (
+          <div style={{ width }}>
+            {isTimeSeriesData ? (
+              <GraphContainer
+                loading={data.state === LoadingState.Loading}
+                statusMessage={statusMessage}
+                data={data.series}
+                eventBus={appEvents}
+                height={300}
+                width={width}
+                absoluteRange={timeRange}
+                timeZone="browser"
+                onChangeTime={() => {}}
+                splitOpenFn={() => {}}
+                loadingState={data.state}
+                thresholdsConfig={thresholds}
+                thresholdsStyle={thresholdsStyle}
+              />
+            ) : (
+              <div className={styles.instantVectorResultWrapper}>
+                <header className={styles.title}>Table</header>
+                <ExpressionResult series={data.series} />
+              </div>
+            )}
+          </div>
+        )}
       </AutoSizer>
     </div>
   );
 };
 
-const getStyles = (visHeight: number) => (theme: GrafanaTheme2) => ({
+const getStyles = (theme: GrafanaTheme2) => ({
   wrapper: css`
-    padding: 0 ${theme.spacing(2)};
-    height: ${visHeight + theme.spacing.gridSize * 4}px;
+    width: 100%;
+    position: relative;
   `,
-  buttonGroup: css`
+  instantVectorResultWrapper: css`
+    border: solid 1px ${theme.colors.border.medium};
+    border-radius: ${theme.shape.borderRadius()};
+    padding: 0;
+
     display: flex;
-    justify-content: flex-end;
+    flex-direction: column;
+    flex-wrap: nowrap;
   `,
+  title: css({
+    label: 'panel-title',
+    padding: theme.spacing(),
+    textOverflow: 'ellipsis',
+    overflow: 'hidden',
+    whiteSpace: 'nowrap',
+    fontSize: theme.typography.h6.fontSize,
+    fontWeight: theme.typography.h6.fontWeight,
+  }),
 });
-
-function defaultUnit(data: PanelData): string | undefined {
-  return data.series[0]?.fields.find((field) => field.type === 'number')?.config.unit;
-}
-
-function defaultFieldConfig(data: PanelData, thresholds?: ThresholdsConfig): PanelFieldConfig {
-  if (!thresholds) {
-    return { defaults: {}, overrides: [] };
-  }
-
-  return {
-    defaults: {
-      thresholds: thresholds,
-      unit: defaultUnit(data),
-      custom: {
-        thresholdsStyle: {
-          mode: GraphTresholdsStyleMode.Line,
-        },
-      },
-    },
-    overrides: [],
-  };
-}
diff --git a/public/app/features/alerting/unified/components/rule-editor/util.test.ts b/public/app/features/alerting/unified/components/rule-editor/util.test.ts
index 52d4c86ee0b..64b24bc9b87 100644
--- a/public/app/features/alerting/unified/components/rule-editor/util.test.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/util.test.ts
@@ -285,6 +285,56 @@ describe('getThresholdsForQueries', () => {
     expect(thresholdsClassic).toMatchSnapshot();
   });
 
+  it('should not throw if no refId exists', () => {
+    const dataQuery: AlertQuery = {
+      refId: 'A',
+      datasourceUid: 'abc123',
+      queryType: '',
+      relativeTimeRange: {
+        from: 600,
+        to: 0,
+      },
+      model: {
+        refId: 'A',
+      },
+    };
+
+    const classicCondition = {
+      refId: 'B',
+      datasourceUid: '__expr__',
+      queryType: '',
+      model: {
+        refId: 'B',
+        type: 'classic_conditions',
+        datasource: ExpressionDatasourceRef,
+        conditions: [
+          {
+            type: 'query',
+            evaluator: {
+              params: [0],
+              type: 'gt',
+            },
+            operator: {
+              type: 'and',
+            },
+            query: {
+              params: [''],
+            },
+            reducer: {
+              params: [],
+              type: 'last',
+            },
+          },
+        ],
+      },
+    };
+
+    expect(() => {
+      const thresholds = getThresholdsForQueries([dataQuery, classicCondition]);
+      expect(thresholds).toStrictEqual({});
+    }).not.toThrowError();
+  });
+
   it('should work for within_range', () => {
     const queries = createThresholdExample('within_range');
     const thresholds = getThresholdsForQueries(queries);
diff --git a/public/app/features/alerting/unified/components/rule-editor/util.ts b/public/app/features/alerting/unified/components/rule-editor/util.ts
index 89dfe3e2717..626551539af 100644
--- a/public/app/features/alerting/unified/components/rule-editor/util.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/util.ts
@@ -1,7 +1,7 @@
 import { ValidateResult } from 'react-hook-form';
 
-import { DataFrame, ThresholdsConfig, ThresholdsMode, isTimeSeriesFrames } from '@grafana/data';
-import { GraphTresholdsStyleMode } from '@grafana/schema';
+import { DataFrame, ThresholdsConfig, ThresholdsMode, isTimeSeriesFrames, PanelData } from '@grafana/data';
+import { GraphTresholdsStyleMode, LoadingState } from '@grafana/schema';
 import { config } from 'app/core/config';
 import { EvalFunction } from 'app/features/alerting/state/alertDef';
 import { isExpressionQuery } from 'app/features/expressions/guards';
@@ -114,13 +114,12 @@ export function warningFromSeries(series: DataFrame[]): Error | undefined {
   return warning ? new Error(warning) : undefined;
 }
 
-export type ThresholdDefinitions = Record<
-  string,
-  {
-    config: ThresholdsConfig;
-    mode: GraphTresholdsStyleMode;
-  }
->;
+export type ThresholdDefinition = {
+  config: ThresholdsConfig;
+  mode: GraphTresholdsStyleMode;
+};
+
+export type ThresholdDefinitions = Record<string, ThresholdDefinition>;
 
 /**
  * This function will retrieve threshold definitions for the given array of data and expression queries.
@@ -147,11 +146,17 @@ export function getThresholdsForQueries(queries: AlertQuery[]) {
     // the time series panel does not support both.
     const hasRangeThreshold = query.model.conditions.some(isRangeCondition);
 
-    query.model.conditions.forEach((condition, index) => {
+    query.model.conditions.forEach((condition) => {
       const threshold = condition.evaluator.params;
 
       // "classic_conditions" use `condition.query.params[]` and "threshold" uses `query.model.expression`
       const refId = condition.query.params[0] ?? query.model.expression;
+
+      // if an expression hasn't been linked to a data query yet, it won't have a refId
+      if (!refId) {
+        return;
+      }
+
       const isRangeThreshold = isRangeCondition(condition);
 
       try {
@@ -261,6 +266,9 @@ export function getThresholdsForQueries(queries: AlertQuery[]) {
     // now also sort the threshold values, if we don't then they will look weird in the time series panel
     // TODO this doesn't work for negative values for now, those need to be sorted inverse
     thresholds[refId].config.steps.sort((a, b) => a.value - b.value);
+
+    // also make sure we remove any "undefined" values from our steps in case the threshold config is incomplete
+    thresholds[refId].config.steps = thresholds[refId].config.steps.filter((step) => step.value !== undefined);
   }
 
   return thresholds;
@@ -271,3 +279,17 @@ function isRangeCondition(condition: ClassicCondition) {
     condition.evaluator.type === EvalFunction.IsWithinRange || condition.evaluator.type === EvalFunction.IsOutsideRange
   );
 }
+
+export function getStatusMessage(data: PanelData): string | undefined {
+  const genericErrorMessage = 'Failed to fetch data';
+  if (data.state !== LoadingState.Error) {
+    return;
+  }
+
+  const errors = data.errors;
+  if (errors?.length) {
+    return errors.map((error) => error.message ?? genericErrorMessage).join(', ');
+  }
+
+  return data.error?.message ?? genericErrorMessage;
+}
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
index 9c01e69ecc6..bce99753e24 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
@@ -1,9 +1,9 @@
-import { css, cx } from '@emotion/css';
-import React, { useCallback, useState } from 'react';
-import AutoSizer from 'react-virtualized-auto-sizer';
+import { css } from '@emotion/css';
+import React, { useCallback } from 'react';
 
 import {
   DataSourceInstanceSettings,
+  DataSourceJsonData,
   DateTime,
   dateTime,
   GrafanaTheme2,
@@ -11,20 +11,20 @@ import {
   RelativeTimeRange,
   urlUtil,
 } from '@grafana/data';
-import { config, getDataSourceSrv, PanelRenderer } from '@grafana/runtime';
-import { Alert, CodeEditor, DateTimePicker, LinkButton, useStyles2, useTheme2 } from '@grafana/ui';
+import { config } from '@grafana/runtime';
+import { DateTimePicker, LinkButton, useStyles2 } from '@grafana/ui';
 import { isExpressionQuery } from 'app/features/expressions/guards';
-import { PanelOptions } from 'app/plugins/panel/table/panelcfg.gen';
 import { AccessControlAction } from 'app/types';
 import { AlertDataQuery, AlertQuery } from 'app/types/unified-alerting-dto';
 
-import { TABLE, TIMESERIES } from '../../utils/constants';
 import { Authorize } from '../Authorize';
-import { PanelPluginsButtonGroup, SupportedPanelPlugins } from '../PanelPluginsButtonGroup';
+import { VizWrapper } from '../rule-editor/VizWrapper';
+import { ThresholdDefinition } from '../rule-editor/util';
 
-interface RuleViewerVisualizationProps
-  extends Pick<AlertQuery, 'refId' | 'datasourceUid' | 'model' | 'relativeTimeRange'> {
+interface RuleViewerVisualizationProps extends Pick<AlertQuery, 'refId' | 'model' | 'relativeTimeRange'> {
+  dsSettings: DataSourceInstanceSettings<DataSourceJsonData>;
   data?: PanelData;
+  thresholds?: ThresholdDefinition;
   onTimeRangeChange: (range: RelativeTimeRange) => void;
   className?: string;
 }
@@ -33,22 +33,15 @@ const headerHeight = 4;
 
 export function RuleViewerVisualization({
   data,
-  refId,
   model,
-  datasourceUid,
+  thresholds,
+  dsSettings,
   relativeTimeRange,
   onTimeRangeChange,
   className,
 }: RuleViewerVisualizationProps): JSX.Element | null {
-  const theme = useTheme2();
   const styles = useStyles2(getStyles);
-  const defaultPanel = isExpressionQuery(model) ? TABLE : TIMESERIES;
-  const [panel, setPanel] = useState<SupportedPanelPlugins>(defaultPanel);
-  const dsSettings = getDataSourceSrv().getInstanceSettings(datasourceUid);
-  const [options, setOptions] = useState<PanelOptions>({
-    frameIndex: 0,
-    showHeader: true,
-  });
+  const isExpression = isExpressionQuery(model);
 
   const onTimeChange = useCallback(
     (newDateTime: DateTime) => {
@@ -70,70 +63,29 @@ export function RuleViewerVisualization({
     return null;
   }
 
-  if (!dsSettings) {
-    return (
-      <div className={cx(styles.content, className)}>
-        <Alert title="Could not find datasource for query" />
-        <CodeEditor
-          width="100%"
-          height="250px"
-          language="json"
-          showLineNumbers={false}
-          showMiniMap={false}
-          value={JSON.stringify(model, null, '\t')}
-          readOnly={true}
-        />
-      </div>
-    );
-  }
-
   return (
-    <div className={cx(styles.content, className)}>
-      <AutoSizer>
-        {({ width, height }) => {
-          return (
-            <div style={{ width, height }}>
-              <div className={styles.header}>
-                <div className={styles.actions}>
-                  {!isExpressionQuery(model) && relativeTimeRange ? (
-                    <DateTimePicker
-                      date={setDateTime(relativeTimeRange.to)}
-                      onChange={onTimeChange}
-                      maxDate={new Date()}
-                    />
-                  ) : null}
-                  <PanelPluginsButtonGroup onChange={setPanel} value={panel} size="md" />
-                  <Authorize actions={[AccessControlAction.DataSourcesExplore]}>
-                    {!isExpressionQuery(model) && (
-                      <>
-                        <div className={styles.spacing} />
-                        <LinkButton
-                          size="md"
-                          variant="secondary"
-                          icon="compass"
-                          target="_blank"
-                          href={createExploreLink(dsSettings, model)}
-                        >
-                          View in Explore
-                        </LinkButton>
-                      </>
-                    )}
-                  </Authorize>
-                </div>
-              </div>
-              <PanelRenderer
-                height={height - theme.spacing.gridSize * headerHeight}
-                width={width}
-                data={data}
-                pluginId={panel}
-                title=""
-                onOptionsChange={setOptions}
-                options={options}
-              />
-            </div>
-          );
-        }}
-      </AutoSizer>
+    <div className={className}>
+      <div className={styles.header}>
+        <div className={styles.actions}>
+          {!isExpression && relativeTimeRange ? (
+            <DateTimePicker date={setDateTime(relativeTimeRange.to)} onChange={onTimeChange} maxDate={new Date()} />
+          ) : null}
+          <Authorize actions={[AccessControlAction.DataSourcesExplore]}>
+            {!isExpression && (
+              <LinkButton
+                size="md"
+                variant="secondary"
+                icon="compass"
+                target="_blank"
+                href={createExploreLink(dsSettings, model)}
+              >
+                View in Explore
+              </LinkButton>
+            )}
+          </Authorize>
+        </div>
+      </div>
+      <VizWrapper data={data} thresholds={thresholds?.config} thresholdsType={thresholds?.mode} />
     </div>
   );
 }
@@ -142,12 +94,12 @@ function createExploreLink(settings: DataSourceInstanceSettings, model: AlertDat
   const { name } = settings;
   const { refId, ...rest } = model;
 
-  /**
+  /*
     In my testing I've found some alerts that don't have a data source embedded inside the model.
-   
+
     At this moment in time it is unclear to me why some alert definitions not have a data source embedded in the model.
     Ideally we'd resolve the datasource name to the proper datasource Ref "{ type: string, uid: string }" and pass that in to the model.
-   
+
     I don't think that should happen here, the fact that the datasource ref is sometimes missing here is a symptom of another cause. (Gilles)
    */
   return urlUtil.renderUrl(`${config.appSubUrl}/explore`, {
@@ -161,16 +113,13 @@ function createExploreLink(settings: DataSourceInstanceSettings, model: AlertDat
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    content: css`
-      width: 100%;
-      height: 250px;
-    `,
     header: css`
       height: ${theme.spacing(headerHeight)};
       display: flex;
       align-items: center;
       justify-content: flex-end;
       white-space: nowrap;
+      margin-bottom: ${theme.spacing(2)};
     `,
     refId: css`
       font-weight: ${theme.typography.fontWeightMedium};
@@ -186,9 +135,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: flex;
       align-items: center;
     `,
-    spacing: css`
-      padding: ${theme.spacing(0, 1, 0, 0)};
-    `,
     errorMessage: css`
       white-space: pre-wrap;
     `,
diff --git a/public/app/features/explore/Graph/ExploreGraph.tsx b/public/app/features/explore/Graph/ExploreGraph.tsx
index 6ff56904d6e..2eeb0fee9cf 100644
--- a/public/app/features/explore/Graph/ExploreGraph.tsx
+++ b/public/app/features/explore/Graph/ExploreGraph.tsx
@@ -15,11 +15,18 @@ import {
   LoadingState,
   SplitOpen,
   TimeZone,
+  ThresholdsConfig,
   DashboardCursorSync,
   EventBus,
 } from '@grafana/data';
 import { PanelRenderer } from '@grafana/runtime';
-import { GraphDrawStyle, LegendDisplayMode, TooltipDisplayMode, SortOrder } from '@grafana/schema';
+import {
+  GraphDrawStyle,
+  LegendDisplayMode,
+  TooltipDisplayMode,
+  SortOrder,
+  GraphThresholdsStyleConfig,
+} from '@grafana/schema';
 import {
   Button,
   Icon,
@@ -29,13 +36,14 @@ import {
   useStyles2,
   useTheme2,
 } from '@grafana/ui';
+import { GraphFieldConfig } from 'app/plugins/panel/graph/types';
 import { defaultGraphConfig, getGraphFieldConfig } from 'app/plugins/panel/timeseries/config';
 import { PanelOptions as TimeSeriesOptions } from 'app/plugins/panel/timeseries/panelcfg.gen';
 import { ExploreGraphStyle } from 'app/types';
 
 import { seriesVisibilityConfigFactory } from '../../dashboard/dashgrid/SeriesVisibilityConfigFactory';
 
-import { applyGraphStyle } from './exploreGraphStyleUtils';
+import { applyGraphStyle, applyThresholdsConfig } from './exploreGraphStyleUtils';
 import { useStructureRev } from './useStructureRev';
 
 const MAX_NUMBER_OF_TIME_SERIES = 20;
@@ -55,6 +63,8 @@ interface Props {
   graphStyle: ExploreGraphStyle;
   anchorToZero?: boolean;
   yAxisMaximum?: number;
+  thresholdsConfig?: ThresholdsConfig;
+  thresholdsStyle?: GraphThresholdsStyleConfig;
   eventBus: EventBus;
 }
 
@@ -73,6 +83,8 @@ export function ExploreGraph({
   tooltipDisplayMode = TooltipDisplayMode.Single,
   anchorToZero = false,
   yAxisMaximum,
+  thresholdsConfig,
+  thresholdsStyle,
   eventBus,
 }: Props) {
   const theme = useTheme2();
@@ -93,7 +105,7 @@ export function ExploreGraph({
     []
   );
 
-  const [fieldConfig, setFieldConfig] = useState<FieldConfigSource>({
+  const [fieldConfig, setFieldConfig] = useState<FieldConfigSource<GraphFieldConfig>>({
     defaults: {
       min: anchorToZero ? 0 : undefined,
       max: yAxisMaximum || undefined,
@@ -109,10 +121,10 @@ export function ExploreGraph({
     overrides: [],
   });
 
-  const styledFieldConfig = useMemo(
-    () => applyGraphStyle(fieldConfig, graphStyle, yAxisMaximum),
-    [fieldConfig, graphStyle, yAxisMaximum]
-  );
+  const styledFieldConfig = useMemo(() => {
+    const withGraphStyle = applyGraphStyle(fieldConfig, graphStyle, yAxisMaximum);
+    return applyThresholdsConfig(withGraphStyle, thresholdsStyle, thresholdsConfig);
+  }, [fieldConfig, graphStyle, yAxisMaximum, thresholdsConfig, thresholdsStyle]);
 
   const dataWithConfig = useMemo(() => {
     return applyFieldOverrides({
diff --git a/public/app/features/explore/Graph/GraphContainer.tsx b/public/app/features/explore/Graph/GraphContainer.tsx
index ca3ce6cf752..2413636300d 100644
--- a/public/app/features/explore/Graph/GraphContainer.tsx
+++ b/public/app/features/explore/Graph/GraphContainer.tsx
@@ -1,7 +1,15 @@
 import React, { useCallback, useState } from 'react';
 
-import { DataFrame, EventBus, AbsoluteTimeRange, TimeZone, SplitOpen, LoadingState } from '@grafana/data';
-import { PanelChrome } from '@grafana/ui';
+import {
+  DataFrame,
+  EventBus,
+  AbsoluteTimeRange,
+  TimeZone,
+  SplitOpen,
+  LoadingState,
+  ThresholdsConfig,
+} from '@grafana/data';
+import { GraphThresholdsStyleConfig, PanelChrome, PanelChromeProps } from '@grafana/ui';
 import { ExploreGraphStyle } from 'app/types';
 
 import { storeGraphStyle } from '../state/utils';
@@ -10,18 +18,18 @@ import { ExploreGraph } from './ExploreGraph';
 import { ExploreGraphLabel } from './ExploreGraphLabel';
 import { loadGraphStyle } from './utils';
 
-interface Props {
+interface Props extends Pick<PanelChromeProps, 'width' | 'height' | 'statusMessage'> {
   loading: boolean;
   data: DataFrame[];
   annotations?: DataFrame[];
   eventBus: EventBus;
-  height: number;
-  width: number;
   absoluteRange: AbsoluteTimeRange;
   timeZone: TimeZone;
   onChangeTime: (absoluteRange: AbsoluteTimeRange) => void;
   splitOpenFn: SplitOpen;
   loadingState: LoadingState;
+  thresholdsConfig?: ThresholdsConfig;
+  thresholdsStyle?: GraphThresholdsStyleConfig;
 }
 
 export const GraphContainer = ({
@@ -34,7 +42,10 @@ export const GraphContainer = ({
   annotations,
   onChangeTime,
   splitOpenFn,
+  thresholdsConfig,
+  thresholdsStyle,
   loadingState,
+  statusMessage,
 }: Props) => {
   const [graphStyle, setGraphStyle] = useState(loadGraphStyle);
 
@@ -49,6 +60,7 @@ export const GraphContainer = ({
       width={width}
       height={height}
       loadingState={loadingState}
+      statusMessage={statusMessage}
       actions={<ExploreGraphLabel graphStyle={graphStyle} onChangeGraphStyle={onGraphStyleChange} />}
     >
       {(innerWidth, innerHeight) => (
@@ -63,6 +75,8 @@ export const GraphContainer = ({
           annotations={annotations}
           splitOpenFn={splitOpenFn}
           loadingState={loadingState}
+          thresholdsConfig={thresholdsConfig}
+          thresholdsStyle={thresholdsStyle}
           eventBus={eventBus}
         />
       )}
diff --git a/public/app/features/explore/Graph/exploreGraphStyleUtils.ts b/public/app/features/explore/Graph/exploreGraphStyleUtils.ts
index 1bbf6f7ad7a..fc121229a76 100644
--- a/public/app/features/explore/Graph/exploreGraphStyleUtils.ts
+++ b/public/app/features/explore/Graph/exploreGraphStyleUtils.ts
@@ -1,7 +1,7 @@
 import produce from 'immer';
 
-import { FieldConfigSource } from '@grafana/data';
-import { GraphDrawStyle, GraphFieldConfig, StackingMode } from '@grafana/schema';
+import { FieldConfigSource, ThresholdsConfig } from '@grafana/data';
+import { GraphDrawStyle, GraphFieldConfig, GraphThresholdsStyleConfig, StackingMode } from '@grafana/schema';
 import { ExploreGraphStyle } from 'app/types';
 
 export type FieldConfig = FieldConfigSource<GraphFieldConfig>;
@@ -57,3 +57,15 @@ export function applyGraphStyle(config: FieldConfig, style: ExploreGraphStyle, m
     }
   });
 }
+
+export function applyThresholdsConfig(
+  config: FieldConfig,
+  thresholdsStyle?: GraphThresholdsStyleConfig,
+  thresholdsConfig?: ThresholdsConfig
+): FieldConfig {
+  return produce(config, (draft) => {
+    draft.defaults.thresholds = thresholdsConfig;
+    draft.defaults.custom = draft.defaults.custom ?? {};
+    draft.defaults.custom.thresholdsStyle = thresholdsStyle;
+  });
+}
diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index efcec635deb..7127fef7677 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -46,6 +46,7 @@ interface Props<TQuery extends DataQuery> {
   index: number;
   dataSource: DataSourceInstanceSettings;
   onChangeDataSource?: (dsSettings: DataSourceInstanceSettings) => void;
+  onDataSourceLoaded?: (instance: DataSourceApi) => void;
   renderHeaderExtras?: () => ReactNode;
   onAddQuery: (query: TQuery) => void;
   onRemoveQuery: (query: TQuery) => void;
@@ -162,6 +163,10 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
       datasource = await this.dataSourceSrv.get();
     }
 
+    if (typeof this.props.onDataSourceLoaded === 'function') {
+      this.props.onDataSourceLoaded(datasource);
+    }
+
     this.setState({
       datasource: datasource as unknown as DataSourceApi<TQuery>,
       queriedDataSourceIdentifier: interpolatedUID,
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index e63e7ed127f..889a5632c79 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -835,6 +835,22 @@ export class LokiDatasource
   getQueryHints(query: LokiQuery, result: DataFrame[]): QueryHint[] {
     return getQueryHints(query.expr, result);
   }
+
+  getDefaultQuery(app: CoreApp): LokiQuery {
+    const defaults = { refId: 'A', expr: '' };
+
+    if (app === CoreApp.UnifiedAlerting) {
+      return {
+        ...defaults,
+        queryType: LokiQueryType.Instant,
+      };
+    }
+
+    return {
+      ...defaults,
+      queryType: LokiQueryType.Range,
+    };
+  }
 }
 
 // NOTE: these two functions are very similar to the escapeLabelValueIn* functions
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.tsx
index 4b0c4937188..8a2403906e1 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.tsx
@@ -1263,6 +1263,33 @@ export class PrometheusDatasource
   getCacheDurationInMinutes(): number {
     return getClientCacheDurationInMinutes(this.cacheLevel);
   }
+
+  getDefaultQuery(app: CoreApp): PromQuery {
+    const defaults = {
+      refId: 'A',
+      expr: '',
+      range: true,
+      instant: false,
+    };
+
+    if (app === CoreApp.UnifiedAlerting) {
+      return {
+        ...defaults,
+        instant: true,
+        range: false,
+      };
+    }
+
+    if (app === CoreApp.Explore) {
+      return {
+        ...defaults,
+        instant: true,
+        range: true,
+      };
+    }
+
+    return defaults;
+  }
 }
 
 /**

From 4d96afa979a1789ae7b2f2d90be245cba4ebe8ec Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Thu, 27 Apr 2023 16:51:31 +0200
Subject: [PATCH 482/729] Check add DS permissions in advanced DS picker
 (#67237)

---
 .../datasources/components/picker/DataSourceModal.tsx        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index 4c18c10b66a..5d101c5b4c0 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -16,9 +16,11 @@ import {
   Icon,
 } from '@grafana/ui';
 import { config } from 'app/core/config';
+import { contextSrv } from 'app/core/core';
 import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants';
 import * as DFImport from 'app/features/dataframe-import';
 import { DATASOURCES_ROUTES } from 'app/features/datasources/constants';
+import { AccessControlAction } from 'app/types';
 
 import { DataSourceList } from './DataSourceList';
 
@@ -51,6 +53,7 @@ export function DataSourceModal({
 }: DataSourceModalProps) {
   const styles = useStyles2(getDataSourceModalStyles);
   const [search, setSearch] = useState('');
+  const hasCreateRights = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
   const analyticsInteractionSrc = reportedInteractionFrom || 'modal';
   const newDataSourceURL = config.featureToggles.dataConnectionsConsole
     ? CONNECTIONS_ROUTES.DataSourcesNew
@@ -147,6 +150,8 @@ export function DataSourceModal({
           <LinkButton
             variant="secondary"
             href={newDataSourceURL}
+            disabled={!hasCreateRights}
+            tooltip={!hasCreateRights ? 'You do not have permission to configure new data sources' : undefined}
             onClick={() => {
               reportInteraction(INTERACTION_EVENT_NAME, {
                 item: INTERACTION_ITEM.CONFIG_NEW_DS,

From a5206a1cda5701fa42e1b025e456c6a369e7591b Mon Sep 17 00:00:00 2001
From: Arati R <33031346+suntala@users.noreply.github.com>
Date: Thu, 27 Apr 2023 17:00:09 +0200
Subject: [PATCH 483/729] Nested folders: Provide count of all descendant
 dashboards and folders (#67184)

* Add a method for getting descendant folders
* Include dashboard count for descendant folders
* Return subfolder count
* Replace references to children with descendants
* Update openapi specs
* Add test for descendant counts
* Add logging to GetDescendantCounts
---
 pkg/api/api.go                                |   2 +-
 pkg/api/folder.go                             |  18 +-
 pkg/services/folder/folderimpl/folder.go      |  44 ++-
 pkg/services/folder/folderimpl/folder_test.go | 276 ++++++++++--------
 pkg/services/folder/foldertest/foldertest.go  |  12 +-
 pkg/services/folder/model.go                  |   8 +-
 pkg/services/folder/service.go                |   2 +-
 public/api-merged.json                        |  22 +-
 public/openapi3.json                          |  22 +-
 9 files changed, 237 insertions(+), 169 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 72f86ea6a34..e72f7c8768a 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -462,7 +462,7 @@ func (hs *HTTPServer) registerRoutes() {
 				folderUidRoute.Put("/", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersWrite, uidScope)), routing.Wrap(hs.UpdateFolder))
 				folderUidRoute.Post("/move", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersWrite, uidScope)), routing.Wrap(hs.MoveFolder))
 				folderUidRoute.Delete("/", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersDelete, uidScope)), routing.Wrap(hs.DeleteFolder))
-				folderUidRoute.Get("/counts", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersRead, uidScope)), routing.Wrap(hs.GetFolderChildrenCounts))
+				folderUidRoute.Get("/counts", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersRead, uidScope)), routing.Wrap(hs.GetFolderDescendantCounts))
 
 				folderUidRoute.Group("/permissions", func(folderPermissionRoute routing.RouteRegister) {
 					folderPermissionRoute.Get("/", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionFoldersPermissionsRead, uidScope)), routing.Wrap(hs.GetFolderPermissionList))
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 1f510d4396b..34497df298b 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -299,19 +299,19 @@ func (hs *HTTPServer) DeleteFolder(c *contextmodel.ReqContext) response.Response
 	return response.JSON(http.StatusOK, "")
 }
 
-// swagger:route GET /folders/{folder_uid}/counts folders getFolderChildrenCounts
+// swagger:route GET /folders/{folder_uid}/counts folders getFolderDescendantCounts
 //
 // Gets the count of each descendant of a folder by kind. The folder is identified by UID.
 //
 // Responses:
-// 200: getFolderChildrenCountsResponse
+// 200: getFolderDescendantCountsResponse
 // 401: unauthorisedError
 // 403: forbiddenError
 // 404: notFoundError
 // 500: internalServerError
-func (hs *HTTPServer) GetFolderChildrenCounts(c *contextmodel.ReqContext) response.Response {
+func (hs *HTTPServer) GetFolderDescendantCounts(c *contextmodel.ReqContext) response.Response {
 	uid := web.Params(c.Req)[":uid"]
-	counts, err := hs.folderService.GetChildrenCounts(c.Req.Context(), &folder.GetChildrenCountsQuery{OrgID: c.OrgID, UID: &uid, SignedInUser: c.SignedInUser})
+	counts, err := hs.folderService.GetDescendantCounts(c.Req.Context(), &folder.GetDescendantCountsQuery{OrgID: c.OrgID, UID: &uid, SignedInUser: c.SignedInUser})
 	if err != nil {
 		return apierrors.ToFolderErrorResponse(err)
 	}
@@ -546,16 +546,16 @@ type DeleteFolderResponse struct {
 	} `json:"body"`
 }
 
-// swagger:parameters getFolderChildrenCounts
-type GetFolderChildrenCountsParams struct {
+// swagger:parameters getFolderDescendantCounts
+type GetFolderDescendantCountsParams struct {
 	// in:path
 	// required:true
 	FolderUID string `json:"folder_uid"`
 }
 
-// swagger:response getFolderChildrenCountsResponse
-type GetFolderChildrenCountsResponse struct {
+// swagger:response getFolderDescendantCountsResponse
+type GetFolderDescendantCountsResponse struct {
 	// The response message
 	// in: body
-	Body folder.ChildrenCounts `json:"body"`
+	Body folder.DescendantCounts `json:"body"`
 }
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index cde1174ce9c..83a84bc9ea9 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -20,6 +20,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/services/store/entity"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -623,7 +624,8 @@ func (s *Service) nestedFolderDelete(ctx context.Context, cmd *folder.DeleteFold
 	return result, nil
 }
 
-func (s *Service) GetChildrenCounts(ctx context.Context, cmd *folder.GetChildrenCountsQuery) (folder.ChildrenCounts, error) {
+func (s *Service) GetDescendantCounts(ctx context.Context, cmd *folder.GetDescendantCountsQuery) (folder.DescendantCounts, error) {
+	logger := s.log.FromContext(ctx)
 	if cmd.SignedInUser == nil {
 		return nil, folder.ErrBadRequest.Errorf("missing signed-in user")
 	}
@@ -634,15 +636,47 @@ func (s *Service) GetChildrenCounts(ctx context.Context, cmd *folder.GetChildren
 		return nil, folder.ErrBadRequest.Errorf("invalid orgID")
 	}
 
-	countsMap := make(folder.ChildrenCounts, len(s.registry))
+	result := []string{*cmd.UID}
+	countsMap := make(folder.DescendantCounts, len(s.registry)+1)
+	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+		subfolders, err := s.getNestedFolders(ctx, cmd.OrgID, *cmd.UID)
+		if err != nil {
+			logger.Error("failed to get subfolders", "error", err)
+			return nil, err
+		}
+		result = append(result, subfolders...)
+		countsMap[entity.StandardKindFolder] = int64(len(subfolders))
+	}
+
 	for _, v := range s.registry {
-		c, err := v.CountInFolder(ctx, cmd.OrgID, *cmd.UID, cmd.SignedInUser)
+		for _, folder := range result {
+			c, err := v.CountInFolder(ctx, cmd.OrgID, folder, cmd.SignedInUser)
+			if err != nil {
+				logger.Error("failed to count folder descendants", "error", err)
+				return nil, err
+			}
+			countsMap[v.Kind()] += c
+		}
+	}
+	return countsMap, nil
+}
+
+func (s *Service) getNestedFolders(ctx context.Context, orgID int64, uid string) ([]string, error) {
+	result := []string{}
+	folders, err := s.store.GetChildren(ctx, folder.GetChildrenQuery{UID: uid, OrgID: orgID})
+	if err != nil {
+		return nil, err
+	}
+
+	for _, f := range folders {
+		result = append(result, f.UID)
+		subfolders, err := s.getNestedFolders(ctx, f.OrgID, f.UID)
 		if err != nil {
 			return nil, err
 		}
-		countsMap[v.Kind()] += c
+		result = append(result, subfolders...)
 	}
-	return countsMap, nil
+	return result, nil
 }
 
 // MakeUserAdmin is copy of DashboardServiceImpl.MakeUserAdmin
diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go
index 80e29f72c4f..73818503c0e 100644
--- a/pkg/services/folder/folderimpl/folder_test.go
+++ b/pkg/services/folder/folderimpl/folder_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -322,7 +321,7 @@ func TestIntegrationFolderService(t *testing.T) {
 	})
 }
 
-func TestIntegrationDeleteNestedFolders(t *testing.T) {
+func TestIntegrationNestedFolderService(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
@@ -347,6 +346,7 @@ func TestIntegrationDeleteNestedFolders(t *testing.T) {
 		bus:                  bus.ProvideBus(tracing.InitializeTracerForTest()),
 		db:                   db,
 		accessControl:        acimpl.ProvideAccessControl(cfg),
+		registry:             make(map[string]folder.RegistryService),
 	}
 
 	signedInUser := user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{
@@ -358,77 +358,170 @@ func TestIntegrationDeleteNestedFolders(t *testing.T) {
 		SignedInUser: &signedInUser,
 	}
 
-	t.Run("With nested folder feature flag on", func(t *testing.T) {
-		origNewGuardian := guardian.New
-		guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
+	t.Run("Should get descendant counts", func(t *testing.T) {
+		ac := acmock.New()
+		folderPermissions := acmock.NewMockedPermissionsService()
+		dashboardPermissions := acmock.NewMockedPermissionsService()
+		depth := 5
+		t.Run("With nested folder feature flag on", func(t *testing.T) {
+			origNewGuardian := guardian.New
+			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
 
-		serviceWithFlagOn.store = nestedFolderStore
-		ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, 3, "", createCmd)
+			_, err := service.ProvideDashboardServiceImpl(cfg, dashStore, folderStore, nil, featuresFlagOn, folderPermissions, dashboardPermissions, ac, serviceWithFlagOn)
+			require.NoError(t, err)
 
-		deleteCmd := folder.DeleteFolderCommand{
-			UID:          ancestorUIDs[0],
-			OrgID:        orgID,
-			SignedInUser: &signedInUser,
-		}
-		err = serviceWithFlagOn.Delete(context.Background(), &deleteCmd)
-		require.NoError(t, err)
+			ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "getDescendantCountsOn", createCmd)
 
-		for i, uid := range ancestorUIDs {
-			// dashboard table
-			_, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, uid)
-			require.ErrorIs(t, err, dashboards.ErrFolderNotFound)
-			// folder table
-			_, err = serviceWithFlagOn.store.Get(context.Background(), folder.GetFolderQuery{UID: &ancestorUIDs[i], OrgID: orgID})
-			require.ErrorIs(t, err, folder.ErrFolderNotFound)
-		}
-		t.Cleanup(func() {
-			guardian.New = origNewGuardian
+			parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[0])
+			require.NoError(t, err)
+			subfolder, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[1])
+			require.NoError(t, err)
+			_ = insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in parent", orgID, parent.ID, "prod")
+			_ = insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in subfolder", orgID, subfolder.ID, "prod")
+
+			countCmd := folder.GetDescendantCountsQuery{
+				UID:          &ancestorUIDs[0],
+				OrgID:        orgID,
+				SignedInUser: &signedInUser,
+			}
+			m, err := serviceWithFlagOn.GetDescendantCounts(context.Background(), &countCmd)
+			require.NoError(t, err)
+			require.Equal(t, m["folder"], int64(depth-1))
+			require.Equal(t, m["dashboard"], int64(2))
+
+			t.Cleanup(func() {
+				guardian.New = origNewGuardian
+				for _, uid := range ancestorUIDs {
+					err := serviceWithFlagOn.store.Delete(context.Background(), uid, orgID)
+					assert.NoError(t, err)
+				}
+			})
+		})
+		t.Run("With nested folder feature flag off", func(t *testing.T) {
+			featuresFlagOff := featuremgmt.WithFeatures()
+			dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOff, tagimpl.ProvideService(db, db.Cfg), quotaService)
+			require.NoError(t, err)
+			nestedFolderStore := ProvideStore(db, db.Cfg, featuresFlagOff)
+
+			serviceWithFlagOff := &Service{
+				cfg:                  cfg,
+				log:                  log.New("test-folder-service"),
+				dashboardStore:       dashStore,
+				dashboardFolderStore: folderStore,
+				store:                nestedFolderStore,
+				features:             featuresFlagOff,
+				bus:                  bus.ProvideBus(tracing.InitializeTracerForTest()),
+				db:                   db,
+				registry:             make(map[string]folder.RegistryService),
+			}
+
+			origNewGuardian := guardian.New
+			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
+
+			_, err = service.ProvideDashboardServiceImpl(cfg, dashStore, folderStore, nil, featuresFlagOff, folderPermissions, dashboardPermissions, ac, serviceWithFlagOff)
+			require.NoError(t, err)
+
+			ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "getDescendantCountsOff", createCmd)
+
+			parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[0])
+			require.NoError(t, err)
+			subfolder, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[1])
+			require.NoError(t, err)
+			_ = insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in parent", orgID, parent.ID, "prod")
+			_ = insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in subfolder", orgID, subfolder.ID, "prod")
+
+			countCmd := folder.GetDescendantCountsQuery{
+				UID:          &ancestorUIDs[0],
+				OrgID:        orgID,
+				SignedInUser: &signedInUser,
+			}
+			m, err := serviceWithFlagOff.GetDescendantCounts(context.Background(), &countCmd)
+			require.NoError(t, err)
+			require.Equal(t, m["folder"], int64(0))
+			require.Equal(t, m["dashboard"], int64(1))
+
+			t.Cleanup(func() {
+				guardian.New = origNewGuardian
+				for _, uid := range ancestorUIDs {
+					err := serviceWithFlagOn.store.Delete(context.Background(), uid, orgID)
+					assert.NoError(t, err)
+				}
+			})
 		})
 	})
-	t.Run("With feature flag unset", func(t *testing.T) {
-		featuresFlagOff := featuremgmt.WithFeatures()
-		dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOff, tagimpl.ProvideService(db, db.Cfg), quotaService)
-		require.NoError(t, err)
-		nestedFolderStore := ProvideStore(db, db.Cfg, featuresFlagOff)
 
-		serviceWithFlagOff := &Service{
-			cfg:                  cfg,
-			log:                  log.New("test-folder-service"),
-			dashboardStore:       dashStore,
-			dashboardFolderStore: folderStore,
-			store:                nestedFolderStore,
-			features:             featuresFlagOff,
-			bus:                  bus.ProvideBus(tracing.InitializeTracerForTest()),
-			db:                   db,
-		}
+	t.Run("Should delete folders", func(t *testing.T) {
+		t.Run("With nested folder feature flag on", func(t *testing.T) {
+			origNewGuardian := guardian.New
+			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
 
-		origNewGuardian := guardian.New
-		guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
+			ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, 3, "", createCmd)
 
-		ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, 1, "", createCmd)
-
-		deleteCmd := folder.DeleteFolderCommand{
-			UID:          ancestorUIDs[0],
-			OrgID:        orgID,
-			SignedInUser: &signedInUser,
-		}
-		err = serviceWithFlagOff.Delete(context.Background(), &deleteCmd)
-		require.NoError(t, err)
-
-		for i, uid := range ancestorUIDs {
-			// dashboard table
-			_, err := serviceWithFlagOff.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, uid)
-			require.ErrorIs(t, err, dashboards.ErrFolderNotFound)
-			// folder table
-			_, err = serviceWithFlagOff.store.Get(context.Background(), folder.GetFolderQuery{UID: &ancestorUIDs[i], OrgID: orgID})
+			deleteCmd := folder.DeleteFolderCommand{
+				UID:          ancestorUIDs[0],
+				OrgID:        orgID,
+				SignedInUser: &signedInUser,
+			}
+			err = serviceWithFlagOn.Delete(context.Background(), &deleteCmd)
 			require.NoError(t, err)
-		}
-		t.Cleanup(func() {
-			guardian.New = origNewGuardian
-			for _, uid := range ancestorUIDs {
-				err := serviceWithFlagOff.store.Delete(context.Background(), uid, orgID)
+
+			for i, uid := range ancestorUIDs {
+				// dashboard table
+				_, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, uid)
+				require.ErrorIs(t, err, dashboards.ErrFolderNotFound)
+				// folder table
+				_, err = serviceWithFlagOn.store.Get(context.Background(), folder.GetFolderQuery{UID: &ancestorUIDs[i], OrgID: orgID})
+				require.ErrorIs(t, err, folder.ErrFolderNotFound)
+			}
+			t.Cleanup(func() {
+				guardian.New = origNewGuardian
+			})
+		})
+		t.Run("With nested folder feature flag off", func(t *testing.T) {
+			featuresFlagOff := featuremgmt.WithFeatures()
+			dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOff, tagimpl.ProvideService(db, db.Cfg), quotaService)
+			require.NoError(t, err)
+			nestedFolderStore := ProvideStore(db, db.Cfg, featuresFlagOff)
+
+			serviceWithFlagOff := &Service{
+				cfg:                  cfg,
+				log:                  log.New("test-folder-service"),
+				dashboardStore:       dashStore,
+				dashboardFolderStore: folderStore,
+				store:                nestedFolderStore,
+				features:             featuresFlagOff,
+				bus:                  bus.ProvideBus(tracing.InitializeTracerForTest()),
+				db:                   db,
+			}
+
+			origNewGuardian := guardian.New
+			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
+
+			ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, 1, "", createCmd)
+
+			deleteCmd := folder.DeleteFolderCommand{
+				UID:          ancestorUIDs[0],
+				OrgID:        orgID,
+				SignedInUser: &signedInUser,
+			}
+			err = serviceWithFlagOff.Delete(context.Background(), &deleteCmd)
+			require.NoError(t, err)
+
+			for i, uid := range ancestorUIDs {
+				// dashboard table
+				_, err := serviceWithFlagOff.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, uid)
+				require.ErrorIs(t, err, dashboards.ErrFolderNotFound)
+				// folder table
+				_, err = serviceWithFlagOff.store.Get(context.Background(), folder.GetFolderQuery{UID: &ancestorUIDs[i], OrgID: orgID})
 				require.NoError(t, err)
 			}
+			t.Cleanup(func() {
+				guardian.New = origNewGuardian
+				for _, uid := range ancestorUIDs {
+					err := serviceWithFlagOff.store.Delete(context.Background(), uid, orgID)
+					require.NoError(t, err)
+				}
+			})
 		})
 	})
 }
@@ -930,65 +1023,6 @@ func TestNestedFolderService(t *testing.T) {
 	})
 }
 
-func TestGetChildrenCounts(t *testing.T) {
-	g := guardian.New
-	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true})
-	t.Cleanup(func() {
-		guardian.New = g
-	})
-
-	folderId := rand.Int63()
-	folderUID := util.GenerateShortUID()
-	f := folder.NewFolder("Folder", "")
-	f.ID = folderId
-	f.UID = folderUID
-	f.OrgID = orgID
-
-	nestedFolderStore := NewFakeStore()
-	nestedFolderStore.ExpectedFolder = f
-
-	dashStore := dashboards.FakeDashboardStore{}
-	dashboardCount := int64(2)
-	countCmd := dashboards.CountDashboardsInFolderRequest{
-		FolderID: f.ID,
-		OrgID:    f.OrgID,
-	}
-	dashStore.On("CountDashboardsInFolder", mock.Anything, &countCmd).Return(dashboardCount, nil)
-
-	dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-	dashboardFolderStore.On("GetFolderByUID", mock.Anything, orgID, folderUID).Return(f, nil)
-
-	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
-	features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
-	folderService := &Service{
-		cfg:                  cfg,
-		store:                nestedFolderStore,
-		dashboardStore:       &dashStore,
-		dashboardFolderStore: dashboardFolderStore,
-		features:             features,
-		log:                  log.New("test-folder-service"),
-		accessControl:        acimpl.ProvideAccessControl(cfg),
-		registry:             make(map[string]folder.RegistryService),
-	}
-
-	ac := acmock.New()
-	folderPermissions := acmock.NewMockedPermissionsService()
-	dashboardPermissions := acmock.NewMockedPermissionsService()
-	_, err := service.ProvideDashboardServiceImpl(cfg, &dashStore, dashboardFolderStore, nil, features, folderPermissions, dashboardPermissions, ac, folderService)
-	require.NoError(t, err)
-
-	signedInUser := user.SignedInUser{UserID: 1, OrgID: orgID}
-	ctx := appcontext.WithUser(context.Background(), &signedInUser)
-	res, err := folderService.GetChildrenCounts(ctx, &folder.GetChildrenCountsQuery{
-		SignedInUser: usr,
-		UID:          &folderUID,
-		OrgID:        orgID,
-	})
-	require.NoError(t, err)
-	require.Equal(t, res["dashboard"], dashboardCount)
-}
-
 func CreateSubtreeInStore(t *testing.T, store *sqlStore, service *Service, depth int, prefix string, cmd folder.CreateFolderCommand) []string {
 	t.Helper()
 
diff --git a/pkg/services/folder/foldertest/foldertest.go b/pkg/services/folder/foldertest/foldertest.go
index 9468186147a..dd865b07b36 100644
--- a/pkg/services/folder/foldertest/foldertest.go
+++ b/pkg/services/folder/foldertest/foldertest.go
@@ -7,10 +7,10 @@ import (
 )
 
 type FakeService struct {
-	ExpectedFolders        []*folder.Folder
-	ExpectedFolder         *folder.Folder
-	ExpectedError          error
-	ExpectedChildrenCounts map[string]int64
+	ExpectedFolders          []*folder.Folder
+	ExpectedFolder           *folder.Folder
+	ExpectedError            error
+	ExpectedDescendantCounts map[string]int64
 }
 
 func NewFakeService() *FakeService {
@@ -51,6 +51,6 @@ func (s *FakeService) RegisterService(service folder.RegistryService) error {
 	return s.ExpectedError
 }
 
-func (s *FakeService) GetChildrenCounts(ctx context.Context, cmd *folder.GetChildrenCountsQuery) (folder.ChildrenCounts, error) {
-	return s.ExpectedChildrenCounts, s.ExpectedError
+func (s *FakeService) GetDescendantCounts(ctx context.Context, cmd *folder.GetDescendantCountsQuery) (folder.DescendantCounts, error) {
+	return s.ExpectedDescendantCounts, s.ExpectedError
 }
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index 1040c7a8088..91cda1d5533 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -155,13 +155,13 @@ type HasAdminPermissionInDashboardsOrFoldersQuery struct {
 	SignedInUser *user.SignedInUser
 }
 
-// GetChildrenCountsQuery captures the information required by the folder service
-// to return the count of children in a folder.
-type GetChildrenCountsQuery struct {
+// GetDescendantCountsQuery captures the information required by the folder service
+// to return the count of descendants (direct and indirect) in a folder.
+type GetDescendantCountsQuery struct {
 	UID   *string
 	OrgID int64
 
 	SignedInUser *user.SignedInUser `json:"-"`
 }
 
-type ChildrenCounts map[string]int64
+type DescendantCounts map[string]int64
diff --git a/pkg/services/folder/service.go b/pkg/services/folder/service.go
index 720f9dd5eed..74b10c61fe8 100644
--- a/pkg/services/folder/service.go
+++ b/pkg/services/folder/service.go
@@ -26,7 +26,7 @@ type Service interface {
 	// Move changes a folder's parent folder to the requested new parent.
 	Move(ctx context.Context, cmd *MoveFolderCommand) (*Folder, error)
 	RegisterService(service RegistryService) error
-	GetChildrenCounts(ctx context.Context, cmd *GetChildrenCountsQuery) (ChildrenCounts, error)
+	GetDescendantCounts(ctx context.Context, cmd *GetDescendantCountsQuery) (DescendantCounts, error)
 }
 
 // FolderStore is a folder store.
diff --git a/public/api-merged.json b/public/api-merged.json
index 8dec040b7ee..64a7f7463c9 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -5655,7 +5655,7 @@
           "folders"
         ],
         "summary": "Gets the count of each descendant of a folder by kind. The folder is identified by UID.",
-        "operationId": "getFolderChildrenCounts",
+        "operationId": "getFolderDescendantCounts",
         "parameters": [
           {
             "type": "string",
@@ -5666,7 +5666,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getFolderChildrenCountsResponse"
+            "$ref": "#/responses/getFolderDescendantCountsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -11885,13 +11885,6 @@
         }
       }
     },
-    "ChildrenCounts": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "integer",
-        "format": "int64"
-      }
-    },
     "ConfFloat64": {
       "description": "ConfFloat64 is a float64. It Marshals float64 values of NaN of Inf\nto null.",
       "type": "number",
@@ -13098,6 +13091,13 @@
         }
       }
     },
+    "DescendantCounts": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "integer",
+        "format": "int64"
+      }
+    },
     "DiscordConfig": {
       "type": "object",
       "title": "DiscordConfig configures notifications via Discord.",
@@ -20341,10 +20341,10 @@
         "$ref": "#/definitions/DataSourceList"
       }
     },
-    "getFolderChildrenCountsResponse": {
+    "getFolderDescendantCountsResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/ChildrenCounts"
+        "$ref": "#/definitions/DescendantCounts"
       }
     },
     "getFolderPermissionListResponse": {
diff --git a/public/openapi3.json b/public/openapi3.json
index bbdca11f0f6..cd0bc5bf846 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -792,11 +792,11 @@
         },
         "description": "(empty)"
       },
-      "getFolderChildrenCountsResponse": {
+      "getFolderDescendantCountsResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/ChildrenCounts"
+              "$ref": "#/components/schemas/DescendantCounts"
             }
           }
         },
@@ -2952,13 +2952,6 @@
         },
         "type": "object"
       },
-      "ChildrenCounts": {
-        "additionalProperties": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "type": "object"
-      },
       "ConfFloat64": {
         "description": "ConfFloat64 is a float64. It Marshals float64 values of NaN of Inf\nto null.",
         "format": "double",
@@ -4165,6 +4158,13 @@
         },
         "type": "object"
       },
+      "DescendantCounts": {
+        "additionalProperties": {
+          "format": "int64",
+          "type": "integer"
+        },
+        "type": "object"
+      },
       "DiscordConfig": {
         "properties": {
           "http_config": {
@@ -17026,7 +17026,7 @@
     },
     "/folders/{folder_uid}/counts": {
       "get": {
-        "operationId": "getFolderChildrenCounts",
+        "operationId": "getFolderDescendantCounts",
         "parameters": [
           {
             "in": "path",
@@ -17039,7 +17039,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getFolderChildrenCountsResponse"
+            "$ref": "#/components/responses/getFolderDescendantCountsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"

From 62587eee886629e40613a12decdbe3acd36318f8 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Thu, 27 Apr 2023 10:20:07 -0500
Subject: [PATCH 484/729] Timeseries: Update auto-migration e2e test (#67402)

---
 e2e/various-suite/graph-auto-migrate.spec.ts          | 2 +-
 packages/grafana-e2e-selectors/src/selectors/pages.ts | 1 -
 public/app/core/components/Page/Page.tsx              | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/e2e/various-suite/graph-auto-migrate.spec.ts b/e2e/various-suite/graph-auto-migrate.spec.ts
index 319ba5bec25..8f21a338501 100644
--- a/e2e/various-suite/graph-auto-migrate.spec.ts
+++ b/e2e/various-suite/graph-auto-migrate.spec.ts
@@ -35,7 +35,7 @@ e2e.scenario({
         e2e.pages.Dashboard.Annotations.marker().should('exist');
       });
 
-    e2e.pages.Dashboard.wrapper().children().children('.scrollbar-view').scrollTo('bottom');
+    cy.get('body').children().find('.scrollbar-view').first().scrollTo('bottom');
 
     e2e.components.Panels.Panel.title('05:00')
       .should('exist')
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index d1c611cc547..95cd03e5b25 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -49,7 +49,6 @@ export const Pages = {
   },
   Dashboard: {
     url: (uid: string) => `/d/${uid}`,
-    wrapper: 'data-testid dashboard-page-wrapper',
     DashNav: {
       /**
        * @deprecated use navV2 from Grafana 8.3 instead
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index fd4c79749d8..df666b44ed9 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -3,7 +3,6 @@ import { css, cx } from '@emotion/css';
 import React, { useLayoutEffect } from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
 import { CustomScrollbar, useStyles2 } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 
@@ -51,7 +50,7 @@ export const Page: PageType = ({
   }, [navModel, pageNav, chrome, layout]);
 
   return (
-    <div className={cx(styles.wrapper, className)} {...otherProps} data-testid={selectors.pages.Dashboard.wrapper}>
+    <div className={cx(styles.wrapper, className)} {...otherProps}>
       {layout === PageLayoutType.Standard && (
         <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
           <div className={styles.pageInner}>

From aa9838bd2526731883784230080cd26144a569f1 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Thu, 27 Apr 2023 17:54:28 +0200
Subject: [PATCH 485/729] Chore: Refactor manifest verifier (#67218)

---
 pkg/api/plugin_resource_test.go               |   5 +-
 pkg/plugins/ifaces.go                         |   4 +
 pkg/plugins/manager/loader/loader_test.go     |   5 +-
 .../manager/manager_integration_test.go       |   5 +-
 pkg/plugins/manager/signature/manifest.go     |  67 ++--
 .../manager/signature/manifest_test.go        |  17 +-
 .../signature/manifestverifier/verifier.go    | 286 ------------------
 .../signature/statickey/static_retriever.go   |  56 ++++
 .../backgroundsvcs/background_services.go     |   6 +-
 .../keyretriever/dynamic/dynamic_retriever.go | 234 ++++++++++++++
 .../dynamic/dynamic_retriever_test.go}        |  32 +-
 .../keyretriever/retriever.go                 |  29 ++
 .../keyretriever/retriever_test.go            |  26 ++
 .../pluginsintegration/pluginsintegration.go  |   5 +
 14 files changed, 416 insertions(+), 361 deletions(-)
 delete mode 100644 pkg/plugins/manager/signature/manifestverifier/verifier.go
 create mode 100644 pkg/plugins/manager/signature/statickey/static_retriever.go
 create mode 100644 pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever.go
 rename pkg/{plugins/manager/signature/manifestverifier/verifier_test.go => services/pluginsintegration/keyretriever/dynamic/dynamic_retriever_test.go} (75%)
 create mode 100644 pkg/services/pluginsintegration/keyretriever/retriever.go
 create mode 100644 pkg/services/pluginsintegration/keyretriever/retriever_test.go

diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index deb9373d4fa..f9f0f9f741e 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
@@ -26,6 +25,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
 	"github.com/grafana/grafana/pkg/plugins/manager/sources"
 	"github.com/grafana/grafana/pkg/plugins/manager/store"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
@@ -36,7 +36,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
@@ -67,7 +66,7 @@ func TestCallResource(t *testing.T) {
 	reg := registry.ProvideService()
 	l := loader.ProvideService(pCfg, fakes.NewFakeLicensingService(), signature.NewUnsignedAuthorizer(pCfg),
 		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(pCfg), fakes.NewFakeRoleRegistry(),
-		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
+		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, statickey.New()))
 	srcs := sources.ProvideService(cfg, pCfg)
 	ps, err := store.ProvideService(reg, srcs, l)
 	require.NoError(t, err)
diff --git a/pkg/plugins/ifaces.go b/pkg/plugins/ifaces.go
index b146f32bcd5..a75b218a028 100644
--- a/pkg/plugins/ifaces.go
+++ b/pkg/plugins/ifaces.go
@@ -157,3 +157,7 @@ type KeyStore interface {
 	GetLastUpdated(ctx context.Context) (*time.Time, error)
 	SetLastUpdated(ctx context.Context) error
 }
+
+type KeyRetriever interface {
+	GetPublicKey(ctx context.Context, keyID string) (string, error)
+}
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index e96b6291313..ccb93246490 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/config"
@@ -21,9 +20,9 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/initializer"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
 	"github.com/grafana/grafana/pkg/plugins/manager/sources"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -1388,7 +1387,7 @@ func newLoader(cfg *config.Cfg, cbs ...func(loader *Loader)) *Loader {
 	l := New(cfg, &fakes.FakeLicensingService{}, signature.NewUnsignedAuthorizer(cfg), fakes.NewFakePluginRegistry(),
 		fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakeRoleRegistry(),
 		assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(cfg),
-		signature.ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
+		signature.ProvideService(cfg, statickey.New()))
 
 	for _, cb := range cbs {
 		cb(l)
diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go
index 074cbdaa0db..5b2fe031811 100644
--- a/pkg/plugins/manager/manager_integration_test.go
+++ b/pkg/plugins/manager/manager_integration_test.go
@@ -14,7 +14,6 @@ import (
 	"gopkg.in/ini.v1"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
@@ -26,13 +25,13 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
 	"github.com/grafana/grafana/pkg/plugins/manager/sources"
 	"github.com/grafana/grafana/pkg/plugins/manager/store"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	plicensing "github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
 	"github.com/grafana/grafana/pkg/services/searchV2"
 	"github.com/grafana/grafana/pkg/setting"
@@ -119,7 +118,7 @@ func TestIntegrationPluginManager(t *testing.T) {
 	lic := plicensing.ProvideLicensing(cfg, &licensing.OSSLicensingService{Cfg: cfg})
 	l := loader.ProvideService(pCfg, lic, signature.NewUnsignedAuthorizer(pCfg),
 		reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(pCfg), fakes.NewFakeRoleRegistry(),
-		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
+		assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, statickey.New()))
 	srcs := sources.ProvideService(cfg, pCfg)
 	ps, err := store.ProvideService(reg, srcs, l)
 	require.NoError(t, err)
diff --git a/pkg/plugins/manager/signature/manifest.go b/pkg/plugins/manager/signature/manifest.go
index 992a9080566..abb22e48155 100644
--- a/pkg/plugins/manager/signature/manifest.go
+++ b/pkg/plugins/manager/signature/manifest.go
@@ -1,6 +1,7 @@
 package signature
 
 import (
+	"bytes"
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
@@ -15,13 +16,14 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/gobwas/glob"
 
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
-	"github.com/grafana/grafana/pkg/plugins/manager/signature/manifestverifier"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -56,28 +58,19 @@ func (m *PluginManifest) isV2() bool {
 }
 
 type Signature struct {
-	verifier *manifestverifier.ManifestVerifier
-	mlog     log.Logger
+	log log.Logger
+	kr  plugins.KeyRetriever
 }
 
 var _ plugins.SignatureCalculator = &Signature{}
 
-func ProvideService(cfg *config.Cfg, kv plugins.KeyStore) *Signature {
-	log := log.New("plugin.signature")
+func ProvideService(cfg *config.Cfg, kr plugins.KeyRetriever) *Signature {
 	return &Signature{
-		verifier: manifestverifier.New(cfg, log, kv),
-		mlog:     log,
+		log: log.New("plugin.signature"),
+		kr:  kr,
 	}
 }
 
-func (s *Signature) IsDisabled() bool {
-	return s.verifier.IsDisabled()
-}
-
-func (s *Signature) Run(ctx context.Context) error {
-	return s.verifier.Run(ctx)
-}
-
 // readPluginManifest attempts to read and verify the plugin manifest
 // if any error occurs or the manifest is not valid, this will return an error
 func (s *Signature) readPluginManifest(ctx context.Context, body []byte) (*PluginManifest, error) {
@@ -109,7 +102,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 		return plugins.Signature{}, fmt.Errorf("files: %w", err)
 	}
 	if len(fsFiles) == 0 {
-		s.mlog.Warn("No plugin file information in directory", "pluginID", plugin.JSONData.ID)
+		s.log.Warn("No plugin file information in directory", "pluginID", plugin.JSONData.ID)
 		return plugins.Signature{
 			Status: plugins.SignatureInvalid,
 		}, nil
@@ -118,13 +111,13 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 	f, err := plugin.FS.Open("MANIFEST.txt")
 	if err != nil {
 		if errors.Is(err, plugins.ErrFileNotExist) {
-			s.mlog.Debug("Could not find a MANIFEST.txt", "id", plugin.JSONData.ID, "err", err)
+			s.log.Debug("Could not find a MANIFEST.txt", "id", plugin.JSONData.ID, "err", err)
 			return plugins.Signature{
 				Status: plugins.SignatureUnsigned,
 			}, nil
 		}
 
-		s.mlog.Debug("Could not open MANIFEST.txt", "id", plugin.JSONData.ID, "err", err)
+		s.log.Debug("Could not open MANIFEST.txt", "id", plugin.JSONData.ID, "err", err)
 		return plugins.Signature{
 			Status: plugins.SignatureInvalid,
 		}, nil
@@ -134,13 +127,13 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 			return
 		}
 		if err = f.Close(); err != nil {
-			s.mlog.Warn("Failed to close plugin MANIFEST file", "err", err)
+			s.log.Warn("Failed to close plugin MANIFEST file", "err", err)
 		}
 	}()
 
 	byteValue, err := io.ReadAll(f)
 	if err != nil || len(byteValue) < 10 {
-		s.mlog.Debug("MANIFEST.TXT is invalid", "id", plugin.JSONData.ID)
+		s.log.Debug("MANIFEST.TXT is invalid", "id", plugin.JSONData.ID)
 		return plugins.Signature{
 			Status: plugins.SignatureUnsigned,
 		}, nil
@@ -148,7 +141,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 
 	manifest, err := s.readPluginManifest(ctx, byteValue)
 	if err != nil {
-		s.mlog.Debug("Plugin signature invalid", "id", plugin.JSONData.ID, "err", err)
+		s.log.Debug("Plugin signature invalid", "id", plugin.JSONData.ID, "err", err)
 		return plugins.Signature{
 			Status: plugins.SignatureInvalid,
 		}, nil
@@ -170,10 +163,10 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 	// Validate that plugin is running within defined root URLs
 	if len(manifest.RootURLs) > 0 {
 		if match, err := urlMatch(manifest.RootURLs, setting.AppUrl, manifest.SignatureType); err != nil {
-			s.mlog.Warn("Could not verify if root URLs match", "plugin", plugin.JSONData.ID, "rootUrls", manifest.RootURLs)
+			s.log.Warn("Could not verify if root URLs match", "plugin", plugin.JSONData.ID, "rootUrls", manifest.RootURLs)
 			return plugins.Signature{}, err
 		} else if !match {
-			s.mlog.Warn("Could not find root URL that matches running application URL", "plugin", plugin.JSONData.ID,
+			s.log.Warn("Could not find root URL that matches running application URL", "plugin", plugin.JSONData.ID,
 				"appUrl", setting.AppUrl, "rootUrls", manifest.RootURLs)
 			return plugins.Signature{
 				Status: plugins.SignatureInvalid,
@@ -185,7 +178,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 
 	// Verify the manifest contents
 	for p, hash := range manifest.Files {
-		err = verifyHash(s.mlog, plugin, p, hash)
+		err = verifyHash(s.log, plugin, p, hash)
 		if err != nil {
 			return plugins.Signature{
 				Status: plugins.SignatureModified,
@@ -215,13 +208,13 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 	}
 
 	if len(unsignedFiles) > 0 {
-		s.mlog.Warn("The following files were not included in the signature", "plugin", plugin.JSONData.ID, "files", unsignedFiles)
+		s.log.Warn("The following files were not included in the signature", "plugin", plugin.JSONData.ID, "files", unsignedFiles)
 		return plugins.Signature{
 			Status: plugins.SignatureModified,
 		}, nil
 	}
 
-	s.mlog.Debug("Plugin signature valid", "id", plugin.JSONData.ID)
+	s.log.Debug("Plugin signature valid", "id", plugin.JSONData.ID)
 	return plugins.Signature{
 		Status:     plugins.SignatureValid,
 		Type:       manifest.SignatureType,
@@ -331,5 +324,25 @@ func (s *Signature) validateManifest(ctx context.Context, m PluginManifest, bloc
 		}
 	}
 
-	return s.verifier.Verify(ctx, m.KeyID, block)
+	return s.Verify(ctx, m.KeyID, block)
+}
+
+func (s *Signature) Verify(ctx context.Context, keyID string, block *clearsign.Block) error {
+	publicKey, err := s.kr.GetPublicKey(ctx, keyID)
+	if err != nil {
+		return err
+	}
+
+	keyring, err := openpgp.ReadArmoredKeyRing(bytes.NewBufferString(publicKey))
+	if err != nil {
+		return fmt.Errorf("%v: %w", "failed to parse public key", err)
+	}
+
+	if _, err = openpgp.CheckDetachedSignature(keyring,
+		bytes.NewBuffer(block.Bytes),
+		block.ArmoredSignature.Body, &packet.Config{}); err != nil {
+		return fmt.Errorf("%v: %w", "failed to check signature", err)
+	}
+
+	return nil
 }
diff --git a/pkg/plugins/manager/signature/manifest_test.go b/pkg/plugins/manager/signature/manifest_test.go
index 069f7495136..2816a8a1b13 100644
--- a/pkg/plugins/manager/signature/manifest_test.go
+++ b/pkg/plugins/manager/signature/manifest_test.go
@@ -11,11 +11,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -52,7 +51,7 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
 -----END PGP SIGNATURE-----`
 
 	t.Run("valid manifest", func(t *testing.T) {
-		s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		s := ProvideService(&config.Cfg{}, statickey.New())
 		manifest, err := s.readPluginManifest(context.Background(), []byte(txt))
 
 		require.NoError(t, err)
@@ -69,7 +68,7 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
 
 	t.Run("invalid manifest", func(t *testing.T) {
 		modified := strings.ReplaceAll(txt, "README.md", "xxxxxxxxxx")
-		s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		s := ProvideService(&config.Cfg{}, statickey.New())
 		_, err := s.readPluginManifest(context.Background(), []byte(modified))
 		require.Error(t, err)
 	})
@@ -107,7 +106,7 @@ khdr/tZ1PDgRxMqB/u+Vtbpl0xSxgblnrDOYMSI=
 -----END PGP SIGNATURE-----`
 
 	t.Run("valid manifest", func(t *testing.T) {
-		s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		s := ProvideService(&config.Cfg{}, statickey.New())
 		manifest, err := s.readPluginManifest(context.Background(), []byte(txt))
 
 		require.NoError(t, err)
@@ -161,7 +160,7 @@ func TestCalculate(t *testing.T) {
 			setting.AppUrl = tc.appURL
 
 			basePath := filepath.Join(parentDir, "testdata/non-pvt-with-root-url/plugin")
-			s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+			s := ProvideService(&config.Cfg{}, statickey.New())
 			sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 				PluginClassFunc: func(ctx context.Context) plugins.Class {
 					return plugins.External
@@ -189,7 +188,7 @@ func TestCalculate(t *testing.T) {
 		basePath := "../testdata/renderer-added-file/plugin"
 
 		runningWindows = true
-		s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		s := ProvideService(&config.Cfg{}, statickey.New())
 		sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
 				return plugins.External
@@ -253,7 +252,7 @@ func TestCalculate(t *testing.T) {
 				toSlash = tc.platform.toSlashFunc()
 				fromSlash = tc.platform.fromSlashFunc()
 
-				s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+				s := ProvideService(&config.Cfg{}, statickey.New())
 				pfs, err := tc.fsFactory()
 				require.NoError(t, err)
 				pfs, err = newPathSeparatorOverrideFS(string(tc.platform.separator), pfs)
@@ -721,7 +720,7 @@ func Test_validateManifest(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			s := ProvideService(&config.Cfg{}, keystore.ProvideService(kvstore.NewFakeKVStore()))
+			s := ProvideService(&config.Cfg{}, statickey.New())
 			err := s.validateManifest(context.Background(), *tc.manifest, nil)
 			require.Errorf(t, err, tc.expectedErr)
 		})
diff --git a/pkg/plugins/manager/signature/manifestverifier/verifier.go b/pkg/plugins/manager/signature/manifestverifier/verifier.go
deleted file mode 100644
index 4424b8a8e42..00000000000
--- a/pkg/plugins/manager/signature/manifestverifier/verifier.go
+++ /dev/null
@@ -1,286 +0,0 @@
-package manifestverifier
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"sync"
-	"time"
-
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
-	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/plugins/log"
-
-	// Only used for getting the feature flag value
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-)
-
-const publicKeySyncInterval = 10 * 24 * time.Hour // 10 days
-
-// ManifestKeys is the database representation of public keys
-// used to verify plugin manifests.
-type ManifestKeys struct {
-	KeyID     string `json:"keyId"`
-	PublicKey string `json:"public"`
-	Since     int64  `json:"since"`
-}
-
-type ManifestVerifier struct {
-	cfg  *config.Cfg
-	mlog log.Logger
-
-	lock    sync.Mutex
-	cli     http.Client
-	kv      plugins.KeyStore
-	hasKeys bool
-}
-
-func New(cfg *config.Cfg, mlog log.Logger, kv plugins.KeyStore) *ManifestVerifier {
-	pmv := &ManifestVerifier{
-		cfg:  cfg,
-		mlog: mlog,
-		cli:  makeHttpClient(),
-		kv:   kv,
-	}
-	return pmv
-}
-
-// IsDisabled disables dynamic retrieval of public keys from the API server.
-func (pmv *ManifestVerifier) IsDisabled() bool {
-	return pmv.cfg == nil || pmv.cfg.Features == nil || !pmv.cfg.Features.IsEnabled(featuremgmt.FlagPluginsAPIManifestKey)
-}
-
-func (pmv *ManifestVerifier) Run(ctx context.Context) error {
-	// do an initial update if necessary
-	err := pmv.updateKeys(ctx)
-	if err != nil {
-		pmv.mlog.Error("Error downloading plugin manifest keys", "error", err)
-	}
-
-	// calculate initial send delay
-	lastUpdated, err := pmv.kv.GetLastUpdated(ctx)
-	if err != nil {
-		return err
-	}
-	nextSendInterval := time.Until(lastUpdated.Add(publicKeySyncInterval))
-	if nextSendInterval < time.Minute {
-		nextSendInterval = time.Minute
-	}
-
-	downloadKeysTicker := time.NewTicker(nextSendInterval)
-	defer downloadKeysTicker.Stop()
-
-	select {
-	case <-downloadKeysTicker.C:
-		err = pmv.updateKeys(ctx)
-		if err != nil {
-			pmv.mlog.Error("Error downloading plugin manifest keys", "error", err)
-		}
-
-		if nextSendInterval != publicKeySyncInterval {
-			nextSendInterval = publicKeySyncInterval
-			downloadKeysTicker.Reset(nextSendInterval)
-		}
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-
-	return ctx.Err()
-}
-
-func (pmv *ManifestVerifier) updateKeys(ctx context.Context) error {
-	pmv.lock.Lock()
-	defer pmv.lock.Unlock()
-
-	lastUpdated, err := pmv.kv.GetLastUpdated(ctx)
-	if err != nil {
-		return err
-	}
-	if time.Since(*lastUpdated) < publicKeySyncInterval {
-		// Cache is still valid
-		return nil
-	}
-
-	return pmv.downloadKeys(ctx)
-}
-
-const publicKeyID = "7e4d0c6a708866e7"
-const publicKeyText = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: OpenPGP.js v4.10.1
-Comment: https://openpgpjs.org
-	
-xpMEXpTXXxMFK4EEACMEIwQBiOUQhvGbDLvndE0fEXaR0908wXzPGFpf0P0Z
-HJ06tsq+0higIYHp7WTNJVEZtcwoYLcPRGaa9OQqbUU63BEyZdgAkPTz3RFd
-5+TkDWZizDcaVFhzbDd500yTwexrpIrdInwC/jrgs7Zy/15h8KA59XXUkdmT
-YB6TR+OA9RKME+dCJozNGUdyYWZhbmEgPGVuZ0BncmFmYW5hLmNvbT7CvAQQ
-EwoAIAUCXpTXXwYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BAAoJEH5NDGpw
-iGbnaWoCCQGQ3SQnCkRWrG6XrMkXOKfDTX2ow9fuoErN46BeKmLM4f1EkDZQ
-Tpq3SE8+My8B5BIH3SOcBeKzi3S57JHGBdFA+wIJAYWMrJNIvw8GeXne+oUo
-NzzACdvfqXAZEp/HFMQhCKfEoWGJE8d2YmwY2+3GufVRTI5lQnZOHLE8L/Vc
-1S5MXESjzpcEXpTXXxIFK4EEACMEIwQBtHX/SD5Qm3v4V92qpaIZQgtTX0sT
-cFPjYWAHqsQ1iENrYN/vg1wU3ADlYATvydOQYvkTyT/tbDvx2Fse8PL84MQA
-YKKQ6AJ3gLVvmeouZdU03YoV4MYaT8KbnJUkZQZkqdz2riOlySNI9CG3oYmv
-omjUAtzgAgnCcurfGLZkkMxlmY8DAQoJwqQEGBMKAAkFAl6U118CGwwACgkQ
-fk0ManCIZuc0jAIJAVw2xdLr4ZQqPUhubrUyFcqlWoW8dQoQagwO8s8ubmby
-KuLA9FWJkfuuRQr+O9gHkDVCez3aism7zmJBqIOi38aNAgjJ3bo6leSS2jR/
-x5NqiKVi83tiXDPncDQYPymOnMhW0l7CVA7wj75HrFvvlRI/4MArlbsZ2tBn
-N1c5v9v/4h6qeA==
-=DNbR
------END PGP PUBLIC KEY BLOCK-----
-`
-
-// Retrieve the key from the API and store it in the database
-func (pmv *ManifestVerifier) downloadKeys(ctx context.Context) error {
-	var data struct {
-		Items []ManifestKeys
-	}
-
-	url, err := url.JoinPath(pmv.cfg.GrafanaComURL, "/api/plugins/ci/keys") // nolint:gosec URL is provided by config
-	if err != nil {
-		return err
-	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		return err
-	}
-
-	resp, err := pmv.cli.Do(req)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		err := resp.Body.Close()
-		if err != nil {
-			pmv.mlog.Warn("error closing response body", "error", err)
-		}
-	}()
-
-	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
-		return err
-	}
-
-	if len(data.Items) == 0 {
-		return errors.New("missing public key")
-	}
-
-	cachedKeys, err := pmv.kv.ListKeys(ctx)
-	if err != nil {
-		return err
-	}
-
-	shouldKeep := make(map[string]bool)
-	for _, key := range data.Items {
-		err = pmv.kv.Set(ctx, key.KeyID, key.PublicKey)
-		if err != nil {
-			return err
-		}
-		shouldKeep[key.KeyID] = true
-	}
-
-	// Delete keys that are no longer in the API
-	for _, key := range cachedKeys {
-		if !shouldKeep[key] {
-			err = pmv.kv.Del(ctx, key)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	// Update the last updated timestamp
-	return pmv.kv.SetLastUpdated(ctx)
-}
-
-func (pmv *ManifestVerifier) ensureKeys(ctx context.Context) error {
-	if pmv.hasKeys {
-		return nil
-	}
-	keys, err := pmv.kv.ListKeys(ctx)
-	if err != nil {
-		return err
-	}
-	if len(keys) == 0 {
-		// Populate with the default key
-		err := pmv.kv.Set(ctx, publicKeyID, publicKeyText)
-		if err != nil {
-			return err
-		}
-	}
-	pmv.hasKeys = true
-	return nil
-}
-
-// getPublicKey loads public keys from:
-//   - The hard-coded value if the feature flag is not enabled.
-//   - A cached value from kv storage if it has been already retrieved. This cache is populated from the grafana.com API.
-func (pmv *ManifestVerifier) getPublicKey(ctx context.Context, keyID string) (string, error) {
-	if pmv.IsDisabled() {
-		return publicKeyText, nil
-	}
-
-	pmv.lock.Lock()
-	defer pmv.lock.Unlock()
-
-	err := pmv.ensureKeys(ctx)
-	if err != nil {
-		return "", err
-	}
-
-	key, exist, err := pmv.kv.Get(ctx, keyID)
-	if err != nil {
-		return "", err
-	}
-	if exist {
-		return key, nil
-	}
-
-	return "", fmt.Errorf("missing public key for %s", keyID)
-}
-
-func (pmv *ManifestVerifier) Verify(ctx context.Context, keyID string, block *clearsign.Block) error {
-	publicKey, err := pmv.getPublicKey(ctx, keyID)
-	if err != nil {
-		return err
-	}
-
-	keyring, err := openpgp.ReadArmoredKeyRing(bytes.NewBufferString(publicKey))
-	if err != nil {
-		return fmt.Errorf("%v: %w", "failed to parse public key", err)
-	}
-
-	if _, err = openpgp.CheckDetachedSignature(keyring,
-		bytes.NewBuffer(block.Bytes),
-		block.ArmoredSignature.Body, &packet.Config{}); err != nil {
-		return fmt.Errorf("%v: %w", "failed to check signature", err)
-	}
-
-	return nil
-}
-
-// Same configuration as pkg/plugins/repo/client.go
-func makeHttpClient() http.Client {
-	tr := &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}).DialContext,
-		MaxIdleConns:          100,
-		IdleConnTimeout:       90 * time.Second,
-		TLSHandshakeTimeout:   10 * time.Second,
-		ExpectContinueTimeout: 1 * time.Second,
-	}
-
-	return http.Client{
-		Timeout:   10 * time.Second,
-		Transport: tr,
-	}
-}
diff --git a/pkg/plugins/manager/signature/statickey/static_retriever.go b/pkg/plugins/manager/signature/statickey/static_retriever.go
new file mode 100644
index 00000000000..d73a7aaf85d
--- /dev/null
+++ b/pkg/plugins/manager/signature/statickey/static_retriever.go
@@ -0,0 +1,56 @@
+package statickey
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/plugins"
+)
+
+const publicKeyID = "7e4d0c6a708866e7"
+const publicKeyText = `-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: OpenPGP.js v4.10.1
+Comment: https://openpgpjs.org
+	
+xpMEXpTXXxMFK4EEACMEIwQBiOUQhvGbDLvndE0fEXaR0908wXzPGFpf0P0Z
+HJ06tsq+0higIYHp7WTNJVEZtcwoYLcPRGaa9OQqbUU63BEyZdgAkPTz3RFd
+5+TkDWZizDcaVFhzbDd500yTwexrpIrdInwC/jrgs7Zy/15h8KA59XXUkdmT
+YB6TR+OA9RKME+dCJozNGUdyYWZhbmEgPGVuZ0BncmFmYW5hLmNvbT7CvAQQ
+EwoAIAUCXpTXXwYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BAAoJEH5NDGpw
+iGbnaWoCCQGQ3SQnCkRWrG6XrMkXOKfDTX2ow9fuoErN46BeKmLM4f1EkDZQ
+Tpq3SE8+My8B5BIH3SOcBeKzi3S57JHGBdFA+wIJAYWMrJNIvw8GeXne+oUo
+NzzACdvfqXAZEp/HFMQhCKfEoWGJE8d2YmwY2+3GufVRTI5lQnZOHLE8L/Vc
+1S5MXESjzpcEXpTXXxIFK4EEACMEIwQBtHX/SD5Qm3v4V92qpaIZQgtTX0sT
+cFPjYWAHqsQ1iENrYN/vg1wU3ADlYATvydOQYvkTyT/tbDvx2Fse8PL84MQA
+YKKQ6AJ3gLVvmeouZdU03YoV4MYaT8KbnJUkZQZkqdz2riOlySNI9CG3oYmv
+omjUAtzgAgnCcurfGLZkkMxlmY8DAQoJwqQEGBMKAAkFAl6U118CGwwACgkQ
+fk0ManCIZuc0jAIJAVw2xdLr4ZQqPUhubrUyFcqlWoW8dQoQagwO8s8ubmby
+KuLA9FWJkfuuRQr+O9gHkDVCez3aism7zmJBqIOi38aNAgjJ3bo6leSS2jR/
+x5NqiKVi83tiXDPncDQYPymOnMhW0l7CVA7wj75HrFvvlRI/4MArlbsZ2tBn
+N1c5v9v/4h6qeA==
+=DNbR
+-----END PGP PUBLIC KEY BLOCK-----
+`
+
+type KeyRetriever struct{}
+
+var _ plugins.KeyRetriever = (*KeyRetriever)(nil)
+
+func New() *KeyRetriever {
+	return &KeyRetriever{}
+}
+
+func (kr *KeyRetriever) GetPublicKey(ctx context.Context, keyID string) (string, error) {
+	if keyID == publicKeyID {
+		return publicKeyText, nil
+	}
+	return "", fmt.Errorf("missing public key for %s", keyID)
+}
+
+func GetDefaultKey() string {
+	return publicKeyText
+}
+
+func GetDefaultKeyID() string {
+	return publicKeyID
+}
diff --git a/pkg/server/backgroundsvcs/background_services.go b/pkg/server/backgroundsvcs/background_services.go
index 1900d9e455f..680eb8a31ba 100644
--- a/pkg/server/backgroundsvcs/background_services.go
+++ b/pkg/server/backgroundsvcs/background_services.go
@@ -8,7 +8,6 @@ import (
 	uss "github.com/grafana/grafana/pkg/infra/usagestats/service"
 	"github.com/grafana/grafana/pkg/infra/usagestats/statscollector"
 	"github.com/grafana/grafana/pkg/plugins/manager/process"
-	"github.com/grafana/grafana/pkg/plugins/manager/signature"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/auth"
@@ -24,6 +23,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	plugindashboardsservice "github.com/grafana/grafana/pkg/services/plugindashboards/service"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever/dynamic"
 	"github.com/grafana/grafana/pkg/services/provisioning"
 	publicdashboardsmetric "github.com/grafana/grafana/pkg/services/publicdashboards/metric"
 	"github.com/grafana/grafana/pkg/services/rendering"
@@ -51,7 +51,7 @@ func ProvideBackgroundServiceRegistry(
 	grpcServerProvider grpcserver.Provider, secretMigrationProvider secretsMigrations.SecretMigrationProvider, loginAttemptService *loginattemptimpl.Service,
 	bundleService *supportbundlesimpl.Service,
 	publicDashboardsMetric *publicdashboardsmetric.Service,
-	signature *signature.Signature,
+	keyRetriever *dynamic.KeyRetriever,
 	// Need to make sure these are initialized, is there a better place to put them?
 	_ dashboardsnapshots.Service, _ *alerting.AlertNotificationService,
 	_ serviceaccounts.Service, _ *guardian.Provider,
@@ -88,7 +88,7 @@ func ProvideBackgroundServiceRegistry(
 		loginAttemptService,
 		bundleService,
 		publicDashboardsMetric,
-		signature,
+		keyRetriever,
 	)
 }
 
diff --git a/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever.go b/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever.go
new file mode 100644
index 00000000000..4459de59c40
--- /dev/null
+++ b/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever.go
@@ -0,0 +1,234 @@
+package dynamic
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"sync"
+	"time"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+const publicKeySyncInterval = 10 * 24 * time.Hour // 10 days
+
+// ManifestKeys is the database representation of public keys
+// used to verify plugin manifests.
+type ManifestKeys struct {
+	KeyID     string `json:"keyId"`
+	PublicKey string `json:"public"`
+	Since     int64  `json:"since"`
+}
+
+type KeyRetriever struct {
+	cfg *config.Cfg
+	log log.Logger
+
+	lock    sync.Mutex
+	cli     http.Client
+	kv      plugins.KeyStore
+	hasKeys bool
+}
+
+var _ plugins.KeyRetriever = (*KeyRetriever)(nil)
+
+func ProvideService(cfg *config.Cfg, kv plugins.KeyStore) *KeyRetriever {
+	kr := &KeyRetriever{
+		cfg: cfg,
+		log: log.New("plugin.signature.key_retriever"),
+		cli: makeHttpClient(),
+		kv:  kv,
+	}
+	return kr
+}
+
+// IsDisabled disables dynamic retrieval of public keys from the API server.
+func (kr *KeyRetriever) IsDisabled() bool {
+	return !kr.cfg.Features.IsEnabled(featuremgmt.FlagPluginsAPIManifestKey)
+}
+
+func (kr *KeyRetriever) Run(ctx context.Context) error {
+	// do an initial update if necessary
+	err := kr.updateKeys(ctx)
+	if err != nil {
+		kr.log.Error("Error downloading plugin manifest keys", "error", err)
+	}
+
+	// calculate initial send delay
+	lastUpdated, err := kr.kv.GetLastUpdated(ctx)
+	if err != nil {
+		return err
+	}
+	nextSendInterval := time.Until(lastUpdated.Add(publicKeySyncInterval))
+	if nextSendInterval < time.Minute {
+		nextSendInterval = time.Minute
+	}
+
+	downloadKeysTicker := time.NewTicker(nextSendInterval)
+	defer downloadKeysTicker.Stop()
+
+	select {
+	case <-downloadKeysTicker.C:
+		err = kr.updateKeys(ctx)
+		if err != nil {
+			kr.log.Error("Error downloading plugin manifest keys", "error", err)
+		}
+
+		if nextSendInterval != publicKeySyncInterval {
+			nextSendInterval = publicKeySyncInterval
+			downloadKeysTicker.Reset(nextSendInterval)
+		}
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+
+	return ctx.Err()
+}
+
+func (kr *KeyRetriever) updateKeys(ctx context.Context) error {
+	kr.lock.Lock()
+	defer kr.lock.Unlock()
+
+	lastUpdated, err := kr.kv.GetLastUpdated(ctx)
+	if err != nil {
+		return err
+	}
+	if time.Since(*lastUpdated) < publicKeySyncInterval {
+		// Cache is still valid
+		return nil
+	}
+
+	return kr.downloadKeys(ctx)
+}
+
+// Retrieve the key from the API and store it in the database
+func (kr *KeyRetriever) downloadKeys(ctx context.Context) error {
+	var data struct {
+		Items []ManifestKeys
+	}
+
+	url, err := url.JoinPath(kr.cfg.GrafanaComURL, "/api/plugins/ci/keys") // nolint:gosec URL is provided by config
+	if err != nil {
+		return err
+	}
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		return err
+	}
+
+	resp, err := kr.cli.Do(req)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		err := resp.Body.Close()
+		if err != nil {
+			kr.log.Warn("error closing response body", "error", err)
+		}
+	}()
+
+	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
+		return err
+	}
+
+	if len(data.Items) == 0 {
+		return errors.New("missing public key")
+	}
+
+	cachedKeys, err := kr.kv.ListKeys(ctx)
+	if err != nil {
+		return err
+	}
+
+	shouldKeep := make(map[string]bool)
+	for _, key := range data.Items {
+		err = kr.kv.Set(ctx, key.KeyID, key.PublicKey)
+		if err != nil {
+			return err
+		}
+		shouldKeep[key.KeyID] = true
+	}
+
+	// Delete keys that are no longer in the API
+	for _, key := range cachedKeys {
+		if !shouldKeep[key] {
+			err = kr.kv.Del(ctx, key)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// Update the last updated timestamp
+	return kr.kv.SetLastUpdated(ctx)
+}
+
+func (kr *KeyRetriever) ensureKeys(ctx context.Context) error {
+	if kr.hasKeys {
+		return nil
+	}
+	keys, err := kr.kv.ListKeys(ctx)
+	if err != nil {
+		return err
+	}
+	if len(keys) == 0 {
+		// Populate with the default key
+		err := kr.kv.Set(ctx, statickey.GetDefaultKeyID(), statickey.GetDefaultKey())
+		if err != nil {
+			return err
+		}
+	}
+	kr.hasKeys = true
+	return nil
+}
+
+// GetPublicKey loads public keys from:
+//   - The hard-coded value if the feature flag is not enabled.
+//   - A cached value from kv storage if it has been already retrieved. This cache is populated from the grafana.com API.
+func (kr *KeyRetriever) GetPublicKey(ctx context.Context, keyID string) (string, error) {
+	kr.lock.Lock()
+	defer kr.lock.Unlock()
+
+	err := kr.ensureKeys(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	key, exist, err := kr.kv.Get(ctx, keyID)
+	if err != nil {
+		return "", err
+	}
+	if exist {
+		return key, nil
+	}
+
+	return "", fmt.Errorf("missing public key for %s", keyID)
+}
+
+// Same configuration as pkg/plugins/repo/client.go
+func makeHttpClient() http.Client {
+	tr := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		DialContext: (&net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+		}).DialContext,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+
+	return http.Client{
+		Timeout:   10 * time.Second,
+		Transport: tr,
+	}
+}
diff --git a/pkg/plugins/manager/signature/manifestverifier/verifier_test.go b/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever_test.go
similarity index 75%
rename from pkg/plugins/manager/signature/manifestverifier/verifier_test.go
rename to pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever_test.go
index 2d5ed092d22..acd46e7db69 100644
--- a/pkg/plugins/manager/signature/manifestverifier/verifier_test.go
+++ b/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever_test.go
@@ -1,42 +1,20 @@
-package manifestverifier
+package dynamic
 
 import (
 	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
 	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/stretchr/testify/require"
 )
 
-func Test_Verify(t *testing.T) {
-	t.Run("it should verify a manifest with the default key", func(t *testing.T) {
-		v := New(&config.Cfg{}, log.New("test"), keystore.ProvideService(kvstore.NewFakeKVStore()))
-
-		body, err := os.ReadFile("../../testdata/test-app/MANIFEST.txt")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		block, _ := clearsign.Decode(body)
-		if block == nil {
-			t.Fatal("failed to decode")
-		}
-
-		err = v.Verify(context.Background(), "7e4d0c6a708866e7", block)
-		require.NoError(t, err)
-	})
-}
-
 func setFakeAPIServer(t *testing.T, publicKey string, keyID string) (*httptest.Server, chan bool) {
 	done := make(chan bool)
 	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -64,14 +42,14 @@ func setFakeAPIServer(t *testing.T, publicKey string, keyID string) (*httptest.S
 	})), done
 }
 func Test_PublicKeyUpdate(t *testing.T) {
-	t.Run("it should verify a manifest with the API key", func(t *testing.T) {
+	t.Run("it should retrieve an API key", func(t *testing.T) {
 		cfg := &config.Cfg{
 			Features: featuremgmt.WithFeatures([]interface{}{featuremgmt.FlagPluginsAPIManifestKey}...),
 		}
 		expectedKey := "fake"
 		s, done := setFakeAPIServer(t, expectedKey, "7e4d0c6a708866e7")
 		cfg.GrafanaComURL = s.URL
-		v := New(cfg, log.New("test"), keystore.ProvideService(kvstore.NewFakeKVStore()))
+		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()))
 		go func() {
 			err := v.Run(context.Background())
 			require.NoError(t, err)
@@ -94,7 +72,7 @@ func Test_PublicKeyUpdate(t *testing.T) {
 		expectedKey := "fake"
 		s, done := setFakeAPIServer(t, expectedKey, "7e4d0c6a708866e7")
 		cfg.GrafanaComURL = s.URL
-		v := New(cfg, log.New("test"), keystore.ProvideService(kvstore.NewFakeKVStore()))
+		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()))
 		go func() {
 			err := v.Run(context.Background())
 			require.NoError(t, err)
@@ -116,7 +94,7 @@ func Test_PublicKeyUpdate(t *testing.T) {
 		expectedKey := "fake"
 		s, done := setFakeAPIServer(t, expectedKey, "other")
 		cfg.GrafanaComURL = s.URL
-		v := New(cfg, log.New("test"), keystore.ProvideService(kvstore.NewFakeKVStore()))
+		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()))
 		go func() {
 			err := v.Run(context.Background())
 			require.NoError(t, err)
diff --git a/pkg/services/pluginsintegration/keyretriever/retriever.go b/pkg/services/pluginsintegration/keyretriever/retriever.go
new file mode 100644
index 00000000000..b22ef5d0948
--- /dev/null
+++ b/pkg/services/pluginsintegration/keyretriever/retriever.go
@@ -0,0 +1,29 @@
+package keyretriever
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever/dynamic"
+)
+
+var _ plugins.KeyRetriever = (*Service)(nil)
+
+type Service struct {
+	kr plugins.KeyRetriever
+}
+
+func ProvideService(dkr *dynamic.KeyRetriever) *Service {
+	s := &Service{}
+	if !dkr.IsDisabled() {
+		s.kr = dkr
+	} else {
+		s.kr = statickey.New()
+	}
+	return s
+}
+
+func (kr *Service) GetPublicKey(ctx context.Context, keyID string) (string, error) {
+	return kr.kr.GetPublicKey(ctx, keyID)
+}
diff --git a/pkg/services/pluginsintegration/keyretriever/retriever_test.go b/pkg/services/pluginsintegration/keyretriever/retriever_test.go
new file mode 100644
index 00000000000..5a35674d81a
--- /dev/null
+++ b/pkg/services/pluginsintegration/keyretriever/retriever_test.go
@@ -0,0 +1,26 @@
+package keyretriever
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/kvstore"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever/dynamic"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_GetPublicKey(t *testing.T) {
+	t.Run("it should return a static key", func(t *testing.T) {
+		cfg := &config.Cfg{
+			Features: featuremgmt.WithFeatures(),
+		}
+		kr := ProvideService(dynamic.ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
+		key, err := kr.GetPublicKey(context.Background(), statickey.GetDefaultKeyID())
+		require.NoError(t, err)
+		require.Equal(t, statickey.GetDefaultKey(), key)
+	})
+}
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index 64c5daf6478..2f6d18670a0 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -26,6 +26,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/oauthtoken"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever/dynamic"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
@@ -71,6 +73,9 @@ var WireSet = wire.NewSet(
 	signature.ProvideService,
 	wire.Bind(new(plugins.KeyStore), new(*keystore.Service)),
 	keystore.ProvideService,
+	wire.Bind(new(plugins.KeyRetriever), new(*keyretriever.Service)),
+	keyretriever.ProvideService,
+	dynamic.ProvideService,
 )
 
 // WireExtensionSet provides a wire.ProviderSet of plugin providers that can be

From 97ddfa631bafbf67a941075531b6d774ee0cebc0 Mon Sep 17 00:00:00 2001
From: MattiasSegerdahl <102952046+MattiasSegerdahl@users.noreply.github.com>
Date: Thu, 27 Apr 2023 17:55:48 +0200
Subject: [PATCH 486/729] Update configure tracing (#67163)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 .../configure-grafana/configure-tracing/index.md              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/configure-tracing/index.md b/docs/sources/setup-grafana/configure-grafana/configure-tracing/index.md
index 2a1bb76614d..a2db0d1ecb8 100644
--- a/docs/sources/setup-grafana/configure-grafana/configure-tracing/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/configure-tracing/index.md
@@ -9,12 +9,12 @@ weight: 200
 
 # Configure tracing to troubleshoot Grafana
 
-You can set up the `grafana` server process to enable certain diagnostics when it starts. This can be helpful
+You can set up the `grafana-server` process to enable certain diagnostics when it starts. This can be useful
 when investigating certain performance problems. It's _not_ recommended to have these enabled by default.
 
 ## Turn on profiling
 
-The `grafana-server` can be started with the arguments `-profile` to enable profiling, `-profile-addr` to override the default HTTP address (`localhost`), and
+The `grafana-server` can be started with the command-line option `-profile` to enable profiling, `-profile-addr` to override the default HTTP address (`localhost`), and
 `-profile-port` to override the default HTTP port (`6060`) where the `pprof` debugging endpoints are available. For example:
 
 ```bash

From 278a8fccc9c24b109691e77a0c9a7314bdb3a7ed Mon Sep 17 00:00:00 2001
From: Eric Wang <2069450+ericdwang@users.noreply.github.com>
Date: Thu, 27 Apr 2023 09:02:06 -0700
Subject: [PATCH 487/729] Docs: Fix broken links to section on Variable syntax
 page (#67340)

These links have a trailing slash which don't work when linking to a
specific element.
---
 docs/sources/dashboards/variables/variable-syntax/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/dashboards/variables/variable-syntax/index.md b/docs/sources/dashboards/variables/variable-syntax/index.md
index 24717a00f02..fdfb8e84d32 100644
--- a/docs/sources/dashboards/variables/variable-syntax/index.md
+++ b/docs/sources/dashboards/variables/variable-syntax/index.md
@@ -22,7 +22,7 @@ Panel titles and metric queries can refer to variables using two different synta
   This syntax is easy to read, but it does not allow you to use a variable in the middle of a word.
   **Example:** apps.frontend.$server.requests.count
 - `${var_name}` Use this syntax when you want to interpolate a variable in the middle of an expression.
-- `${var_name:<format>}` This format gives you more control over how Grafana interpolates values. Refer to [Advanced variable format options]({{< relref "#advanced-variable-format-options/" >}}) for more detail on all the formatting types.
+- `${var_name:<format>}` This format gives you more control over how Grafana interpolates values. Refer to [Advanced variable format options]({{< relref "#advanced-variable-format-options" >}}) for more detail on all the formatting types.
 - `[[varname]]` Do not use. Deprecated old syntax, will be removed in a future release.
 
 Before queries are sent to your data source the query is _interpolated_, meaning the variable is replaced with its current value. During
@@ -30,7 +30,7 @@ interpolation, the variable value might be _escaped_ in order to conform to the
 For example, a variable used in a regex expression in an InfluxDB or Prometheus query will be regex escaped. Read the data source specific
 documentation topic for details on value escaping during interpolation.
 
-For advanced syntax to override data source default formatting, refer to [Advanced variable format options]({{< relref "#advanced-variable-format-options/" >}}).
+For advanced syntax to override data source default formatting, refer to [Advanced variable format options]({{< relref "#advanced-variable-format-options" >}}).
 
 ## Advanced variable format options
 

From 35407142d0ba3ff1673cc4b157dd964db8be7011 Mon Sep 17 00:00:00 2001
From: Kristian Bremberg <114284895+KristianGrafana@users.noreply.github.com>
Date: Thu, 27 Apr 2023 18:20:37 +0200
Subject: [PATCH 488/729] Feature: Trusted Types support (#64975)

* Draft: Feature: Trusted Types support

* remove trusted-types package

* Create policy before jQuery and Angular is loaded and add feature flag

* Add trustedTypePolicies

* Sanitize scriptURL

* Add TT meta tag for test env

* Move trusted types into core

* Add DOMParser support for TrustedHTML

* Seperate RSS sanitization and add better TrustedHTML support

* Get test CSP header from config

* Remove dompurify dep from core

* Add documentation for trusted types

* Apply suggestions from code review

Co-authored-by: Kristian Bremberg <114284895+KristianGrafana@users.noreply.github.com>

* Add comment about Github discussion thread and things breaking

* Remove changes from News panel

* Remove TT feature toggle

* Expose TT and CSPReportOnly to frontend

* Log errors in console when CSP report only is enabled

* Log error for reporting and remove test mode

* Only insert CSP header in HTML for dev env

* Update docs

---------

Co-authored-by: Tobias Skarhed <tobias.skarhed@gmail.com>
Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
---
 .../configure-security-hardening/index.md     | 18 ++++++++++++
 package.json                                  |  2 +-
 packages/grafana-data/src/text/index.ts       |  4 +++
 packages/grafana-data/src/text/sanitize.ts    | 13 +++++++++
 packages/grafana-data/src/types/config.ts     |  2 ++
 packages/grafana-runtime/src/config.ts        |  2 ++
 pkg/api/dtos/frontend_settings.go             |  2 ++
 pkg/api/dtos/index.go                         |  3 ++
 pkg/api/frontendsettings.go                   |  4 +++
 pkg/api/index.go                              |  7 +++++
 pkg/middleware/csp.go                         |  6 ++--
 public/app/core/trustedTypePolicies.ts        | 29 +++++++++++++++++++
 public/app/index.ts                           |  1 +
 public/app/types/window.d.ts                  |  5 ++++
 public/views/index-template.html              |  4 +++
 scripts/grafana-server/custom.ini             |  4 +++
 yarn.lock                                     |  9 +++++-
 17 files changed, 110 insertions(+), 5 deletions(-)
 create mode 100644 public/app/core/trustedTypePolicies.ts

diff --git a/docs/sources/setup-grafana/configure-security/configure-security-hardening/index.md b/docs/sources/setup-grafana/configure-security/configure-security-hardening/index.md
index d1e1b43b904..ff46f214a31 100644
--- a/docs/sources/setup-grafana/configure-security/configure-security-hardening/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-security-hardening/index.md
@@ -74,6 +74,24 @@ content_security_policy = true
 content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
 ```
 
+### Enable trusted types
+
+**Currently in development. [Trusted types](https://github.com/w3c/trusted-types/blob/main/explainer.md) is an experimental Javascript API with [limited browser support](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/trusted-types#browser_compatibility).**
+
+Trusted types reduce the risk of DOM XSS by enforcing developers to sanitize strings that are used in injection sinks, such as setting `innerHTML` on an element. Furthermore, when enabling trusted types, these injection sinks need to go through a policy that will sanitize, or leave the string intact and return it as "safe". This provides some protection from client side injection vulnerabilities in third party libraries, such as jQuery, Angular and even third party plugins.
+
+To enable trusted types in enforce mode, where injection sinks are automatically sanitized:
+
+- Enable `content_security_policy` in the configuration.
+- Add `require-trusted-types-for 'script'` to the `content_security_policy_template` in the configuration.
+
+To enable trusted types in report mode, where inputs that have not been sanitized with trusted types will be logged to the console:
+
+- Enable `content_security_policy_report_only` in the configuration.
+- Add `require-trusted-types-for 'script'` to the `content_security_policy_report_only_template` in the configuration.
+
+As this is a feature currently in development, things may break. If they do, or if you have any other feedback, feel free to [leave a comment](https://github.com/grafana/grafana/discussions/66823).
+
 ## Additional security hardening
 
 The Grafana server has several built-in security features that you can opt-in to enhance security. This section describes additional techniques you can use to harden security.
diff --git a/package.json b/package.json
index 1f096332438..c8f867300e0 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,6 @@
     "@types/d3-force": "^3.0.0",
     "@types/d3-scale-chromatic": "3.0.0",
     "@types/debounce-promise": "3.1.6",
-    "@types/dompurify": "^2",
     "@types/eslint": "8.21.1",
     "@types/file-saver": "2.0.5",
     "@types/glob": "^8.0.0",
@@ -293,6 +292,7 @@
     "@sentry/utils": "6.19.7",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/react-resizable": "3.0.3",
+    "@types/trusted-types": "2.0.3",
     "@types/webpack-env": "1.18.0",
     "@visx/event": "3.0.1",
     "@visx/gradient": "3.0.0",
diff --git a/packages/grafana-data/src/text/index.ts b/packages/grafana-data/src/text/index.ts
index 13d9631e63d..f9ca55a5472 100644
--- a/packages/grafana-data/src/text/index.ts
+++ b/packages/grafana-data/src/text/index.ts
@@ -8,6 +8,8 @@ import {
   sanitizeUrl,
   sanitizeTextPanelContent,
   sanitizeSVGContent,
+  sanitizeTrustedTypes,
+  sanitizeTrustedTypesRSS,
 } from './sanitize';
 
 export const textUtil = {
@@ -17,4 +19,6 @@ export const textUtil = {
   sanitizeTextPanelContent,
   sanitizeUrl,
   sanitizeSVGContent,
+  sanitizeTrustedTypes,
+  sanitizeTrustedTypesRSS,
 };
diff --git a/packages/grafana-data/src/text/sanitize.ts b/packages/grafana-data/src/text/sanitize.ts
index 8f053b530b5..53e403d8e48 100644
--- a/packages/grafana-data/src/text/sanitize.ts
+++ b/packages/grafana-data/src/text/sanitize.ts
@@ -47,6 +47,19 @@ export function sanitize(unsanitizedString: string): string {
   }
 }
 
+export function sanitizeTrustedTypesRSS(unsanitizedString: string): TrustedHTML {
+  return DOMPurify.sanitize(unsanitizedString, {
+    RETURN_TRUSTED_TYPE: true,
+    ADD_ATTR: ['xmlns:atom', 'version', 'property', 'content'],
+    ADD_TAGS: ['rss', 'meta', 'channel', 'title', 'link', 'description', 'atom:link', 'item', 'pubDate', 'guid'],
+    PARSER_MEDIA_TYPE: 'application/xhtml+xml',
+  });
+}
+
+export function sanitizeTrustedTypes(unsanitizedString: string): TrustedHTML {
+  return DOMPurify.sanitize(unsanitizedString, { RETURN_TRUSTED_TYPE: true });
+}
+
 /**
  * Returns string safe from XSS attacks to be used in the Text panel plugin.
  *
diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index 2ab9070db16..b992b4a629c 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -198,6 +198,8 @@ export interface GrafanaConfig {
   viewersCanEdit: boolean;
   editorsCanAdmin: boolean;
   disableSanitizeHtml: boolean;
+  trustedTypesDefaultPolicyEnabled: boolean;
+  cspReportOnlyEnabled: boolean;
   liveEnabled: boolean;
   /** @deprecated Use `theme2` instead. */
   theme: GrafanaTheme;
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index 1b89e4692f8..fd577222fac 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -81,6 +81,8 @@ export class GrafanaBootConfig implements GrafanaConfig {
   viewersCanEdit = false;
   editorsCanAdmin = false;
   disableSanitizeHtml = false;
+  trustedTypesDefaultPolicyEnabled = false;
+  cspReportOnlyEnabled = false;
   liveEnabled = true;
   /** @deprecated Use `theme2` instead. */
   theme: GrafanaTheme;
diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go
index 4eeaeae98f2..eb6be451dad 100644
--- a/pkg/api/dtos/frontend_settings.go
+++ b/pkg/api/dtos/frontend_settings.go
@@ -164,6 +164,8 @@ type FrontendSettingsDTO struct {
 	AngularSupportEnabled               bool   `json:"angularSupportEnabled"`
 	EditorsCanAdmin                     bool   `json:"editorsCanAdmin"`
 	DisableSanitizeHtml                 bool   `json:"disableSanitizeHtml"`
+	TrustedTypesDefaultPolicyEnabled    bool   `json:"trustedTypesDefaultPolicyEnabled"`
+	CSPReportOnlyEnabled                bool   `json:"cspReportOnlyEnabled"`
 
 	Auth FrontendSettingsAuthDTO `json:"auth"`
 
diff --git a/pkg/api/dtos/index.go b/pkg/api/dtos/index.go
index 8e5face1a97..1a25f45a796 100644
--- a/pkg/api/dtos/index.go
+++ b/pkg/api/dtos/index.go
@@ -30,6 +30,9 @@ type IndexViewData struct {
 	Sentry                              *setting.Sentry
 	ContentDeliveryURL                  string
 	LoadingLogo                         template.URL
+	CSPContent                          string
+	CSPEnabled                          bool
+	IsDevelopmentEnv                    bool
 	// Nonce is a cryptographic identifier for use with Content Security Policy.
 	Nonce string
 }
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 98c3da08cee..5f595b1fc63 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/plugins"
@@ -89,6 +90,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 
 	hasAccess := accesscontrol.HasAccess(hs.AccessControl, c)
 	secretsManagerPluginEnabled := kvstore.EvaluateRemoteSecretsPlugin(c.Req.Context(), hs.secretsPluginManager, hs.Cfg) == nil
+	trustedTypesDefaultPolicyEnabled := (hs.Cfg.CSPEnabled && strings.Contains(hs.Cfg.CSPTemplate, "require-trusted-types-for")) || (hs.Cfg.CSPReportOnlyEnabled && strings.Contains(hs.Cfg.CSPReportOnlyTemplate, "require-trusted-types-for"))
 
 	frontendSettings := &dtos.FrontendSettingsDTO{
 		DefaultDatasource:                   defaultDS,
@@ -137,6 +139,8 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		AngularSupportEnabled:               hs.Cfg.AngularSupportEnabled,
 		EditorsCanAdmin:                     hs.Cfg.EditorsCanAdmin,
 		DisableSanitizeHtml:                 hs.Cfg.DisableSanitizeHtml,
+		TrustedTypesDefaultPolicyEnabled:    trustedTypesDefaultPolicyEnabled,
+		CSPReportOnlyEnabled:                hs.Cfg.CSPReportOnlyEnabled,
 		DateFormats:                         hs.Cfg.DateFormats,
 		SecureSocksDSProxyEnabled:           hs.Cfg.SecureSocksDSProxy.Enabled,
 
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 1173bdcb957..6f88ca1bc40 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/middleware"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
@@ -139,6 +140,12 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 		Nonce:                               c.RequestNonce,
 		ContentDeliveryURL:                  hs.Cfg.GetContentDeliveryURL(hs.License.ContentDeliveryPrefix()),
 		LoadingLogo:                         "public/img/grafana_icon.svg",
+		IsDevelopmentEnv:                    hs.Cfg.Env == setting.Dev,
+	}
+
+	if hs.Cfg.CSPEnabled {
+		data.CSPEnabled = true
+		data.CSPContent = middleware.ReplacePolicyVariables(hs.Cfg.CSPTemplate, appURL, c.RequestNonce)
 	}
 
 	if !hs.AccessControl.IsDisabled() {
diff --git a/pkg/middleware/csp.go b/pkg/middleware/csp.go
index c5bd8691768..ebfd54c4450 100644
--- a/pkg/middleware/csp.go
+++ b/pkg/middleware/csp.go
@@ -45,7 +45,7 @@ func nonceMiddleware(next http.Handler, logger log.Logger) http.Handler {
 func cspMiddleware(cfg *setting.Cfg, next http.Handler, logger log.Logger) http.Handler {
 	return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
 		ctx := contexthandler.FromContext(req.Context())
-		policy := replacePolicyVariables(cfg.CSPTemplate, cfg.AppURL, ctx.RequestNonce)
+		policy := ReplacePolicyVariables(cfg.CSPTemplate, cfg.AppURL, ctx.RequestNonce)
 		rw.Header().Set("Content-Security-Policy", policy)
 		next.ServeHTTP(rw, req)
 	})
@@ -54,13 +54,13 @@ func cspMiddleware(cfg *setting.Cfg, next http.Handler, logger log.Logger) http.
 func cspReportOnlyMiddleware(cfg *setting.Cfg, next http.Handler, logger log.Logger) http.Handler {
 	return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
 		ctx := contexthandler.FromContext(req.Context())
-		policy := replacePolicyVariables(cfg.CSPReportOnlyTemplate, cfg.AppURL, ctx.RequestNonce)
+		policy := ReplacePolicyVariables(cfg.CSPReportOnlyTemplate, cfg.AppURL, ctx.RequestNonce)
 		rw.Header().Set("Content-Security-Policy-Report-Only", policy)
 		next.ServeHTTP(rw, req)
 	})
 }
 
-func replacePolicyVariables(policyTemplate, appURL, nonce string) string {
+func ReplacePolicyVariables(policyTemplate, appURL, nonce string) string {
 	policy := strings.ReplaceAll(policyTemplate, "$NONCE", fmt.Sprintf("'nonce-%s'", nonce))
 	re := regexp.MustCompile(`^\w+:(//)?`)
 	rootPath := re.ReplaceAllString(appURL, "")
diff --git a/public/app/core/trustedTypePolicies.ts b/public/app/core/trustedTypePolicies.ts
new file mode 100644
index 00000000000..997e4215194
--- /dev/null
+++ b/public/app/core/trustedTypePolicies.ts
@@ -0,0 +1,29 @@
+import { textUtil } from '@grafana/data';
+import { config } from '@grafana/runtime';
+
+const CSP_REPORT_ONLY_ENABLED = config.bootData.settings.cspReportOnlyEnabled;
+
+if (
+  config.bootData.settings.trustedTypesDefaultPolicyEnabled &&
+  window.trustedTypes &&
+  window.trustedTypes.createPolicy
+) {
+  // check if browser supports Trusted Types
+  window.trustedTypes.createPolicy('default', {
+    createHTML: (string, source, sink) => {
+      if (!CSP_REPORT_ONLY_ENABLED) {
+        return string.replace(/<script/gi, '&lt;script');
+      }
+      console.error('[HTML not sanitized with Trusted Types]', string, source, sink);
+      return string;
+    },
+    createScript: (string) => string,
+    createScriptURL: (string, source, sink) => {
+      if (!CSP_REPORT_ONLY_ENABLED) {
+        return textUtil.sanitizeUrl(string);
+      }
+      console.error('[ScriptURL not sanitized with Trusted Types]', string, source, sink);
+      return string;
+    },
+  });
+}
diff --git a/public/app/index.ts b/public/app/index.ts
index 5b68d3e94fa..6cbb37dfbec 100644
--- a/public/app/index.ts
+++ b/public/app/index.ts
@@ -1,3 +1,4 @@
+import './core/trustedTypePolicies';
 declare let __webpack_public_path__: string;
 declare let __webpack_nonce__: string;
 
diff --git a/public/app/types/window.d.ts b/public/app/types/window.d.ts
index 08ab5dc9105..4d9abb68d44 100644
--- a/public/app/types/window.d.ts
+++ b/public/app/types/window.d.ts
@@ -6,4 +6,9 @@ export declare global {
     public_cdn_path: string;
     nonce: string | undefined;
   }
+
+  // Augment DOMParser to accept TrustedType sanitised content
+  interface DOMParser {
+    parseFromString(string: string | TrustedType, type: DOMParserSupportedType): Document;
+  }
 }
diff --git a/public/views/index-template.html b/public/views/index-template.html
index 90b5914df84..7b5fa319481 100644
--- a/public/views/index-template.html
+++ b/public/views/index-template.html
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    [[ if and .CSPEnabled .IsDevelopmentEnv ]]
+    <!-- Cypress overwrites CSP headers in HTTP requests, so this is required for e2e tests-->
+    <meta  http-equiv="Content-Security-Policy" content="[[.CSPContent]]"/>
+    [[ end ]]
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
diff --git a/scripts/grafana-server/custom.ini b/scripts/grafana-server/custom.ini
index 5256269baa3..bf91c63aec1 100644
--- a/scripts/grafana-server/custom.ini
+++ b/scripts/grafana-server/custom.ini
@@ -1,3 +1,7 @@
+[security]
+content_security_policy = true
+content_security_policy_template = """require-trusted-types-for 'script'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
+
 [feature_toggles]
 enable = publicDashboards
 
diff --git a/yarn.lock b/yarn.lock
index ecfb4884782..0cd65e92e8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10499,6 +10499,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/trusted-types@npm:2.0.3":
+  version: 2.0.3
+  resolution: "@types/trusted-types@npm:2.0.3"
+  checksum: 4794804bc4a4a173d589841b6d26cf455ff5dc4f3e704e847de7d65d215f2e7043d8757e4741ce3a823af3f08260a8d04a1a6e9c5ec9b20b7b04586956a6b005
+  languageName: node
+  linkType: hard
+
 "@types/uglify-js@npm:*":
   version: 3.13.1
   resolution: "@types/uglify-js@npm:3.13.1"
@@ -20222,7 +20229,6 @@ __metadata:
     "@types/d3-force": ^3.0.0
     "@types/d3-scale-chromatic": 3.0.0
     "@types/debounce-promise": 3.1.6
-    "@types/dompurify": ^2
     "@types/eslint": 8.21.1
     "@types/file-saver": 2.0.5
     "@types/glob": ^8.0.0
@@ -20264,6 +20270,7 @@ __metadata:
     "@types/slate-react": 0.22.9
     "@types/testing-library__jest-dom": 5.14.5
     "@types/tinycolor2": 1.4.3
+    "@types/trusted-types": 2.0.3
     "@types/uuid": 9.0.1
     "@types/webpack-env": 1.18.0
     "@types/yargs": 17.0.22

From fc3737bf4f00681cc1b3cc0d4829bfa7a1e4cb31 Mon Sep 17 00:00:00 2001
From: Juan Cabanas <juan.cabanas@grafana.com>
Date: Thu, 27 Apr 2023 14:20:03 -0300
Subject: [PATCH 489/729] PublicDashboards: Email sharing users page  (#67124)

---
 .../src/selectors/pages.ts                    |  21 ++
 .../app/features/admin/UserListAdminPage.tsx  |   5 +-
 .../app/features/admin/UserListPage.test.tsx  | 202 ++++++++++++++++++
 public/app/features/admin/UserListPage.tsx    |  71 +++++-
 .../DashboardsListModalButton.tsx             | 108 ++++++++++
 .../DeleteUserModalButton.tsx                 |  49 +++++
 .../UserListPublicDashboardPage.tsx           |  61 ++++++
 .../dashboard/api/publicDashboardApi.ts       |  20 +-
 .../ConfigPublicDashboard.tsx                 |   4 +-
 .../SharePublicDashboardUtils.test.tsx        |   2 +-
 .../SharePublicDashboardUtils.ts              |  18 +-
 .../DeletePublicDashboardModal.tsx            |   2 +-
 .../PublicDashboardListTable.test.tsx         |   8 +-
 .../PublicDashboardListTable.tsx              |   7 +-
 public/app/features/users/UsersListPage.tsx   |   5 +-
 15 files changed, 553 insertions(+), 30 deletions(-)
 create mode 100644 public/app/features/admin/UserListPage.test.tsx
 create mode 100644 public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
 create mode 100644 public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx
 create mode 100644 public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx

diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index 95cd03e5b25..fd3412b8559 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -289,11 +289,32 @@ export const Pages = {
     },
   },
   UserListPage: {
+    tabs: {
+      allUsers: 'data-testid all-users-tab',
+      orgUsers: 'data-testid org-users-tab',
+      publicDashboardsUsers: 'data-testid public-dashboards-users-tab',
+      users: 'data-testid users-tab',
+    },
     org: {
       url: '/org/users',
     },
     admin: {
       url: '/admin/users',
     },
+    publicDashboards: {
+      container: 'data-testid public-dashboards-users-list',
+    },
+    UserListAdminPage: {
+      container: 'data-testid user-list-admin-page',
+    },
+    UsersListPage: {
+      container: 'data-testid users-list-page',
+    },
+    UsersListPublicDashboardsPage: {
+      container: 'data-testid users-list-public-dashboards-page',
+      DashboardsListModal: {
+        listItem: (uid: string) => `data-testid dashboards-list-item-${uid}`,
+      },
+    },
   },
 };
diff --git a/public/app/features/admin/UserListAdminPage.tsx b/public/app/features/admin/UserListAdminPage.tsx
index a1c6e1f0327..66fa7929bc0 100644
--- a/public/app/features/admin/UserListAdminPage.tsx
+++ b/public/app/features/admin/UserListAdminPage.tsx
@@ -3,6 +3,7 @@ import React, { ComponentType, useEffect, useMemo, memo } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import {
   Icon,
   IconName,
@@ -32,6 +33,8 @@ export const addExtraFilters = (filter: ComponentType<FilterProps>) => {
   extraFilters.push(filter);
 };
 
+const selectors = e2eSelectors.pages.UserListPage.UserListAdminPage;
+
 const mapDispatchToProps = {
   fetchUsers,
   changeQuery,
@@ -78,7 +81,7 @@ const UserListAdminPageUnConnected = ({
 
   return (
     <Page.Contents>
-      <div className="page-action-bar">
+      <div className="page-action-bar" data-testid={selectors.container}>
         <div className="gf-form gf-form--grow">
           <FilterInput
             placeholder="Search user by login, email, or name."
diff --git a/public/app/features/admin/UserListPage.test.tsx b/public/app/features/admin/UserListPage.test.tsx
new file mode 100644
index 00000000000..1f917648f49
--- /dev/null
+++ b/public/app/features/admin/UserListPage.test.tsx
@@ -0,0 +1,202 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
+import { GrafanaBootConfig } from '@grafana/runtime/src';
+import config from 'app/core/config';
+
+import { TestProvider } from '../../../test/helpers/TestProvider';
+import { contextSrv } from '../../core/services/context_srv';
+
+import UserListPage from './UserListPage';
+
+const selectors = e2eSelectors.pages.UserListPage;
+const tabsSelector = selectors.tabs;
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getBackendSrv: () => ({ get: jest.fn().mockResolvedValue([]) }),
+}));
+
+jest.mock('./UserListAdminPage', () => ({
+  UserListAdminPageContent: () => <div data-testid={selectors.UserListAdminPage.container} />,
+}));
+jest.mock('../users/UsersListPage', () => ({
+  UsersListPageContent: () => <div data-testid={selectors.UsersListPage.container} />,
+}));
+jest.mock('./UserListPublicDashboardPage/UserListPublicDashboardPage', () => ({
+  UserListPublicDashboardPage: () => <div data-testid={selectors.UsersListPublicDashboardsPage.container} />,
+}));
+
+const renderPage = () => {
+  render(
+    <TestProvider>
+      <UserListPage />
+    </TestProvider>
+  );
+};
+
+const enableEmailSharing = () => {
+  config.featureToggles.publicDashboardsEmailSharing = true;
+  config.featureToggles.publicDashboards = true;
+  config.licenseInfo = { ...config.licenseInfo, enabledFeatures: { publicDashboardsEmailSharing: true } };
+};
+
+let originalConfigData: GrafanaBootConfig;
+
+beforeEach(() => {
+  originalConfigData = { ...config };
+});
+
+afterEach(() => {
+  config.featureToggles = originalConfigData.featureToggles;
+  config.licenseInfo = originalConfigData.licenseInfo;
+});
+
+describe('Tabs rendering', () => {
+  it('should render All and Org Users tabs when user has permissions to read to org users and is admin', async () => {
+    jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(true);
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
+
+    renderPage();
+
+    expect(screen.getByTestId(tabsSelector.allUsers)).toBeInTheDocument();
+    expect(screen.getByTestId(tabsSelector.orgUsers)).toBeInTheDocument();
+    expect(screen.queryByTestId(tabsSelector.publicDashboardsUsers)).not.toBeInTheDocument();
+  });
+  it('should render All, Org and Public dashboard tabs when user has permissions to read org users, is admin and has email sharing enabled', async () => {
+    jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(true);
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
+
+    enableEmailSharing();
+    renderPage();
+
+    expect(screen.getByTestId(tabsSelector.allUsers)).toBeInTheDocument();
+    expect(screen.getByTestId(tabsSelector.orgUsers)).toBeInTheDocument();
+    expect(screen.getByTestId(tabsSelector.publicDashboardsUsers)).toBeInTheDocument();
+  });
+  describe('No permissions to read org users or not admin', () => {
+    [
+      {
+        hasOrgReadPermissions: false,
+        isAdmin: true,
+      },
+      {
+        hasOrgReadPermissions: true,
+        isAdmin: false,
+      },
+    ].forEach((scenario) => {
+      it('should render no tabs when user has no permissions to read org users or is not admin', async () => {
+        jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(scenario.hasOrgReadPermissions);
+        jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(scenario.isAdmin);
+
+        renderPage();
+
+        expect(screen.queryByTestId(tabsSelector.allUsers)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(tabsSelector.orgUsers)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(tabsSelector.publicDashboardsUsers)).not.toBeInTheDocument();
+      });
+    });
+  });
+  describe('No permissions to read org users or not admin but email sharing enabled', () => {
+    [
+      {
+        title: 'user has no permissions to read org users',
+        hasOrgReadPermissions: false,
+        isAdmin: true,
+      },
+      {
+        title: 'user is not admin',
+        hasOrgReadPermissions: true,
+        isAdmin: false,
+      },
+    ].forEach((scenario) => {
+      it(`should render User and Public dashboard tabs when ${scenario.title} but has email sharing enabled`, async () => {
+        jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(scenario.hasOrgReadPermissions);
+        jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(scenario.isAdmin);
+
+        enableEmailSharing();
+        renderPage();
+
+        expect(screen.queryByTestId(tabsSelector.allUsers)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(tabsSelector.orgUsers)).not.toBeInTheDocument();
+
+        expect(screen.getByTestId(tabsSelector.users)).toBeInTheDocument();
+        expect(screen.getByTestId(tabsSelector.publicDashboardsUsers)).toBeInTheDocument();
+      });
+    });
+  });
+});
+
+describe('Tables rendering', () => {
+  it('should render UserListAdminPage when user is admin', () => {
+    jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(true);
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
+
+    renderPage();
+
+    expect(screen.getByTestId(tabsSelector.allUsers).className.includes('activeTabStyle')).toBeTruthy();
+    expect(screen.getByTestId(tabsSelector.orgUsers)).toBeInTheDocument();
+
+    expect(screen.getByTestId(selectors.UserListAdminPage.container)).toBeInTheDocument();
+  });
+  it('should render UsersListPage when user is admin and has org read permissions', async () => {
+    jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(true);
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
+
+    renderPage();
+
+    expect(screen.getByTestId(tabsSelector.allUsers).className.includes('activeTabStyle')).toBeTruthy();
+    expect(screen.getByTestId(tabsSelector.orgUsers)).toBeInTheDocument();
+    expect(screen.getByTestId(selectors.UserListAdminPage.container)).toBeInTheDocument();
+
+    await userEvent.click(screen.getByTestId(tabsSelector.orgUsers));
+    expect(screen.getByTestId(tabsSelector.orgUsers).className.includes('activeTabStyle')).toBeTruthy();
+    expect(screen.getByTestId(selectors.UsersListPage.container)).toBeInTheDocument();
+  });
+  it('should render UsersListPage when user has org read permissions and is not admin', async () => {
+    jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(false);
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
+
+    renderPage();
+
+    expect(screen.queryByTestId(tabsSelector.allUsers)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(tabsSelector.orgUsers)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(tabsSelector.users)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(tabsSelector.publicDashboardsUsers)).not.toBeInTheDocument();
+
+    expect(screen.getByTestId(selectors.UsersListPage.container)).toBeInTheDocument();
+  });
+  it('should render UserListPublicDashboardPage when user has email sharing enabled and is not admin', async () => {
+    jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(false);
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
+
+    enableEmailSharing();
+    renderPage();
+
+    expect(screen.queryByTestId(tabsSelector.allUsers)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(tabsSelector.orgUsers)).not.toBeInTheDocument();
+
+    expect(screen.queryByTestId(tabsSelector.users)).toBeInTheDocument();
+    expect(screen.queryByTestId(tabsSelector.publicDashboardsUsers)).toBeInTheDocument();
+
+    await userEvent.click(screen.getByTestId(tabsSelector.publicDashboardsUsers));
+    expect(screen.getByTestId(tabsSelector.publicDashboardsUsers).className.includes('activeTabStyle')).toBeTruthy();
+    expect(screen.getByTestId(selectors.UsersListPublicDashboardsPage.container)).toBeInTheDocument();
+  });
+  it('should render UsersListPage when user is not admin and does not have nor org read perms neither email sharing enabled', async () => {
+    jest.spyOn(contextSrv, 'hasAccess').mockReturnValue(false);
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(false);
+
+    renderPage();
+
+    expect(screen.queryByTestId(tabsSelector.allUsers)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(tabsSelector.orgUsers)).not.toBeInTheDocument();
+
+    expect(screen.queryByTestId(tabsSelector.users)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(tabsSelector.publicDashboardsUsers)).not.toBeInTheDocument();
+
+    expect(screen.getByTestId(selectors.UsersListPage.container)).toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/admin/UserListPage.tsx b/public/app/features/admin/UserListPage.tsx
index e3bbbb65ff7..90764f9b40a 100644
--- a/public/app/features/admin/UserListPage.tsx
+++ b/public/app/features/admin/UserListPage.tsx
@@ -2,6 +2,8 @@ import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
+import { config, featureEnabled } from '@grafana/runtime';
 import { useStyles2, TabsBar, Tab } from '@grafana/ui';
 import { contextSrv } from 'app/core/services/context_srv';
 
@@ -10,31 +12,84 @@ import { AccessControlAction } from '../../types';
 import { UsersListPageContent } from '../users/UsersListPage';
 
 import { UserListAdminPageContent } from './UserListAdminPage';
+import { UserListPublicDashboardPage } from './UserListPublicDashboardPage/UserListPublicDashboardPage';
+
+enum TabView {
+  ADMIN = 'admin',
+  ORG = 'org',
+  PUBLIC_DASHBOARDS = 'public-dashboards',
+}
+
+const selectors = e2eSelectors.pages.UserListPage;
+
+const PublicDashboardsTab = ({ view, setView }: { view: TabView | null; setView: (v: TabView | null) => void }) => (
+  <Tab
+    label="Public dashboard users"
+    active={view === TabView.PUBLIC_DASHBOARDS}
+    onChangeTab={() => setView(TabView.PUBLIC_DASHBOARDS)}
+    data-testid={selectors.tabs.publicDashboardsUsers}
+  />
+);
+
+const TAB_PAGE_MAP: Record<TabView, React.ReactElement> = {
+  [TabView.ADMIN]: <UserListAdminPageContent />,
+  [TabView.ORG]: <UsersListPageContent />,
+  [TabView.PUBLIC_DASHBOARDS]: <UserListPublicDashboardPage />,
+};
 
 export default function UserListPage() {
+  const styles = useStyles2(getStyles);
+
   const hasAccessToAdminUsers = contextSrv.hasAccess(AccessControlAction.UsersRead, contextSrv.isGrafanaAdmin);
   const hasAccessToOrgUsers = contextSrv.hasPermission(AccessControlAction.OrgUsersRead);
-  const styles = useStyles2(getStyles);
+  const hasEmailSharingEnabled =
+    Boolean(config.featureToggles.publicDashboards) &&
+    Boolean(config.featureToggles.publicDashboardsEmailSharing) &&
+    featureEnabled('publicDashboardsEmailSharing');
+
   const [view, setView] = useState(() => {
     if (hasAccessToAdminUsers) {
-      return 'admin';
+      return TabView.ADMIN;
     } else if (hasAccessToOrgUsers) {
-      return 'org';
+      return TabView.ORG;
     }
     return null;
   });
 
-  const showToggle = hasAccessToOrgUsers && hasAccessToAdminUsers;
+  const showAdminAndOrgTabs = hasAccessToOrgUsers && hasAccessToAdminUsers;
 
   return (
     <Page navId={'global-users'}>
-      {showToggle && (
+      {showAdminAndOrgTabs ? (
         <TabsBar className={styles.tabsMargin}>
-          <Tab label="All users" active={view === 'admin'} onChangeTab={() => setView('admin')} />
-          <Tab label="Organization users" active={view === 'org'} onChangeTab={() => setView('org')} />
+          <Tab
+            label="All users"
+            active={view === TabView.ADMIN}
+            onChangeTab={() => setView(TabView.ADMIN)}
+            data-testid={selectors.tabs.allUsers}
+          />
+          <Tab
+            label="Organization users"
+            active={view === TabView.ORG}
+            onChangeTab={() => setView(TabView.ORG)}
+            data-testid={selectors.tabs.orgUsers}
+          />
+          {hasEmailSharingEnabled && <PublicDashboardsTab view={view} setView={setView} />}
         </TabsBar>
+      ) : (
+        hasEmailSharingEnabled && (
+          <TabsBar className={styles.tabsMargin}>
+            <Tab
+              label="Users"
+              active={view === TabView.ORG}
+              onChangeTab={() => setView(TabView.ORG)}
+              data-testid={selectors.tabs.users}
+            />
+            <PublicDashboardsTab view={view} setView={setView} />
+          </TabsBar>
+        )
       )}
-      {view === 'admin' ? <UserListAdminPageContent /> : <UsersListPageContent />}
+      {view ? TAB_PAGE_MAP[view] : <UsersListPageContent />}
     </Page>
   );
 }
diff --git a/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx b/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
new file mode 100644
index 00000000000..f18c05d711c
--- /dev/null
+++ b/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
@@ -0,0 +1,108 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data/src';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
+import { Button, LoadingPlaceholder, Modal, ModalsController, useStyles2 } from '@grafana/ui/src';
+import { generatePublicDashboardUrl } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
+
+import { useGetActiveUserDashboardsQuery } from '../../dashboard/api/publicDashboardApi';
+
+const selectors = e2eSelectors.pages.UserListPage.UsersListPublicDashboardsPage.DashboardsListModal;
+export const DashboardsListModal = ({ email, onDismiss }: { email: string; onDismiss: () => void }) => {
+  const styles = useStyles2(getStyles);
+
+  const { data: dashboards, isLoading } = useGetActiveUserDashboardsQuery(email);
+
+  return (
+    <Modal className={styles.modal} isOpen title="Public dashboards" onDismiss={onDismiss}>
+      {isLoading ? (
+        <div className={styles.loading}>
+          <LoadingPlaceholder text="Loading..." />
+        </div>
+      ) : (
+        dashboards?.map((dash) => (
+          <div key={dash.dashboardUid} className={styles.listItem} data-testid={selectors.listItem(dash.dashboardUid)}>
+            <p className={styles.dashboardTitle}>{dash.dashboardTitle}</p>
+            <div className={styles.urlsContainer}>
+              <a
+                rel="noreferrer"
+                target="_blank"
+                className={cx('external-link', styles.url)}
+                href={generatePublicDashboardUrl(dash.publicDashboardAccessToken)}
+                onClick={onDismiss}
+              >
+                Public dashboard URL
+              </a>
+              <span className={styles.urlsDivider}>•</span>
+              <a
+                className={cx('external-link', styles.url)}
+                href={`/d/${dash.dashboardUid}?shareView=share`}
+                onClick={onDismiss}
+              >
+                Public dashboard settings
+              </a>
+            </div>
+            <hr className={styles.divider} />
+          </div>
+        ))
+      )}
+    </Modal>
+  );
+};
+
+export const DashboardsListModalButton = ({ email }: { email: string }) => (
+  <ModalsController>
+    {({ showModal, hideModal }) => (
+      <Button
+        variant="secondary"
+        size="sm"
+        icon="question-circle"
+        title="Open dashboards list"
+        aria-label="Open dashboards list"
+        onClick={() => showModal(DashboardsListModal, { email, onDismiss: hideModal })}
+      />
+    )}
+  </ModalsController>
+);
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  modal: css`
+    width: 590px;
+  `,
+  loading: css`
+    display: flex;
+    justify-content: center;
+  `,
+  listItem: css`
+    display: flex;
+    flex-direction: column;
+    gap: ${theme.spacing(0.5)};
+  `,
+  divider: css`
+    margin: ${theme.spacing(1.5, 0)};
+    color: ${theme.colors.text.secondary};
+  `,
+  urlsContainer: css`
+    display: flex;
+    gap: ${theme.spacing(0.5)};
+
+    ${theme.breakpoints.down('sm')} {
+      flex-direction: column;
+    }
+  `,
+  urlsDivider: css`
+    color: ${theme.colors.text.secondary};
+    ${theme.breakpoints.down('sm')} {
+      display: none;
+    }
+  `,
+  dashboardTitle: css`
+    font-size: ${theme.typography.body.fontSize};
+    font-weight: ${theme.typography.fontWeightBold};
+    margin-bottom: 0;
+  `,
+  url: css`
+    font-size: ${theme.typography.body.fontSize};
+  `,
+});
diff --git a/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx b/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx
new file mode 100644
index 00000000000..d4bb06db15c
--- /dev/null
+++ b/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx
@@ -0,0 +1,49 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data/src';
+import { Button, Modal, ModalsController, useStyles2 } from '@grafana/ui/src';
+import { SessionUser } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
+
+const DeleteUserModal = ({ user, onDismiss }: { user: SessionUser; onDismiss: () => void }) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Modal className={styles.modal} isOpen title="Delete" onDismiss={onDismiss}>
+      <p className={styles.description}>
+        The user {user.email} is currently present in {user.totalDashboards} public dashboard(s). If you wish to remove
+        this user, please navigate to the settings of the corresponding public dashboard.
+      </p>
+      <Modal.ButtonRow>
+        <Button type="button" variant="secondary" onClick={onDismiss} fill="outline">
+          Close
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+};
+
+export const DeleteUserModalButton = ({ user }: { user: SessionUser }) => (
+  <ModalsController>
+    {({ showModal, hideModal }) => (
+      <Button
+        size="sm"
+        variant="destructive"
+        onClick={() => showModal(DeleteUserModal, { user, onDismiss: hideModal })}
+        icon="times"
+        aria-label="Delete user"
+        title="Delete user"
+      />
+    )}
+  </ModalsController>
+);
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  modal: css`
+    width: 500px;
+  `,
+  description: css`
+    font-size: ${theme.typography.body.fontSize};
+    margin: 0;
+  `,
+});
diff --git a/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx b/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx
new file mode 100644
index 00000000000..cb79aec1373
--- /dev/null
+++ b/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
+import { HorizontalGroup, Icon, Tag, Tooltip } from '@grafana/ui/src';
+import { Page } from 'app/core/components/Page/Page';
+
+import { useGetActiveUsersQuery } from '../../dashboard/api/publicDashboardApi';
+
+import { DashboardsListModalButton } from './DashboardsListModalButton';
+import { DeleteUserModalButton } from './DeleteUserModalButton';
+
+const selectors = e2eSelectors.pages.UserListPage.publicDashboards;
+
+export const UserListPublicDashboardPage = () => {
+  const { data: users, isLoading } = useGetActiveUsersQuery();
+
+  return (
+    <Page.Contents isLoading={isLoading}>
+      <table className="filter-table form-inline" data-testid={selectors.container}>
+        <thead>
+          <tr>
+            <th>Email</th>
+            <th>
+              <span>Activated </span>
+              <Tooltip placement="top" content={'Earliest time user has been an active user to a dashboard'}>
+                <Icon name="question-circle" />
+              </Tooltip>
+            </th>
+            <th>Origin</th>
+            <th>Role</th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          {users?.map((user) => (
+            <tr key={user.email}>
+              <td className="max-width-10">
+                <span className="ellipsis" title={user.email}>
+                  {user.email}
+                </span>
+              </td>
+              <td className="max-width-10">{user.firstSeenAtAge}</td>
+              <td className="max-width-10">
+                <HorizontalGroup spacing="sm">
+                  <span>{user.totalDashboards} dashboard(s)</span>
+                  <DashboardsListModalButton email={user.email} />
+                </HorizontalGroup>
+              </td>
+              <td className="max-width-10">
+                <Tag name="Viewer" colorIndex={19} />
+              </td>
+              <td className="text-right">
+                <DeleteUserModalButton user={user} />
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </Page.Contents>
+  );
+};
diff --git a/public/app/features/dashboard/api/publicDashboardApi.ts b/public/app/features/dashboard/api/publicDashboardApi.ts
index 3a8ae32f8bd..762a06e1b15 100644
--- a/public/app/features/dashboard/api/publicDashboardApi.ts
+++ b/public/app/features/dashboard/api/publicDashboardApi.ts
@@ -7,6 +7,8 @@ import { createErrorNotification, createSuccessNotification } from 'app/core/cop
 import {
   PublicDashboard,
   PublicDashboardSettings,
+  SessionDashboard,
+  SessionUser,
 } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { ListPublicDashboardResponse } from 'app/features/manage-dashboards/types';
@@ -42,7 +44,7 @@ const getConfigError = (err: unknown) => ({ error: isFetchError(err) && err.stat
 export const publicDashboardApi = createApi({
   reducerPath: 'publicDashboardApi',
   baseQuery: backendSrvBaseQuery({ baseUrl: '/api' }),
-  tagTypes: ['PublicDashboard', 'AuditTablePublicDashboard'],
+  tagTypes: ['PublicDashboard', 'AuditTablePublicDashboard', 'UsersWithActiveSessions', 'ActiveUserDashboards'],
   refetchOnMountOrArgChange: true,
   endpoints: (builder) => ({
     getPublicDashboard: builder.query<PublicDashboard | undefined, string>({
@@ -116,6 +118,18 @@ export const publicDashboardApi = createApi({
         url: '',
       }),
     }),
+    getActiveUsers: builder.query<SessionUser[], void>({
+      query: () => ({
+        url: '/',
+      }),
+      providesTags: ['UsersWithActiveSessions'],
+    }),
+    getActiveUserDashboards: builder.query<SessionDashboard[], string>({
+      query: () => ({
+        url: '',
+      }),
+      providesTags: (result, _, email) => [{ type: 'ActiveUserDashboards', id: email }],
+    }),
     listPublicDashboards: builder.query<ListPublicDashboardResponse[], void>({
       query: () => ({
         url: '/dashboards/public-dashboards',
@@ -139,6 +153,8 @@ export const publicDashboardApi = createApi({
       invalidatesTags: (result, error, { dashboardUid }) => [
         { type: 'PublicDashboard', id: dashboardUid },
         'AuditTablePublicDashboard',
+        'UsersWithActiveSessions',
+        'ActiveUserDashboards',
       ],
     }),
   }),
@@ -153,4 +169,6 @@ export const {
   useAddRecipientMutation,
   useDeleteRecipientMutation,
   useReshareAccessToRecipientMutation,
+  useGetActiveUsersQuery,
+  useGetActiveUserDashboardsQuery,
 } = publicDashboardApi;
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx
index a271ce9b215..f41aa5359a4 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx
@@ -120,7 +120,7 @@ const ConfigPublicDashboard = () => {
       {hasEmailSharingEnabled && <EmailSharingConfiguration />}
       <Field label="Dashboard URL" className={styles.publicUrl}>
         <Input
-          value={generatePublicDashboardUrl(publicDashboard!)}
+          value={generatePublicDashboardUrl(publicDashboard!.accessToken!)}
           readOnly
           disabled={!publicDashboard?.isEnabled}
           data-testid={selectors.CopyUrlInput}
@@ -129,7 +129,7 @@ const ConfigPublicDashboard = () => {
               data-testid={selectors.CopyUrlButton}
               variant="primary"
               disabled={!publicDashboard?.isEnabled}
-              getText={() => generatePublicDashboardUrl(publicDashboard!)}
+              getText={() => generatePublicDashboardUrl(publicDashboard!.accessToken!)}
             >
               Copy
             </ClipboardButton>
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.test.tsx
index c270394a370..07e30e97e3b 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.test.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.test.tsx
@@ -31,7 +31,7 @@ describe('generatePublicDashboardUrl', () => {
     updateConfig({ appUrl });
     let pubdash = { accessToken } as PublicDashboard;
 
-    expect(generatePublicDashboardUrl(pubdash)).toEqual(`${appUrl}public-dashboards/${accessToken}`);
+    expect(generatePublicDashboardUrl(pubdash.accessToken!)).toEqual(`${appUrl}public-dashboards/${accessToken}`);
   });
 });
 
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
index 33092089208..3d65f5af25a 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
@@ -25,6 +25,18 @@ export interface PublicDashboard extends PublicDashboardSettings {
   recipients?: Array<{ uid: string; recipient: string }>;
 }
 
+export interface SessionDashboard {
+  dashboardTitle: string;
+  dashboardUid: string;
+  publicDashboardAccessToken: string;
+}
+
+export interface SessionUser {
+  email: string;
+  firstSeenAtAge: string;
+  totalDashboards: number;
+}
+
 // Instance methods
 export const dashboardHasTemplateVariables = (variables: VariableModel[]): boolean => {
   return variables.length > 0;
@@ -58,10 +70,10 @@ export const getUnsupportedDashboardDatasources = (panels: PanelModel[]): string
  *
  * All app urls from the Grafana boot config end with a slash.
  *
- * @param publicDashboard
+ * @param accessToken
  */
-export const generatePublicDashboardUrl = (publicDashboard: PublicDashboard): string => {
-  return `${getConfig().appUrl}public-dashboards/${publicDashboard.accessToken}`;
+export const generatePublicDashboardUrl = (accessToken: string): string => {
+  return `${getConfig().appUrl}public-dashboards/${accessToken}`;
 };
 
 export const validEmailRegex = /^[A-Z\d._%+-]+@[A-Z\d.-]+\.[A-Z]{2,}$/i;
diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx
index 780d13c27d8..bcdfc8ec6c8 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx
@@ -26,7 +26,7 @@ export const DeletePublicDashboardModal = ({
   onDismiss: () => void;
 }) => (
   <ConfirmModal
-    isOpen={true}
+    isOpen
     body={<Body title={dashboardTitle} />}
     onConfirm={onConfirm}
     onDismiss={onDismiss}
diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.test.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.test.tsx
index ccc25754dad..b5b33e6c99f 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.test.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.test.tsx
@@ -13,7 +13,7 @@ import { configureStore } from 'app/store/configureStore';
 
 import { ListPublicDashboardResponse } from '../../types';
 
-import { PublicDashboardListTable, viewPublicDashboardUrl } from './PublicDashboardListTable';
+import { PublicDashboardListTable } from './PublicDashboardListTable';
 
 const publicDashboardListResponse: ListPublicDashboardResponse[] = [
   {
@@ -90,12 +90,6 @@ const renderPublicDashboardTable = async (waitForListRendering?: boolean) => {
   waitForListRendering && (await waitForElementToBeRemoved(screen.getByTestId('Spinner'), { timeout: 3000 }));
 };
 
-describe('viewPublicDashboardUrl', () => {
-  it('has the correct url', () => {
-    expect(viewPublicDashboardUrl('abcd')).toEqual('public-dashboards/abcd');
-  });
-});
-
 describe('Show table', () => {
   it('renders loader spinner while loading', async () => {
     await renderPublicDashboardTable();
diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
index bd5cb3b5670..71f7aded088 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
@@ -6,9 +6,9 @@ import { GrafanaTheme2 } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { Link, ButtonGroup, LinkButton, Icon, Tag, useStyles2, Tooltip, useTheme2, Spinner } from '@grafana/ui/src';
 import { Page } from 'app/core/components/Page/Page';
-import { getConfig } from 'app/core/config';
 import { contextSrv } from 'app/core/services/context_srv';
 import { useListPublicDashboardsQuery } from 'app/features/dashboard/api/publicDashboardApi';
+import { generatePublicDashboardUrl } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 import { isOrgAdmin } from 'app/features/plugins/admin/permissions';
 import { AccessControlAction } from 'app/types';
 
@@ -16,9 +16,6 @@ import { ListPublicDashboardResponse } from '../../types';
 
 import { DeletePublicDashboardButton } from './DeletePublicDashboardButton';
 
-export const viewPublicDashboardUrl = (accessToken: string): string =>
-  `${getConfig().appUrl}public-dashboards/${accessToken}`;
-
 export const PublicDashboardListTable = () => {
   const { width } = useWindowSize();
   const isMobile = width <= 480;
@@ -72,7 +69,7 @@ export const PublicDashboardListTable = () => {
                 <td>
                   <ButtonGroup className={styles.buttonGroup}>
                     <LinkButton
-                      href={viewPublicDashboardUrl(pd.accessToken)}
+                      href={generatePublicDashboardUrl(pd.accessToken)}
                       fill="text"
                       size={responsiveSize}
                       title={pd.isEnabled ? 'View public dashboard' : 'Public dashboard is disabled'}
diff --git a/public/app/features/users/UsersListPage.tsx b/public/app/features/users/UsersListPage.tsx
index b8c4723ed18..126e55eda39 100644
--- a/public/app/features/users/UsersListPage.tsx
+++ b/public/app/features/users/UsersListPage.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { renderMarkdown } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { HorizontalGroup, Pagination, VerticalGroup } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
@@ -46,6 +47,8 @@ export interface State {
   showInvites: boolean;
 }
 
+const selectors = e2eSelectors.pages.UserListPage.UsersListPage;
+
 export const UsersListPageUnconnected = ({
   users,
   page,
@@ -80,7 +83,7 @@ export const UsersListPageUnconnected = ({
       return <InviteesTable invitees={invitees} />;
     } else {
       return (
-        <VerticalGroup spacing="md">
+        <VerticalGroup spacing="md" data-testid={selectors.container}>
           <UsersTable
             users={users}
             orgId={contextSrv.user.orgId}

From 2cd98eae2403bc9531535b85cccf8061032db2ad Mon Sep 17 00:00:00 2001
From: Danila Shiman <43502612+ffje@users.noreply.github.com>
Date: Thu, 27 Apr 2023 19:29:35 +0200
Subject: [PATCH 490/729] Cloudwatch: Add FraudDetector namespace with metrics
 and dimensions (#67318)

---
 pkg/tsdb/cloudwatch/constants/metrics.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/tsdb/cloudwatch/constants/metrics.go b/pkg/tsdb/cloudwatch/constants/metrics.go
index ff7cc61af02..0130423d96e 100644
--- a/pkg/tsdb/cloudwatch/constants/metrics.go
+++ b/pkg/tsdb/cloudwatch/constants/metrics.go
@@ -335,6 +335,7 @@ var NamespaceMetricsMap = map[string][]string{
 	"AWS/Events":               {"DeadLetterInvocations", "Events", "FailedInvocations", "IngestionToInvocationStartLatency", "Invocations", "InvocationsFailedToBeSentToDlq", "InvocationsSentToDlq", "MatchedEvents", "ThrottledRules", "TriggeredRules"},
 	"AWS/FSx":                  {"DataReadBytes", "DataReadOperations", "DataWriteBytes", "DataWriteOperations", "FreeDataStorageCapacity", "FreeStorageCapacity", "MetadataOperations"},
 	"AWS/Firehose":             {"BackupToS3.Bytes", "BackupToS3.DataFreshness", "BackupToS3.Records", "BackupToS3.Success", "DataReadFromKinesisStream.Bytes", "DataReadFromKinesisStream.Records", "DeliveryToElasticsearch.Bytes", "DeliveryToElasticsearch.Records", "DeliveryToElasticsearch.Success", "DeliveryToRedshift.Bytes", "DeliveryToRedshift.Records", "DeliveryToRedshift.Success", "DeliveryToS3.Bytes", "DeliveryToS3.DataFreshness", "DeliveryToS3.Records", "DeliveryToS3.Success", "DeliveryToSplunk.Bytes", "DeliveryToSplunk.DataFreshness", "DeliveryToSplunk.Records", "DeliveryToSplunk.Success", "DescribeDeliveryStream.Latency", "DescribeDeliveryStream.Requests", "ExecuteProcessing.Duration", "ExecuteProcessing.Success", "FailedConversion.Bytes", "FailedConversion.Records", "IncomingBytes", "IncomingRecords", "KinesisMillisBehindLatest", "ListDeliveryStreams.Latency", "ListDeliveryStreams.Requests", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Requests", "PutRecordBatch.Bytes", "PutRecordBatch.Latency", "PutRecordBatch.Records", "PutRecordBatch.Requests", "SucceedConversion.Bytes", "SucceedConversion.Records", "SucceedProcessing.Bytes", "SucceedProcessing.Records", "ThrottledDescribeStream", "ThrottledGetRecords", "ThrottledGetShardIterator", "UpdateDeliveryStream.Latency", "UpdateDeliveryStream.Requests"},
+	"AWS/FraudDetector":        {"GetEventPrediction", "GetEventPrediction4xxError", "GetEventPrediction5xxError", "GetEventPredictionLatency", "ModelInvocation", "ModelInvocationError", "ModelInvocationLatency", "OutcomeReturned", "Prediction", "PredictionError", "PredictionLatency", "RuleEvaluateError", "RuleEvaluateFalse", "RuleEvaluateTrue", "RuleNotEvaluated", "VariableDefaultReturned", "VariableUsed"},
 	"AWS/GameLift":             {"ActivatingGameSessions", "ActiveGameSessions", "ActiveInstances", "ActiveServerProcesses", "AvailableGameSessions", "AverageWaitTime", "CurrentPlayerSessions", "CurrentTickets", "DesiredInstances", "FirstChoiceNotViable", "FirstChoiceOutOfCapacity", "GameSessionInterruptions", "HealthyServerProcesses", "IdleInstances", "InstanceInterruptions", "LowestLatencyPlacement", "LowestPricePlacement", "MatchAcceptancesTimedOut", "MatchesAccepted", "MatchesCreated", "MatchesPlaced", "MatchesRejected", "MaxInstances", "MinInstances", "PercentAvailableGameSessions", "PercentHealthyServerProcesses", "PercentIdleInstances", "Placement", "PlacementsCanceled", "PlacementsFailed", "PlacementsStarted", "PlacementsSucceeded", "PlacementsTimedOut", "PlayerSessionActivations", "PlayersStarted", "QueueDepth", "RuleEvaluationsFailed", "RuleEvaluationsPassed", "ServerProcessAbnormalTerminations", "ServerProcessActivations", "ServerProcessTerminations", "TicketsFailed", "TicketsStarted", "TicketsTimedOut", "TimeToMatch", "TimeToTicketSuccess"},
 	"AWS/GlobalAccelerator":    {"NewFlowCount", "ProcessedBytesIn", "ProcessedBytesOut", "HealthyEndpointCount", "UnhealthyEndpointCount"},
 	"AWS/Glue":                 {"glue.driver.BlockManager.disk.diskSpaceUsed_MB", "glue.driver.ExecutorAllocationManager.executors.numberAllExecutors", "glue.driver.ExecutorAllocationManager.executors.numberMaxNeededExecutors", "glue.driver.aggregate.bytesRead", "glue.driver.aggregate.elapsedTime", "glue.driver.aggregate.numCompletedStages", "glue.driver.aggregate.numCompletedTasks", "glue.driver.aggregate.numFailedTasks", "glue.driver.aggregate.numKilledTasks", "glue.driver.aggregate.recordsRead", "glue.driver.aggregate.shuffleBytesWritten", "glue.driver.aggregate.shuffleLocalBytesRead", "glue.driver.jvm.heap.usage  glue.executorId.jvm.heap.usage  glue.ALL.jvm.heap.usage", "glue.driver.jvm.heap.used  glue.executorId.jvm.heap.used  glue.ALL.jvm.heap.used", "glue.driver.s3.filesystem.read_bytes  glue.executorId.s3.filesystem.read_bytes  glue.ALL.s3.filesystem.read_bytes", "glue.driver.s3.filesystem.write_bytes  glue.executorId.s3.filesystem.write_bytes  glue.ALL.s3.filesystem.write_bytes", "glue.driver.system.cpuSystemLoad  glue.executorId.system.cpuSystemLoad  glue.ALL.system.cpuSystemLoad"},
@@ -453,6 +454,7 @@ var NamespaceDimensionKeysMap = map[string][]string{
 	"AWS/Events":                  {"EventBusName", "RuleName"},
 	"AWS/FSx":                     {"FileSystemId"},
 	"AWS/Firehose":                {"DeliveryStreamName"},
+	"AWS/FraudDetector":           {"DetectorID", "DetectorVersionID", "ModelEndpoint", "ModelID", "ModelType", "OutcomeName", "RuleID", "VariableName"},
 	"AWS/GameLift":                {"FleetId", "InstanceType", "MatchmakingConfigurationName", "MatchmakingConfigurationName-RuleName", "MetricGroups", "OperatingSystem", "QueueName"},
 	"AWS/GlobalAccelerator":       {"Accelerator", "Listener", "EndpointGroup", "SourceRegion", "DestinationEdge", "TransportProtocol", "AcceleratorIPAddress"},
 	"AWS/Glue":                    {"JobName", "JobRunId", "Type"},

From 55c36b04ca3d46467964b8724ae539aeca120fe5 Mon Sep 17 00:00:00 2001
From: MattiasSegerdahl <102952046+MattiasSegerdahl@users.noreply.github.com>
Date: Thu, 27 Apr 2023 19:38:55 +0200
Subject: [PATCH 491/729] docs: update dashboard settings page (#67359)

Update index.md
---
 .../modify-dashboard-settings/index.md                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md b/docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md
index e748c204f4b..6532b102e68 100644
--- a/docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md
+++ b/docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md
@@ -1,6 +1,6 @@
 ---
 title: Modify dashboard settings
-menuTitle: Dashboard settings
+menuTitle: Modify dashboard settings
 weight: 8
 keywords:
   - time settings
@@ -12,7 +12,7 @@ keywords:
 
 # Modify dashboard settings
 
-The dashboard settings page enables you to:
+The dashboard settings page allows you to:
 
 - Edit general dashboard properties, including time settings
 - Add annotation queries
@@ -31,7 +31,7 @@ Adjust dashboard time settings when you want to change the dashboard timezone, t
 
 1. On the **Dashboard settings** page, click **General**.
 1. Navigate to the **Time Options** section.
-1. Specify time settings according to the following descriptions.
+1. Specify time settings as follows.
 
    - **Timezone:** Specify the local time zone of the service or system that you are monitoring. This can be helpful when monitoring a system or service that operates across several time zones.
      - **Default:** Grafana uses the default selected time zone for the user profile, team, or organization. If no time zone is specified for the user profile, a team the user is a member of, or the organization, then Grafana uses the local browser time.
@@ -62,7 +62,7 @@ the dashboard. These dropdowns make it easy to change the data being displayed i
 For more information about variables, refer to [Variables]({{< relref "../../variables/" >}}).
 
 1. On the **Dashboard settings** page, click **Variable** in the left side section menu and then the **Add variable** button.
-1. In the **General** section, the the name of the variable. This is the name that you will later use in queries.
+1. In the **General** section, the name of the variable. This is the name that you will later use in queries.
 1. Select a variable **Type**.
 
    > **Note:** The variable type you select impacts which fields you populate on the page.
@@ -74,7 +74,7 @@ For more information about variables, refer to [Variables]({{< relref "../../var
 Dashboard links enable you to place links to other dashboards and web sites directly below the dashboard header. Links provide for easy navigation to other, related dashboards and content.
 
 1. On the **Dashboard settings** page, click **Links** in the left side section menu and then the **Add link** button.
-1. Enter title and and in the **Type** field, select **Dashboard** or **Link**.
+1. Enter title and in the **Type** field, select **Dashboard** or **Link**.
 1. To add a dashboard link:
    a. Add an optional tag. Tags are useful creating a dynamic dropdown of dashboards that all have a specific tag.
    b. Select any of the dashboard link **Options**.

From 60c4e719626efde21627a0c4cf04bf1c1a068b06 Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Thu, 27 Apr 2023 14:39:23 -0400
Subject: [PATCH 492/729] docs: public dashboards updates (#67173)

* add missing insights content, fix links, update intro content, fix incorrect workflow

* copy edits, image and link fixes

* Apply suggestions from code review

add/fix availability notes

* fix wording for clarity

* updated feature toggle page
---
 .../assess-dashboard-usage/index.md           |  10 +-
 .../dashboards/dashboard-public/index.md      | 103 ++++++++++++------
 .../feature-toggles/index.md                  |   4 +-
 3 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/docs/sources/dashboards/assess-dashboard-usage/index.md b/docs/sources/dashboards/assess-dashboard-usage/index.md
index 4c33d059026..26f3c8b85cd 100644
--- a/docs/sources/dashboards/assess-dashboard-usage/index.md
+++ b/docs/sources/dashboards/assess-dashboard-usage/index.md
@@ -45,9 +45,9 @@ For every dashboard and data source, you can access usage information.
 
 > **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
-To see dashboard usage information, click **Dashboard insights** in the top bar.
+To see dashboard usage information, click the dashboard insights icon in the header.
 
-{{< figure src="/static/img/docs/enterprise/dashboard_insights_button.png" max-width="400px" class="docs-image--no-shadow" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-insights.png" max-width="400px" class="docs-image--no-shadow" >}}
 
 Dashboard insights show the following information:
 
@@ -56,6 +56,12 @@ Dashboard insights show the following information:
 
 {{< figure src="/static/img/docs/enterprise/dashboard_insights_stats.png" max-width="400px" class="docs-image--no-shadow" >}}{{< figure src="/static/img/docs/enterprise/dashboard_insights_users.png" max-width="400px" class="docs-image--no-shadow" >}}
 
+{{% admonition type="Note" %}}
+
+If you've enabled the `publicDashboards` feature toggle, you'll also see a Public dashboards tab in your analytics.
+
+{{% /admonition %}}
+
 ### Data source insights
 
 > **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.3 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
diff --git a/docs/sources/dashboards/dashboard-public/index.md b/docs/sources/dashboards/dashboard-public/index.md
index d6b85e8ea1b..436b10eb7b3 100644
--- a/docs/sources/dashboards/dashboard-public/index.md
+++ b/docs/sources/dashboards/dashboard-public/index.md
@@ -8,19 +8,26 @@ weight: 8
 
 # Public dashboards
 
-> **Note:** This is an opt-in alpha feature.
+{{% admonition type="Note" %}}
 
-> **Caution:** Making your dashboard public could result in a large number of queries to the datasources used by your dashboard.
-> This can be mitigated by utilizing the enterprise [caching](https://grafana.com/docs/grafana/latest/enterprise/query-caching/) and/or rate limiting features.
+This feature is in [public preview](/docs/release-life-cycle/).
 
-Public dashboards allow you to share your Grafana dashboard with anyone. This is useful when you want to expose your
-dashboard to the world.
+{{% /admonition %}}
+
+{{% admonition type="Caution" %}}
+
+Making your dashboard public could result in a large number of queries to the data sources used by your dashboard.
+This can be mitigated by utilizing the enterprise [caching]({{< relref "../../administration/data-source-management/#query-caching" >}}) and/or rate limiting features.
+
+{{% /admonition %}}
+
+Public dashboards allow you to share your Grafana dashboard with anyone. This is useful when you want to make your dashboard available to the world without requiring access to your Grafana organization. This differs from [dashboard sharing]({{< relref "../share-dashboards-panels" >}}), which either requires recipients to be users in the same Grafana organization or provides limited information, as with a snapshot.
 
 ## Security implications of making your dashboard public
 
 - Anyone with the URL can access the dashboard.
 - Public dashboards are read-only.
-- Arbitrary queries **cannot** be run against your datasources through public dashboards. Public dashboards can only execute the
+- Arbitrary queries **cannot** be run against your data sources through public dashboards. Public dashboards can only execute the
   queries stored on the original dashboard.
 
 ## Enable the feature
@@ -38,19 +45,25 @@ If you are using Docker, use an environment variable to enable public dashboards
 --env GF_FEATURE_TOGGLES_ENABLE=publicDashboards
 ```
 
-> **Note:** For Grafana Cloud, contact support to have the feature enabled.
+{{% admonition type="Note" %}}
+
+For Grafana Cloud (Pro and Advanced only), contact support to have the feature enabled.
+
+{{% /admonition %}}
 
 ## Make a dashboard public
 
-1. Click the sharing icon to the right of the dashboard title.
+1. Click the sharing icon in the dashboard header.
 1. Click the **Public dashboard** tab.
-1. Acknowledge the implications of making the dashboard public by checking all the checkboxes.
+1. Acknowledge the implications of making the dashboard public by selecting all the checkboxes.
 1. Click **Generate public URL** to make the dashboard public and make your link live.
 1. Copy the public dashboard link if you'd like to share it. You can always come back later for it.
 
+Once you've made the dashboard public, a **Public** tag is displayed in the header of the dashboard.
+
 ## Pause access
 
-1. Click the sharing icon to the right of the dashboard title.
+1. Click the sharing icon in the dashboard header.
 1. Click the **Public dashboard** tab.
 1. Enable the **Pause sharing dashboard** toggle.
 
@@ -58,21 +71,29 @@ The dashboard is no longer accessible, even with the link, until you make it sha
 
 ## Revoke access
 
-1. Click the sharing icon to the right of the dashboard title.
+1. Click the sharing icon in the dashboard header.
 1. Click the **Public dashboard** tab.
 1. Click **Revoke public URL** to delete the public dashboard.
 
-The link no longer works. You must create a new public URL as in [Make a dashboard public](#make-a-dashboard-public).
+The link no longer works. You must create a new public URL, as in [Make a dashboard public](#make-a-dashboard-public).
 
 ## Email sharing
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud).
+{{% admonition type="Note" %}}
 
-Email sharing allows you to share your public dashboard with only specific people via email, instead of having it accessible to anyone with the URL.
+Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud).
+
+{{% /admonition %}}
+
+Email sharing allows you to share your public dashboard with only specific people by email, instead of having it accessible to anyone with the URL. When you use email sharing, recipients receive a one-time use link that's valid for **one hour**. Once the link is used, the viewer has access to the public dashboard for **30 days**.
 
 ### Enable email sharing
 
-> **Note:** For Grafana Cloud, contact support to have the feature enabled.
+{{% admonition type="Note" %}}
+
+For Grafana Cloud (Pro and Advanced only), contact support to have the feature enabled.
+
+{{% /admonition %}}
 
 Add the `publicDashboardsEmailSharing` feature toggle to your `custom.ini` file.
 
@@ -83,12 +104,14 @@ publicDashboardsEmailSharing = true
 
 ### Invite a viewer
 
-1. Click the sharing icon to the right of the dashboard title.
+1. Click the sharing icon in the dashboard header.
 1. Click the **Public dashboard** tab.
-1. Click **Only specified people**.
+1. Acknowledge the implications of making the dashboard public by selecting all the checkboxes.
+1. Click **Generate public URL** to make the dashboard public and make your link live.
+1. Under Can view dashboard, click **Only specified people**.
 1. Enter the email you want to share the public dashboard with.
 1. Click **Invite**.
-1. The recipient(s) will receive an email with a one-time use link. This link must be used within **one hour** or it expires. Once the link is used, the viewer has access to the public dashboard for **30 days**.
+1. The recipient will receive an email with a one-time use link.
 
 ### Viewers requesting access
 
@@ -98,7 +121,7 @@ If the viewer doesn't have an invitation or it's been revoked, you won't be noti
 
 ### Revoke access for a viewer
 
-1. Click the sharing icon to the right of the dashboard title.
+1. Click the sharing icon in the dashboard header.
 1. Click the **Public dashboard** tab.
 1. Click **Revoke** on the viewer you'd like to revoke access for.
 
@@ -106,7 +129,7 @@ Immediately, the viewer no longer has access to the public dashboard, nor can th
 
 ### Reinvite a viewer
 
-1. Click the sharing icon to the right of the dashboard title.
+1. Click the sharing icon in the dashboard header.
 1. Click the **Public dashboard** tab.
 1. Click **Resend** on the viewer you'd like to re-share the public dashboard with.
 
@@ -114,16 +137,26 @@ The viewer will receive an email with a new one-time use link. This will invalid
 
 ### Access limitations
 
-One-time use links use browser cookies, so when a viewer is granted access via one of these links, they will only have access through the browser they used to claim the link.
+One-time use links use browser cookies, so when a viewer is granted access through one of these links, they will only have access on the browser they used to claim the link.
 
 A single viewer cannot generate multiple valid one-time use links. When a new one-time use link is issued for a viewer, all previous ones are invalidated.
 
 If a Grafana user has read access to the parent dashboard, they can view the public dashboard without needing to have access granted.
 
+## Assess public dashboard usage
+
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud).
+
+You can check usage analytics about your public dashboard by clicking the insights icon in the dashboard header:
+
+{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-insights.png" max-width="400px" class="docs-image--no-shadow" alt="Dashboard insights icon" >}}
+
+Learn more about the kind of information provided in the [dashboard insights documentation]({{< relref "../assess-dashboard-usage/#dashboard-insights" >}}).
+
 ## Supported data sources
 
-Public dashboards _should_ work with any datasource that has the properties `backend` and `alerting` both set to true in it's `package.json`. However, this cannot always be
-guaranteed because plugin developers can override this functionality. The following lists include data sources confirmed to work with public dashboards and data sources that should work but have not been confirmed as compatible.
+Public dashboards _should_ work with any data source that has the properties `backend` and `alerting` both set to true in its `package.json`. However, this can't always be
+guaranteed because plugin developers can override this functionality. The following lists include data sources confirmed to work with public dashboards and data sources that should work, but have not been confirmed as compatible.
 
 ### Confirmed:
 
@@ -158,7 +191,11 @@ guaranteed because plugin developers can override this functionality. The follow
 
 ### Unconfirmed:
 
-> **Note:** If you've confirmed one of these datasources work with public dashboards, let us know in our [Github](https://github.com/grafana/grafana/discussions/49253) discussion, and we'll mark it as confirmed!
+{{% admonition type="Note" %}}
+
+If you've confirmed one of these data sources work with public dashboards, let us know in our [Github](https://github.com/grafana/grafana/discussions/49253) discussion, and we'll mark it as confirmed!
+
+{{% /admonition %}}
 
 <table>
   <tr>
@@ -206,13 +243,13 @@ guaranteed because plugin developers can override this functionality. The follow
         <li>Snowflake</li>
         <li>Splunk</li>
         <li>Splunk Infrastructure Monitoring</li>
-        <li>Sqlyze Datasource</li>
+        <li>Sqlyze data source</li>
         <li>TDengine</li>
         <li>Vertica</li>
         <li>Wavefront</li>
         <li>X-Ray</li>
         <li>kdb+</li>
-        <li>simple grpc datasource</li>
+        <li>simple grpc data source</li>
       </ul>
     </td>
   </tr>
@@ -220,17 +257,17 @@ guaranteed because plugin developers can override this functionality. The follow
 
 ## Limitations
 
-- Panels that use frontend datasources will fail to fetch data.
-- Template variables are currently not supported, but are planned to be in the future.
+- Panels that use frontend data sources will fail to fetch data.
+- Template variables are not currently supported, but support is planned in the future.
 - Exemplars will be omitted from the panel.
-- Only annotations that query the `-- Grafana --` datasource are supported.
+- Only annotations that query the `-- Grafana --` data source are supported.
 - Organization annotations are not supported.
 - Grafana Live and real-time event streams are not supported.
-- Library panels are currently not supported, but are planned to be in the future.
-- Datasources using Reverse Proxy functionality are not supported.
+- Library panels are currently not supported, but support is planned in the future.
+- Data sources using Reverse Proxy functionality are not supported.
 
-We are excited to share this enhancement with you and we’d love your feedback! Please check out the [Github](https://github.com/grafana/grafana/discussions/49253) discussion and join the conversation.
+We're excited to share this enhancement with you and we’d love your feedback! Please check out the [Github](https://github.com/grafana/grafana/discussions/49253) discussion and join the conversation.
 
 ## Custom branding
 
-If you are a Grafana Enterprise customer, you can use custom branding to change the appearance of a public dashboard footer. For more information, refer to [Custom branding](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/configure-custom-branding/).
+If you're a Grafana Enterprise customer, you can use custom branding to change the appearance of a public dashboard footer. For more information, refer to [Custom branding](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/configure-custom-branding/).
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index bc03c5b2b41..92915e4f6ac 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -61,6 +61,8 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `renderAuthJWT`                      | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
 | `enableElasticsearchBackendQuerying` | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                              |
 | `enableDatagridEditing`              | Enables the edit functionality in the datagrid panel                                                                                                                                         |
+| `publicDashboards`                   | Enables public access to dashboards                                                                                                                                                          |
+| `publicDashboardsEmailSharing`       | Enables public dashboard sharing to be restricted to only allowed emails                                                                                                                     |
 
 ## Alpha feature toggles
 
@@ -71,8 +73,6 @@ Alpha features might be changed or removed without prior notice.
 | ---------------------------------- | -------------------------------------------------------------------------------------------------------------- |
 | `live-service-web-worker`          | This will use a webworker thread to processes events rather than the main thread                               |
 | `queryOverLive`                    | Use Grafana Live WebSocket to execute backend queries                                                          |
-| `publicDashboards`                 | Enables public access to dashboards                                                                            |
-| `publicDashboardsEmailSharing`     | Enables public dashboard sharing to be restricted to only allowed emails                                       |
 | `lokiLive`                         | Support WebSocket streaming for loki (early prototype)                                                         |
 | `storage`                          | Configurable storage for dashboards, datasources, and resources                                                |
 | `newTraceViewHeader`               | Shows the new trace view header                                                                                |

From 63383ef545107299322bf32625f2b5348e8528bd Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Thu, 27 Apr 2023 20:24:11 +0100
Subject: [PATCH 493/729] AzureMonitor: Application Insights Traces (#64859)

* Build out barebones Traces editor

- Add Traces query type and operation ID prop to query type
- Add necessary header types
- Update resource picker to appropriately work with traces query type
- Build out TracesQueryEditor component
- Include logic to retrieve operationId's for AI Workspaces
- Add backend route mapping
- Update macro to use timestamp as default time field for traces

* AzureMonitor: Traces - Response parsing (#65442)

* Update FormatAsField component

- Add trace ResultFormat type
- Generalise FormatAsField component
- Add component to TracesQueryEditor
- Remove duplicate code in setQueryValue

* Add custom filter function to improve performance

* Add basic conversion for logs to trace

- Add serviceTags converter
- Pass through required parameters (queryType and resultFormat)
- Appropriately set visualisation

* Update parsing to also fill trace tags

- Add constant values for each table schema (include legacy mapping for now if needed)
- Add constant for list of table tags
- Set the foundation for dynamic query building
- Update query to build tags value
- Appropriately set operationName
- Update tagsConverter to filter empty values

* Fix lint and test issues

* AzureMonitor: Traces - Data links (#65566)

* Add portal link for traces

- Pull out necessary values (itemId and itemType)
- Appropriately construct
- Fix ordering

* Set default format as value

- Also set default visualisation

* Fix event schema

* Set default formatAsField value

* Include logs link on traces results

- Adapt config links to allow custom title to be set

* Correctly set operationId for query

* Update backend types

- Include OperationID in query
- Pass forward datasource name and UID

* Ensure setTime doesn't consistently get called if operationID is defined

* Add explore link

- Update util functions to allow setting custom datalinks

* Fix tests

* AzureMonitor: Traces - Query and Editor updates (#66076)

* Add initial query

- Will query the resource as soon as a resource has been selected
- Updates the data links for the query without operationId
- Remove initial operationId query and timeRange dependency
- Update query building

* Add entirely separate traces query property

- Update shared types (also including future types for Azure traces)
- Update backend log analytics datasource to accept both azureLogAnalytics and azureTraces queries
- Update backend specific types
- Update frontend datasource for new properties
- Update mock query

* Update FormatAsField to be entirely generic

* Update query building to be done in backend

- Add required mappings in backend
- Update frontend querying

* Fix query and explore data link

* Add trace type selection

* Better method for setting explore link

* Fix operationId updating

* Run go mod tidy

* Unnecessary changes

* Fix tests

* AzureMonitor: Traces - Add correlation API support (#65855)

Add correlation API support

- Add necessary types
- Add correlation API request when conditions are met
- Update query

* Fix property from merge

* AzureMonitor: Traces - Filtering (#66303)

* Add initial query

- Will query the resource as soon as a resource has been selected
- Updates the data links for the query without operationId
- Remove initial operationId query and timeRange dependency
- Update query building

* Add entirely separate traces query property

- Update shared types (also including future types for Azure traces)
- Update backend log analytics datasource to accept both azureLogAnalytics and azureTraces queries
- Update backend specific types
- Update frontend datasource for new properties
- Update mock query

* Update FormatAsField to be entirely generic

* Update query building to be done in backend

- Add required mappings in backend
- Update frontend querying

* Fix query and explore data link

* Add trace type selection

* Better method for setting explore link

* Fix operationId updating

* Run go mod tidy

* Unnecessary changes

* Fix tests

* Start building out Filters component

- Configure component to query for Filter property values when a filter property is set
- Add setFilters function
- Add typing to tablesSchema
- Use component in TracesQueryEditor

* Update Filters

- Asynchronously pull property options
- Setup list of Filter components

* Update filters component

- Remove unused imports
- Have local filters state and query filters
- Correctly set filters values
- Don't update query every time a filter property changes (not performant)

* Update properties query

- Use current timeRange
- Get count to provide informative labels

* Reset map when time changes

* Add operation selection

* Reset filters when property changes

* Appropriate label name for empty values

* Add filtering to query

* Update filter components

- Fix rendering issue
- Correctly compare and update timeRange
- Split out files for simplicity

* Add checkbox option to multiselect

- Add custom option component
- Correctly call onChange
- Add variableOptionGroup for template variable selection

* Fix adding template vars

* Improve labels and refresh labels on query prop changes

* AzureMonitor: Traces - Testing (#66474)

* Select ds for template variable interpolation

* Update az logs ds tests

- Add templateVariables test
- Add filter test
- Update mock
- Remove anys

* Update QueryEditor test

- Update mocks with timeSrv for log analytics datasource
- Fix query mock
- Use appropriate and consistent selectors

* Add TracesQueryEditor test

- Update resourcePickerRows mock to include app insights resources
- Remove comments and extra new line

* Add FormatAsField test

- Remove unneeded condition

* Update resourcePicker utils test

* Don't hide selected options in filters

* Fix multi-selection on filters

* Add TraceTypeField test

- Add test file
- Update selectors (remove copy/paste mistake)
- Update placeholder text for select and add label

* Add basic filters test

* Begin filters test

* Update filters test

* Add final tests and simplify/generalise addFilter helper

* Minor update to datasource test

* Update macros test

* Update selectors in tests

* Add response-table-frame tests

* Add datasource tests

- Use sorting where JSON models are inconsistent
- Update filters clause
- Dedupe tags
- Correct operationId conditions

* Don't set a default value for blurInputOnSelect

* Simplify datasource test

* Update to use CheckGoldenJSON utils

- Update with generated frame files
- Remove redundant expected frame code
- Update all usages

* Fix lint

* AzureMonitor: Traces feedback (#67292)

* Filter traces if the visualisation is set to trace

- Update build query logic
- Added additional test cases
- Return an error if the traces type is set by itself with the trace visualisation
- Add descriptions to event types
- Update tests

* Fix bug for error displaying traces

* Update mappings and add error field

- Update tests
- Remove unnecessary comments

* Switch location of Operation ID field

* Re-order fields

* Update link title

* Update label for event type selection

* Update correct link title

* Update logs datalink to link to Azure Logs in explore

* Fix lint
---
 .betterer.results                             |   3 +-
 .../src/components/Select/SelectBase.tsx      |   2 +
 .../grafana-ui/src/components/Select/types.ts |   1 +
 pkg/tsdb/azuremonitor/azuremonitor.go         |   6 +-
 pkg/tsdb/azuremonitor/azuremonitor_test.go    |  13 +-
 .../kinds/dataquery/types_dataquery_gen.go    |  96 +++
 .../azure-log-analytics-datasource.go         | 463 +++++++++++--
 .../azure-log-analytics-datasource_test.go    | 647 +++++++++++++++++-
 .../azure-response-table-frame.go             |  63 +-
 .../azure-response-table-frame_test.go        | 186 ++---
 pkg/tsdb/azuremonitor/loganalytics/consts.go  | 121 ++++
 pkg/tsdb/azuremonitor/loganalytics/utils.go   |  27 +-
 pkg/tsdb/azuremonitor/macros/macros.go        |   3 +-
 pkg/tsdb/azuremonitor/macros/macros_test.go   |  10 +
 .../metrics/azuremonitor-datasource.go        |   2 +-
 .../metrics/azuremonitor-datasource_test.go   | 270 +-------
 .../azure-resource-graph-datasource.go        |   7 +-
 .../azure-resource-graph-datasource_test.go   |   2 +-
 pkg/tsdb/azuremonitor/routes.go               |   2 +
 ...ggregate-time-series-response.golden.jsonc |  83 +++
 ...onse-with-multiple-dimensions.golden.jsonc | 323 +++++++++
 ...ggregate-time-series-response.golden.jsonc |  83 +++
 ...h-alias-patterns-in-the-query.golden.jsonc |  84 +++
 ...t-should-use-the-resource-uri.golden.jsonc |  84 +++
 ...es-and-without-a-resource-uri.golden.jsonc |  84 +++
 ...ggregate-time-series-response.golden.jsonc |  83 +++
 ...ggregate-time-series-response.golden.jsonc |  83 +++
 ...ggregate-time-series-response.golden.jsonc |  83 +++
 ...imension-time-series-response.golden.jsonc | 250 +++++++
 ...n.single-dimension-with-alias.golden.jsonc | 253 +++++++
 ...ies-response-with-label-alias.golden.jsonc | 229 +++++++
 ...t-with-alias-should-not-panic.golden.jsonc |  71 ++
 ...multiple-time-series-response.golden.jsonc |  85 +++
 ...se-metrics-single-series.json.golden.jsonc |  96 +++
 ...alytics-response-warning.json.golden.jsonc |  87 +++
 ...analytics-response-empty.json.golden.jsonc |   5 +
 ...analytics-response-table.json.golden.jsonc | 201 ++++++
 ...nalytics-all-types-table.json.golden.jsonc | 205 ++++++
 ...alytics-response-nan-inf.json.golden.jsonc | 105 +++
 ...analytics-response-error.json.golden.jsonc |  87 +++
 .../traces/1-traces-multiple-table.json       |  94 +++
 ...n.multi-trace-as-trace-format.golden.jsonc | 559 +++++++++++++++
 ...ltiple-table.json.multi-trace.golden.jsonc | 216 ++++++
 .../traces/2-traces-single-table.json         |  69 ++
 ....single-trace-as-trace-format.golden.jsonc | 321 +++++++++
 ...ingle-table.json.single-trace.golden.jsonc | 192 ++++++
 pkg/tsdb/azuremonitor/testdata/utils.go       |  29 +
 pkg/tsdb/azuremonitor/types/types.go          |  40 ++
 .../azuremonitor/__mocks__/datasource.ts      |   6 +
 .../azuremonitor/__mocks__/query.ts           |  10 +
 .../__mocks__/resourcePickerRows.ts           |  17 +-
 .../azure_log_analytics_datasource.test.ts    |  51 +-
 .../azure_log_analytics_datasource.ts         |  86 ++-
 .../components/FormatAsField.test.tsx         |  73 ++
 .../azuremonitor/components/FormatAsField.tsx |  60 ++
 .../LogsQueryEditor/FormatAsField.tsx         |  46 --
 .../LogsQueryEditor/LogsQueryEditor.test.tsx  |   2 +-
 .../LogsQueryEditor/LogsQueryEditor.tsx       |  16 +-
 .../MetricsQueryEditor.test.tsx               |   5 +-
 .../MetricsQueryEditor/MetricsQueryEditor.tsx |   3 +-
 .../QueryEditor/QueryEditor.test.tsx          |  39 +-
 .../components/QueryEditor/QueryEditor.tsx    |  13 +
 .../azuremonitor/components/QueryHeader.tsx   |   1 +
 .../components/ResourcePicker/utils.test.ts   |  14 +-
 .../components/ResourcePicker/utils.ts        |  11 +
 .../components/TracesQueryEditor/Filter.tsx   | 278 ++++++++
 .../TracesQueryEditor/Filters.test.tsx        | 411 +++++++++++
 .../components/TracesQueryEditor/Filters.tsx  |  95 +++
 .../TracesQueryEditor/TraceTypeField.test.tsx |  64 ++
 .../TracesQueryEditor/TraceTypeField.tsx      |  49 ++
 .../TracesQueryEditor.test.tsx                | 187 +++++
 .../TracesQueryEditor/TracesQueryEditor.tsx   | 163 +++++
 .../components/TracesQueryEditor/consts.ts    | 167 +++++
 .../components/TracesQueryEditor/index.tsx    |   1 +
 .../TracesQueryEditor/setQueryValue.ts        |  41 ++
 .../datasource/azuremonitor/dataquery.cue     |  31 +-
 .../datasource/azuremonitor/dataquery.gen.ts  |  61 ++
 .../datasource/azuremonitor/datasource.ts     |   9 +-
 .../datasource/azuremonitor/e2e/selectors.ts  |  10 +
 .../resourcePicker/resourcePickerData.ts      |   2 +-
 .../datasource/azuremonitor/types/query.ts    |   2 +
 .../datasource/azuremonitor/types/types.ts    |  11 +-
 .../datasource/azuremonitor/utils/common.ts   |   4 +-
 83 files changed, 7586 insertions(+), 561 deletions(-)
 create mode 100644 pkg/tsdb/azuremonitor/loganalytics/consts.go
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/loganalytics/1-log-analytics-response-metrics-single-series.json.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/loganalytics/10-log-analytics-response-warning.json.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/loganalytics/11-log-analytics-response-empty.json.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/loganalytics/6-log-analytics-response-table.json.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/loganalytics/7-log-analytics-all-types-table.json.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/loganalytics/8-log-analytics-response-nan-inf.json.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/loganalytics/9-log-analytics-response-error.json.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json
 create mode 100644 pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json.multi-trace-as-trace-format.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json.multi-trace.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json
 create mode 100644 pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json.single-trace-as-trace-format.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json.single-trace.golden.jsonc
 create mode 100644 pkg/tsdb/azuremonitor/testdata/utils.go
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/FormatAsField.test.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/FormatAsField.tsx
 delete mode 100644 public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/FormatAsField.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.test.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/consts.ts
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/index.tsx
 create mode 100644 public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/setQueryValue.ts

diff --git a/.betterer.results b/.betterer.results
index 5e3d035af55..883cfa6551b 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -3779,8 +3779,7 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/packages/grafana-ui/src/components/Select/SelectBase.tsx b/packages/grafana-ui/src/components/Select/SelectBase.tsx
index 065de3928b0..4b650d22394 100644
--- a/packages/grafana-ui/src/components/Select/SelectBase.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectBase.tsx
@@ -93,6 +93,7 @@ export function SelectBase<T>({
   'aria-label': ariaLabel,
   autoFocus = false,
   backspaceRemovesValue = true,
+  blurInputOnSelect,
   cacheOptions,
   className,
   closeMenuOnSelect = true,
@@ -213,6 +214,7 @@ export function SelectBase<T>({
     'aria-label': ariaLabel,
     autoFocus,
     backspaceRemovesValue,
+    blurInputOnSelect,
     captureMenuScroll: false,
     closeMenuOnSelect,
     // We don't want to close if we're actually scrolling the menu
diff --git a/packages/grafana-ui/src/components/Select/types.ts b/packages/grafana-ui/src/components/Select/types.ts
index f223ffba58b..3994d86c78a 100644
--- a/packages/grafana-ui/src/components/Select/types.ts
+++ b/packages/grafana-ui/src/components/Select/types.ts
@@ -23,6 +23,7 @@ export interface SelectCommonProps<T> {
   /** Focus is set to the Select when rendered*/
   autoFocus?: boolean;
   backspaceRemovesValue?: boolean;
+  blurInputOnSelect?: boolean;
   className?: string;
   closeMenuOnSelect?: boolean;
   /** Used for custom components. For more information, see `react-select` */
diff --git a/pkg/tsdb/azuremonitor/azuremonitor.go b/pkg/tsdb/azuremonitor/azuremonitor.go
index c2e93db81f2..42dccdd8ba3 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor.go
@@ -35,6 +35,7 @@ func ProvideService(cfg *setting.Cfg, httpClientProvider *httpclient.Provider, t
 		azureMonitor:       &metrics.AzureMonitorDatasource{Proxy: proxy},
 		azureLogAnalytics:  &loganalytics.AzureLogAnalyticsDatasource{Proxy: proxy},
 		azureResourceGraph: &resourcegraph.AzureResourceGraphDatasource{Proxy: proxy},
+		azureTraces:        &loganalytics.AzureLogAnalyticsDatasource{Proxy: proxy},
 	}
 
 	im := datasource.NewInstanceManager(NewInstanceSettings(cfg, httpClientProvider, executors))
@@ -86,7 +87,7 @@ func NewInstanceSettings(cfg *setting.Cfg, clientProvider *httpclient.Provider,
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
 		}
-		jsonDataObj := map[string]interface{}{}
+		jsonDataObj := map[string]any{}
 		err = json.Unmarshal(settings.JSONData, &jsonDataObj)
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
@@ -176,6 +177,9 @@ func (s *Service) getDataSourceFromPluginReq(req *backend.QueryDataRequest) (typ
 		return types.DatasourceInfo{}, fmt.Errorf("unable to convert datasource from service instance")
 	}
 	dsInfo.OrgID = req.PluginContext.OrgID
+
+	dsInfo.DatasourceName = req.PluginContext.DataSourceInstanceSettings.Name
+	dsInfo.DatasourceUID = req.PluginContext.DataSourceInstanceSettings.UID
 	return dsInfo, nil
 }
 
diff --git a/pkg/tsdb/azuremonitor/azuremonitor_test.go b/pkg/tsdb/azuremonitor/azuremonitor_test.go
index 58daa13fcff..2116c1f929f 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor_test.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor_test.go
@@ -165,6 +165,12 @@ func Test_newMux(t *testing.T) {
 			expectedURL: routes[azureMonitorPublic][azureLogAnalytics].URL,
 			Err:         require.NoError,
 		},
+		{
+			name:        "creates an Azure Traces executor",
+			queryType:   azureTraces,
+			expectedURL: routes[azureMonitorPublic][azureLogAnalytics].URL,
+			Err:         require.NoError,
+		},
 	}
 
 	for _, tt := range tests {
@@ -189,7 +195,12 @@ func Test_newMux(t *testing.T) {
 			}
 			mux := s.newQueryMux()
 			res, err := mux.QueryData(context.Background(), &backend.QueryDataRequest{
-				PluginContext: backend.PluginContext{},
+				PluginContext: backend.PluginContext{
+					DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+						Name: "datasource_name",
+						UID:  "datasource_UID",
+					},
+				},
 				Queries: []backend.DataQuery{
 					{QueryType: tt.queryType},
 				},
diff --git a/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
index 96600703b7d..5c71e070681 100644
--- a/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
@@ -27,12 +27,21 @@ const (
 const (
 	AzureLogsQueryResultFormatTable      AzureLogsQueryResultFormat = "table"
 	AzureLogsQueryResultFormatTimeSeries AzureLogsQueryResultFormat = "time_series"
+	AzureLogsQueryResultFormatTrace      AzureLogsQueryResultFormat = "trace"
 )
 
 // Defines values for AzureMonitorQueryAzureLogAnalyticsResultFormat.
 const (
 	AzureMonitorQueryAzureLogAnalyticsResultFormatTable      AzureMonitorQueryAzureLogAnalyticsResultFormat = "table"
 	AzureMonitorQueryAzureLogAnalyticsResultFormatTimeSeries AzureMonitorQueryAzureLogAnalyticsResultFormat = "time_series"
+	AzureMonitorQueryAzureLogAnalyticsResultFormatTrace      AzureMonitorQueryAzureLogAnalyticsResultFormat = "trace"
+)
+
+// Defines values for AzureMonitorQueryAzureTracesResultFormat.
+const (
+	AzureMonitorQueryAzureTracesResultFormatTable      AzureMonitorQueryAzureTracesResultFormat = "table"
+	AzureMonitorQueryAzureTracesResultFormatTimeSeries AzureMonitorQueryAzureTracesResultFormat = "time_series"
+	AzureMonitorQueryAzureTracesResultFormatTrace      AzureMonitorQueryAzureTracesResultFormat = "trace"
 )
 
 // Defines values for AzureQueryType.
@@ -46,10 +55,18 @@ const (
 	AzureQueryTypeAzureResourceGroups             AzureQueryType = "Azure Resource Groups"
 	AzureQueryTypeAzureResourceNames              AzureQueryType = "Azure Resource Names"
 	AzureQueryTypeAzureSubscriptions              AzureQueryType = "Azure Subscriptions"
+	AzureQueryTypeAzureTraces                     AzureQueryType = "Azure Traces"
 	AzureQueryTypeAzureWorkspaces                 AzureQueryType = "Azure Workspaces"
 	AzureQueryTypeGrafanaTemplateVariableFunction AzureQueryType = "Grafana Template Variable Function"
 )
 
+// Defines values for AzureTracesQueryResultFormat.
+const (
+	AzureTracesQueryResultFormatTable      AzureTracesQueryResultFormat = "table"
+	AzureTracesQueryResultFormatTimeSeries AzureTracesQueryResultFormat = "time_series"
+	AzureTracesQueryResultFormatTrace      AzureTracesQueryResultFormat = "trace"
+)
+
 // Defines values for GrafanaTemplateVariableQueryType.
 const (
 	GrafanaTemplateVariableQueryTypeAppInsightsGroupByQuery    GrafanaTemplateVariableQueryType = "AppInsightsGroupByQuery"
@@ -92,6 +109,7 @@ const (
 const (
 	ResultFormatTable      ResultFormat = "table"
 	ResultFormatTimeSeries ResultFormat = "time_series"
+	ResultFormatTrace      ResultFormat = "trace"
 )
 
 // Defines values for SubscriptionsQueryKind.
@@ -352,6 +370,36 @@ type AzureMonitorQuery struct {
 		ResultFormat *string `json:"resultFormat,omitempty"`
 	} `json:"azureResourceGraph,omitempty"`
 
+	// Application Insights Traces sub-query properties.
+	AzureTraces *struct {
+		// Filters for property values.
+		Filters []struct {
+			// Values to filter by.
+			Filters []string `json:"filters"`
+
+			// Comparison operator to use. Either equals or not equals.
+			Operation string `json:"operation"`
+
+			// Property name, auto-populated based on available traces.
+			Property string `json:"property"`
+		} `json:"filters,omitempty"`
+
+		// Operation ID. Used only for Traces queries.
+		OperationId *string `json:"operationId,omitempty"`
+
+		// KQL query to be executed.
+		Query *string `json:"query,omitempty"`
+
+		// Array of resource URIs to be queried.
+		Resources []string `json:"resources,omitempty"`
+
+		// Specifies the format results should be returned as.
+		ResultFormat *AzureMonitorQueryAzureTracesResultFormat `json:"resultFormat,omitempty"`
+
+		// Types of events to filter by.
+		TraceTypes []string `json:"traceTypes,omitempty"`
+	} `json:"azureTraces,omitempty"`
+
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
@@ -394,6 +442,9 @@ type AzureMonitorQuery struct {
 // Specifies the format results should be returned as.
 type AzureMonitorQueryAzureLogAnalyticsResultFormat string
 
+// Specifies the format results should be returned as.
+type AzureMonitorQueryAzureTracesResultFormat string
+
 // @deprecated Legacy template variable support.
 type AzureMonitorQueryGrafanaTemplateVariableFn struct {
 	Kind                 *interface{}           `json:"kind,omitempty"`
@@ -428,6 +479,51 @@ type AzureResourceGraphQuery struct {
 	ResultFormat *string `json:"resultFormat,omitempty"`
 }
 
+// AzureTracesFilter defines model for AzureTracesFilter.
+type AzureTracesFilter struct {
+	// Values to filter by.
+	Filters []string `json:"filters"`
+
+	// Comparison operator to use. Either equals or not equals.
+	Operation string `json:"operation"`
+
+	// Property name, auto-populated based on available traces.
+	Property string `json:"property"`
+}
+
+// Application Insights Traces sub-query properties
+type AzureTracesQuery struct {
+	// Filters for property values.
+	Filters []struct {
+		// Values to filter by.
+		Filters []string `json:"filters"`
+
+		// Comparison operator to use. Either equals or not equals.
+		Operation string `json:"operation"`
+
+		// Property name, auto-populated based on available traces.
+		Property string `json:"property"`
+	} `json:"filters,omitempty"`
+
+	// Operation ID. Used only for Traces queries.
+	OperationId *string `json:"operationId,omitempty"`
+
+	// KQL query to be executed.
+	Query *string `json:"query,omitempty"`
+
+	// Array of resource URIs to be queried.
+	Resources []string `json:"resources,omitempty"`
+
+	// Specifies the format results should be returned as.
+	ResultFormat *AzureTracesQueryResultFormat `json:"resultFormat,omitempty"`
+
+	// Types of events to filter by.
+	TraceTypes []string `json:"traceTypes,omitempty"`
+}
+
+// Specifies the format results should be returned as.
+type AzureTracesQueryResultFormat string
+
 // BaseGrafanaTemplateVariableQuery defines model for BaseGrafanaTemplateVariableQuery.
 type BaseGrafanaTemplateVariableQuery struct {
 	RawQuery             *string                `json:"rawQuery,omitempty"`
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
index 9e4357f2a7f..57c857337e5 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
@@ -12,14 +12,18 @@ import (
 	"net/url"
 	"path"
 	"regexp"
+	"sort"
+	"strings"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/attribute"
+	"k8s.io/utils/strings/slices"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/macros"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 )
@@ -32,13 +36,16 @@ type AzureLogAnalyticsDatasource struct {
 // AzureLogAnalyticsQuery is the query request that is built from the saved values for
 // from the UI
 type AzureLogAnalyticsQuery struct {
-	RefID        string
-	ResultFormat string
-	URL          string
-	JSON         json.RawMessage
-	TimeRange    backend.TimeRange
-	Query        string
-	Resources    []string
+	RefID                 string
+	ResultFormat          string
+	URL                   string
+	TraceExploreQuery     string
+	TraceLogsExploreQuery string
+	JSON                  json.RawMessage
+	TimeRange             backend.TimeRange
+	Query                 string
+	Resources             []string
+	QueryType             string
 }
 
 func (e *AzureLogAnalyticsDatasource) ResourceRequest(rw http.ResponseWriter, req *http.Request, cli *http.Client) {
@@ -64,22 +71,7 @@ func (e *AzureLogAnalyticsDatasource) ExecuteTimeSeriesQuery(ctx context.Context
 	return result, nil
 }
 
-func getApiURL(queryJSONModel types.LogJSONQuery) string {
-	// Legacy queries only specify a Workspace GUID, which we need to use the old workspace-centric
-	// API URL for, and newer queries specifying a resource URI should use resource-centric API.
-	// However, legacy workspace queries using a `workspaces()` template variable will be resolved
-	// to a resource URI, so they should use the new resource-centric.
-	azureLogAnalyticsTarget := queryJSONModel.AzureLogAnalytics
-	var resourceOrWorkspace string
-
-	if len(azureLogAnalyticsTarget.Resources) > 0 {
-		resourceOrWorkspace = azureLogAnalyticsTarget.Resources[0]
-	} else if azureLogAnalyticsTarget.Resource != "" {
-		resourceOrWorkspace = azureLogAnalyticsTarget.Resource
-	} else {
-		resourceOrWorkspace = azureLogAnalyticsTarget.Workspace
-	}
-
+func getApiURL(resourceOrWorkspace string) string {
 	matchesResourceURI, _ := regexp.MatchString("^/subscriptions/", resourceOrWorkspace)
 
 	if matchesResourceURI {
@@ -93,41 +85,108 @@ func (e *AzureLogAnalyticsDatasource) buildQueries(logger log.Logger, queries []
 	azureLogAnalyticsQueries := []*AzureLogAnalyticsQuery{}
 
 	for _, query := range queries {
-		queryJSONModel := types.LogJSONQuery{}
-		err := json.Unmarshal(query.JSON, &queryJSONModel)
-		if err != nil {
-			return nil, fmt.Errorf("failed to decode the Azure Log Analytics query object from JSON: %w", err)
+		resources := []string{}
+		var resourceOrWorkspace string
+		var queryString string
+		var resultFormat string
+		traceExploreQuery := ""
+		traceLogsExploreQuery := ""
+		if query.QueryType == string(dataquery.AzureQueryTypeAzureLogAnalytics) {
+			queryJSONModel := types.LogJSONQuery{}
+			err := json.Unmarshal(query.JSON, &queryJSONModel)
+			if err != nil {
+				return nil, fmt.Errorf("failed to decode the Azure Log Analytics query object from JSON: %w", err)
+			}
+
+			azureLogAnalyticsTarget := queryJSONModel.AzureLogAnalytics
+			logger.Debug("AzureLogAnalytics", "target", azureLogAnalyticsTarget)
+
+			resultFormat = azureLogAnalyticsTarget.ResultFormat
+			if resultFormat == "" {
+				resultFormat = types.TimeSeries
+			}
+
+			// Legacy queries only specify a Workspace GUID, which we need to use the old workspace-centric
+			// API URL for, and newer queries specifying a resource URI should use resource-centric API.
+			// However, legacy workspace queries using a `workspaces()` template variable will be resolved
+			// to a resource URI, so they should use the new resource-centric.
+			if len(azureLogAnalyticsTarget.Resources) > 0 {
+				resources = azureLogAnalyticsTarget.Resources
+				resourceOrWorkspace = azureLogAnalyticsTarget.Resources[0]
+			} else if azureLogAnalyticsTarget.Resource != "" {
+				resources = []string{azureLogAnalyticsTarget.Resource}
+				resourceOrWorkspace = azureLogAnalyticsTarget.Resource
+			} else {
+				resourceOrWorkspace = azureLogAnalyticsTarget.Workspace
+			}
+
+			queryString = azureLogAnalyticsTarget.Query
 		}
 
-		azureLogAnalyticsTarget := queryJSONModel.AzureLogAnalytics
-		logger.Debug("AzureLogAnalytics", "target", azureLogAnalyticsTarget)
+		if query.QueryType == string(dataquery.AzureQueryTypeAzureTraces) {
+			queryJSONModel := types.TracesJSONQuery{}
+			err := json.Unmarshal(query.JSON, &queryJSONModel)
+			if err != nil {
+				return nil, fmt.Errorf("failed to decode the Azure Traces query object from JSON: %w", err)
+			}
 
-		resultFormat := azureLogAnalyticsTarget.ResultFormat
-		if resultFormat == "" {
-			resultFormat = types.TimeSeries
+			azureTracesTarget := queryJSONModel.AzureTraces
+			logger.Debug("AzureTraces", "target", azureTracesTarget)
+
+			if azureTracesTarget.ResultFormat == nil {
+				resultFormat = types.Table
+			} else {
+				resultFormat = string(*azureTracesTarget.ResultFormat)
+				if resultFormat == "" {
+					resultFormat = types.Table
+				}
+			}
+
+			resources = azureTracesTarget.Resources
+			resourceOrWorkspace = azureTracesTarget.Resources[0]
+
+			operationId := ""
+			if queryJSONModel.AzureTraces.OperationId != nil {
+				operationId = *queryJSONModel.AzureTraces.OperationId
+			}
+
+			queryString = buildTracesQuery(operationId, queryJSONModel.AzureTraces.TraceTypes, queryJSONModel.AzureTraces.Filters, &resultFormat)
+			traceIdVariable := "${__data.fields.traceID}"
+			if operationId == "" {
+				traceExploreQuery = buildTracesQuery(traceIdVariable, queryJSONModel.AzureTraces.TraceTypes, queryJSONModel.AzureTraces.Filters, nil)
+				traceLogsExploreQuery = buildTracesLogsQuery(&traceIdVariable)
+			} else {
+				traceExploreQuery = queryString
+				traceLogsExploreQuery = buildTracesLogsQuery(&operationId)
+			}
+			traceExploreQuery, err = macros.KqlInterpolate(logger, query, dsInfo, traceExploreQuery, "TimeGenerated")
+			if err != nil {
+				return nil, fmt.Errorf("failed to create traces explore query: %s", err)
+			}
+			traceLogsExploreQuery, err = macros.KqlInterpolate(logger, query, dsInfo, traceLogsExploreQuery, "TimeGenerated")
+			if err != nil {
+				return nil, fmt.Errorf("failed to create traces logs explore query: %s", err)
+			}
 		}
 
-		apiURL := getApiURL(queryJSONModel)
+		apiURL := getApiURL(resourceOrWorkspace)
 
-		rawQuery, err := macros.KqlInterpolate(logger, query, dsInfo, azureLogAnalyticsTarget.Query, "TimeGenerated")
+		rawQuery, err := macros.KqlInterpolate(logger, query, dsInfo, queryString, "TimeGenerated")
 		if err != nil {
 			return nil, err
 		}
 
-		resources := []string{}
-		if len(azureLogAnalyticsTarget.Resources) > 0 {
-			resources = azureLogAnalyticsTarget.Resources
-		} else if azureLogAnalyticsTarget.Resource != "" {
-			resources = []string{azureLogAnalyticsTarget.Resource}
-		}
 		azureLogAnalyticsQueries = append(azureLogAnalyticsQueries, &AzureLogAnalyticsQuery{
-			RefID:        query.RefID,
-			ResultFormat: resultFormat,
-			URL:          apiURL,
-			JSON:         query.JSON,
-			TimeRange:    query.TimeRange,
-			Query:        rawQuery,
-			Resources:    resources,
+			RefID:                 query.RefID,
+			ResultFormat:          resultFormat,
+			URL:                   apiURL,
+			JSON:                  query.JSON,
+			TimeRange:             query.TimeRange,
+			Query:                 rawQuery,
+			Resources:             resources,
+			QueryType:             query.QueryType,
+			TraceExploreQuery:     traceExploreQuery,
+			TraceLogsExploreQuery: traceLogsExploreQuery,
 		})
 	}
 
@@ -156,6 +215,26 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
 		return dataResponseErrorWithExecuted(fmt.Errorf("credentials for Log Analytics are no longer supported. Go to the data source configuration to update Azure Monitor credentials"))
 	}
 
+	queryJSONModel := dataquery.AzureMonitorQuery{}
+	err := json.Unmarshal(query.JSON, &queryJSONModel)
+	if err != nil {
+		dataResponse.Error = err
+		return dataResponse
+	}
+
+	if query.QueryType == string(dataquery.AzureQueryTypeAzureTraces) {
+		if queryJSONModel.AzureTraces.OperationId != nil && *queryJSONModel.AzureTraces.OperationId != "" {
+			query, err = getCorrelationWorkspaces(ctx, logger, query, dsInfo, *queryJSONModel.AzureTraces.OperationId, tracer)
+			if err != nil {
+				dataResponse.Error = err
+				return dataResponse
+			}
+		}
+		if dataquery.ResultFormat(query.ResultFormat) == (dataquery.ResultFormatTrace) && query.Query == "" {
+			return dataResponseErrorWithExecuted(fmt.Errorf("cannot visualise trace events using the trace visualiser"))
+		}
+	}
+
 	req, err := e.createRequest(ctx, logger, url, query)
 	if err != nil {
 		dataResponse.Error = err
@@ -196,7 +275,7 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
 		return dataResponseErrorWithExecuted(err)
 	}
 
-	frame, err := ResponseTableToFrame(t, query.RefID, query.Query)
+	frame, err := ResponseTableToFrame(t, query.RefID, query.Query, dataquery.AzureQueryType(query.QueryType), dataquery.ResultFormat(query.ResultFormat))
 	if err != nil {
 		return dataResponseErrorWithExecuted(err)
 	}
@@ -211,10 +290,12 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
 		return dataResponse
 	}
 
-	queryUrl, err := getQueryUrl(query.Query, query.Resources, azurePortalBaseUrl)
-	if err != nil {
-		dataResponse.Error = err
-		return dataResponse
+	if query.QueryType == string(dataquery.AzureQueryTypeAzureTraces) && query.ResultFormat == string(dataquery.ResultFormatTrace) {
+		frame.Meta.PreferredVisualization = "trace"
+	}
+
+	if query.ResultFormat == string(dataquery.ResultFormatTable) {
+		frame.Meta.PreferredVisualization = "table"
 	}
 
 	if query.ResultFormat == types.TimeSeries {
@@ -229,7 +310,72 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
 		}
 	}
 
-	AddConfigLinks(*frame, queryUrl)
+	queryUrl, err := getQueryUrl(query.Query, query.Resources, azurePortalBaseUrl)
+	if err != nil {
+		dataResponse.Error = err
+		return dataResponse
+	}
+
+	if query.QueryType == string(dataquery.AzureQueryTypeAzureTraces) {
+		tracesUrl, err := getTracesQueryUrl(query.Resources, azurePortalBaseUrl)
+		if err != nil {
+			dataResponse.Error = err
+			return dataResponse
+		}
+		linkTitle := "Explore Trace in Azure Portal"
+		AddConfigLinks(*frame, tracesUrl, &linkTitle)
+
+		queryJSONModel := dataquery.AzureMonitorQuery{}
+		err = json.Unmarshal(query.JSON, &queryJSONModel)
+		if err != nil {
+			dataResponse.Error = err
+			return dataResponse
+		}
+		traceIdVariable := "${__data.fields.traceID}"
+		resultFormat := dataquery.AzureMonitorQueryAzureTracesResultFormatTrace
+		queryJSONModel.AzureTraces.ResultFormat = &resultFormat
+		queryJSONModel.AzureTraces.Query = &query.TraceExploreQuery
+		if queryJSONModel.AzureTraces.OperationId == nil || *queryJSONModel.AzureTraces.OperationId == "" {
+			queryJSONModel.AzureTraces.OperationId = &traceIdVariable
+		}
+
+		logsQueryType := string(dataquery.AzureQueryTypeAzureLogAnalytics)
+		logsJSONModel := dataquery.AzureMonitorQuery{
+			AzureLogAnalytics: &struct {
+				Query        *string                                                   "json:\"query,omitempty\""
+				Resource     *string                                                   "json:\"resource,omitempty\""
+				Resources    []string                                                  "json:\"resources,omitempty\""
+				ResultFormat *dataquery.AzureMonitorQueryAzureLogAnalyticsResultFormat "json:\"resultFormat,omitempty\""
+				Workspace    *string                                                   "json:\"workspace,omitempty\""
+			}{
+				Resources: queryJSONModel.AzureTraces.Resources,
+				Query:     &query.TraceLogsExploreQuery,
+			},
+			QueryType: &logsQueryType,
+		}
+
+		AddCustomDataLink(*frame, data.DataLink{
+			Title: "Explore Trace: ${__data.fields.traceID}",
+			URL:   "",
+			Internal: &data.InternalDataLink{
+				DatasourceUID:  dsInfo.DatasourceUID,
+				DatasourceName: dsInfo.DatasourceName,
+				Query:          queryJSONModel,
+			},
+		})
+
+		AddCustomDataLink(*frame, data.DataLink{
+			Title: "Explore Trace Logs",
+			URL:   "",
+			Internal: &data.InternalDataLink{
+				DatasourceUID:  dsInfo.DatasourceUID,
+				DatasourceName: dsInfo.DatasourceName,
+				Query:          logsJSONModel,
+			},
+		})
+	} else {
+		AddConfigLinks(*frame, queryUrl, nil)
+	}
 
 	dataResponse.Frames = data.Frames{frame}
 	return dataResponse
@@ -307,6 +453,113 @@ func getQueryUrl(query string, resources []string, azurePortalUrl string) (strin
 	return portalUrl, nil
 }
 
+func getTracesQueryUrl(resources []string, azurePortalUrl string) (string, error) {
+	portalUrl := azurePortalUrl
+	portalUrl += "/#view/AppInsightsExtension/DetailsV2Blade/ComponentId~/"
+	resource := struct {
+		ResourceId string `json:"ResourceId"`
+	}{
+		resources[0],
+	}
+	resourceMarshalled, err := json.Marshal(resource)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal application insights resource: %s", err)
+	}
+
+	portalUrl += url.PathEscape(string(resourceMarshalled))
+	portalUrl += "/DataModel~/"
+
+	// We're making use of data link variables to select the necessary fields in the frontend
+	eventId := "%22eventId%22%3A%22${__data.fields.itemId}%22%2C"
+	timestamp := "%22timestamp%22%3A%22${__data.fields.startTime}%22%2C"
+	eventTable := "%22eventTable%22%3A%22${__data.fields.itemType}%22"
+	traceObject := fmt.Sprintf("%%7B%s%s%s%%7D", eventId, timestamp, eventTable)
+
+	portalUrl += traceObject
+
+	return portalUrl, nil
+}
+
+func getCorrelationWorkspaces(ctx context.Context, logger log.Logger, query *AzureLogAnalyticsQuery, dsInfo types.DatasourceInfo, operationId string, tracer tracing.Tracer) (*AzureLogAnalyticsQuery, error) {
+	azMonService := dsInfo.Services["Azure Monitor"]
+	correlationUrl := azMonService.URL + fmt.Sprintf("%s/providers/microsoft.insights/transactions/%s", query.Resources[0], operationId)
+
+	callCorrelationAPI := func(url string) (AzureCorrelationAPIResponse, error) {
+		req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewBuffer([]byte{}))
+		if err != nil {
+			logger.Debug("Failed to create request", "error", err)
+			return AzureCorrelationAPIResponse{}, fmt.Errorf("%v: %w", "failed to create request", err)
+		}
+		req.URL.Path = url
+		req.Header.Set("Content-Type", "application/json")
+		values := req.URL.Query()
+		values.Add("api-version", "2019-10-17-preview")
+		req.URL.RawQuery = values.Encode()
+		req.Method = "GET"
+
+		ctx, span := tracer.Start(ctx, "azure traces correlation request")
+		span.SetAttributes("target", req.URL, attribute.Key("target").String(req.URL.String()))
+		span.SetAttributes("datasource_id", dsInfo.DatasourceID, attribute.Key("datasource_id").Int64(dsInfo.DatasourceID))
+		span.SetAttributes("org_id", dsInfo.OrgID, attribute.Key("org_id").Int64(dsInfo.OrgID))
+
+		defer span.End()
+
+		tracer.Inject(ctx, req.Header, span)
+
+		logger.Debug("AzureLogAnalytics", "Traces Correlation ApiURL", req.URL.String())
+		res, err := azMonService.HTTPClient.Do(req)
+		if err != nil {
+			return AzureCorrelationAPIResponse{}, err
+		}
+		body, err := io.ReadAll(res.Body)
+		if err != nil {
+			return AzureCorrelationAPIResponse{}, err
+		}
+		defer func() {
+			err := res.Body.Close()
+			if err != nil {
+				logger.Warn("failed to close response body", "error", err)
+			}
+		}()
+
+		if res.StatusCode/100 != 2 {
+			logger.Debug("Request failed", "status", res.Status, "body", string(body))
+			return AzureCorrelationAPIResponse{}, fmt.Errorf("request failed, status: %s, body: %s", res.Status, string(body))
+		}
+		var data AzureCorrelationAPIResponse
+		d := json.NewDecoder(bytes.NewReader(body))
+		d.UseNumber()
+		err = d.Decode(&data)
+		if err != nil {
+			logger.Debug("Failed to unmarshal Azure Traces correlation API response", "error", err, "status", res.Status, "body", string(body))
+			return AzureCorrelationAPIResponse{}, err
+		}
+
+		return data, nil
+	}
+
+	var nextLink *string
+	var correlationResponse AzureCorrelationAPIResponse
+
+	correlationResponse, err := callCorrelationAPI(correlationUrl)
+	if err != nil {
+		return query, err
+	}
+	nextLink = correlationResponse.Properties.NextLink
+	query.Resources = correlationResponse.Properties.Resources
+
+	for nextLink != nil {
+		correlationResponse, err := callCorrelationAPI(correlationUrl)
+		if err != nil {
+			return query, err
+		}
+		query.Resources = append(query.Resources, correlationResponse.Properties.Resources...)
+		nextLink = correlationResponse.Properties.NextLink
+	}
+
+	return query, nil
+}
+
 // Error definition has been inferred from real data and other model definitions like
 // https://github.com/Azure/azure-sdk-for-go/blob/3640559afddbad452d265b54fb1c20b30be0b062/services/preview/virtualmachineimagebuilder/mgmt/2019-05-01-preview/virtualmachineimagebuilder/models.go
 type AzureLogAnalyticsAPIError struct {
@@ -334,6 +587,19 @@ type AzureLogAnalyticsResponse struct {
 	Error  *AzureLogAnalyticsAPIError `json:"error,omitempty"`
 }
 
+type AzureCorrelationAPIResponse struct {
+	ID         string                                `json:"id"`
+	Name       string                                `json:"name"`
+	Type       string                                `json:"type"`
+	Properties AzureCorrelationAPIResponseProperties `json:"properties"`
+	Error      *AzureLogAnalyticsAPIError            `json:"error,omitempty"`
+}
+
+type AzureCorrelationAPIResponseProperties struct {
+	Resources []string `json:"resources"`
+	NextLink  *string  `json:"nextLink,omitempty"`
+}
+
 // GetPrimaryResultTable returns the first table in the response named "PrimaryResult", or an
 // error if there is no table by that name.
 func (ar *AzureLogAnalyticsResponse) GetPrimaryResultTable() (*types.AzureResponseTable, error) {
@@ -392,3 +658,94 @@ func encodeQuery(rawQuery string) (string, error) {
 
 	return base64.StdEncoding.EncodeToString(b.Bytes()), nil
 }
+
+func buildTracesQuery(operationId string, traceTypes []string, filters []types.TracesFilters, resultFormat *string) string {
+	types := traceTypes
+	if len(types) == 0 {
+		types = Tables
+	}
+
+	filteredTypes := make([]string, 0)
+	// If the result format is set to trace then we filter out all events that are of the type traces as they don't make sense when visualised as a span
+	if resultFormat != nil && dataquery.ResultFormat(*resultFormat) == dataquery.ResultFormatTrace {
+		filteredTypes = slices.Filter(filteredTypes, types, func(s string) bool { return s != "traces" })
+	} else {
+		filteredTypes = types
+	}
+	sort.Strings(filteredTypes)
+
+	if len(filteredTypes) == 0 {
+		return ""
+	}
+
+	tagsMap := make(map[string]bool)
+	var tags []string
+	for _, t := range filteredTypes {
+		tableTags := getTagsForTable(t)
+		for _, i := range tableTags {
+			if tagsMap[i] {
+				continue
+			}
+			if i == "cloud_RoleInstance" || i == "cloud_RoleName" || i == "customDimensions" || i == "customMeasurements" {
+				continue
+			}
+			tags = append(tags, i)
+			tagsMap[i] = true
+		}
+	}
+	sort.Strings(tags)
+
+	whereClause := ""
+
+	if operationId != "" {
+		whereClause = fmt.Sprintf("| where (operation_Id != '' and operation_Id == '%s') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == '%s')", operationId, operationId)
+	}
+
+	filtersClause := ""
+
+	if len(filters) > 0 {
+		for _, filter := range filters {
+			if len(filter.Filters) == 0 {
+				continue
+			}
+			operation := "in"
+			if filter.Operation == "ne" {
+				operation = "!in"
+			}
+			filterValues := []string{}
+			for _, val := range filter.Filters {
+				filterValues = append(filterValues, fmt.Sprintf(`"%s"`, val))
+			}
+			filtersClause += fmt.Sprintf("| where %s %s (%s)", filter.Property, operation, strings.Join(filterValues, ","))
+		}
+	}
+
+	propertiesFunc := "bag_merge(customDimensions, customMeasurements)"
+	if len(tags) > 0 {
+		propertiesFunc = fmt.Sprintf("bag_merge(bag_pack_columns(%s), customDimensions, customMeasurements)", strings.Join(tags, ","))
+	}
+
+	errorProperty := ""
+	if slices.Contains(filteredTypes, "exceptions") {
+		errorProperty = `| extend error = iff(itemType == "exceptions", true, false)`
+	}
+
+	baseQuery := fmt.Sprintf(`set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true %s | where $__timeFilter()`, strings.Join(filteredTypes, ","))
+	propertiesStaticQuery := `| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+		`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+		`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+		`| extend serviceName = cloud_RoleName` +
+		`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)`
+	propertiesQuery := fmt.Sprintf(`| extend tags = %s`, propertiesFunc)
+	projectClause := `| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+		`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+		`| order by startTime asc`
+	return baseQuery + whereClause + propertiesStaticQuery + propertiesQuery + errorProperty + filtersClause + projectClause
+}
+
+func buildTracesLogsQuery(operationId *string) string {
+	tables := `union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults`
+	time := `| where $__timeFilter()`
+	operationIdFilter := fmt.Sprintf(`| where operation_Id == "%s"`, *operationId)
+	return strings.Join([]string{tables, time, operationIdFilter}, " \n")
+}
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
index 12983cb04b2..144193c1da0 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 )
 
@@ -45,6 +46,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					}`, types.TimeSeries)),
 					RefID:     "A",
 					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
@@ -63,11 +65,11 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Query:     "Perf | where ['TimeGenerated'] >= datetime('2018-03-15T13:00:00Z') and ['TimeGenerated'] <= datetime('2018-03-15T13:34:00Z') | where ['Computer'] in ('comp1','comp2') | summarize avg(CounterValue) by bin(TimeGenerated, 34000ms), Computer",
 					Resources: []string{"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.OperationalInsights/workspaces/AppInsightsTestDataWorkspace"},
 					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			Err: require.NoError,
 		},
-
 		{
 			name: "Legacy queries with a workspace GUID should use workspace-centric url",
 			queryModel: []backend.DataQuery{
@@ -80,7 +82,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 							"resultFormat": "%s"
 						}
 					}`, types.TimeSeries)),
-					RefID: "A",
+					RefID:     "A",
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
@@ -98,11 +101,11 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					}`, types.TimeSeries)),
 					Query:     "Perf",
 					Resources: []string{},
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			Err: require.NoError,
 		},
-
 		{
 			name: "Legacy workspace queries with a resource URI (from a template variable) should use resource-centric url",
 			queryModel: []backend.DataQuery{
@@ -115,7 +118,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 							"resultFormat": "%s"
 						}
 					}`, types.TimeSeries)),
-					RefID: "A",
+					RefID:     "A",
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
@@ -133,11 +137,11 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					}`, types.TimeSeries)),
 					Query:     "Perf",
 					Resources: []string{},
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			Err: require.NoError,
 		},
-
 		{
 			name: "Queries with multiple resources",
 			queryModel: []backend.DataQuery{
@@ -150,7 +154,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 							"resultFormat": "%s"
 						}
 					}`, types.TimeSeries)),
-					RefID: "A",
+					RefID:     "A",
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
@@ -168,6 +173,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					}`, types.TimeSeries)),
 					Query:     "Perf",
 					Resources: []string{"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/cloud-datasources/providers/Microsoft.OperationalInsights/workspaces/AppInsightsTestDataWorkspace"},
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			Err: require.NoError,
@@ -186,6 +192,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					}`, types.TimeSeries)),
 					RefID:     "A",
 					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
 				},
 			},
 			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
@@ -204,6 +211,632 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Query:     "Perf",
 					Resources: []string{"/subscriptions/r1", "/subscriptions/r2"},
 					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureLogAnalytics),
+				},
+			},
+			Err: require.NoError,
+		},
+
+		{
+			name: "trace query",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"resultFormat": "%s",
+								"traceTypes":	["trace"],
+								"operationId":	"test-op-id"
+							}
+						}`, dataquery.ResultFormatTable)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTable),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"resultFormat": "%s",
+								"traceTypes":	["trace"],
+								"operationId":	"test-op-id"
+							}
+						}`, dataquery.ResultFormatTable)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(customDimensions, customMeasurements)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(customDimensions, customMeasurements)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"test-op-id\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with no result format set",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"traceTypes":	["trace"],
+								"operationId":	"test-op-id"
+							}
+						}`),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTable),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"traceTypes":	["trace"],
+								"operationId":	"test-op-id"
+							}
+						}`),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(customDimensions, customMeasurements)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(customDimensions, customMeasurements)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"test-op-id\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with no operation ID",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTable)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTable),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTable)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == '${__data.fields.traceID}') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == '${__data.fields.traceID}')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"${__data.fields.traceID}\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with no types",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"resultFormat": "%s",
+								"operationId":	"test-op-id"
+							}
+						}`, dataquery.ResultFormatTable)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTable),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"resultFormat": "%s",
+								"operationId":	"test-op-id"
+							}
+						}`, dataquery.ResultFormatTable)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"test-op-id\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with eq filter",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+								"queryType": "Azure Traces",
+								"azureTraces": {
+									"resources":     ["/subscriptions/r1"],
+									"resultFormat": "%s",
+									"operationId":	"test-op-id",
+									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "eq"}]
+								}
+							}`, dataquery.ResultFormatTable)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTable),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+								"queryType": "Azure Traces",
+								"azureTraces": {
+									"resources":     ["/subscriptions/r1"],
+									"resultFormat": "%s",
+									"operationId":	"test-op-id",
+									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "eq"}]
+								}
+							}`, dataquery.ResultFormatTable)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| where appId in ("test-app-id")` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| where appId in ("test-app-id")` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"test-op-id\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with ne filter",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+								"queryType": "Azure Traces",
+								"azureTraces": {
+									"resources":     ["/subscriptions/r1"],
+									"resultFormat": "%s",
+									"operationId":	"test-op-id",
+									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "ne"}]
+								}
+							}`, dataquery.ResultFormatTable)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTable),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+								"queryType": "Azure Traces",
+								"azureTraces": {
+									"resources":     ["/subscriptions/r1"],
+									"resultFormat": "%s",
+									"operationId":	"test-op-id",
+									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "ne"}]
+								}
+							}`, dataquery.ResultFormatTable)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| where appId !in ("test-app-id")` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| where appId !in ("test-app-id")` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"test-op-id\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with multiple filters",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+								"queryType": "Azure Traces",
+								"azureTraces": {
+									"resources":     ["/subscriptions/r1"],
+									"resultFormat": "%s",
+									"operationId":	"test-op-id",
+									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "ne"},{"filters": ["test-client-id"], "property": "clientId", "operation": "eq"}]
+							}
+						}`, dataquery.ResultFormatTable)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTable),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+								"queryType": "Azure Traces",
+								"azureTraces": {
+									"resources":     ["/subscriptions/r1"],
+									"resultFormat": "%s",
+									"operationId":	"test-op-id",
+									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "ne"},{"filters": ["test-client-id"], "property": "clientId", "operation": "eq"}]
+							}
+						}`, dataquery.ResultFormatTable)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| where appId !in ("test-app-id")| where clientId in ("test-client-id")` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| where appId !in ("test-app-id")| where clientId in ("test-client-id")` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"test-op-id\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with trace result format",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTrace),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":     ["/subscriptions/r1"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == '${__data.fields.traceID}') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == '${__data.fields.traceID}')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"${__data.fields.traceID}\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with trace result format and operation ID",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"test-op-id",
+								"resources":    ["/subscriptions/r1"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTrace),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"test-op-id",
+								"resources":    ["/subscriptions/r1"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName` +
+						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"test-op-id\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with trace result format and only trace type",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"test-op-id",
+								"resources":    ["/subscriptions/r1"],
+								"resultFormat": "%s",
+								"traceTypes":		["traces"]
+							}
+						}`, dataquery.ResultFormatTrace)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTrace),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"test-op-id",
+								"resources":    ["/subscriptions/r1"],
+								"resultFormat": "%s",
+								"traceTypes":		["traces"]
+							}
+						}`, dataquery.ResultFormatTrace)),
+					Query:             "",
+					Resources:         []string{"/subscriptions/r1"},
+					TimeRange:         timeRange,
+					QueryType:         string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: "",
+					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
+						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+						"| where operation_Id == \"test-op-id\"",
 				},
 			},
 			Err: require.NoError,
@@ -215,7 +848,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 			queries, err := datasource.buildQueries(logger, tt.queryModel, types.DatasourceInfo{})
 			tt.Err(t, err)
 			if diff := cmp.Diff(tt.azureLogAnalyticsQueries[0], queries[0]); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+				t.Errorf("Result mismatch (-want +got): \n%s", diff)
 			}
 		})
 	}
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame.go b/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame.go
index ad28b2a0e08..045ba6052d7 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame.go
@@ -4,11 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 )
 
@@ -43,12 +45,12 @@ func apiErrorToNotice(err *AzureLogAnalyticsAPIError) data.Notice {
 }
 
 // ResponseTableToFrame converts an AzureResponseTable to a data.Frame.
-func ResponseTableToFrame(table *types.AzureResponseTable, refID string, executedQuery string) (*data.Frame, error) {
+func ResponseTableToFrame(table *types.AzureResponseTable, refID string, executedQuery string, queryType dataquery.AzureQueryType, resultFormat dataquery.ResultFormat) (*data.Frame, error) {
 	if len(table.Rows) == 0 {
 		return nil, nil
 	}
 
-	converterFrame, err := converterFrameForTable(table)
+	converterFrame, err := converterFrameForTable(table, queryType, resultFormat)
 	if err != nil {
 		return nil, err
 	}
@@ -64,7 +66,7 @@ func ResponseTableToFrame(table *types.AzureResponseTable, refID string, execute
 	return converterFrame.Frame, nil
 }
 
-func converterFrameForTable(t *types.AzureResponseTable) (*data.FrameInputConverter, error) {
+func converterFrameForTable(t *types.AzureResponseTable, queryType dataquery.AzureQueryType, resultFormat dataquery.ResultFormat) (*data.FrameInputConverter, error) {
 	converters := []data.FieldConverter{}
 	colNames := make([]string, len(t.Columns))
 	colTypes := make([]string, len(t.Columns)) // for metadata
@@ -76,6 +78,9 @@ func converterFrameForTable(t *types.AzureResponseTable) (*data.FrameInputConver
 		if !ok {
 			return nil, fmt.Errorf("unsupported analytics column type %v", col.Type)
 		}
+		if queryType == dataquery.AzureQueryTypeAzureTraces && resultFormat == dataquery.ResultFormatTrace && (col.Name == "serviceTags" || col.Name == "tags") {
+			converter = tagsConverter
+		}
 		converters = append(converters, converter)
 	}
 
@@ -112,6 +117,58 @@ var converterMap = map[string]data.FieldConverter{
 	"number":   decimalConverter,
 }
 
+type KeyValue struct {
+	Value interface{} `json:"value"`
+	Key   string      `json:"key"`
+}
+
+var tagsConverter = data.FieldConverter{
+	OutputFieldType: data.FieldTypeNullableJSON,
+	Converter: func(v interface{}) (interface{}, error) {
+		if v == nil {
+			return nil, nil
+		}
+
+		m := map[string]any{}
+		err := json.Unmarshal([]byte(v.(string)), &m)
+		if err != nil {
+			return nil, fmt.Errorf("failed to unmarshal trace tags: %s", err)
+		}
+
+		parsedTags := make([]*KeyValue, 0, len(m)-1)
+		for k, v := range m {
+			if v == nil {
+				continue
+			}
+
+			switch v.(type) {
+			case float64:
+				if v == 0 {
+					continue
+				}
+			case string:
+				if v == "" {
+					continue
+				}
+			}
+
+			parsedTags = append(parsedTags, &KeyValue{Key: k, Value: v})
+		}
+		sort.Slice(parsedTags, func(i, j int) bool {
+			return parsedTags[i].Key < parsedTags[j].Key
+		})
+
+		marshalledTags, err := json.Marshal(parsedTags)
+		if err != nil {
+			return nil, fmt.Errorf("failed to marshal parsed trace tags: %s", err)
+		}
+
+		jsonTags := json.RawMessage(marshalledTags)
+
+		return &jsonTags, nil
+	},
+}
+
 var stringConverter = data.FieldConverter{
 	OutputFieldType: data.FieldTypeNullableString,
 	Converter: func(v interface{}) (interface{}, error) {
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame_test.go
index 850c58bd71e..cd69d7069ea 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-response-table-frame_test.go
@@ -2,15 +2,15 @@ package loganalytics
 
 import (
 	"encoding/json"
-	"math"
+	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
-	"time"
 
-	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/testdata"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -24,175 +24,87 @@ func TestLogTableToFrame(t *testing.T) {
 		{
 			name:     "single series",
 			testFile: "loganalytics/1-log-analytics-response-metrics-single-series.json",
-			expectedFrame: func() *data.Frame {
-				frame := data.NewFrame("",
-					data.NewField("TimeGenerated", nil, []*time.Time{
-						util.Pointer(time.Date(2020, 4, 19, 19, 16, 6, 5e8, time.UTC)),
-						util.Pointer(time.Date(2020, 4, 19, 19, 16, 16, 5e8, time.UTC)),
-						util.Pointer(time.Date(2020, 4, 19, 19, 16, 26, 5e8, time.UTC)),
-					}),
-					data.NewField("Computer", nil, []*string{
-						util.Pointer("grafana-vm"),
-						util.Pointer("grafana-vm"),
-						util.Pointer("grafana-vm"),
-					}),
-					data.NewField("avg_CounterValue", nil, []*float64{
-						util.Pointer(1.1),
-						util.Pointer(2.2),
-						util.Pointer(3.3),
-					}),
-				)
-				frame.Meta = &data.FrameMeta{
-					Custom: &LogAnalyticsMeta{ColumnTypes: []string{"datetime", "string", "real"}},
-				}
-				return frame
-			},
 		},
 		{
 			name:     "response table",
 			testFile: "loganalytics/6-log-analytics-response-table.json",
-			expectedFrame: func() *data.Frame {
-				frame := data.NewFrame("",
-					data.NewField("TenantId", nil, []*string{
-						util.Pointer("a2c1b44e-3e57-4410-b027-6cc0ae6dee67"),
-						util.Pointer("a2c1b44e-3e57-4410-b027-6cc0ae6dee67"),
-						util.Pointer("a2c1b44e-3e57-4410-b027-6cc0ae6dee67"),
-					}),
-					data.NewField("Computer", nil, []*string{
-						util.Pointer("grafana-vm"),
-						util.Pointer("grafana-vm"),
-						util.Pointer("grafana-vm"),
-					}),
-					data.NewField("ObjectName", nil, []*string{
-						util.Pointer("Memory"),
-						util.Pointer("Memory"),
-						util.Pointer("Memory"),
-					}),
-					data.NewField("CounterName", nil, []*string{
-						util.Pointer("Available MBytes Memory"),
-						util.Pointer("Available MBytes Memory"),
-						util.Pointer("Available MBytes Memory"),
-					}),
-					data.NewField("InstanceName", nil, []*string{
-						util.Pointer("Memory"),
-						util.Pointer("Memory"),
-						util.Pointer("Memory"),
-					}),
-					data.NewField("Min", nil, []*float64{nil, nil, nil}),
-					data.NewField("Max", nil, []*float64{nil, nil, nil}),
-					data.NewField("SampleCount", nil, []*int32{nil, nil, nil}),
-					data.NewField("CounterValue", nil, []*float64{
-						util.Pointer(2040.0),
-						util.Pointer(2066.0),
-						util.Pointer(2066.0),
-					}),
-					data.NewField("TimeGenerated", nil, []*time.Time{
-						util.Pointer(time.Date(2020, 4, 23, 11, 46, 3, 857e6, time.UTC)),
-						util.Pointer(time.Date(2020, 4, 23, 11, 46, 13, 857e6, time.UTC)),
-						util.Pointer(time.Date(2020, 4, 23, 11, 46, 23, 857e6, time.UTC)),
-					}),
-				)
-				frame.Meta = &data.FrameMeta{
-					Custom: &LogAnalyticsMeta{ColumnTypes: []string{"string", "string", "string",
-						"string", "string", "real", "real", "int", "real", "datetime"}},
-				}
-				return frame
-			},
 		},
 		{
 			name:     "all supported field types",
 			testFile: "loganalytics/7-log-analytics-all-types-table.json",
-			expectedFrame: func() *data.Frame {
-				frame := data.NewFrame("",
-					data.NewField("XBool", nil, []*bool{util.Pointer(true)}),
-					data.NewField("XString", nil, []*string{util.Pointer("Grafana")}),
-					data.NewField("XDateTime", nil, []*time.Time{util.Pointer(time.Date(2006, 1, 2, 22, 4, 5, 1*1e8, time.UTC))}),
-					data.NewField("XDynamic", nil, []*string{util.Pointer(`[{"person":"Daniel"},{"cats":23},{"diagnosis":"cat problem"}]`)}),
-					data.NewField("XGuid", nil, []*string{util.Pointer("74be27de-1e4e-49d9-b579-fe0b331d3642")}),
-					data.NewField("XInt", nil, []*int32{util.Pointer(int32(2147483647))}),
-					data.NewField("XLong", nil, []*int64{util.Pointer(int64(9223372036854775807))}),
-					data.NewField("XReal", nil, []*float64{util.Pointer(1.797693134862315708145274237317043567981e+308)}),
-					data.NewField("XTimeSpan", nil, []*string{util.Pointer("00:00:00.0000001")}),
-					data.NewField("XDecimal", nil, []*float64{util.Pointer(79228162514264337593543950335.0)}),
-					data.NewField("XObject", nil, []*string{util.Pointer(`"{\"person\": \"Daniel\", \"cats\": 23, \"diagnosis\": \"cat problem\"}"`)}),
-					data.NewField("XNumber", nil, []*float64{util.Pointer(79228162514264337593543950335.0)}),
-				)
-				frame.Meta = &data.FrameMeta{
-					Custom: &LogAnalyticsMeta{ColumnTypes: []string{"bool", "string", "datetime",
-						"dynamic", "guid", "int", "long", "real", "timespan", "decimal", "object", "number"}},
-				}
-				return frame
-			},
 		},
 		{
 			name:     "nan and infinity in real response",
 			testFile: "loganalytics/8-log-analytics-response-nan-inf.json",
-			expectedFrame: func() *data.Frame {
-				frame := data.NewFrame("",
-					data.NewField("XInf", nil, []*float64{util.Pointer(math.Inf(0))}),
-					data.NewField("XInfNeg", nil, []*float64{util.Pointer(math.Inf(-2))}),
-					data.NewField("XNan", nil, []*float64{util.Pointer(math.NaN())}),
-				)
-				frame.Meta = &data.FrameMeta{
-					Custom: &LogAnalyticsMeta{ColumnTypes: []string{"real", "real", "real"}},
-				}
-				return frame
-			},
 		},
 		{
 			name:     "data and error in real response",
 			testFile: "loganalytics/9-log-analytics-response-error.json",
-			expectedFrame: func() *data.Frame {
-				frame := data.NewFrame("",
-					data.NewField("OperationName", nil, []*string{util.Pointer("Create or Update Virtual Machine")}),
-					data.NewField("Level", nil, []*string{util.Pointer("Informational")}),
-				)
-				frame.Meta = &data.FrameMeta{
-					Custom:  &LogAnalyticsMeta{ColumnTypes: []string{"string", "string"}},
-					Notices: []data.Notice{{Severity: data.NoticeSeverityError, Text: "There were some errors when processing your query. Something went wrong processing your query on the server. The results of this query exceed the set limit of 1 records."}},
-				}
-				return frame
-			},
 		},
 		{
 			name:     "data and warning in real response",
 			testFile: "loganalytics/10-log-analytics-response-warning.json",
-			expectedFrame: func() *data.Frame {
-				frame := data.NewFrame("",
-					data.NewField("OperationName", nil, []*string{util.Pointer("Create or Update Virtual Machine")}),
-					data.NewField("Level", nil, []*string{util.Pointer("Informational")}),
-				)
-				frame.Meta = &data.FrameMeta{
-					Custom:  &LogAnalyticsMeta{ColumnTypes: []string{"string", "string"}},
-					Notices: []data.Notice{{Severity: data.NoticeSeverityWarning, Text: "There were some errors when processing your query. Something went wrong processing your query on the server. Not sure what happened."}},
-				}
-				return frame
-			},
 		},
 		{
 			name:     "empty data response",
 			testFile: "loganalytics/11-log-analytics-response-empty.json",
-			expectedFrame: func() *data.Frame {
-				return nil
-			},
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			res := loadLogAnalyticsTestFileWithNumber(t, tt.testFile)
-			frame, err := ResponseTableToFrame(&res.Tables[0], "A", "query")
+			res := loadTestFileWithNumber(t, tt.testFile)
+			frame, err := ResponseTableToFrame(&res.Tables[0], "A", "query", dataquery.AzureQueryTypeAzureLogAnalytics, dataquery.ResultFormatTable)
 			appendErrorNotice(frame, res.Error)
 			require.NoError(t, err)
 
-			if diff := cmp.Diff(tt.expectedFrame(), frame, data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
+			testdata.CheckGoldenFrame(t, "../testdata", tt.testFile, frame)
 		})
 	}
 }
 
-func loadLogAnalyticsTestFileWithNumber(t *testing.T, name string) AzureLogAnalyticsResponse {
+func TestTraceTableToFrame(t *testing.T) {
+	tests := []struct {
+		name          string
+		testFile      string
+		expectedFrame func() *data.Frame
+		resultFormat  dataquery.ResultFormat
+	}{
+		{
+			name:         "multi trace",
+			testFile:     "traces/1-traces-multiple-table.json",
+			resultFormat: dataquery.ResultFormatTable,
+		},
+		{
+			name:         "multi trace as trace format",
+			testFile:     "traces/1-traces-multiple-table.json",
+			resultFormat: dataquery.ResultFormatTrace,
+		},
+		{
+			name:         "single trace",
+			testFile:     "traces/2-traces-single-table.json",
+			resultFormat: dataquery.ResultFormatTable,
+		},
+		{
+			name:         "single trace as trace format",
+			testFile:     "traces/2-traces-single-table.json",
+			resultFormat: dataquery.ResultFormatTrace,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			res := loadTestFileWithNumber(t, tt.testFile)
+			frame, err := ResponseTableToFrame(&res.Tables[0], "A", "query", dataquery.AzureQueryTypeAzureTraces, tt.resultFormat)
+			appendErrorNotice(frame, res.Error)
+			require.NoError(t, err)
+
+			testdata.CheckGoldenFrame(t, "../testdata", fmt.Sprintf("%s.%s", tt.testFile, strings.ReplaceAll(tt.name, " ", "-")), frame)
+		})
+	}
+}
+
+func loadTestFileWithNumber(t *testing.T, name string) AzureLogAnalyticsResponse {
 	t.Helper()
 	path := filepath.Join("../testdata", name)
 	// Ignore gosec warning G304 since it's a test
diff --git a/pkg/tsdb/azuremonitor/loganalytics/consts.go b/pkg/tsdb/azuremonitor/loganalytics/consts.go
new file mode 100644
index 00000000000..529c5fcc7da
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/loganalytics/consts.go
@@ -0,0 +1,121 @@
+package loganalytics
+
+var Tables = []string{"availabilityResults", "dependencies", "customEvents", "exceptions", "pageViews", "requests", "traces"}
+
+// AttributesOmit - Properties to omit when generating the attributes bag
+var AttributesOmit = map[string]string{"operationId": "operationId", "duration": "duration", "id": "id", "name": "name", "problemId": "problemId", "operation_ParentId": "operation_ParentId", "timestamp": "timestamp", "customDimensions": "customDimensions", "operation_Name": "operation_Name"}
+
+// CommonProperties - common resource centric properties mapped to legacy property names
+var CommonProperties = map[string]string{
+	"appId":                     "ResourceGUID",
+	"application_Version":       "AppVersion",
+	"appName":                   "_ResourceId",
+	"client_Browser":            "ClientBrowser",
+	"client_City":               "ClientCity",
+	"client_CountryOrRegion":    "ClientCountryOrRegion",
+	"client_IP":                 "ClientIP",
+	"client_Model":              "ClientModel",
+	"client_OS":                 "ClientOS",
+	"client_StateOrProvince":    "ClientStateOrProvince",
+	"client_Type":               "ClientType",
+	"cloud_RoleInstance":        "AppRoleInstance",
+	"cloud_RoleName":            "AppRoleName",
+	"customDimensions":          "Properties",
+	"customMeasurements":        "Measurements",
+	"duration":                  "DurationMs",
+	"id":                        "Id",
+	"iKey":                      "IKey",
+	"itemCount":                 "ItemCount",
+	"itemId":                    "_ItemId",
+	"itemType":                  "Type",
+	"name":                      "Name",
+	"operation_Id":              "OperationId",
+	"operation_Name":            "OperationName",
+	"operation_ParentId":        "OperationParentId",
+	"operation_SyntheticSource": "OperationSyntheticSource",
+	"performanceBucket":         "PerformanceBucket",
+	"sdkVersion":                "SDKVersion",
+	"session_Id":                "SessionId",
+	"success":                   "Success",
+	"timestamp":                 "TimeGenerated",
+	"user_AccountId":            "UserAccountId",
+	"user_AuthenticatedId":      "UserAuthenticatedId",
+	"user_Id":                   "UserId",
+}
+
+func copyCommonProperties(dst map[string]string, omit map[string]string) map[string]string {
+	for k, v := range CommonProperties {
+		if _, ok := omit[k]; !ok {
+			dst[k] = v
+		}
+	}
+	return dst
+}
+
+var emptyMap = map[string]string{}
+
+var AvailabilityResultsSchema = copyCommonProperties(map[string]string{
+	"location": "Location",
+	"message":  "Message",
+	"size":     "Size",
+}, emptyMap)
+
+var DependenciesSchema = copyCommonProperties(map[string]string{
+	"data":       "Data",
+	"resultCode": "ResultCode",
+	"target":     "Target",
+	"type":       "DependencyType",
+}, emptyMap)
+
+var EventsSchema = copyCommonProperties(map[string]string{}, map[string]string{"duration": "duration", "id": "id", "success": "success", "performanceBucket": "performanceBucket"})
+
+var PageViewsSchema = copyCommonProperties(map[string]string{"url": "Url"}, map[string]string{"success": "success"})
+
+var RequestsSchema = copyCommonProperties(map[string]string{"resultCode": "ResultCode",
+	"source": "Source",
+	"url":    "Url"}, map[string]string{})
+
+var ExceptionsSchema = copyCommonProperties(map[string]string{
+	"assembly":          "Assembly",
+	"details":           "Details",
+	"handledAt":         "HandledAt",
+	"innermostAssembly": "InnermostAssembly",
+	"innermostMessage":  "InnermostMessage",
+	"innermostMethod":   "InnermostMethod",
+	"innermostType":     "InnermostType",
+	"message":           "Message",
+	"method":            "Method",
+	"outerAssembly":     "OuterAssembly",
+	"outerMessage":      "OuterMessage",
+	"outerMethod":       "OuterMethod",
+	"outerType":         "OuterType",
+	"problemId":         "ProblemId",
+	"severityLevel":     "SeverityLevel",
+	"type":              "ExceptionType",
+}, map[string]string{"duration": "duration", "id": "id", "name": "name", "performanceBucket": "performanceBucket", "success": "success"})
+
+var TracesSchema = copyCommonProperties(map[string]string{
+	"message":       "Message",
+	"severityLevel": "SeverityLevel",
+}, map[string]string{"duration": "duration", "id": "id", "name": "name", "performanceBucket": "performanceBucket", "success": "success"})
+
+var TablesSchema = map[string]map[string]string{
+	"availabilityResults": AvailabilityResultsSchema,
+	"dependencies":        DependenciesSchema,
+	"customEvents":        EventsSchema,
+	"exceptions":          ExceptionsSchema,
+	"pageViews":           PageViewsSchema,
+	"requests":            RequestsSchema,
+	"traces":              TracesSchema,
+}
+
+func getTagsForTable(table string) []string {
+	tagsMap := TablesSchema[table]
+	tags := []string{}
+
+	for k := range tagsMap {
+		tags = append(tags, k)
+	}
+
+	return tags
+}
diff --git a/pkg/tsdb/azuremonitor/loganalytics/utils.go b/pkg/tsdb/azuremonitor/loganalytics/utils.go
index c96b7697a80..2a3f36e64c9 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/utils.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/utils.go
@@ -7,21 +7,34 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
-func AddConfigLinks(frame data.Frame, dl string) data.Frame {
+func AddCustomDataLink(frame data.Frame, dataLink data.DataLink) data.Frame {
 	for i := range frame.Fields {
 		if frame.Fields[i].Config == nil {
 			frame.Fields[i].Config = &data.FieldConfig{}
 		}
-		deepLink := data.DataLink{
-			Title:       "View in Azure Portal",
-			TargetBlank: true,
-			URL:         dl,
-		}
-		frame.Fields[i].Config.Links = append(frame.Fields[i].Config.Links, deepLink)
+
+		frame.Fields[i].Config.Links = append(frame.Fields[i].Config.Links, dataLink)
 	}
 	return frame
 }
 
+func AddConfigLinks(frame data.Frame, dl string, title *string) data.Frame {
+	linkTitle := "View in Azure Portal"
+	if title != nil {
+		linkTitle = *title
+	}
+
+	deepLink := data.DataLink{
+		Title:       linkTitle,
+		TargetBlank: true,
+		URL:         dl,
+	}
+
+	frame = AddCustomDataLink(frame, deepLink)
+
+	return frame
+}
+
 func GetAzurePortalUrl(azureCloud string) (string, error) {
 	switch azureCloud {
 	case azsettings.AzurePublic:
diff --git a/pkg/tsdb/azuremonitor/macros/macros.go b/pkg/tsdb/azuremonitor/macros/macros.go
index 922ee546c23..b65d1e79e04 100644
--- a/pkg/tsdb/azuremonitor/macros/macros.go
+++ b/pkg/tsdb/azuremonitor/macros/macros.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 	"github.com/grafana/grafana/pkg/tsdb/legacydata/interval"
 )
@@ -38,7 +39,7 @@ func KqlInterpolate(logger log.Logger, query backend.DataQuery, dsInfo types.Dat
 	engine := kqlMacroEngine{}
 
 	defaultTimeFieldForAllDatasources := "timestamp"
-	if len(defaultTimeField) > 0 {
+	if len(defaultTimeField) > 0 && query.QueryType != string(dataquery.AzureQueryTypeAzureTraces) {
 		defaultTimeFieldForAllDatasources = defaultTimeField[0]
 	}
 	return engine.Interpolate(logger, query, dsInfo, kql, defaultTimeFieldForAllDatasources)
diff --git a/pkg/tsdb/azuremonitor/macros/macros_test.go b/pkg/tsdb/azuremonitor/macros/macros_test.go
index 5ae58438ca0..516b9611dba 100644
--- a/pkg/tsdb/azuremonitor/macros/macros_test.go
+++ b/pkg/tsdb/azuremonitor/macros/macros_test.go
@@ -123,6 +123,16 @@ func TestAzureLogAnalyticsMacros(t *testing.T) {
 			expected: "",
 			Err:      require.Error,
 		},
+		{
+			name: "traces time field should remain as timestamp",
+			query: backend.DataQuery{
+				QueryType: "Azure Traces",
+				TimeRange: timeRange,
+			},
+			kql:      `$__timeFilter()`,
+			expected: "['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')",
+			Err:      require.NoError,
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
index 9a121988629..d021f3205fc 100644
--- a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
+++ b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
@@ -379,7 +379,7 @@ func (e *AzureMonitorDatasource) parseResponse(amr types.AzureMonitorResponse, q
 			return nil, err
 		}
 
-		frameWithLink := loganalytics.AddConfigLinks(*frame, queryUrl)
+		frameWithLink := loganalytics.AddConfigLinks(*frame, queryUrl, nil)
 		frames = append(frames, &frameWithLink)
 	}
 
diff --git a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
index fd60ee8e4b8..f310f6b0bdb 100644
--- a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
@@ -20,6 +21,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/testdata"
 	azTime "github.com/grafana/grafana/pkg/tsdb/azuremonitor/time"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 	"github.com/grafana/grafana/pkg/util"
@@ -351,42 +353,7 @@ func TestCustomNamespace(t *testing.T) {
 	})
 }
 
-func makeDates(startDate time.Time, count int, interval time.Duration) (times []time.Time) {
-	for i := 0; i < count; i++ {
-		times = append(times, startDate.Add(interval*time.Duration(i)))
-	}
-	return
-}
-
-func makeTestDataLink(url string) data.DataLink {
-	return data.DataLink{
-		Title:       "View in Azure Portal",
-		TargetBlank: true,
-		URL:         url,
-	}
-}
-
 func TestAzureMonitorParseResponse(t *testing.T) {
-	// datalinks for the test frames
-	averageLink := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
-		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C` +
-		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D`)
-	averageLink2 := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
-		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C` +
-		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D`)
-	totalLink := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
-		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C` +
-		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D`)
-	maxLink := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
-		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A3%2C%22namespace%22%3A%22%22%2C` +
-		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D`)
-	minLink := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
-		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A2%2C%22namespace%22%3A%22%22%2C` +
-		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D`)
-	countLink := makeTestDataLink(`http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/` +
-		`ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A7%2C%22namespace%22%3A%22%22%2C` +
-		`%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D`)
-
 	tests := []struct {
 		name            string
 		responseFile    string
@@ -396,137 +363,67 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 	}{
 		{
 			name:         "average aggregate time series response",
-			responseFile: "1-azure-monitor-response-avg.json",
+			responseFile: "azuremonitor/1-azure-monitor-response-avg.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Params: url.Values{
 					"aggregation": {"Average"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink}})),
-			},
 		},
 		{
 			name:         "total aggregate time series response",
-			responseFile: "2-azure-monitor-response-total.json",
+			responseFile: "azuremonitor/2-azure-monitor-response-total.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Params: url.Values{
 					"aggregation": {"Total"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 13, 29, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{totalLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(8.26), util.Pointer(8.7), util.Pointer(14.82), util.Pointer(10.07), util.Pointer(8.52),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{totalLink}})),
-			},
 		},
 		{
 			name:         "maximum aggregate time series response",
-			responseFile: "3-azure-monitor-response-maximum.json",
+			responseFile: "azuremonitor/3-azure-monitor-response-maximum.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Params: url.Values{
 					"aggregation": {"Maximum"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 14, 26, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{maxLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(3.07), util.Pointer(2.92), util.Pointer(2.87), util.Pointer(2.27), util.Pointer(2.52),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{maxLink}})),
-			},
 		},
 		{
 			name:         "minimum aggregate time series response",
-			responseFile: "4-azure-monitor-response-minimum.json",
+			responseFile: "azuremonitor/4-azure-monitor-response-minimum.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Params: url.Values{
 					"aggregation": {"Minimum"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 14, 43, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{minLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(1.51), util.Pointer(2.38), util.Pointer(1.69), util.Pointer(2.27), util.Pointer(1.96),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{minLink}})),
-			},
 		},
 		{
 			name:         "count aggregate time series response",
-			responseFile: "5-azure-monitor-response-count.json",
+			responseFile: "azuremonitor/5-azure-monitor-response-count.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Params: url.Values{
 					"aggregation": {"Count"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 14, 44, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{countLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(4.0), util.Pointer(4.0), util.Pointer(4.0), util.Pointer(4.0), util.Pointer(4.0),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{countLink}})),
-			},
 		},
 		{
 			name:         "single dimension time series response",
-			responseFile: "6-azure-monitor-response-single-dimension.json",
+			responseFile: "azuremonitor/6-azure-monitor-response-single-dimension.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Params: url.Values{
 					"aggregation": {"Average"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 15, 21, 0, 0, time.UTC), 6, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Count", data.Labels{"blobtype": "PageBlob"},
-						[]*float64{util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), nil}).
-						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}})),
-
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 15, 21, 0, 0, time.UTC), 6, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Count", data.Labels{"blobtype": "BlockBlob"},
-						[]*float64{util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), nil}).
-						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}})),
-
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 15, 21, 0, 0, time.UTC), 6, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Count", data.Labels{"blobtype": "Azure Data Lake Storage"},
-						[]*float64{util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), nil}).
-						SetConfig(&data.FieldConfig{Unit: "short", Links: []data.DataLink{averageLink}})),
-			},
 		},
 		{
 			name:         "with alias patterns in the query",
-			responseFile: "2-azure-monitor-response-total.json",
+			responseFile: "azuremonitor/2-azure-monitor-response-total.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL:   "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Alias: "custom {{resourcegroup}} {{namespace}} {{resourceName}} {{metric}}",
@@ -534,19 +431,10 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					"aggregation": {"Total"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 13, 29, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{totalLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(8.26), util.Pointer(8.7), util.Pointer(14.82), util.Pointer(10.07), util.Pointer(8.52),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", DisplayName: "custom grafanastaging Microsoft.Compute/virtualMachines grafana Percentage CPU", Links: []data.DataLink{totalLink}})),
-			},
 		},
 		{
 			name:         "single dimension with alias",
-			responseFile: "6-azure-monitor-response-single-dimension.json",
+			responseFile: "azuremonitor/6-azure-monitor-response-single-dimension.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL:   "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Alias: "{{dimensionname}}={{DimensionValue}}",
@@ -554,34 +442,10 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					"aggregation": {"Average"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 15, 21, 0, 0, time.UTC), 6, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Count", data.Labels{"blobtype": "PageBlob"},
-						[]*float64{util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), util.Pointer(3.0), nil}).SetConfig(&data.FieldConfig{Unit: "short", DisplayName: "blobtype=PageBlob", Links: []data.DataLink{averageLink}})),
-
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 15, 21, 0, 0, time.UTC), 6, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Count", data.Labels{"blobtype": "BlockBlob"}, []*float64{
-						util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), util.Pointer(1.0), nil,
-					}).SetConfig(&data.FieldConfig{Unit: "short", DisplayName: "blobtype=BlockBlob", Links: []data.DataLink{averageLink}})),
-
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 15, 21, 0, 0, time.UTC), 6, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Count", data.Labels{"blobtype": "Azure Data Lake Storage"}, []*float64{
-						util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0), nil,
-					}).SetConfig(&data.FieldConfig{Unit: "short", DisplayName: "blobtype=Azure Data Lake Storage", Links: []data.DataLink{averageLink}})),
-			},
 		},
 		{
 			name:         "multiple dimension time series response with label alias",
-			responseFile: "7-azure-monitor-response-multi-dimension.json",
+			responseFile: "azuremonitor/7-azure-monitor-response-multi-dimension.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL:   "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Alias: "{{resourcegroup}} {Blob Type={{blobtype}}, Tier={{Tier}}}",
@@ -589,35 +453,10 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					"aggregation": {"Average"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2020, 06, 30, 9, 58, 0, 0, time.UTC), 3, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Capacity", data.Labels{"blobtype": "PageBlob", "tier": "Standard"},
-						[]*float64{util.Pointer(675530.0), util.Pointer(675530.0), util.Pointer(675530.0)}).SetConfig(
-						&data.FieldConfig{Unit: "decbytes", DisplayName: "danieltest {Blob Type=PageBlob, Tier=Standard}", Links: []data.DataLink{averageLink}})),
-
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2020, 06, 30, 9, 58, 0, 0, time.UTC), 3, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Capacity", data.Labels{"blobtype": "BlockBlob", "tier": "Hot"},
-						[]*float64{util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0)}).SetConfig(
-						&data.FieldConfig{Unit: "decbytes", DisplayName: "danieltest {Blob Type=BlockBlob, Tier=Hot}", Links: []data.DataLink{averageLink}})),
-
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2020, 06, 30, 9, 58, 0, 0, time.UTC), 3, time.Hour),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Blob Capacity", data.Labels{"blobtype": "Azure Data Lake Storage", "tier": "Cool"},
-						[]*float64{util.Pointer(0.0), util.Pointer(0.0), util.Pointer(0.0)}).SetConfig(
-						&data.FieldConfig{Unit: "decbytes", DisplayName: "danieltest {Blob Type=Azure Data Lake Storage, Tier=Cool}", Links: []data.DataLink{averageLink}})),
-			},
 		},
 		{
 			name:         "unspecified unit with alias should not panic",
-			responseFile: "8-azure-monitor-response-unspecified-unit.json",
+			responseFile: "azuremonitor/8-azure-monitor-response-unspecified-unit.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL:   "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Alias: "custom",
@@ -625,19 +464,10 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					"aggregation": {"Average"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						[]time.Time{time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC)},
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(2.0875),
-					}).SetConfig(&data.FieldConfig{DisplayName: "custom", Links: []data.DataLink{averageLink}})),
-			},
 		},
 		{
 			name:         "with legacy azure monitor query properties and without a resource uri",
-			responseFile: "2-azure-monitor-response-total.json",
+			responseFile: "azuremonitor/2-azure-monitor-response-total.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL:   "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Alias: "custom {{resourcegroup}} {{namespace}} {{resourceName}} {{metric}}",
@@ -645,19 +475,10 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					"aggregation": {"Total"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 13, 29, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{totalLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(8.26), util.Pointer(8.7), util.Pointer(14.82), util.Pointer(10.07), util.Pointer(8.52),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", DisplayName: "custom grafanastaging Microsoft.Compute/virtualMachines grafana Percentage CPU", Links: []data.DataLink{totalLink}})),
-			},
 		},
 		{
 			name:         "with legacy azure monitor query properties and with a resource uri it should use the resource uri",
-			responseFile: "2-azure-monitor-response-total.json",
+			responseFile: "azuremonitor/2-azure-monitor-response-total.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL:   "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
 				Alias: "custom {{resourcegroup}} {{namespace}} {{resourceName}} {{metric}}",
@@ -665,93 +486,38 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 					"aggregation": {"Total"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 9, 13, 29, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{totalLink}}),
-					data.NewField("Percentage CPU", nil, []*float64{
-						util.Pointer(8.26), util.Pointer(8.7), util.Pointer(14.82), util.Pointer(10.07), util.Pointer(8.52),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", DisplayName: "custom grafanastaging Microsoft.Compute/virtualMachines grafana Percentage CPU", Links: []data.DataLink{totalLink}})),
-			},
 		},
 		{
 			name:         "multiple time series response",
-			responseFile: "9-azure-monitor-response-multi.json",
+			responseFile: "azuremonitor/9-azure-monitor-response-multi.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/providers/microsoft.insights/metrics",
 				Params: url.Values{
 					"aggregation": {"Average"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana"}, []*float64{
-						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink}}),
-				),
-			},
 		},
 		{
 			name:         "multiple time series response with multiple dimensions",
-			responseFile: "10-azure-monitor-response-multi-with-dimensions.json",
+			responseFile: "azuremonitor/10-azure-monitor-response-multi-with-dimensions.json",
 			mockQuery: &types.AzureMonitorQuery{
 				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/providers/microsoft.insights/metrics",
 				Params: url.Values{
 					"aggregation": {"Average"},
 				},
 			},
-			expectedFrames: data.Frames{
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana", "Test Dimension": "value-1"}, []*float64{
-						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink}}),
-				),
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink}}),
-					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana", "Test Dimension": "value-2"}, []*float64{
-						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink}}),
-				),
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink2}}),
-					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana-1", "Test Dimension": "value-1"}, []*float64{
-						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink2}}),
-				),
-				data.NewFrame("",
-					data.NewField("Time", nil,
-						makeDates(time.Date(2019, 2, 8, 10, 13, 0, 0, time.UTC), 5, time.Minute),
-					).SetConfig(&data.FieldConfig{Links: []data.DataLink{averageLink2}}),
-					data.NewField("Percentage CPU", data.Labels{"resourceName": "grafana-1", "Test Dimension": "value-3"}, []*float64{
-						util.Pointer(2.0875), util.Pointer(2.1525), util.Pointer(2.155), util.Pointer(3.6925), util.Pointer(2.44),
-					}).SetConfig(&data.FieldConfig{Unit: "percent", Links: []data.DataLink{averageLink2}}),
-				),
-			},
 		},
 	}
 
 	datasource := &AzureMonitorDatasource{}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			azData := loadTestFile(t, "azuremonitor/"+tt.responseFile)
+			azData := loadTestFile(t, tt.responseFile)
 			dframes, err := datasource.parseResponse(azData, tt.mockQuery, "http://ds")
 			require.NoError(t, err)
 			require.NotNil(t, dframes)
 
-			if diff := cmp.Diff(tt.expectedFrames, dframes, data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
+			testdata.CheckGoldenFrames(t, "../testdata", fmt.Sprintf("%s.%s", tt.responseFile, strings.ReplaceAll(tt.name, " ", "-")), dframes)
 		})
 	}
 }
diff --git a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go
index cd1ef1e3616..20e9f70d098 100644
--- a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go
+++ b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go
@@ -18,6 +18,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/tsdb/azuremonitor/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/loganalytics"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/macros"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
@@ -42,6 +43,7 @@ type AzureResourceGraphQuery struct {
 	JSON              json.RawMessage
 	InterpolatedQuery string
 	TimeRange         backend.TimeRange
+	QueryType         string
 }
 
 const ArgAPIVersion = "2021-06-01-preview"
@@ -110,6 +112,7 @@ func (e *AzureResourceGraphDatasource) buildQueries(logger log.Logger, queries [
 			JSON:              query.JSON,
 			InterpolatedQuery: interpolatedQuery,
 			TimeRange:         query.TimeRange,
+			QueryType:         query.QueryType,
 		})
 	}
 
@@ -193,7 +196,7 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, logger
 		return dataResponseErrorWithExecuted(err)
 	}
 
-	frame, err := loganalytics.ResponseTableToFrame(&argResponse.Data, query.RefID, query.InterpolatedQuery)
+	frame, err := loganalytics.ResponseTableToFrame(&argResponse.Data, query.RefID, query.InterpolatedQuery, dataquery.AzureQueryType(query.QueryType), dataquery.ResultFormat(query.ResultFormat))
 	if err != nil {
 		return dataResponseErrorWithExecuted(err)
 	}
@@ -208,7 +211,7 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, logger
 	}
 
 	url := azurePortalUrl + "/#blade/HubsExtension/ArgQueryBlade/query/" + url.PathEscape(query.InterpolatedQuery)
-	frameWithLink := loganalytics.AddConfigLinks(*frame, url)
+	frameWithLink := loganalytics.AddConfigLinks(*frame, url, nil)
 	if frameWithLink.Meta == nil {
 		frameWithLink.Meta = &data.FrameMeta{}
 	}
diff --git a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource_test.go b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource_test.go
index 54f6cc04926..d8bf3ced7a5 100644
--- a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource_test.go
@@ -125,7 +125,7 @@ func TestAddConfigData(t *testing.T) {
 	frame := data.Frame{
 		Fields: []*data.Field{&field},
 	}
-	frameWithLink := loganalytics.AddConfigLinks(frame, "http://ds")
+	frameWithLink := loganalytics.AddConfigLinks(frame, "http://ds", nil)
 	expectedFrameWithLink := data.Frame{
 		Fields: []*data.Field{
 			{
diff --git a/pkg/tsdb/azuremonitor/routes.go b/pkg/tsdb/azuremonitor/routes.go
index 0a57915a1e8..430c1523add 100644
--- a/pkg/tsdb/azuremonitor/routes.go
+++ b/pkg/tsdb/azuremonitor/routes.go
@@ -11,6 +11,7 @@ const (
 	azureMonitor       = "Azure Monitor"
 	azureLogAnalytics  = "Azure Log Analytics"
 	azureResourceGraph = "Azure Resource Graph"
+	azureTraces        = "Azure Traces"
 )
 
 var azManagement = types.AzRoute{
@@ -57,6 +58,7 @@ var (
 			azureMonitor:       azManagement,
 			azureLogAnalytics:  azLogAnalytics,
 			azureResourceGraph: azManagement,
+			azureTraces:        azLogAnalytics,
 		},
 		azsettings.AzureUSGovernment: {
 			azureMonitor:       azUSGovManagement,
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc
new file mode 100644
index 00000000000..b30ba57e5cf
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc
@@ -0,0 +1,83 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-08 10:13:00 +0000 UTC | 2.0875               |
+//  | 2019-02-08 10:14:00 +0000 UTC | 2.1525               |
+//  | 2019-02-08 10:15:00 +0000 UTC | 2.155                |
+//  | 2019-02-08 10:16:00 +0000 UTC | 3.6925               |
+//  | 2019-02-08 10:17:00 +0000 UTC | 2.44                 |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549620780000,
+            1549620840000,
+            1549620900000,
+            1549620960000,
+            1549621020000
+          ],
+          [
+            2.0875,
+            2.1525,
+            2.155,
+            3.6925,
+            2.44
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc
new file mode 100644
index 00000000000..4facd82e9d6
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc
@@ -0,0 +1,323 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+------------------------------------------------------+
+//  | Name: Time                    | Name: Percentage CPU                                 |
+//  | Labels:                       | Labels: Test Dimension=value-1, resourceName=grafana |
+//  | Type: []time.Time             | Type: []*float64                                     |
+//  +-------------------------------+------------------------------------------------------+
+//  | 2019-02-08 10:13:00 +0000 UTC | 2.0875                                               |
+//  | 2019-02-08 10:14:00 +0000 UTC | 2.1525                                               |
+//  | 2019-02-08 10:15:00 +0000 UTC | 2.155                                                |
+//  | 2019-02-08 10:16:00 +0000 UTC | 3.6925                                               |
+//  | 2019-02-08 10:17:00 +0000 UTC | 2.44                                                 |
+//  +-------------------------------+------------------------------------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+------------------------------------------------------+
+//  | Name: Time                    | Name: Percentage CPU                                 |
+//  | Labels:                       | Labels: Test Dimension=value-2, resourceName=grafana |
+//  | Type: []time.Time             | Type: []*float64                                     |
+//  +-------------------------------+------------------------------------------------------+
+//  | 2019-02-08 10:13:00 +0000 UTC | 2.0875                                               |
+//  | 2019-02-08 10:14:00 +0000 UTC | 2.1525                                               |
+//  | 2019-02-08 10:15:00 +0000 UTC | 2.155                                                |
+//  | 2019-02-08 10:16:00 +0000 UTC | 3.6925                                               |
+//  | 2019-02-08 10:17:00 +0000 UTC | 2.44                                                 |
+//  +-------------------------------+------------------------------------------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+--------------------------------------------------------+
+//  | Name: Time                    | Name: Percentage CPU                                   |
+//  | Labels:                       | Labels: Test Dimension=value-1, resourceName=grafana-1 |
+//  | Type: []time.Time             | Type: []*float64                                       |
+//  +-------------------------------+--------------------------------------------------------+
+//  | 2019-02-08 10:13:00 +0000 UTC | 2.0875                                                 |
+//  | 2019-02-08 10:14:00 +0000 UTC | 2.1525                                                 |
+//  | 2019-02-08 10:15:00 +0000 UTC | 2.155                                                  |
+//  | 2019-02-08 10:16:00 +0000 UTC | 3.6925                                                 |
+//  | 2019-02-08 10:17:00 +0000 UTC | 2.44                                                   |
+//  +-------------------------------+--------------------------------------------------------+
+//  
+//  
+//  
+//  Frame[3] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+--------------------------------------------------------+
+//  | Name: Time                    | Name: Percentage CPU                                   |
+//  | Labels:                       | Labels: Test Dimension=value-3, resourceName=grafana-1 |
+//  | Type: []time.Time             | Type: []*float64                                       |
+//  +-------------------------------+--------------------------------------------------------+
+//  | 2019-02-08 10:13:00 +0000 UTC | 2.0875                                                 |
+//  | 2019-02-08 10:14:00 +0000 UTC | 2.1525                                                 |
+//  | 2019-02-08 10:15:00 +0000 UTC | 2.155                                                  |
+//  | 2019-02-08 10:16:00 +0000 UTC | 3.6925                                                 |
+//  | 2019-02-08 10:17:00 +0000 UTC | 2.44                                                   |
+//  +-------------------------------+--------------------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "Test Dimension": "value-1",
+              "resourceName": "grafana"
+            },
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549620780000,
+            1549620840000,
+            1549620900000,
+            1549620960000,
+            1549621020000
+          ],
+          [
+            2.0875,
+            2.1525,
+            2.155,
+            3.6925,
+            2.44
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "Test Dimension": "value-2",
+              "resourceName": "grafana"
+            },
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549620780000,
+            1549620840000,
+            1549620900000,
+            1549620960000,
+            1549621020000
+          ],
+          [
+            2.0875,
+            2.1525,
+            2.155,
+            3.6925,
+            2.44
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "Test Dimension": "value-1",
+              "resourceName": "grafana-1"
+            },
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549620780000,
+            1549620840000,
+            1549620900000,
+            1549620960000,
+            1549621020000
+          ],
+          [
+            2.0875,
+            2.1525,
+            2.155,
+            3.6925,
+            2.44
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "Test Dimension": "value-3",
+              "resourceName": "grafana-1"
+            },
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549620780000,
+            1549620840000,
+            1549620900000,
+            1549620960000,
+            1549621020000
+          ],
+          [
+            2.0875,
+            2.1525,
+            2.155,
+            3.6925,
+            2.44
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc
new file mode 100644
index 00000000000..4774e964f20
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc
@@ -0,0 +1,83 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-09 13:29:00 +0000 UTC | 8.26                 |
+//  | 2019-02-09 13:30:00 +0000 UTC | 8.7                  |
+//  | 2019-02-09 13:31:00 +0000 UTC | 14.82                |
+//  | 2019-02-09 13:32:00 +0000 UTC | 10.07                |
+//  | 2019-02-09 13:33:00 +0000 UTC | 8.52                 |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549718940000,
+            1549719000000,
+            1549719060000,
+            1549719120000,
+            1549719180000
+          ],
+          [
+            8.26,
+            8.7,
+            14.82,
+            10.07,
+            8.52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc
new file mode 100644
index 00000000000..3c425599469
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc
@@ -0,0 +1,84 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-09 13:29:00 +0000 UTC | 8.26                 |
+//  | 2019-02-09 13:30:00 +0000 UTC | 8.7                  |
+//  | 2019-02-09 13:31:00 +0000 UTC | 14.82                |
+//  | 2019-02-09 13:32:00 +0000 UTC | 10.07                |
+//  | 2019-02-09 13:33:00 +0000 UTC | 8.52                 |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayName": "custom grafanastaging Microsoft.Compute/virtualMachines grafana Percentage CPU",
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549718940000,
+            1549719000000,
+            1549719060000,
+            1549719120000,
+            1549719180000
+          ],
+          [
+            8.26,
+            8.7,
+            14.82,
+            10.07,
+            8.52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc
new file mode 100644
index 00000000000..3c425599469
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc
@@ -0,0 +1,84 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-09 13:29:00 +0000 UTC | 8.26                 |
+//  | 2019-02-09 13:30:00 +0000 UTC | 8.7                  |
+//  | 2019-02-09 13:31:00 +0000 UTC | 14.82                |
+//  | 2019-02-09 13:32:00 +0000 UTC | 10.07                |
+//  | 2019-02-09 13:33:00 +0000 UTC | 8.52                 |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayName": "custom grafanastaging Microsoft.Compute/virtualMachines grafana Percentage CPU",
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549718940000,
+            1549719000000,
+            1549719060000,
+            1549719120000,
+            1549719180000
+          ],
+          [
+            8.26,
+            8.7,
+            14.82,
+            10.07,
+            8.52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc
new file mode 100644
index 00000000000..3c425599469
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc
@@ -0,0 +1,84 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-09 13:29:00 +0000 UTC | 8.26                 |
+//  | 2019-02-09 13:30:00 +0000 UTC | 8.7                  |
+//  | 2019-02-09 13:31:00 +0000 UTC | 14.82                |
+//  | 2019-02-09 13:32:00 +0000 UTC | 10.07                |
+//  | 2019-02-09 13:33:00 +0000 UTC | 8.52                 |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayName": "custom grafanastaging Microsoft.Compute/virtualMachines grafana Percentage CPU",
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549718940000,
+            1549719000000,
+            1549719060000,
+            1549719120000,
+            1549719180000
+          ],
+          [
+            8.26,
+            8.7,
+            14.82,
+            10.07,
+            8.52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc
new file mode 100644
index 00000000000..7b61b79d273
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc
@@ -0,0 +1,83 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-09 14:26:00 +0000 UTC | 3.07                 |
+//  | 2019-02-09 14:27:00 +0000 UTC | 2.92                 |
+//  | 2019-02-09 14:28:00 +0000 UTC | 2.87                 |
+//  | 2019-02-09 14:29:00 +0000 UTC | 2.27                 |
+//  | 2019-02-09 14:30:00 +0000 UTC | 2.52                 |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A3%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A3%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549722360000,
+            1549722420000,
+            1549722480000,
+            1549722540000,
+            1549722600000
+          ],
+          [
+            3.07,
+            2.92,
+            2.87,
+            2.27,
+            2.52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc
new file mode 100644
index 00000000000..8ea7fb4bf8b
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc
@@ -0,0 +1,83 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-09 14:43:00 +0000 UTC | 1.51                 |
+//  | 2019-02-09 14:44:00 +0000 UTC | 2.38                 |
+//  | 2019-02-09 14:45:00 +0000 UTC | 1.69                 |
+//  | 2019-02-09 14:46:00 +0000 UTC | 2.27                 |
+//  | 2019-02-09 14:47:00 +0000 UTC | 1.96                 |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A2%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A2%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549723380000,
+            1549723440000,
+            1549723500000,
+            1549723560000,
+            1549723620000
+          ],
+          [
+            1.51,
+            2.38,
+            1.69,
+            2.27,
+            1.96
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc
new file mode 100644
index 00000000000..bef9a751e15
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc
@@ -0,0 +1,83 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-09 14:44:00 +0000 UTC | 4                    |
+//  | 2019-02-09 14:45:00 +0000 UTC | 4                    |
+//  | 2019-02-09 14:46:00 +0000 UTC | 4                    |
+//  | 2019-02-09 14:47:00 +0000 UTC | 4                    |
+//  | 2019-02-09 14:48:00 +0000 UTC | 4                    |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A7%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A7%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549723440000,
+            1549723500000,
+            1549723560000,
+            1549723620000,
+            1549723680000
+          ],
+          [
+            4,
+            4,
+            4,
+            4,
+            4
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc
new file mode 100644
index 00000000000..f30e3d49f55
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc
@@ -0,0 +1,250 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 6 Rows
+//  +-------------------------------+---------------------------+
+//  | Name: Time                    | Name: Blob Count          |
+//  | Labels:                       | Labels: blobtype=PageBlob |
+//  | Type: []time.Time             | Type: []*float64          |
+//  +-------------------------------+---------------------------+
+//  | 2019-02-09 15:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 16:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 17:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 18:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 19:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 20:21:00 +0000 UTC | null                      |
+//  +-------------------------------+---------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: 
+//  Dimensions: 2 Fields by 6 Rows
+//  +-------------------------------+----------------------------+
+//  | Name: Time                    | Name: Blob Count           |
+//  | Labels:                       | Labels: blobtype=BlockBlob |
+//  | Type: []time.Time             | Type: []*float64           |
+//  +-------------------------------+----------------------------+
+//  | 2019-02-09 15:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 16:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 17:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 18:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 19:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 20:21:00 +0000 UTC | null                       |
+//  +-------------------------------+----------------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: 
+//  Dimensions: 2 Fields by 6 Rows
+//  +-------------------------------+------------------------------------------+
+//  | Name: Time                    | Name: Blob Count                         |
+//  | Labels:                       | Labels: blobtype=Azure Data Lake Storage |
+//  | Type: []time.Time             | Type: []*float64                         |
+//  +-------------------------------+------------------------------------------+
+//  | 2019-02-09 15:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 16:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 17:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 18:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 19:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 20:21:00 +0000 UTC | null                                     |
+//  +-------------------------------+------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "PageBlob"
+            },
+            "config": {
+              "unit": "short",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549725660000,
+            1549729260000,
+            1549732860000,
+            1549736460000,
+            1549740060000,
+            1549743660000
+          ],
+          [
+            3,
+            3,
+            3,
+            3,
+            3,
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "BlockBlob"
+            },
+            "config": {
+              "unit": "short",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549725660000,
+            1549729260000,
+            1549732860000,
+            1549736460000,
+            1549740060000,
+            1549743660000
+          ],
+          [
+            1,
+            1,
+            1,
+            1,
+            1,
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "Azure Data Lake Storage"
+            },
+            "config": {
+              "unit": "short",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549725660000,
+            1549729260000,
+            1549732860000,
+            1549736460000,
+            1549740060000,
+            1549743660000
+          ],
+          [
+            0,
+            0,
+            0,
+            0,
+            0,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc
new file mode 100644
index 00000000000..983aafc942a
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc
@@ -0,0 +1,253 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 6 Rows
+//  +-------------------------------+---------------------------+
+//  | Name: Time                    | Name: Blob Count          |
+//  | Labels:                       | Labels: blobtype=PageBlob |
+//  | Type: []time.Time             | Type: []*float64          |
+//  +-------------------------------+---------------------------+
+//  | 2019-02-09 15:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 16:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 17:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 18:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 19:21:00 +0000 UTC | 3                         |
+//  | 2019-02-09 20:21:00 +0000 UTC | null                      |
+//  +-------------------------------+---------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: 
+//  Dimensions: 2 Fields by 6 Rows
+//  +-------------------------------+----------------------------+
+//  | Name: Time                    | Name: Blob Count           |
+//  | Labels:                       | Labels: blobtype=BlockBlob |
+//  | Type: []time.Time             | Type: []*float64           |
+//  +-------------------------------+----------------------------+
+//  | 2019-02-09 15:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 16:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 17:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 18:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 19:21:00 +0000 UTC | 1                          |
+//  | 2019-02-09 20:21:00 +0000 UTC | null                       |
+//  +-------------------------------+----------------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: 
+//  Dimensions: 2 Fields by 6 Rows
+//  +-------------------------------+------------------------------------------+
+//  | Name: Time                    | Name: Blob Count                         |
+//  | Labels:                       | Labels: blobtype=Azure Data Lake Storage |
+//  | Type: []time.Time             | Type: []*float64                         |
+//  +-------------------------------+------------------------------------------+
+//  | 2019-02-09 15:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 16:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 17:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 18:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 19:21:00 +0000 UTC | 0                                        |
+//  | 2019-02-09 20:21:00 +0000 UTC | null                                     |
+//  +-------------------------------+------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "PageBlob"
+            },
+            "config": {
+              "displayName": "blobtype=PageBlob",
+              "unit": "short",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549725660000,
+            1549729260000,
+            1549732860000,
+            1549736460000,
+            1549740060000,
+            1549743660000
+          ],
+          [
+            3,
+            3,
+            3,
+            3,
+            3,
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "BlockBlob"
+            },
+            "config": {
+              "displayName": "blobtype=BlockBlob",
+              "unit": "short",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549725660000,
+            1549729260000,
+            1549732860000,
+            1549736460000,
+            1549740060000,
+            1549743660000
+          ],
+          [
+            1,
+            1,
+            1,
+            1,
+            1,
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "Azure Data Lake Storage"
+            },
+            "config": {
+              "displayName": "blobtype=Azure Data Lake Storage",
+              "unit": "short",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549725660000,
+            1549729260000,
+            1549732860000,
+            1549736460000,
+            1549740060000,
+            1549743660000
+          ],
+          [
+            0,
+            0,
+            0,
+            0,
+            0,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc
new file mode 100644
index 00000000000..f5df32b8670
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc
@@ -0,0 +1,229 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 3 Rows
+//  +-------------------------------+------------------------------------------+
+//  | Name: Time                    | Name: Blob Capacity                      |
+//  | Labels:                       | Labels: blobtype=PageBlob, tier=Standard |
+//  | Type: []time.Time             | Type: []*float64                         |
+//  +-------------------------------+------------------------------------------+
+//  | 2020-06-30 09:58:00 +0000 UTC | 675530                                   |
+//  | 2020-06-30 10:58:00 +0000 UTC | 675530                                   |
+//  | 2020-06-30 11:58:00 +0000 UTC | 675530                                   |
+//  +-------------------------------+------------------------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: 
+//  Dimensions: 2 Fields by 3 Rows
+//  +-------------------------------+--------------------------------------+
+//  | Name: Time                    | Name: Blob Capacity                  |
+//  | Labels:                       | Labels: blobtype=BlockBlob, tier=Hot |
+//  | Type: []time.Time             | Type: []*float64                     |
+//  +-------------------------------+--------------------------------------+
+//  | 2020-06-30 09:58:00 +0000 UTC | 0                                    |
+//  | 2020-06-30 10:58:00 +0000 UTC | 0                                    |
+//  | 2020-06-30 11:58:00 +0000 UTC | 0                                    |
+//  +-------------------------------+--------------------------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: 
+//  Dimensions: 2 Fields by 3 Rows
+//  +-------------------------------+-----------------------------------------------------+
+//  | Name: Time                    | Name: Blob Capacity                                 |
+//  | Labels:                       | Labels: blobtype=Azure Data Lake Storage, tier=Cool |
+//  | Type: []time.Time             | Type: []*float64                                    |
+//  +-------------------------------+-----------------------------------------------------+
+//  | 2020-06-30 09:58:00 +0000 UTC | 0                                                   |
+//  | 2020-06-30 10:58:00 +0000 UTC | 0                                                   |
+//  | 2020-06-30 11:58:00 +0000 UTC | 0                                                   |
+//  +-------------------------------+-----------------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Capacity",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "PageBlob",
+              "tier": "Standard"
+            },
+            "config": {
+              "displayName": "danieltest {Blob Type=PageBlob, Tier=Standard}",
+              "unit": "decbytes",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1593511080000,
+            1593514680000,
+            1593518280000
+          ],
+          [
+            675530,
+            675530,
+            675530
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Capacity",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "BlockBlob",
+              "tier": "Hot"
+            },
+            "config": {
+              "displayName": "danieltest {Blob Type=BlockBlob, Tier=Hot}",
+              "unit": "decbytes",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1593511080000,
+            1593514680000,
+            1593518280000
+          ],
+          [
+            0,
+            0,
+            0
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Blob Capacity",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "blobtype": "Azure Data Lake Storage",
+              "tier": "Cool"
+            },
+            "config": {
+              "displayName": "danieltest {Blob Type=Azure Data Lake Storage, Tier=Cool}",
+              "unit": "decbytes",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1593511080000,
+            1593514680000,
+            1593518280000
+          ],
+          [
+            0,
+            0,
+            0
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc
new file mode 100644
index 00000000000..450b3a8a54b
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc
@@ -0,0 +1,71 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Percentage CPU |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2019-02-08 10:13:00 +0000 UTC | 2.0875               |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayName": "custom",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549620780000
+          ],
+          [
+            2.0875
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc
new file mode 100644
index 00000000000..2c2900de3ad
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc
@@ -0,0 +1,85 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] 
+//  Name: 
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+------------------------------+
+//  | Name: Time                    | Name: Percentage CPU         |
+//  | Labels:                       | Labels: resourceName=grafana |
+//  | Type: []time.Time             | Type: []*float64             |
+//  +-------------------------------+------------------------------+
+//  | 2019-02-08 10:13:00 +0000 UTC | 2.0875                       |
+//  | 2019-02-08 10:14:00 +0000 UTC | 2.1525                       |
+//  | 2019-02-08 10:15:00 +0000 UTC | 2.155                        |
+//  | 2019-02-08 10:16:00 +0000 UTC | 3.6925                       |
+//  | 2019-02-08 10:17:00 +0000 UTC | 2.44                         |
+//  +-------------------------------+------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Percentage CPU",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "resourceName": "grafana"
+            },
+            "config": {
+              "unit": "percent",
+              "links": [
+                {
+                  "title": "View in Azure Portal",
+                  "targetBlank": true,
+                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1549620780000,
+            1549620840000,
+            1549620900000,
+            1549620960000,
+            1549621020000
+          ],
+          [
+            2.0875,
+            2.1525,
+            2.155,
+            3.6925,
+            2.44
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/loganalytics/1-log-analytics-response-metrics-single-series.json.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/loganalytics/1-log-analytics-response-metrics-single-series.json.golden.jsonc
new file mode 100644
index 00000000000..95b14faac96
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/loganalytics/1-log-analytics-response-metrics-single-series.json.golden.jsonc
@@ -0,0 +1,96 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "datetime",
+//              "string",
+//              "real"
+//          ]
+//      }
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 3 Rows
+//  +---------------------------------+-----------------+------------------------+
+//  | Name: TimeGenerated             | Name: Computer  | Name: avg_CounterValue |
+//  | Labels:                         | Labels:         | Labels:                |
+//  | Type: []*time.Time              | Type: []*string | Type: []*float64       |
+//  +---------------------------------+-----------------+------------------------+
+//  | 2020-04-19 19:16:06.5 +0000 UTC | grafana-vm      | 1.1                    |
+//  | 2020-04-19 19:16:16.5 +0000 UTC | grafana-vm      | 2.2                    |
+//  | 2020-04-19 19:16:26.5 +0000 UTC | grafana-vm      | 3.3                    |
+//  +---------------------------------+-----------------+------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "datetime",
+              "string",
+              "real"
+            ]
+          }
+        },
+        "fields": [
+          {
+            "name": "TimeGenerated",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "Computer",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "avg_CounterValue",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1587323766500,
+            1587323776500,
+            1587323786500
+          ],
+          [
+            "grafana-vm",
+            "grafana-vm",
+            "grafana-vm"
+          ],
+          [
+            1.1,
+            2.2,
+            3.3
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/loganalytics/10-log-analytics-response-warning.json.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/loganalytics/10-log-analytics-response-warning.json.golden.jsonc
new file mode 100644
index 00000000000..0518f9f1554
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/loganalytics/10-log-analytics-response-warning.json.golden.jsonc
@@ -0,0 +1,87 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "string",
+//              "string"
+//          ]
+//      },
+//      "notices": [
+//          {
+//              "severity": "warning",
+//              "text": "There were some errors when processing your query. Something went wrong processing your query on the server. Not sure what happened."
+//          }
+//      ]
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +----------------------------------+-----------------+
+//  | Name: OperationName              | Name: Level     |
+//  | Labels:                          | Labels:         |
+//  | Type: []*string                  | Type: []*string |
+//  +----------------------------------+-----------------+
+//  | Create or Update Virtual Machine | Informational   |
+//  +----------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "string",
+              "string"
+            ]
+          },
+          "notices": [
+            {
+              "severity": "warning",
+              "text": "There were some errors when processing your query. Something went wrong processing your query on the server. Not sure what happened."
+            }
+          ]
+        },
+        "fields": [
+          {
+            "name": "OperationName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "Level",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "Create or Update Virtual Machine"
+          ],
+          [
+            "Informational"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/loganalytics/11-log-analytics-response-empty.json.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/loganalytics/11-log-analytics-response-empty.json.golden.jsonc
new file mode 100644
index 00000000000..e63a03ad551
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/loganalytics/11-log-analytics-response-empty.json.golden.jsonc
@@ -0,0 +1,5 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/loganalytics/6-log-analytics-response-table.json.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/loganalytics/6-log-analytics-response-table.json.golden.jsonc
new file mode 100644
index 00000000000..d2b4fd4b607
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/loganalytics/6-log-analytics-response-table.json.golden.jsonc
@@ -0,0 +1,201 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "string",
+//              "string",
+//              "string",
+//              "string",
+//              "string",
+//              "real",
+//              "real",
+//              "int",
+//              "real",
+//              "datetime"
+//          ]
+//      }
+//  }
+//  Name: 
+//  Dimensions: 10 Fields by 3 Rows
+//  +--------------------------------------+-----------------+------------------+-------------------------+--------------------+------------------+------------------+-------------------+--------------------+-----------------------------------+
+//  | Name: TenantId                       | Name: Computer  | Name: ObjectName | Name: CounterName       | Name: InstanceName | Name: Min        | Name: Max        | Name: SampleCount | Name: CounterValue | Name: TimeGenerated               |
+//  | Labels:                              | Labels:         | Labels:          | Labels:                 | Labels:            | Labels:          | Labels:          | Labels:           | Labels:            | Labels:                           |
+//  | Type: []*string                      | Type: []*string | Type: []*string  | Type: []*string         | Type: []*string    | Type: []*float64 | Type: []*float64 | Type: []*int32    | Type: []*float64   | Type: []*time.Time                |
+//  +--------------------------------------+-----------------+------------------+-------------------------+--------------------+------------------+------------------+-------------------+--------------------+-----------------------------------+
+//  | a2c1b44e-3e57-4410-b027-6cc0ae6dee67 | grafana-vm      | Memory           | Available MBytes Memory | Memory             | null             | null             | null              | 2040               | 2020-04-23 11:46:03.857 +0000 UTC |
+//  | a2c1b44e-3e57-4410-b027-6cc0ae6dee67 | grafana-vm      | Memory           | Available MBytes Memory | Memory             | null             | null             | null              | 2066               | 2020-04-23 11:46:13.857 +0000 UTC |
+//  | a2c1b44e-3e57-4410-b027-6cc0ae6dee67 | grafana-vm      | Memory           | Available MBytes Memory | Memory             | null             | null             | null              | 2066               | 2020-04-23 11:46:23.857 +0000 UTC |
+//  +--------------------------------------+-----------------+------------------+-------------------------+--------------------+------------------+------------------+-------------------+--------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "string",
+              "string",
+              "string",
+              "string",
+              "string",
+              "real",
+              "real",
+              "int",
+              "real",
+              "datetime"
+            ]
+          }
+        },
+        "fields": [
+          {
+            "name": "TenantId",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "Computer",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ObjectName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "CounterName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "InstanceName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "Min",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "Max",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "SampleCount",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int32",
+              "nullable": true
+            }
+          },
+          {
+            "name": "CounterValue",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "TimeGenerated",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "a2c1b44e-3e57-4410-b027-6cc0ae6dee67",
+            "a2c1b44e-3e57-4410-b027-6cc0ae6dee67",
+            "a2c1b44e-3e57-4410-b027-6cc0ae6dee67"
+          ],
+          [
+            "grafana-vm",
+            "grafana-vm",
+            "grafana-vm"
+          ],
+          [
+            "Memory",
+            "Memory",
+            "Memory"
+          ],
+          [
+            "Available MBytes Memory",
+            "Available MBytes Memory",
+            "Available MBytes Memory"
+          ],
+          [
+            "Memory",
+            "Memory",
+            "Memory"
+          ],
+          [
+            null,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null
+          ],
+          [
+            2040,
+            2066,
+            2066
+          ],
+          [
+            1587642363857,
+            1587642373857,
+            1587642383857
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/loganalytics/7-log-analytics-all-types-table.json.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/loganalytics/7-log-analytics-all-types-table.json.golden.jsonc
new file mode 100644
index 00000000000..8894e6c3a28
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/loganalytics/7-log-analytics-all-types-table.json.golden.jsonc
@@ -0,0 +1,205 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "bool",
+//              "string",
+//              "datetime",
+//              "dynamic",
+//              "guid",
+//              "int",
+//              "long",
+//              "real",
+//              "timespan",
+//              "decimal",
+//              "object",
+//              "number"
+//          ]
+//      }
+//  }
+//  Name: 
+//  Dimensions: 12 Fields by 1 Rows
+//  +---------------+-----------------+---------------------------------+---------------------------------------------------------------+--------------------------------------+----------------+---------------------+-------------------------+------------------+-----------------------+--------------------------------------------------------------------------+-----------------------+
+//  | Name: XBool   | Name: XString   | Name: XDateTime                 | Name: XDynamic                                                | Name: XGuid                          | Name: XInt     | Name: XLong         | Name: XReal             | Name: XTimeSpan  | Name: XDecimal        | Name: XObject                                                            | Name: XNumber         |
+//  | Labels:       | Labels:         | Labels:                         | Labels:                                                       | Labels:                              | Labels:        | Labels:             | Labels:                 | Labels:          | Labels:               | Labels:                                                                  | Labels:               |
+//  | Type: []*bool | Type: []*string | Type: []*time.Time              | Type: []*string                                               | Type: []*string                      | Type: []*int32 | Type: []*int64      | Type: []*float64        | Type: []*string  | Type: []*float64      | Type: []*string                                                          | Type: []*float64      |
+//  +---------------+-----------------+---------------------------------+---------------------------------------------------------------+--------------------------------------+----------------+---------------------+-------------------------+------------------+-----------------------+--------------------------------------------------------------------------+-----------------------+
+//  | true          | Grafana         | 2006-01-02 22:04:05.1 +0000 UTC | [{"person":"Daniel"},{"cats":23},{"diagnosis":"cat problem"}] | 74be27de-1e4e-49d9-b579-fe0b331d3642 | 2147483647     | 9223372036854775807 | 1.7976931348623157e+308 | 00:00:00.0000001 | 7.922816251426434e+28 | "{\"person\": \"Daniel\", \"cats\": 23, \"diagnosis\": \"cat problem\"}" | 7.922816251426434e+28 |
+//  +---------------+-----------------+---------------------------------+---------------------------------------------------------------+--------------------------------------+----------------+---------------------+-------------------------+------------------+-----------------------+--------------------------------------------------------------------------+-----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "bool",
+              "string",
+              "datetime",
+              "dynamic",
+              "guid",
+              "int",
+              "long",
+              "real",
+              "timespan",
+              "decimal",
+              "object",
+              "number"
+            ]
+          }
+        },
+        "fields": [
+          {
+            "name": "XBool",
+            "type": "boolean",
+            "typeInfo": {
+              "frame": "bool",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XString",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XDateTime",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XDynamic",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XGuid",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XInt",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int32",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XLong",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XReal",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XTimeSpan",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XDecimal",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XObject",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XNumber",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            true
+          ],
+          [
+            "Grafana"
+          ],
+          [
+            1136239445100
+          ],
+          [
+            "[{\"person\":\"Daniel\"},{\"cats\":23},{\"diagnosis\":\"cat problem\"}]"
+          ],
+          [
+            "74be27de-1e4e-49d9-b579-fe0b331d3642"
+          ],
+          [
+            2147483647
+          ],
+          [
+            9223372036854775807
+          ],
+          [
+            1.7976931348623157e+308
+          ],
+          [
+            "00:00:00.0000001"
+          ],
+          [
+            7.922816251426434e+28
+          ],
+          [
+            "\"{\\\"person\\\": \\\"Daniel\\\", \\\"cats\\\": 23, \\\"diagnosis\\\": \\\"cat problem\\\"}\""
+          ],
+          [
+            7.922816251426434e+28
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/loganalytics/8-log-analytics-response-nan-inf.json.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/loganalytics/8-log-analytics-response-nan-inf.json.golden.jsonc
new file mode 100644
index 00000000000..eb9ffd62185
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/loganalytics/8-log-analytics-response-nan-inf.json.golden.jsonc
@@ -0,0 +1,105 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "real",
+//              "real",
+//              "real"
+//          ]
+//      }
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 1 Rows
+//  +------------------+------------------+------------------+
+//  | Name: XInf       | Name: XInfNeg    | Name: XNan       |
+//  | Labels:          | Labels:          | Labels:          |
+//  | Type: []*float64 | Type: []*float64 | Type: []*float64 |
+//  +------------------+------------------+------------------+
+//  | +Inf             | -Inf             | NaN              |
+//  +------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "real",
+              "real",
+              "real"
+            ]
+          }
+        },
+        "fields": [
+          {
+            "name": "XInf",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XInfNeg",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "XNan",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            null
+          ],
+          [
+            null
+          ],
+          [
+            null
+          ]
+        ],
+        "entities": [
+          {
+            "Inf": [
+              0
+            ]
+          },
+          {
+            "NegInf": [
+              0
+            ]
+          },
+          {
+            "NaN": [
+              0
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/loganalytics/9-log-analytics-response-error.json.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/loganalytics/9-log-analytics-response-error.json.golden.jsonc
new file mode 100644
index 00000000000..adf3cdd8809
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/loganalytics/9-log-analytics-response-error.json.golden.jsonc
@@ -0,0 +1,87 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "string",
+//              "string"
+//          ]
+//      },
+//      "notices": [
+//          {
+//              "severity": "error",
+//              "text": "There were some errors when processing your query. Something went wrong processing your query on the server. The results of this query exceed the set limit of 1 records."
+//          }
+//      ]
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +----------------------------------+-----------------+
+//  | Name: OperationName              | Name: Level     |
+//  | Labels:                          | Labels:         |
+//  | Type: []*string                  | Type: []*string |
+//  +----------------------------------+-----------------+
+//  | Create or Update Virtual Machine | Informational   |
+//  +----------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "string",
+              "string"
+            ]
+          },
+          "notices": [
+            {
+              "severity": "error",
+              "text": "There were some errors when processing your query. Something went wrong processing your query on the server. The results of this query exceed the set limit of 1 records."
+            }
+          ]
+        },
+        "fields": [
+          {
+            "name": "OperationName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "Level",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "Create or Update Virtual Machine"
+          ],
+          [
+            "Informational"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json b/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json
new file mode 100644
index 00000000000..57a40e59f27
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json
@@ -0,0 +1,94 @@
+{
+  "tables": [
+    {
+      "name": "PrimaryResult",
+      "columns": [
+        {
+          "name": "traceID",
+          "type": "string"
+        },
+        {
+          "name": "spanID",
+          "type": "string"
+        },
+        {
+          "name": "parentSpanID",
+          "type": "string"
+        },
+        {
+          "name": "duration",
+          "type": "real"
+        },
+        {
+          "name": "serviceName",
+          "type": "string"
+        },
+        {
+          "name": "operationName",
+          "type": "string"
+        },
+        {
+          "name": "startTime",
+          "type": "datetime"
+        },
+        {
+          "name": "serviceTags",
+          "type": "dynamic"
+        },
+        {
+          "name": "tags",
+          "type": "dynamic"
+        },
+        {
+          "name": "itemId",
+          "type": "string"
+        },
+        {
+          "name": "itemType",
+          "type": "string"
+        }
+      ],
+      "rows": [
+        [
+          "cfae497bfd7a44169f35643940820938",
+          "b52403c5-5b27-43a8-9bc6-5938667a4470",
+          "|cfae497bfd7a44169f35643940820938.",
+          0,
+          "",
+          "GET /github/grafana/grafana/commits",
+          "2023-04-17T14:58:10.176Z",
+          "{\"service\":\"github-test-data\",\"limit\":\"5000\",\"remaining\":\"4351\",\"reset\":\"1681746512\",\"used\":\"649\",\"timestamp\":\"2023-04-17T14:58:10.0000000Z\"}",
+          "{\"client_IP\":\"0.0.0.0\",\"operation_Id\":\"cfae497bfd7a44169f35643940820938\",\"duration\":0,\"iKey\":\"195b4fe4-7b01-4814-abca-ffceb1f62c8f\",\"size\":null,\"sdkVersion\":\"node:1.8.9\",\"name\":\"\",\"client_Model\":\"\",\"cloud_RoleName\":\"Web\",\"customMeasurements\":null,\"client_Browser\":\"\",\"operation_Name\":\"GET /github/grafana/grafana/commits\",\"performanceBucket\":\"\",\"client_CountryOrRegion\":\"Ireland\",\"cloud_RoleInstance\":\"test-vm\",\"appName\":\"test-app\",\"client_Type\":\"PC\",\"operation_ParentId\":\"|cfae497bfd7a44169f35643940820938.\",\"success\":\"\",\"application_Version\":\"1.0.0\",\"operation_SyntheticSource\":\"\",\"itemType\":\"trace\",\"user_AccountId\":\"\",\"session_Id\":\"\",\"timestamp\":\"2023-04-17T14:58:10.1760000Z\",\"message\":\"github commits rate limiting info\",\"client_City\":\"Dublin\",\"client_StateOrProvince\":\"Dublin\",\"itemId\":\"65863e6b-dd30-11ed-a808-002248268105\",\"client_OS\":\"Linux 5.4.0-1036-azure\",\"id\":\"\",\"customDimensions\":{\"service\":\"github-test-data\",\"limit\":\"5000\",\"remaining\":\"4351\",\"reset\":\"1681746512\",\"used\":\"649\",\"timestamp\":\"2023-04-17T14:58:10.0000000Z\"},\"itemCount\":1,\"location\":\"\",\"user_AuthenticatedId\":\"\",\"appId\":\"4ad5a808-11f7-49d5-9713-f6ede83141e4\",\"user_Id\":\"\",\"resultCode\":\"\",\"type\":\"\",\"data\":\"\",\"target\":\"\",\"assembly\":\"\",\"outerType\":\"\",\"innermostAssembly\":\"\",\"innermostType\":\"\",\"method\":\"\",\"problemId\":\"\",\"handledAt\":\"\",\"outerMessage\":\"\",\"details\":null,\"innermostMethod\":\"\",\"innermostMessage\":\"\",\"outerAssembly\":\"\",\"outerMethod\":\"\",\"severityLevel\":1,\"url\":\"\",\"source\":\"\"}",
+          "65863e6b-dd30-11ed-a808-002248268105",
+          "trace"
+        ],
+        [
+          "e766f18a0adc49418d297b1a244f1bfb",
+          "|e766f18a0adc49418d297b1a244f1bfb.1901.",
+          "|e766f18a0adc49418d297b1a244f1bfb.",
+          330,
+          "GET /repos/grafana/grafana/commits",
+          "GET /github/grafana/grafana/commits",
+          "2023-04-17T14:58:10.764Z",
+          null,
+          "{\"client_IP\":\"0.0.0.0\",\"operation_Id\":\"e766f18a0adc49418d297b1a244f1bfb\",\"duration\":330,\"iKey\":\"195b4fe4-7b01-4814-abca-ffceb1f62c8f\",\"size\":null,\"sdkVersion\":\"node:1.8.9\",\"name\":\"GET /repos/grafana/grafana/commits\",\"client_Model\":\"\",\"cloud_RoleName\":\"Web\",\"customMeasurements\":null,\"client_Browser\":\"\",\"operation_Name\":\"GET /github/grafana/grafana/commits\",\"performanceBucket\":\"250ms-500ms\",\"client_CountryOrRegion\":\"Ireland\",\"cloud_RoleInstance\":\"test-vm\",\"appName\":\"test-app\",\"client_Type\":\"PC\",\"operation_ParentId\":\"|e766f18a0adc49418d297b1a244f1bfb.\",\"success\":\"True\",\"application_Version\":\"1.0.0\",\"operation_SyntheticSource\":\"\",\"itemType\":\"dependency\",\"user_AccountId\":\"\",\"session_Id\":\"\",\"timestamp\":\"2023-04-17T14:58:10.7640000Z\",\"message\":\"\",\"client_City\":\"Dublin\",\"client_StateOrProvince\":\"Dublin\",\"itemId\":\"78c1bcf4-dd30-11ed-a808-0022481f7f28\",\"client_OS\":\"Linux 5.4.0-1036-azure\",\"id\":\"|e766f18a0adc49418d297b1a244f1bfb.1901.\",\"customDimensions\":null,\"itemCount\":1,\"location\":\"\",\"user_AuthenticatedId\":\"\",\"appId\":\"4ad5a808-11f7-49d5-9713-f6ede83141e4\",\"user_Id\":\"\",\"resultCode\":\"200\",\"type\":\"HTTP\",\"data\":\"https://api.github.com/repos/grafana/grafana/commits\",\"target\":\"api.github.com\",\"assembly\":\"\",\"outerType\":\"\",\"innermostAssembly\":\"\",\"innermostType\":\"\",\"method\":\"\",\"problemId\":\"\",\"handledAt\":\"\",\"outerMessage\":\"\",\"details\":null,\"innermostMethod\":\"\",\"innermostMessage\":\"\",\"outerAssembly\":\"\",\"outerMethod\":\"\",\"severityLevel\":null,\"url\":\"\",\"source\":\"\"}",
+          "78c1bcf4-dd30-11ed-a808-0022481f7f28",
+          "dependency"
+        ],
+        [
+          "b1f0047386554fa59b7c5330560a0799",
+          "|b1f0047386554fa59b7c5330560a0799.",
+          "b1f0047386554fa59b7c5330560a0799",
+          352,
+          "GET /github/grafana/grafana/commits",
+          "GET /github/grafana/grafana/commits",
+          "2023-04-17T14:58:11.579Z",
+          null,
+          "{\"client_IP\":\"0.0.0.0\",\"operation_Id\":\"b1f0047386554fa59b7c5330560a0799\",\"duration\":352,\"iKey\":\"195b4fe4-7b01-4814-abca-ffceb1f62c8f\",\"size\":null,\"sdkVersion\":\"node:1.8.9\",\"name\":\"GET /github/grafana/grafana/commits\",\"client_Model\":\"\",\"cloud_RoleName\":\"Web\",\"customMeasurements\":null,\"client_Browser\":\"\",\"operation_Name\":\"GET /github/grafana/grafana/commits\",\"performanceBucket\":\"250ms-500ms\",\"client_CountryOrRegion\":\"\",\"cloud_RoleInstance\":\"test-vm\",\"appName\":\"test-app\",\"client_Type\":\"PC\",\"operation_ParentId\":\"b1f0047386554fa59b7c5330560a0799\",\"success\":\"True\",\"application_Version\":\"1.0.0\",\"operation_SyntheticSource\":\"\",\"itemType\":\"request\",\"user_AccountId\":\"\",\"session_Id\":\"\",\"timestamp\":\"2023-04-17T14:58:11.5790000Z\",\"message\":\"\",\"client_City\":\"\",\"client_StateOrProvince\":\"\",\"itemId\":\"5c126241-dd30-11ed-a80a-00224826882d\",\"client_OS\":\"Linux 5.4.0-1036-azure\",\"id\":\"|b1f0047386554fa59b7c5330560a0799.\",\"customDimensions\":null,\"itemCount\":1,\"location\":\"\",\"user_AuthenticatedId\":\"\",\"appId\":\"4ad5a808-11f7-49d5-9713-f6ede83141e4\",\"user_Id\":\"\",\"resultCode\":\"200\",\"type\":\"\",\"data\":\"\",\"target\":\"\",\"assembly\":\"\",\"outerType\":\"\",\"innermostAssembly\":\"\",\"innermostType\":\"\",\"method\":\"\",\"problemId\":\"\",\"handledAt\":\"\",\"outerMessage\":\"\",\"details\":null,\"innermostMethod\":\"\",\"innermostMessage\":\"\",\"outerAssembly\":\"\",\"outerMethod\":\"\",\"severityLevel\":null,\"url\":\"test-url\",\"source\":\"\"}",
+          "5c126241-dd30-11ed-a80a-00224826882d",
+          "request"
+        ]
+      ]
+    }
+  ]
+}
diff --git a/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json.multi-trace-as-trace-format.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json.multi-trace-as-trace-format.golden.jsonc
new file mode 100644
index 00000000000..5cb334595cc
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json.multi-trace-as-trace-format.golden.jsonc
@@ -0,0 +1,559 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "string",
+//              "string",
+//              "string",
+//              "real",
+//              "string",
+//              "string",
+//              "datetime",
+//              "dynamic",
+//              "dynamic",
+//              "string",
+//              "string"
+//          ]
+//      }
+//  }
+//  Name: 
+//  Dimensions: 11 Fields by 3 Rows
+//  +----------------------------------+-----------------------------------------+------------------------------------+------------------+-------------------------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  | Name: traceID                    | Name: spanID                            | Name: parentSpanID                 | Name: duration   | Name: serviceName                   | Name: operationName                 | Name: startTime                   | Name: serviceTags                                                                                                                                                                                                                             | Name: tags                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | Name: itemId                         | Name: itemType  |
+//  | Labels:                          | Labels:                                 | Labels:                            | Labels:          | Labels:                             | Labels:                             | Labels:                           | Labels:                                                                                                                                                                                                                                       | Labels:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Labels:                              | Labels:         |
+//  | Type: []*string                  | Type: []*string                         | Type: []*string                    | Type: []*float64 | Type: []*string                     | Type: []*string                     | Type: []*time.Time                | Type: []*json.RawMessage                                                                                                                                                                                                                      | Type: []*json.RawMessage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | Type: []*string                      | Type: []*string |
+//  +----------------------------------+-----------------------------------------+------------------------------------+------------------+-------------------------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  | cfae497bfd7a44169f35643940820938 | b52403c5-5b27-43a8-9bc6-5938667a4470    | |cfae497bfd7a44169f35643940820938. | 0                |                                     | GET /github/grafana/grafana/commits | 2023-04-17 14:58:10.176 +0000 UTC | [{"value":"5000","key":"limit"},{"value":"4351","key":"remaining"},{"value":"1681746512","key":"reset"},{"value":"github-test-data","key":"service"},{"value":"2023-04-17T14:58:10.0000000Z","key":"timestamp"},{"value":"649","key":"used"}] | [{"value":"4ad5a808-11f7-49d5-9713-f6ede83141e4","key":"appId"},{"value":"test-app","key":"appName"},{"value":"1.0.0","key":"application_Version"},{"value":"Dublin","key":"client_City"},{"value":"Ireland","key":"client_CountryOrRegion"},{"value":"0.0.0.0","key":"client_IP"},{"value":"Linux 5.4.0-1036-azure","key":"client_OS"},{"value":"Dublin","key":"client_StateOrProvince"},{"value":"PC","key":"client_Type"},{"value":"test-vm","key":"cloud_RoleInstance"},{"value":"Web","key":"cloud_RoleName"},{"value":{"limit":"5000","remaining":"4351","reset":"1681746512","service":"github-test-data","timestamp":"2023-04-17T14:58:10.0000000Z","used":"649"},"key":"customDimensions"},{"value":0,"key":"duration"},{"value":"195b4fe4-7b01-4814-abca-ffceb1f62c8f","key":"iKey"},{"value":1,"key":"itemCount"},{"value":"65863e6b-dd30-11ed-a808-002248268105","key":"itemId"},{"value":"trace","key":"itemType"},{"value":"github commits rate limiting info","key":"message"},{"value":"cfae497bfd7a44169f35643940820938","key":"operation_Id"},{"value":"GET /github/grafana/grafana/commits","key":"operation_Name"},{"value":"|cfae497bfd7a44169f35643940820938.","key":"operation_ParentId"},{"value":"node:1.8.9","key":"sdkVersion"},{"value":1,"key":"severityLevel"},{"value":"2023-04-17T14:58:10.1760000Z","key":"timestamp"}]                                                                                                                              | 65863e6b-dd30-11ed-a808-002248268105 | trace           |
+//  | e766f18a0adc49418d297b1a244f1bfb | |e766f18a0adc49418d297b1a244f1bfb.1901. | |e766f18a0adc49418d297b1a244f1bfb. | 330              | GET /repos/grafana/grafana/commits  | GET /github/grafana/grafana/commits | 2023-04-17 14:58:10.764 +0000 UTC | null                                                                                                                                                                                                                                          | [{"value":"4ad5a808-11f7-49d5-9713-f6ede83141e4","key":"appId"},{"value":"test-app","key":"appName"},{"value":"1.0.0","key":"application_Version"},{"value":"Dublin","key":"client_City"},{"value":"Ireland","key":"client_CountryOrRegion"},{"value":"0.0.0.0","key":"client_IP"},{"value":"Linux 5.4.0-1036-azure","key":"client_OS"},{"value":"Dublin","key":"client_StateOrProvince"},{"value":"PC","key":"client_Type"},{"value":"test-vm","key":"cloud_RoleInstance"},{"value":"Web","key":"cloud_RoleName"},{"value":"https://api.github.com/repos/grafana/grafana/commits","key":"data"},{"value":330,"key":"duration"},{"value":"195b4fe4-7b01-4814-abca-ffceb1f62c8f","key":"iKey"},{"value":"|e766f18a0adc49418d297b1a244f1bfb.1901.","key":"id"},{"value":1,"key":"itemCount"},{"value":"78c1bcf4-dd30-11ed-a808-0022481f7f28","key":"itemId"},{"value":"dependency","key":"itemType"},{"value":"GET /repos/grafana/grafana/commits","key":"name"},{"value":"e766f18a0adc49418d297b1a244f1bfb","key":"operation_Id"},{"value":"GET /github/grafana/grafana/commits","key":"operation_Name"},{"value":"|e766f18a0adc49418d297b1a244f1bfb.","key":"operation_ParentId"},{"value":"250ms-500ms","key":"performanceBucket"},{"value":"200","key":"resultCode"},{"value":"node:1.8.9","key":"sdkVersion"},{"value":"True","key":"success"},{"value":"api.github.com","key":"target"},{"value":"2023-04-17T14:58:10.7640000Z","key":"timestamp"},{"value":"HTTP","key":"type"}] | 78c1bcf4-dd30-11ed-a808-0022481f7f28 | dependency      |
+//  | b1f0047386554fa59b7c5330560a0799 | |b1f0047386554fa59b7c5330560a0799.      | b1f0047386554fa59b7c5330560a0799   | 352              | GET /github/grafana/grafana/commits | GET /github/grafana/grafana/commits | 2023-04-17 14:58:11.579 +0000 UTC | null                                                                                                                                                                                                                                          | [{"value":"4ad5a808-11f7-49d5-9713-f6ede83141e4","key":"appId"},{"value":"test-app","key":"appName"},{"value":"1.0.0","key":"application_Version"},{"value":"0.0.0.0","key":"client_IP"},{"value":"Linux 5.4.0-1036-azure","key":"client_OS"},{"value":"PC","key":"client_Type"},{"value":"test-vm","key":"cloud_RoleInstance"},{"value":"Web","key":"cloud_RoleName"},{"value":352,"key":"duration"},{"value":"195b4fe4-7b01-4814-abca-ffceb1f62c8f","key":"iKey"},{"value":"|b1f0047386554fa59b7c5330560a0799.","key":"id"},{"value":1,"key":"itemCount"},{"value":"5c126241-dd30-11ed-a80a-00224826882d","key":"itemId"},{"value":"request","key":"itemType"},{"value":"GET /github/grafana/grafana/commits","key":"name"},{"value":"b1f0047386554fa59b7c5330560a0799","key":"operation_Id"},{"value":"GET /github/grafana/grafana/commits","key":"operation_Name"},{"value":"b1f0047386554fa59b7c5330560a0799","key":"operation_ParentId"},{"value":"250ms-500ms","key":"performanceBucket"},{"value":"200","key":"resultCode"},{"value":"node:1.8.9","key":"sdkVersion"},{"value":"True","key":"success"},{"value":"2023-04-17T14:58:11.5790000Z","key":"timestamp"},{"value":"test-url","key":"url"}]                                                                                                                                                                                                                                                                           | 5c126241-dd30-11ed-a80a-00224826882d | request         |
+//  +----------------------------------+-----------------------------------------+------------------------------------+------------------+-------------------------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "string",
+              "string",
+              "string",
+              "real",
+              "string",
+              "string",
+              "datetime",
+              "dynamic",
+              "dynamic",
+              "string",
+              "string"
+            ]
+          }
+        },
+        "fields": [
+          {
+            "name": "traceID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "spanID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "parentSpanID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "duration",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "serviceName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "operationName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "startTime",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "serviceTags",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tags",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "itemId",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "itemType",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "cfae497bfd7a44169f35643940820938",
+            "e766f18a0adc49418d297b1a244f1bfb",
+            "b1f0047386554fa59b7c5330560a0799"
+          ],
+          [
+            "b52403c5-5b27-43a8-9bc6-5938667a4470",
+            "|e766f18a0adc49418d297b1a244f1bfb.1901.",
+            "|b1f0047386554fa59b7c5330560a0799."
+          ],
+          [
+            "|cfae497bfd7a44169f35643940820938.",
+            "|e766f18a0adc49418d297b1a244f1bfb.",
+            "b1f0047386554fa59b7c5330560a0799"
+          ],
+          [
+            0,
+            330,
+            352
+          ],
+          [
+            "",
+            "GET /repos/grafana/grafana/commits",
+            "GET /github/grafana/grafana/commits"
+          ],
+          [
+            "GET /github/grafana/grafana/commits",
+            "GET /github/grafana/grafana/commits",
+            "GET /github/grafana/grafana/commits"
+          ],
+          [
+            1681743490176,
+            1681743490764,
+            1681743491579
+          ],
+          [
+            [
+              {
+                "value": "5000",
+                "key": "limit"
+              },
+              {
+                "value": "4351",
+                "key": "remaining"
+              },
+              {
+                "value": "1681746512",
+                "key": "reset"
+              },
+              {
+                "value": "github-test-data",
+                "key": "service"
+              },
+              {
+                "value": "2023-04-17T14:58:10.0000000Z",
+                "key": "timestamp"
+              },
+              {
+                "value": "649",
+                "key": "used"
+              }
+            ],
+            null,
+            null
+          ],
+          [
+            [
+              {
+                "value": "4ad5a808-11f7-49d5-9713-f6ede83141e4",
+                "key": "appId"
+              },
+              {
+                "value": "test-app",
+                "key": "appName"
+              },
+              {
+                "value": "1.0.0",
+                "key": "application_Version"
+              },
+              {
+                "value": "Dublin",
+                "key": "client_City"
+              },
+              {
+                "value": "Ireland",
+                "key": "client_CountryOrRegion"
+              },
+              {
+                "value": "0.0.0.0",
+                "key": "client_IP"
+              },
+              {
+                "value": "Linux 5.4.0-1036-azure",
+                "key": "client_OS"
+              },
+              {
+                "value": "Dublin",
+                "key": "client_StateOrProvince"
+              },
+              {
+                "value": "PC",
+                "key": "client_Type"
+              },
+              {
+                "value": "test-vm",
+                "key": "cloud_RoleInstance"
+              },
+              {
+                "value": "Web",
+                "key": "cloud_RoleName"
+              },
+              {
+                "value": {
+                  "limit": "5000",
+                  "remaining": "4351",
+                  "reset": "1681746512",
+                  "service": "github-test-data",
+                  "timestamp": "2023-04-17T14:58:10.0000000Z",
+                  "used": "649"
+                },
+                "key": "customDimensions"
+              },
+              {
+                "value": 0,
+                "key": "duration"
+              },
+              {
+                "value": "195b4fe4-7b01-4814-abca-ffceb1f62c8f",
+                "key": "iKey"
+              },
+              {
+                "value": 1,
+                "key": "itemCount"
+              },
+              {
+                "value": "65863e6b-dd30-11ed-a808-002248268105",
+                "key": "itemId"
+              },
+              {
+                "value": "trace",
+                "key": "itemType"
+              },
+              {
+                "value": "github commits rate limiting info",
+                "key": "message"
+              },
+              {
+                "value": "cfae497bfd7a44169f35643940820938",
+                "key": "operation_Id"
+              },
+              {
+                "value": "GET /github/grafana/grafana/commits",
+                "key": "operation_Name"
+              },
+              {
+                "value": "|cfae497bfd7a44169f35643940820938.",
+                "key": "operation_ParentId"
+              },
+              {
+                "value": "node:1.8.9",
+                "key": "sdkVersion"
+              },
+              {
+                "value": 1,
+                "key": "severityLevel"
+              },
+              {
+                "value": "2023-04-17T14:58:10.1760000Z",
+                "key": "timestamp"
+              }
+            ],
+            [
+              {
+                "value": "4ad5a808-11f7-49d5-9713-f6ede83141e4",
+                "key": "appId"
+              },
+              {
+                "value": "test-app",
+                "key": "appName"
+              },
+              {
+                "value": "1.0.0",
+                "key": "application_Version"
+              },
+              {
+                "value": "Dublin",
+                "key": "client_City"
+              },
+              {
+                "value": "Ireland",
+                "key": "client_CountryOrRegion"
+              },
+              {
+                "value": "0.0.0.0",
+                "key": "client_IP"
+              },
+              {
+                "value": "Linux 5.4.0-1036-azure",
+                "key": "client_OS"
+              },
+              {
+                "value": "Dublin",
+                "key": "client_StateOrProvince"
+              },
+              {
+                "value": "PC",
+                "key": "client_Type"
+              },
+              {
+                "value": "test-vm",
+                "key": "cloud_RoleInstance"
+              },
+              {
+                "value": "Web",
+                "key": "cloud_RoleName"
+              },
+              {
+                "value": "https://api.github.com/repos/grafana/grafana/commits",
+                "key": "data"
+              },
+              {
+                "value": 330,
+                "key": "duration"
+              },
+              {
+                "value": "195b4fe4-7b01-4814-abca-ffceb1f62c8f",
+                "key": "iKey"
+              },
+              {
+                "value": "|e766f18a0adc49418d297b1a244f1bfb.1901.",
+                "key": "id"
+              },
+              {
+                "value": 1,
+                "key": "itemCount"
+              },
+              {
+                "value": "78c1bcf4-dd30-11ed-a808-0022481f7f28",
+                "key": "itemId"
+              },
+              {
+                "value": "dependency",
+                "key": "itemType"
+              },
+              {
+                "value": "GET /repos/grafana/grafana/commits",
+                "key": "name"
+              },
+              {
+                "value": "e766f18a0adc49418d297b1a244f1bfb",
+                "key": "operation_Id"
+              },
+              {
+                "value": "GET /github/grafana/grafana/commits",
+                "key": "operation_Name"
+              },
+              {
+                "value": "|e766f18a0adc49418d297b1a244f1bfb.",
+                "key": "operation_ParentId"
+              },
+              {
+                "value": "250ms-500ms",
+                "key": "performanceBucket"
+              },
+              {
+                "value": "200",
+                "key": "resultCode"
+              },
+              {
+                "value": "node:1.8.9",
+                "key": "sdkVersion"
+              },
+              {
+                "value": "True",
+                "key": "success"
+              },
+              {
+                "value": "api.github.com",
+                "key": "target"
+              },
+              {
+                "value": "2023-04-17T14:58:10.7640000Z",
+                "key": "timestamp"
+              },
+              {
+                "value": "HTTP",
+                "key": "type"
+              }
+            ],
+            [
+              {
+                "value": "4ad5a808-11f7-49d5-9713-f6ede83141e4",
+                "key": "appId"
+              },
+              {
+                "value": "test-app",
+                "key": "appName"
+              },
+              {
+                "value": "1.0.0",
+                "key": "application_Version"
+              },
+              {
+                "value": "0.0.0.0",
+                "key": "client_IP"
+              },
+              {
+                "value": "Linux 5.4.0-1036-azure",
+                "key": "client_OS"
+              },
+              {
+                "value": "PC",
+                "key": "client_Type"
+              },
+              {
+                "value": "test-vm",
+                "key": "cloud_RoleInstance"
+              },
+              {
+                "value": "Web",
+                "key": "cloud_RoleName"
+              },
+              {
+                "value": 352,
+                "key": "duration"
+              },
+              {
+                "value": "195b4fe4-7b01-4814-abca-ffceb1f62c8f",
+                "key": "iKey"
+              },
+              {
+                "value": "|b1f0047386554fa59b7c5330560a0799.",
+                "key": "id"
+              },
+              {
+                "value": 1,
+                "key": "itemCount"
+              },
+              {
+                "value": "5c126241-dd30-11ed-a80a-00224826882d",
+                "key": "itemId"
+              },
+              {
+                "value": "request",
+                "key": "itemType"
+              },
+              {
+                "value": "GET /github/grafana/grafana/commits",
+                "key": "name"
+              },
+              {
+                "value": "b1f0047386554fa59b7c5330560a0799",
+                "key": "operation_Id"
+              },
+              {
+                "value": "GET /github/grafana/grafana/commits",
+                "key": "operation_Name"
+              },
+              {
+                "value": "b1f0047386554fa59b7c5330560a0799",
+                "key": "operation_ParentId"
+              },
+              {
+                "value": "250ms-500ms",
+                "key": "performanceBucket"
+              },
+              {
+                "value": "200",
+                "key": "resultCode"
+              },
+              {
+                "value": "node:1.8.9",
+                "key": "sdkVersion"
+              },
+              {
+                "value": "True",
+                "key": "success"
+              },
+              {
+                "value": "2023-04-17T14:58:11.5790000Z",
+                "key": "timestamp"
+              },
+              {
+                "value": "test-url",
+                "key": "url"
+              }
+            ]
+          ],
+          [
+            "65863e6b-dd30-11ed-a808-002248268105",
+            "78c1bcf4-dd30-11ed-a808-0022481f7f28",
+            "5c126241-dd30-11ed-a80a-00224826882d"
+          ],
+          [
+            "trace",
+            "dependency",
+            "request"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json.multi-trace.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json.multi-trace.golden.jsonc
new file mode 100644
index 00000000000..d5225934962
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/traces/1-traces-multiple-table.json.multi-trace.golden.jsonc
@@ -0,0 +1,216 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "string",
+//              "string",
+//              "string",
+//              "real",
+//              "string",
+//              "string",
+//              "datetime",
+//              "dynamic",
+//              "dynamic",
+//              "string",
+//              "string"
+//          ]
+//      }
+//  }
+//  Name: 
+//  Dimensions: 11 Fields by 3 Rows
+//  +----------------------------------+-----------------------------------------+------------------------------------+------------------+-------------------------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  | Name: traceID                    | Name: spanID                            | Name: parentSpanID                 | Name: duration   | Name: serviceName                   | Name: operationName                 | Name: startTime                   | Name: serviceTags                                                                                                                             | Name: tags                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Name: itemId                         | Name: itemType  |
+//  | Labels:                          | Labels:                                 | Labels:                            | Labels:          | Labels:                             | Labels:                             | Labels:                           | Labels:                                                                                                                                       | Labels:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Labels:                              | Labels:         |
+//  | Type: []*string                  | Type: []*string                         | Type: []*string                    | Type: []*float64 | Type: []*string                     | Type: []*string                     | Type: []*time.Time                | Type: []*string                                                                                                                               | Type: []*string                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Type: []*string                      | Type: []*string |
+//  +----------------------------------+-----------------------------------------+------------------------------------+------------------+-------------------------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  | cfae497bfd7a44169f35643940820938 | b52403c5-5b27-43a8-9bc6-5938667a4470    | |cfae497bfd7a44169f35643940820938. | 0                |                                     | GET /github/grafana/grafana/commits | 2023-04-17 14:58:10.176 +0000 UTC | {"service":"github-test-data","limit":"5000","remaining":"4351","reset":"1681746512","used":"649","timestamp":"2023-04-17T14:58:10.0000000Z"} | {"client_IP":"0.0.0.0","operation_Id":"cfae497bfd7a44169f35643940820938","duration":0,"iKey":"195b4fe4-7b01-4814-abca-ffceb1f62c8f","size":null,"sdkVersion":"node:1.8.9","name":"","client_Model":"","cloud_RoleName":"Web","customMeasurements":null,"client_Browser":"","operation_Name":"GET /github/grafana/grafana/commits","performanceBucket":"","client_CountryOrRegion":"Ireland","cloud_RoleInstance":"test-vm","appName":"test-app","client_Type":"PC","operation_ParentId":"|cfae497bfd7a44169f35643940820938.","success":"","application_Version":"1.0.0","operation_SyntheticSource":"","itemType":"trace","user_AccountId":"","session_Id":"","timestamp":"2023-04-17T14:58:10.1760000Z","message":"github commits rate limiting info","client_City":"Dublin","client_StateOrProvince":"Dublin","itemId":"65863e6b-dd30-11ed-a808-002248268105","client_OS":"Linux 5.4.0-1036-azure","id":"","customDimensions":{"service":"github-test-data","limit":"5000","remaining":"4351","reset":"1681746512","used":"649","timestamp":"2023-04-17T14:58:10.0000000Z"},"itemCount":1,"location":"","user_AuthenticatedId":"","appId":"4ad5a808-11f7-49d5-9713-f6ede83141e4","user_Id":"","resultCode":"","type":"","data":"","target":"","assembly":"","outerType":"","innermostAssembly":"","innermostType":"","method":"","problemId":"","handledAt":"","outerMessage":"","details":null,"innermostMethod":"","innermostMessage":"","outerAssembly":"","outerMethod":"","severityLevel":1,"url":"","source":""}  | 65863e6b-dd30-11ed-a808-002248268105 | trace           |
+//  | e766f18a0adc49418d297b1a244f1bfb | |e766f18a0adc49418d297b1a244f1bfb.1901. | |e766f18a0adc49418d297b1a244f1bfb. | 330              | GET /repos/grafana/grafana/commits  | GET /github/grafana/grafana/commits | 2023-04-17 14:58:10.764 +0000 UTC | null                                                                                                                                          | {"client_IP":"0.0.0.0","operation_Id":"e766f18a0adc49418d297b1a244f1bfb","duration":330,"iKey":"195b4fe4-7b01-4814-abca-ffceb1f62c8f","size":null,"sdkVersion":"node:1.8.9","name":"GET /repos/grafana/grafana/commits","client_Model":"","cloud_RoleName":"Web","customMeasurements":null,"client_Browser":"","operation_Name":"GET /github/grafana/grafana/commits","performanceBucket":"250ms-500ms","client_CountryOrRegion":"Ireland","cloud_RoleInstance":"test-vm","appName":"test-app","client_Type":"PC","operation_ParentId":"|e766f18a0adc49418d297b1a244f1bfb.","success":"True","application_Version":"1.0.0","operation_SyntheticSource":"","itemType":"dependency","user_AccountId":"","session_Id":"","timestamp":"2023-04-17T14:58:10.7640000Z","message":"","client_City":"Dublin","client_StateOrProvince":"Dublin","itemId":"78c1bcf4-dd30-11ed-a808-0022481f7f28","client_OS":"Linux 5.4.0-1036-azure","id":"|e766f18a0adc49418d297b1a244f1bfb.1901.","customDimensions":null,"itemCount":1,"location":"","user_AuthenticatedId":"","appId":"4ad5a808-11f7-49d5-9713-f6ede83141e4","user_Id":"","resultCode":"200","type":"HTTP","data":"https://api.github.com/repos/grafana/grafana/commits","target":"api.github.com","assembly":"","outerType":"","innermostAssembly":"","innermostType":"","method":"","problemId":"","handledAt":"","outerMessage":"","details":null,"innermostMethod":"","innermostMessage":"","outerAssembly":"","outerMethod":"","severityLevel":null,"url":"","source":""} | 78c1bcf4-dd30-11ed-a808-0022481f7f28 | dependency      |
+//  | b1f0047386554fa59b7c5330560a0799 | |b1f0047386554fa59b7c5330560a0799.      | b1f0047386554fa59b7c5330560a0799   | 352              | GET /github/grafana/grafana/commits | GET /github/grafana/grafana/commits | 2023-04-17 14:58:11.579 +0000 UTC | null                                                                                                                                          | {"client_IP":"0.0.0.0","operation_Id":"b1f0047386554fa59b7c5330560a0799","duration":352,"iKey":"195b4fe4-7b01-4814-abca-ffceb1f62c8f","size":null,"sdkVersion":"node:1.8.9","name":"GET /github/grafana/grafana/commits","client_Model":"","cloud_RoleName":"Web","customMeasurements":null,"client_Browser":"","operation_Name":"GET /github/grafana/grafana/commits","performanceBucket":"250ms-500ms","client_CountryOrRegion":"","cloud_RoleInstance":"test-vm","appName":"test-app","client_Type":"PC","operation_ParentId":"b1f0047386554fa59b7c5330560a0799","success":"True","application_Version":"1.0.0","operation_SyntheticSource":"","itemType":"request","user_AccountId":"","session_Id":"","timestamp":"2023-04-17T14:58:11.5790000Z","message":"","client_City":"","client_StateOrProvince":"","itemId":"5c126241-dd30-11ed-a80a-00224826882d","client_OS":"Linux 5.4.0-1036-azure","id":"|b1f0047386554fa59b7c5330560a0799.","customDimensions":null,"itemCount":1,"location":"","user_AuthenticatedId":"","appId":"4ad5a808-11f7-49d5-9713-f6ede83141e4","user_Id":"","resultCode":"200","type":"","data":"","target":"","assembly":"","outerType":"","innermostAssembly":"","innermostType":"","method":"","problemId":"","handledAt":"","outerMessage":"","details":null,"innermostMethod":"","innermostMessage":"","outerAssembly":"","outerMethod":"","severityLevel":null,"url":"test-url","source":""}                                                                                           | 5c126241-dd30-11ed-a80a-00224826882d | request         |
+//  +----------------------------------+-----------------------------------------+------------------------------------+------------------+-------------------------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "string",
+              "string",
+              "string",
+              "real",
+              "string",
+              "string",
+              "datetime",
+              "dynamic",
+              "dynamic",
+              "string",
+              "string"
+            ]
+          }
+        },
+        "fields": [
+          {
+            "name": "traceID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "spanID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "parentSpanID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "duration",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "serviceName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "operationName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "startTime",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "serviceTags",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tags",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "itemId",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "itemType",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "cfae497bfd7a44169f35643940820938",
+            "e766f18a0adc49418d297b1a244f1bfb",
+            "b1f0047386554fa59b7c5330560a0799"
+          ],
+          [
+            "b52403c5-5b27-43a8-9bc6-5938667a4470",
+            "|e766f18a0adc49418d297b1a244f1bfb.1901.",
+            "|b1f0047386554fa59b7c5330560a0799."
+          ],
+          [
+            "|cfae497bfd7a44169f35643940820938.",
+            "|e766f18a0adc49418d297b1a244f1bfb.",
+            "b1f0047386554fa59b7c5330560a0799"
+          ],
+          [
+            0,
+            330,
+            352
+          ],
+          [
+            "",
+            "GET /repos/grafana/grafana/commits",
+            "GET /github/grafana/grafana/commits"
+          ],
+          [
+            "GET /github/grafana/grafana/commits",
+            "GET /github/grafana/grafana/commits",
+            "GET /github/grafana/grafana/commits"
+          ],
+          [
+            1681743490176,
+            1681743490764,
+            1681743491579
+          ],
+          [
+            "{\"service\":\"github-test-data\",\"limit\":\"5000\",\"remaining\":\"4351\",\"reset\":\"1681746512\",\"used\":\"649\",\"timestamp\":\"2023-04-17T14:58:10.0000000Z\"}",
+            null,
+            null
+          ],
+          [
+            "{\"client_IP\":\"0.0.0.0\",\"operation_Id\":\"cfae497bfd7a44169f35643940820938\",\"duration\":0,\"iKey\":\"195b4fe4-7b01-4814-abca-ffceb1f62c8f\",\"size\":null,\"sdkVersion\":\"node:1.8.9\",\"name\":\"\",\"client_Model\":\"\",\"cloud_RoleName\":\"Web\",\"customMeasurements\":null,\"client_Browser\":\"\",\"operation_Name\":\"GET /github/grafana/grafana/commits\",\"performanceBucket\":\"\",\"client_CountryOrRegion\":\"Ireland\",\"cloud_RoleInstance\":\"test-vm\",\"appName\":\"test-app\",\"client_Type\":\"PC\",\"operation_ParentId\":\"|cfae497bfd7a44169f35643940820938.\",\"success\":\"\",\"application_Version\":\"1.0.0\",\"operation_SyntheticSource\":\"\",\"itemType\":\"trace\",\"user_AccountId\":\"\",\"session_Id\":\"\",\"timestamp\":\"2023-04-17T14:58:10.1760000Z\",\"message\":\"github commits rate limiting info\",\"client_City\":\"Dublin\",\"client_StateOrProvince\":\"Dublin\",\"itemId\":\"65863e6b-dd30-11ed-a808-002248268105\",\"client_OS\":\"Linux 5.4.0-1036-azure\",\"id\":\"\",\"customDimensions\":{\"service\":\"github-test-data\",\"limit\":\"5000\",\"remaining\":\"4351\",\"reset\":\"1681746512\",\"used\":\"649\",\"timestamp\":\"2023-04-17T14:58:10.0000000Z\"},\"itemCount\":1,\"location\":\"\",\"user_AuthenticatedId\":\"\",\"appId\":\"4ad5a808-11f7-49d5-9713-f6ede83141e4\",\"user_Id\":\"\",\"resultCode\":\"\",\"type\":\"\",\"data\":\"\",\"target\":\"\",\"assembly\":\"\",\"outerType\":\"\",\"innermostAssembly\":\"\",\"innermostType\":\"\",\"method\":\"\",\"problemId\":\"\",\"handledAt\":\"\",\"outerMessage\":\"\",\"details\":null,\"innermostMethod\":\"\",\"innermostMessage\":\"\",\"outerAssembly\":\"\",\"outerMethod\":\"\",\"severityLevel\":1,\"url\":\"\",\"source\":\"\"}",
+            "{\"client_IP\":\"0.0.0.0\",\"operation_Id\":\"e766f18a0adc49418d297b1a244f1bfb\",\"duration\":330,\"iKey\":\"195b4fe4-7b01-4814-abca-ffceb1f62c8f\",\"size\":null,\"sdkVersion\":\"node:1.8.9\",\"name\":\"GET /repos/grafana/grafana/commits\",\"client_Model\":\"\",\"cloud_RoleName\":\"Web\",\"customMeasurements\":null,\"client_Browser\":\"\",\"operation_Name\":\"GET /github/grafana/grafana/commits\",\"performanceBucket\":\"250ms-500ms\",\"client_CountryOrRegion\":\"Ireland\",\"cloud_RoleInstance\":\"test-vm\",\"appName\":\"test-app\",\"client_Type\":\"PC\",\"operation_ParentId\":\"|e766f18a0adc49418d297b1a244f1bfb.\",\"success\":\"True\",\"application_Version\":\"1.0.0\",\"operation_SyntheticSource\":\"\",\"itemType\":\"dependency\",\"user_AccountId\":\"\",\"session_Id\":\"\",\"timestamp\":\"2023-04-17T14:58:10.7640000Z\",\"message\":\"\",\"client_City\":\"Dublin\",\"client_StateOrProvince\":\"Dublin\",\"itemId\":\"78c1bcf4-dd30-11ed-a808-0022481f7f28\",\"client_OS\":\"Linux 5.4.0-1036-azure\",\"id\":\"|e766f18a0adc49418d297b1a244f1bfb.1901.\",\"customDimensions\":null,\"itemCount\":1,\"location\":\"\",\"user_AuthenticatedId\":\"\",\"appId\":\"4ad5a808-11f7-49d5-9713-f6ede83141e4\",\"user_Id\":\"\",\"resultCode\":\"200\",\"type\":\"HTTP\",\"data\":\"https://api.github.com/repos/grafana/grafana/commits\",\"target\":\"api.github.com\",\"assembly\":\"\",\"outerType\":\"\",\"innermostAssembly\":\"\",\"innermostType\":\"\",\"method\":\"\",\"problemId\":\"\",\"handledAt\":\"\",\"outerMessage\":\"\",\"details\":null,\"innermostMethod\":\"\",\"innermostMessage\":\"\",\"outerAssembly\":\"\",\"outerMethod\":\"\",\"severityLevel\":null,\"url\":\"\",\"source\":\"\"}",
+            "{\"client_IP\":\"0.0.0.0\",\"operation_Id\":\"b1f0047386554fa59b7c5330560a0799\",\"duration\":352,\"iKey\":\"195b4fe4-7b01-4814-abca-ffceb1f62c8f\",\"size\":null,\"sdkVersion\":\"node:1.8.9\",\"name\":\"GET /github/grafana/grafana/commits\",\"client_Model\":\"\",\"cloud_RoleName\":\"Web\",\"customMeasurements\":null,\"client_Browser\":\"\",\"operation_Name\":\"GET /github/grafana/grafana/commits\",\"performanceBucket\":\"250ms-500ms\",\"client_CountryOrRegion\":\"\",\"cloud_RoleInstance\":\"test-vm\",\"appName\":\"test-app\",\"client_Type\":\"PC\",\"operation_ParentId\":\"b1f0047386554fa59b7c5330560a0799\",\"success\":\"True\",\"application_Version\":\"1.0.0\",\"operation_SyntheticSource\":\"\",\"itemType\":\"request\",\"user_AccountId\":\"\",\"session_Id\":\"\",\"timestamp\":\"2023-04-17T14:58:11.5790000Z\",\"message\":\"\",\"client_City\":\"\",\"client_StateOrProvince\":\"\",\"itemId\":\"5c126241-dd30-11ed-a80a-00224826882d\",\"client_OS\":\"Linux 5.4.0-1036-azure\",\"id\":\"|b1f0047386554fa59b7c5330560a0799.\",\"customDimensions\":null,\"itemCount\":1,\"location\":\"\",\"user_AuthenticatedId\":\"\",\"appId\":\"4ad5a808-11f7-49d5-9713-f6ede83141e4\",\"user_Id\":\"\",\"resultCode\":\"200\",\"type\":\"\",\"data\":\"\",\"target\":\"\",\"assembly\":\"\",\"outerType\":\"\",\"innermostAssembly\":\"\",\"innermostType\":\"\",\"method\":\"\",\"problemId\":\"\",\"handledAt\":\"\",\"outerMessage\":\"\",\"details\":null,\"innermostMethod\":\"\",\"innermostMessage\":\"\",\"outerAssembly\":\"\",\"outerMethod\":\"\",\"severityLevel\":null,\"url\":\"test-url\",\"source\":\"\"}"
+          ],
+          [
+            "65863e6b-dd30-11ed-a808-002248268105",
+            "78c1bcf4-dd30-11ed-a808-0022481f7f28",
+            "5c126241-dd30-11ed-a80a-00224826882d"
+          ],
+          [
+            "trace",
+            "dependency",
+            "request"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json b/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json
new file mode 100644
index 00000000000..e66081489c8
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json
@@ -0,0 +1,69 @@
+{
+    "tables": [
+      {
+        "name": "PrimaryResult",
+        "columns": [
+          {
+            "name": "traceID",
+            "type": "string"
+          },
+          {
+            "name": "spanID",
+            "type": "string"
+          },
+          {
+            "name": "parentSpanID",
+            "type": "string"
+          },
+          {
+            "name": "duration",
+            "type": "real"
+          },
+          {
+            "name": "serviceName",
+            "type": "string"
+          },
+          {
+            "name": "operationName",
+            "type": "string"
+          },
+          {
+            "name": "startTime",
+            "type": "datetime"
+          },
+          {
+            "name": "serviceTags",
+            "type": "dynamic"
+          },
+          {
+            "name": "tags",
+            "type": "dynamic"
+          },
+          {
+            "name": "itemId",
+            "type": "string"
+          },
+          {
+            "name": "itemType",
+            "type": "string"
+          }
+        ],
+        "rows": [
+          [
+            "cfae497bfd7a44169f35643940820938",
+            "b52403c5-5b27-43a8-9bc6-5938667a4470",
+            "|cfae497bfd7a44169f35643940820938.",
+            0,
+            "",
+            "GET /github/grafana/grafana/commits",
+            "2023-04-17T14:58:10.176Z",
+            "{\"service\":\"github-test-data\",\"limit\":\"5000\",\"remaining\":\"4351\",\"reset\":\"1681746512\",\"used\":\"649\",\"timestamp\":\"2023-04-17T14:58:10.0000000Z\"}",
+            "{\"client_IP\":\"0.0.0.0\",\"operation_Id\":\"cfae497bfd7a44169f35643940820938\",\"duration\":0,\"iKey\":\"195b4fe4-7b01-4814-abca-ffceb1f62c8f\",\"size\":null,\"sdkVersion\":\"node:1.8.9\",\"name\":\"\",\"client_Model\":\"\",\"cloud_RoleName\":\"Web\",\"customMeasurements\":null,\"client_Browser\":\"\",\"operation_Name\":\"GET /github/grafana/grafana/commits\",\"performanceBucket\":\"\",\"client_CountryOrRegion\":\"Ireland\",\"cloud_RoleInstance\":\"test-vm\",\"appName\":\"test-app\",\"client_Type\":\"PC\",\"operation_ParentId\":\"|cfae497bfd7a44169f35643940820938.\",\"success\":\"\",\"application_Version\":\"1.0.0\",\"operation_SyntheticSource\":\"\",\"itemType\":\"trace\",\"user_AccountId\":\"\",\"session_Id\":\"\",\"timestamp\":\"2023-04-17T14:58:10.1760000Z\",\"message\":\"github commits rate limiting info\",\"client_City\":\"Dublin\",\"client_StateOrProvince\":\"Dublin\",\"itemId\":\"65863e6b-dd30-11ed-a808-002248268105\",\"client_OS\":\"Linux 5.4.0-1036-azure\",\"id\":\"\",\"customDimensions\":{\"service\":\"github-test-data\",\"limit\":\"5000\",\"remaining\":\"4351\",\"reset\":\"1681746512\",\"used\":\"649\",\"timestamp\":\"2023-04-17T14:58:10.0000000Z\"},\"itemCount\":1,\"location\":\"\",\"user_AuthenticatedId\":\"\",\"appId\":\"4ad5a808-11f7-49d5-9713-f6ede83141e4\",\"user_Id\":\"\",\"resultCode\":\"\",\"type\":\"\",\"data\":\"\",\"target\":\"\",\"assembly\":\"\",\"outerType\":\"\",\"innermostAssembly\":\"\",\"innermostType\":\"\",\"method\":\"\",\"problemId\":\"\",\"handledAt\":\"\",\"outerMessage\":\"\",\"details\":null,\"innermostMethod\":\"\",\"innermostMessage\":\"\",\"outerAssembly\":\"\",\"outerMethod\":\"\",\"severityLevel\":1,\"url\":\"\",\"source\":\"\"}",
+            "65863e6b-dd30-11ed-a808-002248268105",
+            "trace"
+          ]
+        ]
+      }
+    ]
+  }
+  
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json.single-trace-as-trace-format.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json.single-trace-as-trace-format.golden.jsonc
new file mode 100644
index 00000000000..86a6297d6ef
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json.single-trace-as-trace-format.golden.jsonc
@@ -0,0 +1,321 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "string",
+//              "string",
+//              "string",
+//              "real",
+//              "string",
+//              "string",
+//              "datetime",
+//              "dynamic",
+//              "dynamic",
+//              "string",
+//              "string"
+//          ]
+//      }
+//  }
+//  Name: 
+//  Dimensions: 11 Fields by 1 Rows
+//  +----------------------------------+--------------------------------------+------------------------------------+------------------+-------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  | Name: traceID                    | Name: spanID                         | Name: parentSpanID                 | Name: duration   | Name: serviceName | Name: operationName                 | Name: startTime                   | Name: serviceTags                                                                                                                                                                                                                             | Name: tags                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Name: itemId                         | Name: itemType  |
+//  | Labels:                          | Labels:                              | Labels:                            | Labels:          | Labels:           | Labels:                             | Labels:                           | Labels:                                                                                                                                                                                                                                       | Labels:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Labels:                              | Labels:         |
+//  | Type: []*string                  | Type: []*string                      | Type: []*string                    | Type: []*float64 | Type: []*string   | Type: []*string                     | Type: []*time.Time                | Type: []*json.RawMessage                                                                                                                                                                                                                      | Type: []*json.RawMessage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | Type: []*string                      | Type: []*string |
+//  +----------------------------------+--------------------------------------+------------------------------------+------------------+-------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  | cfae497bfd7a44169f35643940820938 | b52403c5-5b27-43a8-9bc6-5938667a4470 | |cfae497bfd7a44169f35643940820938. | 0                |                   | GET /github/grafana/grafana/commits | 2023-04-17 14:58:10.176 +0000 UTC | [{"value":"5000","key":"limit"},{"value":"4351","key":"remaining"},{"value":"1681746512","key":"reset"},{"value":"github-test-data","key":"service"},{"value":"2023-04-17T14:58:10.0000000Z","key":"timestamp"},{"value":"649","key":"used"}] | [{"value":"4ad5a808-11f7-49d5-9713-f6ede83141e4","key":"appId"},{"value":"test-app","key":"appName"},{"value":"1.0.0","key":"application_Version"},{"value":"Dublin","key":"client_City"},{"value":"Ireland","key":"client_CountryOrRegion"},{"value":"0.0.0.0","key":"client_IP"},{"value":"Linux 5.4.0-1036-azure","key":"client_OS"},{"value":"Dublin","key":"client_StateOrProvince"},{"value":"PC","key":"client_Type"},{"value":"test-vm","key":"cloud_RoleInstance"},{"value":"Web","key":"cloud_RoleName"},{"value":{"limit":"5000","remaining":"4351","reset":"1681746512","service":"github-test-data","timestamp":"2023-04-17T14:58:10.0000000Z","used":"649"},"key":"customDimensions"},{"value":0,"key":"duration"},{"value":"195b4fe4-7b01-4814-abca-ffceb1f62c8f","key":"iKey"},{"value":1,"key":"itemCount"},{"value":"65863e6b-dd30-11ed-a808-002248268105","key":"itemId"},{"value":"trace","key":"itemType"},{"value":"github commits rate limiting info","key":"message"},{"value":"cfae497bfd7a44169f35643940820938","key":"operation_Id"},{"value":"GET /github/grafana/grafana/commits","key":"operation_Name"},{"value":"|cfae497bfd7a44169f35643940820938.","key":"operation_ParentId"},{"value":"node:1.8.9","key":"sdkVersion"},{"value":1,"key":"severityLevel"},{"value":"2023-04-17T14:58:10.1760000Z","key":"timestamp"}] | 65863e6b-dd30-11ed-a808-002248268105 | trace           |
+//  +----------------------------------+--------------------------------------+------------------------------------+------------------+-------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "string",
+              "string",
+              "string",
+              "real",
+              "string",
+              "string",
+              "datetime",
+              "dynamic",
+              "dynamic",
+              "string",
+              "string"
+            ]
+          }
+        },
+        "fields": [
+          {
+            "name": "traceID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "spanID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "parentSpanID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "duration",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "serviceName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "operationName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "startTime",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "serviceTags",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tags",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "itemId",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "itemType",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "cfae497bfd7a44169f35643940820938"
+          ],
+          [
+            "b52403c5-5b27-43a8-9bc6-5938667a4470"
+          ],
+          [
+            "|cfae497bfd7a44169f35643940820938."
+          ],
+          [
+            0
+          ],
+          [
+            ""
+          ],
+          [
+            "GET /github/grafana/grafana/commits"
+          ],
+          [
+            1681743490176
+          ],
+          [
+            [
+              {
+                "value": "5000",
+                "key": "limit"
+              },
+              {
+                "value": "4351",
+                "key": "remaining"
+              },
+              {
+                "value": "1681746512",
+                "key": "reset"
+              },
+              {
+                "value": "github-test-data",
+                "key": "service"
+              },
+              {
+                "value": "2023-04-17T14:58:10.0000000Z",
+                "key": "timestamp"
+              },
+              {
+                "value": "649",
+                "key": "used"
+              }
+            ]
+          ],
+          [
+            [
+              {
+                "value": "4ad5a808-11f7-49d5-9713-f6ede83141e4",
+                "key": "appId"
+              },
+              {
+                "value": "test-app",
+                "key": "appName"
+              },
+              {
+                "value": "1.0.0",
+                "key": "application_Version"
+              },
+              {
+                "value": "Dublin",
+                "key": "client_City"
+              },
+              {
+                "value": "Ireland",
+                "key": "client_CountryOrRegion"
+              },
+              {
+                "value": "0.0.0.0",
+                "key": "client_IP"
+              },
+              {
+                "value": "Linux 5.4.0-1036-azure",
+                "key": "client_OS"
+              },
+              {
+                "value": "Dublin",
+                "key": "client_StateOrProvince"
+              },
+              {
+                "value": "PC",
+                "key": "client_Type"
+              },
+              {
+                "value": "test-vm",
+                "key": "cloud_RoleInstance"
+              },
+              {
+                "value": "Web",
+                "key": "cloud_RoleName"
+              },
+              {
+                "value": {
+                  "limit": "5000",
+                  "remaining": "4351",
+                  "reset": "1681746512",
+                  "service": "github-test-data",
+                  "timestamp": "2023-04-17T14:58:10.0000000Z",
+                  "used": "649"
+                },
+                "key": "customDimensions"
+              },
+              {
+                "value": 0,
+                "key": "duration"
+              },
+              {
+                "value": "195b4fe4-7b01-4814-abca-ffceb1f62c8f",
+                "key": "iKey"
+              },
+              {
+                "value": 1,
+                "key": "itemCount"
+              },
+              {
+                "value": "65863e6b-dd30-11ed-a808-002248268105",
+                "key": "itemId"
+              },
+              {
+                "value": "trace",
+                "key": "itemType"
+              },
+              {
+                "value": "github commits rate limiting info",
+                "key": "message"
+              },
+              {
+                "value": "cfae497bfd7a44169f35643940820938",
+                "key": "operation_Id"
+              },
+              {
+                "value": "GET /github/grafana/grafana/commits",
+                "key": "operation_Name"
+              },
+              {
+                "value": "|cfae497bfd7a44169f35643940820938.",
+                "key": "operation_ParentId"
+              },
+              {
+                "value": "node:1.8.9",
+                "key": "sdkVersion"
+              },
+              {
+                "value": 1,
+                "key": "severityLevel"
+              },
+              {
+                "value": "2023-04-17T14:58:10.1760000Z",
+                "key": "timestamp"
+              }
+            ]
+          ],
+          [
+            "65863e6b-dd30-11ed-a808-002248268105"
+          ],
+          [
+            "trace"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json.single-trace.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json.single-trace.golden.jsonc
new file mode 100644
index 00000000000..9fd3477cb68
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/traces/2-traces-single-table.json.single-trace.golden.jsonc
@@ -0,0 +1,192 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "azureColumnTypes": [
+//              "string",
+//              "string",
+//              "string",
+//              "real",
+//              "string",
+//              "string",
+//              "datetime",
+//              "dynamic",
+//              "dynamic",
+//              "string",
+//              "string"
+//          ]
+//      }
+//  }
+//  Name: 
+//  Dimensions: 11 Fields by 1 Rows
+//  +----------------------------------+--------------------------------------+------------------------------------+------------------+-------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  | Name: traceID                    | Name: spanID                         | Name: parentSpanID                 | Name: duration   | Name: serviceName | Name: operationName                 | Name: startTime                   | Name: serviceTags                                                                                                                             | Name: tags                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Name: itemId                         | Name: itemType  |
+//  | Labels:                          | Labels:                              | Labels:                            | Labels:          | Labels:           | Labels:                             | Labels:                           | Labels:                                                                                                                                       | Labels:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Labels:                              | Labels:         |
+//  | Type: []*string                  | Type: []*string                      | Type: []*string                    | Type: []*float64 | Type: []*string   | Type: []*string                     | Type: []*time.Time                | Type: []*string                                                                                                                               | Type: []*string                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Type: []*string                      | Type: []*string |
+//  +----------------------------------+--------------------------------------+------------------------------------+------------------+-------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  | cfae497bfd7a44169f35643940820938 | b52403c5-5b27-43a8-9bc6-5938667a4470 | |cfae497bfd7a44169f35643940820938. | 0                |                   | GET /github/grafana/grafana/commits | 2023-04-17 14:58:10.176 +0000 UTC | {"service":"github-test-data","limit":"5000","remaining":"4351","reset":"1681746512","used":"649","timestamp":"2023-04-17T14:58:10.0000000Z"} | {"client_IP":"0.0.0.0","operation_Id":"cfae497bfd7a44169f35643940820938","duration":0,"iKey":"195b4fe4-7b01-4814-abca-ffceb1f62c8f","size":null,"sdkVersion":"node:1.8.9","name":"","client_Model":"","cloud_RoleName":"Web","customMeasurements":null,"client_Browser":"","operation_Name":"GET /github/grafana/grafana/commits","performanceBucket":"","client_CountryOrRegion":"Ireland","cloud_RoleInstance":"test-vm","appName":"test-app","client_Type":"PC","operation_ParentId":"|cfae497bfd7a44169f35643940820938.","success":"","application_Version":"1.0.0","operation_SyntheticSource":"","itemType":"trace","user_AccountId":"","session_Id":"","timestamp":"2023-04-17T14:58:10.1760000Z","message":"github commits rate limiting info","client_City":"Dublin","client_StateOrProvince":"Dublin","itemId":"65863e6b-dd30-11ed-a808-002248268105","client_OS":"Linux 5.4.0-1036-azure","id":"","customDimensions":{"service":"github-test-data","limit":"5000","remaining":"4351","reset":"1681746512","used":"649","timestamp":"2023-04-17T14:58:10.0000000Z"},"itemCount":1,"location":"","user_AuthenticatedId":"","appId":"4ad5a808-11f7-49d5-9713-f6ede83141e4","user_Id":"","resultCode":"","type":"","data":"","target":"","assembly":"","outerType":"","innermostAssembly":"","innermostType":"","method":"","problemId":"","handledAt":"","outerMessage":"","details":null,"innermostMethod":"","innermostMessage":"","outerAssembly":"","outerMethod":"","severityLevel":1,"url":"","source":""} | 65863e6b-dd30-11ed-a808-002248268105 | trace           |
+//  +----------------------------------+--------------------------------------+------------------------------------+------------------+-------------------+-------------------------------------+-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "azureColumnTypes": [
+              "string",
+              "string",
+              "string",
+              "real",
+              "string",
+              "string",
+              "datetime",
+              "dynamic",
+              "dynamic",
+              "string",
+              "string"
+            ]
+          }
+        },
+        "fields": [
+          {
+            "name": "traceID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "spanID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "parentSpanID",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "duration",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "serviceName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "operationName",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "startTime",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "serviceTags",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tags",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "itemId",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "itemType",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "cfae497bfd7a44169f35643940820938"
+          ],
+          [
+            "b52403c5-5b27-43a8-9bc6-5938667a4470"
+          ],
+          [
+            "|cfae497bfd7a44169f35643940820938."
+          ],
+          [
+            0
+          ],
+          [
+            ""
+          ],
+          [
+            "GET /github/grafana/grafana/commits"
+          ],
+          [
+            1681743490176
+          ],
+          [
+            "{\"service\":\"github-test-data\",\"limit\":\"5000\",\"remaining\":\"4351\",\"reset\":\"1681746512\",\"used\":\"649\",\"timestamp\":\"2023-04-17T14:58:10.0000000Z\"}"
+          ],
+          [
+            "{\"client_IP\":\"0.0.0.0\",\"operation_Id\":\"cfae497bfd7a44169f35643940820938\",\"duration\":0,\"iKey\":\"195b4fe4-7b01-4814-abca-ffceb1f62c8f\",\"size\":null,\"sdkVersion\":\"node:1.8.9\",\"name\":\"\",\"client_Model\":\"\",\"cloud_RoleName\":\"Web\",\"customMeasurements\":null,\"client_Browser\":\"\",\"operation_Name\":\"GET /github/grafana/grafana/commits\",\"performanceBucket\":\"\",\"client_CountryOrRegion\":\"Ireland\",\"cloud_RoleInstance\":\"test-vm\",\"appName\":\"test-app\",\"client_Type\":\"PC\",\"operation_ParentId\":\"|cfae497bfd7a44169f35643940820938.\",\"success\":\"\",\"application_Version\":\"1.0.0\",\"operation_SyntheticSource\":\"\",\"itemType\":\"trace\",\"user_AccountId\":\"\",\"session_Id\":\"\",\"timestamp\":\"2023-04-17T14:58:10.1760000Z\",\"message\":\"github commits rate limiting info\",\"client_City\":\"Dublin\",\"client_StateOrProvince\":\"Dublin\",\"itemId\":\"65863e6b-dd30-11ed-a808-002248268105\",\"client_OS\":\"Linux 5.4.0-1036-azure\",\"id\":\"\",\"customDimensions\":{\"service\":\"github-test-data\",\"limit\":\"5000\",\"remaining\":\"4351\",\"reset\":\"1681746512\",\"used\":\"649\",\"timestamp\":\"2023-04-17T14:58:10.0000000Z\"},\"itemCount\":1,\"location\":\"\",\"user_AuthenticatedId\":\"\",\"appId\":\"4ad5a808-11f7-49d5-9713-f6ede83141e4\",\"user_Id\":\"\",\"resultCode\":\"\",\"type\":\"\",\"data\":\"\",\"target\":\"\",\"assembly\":\"\",\"outerType\":\"\",\"innermostAssembly\":\"\",\"innermostType\":\"\",\"method\":\"\",\"problemId\":\"\",\"handledAt\":\"\",\"outerMessage\":\"\",\"details\":null,\"innermostMethod\":\"\",\"innermostMessage\":\"\",\"outerAssembly\":\"\",\"outerMethod\":\"\",\"severityLevel\":1,\"url\":\"\",\"source\":\"\"}"
+          ],
+          [
+            "65863e6b-dd30-11ed-a808-002248268105"
+          ],
+          [
+            "trace"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/utils.go b/pkg/tsdb/azuremonitor/testdata/utils.go
new file mode 100644
index 00000000000..96820c18dd2
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/testdata/utils.go
@@ -0,0 +1,29 @@
+package testdata
+
+import (
+	"fmt"
+	"path/filepath"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental"
+)
+
+func CheckGoldenFrame(t *testing.T, path string, name string, f *data.Frame) {
+	frames := data.Frames{f}
+	if f == nil {
+		frames = nil
+	}
+	dr := backend.DataResponse{
+		Frames: frames,
+	}
+	experimental.CheckGoldenJSONResponse(t, filepath.Join(path), fmt.Sprintf("%s.golden", name), &dr, true)
+}
+
+func CheckGoldenFrames(t *testing.T, path string, name string, f data.Frames) {
+	dr := backend.DataResponse{
+		Frames: f,
+	}
+	experimental.CheckGoldenJSONResponse(t, filepath.Join(path), fmt.Sprintf("%s.golden", name), &dr, true)
+}
diff --git a/pkg/tsdb/azuremonitor/types/types.go b/pkg/tsdb/azuremonitor/types/types.go
index 73fc3160a34..ab063400b99 100644
--- a/pkg/tsdb/azuremonitor/types/types.go
+++ b/pkg/tsdb/azuremonitor/types/types.go
@@ -11,10 +11,13 @@ import (
 
 	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
 )
 
 const (
 	TimeSeries = "time_series"
+	Table      = "table"
+	Trace      = "trace"
 )
 
 var (
@@ -54,6 +57,9 @@ type DatasourceInfo struct {
 	DecryptedSecureJSONData map[string]string
 	DatasourceID            int64
 	OrgID                   int64
+
+	DatasourceName string
+	DatasourceUID  string
 }
 
 // AzureMonitorQuery is the query for all the services as they have similar queries
@@ -183,6 +189,7 @@ type LogJSONQuery struct {
 		Query        string   `json:"query"`
 		ResultFormat string   `json:"resultFormat"`
 		Resources    []string `json:"resources"`
+		OperationId  string   `json:"operationId"`
 
 		// Deprecated: Queries should be migrated to use Resource instead
 		Workspace string `json:"workspace"`
@@ -191,6 +198,39 @@ type LogJSONQuery struct {
 	} `json:"azureLogAnalytics"`
 }
 
+type TracesJSONQuery struct {
+	AzureTraces struct {
+		// Filters for property values.
+		Filters []TracesFilters `json:"filters"`
+
+		// Operation ID. Used only for Traces queries.
+		OperationId *string `json:"operationId"`
+
+		// KQL query to be executed.
+		Query *string `json:"query"`
+
+		// Array of resource URIs to be queried.
+		Resources []string `json:"resources"`
+
+		// Specifies the format results should be returned as.
+		ResultFormat *dataquery.AzureMonitorQueryAzureTracesResultFormat `json:"resultFormat"`
+
+		// Types of events to filter by.
+		TraceTypes []string `json:"traceTypes"`
+	} `json:"azureTraces"`
+}
+
+type TracesFilters struct {
+	// Values to filter by.
+	Filters []string `json:"filters"`
+
+	// Comparison operator to use. Either equals or not equals.
+	Operation string `json:"operation"`
+
+	// Property name, auto-populated based on available traces.
+	Property string `json:"property"`
+}
+
 // MetricChartDefinition is the JSON model for a metrics chart definition
 type MetricChartDefinition struct {
 	ResourceMetadata    map[string]string   `json:"resourceMetadata"`
diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts b/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts
index da450501276..48864ab66b4 100644
--- a/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts
@@ -1,8 +1,13 @@
+import { ContextSrv } from 'app/core/services/context_srv';
+import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
+
 import Datasource from '../datasource';
 
 type DeepPartial<T> = {
   [P in keyof T]?: DeepPartial<T[P]>;
 };
+const contextSrv = new ContextSrv();
+const timeSrv = new TimeSrv(contextSrv);
 
 export default function createMockDatasource(overrides?: DeepPartial<Datasource>) {
   // We make this a partial so we get _some_ kind of type safety when making this, rather than
@@ -46,6 +51,7 @@ export default function createMockDatasource(overrides?: DeepPartial<Datasource>
     azureLogAnalyticsDatasource: {
       getKustoSchema: () => Promise.resolve(),
       getDeprecatedDefaultWorkSpace: () => 'defaultWorkspaceId',
+      timeSrv,
     },
     resourcePickerData: {
       getSubscriptions: () => jest.fn().mockResolvedValue([]),
diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/query.ts b/public/app/plugins/datasource/azuremonitor/__mocks__/query.ts
index aabc97f3d2b..b5f19425316 100644
--- a/public/app/plugins/datasource/azuremonitor/__mocks__/query.ts
+++ b/public/app/plugins/datasource/azuremonitor/__mocks__/query.ts
@@ -27,6 +27,16 @@ export default function createMockQuery(overrides?: Partial<AzureMonitorQuery>):
       ...overrides?.azureResourceGraph,
     },
 
+    azureTraces: {
+      query: 'example traces query',
+      resultFormat: ResultFormat.Trace,
+      resources: ['test-resource'],
+      operationId: 'operationId',
+      traceTypes: ['traces'],
+      filters: [{ filters: ['filter'], operation: 'eq', property: 'property' }],
+      ...overrides?.azureTraces,
+    },
+
     azureMonitor: {
       // aggOptions: [],
       aggregation: 'Average',
diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts b/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts
index 18f7ca495aa..3de04fd222d 100644
--- a/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts
+++ b/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts
@@ -88,7 +88,6 @@ export const mockResourcesByResourceGroup = (): ResourceRowGroup => [
     type: ResourceRowType.Resource,
     location: 'northeurope',
   },
-
   {
     id: 'db-server',
     uri: '/subscriptions/def-456/resourceGroups/dev-3/providers/Microsoft.Compute/virtualMachines/db-server',
@@ -106,6 +105,22 @@ export const mockResourcesByResourceGroup = (): ResourceRowGroup => [
     type: ResourceRowType.Resource,
     location: 'northeurope',
   },
+  {
+    id: 'app-insights-1',
+    uri: '/subscriptions/def-456/resourceGroups/dev-3/providers/microsoft.insights/components/app-insights-1',
+    name: 'app-insights-1',
+    typeLabel: 'Microsoft.Insights/components',
+    type: ResourceRowType.Resource,
+    location: 'northeurope',
+  },
+  {
+    id: 'app-insights-2',
+    uri: '/subscriptions/def-456/resourceGroups/dev-3/providers/microsoft.insights/components/app-insights-2',
+    name: 'app-insights-2',
+    typeLabel: 'Microsoft.Insights/components',
+    type: ResourceRowType.Resource,
+    location: 'northeurope',
+  },
 ];
 
 export const mockSearchResults = (): ResourceRowGroup => [
diff --git a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts
index eab35ea8941..135e999dbbe 100644
--- a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts
@@ -5,7 +5,7 @@ import createMockQuery from '../__mocks__/query';
 import { createTemplateVariables } from '../__mocks__/utils';
 import { singleVariable } from '../__mocks__/variables';
 import AzureMonitorDatasource from '../datasource';
-import { AzureMonitorQuery, AzureQueryType } from '../types';
+import { AzureLogsQuery, AzureMonitorQuery, AzureQueryType, AzureTracesQuery } from '../types';
 
 import FakeSchemaData from './__mocks__/schema';
 import AzureLogAnalyticsDatasource from './azure_log_analytics_datasource';
@@ -330,6 +330,17 @@ describe('AzureLogAnalyticsDatasource', () => {
 
       expect(laDatasource.filterQuery(query)).toBeFalsy();
     });
+
+    it('should not run traces queries missing a resource', () => {
+      const query: AzureMonitorQuery = {
+        refId: 'A',
+        azureTraces: {
+          resources: [],
+        },
+      };
+
+      expect(laDatasource.filterQuery(query)).toBeFalsy();
+    });
   });
 
   describe('When performing interpolateVariablesInQueries for azure_log_analytics', () => {
@@ -344,12 +355,12 @@ describe('AzureLogAnalyticsDatasource', () => {
       expect(templatedQuery[0]).toEqual(query);
     });
 
-    it('should return a query with any template variables replaced', () => {
+    it('should return a logs query with any template variables replaced', () => {
       const templateableProps = ['resource', 'workspace', 'query'];
       const templateVariables = createTemplateVariables(templateableProps);
       templateSrv.init(Array.from(templateVariables.values()).map((item) => item.templateVariable));
       const query = createMockQuery();
-      const azureLogAnalytics: { [index: string]: any } = {};
+      const azureLogAnalytics: Partial<AzureLogsQuery> = {};
       azureLogAnalytics.query = '$query';
       azureLogAnalytics.workspace = '$workspace';
       azureLogAnalytics.resources = ['$resource'];
@@ -366,5 +377,39 @@ describe('AzureLogAnalyticsDatasource', () => {
         resources: [templateVariables.get('resource')?.templateVariable.current.value],
       });
     });
+
+    it('should return a traces query with any template variables replaced', () => {
+      const templateableProps = ['resource', 'query', 'traceTypes', 'property', 'operation', 'filter', 'operationId'];
+      const templateVariables = createTemplateVariables(templateableProps);
+      templateSrv.init(Array.from(templateVariables.values()).map((item) => item.templateVariable));
+      const query = createMockQuery();
+      const azureTraces: Partial<AzureTracesQuery> = {};
+      azureTraces.resources = ['$resource'];
+      azureTraces.query = '$query';
+      azureTraces.traceTypes = ['$traceTypes'];
+      azureTraces.filters = [{ filters: ['$filter'], operation: 'eq', property: '$property' }];
+      azureTraces.operationId = '$operationId';
+      query.queryType = AzureQueryType.AzureTraces;
+      query.azureTraces = {
+        ...query.azureTraces,
+        ...azureTraces,
+      };
+
+      const templatedQuery = ctx.ds.interpolateVariablesInQueries([query], {});
+      expect(templatedQuery[0]).toHaveProperty('datasource');
+      expect(templatedQuery[0].azureTraces).toMatchObject({
+        query: templateVariables.get('query')?.templateVariable.current.value,
+        resources: [templateVariables.get('resource')?.templateVariable.current.value],
+        operationId: templateVariables.get('operationId')?.templateVariable.current.value,
+        traceTypes: [templateVariables.get('traceTypes')?.templateVariable.current.value],
+        filters: [
+          {
+            filters: [templateVariables.get('filter')?.templateVariable.current.value],
+            operation: 'eq',
+            property: templateVariables.get('property')?.templateVariable.current.value,
+          },
+        ],
+      });
+    });
   });
 });
diff --git a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts
index b98f18e0ddf..53ee7b8a7a6 100644
--- a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts
@@ -2,6 +2,7 @@ import { map } from 'lodash';
 
 import { DataSourceInstanceSettings, DataSourceRef, ScopedVars } from '@grafana/data';
 import { DataSourceWithBackend, getTemplateSrv } from '@grafana/runtime';
+import { TimeSrv, getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
 import { isGUIDish } from '../components/ResourcePicker/utils';
 import { getAuthType, getAzureCloud, getAzurePortalUrl } from '../credentials';
@@ -36,6 +37,8 @@ export default class AzureLogAnalyticsDatasource extends DataSourceWithBackend<
   azureMonitorPath: string;
   firstWorkspace?: string;
 
+  readonly timeSrv: TimeSrv = getTimeSrv();
+
   constructor(private instanceSettings: DataSourceInstanceSettings<AzureDataSourceJsonData>) {
     super(instanceSettings);
 
@@ -55,8 +58,9 @@ export default class AzureLogAnalyticsDatasource extends DataSourceWithBackend<
   filterQuery(item: AzureMonitorQuery): boolean {
     return (
       item.hide !== true &&
-      !!item.azureLogAnalytics?.query &&
-      (!!item.azureLogAnalytics.resources?.length || !!item.azureLogAnalytics.workspace)
+      ((!!item.azureLogAnalytics?.query &&
+        (!!item.azureLogAnalytics.resources?.length || !!item.azureLogAnalytics.workspace)) ||
+        !!item.azureTraces?.resources?.length)
     );
   }
 
@@ -108,34 +112,66 @@ export default class AzureLogAnalyticsDatasource extends DataSourceWithBackend<
   }
 
   applyTemplateVariables(target: AzureMonitorQuery, scopedVars: ScopedVars): AzureMonitorQuery {
-    const item = target.azureLogAnalytics;
-    if (!item) {
-      return target;
+    let item;
+    if (target.queryType === AzureQueryType.LogAnalytics && target.azureLogAnalytics) {
+      item = target.azureLogAnalytics;
+      const templateSrv = getTemplateSrv();
+      const resources = item.resources?.map((r) => templateSrv.replace(r, scopedVars));
+      let workspace = templateSrv.replace(item.workspace, scopedVars);
+
+      if (!workspace && !resources && this.firstWorkspace) {
+        workspace = this.firstWorkspace;
+      }
+
+      const query = templateSrv.replace(item.query, scopedVars, interpolateVariable);
+
+      return {
+        ...target,
+        queryType: target.queryType || AzureQueryType.LogAnalytics,
+
+        azureLogAnalytics: {
+          resultFormat: item.resultFormat,
+          query,
+          resources,
+          // Workspace was removed in Grafana 8, but remains for backwards compat
+          workspace,
+        },
+      };
     }
 
-    const templateSrv = getTemplateSrv();
-    const resources = item.resources?.map((r) => templateSrv.replace(r, scopedVars));
-    let workspace = templateSrv.replace(item.workspace, scopedVars);
+    if (target.queryType === AzureQueryType.AzureTraces && target.azureTraces) {
+      item = target.azureTraces;
+      const templateSrv = getTemplateSrv();
+      const resources = item.resources?.map((r) => templateSrv.replace(r, scopedVars));
+      const query = templateSrv.replace(item.query, scopedVars, interpolateVariable);
+      const traceTypes = item.traceTypes?.map((t) => templateSrv.replace(t, scopedVars));
+      const filters = (item.filters ?? [])
+        .filter((f) => !!f.property)
+        .map((f) => {
+          const filtersReplaced = f.filters?.map((filter) => templateSrv.replace(filter ?? '', scopedVars));
+          return {
+            property: templateSrv.replace(f.property, scopedVars),
+            operation: f.operation || 'eq',
+            filters: filtersReplaced || [],
+          };
+        });
 
-    if (!workspace && !resources && this.firstWorkspace) {
-      workspace = this.firstWorkspace;
+      return {
+        ...target,
+        queryType: target.queryType || AzureQueryType.AzureTraces,
+
+        azureTraces: {
+          resultFormat: item.resultFormat,
+          query,
+          resources,
+          operationId: templateSrv.replace(target.azureTraces?.operationId, scopedVars),
+          filters,
+          traceTypes,
+        },
+      };
     }
 
-    const query = templateSrv.replace(item.query, scopedVars, interpolateVariable);
-
-    return {
-      ...target,
-      queryType: AzureQueryType.LogAnalytics,
-
-      azureLogAnalytics: {
-        resultFormat: item.resultFormat,
-        query,
-        resources,
-
-        // Workspace was removed in Grafana 8, but remains for backwards compat
-        workspace,
-      },
-    };
+    return target;
   }
 
   /*
diff --git a/public/app/plugins/datasource/azuremonitor/components/FormatAsField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/FormatAsField.test.tsx
new file mode 100644
index 00000000000..944643e46a5
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/FormatAsField.test.tsx
@@ -0,0 +1,73 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import createMockDatasource from '../__mocks__/datasource';
+import createMockQuery from '../__mocks__/query';
+import { ResultFormat } from '../types';
+
+import FormatAsField from './FormatAsField';
+import { setFormatAs } from './TracesQueryEditor/setQueryValue';
+
+const options = [
+  { label: 'Table', value: ResultFormat.Table },
+  { label: 'Trace', value: ResultFormat.Trace },
+  { label: 'Time Series', value: ResultFormat.TimeSeries },
+];
+
+const props = {
+  query: createMockQuery(),
+  datasource: createMockDatasource(),
+  variableOptionGroup: { label: 'Templates', options: [] },
+  onQueryChange: jest.fn(),
+  setError: jest.fn(),
+  isLoading: false,
+  inputId: 'input-id',
+  options,
+  defaultValue: ResultFormat.Table,
+  setFormatAs,
+  resultFormat: undefined,
+};
+
+describe('FormatAsField', () => {
+  it('should render the current value', async () => {
+    const query = {
+      ...props.query,
+      azureTraces: {
+        resultFormat: ResultFormat.Trace,
+      },
+    };
+    render(<FormatAsField {...props} resultFormat={query.azureTraces.resultFormat} query={query} />);
+    expect(screen.getByText('Trace')).toBeInTheDocument();
+  });
+
+  it('should render the default value if selected is not in list of options', async () => {
+    const query = {
+      ...props.query,
+      azureTraces: {
+        resultFormat: ResultFormat.Trace,
+      },
+    };
+
+    const shortOptions = options.slice(0, 1);
+
+    const { rerender } = render(
+      <FormatAsField {...props} resultFormat={query.azureTraces.resultFormat} options={shortOptions} query={query} />
+    );
+
+    const newQuery = {
+      ...query,
+      azureTraces: { ...query.azureTraces, resultFormat: props.defaultValue },
+    };
+    expect(props.onQueryChange).toHaveBeenCalledWith(newQuery);
+    rerender(
+      <FormatAsField
+        {...props}
+        resultFormat={newQuery.azureTraces.resultFormat}
+        options={shortOptions}
+        query={newQuery}
+      />
+    );
+    expect(screen.getByText('Table')).toBeInTheDocument();
+    expect(screen.queryByText('Trace')).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/plugins/datasource/azuremonitor/components/FormatAsField.tsx b/public/app/plugins/datasource/azuremonitor/components/FormatAsField.tsx
new file mode 100644
index 00000000000..884edb0ec0b
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/FormatAsField.tsx
@@ -0,0 +1,60 @@
+import React, { useCallback, useMemo } from 'react';
+import { useEffectOnce } from 'react-use';
+
+import { SelectableValue } from '@grafana/data';
+import { Select } from '@grafana/ui';
+
+import { selectors } from '../e2e/selectors';
+import { FormatAsFieldProps, ResultFormat } from '../types';
+
+import { Field } from './Field';
+
+const FormatAsField = ({
+  query,
+  variableOptionGroup,
+  onQueryChange,
+  inputId,
+  options: formatOptions,
+  defaultValue,
+  setFormatAs,
+  resultFormat,
+}: FormatAsFieldProps) => {
+  const options = useMemo(() => [...formatOptions, variableOptionGroup], [variableOptionGroup, formatOptions]);
+
+  const handleChange = useCallback(
+    (change: SelectableValue<ResultFormat>) => {
+      const { value } = change;
+      if (!value) {
+        return;
+      }
+
+      const newQuery = setFormatAs(query, value);
+      onQueryChange(newQuery);
+    },
+    [onQueryChange, query, setFormatAs]
+  );
+
+  useEffectOnce(() => {
+    if (!resultFormat) {
+      handleChange({ value: defaultValue });
+    } else {
+      if (!formatOptions.find((item) => item.value === resultFormat)) {
+        handleChange({ value: defaultValue });
+      }
+    }
+  });
+
+  return (
+    <Field label="Format as" data-testid={selectors.components.queryEditor.logsQueryEditor.formatSelection.input}>
+      <Select
+        inputId={`${inputId}-format-as-field`}
+        value={resultFormat ?? defaultValue}
+        onChange={handleChange}
+        options={options}
+        width={38}
+      />
+    </Field>
+  );
+};
+
+export default FormatAsField;
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/FormatAsField.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/FormatAsField.tsx
deleted file mode 100644
index 6796da57671..00000000000
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/FormatAsField.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { useCallback, useMemo } from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { Select } from '@grafana/ui';
-
-import { selectors } from '../../e2e/selectors';
-import { AzureQueryEditorFieldProps, ResultFormat } from '../../types';
-import { Field } from '../Field';
-
-import { setFormatAs } from './setQueryValue';
-
-const FORMAT_OPTIONS: Array<SelectableValue<ResultFormat>> = [
-  { label: 'Time series', value: ResultFormat.TimeSeries },
-  { label: 'Table', value: ResultFormat.Table },
-];
-
-const FormatAsField = ({ query, variableOptionGroup, onQueryChange }: AzureQueryEditorFieldProps) => {
-  const options = useMemo(() => [...FORMAT_OPTIONS, variableOptionGroup], [variableOptionGroup]);
-
-  const handleChange = useCallback(
-    (change: SelectableValue<ResultFormat>) => {
-      const { value } = change;
-      if (!value) {
-        return;
-      }
-
-      const newQuery = setFormatAs(query, value);
-      onQueryChange(newQuery);
-    },
-    [onQueryChange, query]
-  );
-
-  return (
-    <Field label="Format as" data-testid={selectors.components.queryEditor.logsQueryEditor.formatSelection.input}>
-      <Select
-        inputId="azure-monitor-logs-workspaces-field"
-        value={query.azureLogAnalytics?.resultFormat}
-        onChange={handleChange}
-        options={options}
-        width={38}
-      />
-    </Field>
-  );
-};
-
-export default FormatAsField;
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx
index ee24b71b71e..0dc882bf9fa 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx
@@ -170,7 +170,7 @@ describe('LogsQueryEditor', () => {
     await userEvent.click(advancedSection);
 
     const advancedInput = await screen.findByTestId('input-advanced-resource-picker-1');
-    // const advancedInput = await screen.findByLabelText('Resource URI(s)');
+
     await userEvent.type(advancedInput, '/subscriptions/def-123');
 
     const applyButton = screen.getByRole('button', { name: 'Apply' });
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
index 4152dd37968..f967a0d8daa 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
@@ -4,14 +4,16 @@ import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/experimental';
 import { Alert } from '@grafana/ui';
 
 import Datasource from '../../datasource';
-import { AzureMonitorErrorish, AzureMonitorOption, AzureMonitorQuery } from '../../types';
+import { selectors } from '../../e2e/selectors';
+import { AzureMonitorErrorish, AzureMonitorOption, AzureMonitorQuery, ResultFormat } from '../../types';
+import FormatAsField from '../FormatAsField';
 import ResourceField from '../ResourceField';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
 import { parseResourceDetails } from '../ResourcePicker/utils';
 
 import AdvancedResourcePicker from './AdvancedResourcePicker';
-import FormatAsField from './FormatAsField';
 import QueryField from './QueryField';
+import { setFormatAs } from './setQueryValue';
 import useMigrations from './useMigrations';
 
 interface LogsQueryEditorProps {
@@ -49,7 +51,7 @@ const LogsQueryEditor = ({
   };
 
   return (
-    <span data-testid="azure-monitor-logs-query-editor-with-experimental-ui">
+    <span data-testid={selectors.components.queryEditor.logsQueryEditor.container.input}>
       <EditorRows>
         <EditorRow>
           <EditorFieldGroup>
@@ -99,6 +101,14 @@ const LogsQueryEditor = ({
                 variableOptionGroup={variableOptionGroup}
                 onQueryChange={onChange}
                 setError={setError}
+                inputId={'azure-monitor-logs'}
+                options={[
+                  { label: 'Time series', value: ResultFormat.TimeSeries },
+                  { label: 'Table', value: ResultFormat.Table },
+                ]}
+                defaultValue={ResultFormat.Table}
+                setFormatAs={setFormatAs}
+                resultFormat={query.azureLogAnalytics?.resultFormat}
               />
             )}
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
index eb786c5f209..d59a147e4e6 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
@@ -13,6 +13,7 @@ import {
   mockGetValidLocations,
   mockResourcesByResourceGroup,
 } from '../../__mocks__/resourcePickerRows';
+import { selectors } from '../../e2e/selectors';
 import ResourcePickerData from '../../resourcePicker/resourcePickerData';
 
 import MetricsQueryEditor from './MetricsQueryEditor';
@@ -74,7 +75,9 @@ describe('MetricsQueryEditor', () => {
       />
     );
 
-    expect(await screen.findByTestId('azure-monitor-metrics-query-editor-with-experimental-ui')).toBeInTheDocument();
+    expect(
+      await screen.findByTestId(selectors.components.queryEditor.metricsQueryEditor.container.input)
+    ).toBeInTheDocument();
   });
 
   it('should show the current resource in the ResourcePicker', async () => {
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.tsx
index e86238655cb..e4dc2e2fed1 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.tsx
@@ -5,6 +5,7 @@ import { EditorRows, EditorRow, EditorFieldGroup } from '@grafana/experimental';
 
 import { multiResourceCompatibleTypes } from '../../azureMetadata';
 import type Datasource from '../../datasource';
+import { selectors } from '../../e2e/selectors';
 import type { AzureMonitorQuery, AzureMonitorOption, AzureMonitorErrorish, AzureMonitorResource } from '../../types';
 import ResourceField from '../ResourceField';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
@@ -85,7 +86,7 @@ const MetricsQueryEditor = ({
   };
 
   return (
-    <span data-testid="azure-monitor-metrics-query-editor-with-experimental-ui">
+    <span data-testid={selectors.components.queryEditor.metricsQueryEditor.container.input}>
       <EditorRows>
         <EditorRow>
           <EditorFieldGroup>
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
index 4127b87ba20..74ec7c498d9 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
@@ -7,6 +7,7 @@ import * as ui from '@grafana/ui';
 import createMockDatasource from '../../__mocks__/datasource';
 import { invalidNamespaceError } from '../../__mocks__/errors';
 import createMockQuery from '../../__mocks__/query';
+import { selectors } from '../../e2e/selectors';
 import { AzureQueryType } from '../../types';
 
 import QueryEditor from './QueryEditor';
@@ -29,7 +30,9 @@ describe('Azure Monitor QueryEditor', () => {
 
     render(<QueryEditor query={mockQuery} datasource={mockDatasource} onChange={() => {}} onRunQuery={() => {}} />);
     await waitFor(() =>
-      expect(screen.getByTestId('azure-monitor-metrics-query-editor-with-experimental-ui')).toBeInTheDocument()
+      expect(
+        screen.getByTestId(selectors.components.queryEditor.metricsQueryEditor.container.input)
+      ).toBeInTheDocument()
     );
   });
 
@@ -42,7 +45,35 @@ describe('Azure Monitor QueryEditor', () => {
 
     render(<QueryEditor query={mockQuery} datasource={mockDatasource} onChange={() => {}} onRunQuery={() => {}} />);
     await waitFor(() =>
-      expect(screen.queryByTestId('azure-monitor-logs-query-editor-with-experimental-ui')).toBeInTheDocument()
+      expect(screen.queryByTestId(selectors.components.queryEditor.logsQueryEditor.container.input)).toBeInTheDocument()
+    );
+  });
+
+  it('renders the ARG query editor when the query type is ARG', async () => {
+    const mockDatasource = createMockDatasource();
+    const mockQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.AzureResourceGraph,
+    };
+
+    render(<QueryEditor query={mockQuery} datasource={mockDatasource} onChange={() => {}} onRunQuery={() => {}} />);
+    await waitFor(() =>
+      expect(screen.queryByTestId(selectors.components.queryEditor.argsQueryEditor.container.input)).toBeInTheDocument()
+    );
+  });
+
+  it('renders the Traces query editor when the query type is Traces', async () => {
+    const mockDatasource = createMockDatasource();
+    const mockQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.AzureTraces,
+    };
+
+    render(<QueryEditor query={mockQuery} datasource={mockDatasource} onChange={() => {}} onRunQuery={() => {}} />);
+    await waitFor(() =>
+      expect(
+        screen.queryByTestId(selectors.components.queryEditor.tracesQueryEditor.container.input)
+      ).toBeInTheDocument()
     );
   });
 
@@ -69,7 +100,9 @@ describe('Azure Monitor QueryEditor', () => {
       <QueryEditor query={createMockQuery()} datasource={mockDatasource} onChange={() => {}} onRunQuery={() => {}} />
     );
     await waitFor(() =>
-      expect(screen.getByTestId('azure-monitor-metrics-query-editor-with-experimental-ui')).toBeInTheDocument()
+      expect(
+        screen.getByTestId(selectors.components.queryEditor.metricsQueryEditor.container.input)
+      ).toBeInTheDocument()
     );
     expect(screen.getByText('An error occurred while requesting metadata from Azure Monitor')).toBeInTheDocument();
   });
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
index 1dcbab5b1a7..9ac7201c0c7 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
@@ -18,6 +18,7 @@ import LogsQueryEditor from '../LogsQueryEditor';
 import NewMetricsQueryEditor from '../MetricsQueryEditor/MetricsQueryEditor';
 import { QueryHeader } from '../QueryHeader';
 import { Space } from '../Space';
+import TracesQueryEditor from '../TracesQueryEditor';
 
 import usePreparedQuery from './usePreparedQuery';
 
@@ -131,6 +132,18 @@ const EditorForQueryType = ({
         />
       );
 
+    case AzureQueryType.AzureTraces:
+      return (
+        <TracesQueryEditor
+          subscriptionId={subscriptionId}
+          query={query}
+          datasource={datasource}
+          onChange={onChange}
+          variableOptionGroup={variableOptionGroup}
+          setError={setError}
+        />
+      );
+
     default:
       const type = query.queryType as unknown;
       return (
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx
index 77d5b5490ab..3a3c77c81ea 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx
@@ -15,6 +15,7 @@ export const QueryHeader = ({ query, onQueryChange }: QueryTypeFieldProps) => {
   const queryTypes: Array<{ value: AzureQueryType; label: string }> = [
     { value: AzureQueryType.AzureMonitor, label: 'Metrics' },
     { value: AzureQueryType.LogAnalytics, label: 'Logs' },
+    { value: AzureQueryType.AzureTraces, label: 'Traces' },
     { value: AzureQueryType.AzureResourceGraph, label: 'Azure Resource Graph' },
   ];
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.test.ts b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.test.ts
index c6b32fb71eb..119e9625bba 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.test.ts
@@ -198,12 +198,24 @@ describe('AzureMonitor ResourcePicker utils', () => {
       });
     });
 
-    it('ignores an empty resource URI', () => {
+    it('updates a resource with a resource URI for Traces', () => {
+      expect(setResources(createMockQuery(), 'traces', ['/subscription/sub'])).toMatchObject({
+        azureTraces: { resources: ['/subscription/sub'] },
+      });
+    });
+
+    it('ignores an empty logs resource URI', () => {
       expect(setResources(createMockQuery(), 'logs', ['/subscription/sub', ''])).toMatchObject({
         azureLogAnalytics: { resources: ['/subscription/sub'] },
       });
     });
 
+    it('ignores an empty traces resource URI', () => {
+      expect(setResources(createMockQuery(), 'traces', ['/subscription/sub', ''])).toMatchObject({
+        azureTraces: { resources: ['/subscription/sub'] },
+      });
+    });
+
     it('updates a resource with a resource parameters for Metrics', () => {
       expect(
         setResources(createMockQuery(), 'metrics', [
diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.ts b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.ts
index 35c834324f7..33e02b5cef8 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.ts
+++ b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.ts
@@ -169,6 +169,17 @@ export function setResources(
       },
     };
   }
+  if (type === 'traces') {
+    // Resource URI for Traces
+    return {
+      ...query,
+      azureTraces: {
+        ...query.azureTraces,
+        resources: resourcesToStrings(resources).filter((resource) => resource !== ''),
+      },
+    };
+  }
+
   // Resource object for metrics
   const parsedResource = resources.length ? parseResourceDetails(resources[0]) : {};
   return {
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx
new file mode 100644
index 00000000000..daca2da1125
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx
@@ -0,0 +1,278 @@
+import { cx } from '@emotion/css';
+import React, { RefCallback, SyntheticEvent, useState } from 'react';
+import { lastValueFrom } from 'rxjs';
+
+import { CoreApp, DataFrame, SelectableValue, TimeRange } from '@grafana/data';
+import { AccessoryButton } from '@grafana/experimental';
+import {
+  HorizontalGroup,
+  Select,
+  ButtonSelect,
+  AsyncMultiSelect,
+  getSelectStyles,
+  useTheme2,
+  Checkbox,
+} from '@grafana/ui';
+
+import { AzureMonitorQuery, AzureQueryType, AzureTracesFilter } from '../../dataquery.gen';
+import Datasource from '../../datasource';
+import { VariableOptionGroup } from '../../types';
+import { addValueToOptions } from '../../utils/common';
+
+export interface FilterProps {
+  query: AzureMonitorQuery;
+  datasource: Datasource;
+  propertyMap: Map<string, SelectableValue[]>;
+  setPropertyMap: React.Dispatch<React.SetStateAction<Map<string, Array<SelectableValue<string>>>>>;
+  timeRange: TimeRange;
+  queryTraceTypes: string[];
+  properties: string[];
+  variableOptionGroup: VariableOptionGroup;
+}
+
+const onFieldChange = <Key extends keyof AzureTracesFilter>(
+  fieldName: Key,
+  item: Partial<AzureTracesFilter>,
+  selected: SelectableValue<AzureTracesFilter[Key]>,
+  onChange: (item: Partial<AzureTracesFilter>) => void
+) => {
+  if (fieldName === 'filters') {
+    item[fieldName] = selected.map((item: SelectableValue<string>) => item.value);
+  } else {
+    item[fieldName] = selected.value;
+    if (fieldName === 'property') {
+      item.filters = [];
+    }
+  }
+  onChange(item);
+};
+
+const getTraceProperties = async (
+  query: AzureMonitorQuery,
+  datasource: Datasource,
+  timeRange: TimeRange,
+  traceTypes: string[],
+  propertyMap: Map<string, SelectableValue[]>,
+  setPropertyMap: React.Dispatch<React.SetStateAction<Map<string, Array<SelectableValue<string>>>>>,
+  filter?: Partial<AzureTracesFilter>
+): Promise<SelectableValue[]> => {
+  const { azureTraces } = query;
+  if (!azureTraces) {
+    return [];
+  }
+
+  const { resources } = azureTraces;
+
+  if (!resources || !filter) {
+    return [];
+  }
+
+  const property = filter.property;
+  if (!property) {
+    return [];
+  }
+
+  const queryString = `let ${property} = toscalar(union isfuzzy=true ${traceTypes.join(',')}
+  | where $__timeFilter(timestamp)
+  | summarize count=count() by ${property}
+  | summarize make_list(pack_all()));
+  print properties = bag_pack("${property}", ${property});`;
+
+  const results = await lastValueFrom(
+    datasource.azureLogAnalyticsDatasource.query({
+      requestId: 'azure-traces-properties-req',
+      interval: '',
+      intervalMs: 0,
+      scopedVars: {},
+      timezone: '',
+      startTime: 0,
+      app: CoreApp.Unknown,
+      targets: [
+        {
+          ...query,
+          azureLogAnalytics: {
+            resources,
+            query: queryString,
+          },
+          queryType: AzureQueryType.LogAnalytics,
+        },
+      ],
+      range: timeRange,
+    })
+  );
+  if (results.data.length > 0) {
+    const result: DataFrame = results.data[0];
+    if (result.fields.length > 0) {
+      const properties: { [key: string]: Array<{ [key: string]: string | number; count: number }> } = JSON.parse(
+        result.fields[0].values.toArray()[0]
+      );
+      const values = properties[property].map((value) => {
+        let label = value[property];
+        if (value[property] === '') {
+          label = '<Empty>';
+        }
+        return { label: label.toString(), value: value[property].toString(), count: value.count };
+      });
+      propertyMap.set(property, values);
+      setPropertyMap(propertyMap);
+      return values;
+    }
+  }
+
+  return [];
+};
+
+export function makeRenderItem(props: FilterProps) {
+  function renderItem(
+    item: Partial<AzureTracesFilter>,
+    onChange: (item: Partial<AzureTracesFilter>) => void,
+    onDelete: () => void
+  ) {
+    return <Filter {...props} item={item} onChange={onChange} onDelete={onDelete} />;
+  }
+
+  return renderItem;
+}
+
+interface OptionProps {
+  isFocused: boolean;
+  isSelected: boolean;
+  innerProps: JSX.IntrinsicElements['div'];
+  innerRef: RefCallback<HTMLDivElement>;
+  data: SelectableValue<string>;
+  selectOption: (data: SelectableValue<string>) => void;
+}
+
+const Option = (props: React.PropsWithChildren<OptionProps>) => {
+  const { data, innerProps, innerRef, isFocused, isSelected } = props;
+  const theme = useTheme2();
+  const styles = getSelectStyles(theme);
+
+  const onClickMultiOption = (e: SyntheticEvent) => {
+    props.selectOption({ ...data });
+    e.stopPropagation();
+    e.preventDefault();
+  };
+
+  return (
+    <div
+      ref={innerRef}
+      className={cx(
+        styles.option,
+        isFocused && styles.optionFocused,
+        isSelected && styles.optionSelected,
+        data.isDisabled && styles.optionDisabled
+      )}
+      {...innerProps}
+      aria-label="Select option"
+      title={data.title}
+      onClick={onClickMultiOption}
+    >
+      <div className={styles.optionBody}>
+        <Checkbox value={isSelected} label={data.label ? `${data.label} - (${data.count})` : ''} />
+      </div>
+    </div>
+  );
+};
+
+const Filter = (
+  props: FilterProps & {
+    item: Partial<AzureTracesFilter>;
+    onChange: (item: Partial<AzureTracesFilter>) => void;
+    onDelete: () => void;
+  }
+) => {
+  const {
+    query,
+    datasource,
+    propertyMap,
+    setPropertyMap,
+    timeRange,
+    queryTraceTypes,
+    properties,
+    item,
+    onChange,
+    onDelete,
+    variableOptionGroup,
+  } = props;
+  const [loading, setLoading] = useState(false);
+  const [values, setValues] = useState<Array<SelectableValue<string> | VariableOptionGroup>>(
+    addValueToOptions(propertyMap.get(item.property ?? '') ?? [], variableOptionGroup)
+  );
+  const [selected, setSelected] = useState<SelectableValue[]>(
+    item.filters ? item.filters.map((filter) => ({ value: filter, label: filter === '' ? '<Empty>' : filter })) : []
+  );
+
+  const loadOptions = async () => {
+    setLoading(true);
+    if (item.property && item.property !== '') {
+      const vals = propertyMap.get(item.property ?? '');
+      if (!vals) {
+        const promise = await getTraceProperties(
+          query,
+          datasource,
+          timeRange,
+          queryTraceTypes,
+          propertyMap,
+          setPropertyMap,
+          item
+        );
+        setValues(addValueToOptions(promise, variableOptionGroup));
+        setLoading(false);
+        return promise;
+      } else {
+        setValues(addValueToOptions(vals, variableOptionGroup));
+        setLoading(false);
+        return Promise.resolve(vals);
+      }
+    }
+    const empty: Array<SelectableValue<string>> = [];
+    return Promise.resolve(empty);
+  };
+
+  return (
+    <HorizontalGroup spacing="none">
+      <Select
+        menuShouldPortal
+        placeholder="Property"
+        value={item.property ? { value: item.property, label: item.property } : null}
+        options={addValueToOptions(
+          properties.map((type) => ({ label: type, value: type })),
+          variableOptionGroup
+        )}
+        onChange={(e) => onFieldChange('property', item, e, onChange)}
+        width={25}
+      />
+      <ButtonSelect<string>
+        placeholder="Operator"
+        value={item.operation ? { label: item.operation === 'eq' ? '=' : '!=', value: item.operation } : undefined}
+        options={[
+          { label: '=', value: 'eq' },
+          { label: '!=', value: 'ne' },
+        ]}
+        onChange={(e) => onFieldChange('operation', item, e, onChange)}
+        defaultValue={'eq'}
+      />
+      <AsyncMultiSelect
+        blurInputOnSelect={false}
+        menuShouldPortal
+        placeholder="Value"
+        value={selected}
+        loadOptions={loadOptions}
+        isLoading={loading}
+        onOpenMenu={loadOptions}
+        onChange={(e: Array<SelectableValue<string>>) => setSelected(e)}
+        width={35}
+        defaultOptions={values}
+        isClearable
+        components={{ Option }}
+        closeMenuOnSelect={false}
+        onCloseMenu={() => onFieldChange('filters', item, selected, onChange)}
+        hideSelectedOptions={false}
+      />
+      <AccessoryButton aria-label="Remove" icon="times" variant="secondary" onClick={onDelete} type="button" />
+    </HorizontalGroup>
+  );
+};
+
+export default Filter;
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx
new file mode 100644
index 00000000000..26306b1aaf9
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx
@@ -0,0 +1,411 @@
+import { act, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { UserEvent } from '@testing-library/user-event/dist/types/setup/setup';
+import React from 'react';
+import { of } from 'rxjs';
+import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
+
+import { ArrayVector, CoreApp } from '@grafana/data';
+
+import createMockDatasource from '../../__mocks__/datasource';
+import createMockQuery from '../../__mocks__/query';
+import { AzureQueryType } from '../../dataquery.gen';
+import Datasource from '../../datasource';
+import { AzureMonitorQuery } from '../../types';
+
+import Filters from './Filters';
+import { setFilters } from './setQueryValue';
+
+const variableOptionGroup = {
+  label: 'Template variables',
+  options: [],
+};
+let user: UserEvent;
+let mockDatasource: Datasource;
+const onQueryChange = jest.fn();
+
+const addFilter = async (
+  mockQuery: AzureMonitorQuery,
+  filter: {
+    property: string;
+    operation: string;
+    index: number;
+    filters: Array<{
+      count: number;
+      value: string;
+    }>;
+  },
+  rerender: (ui: React.ReactElement) => void
+) => {
+  const { property, operation, index } = filter;
+  const resultVector = new ArrayVector([
+    `{"${property}":[${filter.filters.map(({ count, value }) => `{"${property}":"${value}", "count":${count}}`)}]}`,
+  ]);
+  mockDatasource.azureLogAnalyticsDatasource.query = jest.fn().mockReturnValue(
+    of({
+      data: [
+        {
+          refId: 'A',
+          meta: {
+            typeVersion: [0, 0],
+            custom: {
+              azureColumnTypes: ['dynamic'],
+            },
+          },
+          fields: [
+            {
+              name: 'properties',
+              type: 'string',
+              typeInfo: {
+                frame: 'string',
+                nullable: true,
+              },
+              config: {
+                links: [
+                  {
+                    title: 'View in Azure Portal',
+                    targetBlank: true,
+                    url: 'https://portal.azure.com/#blade/Microsoft_OperationsManagementSuite_Workspace/AnalyticsBlade/initiator/AnalyticsShareLinkToQuery/isQueryEditorVisible/true/scope/%7B%22resources%22%3A%5B%7B%22resourceId%22%3A%22%2Fsubscriptions%2F44693801-6ee6-49de-9b2d-9106972f9572%2FresourceGroups%2Fcloud-datasources%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2FAppInsightsTestData%22%7D%5D%7D/query/H4sIAAAAAAAA%2F3zPz0rDQBAG8HufYuglu2ChTQtqa3wIEQ+KhEk66tD9x86skuDDS+qthF7m8DG%2F+RhHCpiS4x6VY2hfKAvHAA1olB4dZlPCFLB8lHEcGs2FAL+RHXbsWIcnkuJUFgC%2F8PNFmeCtUvYkij5V7%2FDYwBGVpshU9brerta71aZ+3tztt%2FV+d%2F9aWcBwvFAPV9Ttvzo3SvEeM48EfSxBm%2FM0Frph7q0L4vFErWNRk7A%2FteicsdYeFgApc1BIOSbKyiTQQIef7bRmljOHlzdzdfbwFwAA%2F%2F8vPrTNXwEAAA==/isQueryBase64Compressed/true/timespanInIsoFormat/P1D',
+                  },
+                ],
+              },
+              values: resultVector,
+              entities: {},
+            },
+          ],
+          length: 1,
+        },
+      ],
+      state: 'Done',
+    })
+  );
+
+  const operationLabel = operation === 'eq' ? '=' : '!=';
+  const addFilter = await screen.findByLabelText('Add');
+  await act(() => {
+    userEvent.click(addFilter);
+    if (mockQuery.azureTraces?.filters && mockQuery.azureTraces.filters.length < 1) {
+      expect(onQueryChange).not.toHaveBeenCalled();
+    }
+  });
+
+  await waitFor(() => expect(screen.getByText('Property')).toBeInTheDocument());
+  const propertySelect = await screen.findByText('Property');
+  selectOptionInTest(propertySelect, property);
+  await waitFor(() => expect(screen.getByText(property)).toBeInTheDocument());
+
+  await waitFor(() => expect(screen.getByText('Property')).toBeInTheDocument());
+  const operationSelect = await screen.getAllByText('=');
+  selectOptionInTest(operationSelect[index], operationLabel);
+  await waitFor(() => expect(screen.getByText(operationLabel)).toBeInTheDocument());
+
+  const valueSelect = await screen.findByText('Value');
+  await waitFor(() => user.click(valueSelect));
+
+  const query = `let ${property} = toscalar(union isfuzzy=true ${mockQuery.azureTraces?.traceTypes?.join(',')}
+  | where $__timeFilter(timestamp)
+  | summarize count=count() by ${property}
+  | summarize make_list(pack_all()));
+  print properties = bag_pack("${property}", ${property});`;
+
+  expect(mockDatasource.azureLogAnalyticsDatasource.query).toHaveBeenCalledWith(
+    expect.objectContaining({
+      requestId: 'azure-traces-properties-req',
+      interval: '',
+      intervalMs: 0,
+      scopedVars: {},
+      timezone: '',
+      startTime: 0,
+      app: CoreApp.Unknown,
+      targets: [
+        {
+          ...mockQuery,
+          azureLogAnalytics: {
+            resources: mockQuery.azureTraces?.resources,
+            query,
+          },
+          queryType: AzureQueryType.LogAnalytics,
+        },
+      ],
+    })
+  );
+
+  const values = [];
+  for (const currFilter of filter.filters) {
+    const label = `${currFilter.value} - (${currFilter.count})`;
+    await waitFor(() => expect(screen.getByText(label)).toBeInTheDocument());
+    selectOptionInTest(valueSelect, label);
+    await waitFor(() => expect(screen.getByText(currFilter.value)).toBeInTheDocument());
+    values.push(currFilter.value);
+  }
+
+  if (mockQuery.azureTraces?.filters && mockQuery.azureTraces.filters.length === 0) {
+    expect(onQueryChange).not.toHaveBeenCalled();
+  }
+
+  const newQuery = setFilters(mockQuery, [
+    ...(mockQuery.azureTraces?.filters ?? []),
+    { property, operation, filters: values },
+  ]);
+  await waitFor(() => {
+    userEvent.type(valueSelect, '{Escape}');
+    expect(onQueryChange).toHaveBeenCalledWith(newQuery);
+  });
+
+  rerender(
+    <Filters
+      datasource={mockDatasource}
+      onQueryChange={onQueryChange}
+      query={newQuery}
+      setError={jest.fn()}
+      variableOptionGroup={variableOptionGroup}
+    />
+  );
+
+  return newQuery;
+};
+
+describe(`Traces Filters`, () => {
+  beforeEach(() => {
+    mockDatasource = createMockDatasource();
+    user = userEvent.setup();
+  });
+
+  it('should render a trace filter', async () => {
+    let mockQuery = createMockQuery();
+    mockQuery.azureTraces = {
+      ...mockQuery.azureTraces,
+      filters: [
+        {
+          filters: ['test-filter'],
+          operation: 'eq',
+          property: 'test-property',
+        },
+      ],
+    };
+
+    render(
+      <Filters
+        subscriptionId="123"
+        query={mockQuery}
+        onQueryChange={onQueryChange}
+        datasource={mockDatasource}
+        variableOptionGroup={variableOptionGroup}
+        setError={jest.fn()}
+      />
+    );
+
+    expect(screen.getByText('test-property')).toBeInTheDocument();
+    expect(screen.getByText('=')).toBeInTheDocument();
+    expect(screen.getByText('test-filter')).toBeInTheDocument();
+  });
+
+  it('should add a trace filter', async () => {
+    let mockQuery = createMockQuery({ azureTraces: { traceTypes: ['customEvents'] } });
+    mockQuery.azureTraces = {
+      ...mockQuery.azureTraces,
+      filters: undefined,
+    };
+
+    const { rerender } = render(
+      <Filters
+        datasource={mockDatasource}
+        onQueryChange={onQueryChange}
+        query={mockQuery}
+        setError={jest.fn()}
+        variableOptionGroup={variableOptionGroup}
+      />
+    );
+
+    await addFilter(
+      mockQuery,
+      { property: 'appId', filters: [{ count: 10, value: 'test-app-id' }], operation: 'eq', index: 0 },
+      rerender
+    );
+  });
+
+  it('should add multiple trace filters', async () => {
+    let mockQuery = createMockQuery({ azureTraces: { traceTypes: ['customEvents'] } });
+    mockQuery.azureTraces = {
+      ...mockQuery.azureTraces,
+      filters: undefined,
+    };
+
+    const { rerender } = render(
+      <Filters
+        datasource={mockDatasource}
+        onQueryChange={onQueryChange}
+        query={mockQuery}
+        setError={jest.fn()}
+        variableOptionGroup={variableOptionGroup}
+      />
+    );
+
+    mockQuery = await addFilter(
+      mockQuery,
+      { property: 'appId', filters: [{ count: 10, value: 'test-app-id' }], operation: 'eq', index: 0 },
+      rerender
+    );
+    mockQuery = await addFilter(
+      mockQuery,
+      { property: 'client_Browser', filters: [{ count: 100, value: 'test-client' }], operation: 'ne', index: 1 },
+      rerender
+    );
+  });
+
+  it('should delete a trace filter', async () => {
+    let mockQuery = createMockQuery({ azureTraces: { traceTypes: ['customEvents'] } });
+    mockQuery.azureTraces = {
+      ...mockQuery.azureTraces,
+      filters: undefined,
+    };
+
+    const { rerender } = render(
+      <Filters
+        datasource={mockDatasource}
+        onQueryChange={onQueryChange}
+        query={mockQuery}
+        setError={jest.fn()}
+        variableOptionGroup={variableOptionGroup}
+      />
+    );
+
+    mockQuery = await addFilter(
+      mockQuery,
+      { property: 'appId', filters: [{ count: 10, value: 'test-app-id' }], operation: 'eq', index: 0 },
+      rerender
+    );
+    mockQuery = await addFilter(
+      mockQuery,
+      { property: 'client_Browser', filters: [{ count: 100, value: 'test-client' }], operation: 'ne', index: 1 },
+      rerender
+    );
+
+    const removeButtons = screen.getAllByLabelText('Remove');
+
+    mockQuery = {
+      ...mockQuery,
+      azureTraces: {
+        ...mockQuery.azureTraces,
+        filters: mockQuery.azureTraces?.filters?.slice(0, 1),
+      },
+    };
+
+    await act(async () => {
+      await userEvent.click(removeButtons[1]);
+    });
+    rerender(
+      <Filters
+        datasource={mockDatasource}
+        onQueryChange={onQueryChange}
+        query={mockQuery}
+        setError={jest.fn()}
+        variableOptionGroup={variableOptionGroup}
+      />
+    );
+
+    expect(screen.getByText('appId')).toBeInTheDocument();
+    expect(screen.getByText('=')).toBeInTheDocument();
+    expect(screen.getByText('test-app-id')).toBeInTheDocument();
+    expect(screen.queryByText('client_Browser')).not.toBeInTheDocument();
+    expect(screen.queryByText('!=')).not.toBeInTheDocument();
+    expect(screen.queryByText('test-client')).not.toBeInTheDocument();
+  });
+
+  it('should add a trace filter and select multiple values', async () => {
+    let mockQuery = createMockQuery({ azureTraces: { traceTypes: ['customEvents'] } });
+    mockQuery.azureTraces = {
+      ...mockQuery.azureTraces,
+      filters: undefined,
+    };
+
+    const { rerender } = render(
+      <Filters
+        datasource={mockDatasource}
+        onQueryChange={onQueryChange}
+        query={mockQuery}
+        setError={jest.fn()}
+        variableOptionGroup={variableOptionGroup}
+      />
+    );
+
+    await addFilter(
+      mockQuery,
+      {
+        property: 'appId',
+        filters: [
+          { count: 10, value: 'test-app-id' },
+          { count: 20, value: 'test-app-id-2' },
+        ],
+        operation: 'eq',
+        index: 0,
+      },
+      rerender
+    );
+  });
+
+  it('should remove a value from a trace filter with multiple values', async () => {
+    let mockQuery = createMockQuery({ azureTraces: { traceTypes: ['customEvents'] } });
+    mockQuery.azureTraces = {
+      ...mockQuery.azureTraces,
+      filters: undefined,
+    };
+
+    const { rerender } = render(
+      <Filters
+        datasource={mockDatasource}
+        onQueryChange={onQueryChange}
+        query={mockQuery}
+        setError={jest.fn()}
+        variableOptionGroup={variableOptionGroup}
+      />
+    );
+
+    mockQuery = await addFilter(
+      mockQuery,
+      {
+        property: 'appId',
+        filters: [
+          { count: 10, value: 'test-app-id' },
+          { count: 20, value: 'test-app-id-2' },
+        ],
+        operation: 'eq',
+        index: 0,
+      },
+      rerender
+    );
+
+    const currFilter = mockQuery.azureTraces?.filters![0]!;
+    mockQuery = {
+      ...mockQuery,
+      azureTraces: {
+        ...mockQuery.azureTraces,
+        filters: [
+          {
+            ...currFilter,
+            filters: currFilter.filters.slice(0, 1),
+          },
+        ],
+      },
+    };
+    const removeLabel = screen.getByLabelText(`Remove test-app-id-2`);
+    await act(async () => {
+      await userEvent.click(removeLabel);
+    });
+
+    rerender(
+      <Filters
+        datasource={mockDatasource}
+        onQueryChange={onQueryChange}
+        query={mockQuery}
+        setError={jest.fn()}
+        variableOptionGroup={variableOptionGroup}
+      />
+    );
+
+    expect(screen.getByText('appId')).toBeInTheDocument();
+    expect(screen.getByText('=')).toBeInTheDocument();
+    expect(screen.getByText('test-app-id')).toBeInTheDocument();
+    expect(screen.queryByText('test-app-id-2')).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.tsx
new file mode 100644
index 00000000000..100567dcc66
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.tsx
@@ -0,0 +1,95 @@
+import { uniq } from 'lodash';
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { SelectableValue, TimeRange } from '@grafana/data';
+import { EditorList } from '@grafana/experimental';
+import { Field } from '@grafana/ui';
+
+import { AzureQueryEditorFieldProps, AzureTracesFilter } from '../../types';
+
+import { makeRenderItem } from './Filter';
+import { tablesSchema } from './consts';
+import { setFilters } from './setQueryValue';
+
+const Filters = ({ query, datasource, onQueryChange, variableOptionGroup }: AzureQueryEditorFieldProps) => {
+  const { azureTraces } = query;
+  const queryTraceTypes = azureTraces?.traceTypes ? azureTraces.traceTypes : Object.keys(tablesSchema);
+
+  const excludedProperties = new Set([
+    'customDimensions',
+    'customMeasurements',
+    'details',
+    'duration',
+    'id',
+    'itemId',
+    'operation_Id',
+    'operation_ParentId',
+    'timestamp',
+  ]);
+  const properties = uniq(queryTraceTypes.map((type) => Object.keys(tablesSchema[type])).flat()).filter(
+    (item) => !excludedProperties.has(item)
+  );
+
+  const [propertyMap, setPropertyMap] = useState(new Map<string, Array<SelectableValue<string>>>());
+  const queryFilters = useMemo(() => query.azureTraces?.filters ?? [], [query.azureTraces?.filters]);
+  const [filters, updateFilters] = useState(queryFilters);
+
+  const timeSrv = datasource.azureLogAnalyticsDatasource.timeSrv;
+  const [timeRange, setTimeRange] = useState(timeSrv.timeRange());
+
+  const useTime = (time: TimeRange) => {
+    if (
+      timeRange !== null &&
+      (timeRange.raw.from.toString() !== time.raw.from.toString() ||
+        timeRange.raw.to.toString() !== time.raw.to.toString())
+    ) {
+      setTimeRange({ ...time });
+    }
+  };
+  useTime(timeSrv.timeRange());
+
+  useEffect(() => {
+    setPropertyMap(new Map<string, Array<SelectableValue<string>>>());
+  }, [timeRange, query.azureTraces?.resources, query.azureTraces?.traceTypes, query.azureTraces?.operationId]);
+
+  const changedFunc = (changed: Array<Partial<AzureTracesFilter>>) => {
+    let updateQuery = false;
+    const properData: AzureTracesFilter[] = changed.map((x) => {
+      if (x.property !== '' && x.filters && x.filters.length > 0 && x.operation !== '') {
+        updateQuery = true;
+      } else {
+        updateQuery = false;
+      }
+      return {
+        property: x.property ?? '',
+        filters: x.filters ?? [],
+        operation: x.operation ?? 'eq',
+      };
+    });
+    updateFilters(properData);
+    if (updateQuery || (queryFilters.length > 0 && properData.length === 0)) {
+      onQueryChange(setFilters(query, properData));
+    }
+  };
+
+  return (
+    <Field label="Filters">
+      <EditorList
+        items={filters}
+        onChange={changedFunc}
+        renderItem={makeRenderItem({
+          query,
+          datasource,
+          propertyMap,
+          setPropertyMap,
+          timeRange,
+          queryTraceTypes,
+          properties,
+          variableOptionGroup,
+        })}
+      />
+    </Field>
+  );
+};
+
+export default Filters;
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx
new file mode 100644
index 00000000000..e5a7e076e56
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx
@@ -0,0 +1,64 @@
+import { render, screen, act } from '@testing-library/react';
+import React from 'react';
+import { openMenu } from 'react-select-event';
+
+import createMockDatasource from '../../__mocks__/datasource';
+import createMockQuery from '../../__mocks__/query';
+import { selectors } from '../../e2e/selectors';
+
+import TraceTypeField from './TraceTypeField';
+import { Tables } from './consts';
+import { setTraceTypes } from './setQueryValue';
+
+const props = {
+  query: createMockQuery(),
+  datasource: createMockDatasource(),
+  variableOptionGroup: { label: 'Templates', options: [] },
+  onQueryChange: jest.fn(),
+  setError: jest.fn(),
+};
+
+describe('TraceTypeField', () => {
+  it('should render with default types', async () => {
+    const query = {
+      ...props.query,
+      azureTraces: {
+        ...props.query.azureTraces,
+        traceTypes: [],
+      },
+    };
+    render(<TraceTypeField {...props} query={query} />);
+    expect(screen.getByText('Choose event types')).toBeInTheDocument();
+
+    const menu = screen.getByLabelText(selectors.components.queryEditor.tracesQueryEditor.traceTypes.select);
+    openMenu(menu);
+
+    Object.values(Tables).forEach((table) => {
+      expect(screen.getByText(table.label)).toBeInTheDocument();
+    });
+  });
+
+  it('should render the value defined in the query', async () => {
+    render(<TraceTypeField {...props} />);
+    expect(screen.getByText('Traces')).toBeInTheDocument();
+  });
+
+  it('should update the query', async () => {
+    const { rerender } = render(<TraceTypeField {...props} />);
+
+    expect(screen.getByText('Traces')).toBeInTheDocument();
+
+    const menu = screen.getByLabelText(selectors.components.queryEditor.tracesQueryEditor.traceTypes.select);
+
+    openMenu(menu);
+    act(() => {
+      screen.getByText('Dependencies').click();
+    });
+
+    const newQuery = setTraceTypes(props.query, [...props.query.azureTraces?.traceTypes!, 'dependencies']);
+
+    expect(props.onQueryChange).toHaveBeenCalledWith(newQuery);
+    rerender(<TraceTypeField {...props} query={newQuery} />);
+    expect(screen.getByText('Dependencies')).toBeInTheDocument();
+  });
+});
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.tsx
new file mode 100644
index 00000000000..9d5ca517013
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.tsx
@@ -0,0 +1,49 @@
+import React, { useCallback, useMemo } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { MultiSelect } from '@grafana/ui';
+
+import { selectors } from '../../e2e/selectors';
+import { AzureQueryEditorFieldProps, AzureMonitorOption } from '../../types';
+import { findOptions } from '../../utils/common';
+import { Field } from '../Field';
+
+import { Tables } from './consts';
+import { setTraceTypes } from './setQueryValue';
+
+const TraceTypeField = ({ query, variableOptionGroup, onQueryChange }: AzureQueryEditorFieldProps) => {
+  const tables: AzureMonitorOption[] = Object.entries(Tables).map(([key, value]) => ({
+    label: value.label,
+    description: value.description,
+    value: key,
+  }));
+  const handleChange = useCallback(
+    (change: Array<SelectableValue<string>>) => {
+      const newQuery = setTraceTypes(
+        query,
+        change.map((type) => type.value ?? '')
+      );
+      onQueryChange(newQuery);
+    },
+    [onQueryChange, query]
+  );
+
+  const options = useMemo(() => [...tables, variableOptionGroup], [tables, variableOptionGroup]);
+
+  return (
+    <Field label="Event Type">
+      <MultiSelect
+        placeholder="Choose event types"
+        inputId="azure-monitor-traces-type-field"
+        value={findOptions([...tables, ...variableOptionGroup.options], query.azureTraces?.traceTypes ?? [])}
+        onChange={handleChange}
+        options={options}
+        allowCustomValue
+        isClearable
+        aria-label={selectors.components.queryEditor.tracesQueryEditor.traceTypes.select}
+      />
+    </Field>
+  );
+};
+
+export default TraceTypeField;
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.test.tsx
new file mode 100644
index 00000000000..2f74c93a1a0
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.test.tsx
@@ -0,0 +1,187 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import createMockDatasource from '../../__mocks__/datasource';
+import createMockQuery from '../../__mocks__/query';
+import { createMockResourcePickerData } from '../MetricsQueryEditor/MetricsQueryEditor.test';
+
+import TracesQueryEditor from './TracesQueryEditor';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getTemplateSrv: () => ({
+    replace: (val: string) => {
+      return val;
+    },
+  }),
+}));
+
+const variableOptionGroup = {
+  label: 'Template variables',
+  options: [],
+};
+
+describe('TracesQueryEditor', () => {
+  const originalScrollIntoView = window.HTMLElement.prototype.scrollIntoView;
+
+  beforeEach(() => {
+    window.HTMLElement.prototype.scrollIntoView = function () {};
+  });
+  afterEach(() => {
+    window.HTMLElement.prototype.scrollIntoView = originalScrollIntoView;
+  });
+
+  it('should select multiple resources', async () => {
+    const mockDatasource = createMockDatasource({ resourcePickerData: createMockResourcePickerData() });
+    const query = createMockQuery();
+    delete query?.subscription;
+    delete query?.azureTraces?.resources;
+    const onChange = jest.fn();
+
+    render(
+      <TracesQueryEditor
+        query={query}
+        datasource={mockDatasource}
+        variableOptionGroup={variableOptionGroup}
+        onChange={onChange}
+        setError={() => {}}
+      />
+    );
+
+    const resourcePickerButton = await screen.findByRole('button', { name: 'Select a resource' });
+    await userEvent.click(resourcePickerButton);
+
+    const subscriptionButton = await screen.findByRole('button', { name: 'Expand Primary Subscription' });
+    await userEvent.click(subscriptionButton);
+
+    const resourceGroupButton = await screen.findByRole('button', { name: 'Expand A Great Resource Group' });
+    await userEvent.click(resourceGroupButton);
+
+    const checkbox = await screen.findByLabelText('app-insights-1');
+    await userEvent.click(checkbox);
+    expect(checkbox).toBeChecked();
+
+    const checkbox2 = await screen.findByLabelText('app-insights-2');
+    await userEvent.click(checkbox2);
+    expect(checkbox2).toBeChecked();
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Apply' }));
+
+    expect(onChange).toBeCalledWith(
+      expect.objectContaining({
+        azureTraces: expect.objectContaining({
+          resources: [
+            '/subscriptions/def-456/resourceGroups/dev-3/providers/microsoft.insights/components/app-insights-1',
+            '/subscriptions/def-456/resourceGroups/dev-3/providers/microsoft.insights/components/app-insights-2',
+          ],
+        }),
+      })
+    );
+  });
+
+  it('should disable other resource types when selecting multiple resources', async () => {
+    const mockDatasource = createMockDatasource({ resourcePickerData: createMockResourcePickerData() });
+    const query = createMockQuery();
+    delete query?.subscription;
+    delete query?.azureTraces?.resources;
+    const onChange = jest.fn();
+
+    render(
+      <TracesQueryEditor
+        query={query}
+        datasource={mockDatasource}
+        variableOptionGroup={variableOptionGroup}
+        onChange={onChange}
+        setError={() => {}}
+      />
+    );
+
+    const resourcePickerButton = await screen.findByRole('button', { name: 'Select a resource' });
+    await userEvent.click(resourcePickerButton);
+
+    const subscriptionButton = await screen.findByRole('button', { name: 'Expand Primary Subscription' });
+    await userEvent.click(subscriptionButton);
+
+    const resourceGroupButton = await screen.findByRole('button', { name: 'Expand A Great Resource Group' });
+    await userEvent.click(resourceGroupButton);
+
+    const checkbox = await screen.findByLabelText('app-insights-1');
+    await userEvent.click(checkbox);
+    expect(checkbox).toBeChecked();
+
+    expect(await screen.findByLabelText('web-server_DataDisk')).toBeDisabled();
+  });
+
+  it('should show info about multiple selection', async () => {
+    const mockDatasource = createMockDatasource({ resourcePickerData: createMockResourcePickerData() });
+    const query = createMockQuery();
+    delete query?.subscription;
+    delete query?.azureTraces?.resources;
+    const onChange = jest.fn();
+
+    render(
+      <TracesQueryEditor
+        query={query}
+        datasource={mockDatasource}
+        variableOptionGroup={variableOptionGroup}
+        onChange={onChange}
+        setError={() => {}}
+      />
+    );
+
+    const resourcePickerButton = await screen.findByRole('button', { name: 'Select a resource' });
+    await userEvent.click(resourcePickerButton);
+
+    const subscriptionButton = await screen.findByRole('button', { name: 'Expand Primary Subscription' });
+    await userEvent.click(subscriptionButton);
+
+    const resourceGroupButton = await screen.findByRole('button', { name: 'Expand A Great Resource Group' });
+    await userEvent.click(resourceGroupButton);
+
+    const checkbox = await screen.findByLabelText('app-insights-1');
+    await userEvent.click(checkbox);
+    expect(checkbox).toBeChecked();
+
+    expect(await screen.findByText('You may only choose items of the same resource type.')).toBeInTheDocument();
+  });
+
+  it('should call onApply with a new subscription uri when a user types it in the selection box', async () => {
+    const mockDatasource = createMockDatasource({ resourcePickerData: createMockResourcePickerData() });
+    const query = createMockQuery();
+    delete query?.subscription;
+    delete query?.azureTraces?.resources;
+    const onChange = jest.fn();
+
+    render(
+      <TracesQueryEditor
+        query={query}
+        datasource={mockDatasource}
+        variableOptionGroup={variableOptionGroup}
+        onChange={onChange}
+        setError={() => {}}
+      />
+    );
+
+    const resourcePickerButton = await screen.findByRole('button', { name: 'Select a resource' });
+    await userEvent.click(resourcePickerButton);
+
+    const advancedSection = screen.getByText('Advanced');
+    await userEvent.click(advancedSection);
+
+    const advancedInput = await screen.findByTestId('input-advanced-resource-picker-1');
+
+    await userEvent.type(advancedInput, '/subscriptions/def-123');
+
+    const applyButton = screen.getByRole('button', { name: 'Apply' });
+    await userEvent.click(applyButton);
+
+    expect(onChange).toBeCalledWith(
+      expect.objectContaining({
+        azureTraces: expect.objectContaining({
+          resources: ['/subscriptions/def-123'],
+        }),
+      })
+    );
+  });
+});
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx
new file mode 100644
index 00000000000..129bc8cad80
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx
@@ -0,0 +1,163 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { usePrevious } from 'react-use';
+
+import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/experimental';
+import { Input } from '@grafana/ui';
+
+import Datasource from '../../datasource';
+import { selectors } from '../../e2e/selectors';
+import { AzureMonitorErrorish, AzureMonitorOption, AzureMonitorQuery, ResultFormat } from '../../types';
+import { Field } from '../Field';
+import FormatAsField from '../FormatAsField';
+import AdvancedResourcePicker from '../LogsQueryEditor/AdvancedResourcePicker';
+import ResourceField from '../ResourceField';
+import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
+import { parseResourceDetails } from '../ResourcePicker/utils';
+
+import Filters from './Filters';
+import TraceTypeField from './TraceTypeField';
+import { setFormatAs, setQueryOperationId } from './setQueryValue';
+
+interface TracesQueryEditorProps {
+  query: AzureMonitorQuery;
+  datasource: Datasource;
+  subscriptionId?: string;
+  onChange: (newQuery: AzureMonitorQuery) => void;
+  variableOptionGroup: { label: string; options: AzureMonitorOption[] };
+  setError: (source: string, error: AzureMonitorErrorish | undefined) => void;
+}
+
+const TracesQueryEditor = ({
+  query,
+  datasource,
+  subscriptionId,
+  variableOptionGroup,
+  onChange,
+  setError,
+}: TracesQueryEditorProps) => {
+  const disableRow = (row: ResourceRow, selectedRows: ResourceRowGroup) => {
+    if (selectedRows.length === 0) {
+      // Only if there is some resource(s) selected we should disable rows
+      return false;
+    }
+    const rowResourceNS = parseResourceDetails(row.uri, row.location).metricNamespace?.toLowerCase();
+    const selectedRowSampleNs = parseResourceDetails(
+      selectedRows[0].uri,
+      selectedRows[0].location
+    ).metricNamespace?.toLowerCase();
+    // Only resources with the same metricNamespace can be selected
+    return rowResourceNS !== selectedRowSampleNs;
+  };
+
+  const [operationId, setOperationId] = useState<string>(query.azureTraces?.operationId ?? '');
+  const previousOperationId = usePrevious(query.azureTraces?.operationId);
+
+  useEffect(() => {
+    if (query.azureTraces?.operationId) {
+      if (previousOperationId !== query.azureTraces.operationId) {
+        setOperationId(query.azureTraces.operationId);
+      }
+    }
+  }, [setOperationId, previousOperationId, query, operationId]);
+
+  const handleChange = useCallback((ev: React.FormEvent) => {
+    if (ev.target instanceof HTMLInputElement) {
+      setOperationId(ev.target.value);
+    }
+  }, []);
+
+  const handleBlur = useCallback(
+    (ev: React.FormEvent) => {
+      const newQuery = setQueryOperationId(query, operationId);
+      onChange(newQuery);
+    },
+    [onChange, operationId, query]
+  );
+
+  return (
+    <span data-testid={selectors.components.queryEditor.tracesQueryEditor.container.input}>
+      <EditorRows>
+        <EditorRow>
+          <EditorFieldGroup>
+            <ResourceField
+              query={query}
+              datasource={datasource}
+              subscriptionId={subscriptionId}
+              variableOptionGroup={variableOptionGroup}
+              onQueryChange={onChange}
+              setError={setError}
+              selectableEntryTypes={[
+                ResourceRowType.Subscription,
+                ResourceRowType.ResourceGroup,
+                ResourceRowType.Resource,
+                ResourceRowType.Variable,
+              ]}
+              resources={query.azureTraces?.resources ?? []}
+              queryType="traces"
+              disableRow={disableRow}
+              renderAdvanced={(resources, onChange) => (
+                // It's required to cast resources because the resource picker
+                // specifies the type to string | AzureMonitorResource.
+                // eslint-disable-next-line
+                <AdvancedResourcePicker resources={resources as string[]} onChange={onChange} />
+              )}
+              selectionNotice={() => 'You may only choose items of the same resource type.'}
+            />
+          </EditorFieldGroup>
+        </EditorRow>
+        <EditorRow>
+          <EditorFieldGroup>
+            <TraceTypeField
+              datasource={datasource}
+              onQueryChange={onChange}
+              query={query}
+              setError={setError}
+              variableOptionGroup={variableOptionGroup}
+            />
+            <Field label="Operation ID">
+              <Input
+                id="azure-monitor-traces-operation-id-field"
+                value={operationId}
+                onChange={handleChange}
+                onBlur={handleBlur}
+                width={40}
+              />
+            </Field>
+          </EditorFieldGroup>
+        </EditorRow>
+        <EditorRow>
+          <EditorFieldGroup>
+            <Filters
+              datasource={datasource}
+              onQueryChange={onChange}
+              query={query}
+              setError={setError}
+              variableOptionGroup={variableOptionGroup}
+            />
+          </EditorFieldGroup>
+        </EditorRow>
+        <EditorRow>
+          <EditorFieldGroup>
+            <FormatAsField
+              datasource={datasource}
+              setError={setError}
+              query={query}
+              variableOptionGroup={variableOptionGroup}
+              onQueryChange={onChange}
+              inputId="azure-monitor-traces"
+              options={[
+                { label: 'Table', value: ResultFormat.Table },
+                { label: 'Trace', value: ResultFormat.Trace },
+              ]}
+              defaultValue={ResultFormat.Table}
+              setFormatAs={setFormatAs}
+              resultFormat={query.azureTraces?.resultFormat}
+            />
+          </EditorFieldGroup>
+        </EditorRow>
+      </EditorRows>
+    </span>
+  );
+};
+
+export default TracesQueryEditor;
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/consts.ts b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/consts.ts
new file mode 100644
index 00000000000..001bd0d6181
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/consts.ts
@@ -0,0 +1,167 @@
+import { omit } from 'lodash';
+
+export const Tables = {
+  availabilityResults: { label: 'Availablity Results', description: 'Availability test results.' },
+  dependencies: {
+    label: 'Dependencies',
+    description: 'Calls your application makes to other services such as databases or REST APIs.',
+  },
+  customEvents: { label: 'Custom Events', description: 'Calls to TrackEvent that are inserted to monitor usage.' },
+  exceptions: {
+    label: 'Exceptions',
+    description: 'Exceptions that are logged via TrackException, or uncaught exceptions.',
+  },
+  pageViews: { label: 'Page Views', description: 'Web client telemetry to create page view reports.' },
+  requests: { label: 'Requests', description: 'HTTP requests received by the application.' },
+  traces: {
+    label: 'Traces',
+    description:
+      'Diagnostic logs emitted using TrackTrace and similar methods. Note: Traces are not visualised if the result format is set to Trace',
+  },
+};
+
+// Resource centric tables mapped to legacy tables
+export const tables = {
+  AppAvailabilityResults: 'availabilityResults',
+  AppDependencies: 'dependencies',
+  AppEvents: 'events',
+  AppExceptions: 'exceptions',
+  AppPageViews: 'pageViews',
+  AppRequests: 'requests',
+  AppTraces: 'traces',
+};
+
+// Properties to omit when generating the attributes bag
+export const attributesOmit = [
+  'operationId',
+  'duration',
+  'id',
+  'name',
+  'problemId',
+  'operation_ParentId',
+  'timestamp',
+  'customDimensions',
+  'operation_Name',
+];
+
+// Common resource centric properties mapped to legacy property names
+export const common = {
+  appId: 'ResourceGUID',
+  application_Version: 'AppVersion',
+  appName: '_ResourceId',
+  client_Browser: 'ClientBrowser',
+  client_City: 'ClientCity',
+  client_CountryOrRegion: 'ClientCountryOrRegion',
+  client_IP: 'ClientIP',
+  client_Model: 'ClientModel',
+  client_OS: 'ClientOS',
+  client_StateOrProvince: 'ClientStateOrProvince',
+  client_Type: 'ClientType',
+  cloud_RoleInstance: 'AppRoleInstance',
+  cloud_RoleName: 'AppRoleName',
+  customDimensions: 'Properties',
+  customMeasurements: 'Measurements',
+  duration: 'DurationMs',
+  id: 'Id',
+  iKey: 'IKey',
+  itemCount: 'ItemCount',
+  itemId: '_ItemId',
+  itemType: 'Type',
+  name: 'Name',
+  operation_Id: 'OperationId',
+  operation_Name: 'OperationName',
+  operation_ParentId: 'OperationParentId',
+  operation_SyntheticSource: 'OperationSyntheticSource',
+  performanceBucket: 'PerformanceBucket',
+  sdkVersion: 'SDKVersion',
+  session_Id: 'SessionId',
+  success: 'Success',
+  timestamp: 'TimeGenerated',
+  user_AccountId: 'UserAccountId',
+  user_AuthenticatedId: 'UserAuthenticatedId',
+  user_Id: 'UserId',
+};
+
+// Additional properties for availabilityResults
+export const availabilityResultsSchema = {
+  ...common,
+  location: 'Location',
+  message: 'Message',
+  size: 'Size',
+};
+
+// Additional properties for dependencies
+export const dependenciesSchema = {
+  ...common,
+  data: 'Data',
+  resultCode: 'ResultCode',
+  target: 'Target',
+  type: 'DependencyType',
+};
+
+// Additional properties for events
+export const eventsSchema = omit(common, ['duration', 'id', 'success', 'performanceBucket']);
+
+// Additional properties for pageVies
+export const pageViewsSchema = omit(
+  {
+    ...common,
+    url: 'Url',
+  },
+  ['success']
+);
+
+// Additional properties for requests
+export const requestsSchema = {
+  resultCode: 'ResultCode',
+  source: 'Source',
+  url: 'Url',
+};
+
+// Additional properties for exceptions
+export const exceptionsSchema = omit(
+  {
+    ...common,
+    assembly: 'Assembly',
+    details: 'Details',
+    handledAt: 'HandledAt',
+    innermostAssembly: 'InnermostAssembly',
+    innermostMessage: 'InnermostMessage',
+    innermostMethod: 'InnermostMethod',
+    innermostType: 'InnermostType',
+    message: 'Message',
+    method: 'Method',
+    outerAssembly: 'OuterAssembly',
+    outerMessage: 'OuterMessage',
+    outerMethod: 'OuterMethod',
+    outerType: 'OuterType',
+    problemId: 'ProblemId',
+    severityLevel: 'SeverityLevel',
+    type: 'ExceptionType',
+  },
+  ['duration', 'id', 'name', 'performanceBucket', 'success']
+);
+
+// Additional properties for traces
+export const tracesSchema = omit(
+  {
+    message: 'Message',
+    severityLevel: 'SeverityLevel',
+  },
+  ['duration', 'id', 'name', 'performanceBucket', 'success']
+);
+
+export const tablesSchema: { [key: string]: { [key: string]: string } } = {
+  availabilityResults: availabilityResultsSchema,
+  dependencies: dependenciesSchema,
+  customEvents: eventsSchema,
+  exceptions: exceptionsSchema,
+  pageViews: pageViewsSchema,
+  requests: requestsSchema,
+  traces: tracesSchema,
+};
+
+export const tableTags = Object.entries(tablesSchema).reduce(
+  (val, [k, v]) => ({ ...val, [k]: Object.keys(omit(v, attributesOmit)).join(',') }),
+  {}
+);
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/index.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/index.tsx
new file mode 100644
index 00000000000..a052a53085f
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/index.tsx
@@ -0,0 +1 @@
+export { default } from './TracesQueryEditor';
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/setQueryValue.ts b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/setQueryValue.ts
new file mode 100644
index 00000000000..fb9eaa86680
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/setQueryValue.ts
@@ -0,0 +1,41 @@
+import { AzureMonitorQuery, AzureTracesFilter, ResultFormat } from '../../types';
+
+export function setQueryOperationId(query: AzureMonitorQuery, operationId?: string): AzureMonitorQuery {
+  return {
+    ...query,
+    azureTraces: {
+      ...query.azureTraces,
+      operationId,
+    },
+  };
+}
+
+export function setFormatAs(query: AzureMonitorQuery, formatAs: ResultFormat): AzureMonitorQuery {
+  return {
+    ...query,
+    azureTraces: {
+      ...query.azureTraces,
+      resultFormat: formatAs,
+    },
+  };
+}
+
+export function setTraceTypes(query: AzureMonitorQuery, traceTypes: string[]): AzureMonitorQuery {
+  return {
+    ...query,
+    azureTraces: {
+      ...query.azureTraces,
+      traceTypes,
+    },
+  };
+}
+
+export function setFilters(query: AzureMonitorQuery, filters: AzureTracesFilter[]): AzureMonitorQuery {
+  return {
+    ...query,
+    azureTraces: {
+      ...query.azureTraces,
+      filters,
+    },
+  };
+}
diff --git a/public/app/plugins/datasource/azuremonitor/dataquery.cue b/public/app/plugins/datasource/azuremonitor/dataquery.cue
index 747d323aa41..ed649cf642c 100644
--- a/public/app/plugins/datasource/azuremonitor/dataquery.cue
+++ b/public/app/plugins/datasource/azuremonitor/dataquery.cue
@@ -43,6 +43,8 @@ composableKinds: DataQuery: {
 							azureLogAnalytics?: #AzureLogsQuery
 							// Azure Resource Graph sub-query properties.
 							azureResourceGraph?: #AzureResourceGraphQuery
+							// Application Insights Traces sub-query properties.
+							azureTraces?: #AzureTracesQuery
 							// @deprecated Legacy template variable support.
 							grafanaTemplateVariableFn?: #GrafanaTemplateVariableQuery
 
@@ -56,7 +58,7 @@ composableKinds: DataQuery: {
 						} @cuetsy(kind="interface") @grafana(TSVeneer="type")
 
 						// Defines the supported queryTypes. GrafanaTemplateVariableFn is deprecated
-						#AzureQueryType: "Azure Monitor" | "Azure Log Analytics" | "Azure Resource Graph" | "Azure Subscriptions" | "Azure Resource Groups" | "Azure Namespaces" | "Azure Resource Names" | "Azure Metric Names" | "Azure Workspaces" | "Azure Regions" | "Grafana Template Variable Function" @cuetsy(kind="enum", memberNames="AzureMonitor|LogAnalytics|AzureResourceGraph|SubscriptionsQuery|ResourceGroupsQuery|NamespacesQuery|ResourceNamesQuery|MetricNamesQuery|WorkspacesQuery|LocationsQuery|GrafanaTemplateVariableFn")
+						#AzureQueryType: "Azure Monitor" | "Azure Log Analytics" | "Azure Resource Graph" | "Azure Traces" | "Azure Subscriptions" | "Azure Resource Groups" | "Azure Namespaces" | "Azure Resource Names" | "Azure Metric Names" | "Azure Workspaces" | "Azure Regions" | "Grafana Template Variable Function" @cuetsy(kind="enum", memberNames="AzureMonitor|LogAnalytics|AzureResourceGraph|AzureTraces|SubscriptionsQuery|ResourceGroupsQuery|NamespacesQuery|ResourceNamesQuery|MetricNamesQuery|WorkspacesQuery|LocationsQuery|GrafanaTemplateVariableFn")
 
 						#AzureMetricQuery: {
 							// Array of resource URIs to be queried.
@@ -121,7 +123,32 @@ composableKinds: DataQuery: {
 							resource?: string
 						} @cuetsy(kind="interface")
 
-						#ResultFormat: "table" | "time_series" @cuetsy(kind="enum", memberNames="Table|TimeSeries")
+						// Application Insights Traces sub-query properties
+						#AzureTracesQuery: {
+							// Specifies the format results should be returned as.
+							resultFormat?: #ResultFormat
+							// Array of resource URIs to be queried.
+							resources?: [...string]
+							// Operation ID. Used only for Traces queries.
+							operationId?: string
+							// Types of events to filter by.
+							traceTypes?: [...string]
+							// Filters for property values.
+							filters?: [...#AzureTracesFilter]
+							// KQL query to be executed.
+							query?: string
+						} @cuetsy(kind="interface")
+
+						#AzureTracesFilter: {
+							// Property name, auto-populated based on available traces.
+							property: string
+							// Comparison operator to use. Either equals or not equals.
+							operation: string
+							// Values to filter by.
+							filters: [...string]
+						} @cuetsy(kind="interface")
+
+						#ResultFormat: "table" | "time_series" | "trace" @cuetsy(kind="enum", memberNames="Table|TimeSeries|Trace")
 
 						#AzureResourceGraphQuery: {
 							// Azure Resource Graph KQL query to be executed.
diff --git a/public/app/plugins/datasource/azuremonitor/dataquery.gen.ts b/public/app/plugins/datasource/azuremonitor/dataquery.gen.ts
index 8e65899f900..1a33491b3f5 100644
--- a/public/app/plugins/datasource/azuremonitor/dataquery.gen.ts
+++ b/public/app/plugins/datasource/azuremonitor/dataquery.gen.ts
@@ -25,6 +25,10 @@ export interface AzureMonitorQuery extends common.DataQuery {
    * Azure Resource Graph sub-query properties.
    */
   azureResourceGraph?: AzureResourceGraphQuery;
+  /**
+   * Application Insights Traces sub-query properties.
+   */
+  azureTraces?: AzureTracesQuery;
   /**
    * @deprecated Legacy template variable support.
    */
@@ -60,6 +64,7 @@ export const defaultAzureMonitorQuery: Partial<AzureMonitorQuery> = {
 export enum AzureQueryType {
   AzureMonitor = 'Azure Monitor',
   AzureResourceGraph = 'Azure Resource Graph',
+  AzureTraces = 'Azure Traces',
   GrafanaTemplateVariableFn = 'Grafana Template Variable Function',
   LocationsQuery = 'Azure Regions',
   LogAnalytics = 'Azure Log Analytics',
@@ -184,9 +189,65 @@ export const defaultAzureLogsQuery: Partial<AzureLogsQuery> = {
   resources: [],
 };
 
+/**
+ * Application Insights Traces sub-query properties
+ */
+export interface AzureTracesQuery {
+  /**
+   * Filters for property values.
+   */
+  filters?: Array<AzureTracesFilter>;
+  /**
+   * Operation ID. Used only for Traces queries.
+   */
+  operationId?: string;
+  /**
+   * KQL query to be executed.
+   */
+  query?: string;
+  /**
+   * Array of resource URIs to be queried.
+   */
+  resources?: Array<string>;
+  /**
+   * Specifies the format results should be returned as.
+   */
+  resultFormat?: ResultFormat;
+  /**
+   * Types of events to filter by.
+   */
+  traceTypes?: Array<string>;
+}
+
+export const defaultAzureTracesQuery: Partial<AzureTracesQuery> = {
+  filters: [],
+  resources: [],
+  traceTypes: [],
+};
+
+export interface AzureTracesFilter {
+  /**
+   * Values to filter by.
+   */
+  filters: Array<string>;
+  /**
+   * Comparison operator to use. Either equals or not equals.
+   */
+  operation: string;
+  /**
+   * Property name, auto-populated based on available traces.
+   */
+  property: string;
+}
+
+export const defaultAzureTracesFilter: Partial<AzureTracesFilter> = {
+  filters: [],
+};
+
 export enum ResultFormat {
   Table = 'table',
   TimeSeries = 'time_series',
+  Trace = 'trace',
 }
 
 export interface AzureResourceGraphQuery {
diff --git a/public/app/plugins/datasource/azuremonitor/datasource.ts b/public/app/plugins/datasource/azuremonitor/datasource.ts
index 36ba7dc8e70..2f6c444c25f 100644
--- a/public/app/plugins/datasource/azuremonitor/datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/datasource.ts
@@ -90,7 +90,8 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
     }
 
     const observables: Array<Observable<DataQueryResponse>> = Array.from(byType.entries()).map(([queryType, req]) => {
-      const ds = this.pseudoDatasource[queryType];
+      const mappedQueryType = queryType === AzureQueryType.AzureTraces ? AzureQueryType.LogAnalytics : queryType;
+      const ds = this.pseudoDatasource[mappedQueryType];
       if (!ds) {
         throw new Error('Data source not created for query type ' + queryType);
       }
@@ -183,7 +184,8 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
         return query;
       }
 
-      const ds = this.pseudoDatasource[query.queryType];
+      const queryType = query.queryType === AzureQueryType.AzureTraces ? AzureQueryType.LogAnalytics : query.queryType;
+      const ds = this.pseudoDatasource[queryType];
       return {
         datasource: ds?.getRef(),
         ...(ds?.applyTemplateVariables(query, scopedVars) ?? query),
@@ -213,6 +215,9 @@ function hasQueryForType(query: AzureMonitorQuery): boolean {
     case AzureQueryType.AzureResourceGraph:
       return !!query.azureResourceGraph;
 
+    case AzureQueryType.AzureTraces:
+      return !!query.azureTraces;
+
     case AzureQueryType.GrafanaTemplateVariableFn:
       return !!query.grafanaTemplateVariableFn;
 
diff --git a/public/app/plugins/datasource/azuremonitor/e2e/selectors.ts b/public/app/plugins/datasource/azuremonitor/e2e/selectors.ts
index edd07c727a5..9d77b7f927c 100644
--- a/public/app/plugins/datasource/azuremonitor/e2e/selectors.ts
+++ b/public/app/plugins/datasource/azuremonitor/e2e/selectors.ts
@@ -61,11 +61,13 @@ export const components = {
       },
     },
     metricsQueryEditor: {
+      container: { input: 'data-testid azure-monitor-metrics-query-editor-with-experimental-ui' },
       metricName: {
         input: 'data-testid metric-name',
       },
     },
     logsQueryEditor: {
+      container: { input: 'data-testid azure-monitor-logs-query-editor-with-experimental-ui' },
       formatSelection: {
         input: 'data-testid format-selection',
       },
@@ -78,6 +80,14 @@ export const components = {
         input: 'data-testid azure-monitor-args-subscription',
       },
     },
+    tracesQueryEditor: {
+      container: {
+        input: 'data-testid azure-monitor-traces-query-editor-with-experimental-ui',
+      },
+      traceTypes: {
+        select: 'data-testid azure-monitor-traces-query-editor-trace-types',
+      },
+    },
   },
   variableEditor: {
     queryType: {
diff --git a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts
index a600b6a3227..068957621a7 100644
--- a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts
+++ b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts
@@ -32,7 +32,7 @@ const RESOURCE_GRAPH_URL = '/providers/Microsoft.ResourceGraph/resources?api-ver
 
 const logsSupportedResourceTypesKusto = logsResourceTypes.map((v) => `"${v}"`).join(',');
 
-export type ResourcePickerQueryType = 'logs' | 'metrics';
+export type ResourcePickerQueryType = 'logs' | 'metrics' | 'traces';
 
 export default class ResourcePickerData extends DataSourceWithBackend<AzureMonitorQuery, AzureDataSourceJsonData> {
   private resourcePath: string;
diff --git a/public/app/plugins/datasource/azuremonitor/types/query.ts b/public/app/plugins/datasource/azuremonitor/types/query.ts
index 34cabe059a6..0c4287928cd 100644
--- a/public/app/plugins/datasource/azuremonitor/types/query.ts
+++ b/public/app/plugins/datasource/azuremonitor/types/query.ts
@@ -5,8 +5,10 @@ export {
   AzureMetricQuery,
   AzureLogsQuery,
   AzureResourceGraphQuery,
+  AzureTracesQuery,
   AzureMonitorResource,
   AzureMetricDimension,
+  AzureTracesFilter,
   ResultFormat,
 } from '../dataquery.gen';
 
diff --git a/public/app/plugins/datasource/azuremonitor/types/types.ts b/public/app/plugins/datasource/azuremonitor/types/types.ts
index 0fb66cd39ae..b727b37a9a0 100644
--- a/public/app/plugins/datasource/azuremonitor/types/types.ts
+++ b/public/app/plugins/datasource/azuremonitor/types/types.ts
@@ -3,12 +3,13 @@ import {
   DataSourceJsonData,
   DataSourceSettings,
   PanelData,
+  SelectableValue,
   TableData,
 } from '@grafana/data';
 
 import Datasource from '../datasource';
 
-import { AzureMonitorQuery } from './query';
+import { AzureMonitorQuery, ResultFormat } from './query';
 
 export type AzureDataSourceSettings = DataSourceSettings<AzureDataSourceJsonData, AzureDataSourceSecureJsonData>;
 export type AzureDataSourceInstanceSettings = DataSourceInstanceSettings<AzureDataSourceJsonData>;
@@ -170,6 +171,14 @@ export interface AzureQueryEditorFieldProps {
   setError: (source: string, error: AzureMonitorErrorish | undefined) => void;
 }
 
+export interface FormatAsFieldProps extends AzureQueryEditorFieldProps {
+  inputId: string;
+  options: Array<SelectableValue<ResultFormat>>;
+  defaultValue: ResultFormat;
+  setFormatAs: (query: AzureMonitorQuery, formatAs: ResultFormat) => AzureMonitorQuery;
+  resultFormat?: ResultFormat;
+}
+
 export interface AzureResourceSummaryItem {
   subscriptionName: string;
   resourceGroupName: string | undefined;
diff --git a/public/app/plugins/datasource/azuremonitor/utils/common.ts b/public/app/plugins/datasource/azuremonitor/utils/common.ts
index 59e6f1d9b27..46b4e5f52e7 100644
--- a/public/app/plugins/datasource/azuremonitor/utils/common.ts
+++ b/public/app/plugins/datasource/azuremonitor/utils/common.ts
@@ -1,6 +1,6 @@
 import { map } from 'lodash';
 
-import { rangeUtil } from '@grafana/data';
+import { rangeUtil, SelectableValue } from '@grafana/data';
 import { VariableWithMultiSupport } from 'app/features/variables/types';
 
 import TimegrainConverter from '../time_grain_converter';
@@ -23,7 +23,7 @@ export const findOptions = (options: AzureMonitorOption[], values: string[] = []
 export const toOption = (v: { text: string; value: string }) => ({ value: v.value, label: v.text });
 
 export const addValueToOptions = (
-  values: AzureMonitorOption[],
+  values: Array<AzureMonitorOption | SelectableValue>,
   variableOptionGroup: VariableOptionGroup,
   value?: string
 ) => {

From 8352e716ddac2779b9e38fb766cbcfcd67ee90d3 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 27 Apr 2023 12:38:19 -0700
Subject: [PATCH 494/729] ArrayDataFrame: Convert to a simple utility function
 rather than dynamically loaded values (#67427)

---
 .betterer.results                             |  35 ++--
 .../src/dataframe/ArrayDataFrame.test.ts      |  59 +++----
 .../src/dataframe/ArrayDataFrame.ts           | 163 ++++++------------
 .../src/dataframe/processDataFrame.test.ts    |   3 +-
 .../src/dataframe/processDataFrame.ts         |  14 +-
 packages/grafana-data/src/types/data.ts       |   6 +
 .../src/vector/FunctionalVector.ts            |   6 +-
 .../dashboard/utils/loadSnapshotData.ts       |   4 +-
 .../datasource/azuremonitor/variables.test.ts |  32 ++--
 9 files changed, 128 insertions(+), 194 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 883cfa6551b..3e165bedf0d 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -7,12 +7,8 @@ exports[`better eslint`] = {
   value: `{
     "packages/grafana-data/src/dataframe/ArrayDataFrame.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "packages/grafana-data/src/dataframe/CircularDataFrame.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -73,29 +69,24 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
       [0, 0, 0, "Do not use any type assertions.", "5"],
       [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Do not use any type assertions.", "9"],
       [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Do not use any type assertions.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Do not use any type assertions.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Do not use any type assertions.", "12"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
+      [0, 0, 0, "Do not use any type assertions.", "14"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
+      [0, 0, 0, "Do not use any type assertions.", "16"],
       [0, 0, 0, "Do not use any type assertions.", "17"],
       [0, 0, 0, "Do not use any type assertions.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
+      [0, 0, 0, "Do not use any type assertions.", "19"],
       [0, 0, 0, "Do not use any type assertions.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Do not use any type assertions.", "22"],
-      [0, 0, 0, "Do not use any type assertions.", "23"],
-      [0, 0, 0, "Do not use any type assertions.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"]
+      [0, 0, 0, "Do not use any type assertions.", "21"]
     ],
     "packages/grafana-data/src/datetime/datemath.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts b/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
index e9ae03e3dd8..75222ede2d0 100644
--- a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
@@ -1,6 +1,6 @@
-import { FieldType, DataFrame } from '../types';
+import { DataFrame } from '../types';
 
-import { ArrayDataFrame } from './ArrayDataFrame';
+import { ArrayDataFrame, arrayToDataFrame } from './ArrayDataFrame';
 import { toDataFrameDTO } from './processDataFrame';
 
 describe('Array DataFrame', () => {
@@ -15,30 +15,9 @@ describe('Array DataFrame', () => {
   const frame = new ArrayDataFrame(input);
   frame.name = 'Hello';
   frame.refId = 'Z';
-  frame.setFieldType('phantom', FieldType.string, (v) => '🦥');
   const field = frame.fields.find((f) => f.name === 'value');
   field!.config.unit = 'kwh';
 
-  test('Should support functional methods', () => {
-    const expectedNames = input.map((row) => row.name);
-
-    // Check map
-    expect(frame.map((row) => row.name)).toEqual(expectedNames);
-    expect(frame[0].name).toEqual(input[0].name);
-
-    let names: string[] = [];
-    for (const row of frame) {
-      names.push(row.name);
-    }
-    expect(names).toEqual(expectedNames);
-
-    names = [];
-    frame.forEach((row) => {
-      names.push(row.name);
-    });
-    expect(names).toEqual(expectedNames);
-  });
-
   test('Should convert an array of objects to a dataframe', () => {
     expect(toDataFrameDTO(frame)).toMatchInlineSnapshot(`
       {
@@ -84,19 +63,6 @@ describe('Array DataFrame', () => {
               1100,
             ],
           },
-          {
-            "config": {},
-            "labels": undefined,
-            "name": "phantom",
-            "type": "string",
-            "values": [
-              "🦥",
-              "🦥",
-              "🦥",
-              "🦥",
-              "🦥",
-            ],
-          },
         ],
         "meta": undefined,
         "name": "Hello",
@@ -114,4 +80,25 @@ describe('Array DataFrame', () => {
     expect(copy.length).toEqual(frame.length);
     expect(copy.length).toEqual(input.length);
   });
+
+  test('Handles any array input', () => {
+    const f = arrayToDataFrame([1, 2, 3]);
+    expect(f).toMatchInlineSnapshot(`
+      {
+        "fields": [
+          {
+            "config": {},
+            "name": "Value",
+            "type": "number",
+            "values": [
+              1,
+              2,
+              3,
+            ],
+          },
+        ],
+        "length": 3,
+      }
+    `);
+  });
 });
diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts b/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
index fcf665a6282..ae8b821175e 100644
--- a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
@@ -1,118 +1,69 @@
-import { makeArrayIndexableVector, QueryResultMeta } from '../types';
-import { Field, FieldType, DataFrame } from '../types/dataFrame';
-import { FunctionalVector } from '../vector/FunctionalVector';
-import { vectorToArray } from '../vector/vectorToArray';
+import { QueryResultMeta } from '../types';
+import { Field, FieldType, DataFrame, TIME_SERIES_VALUE_FIELD_NAME } from '../types/dataFrame';
 
-import { guessFieldTypeFromNameAndValue, toDataFrameDTO } from './processDataFrame';
-
-/** @public */
-export type ValueConverter<T = any> = (val: unknown) => T;
-
-const NOOP: ValueConverter = (v) => v;
-
-class ArrayPropertyVector<T = any> extends FunctionalVector<T> {
-  converter = NOOP;
-
-  constructor(private source: any[], private prop: string) {
-    super();
-    return makeArrayIndexableVector(this);
-  }
-
-  get length(): number {
-    return this.source.length;
-  }
-
-  get(index: number): T {
-    return this.converter(this.source[index][this.prop]);
-  }
-
-  toArray(): T[] {
-    return vectorToArray(this);
-  }
-
-  toJSON(): T[] {
-    return vectorToArray(this);
-  }
-}
+import { guessFieldTypeForField } from './processDataFrame';
 
 /**
  * The ArrayDataFrame takes an array of objects and presents it as a DataFrame
  *
- * @alpha
+ * @deprecated use arrayToDataFrame
  */
-export class ArrayDataFrame<T = any> extends FunctionalVector<T> implements DataFrame {
+export class ArrayDataFrame<T = any> implements DataFrame {
+  fields: Field[] = [];
+  length = 0;
   name?: string;
   refId?: string;
   meta?: QueryResultMeta;
 
-  fields: Field[] = [];
-  length = 0;
-
-  constructor(private source: T[], names?: string[]) {
-    super();
-
-    this.length = source.length;
-    const first: any = source.length ? source[0] : {};
-    if (names) {
-      this.fields = names.map((name) => {
-        return {
-          name,
-          type: guessFieldTypeFromNameAndValue(name, first[name]),
-          config: {},
-          values: new ArrayPropertyVector(source, name),
-        };
-      });
-    } else {
-      this.setFieldsFromObject(first);
-    }
-    return makeArrayIndexableVector(this);
-  }
-
-  /**
-   * Add a field for each property in the object.  This will guess the type
-   */
-  setFieldsFromObject(obj: Record<string, unknown>) {
-    this.fields = Object.keys(obj).map((name) => {
-      return {
-        name,
-        type: guessFieldTypeFromNameAndValue(name, obj[name]),
-        config: {},
-        values: new ArrayPropertyVector(this.source, name),
-      };
-    });
-  }
-
-  /**
-   * Configure how the object property is passed to the data frame
-   */
-  setFieldType(name: string, type: FieldType, converter?: ValueConverter): Field {
-    let field = this.fields.find((f) => f.name === name);
-    if (field) {
-      field.type = type;
-    } else {
-      field = {
-        name,
-        type,
-        config: {},
-        values: new ArrayPropertyVector(this.source, name),
-      };
-      this.fields.push(field);
-    }
-    (field.values as any).converter = converter ?? NOOP;
-    return field;
-  }
-
-  /**
-   * Get an object with a property for each field in the DataFrame
-   */
-  get(idx: number): T {
-    return this.source[idx];
-  }
-
-  /**
-   * The simplified JSON values used in JSON.stringify()
-   */
-  toJSON() {
-    return toDataFrameDTO(this);
+  constructor(source: T[], names?: string[]) {
+    return arrayToDataFrame(source, names) as ArrayDataFrame<T>; // returns a standard DataFrame
   }
 }
+
+/**
+ * arrayToDataFrame will convert any array into a DataFrame
+ *
+ * @public
+ */
+export function arrayToDataFrame(source: any[], names?: string[]): DataFrame {
+  const df: DataFrame = {
+    fields: [],
+    length: source.length,
+  };
+  if (!source?.length) {
+    return df;
+  }
+
+  if (names) {
+    for (const name of names) {
+      df.fields.push(
+        makeFieldFromValues(
+          name,
+          source.map((v) => v[name])
+        )
+      );
+    }
+    return df;
+  }
+
+  const first = source.find((v) => v != null); // first not null|undefined
+  if (first != null) {
+    if (typeof first === 'object') {
+      df.fields = Object.keys(first).map((name) => {
+        return makeFieldFromValues(
+          name,
+          source.map((v) => v[name])
+        );
+      });
+    } else {
+      df.fields.push(makeFieldFromValues(TIME_SERIES_VALUE_FIELD_NAME, source));
+    }
+  }
+  return df;
+}
+
+function makeFieldFromValues(name: string, values: unknown[]): Field {
+  const f = { name, config: {}, values, type: FieldType.other };
+  f.type = guessFieldTypeForField(f) ?? FieldType.other;
+  return f;
+}
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.test.ts b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
index 9357245127f..a6906452f7c 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
@@ -83,10 +83,9 @@ describe('toDataFrame', () => {
       { a: 1, b: 2 },
       { a: 3, b: 4 },
     ];
-    const array = new ArrayDataFrame(orig);
+    const array = new ArrayDataFrame(orig); // will return a simple DataFrame
     const frame = toDataFrame(array);
     expect(frame).toEqual(array);
-    expect(frame instanceof ArrayDataFrame).toEqual(true);
     expect(frame.length).toEqual(orig.length);
     expect(frame.fields.map((f) => f.name)).toEqual(['a', 'b']);
   });
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index 5fad1214d9e..25047ee86db 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -25,7 +25,7 @@ import {
   GraphSeriesValue,
 } from '../types/index';
 
-import { ArrayDataFrame } from './ArrayDataFrame';
+import { arrayToDataFrame } from './ArrayDataFrame';
 import { dataFrameFromJSON } from './DataFrameJSON';
 import { MutableDataFrame } from './MutableDataFrame';
 
@@ -36,7 +36,7 @@ function convertTableToDataFrame(table: TableData): DataFrame {
     return {
       name: text?.length ? text : c, // rename 'text' to the 'name' field
       config: (disp || {}) as FieldConfig,
-      values: [] as any[],
+      values: [] as unknown[],
       type: type && Object.values(FieldType).includes(type as FieldType) ? (type as FieldType) : FieldType.other,
     };
   });
@@ -339,7 +339,7 @@ export function toDataFrame(data: any): DataFrame {
   }
 
   if (Array.isArray(data)) {
-    return new ArrayDataFrame(data);
+    return arrayToDataFrame(data);
   }
 
   console.warn('Can not convert', data);
@@ -350,7 +350,7 @@ export const toLegacyResponseData = (frame: DataFrame): TimeSeries | TableData =
   const { fields } = frame;
 
   const rowCount = frame.length;
-  const rows: any[][] = [];
+  const rows: unknown[][] = [];
 
   if (fields.length === 2) {
     const { timeField, timeIndex } = getTimeField(frame);
@@ -379,7 +379,7 @@ export const toLegacyResponseData = (frame: DataFrame): TimeSeries | TableData =
   }
 
   for (let i = 0; i < rowCount; i++) {
-    const row: any[] = [];
+    const row: unknown[] = [];
     for (let j = 0; j < fields.length; j++) {
       row.push(fields[j].values[i]);
     }
@@ -460,8 +460,8 @@ export function reverseDataFrame(data: DataFrame): DataFrame {
 /**
  * Wrapper to get an array from each field value
  */
-export function getDataFrameRow(data: DataFrame, row: number): any[] {
-  const values: any[] = [];
+export function getDataFrameRow(data: DataFrame, row: number): unknown[] {
+  const values: unknown[] = [];
   for (const field of data.fields) {
     values.push(field.values[row]);
   }
diff --git a/packages/grafana-data/src/types/data.ts b/packages/grafana-data/src/types/data.ts
index 4a24a248e45..067d4af8f92 100644
--- a/packages/grafana-data/src/types/data.ts
+++ b/packages/grafana-data/src/types/data.ts
@@ -146,6 +146,8 @@ export interface QueryResultBase {
 export interface Labels {
   [key: string]: string;
 }
+
+/** @deprecated this is a very old (pre Grafana 7 + DataFrame) representation for tabular data  */
 export interface Column {
   text: string; // For a Column, the 'text' is the field name
   filterable?: boolean;
@@ -153,6 +155,7 @@ export interface Column {
   custom?: Record<string, any>;
 }
 
+/** @deprecated this is a very old (pre Grafana 7 + DataFrame) representation for tabular data  */
 export interface TableData extends QueryResultBase {
   name?: string;
   columns: Column[];
@@ -160,10 +163,13 @@ export interface TableData extends QueryResultBase {
   type?: string;
 }
 
+/** @deprecated this is a very old (pre Grafana 7 + DataFrame) representation for tabular data  */
 export type TimeSeriesValue = number | null;
 
+/** @deprecated this is a very old (pre Grafana 7 + DataFrame) representation for tabular data  */
 export type TimeSeriesPoints = TimeSeriesValue[][];
 
+/** @deprecated this is a very old (pre Grafana 7 + DataFrame) representation for tabular data  */
 export interface TimeSeries extends QueryResultBase {
   target: string;
   /**
diff --git a/packages/grafana-data/src/vector/FunctionalVector.ts b/packages/grafana-data/src/vector/FunctionalVector.ts
index 7ee154e60f5..62782fe718f 100644
--- a/packages/grafana-data/src/vector/FunctionalVector.ts
+++ b/packages/grafana-data/src/vector/FunctionalVector.ts
@@ -85,9 +85,6 @@ export abstract class FunctionalVector<T = any> implements Vector<T> {
   shift(): T | undefined {
     throw new Error('Method not implemented.');
   }
-  slice(start?: number | undefined, end?: number | undefined): T[] {
-    throw new Error('Method not implemented.');
-  }
   sort(compareFn?: ((a: T, b: T) => number) | undefined): this {
     throw new Error('Method not implemented.');
   }
@@ -121,6 +118,9 @@ export abstract class FunctionalVector<T = any> implements Vector<T> {
   // Delegated Array function -- these will not be efficient :grimmice:
   //--------------------------------------------------------------------------------
 
+  slice(start?: number | undefined, end?: number | undefined): T[] {
+    return this.toArray().slice(start, end);
+  }
   indexOf(searchElement: T, fromIndex?: number | undefined): number {
     return this.toArray().indexOf(searchElement, fromIndex);
   }
diff --git a/public/app/features/dashboard/utils/loadSnapshotData.ts b/public/app/features/dashboard/utils/loadSnapshotData.ts
index e6ab56369e1..b0068246693 100644
--- a/public/app/features/dashboard/utils/loadSnapshotData.ts
+++ b/public/app/features/dashboard/utils/loadSnapshotData.ts
@@ -1,6 +1,6 @@
 import {
   applyFieldOverrides,
-  ArrayDataFrame,
+  arrayToDataFrame,
   getDefaultTimeRange,
   getProcessedDataFrames,
   LoadingState,
@@ -19,7 +19,7 @@ export function loadSnapshotData(panel: PanelModel, dashboard: DashboardModel):
   const worker = new SnapshotWorker();
   const options = { dashboard, range: getDefaultTimeRange() };
   const annotationEvents = worker.canWork(options) ? worker.getAnnotationsInSnapshot(dashboard, panel.id) : [];
-  const annotations = [new ArrayDataFrame(annotationEvents)];
+  const annotations = [arrayToDataFrame(annotationEvents)];
   const timeData = applyPanelTimeOverrides(panel, getTimeSrv().timeRange());
 
   return {
diff --git a/public/app/plugins/datasource/azuremonitor/variables.test.ts b/public/app/plugins/datasource/azuremonitor/variables.test.ts
index 244e282bbc3..53aba537f5d 100644
--- a/public/app/plugins/datasource/azuremonitor/variables.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/variables.test.ts
@@ -38,7 +38,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(fakeSubscriptions);
+      expect(result.data[0].fields[0].values).toEqual(fakeSubscriptions);
     });
 
     it('can fetch resourceGroups with a subscriptionId arg', async () => {
@@ -62,7 +62,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('can fetch metricNamespaces with a subscriptionId', async () => {
@@ -87,7 +87,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('can fetch resourceNames with a subscriptionId', async () => {
@@ -113,7 +113,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('can fetch a metricNamespace with a subscriptionId', async () => {
@@ -140,7 +140,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('can fetch metricNames with a subscriptionId', async () => {
@@ -167,7 +167,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('can fetch workspaces with a subscriptionId', async () => {
@@ -191,7 +191,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('can handle legacy string queries with a default subscription', async () => {
@@ -213,7 +213,7 @@ describe('VariableSupport', () => {
         targets: ['Namespaces(resourceGroup)' as unknown as AzureMonitorQuery],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('can handle legacy string queries', async () => {
@@ -232,7 +232,7 @@ describe('VariableSupport', () => {
         targets: ['Namespaces(subscriptionId, resourceGroup)' as unknown as AzureMonitorQuery],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('returns an empty array for unknown queries', async () => {
@@ -301,7 +301,7 @@ describe('VariableSupport', () => {
       ],
     } as DataQueryRequest<AzureMonitorQuery>;
     const result = await lastValueFrom(variableSupport.query(mockRequest));
-    expect(result.data[0].source).toEqual(expectedResults);
+    expect(result.data[0].fields[0].values).toEqual(expectedResults);
   });
 
   it('passes on the query error for a log query', async () => {
@@ -374,7 +374,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(fakeSubscriptions);
+      expect(result.data[0].fields[0].values).toEqual(fakeSubscriptions);
     });
 
     it('can fetch resourceGroups', async () => {
@@ -394,7 +394,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('returns no data if calling resourceGroups but the subscription is a template variable with no value', async () => {
@@ -429,7 +429,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('returns no data if calling namespaces but the subscription is a template variable with no value', async () => {
@@ -464,7 +464,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('returns no data if calling resourceNames but the subscription is a template variable with no value', async () => {
@@ -502,7 +502,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
 
     it('returns no data if calling metric names but the subscription is a template variable with no value', async () => {
@@ -540,7 +540,7 @@ describe('VariableSupport', () => {
         ],
       } as DataQueryRequest<AzureMonitorQuery>;
       const result = await lastValueFrom(variableSupport.query(mockRequest));
-      expect(result.data[0].source).toEqual(expectedResults);
+      expect(result.data[0].fields[0].values).toEqual(expectedResults);
     });
   });
 });

From dac709b3472b5a5e7dd39c1667c28278b2450701 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Thu, 27 Apr 2023 21:48:40 +0200
Subject: [PATCH 495/729] Canvas: Promote to GA (#67426)

---
 pkg/tests/api/plugins/data/expectedListResp.json | 2 +-
 public/app/plugins/panel/canvas/plugin.json      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json
index a43dfdfadf4..292386e1b24 100644
--- a/pkg/tests/api/plugins/data/expectedListResp.json
+++ b/pkg/tests/api/plugins/data/expectedListResp.json
@@ -309,7 +309,7 @@
     "hasUpdate": false,
     "defaultNavUrl": "/plugins/canvas/",
     "category": "",
-    "state": "beta",
+    "state": "",
     "signature": "internal",
     "signatureType": "",
     "signatureOrg": ""
diff --git a/public/app/plugins/panel/canvas/plugin.json b/public/app/plugins/panel/canvas/plugin.json
index 33e0ad908a3..17f06ce87ba 100644
--- a/public/app/plugins/panel/canvas/plugin.json
+++ b/public/app/plugins/panel/canvas/plugin.json
@@ -2,7 +2,6 @@
   "type": "panel",
   "name": "Canvas",
   "id": "canvas",
-  "state": "beta",
 
   "info": {
     "description": "Explicit element placement",

From f70efed2cb47d0b1c088ee524405ff5e230bd2b9 Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Thu, 27 Apr 2023 15:54:12 -0400
Subject: [PATCH 496/729] Prometheus: Update healthcheck text message (#67401)

* the healthcheck is used outside the config save&test so change text message

* fix e2e test
---
 e2e/various-suite/exemplars.spec.ts | 2 +-
 pkg/tsdb/prometheus/healthcheck.go  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/e2e/various-suite/exemplars.spec.ts b/e2e/various-suite/exemplars.spec.ts
index d341878b4cc..af990cb2d61 100644
--- a/e2e/various-suite/exemplars.spec.ts
+++ b/e2e/various-suite/exemplars.spec.ts
@@ -4,7 +4,7 @@ const dataSourceName = 'PromExemplar';
 const addDataSource = () => {
   e2e.flows.addDataSource({
     type: 'Prometheus',
-    expectedAlertMessage: 'saved',
+    expectedAlertMessage: 'Prometheus',
     name: dataSourceName,
     form: () => {
       e2e.components.DataSource.Prometheus.configPage.exemplarsAddButton().click();
diff --git a/pkg/tsdb/prometheus/healthcheck.go b/pkg/tsdb/prometheus/healthcheck.go
index 8929d12c766..9117e828b7c 100644
--- a/pkg/tsdb/prometheus/healthcheck.go
+++ b/pkg/tsdb/prometheus/healthcheck.go
@@ -64,15 +64,15 @@ func healthcheck(ctx context.Context, req *backend.CheckHealthRequest, i *instan
 	})
 
 	if err != nil {
-		return getHealthCheckMessage(logger, "Your configuration has been saved but there is an error.", err)
+		return getHealthCheckMessage(logger, "There was an error returned querying the Prometheus API.", err)
 	}
 
 	if resp.Responses[refID].Error != nil {
-		return getHealthCheckMessage(logger, "Your configuration has been saved but there is an error.",
+		return getHealthCheckMessage(logger, "There was an error returned querying the Prometheus API.",
 			errors.New(resp.Responses[refID].Error.Error()))
 	}
 
-	return getHealthCheckMessage(logger, "Successfully saved the configuration and queried the Prometheus API.", nil)
+	return getHealthCheckMessage(logger, "Successfully queried the Prometheus API.", nil)
 }
 
 func getHealthCheckMessage(logger log.Logger, message string, err error) (*backend.CheckHealthResult, error) {

From dbaace65293ad2ccfbaac7df35a8b1e4f6fb6513 Mon Sep 17 00:00:00 2001
From: MattiasSegerdahl <102952046+MattiasSegerdahl@users.noreply.github.com>
Date: Thu, 27 Apr 2023 22:28:53 +0200
Subject: [PATCH 497/729] Update index.md (#67363)

* Update index.md

* Update docs/sources/fundamentals/exemplars/index.md

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 docs/sources/fundamentals/exemplars/index.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/sources/fundamentals/exemplars/index.md b/docs/sources/fundamentals/exemplars/index.md
index b30cf32d55a..01e68c5f7fe 100644
--- a/docs/sources/fundamentals/exemplars/index.md
+++ b/docs/sources/fundamentals/exemplars/index.md
@@ -22,9 +22,9 @@ To identify the factors that are contributing to the latency, you must compare a
 
 Use exemplars to help isolate problems within your data distribution by pinpointing query traces exhibiting high latency within a time interval. Once you localize the latency problem to a few exemplar traces, you can combine it with additional system based information or location properties to perform a root cause analysis faster, leading to quick resolutions to performance issues.
 
-Support for exemplars is available for the Prometheus data source only. Once you enable the functionality, exemplars data is available by default. For more information on exemplar configuration and how to enable exemplars, refer to [configuring exemplars in Prometheus data source]({{< relref "../../datasources/prometheus/#configuring-exemplars" >}}).
+Support for exemplars is available for the Prometheus data source only. Once you enable the functionality, exemplar data is available by default. For more information on exemplar configuration and how to enable exemplars, refer to [configuring exemplars in the Prometheus data source]({{< relref "../../datasources/prometheus/#configuring-exemplars" >}}).
 
-Grafana shows exemplars alongside a metric in the Explore view and in dashboards. Each exemplar displays as a highlighted star. You can hover your cursor over an exemplar to view the unique traceID, which is a combination of a key value pair. To investigate further, click the blue button next to the `traceID` property.
+Grafana shows exemplars alongside a metric in the Explore view and in dashboards. Each exemplar displays as a highlighted star. You can hover your cursor over an exemplar to view the unique trace ID, which is a combination of a key value pair. To investigate further, click the blue button next to the `traceID` property.
 
 {{< figure src="/media/docs/grafana/exemplars/screenshot-exemplars.png" class="docs-image--no-shadow" max-width= "750px" caption="Screenshot showing the detail window of an exemplar" >}}
 
@@ -40,7 +40,7 @@ Explore visualizes exemplar traces as highlighted stars alongside metrics data.
 
 To examine the details of an exemplar trace:
 
-1. Place your cursor over an exemplar (highlighted star). Depending on your backend trace data source, you will see a blue button with the label `Query with <data source name>`. In the following example, the tracing data source is Tempo.
+1. Place your cursor over an exemplar (highlighted star). Depending on the trace data source you are using, you will see a blue button with the label `Query with <data source name>`. In the following example, the tracing data source is Tempo.
 
    {{< figure src="/media/docs/grafana/exemplars/screenshot-exemplar-details.png" class="docs-image--no-shadow" max-width= "350px" caption="Screenshot showing exemplar details" >}}
 
@@ -68,7 +68,7 @@ For more information on how to drill down and analyze the trace and span details
 
 This panel shows the details of the trace in different segments.
 
-- The top segment shows the Trace ID to indicate that the query results correspond to the specific trace.
+- The top segment displays the trace ID to indicate that the query results correspond to the specific trace.
 
   You can add more traces to the results using the `Add query` button.
 
@@ -78,7 +78,7 @@ This panel shows the details of the trace in different segments.
 
   1. In the magnified view, you can expand or collapse the various levels of the trace to drill down to the specific span of interest.
 
-     For example, if the strip view shows that most of the latency was within the app layer, you can expand the trace down the app layer to investigate the problem further. To expand a particular layer of span, click the icon on the left. The same button can collapse an expanded span.
+     For example, if the strip view shows that most of the latency was within the app layer, you can expand the trace down the app layer to investigate the problem further. To expand a particular layer of span, click the left icon. The same button can collapse an expanded span.
 
 - To see the details of the span at any level, click the span itself.
 

From b71b778d0dab11b432397c4cd96979ba7664284b Mon Sep 17 00:00:00 2001
From: MattiasSegerdahl <102952046+MattiasSegerdahl@users.noreply.github.com>
Date: Thu, 27 Apr 2023 22:29:04 +0200
Subject: [PATCH 498/729] Update index.md (#67364)

---
 docs/sources/fundamentals/intro-to-prometheus/index.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/sources/fundamentals/intro-to-prometheus/index.md b/docs/sources/fundamentals/intro-to-prometheus/index.md
index c144abf57c3..27f128bbf41 100644
--- a/docs/sources/fundamentals/intro-to-prometheus/index.md
+++ b/docs/sources/fundamentals/intro-to-prometheus/index.md
@@ -14,9 +14,9 @@ weight: 300
 
 # What is Prometheus?
 
-Observability focuses on understanding the internal state of your systems based on the data they produce, which helps determine if your infrastructure is healthy. Prometheus is a core technology for system observability, but the term "Prometheus" can be confusing because it is used in different contexts. Understanding Prometheus basics, why it’s valuable for system observability, and how people use it in practice will both help you better understand it and help you use Grafana.
+Observability focuses on understanding the internal state of your systems based on the data they produce, which helps determine if your infrastructure is healthy. Prometheus is a core technology for monitoring and observability of systems, but the term "Prometheus" can be confusing because it is used in different contexts. Understanding Prometheus basics, why it’s valuable for system observability, and how users use it in practice will both help you better understand it and help you use Grafana.
 
-Prometheus began in 2012 at SoundCloud because existing technologies were insufficient for their observability needs. Prometheus offers both a robust data model and a query language, which are discussed on this page. Prometheus is also simple and scalable. In 2018, Prometheus graduated from Cloud Native Computing Foundation (CNCF) incubation, and today has a thriving community.
+Prometheus began in 2012 at SoundCloud because existing technologies were insufficient for their observability needs. Prometheus offers both a robust data model and a query language. Prometheus is also simple and scalable. In 2018, Prometheus graduated from Cloud Native Computing Foundation (CNCF) incubation, and today has a thriving community.
 
 ## Prometheus as data
 
@@ -31,7 +31,7 @@ Prometheus is a technology that collects and stores time series data. Time serie
 - _metrics_ that consist of a _timestamp_ and a _sample_, which is the numeric value, such as how many disk bytes have been read or a stock price
 - a set of labels called _dimensions_, for example, `job` and `device`
 
-You can store time series data in any relational database, but these kinds of systems are not developed to store and query large volumes of time series data. Prometheus and similar software provide tools to compact and optimize time series data.
+You can store time series data in any relational database, however, these systems are not developed to store and query large volumes of time series data. Prometheus and similar software provide tools to compact and optimize time series data.
 
 ### Simple dashboard using PromQL
 
@@ -106,5 +106,5 @@ The combination of Prometheus and Grafana Agent gives you control over the metri
 Now that you understand how Prometheus metrics work, what will you build?
 
 - One great next step is to [build a dashboard]({{< relref "../../dashboards/build-dashboards/" >}}) in Grafana and start turning that raw Prometheus telemetry data into insights about what’s going with your services and infrastructure.
-- Another great step is to learn about [Grafana Mimir](/oss/mimir/), which is essentially a database for Prometheus data. If you’re wondering how to make this work for a huge number of metrics with a lot of data and fast querying, check out Grafana Mimir.
+- Another great step is to learn about [Grafana Mimir](/oss/mimir/), which is essentially a database for Prometheus data. If you’re wondering how to make this work for a large volumes of metrics with a lot of data and fast querying, check out Grafana Mimir.
 - If you’re interested in working with Prometheus data in Grafana directly, check out the [Prometheus data source]({{< relref "../../datasources/prometheus/" >}}) documentation, or check out [PromQL basics](https://prometheus.io/docs/prometheus/latest/querying/basics/).

From ca1f79b9ba8494655914719c25d62fe8af70c80f Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 27 Apr 2023 13:32:38 -0700
Subject: [PATCH 499/729] Kindsys: Target k8s style resource definitions
 (#67008)

Co-authored-by: sam boyer <sdboyer@grafana.com>
---
 .github/CODEOWNERS                            |   1 -
 .../kinds/core/dashboard/schema-reference.md  |  81 ++++++
 .../core/librarypanel/schema-reference.md     |  81 ++++++
 .../kinds/core/playlist/schema-reference.md   |  81 ++++++
 .../core/preferences/schema-reference.md      |  81 ++++++
 .../core/publicdashboard/schema-reference.md  |  81 ++++++
 .../core/serviceaccount/schema-reference.md   |  83 +++++-
 .../kinds/core/team/schema-reference.md       |  83 +++++-
 .../feature-toggles/index.md                  |   4 +-
 go.mod                                        |  14 +-
 go.sum                                        |  23 +-
 kinds/dashboard/dashboard_kind.cue            | 158 +++++------
 kinds/gen.go                                  |   8 +-
 kinds/librarypanel/librarypanel_kind.cue      |  42 +--
 kinds/playlist/playlist_kind.cue              |  24 +-
 kinds/preferences/preferences_kind.cue        |  34 +--
 .../publicdashboard/public_dashboard_kind.cue |  26 +-
 kinds/serviceaccount/serviceaccount_kind.cue  |  56 ++--
 kinds/team/team_kind.cue                      |  40 ++-
 .../raw/dashboard/x/dashboard_types.gen.ts    |  24 +-
 .../librarypanel/x/librarypanel_types.gen.ts  |   2 +-
 .../src/raw/playlist/x/playlist_types.gen.ts  |   2 +-
 .../preferences/x/preferences_types.gen.ts    |   4 +-
 .../x/publicdashboard_types.gen.ts            |   2 +-
 .../x/serviceaccount_types.gen.ts             |  10 +-
 .../src/raw/team/x/team_types.gen.ts          |  10 +-
 pkg/api/dashboard.go                          |   5 +-
 pkg/api/preferences.go                        |   4 +-
 pkg/codegen/jenny_eachmajor.go                |  20 +-
 pkg/codegen/jenny_go_resources.go             | 118 ++++++++
 .../{jenny_gotypes.go => jenny_go_types.go}   |   0
 pkg/codegen/jenny_ts_resources.go             |  79 ++++++
 .../{jenny_tstypes.go => jenny_ts_types.go}   |   0
 pkg/codegen/jenny_tsveneerindex.go            |  11 +-
 pkg/codegen/tmpl.go                           |   9 +-
 pkg/codegen/tmpl/core_resource.tmpl           |   7 +
 pkg/codegen/tmpl/kind_core.tmpl               |  14 +-
 pkg/kinds/dashboard/dashboard_gen.go          |  17 ++
 pkg/kinds/dashboard/dashboard_kind_gen.go     |  14 +-
 pkg/kinds/dashboard/dashboard_metadata_gen.go |  42 +++
 ...ard_types_gen.go => dashboard_spec_gen.go} | 252 ++++++++----------
 pkg/kinds/dashboard/dashboard_status_gen.go   |  47 ++++
 pkg/kinds/dashboard/dashboards_test.go        |  89 -------
 pkg/kinds/librarypanel/librarypanel_gen.go    |  17 ++
 .../librarypanel/librarypanel_kind_gen.go     |  14 +-
 .../librarypanel/librarypanel_metadata_gen.go |  42 +++
 ..._types_gen.go => librarypanel_spec_gen.go} |   7 +-
 .../librarypanel/librarypanel_status_gen.go   |  47 ++++
 pkg/kinds/playlist/playlist_gen.go            |  17 ++
 pkg/kinds/playlist/playlist_kind_gen.go       |  14 +-
 pkg/kinds/playlist/playlist_metadata_gen.go   |  42 +++
 ...list_types_gen.go => playlist_spec_gen.go} |  39 ++-
 pkg/kinds/playlist/playlist_status_gen.go     |  47 ++++
 pkg/kinds/preferences/preferences_gen.go      |  17 ++
 pkg/kinds/preferences/preferences_kind_gen.go |  14 +-
 .../preferences/preferences_metadata_gen.go   |  42 +++
 ...s_types_gen.go => preferences_spec_gen.go} |  19 +-
 .../preferences/preferences_status_gen.go     |  47 ++++
 .../publicdashboard/publicdashboard_gen.go    |  17 ++
 .../publicdashboard_kind_gen.go               |  14 +-
 .../publicdashboard_metadata_gen.go           |  42 +++
 ...pes_gen.go => publicdashboard_spec_gen.go} |   7 +-
 .../publicdashboard_status_gen.go             |  47 ++++
 .../serviceaccount/serviceaccount_gen.go      |  17 ++
 .../serviceaccount/serviceaccount_kind_gen.go |  14 +-
 .../serviceaccount_metadata_gen.go            |  42 +++
 ...ypes_gen.go => serviceaccount_spec_gen.go} |  17 +-
 .../serviceaccount_status_gen.go              |  47 ++++
 pkg/kinds/team/team_gen.go                    |  17 ++
 pkg/kinds/team/team_kind_gen.go               |  14 +-
 pkg/kinds/team/team_metadata_gen.go           |  42 +++
 .../{team_types_gen.go => team_spec_gen.go}   |  17 +-
 pkg/kinds/team/team_status_gen.go             |  47 ++++
 pkg/services/playlist/model.go                |   2 +-
 pkg/services/store/kind/playlist/summary.go   |   2 +-
 .../store/kind/playlist/summary_test.go       |   2 +-
 .../store/kind/preferences/summary.go         |   2 +-
 .../app/features/teams/__mocks__/teamMocks.ts |   2 -
 public/app/features/teams/state/navModel.ts   |   1 -
 scripts/validate-devenv-dashboards.sh         |  11 -
 80 files changed, 1991 insertions(+), 640 deletions(-)
 create mode 100644 pkg/codegen/jenny_go_resources.go
 rename pkg/codegen/{jenny_gotypes.go => jenny_go_types.go} (100%)
 create mode 100644 pkg/codegen/jenny_ts_resources.go
 rename pkg/codegen/{jenny_tstypes.go => jenny_ts_types.go} (100%)
 create mode 100644 pkg/codegen/tmpl/core_resource.tmpl
 create mode 100644 pkg/kinds/dashboard/dashboard_gen.go
 create mode 100644 pkg/kinds/dashboard/dashboard_metadata_gen.go
 rename pkg/kinds/dashboard/{dashboard_types_gen.go => dashboard_spec_gen.go} (95%)
 create mode 100644 pkg/kinds/dashboard/dashboard_status_gen.go
 delete mode 100644 pkg/kinds/dashboard/dashboards_test.go
 create mode 100644 pkg/kinds/librarypanel/librarypanel_gen.go
 create mode 100644 pkg/kinds/librarypanel/librarypanel_metadata_gen.go
 rename pkg/kinds/librarypanel/{librarypanel_types_gen.go => librarypanel_spec_gen.go} (94%)
 create mode 100644 pkg/kinds/librarypanel/librarypanel_status_gen.go
 create mode 100644 pkg/kinds/playlist/playlist_gen.go
 create mode 100644 pkg/kinds/playlist/playlist_metadata_gen.go
 rename pkg/kinds/playlist/{playlist_types_gen.go => playlist_spec_gen.go} (94%)
 create mode 100644 pkg/kinds/playlist/playlist_status_gen.go
 create mode 100644 pkg/kinds/preferences/preferences_gen.go
 create mode 100644 pkg/kinds/preferences/preferences_metadata_gen.go
 rename pkg/kinds/preferences/{preferences_types_gen.go => preferences_spec_gen.go} (89%)
 create mode 100644 pkg/kinds/preferences/preferences_status_gen.go
 create mode 100644 pkg/kinds/publicdashboard/publicdashboard_gen.go
 create mode 100644 pkg/kinds/publicdashboard/publicdashboard_metadata_gen.go
 rename pkg/kinds/publicdashboard/{publicdashboard_types_gen.go => publicdashboard_spec_gen.go} (86%)
 create mode 100644 pkg/kinds/publicdashboard/publicdashboard_status_gen.go
 create mode 100644 pkg/kinds/serviceaccount/serviceaccount_gen.go
 create mode 100644 pkg/kinds/serviceaccount/serviceaccount_metadata_gen.go
 rename pkg/kinds/serviceaccount/{serviceaccount_types_gen.go => serviceaccount_spec_gen.go} (81%)
 create mode 100644 pkg/kinds/serviceaccount/serviceaccount_status_gen.go
 create mode 100644 pkg/kinds/team/team_gen.go
 create mode 100644 pkg/kinds/team/team_metadata_gen.go
 rename pkg/kinds/team/{team_types_gen.go => team_spec_gen.go} (77%)
 create mode 100644 pkg/kinds/team/team_status_gen.go
 delete mode 100755 scripts/validate-devenv-dashboards.sh

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 887be3290ce..0314cdf07a0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -473,7 +473,6 @@ lerna.json @grafana/frontend-ops
 /scripts/trigger_docker_build.sh @grafana/grafana-delivery
 /scripts/trigger_grafana_packer.sh @grafana/grafana-delivery
 /scripts/trigger_windows_build.sh @grafana/grafana-delivery
-/scripts/validate-devenv-dashboards.sh @grafana/grafana-delivery
 /scripts/verify-repo-update/ @grafana/grafana-delivery
 
 /scripts/webpack/ @grafana/frontend-ops
diff --git a/docs/sources/developers/kinds/core/dashboard/schema-reference.md b/docs/sources/developers/kinds/core/dashboard/schema-reference.md
index ed150b04d41..43bb5161711 100644
--- a/docs/sources/developers/kinds/core/dashboard/schema-reference.md
+++ b/docs/sources/developers/kinds/core/dashboard/schema-reference.md
@@ -13,6 +13,57 @@ title: Dashboard kind
 
 A Grafana dashboard.
 
+| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
+|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
+| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+
+### Metadata
+
+metadata contains embedded CommonMetadata and can be extended with custom string fields
+TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+without external reference as using the CommonMetadata reference breaks thema codegen.
+
+It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
+
+| Property            | Type                   | Required | Default | Description                                                                                                                             |
+|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
+| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
+| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+
+### _kubeObjectMetadata
+
+_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+As it is also intended to be generic enough to function with any API Server.
+
+| Property            | Type              | Required | Default | Description |
+|---------------------|-------------------|----------|---------|-------------|
+| `creationTimestamp` | string            | **Yes**  |         |             |
+| `finalizers`        | string[]          | **Yes**  |         |             |
+| `labels`            | map[string]string | **Yes**  |         |             |
+| `resourceVersion`   | string            | **Yes**  |         |             |
+| `uid`               | string            | **Yes**  |         |             |
+| `deletionTimestamp` | string            | No       |         |             |
+
+### ExtraFields
+
+extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### Spec
+
 | Property               | Type                                        | Required | Default   | Description                                                                                                                                                                                                                                 |
 |------------------------|---------------------------------------------|----------|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `editable`             | boolean                                     | **Yes**  | `true`    | Whether a dashboard is editable or not.                                                                                                                                                                                                     |
@@ -608,4 +659,34 @@ TODO this appears to be spread all over in the frontend. Concepts will likely ne
 | `refresh_intervals` | string[] | **Yes**  | `[5s 10s 30s 1m 5m 15m 30m 1h 2h 1d]` | Selectable intervals for auto-refresh.  |
 | `time_options`      | string[] | **Yes**  | `[5m 15m 1h 6h 12h 24h 2d 7d 30d]`    | TODO docs                               |
 
+### Status
+
+| Property           | Type                                                                             | Required | Default | Description                                                                                                                                                                |
+|--------------------|----------------------------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `additionalFields` | [object](#additionalfields)                                                      | **Yes**  |         | additionalFields is reserved for future use                                                                                                                                |
+| `operatorStates`   | map[string][joinSchema.status.#OperatorState](#joinschema.status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
+
+### AdditionalFields
+
+additionalFields is reserved for future use
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### JoinSchema.Status.#OperatorState
+
+| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
+|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
+| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
+| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
+| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
+
+### Details
+
+details contains any extra information that is operator-specific
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
 
diff --git a/docs/sources/developers/kinds/core/librarypanel/schema-reference.md b/docs/sources/developers/kinds/core/librarypanel/schema-reference.md
index 090c0ab163b..b0e7fa8b078 100644
--- a/docs/sources/developers/kinds/core/librarypanel/schema-reference.md
+++ b/docs/sources/developers/kinds/core/librarypanel/schema-reference.md
@@ -13,6 +13,57 @@ title: LibraryPanel kind
 
 A standalone panel
 
+| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
+|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
+| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+
+### Metadata
+
+metadata contains embedded CommonMetadata and can be extended with custom string fields
+TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+without external reference as using the CommonMetadata reference breaks thema codegen.
+
+It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
+
+| Property            | Type                   | Required | Default | Description                                                                                                                             |
+|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
+| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
+| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+
+### _kubeObjectMetadata
+
+_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+As it is also intended to be generic enough to function with any API Server.
+
+| Property            | Type              | Required | Default | Description |
+|---------------------|-------------------|----------|---------|-------------|
+| `creationTimestamp` | string            | **Yes**  |         |             |
+| `finalizers`        | string[]          | **Yes**  |         |             |
+| `labels`            | map[string]string | **Yes**  |         |             |
+| `resourceVersion`   | string            | **Yes**  |         |             |
+| `uid`               | string            | **Yes**  |         |             |
+| `deletionTimestamp` | string            | No       |         |             |
+
+### ExtraFields
+
+extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### Spec
+
 | Property        | Type                                            | Required | Default | Description                                                                                                                          |
 |-----------------|-------------------------------------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------|
 | `model`         | [object](#model)                                | **Yes**  |         | TODO: should be the same panel schema defined in dashboard<br/>Typescript: Omit<Panel, 'gridPos' &#124; 'id' &#124; 'libraryPanel'>; |
@@ -53,4 +104,34 @@ Typescript: Omit<Panel, 'gridPos' | 'id' | 'libraryPanel'>;
 | Property | Type | Required | Default | Description |
 |----------|------|----------|---------|-------------|
 
+### Status
+
+| Property           | Type                                                                             | Required | Default | Description                                                                                                                                                                |
+|--------------------|----------------------------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `additionalFields` | [object](#additionalfields)                                                      | **Yes**  |         | additionalFields is reserved for future use                                                                                                                                |
+| `operatorStates`   | map[string][joinSchema.status.#OperatorState](#joinschema.status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
+
+### AdditionalFields
+
+additionalFields is reserved for future use
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### JoinSchema.Status.#OperatorState
+
+| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
+|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
+| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
+| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
+| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
+
+### Details
+
+details contains any extra information that is operator-specific
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
 
diff --git a/docs/sources/developers/kinds/core/playlist/schema-reference.md b/docs/sources/developers/kinds/core/playlist/schema-reference.md
index a58544c41c8..06285751bef 100644
--- a/docs/sources/developers/kinds/core/playlist/schema-reference.md
+++ b/docs/sources/developers/kinds/core/playlist/schema-reference.md
@@ -13,6 +13,57 @@ title: Playlist kind
 
 A playlist is a series of dashboards that is automatically rotated in the browser, on a configurable interval.
 
+| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
+|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
+| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+
+### Metadata
+
+metadata contains embedded CommonMetadata and can be extended with custom string fields
+TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+without external reference as using the CommonMetadata reference breaks thema codegen.
+
+It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
+
+| Property            | Type                   | Required | Default | Description                                                                                                                             |
+|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
+| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
+| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+
+### _kubeObjectMetadata
+
+_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+As it is also intended to be generic enough to function with any API Server.
+
+| Property            | Type              | Required | Default | Description |
+|---------------------|-------------------|----------|---------|-------------|
+| `creationTimestamp` | string            | **Yes**  |         |             |
+| `finalizers`        | string[]          | **Yes**  |         |             |
+| `labels`            | map[string]string | **Yes**  |         |             |
+| `resourceVersion`   | string            | **Yes**  |         |             |
+| `uid`               | string            | **Yes**  |         |             |
+| `deletionTimestamp` | string            | No       |         |             |
+
+### ExtraFields
+
+extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### Spec
+
 | Property   | Type                            | Required | Default | Description                                                                                                                                                          |
 |------------|---------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `interval` | string                          | **Yes**  | `5m`    | Interval sets the time between switching views in a playlist.<br/>FIXME: Is this based on a standardized format or what options are available? Can datemath be used? |
@@ -28,4 +79,34 @@ A playlist is a series of dashboards that is automatically rotated in the browse
 | `value`  | string | **Yes**  |         | Value depends on type and describes the playlist item.<br/><br/> - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This<br/> is not portable as the numerical identifier is non-deterministic between different instances.<br/> Will be replaced by dashboard_by_uid in the future. (deprecated)<br/> - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All<br/> dashboards behind the tag will be added to the playlist.<br/> - dashboard_by_uid: The value is the dashboard UID |
 | `title`  | string | No       |         | Title is an unused property -- it will be removed in the future                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 
+### Status
+
+| Property           | Type                                                                             | Required | Default | Description                                                                                                                                                                |
+|--------------------|----------------------------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `additionalFields` | [object](#additionalfields)                                                      | **Yes**  |         | additionalFields is reserved for future use                                                                                                                                |
+| `operatorStates`   | map[string][joinSchema.status.#OperatorState](#joinschema.status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
+
+### AdditionalFields
+
+additionalFields is reserved for future use
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### JoinSchema.Status.#OperatorState
+
+| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
+|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
+| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
+| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
+| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
+
+### Details
+
+details contains any extra information that is operator-specific
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
 
diff --git a/docs/sources/developers/kinds/core/preferences/schema-reference.md b/docs/sources/developers/kinds/core/preferences/schema-reference.md
index 1f487e05207..54254a08232 100644
--- a/docs/sources/developers/kinds/core/preferences/schema-reference.md
+++ b/docs/sources/developers/kinds/core/preferences/schema-reference.md
@@ -13,6 +13,57 @@ title: Preferences kind
 
 The user or team frontend preferences
 
+| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
+|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
+| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+
+### Metadata
+
+metadata contains embedded CommonMetadata and can be extended with custom string fields
+TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+without external reference as using the CommonMetadata reference breaks thema codegen.
+
+It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
+
+| Property            | Type                   | Required | Default | Description                                                                                                                             |
+|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
+| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
+| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+
+### _kubeObjectMetadata
+
+_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+As it is also intended to be generic enough to function with any API Server.
+
+| Property            | Type              | Required | Default | Description |
+|---------------------|-------------------|----------|---------|-------------|
+| `creationTimestamp` | string            | **Yes**  |         |             |
+| `finalizers`        | string[]          | **Yes**  |         |             |
+| `labels`            | map[string]string | **Yes**  |         |             |
+| `resourceVersion`   | string            | **Yes**  |         |             |
+| `uid`               | string            | **Yes**  |         |             |
+| `deletionTimestamp` | string            | No       |         |             |
+
+### ExtraFields
+
+extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### Spec
+
 | Property           | Type                                              | Required | Default | Description                                                                     |
 |--------------------|---------------------------------------------------|----------|---------|---------------------------------------------------------------------------------|
 | `homeDashboardUID` | string                                            | No       |         | UID for the home dashboard                                                      |
@@ -28,4 +79,34 @@ The user or team frontend preferences
 |-----------|--------|----------|---------|---------------------------------------------|
 | `homeTab` | string | No       |         | one of: '' &#124; 'query' &#124; 'starred'; |
 
+### Status
+
+| Property           | Type                                                                             | Required | Default | Description                                                                                                                                                                |
+|--------------------|----------------------------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `additionalFields` | [object](#additionalfields)                                                      | **Yes**  |         | additionalFields is reserved for future use                                                                                                                                |
+| `operatorStates`   | map[string][joinSchema.status.#OperatorState](#joinschema.status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
+
+### AdditionalFields
+
+additionalFields is reserved for future use
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### JoinSchema.Status.#OperatorState
+
+| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
+|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
+| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
+| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
+| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
+
+### Details
+
+details contains any extra information that is operator-specific
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
 
diff --git a/docs/sources/developers/kinds/core/publicdashboard/schema-reference.md b/docs/sources/developers/kinds/core/publicdashboard/schema-reference.md
index 27134952937..1539db4cf20 100644
--- a/docs/sources/developers/kinds/core/publicdashboard/schema-reference.md
+++ b/docs/sources/developers/kinds/core/publicdashboard/schema-reference.md
@@ -13,6 +13,57 @@ title: PublicDashboard kind
 
 Public dashboard configuration
 
+| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
+|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
+| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+
+### Metadata
+
+metadata contains embedded CommonMetadata and can be extended with custom string fields
+TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+without external reference as using the CommonMetadata reference breaks thema codegen.
+
+It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
+
+| Property            | Type                   | Required | Default | Description                                                                                                                             |
+|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
+| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
+| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+
+### _kubeObjectMetadata
+
+_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+As it is also intended to be generic enough to function with any API Server.
+
+| Property            | Type              | Required | Default | Description |
+|---------------------|-------------------|----------|---------|-------------|
+| `creationTimestamp` | string            | **Yes**  |         |             |
+| `finalizers`        | string[]          | **Yes**  |         |             |
+| `labels`            | map[string]string | **Yes**  |         |             |
+| `resourceVersion`   | string            | **Yes**  |         |             |
+| `uid`               | string            | **Yes**  |         |             |
+| `deletionTimestamp` | string            | No       |         |             |
+
+### ExtraFields
+
+extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### Spec
+
 | Property               | Type    | Required | Default | Description                                                     |
 |------------------------|---------|----------|---------|-----------------------------------------------------------------|
 | `annotationsEnabled`   | boolean | **Yes**  |         | Flag that indicates if annotations are enabled                  |
@@ -22,4 +73,34 @@ Public dashboard configuration
 | `uid`                  | string  | **Yes**  |         | Unique public dashboard identifier                              |
 | `accessToken`          | string  | No       |         | Unique public access token                                      |
 
+### Status
+
+| Property           | Type                                                                             | Required | Default | Description                                                                                                                                                                |
+|--------------------|----------------------------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `additionalFields` | [object](#additionalfields)                                                      | **Yes**  |         | additionalFields is reserved for future use                                                                                                                                |
+| `operatorStates`   | map[string][joinSchema.status.#OperatorState](#joinschema.status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
+
+### AdditionalFields
+
+additionalFields is reserved for future use
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### JoinSchema.Status.#OperatorState
+
+| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
+|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
+| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
+| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
+| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
+
+### Details
+
+details contains any extra information that is operator-specific
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
 
diff --git a/docs/sources/developers/kinds/core/serviceaccount/schema-reference.md b/docs/sources/developers/kinds/core/serviceaccount/schema-reference.md
index 4d220d5513e..dd9a9942187 100644
--- a/docs/sources/developers/kinds/core/serviceaccount/schema-reference.md
+++ b/docs/sources/developers/kinds/core/serviceaccount/schema-reference.md
@@ -13,6 +13,57 @@ title: ServiceAccount kind
 
 system account
 
+| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
+|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
+| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+
+### Metadata
+
+metadata contains embedded CommonMetadata and can be extended with custom string fields
+TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+without external reference as using the CommonMetadata reference breaks thema codegen.
+
+It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
+
+| Property            | Type                   | Required | Default | Description                                                                                                                             |
+|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
+| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
+| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+
+### _kubeObjectMetadata
+
+_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+As it is also intended to be generic enough to function with any API Server.
+
+| Property            | Type              | Required | Default | Description |
+|---------------------|-------------------|----------|---------|-------------|
+| `creationTimestamp` | string            | **Yes**  |         |             |
+| `finalizers`        | string[]          | **Yes**  |         |             |
+| `labels`            | map[string]string | **Yes**  |         |             |
+| `resourceVersion`   | string            | **Yes**  |         |             |
+| `uid`               | string            | **Yes**  |         |             |
+| `deletionTimestamp` | string            | No       |         |             |
+
+### ExtraFields
+
+extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### Spec
+
 | Property        | Type               | Required | Default | Description                                                                                                                             |
 |-----------------|--------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
 | `avatarUrl`     | string             | **Yes**  |         | AvatarUrl is the service account's avatar URL. It allows the frontend to display a picture in front<br/>of the service account.         |
@@ -24,8 +75,36 @@ system account
 | `role`          | string             | **Yes**  |         | OrgRole is a Grafana Organization Role which can be 'Viewer', 'Editor', 'Admin'.<br/>Possible values are: `Admin`, `Editor`, `Viewer`.  |
 | `tokens`        | integer            | **Yes**  |         | Tokens is the number of active tokens for the service account.<br/>Tokens are used to authenticate the service account against Grafana. |
 | `accessControl` | map[string]boolean | No       |         | AccessControl metadata associated with a given resource.                                                                                |
-| `created`       | string             | No       |         | Created indicates when the service account was created.                                                                                 |
 | `teams`         | string[]           | No       |         | Teams is a list of teams the service account belongs to.                                                                                |
-| `updated`       | string             | No       |         | Updated indicates when the service account was updated.                                                                                 |
+
+### Status
+
+| Property           | Type                                                                             | Required | Default | Description                                                                                                                                                                |
+|--------------------|----------------------------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `additionalFields` | [object](#additionalfields)                                                      | **Yes**  |         | additionalFields is reserved for future use                                                                                                                                |
+| `operatorStates`   | map[string][joinSchema.status.#OperatorState](#joinschema.status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
+
+### AdditionalFields
+
+additionalFields is reserved for future use
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### JoinSchema.Status.#OperatorState
+
+| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
+|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
+| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
+| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
+| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
+
+### Details
+
+details contains any extra information that is operator-specific
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
 
 
diff --git a/docs/sources/developers/kinds/core/team/schema-reference.md b/docs/sources/developers/kinds/core/team/schema-reference.md
index 85543c78700..8950ac81b88 100644
--- a/docs/sources/developers/kinds/core/team/schema-reference.md
+++ b/docs/sources/developers/kinds/core/team/schema-reference.md
@@ -13,16 +13,95 @@ title: Team kind
 
 A team is a named grouping of Grafana users to which access control rules may be assigned.
 
+| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
+|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
+| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+
+### Metadata
+
+metadata contains embedded CommonMetadata and can be extended with custom string fields
+TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+without external reference as using the CommonMetadata reference breaks thema codegen.
+
+It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
+
+| Property            | Type                   | Required | Default | Description                                                                                                                             |
+|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
+| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
+| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+
+### _kubeObjectMetadata
+
+_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+As it is also intended to be generic enough to function with any API Server.
+
+| Property            | Type              | Required | Default | Description |
+|---------------------|-------------------|----------|---------|-------------|
+| `creationTimestamp` | string            | **Yes**  |         |             |
+| `finalizers`        | string[]          | **Yes**  |         |             |
+| `labels`            | map[string]string | **Yes**  |         |             |
+| `resourceVersion`   | string            | **Yes**  |         |             |
+| `uid`               | string            | **Yes**  |         |             |
+| `deletionTimestamp` | string            | No       |         |             |
+
+### ExtraFields
+
+extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### Spec
+
 | Property        | Type               | Required | Default | Description                                              |
 |-----------------|--------------------|----------|---------|----------------------------------------------------------|
-| `created`       | string             | **Yes**  |         | Created indicates when the team was created.             |
 | `memberCount`   | integer            | **Yes**  |         | MemberCount is the number of the team members.           |
 | `name`          | string             | **Yes**  |         | Name of the team.                                        |
 | `orgId`         | integer            | **Yes**  |         | OrgId is the ID of an organisation the team belongs to.  |
 | `permission`    | integer            | **Yes**  |         | Possible values are: `0`, `1`, `2`, `4`.                 |
-| `updated`       | string             | **Yes**  |         | Updated indicates when the team was updated.             |
 | `accessControl` | map[string]boolean | No       |         | AccessControl metadata associated with a given resource. |
 | `avatarUrl`     | string             | No       |         | AvatarUrl is the team's avatar URL.                      |
 | `email`         | string             | No       |         | Email of the team.                                       |
 
+### Status
+
+| Property           | Type                                                                             | Required | Default | Description                                                                                                                                                                |
+|--------------------|----------------------------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `additionalFields` | [object](#additionalfields)                                                      | **Yes**  |         | additionalFields is reserved for future use                                                                                                                                |
+| `operatorStates`   | map[string][joinSchema.status.#OperatorState](#joinschema.status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
+
+### AdditionalFields
+
+additionalFields is reserved for future use
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### JoinSchema.Status.#OperatorState
+
+| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
+|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
+| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
+| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
+| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
+
+### Details
+
+details contains any extra information that is operator-specific
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
 
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 92915e4f6ac..bc03c5b2b41 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -61,8 +61,6 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `renderAuthJWT`                      | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
 | `enableElasticsearchBackendQuerying` | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                              |
 | `enableDatagridEditing`              | Enables the edit functionality in the datagrid panel                                                                                                                                         |
-| `publicDashboards`                   | Enables public access to dashboards                                                                                                                                                          |
-| `publicDashboardsEmailSharing`       | Enables public dashboard sharing to be restricted to only allowed emails                                                                                                                     |
 
 ## Alpha feature toggles
 
@@ -73,6 +71,8 @@ Alpha features might be changed or removed without prior notice.
 | ---------------------------------- | -------------------------------------------------------------------------------------------------------------- |
 | `live-service-web-worker`          | This will use a webworker thread to processes events rather than the main thread                               |
 | `queryOverLive`                    | Use Grafana Live WebSocket to execute backend queries                                                          |
+| `publicDashboards`                 | Enables public access to dashboards                                                                            |
+| `publicDashboardsEmailSharing`     | Enables public dashboard sharing to be restricted to only allowed emails                                       |
 | `lokiLive`                         | Support WebSocket streaming for loki (early prototype)                                                         |
 | `storage`                          | Configurable storage for dashboards, datasources, and resources                                                |
 | `newTraceViewHeader`               | Shows the new trace view header                                                                                |
diff --git a/go.mod b/go.mod
index 043f4e97785..108e86c82bd 100644
--- a/go.mod
+++ b/go.mod
@@ -22,10 +22,7 @@ replace github.com/deepmap/oapi-codegen => github.com/spinillos/oapi-codegen v1.
 // hoist a replace statement.
 replace k8s.io/client-go => k8s.io/client-go v0.25.3
 
-require (
-	k8s.io/apiextensions-apiserver v0.26.2 // indirect
-	k8s.io/apimachinery v0.26.2
-)
+require k8s.io/apimachinery v0.26.2
 
 require (
 	cloud.google.com/go/storage v1.28.1
@@ -266,7 +263,7 @@ require (
 	github.com/grafana/dataplane/examples v0.0.0-20230404174214-4d6fd58a18ad
 	github.com/grafana/dataplane/sdata v0.0.6
 	github.com/grafana/go-mssqldb v0.9.1
-	github.com/grafana/kindsys v0.0.0-20230414093523-5df3e256ebc0
+	github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a
 	github.com/grafana/thema v0.0.0-20230417103609-99b482c479fe
 	github.com/redis/go-redis/v9 v9.0.2
 	github.com/weaveworks/common v0.0.0-20230208133027-16871410fca4
@@ -297,8 +294,10 @@ require (
 	github.com/drone/drone-go v1.7.1 // indirect
 	github.com/drone/envsubst v1.0.3 // indirect
 	github.com/drone/runner-go v1.12.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/envoyproxy/go-control-plane v0.10.3 // indirect
 	github.com/envoyproxy/protoc-gen-validate v0.6.13 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -337,11 +336,8 @@ require (
 	go.opentelemetry.io/otel/metric v0.37.0 // indirect
 	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
+	k8s.io/api v0.26.2 // indirect
 	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
 require (
diff --git a/go.sum b/go.sum
index d5b00783ff0..ac6805e8220 100644
--- a/go.sum
+++ b/go.sum
@@ -739,10 +739,10 @@ github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac/go.mod h1:Ro8st/El
 github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
 github.com/elazarl/goproxy/ext v0.0.0-20220115173737-adb46da277ac h1:9yrT5tmn9Zc0ytWPASlaPwQfQMQYnRf0RSDe1XvHw0Q=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw=
 github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
@@ -786,6 +786,7 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/fsouza/fake-gcs-server v1.7.0/go.mod h1:5XIRs4YvwNbNoz+1JF8j6KLAyDh7RHGAyAK3EP2EsNk=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
@@ -1268,8 +1269,6 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32 h1:LdPoVBj+CA5oHLeUejDzqy8/c4Fa0UfTtCcOHka0Jws=
-github.com/grafana/alerting v0.0.0-20230418161049-5f374e58cb32/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
 github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2 h1:teRmmE08bSnvyh3e+adfv/6RA1ZZdhTCmNL9Ckfm1Rk=
 github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
@@ -1296,8 +1295,8 @@ github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW3
 github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk=
 github.com/grafana/grafana-plugin-sdk-go v0.159.0 h1:tjqzTe/wz+1zzaeHpOJvBvSvZFx/bJUSHj6WA8HJqhE=
 github.com/grafana/grafana-plugin-sdk-go v0.159.0/go.mod h1:7/F3lL/w3MGuZTwu0jam5oL/4zNOQmhs2k8WZ9VlzhI=
-github.com/grafana/kindsys v0.0.0-20230414093523-5df3e256ebc0 h1:Or8DllkxKq3+kLXAS/tkr5K2Yv745c6K2rRvslGWGd4=
-github.com/grafana/kindsys v0.0.0-20230414093523-5df3e256ebc0/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
+github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a h1:i2YhC6eTyDp+7Ftv5c6VZDUQskmKX4oIPGf38qfiZiU=
+github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
 github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413 h1:bBzCezZNRyYlJpXTkyZdY4fpPxHZUdyeyRWzhtw/P6I=
 github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413/go.mod h1:IvwuGG9xa/h96UH/exgvsfy3zE+ZpctkNT9o5aaGdrU=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20230308154952-78fedf89728b h1:VQOGGGJ2lKcVPANyzIESKYhSeA0QIvUQwfA3CbrkDfA=
@@ -1642,15 +1641,8 @@ github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W
 github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
 github.com/lestrrat-go/jwx v1.2.25/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY=
 github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
 github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
-github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/linkedin/goavro/v2 v2.10.0 h1:eTBIRoInBM88gITGXYtUSqqxLTFXfOsJBiX8ZMW0o4U=
@@ -2935,6 +2927,7 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908150016-7ac13a9a928d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -3271,8 +3264,7 @@ k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s=
 k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk=
 k8s.io/api v0.25.3/go.mod h1:o42gKscFrEVjHdQnyRenACrMtbuJsVdP+WVjqejfzmI=
 k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=
-k8s.io/apiextensions-apiserver v0.26.2 h1:/yTG2B9jGY2Q70iGskMf41qTLhL9XeNN2KhI0uDgwko=
-k8s.io/apiextensions-apiserver v0.26.2/go.mod h1:Y7UPgch8nph8mGCuVk0SK83LnS8Esf3n6fUBgew8SH8=
+k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
 k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8=
 k8s.io/apimachinery v0.17.5/go.mod h1:ioIo1G/a+uONV7Tv+ZmCbMG1/a3kVw5YcDdncd8ugQ0=
 k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
@@ -3302,6 +3294,7 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
@@ -3311,7 +3304,6 @@ k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/klog/v2 v2.20.0/go.mod h1:Gm8eSIfQN6457haJuPaMxZw4wyP5k+ykPFlrhQDvhvw=
 k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
-k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4=
 k8s.io/kube-openapi v0.0.0-20190722073852-5e22f3d471e6/go.mod h1:RZvgC8MSN6DjiMV6oIfEE9pDL9CYXokkfaCKZeHm3nc=
 k8s.io/kube-openapi v0.0.0-20200316234421-82d701f24f9d/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU=
@@ -3337,6 +3329,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/structured-merge-diff/v2 v2.0.1/go.mod h1:Wb7vfKAodbKgf6tn1Kl0VvGj7mRH6DGaRcixXEJXTsE=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
diff --git a/kinds/dashboard/dashboard_kind.cue b/kinds/dashboard/dashboard_kind.cue
index 65349ace538..6711c0deb61 100644
--- a/kinds/dashboard/dashboard_kind.cue
+++ b/kinds/dashboard/dashboard_kind.cue
@@ -16,91 +16,83 @@ lineage: seqs: [
 		schemas: [
 			// 0.0
 			{
-				@grafana(TSVeneer="type")
+				spec: {
+					// Unique numeric identifier for the dashboard.
+					// TODO must isolate or remove identifiers local to a Grafana instance...?
+					id?: int64
+					// Unique dashboard identifier that can be generated by anyone. string (8-40)
+					uid?: string
+					// Title of dashboard.
+					title?: string
+					// Description of dashboard.
+					description?: string
+					// This property should only be used in dashboards defined by plugins.  It is a quick check
+					// to see if the version has changed since the last time.  Unclear why using the version property
+					// is insufficient.
+					revision?: int64 @grafanamaturity(NeedsExpertReview)
+					// For dashboards imported from the https://grafana.com/grafana/dashboards/ portal
+					gnetId?: string @grafanamaturity(NeedsExpertReview)
+					// Tags associated with dashboard.
+					tags?: [...string] @grafanamaturity(NeedsExpertReview)
+					// Theme of dashboard.
+					style: "light" | *"dark" @grafanamaturity(NeedsExpertReview)
+					// Timezone of dashboard. Accepts IANA TZDB zone ID or "browser" or "utc".
+					timezone?: string | *"browser"
+					// Whether a dashboard is editable or not.
+					editable: bool | *true
+					// Configuration of dashboard cursor sync behavior.
+					graphTooltip: #DashboardCursorSync
+					// Time range for dashboard, e.g. last 6 hours, last 7 days, etc
+					time?: {
+						from: string | *"now-6h"
+						to:   string | *"now"
+					} @grafanamaturity(NeedsExpertReview)
 
-				// Unique numeric identifier for the dashboard.
-				// TODO must isolate or remove identifiers local to a Grafana instance...?
-				id?: int64
-				// Unique dashboard identifier that can be generated by anyone. string (8-40)
-				uid?: string
-				// Title of dashboard.
-				title?: string
-				// Description of dashboard.
-				description?: string
-				// This property should only be used in dashboards defined by plugins.  It is a quick check
-				// to see if the version has changed since the last time.  Unclear why using the version property
-				// is insufficient.
-				revision?: int64 @grafanamaturity(NeedsExpertReview)
-				// For dashboards imported from the https://grafana.com/grafana/dashboards/ portal
-				gnetId?: string @grafanamaturity(NeedsExpertReview)
-				// Tags associated with dashboard.
-				tags?: [...string] @grafanamaturity(NeedsExpertReview)
-				// Theme of dashboard.
-				style: "light" | *"dark" @grafanamaturity(NeedsExpertReview)
-				// Timezone of dashboard. Accepts IANA TZDB zone ID or "browser" or "utc".
-				timezone?: string | *"browser"
-				// Whether a dashboard is editable or not.
-				editable: bool | *true
-				// Configuration of dashboard cursor sync behavior.
-				graphTooltip: #DashboardCursorSync
-				// Time range for dashboard, e.g. last 6 hours, last 7 days, etc
-				time?: {
-					from: string | *"now-6h"
-					to:   string | *"now"
-				} @grafanamaturity(NeedsExpertReview)
-
-				// TODO docs
-				// TODO this appears to be spread all over in the frontend. Concepts will likely need tidying in tandem with schema changes
-				timepicker?: {
-					// Whether timepicker is collapsed or not.
-					collapse: bool | *false
-					// Whether timepicker is enabled or not.
-					enable: bool | *true
-					// Whether timepicker is visible or not.
-					hidden: bool | *false
-					// Selectable intervals for auto-refresh.
-					refresh_intervals: [...string] | *["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
 					// TODO docs
-					time_options: [...string] | *["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
-				} @grafanamaturity(NeedsExpertReview)
-				// The month that the fiscal year starts on.  0 = January, 11 = December
-				fiscalYearStartMonth?: uint8 & <12 | *0
-				// When set to true, the dashboard will redraw panels at an interval matching the pixel width.
-				// This will keep data "moving left" regardless of the query refresh rate.  This setting helps
-				// avoid dashboards presenting stale live data
-				liveNow?: bool @grafanamaturity(NeedsExpertReview)
-				// TODO docs
-				weekStart?: string @grafanamaturity(NeedsExpertReview)
+					// TODO this appears to be spread all over in the frontend. Concepts will likely need tidying in tandem with schema changes
+					timepicker?: {
+						// Whether timepicker is collapsed or not.
+						collapse: bool | *false
+						// Whether timepicker is enabled or not.
+						enable: bool | *true
+						// Whether timepicker is visible or not.
+						hidden: bool | *false
+						// Selectable intervals for auto-refresh.
+						refresh_intervals: [...string] | *["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+						// TODO docs
+						time_options: [...string] | *["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+					} @grafanamaturity(NeedsExpertReview)
+					// The month that the fiscal year starts on.  0 = January, 11 = December
+					fiscalYearStartMonth?: uint8 & <12 | *0
+					// When set to true, the dashboard will redraw panels at an interval matching the pixel width.
+					// This will keep data "moving left" regardless of the query refresh rate.  This setting helps
+					// avoid dashboards presenting stale live data
+					liveNow?: bool @grafanamaturity(NeedsExpertReview)
+					// TODO docs
+					weekStart?: string @grafanamaturity(NeedsExpertReview)
 
-				// Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
-				refresh?: string | false
-				// Version of the JSON schema, incremented each time a Grafana update brings
-				// changes to said schema.
-				// TODO this is the existing schema numbering system. It will be replaced by Thema's themaVersion
-				schemaVersion: uint16 | *36
-				// Version of the dashboard, incremented each time the dashboard is updated.
-				version?: uint32 @grafanamaturity(NeedsExpertReview)
-				panels?: [...(#Panel | #RowPanel | #GraphPanel | #HeatmapPanel)] @grafanamaturity(NeedsExpertReview)
-				// TODO docs
-				templating?: {
-					list?: [...#VariableModel] @grafanamaturity(NeedsExpertReview)
-				}
+					// Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
+					refresh?: string | false
+					// Version of the JSON schema, incremented each time a Grafana update brings
+					// changes to said schema.
+					// TODO this is the existing schema numbering system. It will be replaced by Thema's themaVersion
+					schemaVersion: uint16 | *36
+					// Version of the dashboard, incremented each time the dashboard is updated.
+					version?: uint32 @grafanamaturity(NeedsExpertReview)
+					panels?: [...(#Panel | #RowPanel | #GraphPanel | #HeatmapPanel)] @grafanamaturity(NeedsExpertReview)
+					// TODO docs
+					templating?: {
+						list?: [...#VariableModel] @grafanamaturity(NeedsExpertReview)
+					}
 
-				// TODO -- should not be a public interface on its own, but required for Veneer
-				#AnnotationContainer: {
-					// annoying... but required so that the list is defined using the nested Veneer
-					@grafana(TSVeneer="type")
+					// TODO docs
+					annotations?: #AnnotationContainer
 
-					list?: [...#AnnotationQuery] @grafanamaturity(NeedsExpertReview)
-				} @cuetsy(kind="interface")
+					// TODO docs
+					links?: [...#DashboardLink] @grafanamaturity(NeedsExpertReview)
 
-				// TODO docs
-				annotations?: #AnnotationContainer
-
-				// TODO docs
-				links?: [...#DashboardLink] @grafanamaturity(NeedsExpertReview)
-
-				snapshot?: #Snapshot @grafanamaturity(NeedsExpertReview)
+					snapshot?: #Snapshot @grafanamaturity(NeedsExpertReview)
+				} @cuetsy(kind="interface") @grafana(TSVeneer="type")
 
 				///////////////////////////////////////
 				// Definitions (referenced above) are declared below
@@ -131,6 +123,14 @@ lineage: seqs: [
 					ids: [...uint8]
 				} @cuetsy(kind="interface")
 
+				// TODO -- should not be a public interface on its own, but required for Veneer
+				#AnnotationContainer: {
+					// annoying... but required so that the list is defined using the nested Veneer
+					@grafana(TSVeneer="type")
+
+					list?: [...#AnnotationQuery] @grafanamaturity(NeedsExpertReview)
+				} @cuetsy(kind="interface")
+
 				// TODO docs
 				// FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
 				#AnnotationQuery: {
diff --git a/kinds/gen.go b/kinds/gen.go
index ade2ff9fc01..00225af2b31 100644
--- a/kinds/gen.go
+++ b/kinds/gen.go
@@ -38,10 +38,14 @@ func main() {
 
 	// All the jennies that comprise the core kinds generator pipeline
 	coreKindsGen.Append(
-		codegen.LatestJenny(cuectx.GoCoreKindParentPath, codegen.GoTypesJenny{}),
+		&codegen.ResourceGoTypesJenny{},
+		&codegen.SubresourceGoTypesJenny{},
 		codegen.CoreKindJenny(cuectx.GoCoreKindParentPath, nil),
 		codegen.BaseCoreRegistryJenny(filepath.Join("pkg", "registry", "corekind"), cuectx.GoCoreKindParentPath),
-		codegen.LatestMajorsOrXJenny(cuectx.TSCoreKindParentPath, codegen.TSTypesJenny{}),
+		codegen.LatestMajorsOrXJenny(
+			cuectx.TSCoreKindParentPath,
+			true, // forcing group so that we ignore the top level resource (for now)
+			codegen.TSResourceJenny{}),
 		codegen.TSVeneerIndexJenny(filepath.Join("packages", "grafana-schema", "src")),
 		codegen.DocsJenny(filepath.Join("docs", "sources", "developers", "kinds", "core")),
 	)
diff --git a/kinds/librarypanel/librarypanel_kind.cue b/kinds/librarypanel/librarypanel_kind.cue
index 82870b812d3..3b7b187a9df 100644
--- a/kinds/librarypanel/librarypanel_kind.cue
+++ b/kinds/librarypanel/librarypanel_kind.cue
@@ -14,35 +14,35 @@ lineage: seqs: [
 		schemas: [
 			// 0.0
 			{
-				@grafana(TSVeneer="type")
+				spec: {
+					// Folder UID
+					folderUid?: string @grafanamaturity(ToMetadata="sys")
 
-				// Folder UID
-				folderUid?: string @grafanamaturity(ToMetadata="sys")
+					// Library element UID
+					uid: string
 
-				// Library element UID
-				uid: string
+					// Panel name (also saved in the model)
+					name: string & strings.MinRunes(1)
 
-				// Panel name (also saved in the model)
-				name: string & strings.MinRunes(1)
+					// Panel description
+					description?: string
 
-				// Panel description
-				description?: string
+					// The panel type (from inside the model)
+					type: string & strings.MinRunes(1)
 
-				// The panel type (from inside the model)
-				type: string & strings.MinRunes(1)
+					// Dashboard version when this was saved (zero if unknown)
+					schemaVersion?: uint16
 
-				// Dashboard version when this was saved (zero if unknown)
-				schemaVersion?: uint16
+					// panel version, incremented each time the dashboard is updated.
+					version: int64 @grafanamaturity(NeedsExpertReview)
 
-				// panel version, incremented each time the dashboard is updated.
-				version: int64 @grafanamaturity(NeedsExpertReview)
+					// TODO: should be the same panel schema defined in dashboard
+					// Typescript: Omit<Panel, 'gridPos' | 'id' | 'libraryPanel'>;
+					model: {...}
 
-				// TODO: should be the same panel schema defined in dashboard
-				// Typescript: Omit<Panel, 'gridPos' | 'id' | 'libraryPanel'>;
-				model: {...}
-
-				// Object storage metadata
-				meta?: #LibraryElementDTOMeta @grafanamaturity(ToMetadata="sys")
+					// Object storage metadata
+					meta?: #LibraryElementDTOMeta @grafanamaturity(ToMetadata="sys")
+				} @cuetsy(kind="interface") @grafana(TSVeneer="type")
 
 				#LibraryElementDTOMetaUser: {
 					id:        int64
diff --git a/kinds/playlist/playlist_kind.cue b/kinds/playlist/playlist_kind.cue
index 0bf700d3a66..6200ca52149 100644
--- a/kinds/playlist/playlist_kind.cue
+++ b/kinds/playlist/playlist_kind.cue
@@ -9,20 +9,22 @@ lineage: seqs: [
 		schemas: [
 			//0.0
 			{
-				// Unique playlist identifier. Generated on creation, either by the
-				// creator of the playlist of by the application.
-				uid: string
+				spec: {
+					// Unique playlist identifier. Generated on creation, either by the
+					// creator of the playlist of by the application.
+					uid: string
 
-				// Name of the playlist.
-				name: string
+					// Name of the playlist.
+					name: string
 
-				// Interval sets the time between switching views in a playlist.
-				// FIXME: Is this based on a standardized format or what options are available? Can datemath be used?
-				interval: string | *"5m"
+					// Interval sets the time between switching views in a playlist.
+					// FIXME: Is this based on a standardized format or what options are available? Can datemath be used?
+					interval: string | *"5m"
 
-				// The ordered list of items that the playlist will iterate over.
-				// FIXME! This should not be optional, but changing it makes the godegen awkward
-				items?: [...#PlaylistItem]
+					// The ordered list of items that the playlist will iterate over.
+					// FIXME! This should not be optional, but changing it makes the godegen awkward
+					items?: [...#PlaylistItem]
+				} @cuetsy(kind="interface")
 
 				///////////////////////////////////////
 				// Definitions (referenced above) are declared below
diff --git a/kinds/preferences/preferences_kind.cue b/kinds/preferences/preferences_kind.cue
index 1e140035e66..2ab47fa6559 100644
--- a/kinds/preferences/preferences_kind.cue
+++ b/kinds/preferences/preferences_kind.cue
@@ -8,29 +8,31 @@ lineage: seqs: [
 	{
 		schemas: [
 			{
-				// UID for the home dashboard
-				homeDashboardUID?: string
+				spec: {
+					// UID for the home dashboard
+					homeDashboardUID?: string
 
-				// The timezone selection
-				// TODO: this should use the timezone defined in common
-				timezone?: string
+					// The timezone selection
+					// TODO: this should use the timezone defined in common
+					timezone?: string
 
-				// day of the week (sunday, monday, etc)
-				weekStart?: string
+					// day of the week (sunday, monday, etc)
+					weekStart?: string
 
-				// light, dark, empty is default
-				theme?: string
+					// light, dark, empty is default
+					theme?: string
 
-				// Selected language (beta)
-				language?: string
+					// Selected language (beta)
+					language?: string
 
-				// Explore query history preferences
-				queryHistory?: #QueryHistoryPreference
+					// Explore query history preferences
+					queryHistory?: #QueryHistoryPreference
+				} @cuetsy(kind="interface")
 
 				#QueryHistoryPreference: {
-								// one of: '' | 'query' | 'starred';
-								homeTab?: string
-				} @cuetsy(kind="interface") //0.0
+					// one of: '' | 'query' | 'starred';
+					homeTab?: string
+				} @cuetsy(kind="interface")
 			},
 		]
 	},
diff --git a/kinds/publicdashboard/public_dashboard_kind.cue b/kinds/publicdashboard/public_dashboard_kind.cue
index 71f2494fc46..b78295fdb29 100644
--- a/kinds/publicdashboard/public_dashboard_kind.cue
+++ b/kinds/publicdashboard/public_dashboard_kind.cue
@@ -9,18 +9,20 @@ lineage: seqs: [
 		schemas: [
 			// 0.0
 			{
-				// Unique public dashboard identifier
-				uid: string
-				// Dashboard unique identifier referenced by this public dashboard
-				dashboardUid: string
-				// Unique public access token
-				accessToken?: string
-				// Flag that indicates if the public dashboard is enabled
-				isEnabled: bool
-				// Flag that indicates if annotations are enabled
-				annotationsEnabled: bool
-				// Flag that indicates if the time range picker is enabled
-				timeSelectionEnabled: bool
+				spec: {
+					// Unique public dashboard identifier
+					uid: string
+					// Dashboard unique identifier referenced by this public dashboard
+					dashboardUid: string
+					// Unique public access token
+					accessToken?: string
+					// Flag that indicates if the public dashboard is enabled
+					isEnabled: bool
+					// Flag that indicates if annotations are enabled
+					annotationsEnabled: bool
+					// Flag that indicates if the time range picker is enabled
+					timeSelectionEnabled: bool
+				} @cuetsy(kind="interface")
 			},
 		]
 	},
diff --git a/kinds/serviceaccount/serviceaccount_kind.cue b/kinds/serviceaccount/serviceaccount_kind.cue
index 27f54a17db7..ff2ac9682ce 100644
--- a/kinds/serviceaccount/serviceaccount_kind.cue
+++ b/kinds/serviceaccount/serviceaccount_kind.cue
@@ -1,7 +1,5 @@
 package kind
 
-import "time"
-
 name:        "ServiceAccount"
 maturity:    "merged"
 description: "system account"
@@ -11,35 +9,33 @@ lineage: seqs: [
 		schemas: [
 			// v0.0
 			{
-				// ID is the unique identifier of the service account in the database.
-				id: int64 @grafanamaturity(ToMetadata="sys")
-				// OrgId is the ID of an organisation the service account belongs to.
-				orgId: int64 @grafanamaturity(ToMetadata="sys")
-				// Name of the service account.
-				name: string
-				// Login of the service account.
-				login: string
-				// IsDisabled indicates if the service account is disabled.
-				isDisabled: bool
-				// Role is the Grafana organization role of the service account which can be 'Viewer', 'Editor', 'Admin'.
-				role: #OrgRole @grafanamaturity(ToMetadata="kind")
-				// Tokens is the number of active tokens for the service account.
-				// Tokens are used to authenticate the service account against Grafana.
-				tokens: int64 @grafanamaturity(ToMetadata="kind")
-				// AvatarUrl is the service account's avatar URL. It allows the frontend to display a picture in front
-				// of the service account.
-				avatarUrl: string @grafanamaturity(ToMetadata="kind")
-				// AccessControl metadata associated with a given resource.
-				accessControl?: {
-					[string]: bool @grafanamaturity(ToMetadata="sys")
-				}
+				spec: {
+					// ID is the unique identifier of the service account in the database.
+					id: int64 @grafanamaturity(ToMetadata="sys")
+					// OrgId is the ID of an organisation the service account belongs to.
+					orgId: int64 @grafanamaturity(ToMetadata="sys")
+					// Name of the service account.
+					name: string
+					// Login of the service account.
+					login: string
+					// IsDisabled indicates if the service account is disabled.
+					isDisabled: bool
+					// Role is the Grafana organization role of the service account which can be 'Viewer', 'Editor', 'Admin'.
+					role: #OrgRole @grafanamaturity(ToMetadata="kind")
+					// Tokens is the number of active tokens for the service account.
+					// Tokens are used to authenticate the service account against Grafana.
+					tokens: int64 @grafanamaturity(ToMetadata="kind")
+					// AvatarUrl is the service account's avatar URL. It allows the frontend to display a picture in front
+					// of the service account.
+					avatarUrl: string @grafanamaturity(ToMetadata="kind")
+					// AccessControl metadata associated with a given resource.
+					accessControl?: {
+						[string]: bool @grafanamaturity(ToMetadata="sys")
+					}
 
-				// Teams is a list of teams the service account belongs to.
-				teams?: [...string] @grafanamaturity(ToMetadata="sys")
-				// Created indicates when the service account was created.
-				created?: string & time.Time
-				// Updated indicates when the service account was updated.
-				updated?: string & time.Time
+					// Teams is a list of teams the service account belongs to.
+					teams?: [...string] @grafanamaturity(ToMetadata="sys")
+				} @cuetsy(kind="interface")
 
 				// OrgRole is a Grafana Organization Role which can be 'Viewer', 'Editor', 'Admin'.
 				#OrgRole: "Admin" | "Editor" | "Viewer" @cuetsy(kind="type")
diff --git a/kinds/team/team_kind.cue b/kinds/team/team_kind.cue
index 58d285fa93c..d692dac8173 100644
--- a/kinds/team/team_kind.cue
+++ b/kinds/team/team_kind.cue
@@ -1,7 +1,5 @@
 package kind
 
-import "time"
-
 name:        "Team"
 maturity:    "merged"
 description: "A team is a named grouping of Grafana users to which access control rules may be assigned."
@@ -11,26 +9,24 @@ lineage: seqs: [
 		schemas: [
 			// v0.0
 			{
-				// OrgId is the ID of an organisation the team belongs to.
-				orgId: int64 @grafanamaturity(ToMetadata="sys")
-				// Name of the team.
-				name: string
-				// Email of the team.
-				email?: string
-				// AvatarUrl is the team's avatar URL.
-				avatarUrl?: string @grafanamaturity(MaybeRemove)
-				// MemberCount is the number of the team members.
-				memberCount: int64 @grafanamaturity(ToMetadata="kind")
-				// TODO - it seems it's a team_member.permission, unlikely it should belong to the team kind
-				permission: #Permission @grafanamaturity(ToMetadata="kind", MaybeRemove)
-				// AccessControl metadata associated with a given resource.
-				accessControl?: {
-					[string]: bool @grafanamaturity(ToMetadata="sys")
-				}
-				// Created indicates when the team was created.
-				created: string & time.Time
-				// Updated indicates when the team was updated.
-				updated: string & time.Time
+				spec: {
+					// OrgId is the ID of an organisation the team belongs to.
+					orgId: int64 @grafanamaturity(ToMetadata="sys")
+					// Name of the team.
+					name: string
+					// Email of the team.
+					email?: string
+					// AvatarUrl is the team's avatar URL.
+					avatarUrl?: string @grafanamaturity(MaybeRemove)
+					// MemberCount is the number of the team members.
+					memberCount: int64 @grafanamaturity(ToMetadata="kind")
+					// TODO - it seems it's a team_member.permission, unlikely it should belong to the team kind
+					permission: #Permission @grafanamaturity(ToMetadata="kind", MaybeRemove)
+					// AccessControl metadata associated with a given resource.
+					accessControl?: {
+						[string]: bool @grafanamaturity(ToMetadata="sys")
+					}
+				} @cuetsy(kind="interface")
 
 				#Permission: 0 | 1 | 2 | 4 @cuetsy(kind="enum",memberNames="Member|Viewer|Editor|Admin")
 			},
diff --git a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
index 32b7b5d1bf2..144f939eee2 100644
--- a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
+++ b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
@@ -3,22 +3,11 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSTypesJenny
+//     TSResourceJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-/**
- * TODO -- should not be a public interface on its own, but required for Veneer
- */
-export interface AnnotationContainer {
-  list?: Array<AnnotationQuery>;
-}
-
-export const defaultAnnotationContainer: Partial<AnnotationContainer> = {
-  list: [],
-};
-
 /**
  * TODO: this should be a regular DataQuery that depends on the selected dashboard
  * these match the properties of the "grafana" datasouce that is default in most dashboards
@@ -66,6 +55,17 @@ export const defaultAnnotationPanelFilter: Partial<AnnotationPanelFilter> = {
   ids: [],
 };
 
+/**
+ * TODO -- should not be a public interface on its own, but required for Veneer
+ */
+export interface AnnotationContainer {
+  list?: Array<AnnotationQuery>;
+}
+
+export const defaultAnnotationContainer: Partial<AnnotationContainer> = {
+  list: [],
+};
+
 /**
  * TODO docs
  * FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
diff --git a/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts b/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts
index 97cba2a5c5e..d3b967e7a76 100644
--- a/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts
+++ b/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSTypesJenny
+//     TSResourceJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts b/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts
index 03c1c69cce7..4f98abe19bf 100644
--- a/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts
+++ b/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSTypesJenny
+//     TSResourceJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts b/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
index 06f775ad878..8921226ac94 100644
--- a/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
+++ b/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSTypesJenny
+//     TSResourceJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
@@ -13,7 +13,7 @@ export interface QueryHistoryPreference {
    * one of: '' | 'query' | 'starred';
    */
   homeTab?: string;
-} // 0.0
+}
 
 export interface Preferences {
   /**
diff --git a/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts b/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts
index b94e4baefe3..9a1ae8596fd 100644
--- a/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts
+++ b/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSTypesJenny
+//     TSResourceJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/raw/serviceaccount/x/serviceaccount_types.gen.ts b/packages/grafana-schema/src/raw/serviceaccount/x/serviceaccount_types.gen.ts
index d2713bf993d..0f93321ec0d 100644
--- a/packages/grafana-schema/src/raw/serviceaccount/x/serviceaccount_types.gen.ts
+++ b/packages/grafana-schema/src/raw/serviceaccount/x/serviceaccount_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSTypesJenny
+//     TSResourceJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
@@ -23,10 +23,6 @@ export interface ServiceAccount {
    * of the service account.
    */
   avatarUrl: string;
-  /**
-   * Created indicates when the service account was created.
-   */
-  created?: string;
   /**
    * ID is the unique identifier of the service account in the database.
    */
@@ -60,10 +56,6 @@ export interface ServiceAccount {
    * Tokens are used to authenticate the service account against Grafana.
    */
   tokens: number;
-  /**
-   * Updated indicates when the service account was updated.
-   */
-  updated?: string;
 }
 
 export const defaultServiceAccount: Partial<ServiceAccount> = {
diff --git a/packages/grafana-schema/src/raw/team/x/team_types.gen.ts b/packages/grafana-schema/src/raw/team/x/team_types.gen.ts
index 3482c0c758c..938d69c4455 100644
--- a/packages/grafana-schema/src/raw/team/x/team_types.gen.ts
+++ b/packages/grafana-schema/src/raw/team/x/team_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSTypesJenny
+//     TSResourceJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
@@ -24,10 +24,6 @@ export interface Team {
    * AvatarUrl is the team's avatar URL.
    */
   avatarUrl?: string;
-  /**
-   * Created indicates when the team was created.
-   */
-  created: string;
   /**
    * Email of the team.
    */
@@ -48,8 +44,4 @@ export interface Team {
    * TODO - it seems it's a team_member.permission, unlikely it should belong to the team kind
    */
   permission: Permission;
-  /**
-   * Updated indicates when the team was updated.
-   */
-  updated: string;
 }
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index b019c18fca6..466c2ce2409 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -840,7 +840,10 @@ func (hs *HTTPServer) ValidateDashboard(c *contextmodel.ReqContext) response.Res
 	// work), or if schemaVersion is absent (which will happen once the Thema
 	// schema becomes canonical).
 	if err != nil || schemaVersion >= dashboard.HandoffSchemaVersion {
-		_, _, validationErr := dk.JSONValueMux(dashboardBytes)
+		// Schemas expect the dashboard to live in the spec field
+		k8sResource := `{"spec": ` + cmd.Dashboard + "}"
+
+		_, _, validationErr := dk.JSONValueMux([]byte(k8sResource))
 
 		if validationErr == nil {
 			isValid = true
diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go
index 12bbc50f3f1..f4808ec4636 100644
--- a/pkg/api/preferences.go
+++ b/pkg/api/preferences.go
@@ -85,7 +85,7 @@ func (hs *HTTPServer) getPreferencesFor(ctx context.Context, orgID, userID, team
 		}
 	}
 
-	dto := preferences.Preferences{}
+	dto := preferences.Spec{}
 
 	if preference.WeekStart != nil && *preference.WeekStart != "" {
 		dto.WeekStart = preference.WeekStart
@@ -302,7 +302,7 @@ type UpdateOrgPreferencesParams struct {
 // swagger:response getPreferencesResponse
 type GetPreferencesResponse struct {
 	// in:body
-	Body preferences.Preferences `json:"body"`
+	Body preferences.Spec `json:"body"`
 }
 
 // swagger:parameters patchUserPreferences
diff --git a/pkg/codegen/jenny_eachmajor.go b/pkg/codegen/jenny_eachmajor.go
index 34027df9d6c..90f7f764b46 100644
--- a/pkg/codegen/jenny_eachmajor.go
+++ b/pkg/codegen/jenny_eachmajor.go
@@ -8,21 +8,25 @@ import (
 	"github.com/grafana/kindsys"
 )
 
-// LatestMajorsOrXJenny returns a jenny that repeats the input for the latest in each major version,
-func LatestMajorsOrXJenny(parentdir string, inner codejen.OneToOne[SchemaForGen]) OneToMany {
+// LatestMajorsOrXJenny returns a jenny that repeats the input for the latest in each major version.
+//
+// TODO remove forceGroup option, it's a temporary hack to accommodate core kinds
+func LatestMajorsOrXJenny(parentdir string, forceGroup bool, inner codejen.OneToOne[SchemaForGen]) OneToMany {
 	if inner == nil {
 		panic("inner jenny must not be nil")
 	}
 
 	return &lmox{
-		parentdir: parentdir,
-		inner:     inner,
+		parentdir:  parentdir,
+		inner:      inner,
+		forceGroup: forceGroup,
 	}
 }
 
 type lmox struct {
-	parentdir string
-	inner     codejen.OneToOne[SchemaForGen]
+	parentdir  string
+	inner      codejen.OneToOne[SchemaForGen]
+	forceGroup bool
 }
 
 func (j *lmox) JennyName() string {
@@ -36,6 +40,10 @@ func (j *lmox) Generate(kind kindsys.Kind) (codejen.Files, error) {
 		IsGroup: comm.LineageIsGroup,
 	}
 
+	if j.forceGroup {
+		sfg.IsGroup = true
+	}
+
 	do := func(sfg SchemaForGen, infix string) (codejen.Files, error) {
 		f, err := j.inner.Generate(sfg)
 		if err != nil {
diff --git a/pkg/codegen/jenny_go_resources.go b/pkg/codegen/jenny_go_resources.go
new file mode 100644
index 00000000000..c8a02abfa48
--- /dev/null
+++ b/pkg/codegen/jenny_go_resources.go
@@ -0,0 +1,118 @@
+package codegen
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+
+	"cuelang.org/go/cue"
+	"github.com/dave/dst/dstutil"
+	"github.com/grafana/codejen"
+	"github.com/grafana/kindsys"
+	"github.com/grafana/thema/encoding/gocode"
+	"github.com/grafana/thema/encoding/openapi"
+)
+
+type ResourceGoTypesJenny struct {
+	ApplyFuncs       []dstutil.ApplyFunc
+	ExpandReferences bool
+}
+
+func (*ResourceGoTypesJenny) JennyName() string {
+	return "GoTypesJenny"
+}
+
+func (ag *ResourceGoTypesJenny) Generate(kind kindsys.Kind) (*codejen.File, error) {
+	comm := kind.Props().Common()
+	sfg := SchemaForGen{
+		Name:    comm.Name,
+		Schema:  kind.Lineage().Latest(),
+		IsGroup: comm.LineageIsGroup,
+	}
+	sch := sfg.Schema
+
+	iter, err := sch.Underlying().Fields()
+	if err != nil {
+		return nil, err
+	}
+
+	var subr []string
+	for iter.Next() {
+		subr = append(subr, typeNameFromKey(iter.Selector().String()))
+	}
+
+	buf := new(bytes.Buffer)
+	mname := kind.Props().Common().MachineName
+	if err := tmpls.Lookup("core_resource.tmpl").Execute(buf, tvars_resource{
+		PackageName:      mname,
+		KindName:         kind.Props().Common().Name,
+		SubresourceNames: subr,
+	}); err != nil {
+		return nil, fmt.Errorf("failed executing core resource template: %w", err)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	return codejen.NewFile(fmt.Sprintf("pkg/kinds/%s/%s_gen.go", mname, mname), buf.Bytes(), ag), nil
+}
+
+type SubresourceGoTypesJenny struct {
+	ApplyFuncs       []dstutil.ApplyFunc
+	ExpandReferences bool
+}
+
+func (*SubresourceGoTypesJenny) JennyName() string {
+	return "GoResourceTypes"
+}
+
+func (g *SubresourceGoTypesJenny) Generate(kind kindsys.Kind) (codejen.Files, error) {
+	comm := kind.Props().Common()
+	sfg := SchemaForGen{
+		Name:    comm.Name,
+		Schema:  kind.Lineage().Latest(),
+		IsGroup: comm.LineageIsGroup,
+	}
+	sch := sfg.Schema
+
+	// Iterate through all top-level fields and make go types for them
+	// (this should consist of "spec" and arbitrary subresources)
+	i, err := sch.Underlying().Fields()
+	if err != nil {
+		return nil, err
+	}
+	files := make(codejen.Files, 0)
+	for i.Next() {
+		str := i.Selector().String()
+
+		b, err := gocode.GenerateTypesOpenAPI(sch, &gocode.TypeConfigOpenAPI{
+			// TODO will need to account for sanitizing e.g. dashes here at some point
+			Config: &openapi.Config{
+				Group:    false, // TODO: better
+				RootName: typeNameFromKey(str),
+				Subpath:  cue.MakePath(cue.Str(str)),
+			},
+			PackageName: sfg.Schema.Lineage().Name(),
+			ApplyFuncs:  append(g.ApplyFuncs, PrefixDropper(sfg.Name)),
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		name := sfg.Schema.Lineage().Name()
+		files = append(files, codejen.File{
+			RelativePath: fmt.Sprintf("pkg/kinds/%s/%s_%s_gen.go", name, name, strings.ToLower(str)),
+			Data:         b,
+			From:         []codejen.NamedJenny{g},
+		})
+	}
+
+	return files, nil
+}
+
+func typeNameFromKey(key string) string {
+	if len(key) > 0 {
+		return strings.ToUpper(key[:1]) + key[1:]
+	}
+	return strings.ToUpper(key)
+}
diff --git a/pkg/codegen/jenny_gotypes.go b/pkg/codegen/jenny_go_types.go
similarity index 100%
rename from pkg/codegen/jenny_gotypes.go
rename to pkg/codegen/jenny_go_types.go
diff --git a/pkg/codegen/jenny_ts_resources.go b/pkg/codegen/jenny_ts_resources.go
new file mode 100644
index 00000000000..84d957d5767
--- /dev/null
+++ b/pkg/codegen/jenny_ts_resources.go
@@ -0,0 +1,79 @@
+package codegen
+
+import (
+	"github.com/grafana/codejen"
+	"github.com/grafana/cuetsy/ts"
+	"github.com/grafana/cuetsy/ts/ast"
+	"github.com/grafana/thema/encoding/typescript"
+)
+
+// TSResourceJenny is a [OneToOne] that produces TypeScript types and
+// defaults for a Thema schema.
+//
+// Thema's generic TS jenny will be able to replace this one once
+// https://github.com/grafana/thema/issues/89 is complete.
+type TSResourceJenny struct{}
+
+var _ codejen.OneToOne[SchemaForGen] = &TSResourceJenny{}
+
+func (j TSResourceJenny) JennyName() string {
+	return "TSResourceJenny"
+}
+
+func (j TSResourceJenny) Generate(sfg SchemaForGen) (*codejen.File, error) {
+	// TODO allow using name instead of machine name in thema generator
+	f, err := typescript.GenerateTypes(sfg.Schema, &typescript.TypeConfig{
+		RootName: sfg.Name,
+		Group:    sfg.IsGroup,
+	})
+	if err != nil {
+		return nil, err
+	}
+	renameSpecNode(sfg.Name, f)
+
+	return codejen.NewFile(sfg.Schema.Lineage().Name()+"_types.gen.ts", []byte(f.String()), j), nil
+}
+
+func renameSpecNode(name string, tf *ast.File) {
+	specidx, specdefidx := -1, -1
+	for idx, def := range tf.Nodes {
+		// Peer through export keywords
+		if ex, is := def.(ast.ExportKeyword); is {
+			def = ex.Decl
+		}
+
+		switch x := def.(type) {
+		case ast.TypeDecl:
+			if x.Name.Name == "spec" {
+				specidx = idx
+				x.Name.Name = name
+				tf.Nodes[idx] = x
+			}
+		case ast.VarDecl:
+			// Before:
+			//   export const defaultspec: Partial<spec> = {
+			// After:
+			///  export const defaultPlaylist: Partial<Playlist> = {
+			if x.Names.Idents[0].Name == "defaultspec" {
+				specdefidx = idx
+				x.Names.Idents[0].Name = "default" + name
+				tt := x.Type.(ast.TypeTransformExpr)
+				tt.Expr = ts.Ident(name)
+				x.Type = tt
+				tf.Nodes[idx] = x
+			}
+		}
+	}
+
+	if specidx != -1 {
+		decl := tf.Nodes[specidx]
+		tf.Nodes = append(append(tf.Nodes[:specidx], tf.Nodes[specidx+1:]...), decl)
+	}
+	if specdefidx != -1 {
+		if specdefidx > specidx {
+			specdefidx--
+		}
+		decl := tf.Nodes[specdefidx]
+		tf.Nodes = append(append(tf.Nodes[:specdefidx], tf.Nodes[specdefidx+1:]...), decl)
+	}
+}
diff --git a/pkg/codegen/jenny_tstypes.go b/pkg/codegen/jenny_ts_types.go
similarity index 100%
rename from pkg/codegen/jenny_tstypes.go
rename to pkg/codegen/jenny_ts_types.go
diff --git a/pkg/codegen/jenny_tsveneerindex.go b/pkg/codegen/jenny_tsveneerindex.go
index 63d9632b941..528a9a47668 100644
--- a/pkg/codegen/jenny_tsveneerindex.go
+++ b/pkg/codegen/jenny_tsveneerindex.go
@@ -50,6 +50,7 @@ func (gen *genTSVeneerIndex) Generate(kinds ...kindsys.Kind) (*codejen.File, err
 		if err != nil {
 			return nil, fmt.Errorf("%s: %w", def.Props().Common().Name, err)
 		}
+		renameSpecNode(def.Props().Common().Name, f)
 		elems, err := gen.extractTSIndexVeneerElements(def, f)
 		if err != nil {
 			return nil, fmt.Errorf("%s: %w", def.Props().Common().Name, err)
@@ -75,13 +76,13 @@ func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def kindsys.Kind, tf *
 		sels := p.Selectors()
 		switch len(sels) {
 		case 0:
-			name = comm.Name
-			fallthrough
+			return true
+
 		case 1:
 			// Only deal with subpaths that are definitions, for now
 			// TODO incorporate smarts about grouped lineages here
 			if name == "" {
-				if !sels[0].IsDefinition() {
+				if !(sels[0].IsDefinition() || sels[0].String() == "spec") {
 					return false
 				}
 				// It might seem to make sense that we'd strip replaceout the leading # here for
@@ -90,6 +91,10 @@ func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def kindsys.Kind, tf *
 				name = sels[0].String()
 			}
 
+			if name == "spec" {
+				name = comm.Name
+			}
+
 			// Search the generated TS AST for the type and default def nodes
 			pair := findDeclNode(name, tf)
 			if pair.T == nil {
diff --git a/pkg/codegen/tmpl.go b/pkg/codegen/tmpl.go
index 5ea713278fd..e5071707c44 100644
--- a/pkg/codegen/tmpl.go
+++ b/pkg/codegen/tmpl.go
@@ -3,6 +3,7 @@ package codegen
 import (
 	"bytes"
 	"embed"
+	"strings"
 	"text/template"
 	"time"
 
@@ -15,7 +16,8 @@ var tmpls *template.Template
 
 func init() {
 	base := template.New("codegen").Funcs(template.FuncMap{
-		"now": time.Now,
+		"now":     time.Now,
+		"ToLower": strings.ToLower,
 	})
 	tmpls = template.Must(base.ParseFS(tmplFS, "tmpl/*.tmpl"))
 }
@@ -46,6 +48,11 @@ type (
 	tvars_coremodel_imports struct {
 		PackageName string
 	}
+	tvars_resource struct {
+		PackageName      string
+		KindName         string
+		SubresourceNames []string
+	}
 )
 
 type HeaderVars = tvars_autogen_header
diff --git a/pkg/codegen/tmpl/core_resource.tmpl b/pkg/codegen/tmpl/core_resource.tmpl
new file mode 100644
index 00000000000..279dc4ae3be
--- /dev/null
+++ b/pkg/codegen/tmpl/core_resource.tmpl
@@ -0,0 +1,7 @@
+package {{ .PackageName }}
+
+// Resource is the wire representation of {{ .KindName }}. (TODO be better)
+type Resource struct {
+    {{- range .SubresourceNames }}
+	{{ . }} {{ . }} `json:"{{ . | ToLower }}"`{{end}}
+}
diff --git a/pkg/codegen/tmpl/kind_core.tmpl b/pkg/codegen/tmpl/kind_core.tmpl
index 19af086e65d..a2db88dffaf 100644
--- a/pkg/codegen/tmpl/kind_core.tmpl
+++ b/pkg/codegen/tmpl/kind_core.tmpl
@@ -17,9 +17,9 @@ const rootrel string = "kinds/{{ .Props.MachineName }}"
 // TODO standard generated docs
 type Kind struct {
   kindsys.Core
-	lin    thema.ConvergentLineage[*{{ .Props.Name }}]
+	lin    thema.ConvergentLineage[*Resource]
 	jcodec vmux.Codec
-	valmux vmux.ValueMux[*{{ .Props.Name }}]
+	valmux vmux.ValueMux[*Resource]
 }
 
 // type guard - ensure generated Kind type satisfies the kindsys.Core interface
@@ -40,7 +40,7 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 	// Get the thema.Schema that the meta says is in the current version (which
 	// codegen ensures is always the latest)
 	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType[*{{ .Props.Name }}](cursch, &{{ .Props.Name }}{})
+	tsch, err := thema.BindType(cursch, &Resource{})
 	if err != nil {
 		// Should be unreachable, modulo bugs in the Thema->Go code generator
 		return nil, err
@@ -53,18 +53,18 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 }
 
 // ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the {{ .Props.Name }} type generated from the current schema, v{{ .Props.CurrentVersion }}.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*{{ .Props.Name }}] {
+// to the the {{ .Props.Name }} [Resource] type generated from the current schema, v{{ .Props.CurrentVersion }}.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
 	return k.lin
 }
 
 // JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of {{ .Props.Name }}.
+// at any schematized dashboard version to an instance of {{ .Props.Name }} [Resource].
 //
 // Validation and translation errors emitted from this func will identify the
 // input bytes as "dashboard.json".
 //
 // This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*{{ .Props.Name }}, thema.TranslationLacunas, error) {
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
 	return k.valmux(b)
 }
diff --git a/pkg/kinds/dashboard/dashboard_gen.go b/pkg/kinds/dashboard/dashboard_gen.go
new file mode 100644
index 00000000000..93d54e6c8f8
--- /dev/null
+++ b/pkg/kinds/dashboard/dashboard_gen.go
@@ -0,0 +1,17 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package dashboard
+
+// Resource is the wire representation of Dashboard. (TODO be better)
+type Resource struct {
+	Metadata Metadata `json:"metadata"`
+	Spec Spec `json:"spec"`
+	Status Status `json:"status"`
+}
diff --git a/pkg/kinds/dashboard/dashboard_kind_gen.go b/pkg/kinds/dashboard/dashboard_kind_gen.go
index 65b94008504..4fe311a23a4 100644
--- a/pkg/kinds/dashboard/dashboard_kind_gen.go
+++ b/pkg/kinds/dashboard/dashboard_kind_gen.go
@@ -26,9 +26,9 @@ const rootrel string = "kinds/dashboard"
 // TODO standard generated docs
 type Kind struct {
 	kindsys.Core
-	lin    thema.ConvergentLineage[*Dashboard]
+	lin    thema.ConvergentLineage[*Resource]
 	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Dashboard]
+	valmux vmux.ValueMux[*Resource]
 }
 
 // type guard - ensure generated Kind type satisfies the kindsys.Core interface
@@ -49,7 +49,7 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 	// Get the thema.Schema that the meta says is in the current version (which
 	// codegen ensures is always the latest)
 	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType[*Dashboard](cursch, &Dashboard{})
+	tsch, err := thema.BindType(cursch, &Resource{})
 	if err != nil {
 		// Should be unreachable, modulo bugs in the Thema->Go code generator
 		return nil, err
@@ -62,18 +62,18 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 }
 
 // ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Dashboard type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Dashboard] {
+// to the the Dashboard [Resource] type generated from the current schema, v0.0.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
 	return k.lin
 }
 
 // JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Dashboard.
+// at any schematized dashboard version to an instance of Dashboard [Resource].
 //
 // Validation and translation errors emitted from this func will identify the
 // input bytes as "dashboard.json".
 //
 // This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Dashboard, thema.TranslationLacunas, error) {
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
 	return k.valmux(b)
 }
diff --git a/pkg/kinds/dashboard/dashboard_metadata_gen.go b/pkg/kinds/dashboard/dashboard_metadata_gen.go
new file mode 100644
index 00000000000..e9c4a179f23
--- /dev/null
+++ b/pkg/kinds/dashboard/dashboard_metadata_gen.go
@@ -0,0 +1,42 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package dashboard
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]interface{} `json:"extraFields"`
+	Finalizers      []string               `json:"finalizers"`
+	Labels          map[string]string      `json:"labels"`
+	ResourceVersion string                 `json:"resourceVersion"`
+	Uid             string                 `json:"uid"`
+	UpdateTimestamp time.Time              `json:"updateTimestamp"`
+	UpdatedBy       string                 `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/kinds/dashboard/dashboard_types_gen.go b/pkg/kinds/dashboard/dashboard_spec_gen.go
similarity index 95%
rename from pkg/kinds/dashboard/dashboard_types_gen.go
rename to pkg/kinds/dashboard/dashboard_spec_gen.go
index ff4c26ea296..384abdf7b00 100644
--- a/pkg/kinds/dashboard/dashboard_types_gen.go
+++ b/pkg/kinds/dashboard/dashboard_spec_gen.go
@@ -3,8 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
-//     LatestJenny
+//     GoResourceTypes
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -14,12 +13,6 @@ import (
 	"time"
 )
 
-// Defines values for Style.
-const (
-	StyleDark  Style = "dark"
-	StyleLight Style = "light"
-)
-
 // Defines values for CursorSync.
 const (
 	CursorSyncN0 CursorSync = 0
@@ -33,15 +26,6 @@ const (
 	LinkTypeLink       LinkType = "link"
 )
 
-// Defines values for FieldColorModeId.
-const (
-	FieldColorModeIdContinuousGrYlRd FieldColorModeId = "continuous-GrYlRd"
-	FieldColorModeIdFixed            FieldColorModeId = "fixed"
-	FieldColorModeIdPaletteClassic   FieldColorModeId = "palette-classic"
-	FieldColorModeIdPaletteSaturated FieldColorModeId = "palette-saturated"
-	FieldColorModeIdThresholds       FieldColorModeId = "thresholds"
-)
-
 // Defines values for FieldColorSeriesByMode.
 const (
 	FieldColorSeriesByModeLast FieldColorSeriesByMode = "last"
@@ -103,6 +87,12 @@ const (
 	RowPanelTypeRow RowPanelType = "row"
 )
 
+// Defines values for SpecStyle.
+const (
+	SpecStyleDark  SpecStyle = "dark"
+	SpecStyleLight SpecStyle = "light"
+)
+
 // Defines values for SpecialValueMapOptionsMatch.
 const (
 	SpecialValueMapOptionsMatchFalse SpecialValueMapOptionsMatch = "false"
@@ -117,16 +107,6 @@ const (
 	SpecialValueMapTypeValue   SpecialValueMapType = "value"
 )
 
-// Defines values for SpecialValueMatch.
-const (
-	SpecialValueMatchEmpty   SpecialValueMatch = "empty"
-	SpecialValueMatchFalse   SpecialValueMatch = "false"
-	SpecialValueMatchNan     SpecialValueMatch = "nan"
-	SpecialValueMatchNull    SpecialValueMatch = "null"
-	SpecialValueMatchNullNan SpecialValueMatch = "null+nan"
-	SpecialValueMatchTrue    SpecialValueMatch = "true"
-)
-
 // Defines values for ThresholdsMode.
 const (
 	ThresholdsModeAbsolute   ThresholdsMode = "absolute"
@@ -225,112 +205,6 @@ type AnnotationTarget struct {
 	Type string `json:"type"`
 }
 
-// Dashboard defines model for Dashboard.
-type Dashboard struct {
-	// TODO -- should not be a public interface on its own, but required for Veneer
-	Annotations *AnnotationContainer `json:"annotations,omitempty"`
-
-	// Description of dashboard.
-	Description *string `json:"description,omitempty"`
-
-	// Whether a dashboard is editable or not.
-	Editable bool `json:"editable"`
-
-	// The month that the fiscal year starts on.  0 = January, 11 = December
-	FiscalYearStartMonth *int `json:"fiscalYearStartMonth,omitempty"`
-
-	// For dashboards imported from the https://grafana.com/grafana/dashboards/ portal
-	GnetId *string `json:"gnetId,omitempty"`
-
-	// 0 for no shared crosshair or tooltip (default).
-	// 1 for shared crosshair.
-	// 2 for shared crosshair AND shared tooltip.
-	GraphTooltip CursorSync `json:"graphTooltip"`
-
-	// Unique numeric identifier for the dashboard.
-	// TODO must isolate or remove identifiers local to a Grafana instance...?
-	Id *int64 `json:"id,omitempty"`
-
-	// TODO docs
-	Links []Link `json:"links,omitempty"`
-
-	// When set to true, the dashboard will redraw panels at an interval matching the pixel width.
-	// This will keep data "moving left" regardless of the query refresh rate.  This setting helps
-	// avoid dashboards presenting stale live data
-	LiveNow *bool         `json:"liveNow,omitempty"`
-	Panels  []interface{} `json:"panels,omitempty"`
-
-	// Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
-	Refresh *interface{} `json:"refresh,omitempty"`
-
-	// This property should only be used in dashboards defined by plugins.  It is a quick check
-	// to see if the version has changed since the last time.  Unclear why using the version property
-	// is insufficient.
-	Revision *int64 `json:"revision,omitempty"`
-
-	// Version of the JSON schema, incremented each time a Grafana update brings
-	// changes to said schema.
-	// TODO this is the existing schema numbering system. It will be replaced by Thema's themaVersion
-	SchemaVersion int `json:"schemaVersion"`
-
-	// TODO docs
-	Snapshot *Snapshot `json:"snapshot,omitempty"`
-
-	// Theme of dashboard.
-	Style Style `json:"style"`
-
-	// Tags associated with dashboard.
-	Tags []string `json:"tags,omitempty"`
-
-	// TODO docs
-	Templating *struct {
-		List []VariableModel `json:"list,omitempty"`
-	} `json:"templating,omitempty"`
-
-	// Time range for dashboard, e.g. last 6 hours, last 7 days, etc
-	Time *struct {
-		From string `json:"from"`
-		To   string `json:"to"`
-	} `json:"time,omitempty"`
-
-	// TODO docs
-	// TODO this appears to be spread all over in the frontend. Concepts will likely need tidying in tandem with schema changes
-	Timepicker *struct {
-		// Whether timepicker is collapsed or not.
-		Collapse bool `json:"collapse"`
-
-		// Whether timepicker is enabled or not.
-		Enable bool `json:"enable"`
-
-		// Whether timepicker is visible or not.
-		Hidden bool `json:"hidden"`
-
-		// Selectable intervals for auto-refresh.
-		RefreshIntervals []string `json:"refresh_intervals"`
-
-		// TODO docs
-		TimeOptions []string `json:"time_options"`
-	} `json:"timepicker,omitempty"`
-
-	// Timezone of dashboard. Accepts IANA TZDB zone ID or "browser" or "utc".
-	Timezone *string `json:"timezone,omitempty"`
-
-	// Title of dashboard.
-	Title *string `json:"title,omitempty"`
-
-	// Unique dashboard identifier that can be generated by anyone. string (8-40)
-	Uid *string `json:"uid,omitempty"`
-
-	// Version of the dashboard, incremented each time the dashboard is updated.
-	Version *int `json:"version,omitempty"`
-
-	// TODO docs
-	WeekStart *string `json:"weekStart,omitempty"`
-}
-
-// Theme of dashboard.
-type Style string
-
 // 0 for no shared crosshair or tooltip (default).
 // 1 for shared crosshair.
 // 2 for shared crosshair AND shared tooltip.
@@ -397,9 +271,6 @@ type FieldColor struct {
 	SeriesBy *FieldColorSeriesByMode `json:"seriesBy,omitempty"`
 }
 
-// TODO docs
-type FieldColorModeId string
-
 // TODO docs
 type FieldColorSeriesByMode string
 
@@ -693,6 +564,112 @@ type Snapshot struct {
 	UserId int `json:"userId"`
 }
 
+// Spec defines model for Spec.
+type Spec struct {
+	// TODO -- should not be a public interface on its own, but required for Veneer
+	Annotations *AnnotationContainer `json:"annotations,omitempty"`
+
+	// Description of dashboard.
+	Description *string `json:"description,omitempty"`
+
+	// Whether a dashboard is editable or not.
+	Editable bool `json:"editable"`
+
+	// The month that the fiscal year starts on.  0 = January, 11 = December
+	FiscalYearStartMonth *int `json:"fiscalYearStartMonth,omitempty"`
+
+	// For dashboards imported from the https://grafana.com/grafana/dashboards/ portal
+	GnetId *string `json:"gnetId,omitempty"`
+
+	// 0 for no shared crosshair or tooltip (default).
+	// 1 for shared crosshair.
+	// 2 for shared crosshair AND shared tooltip.
+	GraphTooltip CursorSync `json:"graphTooltip"`
+
+	// Unique numeric identifier for the dashboard.
+	// TODO must isolate or remove identifiers local to a Grafana instance...?
+	Id *int64 `json:"id,omitempty"`
+
+	// TODO docs
+	Links []Link `json:"links,omitempty"`
+
+	// When set to true, the dashboard will redraw panels at an interval matching the pixel width.
+	// This will keep data "moving left" regardless of the query refresh rate.  This setting helps
+	// avoid dashboards presenting stale live data
+	LiveNow *bool         `json:"liveNow,omitempty"`
+	Panels  []interface{} `json:"panels,omitempty"`
+
+	// Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
+	Refresh *interface{} `json:"refresh,omitempty"`
+
+	// This property should only be used in dashboards defined by plugins.  It is a quick check
+	// to see if the version has changed since the last time.  Unclear why using the version property
+	// is insufficient.
+	Revision *int64 `json:"revision,omitempty"`
+
+	// Version of the JSON schema, incremented each time a Grafana update brings
+	// changes to said schema.
+	// TODO this is the existing schema numbering system. It will be replaced by Thema's themaVersion
+	SchemaVersion int `json:"schemaVersion"`
+
+	// TODO docs
+	Snapshot *Snapshot `json:"snapshot,omitempty"`
+
+	// Theme of dashboard.
+	Style SpecStyle `json:"style"`
+
+	// Tags associated with dashboard.
+	Tags []string `json:"tags,omitempty"`
+
+	// TODO docs
+	Templating *struct {
+		List []VariableModel `json:"list,omitempty"`
+	} `json:"templating,omitempty"`
+
+	// Time range for dashboard, e.g. last 6 hours, last 7 days, etc
+	Time *struct {
+		From string `json:"from"`
+		To   string `json:"to"`
+	} `json:"time,omitempty"`
+
+	// TODO docs
+	// TODO this appears to be spread all over in the frontend. Concepts will likely need tidying in tandem with schema changes
+	Timepicker *struct {
+		// Whether timepicker is collapsed or not.
+		Collapse bool `json:"collapse"`
+
+		// Whether timepicker is enabled or not.
+		Enable bool `json:"enable"`
+
+		// Whether timepicker is visible or not.
+		Hidden bool `json:"hidden"`
+
+		// Selectable intervals for auto-refresh.
+		RefreshIntervals []string `json:"refresh_intervals"`
+
+		// TODO docs
+		TimeOptions []string `json:"time_options"`
+	} `json:"timepicker,omitempty"`
+
+	// Timezone of dashboard. Accepts IANA TZDB zone ID or "browser" or "utc".
+	Timezone *string `json:"timezone,omitempty"`
+
+	// Title of dashboard.
+	Title *string `json:"title,omitempty"`
+
+	// Unique dashboard identifier that can be generated by anyone. string (8-40)
+	Uid *string `json:"uid,omitempty"`
+
+	// Version of the dashboard, incremented each time the dashboard is updated.
+	Version *int `json:"version,omitempty"`
+
+	// TODO docs
+	WeekStart *string `json:"weekStart,omitempty"`
+}
+
+// Theme of dashboard.
+type SpecStyle string
+
 // TODO docs
 type SpecialValueMap struct {
 	Options struct {
@@ -711,9 +688,6 @@ type SpecialValueMapOptionsMatch string
 // SpecialValueMapType defines model for SpecialValueMap.Type.
 type SpecialValueMapType string
 
-// TODO docs
-type SpecialValueMatch string
-
 // Schema for panel targets is specified by datasource
 // plugins. We use a placeholder definition, which the Go
 // schema loader either left open/as-is with the Base
diff --git a/pkg/kinds/dashboard/dashboard_status_gen.go b/pkg/kinds/dashboard/dashboard_status_gen.go
new file mode 100644
index 00000000000..f8dd45b58b4
--- /dev/null
+++ b/pkg/kinds/dashboard/dashboard_status_gen.go
@@ -0,0 +1,47 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package dashboard
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]OperatorState `json:"operatorStates,omitempty"`
+}
diff --git a/pkg/kinds/dashboard/dashboards_test.go b/pkg/kinds/dashboard/dashboards_test.go
deleted file mode 100644
index 0115ae62fbd..00000000000
--- a/pkg/kinds/dashboard/dashboards_test.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package dashboard_test
-
-import (
-	"encoding/json"
-	"io"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"cuelang.org/go/cue/errors"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/grafana/pkg/kinds/dashboard"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDevenvDashboardValidity(t *testing.T) {
-	path, err := filepath.Abs("../../../devenv/dev-dashboards")
-	require.NoError(t, err)
-
-	m, err := themaTestableDashboards(os.DirFS(path))
-	require.NoError(t, err)
-	dk, err := dashboard.NewKind(cuectx.GrafanaThemaRuntime())
-	require.NoError(t, err)
-
-	for path, b := range m {
-		t.Run(path, func(t *testing.T) {
-			// The path arg here only matters for error output
-			cv, err := cuectx.JSONtoCUE(path, b)
-			require.NoError(t, err, "error while decoding dashboard JSON into a CUE value")
-
-			_, err = dk.ConvergentLineage().TypedSchema().Validate(cv)
-			if err != nil {
-				// Testify trims errors to short length. We want the full text
-				errstr := errors.Details(err, nil)
-				t.Log(errstr)
-				if strings.Contains(errstr, "null") {
-					t.Log("validation failure appears to involve nulls - see if scripts/stripnulls.sh has any effect?")
-				}
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func themaTestableDashboards(in fs.FS) (map[string][]byte, error) {
-	m := make(map[string][]byte)
-
-	err := fs.WalkDir(in, ".", func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if d.IsDir() || filepath.Ext(d.Name()) != ".json" {
-			return nil
-		}
-
-		// nolint:gosec
-		f, err := in.Open(path)
-		if err != nil {
-			return err
-		}
-		defer f.Close() //nolint:errcheck
-
-		b, err := io.ReadAll(f)
-		if err != nil {
-			return err
-		}
-
-		jtree := make(map[string]interface{})
-		err = json.Unmarshal(b, &jtree)
-		if err != nil {
-			return err
-		}
-		if oldschemav, has := jtree["schemaVersion"]; !has || !(oldschemav.(float64) > dashboard.HandoffSchemaVersion-1) {
-			return nil
-		}
-
-		m[path] = b
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}
diff --git a/pkg/kinds/librarypanel/librarypanel_gen.go b/pkg/kinds/librarypanel/librarypanel_gen.go
new file mode 100644
index 00000000000..cd6556dffc5
--- /dev/null
+++ b/pkg/kinds/librarypanel/librarypanel_gen.go
@@ -0,0 +1,17 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package librarypanel
+
+// Resource is the wire representation of LibraryPanel. (TODO be better)
+type Resource struct {
+	Metadata Metadata `json:"metadata"`
+	Spec Spec `json:"spec"`
+	Status Status `json:"status"`
+}
diff --git a/pkg/kinds/librarypanel/librarypanel_kind_gen.go b/pkg/kinds/librarypanel/librarypanel_kind_gen.go
index 4404be4dca9..246c8869bc1 100644
--- a/pkg/kinds/librarypanel/librarypanel_kind_gen.go
+++ b/pkg/kinds/librarypanel/librarypanel_kind_gen.go
@@ -26,9 +26,9 @@ const rootrel string = "kinds/librarypanel"
 // TODO standard generated docs
 type Kind struct {
 	kindsys.Core
-	lin    thema.ConvergentLineage[*LibraryPanel]
+	lin    thema.ConvergentLineage[*Resource]
 	jcodec vmux.Codec
-	valmux vmux.ValueMux[*LibraryPanel]
+	valmux vmux.ValueMux[*Resource]
 }
 
 // type guard - ensure generated Kind type satisfies the kindsys.Core interface
@@ -49,7 +49,7 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 	// Get the thema.Schema that the meta says is in the current version (which
 	// codegen ensures is always the latest)
 	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType[*LibraryPanel](cursch, &LibraryPanel{})
+	tsch, err := thema.BindType(cursch, &Resource{})
 	if err != nil {
 		// Should be unreachable, modulo bugs in the Thema->Go code generator
 		return nil, err
@@ -62,18 +62,18 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 }
 
 // ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the LibraryPanel type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*LibraryPanel] {
+// to the the LibraryPanel [Resource] type generated from the current schema, v0.0.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
 	return k.lin
 }
 
 // JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of LibraryPanel.
+// at any schematized dashboard version to an instance of LibraryPanel [Resource].
 //
 // Validation and translation errors emitted from this func will identify the
 // input bytes as "dashboard.json".
 //
 // This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*LibraryPanel, thema.TranslationLacunas, error) {
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
 	return k.valmux(b)
 }
diff --git a/pkg/kinds/librarypanel/librarypanel_metadata_gen.go b/pkg/kinds/librarypanel/librarypanel_metadata_gen.go
new file mode 100644
index 00000000000..e64314c8af4
--- /dev/null
+++ b/pkg/kinds/librarypanel/librarypanel_metadata_gen.go
@@ -0,0 +1,42 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package librarypanel
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]interface{} `json:"extraFields"`
+	Finalizers      []string               `json:"finalizers"`
+	Labels          map[string]string      `json:"labels"`
+	ResourceVersion string                 `json:"resourceVersion"`
+	Uid             string                 `json:"uid"`
+	UpdateTimestamp time.Time              `json:"updateTimestamp"`
+	UpdatedBy       string                 `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/kinds/librarypanel/librarypanel_types_gen.go b/pkg/kinds/librarypanel/librarypanel_spec_gen.go
similarity index 94%
rename from pkg/kinds/librarypanel/librarypanel_types_gen.go
rename to pkg/kinds/librarypanel/librarypanel_spec_gen.go
index 5bc008309d7..f948b83942e 100644
--- a/pkg/kinds/librarypanel/librarypanel_types_gen.go
+++ b/pkg/kinds/librarypanel/librarypanel_spec_gen.go
@@ -3,8 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
-//     LatestJenny
+//     GoResourceTypes
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -32,8 +31,8 @@ type LibraryElementDTOMetaUser struct {
 	Name      string `json:"name"`
 }
 
-// LibraryPanel defines model for LibraryPanel.
-type LibraryPanel struct {
+// Spec defines model for Spec.
+type Spec struct {
 	// Panel description
 	Description *string `json:"description,omitempty"`
 
diff --git a/pkg/kinds/librarypanel/librarypanel_status_gen.go b/pkg/kinds/librarypanel/librarypanel_status_gen.go
new file mode 100644
index 00000000000..de50bacf2f7
--- /dev/null
+++ b/pkg/kinds/librarypanel/librarypanel_status_gen.go
@@ -0,0 +1,47 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package librarypanel
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]OperatorState `json:"operatorStates,omitempty"`
+}
diff --git a/pkg/kinds/playlist/playlist_gen.go b/pkg/kinds/playlist/playlist_gen.go
new file mode 100644
index 00000000000..fe39143e622
--- /dev/null
+++ b/pkg/kinds/playlist/playlist_gen.go
@@ -0,0 +1,17 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package playlist
+
+// Resource is the wire representation of Playlist. (TODO be better)
+type Resource struct {
+	Metadata Metadata `json:"metadata"`
+	Spec Spec `json:"spec"`
+	Status Status `json:"status"`
+}
diff --git a/pkg/kinds/playlist/playlist_kind_gen.go b/pkg/kinds/playlist/playlist_kind_gen.go
index 7d4dac3a965..d2f2a04cf4b 100644
--- a/pkg/kinds/playlist/playlist_kind_gen.go
+++ b/pkg/kinds/playlist/playlist_kind_gen.go
@@ -26,9 +26,9 @@ const rootrel string = "kinds/playlist"
 // TODO standard generated docs
 type Kind struct {
 	kindsys.Core
-	lin    thema.ConvergentLineage[*Playlist]
+	lin    thema.ConvergentLineage[*Resource]
 	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Playlist]
+	valmux vmux.ValueMux[*Resource]
 }
 
 // type guard - ensure generated Kind type satisfies the kindsys.Core interface
@@ -49,7 +49,7 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 	// Get the thema.Schema that the meta says is in the current version (which
 	// codegen ensures is always the latest)
 	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType[*Playlist](cursch, &Playlist{})
+	tsch, err := thema.BindType(cursch, &Resource{})
 	if err != nil {
 		// Should be unreachable, modulo bugs in the Thema->Go code generator
 		return nil, err
@@ -62,18 +62,18 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 }
 
 // ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Playlist type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Playlist] {
+// to the the Playlist [Resource] type generated from the current schema, v0.0.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
 	return k.lin
 }
 
 // JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Playlist.
+// at any schematized dashboard version to an instance of Playlist [Resource].
 //
 // Validation and translation errors emitted from this func will identify the
 // input bytes as "dashboard.json".
 //
 // This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Playlist, thema.TranslationLacunas, error) {
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
 	return k.valmux(b)
 }
diff --git a/pkg/kinds/playlist/playlist_metadata_gen.go b/pkg/kinds/playlist/playlist_metadata_gen.go
new file mode 100644
index 00000000000..18d1aca5506
--- /dev/null
+++ b/pkg/kinds/playlist/playlist_metadata_gen.go
@@ -0,0 +1,42 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package playlist
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]interface{} `json:"extraFields"`
+	Finalizers      []string               `json:"finalizers"`
+	Labels          map[string]string      `json:"labels"`
+	ResourceVersion string                 `json:"resourceVersion"`
+	Uid             string                 `json:"uid"`
+	UpdateTimestamp time.Time              `json:"updateTimestamp"`
+	UpdatedBy       string                 `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/kinds/playlist/playlist_types_gen.go b/pkg/kinds/playlist/playlist_spec_gen.go
similarity index 94%
rename from pkg/kinds/playlist/playlist_types_gen.go
rename to pkg/kinds/playlist/playlist_spec_gen.go
index 8d8cff4f06b..211fb577b7f 100644
--- a/pkg/kinds/playlist/playlist_types_gen.go
+++ b/pkg/kinds/playlist/playlist_spec_gen.go
@@ -3,8 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
-//     LatestJenny
+//     GoResourceTypes
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -17,24 +16,6 @@ const (
 	ItemTypeDashboardByUid ItemType = "dashboard_by_uid"
 )
 
-// Playlist defines model for Playlist.
-type Playlist struct {
-	// Interval sets the time between switching views in a playlist.
-	// FIXME: Is this based on a standardized format or what options are available? Can datemath be used?
-	Interval string `json:"interval"`
-
-	// The ordered list of items that the playlist will iterate over.
-	// FIXME! This should not be optional, but changing it makes the godegen awkward
-	Items []Item `json:"items,omitempty"`
-
-	// Name of the playlist.
-	Name string `json:"name"`
-
-	// Unique playlist identifier. Generated on creation, either by the
-	// creator of the playlist of by the application.
-	Uid string `json:"uid"`
-}
-
 // Item defines model for Item.
 type Item struct {
 	// Title is an unused property -- it will be removed in the future
@@ -56,3 +37,21 @@ type Item struct {
 
 // Type of the item.
 type ItemType string
+
+// Spec defines model for Spec.
+type Spec struct {
+	// Interval sets the time between switching views in a playlist.
+	// FIXME: Is this based on a standardized format or what options are available? Can datemath be used?
+	Interval string `json:"interval"`
+
+	// The ordered list of items that the playlist will iterate over.
+	// FIXME! This should not be optional, but changing it makes the godegen awkward
+	Items []Item `json:"items,omitempty"`
+
+	// Name of the playlist.
+	Name string `json:"name"`
+
+	// Unique playlist identifier. Generated on creation, either by the
+	// creator of the playlist of by the application.
+	Uid string `json:"uid"`
+}
diff --git a/pkg/kinds/playlist/playlist_status_gen.go b/pkg/kinds/playlist/playlist_status_gen.go
new file mode 100644
index 00000000000..0ad3608f04e
--- /dev/null
+++ b/pkg/kinds/playlist/playlist_status_gen.go
@@ -0,0 +1,47 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package playlist
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]OperatorState `json:"operatorStates,omitempty"`
+}
diff --git a/pkg/kinds/preferences/preferences_gen.go b/pkg/kinds/preferences/preferences_gen.go
new file mode 100644
index 00000000000..66ac30558ab
--- /dev/null
+++ b/pkg/kinds/preferences/preferences_gen.go
@@ -0,0 +1,17 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package preferences
+
+// Resource is the wire representation of Preferences. (TODO be better)
+type Resource struct {
+	Metadata Metadata `json:"metadata"`
+	Spec Spec `json:"spec"`
+	Status Status `json:"status"`
+}
diff --git a/pkg/kinds/preferences/preferences_kind_gen.go b/pkg/kinds/preferences/preferences_kind_gen.go
index 0141c1c2ae6..9efc26fba77 100644
--- a/pkg/kinds/preferences/preferences_kind_gen.go
+++ b/pkg/kinds/preferences/preferences_kind_gen.go
@@ -26,9 +26,9 @@ const rootrel string = "kinds/preferences"
 // TODO standard generated docs
 type Kind struct {
 	kindsys.Core
-	lin    thema.ConvergentLineage[*Preferences]
+	lin    thema.ConvergentLineage[*Resource]
 	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Preferences]
+	valmux vmux.ValueMux[*Resource]
 }
 
 // type guard - ensure generated Kind type satisfies the kindsys.Core interface
@@ -49,7 +49,7 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 	// Get the thema.Schema that the meta says is in the current version (which
 	// codegen ensures is always the latest)
 	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType[*Preferences](cursch, &Preferences{})
+	tsch, err := thema.BindType(cursch, &Resource{})
 	if err != nil {
 		// Should be unreachable, modulo bugs in the Thema->Go code generator
 		return nil, err
@@ -62,18 +62,18 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 }
 
 // ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Preferences type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Preferences] {
+// to the the Preferences [Resource] type generated from the current schema, v0.0.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
 	return k.lin
 }
 
 // JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Preferences.
+// at any schematized dashboard version to an instance of Preferences [Resource].
 //
 // Validation and translation errors emitted from this func will identify the
 // input bytes as "dashboard.json".
 //
 // This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Preferences, thema.TranslationLacunas, error) {
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
 	return k.valmux(b)
 }
diff --git a/pkg/kinds/preferences/preferences_metadata_gen.go b/pkg/kinds/preferences/preferences_metadata_gen.go
new file mode 100644
index 00000000000..db023ad66ab
--- /dev/null
+++ b/pkg/kinds/preferences/preferences_metadata_gen.go
@@ -0,0 +1,42 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package preferences
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]interface{} `json:"extraFields"`
+	Finalizers      []string               `json:"finalizers"`
+	Labels          map[string]string      `json:"labels"`
+	ResourceVersion string                 `json:"resourceVersion"`
+	Uid             string                 `json:"uid"`
+	UpdateTimestamp time.Time              `json:"updateTimestamp"`
+	UpdatedBy       string                 `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/kinds/preferences/preferences_types_gen.go b/pkg/kinds/preferences/preferences_spec_gen.go
similarity index 89%
rename from pkg/kinds/preferences/preferences_types_gen.go
rename to pkg/kinds/preferences/preferences_spec_gen.go
index d03d2a3b106..8ac8df1ed1c 100644
--- a/pkg/kinds/preferences/preferences_types_gen.go
+++ b/pkg/kinds/preferences/preferences_spec_gen.go
@@ -3,15 +3,20 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
-//     LatestJenny
+//     GoResourceTypes
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package preferences
 
-// Preferences defines model for Preferences.
-type Preferences struct {
+// QueryHistoryPreference defines model for QueryHistoryPreference.
+type QueryHistoryPreference struct {
+	// HomeTab one of: '' | 'query' | 'starred';
+	HomeTab *string `json:"homeTab,omitempty"`
+}
+
+// Spec defines model for Spec.
+type Spec struct {
 	// UID for the home dashboard
 	HomeDashboardUID *string `json:"homeDashboardUID,omitempty"`
 
@@ -29,9 +34,3 @@ type Preferences struct {
 	// WeekStart day of the week (sunday, monday, etc)
 	WeekStart *string `json:"weekStart,omitempty"`
 }
-
-// QueryHistoryPreference defines model for QueryHistoryPreference.
-type QueryHistoryPreference struct {
-	// HomeTab one of: '' | 'query' | 'starred';
-	HomeTab *string `json:"homeTab,omitempty"`
-}
diff --git a/pkg/kinds/preferences/preferences_status_gen.go b/pkg/kinds/preferences/preferences_status_gen.go
new file mode 100644
index 00000000000..22fb6b7f5c3
--- /dev/null
+++ b/pkg/kinds/preferences/preferences_status_gen.go
@@ -0,0 +1,47 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package preferences
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]OperatorState `json:"operatorStates,omitempty"`
+}
diff --git a/pkg/kinds/publicdashboard/publicdashboard_gen.go b/pkg/kinds/publicdashboard/publicdashboard_gen.go
new file mode 100644
index 00000000000..7870afda7a2
--- /dev/null
+++ b/pkg/kinds/publicdashboard/publicdashboard_gen.go
@@ -0,0 +1,17 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package publicdashboard
+
+// Resource is the wire representation of PublicDashboard. (TODO be better)
+type Resource struct {
+	Metadata Metadata `json:"metadata"`
+	Spec Spec `json:"spec"`
+	Status Status `json:"status"`
+}
diff --git a/pkg/kinds/publicdashboard/publicdashboard_kind_gen.go b/pkg/kinds/publicdashboard/publicdashboard_kind_gen.go
index c2057b04dcd..f82475779e8 100644
--- a/pkg/kinds/publicdashboard/publicdashboard_kind_gen.go
+++ b/pkg/kinds/publicdashboard/publicdashboard_kind_gen.go
@@ -26,9 +26,9 @@ const rootrel string = "kinds/publicdashboard"
 // TODO standard generated docs
 type Kind struct {
 	kindsys.Core
-	lin    thema.ConvergentLineage[*PublicDashboard]
+	lin    thema.ConvergentLineage[*Resource]
 	jcodec vmux.Codec
-	valmux vmux.ValueMux[*PublicDashboard]
+	valmux vmux.ValueMux[*Resource]
 }
 
 // type guard - ensure generated Kind type satisfies the kindsys.Core interface
@@ -49,7 +49,7 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 	// Get the thema.Schema that the meta says is in the current version (which
 	// codegen ensures is always the latest)
 	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType[*PublicDashboard](cursch, &PublicDashboard{})
+	tsch, err := thema.BindType(cursch, &Resource{})
 	if err != nil {
 		// Should be unreachable, modulo bugs in the Thema->Go code generator
 		return nil, err
@@ -62,18 +62,18 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 }
 
 // ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the PublicDashboard type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*PublicDashboard] {
+// to the the PublicDashboard [Resource] type generated from the current schema, v0.0.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
 	return k.lin
 }
 
 // JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of PublicDashboard.
+// at any schematized dashboard version to an instance of PublicDashboard [Resource].
 //
 // Validation and translation errors emitted from this func will identify the
 // input bytes as "dashboard.json".
 //
 // This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*PublicDashboard, thema.TranslationLacunas, error) {
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
 	return k.valmux(b)
 }
diff --git a/pkg/kinds/publicdashboard/publicdashboard_metadata_gen.go b/pkg/kinds/publicdashboard/publicdashboard_metadata_gen.go
new file mode 100644
index 00000000000..df99a88166b
--- /dev/null
+++ b/pkg/kinds/publicdashboard/publicdashboard_metadata_gen.go
@@ -0,0 +1,42 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package publicdashboard
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]interface{} `json:"extraFields"`
+	Finalizers      []string               `json:"finalizers"`
+	Labels          map[string]string      `json:"labels"`
+	ResourceVersion string                 `json:"resourceVersion"`
+	Uid             string                 `json:"uid"`
+	UpdateTimestamp time.Time              `json:"updateTimestamp"`
+	UpdatedBy       string                 `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/kinds/publicdashboard/publicdashboard_types_gen.go b/pkg/kinds/publicdashboard/publicdashboard_spec_gen.go
similarity index 86%
rename from pkg/kinds/publicdashboard/publicdashboard_types_gen.go
rename to pkg/kinds/publicdashboard/publicdashboard_spec_gen.go
index 80da0c962c1..01321af228a 100644
--- a/pkg/kinds/publicdashboard/publicdashboard_types_gen.go
+++ b/pkg/kinds/publicdashboard/publicdashboard_spec_gen.go
@@ -3,15 +3,14 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
-//     LatestJenny
+//     GoResourceTypes
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package publicdashboard
 
-// PublicDashboard defines model for PublicDashboard.
-type PublicDashboard struct {
+// Spec defines model for Spec.
+type Spec struct {
 	// Unique public access token
 	AccessToken *string `json:"accessToken,omitempty"`
 
diff --git a/pkg/kinds/publicdashboard/publicdashboard_status_gen.go b/pkg/kinds/publicdashboard/publicdashboard_status_gen.go
new file mode 100644
index 00000000000..95665a48706
--- /dev/null
+++ b/pkg/kinds/publicdashboard/publicdashboard_status_gen.go
@@ -0,0 +1,47 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package publicdashboard
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]OperatorState `json:"operatorStates,omitempty"`
+}
diff --git a/pkg/kinds/serviceaccount/serviceaccount_gen.go b/pkg/kinds/serviceaccount/serviceaccount_gen.go
new file mode 100644
index 00000000000..838848fca3c
--- /dev/null
+++ b/pkg/kinds/serviceaccount/serviceaccount_gen.go
@@ -0,0 +1,17 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package serviceaccount
+
+// Resource is the wire representation of ServiceAccount. (TODO be better)
+type Resource struct {
+	Metadata Metadata `json:"metadata"`
+	Spec Spec `json:"spec"`
+	Status Status `json:"status"`
+}
diff --git a/pkg/kinds/serviceaccount/serviceaccount_kind_gen.go b/pkg/kinds/serviceaccount/serviceaccount_kind_gen.go
index 99aca391fde..95604454724 100644
--- a/pkg/kinds/serviceaccount/serviceaccount_kind_gen.go
+++ b/pkg/kinds/serviceaccount/serviceaccount_kind_gen.go
@@ -26,9 +26,9 @@ const rootrel string = "kinds/serviceaccount"
 // TODO standard generated docs
 type Kind struct {
 	kindsys.Core
-	lin    thema.ConvergentLineage[*ServiceAccount]
+	lin    thema.ConvergentLineage[*Resource]
 	jcodec vmux.Codec
-	valmux vmux.ValueMux[*ServiceAccount]
+	valmux vmux.ValueMux[*Resource]
 }
 
 // type guard - ensure generated Kind type satisfies the kindsys.Core interface
@@ -49,7 +49,7 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 	// Get the thema.Schema that the meta says is in the current version (which
 	// codegen ensures is always the latest)
 	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType[*ServiceAccount](cursch, &ServiceAccount{})
+	tsch, err := thema.BindType(cursch, &Resource{})
 	if err != nil {
 		// Should be unreachable, modulo bugs in the Thema->Go code generator
 		return nil, err
@@ -62,18 +62,18 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 }
 
 // ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the ServiceAccount type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*ServiceAccount] {
+// to the the ServiceAccount [Resource] type generated from the current schema, v0.0.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
 	return k.lin
 }
 
 // JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of ServiceAccount.
+// at any schematized dashboard version to an instance of ServiceAccount [Resource].
 //
 // Validation and translation errors emitted from this func will identify the
 // input bytes as "dashboard.json".
 //
 // This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*ServiceAccount, thema.TranslationLacunas, error) {
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
 	return k.valmux(b)
 }
diff --git a/pkg/kinds/serviceaccount/serviceaccount_metadata_gen.go b/pkg/kinds/serviceaccount/serviceaccount_metadata_gen.go
new file mode 100644
index 00000000000..2209086de2e
--- /dev/null
+++ b/pkg/kinds/serviceaccount/serviceaccount_metadata_gen.go
@@ -0,0 +1,42 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package serviceaccount
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]interface{} `json:"extraFields"`
+	Finalizers      []string               `json:"finalizers"`
+	Labels          map[string]string      `json:"labels"`
+	ResourceVersion string                 `json:"resourceVersion"`
+	Uid             string                 `json:"uid"`
+	UpdateTimestamp time.Time              `json:"updateTimestamp"`
+	UpdatedBy       string                 `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/kinds/serviceaccount/serviceaccount_types_gen.go b/pkg/kinds/serviceaccount/serviceaccount_spec_gen.go
similarity index 81%
rename from pkg/kinds/serviceaccount/serviceaccount_types_gen.go
rename to pkg/kinds/serviceaccount/serviceaccount_spec_gen.go
index d4ab2b4157b..fe6d42152bb 100644
--- a/pkg/kinds/serviceaccount/serviceaccount_types_gen.go
+++ b/pkg/kinds/serviceaccount/serviceaccount_spec_gen.go
@@ -3,17 +3,12 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
-//     LatestJenny
+//     GoResourceTypes
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package serviceaccount
 
-import (
-	"time"
-)
-
 // Defines values for OrgRole.
 const (
 	OrgRoleAdmin  OrgRole = "Admin"
@@ -24,8 +19,8 @@ const (
 // OrgRole is a Grafana Organization Role which can be 'Viewer', 'Editor', 'Admin'.
 type OrgRole string
 
-// ServiceAccount defines model for ServiceAccount.
-type ServiceAccount struct {
+// Spec defines model for Spec.
+type Spec struct {
 	// AccessControl metadata associated with a given resource.
 	AccessControl map[string]bool `json:"accessControl,omitempty"`
 
@@ -33,9 +28,6 @@ type ServiceAccount struct {
 	// of the service account.
 	AvatarUrl string `json:"avatarUrl"`
 
-	// Created indicates when the service account was created.
-	Created *time.Time `json:"created,omitempty"`
-
 	// ID is the unique identifier of the service account in the database.
 	Id int64 `json:"id"`
 
@@ -60,7 +52,4 @@ type ServiceAccount struct {
 	// Tokens is the number of active tokens for the service account.
 	// Tokens are used to authenticate the service account against Grafana.
 	Tokens int64 `json:"tokens"`
-
-	// Updated indicates when the service account was updated.
-	Updated *time.Time `json:"updated,omitempty"`
 }
diff --git a/pkg/kinds/serviceaccount/serviceaccount_status_gen.go b/pkg/kinds/serviceaccount/serviceaccount_status_gen.go
new file mode 100644
index 00000000000..a2480770195
--- /dev/null
+++ b/pkg/kinds/serviceaccount/serviceaccount_status_gen.go
@@ -0,0 +1,47 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package serviceaccount
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]OperatorState `json:"operatorStates,omitempty"`
+}
diff --git a/pkg/kinds/team/team_gen.go b/pkg/kinds/team/team_gen.go
new file mode 100644
index 00000000000..b86948a4545
--- /dev/null
+++ b/pkg/kinds/team/team_gen.go
@@ -0,0 +1,17 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package team
+
+// Resource is the wire representation of Team. (TODO be better)
+type Resource struct {
+	Metadata Metadata `json:"metadata"`
+	Spec Spec `json:"spec"`
+	Status Status `json:"status"`
+}
diff --git a/pkg/kinds/team/team_kind_gen.go b/pkg/kinds/team/team_kind_gen.go
index 6354997eaf6..8fc6e091565 100644
--- a/pkg/kinds/team/team_kind_gen.go
+++ b/pkg/kinds/team/team_kind_gen.go
@@ -26,9 +26,9 @@ const rootrel string = "kinds/team"
 // TODO standard generated docs
 type Kind struct {
 	kindsys.Core
-	lin    thema.ConvergentLineage[*Team]
+	lin    thema.ConvergentLineage[*Resource]
 	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Team]
+	valmux vmux.ValueMux[*Resource]
 }
 
 // type guard - ensure generated Kind type satisfies the kindsys.Core interface
@@ -49,7 +49,7 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 	// Get the thema.Schema that the meta says is in the current version (which
 	// codegen ensures is always the latest)
 	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType[*Team](cursch, &Team{})
+	tsch, err := thema.BindType(cursch, &Resource{})
 	if err != nil {
 		// Should be unreachable, modulo bugs in the Thema->Go code generator
 		return nil, err
@@ -62,18 +62,18 @@ func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
 }
 
 // ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Team type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Team] {
+// to the the Team [Resource] type generated from the current schema, v0.0.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
 	return k.lin
 }
 
 // JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Team.
+// at any schematized dashboard version to an instance of Team [Resource].
 //
 // Validation and translation errors emitted from this func will identify the
 // input bytes as "dashboard.json".
 //
 // This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Team, thema.TranslationLacunas, error) {
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
 	return k.valmux(b)
 }
diff --git a/pkg/kinds/team/team_metadata_gen.go b/pkg/kinds/team/team_metadata_gen.go
new file mode 100644
index 00000000000..63066884922
--- /dev/null
+++ b/pkg/kinds/team/team_metadata_gen.go
@@ -0,0 +1,42 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package team
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]interface{} `json:"extraFields"`
+	Finalizers      []string               `json:"finalizers"`
+	Labels          map[string]string      `json:"labels"`
+	ResourceVersion string                 `json:"resourceVersion"`
+	Uid             string                 `json:"uid"`
+	UpdateTimestamp time.Time              `json:"updateTimestamp"`
+	UpdatedBy       string                 `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/kinds/team/team_types_gen.go b/pkg/kinds/team/team_spec_gen.go
similarity index 77%
rename from pkg/kinds/team/team_types_gen.go
rename to pkg/kinds/team/team_spec_gen.go
index 580a803f6da..7fc36635200 100644
--- a/pkg/kinds/team/team_types_gen.go
+++ b/pkg/kinds/team/team_spec_gen.go
@@ -3,17 +3,12 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
-//     LatestJenny
+//     GoResourceTypes
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package team
 
-import (
-	"time"
-)
-
 // Defines values for Permission.
 const (
 	PermissionN0 Permission = 0
@@ -25,17 +20,14 @@ const (
 // Permission defines model for Permission.
 type Permission int
 
-// Team defines model for Team.
-type Team struct {
+// Spec defines model for Spec.
+type Spec struct {
 	// AccessControl metadata associated with a given resource.
 	AccessControl map[string]bool `json:"accessControl,omitempty"`
 
 	// AvatarUrl is the team's avatar URL.
 	AvatarUrl *string `json:"avatarUrl,omitempty"`
 
-	// Created indicates when the team was created.
-	Created time.Time `json:"created"`
-
 	// Email of the team.
 	Email *string `json:"email,omitempty"`
 
@@ -48,7 +40,4 @@ type Team struct {
 	// OrgId is the ID of an organisation the team belongs to.
 	OrgId      int64      `json:"orgId"`
 	Permission Permission `json:"permission"`
-
-	// Updated indicates when the team was updated.
-	Updated time.Time `json:"updated"`
 }
diff --git a/pkg/kinds/team/team_status_gen.go b/pkg/kinds/team/team_status_gen.go
new file mode 100644
index 00000000000..77957257d5f
--- /dev/null
+++ b/pkg/kinds/team/team_status_gen.go
@@ -0,0 +1,47 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package team
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]OperatorState `json:"operatorStates,omitempty"`
+}
diff --git a/pkg/services/playlist/model.go b/pkg/services/playlist/model.go
index 0d6567d2a37..387fd6e9bdc 100644
--- a/pkg/services/playlist/model.go
+++ b/pkg/services/playlist/model.go
@@ -22,7 +22,7 @@ type Playlist struct {
 	OrgId    int64  `json:"-" db:"org_id"`
 }
 
-type PlaylistDTO = playlist.Playlist
+type PlaylistDTO = playlist.Spec
 type PlaylistItemDTO = playlist.Item
 type PlaylistItemType = playlist.ItemType
 
diff --git a/pkg/services/store/kind/playlist/summary.go b/pkg/services/store/kind/playlist/summary.go
index 277d1161440..8511ae3e511 100644
--- a/pkg/services/store/kind/playlist/summary.go
+++ b/pkg/services/store/kind/playlist/summary.go
@@ -22,7 +22,7 @@ func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
 }
 
 func summaryBuilder(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-	obj := &playlist.Playlist{}
+	obj := &playlist.Spec{}
 	err := json.Unmarshal(body, obj)
 	if err != nil {
 		return nil, nil, err // unable to read object
diff --git a/pkg/services/store/kind/playlist/summary_test.go b/pkg/services/store/kind/playlist/summary_test.go
index 31d7f141437..7a9186cbc37 100644
--- a/pkg/services/store/kind/playlist/summary_test.go
+++ b/pkg/services/store/kind/playlist/summary_test.go
@@ -17,7 +17,7 @@ func TestPlaylistSummary(t *testing.T) {
 	_, _, err := builder(context.Background(), "abc", []byte("{invalid json"))
 	require.Error(t, err)
 
-	playlist := playlist.Playlist{
+	playlist := playlist.Spec{
 		Interval: "30s",
 		Name:     "test",
 		Items: []playlist.Item{
diff --git a/pkg/services/store/kind/preferences/summary.go b/pkg/services/store/kind/preferences/summary.go
index c3b557f788e..c2243529e41 100644
--- a/pkg/services/store/kind/preferences/summary.go
+++ b/pkg/services/store/kind/preferences/summary.go
@@ -29,7 +29,7 @@ func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
 			}
 		}
 
-		obj := &preferences.Preferences{}
+		obj := &preferences.Spec{}
 		err := json.Unmarshal(body, obj)
 		if err != nil {
 			return nil, nil, err // unable to read object
diff --git a/public/app/features/teams/__mocks__/teamMocks.ts b/public/app/features/teams/__mocks__/teamMocks.ts
index ccbac6e2eb6..e768ea1bb5f 100644
--- a/public/app/features/teams/__mocks__/teamMocks.ts
+++ b/public/app/features/teams/__mocks__/teamMocks.ts
@@ -18,9 +18,7 @@ export const getMockTeam = (i = 1, overrides = {}): Team => {
     memberCount: i,
     permission: TeamPermissionLevel.Member,
     accessControl: { isEditor: false },
-    created: '',
     orgId: 0,
-    updated: '',
     ...overrides,
   };
 };
diff --git a/public/app/features/teams/state/navModel.ts b/public/app/features/teams/state/navModel.ts
index 5c63bb577de..0f7b503d1b6 100644
--- a/public/app/features/teams/state/navModel.ts
+++ b/public/app/features/teams/state/navModel.ts
@@ -14,7 +14,6 @@ const loadingTeam = {
   memberCount: 0,
   permission: TeamPermissionLevel.Member,
   accessControl: { isEditor: false },
-  created: '',
   orgId: 0,
   updated: '',
 };
diff --git a/scripts/validate-devenv-dashboards.sh b/scripts/validate-devenv-dashboards.sh
deleted file mode 100755
index ed901b14565..00000000000
--- a/scripts/validate-devenv-dashboards.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Temporary - remove this script once the dashboard schema are mature
-
-# Remove the appropriate ellipses from the schema to check for unspecified
-# fields in the artifacts (validating "open")
-
-# Run from root of grafana repo
-CMD=${CLI:-bin/darwin-amd64/grafana-cli}
-FILES=$(grep -rl '"schemaVersion": 30' devenv)
-for DASH in ${FILES}; do echo "${DASH}"; ${CMD} cue validate-resource --dashboard "${DASH}"; done

From d3bfaf549fca4c76c1d05a77462e352b92d30dd8 Mon Sep 17 00:00:00 2001
From: George Robinson <george.robinson@grafana.com>
Date: Thu, 27 Apr 2023 21:45:34 +0100
Subject: [PATCH 500/729] Alerting: Update grafana/alerting to 4f09f51 (#67329)

---
 go.mod | 28 +++++++++++++-------------
 go.sum | 63 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/go.mod b/go.mod
index 108e86c82bd..d2be11539d0 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/BurntSushi/toml v1.2.1
 	github.com/Masterminds/semver v1.5.0
 	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f
-	github.com/aws/aws-sdk-go v1.44.171
+	github.com/aws/aws-sdk-go v1.44.234
 	github.com/beevik/etree v1.1.0
 	github.com/benbjohnson/clock v1.3.0
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
@@ -43,13 +43,13 @@ require (
 	github.com/getsentry/sentry-go v0.13.0
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/go-ldap/ldap/v3 v3.4.4
-	github.com/go-openapi/strfmt v0.21.3
+	github.com/go-openapi/strfmt v0.21.7
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/go-stack/stack v1.8.1
 	github.com/gobwas/glob v0.2.3
-	github.com/gofrs/uuid v4.3.1+incompatible // indirect
+	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/mock v1.6.0
 	github.com/golang/snappy v0.0.4
@@ -57,7 +57,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/google/wire v0.5.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2
+	github.com/grafana/alerting v0.0.0-20230426193323-4f09f516596b
 	github.com/grafana/grafana-aws-sdk v0.12.0
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
 	github.com/grafana/grafana-plugin-sdk-go v0.159.0
@@ -85,7 +85,7 @@ require (
 	github.com/prometheus/alertmanager v0.25.0
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/client_model v0.3.0
-	github.com/prometheus/common v0.40.0
+	github.com/prometheus/common v0.42.0
 	github.com/prometheus/prometheus v1.8.2-0.20211217191541-41f1a8125e66
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/russellhaering/goxmldsig v1.2.0
@@ -104,7 +104,7 @@ require (
 	go.opentelemetry.io/otel/exporters/jaeger v1.0.0
 	go.opentelemetry.io/otel/sdk v1.14.0
 	go.opentelemetry.io/otel/trace v1.14.0
-	golang.org/x/crypto v0.6.0
+	golang.org/x/crypto v0.7.0
 	golang.org/x/exp v0.0.0-20221211140036-ad323defaf05
 	golang.org/x/net v0.8.0
 	golang.org/x/oauth2 v0.6.0
@@ -137,7 +137,7 @@ require (
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/andybalholm/brotli v1.0.4
 	github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
 	github.com/centrifugal/protocol v0.10.0 // indirect
@@ -158,9 +158,9 @@ require (
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
 	github.com/go-openapi/loads v0.21.2
 	github.com/go-openapi/runtime v0.25.0 // indirect
-	github.com/go-openapi/spec v0.20.7 // indirect
+	github.com/go-openapi/spec v0.20.8 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-openapi/validate v0.22.0 // indirect
+	github.com/go-openapi/validate v0.22.1 // indirect
 	github.com/golang-jwt/jwt/v4 v4.4.3
 	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
 	github.com/golang/glog v1.0.0 // indirect
@@ -197,7 +197,7 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/common/sigv4 v0.1.0 // indirect
-	github.com/prometheus/exporter-toolkit v0.8.2 // indirect
+	github.com/prometheus/exporter-toolkit v0.9.1 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect
 	github.com/rs/cors v1.8.3 // indirect
@@ -211,7 +211,7 @@ require (
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
-	go.mongodb.org/mongo-driver v1.11.1 // indirect
+	go.mongodb.org/mongo-driver v1.11.3 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.10.0
 	go.uber.org/goleak v1.2.1 // indirect
@@ -269,6 +269,7 @@ require (
 	github.com/weaveworks/common v0.0.0-20230208133027-16871410fca4
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f
 	go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0
+	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
 )
 
 require (
@@ -305,7 +306,7 @@ require (
 	github.com/gophercloud/gophercloud v1.0.0 // indirect
 	github.com/grafana/sqlds/v2 v2.3.10 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
 	github.com/hashicorp/memberlist v0.5.0 // indirect
 	github.com/hetznercloud/hcloud-go v1.35.3 // indirect
 	github.com/invopop/yaml v0.1.0 // indirect
@@ -337,7 +338,6 @@ require (
 	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
 	k8s.io/api v0.26.2 // indirect
-	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
 )
 
 require (
@@ -414,7 +414,7 @@ replace xorm.io/xorm => github.com/grafana/xorm v0.8.3-0.20220614223926-2fcda756
 
 // Use our fork of the upstream alertmanagers.
 // This is required in order to get notification delivery errors from the receivers API.
-replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20230308154952-78fedf89728b
+replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20230426142720-803b73a2f1f7
 
 // grpc v1.46.0 removed "WithBalancerName()" API, still in use by weaveworks/commons.
 replace google.golang.org/grpc => google.golang.org/grpc v1.45.0
diff --git a/go.sum b/go.sum
index ac6805e8220..510e39466c7 100644
--- a/go.sum
+++ b/go.sum
@@ -277,6 +277,8 @@ github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
+github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE=
+github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -330,8 +332,9 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l
 github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
 github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
 github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
@@ -347,8 +350,8 @@ github.com/aws/aws-sdk-go v1.38.60/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z
 github.com/aws/aws-sdk-go v1.38.68/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.42.16/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go v1.44.171 h1:maREiPAmibvuONMOEZIkCH2OTosLRnDelceTtH3SYfo=
-github.com/aws/aws-sdk-go v1.44.171/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.234 h1:8YbQ5AhpgV/cC7jYX8qS34Am/vcn2ZoIFJ1qIgwOL+0=
+github.com/aws/aws-sdk-go v1.44.234/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/aws/aws-sdk-go-v2 v1.7.0/go.mod h1:tb9wi5s61kTDA5qCkcDbt3KRVV74GGslQkl/DRdX/P4=
 github.com/aws/aws-sdk-go-v2 v1.16.2 h1:fqlCk6Iy3bnCumtrLz9r3mJ/2gUT0pJ0wLFVIdWh+JA=
@@ -946,8 +949,8 @@ github.com/go-openapi/spec v0.20.1/go.mod h1:93x7oh+d+FQsmsieroS4cmR3u0p/ywH649a
 github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg=
 github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
 github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI=
-github.com/go-openapi/spec v0.20.7/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
+github.com/go-openapi/spec v0.20.8 h1:ubHmXNY3FCIOinT8RNrrPfGc9t7I1qhPtdOGoG2AxRU=
+github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
 github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
@@ -961,8 +964,9 @@ github.com/go-openapi/strfmt v0.20.1/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicA
 github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg=
 github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
 github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
-github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o=
 github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg=
+github.com/go-openapi/strfmt v0.21.7 h1:rspiXgNWgeUzhjo1YU01do6qsahtJNByjLVbPLNHb8k=
+github.com/go-openapi/strfmt v0.21.7/go.mod h1:adeGTkxE44sPyLk0JV235VQAO/ZXUr8KAzYjclFs3ew=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
@@ -988,8 +992,8 @@ github.com/go-openapi/validate v0.19.15/go.mod h1:tbn/fdOwYHgrhPBzidZfJC2MIVvs9G
 github.com/go-openapi/validate v0.20.1/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE9E4k54HpKcJ0=
 github.com/go-openapi/validate v0.20.2/go.mod h1:e7OJoKNgd0twXZwIn0A43tHbvIcr/rZIVCbJBpTUoY0=
 github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
-github.com/go-openapi/validate v0.22.0 h1:b0QecH6VslW/TxtpKgzpO1SNG7GU2FsaqKdP1E2T50Y=
-github.com/go-openapi/validate v0.22.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
+github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU=
+github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
@@ -1064,8 +1068,8 @@ github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gofrs/uuid v4.3.1+incompatible h1:0/KbAdpx3UXAx1kEOWHJeOkpbgRFGHVgv+CFIY7dBJI=
-github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
@@ -1269,8 +1273,8 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2 h1:teRmmE08bSnvyh3e+adfv/6RA1ZZdhTCmNL9Ckfm1Rk=
-github.com/grafana/alerting v0.0.0-20230426173942-011a41e1fbe2/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
+github.com/grafana/alerting v0.0.0-20230426193323-4f09f516596b h1:dAHlNtW62HcSh+XmhV7kmcWqnOSnYsw/pGHiEyix544=
+github.com/grafana/alerting v0.0.0-20230426193323-4f09f516596b/go.mod h1:5edgy6tQY4+W2wuJdi8g2GjbVmpJufguy7QGIRl2q4o=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
 github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
 github.com/grafana/cuetsy v0.1.8 h1:l0AKXfHr0clu6qPirirDzNC/W5mqq5gG7iruOVolG34=
@@ -1299,8 +1303,8 @@ github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a h1:i2YhC6eTyDp+7Ft
 github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
 github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413 h1:bBzCezZNRyYlJpXTkyZdY4fpPxHZUdyeyRWzhtw/P6I=
 github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413/go.mod h1:IvwuGG9xa/h96UH/exgvsfy3zE+ZpctkNT9o5aaGdrU=
-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/prometheus-alertmanager v0.25.1-0.20230426142720-803b73a2f1f7 h1:ebffH74Mxh6WLnoShty88jWQ5iLlI/d/qOxS/wdclMg=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20230426142720-803b73a2f1f7/go.mod h1:YYDJFReDm1zvLZnY0qE4mYuBzSnUFZy+qGDM79/C4Y0=
 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=
@@ -1394,8 +1398,8 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru/v2 v2.0.1 h1:5pv5N1lT1fjLg2VQ5KWc7kmucp2x/kvFOnxuVTqZ6x4=
-github.com/hashicorp/golang-lru/v2 v2.0.1/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
+github.com/hashicorp/golang-lru/v2 v2.0.2 h1:Dwmkdr5Nc/oBiXgJS3CDHNhJtIHkuZ3DZF5twqnfBdU=
+github.com/hashicorp/golang-lru/v2 v2.0.2/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
@@ -2020,15 +2024,16 @@ github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+
 github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
-github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
-github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q=
-github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE=
+github.com/prometheus/common v0.41.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
+github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
+github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
 github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
 github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
 github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg=
 github.com/prometheus/exporter-toolkit v0.7.0/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
-github.com/prometheus/exporter-toolkit v0.8.2 h1:sbJAfBXQFkG6sUkbwBun8MNdzW9+wd5YfPYofbmj0YM=
 github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0=
+github.com/prometheus/exporter-toolkit v0.9.1 h1:cNkC01riqiOS+kh3zdnNwRsbe/Blh0WwK3ij5rPJ9Sw=
+github.com/prometheus/exporter-toolkit v0.9.1/go.mod h1:iFlTmFISCix0vyuyBmm0UqOUCTao9+RsAsKJP3YM9ec=
 github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -2327,6 +2332,8 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
+github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4=
+github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
@@ -2393,9 +2400,8 @@ go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R7
 go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
 go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
 go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
-go.mongodb.org/mongo-driver v1.11.0/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
-go.mongodb.org/mongo-driver v1.11.1 h1:QP0znIRTuL0jf1oBQoAoM0C6ZJfBK4kx0Uumtv1A7w8=
-go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
+go.mongodb.org/mongo-driver v1.11.3 h1:Ql6K6qYHEzB6xvu4+AU0BoRoqf9vFPcc4o7MUIdPW8Y=
+go.mongodb.org/mongo-driver v1.11.3/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
 go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
 go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
@@ -2552,10 +2558,10 @@ golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2707,8 +2713,6 @@ golang.org/x/net v0.0.0-20220907135653-1e95f45603a7/go.mod h1:YDH+HFinaLZZlnHAfS
 golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
@@ -2740,7 +2744,7 @@ golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j
 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk=
+golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
 golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
 golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2942,7 +2946,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
@@ -2960,7 +2963,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
@@ -3070,7 +3072,6 @@ golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
-golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=

From 21f6414f132c463cea63a8d752ee862385ed1f03 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Fri, 28 Apr 2023 00:26:06 +0200
Subject: [PATCH 501/729] chore: update codeowners to remove dataviz from
 /packages/ (#67453)

---
 .github/CODEOWNERS | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0314cdf07a0..cd54bdee1b1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -294,17 +294,26 @@
 /public/app/core/internationalization/ @grafana/grafana-frontend-platform
 /e2e/ @grafana/grafana-frontend-platform
 /e2e/cloud-plugins-suite/ @grafana/partner-datasources
-/packages/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/dataviz-squad
+/packages/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
 /packages/grafana-e2e-selectors/ @grafana/grafana-frontend-platform
 /packages/grafana-e2e/ @grafana/grafana-frontend-platform
 /packages/grafana-toolkit/ @grafana/plugins-platform-frontend
 /packages/grafana-ui/.storybook/ @grafana/plugins-platform-frontend
 /packages/grafana-ui/src/components/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/DateTimePickers/ @grafana/grafana-frontend-platform
-/packages/grafana-ui/src/components/GraphNG/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/Gauge/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/BarGauge/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/GraphNG/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/Graph/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/uPlot/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/DataLinks/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/ValuePicker/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/VizLayout/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/VizLegend/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/VizRepeater/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/VizTooltip/ @grafana/dataviz-squad
 /packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /plugins-bundled/ @grafana/plugins-platform-frontend

From f5d97c677b70a4abbd89f951b09b01162205bb1a Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 27 Apr 2023 20:10:02 -0700
Subject: [PATCH 502/729] TimeSeries: Explicitly add transformer when
 timeseries-long exists (#64092)

---
 .../panel-timeseries/timeseries-formats.json  | 851 ++++++++++++++++++
 devenv/jsonnet/dev-dashboards.libsonnet       |   7 +
 .../src/components/PanelDataErrorView.tsx     |   4 +-
 .../components/PanelDataErrorView.test.tsx    |   8 +
 .../panel/components/PanelDataErrorView.tsx   |  40 +-
 .../app/features/panel/state/actions.test.ts  |   8 +
 public/app/features/panel/state/actions.ts    |   6 +-
 .../panel/timeseries/TimeSeriesPanel.tsx      |  17 +-
 .../plugins/panel/timeseries/suggestions.ts   |  29 +-
 9 files changed, 959 insertions(+), 11 deletions(-)
 create mode 100644 devenv/dev-dashboards/panel-timeseries/timeseries-formats.json

diff --git a/devenv/dev-dashboards/panel-timeseries/timeseries-formats.json b/devenv/dev-dashboards/panel-timeseries/timeseries-formats.json
new file mode 100644
index 00000000000..f0eb2e24fc4
--- /dev/null
+++ b/devenv/dev-dashboards/panel-timeseries/timeseries-formats.json
@@ -0,0 +1,851 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 220,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "dim1"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 80
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 8,
+        "x": 0,
+        "y": 0
+      },
+      "id": 8,
+      "options": {
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "frameIndex": 0,
+        "showHeader": true,
+        "showRowNums": false,
+        "sortBy": []
+      },
+      "pluginVersion": "9.5.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana",
+            "uid": "grafana"
+          },
+          "queryType": "snapshot",
+          "refId": "A",
+          "snapshot": [
+            {
+              "data": {
+                "values": [
+                  [
+                    1677256641358,
+                    1677257007358,
+                    1677257373358,
+                    1677257739358,
+                    1677258105358,
+                    1677258471358,
+                    1677258837358,
+                    1677259203358,
+                    1677259569358,
+                    1677259935358,
+                    1677260301358,
+                    1677260667358,
+                    1677261033358,
+                    1677261399358,
+                    1677261765358,
+                    1677262131358,
+                    1677262497358,
+                    1677262863358,
+                    1677263229358,
+                    1677263595358,
+                    1677263961358,
+                    1677264327358,
+                    1677264693358,
+                    1677265059358,
+                    1677265425358,
+                    1677265791358,
+                    1677266157358,
+                    1677266523358,
+                    1677266889358,
+                    1677267255358,
+                    1677267621358,
+                    1677267987358,
+                    1677268353358,
+                    1677268719358,
+                    1677269085358,
+                    1677269451358,
+                    1677269817358,
+                    1677270183358,
+                    1677270549358,
+                    1677270915358,
+                    1677271281358,
+                    1677271647358,
+                    1677272013358,
+                    1677272379358,
+                    1677272745358,
+                    1677273111358,
+                    1677273477358,
+                    1677273843358,
+                    1677274209358,
+                    1677274575358,
+                    1677274941358,
+                    1677275307358,
+                    1677275673358,
+                    1677276039358,
+                    1677276405358,
+                    1677276771358,
+                    1677277137358,
+                    1677277503358,
+                    1677277869358,
+                    1677278235358
+                  ],
+                  [
+                    1,
+                    3,
+                    5,
+                    7,
+                    4,
+                    6,
+                    8,
+                    10,
+                    1,
+                    3,
+                    5,
+                    7,
+                    4,
+                    6,
+                    8,
+                    10,
+                    1,
+                    3,
+                    5,
+                    7,
+                    4,
+                    6,
+                    8,
+                    10,
+                    1,
+                    3,
+                    5,
+                    7,
+                    4,
+                    6,
+                    8,
+                    10,
+                    1,
+                    3,
+                    5,
+                    7,
+                    4,
+                    6,
+                    8,
+                    10,
+                    1,
+                    3,
+                    5,
+                    7,
+                    4,
+                    6,
+                    8,
+                    10,
+                    1,
+                    3,
+                    5,
+                    7,
+                    4,
+                    6,
+                    8,
+                    10,
+                    1,
+                    3,
+                    5,
+                    7
+                  ],
+                  [
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d",
+                    "a",
+                    "b",
+                    "c",
+                    "d"
+                  ],
+                  [
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y",
+                    "x",
+                    "y"
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "labels": {},
+                    "name": "timestamp",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time"
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {},
+                    "name": "numericData",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {},
+                    "name": "dim1",
+                    "type": "string",
+                    "typeInfo": {
+                      "frame": "string"
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {},
+                    "name": "dim2",
+                    "type": "string",
+                    "typeInfo": {
+                      "frame": "string"
+                    }
+                  }
+                ],
+                "meta": {
+                  "type": "timeseries-long",
+                  "typeVersion": [
+                    0,
+                    0
+                  ]
+                },
+                "name": "New Frame",
+                "refId": "A"
+              }
+            },
+            {
+              "data": {
+                "values": [
+                  [
+                    1677256641358,
+                    1677257007358,
+                    1677257373358,
+                    1677257739358,
+                    1677258105358,
+                    1677258471358,
+                    1677258837358,
+                    1677259203358,
+                    1677259569358,
+                    1677259935358,
+                    1677260301358,
+                    1677260667358,
+                    1677261033358,
+                    1677261399358,
+                    1677261765358,
+                    1677262131358,
+                    1677262497358,
+                    1677262863358,
+                    1677263229358,
+                    1677263595358,
+                    1677263961358,
+                    1677264327358,
+                    1677264693358,
+                    1677265059358,
+                    1677265425358,
+                    1677265791358,
+                    1677266157358,
+                    1677266523358,
+                    1677266889358,
+                    1677267255358,
+                    1677267621358,
+                    1677267987358,
+                    1677268353358,
+                    1677268719358,
+                    1677269085358,
+                    1677269451358,
+                    1677269817358,
+                    1677270183358,
+                    1677270549358,
+                    1677270915358,
+                    1677271281358,
+                    1677271647358,
+                    1677272013358,
+                    1677272379358,
+                    1677272745358,
+                    1677273111358,
+                    1677273477358,
+                    1677273843358,
+                    1677274209358,
+                    1677274575358,
+                    1677274941358,
+                    1677275307358,
+                    1677275673358,
+                    1677276039358,
+                    1677276405358,
+                    1677276771358,
+                    1677277137358,
+                    1677277503358,
+                    1677277869358,
+                    1677278235358
+                  ],
+                  [
+                    1,
+                    2,
+                    3,
+                    2,
+                    3,
+                    5,
+                    6,
+                    3,
+                    1,
+                    2,
+                    3,
+                    2,
+                    3,
+                    5,
+                    6,
+                    3,
+                    1,
+                    2,
+                    3,
+                    2,
+                    3,
+                    5,
+                    6,
+                    3,
+                    1,
+                    2,
+                    3,
+                    2,
+                    3,
+                    5,
+                    6,
+                    3,
+                    1,
+                    2,
+                    3,
+                    2,
+                    3,
+                    5,
+                    6,
+                    3,
+                    1,
+                    2,
+                    3,
+                    2,
+                    3,
+                    5,
+                    6,
+                    3,
+                    1,
+                    2,
+                    3,
+                    2,
+                    3,
+                    5,
+                    6,
+                    3,
+                    1,
+                    2,
+                    3,
+                    2
+                  ],
+                  [
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h",
+                    "e",
+                    "f",
+                    "g",
+                    "h"
+                  ],
+                  [
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r",
+                    "q",
+                    "r"
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "labels": {},
+                    "name": "timestamp",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time"
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {},
+                    "name": "value",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {},
+                    "name": "dim3",
+                    "type": "string",
+                    "typeInfo": {
+                      "frame": "string"
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {},
+                    "name": "dim4",
+                    "type": "string",
+                    "typeInfo": {
+                      "frame": "string"
+                    }
+                  }
+                ],
+                "meta": {
+                  "type": "timeseries-long",
+                  "typeVersion": [
+                    0,
+                    0
+                  ]
+                },
+                "name": "New Frame",
+                "refId": "B"
+              }
+            }
+          ]
+        }
+      ],
+      "title": "timeseries-long",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Dashboard --"
+      },
+      "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": 11,
+        "x": 8,
+        "y": 0
+      },
+      "id": 10,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "panelId": 8,
+          "refId": "A"
+        }
+      ],
+      "title": "Timeseries panel requires a transform to render timeseries-long",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 5,
+        "x": 19,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "The timeseries panel can not show timeseries-long directly, it must first be converted to `timeseries-wide` or `timeseries-multi` first.\n\nThe UI should show a button indicating this.",
+        "mode": "markdown"
+      },
+      "pluginVersion": "9.5.0-pre",
+      "title": "Timeseries-long info",
+      "type": "text"
+    }
+  ],
+  "refresh": "",
+  "revision": 1,
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2023-02-24T16:37:21.358Z",
+    "to": "2023-02-24T22:37:15.358Z"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Panel Tests - Timeseries - Supported input formats",
+  "uid": "f4ca24309dd4",
+  "version": 6,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/jsonnet/dev-dashboards.libsonnet b/devenv/jsonnet/dev-dashboards.libsonnet
index c3d6cd99acb..2f77d6aad43 100644
--- a/devenv/jsonnet/dev-dashboards.libsonnet
+++ b/devenv/jsonnet/dev-dashboards.libsonnet
@@ -695,6 +695,13 @@ local dashboard = grafana.dashboard;
         id: 0,
       }
     },
+    dashboard.new('timeseries-formats', import '../dev-dashboards/panel-timeseries/timeseries-formats.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
     dashboard.new('timeseries-gradient-area', import '../dev-dashboards/panel-timeseries/timeseries-gradient-area.json') +
     resource.addMetadata('folder', 'dev-dashboards') +
     {
diff --git a/packages/grafana-runtime/src/components/PanelDataErrorView.tsx b/packages/grafana-runtime/src/components/PanelDataErrorView.tsx
index 61b88a63032..05902a3348a 100644
--- a/packages/grafana-runtime/src/components/PanelDataErrorView.tsx
+++ b/packages/grafana-runtime/src/components/PanelDataErrorView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { FieldConfigSource, PanelData } from '@grafana/data';
+import { FieldConfigSource, PanelData, VisualizationSuggestion } from '@grafana/data';
 
 /**
  * Describes the properties that can be passed to the PanelDataErrorView.
@@ -15,7 +15,7 @@ export interface PanelDataErrorViewProps {
   needsTimeField?: boolean;
   needsNumberField?: boolean;
   needsStringField?: boolean;
-  // suggestions?: VisualizationSuggestion[]; <<< for sure optional
+  suggestions?: VisualizationSuggestion[];
 }
 
 /**
diff --git a/public/app/features/panel/components/PanelDataErrorView.test.tsx b/public/app/features/panel/components/PanelDataErrorView.test.tsx
index b049a44ecd3..3f33487d211 100644
--- a/public/app/features/panel/components/PanelDataErrorView.test.tsx
+++ b/public/app/features/panel/components/PanelDataErrorView.test.tsx
@@ -9,6 +9,14 @@ import { configureStore } from 'app/store/configureStore';
 
 import { PanelDataErrorView } from './PanelDataErrorView';
 
+jest.mock('app/features/dashboard/services/DashboardSrv', () => ({
+  getDashboardSrv: () => {
+    return {
+      getCurrent: () => undefined,
+    };
+  },
+}));
+
 describe('PanelDataErrorView', () => {
   it('show No data when there is no data', () => {
     renderWithProps();
diff --git a/public/app/features/panel/components/PanelDataErrorView.tsx b/public/app/features/panel/components/PanelDataErrorView.tsx
index 35dea163502..93c7344d184 100644
--- a/public/app/features/panel/components/PanelDataErrorView.tsx
+++ b/public/app/features/panel/components/PanelDataErrorView.tsx
@@ -1,8 +1,14 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { CoreApp, GrafanaTheme2, PanelDataSummary, VisualizationSuggestionsBuilder } from '@grafana/data';
-import { PanelDataErrorViewProps } from '@grafana/runtime';
+import {
+  CoreApp,
+  GrafanaTheme2,
+  PanelDataSummary,
+  VisualizationSuggestionsBuilder,
+  VisualizationSuggestion,
+} from '@grafana/data';
+import { PanelDataErrorViewProps, locationService } from '@grafana/runtime';
 import { usePanelContext, useStyles2 } from '@grafana/ui';
 import { CardButton } from 'app/core/components/CardButton';
 import { LS_VISUALIZATION_SELECT_TAB_KEY } from 'app/core/constants';
@@ -21,6 +27,7 @@ export function PanelDataErrorView(props: PanelDataErrorViewProps) {
   const { dataSummary } = builder;
   const message = getMessageFor(props, dataSummary);
   const dispatch = useDispatch();
+  const panel = getDashboardSrv().getCurrent()?.getPanelById(props.panelId);
 
   const openVizPicker = () => {
     store.setObject(LS_VISUALIZATION_SELECT_TAB_KEY, VisualizationSelectPaneTab.Suggestions);
@@ -28,7 +35,6 @@ export function PanelDataErrorView(props: PanelDataErrorViewProps) {
   };
 
   const switchToTable = () => {
-    const panel = getDashboardSrv().getCurrent()?.getPanelById(props.panelId);
     if (!panel) {
       return;
     }
@@ -41,11 +47,37 @@ export function PanelDataErrorView(props: PanelDataErrorViewProps) {
     );
   };
 
+  const loadSuggestion = (s: VisualizationSuggestion) => {
+    if (!panel) {
+      return;
+    }
+    dispatch(
+      changePanelPlugin({
+        ...s, // includes panelId, config, etc
+        panel,
+      })
+    );
+    if (s.transformations) {
+      setTimeout(() => {
+        locationService.partial({ tab: 'transform' });
+      }, 100);
+    }
+  };
+
   return (
     <div className={styles.wrapper}>
       <div className={styles.message}>{message}</div>
-      {context.app === CoreApp.PanelEditor && dataSummary.hasData && (
+      {context.app === CoreApp.PanelEditor && dataSummary.hasData && panel && (
         <div className={styles.actions}>
+          {props.suggestions && (
+            <>
+              {props.suggestions.map((v) => (
+                <CardButton key={v.name} icon="process" onClick={() => loadSuggestion(v)}>
+                  {v.name}
+                </CardButton>
+              ))}
+            </>
+          )}
           <CardButton icon="table" onClick={switchToTable}>
             Switch to table
           </CardButton>
diff --git a/public/app/features/panel/state/actions.test.ts b/public/app/features/panel/state/actions.test.ts
index 840e50647ca..2574f92c27c 100644
--- a/public/app/features/panel/state/actions.test.ts
+++ b/public/app/features/panel/state/actions.test.ts
@@ -21,6 +21,14 @@ jest.mock('app/features/plugins/importPanelPlugin', () => {
   };
 });
 
+jest.mock('app/features/dashboard/services/DashboardSrv', () => ({
+  getDashboardSrv: () => {
+    return {
+      getCurrent: () => undefined,
+    };
+  },
+}));
+
 standardFieldConfigEditorRegistry.setInit(() => mockStandardFieldConfigOptions());
 standardEditorsRegistry.setInit(() => mockStandardFieldConfigOptions());
 
diff --git a/public/app/features/panel/state/actions.ts b/public/app/features/panel/state/actions.ts
index efa00f419c1..98b234393ba 100644
--- a/public/app/features/panel/state/actions.ts
+++ b/public/app/features/panel/state/actions.ts
@@ -56,10 +56,11 @@ export function changePanelPlugin({
   pluginId,
   options,
   fieldConfig,
+  transformations,
 }: ChangePanelPluginAndOptionsArgs): ThunkResult<void> {
   return async (dispatch, getStore) => {
     // ignore action is no change
-    if (panel.type === pluginId && !options && !fieldConfig) {
+    if (panel.type === pluginId && !options && !fieldConfig && !transformations) {
       return;
     }
 
@@ -74,7 +75,7 @@ export function changePanelPlugin({
       panel.changePlugin(plugin);
     }
 
-    if (options || fieldConfig) {
+    if (options || fieldConfig || transformations) {
       const newOptions = getPanelOptionsWithDefaults({
         plugin,
         currentOptions: options || panel.options,
@@ -84,6 +85,7 @@ export function changePanelPlugin({
 
       panel.options = newOptions.options;
       panel.fieldConfig = newOptions.fieldConfig;
+      panel.transformations = transformations || panel.transformations;
       panel.configRev++;
     }
 
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index 85d6d67c45a..472b85ec143 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { Field, PanelProps } from '@grafana/data';
+import { Field, PanelProps, DataFrameType } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
 import { TooltipDisplayMode } from '@grafana/schema';
 import { KeyboardPlugin, TimeSeries, TooltipPlugin, usePanelContext, ZoomPlugin } from '@grafana/ui';
@@ -14,6 +14,7 @@ import { ContextMenuPlugin } from './plugins/ContextMenuPlugin';
 import { ExemplarsPlugin, getVisibleLabels } from './plugins/ExemplarsPlugin';
 import { OutsideRangePlugin } from './plugins/OutsideRangePlugin';
 import { ThresholdControlsPlugin } from './plugins/ThresholdControlsPlugin';
+import { getPrepareTimeseriesSuggestion } from './suggestions';
 import { getTimezones, prepareGraphableFields, regenerateLinksSupplier } from './utils';
 
 interface TimeSeriesPanelProps extends PanelProps<PanelOptions> {}
@@ -39,15 +40,27 @@ export const TimeSeriesPanel = ({
 
   const frames = useMemo(() => prepareGraphableFields(data.series, config.theme2, timeRange), [data, timeRange]);
   const timezones = useMemo(() => getTimezones(options.timezone, timeZone), [options.timezone, timeZone]);
+  const suggestions = useMemo(() => {
+    if (data.series.every((df) => df.meta?.type === DataFrameType.TimeSeriesLong)) {
+      const s = getPrepareTimeseriesSuggestion(id);
+      return {
+        message: 'Long data must be converted to wide',
+        suggestions: s ? [s] : undefined,
+      };
+    }
+    return undefined;
+  }, [data.series, id]);
 
-  if (!frames) {
+  if (!frames || suggestions) {
     return (
       <PanelDataErrorView
         panelId={id}
+        message={suggestions?.message}
         fieldConfig={fieldConfig}
         data={data}
         needsTimeField={true}
         needsNumberField={true}
+        suggestions={suggestions?.suggestions}
       />
     );
   }
diff --git a/public/app/plugins/panel/timeseries/suggestions.ts b/public/app/plugins/panel/timeseries/suggestions.ts
index 5f42497e945..6c490b0f885 100644
--- a/public/app/plugins/panel/timeseries/suggestions.ts
+++ b/public/app/plugins/panel/timeseries/suggestions.ts
@@ -1,5 +1,11 @@
-import { FieldColorModeId, VisualizationSuggestionsBuilder } from '@grafana/data';
+import {
+  FieldColorModeId,
+  VisualizationSuggestionsBuilder,
+  VisualizationSuggestion,
+  DataTransformerID,
+} from '@grafana/data';
 import { GraphDrawStyle, GraphFieldConfig, GraphGradientMode, LineInterpolation, StackingMode } from '@grafana/schema';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { SuggestionName } from 'app/types/suggestions';
 
 import { PanelOptions } from './panelcfg.gen';
@@ -200,3 +206,24 @@ export class TimeSeriesSuggestionsSupplier {
     }
   }
 }
+
+// This will try to get a suggestion that will add a long to wide conversion
+export function getPrepareTimeseriesSuggestion(panelId: number): VisualizationSuggestion | undefined {
+  const panel = getDashboardSrv().getCurrent()?.getPanelById(panelId);
+  if (panel) {
+    const transformations = panel.transformations ? [...panel.transformations] : [];
+    transformations.push({
+      id: DataTransformerID.prepareTimeSeries,
+      options: {
+        format: 'wide',
+      },
+    });
+
+    return {
+      name: 'Transform to wide time series format',
+      pluginId: 'timeseries',
+      transformations,
+    };
+  }
+  return undefined;
+}

From ea536411f1100cf2f70034aeb5c00f4b4a49af97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 28 Apr 2023 07:17:18 +0200
Subject: [PATCH 503/729] DataSourceSettings: Fix recent changes to
 HttpDataSourceSettings (#67436)

---
 .../DataSourceHttpSettings.tsx                | 34 +++++++++----------
 .../components/DataSourceSettings/types.ts    | 11 +++---
 .../prometheus/configuration/ConfigEditor.tsx |  6 ++--
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
index cf4a0a26981..614e42c7c02 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
@@ -73,11 +73,13 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
     azureAuthSettings,
     renderSigV4Editor,
     secureSocksDSProxyEnabled,
-    connectionElements,
+    urlLabel,
+    urlDocs,
   } = props;
-  let urlTooltip;
+
   const [isAccessHelpVisible, setIsAccessHelpVisible] = useState(false);
   const theme = useTheme2();
+  let urlTooltip;
 
   const onSettingsChange = useCallback(
     (change: Partial<DataSourceSettings<any, any>>) => {
@@ -94,7 +96,7 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
       urlTooltip = (
         <>
           Your access method is <em>Browser</em>, this means the URL needs to be accessible from the browser.
-          {connectionElements?.tooltip}
+          {urlDocs}
         </>
       );
       break;
@@ -103,12 +105,12 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
         <>
           Your access method is <em>Server</em>, this means the URL needs to be accessible from the grafana
           backend/server.
-          {connectionElements?.tooltip}
+          {urlDocs}
         </>
       );
       break;
     default:
-      urlTooltip = <>Specify a complete HTTP URL (for example http://your_server:8080) {connectionElements?.tooltip}</>;
+      urlTooltip = <>Specify a complete HTTP URL (for example http://your_server:8080) {urlDocs}</>;
   }
 
   const accessSelect = (
@@ -146,24 +148,20 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
   const azureAuthEnabled: boolean =
     (azureAuthSettings?.azureAuthSupported && azureAuthSettings.getAzureAuthEnabled(dataSourceConfig)) || false;
 
-  const connectionLabel = connectionElements?.label ? connectionElements?.label : 'URL';
-
   return (
     <div className="gf-form-group">
       <>
         <h3 className="page-heading">HTTP</h3>
         <div className="gf-form-group">
-          {defaultUrl && (
-            <div className="gf-form">
-              <FormField
-                interactive={connectionElements?.tooltip ? true : false}
-                label={connectionLabel}
-                labelWidth={13}
-                tooltip={urlTooltip}
-                inputEl={urlInput}
-              />
-            </div>
-          )}
+          <div className="gf-form">
+            <FormField
+              interactive={urlDocs ? true : false}
+              label={urlLabel ?? 'URL'}
+              labelWidth={13}
+              tooltip={urlTooltip}
+              inputEl={urlInput}
+            />
+          </div>
 
           {showAccessOptions && (
             <>
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/types.ts b/packages/grafana-ui/src/components/DataSourceSettings/types.ts
index 81d20df8f2a..12339b67b7d 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/types.ts
+++ b/packages/grafana-ui/src/components/DataSourceSettings/types.ts
@@ -30,7 +30,11 @@ export interface HttpSettingsBaseProps<JSONData extends DataSourceJsonData = any
 
 export interface HttpSettingsProps extends HttpSettingsBaseProps {
   /** The default url for the data source */
-  defaultUrl?: string;
+  defaultUrl: string;
+  /** Set label for url option */
+  urlLabel?: string;
+  /** Added to default url tooltip */
+  urlDocs?: React.ReactNode;
   /** Show the http access help box */
   showAccessOptions?: boolean;
   /** Show the SigV4 auth toggle option */
@@ -41,9 +45,4 @@ export interface HttpSettingsProps extends HttpSettingsBaseProps {
   renderSigV4Editor?: React.ReactNode;
   /** Show the Secure Socks Datasource Proxy toggle option */
   secureSocksDSProxyEnabled?: boolean;
-  /** connection URL label and tooltip */
-  connectionElements?: {
-    label?: string;
-    tooltip?: React.ReactNode;
-  };
 }
diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
index 7df57461f82..b84b7b318c0 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
@@ -49,10 +49,8 @@ export const ConfigEditor = (props: Props) => {
         azureAuthSettings={azureAuthSettings}
         renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
         secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
-        connectionElements={{
-          label: 'Prometheus server URL',
-          tooltip: docsTip(),
-        }}
+        urlLabel="Prometheus server URL"
+        urlDocs={docsTip()}
       />
       <>
         <hr className={styles.hrTopSpace} />

From 43def489f4d601449dba9c95509870499a40b5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 28 Apr 2023 08:18:14 +0200
Subject: [PATCH 504/729] PageNotFound: G10 Redesign (#66909)

* PageNotFound: G10 Redesign

* Make into a reusable component so we can have a more specific version for dashboards

* Make graphic abit smaller
---
 .../core/components/ErrorPage/ErrorPage.tsx   | 78 ---------------
 .../PageNotFound/EntityNotFound.tsx           | 60 ++++++++++++
 .../components/PageNotFound/PageNotFound.tsx  | 15 +++
 .../dashboard/containers/DashboardPage.tsx    | 96 ++++++++++---------
 public/app/routes/routes.tsx                  |  6 +-
 public/img/grot-404-dark.svg                  | 61 ++++++++++++
 public/img/grot-404-light.svg                 | 61 ++++++++++++
 7 files changed, 248 insertions(+), 129 deletions(-)
 delete mode 100644 public/app/core/components/ErrorPage/ErrorPage.tsx
 create mode 100644 public/app/core/components/PageNotFound/EntityNotFound.tsx
 create mode 100644 public/app/core/components/PageNotFound/PageNotFound.tsx
 create mode 100644 public/img/grot-404-dark.svg
 create mode 100644 public/img/grot-404-light.svg

diff --git a/public/app/core/components/ErrorPage/ErrorPage.tsx b/public/app/core/components/ErrorPage/ErrorPage.tsx
deleted file mode 100644
index 65d934bd173..00000000000
--- a/public/app/core/components/ErrorPage/ErrorPage.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-import { VizLegendSeriesIcon } from '@grafana/ui/src/components/VizLegend/VizLegendSeriesIcon';
-
-import { Page } from '../Page/Page';
-
-export function ErrorPage() {
-  const styles = useStyles2(getStyles);
-
-  return (
-    <Page navId="home" layout={PageLayoutType.Canvas} pageNav={{ text: 'Page not found' }}>
-      <div className={styles.container}>
-        <h1>Page not found</h1>
-        <div className={styles.subtitle}>
-          We could not find the page you are looking for. If the issue persists seek help on the{' '}
-          <a href="https://community.grafana.com" target="_blank" rel="noreferrer" className="error-link">
-            community site.
-          </a>
-        </div>
-
-        <div className={styles.panel}>
-          <div className="error-row">
-            <div className="error-column error-space-between graph-percentage">
-              <p>100%</p>
-              <p>80%</p>
-              <p>60%</p>
-              <p>40%</p>
-              <p>20%</p>
-              <p>0%</p>
-            </div>
-            <div className="error-column image-box">
-              <img src="public/img/graph404.svg" width="100%" alt="graph" />
-              <div className="error-row error-space-between">
-                <p className="graph-text">Then</p>
-                <p className="graph-text">Now</p>
-              </div>
-            </div>
-          </div>
-          <div className={styles.legend}>
-            <VizLegendSeriesIcon seriesName="asd" color="green" />
-            <div>Chances you are on the page you are looking for (Last: 0%)</div>
-          </div>
-        </div>
-      </div>
-    </Page>
-  );
-}
-
-export function getStyles(theme: GrafanaTheme2) {
-  return {
-    container: css({
-      display: 'flex',
-      flexDirection: 'column',
-      padding: theme.spacing(4),
-    }),
-    subtitle: css({
-      color: theme.colors.text.secondary,
-      marginBottom: theme.spacing(2),
-    }),
-    panel: css({
-      display: 'flex',
-      flexDirection: 'column',
-      maxWidth: '874px',
-      border: `1px solid ${theme.colors.border.weak}`,
-      borderRadius: theme.shape.borderRadius(),
-      padding: theme.spacing(2),
-      background: theme.colors.background.primary,
-    }),
-    legend: css({
-      display: 'flex',
-      justifyContent: 'flex-end',
-      alignItems: 'center',
-    }),
-  };
-}
diff --git a/public/app/core/components/PageNotFound/EntityNotFound.tsx b/public/app/core/components/PageNotFound/EntityNotFound.tsx
new file mode 100644
index 00000000000..4ed5d97f59a
--- /dev/null
+++ b/public/app/core/components/PageNotFound/EntityNotFound.tsx
@@ -0,0 +1,60 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2, useTheme2 } from '@grafana/ui';
+
+export interface Props {
+  /**
+   * Defaults to Page
+   */
+  entity?: string;
+}
+
+export function EntityNotFound({ entity = 'Page' }: Props) {
+  const styles = useStyles2(getStyles);
+  const theme = useTheme2();
+
+  return (
+    <div className={styles.container}>
+      <h1>{entity} not found</h1>
+      <div className={styles.subtitle}>
+        We&apos;re looking but can&apos;t seem to find this {entity.toLowerCase()}. Try returning{' '}
+        <a href="/" className="external-link">
+          home
+        </a>{' '}
+        or seeking help on the{' '}
+        <a href="https://community.grafana.com" target="_blank" rel="noreferrer" className="external-link">
+          community site.
+        </a>
+      </div>
+      <div className={styles.grot}>
+        <img src={`public/img/grot-404-${theme.isDark ? 'dark' : 'light'}.svg`} width="100%" alt="grot" />
+      </div>
+    </div>
+  );
+}
+
+export function getStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      padding: theme.spacing(8, 2, 2, 2),
+      h1: {
+        textAlign: 'center',
+      },
+    }),
+    subtitle: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.h5.fontSize,
+      padding: theme.spacing(2, 0),
+      textAlign: 'center',
+    }),
+    grot: css({
+      maxWidth: '450px',
+      paddingTop: theme.spacing(8),
+      margin: '0 auto',
+    }),
+  };
+}
diff --git a/public/app/core/components/PageNotFound/PageNotFound.tsx b/public/app/core/components/PageNotFound/PageNotFound.tsx
new file mode 100644
index 00000000000..7135da5b81d
--- /dev/null
+++ b/public/app/core/components/PageNotFound/PageNotFound.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import { PageLayoutType } from '@grafana/data';
+
+import { Page } from '../Page/Page';
+
+import { EntityNotFound } from './EntityNotFound';
+
+export function PageNotFound() {
+  return (
+    <Page navId="home" layout={PageLayoutType.Canvas} pageNav={{ text: 'Page not found' }}>
+      <EntityNotFound entity="Page" />
+    </Page>
+  );
+}
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index d05e2bcac58..0509763a802 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -19,8 +19,8 @@ import { selectors } from '@grafana/e2e-selectors';
 import { config, locationService } from '@grafana/runtime';
 import { Icon, Themeable2, withTheme2 } from '@grafana/ui';
 import { notifyApp } from 'app/core/actions';
-import { ErrorPage } from 'app/core/components/ErrorPage/ErrorPage';
 import { Page } from 'app/core/components/Page/Page';
+import { EntityNotFound } from 'app/core/components/PageNotFound/EntityNotFound';
 import { GrafanaContext, GrafanaContextType } from 'app/core/context/GrafanaContext';
 import { createErrorNotification } from 'app/core/copy/appNotification';
 import { getKioskMode } from 'app/core/navigation/kiosk';
@@ -429,6 +429,14 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
       'page-hidden': Boolean(queryParams.editview || editPanel),
     });
 
+    if (dashboard.meta.dashboardNotFound) {
+      return (
+        <Page navId="dashboards/browse" layout={PageLayoutType.Canvas} pageNav={{ text: 'Not found' }}>
+          <EntityNotFound entity="Dashboard" />
+        </Page>
+      );
+    }
+
     return (
       <>
         <Page
@@ -442,53 +450,47 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
         >
           <DashboardPrompt dashboard={dashboard} />
           {initError && <DashboardFailed />}
-          {dashboard.meta.dashboardNotFound ? (
-            <ErrorPage />
-          ) : (
-            <>
-              {showSubMenu && (
-                <section aria-label={selectors.pages.Dashboard.SubMenu.submenu}>
-                  <SubMenu dashboard={dashboard} annotations={dashboard.annotations.list} links={dashboard.links} />
-                </section>
-              )}
-              {config.featureToggles.editPanelCSVDragAndDrop ? (
-                <DropZone
-                  onDrop={this.onFileDrop}
-                  accept={DFImport.acceptedFiles}
-                  maxSize={DFImport.maxFileSize}
-                  noClick={true}
-                >
-                  {({ getRootProps, isDragActive }) => {
-                    const styles = getStyles(this.props.theme, isDragActive);
-                    return (
-                      <div {...getRootProps({ className: styles.dropZone })}>
-                        <div className={styles.dropOverlay}>
-                          <div className={styles.dropHint}>
-                            <Icon name="upload" size="xxxl"></Icon>
-                            <h3>Create tables from spreadsheets</h3>
-                          </div>
-                        </div>
-                        <DashboardGrid
-                          dashboard={dashboard}
-                          isEditable={!!dashboard.meta.canEdit}
-                          viewPanel={viewPanel}
-                          editPanel={editPanel}
-                        />
-                      </div>
-                    );
-                  }}
-                </DropZone>
-              ) : (
-                <DashboardGrid
-                  dashboard={dashboard}
-                  isEditable={!!dashboard.meta.canEdit}
-                  viewPanel={viewPanel}
-                  editPanel={editPanel}
-                />
-              )}
-              {inspectPanel && <PanelInspector dashboard={dashboard} panel={inspectPanel} />}
-            </>
+          {showSubMenu && (
+            <section aria-label={selectors.pages.Dashboard.SubMenu.submenu}>
+              <SubMenu dashboard={dashboard} annotations={dashboard.annotations.list} links={dashboard.links} />
+            </section>
           )}
+          {config.featureToggles.editPanelCSVDragAndDrop ? (
+            <DropZone
+              onDrop={this.onFileDrop}
+              accept={DFImport.acceptedFiles}
+              maxSize={DFImport.maxFileSize}
+              noClick={true}
+            >
+              {({ getRootProps, isDragActive }) => {
+                const styles = getStyles(this.props.theme, isDragActive);
+                return (
+                  <div {...getRootProps({ className: styles.dropZone })}>
+                    <div className={styles.dropOverlay}>
+                      <div className={styles.dropHint}>
+                        <Icon name="upload" size="xxxl"></Icon>
+                        <h3>Create tables from spreadsheets</h3>
+                      </div>
+                    </div>
+                    <DashboardGrid
+                      dashboard={dashboard}
+                      isEditable={!!dashboard.meta.canEdit}
+                      viewPanel={viewPanel}
+                      editPanel={editPanel}
+                    />
+                  </div>
+                );
+              }}
+            </DropZone>
+          ) : (
+            <DashboardGrid
+              dashboard={dashboard}
+              isEditable={!!dashboard.meta.canEdit}
+              viewPanel={viewPanel}
+              editPanel={editPanel}
+            />
+          )}
+          {inspectPanel && <PanelInspector dashboard={dashboard} panel={inspectPanel} />}
         </Page>
         {editPanel && (
           <PanelEditor
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index 96ed930aa70..436672c7152 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { Redirect } from 'react-router-dom';
 
 import { isTruthy } from '@grafana/data';
-import { ErrorPage } from 'app/core/components/ErrorPage/ErrorPage';
 import { LoginPage } from 'app/core/components/Login/LoginPage';
 import { NavLandingPage } from 'app/core/components/NavLandingPage/NavLandingPage';
+import { PageNotFound } from 'app/core/components/PageNotFound/PageNotFound';
 import config from 'app/core/config';
 import { contextSrv } from 'app/core/services/context_srv';
 import UserAdminPage from 'app/features/admin/UserAdminPage';
@@ -512,10 +512,8 @@ export function getAppRoutes(): RouteDescriptor[] {
     ...getDataConnectionsRoutes(),
     {
       path: '/*',
-      component: ErrorPage,
+      component: PageNotFound,
     },
-    // TODO[Router]
-    // ...playlistRoutes,
   ].filter(isTruthy);
 }
 
diff --git a/public/img/grot-404-dark.svg b/public/img/grot-404-dark.svg
new file mode 100644
index 00000000000..dd6e81f4f0e
--- /dev/null
+++ b/public/img/grot-404-dark.svg
@@ -0,0 +1,61 @@
+<svg width="722" height="480" viewBox="0 0 722 480" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M514.59 3.80879C447.52 -7.78121 379.51 8.58879 314.8 32.5588C275.1 47.2688 236.85 58.9488 196.11 69.7588C150.35 81.8988 102.13 94.2588 62.7402 123.959C15.7502 159.389 -0.05983 214.349 0.000170029 274.969C0.04017 319.049 7.54023 365.349 33.0602 399.379C71.8302 451.069 139.04 459.809 196.03 455.539C267.53 450.189 313.45 436.549 383.95 458.929C471.35 486.669 580.88 498.339 659.07 416.129C765.14 304.599 726.89 126.169 614.63 45.6788C598.19 33.8888 580.48 24.2188 561.98 16.9888C546.27 10.8488 530.46 6.53878 514.59 3.79878V3.80879Z" fill="#9087E9" fill-opacity="0.3"/>
+<path opacity="0.3" d="M273.041 410.45C346.097 410.45 405.321 403.497 405.321 394.92C405.321 386.343 346.097 379.39 273.041 379.39C199.985 379.39 140.761 386.343 140.761 394.92C140.761 403.497 199.985 410.45 273.041 410.45Z" fill="black"/>
+<path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" fill="#F99F10"/>
+<path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M218.861 115.04C187.091 92.89 146.441 87.92 139.291 95.87C133.491 102.31 155.401 137.59 151.851 147.9C148.311 158.21 117.231 151.54 113.831 164.65C112.221 170.88 136.061 185.91 135.421 194.61C134.781 203.31 116.371 200.85 115.021 212.11C114.111 219.68 130.911 221.35 130.271 230.37C129.631 239.39 117.501 237.74 118.031 246.48C118.461 253.57 131.721 248.9 135.271 260.82C138.811 272.74 218.871 115.04 218.871 115.04H218.861Z" fill="#EF6122"/>
+<path d="M77.1408 326.59C78.1108 297.43 98.4608 290.96 113.241 295.94C128.011 300.92 127.191 318.09 123.461 324.55C117.501 334.86 108.751 330.41 112.021 323.19C114.441 316.26 114.891 306.64 103.441 309.7C89.2109 313.51 93.6408 351.77 123.601 344.25C144.121 339.1 142.511 317.37 140.881 285.68C136.511 255.02 141.241 214.82 154.281 176.66C180.701 99.34 339.851 74.21 392.681 145.73C461.311 238.63 385.631 329.37 373.991 340.96C337.731 369.1 343.611 394.56 317.631 396.25C292.941 397.86 294.971 372.77 278.641 371.37C277.681 371.37 276.721 371.37 275.761 371.35C256.591 372.76 252.891 396.67 223.981 396.25C200.421 395.91 210.911 375.33 195.171 365.46C191.871 363.9 189.011 362.8 186.371 362.08C184.291 361.64 181.981 361.32 179.371 361.16C178.771 361.12 175.141 361.14 174.081 361.14C164.731 361.31 159.121 363.52 137.991 367.82C99.9208 375.56 76.3208 351.26 77.1408 326.59Z" fill="#FAC20C" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M181.051 134.78C235.171 96.44 298.161 117.38 306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 242.361 25.05 227.441 34.26C210.761 44.56 231.741 90.5 220.841 101.27C212.091 109.91 206.131 103.31 191.251 98.32C177.811 93.81 181.051 134.78 181.051 134.78Z" fill="#EF6122"/>
+<path d="M262.101 239.52L410.381 239.52C428.197 239.52 442.641 225.077 442.641 207.26V207.25C442.641 189.433 428.197 174.99 410.381 174.99L262.101 174.99C244.284 174.99 229.841 189.433 229.841 207.25V207.26C229.841 225.077 244.284 239.52 262.101 239.52Z" fill="#5545EF" stroke="#231735" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M296.28 228.67L408.8 228.67C420.619 228.67 430.2 219.089 430.2 207.27C430.2 195.451 420.619 185.87 408.8 185.87H296.28C284.461 185.87 274.88 195.451 274.88 207.27C274.88 219.089 284.461 228.67 296.28 228.67Z" fill="#19052D"/>
+<path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" fill="#F99F10"/>
+<path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M200.23 104.32C172.95 91.48 146.34 84.67 139.29 95.87C131.67 107.98 157.65 133.7 151.85 147.9C146.43 161.18 115.82 149.78 113.83 164.65C112.24 176.55 136.06 185.91 135.42 194.61C134.78 203.31 116.14 199.76 114.78 211.03C113.87 218.6 130.91 221.35 130.26 230.37C129.62 239.39 118.02 237.73 118.02 246.48C118.02 253.6 138.81 254.21 139.4 269.02" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 244.001 24.95 227.441 34.26C210.061 44.03 231.741 90.5 220.841 101.27C214.751 107.29 206.751 107.03 199.421 103.95" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M306.531 122.94C277.581 105.78 226.39 104.87 180.98 138.83" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M341.4 253.66C351.4 254.03 366.49 259.17 366.02 269.49C365.55 279.82 349.3 283.19 335.71 279.29C322.12 275.39 323.16 265.5 325.3 262.15C327.44 258.8 332.12 253.32 341.41 253.66H341.4Z" fill="black"/>
+<path d="M345.16 258.45C351.6 259.28 356.39 262.63 356.39 262.63C356.39 262.63 355.45 269.62 344.22 269.4C332.99 269.18 336.07 258.72 336.07 258.72C336.07 258.72 339.03 257.66 345.15 258.44L345.16 258.45Z" fill="white"/>
+<g opacity="0.6">
+<path d="M621.96 318.31V332.84" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M629.23 325.58H614.69" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M657.411 162.86V175.25" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M663.601 169.05H651.221" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<g opacity="0.4">
+<path d="M497.061 209.35V221.73" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M503.25 215.54H490.87" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+</g>
+<path d="M660.051 285.01L668.811 293.76" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M668.811 285.01L660.051 293.76" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M476.391 312.83L482.341 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M482.341 312.83L476.391 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M519 113.2H527.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M523.21 109V117.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M609.581 239.16L616.861 231.87C617.721 231.01 617.721 229.61 616.861 228.74C616.001 227.88 614.601 227.88 613.731 228.74L606.451 236.03L599.161 228.75C598.301 227.89 596.901 227.89 596.031 228.75C595.171 229.61 595.171 231.01 596.031 231.88L603.321 239.16L596.041 246.45C595.181 247.31 595.181 248.71 596.041 249.58C596.471 250.01 597.041 250.23 597.601 250.23C598.161 250.23 598.731 250.01 599.161 249.58L606.441 242.29L613.731 249.57C614.161 250 614.731 250.22 615.291 250.22C615.851 250.22 616.421 250 616.851 249.57C617.711 248.71 617.711 247.31 616.851 246.44L609.561 239.16H609.581Z" fill="#B4ADF8"/>
+<path d="M557.84 280.71V267.77C557.83 266.23 556.581 264.99 555.051 264.99C553.521 264.99 552.271 266.23 552.271 267.77V280.71C552.281 282.25 553.531 283.49 555.061 283.49C556.591 283.49 557.84 282.25 557.84 280.71Z" fill="#A59DF7"/>
+<path d="M648.21 244.27V257.21C648.22 258.75 649.47 259.99 651 259.99C652.53 259.99 653.78 258.75 653.78 257.21V244.27C653.77 242.73 652.52 241.49 650.99 241.49C649.46 241.49 648.21 242.73 648.21 244.27Z" fill="#402EED"/>
+<path d="M561.34 181.68H548.4C546.86 181.69 545.62 182.94 545.62 184.47C545.62 186 546.86 187.25 548.4 187.25H561.34C562.88 187.24 564.12 185.99 564.12 184.46C564.12 182.93 562.88 181.68 561.34 181.68Z" fill="#5041E4"/>
+<path d="M568.931 247.36L568.951 280.7C568.951 282.24 570.191 283.48 571.731 283.48C573.271 283.48 574.511 282.24 574.511 280.7L574.491 247.36C574.491 245.82 573.251 244.58 571.711 244.58C570.171 244.58 568.931 245.82 568.931 247.36Z" fill="#A59DF7"/>
+<path d="M574.791 321.8L541.451 321.82C539.911 321.82 538.671 323.06 538.671 324.6C538.671 326.14 539.911 327.38 541.451 327.38L574.791 327.36C576.331 327.36 577.571 326.12 577.571 324.58C577.571 323.04 576.331 321.8 574.791 321.8Z" fill="#5041E4"/>
+<path d="M601.3 192.84H588.12C586.46 192.84 585.11 194.2 585.11 195.86V209.04C585.11 210.71 586.47 212.05 588.13 212.05H601.31C602.97 212.05 604.32 210.7 604.32 209.03V195.85C604.32 194.19 602.96 192.84 601.3 192.84ZM599.82 207.55H589.61V197.35H599.82V207.55Z" fill="#7C6FFD"/>
+<path d="M541.171 280.72V258.49C541.161 256.95 539.911 255.71 538.381 255.71C536.851 255.71 535.601 256.95 535.601 258.49V280.72C535.611 282.26 536.861 283.5 538.391 283.5C539.921 283.5 541.171 282.26 541.171 280.72Z" fill="#A59DF7"/>
+<path d="M524.981 318.59C528.361 318.59 531.111 321.34 531.111 324.72C531.111 328.1 528.361 330.85 524.981 330.85C521.601 330.85 518.851 328.1 518.851 324.72C518.851 321.34 521.601 318.59 524.981 318.59ZM524.981 326.76C526.111 326.76 527.021 325.84 527.021 324.72C527.021 323.6 526.101 322.68 524.981 322.68C523.861 322.68 522.941 323.6 522.941 324.72C522.941 325.84 523.861 326.76 524.981 326.76Z" fill="#5545EF"/>
+<path d="M656.781 228.23C656.781 231.6 654.041 234.34 650.671 234.34C647.301 234.34 644.561 231.6 644.561 228.23C644.561 224.86 647.301 222.12 650.671 222.12C654.041 222.12 656.781 224.86 656.781 228.23ZM648.641 228.23C648.641 229.35 649.551 230.27 650.681 230.27C651.811 230.27 652.72 229.36 652.72 228.23C652.72 227.1 651.811 226.19 650.681 226.19C649.551 226.19 648.641 227.1 648.641 228.23Z" fill="#402EED"/>
+<path d="M607.45 279.74C607.04 279.74 606.56 279.67 606.15 279.47C605.74 279.33 605.33 279.06 605.06 278.72C604.72 278.45 604.45 278.04 604.31 277.63C604.1 277.22 604.04 276.81 604.04 276.33C604.04 275.44 604.38 274.55 605.06 273.94C605.33 273.6 605.74 273.33 606.15 273.19C606.97 272.85 607.93 272.85 608.75 273.19C609.16 273.33 609.57 273.6 609.84 273.94C610.52 274.55 610.87 275.44 610.87 276.33C610.87 276.81 610.8 277.22 610.6 277.63C610.46 278.04 610.19 278.45 609.85 278.72C609.58 279.06 609.17 279.34 608.76 279.47C608.35 279.67 607.94 279.74 607.46 279.74H607.45Z" fill="#7F73F2"/>
+<path d="M560.38 219.83C559.24 219.83 558.111 219.4 557.331 218.52C556.461 217.74 556.021 216.61 556.021 215.47C556.021 214.33 556.451 213.21 557.331 212.42C558.901 210.77 561.861 210.77 563.421 212.42C563.861 212.77 564.21 213.3 564.38 213.82C564.64 214.35 564.73 214.95 564.73 215.48C564.73 216.08 564.64 216.61 564.38 217.13C564.21 217.66 563.861 218.18 563.421 218.53C562.641 219.41 561.51 219.84 560.37 219.84L560.38 219.83Z" fill="#5545EF"/>
+<path d="M678.98 214.927C678.2 214.927 677.43 214.627 676.89 214.027C676.29 213.487 676 212.717 676 211.937C676 211.157 676.3 210.387 676.89 209.847C677.96 208.717 679.99 208.717 681.06 209.847C681.36 210.087 681.6 210.447 681.72 210.807C681.9 211.167 681.96 211.578 681.96 211.948C681.96 212.358 681.9 212.717 681.72 213.077C681.6 213.437 681.36 213.798 681.06 214.038C680.52 214.638 679.75 214.937 678.97 214.937L678.98 214.927Z" fill="#B4ADF8"/>
+<path d="M614.5 106.948C614.08 106.948 613.59 106.878 613.17 106.668C612.75 106.528 612.33 106.247 612.05 105.897C611.35 105.267 611 104.358 611 103.448C611 102.958 611.07 102.537 611.28 102.117C611.42 101.697 611.7 101.278 612.05 100.998C613.31 99.6675 615.69 99.6675 616.95 100.998C617.3 101.278 617.58 101.697 617.72 102.117C617.93 102.537 618 102.958 618 103.448C618 104.358 617.65 105.267 616.95 105.897C616.67 106.247 616.25 106.528 615.83 106.668C615.41 106.878 614.92 106.948 614.5 106.948Z" fill="#5545EF"/>
+<path d="M614.231 301.93H493.311C485.081 301.93 477.641 296.42 475.231 288.53C474.831 287.21 475.571 285.81 476.891 285.41C478.211 285.01 479.611 285.75 480.011 287.07C481.791 292.88 487.261 296.93 493.311 296.93H614.231C621.901 296.93 628.131 290.69 628.131 283.03V192.28C628.131 184.62 621.891 178.38 614.231 178.38H575.251C573.871 178.38 572.751 177.26 572.751 175.88C572.751 174.5 573.871 173.38 575.251 173.38H614.231C624.651 173.38 633.131 181.86 633.131 192.28V283.03C633.131 293.45 624.651 301.93 614.231 301.93Z" fill="#5A49FA"/>
+<path d="M564.94 154.74V131.41L549.33 148.14H569.88" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M624.88 154.74V131.41L609.271 148.14H629.831" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M589.431 152.79C595.202 152.79 599.88 148.402 599.88 142.99C599.88 137.578 595.202 133.19 589.431 133.19C583.659 133.19 578.98 137.578 578.98 142.99C578.98 148.402 583.659 152.79 589.431 152.79Z" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<path d="M364.23 218.6L394.26 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M394.26 218.6L364.23 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M319.95 218.6L349.99 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M349.99 218.6L319.95 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path opacity="0.15" d="M459.55 269.6C493.527 269.6 521.07 242.057 521.07 208.08C521.07 174.103 493.527 146.56 459.55 146.56C425.574 146.56 398.03 174.103 398.03 208.08C398.03 242.057 425.574 269.6 459.55 269.6Z" fill="white"/>
+<path d="M531.381 221.52C532.261 216.9 532.671 212.18 532.621 207.48C532.571 202.87 532.071 198.24 531.131 193.71C530.201 189.23 528.831 184.82 527.061 180.6C525.291 176.38 523.111 172.3 520.581 168.5C518.021 164.65 515.071 161.04 511.831 157.77C508.521 154.43 504.861 151.42 500.961 148.8C496.961 146.12 492.661 143.82 488.171 141.98C483.681 140.14 479.011 138.75 474.271 137.85C469.651 136.97 464.931 136.56 460.231 136.61C455.621 136.66 450.99 137.16 446.46 138.1C441.98 139.03 437.571 140.4 433.351 142.17C429.131 143.94 425.051 146.12 421.251 148.65C417.401 151.21 413.791 154.16 410.521 157.4C407.181 160.71 404.171 164.37 401.551 168.27C398.871 172.27 396.571 176.57 394.731 181.06C392.891 185.55 391.501 190.22 390.601 194.96C389.721 199.58 389.311 204.3 389.361 209C389.411 213.61 389.911 218.24 390.851 222.77C391.781 227.25 393.151 231.66 394.921 235.88C396.691 240.1 398.871 244.18 401.401 247.98C403.961 251.83 406.911 255.44 410.151 258.71C413.461 262.05 417.121 265.06 421.021 267.68C423.211 269.15 425.491 270.5 427.841 271.73L420.241 290.27L419.321 289.89C416.121 288.58 412.441 290.12 411.131 293.32L383.451 360.83C382.141 364.03 383.681 367.71 386.881 369.02L400.891 374.77C404.091 376.08 407.771 374.54 409.081 371.34L436.761 303.83C438.071 300.63 436.531 296.95 433.331 295.64L432.411 295.26L440.011 276.72C442.551 277.5 445.121 278.14 447.711 278.63C452.331 279.51 457.051 279.92 461.751 279.87C466.361 279.82 470.991 279.32 475.521 278.38C480.001 277.45 484.411 276.08 488.631 274.31C492.851 272.54 496.931 270.36 500.731 267.83C504.581 265.27 508.19 262.32 511.46 259.08C514.8 255.77 517.811 252.11 520.431 248.21C523.111 244.21 525.411 239.91 527.251 235.42C529.091 230.93 530.481 226.26 531.381 221.52ZM438.471 263.14C408.151 250.71 393.651 216.04 406.081 185.72C418.511 155.4 453.181 140.9 483.501 153.33C513.821 165.76 528.321 200.43 515.891 230.75C503.461 261.07 468.791 275.57 438.471 263.14Z" fill="black"/>
+<path opacity="0.3" d="M431.661 246.88C433.981 248.49 436.401 249.85 438.881 250.99C422.951 235.18 420.151 209.77 433.381 190.69C446.611 171.61 471.401 165.33 491.781 174.71C489.841 172.79 487.721 171 485.401 169.39C464.001 154.55 434.621 159.86 419.781 181.26C404.941 202.66 410.251 232.04 431.651 246.88H431.661Z" fill="white"/>
+<path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" fill="#F99F10"/>
+<path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/public/img/grot-404-light.svg b/public/img/grot-404-light.svg
new file mode 100644
index 00000000000..2c9ca391204
--- /dev/null
+++ b/public/img/grot-404-light.svg
@@ -0,0 +1,61 @@
+<svg width="722" height="480" viewBox="0 0 722 480" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M514.59 3.80879C447.52 -7.78121 379.51 8.58879 314.8 32.5588C275.1 47.2688 236.85 58.9488 196.11 69.7588C150.35 81.8988 102.13 94.2588 62.7402 123.959C15.7502 159.389 -0.05983 214.349 0.000170029 274.969C0.04017 319.049 7.54023 365.349 33.0602 399.379C71.8302 451.069 139.04 459.809 196.03 455.539C267.53 450.189 313.45 436.549 383.95 458.929C471.35 486.669 580.88 498.339 659.07 416.129C765.14 304.599 726.89 126.169 614.63 45.6788C598.19 33.8888 580.48 24.2188 561.98 16.9888C546.27 10.8488 530.46 6.53878 514.59 3.79878V3.80879Z" fill="#5545EF" fill-opacity="0.1"/>
+<path opacity="0.1" d="M273.041 410.45C346.097 410.45 405.321 403.497 405.321 394.92C405.321 386.343 346.097 379.39 273.041 379.39C199.985 379.39 140.761 386.343 140.761 394.92C140.761 403.497 199.985 410.45 273.041 410.45Z" fill="black"/>
+<path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" fill="#F99F10"/>
+<path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M218.861 115.04C187.091 92.89 146.441 87.92 139.291 95.87C133.491 102.31 155.401 137.59 151.851 147.9C148.311 158.21 117.231 151.54 113.831 164.65C112.221 170.88 136.061 185.91 135.421 194.61C134.781 203.31 116.371 200.85 115.021 212.11C114.111 219.68 130.911 221.35 130.271 230.37C129.631 239.39 117.501 237.74 118.031 246.48C118.461 253.57 131.721 248.9 135.271 260.82C138.811 272.74 218.871 115.04 218.871 115.04H218.861Z" fill="#EF6122"/>
+<path d="M77.1408 326.59C78.1108 297.43 98.4608 290.96 113.241 295.94C128.011 300.92 127.191 318.09 123.461 324.55C117.501 334.86 108.751 330.41 112.021 323.19C114.441 316.26 114.891 306.64 103.441 309.7C89.2109 313.51 93.6408 351.77 123.601 344.25C144.121 339.1 142.511 317.37 140.881 285.68C136.511 255.02 141.241 214.82 154.281 176.66C180.701 99.34 339.851 74.21 392.681 145.73C461.311 238.63 385.631 329.37 373.991 340.96C337.731 369.1 343.611 394.56 317.631 396.25C292.941 397.86 294.971 372.77 278.641 371.37C277.681 371.37 276.721 371.37 275.761 371.35C256.591 372.76 252.891 396.67 223.981 396.25C200.421 395.91 210.911 375.33 195.171 365.46C191.871 363.9 189.011 362.8 186.371 362.08C184.291 361.64 181.981 361.32 179.371 361.16C178.771 361.12 175.141 361.14 174.081 361.14C164.731 361.31 159.121 363.52 137.991 367.82C99.9208 375.56 76.3208 351.26 77.1408 326.59Z" fill="#FAC20C" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M181.051 134.78C235.171 96.44 298.161 117.38 306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 242.361 25.05 227.441 34.26C210.761 44.56 231.741 90.5 220.841 101.27C212.091 109.91 206.131 103.31 191.251 98.32C177.811 93.81 181.051 134.78 181.051 134.78Z" fill="#EF6122"/>
+<path d="M262.101 239.52L410.381 239.52C428.197 239.52 442.641 225.077 442.641 207.26V207.25C442.641 189.433 428.197 174.99 410.381 174.99L262.101 174.99C244.284 174.99 229.841 189.433 229.841 207.25V207.26C229.841 225.077 244.284 239.52 262.101 239.52Z" fill="#5545EF" stroke="#231735" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M296.28 228.67L408.8 228.67C420.619 228.67 430.2 219.089 430.2 207.27C430.2 195.451 420.619 185.87 408.8 185.87H296.28C284.461 185.87 274.88 195.451 274.88 207.27C274.88 219.089 284.461 228.67 296.28 228.67Z" fill="#19052D"/>
+<path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" fill="#F99F10"/>
+<path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M200.23 104.32C172.95 91.48 146.34 84.67 139.29 95.87C131.67 107.98 157.65 133.7 151.85 147.9C146.43 161.18 115.82 149.78 113.83 164.65C112.24 176.55 136.06 185.91 135.42 194.61C134.78 203.31 116.14 199.76 114.78 211.03C113.87 218.6 130.91 221.35 130.26 230.37C129.62 239.39 118.02 237.73 118.02 246.48C118.02 253.6 138.81 254.21 139.4 269.02" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 244.001 24.95 227.441 34.26C210.061 44.03 231.741 90.5 220.841 101.27C214.751 107.29 206.751 107.03 199.421 103.95" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M306.531 122.94C277.581 105.78 226.39 104.87 180.98 138.83" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+<path d="M341.4 253.66C351.4 254.03 366.49 259.17 366.02 269.49C365.55 279.82 349.3 283.19 335.71 279.29C322.12 275.39 323.16 265.5 325.3 262.15C327.44 258.8 332.12 253.32 341.41 253.66H341.4Z" fill="black"/>
+<path d="M345.16 258.45C351.6 259.28 356.39 262.63 356.39 262.63C356.39 262.63 355.45 269.62 344.22 269.4C332.99 269.18 336.07 258.72 336.07 258.72C336.07 258.72 339.03 257.66 345.15 258.44L345.16 258.45Z" fill="white"/>
+<g opacity="0.5">
+<path d="M621.96 318.31V332.84" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M629.23 325.58H614.69" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M657.411 162.86V175.25" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M663.601 169.05H651.221" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<g opacity="0.4">
+<path d="M497.061 209.35V221.73" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M503.25 215.54H490.87" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+</g>
+<path d="M668 293L676.76 301.75" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M676.76 293L668 301.75" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M476.391 312.83L482.341 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M482.341 312.83L476.391 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M515 125.2H523.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M519.21 121V129.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M609.581 239.16L616.861 231.87C617.721 231.01 617.721 229.61 616.861 228.74C616.001 227.88 614.601 227.88 613.731 228.74L606.451 236.03L599.161 228.75C598.301 227.89 596.901 227.89 596.031 228.75C595.171 229.61 595.171 231.01 596.031 231.88L603.321 239.16L596.041 246.45C595.181 247.31 595.181 248.71 596.041 249.58C596.471 250.01 597.041 250.23 597.601 250.23C598.161 250.23 598.731 250.01 599.161 249.58L606.441 242.29L613.731 249.57C614.161 250 614.731 250.22 615.291 250.22C615.851 250.22 616.421 250 616.851 249.57C617.711 248.71 617.711 247.31 616.851 246.44L609.561 239.16H609.581Z" fill="#B4ADF8"/>
+<path d="M557.84 280.71V267.77C557.83 266.23 556.581 264.99 555.051 264.99C553.521 264.99 552.271 266.23 552.271 267.77V280.71C552.281 282.25 553.531 283.49 555.061 283.49C556.591 283.49 557.84 282.25 557.84 280.71Z" fill="#A59DF7"/>
+<path d="M648.21 244.27V257.21C648.22 258.75 649.47 259.99 651 259.99C652.53 259.99 653.78 258.75 653.78 257.21V244.27C653.77 242.73 652.52 241.49 650.99 241.49C649.46 241.49 648.21 242.73 648.21 244.27Z" fill="#402EED"/>
+<path d="M561.34 181.68H548.4C546.86 181.69 545.62 182.94 545.62 184.47C545.62 186 546.86 187.25 548.4 187.25H561.34C562.88 187.24 564.12 185.99 564.12 184.46C564.12 182.93 562.88 181.68 561.34 181.68Z" fill="#402EED"/>
+<path d="M568.931 247.36L568.951 280.7C568.951 282.24 570.191 283.48 571.731 283.48C573.271 283.48 574.511 282.24 574.511 280.7L574.491 247.36C574.491 245.82 573.251 244.58 571.711 244.58C570.171 244.58 568.931 245.82 568.931 247.36Z" fill="#A59DF7"/>
+<path d="M574.791 321.8L541.451 321.82C539.911 321.82 538.671 323.06 538.671 324.6C538.671 326.14 539.911 327.38 541.451 327.38L574.791 327.36C576.331 327.36 577.571 326.12 577.571 324.58C577.571 323.04 576.331 321.8 574.791 321.8Z" fill="#402EED"/>
+<path d="M601.3 192.84H588.12C586.46 192.84 585.11 194.2 585.11 195.86V209.04C585.11 210.71 586.47 212.05 588.13 212.05H601.31C602.97 212.05 604.32 210.7 604.32 209.03V195.85C604.32 194.19 602.96 192.84 601.3 192.84ZM599.82 207.55H589.61V197.35H599.82V207.55Z" fill="#5545EF"/>
+<path d="M541.171 280.72V258.49C541.161 256.95 539.911 255.71 538.381 255.71C536.851 255.71 535.601 256.95 535.601 258.49V280.72C535.611 282.26 536.861 283.5 538.391 283.5C539.921 283.5 541.171 282.26 541.171 280.72Z" fill="#A59DF7"/>
+<path d="M524.981 318.59C528.361 318.59 531.111 321.34 531.111 324.72C531.111 328.1 528.361 330.85 524.981 330.85C521.601 330.85 518.851 328.1 518.851 324.72C518.851 321.34 521.601 318.59 524.981 318.59ZM524.981 326.76C526.111 326.76 527.021 325.84 527.021 324.72C527.021 323.6 526.101 322.68 524.981 322.68C523.861 322.68 522.941 323.6 522.941 324.72C522.941 325.84 523.861 326.76 524.981 326.76Z" fill="#5545EF"/>
+<path d="M656.781 228.23C656.781 231.6 654.041 234.34 650.671 234.34C647.301 234.34 644.561 231.6 644.561 228.23C644.561 224.86 647.301 222.12 650.671 222.12C654.041 222.12 656.781 224.86 656.781 228.23ZM648.641 228.23C648.641 229.35 649.551 230.27 650.681 230.27C651.811 230.27 652.72 229.36 652.72 228.23C652.72 227.1 651.811 226.19 650.681 226.19C649.551 226.19 648.641 227.1 648.641 228.23Z" fill="#402EED"/>
+<path d="M607.45 279.74C607.04 279.74 606.56 279.67 606.15 279.47C605.74 279.33 605.33 279.06 605.06 278.72C604.72 278.45 604.45 278.04 604.31 277.63C604.1 277.22 604.04 276.81 604.04 276.33C604.04 275.44 604.38 274.55 605.06 273.94C605.33 273.6 605.74 273.33 606.15 273.19C606.97 272.85 607.93 272.85 608.75 273.19C609.16 273.33 609.57 273.6 609.84 273.94C610.52 274.55 610.87 275.44 610.87 276.33C610.87 276.81 610.8 277.22 610.6 277.63C610.46 278.04 610.19 278.45 609.85 278.72C609.58 279.06 609.17 279.34 608.76 279.47C608.35 279.67 607.94 279.74 607.46 279.74H607.45Z" fill="#7F73F2"/>
+<path d="M560.38 219.83C559.24 219.83 558.111 219.4 557.331 218.52C556.461 217.74 556.021 216.61 556.021 215.47C556.021 214.33 556.451 213.21 557.331 212.42C558.901 210.77 561.861 210.77 563.421 212.42C563.861 212.77 564.21 213.3 564.38 213.82C564.64 214.35 564.73 214.95 564.73 215.48C564.73 216.08 564.64 216.61 564.38 217.13C564.21 217.66 563.861 218.18 563.421 218.53C562.641 219.41 561.51 219.84 560.37 219.84L560.38 219.83Z" fill="#5545EF"/>
+<path d="M659.59 202.46C658.81 202.46 658.04 202.16 657.5 201.56C656.9 201.02 656.61 200.25 656.61 199.47C656.61 198.69 656.91 197.92 657.5 197.38C658.57 196.25 660.6 196.25 661.67 197.38C661.97 197.62 662.21 197.98 662.33 198.34C662.51 198.7 662.57 199.11 662.57 199.48C662.57 199.89 662.51 200.25 662.33 200.61C662.21 200.97 661.97 201.33 661.67 201.57C661.13 202.17 660.36 202.47 659.58 202.47L659.59 202.46Z" fill="#B4ADF8"/>
+<path d="M636.5 120.948C636.08 120.948 635.59 120.878 635.17 120.668C634.75 120.528 634.33 120.247 634.05 119.897C633.35 119.267 633 118.358 633 117.448C633 116.958 633.07 116.537 633.28 116.117C633.42 115.697 633.7 115.278 634.05 114.998C635.31 113.668 637.69 113.668 638.95 114.998C639.3 115.278 639.58 115.697 639.72 116.117C639.93 116.537 640 116.958 640 117.448C640 118.358 639.65 119.267 638.95 119.897C638.67 120.247 638.25 120.528 637.83 120.668C637.41 120.878 636.92 120.948 636.5 120.948Z" fill="#5545EF"/>
+<path d="M614.231 301.93H493.311C485.081 301.93 477.641 296.42 475.231 288.53C474.831 287.21 475.571 285.81 476.891 285.41C478.211 285.01 479.611 285.75 480.011 287.07C481.791 292.88 487.261 296.93 493.311 296.93H614.231C621.901 296.93 628.131 290.69 628.131 283.03V192.28C628.131 184.62 621.891 178.38 614.231 178.38H575.251C573.871 178.38 572.751 177.26 572.751 175.88C572.751 174.5 573.871 173.38 575.251 173.38H614.231C624.651 173.38 633.131 181.86 633.131 192.28V283.03C633.131 293.45 624.651 301.93 614.231 301.93Z" fill="#402EED"/>
+<path d="M564.94 154.74V131.41L549.33 148.14H569.88" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M624.88 154.74V131.41L609.271 148.14H629.831" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M589.431 152.79C595.202 152.79 599.88 148.402 599.88 142.99C599.88 137.578 595.202 133.19 589.431 133.19C583.659 133.19 578.98 137.578 578.98 142.99C578.98 148.402 583.659 152.79 589.431 152.79Z" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<path d="M364.23 218.6L394.26 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M394.26 218.6L364.23 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M319.95 218.6L349.99 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M349.99 218.6L319.95 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path opacity="0.25" d="M459.55 269.6C493.527 269.6 521.07 242.057 521.07 208.08C521.07 174.103 493.527 146.56 459.55 146.56C425.574 146.56 398.03 174.103 398.03 208.08C398.03 242.057 425.574 269.6 459.55 269.6Z" fill="white"/>
+<path d="M531.381 221.52C532.261 216.9 532.671 212.18 532.621 207.48C532.571 202.87 532.071 198.24 531.131 193.71C530.201 189.23 528.831 184.82 527.061 180.6C525.291 176.38 523.111 172.3 520.581 168.5C518.021 164.65 515.071 161.04 511.831 157.77C508.521 154.43 504.861 151.42 500.961 148.8C496.961 146.12 492.661 143.82 488.171 141.98C483.681 140.14 479.011 138.75 474.271 137.85C469.651 136.97 464.931 136.56 460.231 136.61C455.621 136.66 450.991 137.16 446.46 138.1C441.98 139.03 437.571 140.4 433.351 142.17C429.131 143.94 425.051 146.12 421.251 148.65C417.401 151.21 413.791 154.16 410.521 157.4C407.181 160.71 404.171 164.37 401.551 168.27C398.871 172.27 396.571 176.57 394.731 181.06C392.891 185.55 391.501 190.22 390.601 194.96C389.721 199.58 389.311 204.3 389.361 209C389.411 213.61 389.911 218.24 390.851 222.77C391.781 227.25 393.151 231.66 394.921 235.88C396.691 240.1 398.871 244.18 401.401 247.98C403.961 251.83 406.911 255.44 410.151 258.71C413.461 262.05 417.121 265.06 421.021 267.68C423.211 269.15 425.491 270.5 427.841 271.73L420.241 290.27L419.321 289.89C416.121 288.58 412.441 290.12 411.131 293.32L383.451 360.83C382.141 364.03 383.681 367.71 386.881 369.02L400.891 374.77C404.091 376.08 407.771 374.54 409.081 371.34L436.761 303.83C438.071 300.63 436.531 296.95 433.331 295.64L432.411 295.26L440.011 276.72C442.551 277.5 445.121 278.14 447.711 278.63C452.331 279.51 457.051 279.92 461.751 279.87C466.361 279.82 470.991 279.32 475.521 278.38C480.001 277.45 484.411 276.08 488.631 274.31C492.851 272.54 496.931 270.36 500.731 267.83C504.581 265.27 508.19 262.32 511.46 259.08C514.8 255.77 517.811 252.11 520.431 248.21C523.111 244.21 525.411 239.91 527.251 235.42C529.091 230.93 530.481 226.26 531.381 221.52ZM438.471 263.14C408.151 250.71 393.651 216.04 406.081 185.72C418.511 155.4 453.181 140.9 483.501 153.33C513.821 165.76 528.321 200.43 515.891 230.75C503.461 261.07 468.791 275.57 438.471 263.14Z" fill="#0A0016"/>
+<path opacity="0.6" d="M431.661 246.88C433.981 248.49 436.401 249.85 438.881 250.99C422.951 235.18 420.151 209.77 433.381 190.69C446.611 171.61 471.401 165.33 491.781 174.71C489.841 172.79 487.721 171 485.401 169.39C464.001 154.55 434.621 159.86 419.781 181.26C404.941 202.66 410.251 232.04 431.651 246.88H431.661Z" fill="white"/>
+<path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" fill="#F99F10"/>
+<path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>

From 1fbac96bd495894f05956e97f5394bd0147f4a9b Mon Sep 17 00:00:00 2001
From: Kyle Cunningham <codeincarnate@users.noreply.github.com>
Date: Fri, 28 Apr 2023 13:23:08 +0700
Subject: [PATCH 505/729] SQL Datasources: Update behavior of default
 connection limits (#66687)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update behavior of defaults in connection limits

* Refactor to use config object instead

* Refactor remove unneeded function

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
---
 packages/grafana-data/src/types/config.ts     |  7 ++++++
 packages/grafana-runtime/src/config.ts        |  5 +++++
 pkg/api/dtos/frontend_settings.go             |  8 +++++++
 pkg/api/frontendsettings.go                   |  6 +++++
 .../configuration/ConnectionLimits.tsx        | 12 +++++-----
 .../useMigrateDatabaseFields.test.ts          | 19 +++++++++++++---
 .../configuration/useMigrateDatabaseFields.ts | 22 ++++++++++++++-----
 public/app/features/plugins/sql/constants.ts  |  8 -------
 8 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index b992b4a629c..d7ac6a94760 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -228,6 +228,13 @@ export interface GrafanaConfig {
   rudderstackDataPlaneUrl: string | undefined;
   rudderstackSdkUrl: string | undefined;
   rudderstackConfigUrl: string | undefined;
+  sqlConnectionLimits: SqlConnectionLimits;
+}
+
+export interface SqlConnectionLimits {
+  maxOpenConns: number;
+  maxIdleConns: number;
+  connMaxLifetime: number;
 }
 
 export interface AuthSettings {
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index fd577222fac..0f232e2408f 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -154,6 +154,11 @@ export class GrafanaBootConfig implements GrafanaConfig {
   rudderstackDataPlaneUrl: undefined;
   rudderstackSdkUrl: undefined;
   rudderstackConfigUrl: undefined;
+  sqlConnectionLimits = {
+    maxOpenConns: 100,
+    maxIdleConns: 100,
+    connMaxLifetime: 14400,
+  };
 
   tokenExpirationDayLimit: undefined;
 
diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go
index eb6be451dad..38722a511e3 100644
--- a/pkg/api/dtos/frontend_settings.go
+++ b/pkg/api/dtos/frontend_settings.go
@@ -112,6 +112,12 @@ type FrontendSettingsWhitelabelingDTO struct {
 	PublicDashboardFooter *FrontendSettingsPublicDashboardFooterConfigDTO `json:"publicDashboardFooter,omitempty"` // PR TODO: type this properly
 }
 
+type FrontendSettingsSqlConnectionLimitsDTO struct {
+	MaxOpenConns    int `json:"maxOpenConns"`
+	MaxIdleConns    int `json:"maxIdleConns"`
+	ConnMaxLifetime int `json:"connMaxLifetime"`
+}
+
 type FrontendSettingsDTO struct {
 	DefaultDatasource          string                           `json:"defaultDatasource"`
 	Datasources                map[string]plugins.DataSourceDTO `json:"datasources"`
@@ -215,6 +221,8 @@ type FrontendSettingsDTO struct {
 
 	PluginsCDNBaseURL string `json:"pluginsCDNBaseURL,omitempty"`
 
+	SqlConnectionLimits FrontendSettingsSqlConnectionLimitsDTO `json:"sqlConnectionLimits"`
+
 	// Enterprise
 	Licensing     *FrontendSettingsLicensingDTO     `json:"licensing,omitempty"`
 	Whitelabeling *FrontendSettingsWhitelabelingDTO `json:"whitelabeling,omitempty"`
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 5f595b1fc63..23e7957796a 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -220,6 +220,12 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		TokenExpirationDayLimit: hs.Cfg.SATokenExpirationDayLimit,
 
 		SnapshotEnabled: hs.Cfg.SnapshotEnabled,
+
+		SqlConnectionLimits: dtos.FrontendSettingsSqlConnectionLimitsDTO{
+			MaxOpenConns:    hs.Cfg.SqlDatasourceMaxOpenConnsDefault,
+			MaxIdleConns:    hs.Cfg.SqlDatasourceMaxIdleConnsDefault,
+			ConnMaxLifetime: hs.Cfg.SqlDatasourceMaxConnLifetimeDefault,
+		},
 	}
 
 	if hs.Cfg.UnifiedAlerting.StateHistory.Enabled {
diff --git a/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx b/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
index aa732c1ad27..d7f97b8620b 100644
--- a/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
+++ b/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 
 import { DataSourceSettings } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { FieldSet, InlineField, InlineFieldRow, InlineSwitch } from '@grafana/ui';
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 
-import { SQLConnectionDefaults } from '../../constants';
 import { SQLConnectionLimits, SQLOptions } from '../../types';
 
 interface Props<T> {
@@ -47,7 +47,7 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
         maxOpenConns: number,
         maxIdleConns: number,
       });
-    } else if (number !== undefined) {
+    } else {
       updateJsonData({
         maxOpenConns: number,
       });
@@ -68,10 +68,10 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
       if (jsonData.maxOpenConns !== undefined) {
         maxConns = jsonData.maxOpenConns;
         idleConns = jsonData.maxOpenConns;
-      } else {
-        maxConns = SQLConnectionDefaults.MAX_CONNS;
-        idleConns = SQLConnectionDefaults.MAX_CONNS;
       }
+    } else {
+      maxConns = jsonData.maxOpenConns;
+      idleConns = jsonData.maxIdleConns;
     }
 
     updateJsonData({
@@ -124,7 +124,7 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
             <span>
               If enabled, automatically set the number of <i>Maximum idle connections</i> to the same value as
               <i> Max open connections</i>. If the number of maximum open connections is not set it will be set to the
-              default ({SQLConnectionDefaults.MAX_CONNS}).
+              default ({config.sqlConnectionLimits.maxIdleConns}).
             </span>
           }
         >
diff --git a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts
index a687b85c304..cda44ce5924 100644
--- a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts
+++ b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts
@@ -2,11 +2,23 @@ import { renderHook } from '@testing-library/react-hooks';
 
 import { DataSourceSettings } from '@grafana/data';
 
-import { SQLConnectionDefaults } from '../../constants';
 import { SQLOptions } from '../../types';
 
 import { useMigrateDatabaseFields } from './useMigrateDatabaseFields';
 
+jest.mock('@grafana/runtime', () => {
+  return {
+    config: {
+      sqlConnectionLimits: {
+        maxOpenConns: 10,
+        maxIdleConns: 11,
+        connMaxLifetime: 12,
+      },
+    },
+    logDebug: jest.fn(),
+  };
+});
+
 describe('Database Field Migration', () => {
   let defaultProps = {
     options: {
@@ -57,8 +69,9 @@ describe('Database Field Migration', () => {
       ...defaultProps,
       onOptionsChange: (options: DataSourceSettings) => {
         const jsonData = options.jsonData as SQLOptions;
-        expect(jsonData.maxOpenConns).toBe(SQLConnectionDefaults.MAX_CONNS);
-        expect(jsonData.maxIdleConns).toBe(Math.ceil(SQLConnectionDefaults.MAX_CONNS));
+        expect(jsonData.maxOpenConns).toBe(10);
+        expect(jsonData.maxIdleConns).toBe(11);
+        expect(jsonData.connMaxLifetime).toBe(12);
         expect(jsonData.maxIdleConnsAuto).toBe(true);
       },
     };
diff --git a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts
index cf587f1b938..2a7ffbe8458 100644
--- a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts
+++ b/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts
@@ -1,9 +1,8 @@
 import { useEffect } from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { logDebug } from '@grafana/runtime';
+import { logDebug, config } from '@grafana/runtime';
 
-import { SQLConnectionDefaults } from '../../constants';
 import { SQLOptions } from '../../types';
 
 /**
@@ -34,9 +33,7 @@ export function useMigrateDatabaseFields<T extends SQLOptions, S = {}>({
       jsonData.maxIdleConns === undefined &&
       jsonData.maxIdleConnsAuto === undefined
     ) {
-      // It's expected that the default will be greater than 4
-      const maxOpenConns = SQLConnectionDefaults.MAX_CONNS;
-      const maxIdleConns = maxOpenConns;
+      const { maxOpenConns, maxIdleConns } = config.sqlConnectionLimits;
 
       logDebug(
         `Setting default max open connections to ${maxOpenConns} and setting max idle connection to ${maxIdleConns}`
@@ -55,6 +52,21 @@ export function useMigrateDatabaseFields<T extends SQLOptions, S = {}>({
       optionsUpdated = true;
     }
 
+    // If the maximum connection lifetime hasn't been
+    // otherwise set fill in with the default from configuration
+    if (jsonData.connMaxLifetime === undefined) {
+      const { connMaxLifetime } = config.sqlConnectionLimits;
+
+      // Spread new options and add our value
+      newOptions.jsonData = {
+        ...newOptions.jsonData,
+        connMaxLifetime: connMaxLifetime,
+      };
+
+      // Note that we've updated the options
+      optionsUpdated = true;
+    }
+
     // Only issue an update if we changed options
     if (optionsUpdated) {
       onOptionsChange(newOptions);
diff --git a/public/app/features/plugins/sql/constants.ts b/public/app/features/plugins/sql/constants.ts
index af6a4758786..0d3466aecc6 100644
--- a/public/app/features/plugins/sql/constants.ts
+++ b/public/app/features/plugins/sql/constants.ts
@@ -15,11 +15,3 @@ export const MACRO_NAMES = [
   '$__unixEpochGroup',
   '$__unixEpochGroupAlias',
 ];
-
-/**
- * Constants for SQL connection
- * parameters and automatic settings
- */
-export const SQLConnectionDefaults = {
-  MAX_CONNS: 100,
-};

From a1b9eb1eea563ca98fa0fe69f406ccf9bc624461 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 28 Apr 2023 09:58:01 +0300
Subject: [PATCH 506/729] Authentication UI: Hide empty settings section
 (#67407)

---
 public/app/features/auth-config/AuthConfigPage.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/app/features/auth-config/AuthConfigPage.tsx b/public/app/features/auth-config/AuthConfigPage.tsx
index bf6f13a4e48..1fa89e990bc 100644
--- a/public/app/features/auth-config/AuthConfigPage.tsx
+++ b/public/app/features/auth-config/AuthConfigPage.tsx
@@ -100,9 +100,9 @@ export const AuthConfigPageUnconnected = ({
             ))}
           </div>
         )}
-        <div className={styles.settingsSection}>
-          <h3>Settings</h3>
-          {authSettings && (
+        {!isEmpty(authSettings) && (
+          <div className={styles.settingsSection}>
+            <h3>Settings</h3>
             <table className="filter-table">
               <tbody>
                 {Object.entries(authSettings).map(([sectionName, sectionSettings], i) => (
@@ -121,8 +121,8 @@ export const AuthConfigPageUnconnected = ({
                 ))}
               </tbody>
             </table>
-          )}
-        </div>
+          </div>
+        )}
       </Page.Contents>
     </Page>
   );

From 82838a21765b309f8c14e16d88ea07de55c68b93 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Fri, 28 Apr 2023 09:54:16 +0200
Subject: [PATCH 507/729] Toolkit: Remove deprecated `plugin:github-publish`
 command (#67471)

---
 .betterer.results                             |  10 -
 .../config/circleci/config.yml                | 295 ------------------
 packages/grafana-toolkit/package.json         |   3 -
 packages/grafana-toolkit/src/cli/index.ts     |  22 +-
 .../src/cli/tasks/plugin.utils.ts             | 213 -------------
 .../src/cli/utils/githubClient.test.ts        | 107 -------
 .../src/cli/utils/githubClient.ts             |  49 ---
 .../src/cli/utils/githubRelease.test.ts       |  10 -
 .../src/cli/utils/githubRelease.ts            | 113 -------
 packages/grafana-toolkit/src/plugins/env.ts   |  10 -
 packages/grafana-toolkit/src/plugins/index.ts |   1 -
 yarn.lock                                     |  23 +-
 12 files changed, 2 insertions(+), 854 deletions(-)
 delete mode 100644 packages/grafana-toolkit/config/circleci/config.yml
 delete mode 100644 packages/grafana-toolkit/src/cli/utils/githubClient.test.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/utils/githubClient.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/utils/githubRelease.test.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/utils/githubRelease.ts
 delete mode 100644 packages/grafana-toolkit/src/plugins/env.ts
 delete mode 100644 packages/grafana-toolkit/src/plugins/index.ts

diff --git a/.betterer.results b/.betterer.results
index 3e165bedf0d..59d950253ae 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -876,21 +876,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-toolkit/src/cli/tasks/task.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-toolkit/src/cli/utils/githubRelease.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-toolkit/src/cli/utils/useSpinner.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/packages/grafana-toolkit/config/circleci/config.yml b/packages/grafana-toolkit/config/circleci/config.yml
deleted file mode 100644
index d1438c2be92..00000000000
--- a/packages/grafana-toolkit/config/circleci/config.yml
+++ /dev/null
@@ -1,295 +0,0 @@
-version: 2.1
-
-parameters:
-  ssh-fingerprint:
-    type: string
-    default: ${GITHUB_SSH_FINGERPRINT}
-
-aliases:
-  # Workflow filters
-  - &filter-only-master
-    branches:
-      only: master
-  - &filter-only-release
-    branches:
-      only: /^v[1-9]*[0-9]+\.[1-9]*[0-9]+\.x$/
-
-workflows:
-  plugin_workflow:
-    jobs:
-      - yarn_install
-      - build_docs:
-          requires:
-            - yarn_install
-      - build_frontend:
-          requires:
-            - yarn_install
-      - build_backend:
-          requires:
-            - yarn_install
-      - package:
-          requires:
-            - build_frontend
-            - build_backend
-            - build_docs
-      - provisioning:
-          requires:
-            - build_frontend
-            - build_backend
-            - build_docs
-      - e2e_canary:
-          requires:
-            - provisioning
-            - package
-      - report:
-          requires:
-            - package
-            - e2e_canary
-      - approve_release:
-          type: approval
-          requires:
-            - report
-          filters: *filter-only-release
-      - publish_github_release:
-          requires:
-            - approve_release
-          filters: *filter-only-release
-
-executors:
-  default_exec: # declares a reusable executor
-    docker:
-      - image: srclosson/grafana-plugin-ci-alpine:latest
-  e2e_exec:
-    docker:
-      - image: srclosson/grafana-plugin-ci-e2e:latest
-
-jobs:
-  yarn_install:
-    executor: default_exec
-    steps:
-      - checkout
-      - restore_cache:
-          name: restore yarn cache
-          keys:
-          - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: Install dependencies
-          command: |
-            mkdir ci
-            yarn bin grafana-toolkit ] || yarn install --immutable
-      - save_cache:
-          name: save yarn cache
-          paths:
-            - ~/project/.yarn
-          key: build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-      - save_cache:
-          name: save cypress cache
-          paths:
-            - ~/.cache/Cypress
-          key: cypress-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-
-  build_docs:
-    executor: default_exec
-    steps:
-      - checkout
-      - restore_cache:
-          name: restore yarn cache
-          keys:
-          - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: Build docs
-          command: |
-            yarn run grafana-toolkit plugin:ci-docs
-            [ -d "dist" ] || circleci-agent step halt
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist
-
-  build_frontend:
-    executor: default_exec
-    steps:
-      - checkout
-      - restore_cache:
-          name: restore yarn cache
-          keys:
-          - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: Build and test frontend
-          command: yarn run grafana-toolkit plugin:ci-build
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist
-
-  build_backend:
-    executor: default_exec
-    steps:
-      - checkout
-      - restore_cache:
-          name: restore yarn cache
-          keys:
-          - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: Exit if no backend
-          command: |
-            [ -f "Magefile.go" ] || circleci-agent step halt
-      - run:
-          name: Build backend
-          command: mage -v buildAll
-      - run:
-          name: Test backend
-          command: |
-            mage -v lint
-            mage -v coverage
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist
-
-  package:
-    executor: default_exec
-    steps:
-    - checkout
-    - restore_cache:
-        name: restore yarn cache
-        keys:
-        - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-    - attach_workspace:
-        at: .
-    - run:
-        name: Move results to ci folder
-        command: yarn run grafana-toolkit plugin:ci-build --finish
-    - run:
-        name: Package distribution
-        command: |
-          yarn run grafana-toolkit plugin:ci-package
-    - persist_to_workspace:
-        root: .
-        paths:
-        - ci/jobs/package
-        - ci/packages
-        - ci/dist
-        - ci/grafana-test-env
-    - store_artifacts:
-        path: ci
-
-  provisioning:
-    executor: default_exec
-    steps:
-    - run:
-      name: Continue if this plugin has a provisioning path
-      command: |
-        [ -z "${PROVISIONING_REPO_PATH}" ] && circleci-agent step halt
-    - checkout
-    - add_ssh_keys:
-        fingerprints:
-          - << pipeline.parameters.ssh-fingerprint >>
-    - run:
-        name: Checkout provisioning files
-        command: git clone --depth 1 git@github.com:grafana/plugin-provisioning.git
-    - run:
-        name: Prepare task output dir
-        command: |
-          mkdir ci # Avoid error if not exists
-          mkdir ci/jobs # Avoid error if not exists
-          mkdir ci/jobs/provisioning
-          mv plugin-provisioning/${PROVISIONING_REPO_PATH}/* ci/jobs/provisioning
-    - persist_to_workspace:
-        root: .
-        paths:
-        - ci/jobs/provisioning
-
-  e2e_canary:
-    executor: e2e_exec
-    steps:
-    - run:
-      name: Continue if this plugin has a provisioning path
-      command: |
-        [ -z "${PROVISIONING_REPO_PATH}" ] && circleci-agent step halt
-    - checkout
-    - attach_workspace:
-        at: .
-    - restore_cache:
-        name: Restore yarn cache
-        keys:
-        - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-    - restore_cache:
-        name: Restore cypress cache
-        keys:
-        - cypress-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-    - run:
-        name: Exit if no e2e tests configured
-        command: |
-          [ -d cypress ] || circleci-agent step halt
-    - run:
-        name: Setup Grafana (local install)
-        command: |
-          ginstall canary
-          /opt/grafana/bin/grafana-server -config ci/grafana-test-env/custom.ini -homepath /opt/grafana &
-          ## To make sure grafana has started up
-          while ! $(netstat -tulpn | grep 3000 >/dev/null 2>&1); do sleep 1; done
-          /opt/grafana/bin/grafana-cli --version
-    - run:
-        name: Copy provisioning files
-        command: cp -r ci/jobs/provisioning provisioning/
-    - run:
-        name: Run e2e tests
-        command: |
-          # If the tests fail, but GRAFANACI_STRICT_E2E=0, don't worry about it
-          yarn run grafana-e2e run \
-          || (
-            [ "$GRAFANACI_STRICT_E2E" -eq 0 ] && echo "Bypassing fail. ci-nostrict enabled"
-          )
-    - run:
-        when: always
-        name: Prepare task output dir
-        command: |
-          # TODO: probably move all of this to `@grafana/toolkit plugin:ci-test`
-          mkdir ci/jobs/e2e_canary
-          # only copy if they exist
-          cp cypress/screenshots/*.* ci/jobs/e2e_canary 2>/dev/null || :
-          cp cypress/videos/*.* ci/jobs/e2e_canary 2>/dev/null || :
-    - persist_to_workspace:
-        root: .
-        paths:
-        - ci/jobs/e2e_canary
-    - store_test_results:
-        path: ci/jobs/e2e_canary
-    - store_artifacts:
-        path: ci/jobs/e2e_canary
-
-  report:
-    executor: default_exec
-    steps:
-    - checkout
-    - attach_workspace:
-        at: .
-    - restore_cache:
-        name: restore yarn cache
-        keys:
-          - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-    - run:
-        name: Toolkit report
-        command: |
-          yarn run grafana-toolkit plugin:ci-report
-    - store_artifacts:
-        path: ci
-
-  publish_github_release:
-    executor: default_exec
-    steps:
-      - checkout
-      - add_ssh_keys:
-          fingerprints:
-            - "dc:60:ab:c7:2d:8c:82:50:2a:2a:97:1a:c0:66:83:14"
-      - attach_workspace:
-          at: .
-      - restore_cache:
-          name: restore yarn cache
-          keys:
-          - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: "Publish Release on GitHub"
-          command: |
-            yarn run grafana-toolkit plugin:github-publish
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 6d36ce4b905..5741702f91e 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -57,7 +57,6 @@
     "@grafana/ui": "10.0.0-pre",
     "@jest/core": "27.5.1",
     "@types/eslint": "8.4.1",
-    "@types/fs-extra": "^9.0.13",
     "@types/jest": "27.4.1",
     "@types/lodash": "4.14.181",
     "@types/node": "16.11.26",
@@ -68,7 +67,6 @@
     "@types/tmp": "0.2.3",
     "@typescript-eslint/eslint-plugin": "5.36.2",
     "@typescript-eslint/parser": "5.36.2",
-    "axios": "^0.26.1",
     "babel-jest": "27.5.1",
     "babel-loader": "^8.2.5",
     "babel-plugin-angularjs-annotate": "0.10.0",
@@ -84,7 +82,6 @@
     "eslint-plugin-react-hooks": "4.6.0",
     "execa": "^5.1.1",
     "fork-ts-checker-webpack-plugin": "^7.2.1",
-    "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
     "html-loader": "^3.1.0",
     "html-webpack-plugin": "^5.5.0",
diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index 0507f026aba..d2ceffd8867 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -4,7 +4,7 @@ import { program } from 'commander';
 import { nodeVersionCheckerTask } from './tasks/nodeVersionChecker';
 import { buildPackageTask } from './tasks/package.build';
 import { pluginBuildTask } from './tasks/plugin.build';
-import { getToolkitVersion, githubPublishTask } from './tasks/plugin.utils';
+import { getToolkitVersion } from './tasks/plugin.utils';
 import { templateTask } from './tasks/template';
 import { toolkitBuildTask } from './tasks/toolkit.build';
 import { execTask } from './utils/execTask';
@@ -127,26 +127,6 @@ export const run = (includeInternalScripts = false) => {
       process.exit(1);
     });
 
-  program
-    .command('plugin:github-publish')
-    .option('--dryrun', 'Do a dry run only', false)
-    .option('--verbose', 'Print verbose', false)
-    .option('--commitHash <hashKey>', 'Specify the commit hash')
-    .description('[Deprecated] Publish to github')
-    .action(async (cmd) => {
-      console.log(
-        chalk.yellow.bold(`⚠️ This command is deprecated and will be removed . No further support will be provided. ⚠️`)
-      );
-      console.log(
-        'We recommend using github actions directly for plugin releasing. You can find an example here:  https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin/templates/github/ci/.github/workflows'
-      );
-      await execTask(githubPublishTask)({
-        dryrun: cmd.dryrun,
-        verbose: cmd.verbose,
-        commitHash: cmd.commitHash,
-      });
-    });
-
   program.on('command:*', () => {
     console.error('Invalid command: %s\nSee --help for a list of available commands.', program.args.join(' '));
     process.exit(1);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
index 7852bd1d8b6..78254f43065 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
@@ -1,147 +1,4 @@
-import execa = require('execa');
 import { readFileSync } from 'fs';
-import path = require('path');
-
-import { getPluginId } from '../../config/utils/getPluginId';
-import { getPluginJson } from '../../config/utils/pluginValidation';
-import { getCiFolder } from '../../plugins/env';
-import { GitHubRelease } from '../utils/githubRelease';
-import { useSpinner } from '../utils/useSpinner';
-
-import { Task, TaskRunner } from './task';
-
-interface Command extends Array<any> {}
-const DEFAULT_EMAIL_ADDRESS = 'eng@grafana.com';
-const DEFAULT_USERNAME = 'CircleCI Automation';
-
-const releaseNotes = async (): Promise<string> => {
-  const { stdout } = await execa(`awk 'BEGIN {FS="##"; RS="##"} FNR==3 {print "##" $1; exit}' CHANGELOG.md`, {
-    shell: true,
-  });
-  return stdout;
-};
-
-const checkoutBranch = async (branchName: string): Promise<Command> => {
-  const currentBranch = await execa(`git rev-parse --abbrev-ref HEAD`, { shell: true });
-  const branchesAvailable = await execa(
-    `(git branch -a | grep "${branchName}$" | grep -v remote) || echo 'No release found'`,
-    { shell: true }
-  );
-
-  if (currentBranch.stdout !== branchName) {
-    console.log('available', branchesAvailable.stdout.trim());
-    if (branchesAvailable.stdout.trim() === branchName) {
-      return ['git', ['checkout', branchName]];
-    } else {
-      return ['git', ['checkout', '-b', branchName]];
-    }
-  }
-  return [];
-};
-
-const gitUrlParse = (url: string): { owner: string; name: string } => {
-  let matchResult: RegExpMatchArray | null = [];
-
-  if (url.match(/^git@github.com/)) {
-    // We have an ssh style url.
-    matchResult = url.match(/^git@github.com:(.*?)\/(.*?)\.git/);
-  }
-
-  if (url.match(/^https:\/\/github.com\//)) {
-    // We have an https style url
-    matchResult = url.match(/^https:\/\/github.com\/(.*?)\/(.*?)\/.git/);
-  }
-
-  if (matchResult && matchResult.length > 2) {
-    return {
-      owner: matchResult[1],
-      name: matchResult[2],
-    };
-  }
-
-  throw `Could not find a suitable git repository. Received [${url}]`;
-};
-
-const prepareRelease = ({ dryrun, verbose }: any) =>
-  useSpinner('Preparing release', async () => {
-    const ciDir = getCiFolder();
-    const distDir = path.resolve(ciDir, 'dist');
-    const distContentDir = path.resolve(distDir, getPluginId());
-    const pluginJsonFile = path.resolve(distContentDir, 'plugin.json');
-    const pluginJson = getPluginJson(pluginJsonFile);
-
-    const githubPublishScript: Command = [
-      ['git', ['config', 'user.email', DEFAULT_EMAIL_ADDRESS]],
-      ['git', ['config', 'user.name', DEFAULT_USERNAME]],
-      await checkoutBranch(`release-${pluginJson.info.version}`),
-      ['/bin/rm', ['-rf', 'dist'], { dryrun }],
-      ['mv', ['-v', distContentDir, 'dist']],
-      ['git', ['add', '--force', 'dist'], { dryrun }],
-      ['/bin/rm', ['-rf', 'src'], { enterprise: true }],
-      ['git', ['rm', '-rf', 'src'], { enterprise: true }],
-      [
-        'git',
-        ['commit', '-m', `automated release ${pluginJson.info.version} [skip ci]`],
-        {
-          dryrun,
-          okOnError: [/nothing to commit/g, /nothing added to commit/g, /no changes added to commit/g],
-        },
-      ],
-      ['git', ['push', '-f', 'origin', `release-${pluginJson.info.version}`], { dryrun }],
-      ['git', ['tag', '-f', `v${pluginJson.info.version}`]],
-      ['git', ['push', '-f', 'origin', `v${pluginJson.info.version}`]],
-    ];
-
-    for (let line of githubPublishScript) {
-      const opts = line.length === 3 ? line[2] : {};
-      const command = line[0];
-      const args = line[1];
-
-      try {
-        if (verbose) {
-          console.log('executing >>', line);
-        }
-
-        if (line.length > 0 && line[0].length > 0) {
-          if (opts['dryrun']) {
-            line[1].push('--dry-run');
-          }
-
-          // Exit if the plugin is NOT an enterprise plugin
-          if (pluginJson.enterprise && !opts['enterprise']) {
-            continue;
-          }
-
-          const { stdout } = await execa(command, args);
-          if (verbose) {
-            console.log(stdout);
-          }
-        } else {
-          if (verbose) {
-            console.log('skipping empty line');
-          }
-        }
-      } catch (ex: any) {
-        const err: string = ex.message;
-        if (opts['okOnError'] && Array.isArray(opts['okOnError'])) {
-          let trueError = true;
-          for (let regex of opts['okOnError']) {
-            if (err.match(regex)) {
-              trueError = false;
-              break;
-            }
-          }
-
-          if (!trueError) {
-            // This is not an error
-            continue;
-          }
-        }
-        console.error(err);
-        process.exit(-1);
-      }
-    }
-  });
 
 export const getToolkitVersion = () => {
   const pkg = readFileSync(`${__dirname}/../../../package.json`, 'utf8');
@@ -151,73 +8,3 @@ export const getToolkitVersion = () => {
   }
   return version;
 };
-interface GithubPublishReleaseOptions {
-  commitHash?: string;
-  githubToken: string;
-  githubUser: string;
-  gitRepoName: string;
-}
-
-const createRelease = ({ commitHash, githubUser, githubToken, gitRepoName }: GithubPublishReleaseOptions) =>
-  useSpinner('Creating release', async () => {
-    const gitRelease = new GitHubRelease(githubToken, githubUser, gitRepoName, await releaseNotes(), commitHash);
-    return gitRelease.release();
-  });
-
-export interface GithubPublishOptions {
-  dryrun?: boolean;
-  verbose?: boolean;
-  commitHash?: string;
-  dev?: boolean;
-}
-
-const githubPublishRunner: TaskRunner<GithubPublishOptions> = async ({ dryrun, verbose, commitHash }) => {
-  let repoUrl: string | undefined = process.env.DRONE_REPO_LINK || process.env.CIRCLE_REPOSITORY_URL;
-  if (!repoUrl) {
-    // Try and figure it out
-    const repo = await execa('git', ['config', '--local', 'remote.origin.url']);
-    if (repo && repo.stdout) {
-      repoUrl = repo.stdout;
-    } else {
-      throw new Error(
-        'The release plugin requires you specify the repository url as environment variable DRONE_REPO_LINK or ' +
-          'CIRCLE_REPOSITORY_URL'
-      );
-    }
-  }
-
-  if (!process.env['GITHUB_ACCESS_TOKEN']) {
-    // Try to use GITHUB_TOKEN, which may be set.
-    if (process.env['GITHUB_TOKEN']) {
-      process.env['GITHUB_ACCESS_TOKEN'] = process.env['GITHUB_TOKEN'];
-    } else {
-      throw new Error(
-        `GitHub publish requires that you set the environment variable GITHUB_ACCESS_TOKEN to a valid github api token.
-        See: https://github.com/settings/tokens for more details.`
-      );
-    }
-  }
-
-  if (!process.env['GITHUB_USERNAME']) {
-    // We can default this one
-    process.env['GITHUB_USERNAME'] = DEFAULT_EMAIL_ADDRESS;
-  }
-
-  const parsedUrl = gitUrlParse(repoUrl);
-  const githubToken = process.env['GITHUB_ACCESS_TOKEN'];
-  const githubUser = parsedUrl.owner;
-
-  await prepareRelease({
-    dryrun,
-    verbose,
-  });
-
-  await createRelease({
-    commitHash,
-    githubUser,
-    githubToken,
-    gitRepoName: parsedUrl.name,
-  });
-};
-
-export const githubPublishTask = new Task<GithubPublishOptions>('GitHub Publish', githubPublishRunner);
diff --git a/packages/grafana-toolkit/src/cli/utils/githubClient.test.ts b/packages/grafana-toolkit/src/cli/utils/githubClient.test.ts
deleted file mode 100644
index ff6cfb0b132..00000000000
--- a/packages/grafana-toolkit/src/cli/utils/githubClient.test.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import GithubClient from './githubClient';
-
-const fakeClient = jest.fn();
-
-beforeEach(() => {
-  delete process.env.GITHUB_USERNAME;
-  delete process.env.GITHUB_ACCESS_TOKEN;
-});
-
-afterEach(() => {
-  delete process.env.GITHUB_USERNAME;
-  delete process.env.GITHUB_ACCESS_TOKEN;
-});
-
-describe('GithubClient', () => {
-  it('should initialise a GithubClient', () => {
-    const github = new GithubClient();
-    const githubEnterprise = new GithubClient({ enterprise: true });
-    expect(github).toBeInstanceOf(GithubClient);
-    expect(githubEnterprise).toBeInstanceOf(GithubClient);
-  });
-
-  describe('#client', () => {
-    it('it should contain a grafana client', () => {
-      // @ts-ignore
-      const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
-
-      const github = new GithubClient();
-      const client = github.client;
-
-      expect(spy).toHaveBeenCalledWith({
-        baseURL: 'https://api.github.com/repos/grafana/grafana',
-        timeout: 10000,
-      });
-      expect(client).toEqual(fakeClient);
-    });
-
-    it('it should contain a grafana enterprise client', () => {
-      // @ts-ignore
-      const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
-
-      const github = new GithubClient({ enterprise: true });
-      const client = github.client;
-
-      expect(spy).toHaveBeenCalledWith({
-        baseURL: 'https://api.github.com/repos/grafana/grafana-enterprise',
-        timeout: 10000,
-      });
-      expect(client).toEqual(fakeClient);
-    });
-
-    describe('when the credentials are required', () => {
-      it('should create the client when the credentials are defined', () => {
-        const username = 'grafana';
-        const token = 'averysecureaccesstoken';
-
-        process.env.GITHUB_USERNAME = username;
-        process.env.GITHUB_ACCESS_TOKEN = token;
-
-        // @ts-ignore
-        const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
-
-        const github = new GithubClient({ required: true });
-        const client = github.client;
-
-        expect(spy).toHaveBeenCalledWith({
-          baseURL: 'https://api.github.com/repos/grafana/grafana',
-          timeout: 10000,
-          auth: { username, password: token },
-        });
-
-        expect(client).toEqual(fakeClient);
-      });
-
-      it('should create the enterprise client when the credentials are defined', () => {
-        const username = 'grafana';
-        const token = 'averysecureaccesstoken';
-
-        process.env.GITHUB_USERNAME = username;
-        process.env.GITHUB_ACCESS_TOKEN = token;
-
-        // @ts-ignore
-        const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
-
-        const github = new GithubClient({ required: true, enterprise: true });
-        const client = github.client;
-
-        expect(spy).toHaveBeenCalledWith({
-          baseURL: 'https://api.github.com/repos/grafana/grafana-enterprise',
-          timeout: 10000,
-          auth: { username, password: token },
-        });
-
-        expect(client).toEqual(fakeClient);
-      });
-
-      describe('when the credentials are not defined', () => {
-        it('should throw an error', () => {
-          expect(() => {
-            // eslint-disable-next-line
-            new GithubClient({ required: true });
-          }).toThrow(/operation needs a GITHUB_USERNAME and GITHUB_ACCESS_TOKEN environment variables/);
-        });
-      });
-    });
-  });
-});
diff --git a/packages/grafana-toolkit/src/cli/utils/githubClient.ts b/packages/grafana-toolkit/src/cli/utils/githubClient.ts
deleted file mode 100644
index 9643c166874..00000000000
--- a/packages/grafana-toolkit/src/cli/utils/githubClient.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
-
-const grafanaURL = (owner: string, repo: string) => `https://api.github.com/repos/${owner}/${repo}`;
-const enterpriseURL = 'https://api.github.com/repos/grafana/grafana-enterprise';
-
-// Encapsulates the creation of a client for the GitHub API
-//
-// Two key things:
-// 1. You can specify whenever you want the credentials to be required or not when imported.
-// 2. If the credentials are available as part of the environment, even if
-// they're not required - the library will use them. This allows us to overcome
-// any API rate limiting imposed without authentication.
-
-interface GithubClientProps {
-  required?: boolean;
-  enterprise?: boolean;
-  owner?: string;
-  repo?: string;
-}
-
-class GithubClient {
-  client: AxiosInstance;
-
-  constructor({ required = false, enterprise = false, owner = 'grafana', repo = 'grafana' }: GithubClientProps = {}) {
-    const username = process.env.GITHUB_USERNAME;
-    const token = process.env.GITHUB_ACCESS_TOKEN;
-
-    const clientConfig: AxiosRequestConfig = {
-      baseURL: enterprise ? enterpriseURL : grafanaURL(owner, repo),
-      timeout: 10000,
-    };
-
-    if (required && !username && !token) {
-      throw new Error('operation needs a GITHUB_USERNAME and GITHUB_ACCESS_TOKEN environment variables');
-    }
-
-    if (username && token) {
-      clientConfig.auth = { username: username, password: token };
-    }
-
-    this.client = this.createClient(clientConfig);
-  }
-
-  private createClient(clientConfig: AxiosRequestConfig) {
-    return axios.create(clientConfig);
-  }
-}
-
-export default GithubClient;
diff --git a/packages/grafana-toolkit/src/cli/utils/githubRelease.test.ts b/packages/grafana-toolkit/src/cli/utils/githubRelease.test.ts
deleted file mode 100644
index 74fedc2a759..00000000000
--- a/packages/grafana-toolkit/src/cli/utils/githubRelease.test.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { GitHubRelease } from './githubRelease';
-
-describe('GithubRelease', () => {
-  it('should initialise a GithubRelease', () => {
-    process.env.GITHUB_ACCESS_TOKEN = '12345';
-    process.env.GITHUB_USERNAME = 'test@grafana.com';
-    const github = new GitHubRelease('A token', 'A username', 'A repo', 'Some release notes');
-    expect(github).toBeInstanceOf(GitHubRelease);
-  });
-});
diff --git a/packages/grafana-toolkit/src/cli/utils/githubRelease.ts b/packages/grafana-toolkit/src/cli/utils/githubRelease.ts
deleted file mode 100644
index 1d59e2d4516..00000000000
--- a/packages/grafana-toolkit/src/cli/utils/githubRelease.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { AxiosResponse } from 'axios';
-import fs = require('fs');
-import path = require('path');
-
-import { getPluginId } from '../../config/utils/getPluginId';
-import { getPluginJson } from '../../config/utils/pluginValidation';
-import { getCiFolder } from '../../plugins/env';
-
-import GithubClient from './githubClient';
-
-const resolveContentType = (extension: string): string => {
-  if (extension.startsWith('.')) {
-    extension = extension.slice(1);
-  }
-  switch (extension) {
-    case 'zip':
-      return 'application/zip';
-    case 'json':
-      return 'application/json';
-    case 'sha1':
-      return 'text/plain';
-    default:
-      return 'application/octet-stream';
-  }
-};
-
-class GitHubRelease {
-  token: string;
-  username: string;
-  repository: string;
-  releaseNotes: string;
-  commitHash?: string;
-  git: GithubClient;
-
-  constructor(token: string, username: string, repository: string, releaseNotes: string, commitHash?: string) {
-    this.token = token;
-    this.username = username;
-    this.repository = repository;
-    this.releaseNotes = releaseNotes;
-    this.commitHash = commitHash;
-
-    this.git = new GithubClient({
-      required: true,
-      owner: username,
-      repo: repository,
-    });
-  }
-
-  publishAssets(srcLocation: string, destUrl: string) {
-    // Add the assets. Loop through files in the ci/dist folder and upload each asset.
-    const files = fs.readdirSync(srcLocation);
-
-    return files.map(async (file: string) => {
-      const fileStat = fs.statSync(`${srcLocation}/${file}`);
-      const fileData = fs.readFileSync(`${srcLocation}/${file}`);
-      return this.git.client.post(`${destUrl}?name=${file}`, fileData, {
-        headers: {
-          'Content-Type': resolveContentType(path.extname(file)),
-          'Content-Length': fileStat.size,
-        },
-        maxContentLength: fileStat.size * 2 * 1024 * 1024,
-      });
-    });
-  }
-
-  async release() {
-    const ciDir = getCiFolder();
-    const distDir = path.resolve(ciDir, 'dist');
-    const distContentDir = path.resolve(distDir, getPluginId());
-    const pluginJsonFile = path.resolve(distContentDir, 'plugin.json');
-    const pluginInfo = getPluginJson(pluginJsonFile).info;
-    const PUBLISH_DIR = path.resolve(getCiFolder(), 'packages');
-    const commitHash = this.commitHash || pluginInfo.build?.hash;
-
-    try {
-      const latestRelease: AxiosResponse<any> = await this.git.client.get(`releases/tags/v${pluginInfo.version}`);
-
-      // Re-release if the version is the same as an existing release
-      if (latestRelease.data.tag_name === `v${pluginInfo.version}`) {
-        await this.git.client.delete(`releases/${latestRelease.data.id}`);
-      }
-    } catch (reason: any) {
-      if (reason.response.status !== 404) {
-        // 404 just means no release found. Not an error. Anything else though, re throw the error
-        throw reason;
-      }
-    }
-
-    try {
-      // Now make the release
-      const newReleaseResponse = await this.git.client.post('releases', {
-        tag_name: `v${pluginInfo.version}`,
-        target_commitish: commitHash,
-        name: `v${pluginInfo.version}`,
-        body: this.releaseNotes,
-        draft: false,
-        prerelease: false,
-      });
-
-      const publishPromises = this.publishAssets(
-        PUBLISH_DIR,
-        `https://uploads.github.com/repos/${this.username}/${this.repository}/releases/${newReleaseResponse.data.id}/assets`
-      );
-      await Promise.all(publishPromises);
-    } catch (reason: any) {
-      console.error(reason.data?.message ?? reason.response.data ?? reason);
-      // Rethrow the error so that we can trigger a non-zero exit code to circle-ci
-      throw reason;
-    }
-  }
-}
-
-export { GitHubRelease };
diff --git a/packages/grafana-toolkit/src/plugins/env.ts b/packages/grafana-toolkit/src/plugins/env.ts
deleted file mode 100644
index 56b9e126351..00000000000
--- a/packages/grafana-toolkit/src/plugins/env.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-
-export const getCiFolder = () => {
-  const dir = path.resolve(process.cwd(), 'ci');
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-  return dir;
-};
diff --git a/packages/grafana-toolkit/src/plugins/index.ts b/packages/grafana-toolkit/src/plugins/index.ts
deleted file mode 100644
index c1532d6d2e4..00000000000
--- a/packages/grafana-toolkit/src/plugins/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './env';
diff --git a/yarn.lock b/yarn.lock
index 0cd65e92e8d..5c6a2b2c782 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3399,7 +3399,6 @@ __metadata:
     "@grafana/ui": 10.0.0-pre
     "@jest/core": 27.5.1
     "@types/eslint": 8.4.1
-    "@types/fs-extra": ^9.0.13
     "@types/jest": 27.4.1
     "@types/lodash": 4.14.181
     "@types/node": 16.11.26
@@ -3410,7 +3409,6 @@ __metadata:
     "@types/tmp": 0.2.3
     "@typescript-eslint/eslint-plugin": 5.36.2
     "@typescript-eslint/parser": 5.36.2
-    axios: ^0.26.1
     babel-jest: 27.5.1
     babel-loader: ^8.2.5
     babel-plugin-angularjs-annotate: 0.10.0
@@ -3426,7 +3424,6 @@ __metadata:
     eslint-plugin-react-hooks: 4.6.0
     execa: ^5.1.1
     fork-ts-checker-webpack-plugin: ^7.2.1
-    fs-extra: ^10.0.0
     globby: ^11.0.4
     html-loader: ^3.1.0
     html-webpack-plugin: ^5.5.0
@@ -9495,15 +9492,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/fs-extra@npm:^9.0.13":
-  version: 9.0.13
-  resolution: "@types/fs-extra@npm:9.0.13"
-  dependencies:
-    "@types/node": "*"
-  checksum: add79e212acd5ac76b97b9045834e03a7996aef60a814185e0459088fd290519a3c1620865d588fa36c4498bf614210d2a703af5cf80aa1dbc125db78f6edac3
-  languageName: node
-  linkType: hard
-
 "@types/geojson@npm:*":
   version: 7946.0.8
   resolution: "@types/geojson@npm:7946.0.8"
@@ -12471,15 +12459,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.26.1":
-  version: 0.26.1
-  resolution: "axios@npm:0.26.1"
-  dependencies:
-    follow-redirects: ^1.14.8
-  checksum: d9eb58ff4bc0b36a04783fc9ff760e9245c829a5a1052ee7ca6013410d427036b1d10d04e7380c02f3508c5eaf3485b1ae67bd2adbfec3683704745c8d7a6e1a
-  languageName: node
-  linkType: hard
-
 "axios@npm:^0.27.2":
   version: 0.27.2
   resolution: "axios@npm:0.27.2"
@@ -19119,7 +19098,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.8":
+"follow-redirects@npm:^1.0.0":
   version: 1.14.8
   resolution: "follow-redirects@npm:1.14.8"
   peerDependenciesMeta:

From 0ec40a51eb6e4dad859005c36579fa9131c05945 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Fri, 28 Apr 2023 10:53:23 +0200
Subject: [PATCH 508/729] Toolkit: Remove deprecated `package:build`,
 `node-version-check` and `toolkit:build` commands (#67475)

---
 .betterer.results                             |  5 -
 packages/grafana-toolkit/package.json         |  6 +-
 packages/grafana-toolkit/src/cli/index.ts     | 44 ---------
 .../src/cli/tasks/nodeVersionChecker.ts       | 77 ---------------
 .../src/cli/tasks/package.build.ts            | 92 -----------------
 .../src/cli/tasks/toolkit.build.ts            | 99 -------------------
 yarn.lock                                     | 27 ++---
 7 files changed, 11 insertions(+), 339 deletions(-)
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/package.build.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts

diff --git a/.betterer.results b/.betterer.results
index 59d950253ae..95c3ac90c74 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -871,11 +871,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "5"],
       [0, 0, 0, "Do not use any type assertions.", "6"]
     ],
-    "packages/grafana-toolkit/src/cli/tasks/package.build.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-toolkit/src/cli/tasks/task.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 5741702f91e..c30e70fc838 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -58,12 +58,11 @@
     "@jest/core": "27.5.1",
     "@types/eslint": "8.4.1",
     "@types/jest": "27.4.1",
-    "@types/lodash": "4.14.181",
+    "@types/lodash": "^4.14.194",
     "@types/node": "16.11.26",
     "@types/prettier": "2.6.3",
     "@types/react-dev-utils": "9.0.10",
     "@types/rimraf": "3.0.2",
-    "@types/semver": "7.3.9",
     "@types/tmp": "0.2.3",
     "@typescript-eslint/eslint-plugin": "5.36.2",
     "@typescript-eslint/parser": "5.36.2",
@@ -90,7 +89,7 @@
     "jest-junit": "13.1.0",
     "less": "^4.1.2",
     "less-loader": "^10.2.0",
-    "lodash": "^4.17.21",
+    "lodash": "4.17.21",
     "mini-css-extract-plugin": "^2.6.0",
     "ora": "^5.4.1",
     "postcss": "^8.4.12",
@@ -103,7 +102,6 @@
     "rimraf": "3.0.2",
     "sass": "^1.49.9",
     "sass-loader": "^12.6.0",
-    "semver": "^7.3.7",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.1",
     "ts-jest": "27.1.3",
diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index d2ceffd8867..1dd6f12b5af 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -1,65 +1,21 @@
 import chalk from 'chalk';
 import { program } from 'commander';
 
-import { nodeVersionCheckerTask } from './tasks/nodeVersionChecker';
-import { buildPackageTask } from './tasks/package.build';
 import { pluginBuildTask } from './tasks/plugin.build';
 import { getToolkitVersion } from './tasks/plugin.utils';
 import { templateTask } from './tasks/template';
-import { toolkitBuildTask } from './tasks/toolkit.build';
 import { execTask } from './utils/execTask';
 
 export const run = (includeInternalScripts = false) => {
   if (includeInternalScripts) {
     program.option('-d, --depreciate <scripts>', 'Inform about npm script deprecation', (v) => v.split(','));
 
-    program
-      .command('package:build')
-      .option('-s, --scope <packages>', 'packages=[data|runtime|ui|toolkit|e2e|e2e-selectors]')
-      .description('Builds @grafana/* package to packages/grafana-*/dist')
-      .action(async (cmd) => {
-        console.warn(
-          '@grafana/toolkit package:build task is deprecated and will be removed in @grafana/toolkit@10.0.0.'
-        );
-        await execTask(buildPackageTask)({
-          scope: cmd.scope,
-        });
-      });
-
-    program
-      .command('node-version-check')
-      .description('[deprecated] Verify node version')
-      .action(async () => {
-        console.log(
-          chalk.yellow.bold(
-            `⚠️ This command is deprecated and will be removed in v10. No further support will be provided. ⚠️`
-          )
-        );
-        console.log(
-          'if you were reliant on this command we recommend https://www.npmjs.com/package/check-node-version'
-        );
-
-        await execTask(nodeVersionCheckerTask)({});
-      });
-
     program
       .command('debug:template')
       .description('Just testing')
       .action(async (cmd) => {
         await execTask(templateTask)({});
       });
-
-    program
-      .command('toolkit:build')
-      .description('[Deprecated] Prepares grafana/toolkit dist package')
-      .action(async (cmd) => {
-        console.log(
-          chalk.yellow.bold(
-            `⚠️ This command is deprecated and will be removed in v10. No further support will be provided. ⚠️`
-          )
-        );
-        await execTask(toolkitBuildTask)({});
-      });
   }
 
   program.option('-v, --version', 'Toolkit version').action(async () => {
diff --git a/packages/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts b/packages/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts
deleted file mode 100644
index d7bcbe0ff8e..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import chalk from 'chalk';
-import { readFileSync } from 'fs';
-import { coerce, satisfies } from 'semver';
-
-import { Task, TaskRunner } from './task';
-
-interface FailedVersionCheck {
-  file: string;
-  line: string;
-}
-
-interface NodeVersionCheckerOptions {}
-
-const pattern = /(circleci\/|FROM )node\:([0-9]+(\.[0-9]+){0,2})/gm;
-const packageJsonFile = 'package.json';
-
-const failures: FailedVersionCheck[] = [];
-
-export const nodeVersionFiles = [packageJsonFile, 'Dockerfile'];
-
-const nodeVersionCheckerRunner: TaskRunner<NodeVersionCheckerOptions> = async () => {
-  // Read version from package json and treat that as the expected version in all other locations
-  const packageJson = require(`${process.cwd()}/${packageJsonFile}`);
-  const expectedVersion = packageJson.engines.node;
-
-  console.log(chalk.yellow(`Specified node version in package.json is: ${expectedVersion}`));
-
-  for (const file of nodeVersionFiles) {
-    const fileContent = readFileSync(`${process.cwd()}/${file}`);
-    const matches = fileContent.toString('utf8').match(pattern);
-
-    if (!matches) {
-      continue;
-    }
-
-    for (const match of matches) {
-      const actualVersion = coerce(match);
-      if (!actualVersion) {
-        failures.push({
-          file,
-          line: match,
-        });
-        continue;
-      }
-
-      const satisfied = satisfies(actualVersion, expectedVersion);
-      if (!satisfied) {
-        failures.push({
-          file,
-          line: match,
-        });
-      }
-    }
-  }
-
-  if (failures.length > 0) {
-    console.log(chalk.red('--------------------------------------------------------------------'));
-    console.log(chalk.red(`These entries don't satisfy the engine version in ${packageJsonFile}`));
-    console.log(chalk.red('--------------------------------------------------------------------'));
-
-    for (let index = 0; index < failures.length; index++) {
-      const failure = failures[index];
-      console.log(chalk.green(`\tIn ${failure.file} the line ${failure.line} does not satisfy ${expectedVersion}.`));
-    }
-
-    throw new Error('Node versions not in sync');
-  }
-
-  console.log(chalk.yellow('--------------------------------------------------------------------'));
-  console.log(chalk.yellow('All node versions seem ok.'));
-  console.log(chalk.yellow('--------------------------------------------------------------------'));
-};
-
-export const nodeVersionCheckerTask = new Task<NodeVersionCheckerOptions>(
-  'Node Version Checker',
-  nodeVersionCheckerRunner
-);
diff --git a/packages/grafana-toolkit/src/cli/tasks/package.build.ts b/packages/grafana-toolkit/src/cli/tasks/package.build.ts
deleted file mode 100644
index 844cc76e798..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/package.build.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import chalk from 'chalk';
-import execa = require('execa');
-import { promises as fs } from 'fs';
-import globby from 'globby';
-import { cloneDeep } from 'lodash';
-import * as path from 'path';
-
-import { useSpinner } from '../utils/useSpinner';
-
-import { Task, TaskRunner } from './task';
-
-const clean = (cwd: string) => useSpinner('Cleaning', () => execa('npm', ['run', 'clean'], { cwd }));
-
-const compile = (cwd: string) =>
-  useSpinner('Compiling sources', () => execa('tsc', ['-p', './tsconfig.build.json'], { cwd }));
-
-const bundle = (cwd: string) => useSpinner('Bundling', () => execa('npm', ['run', 'bundle'], { cwd }));
-
-const preparePackage = async (packageDist: string, pkg: any) => {
-  pkg = cloneDeep(pkg); // avoid mutations
-
-  pkg.main = 'index.js';
-  pkg.types = 'index.d.ts';
-
-  const version: string = pkg.version;
-  const name: string = pkg.name;
-  const deps: any = pkg.dependencies;
-
-  // Below we are adding cross-dependencies to Grafana's packages
-  // with the version being published
-  if (name.endsWith('/ui')) {
-    deps['@grafana/data'] = version;
-  } else if (name.endsWith('/runtime')) {
-    deps['@grafana/data'] = version;
-    deps['@grafana/ui'] = version;
-  } else if (name.endsWith('/toolkit')) {
-    deps['@grafana/data'] = version;
-    deps['@grafana/ui'] = version;
-  }
-
-  await useSpinner('Updating package.json', () =>
-    fs.writeFile(`${packageDist}/package.json`, JSON.stringify(pkg, null, 2))
-  );
-};
-
-const moveFiles = (fromPath: string, toPath: string) => {
-  const files = ['README.md', 'CHANGELOG.md', 'index.js'];
-
-  return useSpinner(`Moving ${files.join(', ')} files`, () => {
-    const promises = files.map((file) => fs.copyFile(`${fromPath}/${file}`, `${toPath}/${file}`));
-    return Promise.all(promises);
-  });
-};
-
-const moveStaticFiles = async (packageRoot: string, pkg: any) => {
-  if (pkg.name.endsWith('/ui')) {
-    return useSpinner('Moving static files', async () => {
-      const staticFiles = await globby(`${packageRoot}/src/**/*.{png,svg,gif,jpg}`);
-      const pathSearch = new RegExp(`^${packageRoot}/src`);
-      const pathReplace = `${packageRoot}/compiled`;
-      const promises = staticFiles.map((file) => fs.copyFile(file, file.replace(pathSearch, pathReplace)));
-      await Promise.all(promises);
-    });
-  }
-};
-
-interface PackageBuildOptions {
-  scope: string;
-}
-
-const buildTaskRunner: TaskRunner<PackageBuildOptions> = async ({ scope }) => {
-  if (!scope) {
-    throw new Error('Provide packages with -s, --scope <packages>');
-  }
-
-  const scopes = scope.split(',').map(async (s) => {
-    const packageRoot = path.resolve(__dirname, `../../../../grafana-${s}`);
-    const packageDist = `${packageRoot}/dist`;
-    const pkg = require(`${packageRoot}/package.json`);
-    console.log(chalk.yellow(`Building ${pkg.name} (package.json version: ${pkg.version})`));
-    await clean(packageRoot);
-    await compile(packageRoot);
-    await moveStaticFiles(packageRoot, pkg);
-    await bundle(packageRoot);
-    await preparePackage(packageDist, pkg);
-    await moveFiles(packageRoot, packageDist);
-  });
-
-  await Promise.all(scopes);
-};
-
-export const buildPackageTask = new Task<PackageBuildOptions>('Package build', buildTaskRunner);
diff --git a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts b/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts
deleted file mode 100644
index 4c4510545c0..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import chalk from 'chalk';
-import execa = require('execa');
-import * as fs from 'fs';
-
-import { useSpinner } from '../utils/useSpinner';
-
-import { Task, TaskRunner } from './task';
-
-const path = require('path');
-
-let distDir: string, cwd: string;
-
-const clean = () => useSpinner('Cleaning', () => execa('npm', ['run', 'clean']));
-
-const compile = () =>
-  useSpinner('Compiling sources', async () => {
-    try {
-      await execa('tsc', ['-p', './tsconfig.json']);
-    } catch (e) {
-      console.log(e);
-      throw e;
-    }
-  });
-
-const copyFiles = () => {
-  const files = [
-    'src/config/prettier.plugin.config.json',
-    'src/config/prettier.plugin.rc.js',
-    'src/config/tsconfig.plugin.json',
-    'src/config/tsconfig.plugin.local.json',
-    'src/config/eslint.plugin.js',
-    'src/config/styles.mock.js',
-    'src/config/jest.babel.config.js',
-    'src/config/jest.plugin.config.local.js',
-    'src/config/matchMedia.js',
-    'src/config/react-inlinesvg.tsx',
-  ];
-
-  return useSpinner(`Moving ${files.join(', ')} files`, async () => {
-    const promises = files.map((file) => {
-      return new Promise<void>((resolve, reject) => {
-        const basedir = path.dirname(`${distDir}/${file}`);
-        if (!fs.existsSync(basedir)) {
-          fs.mkdirSync(basedir, { recursive: true });
-        }
-        fs.copyFile(`${cwd}/${file}`, `${distDir}/${file}`, (err) => {
-          if (err) {
-            reject(err);
-            return;
-          }
-          resolve();
-        });
-      });
-    });
-
-    await Promise.all(promises);
-  });
-};
-
-const copySassFiles = () => {
-  const files = ['_variables.generated.scss', '_variables.dark.generated.scss', '_variables.light.generated.scss'];
-  const exportDir = `${cwd}/sass`;
-  return useSpinner(`Copy scss files ${files.join(', ')} files`, async () => {
-    const sassDir = path.resolve(cwd, '../../public/sass/');
-    if (!fs.existsSync(exportDir)) {
-      fs.mkdirSync(exportDir);
-    }
-    const promises = files.map((file) => {
-      return new Promise<void>((resolve, reject) => {
-        const name = file.replace('.generated', '');
-        fs.copyFile(`${sassDir}/${file}`, `${exportDir}/${name}`, (err) => {
-          if (err) {
-            reject(err);
-            return;
-          }
-          resolve();
-        });
-      });
-    });
-
-    await Promise.all(promises);
-  });
-};
-
-interface ToolkitBuildOptions {}
-
-const toolkitBuildTaskRunner: TaskRunner<ToolkitBuildOptions> = async () => {
-  cwd = path.resolve(__dirname, '../../../');
-  distDir = `${cwd}/dist`;
-  const pkg = require(`${cwd}/package.json`);
-  console.log(chalk.yellow(`Building ${pkg.name} (package.json version: ${pkg.version})`));
-
-  await clean();
-  await compile();
-  await copyFiles();
-  await copySassFiles();
-};
-
-export const toolkitBuildTask = new Task<ToolkitBuildOptions>('@grafana/toolkit build', toolkitBuildTaskRunner);
diff --git a/yarn.lock b/yarn.lock
index 5c6a2b2c782..1d6c1490bcd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3400,12 +3400,11 @@ __metadata:
     "@jest/core": 27.5.1
     "@types/eslint": 8.4.1
     "@types/jest": 27.4.1
-    "@types/lodash": 4.14.181
+    "@types/lodash": ^4.14.194
     "@types/node": 16.11.26
     "@types/prettier": 2.6.3
     "@types/react-dev-utils": 9.0.10
     "@types/rimraf": 3.0.2
-    "@types/semver": 7.3.9
     "@types/tmp": 0.2.3
     "@typescript-eslint/eslint-plugin": 5.36.2
     "@typescript-eslint/parser": 5.36.2
@@ -3432,7 +3431,7 @@ __metadata:
     jest-junit: 13.1.0
     less: ^4.1.2
     less-loader: ^10.2.0
-    lodash: ^4.17.21
+    lodash: 4.17.21
     mini-css-extract-plugin: ^2.6.0
     ora: ^5.4.1
     postcss: ^8.4.12
@@ -3445,7 +3444,6 @@ __metadata:
     rimraf: 3.0.2
     sass: ^1.49.9
     sass-loader: ^12.6.0
-    semver: ^7.3.7
     style-loader: ^3.3.1
     terser-webpack-plugin: ^5.3.1
     ts-jest: 27.1.3
@@ -9756,13 +9754,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:4.14.181":
-  version: 4.14.181
-  resolution: "@types/lodash@npm:4.14.181"
-  checksum: 0d1863d8383fd2f8bb42e9e3fc1d6255bb88ff034d6df848941063698944313dae944fc1270315613e3d303fae7c7a9a86085ad3235ed6204c56c4b0b3699aa9
-  languageName: node
-  linkType: hard
-
 "@types/lodash@npm:4.14.191":
   version: 4.14.191
   resolution: "@types/lodash@npm:4.14.191"
@@ -9784,6 +9775,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash@npm:^4.14.194":
+  version: 4.14.194
+  resolution: "@types/lodash@npm:4.14.194"
+  checksum: 113f34831c461469d91feca2dde737f88487732898b4d25e9eb23b087bb193985f864d1e1e0f3b777edc5022e460443588b6000a3b2348c966f72d17eedc35ea
+  languageName: node
+  linkType: hard
+
 "@types/logfmt@npm:^1.2.3":
   version: 1.2.3
   resolution: "@types/logfmt@npm:1.2.3"
@@ -10302,13 +10300,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/semver@npm:7.3.9":
-  version: 7.3.9
-  resolution: "@types/semver@npm:7.3.9"
-  checksum: 60bfcfdfa7f937be2c6f4b37ddb6714fb0f27b05fe4cbdfdd596a97d35ed95d13ee410efdd88e72a66449d0384220bf20055ab7d6b5df10de4990fbd20e5cbe0
-  languageName: node
-  linkType: hard
-
 "@types/serve-index@npm:^1.9.1":
   version: 1.9.1
   resolution: "@types/serve-index@npm:1.9.1"

From 8845b4cc3b8c7c8c307bcee677d382ec9f16a81c Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Fri, 28 Apr 2023 11:32:45 +0200
Subject: [PATCH 509/729] Plugins: Bump plugin-related backend dependencies
 (#67373)

Bump github.com/hashicorp/go-plugin to v1.4.9
---
 go.mod | 22 +++++++++++-----------
 go.sum | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index d2be11539d0..dcc3da85f0b 100644
--- a/go.mod
+++ b/go.mod
@@ -38,7 +38,7 @@ require (
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/centrifugal/centrifuge v0.29.1
 	github.com/crewjam/saml v0.4.12
-	github.com/fatih/color v1.13.0
+	github.com/fatih/color v1.15.0
 	github.com/gchaincl/sqlhooks v1.3.0
 	github.com/getsentry/sentry-go v0.13.0
 	github.com/go-git/go-git/v5 v5.4.2
@@ -62,8 +62,8 @@ require (
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
 	github.com/grafana/grafana-plugin-sdk-go v0.159.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
-	github.com/hashicorp/go-hclog v1.2.0
-	github.com/hashicorp/go-plugin v1.4.3
+	github.com/hashicorp/go-hclog v1.5.0
+	github.com/hashicorp/go-plugin v1.4.9
 	github.com/hashicorp/go-version v1.3.0
 	github.com/influxdata/influxdb-client-go/v2 v2.6.0
 	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097
@@ -74,7 +74,7 @@ require (
 	github.com/linkedin/goavro/v2 v2.10.0
 	github.com/m3db/prometheus_remote_client_golang v0.4.4
 	github.com/magefile/mage v1.14.0
-	github.com/mattn/go-isatty v0.0.17
+	github.com/mattn/go-isatty v0.0.18
 	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/matttproud/golang_protobuf_extensions v1.0.4
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
@@ -106,7 +106,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.14.0
 	golang.org/x/crypto v0.7.0
 	golang.org/x/exp v0.0.0-20221211140036-ad323defaf05
-	golang.org/x/net v0.8.0
+	golang.org/x/net v0.9.0
 	golang.org/x/oauth2 v0.6.0
 	golang.org/x/sync v0.1.0
 	golang.org/x/time v0.3.0
@@ -165,7 +165,7 @@ require (
 	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
 	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2
+	github.com/golang/protobuf v1.5.3
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/flatbuffers v2.0.8+incompatible // indirect
 	github.com/googleapis/gax-go/v2 v2.7.0
@@ -177,7 +177,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/igm/sockjs-go/v3 v3.0.2 // indirect
 	github.com/jessevdk/go-flags v1.5.0 // indirect
 	github.com/jonboulle/clockwork v0.3.0 // indirect
@@ -188,7 +188,7 @@ require (
 	github.com/mattetti/filebuffer v1.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/miekg/dns v1.1.50 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
@@ -215,11 +215,11 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.10.0
 	go.uber.org/goleak v1.2.1 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.9.0
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
 )
 
 require (
diff --git a/go.sum b/go.sum
index 510e39466c7..0daf20ed7cc 100644
--- a/go.sum
+++ b/go.sum
@@ -769,6 +769,8 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
@@ -1136,6 +1138,8 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -1374,6 +1378,8 @@ github.com/hashicorp/go-plugin v1.2.2/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYt
 github.com/hashicorp/go-plugin v1.4.2/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
 github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
 github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-plugin v1.4.9 h1:ESiK220/qE0aGxWdzKIvRH69iLiuN/PjoLTm69RoWtU=
+github.com/hashicorp/go-plugin v1.4.9/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
@@ -1426,6 +1432,8 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe
 github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493 h1:brI5vBRUlAlM34VFmnLPwjnCL/FxAJp9XvOdX6Zt+XE=
 github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
+github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
+github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hetznercloud/hcloud-go v1.26.2/go.mod h1:2C5uMtBiMoFr3m7lBFPf7wXTdh33CevmZpQIIDPGYJI=
 github.com/hetznercloud/hcloud-go v1.33.1/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME=
 github.com/hetznercloud/hcloud-go v1.35.3 h1:WCmFAhLRooih2QHAsbCbEdpIHnshQQmrPqsr3rHE1Ow=
@@ -1715,6 +1723,8 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
@@ -1760,6 +1770,8 @@ github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.14.0 h1:/x0XQ6h+3U3nAyk1yx+bHPURrKa9sVVvYbuqZ7pIAtI=
 github.com/mitchellh/go-testing-interface v1.14.0/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
+github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
+github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
 github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
@@ -2718,6 +2730,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2940,6 +2954,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -2950,6 +2966,7 @@ golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2967,6 +2984,8 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

From 236862a07cfa9efb6883a4e0ade82b6d30c6c16a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Fri, 28 Apr 2023 11:48:18 +0200
Subject: [PATCH 510/729] loki: devenv: add test-data for regexes (#67476)

---
 devenv/docker/blocks/loki/data/data.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devenv/docker/blocks/loki/data/data.js b/devenv/docker/blocks/loki/data/data.js
index 8989b7a4164..bc013954726 100644
--- a/devenv/docker/blocks/loki/data/data.js
+++ b/devenv/docker/blocks/loki/data/data.js
@@ -160,6 +160,7 @@ function getRandomNanosecPart() {
 const sharedLabels = {
   source: 'data',
   instance: 'server\\1',
+  re: 'one.two$three^four', // to test regex escaping
   job: '"grafana/data"'
 };
 

From b4a7427f31e1b0c2f1b2c3d142fa80b43ee9ac42 Mon Sep 17 00:00:00 2001
From: Alexa V <239999+axelavargas@users.noreply.github.com>
Date: Fri, 28 Apr 2023 12:19:39 +0200
Subject: [PATCH 511/729] [Chore] Refactor Panel Menu Rudderstack events and
 add missing instrumentation (#66850)

---
 .../components/PanelChrome/HoverWidget.tsx    |  8 +++----
 .../components/PanelChrome/PanelChrome.tsx    | 14 ++++++++++-
 .../src/components/PanelChrome/PanelMenu.tsx  | 17 ++++++++++++--
 .../dashboard/dashgrid/PanelChromeAngular.tsx |  1 +
 .../dashgrid/PanelHeader/PanelHeader.tsx      |  7 +++++-
 .../PanelHeader/PanelHeaderMenuTrigger.tsx    |  8 +++++--
 .../dashboard/dashgrid/PanelStateWrapper.tsx  |  1 +
 .../dashboard/utils/getPanelChromeProps.tsx   |  5 ++++
 .../features/dashboard/utils/getPanelMenu.ts  | 23 ++++++++++---------
 9 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx b/packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx
index 3105d991c54..8bff29f9f0b 100644
--- a/packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx
@@ -15,14 +15,13 @@ interface Props {
   title?: string;
   offset?: number;
   dragClass?: string;
+  onOpenMenu?: () => void;
 }
 
-const selectors = e2eSelectors.components.Panels.Panel.HoverWidget;
-
-export function HoverWidget({ menu, title, dragClass, children, offset = -32 }: Props) {
+export function HoverWidget({ menu, title, dragClass, children, offset = -32, onOpenMenu }: Props) {
   const styles = useStyles2(getStyles);
   const draggableRef = useRef<HTMLDivElement>(null);
-
+  const selectors = e2eSelectors.components.Panels.Panel.HoverWidget;
   // Capture the pointer to keep the widget visible while dragging
   const onPointerDown = useCallback((e: React.PointerEvent<HTMLDivElement>) => {
     draggableRef.current?.setPointerCapture(e.pointerId);
@@ -64,6 +63,7 @@ export function HoverWidget({ menu, title, dragClass, children, offset = -32 }:
           placement="bottom"
           menuButtonClass={styles.menuButton}
           onVisibleChange={setMenuOpen}
+          onOpenMenu={onOpenMenu}
         />
       )}
     </div>
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
index 2921b053527..4017fd4c30a 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
@@ -53,6 +53,10 @@ export interface PanelChromeProps {
   actions?: ReactNode;
   displayMode?: 'default' | 'transparent';
   onCancelQuery?: () => void;
+  /**
+   * callback when opening the panel menu
+   */
+  onOpenMenu?: () => void;
 }
 
 /**
@@ -83,6 +87,7 @@ export function PanelChrome({
   leftItems,
   actions,
   onCancelQuery,
+  onOpenMenu,
 }: PanelChromeProps) {
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
@@ -159,7 +164,13 @@ export function PanelChrome({
 
       {hoverHeader && !isTouchDevice && (
         <>
-          <HoverWidget menu={menu} title={title} offset={hoverHeaderOffset} dragClass={dragClass}>
+          <HoverWidget
+            menu={menu}
+            title={title}
+            offset={hoverHeaderOffset}
+            dragClass={dragClass}
+            onOpenMenu={onOpenMenu}
+          >
             {headerContent}
           </HoverWidget>
 
@@ -192,6 +203,7 @@ export function PanelChrome({
                 dragClassCancel,
                 showOnHoverClass
               )}
+              onOpenMenu={onOpenMenu}
             />
           )}
         </div>
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelMenu.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelMenu.tsx
index c9180fe2882..2f80058db33 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelMenu.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelMenu.tsx
@@ -1,5 +1,5 @@
 import { cx } from '@emotion/css';
-import React, { ReactElement } from 'react';
+import React, { ReactElement, useCallback } from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
 
@@ -15,6 +15,7 @@ interface PanelMenuProps {
   placement?: TooltipPlacement;
   offset?: [number, number];
   onVisibleChange?: (state: boolean) => void;
+  onOpenMenu?: () => void;
 }
 
 export function PanelMenu({
@@ -25,10 +26,22 @@ export function PanelMenu({
   dragClassCancel,
   menuButtonClass,
   onVisibleChange,
+  onOpenMenu,
 }: PanelMenuProps) {
   const testId = title ? selectors.components.Panels.Panel.menu(title) : `panel-menu-button`;
+
+  const handleVisibility = useCallback(
+    (show: boolean) => {
+      if (show && onOpenMenu) {
+        onOpenMenu();
+      }
+      return onVisibleChange;
+    },
+    [onOpenMenu, onVisibleChange]
+  );
+
   return (
-    <Dropdown overlay={menu} placement={placement} offset={offset} onVisibleChange={onVisibleChange}>
+    <Dropdown overlay={menu} placement={placement} offset={offset} onVisibleChange={handleVisibility}>
       <ToolbarButton
         aria-label={`Menu for panel with ${title ? `title ${title}` : 'no title'}`}
         title="Menu"
diff --git a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
index 435341e227d..ced559cae25 100644
--- a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
@@ -229,6 +229,7 @@ export class PanelChromeAngularUnconnected extends PureComponent<Props, State> {
           hoverHeader={panelChromeProps.hasOverlayHeader()}
           displayMode={transparent ? 'transparent' : 'default'}
           onCancelQuery={panelChromeProps.onCancelQuery}
+          onOpenMenu={panelChromeProps.onOpenMenu}
         >
           {() => <div ref={(element) => (this.element = element)} className="panel-height-helper" />}
         </PanelChrome>
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
index 1b65818c5fa..144b7d4336a 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 
 import { DataLink, GrafanaTheme2, PanelData } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
 import { Icon, useStyles2, ClickOutsideWrapper } from '@grafana/ui';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
@@ -33,6 +34,10 @@ export function PanelHeader({ panel, error, isViewing, isEditing, data, alertSta
   const className = cx('panel-header', !(isViewing || isEditing) ? 'grid-drag-handle' : '');
   const styles = useStyles2(panelStyles);
 
+  const onOpenMenu = () => {
+    reportInteraction('dashboards_panelheader_menu', { item: 'menu' });
+  };
+
   return (
     <>
       <PanelHeaderLoadingIndicator state={data.state} onClick={onCancelQuery} />
@@ -45,7 +50,7 @@ export function PanelHeader({ panel, error, isViewing, isEditing, data, alertSta
         error={error}
       />
       <div className={className}>
-        <PanelHeaderMenuTrigger data-testid={selectors.components.Panels.Panel.title(title)}>
+        <PanelHeaderMenuTrigger data-testid={selectors.components.Panels.Panel.title(title)} onOpenMenu={onOpenMenu}>
           {({ closeMenu, panelMenuOpen }) => {
             return (
               <ClickOutsideWrapper onClick={closeMenu} parent={document}>
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
index 6d12cb3d1f5..daf3666ef03 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
@@ -9,9 +9,10 @@ interface PanelHeaderMenuTriggerApi {
 
 interface Props extends Omit<HTMLAttributes<HTMLDivElement>, 'children'> {
   children: (props: PanelHeaderMenuTriggerApi) => ReactElement;
+  onOpenMenu?: () => void;
 }
 
-export function PanelHeaderMenuTrigger({ children, ...divProps }: Props) {
+export function PanelHeaderMenuTrigger({ children, onOpenMenu, ...divProps }: Props) {
   const clickCoordinates = useRef<CartesianCoords2D>({ x: 0, y: 0 });
   const [panelMenuOpen, setPanelMenuOpen] = useState<boolean>(false);
 
@@ -22,8 +23,11 @@ export function PanelHeaderMenuTrigger({ children, ...divProps }: Props) {
       }
 
       setPanelMenuOpen(!panelMenuOpen);
+      if (panelMenuOpen) {
+        onOpenMenu?.();
+      }
     },
-    [panelMenuOpen, setPanelMenuOpen]
+    [panelMenuOpen, setPanelMenuOpen, onOpenMenu]
   );
 
   const onMouseDown = useCallback((event: MouseEvent<HTMLDivElement>) => {
diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
index a593580c61e..2b5be94b746 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
@@ -646,6 +646,7 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
           hoverHeader={panelChromeProps.hasOverlayHeader()}
           displayMode={transparent ? 'transparent' : 'default'}
           onCancelQuery={panelChromeProps.onCancelQuery}
+          onOpenMenu={panelChromeProps.onOpenMenu}
         >
           {(innerWidth, innerHeight) => (
             <>
diff --git a/public/app/features/dashboard/utils/getPanelChromeProps.tsx b/public/app/features/dashboard/utils/getPanelChromeProps.tsx
index 90cf4261878..32e4b6528d9 100644
--- a/public/app/features/dashboard/utils/getPanelChromeProps.tsx
+++ b/public/app/features/dashboard/utils/getPanelChromeProps.tsx
@@ -106,6 +106,10 @@ export function getPanelChromeProps(props: CommonProps) {
 
   const title = props.panel.getDisplayTitle();
 
+  const onOpenMenu = () => {
+    reportInteraction('dashboards_panelheader_menu', { item: 'menu' });
+  };
+
   return {
     hasOverlayHeader,
     onShowPanelDescription,
@@ -118,5 +122,6 @@ export function getPanelChromeProps(props: CommonProps) {
     dragClass,
     title,
     titleItems,
+    onOpenMenu,
   };
 }
diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts
index 405e971c6a0..84ca6f1ae10 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.ts
@@ -40,7 +40,7 @@ export function getPanelMenu(
     locationService.partial({
       viewPanel: panel.id,
     });
-    reportInteraction('dashboards_panelheader_view_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'view' });
   };
 
   const onEditPanel = (event: React.MouseEvent<any>) => {
@@ -48,25 +48,26 @@ export function getPanelMenu(
     locationService.partial({
       editPanel: panel.id,
     });
-    reportInteraction('dashboards_panelheader_edit_clicked');
+
+    reportInteraction('dashboards_panelheader_menu', { item: 'edit' });
   };
 
   const onSharePanel = (event: React.MouseEvent<any>) => {
     event.preventDefault();
     sharePanel(dashboard, panel);
-    reportInteraction('dashboards_panelheader_share_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'share' });
   };
 
   const onAddLibraryPanel = (event: React.MouseEvent<any>) => {
     event.preventDefault();
     addLibraryPanel(dashboard, panel);
-    reportInteraction('dashboards_panelheader_createlibrarypanel_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'createLibraryPanel' });
   };
 
   const onUnlinkLibraryPanel = (event: React.MouseEvent<any>) => {
     event.preventDefault();
     unlinkLibraryPanel(panel);
-    reportInteraction('dashboards_panelheader_unlinklibrarypanel_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'unlinkLibraryPanel' });
   };
 
   const onInspectPanel = (tab?: InspectTab) => {
@@ -74,7 +75,7 @@ export function getPanelMenu(
       inspect: panel.id,
       inspectTab: tab,
     });
-    reportInteraction('dashboards_panelheader_inspect_clicked', { tab: tab ?? InspectTab.Data });
+    reportInteraction('dashboards_panelheader_menu', { item: 'inspect', tab: tab ?? InspectTab.Data });
   };
 
   const onMore = (event: React.MouseEvent<any>) => {
@@ -84,19 +85,19 @@ export function getPanelMenu(
   const onDuplicatePanel = (event: React.MouseEvent<any>) => {
     event.preventDefault();
     duplicatePanel(dashboard, panel);
-    reportInteraction('dashboards_panelheader_duplicate_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'duplicate' });
   };
 
   const onCopyPanel = (event: React.MouseEvent<any>) => {
     event.preventDefault();
     copyPanel(panel);
-    reportInteraction('dashboards_panelheader_copy_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'copy' });
   };
 
   const onRemovePanel = (event: React.MouseEvent<any>) => {
     event.preventDefault();
     removePanel(dashboard, panel, true);
-    reportInteraction('dashboards_panelheader_remove_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'remove' });
   };
 
   const onNavigateToExplore = (event: React.MouseEvent<any>) => {
@@ -104,13 +105,13 @@ export function getPanelMenu(
     const openInNewWindow =
       event.ctrlKey || event.metaKey ? (url: string) => window.open(`${config.appSubUrl}${url}`) : undefined;
     store.dispatch(navigateToExplore(panel, { getDataSourceSrv, getTimeSrv, getExploreUrl, openInNewWindow }) as any);
-    reportInteraction('dashboards_panelheader_explore_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'explore' });
   };
 
   const onToggleLegend = (event: React.MouseEvent) => {
     event.preventDefault();
     toggleLegend(panel);
-    reportInteraction('dashboards_panelheader_togglelegend_clicked');
+    reportInteraction('dashboards_panelheader_menu', { item: 'toggleLegend' });
   };
 
   const menu: PanelMenuItem[] = [];

From 969ad1b4e0532032203a13aaeee0d2d41d56da95 Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Fri, 28 Apr 2023 12:23:48 +0200
Subject: [PATCH 512/729] Select: Don't show remove button on multi select if
 disabled (#67303)

---
 .../src/components/Select/SelectBase.test.tsx | 45 ++++++++++++++++++-
 .../src/components/Select/SelectBase.tsx      |  2 +-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/Select/SelectBase.test.tsx b/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
index 97d877616fd..f2b04373235 100644
--- a/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
@@ -9,7 +9,7 @@ import { selectOptionInTest } from '../../../../../public/test/helpers/selectOpt
 import { SelectBase } from './SelectBase';
 
 describe('SelectBase', () => {
-  const onChangeHandler = () => jest.fn();
+  const onChangeHandler = jest.fn();
   const options: Array<SelectableValue<number>> = [
     {
       label: 'Option 1',
@@ -218,4 +218,47 @@ describe('SelectBase', () => {
       expect(menuOptions).toHaveLength(2);
     });
   });
+
+  describe('Multi select', () => {
+    it('calls on change to remove an item when the user presses the remove button', async () => {
+      const value = [
+        {
+          label: 'Option 1',
+          value: 1,
+        },
+      ];
+      render(
+        <SelectBase onChange={onChangeHandler} options={options} isMulti={true} value={value} aria-label="My select" />
+      );
+
+      expect(screen.getByLabelText('My select')).toBeInTheDocument();
+
+      await userEvent.click(screen.getByLabelText('Remove Option 1'));
+      expect(onChangeHandler).toHaveBeenCalledWith([], {
+        action: 'remove-value',
+        name: undefined,
+        removedValue: { label: 'Option 1', value: 1 },
+      });
+    });
+    it('does not allow deleting selected values when disabled', async () => {
+      const value = [
+        {
+          label: 'Option 1',
+          value: 1,
+        },
+      ];
+      render(
+        <SelectBase
+          onChange={onChangeHandler}
+          options={options}
+          disabled
+          isMulti={true}
+          value={value}
+          aria-label="My select"
+        />
+      );
+
+      expect(screen.queryByLabelText('Remove Option 1')).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/packages/grafana-ui/src/components/Select/SelectBase.tsx b/packages/grafana-ui/src/components/Select/SelectBase.tsx
index 4b650d22394..eac330e6fb1 100644
--- a/packages/grafana-ui/src/components/Select/SelectBase.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectBase.tsx
@@ -357,7 +357,7 @@ export function SelectBase<T>({
           },
           SelectContainer,
           MultiValueContainer: MultiValueContainer,
-          MultiValueRemove: MultiValueRemove,
+          MultiValueRemove: !disabled ? MultiValueRemove : () => null,
           ...components,
         }}
         styles={selectStyles}

From cf82fafb534ac6dfefc4417df52dfe66ad9dd88f Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 28 Apr 2023 12:25:51 +0200
Subject: [PATCH 513/729] Loki: Update docs for show context (#67202)

* Loki: Update docs for show context

* Update docs/sources/datasources/loki/query-editor/index.md

Co-authored-by: Matias Chomicki <matyax@gmail.com>

* Update docs/sources/datasources/loki/query-editor/index.md

Co-authored-by: J Stickler <julie.stickler@grafana.com>

---------

Co-authored-by: Matias Chomicki <matyax@gmail.com>
Co-authored-by: J Stickler <julie.stickler@grafana.com>
---
 docs/sources/datasources/loki/query-editor/index.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/datasources/loki/query-editor/index.md b/docs/sources/datasources/loki/query-editor/index.md
index 58a573d29b5..e39a848685e 100644
--- a/docs/sources/datasources/loki/query-editor/index.md
+++ b/docs/sources/datasources/loki/query-editor/index.md
@@ -101,9 +101,9 @@ For more information about log queries and LogQL, refer to the [Loki log queries
 
 ### Show log context
 
-When using a search expression as detailed above, you can retrieve the context surrounding your filtered results.
-By clicking the `Show Context` link on the filtered rows, you'll be able to investigate the log messages that came before and after the
-log message you're interested in.
+In Explore, you can can retrieve the context surrounding your log results by clicking the `Show Context` button. You'll be able to investigate the logs from the same log stream that came before and after the log message you're interested in.
+
+The initial log context query is created from all labels defining the stream for the selected log line. You can use the log context query editor to widen the search by removing one or more of the label filters from log stream. Additionally, if you used a parser in your original query, you can refine your search by using extracted labels filters.
 
 ### Tail live logs
 

From 8b6160bc6610f96114eca7196c5d592c4896e02d Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Fri, 28 Apr 2023 12:38:14 +0200
Subject: [PATCH 514/729] Fix: Advanced DS picker search is case sensitive
 (#67420)

---
 .../components/picker/DataSourceDropdown.tsx  |  4 +-
 .../components/picker/DataSourceModal.tsx     |  3 +-
 .../components/picker/utils.test.ts           | 38 ++++++++++++++++++-
 .../datasources/components/picker/utils.ts    | 11 ++++++
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index 585c5665098..960c692faa0 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -16,7 +16,7 @@ import { DataSourceList } from './DataSourceList';
 import { DataSourceLogo, DataSourceLogoPlaceHolder } from './DataSourceLogo';
 import { DataSourceModal } from './DataSourceModal';
 import { PickerContentProps, DataSourceDropdownProps } from './types';
-import { dataSourceLabel } from './utils';
+import { dataSourceLabel, matchDataSourceWithSearch } from './utils';
 
 const INTERACTION_EVENT_NAME = 'dashboards_dspicker_clicked';
 const INTERACTION_ITEM = {
@@ -166,7 +166,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
           {...props}
           current={current}
           onChange={changeCallback}
-          filter={(ds) => ds.name.toLowerCase().includes(filterTerm?.toLowerCase() ?? '')}
+          filter={(ds) => matchDataSourceWithSearch(ds, filterTerm)}
         ></DataSourceList>
       </div>
 
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index 5d101c5b4c0..315f8a55aca 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -23,6 +23,7 @@ import { DATASOURCES_ROUTES } from 'app/features/datasources/constants';
 import { AccessControlAction } from 'app/types';
 
 import { DataSourceList } from './DataSourceList';
+import { matchDataSourceWithSearch } from './utils';
 
 const INTERACTION_EVENT_NAME = 'dashboards_dspickermodal_clicked';
 const INTERACTION_ITEM = {
@@ -107,7 +108,7 @@ export function DataSourceModal({
             dashboard={false}
             mixed={false}
             variables
-            filter={(ds) => ds.name.includes(search) && !ds.meta.builtIn}
+            filter={(ds) => matchDataSourceWithSearch(ds, search) && !ds.meta.builtIn}
             onChange={onChangeDataSource}
             current={current}
           />
diff --git a/public/app/features/datasources/components/picker/utils.test.ts b/public/app/features/datasources/components/picker/utils.test.ts
index 163ca0f371f..3bd97048735 100644
--- a/public/app/features/datasources/components/picker/utils.test.ts
+++ b/public/app/features/datasources/components/picker/utils.test.ts
@@ -1,6 +1,6 @@
 import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
 
-import { isDataSourceMatch, getDataSourceCompareFn } from './utils';
+import { isDataSourceMatch, getDataSourceCompareFn, matchDataSourceWithSearch } from './utils';
 
 describe('isDataSourceMatch', () => {
   const dataSourceInstanceSettings = { uid: 'a' } as DataSourceInstanceSettings;
@@ -93,3 +93,39 @@ describe('getDataSouceCompareFn', () => {
     ] as DataSourceInstanceSettings[]);
   });
 });
+
+describe('matchDataSourceWithSearch', () => {
+  let dataSource: DataSourceInstanceSettings;
+
+  beforeEach(() => {
+    dataSource = {
+      name: 'My SQL DB',
+    } as DataSourceInstanceSettings;
+  });
+
+  it('should return true when the search term matches the data source name', () => {
+    const searchTerm = 'My SQL';
+    expect(matchDataSourceWithSearch(dataSource, searchTerm)).toBe(true);
+  });
+
+  it('should return true when the search term matches part of the data source name', () => {
+    const searchTerm = 'SQL';
+    expect(matchDataSourceWithSearch(dataSource, searchTerm)).toBe(true);
+  });
+
+  it('should return false when the search term does not match the data source name', () => {
+    const searchTerm = 'Oracle';
+    expect(matchDataSourceWithSearch(dataSource, searchTerm)).toBe(false);
+  });
+
+  it('should return true when the search term is empty', () => {
+    const searchTerm = '';
+    expect(matchDataSourceWithSearch(dataSource, searchTerm)).toBe(true);
+  });
+
+  it('should ignore case when matching the search term', () => {
+    dataSource.name = 'PostgreSQL DB';
+    const searchTerm = 'postgre';
+    expect(matchDataSourceWithSearch(dataSource, searchTerm)).toBe(true);
+  });
+});
diff --git a/public/app/features/datasources/components/picker/utils.ts b/public/app/features/datasources/components/picker/utils.ts
index fdca19ecf15..96edb7e5de6 100644
--- a/public/app/features/datasources/components/picker/utils.ts
+++ b/public/app/features/datasources/components/picker/utils.ts
@@ -87,3 +87,14 @@ export function getDataSourceCompareFn(
 
   return cmpDataSources;
 }
+
+/**
+ * Given a data source and a search term, returns true if the data source matches the search term.
+ * Useful to filter data sources by name containing an string.
+ * @param ds
+ * @param searchTerm
+ * @returns
+ */
+export function matchDataSourceWithSearch(ds: DataSourceInstanceSettings, searchTerm = '') {
+  return ds.name.toLowerCase().includes(searchTerm.toLowerCase());
+}

From 533f8caafd8a9ec0bddaed5489ce73a55e3f7aff Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Fri, 28 Apr 2023 11:48:26 +0100
Subject: [PATCH 515/729] SAML: change the config option for making SAML UI
 accessible to org Admins (#67399)

* change from role grant overrides to SAML UI specific config option

* update permissions needed to access SAML UI

* PR feedback: change config name, change required perms to write, add a comment
---
 pkg/api/api.go                                |  3 +-
 pkg/services/accesscontrol/acimpl/service.go  | 18 +----
 .../accesscontrol/acimpl/service_test.go      | 71 -------------------
 pkg/services/accesscontrol/models.go          |  5 +-
 pkg/services/accesscontrol/roles.go           | 14 ++--
 pkg/services/navtree/navtreeimpl/admin.go     |  2 -
 pkg/setting/setting.go                        | 19 ++---
 public/app/routes/routes.tsx                  |  1 +
 8 files changed, 22 insertions(+), 111 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index e72f7c8768a..b2b18d19fbb 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -225,7 +225,8 @@ func (hs *HTTPServer) registerRoutes() {
 	}
 
 	if hs.License.FeatureEnabled("saml") && hs.Features.IsEnabled(featuremgmt.FlagAuthenticationConfigUI) {
-		r.Get("/admin/authentication/", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)), hs.Index)
+		// TODO change the scope when we extend the auth UI to more providers
+		r.Get("/admin/authentication/", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsSAML)), hs.Index)
 	}
 
 	// authed api
diff --git a/pkg/services/accesscontrol/acimpl/service.go b/pkg/services/accesscontrol/acimpl/service.go
index 0ce0c6ba672..9c64d8a9257 100644
--- a/pkg/services/accesscontrol/acimpl/service.go
+++ b/pkg/services/accesscontrol/acimpl/service.go
@@ -36,7 +36,7 @@ func ProvideService(cfg *setting.Cfg, store db.DB, routeRegister routing.RouteRe
 
 	if !accesscontrol.IsDisabled(cfg) {
 		api.NewAccessControlAPI(routeRegister, accessControl, service, features).RegisterAPIEndpoints()
-		if err := accesscontrol.DeclareFixedRoles(service); err != nil {
+		if err := accesscontrol.DeclareFixedRoles(service, cfg); err != nil {
 			return nil, err
 		}
 	}
@@ -166,12 +166,7 @@ func (s *Service) DeclareFixedRoles(registrations ...accesscontrol.RoleRegistrat
 		return nil
 	}
 
-	for i := range registrations {
-		r := registrations[i]
-		if r.AllowGrantsOverride {
-			s.handleGrantOverrides(&r)
-		}
-
+	for _, r := range registrations {
 		err := accesscontrol.ValidateFixedRole(r.Role)
 		if err != nil {
 			return err
@@ -188,15 +183,6 @@ func (s *Service) DeclareFixedRoles(registrations ...accesscontrol.RoleRegistrat
 	return nil
 }
 
-func (s *Service) handleGrantOverrides(r *accesscontrol.RoleRegistration) {
-	// Replace ":" and "." with "_" to match the key in the config
-	key := strings.ReplaceAll(strings.ReplaceAll(r.Role.Name, ":", "_"), ".", "_")
-	if overrides, ok := s.cfg.RBACGrantOverrides[key]; ok {
-		r.Grants = overrides
-		s.log.Info("Overriding grants for role", "role", r.Role.Name, "overrides", overrides)
-	}
-}
-
 // RegisterFixedRoles registers all declared roles in RAM
 func (s *Service) RegisterFixedRoles(ctx context.Context) error {
 	// If accesscontrol is disabled no need to register roles
diff --git a/pkg/services/accesscontrol/acimpl/service_test.go b/pkg/services/accesscontrol/acimpl/service_test.go
index c6babb34fec..06ab9b18d3d 100644
--- a/pkg/services/accesscontrol/acimpl/service_test.go
+++ b/pkg/services/accesscontrol/acimpl/service_test.go
@@ -161,77 +161,6 @@ func TestService_DeclareFixedRoles(t *testing.T) {
 	}
 }
 
-func TestService_DeclareFixedRoles_Overrides(t *testing.T) {
-	tests := []struct {
-		name         string
-		registration accesscontrol.RoleRegistration
-		overrides    map[string][]string
-		wantGrants   []string
-		wantErr      bool
-	}{
-		{
-			name: "no grant override",
-			registration: accesscontrol.RoleRegistration{
-				Role:                accesscontrol.RoleDTO{Name: "fixed:test:test"},
-				Grants:              []string{"Admin"},
-				AllowGrantsOverride: true,
-			},
-			wantGrants: []string{"Admin"},
-			wantErr:    false,
-		},
-		{
-			name: "should account for grant overrides",
-			registration: accesscontrol.RoleRegistration{
-				Role:                accesscontrol.RoleDTO{Name: "fixed:test:test"},
-				Grants:              []string{"Admin"},
-				AllowGrantsOverride: true,
-			},
-			overrides:  map[string][]string{"fixed_test_test": {"Viewer", "Grafana Admin"}},
-			wantGrants: []string{"Viewer", "Grafana Admin"},
-			wantErr:    false,
-		},
-		{
-			name: "should not account for grant overrides",
-			registration: accesscontrol.RoleRegistration{
-				Role:                accesscontrol.RoleDTO{Name: "fixed:test:test"},
-				Grants:              []string{"Admin"},
-				AllowGrantsOverride: false,
-			},
-			overrides:  map[string][]string{"fixed_test_test": {"Viewer", "Grafana Admin"}},
-			wantGrants: []string{"Admin"},
-			wantErr:    false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ac := setupTestEnv(t)
-
-			// Reset the registations
-			ac.registrations = accesscontrol.RegistrationList{}
-			ac.cfg.RBACGrantOverrides = tt.overrides
-
-			// Test
-			err := ac.DeclareFixedRoles(tt.registration)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			registrationCnt := 0
-			grants := []string{}
-			ac.registrations.Range(func(registration accesscontrol.RoleRegistration) bool {
-				registrationCnt++
-				grants = registration.Grants
-				return true
-			})
-			require.Equal(t, 1, registrationCnt,
-				"expected service registration list to contain the registration")
-			require.ElementsMatch(t, tt.wantGrants, grants)
-		})
-	}
-}
-
 func TestService_DeclarePluginRoles(t *testing.T) {
 	tests := []struct {
 		name          string
diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index 0810a34e20c..ea688c67635 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -16,9 +16,8 @@ var ErrInternal = errutil.NewBase(errutil.StatusInternal, "accesscontrol.interna
 // RoleRegistration stores a role and its assignments to built-in roles
 // (Viewer, Editor, Admin, Grafana Admin)
 type RoleRegistration struct {
-	Role                RoleDTO
-	Grants              []string
-	AllowGrantsOverride bool
+	Role   RoleDTO
+	Grants []string
 }
 
 // Role is the model for Role in RBAC.
diff --git a/pkg/services/accesscontrol/roles.go b/pkg/services/accesscontrol/roles.go
index c9dc935fe04..03c6e25b69d 100644
--- a/pkg/services/accesscontrol/roles.go
+++ b/pkg/services/accesscontrol/roles.go
@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 // Roles definition
@@ -191,7 +192,7 @@ var (
 )
 
 // Declare OSS roles to the accesscontrol service
-func DeclareFixedRoles(service Service) error {
+func DeclareFixedRoles(service Service, cfg *setting.Cfg) error {
 	ldapReader := RoleRegistration{
 		Role:   ldapReaderRole,
 		Grants: []string{RoleGrafanaAdmin},
@@ -224,10 +225,15 @@ func DeclareFixedRoles(service Service) error {
 		Role:   usersWriterRole,
 		Grants: []string{RoleGrafanaAdmin},
 	}
+
+	// TODO: Move to own service when implemented
 	authenticationConfigWriter := RoleRegistration{
-		Role:                authenticationConfigWriterRole,
-		Grants:              []string{RoleGrafanaAdmin},
-		AllowGrantsOverride: true,
+		Role:   authenticationConfigWriterRole,
+		Grants: []string{RoleGrafanaAdmin},
+	}
+
+	if cfg.AuthConfigUIAdminAccess {
+		authenticationConfigWriter.Grants = append(authenticationConfigWriter.Grants, string(org.RoleAdmin))
 	}
 
 	return service.DeclareFixedRoles(ldapReader, ldapWriter, orgUsersReader, orgUsersWriter,
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index 5b8a9e398c9..5ffccdcc6a3 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -163,9 +163,7 @@ func enableServiceAccount(s *ServiceImpl, c *contextmodel.ReqContext) bool {
 
 func evalAuthenticationSettings() ac.Evaluator {
 	return ac.EvalAll(
-		ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsAuth),
 		ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsSAML),
-		ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAuth),
 		ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsSAML),
 	)
 }
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 99525b50361..e8bc06baf85 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -269,6 +269,9 @@ type Cfg struct {
 	AdminEmail                   string
 	DisableSyncLock              bool
 	DisableLoginForm             bool
+	// Not documented & not supported
+	// stand in until a more complete solution is implemented
+	AuthConfigUIAdminAccess bool
 
 	// AWS Plugin Auth
 	AWSAllowedAuthProviders []string
@@ -509,8 +512,6 @@ type Cfg struct {
 	RBACPermissionValidationEnabled bool
 	// Reset basic roles permissions on start-up
 	RBACResetBasicRoles bool
-	// Override default fixed role assignments
-	RBACGrantOverrides map[string][]string
 
 	// GRPC Server.
 	GRPCServerNetwork   string
@@ -1459,7 +1460,8 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
 
 	// Debug setting unlocking frontend auth sync lock. Users will still be reset on their next login.
 	cfg.DisableSyncLock = auth.Key("disable_sync_lock").MustBool(false)
-
+	// Do not use
+	cfg.AuthConfigUIAdminAccess = auth.Key("config_ui_admin_access").MustBool(false)
 	cfg.DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
 	DisableSignoutMenu = auth.Key("disable_signout_menu").MustBool(false)
 
@@ -1567,17 +1569,6 @@ func readAccessControlSettings(iniFile *ini.File, cfg *Cfg) {
 	cfg.RBACPermissionCache = rbac.Key("permission_cache").MustBool(true)
 	cfg.RBACPermissionValidationEnabled = rbac.Key("permission_validation_enabled").MustBool(false)
 	cfg.RBACResetBasicRoles = rbac.Key("reset_basic_roles").MustBool(false)
-
-	rbacOverrides := iniFile.Section("rbac.overrides")
-	cfg.RBACGrantOverrides = map[string][]string{}
-	for _, key := range rbacOverrides.Keys() {
-		value := key.MustString("")
-		grants := strings.Split(value, ",")
-		for i, grant := range grants {
-			grants[i] = strings.TrimSpace(grant)
-		}
-		cfg.RBACGrantOverrides[key.Name()] = grants
-	}
 }
 
 func readUserSettings(iniFile *ini.File, cfg *Cfg) error {
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index 436672c7152..edcbe8488bd 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -309,6 +309,7 @@ export function getAppRoutes(): RouteDescriptor[] {
     // ADMIN
     {
       path: '/admin/authentication',
+      roles: () => contextSrv.evaluatePermission(() => ['Admin', 'ServerAdmin'], [AccessControlAction.SettingsWrite]),
       component:
         config.featureToggles.authenticationConfigUI && config.licenseInfo.enabledFeatures?.saml
           ? SafeDynamicImport(

From b5fbce50b3909540d44020176e2ef058662c85ed Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Fri, 28 Apr 2023 12:50:29 +0200
Subject: [PATCH 516/729] Alerting:Fix alert panel not rendering correct number
 for cloud rules instances (#67487)

Fix alert panel not rendering correct number for cloud rules instances
---
 public/app/plugins/panel/alertlist/AlertInstances.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/alertlist/AlertInstances.tsx b/public/app/plugins/panel/alertlist/AlertInstances.tsx
index 7437268bcad..85c40fd22b3 100644
--- a/public/app/plugins/panel/alertlist/AlertInstances.tsx
+++ b/public/app/plugins/panel/alertlist/AlertInstances.tsx
@@ -80,7 +80,10 @@ export const AlertInstances = ({
     handleInstancesLimit(true);
     setDisplayInstances(true);
   };
-  const totalInstancesNumber = limitInstances ? grafanaFilteredInstancesTotal : filteredAlerts.length;
+  const totalInstancesGrafana = limitInstances ? grafanaFilteredInstancesTotal : filteredAlerts.length;
+  const totalInstancesNotGrafana = filteredAlerts.length;
+  const totalInstancesNumber = isGrafanaAlert ? totalInstancesGrafana : totalInstancesNotGrafana;
+
   const limitStatus = limitInstances
     ? `Showing ${INSTANCES_DISPLAY_LIMIT} of ${grafanaTotalInstances} instances`
     : `Showing all ${grafanaTotalInstances} instances`;

From 4cbda914bdcddd503bcdf1de32fe7358bfe9e392 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Fri, 28 Apr 2023 14:02:27 +0200
Subject: [PATCH 517/729] Plugins: Refactor call resource API handling (#67234)

Moving call resource API stream handling within plugin management as a utility/wrapper.

Closes #66889

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
---
 pkg/api/plugin_resource.go                    | 134 +-------------
 pkg/api/plugin_resource_test.go               |   3 +
 .../http_response_sender.go                   |  65 +++++++
 .../http_response_sender_test.go              |  45 +++++
 .../resource_response_middleware.go           |   4 +
 .../backendplugin/backendplugin_test.go       | 170 ++++++++++++++----
 6 files changed, 252 insertions(+), 169 deletions(-)
 create mode 100644 pkg/plugins/httpresponsesender/http_response_sender.go
 create mode 100644 pkg/plugins/httpresponsesender/http_response_sender_test.go

diff --git a/pkg/api/plugin_resource.go b/pkg/api/plugin_resource.go
index 89bb1884da3..d079f9415c6 100644
--- a/pkg/api/plugin_resource.go
+++ b/pkg/api/plugin_resource.go
@@ -1,18 +1,16 @@
 package api
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
-	"net/textproto"
 	"net/url"
-	"sync"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
+	"github.com/grafana/grafana/pkg/plugins/httpresponsesender"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/util/proxyutil"
@@ -113,80 +111,8 @@ func (hs *HTTPServer) makePluginResourceRequest(w http.ResponseWriter, req *http
 		Body:          body,
 	}
 
-	childCtx, cancel := context.WithCancel(req.Context())
-	defer cancel()
-	stream := newCallResourceResponseStream(childCtx)
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	defer func() {
-		if err := stream.Close(); err != nil {
-			hs.log.Warn("Failed to close plugin resource stream", "err", err)
-		}
-		wg.Wait()
-	}()
-
-	var flushStreamErr error
-	go func() {
-		flushStreamErr = hs.flushStream(stream, w)
-		wg.Done()
-	}()
-
-	if err := hs.pluginClient.CallResource(req.Context(), crReq, stream); err != nil {
-		return err
-	}
-
-	return flushStreamErr
-}
-
-func (hs *HTTPServer) flushStream(stream callResourceClientResponseStream, w http.ResponseWriter) error {
-	processedStreams := 0
-	for {
-		resp, err := stream.Recv()
-		if errors.Is(err, io.EOF) {
-			if processedStreams == 0 {
-				return errors.New("received empty resource response")
-			}
-			return nil
-		}
-		if err != nil {
-			if processedStreams == 0 {
-				return fmt.Errorf("%v: %w", "failed to receive response from resource call", err)
-			}
-
-			hs.log.Error("Failed to receive response from resource call", "err", err)
-			return stream.Close()
-		}
-
-		// Expected that headers and status are only part of first stream
-		if processedStreams == 0 {
-			for k, values := range resp.Headers {
-				// Convert the keys to the canonical format of MIME headers.
-				// This ensures that we can safely add/overwrite headers
-				// even if the plugin returns them in non-canonical format
-				// and be sure they won't be present multiple times in the response.
-				k = textproto.CanonicalMIMEHeaderKey(k)
-
-				for _, v := range values {
-					// TODO: Figure out if we should use Set here instead
-					// nolint:gocritic
-					w.Header().Add(k, v)
-				}
-			}
-
-			w.WriteHeader(resp.Status)
-		}
-
-		if _, err := w.Write(resp.Body); err != nil {
-			hs.log.Error("Failed to write resource response", "err", err)
-		}
-
-		if flusher, ok := w.(http.Flusher); ok {
-			flusher.Flush()
-		}
-		processedStreams++
-	}
+	httpSender := httpresponsesender.New(w)
+	return hs.pluginClient.CallResource(req.Context(), crReq, httpSender)
 }
 
 func handleCallResourceError(err error, reqCtx *contextmodel.ReqContext) {
@@ -202,57 +128,3 @@ func handleCallResourceError(err error, reqCtx *contextmodel.ReqContext) {
 
 	reqCtx.JsonApiErr(500, "Failed to call resource", err)
 }
-
-// callResourceClientResponseStream is used for receiving resource call responses.
-type callResourceClientResponseStream interface {
-	Recv() (*backend.CallResourceResponse, error)
-	Close() error
-}
-
-type callResourceResponseStream struct {
-	ctx    context.Context
-	stream chan *backend.CallResourceResponse
-	closed bool
-}
-
-func newCallResourceResponseStream(ctx context.Context) *callResourceResponseStream {
-	return &callResourceResponseStream{
-		ctx:    ctx,
-		stream: make(chan *backend.CallResourceResponse),
-	}
-}
-
-func (s *callResourceResponseStream) Send(res *backend.CallResourceResponse) error {
-	if s.closed {
-		return errors.New("cannot send to a closed stream")
-	}
-
-	select {
-	case <-s.ctx.Done():
-		return errors.New("cancelled")
-	case s.stream <- res:
-		return nil
-	}
-}
-
-func (s *callResourceResponseStream) Recv() (*backend.CallResourceResponse, error) {
-	select {
-	case <-s.ctx.Done():
-		return nil, s.ctx.Err()
-	case res, ok := <-s.stream:
-		if !ok {
-			return nil, io.EOF
-		}
-		return res, nil
-	}
-}
-
-func (s *callResourceResponseStream) Close() error {
-	if s.closed {
-		return errors.New("cannot close a closed stream")
-	}
-
-	close(s.stream)
-	s.closed = true
-	return nil
-}
diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index f9f0f9f741e..de24f3f852c 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/localcache"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
@@ -79,6 +80,7 @@ func TestCallResource(t *testing.T) {
 		hs.QuotaService = quotatest.New(false, nil)
 		hs.pluginStore = ps
 		hs.pluginClient = pluginClient.ProvideService(reg, pCfg)
+		hs.log = log.New("test")
 	})
 
 	t.Run("Test successful response is received for valid request", func(t *testing.T) {
@@ -117,6 +119,7 @@ func TestCallResource(t *testing.T) {
 		hs.QuotaService = quotatest.New(false, nil)
 		hs.pluginStore = ps
 		hs.pluginClient = pc
+		hs.log = log.New("test")
 	})
 
 	t.Run("Test error is properly propagated to API response", func(t *testing.T) {
diff --git a/pkg/plugins/httpresponsesender/http_response_sender.go b/pkg/plugins/httpresponsesender/http_response_sender.go
new file mode 100644
index 00000000000..6d6fa1613c5
--- /dev/null
+++ b/pkg/plugins/httpresponsesender/http_response_sender.go
@@ -0,0 +1,65 @@
+package httpresponsesender
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"net/textproto"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+)
+
+// HTTPResponseSender implements backend.CallResourceResponseSender and
+// writes an HTTP response using an http.ResponseWriter given received
+// backend.CallResourceResponse(s).
+type HTTPResponseSender struct {
+	processedStreams int
+	w                http.ResponseWriter
+}
+
+// New creates a new HTTPResponseSender.
+func New(w http.ResponseWriter) *HTTPResponseSender {
+	if w == nil {
+		panic("response writer cannot be nil")
+	}
+
+	return &HTTPResponseSender{
+		w: w,
+	}
+}
+
+func (s *HTTPResponseSender) Send(resp *backend.CallResourceResponse) error {
+	if resp == nil {
+		return errors.New("resp cannot be nil")
+	}
+
+	// Expected that headers and status are only part of first stream
+	if s.processedStreams == 0 {
+		for k, values := range resp.Headers {
+			// Convert the keys to the canonical format of MIME headers.
+			// This ensures that we can safely add/overwrite headers
+			// even if the plugin returns them in non-canonical format
+			// and be sure they won't be present multiple times in the response.
+			k = textproto.CanonicalMIMEHeaderKey(k)
+
+			for _, v := range values {
+				s.w.Header().Add(k, v)
+			}
+		}
+
+		s.w.WriteHeader(resp.Status)
+	}
+
+	if _, err := s.w.Write(resp.Body); err != nil {
+		return fmt.Errorf("failed to write resource response: %v", err)
+	}
+
+	if flusher, ok := s.w.(http.Flusher); ok {
+		flusher.Flush()
+	}
+
+	s.processedStreams++
+	return nil
+}
+
+var _ backend.CallResourceResponseSender = &HTTPResponseSender{}
diff --git a/pkg/plugins/httpresponsesender/http_response_sender_test.go b/pkg/plugins/httpresponsesender/http_response_sender_test.go
new file mode 100644
index 00000000000..ee251f44208
--- /dev/null
+++ b/pkg/plugins/httpresponsesender/http_response_sender_test.go
@@ -0,0 +1,45 @@
+package httpresponsesender
+
+import (
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHTTPResponseSender(t *testing.T) {
+	w := httptest.NewRecorder()
+	sender := New(w)
+	require.NotNil(t, sender)
+
+	headers := http.Header{}
+	headers.Add("X-Custom", "custom")
+	err := sender.Send(&backend.CallResourceResponse{
+		Status:  http.StatusOK,
+		Headers: headers,
+		Body:    []byte("Hello world"),
+	})
+	require.NoError(t, err)
+
+	headers2 := http.Header{}
+	headers2.Add("X-Custom-Two", "custom two")
+	err = sender.Send(&backend.CallResourceResponse{
+		Status:  http.StatusNotFound,
+		Headers: headers2,
+		Body:    []byte("Hello world again"),
+	})
+	require.NoError(t, err)
+
+	resp := w.Result()
+	require.NotNil(t, resp)
+	require.Equal(t, http.StatusOK, resp.StatusCode)
+	require.Equal(t, "custom", resp.Header.Get("X-Custom"))
+	require.Empty(t, resp.Header.Get("X-Custom-Two"))
+	bytes, err := io.ReadAll(resp.Body)
+	require.NoError(t, resp.Body.Close())
+	require.NoError(t, err)
+	require.Equal(t, "Hello worldHello world again", string(bytes))
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware.go
index 31d3095a4a7..756821a93c8 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/resource_response_middleware.go
@@ -34,6 +34,10 @@ func (m *ResourceResponseMiddleware) CallResource(ctx context.Context, req *back
 	processedStreams := 0
 	wrappedSender := callResourceResponseSenderFunc(func(res *backend.CallResourceResponse) error {
 		if processedStreams == 0 {
+			if res.Headers == nil {
+				res.Headers = map[string][]string{}
+			}
+
 			proxyutil.SetProxyResponseHeaders(res.Headers)
 		}
 
diff --git a/pkg/tests/api/plugins/backendplugin/backendplugin_test.go b/pkg/tests/api/plugins/backendplugin/backendplugin_test.go
index 18a6f8399a3..95caa2c95be 100644
--- a/pkg/tests/api/plugins/backendplugin/backendplugin_test.go
+++ b/pkg/tests/api/plugins/backendplugin/backendplugin_test.go
@@ -66,10 +66,15 @@ func TestIntegrationBackendPlugins(t *testing.T) {
 				verify(pReq)
 			})
 
-			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest) {
+			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest, resp *http.Response) {
 				verify(pReq)
 				require.Equal(t, "custom", pReq.GetHTTPHeader("X-Custom"))
 				require.Equal(t, "custom", tsCtx.outgoingRequest.Header.Get("X-Custom"))
+				require.Equal(t, "should not be deleted", resp.Header.Get("X-Custom"))
+				require.Equal(t, http.StatusOK, resp.StatusCode)
+
+				// default content type set if not provided
+				require.Equal(t, "application/json", resp.Header.Get("Content-Type"))
 			})
 
 			verifyQueryData := func(pReq *backend.QueryDataRequest) {
@@ -119,8 +124,14 @@ func TestIntegrationBackendPlugins(t *testing.T) {
 				verify(pReq)
 			})
 
-			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest) {
+			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest, resp *http.Response) {
 				verify(pReq)
+
+				require.Equal(t, "should not be deleted", resp.Header.Get("X-Custom"))
+				require.Equal(t, http.StatusOK, resp.StatusCode)
+
+				// default content type set if not provided
+				require.Equal(t, "application/json", resp.Header.Get("Content-Type"))
 			})
 
 			verifyQueryData := func(pReq *backend.QueryDataRequest) {
@@ -161,8 +172,14 @@ func TestIntegrationBackendPlugins(t *testing.T) {
 				verify(pReq)
 			})
 
-			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest) {
+			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest, resp *http.Response) {
 				verify(pReq)
+
+				require.Equal(t, "should not be deleted", resp.Header.Get("X-Custom"))
+				require.Equal(t, http.StatusOK, resp.StatusCode)
+
+				// default content type set if not provided
+				require.Equal(t, "application/json", resp.Header.Get("Content-Type"))
 			})
 
 			verifyQueryData := func(pReq *backend.QueryDataRequest) {
@@ -177,24 +194,94 @@ func TestIntegrationBackendPlugins(t *testing.T) {
 				})
 			})
 		})
+
+	newTestScenario(t, "Datasource with resource returning non-default content-type should not be kept",
+		options(
+			withCallResourceResponse(func(sender backend.CallResourceResponseSender) error {
+				return sender.Send(&backend.CallResourceResponse{
+					Status: http.StatusOK,
+					Headers: map[string][]string{
+						"Content-Type":   {"text/plain"},
+						"Content-Length": {"5"},
+					},
+					Body: []byte("hello"),
+				})
+			}),
+		),
+		func(t *testing.T, tsCtx *testScenarioContext) {
+			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest, resp *http.Response) {
+				require.Equal(t, "text/plain", resp.Header.Get("Content-Type"))
+				require.Equal(t, http.StatusOK, resp.StatusCode)
+				require.Equal(t, int64(5), resp.ContentLength)
+				require.Empty(t, resp.TransferEncoding)
+			})
+		})
+
+	newTestScenario(t, "Datasource with resource returning 204 (no content) status should not set content-type header",
+		options(
+			withCallResourceResponse(func(sender backend.CallResourceResponseSender) error {
+				return sender.Send(&backend.CallResourceResponse{
+					Status: http.StatusNoContent,
+				})
+			}),
+		),
+		func(t *testing.T, tsCtx *testScenarioContext) {
+			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest, resp *http.Response) {
+				require.Empty(t, resp.Header.Get("Content-Type"))
+				require.Equal(t, http.StatusNoContent, resp.StatusCode)
+			})
+		})
+
+	newTestScenario(t, "Datasource with resource returning streaming content should return chunked transfer encoding",
+		options(
+			withCallResourceResponse(func(sender backend.CallResourceResponseSender) error {
+				err := sender.Send(&backend.CallResourceResponse{
+					Status: http.StatusOK,
+					Headers: map[string][]string{
+						"Content-Type": {"text/plain"},
+					},
+					Body: []byte("msg 1\r\n"),
+				})
+
+				if err != nil {
+					return err
+				}
+
+				return sender.Send(&backend.CallResourceResponse{
+					Body: []byte("msg 2\r\n"),
+				})
+			}),
+		),
+		func(t *testing.T, tsCtx *testScenarioContext) {
+			tsCtx.runCallResourceTest(t, func(pReq *backend.CallResourceRequest, resp *http.Response) {
+				require.Equal(t, "text/plain", resp.Header.Get("Content-Type"))
+				require.Equal(t, http.StatusOK, resp.StatusCode)
+				require.Equal(t, []string{"chunked"}, resp.TransferEncoding)
+				bytes, err := io.ReadAll(resp.Body)
+				require.NoError(t, err)
+				require.Equal(t, "msg 1\r\nmsg 2\r\n", string(bytes))
+			})
+		})
 }
 
 type testScenarioContext struct {
-	testPluginID          string
-	uid                   string
-	grafanaListeningAddr  string
-	testEnv               *server.TestEnv
-	outgoingServer        *httptest.Server
-	outgoingRequest       *http.Request
-	backendTestPlugin     *testPlugin
-	rt                    http.RoundTripper
-	modifyIncomingRequest func(req *http.Request)
+	testPluginID               string
+	uid                        string
+	grafanaListeningAddr       string
+	testEnv                    *server.TestEnv
+	outgoingServer             *httptest.Server
+	outgoingRequest            *http.Request
+	backendTestPlugin          *testPlugin
+	rt                         http.RoundTripper
+	modifyIncomingRequest      func(req *http.Request)
+	modifyCallResourceResponse func(sender backend.CallResourceResponseSender) error
 }
 
 type testScenarioInput struct {
-	ds                    *datasources.AddDataSourceCommand
-	token                 *oauth2.Token
-	modifyIncomingRequest func(req *http.Request)
+	ds                         *datasources.AddDataSourceCommand
+	token                      *oauth2.Token
+	modifyIncomingRequest      func(req *http.Request)
+	modifyCallResourceResponse func(sender backend.CallResourceResponseSender) error
 }
 
 type testScenarioOption func(*testScenarioInput)
@@ -246,6 +333,12 @@ func withDsCookieForwarding(names []string) testScenarioOption {
 	}
 }
 
+func withCallResourceResponse(cb func(sender backend.CallResourceResponseSender) error) testScenarioOption {
+	return func(in *testScenarioInput) {
+		in.modifyCallResourceResponse = cb
+	}
+}
+
 func newTestScenario(t *testing.T, name string, opts []testScenarioOption, callback func(t *testing.T, ctx *testScenarioContext)) {
 	tsCtx := testScenarioContext{
 		testPluginID: "test-plugin",
@@ -300,6 +393,26 @@ func newTestScenario(t *testing.T, name string, opts []testScenarioOption, callb
 	}
 
 	tsCtx.modifyIncomingRequest = in.modifyIncomingRequest
+
+	if in.modifyCallResourceResponse == nil {
+		in.modifyCallResourceResponse = func(sender backend.CallResourceResponseSender) error {
+			responseHeaders := map[string][]string{
+				"Connection":       {"close, TE"},
+				"Te":               {"foo", "bar, trailers"},
+				"Proxy-Connection": {"should be deleted"},
+				"Upgrade":          {"foo"},
+				"Set-Cookie":       {"should be deleted"},
+				"X-Custom":         {"should not be deleted"},
+			}
+
+			return sender.Send(&backend.CallResourceResponse{
+				Status:  http.StatusOK,
+				Headers: responseHeaders,
+			})
+		}
+	}
+
+	tsCtx.modifyCallResourceResponse = in.modifyCallResourceResponse
 	tsCtx.testEnv.OAuthTokenService.Token = in.token
 
 	_, err = testEnv.Server.HTTPServer.DataSourcesService.AddDataSource(ctx, cmd)
@@ -476,7 +589,7 @@ func (tsCtx *testScenarioContext) runCheckHealthTest(t *testing.T, callback func
 	})
 }
 
-func (tsCtx *testScenarioContext) runCallResourceTest(t *testing.T, callback func(req *backend.CallResourceRequest)) {
+func (tsCtx *testScenarioContext) runCallResourceTest(t *testing.T, callback func(req *backend.CallResourceRequest, resp *http.Response)) {
 	t.Run("When calling /api/datasources/uid/:uid/resources should set expected headers on outgoing CallResource and HTTP request", func(t *testing.T) {
 		var received *backend.CallResourceRequest
 		tsCtx.backendTestPlugin.CallResourceHandler = backend.CallResourceHandlerFunc(func(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
@@ -508,21 +621,7 @@ func (tsCtx *testScenarioContext) runCallResourceTest(t *testing.T, callback fun
 				tsCtx.testEnv.Server.HTTPServer.Cfg.Logger.Error("Failed to discard body", "error", err)
 			}
 
-			responseHeaders := map[string][]string{
-				"Connection":       {"close, TE"},
-				"Te":               {"foo", "bar, trailers"},
-				"Proxy-Connection": {"should be deleted"},
-				"Upgrade":          {"foo"},
-				"Set-Cookie":       {"should be deleted"},
-				"X-Custom":         {"should not be deleted"},
-			}
-
-			err = sender.Send(&backend.CallResourceResponse{
-				Status:  http.StatusOK,
-				Headers: responseHeaders,
-			})
-
-			return err
+			return tsCtx.modifyCallResourceResponse(sender)
 		})
 
 		u := fmt.Sprintf("http://admin:admin@%s/api/datasources/uid/%s/resources", tsCtx.grafanaListeningAddr, tsCtx.uid)
@@ -541,22 +640,17 @@ func (tsCtx *testScenarioContext) runCallResourceTest(t *testing.T, callback fun
 		require.NoError(t, err)
 		resp, err := http.DefaultClient.Do(req)
 		require.NoError(t, err)
-		b, err := io.ReadAll(resp.Body)
-		require.NoError(t, err)
-		require.Equal(t, http.StatusOK, resp.StatusCode, string(b))
 		t.Cleanup(func() {
 			err := resp.Body.Close()
 			require.NoError(t, err)
 		})
-		_, err = io.ReadAll(resp.Body)
-		require.NoError(t, err)
 
 		require.Empty(t, resp.Header.Get("Connection"))
 		require.Empty(t, resp.Header.Get("Te"))
 		require.Empty(t, resp.Header.Get("Proxy-Connection"))
 		require.Empty(t, resp.Header.Get("Upgrade"))
 		require.Empty(t, resp.Header.Get("Set-Cookie"))
-		require.Equal(t, "should not be deleted", resp.Header.Get("X-Custom"))
+		require.Equal(t, "sandbox", resp.Header.Get("Content-Security-Policy"))
 
 		require.NotNil(t, received)
 		require.Empty(t, received.Headers["Connection"])
@@ -569,7 +663,7 @@ func (tsCtx *testScenarioContext) runCallResourceTest(t *testing.T, callback fun
 		require.NotEmpty(t, tsCtx.outgoingRequest.Header.Get("Accept-Encoding"))
 		require.Equal(t, fmt.Sprintf("Grafana/%s", tsCtx.testEnv.SQLStore.Cfg.BuildVersion), tsCtx.outgoingRequest.Header.Get("User-Agent"))
 
-		callback(received)
+		callback(received, resp)
 	})
 }
 

From c4716918f21590868ba1241fb3a0d5520daee658 Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Date: Fri, 28 Apr 2023 14:03:05 +0200
Subject: [PATCH 518/729] Plugins: Bump grafana-plugin-sdk to v0.160.0 (#67488)

---
 go.mod |  2 +-
 go.sum | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/go.mod b/go.mod
index dcc3da85f0b..c9d423ef3c8 100644
--- a/go.mod
+++ b/go.mod
@@ -60,7 +60,7 @@ require (
 	github.com/grafana/alerting v0.0.0-20230426193323-4f09f516596b
 	github.com/grafana/grafana-aws-sdk v0.12.0
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
-	github.com/grafana/grafana-plugin-sdk-go v0.159.0
+	github.com/grafana/grafana-plugin-sdk-go v0.160.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/hashicorp/go-hclog v1.5.0
 	github.com/hashicorp/go-plugin v1.4.9
diff --git a/go.sum b/go.sum
index 0daf20ed7cc..1443b20fec4 100644
--- a/go.sum
+++ b/go.sum
@@ -767,7 +767,6 @@ github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
@@ -1136,7 +1135,6 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -1301,8 +1299,8 @@ github.com/grafana/grafana-google-sdk-go v0.1.0 h1:LKGY8z2DSxKjYfr2flZsWgTRTZ6HG
 github.com/grafana/grafana-google-sdk-go v0.1.0/go.mod h1:Vo2TKWfDVmNTELBUM+3lkrZvFtBws0qSZdXhQxRdJrE=
 github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW39s+c+LetqSCjFj7xxPC5+M=
 github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk=
-github.com/grafana/grafana-plugin-sdk-go v0.159.0 h1:tjqzTe/wz+1zzaeHpOJvBvSvZFx/bJUSHj6WA8HJqhE=
-github.com/grafana/grafana-plugin-sdk-go v0.159.0/go.mod h1:7/F3lL/w3MGuZTwu0jam5oL/4zNOQmhs2k8WZ9VlzhI=
+github.com/grafana/grafana-plugin-sdk-go v0.160.0 h1:jELbsqee5kRz9vD1hZeP8+984xMZDU/M6uGv0RhOR34=
+github.com/grafana/grafana-plugin-sdk-go v0.160.0/go.mod h1:dPhljkVno3Bg/ZYafMrR/BfYjtCRJD2hU2719Nl3QzM=
 github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a h1:i2YhC6eTyDp+7Ftv5c6VZDUQskmKX4oIPGf38qfiZiU=
 github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
 github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413 h1:bBzCezZNRyYlJpXTkyZdY4fpPxHZUdyeyRWzhtw/P6I=
@@ -1376,8 +1374,6 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9
 github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
 github.com/hashicorp/go-plugin v1.2.2/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0=
 github.com/hashicorp/go-plugin v1.4.2/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
-github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
-github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
 github.com/hashicorp/go-plugin v1.4.9 h1:ESiK220/qE0aGxWdzKIvRH69iLiuN/PjoLTm69RoWtU=
 github.com/hashicorp/go-plugin v1.4.9/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
@@ -1430,8 +1426,6 @@ github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvh
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493 h1:brI5vBRUlAlM34VFmnLPwjnCL/FxAJp9XvOdX6Zt+XE=
-github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hetznercloud/hcloud-go v1.26.2/go.mod h1:2C5uMtBiMoFr3m7lBFPf7wXTdh33CevmZpQIIDPGYJI=
@@ -1721,7 +1715,6 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
 github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
@@ -1768,8 +1761,6 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.14.0 h1:/x0XQ6h+3U3nAyk1yx+bHPURrKa9sVVvYbuqZ7pIAtI=
-github.com/mitchellh/go-testing-interface v1.14.0/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
 github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
 github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
@@ -2728,7 +2719,6 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
@@ -2952,7 +2942,6 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -2964,7 +2953,6 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2982,7 +2970,6 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=

From 816ba4779a5b896c640095879b9caf7a02171f59 Mon Sep 17 00:00:00 2001
From: MattiasSegerdahl <102952046+MattiasSegerdahl@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:27:29 +0200
Subject: [PATCH 519/729] Update start-restart-grafana.md (#67362)

---
 docs/sources/setup-grafana/start-restart-grafana.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/setup-grafana/start-restart-grafana.md b/docs/sources/setup-grafana/start-restart-grafana.md
index b74a92790af..b53f3fc93e6 100644
--- a/docs/sources/setup-grafana/start-restart-grafana.md
+++ b/docs/sources/setup-grafana/start-restart-grafana.md
@@ -109,7 +109,7 @@ To restart the Grafana service, use the `docker restart` command.
 
 `docker restart grafana`
 
-Alternately, you can use the `docker compose restart` command to restart Grafana. For more information, refer to [docker compose documentation](https://docs.docker.com/compose/).
+Alternatively, you can use the `docker compose restart` command to restart Grafana. For more information, refer to [docker compose documentation](https://docs.docker.com/compose/).
 
 ### Docker compose example
 
@@ -149,7 +149,7 @@ Complete the following steps to start the Grafana server on Windows:
 
    > **Note:** The default Grafana port is `3000`. This port might require extra permissions on Windows. If it does not appear in the default port, you can try changing to a different port.
 
-1. If you need to change the port, complete the following steps:
+1. To change the port, complete the following steps:
 
    a. In the `conf` directory, copy `sample.ini` to `custom.ini`.
 

From ea7e5e2d820dd85ae061001378d30aaf2c35ef88 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Fri, 28 Apr 2023 14:28:00 +0200
Subject: [PATCH 520/729] Chore: Improve error message in case of a revoked key
 (#67413)

---
 pkg/plugins/manager/signature/manifest.go     |   7 +-
 .../manager/signature/manifest_test.go        | 104 ++++++++++++++++++
 2 files changed, 110 insertions(+), 1 deletion(-)

diff --git a/pkg/plugins/manager/signature/manifest.go b/pkg/plugins/manager/signature/manifest.go
index abb22e48155..05d95b97d62 100644
--- a/pkg/plugins/manager/signature/manifest.go
+++ b/pkg/plugins/manager/signature/manifest.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
+	openpgpErrors "github.com/ProtonMail/go-crypto/openpgp/errors"
 	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/gobwas/glob"
 
@@ -141,7 +142,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 
 	manifest, err := s.readPluginManifest(ctx, byteValue)
 	if err != nil {
-		s.log.Debug("Plugin signature invalid", "id", plugin.JSONData.ID, "err", err)
+		s.log.Warn("Plugin signature invalid", "id", plugin.JSONData.ID, "err", err)
 		return plugins.Signature{
 			Status: plugins.SignatureInvalid,
 		}, nil
@@ -341,6 +342,10 @@ func (s *Signature) Verify(ctx context.Context, keyID string, block *clearsign.B
 	if _, err = openpgp.CheckDetachedSignature(keyring,
 		bytes.NewBuffer(block.Bytes),
 		block.ArmoredSignature.Body, &packet.Config{}); err != nil {
+		// If the key includes revocations, we can assume that the key was revoked
+		if len(keyring) > 0 && len(keyring[0].Revocations) > 0 {
+			return fmt.Errorf("%s (KeyID: %s): %w", openpgpErrors.ErrKeyRevoked.Error(), keyID, err)
+		}
 		return fmt.Errorf("%v: %w", "failed to check signature", err)
 	}
 
diff --git a/pkg/plugins/manager/signature/manifest_test.go b/pkg/plugins/manager/signature/manifest_test.go
index 2816a8a1b13..b9330bb7ada 100644
--- a/pkg/plugins/manager/signature/manifest_test.go
+++ b/pkg/plugins/manager/signature/manifest_test.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
+	openpgpErrors "github.com/ProtonMail/go-crypto/openpgp/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -756,3 +758,105 @@ func mustNewStaticFSForTests(t *testing.T, dir string) plugins.FS {
 	require.NoError(t, err)
 	return sfs
 }
+
+type revokedKeyProvider struct{}
+
+func (p *revokedKeyProvider) GetPublicKey(ctx context.Context, keyID string) (string, error) {
+	// dummy revoked key created locally
+	const publicKeyText = `-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGRKicsBDADMP7DxjVIj/1gWaaaC+21p7AIXvF6I94FL687fBQLPjFDh9Lrt
+iGk58n/OG4hw+5qhEWdVWR9RvhtNP8XB/wXzFJBTEadZZfShkqEwEP+tSSiczxgl
+C25LvMmfzUjYXwJdByYRZlFTlP3vBqBZy56QWnz0Q7O/CvjNleGWJ4DfqiMFgDoC
+zuCkXLhnpJHMf4HhYqM0qPn4q7SkA+7nJ7LjwU016rIsY+f6iDoe8fLVdqzkg8Ag
+Oo7OsqEU0bex6gxP0XJzAUJffj+fqUty5E8+SBJMCxGcwagqEtivhGTR5sERfcbs
+hk8cPhHDE0qNZvrVQrOsXQc+CXdPtIZl2BQOTiXcaeOItZ5FIfk5kM+HpB3xFVgX
+hu8Ct8r1kKTlRbu5a7BwI8emQJaPrPExr89wALVSFc3SUP6FMsCdCSJZpACMNuro
+HTREH+pKktnhdAptye/LJ4G5PXX89utDOe06iTembTuwi/YouSfeFv5/oVWFf3U8
+MzbLt6hVC8kuZs0AEQEAAYkBtgQgAQoAIBYhBOyXlK8OTF+dy2fAqF3wd+PYth+G
+BQJkSorEAh0AAAoJEF3wd+PYth+GqnwL/0Z8TM+shR8EgoKqXvuytGbyURTL+cz3
+34t0jjayXB0rUp4+Q6umlHZ3JIkIJhzgd3rShtIuo/sxFX7GYXqfQJj28Ry+Gfec
+8hlW+YvzVOs6UzlpFlHktJAHy8+uEw5Z9364apE1yK6MOzy+LWACu7YWYiH/WCQE
+eH4P0R6IiaC/pIUbM4obHtbncL67PnLXn2/350sHdXceInUitLgp9DNZZQvoBA1Y
+Y5cGYMuCF5Ji3/p5z8NYuP5l9KVdb2tBfQDYi3e5TrntpRG/0iI4hPmXJbFlwQip
+nCb31mZy8AlLupCsC3+F97/Ea/sPJblRRrm+cLxXSvqlVJivH7iHsWz5iraMSG4e
+HVyvDc2Cv2uvM6kGDCOTOx/H5w+5FNeFz/AtCE5WQVb8nR66oGWMeV2Dr1RsHKQY
+oJL9C+Gv4gUxz/2E+JFnrJwC4dbZYOQBWNagecTYeMbZMO0uv5WQyqra/99b6Tby
+XlNekEpRXBExbBY2cucrDNXFiFspbX/2jLQHYW5kcmVzMokB1AQTAQoAPhYhBOyX
+lK8OTF+dy2fAqF3wd+PYth+GBQJkSonLAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQW
+AgMBAh4BAheAAAoJEF3wd+PYth+G5VEL/14o7ARD5e3YEKqfbaShXUZItT7rPw13
+M7lDXdr+XB+hrkRPP2ZZVK54x1S4CsDLSym08WFRGiC2mPx2wWESepisWVvixaDj
+EXZm3z76O4pY8NzAymKHKNALev2jgEDIQ22XGFgSxW2MHLLV0OBFAIZBgGLUsR7f
+L9QfG7rICIx5W3W9Rd18SI6s64cSknDjzbyiZeETXQHxVODPmd5u8y/SVwPKQx5J
+qr5qEb7oHKEALRhO7STCyC+kCkU1gmGrzATjng4SzNegwuHDFbSuwy4YEcFvRSkm
+gS4UKEEQBNoZj95I7B8S3hAHYnXWLRAcwg+e3G8JWdBLdYmnuOWa4qsix+GNUXd4
+QUpXFmSihCJO1lF7GBcfE8sUXTq+IwzGP690p/ZBpEqO2wn9UbeSZxGbgZ0HCc2H
+8CNWflWJsfPGnLz2sPt6JmrNW1124gz1PlgBixV2DUzEVBj/Nnv6aqRxZbEQ7/+V
+FYPnNsKV0LVxzDxc0Ob0qFzZ562P/mj9OrkBjQRkSonLAQwAq2L6KSVzLJrtAP12
+TJWERNCrjwWB1SjeKctWwgT+0EwEKmTx0Escnf2aELPgcAQ0pBYD2CEutDn12nhr
+nZppLmyqv7dtOR5JgOs65BHu//K5LOvY5V5deDo7QHfYWCGhgvEHKk0JY2N2ueRM
+iqQwHQPYyLH8rWVueOCfXONSB9I8VqE3HEdug4Wk6jgMNt+9dbGUFl7PvoVDtpcE
+ghNSbXJptQnfFL6lpgPLMyuS+d7W37jhqkFSoe5CvCLSFc8UZRPdIVei5jxfh8rx
+g4QJ9gdVxIHyY6+dBXQ+ZFxIe3EufmYSiST9LM9uZ75oY6VnTEXpu2e2A/mgT8ke
+2Nd/1O7wWV6UndAFruJ732cntT6BLwwHTYHiH2b4km5qjtMrsgY9BWju4WcrDJVD
+RtQ0i5jfmuZOYgxFgwr8Y9nA5k5zUVuudShh/DGEpjpTOQ7jbw2XzvlmTIcwpP/a
+IrKbXZhMW9X3VhXfCOg9IHiKsnvvBVsZbDD4942dU7+NGSPBABEBAAGJAbYEGAEK
+ACAWIQTsl5SvDkxfnctnwKhd8Hfj2LYfhgUCZEqJywIbDAAKCRBd8Hfj2LYfhsqc
+C/9/od/rbuiaJ8h9LfVOjcljDnCyf+2W8HXYcdl4MKNG6IOviLZqwfLLxDzsVgYC
+3A/HsX10kaJNZWbpDttMLJrUyQ4ZBT8UvQv149iCrRdTcNAv+bllpta73phz3D0u
+izMQ7wawOA3pR5VBVGRsYuljwOBR5WuqJ9EDknbE3YCCHFtq1ehHy+VA4BUx9czv
+mPHbYPsJVAWDcBrEKZ7WdIF9U3souFa6PplEQfDgjsoBEw8dC+EQhgb7Z4pP9VlG
+rVI1vraW0T+hS9csr+0LYR+TQiD24gA4Ec5bLJcPinwHoBvPCE3aqqiX67qcxuhq
+jmiiz3S2RrGYAi8vod87xc6k9X8rmv3zir3UeekVq2mPCensQ6+zIK+zyASY/i1d
+kYfyUNMj4t2j9+96F8u2Mh3KpaVTfj4Olg5JWcqG9UJXwXGJflk7NuaBiPBbK/W6
+LusDoGuEb/CYRKY/bRblEm2YcRGJHqzod+S+mBZmEjEB6OSWz01CABs/hWY9rdtY
+YNE=
+=U6y9
+-----END PGP PUBLIC KEY BLOCK-----
+`
+	return publicKeyText, nil
+}
+
+func Test_VerifyRevokedKey(t *testing.T) {
+	s := ProvideService(&config.Cfg{}, &revokedKeyProvider{})
+	m := createV2Manifest(t)
+	txt := `-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+{
+  "manifestVersion": "2.0.0",
+  "signatureType": "grafana",
+  "signedByOrg": "grafana",
+  "signedByOrgName": "Grafana Labs",
+  "plugin": "test-app",
+  "version": "1.0.0",
+  "time": 1621356785895,
+  "keyId": "7e4d0c6a708866e7",
+  "files": {
+	"plugin.json": "c59a51bf6d7ecd7a99608ccb99353390c8b973672a938a0247164324005c0caf",
+	"dashboards/connections.json": "bea86da4be970b98dc4681802ab55cdef3441dc3eb3c654cb207948d17b25303",
+	"dashboards/memory.json": "7c042464941084caa91d0a9a2f188b05315a9796308a652ccdee31ca4fbcbfee",
+	"dashboards/connections_result.json": "124d85c9c2e40214b83273f764574937a79909cfac3f925276fbb72543c224dc"
+  }
+}
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAEBCgAdFiEE7JeUrw5MX53LZ8CoXfB349i2H4YFAmRKigIACgkQXfB349i2
+H4ZdKgwAuVuTjGT7Rn1MfxYRUXRymdnyqsDRYaK8gw5i9OZweBuJBVLtL1eFII0h
+tTr+2jM4kGlsCakpJm3sjRG//8sBYoO5GsnOM6g1gv7mgUwo/Pv3A5eFFeOIkF1W
+E33nNyF17BlY+YPVJPMQ8Q4uBSz2pDlcdQY8gOleWERWMWvmsHZgobt7wyGgts7Y
+hCzKdm+e5/HpWBskW7dRMh1yB+8Ql+IK/Ksy8EDdX+Yv1fGV6ZNNIQxSEBXSily6
+uvZlU9zExa0db9rkg53jFpSfSFpQIJJ0Y0yOmHKDA4WLnphroCIBwo2lxIBIwuNH
+sXjmTjacvrqk13Af7Gat7XSNLapBfy5rTZwJFOwGWyDP1V0FTrlmt5vmoD0MRskq
+gry5NAKktwc2llGaS5uGc5wJ1wTvl5wYQkU8lBevdejntpQSOYNEuICe+OyKQP+h
+OOKpUCovEat+3W9JU1PM+z3cb1H/WWQ3hpKEykyzzi/jZMuRnRobW8Jm/4WxFgaY
+70RA9/V8
+=NUH5
+-----END PGP SIGNATURE-----
+`
+	block, _ := clearsign.Decode([]byte(txt))
+	require.NotNil(t, block, "failed to decode block")
+	err := s.validateManifest(context.Background(), *m, block)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), openpgpErrors.ErrKeyRevoked.Error())
+}

From 50fb1497e52d3b9199edf6bcf7ebf44cdb4ef15e Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:33:16 +0200
Subject: [PATCH 521/729] Toolkit: Remove deprecated `plugin:build` (#67485)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
---
 .betterer.results                             |   19 -
 .prettierrc.js                                |    4 +-
 packages/grafana-toolkit/README.md            |  372 +-
 packages/grafana-toolkit/package.json         |   76 +-
 .../grafana-toolkit/scripts/copy-files.js     |   38 -
 packages/grafana-toolkit/src/cli/index.ts     |   20 +-
 .../src/cli/tasks/plugin.build.ts             |  161 -
 .../src/cli/tasks/plugin/bundle.ts            |   79 -
 .../test_exclude_image_suffix_in_manifest.png |    1 -
 .../src/cli/tasks/plugin/tests.ts             |   50 -
 .../src/cli/utils/useSpinner.ts               |   23 -
 .../src/config/eslint.plugin.js               |    6 -
 packages/grafana-toolkit/src/config/index.ts  |    1 -
 .../src/config/jest.babel.config.js           |    2 -
 .../src/config/jest.plugin.config.local.js    |    8 -
 .../src/config/jest.plugin.config.test.ts     |   40 -
 .../src/config/jest.plugin.config.ts          |  117 -
 .../grafana-toolkit/src/config/matchMedia.js  |   14 -
 .../mocks/jestSetup/noOverrides/package.json  |    1 -
 .../mocks/jestSetup/overrides/package.json    |   11 -
 .../unsupportedOverrides/package.json         |    5 -
 .../duplicates/src/styles/dark.css            |    0
 .../duplicates/src/styles/dark.scss           |    0
 .../duplicates/src/styles/light.css           |    0
 .../missing-theme-file/src/styles/light.css   |    0
 .../no-theme-files/src/styles/whatever.css    |    0
 .../stylesheetsSupport/ok/src/styles/dark.css |    0
 .../ok/src/styles/light.css                   |    0
 .../mocks/webpack/noOverride/package.json     |    3 -
 .../mocks/webpack/overrides/package.json      |    3 -
 .../mocks/webpack/overrides/webpack.config.js |   10 -
 .../webpack/overridesNamedExport/package.json |    3 -
 .../overridesNamedExport/webpack.config.js    |    8 -
 .../webpack/unsupportedOverride/package.json  |    3 -
 .../unsupportedOverride/webpack.config.js     |    5 -
 .../src/config/prettier.plugin.config.json    |    5 -
 .../src/config/prettier.plugin.rc.js          |    3 -
 .../src/config/react-inlinesvg.tsx            |   25 -
 .../grafana-toolkit/src/config/styles.mock.js |    4 -
 .../src/config/tsconfig.plugin.json           |    7 -
 .../src/config/tsconfig.plugin.local.json     |    9 -
 .../src/config/utils/getPluginId.ts           |   11 -
 .../src/config/utils/pluginValidation.test.ts |   15 -
 .../src/config/utils/pluginValidation.ts      |   46 -
 .../src/config/webpack.plugin.config.test.ts  |   77 -
 .../src/config/webpack.plugin.config.ts       |  289 --
 .../src/config/webpack/loaders.test.ts        |   26 -
 .../src/config/webpack/loaders.ts             |  129 -
 .../internal/input-datasource/package.json    |    1 +
 .../internal/input-datasource/tsconfig.json   |    3 +-
 yarn.lock                                     | 3060 +----------------
 51 files changed, 111 insertions(+), 4682 deletions(-)
 delete mode 100644 packages/grafana-toolkit/scripts/copy-files.js
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png
 delete mode 100644 packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts
 delete mode 100644 packages/grafana-toolkit/src/cli/utils/useSpinner.ts
 delete mode 100644 packages/grafana-toolkit/src/config/eslint.plugin.js
 delete mode 100644 packages/grafana-toolkit/src/config/index.ts
 delete mode 100644 packages/grafana-toolkit/src/config/jest.babel.config.js
 delete mode 100644 packages/grafana-toolkit/src/config/jest.plugin.config.local.js
 delete mode 100644 packages/grafana-toolkit/src/config/jest.plugin.config.test.ts
 delete mode 100644 packages/grafana-toolkit/src/config/jest.plugin.config.ts
 delete mode 100644 packages/grafana-toolkit/src/config/matchMedia.js
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.css
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.scss
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/light.css
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/missing-theme-file/src/styles/light.css
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/no-theme-files/src/styles/whatever.css
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/dark.css
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/light.css
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/webpack/overrides/package.json
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json
 delete mode 100644 packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js
 delete mode 100644 packages/grafana-toolkit/src/config/prettier.plugin.config.json
 delete mode 100644 packages/grafana-toolkit/src/config/prettier.plugin.rc.js
 delete mode 100644 packages/grafana-toolkit/src/config/react-inlinesvg.tsx
 delete mode 100644 packages/grafana-toolkit/src/config/styles.mock.js
 delete mode 100644 packages/grafana-toolkit/src/config/tsconfig.plugin.json
 delete mode 100644 packages/grafana-toolkit/src/config/tsconfig.plugin.local.json
 delete mode 100644 packages/grafana-toolkit/src/config/utils/getPluginId.ts
 delete mode 100644 packages/grafana-toolkit/src/config/utils/pluginValidation.test.ts
 delete mode 100644 packages/grafana-toolkit/src/config/utils/pluginValidation.ts
 delete mode 100644 packages/grafana-toolkit/src/config/webpack.plugin.config.test.ts
 delete mode 100644 packages/grafana-toolkit/src/config/webpack.plugin.config.ts
 delete mode 100644 packages/grafana-toolkit/src/config/webpack/loaders.test.ts
 delete mode 100644 packages/grafana-toolkit/src/config/webpack/loaders.ts

diff --git a/.betterer.results b/.betterer.results
index 95c3ac90c74..125dde4bc3a 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -876,25 +876,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-toolkit/src/cli/utils/useSpinner.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "packages/grafana-toolkit/src/config/jest.plugin.config.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "packages/grafana-toolkit/src/config/react-inlinesvg.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "packages/grafana-toolkit/src/config/utils/pluginValidation.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
-    "packages/grafana-toolkit/src/config/webpack.plugin.config.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-ui/src/components/Card/Card.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/.prettierrc.js b/.prettierrc.js
index c14684b0835..a4df7366a3a 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,3 +1,5 @@
 module.exports = {
-  ...require('@grafana/toolkit/src/config/prettier.plugin.config.json'),
+  trailingComma: 'es5',
+  singleQuote: true,
+  printWidth: 120,
 };
diff --git a/packages/grafana-toolkit/README.md b/packages/grafana-toolkit/README.md
index 800492fa133..c3aa5d75e35 100644
--- a/packages/grafana-toolkit/README.md
+++ b/packages/grafana-toolkit/README.md
@@ -1,381 +1,15 @@
-> **WARNING: @grafana/toolkit is currently in BETA**.
+> **WARNING: @grafana/toolkit is deprecated**.
 
 # grafana-toolkit
 
 grafana-toolkit is a CLI that enables efficient development of Grafana plugins. We want to help our community focus on the core value of their plugins rather than all the setup required to develop them.
 
-## Getting started
-
-Set up a new plugin with `grafana-toolkit plugin:create` command:
-
-```sh
-npx @grafana/toolkit plugin:create my-grafana-plugin
-cd my-grafana-plugin
-yarn install
-yarn dev
-```
-
-> **Note:** If running NPM 7+ the `npx` commands mentioned in this article may hang. The workaround is to use `npx --legacy-peer-deps <command to run>`.
-
-## Update your plugin to use grafana-toolkit
-
-Follow the steps below to start using grafana-toolkit in your existing plugin.
-
-1. Add `@grafana/toolkit` package to your project by running `yarn add @grafana/toolkit` or `npm install @grafana/toolkit`.
-2. Create `tsconfig.json` file in the root dir of your plugin and paste the code below:
-
-```json
-{
-  "extends": "./node_modules/@grafana/toolkit/src/config/tsconfig.plugin.json",
-  "include": ["src", "types"],
-  "compilerOptions": {
-    "rootDir": "./src",
-    "baseUrl": "./src",
-    "typeRoots": ["./node_modules/@types"]
-  }
-}
-```
-
-3. Create `.prettierrc.js` file in the root dir of your plugin and paste the code below:
-
-```js
-module.exports = {
-  ...require('./node_modules/@grafana/toolkit/src/config/prettier.plugin.config.json'),
-};
-```
-
-4. In your `package.json` file add following scripts:
-
-```json
-"scripts": {
-  "build": "grafana-toolkit plugin:build",
-  "test": "grafana-toolkit plugin:test",
-  "dev": "grafana-toolkit plugin:dev",
-  "watch": "grafana-toolkit plugin:dev --watch"
-},
-```
-
-## Usage
-
-With grafana-toolkit, we give you a CLI that addresses common tasks performed when working on Grafana plugin:
-
-- `grafana-toolkit plugin:create`
-- `grafana-toolkit plugin:dev`
-- `grafana-toolkit plugin:test`
-- `grafana-toolkit plugin:build`
-- `grafana-toolkit plugin:sign`
-
-### Create your plugin
-
-`grafana-toolkit plugin:create plugin-name`
-
-This command creates a new Grafana plugin from template.
-
-If `plugin-name` is provided, then the template is downloaded to `./plugin-name` directory. Otherwise, it will be downloaded to the current directory.
-
-### Develop your plugin
-
-`grafana-toolkit plugin:dev`
-
-This command creates a development build that's easy to play with and debug using common browser tooling.
-
-Available options:
-
-- `-w`, `--watch` - run development task in a watch mode
-
-### Test your plugin
-
-`grafana-toolkit plugin:test`
-
-This command runs Jest against your codebase.
-
-Available options:
-
-- `--watch` - Runs tests in interactive watch mode.
-- `--coverage` - Reports code coverage.
-- `-u`, `--updateSnapshot` - Performs snapshots update.
-- `--testNamePattern=<regex>` - Runs test with names that match provided regex (https://jestjs.io/docs/en/cli#testnamepattern-regex).
-- `--testPathPattern=<regex>` - Runs test with paths that match provided regex (https://jestjs.io/docs/en/cli#testpathpattern-regex).
-- `--maxWorkers=<num>|<string>` - Limit number of Jest workers spawned (https://jestjs.io/docs/en/cli#--maxworkersnumstring)
-
-### Build your plugin
-
-`grafana-toolkit plugin:build`
-
-This command creates a production-ready build of your plugin.
-
-Available options:
-
-- `--skipTest` - Skip running tests as part of build. Useful if you're running the build as part of a larger pipeline.
-- `--skipLint` - Skip linting as part of build. Useful if you're running the build as part of a larger pipeline.
-- `--coverage` - Reports code coverage after the test step of the build.
-- `--preserveConsole` - Preserves console statements in the code.
-
-### Sign your plugin
-
-`grafana-toolkit plugin:sign`
-
-This command creates a signed MANIFEST.txt file which Grafana uses to validate the integrity of the plugin.
-
-Available options:
-
-- `--signatureType` - The [type of Signature](https://grafana.com/legal/plugins/) you are generating: `private`, `community` or `commercial`
-- `--rootUrls` - For private signatures, a list of the Grafana instance URLs that the plugin will be used on
-
-To generate a signature, you will need to sign up for a free account on https://grafana.com, create an API key with the Plugin Publisher role, and pass that in the `GRAFANA_API_KEY` environment variable.
-
 ## FAQ
 
 ### Which version of grafana-toolkit should I use?
 
-See [Grafana packages versioning guide](https://github.com/grafana/grafana/blob/main/packages/README.md#versioning).
-
-### What tools does grafana-toolkit use?
-
-grafana-toolkit comes with TypeScript, ESLint, Prettier, Jest, CSS and SASS support.
-
-### How to start using grafana-toolkit in my plugin?
-
-See [Updating your plugin to use grafana-toolkit](#updating-your-plugin-to-use-grafana-toolkit).
-
-### Can I use TypeScript to develop Grafana plugins?
-
-Yes! grafana-toolkit supports TypeScript by default.
-
-### How can I test my plugin?
-
-grafana-toolkit comes with Jest as a test runner.
-
-Internally at Grafana we use React Testing Library.
-
-You can also set up Jest with shims of your needs by creating `jest-shim.ts` file in the same directory: `<YOUR_PLUGIN_DIR_>/config/jest-shim.ts`
-
-### Can I provide custom setup for Jest?
-
-You can provide custom Jest configuration with a `package.json` file. For more details, see [Jest docs](https://jest-bot.github.io/jest/docs/configuration.html).
-
-Currently we support following Jest configuration properties:
-
-- [`snapshotSerializers`](https://jest-bot.github.io/jest/docs/configuration.html#snapshotserializers-array-string)
-- [`moduleNameMapper`](https://jestjs.io/docs/en/configuration#modulenamemapper-object-string-string)
-
-### I want to use monaco-editor, is there anything particular I should pay attention?
-
-Yes there is.
-We already bundled monaco-editor in grafana. See [webpack config](https://github.
-com/grafana/grafana/blob/main/scripts/webpack/webpack.common.js#L49-L58).
-We use `@monaco-editor/react` package with loader-config https://github.com/suren-atoyan/monaco-react#loader-config
-By default, monaco files are being downloaded from CDN. We use the bundled version.
-Initialization: https://github.com/grafana/grafana/blob/main/scripts/webpack/webpack.common.js#L49-L58t
-We suggest to use the bundled version to prevent unwanted issues related to version mismatch.
-
-### How can I customize Webpack rules or plugins?
-
-You can provide your own `webpack.config.js` file that exports a `getWebpackConfig` function. We recommend that you extend the standard configuration, but you are free to create your own:
-
-```js
-const CustomPlugin = require('custom-plugin');
-
-module.exports.getWebpackConfig = (config, options) => ({
-  ...config,
-  plugins: [...config.plugins, new CustomPlugin()],
-});
-```
-
-### How can I style my plugin?
-
-We support pure CSS, SASS, and CSS-in-JS approach (via [Emotion](https://emotion.sh/)).
-
-#### Single CSS or SASS file
-
-Create your CSS or SASS file and import it in your plugin entry point (typically `module.ts`):
-
-```ts
-import 'path/to/your/css_or_sass';
-```
-
-The styles will be injected via `style` tag during runtime.
-
-> **Note:** that imported static assets will be inlined as base64 URIs. _This can be subject of change in the future!_
-
-#### Theme-specific stylesheets
-
-If you want to provide different stylesheets for dark/light theme, then create `dark.[css|scss]` and `light.[css|scss]` files in the `src/styles` directory of your plugin. grafana-toolkit generates theme-specific stylesheets that are stored in `dist/styles` directory.
-
-In order for Grafana to pick up your theme stylesheets, you need to use `loadPluginCss` from `@grafana/runtime` package. Typically you would do that in the entry point of your plugin:
-
-```ts
-import { loadPluginCss } from '@grafana/runtime';
-
-loadPluginCss({
-  dark: 'plugins/<YOUR-PLUGIN-ID>/styles/dark.css',
-  light: 'plugins/<YOUR-PLUGIN-ID>/styles/light.css',
-});
-```
-
-You must add `@grafana/runtime` to your plugin dependencies by running `yarn add @grafana/runtime` or `npm install @grafana/runtime`.
-
-> **Note:** that in this case static files (png, svg, json, html) are all copied to dist directory when the plugin is bundled. Relative paths to those files does not change!
-
-#### Emotion
-
-Starting from Grafana 6.2 _our suggested way_ for styling plugins is by using [Emotion](https://emotion.sh). It's a CSS-in-JS library that we use internally at Grafana. The biggest advantage of using Emotion is that you can access Grafana Theme variables.
-
-To start using Emotion, you first must add it to your plugin dependencies:
-
-```
-  yarn add "emotion"@10.0.27
-```
-
-Then, import `css` function from Emotion:
-
-```ts
-import { css } from 'emotion';
-```
-
-Now you are ready to implement your styles:
-
-```tsx
-const MyComponent = () => {
-  return (
-    <div
-      className={css`
-        background: red;
-      `}
-    />
-  );
-};
-```
-
-To learn more about using Grafana theme please refer to [Theme usage guide](https://github.com/grafana/grafana/blob/main/style_guides/themes.md#react)
-
-> We do not support Emotion's `css` prop. Use className instead!
-
-### Can I adjust TypeScript configuration to suit my needs?
-
-Yes! However, it's important that your `tsconfig.json` file contains the following lines:
-
-```json
-{
-  "extends": "./node_modules/@grafana/toolkit/src/config/tsconfig.plugin.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "rootDir": "./src",
-    "typeRoots": ["./node_modules/@types"]
-  }
-}
-```
-
-### Can I adjust ESLint configuration to suit my needs?
-
-grafana-toolkit comes with [default config for ESLint](https://github.com/grafana/grafana/blob/main/packages/grafana-toolkit/src/config/eslint.plugin.json). For now, there is no way to customise ESLint config.
-
-### How is Prettier integrated into grafana-toolkit workflow?
-
-When building plugin with [`grafana-toolkit plugin:build`](#building-plugin) task, grafana-toolkit performs Prettier check. If the check detects any Prettier issues, the build will not pass. To avoid such situation we suggest developing plugin with [`grafana-toolkit plugin:dev --watch`](#developing-plugin) task running. This task tries to fix Prettier issues automatically.
-
-### My editor does not respect Prettier config, what should I do?
-
-In order for your editor to pick up our Prettier config you need to create `.prettierrc.js` file in the root directory of your plugin with following content:
-
-```js
-module.exports = {
-  ...require('./node_modules/@grafana/toolkit/src/config/prettier.plugin.config.json'),
-};
-```
-
-### How do I add third-party dependencies that are not npm packages?
-
-Put them in the `static` directory in the root of your project. The `static` directory is copied when the plugin is built.
-
-### I am getting this message when I run yarn install: `Request failed \"404 Not Found\"`
-
-If you are using version `canary`, this error occurs because a `canary` release unpublishes previous versions leaving `yarn.lock` outdated. Remove `yarn.lock` and run `yarn install` again.
-
-### I am getting this message when I run my plugin: `Unable to dynamically transpile ES module A loader plugin needs to be configured via SystemJS.config({ transpiler: 'transpiler-module' }).`
-
-This error occurs when you bundle your plugin using the `grafana-toolkit plugin:dev` task and your code comments include ES2016 code.
-
-There are two issues at play:
-
-- The `grafana-toolkit plugin:dev` task does not remove comments from your bundled package.
-- Grafana does not support [ES modules](https://hacks.mozilla.org/2018/03/es-modules-a-cartoon-deep-dive/).
-
-If your comments include ES2016 code, then SystemJS v0.20.19, which Grafana uses internally to load plugins, interprets your code as an ESM and fails.
-
-To fix this error, remove the ES2016 code from your comments.
-
-### I would like to dynamically import modules in my plugin
-
-Create a webpack.config.js with this content (in the root of _your_ plugin)
-
-```ts
-// webpack.config.js
-const pluginJson = require('./src/plugin.json');
-module.exports.getWebpackConfig = (config, options) => ({
-  ...config,
-  output: {
-    ...config.output,
-    publicPath: `public/plugins/${pluginJson.id}/`,
-  },
-});
-```
-
-The plugin id is the id written in the plugin.json file.
+You should not use grafana-toolkit anymore. [create-plugin](https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin/) is the tool to create new plugins and existing plugins should migrate.
 
 ## Contribute to grafana-toolkit
 
-You can contribute to grafana-toolkit by helping develop it or by debugging it.
-
-### Develop grafana-toolkit
-
-Typically plugins should be developed using the `@grafana/toolkit` installed from npm. However, when working on the toolkit, you might want to use the local version. There are two ways to run the local toolkit version:
-
-### Using `NODE_OPTIONS` to load the yarn pnp file:
-
-You can run grafana toolkit directly from the grafana repository with this command.
-
-`NODE_OPTIONS="--require $GRAFANA_REPO/.pnp.cjs" $GRAFANA_REPO/packages/grafana-toolkit/dist/bin/grafana-toolkit.js [command]`
-
-You can replace `$GRAFANA_REPO` with the path to your grafana clone or set it in your environment. e.g.: `export GRAFANA_REPO=/home/dev/your_grafana_clone`
-
-> Note: This will run grafana toolkit from your local clone but it won't change the dependencies of what you are trying to build.
-
-### Using yarn berry linking.
-
-#### Prerequisites
-
-For the following to work make sure to have a plugin that uses yarn berry and yarn PnP to test changes against. Feel free to clone the panel plugin [here](https://github.com/jackw/plugin-yarn-berry) if need be.
-
-1. Clone [Grafana repository](https://github.com/grafana/grafana).
-2. Navigate to the directory you have cloned Grafana repo to and then run `yarn install --immutable`.
-3. Open `packages/grafana-toolkit/package.json`, delete any mention of `@grafana/data` and `@grafana/ui`. Then add the following:
-
-```
-  "devDependencies": {
-    "@grafana/data": "workspace:*",
-    "@grafana/ui": "workspace:*"
-  },
-  "peerDependencies": {
-    "@grafana/data": "*",
-    "@grafana/ui": "*"
-  }
-```
-
-**DO NOT commit this `package.json` code change. It is required to resolve these `@grafana` packages from the plugin for development purposes only.**
-
-4. Run `yarn` in the grafana repo.
-5. Navigate to the directory where your plugin code is and then run `yarn link <GRAFANA_DIR>/packages/grafana-toolkit`. This uses yarn berry's `portal` protocol to "link" the grafana-toolkit package and resolve it's dependencies into your plugin code allowing you to develop toolkit and test changes against plugin code.
-6. Make the required changes to Grafana toolkit.
-
-### Debug grafana-toolkit
-
-To debug grafana-toolkit you can use standard [NodeJS debugging methods](https://nodejs.org/de/docs/guides/debugging-getting-started/#enable-inspector) (`node --inspect`, `node --inspect-brk`).
-
-To run grafana-toolkit in a debugging session use the following command in the toolkit's directory:
-
-`node --inspect-brk ./bin/grafana-toolkit.js [task]`
-
-To run [linked](#develop-grafana-toolkit) grafana-toolkit in a debugging session use the following command in the plugin's directory:
-
-`node --inspect-brk ./node_modules/@grafana/toolkit/bin/grafana-toolkit.js [task]`
+Grafana Toolkit is now deprecated.
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index c30e70fc838..0a3568a784f 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -30,85 +30,19 @@
     "LICENSE_APACHE2"
   ],
   "scripts": {
-    "build": "yarn clean && tsc -p tsconfig.json && yarn copy-files",
-    "copy-files": "node ./scripts/copy-files.js",
-    "clean": "rimraf ./dist ./compiled ./sass ./package.tgz",
+    "build": "yarn clean && tsc -p tsconfig.json",
+    "clean": "rm -rf ./dist ./compiled ./sass ./package.tgz",
     "prepack": "mv ./src ./src_bak && cp -r ./dist/src ./src",
-    "postpack": "rimraf ./src && mv ./src_bak ./src",
+    "postpack": "rm -rf ./src && mv ./src_bak ./src",
     "typecheck": "tsc --noEmit"
   },
   "main": "src/index.ts",
   "dependencies": {
-    "@babel/core": "7.18.9",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "7.18.9",
-    "@babel/plugin-proposal-optional-chaining": "7.18.9",
-    "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-transform-react-constant-elements": "7.18.9",
-    "@babel/plugin-transform-runtime": "7.18.10",
-    "@babel/plugin-transform-typescript": "7.19.0",
-    "@babel/preset-env": "7.18.9",
-    "@babel/preset-react": "7.18.6",
-    "@babel/preset-typescript": "7.18.6",
-    "@grafana/data": "10.0.0-pre",
-    "@grafana/eslint-config": "5.1.0",
     "@grafana/tsconfig": "^1.2.0-rc1",
-    "@grafana/ui": "10.0.0-pre",
-    "@jest/core": "27.5.1",
-    "@types/eslint": "8.4.1",
-    "@types/jest": "27.4.1",
-    "@types/lodash": "^4.14.194",
     "@types/node": "16.11.26",
-    "@types/prettier": "2.6.3",
-    "@types/react-dev-utils": "9.0.10",
-    "@types/rimraf": "3.0.2",
-    "@types/tmp": "0.2.3",
-    "@typescript-eslint/eslint-plugin": "5.36.2",
-    "@typescript-eslint/parser": "5.36.2",
-    "babel-jest": "27.5.1",
-    "babel-loader": "^8.2.5",
-    "babel-plugin-angularjs-annotate": "0.10.0",
     "chalk": "^4.1.2",
     "commander": "^9.2.0",
-    "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^3.4.1",
-    "eslint": "8.20.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-jsdoc": "39.6.2",
-    "eslint-plugin-react": "7.29.4",
-    "eslint-plugin-react-hooks": "4.6.0",
-    "execa": "^5.1.1",
-    "fork-ts-checker-webpack-plugin": "^7.2.1",
-    "globby": "^11.0.4",
-    "html-loader": "^3.1.0",
-    "html-webpack-plugin": "^5.5.0",
-    "jest": "27.5.1",
-    "jest-canvas-mock": "2.3.1",
-    "jest-junit": "13.1.0",
-    "less": "^4.1.2",
-    "less-loader": "^10.2.0",
-    "lodash": "4.17.21",
-    "mini-css-extract-plugin": "^2.6.0",
-    "ora": "^5.4.1",
-    "postcss": "^8.4.12",
-    "postcss-flexbugs-fixes": "^5.0.2",
-    "postcss-loader": "^6.2.1",
-    "postcss-preset-env": "7.4.3",
-    "prettier": "2.7.1",
-    "react-dev-utils": "^12.0.0",
-    "replace-in-file-webpack-plugin": "1.0.6",
-    "rimraf": "3.0.2",
-    "sass": "^1.49.9",
-    "sass-loader": "^12.6.0",
-    "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.3.1",
-    "ts-jest": "27.1.3",
-    "ts-loader": "^9.3.1",
-    "ts-node": "^9.1.0",
-    "tslib": "2.4.0",
-    "typescript": "4.8.2",
-    "webpack": "^5.76.0"
+    "tslib": "2.5.0",
+    "typescript": "4.8.2"
   }
 }
diff --git a/packages/grafana-toolkit/scripts/copy-files.js b/packages/grafana-toolkit/scripts/copy-files.js
deleted file mode 100644
index 8ebf3a81068..00000000000
--- a/packages/grafana-toolkit/scripts/copy-files.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-function copyFiles(files, cwd, distDir) {
-  for (const file of files) {
-    const basedir = path.dirname(`${distDir}/${file}`);
-    const name = file.replace('.generated', '');
-    if (!fs.existsSync(basedir)) {
-      fs.mkdirSync(basedir, { recursive: true });
-    }
-    fs.copyFileSync(`${cwd}/${file}`, `${distDir}/${name}`);
-  }
-}
-const configFilesToCopy = [
-  'src/config/prettier.plugin.config.json',
-  'src/config/prettier.plugin.rc.js',
-  'src/config/tsconfig.plugin.json',
-  'src/config/tsconfig.plugin.local.json',
-  'src/config/eslint.plugin.js',
-  'src/config/styles.mock.js',
-  'src/config/jest.babel.config.js',
-  'src/config/jest.plugin.config.local.js',
-  'src/config/matchMedia.js',
-  'src/config/react-inlinesvg.tsx',
-];
-const sassFilesToCopy = [
-  '_variables.generated.scss',
-  '_variables.dark.generated.scss',
-  '_variables.light.generated.scss',
-];
-
-const cwd = path.resolve(__dirname, '../');
-const distPath = path.resolve(cwd, 'dist');
-const sassPath = path.resolve(cwd, 'sass');
-const grafanaSassPath = path.resolve(cwd, '../../public/sass');
-
-copyFiles(configFilesToCopy, cwd, distPath);
-copyFiles(sassFilesToCopy, grafanaSassPath, sassPath);
diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index 1dd6f12b5af..a45ee3bdbb5 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 import { program } from 'commander';
 
-import { pluginBuildTask } from './tasks/plugin.build';
 import { getToolkitVersion } from './tasks/plugin.utils';
 import { templateTask } from './tasks/template';
 import { execTask } from './utils/execTask';
@@ -13,7 +12,7 @@ export const run = (includeInternalScripts = false) => {
     program
       .command('debug:template')
       .description('Just testing')
-      .action(async (cmd) => {
+      .action(async () => {
         await execTask(templateTask)({});
       });
   }
@@ -40,21 +39,12 @@ export const run = (includeInternalScripts = false) => {
     .option('--skipTest', 'Skip running tests (for pipelines that run it separate)', false)
     .option('--skipLint', 'Skip running lint (for pipelines that run it separate)', false)
     .option('--preserveConsole', 'Preserves console calls', false)
-    .description('[Deprecated] Prepares plugin dist package')
-    .action(async (cmd) => {
-      console.log(chalk.yellow('\n⚠️  DEPRECATED. This command is deprecated and will be removed in v10. ⚠️'));
+    .description('[removed] Use grafana create-plugin instead')
+    .action(async () => {
       console.log(
-        'Please migrate to grafana create-plugin https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin\n'
+        'No longer supported. Use grafana create-plugin https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin\n'
       );
-
-      await execTask(pluginBuildTask)({
-        coverage: cmd.coverage,
-        silent: true,
-        maxJestWorkers: cmd.maxJestWorkers,
-        preserveConsole: cmd.preserveConsole,
-        skipLint: cmd.skipLint,
-        skipTest: cmd.skipTest,
-      });
+      process.exit(1);
     });
 
   program
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
deleted file mode 100644
index beacb204b58..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { ESLint } from 'eslint';
-import execa from 'execa';
-import { constants as fsConstants, promises as fs } from 'fs';
-import globby from 'globby';
-import { resolve as resolvePath } from 'path';
-import rimrafCallback from 'rimraf';
-import { promisify } from 'util';
-
-import { useSpinner } from '../utils/useSpinner';
-
-import { bundlePlugin as bundleFn, PluginBundleOptions } from './plugin/bundle';
-import { testPlugin } from './plugin/tests';
-import { Task, TaskRunner } from './task';
-
-const { access, copyFile } = fs;
-const { COPYFILE_EXCL } = fsConstants;
-const rimraf = promisify(rimrafCallback);
-
-interface PluginBuildOptions {
-  coverage: boolean;
-  maxJestWorkers?: string;
-  preserveConsole?: boolean;
-  skipTest?: boolean;
-  skipLint?: boolean;
-}
-
-interface Fixable {
-  fix?: boolean;
-}
-
-const bundlePlugin = (options: PluginBundleOptions) => useSpinner('Compiling...', () => bundleFn(options));
-
-// @ts-ignore
-const clean = () => useSpinner('Cleaning', () => rimraf(`${process.cwd()}/dist`));
-
-const copyIfNonExistent = (srcPath: string, destPath: string) =>
-  copyFile(srcPath, destPath, COPYFILE_EXCL)
-    .then(() => console.log(`Created: ${destPath}`))
-    .catch((error) => {
-      if (error.code !== 'EEXIST') {
-        throw error;
-      }
-    });
-
-export const prepare = () =>
-  useSpinner('Preparing', () =>
-    Promise.all([
-      // Remove local dependencies for @grafana/data/node_modules
-      // See: https://github.com/grafana/grafana/issues/26748
-      rimraf(resolvePath(__dirname, 'node_modules/@grafana/data/node_modules')),
-      // Copy only if local tsconfig does not exist.  Otherwise this will work, but have odd behavior
-      copyIfNonExistent(
-        resolvePath(__dirname, '../../config/tsconfig.plugin.local.json'),
-        resolvePath(process.cwd(), 'tsconfig.json')
-      ),
-      // Copy only if local prettierrc does not exist.  Otherwise this will work, but have odd behavior
-      copyIfNonExistent(
-        resolvePath(__dirname, '../../config/prettier.plugin.rc.js'),
-        resolvePath(process.cwd(), '.prettierrc.js')
-      ),
-    ])
-  );
-
-export const versions = async () => {
-  try {
-    const nodeVersion = await execa('node', ['--version']);
-    console.log(`Using Node.js ${nodeVersion.stdout}`);
-
-    const toolkitVersion = await execa('grafana-toolkit', ['--version']);
-    console.log(`Using @grafana/toolkit ${toolkitVersion.stdout}`);
-  } catch (err) {
-    console.log(`Error reading versions`, err);
-  }
-};
-
-// @ts-ignore
-const typecheckPlugin = () => useSpinner('Typechecking', () => execa('tsc', ['--noEmit']));
-
-// @ts-ignore
-const getStylesSources = () => globby(resolvePath(process.cwd(), 'src/**/*.+(scss|css)'));
-
-export const lintPlugin = ({ fix }: Fixable = {}) =>
-  useSpinner('Linting', async () => {
-    try {
-      // Show a warning if the tslint file exists
-      await access(resolvePath(process.cwd(), 'tslint.json'));
-      console.log('\n');
-      console.log('--------------------------------------------------------------');
-      console.log('NOTE: @grafana/toolkit has migrated to use eslint');
-      console.log('Update your configs to use .eslintrc rather than tslint.json');
-      console.log('--------------------------------------------------------------');
-    } catch {
-      // OK: tslint does not exist
-    }
-
-    // @todo should remove this because the config file could be in a parent dir or within package.json
-    const configFile = await globby(resolvePath(process.cwd(), '.eslintrc?(.cjs|.js|.json|.yaml|.yml)')).then(
-      (filePaths) => {
-        if (filePaths.length > 0) {
-          return filePaths[0];
-        } else {
-          return resolvePath(__dirname, '../../config/eslint.plugin.js');
-        }
-      }
-    );
-
-    const eslint = new ESLint({
-      extensions: ['.ts', '.tsx'],
-      overrideConfigFile: configFile,
-      fix,
-      useEslintrc: false,
-    });
-
-    const results = await eslint.lintFiles(resolvePath(process.cwd(), 'src'));
-
-    if (fix) {
-      await ESLint.outputFixes(results);
-    }
-
-    const { errorCount, warningCount } = results.reduce<Record<string, number>>(
-      (acc, value) => {
-        acc.errorCount += value.errorCount;
-        acc.warningCount += value.warningCount;
-        return acc;
-      },
-      { errorCount: 0, warningCount: 0 }
-    );
-
-    const formatter = await eslint.loadFormatter('stylish');
-    const resultText = formatter.format(results);
-
-    if (errorCount > 0 || warningCount > 0) {
-      console.log('\n');
-      console.log(resultText);
-      console.log('\n');
-    }
-
-    if (errorCount > 0) {
-      throw new Error(`${errorCount} linting errors found in ${results.length} files`);
-    }
-  });
-
-export const pluginBuildRunner: TaskRunner<PluginBuildOptions> = async ({
-  coverage,
-  maxJestWorkers,
-  preserveConsole,
-  skipTest,
-  skipLint,
-}) => {
-  await versions();
-  await prepare();
-  if (!skipLint) {
-    await lintPlugin({ fix: false });
-  }
-  if (!skipTest) {
-    await testPlugin({ updateSnapshot: false, coverage, maxWorkers: maxJestWorkers, watch: false });
-  }
-  await bundlePlugin({ watch: false, production: true, preserveConsole });
-};
-
-export const pluginBuildTask = new Task<PluginBuildOptions>('Build plugin', pluginBuildRunner);
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts
deleted file mode 100644
index 9743f402a63..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import clearConsole from 'react-dev-utils/clearConsole';
-import formatWebpackMessages from 'react-dev-utils/formatWebpackMessages';
-import webpack from 'webpack';
-
-import { loadWebpackConfig } from '../../../config/webpack.plugin.config';
-
-export interface PluginBundleOptions {
-  watch: boolean;
-  production?: boolean;
-  preserveConsole?: boolean;
-}
-
-export const bundlePlugin = async ({ watch, production, preserveConsole }: PluginBundleOptions) => {
-  const compiler = webpack(
-    await loadWebpackConfig({
-      watch,
-      production,
-      preserveConsole,
-    })
-  );
-
-  const webpackPromise = new Promise<void>((resolve, reject) => {
-    if (watch) {
-      console.log('Started watching plugin for changes...');
-      compiler.watch({ ignored: ['**/node_modules', '**/dist'] }, (err, stats) => {});
-
-      compiler.hooks.invalid.tap('invalid', () => {
-        clearConsole();
-        console.log('Compiling...');
-      });
-
-      compiler.hooks.done.tap('done', (stats) => {
-        clearConsole();
-        const json = stats.toJson();
-        const output = formatWebpackMessages(json);
-
-        if (!output.errors.length && !output.warnings.length) {
-          console.log('Compiled successfully!\n');
-          console.log(stats.toString({ colors: true }));
-        }
-
-        if (output.errors.length) {
-          console.log('Compilation failed!');
-          output.errors.forEach((e) => console.log(e));
-
-          if (output.warnings.length) {
-            console.log('Warnings:');
-            output.warnings.forEach((w) => console.log(w));
-          }
-        }
-        if (output.errors.length === 0 && output.warnings.length) {
-          console.log('Compiled with warnings!');
-          output.warnings.forEach((w) => console.log(w));
-        }
-      });
-    } else {
-      compiler.run((err, stats) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-
-        if (stats?.hasErrors()) {
-          stats.compilation.errors.forEach((e) => {
-            console.log(e.message);
-          });
-
-          reject('Build failed');
-          return;
-        }
-
-        console.log('\n', stats?.toString({ colors: true }), '\n');
-        resolve();
-      });
-    }
-  });
-
-  return webpackPromise;
-};
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png b/packages/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png
deleted file mode 100644
index bb07b075925..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: not a real image, but should be excluded from hashed files
\ No newline at end of file
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts
deleted file mode 100644
index 7b8970bf769..00000000000
--- a/packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { runCLI } from '@jest/core';
-
-import { loadJestPluginConfig } from '../../../config/jest.plugin.config';
-import { useSpinner } from '../../utils/useSpinner';
-
-export interface PluginTestOptions {
-  updateSnapshot: boolean;
-  coverage: boolean;
-  watch: boolean;
-  testPathPattern?: string;
-  testNamePattern?: string;
-  maxWorkers?: string;
-}
-
-export const testPlugin = ({
-  updateSnapshot,
-  coverage,
-  watch,
-  testPathPattern,
-  testNamePattern,
-  maxWorkers,
-}: PluginTestOptions) =>
-  useSpinner('Running tests', async () => {
-    const testConfig = loadJestPluginConfig();
-
-    const cliConfig = {
-      config: JSON.stringify(testConfig),
-      updateSnapshot,
-      coverage,
-      watch,
-      testPathPattern: testPathPattern ? [testPathPattern] : [],
-      testNamePattern: testNamePattern ? [testNamePattern] : [],
-      passWithNoTests: true,
-      maxWorkers,
-    };
-
-    // @ts-ignore
-    const runJest = () => runCLI(cliConfig, [process.cwd()]);
-
-    if (watch) {
-      runJest();
-    } else {
-      // @ts-ignore
-      const results = await runJest();
-
-      if (results.results.numFailedTests > 0 || results.results.numFailedTestSuites > 0) {
-        throw new Error('Tests failed');
-      }
-    }
-  });
diff --git a/packages/grafana-toolkit/src/cli/utils/useSpinner.ts b/packages/grafana-toolkit/src/cli/utils/useSpinner.ts
deleted file mode 100644
index 6ba94e330c2..00000000000
--- a/packages/grafana-toolkit/src/cli/utils/useSpinner.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import ora from 'ora';
-
-export const useSpinner = async (label: string, fn: () => Promise<any>, killProcess = true) => {
-  const spinner = ora(label);
-  spinner.start();
-  try {
-    await fn();
-    spinner.succeed();
-  } catch (err: any) {
-    spinner.fail(err.message || err);
-
-    if (err.stdout) {
-      console.error(err.stdout);
-    } else if (err.message) {
-      // Return stack trace if error object
-      console.trace(err); // eslint-disable-line no-console
-    }
-
-    if (killProcess) {
-      process.exit(1);
-    }
-  }
-};
diff --git a/packages/grafana-toolkit/src/config/eslint.plugin.js b/packages/grafana-toolkit/src/config/eslint.plugin.js
deleted file mode 100644
index 8881050af33..00000000000
--- a/packages/grafana-toolkit/src/config/eslint.plugin.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@grafana/eslint-config'],
-  rules: {
-    'react/prop-types': 'off',
-  },
-};
diff --git a/packages/grafana-toolkit/src/config/index.ts b/packages/grafana-toolkit/src/config/index.ts
deleted file mode 100644
index ccb2e12e1b5..00000000000
--- a/packages/grafana-toolkit/src/config/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { CustomWebpackConfigurationGetter, WebpackConfigurationOptions } from './webpack.plugin.config';
diff --git a/packages/grafana-toolkit/src/config/jest.babel.config.js b/packages/grafana-toolkit/src/config/jest.babel.config.js
deleted file mode 100644
index 58098923886..00000000000
--- a/packages/grafana-toolkit/src/config/jest.babel.config.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Transform es modules to prevent `SyntaxError: Cannot use import statement outside a module`
-module.exports = { presets: [['@babel/preset-env', { targets: { esmodules: false, node: 'current' } }]] };
diff --git a/packages/grafana-toolkit/src/config/jest.plugin.config.local.js b/packages/grafana-toolkit/src/config/jest.plugin.config.local.js
deleted file mode 100644
index bcf17c9087d..00000000000
--- a/packages/grafana-toolkit/src/config/jest.plugin.config.local.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is needed because it is used by vscode and other tools that
-// call `jest` directly.  However, unless you are doing anything special
-// do not edit this file
-
-const standard = require('@grafana/toolkit/src/config/jest.plugin.config');
-
-// This process will use the same config that `yarn test` is using
-module.exports = standard.jestConfig();
diff --git a/packages/grafana-toolkit/src/config/jest.plugin.config.test.ts b/packages/grafana-toolkit/src/config/jest.plugin.config.test.ts
deleted file mode 100644
index 021d5c37ca1..00000000000
--- a/packages/grafana-toolkit/src/config/jest.plugin.config.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { jestConfig, allowedJestConfigOverrides } from './jest.plugin.config';
-
-describe('Jest config', () => {
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  it('should throw if not supported overrides provided', () => {
-    // Do not show console error,log when running test
-    jest.spyOn(console, 'error').mockImplementation();
-    jest.spyOn(console, 'log').mockImplementation();
-    const getConfig = () => jestConfig(`${__dirname}/mocks/jestSetup/unsupportedOverrides`);
-
-    expect(getConfig).toThrow('Provided Jest config is not supported');
-  });
-
-  it(`should allow ${allowedJestConfigOverrides} settings overrides`, () => {
-    const config = jestConfig(`${__dirname}/mocks/jestSetup/overrides`);
-    const configKeys = Object.keys(config);
-
-    for (const whitelistedOption of allowedJestConfigOverrides) {
-      expect(configKeys).toContain(whitelistedOption);
-    }
-  });
-
-  describe('stylesheets support', () => {
-    it('should provide module name mapper for stylesheets by default', () => {
-      const config = jestConfig(`${__dirname}/mocks/jestSetup/noOverrides`);
-      expect(config.moduleNameMapper).toBeDefined();
-      expect(Object.keys(config.moduleNameMapper)).toContain('\\.(css|sass|scss)$');
-    });
-
-    it('should preserve mapping for stylesheets when moduleNameMapper overrides provided', () => {
-      const config = jestConfig(`${__dirname}/mocks/jestSetup/overrides`);
-      expect(config.moduleNameMapper).toBeDefined();
-      expect(Object.keys(config.moduleNameMapper)).toContain('\\.(css|sass|scss)$');
-      expect(Object.keys(config.moduleNameMapper)).toContain('someOverride');
-    });
-  });
-});
diff --git a/packages/grafana-toolkit/src/config/jest.plugin.config.ts b/packages/grafana-toolkit/src/config/jest.plugin.config.ts
deleted file mode 100644
index e5809e0aaec..00000000000
--- a/packages/grafana-toolkit/src/config/jest.plugin.config.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import fs from 'fs';
-import path = require('path');
-
-export const allowedJestConfigOverrides = [
-  'snapshotSerializers',
-  'moduleNameMapper',
-  'globalSetup',
-  'globalTeardown',
-  'testEnvironment',
-];
-
-interface EnabledJestConfigOverrides {
-  snapshotSerializers: string[];
-  moduleNameMapper: { [key: string]: string };
-}
-
-const getSetupFile = (filePath: string) => {
-  if (fs.existsSync(`${filePath}.js`)) {
-    return `${filePath}.js`;
-  }
-  if (fs.existsSync(`${filePath}.ts`)) {
-    return `${filePath}.ts`;
-  }
-  return undefined;
-};
-
-export const jestConfig = (baseDir: string = process.cwd()) => {
-  const jestConfigOverrides = (require(path.resolve(baseDir, 'package.json')).jest || {}) as EnabledJestConfigOverrides;
-
-  const deniedOverrides = jestConfigOverrides
-    ? Object.keys(jestConfigOverrides).filter((override) => allowedJestConfigOverrides.indexOf(override) === -1)
-    : [];
-
-  if (deniedOverrides.length > 0) {
-    console.error("\ngrafana-toolkit doesn't support following Jest options: ", deniedOverrides);
-    console.log('Supported Jest options are: ', JSON.stringify(allowedJestConfigOverrides));
-    throw new Error('Provided Jest config is not supported');
-  }
-
-  const shimsFilePath = path.resolve(baseDir, 'config/jest-shim');
-  const setupFilePath = path.resolve(baseDir, 'config/jest-setup');
-
-  // Mock css imports for tests. Otherwise Jest will have troubles understanding SASS/CSS imports
-  const { moduleNameMapper, ...otherOverrides } = jestConfigOverrides;
-  const moduleNameMapperConfig = {
-    '\\.(css|sass|scss)$': `${__dirname}/styles.mock.js`,
-    'react-inlinesvg': `${__dirname}/react-inlinesvg.tsx`,
-    ...moduleNameMapper,
-  };
-
-  const setupFile = getSetupFile(setupFilePath);
-  const shimsFile = getSetupFile(shimsFilePath);
-
-  const setupFiles = [setupFile, shimsFile, `${__dirname}/matchMedia.js`, require.resolve('jest-canvas-mock')].filter(
-    (f) => f
-  );
-  const defaultJestConfig = {
-    verbose: false,
-    moduleDirectories: ['node_modules', 'src'],
-    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
-    setupFiles,
-    globals: {
-      'ts-jest': {
-        isolatedModules: true,
-        tsconfig: path.resolve(baseDir, 'tsconfig.json'),
-      },
-    },
-    coverageReporters: ['json-summary', 'text', 'lcov'],
-    collectCoverageFrom: ['src/**/*.{ts,tsx}', '!**/node_modules/**', '!**/vendor/**'],
-    reporters: [
-      'default',
-      [
-        require.resolve('jest-junit'),
-        {
-          outputDirectory: 'coverage',
-        },
-      ],
-    ],
-    testEnvironment: 'jsdom',
-    testMatch: [
-      '<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}',
-      '<rootDir>/src/**/*.{spec,test,jest}.{js,jsx,ts,tsx}',
-      '<rootDir>/spec/**/*.{spec,test,jest}.{js,jsx,ts,tsx}',
-    ],
-    transform: {
-      '^.+\\.(js|jsx|mjs)$': [
-        require.resolve('babel-jest'),
-        { configFile: path.resolve(__dirname, './jest.babel.config.js') },
-      ],
-      '^.+\\.tsx?$': require.resolve('ts-jest'),
-    },
-    transformIgnorePatterns: [
-      '[/\\\\\\\\]node_modules[/\\\\\\\\].+\\\\.(js|jsx|ts|tsx)$',
-      '^.+\\\\.module\\\\.(css|sass|scss)$',
-    ],
-    moduleNameMapper: moduleNameMapperConfig,
-  };
-
-  return {
-    ...defaultJestConfig,
-    ...otherOverrides,
-  };
-};
-
-/**
- * This will load the existing just setup, or use the default if it exists
- */
-export const loadJestPluginConfig = (baseDir: string = process.cwd()) => {
-  const cfgpath = path.resolve(baseDir, 'jest.config.js');
-  if (!fs.existsSync(cfgpath)) {
-    const toolkitDir = path.dirname(require.resolve(`@grafana/toolkit/package.json`));
-    const src = path.join(toolkitDir, 'src/config/jest.plugin.config.local.js');
-    fs.copyFileSync(src, cfgpath);
-    console.log('Using standard jest plugin config', src);
-  }
-  return require(cfgpath);
-};
diff --git a/packages/grafana-toolkit/src/config/matchMedia.js b/packages/grafana-toolkit/src/config/matchMedia.js
deleted file mode 100644
index f4489dec143..00000000000
--- a/packages/grafana-toolkit/src/config/matchMedia.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
-Object.defineProperty(global, 'matchMedia', {
-  writable: true,
-  value: jest.fn().mockImplementation((query) => ({
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: jest.fn(), // deprecated
-    removeListener: jest.fn(), // deprecated
-    addEventListener: jest.fn(),
-    removeEventListener: jest.fn(),
-    dispatchEvent: jest.fn(),
-  })),
-});
diff --git a/packages/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json b/packages/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json
deleted file mode 100644
index 0967ef424bc..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/packages/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json b/packages/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json
deleted file mode 100644
index 0b7f4df4d03..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "jest": {
-    "moduleNameMapper": {
-      "someOverride": "somePath"
-    },
-    "snapshotSerializers": "serializers",
-    "globalSetup": "path",
-    "globalTeardown": "path",
-    "testEnvironment": "node"
-  }
-}
diff --git a/packages/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json b/packages/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json
deleted file mode 100644
index 8450f881628..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "jest": {
-    "runner": "some-runner"
-  }
-}
diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.css b/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.scss b/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.scss
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/light.css b/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/light.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/missing-theme-file/src/styles/light.css b/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/missing-theme-file/src/styles/light.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/no-theme-files/src/styles/whatever.css b/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/no-theme-files/src/styles/whatever.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/dark.css b/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/dark.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/light.css b/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/light.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json b/packages/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json
deleted file mode 100644
index 4efb0bb15e1..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "version": "Testversion"
-}
diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/overrides/package.json b/packages/grafana-toolkit/src/config/mocks/webpack/overrides/package.json
deleted file mode 100644
index 4efb0bb15e1..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/webpack/overrides/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "version": "Testversion"
-}
diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js b/packages/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js
deleted file mode 100644
index e96ceeed1a9..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-const { cloneDeep } = require('lodash');
-
-const overrideWebpackConfig = (originalConfig, options) => {
-  const config = cloneDeep(originalConfig);
-  config.name = 'customConfig';
-  return config;
-};
-
-module.exports = overrideWebpackConfig;
diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json b/packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json
deleted file mode 100644
index 4efb0bb15e1..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "version": "Testversion"
-}
diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js b/packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js
deleted file mode 100644
index d2e086e5f00..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-const { cloneDeep } = require('lodash');
-
-module.exports.getWebpackConfig = (originalConfig, options) => {
-  const config = cloneDeep(originalConfig);
-  config.name = 'customConfig';
-  return config;
-};
diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json b/packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json
deleted file mode 100644
index 4efb0bb15e1..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "version": "Testversion"
-}
diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js b/packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js
deleted file mode 100644
index f62e5e8d0b4..00000000000
--- a/packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* WRONG CONFIG ON PURPOSE - DO NOT COPY THIS */
-
-module.exports.config = {
-  name: 'test',
-};
diff --git a/packages/grafana-toolkit/src/config/prettier.plugin.config.json b/packages/grafana-toolkit/src/config/prettier.plugin.config.json
deleted file mode 100644
index 49bc44f91c6..00000000000
--- a/packages/grafana-toolkit/src/config/prettier.plugin.config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "trailingComma": "es5",
-  "singleQuote": true,
-  "printWidth": 120
-}
diff --git a/packages/grafana-toolkit/src/config/prettier.plugin.rc.js b/packages/grafana-toolkit/src/config/prettier.plugin.rc.js
deleted file mode 100644
index c14684b0835..00000000000
--- a/packages/grafana-toolkit/src/config/prettier.plugin.rc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  ...require('@grafana/toolkit/src/config/prettier.plugin.config.json'),
-};
diff --git a/packages/grafana-toolkit/src/config/react-inlinesvg.tsx b/packages/grafana-toolkit/src/config/react-inlinesvg.tsx
deleted file mode 100644
index d540f3aabf8..00000000000
--- a/packages/grafana-toolkit/src/config/react-inlinesvg.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-// Due to the grafana/ui Icon component making fetch requests to
-// `/public/img/icon/<icon_name>.svg` we need to mock react-inlinesvg to prevent
-// the failed fetch requests from displaying errors in console.
-
-import React from 'react';
-
-type Callback = (...args: any[]) => void;
-
-export interface StorageItem {
-  content: string;
-  queue: Callback[];
-  status: string;
-}
-
-export const cacheStore: { [key: string]: StorageItem } = Object.create(null);
-
-const SVG_FILE_NAME_REGEX = /(.+)\/(.+)\.svg$/;
-
-const InlineSVG = ({ src }: { src: string }) => {
-  // testId will be the file name without extension (e.g. `public/img/icons/angle-double-down.svg` -> `angle-double-down`)
-  const testId = src.replace(SVG_FILE_NAME_REGEX, '$2');
-  return <svg xmlns="http://www.w3.org/2000/svg" data-testid={testId} viewBox="0 0 24 24" />;
-};
-
-export default InlineSVG;
diff --git a/packages/grafana-toolkit/src/config/styles.mock.js b/packages/grafana-toolkit/src/config/styles.mock.js
deleted file mode 100644
index ebea82fe270..00000000000
--- a/packages/grafana-toolkit/src/config/styles.mock.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Mock for handling stylesheet file imports in tests
-// https://jestjs.io/docs/en/webpack.html#handling-static-assets
-
-module.exports = {};
diff --git a/packages/grafana-toolkit/src/config/tsconfig.plugin.json b/packages/grafana-toolkit/src/config/tsconfig.plugin.json
deleted file mode 100644
index e2948cce30f..00000000000
--- a/packages/grafana-toolkit/src/config/tsconfig.plugin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "compilerOptions": {
-    "alwaysStrict": true,
-    "declaration": false
-  },
-  "extends": "@grafana/tsconfig"
-}
diff --git a/packages/grafana-toolkit/src/config/tsconfig.plugin.local.json b/packages/grafana-toolkit/src/config/tsconfig.plugin.local.json
deleted file mode 100644
index dcc552c6d9a..00000000000
--- a/packages/grafana-toolkit/src/config/tsconfig.plugin.local.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "rootDir": "./src",
-    "baseUrl": "./src",
-    "jsx": "react"
-  },
-  "extends": "@grafana/toolkit/src/config/tsconfig.plugin.json",
-  "include": ["src", "types"]
-}
diff --git a/packages/grafana-toolkit/src/config/utils/getPluginId.ts b/packages/grafana-toolkit/src/config/utils/getPluginId.ts
deleted file mode 100644
index 5acf8090688..00000000000
--- a/packages/grafana-toolkit/src/config/utils/getPluginId.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import path from 'path';
-
-let PLUGIN_ID: string;
-
-export const getPluginId = () => {
-  if (!PLUGIN_ID) {
-    const pluginJson = require(path.resolve(process.cwd(), 'src/plugin.json'));
-    PLUGIN_ID = pluginJson.id;
-  }
-  return PLUGIN_ID;
-};
diff --git a/packages/grafana-toolkit/src/config/utils/pluginValidation.test.ts b/packages/grafana-toolkit/src/config/utils/pluginValidation.test.ts
deleted file mode 100644
index 337057108eb..00000000000
--- a/packages/grafana-toolkit/src/config/utils/pluginValidation.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { getPluginJson, validatePluginJson } from './pluginValidation';
-
-describe('pluginValidation', () => {
-  describe('plugin.json', () => {
-    test('missing plugin.json file', () => {
-      expect(() => getPluginJson(`${__dirname}/mocks/missing-plugin.json`)).toThrowError();
-    });
-  });
-
-  describe('validatePluginJson', () => {
-    test('missing plugin.json file', () => {
-      expect(() => validatePluginJson({})).toThrow('Plugin id is missing in plugin.json');
-    });
-  });
-});
diff --git a/packages/grafana-toolkit/src/config/utils/pluginValidation.ts b/packages/grafana-toolkit/src/config/utils/pluginValidation.ts
deleted file mode 100644
index 80b88ce8f13..00000000000
--- a/packages/grafana-toolkit/src/config/utils/pluginValidation.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { PluginMeta } from '@grafana/data';
-
-export const validatePluginJson = (pluginJson: any) => {
-  if (!pluginJson.id) {
-    throw new Error('Plugin id is missing in plugin.json');
-  }
-
-  if (!pluginJson.info) {
-    throw new Error('Plugin info node is missing in plugin.json');
-  }
-
-  if (!pluginJson.info.version) {
-    throw new Error('Plugin info.version is missing in plugin.json');
-  }
-
-  const types = ['panel', 'datasource', 'app'];
-  const type = pluginJson.type;
-  if (!types.includes(type)) {
-    throw new Error('Invalid plugin type in plugin.json: ' + type);
-  }
-
-  if (!pluginJson.id.endsWith('-' + type)) {
-    throw new Error('[plugin.json] id should end with: -' + type);
-  }
-};
-
-export const getPluginJson = (path: string): PluginMeta => {
-  let pluginJson;
-  try {
-    pluginJson = require(path);
-  } catch (e) {
-    throw new Error('Unable to find: ' + path);
-  }
-
-  validatePluginJson(pluginJson);
-
-  return pluginJson as PluginMeta;
-};
-
-export const assertRootUrlIsValid = (rootUrl: string) => {
-  try {
-    new URL(rootUrl);
-  } catch (err) {
-    throw new Error(`${rootUrl} is not a valid URL`);
-  }
-};
diff --git a/packages/grafana-toolkit/src/config/webpack.plugin.config.test.ts b/packages/grafana-toolkit/src/config/webpack.plugin.config.test.ts
deleted file mode 100644
index 5791f5920f7..00000000000
--- a/packages/grafana-toolkit/src/config/webpack.plugin.config.test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import fs, { BigIntStats } from 'fs';
-
-import { findModuleFiles, loadWebpackConfig } from './webpack.plugin.config';
-// eslint-disable-next-line no-duplicate-imports
-import * as webpackConfig from './webpack.plugin.config';
-
-jest.mock('./webpack/loaders', () => ({
-  getFileLoaders: (): Array<{}> => [],
-  getStylesheetEntries: () => ({}),
-  getStyleLoaders: (): Array<{}> => [],
-}));
-
-const modulePathsMock = [
-  'some/path/module.ts',
-  'some/path/module.ts.whatever',
-  'some/path/module.tsx',
-  'some/path/module.tsx.whatever',
-  'some/path/anotherFile.ts',
-  'some/path/anotherFile.tsx',
-];
-
-describe('Plugin webpack config', () => {
-  describe('findModuleTs', () => {
-    beforeAll(() => {
-      jest.spyOn(fs, 'statSync').mockReturnValue({
-        isDirectory: () => false,
-      } as BigIntStats);
-    });
-
-    afterAll(() => {
-      jest.restoreAllMocks();
-    });
-
-    it('finds module.ts and module.tsx files', async () => {
-      const moduleFiles = await findModuleFiles('/', modulePathsMock);
-      expect(moduleFiles.length).toBe(2);
-      // normalize windows path - \\ -> /
-      expect(moduleFiles.map((p) => p.replace(/\\/g, '/'))).toEqual(['/some/path/module.ts', '/some/path/module.tsx']);
-    });
-  });
-
-  describe('loadWebpackConfig', () => {
-    beforeAll(() => {
-      jest.spyOn(webpackConfig, 'findModuleFiles').mockReturnValue(new Promise((res, _) => res([])));
-    });
-
-    afterAll(() => {
-      jest.restoreAllMocks();
-    });
-
-    it('uses default config if no override exists', async () => {
-      const spy = jest.spyOn(process, 'cwd');
-      spy.mockReturnValue(`${__dirname}/mocks/webpack/noOverride/`);
-      await loadWebpackConfig({});
-    });
-
-    it('calls customConfig if it exists', async () => {
-      const spy = jest.spyOn(process, 'cwd');
-      spy.mockReturnValue(`${__dirname}/mocks/webpack/overrides/`);
-      const config = await loadWebpackConfig({});
-      expect(config.name).toBe('customConfig');
-    });
-
-    it('loads export named getWebpackConfiguration', async () => {
-      const spy = jest.spyOn(process, 'cwd');
-      spy.mockReturnValue(`${__dirname}/mocks/webpack/overridesNamedExport/`);
-      const config = await loadWebpackConfig({});
-      expect(config.name).toBe('customConfig');
-    });
-
-    it('throws an error if module does not export function', async () => {
-      const spy = jest.spyOn(process, 'cwd');
-      spy.mockReturnValue(`${__dirname}/mocks/webpack/unsupportedOverride/`);
-      await expect(loadWebpackConfig({})).rejects.toThrowError();
-    });
-  });
-});
diff --git a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts b/packages/grafana-toolkit/src/config/webpack.plugin.config.ts
deleted file mode 100644
index 382c1e0b0a9..00000000000
--- a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts
+++ /dev/null
@@ -1,289 +0,0 @@
-import * as webpack from 'webpack';
-
-import { getStyleLoaders, getStylesheetEntries, getFileLoaders } from './webpack/loaders';
-
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-const fs = require('fs');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const path = require('path');
-const ReplaceInFileWebpackPlugin = require('replace-in-file-webpack-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
-const util = require('util');
-
-const readdirPromise = util.promisify(fs.readdir);
-const accessPromise = util.promisify(fs.access);
-
-export interface WebpackConfigurationOptions {
-  watch?: boolean;
-  production?: boolean;
-  preserveConsole?: boolean;
-}
-
-type WebpackConfigurationGetter = (options: WebpackConfigurationOptions) => Promise<webpack.Configuration>;
-
-export type CustomWebpackConfigurationGetter = (
-  originalConfig: webpack.Configuration,
-  options: WebpackConfigurationOptions
-) => webpack.Configuration;
-
-export const findModuleFiles = async (base: string, files?: string[], result?: string[]) => {
-  files = files || (await readdirPromise(base));
-  result = result || [];
-
-  if (files) {
-    await Promise.all(
-      files.map(async (file) => {
-        const newbase = path.join(base, file);
-        if (fs.statSync(newbase).isDirectory()) {
-          result = await findModuleFiles(newbase, await readdirPromise(newbase), result);
-        } else {
-          const filename = path.basename(file);
-          if (/^module.(t|j)sx?$/.exec(filename)) {
-            // @ts-ignore
-            result.push(newbase);
-          }
-        }
-      })
-    );
-  }
-  return result;
-};
-
-const getModuleFiles = () => {
-  return findModuleFiles(path.resolve(process.cwd(), 'src'));
-};
-
-const getManualChunk = (id: string) => {
-  if (id.endsWith('module.ts') || id.endsWith('module.js') || id.endsWith('module.tsx')) {
-    const idx = id.lastIndexOf(path.sep + 'src' + path.sep);
-    if (idx > 0) {
-      const name = id.substring(idx + 5, id.lastIndexOf('.'));
-
-      return {
-        name,
-        module: id,
-      };
-    }
-  }
-  return null;
-};
-
-const getEntries = async () => {
-  const entries: { [key: string]: string } = {};
-  const modules = await getModuleFiles();
-
-  modules.forEach((modFile) => {
-    const mod = getManualChunk(modFile);
-    // @ts-ignore
-    entries[mod.name] = mod.module;
-  });
-  return {
-    ...entries,
-    ...getStylesheetEntries(),
-  };
-};
-
-const getCommonPlugins = (options: WebpackConfigurationOptions) => {
-  const hasREADME = fs.existsSync(path.resolve(process.cwd(), 'src', 'README.md'));
-  const packageJson = require(path.resolve(process.cwd(), 'package.json'));
-  return [
-    new MiniCssExtractPlugin({
-      // both options are optional
-      filename: 'styles/[name].css',
-    }),
-    new CopyWebpackPlugin({
-      patterns: [
-        // If src/README.md exists use it; otherwise the root README
-        { from: hasREADME ? 'README.md' : '../README.md', to: '.', force: true, priority: 1, noErrorOnMissing: true },
-        { from: 'plugin.json', to: '.', noErrorOnMissing: true },
-        { from: '**/README.md', to: '[path]README.md', priority: 0, noErrorOnMissing: true },
-        { from: '../LICENSE', to: '.', noErrorOnMissing: true },
-        { from: '../CHANGELOG.md', to: '.', force: true, noErrorOnMissing: true },
-        { from: '**/*.{json,svg,png,html}', to: '.', noErrorOnMissing: true },
-        { from: 'img/**/*', to: '.', noErrorOnMissing: true },
-        { from: 'libs/**/*', to: '.', noErrorOnMissing: true },
-        { from: 'static/**/*', to: '.', noErrorOnMissing: true },
-      ],
-    }),
-
-    new ReplaceInFileWebpackPlugin([
-      {
-        dir: 'dist',
-        files: ['plugin.json', 'README.md'],
-        rules: [
-          {
-            search: '%VERSION%',
-            replace: packageJson.version,
-          },
-          {
-            search: '%TODAY%',
-            replace: new Date().toISOString().substring(0, 10),
-          },
-        ],
-      },
-    ]),
-    new ForkTsCheckerWebpackPlugin({
-      typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
-      issue: {
-        include: [{ file: '**/*.{ts,tsx}' }],
-      },
-    }),
-  ];
-};
-
-const getBaseWebpackConfig: WebpackConfigurationGetter = async (options) => {
-  const plugins = getCommonPlugins(options);
-  const optimization: { [key: string]: any } = {};
-
-  if (options.production) {
-    const compressOptions = { drop_console: !options.preserveConsole, drop_debugger: true };
-    optimization.minimizer = [
-      new TerserPlugin({ terserOptions: { compress: compressOptions } }),
-      new CssMinimizerPlugin(),
-    ];
-    optimization.chunkIds = 'total-size';
-    optimization.moduleIds = 'size';
-  } else if (options.watch) {
-    plugins.push(new HtmlWebpackPlugin());
-  }
-
-  return {
-    mode: options.production ? 'production' : 'development',
-    target: 'web',
-    context: path.join(process.cwd(), 'src'),
-    devtool: 'source-map',
-    entry: await getEntries(),
-    output: {
-      filename: '[name].js',
-      path: path.join(process.cwd(), 'dist'),
-      libraryTarget: 'amd',
-      publicPath: '/',
-    },
-    performance: { hints: false },
-    externals: [
-      'lodash',
-      'jquery',
-      'moment',
-      'slate',
-      'emotion',
-      '@emotion/react',
-      '@emotion/css',
-      'prismjs',
-      'slate-plain-serializer',
-      'slate-react',
-      'react',
-      'react-dom',
-      'react-redux',
-      'redux',
-      'rxjs',
-      'react-router',
-      'react-router-dom',
-      'd3',
-      'angular',
-      '@grafana/ui',
-      '@grafana/runtime',
-      '@grafana/data',
-      ({ request }, callback) => {
-        const prefix = 'grafana/';
-        if (request?.indexOf(prefix) === 0) {
-          return callback(undefined, request.slice(prefix.length));
-        }
-
-        callback();
-      },
-    ],
-    plugins,
-    resolve: {
-      extensions: ['.ts', '.tsx', '.js'],
-      modules: [path.resolve(process.cwd(), 'src'), 'node_modules'],
-      fallback: {
-        buffer: false,
-        fs: false,
-        stream: false,
-        http: false,
-        https: false,
-        string_decoder: false,
-        os: false,
-        timers: false,
-      },
-    },
-    module: {
-      rules: [
-        {
-          test: /\.[tj]sx?$/,
-          use: {
-            loader: require.resolve('babel-loader'),
-            options: {
-              cacheDirectory: true,
-              cacheCompression: false,
-              presets: [
-                [require.resolve('@babel/preset-env'), { modules: false }],
-                [
-                  require.resolve('@babel/preset-typescript'),
-                  {
-                    allowNamespaces: true,
-                    allowDeclareFields: true,
-                  },
-                ],
-                [require.resolve('@babel/preset-react')],
-              ],
-              plugins: [
-                [
-                  require.resolve('@babel/plugin-transform-typescript'),
-                  {
-                    allowNamespaces: true,
-                    allowDeclareFields: true,
-                  },
-                ],
-                require.resolve('@babel/plugin-proposal-class-properties'),
-                [require.resolve('@babel/plugin-proposal-object-rest-spread'), { loose: true }],
-                require.resolve('@babel/plugin-transform-react-constant-elements'),
-                require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
-                require.resolve('@babel/plugin-proposal-optional-chaining'),
-                require.resolve('@babel/plugin-syntax-dynamic-import'),
-                require.resolve('babel-plugin-angularjs-annotate'),
-              ],
-            },
-          },
-          exclude: /node_modules/,
-        },
-        ...getStyleLoaders(),
-        {
-          test: /\.html$/,
-          exclude: [/node_modules/],
-          use: {
-            loader: require.resolve('html-loader'),
-          },
-        },
-        ...getFileLoaders(),
-      ],
-    },
-    optimization,
-  };
-};
-
-export const loadWebpackConfig: WebpackConfigurationGetter = async (options) => {
-  const baseConfig = await getBaseWebpackConfig(options);
-  const customWebpackPath = path.resolve(process.cwd(), 'webpack.config.js');
-
-  try {
-    await accessPromise(customWebpackPath);
-    const customConfig = require(customWebpackPath);
-    const configGetter = customConfig.getWebpackConfig || customConfig;
-    if (typeof configGetter !== 'function') {
-      throw Error(
-        'Custom webpack config needs to export a function implementing CustomWebpackConfigurationGetter. Function needs to be ' +
-          'module export or named "getWebpackConfig"'
-      );
-    }
-    return (configGetter as CustomWebpackConfigurationGetter)(baseConfig, options);
-  } catch (err: any) {
-    if (err.code === 'ENOENT') {
-      return baseConfig;
-    }
-    throw err;
-  }
-};
diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.test.ts b/packages/grafana-toolkit/src/config/webpack/loaders.test.ts
deleted file mode 100644
index 4d63f47e1a2..00000000000
--- a/packages/grafana-toolkit/src/config/webpack/loaders.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { getStylesheetEntries } from './loaders';
-
-describe('Loaders', () => {
-  describe('stylesheet helpers', () => {
-    beforeEach(() => {
-      jest.spyOn(console, 'log').mockImplementation();
-    });
-
-    afterEach(() => {
-      jest.restoreAllMocks();
-    });
-
-    describe('getStylesheetEntries', () => {
-      it('returns entries for dark and light theme', () => {
-        const result = getStylesheetEntries(`${__dirname}/../mocks/stylesheetsSupport/ok`);
-        expect(Object.keys(result)).toHaveLength(2);
-      });
-      it('throws on theme files duplicates', () => {
-        const result = () => {
-          getStylesheetEntries(`${__dirname}/../mocks/stylesheetsSupport/duplicates`);
-        };
-        expect(result).toThrow();
-      });
-    });
-  });
-});
diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.ts b/packages/grafana-toolkit/src/config/webpack/loaders.ts
deleted file mode 100644
index f4b46d45458..00000000000
--- a/packages/grafana-toolkit/src/config/webpack/loaders.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-
-import { getPluginId } from '../utils/getPluginId';
-
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-
-const supportedExtensions = ['css', 'scss', 'less', 'sass'];
-
-const getStylesheetPaths = (root: string = process.cwd()) => {
-  return [`${root}/src/styles/light`, `${root}/src/styles/dark`];
-};
-
-export const getStylesheetEntries = (root: string = process.cwd()) => {
-  const stylesheetsPaths = getStylesheetPaths(root);
-  const entries: { [key: string]: string } = {};
-  supportedExtensions.forEach((e) => {
-    stylesheetsPaths.forEach((p) => {
-      const entryName = p.split('/').slice(-1)[0];
-      if (fs.existsSync(`${p}.${e}`)) {
-        if (entries[entryName]) {
-          console.log(`\nSeems like you have multiple files for ${entryName} theme:`);
-          console.log(entries[entryName]);
-          console.log(`${p}.${e}`);
-          throw new Error('Duplicated stylesheet');
-        } else {
-          entries[entryName] = `${p}.${e}`;
-        }
-      }
-    });
-  });
-
-  return entries;
-};
-
-export const getStyleLoaders = () => {
-  const extractionLoader = {
-    loader: MiniCssExtractPlugin.loader,
-    options: {
-      publicPath: '../',
-    },
-  };
-
-  const cssLoaders = [
-    {
-      loader: require.resolve('css-loader'),
-      options: {
-        importLoaders: 1,
-        sourceMap: true,
-      },
-    },
-    {
-      loader: require.resolve('postcss-loader'),
-      options: {
-        postcssOptions: {
-          plugins: () => [
-            require('postcss-flexbugs-fixes'),
-            require('postcss-preset-env')({
-              autoprefixer: { flexbox: 'no-2009', grid: true },
-            }),
-          ],
-        },
-      },
-    },
-  ];
-
-  const styleDir = path.resolve(process.cwd(), 'src', 'styles') + path.sep;
-  const rules = [
-    {
-      test: /(dark|light)\.css$/,
-      use: [extractionLoader, ...cssLoaders],
-    },
-    {
-      test: /(dark|light)\.scss$/,
-      use: [extractionLoader, ...cssLoaders, require.resolve('sass-loader')],
-    },
-    {
-      test: /\.css$/,
-      use: ['style-loader', ...cssLoaders, require.resolve('sass-loader')],
-      exclude: [`${styleDir}light.css`, `${styleDir}dark.css`],
-    },
-    {
-      test: /\.s[ac]ss$/,
-      use: ['style-loader', ...cssLoaders, require.resolve('sass-loader')],
-      exclude: [`${styleDir}light.scss`, `${styleDir}dark.scss`],
-    },
-    {
-      test: /\.less$/,
-      use: [
-        {
-          loader: require.resolve('style-loader'),
-        },
-        ...cssLoaders,
-        {
-          loader: require.resolve('less-loader'),
-          options: {
-            lessOptions: {
-              javascriptEnabled: true,
-            },
-          },
-        },
-      ],
-      exclude: [`${styleDir}light.less`, `${styleDir}dark.less`],
-    },
-  ];
-
-  return rules;
-};
-
-export const getFileLoaders = () => {
-  return [
-    {
-      test: /\.(png|jpe?g|gif|svg)$/,
-      type: 'asset/resource',
-      generator: {
-        publicPath: `public/plugins/${getPluginId()}/img/`,
-        outputPath: 'img/',
-      },
-    },
-    {
-      test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
-      type: 'asset/resource',
-      generator: {
-        publicPath: `public/plugins/${getPluginId()}/fonts/`,
-        outputPath: 'fonts/',
-      },
-    },
-  ];
-};
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index fd04cac7c97..00affc06f7d 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -14,6 +14,7 @@
   },
   "author": "Grafana Labs",
   "devDependencies": {
+    "@grafana/tsconfig": "^1.2.0-rc1",
     "@types/jest": "26.0.15",
     "@types/react": "18.0.28",
     "copy-webpack-plugin": "11.0.0",
diff --git a/plugins-bundled/internal/input-datasource/tsconfig.json b/plugins-bundled/internal/input-datasource/tsconfig.json
index 2be6ec78f05..78788d15d84 100644
--- a/plugins-bundled/internal/input-datasource/tsconfig.json
+++ b/plugins-bundled/internal/input-datasource/tsconfig.json
@@ -1,7 +1,8 @@
 {
-  "extends": "../../../packages/grafana-toolkit/src/config/tsconfig.plugin.json",
+  "extends": "@grafana/tsconfig",
   "include": ["src", "types"],
   "compilerOptions": {
+    "declaration": false,
     "rootDir": "./src",
     "baseUrl": "./src"
   },
diff --git a/yarn.lock b/yarn.lock
index 1d6c1490bcd..77b960f61c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,7 +31,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.3, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.5.5, @babel/code-frame@npm:^7.8.3":
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.3, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.5.5, @babel/code-frame@npm:^7.8.3":
   version: 7.18.6
   resolution: "@babel/code-frame@npm:7.18.6"
   dependencies:
@@ -40,7 +40,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.18.8, @babel/compat-data@npm:^7.20.1, @babel/compat-data@npm:^7.20.5":
+"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.20.1, @babel/compat-data@npm:^7.20.5":
   version: 7.21.0
   resolution: "@babel/compat-data@npm:7.21.0"
   checksum: dbf632c532f9c75ba0be7d1dc9f6cd3582501af52f10a6b90415d634ec5878735bd46064c91673b10317af94d4cc99c4da5bd9d955978cdccb7905fc33291e4d
@@ -71,29 +71,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.18.9":
-  version: 7.18.9
-  resolution: "@babel/core@npm:7.18.9"
-  dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.18.9
-    "@babel/helper-compilation-targets": ^7.18.9
-    "@babel/helper-module-transforms": ^7.18.9
-    "@babel/helpers": ^7.18.9
-    "@babel/parser": ^7.18.9
-    "@babel/template": ^7.18.6
-    "@babel/traverse": ^7.18.9
-    "@babel/types": ^7.18.9
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.1
-    semver: ^6.3.0
-  checksum: 64b9088b03fdf659b334864ef93bed85d60c17b27fcbd72970f8eb9e0d3266ffa5a1926960f648f2db36b0bafec615f947ea5117d200599a0661b9f0a9cdf323
-  languageName: node
-  linkType: hard
-
 "@babel/core@npm:7.20.5":
   version: 7.20.5
   resolution: "@babel/core@npm:7.20.5"
@@ -117,7 +94,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.0":
+"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.7.5":
   version: 7.21.3
   resolution: "@babel/core@npm:7.21.3"
   dependencies:
@@ -140,7 +117,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.9, @babel/generator@npm:^7.20.5, @babel/generator@npm:^7.21.3, @babel/generator@npm:^7.7.2":
+"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.20.5, @babel/generator@npm:^7.21.3, @babel/generator@npm:^7.7.2":
   version: 7.21.3
   resolution: "@babel/generator@npm:7.21.3"
   dependencies:
@@ -234,7 +211,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.3.1, @babel/helper-define-polyfill-provider@npm:^0.3.2, @babel/helper-define-polyfill-provider@npm:^0.3.3":
+"@babel/helper-define-polyfill-provider@npm:^0.3.3":
   version: 0.3.3
   resolution: "@babel/helper-define-polyfill-provider@npm:0.3.3"
   dependencies:
@@ -303,7 +280,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.18.9, @babel/helper-module-transforms@npm:^7.20.11, @babel/helper-module-transforms@npm:^7.20.2, @babel/helper-module-transforms@npm:^7.21.2":
+"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.20.11, @babel/helper-module-transforms@npm:^7.20.2, @babel/helper-module-transforms@npm:^7.21.2":
   version: 7.21.2
   resolution: "@babel/helper-module-transforms@npm:7.21.2"
   dependencies:
@@ -379,7 +356,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9, @babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0":
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0":
   version: 7.20.0
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.20.0"
   dependencies:
@@ -430,7 +407,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.18.9, @babel/helpers@npm:^7.20.5, @babel/helpers@npm:^7.21.0":
+"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.20.5, @babel/helpers@npm:^7.21.0":
   version: 7.21.0
   resolution: "@babel/helpers@npm:7.21.0"
   dependencies:
@@ -452,7 +429,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.9, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.3":
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.3":
   version: 7.21.3
   resolution: "@babel/parser@npm:7.21.3"
   bin:
@@ -485,7 +462,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-async-generator-functions@npm:^7.18.6, @babel/plugin-proposal-async-generator-functions@npm:^7.20.1":
+"@babel/plugin-proposal-async-generator-functions@npm:^7.20.1":
   version: 7.20.7
   resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.20.7"
   dependencies:
@@ -636,22 +613,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-object-rest-spread@npm:7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.18.9"
-  dependencies:
-    "@babel/compat-data": ^7.18.8
-    "@babel/helper-compilation-targets": ^7.18.9
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.18.8
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 66b9bae741d46edf1c96776d26dfe5d335981e57164ec2450583e3d20dfaa08a5137ffebb897e443913207789f9816bfec4ae845f38762c0196a60949eaffdba
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-object-rest-spread@npm:7.20.7, @babel/plugin-proposal-object-rest-spread@npm:^7.12.1, @babel/plugin-proposal-object-rest-spread@npm:^7.18.9, @babel/plugin-proposal-object-rest-spread@npm:^7.20.2":
+"@babel/plugin-proposal-object-rest-spread@npm:7.20.7, @babel/plugin-proposal-object-rest-spread@npm:^7.12.1, @babel/plugin-proposal-object-rest-spread@npm:^7.20.2":
   version: 7.20.7
   resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.7"
   dependencies:
@@ -678,19 +640,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-chaining@npm:7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.18.9
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f2db40e26172f07c50b635cb61e1f36165de3ba868fcf608d967642f0d044b7c6beb0e7ecf17cbd421144b99e1eae7ad6031ded92925343bb0ed1d08707b514f
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-optional-chaining@npm:7.20.7":
   version: 7.20.7
   resolution: "@babel/plugin-proposal-optional-chaining@npm:7.20.7"
@@ -854,7 +803,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.18.6, @babel/plugin-syntax-import-assertions@npm:^7.20.0":
+"@babel/plugin-syntax-import-assertions@npm:^7.20.0":
   version: 7.20.0
   resolution: "@babel/plugin-syntax-import-assertions@npm:7.20.0"
   dependencies:
@@ -997,7 +946,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.18.6, @babel/plugin-syntax-typescript@npm:^7.20.0, @babel/plugin-syntax-typescript@npm:^7.7.2":
+"@babel/plugin-syntax-typescript@npm:^7.20.0, @babel/plugin-syntax-typescript@npm:^7.7.2":
   version: 7.20.0
   resolution: "@babel/plugin-syntax-typescript@npm:7.20.0"
   dependencies:
@@ -1043,7 +992,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.12.12, @babel/plugin-transform-block-scoping@npm:^7.18.9, @babel/plugin-transform-block-scoping@npm:^7.20.2":
+"@babel/plugin-transform-block-scoping@npm:^7.12.12, @babel/plugin-transform-block-scoping@npm:^7.20.2":
   version: 7.21.0
   resolution: "@babel/plugin-transform-block-scoping@npm:7.21.0"
   dependencies:
@@ -1054,7 +1003,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.12.1, @babel/plugin-transform-classes@npm:^7.18.9, @babel/plugin-transform-classes@npm:^7.20.2":
+"@babel/plugin-transform-classes@npm:^7.12.1, @babel/plugin-transform-classes@npm:^7.20.2":
   version: 7.21.0
   resolution: "@babel/plugin-transform-classes@npm:7.21.0"
   dependencies:
@@ -1085,7 +1034,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.12.1, @babel/plugin-transform-destructuring@npm:^7.18.9, @babel/plugin-transform-destructuring@npm:^7.20.2":
+"@babel/plugin-transform-destructuring@npm:^7.12.1, @babel/plugin-transform-destructuring@npm:^7.20.2":
   version: 7.21.3
   resolution: "@babel/plugin-transform-destructuring@npm:7.21.3"
   dependencies:
@@ -1189,7 +1138,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.18.6, @babel/plugin-transform-modules-amd@npm:^7.19.6":
+"@babel/plugin-transform-modules-amd@npm:^7.19.6":
   version: 7.20.11
   resolution: "@babel/plugin-transform-modules-amd@npm:7.20.11"
   dependencies:
@@ -1201,7 +1150,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.18.6, @babel/plugin-transform-modules-commonjs@npm:^7.19.6":
+"@babel/plugin-transform-modules-commonjs@npm:^7.19.6":
   version: 7.21.2
   resolution: "@babel/plugin-transform-modules-commonjs@npm:7.21.2"
   dependencies:
@@ -1214,7 +1163,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.18.9, @babel/plugin-transform-modules-systemjs@npm:^7.19.6":
+"@babel/plugin-transform-modules-systemjs@npm:^7.19.6":
   version: 7.20.11
   resolution: "@babel/plugin-transform-modules-systemjs@npm:7.20.11"
   dependencies:
@@ -1240,7 +1189,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.18.6, @babel/plugin-transform-named-capturing-groups-regex@npm:^7.19.1":
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.19.1":
   version: 7.20.5
   resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.20.5"
   dependencies:
@@ -1275,7 +1224,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.12.1, @babel/plugin-transform-parameters@npm:^7.18.8, @babel/plugin-transform-parameters@npm:^7.20.1, @babel/plugin-transform-parameters@npm:^7.20.7":
+"@babel/plugin-transform-parameters@npm:^7.12.1, @babel/plugin-transform-parameters@npm:^7.20.1, @babel/plugin-transform-parameters@npm:^7.20.7":
   version: 7.21.3
   resolution: "@babel/plugin-transform-parameters@npm:7.21.3"
   dependencies:
@@ -1297,17 +1246,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-constant-elements@npm:7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-react-constant-elements@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bbdc4bc38317e62bb729d6d2b48bfac4cca52cb476a1a537a6fe693610852a6f2c3b3f616e1c73f17fb4b0dae551b1c96f898b7867a02ff2fbe3e858a346c767
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-react-constant-elements@npm:7.20.2":
   version: 7.20.2
   resolution: "@babel/plugin-transform-react-constant-elements@npm:7.20.2"
@@ -1391,22 +1329,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-runtime@npm:7.18.10":
-  version: 7.18.10
-  resolution: "@babel/plugin-transform-runtime@npm:7.18.10"
-  dependencies:
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.9
-    babel-plugin-polyfill-corejs2: ^0.3.2
-    babel-plugin-polyfill-corejs3: ^0.5.3
-    babel-plugin-polyfill-regenerator: ^0.4.0
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 98c18680b4258b8bd3f04926b73c72ae77037d5ea5b50761ca35de15896bf0d04bedabde39a81be56dbd4859c96ffaa7103fbefb5d5b58a36e0a80381e4a146c
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-runtime@npm:7.19.6":
   version: 7.19.6
   resolution: "@babel/plugin-transform-runtime@npm:7.19.6"
@@ -1434,7 +1356,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.12.1, @babel/plugin-transform-spread@npm:^7.18.9, @babel/plugin-transform-spread@npm:^7.19.0":
+"@babel/plugin-transform-spread@npm:^7.12.1, @babel/plugin-transform-spread@npm:^7.19.0":
   version: 7.20.7
   resolution: "@babel/plugin-transform-spread@npm:7.20.7"
   dependencies:
@@ -1479,19 +1401,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:7.19.0":
-  version: 7.19.0
-  resolution: "@babel/plugin-transform-typescript@npm:7.19.0"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.19.0
-    "@babel/helper-plugin-utils": ^7.19.0
-    "@babel/plugin-syntax-typescript": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d5ed076c1cd7a41efe0da7d9afdcb6281db574b4307243b9f0f96ae255d9efdca47b4aeed5c306d1ad296e683498965c01ecaa147217559e01eceadc350ca4c2
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-typescript@npm:7.20.0":
   version: 7.20.0
   resolution: "@babel/plugin-transform-typescript@npm:7.20.0"
@@ -1519,7 +1428,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.18.10, @babel/plugin-transform-unicode-escapes@npm:^7.18.6":
+"@babel/plugin-transform-unicode-escapes@npm:^7.18.10":
   version: 7.18.10
   resolution: "@babel/plugin-transform-unicode-escapes@npm:7.18.10"
   dependencies:
@@ -1552,91 +1461,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.18.9":
-  version: 7.18.9
-  resolution: "@babel/preset-env@npm:7.18.9"
-  dependencies:
-    "@babel/compat-data": ^7.18.8
-    "@babel/helper-compilation-targets": ^7.18.9
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/helper-validator-option": ^7.18.6
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.18.9
-    "@babel/plugin-proposal-async-generator-functions": ^7.18.6
-    "@babel/plugin-proposal-class-properties": ^7.18.6
-    "@babel/plugin-proposal-class-static-block": ^7.18.6
-    "@babel/plugin-proposal-dynamic-import": ^7.18.6
-    "@babel/plugin-proposal-export-namespace-from": ^7.18.9
-    "@babel/plugin-proposal-json-strings": ^7.18.6
-    "@babel/plugin-proposal-logical-assignment-operators": ^7.18.9
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6
-    "@babel/plugin-proposal-numeric-separator": ^7.18.6
-    "@babel/plugin-proposal-object-rest-spread": ^7.18.9
-    "@babel/plugin-proposal-optional-catch-binding": ^7.18.6
-    "@babel/plugin-proposal-optional-chaining": ^7.18.9
-    "@babel/plugin-proposal-private-methods": ^7.18.6
-    "@babel/plugin-proposal-private-property-in-object": ^7.18.6
-    "@babel/plugin-proposal-unicode-property-regex": ^7.18.6
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-    "@babel/plugin-syntax-class-properties": ^7.12.13
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-    "@babel/plugin-syntax-import-assertions": ^7.18.6
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-    "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-transform-arrow-functions": ^7.18.6
-    "@babel/plugin-transform-async-to-generator": ^7.18.6
-    "@babel/plugin-transform-block-scoped-functions": ^7.18.6
-    "@babel/plugin-transform-block-scoping": ^7.18.9
-    "@babel/plugin-transform-classes": ^7.18.9
-    "@babel/plugin-transform-computed-properties": ^7.18.9
-    "@babel/plugin-transform-destructuring": ^7.18.9
-    "@babel/plugin-transform-dotall-regex": ^7.18.6
-    "@babel/plugin-transform-duplicate-keys": ^7.18.9
-    "@babel/plugin-transform-exponentiation-operator": ^7.18.6
-    "@babel/plugin-transform-for-of": ^7.18.8
-    "@babel/plugin-transform-function-name": ^7.18.9
-    "@babel/plugin-transform-literals": ^7.18.9
-    "@babel/plugin-transform-member-expression-literals": ^7.18.6
-    "@babel/plugin-transform-modules-amd": ^7.18.6
-    "@babel/plugin-transform-modules-commonjs": ^7.18.6
-    "@babel/plugin-transform-modules-systemjs": ^7.18.9
-    "@babel/plugin-transform-modules-umd": ^7.18.6
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.18.6
-    "@babel/plugin-transform-new-target": ^7.18.6
-    "@babel/plugin-transform-object-super": ^7.18.6
-    "@babel/plugin-transform-parameters": ^7.18.8
-    "@babel/plugin-transform-property-literals": ^7.18.6
-    "@babel/plugin-transform-regenerator": ^7.18.6
-    "@babel/plugin-transform-reserved-words": ^7.18.6
-    "@babel/plugin-transform-shorthand-properties": ^7.18.6
-    "@babel/plugin-transform-spread": ^7.18.9
-    "@babel/plugin-transform-sticky-regex": ^7.18.6
-    "@babel/plugin-transform-template-literals": ^7.18.9
-    "@babel/plugin-transform-typeof-symbol": ^7.18.9
-    "@babel/plugin-transform-unicode-escapes": ^7.18.6
-    "@babel/plugin-transform-unicode-regex": ^7.18.6
-    "@babel/preset-modules": ^0.1.5
-    "@babel/types": ^7.18.9
-    babel-plugin-polyfill-corejs2: ^0.3.1
-    babel-plugin-polyfill-corejs3: ^0.5.2
-    babel-plugin-polyfill-regenerator: ^0.3.1
-    core-js-compat: ^3.22.1
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 311002b9255d1aa261afe712ab73a93687652437804e2f44e6cc55438f8b199463f53bb2b8e0912b0034f208a42eee664a9e126a6061ca504a792ede97dd027e
-  languageName: node
-  linkType: hard
-
 "@babel/preset-env@npm:7.20.2, @babel/preset-env@npm:^7.12.11":
   version: 7.20.2
   resolution: "@babel/preset-env@npm:7.20.2"
@@ -1832,7 +1656,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.12.7, @babel/template@npm:^7.18.10, @babel/template@npm:^7.18.6, @babel/template@npm:^7.20.7, @babel/template@npm:^7.3.3":
+"@babel/template@npm:^7.12.7, @babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.3.3":
   version: 7.20.7
   resolution: "@babel/template@npm:7.20.7"
   dependencies:
@@ -1843,7 +1667,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.3, @babel/traverse@npm:^7.7.2":
+"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.3, @babel/traverse@npm:^7.7.2":
   version: 7.21.3
   resolution: "@babel/traverse@npm:7.21.3"
   dependencies:
@@ -2083,97 +1907,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^1.0.3":
-  version: 1.1.0
-  resolution: "@csstools/postcss-color-function@npm:1.1.0"
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties": ^1.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 1378858848067fce67b5b7d1daeb3082bddeacddc588cea0fd85e5d7a0bb5cd4f43fea9b96fced2bc1c45171f8900d1f5ebfe13f574c360164c79e055868befb
-  languageName: node
-  linkType: hard
-
-"@csstools/postcss-font-format-keywords@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/postcss-font-format-keywords@npm:1.0.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.3
-  checksum: 4f41dccc46b51568b0517420d150ca105c31a2652f028f070e7457213f4e950420385d72ee869d75f592811da3a03cb46d11935d51f29b73d9ab24c10b3140e5
-  languageName: node
-  linkType: hard
-
-"@csstools/postcss-hwb-function@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/postcss-hwb-function@npm:1.0.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.3
-  checksum: 7d91ae87d40ece32d57f0fc0c777ff9256bb85c609e2c5e812dc9d9ea98688ea959c3d94b296f69135e99822db361ac447cb7f398a2daeebcc0203d0ee5961c9
-  languageName: node
-  linkType: hard
-
-"@csstools/postcss-ic-unit@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/postcss-ic-unit@npm:1.0.0"
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties": ^1.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.3
-  checksum: d194b13a66027558d2d0dd3be3b795167b5e751bb3a3e62928c77ef1c524f0d672a7658852f07e589abbb64e827096eac00d9b6d7ec79e21006fd4f6f0b3ce87
-  languageName: node
-  linkType: hard
-
-"@csstools/postcss-is-pseudo-class@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "@csstools/postcss-is-pseudo-class@npm:2.0.2"
-  dependencies:
-    postcss-selector-parser: ^6.0.10
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 7118ae8f0fd72d43a7ba770103d8a2fd57fcd7f26972e2285c803fc1a48debd8ff07695132f1e5743a111b71b62d83083a6788c4150b37cf6ea5a550cf10e789
-  languageName: node
-  linkType: hard
-
-"@csstools/postcss-normalize-display-values@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/postcss-normalize-display-values@npm:1.0.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.3
-  checksum: 5751a171f3ccd5d411bf1945e306b7a3191a82a52743b65c9f04ec4beffc0e087c32f024929fb51e46388bd197545699e279d87a53acfbc40dd5594e862b24af
-  languageName: node
-  linkType: hard
-
-"@csstools/postcss-oklab-function@npm:^1.0.2":
-  version: 1.1.0
-  resolution: "@csstools/postcss-oklab-function@npm:1.1.0"
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties": ^1.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: d59616e6acc0466ce87626c50b519a26391ac643d135c0316a4bfca27396c922b67a57cbe6adda3864123f8b9c1b48a0427e499a357887f5c0f3a0aa00b1b71b
-  languageName: node
-  linkType: hard
-
-"@csstools/postcss-progressive-custom-properties@npm:^1.1.0, @csstools/postcss-progressive-custom-properties@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "@csstools/postcss-progressive-custom-properties@npm:1.3.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.3
-  checksum: e281845fde5b8a80d06ec20147bd74e96a9351bebbec5e5c3a6fb37ea30a597ff84172601786a8a270662f58f708b4a3bf8d822d6318023def9773d2f6589962
-  languageName: node
-  linkType: hard
-
 "@csstools/selector-specificity@npm:^2.1.1":
   version: 2.1.1
   resolution: "@csstools/selector-specificity@npm:2.1.1"
@@ -2854,23 +2587,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "@eslint/eslintrc@npm:1.3.0"
-  dependencies:
-    ajv: ^6.12.4
-    debug: ^4.3.2
-    espree: ^9.3.2
-    globals: ^13.15.0
-    ignore: ^5.2.0
-    import-fresh: ^3.2.1
-    js-yaml: ^4.1.0
-    minimatch: ^3.1.2
-    strip-json-comments: ^3.1.1
-  checksum: a1e734ad31a8b5328dce9f479f185fd4fc83dd7f06c538e1fa457fd8226b89602a55cc6458cd52b29573b01cdfaf42331be8cfc1fec732570086b591f4ed6515
-  languageName: node
-  linkType: hard
-
 "@eslint/eslintrc@npm:^1.3.3":
   version: 1.3.3
   resolution: "@eslint/eslintrc@npm:1.3.3"
@@ -3005,6 +2721,7 @@ __metadata:
   resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
   dependencies:
     "@grafana/data": 10.0.0-pre
+    "@grafana/tsconfig": ^1.2.0-rc1
     "@grafana/ui": 10.0.0-pre
     "@types/jest": 26.0.15
     "@types/react": 18.0.28
@@ -3381,77 +3098,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit"
   dependencies:
-    "@babel/core": 7.18.9
-    "@babel/plugin-proposal-class-properties": 7.18.6
-    "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6
-    "@babel/plugin-proposal-object-rest-spread": 7.18.9
-    "@babel/plugin-proposal-optional-chaining": 7.18.9
-    "@babel/plugin-syntax-dynamic-import": 7.8.3
-    "@babel/plugin-transform-react-constant-elements": 7.18.9
-    "@babel/plugin-transform-runtime": 7.18.10
-    "@babel/plugin-transform-typescript": 7.19.0
-    "@babel/preset-env": 7.18.9
-    "@babel/preset-react": 7.18.6
-    "@babel/preset-typescript": 7.18.6
-    "@grafana/data": 10.0.0-pre
-    "@grafana/eslint-config": 5.1.0
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.0.0-pre
-    "@jest/core": 27.5.1
-    "@types/eslint": 8.4.1
-    "@types/jest": 27.4.1
-    "@types/lodash": ^4.14.194
     "@types/node": 16.11.26
-    "@types/prettier": 2.6.3
-    "@types/react-dev-utils": 9.0.10
-    "@types/rimraf": 3.0.2
-    "@types/tmp": 0.2.3
-    "@typescript-eslint/eslint-plugin": 5.36.2
-    "@typescript-eslint/parser": 5.36.2
-    babel-jest: 27.5.1
-    babel-loader: ^8.2.5
-    babel-plugin-angularjs-annotate: 0.10.0
     chalk: ^4.1.2
     commander: ^9.2.0
-    copy-webpack-plugin: ^9.0.1
-    css-loader: ^6.7.1
-    css-minimizer-webpack-plugin: ^3.4.1
-    eslint: 8.20.0
-    eslint-config-prettier: 8.5.0
-    eslint-plugin-jsdoc: 39.6.2
-    eslint-plugin-react: 7.29.4
-    eslint-plugin-react-hooks: 4.6.0
-    execa: ^5.1.1
-    fork-ts-checker-webpack-plugin: ^7.2.1
-    globby: ^11.0.4
-    html-loader: ^3.1.0
-    html-webpack-plugin: ^5.5.0
-    jest: 27.5.1
-    jest-canvas-mock: 2.3.1
-    jest-junit: 13.1.0
-    less: ^4.1.2
-    less-loader: ^10.2.0
-    lodash: 4.17.21
-    mini-css-extract-plugin: ^2.6.0
-    ora: ^5.4.1
-    postcss: ^8.4.12
-    postcss-flexbugs-fixes: ^5.0.2
-    postcss-loader: ^6.2.1
-    postcss-preset-env: 7.4.3
-    prettier: 2.7.1
-    react-dev-utils: ^12.0.0
-    replace-in-file-webpack-plugin: 1.0.6
-    rimraf: 3.0.2
-    sass: ^1.49.9
-    sass-loader: ^12.6.0
-    style-loader: ^3.3.1
-    terser-webpack-plugin: ^5.3.1
-    ts-jest: 27.1.3
-    ts-loader: ^9.3.1
-    ts-node: ^9.1.0
-    tslib: 2.4.0
+    tslib: 2.5.0
     typescript: 4.8.2
-    webpack: ^5.76.0
   bin:
     grafana-toolkit: ./bin/grafana-toolkit.js
   languageName: unknown
@@ -3662,17 +3314,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.9.2":
-  version: 0.9.3
-  resolution: "@humanwhocodes/config-array@npm:0.9.3"
-  dependencies:
-    "@humanwhocodes/object-schema": ^1.2.1
-    debug: ^4.1.1
-    minimatch: ^3.0.4
-  checksum: 6e5d7d274941c459bab0a14a87e372206d89fad3e4879d982edc942e8cc34da6510ea3644b8535a2a9edaa6527e91dccceabc6837ffa8ee506d66bca5d269ebc
-  languageName: node
-  linkType: hard
-
 "@humanwhocodes/module-importer@npm:^1.0.1":
   version: 1.0.1
   resolution: "@humanwhocodes/module-importer@npm:1.0.1"
@@ -3758,20 +3399,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/console@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/console@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    chalk: ^4.0.0
-    jest-message-util: ^27.5.1
-    jest-util: ^27.5.1
-    slash: ^3.0.0
-  checksum: 7cb20f06a34b09734c0342685ec53aa4c401fe3757c13a9c58fce76b971a322eb884f6de1068ef96f746e5398e067371b89515a07c268d4440a867c87748a706
-  languageName: node
-  linkType: hard
-
 "@jest/console@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/console@npm:29.3.1"
@@ -3786,47 +3413,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/core@npm:27.5.1, @jest/core@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/core@npm:27.5.1"
-  dependencies:
-    "@jest/console": ^27.5.1
-    "@jest/reporters": ^27.5.1
-    "@jest/test-result": ^27.5.1
-    "@jest/transform": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    ansi-escapes: ^4.2.1
-    chalk: ^4.0.0
-    emittery: ^0.8.1
-    exit: ^0.1.2
-    graceful-fs: ^4.2.9
-    jest-changed-files: ^27.5.1
-    jest-config: ^27.5.1
-    jest-haste-map: ^27.5.1
-    jest-message-util: ^27.5.1
-    jest-regex-util: ^27.5.1
-    jest-resolve: ^27.5.1
-    jest-resolve-dependencies: ^27.5.1
-    jest-runner: ^27.5.1
-    jest-runtime: ^27.5.1
-    jest-snapshot: ^27.5.1
-    jest-util: ^27.5.1
-    jest-validate: ^27.5.1
-    jest-watcher: ^27.5.1
-    micromatch: ^4.0.4
-    rimraf: ^3.0.0
-    slash: ^3.0.0
-    strip-ansi: ^6.0.0
-  peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  checksum: 904a94ad8f1b43cd6b48de3b0226659bff3696150ff8cf7680fc2faffdc8a115203bb9ab6e817c1f79f9d6a81f67953053cbc64d8a4604f2e0c42a04c28cf126
-  languageName: node
-  linkType: hard
-
 "@jest/core@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/core@npm:29.3.1"
@@ -3868,18 +3454,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/environment@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/environment@npm:27.5.1"
-  dependencies:
-    "@jest/fake-timers": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    jest-mock: ^27.5.1
-  checksum: 2a9e18c35a015508dbec5b90b21c150230fa6c1c8cb8fabe029d46ee2ca4c40eb832fb636157da14c66590d0a4c8a2c053226b041f54a44507d6f6a89abefd66
-  languageName: node
-  linkType: hard
-
 "@jest/environment@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/environment@npm:29.3.1"
@@ -3911,20 +3485,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/fake-timers@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/fake-timers@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    "@sinonjs/fake-timers": ^8.0.1
-    "@types/node": "*"
-    jest-message-util: ^27.5.1
-    jest-mock: ^27.5.1
-    jest-util: ^27.5.1
-  checksum: 02a0561ed2f4586093facd4ae500b74694f187ac24d4a00e949a39a1c5325bca8932b4fcb0388a2c5ed0656506fc1cf51fd3e32cdd48cea7497ad9c6e028aba8
-  languageName: node
-  linkType: hard
-
 "@jest/fake-timers@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/fake-timers@npm:29.3.1"
@@ -3939,17 +3499,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/globals@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/globals@npm:27.5.1"
-  dependencies:
-    "@jest/environment": ^27.5.1
-    "@jest/types": ^27.5.1
-    expect: ^27.5.1
-  checksum: 087f97047e9dcf555f76fe2ce54aee681e005eaa837a0c0c2d251df6b6412c892c9df54cb871b180342114389a5ff895a4e52e6e6d3d0015bf83c02a54f64c3c
-  languageName: node
-  linkType: hard
-
 "@jest/globals@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/globals@npm:29.3.1"
@@ -3962,44 +3511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/reporters@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/reporters@npm:27.5.1"
-  dependencies:
-    "@bcoe/v8-coverage": ^0.2.3
-    "@jest/console": ^27.5.1
-    "@jest/test-result": ^27.5.1
-    "@jest/transform": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    chalk: ^4.0.0
-    collect-v8-coverage: ^1.0.0
-    exit: ^0.1.2
-    glob: ^7.1.2
-    graceful-fs: ^4.2.9
-    istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-instrument: ^5.1.0
-    istanbul-lib-report: ^3.0.0
-    istanbul-lib-source-maps: ^4.0.0
-    istanbul-reports: ^3.1.3
-    jest-haste-map: ^27.5.1
-    jest-resolve: ^27.5.1
-    jest-util: ^27.5.1
-    jest-worker: ^27.5.1
-    slash: ^3.0.0
-    source-map: ^0.6.0
-    string-length: ^4.0.1
-    terminal-link: ^2.0.0
-    v8-to-istanbul: ^8.1.0
-  peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  checksum: faba5eafb86e62b62e152cafc8812d56308f9d1e8b77f3a7dcae4a8803a20a60a0909cc43ed73363ef649bf558e4fb181c7a336d144c89f7998279d1882bb69e
-  languageName: node
-  linkType: hard
-
 "@jest/reporters@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/reporters@npm:29.3.1"
@@ -4055,17 +3566,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/source-map@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/source-map@npm:27.5.1"
-  dependencies:
-    callsites: ^3.0.0
-    graceful-fs: ^4.2.9
-    source-map: ^0.6.0
-  checksum: 4fb1e743b602841babf7e22bd84eca34676cb05d4eb3b604cae57fc59e406099f5ac759ac1a0d04d901237d143f0f4f234417306e823bde732a1d19982230862
-  languageName: node
-  linkType: hard
-
 "@jest/source-map@npm:^29.2.0":
   version: 29.2.0
   resolution: "@jest/source-map@npm:29.2.0"
@@ -4077,18 +3577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/test-result@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/test-result@npm:27.5.1"
-  dependencies:
-    "@jest/console": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/istanbul-lib-coverage": ^2.0.0
-    collect-v8-coverage: ^1.0.0
-  checksum: 338f7c509d6a3bc6d7dd7388c8f6f548b87638e171dc1fddfedcacb4e8950583288832223ba688058cbcf874b937d22bdc0fa88f79f5fc666f77957e465c06a5
-  languageName: node
-  linkType: hard
-
 "@jest/test-result@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/test-result@npm:29.3.1"
@@ -4101,18 +3589,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/test-sequencer@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/test-sequencer@npm:27.5.1"
-  dependencies:
-    "@jest/test-result": ^27.5.1
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^27.5.1
-    jest-runtime: ^27.5.1
-  checksum: f21f9c8bb746847f7f89accfd29d6046eec1446f0b54e4694444feaa4df379791f76ef0f5a4360aafcbc73b50bc979f68b8a7620de404019d3de166be6720cb0
-  languageName: node
-  linkType: hard
-
 "@jest/test-sequencer@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/test-sequencer@npm:29.3.1"
@@ -4148,29 +3624,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/transform@npm:27.5.1"
-  dependencies:
-    "@babel/core": ^7.1.0
-    "@jest/types": ^27.5.1
-    babel-plugin-istanbul: ^6.1.1
-    chalk: ^4.0.0
-    convert-source-map: ^1.4.0
-    fast-json-stable-stringify: ^2.0.0
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^27.5.1
-    jest-regex-util: ^27.5.1
-    jest-util: ^27.5.1
-    micromatch: ^4.0.4
-    pirates: ^4.0.4
-    slash: ^3.0.0
-    source-map: ^0.6.1
-    write-file-atomic: ^3.0.0
-  checksum: a22079121aedea0f20a03a9c026be971f7b92adbfb4d5fd1fb67be315741deac4f056936d7c72a53b24aa5a1071bc942c003925fd453bf3f6a0ae5da6384e137
-  languageName: node
-  linkType: hard
-
 "@jest/transform@npm:^29.3.1":
   version: 29.3.1
   resolution: "@jest/transform@npm:29.3.1"
@@ -4220,32 +3673,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^27.4.2":
-  version: 27.4.2
-  resolution: "@jest/types@npm:27.4.2"
-  dependencies:
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^3.0.0
-    "@types/node": "*"
-    "@types/yargs": ^16.0.0
-    chalk: ^4.0.0
-  checksum: 1191022023e32763063cc1c8b1143fa316fb05db2f9698280a7bdbafcabd989e5fd64f8eb875b8a2e54c53f25dba45ed2eea8ced394d9e484da0fda674cd17a5
-  languageName: node
-  linkType: hard
-
-"@jest/types@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/types@npm:27.5.1"
-  dependencies:
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^3.0.0
-    "@types/node": "*"
-    "@types/yargs": ^16.0.0
-    chalk: ^4.0.0
-  checksum: d1f43cc946d87543ddd79d49547aab2399481d34025d5c5f2025d3d99c573e1d9832fa83cef25e9d9b07a8583500229d15bbb07b8e233d127d911d133e2f14b1
-  languageName: node
-  linkType: hard
-
 "@jest/types@npm:^29.2.1":
   version: 29.2.1
   resolution: "@jest/types@npm:29.2.1"
@@ -7151,15 +6578,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinonjs/fake-timers@npm:^8.0.1":
-  version: 8.1.0
-  resolution: "@sinonjs/fake-timers@npm:8.1.0"
-  dependencies:
-    "@sinonjs/commons": ^1.7.0
-  checksum: 09b5a158ce013a6c37613258bad79ca4efeb99b1f59c41c73cca36cac00b258aefcf46eeea970fccf06b989414d86fe9f54c1102272c0c3bdd51a313cea80949
-  languageName: node
-  linkType: hard
-
 "@sinonjs/fake-timers@npm:^9.1.2":
   version: 9.1.2
   resolution: "@sinonjs/fake-timers@npm:9.1.2"
@@ -8928,7 +8346,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14":
+"@types/babel__core@npm:^7.1.14":
   version: 7.1.16
   resolution: "@types/babel__core@npm:7.1.16"
   dependencies:
@@ -8960,7 +8378,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.4, @types/babel__traverse@npm:^7.0.6":
+"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6":
   version: 7.14.2
   resolution: "@types/babel__traverse@npm:7.14.2"
   dependencies:
@@ -9004,16 +8422,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/clean-css@npm:*":
-  version: 4.2.5
-  resolution: "@types/clean-css@npm:4.2.5"
-  dependencies:
-    "@types/node": "*"
-    source-map: ^0.6.0
-  checksum: 640f0c47ecda76fa15d1d4ea0cd49c6f617f080147b09aae009cafe90bd69362d018abbe61823ac3b867b1057ef7b2c64162ce9fbf876c524800d80c9f87a9e2
-  languageName: node
-  linkType: hard
-
 "@types/common-tags@npm:^1.8.0":
   version: 1.8.1
   resolution: "@types/common-tags@npm:1.8.1"
@@ -9021,7 +8429,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/connect-history-api-fallback@npm:*, @types/connect-history-api-fallback@npm:^1.3.5":
+"@types/connect-history-api-fallback@npm:^1.3.5":
   version: 1.3.5
   resolution: "@types/connect-history-api-fallback@npm:1.3.5"
   dependencies:
@@ -9413,16 +8821,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:8.4.1":
-  version: 8.4.1
-  resolution: "@types/eslint@npm:8.4.1"
-  dependencies:
-    "@types/estree": "*"
-    "@types/json-schema": "*"
-  checksum: b5790997ee9d3820d16350192d41849b0e2448c9e93650acac672ddf502e35c0a5a25547172a9eec840a96687cd94ba1cee672cbd86640f8f4ff1b65960d2ab9
-  languageName: node
-  linkType: hard
-
 "@types/estree-jsx@npm:^1.0.0":
   version: 1.0.0
   resolution: "@types/estree-jsx@npm:1.0.0"
@@ -9573,37 +8971,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/html-minifier@npm:*":
-  version: 4.0.1
-  resolution: "@types/html-minifier@npm:4.0.1"
-  dependencies:
-    "@types/clean-css": "*"
-    "@types/relateurl": "*"
-    "@types/uglify-js": "*"
-  checksum: a149f6b8ea923153c19d4cedb3b3f2840b5f1f2debde1a6048a87595ca3bb76ff3674ad28596137f26ea9cf1414f0d0ae7615493625fd3a1d0899b262235d630
-  languageName: node
-  linkType: hard
-
-"@types/html-webpack-plugin@npm:*":
-  version: 3.2.6
-  resolution: "@types/html-webpack-plugin@npm:3.2.6"
-  dependencies:
-    "@types/html-minifier": "*"
-    "@types/tapable": ^1
-    "@types/webpack": ^4
-  checksum: 75aeb668e626687db7d24dfb6ef500de2362c1703839ca9ef5b7ec742ff5d3e5d9cef31ac189e8fead0e791f5bdfcb430d74e2cfb7cd8365927d7899ead3edc5
-  languageName: node
-  linkType: hard
-
-"@types/http-proxy@npm:^1.17.5":
-  version: 1.17.7
-  resolution: "@types/http-proxy@npm:1.17.7"
-  dependencies:
-    "@types/node": "*"
-  checksum: 88f9c75ca65378d0287d8d0b1dbeed372c8267f4841fe2f6f2d759522494382d3943bc6cc774bef7dd125464a266bafeda813d3658b17a2d1e74acc4efb6e21c
-  languageName: node
-  linkType: hard
-
 "@types/http-proxy@npm:^1.17.8":
   version: 1.17.8
   resolution: "@types/http-proxy@npm:1.17.8"
@@ -9672,16 +9039,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:27.4.1":
-  version: 27.4.1
-  resolution: "@types/jest@npm:27.4.1"
-  dependencies:
-    jest-matcher-utils: ^27.0.0
-    pretty-format: ^27.0.0
-  checksum: 5184f3eef4832d01ee8f59bed15eec45ccc8e29c724a5e6ce37bf74396b37bdf04f557000f45ba4fc38ae6075cf9cfcce3d7a75abc981023c61ceb27230a93e4
-  languageName: node
-  linkType: hard
-
 "@types/jest@npm:29.2.3":
   version: 29.2.3
   resolution: "@types/jest@npm:29.2.3"
@@ -9775,13 +9132,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:^4.14.194":
-  version: 4.14.194
-  resolution: "@types/lodash@npm:4.14.194"
-  checksum: 113f34831c461469d91feca2dde737f88487732898b4d25e9eb23b087bb193985f864d1e1e0f3b777edc5022e460443588b6000a3b2348c966f72d17eedc35ea
-  languageName: node
-  linkType: hard
-
 "@types/logfmt@npm:^1.2.3":
   version: 1.2.3
   resolution: "@types/logfmt@npm:1.2.3"
@@ -9975,13 +9325,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prettier@npm:2.6.3":
-  version: 2.6.3
-  resolution: "@types/prettier@npm:2.6.3"
-  checksum: e1836699ca189fff6d2a73dc22e028b6a6f693ed1180d5998ac29fa197caf8f85aa92cb38db642e4a370e616b451cb5722ad2395dab11c78e025a1455f37d1f0
-  languageName: node
-  linkType: hard
-
 "@types/prettier@npm:^2.1.5":
   version: 2.4.2
   resolution: "@types/prettier@npm:2.4.2"
@@ -10059,19 +9402,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dev-utils@npm:9.0.10":
-  version: 9.0.10
-  resolution: "@types/react-dev-utils@npm:9.0.10"
-  dependencies:
-    "@types/eslint": "*"
-    "@types/express": "*"
-    "@types/html-webpack-plugin": "*"
-    "@types/webpack": ^4
-    "@types/webpack-dev-server": 3
-  checksum: b8aecccc7c0aa3d644f832f72b6e5c378c232c8b72c5671f5e39f37364fb46d362b6877ca728f4a136e0af2b341485fad2ed10b1394efa42568284cbb9c61b61
-  languageName: node
-  linkType: hard
-
 "@types/react-dom@npm:*":
   version: 17.0.10
   resolution: "@types/react-dom@npm:17.0.10"
@@ -10255,13 +9585,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/relateurl@npm:*":
-  version: 0.2.29
-  resolution: "@types/relateurl@npm:0.2.29"
-  checksum: 33226abf47dc03523f88dacb6c2acd185285e754a8e64dd832156fcfbeee053b3c9c63dcb01c06aa263f6e7cb1e53f819718d41dbf7ede38b9d00893cec4a6f6
-  languageName: node
-  linkType: hard
-
 "@types/resolve@npm:1.20.2":
   version: 1.20.2
   resolution: "@types/resolve@npm:1.20.2"
@@ -10276,16 +9599,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/rimraf@npm:3.0.2":
-  version: 3.0.2
-  resolution: "@types/rimraf@npm:3.0.2"
-  dependencies:
-    "@types/glob": "*"
-    "@types/node": "*"
-  checksum: b47fa302f46434cba704d20465861ad250df79467d3d289f9d6490d3aeeb41e8cb32dd80bd1a8fd833d1e185ac719fbf9be12e05ad9ce9be094d8ee8f1405347
-  languageName: node
-  linkType: hard
-
 "@types/scheduler@npm:*":
   version: 0.16.2
   resolution: "@types/scheduler@npm:0.16.2"
@@ -10457,13 +9770,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/tmp@npm:0.2.3":
-  version: 0.2.3
-  resolution: "@types/tmp@npm:0.2.3"
-  checksum: 0ca45e99b3b3c6959d5c4f4555f73c8007db540cfb0fbbb9373217f9ab85e67eef75193f51a1d6564b0ee6c6f5ffa259d1034d7f7530a5b7ce80acb94cfc4daa
-  languageName: node
-  linkType: hard
-
 "@types/tough-cookie@npm:*":
   version: 4.0.2
   resolution: "@types/tough-cookie@npm:4.0.2"
@@ -10515,19 +9821,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webpack-dev-server@npm:3":
-  version: 3.11.6
-  resolution: "@types/webpack-dev-server@npm:3.11.6"
-  dependencies:
-    "@types/connect-history-api-fallback": "*"
-    "@types/express": "*"
-    "@types/serve-static": "*"
-    "@types/webpack": ^4
-    http-proxy-middleware: ^1.0.0
-  checksum: ce801b43593aa84d228d170ec6c2397d40754f138635c5a792d4f85647a59d07250d533299af8c6ea4e83ca7f8ac5feaf7ec03f11ad886faac43f3460b5d3c6e
-  languageName: node
-  linkType: hard
-
 "@types/webpack-env@npm:1.18.0":
   version: 1.18.0
   resolution: "@types/webpack-env@npm:1.18.0"
@@ -10553,20 +9846,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webpack@npm:^4":
-  version: 4.41.31
-  resolution: "@types/webpack@npm:4.41.31"
-  dependencies:
-    "@types/node": "*"
-    "@types/tapable": ^1
-    "@types/uglify-js": "*"
-    "@types/webpack-sources": "*"
-    anymatch: ^3.0.0
-    source-map: ^0.6.0
-  checksum: 8aa4b4ad68bb7a6ee5bd027005014e6242434162ed4c14cd251713ad6041e42bf7629fc56a5edc5a2124b49cc0dce273d6ee3386fae9a9cfe02e1f7e82087ea2
-  languageName: node
-  linkType: hard
-
 "@types/webpack@npm:^4.41.26":
   version: 4.41.33
   resolution: "@types/webpack@npm:4.41.33"
@@ -10642,29 +9921,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:5.36.2":
-  version: 5.36.2
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.36.2"
-  dependencies:
-    "@typescript-eslint/scope-manager": 5.36.2
-    "@typescript-eslint/type-utils": 5.36.2
-    "@typescript-eslint/utils": 5.36.2
-    debug: ^4.3.4
-    functional-red-black-tree: ^1.0.1
-    ignore: ^5.2.0
-    regexpp: ^3.2.0
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependencies:
-    "@typescript-eslint/parser": ^5.0.0
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: edcd9fcecdeb22a689b421cafe3b7adc859bf2fd6227aecdd7412c319c808e7bab063c8f94af32116cfc971962f9780d181cb0a4aa999951c2d2be1f84c6c376
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/eslint-plugin@npm:5.42.0":
   version: 5.42.0
   resolution: "@typescript-eslint/eslint-plugin@npm:5.42.0"
@@ -10688,23 +9944,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:5.36.2":
-  version: 5.36.2
-  resolution: "@typescript-eslint/parser@npm:5.36.2"
-  dependencies:
-    "@typescript-eslint/scope-manager": 5.36.2
-    "@typescript-eslint/types": 5.36.2
-    "@typescript-eslint/typescript-estree": 5.36.2
-    debug: ^4.3.4
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: d6cc22cbc7aacb5ecebf55eb1d681cb6b964b108e147b418295c3e48701a77768cff128c16da421ae50eabb9f1296ecec7fa3cc5f2ccb63a3febf79f98b4195f
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/parser@npm:5.42.0":
   version: 5.42.0
   resolution: "@typescript-eslint/parser@npm:5.42.0"
@@ -10732,16 +9971,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.36.2":
-  version: 5.36.2
-  resolution: "@typescript-eslint/scope-manager@npm:5.36.2"
-  dependencies:
-    "@typescript-eslint/types": 5.36.2
-    "@typescript-eslint/visitor-keys": 5.36.2
-  checksum: 93ff655f7c237c88ec6dc5911202dd8f81bd8909b27f1a758a9d77e9791040f1ee6fe2891314bde75c808ce586246e98003a1b1396937b0312f2440016dea751
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/scope-manager@npm:5.42.0":
   version: 5.42.0
   resolution: "@typescript-eslint/scope-manager@npm:5.42.0"
@@ -10762,23 +9991,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.36.2":
-  version: 5.36.2
-  resolution: "@typescript-eslint/type-utils@npm:5.36.2"
-  dependencies:
-    "@typescript-eslint/typescript-estree": 5.36.2
-    "@typescript-eslint/utils": 5.36.2
-    debug: ^4.3.4
-    tsutils: ^3.21.0
-  peerDependencies:
-    eslint: "*"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: c202b7d2cd08ed7f7d1ad7e430e9e1596478e147f0d485d02babfda0211c55fa950de1dc4d1c950008a8a047a31c1e982e97fe5558f93d496830eb9d9532bc71
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/type-utils@npm:5.42.0":
   version: 5.42.0
   resolution: "@typescript-eslint/type-utils@npm:5.42.0"
@@ -10803,13 +10015,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.36.2":
-  version: 5.36.2
-  resolution: "@typescript-eslint/types@npm:5.36.2"
-  checksum: 736cb8a76b58f2f9a7d066933094c5510ffe31479ea8b804a829ec85942420f1b55e0eb2688fbdaaaa9c0e5b3b590fb8f14bbd745353696b4fd33fda620d417b
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:5.42.0":
   version: 5.42.0
   resolution: "@typescript-eslint/types@npm:5.42.0"
@@ -10842,24 +10047,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.36.2":
-  version: 5.36.2
-  resolution: "@typescript-eslint/typescript-estree@npm:5.36.2"
-  dependencies:
-    "@typescript-eslint/types": 5.36.2
-    "@typescript-eslint/visitor-keys": 5.36.2
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 2827ff57a114b6107ea6d555f3855007133b08a7c2bafba0cfa0c935d8b99fd7b49e982d48cccc1c5ba550d95748d0239f5e2109893f12a165d76ed64a0d261b
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:5.42.0":
   version: 5.42.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.42.0"
@@ -10896,22 +10083,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.36.2":
-  version: 5.36.2
-  resolution: "@typescript-eslint/utils@npm:5.36.2"
-  dependencies:
-    "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.36.2
-    "@typescript-eslint/types": 5.36.2
-    "@typescript-eslint/typescript-estree": 5.36.2
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 45356cf55a8733e3ab1f2c3c19cdaefdb79857e35eb1433c29b81f3df071e9cef8a286bc407abe243889a21d9e793e999f92f03b9c727a0fac1c17a48e64c42a
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/utils@npm:5.42.0":
   version: 5.42.0
   resolution: "@typescript-eslint/utils@npm:5.42.0"
@@ -10974,16 +10145,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.36.2":
-  version: 5.36.2
-  resolution: "@typescript-eslint/visitor-keys@npm:5.36.2"
-  dependencies:
-    "@typescript-eslint/types": 5.36.2
-    eslint-visitor-keys: ^3.3.0
-  checksum: 87ccdcfa5cdedaa3a1aac30d656969f4f5910b62bcaacdf80a514dbf0cbbd8e79b55f8e987eab34cc79ece8ce4b8c19d5caf8b0afb74e0b0d7ab39fb29aa8eba
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:5.42.0":
   version: 5.42.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.42.0"
@@ -11418,13 +10579,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abab@npm:^2.0.3, abab@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "abab@npm:2.0.5"
-  checksum: 0ec951b46d5418c2c2f923021ec193eaebdb4e802ffd5506286781b454be722a13a8430f98085cd3e204918401d9130ec6cc8f5ae19be315b3a0e857d83196e1
-  languageName: node
-  linkType: hard
-
 "abab@npm:^2.0.6":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
@@ -11459,16 +10613,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-globals@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "acorn-globals@npm:6.0.0"
-  dependencies:
-    acorn: ^7.1.1
-    acorn-walk: ^7.1.1
-  checksum: 72d95e5b5e585f9acd019b993ab8bbba68bb3cbc9d9b5c1ebb3c2f1fe5981f11deababfb4949f48e6262f9c57878837f5958c0cca396f81023814680ca878042
-  languageName: node
-  linkType: hard
-
 "acorn-globals@npm:^7.0.0":
   version: 7.0.1
   resolution: "acorn-globals@npm:7.0.1"
@@ -11497,7 +10641,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^7.1.1, acorn-walk@npm:^7.2.0":
+"acorn-walk@npm:^7.2.0":
   version: 7.2.0
   resolution: "acorn-walk@npm:7.2.0"
   checksum: 9252158a79b9d92f1bc0dd6acc0fcfb87a67339e84bcc301bb33d6078936d27e35d606b4d35626d2962cd43c256d6f27717e70cbe15c04fff999ab0b2260b21f
@@ -11511,7 +10655,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^7.1.1, acorn@npm:^7.4.1":
+"acorn@npm:^7.4.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
   bin:
@@ -11529,7 +10673,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.2.4, acorn@npm:^8.4.1":
+"acorn@npm:^8.0.4, acorn@npm:^8.4.1":
   version: 8.5.0
   resolution: "acorn@npm:8.5.0"
   bin:
@@ -11588,7 +10732,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"address@npm:^1.0.1, address@npm:^1.1.2":
+"address@npm:^1.0.1":
   version: 1.1.2
   resolution: "address@npm:1.1.2"
   checksum: d966deee6ab9a0f96ed1d25dc73e91a248f64479c91f9daeb15237b8e3c39a02faac4e6afe8987ef9e5aea60a1593cef5882b7456ab2e6196fc0229a93ec39c2
@@ -12159,17 +11303,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flatmap@npm:^1.2.5":
-  version: 1.2.5
-  resolution: "array.prototype.flatmap@npm:1.2.5"
-  dependencies:
-    call-bind: ^1.0.0
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.0
-  checksum: a14119a28e5687a13cf3fd6756a8e7810563a9e81cd4227e27a25c31d362df47ac72553f06a271fd728741e199047933ad43d561d64a28da0b4e1a26f74e939e
-  languageName: node
-  linkType: hard
-
 "array.prototype.flatmap@npm:^1.3.1":
   version: 1.3.1
   resolution: "array.prototype.flatmap@npm:1.3.1"
@@ -12380,24 +11513,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.4.4":
-  version: 10.4.4
-  resolution: "autoprefixer@npm:10.4.4"
-  dependencies:
-    browserslist: ^4.20.3
-    caniuse-lite: ^1.0.30001335
-    fraction.js: ^4.2.0
-    normalize-range: ^0.1.2
-    picocolors: ^1.0.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.1.0
-  bin:
-    autoprefixer: bin/autoprefixer
-  checksum: bd42e23d71af0228b6b0b27d0d0b33c95e67562e55eb4ca0e221cf795a06482c90d565d6544a5f4090d8e303b09b200845fa2bcaaa707d1e8777974250dffe1f
-  languageName: node
-  linkType: hard
-
 "autoprefixer@npm:^9.8.6":
   version: 9.8.8
   resolution: "autoprefixer@npm:9.8.8"
@@ -12469,24 +11584,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-jest@npm:27.5.1, babel-jest@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "babel-jest@npm:27.5.1"
-  dependencies:
-    "@jest/transform": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/babel__core": ^7.1.14
-    babel-plugin-istanbul: ^6.1.1
-    babel-preset-jest: ^27.5.1
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.9
-    slash: ^3.0.0
-  peerDependencies:
-    "@babel/core": ^7.8.0
-  checksum: 4e93e6e9fb996cc5f1505e924eb8e8cc7b25c294ba9629762a2715390f48af6a4c14dbb84cd9730013ac0e03267a5a9aa2fb6318c544489cda7f50f4e506def4
-  languageName: node
-  linkType: hard
-
 "babel-jest@npm:29.3.1, babel-jest@npm:^29.3.1":
   version: 29.3.1
   resolution: "babel-jest@npm:29.3.1"
@@ -12517,7 +11614,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:^8.0.0, babel-loader@npm:^8.2.5":
+"babel-loader@npm:^8.0.0":
   version: 8.2.5
   resolution: "babel-loader@npm:8.2.5"
   dependencies:
@@ -12602,18 +11699,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "babel-plugin-jest-hoist@npm:27.5.1"
-  dependencies:
-    "@babel/template": ^7.3.3
-    "@babel/types": ^7.3.3
-    "@types/babel__core": ^7.0.0
-    "@types/babel__traverse": ^7.0.6
-  checksum: 709c17727aa8fd3be755d256fb514bf945a5c2ea6017f037d80280fc44ae5fe7dfeebf63d8412df53796455c2c216119d628d8cc90b099434fd819005943d058
-  languageName: node
-  linkType: hard
-
 "babel-plugin-jest-hoist@npm:^29.2.0":
   version: 29.2.0
   resolution: "babel-plugin-jest-hoist@npm:29.2.0"
@@ -12655,32 +11740,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.3.1"
-  dependencies:
-    "@babel/compat-data": ^7.13.11
-    "@babel/helper-define-polyfill-provider": ^0.3.1
-    semver: ^6.1.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ca873f14ccd6d2942013345a956de8165d0913556ec29756a748157140f5312f79eed487674e0ca562285880f05829b3712d72e1e4b412c2ce46bd6a50b4b975
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs2@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.3.2"
-  dependencies:
-    "@babel/compat-data": ^7.17.7
-    "@babel/helper-define-polyfill-provider": ^0.3.2
-    semver: ^6.1.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a76e7bb1a5cc0a4507baa523c23f9efd75764069a25845beba92290386e5e48ed85b894005ece3b527e13c3d2d9c6589cc0a23befb72ea6fc7aa8711f231bb4d
-  languageName: node
-  linkType: hard
-
 "babel-plugin-polyfill-corejs2@npm:^0.3.3":
   version: 0.3.3
   resolution: "babel-plugin-polyfill-corejs2@npm:0.3.3"
@@ -12706,30 +11765,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.5.2":
-  version: 0.5.2
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.5.2"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.1
-    core-js-compat: ^3.21.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2f3184c73f80f00ac876a5ebcad945fd8d2ae70e5f85b7ab6cc3bc69bc74025f4f7070de7abbb2a7274c78e130bd34fc13f4c85342da28205930364a1ef0aa21
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs3@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.5.3"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.2
-    core-js-compat: ^3.21.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9c6644a1b0afbe59e402827fdafc6f44994ff92c5b2f258659cbbfd228f7075dea49e95114af10e66d70f36cbde12ff1d81263eb67be749b3ef0e2c18cf3c16d
-  languageName: node
-  linkType: hard
-
 "babel-plugin-polyfill-corejs3@npm:^0.6.0":
   version: 0.6.0
   resolution: "babel-plugin-polyfill-corejs3@npm:0.6.0"
@@ -12742,28 +11777,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.3.1"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f1473df7b700d6795ca41301b1e65a0aff15ce6c1463fc0ce2cf0c821114b0330920f59d4cebf52976363ee817ba29ad2758544a4661a724b08191080b9fe1da
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-regenerator@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.4.0"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 699aa9c0dc5a2259d7fa52b26613fa1e782439eee54cd98506991f87fddf0c00eec6c5b1917edf586c170731d9e318903bc41210225a691e7bb8087652bbda94
-  languageName: node
-  linkType: hard
-
 "babel-plugin-polyfill-regenerator@npm:^0.4.1":
   version: 0.4.1
   resolution: "babel-plugin-polyfill-regenerator@npm:0.4.1"
@@ -12815,18 +11828,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "babel-preset-jest@npm:27.5.1"
-  dependencies:
-    babel-plugin-jest-hoist: ^27.5.1
-    babel-preset-current-node-syntax: ^1.0.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 251bcea11c18fd9672fec104eadb45b43f117ceeb326fa7345ced778d4c1feab29343cd7a87a1dcfae4997d6c851a8b386d7f7213792da6e23b74f4443a8976d
-  languageName: node
-  linkType: hard
-
 "babel-preset-jest@npm:^29.2.0":
   version: 29.2.0
   resolution: "babel-preset-jest@npm:29.2.0"
@@ -13230,13 +12231,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browser-process-hrtime@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "browser-process-hrtime@npm:1.0.0"
-  checksum: e30f868cdb770b1201afb714ad1575dd86366b6e861900884665fb627109b3cc757c40067d3bfee1ff2a29c835257ea30725a8018a9afd02ac1c24b408b1e45f
-  languageName: node
-  linkType: hard
-
 "browser-stdout@npm:1.3.1":
   version: 1.3.1
   resolution: "browser-stdout@npm:1.3.1"
@@ -13273,36 +12267,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.18.1, browserslist@npm:^4.19.1":
-  version: 4.19.1
-  resolution: "browserslist@npm:4.19.1"
-  dependencies:
-    caniuse-lite: ^1.0.30001286
-    electron-to-chromium: ^1.4.17
-    escalade: ^3.1.1
-    node-releases: ^2.0.1
-    picocolors: ^1.0.0
-  bin:
-    browserslist: cli.js
-  checksum: c0777fd483691638fd6801e16c9d809e1d65f6d2b06db2e806654be51045cbab1452a89841a2c5caea2cbe19d621b4f1d391cffbb24512aa33280039ab345875
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.20.2":
-  version: 4.20.2
-  resolution: "browserslist@npm:4.20.2"
-  dependencies:
-    caniuse-lite: ^1.0.30001317
-    electron-to-chromium: ^1.4.84
-    escalade: ^3.1.1
-    node-releases: ^2.0.2
-    picocolors: ^1.0.0
-  bin:
-    browserslist: cli.js
-  checksum: 18e09beeae32e69fea45fc3642240fb63027b1460d90e24da86377177dca3d82c80f8fa44469d95109e3962f08eb2a23e03037bd5e1f1ec38e4866e2a8572435
-  languageName: node
-  linkType: hard
-
 "browserslist@npm:^4.20.3":
   version: 4.20.3
   resolution: "browserslist@npm:4.20.3"
@@ -13648,7 +12612,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001271, caniuse-lite@npm:^1.0.30001286, caniuse-lite@npm:^1.0.30001317, caniuse-lite@npm:^1.0.30001332, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001426, caniuse-lite@npm:^1.0.30001449":
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001271, caniuse-lite@npm:^1.0.30001332, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001426, caniuse-lite@npm:^1.0.30001449":
   version: 1.0.30001469
   resolution: "caniuse-lite@npm:1.0.30001469"
   checksum: 8e496509d7e9ff189c72205675b5db0c5f1b6a09917027441e835efae0848a468a8c4e7d2b409ffc202438fcd23ae53e017f976a03c22c04d12d3c0e1e33e5de
@@ -14737,15 +13701,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"copy-anything@npm:^2.0.1":
-  version: 2.0.3
-  resolution: "copy-anything@npm:2.0.3"
-  dependencies:
-    is-what: ^3.12.0
-  checksum: 50f6423fa7e346416c18658fd253bfbe8783ff51c4f244a3c18c39693369cc7cb84cc9e4a4e109c0ab2f81e44eb345ce9ca8f0fb4b48f4aae3a396423912d60f
-  languageName: node
-  linkType: hard
-
 "copy-descriptor@npm:^0.1.0":
   version: 0.1.1
   resolution: "copy-descriptor@npm:0.1.1"
@@ -14778,42 +13733,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"copy-webpack-plugin@npm:^9.0.1":
-  version: 9.1.0
-  resolution: "copy-webpack-plugin@npm:9.1.0"
-  dependencies:
-    fast-glob: ^3.2.7
-    glob-parent: ^6.0.1
-    globby: ^11.0.3
-    normalize-path: ^3.0.0
-    schema-utils: ^3.1.1
-    serialize-javascript: ^6.0.0
-  peerDependencies:
-    webpack: ^5.1.0
-  checksum: 06cb4fb6fc99a95ccfd3169115ee57f64953e5b4075900fc8faab98b7e7d3fcd6915b125fdb98c919cfd55e581a8444f5c6b9dbb342cbd60b154d8fb3f79f2b9
-  languageName: node
-  linkType: hard
-
-"core-js-compat@npm:^3.21.0":
-  version: 3.21.0
-  resolution: "core-js-compat@npm:3.21.0"
-  dependencies:
-    browserslist: ^4.19.1
-    semver: 7.0.0
-  checksum: 7914d2f8a2f7c1b400e1c04c7560f4c96028bf23cec3cea6063ba594e38023cccbd38ad88af41c5d6b65450e97a989eb37598f609e3f7fbc6ebc1856d4195cbb
-  languageName: node
-  linkType: hard
-
-"core-js-compat@npm:^3.22.1":
-  version: 3.22.4
-  resolution: "core-js-compat@npm:3.22.4"
-  dependencies:
-    browserslist: ^4.20.3
-    semver: 7.0.0
-  checksum: b58111ba60091ad99be7246ecbb806ff89f504a80f74d1ddd0f219fd51a8b9460db6043bd7fe046acd8bd1b4370c595cfadf70b18fca8520ad8fed52b1f837b5
-  languageName: node
-  linkType: hard
-
 "core-js-compat@npm:^3.25.1":
   version: 3.25.1
   resolution: "core-js-compat@npm:3.25.1"
@@ -15015,19 +13934,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-blank-pseudo@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "css-blank-pseudo@npm:3.0.3"
-  dependencies:
-    postcss-selector-parser: ^6.0.9
-  peerDependencies:
-    postcss: ^8.4
-  bin:
-    css-blank-pseudo: dist/cli.cjs
-  checksum: 9be0a13885a99d8ba9e1f45ea66e801d4da75b58c1c3c516a40772fa3a93ef9952b15dcac0418acbb6c89daaae0572819647701b8e553a02972826e33d4cd67f
-  languageName: node
-  linkType: hard
-
 "css-box-model@npm:^1.2.0":
   version: 1.2.1
   resolution: "css-box-model@npm:1.2.1"
@@ -15053,19 +13959,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "css-has-pseudo@npm:3.0.4"
-  dependencies:
-    postcss-selector-parser: ^6.0.9
-  peerDependencies:
-    postcss: ^8.4
-  bin:
-    css-has-pseudo: dist/cli.cjs
-  checksum: 8f165d68f6621891d9fa1d874794916a52ed8847dfbec591523ad68774650cc1eae062ba08f59514666e04aeba27be72c9b211892f3a187c5ba6e287bd4260e7
-  languageName: node
-  linkType: hard
-
 "css-in-js-utils@npm:^2.0.0":
   version: 2.0.1
   resolution: "css-in-js-utils@npm:2.0.1"
@@ -15123,24 +14016,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-loader@npm:^6.7.1":
-  version: 6.7.1
-  resolution: "css-loader@npm:6.7.1"
-  dependencies:
-    icss-utils: ^5.1.0
-    postcss: ^8.4.7
-    postcss-modules-extract-imports: ^3.0.0
-    postcss-modules-local-by-default: ^4.0.0
-    postcss-modules-scope: ^3.0.0
-    postcss-modules-values: ^4.0.0
-    postcss-value-parser: ^4.2.0
-    semver: ^7.3.5
-  peerDependencies:
-    webpack: ^5.0.0
-  checksum: 170fdbc630a05a43679ef60fa97694766b568dbde37adccc0faafa964fc675f08b976bc68837bb73b61d60240e8d2cbcbf51540fe94ebc9dafc56e7c46ba5527
-  languageName: node
-  linkType: hard
-
 "css-minimizer-webpack-plugin@npm:4.2.2":
   version: 4.2.2
   resolution: "css-minimizer-webpack-plugin@npm:4.2.2"
@@ -15170,42 +14045,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-minimizer-webpack-plugin@npm:^3.4.1":
-  version: 3.4.1
-  resolution: "css-minimizer-webpack-plugin@npm:3.4.1"
-  dependencies:
-    cssnano: ^5.0.6
-    jest-worker: ^27.0.2
-    postcss: ^8.3.5
-    schema-utils: ^4.0.0
-    serialize-javascript: ^6.0.0
-    source-map: ^0.6.1
-  peerDependencies:
-    webpack: ^5.0.0
-  peerDependenciesMeta:
-    "@parcel/css":
-      optional: true
-    clean-css:
-      optional: true
-    csso:
-      optional: true
-    esbuild:
-      optional: true
-  checksum: 065c6c1eadb7c99267db5d04d6f3909e9968b73c4cb79ab9e4502a5fbf1a3d564cfe6f8e0bff8e4ab00d4ed233e9c3c76a4ebe0ee89150b3d9ecb064ddf1e5e9
-  languageName: node
-  linkType: hard
-
-"css-prefers-color-scheme@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "css-prefers-color-scheme@npm:6.0.3"
-  peerDependencies:
-    postcss: ^8.4
-  bin:
-    css-prefers-color-scheme: dist/cli.cjs
-  checksum: 3a2b02f0454adda68861cdcaf6a0d11f462eadf165301cba61c5ec7c5f229ac261c5baa54c377d9b811ec5f21b30d72a02bc032cdad2415b3a566f08a0c47b3a
-  languageName: node
-  linkType: hard
-
 "css-select@npm:^4.1.3":
   version: 4.1.3
   resolution: "css-select@npm:4.1.3"
@@ -15314,13 +14153,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssdb@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "cssdb@npm:6.5.0"
-  checksum: badd8cfc6d827cf08c8442ccbf733af1cd79b1df751c7f7d9a22207d235e928a612751c1025485f4bd5c77d420e0ed2d35c6184a4c5d195671b2e4d56f255b64
-  languageName: node
-  linkType: hard
-
 "cssesc@npm:^3.0.0":
   version: 3.0.0
   resolution: "cssesc@npm:3.0.0"
@@ -15392,19 +14224,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano@npm:^5.0.6":
-  version: 5.0.8
-  resolution: "cssnano@npm:5.0.8"
-  dependencies:
-    cssnano-preset-default: ^5.2.8
-    lilconfig: ^2.0.3
-    yaml: ^1.10.2
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 18d6496accecf8aa428ed8ef27fbc41cd1c2cad26e64b335711fafd23b2d03d5854023d3fbfda7da9718e416ae94d6b38357df20a6289e1db1c422421d819684
-  languageName: node
-  linkType: hard
-
 "cssnano@npm:^5.1.8":
   version: 5.1.8
   resolution: "cssnano@npm:5.1.8"
@@ -15427,13 +14246,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssom@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "cssom@npm:0.4.4"
-  checksum: e3bc1076e7ee4213d4fef05e7ae03bfa83dc05f32611d8edc341f4ecc3d9647b89c8245474c7dd2cdcdb797a27c462e99da7ad00a34399694559f763478ff53f
-  languageName: node
-  linkType: hard
-
 "cssom@npm:^0.5.0":
   version: 0.5.0
   resolution: "cssom@npm:0.5.0"
@@ -15934,17 +14746,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "data-urls@npm:2.0.0"
-  dependencies:
-    abab: ^2.0.3
-    whatwg-mimetype: ^2.3.0
-    whatwg-url: ^8.0.0
-  checksum: 97caf828aac25e25e04ba6869db0f99c75e6859bb5b424ada28d3e7841941ebf08ddff3c1b1bb4585986bd507a5d54c2a716853ea6cb98af877400e637393e71
-  languageName: node
-  linkType: hard
-
 "data-urls@npm:^3.0.2":
   version: 3.0.2
   resolution: "data-urls@npm:3.0.2"
@@ -16005,7 +14806,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.0, debug@npm:^2.6.9":
+"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.9":
   version: 2.6.9
   resolution: "debug@npm:2.6.9"
   dependencies:
@@ -16033,7 +14834,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^3.0.0, debug@npm:^3.1.0, debug@npm:^3.2.6, debug@npm:^3.2.7":
+"debug@npm:^3.0.0, debug@npm:^3.1.0, debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
   dependencies:
@@ -16073,13 +14874,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decimal.js@npm:^10.2.1":
-  version: 10.3.1
-  resolution: "decimal.js@npm:10.3.1"
-  checksum: 0351ac9f05fe050f23227aa6a4573bee2d58fa7378fcf28d969a8c789525032effb488a90320fd3fe86a66e17b4bc507d811b15eada5b7f0e7ec5d2af4c24a59
-  languageName: node
-  linkType: hard
-
 "decimal.js@npm:^10.4.1":
   version: 10.4.2
   resolution: "decimal.js@npm:10.4.2"
@@ -16345,19 +15139,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-port-alt@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "detect-port-alt@npm:1.1.6"
-  dependencies:
-    address: ^1.0.1
-    debug: ^2.6.0
-  bin:
-    detect: ./bin/detect-port
-    detect-port: ./bin/detect-port
-  checksum: 9dc37b1fa4a9dd6d4889e1045849b8d841232b598d1ca888bf712f4035b07a17cf6d537465a0d7323250048d3a5a0540e3b7cf89457efc222f96f77e2c40d16a
-  languageName: node
-  linkType: hard
-
 "detect-port@npm:^1.3.0":
   version: 1.5.1
   resolution: "detect-port@npm:1.5.1"
@@ -16599,15 +15380,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domexception@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "domexception@npm:2.0.1"
-  dependencies:
-    webidl-conversions: ^5.0.0
-  checksum: d638e9cb05c52999f1b2eb87c374b03311ea5b1d69c2f875bc92da73e17db60c12142b45c950228642ff7f845c536b65305483350d080df59003a653da80b691
-  languageName: node
-  linkType: hard
-
 "domexception@npm:^4.0.0":
   version: 4.0.0
   resolution: "domexception@npm:4.0.0"
@@ -16777,13 +15549,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.17":
-  version: 1.4.37
-  resolution: "electron-to-chromium@npm:1.4.37"
-  checksum: d5da221e456bdbd23d554d1362c3e544fb3d384680a8a9fe5027e855f4a16986e7ccfa2924ba8b24f40b47eadd81738db8d2cc6388b5b6386dfadee7bada2155
-  languageName: node
-  linkType: hard
-
 "electron-to-chromium@npm:^1.4.251":
   version: 1.4.253
   resolution: "electron-to-chromium@npm:1.4.253"
@@ -16798,13 +15563,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.84":
-  version: 1.4.90
-  resolution: "electron-to-chromium@npm:1.4.90"
-  checksum: e0d678f6d653dfa5629423b7410761ba9ec78584f3094366867e0639ac38863f705b735c69b2c5bafcc52f94fc1dea9f1071c6e8ea0743ae9225f73388dfd50c
-  languageName: node
-  linkType: hard
-
 "element-resize-detector@npm:^1.2.2":
   version: 1.2.4
   resolution: "element-resize-detector@npm:1.2.4"
@@ -16828,13 +15586,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emittery@npm:^0.8.1":
-  version: 0.8.1
-  resolution: "emittery@npm:0.8.1"
-  checksum: 2457e8c7b0688bb006126f2c025b2655abe682f66b184954122a8a065b5277f9813d49d627896a10b076b81c513ec5f491fd9c14fbd42c04b95ca3c9f3c365ee
-  languageName: node
-  linkType: hard
-
 "emoji-regex@npm:^8.0.0":
   version: 8.0.0
   resolution: "emoji-regex@npm:8.0.0"
@@ -17007,7 +15758,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"errno@npm:^0.1.1, errno@npm:^0.1.3":
+"errno@npm:^0.1.3":
   version: 0.1.8
   resolution: "errno@npm:0.1.8"
   dependencies:
@@ -17857,30 +16608,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:7.29.4":
-  version: 7.29.4
-  resolution: "eslint-plugin-react@npm:7.29.4"
-  dependencies:
-    array-includes: ^3.1.4
-    array.prototype.flatmap: ^1.2.5
-    doctrine: ^2.1.0
-    estraverse: ^5.3.0
-    jsx-ast-utils: ^2.4.1 || ^3.0.0
-    minimatch: ^3.1.2
-    object.entries: ^1.1.5
-    object.fromentries: ^2.0.5
-    object.hasown: ^1.1.0
-    object.values: ^1.1.5
-    prop-types: ^15.8.1
-    resolve: ^2.0.0-next.3
-    semver: ^6.3.0
-    string.prototype.matchall: ^4.0.6
-  peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: bb7d3715ccd7f3e0d7bfaa2125b26d96865695bcfea4a3d510a5763342a74ab5b99a88e13aad9245f9461ad87e4bce69c33fc946888115d576233f9b6e69700d
-  languageName: node
-  linkType: hard
-
 "eslint-plugin-react@npm:7.31.10":
   version: 7.31.10
   resolution: "eslint-plugin-react@npm:7.31.10"
@@ -17998,51 +16725,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:8.20.0":
-  version: 8.20.0
-  resolution: "eslint@npm:8.20.0"
-  dependencies:
-    "@eslint/eslintrc": ^1.3.0
-    "@humanwhocodes/config-array": ^0.9.2
-    ajv: ^6.10.0
-    chalk: ^4.0.0
-    cross-spawn: ^7.0.2
-    debug: ^4.3.2
-    doctrine: ^3.0.0
-    escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.1.1
-    eslint-utils: ^3.0.0
-    eslint-visitor-keys: ^3.3.0
-    espree: ^9.3.2
-    esquery: ^1.4.0
-    esutils: ^2.0.2
-    fast-deep-equal: ^3.1.3
-    file-entry-cache: ^6.0.1
-    functional-red-black-tree: ^1.0.1
-    glob-parent: ^6.0.1
-    globals: ^13.15.0
-    ignore: ^5.2.0
-    import-fresh: ^3.0.0
-    imurmurhash: ^0.1.4
-    is-glob: ^4.0.0
-    js-yaml: ^4.1.0
-    json-stable-stringify-without-jsonify: ^1.0.1
-    levn: ^0.4.1
-    lodash.merge: ^4.6.2
-    minimatch: ^3.1.2
-    natural-compare: ^1.4.0
-    optionator: ^0.9.1
-    regexpp: ^3.2.0
-    strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
-    text-table: ^0.2.0
-    v8-compile-cache: ^2.0.3
-  bin:
-    eslint: bin/eslint.js
-  checksum: a31adf390d71d916925586bc8467b48f620e93dd0416bc1e897d99265af88b48d4eba3985b5ff4653ae5cc46311a360d373574002277e159bb38a4363abf9228
-  languageName: node
-  linkType: hard
-
 "eslint@npm:8.26.0":
   version: 8.26.0
   resolution: "eslint@npm:8.26.0"
@@ -18141,17 +16823,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"espree@npm:^9.3.2":
-  version: 9.3.2
-  resolution: "espree@npm:9.3.2"
-  dependencies:
-    acorn: ^8.7.1
-    acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^3.3.0
-  checksum: 9a790d6779847051e87f70d720a0f6981899a722419e80c92ab6dee01e1ab83b8ce52d11b4dc96c2c490182efb5a4c138b8b0d569205bfe1cd4629e658e58c30
-  languageName: node
-  linkType: hard
-
 "espree@npm:^9.4.0":
   version: 9.4.0
   resolution: "espree@npm:9.4.0"
@@ -18457,18 +17128,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expect@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "expect@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    jest-get-type: ^27.5.1
-    jest-matcher-utils: ^27.5.1
-    jest-message-util: ^27.5.1
-  checksum: b2c66beb52de53ef1872165aace40224e722bca3c2274c54cfa74b6d617d55cf0ccdbf36783ccd64dbea501b280098ed33fd0b207d4f15bc03cd3c7a24364a6a
-  languageName: node
-  linkType: hard
-
 "expect@npm:^29.0.0, expect@npm:^29.3.1":
   version: 29.3.1
   resolution: "expect@npm:29.3.1"
@@ -18713,7 +17372,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9":
+"fast-glob@npm:^3.2.9":
   version: 3.2.11
   resolution: "fast-glob@npm:3.2.11"
   dependencies:
@@ -18911,13 +17570,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"filesize@npm:^8.0.6":
-  version: 8.0.7
-  resolution: "filesize@npm:8.0.7"
-  checksum: 8603d27c5287b984cb100733640645e078f5f5ad65c6d913173e01fb99e09b0747828498fd86647685ccecb69be31f3587b9739ab1e50732116b2374aff4cbf9
-  languageName: node
-  linkType: hard
-
 "fill-range@npm:^4.0.0":
   version: 4.0.0
   resolution: "fill-range@npm:4.0.0"
@@ -19218,63 +17870,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fork-ts-checker-webpack-plugin@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "fork-ts-checker-webpack-plugin@npm:6.5.0"
-  dependencies:
-    "@babel/code-frame": ^7.8.3
-    "@types/json-schema": ^7.0.5
-    chalk: ^4.1.0
-    chokidar: ^3.4.2
-    cosmiconfig: ^6.0.0
-    deepmerge: ^4.2.2
-    fs-extra: ^9.0.0
-    glob: ^7.1.6
-    memfs: ^3.1.2
-    minimatch: ^3.0.4
-    schema-utils: 2.7.0
-    semver: ^7.3.2
-    tapable: ^1.0.0
-  peerDependencies:
-    eslint: ">= 6"
-    typescript: ">= 2.7"
-    vue-template-compiler: "*"
-    webpack: ">= 4"
-  peerDependenciesMeta:
-    eslint:
-      optional: true
-    vue-template-compiler:
-      optional: true
-  checksum: 95d145ab7936445f3a9bfa4116ef73537f97196cfaa3f5b24473dff36d034e839d3b0e034a23beefc9619eceb7a9866816bfd55afd1968e955eb3b3f8cfc35ed
-  languageName: node
-  linkType: hard
-
-"fork-ts-checker-webpack-plugin@npm:^7.2.1":
-  version: 7.2.6
-  resolution: "fork-ts-checker-webpack-plugin@npm:7.2.6"
-  dependencies:
-    "@babel/code-frame": ^7.16.7
-    chalk: ^4.1.2
-    chokidar: ^3.5.3
-    cosmiconfig: ^7.0.1
-    deepmerge: ^4.2.2
-    fs-extra: ^10.0.0
-    memfs: ^3.4.1
-    minimatch: ^3.0.4
-    schema-utils: ^3.1.1
-    semver: ^7.3.5
-    tapable: ^2.2.1
-  peerDependencies:
-    typescript: ">3.6.0"
-    vue-template-compiler: "*"
-    webpack: ^5.11.0
-  peerDependenciesMeta:
-    vue-template-compiler:
-      optional: true
-  checksum: d74e8b22e3e4d5159061d93f519d7eb795bafac4b9a993b72eed952a714144d89c8a706414b231a89c69cabf29e00e1fb26d7060e3b5577c08cabb5a3d5a7697
-  languageName: node
-  linkType: hard
-
 "form-data@npm:^3.0.0":
   version: 3.0.1
   resolution: "form-data@npm:3.0.1"
@@ -19501,13 +18096,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"functional-red-black-tree@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "functional-red-black-tree@npm:1.0.1"
-  checksum: ca6c170f37640e2d94297da8bb4bf27a1d12bea3e00e6a3e007fd7aa32e37e000f5772acf941b4e4f3cf1c95c3752033d0c509af157ad8f526e7f00723b9eb9f
-  languageName: node
-  linkType: hard
-
 "functions-have-names@npm:^1.2.2":
   version: 1.2.2
   resolution: "functions-have-names@npm:1.2.2"
@@ -20014,7 +18602,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^11.0.2, globby@npm:^11.0.3, globby@npm:^11.0.4":
+"globby@npm:^11.0.2, globby@npm:^11.0.4":
   version: 11.0.4
   resolution: "globby@npm:11.0.4"
   dependencies:
@@ -20926,15 +19514,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-encoding-sniffer@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "html-encoding-sniffer@npm:2.0.1"
-  dependencies:
-    whatwg-encoding: ^1.0.5
-  checksum: bf30cce461015ed7e365736fcd6a3063c7bc016a91f74398ef6158886970a96333938f7c02417ab3c12aa82e3e53b40822145facccb9ddfbcdc15a879ae4d7ba
-  languageName: node
-  linkType: hard
-
 "html-encoding-sniffer@npm:^3.0.0":
   version: 3.0.0
   resolution: "html-encoding-sniffer@npm:3.0.0"
@@ -20977,18 +19556,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-loader@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "html-loader@npm:3.1.0"
-  dependencies:
-    html-minifier-terser: ^6.0.2
-    parse5: ^6.0.1
-  peerDependencies:
-    webpack: ^5.0.0
-  checksum: 4c383d103c10465964924f31eeb2876df941df6515b52a7be517eb01d59ff8f5ae344a3ca428469029c999c73f5ae5dac3431701886ca16617a670a0991bd3a2
-  languageName: node
-  linkType: hard
-
 "html-minifier-terser@npm:^6.0.2":
   version: 6.0.2
   resolution: "html-minifier-terser@npm:6.0.2"
@@ -21046,7 +19613,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-webpack-plugin@npm:5.5.0, html-webpack-plugin@npm:^5.0.0, html-webpack-plugin@npm:^5.5.0":
+"html-webpack-plugin@npm:5.5.0, html-webpack-plugin@npm:^5.0.0":
   version: 5.5.0
   resolution: "html-webpack-plugin@npm:5.5.0"
   dependencies:
@@ -21176,19 +19743,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-proxy-middleware@npm:^1.0.0":
-  version: 1.3.1
-  resolution: "http-proxy-middleware@npm:1.3.1"
-  dependencies:
-    "@types/http-proxy": ^1.17.5
-    http-proxy: ^1.18.1
-    is-glob: ^4.0.1
-    is-plain-obj: ^3.0.0
-    micromatch: ^4.0.2
-  checksum: c6f0fe6d5aa58f3757084f1fad8109e7384fdea1b0a5c62f58ac767c42f367a18d3819bed8cbf8b5183f17e3e14fad04322f179c569629004da5fbec9b81a88a
-  languageName: node
-  linkType: hard
-
 "http-proxy-middleware@npm:^2.0.3":
   version: 2.0.4
   resolution: "http-proxy-middleware@npm:2.0.4"
@@ -21375,7 +19929,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24, iconv-lite@npm:^0.4.4, iconv-lite@npm:^0.4.8":
+"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24, iconv-lite@npm:^0.4.8":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
@@ -21453,15 +20007,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"image-size@npm:~0.5.0":
-  version: 0.5.5
-  resolution: "image-size@npm:0.5.5"
-  bin:
-    image-size: bin/image-size.js
-  checksum: 6709d5cb73e96d5097ae5e9aa746dd36d6a9c8cf645e7eecac72ea07dbd6f312a65183752762fa92e2f3b698d4ed8d85dd55bf5207b6367245996bd16576d8fe
-  languageName: node
-  linkType: hard
-
 "immer@npm:9.0.19":
   version: 9.0.19
   resolution: "immer@npm:9.0.19"
@@ -21476,13 +20021,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immer@npm:^9.0.7":
-  version: 9.0.7
-  resolution: "immer@npm:9.0.7"
-  checksum: 3655ad64bf5ab5adf2854f7d2a9ad543f2cd995fcd169b6f10294f41fdb2cbcbd44d8beaa3e01b3c0b6149001190e57f6ab2cd735e6a929780b7462f2e973c9b
-  languageName: node
-  linkType: hard
-
 "immutable@npm:4.2.4":
   version: 4.2.4
   resolution: "immutable@npm:4.2.4"
@@ -22416,13 +20954,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-root@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "is-root@npm:2.1.0"
-  checksum: 37eea0822a2a9123feb58a9d101558ba276771a6d830f87005683349a9acff15958a9ca590a44e778c6b335660b83e85c744789080d734f6081a935a4880aee2
-  languageName: node
-  linkType: hard
-
 "is-set@npm:^2.0.1, is-set@npm:^2.0.2":
   version: 2.0.2
   resolution: "is-set@npm:2.0.2"
@@ -22601,13 +21132,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-what@npm:^3.12.0":
-  version: 3.14.1
-  resolution: "is-what@npm:3.14.1"
-  checksum: a9a6ce92d33799f1ae0916c7afb6f8128a23ce9d28bd69d9ec3ec88910e7a1f68432e6236c3c8a4d544cf0b864675e5d828437efde60ee0cf8102061d395c1df
-  languageName: node
-  linkType: hard
-
 "is-whitespace-character@npm:^1.0.0":
   version: 1.0.4
   resolution: "is-whitespace-character@npm:1.0.4"
@@ -22812,16 +21336,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-canvas-mock@npm:2.3.1":
-  version: 2.3.1
-  resolution: "jest-canvas-mock@npm:2.3.1"
-  dependencies:
-    cssfontparser: ^1.2.1
-    moo-color: ^1.0.2
-  checksum: 82606d348cf4f671af098dcebac19c98643fc5896c6e1af24b572b8e477e7bee18e4c65e0aee8d72d3af88511eba265e12001c6fb72c319d7efe15a6ba23b58b
-  languageName: node
-  linkType: hard
-
 "jest-canvas-mock@npm:2.4.0":
   version: 2.4.0
   resolution: "jest-canvas-mock@npm:2.4.0"
@@ -22832,17 +21346,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-changed-files@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-changed-files@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    execa: ^5.0.0
-    throat: ^6.0.1
-  checksum: 95e9dc74c3ca688ef85cfeab270f43f8902721a6c8ade6ac2459459a77890c85977f537d6fb809056deaa6d9c3f075fa7d2699ff5f3bf7d3fda17c3760b79b15
-  languageName: node
-  linkType: hard
-
 "jest-changed-files@npm:^29.2.0":
   version: 29.2.0
   resolution: "jest-changed-files@npm:29.2.0"
@@ -22853,33 +21356,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-circus@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-circus@npm:27.5.1"
-  dependencies:
-    "@jest/environment": ^27.5.1
-    "@jest/test-result": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    chalk: ^4.0.0
-    co: ^4.6.0
-    dedent: ^0.7.0
-    expect: ^27.5.1
-    is-generator-fn: ^2.0.0
-    jest-each: ^27.5.1
-    jest-matcher-utils: ^27.5.1
-    jest-message-util: ^27.5.1
-    jest-runtime: ^27.5.1
-    jest-snapshot: ^27.5.1
-    jest-util: ^27.5.1
-    pretty-format: ^27.5.1
-    slash: ^3.0.0
-    stack-utils: ^2.0.3
-    throat: ^6.0.1
-  checksum: 6192dccbccb3a6acfa361cbb97bdbabe94864ccf3d885932cfd41f19534329d40698078cf9be1489415e8234255d6ea9f9aff5396b79ad842a6fca6e6fc08fd0
-  languageName: node
-  linkType: hard
-
 "jest-circus@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-circus@npm:29.3.1"
@@ -22907,33 +21383,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-cli@npm:27.5.1"
-  dependencies:
-    "@jest/core": ^27.5.1
-    "@jest/test-result": ^27.5.1
-    "@jest/types": ^27.5.1
-    chalk: ^4.0.0
-    exit: ^0.1.2
-    graceful-fs: ^4.2.9
-    import-local: ^3.0.2
-    jest-config: ^27.5.1
-    jest-util: ^27.5.1
-    jest-validate: ^27.5.1
-    prompts: ^2.0.1
-    yargs: ^16.2.0
-  peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  bin:
-    jest: bin/jest.js
-  checksum: 6c0a69fb48e500241409e09ff743ed72bc6578d7769e2c994724e7ef1e5587f6c1f85dc429e93b98ae38a365222993ee70f0acc2199358992120900984f349e5
-  languageName: node
-  linkType: hard
-
 "jest-cli@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-cli@npm:29.3.1"
@@ -22961,43 +21410,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-config@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-config@npm:27.5.1"
-  dependencies:
-    "@babel/core": ^7.8.0
-    "@jest/test-sequencer": ^27.5.1
-    "@jest/types": ^27.5.1
-    babel-jest: ^27.5.1
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    deepmerge: ^4.2.2
-    glob: ^7.1.1
-    graceful-fs: ^4.2.9
-    jest-circus: ^27.5.1
-    jest-environment-jsdom: ^27.5.1
-    jest-environment-node: ^27.5.1
-    jest-get-type: ^27.5.1
-    jest-jasmine2: ^27.5.1
-    jest-regex-util: ^27.5.1
-    jest-resolve: ^27.5.1
-    jest-runner: ^27.5.1
-    jest-util: ^27.5.1
-    jest-validate: ^27.5.1
-    micromatch: ^4.0.4
-    parse-json: ^5.2.0
-    pretty-format: ^27.5.1
-    slash: ^3.0.0
-    strip-json-comments: ^3.1.1
-  peerDependencies:
-    ts-node: ">=9.0.0"
-  peerDependenciesMeta:
-    ts-node:
-      optional: true
-  checksum: 1188fd46c0ed78cbe3175eb9ad6712ccf74a74be33d9f0d748e147c107f0889f8b701fbff1567f31836ae18597dacdc43d6a8fc30dd34ade6c9229cc6c7cb82d
-  languageName: node
-  linkType: hard
-
 "jest-config@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-config@npm:29.3.1"
@@ -23067,7 +21479,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^27.0.6, jest-diff@npm:^27.1.0, jest-diff@npm:^27.5.1":
+"jest-diff@npm:^27.0.6, jest-diff@npm:^27.1.0":
   version: 27.5.1
   resolution: "jest-diff@npm:27.5.1"
   dependencies:
@@ -23091,15 +21503,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-docblock@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-docblock@npm:27.5.1"
-  dependencies:
-    detect-newline: ^3.0.0
-  checksum: c0fed6d55b229d8bffdd8d03f121dd1a3be77c88f50552d374f9e1ea3bde57bf6bea017a0add04628d98abcb1bfb48b456438eeca8a74ef0053f4dae3b95d29c
-  languageName: node
-  linkType: hard
-
 "jest-docblock@npm:^29.2.0":
   version: 29.2.0
   resolution: "jest-docblock@npm:29.2.0"
@@ -23109,19 +21512,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-each@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-each@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    chalk: ^4.0.0
-    jest-get-type: ^27.5.1
-    jest-util: ^27.5.1
-    pretty-format: ^27.5.1
-  checksum: b5a6d8730fd938982569c9e0b42bdf3c242f97b957ed8155a6473b5f7b540970f8685524e7f53963dc1805319f4b6602abfc56605590ca19d55bd7a87e467e63
-  languageName: node
-  linkType: hard
-
 "jest-each@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-each@npm:29.3.1"
@@ -23156,35 +21546,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-jsdom@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-environment-jsdom@npm:27.5.1"
-  dependencies:
-    "@jest/environment": ^27.5.1
-    "@jest/fake-timers": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    jest-mock: ^27.5.1
-    jest-util: ^27.5.1
-    jsdom: ^16.6.0
-  checksum: bc104aef7d7530d0740402aa84ac812138b6d1e51fe58adecce679f82b99340ddab73e5ec68fa079f33f50c9ddec9728fc9f0ddcca2ad6f0b351eed2762cc555
-  languageName: node
-  linkType: hard
-
-"jest-environment-node@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-environment-node@npm:27.5.1"
-  dependencies:
-    "@jest/environment": ^27.5.1
-    "@jest/fake-timers": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    jest-mock: ^27.5.1
-    jest-util: ^27.5.1
-  checksum: 0f988330c4f3eec092e3fb37ea753b0c6f702e83cd8f4d770af9c2bf964a70bc45fbd34ec6fdb6d71ce98a778d9f54afd673e63f222e4667fff289e8069dba39
-  languageName: node
-  linkType: hard
-
 "jest-environment-node@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-environment-node@npm:29.3.1"
@@ -23261,30 +21622,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-haste-map@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-haste-map@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    "@types/graceful-fs": ^4.1.2
-    "@types/node": "*"
-    anymatch: ^3.0.3
-    fb-watchman: ^2.0.0
-    fsevents: ^2.3.2
-    graceful-fs: ^4.2.9
-    jest-regex-util: ^27.5.1
-    jest-serializer: ^27.5.1
-    jest-util: ^27.5.1
-    jest-worker: ^27.5.1
-    micromatch: ^4.0.4
-    walker: ^1.0.7
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: e092a1412829a9254b4725531ee72926de530f77fda7b0d9ea18008fb7623c16f72e772d8e93be71cac9e591b2c6843a669610887dd2c89bd9eb528856e3ab47
-  languageName: node
-  linkType: hard
-
 "jest-haste-map@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-haste-map@npm:29.3.1"
@@ -23308,43 +21645,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-jasmine2@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-jasmine2@npm:27.5.1"
-  dependencies:
-    "@jest/environment": ^27.5.1
-    "@jest/source-map": ^27.5.1
-    "@jest/test-result": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    chalk: ^4.0.0
-    co: ^4.6.0
-    expect: ^27.5.1
-    is-generator-fn: ^2.0.0
-    jest-each: ^27.5.1
-    jest-matcher-utils: ^27.5.1
-    jest-message-util: ^27.5.1
-    jest-runtime: ^27.5.1
-    jest-snapshot: ^27.5.1
-    jest-util: ^27.5.1
-    pretty-format: ^27.5.1
-    throat: ^6.0.1
-  checksum: b716adf253ceb73db661936153394ab90d7f3a8ba56d6189b7cd4df8e4e2a4153b4e63ebb5d36e29ceb0f4c211d5a6f36ab7048c6abbd881c8646567e2ab8e6d
-  languageName: node
-  linkType: hard
-
-"jest-junit@npm:13.1.0":
-  version: 13.1.0
-  resolution: "jest-junit@npm:13.1.0"
-  dependencies:
-    mkdirp: ^1.0.4
-    strip-ansi: ^6.0.1
-    uuid: ^8.3.2
-    xml: ^1.0.1
-  checksum: a12ec522012cf9d0e97d4c665d8ca05b97dc3d25ef3cd0dbba2b095da4b68e1cabac9751a2718a9593b55c620a2b980e0b6c7dd7d33dfc4b73193bc67b9c9ae0
-  languageName: node
-  linkType: hard
-
 "jest-junit@npm:15.0.0":
   version: 15.0.0
   resolution: "jest-junit@npm:15.0.0"
@@ -23357,16 +21657,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-leak-detector@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-leak-detector@npm:27.5.1"
-  dependencies:
-    jest-get-type: ^27.5.1
-    pretty-format: ^27.5.1
-  checksum: 5c9689060960567ddaf16c570d87afa760a461885765d2c71ef4f4857bbc3af1482c34e3cce88e50beefde1bf35e33530b020480752057a7e3dbb1ca0bae359f
-  languageName: node
-  linkType: hard
-
 "jest-leak-detector@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-leak-detector@npm:29.3.1"
@@ -23389,35 +21679,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^27.0.0, jest-matcher-utils@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-matcher-utils@npm:27.5.1"
-  dependencies:
-    chalk: ^4.0.0
-    jest-diff: ^27.5.1
-    jest-get-type: ^27.5.1
-    pretty-format: ^27.5.1
-  checksum: bb2135fc48889ff3fe73888f6cc7168ddab9de28b51b3148f820c89fdfd2effdcad005f18be67d0b9be80eda208ad47290f62f03d0a33f848db2dd0273c8217a
-  languageName: node
-  linkType: hard
-
-"jest-message-util@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-message-util@npm:27.5.1"
-  dependencies:
-    "@babel/code-frame": ^7.12.13
-    "@jest/types": ^27.5.1
-    "@types/stack-utils": ^2.0.0
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.9
-    micromatch: ^4.0.4
-    pretty-format: ^27.5.1
-    slash: ^3.0.0
-    stack-utils: ^2.0.3
-  checksum: eb6d637d1411c71646de578c49826b6da8e33dd293e501967011de9d1916d53d845afbfb52a5b661ff1c495be7c13f751c48c7f30781fd94fbd64842e8195796
-  languageName: node
-  linkType: hard
-
 "jest-message-util@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-message-util@npm:29.3.1"
@@ -23435,16 +21696,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-mock@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-  checksum: f5b5904bb1741b4a1687a5f492535b7b1758dc26534c72a5423305f8711292e96a601dec966df81bb313269fb52d47227e29f9c2e08324d79529172f67311be0
-  languageName: node
-  linkType: hard
-
 "jest-mock@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-mock@npm:29.3.1"
@@ -23475,13 +21726,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-regex-util@npm:27.5.1"
-  checksum: d45ca7a9543616a34f7f3079337439cf07566e677a096472baa2810e274b9808b76767c97b0a4029b8a5b82b9d256dee28ef9ad4138b2b9e5933f6fac106c418
-  languageName: node
-  linkType: hard
-
 "jest-regex-util@npm:^29.2.0":
   version: 29.2.0
   resolution: "jest-regex-util@npm:29.2.0"
@@ -23489,17 +21733,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-resolve-dependencies@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-resolve-dependencies@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    jest-regex-util: ^27.5.1
-    jest-snapshot: ^27.5.1
-  checksum: c67af97afad1da88f5530317c732bbd1262d1225f6cd7f4e4740a5db48f90ab0bd8564738ac70d1a43934894f9aef62205c1b8f8ee89e5c7a737e6a121ee4c25
-  languageName: node
-  linkType: hard
-
 "jest-resolve-dependencies@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-resolve-dependencies@npm:29.3.1"
@@ -23510,24 +21743,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-resolve@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^27.5.1
-    jest-pnp-resolver: ^1.2.2
-    jest-util: ^27.5.1
-    jest-validate: ^27.5.1
-    resolve: ^1.20.0
-    resolve.exports: ^1.1.0
-    slash: ^3.0.0
-  checksum: 735830e7265b20a348029738680bb2f6e37f80ecea86cda869a4c318ba3a45d39c7a3a873a22f7f746d86258c50ead6e7f501de043e201c095d7ba628a1c440f
-  languageName: node
-  linkType: hard
-
 "jest-resolve@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-resolve@npm:29.3.1"
@@ -23545,35 +21760,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-runner@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-runner@npm:27.5.1"
-  dependencies:
-    "@jest/console": ^27.5.1
-    "@jest/environment": ^27.5.1
-    "@jest/test-result": ^27.5.1
-    "@jest/transform": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    chalk: ^4.0.0
-    emittery: ^0.8.1
-    graceful-fs: ^4.2.9
-    jest-docblock: ^27.5.1
-    jest-environment-jsdom: ^27.5.1
-    jest-environment-node: ^27.5.1
-    jest-haste-map: ^27.5.1
-    jest-leak-detector: ^27.5.1
-    jest-message-util: ^27.5.1
-    jest-resolve: ^27.5.1
-    jest-runtime: ^27.5.1
-    jest-util: ^27.5.1
-    jest-worker: ^27.5.1
-    source-map-support: ^0.5.6
-    throat: ^6.0.1
-  checksum: 5bbe6cf847dd322b3332ec9d6977b54f91bd5f72ff620bc1a0192f0f129deda8aa7ca74c98922187a7aa87d8e0ce4f6c50e99a7ccb2a310bf4d94be2e0c3ce8e
-  languageName: node
-  linkType: hard
-
 "jest-runner@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-runner@npm:29.3.1"
@@ -23603,36 +21789,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-runtime@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-runtime@npm:27.5.1"
-  dependencies:
-    "@jest/environment": ^27.5.1
-    "@jest/fake-timers": ^27.5.1
-    "@jest/globals": ^27.5.1
-    "@jest/source-map": ^27.5.1
-    "@jest/test-result": ^27.5.1
-    "@jest/transform": ^27.5.1
-    "@jest/types": ^27.5.1
-    chalk: ^4.0.0
-    cjs-module-lexer: ^1.0.0
-    collect-v8-coverage: ^1.0.0
-    execa: ^5.0.0
-    glob: ^7.1.3
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^27.5.1
-    jest-message-util: ^27.5.1
-    jest-mock: ^27.5.1
-    jest-regex-util: ^27.5.1
-    jest-resolve: ^27.5.1
-    jest-snapshot: ^27.5.1
-    jest-util: ^27.5.1
-    slash: ^3.0.0
-    strip-bom: ^4.0.0
-  checksum: 929e3df0c53dab43f831f2af4e2996b22aa8cb2d6d483919d6b0426cbc100098fd5b777b998c6568b77f8c4d860b2e83127514292ff61416064f5ef926492386
-  languageName: node
-  linkType: hard
-
 "jest-runtime@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-runtime@npm:29.3.1"
@@ -23673,46 +21829,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-serializer@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-serializer@npm:27.5.1"
-  dependencies:
-    "@types/node": "*"
-    graceful-fs: ^4.2.9
-  checksum: 803e03a552278610edc6753c0dd9fa5bb5cd3ca47414a7b2918106efb62b79fd5e9ae785d0a21f12a299fa599fea8acc1fa6dd41283328cee43962cf7df9bb44
-  languageName: node
-  linkType: hard
-
-"jest-snapshot@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-snapshot@npm:27.5.1"
-  dependencies:
-    "@babel/core": ^7.7.2
-    "@babel/generator": ^7.7.2
-    "@babel/plugin-syntax-typescript": ^7.7.2
-    "@babel/traverse": ^7.7.2
-    "@babel/types": ^7.0.0
-    "@jest/transform": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/babel__traverse": ^7.0.4
-    "@types/prettier": ^2.1.5
-    babel-preset-current-node-syntax: ^1.0.0
-    chalk: ^4.0.0
-    expect: ^27.5.1
-    graceful-fs: ^4.2.9
-    jest-diff: ^27.5.1
-    jest-get-type: ^27.5.1
-    jest-haste-map: ^27.5.1
-    jest-matcher-utils: ^27.5.1
-    jest-message-util: ^27.5.1
-    jest-util: ^27.5.1
-    natural-compare: ^1.4.0
-    pretty-format: ^27.5.1
-    semver: ^7.3.2
-  checksum: a5cfadf0d21cd76063925d1434bc076443ed6d87847d0e248f0b245f11db3d98ff13e45cc03b15404027dabecd712d925f47b6eae4f64986f688640a7d362514
-  languageName: node
-  linkType: hard
-
 "jest-snapshot@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-snapshot@npm:29.3.1"
@@ -23759,34 +21875,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-util@npm:^27.0.0":
-  version: 27.4.2
-  resolution: "jest-util@npm:27.4.2"
-  dependencies:
-    "@jest/types": ^27.4.2
-    "@types/node": "*"
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    graceful-fs: ^4.2.4
-    picomatch: ^2.2.3
-  checksum: bcf16881aff1421c5f7c2df2ef9492cf8cd92fcd0a2a99bec5ab16f7185ee19aea48eda41d9dfa7b5bf4354bdc21628f5931cd2e7281741e6d2983965efb631e
-  languageName: node
-  linkType: hard
-
-"jest-util@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-util@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    graceful-fs: ^4.2.9
-    picomatch: ^2.2.3
-  checksum: ac8d122f6daf7a035dcea156641fd3701aeba245417c40836a77e35b3341b9c02ddc5d904cfcd4ddbaa00ab854da76d3b911870cafdcdbaff90ea471de26c7d7
-  languageName: node
-  linkType: hard
-
 "jest-util@npm:^29.0.0, jest-util@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-util@npm:29.3.1"
@@ -23829,20 +21917,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-validate@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    camelcase: ^6.2.0
-    chalk: ^4.0.0
-    jest-get-type: ^27.5.1
-    leven: ^3.1.0
-    pretty-format: ^27.5.1
-  checksum: 82e870f8ee7e4fb949652711b1567f05ae31c54be346b0899e8353e5c20fad7692b511905b37966945e90af8dc0383eb41a74f3ffefb16140ea4f9164d841412
-  languageName: node
-  linkType: hard
-
 "jest-validate@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-validate@npm:29.3.1"
@@ -23857,21 +21931,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-watcher@npm:27.5.1"
-  dependencies:
-    "@jest/test-result": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    ansi-escapes: ^4.2.1
-    chalk: ^4.0.0
-    jest-util: ^27.5.1
-    string-length: ^4.0.1
-  checksum: 191c4e9c278c0902ade1a8a80883ac244963ba3e6e78607a3d5f729ccca9c6e71fb3b316f87883658132641c5d818aa84202585c76752e03c539e6cbecb820bd
-  languageName: node
-  linkType: hard
-
 "jest-watcher@npm:^29.3.1":
   version: 29.3.1
   resolution: "jest-watcher@npm:29.3.1"
@@ -23899,17 +21958,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^27.0.2, jest-worker@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-worker@npm:27.5.1"
-  dependencies:
-    "@types/node": "*"
-    merge-stream: ^2.0.0
-    supports-color: ^8.0.0
-  checksum: 98cd68b696781caed61c983a3ee30bf880b5bd021c01d98f47b143d4362b85d0737f8523761e2713d45e18b4f9a2b98af1eaee77afade4111bb65c77d6f7c980
-  languageName: node
-  linkType: hard
-
 "jest-worker@npm:^27.0.6":
   version: 27.3.1
   resolution: "jest-worker@npm:27.3.1"
@@ -23968,24 +22016,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest@npm:27.5.1":
-  version: 27.5.1
-  resolution: "jest@npm:27.5.1"
-  dependencies:
-    "@jest/core": ^27.5.1
-    import-local: ^3.0.2
-    jest-cli: ^27.5.1
-  peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  bin:
-    jest: bin/jest.js
-  checksum: 96f1d69042b3c6dfc695f2a4e4b0db38af6fb78582ad1a02beaa57cfcd77cbd31567d7d865c1c85709b7c3e176eefa3b2035ffecd646005f15d8ef528eccf205
-  languageName: node
-  linkType: hard
-
 "jest@npm:29.3.1":
   version: 29.3.1
   resolution: "jest@npm:29.3.1"
@@ -24104,46 +22134,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^16.6.0":
-  version: 16.7.0
-  resolution: "jsdom@npm:16.7.0"
-  dependencies:
-    abab: ^2.0.5
-    acorn: ^8.2.4
-    acorn-globals: ^6.0.0
-    cssom: ^0.4.4
-    cssstyle: ^2.3.0
-    data-urls: ^2.0.0
-    decimal.js: ^10.2.1
-    domexception: ^2.0.1
-    escodegen: ^2.0.0
-    form-data: ^3.0.0
-    html-encoding-sniffer: ^2.0.1
-    http-proxy-agent: ^4.0.1
-    https-proxy-agent: ^5.0.0
-    is-potential-custom-element-name: ^1.0.1
-    nwsapi: ^2.2.0
-    parse5: 6.0.1
-    saxes: ^5.0.1
-    symbol-tree: ^3.2.4
-    tough-cookie: ^4.0.0
-    w3c-hr-time: ^1.0.2
-    w3c-xmlserializer: ^2.0.0
-    webidl-conversions: ^6.1.0
-    whatwg-encoding: ^1.0.5
-    whatwg-mimetype: ^2.3.0
-    whatwg-url: ^8.5.0
-    ws: ^7.4.6
-    xml-name-validator: ^3.0.0
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 454b83371857000763ed31130a049acd1b113e3b927e6dcd75c67ddc30cdd242d7ebcac5c2294b7a1a6428155cb1398709c573b3c6d809218692ea68edd93370
-  languageName: node
-  linkType: hard
-
 "jsdom@npm:^20.0.0":
   version: 20.0.2
   resolution: "jsdom@npm:20.0.2"
@@ -24278,15 +22268,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:2.x, json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.1, json5@npm:^2.2.2, json5@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "json5@npm:2.2.3"
-  bin:
-    json5: lib/cli.js
-  checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
-  languageName: node
-  linkType: hard
-
 "json5@npm:^1.0.1":
   version: 1.0.2
   resolution: "json5@npm:1.0.2"
@@ -24298,6 +22279,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.1, json5@npm:^2.2.2, json5@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "json5@npm:2.2.3"
+  bin:
+    json5: lib/cli.js
+  checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
+  languageName: node
+  linkType: hard
+
 "jsonc-parser@npm:3.2.0, jsonc-parser@npm:^3.2.0":
   version: 3.2.0
   resolution: "jsonc-parser@npm:3.2.0"
@@ -24640,53 +22630,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"less-loader@npm:^10.2.0":
-  version: 10.2.0
-  resolution: "less-loader@npm:10.2.0"
-  dependencies:
-    klona: ^2.0.4
-  peerDependencies:
-    less: ^3.5.0 || ^4.0.0
-    webpack: ^5.0.0
-  checksum: 42a2b56a9d474c066b22423e8ed82821ed6dbc5effad8d84b2a3d8651fb4c5027f32ac770a0fe4810e3e6d0595be576a2f7f2341f2603bdf795cff4e94d7340b
-  languageName: node
-  linkType: hard
-
-"less@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "less@npm:4.1.2"
-  dependencies:
-    copy-anything: ^2.0.1
-    errno: ^0.1.1
-    graceful-fs: ^4.1.2
-    image-size: ~0.5.0
-    make-dir: ^2.1.0
-    mime: ^1.4.1
-    needle: ^2.5.2
-    parse-node-version: ^1.0.1
-    source-map: ~0.6.0
-    tslib: ^2.3.0
-  dependenciesMeta:
-    errno:
-      optional: true
-    graceful-fs:
-      optional: true
-    image-size:
-      optional: true
-    make-dir:
-      optional: true
-    mime:
-      optional: true
-    needle:
-      optional: true
-    source-map:
-      optional: true
-  bin:
-    lessc: bin/lessc
-  checksum: d3cbc3e18a8313e44f7feaf5fce1728b25911e116a8b9f7206e1f7bf5660902ddaf470b58e68a52288488c8a337433b7de686a3d2405ce49155c2280191983de
-  languageName: node
-  linkType: hard
-
 "leven@npm:^3.1.0":
   version: 3.1.0
   resolution: "leven@npm:3.1.0"
@@ -24887,13 +22830,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loader-utils@npm:^3.2.0":
-  version: 3.2.1
-  resolution: "loader-utils@npm:3.2.1"
-  checksum: 4e3ea054cdc8be1ab1f1238f49f42fdf0483039eff920fb1d442039f3f0ad4ebd11fb8e584ccdf2cb7e3c56b3d40c1832416e6408a55651b843da288960cc792
-  languageName: node
-  linkType: hard
-
 "locate-path@npm:^2.0.0":
   version: 2.0.0
   resolution: "locate-path@npm:2.0.0"
@@ -25023,7 +22959,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0":
+"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@@ -26165,7 +24101,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime@npm:1.6.0, mime@npm:^1.4.1, mime@npm:^1.6.0":
+"mime@npm:1.6.0, mime@npm:^1.6.0":
   version: 1.6.0
   resolution: "mime@npm:1.6.0"
   bin:
@@ -26253,17 +24189,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mini-css-extract-plugin@npm:^2.6.0":
-  version: 2.6.0
-  resolution: "mini-css-extract-plugin@npm:2.6.0"
-  dependencies:
-    schema-utils: ^4.0.0
-  peerDependencies:
-    webpack: ^5.0.0
-  checksum: ea73bd66558de7a37db094fe68fa130e7a725ab15f880ff8467a75d9c4c2f1576d20720088ea22af9922a94b8600bbfef0c6acaf10d12a32a9bd20a90ba3c35f
-  languageName: node
-  linkType: hard
-
 "minimalistic-assert@npm:^1.0.0":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
@@ -26811,19 +24736,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"needle@npm:^2.5.2":
-  version: 2.9.1
-  resolution: "needle@npm:2.9.1"
-  dependencies:
-    debug: ^3.2.6
-    iconv-lite: ^0.4.4
-    sax: ^1.2.4
-  bin:
-    needle: ./bin/needle
-  checksum: 746ae3a3782f0a057ff304a98843cc6f2009f978a0fad0c3e641a9d46d0b5702bb3e197ba08aecd48678067874a991c4f5fc320c7e51a4c041d9dd3441146cf0
-  languageName: node
-  linkType: hard
-
 "negotiator@npm:0.6.2, negotiator@npm:^0.6.2":
   version: 0.6.2
   resolution: "negotiator@npm:0.6.2"
@@ -27017,13 +24929,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "node-releases@npm:2.0.2"
-  checksum: da858bf86b4d512842379749f5a5e4196ddab05ba18ffcf29f05bf460beceaca927f070f4430bb5046efec18941ddbc85e4c5fdbb83afc28a38dd6069a2f255e
-  languageName: node
-  linkType: hard
-
 "node-releases@npm:^2.0.3":
   version: 2.0.4
   resolution: "node-releases@npm:2.0.4"
@@ -27337,13 +25242,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "nwsapi@npm:2.2.0"
-  checksum: 5ef4a9bc0c1a5b7f2e014aa6a4b359a257503b796618ed1ef0eb852098f77e772305bb0e92856e4bbfa3e6c75da48c0113505c76f144555ff38867229c2400a7
-  languageName: node
-  linkType: hard
-
 "nwsapi@npm:^2.2.2":
   version: 2.2.2
   resolution: "nwsapi@npm:2.2.2"
@@ -27562,16 +25460,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "object.hasown@npm:1.1.0"
-  dependencies:
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.1
-  checksum: 5c5d0b1b793514609f7a635f3110fbd346e142c9afd2485b802775e1ef6c90e48ff6e8e8744927933370ba30964e21af9c5fcf782b47f34d650aa6b277565330
-  languageName: node
-  linkType: hard
-
 "object.hasown@npm:^1.1.1":
   version: 1.1.1
   resolution: "object.hasown@npm:1.1.1"
@@ -28194,13 +26082,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-node-version@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "parse-node-version@npm:1.0.1"
-  checksum: c192393b6a978092c1ef8df2c42c0a02e4534b96543e23d335f1b9b5b913ac75473d18fe6050b58d6995c57fb383ee71a5cb8397e363caaf38a6df8215cc52fd
-  languageName: node
-  linkType: hard
-
 "parse-path@npm:^7.0.0":
   version: 7.0.0
   resolution: "parse-path@npm:7.0.0"
@@ -28229,7 +26110,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse5@npm:6.0.1, parse5@npm:^6.0.0, parse5@npm:^6.0.1":
+"parse5@npm:^6.0.0":
   version: 6.0.1
   resolution: "parse5@npm:6.0.1"
   checksum: 7d569a176c5460897f7c8f3377eff640d54132b9be51ae8a8fa4979af940830b2b0c296ce75e5bd8f4041520aadde13170dbdec44889975f906098ea0002f4bd
@@ -28575,15 +26456,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pkg-up@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "pkg-up@npm:3.1.0"
-  dependencies:
-    find-up: ^3.0.0
-  checksum: 5bac346b7c7c903613c057ae3ab722f320716199d753f4a7d053d38f2b5955460f3e6ab73b4762c62fd3e947f58e04f1343e92089e7bb6091c90877406fcd8c8
-  languageName: node
-  linkType: hard
-
 "pluralize@npm:^8.0.0":
   version: 8.0.0
   resolution: "pluralize@npm:8.0.0"
@@ -28648,17 +26520,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-attribute-case-insensitive@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "postcss-attribute-case-insensitive@npm:5.0.0"
-  dependencies:
-    postcss-selector-parser: ^6.0.2
-  peerDependencies:
-    postcss: ^8.0.2
-  checksum: 6e0e872af10ba040af79fd0ee63b29cd6bc87a23a146fe71f9942d15769619c1f5b993b3238bdf30eb4f4c24887d2b85755692bc17e21e0ed3b24bd650cbf38b
-  languageName: node
-  linkType: hard
-
 "postcss-calc@npm:^8.2.3":
   version: 8.2.4
   resolution: "postcss-calc@npm:8.2.4"
@@ -28671,50 +26532,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-clamp@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "postcss-clamp@npm:4.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4.6
-  checksum: 118eec936b3b035dc8d75c89973408f15c5a3de3d1ee210a2b3511e3e431d9c56e6f354b509a90540241e2225ffe3caaa2fdf25919c63348ce4583a28ada642c
-  languageName: node
-  linkType: hard
-
-"postcss-color-functional-notation@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "postcss-color-functional-notation@npm:4.2.2"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 77cc5d5526c3228737f2642472546498f0d963b8617c7cae453423331ecb868712ed1557007eab0cd5ff183d60bba24fa2e4bc83e550ddd45f1399e354704b81
-  languageName: node
-  linkType: hard
-
-"postcss-color-hex-alpha@npm:^8.0.3":
-  version: 8.0.3
-  resolution: "postcss-color-hex-alpha@npm:8.0.3"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 3b5c1d12f86fc2b4b5b618e3842d03754eeae8c25cf252201a9bf67d2ef2845b50c23bd2854e631d8133418c13700be93a2a8689cccdfee446f25436adff9e46
-  languageName: node
-  linkType: hard
-
-"postcss-color-rebeccapurple@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-color-rebeccapurple@npm:7.0.2"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.3
-  checksum: 7d734ac50769f2cf42ac1e58247e45dffa3cc5fb663e67fa5b8ca1a71e1e950603263aad2e98d1629db6058b173ade0c5b5de0390d51d240da8c8674c036c8c7
-  languageName: node
-  linkType: hard
-
 "postcss-colormin@npm:^5.3.0":
   version: 5.3.0
   resolution: "postcss-colormin@npm:5.3.0"
@@ -28741,48 +26558,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "postcss-custom-media@npm:8.0.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 11c22e1b8cd5ec13093cb563a3a44817b38127e7f97bde954027f377a6848976092fb5482b96ef0f8b3f716038d9804a01a928eebe98c2d8a1fa9806ff4d3436
-  languageName: node
-  linkType: hard
-
-"postcss-custom-properties@npm:^12.1.5":
-  version: 12.1.7
-  resolution: "postcss-custom-properties@npm:12.1.7"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 98c313c2318679b727080297a12fb6674e5ea5a3343f693167e985793afd9c7d71ce25a17139864ccfe76d32d7474bb89a2ad02830c8e40fa57ccb0a699b528d
-  languageName: node
-  linkType: hard
-
-"postcss-custom-selectors@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-custom-selectors@npm:6.0.0"
-  dependencies:
-    postcss-selector-parser: ^6.0.4
-  peerDependencies:
-    postcss: ^8.1.2
-  checksum: 64640f6beab468222fefc7194b5de1520b0962654d860b71996ab8582e22e9918775582488fe8567faf9d0fb6a032fbafe89a836cfe9008d0985fe4f1d2f033e
-  languageName: node
-  linkType: hard
-
-"postcss-dir-pseudo-class@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "postcss-dir-pseudo-class@npm:6.0.4"
-  dependencies:
-    postcss-selector-parser: ^6.0.9
-  peerDependencies:
-    postcss: ^8.4
-  checksum: e493e6ed54c50b8b1bda1a0cde55fc2dec04d22983e5af178090ff592854a29866c1c255637cb047b2b40c18e6ef15c1aa45aa354735f79a7709e9add5ea2e3e
-  languageName: node
-  linkType: hard
-
 "postcss-discard-comments@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-discard-comments@npm:5.1.1"
@@ -28819,29 +26594,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "postcss-double-position-gradients@npm:3.1.1"
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties": ^1.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: c59131b2d03022fbb69336766786e8cc33f6e78c8040e17d2ba499fce789c675c5dcdc4fd3abe1e76e0ecd3dc910ad8c56d49a307c0115047d21a59544afc527
-  languageName: node
-  linkType: hard
-
-"postcss-env-function@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "postcss-env-function@npm:4.0.6"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 645b2363cfa21be9dcce7fe4a0f172f0af70c00d6a4c1eb3d7ff7e9cfe26d569e291ec2533114d77b12d610023cd168a92d62c38f2fc969fa333b5ae2bff5ffe
-  languageName: node
-  linkType: hard
-
 "postcss-flexbugs-fixes@npm:^4.2.1":
   version: 4.2.1
   resolution: "postcss-flexbugs-fixes@npm:4.2.1"
@@ -28851,87 +26603,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-flexbugs-fixes@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "postcss-flexbugs-fixes@npm:5.0.2"
-  peerDependencies:
-    postcss: ^8.1.4
-  checksum: 022ddbcca8987303b9be75ff259e9de81b98643adac87a5fc6b52a0fcbbf95e1ac9fd508c4ed67cad76ac5d039b7123de8a0832329481b3c626f5d63f7a28f47
-  languageName: node
-  linkType: hard
-
-"postcss-focus-visible@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "postcss-focus-visible@npm:6.0.4"
-  dependencies:
-    postcss-selector-parser: ^6.0.9
-  peerDependencies:
-    postcss: ^8.4
-  checksum: acd010b9ddef9b86ffb5fa604c13515ba83e18bc5118dad0a1281150f412aa0ece056c2c5ac56b55e2599f53ab0f740f5ebfdc51e1f5cfe43b8130bac0096fcc
-  languageName: node
-  linkType: hard
-
-"postcss-focus-within@npm:^5.0.4":
-  version: 5.0.4
-  resolution: "postcss-focus-within@npm:5.0.4"
-  dependencies:
-    postcss-selector-parser: ^6.0.9
-  peerDependencies:
-    postcss: ^8.4
-  checksum: f23d8ab757345a6deaa807d76e10c88caf4b771c38b60e1593b24aee161c503b5823620e89302226a6ae5e7afdb6ac31809241291912e4176eb594a7ddcc9521
-  languageName: node
-  linkType: hard
-
-"postcss-font-variant@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "postcss-font-variant@npm:5.0.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: a19286589261c2bc3e20470486e1ee3b4daf34271c5020167f30856c9b30c26f23264307cb97a184d503814e1b8c5d8a1f9f64a14fd4fd9551c173dca9424695
-  languageName: node
-  linkType: hard
-
-"postcss-gap-properties@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "postcss-gap-properties@npm:3.0.3"
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 8b7bb4292093fa66fa874143b69297d25ab83e5b8aef643f0a39cff900d9754cae55f0fb267f9230dbccbf31d538f2e885c59274daabe57a7b56716292dd89d5
-  languageName: node
-  linkType: hard
-
-"postcss-image-set-function@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "postcss-image-set-function@npm:4.0.6"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: bdcd11d5ef9e5beb8ce14888125e8b526b7e01902dcb78b47ea4418297f64cf188343194670a5beb8ee5831cc902a591a8887e3512403a6b932cff921be85de3
-  languageName: node
-  linkType: hard
-
-"postcss-initial@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "postcss-initial@npm:4.0.1"
-  peerDependencies:
-    postcss: ^8.0.0
-  checksum: 6956953853865de79c39d11533a2860e9f38b770bb284d0010d98a00b9469e22de344e4e5fd8208614d797030487e8918dd2f2c37d9e24d4dd59d565d4fc3e12
-  languageName: node
-  linkType: hard
-
-"postcss-lab-function@npm:^4.1.2":
-  version: 4.2.0
-  resolution: "postcss-lab-function@npm:4.2.0"
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties": ^1.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 89ca828b8ed16feb201be7b050254560786c76392ce0a4262732438521ce13d083d1e542addf9d14da75249c58802d721df3152316bb591c9f627c7038166c2a
-  languageName: node
-  linkType: hard
-
 "postcss-loader@npm:7.0.2":
   version: 7.0.2
   resolution: "postcss-loader@npm:7.0.2"
@@ -28962,38 +26633,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-loader@npm:^6.2.1":
-  version: 6.2.1
-  resolution: "postcss-loader@npm:6.2.1"
-  dependencies:
-    cosmiconfig: ^7.0.0
-    klona: ^2.0.5
-    semver: ^7.3.5
-  peerDependencies:
-    postcss: ^7.0.0 || ^8.0.1
-    webpack: ^5.0.0
-  checksum: e40ae79c3e39df37014677a817b001bd115d8b10dedf53a07b97513d93b1533cd702d7a48831bdd77b9a9484b1ec84a5d4a723f80e83fb28682c75b5e65e8a90
-  languageName: node
-  linkType: hard
-
-"postcss-logical@npm:^5.0.4":
-  version: 5.0.4
-  resolution: "postcss-logical@npm:5.0.4"
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 17c71291ed6a03883a5aa54b9923b874c32710707d041a0f0752e6febdb09dee5d2abf4ef271978d932e4a4c948f349bb23edf633c03e3427ba15e71bfc66ac7
-  languageName: node
-  linkType: hard
-
-"postcss-media-minmax@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "postcss-media-minmax@npm:5.0.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 2cd7283e07a1ac1acdcc3ecbaa0e9932f8d1e7647e7aeb14d91845fcb890d60d7257ec70c825cae8d48ae80a08cc77ebc4021a0dfa32360e0cd991e2bc021607
-  languageName: node
-  linkType: hard
-
 "postcss-media-query-parser@npm:^0.2.3":
   version: 0.2.3
   resolution: "postcss-media-query-parser@npm:0.2.3"
@@ -29119,17 +26758,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^10.1.3":
-  version: 10.1.4
-  resolution: "postcss-nesting@npm:10.1.4"
-  dependencies:
-    postcss-selector-parser: ^6.0.10
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 13dd01f9e43a6f93d48d2f9d5ef08966dbc990864dec585cb799420011c0ffff5b4ec670ba4a912c47a8a57263b4eb95fce352b04ddd2eb70f715bf622ad1a3b
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-charset@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-normalize-charset@npm:5.1.0"
@@ -29229,13 +26857,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-opacity-percentage@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "postcss-opacity-percentage@npm:1.1.2"
-  checksum: b582f6d4efb6a14aa09ba49869774c2f060558a68af8a0c3aa9efc0e01b35a4985e783640806a76d4e26d2ba97556f9b5e88dde91d1664a2e2c24688e4bbcf61
-  languageName: node
-  linkType: hard
-
 "postcss-ordered-values@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-ordered-values@npm:5.1.1"
@@ -29248,99 +26869,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-overflow-shorthand@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "postcss-overflow-shorthand@npm:3.0.3"
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 52080efd1cefbc01a0f931f247c69470a565684cd8e3585c3f5bfa45e849abe12cd4997b031179ea66fc1339eaf72dc9e3d87a218822fd6b958ce71632da23cb
-  languageName: node
-  linkType: hard
-
-"postcss-page-break@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "postcss-page-break@npm:3.0.4"
-  peerDependencies:
-    postcss: ^8
-  checksum: a7d08c945fc691f62c77ac701e64722218b14ec5c8fc1972b8af9c21553492d40808cf95e61b9697b1dacaf7e6180636876d7fee314f079e6c9e39ac1b1edc6f
-  languageName: node
-  linkType: hard
-
-"postcss-place@npm:^7.0.4":
-  version: 7.0.4
-  resolution: "postcss-place@npm:7.0.4"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: dd1738ec9bf324889e4c51f390b4e2774c3b7a040ff277ce88c6e2f139374cf2a5d921d78b156347d57ee618e9029c1907790a50290f48918afb67c5e53bc36e
-  languageName: node
-  linkType: hard
-
-"postcss-preset-env@npm:7.4.3":
-  version: 7.4.3
-  resolution: "postcss-preset-env@npm:7.4.3"
-  dependencies:
-    "@csstools/postcss-color-function": ^1.0.3
-    "@csstools/postcss-font-format-keywords": ^1.0.0
-    "@csstools/postcss-hwb-function": ^1.0.0
-    "@csstools/postcss-ic-unit": ^1.0.0
-    "@csstools/postcss-is-pseudo-class": ^2.0.1
-    "@csstools/postcss-normalize-display-values": ^1.0.0
-    "@csstools/postcss-oklab-function": ^1.0.2
-    "@csstools/postcss-progressive-custom-properties": ^1.3.0
-    autoprefixer: ^10.4.4
-    browserslist: ^4.20.2
-    css-blank-pseudo: ^3.0.3
-    css-has-pseudo: ^3.0.4
-    css-prefers-color-scheme: ^6.0.3
-    cssdb: ^6.5.0
-    postcss-attribute-case-insensitive: ^5.0.0
-    postcss-clamp: ^4.1.0
-    postcss-color-functional-notation: ^4.2.2
-    postcss-color-hex-alpha: ^8.0.3
-    postcss-color-rebeccapurple: ^7.0.2
-    postcss-custom-media: ^8.0.0
-    postcss-custom-properties: ^12.1.5
-    postcss-custom-selectors: ^6.0.0
-    postcss-dir-pseudo-class: ^6.0.4
-    postcss-double-position-gradients: ^3.1.1
-    postcss-env-function: ^4.0.6
-    postcss-focus-visible: ^6.0.4
-    postcss-focus-within: ^5.0.4
-    postcss-font-variant: ^5.0.0
-    postcss-gap-properties: ^3.0.3
-    postcss-image-set-function: ^4.0.6
-    postcss-initial: ^4.0.1
-    postcss-lab-function: ^4.1.2
-    postcss-logical: ^5.0.4
-    postcss-media-minmax: ^5.0.0
-    postcss-nesting: ^10.1.3
-    postcss-opacity-percentage: ^1.1.2
-    postcss-overflow-shorthand: ^3.0.3
-    postcss-page-break: ^3.0.4
-    postcss-place: ^7.0.4
-    postcss-pseudo-class-any-link: ^7.1.1
-    postcss-replace-overflow-wrap: ^4.0.0
-    postcss-selector-not: ^5.0.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.4
-  checksum: a3b5c93c6df29a0e44485ea4413fed58f367090e74ddfa27aee88548e9f6c40ee4c0ce0ec9274e2908a3aa3fe2cdbfeb0b326bcccee4095d46c9014ea53febd2
-  languageName: node
-  linkType: hard
-
-"postcss-pseudo-class-any-link@npm:^7.1.1":
-  version: 7.1.2
-  resolution: "postcss-pseudo-class-any-link@npm:7.1.2"
-  dependencies:
-    postcss-selector-parser: ^6.0.10
-  peerDependencies:
-    postcss: ^8.4
-  checksum: 0653c129790008c43762f79d59c4133eb54c60ca79a2a5953886cabf69de11d411db78096c8e25431de735be450a9fd4e43b0d5b16d08e4f2cf8fbd0bbcdb502
-  languageName: node
-  linkType: hard
-
 "postcss-reduce-initial@npm:^5.1.0":
   version: 5.1.0
   resolution: "postcss-reduce-initial@npm:5.1.0"
@@ -29364,15 +26892,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-replace-overflow-wrap@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-replace-overflow-wrap@npm:4.0.0"
-  peerDependencies:
-    postcss: ^8.0.3
-  checksum: 3ffe20b300a4c377a11c588b142740d8557e03c707474c45234c934190ac374750ddc92c7906c373471d273a20504a429c2062c21fdcaff830fb28e0a81ac1dc
-  languageName: node
-  linkType: hard
-
 "postcss-reporter@npm:7.0.5":
   version: 7.0.5
   resolution: "postcss-reporter@npm:7.0.5"
@@ -29419,27 +26938,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-not@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "postcss-selector-not@npm:5.0.0"
-  dependencies:
-    balanced-match: ^1.0.0
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: eb7bdfdd665b2f0db660d4a2061f103b96d7c326a4b9d6241d55bf32bdcd1f5defaa4c8251123c73e1bcc75dad5a2ce77c520e42ce26ecd1e42f2f842baa155f
-  languageName: node
-  linkType: hard
-
-"postcss-selector-parser@npm:^6.0.10":
-  version: 6.0.10
-  resolution: "postcss-selector-parser@npm:6.0.10"
-  dependencies:
-    cssesc: ^3.0.0
-    util-deprecate: ^1.0.2
-  checksum: 46afaa60e3d1998bd7adf6caa374baf857cc58d3ff944e29459c9a9e4680a7fe41597bd5b755fc81d7c388357e9bf67c0251d047c640a09f148e13606b8a8608
-  languageName: node
-  linkType: hard
-
 "postcss-selector-parser@npm:^6.0.11":
   version: 6.0.11
   resolution: "postcss-selector-parser@npm:6.0.11"
@@ -29548,7 +27046,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.3.11, postcss@npm:^8.3.5":
+"postcss@npm:^8.3.11":
   version: 8.3.11
   resolution: "postcss@npm:8.3.11"
   dependencies:
@@ -29559,28 +27057,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.12":
-  version: 8.4.14
-  resolution: "postcss@npm:8.4.14"
-  dependencies:
-    nanoid: ^3.3.4
-    picocolors: ^1.0.0
-    source-map-js: ^1.0.2
-  checksum: fe58766ff32e4becf65a7d57678995cfd239df6deed2fe0557f038b47c94e4132e7e5f68b5aa820c13adfec32e523b693efaeb65798efb995ce49ccd83953816
-  languageName: node
-  linkType: hard
-
-"postcss@npm:^8.4.7":
-  version: 8.4.7
-  resolution: "postcss@npm:8.4.7"
-  dependencies:
-    nanoid: ^3.3.1
-    picocolors: ^1.0.0
-    source-map-js: ^1.0.2
-  checksum: a515ed36622edbee1d3ba153298d3b62ae9826dfa6de19204c2a6f975c8d3ad36808423b5119a9d82b78efd486de3ce35a1faf882a36ac8aa09492be4fbb7fe1
-  languageName: node
-  linkType: hard
-
 "preceptor-core@npm:~0.10.0":
   version: 0.10.1
   resolution: "preceptor-core@npm:0.10.1"
@@ -29612,15 +27088,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:2.7.1, prettier@npm:^2.3.2":
-  version: 2.7.1
-  resolution: "prettier@npm:2.7.1"
-  bin:
-    prettier: bin-prettier.js
-  checksum: 55a4409182260866ab31284d929b3cb961e5fdb91fe0d2e099dac92eaecec890f36e524b4c19e6ceae839c99c6d7195817579cdffc8e2c80da0cb794463a748b
-  languageName: node
-  linkType: hard
-
 "prettier@npm:2.8.4":
   version: 2.8.4
   resolution: "prettier@npm:2.8.4"
@@ -29639,6 +27106,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:^2.3.2":
+  version: 2.7.1
+  resolution: "prettier@npm:2.7.1"
+  bin:
+    prettier: bin-prettier.js
+  checksum: 55a4409182260866ab31284d929b3cb961e5fdb91fe0d2e099dac92eaecec890f36e524b4c19e6ceae839c99c6d7195817579cdffc8e2c80da0cb794463a748b
+  languageName: node
+  linkType: hard
+
 "pretty-bytes@npm:^5.6.0":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"
@@ -29816,7 +27292,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prompts@npm:^2.0.1, prompts@npm:^2.4.0, prompts@npm:^2.4.2":
+"prompts@npm:^2.0.1, prompts@npm:^2.4.0":
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
   dependencies:
@@ -30729,38 +28205,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dev-utils@npm:^12.0.0":
-  version: 12.0.0
-  resolution: "react-dev-utils@npm:12.0.0"
-  dependencies:
-    "@babel/code-frame": ^7.16.0
-    address: ^1.1.2
-    browserslist: ^4.18.1
-    chalk: ^4.1.2
-    cross-spawn: ^7.0.3
-    detect-port-alt: ^1.1.6
-    escape-string-regexp: ^4.0.0
-    filesize: ^8.0.6
-    find-up: ^5.0.0
-    fork-ts-checker-webpack-plugin: ^6.5.0
-    global-modules: ^2.0.0
-    globby: ^11.0.4
-    gzip-size: ^6.0.0
-    immer: ^9.0.7
-    is-root: ^2.1.0
-    loader-utils: ^3.2.0
-    open: ^8.4.0
-    pkg-up: ^3.1.0
-    prompts: ^2.4.2
-    react-error-overlay: ^6.0.10
-    recursive-readdir: ^2.2.2
-    shell-quote: ^1.7.3
-    strip-ansi: ^6.0.1
-    text-table: ^0.2.0
-  checksum: d3be371c8e1e10877956ef8ceba77e8cb0c47440695d92ad3ca1734fdde77a1aa27a6c15dea9d82c873c7e6817e47d3d7410dfbeaff5c34508ffa9f5378dd1d1
-  languageName: node
-  linkType: hard
-
 "react-diff-viewer@npm:^3.1.1":
   version: 3.1.1
   resolution: "react-diff-viewer@npm:3.1.1"
@@ -30907,13 +28351,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-error-overlay@npm:^6.0.10":
-  version: 6.0.10
-  resolution: "react-error-overlay@npm:6.0.10"
-  checksum: e7384f086a0162eecac8e081fe3c79b32f4ac8690c56bde35ab6b6380d10e6c8375bbb689a450902b6615261fcf6c95ea016fc0b200934667089ca83536bc4a7
-  languageName: node
-  linkType: hard
-
 "react-fast-compare@npm:^3.0.1":
   version: 3.2.0
   resolution: "react-fast-compare@npm:3.2.0"
@@ -31717,15 +29154,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"recursive-readdir@npm:^2.2.2":
-  version: 2.2.3
-  resolution: "recursive-readdir@npm:2.2.3"
-  dependencies:
-    minimatch: ^3.0.5
-  checksum: 88ec96e276237290607edc0872b4f9842837b95cfde0cdbb1e00ba9623dfdf3514d44cdd14496ab60a0c2dd180a6ef8a3f1c34599e6cf2273afac9b72a6fb2b5
-  languageName: node
-  linkType: hard
-
 "redent@npm:^1.0.0":
   version: 1.0.0
   resolution: "redent@npm:1.0.0"
@@ -31865,16 +29293,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "regexp.prototype.flags@npm:1.3.1"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-  checksum: 343595db5a6bbbb3bfbda881f9c74832cfa9fc0039e64a43843f6bb9158b78b921055266510800ed69d4997638890b17a46d55fd9f32961f53ae56ac3ec4dd05
-  languageName: node
-  linkType: hard
-
 "regexp.prototype.flags@npm:^1.4.3":
   version: 1.4.3
   resolution: "regexp.prototype.flags@npm:1.4.3"
@@ -32116,13 +29534,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"replace-in-file-webpack-plugin@npm:1.0.6":
-  version: 1.0.6
-  resolution: "replace-in-file-webpack-plugin@npm:1.0.6"
-  checksum: 0c00a074e544ebe1aef0615e594f6daad47427950a2454e88f94dcb185839d68ce07854b83bbcb5f9b2336f8e8ae24017db4eca085135a9be84e43585163301a
-  languageName: node
-  linkType: hard
-
 "request-progress@npm:^3.0.0":
   version: 3.0.0
   resolution: "request-progress@npm:3.0.0"
@@ -32436,17 +29847,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:3.0.2, rimraf@npm:^3.0.0, rimraf@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "rimraf@npm:3.0.2"
-  dependencies:
-    glob: ^7.1.3
-  bin:
-    rimraf: bin.js
-  checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0
-  languageName: node
-  linkType: hard
-
 "rimraf@npm:4.4.0":
   version: 4.4.0
   resolution: "rimraf@npm:4.4.0"
@@ -32469,6 +29869,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "rimraf@npm:3.0.2"
+  dependencies:
+    glob: ^7.1.3
+  bin:
+    rimraf: bin.js
+  checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0
+  languageName: node
+  linkType: hard
+
 "robust-predicates@npm:^3.0.0":
   version: 3.0.1
   resolution: "robust-predicates@npm:3.0.1"
@@ -32753,31 +30164,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass-loader@npm:^12.6.0":
-  version: 12.6.0
-  resolution: "sass-loader@npm:12.6.0"
-  dependencies:
-    klona: ^2.0.4
-    neo-async: ^2.6.2
-  peerDependencies:
-    fibers: ">= 3.1.0"
-    node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
-    sass: ^1.3.0
-    sass-embedded: "*"
-    webpack: ^5.0.0
-  peerDependenciesMeta:
-    fibers:
-      optional: true
-    node-sass:
-      optional: true
-    sass:
-      optional: true
-    sass-embedded:
-      optional: true
-  checksum: 5d73a428588150f704016aa27397941bb9246cecd2ee083b573e95d969fc080ac6a16f2fe1cc64aca08f6e70da6f3c586ee68f0efc9f527fecc360e5f1c299ec
-  languageName: node
-  linkType: hard
-
 "sass@npm:1.58.3":
   version: 1.58.3
   resolution: "sass@npm:1.58.3"
@@ -32791,35 +30177,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:^1.49.9":
-  version: 1.50.1
-  resolution: "sass@npm:1.50.1"
-  dependencies:
-    chokidar: ">=3.0.0 <4.0.0"
-    immutable: ^4.0.0
-    source-map-js: ">=0.6.2 <2.0.0"
-  bin:
-    sass: sass.js
-  checksum: c06334dbf8eddd508d90ca529c6ffb88cb5861d18cec285480d212b9dbe0a46441cbfd8aa10565780551c71372617465e6c77298e734180e2da2628ce6c46545
-  languageName: node
-  linkType: hard
-
-"sax@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "sax@npm:1.2.4"
-  checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe
-  languageName: node
-  linkType: hard
-
-"saxes@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "saxes@npm:5.0.1"
-  dependencies:
-    xmlchars: ^2.2.0
-  checksum: 5636b55cf15f7cf0baa73f2797bf992bdcf75d1b39d82c0aa4608555c774368f6ac321cb641fd5f3d3ceb87805122cd47540da6a7b5960fe0dbdb8f8c263f000
-  languageName: node
-  linkType: hard
-
 "saxes@npm:^6.0.0":
   version: 6.0.0
   resolution: "saxes@npm:6.0.0"
@@ -32947,15 +30304,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.0.0":
-  version: 7.0.0
-  resolution: "semver@npm:7.0.0"
-  bin:
-    semver: bin/semver.js
-  checksum: 272c11bf8d083274ef79fe40a81c55c184dff84dd58e3c325299d0927ba48cece1f020793d138382b85f89bab5002a35a5ba59a3a68a7eebbb597eb733838778
-  languageName: node
-  linkType: hard
-
 "semver@npm:7.3.4":
   version: 7.3.4
   resolution: "semver@npm:7.3.4"
@@ -33225,13 +30573,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shell-quote@npm:^1.7.3":
-  version: 1.7.3
-  resolution: "shell-quote@npm:1.7.3"
-  checksum: aca58e73a3a5d933d02e0bdddedc53ee14f7c2ec264f97ac915b9d4482d077a38e422aa664631d60a672cd3cdb4054eb2e6c0303f54882453dacb6483e482d34
-  languageName: node
-  linkType: hard
-
 "shellwords@npm:^0.1.1":
   version: 0.1.1
   resolution: "shellwords@npm:0.1.1"
@@ -33702,7 +31043,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-support@npm:^0.5.17, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.20":
+"source-map-support@npm:~0.5.20":
   version: 0.5.20
   resolution: "source-map-support@npm:0.5.20"
   dependencies:
@@ -34221,22 +31562,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "string.prototype.matchall@npm:4.0.6"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.1
-    get-intrinsic: ^1.1.1
-    has-symbols: ^1.0.2
-    internal-slot: ^1.0.3
-    regexp.prototype.flags: ^1.3.1
-    side-channel: ^1.0.4
-  checksum: 07aca53ddd8a096a8bd0560eb8574386c6b3887a6a06b40a98abd42c94dadeed3296261fca22fec59a1ed970d199bdeb450fcb6a7390193588d9c6b5f48fe842
-  languageName: node
-  linkType: hard
-
 "string.prototype.padend@npm:^3.0.0":
   version: 3.1.3
   resolution: "string.prototype.padend@npm:3.1.3"
@@ -34469,7 +31794,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-loader@npm:3.3.1, style-loader@npm:^3.3.1":
+"style-loader@npm:3.3.1":
   version: 3.3.1
   resolution: "style-loader@npm:3.3.1"
   peerDependencies:
@@ -34683,16 +32008,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-hyperlinks@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "supports-hyperlinks@npm:2.2.0"
-  dependencies:
-    has-flag: ^4.0.0
-    supports-color: ^7.0.0
-  checksum: aef04fb41f4a67f1bc128f7c3e88a81b6cf2794c800fccf137006efe5bafde281da3e42e72bf9206c2fcf42e6438f37e3a820a389214d0a88613ca1f2d36076a
-  languageName: node
-  linkType: hard
-
 "supports-hyperlinks@npm:^2.3.0":
   version: 2.3.0
   resolution: "supports-hyperlinks@npm:2.3.0"
@@ -34874,16 +32189,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terminal-link@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "terminal-link@npm:2.1.1"
-  dependencies:
-    ansi-escapes: ^4.2.1
-    supports-hyperlinks: ^2.0.0
-  checksum: ce3d2cd3a438c4a9453947aa664581519173ea40e77e2534d08c088ee6dda449eabdbe0a76d2a516b8b73c33262fedd10d5270ccf7576ae316e3db170ce6562f
-  languageName: node
-  linkType: hard
-
 "terser-webpack-plugin@npm:5.3.6, terser-webpack-plugin@npm:^5.0.3":
   version: 5.3.6
   resolution: "terser-webpack-plugin@npm:5.3.6"
@@ -34948,28 +32253,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "terser-webpack-plugin@npm:5.3.1"
-  dependencies:
-    jest-worker: ^27.4.5
-    schema-utils: ^3.1.1
-    serialize-javascript: ^6.0.0
-    source-map: ^0.6.1
-    terser: ^5.7.2
-  peerDependencies:
-    webpack: ^5.1.0
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    esbuild:
-      optional: true
-    uglify-js:
-      optional: true
-  checksum: 1b808fd4f58ce0b532baacc50b9a850fc69ce0077a0e9e5076d4156c52fab3d40b02d5d9148a3eba64630cf7f40057de54f6a5a87fac1849b1f11d6bfdb42072
-  languageName: node
-  linkType: hard
-
 "terser@npm:^5.0.0, terser@npm:^5.7.2":
   version: 5.16.3
   resolution: "terser@npm:5.16.3"
@@ -35098,13 +32381,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"throat@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "throat@npm:6.0.1"
-  checksum: 782d4171ee4e3cf947483ed2ff1af3e17cc4354c693b9d339284f61f99fbc401d171e0b0d2db3295bb7d447630333e9319c174ebd7ef315c6fb791db9675369c
-  languageName: node
-  linkType: hard
-
 "throttle-debounce@npm:^3.0.1":
   version: 3.0.1
   resolution: "throttle-debounce@npm:3.0.1"
@@ -35341,17 +32617,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "tough-cookie@npm:4.0.0"
-  dependencies:
-    psl: ^1.1.33
-    punycode: ^2.1.1
-    universalify: ^0.1.2
-  checksum: 0891b37eb7d17faa3479d47f0dce2e3007f2583094ad272f2670d120fbcc3df3b0b0a631ba96ecad49f9e2297d93ff8995ce0d3292d08dd7eabe162f5b224d69
-  languageName: node
-  linkType: hard
-
 "tough-cookie@npm:^4.1.2":
   version: 4.1.2
   resolution: "tough-cookie@npm:4.1.2"
@@ -35374,15 +32639,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "tr46@npm:2.1.0"
-  dependencies:
-    punycode: ^2.1.1
-  checksum: ffe6049b9dca3ae329b059aada7f515b0f0064c611b39b51ff6b53897e954650f6f63d9319c6c008d36ead477c7b55e5f64c9dc60588ddc91ff720d64eb710b3
-  languageName: node
-  linkType: hard
-
 "tr46@npm:^3.0.0":
   version: 3.0.0
   resolution: "tr46@npm:3.0.0"
@@ -35485,40 +32741,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:27.1.3":
-  version: 27.1.3
-  resolution: "ts-jest@npm:27.1.3"
-  dependencies:
-    bs-logger: 0.x
-    fast-json-stable-stringify: 2.x
-    jest-util: ^27.0.0
-    json5: 2.x
-    lodash.memoize: 4.x
-    make-error: 1.x
-    semver: 7.x
-    yargs-parser: 20.x
-  peerDependencies:
-    "@babel/core": ">=7.0.0-beta.0 <8"
-    "@types/jest": ^27.0.0
-    babel-jest: ">=27.0.0 <28"
-    esbuild: ~0.14.0
-    jest: ^27.0.0
-    typescript: ">=3.8 <5.0"
-  peerDependenciesMeta:
-    "@babel/core":
-      optional: true
-    "@types/jest":
-      optional: true
-    babel-jest:
-      optional: true
-    esbuild:
-      optional: true
-  bin:
-    ts-jest: cli.js
-  checksum: eb54e5b8fc5f06e4cc20ecec7891201ddc78a3537d5eb3775e29ffbc7e83fd2a68f91db801b6a8c820c872060b24dc41fb6decac800b76256d3cdda6520b5c4f
-  languageName: node
-  linkType: hard
-
 "ts-jest@npm:29.0.5":
   version: 29.0.5
   resolution: "ts-jest@npm:29.0.5"
@@ -35568,7 +32790,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-loader@npm:9.3.1, ts-loader@npm:^9.3.1":
+"ts-loader@npm:9.3.1":
   version: 9.3.1
   resolution: "ts-loader@npm:9.3.1"
   dependencies:
@@ -35659,27 +32881,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-node@npm:^9.1.0":
-  version: 9.1.1
-  resolution: "ts-node@npm:9.1.1"
-  dependencies:
-    arg: ^4.1.0
-    create-require: ^1.1.0
-    diff: ^4.0.1
-    make-error: ^1.1.1
-    source-map-support: ^0.5.17
-    yn: 3.1.1
-  peerDependencies:
-    typescript: ">=2.7"
-  bin:
-    ts-node: dist/bin.js
-    ts-node-script: dist/bin-script.js
-    ts-node-transpile-only: dist/bin-transpile.js
-    ts-script: dist/bin-script-deprecated.js
-  checksum: 356e2647b8b1e6ab00380c0537fa569b63bd9b6f006cc40fd650f81fae1817bd8fecc075300036950d8f45c1d85b95be33cd1e48a1a424a7d86c3dbb42bf60e5
-  languageName: node
-  linkType: hard
-
 "ts-pnp@npm:^1.1.6":
   version: 1.2.0
   resolution: "ts-pnp@npm:1.2.0"
@@ -36316,7 +33517,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"universalify@npm:^0.1.0, universalify@npm:^0.1.2":
+"universalify@npm:^0.1.0":
   version: 0.1.2
   resolution: "universalify@npm:0.1.2"
   checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff
@@ -36611,24 +33812,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"v8-compile-cache@npm:2.3.0, v8-compile-cache@npm:^2.0.3, v8-compile-cache@npm:^2.3.0":
+"v8-compile-cache@npm:2.3.0, v8-compile-cache@npm:^2.3.0":
   version: 2.3.0
   resolution: "v8-compile-cache@npm:2.3.0"
   checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e
   languageName: node
   linkType: hard
 
-"v8-to-istanbul@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "v8-to-istanbul@npm:8.1.0"
-  dependencies:
-    "@types/istanbul-lib-coverage": ^2.0.1
-    convert-source-map: ^1.6.0
-    source-map: ^0.7.3
-  checksum: c7dabf9567e0c210b24d0720e553803cbe1ff81edb1ec7f2080eb4be01ed081a40286cc9f4aaa86d1bf8d57840cefae8fdf326b7cb8faa316ba50c7b948030d4
-  languageName: node
-  linkType: hard
-
 "v8-to-istanbul@npm:^9.0.0":
   version: 9.1.0
   resolution: "v8-to-istanbul@npm:9.1.0"
@@ -36876,24 +34066,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"w3c-hr-time@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "w3c-hr-time@npm:1.0.2"
-  dependencies:
-    browser-process-hrtime: ^1.0.0
-  checksum: ec3c2dacbf8050d917bbf89537a101a08c2e333b4c19155f7d3bedde43529d4339db6b3d049d9610789cb915f9515f8be037e0c54c079e9d4735c50b37ed52b9
-  languageName: node
-  linkType: hard
-
-"w3c-xmlserializer@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "w3c-xmlserializer@npm:2.0.0"
-  dependencies:
-    xml-name-validator: ^3.0.0
-  checksum: ae25c51cf71f1fb2516df1ab33a481f83461a117565b95e3d0927432522323f93b1b2846cbb60196d337970c421adb604fc2d0d180c6a47a839da01db5b9973b
-  languageName: node
-  linkType: hard
-
 "w3c-xmlserializer@npm:^3.0.0":
   version: 3.0.0
   resolution: "w3c-xmlserializer@npm:3.0.0"
@@ -37024,20 +34196,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "webidl-conversions@npm:5.0.0"
-  checksum: ccf1ec2ca7c0b5671e5440ace4a66806ae09c49016ab821481bec0c05b1b82695082dc0a27d1fe9d804d475a408ba0c691e6803fd21be608e710955d4589cd69
-  languageName: node
-  linkType: hard
-
-"webidl-conversions@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "webidl-conversions@npm:6.1.0"
-  checksum: 1f526507aa491f972a0c1409d07f8444e1d28778dfa269a9971f2e157182f3d496dc33296e4ed45b157fdb3bf535bb90c90bf10c50dcf1dd6caacb2a34cc84fb
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^7.0.0":
   version: 7.0.0
   resolution: "webidl-conversions@npm:7.0.0"
@@ -37319,7 +34477,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5.76.0":
+"webpack@npm:>=4.43.0 <6.0.0":
   version: 5.76.2
   resolution: "webpack@npm:5.76.2"
   dependencies:
@@ -37374,15 +34532,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-encoding@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "whatwg-encoding@npm:1.0.5"
-  dependencies:
-    iconv-lite: 0.4.24
-  checksum: 5be4efe111dce29ddee3448d3915477fcc3b28f991d9cf1300b4e50d6d189010d47bca2f51140a844cf9b726e8f066f4aee72a04d687bfe4f2ee2767b2f5b1e6
-  languageName: node
-  linkType: hard
-
 "whatwg-encoding@npm:^2.0.0":
   version: 2.0.0
   resolution: "whatwg-encoding@npm:2.0.0"
@@ -37399,13 +34548,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-mimetype@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "whatwg-mimetype@npm:2.3.0"
-  checksum: 23eb885940bcbcca4ff841c40a78e9cbb893ec42743993a42bf7aed16085b048b44b06f3402018931687153550f9a32d259dfa524e4f03577ab898b6965e5383
-  languageName: node
-  linkType: hard
-
 "whatwg-mimetype@npm:^3.0.0":
   version: 3.0.0
   resolution: "whatwg-mimetype@npm:3.0.0"
@@ -37433,17 +34575,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
-  version: 8.7.0
-  resolution: "whatwg-url@npm:8.7.0"
-  dependencies:
-    lodash: ^4.7.0
-    tr46: ^2.1.0
-    webidl-conversions: ^6.1.0
-  checksum: a87abcc6cefcece5311eb642858c8fdb234e51ec74196bfacf8def2edae1bfbffdf6acb251646ed6301f8cee44262642d8769c707256125a91387e33f405dd1e
-  languageName: node
-  linkType: hard
-
 "which-boxed-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "which-boxed-primitive@npm:1.0.2"
@@ -37700,7 +34831,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^7.3.1, ws@npm:^7.4.6":
+"ws@npm:^7.3.1":
   version: 7.5.5
   resolution: "ws@npm:7.5.5"
   peerDependencies:
@@ -37783,13 +34914,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml-name-validator@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "xml-name-validator@npm:3.0.0"
-  checksum: b3ac459afed783c285bb98e4960bd1f3ba12754fd4f2320efa0f9181ca28928c53cc75ca660d15d205e81f92304419afe94c531c7cfb3e0649aa6d140d53ecb0
-  languageName: node
-  linkType: hard
-
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"
@@ -37893,13 +35017,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:20.x, yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3, yargs-parser@npm:^20.2.9":
-  version: 20.2.9
-  resolution: "yargs-parser@npm:20.2.9"
-  checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
-  languageName: node
-  linkType: hard
-
 "yargs-parser@npm:21.0.1, yargs-parser@npm:^21.0.0, yargs-parser@npm:^21.0.1":
   version: 21.0.1
   resolution: "yargs-parser@npm:21.0.1"
@@ -37907,6 +35024,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3, yargs-parser@npm:^20.2.9":
+  version: 20.2.9
+  resolution: "yargs-parser@npm:20.2.9"
+  checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
+  languageName: node
+  linkType: hard
+
 "yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"

From 7a3f7e26cefb2a85c8762ff24960eeb69cf33236 Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Fri, 28 Apr 2023 08:39:11 -0400
Subject: [PATCH 522/729] Influxdb: Handle legacy Influxdb influxql annotations
 with target in migration (#63225)

* handle legacy influxdb annotations with target in migration

* add types

* don't check tags that are empty strings and give annotation a type
---
 .../plugins/datasource/influxdb/migrations.ts | 34 +++++++++++++++++--
 .../datasource/influxdb/response_parser.ts    |  2 +-
 .../app/plugins/datasource/influxdb/types.ts  |  3 ++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/migrations.ts b/public/app/plugins/datasource/influxdb/migrations.ts
index ad53c824d3b..e0ebecf0169 100644
--- a/public/app/plugins/datasource/influxdb/migrations.ts
+++ b/public/app/plugins/datasource/influxdb/migrations.ts
@@ -1,3 +1,5 @@
+import { InfluxQuery, InfluxQueryTag } from './types';
+
 type LegacyAnnotation = {
   query?: string;
   queryType?: string;
@@ -7,11 +9,19 @@ type LegacyAnnotation = {
   timeEndColumn?: string;
   titleColumn?: string;
   name?: string;
+  target?: {
+    limit?: string | number | undefined;
+    matchAny?: boolean;
+    tags?: InfluxQueryTag[];
+    type?: string;
+  };
 };
 
 // this becomes the target in the migrated annotations
 const migrateLegacyAnnotation = (json: LegacyAnnotation) => {
-  return {
+  // eslint-ignore-next-line
+  const target: InfluxQuery = {
+    refId: '',
     query: json.query ?? '',
     queryType: 'tags',
     fromAnnotations: true,
@@ -21,11 +31,31 @@ const migrateLegacyAnnotation = (json: LegacyAnnotation) => {
     titleColumn: json.titleColumn ?? '',
     name: json.name ?? '',
   };
+
+  // handle json target fields
+  if (json.target && json.target.limit) {
+    target.limit = json.target.limit;
+  }
+
+  if (json.target && json.target.matchAny) {
+    target.matchAny = json.target.matchAny;
+  }
+
+  if (json.target && json.target.tags) {
+    target.tags = json.target.tags;
+  }
+
+  if (json.target && json.target.type) {
+    target.type = json.target.type;
+  }
+
+  return target;
 };
 
 // eslint-ignore-next-line
 export const prepareAnnotation = (json: any) => {
-  json.target = json.target ?? migrateLegacyAnnotation(json);
+  // make sure that any additional target fields are migrated
+  json.target = json.target && !json.target?.query ? migrateLegacyAnnotation(json) : json.target;
 
   return json;
 };
diff --git a/public/app/plugins/datasource/influxdb/response_parser.ts b/public/app/plugins/datasource/influxdb/response_parser.ts
index 44ceb65c32d..e78cd7de693 100644
--- a/public/app/plugins/datasource/influxdb/response_parser.ts
+++ b/public/app/plugins/datasource/influxdb/response_parser.ts
@@ -171,7 +171,7 @@ export default class ResponseParser {
 function colContainsTag(colText: string, tagsColumn: string): boolean {
   const tags = (tagsColumn || '').replace(' ', '').split(',');
   for (const tag of tags) {
-    if (colText.includes(tag)) {
+    if (tag !== '' && colText.includes(tag)) {
       return true;
     }
   }
diff --git a/public/app/plugins/datasource/influxdb/types.ts b/public/app/plugins/datasource/influxdb/types.ts
index caceb8ada4a..ea588d9a223 100644
--- a/public/app/plugins/datasource/influxdb/types.ts
+++ b/public/app/plugins/datasource/influxdb/types.ts
@@ -71,6 +71,9 @@ export interface InfluxQuery extends DataQuery {
   timeEndColumn?: string;
   titleColumn?: string;
   name?: string;
+  matchAny?: boolean;
+  type?: string;
+
   textEditor?: boolean;
   adhocFilters?: AdHocVariableFilter[];
 }

From d4a22cff0a472ddc085b004d76e5873aca06c0f9 Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Fri, 28 Apr 2023 08:40:17 -0400
Subject: [PATCH 523/729] Prometheus: Fix regression for $__rate_interval
 comparison (#67460)

* fix ,  comparison regression

* intervalMs was not pressent before the regression and this value changes the adjusted interval calculating giving a false positive in favor of the regression
---
 pkg/tsdb/prometheus/models/query.go      | 7 ++++++-
 pkg/tsdb/prometheus/models/query_test.go | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/prometheus/models/query.go b/pkg/tsdb/prometheus/models/query.go
index 741d6d4e8bc..384648bc837 100644
--- a/pkg/tsdb/prometheus/models/query.go
+++ b/pkg/tsdb/prometheus/models/query.go
@@ -156,6 +156,10 @@ func calculatePrometheusInterval(
 	query backend.DataQuery,
 	intervalCalculator intervalv2.Calculator,
 ) (time.Duration, error) {
+	// we need to compare the original query model after it is overwritten below to variables so that we can
+	// calculate the rateInterval if it is equal to $__rate_interval or ${__rate_interval}
+	originalQueryInterval := queryInterval
+
 	// If we are using variable for interval/step, we will replace it with calculated interval
 	if isVariableInterval(queryInterval) {
 		queryInterval = ""
@@ -173,7 +177,8 @@ func calculatePrometheusInterval(
 		adjustedInterval = calculatedInterval.Value
 	}
 
-	if queryInterval == varRateInterval || queryInterval == varRateIntervalAlt {
+	// here is where we compare for $__rate_interval or ${__rate_interval}
+	if originalQueryInterval == varRateInterval || originalQueryInterval == varRateIntervalAlt {
 		// Rate interval is final and is not affected by resolution
 		return calculateRateInterval(adjustedInterval, timeInterval, intervalCalculator), nil
 	} else {
diff --git a/pkg/tsdb/prometheus/models/query_test.go b/pkg/tsdb/prometheus/models/query_test.go
index ed48c1d0cfa..dd30c5f0b24 100644
--- a/pkg/tsdb/prometheus/models/query_test.go
+++ b/pkg/tsdb/prometheus/models/query_test.go
@@ -376,7 +376,6 @@ func TestParse(t *testing.T) {
 			"format": "time_series",
 			"intervalFactor": 1,
 			"interval": "$__rate_interval",
-			"intervalMs": 60000,
 			"refId": "A"
 		}`, timeRange)
 

From e13fff0f219c061af10cf450006edce53dcd63a3 Mon Sep 17 00:00:00 2001
From: Usman Ahmad <69509548+usmangt@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:46:10 +0200
Subject: [PATCH 524/729] Update start-restart-grafana.md (#67455)

* Update start-restart-grafana.md

update the `docker-compose.yaml` file as it was not incomplete. Also remove the `grafana-piechart-panel` from the `GF_INSTALL_PLUGIN` as this plugin is available in the core and does not require to be installed separately.

I tested the code and all looks good and also the backend logs look fine.

* Update start-restart-grafana.md

update the docker compose command instead of using the old docker-compose command

* makes prettier

---------

Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
---
 .../setup-grafana/start-restart-grafana.md    | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/docs/sources/setup-grafana/start-restart-grafana.md b/docs/sources/setup-grafana/start-restart-grafana.md
index b53f3fc93e6..1c39700b5e5 100644
--- a/docs/sources/setup-grafana/start-restart-grafana.md
+++ b/docs/sources/setup-grafana/start-restart-grafana.md
@@ -116,24 +116,32 @@ Alternatively, you can use the `docker compose restart` command to restart Grafa
 Configure your `docker-compose.yml` file. For example:
 
 ```bash
-grafana:
-  image: grafana/grafana:latest
-  ports:
-    - "3000:3000"
-  environment:
-    - TERM=linux
-    - GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-piechart-panel,grafana-polystat-panel
+version: "3.8"
+services:
+  grafana:
+    image: grafana/grafana:latest
+    container_name: grafana
+    restart: unless-stopped
+    environment:
+      - TERM=linux
+      - GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-polystat-panel
+    ports:
+      - '3000:3000'
+    volumes:
+      - 'grafana_storage:/var/lib/grafana'
+volumes:
+  grafana_storage: {}
 ```
 
 Start the Grafana server:
 
-`docker-compose up`
+`docker compose up -d`
 
-This starts the Grafana server along with the three plugins specified in the YAML file.
+This starts the Grafana server container in detached mode along with the two plugins specified in the YAML file.
 
 To restart the running container, use this command:
 
-`docker-compose restart grafana`
+`docker compose restart grafana`
 
 ## Windows
 

From 692bb9ed1a21b97235507aa3e5b26511418e103f Mon Sep 17 00:00:00 2001
From: Carl Bergquist <carl.bergquist@gmail.com>
Date: Fri, 28 Apr 2023 15:19:06 +0200
Subject: [PATCH 525/729] Instrumentation: Add support for instrumenting
 database queries (#66022)

Signed-off-by: bergquist <carl.bergquist@gmail.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 conf/defaults.ini                                        | 3 +++
 conf/sample.ini                                          | 3 +++
 docs/sources/setup-grafana/configure-grafana/_index.md   | 4 ++++
 .../configure-grafana/feature-toggles/index.md           | 1 -
 packages/grafana-data/src/types/featureToggles.gen.ts    | 1 -
 pkg/middleware/loggermw/logger.go                        | 2 +-
 pkg/services/featuremgmt/registry.go                     | 6 ------
 pkg/services/featuremgmt/toggles_gen.csv                 | 1 -
 pkg/services/featuremgmt/toggles_gen.go                  | 4 ----
 pkg/services/searchV2/index.go                           | 4 ----
 pkg/services/sqlstore/sqlstore.go                        | 2 +-
 pkg/setting/setting.go                                   | 9 +++++++++
 12 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 086c84d7348..85a43de5f58 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -159,6 +159,9 @@ query_retries = 0
 # For "sqlite" only. How many times to retry transaction in case of database is locked failures. Default is 5.
 transaction_retries = 5
 
+# Set to true to add metrics and tracing for database queries. 
+instrument_queries = false
+
 #################################### Cache server #############################
 [remote_cache]
 # Either "redis", "memcached" or "database" default is "database"
diff --git a/conf/sample.ini b/conf/sample.ini
index d1d788a982b..fed965002a4 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -161,6 +161,9 @@
 # For "sqlite" only. How many times to retry transaction in case of database is locked failures. Default is 5.
 ;transaction_retries = 5
 
+# Set to true to add metrics and tracing for database queries. 
+;instrument_queries = false
+
 ################################### Data sources #########################
 [datasources]
 # Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md
index 6072beb2ca1..13b190a52b9 100644
--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -404,6 +404,10 @@ This setting applies to `sqlite` only and controls the number of times the syste
 
 This setting applies to `sqlite` only and controls the number of times the system retries a transaction when the database is locked. The default value is `5`.
 
+### instrument_queries
+
+Set to `true` to add metrics and tracing for database queries. The default value is `false`.
+
 <hr />
 
 ## [remote_cache]
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index bc03c5b2b41..bf553aa61a2 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -22,7 +22,6 @@ Some stable features are enabled by default. You can disable a stable feature by
 | Feature toggle name                 | Description                                                                                                                                                                                         | Enabled by default |
 | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
 | `disableEnvelopeEncryption`         | Disable envelope encryption (emergency only)                                                                                                                                                        |                    |
-| `database_metrics`                  | Add Prometheus metrics for database tables                                                                                                                                                          |                    |
 | `featureHighlights`                 | Highlight Grafana Enterprise features                                                                                                                                                               |                    |
 | `cloudWatchDynamicLabels`           | Use dynamic labels instead of alias patterns in CloudWatch datasource                                                                                                                               | Yes                |
 | `dataConnectionsConsole`            | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.                        | Yes                |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 120b95f96ef..9f04ea6972c 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -20,7 +20,6 @@
 export interface FeatureToggles {
   trimDefaults?: boolean;
   disableEnvelopeEncryption?: boolean;
-  database_metrics?: boolean;
   ['live-service-web-worker']?: boolean;
   queryOverLive?: boolean;
   panelTitleSearch?: boolean;
diff --git a/pkg/middleware/loggermw/logger.go b/pkg/middleware/loggermw/logger.go
index 4fea6fc0198..493d7a0e968 100644
--- a/pkg/middleware/loggermw/logger.go
+++ b/pkg/middleware/loggermw/logger.go
@@ -119,7 +119,7 @@ func (l *loggerImpl) prepareLogParams(c *contextmodel.ReqContext, duration time.
 		lvl = lvl.HighestOf(errutil.LevelWarn)
 	}
 
-	if l.flags.IsEnabled(featuremgmt.FlagDatabaseMetrics) {
+	if l.cfg.DatabaseInstrumentQueries {
 		logParams = append(logParams, "db_call_count", log.TotalDBCallCount(c.Req.Context()))
 	}
 
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 552ec7e3034..6ad62a643ed 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -21,12 +21,6 @@ var (
 			State:       FeatureStateStable,
 			Owner:       grafanaAsCodeSquad,
 		},
-		{
-			Name:        "database_metrics",
-			Description: "Add Prometheus metrics for database tables",
-			State:       FeatureStateStable,
-			Owner:       hostedGrafanaTeam,
-		},
 		{
 			Name:         "live-service-web-worker",
 			Description:  "This will use a webworker thread to processes events rather than the main thread",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 07bee5a12b9..e3d7ba39bbd 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -1,7 +1,6 @@
 Name,State,Owner,requiresDevMode,RequiresLicense,RequiresRestart,FrontendOnly
 trimDefaults,beta,@grafana/grafana-as-code,false,false,false,false
 disableEnvelopeEncryption,stable,@grafana/grafana-as-code,false,false,false,false
-database_metrics,stable,@grafana/hosted-grafana-team,false,false,false,false
 live-service-web-worker,alpha,@grafana/grafana-app-platform-squad,false,false,false,true
 queryOverLive,alpha,@grafana/grafana-app-platform-squad,false,false,false,true
 panelTitleSearch,beta,@grafana/grafana-app-platform-squad,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index d7e369c0dc3..da33d9d06e3 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -15,10 +15,6 @@ const (
 	// Disable envelope encryption (emergency only)
 	FlagDisableEnvelopeEncryption = "disableEnvelopeEncryption"
 
-	// FlagDatabaseMetrics
-	// Add Prometheus metrics for database tables
-	FlagDatabaseMetrics = "database_metrics"
-
 	// FlagLiveServiceWebWorker
 	// This will use a webworker thread to processes events rather than the main thread
 	FlagLiveServiceWebWorker = "live-service-web-worker"
diff --git a/pkg/services/searchV2/index.go b/pkg/services/searchV2/index.go
index 0c15395cd55..92b247611c3 100644
--- a/pkg/services/searchV2/index.go
+++ b/pkg/services/searchV2/index.go
@@ -591,10 +591,6 @@ func (i *searchIndex) withCtxData(ctx context.Context, params ...interface{}) []
 		params = append(params, "traceID", traceID)
 	}
 
-	if i.features.IsEnabled(featuremgmt.FlagDatabaseMetrics) {
-		params = append(params, "db_call_count", log.TotalDBCallCount(ctx))
-	}
-
 	return params
 }
 
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index ee3d5cbce97..c835ef02e6e 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -362,7 +362,7 @@ func (ss *SQLStore) initEngine(engine *xorm.Engine) error {
 		return err
 	}
 
-	if ss.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagDatabaseMetrics) {
+	if ss.Cfg.DatabaseInstrumentQueries {
 		ss.dbCfg.Type = WrapDatabaseDriverWithHooks(ss.dbCfg.Type, ss.tracer)
 	}
 
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index e8bc06baf85..b7020ed8d87 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -519,6 +519,12 @@ type Cfg struct {
 	GRPCServerTLSConfig *tls.Config
 
 	CustomResponseHeaders map[string]string
+
+	// DatabaseInstrumentQueries is used to decide if database queries
+	// should be instrumented with metrics, logs and traces.
+	// This needs to be on the global object since its used in the
+	// sqlstore package and HTTP middlewares.
+	DatabaseInstrumentQueries bool
 }
 
 // AddChangePasswordLink returns if login form is disabled or not since
@@ -1189,6 +1195,9 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 
 	cfg.LogConfigSources()
 
+	databaseSection := iniFile.Section("database")
+	cfg.DatabaseInstrumentQueries = databaseSection.Key("instrument_queries").MustBool(false)
+
 	return nil
 }
 

From fe59b65f9ef4f33b22fb5f8e8c47ba3aeb8f89a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Fri, 28 Apr 2023 15:31:40 +0200
Subject: [PATCH 526/729] Grafana UI: Create Text component (#66932)

---
 .betterer.results                             |   3 -
 .../src/themes/createTypography.ts            |  23 +--
 packages/grafana-data/src/themes/index.ts     |   2 +-
 .../grafana-ui/src/components/Text/Text.mdx   |   8 ++
 .../components/Text/Text.story.internal.tsx   | 131 ++++++++++++++++++
 .../src/components/Text/Text.test.tsx         |  36 +++++
 .../grafana-ui/src/components/Text/Text.tsx   | 106 ++++++++++++++
 .../src/components/Text/TextElements.tsx      |  75 ++++++++++
 .../Typography/Typography.story.tsx           |  32 -----
 .../src/components/Typography/Typography.tsx  |  16 ---
 packages/grafana-ui/src/unstable.ts           |   1 +
 11 files changed, 370 insertions(+), 63 deletions(-)
 create mode 100644 packages/grafana-ui/src/components/Text/Text.mdx
 create mode 100644 packages/grafana-ui/src/components/Text/Text.story.internal.tsx
 create mode 100644 packages/grafana-ui/src/components/Text/Text.test.tsx
 create mode 100644 packages/grafana-ui/src/components/Text/Text.tsx
 create mode 100644 packages/grafana-ui/src/components/Text/TextElements.tsx
 delete mode 100644 packages/grafana-ui/src/components/Typography/Typography.story.tsx
 delete mode 100644 packages/grafana-ui/src/components/Typography/Typography.tsx
 create mode 100644 packages/grafana-ui/src/unstable.ts

diff --git a/.betterer.results b/.betterer.results
index 125dde4bc3a..4dbb503be09 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -6170,9 +6170,6 @@ exports[`no undocumented stories`] = {
     "packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
-    "packages/grafana-ui/src/components/Typography/Typography.story.tsx:5381": [
-      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
-    ],
     "packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
diff --git a/packages/grafana-data/src/themes/createTypography.ts b/packages/grafana-data/src/themes/createTypography.ts
index 5dfe3ebaf47..1473adc2bb8 100644
--- a/packages/grafana-data/src/themes/createTypography.ts
+++ b/packages/grafana-data/src/themes/createTypography.ts
@@ -5,7 +5,7 @@
 import { ThemeColors } from './createColors';
 
 /** @beta */
-export interface ThemeTypography {
+export interface ThemeTypography extends ThemeTypographyVariantTypes {
   fontFamily: string;
   fontFamilyMonospace: string;
   fontSize: number;
@@ -17,16 +17,6 @@ export interface ThemeTypography {
   // The font-size on the html element.
   htmlFontSize?: number;
 
-  h1: ThemeTypographyVariant;
-  h2: ThemeTypographyVariant;
-  h3: ThemeTypographyVariant;
-  h4: ThemeTypographyVariant;
-  h5: ThemeTypographyVariant;
-  h6: ThemeTypographyVariant;
-
-  body: ThemeTypographyVariant;
-  bodySmall: ThemeTypographyVariant;
-
   /**
    * @deprecated
    * from legacy old theme
@@ -152,3 +142,14 @@ export function createTypography(colors: ThemeColors, typographyInput: ThemeTypo
 function round(value: number) {
   return Math.round(value * 1e5) / 1e5;
 }
+
+export interface ThemeTypographyVariantTypes {
+  h1: ThemeTypographyVariant;
+  h2: ThemeTypographyVariant;
+  h3: ThemeTypographyVariant;
+  h4: ThemeTypographyVariant;
+  h5: ThemeTypographyVariant;
+  h6: ThemeTypographyVariant;
+  body: ThemeTypographyVariant;
+  bodySmall: ThemeTypographyVariant;
+}
diff --git a/packages/grafana-data/src/themes/index.ts b/packages/grafana-data/src/themes/index.ts
index a0f2f9fcc9d..9fac0e68a3c 100644
--- a/packages/grafana-data/src/themes/index.ts
+++ b/packages/grafana-data/src/themes/index.ts
@@ -5,7 +5,7 @@ export type { ThemeColors } from './createColors';
 export type { ThemeBreakpoints, ThemeBreakpointsKey } from './breakpoints';
 export type { ThemeShadows } from './createShadows';
 export type { ThemeShape } from './createShape';
-export type { ThemeTypography, ThemeTypographyVariant } from './createTypography';
+export type { ThemeTypography, ThemeTypographyVariant, ThemeTypographyVariantTypes } from './createTypography';
 export type { ThemeTransitions } from './createTransitions';
 export type { ThemeSpacing } from './createSpacing';
 export type { ThemeZIndices } from './zIndex';
diff --git a/packages/grafana-ui/src/components/Text/Text.mdx b/packages/grafana-ui/src/components/Text/Text.mdx
new file mode 100644
index 00000000000..bbbf8abc2e8
--- /dev/null
+++ b/packages/grafana-ui/src/components/Text/Text.mdx
@@ -0,0 +1,8 @@
+import { Props, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Text } from './Text';
+
+# Text
+
+Use for showing text.
+
+<ArgsTable of={Text} />
diff --git a/packages/grafana-ui/src/components/Text/Text.story.internal.tsx b/packages/grafana-ui/src/components/Text/Text.story.internal.tsx
new file mode 100644
index 00000000000..54394aa47d9
--- /dev/null
+++ b/packages/grafana-ui/src/components/Text/Text.story.internal.tsx
@@ -0,0 +1,131 @@
+import { Meta, Story } from '@storybook/react';
+import React from 'react';
+
+import { StoryExample } from '../../utils/storybook/StoryExample';
+import { VerticalGroup } from '../Layout/Layout';
+
+import { Text } from './Text';
+import mdx from './Text.mdx';
+import { H1, H2, H3, H4, H5, H6, Span, P, Legend, TextModifier } from './TextElements';
+
+const meta: Meta = {
+  title: 'General/Text',
+  component: Text,
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+    controls: { exclude: ['as'] },
+  },
+  argTypes: {
+    variant: { control: 'select', options: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'body', 'bodySmall', undefined] },
+    weight: {
+      control: 'select',
+      options: ['bold', 'medium', 'light', 'regular', undefined],
+    },
+    color: {
+      control: 'select',
+      options: [
+        'error',
+        'success',
+        'warning',
+        'info',
+        'primary',
+        'secondary',
+        'disabled',
+        'link',
+        'maxContrast',
+        undefined,
+      ],
+    },
+    truncate: { control: 'boolean' },
+    textAlignment: {
+      control: 'select',
+      options: ['inherit', 'initial', 'left', 'right', 'center', 'justify', undefined],
+    },
+  },
+};
+
+export const Example: Story = () => {
+  return (
+    <VerticalGroup>
+      <StoryExample name="Header, paragraph, span and legend elements">
+        <H1>h1. Heading</H1>
+        <H2>h2. Heading</H2>
+        <H3>h3. Heading</H3>
+        <H4>h4. Heading</H4>
+        <H5>h5. Heading</H5>
+        <H6>h6. Heading</H6>
+        <P>This is a paragraph</P>
+        <Legend>This is a legend</Legend>
+        <Span>This is a span</Span>
+      </StoryExample>
+    </VerticalGroup>
+  );
+};
+Example.parameters = {
+  controls: {
+    exclude: ['variant', 'weight', 'textAlignment', 'truncate', 'color', 'children'],
+  },
+};
+
+export const HeadingComponent: Story = (args) => {
+  return (
+    <div style={{ width: '300px' }}>
+      <H1 variant={args.variant} weight={args.weight} textAlignment={args.textAlignment} {...args}>
+        {args.children}
+      </H1>
+    </div>
+  );
+};
+HeadingComponent.args = {
+  variant: undefined,
+  weight: 'light',
+  textAlignment: 'center',
+  truncate: false,
+  color: 'primary',
+  children: 'This is a H1 component',
+};
+
+export const LegendComponent: Story = (args) => {
+  return (
+    <div style={{ width: '300px' }}>
+      <Legend variant={args.variant} weight={args.weight} textAlignment={args.textAlignment} {...args}>
+        {args.children}
+      </Legend>
+    </div>
+  );
+};
+
+LegendComponent.args = {
+  variant: undefined,
+  weight: 'bold',
+  textAlignment: 'center',
+  truncate: false,
+  color: 'error',
+  children: 'This is a lengend component',
+};
+
+export const TextModifierComponent: Story = (args) => {
+  return (
+    <div style={{ width: '300px' }}>
+      <H6 variant={args.variant} weight={args.weight} textAlignment={args.textAlignment} {...args}>
+        {args.children}{' '}
+        <TextModifier weight="bold" color="error">
+          {' '}
+          with a part of its text modified{' '}
+        </TextModifier>
+      </H6>
+    </div>
+  );
+};
+TextModifierComponent.args = {
+  variant: undefined,
+  weight: 'light',
+  textAlignment: 'center',
+  truncate: false,
+  color: 'maxContrast',
+  children: 'This is a H6 component',
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/Text/Text.test.tsx b/packages/grafana-ui/src/components/Text/Text.test.tsx
new file mode 100644
index 00000000000..591211db265
--- /dev/null
+++ b/packages/grafana-ui/src/components/Text/Text.test.tsx
@@ -0,0 +1,36 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { createTheme, ThemeTypographyVariantTypes } from '@grafana/data';
+
+import { Text } from './Text';
+
+describe('Text', () => {
+  it('renders correctly', () => {
+    render(<Text as={'h1'}>This is a text component</Text>);
+    expect(screen.getByText('This is a text component')).toBeInTheDocument();
+  });
+  it('keeps the element type but changes its styles', () => {
+    const customVariant: keyof ThemeTypographyVariantTypes = 'body';
+    render(
+      <Text as={'h1'} variant={customVariant}>
+        This is a text component
+      </Text>
+    );
+    const theme = createTheme();
+    const textComponent = screen.getByRole('heading');
+    expect(textComponent).toBeInTheDocument();
+    expect(textComponent).toHaveStyle(`fontSize: ${theme.typography.body.fontSize}`);
+  });
+  it('has the selected colour', () => {
+    const customColor = 'info';
+    const theme = createTheme();
+    render(
+      <Text as={'h1'} color={customColor}>
+        This is a text component
+      </Text>
+    );
+    const textComponent = screen.getByRole('heading');
+    expect(textComponent).toHaveStyle(`color:${theme.colors.info.text}`);
+  });
+});
diff --git a/packages/grafana-ui/src/components/Text/Text.tsx b/packages/grafana-ui/src/components/Text/Text.tsx
new file mode 100644
index 00000000000..fa191317f90
--- /dev/null
+++ b/packages/grafana-ui/src/components/Text/Text.tsx
@@ -0,0 +1,106 @@
+import { css } from '@emotion/css';
+import React, { createElement, CSSProperties, useCallback } from 'react';
+
+import { GrafanaTheme2, ThemeTypographyVariantTypes } from '@grafana/data';
+
+import { useStyles2 } from '../../themes';
+
+export interface TextProps {
+  /** Defines what HTML element is defined underneath */
+  as: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'span' | 'p' | 'legend';
+  /** What typograpy variant should be used for the component. Only use if default variant for the defined element is not what is needed */
+  variant?: keyof ThemeTypographyVariantTypes;
+  /** Override the default weight for the used variant */
+  weight?: 'light' | 'regular' | 'medium' | 'bold';
+  /** Color to use for text */
+  color?: keyof GrafanaTheme2['colors']['text'] | 'error' | 'success' | 'warning' | 'info';
+  /** Use to cut the text off with ellipsis if there isn't space to show all of it. On hover shows the rest of the text */
+  truncate?: boolean;
+  /** Whether to align the text to left, center or right */
+  textAlignment?: CSSProperties['textAlign'];
+  children: React.ReactNode;
+}
+
+export const Text = React.forwardRef<HTMLElement, TextProps>(
+  ({ as, variant, weight, color, truncate, textAlignment, children }, ref) => {
+    const styles = useStyles2(
+      useCallback(
+        (theme) => getTextStyles(theme, variant, color, weight, truncate, textAlignment),
+        [color, textAlignment, truncate, weight, variant]
+      )
+    );
+
+    return createElement(
+      as,
+      {
+        className: styles,
+        ref,
+      },
+      children
+    );
+  }
+);
+
+Text.displayName = 'Text';
+
+const getTextStyles = (
+  theme: GrafanaTheme2,
+  variant?: keyof ThemeTypographyVariantTypes,
+  color?: TextProps['color'],
+  weight?: TextProps['weight'],
+  truncate?: TextProps['truncate'],
+  textAlignment?: TextProps['textAlignment']
+) => {
+  return css([
+    variant && {
+      ...theme.typography[variant],
+    },
+    {
+      margin: 0,
+      padding: 0,
+    },
+    color && {
+      color: customColor(color, theme),
+    },
+    weight && {
+      fontWeight: customWeight(weight, theme),
+    },
+    truncate && {
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap',
+    },
+    textAlignment && {
+      textAlign: textAlignment,
+    },
+  ]);
+};
+
+const customWeight = (weight: TextProps['weight'], theme: GrafanaTheme2): number => {
+  switch (weight) {
+    case 'bold':
+      return theme.typography.fontWeightBold;
+    case 'medium':
+      return theme.typography.fontWeightMedium;
+    case 'light':
+      return theme.typography.fontWeightLight;
+    case 'regular':
+    case undefined:
+      return theme.typography.fontWeightRegular;
+  }
+};
+
+const customColor = (color: TextProps['color'], theme: GrafanaTheme2): string | undefined => {
+  switch (color) {
+    case 'error':
+      return theme.colors.error.text;
+    case 'success':
+      return theme.colors.success.text;
+    case 'info':
+      return theme.colors.info.text;
+    case 'warning':
+      return theme.colors.warning.text;
+    default:
+      return color ? theme.colors.text[color] : undefined;
+  }
+};
diff --git a/packages/grafana-ui/src/components/Text/TextElements.tsx b/packages/grafana-ui/src/components/Text/TextElements.tsx
new file mode 100644
index 00000000000..f0569f9b376
--- /dev/null
+++ b/packages/grafana-ui/src/components/Text/TextElements.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { Text, TextProps } from './Text';
+
+interface TextElementsProps extends Omit<TextProps, 'as'> {}
+
+interface TextModifierProps {
+  /** Override the default weight for the used variant */
+  weight?: 'light' | 'regular' | 'medium' | 'bold';
+  /** Color to use for text */
+  color?: keyof GrafanaTheme2['colors']['text'] | 'error' | 'success' | 'warning' | 'info';
+  children: React.ReactNode;
+}
+
+export const H1 = React.forwardRef<HTMLHeadingElement, TextElementsProps>((props, ref) => {
+  return <Text as="h1" {...props} variant={props.variant || 'h1'} ref={ref} />;
+});
+
+H1.displayName = 'H1';
+
+export const H2 = React.forwardRef<HTMLHeadingElement, TextElementsProps>((props, ref) => {
+  return <Text as="h2" {...props} variant={props.variant || 'h2'} ref={ref} />;
+});
+
+H2.displayName = 'H2';
+
+export const H3 = React.forwardRef<HTMLHeadingElement, TextElementsProps>((props, ref) => {
+  return <Text as="h3" {...props} variant={props.variant || 'h3'} ref={ref} />;
+});
+
+H3.displayName = 'H3';
+
+export const H4 = React.forwardRef<HTMLHeadingElement, TextElementsProps>((props, ref) => {
+  return <Text as="h4" {...props} variant={props.variant || 'h4'} ref={ref} />;
+});
+
+H4.displayName = 'H4';
+
+export const H5 = React.forwardRef<HTMLHeadingElement, TextElementsProps>((props, ref) => {
+  return <Text as="h5" {...props} variant={props.variant || 'h5'} ref={ref} />;
+});
+
+H5.displayName = 'H5';
+
+export const H6 = React.forwardRef<HTMLHeadingElement, TextElementsProps>((props, ref) => {
+  return <Text as="h6" {...props} variant={props.variant || 'h6'} ref={ref} />;
+});
+
+H6.displayName = 'H6';
+
+export const P = React.forwardRef<HTMLParagraphElement, TextElementsProps>((props, ref) => {
+  return <Text as="p" {...props} variant={props.variant || 'body'} ref={ref} />;
+});
+
+P.displayName = 'P';
+
+export const Span = React.forwardRef<HTMLSpanElement, TextElementsProps>((props, ref) => {
+  return <Text as="span" {...props} variant={props.variant || 'bodySmall'} ref={ref} />;
+});
+
+Span.displayName = 'Span';
+
+export const Legend = React.forwardRef<HTMLLegendElement, TextElementsProps>((props, ref) => {
+  return <Text as="legend" {...props} variant={props.variant || 'bodySmall'} ref={ref} />;
+});
+
+Legend.displayName = 'Legend';
+
+export const TextModifier = React.forwardRef<HTMLSpanElement, TextModifierProps>((props, ref) => {
+  return <Text as="span" {...props} ref={ref} />;
+});
+
+TextModifier.displayName = 'TextModifier';
diff --git a/packages/grafana-ui/src/components/Typography/Typography.story.tsx b/packages/grafana-ui/src/components/Typography/Typography.story.tsx
deleted file mode 100644
index e9f9ca6eacc..00000000000
--- a/packages/grafana-ui/src/components/Typography/Typography.story.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Meta, Story } from '@storybook/react';
-import React from 'react';
-
-import { StoryExample } from '../../utils/storybook/StoryExample';
-import { VerticalGroup } from '../Layout/Layout';
-
-import { Typography } from './Typography';
-
-const meta: Meta = {
-  title: 'General/Typography',
-  component: Typography,
-  parameters: {
-    docs: {},
-  },
-};
-
-export const Typopgraphy: Story = () => {
-  return (
-    <VerticalGroup>
-      <StoryExample name="Native header elements (global styles)">
-        <h1>h1. Heading</h1>
-        <h2>h2. Heading</h2>
-        <h3>h3. Heading</h3>
-        <h4>h4. Heading</h4>
-        <h5>h5. Heading</h5>
-        <h6>h6. Heading</h6>
-      </StoryExample>
-    </VerticalGroup>
-  );
-};
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/Typography/Typography.tsx b/packages/grafana-ui/src/components/Typography/Typography.tsx
deleted file mode 100644
index 90aa7d11379..00000000000
--- a/packages/grafana-ui/src/components/Typography/Typography.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-
-/** @internal */
-export interface Props {
-  children: React.ReactNode;
-}
-
-/**
- * @internal
- * TODO implementation coming
- **/
-export const Typography = ({ children }: Props) => {
-  return <h1>{children}</h1>;
-};
-
-Typography.displayName = 'Typography';
diff --git a/packages/grafana-ui/src/unstable.ts b/packages/grafana-ui/src/unstable.ts
new file mode 100644
index 00000000000..8b61345b899
--- /dev/null
+++ b/packages/grafana-ui/src/unstable.ts
@@ -0,0 +1 @@
+export * from './components/Text/TextElements';

From f8faacd54a3ac1ac7ae523014c72f0830f562609 Mon Sep 17 00:00:00 2001
From: Kuba Siemiatkowski <112862936+sasklacz@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:57:17 +0200
Subject: [PATCH 527/729] Datasource: Overhaul plugin error handling and action
 buttons (#67014)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* - initial work on data source config page

* - add links to test status box
- add tracking function

* - add test for the DataSourceConfigAlert component

* - fix flicker of the alert box

* - fix the build

* - small improvements

* - fix failing build

* - fix failing unit tests

* - prettier and betterer fixes

* - fix failing e2e tests

* - fix build again

* - rewrite solution according to the PR comments

* - cleanup

* - fix failing e2e

* - use absolute path in link

* Minor fixes

---------

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .betterer.results                             | 16 +--
 packages/grafana-data/src/types/datasource.ts |  9 +-
 .../src/utils/DataSourceWithBackend.ts        |  9 +-
 .../input-datasource/src/InputDatasource.ts   |  3 +-
 public/app/core/services/backend_srv.ts       |  2 +-
 public/app/core/specs/backend_srv.test.ts     | 31 +++---
 .../services/PublicDashboardDataSource.ts     |  5 +-
 public/app/features/datasources/api.ts        | 10 +-
 .../datasources/components/ButtonRow.test.tsx |  3 +-
 .../datasources/components/ButtonRow.tsx      | 14 +--
 .../components/DataSourceTestingStatus.tsx    | 98 +++++++++++++++++--
 .../datasources/components/EditDataSource.tsx | 10 +-
 .../pages/EditDataSourcePage.test.tsx         | 15 ++-
 .../datasources/state/actions.test.ts         |  5 +-
 .../app/features/datasources/state/actions.ts | 88 +++++++++++++----
 .../features/datasources/state/reducers.ts    |  2 +-
 public/app/features/datasources/types.ts      |  2 +
 .../cloudwatch/__mocks__/logsTestContext.ts   |  4 +-
 .../datasource/dashboard/datasource.ts        | 12 ++-
 .../plugins/datasource/grafana/datasource.ts  |  5 +-
 .../datasource/mixed/MixedDataSource.ts       |  5 +-
 public/test/mocks/datasource_srv.ts           |  9 +-
 22 files changed, 262 insertions(+), 95 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 4dbb503be09..a0bf6bdbc46 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -380,8 +380,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "29"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "28"]
     ],
     "packages/grafana-data/src/types/explore.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -841,8 +840,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
     "packages/grafana-runtime/src/utils/plugin.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -2604,7 +2602,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
     "public/app/features/datasources/components/DataSourceTestingStatus.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
     ],
     "public/app/features/datasources/components/DataSourceTypeCard.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
@@ -2618,8 +2617,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
     "public/app/features/datasources/state/actions.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/features/datasources/state/navModel.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index 797b5afe730..9a33ca35d5a 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -260,7 +260,7 @@ abstract class DataSourceApi<
    * a TestingStatus object. Unknown errors and HTTP errors can be re-thrown and will be handled here:
    * public/app/features/datasources/state/actions.ts
    */
-  abstract testDatasource(): Promise<any>;
+  abstract testDatasource(): Promise<TestDataSourceResponse>;
 
   /**
    * Override to skip executing a query
@@ -473,6 +473,13 @@ export interface DataQueryResponse {
   traceIds?: string[];
 }
 
+export interface TestDataSourceResponse {
+  status: string;
+  message: string;
+  error?: Error;
+  details?: { message?: string; verboseMessage?: string };
+}
+
 export enum DataQueryErrorType {
   Cancelled = 'cancelled',
   Timeout = 'timeout',
diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
index 5b3793cfcbf..f1f9d13fcb9 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
@@ -7,6 +7,7 @@ import {
   DataQuery,
   DataQueryRequest,
   DataQueryResponse,
+  TestDataSourceResponse,
   DataSourceApi,
   DataSourceInstanceSettings,
   DataSourceJsonData,
@@ -342,7 +343,7 @@ class DataSourceWithBackend<
    * Checks the plugin health
    * see public/app/features/datasources/state/actions.ts for what needs to be returned here
    */
-  async testDatasource(): Promise<any> {
+  async testDatasource(): Promise<TestDataSourceResponse> {
     return this.callHealthCheck().then((res) => {
       if (res.status === HealthStatus.OK) {
         return {
@@ -351,7 +352,11 @@ class DataSourceWithBackend<
         };
       }
 
-      throw new HealthCheckError(res.message, res.details);
+      return Promise.reject({
+        status: 'error',
+        message: res.message,
+        error: new HealthCheckError(res.message, res.details),
+      });
     });
   }
 }
diff --git a/plugins-bundled/internal/input-datasource/src/InputDatasource.ts b/plugins-bundled/internal/input-datasource/src/InputDatasource.ts
index b8ea1f58ed4..8aaca3ae3b6 100644
--- a/plugins-bundled/internal/input-datasource/src/InputDatasource.ts
+++ b/plugins-bundled/internal/input-datasource/src/InputDatasource.ts
@@ -2,6 +2,7 @@
 import {
   DataQueryRequest,
   DataQueryResponse,
+  TestDataSourceResponse,
   DataSourceApi,
   DataSourceInstanceSettings,
   MetricFindValue,
@@ -68,7 +69,7 @@ export class InputDatasource extends DataSourceApi<InputQuery, InputOptions> {
     return Promise.resolve({ data: results });
   }
 
-  testDatasource() {
+  testDatasource(): Promise<TestDataSourceResponse> {
     return new Promise((resolve, reject) => {
       let rowCount = 0;
       let info = `${this.data.length} Series:`;
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 16acfd7c110..51cac6074d1 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -301,7 +301,7 @@ export class BackendSrv implements BackendService {
       return;
     }
 
-    // is showSuccessAlert is undefined we only show alerts non GET request, non data query and local api requests
+    // if showSuccessAlert is undefined we only show alerts non GET request, non data query and local api requests
     if (
       config.showSuccessAlert === undefined &&
       (config.method === 'GET' || isDataQuery(config.url) || !isLocalUrl(config.url))
diff --git a/public/app/core/specs/backend_srv.test.ts b/public/app/core/specs/backend_srv.test.ts
index ffa46ae60db..2aa71b2e808 100644
--- a/public/app/core/specs/backend_srv.test.ts
+++ b/public/app/core/specs/backend_srv.test.ts
@@ -125,15 +125,18 @@ describe('backendSrv', () => {
   });
 
   describe('request', () => {
+    const testMessage = 'Datasource updated';
+    const errorMessage = 'UnAuthorized';
+
     describe('when making a successful call and conditions for showSuccessAlert are not favorable', () => {
       it('then it should return correct result and not emit anything', async () => {
         const { backendSrv, appEventsMock, expectRequestCallChain } = getTestContext({
-          data: { message: 'A message' },
+          data: { message: testMessage },
         });
         const url = '/api/dashboard/';
         const result = await backendSrv.request({ url, method: 'DELETE', showSuccessAlert: false });
 
-        expect(result).toEqual({ message: 'A message' });
+        expect(result).toEqual({ message: testMessage });
         expect(appEventsMock.emit).not.toHaveBeenCalled();
         expectRequestCallChain({ url, method: 'DELETE', showSuccessAlert: false });
       });
@@ -142,14 +145,14 @@ describe('backendSrv', () => {
     describe('when making a successful call and conditions for showSuccessAlert are favorable', () => {
       it('then it should emit correct message', async () => {
         const { backendSrv, appEventsMock, expectRequestCallChain } = getTestContext({
-          data: { message: 'A message' },
+          data: { message: testMessage },
         });
         const url = '/api/dashboard/';
         const result = await backendSrv.request({ url, method: 'DELETE', showSuccessAlert: true });
 
-        expect(result).toEqual({ message: 'A message' });
+        expect(result).toEqual({ message: testMessage });
         expect(appEventsMock.emit).toHaveBeenCalledTimes(1);
-        expect(appEventsMock.emit).toHaveBeenCalledWith(AppEvents.alertSuccess, ['A message']);
+        expect(appEventsMock.emit).toHaveBeenCalledWith(AppEvents.alertSuccess, [testMessage]);
         expectRequestCallChain({ url, method: 'DELETE', showSuccessAlert: true });
       });
     });
@@ -161,8 +164,8 @@ describe('backendSrv', () => {
         const { backendSrv, appEventsMock, logoutMock, expectRequestCallChain } = getTestContext({
           ok: false,
           status: 401,
-          statusText: 'UnAuthorized',
-          data: { message: 'UnAuthorized' },
+          statusText: errorMessage,
+          data: { message: errorMessage },
           url,
         });
 
@@ -174,8 +177,8 @@ describe('backendSrv', () => {
           .request({ url, method: 'GET', retry: 0 })
           .catch((error) => {
             expect(error.status).toBe(401);
-            expect(error.statusText).toBe('UnAuthorized');
-            expect(error.data).toEqual({ message: 'UnAuthorized' });
+            expect(error.statusText).toBe(errorMessage);
+            expect(error.data).toEqual({ message: errorMessage });
             expect(appEventsMock.emit).not.toHaveBeenCalled();
             expect(logoutMock).not.toHaveBeenCalled();
             expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
@@ -183,9 +186,9 @@ describe('backendSrv', () => {
             jest.advanceTimersByTime(50);
           })
           .catch((error) => {
-            expect(error).toEqual({ message: 'UnAuthorized' });
+            expect(error).toEqual({ message: errorMessage });
             expect(appEventsMock.emit).toHaveBeenCalledTimes(1);
-            expect(appEventsMock.emit).toHaveBeenCalledWith(AppEvents.alertWarning, ['UnAuthorized', '']);
+            expect(appEventsMock.emit).toHaveBeenCalledWith(AppEvents.alertWarning, [errorMessage, '']);
           });
       });
     });
@@ -196,7 +199,7 @@ describe('backendSrv', () => {
         const { backendSrv, appEventsMock, logoutMock, expectRequestCallChain } = getTestContext({
           ok: false,
           status: 401,
-          statusText: 'UnAuthorized',
+          statusText: errorMessage,
           data: { message: 'Token revoked', error: { id: 'ERR_TOKEN_REVOKED', maxConcurrentSessions: 3 } },
           url,
         });
@@ -226,8 +229,8 @@ describe('backendSrv', () => {
         const { backendSrv, appEventsMock, logoutMock, expectRequestCallChain } = getTestContext({
           ok: false,
           status: 401,
-          statusText: 'UnAuthorized',
-          data: { message: 'UnAuthorized' },
+          statusText: errorMessage,
+          data: { message: errorMessage },
         });
 
         backendSrv.loginPing = jest
diff --git a/public/app/features/dashboard/services/PublicDashboardDataSource.ts b/public/app/features/dashboard/services/PublicDashboardDataSource.ts
index 49c80792888..02ce4b8b6a7 100644
--- a/public/app/features/dashboard/services/PublicDashboardDataSource.ts
+++ b/public/app/features/dashboard/services/PublicDashboardDataSource.ts
@@ -5,6 +5,7 @@ import {
   DataQuery,
   DataQueryRequest,
   DataQueryResponse,
+  TestDataSourceResponse,
   DataSourceApi,
   DataSourceJsonData,
   DataSourcePluginMeta,
@@ -151,7 +152,7 @@ export class PublicDashboardDataSource extends DataSourceApi<DataQuery, DataSour
     return { data: [toDataFrame(annotations)] };
   }
 
-  testDatasource(): Promise<null> {
-    return Promise.resolve(null);
+  testDatasource(): Promise<TestDataSourceResponse> {
+    return Promise.resolve({ message: '', status: '' });
   }
 }
diff --git a/public/app/features/datasources/api.ts b/public/app/features/datasources/api.ts
index 5bfe388fed3..1cec20fe125 100644
--- a/public/app/features/datasources/api.ts
+++ b/public/app/features/datasources/api.ts
@@ -68,7 +68,13 @@ export const createDataSource = (dataSource: Partial<DataSourceSettings>) =>
 
 export const getDataSourcePlugins = () => getBackendSrv().get('/api/plugins', { enabled: 1, type: 'datasource' });
 
-export const updateDataSource = (dataSource: DataSourceSettings) =>
-  getBackendSrv().put(`/api/datasources/uid/${dataSource.uid}`, dataSource);
+export const updateDataSource = (dataSource: DataSourceSettings) => {
+  // we're setting showErrorAlert and showSuccessAlert to false to suppress the popover notifications. Request result will now be
+  // handled by the data source config page
+  return getBackendSrv().put(`/api/datasources/uid/${dataSource.uid}`, dataSource, {
+    showErrorAlert: false,
+    showSuccessAlert: false,
+  });
+};
 
 export const deleteDataSource = (uid: string) => getBackendSrv().delete(`/api/datasources/uid/${uid}`);
diff --git a/public/app/features/datasources/components/ButtonRow.test.tsx b/public/app/features/datasources/components/ButtonRow.test.tsx
index 0d9147452bd..db90d92bb97 100644
--- a/public/app/features/datasources/components/ButtonRow.test.tsx
+++ b/public/app/features/datasources/components/ButtonRow.test.tsx
@@ -10,7 +10,6 @@ const setup = (propOverrides?: object) => {
     canSave: false,
     onSubmit: jest.fn(),
     onTest: jest.fn(),
-    exploreUrl: '/explore',
   };
 
   Object.assign(props, propOverrides);
@@ -22,7 +21,7 @@ describe('<ButtonRow>', () => {
   it('should render component', () => {
     setup();
 
-    expect(screen.getByRole('link', { name: 'Explore' })).toBeInTheDocument();
+    expect(screen.getByText('Test')).toBeInTheDocument();
   });
   it('should render save & test', () => {
     setup({ canSave: true });
diff --git a/public/app/features/datasources/components/ButtonRow.tsx b/public/app/features/datasources/components/ButtonRow.tsx
index 9d581bd8cc4..3058d6b1e9b 100644
--- a/public/app/features/datasources/components/ButtonRow.tsx
+++ b/public/app/features/datasources/components/ButtonRow.tsx
@@ -1,31 +1,23 @@
 import React from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { Button, LinkButton } from '@grafana/ui';
-import { contextSrv } from 'app/core/core';
-import { AccessControlAction } from 'app/types';
+import { Button } from '@grafana/ui';
 
 export interface Props {
-  exploreUrl: string;
   canSave: boolean;
   onSubmit: (event: React.MouseEvent<HTMLButtonElement>) => void;
   onTest: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
 }
 
-export function ButtonRow({ canSave, onSubmit, onTest, exploreUrl }: Props) {
-  const canExploreDataSources = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore);
-
+export function ButtonRow({ canSave, onSubmit, onTest }: Props) {
   return (
     <div className="gf-form-button-row">
-      <LinkButton variant="secondary" fill="solid" href={exploreUrl} disabled={!canExploreDataSources}>
-        Explore
-      </LinkButton>
       {canSave && (
         <Button
           type="submit"
           variant="primary"
           disabled={!canSave}
-          onClick={(event) => onSubmit(event)}
+          onClick={onSubmit}
           aria-label={selectors.pages.DataSource.saveAndTest}
         >
           Save &amp; test
diff --git a/public/app/features/datasources/components/DataSourceTestingStatus.tsx b/public/app/features/datasources/components/DataSourceTestingStatus.tsx
index ba2b43abf3e..ca4ba2243ce 100644
--- a/public/app/features/datasources/components/DataSourceTestingStatus.tsx
+++ b/public/app/features/datasources/components/DataSourceTestingStatus.tsx
@@ -1,30 +1,108 @@
-import React from 'react';
+import { css, cx } from '@emotion/css';
+import React, { HTMLAttributes } from 'react';
 
+import { DataSourceSettings as DataSourceSettingsType, GrafanaTheme2 } from '@grafana/data';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
-import { TestingStatus } from '@grafana/runtime';
-import { Alert } from '@grafana/ui';
+import { TestingStatus, config } from '@grafana/runtime';
+import { AlertVariant, Alert, useTheme2, Link } from '@grafana/ui';
+
+import { contextSrv } from '../../../core/core';
+import { AccessControlAction } from '../../../types';
+import { trackCreateDashboardClicked } from '../tracking';
 
 export type Props = {
   testingStatus?: TestingStatus;
+  exploreUrl: string;
+  dataSource: DataSourceSettingsType;
 };
 
-export function DataSourceTestingStatus({ testingStatus }: Props) {
-  const isError = testingStatus?.status === 'error';
+interface AlertMessageProps extends HTMLAttributes<HTMLDivElement> {
+  title: string;
+  severity?: AlertVariant;
+  exploreUrl: string;
+  dataSourceId: string;
+  onDashboardLinkClicked: () => void;
+}
+
+const getStyles = (theme: GrafanaTheme2, hasTitle: boolean) => {
+  return {
+    content: css`
+      color: ${theme.colors.text.secondary};
+      padding-top: ${hasTitle ? theme.spacing(1) : 0};
+      max-height: 50vh;
+      overflow-y: auto;
+    `,
+    disabled: css`
+      pointer-events: none;
+      color: ${theme.colors.text.secondary};
+    `,
+  };
+};
+
+const AlertSuccessMessage = ({ title, exploreUrl, dataSourceId, onDashboardLinkClicked }: AlertMessageProps) => {
+  const theme = useTheme2();
+  const hasTitle = Boolean(title);
+  const styles = getStyles(theme, hasTitle);
+  const canExploreDataSources = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore);
+
+  return (
+    <div className={styles.content}>
+      Next, you can start to visualize data by{' '}
+      <Link
+        aria-label={`Create a dashboard`}
+        href={`/dashboard/new-with-ds/${dataSourceId}`}
+        className="external-link"
+        onClick={onDashboardLinkClicked}
+      >
+        building a dashboard
+      </Link>
+      , or by querying data in the{' '}
+      <Link
+        aria-label={`Explore data`}
+        className={cx('external-link', {
+          [`${styles.disabled}`]: !canExploreDataSources,
+          'test-disabled': !canExploreDataSources,
+        })}
+        href={exploreUrl}
+      >
+        Explore view
+      </Link>
+      .
+    </div>
+  );
+};
+
+AlertSuccessMessage.displayName = 'AlertSuccessMessage';
+
+export function DataSourceTestingStatus({ testingStatus, exploreUrl, dataSource }: Props) {
+  const severity = testingStatus?.status ? (testingStatus?.status as AlertVariant) : 'error';
   const message = testingStatus?.message;
   const detailsMessage = testingStatus?.details?.message;
   const detailsVerboseMessage = testingStatus?.details?.verboseMessage;
+  const onDashboardLinkClicked = () => {
+    trackCreateDashboardClicked({
+      grafana_version: config.buildInfo.version,
+      datasource_uid: dataSource.uid,
+      plugin_name: dataSource.typeName,
+      path: location.pathname,
+    });
+  };
 
   if (message) {
     return (
       <div className="gf-form-group p-t-2">
-        <Alert
-          severity={isError ? 'error' : 'success'}
-          title={message}
-          aria-label={e2eSelectors.pages.DataSource.alert}
-        >
+        <Alert severity={severity} title={message} aria-label={e2eSelectors.pages.DataSource.alert}>
           {testingStatus?.details && (
             <>
               {detailsMessage}
+              {severity === 'success' ? (
+                <AlertSuccessMessage
+                  title={message}
+                  exploreUrl={exploreUrl}
+                  dataSourceId={dataSource.uid}
+                  onDashboardLinkClicked={onDashboardLinkClicked}
+                />
+              ) : null}
               {detailsVerboseMessage ? (
                 <details style={{ whiteSpace: 'pre-wrap' }}>{String(detailsVerboseMessage)}</details>
               ) : null}
diff --git a/public/app/features/datasources/components/EditDataSource.tsx b/public/app/features/datasources/components/EditDataSource.tsx
index aa985ac08e3..1cad01373a8 100644
--- a/public/app/features/datasources/components/EditDataSource.tsx
+++ b/public/app/features/datasources/components/EditDataSource.tsx
@@ -119,7 +119,11 @@ export function EditDataSourceView({
 
   const onSubmit = async (e: React.MouseEvent<HTMLButtonElement> | React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-    await onUpdate({ ...dataSource });
+    try {
+      await onUpdate({ ...dataSource });
+    } catch (err) {
+      return;
+    }
 
     onTest();
   };
@@ -173,9 +177,9 @@ export function EditDataSourceView({
         </DataSourcePluginContextProvider>
       )}
 
-      <DataSourceTestingStatus testingStatus={testingStatus} />
+      <DataSourceTestingStatus testingStatus={testingStatus} exploreUrl={exploreUrl} dataSource={dataSource} />
 
-      <ButtonRow onSubmit={onSubmit} onTest={onTest} exploreUrl={exploreUrl} canSave={!readOnly && hasWriteRights} />
+      <ButtonRow onSubmit={onSubmit} onTest={onTest} canSave={!readOnly && hasWriteRights} />
     </form>
   );
 }
diff --git a/public/app/features/datasources/pages/EditDataSourcePage.test.tsx b/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
index c3fd01b8346..f168caa7782 100644
--- a/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
+++ b/public/app/features/datasources/pages/EditDataSourcePage.test.tsx
@@ -4,7 +4,7 @@ import { Store } from 'redux';
 import { TestProvider } from 'test/helpers/TestProvider';
 
 import { LayoutModes } from '@grafana/data';
-import { setAngularLoader } from '@grafana/runtime';
+import { setAngularLoader, config } from '@grafana/runtime';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
 import { configureStore } from 'app/store/configureStore';
 
@@ -102,12 +102,23 @@ describe('<EditDataSourcePage>', () => {
     // Title
     expect(screen.queryByText(name)).toBeVisible();
 
+    // Buttons
+    expect(screen.queryByRole('button', { name: /Save (.*) test/i })).toBeVisible();
+
+    // wait for the rest of the async processes to finish
+    expect(await screen.findByText(name)).toBeVisible();
+  });
+
+  it('should show updated action buttons when topnav is on', async () => {
+    config.featureToggles.topnav = true;
+    setup(uid, store);
+
     await waitFor(() => {
       // Buttons
       expect(screen.queryByRole('button', { name: /Delete/i })).toBeVisible();
       expect(screen.queryByRole('button', { name: /Save (.*) test/i })).toBeVisible();
       expect(screen.queryByRole('link', { name: /Build a dashboard/i })).toBeVisible();
-      expect(screen.queryAllByRole('link', { name: /Explore/i })).toHaveLength(2);
+      expect(screen.queryAllByRole('link', { name: /Explore/i })).toHaveLength(1);
     });
   });
 });
diff --git a/public/app/features/datasources/state/actions.test.ts b/public/app/features/datasources/state/actions.test.ts
index 113a9be0a8e..6749ad8a230 100644
--- a/public/app/features/datasources/state/actions.test.ts
+++ b/public/app/features/datasources/state/actions.test.ts
@@ -217,7 +217,7 @@ describe('testDataSource', () => {
           ({
             get: jest.fn().mockReturnValue({
               testDatasource: jest.fn().mockReturnValue({
-                status: '',
+                status: 'success',
                 message: '',
               }),
               type: 'cloudwatch',
@@ -228,8 +228,9 @@ describe('testDataSource', () => {
       };
       const state = {
         testingStatus: {
-          status: '',
+          status: 'success',
           message: '',
+          details: {},
         },
       };
       const dispatchedActions = await thunkTester(state)
diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts
index 4ab06697754..c3b27282f82 100644
--- a/public/app/features/datasources/state/actions.ts
+++ b/public/app/features/datasources/state/actions.ts
@@ -57,6 +57,40 @@ export interface TestDataSourceDependencies {
   getBackendSrv: typeof getBackendSrv;
 }
 
+type parseDataSourceSaveResponse = {
+  message?: string | undefined;
+  status?: string;
+  details?: HealthCheckResultDetails | { message?: string; verboseMessage?: string };
+};
+
+const parseHealthCheckError = (errorResponse: any): parseDataSourceSaveResponse => {
+  let message: string | undefined;
+  let details: HealthCheckResultDetails;
+
+  if (errorResponse.error && errorResponse.error instanceof HealthCheckError) {
+    message = errorResponse.error.message;
+    details = errorResponse.error.details;
+  } else if (isFetchError(errorResponse)) {
+    message = errorResponse.data.message ?? `HTTP error ${errorResponse.statusText}`;
+  } else if (errorResponse instanceof Error) {
+    message = errorResponse.message;
+  }
+
+  return { message, details };
+};
+
+const parseHealthCheckSuccess = (response: any): parseDataSourceSaveResponse => {
+  let message: string | undefined;
+  let status: string;
+  let details: { message?: string; verboseMessage?: string };
+
+  status = response.status;
+  message = response.message;
+  details = response.details;
+
+  return { status, message, details };
+};
+
 export const initDataSourceSettings = (
   uid: string,
   dependencies: InitDataSourceSettingDependencies = {
@@ -112,7 +146,9 @@ export const testDataSource = (
       try {
         const result = await dsApi.testDatasource();
 
-        dispatch(testDataSourceSucceeded(result));
+        const parsedResult = parseHealthCheckSuccess({ ...result, details: { ...result.details } });
+        dispatch(testDataSourceSucceeded(parsedResult));
+
         trackDataSourceTested({
           grafana_version: config.buildInfo.version,
           plugin_id: dsApi.type,
@@ -121,19 +157,9 @@ export const testDataSource = (
           path: editLink,
         });
       } catch (err) {
-        let message: string | undefined;
-        let details: HealthCheckResultDetails;
+        const formattedError = parseHealthCheckError(err);
 
-        if (err instanceof HealthCheckError) {
-          message = err.message;
-          details = err.details;
-        } else if (isFetchError(err)) {
-          message = err.data.message ?? `HTTP error ${err.statusText}`;
-        } else if (err instanceof Error) {
-          message = err.message;
-        }
-
-        dispatch(testDataSourceFailed({ message, details }));
+        dispatch(testDataSourceFailed({ ...formattedError }));
         trackDataSourceTested({
           grafana_version: config.buildInfo.version,
           plugin_id: dsApi.type,
@@ -216,6 +242,7 @@ export function addDataSource(
       isDefault: isFirstDataSource,
     };
 
+    // TODO: typo in name
     if (nameExits(dataSources, newInstance.name)) {
       newInstance.name = findNewName(dataSources, newInstance.name);
     }
@@ -248,9 +275,23 @@ export function loadDataSourcePlugins(): ThunkResult<void> {
 }
 
 export function updateDataSource(dataSource: DataSourceSettings) {
-  return async (dispatch: (dataSourceSettings: ThunkResult<Promise<DataSourceSettings>>) => DataSourceSettings) => {
-    await api.updateDataSource(dataSource);
+  return async (
+    dispatch: (
+      dataSourceSettings: ThunkResult<Promise<DataSourceSettings>> | { payload: unknown; type: string }
+    ) => DataSourceSettings
+  ) => {
+    try {
+      await api.updateDataSource(dataSource);
+    } catch (err: any) {
+      const formattedError = parseHealthCheckError(err);
+
+      dispatch(testDataSourceFailed(formattedError));
+
+      return Promise.reject(dataSource);
+    }
+
     await getDatasourceSrv().reload();
+
     return dispatch(loadDataSource(dataSource.uid));
   };
 }
@@ -259,13 +300,18 @@ export function deleteLoadedDataSource(): ThunkResult<void> {
   return async (dispatch, getStore) => {
     const { uid } = getStore().dataSources.dataSource;
 
-    await api.deleteDataSource(uid);
-    await getDatasourceSrv().reload();
+    try {
+      await api.deleteDataSource(uid);
+      await getDatasourceSrv().reload();
 
-    const datasourcesUrl = config.featureToggles.dataConnectionsConsole
-      ? CONNECTIONS_ROUTES.DataSources
-      : '/datasources';
+      const datasourcesUrl = config.featureToggles.dataConnectionsConsole
+        ? CONNECTIONS_ROUTES.DataSources
+        : '/datasources';
 
-    locationService.push(datasourcesUrl);
+      locationService.push(datasourcesUrl);
+    } catch (err) {
+      const formattedError = parseHealthCheckError(err);
+      dispatch(testDataSourceFailed(formattedError));
+    }
   };
 }
diff --git a/public/app/features/datasources/state/reducers.ts b/public/app/features/datasources/state/reducers.ts
index 0a06664f556..c9bc8f311c8 100644
--- a/public/app/features/datasources/state/reducers.ts
+++ b/public/app/features/datasources/state/reducers.ts
@@ -146,7 +146,7 @@ export const dataSourceSettingsReducer = (
     return {
       ...state,
       testingStatus: {
-        message: 'Testing...',
+        message: 'Testing... this could take up to a couple of minutes',
         status: 'info',
       },
     };
diff --git a/public/app/features/datasources/types.ts b/public/app/features/datasources/types.ts
index f0833101538..8b0fde0a9fa 100644
--- a/public/app/features/datasources/types.ts
+++ b/public/app/features/datasources/types.ts
@@ -14,3 +14,5 @@ export type DataSourcesRoutes = {
   List: string;
   Dashboards: string;
 };
+
+export type DataSourceTestStatus = 'success' | 'warning' | 'error';
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
index 51e37149546..d550f8427ba 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
@@ -12,10 +12,10 @@ import {
   DataQuery,
   DataQueryRequest,
   DataQueryResponse,
+  TestDataSourceResponse,
 } from '@grafana/data';
 import { GetDataSourceListFilters, setDataSourceSrv } from '@grafana/runtime';
 
-import { CloudWatchDatasource } from '../datasource';
 import { CloudWatchLogsQueryStatus } from '../types';
 
 import { meta, setupMockedDataSource } from './CloudWatchDataSource';
@@ -62,7 +62,7 @@ export function setupForLogs() {
         ): Observable<DataQueryResponse> | Promise<DataQueryResponse> {
           throw new Error('Function not implemented.');
         },
-        testDatasource: function (): Promise<CloudWatchDatasource> {
+        testDatasource: function (): Promise<TestDataSourceResponse> {
           throw new Error('Function not implemented.');
         },
         meta: meta,
diff --git a/public/app/plugins/datasource/dashboard/datasource.ts b/public/app/plugins/datasource/dashboard/datasource.ts
index e4d9465c04c..96fcc13c6f6 100644
--- a/public/app/plugins/datasource/dashboard/datasource.ts
+++ b/public/app/plugins/datasource/dashboard/datasource.ts
@@ -1,4 +1,10 @@
-import { DataSourceApi, DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/data';
+import {
+  DataSourceApi,
+  DataQueryRequest,
+  DataQueryResponse,
+  DataSourceInstanceSettings,
+  TestDataSourceResponse,
+} from '@grafana/data';
 
 import { DashboardQuery } from './types';
 
@@ -18,7 +24,7 @@ export class DashboardDatasource extends DataSourceApi<DashboardQuery> {
     return Promise.reject('This should not be called directly');
   }
 
-  testDatasource() {
-    return Promise.resolve({});
+  testDatasource(): Promise<TestDataSourceResponse> {
+    return Promise.resolve({ message: '', status: '' });
   }
 }
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index b9e22bdfe78..7b0d886eb11 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -9,6 +9,7 @@ import {
   DataQueryRequest,
   DataQueryResponse,
   DataSourceInstanceSettings,
+  TestDataSourceResponse,
   isValidLiveChannelAddress,
   MutableDataFrame,
   parseLiveChannelAddress,
@@ -252,8 +253,8 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
     return { data: [toDataFrame(annotations)] };
   }
 
-  testDatasource() {
-    return Promise.resolve();
+  testDatasource(): Promise<TestDataSourceResponse> {
+    return Promise.resolve({ message: '', status: '' });
   }
 }
 
diff --git a/public/app/plugins/datasource/mixed/MixedDataSource.ts b/public/app/plugins/datasource/mixed/MixedDataSource.ts
index b6ca7a20591..d0296261f99 100644
--- a/public/app/plugins/datasource/mixed/MixedDataSource.ts
+++ b/public/app/plugins/datasource/mixed/MixedDataSource.ts
@@ -6,6 +6,7 @@ import {
   DataQuery,
   DataQueryRequest,
   DataQueryResponse,
+  TestDataSourceResponse,
   DataSourceApi,
   DataSourceInstanceSettings,
   LoadingState,
@@ -94,8 +95,8 @@ export class MixedDatasource extends DataSourceApi<DataQuery> {
     return forkJoin(runningQueries).pipe(flattenResponses(), map(this.finalizeResponses), mergeAll());
   }
 
-  testDatasource() {
-    return Promise.resolve({});
+  testDatasource(): Promise<TestDataSourceResponse> {
+    return Promise.resolve({ message: '', status: '' });
   }
 
   private isQueryable(query: BatchedQueries): boolean {
diff --git a/public/test/mocks/datasource_srv.ts b/public/test/mocks/datasource_srv.ts
index af815da4d90..3f68dded950 100644
--- a/public/test/mocks/datasource_srv.ts
+++ b/public/test/mocks/datasource_srv.ts
@@ -3,6 +3,7 @@ import { Observable } from 'rxjs';
 import {
   DataQueryRequest,
   DataQueryResponse,
+  TestDataSourceResponse,
   DataSourceApi,
   DataSourceInstanceSettings,
   DataSourcePluginMeta,
@@ -57,8 +58,8 @@ export class MockDataSourceApi extends DataSourceApi {
     });
   }
 
-  testDatasource() {
-    return Promise.resolve();
+  testDatasource(): Promise<TestDataSourceResponse> {
+    return Promise.resolve({ message: '', status: '' });
   }
 
   setupMixed(value: boolean) {
@@ -99,7 +100,7 @@ export class MockObservableDataSourceApi extends DataSourceApi {
     });
   }
 
-  testDatasource() {
-    return Promise.resolve();
+  testDatasource(): Promise<TestDataSourceResponse> {
+    return Promise.resolve({ message: '', status: '' });
   }
 }

From 932136807b611ecc1722f3c33f60c4661346efe5 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Fri, 28 Apr 2023 16:00:48 +0200
Subject: [PATCH 528/729] Chore: Allow to force the download of the public key
 (#67486)

---
 conf/defaults.ini                             |  2 +
 conf/sample.ini                               |  2 +
 .../keyretriever/dynamic/dynamic_retriever.go | 22 +++++----
 .../dynamic/dynamic_retriever_test.go         | 46 +++++++++++++------
 .../keyretriever/retriever_test.go            |  8 ++--
 pkg/setting/setting.go                        |  1 +
 pkg/setting/setting_plugins.go                |  1 +
 7 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 85a43de5f58..3e585172afb 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1342,6 +1342,8 @@ plugin_catalog_url = https://grafana.com/grafana/plugins/
 plugin_catalog_hidden_plugins =
 # Log all backend requests for core and external plugins.
 log_backend_requests = false
+# Force download of public key for verifying plugin signature on startup.
+enforce_public_key_download = false
 
 #################################### Grafana Live ##########################################
 [live]
diff --git a/conf/sample.ini b/conf/sample.ini
index fed965002a4..ced98a3a829 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -1281,6 +1281,8 @@
 ;plugin_catalog_hidden_plugins =
 # Log all backend requests for core and external plugins.
 ;log_backend_requests = false
+# Force download of public key for verifying plugin signature on startup.
+;enforce_public_key_download = false
 
 #################################### Grafana Live ##########################################
 [live]
diff --git a/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever.go b/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever.go
index 4459de59c40..17948954fef 100644
--- a/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever.go
+++ b/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 const publicKeySyncInterval = 10 * 24 * time.Hour // 10 days
@@ -29,8 +29,9 @@ type ManifestKeys struct {
 }
 
 type KeyRetriever struct {
-	cfg *config.Cfg
-	log log.Logger
+	cfg   *setting.Cfg
+	log   log.Logger
+	flags featuremgmt.FeatureToggles
 
 	lock    sync.Mutex
 	cli     http.Client
@@ -40,19 +41,20 @@ type KeyRetriever struct {
 
 var _ plugins.KeyRetriever = (*KeyRetriever)(nil)
 
-func ProvideService(cfg *config.Cfg, kv plugins.KeyStore) *KeyRetriever {
+func ProvideService(cfg *setting.Cfg, kv plugins.KeyStore, flags featuremgmt.FeatureToggles) *KeyRetriever {
 	kr := &KeyRetriever{
-		cfg: cfg,
-		log: log.New("plugin.signature.key_retriever"),
-		cli: makeHttpClient(),
-		kv:  kv,
+		cfg:   cfg,
+		flags: flags,
+		log:   log.New("plugin.signature.key_retriever"),
+		cli:   makeHttpClient(),
+		kv:    kv,
 	}
 	return kr
 }
 
 // IsDisabled disables dynamic retrieval of public keys from the API server.
 func (kr *KeyRetriever) IsDisabled() bool {
-	return !kr.cfg.Features.IsEnabled(featuremgmt.FlagPluginsAPIManifestKey)
+	return !kr.flags.IsEnabled(featuremgmt.FlagPluginsAPIManifestKey)
 }
 
 func (kr *KeyRetriever) Run(ctx context.Context) error {
@@ -101,7 +103,7 @@ func (kr *KeyRetriever) updateKeys(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	if time.Since(*lastUpdated) < publicKeySyncInterval {
+	if !kr.cfg.PluginForcePublicKeyDownload && time.Since(*lastUpdated) < publicKeySyncInterval {
 		// Cache is still valid
 		return nil
 	}
diff --git a/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever_test.go b/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever_test.go
index acd46e7db69..f395e61ee00 100644
--- a/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever_test.go
+++ b/pkg/services/pluginsintegration/keyretriever/dynamic/dynamic_retriever_test.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/require"
 )
 
@@ -43,13 +43,11 @@ func setFakeAPIServer(t *testing.T, publicKey string, keyID string) (*httptest.S
 }
 func Test_PublicKeyUpdate(t *testing.T) {
 	t.Run("it should retrieve an API key", func(t *testing.T) {
-		cfg := &config.Cfg{
-			Features: featuremgmt.WithFeatures([]interface{}{featuremgmt.FlagPluginsAPIManifestKey}...),
-		}
+		cfg := &setting.Cfg{}
 		expectedKey := "fake"
 		s, done := setFakeAPIServer(t, expectedKey, "7e4d0c6a708866e7")
 		cfg.GrafanaComURL = s.URL
-		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()), featuremgmt.WithFeatures(featuremgmt.FlagPluginsAPIManifestKey))
 		go func() {
 			err := v.Run(context.Background())
 			require.NoError(t, err)
@@ -66,13 +64,11 @@ func Test_PublicKeyUpdate(t *testing.T) {
 	})
 
 	t.Run("it should update the latest update date", func(t *testing.T) {
-		cfg := &config.Cfg{
-			Features: featuremgmt.WithFeatures([]interface{}{featuremgmt.FlagPluginsAPIManifestKey}...),
-		}
+		cfg := &setting.Cfg{}
 		expectedKey := "fake"
 		s, done := setFakeAPIServer(t, expectedKey, "7e4d0c6a708866e7")
 		cfg.GrafanaComURL = s.URL
-		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()), featuremgmt.WithFeatures(featuremgmt.FlagPluginsAPIManifestKey))
 		go func() {
 			err := v.Run(context.Background())
 			require.NoError(t, err)
@@ -88,13 +84,11 @@ func Test_PublicKeyUpdate(t *testing.T) {
 	})
 
 	t.Run("it should remove old keys", func(t *testing.T) {
-		cfg := &config.Cfg{
-			Features: featuremgmt.WithFeatures([]interface{}{featuremgmt.FlagPluginsAPIManifestKey}...),
-		}
+		cfg := &setting.Cfg{}
 		expectedKey := "fake"
 		s, done := setFakeAPIServer(t, expectedKey, "other")
 		cfg.GrafanaComURL = s.URL
-		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()))
+		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()), featuremgmt.WithFeatures(featuremgmt.FlagPluginsAPIManifestKey))
 		go func() {
 			err := v.Run(context.Background())
 			require.NoError(t, err)
@@ -113,4 +107,30 @@ func Test_PublicKeyUpdate(t *testing.T) {
 		require.Equal(t, true, found)
 		require.Equal(t, expectedKey, res)
 	})
+
+	t.Run("it should force-download the key", func(t *testing.T) {
+		cfg := &setting.Cfg{
+			PluginForcePublicKeyDownload: true,
+		}
+		expectedKey := "fake"
+		s, done := setFakeAPIServer(t, expectedKey, "7e4d0c6a708866e7")
+		cfg.GrafanaComURL = s.URL
+		v := ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()), featuremgmt.WithFeatures(featuremgmt.FlagPluginsAPIManifestKey))
+		// Simulate an updated key
+		err := v.kv.SetLastUpdated(context.Background())
+		require.NoError(t, err)
+		go func() {
+			err := v.Run(context.Background())
+			require.NoError(t, err)
+		}()
+		<-done
+
+		// wait for the lock to be free
+		v.lock.Lock()
+		defer v.lock.Unlock()
+		res, found, err := v.kv.Get(context.Background(), "7e4d0c6a708866e7")
+		require.NoError(t, err)
+		require.Equal(t, true, found)
+		require.Equal(t, expectedKey, res)
+	})
 }
diff --git a/pkg/services/pluginsintegration/keyretriever/retriever_test.go b/pkg/services/pluginsintegration/keyretriever/retriever_test.go
index 5a35674d81a..283c688fa71 100644
--- a/pkg/services/pluginsintegration/keyretriever/retriever_test.go
+++ b/pkg/services/pluginsintegration/keyretriever/retriever_test.go
@@ -5,20 +5,18 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever/dynamic"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_GetPublicKey(t *testing.T) {
 	t.Run("it should return a static key", func(t *testing.T) {
-		cfg := &config.Cfg{
-			Features: featuremgmt.WithFeatures(),
-		}
-		kr := ProvideService(dynamic.ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore())))
+		cfg := &setting.Cfg{}
+		kr := ProvideService(dynamic.ProvideService(cfg, keystore.ProvideService(kvstore.NewFakeKVStore()), featuremgmt.WithFeatures()))
 		key, err := kr.GetPublicKey(context.Background(), statickey.GetDefaultKeyID())
 		require.NoError(t, err)
 		require.Equal(t, statickey.GetDefaultKey(), key)
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index b7020ed8d87..97f7a39e78b 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -236,6 +236,7 @@ type Cfg struct {
 	PluginCatalogHiddenPlugins       []string
 	PluginAdminEnabled               bool
 	PluginAdminExternalManageEnabled bool
+	PluginForcePublicKeyDownload     bool
 
 	PluginsCDNURLTemplate    string
 	PluginLogBackendRequests bool
diff --git a/pkg/setting/setting_plugins.go b/pkg/setting/setting_plugins.go
index 86201eccb7b..9d95154895d 100644
--- a/pkg/setting/setting_plugins.go
+++ b/pkg/setting/setting_plugins.go
@@ -30,6 +30,7 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error {
 	cfg.PluginsEnableAlpha = pluginsSection.Key("enable_alpha").MustBool(false)
 	cfg.PluginsAppsSkipVerifyTLS = pluginsSection.Key("app_tls_skip_verify_insecure").MustBool(false)
 	cfg.PluginSettings = extractPluginSettings(iniFile.Sections())
+	cfg.PluginForcePublicKeyDownload = pluginsSection.Key("enforce_public_key_download").MustBool(false)
 
 	pluginsAllowUnsigned := pluginsSection.Key("allow_loading_unsigned_plugins").MustString("")
 

From 15363e416bc8362a134d8820d788e59f41b42770 Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Fri, 28 Apr 2023 15:01:50 +0100
Subject: [PATCH 529/729] Explore: Avoid duplicate refIds when adding a new
 query (#67499)

---
 public/app/core/utils/explore.test.ts | 6 ++++++
 public/app/core/utils/explore.ts      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts
index 281d17acbea..d6de87958da 100644
--- a/public/app/core/utils/explore.test.ts
+++ b/public/app/core/utils/explore.test.ts
@@ -489,4 +489,10 @@ describe('generateEmptyQuery', () => {
     expect(query.datasource?.type).toBe('loki');
     expect(query.refId).toBe('B');
   });
+
+  it('should generate a query with a unique refId', async () => {
+    const query = await generateEmptyQuery([{ refId: 'A' }], 2);
+
+    expect(query.refId).not.toBe('A');
+  });
 });
diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index 9d7de0088e4..fbea62123d7 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -275,7 +275,7 @@ export async function generateEmptyQuery(
     defaultQuery = datasourceInstance.getDefaultQuery?.(CoreApp.Explore);
   }
 
-  return { refId: getNextRefIdChar(queries), key: generateKey(index), datasource: datasourceRef, ...defaultQuery };
+  return { ...defaultQuery, refId: getNextRefIdChar(queries), key: generateKey(index), datasource: datasourceRef };
 }
 
 export const generateNewKeyAndAddRefIdIfMissing = (target: DataQuery, queries: DataQuery[], index = 0): DataQuery => {

From 07041b5b36735c3261ab118da6588d66cd9648a2 Mon Sep 17 00:00:00 2001
From: Alexa V <239999+axelavargas@users.noreply.github.com>
Date: Fri, 28 Apr 2023 16:20:32 +0200
Subject: [PATCH 530/729] Dashboard: Revert fixed header shown on mobile
 devices in the new panel header (#67510)

---
 .../src/components/PanelChrome/PanelChrome.tsx  | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
index 4017fd4c30a..000c08b6e4d 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
@@ -1,6 +1,5 @@
 import { css, cx } from '@emotion/css';
 import React, { CSSProperties, ReactElement, ReactNode } from 'react';
-import { useMedia } from 'react-use';
 
 import { GrafanaTheme2, LoadingState } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -92,13 +91,10 @@ export function PanelChrome({
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
 
-  const pointerQuery = '(pointer: coarse)';
-  // detect if we are on touch devices
-  const isTouchDevice = useMedia(pointerQuery);
-  const hasHeader = !hoverHeader || isTouchDevice;
+  const hasHeader = !hoverHeader;
 
   // hover menu is only shown on hover when not on touch devices
-  const showOnHoverClass = !isTouchDevice ? 'show-on-hover' : '';
+  const showOnHoverClass = 'show-on-hover';
 
   const headerHeight = getHeaderHeight(theme, hasHeader);
   const { contentStyle, innerWidth, innerHeight } = getContentStyle(padding, theme, width, headerHeight, height);
@@ -162,7 +158,7 @@ export function PanelChrome({
         {loadingState === LoadingState.Loading ? <LoadingBar width={width} ariaLabel="Panel loading bar" /> : null}
       </div>
 
-      {hoverHeader && !isTouchDevice && (
+      {hoverHeader && (
         <>
           <HoverWidget
             menu={menu}
@@ -197,12 +193,7 @@ export function PanelChrome({
               menu={menu}
               title={title}
               placement="bottom-end"
-              menuButtonClass={cx(
-                { [styles.hiddenMenu]: !isTouchDevice },
-                styles.menuItem,
-                dragClassCancel,
-                showOnHoverClass
-              )}
+              menuButtonClass={cx(styles.menuItem, dragClassCancel, showOnHoverClass)}
               onOpenMenu={onOpenMenu}
             />
           )}

From 2d195741c0416f1f41302f15092511da177b4bd5 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:22:18 +0100
Subject: [PATCH 531/729] Chore: Update codeowners so Dashboards owns Inspector
 (#67374)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cd54bdee1b1..5ece762b8ff 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -366,7 +366,7 @@ lerna.json @grafana/frontend-ops
 /public/app/features/explore/ @grafana/explore-squad
 /public/app/features/expressions/ @grafana/observability-metrics
 /public/app/features/folders/ @grafana/grafana-frontend-platform
-/public/app/features/inspector/ @grafana/grafana-frontend-platform
+/public/app/features/inspector/ @grafana/dashboards-squad
 /public/app/features/invites/ @grafana/grafana-frontend-platform
 /public/app/features/geo/ @grafana/dataviz-squad
 /public/app/features/library-panels/ @grafana/grafana-frontend-platform

From cd0fb21f297be56c7d8de5d0fd898ce8ed468e0d Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 28 Apr 2023 07:31:51 -0700
Subject: [PATCH 532/729] Angular: support getLegacyAngularInjector() even when
 angular is disabled. (#67439)

---
 public/app/angular/GrafanaCtrl.ts             |  3 -
 .../angular/loadAndInitAngularIfEnabled.ts    | 72 ++++++++++++++++++-
 public/app/app.ts                             |  2 +
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/public/app/angular/GrafanaCtrl.ts b/public/app/angular/GrafanaCtrl.ts
index 395c3ed97f1..cb6a144c224 100644
--- a/public/app/angular/GrafanaCtrl.ts
+++ b/public/app/angular/GrafanaCtrl.ts
@@ -10,7 +10,6 @@ import { AngularLoader } from 'app/angular/services/AngularLoader';
 import appEvents from 'app/core/app_events';
 import config from 'app/core/config';
 import { ContextSrv } from 'app/core/services/context_srv';
-import { initGrafanaLive } from 'app/features/live';
 import { AppEventEmitter, AppEventConsumer } from 'app/types';
 
 import { UtilSrv } from './services/UtilSrv';
@@ -32,8 +31,6 @@ export class GrafanaCtrl {
     setAngularLoader(angularLoader);
     setLegacyAngularInjector($injector);
 
-    initGrafanaLive();
-
     $scope.init = () => {
       $scope.contextSrv = contextSrv;
       $scope.appSubUrl = config.appSubUrl;
diff --git a/public/app/angular/loadAndInitAngularIfEnabled.ts b/public/app/angular/loadAndInitAngularIfEnabled.ts
index 211f44ae3b8..ee37609818b 100644
--- a/public/app/angular/loadAndInitAngularIfEnabled.ts
+++ b/public/app/angular/loadAndInitAngularIfEnabled.ts
@@ -1,4 +1,17 @@
-import { config, setAngularLoader } from '@grafana/runtime';
+import { deprecationWarning } from '@grafana/data';
+import {
+  config,
+  setAngularLoader,
+  setLegacyAngularInjector,
+  getDataSourceSrv,
+  getBackendSrv,
+  getTemplateSrv,
+} from '@grafana/runtime';
+import { contextSrv } from 'app/core/core';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { validationSrv } from 'app/features/manage-dashboards/services/ValidationSrv';
+import { getLinkSrv } from 'app/features/panel/panellinks/link_srv';
 
 export async function loadAndInitAngularIfEnabled() {
   if (config.angularSupportEnabled) {
@@ -7,6 +20,7 @@ export async function loadAndInitAngularIfEnabled() {
     app.init();
     app.bootstrap();
   } else {
+    // Register a dummy loader that does nothing
     setAngularLoader({
       load: (elem, scopeProps, template) => {
         return {
@@ -18,5 +32,61 @@ export async function loadAndInitAngularIfEnabled() {
         };
       },
     });
+
+    // Temporary path to allow access to services exposed directly by the angular injector
+    setLegacyAngularInjector({
+      get: (key: string) => {
+        switch (key) {
+          case 'backendSrv': {
+            deprecationWarning('getLegacyAngularInjector', 'backendSrv', 'use getBackendSrv() in @grafana/runtime');
+            return getBackendSrv();
+          }
+
+          case 'contextSrv': {
+            deprecationWarning('getLegacyAngularInjector', 'contextSrv');
+            return contextSrv;
+          }
+
+          case 'dashboardSrv': {
+            // we do not yet have a public interface for this
+            deprecationWarning('getLegacyAngularInjector', 'getDashboardSrv');
+            return getDashboardSrv();
+          }
+
+          case 'datasourceSrv': {
+            deprecationWarning(
+              'getLegacyAngularInjector',
+              'datasourceSrv',
+              'use getDataSourceSrv() in @grafana/runtime'
+            );
+            return getDataSourceSrv();
+          }
+
+          case 'linkSrv': {
+            // we do not yet have a public interface for this
+            deprecationWarning('getLegacyAngularInjector', 'linkSrv');
+            return getLinkSrv();
+          }
+
+          case 'validationSrv': {
+            // we do not yet have a public interface for this
+            deprecationWarning('getLegacyAngularInjector', 'validationSrv');
+            return validationSrv;
+          }
+
+          case 'timeSrv': {
+            // we do not yet have a public interface for this
+            deprecationWarning('getLegacyAngularInjector', 'timeSrv');
+            return getTimeSrv();
+          }
+
+          case 'templateSrv': {
+            deprecationWarning('getLegacyAngularInjector', 'templateSrv', 'use getTemplateSrv() in @grafana/runtime');
+            return getTemplateSrv();
+          }
+        }
+        throw 'Angular is disabled.  Unable to expose: ' + key;
+      },
+    } as angular.auto.IInjectorService);
   }
 }
diff --git a/public/app/app.ts b/public/app/app.ts
index 1ea3967a202..f2f9eb799e8 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -70,6 +70,7 @@ import { SentryEchoBackend } from './core/services/echo/backends/sentry/SentryBa
 import { KeybindingSrv } from './core/services/keybindingSrv';
 import { initDevFeatures } from './dev';
 import { getTimeSrv } from './features/dashboard/services/TimeSrv';
+import { initGrafanaLive } from './features/live';
 import { PanelDataErrorView } from './features/panel/components/PanelDataErrorView';
 import { PanelRenderer } from './features/panel/components/PanelRenderer';
 import { DatasourceSrv } from './features/plugins/datasource_srv';
@@ -127,6 +128,7 @@ export class GrafanaApp {
       setPanelDataErrorView(PanelDataErrorView);
       setLocationSrv(locationService);
       setTimeZoneResolver(() => config.bootData.user.timezone);
+      initGrafanaLive();
 
       // Expose the app-wide eventbus
       setAppEvents(appEvents);

From ffd83a027dfe61700fc10029d715ef1f588ba43a Mon Sep 17 00:00:00 2001
From: Andre Pereira <adrapereira@gmail.com>
Date: Fri, 28 Apr 2023 15:34:14 +0100
Subject: [PATCH 533/729] Trace View: Export trace button  (#67368)

* Add export button to trace view

* Support zipkin, jaeger and otlp formats
---
 .../features/explore/TraceView/TraceView.tsx  |  5 ++-
 .../Actions/TracePageActions.tsx              | 26 ++++++++++----
 .../NewTracePageHeader.test.tsx               |  2 ++
 .../TracePageHeader/NewTracePageHeader.tsx    |  8 +++--
 .../app/features/inspector/InspectDataTab.tsx | 29 ++-------------
 .../app/features/inspector/utils/download.ts  | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index 3de2d2da2ca..35d87ca9e14 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -3,6 +3,7 @@ import React, { RefObject, useMemo, useState } from 'react';
 import { useToggle } from 'react-use';
 
 import {
+  CoreApp,
   DataFrame,
   DataLink,
   DataSourceApi,
@@ -76,7 +77,7 @@ type Props = {
 };
 
 export function TraceView(props: Props) {
-  const { spanFindMatches, traceProp, datasource, topOfViewRef, topOfViewRefType } = props;
+  const { spanFindMatches, traceProp, datasource, topOfViewRef, topOfViewRefType, exploreId } = props;
 
   const {
     detailStates,
@@ -159,6 +160,7 @@ export function TraceView(props: Props) {
             <>
               <NewTracePageHeader
                 trace={traceProp}
+                data={props.dataFrames[0]}
                 timeZone={timeZone}
                 search={newTraceViewHeaderSearch}
                 setSearch={setNewTraceViewHeaderSearch}
@@ -170,6 +172,7 @@ export function TraceView(props: Props) {
                 spanFilterMatches={spanFilterMatches}
                 datasourceType={datasourceType}
                 setHeaderHeight={setHeaderHeight}
+                app={exploreId ? CoreApp.Explore : CoreApp.Unknown}
               />
               <SpanGraph
                 trace={traceProp}
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
index 4a967e1ff83..120843333ea 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
@@ -1,8 +1,13 @@
 import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
+import { CoreApp, DataFrame } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 import { useStyles2 } from '@grafana/ui';
 
+import { config } from '../../../../../../core/config';
+import { downloadTraceAsJson } from '../../../../../inspector/utils/download';
+
 import ActionButton from './ActionButton';
 
 export const getStyles = () => {
@@ -17,10 +22,12 @@ export const getStyles = () => {
 
 export type TracePageActionsProps = {
   traceId: string;
+  data: DataFrame;
+  app?: CoreApp;
 };
 
 export default function TracePageActions(props: TracePageActionsProps) {
-  const { traceId } = props;
+  const { traceId, data, app } = props;
   const styles = useStyles2(getStyles);
   const [copyTraceIdClicked, setCopyTraceIdClicked] = useState(false);
 
@@ -32,6 +39,16 @@ export default function TracePageActions(props: TracePageActionsProps) {
     }, 5000);
   };
 
+  const exportTrace = () => {
+    const traceFormat = downloadTraceAsJson(data, 'Trace-' + traceId.substring(traceId.length - 6));
+    reportInteraction('grafana_traces_download_traces_clicked', {
+      app,
+      grafana_version: config.buildInfo.version,
+      trace_format: traceFormat,
+      location: 'trace-view',
+    });
+  };
+
   return (
     <div className={styles.TracePageActions}>
       <ActionButton
@@ -40,12 +57,7 @@ export default function TracePageActions(props: TracePageActionsProps) {
         label={copyTraceIdClicked ? 'Copied!' : 'Trace ID'}
         icon={'copy'}
       />
-      {/* <ActionButton
-        onClick={() => alert('not implemented')}
-        ariaLabel={'Export Trace'}
-        label={'Export'}
-        icon={'save'}
-      /> */}
+      <ActionButton onClick={exportTrace} ariaLabel={'Export Trace'} label={'Export'} icon={'save'} />
     </div>
   );
 }
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
index 05b7ad0bee8..18b3c4fa408 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.test.tsx
@@ -15,6 +15,7 @@
 import { getByText, render } from '@testing-library/react';
 import React from 'react';
 
+import { MutableDataFrame } from '@grafana/data';
 import config from 'app/core/config';
 
 import { defaultFilters } from '../../useSearch';
@@ -36,6 +37,7 @@ const setup = () => {
     setFocusedSpanIdForSearch: jest.fn(),
     datasourceType: 'tempo',
     setHeaderHeight: jest.fn(),
+    data: new MutableDataFrame(),
   };
 
   return render(<NewTracePageHeader {...defaultProps} />);
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
index 60c0e40a72d..e9f663851de 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
@@ -16,7 +16,7 @@ import { css } from '@emotion/css';
 import cx from 'classnames';
 import React, { memo, useEffect, useMemo } from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { CoreApp, DataFrame, GrafanaTheme2 } from '@grafana/data';
 import { TimeZone } from '@grafana/schema';
 import { Badge, BadgeColor, Tooltip, useStyles2 } from '@grafana/ui';
 
@@ -34,6 +34,8 @@ import { timestamp, getStyles } from './TracePageHeader';
 
 export type TracePageHeaderProps = {
   trace: Trace | null;
+  data: DataFrame;
+  app?: CoreApp;
   timeZone: TimeZone;
   search: SearchProps;
   setSearch: React.Dispatch<React.SetStateAction<SearchProps>>;
@@ -50,6 +52,8 @@ export type TracePageHeaderProps = {
 export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
   const {
     trace,
+    data,
+    app,
     timeZone,
     search,
     setSearch,
@@ -101,7 +105,7 @@ export const NewTracePageHeader = memo((props: TracePageHeaderProps) => {
       <div className={styles.titleRow}>
         {links && links.length > 0 && <ExternalLinks links={links} className={styles.TracePageHeaderBack} />}
         {title}
-        <TracePageActions traceId={trace.traceID} />
+        <TracePageActions traceId={trace.traceID} data={data} app={app} />
       </div>
 
       <div className={styles.subtitle}>
diff --git a/public/app/features/inspector/InspectDataTab.tsx b/public/app/features/inspector/InspectDataTab.tsx
index d270b75511c..88e93c13984 100644
--- a/public/app/features/inspector/InspectDataTab.tsx
+++ b/public/app/features/inspector/InspectDataTab.tsx
@@ -9,7 +9,6 @@ import {
   CSVConfig,
   DataFrame,
   DataTransformerID,
-  MutableDataFrame,
   SelectableValue,
   TimeZone,
   transformDataFrame,
@@ -22,13 +21,10 @@ import { t, Trans } from 'app/core/internationalization';
 import { dataFrameToLogsModel } from 'app/core/logsModel';
 import { PanelModel } from 'app/features/dashboard/state';
 import { GetDataOptions } from 'app/features/query/state/PanelQueryRunner';
-import { transformToJaeger } from 'app/plugins/datasource/jaeger/responseTransform';
-import { transformToOTLP } from 'app/plugins/datasource/tempo/resultTransformer';
-import { transformToZipkin } from 'app/plugins/datasource/zipkin/utils/transforms';
 
 import { InspectDataOptions } from './InspectDataOptions';
 import { getPanelInspectorStyles } from './styles';
-import { downloadAsJson, downloadDataFrameAsCsv, downloadLogsModelAsTxt } from './utils/download';
+import { downloadAsJson, downloadDataFrameAsCsv, downloadLogsModelAsTxt, downloadTraceAsJson } from './utils/download';
 
 interface Props {
   isLoading: boolean;
@@ -124,28 +120,7 @@ export class InspectDataTab extends PureComponent<Props, State> {
       if (df.meta?.preferredVisualisationType !== 'trace') {
         continue;
       }
-      let traceFormat = 'otlp';
-
-      switch (df.meta?.custom?.traceFormat) {
-        case 'jaeger': {
-          let res = transformToJaeger(new MutableDataFrame(df));
-          downloadAsJson(res, (panel ? panel.getDisplayTitle() : 'Explore') + '-traces');
-          traceFormat = 'jaeger';
-          break;
-        }
-        case 'zipkin': {
-          let res = transformToZipkin(new MutableDataFrame(df));
-          downloadAsJson(res, (panel ? panel.getDisplayTitle() : 'Explore') + '-traces');
-          traceFormat = 'zipkin';
-          break;
-        }
-        case 'otlp':
-        default: {
-          let res = transformToOTLP(new MutableDataFrame(df));
-          downloadAsJson(res, (panel ? panel.getDisplayTitle() : 'Explore') + '-traces');
-          break;
-        }
-      }
+      const traceFormat = downloadTraceAsJson(df, (panel ? panel.getDisplayTitle() : 'Explore') + '-traces');
 
       reportInteraction('grafana_traces_download_traces_clicked', {
         app,
diff --git a/public/app/features/inspector/utils/download.ts b/public/app/features/inspector/utils/download.ts
index 5338ade3caa..23f76673b95 100644
--- a/public/app/features/inspector/utils/download.ts
+++ b/public/app/features/inspector/utils/download.ts
@@ -7,9 +7,14 @@ import {
   dateTimeFormat,
   dateTimeFormatISO,
   LogsModel,
+  MutableDataFrame,
   toCSV,
 } from '@grafana/data';
 
+import { transformToJaeger } from '../../../plugins/datasource/jaeger/responseTransform';
+import { transformToOTLP } from '../../../plugins/datasource/tempo/resultTransformer';
+import { transformToZipkin } from '../../../plugins/datasource/zipkin/utils/transforms';
+
 /**
  * Downloads a DataFrame as a TXT file.
  *
@@ -77,3 +82,34 @@ export function downloadAsJson(json: unknown, title: string) {
   const fileName = `${title}-${dateTimeFormat(new Date())}.json`;
   saveAs(blob, fileName);
 }
+
+/**
+ * Downloads a trace as json, based on the DataFrame format or OTLP as a default
+ *
+ * @param {DataFrame} frame
+ * @param {string} title
+ */
+export function downloadTraceAsJson(frame: DataFrame, title: string): string {
+  let traceFormat = 'otlp';
+  switch (frame.meta?.custom?.traceFormat) {
+    case 'jaeger': {
+      let res = transformToJaeger(new MutableDataFrame(frame));
+      downloadAsJson(res, title);
+      traceFormat = 'jaeger';
+      break;
+    }
+    case 'zipkin': {
+      let res = transformToZipkin(new MutableDataFrame(frame));
+      downloadAsJson(res, title);
+      traceFormat = 'zipkin';
+      break;
+    }
+    case 'otlp':
+    default: {
+      let res = transformToOTLP(new MutableDataFrame(frame));
+      downloadAsJson(res, title);
+      break;
+    }
+  }
+  return traceFormat;
+}

From 9eb10bee1f2d249b746c8011f7446b10eec94c98 Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Fri, 28 Apr 2023 10:42:16 -0400
Subject: [PATCH 534/729] Alerting: Scheduler use rule fingerprint instead of
 version (#66531)

* implement calculation of fingerprint for ruleWithFolder
* update scheduler to use fingerprint instead of rule's version
---
 pkg/services/ngalert/schedule/registry.go     | 146 +++++++++++++-
 .../ngalert/schedule/registry_bench_test.go   |  30 +++
 .../ngalert/schedule/registry_test.go         | 190 ++++++++++++++----
 pkg/services/ngalert/schedule/schedule.go     |  72 +++----
 .../ngalert/schedule/schedule_unit_test.go    |  12 +-
 5 files changed, 367 insertions(+), 83 deletions(-)
 create mode 100644 pkg/services/ngalert/schedule/registry_bench_test.go

diff --git a/pkg/services/ngalert/schedule/registry.go b/pkg/services/ngalert/schedule/registry.go
index 2aea4c5ceec..7495d6c64c8 100644
--- a/pkg/services/ngalert/schedule/registry.go
+++ b/pkg/services/ngalert/schedule/registry.go
@@ -2,9 +2,15 @@ package schedule
 
 import (
 	"context"
+	"encoding/binary"
 	"errors"
+	"fmt"
+	"hash/fnv"
+	"math"
+	"sort"
 	"sync"
 	"time"
+	"unsafe"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/util"
@@ -62,10 +68,9 @@ func (r *alertRuleInfoRegistry) keyMap() map[models.AlertRuleKey]struct{} {
 	return definitionsIDs
 }
 
-type ruleVersion int64
 type ruleVersionAndPauseStatus struct {
-	Version  ruleVersion
-	IsPaused bool
+	Fingerprint fingerprint
+	IsPaused    bool
 }
 
 type alertRuleInfo struct {
@@ -106,20 +111,15 @@ func (a *alertRuleInfo) eval(eval *evaluation) (bool, *evaluation) {
 // update sends an instruction to the rule evaluation routine to update the scheduled rule to the specified version. The specified version must be later than the current version, otherwise no update will happen.
 func (a *alertRuleInfo) update(lastVersion ruleVersionAndPauseStatus) bool {
 	// check if the channel is not empty.
-	msg := lastVersion
 	select {
-	case v := <-a.updateCh:
-		// if it has a version pick the greatest one.
-		if v.Version > msg.Version {
-			msg = v
-		}
+	case <-a.updateCh:
 	case <-a.ctx.Done():
 		return false
 	default:
 	}
 
 	select {
-	case a.updateCh <- msg:
+	case a.updateCh <- lastVersion:
 		return true
 	case <-a.ctx.Done():
 		return false
@@ -233,3 +233,129 @@ func (r *alertRulesRegistry) getDiff(rules map[models.AlertRuleKey]*models.Alert
 	}
 	return result
 }
+
+type fingerprint uint64
+
+func (f fingerprint) String() string {
+	return fmt.Sprintf("%016x", uint64(f))
+}
+
+// fingerprintSeparator used during calculation of fingerprint to separate different fields. Contains a byte sequence that cannot happen in UTF-8 strings.
+var fingerprintSeparator = []byte{255}
+
+type ruleWithFolder struct {
+	rule        *models.AlertRule
+	folderTitle string
+}
+
+// fingerprint calculates a fingerprint that includes all fields except rule's Version and Update timestamp.
+func (r ruleWithFolder) Fingerprint() fingerprint {
+	rule := r.rule
+
+	sum := fnv.New64()
+
+	writeBytes := func(b []byte) {
+		_, _ = sum.Write(b)
+		_, _ = sum.Write(fingerprintSeparator)
+	}
+	writeString := func(s string) {
+		if len(s) == 0 {
+			writeBytes(nil)
+			return
+		}
+		// TODO fix it when upgraded to in GO1.20 to
+		/*
+			writeBytes(unsafe.Slice(unsafe.StringData(s), len(s))) //nolint:gosec
+		*/
+		// avoid allocation when converting string to byte slice
+		writeBytes(*(*[]byte)(unsafe.Pointer(&s))) //nolint:gosec
+	}
+	// this temp slice is used to convert ints to bytes.
+	tmp := make([]byte, 8)
+	writeInt := func(u int64) {
+		binary.LittleEndian.PutUint64(tmp, uint64(u))
+		writeBytes(tmp)
+	}
+
+	// allocate a slice that will be used for sorting keys, so we allocate it only once
+	var keys []string
+	maxLen := int(math.Max(math.Max(float64(len(rule.Annotations)), float64(len(rule.Labels))), float64(len(rule.Data))))
+	if maxLen > 0 {
+		keys = make([]string, maxLen)
+	}
+
+	writeLabels := func(lbls map[string]string) {
+		// maps do not guarantee predictable sequence of keys.
+		// Therefore, to make hash stable, we need to sort keys
+		if len(lbls) == 0 {
+			return
+		}
+		idx := 0
+		for labelName := range lbls {
+			keys[idx] = labelName
+			idx++
+		}
+		sub := keys[:idx]
+		sort.Strings(sub)
+		for _, name := range sub {
+			writeString(name)
+			writeString(lbls[name])
+		}
+	}
+	writeQuery := func() {
+		// The order of queries is not important as they represent an expression tree.
+		// Therefore, the order of elements should not change the hash. Sort by RefID because it is the unique key.
+		for i, q := range rule.Data {
+			keys[i] = q.RefID
+		}
+		sub := keys[:len(rule.Data)]
+		sort.Strings(sub)
+		for _, id := range sub {
+			for _, q := range rule.Data {
+				if q.RefID == id {
+					writeString(q.RefID)
+					writeString(q.DatasourceUID)
+					writeString(q.QueryType)
+					writeInt(int64(q.RelativeTimeRange.From))
+					writeInt(int64(q.RelativeTimeRange.To))
+					writeBytes(q.Model)
+					break
+				}
+			}
+		}
+	}
+
+	// fields that determine the rule state
+	writeString(rule.UID)
+	writeString(rule.Title)
+	writeString(rule.NamespaceUID)
+	writeString(r.folderTitle)
+	writeLabels(rule.Labels)
+	writeString(rule.Condition)
+	writeQuery()
+
+	if rule.IsPaused {
+		writeInt(1)
+	} else {
+		writeInt(0)
+	}
+
+	// fields that do not affect the state.
+	// TODO consider removing fields below from the fingerprint
+	writeInt(rule.ID)
+	writeInt(rule.OrgID)
+	writeInt(rule.IntervalSeconds)
+	writeInt(int64(rule.For))
+	writeLabels(rule.Annotations)
+	if rule.DashboardUID != nil {
+		writeString(*rule.DashboardUID)
+	}
+	if rule.PanelID != nil {
+		writeInt(*rule.PanelID)
+	}
+	writeString(rule.RuleGroup)
+	writeInt(int64(rule.RuleGroupIndex))
+	writeString(string(rule.NoDataState))
+	writeString(string(rule.ExecErrState))
+	return fingerprint(sum.Sum64())
+}
diff --git a/pkg/services/ngalert/schedule/registry_bench_test.go b/pkg/services/ngalert/schedule/registry_bench_test.go
new file mode 100644
index 00000000000..7ab26df885c
--- /dev/null
+++ b/pkg/services/ngalert/schedule/registry_bench_test.go
@@ -0,0 +1,30 @@
+package schedule
+
+import (
+	"fmt"
+	"io"
+	"math/rand"
+	"testing"
+
+	"github.com/google/uuid"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+func BenchmarkRuleWithFolderFingerprint(b *testing.B) {
+	rules := models.GenerateAlertRules(b.N, models.AlertRuleGen(func(rule *models.AlertRule) {
+		rule.Data = make([]models.AlertQuery, 0, 5)
+		for i := 0; i < rand.Intn(5)+1; i++ {
+			rule.Data = append(rule.Data, models.GenerateAlertQuery())
+		}
+	}))
+	folder := uuid.NewString()
+	b.ReportAllocs()
+	b.ResetTimer()
+	var f fingerprint
+	for i := 0; i < b.N; i++ {
+		f = ruleWithFolder{rule: rules[i], folderTitle: folder}.Fingerprint()
+	}
+	b.StopTimer()
+	_, _ = fmt.Fprint(io.Discard, f)
+}
diff --git a/pkg/services/ngalert/schedule/registry_test.go b/pkg/services/ngalert/schedule/registry_test.go
index 04a569b91d4..5b70b6b7978 100644
--- a/pkg/services/ngalert/schedule/registry_test.go
+++ b/pkg/services/ngalert/schedule/registry_test.go
@@ -2,13 +2,16 @@ package schedule
 
 import (
 	"context"
+	"encoding/json"
 	"math"
 	"math/rand"
+	"reflect"
 	"runtime"
 	"sync"
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -27,7 +30,7 @@ func TestSchedule_alertRuleInfo(t *testing.T) {
 			r := newAlertRuleInfo(context.Background())
 			resultCh := make(chan bool)
 			go func() {
-				resultCh <- r.update(ruleVersionAndPauseStatus{ruleVersion(rand.Int63()), false})
+				resultCh <- r.update(ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false})
 			}()
 			select {
 			case <-r.updateCh:
@@ -38,52 +41,26 @@ func TestSchedule_alertRuleInfo(t *testing.T) {
 		})
 		t.Run("update should drop any concurrent sending to updateCh", func(t *testing.T) {
 			r := newAlertRuleInfo(context.Background())
-			version1 := ruleVersion(rand.Int31())
-			version2 := version1 + 1
+			version1 := ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}
+			version2 := ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}
 
 			wg := sync.WaitGroup{}
 			wg.Add(1)
 			go func() {
 				wg.Done()
-				r.update(ruleVersionAndPauseStatus{version1, false})
+				r.update(version1)
 				wg.Done()
 			}()
 			wg.Wait()
 			wg.Add(2) // one when time1 is sent, another when go-routine for time2 has started
 			go func() {
 				wg.Done()
-				r.update(ruleVersionAndPauseStatus{version2, false})
+				r.update(version2)
 			}()
 			wg.Wait() // at this point tick 1 has already been dropped
 			select {
 			case version := <-r.updateCh:
-				require.Equal(t, ruleVersionAndPauseStatus{version2, false}, version)
-			case <-time.After(5 * time.Second):
-				t.Fatal("No message was received on eval channel")
-			}
-		})
-		t.Run("update should drop any concurrent sending to updateCh and use greater version", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			version1 := ruleVersion(rand.Int31())
-			version2 := version1 + 1
-
-			wg := sync.WaitGroup{}
-			wg.Add(1)
-			go func() {
-				wg.Done()
-				r.update(ruleVersionAndPauseStatus{version2, false})
-				wg.Done()
-			}()
-			wg.Wait()
-			wg.Add(2) // one when time1 is sent, another when go-routine for time2 has started
-			go func() {
-				wg.Done()
-				r.update(ruleVersionAndPauseStatus{version1, false})
-			}()
-			wg.Wait() // at this point tick 1 has already been dropped
-			select {
-			case version := <-r.updateCh:
-				require.Equal(t, ruleVersionAndPauseStatus{version2, false}, version)
+				require.Equal(t, version2, version)
 			case <-time.After(5 * time.Second):
 				t.Fatal("No message was received on eval channel")
 			}
@@ -185,7 +162,7 @@ func TestSchedule_alertRuleInfo(t *testing.T) {
 			r := newAlertRuleInfo(context.Background())
 			r.stop(errRuleDeleted)
 			require.ErrorIs(t, r.ctx.Err(), errRuleDeleted)
-			require.False(t, r.update(ruleVersionAndPauseStatus{ruleVersion(rand.Int63()), false}))
+			require.False(t, r.update(ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}))
 		})
 		t.Run("eval should do nothing", func(t *testing.T) {
 			r := newAlertRuleInfo(context.Background())
@@ -237,7 +214,7 @@ func TestSchedule_alertRuleInfo(t *testing.T) {
 					}
 					switch rand.Intn(max) + 1 {
 					case 1:
-						r.update(ruleVersionAndPauseStatus{ruleVersion(rand.Int63()), false})
+						r.update(ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false})
 					case 2:
 						r.eval(&evaluation{
 							scheduledAt: time.Now(),
@@ -368,3 +345,148 @@ func TestSchedulableAlertRulesRegistry_set(t *testing.T) {
 		require.Equal(t, expectedUpdated, diff.updated)
 	})
 }
+
+func TestRuleWithFolderFingerprint(t *testing.T) {
+	rule := models.AlertRuleGen()()
+	title := uuid.NewString()
+	f := ruleWithFolder{rule: rule, folderTitle: title}.Fingerprint()
+	t.Run("should calculate a fingerprint", func(t *testing.T) {
+		require.NotEqual(t, 0, uint64(f))
+	})
+	t.Run("mirror copy should have the same fingerprint", func(t *testing.T) {
+		f2 := ruleWithFolder{rule: models.CopyRule(rule), folderTitle: title}.Fingerprint()
+		require.Equal(t, f, f2)
+	})
+	t.Run("order of queries should not affect the fingerprint", func(t *testing.T) {
+		cp := models.CopyRule(rule)
+		rand.Shuffle(len(cp.Data), func(i, j int) {
+			cp.Data[i], cp.Data[j] = cp.Data[j], cp.Data[i]
+		})
+		f2 := ruleWithFolder{rule: cp, folderTitle: title}.Fingerprint()
+		require.Equal(t, f, f2)
+	})
+	t.Run("folder name should be used in fingerprint", func(t *testing.T) {
+		f2 := ruleWithFolder{rule: rule, folderTitle: uuid.NewString()}.Fingerprint()
+		require.NotEqual(t, f, f2)
+	})
+	t.Run("Version and Updated should be excluded from fingerprint", func(t *testing.T) {
+		cp := models.CopyRule(rule)
+		cp.Version++
+		cp.Updated = cp.Updated.Add(1 * time.Second)
+
+		f2 := ruleWithFolder{rule: cp, folderTitle: title}.Fingerprint()
+		require.Equal(t, f, f2)
+	})
+
+	t.Run("all other fields should be considered", func(t *testing.T) {
+		r1 := &models.AlertRule{
+			ID:        1,
+			OrgID:     2,
+			Title:     "test",
+			Condition: "A",
+			Data: []models.AlertQuery{
+				{
+					RefID:     "1",
+					QueryType: "323",
+					RelativeTimeRange: models.RelativeTimeRange{
+						From: 1,
+						To:   2,
+					},
+					DatasourceUID: "123",
+					Model:         json.RawMessage(`{"test": "test-model"}`),
+				},
+			},
+			Updated:         time.Now(),
+			IntervalSeconds: 2,
+			Version:         1,
+			UID:             "test-uid",
+			NamespaceUID:    "test-ns",
+			DashboardUID:    func(s string) *string { return &s }("dashboard"),
+			PanelID:         func(i int64) *int64 { return &i }(123),
+			RuleGroup:       "test-group",
+			RuleGroupIndex:  1,
+			NoDataState:     "test-nodata",
+			ExecErrState:    "test-err",
+			For:             12,
+			Annotations: map[string]string{
+				"key-annotation": "value-annotation",
+			},
+			Labels: map[string]string{
+				"key-label": "value-label",
+			},
+			IsPaused: false,
+		}
+		r2 := &models.AlertRule{
+			ID:        2,
+			OrgID:     3,
+			Title:     "test-2",
+			Condition: "B",
+			Data: []models.AlertQuery{
+				{
+					RefID:     "2",
+					QueryType: "12313123",
+					RelativeTimeRange: models.RelativeTimeRange{
+						From: 2,
+						To:   3,
+					},
+					DatasourceUID: "asdasdasd21",
+					Model:         json.RawMessage(`{"test": "test-model-2"}`),
+				},
+			},
+			IntervalSeconds: 23,
+			UID:             "test-uid2",
+			NamespaceUID:    "test-ns2",
+			DashboardUID:    func(s string) *string { return &s }("dashboard-2"),
+			PanelID:         func(i int64) *int64 { return &i }(1222),
+			RuleGroup:       "test-group-2",
+			RuleGroupIndex:  22,
+			NoDataState:     "test-nodata2",
+			ExecErrState:    "test-err2",
+			For:             1141,
+			Annotations: map[string]string{
+				"key-annotation2": "value-annotation",
+			},
+			Labels: map[string]string{
+				"key-label": "value-label23",
+			},
+			IsPaused: true,
+		}
+
+		excludedFields := map[string]struct{}{
+			"Version": {},
+			"Updated": {},
+		}
+
+		tp := reflect.TypeOf(rule).Elem()
+		var nonDiffFields []string
+		// making sure that we get completely different struct
+
+		dif := r1.Diff(r2)
+		nonDiffFields = make([]string, 0)
+		for j := 0; j < tp.NumField(); j++ {
+			name := tp.Field(j).Name
+			if _, ok := excludedFields[name]; ok {
+				continue
+			}
+			if len(dif.GetDiffsForField(tp.Field(j).Name)) == 0 {
+				nonDiffFields = append(nonDiffFields, tp.Field(j).Name)
+			}
+		}
+		require.Emptyf(t, nonDiffFields, "cannot generate completely unique alert rule. Some fields are not randomized")
+
+		r2v := reflect.ValueOf(r2).Elem()
+		for i := 0; i < tp.NumField(); i++ {
+			if _, ok := excludedFields[tp.Field(i).Name]; ok {
+				continue
+			}
+			cp := models.CopyRule(r1)
+			v := reflect.ValueOf(cp).Elem()
+			vf := v.Field(i)
+			vf.Set(r2v.Field(i))
+			f2 := ruleWithFolder{rule: cp, folderTitle: title}.Fingerprint()
+			if f2 == f {
+				t.Fatalf("Field %s does not seem to be used in fingerprint. Diff: %s", tp.Field(i).Name, r1.Diff(cp))
+			}
+		}
+	})
+}
diff --git a/pkg/services/ngalert/schedule/schedule.go b/pkg/services/ngalert/schedule/schedule.go
index eefed6e9a4c..16523eb8754 100644
--- a/pkg/services/ngalert/schedule/schedule.go
+++ b/pkg/services/ngalert/schedule/schedule.go
@@ -271,16 +271,18 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 
 		itemFrequency := item.IntervalSeconds / int64(sch.baseInterval.Seconds())
 		isReadyToRun := item.IntervalSeconds != 0 && tickNum%itemFrequency == 0
-		if isReadyToRun {
-			var folderTitle string
-			if !sch.disableGrafanaFolder {
-				title, ok := folderTitles[item.NamespaceUID]
-				if ok {
-					folderTitle = title
-				} else {
-					missingFolder[item.NamespaceUID] = append(missingFolder[item.NamespaceUID], item.UID)
-				}
+
+		var folderTitle string
+		if !sch.disableGrafanaFolder {
+			title, ok := folderTitles[item.NamespaceUID]
+			if ok {
+				folderTitle = title
+			} else {
+				missingFolder[item.NamespaceUID] = append(missingFolder[item.NamespaceUID], item.UID)
 			}
+		}
+
+		if isReadyToRun {
 			readyToRun = append(readyToRun, readyToRunItem{ruleInfo: ruleInfo, evaluation: evaluation{
 				scheduledAt: tick,
 				rule:        item,
@@ -292,8 +294,8 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 			sch.log.Debug("Rule has been updated. Notifying evaluation routine", key.LogContext()...)
 			go func(ri *alertRuleInfo, rule *ngmodels.AlertRule) {
 				ri.update(ruleVersionAndPauseStatus{
-					Version:  ruleVersion(rule.Version),
-					IsPaused: rule.IsPaused,
+					Fingerprint: ruleWithFolder{rule: rule, folderTitle: folderTitle}.Fingerprint(),
+					IsPaused:    rule.IsPaused,
 				})
 			}(ruleInfo, item)
 			updatedRules = append(updatedRules, ngmodels.AlertRuleKeyWithVersion{
@@ -369,8 +371,8 @@ func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertR
 		notify(states)
 	}
 
-	evaluate := func(ctx context.Context, attempt int64, e *evaluation, span tracing.Span) {
-		logger := logger.New("version", e.rule.Version, "attempt", attempt, "now", e.scheduledAt)
+	evaluate := func(ctx context.Context, f fingerprint, attempt int64, e *evaluation, span tracing.Span) {
+		logger := logger.New("version", e.rule.Version, "fingerprint", f, "attempt", attempt, "now", e.scheduledAt)
 		start := sch.clock.Now()
 
 		evalCtx := eval.NewContext(ctx, SchedulerUserFor(e.rule.OrgID))
@@ -450,24 +452,21 @@ func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertR
 	}
 
 	evalRunning := false
-	var currentRuleVersion int64 = 0
+	var currentFingerprint fingerprint
 	defer sch.stopApplied(key)
 	for {
 		select {
 		// used by external services (API) to notify that rule is updated.
 		case ctx := <-updateCh:
-			// sometimes it can happen when, for example, the rule evaluation took so long,
-			// and there were two concurrent messages in updateCh and evalCh, and the eval's one got processed first.
-			// therefore, at the time when message from updateCh is processed the current rule will have
-			// at least the same version (or greater) and the state created for the new version of the rule.
-			if currentRuleVersion >= int64(ctx.Version) {
-				logger.Info("Skip updating rule because its current version is actual", "version", currentRuleVersion, "newVersion", ctx.Version)
+			if currentFingerprint == ctx.Fingerprint {
+				logger.Info("Rule's fingerprint has not changed. Skip resetting the state", "currentFingerprint", currentFingerprint)
 				continue
 			}
 
-			logger.Info("Clearing the state of the rule because it was updated", "version", currentRuleVersion, "newVersion", ctx.Version, "isPaused", ctx.IsPaused)
+			logger.Info("Clearing the state of the rule because it was updated", "isPaused", ctx.IsPaused, "fingerprint", ctx.Fingerprint)
 			// clear the state. So the next evaluation will start from the scratch.
 			resetState(grafanaCtx, ctx.IsPaused)
+			currentFingerprint = ctx.Fingerprint
 		// evalCh - used by the scheduler to signal that evaluation is needed.
 		case ctx, ok := <-evalCh:
 			if !ok {
@@ -486,21 +485,24 @@ func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertR
 				}()
 
 				err := retryIfError(func(attempt int64) error {
-					newVersion := ctx.rule.Version
 					isPaused := ctx.rule.IsPaused
-					// fetch latest alert rule version
-					if currentRuleVersion != newVersion {
-						// Do not clean up state if the eval loop has just started.
-						// We need to reset state if the loop has started and the alert is already paused. It can happen,
-						// if we have an alert with state and we do file provision with stateful Grafana, that state
-						// lingers in DB and won't be cleaned up until next alert rule update.
-						if currentRuleVersion > 0 || isPaused {
-							logger.Debug("Got a new version of alert rule. Clear up the state and refresh extra labels", "version", currentRuleVersion, "newVersion", newVersion)
-							resetState(grafanaCtx, isPaused)
-						}
-						currentRuleVersion = newVersion
+					f := ruleWithFolder{ctx.rule, ctx.folderTitle}.Fingerprint()
+					// Do not clean up state if the eval loop has just started.
+					var needReset bool
+					if currentFingerprint != 0 && currentFingerprint != f {
+						logger.Debug("Got a new version of alert rule. Clear up the state", "fingerprint", f)
+						needReset = true
 					}
+					// We need to reset state if the loop has started and the alert is already paused. It can happen,
+					// if we have an alert with state and we do file provision with stateful Grafana, that state
+					// lingers in DB and won't be cleaned up until next alert rule update.
+					needReset = needReset || (currentFingerprint == 0 && isPaused)
+					if needReset {
+						resetState(grafanaCtx, isPaused)
+					}
+					currentFingerprint = f
 					if isPaused {
+						logger.Debug("Skip rule evaluation because it is paused")
 						return nil
 					}
 					tracingCtx, span := sch.tracer.Start(grafanaCtx, "alert rule execution")
@@ -509,10 +511,12 @@ func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertR
 					span.SetAttributes("rule_uid", ctx.rule.UID, attribute.String("rule_uid", ctx.rule.UID))
 					span.SetAttributes("org_id", ctx.rule.OrgID, attribute.Int64("org_id", ctx.rule.OrgID))
 					span.SetAttributes("rule_version", ctx.rule.Version, attribute.Int64("rule_version", ctx.rule.Version))
+					fpStr := currentFingerprint.String()
+					span.SetAttributes("rule_fingerprint", fpStr, attribute.String("rule_fingerprint", fpStr))
 					utcTick := ctx.scheduledAt.UTC().Format(time.RFC3339Nano)
 					span.SetAttributes("tick", utcTick, attribute.String("tick", utcTick))
 
-					evaluate(tracingCtx, attempt, ctx, span)
+					evaluate(tracingCtx, f, attempt, ctx, span)
 					return nil
 				})
 				if err != nil {
diff --git a/pkg/services/ngalert/schedule/schedule_unit_test.go b/pkg/services/ngalert/schedule/schedule_unit_test.go
index 47eca4f16fd..1e003cc4d93 100644
--- a/pkg/services/ngalert/schedule/schedule_unit_test.go
+++ b/pkg/services/ngalert/schedule/schedule_unit_test.go
@@ -530,6 +530,8 @@ func TestSchedule_ruleRoutine(t *testing.T) {
 
 	t.Run("when a message is sent to update channel", func(t *testing.T) {
 		rule := models.AlertRuleGen(withQueryForState(t, eval.Normal))()
+		folderTitle := "folderName"
+		ruleFp := ruleWithFolder{rule, folderTitle}.Fingerprint()
 
 		evalChan := make(chan *evaluation)
 		evalAppliedChan := make(chan time.Time)
@@ -540,7 +542,7 @@ func TestSchedule_ruleRoutine(t *testing.T) {
 
 		sch, ruleStore, _, _ := createSchedule(evalAppliedChan, &sender)
 		ruleStore.PutRule(context.Background(), rule)
-		sch.schedulableAlertRules.set([]*models.AlertRule{rule}, map[string]string{rule.NamespaceUID: "folderName"})
+		sch.schedulableAlertRules.set([]*models.AlertRule{rule}, map[string]string{rule.NamespaceUID: folderTitle})
 
 		go func() {
 			ctx, cancel := context.WithCancel(context.Background())
@@ -552,6 +554,7 @@ func TestSchedule_ruleRoutine(t *testing.T) {
 		evalChan <- &evaluation{
 			scheduledAt: sch.clock.Now(),
 			rule:        rule,
+			folderTitle: folderTitle,
 		}
 
 		waitForTimeChannel(t, evalAppliedChan)
@@ -584,9 +587,8 @@ func TestSchedule_ruleRoutine(t *testing.T) {
 		require.Greaterf(t, expectedToBeSent, 0, "State manager was expected to return at least one state that can be expired")
 
 		t.Run("should do nothing if version in channel is the same", func(t *testing.T) {
-			updateChan <- ruleVersionAndPauseStatus{ruleVersion(rule.Version - 1), false}
-			updateChan <- ruleVersionAndPauseStatus{ruleVersion(rule.Version), false}
-			updateChan <- ruleVersionAndPauseStatus{ruleVersion(rule.Version), false} // second time just to make sure that previous messages were handled
+			updateChan <- ruleVersionAndPauseStatus{ruleFp, false}
+			updateChan <- ruleVersionAndPauseStatus{ruleFp, false} // second time just to make sure that previous messages were handled
 
 			actualStates := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
 			require.Len(t, actualStates, len(states))
@@ -595,7 +597,7 @@ func TestSchedule_ruleRoutine(t *testing.T) {
 		})
 
 		t.Run("should clear the state and expire firing alerts if version in channel is greater", func(t *testing.T) {
-			updateChan <- ruleVersionAndPauseStatus{ruleVersion(rule.Version + rand.Int63n(1000) + 1), false}
+			updateChan <- ruleVersionAndPauseStatus{ruleFp + 1, false}
 
 			require.Eventually(t, func() bool {
 				return len(sender.Calls) > 0

From 91471ac7ae5734823ee79b466ecbc60a16379589 Mon Sep 17 00:00:00 2001
From: Matthew Jacobson <matthew.jacobson@grafana.com>
Date: Fri, 28 Apr 2023 10:56:59 -0400
Subject: [PATCH 535/729] Alerting: Template Testing API (#67450)

---
 go.mod                                        |   2 +-
 go.sum                                        |   8 +-
 pkg/services/ngalert/api/api.go               |   1 +
 pkg/services/ngalert/api/api_alertmanager.go  |  32 ++++
 .../ngalert/api/api_alertmanager_test.go      |  40 ++++
 pkg/services/ngalert/api/authorization.go     |   3 +
 .../ngalert/api/authorization_test.go         |   2 +-
 .../ngalert/api/forking_alertmanager.go       |   4 +
 .../api/generated_base_api_alertmanager.go    |  19 ++
 pkg/services/ngalert/api/tooling/api.json     | 111 ++++++++++-
 .../api/tooling/definitions/alertmanager.go   |  63 +++++++
 pkg/services/ngalert/api/tooling/post.json    | 155 +++++++++++++++-
 pkg/services/ngalert/api/tooling/spec.json    | 155 +++++++++++++++-
 pkg/services/ngalert/notifier/alertmanager.go |  56 +-----
 .../ngalert/notifier/alertmanager_test.go     |   1 +
 pkg/services/ngalert/notifier/config.go       |  34 ++--
 pkg/services/ngalert/notifier/templates.go    |  63 +++++++
 .../ngalert/notifier/templates_test.go        | 174 ++++++++++++++++++
 .../api_alertmanager_configuration_test.go    |   2 +-
 19 files changed, 847 insertions(+), 78 deletions(-)
 create mode 100644 pkg/services/ngalert/notifier/templates.go
 create mode 100644 pkg/services/ngalert/notifier/templates_test.go

diff --git a/go.mod b/go.mod
index c9d423ef3c8..fe506135986 100644
--- a/go.mod
+++ b/go.mod
@@ -57,7 +57,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/google/wire v0.5.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/grafana/alerting v0.0.0-20230426193323-4f09f516596b
+	github.com/grafana/alerting v0.0.0-20230428095912-33c5aa68a5ba
 	github.com/grafana/grafana-aws-sdk v0.12.0
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
 	github.com/grafana/grafana-plugin-sdk-go v0.160.0
diff --git a/go.sum b/go.sum
index 1443b20fec4..d60b20df894 100644
--- a/go.sum
+++ b/go.sum
@@ -1275,8 +1275,12 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/alerting v0.0.0-20230426193323-4f09f516596b h1:dAHlNtW62HcSh+XmhV7kmcWqnOSnYsw/pGHiEyix544=
-github.com/grafana/alerting v0.0.0-20230426193323-4f09f516596b/go.mod h1:5edgy6tQY4+W2wuJdi8g2GjbVmpJufguy7QGIRl2q4o=
+github.com/grafana/alerting v0.0.0-20230427200804-f8565cd8b74b h1:SyatotlHGK+05AxICctry09ZEawhE0AasWpOifljH4M=
+github.com/grafana/alerting v0.0.0-20230427200804-f8565cd8b74b/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
+github.com/grafana/alerting v0.0.0-20230428094731-e067f119be06 h1:g+J4UGslzpi9Kt+846NDAjGtVyt8K9Lgjj/vUh61yK0=
+github.com/grafana/alerting v0.0.0-20230428094731-e067f119be06/go.mod h1:5edgy6tQY4+W2wuJdi8g2GjbVmpJufguy7QGIRl2q4o=
+github.com/grafana/alerting v0.0.0-20230428095912-33c5aa68a5ba h1:aNTu22ojw4XY24DYNAuvw8v/5iFUNk2bkdTeeWQ5+0o=
+github.com/grafana/alerting v0.0.0-20230428095912-33c5aa68a5ba/go.mod h1:5edgy6tQY4+W2wuJdi8g2GjbVmpJufguy7QGIRl2q4o=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
 github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
 github.com/grafana/cuetsy v0.1.8 h1:l0AKXfHr0clu6qPirirDzNC/W5mqq5gG7iruOVolG34=
diff --git a/pkg/services/ngalert/api/api.go b/pkg/services/ngalert/api/api.go
index 1c6e54fa257..08fedec5108 100644
--- a/pkg/services/ngalert/api/api.go
+++ b/pkg/services/ngalert/api/api.go
@@ -52,6 +52,7 @@ type Alertmanager interface {
 	// Receivers
 	GetReceivers(ctx context.Context) []apimodels.Receiver
 	TestReceivers(ctx context.Context, c apimodels.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error)
+	TestTemplate(ctx context.Context, c apimodels.TestTemplatesConfigBodyParams) (*notifier.TestTemplatesResults, error)
 }
 
 type AlertingStore interface {
diff --git a/pkg/services/ngalert/api/api_alertmanager.go b/pkg/services/ngalert/api/api_alertmanager.go
index 3c3c18b6fd0..b61469f97b6 100644
--- a/pkg/services/ngalert/api/api_alertmanager.go
+++ b/pkg/services/ngalert/api/api_alertmanager.go
@@ -342,6 +342,20 @@ func (srv AlertmanagerSrv) RoutePostTestReceivers(c *contextmodel.ReqContext, bo
 	return response.JSON(statusForTestReceivers(result.Receivers), newTestReceiversResult(result))
 }
 
+func (srv AlertmanagerSrv) RoutePostTestTemplates(c *contextmodel.ReqContext, body apimodels.TestTemplatesConfigBodyParams) response.Response {
+	am, errResp := srv.AlertmanagerFor(c.OrgID)
+	if errResp != nil {
+		return errResp
+	}
+
+	res, err := am.TestTemplate(c.Req.Context(), body)
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "", err)
+	}
+
+	return response.JSON(http.StatusOK, newTestTemplateResult(res))
+}
+
 // contextWithTimeoutFromRequest returns a context with a deadline set from the
 // Request-Timeout header in the HTTP request. If the header is absent then the
 // context will use the default timeout. The timeout in the Request-Timeout
@@ -433,6 +447,24 @@ func statusForTestReceivers(v []notifier.TestReceiverResult) int {
 	}
 }
 
+func newTestTemplateResult(res *notifier.TestTemplatesResults) apimodels.TestTemplatesResults {
+	apiRes := apimodels.TestTemplatesResults{}
+	for _, r := range res.Results {
+		apiRes.Results = append(apiRes.Results, apimodels.TestTemplatesResult{
+			Name: r.Name,
+			Text: r.Text,
+		})
+	}
+	for _, e := range res.Errors {
+		apiRes.Errors = append(apiRes.Errors, apimodels.TestTemplatesErrorResult{
+			Name:    e.Name,
+			Kind:    apimodels.TemplateErrorKind(e.Kind),
+			Message: e.Error.Error(),
+		})
+	}
+	return apiRes
+}
+
 func (srv AlertmanagerSrv) AlertmanagerFor(orgID int64) (Alertmanager, *response.NormalResponse) {
 	am, err := srv.mam.AlertmanagerFor(orgID)
 	if err == nil {
diff --git a/pkg/services/ngalert/api/api_alertmanager_test.go b/pkg/services/ngalert/api/api_alertmanager_test.go
index 94c29dfbf2d..25bea2612f8 100644
--- a/pkg/services/ngalert/api/api_alertmanager_test.go
+++ b/pkg/services/ngalert/api/api_alertmanager_test.go
@@ -421,6 +421,46 @@ func TestRoutePostGrafanaAlertingConfigHistoryActivate(t *testing.T) {
 	})
 }
 
+func TestRoutePostTestTemplates(t *testing.T) {
+	sut := createSut(t, nil)
+
+	t.Run("assert 404 when no alertmanager found", func(tt *testing.T) {
+		req, err := http.NewRequest(http.MethodGet, "https://grafana.net", nil)
+		require.NoError(tt, err)
+		q := req.URL.Query()
+		req.URL.RawQuery = q.Encode()
+
+		rc := createRequestCtxInOrg(10)
+
+		response := sut.RoutePostTestTemplates(rc, apimodels.TestTemplatesConfigBodyParams{})
+		require.Equal(tt, 404, response.Status())
+	})
+
+	t.Run("assert 409 when alertmanager not ready", func(tt *testing.T) {
+		req, err := http.NewRequest(http.MethodGet, "https://grafana.net", nil)
+		require.NoError(tt, err)
+		q := req.URL.Query()
+		req.URL.RawQuery = q.Encode()
+
+		rc := createRequestCtxInOrg(3)
+
+		response := sut.RoutePostTestTemplates(rc, apimodels.TestTemplatesConfigBodyParams{})
+		require.Equal(tt, 409, response.Status())
+	})
+
+	t.Run("assert 200 for a valid alertmanager", func(tt *testing.T) {
+		req, err := http.NewRequest(http.MethodGet, "https://grafana.net", nil)
+		require.NoError(tt, err)
+		q := req.URL.Query()
+		req.URL.RawQuery = q.Encode()
+
+		rc := createRequestCtxInOrg(1)
+
+		response := sut.RoutePostTestTemplates(rc, apimodels.TestTemplatesConfigBodyParams{})
+		require.Equal(tt, 200, response.Status())
+	})
+}
+
 func TestSilenceCreate(t *testing.T) {
 	makeSilence := func(comment string, createdBy string,
 		startsAt, endsAt strfmt.DateTime, matchers amv2.Matchers) amv2.Silence {
diff --git a/pkg/services/ngalert/api/authorization.go b/pkg/services/ngalert/api/authorization.go
index 418b5692634..865cc96a418 100644
--- a/pkg/services/ngalert/api/authorization.go
+++ b/pkg/services/ngalert/api/authorization.go
@@ -173,6 +173,9 @@ func (api *API) authorize(method, path string) web.Handler {
 	case http.MethodPost + "/api/alertmanager/grafana/config/api/v1/receivers/test":
 		fallback = middleware.ReqEditorRole
 		eval = ac.EvalPermission(ac.ActionAlertingNotificationsRead)
+	case http.MethodPost + "/api/alertmanager/grafana/config/api/v1/templates/test":
+		fallback = middleware.ReqSignedIn
+		eval = ac.EvalPermission(ac.ActionAlertingNotificationsRead)
 
 	// External Alertmanager Paths
 	case http.MethodDelete + "/api/alertmanager/{DatasourceUID}/config/api/v1/alerts":
diff --git a/pkg/services/ngalert/api/authorization_test.go b/pkg/services/ngalert/api/authorization_test.go
index 528644021af..05848122d13 100644
--- a/pkg/services/ngalert/api/authorization_test.go
+++ b/pkg/services/ngalert/api/authorization_test.go
@@ -49,7 +49,7 @@ func TestAuthorize(t *testing.T) {
 		}
 		paths[p] = methods
 	}
-	require.Len(t, paths, 47)
+	require.Len(t, paths, 48)
 
 	ac := acmock.New()
 	api := &API{AccessControl: ac}
diff --git a/pkg/services/ngalert/api/forking_alertmanager.go b/pkg/services/ngalert/api/forking_alertmanager.go
index 78b87ded9a0..39be2570e4f 100644
--- a/pkg/services/ngalert/api/forking_alertmanager.go
+++ b/pkg/services/ngalert/api/forking_alertmanager.go
@@ -189,3 +189,7 @@ func (f *AlertmanagerApiHandler) handleRouteGetGrafanaReceivers(ctx *contextmode
 func (f *AlertmanagerApiHandler) handleRoutePostTestGrafanaReceivers(ctx *contextmodel.ReqContext, conf apimodels.TestReceiversConfigBodyParams) response.Response {
 	return f.GrafanaSvc.RoutePostTestReceivers(ctx, conf)
 }
+
+func (f *AlertmanagerApiHandler) handleRoutePostTestGrafanaTemplates(ctx *contextmodel.ReqContext, conf apimodels.TestTemplatesConfigBodyParams) response.Response {
+	return f.GrafanaSvc.RoutePostTestTemplates(ctx, conf)
+}
diff --git a/pkg/services/ngalert/api/generated_base_api_alertmanager.go b/pkg/services/ngalert/api/generated_base_api_alertmanager.go
index 145b0c33ea4..244ad5fbba2 100644
--- a/pkg/services/ngalert/api/generated_base_api_alertmanager.go
+++ b/pkg/services/ngalert/api/generated_base_api_alertmanager.go
@@ -44,6 +44,7 @@ type AlertmanagerApi interface {
 	RoutePostGrafanaAlertingConfig(*contextmodel.ReqContext) response.Response
 	RoutePostGrafanaAlertingConfigHistoryActivate(*contextmodel.ReqContext) response.Response
 	RoutePostTestGrafanaReceivers(*contextmodel.ReqContext) response.Response
+	RoutePostTestGrafanaTemplates(*contextmodel.ReqContext) response.Response
 }
 
 func (f *AlertmanagerApiHandler) RouteCreateGrafanaSilence(ctx *contextmodel.ReqContext) response.Response {
@@ -181,6 +182,14 @@ func (f *AlertmanagerApiHandler) RoutePostTestGrafanaReceivers(ctx *contextmodel
 	}
 	return f.handleRoutePostTestGrafanaReceivers(ctx, conf)
 }
+func (f *AlertmanagerApiHandler) RoutePostTestGrafanaTemplates(ctx *contextmodel.ReqContext) response.Response {
+	// Parse Request Body
+	conf := apimodels.TestTemplatesConfigBodyParams{}
+	if err := web.Bind(ctx.Req, &conf); err != nil {
+		return response.Error(http.StatusBadRequest, "bad request data", err)
+	}
+	return f.handleRoutePostTestGrafanaTemplates(ctx, conf)
+}
 
 func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics.API) {
 	api.RouteRegister.Group("", func(group routing.RouteRegister) {
@@ -434,5 +443,15 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
 				m,
 			),
 		)
+		group.Post(
+			toMacaronPath("/api/alertmanager/grafana/config/api/v1/templates/test"),
+			api.authorize(http.MethodPost, "/api/alertmanager/grafana/config/api/v1/templates/test"),
+			metrics.Instrument(
+				http.MethodPost,
+				"/api/alertmanager/grafana/config/api/v1/templates/test",
+				api.Hooks.Wrap(srv.RoutePostTestGrafanaTemplates),
+				m,
+			),
+		)
 	}, middleware.ReqSignedIn)
 }
diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json
index d989685b0b8..bdb1ac22de1 100644
--- a/pkg/services/ngalert/api/tooling/api.json
+++ b/pkg/services/ngalert/api/tooling/api.json
@@ -299,6 +299,10 @@
   "AlertingRule": {
    "description": "adapted from cortex",
    "properties": {
+    "activeAt": {
+     "format": "date-time",
+     "type": "string"
+    },
     "alerts": {
      "items": {
       "$ref": "#/definitions/Alert"
@@ -339,6 +343,20 @@
      "description": "State can be \"pending\", \"firing\", \"inactive\".",
      "type": "string"
     },
+    "totals": {
+     "additionalProperties": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "object"
+    },
+    "totalsFiltered": {
+     "additionalProperties": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "object"
+    },
     "type": {
      "$ref": "#/definitions/RuleType"
     }
@@ -350,7 +368,7 @@
     "type",
     "state",
     "annotations",
-    "alerts"
+    "activeAt"
    ],
    "type": "object"
   },
@@ -2845,6 +2863,13 @@
       "$ref": "#/definitions/RuleGroup"
      },
      "type": "array"
+    },
+    "totals": {
+     "additionalProperties": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "object"
     }
    },
    "required": [
@@ -2878,6 +2903,13 @@
       "$ref": "#/definitions/AlertingRule"
      },
      "type": "array"
+    },
+    "totals": {
+     "additionalProperties": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "object"
     }
    },
    "required": [
@@ -3343,6 +3375,77 @@
    },
    "type": "object"
   },
+  "TestTemplatesConfigBodyParams": {
+   "properties": {
+    "alerts": {
+     "description": "Alerts to use as data when testing the template.",
+     "items": {
+      "$ref": "#/definitions/postableAlert"
+     },
+     "type": "array"
+    },
+    "name": {
+     "description": "Name of the template file.",
+     "type": "string"
+    },
+    "template": {
+     "description": "Template string to test.",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "TestTemplatesErrorResult": {
+   "properties": {
+    "kind": {
+     "description": "Kind of template error that occurred.",
+     "enum": [
+      "invalid_template",
+      "execution_error"
+     ],
+     "type": "string"
+    },
+    "message": {
+     "description": "Error message.",
+     "type": "string"
+    },
+    "name": {
+     "description": "Name of the associated template for this error. Will be empty if the Kind is \"invalid_template\".",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "TestTemplatesResult": {
+   "properties": {
+    "name": {
+     "description": "Name of the associated template definition for this result.",
+     "type": "string"
+    },
+    "text": {
+     "description": "Interpolated value of the template.",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "TestTemplatesResults": {
+   "properties": {
+    "errors": {
+     "items": {
+      "$ref": "#/definitions/TestTemplatesErrorResult"
+     },
+     "type": "array"
+    },
+    "results": {
+     "items": {
+      "$ref": "#/definitions/TestTemplatesResult"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
   "Threshold": {
    "description": "Threshold a single step on the threshold list",
    "properties": {
@@ -3644,7 +3747,6 @@
    "type": "object"
   },
   "alertGroup": {
-   "description": "AlertGroup alert group",
    "properties": {
     "alerts": {
      "description": "alerts",
@@ -3829,13 +3931,13 @@
    "type": "object"
   },
   "gettableAlerts": {
+   "description": "GettableAlerts gettable alerts",
    "items": {
     "$ref": "#/definitions/gettableAlert"
    },
    "type": "array"
   },
   "gettableSilence": {
-   "description": "GettableSilence gettable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3891,7 +3993,6 @@
    "type": "array"
   },
   "integration": {
-   "description": "Integration integration",
    "properties": {
     "lastNotifyAttempt": {
      "description": "A timestamp indicating the last attempt to deliver a notification regardless of the outcome.\nFormat: date-time",
@@ -4035,7 +4136,6 @@
    "type": "array"
   },
   "postableSilence": {
-   "description": "PostableSilence postable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -4073,6 +4173,7 @@
    "type": "object"
   },
   "receiver": {
+   "description": "Receiver receiver",
    "properties": {
     "active": {
      "description": "active",
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
index 720eb99cf4c..b9d06f56419 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
@@ -168,6 +168,19 @@ import (
 //       408: Failure
 //       409: AlertManagerNotReady
 
+// swagger:route POST /api/alertmanager/grafana/config/api/v1/templates/test alertmanager RoutePostTestGrafanaTemplates
+//
+// Test Grafana managed templates without saving them.
+//     Produces:
+//     - application/json
+//
+//     Responses:
+//
+//       200: TestTemplatesResults
+//       400: ValidationError
+//       403: PermissionDenied
+//       409: AlertManagerNotReady
+
 // swagger:route GET /api/alertmanager/grafana/api/v2/silences alertmanager RouteGetGrafanaSilences
 //
 // get silences
@@ -293,6 +306,56 @@ type TestReceiverConfigResult struct {
 	Error  string `json:"error,omitempty"`
 }
 
+// swagger:parameters RoutePostTestGrafanaTemplates
+type TestTemplatesConfigParams struct {
+	// in:body
+	Body TestTemplatesConfigBodyParams
+}
+
+type TestTemplatesConfigBodyParams struct {
+	// Alerts to use as data when testing the template.
+	Alerts []*amv2.PostableAlert `json:"alerts"`
+
+	// Template string to test.
+	Template string `json:"template"`
+
+	// Name of the template file.
+	Name string `json:"name"`
+}
+
+// swagger:model
+type TestTemplatesResults struct {
+	Results []TestTemplatesResult      `json:"results,omitempty"`
+	Errors  []TestTemplatesErrorResult `json:"errors,omitempty"`
+}
+
+type TestTemplatesResult struct {
+	// Name of the associated template definition for this result.
+	Name string `json:"name"`
+
+	// Interpolated value of the template.
+	Text string `json:"text"`
+}
+
+type TestTemplatesErrorResult struct {
+	// Name of the associated template for this error. Will be empty if the Kind is "invalid_template".
+	Name string `json:"name,omitempty"`
+
+	// Kind of template error that occurred.
+	Kind TemplateErrorKind `json:"kind"`
+
+	// Error message.
+	Message string `json:"message"`
+}
+
+// swagger:enum TemplateErrorKind
+type TemplateErrorKind string
+
+const (
+	InvalidTemplate TemplateErrorKind = "invalid_template"
+	ExecutionError  TemplateErrorKind = "execution_error"
+)
+
 // swagger:parameters RouteCreateSilence RouteCreateGrafanaSilence
 type CreateSilenceParams struct {
 	// in:body
diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json
index a4f647fe6b0..0314e936ba8 100644
--- a/pkg/services/ngalert/api/tooling/post.json
+++ b/pkg/services/ngalert/api/tooling/post.json
@@ -299,6 +299,10 @@
   "AlertingRule": {
    "description": "adapted from cortex",
    "properties": {
+    "activeAt": {
+     "format": "date-time",
+     "type": "string"
+    },
     "alerts": {
      "items": {
       "$ref": "#/definitions/Alert"
@@ -339,6 +343,20 @@
      "description": "State can be \"pending\", \"firing\", \"inactive\".",
      "type": "string"
     },
+    "totals": {
+     "additionalProperties": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "object"
+    },
+    "totalsFiltered": {
+     "additionalProperties": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "object"
+    },
     "type": {
      "$ref": "#/definitions/RuleType"
     }
@@ -350,7 +368,7 @@
     "type",
     "state",
     "annotations",
-    "alerts"
+    "activeAt"
    ],
    "type": "object"
   },
@@ -2845,6 +2863,13 @@
       "$ref": "#/definitions/RuleGroup"
      },
      "type": "array"
+    },
+    "totals": {
+     "additionalProperties": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "object"
     }
    },
    "required": [
@@ -2878,6 +2903,13 @@
       "$ref": "#/definitions/AlertingRule"
      },
      "type": "array"
+    },
+    "totals": {
+     "additionalProperties": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "object"
     }
    },
    "required": [
@@ -3343,6 +3375,77 @@
    },
    "type": "object"
   },
+  "TestTemplatesConfigBodyParams": {
+   "properties": {
+    "alerts": {
+     "description": "Alerts to use as data when testing the template.",
+     "items": {
+      "$ref": "#/definitions/postableAlert"
+     },
+     "type": "array"
+    },
+    "name": {
+     "description": "Name of the template file.",
+     "type": "string"
+    },
+    "template": {
+     "description": "Template string to test.",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "TestTemplatesErrorResult": {
+   "properties": {
+    "kind": {
+     "description": "Kind of template error that occurred.",
+     "enum": [
+      "invalid_template",
+      "execution_error"
+     ],
+     "type": "string"
+    },
+    "message": {
+     "description": "Error message.",
+     "type": "string"
+    },
+    "name": {
+     "description": "Name of the associated template for this error. Will be empty if the Kind is \"invalid_template\".",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "TestTemplatesResult": {
+   "properties": {
+    "name": {
+     "description": "Name of the associated template definition for this result.",
+     "type": "string"
+    },
+    "text": {
+     "description": "Interpolated value of the template.",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "TestTemplatesResults": {
+   "properties": {
+    "errors": {
+     "items": {
+      "$ref": "#/definitions/TestTemplatesErrorResult"
+     },
+     "type": "array"
+    },
+    "results": {
+     "items": {
+      "$ref": "#/definitions/TestTemplatesResult"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
   "Threshold": {
    "description": "Threshold a single step on the threshold list",
    "properties": {
@@ -3668,6 +3771,7 @@
    "type": "object"
   },
   "alertGroups": {
+   "description": "AlertGroups alert groups",
    "items": {
     "$ref": "#/definitions/alertGroup"
    },
@@ -3888,6 +3992,7 @@
    "type": "array"
   },
   "integration": {
+   "description": "Integration integration",
    "properties": {
     "lastNotifyAttempt": {
      "description": "A timestamp indicating the last attempt to deliver a notification regardless of the outcome.\nFormat: date-time",
@@ -4031,7 +4136,6 @@
    "type": "array"
   },
   "postableSilence": {
-   "description": "PostableSilence postable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -4606,6 +4710,53 @@
     ]
    }
   },
+  "/api/alertmanager/grafana/config/api/v1/templates/test": {
+   "post": {
+    "operationId": "RoutePostTestGrafanaTemplates",
+    "parameters": [
+     {
+      "in": "body",
+      "name": "Body",
+      "schema": {
+       "$ref": "#/definitions/TestTemplatesConfigBodyParams"
+      }
+     }
+    ],
+    "produces": [
+     "application/json"
+    ],
+    "responses": {
+     "200": {
+      "description": "TestTemplatesResults",
+      "schema": {
+       "$ref": "#/definitions/TestTemplatesResults"
+      }
+     },
+     "400": {
+      "description": "ValidationError",
+      "schema": {
+       "$ref": "#/definitions/ValidationError"
+      }
+     },
+     "403": {
+      "description": "PermissionDenied",
+      "schema": {
+       "$ref": "#/definitions/PermissionDenied"
+      }
+     },
+     "409": {
+      "description": "AlertManagerNotReady",
+      "schema": {
+       "$ref": "#/definitions/AlertManagerNotReady"
+      }
+     }
+    },
+    "summary": "Test Grafana managed templates without saving them.",
+    "tags": [
+     "alertmanager"
+    ]
+   }
+  },
   "/api/alertmanager/grafana/config/history": {
    "get": {
     "description": "gets Alerting configurations that were successfully applied in the past",
diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json
index 65794ac1b02..0d51eafecd2 100644
--- a/pkg/services/ngalert/api/tooling/spec.json
+++ b/pkg/services/ngalert/api/tooling/spec.json
@@ -435,6 +435,53 @@
         }
       }
     },
+    "/api/alertmanager/grafana/config/api/v1/templates/test": {
+      "post": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "alertmanager"
+        ],
+        "summary": "Test Grafana managed templates without saving them.",
+        "operationId": "RoutePostTestGrafanaTemplates",
+        "parameters": [
+          {
+            "name": "Body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/TestTemplatesConfigBodyParams"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "TestTemplatesResults",
+            "schema": {
+              "$ref": "#/definitions/TestTemplatesResults"
+            }
+          },
+          "400": {
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
+          },
+          "403": {
+            "description": "PermissionDenied",
+            "schema": {
+              "$ref": "#/definitions/PermissionDenied"
+            }
+          },
+          "409": {
+            "description": "AlertManagerNotReady",
+            "schema": {
+              "$ref": "#/definitions/AlertManagerNotReady"
+            }
+          }
+        }
+      }
+    },
     "/api/alertmanager/grafana/config/history": {
       "get": {
         "description": "gets Alerting configurations that were successfully applied in the past",
@@ -3016,9 +3063,13 @@
         "type",
         "state",
         "annotations",
-        "alerts"
+        "activeAt"
       ],
       "properties": {
+        "activeAt": {
+          "type": "string",
+          "format": "date-time"
+        },
         "alerts": {
           "type": "array",
           "items": {
@@ -3059,6 +3110,20 @@
           "description": "State can be \"pending\", \"firing\", \"inactive\".",
           "type": "string"
         },
+        "totals": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "totalsFiltered": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
         "type": {
           "$ref": "#/definitions/RuleType"
         }
@@ -5563,6 +5628,13 @@
           "items": {
             "$ref": "#/definitions/RuleGroup"
           }
+        },
+        "totals": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "integer",
+            "format": "int64"
+          }
         }
       }
     },
@@ -5599,6 +5671,13 @@
           "items": {
             "$ref": "#/definitions/AlertingRule"
           }
+        },
+        "totals": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "integer",
+            "format": "int64"
+          }
         }
       }
     },
@@ -6057,6 +6136,77 @@
         }
       }
     },
+    "TestTemplatesConfigBodyParams": {
+      "type": "object",
+      "properties": {
+        "alerts": {
+          "description": "Alerts to use as data when testing the template.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/postableAlert"
+          }
+        },
+        "name": {
+          "description": "Name of the template file.",
+          "type": "string"
+        },
+        "template": {
+          "description": "Template string to test.",
+          "type": "string"
+        }
+      }
+    },
+    "TestTemplatesErrorResult": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "description": "Kind of template error that occurred.",
+          "type": "string",
+          "enum": [
+            "invalid_template",
+            "execution_error"
+          ]
+        },
+        "message": {
+          "description": "Error message.",
+          "type": "string"
+        },
+        "name": {
+          "description": "Name of the associated template for this error. Will be empty if the Kind is \"invalid_template\".",
+          "type": "string"
+        }
+      }
+    },
+    "TestTemplatesResult": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of the associated template definition for this result.",
+          "type": "string"
+        },
+        "text": {
+          "description": "Interpolated value of the template.",
+          "type": "string"
+        }
+      }
+    },
+    "TestTemplatesResults": {
+      "type": "object",
+      "properties": {
+        "errors": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TestTemplatesErrorResult"
+          }
+        },
+        "results": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TestTemplatesResult"
+          }
+        }
+      }
+    },
     "Threshold": {
       "description": "Threshold a single step on the threshold list",
       "type": "object",
@@ -6383,6 +6533,7 @@
       "$ref": "#/definitions/alertGroup"
     },
     "alertGroups": {
+      "description": "AlertGroups alert groups",
       "type": "array",
       "items": {
         "$ref": "#/definitions/alertGroup"
@@ -6608,6 +6759,7 @@
       "$ref": "#/definitions/gettableSilences"
     },
     "integration": {
+      "description": "Integration integration",
       "type": "object",
       "required": [
         "name",
@@ -6752,7 +6904,6 @@
       }
     },
     "postableSilence": {
-      "description": "PostableSilence postable silence",
       "type": "object",
       "required": [
         "comment",
diff --git a/pkg/services/ngalert/notifier/alertmanager.go b/pkg/services/ngalert/notifier/alertmanager.go
index e5304520110..8a3090e25e5 100644
--- a/pkg/services/ngalert/notifier/alertmanager.go
+++ b/pkg/services/ngalert/notifier/alertmanager.go
@@ -117,7 +117,8 @@ func newAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store A
 	}
 
 	amcfg := &alertingNotify.GrafanaAlertmanagerConfig{
-		WorkingDirectory:   workingDir,
+		WorkingDirectory:   filepath.Join(cfg.DataPath, workingDir, strconv.Itoa(int(orgID))),
+		ExternalURL:        cfg.AppURL,
 		AlertStoreCallback: nil,
 		PeerTimeout:        cfg.UnifiedAlerting.HAPeerTimeout,
 		Silences:           silencesOptions,
@@ -259,9 +260,10 @@ func (am *Alertmanager) applyConfig(cfg *apimodels.PostableUserConfig, rawConfig
 		cfg.TemplateFiles = map[string]string{}
 	}
 	cfg.TemplateFiles["__default__.tmpl"] = alertingTemplates.DefaultTemplateString
+	cfg.AlertmanagerConfig.Templates = append(cfg.AlertmanagerConfig.Templates, "__default__.tmpl")
 
 	// next, we need to make sure we persist the templates to disk.
-	paths, templatesChanged, err := PersistTemplates(cfg, am.WorkingDirPath())
+	_, templatesChanged, err := PersistTemplates(cfg, am.Base.WorkingDirectory())
 	if err != nil {
 		return false, err
 	}
@@ -272,18 +274,11 @@ func (am *Alertmanager) applyConfig(cfg *apimodels.PostableUserConfig, rawConfig
 		return false, nil
 	}
 
-	// With the templates persisted, create the template list using the paths.
-	tmpl, err := am.Base.TemplateFromPaths(am.Settings.AppURL, paths...)
-	if err != nil {
-		return false, err
-	}
-
 	err = am.Base.ApplyConfig(AlertingConfiguration{
-		RawAlertmanagerConfig:    rawConfig,
-		AlertmanagerConfig:       cfg.AlertmanagerConfig,
-		AlertmanagerTemplates:    tmpl,
-		IntegrationsFunc:         am.buildIntegrationsMap,
-		ReceiverIntegrationsFunc: am.buildReceiverIntegration,
+		rawAlertmanagerConfig:    rawConfig,
+		alertmanagerConfig:       cfg.AlertmanagerConfig,
+		receivers:                PostableApiAlertingConfigToApiReceivers(cfg.AlertmanagerConfig),
+		receiverIntegrationsFunc: am.buildReceiverIntegrations,
 	})
 	if err != nil {
 		return false, err
@@ -310,22 +305,8 @@ func (am *Alertmanager) applyAndMarkConfig(ctx context.Context, hash string, cfg
 	return nil
 }
 
-func (am *Alertmanager) WorkingDirPath() string {
-	return filepath.Join(am.Settings.DataPath, workingDir, strconv.Itoa(int(am.orgID)))
-}
-
-// buildIntegrationsMap builds a map of name to the list of Grafana integration notifiers off of a list of receiver config.
-func (am *Alertmanager) buildIntegrationsMap(receivers []*alertingNotify.APIReceiver, templates *alertingTemplates.Template) (map[string][]*alertingNotify.Integration, error) {
-	integrationsMap := make(map[string][]*alertingNotify.Integration, len(receivers))
-	for _, receiver := range receivers {
-		integrations, err := am.buildReceiverIntegrations(receiver, templates)
-		if err != nil {
-			return nil, err
-		}
-		integrationsMap[receiver.Name] = integrations
-	}
-
-	return integrationsMap, nil
+func (am *Alertmanager) AppURL() string {
+	return am.Settings.AppURL
 }
 
 // buildReceiverIntegrations builds a list of integration notifiers off of a receiver config.
@@ -356,23 +337,6 @@ func (am *Alertmanager) buildReceiverIntegrations(receiver *alertingNotify.APIRe
 	return integrations, nil
 }
 
-func (am *Alertmanager) buildReceiverIntegration(r *alertingNotify.GrafanaIntegrationConfig, tmpl *alertingTemplates.Template) (*alertingNotify.Integration, error) {
-	apiReceiver := &alertingNotify.APIReceiver{
-		GrafanaIntegrations: alertingNotify.GrafanaIntegrations{
-			Integrations: []*alertingNotify.GrafanaIntegrationConfig{r},
-		},
-	}
-	integrations, err := am.buildReceiverIntegrations(apiReceiver, tmpl)
-	if err != nil {
-		return nil, err
-	}
-	if len(integrations) == 0 {
-		// This should not happen, but it is better to return some error rather than having a panic.
-		return nil, fmt.Errorf("failed to build integration")
-	}
-	return integrations[0], nil
-}
-
 // PutAlerts receives the alerts and then sends them through the corresponding route based on whenever the alert has a receiver embedded or not
 func (am *Alertmanager) PutAlerts(postableAlerts apimodels.PostableAlerts) error {
 	alerts := make(alertingNotify.PostableAlerts, 0, len(postableAlerts.PostableAlerts))
diff --git a/pkg/services/ngalert/notifier/alertmanager_test.go b/pkg/services/ngalert/notifier/alertmanager_test.go
index b2a0408745f..d22f51069e4 100644
--- a/pkg/services/ngalert/notifier/alertmanager_test.go
+++ b/pkg/services/ngalert/notifier/alertmanager_test.go
@@ -22,6 +22,7 @@ func setupAMTest(t *testing.T) *Alertmanager {
 	dir := t.TempDir()
 	cfg := &setting.Cfg{
 		DataPath: dir,
+		AppURL:   "http://localhost:9093",
 	}
 
 	m := metrics.NewAlertmanagerMetrics(prometheus.NewRegistry())
diff --git a/pkg/services/ngalert/notifier/config.go b/pkg/services/ngalert/notifier/config.go
index 5acb73c390d..10fb03e47ce 100644
--- a/pkg/services/ngalert/notifier/config.go
+++ b/pkg/services/ngalert/notifier/config.go
@@ -92,18 +92,16 @@ func Load(rawConfig []byte) (*api.PostableUserConfig, error) {
 // AlertingConfiguration provides configuration for an Alertmanager.
 // It implements the notify.Configuration interface.
 type AlertingConfiguration struct {
-	AlertmanagerConfig    api.PostableApiAlertingConfig
-	RawAlertmanagerConfig []byte
+	alertmanagerConfig    api.PostableApiAlertingConfig
+	rawAlertmanagerConfig []byte
 
-	AlertmanagerTemplates *alertingTemplates.Template
-
-	IntegrationsFunc         func(receivers []*alertingNotify.APIReceiver, templates *alertingTemplates.Template) (map[string][]*alertingNotify.Integration, error)
-	ReceiverIntegrationsFunc func(r *alertingNotify.GrafanaIntegrationConfig, tmpl *alertingTemplates.Template) (*alertingNotify.Integration, error)
+	receivers                []*alertingNotify.APIReceiver
+	receiverIntegrationsFunc func(r *alertingNotify.APIReceiver, tmpl *alertingTemplates.Template) ([]*alertingNotify.Integration, error)
 }
 
-func (a AlertingConfiguration) BuildReceiverIntegrationsFunc() func(next *alertingNotify.GrafanaIntegrationConfig, tmpl *alertingTemplates.Template) (alertingNotify.Notifier, error) {
-	return func(next *alertingNotify.GrafanaIntegrationConfig, tmpl *alertingTemplates.Template) (alertingNotify.Notifier, error) {
-		return a.ReceiverIntegrationsFunc(next, tmpl)
+func (a AlertingConfiguration) BuildReceiverIntegrationsFunc() func(next *alertingNotify.APIReceiver, tmpl *alertingTemplates.Template) ([]*alertingNotify.Integration, error) {
+	return func(next *alertingNotify.APIReceiver, tmpl *alertingTemplates.Template) ([]*alertingNotify.Integration, error) {
+		return a.receiverIntegrationsFunc(next, tmpl)
 	}
 }
 
@@ -112,29 +110,29 @@ func (a AlertingConfiguration) DispatcherLimits() alertingNotify.DispatcherLimit
 }
 
 func (a AlertingConfiguration) InhibitRules() []alertingNotify.InhibitRule {
-	return a.AlertmanagerConfig.InhibitRules
+	return a.alertmanagerConfig.InhibitRules
 }
 
 func (a AlertingConfiguration) MuteTimeIntervals() []alertingNotify.MuteTimeInterval {
-	return a.AlertmanagerConfig.MuteTimeIntervals
+	return a.alertmanagerConfig.MuteTimeIntervals
 }
 
-func (a AlertingConfiguration) ReceiverIntegrations() (map[string][]*alertingNotify.Integration, error) {
-	return a.IntegrationsFunc(PostableApiAlertingConfigToApiReceivers(a.AlertmanagerConfig), a.AlertmanagerTemplates)
+func (a AlertingConfiguration) Receivers() []*alertingNotify.APIReceiver {
+	return a.receivers
 }
 
 func (a AlertingConfiguration) RoutingTree() *alertingNotify.Route {
-	return a.AlertmanagerConfig.Route.AsAMRoute()
+	return a.alertmanagerConfig.Route.AsAMRoute()
 }
 
-func (a AlertingConfiguration) Templates() *alertingTemplates.Template {
-	return a.AlertmanagerTemplates
+func (a AlertingConfiguration) Templates() []string {
+	return a.alertmanagerConfig.Templates
 }
 
 func (a AlertingConfiguration) Hash() [16]byte {
-	return md5.Sum(a.RawAlertmanagerConfig)
+	return md5.Sum(a.rawAlertmanagerConfig)
 }
 
 func (a AlertingConfiguration) Raw() []byte {
-	return a.RawAlertmanagerConfig
+	return a.rawAlertmanagerConfig
 }
diff --git a/pkg/services/ngalert/notifier/templates.go b/pkg/services/ngalert/notifier/templates.go
new file mode 100644
index 00000000000..0f34a7e60bd
--- /dev/null
+++ b/pkg/services/ngalert/notifier/templates.go
@@ -0,0 +1,63 @@
+package notifier
+
+import (
+	"context"
+
+	alertingModels "github.com/grafana/alerting/models"
+	alertingNotify "github.com/grafana/alerting/notify"
+	amv2 "github.com/prometheus/alertmanager/api/v2/models"
+	prometheusModel "github.com/prometheus/common/model"
+
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+)
+
+type TestTemplatesResults = alertingNotify.TestTemplatesResults
+
+var (
+	DefaultLabels = map[string]string{
+		prometheusModel.AlertNameLabel:  `alert title`,
+		alertingModels.FolderTitleLabel: `folder title`,
+	}
+	DefaultAnnotations = map[string]string{
+		alertingModels.ValuesAnnotation:       `{"B":22,"C":1}`,
+		alertingModels.ValueStringAnnotation:  `[ var='B' labels={__name__=go_threads, instance=host.docker.internal:3000, job=grafana} value=22 ], [ var='C' labels={__name__=go_threads, instance=host.docker.internal:3000, job=grafana} value=1 ]`,
+		alertingModels.OrgIDAnnotation:        `1`,
+		alertingModels.DashboardUIDAnnotation: `dashboard_uid`,
+		alertingModels.PanelIDAnnotation:      `1`,
+	}
+)
+
+// TestTemplate tests the given template string against the given alerts. Existing templates are used to provide context for the test.
+// If an existing template of the same filename as the one being tested is found, it will not be used as context.
+func (am *Alertmanager) TestTemplate(ctx context.Context, c apimodels.TestTemplatesConfigBodyParams) (*TestTemplatesResults, error) {
+	for _, alert := range c.Alerts {
+		addDefaultLabelsAndAnnotations(alert)
+	}
+
+	return am.Base.TestTemplate(ctx, alertingNotify.TestTemplatesConfigBodyParams{
+		Alerts:   c.Alerts,
+		Template: c.Template,
+		Name:     c.Name,
+	})
+}
+
+// addDefaultLabelsAndAnnotations is a slimmed down version of schedule.stateToPostableAlert and schedule.getRuleExtraLabels using default values.
+func addDefaultLabelsAndAnnotations(alert *amv2.PostableAlert) {
+	if alert.Labels == nil {
+		alert.Labels = make(map[string]string)
+	}
+	for k, v := range DefaultLabels {
+		if _, ok := alert.Labels[k]; !ok {
+			alert.Labels[k] = v
+		}
+	}
+
+	if alert.Annotations == nil {
+		alert.Annotations = make(map[string]string)
+	}
+	for k, v := range DefaultAnnotations {
+		if _, ok := alert.Annotations[k]; !ok {
+			alert.Annotations[k] = v
+		}
+	}
+}
diff --git a/pkg/services/ngalert/notifier/templates_test.go b/pkg/services/ngalert/notifier/templates_test.go
new file mode 100644
index 00000000000..a5806405642
--- /dev/null
+++ b/pkg/services/ngalert/notifier/templates_test.go
@@ -0,0 +1,174 @@
+package notifier
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/go-openapi/strfmt"
+	alertingModels "github.com/grafana/alerting/models"
+	alertingNotify "github.com/grafana/alerting/notify"
+	amv2 "github.com/prometheus/alertmanager/api/v2/models"
+	prometheusModel "github.com/prometheus/common/model"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+)
+
+var (
+	simpleAlert = amv2.PostableAlert{
+		Alert: amv2.Alert{
+			Labels: amv2.LabelSet{"__alert_rule_uid__": "rule uid", "alertname": "alert1", "lbl1": "val1"},
+		},
+		Annotations: amv2.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertImageToken__": "test-image-1"},
+		StartsAt:    strfmt.DateTime{},
+		EndsAt:      strfmt.DateTime{},
+	}
+)
+
+func TestTemplateDefaultData(t *testing.T) {
+	am := setupAMTest(t)
+
+	tests := []struct {
+		name     string
+		input    apimodels.TestTemplatesConfigBodyParams
+		expected TestTemplatesResults
+	}{{
+		name: "check various extended data",
+		input: apimodels.TestTemplatesConfigBodyParams{
+			Alerts: []*amv2.PostableAlert{&simpleAlert},
+			Name:   "slack.title",
+			Template: `{{ define "slack.title" }}
+Receiver: {{ .Receiver }}
+Status: {{ .Status }}
+ExternalURL: {{ .ExternalURL }}
+Alerts: {{ len .Alerts }}
+Firing Alerts: {{ len .Alerts.Firing }}
+Resolved Alerts: {{ len .Alerts.Resolved }}
+GroupLabels: {{ range .GroupLabels.SortedPairs }}{{ .Name }}={{ .Value }} {{ end }}
+CommonLabels: {{ range .CommonLabels.SortedPairs }}{{ .Name }}={{ .Value }} {{ end }}
+CommonAnnotations: {{ range .CommonAnnotations.SortedPairs }}{{ .Name }}={{ .Value }} {{ end }}
+{{ end }}`,
+		},
+		expected: TestTemplatesResults{
+			Results: []alertingNotify.TestTemplatesResult{{
+				Name: "slack.title",
+				Text: "\nReceiver: TestReceiver\nStatus: firing\nExternalURL: http://localhost:9093\nAlerts: 1\nFiring Alerts: 1\nResolved Alerts: 0\nGroupLabels: group_label=group_label_value \nCommonLabels: alertname=alert1 grafana_folder=folder title lbl1=val1 \nCommonAnnotations: ann1=annv1 \n",
+			}},
+			Errors: nil,
+		},
+	}, {
+		name: "AlertNameLabel",
+		input: apimodels.TestTemplatesConfigBodyParams{
+			Alerts:   []*amv2.PostableAlert{{}},
+			Name:     "slack.title",
+			Template: fmt.Sprintf(`{{ define "slack.title" }}{{ index (index .Alerts 0 ).Labels "%s" }}{{ end }}`, prometheusModel.AlertNameLabel),
+		},
+		expected: TestTemplatesResults{
+			Results: []alertingNotify.TestTemplatesResult{{
+				Name: "slack.title",
+				Text: DefaultLabels[prometheusModel.AlertNameLabel],
+			}},
+			Errors: nil,
+		},
+	}, {
+		name: "FolderTitleLabel",
+		input: apimodels.TestTemplatesConfigBodyParams{
+			Alerts:   []*amv2.PostableAlert{{}},
+			Name:     "slack.title",
+			Template: fmt.Sprintf(`{{ define "slack.title" }}{{ index (index .Alerts 0 ).Labels "%s" }}{{ end }}`, alertingModels.FolderTitleLabel),
+		},
+		expected: TestTemplatesResults{
+			Results: []alertingNotify.TestTemplatesResult{{
+				Name: "slack.title",
+				Text: DefaultLabels[alertingModels.FolderTitleLabel],
+			}},
+			Errors: nil,
+		},
+	}, {
+		name: "ValuesAnnotation",
+		input: apimodels.TestTemplatesConfigBodyParams{
+			Alerts:   []*amv2.PostableAlert{{}},
+			Name:     "slack.title",
+			Template: `{{ define "slack.title" }}{{ range $key, $value := (index .Alerts 0 ).Values }}{{ $key }}={{ $value }} {{ end }}{{ end }}`,
+		},
+		expected: TestTemplatesResults{
+			Results: []alertingNotify.TestTemplatesResult{{
+				Name: "slack.title",
+				Text: "B=22 C=1 ",
+			}},
+			Errors: nil,
+		},
+	}, {
+		name: "ValueStringAnnotation",
+		input: apimodels.TestTemplatesConfigBodyParams{
+			Alerts:   []*amv2.PostableAlert{{}},
+			Name:     "slack.title",
+			Template: `{{ define "slack.title" }}{{ (index .Alerts 0 ).ValueString }}{{ end }}`,
+		},
+		expected: TestTemplatesResults{
+			Results: []alertingNotify.TestTemplatesResult{{
+				Name: "slack.title",
+				Text: DefaultAnnotations[alertingModels.ValueStringAnnotation],
+			}},
+			Errors: nil,
+		},
+	}, {
+		name: "DashboardURL generation contains DashboardUIDAnnotation and OrgIDAnnotation ",
+		input: apimodels.TestTemplatesConfigBodyParams{
+			Alerts:   []*amv2.PostableAlert{{}},
+			Name:     "slack.title",
+			Template: `{{ define "slack.title" }}{{ (index .Alerts 0 ).DashboardURL }}{{ end }}`,
+		},
+		expected: TestTemplatesResults{
+			Results: []alertingNotify.TestTemplatesResult{{
+				Name: "slack.title",
+				Text: fmt.Sprintf("http://localhost:9093/d/%s?orgId=%s",
+					DefaultAnnotations[alertingModels.DashboardUIDAnnotation],
+					DefaultAnnotations[alertingModels.OrgIDAnnotation]),
+			}},
+			Errors: nil,
+		},
+	}, {
+		name: "PanelURL generation contains DashboardUIDAnnotation, PanelIDAnnotation, and OrgIDAnnotation ",
+		input: apimodels.TestTemplatesConfigBodyParams{
+			Alerts:   []*amv2.PostableAlert{{}},
+			Name:     "slack.title",
+			Template: `{{ define "slack.title" }}{{ (index .Alerts 0 ).PanelURL }}{{ end }}`,
+		},
+		expected: TestTemplatesResults{
+			Results: []alertingNotify.TestTemplatesResult{{
+				Name: "slack.title",
+				Text: fmt.Sprintf("http://localhost:9093/d/%s?orgId=%s&viewPanel=%s",
+					DefaultAnnotations[alertingModels.DashboardUIDAnnotation],
+					DefaultAnnotations[alertingModels.OrgIDAnnotation],
+					DefaultAnnotations[alertingModels.PanelIDAnnotation]),
+			}},
+			Errors: nil,
+		},
+	}, {
+		name: "GeneratorURL generation ",
+		input: apimodels.TestTemplatesConfigBodyParams{
+			Alerts:   []*amv2.PostableAlert{{Alert: amv2.Alert{GeneratorURL: "http://localhost:3000"}}},
+			Name:     "slack.title",
+			Template: `{{ define "slack.title" }}{{ (index .Alerts 0 ).GeneratorURL }}{{ end }}`,
+		},
+		expected: TestTemplatesResults{
+			Results: []alertingNotify.TestTemplatesResult{{
+				Name: "slack.title",
+				Text: fmt.Sprintf("http://localhost:3000?orgId=%s", DefaultAnnotations[alertingModels.OrgIDAnnotation]),
+			}},
+			Errors: nil,
+		},
+	},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			res, err := am.TestTemplate(context.Background(), test.input)
+			require.NoError(t, err)
+			assert.Equal(t, test.expected, *res)
+		})
+	}
+}
diff --git a/pkg/tests/api/alerting/api_alertmanager_configuration_test.go b/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
index 9ab9a901f6f..6382a78ca65 100644
--- a/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
+++ b/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
@@ -102,7 +102,7 @@ func TestIntegrationAlertmanagerConfigurationIsTransactional(t *testing.T) {
 		require.NoError(t, err)
 		var res map[string]interface{}
 		require.NoError(t, json.Unmarshal(b, &res))
-		require.Regexp(t, `^failed to save and apply Alertmanager configuration: failed to build integration map: failed to validate integration "slack.receiver" \(UID [^\)]+\) of type "slack": token must be specified when using the Slack chat API`, res["message"])
+		require.Regexp(t, `^failed to save and apply Alertmanager configuration: failed to validate integration "slack.receiver" \(UID [^\)]+\) of type "slack": token must be specified when using the Slack chat API`, res["message"])
 		resp = getRequest(t, alertConfigURL, http.StatusOK) // nolint
 
 		require.JSONEq(t, defaultAlertmanagerConfigJSON, getBody(t, resp.Body))

From b5a2c3c7f50b0735a21a533d50d3fa33a5f57faa Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Fri, 28 Apr 2023 16:03:51 +0100
Subject: [PATCH 536/729] Query History: Remove migration (#67470)

---
 .../developers/http_api/query_history.md      |  59 ---------
 pkg/services/queryhistory/api.go              |  40 ------
 pkg/services/queryhistory/database.go         |  60 ---------
 pkg/services/queryhistory/models.go           |  21 ---
 pkg/services/queryhistory/queryhistory.go     |   5 -
 .../queryhistory/queryhistory_migrate_test.go | 120 ------------------
 public/api-merged.json                        |  84 ------------
 .../history/RichHistoryRemoteStorage.test.ts  |  12 --
 .../core/history/RichHistoryRemoteStorage.ts  |  29 +----
 .../history/richHistoryLocalStorageUtils.ts   |   1 -
 public/app/core/utils/richHistory.test.ts     |  31 -----
 public/app/core/utils/richHistory.ts          |  45 +------
 .../app/features/explore/QueryRows.test.tsx   |   1 -
 .../features/explore/spec/helper/setup.tsx    |  17 ---
 .../explore/spec/queryHistory.test.tsx        |  56 +-------
 public/app/features/explore/state/history.ts  |  21 ---
 public/app/features/explore/state/main.ts     |   9 --
 public/app/types/explore.ts                   |   5 -
 public/openapi3.json                          |  64 ----------
 19 files changed, 3 insertions(+), 677 deletions(-)
 delete mode 100644 pkg/services/queryhistory/queryhistory_migrate_test.go

diff --git a/docs/sources/developers/http_api/query_history.md b/docs/sources/developers/http_api/query_history.md
index ea932f047f0..b6d1d01877a 100644
--- a/docs/sources/developers/http_api/query_history.md
+++ b/docs/sources/developers/http_api/query_history.md
@@ -335,62 +335,3 @@ Status codes:
 - **200** – OK
 - **401** – Unauthorized
 - **500** – Internal error
-
-## Migrate queries to Query history
-
-`POST /api/query-history/migrate`
-
-Migrates multiple queries in to query history.
-
-**Example request:**
-
-```http
-POST /api/query-history HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-{
-  "queries": [
-    {
-      "datasourceUid": "PE1C5CBDA0504A6A3",
-      "queries": [
-        {
-          "refId": "A",
-          "key": "Q-87fed8e3-62ba-4eb2-8d2a-4129979bb4de-0",
-          "scenarioId": "csv_content",
-          "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-          }
-        }
-      ],
-      "starred": false,
-      "createdAt": 1643630762,
-      "comment": "debugging"
-    }
-  ]
-}
-```
-
-JSON body schema:
-
-- **queries** – JSON of query history items.
-
-**Example response:**
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-{
-  "message": "Query history successfully migrated",
-  "totalCount": 105,
-  "starredCount": 10
-}
-```
-
-Status codes:
-
-- **200** – OK
-- **400** - Errors (invalid JSON, missing or invalid fields)
-- **401** – Unauthorized
-- **500** – Internal error
diff --git a/pkg/services/queryhistory/api.go b/pkg/services/queryhistory/api.go
index 43a9fed05eb..3b47185ced1 100644
--- a/pkg/services/queryhistory/api.go
+++ b/pkg/services/queryhistory/api.go
@@ -20,8 +20,6 @@ func (s *QueryHistoryService) registerAPIEndpoints() {
 		entities.Post("/star/:uid", middleware.ReqSignedIn, routing.Wrap(s.starHandler))
 		entities.Delete("/star/:uid", middleware.ReqSignedIn, routing.Wrap(s.unstarHandler))
 		entities.Patch("/:uid", middleware.ReqSignedIn, routing.Wrap(s.patchCommentHandler))
-		// Remove migrate endpoint in Grafana v10 as breaking change
-		entities.Post("/migrate", middleware.ReqSignedIn, routing.Wrap(s.migrateHandler))
 	})
 }
 
@@ -189,31 +187,6 @@ func (s *QueryHistoryService) unstarHandler(c *contextmodel.ReqContext) response
 	return response.JSON(http.StatusOK, QueryHistoryResponse{Result: query})
 }
 
-// swagger:route POST /query-history/migrate query_history migrateQueries
-//
-// Migrate queries to query history.
-//
-// Adds multiple queries to query history.
-//
-// Responses:
-// 200: getQueryHistoryMigrationResponse
-// 400: badRequestError
-// 401: unauthorisedError
-// 500: internalServerError
-func (s *QueryHistoryService) migrateHandler(c *contextmodel.ReqContext) response.Response {
-	cmd := MigrateQueriesToQueryHistoryCommand{}
-	if err := web.Bind(c.Req, &cmd); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-
-	totalCount, starredCount, err := s.MigrateQueriesToQueryHistory(c.Req.Context(), c.SignedInUser, cmd)
-	if err != nil {
-		return response.Error(http.StatusInternalServerError, "Failed to migrate query history", err)
-	}
-
-	return response.JSON(http.StatusOK, QueryHistoryMigrationResponse{Message: "Query history successfully migrated", TotalCount: totalCount, StarredCount: starredCount})
-}
-
 // swagger:parameters starQuery patchQueryComment deleteQuery unstarQuery
 type QueryHistoryByUID struct {
 	// in:path
@@ -275,13 +248,6 @@ type PatchQueryCommentParams struct {
 	Body PatchQueryCommentInQueryHistoryCommand `json:"body"`
 }
 
-// swagger:parameters migrateQueries
-type MigrateQueriesParams struct {
-	// in:body
-	// required:true
-	Body MigrateQueriesToQueryHistoryCommand `json:"body"`
-}
-
 //swagger:response getQueryHistorySearchResponse
 type GetQueryHistorySearchResponse struct {
 	// in: body
@@ -299,9 +265,3 @@ type GetQueryHistoryDeleteQueryResponse struct {
 	// in: body
 	Body QueryHistoryDeleteQueryResponse `json:"body"`
 }
-
-// swagger:response getQueryHistoryMigrationResponse
-type GetQueryHistoryMigrationResponse struct {
-	// in: body
-	Body QueryHistoryMigrationResponse `json:"body"`
-}
diff --git a/pkg/services/queryhistory/database.go b/pkg/services/queryhistory/database.go
index 512f74fbd1b..9122462d23a 100644
--- a/pkg/services/queryhistory/database.go
+++ b/pkg/services/queryhistory/database.go
@@ -2,7 +2,6 @@ package queryhistory
 
 import (
 	"context"
-	"fmt"
 	"strconv"
 
 	"github.com/grafana/grafana/pkg/infra/db"
@@ -271,65 +270,6 @@ func (s QueryHistoryService) unstarQuery(ctx context.Context, user *user.SignedI
 	return dto, nil
 }
 
-// migrateQueries adds multiple queries into query history
-func (s QueryHistoryService) migrateQueries(ctx context.Context, usr *user.SignedInUser, cmd MigrateQueriesToQueryHistoryCommand) (int, int, error) {
-	queryHistories := make([]*QueryHistory, 0, len(cmd.Queries))
-	starredQueries := make([]*QueryHistoryStar, 0)
-
-	err := s.store.WithTransactionalDbSession(ctx, func(session *db.Session) error {
-		for _, query := range cmd.Queries {
-			uid := util.GenerateShortUID()
-			queryHistories = append(queryHistories, &QueryHistory{
-				OrgID:         usr.OrgID,
-				UID:           uid,
-				Queries:       query.Queries,
-				DatasourceUID: query.DatasourceUID,
-				CreatedBy:     usr.UserID,
-				CreatedAt:     query.CreatedAt,
-				Comment:       query.Comment,
-			})
-
-			if query.Starred {
-				starredQueries = append(starredQueries, &QueryHistoryStar{
-					UserID:   usr.UserID,
-					QueryUID: uid,
-				})
-			}
-		}
-
-		batchSize := 50
-		var err error
-		for i := 0; i < len(queryHistories); i += batchSize {
-			j := i + batchSize
-			if j > len(queryHistories) {
-				j = len(queryHistories)
-			}
-			_, err = session.InsertMulti(queryHistories[i:j])
-			if err != nil {
-				return err
-			}
-		}
-
-		for i := 0; i < len(starredQueries); i += batchSize {
-			j := i + batchSize
-			if j > len(starredQueries) {
-				j = len(starredQueries)
-			}
-			_, err = session.InsertMulti(starredQueries[i:j])
-			if err != nil {
-				return err
-			}
-		}
-		return err
-	})
-
-	if err != nil {
-		return 0, 0, fmt.Errorf("failed to migrate query history: %w", err)
-	}
-
-	return len(queryHistories), len(starredQueries), nil
-}
-
 func (s QueryHistoryService) deleteStaleQueries(ctx context.Context, olderThan int64) (int, error) {
 	var rowsCount int64
 
diff --git a/pkg/services/queryhistory/models.go b/pkg/services/queryhistory/models.go
index 98d646365a6..e1f60ca2c3f 100644
--- a/pkg/services/queryhistory/models.go
+++ b/pkg/services/queryhistory/models.go
@@ -74,20 +74,6 @@ type QueryHistoryDeleteQueryResponse struct {
 	Message string `json:"message"`
 }
 
-type QueryToMigrate struct {
-	DatasourceUID string           `json:"datasourceUid"`
-	Queries       *simplejson.Json `json:"queries"`
-	CreatedAt     int64            `json:"createdAt"`
-	Comment       string           `json:"comment"`
-	Starred       bool             `json:"starred"`
-}
-
-type QueryHistoryMigrationResponse struct {
-	Message      string `json:"message"`
-	TotalCount   int    `json:"totalCount"`
-	StarredCount int    `json:"starredCount"`
-}
-
 // CreateQueryInQueryHistoryCommand is the command for adding query history
 // swagger:model
 type CreateQueryInQueryHistoryCommand struct {
@@ -105,10 +91,3 @@ type PatchQueryCommentInQueryHistoryCommand struct {
 	// Updated comment
 	Comment string `json:"comment"`
 }
-
-// MigrateQueriesToQueryHistoryCommand is the command used for migration of old queries into query history
-// swagger:model
-type MigrateQueriesToQueryHistoryCommand struct {
-	// Array of queries to store in query history.
-	Queries []QueryToMigrate `json:"queries"`
-}
diff --git a/pkg/services/queryhistory/queryhistory.go b/pkg/services/queryhistory/queryhistory.go
index 2f963a262f4..deb7d8d640e 100644
--- a/pkg/services/queryhistory/queryhistory.go
+++ b/pkg/services/queryhistory/queryhistory.go
@@ -35,7 +35,6 @@ type Service interface {
 	PatchQueryCommentInQueryHistory(ctx context.Context, user *user.SignedInUser, UID string, cmd PatchQueryCommentInQueryHistoryCommand) (QueryHistoryDTO, error)
 	StarQueryInQueryHistory(ctx context.Context, user *user.SignedInUser, UID string) (QueryHistoryDTO, error)
 	UnstarQueryInQueryHistory(ctx context.Context, user *user.SignedInUser, UID string) (QueryHistoryDTO, error)
-	MigrateQueriesToQueryHistory(ctx context.Context, user *user.SignedInUser, cmd MigrateQueriesToQueryHistoryCommand) (int, int, error)
 	DeleteStaleQueriesInQueryHistory(ctx context.Context, olderThan int64) (int, error)
 	EnforceRowLimitInQueryHistory(ctx context.Context, limit int, starredQueries bool) (int, error)
 }
@@ -72,10 +71,6 @@ func (s QueryHistoryService) UnstarQueryInQueryHistory(ctx context.Context, user
 	return s.unstarQuery(ctx, user, UID)
 }
 
-func (s QueryHistoryService) MigrateQueriesToQueryHistory(ctx context.Context, user *user.SignedInUser, cmd MigrateQueriesToQueryHistoryCommand) (int, int, error) {
-	return s.migrateQueries(ctx, user, cmd)
-}
-
 func (s QueryHistoryService) DeleteStaleQueriesInQueryHistory(ctx context.Context, olderThan int64) (int, error) {
 	return s.deleteStaleQueries(ctx, olderThan)
 }
diff --git a/pkg/services/queryhistory/queryhistory_migrate_test.go b/pkg/services/queryhistory/queryhistory_migrate_test.go
deleted file mode 100644
index 5c2d393a5ba..00000000000
--- a/pkg/services/queryhistory/queryhistory_migrate_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package queryhistory
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-)
-
-func TestIntegrationMigrateQueriesToQueryHistory(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	testScenario(t, "When users tries to migrate 1 query in query history it should succeed",
-		func(t *testing.T, sc scenarioContext) {
-			command := MigrateQueriesToQueryHistoryCommand{
-				Queries: []QueryToMigrate{
-					{
-						DatasourceUID: "NCzh67i",
-						Queries: simplejson.NewFromAny(map[string]interface{}{
-							"expr": "test",
-						}),
-						Comment:   "",
-						Starred:   false,
-						CreatedAt: sc.service.now().Unix(),
-					},
-				},
-			}
-			sc.reqContext.Req.Body = mockRequestBody(command)
-			resp := sc.service.migrateHandler(sc.reqContext)
-			var response QueryHistoryMigrationResponse
-			err := json.Unmarshal(resp.Body(), &response)
-			require.NoError(t, err)
-			require.Equal(t, 200, resp.Status())
-			require.Equal(t, "Query history successfully migrated", response.Message)
-			require.Equal(t, 1, response.TotalCount)
-			require.Equal(t, 0, response.StarredCount)
-		})
-
-	testScenario(t, "When users tries to migrate multiple queries in query history it should succeed",
-		func(t *testing.T, sc scenarioContext) {
-			command := MigrateQueriesToQueryHistoryCommand{
-				Queries: []QueryToMigrate{
-					{
-						DatasourceUID: "NCzh67i",
-						Queries: simplejson.NewFromAny(map[string]interface{}{
-							"expr": "test1",
-						}),
-						Comment:   "",
-						Starred:   false,
-						CreatedAt: sc.service.now().Unix(),
-					},
-					{
-						DatasourceUID: "NCzh67i",
-						Queries: simplejson.NewFromAny(map[string]interface{}{
-							"expr": "test2",
-						}),
-						Comment:   "",
-						Starred:   false,
-						CreatedAt: sc.service.now().Unix() - int64(100),
-					},
-					{
-						DatasourceUID: "ABch68f",
-						Queries: simplejson.NewFromAny(map[string]interface{}{
-							"expr": "test3",
-						}),
-						Comment:   "",
-						Starred:   false,
-						CreatedAt: sc.service.now().Unix() - int64(1000),
-					},
-				},
-			}
-			sc.reqContext.Req.Body = mockRequestBody(command)
-			resp := sc.service.migrateHandler(sc.reqContext)
-			var response QueryHistoryMigrationResponse
-			err := json.Unmarshal(resp.Body(), &response)
-			require.NoError(t, err)
-			require.Equal(t, 200, resp.Status())
-			require.Equal(t, "Query history successfully migrated", response.Message)
-			require.Equal(t, 3, response.TotalCount)
-			require.Equal(t, 0, response.StarredCount)
-		})
-
-	testScenario(t, "When users tries to migrate starred and not starred query in query history it should succeed",
-		func(t *testing.T, sc scenarioContext) {
-			command := MigrateQueriesToQueryHistoryCommand{
-				Queries: []QueryToMigrate{
-					{
-						DatasourceUID: "NCzh67i",
-						Queries: simplejson.NewFromAny(map[string]interface{}{
-							"expr": "test1",
-						}),
-						Comment:   "",
-						Starred:   true,
-						CreatedAt: sc.service.now().Unix(),
-					},
-					{
-						DatasourceUID: "NCzh67i",
-						Queries: simplejson.NewFromAny(map[string]interface{}{
-							"expr": "test2",
-						}),
-						Comment:   "",
-						Starred:   false,
-						CreatedAt: sc.service.now().Unix() - int64(100),
-					},
-				},
-			}
-			sc.reqContext.Req.Body = mockRequestBody(command)
-			resp := sc.service.migrateHandler(sc.reqContext)
-			var response QueryHistoryMigrationResponse
-			err := json.Unmarshal(resp.Body(), &response)
-			require.NoError(t, err)
-			require.Equal(t, 200, resp.Status())
-			require.Equal(t, "Query history successfully migrated", response.Message)
-			require.Equal(t, 2, response.TotalCount)
-			require.Equal(t, 1, response.StarredCount)
-		})
-}
diff --git a/public/api-merged.json b/public/api-merged.json
index 64a7f7463c9..3510557e8e7 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -7736,40 +7736,6 @@
         }
       }
     },
-    "/query-history/migrate": {
-      "post": {
-        "description": "Adds multiple queries to query history.",
-        "tags": [
-          "query_history"
-        ],
-        "summary": "Migrate queries to query history.",
-        "operationId": "migrateQueries",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/MigrateQueriesToQueryHistoryCommand"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getQueryHistoryMigrationResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
     "/query-history/star/{query_history_uid}": {
       "post": {
         "description": "Adds star to query in query history as specified by the UID.",
@@ -15042,19 +15008,6 @@
         }
       }
     },
-    "MigrateQueriesToQueryHistoryCommand": {
-      "description": "MigrateQueriesToQueryHistoryCommand is the command used for migration of old queries into query history",
-      "type": "object",
-      "properties": {
-        "queries": {
-          "description": "Array of queries to store in query history.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/QueryToMigrate"
-          }
-        }
-      }
-    },
     "MoveFolderCommand": {
       "description": "MoveFolderCommand captures the information required by the folder service\nto move a folder.",
       "type": "object",
@@ -16406,22 +16359,6 @@
         }
       }
     },
-    "QueryHistoryMigrationResponse": {
-      "type": "object",
-      "properties": {
-        "message": {
-          "type": "string"
-        },
-        "starredCount": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "totalCount": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
-    },
     "QueryHistoryPreference": {
       "type": "object",
       "properties": {
@@ -16554,27 +16491,6 @@
         }
       }
     },
-    "QueryToMigrate": {
-      "type": "object",
-      "properties": {
-        "comment": {
-          "type": "string"
-        },
-        "createdAt": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "datasourceUid": {
-          "type": "string"
-        },
-        "queries": {
-          "$ref": "#/definitions/Json"
-        },
-        "starred": {
-          "type": "boolean"
-        }
-      }
-    },
     "QuotaDTO": {
       "type": "object",
       "properties": {
diff --git a/public/app/core/history/RichHistoryRemoteStorage.test.ts b/public/app/core/history/RichHistoryRemoteStorage.test.ts
index 2e70202c5f6..e105c10c5eb 100644
--- a/public/app/core/history/RichHistoryRemoteStorage.test.ts
+++ b/public/app/core/history/RichHistoryRemoteStorage.test.ts
@@ -173,18 +173,6 @@ describe('RichHistoryRemoteStorage', () => {
     } as Partial<UserPreferencesDTO>);
   });
 
-  it('migrates provided rich history items', async () => {
-    const { richHistoryQuery, dto } = setup();
-    fetchMock.mockReturnValue(of({}));
-    await storage.migrate([richHistoryQuery]);
-    expect(fetchMock).toBeCalledWith({
-      url: '/api/query-history/migrate',
-      method: 'POST',
-      data: { queries: [dto] },
-      showSuccessAlert: false,
-    });
-  });
-
   it('stars query history items', async () => {
     const { richHistoryQuery, dto } = setup();
     postMock.mockResolvedValue({
diff --git a/public/app/core/history/RichHistoryRemoteStorage.ts b/public/app/core/history/RichHistoryRemoteStorage.ts
index f839c6ad89f..daa22e38797 100644
--- a/public/app/core/history/RichHistoryRemoteStorage.ts
+++ b/public/app/core/history/RichHistoryRemoteStorage.ts
@@ -8,7 +8,7 @@ import { PreferencesService } from '../services/PreferencesService';
 import { RichHistorySearchFilters, RichHistorySettings, SortOrder } from '../utils/richHistoryTypes';
 
 import RichHistoryStorage, { RichHistoryStorageWarningDetails } from './RichHistoryStorage';
-import { fromDTO, toDTO } from './remoteStorageConverter';
+import { fromDTO } from './remoteStorageConverter';
 
 export type RichHistoryRemoteStorageDTO = {
   uid: string;
@@ -19,18 +19,6 @@ export type RichHistoryRemoteStorageDTO = {
   queries: DataQuery[];
 };
 
-type RichHistoryRemoteStorageMigrationDTO = {
-  datasourceUid: string;
-  queries: DataQuery[];
-  createdAt: number;
-  starred: boolean;
-  comment: string;
-};
-
-type RichHistoryRemoteStorageMigrationPayloadDTO = {
-  queries: RichHistoryRemoteStorageMigrationDTO[];
-};
-
 type RichHistoryRemoteStorageResultsPayloadDTO = {
   result: {
     queryHistory: RichHistoryRemoteStorageDTO[];
@@ -122,21 +110,6 @@ export default class RichHistoryRemoteStorage implements RichHistoryStorage {
     }
     return fromDTO(dto.result);
   }
-
-  /**
-   * @internal Used only for migration purposes. Will be removed in future.
-   */
-  async migrate(richHistory: RichHistoryQuery[]) {
-    const data: RichHistoryRemoteStorageMigrationPayloadDTO = { queries: richHistory.map(toDTO) };
-    await lastValueFrom(
-      getBackendSrv().fetch({
-        url: '/api/query-history/migrate',
-        method: 'POST',
-        data,
-        showSuccessAlert: false,
-      })
-    );
-  }
 }
 
 function buildQueryParams(filters: RichHistorySearchFilters): string {
diff --git a/public/app/core/history/richHistoryLocalStorageUtils.ts b/public/app/core/history/richHistoryLocalStorageUtils.ts
index 3803f201169..7f58de9a860 100644
--- a/public/app/core/history/richHistoryLocalStorageUtils.ts
+++ b/public/app/core/history/richHistoryLocalStorageUtils.ts
@@ -96,5 +96,4 @@ export const RICH_HISTORY_SETTING_KEYS = {
   starredTabAsFirstTab: 'grafana.explore.richHistory.starredTabAsFirstTab',
   activeDatasourceOnly: 'grafana.explore.richHistory.activeDatasourceOnly',
   datasourceFilters: 'grafana.explore.richHistory.datasourceFilters',
-  migrated: 'grafana.explore.richHistory.migrated',
 };
diff --git a/public/app/core/utils/richHistory.test.ts b/public/app/core/utils/richHistory.test.ts
index c06f1b1f393..4e87f38e748 100644
--- a/public/app/core/utils/richHistory.test.ts
+++ b/public/app/core/utils/richHistory.test.ts
@@ -13,9 +13,7 @@ import {
   createQueryHeading,
   deleteAllFromRichHistory,
   deleteQueryInRichHistory,
-  migrateQueryHistoryFromLocalStorage,
   SortOrder,
-  LocalStorageMigrationStatus,
 } from './richHistory';
 
 const richHistoryStorageMock: RichHistoryStorage = {} as RichHistoryStorage;
@@ -179,35 +177,6 @@ describe('richHistory', () => {
     });
   });
 
-  describe('migration', () => {
-    beforeEach(() => {
-      richHistoryRemoteStorageMock.migrate.mockReset();
-    });
-
-    it('migrates history', async () => {
-      const history = { richHistory: [{ id: 'test' }, { id: 'test2' }], total: 2 };
-
-      richHistoryLocalStorageMock.getRichHistory.mockReturnValue(history);
-      const migrationResult = await migrateQueryHistoryFromLocalStorage();
-      expect(richHistoryRemoteStorageMock.migrate).toBeCalledWith(history.richHistory);
-      expect(migrationResult.status).toBe(LocalStorageMigrationStatus.Successful);
-      expect(migrationResult.error).toBeUndefined();
-    });
-    it('does not migrate if there are no entries', async () => {
-      richHistoryLocalStorageMock.getRichHistory.mockReturnValue({ richHistory: [] });
-      const migrationResult = await migrateQueryHistoryFromLocalStorage();
-      expect(richHistoryRemoteStorageMock.migrate).not.toBeCalled();
-      expect(migrationResult.status).toBe(LocalStorageMigrationStatus.NotNeeded);
-      expect(migrationResult.error).toBeUndefined();
-    });
-    it('propagates thrown errors', async () => {
-      richHistoryLocalStorageMock.getRichHistory.mockRejectedValue(new Error('migration failed'));
-      const migrationResult = await migrateQueryHistoryFromLocalStorage();
-      expect(migrationResult.status).toBe(LocalStorageMigrationStatus.Failed);
-      expect(migrationResult.error?.message).toBe('migration failed');
-    });
-  });
-
   describe('mapNumbertoTimeInSlider', () => {
     it('should correctly map number to value', () => {
       const value = mapNumbertoTimeInSlider(25);
diff --git a/public/app/core/utils/richHistory.ts b/public/app/core/utils/richHistory.ts
index 0e6a8f28b18..9c0b4be0d15 100644
--- a/public/app/core/utils/richHistory.ts
+++ b/public/app/core/utils/richHistory.ts
@@ -4,17 +4,11 @@ import { DataQuery, DataSourceApi, dateTimeFormat, ExploreUrlState, urlUtil } fr
 import { serializeStateToUrlParam } from '@grafana/data/src/utils/url';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { notifyApp } from 'app/core/actions';
-import {
-  createErrorNotification,
-  createSuccessNotification,
-  createWarningNotification,
-} from 'app/core/copy/appNotification';
+import { createErrorNotification, createWarningNotification } from 'app/core/copy/appNotification';
 import { dispatch } from 'app/store/store';
 import { RichHistoryQuery } from 'app/types/explore';
 
 import { config } from '../config';
-import RichHistoryLocalStorage from '../history/RichHistoryLocalStorage';
-import RichHistoryRemoteStorage from '../history/RichHistoryRemoteStorage';
 import {
   RichHistoryResults,
   RichHistoryServiceError,
@@ -134,43 +128,6 @@ export async function deleteQueryInRichHistory(id: string) {
   }
 }
 
-export enum LocalStorageMigrationStatus {
-  Successful = 'successful',
-  Failed = 'failed',
-  NotNeeded = 'not-needed',
-}
-
-export interface LocalStorageMigrationResult {
-  status: LocalStorageMigrationStatus;
-  error?: Error;
-}
-
-export async function migrateQueryHistoryFromLocalStorage(): Promise<LocalStorageMigrationResult> {
-  const richHistoryLocalStorage = new RichHistoryLocalStorage();
-  const richHistoryRemoteStorage = new RichHistoryRemoteStorage();
-
-  try {
-    const { richHistory } = await richHistoryLocalStorage.getRichHistory({
-      datasourceFilters: [],
-      from: 0,
-      search: '',
-      sortOrder: SortOrder.Descending,
-      starred: false,
-      to: 14,
-    });
-    if (richHistory.length === 0) {
-      return { status: LocalStorageMigrationStatus.NotNeeded };
-    }
-    await richHistoryRemoteStorage.migrate(richHistory);
-    dispatch(notifyApp(createSuccessNotification('Query history successfully migrated from local storage')));
-    return { status: LocalStorageMigrationStatus.Successful };
-  } catch (error) {
-    const errorToThrow = error instanceof Error ? error : new Error('Uknown error occurred.');
-    dispatch(notifyApp(createWarningNotification(`Query history migration failed. ${errorToThrow.message}`)));
-    return { status: LocalStorageMigrationStatus.Failed, error: errorToThrow };
-  }
-}
-
 export const createUrlFromRichHistory = (query: RichHistoryQuery) => {
   const exploreState: ExploreUrlState = {
     /* Default range, as we are not saving timerange in rich history */
diff --git a/public/app/features/explore/QueryRows.test.tsx b/public/app/features/explore/QueryRows.test.tsx
index 007b946a2da..2450774c14c 100644
--- a/public/app/features/explore/QueryRows.test.tsx
+++ b/public/app/features/explore/QueryRows.test.tsx
@@ -61,7 +61,6 @@ function setup(queries: DataQuery[]) {
     right: undefined,
     richHistoryStorageFull: false,
     richHistoryLimitExceededWarningShown: false,
-    richHistoryMigrationFailed: false,
   };
   const store = configureStore({ explore: initialState, user: { orgId: 1 } as UserState });
 
diff --git a/public/app/features/explore/spec/helper/setup.tsx b/public/app/features/explore/spec/helper/setup.tsx
index eff78133d9d..3530b4cec9f 100644
--- a/public/app/features/explore/spec/helper/setup.tsx
+++ b/public/app/features/explore/spec/helper/setup.tsx
@@ -22,8 +22,6 @@ import { lastUsedDatasourceKeyForOrgId } from 'app/core/utils/explore';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 import { configureStore } from 'app/store/configureStore';
 
-import { RICH_HISTORY_KEY, RichHistoryLocalStorageDTO } from '../../../../core/history/RichHistoryLocalStorage';
-import { RICH_HISTORY_SETTING_KEYS } from '../../../../core/history/richHistoryLocalStorageUtils';
 import { LokiDatasource } from '../../../../plugins/datasource/loki/datasource';
 import { LokiQuery } from '../../../../plugins/datasource/loki/types';
 import { ExploreId } from '../../../../types';
@@ -196,18 +194,3 @@ export const withinExplore = (exploreId: ExploreId) => {
   const container = screen.getAllByTestId('data-testid Explore');
   return within(container[exploreId === ExploreId.left ? 0 : 1]);
 };
-
-export const localStorageHasAlreadyBeenMigrated = () => {
-  window.localStorage.setItem(RICH_HISTORY_SETTING_KEYS.migrated, 'true');
-};
-
-export const setupLocalStorageRichHistory = (dsName: string) => {
-  const richHistoryDTO: RichHistoryLocalStorageDTO = {
-    ts: Date.now(),
-    datasourceName: dsName,
-    starred: true,
-    comment: '',
-    queries: [{ refId: 'A' }],
-  };
-  window.localStorage.setItem(RICH_HISTORY_KEY, JSON.stringify([richHistoryDTO]));
-};
diff --git a/public/app/features/explore/spec/queryHistory.test.tsx b/public/app/features/explore/spec/queryHistory.test.tsx
index f9d102fa320..952b598c9e2 100644
--- a/public/app/features/explore/spec/queryHistory.test.tsx
+++ b/public/app/features/explore/spec/queryHistory.test.tsx
@@ -31,13 +31,7 @@ import {
   switchToQueryHistoryTab,
 } from './helper/interactions';
 import { makeLogsQueryResponse } from './helper/query';
-import {
-  localStorageHasAlreadyBeenMigrated,
-  setupExplore,
-  setupLocalStorageRichHistory,
-  tearDown,
-  waitForExplore,
-} from './helper/setup';
+import { setupExplore, tearDown, waitForExplore } from './helper/setup';
 
 const fetchMock = jest.fn();
 const postMock = jest.fn();
@@ -225,56 +219,8 @@ describe('Explore: Query History', () => {
     assertDataSourceFilterVisibility(false);
   });
 
-  describe('local storage migration', () => {
-    it('does not migrate if query history is not enabled', async () => {
-      config.queryHistoryEnabled = false;
-      const { datasources } = setupExplore();
-      setupLocalStorageRichHistory('loki');
-      (datasources.loki.query as jest.Mock).mockReturnValueOnce(makeLogsQueryResponse());
-      getMock.mockReturnValue({ result: { queryHistory: [] } });
-      await waitForExplore();
-
-      await openQueryHistory();
-      expect(postMock).not.toBeCalledWith('/api/query-history/migrate', { queries: [] });
-      expect(reportInteractionMock).toBeCalledWith('grafana_explore_query_history_opened', {
-        queryHistoryEnabled: false,
-      });
-    });
-
-    it('migrates query history from local storage', async () => {
-      config.queryHistoryEnabled = true;
-      const { datasources } = setupExplore();
-      setupLocalStorageRichHistory('loki');
-      (datasources.loki.query as jest.Mock).mockReturnValueOnce(makeLogsQueryResponse());
-      fetchMock.mockReturnValue(of({ data: { result: { queryHistory: [] } } }));
-      await waitForExplore();
-
-      await openQueryHistory();
-      expect(fetchMock).toBeCalledWith(
-        expect.objectContaining({
-          url: expect.stringMatching('/api/query-history/migrate'),
-          data: { queries: [expect.objectContaining({ datasourceUid: 'loki-uid' })] },
-        })
-      );
-      fetchMock.mockReset();
-      fetchMock.mockReturnValue(of({ data: { result: { queryHistory: [] } } }));
-
-      await closeQueryHistory();
-      await openQueryHistory();
-      expect(fetchMock).not.toBeCalledWith(
-        expect.objectContaining({
-          url: expect.stringMatching('/api/query-history/migrate'),
-        })
-      );
-      expect(reportInteractionMock).toBeCalledWith('grafana_explore_query_history_opened', {
-        queryHistoryEnabled: true,
-      });
-    });
-  });
-
   it('pagination', async () => {
     config.queryHistoryEnabled = true;
-    localStorageHasAlreadyBeenMigrated();
     const { datasources } = setupExplore();
     (datasources.loki.query as jest.Mock).mockReturnValueOnce(makeLogsQueryResponse());
     fetchMock.mockReturnValue(
diff --git a/public/app/features/explore/state/history.ts b/public/app/features/explore/state/history.ts
index 9697e2eb596..3590dda1df3 100644
--- a/public/app/features/explore/state/history.ts
+++ b/public/app/features/explore/state/history.ts
@@ -1,18 +1,13 @@
 import { AnyAction, createAction } from '@reduxjs/toolkit';
 
 import { HistoryItem } from '@grafana/data';
-import { config, logError } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
-import { RICH_HISTORY_SETTING_KEYS } from 'app/core/history/richHistoryLocalStorageUtils';
-import store from 'app/core/store';
 import {
   addToRichHistory,
   deleteAllFromRichHistory,
   deleteQueryInRichHistory,
   getRichHistory,
   getRichHistorySettings,
-  LocalStorageMigrationStatus,
-  migrateQueryHistoryFromLocalStorage,
   updateCommentInRichHistory,
   updateRichHistorySettings,
   updateStarredInRichHistory,
@@ -24,7 +19,6 @@ import { RichHistorySearchFilters, RichHistorySettings } from '../../../core/uti
 
 import {
   richHistoryLimitExceededAction,
-  richHistoryMigrationFailedAction,
   richHistorySearchFiltersUpdatedAction,
   richHistorySettingsUpdatedAction,
   richHistoryStorageFullAction,
@@ -173,21 +167,6 @@ export const clearRichHistoryResults = (exploreId: ExploreId): ThunkResult<void>
  */
 export const initRichHistory = (): ThunkResult<void> => {
   return async (dispatch, getState) => {
-    const queriesMigrated = store.getBool(RICH_HISTORY_SETTING_KEYS.migrated, false);
-    const migrationFailedDuringThisSession = getState().explore.richHistoryMigrationFailed;
-
-    // Query history migration should always be successful, but in case of unexpected errors we ensure
-    // the migration attempt happens only once per session, and the user is informed about the failure
-    // in a way that can help with potential investigation.
-    if (config.queryHistoryEnabled && !queriesMigrated && !migrationFailedDuringThisSession) {
-      const migrationResult = await migrateQueryHistoryFromLocalStorage();
-      if (migrationResult.status === LocalStorageMigrationStatus.Failed) {
-        dispatch(richHistoryMigrationFailedAction());
-        logError(migrationResult.error!, { explore: { event: 'QueryHistoryMigrationFailed' } });
-      } else {
-        store.set(RICH_HISTORY_SETTING_KEYS.migrated, true);
-      }
-    }
     let settings = getState().explore.richHistorySettings;
     if (!settings) {
       settings = await getRichHistorySettings();
diff --git a/public/app/features/explore/state/main.ts b/public/app/features/explore/state/main.ts
index 53ad7c372aa..18153a8e6de 100644
--- a/public/app/features/explore/state/main.ts
+++ b/public/app/features/explore/state/main.ts
@@ -31,7 +31,6 @@ export const richHistoryUpdatedAction = createAction<{ richHistoryResults: RichH
 );
 export const richHistoryStorageFullAction = createAction('explore/richHistoryStorageFullAction');
 export const richHistoryLimitExceededAction = createAction('explore/richHistoryLimitExceededAction');
-export const richHistoryMigrationFailedAction = createAction('explore/richHistoryMigrationFailedAction');
 
 export const richHistorySettingsUpdatedAction = createAction<RichHistorySettings>('explore/richHistorySettingsUpdated');
 export const richHistorySearchFiltersUpdatedAction = createAction<{
@@ -175,7 +174,6 @@ export const initialExploreState: ExploreState = {
   correlations: undefined,
   richHistoryStorageFull: false,
   richHistoryLimitExceededWarningShown: false,
-  richHistoryMigrationFailed: false,
   largerExploreId: undefined,
   maxedExploreId: undefined,
   evenSplitPanes: true,
@@ -256,13 +254,6 @@ export const exploreReducer = (state = initialExploreState, action: AnyAction):
     };
   }
 
-  if (richHistoryMigrationFailedAction.match(action)) {
-    return {
-      ...state,
-      richHistoryMigrationFailed: true,
-    };
-  }
-
   if (resetExploreAction.match(action)) {
     const leftState = state[ExploreId.left];
     const rightState = state[ExploreId.right];
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index 4c24e6d5e4f..6c523946588 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -65,11 +65,6 @@ export interface ExploreState {
    */
   richHistoryLimitExceededWarningShown: boolean;
 
-  /**
-   * True if a warning message about failed rich history has been shown already in this session.
-   */
-  richHistoryMigrationFailed: boolean;
-
   /**
    * On a split manual resize, we calculate which pane is larger, or if they are roughly the same size. If undefined, it is not split or they are roughly the same size
    */
diff --git a/public/openapi3.json b/public/openapi3.json
index cd0bc5bf846..e57890b10b5 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -6109,19 +6109,6 @@
         ],
         "type": "object"
       },
-      "MigrateQueriesToQueryHistoryCommand": {
-        "description": "MigrateQueriesToQueryHistoryCommand is the command used for migration of old queries into query history",
-        "properties": {
-          "queries": {
-            "description": "Array of queries to store in query history.",
-            "items": {
-              "$ref": "#/components/schemas/QueryToMigrate"
-            },
-            "type": "array"
-          }
-        },
-        "type": "object"
-      },
       "MoveFolderCommand": {
         "description": "MoveFolderCommand captures the information required by the folder service\nto move a folder.",
         "properties": {
@@ -7472,22 +7459,6 @@
         },
         "type": "object"
       },
-      "QueryHistoryMigrationResponse": {
-        "properties": {
-          "message": {
-            "type": "string"
-          },
-          "starredCount": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "totalCount": {
-            "format": "int64",
-            "type": "integer"
-          }
-        },
-        "type": "object"
-      },
       "QueryHistoryPreference": {
         "properties": {
           "homeTab": {
@@ -19262,41 +19233,6 @@
         ]
       }
     },
-    "/query-history/migrate": {
-      "post": {
-        "description": "Adds multiple queries to query history.",
-        "operationId": "migrateQueries",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/MigrateQueriesToQueryHistoryCommand"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getQueryHistoryMigrationResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Migrate queries to query history.",
-        "tags": [
-          "query_history"
-        ]
-      }
-    },
     "/query-history/star/{query_history_uid}": {
       "delete": {
         "description": "Removes star from query in query history as specified by the UID.",

From 3854be1fcb35c1340953bae0d5f022d7cf88089f Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Fri, 28 Apr 2023 17:05:45 +0200
Subject: [PATCH 537/729] Alerting: Implement template preview for Grafana
 AlertManager (#65530)

* Add Preview template and payload editor to templates form

* Add TemplatePreview test and update css

* Preview errors for each template that is wrong

* Enable preview templating only for Grafana Alert Manager

* Use harcoded default payload instead of requesting it to the backend

* Update error response in the api definition

* Add spinner when loading result for preview

* Update api request followind DD changes

* Use pre instead of TextArea to render the preview

* Fix tests

* Add alert list editor

* Add start and end time for alert generator

* Add preview for data list added in the modal

* Update copies and move submit button in alert generator to the bottom

* Copy updates

* Refactor

* Use tab instead of button to preview

* Move payload editor next to the content

* Copy update

* Refactor

* Adress PR review comments

* Fix wrong json format throwing an exception when adding more data

* Use monaco editor for payload

* Only show text 'Preview for...'  when we have more than one define

* Fix some errors

* Update CollapseSection style

* Add tooltip for the Payload info icon explaining the available list of alert data fields in preview

* Set payload as invalid if it's not an array

* Fix test

* Update text in AlertTemplateDataTable

* Add separators to distinguish lines that belong to the preview

* Fix text

* Use subDays instead of addDays for substracting days
---
 .../alerting/unified/api/onCallApi.ts         |   1 -
 .../alerting/unified/api/templateApi.ts       |  40 ++
 .../receivers/PayloadEditor.test.tsx          |  81 ++++
 .../components/receivers/PayloadEditor.tsx    | 160 ++++++++
 .../components/receivers/TemplateData.ts      |  23 ++
 .../components/receivers/TemplateDataDocs.tsx |   2 +-
 .../components/receivers/TemplateForm.tsx     | 368 ++++++++++++++----
 .../receivers/TemplatePreview.test.tsx        | 159 ++++++++
 .../receivers/form/GenerateAlertDataModal.tsx | 173 ++++++++
 .../alerting/unified/mocks/templatesApi.ts    |  12 +
 .../ThresholdsEditor/ThresholdsEditor.tsx     |  18 +-
 .../plugins/datasource/alertmanager/types.ts  |   1 +
 12 files changed, 954 insertions(+), 84 deletions(-)
 create mode 100644 public/app/features/alerting/unified/api/templateApi.ts
 create mode 100644 public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
 create mode 100644 public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
 create mode 100644 public/app/features/alerting/unified/components/receivers/TemplatePreview.test.tsx
 create mode 100644 public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
 create mode 100644 public/app/features/alerting/unified/mocks/templatesApi.ts

diff --git a/public/app/features/alerting/unified/api/onCallApi.ts b/public/app/features/alerting/unified/api/onCallApi.ts
index 259adfdb517..a7272211950 100644
--- a/public/app/features/alerting/unified/api/onCallApi.ts
+++ b/public/app/features/alerting/unified/api/onCallApi.ts
@@ -16,7 +16,6 @@ export const onCallApi = alertingApi.injectEndpoints({
         const integrations = await fetchOnCallIntegrations();
         return { data: integrations };
       },
-      providesTags: ['AlertmanagerChoice'],
     }),
   }),
 });
diff --git a/public/app/features/alerting/unified/api/templateApi.ts b/public/app/features/alerting/unified/api/templateApi.ts
new file mode 100644
index 00000000000..41e5f23703a
--- /dev/null
+++ b/public/app/features/alerting/unified/api/templateApi.ts
@@ -0,0 +1,40 @@
+import { alertingApi } from './alertingApi';
+
+export const previewTemplateUrl = `/api/alertmanager/grafana/config/api/v1/templates/test`;
+
+export interface TemplatePreviewResult {
+  name: string;
+  text: string;
+}
+export interface TemplatePreviewErrors {
+  name?: string;
+  message: string;
+  kind: string;
+}
+export interface TemplatePreviewResponse {
+  results?: TemplatePreviewResult[];
+  errors?: TemplatePreviewErrors[];
+}
+
+export interface KeyValueField {
+  key: string;
+  value: string;
+}
+export interface AlertField {
+  annotations: KeyValueField[];
+  labels: KeyValueField[];
+}
+
+export const templatesApi = alertingApi.injectEndpoints({
+  endpoints: (build) => ({
+    previewTemplate: build.mutation<TemplatePreviewResponse, { template: string; alerts: AlertField[]; name: string }>({
+      query: ({ template, alerts, name }) => ({
+        url: previewTemplateUrl,
+        data: { template: template, alerts: alerts, name: name },
+        method: 'POST',
+      }),
+    }),
+  }),
+});
+
+export const { usePreviewTemplateMutation } = templatesApi;
diff --git a/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx b/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
new file mode 100644
index 00000000000..6c38193111b
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
@@ -0,0 +1,81 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { default as React, useState } from 'react';
+import { Provider } from 'react-redux';
+
+import { configureStore } from 'app/store/configureStore';
+
+import 'whatwg-fetch';
+
+import { PayloadEditor, RESET_TO_DEFAULT } from './PayloadEditor';
+
+const DEFAULT_PAYLOAD = `[
+  {
+    "annotations": {
+      "summary": "Instance instance1 has been down for more than 5 minutes"
+    },
+    "labels": {
+      "instance": "instance1"
+    },
+    "startsAt": "2023-04-25T15:28:56.440Z"
+  }]
+`;
+
+jest.mock('@grafana/ui', () => ({
+  ...jest.requireActual('@grafana/ui'),
+  CodeEditor: function CodeEditor({ value, onBlur }: { value: string; onBlur: (newValue: string) => void }) {
+    return <input data-testid="mockeditor" value={value} onChange={(e) => onBlur(e.currentTarget.value)} />;
+  },
+}));
+
+const PayloadEditorWithState = () => {
+  const [payload, setPayload] = useState(DEFAULT_PAYLOAD);
+  return (
+    <PayloadEditor
+      payload={payload}
+      setPayload={setPayload}
+      defaultPayload={DEFAULT_PAYLOAD}
+      setPayloadFormatError={jest.fn()}
+      payloadFormatError={null}
+      onPayloadError={jest.fn()}
+    />
+  );
+};
+const renderWithProvider = () => {
+  const store = configureStore();
+  render(
+    <Provider store={store}>
+      <PayloadEditorWithState />
+    </Provider>
+  );
+};
+
+describe('Payload editor', () => {
+  it('Should render default payload by default', async () => {
+    renderWithProvider();
+    await waitFor(() => {
+      expect(screen.getByTestId('mockeditor')).toHaveValue(
+        `[  {    "annotations": {      "summary": "Instance instance1 has been down for more than 5 minutes"    },    "labels": {      "instance": "instance1"    },    "startsAt": "2023-04-25T15:28:56.440Z"  }]`
+      );
+    });
+  });
+
+  it('Should render default payload after clicking reset to default button', async () => {
+    renderWithProvider();
+    await waitFor(() => {
+      expect(screen.getByTestId('mockeditor')).toHaveValue(
+        '[  {    "annotations": {      "summary": "Instance instance1 has been down for more than 5 minutes"    },    "labels": {      "instance": "instance1"    },    "startsAt": "2023-04-25T15:28:56.440Z"  }]'
+      );
+    });
+    await userEvent.type(screen.getByTestId('mockeditor'), 'this is the something');
+    expect(screen.getByTestId('mockeditor')).toHaveValue(
+      '[  {    "annotations": {      "summary": "Instance instance1 has been down for more than 5 minutes"    },    "labels": {      "instance": "instance1"    },    "startsAt": "2023-04-25T15:28:56.440Z"  }]this is the something'
+    );
+    await userEvent.click(screen.getByText(RESET_TO_DEFAULT));
+    await waitFor(() =>
+      expect(screen.queryByTestId('mockeditor')).toHaveValue(
+        '[  {    "annotations": {      "summary": "Instance instance1 has been down for more than 5 minutes"    },    "labels": {      "instance": "instance1"    },    "startsAt": "2023-04-25T15:28:56.440Z"  }]'
+      )
+    );
+  });
+});
diff --git a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
new file mode 100644
index 00000000000..20ab3d80e31
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
@@ -0,0 +1,160 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Badge, Button, CodeEditor, Icon, Tooltip, useStyles2 } from '@grafana/ui';
+import { TestTemplateAlert } from 'app/plugins/datasource/alertmanager/types';
+
+import { AlertTemplatePreviewData } from './TemplateData';
+import { TemplateDataTable } from './TemplateDataDocs';
+import { GenerateAlertDataModal } from './form/GenerateAlertDataModal';
+
+export const RESET_TO_DEFAULT = 'Reset to default';
+
+export function PayloadEditor({
+  payload,
+  setPayload,
+  defaultPayload,
+  setPayloadFormatError,
+  payloadFormatError,
+  onPayloadError,
+}: {
+  payload: string;
+  defaultPayload: string;
+  setPayload: React.Dispatch<React.SetStateAction<string>>;
+  setPayloadFormatError: (value: React.SetStateAction<string | null>) => void;
+  payloadFormatError: string | null;
+  onPayloadError: () => void;
+}) {
+  const styles = useStyles2(getStyles);
+  const onReset = () => {
+    setPayload(defaultPayload);
+  };
+
+  const [isEditingAlertData, setIsEditingAlertData] = useState(false);
+
+  const onCloseEditAlertModal = () => {
+    setIsEditingAlertData(false);
+  };
+
+  const errorInPayloadJson = payloadFormatError !== null;
+
+  const onOpenEditAlertModal = () => {
+    try {
+      const payloadObj = JSON.parse(payload);
+      JSON.stringify([...payloadObj]); // check if it's iterable, in order to be able to add more data
+      setIsEditingAlertData(true);
+      setPayloadFormatError(null);
+    } catch (e) {
+      setPayloadFormatError(e instanceof Error ? e.message : 'Invalid JSON.');
+      onPayloadError();
+    }
+  };
+  const onAddAlertList = (alerts: TestTemplateAlert[]) => {
+    onCloseEditAlertModal();
+    setPayload((payload) => {
+      const payloadObj = JSON.parse(payload);
+      return JSON.stringify([...payloadObj, ...alerts], undefined, 2);
+    });
+  };
+
+  return (
+    <div className={styles.wrapper}>
+      <div className={styles.editor}>
+        <div className={styles.title}>
+          Payload data
+          <Tooltip placement="top" content={<AlertTemplateDataTable />} theme="info">
+            <Icon name="info-circle" className={styles.tooltip} size="xl" />
+          </Tooltip>
+        </div>
+
+        <CodeEditor
+          width={640}
+          height={363}
+          language={'json'}
+          showLineNumbers={true}
+          showMiniMap={false}
+          value={payload}
+          readOnly={false}
+          onBlur={setPayload}
+        />
+
+        <div className={styles.buttonsWrapper}>
+          <Button onClick={onReset} className={styles.button} icon="arrow-up" type="button" variant="secondary">
+            {RESET_TO_DEFAULT}
+          </Button>
+          <Button
+            onClick={onOpenEditAlertModal}
+            className={styles.button}
+            icon="plus-circle"
+            type="button"
+            variant="secondary"
+            disabled={errorInPayloadJson}
+          >
+            Add alert data
+          </Button>
+          {payloadFormatError !== null && (
+            <Badge
+              color="orange"
+              icon="exclamation-triangle"
+              text={'There are some errors in payload JSON.'}
+              tooltip={'Fix errors in payload, and click Refresh preview button'}
+            />
+          )}
+        </div>
+      </div>
+      <GenerateAlertDataModal isOpen={isEditingAlertData} onDismiss={onCloseEditAlertModal} onAccept={onAddAlertList} />
+    </div>
+  );
+}
+const AlertTemplateDataTable = () => {
+  const styles = useStyles2(getStyles);
+  return (
+    <TemplateDataTable
+      caption={
+        <h4 className={styles.templateDataDocsHeader}>
+          Alert template data <span>This is the list of alert data fields used in the preview.</span>
+        </h4>
+      }
+      dataItems={AlertTemplatePreviewData}
+    />
+  );
+};
+const getStyles = (theme: GrafanaTheme2) => ({
+  jsonEditor: css`
+    width: 605px;
+    height: 363px;
+  `,
+  buttonsWrapper: css`
+    margin-top: ${theme.spacing(1)};
+    display: flex;
+  `,
+  button: css`
+    flex: none;
+    width: fit-content;
+    padding-right: ${theme.spacing(1)};
+    margin-right: ${theme.spacing(1)};
+  `,
+  title: css`
+    font-weight: ${theme.typography.fontWeightBold};
+  `,
+  wrapper: css`
+    padding-top: 38px;
+  `,
+  tooltip: css`
+    padding-left: ${theme.spacing(1)};
+  `,
+  editor: css`
+    display: flex;
+    flex-direction: column;
+    margin-top: ${theme.spacing(-1)};
+  `,
+  templateDataDocsHeader: css`
+    color: ${theme.colors.text.primary};
+
+    span {
+      color: ${theme.colors.text.secondary};
+      font-size: ${theme.typography.bodySmall.fontSize};
+    }
+  `,
+});
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateData.ts b/public/app/features/alerting/unified/components/receivers/TemplateData.ts
index 7580bda6fba..a46eaaaa8e4 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateData.ts
+++ b/public/app/features/alerting/unified/components/receivers/TemplateData.ts
@@ -59,6 +59,29 @@ export const GlobalTemplateData: TemplateDataItem[] = [
   },
 ];
 
+export const AlertTemplatePreviewData: TemplateDataItem[] = [
+  {
+    name: 'Labels',
+    type: 'KeyValue',
+    notes: 'Set of labels attached to the alert.',
+  },
+  {
+    name: 'Annotations',
+    type: 'KeyValue',
+    notes: 'Set of annotations attached to the alert.',
+  },
+  {
+    name: 'StartsAt',
+    type: 'time.Time',
+    notes: 'Time the alert started firing.',
+  },
+  {
+    name: 'EndsAt',
+    type: 'time.Time',
+    notes: 'Time the alert ends firing.',
+  },
+];
+
 export const AlertTemplateData: TemplateDataItem[] = [
   {
     name: 'Status',
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx b/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx
index 99e5e4fb3d9..3e1dbe0e85d 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx
@@ -72,7 +72,7 @@ interface TemplateDataTableProps {
   typeRenderer?: (type: TemplateDataItem['type']) => React.ReactNode;
 }
 
-function TemplateDataTable({ dataItems, caption, typeRenderer }: TemplateDataTableProps) {
+export function TemplateDataTable({ dataItems, caption, typeRenderer }: TemplateDataTableProps) {
   const styles = useStyles2(getTemplateDataTableStyles);
 
   return (
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
index 225c0d49746..52299c0a047 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
@@ -1,46 +1,79 @@
 import { css } from '@emotion/css';
+import { subDays } from 'date-fns';
 import { Location } from 'history';
-import React from 'react';
-import { useForm, Validate } from 'react-hook-form';
+import React, { useCallback, useEffect, useState } from 'react';
+import { FormProvider, useForm, useFormContext, Validate } from 'react-hook-form';
 import { useLocation } from 'react-router-dom';
-import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
-import { Alert, Button, Field, FieldSet, Input, LinkButton, useStyles2 } from '@grafana/ui';
+import {
+  Alert,
+  Button,
+  CollapsableSection,
+  Field,
+  FieldSet,
+  Input,
+  LinkButton,
+  Spinner,
+  Tab,
+  TabsBar,
+  useStyles2,
+} from '@grafana/ui';
 import { useCleanup } from 'app/core/hooks/useCleanup';
 import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
 import { useDispatch } from 'app/types';
 
+import {
+  AlertField,
+  TemplatePreviewErrors,
+  TemplatePreviewResponse,
+  TemplatePreviewResult,
+  usePreviewTemplateMutation,
+} from '../../api/templateApi';
 import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
 import { updateAlertManagerConfigAction } from '../../state/actions';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 import { makeAMLink } from '../../utils/misc';
 import { initialAsyncRequestState } from '../../utils/redux';
 import { ensureDefine } from '../../utils/templates';
 import { ProvisionedResource, ProvisioningAlert } from '../Provisioning';
 
+import { PayloadEditor } from './PayloadEditor';
 import { TemplateDataDocs } from './TemplateDataDocs';
 import { TemplateEditor } from './TemplateEditor';
 import { snippets } from './editor/templateDataSuggestions';
 
-interface Values {
+export interface TemplateFormValues {
   name: string;
   content: string;
 }
 
-const defaults: Values = Object.freeze({
+export const defaults: TemplateFormValues = Object.freeze({
   name: '',
   content: '',
 });
 
 interface Props {
-  existing?: Values;
+  existing?: TemplateFormValues;
   config: AlertManagerCortexConfig;
   alertManagerSourceName: string;
   provenance?: string;
 }
 export const isDuplicating = (location: Location) => location.pathname.endsWith('/duplicate');
 
+const DEFAULT_PAYLOAD = `[
+  {
+    "annotations": {
+      "summary": "Instance instance1 has been down for more than 5 minutes"
+    },
+    "labels": {
+      "instance": "instance1"
+    },
+    "startsAt": "${subDays(new Date(), 1).toISOString()}"
+  }]
+`;
+
 export const TemplateForm = ({ existing, alertManagerSourceName, config, provenance }: Props) => {
   const styles = useStyles2(getStyles);
   const dispatch = useDispatch();
@@ -52,7 +85,14 @@ export const TemplateForm = ({ existing, alertManagerSourceName, config, provena
   const location = useLocation();
   const isduplicating = isDuplicating(location);
 
-  const submit = (values: Values) => {
+  const [payload, setPayload] = useState(DEFAULT_PAYLOAD);
+  const [payloadFormatError, setPayloadFormatError] = useState<string | null>(null);
+
+  const [view, setView] = useState<'content' | 'preview'>('content');
+
+  const onPayloadError = () => setView('preview');
+
+  const submit = (values: TemplateFormValues) => {
     // wrap content in "define" if it's not already wrapped, in case user did not do it/
     // it's not obvious that this is needed for template to work
     const content = ensureDefine(values.name, values.content);
@@ -92,86 +132,119 @@ export const TemplateForm = ({ existing, alertManagerSourceName, config, provena
     );
   };
 
+  const formApi = useForm<TemplateFormValues>({
+    mode: 'onSubmit',
+    defaultValues: existing ?? defaults,
+  });
   const {
     handleSubmit,
     register,
     formState: { errors },
     getValues,
     setValue,
-  } = useForm<Values>({
-    mode: 'onSubmit',
-    defaultValues: existing ?? defaults,
-  });
+    watch,
+  } = formApi;
 
   const validateNameIsUnique: Validate<string> = (name: string) => {
     return !config.template_files[name] || existing?.name === name
       ? true
       : 'Another template with this name already exists.';
   };
+  const isGrafanaAlertManager = alertManagerSourceName === GRAFANA_RULES_SOURCE_NAME;
+
   return (
-    <form onSubmit={handleSubmit(submit)}>
-      <h4>{existing && !isduplicating ? 'Edit notification template' : 'Create notification template'}</h4>
-      {error && (
-        <Alert severity="error" title="Error saving template">
-          {error.message || (error as any)?.data?.message || String(error)}
-        </Alert>
-      )}
-      {provenance && <ProvisioningAlert resource={ProvisionedResource.Template} />}
-      <FieldSet disabled={Boolean(provenance)}>
-        <Field label="Template name" error={errors?.name?.message} invalid={!!errors.name?.message} required>
-          <Input
-            {...register('name', {
-              required: { value: true, message: 'Required.' },
-              validate: { nameIsUnique: validateNameIsUnique },
-            })}
-            placeholder="Give your template a name"
-            width={42}
-            autoFocus={true}
-          />
-        </Field>
-        <TemplatingGuideline />
-        <div className={styles.contentContainer}>
-          <div>
-            <Field label="Content" error={errors?.content?.message} invalid={!!errors.content?.message} required>
-              <div className={styles.editWrapper}>
-                <AutoSizer>
-                  {({ width, height }) => (
-                    <TemplateEditor
-                      value={getValues('content')}
-                      width={width}
-                      height={height}
-                      onBlur={(value) => setValue('content', value)}
-                    />
-                  )}
-                </AutoSizer>
+    <FormProvider {...formApi}>
+      <form onSubmit={handleSubmit(submit)}>
+        <h4>{existing && !isduplicating ? 'Edit notification template' : 'Create notification template'}</h4>
+        {error && (
+          <Alert severity="error" title="Error saving template">
+            {error.message || (error as any)?.data?.message || String(error)}
+          </Alert>
+        )}
+        {provenance && <ProvisioningAlert resource={ProvisionedResource.Template} />}
+        <FieldSet disabled={Boolean(provenance)}>
+          <Field label="Template name" error={errors?.name?.message} invalid={!!errors.name?.message} required>
+            <Input
+              {...register('name', {
+                required: { value: true, message: 'Required.' },
+                validate: { nameIsUnique: validateNameIsUnique },
+              })}
+              placeholder="Give your template a name"
+              width={42}
+              autoFocus={true}
+            />
+          </Field>
+          <TemplatingGuideline />
+          <Stack direction="row" alignItems={'center'}>
+            <div>
+              <TabsBar>
+                <Tab label="Content" active={view === 'content'} onChangeTab={() => setView('content')} />
+                {isGrafanaAlertManager && (
+                  <Tab label="Preview" active={view === 'preview'} onChangeTab={() => setView('preview')} />
+                )}
+              </TabsBar>
+              <div className={styles.contentContainer}>
+                {view === 'content' ? (
+                  <div>
+                    <Field error={errors?.content?.message} invalid={!!errors.content?.message} required>
+                      <div className={styles.editWrapper}>
+                        <TemplateEditor
+                          value={getValues('content')}
+                          width={640}
+                          height={363}
+                          onBlur={(value) => setValue('content', value)}
+                        />
+                      </div>
+                    </Field>
+                    <div className={styles.buttons}>
+                      {loading && (
+                        <Button disabled={true} icon="fa fa-spinner" variant="primary">
+                          Saving...
+                        </Button>
+                      )}
+                      {!loading && (
+                        <Button type="submit" variant="primary">
+                          Save template
+                        </Button>
+                      )}
+                      <LinkButton
+                        disabled={loading}
+                        href={makeAMLink('alerting/notifications', alertManagerSourceName)}
+                        variant="secondary"
+                        type="button"
+                        fill="outline"
+                      >
+                        Cancel
+                      </LinkButton>
+                    </div>
+                  </div>
+                ) : (
+                  <TemplatePreview
+                    payload={payload}
+                    templateName={watch('name')}
+                    setPayloadFormatError={setPayloadFormatError}
+                    payloadFormatError={payloadFormatError}
+                  />
+                )}
               </div>
-            </Field>
-            <div className={styles.buttons}>
-              {loading && (
-                <Button disabled={true} icon="fa fa-spinner" variant="primary">
-                  Saving...
-                </Button>
-              )}
-              {!loading && (
-                <Button type="submit" variant="primary">
-                  Save template
-                </Button>
-              )}
-              <LinkButton
-                disabled={loading}
-                href={makeAMLink('alerting/notifications', alertManagerSourceName)}
-                variant="secondary"
-                type="button"
-                fill="outline"
-              >
-                Cancel
-              </LinkButton>
             </div>
-          </div>
+            {isGrafanaAlertManager && (
+              <PayloadEditor
+                payload={payload}
+                setPayload={setPayload}
+                defaultPayload={DEFAULT_PAYLOAD}
+                setPayloadFormatError={setPayloadFormatError}
+                payloadFormatError={payloadFormatError}
+                onPayloadError={onPayloadError}
+              />
+            )}
+          </Stack>
+        </FieldSet>
+        <CollapsableSection label="Data cheat sheet" isOpen={false} className={styles.collapsableSection}>
           <TemplateDataDocs />
-        </div>
-      </FieldSet>
-    </form>
+        </CollapsableSection>
+      </form>
+    </FormProvider>
   );
 };
 
@@ -209,9 +282,123 @@ function TemplatingGuideline() {
   );
 }
 
+function getResultsToRender(results: TemplatePreviewResult[]) {
+  const filteredResults = results.filter((result) => result.text.trim().length > 0);
+
+  const moreThanOne = filteredResults.length > 1;
+
+  const preview = (result: TemplatePreviewResult) => {
+    const previewForLabel = `Preview for ${result.name}:`;
+    const separatorStart = '='.repeat(previewForLabel.length).concat('>');
+    const separatorEnd = '<'.concat('='.repeat(previewForLabel.length));
+    if (moreThanOne) {
+      return `${previewForLabel}\n${separatorStart}${result.text}${separatorEnd}\n`;
+    } else {
+      return `${separatorStart}${result.text}${separatorEnd}\n`;
+    }
+  };
+
+  return filteredResults
+    .map((result: TemplatePreviewResult) => {
+      return preview(result);
+    })
+    .join(`\n`);
+}
+
+function getErrorsToRender(results: TemplatePreviewErrors[]) {
+  return results
+    .map((result: TemplatePreviewErrors) => {
+      if (result.name) {
+        return `ERROR in ${result.name}:\n`.concat(`${result.kind}\n${result.message}\n`);
+      } else {
+        return `ERROR:\n${result.kind}\n${result.message}\n`;
+      }
+    })
+    .join(`\n`);
+}
+export const PREVIEW_NOT_AVAILABLE = 'Preview request failed. Check if the payload data has the correct structure.';
+
+function getPreviewTorender(
+  isPreviewError: boolean,
+  payloadFormatError: string | null,
+  data: TemplatePreviewResponse | undefined
+) {
+  // ERRORS IN JSON OR IN REQUEST (endpoint not available, for example)
+  const previewErrorRequest = isPreviewError ? PREVIEW_NOT_AVAILABLE : undefined;
+  const somethingWasWrong: boolean = isPreviewError || Boolean(payloadFormatError);
+  const errorToRender = payloadFormatError || previewErrorRequest;
+
+  //PREVIEW : RESULTS AND ERRORS
+  const previewResponseResults = data?.results;
+  const previewResponseErrors = data?.errors;
+
+  const previewResultsToRender = previewResponseResults ? getResultsToRender(previewResponseResults) : '';
+  const previewErrorsToRender = previewResponseErrors ? getErrorsToRender(previewResponseErrors) : '';
+
+  if (somethingWasWrong) {
+    return errorToRender;
+  } else {
+    return `${previewResultsToRender}\n${previewErrorsToRender}`;
+  }
+}
+
+export function TemplatePreview({
+  payload,
+  templateName,
+  payloadFormatError,
+  setPayloadFormatError,
+}: {
+  payload: string;
+  templateName: string;
+  payloadFormatError: string | null;
+  setPayloadFormatError: (value: React.SetStateAction<string | null>) => void;
+}) {
+  const styles = useStyles2(getStyles);
+
+  const { watch } = useFormContext<TemplateFormValues>();
+
+  const templateContent = watch('content');
+
+  const [trigger, { data, isError: isPreviewError, isLoading }] = usePreviewTemplateMutation();
+
+  const previewToRender = getPreviewTorender(isPreviewError, payloadFormatError, data);
+
+  const onPreview = useCallback(() => {
+    try {
+      const alertList: AlertField[] = JSON.parse(payload);
+      JSON.stringify([...alertList]); // check if it's iterable, in order to be able to add more data
+      trigger({ template: templateContent, alerts: alertList, name: templateName });
+      setPayloadFormatError(null);
+    } catch (e) {
+      setPayloadFormatError(e instanceof Error ? e.message : 'Invalid JSON.');
+    }
+  }, [templateContent, templateName, payload, setPayloadFormatError, trigger]);
+
+  useEffect(() => onPreview(), [onPreview]);
+
+  return (
+    <Stack direction="row" alignItems="center" gap={2}>
+      <Stack direction="column">
+        {isLoading && (
+          <>
+            <Spinner inline={true} /> Loading preview...
+          </>
+        )}
+        <pre className={styles.preview.result} data-testid="payloadJSON">
+          {previewToRender}
+        </pre>
+        <Button onClick={onPreview} className={styles.preview.button} icon="arrow-up" type="button" variant="secondary">
+          Refresh preview
+        </Button>
+      </Stack>
+    </Stack>
+  );
+}
+
 const getStyles = (theme: GrafanaTheme2) => ({
   contentContainer: css`
     display: flex;
+    padding-top: 10px;
     gap: ${theme.spacing(2)};
     flex-direction: row;
     align-items: flex-start;
@@ -232,6 +419,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     & > * + * {
       margin-left: ${theme.spacing(1)};
     }
+    margin-top: -7px;
   `,
   textarea: css`
     max-width: 758px;
@@ -240,6 +428,40 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: block;
     position: relative;
     width: 640px;
-    height: 320px;
+    height: 363px;
+  `,
+  toggle: css({
+    color: theme.colors.text.secondary,
+    marginRight: `${theme.spacing(1)}`,
+  }),
+  previewHeader: css({
+    display: 'flex',
+    cursor: 'pointer',
+    alignItems: 'baseline',
+    color: theme.colors.text.primary,
+    '&:hover': {
+      background: theme.colors.emphasize(theme.colors.background.primary, 0.03),
+    },
+  }),
+  previewHeaderTitle: css({
+    flexGrow: 1,
+    overflow: 'hidden',
+    fontSize: theme.typography.h4.fontSize,
+    fontWeight: theme.typography.fontWeightMedium,
+    margin: 0,
+  }),
+  preview: {
+    result: css`
+      width: 640px;
+      height: 363px;
+    `,
+    button: css`
+      flex: none;
+      width: fit-content;
+      margin-top: ${theme.spacing(-3)};
+    `,
+  },
+  collapsableSection: css`
+    width: fit-content;
   `,
 });
diff --git a/public/app/features/alerting/unified/components/receivers/TemplatePreview.test.tsx b/public/app/features/alerting/unified/components/receivers/TemplatePreview.test.tsx
new file mode 100644
index 00000000000..def4b0edaa3
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/TemplatePreview.test.tsx
@@ -0,0 +1,159 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import { setupServer } from 'msw/node';
+import { default as React } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import { Provider } from 'react-redux';
+
+import { setBackendSrv } from '@grafana/runtime';
+import { backendSrv } from 'app/core/services/backend_srv';
+import { configureStore } from 'app/store/configureStore';
+
+import 'whatwg-fetch';
+import { TemplatePreviewResponse } from '../../api/templateApi';
+import { mockPreviewTemplateResponse, mockPreviewTemplateResponseRejected } from '../../mocks/templatesApi';
+
+import { defaults, PREVIEW_NOT_AVAILABLE, TemplateFormValues, TemplatePreview } from './TemplateForm';
+
+const getProviderWraper = () => {
+  return function Wrapper({ children }: React.PropsWithChildren<{}>) {
+    const store = configureStore();
+    const formApi = useForm<TemplateFormValues>({ defaultValues: defaults });
+    return (
+      <Provider store={store}>
+        <FormProvider {...formApi}>{children}</FormProvider>
+      </Provider>
+    );
+  };
+};
+
+const server = setupServer();
+
+beforeAll(() => {
+  setBackendSrv(backendSrv);
+  server.listen({ onUnhandledRequest: 'error' });
+});
+
+beforeEach(() => {
+  server.resetHandlers();
+});
+
+afterAll(() => {
+  server.close();
+});
+
+describe('TemplatePreview component', () => {
+  it('Should render error if payload has wrong format', async () => {
+    render(
+      <TemplatePreview
+        payload={'bla bla bla'}
+        templateName="potato"
+        payloadFormatError={'Unexpected token b in JSON at position 0'}
+        setPayloadFormatError={jest.fn()}
+      />,
+      { wrapper: getProviderWraper() }
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('payloadJSON')).toHaveTextContent('Unexpected token b in JSON at position 0');
+    });
+  });
+
+  it('Should render error if payload is not an iterable', async () => {
+    const setError = jest.fn();
+    render(
+      <TemplatePreview
+        payload={'{"a":"b"}'}
+        templateName="potato"
+        payloadFormatError={'Unexpected token b in JSON at position 0'}
+        setPayloadFormatError={setError}
+      />,
+      { wrapper: getProviderWraper() }
+    );
+    await waitFor(() => {
+      expect(setError).toHaveBeenCalledWith('alertList is not iterable');
+    });
+  });
+
+  it('Should render error if payload has wrong format rendering the preview', async () => {
+    render(
+      <TemplatePreview
+        payload={'potatos and cherries'}
+        templateName="potato"
+        payloadFormatError={'Unexpected token b in JSON at position 0'}
+        setPayloadFormatError={jest.fn()}
+      />,
+      {
+        wrapper: getProviderWraper(),
+      }
+    );
+
+    await waitFor(() => {
+      expect(screen.getByTestId('payloadJSON')).toHaveTextContent('Unexpected token b in JSON at position 0');
+    });
+  });
+
+  it('Should render error in preview response , if payload has correct format but preview request has been rejected', async () => {
+    mockPreviewTemplateResponseRejected(server);
+    render(
+      <TemplatePreview
+        payload={'[{"a":"b"}]'}
+        templateName="potato"
+        payloadFormatError={null}
+        setPayloadFormatError={jest.fn()}
+      />,
+      { wrapper: getProviderWraper() }
+    );
+
+    await waitFor(() => {
+      expect(screen.getByTestId('payloadJSON')).toHaveTextContent(PREVIEW_NOT_AVAILABLE);
+    });
+  });
+
+  it('Should render preview response , if payload has correct ', async () => {
+    const response: TemplatePreviewResponse = {
+      results: [
+        { name: 'template1', text: 'This is the template result bla bla bla' },
+        { name: 'template2', text: 'This is the template2 result bla bla bla' },
+      ],
+    };
+    mockPreviewTemplateResponse(server, response);
+    render(
+      <TemplatePreview
+        payload={'[{"a":"b"}]'}
+        templateName="potato"
+        payloadFormatError={null}
+        setPayloadFormatError={jest.fn()}
+      />,
+      { wrapper: getProviderWraper() }
+    );
+
+    await waitFor(() => {
+      expect(screen.getByTestId('payloadJSON')).toHaveTextContent(
+        'Preview for template1: ======================>This is the template result bla bla bla<====================== Preview for template2: ======================>This is the template2 result bla bla bla<======================'
+      );
+    });
+  });
+  it('Should render preview response with some errors,  if payload has correct format ', async () => {
+    const response: TemplatePreviewResponse = {
+      results: [{ name: 'template1', text: 'This is the template result bla bla bla' }],
+      errors: [
+        { name: 'template2', message: 'Unexpected "{" in operand', kind: 'kind_of_error' },
+        { name: 'template3', kind: 'kind_of_error', message: 'Unexpected "{" in operand' },
+      ],
+    };
+    mockPreviewTemplateResponse(server, response);
+    render(
+      <TemplatePreview
+        payload={'[{"a":"b"}]'}
+        templateName="potato"
+        payloadFormatError={null}
+        setPayloadFormatError={jest.fn()}
+      />,
+      { wrapper: getProviderWraper() }
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('payloadJSON')).toHaveTextContent(
+        '======================>This is the template result bla bla bla<====================== ERROR in template2: kind_of_error Unexpected "{" in operand ERROR in template3: kind_of_error Unexpected "{" in operand'
+      );
+    });
+  });
+});
diff --git a/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx b/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
new file mode 100644
index 00000000000..706eacf3348
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
@@ -0,0 +1,173 @@
+import { css } from '@emotion/css';
+import { addDays, subDays } from 'date-fns';
+import React, { useState } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Stack } from '@grafana/experimental';
+import { Button, Card, Modal, RadioButtonGroup, useStyles2 } from '@grafana/ui';
+import { TestTemplateAlert } from 'app/plugins/datasource/alertmanager/types';
+
+import { KeyValueField } from '../../../api/templateApi';
+import AnnotationsField from '../../rule-editor/AnnotationsField';
+import LabelsField from '../../rule-editor/LabelsField';
+
+interface Props {
+  isOpen: boolean;
+  onDismiss: () => void;
+  onAccept: (alerts: TestTemplateAlert[]) => void;
+}
+
+interface FormFields {
+  annotations: KeyValueField[];
+  labels: KeyValueField[];
+  status: 'firing' | 'resolved';
+}
+
+const defaultValues: FormFields = {
+  annotations: [{ key: '', value: '' }],
+  labels: [{ key: '', value: '' }],
+  status: 'firing',
+};
+
+export const GenerateAlertDataModal = ({ isOpen, onDismiss, onAccept }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  const [alerts, setAlerts] = useState<TestTemplateAlert[]>([]);
+
+  const formMethods = useForm<FormFields>({ defaultValues, mode: 'onBlur' });
+  const annotations = formMethods.watch('annotations');
+  const labels = formMethods.watch('labels');
+  const [status, setStatus] = useState<'firing' | 'resolved'>('firing');
+
+  const onAdd = () => {
+    const alert: TestTemplateAlert = {
+      annotations: annotations
+        .filter(({ key, value }) => !!key && !!value)
+        .reduce((acc, { key, value }) => {
+          return { ...acc, [key]: value };
+        }, {}),
+      labels: labels
+        .filter(({ key, value }) => !!key && !!value)
+        .reduce((acc, { key, value }) => {
+          return { ...acc, [key]: value };
+        }, {}),
+      startsAt: '2023-04-01T00:00:00Z',
+      endsAt: status === 'firing' ? addDays(new Date(), 1).toISOString() : subDays(new Date(), 1).toISOString(),
+    };
+    setAlerts((alerts) => [...alerts, alert]);
+    formMethods.reset();
+  };
+
+  const onSubmit = () => {
+    onAccept(alerts);
+    setAlerts([]);
+    formMethods.reset();
+    setStatus('firing');
+  };
+
+  const labelsOrAnnotationsAdded = () => {
+    const someLabels = labels.some((lb) => lb.key !== '' && lb.value !== '');
+    const someAnnotations = annotations.some((ann) => ann.key !== '' && ann.value !== '');
+    return someLabels || someAnnotations;
+  };
+
+  type AlertOption = {
+    label: string;
+    value: 'firing' | 'resolved';
+  };
+  const alertOptions: AlertOption[] = [
+    {
+      label: 'Firing',
+      value: 'firing',
+    },
+    { label: 'Resolved', value: 'resolved' },
+  ];
+
+  return (
+    <Modal onDismiss={onDismiss} isOpen={isOpen} title={'Add alert data'}>
+      <FormProvider {...formMethods}>
+        <form
+          onSubmit={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            formMethods.reset();
+            setStatus('firing');
+          }}
+        >
+          <>
+            <Card>
+              <Stack direction="column" gap={1}>
+                <div className={styles.section}>
+                  <AnnotationsField />
+                </div>
+                <div className={styles.section}>
+                  <LabelsField />
+                </div>
+                <div className={styles.flexWrapper}>
+                  <RadioButtonGroup value={status} options={alertOptions} onChange={(value) => setStatus(value)} />
+                  <Button
+                    onClick={onAdd}
+                    className={styles.onAddButton}
+                    icon="plus-circle"
+                    type="button"
+                    variant="secondary"
+                    disabled={!labelsOrAnnotationsAdded()}
+                  >
+                    Add alert data
+                  </Button>
+                </div>
+              </Stack>
+            </Card>
+          </>
+          <div className={styles.onSubmitWrapper}></div>
+          {alerts.length > 0 && (
+            <Stack direction="column" gap={1}>
+              <h5> Review alert data to add to the payload:</h5>
+              <pre className={styles.result} data-testid="payloadJSON">
+                {JSON.stringify(alerts, null, 2)}
+              </pre>
+            </Stack>
+          )}
+          <div className={styles.onSubmitWrapper}>
+            <Modal.ButtonRow>
+              <Button onClick={onSubmit} disabled={alerts.length === 0} className={styles.onSubmitButton}>
+                Add alert data to payload
+              </Button>
+            </Modal.ButtonRow>
+          </div>
+        </form>
+      </FormProvider>
+    </Modal>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  section: css`
+    margin-bottom: ${theme.spacing(2)};
+  `,
+  onAddButton: css`
+    flex: none;
+    width: fit-content;
+    padding-right: ${theme.spacing(1)};
+    margin-left: auto;
+  `,
+  flexWrapper: css`
+    display: flex;
+    flex-direction: row,
+    justify-content: space-between;
+  `,
+  onSubmitWrapper: css`
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+    justify-content: flex-end;
+  `,
+  onSubmitButton: css`
+    margin-left: ${theme.spacing(2)};
+  `,
+  result: css`
+    width: 570px;
+    height: 363px;
+  `,
+});
diff --git a/public/app/features/alerting/unified/mocks/templatesApi.ts b/public/app/features/alerting/unified/mocks/templatesApi.ts
new file mode 100644
index 00000000000..cb6d18d4cf3
--- /dev/null
+++ b/public/app/features/alerting/unified/mocks/templatesApi.ts
@@ -0,0 +1,12 @@
+import { rest } from 'msw';
+import { SetupServer } from 'msw/node';
+
+import { previewTemplateUrl, TemplatePreviewResponse } from '../api/templateApi';
+
+export function mockPreviewTemplateResponse(server: SetupServer, response: TemplatePreviewResponse) {
+  server.use(rest.post(previewTemplateUrl, (req, res, ctx) => res(ctx.status(200), ctx.json(response))));
+}
+
+export function mockPreviewTemplateResponseRejected(server: SetupServer) {
+  server.use(rest.post(previewTemplateUrl, (req, res, ctx) => res(ctx.status(500), ctx.json('error'))));
+}
diff --git a/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx b/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
index 1ba5234e31b..e5f8df86343 100644
--- a/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
+++ b/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
@@ -1,25 +1,25 @@
 import { css } from '@emotion/css';
 import { isNumber } from 'lodash';
-import React, { PureComponent, ChangeEvent } from 'react';
+import React, { ChangeEvent, PureComponent } from 'react';
 
 import {
-  Threshold,
+  GrafanaTheme2,
+  SelectableValue,
   sortThresholds,
+  Threshold,
   ThresholdsConfig,
   ThresholdsMode,
-  SelectableValue,
-  GrafanaTheme2,
 } from '@grafana/data';
 import {
-  Input,
-  colors,
-  ColorPicker,
-  ThemeContext,
   Button,
+  ColorPicker,
+  colors,
+  IconButton,
+  Input,
   Label,
   RadioButtonGroup,
   stylesFactory,
-  IconButton,
+  ThemeContext,
 } from '@grafana/ui';
 
 const modes: Array<SelectableValue<ThresholdsMode>> = [
diff --git a/public/app/plugins/datasource/alertmanager/types.ts b/public/app/plugins/datasource/alertmanager/types.ts
index ba4aeed19e0..17a3c192427 100644
--- a/public/app/plugins/datasource/alertmanager/types.ts
+++ b/public/app/plugins/datasource/alertmanager/types.ts
@@ -252,6 +252,7 @@ export interface AlertmanagerStatus {
 }
 
 export type TestReceiversAlert = Pick<AlertmanagerAlert, 'annotations' | 'labels'>;
+export type TestTemplateAlert = Pick<AlertmanagerAlert, 'annotations' | 'labels' | 'startsAt' | 'endsAt'>;
 
 export interface TestReceiversPayload {
   receivers?: Receiver[];

From 7be23e738411eed74d7f9fd39a4cf42af6c29dd3 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Fri, 28 Apr 2023 17:10:59 +0200
Subject: [PATCH 538/729] Grafana Toolkit: Prevent MODULE_NOT_FOUND errors
 (#67518)

fix(grafana-toolkit): put back ts-node to prevent MODULE_NOT_FOUND errors
---
 packages/grafana-toolkit/package.json |  1 +
 yarn.lock                             | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 0a3568a784f..3113dff6082 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -42,6 +42,7 @@
     "@types/node": "16.11.26",
     "chalk": "^4.1.2",
     "commander": "^9.2.0",
+    "ts-node": "^9.1.0",
     "tslib": "2.5.0",
     "typescript": "4.8.2"
   }
diff --git a/yarn.lock b/yarn.lock
index 77b960f61c3..9d4083b4ed2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3102,6 +3102,7 @@ __metadata:
     "@types/node": 16.11.26
     chalk: ^4.1.2
     commander: ^9.2.0
+    ts-node: ^9.1.0
     tslib: 2.5.0
     typescript: 4.8.2
   bin:
@@ -31033,7 +31034,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-support@npm:^0.5.16":
+"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.17":
   version: 0.5.21
   resolution: "source-map-support@npm:0.5.21"
   dependencies:
@@ -32881,6 +32882,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-node@npm:^9.1.0":
+  version: 9.1.1
+  resolution: "ts-node@npm:9.1.1"
+  dependencies:
+    arg: ^4.1.0
+    create-require: ^1.1.0
+    diff: ^4.0.1
+    make-error: ^1.1.1
+    source-map-support: ^0.5.17
+    yn: 3.1.1
+  peerDependencies:
+    typescript: ">=2.7"
+  bin:
+    ts-node: dist/bin.js
+    ts-node-script: dist/bin-script.js
+    ts-node-transpile-only: dist/bin-transpile.js
+    ts-script: dist/bin-script-deprecated.js
+  checksum: 356e2647b8b1e6ab00380c0537fa569b63bd9b6f006cc40fd650f81fae1817bd8fecc075300036950d8f45c1d85b95be33cd1e48a1a424a7d86c3dbb42bf60e5
+  languageName: node
+  linkType: hard
+
 "ts-pnp@npm:^1.1.6":
   version: 1.2.0
   resolution: "ts-pnp@npm:1.2.0"

From 8a6552a9e535aa550b5a683f90d65ec105e922df Mon Sep 17 00:00:00 2001
From: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Date: Fri, 28 Apr 2023 10:11:49 -0500
Subject: [PATCH 539/729] Docs: fixes alias and menutitle (#67511)

fixes alias and menutitle
---
 docs/sources/setup-grafana/installation/_index.md              | 2 +-
 docs/sources/setup-grafana/installation/suse-opensuse/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/setup-grafana/installation/_index.md b/docs/sources/setup-grafana/installation/_index.md
index 999c7c0b2c5..0c24fb77bc6 100644
--- a/docs/sources/setup-grafana/installation/_index.md
+++ b/docs/sources/setup-grafana/installation/_index.md
@@ -5,7 +5,7 @@ aliases:
   - ../installation/installation/
   - ../installation/requirements/
   - /docs/grafana/v2.1/installation/install/
-  - ./rpm/
+  - ./installation/rpm/
 description: Installation guide for Grafana
 title: Install Grafana
 weight: 100
diff --git a/docs/sources/setup-grafana/installation/suse-opensuse/index.md b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
index bb31b27831d..d65cffb506b 100644
--- a/docs/sources/setup-grafana/installation/suse-opensuse/index.md
+++ b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
@@ -1,7 +1,7 @@
 ---
 description: Install guide for Grafana on SUSE or OpenSUSE.
 title: Install Grafana on SUSE or OpenSUSE
-menuTitle: Redhat, RHEL, or Fedora
+menuTitle: SUSE or openSUSE
 weight: 450
 ---
 

From 8a5b07c9a3a631ec0051692b844f4fe985682641 Mon Sep 17 00:00:00 2001
From: mallettjared <110853992+mallettjared@users.noreply.github.com>
Date: Fri, 28 Apr 2023 11:12:28 -0400
Subject: [PATCH 540/729] Duplicate Exemplars Configuration Delete (#66016)

* Duplicate Exemplars Configuration Delete

I noticed there were double Exemplar configuration paragraphs one right after the other and deleted the upper one.

* makes prettier

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
---
 docs/sources/datasources/prometheus/_index.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/sources/datasources/prometheus/_index.md b/docs/sources/datasources/prometheus/_index.md
index 2a95f1ba839..08f56b5c32d 100644
--- a/docs/sources/datasources/prometheus/_index.md
+++ b/docs/sources/datasources/prometheus/_index.md
@@ -61,12 +61,17 @@ To configure basic settings for the data source, complete the following steps:
     | `Version`                       | The version of your Prometheus server, note that this field is not visible until the Prometheus type is selected.                                                                                                                                                                                               |
     | `Disable metrics lookup`        | Checking this option will disable the metrics chooser and metric/label support in the query field's autocomplete. This helps if you have performance issues with bigger Prometheus instances.                                                                                                                   |
     | `Custom query parameters`       | Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup`, or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'.                                                                                                         |
-    | **Exemplars configuration**     |                                                                                                                                                                                                                                                                                                                 |
-    | `Internal link`                 | Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select the backend tracing data store for your exemplar data.                                                                                                                                             |
-    | `Data source`                   | _(Visible only if you enable `Internal link`)_ Selects the backend tracing data store for your exemplar data.                                                                                                                                                                                                   |
-    | `URL`                           | _(Visible only if you disable `Internal link`)_ Defines the external link's full URL. You can interpolate the value from the field by using the [`${__value.raw}` macro]({{< relref "../..//panels-visualizations/configure-data-links/#value-variables" >}}).                                                  |
-    | `URL Label`                     | _(Optional)_ Adds a custom display label to override the value of the `Label name` field.                                                                                                                                                                                                                       |
-    | `Label name`                    | Adds a name for the exemplar traceID property.                                                                                                                                                                                                                                                                  |
+
+        **Exemplars configuration:**
+
+        | Name              | Description                                                                                                                                                                                                                                                    |
+
+    | ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+    | **Internal link** | Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select the backend tracing data store for your exemplar data. |
+    | **Data source** | _(Visible only if you enable `Internal link`)_ Selects the backend tracing data store for your exemplar data. |
+    | **URL** | _(Visible only if you disable `Internal link`)_ Defines the external link's full URL. You can interpolate the value from the field by using the [`${__value.raw}` macro]({{< relref "../..//panels-visualizations/configure-data-links/#value-variables" >}}). |
+    | **URL label** | _(Optional)_ Adds a custom display label to override the value of the `Label name` field. |
+    | **Label name** | Adds a name for the exemplar traceID property. |
 
 ### Provision the data source
 

From d8da6c75e52fb5ed4542cbe7a1dafe18ba221bed Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 28 Apr 2023 17:22:30 +0200
Subject: [PATCH 541/729] Loki: Distinguish hidden and not hidden queries in
 tracking (#67507)

* Loki: Distinguish hidden and not hidden queries in tracking

* Rename
---
 public/app/plugins/datasource/loki/tracking.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/tracking.ts b/public/app/plugins/datasource/loki/tracking.ts
index a7abeff1aec..5a122730a7e 100644
--- a/public/app/plugins/datasource/loki/tracking.ts
+++ b/public/app/plugins/datasource/loki/tracking.ts
@@ -144,6 +144,11 @@ export function trackQuery(
     return;
   }
 
+  // TODO: We need to re-think this for split queries
+  if (config.featureToggles.lokiQuerySplitting) {
+    return;
+  }
+
   let totalBytes = 0;
   for (const frame of response.data) {
     const byteKey = frame.meta?.custom?.lokiQueryStatKey;
@@ -171,7 +176,8 @@ export function trackQuery(
       query_type: isLogsQuery(query.expr) ? 'logs' : 'metric',
       query_vector_type: query.queryType,
       resolution: query.resolution,
-      simultaneously_sent_query_count: queries.length,
+      simultaneously_executed_query_count: queries.filter((query) => !query.hide).length,
+      simultaneously_hidden_query_count: queries.filter((query) => query.hide).length,
       time_range_from: request?.range?.from?.toISOString(),
       time_range_to: request?.range?.to?.toISOString(),
       time_taken: Date.now() - startTime.getTime(),

From 7448427739f894200c2c6cda7d4b5707ba710eaa Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Fri, 28 Apr 2023 16:27:07 +0100
Subject: [PATCH 542/729] Tracing: Feedback button (#67398)

* Feedback button

* Hide button

* Make gen-cue
---
 .../Actions/TracePageActions.tsx              | 28 ++++++++++++++++---
 .../TracePageHeader/NewTracePageHeader.tsx    |  3 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
index 120843333ea..926388534fe 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
@@ -1,21 +1,30 @@
 import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
-import { CoreApp, DataFrame } from '@grafana/data';
+import { GrafanaTheme2, CoreApp, DataFrame } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
-import { useStyles2 } from '@grafana/ui';
+import { Icon, useTheme2 } from '@grafana/ui';
 
 import { config } from '../../../../../../core/config';
 import { downloadTraceAsJson } from '../../../../../inspector/utils/download';
 
 import ActionButton from './ActionButton';
 
-export const getStyles = () => {
+export const getStyles = (theme: GrafanaTheme2) => {
   return {
     TracePageActions: css`
       label: TracePageActions;
       display: flex;
       gap: 4px;
+      margin-top: 2px;
+    `,
+    feedback: css`
+      margin: 6px;
+      color: ${theme.colors.text.secondary};
+      font-size: ${theme.typography.bodySmall.fontSize};
+      &:hover {
+        color: ${theme.colors.text.link};
+      }
     `,
   };
 };
@@ -28,7 +37,8 @@ export type TracePageActionsProps = {
 
 export default function TracePageActions(props: TracePageActionsProps) {
   const { traceId, data, app } = props;
-  const styles = useStyles2(getStyles);
+  const theme = useTheme2();
+  const styles = getStyles(theme);
   const [copyTraceIdClicked, setCopyTraceIdClicked] = useState(false);
 
   const copyTraceId = () => {
@@ -51,6 +61,16 @@ export default function TracePageActions(props: TracePageActionsProps) {
 
   return (
     <div className={styles.TracePageActions}>
+      <a
+        href="https://forms.gle/RZDEx8ScyZNguDoC8"
+        className={styles.feedback}
+        title="Share your thoughts about tracing in Grafana."
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        <Icon name="comment-alt-message" /> Give feedback
+      </a>
+
       <ActionButton
         onClick={copyTraceId}
         ariaLabel={'Copy Trace ID'}
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
index e9f663851de..5dd3d3ecac1 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/NewTracePageHeader.tsx
@@ -162,7 +162,7 @@ const getNewStyles = (theme: GrafanaTheme2) => {
       z-index: 5;
     `,
     titleRow: css`
-      align-items: center;
+      align-items: flex-start;
       display: flex;
       padding: 0 8px;
     `,
@@ -193,6 +193,7 @@ const getNewStyles = (theme: GrafanaTheme2) => {
     `,
     url: css`
       margin: -2.5px 0.3em;
+      height: 15px;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;

From 8df54a6daaca334356d8f9b1912a6801e54051e0 Mon Sep 17 00:00:00 2001
From: Jo <joao.guerreiro@grafana.com>
Date: Fri, 28 Apr 2023 17:38:58 +0200
Subject: [PATCH 543/729] Users: Enable case insensitive login by default
 (#66134)

* enable case insensitive by default

* fix missing case-insensitive query

* fix missing case insensitive query

* fix missing case insensitive query in temp_user

* skip integration testing in mysql

* skip integration testing in mysql

* use t.cleanup

* lowercase only once

* aligned to only using sql as that is what we do in other parts

---------

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
---
 pkg/services/temp_user/tempuserimpl/store.go  | 10 ++-
 .../temp_user/tempuserimpl/store_test.go      | 29 +++++-
 .../temp_user/tempuserimpl/temp_user.go       |  4 +-
 pkg/services/user/userimpl/store.go           | 13 ++-
 pkg/services/user/userimpl/store_test.go      | 88 +++++++++++++++++++
 pkg/setting/setting.go                        |  2 +-
 6 files changed, 138 insertions(+), 8 deletions(-)

diff --git a/pkg/services/temp_user/tempuserimpl/store.go b/pkg/services/temp_user/tempuserimpl/store.go
index c66f702a8a9..d362b4ba897 100644
--- a/pkg/services/temp_user/tempuserimpl/store.go
+++ b/pkg/services/temp_user/tempuserimpl/store.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 type store interface {
@@ -18,7 +19,8 @@ type store interface {
 }
 
 type xormStore struct {
-	db db.DB
+	db  db.DB
+	cfg *setting.Cfg
 }
 
 func (ss *xormStore) UpdateTempUserStatus(ctx context.Context, cmd *tempuser.UpdateTempUserStatusCommand) error {
@@ -102,7 +104,11 @@ func (ss *xormStore) GetTempUsersQuery(ctx context.Context, query *tempuser.GetT
 		}
 
 		if query.Email != "" {
-			rawSQL += ` AND tu.email=?`
+			if ss.cfg.CaseInsensitiveLogin {
+				rawSQL += ` AND LOWER(tu.email)=LOWER(?)`
+			} else {
+				rawSQL += ` AND tu.email=?`
+			}
 			params = append(params, query.Email)
 		}
 
diff --git a/pkg/services/temp_user/tempuserimpl/store_test.go b/pkg/services/temp_user/tempuserimpl/store_test.go
index 507b5ef179b..7fa636110e5 100644
--- a/pkg/services/temp_user/tempuserimpl/store_test.go
+++ b/pkg/services/temp_user/tempuserimpl/store_test.go
@@ -15,7 +15,7 @@ func TestIntegrationTempUserCommandsAndQueries(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	var store store
+	var store *xormStore
 	var tempUser *tempuser.TempUser
 	var err error
 	cmd := tempuser.CreateTempUserCommand{
@@ -27,7 +27,7 @@ func TestIntegrationTempUserCommandsAndQueries(t *testing.T) {
 	}
 	setup := func(t *testing.T) {
 		db := db.InitTestDB(t)
-		store = &xormStore{db: db}
+		store = &xormStore{db: db, cfg: db.Cfg}
 		tempUser, err = store.CreateTempUser(context.Background(), &cmd)
 		require.Nil(t, err)
 	}
@@ -56,6 +56,31 @@ func TestIntegrationTempUserCommandsAndQueries(t *testing.T) {
 		require.Nil(t, err)
 		require.Equal(t, 1, len(queryResult))
 	})
+	t.Run("Should not be able to get temp users by case-insentive email - case sensitive", func(t *testing.T) {
+		if db.IsTestDbMySQL() {
+			t.Skip("MySQL is case insensitive by default")
+		}
+		setup(t)
+		store.cfg.CaseInsensitiveLogin = false
+		query := tempuser.GetTempUsersQuery{Email: "E@as.co", Status: tempuser.TmpUserInvitePending}
+		queryResult, err := store.GetTempUsersQuery(context.Background(), &query)
+
+		require.Nil(t, err)
+		require.Equal(t, 0, len(queryResult))
+	})
+
+	t.Run("Should be able to get temp users by email - case insensitive", func(t *testing.T) {
+		setup(t)
+		store.cfg.CaseInsensitiveLogin = true
+		query := tempuser.GetTempUsersQuery{Email: "E@as.co", Status: tempuser.TmpUserInvitePending}
+		queryResult, err := store.GetTempUsersQuery(context.Background(), &query)
+
+		require.Nil(t, err)
+		require.Equal(t, 1, len(queryResult))
+		t.Cleanup(func() {
+			store.cfg.CaseInsensitiveLogin = false
+		})
+	})
 
 	t.Run("Should be able to get temp users by code", func(t *testing.T) {
 		setup(t)
diff --git a/pkg/services/temp_user/tempuserimpl/temp_user.go b/pkg/services/temp_user/tempuserimpl/temp_user.go
index b46b3281ce8..e6dd24fe452 100644
--- a/pkg/services/temp_user/tempuserimpl/temp_user.go
+++ b/pkg/services/temp_user/tempuserimpl/temp_user.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 type Service struct {
@@ -13,9 +14,10 @@ type Service struct {
 
 func ProvideService(
 	db db.DB,
+	cfg *setting.Cfg,
 ) tempuser.Service {
 	return &Service{
-		store: &xormStore{db: db},
+		store: &xormStore{db: db, cfg: cfg},
 	}
 }
 
diff --git a/pkg/services/user/userimpl/store.go b/pkg/services/user/userimpl/store.go
index f2f9355ddfe..f59c6e40302 100644
--- a/pkg/services/user/userimpl/store.go
+++ b/pkg/services/user/userimpl/store.go
@@ -88,8 +88,16 @@ func (ss *sqlStore) Insert(ctx context.Context, cmd *user.User) (int64, error) {
 }
 
 func (ss *sqlStore) Get(ctx context.Context, usr *user.User) (*user.User, error) {
+	ret := &user.User{}
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		exists, err := sess.Where("email=? OR login=?", usr.Email, usr.Login).Get(usr)
+		where := "email=? OR login=?"
+		login := usr.Login
+		email := usr.Email
+		if ss.cfg.CaseInsensitiveLogin {
+			where = "LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)"
+		}
+
+		exists, err := sess.Where(where, email, login).Get(ret)
 		if !exists {
 			return user.ErrUserNotFound
 		}
@@ -101,7 +109,8 @@ func (ss *sqlStore) Get(ctx context.Context, usr *user.User) (*user.User, error)
 	if err != nil {
 		return nil, err
 	}
-	return usr, nil
+
+	return ret, nil
 }
 
 func (ss *sqlStore) Delete(ctx context.Context, userID int64) error {
diff --git a/pkg/services/user/userimpl/store_test.go b/pkg/services/user/userimpl/store_test.go
index e3b43a801b0..e617478d161 100644
--- a/pkg/services/user/userimpl/store_test.go
+++ b/pkg/services/user/userimpl/store_test.go
@@ -21,6 +21,94 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+func TestIntegrationUserGet(t *testing.T) {
+	testCases := []struct {
+		name            string
+		wantErr         error
+		searchLogin     string
+		searchEmail     string
+		caseInsensitive bool
+	}{
+		{
+			name:            "user not found non exact - not case insensitive",
+			wantErr:         user.ErrUserNotFound,
+			searchLogin:     "Test",
+			searchEmail:     "Test@email.com",
+			caseInsensitive: false,
+		},
+		{
+			name:            "user found exact - not case insensitive",
+			wantErr:         nil,
+			searchLogin:     "test",
+			searchEmail:     "test@email.com",
+			caseInsensitive: false,
+		},
+		{
+			name:            "user found non exact - case insensitive",
+			wantErr:         nil,
+			searchLogin:     "Test",
+			searchEmail:     "Test@email.com",
+			caseInsensitive: true,
+		},
+		{
+			name:            "user found exact - case insensitive",
+			wantErr:         nil,
+			searchLogin:     "Test",
+			searchEmail:     "Test@email.com",
+			caseInsensitive: true,
+		},
+		{
+			name:            "user not found - case insensitive",
+			wantErr:         user.ErrUserNotFound,
+			searchLogin:     "Test_login",
+			searchEmail:     "Test*@email.com",
+			caseInsensitive: true,
+		},
+	}
+
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	ss := db.InitTestDB(t)
+	cfg := ss.Cfg
+	userStore := ProvideStore(ss, cfg)
+
+	_, errUser := userStore.Insert(context.Background(),
+		&user.User{
+			Email:   "test@email.com",
+			Name:    "test",
+			Login:   "test",
+			Created: time.Now(),
+			Updated: time.Now(),
+		},
+	)
+	require.NoError(t, errUser)
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			if !tc.caseInsensitive && db.IsTestDbMySQL() {
+				t.Skip("mysql is always case insensitive")
+			}
+			cfg.CaseInsensitiveLogin = tc.caseInsensitive
+			usr, err := userStore.Get(context.Background(),
+				&user.User{
+					Email: tc.searchEmail,
+					Login: tc.searchLogin,
+				},
+			)
+
+			if tc.wantErr != nil {
+				require.Error(t, err)
+				require.Nil(t, usr)
+			} else {
+				require.NoError(t, err)
+				require.NotNil(t, usr)
+			}
+		})
+	}
+}
+
 func TestIntegrationUserDataAccess(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 97f7a39e78b..3f0e65a1711 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -1590,7 +1590,7 @@ func readUserSettings(iniFile *ini.File, cfg *Cfg) error {
 	cfg.AutoAssignOrgRole = users.Key("auto_assign_org_role").In("Editor", []string{"Editor", "Admin", "Viewer"})
 	VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
 
-	cfg.CaseInsensitiveLogin = users.Key("case_insensitive_login").MustBool(false)
+	cfg.CaseInsensitiveLogin = users.Key("case_insensitive_login").MustBool(true)
 
 	LoginHint = valueAsString(users, "login_hint", "")
 	PasswordHint = valueAsString(users, "password_hint", "")

From 73381646120d7c3fc3e092a3fe147ca7eacc6125 Mon Sep 17 00:00:00 2001
From: Virginia Cepeda <virginia.cepeda@grafana.com>
Date: Fri, 28 Apr 2023 12:58:15 -0300
Subject: [PATCH 544/729] Alerting: Add alert instance picker (#67138)

* Add Preview template and payload editor to templates form

* Add TemplatePreview test and update css

* Preview errors for each template that is wrong

* Enable preview templating only for Grafana Alert Manager

* Use harcoded default payload instead of requesting it to the backend

* Update error response in the api definition

* Add spinner when loading result for preview

* Update api request followind DD changes

* Use pre instead of TextArea to render the preview

* Fix tests

* Add alert list editor

* Add start and end time for alert generator

* Add preview for data list added in the modal

* Update copies and move submit button in alert generator to the bottom

* Copy updates

* Refactor

* Use tab instead of button to preview

* Move payload editor next to the content

* Copy update

* Refactor

* Adress PR review comments

* Fix wrong json format throwing an exception when adding more data

* Use monaco editor for payload

* Only show text 'Preview for...'  when we have more than one define

* Fix some errors

* Update CollapseSection style

* Add tooltip for the Payload info icon explaining the available list of alert data fields in preview

* Set payload as invalid if it's not an array

* Fix test

* Update text in AlertTemplateDataTable

* Add separators to distinguish lines that belong to the preview

* Use harcoded default payload instead of requesting it to the backend

* Add alert instance picker

* Add rule search capability and cleanup

* Display alert instance extra information on hover

* Rebase and integrate with existing view

* Display folder under rule name

* Display unique labels for alert instances

* Remove unneeded interface

* Reset state after closing the modal

* Refactor useEffect and useMemo

* Move common code to variable

* Refactor to avoid setting filtered rules as state

* Disable instance selector button when there are errors in the payload

* Validate payload on button click

* Change warning text

* Add support for state filters in alertmanager alerts request

* Use RTK Query to fetch alert instances

* Address review comments

* Fix lint

---------

Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com>
---
 .../alerting/unified/api/alertmanagerApi.ts   |  16 +-
 .../receivers/AlertInstanceModalSelector.tsx  | 380 ++++++++++++++++++
 .../components/receivers/PayloadEditor.tsx    |  42 +-
 .../components/receivers/TemplateForm.tsx     |   1 +
 .../features/alerting/unified/utils/labels.ts |  13 +
 5 files changed, 448 insertions(+), 4 deletions(-)
 create mode 100644 public/app/features/alerting/unified/components/receivers/AlertInstanceModalSelector.tsx

diff --git a/public/app/features/alerting/unified/api/alertmanagerApi.ts b/public/app/features/alerting/unified/api/alertmanagerApi.ts
index 762c79bb662..a761134eaf9 100644
--- a/public/app/features/alerting/unified/api/alertmanagerApi.ts
+++ b/public/app/features/alerting/unified/api/alertmanagerApi.ts
@@ -40,9 +40,23 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
           ?.filter((matcher) => matcher.name && matcher.value)
           .map((matcher) => `${matcher.name}${matcherToOperator(matcher)}${matcher.value}`);
 
+        const { silenced, inhibited, unprocessed, active } = filter || {};
+
+        const stateParams = Object.fromEntries(
+          Object.entries({ silenced, active, inhibited, unprocessed }).filter(([_, value]) => value !== undefined)
+        );
+
+        const params: Record<string, unknown> | undefined = { filter: filterMatchers };
+
+        if (stateParams) {
+          Object.keys(stateParams).forEach((key: string) => {
+            params[key] = stateParams[key];
+          });
+        }
+
         return {
           url: `/api/alertmanager/${getDatasourceAPIUid(amSourceName)}/api/v2/alerts`,
-          params: { filter: filterMatchers },
+          params,
         };
       },
     }),
diff --git a/public/app/features/alerting/unified/components/receivers/AlertInstanceModalSelector.tsx b/public/app/features/alerting/unified/components/receivers/AlertInstanceModalSelector.tsx
new file mode 100644
index 00000000000..beff7898e50
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/AlertInstanceModalSelector.tsx
@@ -0,0 +1,380 @@
+import { css, cx } from '@emotion/css';
+import React, { CSSProperties, useCallback, useMemo, useState } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
+import { FixedSizeList } from 'react-window';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import {
+  Button,
+  clearButtonStyles,
+  FilterInput,
+  LoadingPlaceholder,
+  Modal,
+  Tooltip,
+  useStyles2,
+  Icon,
+  Tag,
+} from '@grafana/ui';
+import { AlertmanagerAlert, TestTemplateAlert } from 'app/plugins/datasource/alertmanager/types';
+
+import { alertmanagerApi } from '../../api/alertmanagerApi';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
+import { arrayLabelsToObject, labelsToTags, objectLabelsToArray } from '../../utils/labels';
+import { extractCommonLabels, omitLabels } from '../rules/state-history/common';
+
+export function AlertInstanceModalSelector({
+  onSelect,
+  isOpen,
+  onClose,
+}: {
+  onSelect: (alerts: TestTemplateAlert[]) => void;
+  isOpen: boolean;
+  onClose: () => void;
+}) {
+  const styles = useStyles2(getStyles);
+
+  const [selectedRule, setSelectedRule] = useState<string>();
+  const [selectedInstances, setSelectedInstances] = useState<AlertmanagerAlert[] | null>(null);
+  const { useGetAlertmanagerAlertsQuery } = alertmanagerApi;
+
+  const {
+    currentData: result = [],
+    isFetching: loading,
+    isError: error,
+  } = useGetAlertmanagerAlertsQuery({
+    amSourceName: GRAFANA_RULES_SOURCE_NAME,
+    filter: {
+      inhibited: true,
+      silenced: true,
+      active: true,
+    },
+  });
+
+  const [ruleFilter, setRuleFilter] = useState('');
+
+  const rulesWithInstances: Record<string, AlertmanagerAlert[]> = useMemo(() => {
+    const rules: Record<string, AlertmanagerAlert[]> = {};
+    if (!loading && result) {
+      result.forEach((instance) => {
+        if (!rules[instance.labels['alertname']]) {
+          rules[instance.labels['alertname']] = [];
+        }
+        rules[instance.labels['alertname']].push(instance);
+      });
+    }
+    return rules;
+  }, [loading, result]);
+
+  const handleRuleChange = useCallback((rule: string) => {
+    setSelectedRule(rule);
+    setSelectedInstances(null);
+  }, []);
+
+  const filteredRules: Record<string, AlertmanagerAlert[]> = useMemo(() => {
+    const filteredRules = Object.keys(rulesWithInstances).filter((rule) =>
+      rule.toLowerCase().includes(ruleFilter.toLowerCase())
+    );
+    const filteredRulesObject: Record<string, AlertmanagerAlert[]> = {};
+    filteredRules.forEach((rule) => {
+      filteredRulesObject[rule] = rulesWithInstances[rule];
+    });
+    return filteredRulesObject;
+  }, [rulesWithInstances, ruleFilter]);
+
+  if (error) {
+    return null;
+  }
+
+  const filteredRulesKeys = Object.keys(filteredRules || []);
+
+  const RuleRow = ({ index, style }: { index: number; style?: CSSProperties }) => {
+    if (!filteredRules) {
+      return null;
+    }
+    const ruleName = filteredRulesKeys[index];
+
+    const isSelected = ruleName === selectedRule;
+
+    return (
+      <button
+        type="button"
+        title={ruleName}
+        style={style}
+        className={cx(styles.rowButton, { [styles.rowOdd]: index % 2 === 1, [styles.rowSelected]: isSelected })}
+        onClick={() => handleRuleChange(ruleName)}
+      >
+        <div className={cx(styles.ruleTitle, styles.rowButtonTitle)}>{ruleName}</div>
+        <div className={styles.alertFolder}>
+          <>
+            <Icon name="folder" /> {filteredRules[ruleName][0].labels['grafana_folder'] ?? ''}
+          </>
+        </div>
+      </button>
+    );
+  };
+
+  const getAlertUniqueLabels = (allAlerts: AlertmanagerAlert[], currentAlert: AlertmanagerAlert) => {
+    const allLabels = allAlerts.map((alert) => alert.labels);
+    const labelsAsArray = allLabels.map(objectLabelsToArray);
+
+    const ruleCommonLabels = extractCommonLabels(labelsAsArray);
+    const alertUniqueLabels = omitLabels(objectLabelsToArray(currentAlert.labels), ruleCommonLabels);
+
+    const tags = alertUniqueLabels.length
+      ? labelsToTags(arrayLabelsToObject(alertUniqueLabels))
+      : labelsToTags(currentAlert.labels);
+
+    return tags;
+  };
+
+  const InstanceRow = ({ index, style }: { index: number; style: CSSProperties }) => {
+    const alerts = useMemo(() => (selectedRule ? rulesWithInstances[selectedRule] : []), []);
+    const alert = alerts[index];
+    const isSelected = selectedInstances?.includes(alert);
+    const tags = useMemo(() => getAlertUniqueLabels(alerts, alert), [alerts, alert]);
+
+    const handleSelectInstances = () => {
+      if (isSelected && selectedInstances) {
+        setSelectedInstances(selectedInstances.filter((instance) => instance !== alert));
+        return;
+      }
+      setSelectedInstances([...(selectedInstances || []), alert]);
+    };
+
+    return (
+      <button
+        type="button"
+        style={style}
+        className={cx(styles.rowButton, styles.instanceButton, {
+          [styles.rowOdd]: index % 2 === 1,
+          [styles.rowSelected]: isSelected,
+        })}
+        onClick={handleSelectInstances}
+      >
+        <div className={styles.rowButtonTitle} title={alert.labels['alertname']}>
+          <Tooltip placement="bottom" content={<pre>{JSON.stringify(alert, null, 2)}</pre>} theme={'info'}>
+            <div>
+              {tags.map((tag, index) => (
+                <Tag key={index} name={tag} className={styles.tag} />
+              ))}
+            </div>
+          </Tooltip>
+        </div>
+      </button>
+    );
+  };
+
+  const handleConfirm = () => {
+    const instances: TestTemplateAlert[] =
+      selectedInstances?.map((instance: AlertmanagerAlert) => {
+        const alert: TestTemplateAlert = {
+          annotations: instance.annotations,
+          labels: instance.labels,
+          startsAt: instance.startsAt,
+          endsAt: instance.endsAt,
+        };
+        return alert;
+      }) || [];
+
+    onSelect(instances);
+    resetState();
+  };
+
+  const resetState = () => {
+    setSelectedRule(undefined);
+    setSelectedInstances(null);
+    setRuleFilter('');
+    handleSearchRules('');
+  };
+
+  const onDismiss = () => {
+    resetState();
+    onClose();
+  };
+
+  const handleSearchRules = (filter: string) => {
+    setRuleFilter(filter);
+  };
+
+  return (
+    <div>
+      <Modal
+        title="Select alert instances"
+        className={styles.modal}
+        closeOnEscape
+        isOpen={isOpen}
+        onDismiss={onDismiss}
+        contentClassName={styles.modalContent}
+      >
+        <div className={styles.container}>
+          <FilterInput
+            value={ruleFilter}
+            onChange={handleSearchRules}
+            title="Search alert rule"
+            placeholder="Search alert rule"
+            autoFocus
+          />
+          <div>{(selectedRule && 'Select one or more instances from the list below') || ''}</div>
+
+          <div className={styles.column}>
+            {loading && <LoadingPlaceholder text="Loading rules..." className={styles.loadingPlaceholder} />}
+
+            {!loading && (
+              <AutoSizer>
+                {({ height, width }) => (
+                  <FixedSizeList itemSize={50} height={height} width={width} itemCount={filteredRulesKeys.length}>
+                    {RuleRow}
+                  </FixedSizeList>
+                )}
+              </AutoSizer>
+            )}
+          </div>
+
+          <div className={styles.column}>
+            {!selectedRule && !loading && (
+              <div className={styles.selectedRulePlaceholder}>
+                <div>Select an alert rule to get a list of available instances</div>
+              </div>
+            )}
+            {loading && <LoadingPlaceholder text="Loading rule..." className={styles.loadingPlaceholder} />}
+
+            {selectedRule && rulesWithInstances[selectedRule].length && !loading && (
+              <AutoSizer>
+                {({ width, height }) => (
+                  <FixedSizeList
+                    itemSize={32}
+                    height={height}
+                    width={width}
+                    itemCount={rulesWithInstances[selectedRule].length || 0}
+                  >
+                    {InstanceRow}
+                  </FixedSizeList>
+                )}
+              </AutoSizer>
+            )}
+          </div>
+        </div>
+        <Modal.ButtonRow>
+          <Button type="button" variant="secondary" onClick={onDismiss}>
+            Cancel
+          </Button>
+          <Button
+            type="button"
+            variant="primary"
+            disabled={!(selectedRule && selectedInstances)}
+            onClick={() => {
+              if (selectedRule && selectedInstances) {
+                handleConfirm();
+              }
+            }}
+          >
+            Add alert data to payload
+          </Button>
+        </Modal.ButtonRow>
+      </Modal>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  const clearButton = clearButtonStyles(theme);
+
+  return {
+    container: css`
+      display: grid;
+      grid-template-columns: 1fr 1.5fr;
+      grid-template-rows: min-content auto;
+      gap: ${theme.spacing(2)};
+      flex: 1;
+    `,
+
+    tag: css`
+      margin: 5px;
+    `,
+
+    column: css`
+      flex: 1 1 auto;
+    `,
+
+    alertLabels: css`
+      overflow-x: auto;
+      height: 32px;
+    `,
+    ruleTitle: css`
+      height: 22px;
+      font-weight: ${theme.typography.fontWeightBold};
+    `,
+    rowButton: css`
+      ${clearButton};
+      padding: ${theme.spacing(0.5)};
+      overflow: hidden;
+      text-overflow: ellipsis;
+      text-align: left;
+      white-space: nowrap;
+      cursor: pointer;
+      border: 2px solid transparent;
+
+      &:disabled {
+        cursor: not-allowed;
+        color: ${theme.colors.text.disabled};
+      }
+    `,
+    rowButtonTitle: css`
+      overflow-x: auto;
+    `,
+    rowSelected: css`
+      border-color: ${theme.colors.primary.border};
+    `,
+    rowOdd: css`
+      background-color: ${theme.colors.background.secondary};
+    `,
+    instanceButton: css`
+      display: flex;
+      gap: ${theme.spacing(1)};
+      justify-content: space-between;
+      align-items: center;
+    `,
+    loadingPlaceholder: css`
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    `,
+    selectedRulePlaceholder: css`
+      width: 100%;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      text-align: center;
+      font-weight: ${theme.typography.fontWeightBold};
+    `,
+    modal: css`
+      height: 100%;
+    `,
+    modalContent: css`
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+    `,
+    modalAlert: css`
+      flex-grow: 0;
+    `,
+    warnIcon: css`
+      fill: ${theme.colors.warning.main};
+    `,
+    labels: css`
+      justify-content: flex-start;
+    `,
+    alertFolder: css`
+      height: 20px;
+      font-size: ${theme.typography.bodySmall.fontSize};
+      color: ${theme.colors.text.secondary};
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      column-gap: ${theme.spacing(1)};
+      align-items: center;
+    `,
+  };
+};
diff --git a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
index 20ab3d80e31..a39cbdbad48 100644
--- a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
+++ b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
@@ -5,6 +5,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { Badge, Button, CodeEditor, Icon, Tooltip, useStyles2 } from '@grafana/ui';
 import { TestTemplateAlert } from 'app/plugins/datasource/alertmanager/types';
 
+import { AlertInstanceModalSelector } from './AlertInstanceModalSelector';
 import { AlertTemplatePreviewData } from './TemplateData';
 import { TemplateDataTable } from './TemplateDataDocs';
 import { GenerateAlertDataModal } from './form/GenerateAlertDataModal';
@@ -39,25 +40,43 @@ export function PayloadEditor({
 
   const errorInPayloadJson = payloadFormatError !== null;
 
-  const onOpenEditAlertModal = () => {
+  const validatePayload = () => {
     try {
       const payloadObj = JSON.parse(payload);
       JSON.stringify([...payloadObj]); // check if it's iterable, in order to be able to add more data
-      setIsEditingAlertData(true);
       setPayloadFormatError(null);
     } catch (e) {
       setPayloadFormatError(e instanceof Error ? e.message : 'Invalid JSON.');
       onPayloadError();
+      throw e;
     }
   };
+
+  const onOpenEditAlertModal = () => {
+    try {
+      validatePayload();
+      setIsEditingAlertData(true);
+    } catch (e) {}
+  };
+
+  const onOpenAlertSelectorModal = () => {
+    try {
+      validatePayload();
+      setIsAlertSelectorOpen(true);
+    } catch (e) {}
+  };
+
   const onAddAlertList = (alerts: TestTemplateAlert[]) => {
     onCloseEditAlertModal();
+    setIsAlertSelectorOpen(false);
     setPayload((payload) => {
       const payloadObj = JSON.parse(payload);
       return JSON.stringify([...payloadObj, ...alerts], undefined, 2);
     });
   };
 
+  const [isAlertSelectorOpen, setIsAlertSelectorOpen] = useState(false);
+
   return (
     <div className={styles.wrapper}>
       <div className={styles.editor}>
@@ -93,17 +112,34 @@ export function PayloadEditor({
           >
             Add alert data
           </Button>
+
+          <Button
+            type="button"
+            variant="secondary"
+            icon="bell"
+            disabled={errorInPayloadJson}
+            onClick={onOpenAlertSelectorModal}
+          >
+            Choose alert instances
+          </Button>
+
           {payloadFormatError !== null && (
             <Badge
               color="orange"
               icon="exclamation-triangle"
-              text={'There are some errors in payload JSON.'}
+              text={'JSON Error'}
               tooltip={'Fix errors in payload, and click Refresh preview button'}
             />
           )}
         </div>
       </div>
       <GenerateAlertDataModal isOpen={isEditingAlertData} onDismiss={onCloseEditAlertModal} onAccept={onAddAlertList} />
+
+      <AlertInstanceModalSelector
+        onSelect={onAddAlertList}
+        isOpen={isAlertSelectorOpen}
+        onClose={() => setIsAlertSelectorOpen(false)}
+      />
     </div>
   );
 }
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
index 52299c0a047..72c28266b14 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
@@ -316,6 +316,7 @@ function getErrorsToRender(results: TemplatePreviewErrors[]) {
     })
     .join(`\n`);
 }
+
 export const PREVIEW_NOT_AVAILABLE = 'Preview request failed. Check if the payload data has the correct structure.';
 
 function getPreviewTorender(
diff --git a/public/app/features/alerting/unified/utils/labels.ts b/public/app/features/alerting/unified/utils/labels.ts
index 58fa467f698..5471520a3f5 100644
--- a/public/app/features/alerting/unified/utils/labels.ts
+++ b/public/app/features/alerting/unified/utils/labels.ts
@@ -1,7 +1,20 @@
 import { Labels } from '../../../../types/unified-alerting-dto';
+import { Label } from '../components/rules/state-history/common';
 
 export function labelsToTags(labels: Labels) {
   return Object.entries(labels)
     .map(([label, value]) => `${label}=${value}`)
     .sort();
 }
+
+export function objectLabelsToArray(labels: Labels): Label[] {
+  return Object.entries(labels).map(([label, value]) => [label, value]);
+}
+
+export function arrayLabelsToObject(labels: Label[]): Labels {
+  const labelsObject: Labels = {};
+  labels.forEach((label: Label) => {
+    labelsObject[label[0]] = label[1];
+  });
+  return labelsObject;
+}

From 166641d66d22c72d93d6d5c4c69b1630d9450e87 Mon Sep 17 00:00:00 2001
From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
Date: Fri, 28 Apr 2023 18:00:56 +0200
Subject: [PATCH 545/729] NestedFolders: Permission for creating and editing
 (#67406)

* Initial permissions

* Show/hide checkboxes

* Fix kinds from main

* CreateNewButton tests

* Update DashboardsTree test

* Mock folder permissions

* Rename showCheckBoxes to canSelect

* Make column ordering look better
---
 .../BrowseDashboardsPage.test.tsx             |  9 +++
 .../BrowseDashboardsPage.tsx                  | 27 ++++++++-
 .../components/BrowseView.test.tsx            | 10 ++--
 .../components/BrowseView.tsx                 |  4 +-
 .../components/CreateNewButton.test.tsx       | 22 ++++++-
 .../components/CreateNewButton.tsx            | 16 ++++--
 .../components/DashboardsTree.test.tsx        | 25 ++++++++
 .../components/DashboardsTree.tsx             | 57 ++++++++++---------
 .../components/SearchView.tsx                 |  7 ++-
 .../features/browse-dashboards/permissions.ts | 26 +++++++++
 10 files changed, 160 insertions(+), 43 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/permissions.ts

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
index 78d416cae1c..27c5724157b 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
@@ -9,6 +9,7 @@ import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps
 
 import BrowseDashboardsPage, { Props } from './BrowseDashboardsPage';
 import { wellFormedTree } from './fixtures/dashboardsTreeItem.fixture';
+import * as permissions from './permissions';
 const [mockTree, { dashbdD }] = wellFormedTree();
 
 jest.mock('react-virtualized-auto-sizer', () => {
@@ -57,6 +58,14 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
     props = {
       ...getRouteComponentProps(),
     };
+
+    jest.spyOn(permissions, 'getFolderPermissions').mockImplementation(() => {
+      return {
+        canEditInFolder: true,
+        canCreateDashboards: true,
+        canCreateFolder: true,
+      };
+    });
   });
 
   it('displays a search input', async () => {
diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index 63421067dd9..bda3a89aa66 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -17,6 +17,7 @@ import { BrowseFilters } from './components/BrowseFilters';
 import { BrowseView } from './components/BrowseView';
 import { CreateNewButton } from './components/CreateNewButton';
 import { SearchView } from './components/SearchView';
+import { getFolderPermissions } from './permissions';
 import { useHasSelection } from './state';
 
 export interface BrowseDashboardsPageRouteParams {
@@ -52,8 +53,22 @@ const BrowseDashboardsPage = memo(({ match }: Props) => {
   const navModel = useMemo(() => (folderDTO ? buildNavModel(folderDTO) : undefined), [folderDTO]);
   const hasSelection = useHasSelection();
 
+  const { canEditInFolder, canCreateDashboards, canCreateFolder } = getFolderPermissions(folderDTO);
+
   return (
-    <Page navId="dashboards/browse" pageNav={navModel} actions={<CreateNewButton inFolder={folderUID} />}>
+    <Page
+      navId="dashboards/browse"
+      pageNav={navModel}
+      actions={
+        (canCreateDashboards || canCreateFolder) && (
+          <CreateNewButton
+            inFolder={folderUID}
+            canCreateDashboard={canCreateDashboards}
+            canCreateFolder={canCreateFolder}
+          />
+        )
+      }
+    >
       <Page.Contents className={styles.pageContents}>
         <FilterInput
           placeholder={getSearchPlaceholder(searchState.includePanels)}
@@ -68,9 +83,15 @@ const BrowseDashboardsPage = memo(({ match }: Props) => {
           <AutoSizer>
             {({ width, height }) =>
               isSearching ? (
-                <SearchView key={rerender} width={width} height={height} />
+                <SearchView key={rerender} canSelect={canEditInFolder} width={width} height={height} />
               ) : (
-                <BrowseView key={rerender} width={width} height={height} folderUID={folderUID} />
+                <BrowseView
+                  key={rerender}
+                  canSelect={canEditInFolder}
+                  width={width}
+                  height={height}
+                  folderUID={folderUID}
+                />
               )
             }
           </AutoSizer>
diff --git a/public/app/features/browse-dashboards/components/BrowseView.test.tsx b/public/app/features/browse-dashboards/components/BrowseView.test.tsx
index dcba29461f8..24d262105ca 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.test.tsx
@@ -32,7 +32,7 @@ describe('browse-dashboards BrowseView', () => {
   const HEIGHT = 600;
 
   it('expands and collapses a folder', async () => {
-    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    render(<BrowseView canSelect folderUID={undefined} width={WIDTH} height={HEIGHT} />);
     await screen.findByText(folderA.item.title);
 
     await expandFolder(folderA.item.uid);
@@ -43,7 +43,7 @@ describe('browse-dashboards BrowseView', () => {
   });
 
   it('checks items when selected', async () => {
-    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    render(<BrowseView canSelect folderUID={undefined} width={WIDTH} height={HEIGHT} />);
 
     const checkbox = await screen.findByTestId(selectors.pages.BrowseDashbards.table.checkbox(dashbdD.item.uid));
     expect(checkbox).not.toBeChecked();
@@ -53,7 +53,7 @@ describe('browse-dashboards BrowseView', () => {
   });
 
   it('checks all descendants when a folder is selected', async () => {
-    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    render(<BrowseView canSelect folderUID={undefined} width={WIDTH} height={HEIGHT} />);
     await screen.findByText(folderA.item.title);
 
     // First expand then click folderA
@@ -72,7 +72,7 @@ describe('browse-dashboards BrowseView', () => {
   });
 
   it('checks descendants loaded after a folder is selected', async () => {
-    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    render(<BrowseView canSelect folderUID={undefined} width={WIDTH} height={HEIGHT} />);
     await screen.findByText(folderA.item.title);
 
     // First expand then click folderA
@@ -94,7 +94,7 @@ describe('browse-dashboards BrowseView', () => {
   });
 
   it('unchecks ancestors when unselecting an item', async () => {
-    render(<BrowseView folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    render(<BrowseView canSelect folderUID={undefined} width={WIDTH} height={HEIGHT} />);
     await screen.findByText(folderA.item.title);
 
     await expandFolder(folderA.item.uid);
diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
index e67c2fbc4e3..d3f9b2e927d 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -18,9 +18,10 @@ interface BrowseViewProps {
   height: number;
   width: number;
   folderUID: string | undefined;
+  canSelect: boolean;
 }
 
-export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
+export function BrowseView({ folderUID, width, height, canSelect }: BrowseViewProps) {
   const dispatch = useDispatch();
   const flatTree = useFlatTreeState(folderUID);
   const selectedItems = useCheckboxSelectionState();
@@ -49,6 +50,7 @@ export function BrowseView({ folderUID, width, height }: BrowseViewProps) {
 
   return (
     <DashboardsTree
+      canSelect={canSelect}
       items={flatTree}
       width={width}
       height={height}
diff --git a/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx b/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
index 7da67fe3a50..d81b3818161 100644
--- a/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
+++ b/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { CreateNewButton } from './CreateNewButton';
 
 async function renderAndOpen(folderUID?: string) {
-  render(<CreateNewButton inFolder={folderUID} />);
+  render(<CreateNewButton canCreateDashboard canCreateFolder inFolder={folderUID} />);
   const newButton = screen.getByText('New');
   await userEvent.click(newButton);
 }
@@ -26,4 +26,24 @@ describe('NewActionsButton', () => {
     expect(screen.getByText('New Folder')).toHaveAttribute('href', '/dashboards/folder/new');
     expect(screen.getByText('Import')).toHaveAttribute('href', '/dashboard/import');
   });
+
+  it('should only render dashboard items when folder creation is disabled', async () => {
+    render(<CreateNewButton canCreateDashboard canCreateFolder={false} />);
+    const newButton = screen.getByText('New');
+    await userEvent.click(newButton);
+
+    expect(screen.getByText('New Dashboard')).toBeInTheDocument();
+    expect(screen.getByText('Import')).toBeInTheDocument();
+    expect(screen.queryByText('New Folder')).not.toBeInTheDocument();
+  });
+
+  it('should only render folder item when dashboard creation is disabled', async () => {
+    render(<CreateNewButton canCreateDashboard={false} canCreateFolder />);
+    const newButton = screen.getByText('New');
+    await userEvent.click(newButton);
+
+    expect(screen.queryByText('New Dashboard')).not.toBeInTheDocument();
+    expect(screen.queryByText('Import')).not.toBeInTheDocument();
+    expect(screen.getByText('New Folder')).toBeInTheDocument();
+  });
 });
diff --git a/public/app/features/browse-dashboards/components/CreateNewButton.tsx b/public/app/features/browse-dashboards/components/CreateNewButton.tsx
index 01e32bf8fbb..ac38ca4945f 100644
--- a/public/app/features/browse-dashboards/components/CreateNewButton.tsx
+++ b/public/app/features/browse-dashboards/components/CreateNewButton.tsx
@@ -13,14 +13,22 @@ interface Props {
    * Pass a folder UID in which the dashboard or folder will be created
    */
   inFolder?: string;
+  canCreateFolder: boolean;
+  canCreateDashboard: boolean;
 }
 
-export function CreateNewButton({ inFolder }: Props) {
+export function CreateNewButton({ inFolder, canCreateDashboard, canCreateFolder }: Props) {
   const newMenu = (
     <Menu>
-      <MenuItem url={addFolderUidToUrl('/dashboard/new', inFolder)} label={getNewDashboardPhrase()} />
-      <MenuItem url={addFolderUidToUrl('/dashboards/folder/new', inFolder)} label={getNewFolderPhrase()} />
-      <MenuItem url={addFolderUidToUrl('/dashboard/import', inFolder)} label={getImportPhrase()} />
+      {canCreateDashboard && (
+        <MenuItem url={addFolderUidToUrl('/dashboard/new', inFolder)} label={getNewDashboardPhrase()} />
+      )}
+      {canCreateFolder && (
+        <MenuItem url={addFolderUidToUrl('/dashboards/folder/new', inFolder)} label={getNewFolderPhrase()} />
+      )}
+      {canCreateDashboard && (
+        <MenuItem url={addFolderUidToUrl('/dashboard/import', inFolder)} label={getImportPhrase()} />
+      )}
     </Menu>
   );
 
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
index 65b498d29e0..0f3192636e6 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
@@ -4,6 +4,8 @@ import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { assertIsDefined } from 'test/helpers/asserts';
 
+import { selectors } from '@grafana/e2e-selectors';
+
 import { wellFormedDashboard, wellFormedEmptyFolder, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
 
 import { DashboardsTree } from './DashboardsTree';
@@ -30,6 +32,7 @@ describe('browse-dashboards DashboardsTree', () => {
   it('renders a dashboard item', () => {
     render(
       <DashboardsTree
+        canSelect
         items={[dashboard]}
         selectedItems={selectedItems}
         width={WIDTH}
@@ -42,11 +45,31 @@ describe('browse-dashboards DashboardsTree', () => {
     expect(screen.queryByText(dashboard.item.title)).toBeInTheDocument();
     expect(screen.queryByText('Dashboard')).toBeInTheDocument();
     expect(screen.queryByText(assertIsDefined(dashboard.item.tags)[0])).toBeInTheDocument();
+    expect(screen.getByTestId(selectors.pages.BrowseDashbards.table.checkbox(dashboard.item.uid))).toBeInTheDocument();
+  });
+
+  it('does not render checkbox when disabled', () => {
+    render(
+      <DashboardsTree
+        canSelect={false}
+        items={[dashboard]}
+        selectedItems={selectedItems}
+        width={WIDTH}
+        height={HEIGHT}
+        onFolderClick={noop}
+        onItemSelectionChange={noop}
+        onAllSelectionChange={noop}
+      />
+    );
+    expect(
+      screen.queryByTestId(selectors.pages.BrowseDashbards.table.checkbox(dashboard.item.uid))
+    ).not.toBeInTheDocument();
   });
 
   it('renders a folder item', () => {
     render(
       <DashboardsTree
+        canSelect
         items={[folder]}
         selectedItems={selectedItems}
         width={WIDTH}
@@ -64,6 +87,7 @@ describe('browse-dashboards DashboardsTree', () => {
     const handler = jest.fn();
     render(
       <DashboardsTree
+        canSelect
         items={[folder]}
         selectedItems={selectedItems}
         width={WIDTH}
@@ -82,6 +106,7 @@ describe('browse-dashboards DashboardsTree', () => {
   it('renders empty folder indicators', () => {
     render(
       <DashboardsTree
+        canSelect
         items={[emptyFolderIndicator]}
         selectedItems={selectedItems}
         width={WIDTH}
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
index 10f2dee9f3a..0451b15aa96 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
@@ -3,7 +3,7 @@ import React, { useMemo } from 'react';
 import { CellProps, Column, HeaderProps, TableInstance, useTable } from 'react-table';
 import { FixedSizeList as List } from 'react-window';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, isTruthy } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Checkbox, useStyles2 } from '@grafana/ui';
 import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
@@ -23,6 +23,7 @@ interface DashboardsTreeProps {
   onFolderClick: (uid: string, newOpenState: boolean) => void;
   onAllSelectionChange: (newState: boolean) => void;
   onItemSelectionChange: (item: DashboardViewItem, newState: boolean) => void;
+  canSelect: boolean;
 }
 
 type DashboardsTreeColumn = Column<DashboardsTreeItem>;
@@ -46,34 +47,37 @@ export function DashboardsTree({
   onFolderClick,
   onAllSelectionChange,
   onItemSelectionChange,
+  canSelect = false,
 }: DashboardsTreeProps) {
   const styles = useStyles2(getStyles);
 
   const tableColumns = useMemo(() => {
-    const checkboxColumn: DashboardsTreeColumn = {
-      id: 'checkbox',
-      width: 0,
-      Header: ({ selectedItems }: DashboardTreeHeaderProps) => {
-        const isAllSelected = selectedItems?.$all ?? false;
-        return <Checkbox value={isAllSelected} onChange={(ev) => onAllSelectionChange(ev.currentTarget.checked)} />;
-      },
-      Cell: ({ row: { original: row }, selectedItems }: DashboardsTreeCellProps) => {
-        const item = row.item;
-        if (item.kind === 'ui-empty-folder' || !selectedItems) {
-          return <></>;
+    const checkboxColumn: DashboardsTreeColumn | null = canSelect
+      ? {
+          id: 'checkbox',
+          width: 0,
+          Header: ({ selectedItems }: DashboardTreeHeaderProps) => {
+            const isAllSelected = selectedItems?.$all ?? false;
+            return <Checkbox value={isAllSelected} onChange={(ev) => onAllSelectionChange(ev.currentTarget.checked)} />;
+          },
+          Cell: ({ row: { original: row }, selectedItems }: DashboardsTreeCellProps) => {
+            const item = row.item;
+            if (item.kind === 'ui-empty-folder' || !selectedItems) {
+              return <></>;
+            }
+
+            const isSelected = selectedItems?.[item.kind][item.uid] ?? false;
+
+            return (
+              <Checkbox
+                data-testid={selectors.pages.BrowseDashbards.table.checkbox(item.uid)}
+                value={isSelected}
+                onChange={(ev) => onItemSelectionChange(item, ev.currentTarget.checked)}
+              />
+            );
+          },
         }
-
-        const isSelected = selectedItems?.[item.kind][item.uid] ?? false;
-
-        return (
-          <Checkbox
-            data-testid={selectors.pages.BrowseDashbards.table.checkbox(item.uid)}
-            value={isSelected}
-            onChange={(ev) => onItemSelectionChange(item, ev.currentTarget.checked)}
-          />
-        );
-      },
-    };
+      : null;
 
     const nameColumn: DashboardsTreeColumn = {
       id: 'name',
@@ -95,9 +99,10 @@ export function DashboardsTree({
       Header: 'Tags',
       Cell: TagsCell,
     };
+    const columns = [canSelect && checkboxColumn, nameColumn, typeColumn, tagsColumns].filter(isTruthy);
 
-    return [checkboxColumn, nameColumn, typeColumn, tagsColumns];
-  }, [onItemSelectionChange, onAllSelectionChange, onFolderClick]);
+    return columns;
+  }, [onItemSelectionChange, onAllSelectionChange, onFolderClick, canSelect]);
 
   const table = useTable({ columns: tableColumns, data: items }, useCustomFlexLayout);
   const { getTableProps, getTableBodyProps, headerGroups } = table;
diff --git a/public/app/features/browse-dashboards/components/SearchView.tsx b/public/app/features/browse-dashboards/components/SearchView.tsx
index 92e985f4d0f..ad29eb87190 100644
--- a/public/app/features/browse-dashboards/components/SearchView.tsx
+++ b/public/app/features/browse-dashboards/components/SearchView.tsx
@@ -12,9 +12,10 @@ import { setAllSelection, setItemSelectionState, useHasSelection } from '../stat
 interface SearchViewProps {
   height: number;
   width: number;
+  canSelect: boolean;
 }
 
-export function SearchView({ width, height }: SearchViewProps) {
+export function SearchView({ width, height, canSelect }: SearchViewProps) {
   const dispatch = useDispatch();
   const selectedItems = useSelector((wholeState) => wholeState.browseDashboards.selectedItems);
   const hasSelection = useHasSelection();
@@ -73,8 +74,8 @@ export function SearchView({ width, height }: SearchViewProps) {
 
   const props: SearchResultsProps = {
     response: value,
-    selection: selectionChecker,
-    selectionToggle: handleItemSelectionChange,
+    selection: canSelect ? selectionChecker : undefined,
+    selectionToggle: canSelect ? handleItemSelectionChange : undefined,
     clearSelection,
     width: width,
     height: height,
diff --git a/public/app/features/browse-dashboards/permissions.ts b/public/app/features/browse-dashboards/permissions.ts
new file mode 100644
index 00000000000..0e155f3e257
--- /dev/null
+++ b/public/app/features/browse-dashboards/permissions.ts
@@ -0,0 +1,26 @@
+import { contextSrv } from 'app/core/core';
+import { AccessControlAction, FolderDTO } from 'app/types';
+
+function checkFolderPermission(action: AccessControlAction, fallback: boolean, folderDTO?: FolderDTO) {
+  return folderDTO
+    ? contextSrv.hasAccessInMetadata(action, folderDTO, fallback)
+    : contextSrv.hasAccess(action, fallback);
+}
+
+export function getFolderPermissions(folderDTO?: FolderDTO) {
+  // It is possible to have edit permissions for folders and dashboards, without being able to save, hence 'canSave'
+  const canEditInFolderFallback = folderDTO ? folderDTO.canSave : contextSrv.hasEditPermissionInFolders;
+
+  const canEditInFolder = checkFolderPermission(AccessControlAction.FoldersWrite, canEditInFolderFallback, folderDTO);
+  const canCreateFolder = checkFolderPermission(AccessControlAction.FoldersCreate, contextSrv.isEditor);
+  const canCreateDashboards = checkFolderPermission(
+    AccessControlAction.DashboardsCreate,
+    canEditInFolderFallback || !!folderDTO?.canSave
+  );
+
+  return {
+    canEditInFolder,
+    canCreateDashboards,
+    canCreateFolder,
+  };
+}

From 836fef67856775c59823a3e0ae091246880b6cee Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Fri, 28 Apr 2023 18:19:31 +0200
Subject: [PATCH 546/729] DataSourcePicker: keyboard navigatable list hook and
 implementation in the new data source picker dropdown (#67370)

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
---
 .../components/picker/DataSourceCard.tsx      |  9 ++-
 .../components/picker/DataSourceDropdown.tsx  | 61 +++++++++++++--
 .../components/picker/DataSourceList.tsx      | 36 +++++++--
 .../components/picker/DataSourceModal.tsx     |  1 +
 .../datasources/components/picker/types.ts    |  2 +
 public/app/features/datasources/hooks.ts      | 74 ++++++++++++++++++-
 6 files changed, 167 insertions(+), 16 deletions(-)

diff --git a/public/app/features/datasources/components/picker/DataSourceCard.tsx b/public/app/features/datasources/components/picker/DataSourceCard.tsx
index b68c08622df..ca21443c054 100644
--- a/public/app/features/datasources/components/picker/DataSourceCard.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceCard.tsx
@@ -10,11 +10,16 @@ interface DataSourceCardProps {
   selected: boolean;
 }
 
-export function DataSourceCard({ ds, onClick, selected }: DataSourceCardProps) {
+export function DataSourceCard({ ds, onClick, selected, ...htmlProps }: DataSourceCardProps) {
   const styles = useStyles2(getStyles);
 
   return (
-    <Card key={ds.uid} onClick={onClick} className={cx(styles.card, selected ? styles.selected : undefined)}>
+    <Card
+      key={ds.uid}
+      onClick={onClick}
+      className={cx(styles.card, selected ? styles.selected : undefined)}
+      {...htmlProps}
+    >
       <Card.Heading className={styles.heading}>
         <div className={styles.headingContent}>
           <span className={styles.name}>{ds.name}</span>
diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index 960c692faa0..560d54dbec3 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import { useDialog } from '@react-aria/dialog';
 import { useOverlay } from '@react-aria/overlays';
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { usePopper } from 'react-popper';
 
 import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
@@ -9,6 +9,7 @@ import { reportInteraction } from '@grafana/runtime';
 import { DataSourceJsonData } from '@grafana/schema';
 import { Button, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
 import config from 'app/core/config';
+import { useKeyNavigationListener } from 'app/features/search/hooks/useSearchKeyboardSelection';
 
 import { useDatasource } from '../../hooks';
 
@@ -30,15 +31,41 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
   const { current, onChange, ...restProps } = props;
 
   const [isOpen, setOpen] = useState(false);
+  const [inputHasFocus, setInputHasFocus] = useState(false);
   const [markerElement, setMarkerElement] = useState<HTMLInputElement | null>();
   const [selectorElement, setSelectorElement] = useState<HTMLDivElement | null>();
-  const [filterTerm, setFilterTerm] = useState<string>();
+  const [filterTerm, setFilterTerm] = useState<string>('');
   const openDropdown = () => {
     reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_DROPDOWN });
     setOpen(true);
     markerElement?.focus();
   };
 
+  const { onKeyDown, keyboardEvents } = useKeyNavigationListener();
+
+  useEffect(() => {
+    const sub = keyboardEvents.subscribe({
+      next: (keyEvent) => {
+        switch (keyEvent?.code) {
+          case 'ArrowDown': {
+            openDropdown();
+            keyEvent.preventDefault();
+            break;
+          }
+          case 'ArrowUp':
+            openDropdown();
+            keyEvent.preventDefault();
+            break;
+          case 'Escape':
+            onClose();
+            markerElement?.focus();
+            keyEvent.preventDefault();
+        }
+      },
+    });
+    return () => sub.unsubscribe();
+  });
+
   const currentDataSourceInstanceSettings = useDatasource(current);
 
   const popper = usePopper(markerElement, selectorElement, {
@@ -56,8 +83,7 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
   const onClose = useCallback(() => {
     setFilterTerm('');
     setOpen(false);
-    markerElement?.blur();
-  }, [setOpen, markerElement]);
+  }, [setOpen]);
 
   const ref = useRef<HTMLDivElement>(null);
   const { overlayProps, underlayProps } = useOverlay(
@@ -77,9 +103,11 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
 
   return (
     <div className={styles.container}>
-      <div tabIndex={0} onFocus={openDropdown} role={'button'} className={styles.trigger} onClick={openDropdown}>
+      {/* This clickable div is just extending the clickable area on the input element to include the prefix and suffix. */}
+      {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
+      <div className={styles.trigger} onClick={openDropdown}>
         <Input
-          className={isOpen ? undefined : styles.input}
+          className={inputHasFocus ? undefined : styles.input}
           prefix={
             filterTerm && isOpen ? (
               <DataSourceLogoPlaceHolder />
@@ -89,10 +117,18 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
           }
           suffix={<Icon name={isOpen ? 'search' : 'angle-down'} />}
           placeholder={dataSourceLabel(currentDataSourceInstanceSettings)}
-          onFocus={openDropdown}
           onClick={openDropdown}
+          onFocus={() => {
+            setInputHasFocus(true);
+          }}
+          onBlur={() => {
+            setInputHasFocus(false);
+            onClose();
+          }}
+          onKeyDown={onKeyDown}
           value={filterTerm}
           onChange={(e) => {
+            openDropdown();
             setFilterTerm(e.currentTarget.value);
           }}
           ref={setMarkerElement}
@@ -101,8 +137,16 @@ export function DataSourceDropdown(props: DataSourceDropdownProps) {
       {isOpen ? (
         <Portal>
           <div {...underlayProps} />
-          <div ref={ref} {...overlayProps} {...dialogProps}>
+          <div
+            ref={ref}
+            {...overlayProps}
+            {...dialogProps}
+            onMouseDown={(e) => {
+              e.preventDefault(); /** Need to prevent default here to stop onMouseDown to trigger onBlur of the input element */
+            }}
+          >
             <PickerContent
+              keyboardEvents={keyboardEvents}
               filterTerm={filterTerm}
               onChange={(ds: DataSourceInstanceSettings<DataSourceJsonData>) => {
                 onClose();
@@ -164,6 +208,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
       <div className={styles.dataSourceList}>
         <DataSourceList
           {...props}
+          enableKeyboardNavigation
           current={current}
           onChange={changeCallback}
           filter={(ds) => matchDataSourceWithSearch(ds, filterTerm)}
diff --git a/public/app/features/datasources/components/picker/DataSourceList.tsx b/public/app/features/datasources/components/picker/DataSourceList.tsx
index afefb30f4b8..815336e95bd 100644
--- a/public/app/features/datasources/components/picker/DataSourceList.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceList.tsx
@@ -1,9 +1,12 @@
-import React from 'react';
+import { css, cx } from '@emotion/css';
+import React, { useRef } from 'react';
+import { Observable } from 'rxjs';
 
-import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
+import { DataSourceInstanceSettings, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
 import { getTemplateSrv } from '@grafana/runtime';
+import { useTheme2 } from '@grafana/ui';
 
-import { useDatasources, useRecentlyUsedDataSources } from '../../hooks';
+import { useDatasources, useKeyboardNavigatableList, useRecentlyUsedDataSources } from '../../hooks';
 
 import { DataSourceCard } from './DataSourceCard';
 import { getDataSourceCompareFn, isDataSourceMatch } from './utils';
@@ -30,13 +33,25 @@ export interface DataSourceListProps {
   /** If true,we show only DSs with logs; and if true, pluginId shouldnt be passed in */
   logs?: boolean;
   width?: number;
+  keyboardEvents?: Observable<React.KeyboardEvent>;
   inputId?: string;
   filter?: (dataSource: DataSourceInstanceSettings) => boolean;
   onClear?: () => void;
+  enableKeyboardNavigation?: boolean;
 }
 
 export function DataSourceList(props: DataSourceListProps) {
-  const { className, current, onChange } = props;
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const [navigatableProps, selectedItemCssSelector] = useKeyboardNavigatableList({
+    keyboardEvents: props.keyboardEvents,
+    containerRef: containerRef,
+  });
+
+  const theme = useTheme2();
+  const styles = getStyles(theme, selectedItemCssSelector);
+
+  const { className, current, onChange, enableKeyboardNavigation } = props;
   // QUESTION: Should we use data from the Redux store as admin DS view does?
   const dataSources = useDatasources({
     alerting: props.alerting,
@@ -54,7 +69,7 @@ export function DataSourceList(props: DataSourceListProps) {
   const [recentlyUsedDataSources, pushRecentlyUsedDataSource] = useRecentlyUsedDataSources();
 
   return (
-    <div className={className}>
+    <div ref={containerRef} className={cx(className, styles.container)}>
       {dataSources
         .filter((ds) => (props.filter ? props.filter(ds) : true))
         .sort(getDataSourceCompareFn(current, recentlyUsedDataSources, getDataSourceVariableIDs()))
@@ -67,6 +82,7 @@ export function DataSourceList(props: DataSourceListProps) {
               onChange(ds);
             }}
             selected={!!isDataSourceMatch(ds, current)}
+            {...(enableKeyboardNavigation ? navigatableProps : {})}
           />
         ))}
     </div>
@@ -81,3 +97,13 @@ function getDataSourceVariableIDs() {
     .filter((v) => v.type === 'datasource')
     .map((v) => `\${${v.id}}`);
 }
+
+function getStyles(theme: GrafanaTheme2, selectedItemCssSelector: string) {
+  return {
+    container: css`
+      ${selectedItemCssSelector} {
+        background-color: ${theme.colors.background.secondary};
+      }
+    `,
+  };
+}
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index 315f8a55aca..a7845f742b4 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -94,6 +94,7 @@ export function DataSourceModal({
     >
       <div className={styles.leftColumn}>
         <Input
+          autoFocus
           className={styles.searchInput}
           value={search}
           prefix={<Icon name="search" />}
diff --git a/public/app/features/datasources/components/picker/types.ts b/public/app/features/datasources/components/picker/types.ts
index 4dc7dd36a4e..0358f227b41 100644
--- a/public/app/features/datasources/components/picker/types.ts
+++ b/public/app/features/datasources/components/picker/types.ts
@@ -1,5 +1,6 @@
 import React from 'react';
 import { DropzoneOptions } from 'react-dropzone';
+import { Observable } from 'rxjs';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
 import { DataSourceJsonData, DataSourceRef } from '@grafana/schema';
@@ -14,6 +15,7 @@ export interface DataSourceDropdownProps {
 }
 
 export interface PickerContentProps extends DataSourceDropdownProps {
+  keyboardEvents: Observable<React.KeyboardEvent>;
   style: React.CSSProperties;
   filterTerm?: string;
   onClose: () => void;
diff --git a/public/app/features/datasources/hooks.ts b/public/app/features/datasources/hooks.ts
index b0985ed5863..07c700119e8 100644
--- a/public/app/features/datasources/hooks.ts
+++ b/public/app/features/datasources/hooks.ts
@@ -1,5 +1,6 @@
-import { useCallback } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useLocalStorage } from 'react-use';
+import { Observable } from 'rxjs';
 
 import { DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
 import { GetDataSourceListFilters, getDataSourceSrv } from '@grafana/runtime';
@@ -55,3 +56,74 @@ export function useDatasource(dataSource: string | DataSourceRef | DataSourceIns
 
   return dataSourceSrv.getInstanceSettings(dataSource);
 }
+
+export interface KeybaordNavigatableListProps {
+  keyboardEvents?: Observable<React.KeyboardEvent>;
+  containerRef: React.RefObject<HTMLElement>;
+}
+
+/**
+ * Allows navigating lists of elements where the data-role attribute is set to "keyboardSelectableItem"
+ * @param props
+ */
+export function useKeyboardNavigatableList(props: KeybaordNavigatableListProps): [Record<string, string>, string] {
+  const { keyboardEvents, containerRef } = props;
+  const [selectedIndex, setSelectedIndex] = useState<number>(0);
+
+  const attributeName = 'data-role';
+  const roleName = 'keyboardSelectableItem';
+  const navigatableItemProps = { ...{ [attributeName]: roleName } };
+  const querySelectorNavigatableElements = `[${attributeName}="${roleName}"`;
+
+  const selectedAttributeName = 'data-selectedItem';
+  const selectedItemCssSelector = `[${selectedAttributeName}="true"]`;
+
+  useEffect(() => {
+    const listItems = containerRef?.current?.querySelectorAll<HTMLElement | HTMLButtonElement | HTMLAnchorElement>(
+      querySelectorNavigatableElements
+    );
+
+    const selectedItem = listItems?.item(selectedIndex % listItems?.length);
+
+    listItems?.forEach((li) => li.setAttribute(selectedAttributeName, 'false'));
+
+    if (selectedItem) {
+      selectedItem.scrollIntoView({ block: 'center' });
+      selectedItem.setAttribute(selectedAttributeName, 'true');
+    }
+  }, [selectedIndex, containerRef, selectedAttributeName, querySelectorNavigatableElements]);
+
+  const clickSelectedElement = () => {
+    containerRef?.current
+      ?.querySelector<HTMLElement | HTMLButtonElement | HTMLAnchorElement>(selectedItemCssSelector)
+      ?.querySelector<HTMLButtonElement>('button') // This is a bit weird. The main use for this would be to select card items, however the root of the card component does not have the click event handler, instead it's attached to a button inside it.
+      ?.click();
+  };
+
+  useEffect(() => {
+    if (!keyboardEvents) {
+      return;
+    }
+    const sub = keyboardEvents.subscribe({
+      next: (keyEvent) => {
+        switch (keyEvent?.code) {
+          case 'ArrowDown': {
+            setSelectedIndex(selectedIndex + 1);
+            keyEvent.preventDefault();
+            break;
+          }
+          case 'ArrowUp':
+            setSelectedIndex(selectedIndex > 0 ? selectedIndex - 1 : selectedIndex);
+            keyEvent.preventDefault();
+            break;
+          case 'Enter':
+            clickSelectedElement();
+            break;
+        }
+      },
+    });
+    return () => sub.unsubscribe();
+  });
+
+  return [navigatableItemProps, selectedItemCssSelector];
+}

From e88e50efe445435bb5d1d20eb6356faea9a1fde1 Mon Sep 17 00:00:00 2001
From: Juan Cabanas <juan.cabanas@grafana.com>
Date: Fri, 28 Apr 2023 13:37:11 -0300
Subject: [PATCH 547/729] ShareModal: Responsive tabs and Public Dashboards
 modal fixed (#66805)

---
 .../src/components/Tabs/TabsBar.tsx           | 41 +++++++++----------
 .../PanelEditor/PanelEditorTabs.tsx           |  2 +-
 .../EmailSharingConfiguration.tsx             |  3 ++
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/packages/grafana-ui/src/components/Tabs/TabsBar.tsx b/packages/grafana-ui/src/components/Tabs/TabsBar.tsx
index 6cfb03409be..0e5e9714da3 100644
--- a/packages/grafana-ui/src/components/Tabs/TabsBar.tsx
+++ b/packages/grafana-ui/src/components/Tabs/TabsBar.tsx
@@ -3,7 +3,7 @@ import React, { ReactNode } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 
 export interface Props {
   /** Children should be a single <Tab /> or an array of <Tab /> */
@@ -13,32 +13,31 @@ export interface Props {
   hideBorder?: boolean;
 }
 
-const getTabsBarStyles = stylesFactory((theme: GrafanaTheme2, hideBorder = false) => {
-  return {
-    tabsWrapper:
-      !hideBorder &&
-      css`
-        border-bottom: 1px solid ${theme.colors.border.weak};
-      `,
-    tabs: css`
-      position: relative;
-      display: flex;
-      height: ${theme.components.menuTabs.height}px;
-    `,
-  };
-});
-
-export const TabsBar = React.forwardRef<HTMLDivElement, Props>(({ children, className, hideBorder }, ref) => {
-  const theme = useTheme2();
-  const tabsStyles = getTabsBarStyles(theme, hideBorder);
+export const TabsBar = React.forwardRef<HTMLDivElement, Props>(({ children, className, hideBorder = false }, ref) => {
+  const styles = useStyles2(getStyles);
 
   return (
-    <div className={cx(tabsStyles.tabsWrapper, className)} ref={ref}>
-      <div className={tabsStyles.tabs} role="tablist">
+    <div className={cx(styles.tabsWrapper, hideBorder && styles.noBorder, className)} ref={ref}>
+      <div className={styles.tabs} role="tablist">
         {children}
       </div>
     </div>
   );
 });
 
+const getStyles = (theme: GrafanaTheme2) => ({
+  tabsWrapper: css`
+    border-bottom: 1px solid ${theme.colors.border.weak};
+    overflow-x: auto;
+  `,
+  noBorder: css`
+    border-bottom: 0;
+  `,
+  tabs: css`
+    position: relative;
+    display: flex;
+    height: ${theme.components.menuTabs.height}px;
+  `,
+});
+
 TabsBar.displayName = 'TabsBar';
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
index 9625c117975..85d0274fb69 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
@@ -150,7 +150,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       padding: 0;
       display: flex;
       flex-direction: column;
-      flex-grow: 1;
+      flex: 1;
       min-height: 0;
       background: ${theme.colors.background.primary};
       border: 1px solid ${theme.components.panel.borderColor};
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx
index 2b67563d255..3e2bcf69c19 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx
@@ -1,6 +1,7 @@
 import { css } from '@emotion/css';
 import React from 'react';
 import { useForm } from 'react-hook-form';
+import { useWindowSize } from 'react-use';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
@@ -107,6 +108,7 @@ const EmailList = ({
 };
 
 export const EmailSharingConfiguration = () => {
+  const { width } = useWindowSize();
   const styles = useStyles2(getStyles);
   const dashboardState = useSelector((store) => store.dashboard);
   const dashboard = dashboardState.getModel()!;
@@ -161,6 +163,7 @@ export const EmailSharingConfiguration = () => {
             return (
               <RadioButtonGroup
                 {...rest}
+                size={width < 480 ? 'sm' : 'md'}
                 options={options}
                 onChange={(shareType: PublicDashboardShareType) => {
                   reportInteraction('grafana_dashboards_public_share_type_clicked', {

From 149adb09929cc2f165315a1f31ac4ff0332e08c3 Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Fri, 28 Apr 2023 18:41:00 +0200
Subject: [PATCH 548/729] FileImport: add interaction reporting for dropping
 files (#67512)

add interaction reporting for dragndrop
---
 .../features/dashboard/containers/DashboardPage.tsx  | 12 +++++++++++-
 .../datasource/grafana/components/QueryEditor.tsx    | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index 0509763a802..e0c5cd3091b 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -16,7 +16,7 @@ import {
   formattedValueToString,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { config, locationService } from '@grafana/runtime';
+import { config, locationService, reportInteraction } from '@grafana/runtime';
 import { Icon, Themeable2, withTheme2 } from '@grafana/ui';
 import { notifyApp } from 'app/core/actions';
 import { Page } from 'app/core/components/Page/Page';
@@ -166,6 +166,16 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
         )
       );
     });
+
+    reportInteraction('dashboards_dropped_files', {
+      number_of_files: fileRejections.length + acceptedFiles.length,
+      accepted_files: acceptedFiles.map((a) => {
+        return { type: a.type, size: a.size };
+      }),
+      rejected_files: fileRejections.map((r) => {
+        return { type: r.file.type, size: r.file.size };
+      }),
+    });
   };
 
   getCleanState(): State {
diff --git a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
index b26b7689976..7a476150fb1 100644
--- a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
@@ -16,7 +16,7 @@ import {
   getValueFormat,
   formattedValueToString,
 } from '@grafana/data';
-import { config, getBackendSrv, getDataSourceSrv } from '@grafana/runtime';
+import { config, getBackendSrv, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
 import {
   InlineField,
   Select,
@@ -391,6 +391,16 @@ export class UnthemedQueryEditor extends PureComponent<Props, State> {
         snapshot,
       });
       this.props.onRunQuery();
+
+      reportInteraction('grafana_datasource_drop_files', {
+        number_of_files: fileRejections.length + acceptedFiles.length,
+        accepted_files: acceptedFiles.map((a) => {
+          return { type: a.type, size: a.size };
+        }),
+        rejected_files: fileRejections.map((r) => {
+          return { type: r.file.type, size: r.file.size };
+        }),
+      });
     });
   };
 

From 7bceab4ad440cc7a271fd968b3162e4b18664783 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Fri, 28 Apr 2023 18:57:02 +0200
Subject: [PATCH 549/729] Grafana Toolkit: Fix broken build directory structure
 (#67544)

fix(grafana-toolkit): make sure to build into cli directory so relative paths work
---
 packages/grafana-toolkit/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-toolkit/tsconfig.json b/packages/grafana-toolkit/tsconfig.json
index cbfacdd8a00..9252b4591f4 100644
--- a/packages/grafana-toolkit/tsconfig.json
+++ b/packages/grafana-toolkit/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "declarationDir": "dist/src",
+    "declarationDir": "dist/src/cli",
     "module": "commonjs",
-    "outDir": "dist/src",
+    "outDir": "dist/src/cli",
     "rootDirs": ["."],
     "paths": {
       "@grafana/toolkit": ["."]

From cdf8555aceb651ecd63895322fd89e9fa3a3872b Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Fri, 28 Apr 2023 19:09:44 +0200
Subject: [PATCH 550/729] Use URL isFirstPanel to enable panel editor
 onboarding (#67546)

---
 .../features/dashboard/dashgrid/DashboardEmpty.tsx |  2 +-
 .../app/features/query/components/QueryGroup.tsx   | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
index 581d8f5e3fe..47c5ec2146a 100644
--- a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
@@ -43,7 +43,7 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
             onClick={() => {
               const id = onCreateNewPanel(dashboard, initialDatasource);
               reportInteraction('dashboards_emptydashboard_clicked', { item: 'add_visualization' });
-              locationService.partial({ editPanel: id });
+              locationService.partial({ editPanel: id, firstPanel: true });
               dispatch(setInitialDatasource(undefined));
             }}
             disabled={!canCreate}
diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index c3cb601104c..e9f0f653f66 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -124,9 +124,7 @@ export class QueryGroup extends PureComponent<Props, State> {
         defaultDataSource,
         // TODO: Detect the first panel added into a new dashboard better.
         // This is flaky in case the UID is generated differently
-        isDataSourceModalOpen:
-          locationService.getLocation().pathname === '/dashboard/new' &&
-          locationService.getSearchObject().editPanel === '1',
+        isDataSourceModalOpen: !!locationService.getSearchObject().firstPanel,
       });
     } catch (error) {
       console.log('failed to load data source', error);
@@ -261,6 +259,11 @@ export class QueryGroup extends PureComponent<Props, State> {
     this.setState({ isHelpOpen: false });
   };
 
+  onCloseDataSourceModal = () => {
+    this.setState({ isDataSourceModalOpen: false });
+    locationService.partial({ firstPanel: null });
+  };
+
   renderMixedPicker = () => {
     return (
       <DataSourcePicker
@@ -289,15 +292,14 @@ export class QueryGroup extends PureComponent<Props, State> {
       current: this.props.options.dataSource,
       onChange: (ds: DataSourceInstanceSettings) => {
         this.onChangeDataSource(ds);
-        this.setState({ isDataSourceModalOpen: false });
+        this.onCloseDataSourceModal();
       },
     };
-    const onDismiss = () => this.setState({ isDataSourceModalOpen: false });
 
     return (
       <>
         {isDataSourceModalOpen && config.featureToggles.advancedDataSourcePicker && (
-          <DataSourceModal {...commonProps} onDismiss={onDismiss}></DataSourceModal>
+          <DataSourceModal {...commonProps} onDismiss={this.onCloseDataSourceModal}></DataSourceModal>
         )}
         <DataSourcePicker
           {...commonProps}

From 92d47a8d8fdb9c9cd2bf50ac7df06b3ae5e86152 Mon Sep 17 00:00:00 2001
From: Andrej Ocenas <mr.ocenas@gmail.com>
Date: Fri, 28 Apr 2023 19:53:46 +0200
Subject: [PATCH 551/729] Pyroscope: Fix autodetection in case of using Phlare
 backend (#67536)

---
 pkg/tsdb/phlare/instance.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/phlare/instance.go b/pkg/tsdb/phlare/instance.go
index 04f101f123c..f89295f8df5 100644
--- a/pkg/tsdb/phlare/instance.go
+++ b/pkg/tsdb/phlare/instance.go
@@ -172,13 +172,17 @@ func (d *PhlareDatasource) backendType(ctx context.Context, req *backend.CallRes
 	query := u.Query()
 	body := &BackendTypeRespBody{BackendType: "unknown"}
 
-	pyroClient := getClient("pyroscope", d.httpClient, query["url"][0])
+	// We take the url from the request query because the data source may not yet be saved in DB with the URL we want
+	// to test with (like when filling in the confgi page for the first time)
+	url := query["url"][0]
+
+	pyroClient := getClient("pyroscope", d.httpClient, url)
 	_, err = pyroClient.ProfileTypes(ctx)
 
 	if err == nil {
 		body.BackendType = "pyroscope"
 	} else {
-		phlareClient := getClient("phlare", d.httpClient, d.settings.URL)
+		phlareClient := getClient("phlare", d.httpClient, url)
 		_, err := phlareClient.ProfileTypes(ctx)
 		if err == nil {
 			body.BackendType = "phlare"

From b1b6d9e2db6d041d35cf19479cf108ac3d5e6c0e Mon Sep 17 00:00:00 2001
From: Ezequiel Victorero <ezequiel.victorero@grafana.com>
Date: Fri, 28 Apr 2023 15:03:30 -0300
Subject: [PATCH 552/729] PublicDashboards: Return custom meta field (#67538)

---
 pkg/services/publicdashboards/service/query.go |  1 -
 .../publicdashboards/service/query_test.go     | 18 +++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkg/services/publicdashboards/service/query.go b/pkg/services/publicdashboards/service/query.go
index 66954ec9230..184e83d5916 100644
--- a/pkg/services/publicdashboards/service/query.go
+++ b/pkg/services/publicdashboards/service/query.go
@@ -315,7 +315,6 @@ func sanitizeMetadataFromQueryData(res *backend.QueryDataResponse) {
 		for i := range frames {
 			if frames[i].Meta != nil {
 				frames[i].Meta.ExecutedQueryString = ""
-				frames[i].Meta.Custom = nil
 			}
 		}
 	}
diff --git a/pkg/services/publicdashboards/service/query_test.go b/pkg/services/publicdashboards/service/query_test.go
index 56be3f91f6a..a30186e8ec4 100644
--- a/pkg/services/publicdashboards/service/query_test.go
+++ b/pkg/services/publicdashboards/service/query_test.go
@@ -1564,7 +1564,7 @@ func TestGroupQueriesByDataSource(t *testing.T) {
 }
 
 func TestSanitizeMetadataFromQueryData(t *testing.T) {
-	t.Run("can remove metadata from query", func(t *testing.T) {
+	t.Run("can remove ExecutedQueryString from metadata", func(t *testing.T) {
 		fakeResponse := &backend.QueryDataResponse{
 			Responses: backend.Responses{
 				"A": backend.DataResponse{
@@ -1595,9 +1595,6 @@ func TestSanitizeMetadataFromQueryData(t *testing.T) {
 							Name: "3",
 							Meta: &data.FrameMeta{
 								ExecutedQueryString: "Test3",
-								Custom: map[string]string{
-									"test3": "test3",
-								},
 							},
 						},
 					},
@@ -1605,13 +1602,12 @@ func TestSanitizeMetadataFromQueryData(t *testing.T) {
 			},
 		}
 		sanitizeMetadataFromQueryData(fakeResponse)
-		for k := range fakeResponse.Responses {
-			frames := fakeResponse.Responses[k].Frames
-			for i := range frames {
-				require.Empty(t, frames[i].Meta.ExecutedQueryString)
-				require.Empty(t, frames[i].Meta.Custom)
-			}
-		}
+		assert.Equal(t, fakeResponse.Responses["A"].Frames[0].Meta.ExecutedQueryString, "")
+		assert.Equal(t, fakeResponse.Responses["A"].Frames[0].Meta.Custom, map[string]string{"test1": "test1"})
+		assert.Equal(t, fakeResponse.Responses["A"].Frames[1].Meta.ExecutedQueryString, "")
+		assert.Equal(t, fakeResponse.Responses["A"].Frames[1].Meta.Custom, map[string]string{"test2": "test2"})
+		assert.Equal(t, fakeResponse.Responses["B"].Frames[0].Meta.ExecutedQueryString, "")
+		assert.Nil(t, fakeResponse.Responses["B"].Frames[0].Meta.Custom)
 	})
 }
 

From e493bec3a87c30791143fd99897b873b092d6be8 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 28 Apr 2023 12:20:10 -0700
Subject: [PATCH 553/729] Geomap: Improve migration logic (#65500)

---
 packages/grafana-data/src/types/dashboard.ts  |  5 ++
 .../features/dashboard/state/PanelModel.ts    |  2 +-
 public/app/features/geo/utils/location.ts     |  9 +--
 .../plugins/panel/geomap/migrations.test.ts   | 54 +++++++++++++-
 public/app/plugins/panel/geomap/migrations.ts | 73 +++++++++++++++++--
 5 files changed, 128 insertions(+), 15 deletions(-)

diff --git a/packages/grafana-data/src/types/dashboard.ts b/packages/grafana-data/src/types/dashboard.ts
index 1608efd8eb8..36787674903 100644
--- a/packages/grafana-data/src/types/dashboard.ts
+++ b/packages/grafana-data/src/types/dashboard.ts
@@ -1,3 +1,5 @@
+import { DataTransformerConfig } from '@grafana/schema';
+
 import { FieldConfigSource } from './fieldOverrides';
 import { DataQuery, DataSourceRef } from './query';
 
@@ -38,6 +40,9 @@ export interface PanelModel<TOptions = any, TCustomFieldConfig = any> {
   /** The queries in a panel */
   targets?: DataQuery[];
 
+  /** Optionally process data after query */
+  transformations?: DataTransformerConfig[];
+
   /** alerting v1 object */
   alert?: any;
 }
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index dff99dbd546..dc582275148 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -487,7 +487,7 @@ export class PanelModel implements DataConfigSource, IPanelModel {
     const oldOptions: any = this.getOptionsToRemember();
     const prevFieldConfig = this.fieldConfig;
     const oldPluginId = this.type;
-    const wasAngular = this.isAngularPlugin();
+    const wasAngular = this.isAngularPlugin() || Boolean(autoMigrateAngular[oldPluginId]);
     this.cachedPluginOptions[oldPluginId] = {
       properties: oldOptions,
       fieldConfig: prevFieldConfig,
diff --git a/public/app/features/geo/utils/location.ts b/public/app/features/geo/utils/location.ts
index 02a25c40fa3..91f009d54b6 100644
--- a/public/app/features/geo/utils/location.ts
+++ b/public/app/features/geo/utils/location.ts
@@ -82,11 +82,10 @@ export async function getLocationMatchers(src?: FrameGeometrySource): Promise<Lo
       }
       break;
     case FrameGeometrySourceMode.Lookup:
-      if (src?.lookup) {
-        info.lookup = getFieldFinder(getFieldMatcher({ id: FieldMatcherID.byName, options: src.lookup }));
-      } else {
-        info.lookup = () => undefined; // In manual mode, don't automatically find field
-      }
+      const m = src?.lookup?.length
+        ? getFieldMatcher({ id: FieldMatcherID.byName, options: src.lookup })
+        : getFieldMatcher({ id: FieldMatcherID.byType, options: FieldType.string });
+      info.lookup = getFieldFinder(m);
       break;
     case FrameGeometrySourceMode.Coords:
       if (src?.latitude) {
diff --git a/public/app/plugins/panel/geomap/migrations.test.ts b/public/app/plugins/panel/geomap/migrations.test.ts
index 3b6f3d97ca2..e498578e303 100644
--- a/public/app/plugins/panel/geomap/migrations.test.ts
+++ b/public/app/plugins/panel/geomap/migrations.test.ts
@@ -55,7 +55,49 @@ describe('Worldmap Migrations', () => {
             "mouseWheelZoom": true,
             "showZoom": true,
           },
-          "layers": [],
+          "layers": [
+            {
+              "config": {
+                "showLegend": true,
+                "style": {
+                  "color": {
+                    "fixed": "dark-green",
+                  },
+                  "opacity": 0.4,
+                  "rotation": {
+                    "fixed": 0,
+                    "max": 360,
+                    "min": -360,
+                    "mode": "mod",
+                  },
+                  "size": {
+                    "fixed": 5,
+                    "max": 30,
+                    "min": 2,
+                  },
+                  "symbol": {
+                    "fixed": "img/icons/marker/circle.svg",
+                    "mode": "fixed",
+                  },
+                  "textConfig": {
+                    "fontSize": 12,
+                    "offsetX": 0,
+                    "offsetY": 0,
+                    "textAlign": "center",
+                    "textBaseline": "middle",
+                  },
+                },
+              },
+              "location": {
+                "gazetteer": "public/gazetteer/countries.json",
+                "lookup": undefined,
+                "mode": "lookup",
+              },
+              "name": "",
+              "tooltip": true,
+              "type": "markers",
+            },
+          ],
           "tooltip": {
             "mode": "details",
           },
@@ -66,6 +108,16 @@ describe('Worldmap Migrations', () => {
             "zoom": 6,
           },
         },
+        "transformations": [
+          {
+            "id": "reduce",
+            "options": {
+              "reducers": [
+                "sum",
+              ],
+            },
+          },
+        ],
       }
     `);
   });
diff --git a/public/app/plugins/panel/geomap/migrations.ts b/public/app/plugins/panel/geomap/migrations.ts
index 7342d0982e8..6e6369be899 100644
--- a/public/app/plugins/panel/geomap/migrations.ts
+++ b/public/app/plugins/panel/geomap/migrations.ts
@@ -1,9 +1,19 @@
 import { cloneDeep } from 'lodash';
 
-import { FieldConfigSource, PanelModel, PanelTypeChangedHandler, Threshold, ThresholdsMode } from '@grafana/data';
+import {
+  FieldConfigSource,
+  PanelModel,
+  PanelTypeChangedHandler,
+  Threshold,
+  ThresholdsMode,
+  fieldReducers,
+  FrameGeometrySourceMode,
+  DataTransformerConfig,
+  DataTransformerID,
+} from '@grafana/data';
 import { ResourceDimensionMode } from 'app/features/dimensions';
 
-import { MarkersConfig } from './layers/data/markersLayer';
+import { defaultMarkersConfig, MarkersConfig } from './layers/data/markersLayer';
 import { getMarkerAsPath } from './style/markers';
 import { defaultStyleConfig } from './style/types';
 import { PanelOptions, TooltipMode } from './types';
@@ -15,10 +25,13 @@ import { MapCenterID } from './view';
 export const mapPanelChangedHandler: PanelTypeChangedHandler = (panel, prevPluginId, prevOptions, prevFieldConfig) => {
   // Changing from angular/worldmap panel to react/openlayers
   if (prevPluginId === 'grafana-worldmap-panel' && prevOptions.angular) {
-    const { fieldConfig, options } = worldmapToGeomapOptions({
+    const { fieldConfig, options, xform } = worldmapToGeomapOptions({
       ...prevOptions.angular,
       fieldConfig: prevFieldConfig,
     });
+    if (xform?.id?.length) {
+      panel.transformations = panel.transformations ? [...panel.transformations, xform] : [xform];
+    }
     panel.fieldConfig = fieldConfig; // Mutates the incoming panel
     return options;
   }
@@ -26,12 +39,17 @@ export const mapPanelChangedHandler: PanelTypeChangedHandler = (panel, prevPlugi
   return {};
 };
 
-export function worldmapToGeomapOptions(angular: any): { fieldConfig: FieldConfigSource; options: PanelOptions } {
+export function worldmapToGeomapOptions(angular: any): {
+  fieldConfig: FieldConfigSource;
+  options: PanelOptions;
+  xform?: DataTransformerConfig;
+} {
   const fieldConfig: FieldConfigSource = {
     defaults: {},
     overrides: [],
   };
 
+  const markersLayer = cloneDeep(defaultMarkersConfig);
   const options: PanelOptions = {
     view: {
       id: MapCenterID.Zero,
@@ -44,9 +62,7 @@ export function worldmapToGeomapOptions(angular: any): { fieldConfig: FieldConfi
       type: 'default', // was carto
       name: 'Basemap',
     },
-    layers: [
-      // TODO? depends on current configs
-    ],
+    layers: [markersLayer],
     tooltip: { mode: TooltipMode.Details },
   };
 
@@ -55,6 +71,47 @@ export function worldmapToGeomapOptions(angular: any): { fieldConfig: FieldConfi
     fieldConfig.defaults.decimals = v;
   }
 
+  // Set the markers range
+  const style = markersLayer.config!.style;
+  v = asNumber(angular.circleMaxSize);
+  if (v) {
+    style.size!.max = v;
+  }
+  v = asNumber(angular.circleMinSize);
+  if (v) {
+    style.size!.min = v;
+  }
+
+  let xform: DataTransformerConfig | undefined = undefined;
+  const reducer = fieldReducers.getIfExists(angular.valueName);
+  if (reducer && angular.locationData?.length) {
+    xform = {
+      id: DataTransformerID.reduce,
+      options: {
+        reducers: [reducer.id],
+      },
+    };
+
+    switch (angular.locationData) {
+      case 'countries':
+      case 'countries_3letter':
+        markersLayer.location = {
+          mode: FrameGeometrySourceMode.Lookup,
+          gazetteer: 'public/gazetteer/countries.json',
+          lookup: undefined, // will default to first string field from reducer
+        };
+        break;
+
+      case 'states':
+        markersLayer.location = {
+          mode: FrameGeometrySourceMode.Lookup,
+          gazetteer: 'public/gazetteer/usa-states.json',
+          lookup: undefined, // will default to first string field from reducer
+        };
+        break;
+    }
+  }
+
   // Convert thresholds and color values
   if (angular.thresholds && angular.colors) {
     const levels = angular.thresholds.split(',').map((strVale: string) => {
@@ -99,7 +156,7 @@ export function worldmapToGeomapOptions(angular: any): { fieldConfig: FieldConfi
   options.view.id = mapCenters[angular.mapCenter as any];
   options.view.lat = asNumber(angular.mapCenterLatitude);
   options.view.lon = asNumber(angular.mapCenterLongitude);
-  return { fieldConfig, options };
+  return { fieldConfig, options, xform };
 }
 
 function asNumber(v: any): number | undefined {

From 8d1c32488b82b00677bd8dc96765e814ce39bc6f Mon Sep 17 00:00:00 2001
From: sarah-spang <86264026+sarah-spang@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:38:27 -0600
Subject: [PATCH 554/729] Docs: Update Color Modes (#67560)

* Docs: Update Color Modes

Some color mode descriptions had mistakes and a few were missing.

* fixed typo

---------

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
---
 .../configure-standard-options/index.md                | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/sources/panels-visualizations/configure-standard-options/index.md b/docs/sources/panels-visualizations/configure-standard-options/index.md
index d82cc74574d..1244253d361 100644
--- a/docs/sources/panels-visualizations/configure-standard-options/index.md
+++ b/docs/sources/panels-visualizations/configure-standard-options/index.md
@@ -124,11 +124,15 @@ Select one of the following palettes:
 | **Classic palette**                  | Grafana will assign color by looking up a color in a palette by series index. Useful for Graphs and pie charts and other categorical data visualizations |
 | **Classic palette (by series name)** | Grafana will assign color based on the name of the series. Useful when the series names to be visualized depend on the available data.                   |
 | **Green-Yellow-Red (by value)**      | Continuous color scheme                                                                                                                                  |
+| **Red-Yellow-Green (by value)**      | Continuous color scheme                                                                                                                                  |
 | **Blue-Yellow-Red (by value)**       | Continuous color scheme                                                                                                                                  |
+| **Yellow-Red (by value)**            | Continuous color scheme                                                                                                                                  |
+| **Blue-Purple (by value)**           | Continuous color scheme                                                                                                                                  |
+| **Yellow-Blue (by value)**           | Continuous color scheme                                                                                                                                  |
 | **Blues (by value)**                 | Continuous color scheme (panel background to blue)                                                                                                       |
-| **Reds (by value)**                  | Continuous color scheme (panel background color to blue)                                                                                                 |
-| **Greens (by value)**                | Continuous color scheme (panel background color to blue)                                                                                                 |
-| **Purple (by value)**                | Continuous color scheme (panel background color to blue)                                                                                                 |
+| **Reds (by value)**                  | Continuous color scheme (panel background color to red)                                                                                                  |
+| **Greens (by value)**                | Continuous color scheme (panel background color to green)                                                                                                |
+| **Purples (by value)**               | Continuous color scheme (panel background color to purple)                                                                                               |
 
 {{< figure src="/static/img/docs/v73/color_scheme_dropdown.png" max-width="350px" caption="Color scheme" >}}
 

From e5aeb7c32207733a257ae1ae70c6cba3278a337d Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Fri, 28 Apr 2023 23:35:32 -0500
Subject: [PATCH 555/729] TimeSeries: Fix leading null-fill for missing
 intervals (#67570)

---
 .../GraphNG/nullInsertThreshold.test.ts       | 28 +++++++++++++++++++
 .../components/GraphNG/nullInsertThreshold.ts | 11 ++++----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
index 9e8af37ccf8..ab3343aa1b2 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
@@ -152,6 +152,34 @@ describe('nullInsertThreshold Transformer', () => {
     ]);
   });
 
+  // this tests that intervals at 24hr but starting not at 12am UTC are not always snapped to 12am UTC
+  test('should insert leading null at beginning +interval when timeRange.from.valueOf() exceeds threshold 11PM UTC', () => {
+    const df = new MutableDataFrame({
+      refId: 'A',
+      fields: [
+        {
+          name: 'Time',
+          type: FieldType.time,
+          config: { interval: 86400000 },
+          values: [1679439600000, 1679526000000, 1679612400000, 1679698800000, 1679785200000],
+        },
+        { name: 'One', type: FieldType.number, values: [0, 1, 2, 3, 4] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({
+      frame: df,
+      refFieldName: null,
+      refFieldPseudoMin: 1679320395828,
+      refFieldPseudoMax: 1679815217157,
+    });
+
+    expect(result.fields[0].values).toEqual([
+      1679266800000, 1679353200000, 1679439600000, 1679526000000, 1679612400000, 1679698800000, 1679785200000,
+    ]);
+    expect(result.fields[1].values).toEqual([null, null, 0, 1, 2, 3, 4]);
+  });
+
   test('should insert trailing null at end +interval when timeRange.to.valueOf() exceeds threshold', () => {
     const df = new MutableDataFrame({
       refId: 'A',
diff --git a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
index de02223c02c..a4a71c1c190 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
@@ -1,4 +1,4 @@
-import { DataFrame, FieldType, incrRoundDn } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 
 type InsertMode = (prev: number, next: number, threshold: number) => number;
 
@@ -108,11 +108,11 @@ function nullInsertThreshold(
   const len = refValues.length;
   const refValuesNew: number[] = [];
 
-  // Continiuously subtract the threshold from the first data
-  // point filling in insert values accordingly
+  // Continuously subtract the threshold from the first data point, filling in insert values accordingly
   if (refFieldPseudoMin != null && refFieldPseudoMin < refValues[0]) {
+    let preFillCount = Math.ceil((refValues[0] - refFieldPseudoMin) / threshold);
     // this will be 0 or 1 threshold increment left of visible range
-    let prevSlot = incrRoundDn(refFieldPseudoMin, threshold);
+    let prevSlot = refValues[0] - preFillCount * threshold;
 
     while (prevSlot < refValues[0]) {
       // (prevSlot - threshold) is used to simulate the previous 'real' data point, as getInsertValue expects
@@ -126,8 +126,7 @@ function nullInsertThreshold(
 
   let prevValue: number = refValues[0];
 
-  // Fill nulls when a value is greater than
-  // the threshold value
+  // Fill nulls when a value is greater than the threshold value
   for (let i = 1; i < len; i++) {
     const curValue = refValues[i];
 

From 8516e6393747483cbe9639291ad92249b0ac68dc Mon Sep 17 00:00:00 2001
From: Shirley <4163034+fridgepoet@users.noreply.github.com>
Date: Mon, 1 May 2023 10:10:36 +0200
Subject: [PATCH 556/729] CloudWatch: Deprecate dynamic labels feature toggle,
 remove support for Alias in frontend (#67222)

---
 .betterer.results                             |   4 -
 .../components/MetricsQueryEditor/Alias.tsx   |  47 -------
 .../MetricsQueryEditor.test.tsx               |  35 +++--
 .../MetricsQueryEditor/MetricsQueryEditor.tsx |  37 ++---
 .../migrations/metricQueryMigrations.test.ts  | 127 ++++++++++--------
 .../migrations/metricQueryMigrations.ts       |   5 +-
 .../useMigratedMetricsQuery.test.ts           |  11 +-
 7 files changed, 108 insertions(+), 158 deletions(-)
 delete mode 100644 public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/Alias.tsx

diff --git a/.betterer.results b/.betterer.results
index a0bf6bdbc46..3b1d4fa728d 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -3881,10 +3881,6 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/cloudwatch/components/LogsQueryField.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/Alias.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/plugins/datasource/cloudwatch/datasource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/Alias.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/Alias.tsx
deleted file mode 100644
index ba9d961352d..00000000000
--- a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/Alias.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { debounce } from 'lodash';
-import React, { useState } from 'react';
-
-import { IconButton, Input, Tooltip } from '@grafana/ui';
-
-export interface Props {
-  onChange: (alias: any) => void;
-  value: string;
-  id?: string;
-}
-
-export const Alias = ({ value = '', onChange, id }: Props) => {
-  const [alias, setAlias] = useState(value);
-
-  const propagateOnChange = debounce(onChange, 1500);
-
-  onChange = (e: any) => {
-    setAlias(e.target.value);
-    propagateOnChange(e.target.value);
-  };
-
-  return (
-    <div style={{ display: 'flex', alignItems: 'center' }}>
-      <Input id={id} type="text" value={alias} onChange={onChange} aria-label="Optional alias" />
-      <Tooltip
-        content={
-          <span>
-            Alias pattern will be deprecated in Grafana 10. See{' '}
-            <a
-              target="__blank"
-              rel="noopener noreferrer"
-              href="https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/query-editor/#common-query-editor-fields"
-            >
-              documentation
-            </a>{' '}
-            for how to use dynamic labels.
-          </span>
-        }
-        interactive
-        theme="error"
-        placement="right"
-      >
-        <IconButton name="exclamation-triangle" variant="destructive" style={{ marginLeft: 4 }} />
-      </Tooltip>
-    </div>
-  );
-};
diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
index ca3056303b9..5b284abb0c4 100644
--- a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
@@ -111,27 +111,22 @@ describe('QueryEditor', () => {
     });
   });
 
-  describe('when dynamic labels feature toggle is enabled', () => {
-    it('should render label field', async () => {
-      const props = setup();
-      const originalValue = config.featureToggles.cloudWatchDynamicLabels;
-      config.featureToggles.cloudWatchDynamicLabels = true;
+  it('should render label field and not alias field', async () => {
+    const props = setup();
 
-      render(
-        <MetricsQueryEditor
-          {...props}
-          query={{ ...props.query, refId: 'A', alias: 'Period: {{period}} InstanceId: {{InstanceId}}' }}
-        />
-      );
+    render(
+      <MetricsQueryEditor
+        {...props}
+        query={{ ...props.query, refId: 'A', alias: 'Period: {{period}} InstanceId: {{InstanceId}}' }}
+      />
+    );
 
-      expect(await screen.findByText('Label')).toBeInTheDocument();
-      expect(screen.queryByText('Alias')).toBeNull();
-      expect(screen.getByText("Period: ${PROP('Period')} InstanceId: ${PROP('Dim.InstanceId')}"));
-
-      config.featureToggles.cloudWatchDynamicLabels = originalValue;
-    });
+    expect(await screen.findByText('Label')).toBeInTheDocument();
+    expect(screen.queryByText('Alias')).toBeNull();
+    expect(screen.getByText("Period: ${PROP('Period')} InstanceId: ${PROP('Dim.InstanceId')}"));
   });
 
+  // TODO: delete this test when dynamic labels feature flag is removed
   describe('when dynamic labels feature toggle is disabled', () => {
     it('should render alias field', async () => {
       const props = setup();
@@ -141,9 +136,9 @@ describe('QueryEditor', () => {
       const expected = 'Period: {{period}} InstanceId: {{InstanceId}}';
       render(<MetricsQueryEditor {...props} query={{ ...props.query, refId: 'A', alias: expected }} />);
 
-      expect(await screen.findByText('Alias')).toBeInTheDocument();
-      expect(screen.queryByText('Label')).toBeNull();
-      expect(screen.getByLabelText('Alias - optional')).toHaveValue(expected);
+      expect(await screen.findByText('Label')).toBeInTheDocument();
+      expect(screen.queryByText('Alias')).toBeNull();
+      expect(screen.getByText("Period: ${PROP('Period')} InstanceId: ${PROP('Dim.InstanceId')}"));
 
       config.featureToggles.cloudWatchDynamicLabels = originalValue;
     });
diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.tsx
index 3f53bd51c42..e6196131ea2 100644
--- a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.tsx
@@ -2,7 +2,6 @@ import React, { ChangeEvent, useCallback, useEffect, useState } from 'react';
 
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
 import { EditorField, EditorRow, InlineSelect, Space } from '@grafana/experimental';
-import { config } from '@grafana/runtime';
 import { ConfirmModal, Input, RadioButtonGroup } from '@grafana/ui';
 
 import { MathExpressionQueryField, MetricStatEditor, SQLBuilderEditor } from '../';
@@ -19,8 +18,6 @@ import {
 import { DynamicLabelsField } from '../DynamicLabelsField';
 import { SQLCodeEditor } from '../SQLCodeEditor';
 
-import { Alias } from './Alias';
-
 export interface Props extends QueryEditorProps<CloudWatchDatasource, CloudWatchQuery, CloudWatchJsonData> {
   query: CloudWatchMetricsQuery;
   extraHeaderElementLeft?: React.Dispatch<JSX.Element | undefined>;
@@ -182,28 +179,18 @@ export const MetricsQueryEditor = (props: Props) => {
           />
         </EditorField>
 
-        {config.featureToggles.cloudWatchDynamicLabels ? (
-          <EditorField
-            label="Label"
-            width={26}
-            optional
-            tooltip="Change time series legend name using Dynamic labels. See documentation for details."
-          >
-            <DynamicLabelsField
-              width={52}
-              label={migratedQuery.label ?? ''}
-              onChange={(label) => props.onChange({ ...query, label })}
-            ></DynamicLabelsField>
-          </EditorField>
-        ) : (
-          <EditorField label="Alias" width={26} optional tooltip="Change time series legend name using this field.">
-            <Alias
-              id={`${query.refId}-cloudwatch-metric-query-editor-alias`}
-              value={migratedQuery.alias ?? ''}
-              onChange={(value: string) => onChange({ ...migratedQuery, alias: value })}
-            />
-          </EditorField>
-        )}
+        <EditorField
+          label="Label"
+          width={26}
+          optional
+          tooltip="Change time series legend name using Dynamic labels. See documentation for details."
+        >
+          <DynamicLabelsField
+            width={52}
+            label={migratedQuery.label ?? ''}
+            onChange={(label) => props.onChange({ ...query, label })}
+          ></DynamicLabelsField>
+        </EditorField>
       </EditorRow>
     </>
   );
diff --git a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts
index 41122a8e66d..db9911fe679 100644
--- a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts
@@ -25,68 +25,87 @@ describe('metricQueryMigrations', () => {
       matchExact: false,
       expression: '',
     };
-    describe('when feature is enabled', () => {
-      describe('and label was not previously migrated', () => {
-        const cases: TestScenario[] = [
-          { description: 'Metric name', alias: '{{metric}}', label: "${PROP('MetricName')}" },
-          { description: 'Trim pattern', alias: '{{  metric     }}', label: "${PROP('MetricName')}" },
-          { description: 'Namespace', alias: '{{namespace}}', label: "${PROP('Namespace')}" },
-          { description: 'Period', alias: '{{period}}', label: "${PROP('Period')}" },
-          { description: 'Region', alias: '{{region}}', label: "${PROP('Region')}" },
-          { description: 'Statistic', alias: '{{stat}}', label: "${PROP('Stat')}" },
-          { description: 'Label', alias: '{{label}}', label: '${LABEL}' },
-          {
-            description: 'Non-existing alias pattern',
-            alias: '{{anything_else}}',
-            label: "${PROP('Dim.anything_else')}",
-          },
-          {
-            description: 'Combined patterns',
-            alias: 'some {{combination}} of {{label}} and {{metric}}',
-            label: "some ${PROP('Dim.combination')} of ${LABEL} and ${PROP('MetricName')}",
-          },
-          {
-            description: 'Combined patterns not trimmed',
-            alias: 'some {{combination  }}{{ label}} and {{metric}}',
-            label: "some ${PROP('Dim.combination')}${LABEL} and ${PROP('MetricName')}",
-          },
-        ];
-        test.each(cases)('given old alias %p, it should be migrated to label: %p', ({ alias, label }) => {
-          config.featureToggles.cloudWatchDynamicLabels = true;
-          const testQuery = { ...baseQuery, alias };
-          const result = migrateAliasPatterns(testQuery);
-          expect(result.label).toBe(label);
-          expect(result.alias).toBe(alias);
-        });
-      });
-
-      describe('and label was previously migrated', () => {
-        const cases: TestScenario[] = [
-          {
-            alias: '',
-            label: "${PROP('MetricName')}",
-          },
-          { alias: '{{metric}}', label: "${PROP('Period')}" },
-          { alias: '{{namespace}}', label: '' },
-        ];
-        test.each(cases)('it should not be migrated once again', ({ alias, label }) => {
-          config.featureToggles.cloudWatchDynamicLabels = true;
-          const testQuery = { ...baseQuery, alias, label };
-          const result = migrateAliasPatterns(testQuery);
-          expect(result.label).toBe(label);
-          expect(result.alias).toBe(alias);
-        });
+    describe('when label was not previously migrated', () => {
+      const cases: TestScenario[] = [
+        { description: 'Metric name', alias: '{{metric}}', label: "${PROP('MetricName')}" },
+        { description: 'Trim pattern', alias: '{{  metric     }}', label: "${PROP('MetricName')}" },
+        { description: 'Namespace', alias: '{{namespace}}', label: "${PROP('Namespace')}" },
+        { description: 'Period', alias: '{{period}}', label: "${PROP('Period')}" },
+        { description: 'Region', alias: '{{region}}', label: "${PROP('Region')}" },
+        { description: 'Statistic', alias: '{{stat}}', label: "${PROP('Stat')}" },
+        { description: 'Label', alias: '{{label}}', label: '${LABEL}' },
+        {
+          description: 'Non-existing alias pattern',
+          alias: '{{anything_else}}',
+          label: "${PROP('Dim.anything_else')}",
+        },
+        {
+          description: 'Combined patterns',
+          alias: 'some {{combination}} of {{label}} and {{metric}}',
+          label: "some ${PROP('Dim.combination')} of ${LABEL} and ${PROP('MetricName')}",
+        },
+        {
+          description: 'Combined patterns not trimmed',
+          alias: 'some {{combination  }}{{ label}} and {{metric}}',
+          label: "some ${PROP('Dim.combination')}${LABEL} and ${PROP('MetricName')}",
+        },
+      ];
+      test.each(cases)('given old alias %p, it should be migrated to label: %p', ({ alias, label }) => {
+        const testQuery = { ...baseQuery, alias };
+        const result = migrateAliasPatterns(testQuery);
+        expect(result.label).toBe(label);
+        expect(result.alias).toBe(alias);
       });
     });
 
+    describe('when label was previously migrated', () => {
+      const cases: TestScenario[] = [
+        {
+          alias: '',
+          label: "${PROP('MetricName')}",
+        },
+        { alias: '{{metric}}', label: "${PROP('Period')}" },
+        { alias: '{{namespace}}', label: '' },
+      ];
+      test.each(cases)('it should not be migrated once again', ({ alias, label }) => {
+        const testQuery = { ...baseQuery, alias, label };
+        const result = migrateAliasPatterns(testQuery);
+        expect(result.label).toBe(label);
+        expect(result.alias).toBe(alias);
+      });
+    });
+
+    // TODO: delete this test when dynamic labels feature flag is removed
     describe('when feature is disabled', () => {
       const cases: TestScenario[] = [
         { alias: '{{period}}', label: "${PROP('MetricName')}" },
-        { alias: '{{metric}}', label: '' },
+        { alias: '{{metric}}', label: "${PROP('MetricName')}" },
         { alias: '', label: "${PROP('MetricName')}" },
-        { alias: '', label: undefined },
+        { alias: '', label: '' },
+        { description: 'Metric name', alias: '{{metric}}', label: "${PROP('MetricName')}" },
+        { description: 'Trim pattern', alias: '{{  metric     }}', label: "${PROP('MetricName')}" },
+        { description: 'Namespace', alias: '{{namespace}}', label: "${PROP('Namespace')}" },
+        { description: 'Period', alias: '{{period}}', label: "${PROP('Period')}" },
+        { description: 'Region', alias: '{{region}}', label: "${PROP('Region')}" },
+        { description: 'Statistic', alias: '{{stat}}', label: "${PROP('Stat')}" },
+        { description: 'Label', alias: '{{label}}', label: '${LABEL}' },
+        {
+          description: 'Non-existing alias pattern',
+          alias: '{{anything_else}}',
+          label: "${PROP('Dim.anything_else')}",
+        },
+        {
+          description: 'Combined patterns',
+          alias: 'some {{combination}} of {{label}} and {{metric}}',
+          label: "some ${PROP('Dim.combination')} of ${LABEL} and ${PROP('MetricName')}",
+        },
+        {
+          description: 'Combined patterns not trimmed',
+          alias: 'some {{combination  }}{{ label}} and {{metric}}',
+          label: "some ${PROP('Dim.combination')}${LABEL} and ${PROP('MetricName')}",
+        },
       ];
-      test.each(cases)('should not migrate alias', ({ alias, label }) => {
+      test.each(cases)('should migrate alias anyway', ({ alias, label }) => {
         config.featureToggles.cloudWatchDynamicLabels = false;
         const testQuery = { ...baseQuery, alias: `${alias}` };
         if (label !== undefined) {
diff --git a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.ts b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.ts
index 0cffd1cdb6e..d734a234330 100644
--- a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.ts
+++ b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.ts
@@ -1,7 +1,5 @@
 import deepEqual from 'fast-deep-equal';
 
-import { config } from '@grafana/runtime';
-
 import { CloudWatchMetricsQuery } from '../types';
 
 // Call this function to migrate queries from within the plugin.
@@ -20,8 +18,9 @@ const aliasPatterns: Record<string, string> = {
   label: `LABEL`,
 };
 
+// migrateAliasPatterns in the context of https://github.com/grafana/grafana/issues/48434
 export function migrateAliasPatterns(query: CloudWatchMetricsQuery): CloudWatchMetricsQuery {
-  if (config.featureToggles.cloudWatchDynamicLabels && !query.hasOwnProperty('label')) {
+  if (!query.hasOwnProperty('label')) {
     const newQuery = { ...query };
     if (!query.hasOwnProperty('label')) {
       const regex = /{{\s*(.+?)\s*}}/g;
diff --git a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
index d29fef5a1da..8459f146342 100644
--- a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
@@ -10,10 +10,9 @@ import useMigratedMetricsQuery from './useMigratedMetricsQuery';
 
 describe('usePrepareMetricsQuery', () => {
   const DEFAULT_TEST_QUERY: CloudWatchMetricsQuery = { ...DEFAULT_METRICS_QUERY, refId: 'testId' };
-  describe('when dynamic labels are true and there is no label', () => {
+  describe('when there is no label', () => {
     const testQuery: CloudWatchMetricsQuery = { ...DEFAULT_TEST_QUERY, alias: 'test' };
     it('should replace label with alias and trigger onChangeQuery', async () => {
-      config.featureToggles.cloudWatchDynamicLabels = true;
       const expectedQuery: CloudWatchMetricsQuery = migrateAliasPatterns(testQuery);
       const onChangeQuery = jest.fn();
       const { result } = renderHook(() => useMigratedMetricsQuery(testQuery, onChangeQuery));
@@ -31,14 +30,16 @@ describe('usePrepareMetricsQuery', () => {
       expect(onChangeQuery).toHaveBeenCalledTimes(0);
     });
   });
+  // TODO: delete this test when dynamic labels feature flag is removed
   describe('when dynamic labels feature flag is disabled', () => {
     const testQuery: CloudWatchMetricsQuery = { ...DEFAULT_TEST_QUERY };
-    it('should not replace label or trigger onChange', async () => {
+    it('should replace label or trigger onChange', async () => {
+      const expectedQuery: CloudWatchMetricsQuery = migrateAliasPatterns(testQuery);
       config.featureToggles.cloudWatchDynamicLabels = false;
       const onChangeQuery = jest.fn();
       const { result } = renderHook(() => useMigratedMetricsQuery(testQuery, onChangeQuery));
-      expect(result.current).toEqual(testQuery);
-      expect(onChangeQuery).toHaveBeenCalledTimes(0);
+      expect(onChangeQuery).toHaveBeenLastCalledWith(result.current);
+      expect(result.current).toEqual(expectedQuery);
     });
   });
 });

From ba8bba78fca95c608de995b7c8665398c02b8bd4 Mon Sep 17 00:00:00 2001
From: Kuba Siemiatkowski <112862936+sasklacz@users.noreply.github.com>
Date: Mon, 1 May 2023 12:16:16 +0200
Subject: [PATCH 557/729] Datasource: Move the Delete data source button back
 to the bottom (#67552)

* - move delete button back to the lower section

* - remove the top Delete button

* - fix e2e tests
---
 .betterer.results                                 |  3 ---
 .../grafana-e2e-selectors/src/selectors/pages.ts  |  2 +-
 .../datasources/components/ButtonRow.test.tsx     |  5 ++++-
 .../features/datasources/components/ButtonRow.tsx | 15 +++++++++++++--
 .../datasources/components/EditDataSource.tsx     | 10 ++++++++--
 .../components/EditDataSourceActions.tsx          | 13 ++-----------
 6 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 3b1d4fa728d..84d3ed13d5e 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2595,9 +2595,6 @@ exports[`better eslint`] = {
     "public/app/features/datasources/components/BasicSettings.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
-    "public/app/features/datasources/components/ButtonRow.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "public/app/features/datasources/components/DataSourceReadOnlyMessage.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index fd3412b8559..ca4ab410469 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -20,7 +20,7 @@ export const Pages = {
     name: 'Data source settings page name input field',
     delete: 'Data source settings page Delete button',
     readOnly: 'Data source settings page read only message',
-    saveAndTest: 'Data source settings page Save and Test button',
+    saveAndTest: 'data-testid Data source settings page Save and Test button',
     alert: 'Data source settings page Alert',
   },
   DataSources: {
diff --git a/public/app/features/datasources/components/ButtonRow.test.tsx b/public/app/features/datasources/components/ButtonRow.test.tsx
index db90d92bb97..4232314a48e 100644
--- a/public/app/features/datasources/components/ButtonRow.test.tsx
+++ b/public/app/features/datasources/components/ButtonRow.test.tsx
@@ -8,6 +8,8 @@ import { ButtonRow, Props } from './ButtonRow';
 const setup = (propOverrides?: object) => {
   const props: Props = {
     canSave: false,
+    canDelete: true,
+    onDelete: jest.fn(),
     onSubmit: jest.fn(),
     onTest: jest.fn(),
   };
@@ -21,11 +23,12 @@ describe('<ButtonRow>', () => {
   it('should render component', () => {
     setup();
 
+    expect(screen.getByTestId(selectors.pages.DataSource.delete)).toBeInTheDocument();
     expect(screen.getByText('Test')).toBeInTheDocument();
   });
   it('should render save & test', () => {
     setup({ canSave: true });
 
-    expect(screen.getByRole('button', { name: selectors.pages.DataSource.saveAndTest })).toBeInTheDocument();
+    expect(screen.getByTestId(selectors.pages.DataSource.saveAndTest)).toBeInTheDocument();
   });
 });
diff --git a/public/app/features/datasources/components/ButtonRow.tsx b/public/app/features/datasources/components/ButtonRow.tsx
index 3058d6b1e9b..8239b2f7b56 100644
--- a/public/app/features/datasources/components/ButtonRow.tsx
+++ b/public/app/features/datasources/components/ButtonRow.tsx
@@ -5,20 +5,31 @@ import { Button } from '@grafana/ui';
 
 export interface Props {
   canSave: boolean;
+  canDelete: boolean;
+  onDelete: (event: React.MouseEvent<HTMLButtonElement>) => void;
   onSubmit: (event: React.MouseEvent<HTMLButtonElement>) => void;
   onTest: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
 }
 
-export function ButtonRow({ canSave, onSubmit, onTest }: Props) {
+export function ButtonRow({ canSave, canDelete, onDelete, onSubmit, onTest }: Props) {
   return (
     <div className="gf-form-button-row">
+      <Button
+        type="button"
+        variant="destructive"
+        disabled={!canDelete}
+        onClick={onDelete}
+        data-testid={selectors.pages.DataSource.delete}
+      >
+        Delete
+      </Button>
       {canSave && (
         <Button
           type="submit"
           variant="primary"
           disabled={!canSave}
           onClick={onSubmit}
-          aria-label={selectors.pages.DataSource.saveAndTest}
+          data-testid={selectors.pages.DataSource.saveAndTest}
         >
           Save &amp; test
         </Button>
diff --git a/public/app/features/datasources/components/EditDataSource.tsx b/public/app/features/datasources/components/EditDataSource.tsx
index 1cad01373a8..460fd603244 100644
--- a/public/app/features/datasources/components/EditDataSource.tsx
+++ b/public/app/features/datasources/components/EditDataSource.tsx
@@ -108,7 +108,7 @@ export function EditDataSourceView({
   onUpdate,
 }: ViewProps) {
   const { plugin, loadError, testingStatus, loading } = dataSourceSettings;
-  const { readOnly, hasWriteRights } = dataSourceRights;
+  const { readOnly, hasWriteRights, hasDeleteRights } = dataSourceRights;
   const hasDataSource = dataSource.id > 0;
 
   const dsi = getDataSourceSrv()?.getInstanceSettings(dataSource.uid);
@@ -179,7 +179,13 @@ export function EditDataSourceView({
 
       <DataSourceTestingStatus testingStatus={testingStatus} exploreUrl={exploreUrl} dataSource={dataSource} />
 
-      <ButtonRow onSubmit={onSubmit} onTest={onTest} canSave={!readOnly && hasWriteRights} />
+      <ButtonRow
+        onSubmit={onSubmit}
+        onTest={onTest}
+        onDelete={onDelete}
+        canDelete={!readOnly && hasDeleteRights}
+        canSave={!readOnly && hasWriteRights}
+      />
     </form>
   );
 }
diff --git a/public/app/features/datasources/components/EditDataSourceActions.tsx b/public/app/features/datasources/components/EditDataSourceActions.tsx
index ae07c1dafdc..95cbc85c558 100644
--- a/public/app/features/datasources/components/EditDataSourceActions.tsx
+++ b/public/app/features/datasources/components/EditDataSourceActions.tsx
@@ -3,11 +3,11 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { Button, LinkButton, useStyles2 } from '@grafana/ui';
+import { LinkButton, useStyles2 } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types';
 
-import { useDataSource, useDataSourceRights, useDeleteLoadedDataSource } from '../state';
+import { useDataSource } from '../state';
 import { trackCreateDashboardClicked, trackExploreClicked } from '../tracking';
 import { constructDataSourceExploreUrl } from '../utils';
 
@@ -26,13 +26,8 @@ interface Props {
 export function EditDataSourceActions({ uid }: Props) {
   const styles = useStyles2(getStyles);
   const dataSource = useDataSource(uid);
-  const onDelete = useDeleteLoadedDataSource();
-
-  const { readOnly, hasDeleteRights } = useDataSourceRights(uid);
   const hasExploreRights = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore);
 
-  const canDelete = !readOnly && hasDeleteRights;
-
   return (
     <>
       <LinkButton
@@ -71,10 +66,6 @@ export function EditDataSourceActions({ uid }: Props) {
           Explore
         </LinkButton>
       )}
-
-      <Button type="button" variant="destructive" disabled={!canDelete} onClick={onDelete} className={styles.button}>
-        Delete
-      </Button>
     </>
   );
 }

From d2bc2700977ceb147f37cd3591d9486d6108e34f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 1 May 2023 15:50:25 +0200
Subject: [PATCH 558/729] Alert: Redesign with tinted background  (#66918)

---
 .../grafana-data/src/themes/createColors.ts   |  2 +-
 packages/grafana-data/src/themes/palette.ts   |  8 ++--
 .../grafana-ui/src/components/Alert/Alert.tsx | 44 +++++++++++--------
 .../ConnectionsRedirectNotice.tsx             |  5 +--
 .../features/live/LiveConnectionWarning.tsx   |  2 -
 5 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/packages/grafana-data/src/themes/createColors.ts b/packages/grafana-data/src/themes/createColors.ts
index c645630f1d3..30d991dcc97 100644
--- a/packages/grafana-data/src/themes/createColors.ts
+++ b/packages/grafana-data/src/themes/createColors.ts
@@ -280,7 +280,7 @@ export function createColors(colors: ThemeColorsInput): ThemeColors {
       color.shade = base.mode === 'light' ? darken(color.main, tonalOffset) : lighten(color.main, tonalOffset);
     }
     if (!color.transparent) {
-      color.transparent = base.mode === 'light' ? alpha(color.main, 0.08) : alpha(color.main, 0.15);
+      color.transparent = alpha(color.main, 0.15);
     }
     if (!color.contrastText) {
       color.contrastText = getContrastText(color.main);
diff --git a/packages/grafana-data/src/themes/palette.ts b/packages/grafana-data/src/themes/palette.ts
index 2ac623b3da0..f9d9a780688 100644
--- a/packages/grafana-data/src/themes/palette.ts
+++ b/packages/grafana-data/src/themes/palette.ts
@@ -30,8 +30,8 @@ export const palette = {
   redDarkText: '#FF5286',
   greenDarkMain: '#1A7F4B',
   greenDarkText: '#6CCF8E',
-  orangeDarkMain: '#F5B73D',
-  orangeDarkText: '#F8D06B',
+  orangeDarkMain: '#FF9900',
+  orangeDarkText: '#fbad37',
 
   blueLightMain: '#3871DC',
   blueLightText: '#1F62E0',
@@ -39,6 +39,6 @@ export const palette = {
   redLightText: '#CF0E5B',
   greenLightMain: '#1B855E',
   greenLightText: '#0A764E',
-  orangeLightMain: '#FAD34A',
-  orangeLightText: '#8A6C00',
+  orangeLightMain: '#FF9900',
+  orangeLightText: '#B5510D',
 };
diff --git a/packages/grafana-ui/src/components/Alert/Alert.tsx b/packages/grafana-ui/src/components/Alert/Alert.tsx
index 4da17e027ca..110f2ccbf8e 100644
--- a/packages/grafana-ui/src/components/Alert/Alert.tsx
+++ b/packages/grafana-ui/src/components/Alert/Alert.tsx
@@ -1,5 +1,6 @@
 import { css, cx } from '@emotion/css';
 import React, { AriaRole, HTMLAttributes, ReactNode } from 'react';
+import tinycolor2 from 'tinycolor2';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -8,7 +9,6 @@ import { useTheme2 } from '../../themes';
 import { IconName } from '../../types/icon';
 import { Button } from '../Button/Button';
 import { Icon } from '../Icon/Icon';
-import { IconButton } from '../IconButton/IconButton';
 
 export type AlertVariant = 'success' | 'warning' | 'error' | 'info';
 
@@ -73,7 +73,14 @@ export const Alert = React.forwardRef<HTMLDivElement, Props>(
         {/* If onRemove is specified, giving preference to onRemove */}
         {onRemove && !buttonContent && (
           <div className={styles.close}>
-            <IconButton aria-label="Close alert" name="times" onClick={onRemove} size="lg" type="button" />
+            <Button
+              aria-label="Close alert"
+              icon="times"
+              onClick={onRemove}
+              type="button"
+              fill="text"
+              variant="secondary"
+            />
           </div>
         )}
 
@@ -113,6 +120,7 @@ const getStyles = (
 ) => {
   const color = theme.colors[severity];
   const borderRadius = theme.shape.borderRadius();
+  const borderColor = tinycolor2(color.border).setAlpha(0.2).toString();
 
   return {
     alert: css`
@@ -122,8 +130,10 @@ const getStyles = (
       display: flex;
       flex-direction: row;
       align-items: stretch;
-      background: ${theme.colors.background.secondary};
-      box-shadow: ${elevated ? theme.shadows.z3 : theme.shadows.z1};
+      background: ${color.transparent};
+      box-shadow: ${elevated ? theme.shadows.z3 : 'none'};
+      padding: ${theme.spacing(1, 2)};
+      border: 1px solid ${borderColor};
       margin-bottom: ${theme.spacing(bottomSpacing ?? 2)};
       margin-top: ${theme.spacing(topSpacing ?? 0)};
 
@@ -139,21 +149,15 @@ const getStyles = (
       }
     `,
     icon: css`
-      padding: ${theme.spacing(2, 3)};
-      background: ${color.main};
-      border-radius: ${borderRadius} 0 0 ${borderRadius};
-      color: ${color.contrastText};
+      padding: ${theme.spacing(1, 2, 0, 0)};
+      color: ${color.text};
       display: flex;
-      align-items: center;
-      justify-content: center;
-    `,
-    title: css`
-      font-weight: ${theme.typography.fontWeightMedium};
-      color: ${theme.colors.text.primary};
     `,
+    title: css({
+      fontWeight: theme.typography.fontWeightMedium,
+    }),
     body: css`
-      color: ${theme.colors.text.secondary};
-      padding: ${theme.spacing(2)};
+      padding: ${theme.spacing(1, 0)};
       flex-grow: 1;
       display: flex;
       flex-direction: column;
@@ -162,8 +166,7 @@ const getStyles = (
       word-break: break-word;
     `,
     content: css`
-      color: ${theme.colors.text.secondary};
-      padding-top: ${hasTitle ? theme.spacing(1) : 0};
+      padding-top: ${hasTitle ? theme.spacing(0.5) : 0};
       max-height: 50vh;
       overflow-y: auto;
     `,
@@ -174,9 +177,12 @@ const getStyles = (
       align-items: center;
     `,
     close: css`
-      padding: ${theme.spacing(2, 1)};
+      position: relative;
+      color: ${theme.colors.text.secondary};
       background: none;
       display: flex;
+      top: -6px;
+      right: -14px;
     `,
   };
 };
diff --git a/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx b/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx
index c473107d804..20c34dd33f8 100644
--- a/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx
+++ b/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx
@@ -17,7 +17,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
   alertParagraph: css`
     margin: 0 ${theme.spacing(1)} 0 0;
     line-height: ${theme.spacing(theme.components.height.sm)};
-    color: ${theme.colors.text.primary};
   `,
 });
 
@@ -31,8 +30,8 @@ export function ConnectionsRedirectNotice() {
           Data sources have a new home! You can discover new data sources or manage existing ones in the new Connections
           page, accessible from the lefthand nav.
         </p>
-        <LinkButton aria-label="Link to Connections" icon="adjust-circle" href={ROUTES.DataSources}>
-          See data sources in Connections
+        <LinkButton aria-label="Link to Connections" icon="arrow-right" href={ROUTES.DataSources} fill="text">
+          Go to connections
         </LinkButton>
       </div>
     </Alert>
diff --git a/public/app/features/live/LiveConnectionWarning.tsx b/public/app/features/live/LiveConnectionWarning.tsx
index 646705d8a34..5f819597821 100644
--- a/public/app/features/live/LiveConnectionWarning.tsx
+++ b/public/app/features/live/LiveConnectionWarning.tsx
@@ -72,10 +72,8 @@ const getStyle = stylesFactory((theme: GrafanaTheme2) => {
       margin: 16px;
     `,
     warn: css`
-      border: 2px solid ${theme.colors.warning.main};
       max-width: 400px;
       margin: auto;
-      height: 3em;
     `,
   };
 });

From 61484fa826926c1d378b853329f4d690e8e7a5bd Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Mon, 1 May 2023 10:32:16 -0400
Subject: [PATCH 559/729] Alerting: Mention title of alert rule that caused
 migration to fail (#67451)

* add debug log for migration of alert rules
* add alert rule name and some information to conversion error
---
 pkg/services/sqlstore/migrations/ualert/ualert.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/services/sqlstore/migrations/ualert/ualert.go b/pkg/services/sqlstore/migrations/ualert/ualert.go
index a7a4a83a759..009a078fb46 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert.go
@@ -293,6 +293,7 @@ func (m *migration) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
 
 	for _, da := range dashAlerts {
 		l := mg.Logger.New("ruleID", da.Id, "ruleName", da.Name, "dashboardUID", da.DashboardUID, "orgID", da.OrgId)
+		l.Debug("migrating alert rule to Unified Alerting")
 		newCond, err := transConditions(*da.ParsedSettings, da.OrgId, dsIDMap)
 		if err != nil {
 			return err
@@ -376,7 +377,7 @@ func (m *migration) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
 		}
 		rule, err := m.makeAlertRule(*newCond, da, folder.Uid)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to migrate alert rule '%s' [ID:%d, DashboardUID:%s, orgID:%d]: %w", da.Name, da.Id, da.DashboardUID, da.OrgId, err)
 		}
 
 		if _, ok := rulesPerOrg[rule.OrgID]; !ok {

From 55df8afe8fc76c9659ef6e9fabb83af36cb63cd8 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 1 May 2023 09:42:22 -0700
Subject: [PATCH 560/729] Timeseries: don't show conversion error for empty
 response (#67590)

---
 .../panel-timeseries/timeseries-formats.json  | 105 ++++++++++++++++--
 .../panel/timeseries/TimeSeriesPanel.tsx      |   4 +-
 2 files changed, 98 insertions(+), 11 deletions(-)

diff --git a/devenv/dev-dashboards/panel-timeseries/timeseries-formats.json b/devenv/dev-dashboards/panel-timeseries/timeseries-formats.json
index f0eb2e24fc4..7a4b9ea0df2 100644
--- a/devenv/dev-dashboards/panel-timeseries/timeseries-formats.json
+++ b/devenv/dev-dashboards/panel-timeseries/timeseries-formats.json
@@ -18,7 +18,6 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 220,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -44,8 +43,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -77,6 +75,7 @@
       },
       "id": 8,
       "options": {
+        "cellHeight": "sm",
         "footer": {
           "countRows": false,
           "fields": "",
@@ -90,7 +89,7 @@
         "showRowNums": false,
         "sortBy": []
       },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "10.0.0-pre",
       "targets": [
         {
           "datasource": {
@@ -760,8 +759,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -825,9 +823,98 @@
         "content": "The timeseries panel can not show timeseries-long directly, it must first be converted to `timeseries-wide` or `timeseries-multi` first.\n\nThe UI should show a button indicating this.",
         "mode": "markdown"
       },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "10.0.0-pre",
       "title": "Timeseries-long info",
       "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "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": 8,
+        "w": 8,
+        "x": 0,
+        "y": 8
+      },
+      "id": 11,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 0
+        }
+      ],
+      "title": "Expected no-data message (empty series",
+      "type": "timeseries"
     }
   ],
   "refresh": "",
@@ -846,6 +933,6 @@
   "timezone": "",
   "title": "Panel Tests - Timeseries - Supported input formats",
   "uid": "f4ca24309dd4",
-  "version": 6,
+  "version": 1,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index 472b85ec143..b07db8cc1cb 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -41,7 +41,7 @@ export const TimeSeriesPanel = ({
   const frames = useMemo(() => prepareGraphableFields(data.series, config.theme2, timeRange), [data, timeRange]);
   const timezones = useMemo(() => getTimezones(options.timezone, timeZone), [options.timezone, timeZone]);
   const suggestions = useMemo(() => {
-    if (data.series.every((df) => df.meta?.type === DataFrameType.TimeSeriesLong)) {
+    if (frames?.length && frames.every((df) => df.meta?.type === DataFrameType.TimeSeriesLong)) {
       const s = getPrepareTimeseriesSuggestion(id);
       return {
         message: 'Long data must be converted to wide',
@@ -49,7 +49,7 @@ export const TimeSeriesPanel = ({
       };
     }
     return undefined;
-  }, [data.series, id]);
+  }, [frames, id]);
 
   if (!frames || suggestions) {
     return (

From d189b8b47ff5f7a432dfd960ab48ce6d17d0c74b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 1 May 2023 19:33:30 +0200
Subject: [PATCH 561/729] Alert: Fixes a minor issue with new Alert design and
 updated scss files (#67589)

---
 packages/grafana-ui/src/components/Alert/Alert.tsx     |  4 +++-
 .../src/components/Alert/InlineBanner.story.tsx        |  7 +------
 public/sass/_variables.dark.generated.scss             | 10 +++++-----
 public/sass/_variables.light.generated.scss            | 10 +++++-----
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/grafana-ui/src/components/Alert/Alert.tsx b/packages/grafana-ui/src/components/Alert/Alert.tsx
index 110f2ccbf8e..2a0a8473028 100644
--- a/packages/grafana-ui/src/components/Alert/Alert.tsx
+++ b/packages/grafana-ui/src/components/Alert/Alert.tsx
@@ -171,10 +171,12 @@ const getStyles = (
       overflow-y: auto;
     `,
     buttonWrapper: css`
-      padding: ${theme.spacing(1)};
+      margin-left: ${theme.spacing(1)};
       background: none;
       display: flex;
       align-items: center;
+      align-self: center;
+      background: ${theme.colors.background.primary};
     `,
     close: css`
       position: relative;
diff --git a/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx b/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
index 5da630ce66b..4faeeacbd3c 100644
--- a/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
+++ b/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
@@ -80,12 +80,7 @@ export const Examples: ComponentStory<typeof Alert> = () => {
       <StoryExample name="Severities">
         <VerticalGroup>
           {severities.map((severity) => (
-            <Alert
-              title={`Severity: ${severity}`}
-              severity={severity}
-              key={severity}
-              onRemove={action('Remove button clicked')}
-            >
+            <Alert title={`Severity: ${severity}`} severity={severity} key={severity}>
               Child content
             </Alert>
           ))}
diff --git a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss
index e1197d4f35e..6683210d06e 100644
--- a/public/sass/_variables.dark.generated.scss
+++ b/public/sass/_variables.dark.generated.scss
@@ -80,7 +80,7 @@ $variable: #6E9FFF;
 
 $brand-primary: #eb7b18;
 $brand-success: #1A7F4B;
-$brand-warning: #F5B73D;
+$brand-warning: #FF9900;
 $brand-danger: #D10E5C;
 
 $query-red: #FF5286;
@@ -91,7 +91,7 @@ $query-orange: #eb7b18;
 // Status colors
 // -------------------------¨
 $online: #6CCF8E;
-$warn: #F8D06B;
+$warn: #fbad37;
 $critical: #FF5286;
 
 // Scaffolding
@@ -275,14 +275,14 @@ $tab-border-color: $dark-9;
 
 // Form states and alerts
 // -------------------------
-$warning-text-color: #F8D06B;
+$warning-text-color: #fbad37;
 $error-text-color: #FF5286;
 $success-text-color: #6CCF8E;
 
 $alert-error-bg: #D10E5C;
 $alert-success-bg: #1A7F4B;
-$alert-warning-bg: #F5B73D;
-$alert-info-bg: #F5B73D;
+$alert-warning-bg: #FF9900;
+$alert-info-bg: #FF9900;
 
 // Tooltips and popovers
 // -------------------------
diff --git a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss
index 84147e39fc4..724d00fd233 100644
--- a/public/sass/_variables.light.generated.scss
+++ b/public/sass/_variables.light.generated.scss
@@ -75,7 +75,7 @@ $variable: #1F62E0;
 
 $brand-primary: #eb7b18;
 $brand-success: #1B855E;
-$brand-warning: #FAD34A;
+$brand-warning: #FF9900;
 $brand-danger: #E0226E;
 
 $query-red: #CF0E5B;
@@ -86,7 +86,7 @@ $query-orange: #eb7b18;
 // Status colors
 // -------------------------
 $online: #0A764E;
-$warn: #8A6C00;
+$warn: #B5510D;
 $critical: #CF0E5B;
 
 
@@ -272,14 +272,14 @@ $tab-border-color: $gray-5;
 
 // Form states and alerts
 // -------------------------
-$warning-text-color: #8A6C00;
+$warning-text-color: #B5510D;
 $error-text-color: #CF0E5B;
 $success-text-color: #0A764E;
 
 $alert-error-bg: #E0226E;
 $alert-success-bg: #1B855E;
-$alert-warning-bg: #FAD34A;
-$alert-info-bg: #FAD34A;
+$alert-warning-bg: #FF9900;
+$alert-info-bg: #FF9900;
 
 // Tooltips and popovers
 $tooltipBackground: #F4F5F5;

From 9d564f9afb235415ebb1bf0675a75dc923fe4a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 1 May 2023 20:15:09 +0200
Subject: [PATCH 562/729] Alert: Remove fix for custom content close button
 (#67592)

---
 packages/grafana-ui/src/components/Alert/Alert.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/Alert/Alert.tsx b/packages/grafana-ui/src/components/Alert/Alert.tsx
index 2a0a8473028..e13dd28a294 100644
--- a/packages/grafana-ui/src/components/Alert/Alert.tsx
+++ b/packages/grafana-ui/src/components/Alert/Alert.tsx
@@ -172,11 +172,9 @@ const getStyles = (
     `,
     buttonWrapper: css`
       margin-left: ${theme.spacing(1)};
-      background: none;
       display: flex;
       align-items: center;
       align-self: center;
-      background: ${theme.colors.background.primary};
     `,
     close: css`
       position: relative;

From 262cdcc789f7e86722630a70824ea47c2249df0c Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Mon, 1 May 2023 14:56:58 -0400
Subject: [PATCH 563/729] docs: nav updates for assess dashboards topic
 (#67593)

* updated screenshots and nav info in data sources section

* removed redundant availability notes

* apply review suggestion
---
 .../assess-dashboard-usage/index.md           | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/docs/sources/dashboards/assess-dashboard-usage/index.md b/docs/sources/dashboards/assess-dashboard-usage/index.md
index 26f3c8b85cd..af2bca8d257 100644
--- a/docs/sources/dashboards/assess-dashboard-usage/index.md
+++ b/docs/sources/dashboards/assess-dashboard-usage/index.md
@@ -43,8 +43,6 @@ For every dashboard and data source, you can access usage information.
 
 ### Dashboard insights
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
-
 To see dashboard usage information, click the dashboard insights icon in the header.
 
 {{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-insights.png" max-width="400px" class="docs-image--no-shadow" >}}
@@ -64,8 +62,6 @@ If you've enabled the `publicDashboards` feature toggle, you'll also see a Publi
 
 ### Data source insights
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.3 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
-
 Data source insights provides information about how a data source has been used in the past 30 days, such as:
 
 - Queries per day
@@ -74,17 +70,16 @@ Data source insights provides information about how a data source has been used
 
 To find data source insights:
 
-1. Go to the Data source list view.
-1. Click on a data source.
+1. Click **Connections** in the main navigation.
+1. Under Your connections, click **Data sources**.
+1. Click a data source.
 1. Click the **Insights** tab.
 
-{{< figure src="/static/img/docs/enterprise/datasource_insights.png" max-width="650px" class="docs-image--no-shadow" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-data-source-insights-9.5.png" max-width="650px" class="docs-image--no-shadow" >}}
 
 ## Presence indicator
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
-
-When you are signed in and looking at a dashboard, you can know who is looking at the same dashboard as you are via a presence indicator, which displays avatars of users who have recently interacted with the dashboard. The default timeframe is 10 minutes. To see the user's name, hover over the user's avatar. The avatars come from [Gravatar](https://gravatar.com) based on the user's email.
+When you are signed in and looking at a dashboard, you can know who is looking at the same dashboard as you are via a presence indicator, which displays avatars of users who have recently interacted with the dashboard. The default time frame is 10 minutes. To see the user's name, hover over the user's avatar. The avatars come from [Gravatar](https://gravatar.com) based on the user's email.
 
 When there are more active users on a dashboard than can fit within the presence indicator, click the **+X** icon. Doing so opens [dashboard insights]({{< relref "#dashboard-and-data-source-insights" >}}), which contains more details about recent user activity.
 
@@ -100,23 +95,19 @@ recent_users_age = 10m
 
 ## Sort dashboards by using insights data
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
-
-In the search view, you can use insights data to help you find most-used, broken, and unused dashbaords.
+In the search view, you can use insights data to help you find most-used, broken, and unused dashboards.
 
 You can sort the dashboards by:
 
 - Errors total
-- Errors 30 days
+- Errors 30 days (most and least)
 - Views total
-- Views 30 days
+- Views 30 days (most and least)
 
-{{< figure src="/static/img/docs/enterprise/improved-search-7-5.png" max-width="650px" class="docs-image--no-shadow" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-sort-9.5.png" max-width="650px" class="docs-image--no-shadow" >}}
 
 ## Visualize usage insights data
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
-
 If you set up your installation to [export logs of usage insights]({{< relref "../../setup-grafana/configure-security/export-logs/" >}}), we've created two dashboards to help you take advantage of this data.
 
 1. [Usage Insights overview](/grafana/dashboards/13785) provides a top-level perspective of user activity.

From cc46581522edf713fc66858817ef03045041be13 Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Mon, 1 May 2023 14:57:16 -0400
Subject: [PATCH 564/729] docs: add link to dashboard insights page (#67594)

* added link to dashboard insights docs

* shortened link text
---
 docs/sources/dashboards/use-dashboards/index.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/sources/dashboards/use-dashboards/index.md b/docs/sources/dashboards/use-dashboards/index.md
index db62eb9793a..fe5bbac9257 100644
--- a/docs/sources/dashboards/use-dashboards/index.md
+++ b/docs/sources/dashboards/use-dashboards/index.md
@@ -34,15 +34,15 @@ The following image and descriptions highlights all dashboards features.
 - (3) **Share dashboard or panel**: Use this option to share the current dashboard or panel by link or snapshot. You can also export the dashboard definition from the share modal.
 - (4) **Add**: Use this option to add a panel, dashboard row, or library panel to the current dashboard.
 - (5) **Save dashboard**: Click to save changes to your dashboard.
-- (6) **Dashboard insights**: Click to view analytics about your dashboard including information about users, activity, query counts.
-- (7) **Dashboard settings**: Use this option to change dashboard name, folder, and tags and manage variables and annotation queries. For more information about dashboard settings, refer to [Modify dashboard settings]({{< relref "../build-dashboards/modify-dashboard-settings/" >}}).
+- (6) **Dashboard insights**: Click to view analytics about your dashboard including information about users, activity, query counts. Learn more about [dashboard analytics]({{< relref "../assess-dashboard-usage/" >}}).
+- (7) **Dashboard settings**: Use this option to change dashboard name, folder, and tags and manage variables and annotation queries. Learn more about [dashboard settings]({{< relref "../build-dashboards/modify-dashboard-settings/" >}}).
 - (8) **Time picker dropdown**: Click to select relative time range options and set custom absolute time ranges.
   - You can change the **Timezone** and **fiscal year** settings from the time range controls by clicking the **Change time settings** button.
   - Time settings are saved on a per-dashboard basis.
-- (9) **Zoom out time range**: Click to zoom out the time range. For more information about how to use time range controls, refer to [Common time range controls]({{< relref "#common-time-range-controls" >}}).
+- (9) **Zoom out time range**: Click to zoom out the time range. Learn more about how to use [common time range controls]({{< relref "#common-time-range-controls" >}}).
 - (10) **Refresh dashboard**: Click to immediately trigger queries and refresh dashboard data.
 - (11) **Refresh dashboard time interval**: Click to select a dashboard auto refresh time interval.
-- (12) **View mode**: Click to display the dashboard on a large screen such as a TV or a kiosk. View mode hides irrelevant information such as navigation menus. For more information about view mode, refer to [How to Create Kiosks to Display Dashboards on a TV](https://grafana.com/blog/2019/05/02/grafana-tutorial-how-to-create-kiosks-to-display-dashboards-on-a-tv/).
+- (12) **View mode**: Click to display the dashboard on a large screen such as a TV or a kiosk. View mode hides irrelevant information such as navigation menus. Learn more about view mode in our [How to Create Kiosks to Display Dashboards on a TV blog post](https://grafana.com/blog/2019/05/02/grafana-tutorial-how-to-create-kiosks-to-display-dashboards-on-a-tv/).
 - (13) **Dashboard panel**: The primary building block of a dashboard is the panel. To add a new panel, dashboard row, or library panel, click **Add panel**.
   - Library panels can be shared among many dashboards.
   - To move a panel, drag the panel header to another location.

From 999a2ce92ddc8d45aa59bb305c1ef9f7282041a0 Mon Sep 17 00:00:00 2001
From: Ron D <106610617+rgnvldr@users.noreply.github.com>
Date: Mon, 1 May 2023 12:56:21 -0700
Subject: [PATCH 565/729] Add Grafana Free as supporting Enterprise features
 (#67568)

Per https://docs.google.com/document/d/14aOVLPq0FNqQKN4axTTEvjraY_OafhiDM_2NYSHF33A/edit#heading=h.lo4c6e71q7vo Grafana Cloud Free will include all the features of Grafana Advanced in Q2
---
 docs/sources/introduction/grafana-enterprise.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/introduction/grafana-enterprise.md b/docs/sources/introduction/grafana-enterprise.md
index 32f91ef4478..be9b0f590dd 100644
--- a/docs/sources/introduction/grafana-enterprise.md
+++ b/docs/sources/introduction/grafana-enterprise.md
@@ -19,7 +19,7 @@ To learn more about Grafana Enterprise, refer to [our product page](https://graf
 
 ## Enterprise features in Grafana Cloud
 
-Many Grafana Enterprise features are also available in [Grafana Cloud](/docs/grafana-cloud) Pro and Advanced accounts. For details, refer to [the Grafana Cloud features table](https://grafana.com/pricing/#featuresTable).
+Many Grafana Enterprise features are also available in [Grafana Cloud](/docs/grafana-cloud) Free, Pro, and Advanced accounts. For details, refer to [the Grafana Cloud features table](https://grafana.com/pricing/#featuresTable).
 
 ## Authentication
 

From 01aa776522bec2d41d58064227de19cde408d390 Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Mon, 1 May 2023 16:47:10 -0400
Subject: [PATCH 566/729] docs: reverse what's new order in TOC (#67596)

* reverse order of what's new pages

* fix page weight numbering to follow original pattern
---
 docs/sources/whatsnew/whats-new-in-v9-3.md | 2 +-
 docs/sources/whatsnew/whats-new-in-v9-4.md | 2 +-
 docs/sources/whatsnew/whats-new-in-v9-5.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/whatsnew/whats-new-in-v9-3.md b/docs/sources/whatsnew/whats-new-in-v9-3.md
index ba323287c89..0f18686077b 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-3.md
@@ -9,7 +9,7 @@ keywords:
   - '9.3'
   - release notes
 title: What's new in Grafana v9.3
-weight: -33
+weight: -34
 ---
 
 # What’s new in Grafana v9.3
diff --git a/docs/sources/whatsnew/whats-new-in-v9-4.md b/docs/sources/whatsnew/whats-new-in-v9-4.md
index 365e0bf2326..89d19bc8a3e 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-4.md
@@ -7,7 +7,7 @@ keywords:
   - '9.4'
   - release notes
 title: What's new in Grafana v9.4
-weight: -33
+weight: -35
 ---
 
 # What’s new in Grafana v9.4
diff --git a/docs/sources/whatsnew/whats-new-in-v9-5.md b/docs/sources/whatsnew/whats-new-in-v9-5.md
index fb8139c7782..55c87549a8a 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-5.md
@@ -7,7 +7,7 @@ keywords:
   - '9.5'
   - release notes
 title: What's new in Grafana v9.5
-weight: -33
+weight: -36
 ---
 
 # What’s new in Grafana v9.5

From 0d52d19e21152b27a1d8aa375f8d753339caa393 Mon Sep 17 00:00:00 2001
From: matt abrams <37156449+zuchka@users.noreply.github.com>
Date: Mon, 1 May 2023 11:25:09 -1000
Subject: [PATCH 567/729] GH Issues: replace markdown-based Bug Report form w/
 YAML-based form (#67244)

* replaces markdown report w yaml

* switch to opentext + feedback changes
---
 .github/ISSUE_TEMPLATE/0-bug-report.yaml | 177 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/1-bug_report.md   |  31 ----
 .github/ISSUE_TEMPLATE/1-staff_issues.md |   5 +
 3 files changed, 182 insertions(+), 31 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/0-bug-report.yaml
 delete mode 100644 .github/ISSUE_TEMPLATE/1-bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/1-staff_issues.md

diff --git a/.github/ISSUE_TEMPLATE/0-bug-report.yaml b/.github/ISSUE_TEMPLATE/0-bug-report.yaml
new file mode 100644
index 00000000000..56476cb716c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/0-bug-report.yaml
@@ -0,0 +1,177 @@
+name: New Bug Report
+description: File a bug report
+title: "Product-Area-Here: short description of bug here"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        Please try to give your issue a good title. Try using the product-area where you are having an issue and a brief description of the problem. Like this: 
+        - `Dashboards: Template Variables break when I do X` or 
+        - `Alerting: message templating plus Slack channel breaks when I do X`
+  - type: markdown
+    attributes:
+      value: |
+        **HINT:** Have you tried [searching](https://github.com/grafana/grafana/issues) for similar issues? Duplicate issues are common.
+
+        **Are you reporting a security vulnerability?** [Submit it here instead](https://github.com/grafana/grafana/security/policy).
+  - type: markdown
+    attributes:
+      value: |
+       #
+  - type: textarea
+    id: bug-describe
+    attributes:
+      label: |
+        
+        # What went wrong?
+        
+      description: |
+        #
+        Describe your bug. What happened? What did you expect to happen?
+
+        **Hot Tip:** Record your screen and add it here as a gif. 
+      placeholder: Tell us what you see!
+      value: |
+        **What happened**:
+
+          - 
+
+        **What did you expect to happen**:
+
+          - 
+
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+       #
+  - type: textarea
+    id: bug-repro
+    attributes:
+      label: |
+        
+        # How do we reproduce it?
+        
+      description: |
+        #
+
+        Whenever possible, please provide **detailed** steps for reproducing your bug.
+
+        **This is very helpful info** 
+      placeholder: "Step 1:..."
+      value: |
+        **Step 1**:
+        
+        - Open Grafana and do X 
+
+        **Step 2**:
+
+        - Now click button Y
+
+        **Step 3**:
+
+        - Wait for the browser to crash. Error message says: "Error..."
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+       #
+  - type: input
+    id: gf-version
+    attributes:
+      label: |
+        
+        # What Grafana version are you using?
+        
+      description: |
+        #
+        - [How do I find my Grafana version info?](https://community.grafana.com/t/how-to-find-your-grafana-version-info-3-different-ways/86857)
+      placeholder: "ex: v9.5.0, or v9.5.0-cloud.5.a016665c (b2a5d45589)"
+    validations:
+      required: true  
+  - type: markdown
+    attributes:
+      value: |
+        #
+        #
+        # Optional Questions:
+        #
+  - type: textarea
+    id: get-help
+    attributes:
+      label: |
+        
+        ## Optional Questions:
+        
+        ### Is the bug inside a Dashboard Panel?
+
+      description: |
+        If the bug appears inside a [dashboard panel](https://grafana.com/docs/grafana/latest/panels-visualizations/#panels-and-visualizations), please use the ["Get-Help" feature](https://grafana.com/docs/grafana/latest/troubleshooting/send-panel-to-grafana-support/). Select **copy to clipboard** and paste the data below.
+        No need for backticks--this text will get formatted as a code-block.
+
+        What's a [dashboard panel](https://grafana.com/docs/grafana/latest/panels-visualizations/#panels-and-visualizations)?
+      placeholder: Copy "get-help" data here
+      value: Copy the panel's ["get-help" data](https://grafana.com/docs/grafana/latest/troubleshooting/send-panel-to-grafana-support/) here  
+  - type: dropdown
+    id: gf-deployment
+    attributes:
+      label: Grafana Platform?
+      description: |
+        **How** are you running/deploying Grafana?
+      options:
+        - I use Grafana Cloud
+        - Docker
+        - Kubernetes
+        - A package manager (APT, YUM, BREW, etc.)
+        - A downloaded binary
+        - Other
+        - I don't know
+    validations:
+      required: false
+  - type: input
+    id: user-os
+    attributes:
+      label: User's OS?
+      description: What operating system are you running locally?
+      placeholder: "ex. MacOS Big Sur 11.7, or Ubuntu 20.04..."
+  - type: input
+    id: user-browser
+    attributes:
+      label: User's Browser?
+      description: Is the bug occuring in Grafana's user-interface? If so, what browsers are you seeing the problem on? You may choose more than one.
+      placeholder: "ex. Google Chrome Version 112.0.5615.137 (Official Build) (arm64)..."
+  - type: dropdown
+    id: regression
+    attributes:
+      label: Is this a Regression?
+      description: |
+        A regression means that the feature was working, then you upgraded, and now it's broken.
+      options:
+        - 'No'
+        - 'Yes'
+    validations:
+      required: false
+  - type: input
+    id: gf-datasource
+    attributes:
+      label: Are Datasources involved?
+      description: |
+        Is this issue specific to a datasource plugin / plugins? Please list all that apply:
+      placeholder: "ex. Elasticsearch 5.0.0 or Infinity 1.4.1 ..."
+  - type: markdown
+    attributes:
+      value: |
+        #
+        #
+        ## Anything else to add?
+        #
+  - type: textarea
+    id: extra
+    attributes:
+      label: |
+              Anything else to add?
+      description: Add any extra information here
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md
deleted file mode 100644
index e17d15e3e0e..00000000000
--- a/.github/ISSUE_TEMPLATE/1-bug_report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Report a bug you found when using Grafana
-labels: 'type: bug'
----
-
-<!--
-Please use this template to create your bug report. By providing as much info as possible you help us understand the issue, reproduce it and resolve it for you quicker. Therefore take a couple of extra minutes to make sure you have provided all info needed.
-
-PROTIP: record your screen and attach it as a gif to showcase the issue.
-
-- Questions should be posted to: https://community.grafana.com
-- Use query inspector to troubleshoot issues: https://bit.ly/2XNF6YS
-- How to record and attach gif: https://bit.ly/2Mi8T6K
--->
-
-## What happened:
-
-## What you expected to happen:
-
-## How to reproduce it (as minimally and precisely as possible):
-
-## Anything else we need to know?:
-
-## Environment:
-- Grafana version:
-- Data source type & version:
-- OS Grafana is installed on:
-- User OS & Browser:
-- Grafana plugins:
-- Others:
diff --git a/.github/ISSUE_TEMPLATE/1-staff_issues.md b/.github/ISSUE_TEMPLATE/1-staff_issues.md
new file mode 100644
index 00000000000..48aa91e08c9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-staff_issues.md
@@ -0,0 +1,5 @@
+---
+name: Staff Issues
+about: Blank issue for Grafana staff members
+labels: 'internal'
+---

From d31d1576fbcbb2ee5e19de3e9d6bc4af1047d659 Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Mon, 1 May 2023 17:29:35 -0400
Subject: [PATCH 568/729] Prometheus: Metric encyclopedia improvements (#67084)

* move to me directory and sort by relevance

* refactor letter search, uFuzzy and styles out of ency

* begin state refactor

* refactor getMetaData useEffect call with useReducer

* refactor pagination with useReducer

* refactor fuzzy state for useReducer

* refactor all filters for useReducer

* remove haystacks arrays in favor of haystack dictionaries w object keys

* refactor out functions into state helpers

* switch label filter text color to work with light theme

* make each row clickable to select metric

* add pagination component

* fix max results

* make a better table with keystrokes, navigate to metric with up&down, select on enter, hide settings, make a nice button

* save space, give more real esate to the table

* add highlighting for fuzzy search matches

* add custom button in metric select option to open metric encyclopedia

* open the modal with enter keystroke

* remove unnecessary actions and variables from m.e.

* fix tests, clean code

* remove setting of selected idx on results row when hovering

* tests

* rename to metrics modal and have select option same as header

* reduce width for wider screens

* pass in initial metrics list and remove call to labels and series in metrics modal

* use createSlice from reduc toolkit to deduce actions

* save the metrics modal additional settings

* galen alphabet refactor suggestion

* remove extra row in results table

* fix storing settings, wrap in feature toggle

* remove metadata check & load because metric select already handles this

* Update public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/LetterSearch.tsx

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>

* fix styles, show cursor as pointer for select option and clickable row

* taller modal for larger screens

* turn off metadata settings if usebackend is selected

* additional settings button space

* add pipe to ufuzzy metadata search

---------

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
---
 .../components/MetricEncyclopediaModal.tsx    | 850 ------------------
 .../querybuilder/components/MetricSelect.tsx  | 170 +++-
 .../components/PromQueryBuilder.tsx           |  71 +-
 .../components/PromQueryBuilderContainer.tsx  |  36 +-
 .../{ => metrics-modal}/FeedbackLink.tsx      |   2 +-
 .../components/metrics-modal/LetterSearch.tsx |  71 ++
 .../MetricsModal.test.tsx}                    |  56 +-
 .../components/metrics-modal/MetricsModal.tsx | 402 +++++++++
 .../components/metrics-modal/ResultsTable.tsx | 170 ++++
 .../components/metrics-modal/state/helpers.ts | 213 +++++
 .../components/metrics-modal/state/state.ts   | 209 +++++
 .../components/metrics-modal/styles.ts        | 123 +++
 .../components/metrics-modal/types.ts         |  30 +
 .../components/metrics-modal/uFuzzy.ts        |  43 +
 .../prometheus/querybuilder/types.ts          |   5 +
 .../plugins/datasource/prometheus/types.ts    |   5 +
 16 files changed, 1475 insertions(+), 981 deletions(-)
 delete mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/MetricEncyclopediaModal.tsx
 rename public/app/plugins/datasource/prometheus/querybuilder/components/{ => metrics-modal}/FeedbackLink.tsx (90%)
 create mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/LetterSearch.tsx
 rename public/app/plugins/datasource/prometheus/querybuilder/components/{MetricEncyclopediaModal.test.tsx => metrics-modal/MetricsModal.test.tsx} (83%)
 create mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.tsx
 create mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/ResultsTable.tsx
 create mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/helpers.ts
 create mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/state.ts
 create mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/styles.ts
 create mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/types.ts
 create mode 100644 public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/uFuzzy.ts

diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricEncyclopediaModal.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricEncyclopediaModal.tsx
deleted file mode 100644
index 4c336acf866..00000000000
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricEncyclopediaModal.tsx
+++ /dev/null
@@ -1,850 +0,0 @@
-import { css, cx } from '@emotion/css';
-import uFuzzy from '@leeoniya/ufuzzy';
-import debounce from 'debounce-promise';
-import { debounce as debounceLodash } from 'lodash';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-
-import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { EditorField } from '@grafana/experimental';
-import { reportInteraction } from '@grafana/runtime';
-import {
-  Button,
-  CellProps,
-  Column,
-  InlineField,
-  Switch,
-  Input,
-  InteractiveTable,
-  Modal,
-  MultiSelect,
-  Select,
-  Spinner,
-  useTheme2,
-} from '@grafana/ui';
-
-import { PrometheusDatasource } from '../../datasource';
-import { getMetadataHelp, getMetadataType } from '../../language_provider';
-import { promQueryModeller } from '../PromQueryModeller';
-import { regexifyLabelValuesQueryString } from '../shared/parsingUtils';
-import { PromVisualQuery } from '../types';
-
-import { FeedbackLink } from './FeedbackLink';
-
-type Props = {
-  datasource: PrometheusDatasource;
-  isOpen: boolean;
-  query: PromVisualQuery;
-  onClose: () => void;
-  onChange: (query: PromVisualQuery) => void;
-};
-
-type MetricsData = MetricData[];
-
-type MetricData = {
-  value: string;
-  type?: string;
-  description?: string;
-};
-
-type PromFilterOption = {
-  value: string;
-  description: string;
-};
-
-const promTypes: PromFilterOption[] = [
-  {
-    value: 'counter',
-    description:
-      'A cumulative metric that represents a single monotonically increasing counter whose value can only increase or be reset to zero on restart.',
-  },
-  {
-    value: 'gauge',
-    description: 'A metric that represents a single numerical value that can arbitrarily go up and down.',
-  },
-  {
-    value: 'histogram',
-    description:
-      'A histogram samples observations (usually things like request durations or response sizes) and counts them in configurable buckets.',
-  },
-  {
-    value: 'summary',
-    description:
-      'A summary samples observations (usually things like request durations and response sizes) and can calculate configurable quantiles over a sliding time window.',
-  },
-];
-
-export const placeholders = {
-  browse: 'Search metrics by name',
-  metadataSearchSwitch: 'Search by metadata type and description in addition to name',
-  type: 'Select...',
-  variables: 'Select...',
-  excludeNoMetadata: 'Exclude results with no metadata',
-  setUseBackend: 'Use the backend to browse metrics',
-};
-
-export const DEFAULT_RESULTS_PER_PAGE = 10;
-
-const uf = new uFuzzy({
-  intraMode: 1,
-  intraIns: 1,
-  intraSub: 1,
-  intraTrn: 1,
-  intraDel: 1,
-});
-
-function fuzzySearch(haystack: string[], query: string, setter: React.Dispatch<React.SetStateAction<number[]>>) {
-  const idxs = uf.filter(haystack, query);
-  idxs && setter(idxs);
-}
-
-const debouncedFuzzySearch = debounceLodash(fuzzySearch, 300);
-
-export const MetricEncyclopediaModal = (props: Props) => {
-  const { datasource, isOpen, onClose, onChange, query } = props;
-
-  const [variables, setVariables] = useState<Array<SelectableValue<string>>>([]);
-
-  const [isLoading, setIsLoading] = useState<boolean>(true);
-
-  // metric list
-  const [metrics, setMetrics] = useState<MetricsData>([]);
-  const [hasMetadata, setHasMetadata] = useState<boolean>(true);
-  const [metaHaystack, setMetaHaystack] = useState<string[]>([]);
-  const [nameHaystack, setNameHaystack] = useState<string[]>([]);
-
-  // pagination
-  const [resultsPerPage, setResultsPerPage] = useState<number>(DEFAULT_RESULTS_PER_PAGE);
-  const [pageNum, setPageNum] = useState<number>(1);
-
-  // filters
-  const [fuzzySearchQuery, setFuzzySearchQuery] = useState<string>('');
-  const [fuzzyMetaSearchResults, setFuzzyMetaSearchResults] = useState<number[]>([]);
-  const [fuzzyNameSearchResults, setFuzzyNameSearchResults] = useState<number[]>([]);
-  const [fullMetaSearch, setFullMetaSearch] = useState<boolean>(false);
-  const [excludeNullMetadata, setExcludeNullMetadata] = useState<boolean>(false);
-  const [selectedTypes, setSelectedTypes] = useState<Array<SelectableValue<string>>>([]);
-  const [letterSearch, setLetterSearch] = useState<string | null>(null);
-
-  const [totalMetricCount, setTotalMetricCount] = useState<number>(0);
-  const [filteredMetricCount, setFilteredMetricCount] = useState<number>();
-  // backend search metric names by text
-  const [useBackend, setUseBackend] = useState<boolean>(false);
-  const [disableTextWrap, setDisableTextWrap] = useState<boolean>(false);
-
-  const updateMetricsMetadata = useCallback(async () => {
-    // *** Loading Gif
-    setIsLoading(true);
-
-    // Makes sure we loaded the metadata for metrics. Usually this is done in the start() method of the provider but we
-    // don't use it with the visual builder and there is no need to run all the start() setup anyway.
-    if (!datasource.languageProvider.metricsMetadata) {
-      await datasource.languageProvider.loadMetricsMetadata();
-    }
-
-    // Error handling for when metrics metadata returns as undefined
-    // *** Will have to handle metadata filtering if this happens
-    // *** only display metrics fuzzy search, filter and pagination
-    if (!datasource.languageProvider.metricsMetadata) {
-      setHasMetadata(false);
-      datasource.languageProvider.metricsMetadata = {};
-    }
-
-    // filter by adding the query.labels to the search?
-    // *** do this in the filter???
-    let metrics;
-    if (query.labels.length > 0) {
-      const expr = promQueryModeller.renderLabels(query.labels);
-      metrics = (await datasource.languageProvider.getSeries(expr, true))['__name__'] ?? [];
-    } else {
-      metrics = (await datasource.languageProvider.getLabelValues('__name__')) ?? [];
-    }
-
-    let haystackMetaData: string[] = [];
-    let haystackNameData: string[] = [];
-    let metricsData: MetricsData = metrics.map((m) => {
-      const type = getMetadataType(m, datasource.languageProvider.metricsMetadata!);
-      const description = getMetadataHelp(m, datasource.languageProvider.metricsMetadata!);
-
-      // string[] = name + type + description
-      haystackMetaData.push(`${m} ${type} ${description}`);
-      haystackNameData.push(m);
-      return {
-        value: m,
-        type: type,
-        description: description,
-      };
-    });
-
-    // setting this by the backend if useBackend is true
-    setMetrics(metricsData);
-    setMetaHaystack(haystackMetaData);
-    setNameHaystack(haystackNameData);
-
-    setVariables(
-      datasource.getVariables().map((v) => {
-        return {
-          value: v,
-          label: v,
-        };
-      })
-    );
-
-    setTotalMetricCount(metricsData.length);
-    setFilteredMetricCount(metricsData.length);
-    setIsLoading(false);
-  }, [query, datasource]);
-
-  useEffect(() => {
-    updateMetricsMetadata();
-  }, [updateMetricsMetadata]);
-
-  const theme = useTheme2();
-  const styles = getStyles(theme, disableTextWrap);
-
-  const typeOptions: SelectableValue[] = promTypes.map((t: PromFilterOption) => {
-    return {
-      value: t.value,
-      label: t.value,
-      description: t.description,
-    };
-  });
-
-  function calculatePageList(metrics: MetricsData, resultsPerPage: number) {
-    if (!metrics.length) {
-      return [];
-    }
-
-    const calcResultsPerPage: number = resultsPerPage === 0 ? 1 : resultsPerPage;
-
-    const pages = Math.floor(filterMetrics(metrics).length / calcResultsPerPage) + 1;
-
-    return [...Array(pages).keys()].map((i) => i + 1);
-  }
-
-  function sliceMetrics(metrics: MetricsData, pageNum: number, resultsPerPage: number) {
-    const calcResultsPerPage: number = resultsPerPage === 0 ? 1 : resultsPerPage;
-    const start: number = pageNum === 1 ? 0 : (pageNum - 1) * calcResultsPerPage;
-    const end: number = start + calcResultsPerPage;
-    return metrics.slice(start, end);
-  }
-
-  function hasMetaDataFilters() {
-    return selectedTypes.length > 0;
-  }
-
-  /**
-   * Filter
-   *
-   * @param metrics
-   * @param skipLetterSearch used to show the alphabet letters as clickable before filtering out letters (needs to be refactored)
-   * @returns
-   */
-  function filterMetrics(metrics: MetricsData, skipLetterSearch?: boolean): MetricsData {
-    let filteredMetrics: MetricsData = metrics;
-
-    if (fuzzySearchQuery) {
-      filteredMetrics = filteredMetrics.filter((m: MetricData, idx) => {
-        if (useBackend) {
-          // skip for backend!
-          return true;
-        } else if (fullMetaSearch) {
-          return fuzzyMetaSearchResults.includes(idx);
-        } else {
-          return fuzzyNameSearchResults.includes(idx);
-        }
-      });
-    }
-
-    if (letterSearch && !skipLetterSearch) {
-      filteredMetrics = filteredMetrics.filter((m: MetricData, idx) => {
-        const letters: string[] = [letterSearch, letterSearch.toLowerCase()];
-        return letters.includes(m.value[0]);
-      });
-    }
-
-    if (selectedTypes.length > 0 && !useBackend) {
-      filteredMetrics = filteredMetrics.filter((m: MetricData, idx) => {
-        // Matches type
-        const matchesSelectedType = selectedTypes.some((t) => t.value === m.type);
-
-        // missing type
-        const hasNoType = !m.type;
-
-        return matchesSelectedType || (hasNoType && !excludeNullMetadata);
-      });
-    }
-
-    if (excludeNullMetadata) {
-      filteredMetrics = filteredMetrics.filter((m: MetricData) => {
-        return m.type !== undefined && m.description !== undefined;
-      });
-    }
-
-    return filteredMetrics;
-  }
-
-  /**
-   * The filtered and paginated metrics displayed in the modal
-   * */
-  function displayedMetrics(metrics: MetricsData) {
-    const filteredSorted: MetricsData = filterMetrics(metrics).sort(alphabetically(true, hasMetaDataFilters()));
-
-    if (filteredMetricCount !== filteredSorted.length && filteredSorted.length !== 0) {
-      setFilteredMetricCount(filteredSorted.length);
-    }
-
-    const displayedMetrics: MetricsData = sliceMetrics(filteredSorted, pageNum, resultsPerPage);
-
-    return displayedMetrics;
-  }
-  /**
-   * The backend debounced search
-   */
-  const debouncedBackendSearch = useMemo(
-    () =>
-      debounce(async (metricText: string) => {
-        setIsLoading(true);
-        const queryString = regexifyLabelValuesQueryString(metricText);
-
-        const labelsParams = query.labels.map((label) => {
-          return `,${label.label}="${label.value}"`;
-        });
-
-        const params = `label_values({__name__=~".*${queryString}"${
-          query.labels ? labelsParams.join() : ''
-        }},__name__)`;
-
-        const results = datasource.metricFindQuery(params);
-
-        const metrics = await results.then((results) => {
-          return results.map((result) => {
-            return {
-              value: result.text,
-            };
-          });
-        });
-
-        setMetrics(metrics);
-        setFilteredMetricCount(metrics.length);
-        setIsLoading(false);
-      }, datasource.getDebounceTimeInMilliseconds()),
-    [datasource, query.labels]
-  );
-
-  function letterSearchComponent() {
-    const alphabetCheck: { [char: string]: number } = {
-      A: 0,
-      B: 0,
-      C: 0,
-      D: 0,
-      E: 0,
-      F: 0,
-      G: 0,
-      H: 0,
-      I: 0,
-      J: 0,
-      K: 0,
-      L: 0,
-      M: 0,
-      N: 0,
-      O: 0,
-      P: 0,
-      Q: 0,
-      R: 0,
-      S: 0,
-      T: 0,
-      U: 0,
-      V: 0,
-      W: 0,
-      X: 0,
-      Y: 0,
-      Z: 0,
-    };
-
-    filterMetrics(metrics, true).forEach((m: MetricData, idx) => {
-      const metricFirstLetter = m.value[0].toUpperCase();
-
-      if (alphabet.includes(metricFirstLetter) && !alphabetCheck[metricFirstLetter]) {
-        alphabetCheck[metricFirstLetter] += 1;
-      }
-    });
-
-    // return the alphabet components with the correct style and behavior
-    return Object.keys(alphabetCheck).map((letter: string) => {
-      // const active: boolean = .some((m: MetricData) => {
-      //   return m.value[0] === letter || m.value[0] === letter?.toLowerCase();
-      // });
-      const active: boolean = alphabetCheck[letter] > 0;
-      // starts with letter search
-      // filter by starts with letter
-      // if same letter searched null out remove letter search
-      function updateLetterSearch() {
-        if (letterSearch === letter) {
-          setLetterSearch(null);
-        } else {
-          setLetterSearch(letter);
-        }
-        setPageNum(1);
-      }
-      // selected letter to filter by
-      const selectedClass: string = letterSearch === letter ? styles.selAlpha : '';
-      // these letters are represented in the list of metrics
-      const activeClass: string = active ? styles.active : styles.gray;
-
-      return (
-        <span
-          onClick={active ? updateLetterSearch : () => {}}
-          className={`${selectedClass} ${activeClass}`}
-          key={letter}
-          data-testid={'letter-' + letter}
-        >
-          {letter + ' '}
-          {/* {idx !== coll.length - 1 ? '|': ''} */}
-        </span>
-      );
-    });
-  }
-
-  const MAXIMUM_RESULTS_PER_PAGE = 1000;
-  const calculateResultsPerPage = (results: number) => {
-    if (results < 1) {
-      return 1;
-    }
-
-    if (results > MAXIMUM_RESULTS_PER_PAGE) {
-      return MAXIMUM_RESULTS_PER_PAGE;
-    }
-
-    return results ?? 10;
-  };
-
-  const ButtonCell = ({
-    row: {
-      original: { value },
-    },
-  }: CellProps<MetricData, void>) => {
-    return (
-      <Button
-        size="sm"
-        variant={'secondary'}
-        fill={'solid'}
-        aria-label="use this metric button"
-        data-testid={testIds.useMetric}
-        onClick={() => {
-          onChange({ ...query, metric: value });
-          reportInteraction('grafana_prom_metric_encycopedia_tracking', {
-            metric: value,
-            hasVariables: variables.length > 0,
-            hasMetadata: hasMetadata,
-            totalMetricCount: metrics.length,
-            fuzzySearchQuery: fuzzySearchQuery,
-            fullMetaSearch: fullMetaSearch,
-            selectedTypes: selectedTypes,
-            letterSearch: letterSearch,
-          });
-          onClose();
-        }}
-      >
-        Use this metric
-      </Button>
-    );
-  };
-
-  function tableResults(metrics: MetricsData) {
-    const tableData: MetricsData = metrics;
-
-    const columns: Array<Column<MetricData>> = [
-      { id: '', header: 'Select', cell: ButtonCell },
-      { id: 'value', header: 'Name' },
-      { id: 'type', header: 'Type' },
-      { id: 'description', header: 'Description' },
-    ];
-
-    return <InteractiveTable className={styles.table} columns={columns} data={tableData} getRowId={(r) => r.value} />;
-  }
-
-  function fuzzySearchCallback(query: string, fullMetaSearchVal: boolean) {
-    if (useBackend && query === '') {
-      // get all metrics data if a user erases everything in the input
-      updateMetricsMetadata();
-    } else if (useBackend) {
-      debouncedBackendSearch(query);
-    } else {
-      // search either the names or all metadata
-      // fuzzy search go!
-
-      if (fullMetaSearchVal) {
-        debouncedFuzzySearch(metaHaystack, query, setFuzzyMetaSearchResults);
-      } else {
-        debouncedFuzzySearch(nameHaystack, query, setFuzzyNameSearchResults);
-      }
-    }
-  }
-
-  return (
-    <Modal
-      data-testid={testIds.metricModal}
-      isOpen={isOpen}
-      title="Browse metrics"
-      onDismiss={onClose}
-      aria-label="Metric Encyclopedia"
-      className={styles.modal}
-    >
-      <div className={styles.inputWrapper}>
-        <div className={cx(styles.inputItem, styles.inputItemFirst)}>
-          <EditorField label="Search metrics">
-            <Input
-              data-testid={testIds.searchMetric}
-              placeholder={placeholders.browse}
-              value={fuzzySearchQuery}
-              onInput={(e) => {
-                const value = e.currentTarget.value ?? '';
-                setFuzzySearchQuery(value);
-
-                fuzzySearchCallback(value, fullMetaSearch);
-
-                setPageNum(1);
-              }}
-            />
-          </EditorField>
-        </div>
-        <div className={styles.inputItem}>
-          <EditorField label="Filter by type">
-            <MultiSelect
-              data-testid={testIds.selectType}
-              inputId="my-select"
-              options={typeOptions}
-              value={selectedTypes}
-              disabled={!hasMetadata || useBackend}
-              placeholder={placeholders.type}
-              onChange={(v) => {
-                // *** Filter by type
-                // *** always include metrics without metadata but label it as unknown type
-                // Consider tabs select instead of actual select or multi select
-                setSelectedTypes(v);
-                setPageNum(1);
-              }}
-            />
-          </EditorField>
-        </div>
-        <div className={styles.inputItem}>
-          <EditorField label="Select template variables">
-            <Select
-              inputId="my-select"
-              options={variables}
-              value={''}
-              placeholder={placeholders.variables}
-              onChange={(v) => {
-                const value: string = v.value ?? '';
-                onChange({ ...query, metric: value });
-                onClose();
-              }}
-            />
-          </EditorField>
-        </div>
-      </div>
-
-      <div className={styles.selectWrapper}>
-        <EditorField label="Search Settings">
-          <>
-            <div className={styles.selectItem}>
-              <Switch
-                data-testid={testIds.searchWithMetadata}
-                value={fullMetaSearch}
-                disabled={useBackend || !hasMetadata}
-                onChange={() => {
-                  const newVal = !fullMetaSearch;
-                  setFullMetaSearch(newVal);
-
-                  fuzzySearchCallback(fuzzySearchQuery, newVal);
-
-                  setPageNum(1);
-                }}
-              />
-              <p className={styles.selectItemLabel}>{placeholders.metadataSearchSwitch}</p>
-            </div>
-            <div className={styles.selectItem}>
-              <Switch
-                data-testid={testIds.setUseBackend}
-                value={useBackend}
-                onChange={() => {
-                  const newVal = !useBackend;
-                  setUseBackend(newVal);
-                  if (newVal === false) {
-                    // rebuild the metrics metadata if we turn off useBackend
-                    updateMetricsMetadata();
-                  } else {
-                    // check if there is text in the browse search and update
-                    if (fuzzySearchQuery !== '') {
-                      debouncedBackendSearch(fuzzySearchQuery);
-                    }
-                    // otherwise wait for user typing
-                  }
-
-                  setPageNum(1);
-                }}
-              />
-              <p className={styles.selectItemLabel}>{placeholders.setUseBackend}</p>
-            </div>
-          </>
-        </EditorField>
-      </div>
-      <h4 className={styles.resultsHeading}>Results</h4>
-      <div className={styles.resultsData}>
-        <div className={styles.resultsDataCount}>
-          Showing {filteredMetricCount} of {totalMetricCount} total metrics.{' '}
-          {isLoading && <Spinner className={styles.loadingSpinner} />}
-        </div>
-        {query.labels.length > 0 && (
-          <p className={styles.resultsDataFiltered}>
-            These metrics have been pre-filtered by labels chosen in the label filters.
-          </p>
-        )}
-      </div>
-
-      <div className={styles.alphabetRow}>
-        <div>{letterSearchComponent()}</div>
-        <div className={styles.alphabetRowToggles}>
-          <div className={styles.selectItem}>
-            <Switch value={disableTextWrap} onChange={() => setDisableTextWrap((p) => !p)} />
-            <p className={styles.selectItemLabel}>Disable text wrap</p>
-          </div>
-          <div className={styles.selectItem}>
-            <Switch
-              value={excludeNullMetadata}
-              disabled={useBackend || !hasMetadata}
-              onChange={() => {
-                setExcludeNullMetadata(!excludeNullMetadata);
-                setPageNum(1);
-              }}
-            />
-            <p className={styles.selectItemLabel}>{placeholders.excludeNoMetadata}</p>
-          </div>
-        </div>
-      </div>
-
-      <div className={styles.results}>{metrics && tableResults(displayedMetrics(metrics))}</div>
-
-      <div className={styles.pageSettingsWrapper}>
-        <div className={styles.pageSettings}>
-          <InlineField label="Select page" labelWidth={20} className="query-keyword">
-            <Select
-              data-testid={testIds.searchPage}
-              options={calculatePageList(metrics, resultsPerPage).map((p) => {
-                return { value: p, label: '' + p };
-              })}
-              value={pageNum ?? 1}
-              placeholder="select page"
-              width={20}
-              onChange={(e) => {
-                const value = e.value ?? 1;
-                setPageNum(value);
-              }}
-            />
-          </InlineField>
-
-          <InlineField
-            label="# results per page"
-            tooltip={'The maximum results per page is ' + MAXIMUM_RESULTS_PER_PAGE}
-            labelWidth={20}
-          >
-            <Input
-              data-testid={testIds.resultsPerPage}
-              value={calculateResultsPerPage(resultsPerPage)}
-              placeholder="results per page"
-              width={20}
-              onInput={(e) => {
-                const value = +e.currentTarget.value;
-
-                if (isNaN(value)) {
-                  return;
-                }
-
-                setResultsPerPage(value);
-              }}
-            />
-          </InlineField>
-        </div>
-
-        <FeedbackLink feedbackUrl="https://forms.gle/DEMAJHoAMpe3e54CA" />
-      </div>
-    </Modal>
-  );
-};
-
-function alphabetically(ascending: boolean, metadataFilters: boolean) {
-  return function (a: MetricData, b: MetricData) {
-    // equal items sort equally
-    if (a.value === b.value) {
-      return 0;
-    }
-
-    // *** NO METADATA? SORT LAST
-    // undefined metadata sort after anything else
-    // if filters are on
-    if (metadataFilters) {
-      if (a.type === undefined) {
-        return 1;
-      }
-      if (b.type === undefined) {
-        return -1;
-      }
-    }
-
-    // otherwise, if we're ascending, lowest sorts first
-    if (ascending) {
-      return a.value < b.value ? -1 : 1;
-    }
-
-    // if descending, highest sorts first
-    return a.value < b.value ? 1 : -1;
-  };
-}
-
-const getStyles = (theme: GrafanaTheme2, disableTextWrap: boolean) => {
-  return {
-    modal: css`
-      width: 85vw;
-      ${theme.breakpoints.down('md')} {
-        width: 100%;
-      }
-    `,
-    inputWrapper: css`
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      gap: ${theme.spacing(2)};
-      margin-bottom: ${theme.spacing(2)};
-    `,
-    inputItemFirst: css`
-      flex-basis: 40%;
-    `,
-    inputItem: css`
-      flex-grow: 1;
-      flex-basis: 20%;
-      ${theme.breakpoints.down('md')} {
-        min-width: 100%;
-      }
-    `,
-    selectWrapper: css`
-      margin-bottom: ${theme.spacing(2)};
-    `,
-    selectItem: css`
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-    `,
-    selectItemLabel: css`
-      margin: 0 0 0 ${theme.spacing(1)};
-      align-self: center;
-      color: ${theme.colors.text.secondary};
-    `,
-    resultsHeading: css`
-      margin: 0 0 0 0;
-    `,
-    resultsData: css`
-      margin: 0 0 ${theme.spacing(1)} 0;
-    `,
-    resultsDataCount: css`
-      margin: 0;
-    `,
-    resultsDataFiltered: css`
-      margin: 0;
-      color: ${theme.colors.warning.main};
-    `,
-    alphabetRow: css`
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: space-between;
-      align-items: center;
-      column-gap: ${theme.spacing(1)};
-      margin-bottom: ${theme.spacing(1)};
-    `,
-    alphabetRowToggles: css`
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      flex-wrap: wrap;
-      column-gap: ${theme.spacing(1)};
-    `,
-    results: css`
-      height: 300px;
-      overflow-y: scroll;
-    `,
-    pageSettingsWrapper: css`
-      padding-top: ${theme.spacing(1.5)};
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: space-between;
-      align-items: center;
-    `,
-    pageSettings: css`
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      align-items: center;
-    `,
-    selAlpha: css`
-      cursor: pointer;
-      color: #6e9fff;
-    `,
-    active: css`
-      cursor: pointer;
-    `,
-    gray: css`
-      color: grey;
-    `,
-    loadingSpinner: css`
-      display: inline-block;
-    `,
-    table: css`
-      white-space: ${disableTextWrap ? 'nowrap' : 'normal'};
-      td {
-        vertical-align: baseline;
-      }
-    `,
-  };
-};
-
-export const testIds = {
-  metricModal: 'metric-modal',
-  searchMetric: 'search-metric',
-  searchWithMetadata: 'search-with-metadata',
-  selectType: 'select-type',
-  metricCard: 'metric-card',
-  useMetric: 'use-metric',
-  searchPage: 'search-page',
-  resultsPerPage: 'results-per-page',
-  setUseBackend: 'set-use-backend',
-};
-
-const alphabet = [
-  'A',
-  'B',
-  'C',
-  'D',
-  'E',
-  'F',
-  'G',
-  'H',
-  'I',
-  'J',
-  'K',
-  'L',
-  'M',
-  'N',
-  'O',
-  'P',
-  'Q',
-  'R',
-  'S',
-  'T',
-  'U',
-  'V',
-  'W',
-  'X',
-  'Y',
-  'Z',
-];
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
index 74c48ef49cc..02611841f5d 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
@@ -5,13 +5,17 @@ import Highlighter from 'react-highlight-words';
 
 import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
 import { EditorField, EditorFieldGroup } from '@grafana/experimental';
-import { AsyncSelect, FormatOptionLabelMeta, useStyles2 } from '@grafana/ui';
+import { config } from '@grafana/runtime';
+import { AsyncSelect, Button, FormatOptionLabelMeta, useStyles2 } from '@grafana/ui';
+import { SelectMenuOptions } from '@grafana/ui/src/components/Select/SelectMenu';
 
 import { PrometheusDatasource } from '../../datasource';
 import { regexifyLabelValuesQueryString } from '../shared/parsingUtils';
 import { QueryBuilderLabelFilter } from '../shared/types';
 import { PromVisualQuery } from '../types';
 
+import { MetricsModal } from './metrics-modal/MetricsModal';
+
 // We are matching words split with space
 const splitSeparator = ' ';
 
@@ -26,6 +30,8 @@ export interface Props {
 
 export const PROMETHEUS_QUERY_BUILDER_MAX_RESULTS = 1000;
 
+const prometheusMetricEncyclopedia = config.featureToggles.prometheusMetricEncyclopedia;
+
 export function MetricSelect({
   datasource,
   query,
@@ -38,6 +44,8 @@ export function MetricSelect({
   const [state, setState] = useState<{
     metrics?: Array<SelectableValue<any>>;
     isLoading?: boolean;
+    metricsModalOpen?: boolean;
+    initialMetrics?: string[];
   }>({});
 
   const customFilterOption = useCallback((option: SelectableValue<any>, searchQuery: string) => {
@@ -129,40 +137,118 @@ export function MetricSelect({
     (query: string) => getMetricLabels(query),
     datasource.getDebounceTimeInMilliseconds()
   );
+  // No type found for the common select props so typing as any
+  // https://github.com/grafana/grafana/blob/main/packages/grafana-ui/src/components/Select/SelectBase.tsx/#L212-L263
+  // eslint-disable-next-line
+  const CustomOption = (props: any) => {
+    const option = props.data;
+
+    if (option.value === 'BrowseMetrics') {
+      const isFocused = props.isFocused ? styles.focus : '';
+
+      return (
+        <div
+          {...props.innerProps}
+          onKeyDown={(e) => {
+            // if there is no metric and the m.e. is enabled, open the modal
+            if (e.code === 'Enter') {
+              setState({ ...state, metricsModalOpen: true });
+            }
+          }}
+        >
+          {
+            <div className={`${styles.customOption} ${isFocused}`}>
+              <div>
+                <div>{option.label}</div>
+                <div className={styles.customOptionDesc}>{option.description}</div>
+              </div>
+              <Button
+                variant="primary"
+                fill="outline"
+                size="sm"
+                onClick={() => setState({ ...state, metricsModalOpen: true })}
+                icon="book"
+              >
+                Open
+              </Button>
+            </div>
+          }
+        </div>
+      );
+    }
+
+    return SelectMenuOptions(props);
+  };
 
   return (
-    <EditorFieldGroup>
-      <EditorField label="Metric">
-        <AsyncSelect
-          inputId="prometheus-metric-select"
-          className={styles.select}
-          value={query.metric ? toOption(query.metric) : undefined}
-          placeholder={'Select metric'}
-          allowCustomValue
-          formatOptionLabel={formatOptionLabel}
-          filterOption={customFilterOption}
-          onOpenMenu={async () => {
-            if (metricLookupDisabled) {
-              return;
-            }
-            setState({ isLoading: true });
-            const metrics = await onGetMetrics();
-            if (metrics.length > PROMETHEUS_QUERY_BUILDER_MAX_RESULTS) {
-              metrics.splice(0, metrics.length - PROMETHEUS_QUERY_BUILDER_MAX_RESULTS);
-            }
-            setState({ metrics, isLoading: undefined });
-          }}
-          loadOptions={metricLookupDisabled ? metricLookupDisabledSearch : debouncedSearch}
-          isLoading={state.isLoading}
-          defaultOptions={state.metrics}
-          onChange={({ value }) => {
-            if (value) {
-              onChange({ ...query, metric: value });
-            }
-          }}
+    <>
+      {prometheusMetricEncyclopedia && !datasource.lookupsDisabled && state.metricsModalOpen && (
+        <MetricsModal
+          datasource={datasource}
+          isOpen={state.metricsModalOpen}
+          onClose={() => setState({ ...state, metricsModalOpen: false })}
+          query={query}
+          onChange={onChange}
+          initialMetrics={state.initialMetrics ?? []}
         />
-      </EditorField>
-    </EditorFieldGroup>
+      )}
+      <EditorFieldGroup>
+        <EditorField label="Metric">
+          <AsyncSelect
+            inputId="prometheus-metric-select"
+            className={styles.select}
+            value={query.metric ? toOption(query.metric) : undefined}
+            placeholder={'Select metric'}
+            allowCustomValue
+            formatOptionLabel={formatOptionLabel}
+            filterOption={customFilterOption}
+            onOpenMenu={async () => {
+              if (metricLookupDisabled) {
+                return;
+              }
+              setState({ isLoading: true });
+              const metrics = await onGetMetrics();
+              const initialMetrics: string[] = metrics.map((m) => m.value);
+              if (metrics.length > PROMETHEUS_QUERY_BUILDER_MAX_RESULTS) {
+                metrics.splice(0, metrics.length - PROMETHEUS_QUERY_BUILDER_MAX_RESULTS);
+              }
+
+              if (config.featureToggles.prometheusMetricEncyclopedia) {
+                // pass the initial metrics, possibly filtered by labels into the Metrics Modal
+                const metricsModalOption: SelectableValue[] = [
+                  {
+                    value: 'BrowseMetrics',
+                    label: 'Browse metrics',
+                    description: 'Browse and filter metrics and metadata with a fuzzy search',
+                  },
+                ];
+                setState({
+                  metrics: [...metricsModalOption, ...metrics],
+                  isLoading: undefined,
+                  initialMetrics: initialMetrics,
+                });
+              } else {
+                setState({ metrics, isLoading: undefined });
+              }
+            }}
+            loadOptions={metricLookupDisabled ? metricLookupDisabledSearch : debouncedSearch}
+            isLoading={state.isLoading}
+            defaultOptions={state.metrics}
+            onChange={({ value }) => {
+              if (value) {
+                // if there is no metric and the m.e. is enabled, open the modal
+                if (prometheusMetricEncyclopedia && value === 'BrowseMetrics') {
+                  setState({ ...state, metricsModalOpen: true });
+                } else {
+                  onChange({ ...query, metric: value });
+                }
+              }
+            }}
+            components={{ Option: CustomOption }}
+          />
+        </EditorField>
+      </EditorFieldGroup>
+    </>
   );
 }
 
@@ -177,4 +263,24 @@ const getStyles = (theme: GrafanaTheme2) => ({
     color: ${theme.colors.warning.contrastText};
     background-color: ${theme.colors.warning.main};
   `,
+  customOption: css`
+    padding: 8px;
+    display: flex;
+    justify-content: space-between;
+    cursor: pointer;
+    :hover {
+      background-color: ${theme.colors.emphasize(theme.colors.background.primary, 0.03)};
+    }
+  `,
+  customOptionlabel: css`
+    color: ${theme.colors.text.primary};
+  `,
+  customOptionDesc: css`
+    color: ${theme.colors.text.secondary};
+    font-size: ${theme.typography.size.xs};
+    opacity: 50%;
+  `,
+  focus: css`
+    background-color: ${theme.colors.emphasize(theme.colors.background.primary, 0.03)};
+  `,
 });
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
index d56c50722da..84fd29920f4 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
@@ -1,10 +1,7 @@
-import { css } from '@emotion/css';
 import React, { useCallback, useState } from 'react';
 
-import { DataSourceApi, GrafanaTheme2, PanelData, SelectableValue } from '@grafana/data';
+import { DataSourceApi, PanelData, SelectableValue } from '@grafana/data';
 import { EditorRow } from '@grafana/experimental';
-import { config } from '@grafana/runtime';
-import { Button, Tag, useStyles2 } from '@grafana/ui';
 
 import { PrometheusDatasource } from '../../datasource';
 import { getMetadataString } from '../../language_provider';
@@ -22,7 +19,6 @@ import { QueryBuilderLabelFilter, QueryBuilderOperation } from '../shared/types'
 import { PromVisualQuery } from '../types';
 
 import { LabelFilters } from './LabelFilters';
-import { MetricEncyclopediaModal } from './MetricEncyclopediaModal';
 import { MetricSelect, PROMETHEUS_QUERY_BUILDER_MAX_RESULTS } from './MetricSelect';
 import { NestedQueryList } from './NestedQueryList';
 import { EXPLAIN_LABEL_FILTER_CONTENT } from './PromQueryBuilderExplained';
@@ -39,12 +35,10 @@ export interface Props {
 export const PromQueryBuilder = React.memo<Props>((props) => {
   const { datasource, query, onChange, onRunQuery, data, showExplain } = props;
   const [highlightedOp, setHighlightedOp] = useState<QueryBuilderOperation | undefined>();
-  const [metricEncyclopediaModalOpen, setMetricEncyclopediaModalOpen] = useState(false);
   const onChangeLabels = (labels: QueryBuilderLabelFilter[]) => {
     onChange({ ...query, labels });
   };
 
-  const styles = useStyles2(getStyles);
   /**
    * Map metric metadata to SelectableValue for Select component and also adds defined template variables to the list.
    */
@@ -208,55 +202,20 @@ export const PromQueryBuilder = React.memo<Props>((props) => {
   }, [datasource, query, withTemplateVariableOptions]);
 
   const lang = { grammar: promqlGrammar, name: 'promql' };
-  const isMetricEncyclopediaEnabled = config.featureToggles.prometheusMetricEncyclopedia;
 
   const initHints = datasource.getInitHints();
 
   return (
     <>
       <EditorRow>
-        {isMetricEncyclopediaEnabled && !datasource.lookupsDisabled ? (
-          <>
-            <Button
-              className={styles.button}
-              variant="secondary"
-              size="sm"
-              onClick={() => setMetricEncyclopediaModalOpen((prevValue) => !prevValue)}
-            >
-              Metric encyclopedia
-            </Button>
-            {query.metric && (
-              <Tag
-                name={' ' + query.metric}
-                color="#3D71D9"
-                icon="times"
-                onClick={() => {
-                  onChange({ ...query, metric: '' });
-                }}
-                title="Click to remove metric"
-                className={styles.metricTag}
-              />
-            )}
-            {metricEncyclopediaModalOpen && (
-              <MetricEncyclopediaModal
-                datasource={datasource}
-                isOpen={metricEncyclopediaModalOpen}
-                onClose={() => setMetricEncyclopediaModalOpen(false)}
-                query={query}
-                onChange={onChange}
-              />
-            )}
-          </>
-        ) : (
-          <MetricSelect
-            query={query}
-            onChange={onChange}
-            onGetMetrics={onGetMetrics}
-            datasource={datasource}
-            labelsFilters={query.labels}
-            metricLookupDisabled={datasource.lookupsDisabled}
-          />
-        )}
+        <MetricSelect
+          query={query}
+          onChange={onChange}
+          onGetMetrics={onGetMetrics}
+          datasource={datasource}
+          labelsFilters={query.labels}
+          metricLookupDisabled={datasource.lookupsDisabled}
+        />
         <LabelFilters
           debounceDuration={datasource.getDebounceTimeInMilliseconds()}
           getLabelValuesAutofillSuggestions={getLabelValuesAutocompleteSuggestions}
@@ -365,15 +324,3 @@ async function getMetrics(
 }
 
 PromQueryBuilder.displayName = 'PromQueryBuilder';
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    button: css`
-      height: auto;
-    `,
-    metricTag: css`
-      margin: '10px 0 10px 0',
-      backgroundColor: '#3D71D9',
-    `,
-  };
-};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx
index 05d84bc6fc4..2e587f2f020 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx
@@ -2,6 +2,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import React, { useEffect, useReducer } from 'react';
 
 import { PanelData } from '@grafana/data';
+import { config } from '@grafana/runtime';
 
 import { PrometheusDatasource } from '../../datasource';
 import { PromQuery } from '../../types';
@@ -11,6 +12,7 @@ import { PromVisualQuery } from '../types';
 
 import { PromQueryBuilder } from './PromQueryBuilder';
 import { QueryPreview } from './QueryPreview';
+import { getSettings, MetricsModalSettings } from './metrics-modal/state/state';
 
 export interface Props {
   query: PromQuery;
@@ -26,22 +28,39 @@ export interface State {
   expr: string;
 }
 
+const prometheusMetricEncyclopedia = config.featureToggles.prometheusMetricEncyclopedia;
 /**
  * This component is here just to contain the translation logic between string query and the visual query builder model.
  */
 export function PromQueryBuilderContainer(props: Props) {
   const { query, onChange, onRunQuery, datasource, data, showExplain } = props;
   const [state, dispatch] = useReducer(stateSlice.reducer, { expr: query.expr });
-
   // Only rebuild visual query if expr changes from outside
   useEffect(() => {
     dispatch(exprChanged(query.expr));
-  }, [query.expr]);
+
+    if (prometheusMetricEncyclopedia) {
+      dispatch(
+        setMetricsModalSettings({
+          useBackend: query.useBackend ?? false,
+          disableTextWrap: query.disableTextWrap ?? false,
+          fullMetaSearch: query.fullMetaSearch ?? false,
+          excludeNullMetadata: query.excludeNullMetadata ?? false,
+        })
+      );
+    }
+  }, [query]);
 
   const onVisQueryChange = (visQuery: PromVisualQuery) => {
     const expr = promQueryModeller.renderQuery(visQuery);
     dispatch(visualQueryChange({ visQuery, expr }));
-    onChange({ ...props.query, expr: expr });
+
+    if (prometheusMetricEncyclopedia) {
+      const metricsModalSettings = getSettings(visQuery);
+      onChange({ ...props.query, expr: expr, ...metricsModalSettings });
+    } else {
+      onChange({ ...props.query, expr: expr });
+    }
   };
 
   if (!state.visQuery) {
@@ -75,10 +94,19 @@ const stateSlice = createSlice({
       if (!state.visQuery || state.expr !== action.payload) {
         state.expr = action.payload;
         const parseResult = buildVisualQueryFromString(action.payload);
+
         state.visQuery = parseResult.query;
       }
     },
+    setMetricsModalSettings: (state, action: PayloadAction<MetricsModalSettings>) => {
+      if (state.visQuery && prometheusMetricEncyclopedia) {
+        state.visQuery.useBackend = action.payload.useBackend;
+        state.visQuery.disableTextWrap = action.payload.disableTextWrap;
+        state.visQuery.fullMetaSearch = action.payload.fullMetaSearch;
+        state.visQuery.excludeNullMetadata = action.payload.excludeNullMetadata;
+      }
+    },
   },
 });
 
-const { visualQueryChange, exprChanged } = stateSlice.actions;
+const { visualQueryChange, exprChanged, setMetricsModalSettings } = stateSlice.actions;
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/FeedbackLink.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/FeedbackLink.tsx
similarity index 90%
rename from public/app/plugins/datasource/prometheus/querybuilder/components/FeedbackLink.tsx
rename to public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/FeedbackLink.tsx
index ae3916a0f51..012538895b2 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/FeedbackLink.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/FeedbackLink.tsx
@@ -17,7 +17,7 @@ export function FeedbackLink({ feedbackUrl }: Props) {
       <a
         href={feedbackUrl}
         className={styles.link}
-        title="The Metric Encyclopedia is new, please let us know how we can improve it"
+        title="The Metrics Modal is new, please let us know how we can improve it"
         target="_blank"
         rel="noreferrer noopener"
       >
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/LetterSearch.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/LetterSearch.tsx
new file mode 100644
index 00000000000..cda6c972055
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/LetterSearch.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+
+import { useTheme2 } from '@grafana/ui';
+
+import { getStyles } from './styles';
+import { MetricData, MetricsData } from './types';
+
+export type LetterSearchProps = {
+  filteredMetrics: MetricsData;
+  disableTextWrap: boolean;
+  updateLetterSearch: (letter: string) => void;
+  letterSearch: string | null;
+};
+
+export function LetterSearch(props: LetterSearchProps) {
+  const { filteredMetrics, disableTextWrap, updateLetterSearch, letterSearch } = props;
+
+  const alphabetDictionary = alphabetCheck();
+
+  const theme = useTheme2();
+  const styles = getStyles(theme, disableTextWrap);
+
+  filteredMetrics.forEach((m: MetricData, idx: number) => {
+    const metricFirstLetter = m.value[0].toUpperCase();
+
+    if (alphabet.includes(metricFirstLetter) && !alphabetDictionary[metricFirstLetter]) {
+      alphabetDictionary[metricFirstLetter] += 1;
+    }
+  });
+
+  // return the alphabet components with the correct style and behavior
+  return (
+    <div>
+      {Object.keys(alphabetDictionary).map((letter: string) => {
+        const active: boolean = alphabetDictionary[letter] > 0;
+        // starts with letter search
+        // filter by starts with letter
+        // if same letter searched null out remove letter search
+        function setLetterSearch() {
+          updateLetterSearch(letter);
+        }
+        // selected letter to filter by
+        const selectedClass: string = letterSearch === letter ? styles.selAlpha : '';
+        // these letters are represented in the list of metrics
+        const activeClass: string = active ? styles.active : styles.gray;
+
+        return (
+          <span
+            onClick={active ? setLetterSearch : () => {}}
+            className={`${selectedClass} ${activeClass}`}
+            key={letter}
+            data-testid={'letter-' + letter}
+          >
+            {letter + ' '}
+            {/* {idx !== coll.length - 1 ? '|': ''} */}
+          </span>
+        );
+      })}
+    </div>
+  );
+}
+
+export const alphabet = [...'ABCDEFGHIJKLMNOPQRSTUVWXYZ'];
+
+function alphabetCheck(): { [char: string]: number } {
+  const check: { [char: string]: number } = {};
+
+  alphabet.forEach((char) => (check[char] = 0));
+
+  return check;
+}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricEncyclopediaModal.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.test.tsx
similarity index 83%
rename from public/app/plugins/datasource/prometheus/querybuilder/components/MetricEncyclopediaModal.test.tsx
rename to public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.test.tsx
index b01d2b8f38c..e5e6ddbc677 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricEncyclopediaModal.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.test.tsx
@@ -4,13 +4,13 @@ import React from 'react';
 
 import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@grafana/data';
 
-import { PrometheusDatasource } from '../../datasource';
-import PromQlLanguageProvider from '../../language_provider';
-import { EmptyLanguageProviderMock } from '../../language_provider.mock';
-import { PromOptions } from '../../types';
-import { PromVisualQuery } from '../types';
+import { PrometheusDatasource } from '../../../datasource';
+import PromQlLanguageProvider from '../../../language_provider';
+import { EmptyLanguageProviderMock } from '../../../language_provider.mock';
+import { PromOptions } from '../../../types';
+import { PromVisualQuery } from '../../types';
 
-import { MetricEncyclopediaModal, testIds } from './MetricEncyclopediaModal';
+import { MetricsModal, testIds } from './MetricsModal';
 
 // don't care about interaction tracking in our unit tests
 jest.mock('@grafana/runtime', () => ({
@@ -18,7 +18,7 @@ jest.mock('@grafana/runtime', () => ({
   reportInteraction: jest.fn(),
 }));
 
-describe('MetricEncyclopediaModal', () => {
+describe('MetricsModal', () => {
   it('renders the modal', async () => {
     setup(defaultQuery, listOfMetrics);
     await waitFor(() => {
@@ -46,7 +46,7 @@ describe('MetricEncyclopediaModal', () => {
       operations: [],
     };
 
-    setup(query, listOfMetrics);
+    setup(query, ['with-labels'], true);
     await waitFor(() => {
       expect(screen.getByText('with-labels')).toBeInTheDocument();
     });
@@ -102,18 +102,9 @@ describe('MetricEncyclopediaModal', () => {
     expect(metricStartingWithSomethingElse).toBeNull();
   });
 
-  it('allows a user to select a template variable', async () => {
-    setup(defaultQuery, listOfMetrics);
-
-    await waitFor(() => {
-      const selectType = screen.getByText('Select template variables');
-      expect(selectType).toBeInTheDocument();
-    });
-  });
-
   // Pagination
   it('shows metrics within a range by pagination', async () => {
-    // default resultsPerPage is 10
+    // default resultsPerPage is 100
     setup(defaultQuery, listOfMetrics);
     await waitFor(() => {
       expect(screen.getByText('all-metrics')).toBeInTheDocument();
@@ -146,9 +137,9 @@ describe('MetricEncyclopediaModal', () => {
     expect(metricInsideRange).toBeInTheDocument();
   });
 
-  it('paginates millions of metrics and does not run out of memory', async () => {
-    const millionsOfMetrics: string[] = [...Array(1000000).keys()].map((i) => '' + i);
-    setup(defaultQuery, millionsOfMetrics);
+  it('paginates lots of metrics and does not run out of memory', async () => {
+    const lotsOfMetrics: string[] = [...Array(100000).keys()].map((i) => '' + i);
+    setup(defaultQuery, lotsOfMetrics);
     await waitFor(() => {
       // doesn't break on loading
       expect(screen.getByText('0')).toBeInTheDocument();
@@ -156,7 +147,7 @@ describe('MetricEncyclopediaModal', () => {
     const resultsPerPageInput = screen.getByTestId(testIds.resultsPerPage);
     // doesn't break on changing results per page
     await userEvent.type(resultsPerPageInput, '11');
-    const metricInsideRange = screen.getByText('10');
+    const metricInsideRange = screen.getByText('9');
     expect(metricInsideRange).toBeInTheDocument();
   });
 
@@ -174,11 +165,9 @@ describe('MetricEncyclopediaModal', () => {
     });
     const searchMetric = screen.getByTestId(testIds.searchMetric);
     expect(searchMetric).toBeInTheDocument();
-    await userEvent.type(searchMetric, 'a_b');
+    await userEvent.type(searchMetric, 'a_buck');
 
     await waitFor(() => {
-      metricABucket = screen.getByText('a_bucket');
-      expect(metricABucket).toBeInTheDocument();
       metricAll = screen.queryByText('all-metrics');
       expect(metricAll).toBeNull();
     });
@@ -194,6 +183,10 @@ describe('MetricEncyclopediaModal', () => {
       expect(metricABucket).toBeInTheDocument();
     });
 
+    const showSettingsButton = screen.getByTestId(testIds.showAdditionalSettings);
+    expect(showSettingsButton).toBeInTheDocument();
+    await userEvent.click(showSettingsButton);
+
     const metadataSwitch = screen.getByTestId(testIds.searchWithMetadata);
     expect(metadataSwitch).toBeInTheDocument();
     await userEvent.click(metadataSwitch);
@@ -217,12 +210,11 @@ const defaultQuery: PromVisualQuery = {
 
 const listOfMetrics: string[] = ['all-metrics', 'a_bucket', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'];
 
-function createDatasource(metrics: string[], withLabels?: boolean) {
+function createDatasource(withLabels?: boolean) {
   const languageProvider = new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider;
 
   // display different results if their are labels selected in the PromVisualQuery
   if (withLabels) {
-    languageProvider.getSeries = () => Promise.resolve({ __name__: ['with-labels'] });
     languageProvider.metricsMetadata = {
       'with-labels': {
         type: 'with-labels-type',
@@ -231,7 +223,6 @@ function createDatasource(metrics: string[], withLabels?: boolean) {
     };
   } else {
     // all metrics
-    languageProvider.getLabelValues = () => Promise.resolve(metrics);
     languageProvider.metricsMetadata = {
       'all-metrics': {
         type: 'all-metrics-type',
@@ -262,23 +253,24 @@ function createDatasource(metrics: string[], withLabels?: boolean) {
   return datasource;
 }
 
-function createProps(query: PromVisualQuery, datasource: PrometheusDatasource) {
+function createProps(query: PromVisualQuery, datasource: PrometheusDatasource, metrics: string[]) {
   return {
     datasource,
     isOpen: true,
     onChange: jest.fn(),
     onClose: jest.fn(),
     query: query,
+    initialMetrics: metrics,
   };
 }
 
 function setup(query: PromVisualQuery, metrics: string[], withlabels?: boolean) {
   const withLabels: boolean = query.labels.length > 0;
-  const datasource = createDatasource(metrics, withLabels);
-  const props = createProps(query, datasource);
+  const datasource = createDatasource(withLabels);
+  const props = createProps(query, datasource, metrics);
 
   // render the modal only
-  const { container } = render(<MetricEncyclopediaModal {...props} />);
+  const { container } = render(<MetricsModal {...props} />);
 
   return container;
 }
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.tsx
new file mode 100644
index 00000000000..4b5b857ecec
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.tsx
@@ -0,0 +1,402 @@
+import { cx } from '@emotion/css';
+import debounce from 'debounce-promise';
+import React, { useCallback, useEffect, useMemo, useReducer } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorField } from '@grafana/experimental';
+import { reportInteraction } from '@grafana/runtime';
+import { InlineField, Switch, Input, Modal, MultiSelect, Spinner, useTheme2, Pagination, Button } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../../../datasource';
+import { PromVisualQuery } from '../../types';
+
+import { FeedbackLink } from './FeedbackLink';
+import { LetterSearch } from './LetterSearch';
+import { ResultsTable } from './ResultsTable';
+import {
+  calculatePageList,
+  calculateResultsPerPage,
+  displayedMetrics,
+  filterMetrics,
+  getBackendSearchMetrics,
+  setMetrics,
+  placeholders,
+  promTypes,
+} from './state/helpers';
+import {
+  DEFAULT_RESULTS_PER_PAGE,
+  initialState,
+  MAXIMUM_RESULTS_PER_PAGE,
+  // MetricsModalReducer,
+  MetricsModalMetadata,
+  stateSlice,
+} from './state/state';
+import { getStyles } from './styles';
+import { PromFilterOption } from './types';
+import { debouncedFuzzySearch } from './uFuzzy';
+
+export type MetricsModalProps = {
+  datasource: PrometheusDatasource;
+  isOpen: boolean;
+  query: PromVisualQuery;
+  onClose: () => void;
+  onChange: (query: PromVisualQuery) => void;
+  initialMetrics: string[];
+};
+
+// actions
+const {
+  setIsLoading,
+  buildMetrics,
+  filterMetricsBackend,
+  setResultsPerPage,
+  setPageNum,
+  setFuzzySearchQuery,
+  setNameHaystack,
+  setMetaHaystack,
+  setFullMetaSearch,
+  setExcludeNullMetadata,
+  setSelectedTypes,
+  setLetterSearch,
+  setUseBackend,
+  setSelectedIdx,
+  setDisableTextWrap,
+  showAdditionalSettings,
+} = stateSlice.actions;
+
+export const MetricsModal = (props: MetricsModalProps) => {
+  const { datasource, isOpen, onClose, onChange, query, initialMetrics } = props;
+
+  const [state, dispatch] = useReducer(stateSlice.reducer, initialState(query));
+
+  const theme = useTheme2();
+  const styles = getStyles(theme, state.disableTextWrap);
+
+  /**
+   * loads metrics and metadata on opening modal and switching off useBackend
+   */
+  const updateMetricsMetadata = useCallback(async () => {
+    // *** Loading Gif
+    dispatch(setIsLoading(true));
+
+    const data: MetricsModalMetadata = await setMetrics(datasource, query, initialMetrics);
+
+    dispatch(
+      buildMetrics({
+        isLoading: false,
+        hasMetadata: data.hasMetadata,
+        metrics: data.metrics,
+        metaHaystackDictionary: data.metaHaystackDictionary,
+        nameHaystackDictionary: data.nameHaystackDictionary,
+        totalMetricCount: data.metrics.length,
+        filteredMetricCount: data.metrics.length,
+      })
+    );
+  }, [query, datasource, initialMetrics]);
+
+  useEffect(() => {
+    updateMetricsMetadata();
+  }, [updateMetricsMetadata]);
+
+  const typeOptions: SelectableValue[] = promTypes.map((t: PromFilterOption) => {
+    return {
+      value: t.value,
+      label: t.value,
+      description: t.description,
+    };
+  });
+
+  /**
+   * The backend debounced search
+   */
+  const debouncedBackendSearch = useMemo(
+    () =>
+      debounce(async (metricText: string) => {
+        dispatch(setIsLoading(true));
+
+        const metrics = await getBackendSearchMetrics(metricText, query.labels, datasource);
+
+        dispatch(
+          filterMetricsBackend({
+            metrics: metrics,
+            filteredMetricCount: metrics.length,
+            isLoading: false,
+          })
+        );
+      }, datasource.getDebounceTimeInMilliseconds()),
+    [datasource, query]
+  );
+
+  function fuzzyNameDispatch(haystackData: string[][]) {
+    dispatch(setNameHaystack(haystackData));
+  }
+
+  function fuzzyMetaDispatch(haystackData: string[][]) {
+    dispatch(setMetaHaystack(haystackData));
+  }
+
+  function fuzzySearchCallback(query: string, fullMetaSearchVal: boolean) {
+    if (state.useBackend && query === '') {
+      // get all metrics data if a user erases everything in the input
+      updateMetricsMetadata();
+    } else if (state.useBackend) {
+      debouncedBackendSearch(query);
+    } else {
+      // search either the names or all metadata
+      // fuzzy search go!
+      if (fullMetaSearchVal) {
+        debouncedFuzzySearch(Object.keys(state.metaHaystackDictionary), query, fuzzyMetaDispatch);
+      } else {
+        debouncedFuzzySearch(Object.keys(state.nameHaystackDictionary), query, fuzzyNameDispatch);
+      }
+    }
+  }
+
+  function keyFunction(e: React.KeyboardEvent<HTMLElement>) {
+    if (e.code === 'ArrowDown' && state.selectedIdx < state.resultsPerPage - 1) {
+      dispatch(setSelectedIdx(state.selectedIdx + 1));
+    } else if (e.code === 'ArrowUp' && state.selectedIdx > 0) {
+      dispatch(setSelectedIdx(state.selectedIdx - 1));
+    } else if (e.code === 'Enter') {
+      const metric = displayedMetrics(state, dispatch)[state.selectedIdx];
+
+      onChange({ ...query, metric: metric.value });
+      reportInteraction('grafana_prom_metric_encycopedia_tracking', {
+        metric: metric.value,
+        hasMetadata: state.hasMetadata,
+        totalMetricCount: state.totalMetricCount,
+        fuzzySearchQuery: state.fuzzySearchQuery,
+        fullMetaSearch: state.fullMetaSearch,
+        selectedTypes: state.selectedTypes,
+        letterSearch: state.letterSearch,
+      });
+      onClose();
+    }
+  }
+
+  return (
+    <Modal
+      data-testid={testIds.metricModal}
+      isOpen={isOpen}
+      title="Browse metrics"
+      onDismiss={onClose}
+      aria-label="Browse metrics"
+      className={styles.modal}
+    >
+      <div className={styles.inputWrapper}>
+        <div className={cx(styles.inputItem, styles.inputItemFirst)}>
+          <EditorField label="Search metrics">
+            <Input
+              autoFocus={true}
+              data-testid={testIds.searchMetric}
+              placeholder={placeholders.browse}
+              value={state.fuzzySearchQuery}
+              onInput={(e) => {
+                const value = e.currentTarget.value ?? '';
+                dispatch(setFuzzySearchQuery(value));
+
+                fuzzySearchCallback(value, state.fullMetaSearch);
+              }}
+              onKeyDown={(e) => {
+                keyFunction(e);
+              }}
+            />
+          </EditorField>
+        </div>
+        <div className={styles.inputItem}>
+          <EditorField label="Filter by type">
+            <MultiSelect
+              data-testid={testIds.selectType}
+              inputId="my-select"
+              options={typeOptions}
+              value={state.selectedTypes}
+              disabled={!state.hasMetadata || state.useBackend}
+              placeholder={placeholders.type}
+              onChange={(v) => {
+                // *** Filter by type
+                // *** always include metrics without metadata but label it as unknown type
+                // Consider tabs select instead of actual select or multi select
+                dispatch(setSelectedTypes(v));
+              }}
+            />
+          </EditorField>
+        </div>
+      </div>
+      {/* <h4 className={styles.resultsHeading}>Results</h4> */}
+      <div className={styles.resultsData}>
+        <div className={styles.resultsDataCount}>
+          Showing {state.filteredMetricCount} of {state.totalMetricCount} results.{' '}
+          <Spinner className={`${styles.loadingSpinner} ${state.isLoading ? styles.visible : ''}`} />
+          <div className={styles.selectWrapper}>
+            <div className={styles.alphabetRow}>
+              <LetterSearch
+                filteredMetrics={filterMetrics(state, true)}
+                disableTextWrap={state.disableTextWrap}
+                updateLetterSearch={(letter: string) => {
+                  if (state.letterSearch === letter) {
+                    dispatch(setLetterSearch(''));
+                  } else {
+                    dispatch(setLetterSearch(letter));
+                  }
+                }}
+                letterSearch={state.letterSearch}
+              />
+              <Button
+                variant="secondary"
+                fill="text"
+                size="sm"
+                onClick={() => dispatch(showAdditionalSettings())}
+                onKeyDown={(e) => {
+                  keyFunction(e);
+                }}
+                data-testid={testIds.showAdditionalSettings}
+              >
+                Additional Settings
+              </Button>
+            </div>
+            {state.showAdditionalSettings && (
+              <>
+                <div className={styles.selectItem}>
+                  <Switch
+                    data-testid={testIds.searchWithMetadata}
+                    value={state.fullMetaSearch}
+                    disabled={state.useBackend || !state.hasMetadata}
+                    onChange={() => {
+                      const newVal = !state.fullMetaSearch;
+                      dispatch(setFullMetaSearch(newVal));
+                      onChange({ ...query, fullMetaSearch: newVal });
+
+                      fuzzySearchCallback(state.fuzzySearchQuery, newVal);
+                    }}
+                    onKeyDown={(e) => {
+                      keyFunction(e);
+                    }}
+                  />
+                  <p className={styles.selectItemLabel}>{placeholders.metadataSearchSwitch}</p>
+                </div>
+                <div className={styles.selectItem}>
+                  <Switch
+                    value={state.excludeNullMetadata}
+                    disabled={state.useBackend || !state.hasMetadata}
+                    onChange={() => {
+                      dispatch(setExcludeNullMetadata(!state.excludeNullMetadata));
+                      onChange({ ...query, excludeNullMetadata: !state.excludeNullMetadata });
+                    }}
+                    onKeyDown={(e) => {
+                      keyFunction(e);
+                    }}
+                  />
+                  <p className={styles.selectItemLabel}>{placeholders.excludeNoMetadata}</p>
+                </div>
+                <div className={styles.selectItem}>
+                  <Switch
+                    value={state.disableTextWrap}
+                    onChange={() => {
+                      dispatch(setDisableTextWrap());
+                      onChange({ ...query, disableTextWrap: !state.disableTextWrap });
+                    }}
+                    onKeyDown={(e) => {
+                      keyFunction(e);
+                    }}
+                  />
+                  <p className={styles.selectItemLabel}>Disable text wrap</p>
+                </div>
+                <div className={styles.selectItem}>
+                  <Switch
+                    data-testid={testIds.setUseBackend}
+                    value={state.useBackend}
+                    onChange={() => {
+                      const newVal = !state.useBackend;
+                      dispatch(setUseBackend(newVal));
+                      onChange({ ...query, useBackend: newVal });
+                      if (newVal === false) {
+                        // rebuild the metrics metadata if we turn off useBackend
+                        updateMetricsMetadata();
+                      } else {
+                        // check if there is text in the browse search and update
+                        if (state.fuzzySearchQuery !== '') {
+                          debouncedBackendSearch(state.fuzzySearchQuery);
+                        }
+                        // otherwise wait for user typing
+                      }
+                    }}
+                    onKeyDown={(e) => {
+                      keyFunction(e);
+                    }}
+                  />
+                  <p className={styles.selectItemLabel}>{placeholders.setUseBackend}</p>
+                </div>
+              </>
+            )}
+          </div>
+        </div>
+        {query.labels.length > 0 && (
+          <p className={styles.resultsDataFiltered}>
+            These metrics have been pre-filtered by labels chosen in the label filters.
+          </p>
+        )}
+      </div>
+      <div className={styles.results}>
+        {state.metrics && (
+          <ResultsTable
+            metrics={displayedMetrics(state, dispatch)}
+            onChange={onChange}
+            onClose={onClose}
+            query={query}
+            state={state}
+            selectedIdx={state.selectedIdx}
+            disableTextWrap={state.disableTextWrap}
+          />
+        )}
+      </div>
+
+      <div className={styles.pageSettingsWrapper}>
+        <div className={styles.pageSettings}>
+          <InlineField
+            label="# results per page"
+            tooltip={'The maximum results per page is ' + MAXIMUM_RESULTS_PER_PAGE}
+            labelWidth={20}
+          >
+            <Input
+              data-testid={testIds.resultsPerPage}
+              value={calculateResultsPerPage(state.resultsPerPage, DEFAULT_RESULTS_PER_PAGE, MAXIMUM_RESULTS_PER_PAGE)}
+              placeholder="results per page"
+              width={20}
+              onInput={(e) => {
+                const value = +e.currentTarget.value;
+
+                if (isNaN(value)) {
+                  return;
+                }
+
+                dispatch(setResultsPerPage(value));
+              }}
+            />
+          </InlineField>
+          <Pagination
+            currentPage={state.pageNum ?? 1}
+            numberOfPages={calculatePageList(state).length}
+            onNavigate={(val: number) => {
+              const page = val ?? 1;
+              dispatch(setPageNum(page));
+            }}
+          />
+        </div>
+        <FeedbackLink feedbackUrl="https://forms.gle/DEMAJHoAMpe3e54CA" />
+      </div>
+    </Modal>
+  );
+};
+
+export const testIds = {
+  metricModal: 'metric-modal',
+  searchMetric: 'search-metric',
+  searchWithMetadata: 'search-with-metadata',
+  selectType: 'select-type',
+  metricCard: 'metric-card',
+  useMetric: 'use-metric',
+  searchPage: 'search-page',
+  resultsPerPage: 'results-per-page',
+  setUseBackend: 'set-use-backend',
+  showAdditionalSettings: 'show-additional-settings',
+};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/ResultsTable.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/ResultsTable.tsx
new file mode 100644
index 00000000000..488db534cfa
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/ResultsTable.tsx
@@ -0,0 +1,170 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useRef } from 'react';
+import Highlighter from 'react-highlight-words';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import { useTheme2 } from '@grafana/ui';
+
+import { PromVisualQuery } from '../../types';
+
+import { MetricsModalState } from './state/state';
+import { MetricData, MetricsData } from './types';
+
+type ResultsTableProps = {
+  metrics: MetricsData;
+  onChange: (query: PromVisualQuery) => void;
+  onClose: () => void;
+  query: PromVisualQuery;
+  state: MetricsModalState;
+  selectedIdx: number;
+  disableTextWrap: boolean;
+};
+
+export function ResultsTable(props: ResultsTableProps) {
+  const { metrics, onChange, onClose, query, state, selectedIdx, disableTextWrap } = props;
+
+  const theme = useTheme2();
+  const styles = getStyles(theme, disableTextWrap);
+
+  const tableRef = useRef<HTMLTableElement | null>(null);
+
+  function isSelectedRow(idx: number): boolean {
+    return idx === selectedIdx;
+  }
+
+  function selectMetric(metric: MetricData) {
+    if (metric.value) {
+      onChange({ ...query, metric: metric.value });
+      reportInteraction('grafana_prom_metric_encycopedia_tracking', {
+        metric: metric.value,
+        hasMetadata: state.hasMetadata,
+        totalMetricCount: state.totalMetricCount,
+        fuzzySearchQuery: state.fuzzySearchQuery,
+        fullMetaSearch: state.fullMetaSearch,
+        selectedTypes: state.selectedTypes,
+        letterSearch: state.letterSearch,
+      });
+      onClose();
+    }
+  }
+
+  useEffect(() => {
+    const tr = tableRef.current?.getElementsByClassName('selected-row')[0];
+    tr?.scrollIntoView({ block: 'nearest', inline: 'nearest' });
+  }, [selectedIdx]);
+
+  function metaRows(metric: MetricData) {
+    if (state.fullMetaSearch && metric) {
+      return (
+        <>
+          <td>
+            <Highlighter
+              textToHighlight={metric.type ?? ''}
+              searchWords={state.metaHaystackMatches}
+              autoEscape
+              highlightClassName={styles.matchHighLight}
+            />
+          </td>
+          <td>
+            <Highlighter
+              textToHighlight={metric.description ?? ''}
+              searchWords={state.metaHaystackMatches}
+              autoEscape
+              highlightClassName={styles.matchHighLight}
+            />
+          </td>
+        </>
+      );
+    } else {
+      return (
+        <>
+          <td>{metric.type ?? ''}</td>
+          <td>{metric.description ?? ''}</td>
+        </>
+      );
+    }
+  }
+
+  return (
+    <table className={styles.table} ref={tableRef}>
+      <thead>
+        <tr className={styles.header}>
+          <th>Name</th>
+          {state.hasMetadata && (
+            <>
+              <th>Type</th>
+              <th>Description</th>
+            </>
+          )}
+        </tr>
+      </thead>
+      <tbody>
+        <>
+          {metrics &&
+            metrics.map((metric: MetricData, idx: number) => {
+              return (
+                <tr
+                  key={metric?.value ?? idx}
+                  className={`${styles.row} ${isSelectedRow(idx) ? `${styles.selectedRow} selected-row` : ''}`}
+                  onClick={() => selectMetric(metric)}
+                >
+                  <td>
+                    <Highlighter
+                      textToHighlight={metric?.value ?? ''}
+                      searchWords={state.fullMetaSearch ? state.metaHaystackMatches : state.nameHaystackMatches}
+                      autoEscape
+                      highlightClassName={styles.matchHighLight}
+                    />
+                  </td>
+                  {state.hasMetadata && metaRows(metric)}
+                </tr>
+              );
+            })}
+        </>
+      </tbody>
+    </table>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2, disableTextWrap: boolean) => {
+  const rowHoverBg = theme.colors.emphasize(theme.colors.background.primary, 0.03);
+
+  return {
+    table: css`
+      border-radius: ${theme.shape.borderRadius()};
+      width: 100%;
+      white-space: ${disableTextWrap ? 'nowrap' : 'normal'};
+      td {
+        padding: ${theme.spacing(1)};
+      }
+
+      td,
+      th {
+        min-width: ${theme.spacing(3)};
+      }
+    `,
+    header: css`
+      border-bottom: 1px solid ${theme.colors.border.weak};
+    `,
+    row: css`
+      label: row;
+      cursor: pointer;
+      border-bottom: 1px solid ${theme.colors.border.weak}
+      &:last-child {
+        border-bottom: 0;
+      }
+      :hover {
+        background-color: ${rowHoverBg};
+      }
+    `,
+    selectedRow: css`
+      background-color: ${rowHoverBg};
+    `,
+    matchHighLight: css`
+      background: inherit;
+      color: ${theme.components.textHighlight.text};
+      background-color: ${theme.components.textHighlight.background};
+    `,
+  };
+};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/helpers.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/helpers.ts
new file mode 100644
index 00000000000..91e1d620688
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/helpers.ts
@@ -0,0 +1,213 @@
+import { AnyAction } from '@reduxjs/toolkit';
+
+import { PrometheusDatasource } from 'app/plugins/datasource/prometheus/datasource';
+import { getMetadataHelp, getMetadataType } from 'app/plugins/datasource/prometheus/language_provider';
+
+import { regexifyLabelValuesQueryString } from '../../../shared/parsingUtils';
+import { QueryBuilderLabelFilter } from '../../../shared/types';
+import { PromVisualQuery } from '../../../types';
+import { HaystackDictionary, MetricData, MetricsData, PromFilterOption } from '../types';
+
+import { MetricsModalMetadata, MetricsModalState, stateSlice } from './state';
+
+const { setFilteredMetricCount } = stateSlice.actions;
+
+export async function setMetrics(
+  datasource: PrometheusDatasource,
+  query: PromVisualQuery,
+  initialMetrics?: string[]
+): Promise<MetricsModalMetadata> {
+  // metadata is set in the metric select now
+  // use this to disable metadata search and display
+  let hasMetadata = true;
+  const metadata = datasource.languageProvider.metricsMetadata;
+  if (metadata && Object.keys(metadata).length === 0) {
+    hasMetadata = false;
+  }
+
+  let nameHaystackDictionaryData: HaystackDictionary = {};
+  let metaHaystackDictionaryData: HaystackDictionary = {};
+
+  // pass in metrics from getMetrics in the query builder, reduced in the metric select
+  let metricsData: MetricsData | undefined;
+
+  metricsData = initialMetrics?.map((m: string) => {
+    const type = getMetadataType(m, datasource.languageProvider.metricsMetadata!);
+    const description = getMetadataHelp(m, datasource.languageProvider.metricsMetadata!);
+
+    // possibly remove the type in favor of the type select
+    const metaDataString = `${m}¦${type}¦${description}`;
+
+    const metricData: MetricData = {
+      value: m,
+      type: type,
+      description: description,
+    };
+
+    nameHaystackDictionaryData[m] = metricData;
+    metaHaystackDictionaryData[metaDataString] = metricData;
+
+    return metricData;
+  });
+
+  return {
+    isLoading: false,
+    hasMetadata: hasMetadata,
+    metrics: metricsData ?? [],
+    metaHaystackDictionary: metaHaystackDictionaryData,
+    nameHaystackDictionary: nameHaystackDictionaryData,
+    totalMetricCount: metricsData?.length ?? 0,
+    filteredMetricCount: metricsData?.length ?? 0,
+  };
+}
+
+/**
+ * The filtered and paginated metrics displayed in the modal
+ * */
+export function displayedMetrics(state: MetricsModalState, dispatch: React.Dispatch<AnyAction>) {
+  const filteredSorted: MetricsData = filterMetrics(state);
+
+  if (!state.isLoading && state.filteredMetricCount !== filteredSorted.length) {
+    dispatch(setFilteredMetricCount(filteredSorted.length));
+  }
+
+  return sliceMetrics(filteredSorted, state.pageNum, state.resultsPerPage);
+}
+
+/**
+ * Filter the metrics with all the options, fuzzy, type, letter
+ * @param metrics
+ * @param skipLetterSearch used to show the alphabet letters as clickable before filtering out letters (needs to be refactored)
+ * @returns
+ */
+export function filterMetrics(state: MetricsModalState, skipLetterSearch?: boolean): MetricsData {
+  let filteredMetrics: MetricsData = state.metrics;
+
+  if (state.fuzzySearchQuery && !state.useBackend) {
+    if (state.fullMetaSearch) {
+      filteredMetrics = state.metaHaystackOrder.map((needle: string) => state.metaHaystackDictionary[needle]);
+    } else {
+      filteredMetrics = state.nameHaystackOrder.map((needle: string) => state.nameHaystackDictionary[needle]);
+    }
+  }
+
+  if (state.letterSearch && !skipLetterSearch) {
+    filteredMetrics = filteredMetrics.filter((m: MetricData, idx) => {
+      const letters: string[] = [state.letterSearch, state.letterSearch.toLowerCase()];
+      return letters.includes(m.value[0]);
+    });
+  }
+
+  if (state.selectedTypes.length > 0 && !state.useBackend) {
+    filteredMetrics = filteredMetrics.filter((m: MetricData, idx) => {
+      // Matches type
+      const matchesSelectedType = state.selectedTypes.some((t) => t.value === m.type);
+
+      // missing type
+      const hasNoType = !m.type;
+
+      return matchesSelectedType || (hasNoType && !state.excludeNullMetadata);
+    });
+  }
+
+  if (state.excludeNullMetadata) {
+    filteredMetrics = filteredMetrics.filter((m: MetricData) => {
+      return m.type !== undefined && m.description !== undefined;
+    });
+  }
+
+  return filteredMetrics;
+}
+
+export function calculatePageList(state: MetricsModalState) {
+  if (!state.metrics.length) {
+    return [];
+  }
+
+  const calcResultsPerPage: number = state.resultsPerPage === 0 ? 1 : state.resultsPerPage;
+
+  const pages = Math.floor(filterMetrics(state).length / calcResultsPerPage) + 1;
+
+  return [...Array(pages).keys()].map((i) => i + 1);
+}
+
+export function sliceMetrics(metrics: MetricsData, pageNum: number, resultsPerPage: number) {
+  const calcResultsPerPage: number = resultsPerPage === 0 ? 1 : resultsPerPage;
+  const start: number = pageNum === 1 ? 0 : (pageNum - 1) * calcResultsPerPage;
+  const end: number = start + calcResultsPerPage;
+  return metrics.slice(start, end);
+}
+
+export const calculateResultsPerPage = (results: number, defaultResults: number, max: number) => {
+  if (results < 1) {
+    return 1;
+  }
+
+  if (results > max) {
+    return max;
+  }
+
+  return results ?? defaultResults;
+};
+
+/**
+ * The backend query that replaces the uFuzzy search when the option 'useBackend' has been selected
+ * @param metricText
+ * @param labels
+ * @param datasource
+ * @returns
+ */
+export async function getBackendSearchMetrics(
+  metricText: string,
+  labels: QueryBuilderLabelFilter[],
+  datasource: PrometheusDatasource
+): Promise<Array<{ value: string }>> {
+  const queryString = regexifyLabelValuesQueryString(metricText);
+
+  const labelsParams = labels.map((label) => {
+    return `,${label.label}="${label.value}"`;
+  });
+
+  const params = `label_values({__name__=~".*${queryString}"${labels ? labelsParams.join() : ''}},__name__)`;
+
+  const results = datasource.metricFindQuery(params);
+
+  return await results.then((results) => {
+    return results.map((result) => {
+      return {
+        value: result.text,
+      };
+    });
+  });
+}
+
+export const promTypes: PromFilterOption[] = [
+  {
+    value: 'counter',
+    description:
+      'A cumulative metric that represents a single monotonically increasing counter whose value can only increase or be reset to zero on restart.',
+  },
+  {
+    value: 'gauge',
+    description: 'A metric that represents a single numerical value that can arbitrarily go up and down.',
+  },
+  {
+    value: 'histogram',
+    description:
+      'A histogram samples observations (usually things like request durations or response sizes) and counts them in configurable buckets.',
+  },
+  {
+    value: 'summary',
+    description:
+      'A summary samples observations (usually things like request durations and response sizes) and can calculate configurable quantiles over a sliding time window.',
+  },
+];
+
+export const placeholders = {
+  browse: 'Search metrics by name',
+  metadataSearchSwitch: 'Search by metadata type and description in addition to name',
+  type: 'Select...',
+  variables: 'Select...',
+  excludeNoMetadata: 'Exclude results with no metadata',
+  setUseBackend: 'Use the backend to browse metrics',
+};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/state.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/state.ts
new file mode 100644
index 00000000000..5e78c63ee0e
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/state.ts
@@ -0,0 +1,209 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+
+import { SelectableValue } from '@grafana/data';
+
+import { PromVisualQuery } from '../../../types';
+import { HaystackDictionary, MetricsData } from '../types';
+
+export const DEFAULT_RESULTS_PER_PAGE = 100;
+export const MAXIMUM_RESULTS_PER_PAGE = 1000;
+
+export const stateSlice = createSlice({
+  name: 'metrics-modal-state',
+  initialState: initialState(),
+  reducers: {
+    filterMetricsBackend: (
+      state,
+      action: PayloadAction<{
+        metrics: MetricsData;
+        filteredMetricCount: number;
+        isLoading: boolean;
+      }>
+    ) => {
+      state.metrics = action.payload.metrics;
+      state.filteredMetricCount = action.payload.filteredMetricCount;
+      state.isLoading = action.payload.isLoading;
+    },
+    buildMetrics: (state, action: PayloadAction<MetricsModalMetadata>) => {
+      state.isLoading = action.payload.isLoading;
+      state.metrics = action.payload.metrics;
+      state.hasMetadata = action.payload.hasMetadata;
+      state.metaHaystackDictionary = action.payload.metaHaystackDictionary;
+      state.nameHaystackDictionary = action.payload.nameHaystackDictionary;
+      state.totalMetricCount = action.payload.totalMetricCount;
+      state.filteredMetricCount = action.payload.filteredMetricCount;
+    },
+    setIsLoading: (state, action: PayloadAction<boolean>) => {
+      state.isLoading = action.payload;
+    },
+    setFilteredMetricCount: (state, action: PayloadAction<number>) => {
+      state.filteredMetricCount = action.payload;
+    },
+    setResultsPerPage: (state, action: PayloadAction<number>) => {
+      state.resultsPerPage = action.payload;
+    },
+    setPageNum: (state, action: PayloadAction<number>) => {
+      state.pageNum = action.payload;
+    },
+    setFuzzySearchQuery: (state, action: PayloadAction<string>) => {
+      state.fuzzySearchQuery = action.payload;
+      state.pageNum = 1;
+      state.letterSearch = '';
+      state.selectedIdx = 0;
+    },
+    setNameHaystack: (state, action: PayloadAction<string[][]>) => {
+      state.nameHaystackOrder = action.payload[0];
+      state.nameHaystackMatches = action.payload[1];
+    },
+    setMetaHaystack: (state, action: PayloadAction<string[][]>) => {
+      state.metaHaystackOrder = action.payload[0];
+      state.metaHaystackMatches = action.payload[1];
+    },
+    setFullMetaSearch: (state, action: PayloadAction<boolean>) => {
+      state.fullMetaSearch = action.payload;
+      state.pageNum = 1;
+    },
+    setExcludeNullMetadata: (state, action: PayloadAction<boolean>) => {
+      state.excludeNullMetadata = action.payload;
+      state.pageNum = 1;
+    },
+    setSelectedTypes: (state, action: PayloadAction<Array<SelectableValue<string>>>) => {
+      state.selectedTypes = action.payload;
+      state.pageNum = 1;
+    },
+    setLetterSearch: (state, action: PayloadAction<string>) => {
+      state.letterSearch = action.payload;
+      state.pageNum = 1;
+    },
+    setUseBackend: (state, action: PayloadAction<boolean>) => {
+      state.useBackend = action.payload;
+      state.fullMetaSearch = false;
+      state.excludeNullMetadata = false;
+      state.pageNum = 1;
+    },
+    setSelectedIdx: (state, action: PayloadAction<number>) => {
+      state.selectedIdx = action.payload;
+    },
+    setDisableTextWrap: (state) => {
+      state.disableTextWrap = !state.disableTextWrap;
+    },
+    showAdditionalSettings: (state) => {
+      state.showAdditionalSettings = !state.showAdditionalSettings;
+    },
+  },
+});
+
+/**
+ * Initial state for the Metrics Modal
+ * @returns
+ */
+export function initialState(query?: PromVisualQuery): MetricsModalState {
+  return {
+    isLoading: true,
+    metrics: [],
+    hasMetadata: true,
+    metaHaystackDictionary: {},
+    metaHaystackMatches: [],
+    metaHaystackOrder: [],
+    nameHaystackDictionary: {},
+    nameHaystackOrder: [],
+    nameHaystackMatches: [],
+    totalMetricCount: 0,
+    filteredMetricCount: null,
+    resultsPerPage: DEFAULT_RESULTS_PER_PAGE,
+    pageNum: 1,
+    fuzzySearchQuery: '',
+    fullMetaSearch: query?.fullMetaSearch ?? false,
+    excludeNullMetadata: query?.excludeNullMetadata ?? false,
+    selectedTypes: [],
+    letterSearch: '',
+    useBackend: query?.useBackend ?? false,
+    disableTextWrap: query?.disableTextWrap ?? false,
+    selectedIdx: 0,
+    showAdditionalSettings: false,
+  };
+}
+
+/**
+ * The Metrics Modal state object
+ */
+export interface MetricsModalState {
+  /** Used for the loading spinner */
+  isLoading: boolean;
+  /**
+   * Initial collection of metrics.
+   * The frontend filters do not impact this, but
+   * it is reduced by the backend search.
+   */
+  metrics: MetricsData;
+  /** Field for disabling type select and switches that rely on metadata */
+  hasMetadata: boolean;
+  /** Used to display metrics and help with fuzzy order */
+  nameHaystackDictionary: HaystackDictionary;
+  /** Used to sort name fuzzy search by relevance */
+  nameHaystackOrder: string[];
+  /** Used to highlight text in fuzzy matches */
+  nameHaystackMatches: string[];
+  /** Used to display metrics and help with fuzzy order for search across all metadata */
+  metaHaystackDictionary: HaystackDictionary;
+  /** Used to sort meta fuzzy search by relevance */
+  metaHaystackOrder: string[];
+  /** Used to highlight text in fuzzy matches */
+  metaHaystackMatches: string[];
+  /** Total results computed on initialization */
+  totalMetricCount: number;
+  /** Set after filtering metrics */
+  filteredMetricCount: number | null;
+  /** Pagination field for showing results in table */
+  resultsPerPage: number;
+  /** Pagination field */
+  pageNum: number;
+  /** The text query used to match metrics */
+  fuzzySearchQuery: string;
+  /** Enables the fuzzy meatadata search */
+  fullMetaSearch: boolean;
+  /** Excludes results that are missing type and description */
+  excludeNullMetadata: boolean;
+  /** Filter by prometheus type */
+  selectedTypes: Array<SelectableValue<string>>;
+  /** After results are filtered, select a letter to show metrics that start with that letter */
+  letterSearch: string;
+  /** Filter by the series match endpoint instead of the fuzzy search */
+  useBackend: boolean;
+  /** Disable text wrap for descriptions in the results table */
+  disableTextWrap: boolean;
+  /** The selected metric in the table represented by hover style highlighting */
+  selectedIdx: number;
+  /** Display toggle switches for settings */
+  showAdditionalSettings: boolean;
+}
+
+/**
+ * Type for the useEffect get metadata function
+ */
+export type MetricsModalMetadata = {
+  isLoading: boolean;
+  metrics: MetricsData;
+  hasMetadata: boolean;
+  metaHaystackDictionary: HaystackDictionary;
+  nameHaystackDictionary: HaystackDictionary;
+  totalMetricCount: number;
+  filteredMetricCount: number | null;
+};
+
+// for updating the settings in the PromQuery model
+export function getSettings(visQuery: PromVisualQuery): MetricsModalSettings {
+  return {
+    useBackend: visQuery?.useBackend ?? false,
+    disableTextWrap: visQuery?.disableTextWrap ?? false,
+    fullMetaSearch: visQuery?.fullMetaSearch ?? false,
+    excludeNullMetadata: visQuery.excludeNullMetadata ?? false,
+  };
+}
+
+export type MetricsModalSettings = {
+  useBackend?: boolean;
+  disableTextWrap?: boolean;
+  fullMetaSearch?: boolean;
+  excludeNullMetadata?: boolean;
+};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/styles.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/styles.ts
new file mode 100644
index 00000000000..65978dae22f
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/styles.ts
@@ -0,0 +1,123 @@
+import { css } from '@emotion/css';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+export const getStyles = (theme: GrafanaTheme2, disableTextWrap: boolean) => {
+  return {
+    modal: css`
+      width: 85vw;
+      ${theme.breakpoints.down('md')} {
+        width: 100%;
+      }
+      ${theme.breakpoints.up('xl')} {
+        width: 60%;
+      }
+    `,
+    inputWrapper: css`
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      gap: ${theme.spacing(2)};
+      margin-bottom: ${theme.spacing(2)};
+    `,
+    inputItemFirst: css`
+      flex-basis: 40%;
+    `,
+    inputItem: css`
+      flex-grow: 1;
+      flex-basis: 20%;
+      ${theme.breakpoints.down('md')} {
+        min-width: 100%;
+      }
+    `,
+    selectWrapper: css`
+      margin-bottom: ${theme.spacing(1)};
+    `,
+    selectItem: css`
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    `,
+    selectItemLabel: css`
+      margin: 0 0 0 ${theme.spacing(1)};
+      align-self: center;
+      color: ${theme.colors.text.secondary};
+    `,
+    resultsHeading: css`
+      margin: 0 0 0 0;
+    `,
+    resultsData: css`
+      margin: 0 0 ${theme.spacing(1)} 0;
+    `,
+    resultsDataCount: css`
+      margin: 0;
+    `,
+    resultsDataFiltered: css`
+      margin: 0;
+      color: ${theme.colors.warning.text};
+    `,
+    alphabetRow: css`
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      align-items: center;
+      column-gap: ${theme.spacing(1)};
+      margin-bottom: ${theme.spacing(1)};
+    `,
+    alphabetRowToggles: css`
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      flex-wrap: wrap;
+      column-gap: ${theme.spacing(1)};
+    `,
+    results: css`
+      height: calc(80vh - 280px);
+      overflow-y: scroll;
+    `,
+    pageSettingsWrapper: css`
+      padding-top: ${theme.spacing(1.5)};
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      align-items: center;
+      position: sticky;
+    `,
+    pageSettings: css`
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      align-items: center;
+    `,
+    selAlpha: css`
+      cursor: pointer;
+      color: #6e9fff;
+    `,
+    active: css`
+      cursor: pointer;
+    `,
+    gray: css`
+      color: grey;
+      opacity: 50%;
+    `,
+    loadingSpinner: css`
+      display: inline-block;
+      visibility: hidden;
+    `,
+    table: css`
+      white-space: ${disableTextWrap ? 'nowrap' : 'normal'};
+      td {
+        vertical-align: baseline;
+        padding: 0;
+      }
+    `,
+    tableDiv: css`
+      padding: 8px;
+    `,
+    visible: css`
+      visibility: visible;
+    `,
+  };
+};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/types.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/types.ts
new file mode 100644
index 00000000000..ff47b531602
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/types.ts
@@ -0,0 +1,30 @@
+export type MetricsData = MetricData[];
+
+export type MetricData = {
+  value: string;
+  type?: string;
+  description?: string;
+};
+
+export type PromFilterOption = {
+  value: string;
+  description: string;
+};
+
+export interface HaystackDictionary {
+  [needle: string]: MetricData;
+}
+
+export type UFuzzyInfo = {
+  idx: number[];
+  start: number[];
+  chars: number[];
+  terms: number[];
+  interIns: number[];
+  intraIns: number[];
+  interLft2: number[];
+  interRgt2: number[];
+  interLft1: number[];
+  interRgt1: number[];
+  ranges: number[][];
+};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/uFuzzy.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/uFuzzy.ts
new file mode 100644
index 00000000000..27741aed4d7
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/uFuzzy.ts
@@ -0,0 +1,43 @@
+import uFuzzy from '@leeoniya/ufuzzy';
+import { debounce as debounceLodash } from 'lodash';
+
+const uf = new uFuzzy({
+  intraMode: 1,
+  intraIns: 1,
+  intraSub: 1,
+  intraTrn: 1,
+  intraDel: 1,
+});
+
+export function fuzzySearch(haystack: string[], query: string, dispatcher: (data: string[][]) => void) {
+  const [idxs, info, order] = uf.search(haystack, query, false, 1e5);
+
+  let haystackOrder: string[] = [];
+  let matchesSet: Set<string> = new Set();
+  if (idxs && order) {
+    /**
+     * get the fuzzy matches for hilighting
+     * @param part
+     * @param matched
+     */
+    const mark = (part: string, matched: boolean) => {
+      if (matched) {
+        matchesSet.add(part);
+      }
+    };
+
+    // Iterate to create the order of needles(queries) and the matches
+    for (let i = 0; i < order.length; i++) {
+      let infoIdx = order[i];
+
+      /** Evaluate the match, get the matches for highlighting */
+      uFuzzy.highlight(haystack[info.idx[infoIdx]], info.ranges[infoIdx], mark);
+      /** Get the order */
+      haystackOrder.push(haystack[info.idx[infoIdx]]);
+    }
+
+    dispatcher([haystackOrder, [...matchesSet]]);
+  }
+}
+
+export const debouncedFuzzySearch = debounceLodash(fuzzySearch, 300);
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/types.ts b/public/app/plugins/datasource/prometheus/querybuilder/types.ts
index 5570e025a7e..c4f8b6b8c2c 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/types.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/types.ts
@@ -9,6 +9,11 @@ export interface PromVisualQuery {
   labels: QueryBuilderLabelFilter[];
   operations: QueryBuilderOperation[];
   binaryQueries?: PromVisualQueryBinary[];
+  // metrics modal additional settings
+  useBackend?: boolean;
+  disableTextWrap?: boolean;
+  excludeNullMetadata?: boolean;
+  fullMetaSearch?: boolean;
 }
 
 export type PromVisualQueryBinary = VisualQueryBinary<PromVisualQuery>;
diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts
index 65386982c10..2798725fabe 100644
--- a/public/app/plugins/datasource/prometheus/types.ts
+++ b/public/app/plugins/datasource/prometheus/types.ts
@@ -18,6 +18,11 @@ export interface PromQuery extends GenPromQuery, DataQuery {
   hinting?: boolean;
   interval?: string;
   intervalFactor?: number;
+  // store the metrics modal additional settings
+  useBackend?: boolean;
+  disableTextWrap?: boolean;
+  fullMetaSearch?: boolean;
+  excludeNullMetadata?: boolean;
 }
 
 export enum PrometheusCacheLevel {

From 86302bc1ec1149e5ac02cd332aa4aa39fc4eda30 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 1 May 2023 19:41:40 -0700
Subject: [PATCH 569/729] DataFrame: Deprecate MutableDataFrame (#67569)

---
 .betterer.results                             |  4 +-
 .../src/dataframe/MutableDataFrame.ts         |  6 ++
 .../src/dataframe/processDataFrame.test.ts    |  4 +-
 .../src/dataframe/processDataFrame.ts         | 35 +++++++++-
 .../src/field/fieldDisplay.test.ts            | 39 ++++++-----
 .../src/field/fieldOverrides.test.ts          | 16 ++---
 .../field/getFieldDisplayValuesProxy.test.tsx |  4 +-
 .../src/transformations/fieldReducer.test.ts  |  5 +-
 .../transformers/groupingToMatrix.ts          | 25 +++++---
 .../grafana-data/src/utils/flotPairs.test.ts  |  4 +-
 .../src/utils/DataSourceWithBackend.test.ts   | 12 ++--
 .../GraphNG/nullInsertThreshold.test.ts       | 30 ++++-----
 .../components/GraphNG/nullToValue.test.ts    | 10 +--
 .../loki/LogContextProvider.test.ts           | 10 +--
 .../datasource/loki/getDerivedFields.test.ts  |  4 +-
 .../datasource/mssql/datasource.test.ts       | 18 +++---
 .../datasource/mysql/specs/datasource.test.ts | 20 +++---
 .../datasource/postgres/datasource.test.ts    | 26 ++++----
 .../prometheus/result_transformer.test.ts     | 64 +++++++++----------
 .../datasource/tempo/datasource.test.ts       | 16 ++---
 .../datasource/tempo/graphTransform.test.ts   | 14 ++--
 .../tempo/resultTransformer.test.ts           |  4 +-
 .../datasource/testdata/nodeGraphUtils.ts     | 23 +++++--
 .../plugins/datasource/zipkin/datasource.ts   |  4 +-
 .../components/FlameGraph/FlameGraph.test.tsx |  4 +-
 .../FlameGraph/FlameGraphMetadata.test.ts     |  4 +-
 .../FlameGraph/FlameGraphTooltip.test.tsx     |  4 +-
 .../FlameGraph/dataTransform.test.ts          |  6 +-
 .../components/FlameGraph/rendering.test.ts   |  4 +-
 .../components/FlameGraphContainer.test.tsx   |  4 +-
 .../FlameGraphTopTableContainer.test.tsx      |  4 +-
 .../app/plugins/panel/logs/LogsPanel.test.tsx |  6 +-
 .../app/plugins/panel/nodeGraph/utils.test.ts | 22 +++----
 .../plugins/ExemplarsPlugin.test.tsx          | 22 +++----
 .../plugins/panel/timeseries/utils.test.ts    |  8 +--
 35 files changed, 266 insertions(+), 219 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 84d3ed13d5e..7f301119b7d 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -86,7 +86,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "18"],
       [0, 0, 0, "Do not use any type assertions.", "19"],
       [0, 0, 0, "Do not use any type assertions.", "20"],
-      [0, 0, 0, "Do not use any type assertions.", "21"]
+      [0, 0, 0, "Do not use any type assertions.", "21"],
+      [0, 0, 0, "Do not use any type assertions.", "22"],
+      [0, 0, 0, "Do not use any type assertions.", "23"]
     ],
     "packages/grafana-data/src/datetime/datemath.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.ts b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
index 94c8a599cde..7d96a8f592c 100644
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
@@ -10,10 +10,16 @@ import { guessFieldTypeFromValue, guessFieldTypeForField, toDataFrameDTO } from
 /** @deprecated */
 export type MutableField<T = any> = Field<T>;
 
+/** @deprecated */
 type MutableVectorCreator = (buffer?: any[]) => any[];
 
 export const MISSING_VALUE = undefined; // Treated as connected in new graph panel
 
+/**
+ * MutableDataFrame is a complex wrapper around the DataFrame interface
+ *
+ * @deprecated use standard DataFrame, or create one with PartialDataFrame
+ */
 export class MutableDataFrame<T = any> extends FunctionalVector<T> implements DataFrame {
   name?: string;
   refId?: string;
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.test.ts b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
index a6906452f7c..4d5c6485004 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
@@ -2,8 +2,8 @@ import { dateTime } from '../datetime/moment_wrapper';
 import { DataFrameDTO, FieldType, TableData, TimeSeries } from '../types/index';
 
 import { ArrayDataFrame } from './ArrayDataFrame';
-import { MutableDataFrame } from './MutableDataFrame';
 import {
+  createDataFrame,
   guessFieldTypeFromValue,
   guessFieldTypes,
   isDataFrame,
@@ -130,7 +130,7 @@ describe('toDataFrame', () => {
   });
 
   it('Guess Column Types from series', () => {
-    const series = new MutableDataFrame({
+    const series = createDataFrame({
       fields: [
         { name: 'A (number)', values: [123, null] },
         { name: 'B (strings)', values: [null, 'Hello'] },
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index 25047ee86db..09e67d8349d 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -27,7 +27,6 @@ import {
 
 import { arrayToDataFrame } from './ArrayDataFrame';
 import { dataFrameFromJSON } from './DataFrameJSON';
-import { MutableDataFrame } from './MutableDataFrame';
 
 function convertTableToDataFrame(table: TableData): DataFrame {
   const fields = table.columns.map((c) => {
@@ -315,7 +314,7 @@ export function toDataFrame(data: any): DataFrame {
     }
 
     // This will convert the array values into Vectors
-    return new MutableDataFrame(data as DataFrameDTO);
+    return createDataFrame(data as DataFrameDTO);
   }
 
   // Handle legacy docs/json type
@@ -567,3 +566,35 @@ export function preProcessPanelData(data: PanelData, lastResult?: PanelData): Pa
     timings: { dataProcessingTime: STOPTIME - STARTTIME },
   };
 }
+
+export interface PartialDataFrame extends Omit<DataFrame, 'fields' | 'length'> {
+  fields: Array<Partial<Field>>;
+}
+
+export function createDataFrame(input: PartialDataFrame): DataFrame {
+  let length = 0;
+  const fields = input.fields.map((p, idx) => {
+    const { state, ...field } = p;
+    if (!field.name) {
+      field.name = `Field ${idx + 1}`;
+    }
+    if (!field.config) {
+      field.config = {};
+    }
+    if (!field.values) {
+      field.values = new Array(length);
+    } else if (field.values.length > length) {
+      length = field.values.length;
+    }
+    if (!field.type) {
+      field.type = guessFieldTypeForField(field as Field) ?? FieldType.other;
+    }
+    return field as Field;
+  });
+
+  return {
+    ...input,
+    fields,
+    length,
+  };
+}
diff --git a/packages/grafana-data/src/field/fieldDisplay.test.ts b/packages/grafana-data/src/field/fieldDisplay.test.ts
index ebea46752bd..a9da5bf0182 100644
--- a/packages/grafana-data/src/field/fieldDisplay.test.ts
+++ b/packages/grafana-data/src/field/fieldDisplay.test.ts
@@ -508,8 +508,25 @@ function createEmptyDisplayOptions(extend = {}): GetFieldDisplayValuesOptions {
 }
 
 function createDisplayOptions(extend: Partial<GetFieldDisplayValuesOptions> = {}): GetFieldDisplayValuesOptions {
-  const options: GetFieldDisplayValuesOptions = {
-    data: [
+  const options = merge(
+    {
+      replaceVariables: (value: string) => {
+        return value;
+      },
+      reduceOptions: {
+        calcs: [],
+      },
+      fieldConfig: {
+        overrides: [],
+        defaults: {},
+      },
+      theme: createTheme(),
+    },
+    extend
+  );
+
+  if (!options.data?.length) {
+    options.data = [
       toDataFrame({
         name: 'Series Name',
         fields: [
@@ -518,21 +535,9 @@ function createDisplayOptions(extend: Partial<GetFieldDisplayValuesOptions> = {}
           { name: 'Field 3', values: [2, 4, 6] },
         ],
       }),
-    ],
-    replaceVariables: (value: string) => {
-      return value;
-    },
-    reduceOptions: {
-      calcs: [],
-    },
-    fieldConfig: {
-      overrides: [],
-      defaults: {},
-    },
-    theme: createTheme(),
-  };
-
-  return merge(options, extend);
+    ];
+  }
+  return options;
 }
 
 describe('fixCellTemplateExpressions', () => {
diff --git a/packages/grafana-data/src/field/fieldOverrides.test.ts b/packages/grafana-data/src/field/fieldOverrides.test.ts
index d24892db1f0..e136a5a6a12 100644
--- a/packages/grafana-data/src/field/fieldOverrides.test.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.test.ts
@@ -1,4 +1,4 @@
-import { ArrayDataFrame, MutableDataFrame, toDataFrame } from '../dataframe';
+import { ArrayDataFrame, createDataFrame, toDataFrame } from '../dataframe';
 import { rangeUtil } from '../datetime';
 import { createTheme } from '../themes';
 import { FieldMatcherID } from '../transformations';
@@ -177,11 +177,11 @@ describe('applyFieldOverrides', () => {
   };
 
   describe('given multiple data frames', () => {
-    const f0 = new MutableDataFrame({
+    const f0 = createDataFrame({
       name: 'A',
       fields: [{ name: 'message', type: FieldType.string, values: [10, 20] }],
     });
-    const f1 = new MutableDataFrame({
+    const f1 = createDataFrame({
       name: 'B',
       fields: [{ name: 'info', type: FieldType.string, values: [10, 20] }],
     });
@@ -676,7 +676,7 @@ describe('getLinksSupplier', () => {
       getTimeRangeForUrl: () => ({ from: 'now-7d', to: 'now' }),
     });
 
-    const f0 = new MutableDataFrame({
+    const f0 = createDataFrame({
       name: 'A',
       fields: [
         {
@@ -712,7 +712,7 @@ describe('getLinksSupplier', () => {
     });
 
     const datasourceUid = '1234';
-    const f0 = new MutableDataFrame({
+    const f0 = createDataFrame({
       name: 'A',
       fields: [
         {
@@ -766,7 +766,7 @@ describe('getLinksSupplier', () => {
 
     const datasourceUid = '1234';
     const range = rangeUtil.relativeToTimeRange({ from: 600, to: 0 });
-    const f0 = new MutableDataFrame({
+    const f0 = createDataFrame({
       name: 'A',
       fields: [
         {
@@ -827,7 +827,7 @@ describe('getLinksSupplier', () => {
     it('handles link click handlers', () => {
       const onClickSpy = jest.fn();
       const replaceSpy = jest.fn();
-      const f0 = new MutableDataFrame({
+      const f0 = createDataFrame({
         name: 'A',
         fields: [
           {
@@ -867,7 +867,7 @@ describe('getLinksSupplier', () => {
       const replaceSpy = jest.fn().mockReturnValue('url interpolated 10');
       const onBuildUrlSpy = jest.fn();
 
-      const f0 = new MutableDataFrame({
+      const f0 = createDataFrame({
         name: 'A',
         fields: [
           {
diff --git a/packages/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx b/packages/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx
index 92b9181fe72..b17ceef4cb6 100644
--- a/packages/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx
+++ b/packages/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx
@@ -1,4 +1,4 @@
-import { MutableDataFrame, toDataFrame } from '../dataframe';
+import { createDataFrame, toDataFrame } from '../dataframe';
 import { createTheme } from '../themes';
 
 import { applyFieldOverrides } from './fieldOverrides';
@@ -85,7 +85,7 @@ describe('getFieldDisplayValuesProxy', () => {
 
   it('should use default display processor if display is not defined', () => {
     const p = getFieldDisplayValuesProxy({
-      frame: new MutableDataFrame({ fields: [{ name: 'test', values: [1, 2] }] }),
+      frame: createDataFrame({ fields: [{ name: 'test', values: [1, 2] }] }),
       rowIndex: 0,
     });
     expect(p.test.text).toBe('1');
diff --git a/packages/grafana-data/src/transformations/fieldReducer.test.ts b/packages/grafana-data/src/transformations/fieldReducer.test.ts
index 1a30e1c3239..f4cc0b6b178 100644
--- a/packages/grafana-data/src/transformations/fieldReducer.test.ts
+++ b/packages/grafana-data/src/transformations/fieldReducer.test.ts
@@ -1,7 +1,6 @@
 import { difference } from 'lodash';
 
-import { MutableDataFrame } from '../dataframe/MutableDataFrame';
-import { guessFieldTypeFromValue } from '../dataframe/processDataFrame';
+import { createDataFrame, guessFieldTypeFromValue } from '../dataframe/processDataFrame';
 import { Field, FieldType } from '../types/index';
 
 import { fieldReducers, ReducerID, reduceField } from './fieldReducer';
@@ -24,7 +23,7 @@ function createField<T>(name: string, values?: T[], type?: FieldType): Field<T>
 }
 
 describe('Stats Calculators', () => {
-  const basicTable = new MutableDataFrame({
+  const basicTable = createDataFrame({
     fields: [
       { name: 'a', values: [10, 20] },
       { name: 'b', values: [20, 30] },
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
index 3b5721b7b99..741c2a50adf 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
@@ -1,6 +1,5 @@
 import { map } from 'rxjs/operators';
 
-import { MutableDataFrame } from '../../dataframe';
 import { getFieldDisplayName } from '../../field/fieldState';
 import { DataFrame, DataTransformerInfo, Field, FieldType, SpecialValue } from '../../types';
 import { fieldMatchers } from '../matchers';
@@ -75,13 +74,14 @@ export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTr
           matrixValues[columnName][rowName] = value;
         }
 
-        const resultFrame = new MutableDataFrame();
-
-        resultFrame.addField({
-          name: rowColumnField,
-          values: rowValues,
-          type: FieldType.string,
-        });
+        const fields: Field[] = [
+          {
+            name: rowColumnField,
+            values: rowValues,
+            type: FieldType.string,
+            config: {},
+          },
+        ];
 
         for (const columnName of columnValues) {
           let values = [];
@@ -98,7 +98,7 @@ export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTr
             valueField.config = { ...valueField.config, displayNameFromDS: undefined };
           }
 
-          resultFrame.addField({
+          fields.push({
             name: columnName.toString(),
             values: values,
             config: valueField.config,
@@ -106,7 +106,12 @@ export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTr
           });
         }
 
-        return [resultFrame];
+        return [
+          {
+            fields,
+            length: rowValues.length,
+          },
+        ];
       })
     ),
 };
diff --git a/packages/grafana-data/src/utils/flotPairs.test.ts b/packages/grafana-data/src/utils/flotPairs.test.ts
index 1ab5d314b2c..a17de17b971 100644
--- a/packages/grafana-data/src/utils/flotPairs.test.ts
+++ b/packages/grafana-data/src/utils/flotPairs.test.ts
@@ -1,11 +1,11 @@
-import { MutableDataFrame } from '../dataframe/MutableDataFrame';
+import { createDataFrame } from '../dataframe';
 import { dateTime } from '../datetime/moment_wrapper';
 import { TimeRange } from '../types/time';
 
 import { getFlotPairs, getFlotPairsConstant } from './flotPairs';
 
 describe('getFlotPairs', () => {
-  const series = new MutableDataFrame({
+  const series = createDataFrame({
     fields: [
       { name: 'a', values: [1, 2, 3] },
       { name: 'b', values: [100, 200, 300] },
diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
index 439f4a0300d..b4048689c98 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
@@ -8,7 +8,7 @@ import {
   DataSourceInstanceSettings,
   DataSourceJsonData,
   DataSourceRef,
-  MutableDataFrame,
+  createDataFrame,
 } from '@grafana/data';
 
 import {
@@ -240,10 +240,12 @@ describe('DataSourceWithBackend', () => {
     let obs = toStreamingDataResponse(rsp, request, standardStreamOptionsProvider);
     expect(obs).toBeDefined();
 
-    let frame = new MutableDataFrame();
-    frame.meta = {
-      channel: 'a/b/c',
-    };
+    let frame = createDataFrame({
+      meta: {
+        channel: 'a/b/c',
+      },
+      fields: [],
+    });
     rsp.data = [frame];
     obs = toStreamingDataResponse(rsp, request, standardStreamOptionsProvider);
     expect(obs).toBeDefined();
diff --git a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
index ab3343aa1b2..7a2ceb15e8d 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
@@ -1,4 +1,4 @@
-import { FieldType, MutableDataFrame } from '@grafana/data';
+import { FieldType, createDataFrame } from '@grafana/data';
 
 import { applyNullInsertThreshold } from './nullInsertThreshold';
 
@@ -48,7 +48,7 @@ function genFrame() {
 
 describe('nullInsertThreshold Transformer', () => {
   test('should insert nulls at +threshold between adjacent > threshold: 1', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, values: [1, 3, 10] },
@@ -65,7 +65,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should insert nulls at +threshold between adjacent > threshold: 2', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, values: [5, 7, 11] },
@@ -82,7 +82,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should insert nulls at +interval between adjacent > interval: 1', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 10] },
@@ -99,7 +99,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should insert leading null at beginning +interval when timeRange.from.valueOf() exceeds threshold', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [4, 6, 13] },
@@ -154,7 +154,7 @@ describe('nullInsertThreshold Transformer', () => {
 
   // this tests that intervals at 24hr but starting not at 12am UTC are not always snapped to 12am UTC
   test('should insert leading null at beginning +interval when timeRange.from.valueOf() exceeds threshold 11PM UTC', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         {
@@ -181,7 +181,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should insert trailing null at end +interval when timeRange.to.valueOf() exceeds threshold', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 10] },
@@ -197,7 +197,7 @@ describe('nullInsertThreshold Transformer', () => {
     expect(result.fields[2].values).toEqual(['a', null, 'b', null, null, null, null, null, null, 'c', null, null]);
 
     // should work for frames with 1 datapoint
-    const df2 = new MutableDataFrame({
+    const df2 = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1] },
@@ -216,7 +216,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should not insert trailing null at end +interval when timeRange.to.valueOf() equals threshold', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1] },
@@ -234,7 +234,7 @@ describe('nullInsertThreshold Transformer', () => {
 
   // TODO: make this work
   test.skip('should insert nulls at +threshold (when defined) instead of +interval', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 2 }, values: [5, 7, 11] },
@@ -251,7 +251,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should noop on 0 datapoints', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [] },
@@ -265,7 +265,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should noop on invalid threshold', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, values: [1, 2, 4] },
@@ -279,7 +279,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should noop on invalid interval', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: -1 }, values: [1, 2, 4] },
@@ -293,7 +293,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should noop when no missing steps', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 2, 3] },
@@ -307,7 +307,7 @@ describe('nullInsertThreshold Transformer', () => {
   });
 
   test('should noop when refFieldName not found', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 2, 5] },
diff --git a/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts b/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts
index a321f6a7e2f..e14f64e1710 100644
--- a/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts
+++ b/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts
@@ -1,11 +1,11 @@
-import { FieldType, MutableDataFrame } from '@grafana/data';
+import { FieldType, createDataFrame } from '@grafana/data';
 
 import { applyNullInsertThreshold } from './nullInsertThreshold';
 import { nullToValue } from './nullToValue';
 
 describe('nullToValue Transformer', () => {
   test('should change all nulls to configured zero value', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, values: [1, 3, 10] },
@@ -32,7 +32,7 @@ describe('nullToValue Transformer', () => {
   });
 
   test('should change all nulls to configured positive value', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, values: [5, 7, 11] },
@@ -59,7 +59,7 @@ describe('nullToValue Transformer', () => {
   });
 
   test('should change all nulls to configured negative value', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 10] },
@@ -76,7 +76,7 @@ describe('nullToValue Transformer', () => {
   });
 
   test('should have no effect without nulls', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       refId: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 2, 3] },
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
index 16bad0e1480..14bb38da2db 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
@@ -1,12 +1,6 @@
 import { of } from 'rxjs';
 
-import {
-  DataQueryResponse,
-  FieldType,
-  LogRowContextQueryDirection,
-  LogRowModel,
-  MutableDataFrame,
-} from '@grafana/data';
+import { DataQueryResponse, FieldType, LogRowContextQueryDirection, LogRowModel, createDataFrame } from '@grafana/data';
 
 import LokiLanguageProvider from './LanguageProvider';
 import { LogContextProvider } from './LogContextProvider';
@@ -25,7 +19,7 @@ defaultDatasourceMock.languageProvider = defaultLanguageProviderMock;
 
 const defaultLogRow = {
   rowIndex: 0,
-  dataFrame: new MutableDataFrame({
+  dataFrame: createDataFrame({
     fields: [
       {
         name: 'ts',
diff --git a/public/app/plugins/datasource/loki/getDerivedFields.test.ts b/public/app/plugins/datasource/loki/getDerivedFields.test.ts
index 4091d70e09a..554975630e4 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.test.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.test.ts
@@ -1,4 +1,4 @@
-import { MutableDataFrame } from '@grafana/data';
+import { createDataFrame } from '@grafana/data';
 
 import { getDerivedFields } from './getDerivedFields';
 
@@ -16,7 +16,7 @@ jest.mock('@grafana/runtime', () => ({
 
 describe('getDerivedFields', () => {
   it('adds links to fields', () => {
-    const df = new MutableDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
+    const df = createDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
     const newFields = getDerivedFields(df, [
       {
         matcherRegex: 'trace1=(\\w+)',
diff --git a/public/app/plugins/datasource/mssql/datasource.test.ts b/public/app/plugins/datasource/mssql/datasource.test.ts
index 36a1b17113f..99bfc5eb620 100644
--- a/public/app/plugins/datasource/mssql/datasource.test.ts
+++ b/public/app/plugins/datasource/mssql/datasource.test.ts
@@ -7,7 +7,7 @@ import {
   dateTime,
   FieldType,
   MetricFindValue,
-  MutableDataFrame,
+  createDataFrame,
   TimeRange,
 } from '@grafana/data';
 import { backendSrv } from 'app/core/services/backend_srv';
@@ -54,7 +54,7 @@ describe('MSSQLDatasource', () => {
         tempvar: {
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
                   { name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -130,7 +130,7 @@ describe('MSSQLDatasource', () => {
             refId: 'datasets',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [{ name: 'name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
                 })
               ),
@@ -152,7 +152,7 @@ describe('MSSQLDatasource', () => {
             refId: 'tables',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [{ name: 'schemaAndName', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
                 })
               ),
@@ -175,7 +175,7 @@ describe('MSSQLDatasource', () => {
             refId: 'columns',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'column', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
                     { name: 'type', type: FieldType.string, values: ['int', 'char', 'bool'] },
@@ -216,7 +216,7 @@ describe('MSSQLDatasource', () => {
         tempvar: {
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: '__value', values: ['value1', 'value2', 'value3'] },
                   { name: '__text', values: ['aTitle', 'aTitle2', 'aTitle3'] },
@@ -254,7 +254,7 @@ describe('MSSQLDatasource', () => {
           refId: 'tempvar',
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: 'id', values: [1, 2, 3] },
                   { name: 'values', values: ['test1', 'test2', 'test3'] },
@@ -297,7 +297,7 @@ describe('MSSQLDatasource', () => {
         tempvar: {
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: '__text', values: ['aTitle', 'aTitle', 'aTitle'] },
                   { name: '__value', values: ['same', 'same', 'diff'] },
@@ -330,7 +330,7 @@ describe('MSSQLDatasource', () => {
         tempvar: {
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [{ name: 'test', values: ['aTitle'] }],
               })
             ),
diff --git a/public/app/plugins/datasource/mysql/specs/datasource.test.ts b/public/app/plugins/datasource/mysql/specs/datasource.test.ts
index 9e6c749b4d6..2149011f16e 100644
--- a/public/app/plugins/datasource/mysql/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/mysql/specs/datasource.test.ts
@@ -6,7 +6,7 @@ import {
   DataSourceInstanceSettings,
   dateTime,
   FieldType,
-  MutableDataFrame,
+  createDataFrame,
 } from '@grafana/data';
 import { FetchResponse, setBackendSrv } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
@@ -115,7 +115,7 @@ describe('MySQLDatasource', () => {
             refId: 'datasets',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [{ name: 'name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
                 })
               ),
@@ -137,7 +137,7 @@ describe('MySQLDatasource', () => {
             refId: 'tables',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [{ name: 'table_name', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
                 })
               ),
@@ -159,7 +159,7 @@ describe('MySQLDatasource', () => {
             refId: 'fields',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'column_name', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
                     { name: 'data_type', type: FieldType.string, values: ['int', 'char', 'bool'] },
@@ -199,7 +199,7 @@ describe('MySQLDatasource', () => {
           refId: 'tempvar',
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
                   { name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -232,7 +232,7 @@ describe('MySQLDatasource', () => {
           refId: 'tempvar',
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
                   { name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -267,7 +267,7 @@ describe('MySQLDatasource', () => {
           refId: 'tempvar',
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
                   { name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -300,7 +300,7 @@ describe('MySQLDatasource', () => {
           refId: 'tempvar',
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: '__value', values: ['value1', 'value2', 'value3'] },
                   { name: '__text', values: ['aTitle', 'aTitle2', 'aTitle3'] },
@@ -335,7 +335,7 @@ describe('MySQLDatasource', () => {
           refId: 'tempvar',
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: 'id', values: [1, 2, 3] },
                   { name: 'values', values: ['test1', 'test2', 'test3'] },
@@ -373,7 +373,7 @@ describe('MySQLDatasource', () => {
           refId: 'tempvar',
           frames: [
             dataFrameToJSON(
-              new MutableDataFrame({
+              createDataFrame({
                 fields: [
                   { name: '__text', values: ['aTitle', 'aTitle', 'aTitle'] },
                   { name: '__value', values: ['same', 'same', 'diff'] },
diff --git a/public/app/plugins/datasource/postgres/datasource.test.ts b/public/app/plugins/datasource/postgres/datasource.test.ts
index 48c9a2990c9..5129098192e 100644
--- a/public/app/plugins/datasource/postgres/datasource.test.ts
+++ b/public/app/plugins/datasource/postgres/datasource.test.ts
@@ -9,7 +9,7 @@ import {
   dateTime,
   FieldType,
   LoadingState,
-  MutableDataFrame,
+  createDataFrame,
 } from '@grafana/data';
 import { FetchResponse } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
@@ -113,7 +113,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'A',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'time', values: [1599643351085] },
                     { name: 'metric', values: [30.226249741223704], labels: { metric: 'America' } },
@@ -204,7 +204,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'A',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'time', values: [1599643351085] },
                     { name: 'metric', values: ['America'] },
@@ -349,7 +349,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'tables',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [{ name: 'table', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
                 })
               ),
@@ -372,7 +372,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'meta',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [{ name: 'version', type: FieldType.string, values: ['test1'] }],
                 })
               ),
@@ -394,7 +394,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'meta',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [{ name: 'extversion', type: FieldType.string, values: ['test1'] }],
                 })
               ),
@@ -416,7 +416,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'columns',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'column', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
                     { name: 'type', type: FieldType.string, values: ['int', 'char', 'bool'] },
@@ -458,7 +458,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'tempvar',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
                     { name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -491,7 +491,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'tempvar',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
                     { name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -533,7 +533,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'tempvar',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
                     { name: 'text', values: ['some text', 'some text2', 'some text3'] },
@@ -573,7 +573,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'tempvar',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: '__value', values: ['value1', 'value2', 'value3'] },
                     { name: '__text', values: ['aTitle', 'aTitle2', 'aTitle3'] },
@@ -607,7 +607,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'tempvar',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: 'id', values: [1, 2, 3] },
                     { name: 'values', values: ['test1', 'test2', 'test3'] },
@@ -644,7 +644,7 @@ describe('PostgreSQLDatasource', () => {
             refId: 'tempvar',
             frames: [
               dataFrameToJSON(
-                new MutableDataFrame({
+                createDataFrame({
                   fields: [
                     { name: '__text', values: ['aTitle', 'aTitle', 'aTitle'] },
                     { name: '__value', values: ['same', 'same', 'diff'] },
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
index ede4c6e7089..a738eaf9e6f 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
@@ -3,7 +3,7 @@ import {
   DataQueryRequest,
   DataQueryResponse,
   FieldType,
-  MutableDataFrame,
+  createDataFrame,
   PreferredVisualisationType,
 } from '@grafana/data';
 
@@ -191,7 +191,7 @@ describe('Prometheus Result Transformer', () => {
       const response = {
         state: 'Done',
         data: [
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -226,7 +226,7 @@ describe('Prometheus Result Transformer', () => {
       const response = {
         state: 'Done',
         data: [
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -238,7 +238,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'time', type: FieldType.time, values: [2, 3, 7] },
@@ -280,7 +280,7 @@ describe('Prometheus Result Transformer', () => {
       const response = {
         state: 'Done',
         data: [
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -292,7 +292,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'B',
             fields: [
               { name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -325,7 +325,7 @@ describe('Prometheus Result Transformer', () => {
       const response = {
         state: 'Done',
         data: [
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -337,7 +337,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -349,7 +349,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -390,7 +390,7 @@ describe('Prometheus Result Transformer', () => {
       const response = {
         state: 'Done',
         data: [
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -402,7 +402,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -414,7 +414,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -426,7 +426,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'B',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -438,7 +438,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'B',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -450,7 +450,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'B',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -485,7 +485,7 @@ describe('Prometheus Result Transformer', () => {
         state: 'Done',
         data: [
           // 10
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -497,7 +497,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -509,7 +509,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -522,7 +522,7 @@ describe('Prometheus Result Transformer', () => {
             ],
           }),
           // 20
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -534,7 +534,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -546,7 +546,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -559,7 +559,7 @@ describe('Prometheus Result Transformer', () => {
             ],
           }),
           // 30
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -571,7 +571,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -583,7 +583,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -625,7 +625,7 @@ describe('Prometheus Result Transformer', () => {
       const response = {
         state: 'Done',
         data: [
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -637,7 +637,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             name: 'exemplar',
             meta: {
@@ -675,7 +675,7 @@ describe('Prometheus Result Transformer', () => {
       const response = {
         state: 'Done',
         data: [
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             fields: [
               { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
@@ -687,7 +687,7 @@ describe('Prometheus Result Transformer', () => {
               },
             ],
           }),
-          new MutableDataFrame({
+          createDataFrame({
             refId: 'A',
             name: 'exemplar',
             meta: {
@@ -741,7 +741,7 @@ describe('Prometheus Result Transformer', () => {
 
   describe('transformDFToTable', () => {
     it('transforms dataFrame with response length 1 to table dataFrame', () => {
-      const df = new MutableDataFrame({
+      const df = createDataFrame({
         refId: 'A',
         fields: [
           { name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -765,7 +765,7 @@ describe('Prometheus Result Transformer', () => {
     });
 
     it('transforms dataFrame with response length 2 to table dataFrame', () => {
-      const df = new MutableDataFrame({
+      const df = createDataFrame({
         refId: 'A',
         fields: [
           { name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -794,7 +794,7 @@ describe('Prometheus Result Transformer', () => {
       const value2 = 'value2';
 
       const dataframes = [
-        new MutableDataFrame({
+        createDataFrame({
           refId: 'A',
           fields: [
             { name: 'time', type: FieldType.time, values: [6, 5, 4] },
@@ -806,7 +806,7 @@ describe('Prometheus Result Transformer', () => {
             },
           ],
         }),
-        new MutableDataFrame({
+        createDataFrame({
           refId: 'B',
           fields: [],
         }),
diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts
index 788a139fcd3..dfd59aec047 100644
--- a/public/app/plugins/datasource/tempo/datasource.test.ts
+++ b/public/app/plugins/datasource/tempo/datasource.test.ts
@@ -9,7 +9,7 @@ import {
   FieldType,
   getDefaultTimeRange,
   LoadingState,
-  MutableDataFrame,
+  createDataFrame,
   PluginType,
 } from '@grafana/data';
 import {
@@ -121,7 +121,7 @@ describe('Tempo data source', () => {
 
   it('parses json fields from backend', async () => {
     setupBackendSrv(
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           { name: 'traceID', values: ['04450900759028499335'] },
           { name: 'spanID', values: ['4322526419282105830'] },
@@ -796,7 +796,7 @@ const defaultSettings: DataSourceInstanceSettings<TempoJsonData> = {
   readOnly: false,
 };
 
-const rateMetric = new MutableDataFrame({
+const rateMetric = createDataFrame({
   refId: 'topk(5, sum(rate(traces_spanmetrics_calls_total{span_kind="SPAN_KIND_SERVER"}[$__range])) by (span_name))',
   fields: [
     { name: 'Time', values: [1653725618609, 1653725618609] },
@@ -808,7 +808,7 @@ const rateMetric = new MutableDataFrame({
   ],
 });
 
-const errorRateMetric = new MutableDataFrame({
+const errorRateMetric = createDataFrame({
   refId:
     'topk(5, sum(rate(traces_spanmetrics_calls_total{status_code="STATUS_CODE_ERROR",span_name=~"HTTP Client|HTTP GET - root"}[$__range])) by (span_name))',
   fields: [
@@ -821,7 +821,7 @@ const errorRateMetric = new MutableDataFrame({
   ],
 });
 
-const durationMetric = new MutableDataFrame({
+const durationMetric = createDataFrame({
   refId:
     'histogram_quantile(.9, sum(rate(traces_spanmetrics_latency_bucket{span_name=~"HTTP GET - root"}[$__range])) by (le))',
   fields: [
@@ -833,7 +833,7 @@ const durationMetric = new MutableDataFrame({
   ],
 });
 
-const totalsPromMetric = new MutableDataFrame({
+const totalsPromMetric = createDataFrame({
   refId: 'traces_service_graph_request_total',
   fields: [
     { name: 'Time', values: [1628169788000, 1628169788000] },
@@ -846,7 +846,7 @@ const totalsPromMetric = new MutableDataFrame({
   ],
 });
 
-const secondsPromMetric = new MutableDataFrame({
+const secondsPromMetric = createDataFrame({
   refId: 'traces_service_graph_request_server_seconds_sum',
   fields: [
     { name: 'Time', values: [1628169788000, 1628169788000] },
@@ -859,7 +859,7 @@ const secondsPromMetric = new MutableDataFrame({
   ],
 });
 
-const failedPromMetric = new MutableDataFrame({
+const failedPromMetric = createDataFrame({
   refId: 'traces_service_graph_request_failed_total',
   fields: [
     { name: 'Time', values: [1628169788000, 1628169788000] },
diff --git a/public/app/plugins/datasource/tempo/graphTransform.test.ts b/public/app/plugins/datasource/tempo/graphTransform.test.ts
index e9e52bb09d1..1d774070347 100644
--- a/public/app/plugins/datasource/tempo/graphTransform.test.ts
+++ b/public/app/plugins/datasource/tempo/graphTransform.test.ts
@@ -1,4 +1,4 @@
-import { DataFrameView, dateTime, MutableDataFrame } from '@grafana/data';
+import { DataFrameView, dateTime, createDataFrame } from '@grafana/data';
 
 import { createGraphFrames, mapPromMetricsToServiceMap } from './graphTransform';
 import { bigResponse } from './testResponse';
@@ -116,7 +116,7 @@ describe('mapPromMetricsToServiceMap', () => {
   });
 });
 
-const singleSpanResponse = new MutableDataFrame({
+const singleSpanResponse = createDataFrame({
   fields: [
     { name: 'traceID', values: ['04450900759028499335'] },
     { name: 'spanID', values: ['4322526419282105830'] },
@@ -128,7 +128,7 @@ const singleSpanResponse = new MutableDataFrame({
   ],
 });
 
-const missingSpanResponse = new MutableDataFrame({
+const missingSpanResponse = createDataFrame({
   fields: [
     { name: 'traceID', values: ['04450900759028499335', '04450900759028499335'] },
     { name: 'spanID', values: ['1', '2'] },
@@ -140,7 +140,7 @@ const missingSpanResponse = new MutableDataFrame({
   ],
 });
 
-const totalsPromMetric = new MutableDataFrame({
+const totalsPromMetric = createDataFrame({
   refId: 'traces_service_graph_request_total',
   fields: [
     { name: 'Time', values: [1628169788000, 1628169788000] },
@@ -153,7 +153,7 @@ const totalsPromMetric = new MutableDataFrame({
   ],
 });
 
-const secondsPromMetric = new MutableDataFrame({
+const secondsPromMetric = createDataFrame({
   refId: 'traces_service_graph_request_server_seconds_sum',
   fields: [
     { name: 'Time', values: [1628169788000, 1628169788000] },
@@ -166,7 +166,7 @@ const secondsPromMetric = new MutableDataFrame({
   ],
 });
 
-const failedPromMetric = new MutableDataFrame({
+const failedPromMetric = createDataFrame({
   refId: 'traces_service_graph_request_failed_total',
   fields: [
     { name: 'Time', values: [1628169788000, 1628169788000] },
@@ -179,7 +179,7 @@ const failedPromMetric = new MutableDataFrame({
   ],
 });
 
-const invalidFailedPromMetric = new MutableDataFrame({
+const invalidFailedPromMetric = createDataFrame({
   refId: 'traces_service_graph_request_failed_total',
   fields: [
     { name: 'Time', values: [1628169788000, 1628169788000] },
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.test.ts b/public/app/plugins/datasource/tempo/resultTransformer.test.ts
index 1b78d658d96..83cd753c9b5 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.test.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.test.ts
@@ -2,7 +2,7 @@ import { collectorTypes } from '@opentelemetry/exporter-collector';
 
 import {
   FieldType,
-  MutableDataFrame,
+  createDataFrame,
   PluginType,
   DataSourceInstanceSettings,
   dateTime,
@@ -45,7 +45,7 @@ const defaultSettings: DataSourceInstanceSettings = {
 };
 
 describe('transformTraceList()', () => {
-  const lokiDataFrame = new MutableDataFrame({
+  const lokiDataFrame = createDataFrame({
     fields: [
       {
         name: 'ts',
diff --git a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts b/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
index 564b70cad70..42c50fe563a 100644
--- a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
+++ b/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
@@ -1,4 +1,11 @@
-import { FieldColorModeId, FieldDTO, FieldType, MutableDataFrame, NodeGraphDataFrameFieldNames } from '@grafana/data';
+import {
+  FieldColorModeId,
+  FieldDTO,
+  FieldType,
+  MutableDataFrame,
+  NodeGraphDataFrameFieldNames,
+  DataFrame,
+} from '@grafana/data';
 
 import { nodes, edges } from './testData/serviceMapResponse';
 
@@ -105,16 +112,17 @@ export function generateRandomNodes(count = 10) {
     meta: { preferredVisualisationType: 'nodeGraph' },
   });
 
-  const edgesFrame = new MutableDataFrame({
+  const edgesFrame: DataFrame = {
     name: 'edges',
     fields: [
-      { name: NodeGraphDataFrameFieldNames.id, values: [], type: FieldType.string },
-      { name: NodeGraphDataFrameFieldNames.source, values: [], type: FieldType.string },
-      { name: NodeGraphDataFrameFieldNames.target, values: [], type: FieldType.string },
-      { name: NodeGraphDataFrameFieldNames.mainStat, values: [], type: FieldType.number },
+      { name: NodeGraphDataFrameFieldNames.id, values: [], type: FieldType.string, config: {} },
+      { name: NodeGraphDataFrameFieldNames.source, values: [], type: FieldType.string, config: {} },
+      { name: NodeGraphDataFrameFieldNames.target, values: [], type: FieldType.string, config: {} },
+      { name: NodeGraphDataFrameFieldNames.mainStat, values: [], type: FieldType.number, config: {} },
     ],
     meta: { preferredVisualisationType: 'nodeGraph' },
-  });
+    length: 0,
+  };
 
   const edgesSet = new Set();
   for (const node of nodes) {
@@ -140,6 +148,7 @@ export function generateRandomNodes(count = 10) {
       edgesFrame.fields[3].values.push(Math.random() * 100);
     }
   }
+  edgesFrame.length = edgesFrame.fields[0].values.length;
 
   return [nodeFrame, edgesFrame];
 }
diff --git a/public/app/plugins/datasource/zipkin/datasource.ts b/public/app/plugins/datasource/zipkin/datasource.ts
index 0ea00fe33f0..01e525f0e34 100644
--- a/public/app/plugins/datasource/zipkin/datasource.ts
+++ b/public/app/plugins/datasource/zipkin/datasource.ts
@@ -8,7 +8,7 @@ import {
   DataSourceInstanceSettings,
   DataSourceJsonData,
   FieldType,
-  MutableDataFrame,
+  createDataFrame,
   ScopedVars,
 } from '@grafana/data';
 import { BackendSrvRequest, FetchResponse, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
@@ -127,7 +127,7 @@ function responseToDataQueryResponse(response: { data: ZipkinSpan[] }, nodeGraph
 
 const emptyDataQueryResponse = {
   data: [
-    new MutableDataFrame({
+    createDataFrame({
       fields: [
         {
           name: 'trace',
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx
index 0d1b51ba755..6641bf30c4c 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraph.test.tsx
@@ -1,7 +1,7 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import React, { useState } from 'react';
 
-import { CoreApp, MutableDataFrame } from '@grafana/data';
+import { CoreApp, createDataFrame } from '@grafana/data';
 
 import { SelectedView } from '../types';
 
@@ -27,7 +27,7 @@ describe('FlameGraph', () => {
     const [search] = useState('');
     const [selectedView, _] = useState(SelectedView.Both);
 
-    const flameGraphData = new MutableDataFrame(data);
+    const flameGraphData = createDataFrame(data);
     const container = new FlameGraphDataContainer(flameGraphData);
     const levels = nestedSetToLevels(container);
 
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphMetadata.test.ts b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphMetadata.test.ts
index 2c1c2dcde10..482a7c4b637 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphMetadata.test.ts
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphMetadata.test.ts
@@ -1,10 +1,10 @@
-import { MutableDataFrame } from '@grafana/data';
+import { createDataFrame } from '@grafana/data';
 
 import { getMetadata } from './FlameGraphMetadata';
 import { FlameGraphDataContainer } from './dataTransform';
 
 function makeDataFrame(fields: Record<string, Array<number | string>>, unit?: string) {
-  return new MutableDataFrame({
+  return createDataFrame({
     fields: Object.keys(fields).map((key) => ({
       name: key,
       values: fields[key],
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx
index 087b2107503..8d7e256d3d3 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/FlameGraphTooltip.test.tsx
@@ -1,10 +1,10 @@
-import { Field, FieldType, MutableDataFrame } from '@grafana/data';
+import { Field, FieldType, createDataFrame } from '@grafana/data';
 
 import { getTooltipData } from './FlameGraphTooltip';
 import { FlameGraphDataContainer } from './dataTransform';
 
 function setupData(unit?: string) {
-  const flameGraphData = new MutableDataFrame({
+  const flameGraphData = createDataFrame({
     fields: [
       { name: 'level', values: [0] },
       unit ? makeField('value', unit, [8_624_078_250]) : { name: 'value', values: [8_624_078_250] },
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.test.ts b/public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.test.ts
index f6588c98de5..b9a68eea93a 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.test.ts
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/dataTransform.test.ts
@@ -1,10 +1,10 @@
-import { MutableDataFrame } from '@grafana/data';
+import { createDataFrame } from '@grafana/data';
 
 import { FlameGraphDataContainer, nestedSetToLevels } from './dataTransform';
 
 describe('nestedSetToLevels', () => {
   it('converts nested set data frame to levels', () => {
-    const frame = new MutableDataFrame({
+    const frame = createDataFrame({
       fields: [
         { name: 'level', values: [0, 1, 2, 3, 2, 1, 2, 3, 4] },
         { name: 'value', values: [10, 5, 3, 1, 1, 4, 3, 2, 1] },
@@ -33,7 +33,7 @@ describe('nestedSetToLevels', () => {
   });
 
   it('converts nested set data if multiple same level items', () => {
-    const frame = new MutableDataFrame({
+    const frame = createDataFrame({
       fields: [
         { name: 'level', values: [0, 1, 1, 1] },
         { name: 'value', values: [10, 5, 3, 1] },
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraph/rendering.test.ts b/public/app/plugins/panel/flamegraph/components/FlameGraph/rendering.test.ts
index 8a86199f505..3489e2f5378 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraph/rendering.test.ts
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraph/rendering.test.ts
@@ -1,10 +1,10 @@
-import { MutableDataFrame } from '@grafana/data';
+import { createDataFrame } from '@grafana/data';
 
 import { FlameGraphDataContainer, LevelItem } from './dataTransform';
 import { getRectDimensionsForLevel } from './rendering';
 
 function makeDataFrame(fields: Record<string, Array<number | string>>) {
-  return new MutableDataFrame({
+  return createDataFrame({
     fields: Object.keys(fields).map((key) => ({
       name: key,
       values: fields[key],
diff --git a/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx b/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx
index c3f5dc8f397..6cb815202ff 100644
--- a/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx
+++ b/public/app/plugins/panel/flamegraph/components/FlameGraphContainer.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { CoreApp, MutableDataFrame } from '@grafana/data';
+import { CoreApp, createDataFrame } from '@grafana/data';
 
 import { MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH } from '../constants';
 
@@ -23,7 +23,7 @@ describe('FlameGraphContainer', () => {
   Object.defineProperty(HTMLElement.prototype, 'clientWidth', { value: 500 });
 
   const FlameGraphContainerWithProps = () => {
-    const flameGraphData = new MutableDataFrame(data);
+    const flameGraphData = createDataFrame(data);
     flameGraphData.meta = {
       custom: {
         ProfileTypeID: 'cpu:foo:bar',
diff --git a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx
index 1e823537ec4..b222b1964c9 100644
--- a/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx
+++ b/public/app/plugins/panel/flamegraph/components/TopTable/FlameGraphTopTableContainer.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import React, { useState } from 'react';
 
-import { CoreApp, MutableDataFrame } from '@grafana/data';
+import { CoreApp, createDataFrame } from '@grafana/data';
 
 import { FlameGraphDataContainer, nestedSetToLevels } from '../FlameGraph/dataTransform';
 import { data } from '../FlameGraph/testData/dataNestedSet';
@@ -14,7 +14,7 @@ describe('FlameGraphTopTableContainer', () => {
     const [search, setSearch] = useState('');
     const [selectedView, _] = useState(SelectedView.Both);
 
-    const flameGraphData = new MutableDataFrame(data);
+    const flameGraphData = createDataFrame(data);
     const container = new FlameGraphDataContainer(flameGraphData);
     const levels = nestedSetToLevels(container);
 
diff --git a/public/app/plugins/panel/logs/LogsPanel.test.tsx b/public/app/plugins/panel/logs/LogsPanel.test.tsx
index 99ad2026a78..0581c91629e 100644
--- a/public/app/plugins/panel/logs/LogsPanel.test.tsx
+++ b/public/app/plugins/panel/logs/LogsPanel.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import React, { ComponentProps } from 'react';
 
-import { LoadingState, MutableDataFrame, FieldType, LogsSortOrder } from '@grafana/data';
+import { LoadingState, createDataFrame, FieldType, LogsSortOrder } from '@grafana/data';
 
 import { LogsPanel } from './LogsPanel';
 
@@ -10,7 +10,7 @@ type LogsPanelProps = ComponentProps<typeof LogsPanel>;
 describe('LogsPanel', () => {
   describe('when returned series include common labels', () => {
     const seriesWithCommonLabels = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'time',
@@ -66,7 +66,7 @@ describe('LogsPanel', () => {
   });
   describe('when returned series does not include common labels', () => {
     const seriesWithoutCommonLabels = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'time',
diff --git a/public/app/plugins/panel/nodeGraph/utils.test.ts b/public/app/plugins/panel/nodeGraph/utils.test.ts
index 4bf9ddc09ab..58607b6b367 100644
--- a/public/app/plugins/panel/nodeGraph/utils.test.ts
+++ b/public/app/plugins/panel/nodeGraph/utils.test.ts
@@ -1,4 +1,4 @@
-import { DataFrame, FieldType, MutableDataFrame } from '@grafana/data';
+import { DataFrame, FieldType, createDataFrame } from '@grafana/data';
 
 import { NodeDatum, NodeGraphOptions } from './types';
 import {
@@ -81,27 +81,27 @@ describe('processNodes', () => {
 
   it('detects dataframes correctly', () => {
     const validFrames = [
-      new MutableDataFrame({
+      createDataFrame({
         refId: 'hasPreferredVisualisationType',
         fields: [],
         meta: {
           preferredVisualisationType: 'nodeGraph',
         },
       }),
-      new MutableDataFrame({
+      createDataFrame({
         refId: 'hasName',
         fields: [],
         name: 'nodes',
       }),
-      new MutableDataFrame({
+      createDataFrame({
         refId: 'nodes', // hasRefId
         fields: [],
       }),
-      new MutableDataFrame({
+      createDataFrame({
         refId: 'hasValidNodesShape',
         fields: [{ name: 'id', type: FieldType.string }],
       }),
-      new MutableDataFrame({
+      createDataFrame({
         refId: 'hasValidEdgesShape',
         fields: [
           { name: 'id', type: FieldType.string },
@@ -111,7 +111,7 @@ describe('processNodes', () => {
       }),
     ];
     const invalidFrames = [
-      new MutableDataFrame({
+      createDataFrame({
         refId: 'invalidData',
         fields: [],
       }),
@@ -124,7 +124,7 @@ describe('processNodes', () => {
   });
 
   it('getting fields is case insensitive', () => {
-    const nodeFrame = new MutableDataFrame({
+    const nodeFrame = createDataFrame({
       refId: 'nodes',
       fields: [
         { name: 'id', type: FieldType.string, values: ['id'] },
@@ -142,7 +142,7 @@ describe('processNodes', () => {
     expect(nodeFields.mainStat).toBeDefined();
     expect(nodeFields.secondaryStat).toBeDefined();
 
-    const edgeFrame = new MutableDataFrame({
+    const edgeFrame = createDataFrame({
       refId: 'nodes',
       fields: [
         { name: 'id', type: FieldType.string, values: ['id'] },
@@ -162,7 +162,7 @@ describe('processNodes', () => {
 
   it('interpolates panel options correctly', () => {
     const frames = [
-      new MutableDataFrame({
+      createDataFrame({
         refId: 'nodes',
         fields: [
           { name: 'id', type: FieldType.string },
@@ -173,7 +173,7 @@ describe('processNodes', () => {
           { name: 'arc__tertiary', type: FieldType.string },
         ],
       }),
-      new MutableDataFrame({
+      createDataFrame({
         refId: 'edges',
         fields: [
           { name: 'id', type: FieldType.string },
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.test.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.test.tsx
index cd3436bddf2..ab905506360 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.test.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.test.tsx
@@ -1,16 +1,15 @@
-import { MutableDataFrame, Field } from '@grafana/data/src';
-import { UPlotConfigBuilder } from '@grafana/ui/src';
+import { createDataFrame } from '@grafana/data';
+import { UPlotConfigBuilder } from '@grafana/ui';
 
 import { getVisibleLabels, VisibleExemplarLabels } from './ExemplarsPlugin';
 
 describe('getVisibleLabels()', () => {
-  const dataFrameSeries1 = new MutableDataFrame({
+  const dataFrameSeries1 = createDataFrame({
     name: 'tns/app',
     fields: [
       {
         name: 'Time',
         values: [1670418750000, 1670418765000, 1670418780000, 1670418795000],
-        entities: {},
       },
       {
         name: 'Value',
@@ -19,16 +18,14 @@ describe('getVisibleLabels()', () => {
         },
         values: [0.018963114754098367, 0.019140624999999974, 0.019718309859154928, 0.020064189189189167],
       },
-    ] as unknown as Field[],
-    length: 4,
+    ],
   });
-  const dataFrameSeries2 = new MutableDataFrame({
+  const dataFrameSeries2 = createDataFrame({
     name: 'tns/db',
     fields: [
       {
         name: 'Time',
         values: [1670418750000, 1670418765000, 1670418780000, 1670418795000],
-        entities: {},
       },
       {
         name: 'Value',
@@ -37,16 +34,14 @@ describe('getVisibleLabels()', () => {
         },
         values: [0.028963114754098367, 0.029140624999999974, 0.029718309859154928, 0.030064189189189167],
       },
-    ] as unknown as Field[],
-    length: 4,
+    ],
   });
-  const dataFrameSeries3 = new MutableDataFrame({
+  const dataFrameSeries3 = createDataFrame({
     name: 'tns/loadgen',
     fields: [
       {
         name: 'Time',
         values: [1670418750000, 1670418765000, 1670418780000, 1670418795000],
-        entities: {},
       },
       {
         name: 'Value',
@@ -55,8 +50,7 @@ describe('getVisibleLabels()', () => {
         },
         values: [0.028963114754098367, 0.029140624999999974, 0.029718309859154928, 0.030064189189189167],
       },
-    ] as unknown as Field[],
-    length: 4,
+    ],
   });
   const frames = [dataFrameSeries1, dataFrameSeries2, dataFrameSeries3];
   const config: UPlotConfigBuilder = {
diff --git a/public/app/plugins/panel/timeseries/utils.test.ts b/public/app/plugins/panel/timeseries/utils.test.ts
index 07ca5d1faf9..78af574e426 100644
--- a/public/app/plugins/panel/timeseries/utils.test.ts
+++ b/public/app/plugins/panel/timeseries/utils.test.ts
@@ -1,4 +1,4 @@
-import { createTheme, FieldType, MutableDataFrame, toDataFrame } from '@grafana/data';
+import { createTheme, FieldType, createDataFrame, toDataFrame } from '@grafana/data';
 
 import { prepareGraphableFields } from './utils';
 
@@ -76,7 +76,7 @@ describe('prepare timeseries graph', () => {
   });
 
   it('will convert NaN and Infinty to nulls', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       fields: [
         { name: 'time', type: FieldType.time, values: [995, 9996, 9997, 9998, 9999] },
         { name: 'a', values: [-10, NaN, 10, -Infinity, +Infinity] },
@@ -97,7 +97,7 @@ describe('prepare timeseries graph', () => {
   });
 
   it('will insert nulls given an interval value', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       fields: [
         { name: 'time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 6] },
         { name: 'a', values: [1, 2, 3] },
@@ -121,7 +121,7 @@ describe('prepare timeseries graph', () => {
   });
 
   it('will insert and convert nulls to a configure "no value" value', () => {
-    const df = new MutableDataFrame({
+    const df = createDataFrame({
       fields: [
         { name: 'time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 6] },
         { name: 'a', config: { noValue: '20' }, values: [1, 2, 3] },

From ab7b14fecbca34de14a0587d9efc008a27ed84a4 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 2 May 2023 02:48:59 -0400
Subject: [PATCH 570/729] Release: Bump version to 10.1.0-pre (#67613)

"Release: Updated versions in package to 10.1.0-pre"
---
 lerna.json                                    |  6 ++--
 package.json                                  |  2 +-
 packages/grafana-data/package.json            |  4 +--
 packages/grafana-e2e-selectors/package.json   |  2 +-
 packages/grafana-e2e/package.json             |  4 +--
 packages/grafana-eslint-rules/package.json    |  2 +-
 packages/grafana-runtime/package.json         |  8 +++---
 packages/grafana-schema/package.json          |  2 +-
 packages/grafana-toolkit/package.json         |  2 +-
 packages/grafana-ui/package.json              |  8 +++---
 .../internal/input-datasource/package.json    |  6 ++--
 yarn.lock                                     | 28 +++++++++----------
 12 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/lerna.json b/lerna.json
index ffc0d55874a..f174892e686 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,8 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": ["packages/*"],
-  "version": "10.0.0-pre"
+  "packages": [
+    "packages/*"
+  ],
+  "version": "10.1.0-pre"
 }
diff --git a/package.json b/package.json
index c8f867300e0..0c1adddfd61 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "repository": "github:grafana/grafana",
   "scripts": {
     "build": "yarn i18n:compile && NODE_ENV=production webpack --progress --config scripts/webpack/webpack.prod.js",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 30c421f565b..088a1b76ee7 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "6.0.2",
-    "@grafana/schema": "10.0.0-pre",
+    "@grafana/schema": "10.1.0-pre",
     "@types/d3-interpolate": "^3.0.0",
     "@types/string-hash": "1.1.1",
     "d3-interpolate": "3.0.1",
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index a3dbb13e104..2027e7be469 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e-selectors",
-  "version": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",
diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json
index 0b85a93aa11..707329e54b6 100644
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e",
-  "version": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "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": "10.0.0-pre",
+    "@grafana/e2e-selectors": "10.1.0-pre",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "babel-loader": "9.1.2",
diff --git a/packages/grafana-eslint-rules/package.json b/packages/grafana-eslint-rules/package.json
index 45daca50272..71fd2085f4b 100644
--- 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": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "main": "./index.cjs",
   "author": "Grafana Labs",
   "license": "Apache-2.0",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index e7ba8738b6c..aa97f210716 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -37,10 +37,10 @@
     "postpack": "mv package.json.bak package.json"
   },
   "dependencies": {
-    "@grafana/data": "10.0.0-pre",
-    "@grafana/e2e-selectors": "10.0.0-pre",
+    "@grafana/data": "10.1.0-pre",
+    "@grafana/e2e-selectors": "10.1.0-pre",
     "@grafana/faro-web-sdk": "1.0.2",
-    "@grafana/ui": "10.0.0-pre",
+    "@grafana/ui": "10.1.0-pre",
     "@sentry/browser": "6.19.7",
     "history": "4.10.1",
     "lodash": "4.17.21",
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index 0655787fd14..70d02dfc459 100644
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/schema",
-  "version": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 3113dff6082..a7467ee05e3 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/toolkit",
-  "version": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "description": "Grafana Toolkit",
   "keywords": [
     "grafana",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 24e2e86032a..ccb8b3027f3 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -49,10 +49,10 @@
   "dependencies": {
     "@emotion/css": "11.10.6",
     "@emotion/react": "11.10.6",
-    "@grafana/data": "10.0.0-pre",
-    "@grafana/e2e-selectors": "10.0.0-pre",
+    "@grafana/data": "10.1.0-pre",
+    "@grafana/e2e-selectors": "10.1.0-pre",
     "@grafana/faro-web-sdk": "1.0.2",
-    "@grafana/schema": "10.0.0-pre",
+    "@grafana/schema": "10.1.0-pre",
     "@leeoniya/ufuzzy": "1.0.6",
     "@monaco-editor/react": "4.4.6",
     "@popperjs/core": "2.11.6",
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 00affc06f7d..3c7a04c738c 100644
--- 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": "10.0.0-pre",
+  "version": "10.1.0-pre",
   "description": "Input Datasource",
   "private": true,
   "repository": {
@@ -28,8 +28,8 @@
     "webpack": "5.76.0"
   },
   "dependencies": {
-    "@grafana/data": "10.0.0-pre",
-    "@grafana/ui": "10.0.0-pre",
+    "@grafana/data": "10.1.0-pre",
+    "@grafana/ui": "10.1.0-pre",
     "react": "18.2.0",
     "tslib": "2.5.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 9d4083b4ed2..7ee26a3a648 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2720,9 +2720,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
   dependencies:
-    "@grafana/data": 10.0.0-pre
+    "@grafana/data": 10.1.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.0.0-pre
+    "@grafana/ui": 10.1.0-pre
     "@types/jest": 26.0.15
     "@types/react": 18.0.28
     copy-webpack-plugin: 11.0.0
@@ -2758,12 +2758,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/data@10.0.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@10.1.0-pre, @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": 10.0.0-pre
+    "@grafana/schema": 10.1.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
     "@rollup/plugin-commonjs": 23.0.2
     "@rollup/plugin-json": 5.0.1
@@ -2824,7 +2824,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/e2e-selectors@10.0.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@10.1.0-pre, @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:
@@ -2861,7 +2861,7 @@ __metadata:
     "@babel/core": 7.20.5
     "@babel/preset-env": 7.20.2
     "@cypress/webpack-preprocessor": 5.17.0
-    "@grafana/e2e-selectors": 10.0.0-pre
+    "@grafana/e2e-selectors": 10.1.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
     "@mochajs/json-file-reporter": ^1.2.0
     "@rollup/plugin-node-resolve": 15.0.1
@@ -3021,11 +3021,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
   dependencies:
-    "@grafana/data": 10.0.0-pre
-    "@grafana/e2e-selectors": 10.0.0-pre
+    "@grafana/data": 10.1.0-pre
+    "@grafana/e2e-selectors": 10.1.0-pre
     "@grafana/faro-web-sdk": 1.0.2
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.0.0-pre
+    "@grafana/ui": 10.1.0-pre
     "@rollup/plugin-commonjs": 23.0.2
     "@rollup/plugin-node-resolve": 15.0.1
     "@sentry/browser": 6.19.7
@@ -3075,7 +3075,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/schema@10.0.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@10.1.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
   version: 0.0.0-use.local
   resolution: "@grafana/schema@workspace:packages/grafana-schema"
   dependencies:
@@ -3117,17 +3117,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/ui@10.0.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@10.1.0-pre, @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": 10.0.0-pre
-    "@grafana/e2e-selectors": 10.0.0-pre
+    "@grafana/data": 10.1.0-pre
+    "@grafana/e2e-selectors": 10.1.0-pre
     "@grafana/faro-web-sdk": 1.0.2
-    "@grafana/schema": 10.0.0-pre
+    "@grafana/schema": 10.1.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
     "@leeoniya/ufuzzy": 1.0.6
     "@mdx-js/react": 1.6.22

From 3bfb50f989d11eb9cb5c3da8eaaf5bf7aa1c90b5 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 2 May 2023 09:52:02 +0200
Subject: [PATCH 571/729] Elastic: Create legacy runner for proxy queries
 (#67397)

* Elastic: Rename request to legacy request and call directly

* Apply content header directly in request

* Move legacy running queries to legacyqueryrunner
---
 .betterer.results                             |  32 +-
 .../elasticsearch/LegacyQueryRunner.ts        | 407 ++++++++++++++++++
 .../elasticsearch/datasource.test.ts          |   9 +-
 .../datasource/elasticsearch/datasource.ts    | 405 +----------------
 4 files changed, 449 insertions(+), 404 deletions(-)
 create mode 100644 public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts

diff --git a/.betterer.results b/.betterer.results
index 7f301119b7d..a641a30be82 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -3979,6 +3979,21 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
+    "public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Do not use any type assertions.", "11"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+    ],
     "public/app/plugins/datasource/elasticsearch/QueryBuilder.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -4056,22 +4071,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Do not use any type assertions.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "30"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "15"]
     ],
     "public/app/plugins/datasource/elasticsearch/hooks/useStatelessReducer.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
diff --git a/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts b/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts
new file mode 100644
index 00000000000..6665b6028fd
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts
@@ -0,0 +1,407 @@
+import { isNumber, isString, first as _first, cloneDeep } from 'lodash';
+import { lastValueFrom, Observable, of, throwError } from 'rxjs';
+import { catchError, map, tap } from 'rxjs/operators';
+
+import {
+  DataFrame,
+  DataQueryRequest,
+  DataQueryResponse,
+  dateTime,
+  Field,
+  LogRowContextOptions,
+  LogRowContextQueryDirection,
+  LogRowModel,
+  toUtc,
+} from '@grafana/data';
+import { BackendSrvRequest, getBackendSrv, TemplateSrv } from '@grafana/runtime';
+
+import { ElasticResponse } from './ElasticResponse';
+import { ElasticDatasource, enhanceDataFrame } from './datasource';
+import { defaultBucketAgg, hasMetricOfType } from './queryDef';
+import { trackAnnotationQuery, trackQuery } from './tracking';
+import { ElasticsearchQuery, Logs } from './types';
+
+export class LegacyQueryRunner {
+  datasource: ElasticDatasource;
+  templateSrv: TemplateSrv;
+
+  constructor(datasource: ElasticDatasource, templateSrv: TemplateSrv) {
+    this.datasource = datasource;
+    this.templateSrv = templateSrv;
+  }
+
+  request(
+    method: string,
+    url: string,
+    data?: BackendSrvRequest['data'],
+    headers?: BackendSrvRequest['headers']
+  ): Observable<any> {
+    if (!this.datasource.isProxyAccess) {
+      const error = new Error(
+        'Browser access mode in the Elasticsearch datasource is no longer available. Switch to server access mode.'
+      );
+      return throwError(() => error);
+    }
+
+    const options: BackendSrvRequest = {
+      url: this.datasource.url + '/' + url,
+      method,
+      data,
+      headers,
+    };
+
+    if (method === 'POST') {
+      options.headers = options.headers ?? {};
+      options.headers['Content-Type'] = 'application/x-ndjson';
+    }
+
+    if (this.datasource.basicAuth || this.datasource.withCredentials) {
+      options.withCredentials = true;
+    }
+    if (this.datasource.basicAuth) {
+      options.headers = {
+        Authorization: this.datasource.basicAuth,
+      };
+    }
+
+    return getBackendSrv()
+      .fetch<any>(options)
+      .pipe(
+        map((results) => {
+          results.data.$$config = results.config;
+          return results.data;
+        }),
+        catchError((err) => {
+          if (err.data) {
+            const message = err.data.error?.reason ?? err.data.message ?? 'Unknown error';
+
+            return throwError({
+              message: 'Elasticsearch error: ' + message,
+              error: err.data.error,
+            });
+          }
+
+          return throwError(err);
+        })
+      );
+  }
+
+  annotationQuery(options: any) {
+    const annotation = options.annotation;
+    const timeField = annotation.timeField || '@timestamp';
+    const timeEndField = annotation.timeEndField || null;
+
+    // the `target.query` is the "new" location for the query.
+    // normally we would write this code as
+    // try-the-new-place-then-try-the-old-place,
+    // but we had the bug at
+    // https://github.com/grafana/grafana/issues/61107
+    // that may have stored annotations where
+    // both the old and the new place are set,
+    // and in that scenario the old place needs
+    // to have priority.
+    const queryString = annotation.query ?? annotation.target?.query;
+    const tagsField = annotation.tagsField || 'tags';
+    const textField = annotation.textField || null;
+
+    const dateRanges = [];
+    const rangeStart: any = {};
+    rangeStart[timeField] = {
+      from: options.range.from.valueOf(),
+      to: options.range.to.valueOf(),
+      format: 'epoch_millis',
+    };
+    dateRanges.push({ range: rangeStart });
+
+    if (timeEndField) {
+      const rangeEnd: any = {};
+      rangeEnd[timeEndField] = {
+        from: options.range.from.valueOf(),
+        to: options.range.to.valueOf(),
+        format: 'epoch_millis',
+      };
+      dateRanges.push({ range: rangeEnd });
+    }
+
+    const queryInterpolated = this.datasource.interpolateLuceneQuery(queryString);
+    const query: any = {
+      bool: {
+        filter: [
+          {
+            bool: {
+              should: dateRanges,
+              minimum_should_match: 1,
+            },
+          },
+        ],
+      },
+    };
+
+    if (queryInterpolated) {
+      query.bool.filter.push({
+        query_string: {
+          query: queryInterpolated,
+        },
+      });
+    }
+    const data: any = {
+      query,
+      size: 10000,
+    };
+
+    const header: any = {
+      search_type: 'query_then_fetch',
+      ignore_unavailable: true,
+    };
+
+    // @deprecated
+    // Field annotation.index is deprecated and will be removed in the future
+    if (annotation.index) {
+      header.index = annotation.index;
+    } else {
+      header.index = this.datasource.indexPattern.getIndexList(options.range.from, options.range.to);
+    }
+
+    const payload = JSON.stringify(header) + '\n' + JSON.stringify(data) + '\n';
+
+    trackAnnotationQuery(annotation);
+    return lastValueFrom(
+      this.request('POST', '_msearch', payload).pipe(
+        map((res) => {
+          const list = [];
+          const hits = res.responses[0].hits.hits;
+
+          const getFieldFromSource = (source: any, fieldName: any) => {
+            if (!fieldName) {
+              return;
+            }
+
+            const fieldNames = fieldName.split('.');
+            let fieldValue = source;
+
+            for (let i = 0; i < fieldNames.length; i++) {
+              fieldValue = fieldValue[fieldNames[i]];
+              if (!fieldValue) {
+                console.log('could not find field in annotation: ', fieldName);
+                return '';
+              }
+            }
+
+            return fieldValue;
+          };
+
+          for (let i = 0; i < hits.length; i++) {
+            const source = hits[i]._source;
+            let time = getFieldFromSource(source, timeField);
+            if (typeof hits[i].fields !== 'undefined') {
+              const fields = hits[i].fields;
+              if (isString(fields[timeField]) || isNumber(fields[timeField])) {
+                time = fields[timeField];
+              }
+            }
+
+            const event: {
+              annotation: any;
+              time: number;
+              timeEnd?: number;
+              text: string;
+              tags: string | string[];
+            } = {
+              annotation: annotation,
+              time: toUtc(time).valueOf(),
+              text: getFieldFromSource(source, textField),
+              tags: getFieldFromSource(source, tagsField),
+            };
+
+            if (timeEndField) {
+              const timeEnd = getFieldFromSource(source, timeEndField);
+              if (timeEnd) {
+                event.timeEnd = toUtc(timeEnd).valueOf();
+              }
+            }
+
+            // legacy support for title field
+            if (annotation.titleField) {
+              const title = getFieldFromSource(source, annotation.titleField);
+              if (title) {
+                event.text = title + '\n' + event.text;
+              }
+            }
+
+            if (typeof event.tags === 'string') {
+              event.tags = event.tags.split(',');
+            }
+
+            list.push(event);
+          }
+          return list;
+        })
+      )
+    );
+  }
+
+  async logContextQuery(row: LogRowModel, options?: LogRowContextOptions): Promise<{ data: DataFrame[] }> {
+    const sortField = row.dataFrame.fields.find((f) => f.name === 'sort');
+    const searchAfter = sortField?.values[row.rowIndex] || [row.timeEpochMs];
+    const sort = options?.direction === LogRowContextQueryDirection.Forward ? 'asc' : 'desc';
+
+    const header =
+      options?.direction === LogRowContextQueryDirection.Forward
+        ? this.datasource.getQueryHeader('query_then_fetch', dateTime(row.timeEpochMs))
+        : this.datasource.getQueryHeader('query_then_fetch', undefined, dateTime(row.timeEpochMs));
+
+    const limit = options?.limit ?? 10;
+    const esQuery = JSON.stringify({
+      size: limit,
+      query: {
+        bool: {
+          filter: [
+            {
+              range: {
+                [this.datasource.timeField]: {
+                  [options?.direction === LogRowContextQueryDirection.Forward ? 'gte' : 'lte']: row.timeEpochMs,
+                  format: 'epoch_millis',
+                },
+              },
+            },
+          ],
+        },
+      },
+      sort: [{ [this.datasource.timeField]: sort }, { _doc: sort }],
+      search_after: searchAfter,
+    });
+    const payload = [header, esQuery].join('\n') + '\n';
+    const url = this.datasource.getMultiSearchUrl();
+    const response = await lastValueFrom(this.request('POST', url, payload));
+    const targets: ElasticsearchQuery[] = [{ refId: `${row.dataFrame.refId}`, metrics: [{ type: 'logs', id: '1' }] }];
+    const elasticResponse = new ElasticResponse(targets, transformHitsBasedOnDirection(response, sort));
+    const logResponse = elasticResponse.getLogs(this.datasource.logMessageField, this.datasource.logLevelField);
+    const dataFrame = _first(logResponse.data);
+    if (!dataFrame) {
+      return { data: [] };
+    }
+    /**
+     * The LogRowContext requires there is a field in the dataFrame.fields
+     * named `ts` for timestamp and `line` for the actual log line to display.
+     * Unfortunatly these fields are hardcoded and are required for the lines to
+     * be properly displayed. This code just copies the fields based on this.timeField
+     * and this.logMessageField and recreates the dataFrame so it works.
+     */
+    const timestampField = dataFrame.fields.find((f: Field) => f.name === this.datasource.timeField);
+    const lineField = dataFrame.fields.find((f: Field) => f.name === this.datasource.logMessageField);
+    if (timestampField && lineField) {
+      return {
+        data: [
+          {
+            ...dataFrame,
+            fields: [...dataFrame.fields, { ...timestampField, name: 'ts' }, { ...lineField, name: 'line' }],
+          },
+        ],
+      };
+    }
+    return logResponse;
+  }
+
+  query(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> {
+    let payload = '';
+    const targets = this.datasource.interpolateVariablesInQueries(cloneDeep(request.targets), request.scopedVars);
+    const sentTargets: ElasticsearchQuery[] = [];
+    let targetsContainsLogsQuery = targets.some((target) => hasMetricOfType(target, 'logs'));
+
+    const logLimits: Array<number | undefined> = [];
+
+    for (const target of targets) {
+      if (target.hide) {
+        continue;
+      }
+
+      let queryObj;
+      if (hasMetricOfType(target, 'logs')) {
+        // FIXME: All this logic here should be in the query builder.
+        // When moving to the BE-only implementation we should remove this and let the BE
+        // Handle this.
+        // TODO: defaultBucketAgg creates a dete_histogram aggregation without a field, so it fallbacks to
+        // the configured timeField. we should allow people to use a different time field here.
+        target.bucketAggs = [defaultBucketAgg()];
+
+        const log = target.metrics?.find((m) => m.type === 'logs') as Logs;
+        const limit = log.settings?.limit ? parseInt(log.settings?.limit, 10) : 500;
+        logLimits.push(limit);
+
+        target.metrics = [];
+        // Setting this for metrics queries that are typed as logs
+        queryObj = this.datasource.queryBuilder.getLogsQuery(target, limit);
+      } else {
+        logLimits.push();
+        if (target.alias) {
+          target.alias = this.datasource.interpolateLuceneQuery(target.alias, request.scopedVars);
+        }
+
+        queryObj = this.datasource.queryBuilder.build(target);
+      }
+
+      const esQuery = JSON.stringify(queryObj);
+
+      const searchType = 'query_then_fetch';
+      const header = this.datasource.getQueryHeader(searchType, request.range.from, request.range.to);
+      payload += header + '\n';
+
+      payload += esQuery + '\n';
+
+      sentTargets.push(target);
+    }
+
+    if (sentTargets.length === 0) {
+      return of({ data: [] });
+    }
+
+    // We replace the range here for actual values. We need to replace it together with enclosing "" so that we replace
+    // it as an integer not as string with digits. This is because elastic will convert the string only if the time
+    // field is specified as type date (which probably should) but can also be specified as integer (millisecond epoch)
+    // and then sending string will error out.
+    payload = payload.replace(/"\$timeFrom"/g, request.range.from.valueOf().toString());
+    payload = payload.replace(/"\$timeTo"/g, request.range.to.valueOf().toString());
+    payload = this.templateSrv.replace(payload, request.scopedVars);
+
+    const url = this.datasource.getMultiSearchUrl();
+
+    const start = new Date();
+    return this.request('POST', url, payload).pipe(
+      map((res) => {
+        const er = new ElasticResponse(sentTargets, res);
+
+        // TODO: This needs to be revisited, it seems wrong to process ALL the sent queries as logs if only one of them was a log query
+        if (targetsContainsLogsQuery) {
+          const response = er.getLogs(this.datasource.logMessageField, this.datasource.logLevelField);
+
+          response.data.forEach((dataFrame, index) => {
+            enhanceDataFrame(dataFrame, this.datasource.dataLinks, logLimits[index]);
+          });
+          return response;
+        }
+
+        return er.getTimeSeries();
+      }),
+      tap((response) => trackQuery(response, request, start))
+    );
+  }
+}
+
+function transformHitsBasedOnDirection(response: any, direction: 'asc' | 'desc') {
+  if (direction === 'desc') {
+    return response;
+  }
+  const actualResponse = response.responses[0];
+  return {
+    ...response,
+    responses: [
+      {
+        ...actualResponse,
+        hits: {
+          ...actualResponse.hits,
+          hits: actualResponse.hits.hits.reverse(),
+        },
+      },
+    ],
+  };
+}
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index 6793fa31871..f063ea6fd59 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -860,13 +860,14 @@ describe('ElasticDatasource', () => {
   describe('query', () => {
     it('should replace range as integer not string', async () => {
       const { ds } = getTestContext({ jsonData: { interval: 'Daily', timeField: '@time' } });
-      const postMock = jest.fn((url: string, data) => of(createFetchResponse({ responses: [] })));
-      ds['post'] = postMock;
+      const postMock = jest.fn((method: string, url: string, data, header: object) =>
+        of(createFetchResponse({ responses: [] }))
+      );
+      ds.legacyQueryRunner['request'] = postMock;
 
       await expect(ds.query(createElasticQuery())).toEmitValuesWith((received) => {
         expect(postMock).toHaveBeenCalledTimes(1);
-
-        const query = postMock.mock.calls[0][1];
+        const query = postMock.mock.calls[0][2];
         expect(typeof JSON.parse(query.split('\n')[1]).query.bool.filter[0].range['@time'].gte).toBe('number');
       });
     });
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 6de79c1b9e0..b863b60b523 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -1,5 +1,5 @@
-import { cloneDeep, find, first as _first, isNumber, isObject, isString, map as _map } from 'lodash';
-import { generate, lastValueFrom, Observable, of, throwError } from 'rxjs';
+import { cloneDeep, find, first as _first, isObject, isString, map as _map } from 'lodash';
+import { generate, lastValueFrom, Observable, of } from 'rxjs';
 import { catchError, first, map, mergeMap, skipWhile, throwIfEmpty, tap } from 'rxjs/operators';
 import { SemVer } from 'semver';
 
@@ -21,27 +21,25 @@ import {
   MetricFindValue,
   ScopedVars,
   TimeRange,
-  toUtc,
   QueryFixAction,
   CoreApp,
   SupplementaryQueryType,
-  SupplementaryQueryOptions,
   DataQueryError,
   rangeUtil,
-  Field,
   LogRowContextQueryDirection,
   LogRowContextOptions,
+  SupplementaryQueryOptions,
 } from '@grafana/data';
-import { BackendSrvRequest, DataSourceWithBackend, getBackendSrv, getDataSourceSrv, config } from '@grafana/runtime';
+import { DataSourceWithBackend, getDataSourceSrv, config } from '@grafana/runtime';
 import { queryLogsVolume } from 'app/core/logsModel';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
 import { getLogLevelFromKey } from '../../../features/logs/utils';
 
-import { ElasticResponse } from './ElasticResponse';
 import { IndexPattern, intervalMap } from './IndexPattern';
 import LanguageProvider from './LanguageProvider';
+import { LegacyQueryRunner } from './LegacyQueryRunner';
 import { ElasticQueryBuilder } from './QueryBuilder';
 import { ElasticsearchAnnotationsQueryEditor } from './components/QueryEditor/AnnotationQueryEditor';
 import { isBucketAggregationWithField } from './components/QueryEditor/BucketAggregationsEditor/aggregations';
@@ -51,8 +49,7 @@ import {
   isPipelineAggregationWithMultipleBucketPaths,
 } from './components/QueryEditor/MetricAggregationsEditor/aggregations';
 import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils';
-import { defaultBucketAgg, hasMetricOfType } from './queryDef';
-import { trackAnnotationQuery, trackQuery } from './tracking';
+import { trackQuery } from './tracking';
 import {
   Logs,
   BucketAggregation,
@@ -106,6 +103,7 @@ export class ElasticDatasource
   isProxyAccess: boolean;
   timeSrv: TimeSrv;
   databaseVersion: SemVer | null;
+  legacyQueryRunner: LegacyQueryRunner;
 
   constructor(
     instanceSettings: DataSourceInstanceSettings<ElasticsearchOptions>,
@@ -147,57 +145,7 @@ export class ElasticDatasource
     }
     this.languageProvider = new LanguageProvider(this);
     this.timeSrv = getTimeSrv();
-  }
-
-  private request(
-    method: string,
-    url: string,
-    data?: undefined,
-    headers?: BackendSrvRequest['headers']
-  ): Observable<any> {
-    if (!this.isProxyAccess) {
-      const error = new Error(
-        'Browser access mode in the Elasticsearch datasource is no longer available. Switch to server access mode.'
-      );
-      return throwError(() => error);
-    }
-
-    const options: BackendSrvRequest = {
-      url: this.url + '/' + url,
-      method,
-      data,
-      headers,
-    };
-
-    if (this.basicAuth || this.withCredentials) {
-      options.withCredentials = true;
-    }
-    if (this.basicAuth) {
-      options.headers = {
-        Authorization: this.basicAuth,
-      };
-    }
-
-    return getBackendSrv()
-      .fetch<any>(options)
-      .pipe(
-        map((results) => {
-          results.data.$$config = results.config;
-          return results.data;
-        }),
-        catchError((err) => {
-          if (err.data) {
-            const message = err.data.error?.reason ?? err.data.message ?? 'Unknown error';
-
-            return throwError({
-              message: 'Elasticsearch error: ' + message,
-              error: err.data.error,
-            });
-          }
-
-          return throwError(err);
-        })
-      );
+    this.legacyQueryRunner = new LegacyQueryRunner(this, this.templateSrv);
   }
 
   async importFromAbstractQueries(abstractQueries: AbstractQuery[]): Promise<ElasticsearchQuery[]> {
@@ -212,7 +160,8 @@ export class ElasticDatasource
    *
    * @param url the url to query the index on, for example `/_mapping`.
    */
-  private get(url: string, range = getDefaultTimeRange()): Observable<any> {
+
+  private requestAllIndices(url: string, range = getDefaultTimeRange()): Observable<any> {
     let indexList = this.indexPattern.getIndexList(range.from, range.to);
     if (!Array.isArray(indexList)) {
       indexList = [this.indexPattern.getIndexForToday()];
@@ -220,12 +169,8 @@ export class ElasticDatasource
 
     const indexUrlList = indexList.map((index) => index + url);
 
-    return this.requestAllIndices(indexUrlList);
-  }
-
-  private requestAllIndices(indexList: string[]): Observable<any> {
     const maxTraversals = 7; // do not go beyond one week (for a daily pattern)
-    const listLen = indexList.length;
+    const listLen = indexUrlList.length;
 
     return generate({
       initialState: 0,
@@ -234,7 +179,9 @@ export class ElasticDatasource
     }).pipe(
       mergeMap((index) => {
         // catch all errors and emit an object with an err property to simplify checks later in the pipeline
-        return this.request('GET', indexList[listLen - index - 1]).pipe(catchError((err) => of({ err })));
+        return this.legacyQueryRunner
+          .request('GET', indexUrlList[listLen - index - 1])
+          .pipe(catchError((err) => of({ err })));
       }),
       skipWhile((resp) => resp?.err?.status === 404), // skip all requests that fail because missing Elastic index
       throwIfEmpty(() => 'Could not find an available index for this time range.'), // when i === Math.min(listLen, maxTraversals) generate will complete but without emitting any values which means we didn't find a valid index
@@ -249,165 +196,11 @@ export class ElasticDatasource
     );
   }
 
-  private post(url: string, data: any): Observable<any> {
-    return this.request('POST', url, data, { 'Content-Type': 'application/x-ndjson' });
-  }
-
   annotationQuery(options: any): Promise<any> {
-    const annotation = options.annotation;
-    const timeField = annotation.timeField || '@timestamp';
-    const timeEndField = annotation.timeEndField || null;
-
-    // the `target.query` is the "new" location for the query.
-    // normally we would write this code as
-    // try-the-new-place-then-try-the-old-place,
-    // but we had the bug at
-    // https://github.com/grafana/grafana/issues/61107
-    // that may have stored annotations where
-    // both the old and the new place are set,
-    // and in that scenario the old place needs
-    // to have priority.
-    const queryString = annotation.query ?? annotation.target?.query;
-    const tagsField = annotation.tagsField || 'tags';
-    const textField = annotation.textField || null;
-
-    const dateRanges = [];
-    const rangeStart: any = {};
-    rangeStart[timeField] = {
-      from: options.range.from.valueOf(),
-      to: options.range.to.valueOf(),
-      format: 'epoch_millis',
-    };
-    dateRanges.push({ range: rangeStart });
-
-    if (timeEndField) {
-      const rangeEnd: any = {};
-      rangeEnd[timeEndField] = {
-        from: options.range.from.valueOf(),
-        to: options.range.to.valueOf(),
-        format: 'epoch_millis',
-      };
-      dateRanges.push({ range: rangeEnd });
-    }
-
-    const queryInterpolated = this.interpolateLuceneQuery(queryString);
-    const query: any = {
-      bool: {
-        filter: [
-          {
-            bool: {
-              should: dateRanges,
-              minimum_should_match: 1,
-            },
-          },
-        ],
-      },
-    };
-
-    if (queryInterpolated) {
-      query.bool.filter.push({
-        query_string: {
-          query: queryInterpolated,
-        },
-      });
-    }
-    const data: any = {
-      query,
-      size: 10000,
-    };
-
-    const header: any = {
-      search_type: 'query_then_fetch',
-      ignore_unavailable: true,
-    };
-
-    // @deprecated
-    // Field annotation.index is deprecated and will be removed in the future
-    if (annotation.index) {
-      header.index = annotation.index;
-    } else {
-      header.index = this.indexPattern.getIndexList(options.range.from, options.range.to);
-    }
-
-    const payload = JSON.stringify(header) + '\n' + JSON.stringify(data) + '\n';
-
-    trackAnnotationQuery(annotation);
-    return lastValueFrom(
-      this.post('_msearch', payload).pipe(
-        map((res) => {
-          const list = [];
-          const hits = res.responses[0].hits.hits;
-
-          const getFieldFromSource = (source: any, fieldName: any) => {
-            if (!fieldName) {
-              return;
-            }
-
-            const fieldNames = fieldName.split('.');
-            let fieldValue = source;
-
-            for (let i = 0; i < fieldNames.length; i++) {
-              fieldValue = fieldValue[fieldNames[i]];
-              if (!fieldValue) {
-                console.log('could not find field in annotation: ', fieldName);
-                return '';
-              }
-            }
-
-            return fieldValue;
-          };
-
-          for (let i = 0; i < hits.length; i++) {
-            const source = hits[i]._source;
-            let time = getFieldFromSource(source, timeField);
-            if (typeof hits[i].fields !== 'undefined') {
-              const fields = hits[i].fields;
-              if (isString(fields[timeField]) || isNumber(fields[timeField])) {
-                time = fields[timeField];
-              }
-            }
-
-            const event: {
-              annotation: any;
-              time: number;
-              timeEnd?: number;
-              text: string;
-              tags: string | string[];
-            } = {
-              annotation: annotation,
-              time: toUtc(time).valueOf(),
-              text: getFieldFromSource(source, textField),
-              tags: getFieldFromSource(source, tagsField),
-            };
-
-            if (timeEndField) {
-              const timeEnd = getFieldFromSource(source, timeEndField);
-              if (timeEnd) {
-                event.timeEnd = toUtc(timeEnd).valueOf();
-              }
-            }
-
-            // legacy support for title tield
-            if (annotation.titleField) {
-              const title = getFieldFromSource(source, annotation.titleField);
-              if (title) {
-                event.text = title + '\n' + event.text;
-              }
-            }
-
-            if (typeof event.tags === 'string') {
-              event.tags = event.tags.split(',');
-            }
-
-            list.push(event);
-          }
-          return list;
-        })
-      )
-    );
+    return this.legacyQueryRunner.annotationQuery(options);
   }
 
-  private interpolateLuceneQuery(queryString: string, scopedVars?: ScopedVars) {
+  interpolateLuceneQuery(queryString: string, scopedVars?: ScopedVars) {
     return this.templateSrv.replace(queryString, scopedVars, 'lucene');
   }
 
@@ -529,65 +322,7 @@ export class ElasticDatasource
         )
       );
     } else {
-      const sortField = row.dataFrame.fields.find((f) => f.name === 'sort');
-      const searchAfter = sortField?.values[row.rowIndex] || [row.timeEpochMs];
-      const sort = options?.direction === LogRowContextQueryDirection.Forward ? 'asc' : 'desc';
-
-      const header =
-        options?.direction === LogRowContextQueryDirection.Forward
-          ? this.getQueryHeader('query_then_fetch', dateTime(row.timeEpochMs))
-          : this.getQueryHeader('query_then_fetch', undefined, dateTime(row.timeEpochMs));
-
-      const limit = options?.limit ?? 10;
-      const esQuery = JSON.stringify({
-        size: limit,
-        query: {
-          bool: {
-            filter: [
-              {
-                range: {
-                  [this.timeField]: {
-                    [options?.direction === LogRowContextQueryDirection.Forward ? 'gte' : 'lte']: row.timeEpochMs,
-                    format: 'epoch_millis',
-                  },
-                },
-              },
-            ],
-          },
-        },
-        sort: [{ [this.timeField]: sort }, { _doc: sort }],
-        search_after: searchAfter,
-      });
-      const payload = [header, esQuery].join('\n') + '\n';
-      const url = this.getMultiSearchUrl();
-      const response = await lastValueFrom(this.post(url, payload));
-      const targets: ElasticsearchQuery[] = [{ refId: `${row.dataFrame.refId}`, metrics: [{ type: 'logs', id: '1' }] }];
-      const elasticResponse = new ElasticResponse(targets, transformHitsBasedOnDirection(response, sort));
-      const logResponse = elasticResponse.getLogs(this.logMessageField, this.logLevelField);
-      const dataFrame = _first(logResponse.data);
-      if (!dataFrame) {
-        return { data: [] };
-      }
-      /**
-       * The LogRowContext requires there is a field in the dataFrame.fields
-       * named `ts` for timestamp and `line` for the actual log line to display.
-       * Unfortunatly these fields are hardcoded and are required for the lines to
-       * be properly displayed. This code just copies the fields based on this.timeField
-       * and this.logMessageField and recreates the dataFrame so it works.
-       */
-      const timestampField = dataFrame.fields.find((f: Field) => f.name === this.timeField);
-      const lineField = dataFrame.fields.find((f: Field) => f.name === this.logMessageField);
-      if (timestampField && lineField) {
-        return {
-          data: [
-            {
-              ...dataFrame,
-              fields: [...dataFrame.fields, { ...timestampField, name: 'ts' }, { ...lineField, name: 'line' }],
-            },
-          ],
-        };
-      }
-      return logResponse;
+      return this.legacyQueryRunner.logContextQuery(row, options);
     }
   };
 
@@ -692,87 +427,7 @@ export class ElasticDatasource
       const start = new Date();
       return super.query(request).pipe(tap((response) => trackQuery(response, request, start)));
     }
-    let payload = '';
-    const targets = this.interpolateVariablesInQueries(cloneDeep(request.targets), request.scopedVars);
-    const sentTargets: ElasticsearchQuery[] = [];
-    let targetsContainsLogsQuery = targets.some((target) => hasMetricOfType(target, 'logs'));
-
-    const logLimits: Array<number | undefined> = [];
-
-    for (const target of targets) {
-      if (target.hide) {
-        continue;
-      }
-
-      let queryObj;
-      if (hasMetricOfType(target, 'logs')) {
-        // FIXME: All this logic here should be in the query builder.
-        // When moving to the BE-only implementation we should remove this and let the BE
-        // Handle this.
-        // TODO: defaultBucketAgg creates a dete_histogram aggregation without a field, so it fallbacks to
-        // the configured timeField. we should allow people to use a different time field here.
-        target.bucketAggs = [defaultBucketAgg()];
-
-        const log = target.metrics?.find((m) => m.type === 'logs') as Logs;
-        const limit = log.settings?.limit ? parseInt(log.settings?.limit, 10) : 500;
-        logLimits.push(limit);
-
-        target.metrics = [];
-        // Setting this for metrics queries that are typed as logs
-        queryObj = this.queryBuilder.getLogsQuery(target, limit);
-      } else {
-        logLimits.push();
-        if (target.alias) {
-          target.alias = this.interpolateLuceneQuery(target.alias, request.scopedVars);
-        }
-
-        queryObj = this.queryBuilder.build(target);
-      }
-
-      const esQuery = JSON.stringify(queryObj);
-
-      const searchType = 'query_then_fetch';
-      const header = this.getQueryHeader(searchType, request.range.from, request.range.to);
-      payload += header + '\n';
-
-      payload += esQuery + '\n';
-
-      sentTargets.push(target);
-    }
-
-    if (sentTargets.length === 0) {
-      return of({ data: [] });
-    }
-
-    // We replace the range here for actual values. We need to replace it together with enclosing "" so that we replace
-    // it as an integer not as string with digits. This is because elastic will convert the string only if the time
-    // field is specified as type date (which probably should) but can also be specified as integer (millisecond epoch)
-    // and then sending string will error out.
-    payload = payload.replace(/"\$timeFrom"/g, request.range.from.valueOf().toString());
-    payload = payload.replace(/"\$timeTo"/g, request.range.to.valueOf().toString());
-    payload = this.templateSrv.replace(payload, request.scopedVars);
-
-    const url = this.getMultiSearchUrl();
-
-    const start = new Date();
-    return this.post(url, payload).pipe(
-      map((res) => {
-        const er = new ElasticResponse(sentTargets, res);
-
-        // TODO: This needs to be revisited, it seems wrong to process ALL the sent queries as logs if only one of them was a log query
-        if (targetsContainsLogsQuery) {
-          const response = er.getLogs(this.logMessageField, this.logLevelField);
-
-          response.data.forEach((dataFrame, index) => {
-            enhanceDataFrame(dataFrame, this.dataLinks, logLimits[index]);
-          });
-          return response;
-        }
-
-        return er.getTimeSeries();
-      }),
-      tap((response) => trackQuery(response, request, start))
-    );
+    return this.legacyQueryRunner.query(request);
   }
 
   isMetadataField(fieldName: string) {
@@ -796,7 +451,7 @@ export class ElasticDatasource
       nested: 'nested',
       histogram: 'number',
     };
-    return this.get('/_mapping', range).pipe(
+    return this.requestAllIndices('/_mapping', range).pipe(
       map((result) => {
         const shouldAddField = (obj: any, key: string) => {
           if (this.isMetadataField(key)) {
@@ -874,7 +529,7 @@ export class ElasticDatasource
 
     const url = this.getMultiSearchUrl();
 
-    return this.post(url, esQuery).pipe(
+    return this.legacyQueryRunner.request('POST', url, esQuery).pipe(
       map((res) => {
         if (!res.responses[0].aggregations) {
           return [];
@@ -1084,7 +739,7 @@ export class ElasticDatasource
 
   private getDatabaseVersionUncached(): Promise<SemVer | null> {
     // we want this function to never fail
-    return lastValueFrom(this.request('GET', '/')).then(
+    return lastValueFrom(this.legacyQueryRunner.request('GET', '/')).then(
       (data) => {
         const versionNumber = data?.version?.number;
         if (typeof versionNumber !== 'string') {
@@ -1212,24 +867,6 @@ function generateDataLink(linkConfig: DataLinkConfig): DataLink {
     };
   }
 }
-function transformHitsBasedOnDirection(response: any, direction: 'asc' | 'desc') {
-  if (direction === 'desc') {
-    return response;
-  }
-  const actualResponse = response.responses[0];
-  return {
-    ...response,
-    responses: [
-      {
-        ...actualResponse,
-        hits: {
-          ...actualResponse.hits,
-          hits: actualResponse.hits.hits.reverse(),
-        },
-      },
-    ],
-  };
-}
 
 function createContextTimeRange(rowTimeEpochMs: number, direction: string, intervalPattern: Interval | undefined) {
   const offset = 7;

From 2316178565a98efde18a1d8f7b96e774caf3e476 Mon Sep 17 00:00:00 2001
From: Shirley <4163034+fridgepoet@users.noreply.github.com>
Date: Tue, 2 May 2023 10:48:17 +0200
Subject: [PATCH 572/729] CloudWatch: Remove dynamic labels feature toggle
 (#67371)

---
 .../feature-toggles/index.md                  |  1 -
 .../src/types/featureToggles.gen.ts           |  1 -
 pkg/services/featuremgmt/registry.go          |  7 ---
 pkg/services/featuremgmt/toggles_gen.csv      |  1 -
 pkg/services/featuremgmt/toggles_gen.go       |  4 --
 .../MetricsQueryEditor.test.tsx               | 19 --------
 .../migrations/metricQueryMigrations.test.ts  | 44 -------------------
 .../useMigratedMetricsQuery.test.ts           | 15 -------
 8 files changed, 92 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index bf553aa61a2..ee00de1835e 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -23,7 +23,6 @@ Some stable features are enabled by default. You can disable a stable feature by
 | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
 | `disableEnvelopeEncryption`         | Disable envelope encryption (emergency only)                                                                                                                                                        |                    |
 | `featureHighlights`                 | Highlight Grafana Enterprise features                                                                                                                                                               |                    |
-| `cloudWatchDynamicLabels`           | Use dynamic labels instead of alias patterns in CloudWatch datasource                                                                                                                               | Yes                |
 | `dataConnectionsConsole`            | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.                        | Yes                |
 | `internationalization`              | Enables internationalization                                                                                                                                                                        | Yes                |
 | `topnav`                            | Enables new top navigation and page layouts                                                                                                                                                         | Yes                |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 9f04ea6972c..7875ba2d63a 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -33,7 +33,6 @@ export interface FeatureToggles {
   exploreMixedDatasource?: boolean;
   newTraceViewHeader?: boolean;
   correlations?: boolean;
-  cloudWatchDynamicLabels?: boolean;
   datasourceQueryMultiStatus?: boolean;
   traceToMetrics?: boolean;
   newDBLibrary?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 6ad62a643ed..b142ca014f7 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -104,13 +104,6 @@ var (
 			State:       FeatureStateBeta,
 			Owner:       grafanaExploreSquad,
 		},
-		{
-			Name:        "cloudWatchDynamicLabels",
-			Description: "Use dynamic labels instead of alias patterns in CloudWatch datasource",
-			State:       FeatureStateStable,
-			Expression:  "true", // enabled by default
-			Owner:       awsPluginsSquad,
-		},
 		{
 			Name:        "datasourceQueryMultiStatus",
 			Description: "Introduce HTTP 207 Multi Status for api/ds/query",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index e3d7ba39bbd..612ff973b0c 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -14,7 +14,6 @@ storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
 exploreMixedDatasource,beta,@grafana/explore-squad,false,false,false,true
 newTraceViewHeader,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
 correlations,beta,@grafana/explore-squad,false,false,false,false
-cloudWatchDynamicLabels,stable,@grafana/aws-plugins,false,false,false,false
 datasourceQueryMultiStatus,alpha,@grafana/plugins-platform-backend,false,false,false,false
 traceToMetrics,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
 newDBLibrary,beta,@grafana/backend-platform,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index da33d9d06e3..b1c017b10b1 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -67,10 +67,6 @@ const (
 	// Correlations page
 	FlagCorrelations = "correlations"
 
-	// FlagCloudWatchDynamicLabels
-	// Use dynamic labels instead of alias patterns in CloudWatch datasource
-	FlagCloudWatchDynamicLabels = "cloudWatchDynamicLabels"
-
 	// FlagDatasourceQueryMultiStatus
 	// Introduce HTTP 207 Multi Status for api/ds/query
 	FlagDatasourceQueryMultiStatus = "datasourceQueryMultiStatus"
diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
index 5b284abb0c4..907e91d574c 100644
--- a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import selectEvent from 'react-select-event';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import * as ui from '@grafana/ui';
 import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { TemplateSrv } from 'app/features/templating/template_srv';
@@ -125,22 +124,4 @@ describe('QueryEditor', () => {
     expect(screen.queryByText('Alias')).toBeNull();
     expect(screen.getByText("Period: ${PROP('Period')} InstanceId: ${PROP('Dim.InstanceId')}"));
   });
-
-  // TODO: delete this test when dynamic labels feature flag is removed
-  describe('when dynamic labels feature toggle is disabled', () => {
-    it('should render alias field', async () => {
-      const props = setup();
-      const originalValue = config.featureToggles.cloudWatchDynamicLabels;
-      config.featureToggles.cloudWatchDynamicLabels = false;
-
-      const expected = 'Period: {{period}} InstanceId: {{InstanceId}}';
-      render(<MetricsQueryEditor {...props} query={{ ...props.query, refId: 'A', alias: expected }} />);
-
-      expect(await screen.findByText('Label')).toBeInTheDocument();
-      expect(screen.queryByText('Alias')).toBeNull();
-      expect(screen.getByText("Period: ${PROP('Period')} InstanceId: ${PROP('Dim.InstanceId')}"));
-
-      config.featureToggles.cloudWatchDynamicLabels = originalValue;
-    });
-  });
 });
diff --git a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts
index db9911fe679..55a62c6644d 100644
--- a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts
@@ -1,5 +1,3 @@
-import { config } from '@grafana/runtime';
-
 import { CloudWatchMetricsQuery } from '../types';
 
 import { migrateAliasPatterns } from './metricQueryMigrations';
@@ -74,47 +72,5 @@ describe('metricQueryMigrations', () => {
         expect(result.alias).toBe(alias);
       });
     });
-
-    // TODO: delete this test when dynamic labels feature flag is removed
-    describe('when feature is disabled', () => {
-      const cases: TestScenario[] = [
-        { alias: '{{period}}', label: "${PROP('MetricName')}" },
-        { alias: '{{metric}}', label: "${PROP('MetricName')}" },
-        { alias: '', label: "${PROP('MetricName')}" },
-        { alias: '', label: '' },
-        { description: 'Metric name', alias: '{{metric}}', label: "${PROP('MetricName')}" },
-        { description: 'Trim pattern', alias: '{{  metric     }}', label: "${PROP('MetricName')}" },
-        { description: 'Namespace', alias: '{{namespace}}', label: "${PROP('Namespace')}" },
-        { description: 'Period', alias: '{{period}}', label: "${PROP('Period')}" },
-        { description: 'Region', alias: '{{region}}', label: "${PROP('Region')}" },
-        { description: 'Statistic', alias: '{{stat}}', label: "${PROP('Stat')}" },
-        { description: 'Label', alias: '{{label}}', label: '${LABEL}' },
-        {
-          description: 'Non-existing alias pattern',
-          alias: '{{anything_else}}',
-          label: "${PROP('Dim.anything_else')}",
-        },
-        {
-          description: 'Combined patterns',
-          alias: 'some {{combination}} of {{label}} and {{metric}}',
-          label: "some ${PROP('Dim.combination')} of ${LABEL} and ${PROP('MetricName')}",
-        },
-        {
-          description: 'Combined patterns not trimmed',
-          alias: 'some {{combination  }}{{ label}} and {{metric}}',
-          label: "some ${PROP('Dim.combination')}${LABEL} and ${PROP('MetricName')}",
-        },
-      ];
-      test.each(cases)('should migrate alias anyway', ({ alias, label }) => {
-        config.featureToggles.cloudWatchDynamicLabels = false;
-        const testQuery = { ...baseQuery, alias: `${alias}` };
-        if (label !== undefined) {
-          testQuery.label = label;
-        }
-        const result = migrateAliasPatterns(testQuery);
-        expect(result.label).toBe(label);
-        expect(result.alias).toBe(alias);
-      });
-    });
   });
 });
diff --git a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
index 8459f146342..5ac0dde4410 100644
--- a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts
@@ -1,7 +1,5 @@
 import { renderHook } from '@testing-library/react';
 
-import { config } from '@grafana/runtime';
-
 import { DEFAULT_METRICS_QUERY } from '../defaultQueries';
 import { CloudWatchMetricsQuery } from '../types';
 
@@ -21,7 +19,6 @@ describe('usePrepareMetricsQuery', () => {
     });
   });
   describe('when query has a label', () => {
-    config.featureToggles.cloudWatchDynamicLabels = true;
     const testQuery: CloudWatchMetricsQuery = { ...DEFAULT_TEST_QUERY, label: 'test' };
     it('should not replace label or trigger onChange', async () => {
       const onChangeQuery = jest.fn();
@@ -30,16 +27,4 @@ describe('usePrepareMetricsQuery', () => {
       expect(onChangeQuery).toHaveBeenCalledTimes(0);
     });
   });
-  // TODO: delete this test when dynamic labels feature flag is removed
-  describe('when dynamic labels feature flag is disabled', () => {
-    const testQuery: CloudWatchMetricsQuery = { ...DEFAULT_TEST_QUERY };
-    it('should replace label or trigger onChange', async () => {
-      const expectedQuery: CloudWatchMetricsQuery = migrateAliasPatterns(testQuery);
-      config.featureToggles.cloudWatchDynamicLabels = false;
-      const onChangeQuery = jest.fn();
-      const { result } = renderHook(() => useMigratedMetricsQuery(testQuery, onChangeQuery));
-      expect(onChangeQuery).toHaveBeenLastCalledWith(result.current);
-      expect(result.current).toEqual(expectedQuery);
-    });
-  });
 });

From 9614dc2446eac438bedb0783654ccf77acb6dae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 2 May 2023 10:51:59 +0200
Subject: [PATCH 573/729] Connections: Simplify connections nav (#66813)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Connections: Simplify connections nav

* rename Connections pages everywhere

---------

Co-authored-by: Miklós Tolnai <miklos.tolnai@grafana.com>
---
 pkg/api/api.go                                |  8 +-
 .../navtree/navtreeimpl/applinks_test.go      | 22 ++---
 pkg/services/navtree/navtreeimpl/navtree.go   | 31 +++----
 .../features/connections/Connections.test.tsx | 65 ++++-----------
 .../app/features/connections/Connections.tsx  | 21 ++---
 .../__mocks__/store.navIndex.mock.ts          | 80 ++++++-------------
 public/app/features/connections/constants.ts  | 17 ++--
 .../hooks/useDataSourceSettingsNav.ts         |  4 +-
 .../pages/AddNewConnectionPage.tsx            | 15 ++++
 .../connections/pages/ConnectDataPage.tsx     | 15 ----
 .../pages/DataSourceDetailsPage.tsx           |  6 +-
 .../connections/pages/DataSourcesListPage.tsx |  2 +-
 .../connections/pages/NewDataSourcePage.tsx   |  2 +-
 .../app/features/connections/pages/index.tsx  |  2 +-
 .../tabs/ConnectData/ConnectData.test.tsx     |  6 +-
 .../tabs/ConnectData/ConnectData.tsx          |  2 +-
 .../NoAccessModal/NoAccessModal.tsx           |  2 +-
 .../components/DataSourceCategories.tsx       |  2 +-
 .../features/plugins/admin/pages/Browse.tsx   |  2 +-
 19 files changed, 112 insertions(+), 192 deletions(-)
 create mode 100644 public/app/features/connections/pages/AddNewConnectionPage.tsx
 delete mode 100644 public/app/features/connections/pages/ConnectDataPage.tsx

diff --git a/pkg/api/api.go b/pkg/api/api.go
index b2b18d19fbb..f8aff7dd331 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -126,11 +126,11 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/plugins/:id/edit", middleware.CanAdminPlugins(hs.Cfg), hs.Index) // deprecated
 	r.Get("/plugins/:id/page/:page", middleware.CanAdminPlugins(hs.Cfg), hs.Index)
 
-	r.Get("/connections/your-connections/datasources", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
-	r.Get("/connections/your-connections/datasources/new", authorize(reqOrgAdmin, datasources.NewPageAccess), hs.Index)
-	r.Get("/connections/your-connections/datasources/edit/*", authorize(reqOrgAdmin, datasources.EditPageAccess), hs.Index)
+	r.Get("/connections/your-datasources", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
+	r.Get("/connections/your-datasources/new", authorize(reqOrgAdmin, datasources.NewPageAccess), hs.Index)
+	r.Get("/connections/your-datasources/edit/*", authorize(reqOrgAdmin, datasources.EditPageAccess), hs.Index)
 	r.Get("/connections", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
-	r.Get("/connections/connect-data", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
+	r.Get("/connections/add-new-connection", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
 	r.Get("/connections/datasources/:id", middleware.CanAdminPlugins(hs.Cfg), hs.Index)
 	r.Get("/connections/datasources/:id/page/:page", middleware.CanAdminPlugins(hs.Cfg), hs.Index)
 
diff --git a/pkg/services/navtree/navtreeimpl/applinks_test.go b/pkg/services/navtree/navtreeimpl/applinks_test.go
index 3fdbc794931..be4a6658fbb 100644
--- a/pkg/services/navtree/navtreeimpl/applinks_test.go
+++ b/pkg/services/navtree/navtreeimpl/applinks_test.go
@@ -93,8 +93,8 @@ func TestAddAppLinks(t *testing.T) {
 					AddToNav: true,
 				},
 				{
-					Name:     "Connect data",
-					Path:     "/connections/connect-data",
+					Name:     "Add new connection",
+					Path:     "/connections/add-new-connection",
 					Type:     "page",
 					AddToNav: false,
 				},
@@ -296,7 +296,7 @@ func TestAddAppLinks(t *testing.T) {
 		service.features = featuremgmt.WithFeatures(featuremgmt.FlagDataConnectionsConsole)
 		service.navigationAppConfig = map[string]NavigationAppConfig{}
 		service.navigationAppPathConfig = map[string]NavigationAppConfig{
-			"/connections/connect-data": {SectionID: "connections"},
+			"/connections/add-new-connection": {SectionID: "connections"},
 		}
 
 		// Build nav-tree and check if the "Connections" page is there
@@ -306,10 +306,10 @@ func TestAddAppLinks(t *testing.T) {
 		require.NotNil(t, connectionsNode)
 		require.Equal(t, "Connections", connectionsNode.Text)
 
-		// Check if the original "Connect data" page (served by core) is there until we add the standalone plugin page
+		// Check if the original "Add new connection" page (served by core) is there until we add the standalone plugin page
 		connectDataNode := connectionsNode.Children[0]
-		require.Equal(t, "Connect data", connectDataNode.Text)
-		require.Equal(t, "connections-connect-data", connectDataNode.Id)
+		require.Equal(t, "Add new connection", connectDataNode.Text)
+		require.Equal(t, "connections-add-new-connection", connectDataNode.Id)
 		require.Equal(t, "", connectDataNode.PluginID)
 
 		// Check if the standalone plugin page appears under the section where we registered it and if it overrides the original page
@@ -317,8 +317,8 @@ func TestAddAppLinks(t *testing.T) {
 
 		require.NoError(t, err)
 		require.Equal(t, "Connections", connectionsNode.Text)
-		require.Equal(t, "Connect data", connectDataNode.Text)
-		require.Equal(t, "standalone-plugin-page-/connections/connect-data", connectDataNode.Id) // Overridden "Connect data" page
+		require.Equal(t, "Add new connection", connectDataNode.Text)
+		require.Equal(t, "standalone-plugin-page-/connections/add-new-connection", connectDataNode.Id) // Overridden "Add new connection" page
 		require.Equal(t, "test-app3", connectDataNode.PluginID)
 
 		// Check if the standalone plugin page does not appear under the app section anymore
@@ -342,12 +342,12 @@ func TestAddAppLinks(t *testing.T) {
 		require.NoError(t, err)
 
 		// The original core page should exist under the section
-		connectDataNode := treeRoot.FindById("connections-connect-data")
-		require.Equal(t, "connections-connect-data", connectDataNode.Id)
+		connectDataNode := treeRoot.FindById("connections-add-new-connection")
+		require.Equal(t, "connections-add-new-connection", connectDataNode.Id)
 		require.Equal(t, "", connectDataNode.PluginID)
 
 		// The standalone plugin page should not be found in the navtree at all (as we didn't configure it)
-		standaloneConnectDataNode := treeRoot.FindById("standalone-plugin-page-/connections/connect-data")
+		standaloneConnectDataNode := treeRoot.FindById("standalone-plugin-page-/connections/add-new-connection")
 		require.Nil(t, standaloneConnectDataNode)
 
 		// Only the pages that have `AddToNav=true` appear under the plugin navigation
diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index b8544cffc3a..09824547154 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -481,29 +481,22 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *contextmodel.ReqContext) *n
 	baseUrl := s.cfg.AppSubURL + "/connections"
 
 	if hasAccess(ac.ReqOrgAdmin, datasources.ConfigurationPageAccess) {
-		// Connect data
+		// Add new connection
 		children = append(children, &navtree.NavLink{
-			Id:        "connections-connect-data",
-			Text:      "Connect data",
-			SubTitle:  "Browse and create new connections",
-			IsSection: true,
-			Url:       s.cfg.AppSubURL + "/connections/connect-data",
-			Children:  []*navtree.NavLink{},
+			Id:       "connections-add-new-connection",
+			Text:     "Add new connection",
+			SubTitle: "Browse and create new connections",
+			Url:      baseUrl + "/add-new-connection",
+			Children: []*navtree.NavLink{},
 		})
 
-		// Your connections
+		// Your data sources
 		children = append(children, &navtree.NavLink{
-			Id:       "connections-your-connections",
-			Text:     "Your connections",
-			SubTitle: "Manage your existing connections",
-			Url:      baseUrl + "/your-connections",
-			// Datasources
-			Children: []*navtree.NavLink{{
-				Id:       "connections-your-connections-datasources",
-				Text:     "Data sources",
-				SubTitle: "View and manage your connected data source connections",
-				Url:      baseUrl + "/your-connections/datasources",
-			}},
+			Id:       "connections-your-datasources",
+			Text:     "Your data sources",
+			SubTitle: "View and manage your connected data source connections",
+			Url:      baseUrl + "/your-datasources",
+			Children: []*navtree.NavLink{},
 		})
 	}
 
diff --git a/public/app/features/connections/Connections.test.tsx b/public/app/features/connections/Connections.test.tsx
index 48a8c52201f..6519280a375 100644
--- a/public/app/features/connections/Connections.test.tsx
+++ b/public/app/features/connections/Connections.test.tsx
@@ -38,56 +38,49 @@ describe('Connections', () => {
     (contextSrv.hasPermission as jest.Mock) = jest.fn().mockReturnValue(true);
   });
 
-  test('shows the "Connect data" page by default', async () => {
+  test('shows the "Add new connection" page by default', async () => {
     renderPage();
 
     // Data sources group
     expect(await screen.findByText('Data sources')).toBeVisible();
 
     // Heading
-    expect(await screen.findByText('Connect data')).toBeVisible();
+    expect(await screen.findByText('Add new connection')).toBeVisible();
     expect(await screen.findByText('Browse and create new connections')).toBeVisible();
   });
 
-  test('shows a landing page for Your connections', async () => {
-    renderPage(ROUTES.YourConnections);
-
-    expect(await screen.findByRole('link', { name: 'Datasources' })).toBeVisible();
-    expect(await screen.findByText('Manage your existing datasource connections')).toBeVisible();
-  });
-
   test('renders the correct tab even if accessing it with a "sub-url"', async () => {
-    renderPage(ROUTES.ConnectData);
+    renderPage(ROUTES.AddNewConnection);
 
-    expect(await screen.findByText('Connect data')).toBeVisible();
+    expect(await screen.findByText('Add new connection')).toBeVisible();
     expect(await screen.findByText('Browse and create new connections')).toBeVisible();
 
     // Should not render the "Your datasources" page
     expect(screen.queryByText('Manage your existing datasource connections')).not.toBeInTheDocument();
   });
 
-  test('renders the core "Connect data" page in case there is no standalone plugin page override for it', async () => {
-    renderPage(ROUTES.ConnectData);
+  test('renders the core "Add new connection" page in case there is no standalone plugin page override for it', async () => {
+    renderPage(ROUTES.AddNewConnection);
 
     // We expect to see no results and "Data sources" as a header (we only have data sources in OSS Grafana at this point)
     expect(await screen.findByText('Data sources')).toBeVisible();
     expect(await screen.findByText('No results matching your query were found.')).toBeVisible();
   });
 
-  test('does not render anything for the "Connect data" page in case it is displayed by a standalone plugin page', async () => {
-    // We are overriding the navIndex to have the "Connect data" page registered by a plugin
+  test('does not render anything for the "Add new connection" page in case it is displayed by a standalone plugin page', async () => {
+    // We are overriding the navIndex to have the "Add new connection" page registered by a plugin
     const standalonePluginPage = {
-      id: 'standalone-plugin-page-/connections/connect-data',
-      text: 'Connect data',
+      id: 'standalone-plugin-page-/connections/add-new-connection',
+      text: 'Add new connection',
       subTitle: 'Browse and create new connections',
-      url: '/connections/connect-data',
+      url: '/connections/add-new-connection',
       pluginId: 'grafana-easystart-app',
     };
 
     const connections = {
       ...navIndex.connections,
       children: navIndex.connections.children?.map((child) => {
-        if (child.id === 'connections-connect-data') {
+        if (child.id === 'connections-add-new-connection') {
           return standalonePluginPage;
         }
 
@@ -100,40 +93,10 @@ describe('Connections', () => {
       plugins: getPluginsStateMock([]),
     });
 
-    renderPage(ROUTES.ConnectData, store);
+    renderPage(ROUTES.AddNewConnection, store);
 
-    // We expect not to see the text that would be rendered by the core "Connect data" page
+    // We expect not to see the text that would be rendered by the core "Add new connection" page
     expect(screen.queryByText('Data sources')).not.toBeInTheDocument();
     expect(screen.queryByText('No results matching your query were found.')).not.toBeInTheDocument();
   });
-
-  test('Your connections redirects to Data sources if it has one child', async () => {
-    const navIndexCopy = {
-      ...navIndex,
-      'connections-your-connections': {
-        id: 'connections-your-connections',
-        text: 'Your connections',
-        subTitle: 'Manage your existing connections',
-        url: '/connections/your-connections',
-        children: [
-          {
-            id: 'connections-your-connections-datasources',
-            text: 'Datasources',
-            subTitle: 'Manage your existing datasource connections',
-            url: '/connections/your-connections/datasources',
-          },
-        ],
-      },
-    };
-
-    const store = configureStore({
-      navIndex: navIndexCopy,
-      plugins: getPluginsStateMock([]),
-    });
-
-    renderPage(ROUTES.YourConnections, store);
-
-    expect(await screen.findByPlaceholderText('Search by name or type')).toBeInTheDocument();
-    expect(await screen.queryByRole('link', { name: 'Datasources' })).toBeNull();
-  });
 });
diff --git a/public/app/features/connections/Connections.tsx b/public/app/features/connections/Connections.tsx
index 1a66576c825..952ed4a73ff 100644
--- a/public/app/features/connections/Connections.tsx
+++ b/public/app/features/connections/Connections.tsx
@@ -1,13 +1,12 @@
 import * as React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 
-import { NavLandingPage } from 'app/core/components/NavLandingPage/NavLandingPage';
 import { DataSourcesRoutesContext } from 'app/features/datasources/state';
 import { StoreState, useSelector } from 'app/types';
 
 import { ROUTES } from './constants';
 import {
-  ConnectDataPage,
+  AddNewConnectionPage,
   DataSourceDashboardsPage,
   DataSourceDetailsPage,
   DataSourcesListPage,
@@ -17,12 +16,7 @@ import {
 
 export default function Connections() {
   const navIndex = useSelector((state: StoreState) => state.navIndex);
-  const isConnectDataPageOverriden = Boolean(navIndex['standalone-plugin-page-/connections/connect-data']);
-
-  const YourConnectionsPage =
-    navIndex['connections-your-connections'].children && navIndex['connections-your-connections'].children?.length > 1
-      ? () => <NavLandingPage navId="connections-your-connections" />
-      : () => <Redirect to={ROUTES.DataSources} />;
+  const isAddNewConnectionPageOverridden = Boolean(navIndex['standalone-plugin-page-/connections/add-new-connection']);
 
   return (
     <DataSourcesRoutesContext.Provider
@@ -34,17 +28,18 @@ export default function Connections() {
       }}
     >
       <Switch>
-        {/* Redirect to "Connect data" by default */}
-        <Route exact sensitive path={ROUTES.Base} component={() => <Redirect to={ROUTES.ConnectData} />} />
-        <Route exact sensitive path={ROUTES.YourConnections} component={YourConnectionsPage} />
+        {/* Redirect to "Add new connection" by default */}
+        <Route exact sensitive path={ROUTES.Base} component={() => <Redirect to={ROUTES.AddNewConnection} />} />
         <Route exact sensitive path={ROUTES.DataSources} component={DataSourcesListPage} />
         <Route exact sensitive path={ROUTES.DataSourcesDetails} component={DataSourceDetailsPage} />
         <Route exact sensitive path={ROUTES.DataSourcesNew} component={NewDataSourcePage} />
         <Route exact sensitive path={ROUTES.DataSourcesEdit} component={EditDataSourcePage} />
         <Route exact sensitive path={ROUTES.DataSourcesDashboards} component={DataSourceDashboardsPage} />
 
-        {/* "Connect data" page - we don't register a route in case a plugin already registers a standalone page for it */}
-        {!isConnectDataPageOverriden && <Route exact sensitive path={ROUTES.ConnectData} component={ConnectDataPage} />}
+        {/* "Add new connection" page - we don't register a route in case a plugin already registers a standalone page for it */}
+        {!isAddNewConnectionPageOverridden && (
+          <Route exact sensitive path={ROUTES.AddNewConnection} component={AddNewConnectionPage} />
+        )}
 
         {/* Not found */}
         <Route component={() => <Redirect to="/notfound" />} />
diff --git a/public/app/features/connections/__mocks__/store.navIndex.mock.ts b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
index d944ccbf3ec..dc3774ad9c9 100644
--- a/public/app/features/connections/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
@@ -229,30 +229,22 @@ export const navIndex: NavIndex = {
     sortWeight: -1300,
     children: [
       {
-        id: 'connections-your-connections',
-        text: 'Your connections',
-        subTitle: 'Manage your existing connections',
-        url: '/connections/your-connections',
-        children: [
-          {
-            id: 'connections-your-connections-datasources',
-            text: 'Datasources',
-            subTitle: 'Manage your existing datasource connections',
-            url: '/connections/your-connections/datasources',
-          },
-          {
-            id: 'standalone-plugin-page-/connections/your-connections/infrastructure',
-            text: 'Infrastructure',
-            url: '/connections/your-connections/infrastructure',
-            pluginId: 'grafana-easystart-app',
-          },
-        ],
+        id: 'connections-add-new-connection',
+        text: 'Add new connection',
+        subTitle: 'Browse and create new connections',
+        url: '/connections/add-new-connection',
       },
       {
-        id: 'connections-connect-data',
-        text: 'Connect data',
-        subTitle: 'Browse and create new connections',
-        url: '/connections/connect-data',
+        id: 'connections-your-datasources',
+        text: 'Your data sources',
+        subTitle: 'Manage your existing datasource connections',
+        url: '/connections/your-datasources',
+      },
+      {
+        id: 'standalone-plugin-page-/connections/your-infrastructure',
+        text: 'Your infrastructure',
+        url: '/connections/your-infrastructure',
+        pluginId: 'grafana-easystart-app',
       },
     ],
     parentItem: {
@@ -263,43 +255,23 @@ export const navIndex: NavIndex = {
       sortWeight: -2000,
     },
   },
-  'connections-your-connections': {
-    id: 'connections-your-connections',
-    text: 'Your connections',
-    subTitle: 'Manage your existing connections',
-    url: '/connections/your-connections',
-    children: [
-      {
-        id: 'connections-your-connections-datasources',
-        text: 'Datasources',
-        subTitle: 'Manage your existing datasource connections',
-        url: '/connections/your-connections/datasources',
-      },
-      {
-        id: 'standalone-plugin-page-/connections/your-connections/infrastructure',
-        text: 'Infrastructure',
-        url: '/connections/your-connections/infrastructure',
-        pluginId: 'grafana-easystart-app',
-      },
-    ],
-  },
-  'connections-your-connections-datasources': {
-    id: 'connections-your-connections-datasources',
-    text: 'Datasources',
+  'connections-your-datasources': {
+    id: 'connections-your-datasources',
+    text: 'Your data sources',
     subTitle: 'Manage your existing datasource connections',
-    url: '/connections/your-connections/datasources',
+    url: '/connections/your-datasources',
   },
-  'standalone-plugin-page-/connections/your-connections/infrastructure': {
-    id: 'standalone-plugin-page-/connections/your-connections/infrastructure',
-    text: 'Infrastructure',
-    url: '/connections/your-connections/infrastructure',
+  'standalone-plugin-page-/connections/your-infrastructure': {
+    id: 'standalone-plugin-page-/connections/your-infrastructure',
+    text: 'Your infrastructure',
+    url: '/connections/your-infrastructure',
     pluginId: 'grafana-easystart-app',
   },
-  'connections-connect-data': {
-    id: 'connections-connect-data',
-    text: 'Connect data',
+  'connections-add-new-connection': {
+    id: 'connections-add-new-connection',
+    text: 'Add new connection',
     subTitle: 'Browse and create new connections',
-    url: '/connections/connect-data',
+    url: '/connections/add-new-connection',
   },
   cfg: {
     id: 'cfg',
diff --git a/public/app/features/connections/constants.ts b/public/app/features/connections/constants.ts
index faa38dfc749..f24f4015c8d 100644
--- a/public/app/features/connections/constants.ts
+++ b/public/app/features/connections/constants.ts
@@ -4,16 +4,13 @@ export const ROUTE_BASE_ID = 'connections';
 export const ROUTES = {
   Base: `/${ROUTE_BASE_ID}`,
 
-  // Your Connections
-  YourConnections: `/${ROUTE_BASE_ID}/your-connections`,
+  // Your Datasources
+  DataSources: `/${ROUTE_BASE_ID}/your-datasources`,
+  DataSourcesNew: `/${ROUTE_BASE_ID}/your-datasources/new`,
+  DataSourcesEdit: `/${ROUTE_BASE_ID}/your-datasources/edit/:uid`,
+  DataSourcesDashboards: `/${ROUTE_BASE_ID}/your-datasources/edit/:uid/dashboards`,
 
-  // Your Connections / Datasources
-  DataSources: `/${ROUTE_BASE_ID}/your-connections/datasources`,
-  DataSourcesNew: `/${ROUTE_BASE_ID}/your-connections/datasources/new`,
-  DataSourcesEdit: `/${ROUTE_BASE_ID}/your-connections/datasources/edit/:uid`,
-  DataSourcesDashboards: `/${ROUTE_BASE_ID}/your-connections/datasources/edit/:uid/dashboards`,
-
-  // Connect Data
-  ConnectData: `/${ROUTE_BASE_ID}/connect-data`,
+  // Add new connection
+  AddNewConnection: `/${ROUTE_BASE_ID}/add-new-connection`,
   DataSourcesDetails: `/${ROUTE_BASE_ID}/datasources/:id`,
 } as const;
diff --git a/public/app/features/connections/hooks/useDataSourceSettingsNav.ts b/public/app/features/connections/hooks/useDataSourceSettingsNav.ts
index cab99f7e016..eb745955dd4 100644
--- a/public/app/features/connections/hooks/useDataSourceSettingsNav.ts
+++ b/public/app/features/connections/hooks/useDataSourceSettingsNav.ts
@@ -23,12 +23,12 @@ export function useDataSourceSettingsNav(pageId?: string) {
     active: true,
     children: (nav.main.children || []).map((navModelItem) => ({
       ...navModelItem,
-      url: navModelItem.url?.replace('datasources/edit/', '/connections/your-connections/datasources/edit/'),
+      url: navModelItem.url?.replace('datasources/edit/', '/connections/your-datasources/edit/'),
     })),
   };
 
   return {
-    navId: 'connections-your-connections-datasources',
+    navId: 'connections-your-datasources',
     pageNav,
   };
 }
diff --git a/public/app/features/connections/pages/AddNewConnectionPage.tsx b/public/app/features/connections/pages/AddNewConnectionPage.tsx
new file mode 100644
index 00000000000..84af4f0ea99
--- /dev/null
+++ b/public/app/features/connections/pages/AddNewConnectionPage.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react';
+
+import { Page } from 'app/core/components/Page/Page';
+
+import { AddNewConnection } from '../tabs/ConnectData';
+
+export function AddNewConnectionPage() {
+  return (
+    <Page navId={'connections-add-new-connection'}>
+      <Page.Contents>
+        <AddNewConnection />
+      </Page.Contents>
+    </Page>
+  );
+}
diff --git a/public/app/features/connections/pages/ConnectDataPage.tsx b/public/app/features/connections/pages/ConnectDataPage.tsx
deleted file mode 100644
index ef8a25d8dbf..00000000000
--- a/public/app/features/connections/pages/ConnectDataPage.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from 'react';
-
-import { Page } from 'app/core/components/Page/Page';
-
-import { ConnectData } from '../tabs/ConnectData';
-
-export function ConnectDataPage() {
-  return (
-    <Page navId={'connections-connect-data'}>
-      <Page.Contents>
-        <ConnectData />
-      </Page.Contents>
-    </Page>
-  );
-}
diff --git a/public/app/features/connections/pages/DataSourceDetailsPage.tsx b/public/app/features/connections/pages/DataSourceDetailsPage.tsx
index 09e7a1795b5..1380efd0a30 100644
--- a/public/app/features/connections/pages/DataSourceDetailsPage.tsx
+++ b/public/app/features/connections/pages/DataSourceDetailsPage.tsx
@@ -8,11 +8,11 @@ import { StoreState, useSelector, AppNotificationSeverity } from 'app/types';
 import { ROUTES } from '../constants';
 
 export function DataSourceDetailsPage() {
-  const overrideNavId = 'standalone-plugin-page-/connections/connect-data';
+  const overrideNavId = 'standalone-plugin-page-/connections/add-new-connection';
   const { id } = useParams<{ id: string }>();
   const navIndex = useSelector((state: StoreState) => state.navIndex);
   const isConnectDataPageOverriden = Boolean(navIndex[overrideNavId]);
-  const navId = isConnectDataPageOverriden ? overrideNavId : 'connections-connect-data'; // The nav id changes (gets a prefix) if it is overriden by a plugin
+  const navId = isConnectDataPageOverriden ? overrideNavId : 'connections-add-new-connection'; // The nav id changes (gets a prefix) if it is overriden by a plugin
 
   return (
     <PluginDetailsPage
@@ -35,7 +35,7 @@ function NotFoundDatasource() {
     <Alert severity={AppNotificationSeverity.Warning} title="">
       Maybe you mistyped the URL or the plugin with the id <Badge text={id} color="orange" /> is unavailable.
       <br />
-      To see a list of available datasources please <a href={ROUTES.ConnectData}>click here</a>.
+      To see a list of available datasources please <a href={ROUTES.AddNewConnection}>click here</a>.
     </Alert>
   );
 }
diff --git a/public/app/features/connections/pages/DataSourcesListPage.tsx b/public/app/features/connections/pages/DataSourcesListPage.tsx
index 394fc16ab2a..bfbe77d44d7 100644
--- a/public/app/features/connections/pages/DataSourcesListPage.tsx
+++ b/public/app/features/connections/pages/DataSourcesListPage.tsx
@@ -11,7 +11,7 @@ export function DataSourcesListPage() {
 
   const actions = dataSourcesCount > 0 ? <DataSourceAddButton /> : undefined;
   return (
-    <Page navId={'connections-your-connections-datasources'} actions={actions}>
+    <Page navId={'connections-your-datasources'} actions={actions}>
       <Page.Contents>
         <DataSourcesList />
       </Page.Contents>
diff --git a/public/app/features/connections/pages/NewDataSourcePage.tsx b/public/app/features/connections/pages/NewDataSourcePage.tsx
index 08c659004e2..b16a6234f6a 100644
--- a/public/app/features/connections/pages/NewDataSourcePage.tsx
+++ b/public/app/features/connections/pages/NewDataSourcePage.tsx
@@ -6,7 +6,7 @@ import { NewDataSource } from 'app/features/datasources/components/NewDataSource
 export function NewDataSourcePage() {
   return (
     <Page
-      navId={'connections-your-connections-datasources'}
+      navId={'connections-your-datasources'}
       pageNav={{ text: 'Add data source', subTitle: 'Choose a data source type', active: true }}
     >
       <Page.Contents>
diff --git a/public/app/features/connections/pages/index.tsx b/public/app/features/connections/pages/index.tsx
index 1fdd3106fc5..64d2ec896ec 100644
--- a/public/app/features/connections/pages/index.tsx
+++ b/public/app/features/connections/pages/index.tsx
@@ -1,4 +1,4 @@
-export { ConnectDataPage } from './ConnectDataPage';
+export { AddNewConnectionPage } from './AddNewConnectionPage';
 export { DataSourceDetailsPage } from './DataSourceDetailsPage';
 export { DataSourcesListPage } from './DataSourcesListPage';
 export { DataSourceDashboardsPage } from './DataSourceDashboardsPage';
diff --git a/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx b/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx
index f726b80774a..9c1a89f4d45 100644
--- a/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx
+++ b/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx
@@ -9,7 +9,7 @@ import { CatalogPlugin } from 'app/features/plugins/admin/types';
 import { configureStore } from 'app/store/configureStore';
 import { AccessControlAction } from 'app/types';
 
-import { ConnectData } from './ConnectData';
+import { AddNewConnection } from './ConnectData';
 
 jest.mock('app/features/datasources/api');
 
@@ -19,7 +19,7 @@ const renderPage = (plugins: CatalogPlugin[] = []): RenderResult => {
 
   return render(
     <Provider store={store}>
-      <ConnectData />
+      <AddNewConnection />
     </Provider>
   );
 };
@@ -32,7 +32,7 @@ const mockCatalogDataSourcePlugin = getCatalogPluginMock({
 
 const originalHasPermission = contextSrv.hasPermission;
 
-describe('Connect Data', () => {
+describe('Add new connection', () => {
   beforeEach(() => {
     contextSrv.hasPermission = originalHasPermission;
   });
diff --git a/public/app/features/connections/tabs/ConnectData/ConnectData.tsx b/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
index 64090c47740..52e2ac97b0f 100644
--- a/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
+++ b/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
@@ -27,7 +27,7 @@ const getStyles = () => ({
   `,
 });
 
-export function ConnectData() {
+export function AddNewConnection() {
   const [searchTerm, setSearchTerm] = useState('');
   const [isNoAccessModalOpen, setIsNoAccessModalOpen] = useState(false);
   const [focusedItem, setFocusedItem] = useState<CardGridItem | null>(null);
diff --git a/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx b/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx
index c705162bcb1..e386f7b5a1f 100644
--- a/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx
+++ b/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx
@@ -91,7 +91,7 @@ export function NoAccessModal({ item, isOpen, onDismiss }: NoAccessModalProps) {
           <div>
             <p>
               Editors cannot add new connections. You may check to see if it is already configured in{' '}
-              <a href="/connections/your-connections">Your Connections</a>.
+              <a href="/connections/your-datasources">Your data sources</a>.
             </p>
             <p>To add a new connection, contact your Grafana admin.</p>
           </div>
diff --git a/public/app/features/datasources/components/DataSourceCategories.tsx b/public/app/features/datasources/components/DataSourceCategories.tsx
index 812dcfdbe65..c6b84fcdf5e 100644
--- a/public/app/features/datasources/components/DataSourceCategories.tsx
+++ b/public/app/features/datasources/components/DataSourceCategories.tsx
@@ -19,7 +19,7 @@ export type Props = {
 
 export function DataSourceCategories({ categories, onClickDataSourceType }: Props) {
   const moreDataSourcesLink = config.featureToggles.dataConnectionsConsole
-    ? `${ROUTES.ConnectData}?cat=data-source`
+    ? `${ROUTES.AddNewConnection}?cat=data-source`
     : '/plugins?filterBy=all&filterByType=datasource&utm_source=grafana_add_ds';
 
   return (
diff --git a/public/app/features/plugins/admin/pages/Browse.tsx b/public/app/features/plugins/admin/pages/Browse.tsx
index f6996282216..8a78fc20c4d 100644
--- a/public/app/features/plugins/admin/pages/Browse.tsx
+++ b/public/app/features/plugins/admin/pages/Browse.tsx
@@ -67,7 +67,7 @@ export default function Browse({ route }: GrafanaRouteComponentProps): ReactElem
   const subTitle = config.featureToggles.dataConnectionsConsole ? (
     <div>
       Extend the Grafana experience with panel plugins and apps. To find more data sources go to{' '}
-      <a className="external-link" href={`${CONNECTIONS_ROUTES.ConnectData}?cat=data-source`}>
+      <a className="external-link" href={`${CONNECTIONS_ROUTES.AddNewConnection}?cat=data-source`}>
         Connections
       </a>
       .

From 15d41698138f250b85ccd423f2f252dea7cf3c93 Mon Sep 17 00:00:00 2001
From: Domas <domasx2@gmail.com>
Date: Tue, 2 May 2023 12:10:56 +0300
Subject: [PATCH 574/729] Frontend logging: Remove Sentry javascript agent
 support (#67493)

* remove Sentry

* fix sourcemap resolve
---
 .github/renovate.json5                        |   6 -
 conf/defaults.ini                             |  11 +-
 conf/sample.ini                               |  15 +-
 .../setup-grafana/configure-grafana/_index.md |  20 +-
 go.mod                                        |   1 -
 go.sum                                        |   4 -
 package.json                                  |   3 -
 packages/grafana-data/src/types/config.ts     |  13 -
 packages/grafana-runtime/package.json         |   1 -
 packages/grafana-runtime/src/config.ts        |   6 -
 .../grafana-runtime/src/services/EchoSrv.ts   |   1 -
 packages/grafana-runtime/src/utils/logging.ts |  41 +--
 packages/grafana-ui/package.json              |   1 -
 .../ErrorBoundary/ErrorBoundary.test.tsx      |  11 +-
 .../ErrorBoundary/ErrorBoundary.tsx           |   2 -
 pkg/api/dtos/frontend_settings.go             |   1 -
 pkg/api/dtos/index.go                         |   2 -
 pkg/api/frontend_logging.go                   |  76 +----
 pkg/api/frontend_logging_test.go              | 290 +-----------------
 .../grafana_javascript_agent.go               |   2 +
 .../grafana_javascript_agent_sourcemaps.go    |  30 +-
 pkg/api/frontendlogging/sentry.go             | 108 -------
 pkg/api/frontendlogging/source_maps.go        |   9 +-
 pkg/api/frontendsettings.go                   |   1 -
 pkg/api/index.go                              |   1 -
 pkg/setting/setting.go                        |   4 -
 .../setting_grafana_javascript_agent.go       |  21 +-
 pkg/setting/setting_sentry.go                 |  28 --
 public/app/app.ts                             |  10 -
 public/app/core/services/echo/EchoSrv.ts      |   8 +-
 .../backends/sentry/SentryBackend.test.ts     | 143 ---------
 .../echo/backends/sentry/SentryBackend.ts     |  66 ----
 .../CustomEndpointTransport.test.ts           | 133 --------
 .../transports/CustomEndpointTransport.ts     | 151 ---------
 .../sentry/transports/EchoSrvTransport.ts     |  26 --
 .../services/echo/backends/sentry/types.ts    |  16 -
 .../features/alerting/unified/Analytics.ts    |   2 +-
 yarn.lock                                     |  71 +----
 38 files changed, 47 insertions(+), 1288 deletions(-)
 delete mode 100644 pkg/api/frontendlogging/sentry.go
 delete mode 100644 pkg/setting/setting_sentry.go
 delete mode 100644 public/app/core/services/echo/backends/sentry/SentryBackend.test.ts
 delete mode 100644 public/app/core/services/echo/backends/sentry/SentryBackend.ts
 delete mode 100644 public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.test.ts
 delete mode 100644 public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.ts
 delete mode 100644 public/app/core/services/echo/backends/sentry/transports/EchoSrvTransport.ts
 delete mode 100644 public/app/core/services/echo/backends/sentry/types.ts

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 83033b38060..bdb71164b90 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -16,12 +16,6 @@
     "systemjs",
     "ts-loader", // we should remove ts-loader and use babel-loader instead
     "ora", // we should bump this once we move to esm modules
-
-    // Sentry deprecated in favor of Grafana Faro for frontend logging.
-    // Major effort required to upgrade to latest Sentry, not worthwhile
-    "@sentry/browser",
-    "@sentry/types",
-    "@sentry/utils",
   ],
   "includePaths": ["package.json", "packages/**"],
   "ignorePaths": ["packages/grafana-toolkit/package.json", "emails/**", "plugins-bundled/**", "**/mocks/**"],
diff --git a/conf/defaults.ini b/conf/defaults.ini
index 3e585172afb..0176519d9e1 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -872,21 +872,12 @@ facility =
 tag =
 
 [log.frontend]
-# Should Sentry javascript agent be initialized
+# Should Faro javascript agent be initialized
 enabled = false
 
-# Defines which provider to use sentry or grafana
-provider = sentry
-
-# Sentry DSN if you want to send events to Sentry.
-sentry_dsn =
-
 # Custom HTTP endpoint to send events to. Default will log the events to stdout.
 custom_endpoint =
 
-# Rate of events to be reported to Sentry between 0 (none) and 1 (all), float
-sample_rate = 1.0
-
 # Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint (/log).
 log_endpoint_requests_per_second_limit = 3
 
diff --git a/conf/sample.ini b/conf/sample.ini
index ced98a3a829..29bf51e332b 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -844,20 +844,11 @@
 ;tag =
 
 [log.frontend]
-# Should Sentry javascript agent be initialized
+# Should Faro javascript agent be initialized
 ;enabled = false
 
-# Defines which provider to use, default is Sentry
-;provider = sentry
-
-# Sentry DSN if you want to send events to Sentry.
-;sentry_dsn =
-
-# Custom HTTP endpoint to send events captured by the Sentry agent to. Default will log the events to stdout.
-;custom_endpoint = /log
-
-# Rate of events to be reported between 0 (none) and 1 (all), float
-;sample_rate = 1.0
+# Custom HTTP endpoint to send events to. Default will log the events to stdout.
+;custom_endpoint = /log-grafana-javascript-agent
 
 # Requests per second limit enforced an extended period, for Grafana backend log ingestion endpoint (/log).
 ;log_endpoint_requests_per_second_limit = 3
diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md
index 13b190a52b9..7eb24453425 100644
--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -1284,31 +1284,19 @@ Syslog tag. By default, the process's `argv[0]` is used.
 
 ### enabled
 
-Sentry javascript agent is initialized. Default is `false`.
-
-### provider
-
-Defines which provider to use `sentry` or `grafana`. Default is `sentry`
-
-### sentry_dsn
-
-Sentry DSN if you want to send events to Sentry
+Faro javascript agent is initialized. Default is `false`.
 
 ### custom_endpoint
 
-Custom HTTP endpoint to send events captured by the Sentry agent to. Default, `/log`, will log the events to stdout.
-
-### sample_rate
-
-Rate of events to be reported between `0` (none) and `1` (all, default), float.
+Custom HTTP endpoint to send events captured by the Faro agent to. Default, `/log-grafana-javascript-agent`, will log the events to stdout.
 
 ### log_endpoint_requests_per_second_limit
 
-Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint, `/log`. Default is `3`.
+Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint, `/log-grafana-javascript-agent`. Default is `3`.
 
 ### log_endpoint_burst_limit
 
-Maximum requests accepted per short interval of time for Grafana backend log ingestion endpoint, `/log`. Default is `15`.
+Maximum requests accepted per short interval of time for Grafana backend log ingestion endpoint, `/log-grafana-javascript-agent`. Default is `15`.
 
 ### instrumentations_errors_enabled
 
diff --git a/go.mod b/go.mod
index fe506135986..fb604764e12 100644
--- a/go.mod
+++ b/go.mod
@@ -40,7 +40,6 @@ require (
 	github.com/crewjam/saml v0.4.12
 	github.com/fatih/color v1.15.0
 	github.com/gchaincl/sqlhooks v1.3.0
-	github.com/getsentry/sentry-go v0.13.0
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/go-ldap/ldap/v3 v3.4.4
 	github.com/go-openapi/strfmt v0.21.7
diff --git a/go.sum b/go.sum
index d60b20df894..a53bba85ff9 100644
--- a/go.sum
+++ b/go.sum
@@ -801,8 +801,6 @@ github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebK
 github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
 github.com/getkin/kin-openapi v0.115.0 h1:c8WHRLVY3G8m9jQTy0/DnIuljgRwTCB5twZytQS4JyU=
 github.com/getkin/kin-openapi v0.115.0/go.mod h1:l5e9PaFUo9fyLJCPGQeXI2ML8c3P8BHOEV2VaAVf/pc=
-github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
-github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
@@ -822,7 +820,6 @@ github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF
 github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
@@ -1962,7 +1959,6 @@ github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
 github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
diff --git a/package.json b/package.json
index 0c1adddfd61..b3ac921b2f2 100644
--- a/package.json
+++ b/package.json
@@ -287,9 +287,6 @@
     "@react-stately/tree": "3.3.1",
     "@reduxjs/toolkit": "1.9.3",
     "@remix-run/router": "^1.5.0",
-    "@sentry/browser": "6.19.7",
-    "@sentry/types": "6.19.7",
-    "@sentry/utils": "6.19.7",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/react-resizable": "3.0.3",
     "@types/trusted-types": "2.0.3",
diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index d7ac6a94760..7331280cc1a 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -46,18 +46,6 @@ export interface LicenseInfo {
   trialExpiry?: number;
 }
 
-/**
- * Describes Sentry integration config
- *
- * @public
- */
-export interface SentryConfig {
-  enabled: boolean;
-  dsn: string;
-  customEndpoint: string;
-  sampleRate: number;
-}
-
 /**
  * Describes GrafanaJavascriptAgentConfig integration config
  *
@@ -209,7 +197,6 @@ export interface GrafanaConfig {
   licenseInfo: LicenseInfo;
   http2Enabled: boolean;
   dateFormats?: SystemDateFormatSettings;
-  sentry: SentryConfig;
   grafanaJavascriptAgent: GrafanaJavascriptAgentConfig;
   customTheme?: any;
   geomapDefaultBaseLayer?: MapLayerOptions;
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index aa97f210716..8d8cd121b1c 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -41,7 +41,6 @@
     "@grafana/e2e-selectors": "10.1.0-pre",
     "@grafana/faro-web-sdk": "1.0.2",
     "@grafana/ui": "10.1.0-pre",
-    "@sentry/browser": "6.19.7",
     "history": "4.10.1",
     "lodash": "4.17.21",
     "rxjs": "7.8.0",
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index 0f232e2408f..39748fd3546 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -103,12 +103,6 @@ export class GrafanaBootConfig implements GrafanaConfig {
   supportBundlesEnabled = false;
   http2Enabled = false;
   dateFormats?: SystemDateFormatSettings;
-  sentry = {
-    enabled: false,
-    dsn: '',
-    customEndpoint: '',
-    sampleRate: 1,
-  };
   grafanaJavascriptAgent = {
     enabled: false,
     customEndpoint: '',
diff --git a/packages/grafana-runtime/src/services/EchoSrv.ts b/packages/grafana-runtime/src/services/EchoSrv.ts
index 4bde55d82ac..d2dc93920d3 100644
--- a/packages/grafana-runtime/src/services/EchoSrv.ts
+++ b/packages/grafana-runtime/src/services/EchoSrv.ts
@@ -78,7 +78,6 @@ export interface EchoEvent<T extends EchoEventType = any, P = any> {
 export enum EchoEventType {
   Performance = 'performance',
   MetaAnalytics = 'meta-analytics',
-  Sentry = 'sentry',
   Pageview = 'pageview',
   Interaction = 'interaction',
   ExperimentView = 'experimentview',
diff --git a/packages/grafana-runtime/src/utils/logging.ts b/packages/grafana-runtime/src/utils/logging.ts
index 5443f264cba..a6c26c717dd 100644
--- a/packages/grafana-runtime/src/utils/logging.ts
+++ b/packages/grafana-runtime/src/utils/logging.ts
@@ -1,76 +1,54 @@
-import { captureMessage, captureException, Severity as LogLevel } from '@sentry/browser';
-
-import { faro, LogLevel as GrafanaLogLevel } from '@grafana/faro-web-sdk';
+import { faro, LogLevel } from '@grafana/faro-web-sdk';
 
 import { config } from '../config';
 
 export { LogLevel };
 
-// a bit stricter than what Sentry allows
 type Contexts = Record<string, Record<string, number | string | Record<string, string | number>>>;
 
 /**
- * Log a message at INFO level. Depending on configuration might be forwarded to backend and logged to stdout or sent to Sentry
- *
+ * Log a message at INFO level
  * @public
  */
 export function logInfo(message: string, contexts?: Contexts) {
   if (config.grafanaJavascriptAgent.enabled) {
     faro.api.pushLog([message], {
-      level: GrafanaLogLevel.INFO,
+      level: LogLevel.INFO,
       context: contexts,
     });
   }
-  if (config.sentry.enabled) {
-    captureMessage(message, {
-      level: LogLevel.Info,
-      contexts,
-    });
-  }
 }
 
 /**
- * Log a message at WARNING level. Depending on configuration might be forwarded to backend and logged to stdout or sent to Sentry
+ * Log a message at WARNING level
  *
  * @public
  */
 export function logWarning(message: string, contexts?: Contexts) {
   if (config.grafanaJavascriptAgent.enabled) {
     faro.api.pushLog([message], {
-      level: GrafanaLogLevel.WARN,
+      level: LogLevel.WARN,
       context: contexts,
     });
   }
-  if (config.sentry.enabled) {
-    captureMessage(message, {
-      level: LogLevel.Warning,
-      contexts,
-    });
-  }
 }
 
 /**
- * Log a message at DEBUG level. Depending on configuration might be forwarded to backend and logged to stdout or sent to Sentry
+ * Log a message at DEBUG level
  *
  * @public
  */
 export function logDebug(message: string, contexts?: Contexts) {
   if (config.grafanaJavascriptAgent.enabled) {
     faro.api.pushLog([message], {
-      level: GrafanaLogLevel.DEBUG,
+      level: LogLevel.DEBUG,
       context: contexts,
     });
   }
-  if (config.sentry.enabled) {
-    captureMessage(message, {
-      level: LogLevel.Debug,
-      contexts,
-    });
-  }
 }
 
 /**
- * Log an error. Depending on configuration might be forwarded to backend and logged to stdout or sent to Sentry
+ * Log an error
  *
  * @public
  */
@@ -78,7 +56,4 @@ export function logError(err: Error, contexts?: Contexts) {
   if (config.grafanaJavascriptAgent.enabled) {
     faro.api.pushError(err);
   }
-  if (config.sentry.enabled) {
-    captureException(err, { contexts });
-  }
 }
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index ccb8b3027f3..1acc87faa7e 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -63,7 +63,6 @@
     "@react-aria/overlays": "3.10.1",
     "@react-aria/utils": "3.13.1",
     "@react-stately/menu": "3.4.1",
-    "@sentry/browser": "6.19.7",
     "ansicolor": "1.1.100",
     "calculate-size": "1.1.1",
     "classnames": "2.3.2",
diff --git a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx
index df5241e46de..d2af63af611 100644
--- a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx
+++ b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx
@@ -1,4 +1,3 @@
-import { captureException } from '@sentry/browser';
 import { render, screen } from '@testing-library/react';
 import React, { FC } from 'react';
 
@@ -6,7 +5,6 @@ import { faro } from '@grafana/faro-web-sdk';
 
 import { ErrorBoundary } from './ErrorBoundary';
 
-jest.mock('@sentry/browser');
 jest.mock('@grafana/faro-web-sdk', () => ({
   faro: {
     api: {
@@ -31,7 +29,7 @@ describe('ErrorBoundary', () => {
     consoleSpy.mockRestore();
   });
 
-  it('should catch error and report it to sentry, including react component stack in context', async () => {
+  it('should catch error and report it to Faro', async () => {
     const problem = new Error('things went terribly wrong');
     render(
       <ErrorBoundary>
@@ -46,13 +44,6 @@ describe('ErrorBoundary', () => {
     );
 
     await screen.findByText(problem.message);
-    expect(captureException).toHaveBeenCalledTimes(1);
-    const [error, context] = (captureException as jest.Mock).mock.calls[0];
-    expect(error).toBe(problem);
-    expect(context).toHaveProperty('contexts');
-    expect(context.contexts).toHaveProperty('react');
-    expect(context.contexts.react).toHaveProperty('componentStack');
-    expect(context.contexts.react.componentStack).toMatch(/^\s+at ErrorThrower (.*)\s+at ErrorBoundary (.*)\s*$/);
     expect(faro.api.pushError).toHaveBeenCalledTimes(1);
     expect((faro.api.pushError as jest.Mock).mock.calls[0][0]).toBe(problem);
   });
diff --git a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx
index 2afe61423cc..808ed22c4ca 100644
--- a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx
+++ b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx
@@ -1,4 +1,3 @@
-import { captureException } from '@sentry/browser';
 import React, { PureComponent, ReactNode, ComponentType } from 'react';
 
 import { faro } from '@grafana/faro-web-sdk';
@@ -38,7 +37,6 @@ export class ErrorBoundary extends PureComponent<Props, State> {
   };
 
   componentDidCatch(error: Error, errorInfo: ErrorInfo) {
-    captureException(error, { contexts: { react: { componentStack: errorInfo.componentStack } } });
     faro?.api?.pushError(error);
     this.setState({ error, errorInfo });
 
diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go
index 38722a511e3..cf46d35bbed 100644
--- a/pkg/api/dtos/frontend_settings.go
+++ b/pkg/api/dtos/frontend_settings.go
@@ -185,7 +185,6 @@ type FrontendSettingsDTO struct {
 	RendererVersion                  string                         `json:"rendererVersion"`
 	SecretsManagerPluginEnabled      bool                           `json:"secretsManagerPluginEnabled"`
 	Http2Enabled                     bool                           `json:"http2Enabled"`
-	Sentry                           setting.Sentry                 `json:"sentry"`
 	GrafanaJavascriptAgent           setting.GrafanaJavascriptAgent `json:"grafanaJavascriptAgent"`
 	PluginCatalogURL                 string                         `json:"pluginCatalogURL"`
 	PluginAdminEnabled               bool                           `json:"pluginAdminEnabled"`
diff --git a/pkg/api/dtos/index.go b/pkg/api/dtos/index.go
index 1a25f45a796..99ffc5de835 100644
--- a/pkg/api/dtos/index.go
+++ b/pkg/api/dtos/index.go
@@ -4,7 +4,6 @@ import (
 	"html/template"
 
 	"github.com/grafana/grafana/pkg/services/navtree"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 type IndexViewData struct {
@@ -27,7 +26,6 @@ type IndexViewData struct {
 	FavIcon                             template.URL
 	AppleTouchIcon                      template.URL
 	AppTitle                            string
-	Sentry                              *setting.Sentry
 	ContentDeliveryURL                  string
 	LoadingLogo                         template.URL
 	CSPContent                          string
diff --git a/pkg/api/frontend_logging.go b/pkg/api/frontend_logging.go
index 4d69efc14be..470a77cb4e0 100644
--- a/pkg/api/frontend_logging.go
+++ b/pkg/api/frontend_logging.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/getsentry/sentry-go"
 	"golang.org/x/time/rate"
 
 	"github.com/grafana/grafana/pkg/api/frontendlogging"
@@ -16,51 +15,8 @@ var frontendLogger = log.New("frontend")
 
 type frontendLogMessageHandler func(hs *HTTPServer, c *web.Context)
 
-const sentryLogEndpointPath = "/log"
 const grafanaJavascriptAgentEndpointPath = "/log-grafana-javascript-agent"
 
-/** @deprecated will be removed in the next major version */
-func NewFrontendLogMessageHandler(store *frontendlogging.SourceMapStore) frontendLogMessageHandler {
-	return func(hs *HTTPServer, c *web.Context) {
-		event := frontendlogging.FrontendSentryEvent{}
-		if err := web.Bind(c.Req, &event); err != nil {
-			c.Resp.WriteHeader(http.StatusBadRequest)
-			_, err = c.Resp.Write([]byte("bad request data"))
-			if err != nil {
-				hs.log.Error("could not write to response", "err", err)
-			}
-			return
-		}
-
-		var msg = "unknown"
-
-		if len(event.Message) > 0 {
-			msg = event.Message
-		} else if event.Exception != nil && len(event.Exception.Values) > 0 {
-			msg = event.Exception.Values[0].FmtMessage()
-		}
-
-		var ctx = event.ToLogContext(store)
-
-		switch event.Level {
-		case sentry.LevelError:
-			frontendLogger.Error(msg, ctx...)
-		case sentry.LevelWarning:
-			frontendLogger.Warn(msg, ctx...)
-		case sentry.LevelDebug:
-			frontendLogger.Debug(msg, ctx...)
-		default:
-			frontendLogger.Info(msg, ctx...)
-		}
-
-		c.Resp.WriteHeader(http.StatusAccepted)
-		_, err := c.Resp.Write([]byte("OK"))
-		if err != nil {
-			hs.log.Error("could not write to response", "err", err)
-		}
-	}
-}
-
 func GrafanaJavascriptAgentLogMessageHandler(store *frontendlogging.SourceMapStore) frontendLogMessageHandler {
 	return func(hs *HTTPServer, c *web.Context) {
 		event := frontendlogging.FrontendGrafanaJavascriptAgentEvent{}
@@ -143,9 +99,9 @@ func GrafanaJavascriptAgentLogMessageHandler(store *frontendlogging.SourceMapSto
 // this is to avoid reporting errors in case config was changes but there are browser
 // sessions still open with older config
 func (hs *HTTPServer) frontendLogEndpoints() web.Handler {
-	if !(hs.Cfg.GrafanaJavascriptAgent.Enabled || hs.Cfg.Sentry.Enabled) {
+	if !(hs.Cfg.GrafanaJavascriptAgent.Enabled) {
 		return func(ctx *web.Context) {
-			if ctx.Req.Method == http.MethodPost && (ctx.Req.URL.Path == sentryLogEndpointPath || ctx.Req.URL.Path == grafanaJavascriptAgentEndpointPath) {
+			if ctx.Req.Method == http.MethodPost && ctx.Req.URL.Path == grafanaJavascriptAgentEndpointPath {
 				ctx.Resp.WriteHeader(http.StatusAccepted)
 				_, err := ctx.Resp.Write([]byte("OK"))
 				if err != nil {
@@ -156,33 +112,11 @@ func (hs *HTTPServer) frontendLogEndpoints() web.Handler {
 	}
 
 	sourceMapStore := frontendlogging.NewSourceMapStore(hs.Cfg, hs.pluginStaticRouteResolver, frontendlogging.ReadSourceMapFromFS)
-
-	var rateLimiter *rate.Limiter
-	var handler frontendLogMessageHandler
-	handlerEndpoint := ""
-	dummyEndpoint := ""
-
-	if hs.Cfg.GrafanaJavascriptAgent.Enabled {
-		rateLimiter = rate.NewLimiter(rate.Limit(hs.Cfg.GrafanaJavascriptAgent.EndpointRPS), hs.Cfg.GrafanaJavascriptAgent.EndpointBurst)
-		handler = GrafanaJavascriptAgentLogMessageHandler(sourceMapStore)
-		handlerEndpoint = grafanaJavascriptAgentEndpointPath
-		dummyEndpoint = sentryLogEndpointPath
-	} else {
-		rateLimiter = rate.NewLimiter(rate.Limit(hs.Cfg.Sentry.EndpointRPS), hs.Cfg.Sentry.EndpointBurst)
-		handler = NewFrontendLogMessageHandler(sourceMapStore)
-		handlerEndpoint = sentryLogEndpointPath
-		dummyEndpoint = grafanaJavascriptAgentEndpointPath
-	}
+	rateLimiter := rate.NewLimiter(rate.Limit(hs.Cfg.GrafanaJavascriptAgent.EndpointRPS), hs.Cfg.GrafanaJavascriptAgent.EndpointBurst)
+	handler := GrafanaJavascriptAgentLogMessageHandler(sourceMapStore)
 
 	return func(ctx *web.Context) {
-		if ctx.Req.Method == http.MethodPost && ctx.Req.URL.Path == dummyEndpoint {
-			ctx.Resp.WriteHeader(http.StatusAccepted)
-			_, err := ctx.Resp.Write([]byte("OK"))
-			if err != nil {
-				hs.log.Error("could not write to response", "err", err)
-			}
-		}
-		if ctx.Req.Method == http.MethodPost && ctx.Req.URL.Path == handlerEndpoint {
+		if ctx.Req.Method == http.MethodPost && ctx.Req.URL.Path == grafanaJavascriptAgentEndpointPath {
 			if !rateLimiter.AllowN(time.Now(), 1) {
 				ctx.Resp.WriteHeader(http.StatusTooManyRequests)
 				return
diff --git a/pkg/api/frontend_logging_test.go b/pkg/api/frontend_logging_test.go
index 5771bb4465c..f20687481fd 100644
--- a/pkg/api/frontend_logging_test.go
+++ b/pkg/api/frontend_logging_test.go
@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/getsentry/sentry-go"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/stretchr/testify/assert"
@@ -30,79 +29,6 @@ type SourceMapReadRecord struct {
 
 type logScenarioFunc func(c *scenarioContext, logs map[string]interface{}, sourceMapReads []SourceMapReadRecord)
 
-func logSentryEventScenario(t *testing.T, desc string, event frontendlogging.FrontendSentryEvent, fn logScenarioFunc) {
-	t.Run(desc, func(t *testing.T) {
-		var logcontent = make(map[string]interface{})
-		logcontent["logger"] = "frontend"
-		newfrontendLogger := log.Logger(log.LoggerFunc(func(keyvals ...interface{}) error {
-			for i := 0; i < len(keyvals); i += 2 {
-				logcontent[keyvals[i].(string)] = keyvals[i+1]
-			}
-			return nil
-		}))
-
-		origHandler := frontendLogger.GetLogger()
-		frontendLogger.Swap(level.NewFilter(newfrontendLogger, level.AllowInfo()))
-		sourceMapReads := []SourceMapReadRecord{}
-
-		t.Cleanup(func() {
-			frontendLogger.Swap(origHandler)
-		})
-
-		sc := setupScenarioContext(t, "/log")
-
-		cdnRootURL, e := url.Parse("https://storage.googleapis.com/grafana-static-assets")
-		require.NoError(t, e)
-
-		cfg := &setting.Cfg{
-			StaticRootPath: "/staticroot",
-			CDNRootURL:     cdnRootURL,
-		}
-
-		readSourceMap := func(dir string, path string) ([]byte, error) {
-			sourceMapReads = append(sourceMapReads, SourceMapReadRecord{
-				dir:  dir,
-				path: path,
-			})
-			if strings.Contains(path, "error") {
-				return nil, errors.New("epic hard drive failure")
-			}
-			if strings.HasSuffix(path, "foo.js.map") {
-				f, err := os.ReadFile("./frontendlogging/test-data/foo.js.map")
-				require.NoError(t, err)
-				return f, nil
-			}
-			return nil, os.ErrNotExist
-		}
-
-		// fake plugin route so we will try to find a source map there
-		pm := fakePluginStaticRouteResolver{
-			routes: []*plugins.StaticRoute{
-				{
-					Directory: "/usr/local/telepathic-panel",
-					PluginID:  "telepathic",
-				},
-			},
-		}
-
-		sourceMapStore := frontendlogging.NewSourceMapStore(cfg, &pm, readSourceMap)
-
-		loggingHandler := NewFrontendLogMessageHandler(sourceMapStore)
-
-		handler := routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
-			sc.context = c
-			c.Req.Body = mockRequestBody(event)
-			c.Req.Header.Add("Content-Type", "application/json")
-			loggingHandler(nil, c.Context)
-			return response.Success("ok")
-		})
-
-		sc.m.Post(sc.url, handler)
-		sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
-		fn(sc, logcontent, sourceMapReads)
-	})
-}
-
 func logGrafanaJavascriptAgentEventScenario(t *testing.T, desc string, event frontendlogging.FrontendGrafanaJavascriptAgentEvent, fn logScenarioFunc) {
 	t.Run(desc, func(t *testing.T) {
 		var logcontent = make(map[string]interface{})
@@ -176,216 +102,6 @@ func logGrafanaJavascriptAgentEventScenario(t *testing.T, desc string, event fro
 	})
 }
 
-func TestFrontendLoggingEndpointSentry(t *testing.T) {
-	ts, err := time.Parse("2006-01-02T15:04:05.000Z", "2020-10-22T06:29:29.078Z")
-	require.NoError(t, err)
-
-	t.Run("FrontendLoggingEndpoint", func(t *testing.T) {
-		request := sentry.Request{
-			URL: "http://localhost:3000/",
-			Headers: map[string]string{
-				"User-Agent": "Chrome",
-			},
-		}
-
-		user := sentry.User{
-			Email: "geralt@kaermorhen.com",
-			ID:    "45",
-		}
-
-		event := sentry.Event{
-			EventID:   "123",
-			Level:     sentry.LevelError,
-			Request:   &request,
-			Timestamp: ts,
-		}
-
-		errorEvent := frontendlogging.FrontendSentryEvent{
-			Event: &event,
-			Exception: &frontendlogging.FrontendSentryException{
-				Values: []frontendlogging.FrontendSentryExceptionValue{
-					{
-						Type:  "UserError",
-						Value: "Please replace user and try again",
-						Stacktrace: sentry.Stacktrace{
-							Frames: []sentry.Frame{
-								{
-									Function: "foofn",
-									Filename: "foo.js",
-									Lineno:   123,
-									Colno:    23,
-								},
-								{
-									Function: "barfn",
-									Filename: "bar.js",
-									Lineno:   113,
-									Colno:    231,
-								},
-							},
-						},
-					},
-				},
-			},
-		}
-
-		logSentryEventScenario(t, "Should log received error event", errorEvent,
-			func(sc *scenarioContext, logs map[string]interface{}, sourceMapReads []SourceMapReadRecord) {
-				assert.Equal(t, http.StatusAccepted, sc.resp.Code)
-				assertContextContains(t, logs, "logger", "frontend")
-				assertContextContains(t, logs, "url", errorEvent.Request.URL)
-				assertContextContains(t, logs, "user_agent", errorEvent.Request.Headers["User-Agent"])
-				assertContextContains(t, logs, "event_id", errorEvent.EventID)
-				assertContextContains(t, logs, "original_timestamp", errorEvent.Timestamp)
-				assertContextContains(t, logs, "stacktrace", `UserError: Please replace user and try again
-  at foofn (foo.js:123:23)
-  at barfn (bar.js:113:231)`)
-				assert.NotContains(t, logs, "context")
-			})
-
-		messageEvent := frontendlogging.FrontendSentryEvent{
-			Event: &sentry.Event{
-				EventID:   "123",
-				Level:     sentry.LevelInfo,
-				Request:   &request,
-				Timestamp: ts,
-				Message:   "hello world",
-				User:      user,
-			},
-			Exception: nil,
-		}
-
-		logSentryEventScenario(t, "Should log received message event", messageEvent,
-			func(sc *scenarioContext, logs map[string]interface{}, sourceMapReads []SourceMapReadRecord) {
-				assert.Equal(t, http.StatusAccepted, sc.resp.Code)
-				assert.Len(t, logs, 10)
-				assertContextContains(t, logs, "logger", "frontend")
-				assertContextContains(t, logs, "msg", "hello world")
-				assertContextContains(t, logs, level.Key().(string), level.InfoValue())
-				assertContextContains(t, logs, "logger", "frontend")
-				assertContextContains(t, logs, "url", messageEvent.Request.URL)
-				assertContextContains(t, logs, "user_agent", messageEvent.Request.Headers["User-Agent"])
-				assertContextContains(t, logs, "event_id", messageEvent.EventID)
-				assertContextContains(t, logs, "original_timestamp", messageEvent.Timestamp)
-				assert.NotContains(t, logs, "stacktrace")
-				assert.NotContains(t, logs, "context")
-				assertContextContains(t, logs, "user_email", user.Email)
-				assertContextContains(t, logs, "user_id", user.ID)
-			})
-
-		eventWithContext := frontendlogging.FrontendSentryEvent{
-			Event: &sentry.Event{
-				EventID:   "123",
-				Level:     sentry.LevelInfo,
-				Request:   &request,
-				Timestamp: ts,
-				Message:   "hello world",
-				User:      user,
-				Contexts: map[string]interface{}{
-					"foo": map[string]interface{}{
-						"one":   "two",
-						"three": 4,
-					},
-					"bar": "baz",
-				},
-			},
-			Exception: nil,
-		}
-
-		logSentryEventScenario(t, "Should log event context", eventWithContext,
-			func(sc *scenarioContext, logs map[string]interface{}, sourceMapReads []SourceMapReadRecord) {
-				assert.Equal(t, http.StatusAccepted, sc.resp.Code)
-				assertContextContains(t, logs, "context_foo_one", "two")
-				assertContextContains(t, logs, "context_foo_three", "4")
-				assertContextContains(t, logs, "context_bar", "baz")
-			})
-
-		errorEventForSourceMapping := frontendlogging.FrontendSentryEvent{
-			Event: &event,
-			Exception: &frontendlogging.FrontendSentryException{
-				Values: []frontendlogging.FrontendSentryExceptionValue{
-					{
-						Type:  "UserError",
-						Value: "Please replace user and try again",
-						Stacktrace: sentry.Stacktrace{
-							Frames: []sentry.Frame{
-								{
-									Function: "foofn",
-									Filename: "http://localhost:3000/public/build/moo/foo.js", // source map found and mapped, core
-									Lineno:   2,
-									Colno:    5,
-								},
-								{
-									Function: "foofn",
-									Filename: "http://localhost:3000/public/plugins/telepathic/foo.js", // plugin, source map found and mapped
-									Lineno:   3,
-									Colno:    10,
-								},
-								{
-									Function: "explode",
-									Filename: "http://localhost:3000/public/build/error.js", // reading source map throws error
-									Lineno:   3,
-									Colno:    10,
-								},
-								{
-									Function: "wat",
-									Filename: "http://localhost:3000/public/build/bar.js", // core, but source map not found on fs
-									Lineno:   3,
-									Colno:    10,
-								},
-								{
-									Function: "nope",
-									Filename: "http://localhost:3000/baz.js", // not core or plugin, wont even attempt to get source map
-									Lineno:   3,
-									Colno:    10,
-								},
-								{
-									Function: "fake",
-									Filename: "http://localhost:3000/public/build/../../secrets.txt", // path will be sanitized
-									Lineno:   3,
-									Colno:    10,
-								},
-								{
-									Function: "cdn",
-									Filename: "https://storage.googleapis.com/grafana-static-assets/grafana-oss/pre-releases/7.5.0-11925pre/public/build/foo.js", // source map found and mapped
-									Lineno:   3,
-									Colno:    10,
-								},
-							},
-						},
-					},
-				},
-			},
-		}
-
-		logSentryEventScenario(t, "Should load sourcemap and transform stacktrace line when possible",
-			errorEventForSourceMapping, func(sc *scenarioContext, logs map[string]interface{}, sourceMapReads []SourceMapReadRecord) {
-				assert.Equal(t, http.StatusAccepted, sc.resp.Code)
-				assert.Len(t, logs, 9)
-				assertContextContains(t, logs, "stacktrace", `UserError: Please replace user and try again
-  at ? (core|webpack:///./some_source.ts:2:2)
-  at ? (telepathic|webpack:///./some_source.ts:3:2)
-  at explode (http://localhost:3000/public/build/error.js:3:10)
-  at wat (http://localhost:3000/public/build/bar.js:3:10)
-  at nope (http://localhost:3000/baz.js:3:10)
-  at fake (http://localhost:3000/public/build/../../secrets.txt:3:10)
-  at ? (core|webpack:///./some_source.ts:3:2)`)
-				assert.Len(t, sourceMapReads, 6)
-				assert.Equal(t, "/staticroot", sourceMapReads[0].dir)
-				assert.Equal(t, "build/moo/foo.js.map", sourceMapReads[0].path)
-				assert.Equal(t, "/usr/local/telepathic-panel", sourceMapReads[1].dir)
-				assert.Equal(t, "/foo.js.map", sourceMapReads[1].path)
-				assert.Equal(t, "/staticroot", sourceMapReads[2].dir)
-				assert.Equal(t, "build/error.js.map", sourceMapReads[2].path)
-				assert.Equal(t, "/staticroot", sourceMapReads[3].dir)
-				assert.Equal(t, "build/bar.js.map", sourceMapReads[3].path)
-				assert.Equal(t, "/staticroot", sourceMapReads[4].dir)
-				assert.Equal(t, "secrets.txt.map", sourceMapReads[4].path)
-				assert.Equal(t, "/staticroot", sourceMapReads[5].dir)
-				assert.Equal(t, "build/foo.js.map", sourceMapReads[5].path)
-			})
-	})
-}
-
 func TestFrontendLoggingEndpointGrafanaJavascriptAgent(t *testing.T) {
 	ts, err := time.Parse("2006-01-02T15:04:05.000Z", "2020-10-22T06:29:29.078Z")
 	require.NoError(t, err)
@@ -536,13 +252,13 @@ func TestFrontendLoggingEndpointGrafanaJavascriptAgent(t *testing.T) {
 			func(sc *scenarioContext, logs map[string]interface{}, sourceMapReads []SourceMapReadRecord) {
 				assert.Equal(t, http.StatusAccepted, sc.resp.Code)
 				assertContextContains(t, logs, "stacktrace", `UserError: Please replace user and try again
-  at ? (webpack:///./some_source.ts:2:2)
-  at ? (webpack:///./some_source.ts:3:2)
+  at ? (core|webpack:///./some_source.ts:2:2)
+  at ? (telepathic|webpack:///./some_source.ts:3:2)
   at explode (http://localhost:3000/public/build/error.js:3:10)
   at wat (http://localhost:3000/public/build/bar.js:3:10)
   at nope (http://localhost:3000/baz.js:3:10)
   at fake (http://localhost:3000/public/build/../../secrets.txt:3:10)
-  at ? (webpack:///./some_source.ts:3:2)`)
+  at ? (core|webpack:///./some_source.ts:3:2)`)
 				assert.Len(t, sourceMapReads, 6)
 				assert.Equal(t, "/staticroot", sourceMapReads[0].dir)
 				assert.Equal(t, "build/moo/foo.js.map", sourceMapReads[0].path)
diff --git a/pkg/api/frontendlogging/grafana_javascript_agent.go b/pkg/api/frontendlogging/grafana_javascript_agent.go
index 4e00cf644c4..45c54d0562c 100644
--- a/pkg/api/frontendlogging/grafana_javascript_agent.go
+++ b/pkg/api/frontendlogging/grafana_javascript_agent.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 )
 
+type CtxVector []interface{}
+
 type FrontendGrafanaJavascriptAgentEvent struct {
 	Exceptions   []Exception   `json:"exceptions,omitempty"`
 	Logs         []Log         `json:"logs,omitempty"`
diff --git a/pkg/api/frontendlogging/grafana_javascript_agent_sourcemaps.go b/pkg/api/frontendlogging/grafana_javascript_agent_sourcemaps.go
index e9de9f22970..5eb7d375899 100644
--- a/pkg/api/frontendlogging/grafana_javascript_agent_sourcemaps.go
+++ b/pkg/api/frontendlogging/grafana_javascript_agent_sourcemaps.go
@@ -1,33 +1,5 @@
 package frontendlogging
 
-// ResolveSourceLocation resolves minified source location to original source location
-func ResolveSourceLocation(store *SourceMapStore, frame *Frame) (*Frame, error) {
-	smap, err := store.getSourceMap(frame.Filename)
-	if err != nil {
-		return nil, err
-	}
-	if smap == nil {
-		return nil, nil
-	}
-
-	file, function, line, col, ok := smap.consumer.Source(frame.Lineno, frame.Colno)
-	if !ok {
-		return nil, nil
-	}
-
-	// unfortunately in many cases go-sourcemap fails to determine the original function name.
-	// not a big issue as long as file, line and column are correct
-	if len(function) == 0 {
-		function = "?"
-	}
-	return &Frame{
-		Filename: file,
-		Lineno:   line,
-		Colno:    col,
-		Function: function,
-	}, nil
-}
-
 // TransformException will attempt to resolved all monified source locations in the stacktrace with original source locations
 func TransformException(ex *Exception, store *SourceMapStore) *Exception {
 	if ex.Stacktrace == nil {
@@ -37,7 +9,7 @@ func TransformException(ex *Exception, store *SourceMapStore) *Exception {
 
 	for _, frame := range ex.Stacktrace.Frames {
 		frame := frame
-		mappedFrame, err := ResolveSourceLocation(store, &frame)
+		mappedFrame, err := store.resolveSourceLocation(frame)
 		if err != nil {
 			frames = append(frames, frame)
 		} else if mappedFrame != nil {
diff --git a/pkg/api/frontendlogging/sentry.go b/pkg/api/frontendlogging/sentry.go
deleted file mode 100644
index 66b74c09c04..00000000000
--- a/pkg/api/frontendlogging/sentry.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package frontendlogging
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/getsentry/sentry-go"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-)
-
-type CtxVector []interface{}
-
-var logger = log.New("frontendlogging")
-
-type FrontendSentryExceptionValue struct {
-	Value      string            `json:"value,omitempty"`
-	Type       string            `json:"type,omitempty"`
-	Stacktrace sentry.Stacktrace `json:"stacktrace,omitempty"`
-}
-
-type FrontendSentryException struct {
-	Values []FrontendSentryExceptionValue `json:"values,omitempty"`
-}
-
-type FrontendSentryEvent struct {
-	*sentry.Event
-	Exception *FrontendSentryException `json:"exception,omitempty"`
-}
-
-func (value *FrontendSentryExceptionValue) FmtMessage() string {
-	return fmt.Sprintf("%s: %s", value.Type, value.Value)
-}
-
-func fmtLine(frame sentry.Frame) string {
-	module := ""
-	if len(frame.Module) > 0 {
-		module = frame.Module + "|"
-	}
-	return fmt.Sprintf("\n  at %s (%s%s:%v:%v)", frame.Function, module, frame.Filename, frame.Lineno, frame.Colno)
-}
-
-func (value *FrontendSentryExceptionValue) FmtStacktrace(store *SourceMapStore) string {
-	var stacktrace = value.FmtMessage()
-	for _, frame := range value.Stacktrace.Frames {
-		mappedFrame, err := store.resolveSourceLocation(frame)
-		if err != nil {
-			logger.Error("Error resolving stack trace frame source location", "err", err)
-			stacktrace += fmtLine(frame) // even if reading source map fails for unexpected reason, still better to log compiled location than nothing at all
-		} else {
-			if mappedFrame != nil {
-				stacktrace += fmtLine(*mappedFrame)
-			} else {
-				stacktrace += fmtLine(frame)
-			}
-		}
-	}
-	return stacktrace
-}
-
-func (exception *FrontendSentryException) FmtStacktraces(store *SourceMapStore) string {
-	stacktraces := make([]string, 0, len(exception.Values))
-	for _, value := range exception.Values {
-		stacktraces = append(stacktraces, value.FmtStacktrace(store))
-	}
-	return strings.Join(stacktraces, "\n\n")
-}
-
-func addEventContextToLogContext(rootPrefix string, logCtx *CtxVector, eventCtx map[string]interface{}) {
-	for key, element := range eventCtx {
-		prefix := fmt.Sprintf("%s_%s", rootPrefix, key)
-		switch v := element.(type) {
-		case map[string]interface{}:
-			addEventContextToLogContext(prefix, logCtx, v)
-		default:
-			*logCtx = append(*logCtx, prefix, fmt.Sprintf("%v", v))
-		}
-	}
-}
-
-func (event *FrontendSentryEvent) ToLogContext(store *SourceMapStore) []interface{} {
-	var ctx = CtxVector{"url", event.Request.URL, "user_agent", event.Request.Headers["User-Agent"],
-		"event_id", event.EventID, "original_timestamp", event.Timestamp}
-
-	if event.Exception != nil {
-		ctx = append(ctx, "stacktrace", event.Exception.FmtStacktraces(store))
-	}
-	addEventContextToLogContext("context", &ctx, event.Contexts)
-	if len(event.User.Email) > 0 {
-		ctx = append(ctx, "user_email", event.User.Email, "user_id", event.User.ID)
-	}
-
-	return ctx
-}
-
-func (event *FrontendSentryEvent) MarshalJSON() ([]byte, error) {
-	eventJSON, err := json.Marshal(event.Event)
-	if err != nil {
-		return nil, err
-	}
-	exceptionJSON, err := json.Marshal(map[string]interface{}{"exception": event.Exception})
-	if err != nil {
-		return nil, err
-	}
-	exceptionJSON[0] = ','
-	return append(eventJSON[:len(eventJSON)-1], exceptionJSON...), nil
-}
diff --git a/pkg/api/frontendlogging/source_maps.go b/pkg/api/frontendlogging/source_maps.go
index 95a4802a2ab..d811b107364 100644
--- a/pkg/api/frontendlogging/source_maps.go
+++ b/pkg/api/frontendlogging/source_maps.go
@@ -9,13 +9,14 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/getsentry/sentry-go"
 	sourcemap "github.com/go-sourcemap/sourcemap"
-
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+var logger = log.New("frontendlogging")
+
 type sourceMapLocation struct {
 	dir      string
 	path     string
@@ -136,7 +137,7 @@ func (store *SourceMapStore) getSourceMap(sourceURL string) (*sourceMap, error)
 	return smap, nil
 }
 
-func (store *SourceMapStore) resolveSourceLocation(frame sentry.Frame) (*sentry.Frame, error) {
+func (store *SourceMapStore) resolveSourceLocation(frame Frame) (*Frame, error) {
 	smap, err := store.getSourceMap(frame.Filename)
 	if err != nil {
 		return nil, err
@@ -157,7 +158,7 @@ func (store *SourceMapStore) resolveSourceLocation(frame sentry.Frame) (*sentry.
 	if len(smap.pluginID) > 0 {
 		module = smap.pluginID
 	}
-	return &sentry.Frame{
+	return &Frame{
 		Filename: file,
 		Lineno:   line,
 		Colno:    col,
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 23e7957796a..505004492b7 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -184,7 +184,6 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		RendererVersion:                  hs.RenderService.Version(),
 		SecretsManagerPluginEnabled:      secretsManagerPluginEnabled,
 		Http2Enabled:                     hs.Cfg.Protocol == setting.HTTP2Scheme,
-		Sentry:                           hs.Cfg.Sentry,
 		GrafanaJavascriptAgent:           hs.Cfg.GrafanaJavascriptAgent,
 		PluginCatalogURL:                 hs.Cfg.PluginCatalogURL,
 		PluginAdminEnabled:               hs.Cfg.PluginAdminEnabled,
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 6f88ca1bc40..067c5828683 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -136,7 +136,6 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 		AppleTouchIcon:                      "public/img/apple-touch-icon.png",
 		AppTitle:                            "Grafana",
 		NavTree:                             navTree,
-		Sentry:                              &hs.Cfg.Sentry,
 		Nonce:                               c.RequestNonce,
 		ContentDeliveryURL:                  hs.Cfg.GetContentDeliveryURL(hs.License.ContentDeliveryPrefix()),
 		LoadingLogo:                         "public/img/grafana_icon.svg",
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 3f0e65a1711..122d3ef2bf0 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -363,9 +363,6 @@ type Cfg struct {
 	DashboardAnnotationCleanupSettings AnnotationCleanupSettings
 	APIAnnotationCleanupSettings       AnnotationCleanupSettings
 
-	// Sentry config
-	Sentry Sentry
-
 	// GrafanaJavascriptAgent config
 	GrafanaJavascriptAgent GrafanaJavascriptAgent
 
@@ -1187,7 +1184,6 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	cfg.GeomapEnableCustomBaseLayers = geomapSection.Key("enable_custom_baselayers").MustBool(true)
 
 	cfg.readDateFormats()
-	cfg.readSentryConfig()
 	cfg.readGrafanaJavascriptAgentConfig()
 
 	if err := cfg.readLiveSettings(iniFile); err != nil {
diff --git a/pkg/setting/setting_grafana_javascript_agent.go b/pkg/setting/setting_grafana_javascript_agent.go
index e5c51894f83..cfc04d5136d 100644
--- a/pkg/setting/setting_grafana_javascript_agent.go
+++ b/pkg/setting/setting_grafana_javascript_agent.go
@@ -13,17 +13,14 @@ type GrafanaJavascriptAgent struct {
 
 func (cfg *Cfg) readGrafanaJavascriptAgentConfig() {
 	raw := cfg.Raw.Section("log.frontend")
-	provider := raw.Key("provider").MustString("sentry")
-	if provider == "grafana" {
-		cfg.GrafanaJavascriptAgent = GrafanaJavascriptAgent{
-			Enabled:                             raw.Key("enabled").MustBool(true),
-			CustomEndpoint:                      raw.Key("custom_endpoint").MustString("/log-grafana-javascript-agent"),
-			EndpointRPS:                         raw.Key("log_endpoint_requests_per_second_limit").MustInt(3),
-			EndpointBurst:                       raw.Key("log_endpoint_burst_limit").MustInt(15),
-			ErrorInstrumentalizationEnabled:     raw.Key("instrumentations_errors_enabled").MustBool(true),
-			ConsoleInstrumentalizationEnabled:   raw.Key("instrumentations_console_enabled").MustBool(true),
-			WebVitalsInstrumentalizationEnabled: raw.Key("instrumentations_webvitals_enabled").MustBool(true),
-			ApiKey:                              raw.Key("api_key").String(),
-		}
+	cfg.GrafanaJavascriptAgent = GrafanaJavascriptAgent{
+		Enabled:                             raw.Key("enabled").MustBool(true),
+		CustomEndpoint:                      raw.Key("custom_endpoint").MustString("/log-grafana-javascript-agent"),
+		EndpointRPS:                         raw.Key("log_endpoint_requests_per_second_limit").MustInt(3),
+		EndpointBurst:                       raw.Key("log_endpoint_burst_limit").MustInt(15),
+		ErrorInstrumentalizationEnabled:     raw.Key("instrumentations_errors_enabled").MustBool(true),
+		ConsoleInstrumentalizationEnabled:   raw.Key("instrumentations_console_enabled").MustBool(true),
+		WebVitalsInstrumentalizationEnabled: raw.Key("instrumentations_webvitals_enabled").MustBool(true),
+		ApiKey:                              raw.Key("api_key").String(),
 	}
 }
diff --git a/pkg/setting/setting_sentry.go b/pkg/setting/setting_sentry.go
deleted file mode 100644
index 49aee537023..00000000000
--- a/pkg/setting/setting_sentry.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package setting
-
-import "github.com/go-kit/log/level"
-
-type Sentry struct {
-	Enabled        bool    `json:"enabled"`
-	DSN            string  `json:"dsn"`
-	CustomEndpoint string  `json:"customEndpoint"`
-	SampleRate     float64 `json:"sampleRate"`
-	EndpointRPS    int     `json:"-"`
-	EndpointBurst  int     `json:"-"`
-}
-
-func (cfg *Cfg) readSentryConfig() {
-	raw := cfg.Raw.Section("log.frontend")
-	provider := raw.Key("provider").MustString("sentry")
-	if provider == "sentry" || provider != "grafana" {
-		_ = level.Warn(cfg.Logger).Log("msg", "\"sentry\" frontend logging provider is deprecated and will be removed in the next major version. Use \"grafana\" provider instead.")
-		cfg.Sentry = Sentry{
-			Enabled:        raw.Key("enabled").MustBool(true),
-			DSN:            raw.Key("sentry_dsn").String(),
-			CustomEndpoint: raw.Key("custom_endpoint").MustString("/log"),
-			SampleRate:     raw.Key("sample_rate").MustFloat64(),
-			EndpointRPS:    raw.Key("log_endpoint_requests_per_second_limit").MustInt(3),
-			EndpointBurst:  raw.Key("log_endpoint_burst_limit").MustInt(15),
-		}
-	}
-}
diff --git a/public/app/app.ts b/public/app/app.ts
index f2f9eb799e8..56c10d5d92f 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -66,7 +66,6 @@ import { GA4EchoBackend } from './core/services/echo/backends/analytics/GA4Backe
 import { GAEchoBackend } from './core/services/echo/backends/analytics/GABackend';
 import { RudderstackBackend } from './core/services/echo/backends/analytics/RudderstackBackend';
 import { GrafanaJavascriptAgentBackend } from './core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend';
-import { SentryEchoBackend } from './core/services/echo/backends/sentry/SentryBackend';
 import { KeybindingSrv } from './core/services/keybindingSrv';
 import { initDevFeatures } from './dev';
 import { getTimeSrv } from './features/dashboard/services/TimeSrv';
@@ -259,15 +258,6 @@ function initEchoSrv() {
     registerEchoBackend(new PerformanceBackend({}));
   }
 
-  if (config.sentry.enabled) {
-    registerEchoBackend(
-      new SentryEchoBackend({
-        ...config.sentry,
-        user: config.bootData.user,
-        buildInfo: config.buildInfo,
-      })
-    );
-  }
   if (config.grafanaJavascriptAgent.enabled) {
     registerEchoBackend(
       new GrafanaJavascriptAgentBackend({
diff --git a/public/app/core/services/echo/EchoSrv.ts b/public/app/core/services/echo/EchoSrv.ts
index 689517b32d5..54ec330c414 100644
--- a/public/app/core/services/echo/EchoSrv.ts
+++ b/public/app/core/services/echo/EchoSrv.ts
@@ -1,5 +1,4 @@
-import { captureException } from '@sentry/browser';
-
+import { faro } from '@grafana/faro-web-sdk';
 import { getEchoSrv, EchoEventType } from '@grafana/runtime';
 
 import { PerformanceEvent } from './backends/PerformanceBackend';
@@ -14,6 +13,5 @@ export const reportPerformance = (metric: string, value: number) => {
   });
 };
 
-// Sentry will process the error, adding its own metadata, applying any sampling rules,
-// then push it to EchoSrv as SentryEvent
-export const reportError = (error: Error) => captureException(error);
+// Farp will process the error, then push it to EchoSrv as GrafanaJavascriptAgent event
+export const reportError = (error: Error) => faro?.api?.pushError(error);
diff --git a/public/app/core/services/echo/backends/sentry/SentryBackend.test.ts b/public/app/core/services/echo/backends/sentry/SentryBackend.test.ts
deleted file mode 100644
index 62b1cd7c5ae..00000000000
--- a/public/app/core/services/echo/backends/sentry/SentryBackend.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { init as initSentry, setUser as sentrySetUser, Event as SentryEvent } from '@sentry/browser';
-import { FetchTransport } from '@sentry/browser/dist/transports';
-import { waitFor } from '@testing-library/react';
-
-import { BuildInfo } from '@grafana/data';
-import { GrafanaEdition } from '@grafana/data/src/types/config';
-import { EchoBackend, EchoEventType, EchoMeta, setEchoSrv } from '@grafana/runtime';
-
-import { Echo } from '../../Echo';
-
-import { SentryEchoBackend, SentryEchoBackendOptions } from './SentryBackend';
-import { CustomEndpointTransport } from './transports/CustomEndpointTransport';
-import { EchoSrvTransport } from './transports/EchoSrvTransport';
-import { SentryEchoEvent } from './types';
-
-jest.mock('@sentry/browser');
-
-describe('SentryEchoBackend', () => {
-  beforeEach(() => {
-    jest.resetAllMocks();
-    window.fetch = jest.fn();
-  });
-
-  const buildInfo: BuildInfo = {
-    version: '1.0',
-    commit: 'abcd123',
-    env: 'production',
-    edition: GrafanaEdition.OpenSource,
-    latestVersion: 'ba',
-    hasUpdate: false,
-    hideVersion: false,
-  };
-
-  const options: SentryEchoBackendOptions = {
-    enabled: true,
-    buildInfo,
-    dsn: 'https://examplePublicKey@o0.ingest.testsentry.io/0',
-    sampleRate: 1,
-    customEndpoint: '',
-    user: {
-      email: 'darth.vader@sith.glx',
-      id: 504,
-      orgId: 1,
-    },
-  };
-
-  it('will set up sentry`s FetchTransport if DSN is provided', async () => {
-    const backend = new SentryEchoBackend(options);
-    expect(backend.transports.length).toEqual(1);
-    expect(backend.transports[0]).toBeInstanceOf(FetchTransport);
-    expect((backend.transports[0] as FetchTransport).options.dsn).toEqual(options.dsn);
-  });
-
-  it('will set up custom endpoint transport if custom endpoint is provided', async () => {
-    const backend = new SentryEchoBackend({
-      ...options,
-      dsn: '',
-      customEndpoint: '/log',
-    });
-    expect(backend.transports.length).toEqual(1);
-    expect(backend.transports[0]).toBeInstanceOf(CustomEndpointTransport);
-    expect((backend.transports[0] as CustomEndpointTransport).options.endpoint).toEqual('/log');
-  });
-
-  it('will initialize sentry and set user', async () => {
-    new SentryEchoBackend(options);
-    expect(initSentry).toHaveBeenCalledTimes(1);
-    expect(initSentry).toHaveBeenCalledWith({
-      release: buildInfo.version,
-      environment: buildInfo.env,
-      dsn: options.dsn,
-      sampleRate: options.sampleRate,
-      transport: EchoSrvTransport,
-      ignoreErrors: [
-        'ResizeObserver loop limit exceeded',
-        'ResizeObserver loop completed',
-        'Non-Error exception captured with keys',
-      ],
-    });
-    expect(sentrySetUser).toHaveBeenCalledWith({
-      email: options.user?.email,
-      id: String(options.user?.id),
-    });
-  });
-
-  it('will forward events to transports', async () => {
-    const backend = new SentryEchoBackend(options);
-    backend.transports = [{ sendEvent: jest.fn() }, { sendEvent: jest.fn() }];
-    const event: SentryEchoEvent = {
-      type: EchoEventType.Sentry,
-      payload: { foo: 'bar' } as unknown as SentryEvent,
-      meta: {} as unknown as EchoMeta,
-    };
-    backend.addEvent(event);
-    backend.transports.forEach((transport) => {
-      expect(transport.sendEvent).toHaveBeenCalledTimes(1);
-      expect(transport.sendEvent).toHaveBeenCalledWith(event.payload);
-    });
-  });
-
-  it('integration test with EchoSrv, Sentry and CustomFetchTransport', async () => {
-    // sets up the whole thing between window.onerror and backend endpoint call, checks that error is reported
-
-    // use actual sentry & mock window.fetch
-    const sentry = jest.requireActual('@sentry/browser');
-    (initSentry as jest.Mock).mockImplementation(sentry.init);
-    (sentrySetUser as jest.Mock).mockImplementation(sentry.setUser);
-    const fetchSpy = (window.fetch = jest.fn());
-    fetchSpy.mockResolvedValue({ status: 200 } as Response);
-
-    // set up echo srv & sentry backend
-    const echo = new Echo({ debug: true });
-    setEchoSrv(echo);
-    const sentryBackend = new SentryEchoBackend({
-      ...options,
-      dsn: '',
-      customEndpoint: '/log',
-    });
-    echo.addBackend(sentryBackend);
-
-    // lets add another echo backend for sentry events for good measure
-    const myCustomErrorBackend: EchoBackend = {
-      supportedEvents: [EchoEventType.Sentry],
-      flush: () => {},
-      options: {},
-      addEvent: jest.fn(),
-    };
-    echo.addBackend(myCustomErrorBackend);
-
-    // fire off an error using global error handler, Sentry should pick it up
-    const error = new Error('test error');
-    window.onerror!(error.message, undefined, undefined, undefined, error);
-
-    // check that error was reported to backend
-    await waitFor(() => expect(fetchSpy).toHaveBeenCalledTimes(1));
-    const [url, reqInit]: [string, RequestInit] = fetchSpy.mock.calls[0];
-    expect(url).toEqual('/log');
-    expect((JSON.parse(reqInit.body as string) as SentryEvent).exception!.values![0].value).toEqual('test error');
-
-    // check that our custom backend got it too
-    expect(myCustomErrorBackend.addEvent).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/public/app/core/services/echo/backends/sentry/SentryBackend.ts b/public/app/core/services/echo/backends/sentry/SentryBackend.ts
deleted file mode 100644
index dc63851da2e..00000000000
--- a/public/app/core/services/echo/backends/sentry/SentryBackend.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { BrowserOptions, init as initSentry, setUser as sentrySetUser } from '@sentry/browser';
-import { FetchTransport } from '@sentry/browser/dist/transports';
-
-import { BuildInfo } from '@grafana/data';
-import { SentryConfig } from '@grafana/data/src/types/config';
-import { EchoBackend, EchoEventType } from '@grafana/runtime';
-
-import { CustomEndpointTransport } from './transports/CustomEndpointTransport';
-import { EchoSrvTransport } from './transports/EchoSrvTransport';
-import { SentryEchoEvent, User, BaseTransport } from './types';
-
-export interface SentryEchoBackendOptions extends SentryConfig {
-  user?: User;
-  buildInfo: BuildInfo;
-}
-
-export class SentryEchoBackend implements EchoBackend<SentryEchoEvent, SentryEchoBackendOptions> {
-  supportedEvents = [EchoEventType.Sentry];
-
-  transports: BaseTransport[];
-
-  constructor(public options: SentryEchoBackendOptions) {
-    // set up transports to post events to grafana backend and/or Sentry
-    this.transports = [];
-    if (options.dsn) {
-      this.transports.push(new FetchTransport({ dsn: options.dsn }, fetch));
-    }
-    if (options.customEndpoint) {
-      this.transports.push(new CustomEndpointTransport({ endpoint: options.customEndpoint }));
-    }
-
-    // initialize Sentry so it can set up its hooks and start collecting errors
-    const sentryOptions: BrowserOptions = {
-      release: options.buildInfo.version,
-      environment: options.buildInfo.env,
-      // seems Sentry won't attempt to send events to transport unless a valid DSN is defined :shrug:
-      dsn: options.dsn || 'https://examplePublicKey@o0.ingest.sentry.io/0',
-      sampleRate: options.sampleRate,
-      transport: EchoSrvTransport, // will dump errors to EchoSrv
-      ignoreErrors: [
-        'ResizeObserver loop limit exceeded',
-        'ResizeObserver loop completed',
-        'Non-Error exception captured with keys',
-      ],
-    };
-
-    if (options.user) {
-      sentrySetUser({
-        email: options.user.email,
-        id: String(options.user.id),
-      });
-    }
-
-    initSentry(sentryOptions);
-  }
-
-  addEvent = (e: SentryEchoEvent) => {
-    this.transports.forEach((t) => t.sendEvent(e.payload));
-  };
-
-  // backend will log events to stdout, and at least in case of hosted grafana they will be
-  // ingested into Loki. Due to Loki limitations logs cannot be backdated,
-  // so not using buffering for this backend to make sure that events are logged as close
-  // to their context as possible
-  flush = () => {};
-}
diff --git a/public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.test.ts b/public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.test.ts
deleted file mode 100644
index 6428907219f..00000000000
--- a/public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.test.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import { Event, Severity } from '@sentry/browser';
-
-import { CustomEndpointTransport } from './CustomEndpointTransport';
-
-describe('CustomEndpointTransport', () => {
-  const fetchSpy = (window.fetch = jest.fn());
-  let consoleSpy: jest.SpyInstance;
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    // The code logs a warning to console
-    // Let's stub this out so we don't pollute the test output
-    consoleSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
-  });
-
-  afterEach(() => {
-    consoleSpy.mockRestore();
-  });
-  const now = new Date();
-
-  const event: Event = {
-    level: Severity.Error,
-    breadcrumbs: [],
-    exception: {
-      values: [
-        {
-          type: 'SomeError',
-          value: 'foo',
-        },
-      ],
-    },
-    timestamp: now.getTime() / 1000,
-  };
-
-  it('will send received event to backend using window.fetch', async () => {
-    fetchSpy.mockResolvedValue({ status: 200 });
-    const transport = new CustomEndpointTransport({ endpoint: '/log' });
-    await transport.sendEvent(event);
-    expect(fetchSpy).toHaveBeenCalledTimes(1);
-    const [url, reqInit]: [string, RequestInit] = fetchSpy.mock.calls[0];
-    expect(url).toEqual('/log');
-    expect(reqInit.method).toEqual('POST');
-    expect(reqInit.headers).toEqual({
-      'Content-Type': 'application/json',
-    });
-    expect(JSON.parse(reqInit.body!.toString())).toEqual({
-      ...event,
-      timestamp: now.toISOString(),
-    });
-  });
-
-  it('will back off if backend returns Retry-After', async () => {
-    const rateLimiterResponse = {
-      status: 429,
-      ok: false,
-      headers: new Headers({
-        'Retry-After': '1', // 1 second
-      }),
-    } as Response;
-    fetchSpy.mockResolvedValueOnce(rateLimiterResponse).mockResolvedValueOnce({ status: 200 });
-    const transport = new CustomEndpointTransport({ endpoint: '/log' });
-
-    // first call - backend is called, rejected because of 429
-    await expect(transport.sendEvent(event)).rejects.toEqual(rateLimiterResponse);
-    expect(fetchSpy).toHaveBeenCalledTimes(1);
-
-    // second immediate call - shot circuited because retry-after time has not expired, backend not called
-    await expect(transport.sendEvent(event)).resolves.toHaveProperty('status', 'skipped');
-    expect(fetchSpy).toHaveBeenCalledTimes(1);
-
-    // wait out the retry-after and call again - great success
-    await new Promise((resolve) => setTimeout(() => resolve(null), 1001));
-    await expect(transport.sendEvent(event)).resolves.toBeTruthy();
-    expect(fetchSpy).toHaveBeenCalledTimes(2);
-  });
-
-  it('will back off if backend returns Retry-After', async () => {
-    const rateLimiterResponse = {
-      status: 429,
-      ok: false,
-      headers: new Headers({
-        'Retry-After': '1', // 1 second
-      }),
-    } as Response;
-    fetchSpy.mockResolvedValueOnce(rateLimiterResponse).mockResolvedValueOnce({ status: 200 });
-    const transport = new CustomEndpointTransport({ endpoint: '/log' });
-
-    // first call - backend is called, rejected because of 429
-    await expect(transport.sendEvent(event)).rejects.toHaveProperty('status', 429);
-    expect(fetchSpy).toHaveBeenCalledTimes(1);
-
-    // second immediate call - shot circuited because retry-after time has not expired, backend not called
-    await expect(transport.sendEvent(event)).resolves.toHaveProperty('status', 'skipped');
-    expect(fetchSpy).toHaveBeenCalledTimes(1);
-
-    // wait out the retry-after and call again - great success
-    await new Promise((resolve) => setTimeout(() => resolve(null), 1001));
-    await expect(transport.sendEvent(event)).resolves.toBeTruthy();
-    expect(fetchSpy).toHaveBeenCalledTimes(2);
-  });
-
-  it('will drop events and log a warning to console if max concurrency is reached', async () => {
-    const calls: Array<(value: unknown) => void> = [];
-    fetchSpy.mockImplementation(
-      () =>
-        new Promise((resolve) => {
-          calls.push(resolve);
-        })
-    );
-
-    const transport = new CustomEndpointTransport({ endpoint: '/log', maxConcurrentRequests: 2 });
-
-    // first two requests are accepted
-    transport.sendEvent(event);
-    const event2 = transport.sendEvent(event);
-    expect(calls).toHaveLength(2);
-
-    // third is skipped because too many requests in flight
-    await expect(transport.sendEvent(event)).resolves.toHaveProperty('status', 'skipped');
-
-    expect(calls).toHaveLength(2);
-
-    // after resolving in flight requests, next request is accepted as well
-    calls.forEach((call) => {
-      call({ status: 200 });
-    });
-    await event2;
-    const event3 = transport.sendEvent(event);
-    expect(calls).toHaveLength(3);
-    calls[2]({ status: 200 });
-    await event3;
-  });
-});
diff --git a/public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.ts b/public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.ts
deleted file mode 100644
index ea15b2622d6..00000000000
--- a/public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { Event, Severity } from '@sentry/browser';
-import { Response } from '@sentry/types';
-import {
-  logger,
-  makePromiseBuffer,
-  parseRetryAfterHeader,
-  PromiseBuffer,
-  supportsReferrerPolicy,
-  SyncPromise,
-} from '@sentry/utils';
-
-import { BaseTransport } from '../types';
-
-export interface CustomEndpointTransportOptions {
-  endpoint: string;
-  fetchParameters?: Partial<RequestInit>;
-  maxConcurrentRequests?: number;
-}
-
-const DEFAULT_MAX_CONCURRENT_REQUESTS = 3;
-
-const DEFAULT_RATE_LIMIT_TIMEOUT_MS = 5000;
-
-/**
- * This is a copy of sentry's FetchTransport, edited to be able to push to any custom url
- * instead of using Sentry-specific endpoint logic.
- * Also transforms some of the payload values to be parseable by go.
- * Sends events sequentially and implements back-off in case of rate limiting.
- */
-
-export class CustomEndpointTransport implements BaseTransport {
-  /** Locks transport after receiving 429 response */
-  private _disabledUntil: Date = new Date(Date.now());
-
-  private readonly _buffer: PromiseBuffer<Response>;
-
-  constructor(public options: CustomEndpointTransportOptions) {
-    this._buffer = makePromiseBuffer(options.maxConcurrentRequests ?? DEFAULT_MAX_CONCURRENT_REQUESTS);
-  }
-
-  sendEvent(event: Event): PromiseLike<Response> {
-    if (new Date(Date.now()) < this._disabledUntil) {
-      const reason = `Dropping frontend event due to too many requests.`;
-      console.warn(reason);
-      return Promise.resolve({
-        event,
-        reason,
-        status: 'skipped',
-      });
-    }
-
-    const sentryReq = {
-      // convert all timestamps to iso string, so it's parseable by backend
-      body: JSON.stringify({
-        ...event,
-        level: event.level ?? (event.exception ? Severity.Error : Severity.Info),
-        exception: event.exception
-          ? {
-              values: event.exception.values?.map((value) => ({
-                ...value,
-                // according to both typescript and go types, value is supposed to be string.
-                // but in some odd cases at runtime it turns out to be an empty object {}
-                // let's fix it here
-                value: fmtSentryErrorValue(value.value),
-              })),
-            }
-          : event.exception,
-        breadcrumbs: event.breadcrumbs?.map((breadcrumb) => ({
-          ...breadcrumb,
-          timestamp: makeTimestamp(breadcrumb.timestamp),
-        })),
-        timestamp: makeTimestamp(event.timestamp),
-      }),
-      url: this.options.endpoint,
-    };
-
-    const options: RequestInit = {
-      body: sentryReq.body,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      method: 'POST',
-      // Despite all stars in the sky saying that Edge supports old draft syntax, aka 'never', 'always', 'origin' and 'default
-      // https://caniuse.com/#feat=referrer-policy
-      // It doesn't. And it throw exception instead of ignoring this parameter...
-      // REF: https://github.com/getsentry/raven-js/issues/1233
-      referrerPolicy: supportsReferrerPolicy() ? 'origin' : '',
-    };
-
-    if (this.options.fetchParameters !== undefined) {
-      Object.assign(options, this.options.fetchParameters);
-    }
-
-    return this._buffer
-      .add(
-        () =>
-          new SyncPromise<Response>((resolve, reject) => {
-            window
-              .fetch(sentryReq.url, options)
-              .then((response) => {
-                if (response.status === 200) {
-                  resolve({ status: 'success' });
-                  return;
-                }
-
-                if (response.status === 429) {
-                  const now = Date.now();
-                  const retryAfterHeader = response.headers.get('Retry-After');
-                  if (retryAfterHeader) {
-                    this._disabledUntil = new Date(now + parseRetryAfterHeader(retryAfterHeader, now));
-                  } else {
-                    this._disabledUntil = new Date(now + DEFAULT_RATE_LIMIT_TIMEOUT_MS);
-                  }
-                  logger.warn(`Too many requests, backing off till: ${this._disabledUntil}`);
-                }
-
-                reject(response);
-              })
-              .catch(reject);
-          })
-      )
-      .then(undefined, (reason) => {
-        if (reason.message === 'Not adding Promise due to buffer limit reached.') {
-          const msg = `Dropping frontend log event due to too many requests in flight.`;
-          console.warn(msg);
-          return {
-            event,
-            reason: msg,
-            status: 'skipped',
-          };
-        }
-        throw reason;
-      });
-  }
-}
-
-function makeTimestamp(time: number | undefined): string {
-  if (time) {
-    return new Date(time * 1000).toISOString();
-  }
-  return new Date().toISOString();
-}
-
-function fmtSentryErrorValue(value: unknown): string | undefined {
-  if (typeof value === 'string' || value === undefined) {
-    return value;
-  } else if (value && typeof value === 'object' && Object.keys(value).length === 0) {
-    return '';
-  }
-  return String(value);
-}
diff --git a/public/app/core/services/echo/backends/sentry/transports/EchoSrvTransport.ts b/public/app/core/services/echo/backends/sentry/transports/EchoSrvTransport.ts
deleted file mode 100644
index a49c3219940..00000000000
--- a/public/app/core/services/echo/backends/sentry/transports/EchoSrvTransport.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Event } from '@sentry/browser';
-import { BaseTransport } from '@sentry/browser/dist/transports';
-import { EventStatus, Request, Session, Response } from '@sentry/types';
-
-import { getEchoSrv, EchoEventType } from '@grafana/runtime';
-
-export class EchoSrvTransport extends BaseTransport {
-  sendEvent(event: Event): Promise<{ status: EventStatus; event: Event }> {
-    getEchoSrv().addEvent({
-      type: EchoEventType.Sentry,
-      payload: event,
-    });
-    return Promise.resolve({
-      status: 'success',
-      event,
-    });
-  }
-  // not recording sessions for now
-  sendSession(session: Session): PromiseLike<Response> {
-    return Promise.resolve({ status: 'skipped' });
-  }
-  // required by BaseTransport definition but not used by this implementation
-  _sendRequest(sentryRequest: Request, originalPayload: Event | Session): PromiseLike<Response> {
-    throw new Error('should not happen');
-  }
-}
diff --git a/public/app/core/services/echo/backends/sentry/types.ts b/public/app/core/services/echo/backends/sentry/types.ts
deleted file mode 100644
index a19fe3c0856..00000000000
--- a/public/app/core/services/echo/backends/sentry/types.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Event as SentryEvent } from '@sentry/browser';
-import { Response } from '@sentry/types';
-
-import { EchoEvent, EchoEventType } from '@grafana/runtime';
-
-export interface BaseTransport {
-  sendEvent(event: SentryEvent): PromiseLike<Response>;
-}
-
-export type SentryEchoEvent = EchoEvent<EchoEventType.Sentry, SentryEvent>;
-
-export interface User {
-  email: string;
-  id: number;
-  orgId: number;
-}
diff --git a/public/app/features/alerting/unified/Analytics.ts b/public/app/features/alerting/unified/Analytics.ts
index da31b83ebf1..8ce2236f361 100644
--- a/public/app/features/alerting/unified/Analytics.ts
+++ b/public/app/features/alerting/unified/Analytics.ts
@@ -17,7 +17,7 @@ export const LogMessages = {
   unknownMessageFromError: 'unknown messageFromError',
 };
 
-// logInfo from '@grafana/runtime' should be used, but it doesn't handle Grafana JS Agent and Sentry correctly
+// logInfo from '@grafana/runtime' should be used, but it doesn't handle Grafana JS Agent correctly
 export function logInfo(message: string, context: Record<string, string | number> = {}) {
   if (config.grafanaJavascriptAgent.enabled) {
     faro.api.pushLog([message], {
diff --git a/yarn.lock b/yarn.lock
index 7ee26a3a648..de2e1c7be14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3028,7 +3028,6 @@ __metadata:
     "@grafana/ui": 10.1.0-pre
     "@rollup/plugin-commonjs": 23.0.2
     "@rollup/plugin-node-resolve": 15.0.1
-    "@sentry/browser": 6.19.7
     "@testing-library/dom": 9.0.1
     "@testing-library/react": 14.0.0
     "@testing-library/user-event": 14.4.3
@@ -3141,7 +3140,6 @@ __metadata:
     "@react-aria/utils": 3.13.1
     "@react-stately/menu": 3.4.1
     "@rollup/plugin-node-resolve": 15.0.1
-    "@sentry/browser": 6.19.7
     "@storybook/addon-a11y": 6.5.16
     "@storybook/addon-actions": 6.5.16
     "@storybook/addon-docs": 6.5.16
@@ -6451,70 +6449,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/browser@npm:6.19.7":
-  version: 6.19.7
-  resolution: "@sentry/browser@npm:6.19.7"
-  dependencies:
-    "@sentry/core": 6.19.7
-    "@sentry/types": 6.19.7
-    "@sentry/utils": 6.19.7
-    tslib: ^1.9.3
-  checksum: 071d00c76c2d0384580474c634c58c6196bbd1a3cf510da1309bd1565c57df7422fca8ceb717db189fa557f2c711a21664ee1ab935dfd9869faf416d388e6f78
-  languageName: node
-  linkType: hard
-
-"@sentry/core@npm:6.19.7":
-  version: 6.19.7
-  resolution: "@sentry/core@npm:6.19.7"
-  dependencies:
-    "@sentry/hub": 6.19.7
-    "@sentry/minimal": 6.19.7
-    "@sentry/types": 6.19.7
-    "@sentry/utils": 6.19.7
-    tslib: ^1.9.3
-  checksum: d212e8ef07114549de4a93b81f8bfa217ca1550ca7a5eeaa611e5629faef78ff72663ce561ffa2cff48f3dc556745ef65177044f9965cdd3cbccf617cf3bf675
-  languageName: node
-  linkType: hard
-
-"@sentry/hub@npm:6.19.7":
-  version: 6.19.7
-  resolution: "@sentry/hub@npm:6.19.7"
-  dependencies:
-    "@sentry/types": 6.19.7
-    "@sentry/utils": 6.19.7
-    tslib: ^1.9.3
-  checksum: 10bb1c5cba1b0f1e27a3dd0a186c22f94aeaf11c4662890ab07b2774f46f46af78d61e3ba71d76edc750a7b45af86edd032f35efecdb4efa2eaf551080ccdcb1
-  languageName: node
-  linkType: hard
-
-"@sentry/minimal@npm:6.19.7":
-  version: 6.19.7
-  resolution: "@sentry/minimal@npm:6.19.7"
-  dependencies:
-    "@sentry/hub": 6.19.7
-    "@sentry/types": 6.19.7
-    tslib: ^1.9.3
-  checksum: 9153ac426ee056fc34c5be898f83d74ec08f559d69f544c5944ec05e584b62ed356b92d1a9b08993a7022ad42b5661c3d72881221adc19bee5fc1af3ad3864a8
-  languageName: node
-  linkType: hard
-
-"@sentry/types@npm:6.19.7":
-  version: 6.19.7
-  resolution: "@sentry/types@npm:6.19.7"
-  checksum: f46ef74a33376ad6ea9b128115515c58eb9369d89293c60aa67abca26b5d5d519aa4d0a736db56ae0d75ffd816643d62187018298523cbc2e6c2fb3a6b2a9035
-  languageName: node
-  linkType: hard
-
-"@sentry/utils@npm:6.19.7":
-  version: 6.19.7
-  resolution: "@sentry/utils@npm:6.19.7"
-  dependencies:
-    "@sentry/types": 6.19.7
-    tslib: ^1.9.3
-  checksum: a000223b9c646c64e3565e79cace1eeb75114342b768367c4dddd646476c215eb1bddfb70c63f05e2352d3bce2d7d415344e4757a001605d0e01ac74da5dd306
-  languageName: node
-  linkType: hard
-
 "@sideway/address@npm:^4.1.3":
   version: 4.1.4
   resolution: "@sideway/address@npm:4.1.4"
@@ -18770,9 +18704,6 @@ __metadata:
     "@reduxjs/toolkit": 1.9.3
     "@remix-run/router": ^1.5.0
     "@rtsao/plugin-proposal-class-properties": 7.0.1-patch.1
-    "@sentry/browser": 6.19.7
-    "@sentry/types": 6.19.7
-    "@sentry/utils": 6.19.7
     "@swc/core": 1.3.38
     "@swc/helpers": 0.4.14
     "@testing-library/dom": 9.0.1
@@ -32939,7 +32870,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.10.0, tslib@npm:^1.14.1, tslib@npm:^1.8.1, tslib@npm:^1.9.3":
+"tslib@npm:^1.10.0, tslib@npm:^1.14.1, tslib@npm:^1.8.1":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd

From 32d3e895b3c956003c2bebdcbda3a96418a5f022 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 2 May 2023 10:17:25 +0000
Subject: [PATCH 575/729] NestedFolders: Indicate when folders have
 mixed-selection children (#67337)

* Show indeterminate checkbox for folders with partially selected children

* When selecting an item, check ancestors to see if all their children are now selected

* reword comment

* fix test

* fix lint

* Check all descendants for mixed state

* Use indeterminate checkbox

* fix test description

* make header checkbox select/unselect automatically

* mixed header checkbox:

* fix tests

* add tests
---
 .../BrowseDashboardsPage.test.tsx             |   5 +-
 .../components/BrowseView.test.tsx            |  20 ++++
 .../components/BrowseView.tsx                 |  77 +++++++++++-
 .../components/CheckboxCell.tsx               |  29 +++++
 .../components/CheckboxHeaderCell.tsx         |  17 +++
 .../components/DashboardsTree.test.tsx        |  18 ++-
 .../components/DashboardsTree.tsx             |  87 ++++++--------
 .../features/browse-dashboards/state/hooks.ts |   4 +
 .../browse-dashboards/state/reducers.test.ts  | 113 +++++++++++++++++-
 .../browse-dashboards/state/reducers.ts       |  45 ++++---
 .../app/features/browse-dashboards/types.ts   |  20 ++++
 11 files changed, 344 insertions(+), 91 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/components/CheckboxCell.tsx
 create mode 100644 public/app/features/browse-dashboards/components/CheckboxHeaderCell.tsx

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
index 27c5724157b..3cd8b448e51 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
@@ -75,9 +75,10 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
 
   it('displays the filters and hides the actions initially', async () => {
     render(<BrowseDashboardsPage {...props} />);
+    await screen.findByPlaceholderText('Search for dashboards and folders');
 
-    expect(await screen.findByText('Sort')).toBeInTheDocument();
-    expect(await screen.findByText('Filter by tag')).toBeInTheDocument();
+    expect(screen.queryByText('Sort')).toBeInTheDocument();
+    expect(screen.queryByText('Filter by tag')).toBeInTheDocument();
 
     expect(screen.queryByRole('button', { name: 'Move' })).not.toBeInTheDocument();
     expect(screen.queryByRole('button', { name: 'Delete' })).not.toBeInTheDocument();
diff --git a/public/app/features/browse-dashboards/components/BrowseView.test.tsx b/public/app/features/browse-dashboards/components/BrowseView.test.tsx
index 24d262105ca..3b176523902 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.test.tsx
@@ -116,6 +116,26 @@ describe('browse-dashboards BrowseView', () => {
     const grandparentCheckbox = screen.queryByTestId(selectors.pages.BrowseDashbards.table.checkbox(folderA.item.uid));
     expect(grandparentCheckbox).not.toBeChecked();
   });
+
+  it('shows indeterminate checkboxes when a descendant is selected', async () => {
+    render(<BrowseView canSelect={true} folderUID={undefined} width={WIDTH} height={HEIGHT} />);
+    await screen.findByText(folderA.item.title);
+
+    await expandFolder(folderA.item.uid);
+    await expandFolder(folderA_folderB.item.uid);
+
+    await clickCheckbox(folderA_folderB_dashbdB.item.uid);
+
+    const parentCheckbox = screen.queryByTestId(
+      selectors.pages.BrowseDashbards.table.checkbox(folderA_folderB.item.uid)
+    );
+    expect(parentCheckbox).not.toBeChecked();
+    expect(parentCheckbox).toBePartiallyChecked();
+
+    const grandparentCheckbox = screen.queryByTestId(selectors.pages.BrowseDashbards.table.checkbox(folderA.item.uid));
+    expect(grandparentCheckbox).not.toBeChecked();
+    expect(grandparentCheckbox).toBePartiallyChecked();
+  });
 });
 
 async function expandFolder(uid: string) {
diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
index d3f9b2e927d..021e02e5e83 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -9,8 +9,10 @@ import {
   fetchChildren,
   setFolderOpenState,
   setItemSelectionState,
+  useChildrenByParentUIDState,
   setAllSelection,
 } from '../state';
+import { DashboardTreeSelection, SelectionState } from '../types';
 
 import { DashboardsTree } from './DashboardsTree';
 
@@ -25,10 +27,7 @@ export function BrowseView({ folderUID, width, height, canSelect }: BrowseViewPr
   const dispatch = useDispatch();
   const flatTree = useFlatTreeState(folderUID);
   const selectedItems = useCheckboxSelectionState();
-
-  useEffect(() => {
-    dispatch(fetchChildren(folderUID));
-  }, [dispatch, folderUID]);
+  const childrenByParentUID = useChildrenByParentUIDState();
 
   const handleFolderClick = useCallback(
     (clickedFolderUID: string, isOpen: boolean) => {
@@ -41,6 +40,10 @@ export function BrowseView({ folderUID, width, height, canSelect }: BrowseViewPr
     [dispatch]
   );
 
+  useEffect(() => {
+    dispatch(fetchChildren(folderUID));
+  }, [handleFolderClick, dispatch, folderUID]);
+
   const handleItemSelectionChange = useCallback(
     (item: DashboardViewItem, isSelected: boolean) => {
       dispatch(setItemSelectionState({ item, isSelected }));
@@ -48,16 +51,80 @@ export function BrowseView({ folderUID, width, height, canSelect }: BrowseViewPr
     [dispatch]
   );
 
+  const isSelected = useCallback(
+    (item: DashboardViewItem | '$all'): SelectionState => {
+      if (item === '$all') {
+        // We keep the boolean $all state up to date in redux, so we can short-circut
+        // the logic if we know this has been selected
+        if (selectedItems.$all) {
+          return SelectionState.Selected;
+        }
+
+        // Otherwise, if we have any selected items, then it should be in 'mixed' state
+        for (const selection of Object.values(selectedItems)) {
+          if (typeof selection === 'boolean') {
+            continue;
+          }
+
+          for (const uid in selection) {
+            const isSelected = selection[uid];
+            if (isSelected) {
+              return SelectionState.Mixed;
+            }
+          }
+        }
+
+        // Otherwise otherwise, nothing is selected and header should be unselected
+        return SelectionState.Unselected;
+      }
+
+      const isSelected = selectedItems[item.kind][item.uid];
+      if (isSelected) {
+        return SelectionState.Selected;
+      }
+
+      // Because if _all_ children, then the parent is selected (and bailed in the previous check),
+      // this .some check will only return true if the children are partially selected
+      const isMixed = hasSelectedDescendants(item, childrenByParentUID, selectedItems);
+      if (isMixed) {
+        return SelectionState.Mixed;
+      }
+
+      return SelectionState.Unselected;
+    },
+    [selectedItems, childrenByParentUID]
+  );
+
   return (
     <DashboardsTree
       canSelect={canSelect}
       items={flatTree}
       width={width}
       height={height}
-      selectedItems={selectedItems}
+      isSelected={isSelected}
       onFolderClick={handleFolderClick}
       onAllSelectionChange={(newState) => dispatch(setAllSelection({ isSelected: newState }))}
       onItemSelectionChange={handleItemSelectionChange}
     />
   );
 }
+
+function hasSelectedDescendants(
+  item: DashboardViewItem,
+  childrenByParentUID: Record<string, DashboardViewItem[] | undefined>,
+  selectedItems: DashboardTreeSelection
+): boolean {
+  const children = childrenByParentUID[item.uid];
+  if (!children) {
+    return false;
+  }
+
+  return children.some((v) => {
+    const thisIsSelected = selectedItems[v.kind][v.uid];
+    if (thisIsSelected) {
+      return thisIsSelected;
+    }
+
+    return hasSelectedDescendants(v, childrenByParentUID, selectedItems);
+  });
+}
diff --git a/public/app/features/browse-dashboards/components/CheckboxCell.tsx b/public/app/features/browse-dashboards/components/CheckboxCell.tsx
new file mode 100644
index 00000000000..0ab480efb58
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/CheckboxCell.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { Checkbox } from '@grafana/ui';
+
+import { DashboardsTreeCellProps, SelectionState } from '../types';
+
+export default function CheckboxCell({
+  row: { original: row },
+  isSelected,
+  onItemSelectionChange,
+}: DashboardsTreeCellProps) {
+  const item = row.item;
+
+  if (item.kind === 'ui-empty-folder' || !isSelected) {
+    return null;
+  }
+
+  const state = isSelected(item);
+
+  return (
+    <Checkbox
+      data-testid={selectors.pages.BrowseDashbards.table.checkbox(item.uid)}
+      value={state === SelectionState.Selected}
+      indeterminate={state === SelectionState.Mixed}
+      onChange={(ev) => onItemSelectionChange?.(item, ev.currentTarget.checked)}
+    />
+  );
+}
diff --git a/public/app/features/browse-dashboards/components/CheckboxHeaderCell.tsx b/public/app/features/browse-dashboards/components/CheckboxHeaderCell.tsx
new file mode 100644
index 00000000000..910a18103b3
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/CheckboxHeaderCell.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { Checkbox } from '@grafana/ui';
+
+import { DashboardTreeHeaderProps, SelectionState } from '../types';
+
+export default function CheckboxHeaderCell({ isSelected, onAllSelectionChange }: DashboardTreeHeaderProps) {
+  const state = isSelected?.('$all') ?? SelectionState.Unselected;
+
+  return (
+    <Checkbox
+      value={state === SelectionState.Selected}
+      indeterminate={state === SelectionState.Mixed}
+      onChange={(ev) => onAllSelectionChange?.(ev.currentTarget.checked)}
+    />
+  );
+}
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
index 0f3192636e6..f070bcd26b6 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
@@ -7,6 +7,7 @@ import { assertIsDefined } from 'test/helpers/asserts';
 import { selectors } from '@grafana/e2e-selectors';
 
 import { wellFormedDashboard, wellFormedEmptyFolder, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
+import { SelectionState } from '../types';
 
 import { DashboardsTree } from './DashboardsTree';
 
@@ -22,19 +23,14 @@ describe('browse-dashboards DashboardsTree', () => {
   const emptyFolderIndicator = wellFormedEmptyFolder();
   const dashboard = wellFormedDashboard(2);
   const noop = () => {};
-  const selectedItems = {
-    $all: false,
-    folder: {},
-    dashboard: {},
-    panel: {},
-  };
+  const isSelected = () => SelectionState.Unselected;
 
   it('renders a dashboard item', () => {
     render(
       <DashboardsTree
         canSelect
         items={[dashboard]}
-        selectedItems={selectedItems}
+        isSelected={isSelected}
         width={WIDTH}
         height={HEIGHT}
         onFolderClick={noop}
@@ -53,7 +49,7 @@ describe('browse-dashboards DashboardsTree', () => {
       <DashboardsTree
         canSelect={false}
         items={[dashboard]}
-        selectedItems={selectedItems}
+        isSelected={isSelected}
         width={WIDTH}
         height={HEIGHT}
         onFolderClick={noop}
@@ -71,7 +67,7 @@ describe('browse-dashboards DashboardsTree', () => {
       <DashboardsTree
         canSelect
         items={[folder]}
-        selectedItems={selectedItems}
+        isSelected={isSelected}
         width={WIDTH}
         height={HEIGHT}
         onFolderClick={noop}
@@ -89,7 +85,7 @@ describe('browse-dashboards DashboardsTree', () => {
       <DashboardsTree
         canSelect
         items={[folder]}
-        selectedItems={selectedItems}
+        isSelected={isSelected}
         width={WIDTH}
         height={HEIGHT}
         onFolderClick={handler}
@@ -108,7 +104,7 @@ describe('browse-dashboards DashboardsTree', () => {
       <DashboardsTree
         canSelect
         items={[emptyFolderIndicator]}
-        selectedItems={selectedItems}
+        isSelected={isSelected}
         width={WIDTH}
         height={HEIGHT}
         onFolderClick={noop}
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
index 0451b15aa96..2b471e892d3 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
@@ -1,15 +1,23 @@
 import { css, cx } from '@emotion/css';
 import React, { useMemo } from 'react';
-import { CellProps, Column, HeaderProps, TableInstance, useTable } from 'react-table';
+import { TableInstance, useTable } from 'react-table';
 import { FixedSizeList as List } from 'react-window';
 
 import { GrafanaTheme2, isTruthy } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Checkbox, useStyles2 } from '@grafana/ui';
-import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
+import { useStyles2 } from '@grafana/ui';
+import { DashboardViewItem } from 'app/features/search/types';
 
-import { DashboardsTreeItem, DashboardTreeSelection, INDENT_AMOUNT_CSS_VAR } from '../types';
+import {
+  DashboardsTreeCellProps,
+  DashboardsTreeColumn,
+  DashboardsTreeItem,
+  INDENT_AMOUNT_CSS_VAR,
+  SelectionState,
+} from '../types';
 
+import CheckboxCell from './CheckboxCell';
+import CheckboxHeaderCell from './CheckboxHeaderCell';
 import { NameCell } from './NameCell';
 import { TagsCell } from './TagsCell';
 import { TypeCell } from './TypeCell';
@@ -19,23 +27,13 @@ interface DashboardsTreeProps {
   items: DashboardsTreeItem[];
   width: number;
   height: number;
-  selectedItems: DashboardTreeSelection;
+  isSelected: (kind: DashboardViewItem | '$all') => SelectionState;
   onFolderClick: (uid: string, newOpenState: boolean) => void;
   onAllSelectionChange: (newState: boolean) => void;
   onItemSelectionChange: (item: DashboardViewItem, newState: boolean) => void;
   canSelect: boolean;
 }
 
-type DashboardsTreeColumn = Column<DashboardsTreeItem>;
-type DashboardTreeHeaderProps = HeaderProps<DashboardsTreeItem> & {
-  // Note: userProps for cell renderers (e.g. second argument in `cell.render('Cell', foo)` )
-  // aren't typed, so we must be careful when accessing this
-  selectedItems?: DashboardsTreeProps['selectedItems'];
-};
-type DashboardsTreeCellProps = CellProps<DashboardsTreeItem, unknown> & {
-  selectedItems?: DashboardsTreeProps['selectedItems'];
-};
-
 const HEADER_HEIGHT = 35;
 const ROW_HEIGHT = 35;
 
@@ -43,7 +41,7 @@ export function DashboardsTree({
   items,
   width,
   height,
-  selectedItems,
+  isSelected,
   onFolderClick,
   onAllSelectionChange,
   onItemSelectionChange,
@@ -52,32 +50,12 @@ export function DashboardsTree({
   const styles = useStyles2(getStyles);
 
   const tableColumns = useMemo(() => {
-    const checkboxColumn: DashboardsTreeColumn | null = canSelect
-      ? {
-          id: 'checkbox',
-          width: 0,
-          Header: ({ selectedItems }: DashboardTreeHeaderProps) => {
-            const isAllSelected = selectedItems?.$all ?? false;
-            return <Checkbox value={isAllSelected} onChange={(ev) => onAllSelectionChange(ev.currentTarget.checked)} />;
-          },
-          Cell: ({ row: { original: row }, selectedItems }: DashboardsTreeCellProps) => {
-            const item = row.item;
-            if (item.kind === 'ui-empty-folder' || !selectedItems) {
-              return <></>;
-            }
-
-            const isSelected = selectedItems?.[item.kind][item.uid] ?? false;
-
-            return (
-              <Checkbox
-                data-testid={selectors.pages.BrowseDashbards.table.checkbox(item.uid)}
-                value={isSelected}
-                onChange={(ev) => onItemSelectionChange(item, ev.currentTarget.checked)}
-              />
-            );
-          },
-        }
-      : null;
+    const checkboxColumn: DashboardsTreeColumn = {
+      id: 'checkbox',
+      width: 0,
+      Header: CheckboxHeaderCell,
+      Cell: CheckboxCell,
+    };
 
     const nameColumn: DashboardsTreeColumn = {
       id: 'name',
@@ -102,17 +80,20 @@ export function DashboardsTree({
     const columns = [canSelect && checkboxColumn, nameColumn, typeColumn, tagsColumns].filter(isTruthy);
 
     return columns;
-  }, [onItemSelectionChange, onAllSelectionChange, onFolderClick, canSelect]);
+  }, [onFolderClick, canSelect]);
 
   const table = useTable({ columns: tableColumns, data: items }, useCustomFlexLayout);
   const { getTableProps, getTableBodyProps, headerGroups } = table;
 
-  const virtualData = useMemo(() => {
-    return {
+  const virtualData = useMemo(
+    () => ({
       table,
-      selectedItems,
-    };
-  }, [table, selectedItems]);
+      isSelected,
+      onAllSelectionChange,
+      onItemSelectionChange,
+    }),
+    [table, isSelected, onAllSelectionChange, onItemSelectionChange]
+  );
 
   return (
     <div {...getTableProps()} className={styles.tableRoot} role="table">
@@ -128,7 +109,7 @@ export function DashboardsTree({
 
               return (
                 <div key={key} {...headerProps} role="columnheader" className={styles.cell}>
-                  {column.render('Header', { selectedItems })}
+                  {column.render('Header', { isSelected, onAllSelectionChange })}
                 </div>
               );
             })}
@@ -156,13 +137,15 @@ interface VirtualListRowProps {
   style: React.CSSProperties;
   data: {
     table: TableInstance<DashboardsTreeItem>;
-    selectedItems: Record<DashboardViewItemKind, Record<string, boolean | undefined>>;
+    isSelected: DashboardsTreeCellProps['isSelected'];
+    onAllSelectionChange: DashboardsTreeCellProps['onAllSelectionChange'];
+    onItemSelectionChange: DashboardsTreeCellProps['onItemSelectionChange'];
   };
 }
 
 function VirtualListRow({ index, style, data }: VirtualListRowProps) {
   const styles = useStyles2(getStyles);
-  const { table, selectedItems } = data;
+  const { table, isSelected, onItemSelectionChange } = data;
   const { rows, prepareRow } = table;
 
   const row = rows[index];
@@ -179,7 +162,7 @@ function VirtualListRow({ index, style, data }: VirtualListRowProps) {
 
         return (
           <div key={key} {...cellProps} className={styles.cell}>
-            {cell.render('Cell', { selectedItems })}
+            {cell.render('Cell', { isSelected, onItemSelectionChange })}
           </div>
         );
       })}
diff --git a/public/app/features/browse-dashboards/state/hooks.ts b/public/app/features/browse-dashboards/state/hooks.ts
index 3bd672b0946..097ef3ebb7e 100644
--- a/public/app/features/browse-dashboards/state/hooks.ts
+++ b/public/app/features/browse-dashboards/state/hooks.ts
@@ -44,6 +44,10 @@ export function useCheckboxSelectionState() {
   return useSelector((wholeState: StoreState) => wholeState.browseDashboards.selectedItems);
 }
 
+export function useChildrenByParentUIDState() {
+  return useSelector((wholeState: StoreState) => wholeState.browseDashboards.childrenByParentUID);
+}
+
 export function useActionSelectionState() {
   return useSelector((state) => selectedItemsForActionsSelector(state));
 }
diff --git a/public/app/features/browse-dashboards/state/reducers.test.ts b/public/app/features/browse-dashboards/state/reducers.test.ts
index 32e5b3bbb99..1bf0ce0d41a 100644
--- a/public/app/features/browse-dashboards/state/reducers.test.ts
+++ b/public/app/features/browse-dashboards/state/reducers.test.ts
@@ -115,8 +115,10 @@ describe('browse-dashboards reducers', () => {
 
   describe('setItemSelectionState', () => {
     it('marks items as selected', () => {
+      const folder = wellFormedFolder(1).item;
+      const dashboard = wellFormedDashboard(2).item;
       const state = createInitialState();
-      const dashboard = wellFormedDashboard().item;
+      state.rootItems = [folder, dashboard];
 
       setItemSelectionState(state, { type: 'setItemSelectionState', payload: { item: dashboard, isSelected: true } });
 
@@ -133,11 +135,13 @@ describe('browse-dashboards reducers', () => {
     it('marks descendants as selected when the parent folder is selected', () => {
       const state = createInitialState();
 
-      const parentFolder = wellFormedFolder(1).item;
-      const childDashboard = wellFormedDashboard(2, {}, { parentUID: parentFolder.uid }).item;
-      const childFolder = wellFormedFolder(3, {}, { parentUID: parentFolder.uid }).item;
-      const grandchildDashboard = wellFormedDashboard(4, {}, { parentUID: childFolder.uid }).item;
+      const rootDashboard = wellFormedDashboard(1).item;
+      const parentFolder = wellFormedFolder(2).item;
+      const childDashboard = wellFormedDashboard(3, {}, { parentUID: parentFolder.uid }).item;
+      const childFolder = wellFormedFolder(4, {}, { parentUID: parentFolder.uid }).item;
+      const grandchildDashboard = wellFormedDashboard(5, {}, { parentUID: childFolder.uid }).item;
 
+      state.rootItems = [parentFolder, rootDashboard];
       state.childrenByParentUID[parentFolder.uid] = [childDashboard, childFolder];
       state.childrenByParentUID[childFolder.uid] = [grandchildDashboard];
 
@@ -196,6 +200,105 @@ describe('browse-dashboards reducers', () => {
         panel: {},
       });
     });
+
+    it('selects ancestors when all their children are now selected', () => {
+      const state = createInitialState();
+
+      const rootDashboard = wellFormedDashboard(1).item;
+      const parentFolder = wellFormedFolder(2).item;
+      const childDashboard = wellFormedDashboard(3, {}, { parentUID: parentFolder.uid }).item;
+      const childFolder = wellFormedFolder(4, {}, { parentUID: parentFolder.uid }).item;
+      const grandchildDashboard = wellFormedDashboard(5, {}, { parentUID: childFolder.uid }).item;
+
+      state.rootItems = [parentFolder, rootDashboard];
+      state.childrenByParentUID[parentFolder.uid] = [childDashboard, childFolder];
+      state.childrenByParentUID[childFolder.uid] = [grandchildDashboard];
+
+      // Selected the deepest grandchild dashboard
+      setItemSelectionState(state, {
+        type: 'setItemSelectionState',
+        payload: { item: grandchildDashboard, isSelected: true },
+      });
+
+      expect(state.selectedItems).toEqual({
+        $all: false,
+        dashboard: {
+          [grandchildDashboard.uid]: true,
+        },
+        folder: {
+          [parentFolder.uid]: false,
+          [childFolder.uid]: true, // is selected because all it's children (grandchildDashboard) is selected
+        },
+        panel: {},
+      });
+
+      setItemSelectionState(state, {
+        type: 'setItemSelectionState',
+        payload: { item: childDashboard, isSelected: true },
+      });
+
+      expect(state.selectedItems).toEqual({
+        $all: false,
+        dashboard: {
+          [childDashboard.uid]: true,
+          [grandchildDashboard.uid]: true,
+        },
+        folder: {
+          [parentFolder.uid]: true, // is now selected because we also selected its other child
+          [childFolder.uid]: true,
+        },
+        panel: {},
+      });
+    });
+
+    it('selects the $all header checkbox when all descendants are now selected', () => {
+      const state = createInitialState();
+
+      const rootDashboard = wellFormedDashboard(1).item;
+      const rootFolder = wellFormedFolder(2).item;
+      const childDashboardA = wellFormedDashboard(3, {}, { parentUID: rootFolder.uid }).item;
+      const childDashboardB = wellFormedDashboard(4, {}, { parentUID: rootFolder.uid }).item;
+
+      state.rootItems = [rootFolder, rootDashboard];
+      state.childrenByParentUID[rootFolder.uid] = [childDashboardA, childDashboardB];
+
+      state.selectedItems.dashboard = { [rootDashboard.uid]: true, [childDashboardA.uid]: true };
+
+      // Selected the deepest grandchild dashboard
+      setItemSelectionState(state, {
+        type: 'setItemSelectionState',
+        payload: { item: childDashboardB, isSelected: true },
+      });
+
+      expect(state.selectedItems.$all).toBeTruthy();
+    });
+
+    it('unselects the $all header checkbox a descendant is unselected', () => {
+      const state = createInitialState();
+
+      const rootDashboard = wellFormedDashboard(1).item;
+      const rootFolder = wellFormedFolder(2).item;
+      const childDashboardA = wellFormedDashboard(3, {}, { parentUID: rootFolder.uid }).item;
+      const childDashboardB = wellFormedDashboard(4, {}, { parentUID: rootFolder.uid }).item;
+
+      state.rootItems = [rootFolder, rootDashboard];
+      state.childrenByParentUID[rootFolder.uid] = [childDashboardA, childDashboardB];
+
+      state.selectedItems.dashboard = {
+        [rootDashboard.uid]: true,
+        [childDashboardA.uid]: true,
+        [childDashboardB.uid]: true,
+      };
+      state.selectedItems.folder = { [rootFolder.uid]: true };
+
+      // Selected the deepest grandchild dashboard
+      setItemSelectionState(state, {
+        type: 'setItemSelectionState',
+        payload: { item: childDashboardB, isSelected: false },
+      });
+
+      expect(state.selectedItems.$all).toBeFalsy();
+    });
   });
 
   describe('setAllSelection', () => {
diff --git a/public/app/features/browse-dashboards/state/reducers.ts b/public/app/features/browse-dashboards/state/reducers.ts
index ac79052360c..86414f423ec 100644
--- a/public/app/features/browse-dashboards/state/reducers.ts
+++ b/public/app/features/browse-dashboards/state/reducers.ts
@@ -45,6 +45,8 @@ export function setItemSelectionState(
 ) {
   const { item, isSelected } = action.payload;
 
+  // Selecting a folder selects all children, and unselecting a folder deselects all children
+  // so propagate the new selection state to all descendants
   function markChildren(kind: DashboardViewItemKind, uid: string) {
     state.selectedItems[kind][uid] = isSelected;
 
@@ -60,26 +62,37 @@ export function setItemSelectionState(
 
   markChildren(item.kind, item.uid);
 
-  // If we're unselecting an item, unselect all ancestors (parent, grandparent, etc) also
-  // so we can later show a UI-only 'mixed' checkbox
-  if (!isSelected) {
-    let nextParentUID = item.parentUID;
+  // If all children of a folder are selected, then the folder is also selected.
+  // If *any* child of a folder is unselelected, then the folder is alo unselected.
+  // Reconcile all ancestors to make sure they're in the correct state.
+  let nextParentUID = item.parentUID;
 
-    // this is like a recursive climb up the parents of the tree while we have a
-    // parentUID (we've hit a root dashboard/folder)
-    while (nextParentUID) {
-      const parent = findItem(state.rootItems, state.childrenByParentUID, nextParentUID);
+  while (nextParentUID) {
+    const parent = findItem(state.rootItems, state.childrenByParentUID, nextParentUID);
 
-      // This case should not happen, but a find can theortically return undefined, and it
-      // helps limit infinite loops
-      if (!parent) {
-        break;
-      }
-
-      state.selectedItems[parent.kind][parent.uid] = false;
-      nextParentUID = parent.parentUID;
+    // This case should not happen, but a find can theortically return undefined, and it
+    // helps limit infinite loops
+    if (!parent) {
+      break;
     }
+
+    if (isSelected) {
+      // If we're selecting an item, check all ancestors and see if all their children are
+      // now selected and update them appropriately
+      const children = state.childrenByParentUID[parent.uid];
+
+      const allChildrenSelected = children?.every((v) => state.selectedItems[v.kind][v.uid]) ?? false;
+      state.selectedItems[parent.kind][parent.uid] = allChildrenSelected;
+    } else {
+      // A folder cannot be selected if any of it's children are unselected
+      state.selectedItems[parent.kind][parent.uid] = false;
+    }
+
+    nextParentUID = parent.parentUID;
   }
+
+  // Check to see if we should mark the header checkbox selected if all root items are selected
+  state.selectedItems.$all = state.rootItems.every((v) => state.selectedItems[v.kind][v.uid]) ?? false;
 }
 
 export function setAllSelection(state: BrowseDashboardsState, action: PayloadAction<{ isSelected: boolean }>) {
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
index 7ace5982127..aa97eb5d737 100644
--- a/public/app/features/browse-dashboards/types.ts
+++ b/public/app/features/browse-dashboards/types.ts
@@ -1,3 +1,5 @@
+import { CellProps, Column, HeaderProps } from 'react-table';
+
 import { DashboardViewItem as DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
 export type DashboardTreeSelection = Record<DashboardViewItemKind, Record<string, boolean | undefined>> & {
@@ -27,3 +29,21 @@ export interface DashboardsTreeItem<T extends DashboardViewItemWithUIItems = Das
 }
 
 export const INDENT_AMOUNT_CSS_VAR = '--dashboards-tree-indentation';
+
+interface RendererUserProps {
+  // Note: userProps for cell renderers (e.g. second argument in `cell.render('Cell', foo)` )
+  // aren't typed, so we must be careful when accessing this
+  isSelected?: (kind: DashboardViewItem | '$all') => SelectionState;
+  onAllSelectionChange?: (newState: boolean) => void;
+  onItemSelectionChange?: (item: DashboardViewItem, newState: boolean) => void;
+}
+
+export type DashboardsTreeColumn = Column<DashboardsTreeItem>;
+export type DashboardsTreeCellProps = CellProps<DashboardsTreeItem, unknown> & RendererUserProps;
+export type DashboardTreeHeaderProps = HeaderProps<DashboardsTreeItem> & RendererUserProps;
+
+export enum SelectionState {
+  Unselected,
+  Selected,
+  Mixed,
+}

From fd2c7594cf4404faa507b11cd7de4662ad082e43 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 2 May 2023 11:33:59 +0000
Subject: [PATCH 576/729] NestedFolders: Add empty states for Browse and Search
 (#67423)

* NestedFolders: Add empty states for Browse and Search

* empty states

* fix types

* tests
---
 .../components/BrowseView.tsx                 | 25 ++++++
 .../components/SearchView.tsx                 | 15 +++-
 .../browse-dashboards/state/hooks.test.ts     | 79 +++++++++++++++++++
 .../features/browse-dashboards/state/hooks.ts | 12 ++-
 .../browse-dashboards/state/reducers.ts       |  6 +-
 .../features/browse-dashboards/state/slice.ts |  2 +-
 .../app/features/browse-dashboards/types.ts   |  2 +-
 .../search/state/SearchStateManager.ts        |  1 +
 8 files changed, 134 insertions(+), 8 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/state/hooks.test.ts

diff --git a/public/app/features/browse-dashboards/components/BrowseView.tsx b/public/app/features/browse-dashboards/components/BrowseView.tsx
index 021e02e5e83..8afd4cb9d51 100644
--- a/public/app/features/browse-dashboards/components/BrowseView.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseView.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 
+import { Spinner } from '@grafana/ui';
+import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import { DashboardViewItem } from 'app/features/search/types';
 import { useDispatch } from 'app/types';
 
@@ -11,6 +13,7 @@ import {
   setItemSelectionState,
   useChildrenByParentUIDState,
   setAllSelection,
+  useBrowseLoadingStatus,
 } from '../state';
 import { DashboardTreeSelection, SelectionState } from '../types';
 
@@ -24,6 +27,7 @@ interface BrowseViewProps {
 }
 
 export function BrowseView({ folderUID, width, height, canSelect }: BrowseViewProps) {
+  const status = useBrowseLoadingStatus(folderUID);
   const dispatch = useDispatch();
   const flatTree = useFlatTreeState(folderUID);
   const selectedItems = useCheckboxSelectionState();
@@ -95,6 +99,27 @@ export function BrowseView({ folderUID, width, height, canSelect }: BrowseViewPr
     [selectedItems, childrenByParentUID]
   );
 
+  if (status === 'pending') {
+    return <Spinner />;
+  }
+
+  if (status === 'fulfilled' && flatTree.length === 0) {
+    return (
+      <div style={{ width }}>
+        <EmptyListCTA
+          title={folderUID ? "This folder doesn't have any dashboards yet" : 'No dashboards yet. Create your first!'}
+          buttonIcon="plus"
+          buttonTitle="Create Dashboard"
+          buttonLink={folderUID ? `dashboard/new?folderUid=${folderUID}` : 'dashboard/new'}
+          proTip={folderUID && 'Add/move dashboards to your folder at ->'}
+          proTipLink={folderUID && 'dashboards'}
+          proTipLinkTitle={folderUID && 'Browse dashboards'}
+          proTipTarget=""
+        />
+      </div>
+    );
+  }
+
   return (
     <DashboardsTree
       canSelect={canSelect}
diff --git a/public/app/features/browse-dashboards/components/SearchView.tsx b/public/app/features/browse-dashboards/components/SearchView.tsx
index ad29eb87190..1c4653de2a9 100644
--- a/public/app/features/browse-dashboards/components/SearchView.tsx
+++ b/public/app/features/browse-dashboards/components/SearchView.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import { Spinner } from '@grafana/ui';
+import { Button, Card, Spinner } from '@grafana/ui';
 import { useKeyNavigationListener } from 'app/features/search/hooks/useSearchKeyboardSelection';
 import { SearchResultsProps, SearchResultsTable } from 'app/features/search/page/components/SearchResultsTable';
 import { useSearchStateManager } from 'app/features/search/state/SearchStateManager';
@@ -69,7 +69,18 @@ export function SearchView({ width, height, canSelect }: SearchViewProps) {
   }
 
   if (value.totalRows === 0) {
-    return <div style={{ width }}>No search results</div>;
+    return (
+      <div style={{ width }}>
+        <Card>
+          <Card.Heading>No results found for your query.</Card.Heading>
+          <Card.Actions>
+            <Button variant="secondary" onClick={stateManager.onClearSearchAndFilters}>
+              Clear search and filters
+            </Button>
+          </Card.Actions>
+        </Card>
+      </div>
+    );
   }
 
   const props: SearchResultsProps = {
diff --git a/public/app/features/browse-dashboards/state/hooks.test.ts b/public/app/features/browse-dashboards/state/hooks.test.ts
new file mode 100644
index 00000000000..87d302558d9
--- /dev/null
+++ b/public/app/features/browse-dashboards/state/hooks.test.ts
@@ -0,0 +1,79 @@
+import { configureStore } from 'app/store/configureStore';
+import { useSelector } from 'app/types';
+
+import { BrowseDashboardsState } from '../types';
+
+import { useBrowseLoadingStatus } from './hooks';
+
+jest.mock('app/types', () => {
+  const original = jest.requireActual('app/types');
+  return {
+    ...original,
+    useSelector: jest.fn(),
+  };
+});
+
+function createInitialState(partial: Partial<BrowseDashboardsState>): BrowseDashboardsState {
+  return {
+    rootItems: undefined,
+    childrenByParentUID: {},
+    openFolders: {},
+    selectedItems: {
+      $all: false,
+      dashboard: {},
+      folder: {},
+      panel: {},
+    },
+
+    ...partial,
+  };
+}
+
+describe('browse-dashboards state hooks', () => {
+  const folderUID = 'abc-123';
+
+  function mockState(browseState: BrowseDashboardsState) {
+    const wholeState = configureStore().getState();
+    wholeState.browseDashboards = browseState;
+
+    jest.mocked(useSelector).mockImplementationOnce((callback) => {
+      return callback(wholeState);
+    });
+  }
+
+  describe('useBrowseLoadingStatus', () => {
+    it('returns loading when root view is loading', () => {
+      mockState(createInitialState({ rootItems: undefined }));
+
+      const status = useBrowseLoadingStatus(undefined);
+      expect(status).toEqual('pending');
+    });
+
+    it('returns loading when folder view is loading', () => {
+      mockState(createInitialState({ childrenByParentUID: {} }));
+
+      const status = useBrowseLoadingStatus(folderUID);
+      expect(status).toEqual('pending');
+    });
+
+    it('returns fulfilled when root view is finished loading', () => {
+      mockState(createInitialState({ rootItems: [] }));
+
+      const status = useBrowseLoadingStatus(undefined);
+      expect(status).toEqual('fulfilled');
+    });
+
+    it('returns fulfilled when folder view is finished loading', () => {
+      mockState(
+        createInitialState({
+          childrenByParentUID: {
+            [folderUID]: [],
+          },
+        })
+      );
+
+      const status = useBrowseLoadingStatus(folderUID);
+      expect(status).toEqual('fulfilled');
+    });
+  });
+});
diff --git a/public/app/features/browse-dashboards/state/hooks.ts b/public/app/features/browse-dashboards/state/hooks.ts
index 097ef3ebb7e..1523ea2ec91 100644
--- a/public/app/features/browse-dashboards/state/hooks.ts
+++ b/public/app/features/browse-dashboards/state/hooks.ts
@@ -11,7 +11,7 @@ const flatTreeSelector = createSelector(
   (wholeState: StoreState) => wholeState.browseDashboards.openFolders,
   (wholeState: StoreState, rootFolderUID: string | undefined) => rootFolderUID,
   (rootItems, childrenByParentUID, openFolders, folderUID) => {
-    return createFlatTree(folderUID, rootItems, childrenByParentUID, openFolders);
+    return createFlatTree(folderUID, rootItems ?? [], childrenByParentUID, openFolders);
   }
 );
 
@@ -32,6 +32,16 @@ const selectedItemsForActionsSelector = createSelector(
   }
 );
 
+export function useBrowseLoadingStatus(folderUID: string | undefined): 'pending' | 'fulfilled' {
+  return useSelector((wholeState) => {
+    const children = folderUID
+      ? wholeState.browseDashboards.childrenByParentUID[folderUID]
+      : wholeState.browseDashboards.rootItems;
+
+    return children ? 'fulfilled' : 'pending';
+  });
+}
+
 export function useFlatTreeState(folderUID: string | undefined) {
   return useSelector((state) => flatTreeSelector(state, folderUID));
 }
diff --git a/public/app/features/browse-dashboards/state/reducers.ts b/public/app/features/browse-dashboards/state/reducers.ts
index 86414f423ec..1fcd31ff6df 100644
--- a/public/app/features/browse-dashboards/state/reducers.ts
+++ b/public/app/features/browse-dashboards/state/reducers.ts
@@ -68,7 +68,7 @@ export function setItemSelectionState(
   let nextParentUID = item.parentUID;
 
   while (nextParentUID) {
-    const parent = findItem(state.rootItems, state.childrenByParentUID, nextParentUID);
+    const parent = findItem(state.rootItems ?? [], state.childrenByParentUID, nextParentUID);
 
     // This case should not happen, but a find can theortically return undefined, and it
     // helps limit infinite loops
@@ -92,7 +92,7 @@ export function setItemSelectionState(
   }
 
   // Check to see if we should mark the header checkbox selected if all root items are selected
-  state.selectedItems.$all = state.rootItems.every((v) => state.selectedItems[v.kind][v.uid]) ?? false;
+  state.selectedItems.$all = state.rootItems?.every((v) => state.selectedItems[v.kind][v.uid]) ?? false;
 }
 
 export function setAllSelection(state: BrowseDashboardsState, action: PayloadAction<{ isSelected: boolean }>) {
@@ -115,7 +115,7 @@ export function setAllSelection(state: BrowseDashboardsState, action: PayloadAct
       }
     }
 
-    for (const child of state.rootItems) {
+    for (const child of state.rootItems ?? []) {
       state.selectedItems[child.kind][child.uid] = isSelected;
     }
   } else {
diff --git a/public/app/features/browse-dashboards/state/slice.ts b/public/app/features/browse-dashboards/state/slice.ts
index 39db1edbdb9..3f8f0db9862 100644
--- a/public/app/features/browse-dashboards/state/slice.ts
+++ b/public/app/features/browse-dashboards/state/slice.ts
@@ -8,7 +8,7 @@ import * as allReducers from './reducers';
 const { extraReducerFetchChildrenFulfilled, ...baseReducers } = allReducers;
 
 const initialState: BrowseDashboardsState = {
-  rootItems: [],
+  rootItems: undefined,
   childrenByParentUID: {},
   openFolders: {},
   selectedItems: {
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
index aa97eb5d737..f9681e83872 100644
--- a/public/app/features/browse-dashboards/types.ts
+++ b/public/app/features/browse-dashboards/types.ts
@@ -7,7 +7,7 @@ export type DashboardTreeSelection = Record<DashboardViewItemKind, Record<string
 };
 
 export interface BrowseDashboardsState {
-  rootItems: DashboardViewItem[];
+  rootItems: DashboardViewItem[] | undefined;
   childrenByParentUID: Record<string, DashboardViewItem[] | undefined>;
   selectedItems: DashboardTreeSelection;
 
diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index 104511ad2e0..211d0742884 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -95,6 +95,7 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
       tag: [],
       panel_type: undefined,
       starred: undefined,
+      sort: undefined,
     });
   };
 

From f9fd15c01e1c8e3495f4e99342ee12c7a00d3527 Mon Sep 17 00:00:00 2001
From: Jo <joao.guerreiro@grafana.com>
Date: Tue, 2 May 2023 13:57:46 +0200
Subject: [PATCH 577/729] fix shadow log in service accounts (#67643)

* fix shadow log in service accounts
---
 pkg/services/serviceaccounts/manager/service.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/services/serviceaccounts/manager/service.go b/pkg/services/serviceaccounts/manager/service.go
index aaf08d8aa47..d4a0c26c999 100644
--- a/pkg/services/serviceaccounts/manager/service.go
+++ b/pkg/services/serviceaccounts/manager/service.go
@@ -58,10 +58,9 @@ func ProvideServiceAccountsService(
 		userService,
 		orgService,
 	)
-	log := log.New("serviceaccounts")
 	s := &ServiceAccountsService{
 		store:         serviceAccountsStore,
-		log:           log,
+		log:           log.New("serviceaccounts"),
 		backgroundLog: log.New("serviceaccounts.background"),
 	}
 

From 93b461bd960051c11754508f3e39f2d9b1b5bb75 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 2 May 2023 15:05:19 +0300
Subject: [PATCH 578/729] Authentication UI: Remove auth settings (#67647)

---
 .../features/auth-config/AuthConfigPage.tsx   | 36 ++-----------------
 public/app/features/auth-config/utils.ts      |  9 -----
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/public/app/features/auth-config/AuthConfigPage.tsx b/public/app/features/auth-config/AuthConfigPage.tsx
index 1fa89e990bc..09d9a3fc1b9 100644
--- a/public/app/features/auth-config/AuthConfigPage.tsx
+++ b/public/app/features/auth-config/AuthConfigPage.tsx
@@ -11,7 +11,7 @@ import { StoreState } from 'app/types';
 import ConfigureAuthCTA from './components/ConfigureAuthCTA';
 import { ProviderCard } from './components/ProviderCard';
 import { loadSettings } from './state/actions';
-import { filterAuthSettings, getProviderUrl } from './utils';
+import { getProviderUrl } from './utils';
 
 import { getRegisteredAuthProviders } from '.';
 
@@ -20,9 +20,8 @@ interface OwnProps {}
 export type Props = OwnProps & ConnectedProps<typeof connector>;
 
 function mapStateToProps(state: StoreState) {
-  const { settings, isLoading, providerStatuses } = state.authConfig;
+  const { isLoading, providerStatuses } = state.authConfig;
   return {
-    settings,
     isLoading,
     providerStatuses,
   };
@@ -34,12 +33,7 @@ const mapDispatchToProps = {
 
 const connector = connect(mapStateToProps, mapDispatchToProps);
 
-export const AuthConfigPageUnconnected = ({
-  settings,
-  providerStatuses,
-  isLoading,
-  loadSettings,
-}: Props): JSX.Element => {
+export const AuthConfigPageUnconnected = ({ providerStatuses, isLoading, loadSettings }: Props): JSX.Element => {
   const styles = useStyles2(getStyles);
 
   useEffect(() => {
@@ -54,7 +48,6 @@ export const AuthConfigPageUnconnected = ({
   const availableProviders = authProviders.filter(
     (p) => !providerStatuses[p.id]?.enabled && !providerStatuses[p.id]?.configured
   );
-  const authSettings = filterAuthSettings(settings);
   const firstAvailableProvider = availableProviders?.length ? availableProviders[0] : null;
 
   return (
@@ -100,29 +93,6 @@ export const AuthConfigPageUnconnected = ({
             ))}
           </div>
         )}
-        {!isEmpty(authSettings) && (
-          <div className={styles.settingsSection}>
-            <h3>Settings</h3>
-            <table className="filter-table">
-              <tbody>
-                {Object.entries(authSettings).map(([sectionName, sectionSettings], i) => (
-                  <React.Fragment key={`section-${i}`}>
-                    <tr>
-                      <td className="admin-settings-section">{sectionName}</td>
-                      <td />
-                    </tr>
-                    {Object.entries(sectionSettings).map(([settingName, settingValue], j) => (
-                      <tr key={`property-${j}`}>
-                        <td className={styles.settingName}>{settingName}</td>
-                        <td className={styles.settingName}>{settingValue}</td>
-                      </tr>
-                    ))}
-                  </React.Fragment>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        )}
       </Page.Contents>
     </Page>
   );
diff --git a/public/app/features/auth-config/utils.ts b/public/app/features/auth-config/utils.ts
index 6513cbccc7c..872918065fb 100644
--- a/public/app/features/auth-config/utils.ts
+++ b/public/app/features/auth-config/utils.ts
@@ -1,15 +1,6 @@
-import { Settings } from 'app/types';
-
 import { BASE_PATH } from './constants';
 import { AuthProviderInfo } from './types';
 
-export function filterAuthSettings(settings: Settings) {
-  const authSettings: Settings = Object.fromEntries(
-    Object.entries(settings).filter(([sectionName]) => sectionName === 'auth')
-  );
-  return authSettings;
-}
-
 export function getProviderUrl(provider: AuthProviderInfo) {
   return BASE_PATH + (provider.configPath || provider.id);
 }

From 1013a3e25301718eab929ca8e19f6a68763fb5a7 Mon Sep 17 00:00:00 2001
From: Alfredo <109958902+alfredo-d@users.noreply.github.com>
Date: Tue, 2 May 2023 20:14:20 +0800
Subject: [PATCH 579/729] Docs: Fix broken link for no data and error handling
 (#67617)

Fix broken link for no data and error handling
---
 .../alerting/alerting-rules/create-grafana-managed-rule.md      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index cbef5608d54..9cd75ea7582 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -52,7 +52,7 @@ To create a Grafana-managed alert rule, complete the following steps.
    - For **Evaluate every**, specify the frequency of evaluation. Must be a multiple of 10 seconds. For examples, `1m`, `30s`.
    - For **Evaluate for**, specify the duration for which the condition must be true before an alert fires.
      > **Note:** Once a condition is breached, the alert goes into the Pending state. If the condition remains breached for the duration specified, the alert transitions to the `Firing` state, otherwise it reverts back to the `Normal` state.
-   - In **Configure no data and error handling**, configure alerting behavior in the absence of data. Use the guidelines in [No data and error handling](#no-data-and-error-handling).
+   - In **Configure no data and error handling**, configure alerting behavior in the absence of data. Use the guidelines in [No data and error handling](#configure-no-data-and-error-handling).
    - Click **Preview** to check the result of running the query at this moment. Preview excludes no data and error handling.
 
      **Note:**

From 35f649e5306b8578e1774bfc2672426273366146 Mon Sep 17 00:00:00 2001
From: Matt Dodson <47385188+MattDodsonEnglish@users.noreply.github.com>
Date: Tue, 2 May 2023 09:28:23 -0300
Subject: [PATCH 580/729] Docs, update README to explain local build (#61086)

Update README.md
---
 docs/README.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 22fa25f6f78..006bb41449b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,14 +1,19 @@
 # Building the docs locally
 
-When you contribute to documentation, it is a good practice to build the docs on your local machine to make sure your changes appear as you expect. This README explains the process for doing that.
+When you contribute to documentation, it's a good practice to build the docs on your local machine to make sure your changes appear as you expect. This README explains the process for doing that.
+
+To build a local version, you need to run a process in a Docker container.
+Grafana periodically updates the Docker image, [`docs-base`](https://hub.docker.com/r/grafana/docs-base), to update the styling of the Docs.
 
 ## Requirements
 
-Docker >= 2.1.0.3
-Yarn >= 1.22.4
+- Docker >= 2.1.0.3
+- Yarn >= 1.22.4
 
 ## Build the doc site
 
+First, make sure the Docker daemon is running on your machine. Then, follow these steps:
+
 1. On the command line, first change to the docs folder: `cd docs`.
 1. Run `make docs`. This launches a preview of the website with the current grafana docs at `http://localhost:3002/docs/grafana/latest/` which will refresh automatically when changes are made to content in the `sources` directory.
 

From 11446511c14cd20ef24ac9b8f3476fd16e72e7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 2 May 2023 16:24:59 +0200
Subject: [PATCH 581/729] Scenes: Minor fix to monitoring app (#67635)

---
 .../scenes/apps/GrafanaMonitoringApp.tsx      | 46 +------------------
 public/app/features/scenes/apps/scenes.ts     | 15 +-----
 2 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx b/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx
index 5a68485a863..b1aa3b7471f 100644
--- a/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx
+++ b/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx
@@ -1,16 +1,7 @@
 // Libraries
 import React, { useMemo, useState } from 'react';
 
-import {
-  SceneCanvasText,
-  SceneFlexLayout,
-  SceneApp,
-  SceneAppPage,
-  SceneRouteMatch,
-  EmbeddedScene,
-  SceneAppPageLike,
-  SceneFlexItem,
-} from '@grafana/scenes';
+import { SceneApp, SceneAppPage, SceneRouteMatch, SceneAppPageLike } from '@grafana/scenes';
 import { usePageNav } from 'app/core/components/Page/usePageNav';
 import { PluginPageContext, PluginPageContextType } from 'app/features/plugins/components/PluginPageContext';
 
@@ -104,44 +95,9 @@ export function getHandlerDrilldownPage(
         routePath: '/scenes/grafana-monitoring/handlers/:handler/logs',
         getScene: () => getHandlerLogsScene(handler),
         preserveUrlKeys: ['from', 'to', 'var-instance'],
-        drilldowns: [
-          {
-            routePath: '/scenes/grafana-monitoring/handlers/:handler/logs/:secondLevel',
-            getPage: getSecondLevelDrilldown,
-          },
-        ],
       }),
     ],
   });
 }
 
-export function getSecondLevelDrilldown(
-  match: SceneRouteMatch<{ handler: string; secondLevel: string }>,
-  parent: SceneAppPageLike
-) {
-  const handler = decodeURIComponent(match.params.handler);
-  const secondLevel = decodeURIComponent(match.params.secondLevel);
-  const baseUrl = `/scenes/grafana-monitoring/handlers/${encodeURIComponent(handler)}/logs/${secondLevel}`;
-
-  return new SceneAppPage({
-    title: secondLevel,
-    subTitle: 'Second level dynamic drilldown',
-    url: baseUrl,
-    getParentPage: () => parent,
-    getScene: () => {
-      return new EmbeddedScene({
-        body: new SceneFlexLayout({
-          children: [
-            new SceneFlexItem({
-              body: new SceneCanvasText({
-                text: 'Drilldown: ' + secondLevel,
-              }),
-            }),
-          ],
-        }),
-      });
-    },
-  });
-}
-
 export default GrafanaMonitoringApp;
diff --git a/public/app/features/scenes/apps/scenes.ts b/public/app/features/scenes/apps/scenes.ts
index 95316b54c7f..1f3fbe47808 100644
--- a/public/app/features/scenes/apps/scenes.ts
+++ b/public/app/features/scenes/apps/scenes.ts
@@ -164,7 +164,7 @@ export function getHttpHandlerListScene(): EmbeddedScene {
                 // },
                 title: getFrameDisplayName(frame),
                 options: {
-                  legend: { displayMode: 'hidden' },
+                  legend: { showLegend: false },
                 },
               }),
             }),
@@ -481,19 +481,6 @@ export function getHandlerLogsScene(handler: string): EmbeddedScene {
     body: new SceneFlexLayout({
       direction: 'column',
       children: [
-        new SceneFlexItem({
-          body: new VizPanel({
-            pluginId: 'text',
-            title: '',
-            options: {
-              mode: 'markdown',
-              content: `
-  [mupp](/scenes/grafana-monitoring/handlers/${encodeURIComponent(handler)}/logs/mupp)
-  [mapp](/scenes/grafana-monitoring/handlers/${encodeURIComponent(handler)}/logs/mapp)
-  `,
-            },
-          }),
-        }),
         new SceneFlexItem({
           body: new VizPanel({
             $data: logsQuery,

From 688459f25c79b80872d08dd8e18abc341986999c Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Tue, 2 May 2023 11:27:11 -0400
Subject: [PATCH 582/729] docs: move misplaced Configure legend page (#67597)

* move configure legend page and add alias

* updated page weight and tried fixing alias

* fixed alias

* add preemptive alias for current page location

* apply suggestion from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* apply suggestions from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* apply suggestions from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
---
 .../{visualizations => }/configure-legend/index.md          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename docs/sources/panels-visualizations/{visualizations => }/configure-legend/index.md (96%)

diff --git a/docs/sources/panels-visualizations/visualizations/configure-legend/index.md b/docs/sources/panels-visualizations/configure-legend/index.md
similarity index 96%
rename from docs/sources/panels-visualizations/visualizations/configure-legend/index.md
rename to docs/sources/panels-visualizations/configure-legend/index.md
index 19c618c2d03..73827297386 100644
--- a/docs/sources/panels-visualizations/visualizations/configure-legend/index.md
+++ b/docs/sources/panels-visualizations/configure-legend/index.md
@@ -1,9 +1,9 @@
 ---
 aliases:
-  - ../../panels/working-with-panels/configure-legend/
-  - ../../visualizations/configure-legend/
+  - ../panels/working-with-panels/configure-legend/
+  - visualizations/configure-legend/
 title: Configure a legend
-weight: 1300
+weight: 400
 ---
 
 # Configure a legend

From 9b81d738bf1f7f3746820872960e5c2865fcb157 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 2 May 2023 15:37:59 +0000
Subject: [PATCH 583/729] Search: Fix Folder View not loading dashboards
 (#67666)

---
 public/app/features/search/state/SearchStateManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index 211d0742884..22b45f93cb4 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -54,7 +54,7 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
       eventTrackingNamespace: folderUid ? 'manage_dashboards' : 'dashboard_search',
     });
 
-    if (doInitialSearch && this.hasSearchFilters()) {
+    if (doInitialSearch) {
       this.doSearch();
     }
   }

From 02086e843f595e828f7a46b5f833d25da01e9049 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 2 May 2023 17:22:51 +0100
Subject: [PATCH 584/729] Nested folders: hook up move/delete logic properly
 (#67648)

* clear selection post move/delete

* move actions out of rtk-query

* move findItems, create selectors, refetch children when moving/deleting

* cleaner syntax

* remove unnecessary function, just put logic in the selector

* handle moving/deleting from the root

* slightly cleaner

* handle when rootItems are undefined

* handle 'general' in the fetchChildren reducer

* only refresh at the end

* don't need thunk api
---
 .../BrowseDashboardsPage.tsx                  |  17 +--
 .../api/browseDashboardsAPI.ts                |  69 +-----------
 .../BrowseActions/BrowseActions.tsx           |  81 +++++++++-----
 .../components/DashboardsTree.tsx             |   4 +-
 .../browse-dashboards/state/actions.ts        |  45 +++++++-
 .../features/browse-dashboards/state/hooks.ts | 101 ++++++++----------
 .../browse-dashboards/state/reducers.ts       |  31 +-----
 .../features/browse-dashboards/state/utils.ts |  28 +++++
 public/app/features/search/service/folders.ts |   2 +-
 9 files changed, 181 insertions(+), 197 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/state/utils.ts

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index bda3a89aa66..ac10735a8a7 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { memo, useEffect, useMemo, useState } from 'react';
+import React, { memo, useEffect, useMemo } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
@@ -30,9 +30,6 @@ export interface Props extends GrafanaRouteComponentProps<BrowseDashboardsPageRo
 // New Browse/Manage/Search Dashboards views for nested folders
 
 const BrowseDashboardsPage = memo(({ match }: Props) => {
-  // this is a complete hack to force a full rerender.
-  // TODO remove once we move everything to RTK query
-  const [rerender, setRerender] = useState(0);
   const { uid: folderUID } = match.params;
 
   const styles = useStyles2(getStyles);
@@ -77,21 +74,15 @@ const BrowseDashboardsPage = memo(({ match }: Props) => {
           onChange={(e) => stateManager.onQueryChange(e)}
         />
 
-        {hasSelection ? <BrowseActions onActionComplete={() => setRerender(rerender + 1)} /> : <BrowseFilters />}
+        {hasSelection ? <BrowseActions /> : <BrowseFilters />}
 
         <div className={styles.subView}>
           <AutoSizer>
             {({ width, height }) =>
               isSearching ? (
-                <SearchView key={rerender} canSelect={canEditInFolder} width={width} height={height} />
+                <SearchView canSelect={canEditInFolder} width={width} height={height} />
               ) : (
-                <BrowseView
-                  key={rerender}
-                  canSelect={canEditInFolder}
-                  width={width}
-                  height={height}
-                  folderUID={folderUID}
-                />
+                <BrowseView canSelect={canEditInFolder} width={width} height={height} folderUID={folderUID} />
               )
             }
           </AutoSizer>
diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index b5c879c0abb..29e02e8f2c6 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -3,8 +3,7 @@ import { lastValueFrom } from 'rxjs';
 
 import { isTruthy } from '@grafana/data';
 import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
-import { DeleteDashboardResponse } from 'app/features/manage-dashboards/types';
-import { DashboardDTO, FolderDTO } from 'app/types';
+import { FolderDTO } from 'app/types';
 
 import { DashboardTreeSelection } from '../types';
 
@@ -36,62 +35,6 @@ export const browseDashboardsAPI = createApi({
   reducerPath: 'browseDashboardsAPI',
   baseQuery: createBackendSrvBaseQuery({ baseURL: '/api' }),
   endpoints: (builder) => ({
-    deleteDashboard: builder.mutation<DeleteDashboardResponse, string>({
-      query: (dashboardUID) => ({
-        url: `/dashboards/uid/${dashboardUID}`,
-        method: 'DELETE',
-      }),
-    }),
-    deleteFolder: builder.mutation<void, string>({
-      query: (folderUID) => ({
-        url: `/folders/${folderUID}`,
-        method: 'DELETE',
-        params: {
-          forceDeleteRules: true,
-        },
-      }),
-    }),
-    // TODO we can define this return type properly
-    moveDashboard: builder.mutation<
-      unknown,
-      {
-        dashboardUID: string;
-        destinationUID: string;
-      }
-    >({
-      queryFn: async ({ dashboardUID, destinationUID }, _api, _extraOptions, baseQuery) => {
-        const fullDash: DashboardDTO = await getBackendSrv().get(`/api/dashboards/uid/${dashboardUID}`);
-
-        const options = {
-          dashboard: fullDash.dashboard,
-          folderUid: destinationUID,
-          overwrite: false,
-        };
-
-        return baseQuery({
-          url: '/dashboards/db',
-          method: 'POST',
-          data: {
-            message: '',
-            ...options,
-          },
-        });
-      },
-    }),
-    // TODO this doesn't return void, find where the correct type is
-    moveFolder: builder.mutation<
-      void,
-      {
-        folderUID: string;
-        destinationUID: string;
-      }
-    >({
-      query: ({ folderUID, destinationUID }) => ({
-        url: `/folders/${folderUID}/move`,
-        method: 'POST',
-        data: { parentUid: destinationUID },
-      }),
-    }),
     getFolder: builder.query<FolderDTO, string>({
       query: (folderUID) => ({ url: `/folders/${folderUID}` }),
     }),
@@ -150,13 +93,5 @@ export const browseDashboardsAPI = createApi({
   }),
 });
 
-export const {
-  useDeleteDashboardMutation,
-  useDeleteFolderMutation,
-  useGetAffectedItemsQuery,
-  useGetFolderQuery,
-  useLazyGetFolderQuery,
-  useMoveDashboardMutation,
-  useMoveFolderMutation,
-} = browseDashboardsAPI;
+export const { useGetAffectedItemsQuery, useGetFolderQuery } = browseDashboardsAPI;
 export { skipToken } from '@reduxjs/toolkit/query/react';
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
index 4b40aad2740..68479753977 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
@@ -4,69 +4,92 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { Button, useStyles2 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
+import { useDispatch, useSelector } from 'app/types';
 import { ShowModalReactEvent } from 'app/types/events';
 
 import {
-  useDeleteDashboardMutation,
-  useDeleteFolderMutation,
-  useMoveDashboardMutation,
-  useMoveFolderMutation,
-} from '../../api/browseDashboardsAPI';
-import { useActionSelectionState } from '../../state';
+  childrenByParentUIDSelector,
+  deleteDashboard,
+  deleteFolder,
+  fetchChildren,
+  moveDashboard,
+  moveFolder,
+  rootItemsSelector,
+  setAllSelection,
+  useActionSelectionState,
+} from '../../state';
+import { findItem } from '../../state/utils';
 
 import { DeleteModal } from './DeleteModal';
 import { MoveModal } from './MoveModal';
 
-export interface Props {
-  // this is a complete hack to force a full rerender.
-  // TODO remove once we move everything to RTK query
-  onActionComplete?: () => void;
-}
+export interface Props {}
 
-export function BrowseActions({ onActionComplete }: Props) {
+export function BrowseActions() {
   const styles = useStyles2(getStyles);
   const selectedItems = useActionSelectionState();
-  const [deleteDashboard] = useDeleteDashboardMutation();
-  const [deleteFolder] = useDeleteFolderMutation();
-  const [moveFolder] = useMoveFolderMutation();
-  const [moveDashboard] = useMoveDashboardMutation();
+  const dispatch = useDispatch();
   const selectedDashboards = Object.keys(selectedItems.dashboard).filter((uid) => selectedItems.dashboard[uid]);
   const selectedFolders = Object.keys(selectedItems.folder).filter((uid) => selectedItems.folder[uid]);
+  const rootItems = useSelector(rootItemsSelector);
+  const childrenByParentUID = useSelector(childrenByParentUIDSelector);
+
+  const onActionComplete = (parentsToRefresh: Set<string | undefined>) => {
+    dispatch(
+      setAllSelection({
+        isSelected: false,
+      })
+    );
+    for (const parentUID of parentsToRefresh) {
+      dispatch(fetchChildren(parentUID));
+    }
+  };
 
   const onDelete = async () => {
+    const parentsToRefresh = new Set<string | undefined>();
+
     // Delete all the folders sequentially
     // TODO error handling here
     for (const folderUID of selectedFolders) {
-      await deleteFolder(folderUID).unwrap();
+      await dispatch(deleteFolder(folderUID));
+      // find the parent folder uid and add it to parentsToRefresh
+      const folder = findItem(rootItems ?? [], childrenByParentUID, folderUID);
+      parentsToRefresh.add(folder?.parentUID);
     }
 
-    // Delete all the dashboards sequenetially
+    // Delete all the dashboards sequentially
     // TODO error handling here
     for (const dashboardUID of selectedDashboards) {
-      await deleteDashboard(dashboardUID).unwrap();
+      await dispatch(deleteDashboard(dashboardUID));
+      // find the parent folder uid and add it to parentsToRefresh
+      const dashboard = findItem(rootItems ?? [], childrenByParentUID, dashboardUID);
+      parentsToRefresh.add(dashboard?.parentUID);
     }
-    onActionComplete?.();
+    onActionComplete(parentsToRefresh);
   };
 
   const onMove = async (destinationUID: string) => {
+    const parentsToRefresh = new Set<string | undefined>();
+    parentsToRefresh.add(destinationUID);
+
     // Move all the folders sequentially
     // TODO error handling here
     for (const folderUID of selectedFolders) {
-      await moveFolder({
-        folderUID,
-        destinationUID,
-      }).unwrap();
+      await dispatch(moveFolder({ folderUID, destinationUID }));
+      // find the parent folder uid and add it to parentsToRefresh
+      const folder = findItem(rootItems ?? [], childrenByParentUID, folderUID);
+      parentsToRefresh.add(folder?.parentUID);
     }
 
     // Move all the dashboards sequentially
     // TODO error handling here
     for (const dashboardUID of selectedDashboards) {
-      await moveDashboard({
-        dashboardUID,
-        destinationUID,
-      }).unwrap();
+      await dispatch(moveDashboard({ dashboardUID, destinationUID }));
+      // find the parent folder uid and add it to parentsToRefresh
+      const dashboard = findItem(rootItems ?? [], childrenByParentUID, dashboardUID);
+      parentsToRefresh.add(dashboard?.parentUID);
     }
-    onActionComplete?.();
+    onActionComplete(parentsToRefresh);
   };
 
   const showMoveModal = () => {
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
index 2b471e892d3..979dfb648b4 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
@@ -92,7 +92,9 @@ export function DashboardsTree({
       onAllSelectionChange,
       onItemSelectionChange,
     }),
-    [table, isSelected, onAllSelectionChange, onItemSelectionChange]
+    // we need this to rerender if items changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [table, isSelected, onAllSelectionChange, onItemSelectionChange, items]
   );
 
   return (
diff --git a/public/app/features/browse-dashboards/state/actions.ts b/public/app/features/browse-dashboards/state/actions.ts
index 98fa760a937..ed0ad9541a2 100644
--- a/public/app/features/browse-dashboards/state/actions.ts
+++ b/public/app/features/browse-dashboards/state/actions.ts
@@ -1,10 +1,49 @@
-import { createAsyncThunk } from '@reduxjs/toolkit';
-
+import { getBackendSrv } from '@grafana/runtime';
+import { DeleteDashboardResponse } from 'app/features/manage-dashboards/types';
+import { GENERAL_FOLDER_UID } from 'app/features/search/constants';
 import { getFolderChildren } from 'app/features/search/service/folders';
+import { createAsyncThunk, DashboardDTO } from 'app/types';
 
 export const fetchChildren = createAsyncThunk(
   'browseDashboards/fetchChildren',
   async (parentUID: string | undefined) => {
-    return await getFolderChildren(parentUID, undefined, true);
+    // Need to handle the case where the parentUID is the root
+    const uid = parentUID === GENERAL_FOLDER_UID ? undefined : parentUID;
+    return await getFolderChildren(uid, undefined, true);
+  }
+);
+
+export const deleteDashboard = createAsyncThunk('browseDashboards/deleteDashboard', async (dashboardUID: string) => {
+  return getBackendSrv().delete<DeleteDashboardResponse>(`/api/dashboards/uid/${dashboardUID}`);
+});
+
+export const deleteFolder = createAsyncThunk('browseDashboards/deleteFolder', async (folderUID: string) => {
+  return getBackendSrv().delete(`/api/folders/${folderUID}`, undefined, {
+    params: { forceDeleteRules: true },
+  });
+});
+
+export const moveDashboard = createAsyncThunk(
+  'browseDashboards/moveDashboard',
+  async ({ dashboardUID, destinationUID }: { dashboardUID: string; destinationUID: string }) => {
+    const fullDash: DashboardDTO = await getBackendSrv().get(`/api/dashboards/uid/${dashboardUID}`);
+
+    const options = {
+      dashboard: fullDash.dashboard,
+      folderUid: destinationUID,
+      overwrite: false,
+    };
+
+    return getBackendSrv().post('/api/dashboards/db', {
+      message: '',
+      ...options,
+    });
+  }
+);
+
+export const moveFolder = createAsyncThunk(
+  'browseDashboards/moveFolder',
+  async ({ folderUID, destinationUID }: { folderUID: string; destinationUID: string }) => {
+    return getBackendSrv().post(`/api/folders/${folderUID}/move`, { parentUID: destinationUID });
   }
 );
diff --git a/public/app/features/browse-dashboards/state/hooks.ts b/public/app/features/browse-dashboards/state/hooks.ts
index 1523ea2ec91..66e74ccdaab 100644
--- a/public/app/features/browse-dashboards/state/hooks.ts
+++ b/public/app/features/browse-dashboards/state/hooks.ts
@@ -5,30 +5,61 @@ import { useSelector, StoreState } from 'app/types';
 
 import { DashboardsTreeItem, DashboardTreeSelection } from '../types';
 
+export const rootItemsSelector = (wholeState: StoreState) => wholeState.browseDashboards.rootItems;
+export const childrenByParentUIDSelector = (wholeState: StoreState) => wholeState.browseDashboards.childrenByParentUID;
+export const openFoldersSelector = (wholeState: StoreState) => wholeState.browseDashboards.openFolders;
+export const selectedItemsSelector = (wholeState: StoreState) => wholeState.browseDashboards.selectedItems;
+
 const flatTreeSelector = createSelector(
-  (wholeState: StoreState) => wholeState.browseDashboards.rootItems,
-  (wholeState: StoreState) => wholeState.browseDashboards.childrenByParentUID,
-  (wholeState: StoreState) => wholeState.browseDashboards.openFolders,
+  rootItemsSelector,
+  childrenByParentUIDSelector,
+  openFoldersSelector,
   (wholeState: StoreState, rootFolderUID: string | undefined) => rootFolderUID,
   (rootItems, childrenByParentUID, openFolders, folderUID) => {
     return createFlatTree(folderUID, rootItems ?? [], childrenByParentUID, openFolders);
   }
 );
 
-const hasSelectionSelector = createSelector(
-  (wholeState: StoreState) => wholeState.browseDashboards.selectedItems,
-  (selectedItems) => {
-    return Object.values(selectedItems).some((selectedItem) =>
-      Object.values(selectedItem).some((isSelected) => isSelected)
-    );
-  }
-);
+const hasSelectionSelector = createSelector(selectedItemsSelector, (selectedItems) => {
+  return Object.values(selectedItems).some((selectedItem) =>
+    Object.values(selectedItem).some((isSelected) => isSelected)
+  );
+});
 
+// Returns a DashboardTreeSelection but unselects any selected folder's children.
+// This is useful when making backend requests to move or delete items.
+// In this case, we only need to move/delete the parent folder and it will cascade to the children.
 const selectedItemsForActionsSelector = createSelector(
-  (wholeState: StoreState) => wholeState.browseDashboards.selectedItems,
-  (wholeState: StoreState) => wholeState.browseDashboards.childrenByParentUID,
+  selectedItemsSelector,
+  childrenByParentUIDSelector,
   (selectedItems, childrenByParentUID) => {
-    return getSelectedItemsForActions(selectedItems, childrenByParentUID);
+    // Take a copy of the selected items to work with
+    // We don't care about panels here, only dashboards and folders can be moved or deleted
+    const result: Omit<DashboardTreeSelection, 'panel' | '$all'> = {
+      dashboard: { ...selectedItems.dashboard },
+      folder: { ...selectedItems.folder },
+    };
+
+    // Loop over selected folders in the input
+    for (const folderUID of Object.keys(selectedItems.folder)) {
+      const isSelected = selectedItems.folder[folderUID];
+      if (isSelected) {
+        // Unselect any children in the output
+        const children = childrenByParentUID[folderUID];
+        if (children) {
+          for (const child of children) {
+            if (child.kind === 'dashboard') {
+              result.dashboard[child.uid] = false;
+            }
+            if (child.kind === 'folder') {
+              result.folder[child.uid] = false;
+            }
+          }
+        }
+      }
+    }
+
+    return result;
   }
 );
 
@@ -51,7 +82,7 @@ export function useHasSelection() {
 }
 
 export function useCheckboxSelectionState() {
-  return useSelector((wholeState: StoreState) => wholeState.browseDashboards.selectedItems);
+  return useSelector(selectedItemsSelector);
 }
 
 export function useChildrenByParentUIDState() {
@@ -109,43 +140,3 @@ function createFlatTree(
 
   return items.flatMap((item) => mapItem(item, folderUID, level));
 }
-
-/**
- * Returns a DashboardTreeSelection but unselects any selected folder's children.
- * This is useful when making backend requests to move or delete items.
- * In this case, we only need to move/delete the parent folder and it will cascade to the children.
- * @param selectedItemsState Overall selection state
- * @param childrenByParentUID Arrays of children keyed by their parent UID
- */
-function getSelectedItemsForActions(
-  selectedItemsState: DashboardTreeSelection,
-  childrenByParentUID: Record<string, DashboardViewItem[] | undefined>
-): Omit<DashboardTreeSelection, 'panel' | '$all'> {
-  // Take a copy of the selected items to work with
-  // We don't care about panels here, only dashboards and folders can be moved or deleted
-  const result = {
-    dashboard: { ...selectedItemsState.dashboard },
-    folder: { ...selectedItemsState.folder },
-  };
-
-  // Loop over selected folders in the input
-  for (const folderUID of Object.keys(selectedItemsState.folder)) {
-    const isSelected = selectedItemsState.folder[folderUID];
-    if (isSelected) {
-      // Unselect any children in the output
-      const children = childrenByParentUID[folderUID];
-      if (children) {
-        for (const child of children) {
-          if (child.kind === 'dashboard') {
-            result.dashboard[child.uid] = false;
-          }
-          if (child.kind === 'folder') {
-            result.folder[child.uid] = false;
-          }
-        }
-      }
-    }
-  }
-
-  return result;
-}
diff --git a/public/app/features/browse-dashboards/state/reducers.ts b/public/app/features/browse-dashboards/state/reducers.ts
index 1fcd31ff6df..3b8f23c9950 100644
--- a/public/app/features/browse-dashboards/state/reducers.ts
+++ b/public/app/features/browse-dashboards/state/reducers.ts
@@ -1,10 +1,12 @@
 import { PayloadAction } from '@reduxjs/toolkit';
 
+import { GENERAL_FOLDER_UID } from 'app/features/search/constants';
 import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
 import { BrowseDashboardsState } from '../types';
 
 import { fetchChildren } from './actions';
+import { findItem } from './utils';
 
 type FetchChildrenAction = ReturnType<typeof fetchChildren.fulfilled>;
 
@@ -12,7 +14,7 @@ export function extraReducerFetchChildrenFulfilled(state: BrowseDashboardsState,
   const parentUID = action.meta.arg;
   const children = action.payload;
 
-  if (!parentUID) {
+  if (!parentUID || parentUID === GENERAL_FOLDER_UID) {
     state.rootItems = children;
     return;
   }
@@ -133,30 +135,3 @@ export function setAllSelection(state: BrowseDashboardsState, action: PayloadAct
     }
   }
 }
-
-function findItem(
-  rootItems: DashboardViewItem[],
-  childrenByUID: Record<string, DashboardViewItem[] | undefined>,
-  uid: string
-): DashboardViewItem | undefined {
-  for (const item of rootItems) {
-    if (item.uid === uid) {
-      return item;
-    }
-  }
-
-  for (const parentUID in childrenByUID) {
-    const children = childrenByUID[parentUID];
-    if (!children) {
-      continue;
-    }
-
-    for (const child of children) {
-      if (child.uid === uid) {
-        return child;
-      }
-    }
-  }
-
-  return undefined;
-}
diff --git a/public/app/features/browse-dashboards/state/utils.ts b/public/app/features/browse-dashboards/state/utils.ts
new file mode 100644
index 00000000000..04b2bfb5cd4
--- /dev/null
+++ b/public/app/features/browse-dashboards/state/utils.ts
@@ -0,0 +1,28 @@
+import { DashboardViewItem } from 'app/features/search/types';
+
+export function findItem(
+  rootItems: DashboardViewItem[],
+  childrenByUID: Record<string, DashboardViewItem[] | undefined>,
+  uid: string
+): DashboardViewItem | undefined {
+  for (const item of rootItems) {
+    if (item.uid === uid) {
+      return item;
+    }
+  }
+
+  for (const parentUID in childrenByUID) {
+    const children = childrenByUID[parentUID];
+    if (!children) {
+      continue;
+    }
+
+    for (const child of children) {
+      if (child.uid === uid) {
+        return child;
+      }
+    }
+  }
+
+  return undefined;
+}
diff --git a/public/app/features/search/service/folders.ts b/public/app/features/search/service/folders.ts
index 5da1e8d0ccc..7a096bce78a 100644
--- a/public/app/features/search/service/folders.ts
+++ b/public/app/features/search/service/folders.ts
@@ -28,7 +28,7 @@ export async function getFolderChildren(
   const dashboardsResults = await searcher.search({
     kind: ['dashboard'],
     query: '*',
-    location: parentUid ?? 'general',
+    location: parentUid || 'general',
     limit: 1000,
   });
 

From c4a31390efc756d7a95dbf110d75c90761c37f1e Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 2 May 2023 16:25:03 +0000
Subject: [PATCH 585/729] NestedFolders: Use new Browse Dashboards UI behind
 feature flag (#67416)

NestedFolders: Put feature flagged new Browse Dashboards UI at main route
---
 pkg/api/api.go                                |  6 ----
 .../browse-dashboards/components/NameCell.tsx | 13 ++++----
 .../search/components/DashboardListPage.tsx   | 33 ++++++++-----------
 public/app/routes/routes.tsx                  | 22 -------------
 4 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index f8aff7dd331..2577fbfd854 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -152,12 +152,6 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/dashboards/*", reqSignedIn, hs.Index)
 	r.Get("/goto/:uid", reqSignedIn, hs.redirectFromShortURL, hs.Index)
 
-	// Temporary routes for the work-in-progress new Browse Dashboards views
-	if hs.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
-		r.Get("/nested-dashboards/", reqSignedIn, hs.Index)
-		r.Get("/nested-dashboards/*", reqSignedIn, hs.Index)
-	}
-
 	if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) {
 		// list public dashboards
 		r.Get("/public-dashboards/list", reqSignedIn, hs.Index)
diff --git a/public/app/features/browse-dashboards/components/NameCell.tsx b/public/app/features/browse-dashboards/components/NameCell.tsx
index 4765b7042a1..5b86405934b 100644
--- a/public/app/features/browse-dashboards/components/NameCell.tsx
+++ b/public/app/features/browse-dashboards/components/NameCell.tsx
@@ -45,12 +45,13 @@ export function NameCell({ row: { original: data }, onFolderClick }: NameCellPro
         <span className={styles.folderButtonSpacer} />
       )}
 
-      <Link
-        href={item.kind === 'folder' ? `/nested-dashboards/f/${item.uid}` : `/d/${item.uid}`}
-        className={styles.link}
-      >
-        {item.title}
-      </Link>
+      {item.url ? (
+        <Link href={item.url} className={styles.link}>
+          {item.title}
+        </Link>
+      ) : (
+        item.title
+      )}
     </>
   );
 }
diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx
index 5f018a14708..986c3f54452 100644
--- a/public/app/features/search/components/DashboardListPage.tsx
+++ b/public/app/features/search/components/DashboardListPage.tsx
@@ -4,11 +4,11 @@ import { useAsync } from 'react-use';
 
 import { locationUtil, NavModelItem } from '@grafana/data';
 import { config, locationService } from '@grafana/runtime';
-import { Badge, Link, Tooltip } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+import NewBrowseDashboardsPage from 'app/features/browse-dashboards/BrowseDashboardsPage';
 import { FolderDTO } from 'app/types';
 
-import { GrafanaRouteComponentProps } from '../../../core/navigation/types';
 import { loadFolderPage } from '../loaders';
 
 import ManageDashboardsNew from './ManageDashboardsNew';
@@ -20,7 +20,16 @@ export interface DashboardListPageRouteParams {
 
 interface Props extends GrafanaRouteComponentProps<DashboardListPageRouteParams> {}
 
-export const DashboardListPage = memo(({ match, location }: Props) => {
+export const DashboardListPageFeatureToggle = memo((props: Props) => {
+  if (config.featureToggles.nestedFolders) {
+    return <NewBrowseDashboardsPage {...props} />;
+  }
+
+  return <DashboardListPage {...props} />;
+});
+DashboardListPageFeatureToggle.displayName = 'DashboardListPageFeatureToggle';
+
+const DashboardListPage = memo(({ match, location }: Props) => {
   const { loading, value } = useAsync<() => Promise<{ folder?: FolderDTO; pageNav?: NavModelItem }>>(() => {
     const uid = match.params.uid;
     const url = location.pathname;
@@ -41,21 +50,7 @@ export const DashboardListPage = memo(({ match, location }: Props) => {
   }, [match.params.uid]);
 
   return (
-    <Page
-      navId="dashboards/browse"
-      pageNav={value?.pageNav}
-      actions={
-        config.featureToggles.nestedFolders && (
-          <Link href="/nested-dashboards">
-            <Tooltip content="New Browse Dashboards for nested folders is still under development and may be missing features">
-              <span>
-                <Badge icon="folder" color="blue" text="Preview new Browse Dashboards" />
-              </span>
-            </Tooltip>
-          </Link>
-        )
-      }
-    >
+    <Page navId="dashboards/browse" pageNav={value?.pageNav}>
       <Page.Contents
         isLoading={loading}
         className={css`
@@ -72,4 +67,4 @@ export const DashboardListPage = memo(({ match, location }: Props) => {
 
 DashboardListPage.displayName = 'DashboardListPage';
 
-export default DashboardListPage;
+export default DashboardListPageFeatureToggle;
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index edcbe8488bd..b8b466801f4 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -140,9 +140,6 @@ export function getAppRoutes(): RouteDescriptor[] {
             )
       ),
     },
-
-    ...(config.featureToggles.nestedFolders ? getNestedFoldersRoutes() : []),
-
     {
       path: '/dashboards',
       component: SafeDynamicImport(
@@ -567,22 +564,3 @@ export function getDynamicDashboardRoutes(cfg = config): RouteDescriptor[] {
     },
   ];
 }
-
-function getNestedFoldersRoutes(): RouteDescriptor[] {
-  return [
-    {
-      path: '/nested-dashboards',
-      component: SafeDynamicImport(() => import('app/features/browse-dashboards/BrowseDashboardsPage')),
-    },
-
-    {
-      path: '/nested-dashboards/f/:uid',
-      component: SafeDynamicImport(() => import('app/features/browse-dashboards/BrowseDashboardsPage')),
-    },
-
-    {
-      path: '/nested-dashboards/f/:uid/:slug',
-      component: SafeDynamicImport(() => import('app/features/browse-dashboards/BrowseDashboardsPage')),
-    },
-  ];
-}

From 44f75ba185f7e1f6b0f79818492a5ae0b5d9cf3d Mon Sep 17 00:00:00 2001
From: David Harris <david.harris@grafana.com>
Date: Tue, 2 May 2023 18:05:54 +0100
Subject: [PATCH 586/729] chore: fix link to docs (#67642)

* chore: fix link to docs

* Update public/app/features/datasources/components/DataSourcesList.tsx

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>

* Update public/app/features/explore/NoDataSourceCallToAction.tsx

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>

---------

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
---
 public/app/features/datasources/components/DataSourcesList.tsx | 2 +-
 public/app/features/explore/NoDataSourceCallToAction.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/datasources/components/DataSourcesList.tsx b/public/app/features/datasources/components/DataSourcesList.tsx
index d18b2fdef53..8d92074cc47 100644
--- a/public/app/features/datasources/components/DataSourcesList.tsx
+++ b/public/app/features/datasources/components/DataSourcesList.tsx
@@ -78,7 +78,7 @@ export function DataSourcesListView({
         buttonLink={dataSourcesRoutes.New}
         buttonTitle="Add data source"
         proTip="You can also define data sources through configuration files."
-        proTipLink="http://docs.grafana.org/administration/provisioning/#datasources?utm_source=grafana_ds_list"
+        proTipLink="http://docs.grafana.org/administration/provisioning/?utm_source=grafana_ds_list#data-sources"
         proTipLinkTitle="Learn more"
         proTipTarget="_blank"
       />
diff --git a/public/app/features/explore/NoDataSourceCallToAction.tsx b/public/app/features/explore/NoDataSourceCallToAction.tsx
index f898ec5808b..1e390cf7bdb 100644
--- a/public/app/features/explore/NoDataSourceCallToAction.tsx
+++ b/public/app/features/explore/NoDataSourceCallToAction.tsx
@@ -19,7 +19,7 @@ export const NoDataSourceCallToAction = () => {
       <Icon name="rocket" />
       <> ProTip: You can also define data sources through configuration files. </>
       <a
-        href="http://docs.grafana.org/administration/provisioning/#datasources?utm_source=explore"
+        href="http://docs.grafana.org/administration/provisioning/?utm_source=explore#data-sources"
         target="_blank"
         rel="noreferrer"
         className="text-link"

From a464d9c51464349926acb22f19efc5f8ce7c2b9e Mon Sep 17 00:00:00 2001
From: Staton Hysell <101748563+staton-hyse11@users.noreply.github.com>
Date: Tue, 2 May 2023 13:26:25 -0400
Subject: [PATCH 587/729] Create 8-Saga_contribution.yaml (#67663)

---
 .../ISSUE_TEMPLATE/8-Saga_contribution.yaml   | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/8-Saga_contribution.yaml

diff --git a/.github/ISSUE_TEMPLATE/8-Saga_contribution.yaml b/.github/ISSUE_TEMPLATE/8-Saga_contribution.yaml
new file mode 100644
index 00000000000..5624b43c122
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/8-Saga_contribution.yaml
@@ -0,0 +1,65 @@
+---
+name: Saga contribution template
+description: Contribute to the design system.
+title: "Saga: "
+labels:
+  - area/grafana/ui, design-system 
+body:
+  - type: markdown
+    attributes:
+      value: |
+        By using this template, you help expand our component and pattern solutions within the design system and let others reuse your work! You can contribute bug or design defect fixes, component, and pattern enhancements, or even net-new components! This template brings visibility to the great work everyone already does and in turn helps reduce duplicate efforts.
+        Thank you!
+  - type: checkboxes
+    attributes:
+      label: What type of contribution is this?
+      description: null
+      options:
+        - label: Fix - bug, design defect, typo, documentation conciseness
+        - label: Unification - combining similar components/patterns into a single
+            solution
+        - label: Proposal - net-new component, additions, variants
+    validations:
+      required: true
+  - type: textarea
+    id: background
+    attributes:
+      label: Why is this needed?
+      description: Explain the use case and where it can be used.
+      placeholder: null
+    validations:
+      required: true
+  - type: textarea
+    id: use_case
+    attributes:
+      label: Where is this or where can it be used?
+      description: Explain the current/future use case, be sure to include areas of impact
+      placeholder: null
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Deliverables
+      description: Add a checklist of deliverables here. You can later add links to
+        each deliverable.
+      value: |
+        - Figma mockup
+        - Storybook story
+        - …
+  - type: checkboxes
+    attributes:
+      label: Contribution guiding principles
+      description: Use this checklist of guiding principles to ensure your
+        contribution makes Grafana a better product
+      options:
+        - label: Universal - not specific to a single product feature; able to be used
+            product-wide
+        - label: Accessible - inclusive to all types of users and assistive tools
+        - label: Flexible - thoughtfully built and designed to solve various
+            configurations and situations
+        - label: Coherent - follows existing visual styling and patterns
+        - label: Defined - documented clearly and concisely for ease of understanding
+        - label: Distinct - solves a unique gap or problem that cannot be solved with
+            current solutions
+    validations:
+        required: false

From 765735092a7e8a196d724204e7adbd951a0bf0fe Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Tue, 2 May 2023 13:58:36 -0400
Subject: [PATCH 588/729] docs: add nav and users info for public dashboards
 (#67674)

* add content re admin and public dashboards navigation

* added admin users section
---
 docs/sources/dashboards/dashboard-public/index.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/sources/dashboards/dashboard-public/index.md b/docs/sources/dashboards/dashboard-public/index.md
index 436b10eb7b3..60095c05e30 100644
--- a/docs/sources/dashboards/dashboard-public/index.md
+++ b/docs/sources/dashboards/dashboard-public/index.md
@@ -23,6 +23,8 @@ This can be mitigated by utilizing the enterprise [caching]({{< relref "../../ad
 
 Public dashboards allow you to share your Grafana dashboard with anyone. This is useful when you want to make your dashboard available to the world without requiring access to your Grafana organization. This differs from [dashboard sharing]({{< relref "../share-dashboards-panels" >}}), which either requires recipients to be users in the same Grafana organization or provides limited information, as with a snapshot.
 
+You can see a list of all your public dashboards in one place by navigating to **Dashboards > Public dashboards**. For each dashboard in the list, the page displays the status, a link to view the dashboard, a link to the public dashboard configuration, and the option to revoke the public URL.
+
 ## Security implications of making your dashboard public
 
 - Anyone with the URL can access the dashboard.
@@ -135,6 +137,16 @@ Immediately, the viewer no longer has access to the public dashboard, nor can th
 
 The viewer will receive an email with a new one-time use link. This will invalidate all previously issued links for that viewer.
 
+### View public dashboard users
+
+To see a list of users who have accessed your dashboard by way of email sharing, take the following steps:
+
+1. In the main sidebar navigation, click **Administration**.
+1. Click **Users**.
+1. Click the **Public dashboard users** tab.
+
+From here, you can see the earliest time a user has been active in a dashboard, which public dashboards they have access to, and their role.
+
 ### Access limitations
 
 One-time use links use browser cookies, so when a viewer is granted access through one of these links, they will only have access on the browser they used to claim the link.

From 5d5a54979c8e24927f6ff168afd01d6d5aec8a3a Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 2 May 2023 22:20:30 +0100
Subject: [PATCH 589/729] Nested folders: hook up `getAffectedItems` to the
 backend count route (#67677)

* hook up getAffectedItems to the backend count route

* mock out backendSrv in unit tests

* Don't delete alert rules while API doesn't return counts

* Show alert rule counts when API returns them

* use components for modal styles

* Revert "use components for modal styles"

This reverts commit 80ac1152f8d966b62bd692d935695bc4f992c5ba.

---------

Co-authored-by: joshhunt <josh@trtr.co>
---
 .../api/browseDashboardsAPI.ts                | 67 ++++++-------------
 .../BrowseActions/MoveModal.test.tsx          | 10 +++
 .../browse-dashboards/state/actions.ts        |  4 +-
 public/app/types/folders.ts                   | 14 ++++
 4 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index 29e02e8f2c6..66b40ae8417 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -3,7 +3,7 @@ import { lastValueFrom } from 'rxjs';
 
 import { isTruthy } from '@grafana/data';
 import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
-import { FolderDTO } from 'app/types';
+import { DescendantCount, DescendantCountDTO, FolderDTO } from 'app/types';
 
 import { DashboardTreeSelection } from '../types';
 
@@ -38,56 +38,33 @@ export const browseDashboardsAPI = createApi({
     getFolder: builder.query<FolderDTO, string>({
       query: (folderUID) => ({ url: `/folders/${folderUID}` }),
     }),
-    getAffectedItems: builder.query<
-      // TODO move to folder types file once structure is finalised
-      {
-        folder: number;
-        dashboard: number;
-        libraryPanel: number;
-        alertRule: number;
-      },
-      DashboardTreeSelection
-    >({
+    getAffectedItems: builder.query<DescendantCount, DashboardTreeSelection>({
       queryFn: async (selectedItems) => {
         const folderUIDs = Object.keys(selectedItems.folder).filter((uid) => selectedItems.folder[uid]);
-        // Mock descendant count
-        // TODO convert to real implementation
-        const mockDescendantCount = {
-          folder: 1,
-          dashboard: 1,
-          libraryPanel: 1,
-          alertRule: 1,
-        };
-        const promises = folderUIDs.map((id) => {
-          return new Promise<typeof mockDescendantCount>((resolve, reject) => {
-            // Artificial delay to simulate network request
-            setTimeout(() => {
-              resolve(mockDescendantCount);
-              // reject(new Error('Uh oh!'));
-            }, 1000);
-          });
+
+        const promises = folderUIDs.map((folderUID) => {
+          return getBackendSrv().get<DescendantCountDTO>(`/api/folders/${folderUID}/counts`);
         });
 
         const results = await Promise.all(promises);
-        const aggregatedResults = results.reduce(
-          (acc, val) => ({
-            folder: acc.folder + val.folder,
-            dashboard: acc.dashboard + val.dashboard,
-            libraryPanel: acc.libraryPanel + val.libraryPanel,
-            alertRule: acc.alertRule + val.alertRule,
-          }),
-          {
-            folder: 0,
-            dashboard: 0,
-            libraryPanel: 0,
-            alertRule: 0,
-          }
-        );
 
-        // Add in the top level selected items
-        aggregatedResults.folder += Object.values(selectedItems.folder).filter(isTruthy).length;
-        aggregatedResults.dashboard += Object.values(selectedItems.dashboard).filter(isTruthy).length;
-        return { data: aggregatedResults };
+        const totalCounts = {
+          folder: Object.values(selectedItems.folder).filter(isTruthy).length,
+          dashboard: Object.values(selectedItems.dashboard).filter(isTruthy).length,
+          libraryPanel: 0,
+          alertRule: 0,
+        };
+
+        for (const folderCounts of results) {
+          totalCounts.folder += folderCounts.folder;
+          totalCounts.dashboard += folderCounts.dashboard;
+          totalCounts.alertRule += folderCounts.alertrule ?? 0;
+
+          // TODO enable these once the backend correctly returns them
+          // totalCounts.libraryPanel += folderCounts.libraryPanel;
+        }
+
+        return { data: totalCounts };
       },
     }),
   }),
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
index 5ac7b077728..b5e34cdb623 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
@@ -4,6 +4,8 @@ import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
+import { setBackendSrv } from '@grafana/runtime';
+import { backendSrv } from 'app/core/services/__mocks__/backend_srv';
 import * as api from 'app/features/manage-dashboards/state/actions';
 import { DashboardSearchHit } from 'app/features/search/types';
 
@@ -22,6 +24,14 @@ describe('browse-dashboards MoveModal', () => {
   ];
   let props: Props;
 
+  beforeAll(() => {
+    setBackendSrv(backendSrv);
+    jest.spyOn(backendSrv, 'get').mockResolvedValue({
+      dashboard: 0,
+      folder: 0,
+    });
+  });
+
   beforeEach(() => {
     props = {
       isOpen: true,
diff --git a/public/app/features/browse-dashboards/state/actions.ts b/public/app/features/browse-dashboards/state/actions.ts
index ed0ad9541a2..8ee42212b5d 100644
--- a/public/app/features/browse-dashboards/state/actions.ts
+++ b/public/app/features/browse-dashboards/state/actions.ts
@@ -19,7 +19,9 @@ export const deleteDashboard = createAsyncThunk('browseDashboards/deleteDashboar
 
 export const deleteFolder = createAsyncThunk('browseDashboards/deleteFolder', async (folderUID: string) => {
   return getBackendSrv().delete(`/api/folders/${folderUID}`, undefined, {
-    params: { forceDeleteRules: true },
+    // TODO: Once backend returns alert rule counts, set this back to true
+    // when this is merged https://github.com/grafana/grafana/pull/67259
+    params: { forceDeleteRules: false },
   });
 });
 
diff --git a/public/app/types/folders.ts b/public/app/types/folders.ts
index 9f5bc9628a0..96b372f8ff4 100644
--- a/public/app/types/folders.ts
+++ b/public/app/types/folders.ts
@@ -27,6 +27,20 @@ export interface FolderState {
   canViewFolderPermissions: boolean;
 }
 
+export interface DescendantCountDTO {
+  folder: number;
+  dashboard: number;
+  libraryPanel: number;
+  alertrule?: number;
+}
+
+export interface DescendantCount {
+  folder: number;
+  dashboard: number;
+  libraryPanel: number;
+  alertRule: number;
+}
+
 export interface FolderInfo {
   /**
    * @deprecated use uid instead.

From 7ed93cea54d33456a6f31ef34be2aea51e961b58 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Wed, 3 May 2023 09:24:09 +0200
Subject: [PATCH 590/729] Alerting: Fix bottom links(useful links) at contact
 points fundamentals page (#67695)

Fix bottom links(useful links) at contact points fundamentals page
---
 docs/sources/alerting/fundamentals/contact-points/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/alerting/fundamentals/contact-points/index.md b/docs/sources/alerting/fundamentals/contact-points/index.md
index 6c7a3e4608b..4d8a6e955c0 100644
--- a/docs/sources/alerting/fundamentals/contact-points/index.md
+++ b/docs/sources/alerting/fundamentals/contact-points/index.md
@@ -54,6 +54,6 @@ The following table lists the contact point integrations supported by Grafana.
 
 ## Useful links
 
-[Manage contact points](/docs/grafana/latest/alerting/manage-notifications/create-contact-point/)
+[Manage contact points](/docs/grafana/latest/alerting/manage-notifications/manage-contact-points/)
 
 [Create and edit notification templates](/docs/grafana/latest/alerting/manage-notifications/template-notifications/create-notification-templates/)

From 76284ed3a698d048c681240a22008919076cb658 Mon Sep 17 00:00:00 2001
From: mikkancso <miklos.tolnai@grafana.com>
Date: Wed, 3 May 2023 09:39:13 +0200
Subject: [PATCH 591/729] Connections: Rename "Your data source" to "Data
 source" page (#67662)

rename "Your data source" to "Data source" page

This page was meant to be named "Data source" in the previous PR [0].
I just made a mistake by naming it wrongly.

[0]: https://github.com/grafana/grafana/pull/66813/files
---
 pkg/api/api.go                                |  6 ++--
 pkg/services/navtree/navtreeimpl/navtree.go   |  8 +++---
 .../features/connections/Connections.test.tsx |  2 +-
 .../__mocks__/store.navIndex.mock.ts          | 28 +++++++++----------
 public/app/features/connections/constants.ts  | 10 +++----
 .../hooks/useDataSourceSettingsNav.ts         |  4 +--
 .../connections/pages/DataSourcesListPage.tsx |  2 +-
 .../connections/pages/NewDataSourcePage.tsx   |  2 +-
 .../NoAccessModal/NoAccessModal.tsx           |  2 +-
 9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 2577fbfd854..c3756ea58ee 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -126,9 +126,9 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/plugins/:id/edit", middleware.CanAdminPlugins(hs.Cfg), hs.Index) // deprecated
 	r.Get("/plugins/:id/page/:page", middleware.CanAdminPlugins(hs.Cfg), hs.Index)
 
-	r.Get("/connections/your-datasources", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
-	r.Get("/connections/your-datasources/new", authorize(reqOrgAdmin, datasources.NewPageAccess), hs.Index)
-	r.Get("/connections/your-datasources/edit/*", authorize(reqOrgAdmin, datasources.EditPageAccess), hs.Index)
+	r.Get("/connections/datasources", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
+	r.Get("/connections/datasources/new", authorize(reqOrgAdmin, datasources.NewPageAccess), hs.Index)
+	r.Get("/connections/datasources/edit/*", authorize(reqOrgAdmin, datasources.EditPageAccess), hs.Index)
 	r.Get("/connections", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
 	r.Get("/connections/add-new-connection", authorize(reqOrgAdmin, datasources.ConfigurationPageAccess), hs.Index)
 	r.Get("/connections/datasources/:id", middleware.CanAdminPlugins(hs.Cfg), hs.Index)
diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index 09824547154..804600929fe 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -490,12 +490,12 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *contextmodel.ReqContext) *n
 			Children: []*navtree.NavLink{},
 		})
 
-		// Your data sources
+		// Data sources
 		children = append(children, &navtree.NavLink{
-			Id:       "connections-your-datasources",
-			Text:     "Your data sources",
+			Id:       "connections-datasources",
+			Text:     "Data sources",
 			SubTitle: "View and manage your connected data source connections",
-			Url:      baseUrl + "/your-datasources",
+			Url:      baseUrl + "/datasources",
 			Children: []*navtree.NavLink{},
 		})
 	}
diff --git a/public/app/features/connections/Connections.test.tsx b/public/app/features/connections/Connections.test.tsx
index 6519280a375..1eae465d761 100644
--- a/public/app/features/connections/Connections.test.tsx
+++ b/public/app/features/connections/Connections.test.tsx
@@ -55,7 +55,7 @@ describe('Connections', () => {
     expect(await screen.findByText('Add new connection')).toBeVisible();
     expect(await screen.findByText('Browse and create new connections')).toBeVisible();
 
-    // Should not render the "Your datasources" page
+    // Should not render the "datasources" page
     expect(screen.queryByText('Manage your existing datasource connections')).not.toBeInTheDocument();
   });
 
diff --git a/public/app/features/connections/__mocks__/store.navIndex.mock.ts b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
index dc3774ad9c9..99ba0cd4fca 100644
--- a/public/app/features/connections/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
@@ -235,15 +235,15 @@ export const navIndex: NavIndex = {
         url: '/connections/add-new-connection',
       },
       {
-        id: 'connections-your-datasources',
-        text: 'Your data sources',
+        id: 'connections-datasources',
+        text: 'Data sources',
         subTitle: 'Manage your existing datasource connections',
-        url: '/connections/your-datasources',
+        url: '/connections/datasources',
       },
       {
-        id: 'standalone-plugin-page-/connections/your-infrastructure',
-        text: 'Your infrastructure',
-        url: '/connections/your-infrastructure',
+        id: 'standalone-plugin-page-/connections/infrastructure',
+        text: 'Infrastructure',
+        url: '/connections/infrastructure',
         pluginId: 'grafana-easystart-app',
       },
     ],
@@ -255,16 +255,16 @@ export const navIndex: NavIndex = {
       sortWeight: -2000,
     },
   },
-  'connections-your-datasources': {
-    id: 'connections-your-datasources',
-    text: 'Your data sources',
+  'connections-datasources': {
+    id: 'connections-datasources',
+    text: 'Data sources',
     subTitle: 'Manage your existing datasource connections',
-    url: '/connections/your-datasources',
+    url: '/connections/datasources',
   },
-  'standalone-plugin-page-/connections/your-infrastructure': {
-    id: 'standalone-plugin-page-/connections/your-infrastructure',
-    text: 'Your infrastructure',
-    url: '/connections/your-infrastructure',
+  'standalone-plugin-page-/connections/infrastructure': {
+    id: 'standalone-plugin-page-/connections/infrastructure',
+    text: 'Infrastructure',
+    url: '/connections/infrastructure',
     pluginId: 'grafana-easystart-app',
   },
   'connections-add-new-connection': {
diff --git a/public/app/features/connections/constants.ts b/public/app/features/connections/constants.ts
index f24f4015c8d..406e9d41f8c 100644
--- a/public/app/features/connections/constants.ts
+++ b/public/app/features/connections/constants.ts
@@ -4,11 +4,11 @@ export const ROUTE_BASE_ID = 'connections';
 export const ROUTES = {
   Base: `/${ROUTE_BASE_ID}`,
 
-  // Your Datasources
-  DataSources: `/${ROUTE_BASE_ID}/your-datasources`,
-  DataSourcesNew: `/${ROUTE_BASE_ID}/your-datasources/new`,
-  DataSourcesEdit: `/${ROUTE_BASE_ID}/your-datasources/edit/:uid`,
-  DataSourcesDashboards: `/${ROUTE_BASE_ID}/your-datasources/edit/:uid/dashboards`,
+  // Data sources
+  DataSources: `/${ROUTE_BASE_ID}/datasources`,
+  DataSourcesNew: `/${ROUTE_BASE_ID}/datasources/new`,
+  DataSourcesEdit: `/${ROUTE_BASE_ID}/datasources/edit/:uid`,
+  DataSourcesDashboards: `/${ROUTE_BASE_ID}/datasources/edit/:uid/dashboards`,
 
   // Add new connection
   AddNewConnection: `/${ROUTE_BASE_ID}/add-new-connection`,
diff --git a/public/app/features/connections/hooks/useDataSourceSettingsNav.ts b/public/app/features/connections/hooks/useDataSourceSettingsNav.ts
index eb745955dd4..30b7b6addf2 100644
--- a/public/app/features/connections/hooks/useDataSourceSettingsNav.ts
+++ b/public/app/features/connections/hooks/useDataSourceSettingsNav.ts
@@ -23,12 +23,12 @@ export function useDataSourceSettingsNav(pageId?: string) {
     active: true,
     children: (nav.main.children || []).map((navModelItem) => ({
       ...navModelItem,
-      url: navModelItem.url?.replace('datasources/edit/', '/connections/your-datasources/edit/'),
+      url: navModelItem.url?.replace('datasources/edit/', '/connections/datasources/edit/'),
     })),
   };
 
   return {
-    navId: 'connections-your-datasources',
+    navId: 'connections-datasources',
     pageNav,
   };
 }
diff --git a/public/app/features/connections/pages/DataSourcesListPage.tsx b/public/app/features/connections/pages/DataSourcesListPage.tsx
index bfbe77d44d7..7c75b08d039 100644
--- a/public/app/features/connections/pages/DataSourcesListPage.tsx
+++ b/public/app/features/connections/pages/DataSourcesListPage.tsx
@@ -11,7 +11,7 @@ export function DataSourcesListPage() {
 
   const actions = dataSourcesCount > 0 ? <DataSourceAddButton /> : undefined;
   return (
-    <Page navId={'connections-your-datasources'} actions={actions}>
+    <Page navId={'connections-datasources'} actions={actions}>
       <Page.Contents>
         <DataSourcesList />
       </Page.Contents>
diff --git a/public/app/features/connections/pages/NewDataSourcePage.tsx b/public/app/features/connections/pages/NewDataSourcePage.tsx
index b16a6234f6a..c2228d6835b 100644
--- a/public/app/features/connections/pages/NewDataSourcePage.tsx
+++ b/public/app/features/connections/pages/NewDataSourcePage.tsx
@@ -6,7 +6,7 @@ import { NewDataSource } from 'app/features/datasources/components/NewDataSource
 export function NewDataSourcePage() {
   return (
     <Page
-      navId={'connections-your-datasources'}
+      navId={'connections-datasources'}
       pageNav={{ text: 'Add data source', subTitle: 'Choose a data source type', active: true }}
     >
       <Page.Contents>
diff --git a/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx b/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx
index e386f7b5a1f..c6e6c6f5dd6 100644
--- a/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx
+++ b/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx
@@ -91,7 +91,7 @@ export function NoAccessModal({ item, isOpen, onDismiss }: NoAccessModalProps) {
           <div>
             <p>
               Editors cannot add new connections. You may check to see if it is already configured in{' '}
-              <a href="/connections/your-datasources">Your data sources</a>.
+              <a href="/connections/datasources">Data sources</a>.
             </p>
             <p>To add a new connection, contact your Grafana admin.</p>
           </div>

From 21d28c1cb5db54f6f26544022d41fcc658430c23 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus.andersson@grafana.com>
Date: Wed, 3 May 2023 09:53:33 +0200
Subject: [PATCH 592/729] PluginCatalog: Update message about insufficient
 permissions (#67664)

Changed so we map the enum into different message.
---
 .../InstallControls/InstallControlsWarning.tsx  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/app/features/plugins/admin/components/InstallControls/InstallControlsWarning.tsx b/public/app/features/plugins/admin/components/InstallControls/InstallControlsWarning.tsx
index c2c3643d301..7a2f86c1386 100644
--- a/public/app/features/plugins/admin/components/InstallControls/InstallControlsWarning.tsx
+++ b/public/app/features/plugins/admin/components/InstallControls/InstallControlsWarning.tsx
@@ -58,8 +58,7 @@ export const InstallControlsWarning = ({ plugin, pluginStatus, latestCompatibleV
   }
 
   if (!hasPermission && !isExternallyManaged) {
-    const message = `You do not have permission to ${pluginStatus} this plugin.`;
-    return <div className={styles.message}>{message}</div>;
+    return <div className={styles.message}>{statusToMessage(pluginStatus)}</div>;
   }
 
   if (!plugin.isPublished) {
@@ -101,3 +100,17 @@ export const getStyles = (theme: GrafanaTheme2) => {
     `,
   };
 };
+
+function statusToMessage(status: PluginStatus): string {
+  switch (status) {
+    case PluginStatus.INSTALL:
+    case PluginStatus.REINSTALL:
+      return `You do not have permission to install this plugin.`;
+    case PluginStatus.UNINSTALL:
+      return `You do not have permission to uninstall this plugin.`;
+    case PluginStatus.UPDATE:
+      return `You do not have permission to update this plugin.`;
+    default:
+      return `You do not have permission to manage this plugin.`;
+  }
+}

From b10d415569dc8de78a56d549085d84e0ceae9d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Wed, 3 May 2023 10:34:29 +0200
Subject: [PATCH 593/729] grafana-data: improved field-config docs (#67696)

---
 packages/grafana-data/src/types/dataFrame.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-data/src/types/dataFrame.ts b/packages/grafana-data/src/types/dataFrame.ts
index 639a3770b76..b46e912a5f0 100644
--- a/packages/grafana-data/src/types/dataFrame.ts
+++ b/packages/grafana-data/src/types/dataFrame.ts
@@ -29,12 +29,14 @@ export enum FieldType {
  */
 export interface FieldConfig<TOptions = any> {
   /**
-   * The display value for this field.  This supports template variables blank is auto
+   * The display value for this field.  This supports template variables blank is auto.
+   * If you are a datasource plugin, do not set this. Use `field.value` and if that
+   * is not enough, use `field.config.displayNameFromDS`.
    */
   displayName?: string;
 
   /**
-   * This can be used by data sources that return and explicit naming structure for values and labels
+   * This can be used by data sources that need to customize how values are named.
    * When this property is configured, this value is used rather than the default naming strategy.
    */
   displayNameFromDS?: string;

From 69402f859b314dfdf37b6535316f7a86b6eac1e3 Mon Sep 17 00:00:00 2001
From: Alfredo <109958902+alfredo-d@users.noreply.github.com>
Date: Wed, 3 May 2023 16:43:11 +0800
Subject: [PATCH 594/729] Docs: Add callout for variables behavior with classic
 conditions (#67253)

* Add doc on classic condition behaviour with labels

* Update docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
---
 .../annotation-label/variables-label-annotation.md        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md b/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
index 7044712eb47..8d935e91865 100644
--- a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
@@ -122,6 +122,14 @@ If the rule uses Classic Conditions instead of Threshold, Reduce and Math expres
 The first condition is {{ $values.B0 }}, and the second condition is {{ $values.B1 }}
 ```
 
+With classic conditions, labels from the query are not available in `$labels` variable, because single alert instance are generated. Instead, you can retrieve the labels from the `$values` variable.
+
+```
+{{ range $k, $v := $values }}
+The value is {{ $v }} and the labels are {{ $v.Labels }}
+{{ end }}
+```
+
 ## Functions
 
 The following functions are also available when expanding labels and annotations:

From a3b10b2c8ddc2a5dba4706fb2989d6c842b8af34 Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Wed, 3 May 2023 12:02:48 +0100
Subject: [PATCH 595/729] RBAC: remove rbac disabled from preferences tests
 (#67712)

remove rbac disabled from preferences tests
---
 pkg/api/preferences_test.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/api/preferences_test.go b/pkg/api/preferences_test.go
index 871e0f63bad..4d8a1c9fc84 100644
--- a/pkg/api/preferences_test.go
+++ b/pkg/api/preferences_test.go
@@ -189,7 +189,6 @@ func TestAPIEndpoint_PutCurrentOrgPreferences_AccessControl(t *testing.T) {
 
 func TestAPIEndpoint_PatchUserPreferences(t *testing.T) {
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 
 	dashSvc := dashboards.NewFakeDashboardService(t)
 	qResult := &dashboards.Dashboard{UID: "home", ID: 1}
@@ -240,7 +239,6 @@ func TestAPIEndpoint_PatchUserPreferences(t *testing.T) {
 
 func TestAPIEndpoint_PatchOrgPreferences(t *testing.T) {
 	cfg := setting.NewCfg()
-	cfg.RBACEnabled = false
 
 	server := SetupAPITestServer(t, func(hs *HTTPServer) {
 		hs.Cfg = cfg
@@ -250,8 +248,9 @@ func TestAPIEndpoint_PatchOrgPreferences(t *testing.T) {
 	input := strings.NewReader(testPatchOrgPreferencesCmd)
 	t.Run("Returns 200 on success", func(t *testing.T) {
 		req := webtest.RequestWithSignedInUser(server.NewRequest(http.MethodPatch, patchOrgPreferencesUrl, input), &user.SignedInUser{
-			OrgID:   1,
-			OrgRole: org.RoleAdmin,
+			OrgID:       1,
+			OrgRole:     org.RoleAdmin,
+			Permissions: map[int64]map[string][]string{1: {accesscontrol.ActionOrgsPreferencesWrite: {}}},
 		})
 		response, err := server.SendJSON(req)
 		require.NoError(t, err)
@@ -262,8 +261,9 @@ func TestAPIEndpoint_PatchOrgPreferences(t *testing.T) {
 	input = strings.NewReader(testPatchOrgPreferencesCmdBad)
 	t.Run("Returns 400 with bad data", func(t *testing.T) {
 		req := webtest.RequestWithSignedInUser(server.NewRequest(http.MethodPatch, patchOrgPreferencesUrl, input), &user.SignedInUser{
-			OrgID:   1,
-			OrgRole: org.RoleAdmin,
+			OrgID:       1,
+			OrgRole:     org.RoleAdmin,
+			Permissions: map[int64]map[string][]string{1: {accesscontrol.ActionOrgsPreferencesWrite: {}}},
 		})
 		response, err := server.SendJSON(req)
 		require.NoError(t, err)

From 6570ec7afe3e58591ece5a830ada4f37c5f840dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Wed, 3 May 2023 13:37:45 +0200
Subject: [PATCH 596/729] Gauge: Set min and max for percent unit (#67517)

* Gauge: Set min and max for percent unit

* Remove exclamation mark

* Add parentheses around ternary
---
 public/app/plugins/panel/gauge/GaugePanel.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/gauge/GaugePanel.tsx b/public/app/plugins/panel/gauge/GaugePanel.tsx
index 8254065cd0b..1ac500ed62e 100644
--- a/public/app/plugins/panel/gauge/GaugePanel.tsx
+++ b/public/app/plugins/panel/gauge/GaugePanel.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 
-import { FieldDisplay, getFieldDisplayValues, PanelProps } from '@grafana/data';
+import { FieldDisplay, getDisplayProcessor, getFieldDisplayValues, PanelProps } from '@grafana/data';
 import { DataLinksContextMenu, Gauge, VizRepeater, VizRepeaterRenderValueProps } from '@grafana/ui';
 import { DataLinksContextMenuApi } from '@grafana/ui/src/components/DataLinks/DataLinksContextMenu';
 import { config } from 'app/core/config';
@@ -54,6 +54,19 @@ export class GaugePanel extends PureComponent<PanelProps<PanelOptions>> {
 
   getValues = (): FieldDisplay[] => {
     const { data, options, replaceVariables, fieldConfig, timeZone } = this.props;
+
+    for (let frame of data.series) {
+      for (let field of frame.fields) {
+        // Set the Min/Max value automatically for percent and percentunit
+        if (field.config.unit === 'percent' || field.config.unit === 'percentunit') {
+          const min = field.config.min ?? 0;
+          const max = field.config.max ?? (field.config.unit === 'percent' ? 100 : 1);
+          field.state = field.state ?? {};
+          field.state.range = { min, max, delta: max - min };
+          field.display = getDisplayProcessor({ field, theme: config.theme2 });
+        }
+      }
+    }
     return getFieldDisplayValues({
       fieldConfig,
       reduceOptions: options.reduceOptions,

From 04f1e344b10fb41219466ea6146306a22533f531 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Wed, 3 May 2023 14:52:10 +0300
Subject: [PATCH 597/729] CI: Fix broken nightly builds (#67705)

Sort objects in a bucket based on the generation timestamp
---
 pkg/build/gcloud/storage/gsutil.go | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkg/build/gcloud/storage/gsutil.go b/pkg/build/gcloud/storage/gsutil.go
index 38a040f6017..91ead018b42 100644
--- a/pkg/build/gcloud/storage/gsutil.go
+++ b/pkg/build/gcloud/storage/gsutil.go
@@ -366,11 +366,17 @@ func GetLatestMainBuild(ctx context.Context, bucket *storage.BucketHandle, path
 		return "", ErrorNilBucket
 	}
 
-	it := bucket.Objects(ctx, &storage.Query{
+	query := &storage.Query{
 		Prefix: path,
-	})
+	}
+	err := query.SetAttrSelection([]string{"Name", "Generation"})
+	if err != nil {
+		return "", fmt.Errorf("failed to set attribute selector, err: %q", err)
+	}
+	it := bucket.Objects(ctx, query)
 
 	var files []string
+	var oldGeneration int64
 	for {
 		attrs, err := it.Next()
 		if errors.Is(err, iterator.Done) {
@@ -379,12 +385,16 @@ func GetLatestMainBuild(ctx context.Context, bucket *storage.BucketHandle, path
 		if err != nil {
 			return "", fmt.Errorf("failed to iterate through bucket, err: %w", err)
 		}
-
-		files = append(files, attrs.Name)
+		if attrs.Generation >= oldGeneration {
+			files = append([]string{attrs.Name}, files...)
+			oldGeneration = attrs.Generation
+		} else {
+			files = append(files, attrs.Name)
+		}
 	}
 
 	var latestVersion string
-	for i := len(files) - 1; i >= 0; i-- {
+	for i := 0; i < len(files); i++ {
 		captureVersion := regexp.MustCompile(`(\d+\.\d+\.\d+-\d+pre)`)
 		if captureVersion.MatchString(files[i]) {
 			latestVersion = captureVersion.FindString(files[i])

From 471a03328b725bf350a07ecf7e67ee742e2b7a56 Mon Sep 17 00:00:00 2001
From: Virginia Cepeda <virginia.cepeda@grafana.com>
Date: Wed, 3 May 2023 09:37:42 -0300
Subject: [PATCH 598/729] Alerting: Allow to tab onto elements for a11y
 (#67684)

* Make search popover be tabbed onto

Co-Authored-By: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>

* Allow tokens in rule description to be tabbed onto

Co-Authored-By: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>

---------

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
---
 public/app/features/alerting/unified/components/HoverCard.tsx | 4 ++++
 public/app/features/alerting/unified/components/Tokenize.tsx  | 4 ++--
 .../alerting/unified/components/rules/RulesFilter.tsx         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/app/features/alerting/unified/components/HoverCard.tsx b/public/app/features/alerting/unified/components/HoverCard.tsx
index 9a8bd56c6e4..8239bd86426 100644
--- a/public/app/features/alerting/unified/components/HoverCard.tsx
+++ b/public/app/features/alerting/unified/components/HoverCard.tsx
@@ -57,6 +57,8 @@ export const HoverCard = ({
                 wrapperClassName={classnames(styles.popover(arrow ? 1.25 : 0), wrapperClassName)}
                 onMouseLeave={hidePopper}
                 onMouseEnter={showPopper}
+                onFocus={showPopper}
+                onBlur={hidePopper}
                 referenceElement={popoverRef.current}
                 renderArrow={
                   arrow
@@ -70,6 +72,8 @@ export const HoverCard = ({
               ref: popoverRef,
               onMouseEnter: showPopper,
               onMouseLeave: hidePopper,
+              onFocus: showPopper,
+              onBlur: hidePopper,
             })}
           </>
         );
diff --git a/public/app/features/alerting/unified/components/Tokenize.tsx b/public/app/features/alerting/unified/components/Tokenize.tsx
index 3866cc3a99a..12ca16617ff 100644
--- a/public/app/features/alerting/unified/components/Tokenize.tsx
+++ b/public/app/features/alerting/unified/components/Tokenize.tsx
@@ -88,12 +88,12 @@ function Token({ content, description, type }: TokenProps) {
       disabled={disableCard}
       content={
         <div className={styles.hoverTokenItem}>
-          <Badge text={<>{type}</>} color={'blue'} /> {description && <code>{description}</code>}
+          <Badge tabIndex={0} text={<>{type}</>} color={'blue'} /> {description && <code>{description}</code>}
         </div>
       }
     >
       <span>
-        <Badge className={styles.token} text={content} color={'blue'} />
+        <Badge tabIndex={0} className={styles.token} text={content} color={'blue'} />
       </span>
     </HoverCard>
   );
diff --git a/public/app/features/alerting/unified/components/rules/RulesFilter.tsx b/public/app/features/alerting/unified/components/rules/RulesFilter.tsx
index b38e4ac6218..9bdc54df798 100644
--- a/public/app/features/alerting/unified/components/rules/RulesFilter.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesFilter.tsx
@@ -203,7 +203,7 @@ const RulesFilter = ({ onFilterCleared = () => undefined }: RulesFilerProps) =>
                     <Stack gap={0.5}>
                       <span>Search</span>
                       <HoverCard content={<SearchQueryHelp />}>
-                        <Icon name="info-circle" size="sm" />
+                        <Icon name="info-circle" size="sm" tabIndex={0} />
                       </HoverCard>
                     </Stack>
                   </Label>

From 6cd042ed166888a31853477e023dcb504d06f50d Mon Sep 17 00:00:00 2001
From: Will Browne <wbrowne@users.noreply.github.com>
Date: Wed, 3 May 2023 14:52:57 +0200
Subject: [PATCH 599/729] Plugins: Remove dead CLI code and use pkg/plugins for
 uninstall process (#67711)

* remove dead code and use pkg/plugins for uninstall process

* fix linter
---
 pkg/cmd/grafana-cli/commands/cli.go           |  2 +-
 .../grafana-cli/commands/install_command.go   | 17 ++++
 .../grafana-cli/commands/remove_command.go    | 14 +---
 .../commands/upgrade_all_command.go           |  5 +-
 .../grafana-cli/commands/upgrade_command.go   | 20 ++---
 pkg/cmd/grafana-cli/services/api_client.go    | 78 +------------------
 pkg/cmd/grafana-cli/services/services.go      | 28 ++-----
 pkg/cmd/grafana-cli/utils/command_line.go     |  3 -
 8 files changed, 42 insertions(+), 125 deletions(-)

diff --git a/pkg/cmd/grafana-cli/commands/cli.go b/pkg/cmd/grafana-cli/commands/cli.go
index 4d421fedd6d..9865c137800 100644
--- a/pkg/cmd/grafana-cli/commands/cli.go
+++ b/pkg/cmd/grafana-cli/commands/cli.go
@@ -11,7 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
-// RunCLI is the entrypoint for the grafana-cli command. It returns the exit code for the grafana-cli program.
+// CLICommand is the entrypoint for the grafana-cli command. It returns the exit code for the grafana-cli program.
 func CLICommand(version string) *cli.Command {
 	return &cli.Command{
 		Name:  "cli",
diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index 35a8cd2a0ec..f799a847088 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
 
@@ -13,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
+	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/repo"
 	"github.com/grafana/grafana/pkg/plugins/storage"
 )
@@ -104,6 +106,21 @@ func installPlugin(ctx context.Context, pluginID, version string, c utils.Comman
 	return nil
 }
 
+// uninstallPlugin removes the plugin directory
+func uninstallPlugin(_ context.Context, pluginID string, c utils.CommandLine) error {
+	logger.Infof("Removing plugin: %v\n", pluginID)
+
+	pluginPath := filepath.Join(c.PluginDirectory(), pluginID)
+	fs := plugins.NewLocalFS(pluginPath)
+
+	logger.Debugf("Removing directory %v\n", pluginPath)
+	err := fs.Remove()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func osAndArchString() string {
 	osString := strings.ToLower(runtime.GOOS)
 	arch := runtime.GOARCH
diff --git a/pkg/cmd/grafana-cli/commands/remove_command.go b/pkg/cmd/grafana-cli/commands/remove_command.go
index 953bb7e7583..2c29dfd709f 100644
--- a/pkg/cmd/grafana-cli/commands/remove_command.go
+++ b/pkg/cmd/grafana-cli/commands/remove_command.go
@@ -1,31 +1,25 @@
 package commands
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
 
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
-var removePlugin func(pluginPath, id string) error = services.RemoveInstalledPlugin
-
 func (cmd Command) removeCommand(c utils.CommandLine) error {
-	pluginPath := c.PluginDirectory()
-
-	plugin := c.Args().First()
-	if plugin == "" {
+	pluginID := c.Args().First()
+	if pluginID == "" {
 		return errors.New("missing plugin parameter")
 	}
 
-	err := removePlugin(pluginPath, plugin)
-
+	err := uninstallPlugin(context.Background(), pluginID, c)
 	if err != nil {
 		if strings.Contains(err.Error(), "no such file or directory") {
 			return fmt.Errorf("plugin does not exist")
 		}
-
 		return err
 	} else {
 		logRestartNotice()
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
index a2309877a33..e3333073775 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
@@ -49,15 +49,16 @@ func (cmd Command) upgradeAllCommand(c utils.CommandLine) error {
 		}
 	}
 
+	ctx := context.Background()
 	for _, p := range pluginsToUpgrade {
 		logger.Infof("Updating %v \n", p.ID)
 
-		err := services.RemoveInstalledPlugin(pluginsDir, p.ID)
+		err = uninstallPlugin(ctx, p.ID, c)
 		if err != nil {
 			return err
 		}
 
-		err = installPlugin(context.Background(), p.ID, "", c)
+		err = installPlugin(ctx, p.ID, "", c)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_command.go b/pkg/cmd/grafana-cli/commands/upgrade_command.go
index 81ba757c4ac..d80a6beb908 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_command.go
@@ -12,32 +12,32 @@ import (
 )
 
 func (cmd Command) upgradeCommand(c utils.CommandLine) error {
+	ctx := context.Background()
 	pluginsDir := c.PluginDirectory()
-	pluginName := c.Args().First()
-
-	localPlugin, err := services.ReadPlugin(pluginsDir, pluginName)
+	pluginID := c.Args().First()
 
+	localPlugin, err := services.ReadPlugin(pluginsDir, pluginID)
 	if err != nil {
 		return err
 	}
 
-	plugin, err2 := cmd.Client.GetPlugin(pluginName, c.PluginRepoURL())
-	if err2 != nil {
-		return err2
+	plugin, err := cmd.Client.GetPlugin(pluginID, c.PluginRepoURL())
+	if err != nil {
+		return err
 	}
 
 	if shouldUpgrade(localPlugin.Info.Version, &plugin) {
-		if err := services.RemoveInstalledPlugin(pluginsDir, pluginName); err != nil {
-			return fmt.Errorf("failed to remove plugin '%s': %w", pluginName, err)
+		if err = uninstallPlugin(ctx, pluginID, c); err != nil {
+			return fmt.Errorf("failed to remove plugin '%s': %w", pluginID, err)
 		}
 
-		err := installPlugin(context.Background(), pluginName, "", c)
+		err = installPlugin(ctx, pluginID, "", c)
 		if err == nil {
 			logRestartNotice()
 		}
 		return err
 	}
 
-	logger.Infof("%s %s is up to date \n", color.GreenString("✔"), pluginName)
+	logger.Infof("%s %s is up to date \n", color.GreenString("✔"), pluginID)
 	return nil
 }
diff --git a/pkg/cmd/grafana-cli/services/api_client.go b/pkg/cmd/grafana-cli/services/api_client.go
index 8fa93c24390..c9f8e9a506a 100644
--- a/pkg/cmd/grafana-cli/services/api_client.go
+++ b/pkg/cmd/grafana-cli/services/api_client.go
@@ -1,15 +1,12 @@
 package services
 
 import (
-	"bufio"
-	"crypto/sha256"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
-	"os"
 	"path"
 	"runtime"
 
@@ -17,9 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 )
 
-type GrafanaComClient struct {
-	retryCount int
-}
+type GrafanaComClient struct{}
 
 func (client *GrafanaComClient) GetPlugin(pluginId, repoUrl string) (models.Plugin, error) {
 	logger.Debugf("getting plugin metadata from: %v pluginId: %v \n", repoUrl, pluginId)
@@ -42,77 +37,6 @@ func (client *GrafanaComClient) GetPlugin(pluginId, repoUrl string) (models.Plug
 	return data, nil
 }
 
-func (client *GrafanaComClient) DownloadFile(pluginName string, tmpFile *os.File, url string, checksum string) (err error) {
-	// Try handling URL as a local file path first
-	if _, err := os.Stat(url); err == nil {
-		// We can ignore this gosec G304 warning since `url` stems from command line flag "pluginUrl". If the
-		// user shouldn't be able to read the file, it should be handled through filesystem permissions.
-		// nolint:gosec
-		f, err := os.Open(url)
-		if err != nil {
-			return fmt.Errorf("%v: %w", "Failed to read plugin archive", err)
-		}
-		_, err = io.Copy(tmpFile, f)
-		if err != nil {
-			return fmt.Errorf("%v: %w", "Failed to copy plugin archive", err)
-		}
-		return nil
-	}
-
-	client.retryCount = 0
-
-	defer func() {
-		if r := recover(); r != nil {
-			client.retryCount++
-			if client.retryCount < 3 {
-				logger.Info("Failed downloading. Will retry once.")
-				err = tmpFile.Truncate(0)
-				if err != nil {
-					return
-				}
-				_, err = tmpFile.Seek(0, 0)
-				if err != nil {
-					return
-				}
-				err = client.DownloadFile(pluginName, tmpFile, url, checksum)
-			} else {
-				client.retryCount = 0
-				failure := fmt.Sprintf("%v", r)
-				if failure == "runtime error: makeslice: len out of range" {
-					err = fmt.Errorf("corrupt HTTP response from source, please try again")
-				} else {
-					panic(r)
-				}
-			}
-		}
-	}()
-
-	// Using no timeout here as some plugins can be bigger and smaller timeout would prevent to download a plugin on
-	// slow network. As this is CLI operation hanging is not a big of an issue as user can just abort.
-	bodyReader, err := sendRequest(HttpClientNoTimeout, url)
-	if err != nil {
-		return fmt.Errorf("%v: %w", "Failed to send request", err)
-	}
-	defer func() {
-		if err := bodyReader.Close(); err != nil {
-			logger.Warn("Failed to close body", "err", err)
-		}
-	}()
-
-	w := bufio.NewWriter(tmpFile)
-	h := sha256.New()
-	if _, err = io.Copy(w, io.TeeReader(bodyReader, h)); err != nil {
-		return fmt.Errorf("%v: %w", "failed to compute SHA256 checksum", err)
-	}
-	if err := w.Flush(); err != nil {
-		return fmt.Errorf("failed to write to %q: %w", tmpFile.Name(), err)
-	}
-	if len(checksum) > 0 && checksum != fmt.Sprintf("%x", h.Sum(nil)) {
-		return fmt.Errorf("expected SHA256 checksum does not match the downloaded archive - please contact security@grafana.com")
-	}
-	return nil
-}
-
 func (client *GrafanaComClient) ListAllPlugins(repoUrl string) (models.PluginRepo, error) {
 	body, err := sendRequestGetBytes(HttpClient, repoUrl, "repo")
 
diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
index 90d14838e48..119e9f91199 100644
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -15,12 +15,11 @@ import (
 )
 
 var (
-	IoHelper            models.IoUtil = IoUtilImp{}
-	HttpClient          http.Client
-	HttpClientNoTimeout http.Client
-	GrafanaVersion      string
-	ErrNotFoundError    = errors.New("404 not found error")
-	Logger              *logger.CLILogger
+	IoHelper         models.IoUtil = IoUtilImp{}
+	HttpClient       http.Client
+	GrafanaVersion   string
+	ErrNotFoundError = errors.New("404 not found error")
+	Logger           *logger.CLILogger
 )
 
 type BadRequestError struct {
@@ -37,9 +36,7 @@ func (e *BadRequestError) Error() string {
 
 func Init(version string, skipTLSVerify bool, debugMode bool) {
 	GrafanaVersion = version
-
 	HttpClient = makeHttpClient(skipTLSVerify, 10*time.Second)
-	HttpClientNoTimeout = makeHttpClient(skipTLSVerify, 0)
 	Logger = logger.New(debugMode)
 }
 
@@ -73,7 +70,7 @@ func ReadPlugin(pluginDir, pluginName string) (models.InstalledPlugin, error) {
 		pluginDataPath := filepath.Join(pluginDir, pluginName, "plugin.json")
 		data, err = IoHelper.ReadFile(pluginDataPath)
 		if err != nil {
-			return models.InstalledPlugin{}, errors.New("Could not find dist/plugin.json or plugin.json on  " + pluginName + " in " + pluginDir)
+			return models.InstalledPlugin{}, errors.New("Could not find dist/plugin.json or plugin.json for " + pluginName + " in " + pluginDir)
 		}
 	}
 
@@ -105,16 +102,3 @@ func GetLocalPlugins(pluginDir string) []models.InstalledPlugin {
 
 	return result
 }
-
-func RemoveInstalledPlugin(pluginPath, pluginName string) error {
-	logger.Infof("Removing plugin: %v\n", pluginName)
-	pluginDir := filepath.Join(pluginPath, pluginName)
-
-	_, err := IoHelper.Stat(pluginDir)
-	if err != nil {
-		return err
-	}
-
-	logger.Debugf("Removing directory %v\n", pluginDir)
-	return IoHelper.RemoveAll(pluginDir)
-}
diff --git a/pkg/cmd/grafana-cli/utils/command_line.go b/pkg/cmd/grafana-cli/utils/command_line.go
index d8faff51969..cf80714aee7 100644
--- a/pkg/cmd/grafana-cli/utils/command_line.go
+++ b/pkg/cmd/grafana-cli/utils/command_line.go
@@ -1,8 +1,6 @@
 package utils
 
 import (
-	"os"
-
 	"github.com/urfave/cli/v2"
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
@@ -27,7 +25,6 @@ type CommandLine interface {
 
 type ApiClient interface {
 	GetPlugin(pluginId, repoUrl string) (models.Plugin, error)
-	DownloadFile(pluginName string, tmpFile *os.File, url string, checksum string) (err error)
 	ListAllPlugins(repoUrl string) (models.PluginRepo, error)
 }
 

From 373e4cab9af6b7432100be99dd97d4b03313b731 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Wed, 3 May 2023 16:01:26 +0300
Subject: [PATCH 600/729] InfluxDB: Fix querying retention policies on flux
 mode (#67722)

Query retention policies only on InfluxQL mode
---
 public/app/plugins/datasource/influxdb/datasource.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 2a2a8838564..fea2aa9ee89 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -169,7 +169,8 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
   }
 
   async getRetentionPolicies(): Promise<string[]> {
-    if (this.retentionPolicies.length) {
+    // Only For InfluxQL Mode
+    if (this.isFlux || this.retentionPolicies.length) {
       return Promise.resolve(this.retentionPolicies);
     } else {
       return getAllPolicies(this).catch((err) => {

From 66ad704292cc1dc845ac69ccfcb9eec16c5255f8 Mon Sep 17 00:00:00 2001
From: Nabeel Saad <saadnabs@hotmail.com>
Date: Wed, 3 May 2023 15:05:07 +0200
Subject: [PATCH 601/729] Update index.md (#67172)

Clarified some of the intro text and added JSON outer element to make the samples clearer
---
 .../settings-updates-at-runtime/index.md              | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/settings-updates-at-runtime/index.md b/docs/sources/setup-grafana/configure-grafana/settings-updates-at-runtime/index.md
index 5196e85f63e..4c41ced8fa1 100644
--- a/docs/sources/setup-grafana/configure-grafana/settings-updates-at-runtime/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/settings-updates-at-runtime/index.md
@@ -17,11 +17,10 @@ weight: 500
 By updating settings at runtime, you can update Grafana settings without needing to restart the Grafana server.
 
 Updates that happen at runtime are stored in the database and override
-[settings from the other sources]({{< relref "../../configure-grafana/" >}})
+[settings from other sources]({{< relref "../../configure-grafana/" >}})
 (arguments, environment variables, settings file, etc). Therefore, every time a specific setting key is removed at runtime,
 the value used for that key is the inherited one from the other sources in the reverse order of precedence
-(`arguments > environment variables > settings file`), being the application default the value used when no one provided
-through one of these, at least.
+(`arguments > environment variables > settings file`). When no value is provided through any of these options, then the value used will be the application default
 
 Currently, **it only supports updates on the `auth.saml` section.**
 
@@ -55,7 +54,9 @@ it would enable SAML and disable single logouts. And, if you provide the followi
 
 ```json
 {
-  "auth.saml": ["allow_idp_initiated"]
+  "removals": {
+    "auth.saml": ["allow_idp_initiated"]
+  }
 }
 ```
 
@@ -87,7 +88,7 @@ won't be persisted into the database.
 Grafana Enterprise has a built-in scheduled background job that looks into the database every minute for
 settings updates. If there are updates, it reloads the Grafana services affected by the detected changes.
 
-The background job synchronizes settings between instances in high availability set-ups. So, after you perform some changes through the
+The background job synchronizes settings between instances in a highly available set-up. So, after you perform some changes through the
 HTTP API, then the other instances are synchronized through the database and the background job.
 
 ## Control access with role-based access control

From 3a6f162cc6f8c4050b1752f35dfd6c31d43abec9 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Wed, 3 May 2023 16:29:48 +0300
Subject: [PATCH 602/729] Datagrid: Remove multi-paste (#67387)

remove multi-paste functionality and unneccessary async from func
---
 public/app/plugins/panel/datagrid/DataGridPanel.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
index dc72717ce5c..a79fc9f45c6 100644
--- a/public/app/plugins/panel/datagrid/DataGridPanel.tsx
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
@@ -76,7 +76,7 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
     return getGridCellKind(field, row, hasGridSelection(gridSelection));
   };
 
-  const onCellEdited = async (cell: Item, newValue: EditableGridCell) => {
+  const onCellEdited = (cell: Item, newValue: EditableGridCell) => {
     // if there are rows selected, return early, we don't want to edit any cell
     if (hasGridSelection(gridSelection)) {
       return;
@@ -263,7 +263,6 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
         getCellsForSelection={isDatagridEnabled() ? true : undefined}
         showSearch={isDatagridEnabled() ? toggleSearch : false}
         onSearchClose={onSearchClose}
-        onPaste={isDatagridEnabled() ? true : undefined}
         gridSelection={gridSelection}
         onGridSelectionChange={isDatagridEnabled() ? onGridSelectionChange : undefined}
         onRowAppended={isDatagridEnabled() ? addNewRow : undefined}

From 2ecc1802e7397a23c4f42f93837a88d74f22e260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 3 May 2023 16:07:43 +0200
Subject: [PATCH 603/729] Page: Remove toolbar prop as it's no longer needed
 (#67734)

---
 public/app/core/components/Page/Page.tsx      | 13 ++------
 public/app/core/components/Page/types.ts      |  2 --
 .../components/PanelEditor/PanelEditor.tsx    | 10 ++-----
 .../dashboard/containers/DashboardPage.tsx    | 30 +++++++++----------
 .../containers/PublicDashboardPage.tsx        |  8 ++---
 .../scenes/dashboard/DashboardScene.tsx       |  4 +--
 6 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index df666b44ed9..67cb493f3da 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -24,7 +24,6 @@ export const Page: PageType = ({
   className,
   info,
   layout = PageLayoutType.Standard,
-  toolbar,
   scrollTop,
   scrollRef,
   ...otherProps
@@ -70,18 +69,10 @@ export const Page: PageType = ({
       )}
       {layout === PageLayoutType.Canvas && (
         <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
-          <div className={styles.canvasContent}>
-            {toolbar}
-            {children}
-          </div>
+          <div className={styles.canvasContent}>{children}</div>
         </CustomScrollbar>
       )}
-      {layout === PageLayoutType.Custom && (
-        <>
-          {toolbar}
-          {children}
-        </>
-      )}
+      {layout === PageLayoutType.Custom && children}
     </div>
   );
 };
diff --git a/public/app/core/components/Page/types.ts b/public/app/core/components/Page/types.ts
index 64b8ba7ba0d..6b9264324e6 100644
--- a/public/app/core/components/Page/types.ts
+++ b/public/app/core/components/Page/types.ts
@@ -19,8 +19,6 @@ export interface PageProps extends HTMLAttributes<HTMLDivElement> {
   subTitle?: React.ReactNode;
   /** Control the page layout. */
   layout?: PageLayoutType;
-  /** Something we can remove when we remove the old nav. */
-  toolbar?: React.ReactNode;
   /** Can be used to get the scroll container element to access scroll position */
   scrollRef?: RefCallback<HTMLDivElement>;
   /** Can be used to update the current scroll position */
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
index de45e2a6f12..772301165aa 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
@@ -429,12 +429,6 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
     this.setState({ showSaveLibraryPanelModal: false });
   };
 
-  renderToolbar() {
-    return (
-      <AppChromeUpdate actions={<ToolbarButtonRow alignment="right">{this.renderEditorActions()}</ToolbarButtonRow>} />
-    );
-  }
-
   render() {
     const { initDone, uiState, theme, sectionNav, pageNav, className, updatePanelEditorUIState } = this.props;
     const styles = getStyles(theme, this.props);
@@ -449,9 +443,11 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
         pageNav={pageNav}
         aria-label={selectors.components.PanelEditor.General.content}
         layout={PageLayoutType.Custom}
-        toolbar={this.renderToolbar()}
         className={className}
       >
+        <AppChromeUpdate
+          actions={<ToolbarButtonRow alignment="right">{this.renderEditorActions()}</ToolbarButtonRow>}
+        />
         <div className={styles.wrapper}>
           <div className={styles.verticalSplitPanesWrapper}>
             {!uiState.isPanelOptionsVisible ? (
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index e0c5cd3091b..cab687ff7e5 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -419,20 +419,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
     const inspectPanel = this.getInspectPanel();
     const showSubMenu = !editPanel && !kioskMode && !this.props.queryParams.editview;
 
-    const toolbar = kioskMode !== KioskMode.Full && !queryParams.editview && (
-      <header data-testid={selectors.pages.Dashboard.DashNav.navV2}>
-        <DashNav
-          dashboard={dashboard}
-          title={dashboard.title}
-          folderTitle={dashboard.meta.folderTitle}
-          isFullscreen={!!viewPanel}
-          onAddPanel={this.onAddPanel}
-          kioskMode={kioskMode}
-          hideTimePicker={dashboard.timepicker.hidden}
-          shareModalActiveTab={this.props.queryParams.shareView}
-        />
-      </header>
-    );
+    const showToolbar = kioskMode !== KioskMode.Full && !queryParams.editview;
 
     const pageClassName = cx({
       'panel-in-fullscreen': Boolean(viewPanel),
@@ -453,11 +440,24 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
           navModel={sectionNav}
           pageNav={pageNav}
           layout={PageLayoutType.Canvas}
-          toolbar={toolbar}
           className={pageClassName}
           scrollRef={this.setScrollRef}
           scrollTop={updateScrollTop}
         >
+          {showToolbar && (
+            <header data-testid={selectors.pages.Dashboard.DashNav.navV2}>
+              <DashNav
+                dashboard={dashboard}
+                title={dashboard.title}
+                folderTitle={dashboard.meta.folderTitle}
+                isFullscreen={!!viewPanel}
+                onAddPanel={this.onAddPanel}
+                kioskMode={kioskMode}
+                hideTimePicker={dashboard.timepicker.hidden}
+                shareModalActiveTab={this.props.queryParams.shareView}
+              />
+            </header>
+          )}
           <DashboardPrompt dashboard={dashboard} />
           {initError && <DashboardFailed />}
           {showSubMenu && (
diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.tsx
index 12e5fa6cda8..861f7b6dd70 100644
--- a/public/app/features/dashboard/containers/PublicDashboardPage.tsx
+++ b/public/app/features/dashboard/containers/PublicDashboardPage.tsx
@@ -104,12 +104,8 @@ const PublicDashboardPage = (props: Props) => {
   }
 
   return (
-    <Page
-      pageNav={{ text: dashboard.title }}
-      layout={PageLayoutType.Custom}
-      toolbar={<Toolbar dashboard={dashboard} />}
-      data-testid={selectors.page}
-    >
+    <Page pageNav={{ text: dashboard.title }} layout={PageLayoutType.Custom} data-testid={selectors.page}>
+      <Toolbar dashboard={dashboard} />
       {dashboardState.initError && <DashboardFailed initError={dashboardState.initError} />}
       <div className={styles.gridContainer}>
         <DashboardGrid dashboard={dashboard} isEditable={false} viewPanel={null} editPanel={null} hidePanelMenus />
diff --git a/public/app/features/scenes/dashboard/DashboardScene.tsx b/public/app/features/scenes/dashboard/DashboardScene.tsx
index 2f0d2967dc7..b3132a98e51 100644
--- a/public/app/features/scenes/dashboard/DashboardScene.tsx
+++ b/public/app/features/scenes/dashboard/DashboardScene.tsx
@@ -36,10 +36,10 @@ function DashboardSceneRenderer({ model }: SceneComponentProps<DashboardScene>)
       />
     );
   }
-  const pageToolbar = <AppChromeUpdate actions={toolbarActions} />;
 
   return (
-    <Page navId="scenes" pageNav={{ text: title }} layout={PageLayoutType.Canvas} toolbar={pageToolbar}>
+    <Page navId="scenes" pageNav={{ text: title }} layout={PageLayoutType.Canvas}>
+      <AppChromeUpdate actions={toolbarActions} />
       {controls && (
         <div className={styles.controls}>
           {controls.map((control) => (

From cd8b6be41dea26f833a8f5d1c993dfe0bdeed2f5 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Wed, 3 May 2023 17:48:30 +0300
Subject: [PATCH 604/729] Maintain column widths when deleting columns (#67707)

---
 public/app/plugins/panel/datagrid/state.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/datagrid/state.ts b/public/app/plugins/panel/datagrid/state.ts
index 65840df7afe..fe414b124ca 100644
--- a/public/app/plugins/panel/datagrid/state.ts
+++ b/public/app/plugins/panel/datagrid/state.ts
@@ -220,9 +220,14 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
       columns = [
         ...updateColumnsPayload.frame.fields.map((field: Field, index: number) => {
           const displayName = getFieldDisplayName(field, updateColumnsPayload.frame);
+
+          // find column by field name and update width in new set. We cannot use index because
+          // if a column gets deleted we don't know the correct index anymore
+          const width = state.columns.find((column) => column.title === displayName)?.width;
+
           return {
             title: displayName,
-            width: state.columns[index]?.width ?? getCellWidth(field),
+            width: width ?? getCellWidth(field),
             icon: typeToIconMap.get(field.type),
             hasMenu: isDatagridEnabled(),
             trailingRowOptions: { targetColumn: --index },

From 8166453f9fb2d7ed9b5e5ca3c8d332b3041f0475 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Wed, 3 May 2023 17:01:20 +0200
Subject: [PATCH 605/729] Alerting: Fix export button variant (#67742)

Fix export button variant
---
 public/app/features/alerting/unified/RuleList.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/alerting/unified/RuleList.tsx b/public/app/features/alerting/unified/RuleList.tsx
index 1a566e19dc6..7baeadeeb44 100644
--- a/public/app/features/alerting/unified/RuleList.tsx
+++ b/public/app/features/alerting/unified/RuleList.tsx
@@ -118,6 +118,7 @@ const RuleList = withErrorBoundary(
               <Stack direction="row" gap={0.5}>
                 {canReadProvisioning && (
                   <LinkButton
+                    variant="secondary"
                     href={createUrl('/api/v1/provisioning/alert-rules/export', {
                       download: 'true',
                       format: 'yaml',

From 0271a1d094f7daab19354562a821509f6831000d Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Wed, 3 May 2023 11:17:28 -0400
Subject: [PATCH 606/729] docs: add semi relative time ranges (#67559)

* add semi-relative time range section

* added second example and reworded

* formatting fixes

* added alerting note and fixed formatting

* wording fix
---
 .../dashboards/use-dashboards/index.md        | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/docs/sources/dashboards/use-dashboards/index.md b/docs/sources/dashboards/use-dashboards/index.md
index fe5bbac9257..6b8cd5e2dee 100644
--- a/docs/sources/dashboards/use-dashboards/index.md
+++ b/docs/sources/dashboards/use-dashboards/index.md
@@ -86,7 +86,7 @@ This section describes supported time units and relative ranges, the common time
 
 Grafana supports the following time units: `s (seconds)`, `m (minutes)`, `h (hours)`, `d (days)`, `w (weeks)`, `M (months)`, `Q (quarters)` and `y (years)`.
 
-The minus operator enables you to step back in time, relative to now. If you want to display the full period of the unit (day, week, month, etc...), append `/<time unit>` to the end. To view fiscal periods, use `fQ (fiscal quarter)` and `fy (fiscal year)` time units.
+The minus operator enables you to step back in time, relative to the current date and time, or `now`. If you want to display the full period of the unit (day, week, month, etc...), append `/<time unit>` to the end. To view fiscal periods, use `fQ (fiscal quarter)` and `fy (fiscal year)` time units.
 
 The plus operator enables you to step forward in time, relative to now. For example, you can use this feature to look at predicted data in the future.
 
@@ -105,13 +105,15 @@ The following table provides example relative ranges:
 | This Year              | `now/Y`     | `now/Y`     |
 | Previous fiscal year   | `now-1y/fy` | `now-1y/fy` |
 
-#### Note about Grafana Alerting
+{{% admonition type="Note" %}}
 
-For Grafana Alerting, we do not support the following syntaxes at this time.
+Grafana Alerting does not support the following syntaxes at this time:
 
 - now+n for future timestamps.
 - now-1n/n for "start of n until end of n" because this is an absolute timestamp.
 
+{{% /admonition %}}
+
 ### Common time range controls
 
 The dashboard and panel time controls have a common UI.
@@ -156,6 +158,32 @@ You can set an absolute time range in the following ways:
 
 This section also displays recently used absolute ranges.
 
+#### Semi-relative time range
+
+{{% admonition type="Note" %}}
+
+Grafana Alerting does not support semi-relative time ranges.
+
+{{% /admonition %}}
+
+You can also use the absolute time range settings to set a semi-relative time range. Semi-relative time range dashboards are useful when you need to monitor the progress of something over time, but you also want to see the entire history from a starting point.
+
+Set a semi-relative time range by setting the start time to an absolute timestamp and the end time to a “now” that is relative to the current time. For example:
+
+**Start time:** `2023-05-01 00:00:00`
+
+**End time:** `now`
+
+If you wanted to track the progress of something during business hours, you could set a time range that covers the current day, but starting at 8am, like so:
+
+**Start time:** `now/d+8h`
+
+**End time:** `now`
+
+This is equivalent to the **Today so far** time range preset, but it starts at 8:00am instead of 12:00am by appending +8h to the periodic start time.
+
+Using a semi-relative time range, as time progresses, your dashboard will automatically and progressively zoom out to show more history and fewer details. At the same rate, as high data resolution decreases, historical trends over the entire time period will become more clear.
+
 #### Zoom out (Cmd+Z or Ctrl+Z)
 
 Click the **Zoom out** icon to view a larger time range in the dashboard or panel visualization.

From e3efecacb5f1aaf5972f1a12cc457690dac2d0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 3 May 2023 17:19:56 +0200
Subject: [PATCH 607/729] PageHeader: Set h1 style from wrapping element
 (#67735)

---
 public/app/core/components/Page/PageHeader.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/app/core/components/Page/PageHeader.tsx b/public/app/core/components/Page/PageHeader.tsx
index 7e3b7aa3e8e..a7f1e056089 100644
--- a/public/app/core/components/Page/PageHeader.tsx
+++ b/public/app/core/components/Page/PageHeader.tsx
@@ -20,7 +20,7 @@ export function PageHeader({ navItem, renderTitle, actions, info, subTitle }: Pr
   const styles = useStyles2(getStyles);
   const sub = subTitle ?? navItem.subTitle;
 
-  const titleElement = renderTitle ? renderTitle(navItem.text) : <h1 className={styles.pageTitle}>{navItem.text}</h1>;
+  const titleElement = renderTitle ? renderTitle(navItem.text) : <h1>{navItem.text}</h1>;
 
   return (
     <div className={styles.pageHeader}>
@@ -51,6 +51,10 @@ const getStyles = (theme: GrafanaTheme2) => {
     title: css({
       display: 'flex',
       flexDirection: 'row',
+      h1: {
+        display: 'flex',
+        marginBottom: 0,
+      },
     }),
     actions: css({
       display: 'flex',
@@ -73,10 +77,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       gap: theme.spacing(1),
       marginBottom: theme.spacing(2),
     }),
-    pageTitle: css({
-      display: 'flex',
-      marginBottom: 0,
-    }),
     subTitle: css({
       position: 'relative',
       color: theme.colors.text.secondary,

From 049029b6a27022897e4af4751c393f753f858975 Mon Sep 17 00:00:00 2001
From: Virginia Cepeda <virginia.cepeda@grafana.com>
Date: Wed, 3 May 2023 12:43:45 -0300
Subject: [PATCH 608/729] Alerting: Fix banner button variant (#67750)

Fix banner button variant
---
 .../alerting/unified/components/receivers/TemplateForm.tsx       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
index 72c28266b14..b550fd19fab 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
@@ -264,6 +264,7 @@ function TemplatingGuideline() {
             href="https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/"
             target="_blank"
             icon="external-link-alt"
+            variant="secondary"
           >
             Templating documentation
           </LinkButton>

From f03d0698d3faa756004c8766290fffe4131a293c Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Wed, 3 May 2023 16:45:11 +0100
Subject: [PATCH 609/729] Explore: move panes into a keyed object (#66117)

---
 .betterer.results                             |  19 +-
 packages/grafana-data/src/types/explore.ts    |   4 +-
 public/app/core/utils/explore.test.ts         |   2 +-
 .../explore/AddToDashboard/index.test.tsx     |  10 +-
 public/app/features/explore/Explore.test.tsx  |   4 +-
 public/app/features/explore/Explore.tsx       |   4 +-
 public/app/features/explore/ExplorePage.tsx   |   4 +-
 .../features/explore/ExplorePaneContainer.tsx |  16 +-
 .../explore/ExploreQueryInspector.tsx         |   2 +-
 .../app/features/explore/ExploreToolbar.tsx   |   6 +-
 public/app/features/explore/LogsContainer.tsx |   5 +-
 .../explore/NodeGraphContainer.test.tsx       |   3 +-
 .../features/explore/NodeGraphContainer.tsx   |   2 +-
 .../app/features/explore/QueryRows.test.tsx   |  13 +-
 .../explore/RawPrometheusContainer.test.tsx   |   2 +-
 .../explore/RawPrometheusContainer.tsx        |   2 +-
 .../explore/ResponseErrorContainer.test.tsx   |   4 +-
 .../explore/ResponseErrorContainer.tsx        |   2 +-
 .../explore/RichHistory/RichHistory.test.tsx  |   3 +-
 .../RichHistory/RichHistoryCard.test.tsx      |   2 +-
 .../explore/RichHistory/RichHistoryCard.tsx   |   2 +-
 .../RichHistory/RichHistoryContainer.test.tsx |   3 +-
 .../RichHistory/RichHistoryContainer.tsx      |   3 +-
 .../RichHistoryStarredTab.test.tsx            |   3 +-
 .../features/explore/TableContainer.test.tsx  |   2 +-
 .../app/features/explore/TableContainer.tsx   |   3 +-
 .../features/explore/TraceView/TraceView.tsx  |   4 +-
 .../explore/TraceView/TraceViewContainer.tsx  |   2 +-
 .../explore/spec/queryHistory.test.tsx        |   2 +-
 .../app/features/explore/state/datasource.ts  |   6 +-
 .../explore/state/explorePane.test.ts         |  20 +-
 .../app/features/explore/state/explorePane.ts |  62 ++-
 public/app/features/explore/state/helpers.ts  |  62 +--
 public/app/features/explore/state/history.ts  |  11 +-
 .../app/features/explore/state/main.test.ts   |  35 +-
 public/app/features/explore/state/main.ts     |  84 ++--
 .../app/features/explore/state/query.test.ts  | 394 +++++++++---------
 public/app/features/explore/state/query.ts    |  33 +-
 .../app/features/explore/state/selectors.ts   |   4 +-
 .../app/features/explore/state/time.test.ts   |   2 +-
 public/app/features/explore/state/time.ts     |  44 +-
 public/app/types/explore.ts                   |  20 +-
 42 files changed, 501 insertions(+), 409 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index a641a30be82..5ae9c8d69b2 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -385,8 +385,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "28"]
     ],
     "packages/grafana-data/src/types/explore.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/types/fieldOverrides.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -2748,9 +2747,25 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
+    "public/app/features/explore/state/history.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/features/explore/state/main.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
+    ],
+    "public/app/features/explore/state/query.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "public/app/features/explore/state/time.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
+    "public/app/features/explore/state/time.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"]
+    ],
     "public/app/features/explore/state/utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/packages/grafana-data/src/types/explore.ts b/packages/grafana-data/src/types/explore.ts
index 57568f95f2f..9ca6e18fab7 100644
--- a/packages/grafana-data/src/types/explore.ts
+++ b/packages/grafana-data/src/types/explore.ts
@@ -22,7 +22,7 @@ export interface ExploreTracePanelState {
   spanId?: string;
 }
 
-export interface SplitOpenOptions<T> {
+export interface SplitOpenOptions<T extends AnyQuery = AnyQuery> {
   datasourceUid: string;
   /** @deprecated Will be removed in a future version. Use queries instead. */
   query?: T;
@@ -34,4 +34,4 @@ export interface SplitOpenOptions<T> {
 /**
  * SplitOpen type is used in Explore and related components.
  */
-export type SplitOpen = <T extends DataQuery = any>(options?: SplitOpenOptions<T> | undefined) => void;
+export type SplitOpen = (options?: SplitOpenOptions | undefined) => void;
diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts
index d6de87958da..5d11ed7c943 100644
--- a/public/app/core/utils/explore.test.ts
+++ b/public/app/core/utils/explore.test.ts
@@ -2,9 +2,9 @@ import { dateTime, ExploreUrlState, LogsSortOrder } from '@grafana/data';
 import { serializeStateToUrlParam } from '@grafana/data/src/utils/url';
 import { RefreshPicker } from '@grafana/ui';
 import store from 'app/core/store';
+import { ExploreId } from 'app/types';
 
 import { DatasourceSrvMock, MockDataSourceApi } from '../../../test/mocks/datasource_srv';
-import { ExploreId } from '../../types';
 
 import {
   buildQueryTransaction,
diff --git a/public/app/features/explore/AddToDashboard/index.test.tsx b/public/app/features/explore/AddToDashboard/index.test.tsx
index b1a36dcb248..99b96961d6b 100644
--- a/public/app/features/explore/AddToDashboard/index.test.tsx
+++ b/public/app/features/explore/AddToDashboard/index.test.tsx
@@ -22,11 +22,13 @@ import { AddToDashboard } from '.';
 const setup = (children: ReactNode, queries: DataQuery[] = [{ refId: 'A' }]) => {
   const store = configureStore({
     explore: {
-      left: {
-        queries,
-        queryResponse: createEmptyQueryResponse(),
+      panes: {
+        left: {
+          queries,
+          queryResponse: createEmptyQueryResponse(),
+        },
       },
-    } as ExploreState,
+    } as unknown as ExploreState,
   });
 
   return render(<Provider store={store}>{children}</Provider>);
diff --git a/public/app/features/explore/Explore.test.tsx b/public/app/features/explore/Explore.test.tsx
index fd726b323f7..79374953c7a 100644
--- a/public/app/features/explore/Explore.test.tsx
+++ b/public/app/features/explore/Explore.test.tsx
@@ -4,7 +4,7 @@ import { AutoSizerProps } from 'react-virtualized-auto-sizer';
 import { TestProvider } from 'test/helpers/TestProvider';
 
 import { DataSourceApi, LoadingState, CoreApp, createTheme, EventBusSrv } from '@grafana/data';
-import { ExploreId } from 'app/types/explore';
+import { ExploreId } from 'app/types';
 
 import { Explore, Props } from './Explore';
 import { scanStopAction } from './state/query';
@@ -86,7 +86,7 @@ const dummyProps: Props = {
   showTrace: true,
   showNodeGraph: true,
   showFlameGraph: true,
-  splitOpen: () => {},
+  splitOpen: jest.fn(),
   splitted: false,
   isFromCompactUrl: false,
   eventBus: new EventBusSrv(),
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index c85b9494459..e27a4ba2f99 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -253,7 +253,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
   };
 
   onSplitOpen = (panelType: string) => {
-    return async (options?: SplitOpenOptions<DataQuery>) => {
+    return async (options?: SplitOpenOptions) => {
       this.props.splitOpen(options);
       if (options && this.props.datasourceInstance) {
         const target = (await getDataSourceSrv().get(options.datasourceUid)).type;
@@ -546,7 +546,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
 function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) {
   const explore = state.explore;
   const { syncedTimes } = explore;
-  const item: ExploreItemState = explore[exploreId]!;
+  const item: ExploreItemState = explore.panes[exploreId]!;
   const timeZone = getTimeZone(state.user);
   const {
     datasourceInstance,
diff --git a/public/app/features/explore/ExplorePage.tsx b/public/app/features/explore/ExplorePage.tsx
index 68458025230..78b885b479d 100644
--- a/public/app/features/explore/ExplorePage.tsx
+++ b/public/app/features/explore/ExplorePage.tsx
@@ -168,7 +168,9 @@ export function ExplorePage(props: GrafanaRouteComponentProps<{}, ExploreQueryPa
 const useExplorePageTitle = () => {
   const navModel = useNavModel('explore');
   const datasources = useSelector((state) =>
-    [state.explore.left.datasourceInstance?.name, state.explore.right?.datasourceInstance?.name].filter(isTruthy)
+    [state.explore.panes.left!.datasourceInstance?.name, state.explore.panes.right?.datasourceInstance?.name].filter(
+      isTruthy
+    )
   );
 
   document.title = `${navModel.main.text} - ${datasources.join(' | ')} - ${Branding.AppTitle}`;
diff --git a/public/app/features/explore/ExplorePaneContainer.tsx b/public/app/features/explore/ExplorePaneContainer.tsx
index 9744d8a07fd..51c82652def 100644
--- a/public/app/features/explore/ExplorePaneContainer.tsx
+++ b/public/app/features/explore/ExplorePaneContainer.tsx
@@ -122,16 +122,16 @@ class ExplorePaneContainerUnconnected extends React.PureComponent<Props> {
         reportInteraction('grafana_explore_compact_notice');
       }
 
-      this.props.initializeExplore(
+      this.props.initializeExplore({
         exploreId,
-        rootDatasourceOverride || queries[0]?.datasource || initialDatasource,
+        datasource: rootDatasourceOverride || queries[0]?.datasource || initialDatasource,
         queries,
-        initialRange,
-        width,
-        this.exploreEvents,
+        range: initialRange,
+        containerWidth: width,
+        eventBridge: this.exploreEvents,
         panelsState,
-        isFromCompactUrl
-      );
+        isFromCompactUrl,
+      });
     }
   }
 
@@ -181,7 +181,7 @@ function mapStateToProps(state: StoreState, props: OwnProps) {
     : getTimeRange(timeZone, DEFAULT_RANGE, fiscalYearStartMonth);
 
   return {
-    initialized: state.explore[props.exploreId]?.initialized,
+    initialized: state.explore.panes[props.exploreId]?.initialized,
     initialDatasource,
     initialQueries: queries,
     initialRange,
diff --git a/public/app/features/explore/ExploreQueryInspector.tsx b/public/app/features/explore/ExploreQueryInspector.tsx
index 6084734bbf8..ea2bb312217 100644
--- a/public/app/features/explore/ExploreQueryInspector.tsx
+++ b/public/app/features/explore/ExploreQueryInspector.tsx
@@ -90,7 +90,7 @@ export function ExploreQueryInspector(props: Props) {
 
 function mapStateToProps(state: StoreState, { exploreId }: { exploreId: ExploreId }) {
   const explore = state.explore;
-  const item: ExploreItemState = explore[exploreId]!;
+  const item: ExploreItemState = explore.panes[exploreId]!;
   const { loading, queryResponse } = item;
 
   return {
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 73abdae0d93..adab7756315 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -52,7 +52,7 @@ export function ExploreToolbar({ exploreId, topOfViewRef, onChangeTime }: Props)
   const { refreshInterval, loading, datasourceInstance, range, isLive, isPaused, syncedTimes } = useSelector(
     (state: StoreState) => ({
       ...pick(
-        state.explore[exploreId]!,
+        state.explore.panes[exploreId]!,
         'refreshInterval',
         'loading',
         'datasourceInstance',
@@ -65,9 +65,9 @@ export function ExploreToolbar({ exploreId, topOfViewRef, onChangeTime }: Props)
     shallowEqual
   );
   const isLargerPane = useSelector((state: StoreState) => state.explore.largerExploreId === exploreId);
-  const showSmallTimePicker = useSelector((state) => splitted || state.explore[exploreId]!.containerWidth < 1210);
+  const showSmallTimePicker = useSelector((state) => splitted || state.explore.panes[exploreId]!.containerWidth < 1210);
   const showSmallDataSourcePicker = useSelector(
-    (state) => state.explore[exploreId]!.containerWidth < (splitted ? 700 : 800)
+    (state) => state.explore.panes[exploreId]!.containerWidth < (splitted ? 700 : 800)
   );
 
   const shouldRotateSplitIcon = useMemo(
diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx
index 67d89101449..73f76fd680f 100644
--- a/public/app/features/explore/LogsContainer.tsx
+++ b/public/app/features/explore/LogsContainer.tsx
@@ -208,10 +208,9 @@ class LogsContainer extends PureComponent<LogsContainerProps> {
   }
 }
 
-function mapStateToProps(state: StoreState, { exploreId }: { exploreId: string }) {
+function mapStateToProps(state: StoreState, { exploreId }: { exploreId: ExploreId }) {
   const explore = state.explore;
-  // @ts-ignore
-  const item: ExploreItemState = explore[exploreId];
+  const item: ExploreItemState = explore.panes[exploreId]!;
   const {
     logsResult,
     loading,
diff --git a/public/app/features/explore/NodeGraphContainer.test.tsx b/public/app/features/explore/NodeGraphContainer.test.tsx
index fc991d5eaa0..d37d63a513c 100644
--- a/public/app/features/explore/NodeGraphContainer.test.tsx
+++ b/public/app/features/explore/NodeGraphContainer.test.tsx
@@ -2,8 +2,7 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { getDefaultTimeRange, MutableDataFrame } from '@grafana/data';
-
-import { ExploreId } from '../../types';
+import { ExploreId } from 'app/types';
 
 import { UnconnectedNodeGraphContainer } from './NodeGraphContainer';
 
diff --git a/public/app/features/explore/NodeGraphContainer.tsx b/public/app/features/explore/NodeGraphContainer.tsx
index 2594f757a13..a55d71636d1 100644
--- a/public/app/features/explore/NodeGraphContainer.tsx
+++ b/public/app/features/explore/NodeGraphContainer.tsx
@@ -108,7 +108,7 @@ export function UnconnectedNodeGraphContainer(props: Props) {
 
 function mapStateToProps(state: StoreState, { exploreId }: OwnProps) {
   return {
-    range: state.explore[exploreId]!.range,
+    range: state.explore.panes[exploreId]!.range,
   };
 }
 
diff --git a/public/app/features/explore/QueryRows.test.tsx b/public/app/features/explore/QueryRows.test.tsx
index 2450774c14c..c04019c4283 100644
--- a/public/app/features/explore/QueryRows.test.tsx
+++ b/public/app/features/explore/QueryRows.test.tsx
@@ -50,15 +50,16 @@ function setup(queries: DataQuery[]) {
 
   const leftState = makeExplorePaneState();
   const initialState: ExploreState = {
-    left: {
-      ...leftState,
-      richHistory: [],
-      datasourceInstance: datasources['someDs-uid'],
-      queries,
+    panes: {
+      left: {
+        ...leftState,
+        richHistory: [],
+        datasourceInstance: datasources['someDs-uid'],
+        queries,
+      },
     },
     syncedTimes: false,
     correlations: [],
-    right: undefined,
     richHistoryStorageFull: false,
     richHistoryLimitExceededWarningShown: false,
   };
diff --git a/public/app/features/explore/RawPrometheusContainer.test.tsx b/public/app/features/explore/RawPrometheusContainer.test.tsx
index 2f750d7f752..d218394c2ca 100644
--- a/public/app/features/explore/RawPrometheusContainer.test.tsx
+++ b/public/app/features/explore/RawPrometheusContainer.test.tsx
@@ -2,7 +2,7 @@ import { fireEvent, render, screen, within } from '@testing-library/react';
 import React from 'react';
 
 import { FieldType, getDefaultTimeRange, InternalTimeZones, toDataFrame } from '@grafana/data';
-import { ExploreId, TABLE_RESULTS_STYLE } from 'app/types/explore';
+import { ExploreId, TABLE_RESULTS_STYLE } from 'app/types';
 
 import { RawPrometheusContainer } from './RawPrometheusContainer';
 
diff --git a/public/app/features/explore/RawPrometheusContainer.tsx b/public/app/features/explore/RawPrometheusContainer.tsx
index c37a9859852..517eb695712 100644
--- a/public/app/features/explore/RawPrometheusContainer.tsx
+++ b/public/app/features/explore/RawPrometheusContainer.tsx
@@ -30,7 +30,7 @@ interface PrometheusContainerState {
 
 function mapStateToProps(state: StoreState, { exploreId }: RawPrometheusContainerProps) {
   const explore = state.explore;
-  const item: ExploreItemState = explore[exploreId]!;
+  const item: ExploreItemState = explore.panes[exploreId]!;
   const { loading: loadingInState, tableResult, rawPrometheusResult, range } = item;
   const rawPrometheusFrame: DataFrame[] = rawPrometheusResult ? [rawPrometheusResult] : [];
   const result = (tableResult?.length ?? false) > 0 && rawPrometheusResult ? tableResult : rawPrometheusFrame;
diff --git a/public/app/features/explore/ResponseErrorContainer.test.tsx b/public/app/features/explore/ResponseErrorContainer.test.tsx
index dec33a6bf35..bc59f4fe513 100644
--- a/public/app/features/explore/ResponseErrorContainer.test.tsx
+++ b/public/app/features/explore/ResponseErrorContainer.test.tsx
@@ -4,9 +4,9 @@ import { Provider } from 'react-redux';
 
 import { DataQueryError, LoadingState, getDefaultTimeRange } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { ExploreId } from 'app/types';
 
 import { configureStore } from '../../store/configureStore';
-import { ExploreId } from '../../types';
 
 import { ResponseErrorContainer } from './ResponseErrorContainer';
 
@@ -46,7 +46,7 @@ describe('ResponseErrorContainer', () => {
 
 function setup(error: DataQueryError) {
   const store = configureStore();
-  store.getState().explore[ExploreId.left].queryResponse = {
+  store.getState().explore.panes.left!.queryResponse = {
     timeRange: getDefaultTimeRange(),
     series: [],
     state: LoadingState.Error,
diff --git a/public/app/features/explore/ResponseErrorContainer.tsx b/public/app/features/explore/ResponseErrorContainer.tsx
index ec6f311892f..6dfd2c227c4 100644
--- a/public/app/features/explore/ResponseErrorContainer.tsx
+++ b/public/app/features/explore/ResponseErrorContainer.tsx
@@ -11,7 +11,7 @@ interface Props {
   exploreId: ExploreId;
 }
 export function ResponseErrorContainer(props: Props) {
-  const queryResponse = useSelector((state) => state.explore[props.exploreId]?.queryResponse);
+  const queryResponse = useSelector((state) => state.explore.panes[props.exploreId]!.queryResponse);
   const queryError = queryResponse?.state === LoadingState.Error ? queryResponse?.error : undefined;
 
   // Errors with ref ids are shown below the corresponding query
diff --git a/public/app/features/explore/RichHistory/RichHistory.test.tsx b/public/app/features/explore/RichHistory/RichHistory.test.tsx
index ea6b16fba9f..fa8755c7a3f 100644
--- a/public/app/features/explore/RichHistory/RichHistory.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistory.test.tsx
@@ -3,8 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { SortOrder } from 'app/core/utils/richHistory';
-
-import { ExploreId } from '../../../types/explore';
+import { ExploreId } from 'app/types';
 
 import { RichHistory, RichHistoryProps, Tabs } from './RichHistory';
 
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
index 63cccb46522..27a5808d8e7 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
@@ -6,8 +6,8 @@ import { DataSourceApi, DataSourceInstanceSettings, DataSourcePluginMeta } from
 import { DataQuery, DataSourceRef } from '@grafana/schema';
 import appEvents from 'app/core/app_events';
 import { MixedDatasource } from 'app/plugins/datasource/mixed/MixedDataSource';
+import { ExploreId, RichHistoryQuery } from 'app/types';
 import { ShowConfirmModalEvent } from 'app/types/events';
-import { ExploreId, RichHistoryQuery } from 'app/types/explore';
 
 import { RichHistoryCard, Props } from './RichHistoryCard';
 
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
index bd81b1ed3d5..54fc5214f0b 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
@@ -23,7 +23,7 @@ import { RichHistoryQuery, ExploreId } from 'app/types/explore';
 
 function mapStateToProps(state: StoreState, { exploreId }: { exploreId: ExploreId }) {
   const explore = state.explore;
-  const { datasourceInstance } = explore[exploreId]!;
+  const { datasourceInstance } = explore.panes[exploreId]!;
   return {
     exploreId,
     datasourceInstance,
diff --git a/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx b/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
index 84d1aca02a9..813752ade03 100644
--- a/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
@@ -2,8 +2,7 @@ import { render } from '@testing-library/react';
 import React from 'react';
 
 import { SortOrder } from 'app/core/utils/richHistory';
-
-import { ExploreId } from '../../../types/explore';
+import { ExploreId } from 'app/types';
 
 import { Tabs } from './RichHistory';
 import { RichHistoryContainer, Props } from './RichHistoryContainer';
diff --git a/public/app/features/explore/RichHistory/RichHistoryContainer.tsx b/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
index 72fb7c125f1..f89e30757c0 100644
--- a/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
@@ -26,8 +26,7 @@ import { RichHistory, Tabs } from './RichHistory';
 
 function mapStateToProps(state: StoreState, { exploreId }: { exploreId: ExploreId }) {
   const explore = state.explore;
-  // @ts-ignore
-  const item: ExploreItemState = explore[exploreId];
+  const item: ExploreItemState = explore.panes[exploreId]!;
   const richHistorySearchFilters = item.richHistorySearchFilters;
   const richHistorySettings = explore.richHistorySettings;
   const { datasourceInstance } = item;
diff --git a/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx b/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
index 31f18b06b7c..d978e8e4348 100644
--- a/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
@@ -2,8 +2,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { SortOrder } from 'app/core/utils/richHistory';
-
-import { ExploreId } from '../../../types/explore';
+import { ExploreId } from 'app/types';
 
 import { RichHistoryStarredTab, RichHistoryStarredTabProps } from './RichHistoryStarredTab';
 
diff --git a/public/app/features/explore/TableContainer.test.tsx b/public/app/features/explore/TableContainer.test.tsx
index 7515d93906a..a227a93f1f0 100644
--- a/public/app/features/explore/TableContainer.test.tsx
+++ b/public/app/features/explore/TableContainer.test.tsx
@@ -2,7 +2,7 @@ import { render, screen, within } from '@testing-library/react';
 import React from 'react';
 
 import { DataFrame, FieldType, getDefaultTimeRange, InternalTimeZones, toDataFrame } from '@grafana/data';
-import { ExploreId } from 'app/types/explore';
+import { ExploreId } from 'app/types';
 
 import { TableContainer } from './TableContainer';
 
diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx
index 600c4cdd7be..767f801f6e9 100644
--- a/public/app/features/explore/TableContainer.tsx
+++ b/public/app/features/explore/TableContainer.tsx
@@ -21,8 +21,7 @@ interface TableContainerProps {
 
 function mapStateToProps(state: StoreState, { exploreId }: TableContainerProps) {
   const explore = state.explore;
-  // @ts-ignore
-  const item: ExploreItemState = explore[exploreId];
+  const item: ExploreItemState = explore.panes[exploreId]!;
   const { loading: loadingInState, tableResult, range } = item;
   const loading = tableResult && tableResult.length > 0 ? false : loadingInState;
   return { loading, tableResult, range };
diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index 35d87ca9e14..06c927fa5b1 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -256,7 +256,7 @@ function useFocusSpanLink(options: {
   refId?: string;
   datasource?: DataSourceApi;
 }): [string | undefined, (traceId: string, spanId: string) => LinkModel<Field>] {
-  const panelState = useSelector((state) => state.explore[options.exploreId]?.panelsState.trace);
+  const panelState = useSelector((state) => state.explore.panes[options.exploreId]?.panelsState.trace);
   const focusedSpanId = panelState?.spanId;
 
   const dispatch = useDispatch();
@@ -269,7 +269,7 @@ function useFocusSpanLink(options: {
     );
 
   const query = useSelector((state) =>
-    state.explore[options.exploreId]?.queries.find((query) => query.refId === options.refId)
+    state.explore.panes[options.exploreId]?.queries.find((query) => query.refId === options.refId)
   );
 
   const createFocusSpanLink = (traceId: string, spanId: string) => {
diff --git a/public/app/features/explore/TraceView/TraceViewContainer.tsx b/public/app/features/explore/TraceView/TraceViewContainer.tsx
index b11e1d4263d..7572570cbf8 100644
--- a/public/app/features/explore/TraceView/TraceViewContainer.tsx
+++ b/public/app/features/explore/TraceView/TraceViewContainer.tsx
@@ -47,7 +47,7 @@ export function TraceViewContainer(props: Props) {
   const [focusedSpanIdForSearch, setFocusedSpanIdForSearch] = useState('');
   const [searchBarSuffix, setSearchBarSuffix] = useState('');
   const datasource = useSelector(
-    (state: StoreState) => state.explore[props.exploreId!]?.datasourceInstance ?? undefined
+    (state: StoreState) => state.explore.panes[props.exploreId]?.datasourceInstance ?? undefined
   );
   const datasourceType = datasource ? datasource?.type : 'unknown';
 
diff --git a/public/app/features/explore/spec/queryHistory.test.tsx b/public/app/features/explore/spec/queryHistory.test.tsx
index 952b598c9e2..83b15dbb406 100644
--- a/public/app/features/explore/spec/queryHistory.test.tsx
+++ b/public/app/features/explore/spec/queryHistory.test.tsx
@@ -3,9 +3,9 @@ import { of } from 'rxjs';
 
 import { serializeStateToUrlParam } from '@grafana/data';
 import { config } from '@grafana/runtime';
+import { ExploreId } from 'app/types';
 
 import { silenceConsoleOutput } from '../../../../test/core/utils/silenceConsoleOutput';
-import { ExploreId } from '../../../types';
 
 import {
   assertDataSourceFilterVisibility,
diff --git a/public/app/features/explore/state/datasource.ts b/public/app/features/explore/state/datasource.ts
index 5aed7e998ed..a78a3d358f7 100644
--- a/public/app/features/explore/state/datasource.ts
+++ b/public/app/features/explore/state/datasource.ts
@@ -45,7 +45,7 @@ export function changeDatasource(
   return async (dispatch, getState) => {
     const orgId = getState().user.orgId;
     const { history, instance } = await loadAndInitDatasource(orgId, { uid: datasourceUid });
-    const currentDataSourceInstance = getState().explore[exploreId]!.datasourceInstance;
+    const currentDataSourceInstance = getState().explore.panes[exploreId]!.datasourceInstance;
 
     reportInteraction('explore_change_ds', {
       from: (currentDataSourceInstance?.meta?.mixed ? 'mixed' : currentDataSourceInstance?.type) || 'unknown',
@@ -61,11 +61,11 @@ export function changeDatasource(
     );
 
     if (options?.importQueries) {
-      const queries = getState().explore[exploreId]!.queries;
+      const queries = getState().explore.panes[exploreId]!.queries;
       await dispatch(importQueries(exploreId, queries, currentDataSourceInstance, instance));
     }
 
-    if (getState().explore[exploreId]!.isLive) {
+    if (getState().explore.panes[exploreId]!.isLive) {
       dispatch(changeRefreshInterval(exploreId, RefreshPicker.offOption.value));
     }
 
diff --git a/public/app/features/explore/state/explorePane.test.ts b/public/app/features/explore/state/explorePane.test.ts
index 02debf075c0..d4bf58ff10b 100644
--- a/public/app/features/explore/state/explorePane.test.ts
+++ b/public/app/features/explore/state/explorePane.test.ts
@@ -29,9 +29,11 @@ function setupStore(state?: any) {
   return configureStore({
     ...defaultInitialState,
     explore: {
-      [ExploreId.left]: {
-        ...defaultInitialState.explore[ExploreId.left],
-        ...(state || {}),
+      panes: {
+        [ExploreId.left]: {
+          ...defaultInitialState.explore.panes.left,
+          ...(state || {}),
+        },
       },
     },
   } as any);
@@ -98,7 +100,7 @@ describe('refreshExplore', () => {
     await dispatch(
       refreshExplore(ExploreId.left, serializeStateToUrlParam({ datasource: 'newDs', queries: [], range: testRange }))
     );
-    expect(getState().explore[ExploreId.left].datasourceInstance?.name).toBe('newDs');
+    expect(getState().explore.panes.left!.datasourceInstance?.name).toBe('newDs');
   });
 
   it('should change and run new queries from the URL', async () => {
@@ -111,21 +113,19 @@ describe('refreshExplore', () => {
       )
     );
     // same
-    const state = getState().explore[ExploreId.left];
+    const state = getState().explore.panes.left!;
     expect(state.datasourceInstance?.name).toBe('someDs');
     expect(state.queries.length).toBe(1);
     expect(state.queries).toMatchObject([{ expr: 'count()' }]);
     expect(datasources.someDs.query).toHaveBeenCalledTimes(1);
   });
 
-  it('should not do anything if pane is not initialized', async () => {
-    const { dispatch, getState } = setup({
-      initialized: false,
-    });
+  it('should not do anything if pane is not present', async () => {
+    const { dispatch, getState } = setup({});
     const state = getState();
     await dispatch(
       refreshExplore(
-        ExploreId.left,
+        ExploreId.right,
         serializeStateToUrlParam({ datasource: 'newDs', queries: [{ expr: 'count()', refId: 'A' }], range: testRange })
       )
     );
diff --git a/public/app/features/explore/state/explorePane.ts b/public/app/features/explore/state/explorePane.ts
index b3d7878864d..6bf30d81e4c 100644
--- a/public/app/features/explore/state/explorePane.ts
+++ b/public/app/features/explore/state/explorePane.ts
@@ -22,7 +22,7 @@ import {
   getTimeRangeFromUrl,
 } from 'app/core/utils/explore';
 import { getFiscalYearStartMonth, getTimeZone } from 'app/features/profile/state/selectors';
-import { ThunkResult } from 'app/types';
+import { createAsyncThunk, ThunkResult } from 'app/types';
 import { ExploreId, ExploreItemState } from 'app/types/explore';
 
 import { datasourceReducer } from './datasource';
@@ -67,7 +67,7 @@ export function changePanelState(
   panelState: ExplorePanelsState[PreferredVisualisationType]
 ): ThunkResult<void> {
   return async (dispatch, getState) => {
-    const exploreItem = getState().explore[exploreId];
+    const exploreItem = getState().explore.panes[exploreId];
     if (exploreItem === undefined) {
       return;
     }
@@ -89,7 +89,7 @@ export function changePanelState(
  * Initialize Explore state with state from the URL and the React component.
  * Call this only on components for with the Explore state has not been initialized.
  */
-export interface InitializeExplorePayload {
+interface InitializeExplorePayload {
   exploreId: ExploreId;
   containerWidth: number;
   eventBridge: EventBusExtended;
@@ -99,7 +99,7 @@ export interface InitializeExplorePayload {
   datasourceInstance?: DataSourceApi;
   isFromCompactUrl?: boolean;
 }
-export const initializeExploreAction = createAction<InitializeExplorePayload>('explore/initializeExplore');
+const initializeExploreAction = createAction<InitializeExplorePayload>('explore/initializeExploreAction');
 
 export interface SetUrlReplacedPayload {
   exploreId: ExploreId;
@@ -117,6 +117,16 @@ export function changeSize(
   return changeSizeAction({ exploreId, height, width });
 }
 
+interface InitializeExploreOptions {
+  exploreId: ExploreId;
+  datasource: DataSourceRef | string;
+  queries: DataQuery[];
+  range: TimeRange;
+  containerWidth: number;
+  eventBridge: EventBusExtended;
+  panelsState?: ExplorePanelsState;
+  isFromCompactUrl?: boolean;
+}
 /**
  * Initialize Explore state with state from the URL and the React component.
  * Call this only on components for with the Explore state has not been initialized.
@@ -125,17 +135,21 @@ export function changeSize(
  * and can be either a string that is the name or uid, or a datasourceRef
  * This is to maximize compatability with how datasources are accessed from the URL param.
  */
-export function initializeExplore(
-  exploreId: ExploreId,
-  datasource: DataSourceRef | string,
-  queries: DataQuery[],
-  range: TimeRange,
-  containerWidth: number,
-  eventBridge: EventBusExtended,
-  panelsState?: ExplorePanelsState,
-  isFromCompactUrl?: boolean
-): ThunkResult<void> {
-  return async (dispatch, getState) => {
+export const initializeExplore = createAsyncThunk(
+  'explore/initializeExplore',
+  async (
+    {
+      exploreId,
+      datasource,
+      queries,
+      range,
+      containerWidth,
+      eventBridge,
+      panelsState,
+      isFromCompactUrl,
+    }: InitializeExploreOptions,
+    { dispatch, getState }
+  ) => {
     const exploreDatasources = getDataSourceSrv().getList();
     let instance = undefined;
     let history: HistoryItem[] = [];
@@ -170,8 +184,8 @@ export function initializeExplore(
       // user to go back to previous url.
       dispatch(runQueries(exploreId, { replaceUrl: true }));
     }
-  };
-}
+  }
+);
 
 /**
  * Reacts to changes in URL state that we need to sync back to our redux state. Computes diff of newUrlQuery vs current
@@ -179,8 +193,8 @@ export function initializeExplore(
  */
 export function refreshExplore(exploreId: ExploreId, newUrlQuery: string): ThunkResult<void> {
   return async (dispatch, getState) => {
-    const itemState = getState().explore[exploreId];
-    if (!itemState?.initialized) {
+    const itemState = getState().explore.panes[exploreId];
+    if (!itemState) {
       return;
     }
 
@@ -208,7 +222,15 @@ export function refreshExplore(exploreId: ExploreId, newUrlQuery: string): Thunk
     if (update.datasource) {
       const initialQueries = await ensureQueries(queries);
       await dispatch(
-        initializeExplore(exploreId, datasource, initialQueries, range, containerWidth, eventBridge, panelsState)
+        initializeExplore({
+          exploreId,
+          datasource,
+          queries: initialQueries,
+          range,
+          containerWidth,
+          eventBridge,
+          panelsState,
+        })
       );
       return;
     }
diff --git a/public/app/features/explore/state/helpers.ts b/public/app/features/explore/state/helpers.ts
index 511e24acc81..1437bb0a84c 100644
--- a/public/app/features/explore/state/helpers.ts
+++ b/public/app/features/explore/state/helpers.ts
@@ -1,7 +1,5 @@
 import { DefaultTimeZone, TimeRange, toUtc, SupplementaryQueryType } from '@grafana/data';
 
-import { ExploreId } from '../../../types';
-
 export const createDefaultInitialState = () => {
   const t = toUtc();
   const testRange: TimeRange = {
@@ -19,37 +17,39 @@ export const createDefaultInitialState = () => {
       timeZone: DefaultTimeZone,
     },
     explore: {
-      [ExploreId.left]: {
-        datasourceInstance: {
-          query: jest.fn(),
-          getRef: jest.fn(),
-          getDataProvider: jest.fn(),
-          getSupportedSupplementaryQueryTypes: jest
-            .fn()
-            .mockImplementation(() => [SupplementaryQueryType.LogsVolume, SupplementaryQueryType.LogsSample]),
-          getSupplementaryQuery: jest.fn(),
-          meta: {
-            id: 'something',
+      panes: {
+        left: {
+          datasourceInstance: {
+            query: jest.fn(),
+            getRef: jest.fn(),
+            getDataProvider: jest.fn(),
+            getSupportedSupplementaryQueryTypes: jest
+              .fn()
+              .mockImplementation(() => [SupplementaryQueryType.LogsVolume, SupplementaryQueryType.LogsSample]),
+            getSupplementaryQuery: jest.fn(),
+            meta: {
+              id: 'something',
+            },
           },
-        },
-        initialized: true,
-        containerWidth: 1920,
-        eventBridge: { emit: () => {} },
-        queries: [{ expr: 'test' }],
-        range: testRange,
-        history: [],
-        refreshInterval: {
-          label: 'Off',
-          value: 0,
-        },
-        cache: [],
-        richHistory: [],
-        supplementaryQueries: {
-          [SupplementaryQueryType.LogsVolume]: {
-            enabled: true,
+          initialized: true,
+          containerWidth: 1920,
+          eventBridge: { emit: () => {} },
+          queries: [{ expr: 'test' }],
+          range: testRange,
+          history: [],
+          refreshInterval: {
+            label: 'Off',
+            value: 0,
           },
-          [SupplementaryQueryType.LogsSample]: {
-            enabled: true,
+          cache: [],
+          richHistory: [],
+          supplementaryQueries: {
+            [SupplementaryQueryType.LogsVolume]: {
+              enabled: true,
+            },
+            [SupplementaryQueryType.LogsSample]: {
+              enabled: true,
+            },
           },
         },
       },
diff --git a/public/app/features/explore/state/history.ts b/public/app/features/explore/state/history.ts
index 3590dda1df3..8c46f0dce72 100644
--- a/public/app/features/explore/state/history.ts
+++ b/public/app/features/explore/state/history.ts
@@ -67,8 +67,9 @@ const updateRichHistoryState = ({ updatedQuery, deletedId }: SyncHistoryUpdatesO
 };
 
 const forEachExplorePane = (state: ExploreState, callback: (item: ExploreItemState, exploreId: ExploreId) => void) => {
-  callback(state.left, ExploreId.left);
-  state.right && callback(state.right, ExploreId.right);
+  Object.entries(state.panes).forEach(([exploreId, item]) => {
+    callback(item!, exploreId as ExploreId);
+  });
 };
 
 export const addHistoryItem = (
@@ -130,7 +131,7 @@ export const deleteRichHistory = (): ThunkResult<void> => {
 
 export const loadRichHistory = (exploreId: ExploreId): ThunkResult<void> => {
   return async (dispatch, getState) => {
-    const filters = getState().explore![exploreId]?.richHistorySearchFilters;
+    const filters = getState().explore.panes[exploreId]!.richHistorySearchFilters;
     if (filters) {
       const richHistoryResults = await getRichHistory(filters);
       dispatch(richHistoryUpdatedAction({ richHistoryResults, exploreId }));
@@ -140,8 +141,8 @@ export const loadRichHistory = (exploreId: ExploreId): ThunkResult<void> => {
 
 export const loadMoreRichHistory = (exploreId: ExploreId): ThunkResult<void> => {
   return async (dispatch, getState) => {
-    const currentFilters = getState().explore![exploreId]?.richHistorySearchFilters;
-    const currentRichHistory = getState().explore![exploreId]?.richHistory;
+    const currentFilters = getState().explore.panes[exploreId]?.richHistorySearchFilters;
+    const currentRichHistory = getState().explore.panes[exploreId]?.richHistory;
     if (currentFilters && currentRichHistory) {
       const nextFilters = { ...currentFilters, page: (currentFilters?.page || 1) + 1 };
       const moreRichHistory = await getRichHistory(nextFilters);
diff --git a/public/app/features/explore/state/main.test.ts b/public/app/features/explore/state/main.test.ts
index a169d52bd6a..27cf6af3227 100644
--- a/public/app/features/explore/state/main.test.ts
+++ b/public/app/features/explore/state/main.test.ts
@@ -117,7 +117,7 @@ describe('navigateToExplore', () => {
 describe('Explore reducer', () => {
   describe('split view', () => {
     describe('split close', () => {
-      it('should keep right pane as left when left is closed', () => {
+      it('should move right pane to left when left is closed', () => {
         const leftItemMock = {
           containerWidth: 100,
         } as unknown as ExploreItemState;
@@ -127,8 +127,10 @@ describe('Explore reducer', () => {
         } as unknown as ExploreItemState;
 
         const initialState = {
-          left: leftItemMock,
-          right: rightItemMock,
+          panes: {
+            left: leftItemMock,
+            right: rightItemMock,
+          },
         } as unknown as ExploreState;
 
         // closing left item
@@ -138,9 +140,10 @@ describe('Explore reducer', () => {
           .thenStateShouldEqual({
             evenSplitPanes: true,
             largerExploreId: undefined,
-            left: rightItemMock,
+            panes: {
+              left: rightItemMock,
+            },
             maxedExploreId: undefined,
-            right: undefined,
             syncedTimes: false,
           } as unknown as ExploreState);
       });
@@ -154,8 +157,10 @@ describe('Explore reducer', () => {
         } as unknown as ExploreItemState;
 
         const initialState = {
-          left: leftItemMock,
-          right: rightItemMock,
+          panes: {
+            left: leftItemMock,
+            right: rightItemMock,
+          },
         } as unknown as ExploreState;
 
         // closing left item
@@ -165,9 +170,10 @@ describe('Explore reducer', () => {
           .thenStateShouldEqual({
             evenSplitPanes: true,
             largerExploreId: undefined,
-            left: leftItemMock,
+            panes: {
+              left: leftItemMock,
+            },
             maxedExploreId: undefined,
-            right: undefined,
             syncedTimes: false,
           } as unknown as ExploreState);
       });
@@ -178,8 +184,10 @@ describe('Explore reducer', () => {
         } as unknown as ExploreItemState;
 
         const initialState = {
-          left: itemMock,
-          right: itemMock,
+          panes: {
+            right: itemMock,
+            left: itemMock,
+          },
           syncedTimes: true,
         } as unknown as ExploreState;
 
@@ -188,8 +196,9 @@ describe('Explore reducer', () => {
           .whenActionIsDispatched(splitCloseAction({ itemId: ExploreId.right }))
           .thenStateShouldEqual({
             evenSplitPanes: true,
-            left: itemMock,
-            right: undefined,
+            panes: {
+              left: itemMock,
+            },
             syncedTimes: false,
           } as unknown as ExploreState);
       });
diff --git a/public/app/features/explore/state/main.ts b/public/app/features/explore/state/main.ts
index 18153a8e6de..c51591cc705 100644
--- a/public/app/features/explore/state/main.ts
+++ b/public/app/features/explore/state/main.ts
@@ -3,18 +3,17 @@ import { AnyAction } from 'redux';
 
 import { ExploreUrlState, serializeStateToUrlParam, SplitOpenOptions, UrlQueryMap } from '@grafana/data';
 import { DataSourceSrv, locationService } from '@grafana/runtime';
-import { DataQuery } from '@grafana/schema';
 import { GetExploreUrlArguments, stopQueryState } from 'app/core/utils/explore';
 import { PanelModel } from 'app/features/dashboard/state';
 import { ExploreId, ExploreItemState, ExploreState } from 'app/types/explore';
 
 import { RichHistoryResults } from '../../../core/history/RichHistoryStorage';
 import { RichHistorySearchFilters, RichHistorySettings } from '../../../core/utils/richHistoryTypes';
-import { ThunkResult } from '../../../types';
+import { createAsyncThunk, ThunkResult } from '../../../types';
 import { CorrelationData } from '../../correlations/useCorrelations';
 import { TimeSrv } from '../../dashboard/services/TimeSrv';
 
-import { paneReducer } from './explorePane';
+import { initializeExplore, paneReducer } from './explorePane';
 import { getUrlStateFromPaneState, makeExplorePaneState } from './utils';
 
 //
@@ -72,12 +71,12 @@ export const splitCloseAction = createAction<SplitCloseActionPayload>('explore/s
  * Not all of the redux state is reflected in URL though.
  */
 export const stateSave = (options?: { replace?: boolean }): ThunkResult<void> => {
-  return (dispatch, getState) => {
-    const { left, right } = getState().explore;
+  return (_, getState) => {
+    const { left, right } = getState().explore.panes;
     const orgId = getState().user.orgId.toString();
     const urlStates: { [index: string]: string | null } = { orgId };
 
-    urlStates.left = serializeStateToUrlParam(getUrlStateFromPaneState(left));
+    urlStates.left = serializeStateToUrlParam(getUrlStateFromPaneState(left!));
 
     if (right) {
       urlStates.right = serializeStateToUrlParam(getUrlStateFromPaneState(right));
@@ -100,9 +99,10 @@ export const lastSavedUrl: UrlQueryMap = {};
  * or uses values from options arg. This does only navigation each pane is then responsible for initialization from
  * the URL.
  */
-export const splitOpen = <T extends DataQuery = DataQuery>(options?: SplitOpenOptions<T>): ThunkResult<void> => {
-  return async (dispatch, getState) => {
-    const leftState: ExploreItemState = getState().explore[ExploreId.left];
+export const splitOpen = createAsyncThunk(
+  'explore/splitOpen',
+  async (options: SplitOpenOptions | undefined, { getState }) => {
+    const leftState: ExploreItemState = getState().explore.panes.left!;
     const leftUrlState = getUrlStateFromPaneState(leftState);
     let rightUrlState: ExploreUrlState = leftUrlState;
 
@@ -119,8 +119,8 @@ export const splitOpen = <T extends DataQuery = DataQuery>(options?: SplitOpenOp
 
     const urlState = serializeStateToUrlParam(rightUrlState);
     locationService.partial({ right: urlState }, true);
-  };
-};
+  }
+);
 
 /**
  * Close the split view and save URL state. We need to update the state here because when closing we cannot just
@@ -169,8 +169,9 @@ export const navigateToExplore = (
 const initialExploreItemState = makeExplorePaneState();
 export const initialExploreState: ExploreState = {
   syncedTimes: false,
-  left: initialExploreItemState,
-  right: undefined,
+  panes: {
+    [ExploreId.left]: initialExploreItemState,
+  },
   correlations: undefined,
   richHistoryStorageFull: false,
   richHistoryLimitExceededWarningShown: false,
@@ -186,13 +187,12 @@ export const initialExploreState: ExploreState = {
 export const exploreReducer = (state = initialExploreState, action: AnyAction): ExploreState => {
   if (splitCloseAction.match(action)) {
     const { itemId } = action.payload;
-    const targetSplit = {
-      left: itemId === ExploreId.left ? state.right! : state.left,
-      right: undefined,
+    const panes = {
+      left: itemId === ExploreId.left ? state.panes.right : state.panes.left,
     };
     return {
       ...state,
-      ...targetSplit,
+      panes,
       largerExploreId: undefined,
       maxedExploreId: undefined,
       evenSplitPanes: true,
@@ -255,18 +255,18 @@ export const exploreReducer = (state = initialExploreState, action: AnyAction):
   }
 
   if (resetExploreAction.match(action)) {
-    const leftState = state[ExploreId.left];
-    const rightState = state[ExploreId.right];
-    stopQueryState(leftState.querySubscription);
-    if (rightState) {
-      stopQueryState(rightState.querySubscription);
+    // FIXME: reducers should REALLY not have side effects.
+    for (const [, pane] of Object.entries(state.panes).filter(([exploreId]) => exploreId !== ExploreId.left)) {
+      stopQueryState(pane!.querySubscription);
     }
 
     return {
       ...initialExploreState,
-      left: {
-        ...initialExploreItemState,
-        queries: state.left.queries,
+      panes: {
+        left: {
+          ...initialExploreItemState,
+          queries: state.panes.left!.queries,
+        },
       },
     };
   }
@@ -279,12 +279,40 @@ export const exploreReducer = (state = initialExploreState, action: AnyAction):
     };
   }
 
+  if (splitOpen.pending.match(action)) {
+    return {
+      ...state,
+      panes: {
+        ...state.panes,
+        right: initialExploreItemState,
+      },
+    };
+  }
+
+  if (initializeExplore.pending.match(action)) {
+    return {
+      ...state,
+      panes: {
+        ...state.panes,
+        [action.meta.arg.exploreId]: initialExploreItemState,
+      },
+    };
+  }
+
   if (action.payload) {
     const { exploreId } = action.payload;
     if (exploreId !== undefined) {
-      // @ts-ignore
-      const explorePaneState = state[exploreId];
-      return { ...state, [exploreId]: paneReducer(explorePaneState, action) };
+      return {
+        ...state,
+        panes: Object.entries(state.panes).reduce<ExploreState['panes']>((acc, [id, pane]) => {
+          if (id === exploreId) {
+            acc[id as ExploreId] = paneReducer(pane, action);
+          } else {
+            acc[id as ExploreId] = pane;
+          }
+          return acc;
+        }, {}),
+      };
     }
   }
 
diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts
index c764e0dbc29..81bf80177cf 100644
--- a/public/app/features/explore/state/query.test.ts
+++ b/public/app/features/explore/state/query.test.ts
@@ -103,7 +103,7 @@ jest.mock('@grafana/runtime', () => ({
 }));
 
 function setupQueryResponse(state: StoreState) {
-  const leftDatasourceInstance = assertIsDefined(state.explore[ExploreId.left].datasourceInstance);
+  const leftDatasourceInstance = assertIsDefined(state.explore.panes.left!.datasourceInstance);
 
   jest.mocked(leftDatasourceInstance.query).mockReturnValueOnce(
     of({
@@ -126,10 +126,12 @@ async function setupStore(queries: DataQuery[], datasourceInstance: Partial<Data
   const store: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
     ...defaultInitialState,
     explore: {
-      [exploreId]: {
-        ...defaultInitialState.explore[exploreId],
-        queries: queries,
-        datasourceInstance: datasourceInstance,
+      panes: {
+        [exploreId]: {
+          ...defaultInitialState.explore.panes[exploreId],
+          queries: queries,
+          datasourceInstance: datasourceInstance,
+        },
       },
     },
   } as unknown as Partial<StoreState>);
@@ -157,8 +159,8 @@ describe('runQueries', () => {
     setupQueryResponse(getState());
     await dispatch(saveCorrelationsAction([]));
     await dispatch(runQueries(ExploreId.left));
-    expect(getState().explore[ExploreId.left].showMetrics).toBeTruthy();
-    expect(getState().explore[ExploreId.left].graphResult).toBeDefined();
+    expect(getState().explore.panes.left!.showMetrics).toBeTruthy();
+    expect(getState().explore.panes.left!.graphResult).toBeDefined();
   });
 
   it('should modify the request-id for all supplementary queries', () => {
@@ -167,7 +169,7 @@ describe('runQueries', () => {
     dispatch(saveCorrelationsAction([]));
     dispatch(runQueries(ExploreId.left));
 
-    const state = getState().explore[ExploreId.left];
+    const state = getState().explore.panes.left!;
     expect(state.queryResponse.request?.requestId).toBe('explore_left');
     const datasource = state.datasourceInstance as unknown as DataSourceWithSupplementaryQueriesSupport<DataQuery>;
     for (const type of supplementaryQueryTypes) {
@@ -182,21 +184,21 @@ describe('runQueries', () => {
 
   it('should set state to done if query completes without emitting', async () => {
     const { dispatch, getState } = setupTests();
-    const leftDatasourceInstance = assertIsDefined(getState().explore[ExploreId.left].datasourceInstance);
+    const leftDatasourceInstance = assertIsDefined(getState().explore.panes.left!.datasourceInstance);
     jest.mocked(leftDatasourceInstance.query).mockReturnValueOnce(EMPTY);
     await dispatch(saveCorrelationsAction([]));
     await dispatch(runQueries(ExploreId.left));
     await new Promise((resolve) => setTimeout(() => resolve(''), 500));
-    expect(getState().explore[ExploreId.left].queryResponse.state).toBe(LoadingState.Done);
+    expect(getState().explore.panes.left!.queryResponse.state).toBe(LoadingState.Done);
   });
 
   it('shows results only after correlations are loaded', async () => {
     const { dispatch, getState } = setupTests();
     setupQueryResponse(getState());
     await dispatch(runQueries(ExploreId.left));
-    expect(getState().explore[ExploreId.left].graphResult).not.toBeDefined();
+    expect(getState().explore.panes.left!.graphResult).not.toBeDefined();
     await dispatch(saveCorrelationsAction([]));
-    expect(getState().explore[ExploreId.left].graphResult).toBeDefined();
+    expect(getState().explore.panes.left!.graphResult).toBeDefined();
   });
 });
 
@@ -207,16 +209,18 @@ describe('running queries', () => {
     const exploreId = ExploreId.left;
     const initialState = {
       explore: {
-        [exploreId]: {
-          datasourceInstance: { name: 'testDs' },
-          initialized: true,
-          loading: true,
-          querySubscription: unsubscribable,
-          queries: ['A'],
-          range: testRange,
-          supplementaryQueries: {
-            [SupplementaryQueryType.LogsVolume]: { enabled: true },
-            [SupplementaryQueryType.LogsSample]: { enabled: true },
+        panes: {
+          [exploreId]: {
+            datasourceInstance: { name: 'testDs' },
+            initialized: true,
+            loading: true,
+            querySubscription: unsubscribable,
+            queries: ['A'],
+            range: testRange,
+            supplementaryQueries: {
+              [SupplementaryQueryType.LogsVolume]: { enabled: true },
+              [SupplementaryQueryType.LogsSample]: { enabled: true },
+            },
           },
         },
       },
@@ -257,10 +261,12 @@ describe('changeQueries', () => {
       const { dispatch } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            datasourceInstance: datasources[0],
-            queries: originalQueries,
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              datasourceInstance: datasources[0],
+              queries: originalQueries,
+            },
           },
         },
       } as unknown as Partial<StoreState>);
@@ -289,10 +295,12 @@ describe('changeQueries', () => {
       const { dispatch } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            datasourceInstance: datasources[0],
-            queries: [{ refId: 'A', datasource: datasources[0].getRef() }],
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              datasourceInstance: datasources[0],
+              queries: [{ refId: 'A', datasource: datasources[0].getRef() }],
+            },
           },
         },
       } as unknown as Partial<StoreState>);
@@ -316,10 +324,12 @@ describe('changeQueries', () => {
       const { dispatch, getState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            datasourceInstance: datasources[0],
-            queries: originalQueries,
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              datasourceInstance: datasources[0],
+              queries: originalQueries,
+            },
           },
         },
       } as unknown as Partial<StoreState>);
@@ -331,18 +341,20 @@ describe('changeQueries', () => {
         })
       );
 
-      expect(getState().explore[ExploreId.left].queries[0]).toHaveProperty('refId', 'A');
-      expect(getState().explore[ExploreId.left].queries[0]).toHaveProperty('datasource', datasources[1].getRef());
+      expect(getState().explore.panes.left!.queries[0]).toHaveProperty('refId', 'A');
+      expect(getState().explore.panes.left!.queries[0]).toHaveProperty('datasource', datasources[1].getRef());
     });
 
     it('should not import queries when datasource is not changed', async () => {
       const { dispatch, getState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            datasourceInstance: datasources[0],
-            queries: [{ refId: 'A', datasource: datasources[0].getRef() }],
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              datasourceInstance: datasources[0],
+              queries: [{ refId: 'A', datasource: datasources[0].getRef() }],
+            },
           },
         },
       } as unknown as Partial<StoreState>);
@@ -354,9 +366,9 @@ describe('changeQueries', () => {
         })
       );
 
-      expect(getState().explore[ExploreId.left].queries[0]).toHaveProperty('refId', 'A');
-      expect(getState().explore[ExploreId.left].queries[0]).toHaveProperty('datasource', datasources[0].getRef());
-      expect(getState().explore[ExploreId.left].queries[0]).toEqual({
+      expect(getState().explore.panes.left!.queries[0]).toHaveProperty('refId', 'A');
+      expect(getState().explore.panes.left!.queries[0]).toHaveProperty('datasource', datasources[0].getRef());
+      expect(getState().explore.panes.left!.queries[0]).toEqual({
         refId: 'A',
         datasource: datasources[0].getRef(),
         queryType: 'someValue',
@@ -371,9 +383,11 @@ describe('importing queries', () => {
       const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            datasourceInstance: datasources[0],
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              datasourceInstance: datasources[0],
+            },
           },
         },
       } as unknown as Partial<StoreState>);
@@ -390,10 +404,10 @@ describe('importing queries', () => {
         )
       );
 
-      expect(getState().explore[ExploreId.left].queries[0]).toHaveProperty('refId', 'refId_A');
-      expect(getState().explore[ExploreId.left].queries[1]).toHaveProperty('refId', 'refId_B');
-      expect(getState().explore[ExploreId.left].queries[0]).toHaveProperty('datasource.uid', 'ds2');
-      expect(getState().explore[ExploreId.left].queries[1]).toHaveProperty('datasource.uid', 'ds2');
+      expect(getState().explore.panes.left!.queries[0]).toHaveProperty('refId', 'refId_A');
+      expect(getState().explore.panes.left!.queries[1]).toHaveProperty('refId', 'refId_B');
+      expect(getState().explore.panes.left!.queries[0]).toHaveProperty('datasource.uid', 'ds2');
+      expect(getState().explore.panes.left!.queries[1]).toHaveProperty('datasource.uid', 'ds2');
     });
   });
 });
@@ -415,10 +429,10 @@ describe('adding new query rows', () => {
 
       const getState = await setupStore(queries, datasourceInstance);
 
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.id).toBe('mixed');
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.mixed).toBe(true);
-      expect(getState().explore[exploreId].queries).toHaveLength(1);
-      expect(getState().explore[exploreId].queryKeys).toEqual(['uid-loki-0']);
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.id).toBe('mixed');
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.mixed).toBe(true);
+      expect(getState().explore.panes[exploreId]!.queries).toHaveLength(1);
+      expect(getState().explore.panes[exploreId]!.queryKeys).toEqual(['uid-loki-0']);
     });
     it('should add query row when there is not yet a row and meta.mixed === false', async () => {
       const queries: DataQuery[] = [];
@@ -435,10 +449,10 @@ describe('adding new query rows', () => {
 
       const getState = await setupStore(queries, datasourceInstance);
 
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.id).toBe('loki');
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.mixed).toBe(false);
-      expect(getState().explore[exploreId].queries).toHaveLength(1);
-      expect(getState().explore[exploreId].queryKeys).toEqual(['uid-loki-0']);
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.id).toBe('loki');
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.mixed).toBe(false);
+      expect(getState().explore.panes[exploreId]!.queries).toHaveLength(1);
+      expect(getState().explore.panes[exploreId]!.queryKeys).toEqual(['uid-loki-0']);
     });
 
     it('should add another query row if there are two rows already', async () => {
@@ -462,10 +476,10 @@ describe('adding new query rows', () => {
       };
       const getState = await setupStore(queries, datasourceInstance);
 
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.id).toBe('loki');
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.mixed).toBe(false);
-      expect(getState().explore[exploreId].queries).toHaveLength(3);
-      expect(getState().explore[exploreId].queryKeys).toEqual(['ds3-0', 'ds4-1', 'ds4-2']);
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.id).toBe('loki');
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.mixed).toBe(false);
+      expect(getState().explore.panes[exploreId]!.queries).toHaveLength(3);
+      expect(getState().explore.panes[exploreId]!.queryKeys).toEqual(['ds3-0', 'ds4-1', 'ds4-2']);
     });
   });
   describe('with mixed datasources enabled', () => {
@@ -490,11 +504,11 @@ describe('adding new query rows', () => {
 
       const getState = await setupStore(queries, datasourceInstance);
 
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.id).toBe('mixed');
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.mixed).toBe(true);
-      expect(getState().explore[exploreId].queries).toHaveLength(1);
-      expect(getState().explore[exploreId].queries[0]?.datasource?.type).toBe('postgres');
-      expect(getState().explore[exploreId].queryKeys).toEqual(['ds1-0']);
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.id).toBe('mixed');
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.mixed).toBe(true);
+      expect(getState().explore.panes[exploreId]!.queries).toHaveLength(1);
+      expect(getState().explore.panes[exploreId]!.queries[0]?.datasource?.type).toBe('postgres');
+      expect(getState().explore.panes[exploreId]!.queryKeys).toEqual(['ds1-0']);
     });
 
     it('should add query row whith root ds (with overriding the default ds) when there is not yet a row', async () => {
@@ -512,11 +526,11 @@ describe('adding new query rows', () => {
 
       const getState = await setupStore(queries, datasourceInstance);
 
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.id).toBe('loki');
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.mixed).toBe(false);
-      expect(getState().explore[exploreId].queries).toHaveLength(1);
-      expect(getState().explore[exploreId].queries[0]?.datasource?.type).toBe('loki');
-      expect(getState().explore[exploreId].queryKeys).toEqual(['uid-loki-0']);
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.id).toBe('loki');
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.mixed).toBe(false);
+      expect(getState().explore.panes[exploreId]!.queries).toHaveLength(1);
+      expect(getState().explore.panes[exploreId]!.queries[0]?.datasource?.type).toBe('loki');
+      expect(getState().explore.panes[exploreId]!.queryKeys).toEqual(['uid-loki-0']);
     });
 
     it('should add another query row if there are two rows already (impossible in UI)', async () => {
@@ -542,11 +556,11 @@ describe('adding new query rows', () => {
 
       const getState = await setupStore(queries, datasourceInstance);
 
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.id).toBe('postgres');
-      expect(getState().explore[exploreId].datasourceInstance?.meta?.mixed).toBe(false);
-      expect(getState().explore[exploreId].queries).toHaveLength(3);
-      expect(getState().explore[exploreId].queries[2]?.datasource?.type).toBe('loki');
-      expect(getState().explore[exploreId].queryKeys).toEqual(['ds3-0', 'ds4-1', 'ds4-2']);
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.id).toBe('postgres');
+      expect(getState().explore.panes[exploreId]!.datasourceInstance?.meta?.mixed).toBe(false);
+      expect(getState().explore.panes[exploreId]!.queries).toHaveLength(3);
+      expect(getState().explore.panes[exploreId]!.queries[2]?.datasource?.type).toBe('loki');
+      expect(getState().explore.panes[exploreId]!.queryKeys).toEqual(['ds3-0', 'ds4-1', 'ds4-2']);
     });
   });
 });
@@ -630,20 +644,22 @@ describe('reducer', () => {
       const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            queryResponse: {
-              series: [{ name: 'test name' }],
-              state: LoadingState.Done,
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              queryResponse: {
+                series: [{ name: 'test name' }],
+                state: LoadingState.Done,
+              },
+              absoluteRange: { from: 1621348027000, to: 1621348050000 },
             },
-            absoluteRange: { from: 1621348027000, to: 1621348050000 },
           },
         },
       } as unknown as Partial<StoreState>);
 
       await dispatch(addResultsToCache(ExploreId.left));
 
-      expect(getState().explore[ExploreId.left].cache).toEqual([
+      expect(getState().explore.panes.left!.cache).toEqual([
         { key: 'from=1621348027000&to=1621348050000', value: { series: [{ name: 'test name' }], state: 'Done' } },
       ]);
     });
@@ -652,44 +668,48 @@ describe('reducer', () => {
       const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            queryResponse: { series: [{ name: 'test name' }], state: LoadingState.Loading },
-            absoluteRange: { from: 1621348027000, to: 1621348050000 },
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              queryResponse: { series: [{ name: 'test name' }], state: LoadingState.Loading },
+              absoluteRange: { from: 1621348027000, to: 1621348050000 },
+            },
           },
         },
       } as unknown as Partial<StoreState>);
 
       await dispatch(addResultsToCache(ExploreId.left));
 
-      expect(getState().explore[ExploreId.left].cache).toEqual([]);
+      expect(getState().explore.panes.left!.cache).toEqual([]);
     });
 
     it('should not add duplicate response to cache', async () => {
       const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            queryResponse: {
-              series: [{ name: 'test name' }],
-              state: LoadingState.Done,
-            },
-            absoluteRange: { from: 1621348027000, to: 1621348050000 },
-            cache: [
-              {
-                key: 'from=1621348027000&to=1621348050000',
-                value: { series: [{ name: 'old test name' }], state: LoadingState.Done },
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              queryResponse: {
+                series: [{ name: 'test name' }],
+                state: LoadingState.Done,
               },
-            ],
+              absoluteRange: { from: 1621348027000, to: 1621348050000 },
+              cache: [
+                {
+                  key: 'from=1621348027000&to=1621348050000',
+                  value: { series: [{ name: 'old test name' }], state: LoadingState.Done },
+                },
+              ],
+            },
           },
         },
       } as unknown as Partial<StoreState>);
 
       await dispatch(addResultsToCache(ExploreId.left));
 
-      expect(getState().explore[ExploreId.left].cache).toHaveLength(1);
-      expect(getState().explore[ExploreId.left].cache).toEqual([
+      expect(getState().explore.panes.left!.cache).toHaveLength(1);
+      expect(getState().explore.panes.left!.cache).toEqual([
         { key: 'from=1621348027000&to=1621348050000', value: { series: [{ name: 'old test name' }], state: 'Done' } },
       ]);
     });
@@ -698,21 +718,23 @@ describe('reducer', () => {
       const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            cache: [
-              {
-                key: 'from=1621348027000&to=1621348050000',
-                value: { series: [{ name: 'old test name' }], state: 'Done' },
-              },
-            ],
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              cache: [
+                {
+                  key: 'from=1621348027000&to=1621348050000',
+                  value: { series: [{ name: 'old test name' }], state: 'Done' },
+                },
+              ],
+            },
           },
         },
       } as unknown as Partial<StoreState>);
 
       await dispatch(clearCache(ExploreId.left));
 
-      expect(getState().explore[ExploreId.left].cache).toEqual([]);
+      expect(getState().explore.panes.left!.cache).toEqual([]);
     });
   });
 
@@ -739,22 +761,24 @@ describe('reducer', () => {
       const store: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            datasourceInstance: {
-              query: jest.fn(),
-              getRef: jest.fn(),
-              meta: {
-                id: 'something',
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              datasourceInstance: {
+                query: jest.fn(),
+                getRef: jest.fn(),
+                meta: {
+                  id: 'something',
+                },
+                getDataProvider: () => {
+                  return mockDataProvider();
+                },
+                getSupportedSupplementaryQueryTypes: () => [
+                  SupplementaryQueryType.LogsVolume,
+                  SupplementaryQueryType.LogsSample,
+                ],
+                getSupplementaryQuery: jest.fn(),
               },
-              getDataProvider: () => {
-                return mockDataProvider();
-              },
-              getSupportedSupplementaryQueryTypes: () => [
-                SupplementaryQueryType.LogsVolume,
-                SupplementaryQueryType.LogsSample,
-              ],
-              getSupplementaryQuery: jest.fn(),
             },
           },
         },
@@ -797,8 +821,8 @@ describe('reducer', () => {
       expect(unsubscribes[1]).toBeCalled();
 
       for (const type of supplementaryQueryTypes) {
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].data).toBeUndefined();
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].dataProvider).toBeUndefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[type].data).toBeUndefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[type].dataProvider).toBeUndefined();
       }
     });
 
@@ -814,20 +838,20 @@ describe('reducer', () => {
       dispatch(runQueries(ExploreId.left));
 
       for (const type of supplementaryQueryTypes) {
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].data).toBeDefined();
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].data!.state).toBe(LoadingState.Loading);
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].dataProvider).toBeDefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[type].data).toBeDefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[type].data!.state).toBe(LoadingState.Loading);
+        expect(getState().explore.panes.left!.supplementaryQueries[type].dataProvider).toBeDefined();
       }
       for (const type of supplementaryQueryTypes) {
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].data).toBeDefined();
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].data!.state).toBe(LoadingState.Loading);
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].dataProvider).toBeDefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[type].data).toBeDefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[type].data!.state).toBe(LoadingState.Loading);
+        expect(getState().explore.panes.left!.supplementaryQueries[type].dataProvider).toBeDefined();
       }
 
       dispatch(cancelQueries(ExploreId.left));
       for (const type of supplementaryQueryTypes) {
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].data).toBeUndefined();
-        expect(getState().explore[ExploreId.left].supplementaryQueries[type].data).toBeUndefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[type].data).toBeUndefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[type].data).toBeUndefined();
       }
     });
 
@@ -841,17 +865,17 @@ describe('reducer', () => {
       dispatch(runQueries(ExploreId.left));
 
       for (const types of supplementaryQueryTypes) {
-        expect(getState().explore[ExploreId.left].supplementaryQueries[types].data).toBeDefined();
-        expect(getState().explore[ExploreId.left].supplementaryQueries[types].data!.state).toBe(LoadingState.Done);
-        expect(getState().explore[ExploreId.left].supplementaryQueries[types].dataProvider).toBeDefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[types].data).toBeDefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[types].data!.state).toBe(LoadingState.Done);
+        expect(getState().explore.panes.left!.supplementaryQueries[types].dataProvider).toBeDefined();
       }
 
       dispatch(cancelQueries(ExploreId.left));
 
       for (const types of supplementaryQueryTypes) {
-        expect(getState().explore[ExploreId.left].supplementaryQueries[types].data).toBeDefined();
-        expect(getState().explore[ExploreId.left].supplementaryQueries[types].data!.state).toBe(LoadingState.Done);
-        expect(getState().explore[ExploreId.left].supplementaryQueries[types].dataProvider).toBeUndefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[types].data).toBeDefined();
+        expect(getState().explore.panes.left!.supplementaryQueries[types].data!.state).toBe(LoadingState.Done);
+        expect(getState().explore.panes.left!.supplementaryQueries[types].dataProvider).toBeUndefined();
       }
     });
 
@@ -861,34 +885,30 @@ describe('reducer', () => {
       };
       // turn logs volume off (but keep logs sample on)
       dispatch(setSupplementaryQueryEnabled(ExploreId.left, false, SupplementaryQueryType.LogsVolume));
-      expect(getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsVolume].enabled).toBe(
+      expect(getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].enabled).toBe(
         false
       );
-      expect(getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsSample].enabled).toBe(
-        true
-      );
+      expect(getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsSample].enabled).toBe(true);
 
       // verify that if we run a query, it will: 1) not do logs volume, 2) do logs sample 3) provider will still be set for both
       dispatch(runQueries(ExploreId.left));
 
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsVolume].data
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].data
       ).toBeUndefined();
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsVolume].dataSubscription
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].dataSubscription
       ).toBeUndefined();
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsVolume].dataProvider
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].dataProvider
       ).toBeDefined();
 
+      expect(getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsSample].data).toBeDefined();
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsSample].data
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsSample].dataSubscription
       ).toBeDefined();
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsSample].dataSubscription
-      ).toBeDefined();
-      expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsSample].dataProvider
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsSample].dataProvider
       ).toBeDefined();
     });
 
@@ -900,30 +920,28 @@ describe('reducer', () => {
       // runQueries sets up providers, but does not run queries
       dispatch(runQueries(ExploreId.left));
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsVolume].dataProvider
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].dataProvider
       ).toBeDefined();
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsSample].dataProvider
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsSample].dataProvider
       ).toBeDefined();
 
       // we turn 1 supplementary query (logs volume) on
       dispatch(setSupplementaryQueryEnabled(ExploreId.left, true, SupplementaryQueryType.LogsVolume));
 
       // verify it was turned on
-      expect(getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsVolume].enabled).toBe(
-        true
-      );
+      expect(getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].enabled).toBe(true);
       // verify that other stay off
-      expect(getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsSample].enabled).toBe(
+      expect(getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsSample].enabled).toBe(
         false
       );
 
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsVolume].dataSubscription
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].dataSubscription
       ).toBeDefined();
 
       expect(
-        getState().explore[ExploreId.left].supplementaryQueries[SupplementaryQueryType.LogsSample].dataSubscription
+        getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsSample].dataSubscription
       ).toBeUndefined();
     });
   });
@@ -934,24 +952,26 @@ describe('reducer', () => {
       const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            queryResponse: {
-              state: LoadingState.Streaming,
-            },
-            logsResult: {
-              hasUniqueLabels: false,
-              rows: logRows,
+          panes: {
+            [ExploreId.left]: {
+              ...defaultInitialState.explore.panes[ExploreId.left],
+              queryResponse: {
+                state: LoadingState.Streaming,
+              },
+              logsResult: {
+                hasUniqueLabels: false,
+                rows: logRows,
+              },
             },
           },
         },
       } as unknown as Partial<StoreState>);
-      expect(getState().explore[ExploreId.left].logsResult?.rows.length).toBe(logRows.length);
+      expect(getState().explore.panes[ExploreId.left]?.logsResult?.rows.length).toBe(logRows.length);
 
       await dispatch(clearLogs({ exploreId: ExploreId.left }));
 
-      expect(getState().explore[ExploreId.left].logsResult?.rows.length).toBe(0);
-      expect(getState().explore[ExploreId.left].clearedAtIndex).toBe(logRows.length - 1);
+      expect(getState().explore.panes[ExploreId.left]?.logsResult?.rows.length).toBe(0);
+      expect(getState().explore.panes[ExploreId.left]?.clearedAtIndex).toBe(logRows.length - 1);
     });
 
     it('should filter new log rows', async () => {
@@ -962,21 +982,23 @@ describe('reducer', () => {
       const { dispatch, getState }: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
         ...defaultInitialState,
         explore: {
-          [ExploreId.left]: {
-            ...defaultInitialState.explore[ExploreId.left],
-            isLive: true,
-            queryResponse: {
-              state: LoadingState.Streaming,
-            },
-            logsResult: {
-              hasUniqueLabels: false,
-              rows: oldLogRows,
+          panes: {
+            [ExploreId.left]: {
+              ...defaultInitialState.explore.panes[ExploreId.left],
+              isLive: true,
+              queryResponse: {
+                state: LoadingState.Streaming,
+              },
+              logsResult: {
+                hasUniqueLabels: false,
+                rows: oldLogRows,
+              },
             },
           },
         },
       } as unknown as Partial<StoreState>);
 
-      expect(getState().explore[ExploreId.left].logsResult?.rows.length).toBe(oldLogRows.length);
+      expect(getState().explore.panes[ExploreId.left]?.logsResult?.rows.length).toBe(oldLogRows.length);
 
       await dispatch(clearLogs({ exploreId: ExploreId.left }));
       await dispatch(
@@ -996,8 +1018,8 @@ describe('reducer', () => {
         } as unknown as QueryEndedPayload)
       );
 
-      expect(getState().explore[ExploreId.left].logsResult?.rows.length).toBe(newLogRows.length);
-      expect(getState().explore[ExploreId.left].clearedAtIndex).toBe(oldLogRows.length - 1);
+      expect(getState().explore.panes[ExploreId.left]?.logsResult?.rows.length).toBe(newLogRows.length);
+      expect(getState().explore.panes[ExploreId.left]?.clearedAtIndex).toBe(oldLogRows.length - 1);
     });
   });
 });
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 1b9ecacc758..a1cb06bac8b 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -241,13 +241,13 @@ export const clearCacheAction = createAction<ClearCachePayload>('explore/clearCa
  */
 export function addQueryRow(exploreId: ExploreId, index: number): ThunkResult<void> {
   return async (dispatch, getState) => {
-    const queries = getState().explore[exploreId]!.queries;
+    const queries = getState().explore.panes[exploreId]!.queries;
     let datasourceOverride = undefined;
 
     // if this is the first query being added, check for a root datasource
     // if it's not mixed, send it as an override. generateEmptyQuery doesn't have access to state
     if (queries.length === 0) {
-      const rootDatasource = getState().explore[exploreId]!.datasourceInstance;
+      const rootDatasource = getState().explore.panes[exploreId]!.datasourceInstance;
       if (!config.featureToggles.exploreMixedDatasource || !rootDatasource?.meta.mixed) {
         datasourceOverride = rootDatasource;
       }
@@ -267,7 +267,7 @@ export function cancelQueries(exploreId: ExploreId): ThunkResult<void> {
     dispatch(scanStopAction({ exploreId }));
     dispatch(cancelQueriesAction({ exploreId }));
 
-    const supplementaryQueries = getState().explore[exploreId]!.supplementaryQueries;
+    const supplementaryQueries = getState().explore.panes[exploreId]!.supplementaryQueries;
     // Cancel all data providers
     for (const type of supplementaryQueryTypes) {
       dispatch(cleanSupplementaryQueryDataProviderAction({ exploreId, type }));
@@ -311,7 +311,7 @@ export const changeQueries = createAsyncThunk<void, ChangeQueriesPayload>(
   'explore/changeQueries',
   async ({ queries, exploreId }, { getState, dispatch }) => {
     let queriesImported = false;
-    const oldQueries = getState().explore[exploreId]!.queries;
+    const oldQueries = getState().explore.panes[exploreId]!.queries;
 
     for (const newQuery of queries) {
       for (const oldQuery of oldQueries) {
@@ -423,7 +423,7 @@ export function modifyQueries(
   modifier: (query: DataQuery, modification: QueryFixAction) => Promise<DataQuery>
 ): ThunkResult<void> {
   return async (dispatch, getState) => {
-    const state = getState().explore[exploreId]!;
+    const state = getState().explore.panes[exploreId]!;
 
     const { queries } = state;
 
@@ -457,8 +457,9 @@ async function handleHistory(
   // Because filtering happens in the backend we cannot add a new entry without checking if it matches currently
   // used filters. Instead, we refresh the query history list.
   // TODO: run only if Query History list is opened (#47252)
-  await dispatch(loadRichHistory(ExploreId.left));
-  await dispatch(loadRichHistory(ExploreId.right));
+  for (const exploreId in state.panes) {
+    await dispatch(loadRichHistory(exploreId as ExploreId));
+  }
 }
 
 /**
@@ -479,7 +480,7 @@ export const runQueries = (
       dispatch(clearCache(exploreId));
     }
 
-    const exploreItemState = getState().explore[exploreId]!;
+    const exploreItemState = getState().explore.panes[exploreId]!;
     const {
       datasourceInstance,
       containerWidth,
@@ -582,9 +583,9 @@ export const runQueries = (
           dispatch(queryStreamUpdatedAction({ exploreId, response: data }));
 
           // Keep scanning for results if this was the last scanning transaction
-          if (getState().explore[exploreId]!.scanning) {
+          if (getState().explore.panes[exploreId]!.scanning) {
             if (data.state === LoadingState.Done && data.series.length === 0) {
-              const range = getShiftedTimeRange(-1, getState().explore[exploreId]!.range);
+              const range = getShiftedTimeRange(-1, getState().explore.panes[exploreId]!.range);
               dispatch(updateTime({ exploreId, absoluteRange: range }));
               dispatch(runQueries(exploreId));
             } else {
@@ -602,7 +603,7 @@ export const runQueries = (
           // In case we don't get any response at all but the observable completed, make sure we stop loading state.
           // This is for cases when some queries are noop like running first query after load but we don't have any
           // actual query input.
-          if (getState().explore[exploreId]!.queryResponse.state === LoadingState.Loading) {
+          if (getState().explore.panes[exploreId]!.queryResponse.state === LoadingState.Loading) {
             dispatch(changeLoadingStateAction({ exploreId, loadingState: LoadingState.Done }));
           }
         },
@@ -777,7 +778,7 @@ function canReuseSupplementaryQueryData(
 export function setQueries(exploreId: ExploreId, rawQueries: DataQuery[]): ThunkResult<void> {
   return (dispatch, getState) => {
     // Inject react keys into query objects
-    const queries = getState().explore[exploreId]!.queries;
+    const queries = getState().explore.panes[exploreId]!.queries;
     const nextQueries = rawQueries.map((query, index) => generateNewKeyAndAddRefIdIfMissing(query, queries, index));
     dispatch(setQueriesAction({ exploreId, queries: nextQueries }));
     dispatch(runQueries(exploreId));
@@ -794,7 +795,7 @@ export function scanStart(exploreId: ExploreId): ThunkResult<void> {
     // Register the scanner
     dispatch(scanStartAction({ exploreId }));
     // Scanning must trigger query run, and return the new range
-    const range = getShiftedTimeRange(-1, getState().explore[exploreId]!.range);
+    const range = getShiftedTimeRange(-1, getState().explore.panes[exploreId]!.range);
     // Set the new range to be displayed
     dispatch(updateTime({ exploreId, absoluteRange: range }));
     dispatch(runQueries(exploreId));
@@ -803,8 +804,8 @@ export function scanStart(exploreId: ExploreId): ThunkResult<void> {
 
 export function addResultsToCache(exploreId: ExploreId): ThunkResult<void> {
   return (dispatch, getState) => {
-    const queryResponse = getState().explore[exploreId]!.queryResponse;
-    const absoluteRange = getState().explore[exploreId]!.absoluteRange;
+    const queryResponse = getState().explore.panes[exploreId]!.queryResponse;
+    const absoluteRange = getState().explore.panes[exploreId]!.absoluteRange;
     const cacheKey = createCacheKey(absoluteRange);
 
     // Save results to cache only when all results received and loading is done
@@ -825,7 +826,7 @@ export function clearCache(exploreId: ExploreId): ThunkResult<void> {
  */
 export function loadSupplementaryQueryData(exploreId: ExploreId, type: SupplementaryQueryType): ThunkResult<void> {
   return (dispatch, getState) => {
-    const { supplementaryQueries } = getState().explore[exploreId]!;
+    const { supplementaryQueries } = getState().explore.panes[exploreId]!;
     const dataProvider = supplementaryQueries[type].dataProvider;
 
     if (dataProvider) {
diff --git a/public/app/features/explore/state/selectors.ts b/public/app/features/explore/state/selectors.ts
index 0fee6ab2be6..18d2767cab9 100644
--- a/public/app/features/explore/state/selectors.ts
+++ b/public/app/features/explore/state/selectors.ts
@@ -1,5 +1,5 @@
 import { ExploreId, StoreState } from 'app/types';
 
-export const isSplit = (state: StoreState) => Boolean(state.explore[ExploreId.left] && state.explore[ExploreId.right]);
+export const isSplit = (state: StoreState) => Object.keys(state.explore.panes).length > 1;
 
-export const getExploreItemSelector = (exploreId: ExploreId) => (state: StoreState) => state.explore[exploreId];
+export const getExploreItemSelector = (exploreId: ExploreId) => (state: StoreState) => state.explore.panes[exploreId];
diff --git a/public/app/features/explore/state/time.test.ts b/public/app/features/explore/state/time.test.ts
index b32c38c6f8a..bc561d0ff69 100644
--- a/public/app/features/explore/state/time.test.ts
+++ b/public/app/features/explore/state/time.test.ts
@@ -2,7 +2,7 @@ import { reducerTester } from 'test/core/redux/reducerTester';
 
 import { dateTime, LoadingState } from '@grafana/data';
 import { configureStore } from 'app/store/configureStore';
-import { ExploreId, ExploreItemState } from 'app/types/explore';
+import { ExploreId, ExploreItemState } from 'app/types';
 
 import { silenceConsoleOutput } from '../../../../test/core/utils/silenceConsoleOutput';
 
diff --git a/public/app/features/explore/state/time.ts b/public/app/features/explore/state/time.ts
index ec96b5b5600..d298e68310b 100644
--- a/public/app/features/explore/state/time.ts
+++ b/public/app/features/explore/state/time.ts
@@ -43,12 +43,10 @@ export const updateTimeRange = (options: {
   return (dispatch, getState) => {
     const { syncedTimes } = getState().explore;
     if (syncedTimes) {
-      dispatch(updateTime({ ...options, exploreId: ExploreId.left }));
-      // When running query by updating time range, we want to preserve cache.
-      // Cached results are currently used in Logs pagination.
-      dispatch(runQueries(ExploreId.left, { preserveCache: true }));
-      dispatch(updateTime({ ...options, exploreId: ExploreId.right }));
-      dispatch(runQueries(ExploreId.right, { preserveCache: true }));
+      Object.keys(getState().explore.panes).forEach((exploreId) => {
+        dispatch(updateTime({ ...options, exploreId: exploreId as ExploreId }));
+        dispatch(runQueries(exploreId as ExploreId, { preserveCache: true }));
+      });
     } else {
       dispatch(updateTime({ ...options }));
       dispatch(runQueries(options.exploreId, { preserveCache: true }));
@@ -73,7 +71,7 @@ export const updateTime = (config: {
 }): ThunkResult<void> => {
   return (dispatch, getState) => {
     const { exploreId, absoluteRange: absRange, rawRange: actionRange } = config;
-    const itemState = getState().explore[exploreId]!;
+    const itemState = getState().explore.panes[exploreId]!;
     const timeZone = getTimeZone(getState().user);
     const fiscalYearStartMonth = getFiscalYearStartMonth(getState().user);
     const { range: rangeInState } = itemState;
@@ -118,13 +116,14 @@ export const updateTime = (config: {
  */
 export function syncTimes(exploreId: ExploreId): ThunkResult<void> {
   return (dispatch, getState) => {
-    if (exploreId === ExploreId.left) {
-      const leftState = getState().explore.left;
-      dispatch(updateTimeRange({ exploreId: ExploreId.right, rawRange: leftState.range.raw }));
-    } else {
-      const rightState = getState().explore.right!;
-      dispatch(updateTimeRange({ exploreId: ExploreId.left, rawRange: rightState.range.raw }));
-    }
+    const range = getState().explore.panes[exploreId]!.range.raw;
+
+    Object.keys(getState().explore.panes)
+      .filter((key) => key !== exploreId)
+      .forEach((exploreId) => {
+        dispatch(updateTimeRange({ exploreId: exploreId as ExploreId, rawRange: range }));
+      });
+
     const isTimeSynced = getState().explore.syncedTimes;
     dispatch(syncTimesAction({ syncedTimes: !isTimeSynced }));
     dispatch(stateSave());
@@ -140,16 +139,13 @@ export function makeAbsoluteTime(): ThunkResult<void> {
   return (dispatch, getState) => {
     const timeZone = getTimeZone(getState().user);
     const fiscalYearStartMonth = getFiscalYearStartMonth(getState().user);
-    const leftState = getState().explore.left;
-    const leftRange = getTimeRange(timeZone, leftState.range.raw, fiscalYearStartMonth);
-    const leftAbsoluteRange: AbsoluteTimeRange = { from: leftRange.from.valueOf(), to: leftRange.to.valueOf() };
-    dispatch(updateTime({ exploreId: ExploreId.left, absoluteRange: leftAbsoluteRange }));
-    const rightState = getState().explore.right!;
-    if (rightState) {
-      const rightRange = getTimeRange(timeZone, rightState.range.raw, fiscalYearStartMonth);
-      const rightAbsoluteRange: AbsoluteTimeRange = { from: rightRange.from.valueOf(), to: rightRange.to.valueOf() };
-      dispatch(updateTime({ exploreId: ExploreId.right, absoluteRange: rightAbsoluteRange }));
-    }
+
+    Object.entries(getState().explore.panes).forEach(([exploreId, exploreItemState]) => {
+      const range = getTimeRange(timeZone, exploreItemState!.range.raw, fiscalYearStartMonth);
+      const absoluteRange: AbsoluteTimeRange = { from: range.from.valueOf(), to: range.to.valueOf() };
+      dispatch(updateTime({ exploreId: exploreId as ExploreId, absoluteRange }));
+    });
+
     dispatch(stateSave());
   };
 }
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index 6c523946588..351c88ddbb5 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -38,14 +38,14 @@ export interface ExploreState {
    * True if time interval for panels are synced. Only possible with split mode.
    */
   syncedTimes: boolean;
-  /**
-   * Explore state of the left split (left is default in non-split view).
-   */
-  left: ExploreItemState;
-  /**
-   * Explore state of the right area in split view.
-   */
-  right?: ExploreItemState;
+
+  // This being optional wouldn't be needed with noUncheckedIndexedAccess set to true, but it cause more than 5k errors currently.
+  // In order to be safe, we declare each item as pssobly undefined to force existence checks.
+  // This will have the side effect of also forcing undefined checks when iterating over this object entries, but
+  // it's better to error on the safer side.
+  panes: {
+    [paneId in ExploreId]?: ExploreItemState;
+  };
 
   correlations?: CorrelationData[];
 
@@ -68,12 +68,12 @@ export interface ExploreState {
   /**
    * On a split manual resize, we calculate which pane is larger, or if they are roughly the same size. If undefined, it is not split or they are roughly the same size
    */
-  largerExploreId?: ExploreId;
+  largerExploreId?: keyof ExploreState['panes'];
 
   /**
    * If a maximize pane button is pressed, this indicates which side was maximized. Will be undefined if not split or if it is manually resized
    */
-  maxedExploreId?: ExploreId;
+  maxedExploreId?: keyof ExploreState['panes'];
 
   /**
    * If a minimize pane button is pressed, it will do an even split of panes. Will be undefined if split or on a manual resize

From c378dbb01b1a7726faf1ccd292043d37a66f6838 Mon Sep 17 00:00:00 2001
From: Oleg Zaytsev <mail@olegzaytsev.com>
Date: Wed, 3 May 2023 17:57:18 +0200
Subject: [PATCH 610/729] AlertRuleForm: s/Edit yaml/Edit YAML/ (#67714)

YAML is an acronym and should be uppercased when used in texts.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 .../alerting/unified/components/rule-editor/AlertRuleForm.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
index 92680cac669..3226b13367e 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
@@ -221,7 +221,7 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => {
               onClick={() => setShowEditYaml(true)}
               disabled={submitState.loading}
             >
-              Edit yaml
+              Edit YAML
             </Button>
           )}
           <Button

From 681925fb6387ddb54e41703eb82b434e340d5fa5 Mon Sep 17 00:00:00 2001
From: samu6851 <samuel.oswalt@grafana.com>
Date: Wed, 3 May 2023 09:08:24 -0700
Subject: [PATCH 611/729] Link to config exemplars leads goes to top of page
 (#67687)

* Link to config exemplars leads goes to top of page

The link to the configure exemplars in a Prometheus datasource leads to the top of the page.  I have referenced the correct link that would take it to the right section.

https://grafana.com/docs/grafana/latest/datasources/prometheus/#configure-exemplars

* Update docs/sources/fundamentals/exemplars/index.md

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 docs/sources/fundamentals/exemplars/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/fundamentals/exemplars/index.md b/docs/sources/fundamentals/exemplars/index.md
index 01e68c5f7fe..d5a3dd3e006 100644
--- a/docs/sources/fundamentals/exemplars/index.md
+++ b/docs/sources/fundamentals/exemplars/index.md
@@ -22,7 +22,7 @@ To identify the factors that are contributing to the latency, you must compare a
 
 Use exemplars to help isolate problems within your data distribution by pinpointing query traces exhibiting high latency within a time interval. Once you localize the latency problem to a few exemplar traces, you can combine it with additional system based information or location properties to perform a root cause analysis faster, leading to quick resolutions to performance issues.
 
-Support for exemplars is available for the Prometheus data source only. Once you enable the functionality, exemplar data is available by default. For more information on exemplar configuration and how to enable exemplars, refer to [configuring exemplars in the Prometheus data source]({{< relref "../../datasources/prometheus/#configuring-exemplars" >}}).
+Support for exemplars is available for the Prometheus data source only. Once you enable the functionality, exemplar data is available by default. For more information on exemplar configuration and how to enable exemplars, refer to [configuring exemplars in the Prometheus data source]({{< relref "../../datasources/prometheus/#configure-exemplars" >}}).
 
 Grafana shows exemplars alongside a metric in the Explore view and in dashboards. Each exemplar displays as a highlighted star. You can hover your cursor over an exemplar to view the unique trace ID, which is a combination of a key value pair. To investigate further, click the blue button next to the `traceID` property.
 

From 4d7c0904ef3455a2fc8db0ba813463c222d6c350 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 3 May 2023 18:09:18 +0200
Subject: [PATCH 612/729] Elasticsearch: Run version check thorugh backend if
 enableElasticsearchBackendQuerying enabled (#67679)

* Elasticsearch: Run getDBversion trough resource calls

* Update

* Update

* Fix lint

* Close response body

* Fix lint

* Refactor
---
 pkg/tsdb/elasticsearch/elasticsearch.go       | 68 +++++++++++++++++++
 .../elasticsearch/datasource.test.ts          | 38 ++++++++++-
 .../datasource/elasticsearch/datasource.ts    |  8 ++-
 3 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go
index ccdf101e555..0f714996d08 100644
--- a/pkg/tsdb/elasticsearch/elasticsearch.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch.go
@@ -1,10 +1,15 @@
 package elasticsearch
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"path"
 	"strconv"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -172,3 +177,66 @@ func (s *Service) getDSInfo(pluginCtx backend.PluginContext) (*es.DatasourceInfo
 
 	return &instance, nil
 }
+
+func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	logger := eslog.FromContext(ctx)
+	// allowed paths for resource calls:
+	// - empty string for fetching db version
+	if req.Path != "" {
+		return fmt.Errorf("invalid resource URL: %s", req.Path)
+	}
+
+	ds, err := s.getDSInfo(req.PluginContext)
+	if err != nil {
+		return err
+	}
+
+	esUrl, err := url.Parse(ds.URL)
+	if err != nil {
+		return err
+	}
+
+	resourcePath, err := url.Parse(req.Path)
+	if err != nil {
+		return err
+	}
+
+	// We take the path and the query-string only
+	esUrl.RawQuery = resourcePath.RawQuery
+	esUrl.Path = path.Join(esUrl.Path, resourcePath.Path)
+
+	request, err := http.NewRequestWithContext(ctx, req.Method, esUrl.String(), bytes.NewBuffer(req.Body))
+	if err != nil {
+		return err
+	}
+
+	response, err := ds.HTTPClient.Do(request)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		if err := response.Body.Close(); err != nil {
+			logger.Warn("Failed to close response body", "err", err)
+		}
+	}()
+
+	body, err := io.ReadAll(response.Body)
+	if err != nil {
+		return err
+	}
+
+	responseHeaders := map[string][]string{
+		"content-type": {"application/json"},
+	}
+
+	if response.Header.Get("Content-Encoding") != "" {
+		responseHeaders["content-encoding"] = []string{response.Header.Get("Content-Encoding")}
+	}
+
+	return sender.Send(&backend.CallResourceResponse{
+		Status:  response.StatusCode,
+		Headers: responseHeaders,
+		Body:    body,
+	})
+}
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index f063ea6fd59..ab9c07af866 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -18,7 +18,7 @@ import {
   TimeRange,
   toUtc,
 } from '@grafana/data';
-import { BackendSrvRequest, FetchResponse, reportInteraction } from '@grafana/runtime';
+import { BackendSrvRequest, FetchResponse, reportInteraction, config } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
 import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { TemplateSrv } from 'app/features/templating/template_srv';
@@ -31,6 +31,8 @@ import { Filters, ElasticsearchOptions, ElasticsearchQuery } from './types';
 
 const ELASTICSEARCH_MOCK_URL = 'http://elasticsearch.local';
 
+const originalConsoleError = console.error;
+
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => backendSrv,
@@ -1291,3 +1293,37 @@ const logsResponse = {
     ],
   },
 };
+
+describe('ElasticDatasource using backend', () => {
+  beforeEach(() => {
+    console.error = jest.fn();
+    config.featureToggles.enableElasticsearchBackendQuerying = true;
+  });
+
+  afterEach(() => {
+    console.error = originalConsoleError;
+    config.featureToggles.enableElasticsearchBackendQuerying = false;
+  });
+  describe('getDatabaseVersion', () => {
+    it('should correctly get db version', async () => {
+      const { ds } = getTestContext();
+      ds.getResource = jest.fn().mockResolvedValue({ version: { number: '8.0.0' } });
+      const version = await ds.getDatabaseVersion();
+      expect(version?.raw).toBe('8.0.0');
+    });
+
+    it('should correctly return null if invalid numeric version', async () => {
+      const { ds } = getTestContext();
+      ds.getResource = jest.fn().mockResolvedValue({ version: { number: 8 } });
+      const version = await ds.getDatabaseVersion();
+      expect(version).toBe(null);
+    });
+
+    it('should correctly return null if rejected request', async () => {
+      const { ds } = getTestContext();
+      ds.getResource = jest.fn().mockRejectedValue({});
+      const version = await ds.getDatabaseVersion();
+      expect(version).toBe(null);
+    });
+  });
+});
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index b863b60b523..7f2f52da49d 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -1,5 +1,5 @@
 import { cloneDeep, find, first as _first, isObject, isString, map as _map } from 'lodash';
-import { generate, lastValueFrom, Observable, of } from 'rxjs';
+import { from, generate, lastValueFrom, Observable, of } from 'rxjs';
 import { catchError, first, map, mergeMap, skipWhile, throwIfEmpty, tap } from 'rxjs/operators';
 import { SemVer } from 'semver';
 
@@ -739,7 +739,11 @@ export class ElasticDatasource
 
   private getDatabaseVersionUncached(): Promise<SemVer | null> {
     // we want this function to never fail
-    return lastValueFrom(this.legacyQueryRunner.request('GET', '/')).then(
+    const getDbVersionObservable = config.featureToggles.enableElasticsearchBackendQuerying
+      ? from(this.getResource(''))
+      : this.legacyQueryRunner.request('GET', '/');
+
+    return lastValueFrom(getDbVersionObservable).then(
       (data) => {
         const versionNumber = data?.version?.number;
         if (typeof versionNumber !== 'string') {

From 2b2afb178406bc221b30415a48e9685721dc09a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 3 May 2023 18:28:37 +0200
Subject: [PATCH 613/729] Theme: Change dark theme borders to improve contrast
 on primary background (#67699)

---
 .../grafana-data/src/themes/createColors.ts   |  6 +++---
 public/sass/_variables.dark.generated.scss    | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/grafana-data/src/themes/createColors.ts b/packages/grafana-data/src/themes/createColors.ts
index 30d991dcc97..d09827e3670 100644
--- a/packages/grafana-data/src/themes/createColors.ts
+++ b/packages/grafana-data/src/themes/createColors.ts
@@ -89,9 +89,9 @@ class DarkColors implements ThemeColorsBase<Partial<ThemeRichColor>> {
   whiteBase = '204, 204, 220';
 
   border = {
-    weak: `rgba(${this.whiteBase}, 0.07)`,
-    medium: `rgba(${this.whiteBase}, 0.15)`,
-    strong: `rgba(${this.whiteBase}, 0.25)`,
+    weak: `rgba(${this.whiteBase}, 0.12)`,
+    medium: `rgba(${this.whiteBase}, 0.20)`,
+    strong: `rgba(${this.whiteBase}, 0.30)`,
   };
 
   text = {
diff --git a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss
index 6683210d06e..34b517f0188 100644
--- a/public/sass/_variables.dark.generated.scss
+++ b/public/sass/_variables.dark.generated.scss
@@ -64,10 +64,10 @@ $layer0: #111217;
 $layer1: #181b1f;
 $layer2: #22252b;
 
-$divider: rgba(204, 204, 220, 0.07);
+$divider: rgba(204, 204, 220, 0.12);
 
-$border0: rgba(204, 204, 220, 0.07);
-$border1: rgba(204, 204, 220, 0.15);
+$border0: rgba(204, 204, 220, 0.12);
+$border1: rgba(204, 204, 220, 0.20);
 
 // Accent colors
 // -------------------------
@@ -133,7 +133,7 @@ $hr-border-color: $dark-9;
 // Panel
 // -------------------------
 $panel-bg: #181b1f;
-$panel-border: 1px solid rgba(204, 204, 220, 0.07);
+$panel-border: 1px solid rgba(204, 204, 220, 0.12);
 $panel-header-hover-bg: rgba(204, 204, 220, 0.16);
 $panel-box-shadow: none;
 $panel-corner: $panel-bg;
@@ -173,7 +173,7 @@ $scrollbarBorder: black;
 // Tables
 // -------------------------
 $table-bg-accent: #22252b;
-$table-border: rgba(204, 204, 220, 0.15);
+$table-border: rgba(204, 204, 220, 0.20);
 $table-bg-odd: rgb(28, 31, 35);
 $table-bg-hover: rgb(35, 38, 42);
 
@@ -215,7 +215,7 @@ $input-bg: #111217;
 $input-bg-disabled: rgba(204, 204, 220, 0.04);
 
 $input-color: rgb(204, 204, 220);
-$input-border-color: rgba(204, 204, 220, 0.15);
+$input-border-color: rgba(204, 204, 220, 0.20);
 $input-box-shadow: none;
 $input-border-focus: #6E9FFF;
 $input-box-shadow-focus: #6E9FFF !default;
@@ -234,9 +234,9 @@ $typeahead-selected-color: $yellow;
 // Dropdowns
 // -------------------------
 $dropdownBackground: #181b1f;
-$dropdownBorder: rgba(204, 204, 220, 0.07);
-$dropdownDividerTop: rgba(204, 204, 220, 0.07);
-$dropdownDividerBottom: rgba(204, 204, 220, 0.07);
+$dropdownBorder: rgba(204, 204, 220, 0.12);
+$dropdownDividerTop: rgba(204, 204, 220, 0.12);
+$dropdownDividerBottom: rgba(204, 204, 220, 0.12);
 $dropdownShadow: 0px 8px 24px rgb(1,4,9);
 
 $dropdownLinkColor: $link-color;
@@ -299,7 +299,7 @@ $tooltipShadow: 0px 4px 8px rgba(24, 26, 27, 0.75);
 
 $popover-bg: #181b1f;
 $popover-color: rgb(204, 204, 220);
-$popover-border-color: rgba(204, 204, 220, 0.07);
+$popover-border-color: rgba(204, 204, 220, 0.12);
 $popover-header-bg: #22252b;
 $popover-shadow: 0px 8px 24px rgb(1,4,9);
 

From 43c7a5b60335426607c9d1d89ee84589783c32a0 Mon Sep 17 00:00:00 2001
From: Sarah Zinger <sarah.zinger@grafana.com>
Date: Wed, 3 May 2023 12:33:15 -0400
Subject: [PATCH 614/729] Cloudwatch: Fix description of plugin (#67744)

Fix description of Cloudwatch
---
 public/app/plugins/datasource/cloudwatch/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/cloudwatch/README.md b/public/app/plugins/datasource/cloudwatch/README.md
index e5e698cb51d..4947c14ee58 100644
--- a/public/app/plugins/datasource/cloudwatch/README.md
+++ b/public/app/plugins/datasource/cloudwatch/README.md
@@ -1,6 +1,6 @@
 # CloudWatch data source - native plugin
 
-Grafana ships with **built in** support for CloudWatch. Simply add it as a data source and are ready to build dashboards for your CloudWatch metrics.
+Grafana ships with **built in** support for CloudWatch. Simply add it as a data source and you are ready to build dashboards for your CloudWatch metrics and logs.
 
 Read more about it here:
 

From 4eb063c1ddbb36ef4bc3c5d0c39f343995b56514 Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Wed, 3 May 2023 13:49:31 -0400
Subject: [PATCH 615/729] docs: fix create dashboard steps (#67310)

* updated steps for dashboard creation

* added images, other wording and structure edits
---
 .../build-dashboards/create-dashboard/index.md    |  9 ++++++++-
 .../getting-started/build-first-dashboard.md      | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/docs/sources/dashboards/build-dashboards/create-dashboard/index.md b/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
index ebefd198ad4..7fc28605de7 100644
--- a/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
+++ b/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
@@ -31,6 +31,10 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 
    For more information about data sources, refer to [Data sources]({{< relref "../../../datasources/" >}}) for specific guidelines.
 
+1. Click the Refresh dashboard icon to query the data source.
+
+   ![Refresh dashboard icon](/media/docs/grafana/dashboards/screenshot-refresh-dashboard-9.5.png)
+
 1. In the visualization list, select a visualization type.
 
    ![Visualization selector](/media/docs/grafana/dashboards/screenshot-select-visualization-9-5.png)
@@ -49,7 +53,10 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
    - [Configure thresholds]({{< relref "../../../panels-visualizations/configure-thresholds/" >}})
    - [Configure standard options]({{< relref "../../../panels-visualizations/configure-standard-options/" >}})
 
-1. When you've finished editing your panel, click **Save** in the top right corner.
+1. When you've finished editing your panel, click **Save** to save the dashboard.
+
+   Alternatively, click **Apply** if you want to see your changes applied to the dashboard first. Then click the save icon in the dashboard header.
+
 1. Enter a name for your dashboard and select a folder, if applicable.
 1. Click **Save**.
 
diff --git a/docs/sources/getting-started/build-first-dashboard.md b/docs/sources/getting-started/build-first-dashboard.md
index 4f054d85e3f..c8a7378b812 100644
--- a/docs/sources/getting-started/build-first-dashboard.md
+++ b/docs/sources/getting-started/build-first-dashboard.md
@@ -10,7 +10,7 @@ weight: 200
 
 # Build your first dashboard
 
-This topic helps you get started with Grafana and build your first dashboard. To learn more about Grafana, refer to [What is Grafana?]({{< relref "_index.md" >}}).
+This topic helps you get started with Grafana and build your first dashboard using the built-in `Grafana` data source. To learn more about Grafana, refer to [Introduction to Grafana]({{< relref "../introduction/" >}}).
 
 > **Note:** Grafana also offers a [free account with Grafana Cloud](https://grafana.com/signup/cloud/connect-account?pg=gsdocs) to help getting started even easier and faster. You can install Grafana to self-host or get a free Grafana Cloud account.
 
@@ -37,7 +37,9 @@ To sign in to Grafana for the first time:
 
 #### Create a dashboard
 
-To create your first dashboard:
+If you've already set up a data source that you know how to query, refer to [Create a dashboard]({{< relref "../dashboards/build-dashboards/create-dashboard/" >}}) instead.
+
+To create your first dashboard using the built-in `Grafana` data source:
 
 1. Click **Dashboards** in the left-side menu.
 1. On the Dashboards page, click **New** and select **New Dashboard** from the dropdown menu.
@@ -47,7 +49,14 @@ To create your first dashboard:
 
    This generates the Random Walk dashboard.
 
-1. Click **Save** in the top right corner of your screen to save the dashboard.
+1. Click the Refresh dashboard icon to query the data source.
+
+   ![Refresh dashboard icon](/media/docs/grafana/dashboards/screenshot-refresh-dashboard-9.5.png)
+
+1. When you've finished editing your panel, click **Save** to save the dashboard.
+
+   Alternatively, click **Apply** if you want to see your changes applied to the dashboard first. Then click the save icon in the dashboard header.
+
 1. Add a descriptive name for the dashboard, and then click **Save**.
 
 Congratulations, you have created your first dashboard and it is displaying results.

From 00a6a14a23433349f1a8976898e181c11540a669 Mon Sep 17 00:00:00 2001
From: Ricky Whitaker <ricky.whitaker@grafana.com>
Date: Wed, 3 May 2023 12:53:14 -0500
Subject: [PATCH 616/729] adding backup ubuntu mirrors into Dockerfile (#67341)

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 3d4f4dbdbe8..adab4389208 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -108,6 +108,7 @@ RUN if grep -i -q alpine /etc/issue; then \
       apk add --no-cache ca-certificates bash curl tzdata musl-utils && \
       apk info -vv | sort; \
     elif grep -i -q ubuntu /etc/issue; then \
+      sed -i "s|deb http://.*/ \(.*\)|\0\ndeb http://mirrors.mit.edu/ubuntu/ \1\ndeb http://mirrors.ocf.berkeley.edu/ubuntu/ \1|g" /etc/apt/sources.list && \
       DEBIAN_FRONTEND=noninteractive && \
       apt-get update && \
       apt-get install -y ca-certificates curl tzdata && \

From 768efe9748e4041eab92ee64161b33902977d5a8 Mon Sep 17 00:00:00 2001
From: Kevin Minehart <kmineh0151@gmail.com>
Date: Wed, 3 May 2023 13:56:02 -0500
Subject: [PATCH 617/729] CI: Add rgm to drone (#66991)

* add drone stub that build grafana using 'grafana/build' (dagger)

---------

Co-authored-by: Ricky Whitaker <ricky.whitaker@grafana.com>
---
 .drone.star              |   5 ++
 .drone.yml               | 120 ++++++++++++++++++++++++++++++++++++++-
 scripts/drone/rgm.star   | 100 ++++++++++++++++++++++++++++++++
 scripts/drone/vault.star |  19 +++++++
 4 files changed, 243 insertions(+), 1 deletion(-)
 create mode 100644 scripts/drone/rgm.star

diff --git a/.drone.star b/.drone.star
index c0a804ddf8d..5c9e4793bbf 100644
--- a/.drone.star
+++ b/.drone.star
@@ -20,6 +20,10 @@ load(
     "publish_npm_pipelines",
     "publish_packages_pipeline",
 )
+load(
+    "scripts/drone/rgm.star",
+    "rgm",
+)
 load(
     "scripts/drone/pipelines/publish_images.star",
     "publish_image_pipelines_public",
@@ -51,6 +55,7 @@ def main(_ctx):
         publish_artifacts_pipelines("public") +
         publish_npm_pipelines() +
         publish_packages_pipeline() +
+        rgm() +
         artifacts_page_pipeline() +
         version_branch_pipelines() +
         integration_test_pipelines() +
diff --git a/.drone.yml b/.drone.yml
index 2fac796ac57..cbce6010e7e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4546,6 +4546,106 @@ volumes:
     path: /var/run/docker.sock
   name: docker
 ---
+clone:
+  retries: 3
+depends_on: []
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: '[RGM] Build and upload a grafana.tar.gz to a prerelease bucket when merging
+  to main'
+node:
+  type: no-parallel
+platform:
+  arch: amd64
+  os: linux
+services: []
+steps:
+- commands:
+  - git clone https://github.com/grafana/grafana-build.git rgm
+  failure: ignore
+  image: alpine/git
+  name: clone-rgm
+- commands:
+  - apk update && apk add docker
+  - export GRAFANA_DIR=$$(pwd)
+  - cd rgm && ./scripts/drone_publish_main.sh
+  environment:
+    DESTINATION:
+      from_secret: destination
+    GCP_KEY_BASE64:
+      from_secret: gcp_key_base64
+    GITHUB_TOKEN:
+      from_secret: github_token
+  failure: ignore
+  image: golang:1.20.3-alpine
+  name: rgm-build
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+trigger:
+  branch: main
+  event:
+  - push
+type: docker
+volumes:
+- host:
+    path: /var/run/docker.sock
+  name: docker
+---
+clone:
+  retries: 3
+depends_on:
+- main-test-backend
+- main-test-frontend
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: '[RGM] Build and upload a grafana.tar.gz to a prerelease bucket when tagging'
+node:
+  type: no-parallel
+platform:
+  arch: amd64
+  os: linux
+services: []
+steps:
+- commands:
+  - git clone https://github.com/grafana/grafana-build.git rgm
+  failure: ignore
+  image: alpine/git
+  name: clone-rgm
+- commands:
+  - apk update && apk add docker
+  - export GRAFANA_DIR=$$(pwd)
+  - cd rgm && ./scripts/drone_publish_tag.sh
+  environment:
+    DESTINATION:
+      from_secret: destination
+    GCP_KEY_BASE64:
+      from_secret: gcp_key_base64
+    GITHUB_TOKEN:
+      from_secret: github_token
+  failure: ignore
+  image: golang:1.20.3-alpine
+  name: rgm-build
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+trigger:
+  event:
+    exclude:
+    - promote
+  ref:
+    exclude:
+    - refs/tags/*-cloud*
+    include:
+    - refs/tags/v*
+type: docker
+volumes:
+- host:
+    path: /var/run/docker.sock
+  name: docker
+---
 clone:
   disable: true
 depends_on: []
@@ -6822,7 +6922,25 @@ get:
 kind: secret
 name: enterprise2_security_prefix
 ---
+get:
+  name: gcp_service_account_base64
+  path: infra/data/ci/grafana-release-eng/rgm
+kind: secret
+name: gcp_key_base64
+---
+get:
+  name: destination
+  path: infra/data/ci/grafana-release-eng/rgm
+kind: secret
+name: destination
+---
+get:
+  name: pat
+  path: infra/data/ci/github/grafanabot
+kind: secret
+name: github_token
+---
 kind: signature
-hmac: e8c29c328c07ab24a7f858cc319c9b35a5bec1fc79531e809e5d3a390bbcbc2f
+hmac: d6bfbf6fa92bf3ed68b72ed6315e926aeec8b50e08a44cff1e40f0561007a0fd
 
 ...
diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star
new file mode 100644
index 00000000000..b4f12488ba0
--- /dev/null
+++ b/scripts/drone/rgm.star
@@ -0,0 +1,100 @@
+"""
+rgm uses 'github.com/grafana/grafana-build' to build Grafana on the following events:
+* A merge to main
+* A tag that begins with a 'v'
+"""
+
+load(
+    "scripts/drone/utils/utils.star",
+    "pipeline",
+)
+load(
+    "scripts/drone/vault.star",
+    "from_secret",
+    "rgm_destination",
+    "rgm_gcp_key_base64",
+    "rgm_github_token",
+)
+
+rgm_env_secrets = {
+    "GCP_KEY_BASE64": from_secret(rgm_gcp_key_base64),
+    "DESTINATION": from_secret(rgm_destination),
+    "GITHUB_TOKEN": from_secret(rgm_github_token),
+}
+
+def rgm_build(script = "drone_publish_main.sh"):
+    clone_step = {
+        "name": "clone-rgm",
+        "image": "alpine/git",
+        "commands": [
+            "git clone https://github.com/grafana/grafana-build.git rgm",
+        ],
+        "failure": "ignore",
+    }
+
+    rgm_build_step = {
+        "name": "rgm-build",
+        "image": "golang:1.20.3-alpine",
+        "commands": [
+            # the docker program is a requirement for running dagger programs
+            "apk update && apk add docker",
+            "export GRAFANA_DIR=$$(pwd)",
+            "cd rgm && ./scripts/{}".format(script),
+        ],
+        "environment": rgm_env_secrets,
+        # The docker socket is a requirement for running dagger programs
+        # In the future we should find a way to use dagger without mounting the docker socket.
+        "volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
+        "failure": "ignore",
+    }
+
+    return [
+        clone_step,
+        rgm_build_step,
+    ]
+
+def rgm_main():
+    trigger = {
+        "event": [
+            "push",
+        ],
+        "branch": "main",
+    }
+
+    return pipeline(
+        name = "[RGM] Build and upload a grafana.tar.gz to a prerelease bucket when merging to main",
+        edition = "all",
+        trigger = trigger,
+        steps = rgm_build(),
+    )
+
+def rgm_tag():
+    trigger = {
+        "event": {
+            "exclude": [
+                "promote",
+            ],
+        },
+        "ref": {
+            "include": [
+                "refs/tags/v*",
+            ],
+            "exclude": [
+                "refs/tags/*-cloud*",
+            ],
+        },
+    }
+
+    return pipeline(
+        name = "[RGM] Build and upload a grafana.tar.gz to a prerelease bucket when tagging",
+        edition = "all",
+        trigger = trigger,
+        steps = rgm_build(script = "drone_publish_tag.sh"),
+        depends_on = ["main-test-backend", "main-test-frontend"],
+    )
+
+def rgm():
+    return [
+        rgm_main(),
+        rgm_tag(),
+    ]
diff --git a/scripts/drone/vault.star b/scripts/drone/vault.star
index be4a4be0c70..167b7ec9c04 100644
--- a/scripts/drone/vault.star
+++ b/scripts/drone/vault.star
@@ -9,6 +9,10 @@ azure_sp_app_id = "azure_sp_app_id"
 azure_sp_app_pw = "azure_sp_app_pw"
 azure_tenant = "azure_tenant"
 
+rgm_gcp_key_base64 = "gcp_key_base64"
+rgm_destination = "destination"
+rgm_github_token = "github_token"
+
 def from_secret(secret):
     return {"from_secret": secret}
 
@@ -119,4 +123,19 @@ def secrets():
             "infra/data/ci/grafana-release-eng/enterprise2",
             "security_prefix",
         ),
+        vault_secret(
+            rgm_gcp_key_base64,
+            "infra/data/ci/grafana-release-eng/rgm",
+            "gcp_service_account_base64",
+        ),
+        vault_secret(
+            rgm_destination,
+            "infra/data/ci/grafana-release-eng/rgm",
+            "destination",
+        ),
+        vault_secret(
+            rgm_github_token,
+            "infra/data/ci/github/grafanabot",
+            "pat",
+        ),
     ]

From 80543a0bfa06826327b318648c4cadc0e7c601eb Mon Sep 17 00:00:00 2001
From: Kevin Minehart <kmineh0151@gmail.com>
Date: Wed, 3 May 2023 14:08:01 -0500
Subject: [PATCH 618/729] CI: set RGM deps on main merge not on tag (#67778)

set deps on main merge not on tag
---
 .drone.yml             | 10 +++++-----
 scripts/drone/rgm.star |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index cbce6010e7e..05116449c1f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4548,7 +4548,9 @@ volumes:
 ---
 clone:
   retries: 3
-depends_on: []
+depends_on:
+- main-test-backend
+- main-test-frontend
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -4595,9 +4597,7 @@ volumes:
 ---
 clone:
   retries: 3
-depends_on:
-- main-test-backend
-- main-test-frontend
+depends_on: []
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -6941,6 +6941,6 @@ kind: secret
 name: github_token
 ---
 kind: signature
-hmac: d6bfbf6fa92bf3ed68b72ed6315e926aeec8b50e08a44cff1e40f0561007a0fd
+hmac: e819db5b752a99280213ed98baa12c0c27c87521c826580a8067c957579db98f
 
 ...
diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star
index b4f12488ba0..11e48274927 100644
--- a/scripts/drone/rgm.star
+++ b/scripts/drone/rgm.star
@@ -66,6 +66,7 @@ def rgm_main():
         edition = "all",
         trigger = trigger,
         steps = rgm_build(),
+        depends_on = ["main-test-backend", "main-test-frontend"],
     )
 
 def rgm_tag():
@@ -90,7 +91,7 @@ def rgm_tag():
         edition = "all",
         trigger = trigger,
         steps = rgm_build(script = "drone_publish_tag.sh"),
-        depends_on = ["main-test-backend", "main-test-frontend"],
+        depends_on = [],
     )
 
 def rgm():

From 140f9620f51f445059813a04ab7a172b653d2b65 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Wed, 3 May 2023 20:13:29 +0100
Subject: [PATCH 619/729] AzureMonitor: Update Azure E2E test (#67646)

Update Azure E2E test

- Update resource names
- Update timeouts
- Add traces E2E test
---
 e2e/cloud-plugins-suite/azure-monitor.spec.ts | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
index 7a328508443..5028371a299 100644
--- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts
+++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
@@ -44,7 +44,7 @@ function provisionAzureMonitorDatasources(datasources: AzureMonitorProvision[])
       e2eSelectors.configEditor.loadSubscriptions.button().click().wait('@subscriptions').wait(500);
       e2eSelectors.configEditor.defaultSubscription.input().find('input').type('datasources{enter}');
       // Wait for 15s so that credentials are ready. 5s has been tested locally before and seemed insufficient.
-      e2e().wait(30000);
+      e2e().wait(15000);
     },
     expectedAlertMessage: 'Successfully connected to all Azure Monitor endpoints',
     // Reduce the timeout from 30s to error faster when an invalid alert message is presented
@@ -100,6 +100,10 @@ const addAzureMonitorVariable = (
   e2e.pages.Dashboard.Settings.Actions.close().click();
 };
 
+const storageAcctName = 'azmonteststorage';
+const logAnalyticsName = 'az-mon-test-logs';
+const applicationInsightsName = 'az-mon-test-ai-a';
+
 e2e.scenario({
   describeName: 'Add Azure Monitor datasource',
   itName: 'fills out datasource connection configuration',
@@ -140,7 +144,7 @@ e2e.scenario({
 
 e2e.scenario({
   describeName: 'Create dashboard and add a panel for each query type',
-  itName: 'create dashboard, add panel for metrics query, log analytics query, and ARG query',
+  itName: 'create dashboard, add panel for metrics, log analytics, ARG, and traces queries',
   scenario: () => {
     e2e.flows.addDashboard({
       timeRange: {
@@ -160,14 +164,15 @@ e2e.scenario({
         e2eSelectors.queryEditor.resourcePicker.search
           .input()
           .wait(100)
-          .type('azmonmetricstest')
+          .type(storageAcctName)
           .wait(500)
           .type('{enter}');
-        e2e().contains('azmonmetricstest').click();
+        e2e().contains(storageAcctName).click();
         e2eSelectors.queryEditor.resourcePicker.apply.button().click();
         e2e().contains('microsoft.storage/storageaccounts');
         e2eSelectors.queryEditor.metricsQueryEditor.metricName.input().find('input').type('Used capacity{enter}');
       },
+      timeout: 10000,
     });
     e2e.components.PanelEditor.applyButton().click();
     e2e.flows.addPanel({
@@ -179,14 +184,15 @@ e2e.scenario({
         e2eSelectors.queryEditor.resourcePicker.search
           .input()
           .wait(100)
-          .type('azmonlogstest')
+          .type(logAnalyticsName)
           .wait(500)
           .type('{enter}');
-        e2e().contains('azmonlogstest').click();
+        e2e().contains(logAnalyticsName).click();
         e2eSelectors.queryEditor.resourcePicker.apply.button().click();
         e2e.components.CodeEditor.container().type('AzureDiagnostics');
         e2eSelectors.queryEditor.logsQueryEditor.formatSelection.input().type('Time series{enter}');
       },
+      timeout: 10000,
     });
     e2e.components.PanelEditor.applyButton().click();
     e2e.flows.addPanel({
@@ -205,6 +211,27 @@ e2e.scenario({
         );
         e2e.components.PanelEditor.toggleTableView().click({ force: true });
       },
+      timeout: 10000,
+    });
+    e2e.components.PanelEditor.applyButton().click();
+    e2e.flows.addPanel({
+      dataSourceName,
+      visitDashboardAtStart: false,
+      queriesForm: () => {
+        e2eSelectors.queryEditor.header.select().find('input').type('Traces{enter}');
+        e2eSelectors.queryEditor.resourcePicker.select.button().click();
+        e2eSelectors.queryEditor.resourcePicker.search
+          .input()
+          .wait(100)
+          .type(applicationInsightsName)
+          .wait(500)
+          .type('{enter}');
+        e2e().contains(applicationInsightsName).click();
+        e2eSelectors.queryEditor.resourcePicker.apply.button().click();
+        e2e().wait(10000);
+        e2eSelectors.queryEditor.logsQueryEditor.formatSelection.input().type('Trace{enter}');
+      },
+      timeout: 10000,
     });
   },
 });
@@ -255,7 +282,7 @@ e2e.scenario({
     e2e.pages.Dashboard.SubMenu.submenuItemLabels('resource')
       .parent()
       .find('input')
-      .type('azmonmetricstest{downArrow}{enter}');
+      .type(`${storageAcctName}{downArrow}{enter}`);
     e2e.flows.addPanel({
       dataSourceName,
       visitDashboardAtStart: false,
@@ -270,6 +297,7 @@ e2e.scenario({
         e2eSelectors.queryEditor.resourcePicker.apply.button().click();
         e2eSelectors.queryEditor.metricsQueryEditor.metricName.input().find('input').type('Transactions{enter}');
       },
+      timeout: 10000,
     });
   },
 });
@@ -291,8 +319,8 @@ e2e.scenario({
     e2e.pages.Dashboard.Settings.Annotations.Settings.name().type('TestAnnotation');
     e2e.components.DataSourcePicker.inputV2().click().type(`${dataSourceName}{enter}`);
     e2eSelectors.queryEditor.resourcePicker.select.button().click();
-    e2eSelectors.queryEditor.resourcePicker.search.input().type('azmonmetricstest');
-    e2e().contains('azmonmetricstest').click();
+    e2eSelectors.queryEditor.resourcePicker.search.input().type(storageAcctName);
+    e2e().contains(storageAcctName).click();
     e2eSelectors.queryEditor.resourcePicker.apply.button().click();
     e2e().contains('microsoft.storage/storageaccounts');
     e2eSelectors.queryEditor.metricsQueryEditor.metricName.input().find('input').type('Transactions{enter}');
@@ -303,8 +331,8 @@ e2e.scenario({
       visitDashboardAtStart: false,
       queriesForm: () => {
         e2eSelectors.queryEditor.resourcePicker.select.button().click();
-        e2eSelectors.queryEditor.resourcePicker.search.input().type('azmonmetricstest');
-        e2e().contains('azmonmetricstest').click();
+        e2eSelectors.queryEditor.resourcePicker.search.input().type(storageAcctName);
+        e2e().contains(storageAcctName).click();
         e2eSelectors.queryEditor.resourcePicker.apply.button().click();
         e2e().contains('microsoft.storage/storageaccounts');
         e2eSelectors.queryEditor.metricsQueryEditor.metricName.input().find('input').type('Used capacity{enter}');

From 576551439739235f1a8852509b7b6308baea07fd Mon Sep 17 00:00:00 2001
From: Ricky Whitaker <ricky.whitaker@grafana.com>
Date: Wed, 3 May 2023 14:21:54 -0500
Subject: [PATCH 620/729] rolling back sed command to add ubuntu mirrors
 (#67780)

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index adab4389208..3d4f4dbdbe8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -108,7 +108,6 @@ RUN if grep -i -q alpine /etc/issue; then \
       apk add --no-cache ca-certificates bash curl tzdata musl-utils && \
       apk info -vv | sort; \
     elif grep -i -q ubuntu /etc/issue; then \
-      sed -i "s|deb http://.*/ \(.*\)|\0\ndeb http://mirrors.mit.edu/ubuntu/ \1\ndeb http://mirrors.ocf.berkeley.edu/ubuntu/ \1|g" /etc/apt/sources.list && \
       DEBIAN_FRONTEND=noninteractive && \
       apt-get update && \
       apt-get install -y ca-certificates curl tzdata && \

From 881ed3b599ddb827e28fb23622f15c978ed53f9b Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 3 May 2023 13:07:39 -0700
Subject: [PATCH 621/729] Schema: Add basic folder schema (#67561)

---
 .../kinds/core/folder/schema-reference.md     | 103 ++++++++++++++++++
 go.sum                                        |   4 -
 kinds/folder/folder_kind.cue                  |  30 +++++
 packages/grafana-schema/src/index.gen.ts      |   3 +
 .../src/raw/folder/x/folder_types.gen.ts      |  24 ++++
 pkg/kinds/folder/folder_gen.go                |  17 +++
 pkg/kinds/folder/folder_kind_gen.go           |  79 ++++++++++++++
 pkg/kinds/folder/folder_metadata_gen.go       |  42 +++++++
 pkg/kinds/folder/folder_spec_gen.go           |  22 ++++
 pkg/kinds/folder/folder_status_gen.go         |  47 ++++++++
 pkg/registry/corekind/base_gen.go             |  14 +++
 11 files changed, 381 insertions(+), 4 deletions(-)
 create mode 100644 docs/sources/developers/kinds/core/folder/schema-reference.md
 create mode 100644 kinds/folder/folder_kind.cue
 create mode 100644 packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts
 create mode 100644 pkg/kinds/folder/folder_gen.go
 create mode 100644 pkg/kinds/folder/folder_kind_gen.go
 create mode 100644 pkg/kinds/folder/folder_metadata_gen.go
 create mode 100644 pkg/kinds/folder/folder_spec_gen.go
 create mode 100644 pkg/kinds/folder/folder_status_gen.go

diff --git a/docs/sources/developers/kinds/core/folder/schema-reference.md b/docs/sources/developers/kinds/core/folder/schema-reference.md
new file mode 100644
index 00000000000..dca49d90100
--- /dev/null
+++ b/docs/sources/developers/kinds/core/folder/schema-reference.md
@@ -0,0 +1,103 @@
+---
+keywords:
+  - grafana
+  - schema
+title: Folder kind
+---
+> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
+
+## Folder
+
+#### Maturity: [merged](../../../maturity/#merged)
+#### Version: 0.0
+
+A folder is a collection of resources that are grouped together and can share permissions.
+
+| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
+|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
+| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
+
+### Metadata
+
+metadata contains embedded CommonMetadata and can be extended with custom string fields
+TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+without external reference as using the CommonMetadata reference breaks thema codegen.
+
+It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
+
+| Property            | Type                   | Required | Default | Description                                                                                                                             |
+|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
+| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
+| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
+| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
+
+### _kubeObjectMetadata
+
+_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+As it is also intended to be generic enough to function with any API Server.
+
+| Property            | Type              | Required | Default | Description |
+|---------------------|-------------------|----------|---------|-------------|
+| `creationTimestamp` | string            | **Yes**  |         |             |
+| `finalizers`        | string[]          | **Yes**  |         |             |
+| `labels`            | map[string]string | **Yes**  |         |             |
+| `resourceVersion`   | string            | **Yes**  |         |             |
+| `uid`               | string            | **Yes**  |         |             |
+| `deletionTimestamp` | string            | No       |         |             |
+
+### ExtraFields
+
+extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### Spec
+
+| Property      | Type   | Required | Default | Description                          |
+|---------------|--------|----------|---------|--------------------------------------|
+| `title`       | string | **Yes**  |         | Folder title                         |
+| `uid`         | string | **Yes**  |         | Unique folder id. (will be k8s name) |
+| `description` | string | No       |         | Description of the folder.           |
+
+### Status
+
+| Property           | Type                                                                             | Required | Default | Description                                                                                                                                                                |
+|--------------------|----------------------------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `additionalFields` | [object](#additionalfields)                                                      | **Yes**  |         | additionalFields is reserved for future use                                                                                                                                |
+| `operatorStates`   | map[string][joinSchema.status.#OperatorState](#joinschema.status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
+
+### AdditionalFields
+
+additionalFields is reserved for future use
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+### JoinSchema.Status.#OperatorState
+
+| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
+|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
+| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
+| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
+| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
+
+### Details
+
+details contains any extra information that is operator-specific
+
+| Property | Type | Required | Default | Description |
+|----------|------|----------|---------|-------------|
+
+
diff --git a/go.sum b/go.sum
index a53bba85ff9..8b749978c97 100644
--- a/go.sum
+++ b/go.sum
@@ -1272,10 +1272,6 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/alerting v0.0.0-20230427200804-f8565cd8b74b h1:SyatotlHGK+05AxICctry09ZEawhE0AasWpOifljH4M=
-github.com/grafana/alerting v0.0.0-20230427200804-f8565cd8b74b/go.mod h1:nHfrSTdV7/l74N5/ezqlQ+JwSvIChhN3G5+PjCfwG/E=
-github.com/grafana/alerting v0.0.0-20230428094731-e067f119be06 h1:g+J4UGslzpi9Kt+846NDAjGtVyt8K9Lgjj/vUh61yK0=
-github.com/grafana/alerting v0.0.0-20230428094731-e067f119be06/go.mod h1:5edgy6tQY4+W2wuJdi8g2GjbVmpJufguy7QGIRl2q4o=
 github.com/grafana/alerting v0.0.0-20230428095912-33c5aa68a5ba h1:aNTu22ojw4XY24DYNAuvw8v/5iFUNk2bkdTeeWQ5+0o=
 github.com/grafana/alerting v0.0.0-20230428095912-33c5aa68a5ba/go.mod h1:5edgy6tQY4+W2wuJdi8g2GjbVmpJufguy7QGIRl2q4o=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
diff --git a/kinds/folder/folder_kind.cue b/kinds/folder/folder_kind.cue
new file mode 100644
index 00000000000..b0b5a1b4cc1
--- /dev/null
+++ b/kinds/folder/folder_kind.cue
@@ -0,0 +1,30 @@
+package kind
+
+name:        "Folder"
+maturity:    "merged"
+description: "A folder is a collection of resources that are grouped together and can share permissions."
+
+lineage: seqs: [
+	{
+		schemas: [
+			//0.0
+			{
+
+				spec: {
+					// Unique folder id. (will be k8s name)
+					uid: string
+
+					// Folder title
+					title: string
+
+					// Description of the folder.
+					description?: string
+				} @cuetsy(kind="interface")
+				//
+				// TODO: 
+				// common metadata will soon support setting the parent folder in the metadata
+				//
+			},
+		]
+	},
+]
diff --git a/packages/grafana-schema/src/index.gen.ts b/packages/grafana-schema/src/index.gen.ts
index 3d6371d00bd..aa647f38e81 100644
--- a/packages/grafana-schema/src/index.gen.ts
+++ b/packages/grafana-schema/src/index.gen.ts
@@ -91,6 +91,9 @@ export {
   defaultFieldConfig
 } from './veneer/dashboard.types';
 
+// Raw generated types from Folder kind.
+export type { Folder } from './raw/folder/x/folder_types.gen';
+
 // Raw generated types from LibraryPanel kind.
 export type {
   LibraryElementDTOMetaUser,
diff --git a/packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts b/packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts
new file mode 100644
index 00000000000..45922122c71
--- /dev/null
+++ b/packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts
@@ -0,0 +1,24 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     TSResourceJenny
+//     LatestMajorsOrXJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+export interface Folder {
+  /**
+   * Description of the folder.
+   */
+  description?: string;
+  /**
+   * Folder title
+   */
+  title: string;
+  /**
+   * Unique folder id. (will be k8s name)
+   */
+  uid: string;
+}
diff --git a/pkg/kinds/folder/folder_gen.go b/pkg/kinds/folder/folder_gen.go
new file mode 100644
index 00000000000..293f6545fc9
--- /dev/null
+++ b/pkg/kinds/folder/folder_gen.go
@@ -0,0 +1,17 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package folder
+
+// Resource is the wire representation of Folder. (TODO be better)
+type Resource struct {
+	Metadata Metadata `json:"metadata"`
+	Spec Spec `json:"spec"`
+	Status Status `json:"status"`
+}
diff --git a/pkg/kinds/folder/folder_kind_gen.go b/pkg/kinds/folder/folder_kind_gen.go
new file mode 100644
index 00000000000..41205e02c47
--- /dev/null
+++ b/pkg/kinds/folder/folder_kind_gen.go
@@ -0,0 +1,79 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     CoreKindJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package folder
+
+import (
+	"github.com/grafana/kindsys"
+	"github.com/grafana/thema"
+	"github.com/grafana/thema/vmux"
+
+	"github.com/grafana/grafana/pkg/cuectx"
+)
+
+// rootrel is the relative path from the grafana repository root to the
+// directory containing the .cue files in which this kind is defined. Necessary
+// for runtime errors related to the definition and/or lineage to provide
+// a real path to the correct .cue file.
+const rootrel string = "kinds/folder"
+
+// TODO standard generated docs
+type Kind struct {
+	kindsys.Core
+	lin    thema.ConvergentLineage[*Resource]
+	jcodec vmux.Codec
+	valmux vmux.ValueMux[*Resource]
+}
+
+// type guard - ensure generated Kind type satisfies the kindsys.Core interface
+var _ kindsys.Core = &Kind{}
+
+// TODO standard generated docs
+func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
+	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	k := &Kind{}
+	k.Core, err = kindsys.BindCore(rt, def, opts...)
+	if err != nil {
+		return nil, err
+	}
+	// Get the thema.Schema that the meta says is in the current version (which
+	// codegen ensures is always the latest)
+	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
+	tsch, err := thema.BindType(cursch, &Resource{})
+	if err != nil {
+		// Should be unreachable, modulo bugs in the Thema->Go code generator
+		return nil, err
+	}
+
+	k.jcodec = vmux.NewJSONCodec("folder.json")
+	k.lin = tsch.ConvergentLineage()
+	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
+	return k, nil
+}
+
+// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
+// to the the Folder [Resource] type generated from the current schema, v0.0.
+func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
+	return k.lin
+}
+
+// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
+// at any schematized dashboard version to an instance of Folder [Resource].
+//
+// Validation and translation errors emitted from this func will identify the
+// input bytes as "dashboard.json".
+//
+// This is a thin wrapper around Thema's [vmux.ValueMux].
+func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
+	return k.valmux(b)
+}
diff --git a/pkg/kinds/folder/folder_metadata_gen.go b/pkg/kinds/folder/folder_metadata_gen.go
new file mode 100644
index 00000000000..283196c7556
--- /dev/null
+++ b/pkg/kinds/folder/folder_metadata_gen.go
@@ -0,0 +1,42 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package folder
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]interface{} `json:"extraFields"`
+	Finalizers      []string               `json:"finalizers"`
+	Labels          map[string]string      `json:"labels"`
+	ResourceVersion string                 `json:"resourceVersion"`
+	Uid             string                 `json:"uid"`
+	UpdateTimestamp time.Time              `json:"updateTimestamp"`
+	UpdatedBy       string                 `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/kinds/folder/folder_spec_gen.go b/pkg/kinds/folder/folder_spec_gen.go
new file mode 100644
index 00000000000..9507f09be5b
--- /dev/null
+++ b/pkg/kinds/folder/folder_spec_gen.go
@@ -0,0 +1,22 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package folder
+
+// Spec defines model for Spec.
+type Spec struct {
+	// Description of the folder.
+	Description *string `json:"description,omitempty"`
+
+	// Folder title
+	Title string `json:"title"`
+
+	// Unique folder id. (will be k8s name)
+	Uid string `json:"uid"`
+}
diff --git a/pkg/kinds/folder/folder_status_gen.go b/pkg/kinds/folder/folder_status_gen.go
new file mode 100644
index 00000000000..2a8f6a334eb
--- /dev/null
+++ b/pkg/kinds/folder/folder_status_gen.go
@@ -0,0 +1,47 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     GoResourceTypes
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package folder
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]OperatorState `json:"operatorStates,omitempty"`
+}
diff --git a/pkg/registry/corekind/base_gen.go b/pkg/registry/corekind/base_gen.go
index e8b620703e0..95fc4a49b75 100644
--- a/pkg/registry/corekind/base_gen.go
+++ b/pkg/registry/corekind/base_gen.go
@@ -13,6 +13,7 @@ import (
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/kinds/dashboard"
+	"github.com/grafana/grafana/pkg/kinds/folder"
 	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 	"github.com/grafana/grafana/pkg/kinds/playlist"
 	"github.com/grafana/grafana/pkg/kinds/preferences"
@@ -41,6 +42,7 @@ import (
 type Base struct {
 	all             []kindsys.Core
 	dashboard       *dashboard.Kind
+	folder          *folder.Kind
 	librarypanel    *librarypanel.Kind
 	playlist        *playlist.Kind
 	preferences     *preferences.Kind
@@ -52,6 +54,7 @@ type Base struct {
 // type guards
 var (
 	_ kindsys.Core = &dashboard.Kind{}
+	_ kindsys.Core = &folder.Kind{}
 	_ kindsys.Core = &librarypanel.Kind{}
 	_ kindsys.Core = &playlist.Kind{}
 	_ kindsys.Core = &preferences.Kind{}
@@ -65,6 +68,11 @@ func (b *Base) Dashboard() *dashboard.Kind {
 	return b.dashboard
 }
 
+// Folder returns the [kindsys.Interface] implementation for the folder kind.
+func (b *Base) Folder() *folder.Kind {
+	return b.folder
+}
+
 // LibraryPanel returns the [kindsys.Interface] implementation for the librarypanel kind.
 func (b *Base) LibraryPanel() *librarypanel.Kind {
 	return b.librarypanel
@@ -105,6 +113,12 @@ func doNewBase(rt *thema.Runtime) *Base {
 	}
 	reg.all = append(reg.all, reg.dashboard)
 
+	reg.folder, err = folder.NewKind(rt)
+	if err != nil {
+		panic(fmt.Sprintf("error while initializing the folder Kind: %s", err))
+	}
+	reg.all = append(reg.all, reg.folder)
+
 	reg.librarypanel, err = librarypanel.NewKind(rt)
 	if err != nil {
 		panic(fmt.Sprintf("error while initializing the librarypanel Kind: %s", err))

From 3c2e71bf804ae71abef87e94bf37161f95764281 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Wed, 3 May 2023 17:10:10 -0600
Subject: [PATCH 622/729] Canvas: Add gdev dashboard for connections (#67792)

---
 .../canvas-connection-examples.json           | 1441 +++++++++++++++++
 devenv/jsonnet/dev-dashboards.libsonnet       |    7 +
 2 files changed, 1448 insertions(+)
 create mode 100644 devenv/dev-dashboards/panel-canvas/canvas-connection-examples.json

diff --git a/devenv/dev-dashboards/panel-canvas/canvas-connection-examples.json b/devenv/dev-dashboards/panel-canvas/canvas-connection-examples.json
new file mode 100644
index 00000000000..19fbe0b3325
--- /dev/null
+++ b/devenv/dev-dashboards/panel-canvas/canvas-connection-examples.json
@@ -0,0 +1,1441 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "#6ED0E0",
+                "value": 30
+              },
+              {
+                "color": "#EAB839",
+                "value": 50
+              },
+              {
+                "color": "#EF843C",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 15,
+        "x": 5,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "inlineEditing": true,
+        "root": {
+          "background": {
+            "color": {
+              "fixed": "transparent"
+            }
+          },
+          "border": {
+            "color": {
+              "fixed": "dark-green"
+            }
+          },
+          "elements": [
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "text": {
+                  "fixed": "gateway"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "field": "gateway",
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -1.02020202020202,
+                    "y": 0.041666666666666664
+                  },
+                  "targetName": "Element 2"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 1",
+              "placement": {
+                "height": 48,
+                "left": 117,
+                "top": 168,
+                "width": 99
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "text": {
+                  "fixed": "productpage"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "field": "product-details",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 1
+                  },
+                  "target": {
+                    "x": -0.9797979797979798,
+                    "y": 0
+                  },
+                  "targetName": "Element 3"
+                },
+                {
+                  "color": {
+                    "field": "product-reviews",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": -1
+                  },
+                  "target": {
+                    "x": -1,
+                    "y": 0.041666666666666664
+                  },
+                  "targetName": "Element 4"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 2",
+              "placement": {
+                "height": 48,
+                "left": 327,
+                "top": 168,
+                "width": 99
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "text": {
+                  "fixed": "details"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "field": "details-checkout",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -0.9595959595959596,
+                    "y": -0.041666666666666664
+                  },
+                  "targetName": "Element 11"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 3",
+              "placement": {
+                "height": 48,
+                "left": 548,
+                "top": 69,
+                "width": 99
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "text": {
+                  "fixed": "reviews"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "field": "reviews-ratings",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -0.9797979797979798,
+                    "y": 0.041666666666666664
+                  },
+                  "targetName": "Element 5"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 4",
+              "placement": {
+                "height": 48,
+                "left": 549,
+                "top": 274,
+                "width": 99
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "text": {
+                  "fixed": "ratings"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 5",
+              "placement": {
+                "height": 48,
+                "left": 797,
+                "top": 275,
+                "width": 99
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "field": "gateway",
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "field": "gateway",
+                  "fixed": "",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 6",
+              "placement": {
+                "height": 36,
+                "left": 235,
+                "top": 148,
+                "width": 64
+              },
+              "type": "metric-value"
+            },
+            {
+              "background": {
+                "color": {
+                  "field": "product-details",
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "field": "product-details",
+                  "fixed": "",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 7",
+              "placement": {
+                "height": 36,
+                "left": 415,
+                "top": 89,
+                "width": 64
+              },
+              "type": "metric-value"
+            },
+            {
+              "background": {
+                "color": {
+                  "field": "product-reviews",
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "field": "product-reviews",
+                  "fixed": "",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 8",
+              "placement": {
+                "height": 36,
+                "left": 411,
+                "top": 258,
+                "width": 64
+              },
+              "type": "metric-value"
+            },
+            {
+              "background": {
+                "color": {
+                  "field": "reviews-ratings",
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "field": "reviews-ratings",
+                  "fixed": "",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 9",
+              "placement": {
+                "height": 36,
+                "left": 686,
+                "top": 250,
+                "width": 64
+              },
+              "type": "metric-value"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "rgb(204, 204, 220)"
+                },
+                "size": 16,
+                "text": {
+                  "fixed": "# of requests"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 10",
+              "placement": {
+                "height": 50,
+                "left": 13,
+                "top": 309,
+                "width": 100
+              },
+              "type": "text"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "text": {
+                  "fixed": "checkout"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 11",
+              "placement": {
+                "height": 48,
+                "left": 797,
+                "top": 68,
+                "width": 99
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "field": "details-checkout",
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "field": "details-checkout",
+                  "fixed": "0",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 12",
+              "placement": {
+                "height": 36,
+                "left": 684,
+                "top": 47,
+                "width": 63.99609375
+              },
+              "type": "metric-value"
+            }
+          ],
+          "name": "Element 1672955773575",
+          "type": "frame"
+        },
+        "showAdvancedTypes": false
+      },
+      "pluginVersion": "10.1.0-pre",
+      "targets": [
+        {
+          "csvContent": "gateway, product-details, product-reviews, reviews-ratings, details-checkout\n100, 56, 44, 22, 28",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Service Graph",
+      "type": "canvas"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [
+            {
+              "targetBlank": true,
+              "title": "Show details",
+              "url": "https://ops.grafana-ops.net/d/fU-WBSqWz/synthetic-monitoring-summary?orgId=1"
+            }
+          ],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "blue",
+                "value": 30
+              },
+              {
+                "color": "#EAB839",
+                "value": 50
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "percent"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 15,
+        "w": 15,
+        "x": 5,
+        "y": 11
+      },
+      "id": 2,
+      "options": {
+        "inlineEditing": false,
+        "root": {
+          "background": {
+            "color": {
+              "fixed": "transparent"
+            }
+          },
+          "border": {
+            "color": {
+              "fixed": "dark-green"
+            }
+          },
+          "constraint": {
+            "horizontal": "left",
+            "vertical": "top"
+          },
+          "elements": [
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "blinkRate": {
+                  "fixed": 2
+                },
+                "bulbColor": {
+                  "field": "server_database"
+                },
+                "statusColor": {
+                  "field": "server_region"
+                },
+                "type": "Single"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "field": "server_database2",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -1,
+                    "y": -1
+                  },
+                  "target": {
+                    "x": 0.030303030303030304,
+                    "y": 0
+                  },
+                  "targetName": "Element 11"
+                },
+                {
+                  "color": {
+                    "field": "server_database",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -1,
+                    "y": -1
+                  },
+                  "target": {
+                    "x": 0.09090909090909091,
+                    "y": 0.16666666666666666
+                  },
+                  "targetName": "Element 12"
+                },
+                {
+                  "color": {
+                    "field": "server_region",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": -1
+                  },
+                  "target": {
+                    "x": -0.2727272727272727,
+                    "y": 0.4166666666666667
+                  },
+                  "targetName": "Element 13"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "server 1",
+              "placement": {
+                "height": 114,
+                "left": 468,
+                "top": 11,
+                "width": 120.99609375
+              },
+              "type": "server"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "blinkRate": {
+                  "fixed": 0.25
+                },
+                "bulbColor": {
+                  "field": "database_server"
+                },
+                "statusColor": {
+                  "field": "database_server"
+                },
+                "type": "Database"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "field": "database_server",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 1
+                  },
+                  "target": {
+                    "x": -0.15151515151515152,
+                    "y": -0.16666666666666666
+                  },
+                  "targetName": "Element 12"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "database 1",
+              "placement": {
+                "height": 114,
+                "left": 207,
+                "top": 367,
+                "width": 121
+              },
+              "type": "server"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "blinkRate": {
+                  "fixed": 0.5
+                },
+                "bulbColor": {
+                  "field": "region_server"
+                },
+                "statusColor": {
+                  "field": "region_server"
+                },
+                "type": "Terminal"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "field": "region_server",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -1,
+                    "y": 1
+                  },
+                  "target": {
+                    "x": -0.21212121212121213,
+                    "y": 0.08333333333333333
+                  },
+                  "targetName": "Element 13"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "region 1",
+              "placement": {
+                "height": 116,
+                "left": 699,
+                "top": 365,
+                "width": 121
+              },
+              "type": "server"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "image": {
+                  "field": "",
+                  "fixed": "",
+                  "mode": "fixed"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "field": "database_server",
+                  "fixed": "#ffffff"
+                },
+                "size": 20,
+                "text": {
+                  "field": "database_server",
+                  "fixed": "10%",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 4",
+              "placement": {
+                "height": 29,
+                "left": 318,
+                "top": 282,
+                "width": 46
+              },
+              "type": "text"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "blinkRate": {
+                  "fixed": 0.5,
+                  "mode": "mod"
+                },
+                "bulbColor": {
+                  "field": "database2_server"
+                },
+                "statusColor": {
+                  "field": "database2_server"
+                },
+                "type": "Database"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "field": "database2_server",
+                    "fixed": "white"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 1
+                  },
+                  "target": {
+                    "x": -0.3333333333333333,
+                    "y": 0
+                  },
+                  "targetName": "Element 11"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "database 2",
+              "placement": {
+                "height": 116,
+                "left": 55,
+                "top": 191,
+                "width": 117
+              },
+              "type": "server"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "image": {
+                  "field": "",
+                  "fixed": "",
+                  "mode": "fixed"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "field": "server_database",
+                  "fixed": "#ffffff"
+                },
+                "size": 20,
+                "text": {
+                  "field": "server_database",
+                  "fixed": "10%",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 6",
+              "placement": {
+                "height": 29,
+                "left": 382,
+                "top": 162,
+                "width": 46
+              },
+              "type": "text"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "image": {
+                  "field": "",
+                  "fixed": "",
+                  "mode": "fixed"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "field": "database2_server",
+                  "fixed": "#ffffff"
+                },
+                "size": 20,
+                "text": {
+                  "field": "database2_server",
+                  "fixed": "10%",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 7",
+              "placement": {
+                "height": 29,
+                "left": 206,
+                "top": 138,
+                "width": 46
+              },
+              "type": "text"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "image": {
+                  "field": "",
+                  "fixed": "",
+                  "mode": "fixed"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "field": "server_database2",
+                  "fixed": "#ffffff"
+                },
+                "size": 20,
+                "text": {
+                  "field": "server_database2",
+                  "fixed": "10%",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 8",
+              "placement": {
+                "height": 29,
+                "left": 374,
+                "top": 103,
+                "width": 46
+              },
+              "type": "text"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "image": {
+                  "field": "",
+                  "fixed": "",
+                  "mode": "fixed"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "field": "server_region",
+                  "fixed": "#ffffff"
+                },
+                "size": 20,
+                "text": {
+                  "field": "server_region",
+                  "fixed": "10%",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 9",
+              "placement": {
+                "height": 29,
+                "left": 625,
+                "top": 158,
+                "width": 46
+              },
+              "type": "text"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "image": {
+                  "field": "",
+                  "fixed": "",
+                  "mode": "fixed"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "field": "region_server",
+                  "fixed": "#ffffff"
+                },
+                "size": 20,
+                "text": {
+                  "field": "region_server",
+                  "fixed": "10%",
+                  "mode": "field"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 10",
+              "placement": {
+                "height": 29,
+                "left": 676,
+                "top": 282,
+                "width": 46
+              },
+              "type": "text"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 11",
+              "placement": {
+                "height": 24,
+                "left": 268,
+                "top": 158,
+                "width": 33
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 12",
+              "placement": {
+                "height": 24,
+                "left": 372,
+                "top": 254,
+                "width": 33
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 13",
+              "placement": {
+                "height": 24,
+                "left": 646,
+                "top": 252,
+                "width": 33
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "image": {
+                  "field": "",
+                  "fixed": "",
+                  "mode": "fixed"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                }
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "field": "server_region",
+                  "fixed": "#ffffff"
+                },
+                "size": 20,
+                "text": {
+                  "field": "server_database2",
+                  "fixed": "Server 1",
+                  "mode": "fixed"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 14",
+              "placement": {
+                "height": 29,
+                "left": 483,
+                "top": 138,
+                "width": 89
+              },
+              "type": "text"
+            }
+          ],
+          "name": "Element 1672954602175",
+          "placement": {
+            "height": 100,
+            "left": 0,
+            "top": 0,
+            "width": 100
+          },
+          "type": "frame"
+        },
+        "showAdvancedTypes": false
+      },
+      "pluginVersion": "10.1.0-pre",
+      "targets": [
+        {
+          "csvContent": "database_server, server_database, server_region, region_server, database2_server, server_database2\n10, 53, 35, 12, 22, 81",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Network Weathermap",
+      "type": "canvas"
+    }
+  ],
+  "refresh": "",
+  "revision": 1,
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [
+    "gdev",
+    "panel-tests",
+    "canvas"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Panel Tests - Canvas Connection Examples",
+  "uid": "Pu8lwQAVz",
+  "version": 3,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/jsonnet/dev-dashboards.libsonnet b/devenv/jsonnet/dev-dashboards.libsonnet
index 2f77d6aad43..3dbd57652c7 100644
--- a/devenv/jsonnet/dev-dashboards.libsonnet
+++ b/devenv/jsonnet/dev-dashboards.libsonnet
@@ -135,6 +135,13 @@ local dashboard = grafana.dashboard;
         id: 0,
       }
     },
+    dashboard.new('canvas-connection-examples', import '../dev-dashboards/panel-canvas/canvas-connection-examples.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
     dashboard.new('canvas-examples', import '../dev-dashboards/panel-canvas/canvas-examples.json') +
     resource.addMetadata('folder', 'dev-dashboards') +
     {

From 9812ad2cb2517a0ad411763b303395e385ca5362 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Thu, 4 May 2023 10:52:43 +0300
Subject: [PATCH 623/729] Chore: Upgrade Go to 1.20.4 (#67748)

Upgrade Go to 1.20.4
---
 .drone.yml                        | 546 +++++++++++++++---------------
 Dockerfile                        |   2 +-
 Makefile                          |   2 +-
 scripts/build/ci-build/Dockerfile |   2 +-
 scripts/drone/steps/lib.star      |   4 +-
 5 files changed, 278 insertions(+), 278 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 05116449c1f..0350009bf9d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,7 +24,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build verify-drone
@@ -74,13 +74,13 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build verify-starlark .
   depends_on:
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: lint-starlark
 trigger:
   event:
@@ -127,13 +127,13 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - yarn-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: betterer-frontend
 - commands:
   - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST"
@@ -153,7 +153,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - yarn run ci:test-frontend
@@ -162,7 +162,7 @@ steps:
   - clone-enterprise
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-frontend
 trigger:
   event:
@@ -216,7 +216,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -225,7 +225,7 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - yarn run prettier:check
@@ -237,7 +237,7 @@ steps:
   - clone-enterprise
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: lint-frontend
 trigger:
   event:
@@ -291,7 +291,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -302,7 +302,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -312,7 +312,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -321,19 +321,19 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend
 - commands:
   - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -341,7 +341,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend-integration
 trigger:
   event:
@@ -390,7 +390,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST"
@@ -410,13 +410,13 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - make gen-go
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - apt-get update && apt-get install make
@@ -425,7 +425,7 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: lint-backend
 trigger:
   event:
@@ -480,7 +480,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -489,7 +489,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -497,18 +497,18 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@@ -531,7 +531,7 @@ steps:
       from_secret: github_token_pr
     TEST_TAG: v0.0.0-test
   failure: ignore
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: trigger-test-release
   when:
     paths:
@@ -558,7 +558,7 @@ steps:
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -567,7 +567,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -578,7 +578,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition oss
@@ -586,7 +586,7 @@ steps:
   - compile-build-cmd
   - yarn-install
   environment: null
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss
@@ -597,7 +597,7 @@ steps:
   - build-frontend
   - build-frontend-packages
   environment: null
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package
 - commands:
   - ./scripts/grafana-server/start-server
@@ -610,7 +610,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -713,7 +713,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-storybook
   when:
     paths:
@@ -724,7 +724,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - yarn wait-on http://$HOST:$PORT
@@ -826,7 +826,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
   failure: ignore
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mkdir -p bin
@@ -839,7 +839,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -853,7 +853,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -862,13 +862,13 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - apt-get update
@@ -885,7 +885,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -902,7 +902,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -912,7 +912,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -922,7 +922,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: memcached-integration-tests
 trigger:
   event:
@@ -974,7 +974,7 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - |-
@@ -986,7 +986,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: codespell
 - commands:
   - yarn run prettier:checkDocs
@@ -994,7 +994,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: lint-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana/latest
@@ -1038,13 +1038,13 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build shellcheck
   depends_on:
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: shellcheck
 trigger:
   event:
@@ -1085,7 +1085,7 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - |-
@@ -1097,7 +1097,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: codespell
 - commands:
   - yarn run prettier:checkDocs
@@ -1105,7 +1105,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: lint-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana/latest
@@ -1158,13 +1158,13 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - yarn-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -1172,7 +1172,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-frontend
 trigger:
   branch: main
@@ -1212,7 +1212,7 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - yarn run prettier:check
@@ -1223,7 +1223,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: lint-frontend
 trigger:
   branch: main
@@ -1265,7 +1265,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1274,7 +1274,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1282,19 +1282,19 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend
 - commands:
   - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -1302,7 +1302,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend-integration
 trigger:
   branch: main
@@ -1344,12 +1344,12 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - apt-get update && apt-get install make
@@ -1358,7 +1358,7 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: lint-backend
 - commands:
   - ./bin/build verify-drone
@@ -1412,7 +1412,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1421,7 +1421,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1429,25 +1429,25 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -1456,7 +1456,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -1467,7 +1467,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition oss
@@ -1477,7 +1477,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign
@@ -1495,7 +1495,7 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package
 - commands:
   - ./scripts/grafana-server/start-server
@@ -1508,7 +1508,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -1611,7 +1611,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-storybook
   when:
     paths:
@@ -1622,7 +1622,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - yarn wait-on http://$HOST:$PORT
@@ -1666,7 +1666,7 @@ steps:
     GRAFANA_MISC_STATS_API_KEY:
       from_secret: grafana_misc_stats_api_key
   failure: ignore
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: publish-frontend-metrics
   when:
     repo:
@@ -1747,7 +1747,7 @@ steps:
   environment:
     NPM_TOKEN:
       from_secret: npm_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: release-canary-npm-packages
   when:
     paths:
@@ -1854,7 +1854,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -1867,7 +1867,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1875,13 +1875,13 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - apt-get update
@@ -1898,7 +1898,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -1915,7 +1915,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -1925,7 +1925,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -1935,7 +1935,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: memcached-integration-tests
 trigger:
   branch: main
@@ -2173,32 +2173,32 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build build-backend --jobs 8 --edition oss ${DRONE_TAG}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG}
@@ -2207,7 +2207,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG}
@@ -2216,7 +2216,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition oss
@@ -2226,7 +2226,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition oss  --sign ${DRONE_TAG}
@@ -2244,14 +2244,14 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition oss --shouldSave
@@ -2290,7 +2290,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -2367,7 +2367,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-storybook
   when:
     event:
@@ -2426,7 +2426,7 @@ steps:
       from_secret: gcp_key
     PRERELEASE_BUCKET:
       from_secret: prerelease_bucket
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: store-npm-packages
 trigger:
   event:
@@ -2472,13 +2472,13 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - yarn-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -2486,7 +2486,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-frontend
 trigger:
   event:
@@ -2528,7 +2528,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2537,7 +2537,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2545,19 +2545,19 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend
 - commands:
   - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -2565,7 +2565,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend-integration
 trigger:
   event:
@@ -2681,7 +2681,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -2698,7 +2698,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -2706,19 +2706,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2728,7 +2728,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2737,14 +2737,14 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -2753,7 +2753,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -2762,7 +2762,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -2772,7 +2772,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise  --sign ${DRONE_TAG}
@@ -2790,14 +2790,14 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise --shouldSave
@@ -2837,7 +2837,7 @@ steps:
     ARCH: linux-amd64
     PORT: 3001
     RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -2972,7 +2972,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -2989,7 +2989,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -2999,14 +2999,14 @@ steps:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - init-enterprise
   - yarn-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -3015,7 +3015,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-frontend
 trigger:
   event:
@@ -3055,7 +3055,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mkdir -p bin
@@ -3078,7 +3078,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -3090,7 +3090,7 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3100,7 +3100,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3109,19 +3109,19 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend
 - commands:
   - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -3129,7 +3129,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend-integration
 trigger:
   event:
@@ -3265,7 +3265,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -3282,7 +3282,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -3290,19 +3290,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3312,7 +3312,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -3321,7 +3321,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -3330,7 +3330,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -3340,14 +3340,14 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend-enterprise2
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise2  --sign ${DRONE_TAG}
@@ -3365,7 +3365,7 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package-enterprise2
 - commands:
   - ./bin/build upload-cdn --edition enterprise2
@@ -3385,7 +3385,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package-enterprise2
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise2 --shouldSave
@@ -3519,7 +3519,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -3536,7 +3536,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -3544,19 +3544,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3566,7 +3566,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -3575,7 +3575,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -3584,7 +3584,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -3594,14 +3594,14 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend-enterprise2
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise2  --sign ${DRONE_TAG}
@@ -3619,7 +3619,7 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package-enterprise2
 - commands:
   - ./bin/build upload-cdn --edition enterprise2
@@ -3639,7 +3639,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package-enterprise2
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise2 --shouldSave
@@ -3765,7 +3765,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition oss
@@ -3861,7 +3861,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition enterprise
@@ -3940,7 +3940,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition enterprise
@@ -4009,7 +4009,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition enterprise2
@@ -4072,7 +4072,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition enterprise2
@@ -4136,7 +4136,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build publish aws --image grafana/grafana-enterprise --repo grafana-labs/grafanaenterprise
@@ -4187,7 +4187,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts packages --security --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -4249,7 +4249,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -4322,12 +4322,12 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG}
@@ -4351,7 +4351,7 @@ steps:
     NPM_TOKEN:
       from_secret: npm_token
   failure: ignore
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: release-npm-packages
 trigger:
   event:
@@ -4388,7 +4388,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - depends_on:
   - compile-build-cmd
@@ -4479,7 +4479,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - depends_on:
   - compile-build-cmd
@@ -4675,7 +4675,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -4692,7 +4692,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -4700,7 +4700,7 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts-page
@@ -4709,7 +4709,7 @@ steps:
   environment:
     GCP_KEY:
       from_secret: gcp_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: artifacts-page
 trigger:
   event:
@@ -4754,32 +4754,32 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -4788,7 +4788,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -4799,7 +4799,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition oss
@@ -4809,7 +4809,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign
@@ -4827,14 +4827,14 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition oss --shouldSave
@@ -4873,7 +4873,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -4950,7 +4950,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-storybook
   when:
     paths:
@@ -5031,13 +5031,13 @@ steps:
 - commands:
   - yarn install --immutable
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - yarn-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -5045,7 +5045,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-frontend
 trigger:
   ref:
@@ -5081,7 +5081,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -5090,7 +5090,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5098,19 +5098,19 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend
 - commands:
   - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -5118,7 +5118,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend-integration
 trigger:
   ref:
@@ -5188,7 +5188,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5196,13 +5196,13 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - apt-get update
@@ -5219,7 +5219,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -5236,7 +5236,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -5246,7 +5246,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -5256,7 +5256,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: memcached-integration-tests
 trigger:
   ref:
@@ -5362,7 +5362,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -5378,7 +5378,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -5386,19 +5386,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -5408,7 +5408,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5417,14 +5417,14 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -5433,7 +5433,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -5444,7 +5444,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -5454,7 +5454,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -5473,14 +5473,14 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise --shouldSave
@@ -5520,7 +5520,7 @@ steps:
     ARCH: linux-amd64
     PORT: 3001
     RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -5661,7 +5661,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -5677,7 +5677,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -5687,14 +5687,14 @@ steps:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - yarn betterer ci
   depends_on:
   - init-enterprise
   - yarn-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -5703,7 +5703,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-frontend
 trigger:
   ref:
@@ -5737,7 +5737,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mkdir -p bin
@@ -5759,7 +5759,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -5771,7 +5771,7 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -5781,7 +5781,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5790,19 +5790,19 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend
 - commands:
   - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -5810,7 +5810,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: test-backend-integration
 trigger:
   ref:
@@ -5880,7 +5880,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -5896,7 +5896,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -5906,7 +5906,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -5915,13 +5915,13 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - apt-get update
@@ -5938,7 +5938,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -5955,7 +5955,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -5965,7 +5965,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -5975,7 +5975,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: memcached-integration-tests
 trigger:
   ref:
@@ -6101,7 +6101,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -6117,7 +6117,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -6125,19 +6125,19 @@ steps:
   - init-enterprise
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: yarn-install
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -6147,7 +6147,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -6156,7 +6156,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend
 - commands:
   - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -6167,7 +6167,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-frontend-packages
 - commands:
   - ./bin/build  build-plugins --jobs 8 --edition enterprise
@@ -6177,7 +6177,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-plugins
 - commands:
   - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER}
@@ -6185,7 +6185,7 @@ steps:
   depends_on:
   - wire-install
   - compile-build-cmd
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: build-backend-enterprise2
 - commands:
   - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER}
@@ -6204,7 +6204,7 @@ steps:
       from_secret: packages_gpg_public_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: package-enterprise2
 - commands:
   - ./bin/build upload-cdn --edition enterprise2
@@ -6224,7 +6224,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package-enterprise2
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: copy-packages-for-docker
 - commands:
   - ./bin/build build-docker --edition enterprise2 --shouldSave
@@ -6378,7 +6378,7 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -6386,13 +6386,13 @@ steps:
     in output.'
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - apt-get update
@@ -6409,7 +6409,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -6426,7 +6426,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -6436,7 +6436,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -6446,7 +6446,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: memcached-integration-tests
 trigger:
   event:
@@ -6523,7 +6523,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -6540,7 +6540,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: init-enterprise
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -6550,7 +6550,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -6559,13 +6559,13 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: verify-gen-jsonnet
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: wire-install
 - commands:
   - apt-get update
@@ -6582,7 +6582,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -6599,7 +6599,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -6609,7 +6609,7 @@ steps:
   - wire-install
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -6619,7 +6619,7 @@ steps:
   - wire-install
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.7.3
+  image: grafana/build-container:1.7.4
   name: memcached-integration-tests
 trigger:
   event:
@@ -6772,7 +6772,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.3
+  image: golang:1.20.4
   name: compile-build-cmd
 - commands:
   - ./bin/build publish grafana-com --edition oss
@@ -6941,6 +6941,6 @@ kind: secret
 name: github_token
 ---
 kind: signature
-hmac: e819db5b752a99280213ed98baa12c0c27c87521c826580a8067c957579db98f
+hmac: e7a06868456687331f07e34fec5eb6ec45d2b987564ba7ec11d7f29bfa6a98c9
 
 ...
diff --git a/Dockerfile b/Dockerfile
index 3d4f4dbdbe8..441be9dfa64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 ARG BASE_IMAGE=alpine:3.17
 ARG JS_IMAGE=node:18-alpine3.17
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.20.3-alpine3.17
+ARG GO_IMAGE=golang:1.20.4-alpine3.17
 
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
diff --git a/Makefile b/Makefile
index b91a2e36b11..5b113040eba 100644
--- a/Makefile
+++ b/Makefile
@@ -207,7 +207,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--build-arg BASE_IMAGE=ubuntu:20.04 \
-	--build-arg GO_IMAGE=golang:1.20.3 \
+	--build-arg GO_IMAGE=golang:1.20.4 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)
 
diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile
index 9d3a65b388a..992c8d43e9d 100644
--- a/scripts/build/ci-build/Dockerfile
+++ b/scripts/build/ci-build/Dockerfile
@@ -108,7 +108,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
 # Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's.
 FROM debian:buster-20220822
 
-ENV GOVERSION=1.20.3 \
+ENV GOVERSION=1.20.4 \
     PATH=/usr/local/go/bin:$PATH \
     GOPATH=/go \
     NODEVERSION=18.12.0-1nodesource1 \
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 500c4a3fc30..510aa041e73 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -9,14 +9,14 @@ load(
 )
 
 grabpl_version = "v3.0.30"
-build_image = "grafana/build-container:1.7.3"
+build_image = "grafana/build-container:1.7.4"
 publish_image = "grafana/grafana-ci-deploy:1.3.3"
 deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image"
 alpine_image = "alpine:3.17.1"
 curl_image = "byrnedo/alpine-curl:0.1.8"
 windows_image = "mcr.microsoft.com/windows:1809"
 wix_image = "grafana/ci-wix:0.1.1"
-go_image = "golang:1.20.3"
+go_image = "golang:1.20.4"
 
 trigger_oss = {
     "repo": [

From b1382ac48e890cb55ae963f749e6a2b4e5b0981e Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Thu, 4 May 2023 09:36:36 +0100
Subject: [PATCH 624/729] RBAC: Do not search for parents of the root folder
 (#67746)

do not search for parents of the general folder
---
 pkg/services/dashboards/accesscontrol.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/services/dashboards/accesscontrol.go b/pkg/services/dashboards/accesscontrol.go
index 2451fac0c81..3b798fddb4d 100644
--- a/pkg/services/dashboards/accesscontrol.go
+++ b/pkg/services/dashboards/accesscontrol.go
@@ -196,6 +196,9 @@ func resolveDashboardScope(ctx context.Context, folderDB folder.FolderStore, org
 }
 
 func GetInheritedScopes(ctx context.Context, orgID int64, folderUID string, folderSvc folder.Service) ([]string, error) {
+	if folderUID == ac.GeneralFolderUID {
+		return nil, nil
+	}
 	ancestors, err := folderSvc.GetParents(ctx, folder.GetParentsQuery{
 		UID:   folderUID,
 		OrgID: orgID,

From 3644ea65562fcddc4e8edf37e4a28051f1bf0e0f Mon Sep 17 00:00:00 2001
From: Jo <joao.guerreiro@grafana.com>
Date: Thu, 4 May 2023 10:36:51 +0200
Subject: [PATCH 625/729] ServiceAccounts: Add secret scan service docs
 (#57926)

* add secret scanning docs

* update docs

* fix merge

* add revoke to docs

* add revoke to docs

* typo fix

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* add step by step instructions

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* prettier

* Update docs/sources/setup-grafana/configure-security/secret-scan.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* feedback

* Update docs/sources/setup-grafana/configure-security/secret-scan.md

* Update docs/sources/setup-grafana/configure-security/secret-scan.md

* Update docs/sources/setup-grafana/configure-security/secret-scan.md

Co-authored-by: Victor Cinaglia <victor@grafana.com>

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Victor Cinaglia <victor@grafana.com>
---
 conf/defaults.ini                             | 20 ++++-
 conf/sample.ini                               | 16 ++++
 .../configure-security/secret-scan.md         | 83 +++++++++++++++++++
 3 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 docs/sources/setup-grafana/configure-security/secret-scan.md

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 0176519d9e1..1066299459e 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -422,7 +422,7 @@ datasource_limit = 5000
 
 ################################### SQL Data Sources #####################
 [sql_datasources]
-# Default maximum number of open connections maintained in the connection pool 
+# Default maximum number of open connections maintained in the connection pool
 # when connecting to SQL based data sources
 max_open_conns_default = 100
 
@@ -431,7 +431,7 @@ max_open_conns_default = 100
 max_idle_conns_default = 100
 
 # Default maximum connection lifetime used when connecting
-# to SQL based data sources. 
+# to SQL based data sources.
 max_conn_lifetime_default = 14400
 
 #################################### Users ###############################
@@ -484,6 +484,22 @@ user_invite_max_lifetime_duration = 24h
 # Enter a comma-separated list of usernames to hide them in the Grafana UI. These users are shown to Grafana admins and to themselves.
 hidden_users =
 
+[secretscan]
+# Enable secretscan feature
+enabled = false
+
+# Interval to check for token leaks
+interval = 5m
+
+# base URL of the grafana token leak check service
+base_url = https://secret-scanning.grafana.net
+
+# URL to send outgoing webhooks to in case of detection
+oncall_url =
+
+# Whether to revoke the token if a leak is detected or just send a notification
+revoke = true
+
 [service_accounts]
 # When set, Grafana will not allow the creation of tokens with expiry greater than this setting.
 token_expiration_day_limit =
diff --git a/conf/sample.ini b/conf/sample.ini
index 29bf51e332b..91d4e908be5 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -469,6 +469,22 @@
 # Enter a comma-separated list of users login to hide them in the Grafana UI. These users are shown to Grafana admins and themselves.
 ; hidden_users =
 
+[secretscan]
+# Enable secretscan feature
+;enabled = false
+
+# Interval to check for token leaks
+;interval = 5m
+
+# base URL of the grafana token leak check service
+;base_url = https://secret-scanning.grafana.net
+
+# URL to send outgoing webhooks to in case of detection
+;oncall_url =
+
+# Whether to revoke the token if a leak is detected or just send a notification
+;revoke = true
+
 [service_accounts]
 # Service account maximum expiration date in days.
 # When set, Grafana will not allow the creation of tokens with expiry greater than this setting.
diff --git a/docs/sources/setup-grafana/configure-security/secret-scan.md b/docs/sources/setup-grafana/configure-security/secret-scan.md
new file mode 100644
index 00000000000..0338da5de69
--- /dev/null
+++ b/docs/sources/setup-grafana/configure-security/secret-scan.md
@@ -0,0 +1,83 @@
+---
+description: Detect and revoke leaked Grafana service account tokens
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Configure Grafana secret scanning and notifications
+menuTitle: Configure secret scanning
+weight: 1000
+---
+
+# Configure Grafana secret scanning and notifications
+
+With Grafana, you can use the GitHub Secret Scanning service to determine if your [service account tokens]({{< relref "../../administration/service-accounts/" >}}) have been leaked on GitHub.
+
+When GitHub Secret Scanning detects a Grafana secret, its hash is stored in Grafana Labs' secret scanning service.
+
+Grafana instances, whether on-premises or on the cloud, can use this service to verify if a token generated by the instance has been made public. This verification is done by comparing the token's hash with the exposed token's hash.
+
+If the service detects a leaked token, it immediately revokes it, making it useless, and logs the event.
+
+> **Note:** If the `revoke` option is disabled, the service only sends a notification to the configured webhook URL and logs the event. The token is not automatically revoked.
+
+You can also configure the service to send an outgoing webhook notification to a webhook URL.
+
+The notification includes a JSON payload that contains the following data:
+
+```json
+{
+  "alert_uid": "c9ce50a1-d66b-45e4-9b5d-175766cfc026",
+  "link_to_upstream_details": <URL to token leak>,
+  "message": "Token of type grafana_service_account_token with name
+sa-the-toucans has been publicly exposed in <URL to token leak>.
+Grafana has revoked this token",
+  "state": "alerting",
+  "title": "SecretScan Alert: Grafana Token leaked"
+}
+```
+
+> **Note:** Secret scanning is disabled by default. Outgoing connections are made once you enable it.
+
+## Before you begin
+
+- Ensure all your API keys have been migrated to service accounts.
+  For more information about service account migration, refer to [Migrate API keys to Grafana service accounts]({{< relref "../../administration/api-keys/#migrate-api-keys-to-grafana-service-accounts" >}}).
+
+## Configure secret scanning
+
+1. Open the Grafana configuration file.
+
+1. In the `[secretscan]` section, update the following parameters:
+
+```ini
+[secretscan]
+# Enable secretscan feature
+enabled = true
+
+# Whether to revoke the token if a leak is detected or just send a notification
+revoke = true
+```
+
+Save the configuration file and restart Grafana.
+
+## Configure outgoing webhook notifications
+
+1. Create an oncall integration of the type **Webhook** and set up alerts.
+   To learn how to create a Grafana OnCall integration, refer to [Webhook integrations for Grafana OnCall](/docs/oncall/latest/integrations/available-integrations/configure-webhook/).
+
+1. Copy the webhook URL of the new integration.
+
+1. Open the Grafana configuration file.
+
+1. In the `[secretscan]` section, update the following parameters,
+   replacing the URL with the webhook URL you copied in step 2.
+
+```ini
+[secretscan]
+# URL to send a webhook payload in oncall format
+oncall_url = https://example.url/integrations/v1/webhook/3a359nib9eweAd9lAAAETVdOx/
+```
+
+Save the configuration file and restart Grafana.

From fd28c8490f5cf51c5f2c8085af6d7602c90ce419 Mon Sep 17 00:00:00 2001
From: Will Browne <wbrowne@users.noreply.github.com>
Date: Thu, 4 May 2023 10:52:09 +0200
Subject: [PATCH 626/729] Plugins: Tidy up CLI code (#67723)

* remove dead code and use pkg/plugins for uninstall process

* fix linter

* remove unnecessary cruft
---
 pkg/cmd/grafana-cli/commands/commands.go      | 24 ++++---------
 .../commands/commandstest/fake_api_client.go  | 36 -------------------
 .../grafana-cli/commands/install_command.go   |  2 +-
 .../commands/listremote_command.go            |  5 +--
 .../commands/listversions_command.go          |  5 +--
 pkg/cmd/grafana-cli/commands/ls_command.go    |  2 +-
 .../grafana-cli/commands/ls_command_test.go   |  9 ++---
 .../grafana-cli/commands/remove_command.go    |  2 +-
 .../commands/upgrade_all_command.go           |  4 +--
 .../grafana-cli/commands/upgrade_command.go   |  4 +--
 pkg/cmd/grafana-cli/services/api_client.go    |  6 ++--
 11 files changed, 25 insertions(+), 74 deletions(-)
 delete mode 100644 pkg/cmd/grafana-cli/commands/commandstest/fake_api_client.go

diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go
index a59b209986b..c1459f89361 100644
--- a/pkg/cmd/grafana-cli/commands/commands.go
+++ b/pkg/cmd/grafana-cli/commands/commands.go
@@ -10,7 +10,6 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands/datamigrations"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands/secretsmigrations"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
@@ -91,47 +90,38 @@ func runPluginCommand(command func(commandLine utils.CommandLine) error) func(co
 	}
 }
 
-// Command contains command state.
-type Command struct {
-	Client utils.ApiClient
-}
-
-var cmd Command = Command{
-	Client: &services.GrafanaComClient{},
-}
-
 var pluginCommands = []*cli.Command{
 	{
 		Name:   "install",
 		Usage:  "install <plugin id> <plugin version (optional)>",
-		Action: runPluginCommand(cmd.installCommand),
+		Action: runPluginCommand(installCommand),
 	}, {
 		Name:   "list-remote",
 		Usage:  "list remote available plugins",
-		Action: runPluginCommand(cmd.listRemoteCommand),
+		Action: runPluginCommand(listRemoteCommand),
 	}, {
 		Name:   "list-versions",
 		Usage:  "list-versions <plugin id>",
-		Action: runPluginCommand(cmd.listVersionsCommand),
+		Action: runPluginCommand(listVersionsCommand),
 	}, {
 		Name:    "update",
 		Usage:   "update <plugin id>",
 		Aliases: []string{"upgrade"},
-		Action:  runPluginCommand(cmd.upgradeCommand),
+		Action:  runPluginCommand(upgradeCommand),
 	}, {
 		Name:    "update-all",
 		Aliases: []string{"upgrade-all"},
 		Usage:   "update all your installed plugins",
-		Action:  runPluginCommand(cmd.upgradeAllCommand),
+		Action:  runPluginCommand(upgradeAllCommand),
 	}, {
 		Name:   "ls",
 		Usage:  "list installed plugins (excludes core plugins)",
-		Action: runPluginCommand(cmd.lsCommand),
+		Action: runPluginCommand(lsCommand),
 	}, {
 		Name:    "uninstall",
 		Aliases: []string{"remove"},
 		Usage:   "uninstall <plugin id>",
-		Action:  runPluginCommand(cmd.removeCommand),
+		Action:  runPluginCommand(removeCommand),
 	},
 }
 
diff --git a/pkg/cmd/grafana-cli/commands/commandstest/fake_api_client.go b/pkg/cmd/grafana-cli/commands/commandstest/fake_api_client.go
deleted file mode 100644
index 9bba38eb61b..00000000000
--- a/pkg/cmd/grafana-cli/commands/commandstest/fake_api_client.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package commandstest
-
-import (
-	"os"
-
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
-)
-
-type FakeGrafanaComClient struct {
-	GetPluginFunc      func(pluginId, repoUrl string) (models.Plugin, error)
-	DownloadFileFunc   func(pluginName string, tmpFile *os.File, url string, checksum string) (err error)
-	ListAllPluginsFunc func(repoUrl string) (models.PluginRepo, error)
-}
-
-func (client *FakeGrafanaComClient) GetPlugin(pluginID, repoUrl string) (models.Plugin, error) {
-	if client.GetPluginFunc != nil {
-		return client.GetPluginFunc(pluginID, repoUrl)
-	}
-
-	return models.Plugin{}, nil
-}
-
-func (client *FakeGrafanaComClient) DownloadFile(pluginName string, tmpFile *os.File, url string, checksum string) (err error) {
-	if client.DownloadFileFunc != nil {
-		return client.DownloadFileFunc(pluginName, tmpFile, url, checksum)
-	}
-
-	return nil
-}
-
-func (client *FakeGrafanaComClient) ListAllPlugins(repoURL string) (models.PluginRepo, error) {
-	if client.ListAllPluginsFunc != nil {
-		return client.ListAllPluginsFunc(repoURL)
-	}
-	return models.PluginRepo{}, nil
-}
diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index f799a847088..994da69c0af 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -49,7 +49,7 @@ func logRestartNotice() {
 	logger.Info(color.GreenString("Please restart Grafana after installing or removing plugins. Refer to Grafana documentation for instructions if necessary.\n\n"))
 }
 
-func (cmd Command) installCommand(c utils.CommandLine) error {
+func installCommand(c utils.CommandLine) error {
 	pluginFolder := c.PluginDirectory()
 	if err := validateInput(c, pluginFolder); err != nil {
 		return err
diff --git a/pkg/cmd/grafana-cli/commands/listremote_command.go b/pkg/cmd/grafana-cli/commands/listremote_command.go
index 2ecf847d13b..79b11c939b1 100644
--- a/pkg/cmd/grafana-cli/commands/listremote_command.go
+++ b/pkg/cmd/grafana-cli/commands/listremote_command.go
@@ -2,13 +2,14 @@ package commands
 
 import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
 // listRemoteCommand prints out all plugins in the remote repo with latest version supported on current platform.
 // If there are no supported versions for plugin it is skipped.
-func (cmd Command) listRemoteCommand(c utils.CommandLine) error {
-	plugin, err := cmd.Client.ListAllPlugins(c.PluginRepoURL())
+func listRemoteCommand(c utils.CommandLine) error {
+	plugin, err := services.ListAllPlugins(c.PluginRepoURL())
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/grafana-cli/commands/listversions_command.go b/pkg/cmd/grafana-cli/commands/listversions_command.go
index 73f567dcb3f..89ca4ffaa6f 100644
--- a/pkg/cmd/grafana-cli/commands/listversions_command.go
+++ b/pkg/cmd/grafana-cli/commands/listversions_command.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
@@ -16,14 +17,14 @@ func validateVersionInput(c utils.CommandLine) error {
 	return nil
 }
 
-func (cmd Command) listVersionsCommand(c utils.CommandLine) error {
+func listVersionsCommand(c utils.CommandLine) error {
 	if err := validateVersionInput(c); err != nil {
 		return err
 	}
 
 	pluginToList := c.Args().First()
 
-	plugin, err := cmd.Client.GetPlugin(pluginToList, c.String("repo"))
+	plugin, err := services.GetPlugin(pluginToList, c.String("repo"))
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/grafana-cli/commands/ls_command.go b/pkg/cmd/grafana-cli/commands/ls_command.go
index aa3b94d0214..8eb06bb2925 100644
--- a/pkg/cmd/grafana-cli/commands/ls_command.go
+++ b/pkg/cmd/grafana-cli/commands/ls_command.go
@@ -35,7 +35,7 @@ var validateLsCommand = func(pluginDir string) error {
 	return nil
 }
 
-func (cmd Command) lsCommand(c utils.CommandLine) error {
+func lsCommand(c utils.CommandLine) error {
 	pluginDir := c.PluginDirectory()
 	if err := validateLsCommand(pluginDir); err != nil {
 		return err
diff --git a/pkg/cmd/grafana-cli/commands/ls_command_test.go b/pkg/cmd/grafana-cli/commands/ls_command_test.go
index c2454568e2a..a22963a49a2 100644
--- a/pkg/cmd/grafana-cli/commands/ls_command_test.go
+++ b/pkg/cmd/grafana-cli/commands/ls_command_test.go
@@ -43,8 +43,7 @@ func TestMissingPath(t *testing.T) {
 			c, err := commandstest.NewCliContext(tc.cliContext)
 			require.NoError(t, err)
 
-			cmd := Command{}
-			err = cmd.lsCommand(c)
+			err = lsCommand(c)
 			assert.Equal(t, tc.error, err)
 		})
 	}
@@ -66,8 +65,7 @@ func TestValidateLsCommand_override(t *testing.T) {
 			return expected
 		}
 
-		cmd := Command{}
-		err = cmd.lsCommand(c)
+		err = lsCommand(c)
 		assert.Error(t, err)
 		assert.Equal(t, expected, err, "can override validateLsCommand")
 	})
@@ -77,8 +75,7 @@ func TestValidateLsCommand_override(t *testing.T) {
 		c, err := commandstest.NewCliContext(map[string]string{"path": "/var/lib/grafana/plugins"})
 		require.NoError(t, err)
 
-		cmd := Command{}
-		err = cmd.lsCommand(c)
+		err = lsCommand(c)
 		assert.NotEqual(t, err, expected, "validateLsCommand is reset")
 	})
 }
diff --git a/pkg/cmd/grafana-cli/commands/remove_command.go b/pkg/cmd/grafana-cli/commands/remove_command.go
index 2c29dfd709f..066160143b9 100644
--- a/pkg/cmd/grafana-cli/commands/remove_command.go
+++ b/pkg/cmd/grafana-cli/commands/remove_command.go
@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
-func (cmd Command) removeCommand(c utils.CommandLine) error {
+func removeCommand(c utils.CommandLine) error {
 	pluginID := c.Args().First()
 	if pluginID == "" {
 		return errors.New("missing plugin parameter")
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
index e3333073775..b13ddea45f7 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
@@ -25,12 +25,12 @@ func shouldUpgrade(installed string, remote *models.Plugin) bool {
 	return installedVersion.LessThan(latestVersion)
 }
 
-func (cmd Command) upgradeAllCommand(c utils.CommandLine) error {
+func upgradeAllCommand(c utils.CommandLine) error {
 	pluginsDir := c.PluginDirectory()
 
 	localPlugins := services.GetLocalPlugins(pluginsDir)
 
-	remotePlugins, err := cmd.Client.ListAllPlugins(c.String("repo"))
+	remotePlugins, err := services.ListAllPlugins(c.String("repo"))
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_command.go b/pkg/cmd/grafana-cli/commands/upgrade_command.go
index d80a6beb908..cf7d47ec9d2 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_command.go
@@ -11,7 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
-func (cmd Command) upgradeCommand(c utils.CommandLine) error {
+func upgradeCommand(c utils.CommandLine) error {
 	ctx := context.Background()
 	pluginsDir := c.PluginDirectory()
 	pluginID := c.Args().First()
@@ -21,7 +21,7 @@ func (cmd Command) upgradeCommand(c utils.CommandLine) error {
 		return err
 	}
 
-	plugin, err := cmd.Client.GetPlugin(pluginID, c.PluginRepoURL())
+	plugin, err := services.GetPlugin(pluginID, c.PluginRepoURL())
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/grafana-cli/services/api_client.go b/pkg/cmd/grafana-cli/services/api_client.go
index c9f8e9a506a..99d3c9b7f93 100644
--- a/pkg/cmd/grafana-cli/services/api_client.go
+++ b/pkg/cmd/grafana-cli/services/api_client.go
@@ -14,9 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 )
 
-type GrafanaComClient struct{}
-
-func (client *GrafanaComClient) GetPlugin(pluginId, repoUrl string) (models.Plugin, error) {
+func GetPlugin(pluginId, repoUrl string) (models.Plugin, error) {
 	logger.Debugf("getting plugin metadata from: %v pluginId: %v \n", repoUrl, pluginId)
 	body, err := sendRequestGetBytes(HttpClient, repoUrl, "repo", pluginId)
 	if err != nil {
@@ -37,7 +35,7 @@ func (client *GrafanaComClient) GetPlugin(pluginId, repoUrl string) (models.Plug
 	return data, nil
 }
 
-func (client *GrafanaComClient) ListAllPlugins(repoUrl string) (models.PluginRepo, error) {
+func ListAllPlugins(repoUrl string) (models.PluginRepo, error) {
 	body, err := sendRequestGetBytes(HttpClient, repoUrl, "repo")
 
 	if err != nil {

From 338e98e237d92139a9a650d7a7acfa47e15984db Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 4 May 2023 09:32:37 +0000
Subject: [PATCH 627/729] NestedFolders: Fetch access control metadata for
 folder view (#67786)

---
 .../app/features/browse-dashboards/api/browseDashboardsAPI.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index 66b40ae8417..8b46af6b365 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -36,7 +36,7 @@ export const browseDashboardsAPI = createApi({
   baseQuery: createBackendSrvBaseQuery({ baseURL: '/api' }),
   endpoints: (builder) => ({
     getFolder: builder.query<FolderDTO, string>({
-      query: (folderUID) => ({ url: `/folders/${folderUID}` }),
+      query: (folderUID) => ({ url: `/folders/${folderUID}`, params: { accesscontrol: true } }),
     }),
     getAffectedItems: builder.query<DescendantCount, DashboardTreeSelection>({
       queryFn: async (selectedItems) => {

From e03a8b682620248288d936f375b018c6863b590c Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Thu, 4 May 2023 11:56:51 +0200
Subject: [PATCH 628/729] BackendSrv: Restructure response stream to resolve a
 retried request correctly (#66095)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* BackendSrv: Restrucutre response stream to resolve a retried request
correctly

* BackendSrv: Get signed in property from user

* Fix test with correct number of calls

* To prevent retry we need to throw error

* Fix tests

* revert change

* Fixes to token rotation

* Align tests

* Remove commented out code

---------

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>
---
 .betterer.results                         |   4 +-
 public/app/core/services/backend_srv.ts   | 186 ++++++++++++----------
 public/app/core/specs/backend_srv.test.ts | 186 +++++++++++++++-------
 3 files changed, 229 insertions(+), 147 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 5ae9c8d69b2..22be1f2f322 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -1631,8 +1631,8 @@ exports[`better eslint`] = {
     "public/app/core/services/backend_srv.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 51cac6074d1..594bc15346e 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -1,16 +1,17 @@
-import {
-  from,
-  lastValueFrom,
-  merge,
-  MonoTypeOperatorFunction,
-  Observable,
-  of,
-  Subject,
-  Subscription,
-  throwError,
-} from 'rxjs';
+import { from, lastValueFrom, MonoTypeOperatorFunction, Observable, Subject, Subscription, throwError } from 'rxjs';
 import { fromFetch } from 'rxjs/fetch';
-import { catchError, filter, map, mergeMap, retryWhen, share, takeUntil, tap, throwIfEmpty } from 'rxjs/operators';
+import {
+  catchError,
+  filter,
+  finalize,
+  map,
+  mergeMap,
+  retryWhen,
+  share,
+  takeUntil,
+  tap,
+  throwIfEmpty,
+} from 'rxjs/operators';
 import { v4 as uuidv4 } from 'uuid';
 
 import { AppEvents, DataQueryErrorType } from '@grafana/data';
@@ -59,6 +60,7 @@ export class BackendSrv implements BackendService {
   private inspectorStream: Subject<FetchResponse | FetchError> = new Subject<FetchResponse | FetchError>();
   private readonly fetchQueue: FetchQueue;
   private readonly responseQueue: ResponseQueue;
+  private _tokenRotationInProgress?: Observable<FetchResponse> | null = null;
 
   private dependencies: BackendSrvDependencies = {
     fromFetch: fromFetch,
@@ -141,18 +143,9 @@ export class BackendSrv implements BackendService {
       }
     }
 
-    const fromFetchStream = this.getFromFetchStream<T>(options);
-    const failureStream = fromFetchStream.pipe(this.toFailureStream<T>(options));
-    const successStream = fromFetchStream.pipe(
-      filter((response) => response.ok === true),
-      tap((response) => {
-        this.showSuccessAlert(response);
-        this.inspectorStream.next(response);
-      })
-    );
-
-    return merge(successStream, failureStream).pipe(
-      catchError((err: FetchError) => throwError(this.processRequestError(options, err))),
+    return this.getFromFetchStream<T>(options).pipe(
+      this.handleStreamResponse<T>(options),
+      this.handleStreamError(options),
       this.handleStreamCancellation(options)
     );
   }
@@ -228,70 +221,10 @@ export class BackendSrv implements BackendService {
           traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
         };
         return fetchResponse;
-      }),
-      share() // sharing this so we can split into success and failure and then merge back
+      })
     );
   }
 
-  private toFailureStream<T>(options: BackendSrvRequest): MonoTypeOperatorFunction<FetchResponse<T>> {
-    const { isSignedIn } = this.dependencies.contextSrv.user;
-
-    return (inputStream) =>
-      inputStream.pipe(
-        filter((response) => response.ok === false),
-        mergeMap((response) => {
-          const { status, statusText, data } = response;
-          const fetchErrorResponse: FetchError = {
-            status,
-            statusText,
-            data,
-            config: options,
-            traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
-          };
-          return throwError(fetchErrorResponse);
-        }),
-        retryWhen((attempts: Observable<any>) =>
-          attempts.pipe(
-            mergeMap((error, i) => {
-              const firstAttempt = i === 0 && options.retry === 0;
-
-              if (error.status === 401 && isLocalUrl(options.url) && firstAttempt && isSignedIn) {
-                if (error.data?.error?.id === 'ERR_TOKEN_REVOKED') {
-                  this.dependencies.appEvents.publish(
-                    new ShowModalReactEvent({
-                      component: TokenRevokedModal,
-                      props: {
-                        maxConcurrentSessions: error.data?.error?.maxConcurrentSessions,
-                      },
-                    })
-                  );
-
-                  return of({});
-                }
-
-                let authChecker = () => this.loginPing();
-                if (config.featureToggles.clientTokenRotation) {
-                  authChecker = () => this.rotateToken();
-                }
-
-                return from(authChecker()).pipe(
-                  catchError((err) => {
-                    if (err.status === 401) {
-                      this.dependencies.logout();
-                      return throwError(err);
-                    }
-                    return throwError(err);
-                  })
-                );
-              }
-
-              return throwError(error);
-            })
-          )
-        )
-      );
-  }
-
   showApplicationErrorAlert(err: FetchError) {}
 
   showSuccessAlert<T>(response: FetchResponse<T>) {
@@ -386,6 +319,74 @@ export class BackendSrv implements BackendService {
     return err;
   }
 
+  private handleStreamResponse<T>(options: BackendSrvRequest): MonoTypeOperatorFunction<FetchResponse<T>> {
+    return (inputStream) =>
+      inputStream.pipe(
+        map((response) => {
+          if (!response.ok) {
+            const { status, statusText, data } = response;
+            const fetchErrorResponse: FetchError = {
+              status,
+              statusText,
+              data,
+              config: options,
+              traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
+            };
+            throw fetchErrorResponse;
+          }
+          return response;
+        }),
+        tap((response) => {
+          this.showSuccessAlert(response);
+          this.inspectorStream.next(response);
+        })
+      );
+  }
+
+  private handleStreamError<T>(options: BackendSrvRequest): MonoTypeOperatorFunction<FetchResponse<T>> {
+    const { isSignedIn } = this.dependencies.contextSrv.user;
+
+    return (inputStream) =>
+      inputStream.pipe(
+        retryWhen((attempts: Observable<any>) =>
+          attempts.pipe(
+            mergeMap((error, i) => {
+              const firstAttempt = i === 0 && options.retry === 0;
+
+              if (error.status === 401 && isLocalUrl(options.url) && firstAttempt && isSignedIn) {
+                if (error.data?.error?.id === 'ERR_TOKEN_REVOKED') {
+                  this.dependencies.appEvents.publish(
+                    new ShowModalReactEvent({
+                      component: TokenRevokedModal,
+                      props: {
+                        maxConcurrentSessions: error.data?.error?.maxConcurrentSessions,
+                      },
+                    })
+                  );
+                  return throwError(() => error);
+                }
+
+                let authChecker = config.featureToggles.clientTokenRotation ? this.rotateToken() : this.loginPing();
+
+                return from(authChecker).pipe(
+                  catchError((err) => {
+                    if (err.status === 401) {
+                      this.dependencies.logout();
+                      return throwError(err);
+                    }
+                    return throwError(err);
+                  })
+                );
+              }
+
+              return throwError(error);
+            })
+          )
+        ),
+        catchError((err: FetchError) => throwError(() => this.processRequestError(options, err)))
+      );
+  }
+
   private handleStreamCancellation(options: BackendSrvRequest): MonoTypeOperatorFunction<FetchResponse<any>> {
     return (inputStream) =>
       inputStream.pipe(
@@ -459,11 +460,22 @@ export class BackendSrv implements BackendService {
   }
 
   rotateToken() {
-    return this.request({ url: '/api/user/auth-tokens/rotate', method: 'POST', retry: 1 });
+    if (this._tokenRotationInProgress) {
+      return this._tokenRotationInProgress;
+    }
+
+    this._tokenRotationInProgress = this.fetch({ url: '/api/user/auth-tokens/rotate', method: 'POST', retry: 1 }).pipe(
+      finalize(() => {
+        this._tokenRotationInProgress = null;
+      }),
+      share()
+    );
+
+    return this._tokenRotationInProgress;
   }
 
   loginPing() {
-    return this.request({ url: '/api/login/ping', method: 'GET', retry: 1 });
+    return this.fetch({ url: '/api/login/ping', method: 'GET', retry: 1 });
   }
 
   /** @deprecated */
diff --git a/public/app/core/specs/backend_srv.test.ts b/public/app/core/specs/backend_srv.test.ts
index 2aa71b2e808..fad3b7e8665 100644
--- a/public/app/core/specs/backend_srv.test.ts
+++ b/public/app/core/specs/backend_srv.test.ts
@@ -1,16 +1,17 @@
 import 'whatwg-fetch'; // fetch polyfill needed for PhantomJs rendering
 import { Observable, of, lastValueFrom } from 'rxjs';
+import { fromFetch } from 'rxjs/fetch';
 import { delay } from 'rxjs/operators';
 
 import { AppEvents, DataQueryErrorType, EventBusExtended } from '@grafana/data';
-import { BackendSrvRequest, FetchError, FetchResponse } from '@grafana/runtime';
+import { BackendSrvRequest, FetchError, config, FetchResponse } from '@grafana/runtime';
 
 import { TokenRevokedModal } from '../../features/users/TokenRevokedModal';
 import { ShowModalReactEvent } from '../../types/events';
 import { BackendSrv, BackendSrvDependencies } from '../services/backend_srv';
 import { ContextSrv, User } from '../services/context_srv';
 
-const getTestContext = (overides?: object) => {
+const getTestContext = (overides?: object, mockFromFetch = true) => {
   const defaults = {
     data: { test: 'hello world' },
     ok: true,
@@ -55,7 +56,7 @@ const getTestContext = (overides?: object) => {
   const parseRequestOptionsMock = jest.fn().mockImplementation((options) => options);
 
   const backendSrv = new BackendSrv({
-    fromFetch: fromFetchMock,
+    fromFetch: mockFromFetch ? fromFetchMock : fromFetch,
     appEvents: appEventsMock,
     contextSrv: contextSrvMock,
     logout: logoutMock,
@@ -63,14 +64,14 @@ const getTestContext = (overides?: object) => {
 
   backendSrv['parseRequestOptions'] = parseRequestOptionsMock;
 
-  const expectCallChain = () => {
-    expect(fromFetchMock).toHaveBeenCalledTimes(1);
+  const expectCallChain = (calls = 1) => {
+    expect(fromFetchMock).toHaveBeenCalledTimes(calls);
   };
 
-  const expectRequestCallChain = (options: unknown) => {
+  const expectRequestCallChain = (options: unknown, calls = 1) => {
     expect(parseRequestOptionsMock).toHaveBeenCalledTimes(1);
     expect(parseRequestOptionsMock).toHaveBeenCalledWith(options);
-    expectCallChain();
+    expectCallChain(calls);
   };
 
   return {
@@ -158,38 +159,71 @@ describe('backendSrv', () => {
     });
 
     describe('when making an unsuccessful call and conditions for retry are favorable and loginPing does not throw', () => {
-      it('then it should retry', async () => {
-        jest.useFakeTimers();
-        const url = '/api/dashboard/';
-        const { backendSrv, appEventsMock, logoutMock, expectRequestCallChain } = getTestContext({
-          ok: false,
-          status: 401,
-          statusText: errorMessage,
-          data: { message: errorMessage },
-          url,
-        });
+      const url = '/api/dashboard/';
+      const okResponse = { ok: true, status: 200, statusText: 'OK', data: { message: 'Ok' } };
+      let fetchMock: jest.SpyInstance;
 
-        backendSrv.loginPing = jest
-          .fn()
-          .mockResolvedValue({ ok: true, status: 200, statusText: 'OK', data: { message: 'Ok' } });
+      afterEach(() => {
+        fetchMock.mockClear();
+      });
 
-        await backendSrv
-          .request({ url, method: 'GET', retry: 0 })
-          .catch((error) => {
-            expect(error.status).toBe(401);
-            expect(error.statusText).toBe(errorMessage);
-            expect(error.data).toEqual({ message: errorMessage });
-            expect(appEventsMock.emit).not.toHaveBeenCalled();
-            expect(logoutMock).not.toHaveBeenCalled();
-            expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
-            expectRequestCallChain({ url, method: 'GET', retry: 0 });
-            jest.advanceTimersByTime(50);
+      afterAll(() => {
+        fetchMock.mockRestore();
+        config.featureToggles.clientTokenRotation = false;
+      });
+
+      it.each`
+        clientTokenRotation
+        ${true}
+        ${false}
+      `('then it should retry (clientTokenRotation = %s)', async ({ clientTokenRotation }) => {
+        config.featureToggles.clientTokenRotation = clientTokenRotation;
+
+        fetchMock = jest
+          .spyOn(global, 'fetch')
+          .mockRejectedValueOnce({
+            ok: false,
+            status: 401,
+            statusText: errorMessage,
+            headers: new Map(),
+            text: jest.fn().mockResolvedValue(JSON.stringify({ test: 'hello world' })),
+            data: { message: errorMessage },
+            url,
           })
-          .catch((error) => {
-            expect(error).toEqual({ message: errorMessage });
-            expect(appEventsMock.emit).toHaveBeenCalledTimes(1);
-            expect(appEventsMock.emit).toHaveBeenCalledWith(AppEvents.alertWarning, [errorMessage, '']);
-          });
+          .mockResolvedValueOnce({
+            ok: true,
+            status: 200,
+            headers: new Map(),
+            text: jest.fn().mockResolvedValue(JSON.stringify({ test: 'hello world' })),
+            data: { message: 'OK' },
+            url,
+          } as unknown as Response);
+
+        const { backendSrv, appEventsMock, logoutMock } = getTestContext(
+          {
+            ok: false,
+            status: 401,
+            statusText: errorMessage,
+            data: { message: errorMessage },
+            url,
+          },
+          false
+        );
+
+        backendSrv.loginPing = jest.fn().mockResolvedValue(okResponse);
+
+        backendSrv.rotateToken = jest.fn().mockResolvedValue(okResponse);
+
+        await backendSrv.request({ url, method: 'GET', retry: 0 }).finally(() => {
+          expect(appEventsMock.emit).not.toHaveBeenCalled();
+          expect(logoutMock).not.toHaveBeenCalled();
+          if (config.featureToggles.clientTokenRotation) {
+            expect(backendSrv.rotateToken).toHaveBeenCalledTimes(1);
+          } else {
+            expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
+          }
+          expect(fetchMock).toHaveBeenCalledTimes(2); // expecting 2 calls because of retry and because the loginPing/tokenRotation is mocked
+        });
       });
     });
 
@@ -486,32 +520,68 @@ describe('backendSrv', () => {
     });
 
     describe('when making an unsuccessful call and conditions for retry are favorable and loginPing does not throw', () => {
-      it('then it should retry', async () => {
-        const { backendSrv, logoutMock, expectRequestCallChain } = getTestContext({
-          ok: false,
-          status: 401,
-          statusText: 'UnAuthorized',
-          data: { message: 'UnAuthorized' },
-        });
+      const url = '/api/dashboard/';
+      const okResponse = { ok: true, status: 200, statusText: 'OK', data: { message: 'Ok' } };
+      let fetchMock: jest.SpyInstance;
 
-        backendSrv.loginPing = jest
-          .fn()
-          .mockResolvedValue({ ok: true, status: 200, statusText: 'OK', data: { message: 'Ok' } });
-        const url = '/api/dashboard/';
+      afterEach(() => {
+        fetchMock.mockClear();
+      });
 
-        let inspectorPacket: FetchResponse | FetchError;
-        backendSrv.getInspectorStream().subscribe({
-          next: (rsp) => (inspectorPacket = rsp),
-        });
+      afterAll(() => {
+        fetchMock.mockRestore();
+        config.featureToggles.clientTokenRotation = false;
+      });
 
-        await backendSrv.datasourceRequest({ url, method: 'GET', retry: 0 }).catch((error) => {
-          expect(error.status).toBe(401);
-          expect(error.statusText).toBe('UnAuthorized');
-          expect(error.data).toEqual({ message: 'UnAuthorized' });
-          expect(inspectorPacket).toBe(error);
-          expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
+      it.each`
+        clientTokenRotation
+        ${true}
+        ${false}
+      `('then it should retry (clientTokenRotation = %s)', async ({ clientTokenRotation }) => {
+        config.featureToggles.clientTokenRotation = clientTokenRotation;
+
+        fetchMock = jest
+          .spyOn(global, 'fetch')
+          .mockRejectedValueOnce({
+            ok: false,
+            status: 401,
+            statusText: 'UnAuthorized',
+            headers: new Map(),
+            text: jest.fn().mockResolvedValue(JSON.stringify({ test: 'hello world' })),
+            data: { message: 'UnAuthorized' },
+            url,
+          })
+          .mockResolvedValueOnce({
+            ok: true,
+            status: 200,
+            headers: new Map(),
+            text: jest.fn().mockResolvedValue(JSON.stringify({ test: 'hello world' })),
+            data: { message: 'OK' },
+            url,
+          } as unknown as Response);
+
+        const { backendSrv, logoutMock } = getTestContext(
+          {
+            ok: false,
+            status: 401,
+            statusText: 'UnAuthorized',
+            data: { message: 'UnAuthorized' },
+          },
+          false
+        );
+
+        backendSrv.loginPing = jest.fn().mockResolvedValue(okResponse);
+
+        backendSrv.rotateToken = jest.fn().mockResolvedValue(okResponse);
+
+        await backendSrv.datasourceRequest({ url, method: 'GET', retry: 0 }).finally(() => {
           expect(logoutMock).not.toHaveBeenCalled();
-          expectRequestCallChain({ url, method: 'GET', retry: 0 });
+          if (config.featureToggles.clientTokenRotation) {
+            expect(backendSrv.rotateToken).toHaveBeenCalledTimes(1);
+          } else {
+            expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
+          }
+          expect(fetchMock).toHaveBeenCalledTimes(2); // expecting 2 calls because of retry and because the loginPing/tokenRotation is mocked
         });
       });
     });

From 1afaf4d73e0aeb78552b9f5445a50dfc933e6b0e Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Thu, 4 May 2023 12:17:03 +0200
Subject: [PATCH 629/729] Improve empty state when no ds picker were found
 (#67422)

---
 lerna.json                                    |  4 +-
 .../picker/AddNewDataSourceButton.tsx         | 32 ++++++++++++++
 .../components/picker/DataSourceDropdown.tsx  | 24 ++++++-----
 .../components/picker/DataSourceList.tsx      | 43 +++++++++++++++++--
 .../components/picker/DataSourceModal.tsx     | 31 ++++++-------
 5 files changed, 100 insertions(+), 34 deletions(-)
 create mode 100644 public/app/features/datasources/components/picker/AddNewDataSourceButton.tsx

diff --git a/lerna.json b/lerna.json
index f174892e686..78f2726b208 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,8 +1,6 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "10.1.0-pre"
 }
diff --git a/public/app/features/datasources/components/picker/AddNewDataSourceButton.tsx b/public/app/features/datasources/components/picker/AddNewDataSourceButton.tsx
new file mode 100644
index 00000000000..256ce1ef89e
--- /dev/null
+++ b/public/app/features/datasources/components/picker/AddNewDataSourceButton.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+
+import { LinkButton, ButtonVariant } from '@grafana/ui';
+import { config } from 'app/core/config';
+import { contextSrv } from 'app/core/core';
+import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants';
+import { DATASOURCES_ROUTES } from 'app/features/datasources/constants';
+import { AccessControlAction } from 'app/types';
+
+interface AddNewDataSourceButtonProps {
+  onClick?: () => void;
+  variant?: ButtonVariant;
+}
+
+export function AddNewDataSourceButton({ variant, onClick }: AddNewDataSourceButtonProps) {
+  const hasCreateRights = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
+  const newDataSourceURL = config.featureToggles.dataConnectionsConsole
+    ? CONNECTIONS_ROUTES.DataSourcesNew
+    : DATASOURCES_ROUTES.New;
+
+  return (
+    <LinkButton
+      variant={variant || 'primary'}
+      href={newDataSourceURL}
+      disabled={!hasCreateRights}
+      tooltip={!hasCreateRights ? 'You do not have permission to configure new data sources' : undefined}
+      onClick={onClick}
+    >
+      Configure a new data source
+    </LinkButton>
+  );
+}
diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
index 560d54dbec3..21166c00d55 100644
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
@@ -25,6 +25,7 @@ const INTERACTION_ITEM = {
   SELECT_DS: 'select_ds',
   ADD_FILE: 'add_file',
   OPEN_ADVANCED_DS_PICKER: 'open_advanced_ds_picker',
+  CONFIG_NEW_DS_EMPTY_STATE: 'config_new_ds_empty_state',
 };
 
 export function DataSourceDropdown(props: DataSourceDropdownProps) {
@@ -205,16 +206,19 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
 
   return (
     <div style={props.style} ref={ref} className={styles.container}>
-      <div className={styles.dataSourceList}>
-        <DataSourceList
-          {...props}
-          enableKeyboardNavigation
-          current={current}
-          onChange={changeCallback}
-          filter={(ds) => matchDataSourceWithSearch(ds, filterTerm)}
-        ></DataSourceList>
-      </div>
-
+      <DataSourceList
+        {...props}
+        enableKeyboardNavigation
+        className={styles.dataSourceList}
+        current={current}
+        onChange={changeCallback}
+        filter={(ds) => matchDataSourceWithSearch(ds, filterTerm)}
+        onClickEmptyStateCTA={() =>
+          reportInteraction(INTERACTION_EVENT_NAME, {
+            item: INTERACTION_ITEM.CONFIG_NEW_DS_EMPTY_STATE,
+          })
+        }
+      ></DataSourceList>
       <div className={styles.footer}>
         {onClickAddCSV && config.featureToggles.editPanelCSVDragAndDrop && (
           <Button variant="secondary" size="sm" onClick={clickAddCSVCallback}>
diff --git a/public/app/features/datasources/components/picker/DataSourceList.tsx b/public/app/features/datasources/components/picker/DataSourceList.tsx
index 815336e95bd..a5f317b006c 100644
--- a/public/app/features/datasources/components/picker/DataSourceList.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceList.tsx
@@ -4,10 +4,11 @@ import { Observable } from 'rxjs';
 
 import { DataSourceInstanceSettings, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
 import { getTemplateSrv } from '@grafana/runtime';
-import { useTheme2 } from '@grafana/ui';
+import { useStyles2, useTheme2 } from '@grafana/ui';
 
 import { useDatasources, useKeyboardNavigatableList, useRecentlyUsedDataSources } from '../../hooks';
 
+import { AddNewDataSourceButton } from './AddNewDataSourceButton';
 import { DataSourceCard } from './DataSourceCard';
 import { getDataSourceCompareFn, isDataSourceMatch } from './utils';
 
@@ -37,6 +38,7 @@ export interface DataSourceListProps {
   inputId?: string;
   filter?: (dataSource: DataSourceInstanceSettings) => boolean;
   onClear?: () => void;
+  onClickEmptyStateCTA?: () => void;
   enableKeyboardNavigation?: boolean;
 }
 
@@ -51,7 +53,7 @@ export function DataSourceList(props: DataSourceListProps) {
   const theme = useTheme2();
   const styles = getStyles(theme, selectedItemCssSelector);
 
-  const { className, current, onChange, enableKeyboardNavigation } = props;
+  const { className, current, onChange, enableKeyboardNavigation, onClickEmptyStateCTA } = props;
   // QUESTION: Should we use data from the Redux store as admin DS view does?
   const dataSources = useDatasources({
     alerting: props.alerting,
@@ -67,11 +69,14 @@ export function DataSourceList(props: DataSourceListProps) {
   });
 
   const [recentlyUsedDataSources, pushRecentlyUsedDataSource] = useRecentlyUsedDataSources();
+  const filteredDataSources = props.filter ? dataSources.filter(props.filter) : dataSources;
 
   return (
     <div ref={containerRef} className={cx(className, styles.container)}>
-      {dataSources
-        .filter((ds) => (props.filter ? props.filter(ds) : true))
+      {filteredDataSources.length === 0 && (
+        <EmptyState className={styles.emptyState} onClickCTA={onClickEmptyStateCTA} />
+      )}
+      {filteredDataSources
         .sort(getDataSourceCompareFn(current, recentlyUsedDataSources, getDataSourceVariableIDs()))
         .map((ds) => (
           <DataSourceCard
@@ -89,6 +94,30 @@ export function DataSourceList(props: DataSourceListProps) {
   );
 }
 
+function EmptyState({ className, onClickCTA }: { className?: string; onClickCTA?: () => void }) {
+  const styles = useStyles2(getEmptyStateStyles);
+  return (
+    <div className={cx(className, styles.container)}>
+      <p className={styles.message}>No data sources found</p>
+      <AddNewDataSourceButton onClick={onClickCTA} />
+    </div>
+  );
+}
+
+function getEmptyStateStyles(theme: GrafanaTheme2) {
+  return {
+    container: css`
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+    `,
+    message: css`
+      margin-bottom: ${theme.spacing(3)};
+    `,
+  };
+}
+
 function getDataSourceVariableIDs() {
   const templateSrv = getTemplateSrv();
   /** Unforunately there is no easy way to identify data sources that are variables. The uid of the data source will be the name of the variable in a templating syntax $([name]) **/
@@ -101,9 +130,15 @@ function getDataSourceVariableIDs() {
 function getStyles(theme: GrafanaTheme2, selectedItemCssSelector: string) {
   return {
     container: css`
+      display: flex;
+      flex-direction: column;
       ${selectedItemCssSelector} {
         background-color: ${theme.colors.background.secondary};
       }
     `,
+    emptyState: css`
+      height: 100%;
+      flex: 1;
+    `,
   };
 }
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index a7845f742b4..663e1f2a7db 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -10,18 +10,13 @@ import {
   FileDropzone,
   FileDropzoneDefaultChildren,
   CustomScrollbar,
-  LinkButton,
   useStyles2,
   Input,
   Icon,
 } from '@grafana/ui';
-import { config } from 'app/core/config';
-import { contextSrv } from 'app/core/core';
-import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants';
 import * as DFImport from 'app/features/dataframe-import';
-import { DATASOURCES_ROUTES } from 'app/features/datasources/constants';
-import { AccessControlAction } from 'app/types';
 
+import { AddNewDataSourceButton } from './AddNewDataSourceButton';
 import { DataSourceList } from './DataSourceList';
 import { matchDataSourceWithSearch } from './utils';
 
@@ -30,6 +25,7 @@ const INTERACTION_ITEM = {
   SELECT_DS: 'select_ds',
   UPLOAD_FILE: 'upload_file',
   CONFIG_NEW_DS: 'config_new_ds',
+  CONFIG_NEW_DS_EMPTY_STATE: 'config_new_ds_empty_state',
   SEARCH: 'search',
   DISMISS: 'dismiss',
 };
@@ -54,11 +50,7 @@ export function DataSourceModal({
 }: DataSourceModalProps) {
   const styles = useStyles2(getDataSourceModalStyles);
   const [search, setSearch] = useState('');
-  const hasCreateRights = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
   const analyticsInteractionSrc = reportedInteractionFrom || 'modal';
-  const newDataSourceURL = config.featureToggles.dataConnectionsConsole
-    ? CONNECTIONS_ROUTES.DataSourcesNew
-    : DATASOURCES_ROUTES.New;
 
   const onDismissModal = () => {
     onDismiss();
@@ -106,12 +98,19 @@ export function DataSourceModal({
         />
         <CustomScrollbar>
           <DataSourceList
+            className={styles.dataSourceList}
             dashboard={false}
             mixed={false}
             variables
             filter={(ds) => matchDataSourceWithSearch(ds, search) && !ds.meta.builtIn}
             onChange={onChangeDataSource}
             current={current}
+            onClickEmptyStateCTA={() =>
+              reportInteraction(INTERACTION_EVENT_NAME, {
+                item: INTERACTION_ITEM.CONFIG_NEW_DS_EMPTY_STATE,
+                src: analyticsInteractionSrc,
+              })
+            }
           />
         </CustomScrollbar>
       </div>
@@ -149,20 +148,15 @@ export function DataSourceModal({
           )}
         </div>
         <div className={styles.dsCTAs}>
-          <LinkButton
+          <AddNewDataSourceButton
             variant="secondary"
-            href={newDataSourceURL}
-            disabled={!hasCreateRights}
-            tooltip={!hasCreateRights ? 'You do not have permission to configure new data sources' : undefined}
             onClick={() => {
               reportInteraction(INTERACTION_EVENT_NAME, {
                 item: INTERACTION_ITEM.CONFIG_NEW_DS,
                 src: analyticsInteractionSrc,
               });
             }}
-          >
-            Configure a new data source
-          </LinkButton>
+          />
         </div>
       </div>
     </Modal>
@@ -203,6 +197,9 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
       flex: 1;
       margin-bottom: ${theme.spacing(4)};
     `,
+    dataSourceList: css`
+      height: 100%;
+    `,
     builtInDataSourceList: css`
       margin-bottom: ${theme.spacing(4)};
     `,

From 8ca9a89cf1ca4f6c99b65f57b808bf4fe1c8c4d2 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Thu, 4 May 2023 12:37:14 +0200
Subject: [PATCH 630/729] Connections: Fix create new datasource route (#67802)

fix(connections): prevent datasources details route matching new route
---
 public/app/features/connections/Connections.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/connections/Connections.tsx b/public/app/features/connections/Connections.tsx
index 952ed4a73ff..f7ef10fcb92 100644
--- a/public/app/features/connections/Connections.tsx
+++ b/public/app/features/connections/Connections.tsx
@@ -31,8 +31,8 @@ export default function Connections() {
         {/* Redirect to "Add new connection" by default */}
         <Route exact sensitive path={ROUTES.Base} component={() => <Redirect to={ROUTES.AddNewConnection} />} />
         <Route exact sensitive path={ROUTES.DataSources} component={DataSourcesListPage} />
-        <Route exact sensitive path={ROUTES.DataSourcesDetails} component={DataSourceDetailsPage} />
         <Route exact sensitive path={ROUTES.DataSourcesNew} component={NewDataSourcePage} />
+        <Route exact sensitive path={ROUTES.DataSourcesDetails} component={DataSourceDetailsPage} />
         <Route exact sensitive path={ROUTES.DataSourcesEdit} component={EditDataSourcePage} />
         <Route exact sensitive path={ROUTES.DataSourcesDashboards} component={DataSourceDashboardsPage} />
 

From 111118dd686611e7404673d89818ea94c137f2d8 Mon Sep 17 00:00:00 2001
From: Aleksandr Mikhailov <aleksandr.mihailov@protonmail.com>
Date: Thu, 4 May 2023 14:23:13 +0200
Subject: [PATCH 631/729] TraceToLogs: Enable trace-to-log feature for
 cloud-logging-data-source-plugin (#65614)

* TraceToLogs: Enable trace-to-log feature for cloud-logging-data-source-plugin

* TraceToLogs: Add tests for googlecloud-logging-datasource
---
 .../TraceToLogs/TraceToLogsSettings.tsx       |   1 +
 .../explore/TraceView/createSpanLink.test.ts  | 183 ++++++++++++++++++
 .../explore/TraceView/createSpanLink.tsx      |  35 ++++
 3 files changed, 219 insertions(+)

diff --git a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx b/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
index d572983fdb9..68b9c9011c1 100644
--- a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
+++ b/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
@@ -78,6 +78,7 @@ export function TraceToLogsSettings({ options, onOptionsChange }: Props) {
     'grafana-splunk-datasource', // external
     'grafana-opensearch-datasource', // external
     'grafana-falconlogscale-datasource', // external
+    'googlecloud-logging-datasource', // external
   ];
 
   const traceToLogs = useMemo(
diff --git a/public/app/features/explore/TraceView/createSpanLink.test.ts b/public/app/features/explore/TraceView/createSpanLink.test.ts
index d8fa3ab3c27..0a25952d025 100644
--- a/public/app/features/explore/TraceView/createSpanLink.test.ts
+++ b/public/app/features/explore/TraceView/createSpanLink.test.ts
@@ -810,6 +810,189 @@ describe('createSpanLinkFactory', () => {
     });
   });
 
+  describe('google cloud link', () => {
+    const searchUID = 'searchUID';
+
+    beforeAll(() => {
+      setDataSourceSrv({
+        getInstanceSettings() {
+          return {
+            uid: searchUID,
+            name: 'Google Cloud Logging',
+            type: 'googlecloud-logging-datasource',
+          } as unknown as DataSourceInstanceSettings;
+        },
+      } as unknown as DataSourceSrv);
+
+      setLinkSrv(new LinkSrv());
+      setTemplateSrv(new TemplateSrv());
+    });
+
+    it('creates link with correct simple query', () => {
+      const createLink = setupSpanLinkFactory({
+        datasourceUid: searchUID,
+      });
+      const links = createLink!(createTraceSpan());
+
+      const linkDef = links?.logLinks?.[0];
+      expect(linkDef).toBeDefined();
+      expect(decodeURIComponent(linkDef!.href)).toContain(
+        `datasource":"${searchUID}","queries":[{"query":"cluster=\\"cluster1\\" AND hostname=\\"hostname1\\"","refId":""}]`
+      );
+    });
+
+    it('automatically timeshifts the time range by one second in a query', () => {
+      const createLink = setupSpanLinkFactory({
+        datasourceUid: searchUID,
+      });
+      const links = createLink!(createTraceSpan());
+
+      const linkDef = links?.logLinks?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef!.href).toContain(
+        `${encodeURIComponent('{"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:01.000Z"}')}`
+      );
+      expect(linkDef!.href).not.toContain(
+        `${encodeURIComponent('{"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:00.000Z"}')}`
+      );
+    });
+
+    it('formats query correctly if filterByTraceID and or filterBySpanID is true', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          datasourceUid: searchUID,
+          filterByTraceID: true,
+          filterBySpanID: true,
+        },
+        searchUID
+      );
+
+      expect(createLink).toBeDefined();
+      const links = createLink!(createTraceSpan());
+
+      const linkDef = links?.logLinks?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          `{"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:01.000Z"},"datasource":"${searchUID}","queries":[{"query":"\\"6605c7b08e715d6c\\" AND \\"7946b05c2e2e4e5a\\" AND cluster=\\"cluster1\\" AND hostname=\\"hostname1\\"","refId":""}]}`
+        )}`
+      );
+    });
+
+    it('formats query correctly if only filterByTraceID is true', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          datasourceUid: searchUID,
+          filterByTraceID: true,
+        },
+        searchUID
+      );
+
+      expect(createLink).toBeDefined();
+      const links = createLink!(
+        createTraceSpan({
+          process: {
+            serviceName: 'service',
+            tags: [],
+          },
+        })
+      );
+
+      const linkDef = links?.logLinks?.[0];
+      expect(linkDef).toBeDefined();
+      expect(decodeURIComponent(linkDef!.href)).toBe(
+        `/explore?left={"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:01.000Z"},"datasource":"searchUID","queries":[{"query":"\\"7946b05c2e2e4e5a\\"","refId":""}]}`
+      );
+    });
+
+    it('should format one tag correctly', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          tags: [{ key: 'ip' }],
+        },
+        searchUID
+      );
+      expect(createLink).toBeDefined();
+      const links = createLink!(
+        createTraceSpan({
+          process: {
+            serviceName: 'service',
+            tags: [{ key: 'ip', value: '192.168.0.1' }],
+          },
+        })
+      );
+
+      const linkDef = links?.logLinks?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          `{"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:01.000Z"},"datasource":"${searchUID}","queries":[{"query":"ip=\\"192.168.0.1\\"","refId":""}]}`
+        )}`
+      );
+    });
+
+    it('should format multiple tags correctly', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          tags: [{ key: 'ip' }, { key: 'hostname' }],
+        },
+        searchUID
+      );
+      expect(createLink).toBeDefined();
+      const links = createLink!(
+        createTraceSpan({
+          process: {
+            serviceName: 'service',
+            tags: [
+              { key: 'hostname', value: 'hostname1' },
+              { key: 'ip', value: '192.168.0.1' },
+            ],
+          },
+        })
+      );
+
+      const linkDef = links?.logLinks?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          `{"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:01.000Z"},"datasource":"${searchUID}","queries":[{"query":"hostname=\\"hostname1\\" AND ip=\\"192.168.0.1\\"","refId":""}]}`
+        )}`
+      );
+    });
+
+    it('handles renamed tags', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          tags: [
+            { key: 'service.name', value: 'service' },
+            { key: 'k8s.pod.name', value: 'pod' },
+          ],
+        },
+        searchUID
+      );
+      expect(createLink).toBeDefined();
+      const links = createLink!(
+        createTraceSpan({
+          process: {
+            serviceName: 'service',
+            tags: [
+              { key: 'service.name', value: 'serviceName' },
+              { key: 'k8s.pod.name', value: 'podName' },
+            ],
+          },
+        })
+      );
+
+      const linkDef = links?.logLinks?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          `{"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:01.000Z"},"datasource":"${searchUID}","queries":[{"query":"service=\\"serviceName\\" AND pod=\\"podName\\"","refId":""}]}`
+        )}`
+      );
+    });
+  });
+
   describe('custom query', () => {
     beforeAll(() => {
       setDataSourceSrv({
diff --git a/public/app/features/explore/TraceView/createSpanLink.tsx b/public/app/features/explore/TraceView/createSpanLink.tsx
index c2286c7f931..d6cf1ce1dcb 100644
--- a/public/app/features/explore/TraceView/createSpanLink.tsx
+++ b/public/app/features/explore/TraceView/createSpanLink.tsx
@@ -165,6 +165,10 @@ function legacyCreateSpanLinkFactory(
         case 'grafana-falconlogscale-datasource':
           tags = getFormattedTags(span, tagsToUse, { joinBy: ' OR ' });
           query = getQueryForFalconLogScale(span, traceToLogsOptions, tags, customQuery);
+          break;
+        case 'googlecloud-logging-datasource':
+          tags = getFormattedTags(span, tagsToUse, { joinBy: ' AND ' });
+          query = getQueryForGoogleCloudLogging(span, traceToLogsOptions, tags, customQuery);
       }
 
       // query can be false in case the simple UI tag mapping is used but none of them are present in the span.
@@ -406,6 +410,37 @@ function getQueryForSplunk(span: TraceSpan, options: TraceToLogsOptionsV2, tags:
   };
 }
 
+function getQueryForGoogleCloudLogging(
+  span: TraceSpan,
+  options: TraceToLogsOptionsV2,
+  tags: string,
+  customQuery?: string
+) {
+  const { filterByTraceID, filterBySpanID } = options;
+
+  if (customQuery) {
+    return { query: customQuery, refId: '' };
+  }
+
+  let queryArr = [];
+  if (filterBySpanID && span.spanID) {
+    queryArr.push('"${__span.spanId}"');
+  }
+
+  if (filterByTraceID && span.traceID) {
+    queryArr.push('"${__span.traceId}"');
+  }
+
+  if (tags) {
+    queryArr.push('${__tags}');
+  }
+
+  return {
+    query: queryArr.join(' AND '),
+    refId: '',
+  };
+}
+
 function getQueryForFalconLogScale(span: TraceSpan, options: TraceToLogsOptionsV2, tags: string, customQuery?: string) {
   const { filterByTraceID, filterBySpanID } = options;
 

From 3c42dea10b95405957e766ee461f2096bbdd32e3 Mon Sep 17 00:00:00 2001
From: Virginia Cepeda <virginia.cepeda@grafana.com>
Date: Thu, 4 May 2023 09:30:25 -0300
Subject: [PATCH 632/729] Alerting: Use standard validation/error pattern on
 group selection (#67787)

---
 .../alerting/unified/components/rule-editor/FolderAndGroup.tsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
index 2a078322785..6d1f4202942 100644
--- a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
@@ -169,6 +169,7 @@ export function FolderAndGroup({ initialFolder }: FolderAndGroupProps) {
                 inputId="group"
                 key={`my_unique_select_key__${selectedGroup?.title ?? ''}`}
                 {...field}
+                invalid={Boolean(folder) && !selectedGroup.value}
                 loadOptions={debouncedSearch}
                 loadingMessage={'Loading groups...'}
                 defaultOptions={groupOptions}

From c792af3ad0f34309549347835627624a44afe5ba Mon Sep 17 00:00:00 2001
From: lpugoy <44182754+lpugoy@users.noreply.github.com>
Date: Thu, 4 May 2023 22:35:36 +1000
Subject: [PATCH 633/729] grafana-mixin: Fix expression for
 GrafanaRequestsFailing alert (#63382)

Fix expression for GrafanaRequestsFailing alert

The intent of the alert is to get the ratio of 5xx to all status codes
[^1]. With the original expression, the left hand side can have more than
one row with the same labels except for the status code. This results in
a promql error because it is doing a many-to-one matching. Doing a sum
on the left hand side first should preserve the intent of the alert and
resolve the issue.

[^1]: https://github.com/grafana/grafana/pull/43116
---
 grafana-mixin/alerts/alerts.libsonnet | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grafana-mixin/alerts/alerts.libsonnet b/grafana-mixin/alerts/alerts.libsonnet
index fbd957b4fb9..1c92a59bf51 100644
--- a/grafana-mixin/alerts/alerts.libsonnet
+++ b/grafana-mixin/alerts/alerts.libsonnet
@@ -11,8 +11,8 @@
           {
             alert: 'GrafanaRequestsFailing',
             expr: |||
-              100 * namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."}
-              / ignoring (status_code) group_left
+              100 * sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."})
+              /
               sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query"})
               > %(grafanaRequestsFailingThresholdPercent)s
             ||| % $._config,

From 37378c4dd8ae57ac737385cad1d9d8826ef8e32e Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Thu, 4 May 2023 14:17:44 +0100
Subject: [PATCH 634/729] Navigation: more nav interface cleanup (#67708)

more nav interface cleanup
---
 packages/grafana-data/src/types/navModel.ts   |  17 +-
 .../components/PageHeader/PageHeader.test.tsx |  18 --
 .../core/components/PageHeader/PageHeader.tsx |  58 ++----
 .../app/features/admin/AdminEditOrgPage.tsx   |   1 -
 public/app/features/admin/UserAdminPage.tsx   |   1 -
 public/app/features/admin/UserCreatePage.tsx  |   1 -
 .../features/alerting/unified/RuleEditor.tsx  |   1 -
 .../mute-timings/MuteTimingForm.tsx           |   1 -
 .../rule-viewer/RuleViewerLayout.tsx          |   1 -
 .../unified/hooks/useSilenceNavData.test.tsx  |   2 -
 .../unified/hooks/useSilenceNavData.ts        |   1 -
 .../__mocks__/store.navIndex.mock.ts          | 174 +++++++++---------
 .../features/datasources/state/navModel.ts    |   1 -
 .../components/NewDashboardsFolder.tsx        |   1 -
 public/app/features/folders/state/navModel.ts |   1 -
 .../manage-dashboards/DashboardImportPage.tsx |   1 -
 public/app/features/org/NewOrgPage.tsx        |   1 -
 .../admin/hooks/usePluginDetailsTabs.tsx      |   2 -
 .../serviceaccounts/ServiceAccountPage.tsx    |   1 -
 public/app/features/teams/CreateTeam.tsx      |   1 -
 public/app/features/teams/state/navModel.ts   |   1 -
 21 files changed, 105 insertions(+), 181 deletions(-)

diff --git a/packages/grafana-data/src/types/navModel.ts b/packages/grafana-data/src/types/navModel.ts
index 2c83bb45753..c20ea94656c 100644
--- a/packages/grafana-data/src/types/navModel.ts
+++ b/packages/grafana-data/src/types/navModel.ts
@@ -6,7 +6,6 @@ import { IconName } from './icon';
 export interface NavLinkDTO {
   id?: string;
   text: string;
-  description?: string;
   subTitle?: string;
   icon?: IconName;
   img?: string;
@@ -21,6 +20,7 @@ export interface NavLinkDTO {
   isSection?: boolean;
   children?: NavLinkDTO[];
   highlightText?: string;
+  highlightId?: string;
   emptyMessageId?: string;
   // The ID of the plugin that registered the page (in case it was registered by a plugin, otherwise left empty)
   pluginId?: string;
@@ -31,23 +31,13 @@ export interface NavLinkDTO {
 export interface NavModelItem extends NavLinkDTO {
   children?: NavModelItem[];
   active?: boolean;
-  breadcrumbs?: NavModelBreadcrumb[];
   parentItem?: NavModelItem;
-  showOrgSwitcher?: boolean;
   onClick?: () => void;
-  menuItemType?: NavMenuItemType;
-  highlightText?: string;
-  highlightId?: string;
   tabSuffix?: ComponentType<{ className?: string }>;
   hideFromBreadcrumbs?: boolean;
   emptyMessage?: string;
 }
 
-export enum NavMenuItemType {
-  Section = 'section',
-  Item = 'item',
-}
-
 /**
  *  Interface used to describe  different kinds of page titles and page navigation. Navmodels are usually generated in the backend and stored in Redux.
  */
@@ -62,11 +52,6 @@ export interface NavModel {
   node: NavModelItem;
 }
 
-export interface NavModelBreadcrumb {
-  title: string;
-  url?: string;
-}
-
 export type NavIndex = { [s: string]: NavModelItem };
 
 export enum PageLayoutType {
diff --git a/public/app/core/components/PageHeader/PageHeader.test.tsx b/public/app/core/components/PageHeader/PageHeader.test.tsx
index e7c53a234af..26b256bfd66 100644
--- a/public/app/core/components/PageHeader/PageHeader.test.tsx
+++ b/public/app/core/components/PageHeader/PageHeader.test.tsx
@@ -21,22 +21,4 @@ describe('PageHeader', () => {
       expect(screen.getByRole('heading', { name: 'node' })).toBeInTheDocument();
     });
   });
-
-  describe('when the nav tree has a node with breadcrumbs and a title', () => {
-    it('should render the title with breadcrumbs first and then title last', async () => {
-      const nav: NavModelItem = {
-        icon: 'folder-open',
-        id: 'child',
-        subTitle: 'child subtitle',
-        url: '',
-        text: 'child',
-        breadcrumbs: [{ title: 'Parent', url: 'parentUrl' }],
-      };
-
-      render(<PageHeader navItem={nav} />);
-
-      expect(screen.getByRole('heading', { name: 'Parent / child' })).toBeInTheDocument();
-      expect(screen.getByRole('link', { name: 'Parent' })).toBeInTheDocument();
-    });
-  });
 });
diff --git a/public/app/core/components/PageHeader/PageHeader.tsx b/public/app/core/components/PageHeader/PageHeader.tsx
index 412da8c3078..c1404c7a2ec 100644
--- a/public/app/core/components/PageHeader/PageHeader.tsx
+++ b/public/app/core/components/PageHeader/PageHeader.tsx
@@ -1,7 +1,7 @@
 import { css, cx } from '@emotion/css';
 import React from 'react';
 
-import { NavModelItem, NavModelBreadcrumb, GrafanaTheme2 } from '@grafana/data';
+import { NavModelItem, GrafanaTheme2 } from '@grafana/data';
 import { Tab, TabsBar, Icon, useStyles2, toIconName } from '@grafana/ui';
 import { PanelHeaderMenuItem } from 'app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem';
 
@@ -106,9 +106,7 @@ export const PageHeader = ({ navItem: model, renderTitle, actions, info, subTitl
         </span>
 
         <div className={cx('page-header__info-block', styles.headerText)}>
-          {renderTitle
-            ? renderTitle(main.text)
-            : renderHeaderTitle(main.text, main.breadcrumbs ?? [], main.highlightText)}
+          {renderTitle ? renderTitle(main.text) : renderHeaderTitle(main.text, main.highlightText)}
           {info && <PageInfo info={info} />}
           {sub && <div className="page-header__sub-title">{sub}</div>}
           {actions && <div className={styles.actions}>{actions}</div>}
@@ -129,46 +127,24 @@ export const PageHeader = ({ navItem: model, renderTitle, actions, info, subTitl
   );
 };
 
-function renderHeaderTitle(
-  title: string,
-  breadcrumbs: NavModelBreadcrumb[],
-  highlightText: NavModelItem['highlightText']
-) {
-  if (!title && (!breadcrumbs || breadcrumbs.length === 0)) {
+function renderHeaderTitle(title: string, highlightText: NavModelItem['highlightText']) {
+  if (!title) {
     return null;
   }
 
-  if (!breadcrumbs || breadcrumbs.length === 0) {
-    return (
-      <h1 className="page-header__title">
-        {title}
-        {highlightText && (
-          <ProBadge
-            text={highlightText}
-            className={css`
-              vertical-align: middle;
-            `}
-          />
-        )}
-      </h1>
-    );
-  }
-
-  const breadcrumbsResult = [];
-  for (const bc of breadcrumbs) {
-    if (bc.url) {
-      breadcrumbsResult.push(
-        <a className="page-header__link" key={breadcrumbsResult.length} href={bc.url}>
-          {bc.title}
-        </a>
-      );
-    } else {
-      breadcrumbsResult.push(<span key={breadcrumbsResult.length}> / {bc.title}</span>);
-    }
-  }
-  breadcrumbsResult.push(<span key={breadcrumbs.length + 1}> / {title}</span>);
-
-  return <h1 className="page-header__title">{breadcrumbsResult}</h1>;
+  return (
+    <h1 className="page-header__title">
+      {title}
+      {highlightText && (
+        <ProBadge
+          text={highlightText}
+          className={css`
+            vertical-align: middle;
+          `}
+        />
+      )}
+    </h1>
+  );
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
diff --git a/public/app/features/admin/AdminEditOrgPage.tsx b/public/app/features/admin/AdminEditOrgPage.tsx
index e4359481f87..0c071fac6b3 100644
--- a/public/app/features/admin/AdminEditOrgPage.tsx
+++ b/public/app/features/admin/AdminEditOrgPage.tsx
@@ -90,7 +90,6 @@ const AdminEditOrgPage = ({ match }: Props) => {
   const pageNav: NavModelItem = {
     text: orgState?.value?.name ?? '',
     icon: 'shield',
-    breadcrumbs: [{ title: 'Orgs', url: 'admin/orgs' }],
     subTitle: 'Manage settings and user roles for an organization.',
   };
 
diff --git a/public/app/features/admin/UserAdminPage.tsx b/public/app/features/admin/UserAdminPage.tsx
index 737cbd18d79..0820b1428aa 100644
--- a/public/app/features/admin/UserAdminPage.tsx
+++ b/public/app/features/admin/UserAdminPage.tsx
@@ -111,7 +111,6 @@ export class UserAdminPage extends PureComponent<Props> {
     const pageNav: NavModelItem = {
       text: user?.login ?? '',
       icon: 'shield',
-      breadcrumbs: [{ title: 'Users', url: 'admin/users' }],
       subTitle: 'Manage settings for an individual user.',
     };
 
diff --git a/public/app/features/admin/UserCreatePage.tsx b/public/app/features/admin/UserCreatePage.tsx
index bf7ce0077fd..da72bd30d90 100644
--- a/public/app/features/admin/UserCreatePage.tsx
+++ b/public/app/features/admin/UserCreatePage.tsx
@@ -20,7 +20,6 @@ const pageNav: NavModelItem = {
   id: 'user-new',
   text: 'New user',
   subTitle: 'Create a new Grafana user.',
-  breadcrumbs: [{ title: 'Server admin', url: 'admin/users' }],
 };
 
 const UserCreatePage = () => {
diff --git a/public/app/features/alerting/unified/RuleEditor.tsx b/public/app/features/alerting/unified/RuleEditor.tsx
index bc461f500ef..e97c94f195e 100644
--- a/public/app/features/alerting/unified/RuleEditor.tsx
+++ b/public/app/features/alerting/unified/RuleEditor.tsx
@@ -21,7 +21,6 @@ type RuleEditorProps = GrafanaRouteComponentProps<{ id?: string }>;
 const defaultPageNav: Partial<NavModelItem> = {
   icon: 'bell',
   id: 'alert-rule-view',
-  breadcrumbs: [{ title: 'Alert rules', url: 'alerting/list' }],
 };
 
 const getPageNav = (state: 'edit' | 'add') => {
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
index 1a6b0de3fe7..f8d6f1c4c4a 100644
--- a/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
@@ -60,7 +60,6 @@ const useDefaultValues = (muteTiming?: MuteTimeInterval): MuteTimingFields => {
 
 const defaultPageNav: Partial<NavModelItem> = {
   icon: 'sitemap',
-  breadcrumbs: [{ title: 'Notification Policies', url: 'alerting/routes' }],
 };
 
 const MuteTimingForm = ({ muteTiming, showError, provenance }: Props) => {
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx
index 529abe2ce96..96d0224bb65 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx
@@ -14,7 +14,6 @@ type Props = {
 const defaultPageNav: Partial<NavModelItem> = {
   icon: 'bell',
   id: 'alert-rule-view',
-  breadcrumbs: [{ title: 'Alert rules', url: 'alerting/list' }],
 };
 
 export function RuleViewerLayout(props: Props): JSX.Element | null {
diff --git a/public/app/features/alerting/unified/hooks/useSilenceNavData.test.tsx b/public/app/features/alerting/unified/hooks/useSilenceNavData.test.tsx
index 5240b06a999..f604ff0da09 100644
--- a/public/app/features/alerting/unified/hooks/useSilenceNavData.test.tsx
+++ b/public/app/features/alerting/unified/hooks/useSilenceNavData.test.tsx
@@ -27,7 +27,6 @@ describe('useSilenceNavData', () => {
 
     expect(result).toEqual({
       icon: 'bell-slash',
-      breadcrumbs: [{ title: 'Silences', url: 'alerting/silences' }],
       id: 'silence-new',
       text: 'Add silence',
     });
@@ -39,7 +38,6 @@ describe('useSilenceNavData', () => {
 
     expect(result).toEqual({
       icon: 'bell-slash',
-      breadcrumbs: [{ title: 'Silences', url: 'alerting/silences' }],
       id: 'silence-edit',
       text: 'Edit silence',
     });
diff --git a/public/app/features/alerting/unified/hooks/useSilenceNavData.ts b/public/app/features/alerting/unified/hooks/useSilenceNavData.ts
index 9757d385f3b..a8fedc67dbf 100644
--- a/public/app/features/alerting/unified/hooks/useSilenceNavData.ts
+++ b/public/app/features/alerting/unified/hooks/useSilenceNavData.ts
@@ -5,7 +5,6 @@ import { NavModelItem } from '@grafana/data';
 
 const defaultPageNav: Partial<NavModelItem> = {
   icon: 'bell-slash',
-  breadcrumbs: [{ title: 'Silences', url: 'alerting/silences' }],
 };
 
 export function useSilenceNavData() {
diff --git a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
index 9376b24ee32..b505dd42f61 100644
--- a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
@@ -1003,28 +1003,28 @@ export const navIndex: NavIndex = {
       {
         id: 'connections-datasources',
         text: 'Data sources',
-        description: 'Add and configure data sources',
+        subTitle: 'Add and configure data sources',
         icon: 'database',
         url: '/connections/datasources',
       },
       {
         id: 'connections-plugins',
         text: 'Plugins',
-        description: 'Manage plugins',
+        subTitle: 'Manage plugins',
         icon: 'plug',
         url: '/connections/plugins',
       },
       {
         id: 'connections-cloud-integrations',
         text: 'Cloud integrations',
-        description: 'Manage your cloud integrations',
+        subTitle: 'Manage your cloud integrations',
         icon: 'bolt',
         url: '/connections/cloud-integrations',
       },
       {
         id: 'connections-recorded-queries',
         text: 'Recorded queries',
-        description: 'Manage your recorded queries',
+        subTitle: 'Manage your recorded queries',
         icon: 'record-audio',
         url: '/connections/recorded-queries',
       },
@@ -1033,7 +1033,7 @@ export const navIndex: NavIndex = {
   'connections-datasources': {
     id: 'connections-datasources',
     text: 'Data sources',
-    description: 'Add and configure data sources',
+    subTitle: 'Add and configure data sources',
     icon: 'database',
     url: '/connections/datasources',
     parentItem: {
@@ -1046,28 +1046,28 @@ export const navIndex: NavIndex = {
         {
           id: 'connections-datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/connections/datasources',
         },
         {
           id: 'connections-plugins',
           text: 'Plugins',
-          description: 'Manage plugins',
+          subTitle: 'Manage plugins',
           icon: 'plug',
           url: '/connections/plugins',
         },
         {
           id: 'connections-cloud-integrations',
           text: 'Cloud integrations',
-          description: 'Manage your cloud integrations',
+          subTitle: 'Manage your cloud integrations',
           icon: 'bolt',
           url: '/connections/cloud-integrations',
         },
         {
           id: 'connections-recorded-queries',
           text: 'Recorded queries',
-          description: 'Manage your recorded queries',
+          subTitle: 'Manage your recorded queries',
           icon: 'record-audio',
           url: '/connections/recorded-queries',
         },
@@ -1077,7 +1077,7 @@ export const navIndex: NavIndex = {
   'connections-plugins': {
     id: 'connections-plugins',
     text: 'Plugins',
-    description: 'Manage plugins',
+    subTitle: 'Manage plugins',
     icon: 'plug',
     url: '/connections/plugins',
     parentItem: {
@@ -1090,28 +1090,28 @@ export const navIndex: NavIndex = {
         {
           id: 'connections-datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/connections/datasources',
         },
         {
           id: 'connections-plugins',
           text: 'Plugins',
-          description: 'Manage plugins',
+          subTitle: 'Manage plugins',
           icon: 'plug',
           url: '/connections/plugins',
         },
         {
           id: 'connections-cloud-integrations',
           text: 'Cloud integrations',
-          description: 'Manage your cloud integrations',
+          subTitle: 'Manage your cloud integrations',
           icon: 'bolt',
           url: '/connections/cloud-integrations',
         },
         {
           id: 'connections-recorded-queries',
           text: 'Recorded queries',
-          description: 'Manage your recorded queries',
+          subTitle: 'Manage your recorded queries',
           icon: 'record-audio',
           url: '/connections/recorded-queries',
         },
@@ -1121,7 +1121,7 @@ export const navIndex: NavIndex = {
   'connections-cloud-integrations': {
     id: 'connections-cloud-integrations',
     text: 'Cloud integrations',
-    description: 'Manage your cloud integrations',
+    subTitle: 'Manage your cloud integrations',
     icon: 'bolt',
     url: '/connections/cloud-integrations',
     parentItem: {
@@ -1134,28 +1134,28 @@ export const navIndex: NavIndex = {
         {
           id: 'connections-datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/connections/datasources',
         },
         {
           id: 'connections-plugins',
           text: 'Plugins',
-          description: 'Manage plugins',
+          subTitle: 'Manage plugins',
           icon: 'plug',
           url: '/connections/plugins',
         },
         {
           id: 'connections-cloud-integrations',
           text: 'Cloud integrations',
-          description: 'Manage your cloud integrations',
+          subTitle: 'Manage your cloud integrations',
           icon: 'bolt',
           url: '/connections/cloud-integrations',
         },
         {
           id: 'connections-recorded-queries',
           text: 'Recorded queries',
-          description: 'Manage your recorded queries',
+          subTitle: 'Manage your recorded queries',
           icon: 'record-audio',
           url: '/connections/recorded-queries',
         },
@@ -1165,7 +1165,7 @@ export const navIndex: NavIndex = {
   'connections-recorded-queries': {
     id: 'connections-recorded-queries',
     text: 'Recorded queries',
-    description: 'Manage your recorded queries',
+    subTitle: 'Manage your recorded queries',
     icon: 'record-audio',
     url: '/connections/recorded-queries',
     parentItem: {
@@ -1178,28 +1178,28 @@ export const navIndex: NavIndex = {
         {
           id: 'connections-datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/connections/datasources',
         },
         {
           id: 'connections-plugins',
           text: 'Plugins',
-          description: 'Manage plugins',
+          subTitle: 'Manage plugins',
           icon: 'plug',
           url: '/connections/plugins',
         },
         {
           id: 'connections-cloud-integrations',
           text: 'Cloud integrations',
-          description: 'Manage your cloud integrations',
+          subTitle: 'Manage your cloud integrations',
           icon: 'bolt',
           url: '/connections/cloud-integrations',
         },
         {
           id: 'connections-recorded-queries',
           text: 'Recorded queries',
-          description: 'Manage your recorded queries',
+          subTitle: 'Manage your recorded queries',
           icon: 'record-audio',
           url: '/connections/recorded-queries',
         },
@@ -1386,49 +1386,49 @@ export const navIndex: NavIndex = {
       {
         id: 'datasources',
         text: 'Data sources',
-        description: 'Add and configure data sources',
+        subTitle: 'Add and configure data sources',
         icon: 'database',
         url: '/datasources',
       },
       {
         id: 'users',
         text: 'Users',
-        description: 'Manage org members',
+        subTitle: 'Manage org members',
         icon: 'user',
         url: '/org/users',
       },
       {
         id: 'teams',
         text: 'Teams',
-        description: 'Manage org groups',
+        subTitle: 'Manage org groups',
         icon: 'users-alt',
         url: '/org/teams',
       },
       {
         id: 'plugins',
         text: 'Plugins',
-        description: 'View and configure plugins',
+        subTitle: 'View and configure plugins',
         icon: 'plug',
         url: '/plugins',
       },
       {
         id: 'org-settings',
         text: 'Preferences',
-        description: 'Organization preferences',
+        subTitle: 'Organization preferences',
         icon: 'sliders-v-alt',
         url: '/org',
       },
       {
         id: 'apikeys',
         text: 'API keys',
-        description: 'Create & manage API keys',
+        subTitle: 'Create & manage API keys',
         icon: 'key-skeleton-alt',
         url: '/org/apikeys',
       },
       {
         id: 'serviceaccounts',
         text: 'Service accounts',
-        description: 'Manage service accounts',
+        subTitle: 'Manage service accounts',
         icon: 'gf-service-account',
         url: '/org/serviceaccounts',
       },
@@ -1437,7 +1437,7 @@ export const navIndex: NavIndex = {
   datasources: {
     id: 'datasources',
     text: 'Data sources',
-    description: 'Add and configure data sources',
+    subTitle: 'Add and configure data sources',
     icon: 'database',
     url: '/datasources',
     parentItem: {
@@ -1451,49 +1451,49 @@ export const navIndex: NavIndex = {
         {
           id: 'datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/datasources',
         },
         {
           id: 'users',
           text: 'Users',
-          description: 'Manage org members',
+          subTitle: 'Manage org members',
           icon: 'user',
           url: '/org/users',
         },
         {
           id: 'teams',
           text: 'Teams',
-          description: 'Manage org groups',
+          subTitle: 'Manage org groups',
           icon: 'users-alt',
           url: '/org/teams',
         },
         {
           id: 'plugins',
           text: 'Plugins',
-          description: 'View and configure plugins',
+          subTitle: 'View and configure plugins',
           icon: 'plug',
           url: '/plugins',
         },
         {
           id: 'org-settings',
           text: 'Preferences',
-          description: 'Organization preferences',
+          subTitle: 'Organization preferences',
           icon: 'sliders-v-alt',
           url: '/org',
         },
         {
           id: 'apikeys',
           text: 'API keys',
-          description: 'Create & manage API keys',
+          subTitle: 'Create & manage API keys',
           icon: 'key-skeleton-alt',
           url: '/org/apikeys',
         },
         {
           id: 'serviceaccounts',
           text: 'Service accounts',
-          description: 'Manage service accounts',
+          subTitle: 'Manage service accounts',
           icon: 'gf-service-account',
           url: '/org/serviceaccounts',
         },
@@ -1503,7 +1503,7 @@ export const navIndex: NavIndex = {
   users: {
     id: 'users',
     text: 'Users',
-    description: 'Manage org members',
+    subTitle: 'Manage org members',
     icon: 'user',
     url: '/org/users',
     parentItem: {
@@ -1517,49 +1517,49 @@ export const navIndex: NavIndex = {
         {
           id: 'datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/datasources',
         },
         {
           id: 'users',
           text: 'Users',
-          description: 'Manage org members',
+          subTitle: 'Manage org members',
           icon: 'user',
           url: '/org/users',
         },
         {
           id: 'teams',
           text: 'Teams',
-          description: 'Manage org groups',
+          subTitle: 'Manage org groups',
           icon: 'users-alt',
           url: '/org/teams',
         },
         {
           id: 'plugins',
           text: 'Plugins',
-          description: 'View and configure plugins',
+          subTitle: 'View and configure plugins',
           icon: 'plug',
           url: '/plugins',
         },
         {
           id: 'org-settings',
           text: 'Preferences',
-          description: 'Organization preferences',
+          subTitle: 'Organization preferences',
           icon: 'sliders-v-alt',
           url: '/org',
         },
         {
           id: 'apikeys',
           text: 'API keys',
-          description: 'Create & manage API keys',
+          subTitle: 'Create & manage API keys',
           icon: 'key-skeleton-alt',
           url: '/org/apikeys',
         },
         {
           id: 'serviceaccounts',
           text: 'Service accounts',
-          description: 'Manage service accounts',
+          subTitle: 'Manage service accounts',
           icon: 'gf-service-account',
           url: '/org/serviceaccounts',
         },
@@ -1569,7 +1569,7 @@ export const navIndex: NavIndex = {
   teams: {
     id: 'teams',
     text: 'Teams',
-    description: 'Manage org groups',
+    subTitle: 'Manage org groups',
     icon: 'users-alt',
     url: '/org/teams',
     parentItem: {
@@ -1583,49 +1583,49 @@ export const navIndex: NavIndex = {
         {
           id: 'datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/datasources',
         },
         {
           id: 'users',
           text: 'Users',
-          description: 'Manage org members',
+          subTitle: 'Manage org members',
           icon: 'user',
           url: '/org/users',
         },
         {
           id: 'teams',
           text: 'Teams',
-          description: 'Manage org groups',
+          subTitle: 'Manage org groups',
           icon: 'users-alt',
           url: '/org/teams',
         },
         {
           id: 'plugins',
           text: 'Plugins',
-          description: 'View and configure plugins',
+          subTitle: 'View and configure plugins',
           icon: 'plug',
           url: '/plugins',
         },
         {
           id: 'org-settings',
           text: 'Preferences',
-          description: 'Organization preferences',
+          subTitle: 'Organization preferences',
           icon: 'sliders-v-alt',
           url: '/org',
         },
         {
           id: 'apikeys',
           text: 'API keys',
-          description: 'Create & manage API keys',
+          subTitle: 'Create & manage API keys',
           icon: 'key-skeleton-alt',
           url: '/org/apikeys',
         },
         {
           id: 'serviceaccounts',
           text: 'Service accounts',
-          description: 'Manage service accounts',
+          subTitle: 'Manage service accounts',
           icon: 'gf-service-account',
           url: '/org/serviceaccounts',
         },
@@ -1635,7 +1635,7 @@ export const navIndex: NavIndex = {
   plugins: {
     id: 'plugins',
     text: 'Plugins',
-    description: 'View and configure plugins',
+    subTitle: 'View and configure plugins',
     icon: 'plug',
     url: '/plugins',
     parentItem: {
@@ -1649,49 +1649,49 @@ export const navIndex: NavIndex = {
         {
           id: 'datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/datasources',
         },
         {
           id: 'users',
           text: 'Users',
-          description: 'Manage org members',
+          subTitle: 'Manage org members',
           icon: 'user',
           url: '/org/users',
         },
         {
           id: 'teams',
           text: 'Teams',
-          description: 'Manage org groups',
+          subTitle: 'Manage org groups',
           icon: 'users-alt',
           url: '/org/teams',
         },
         {
           id: 'plugins',
           text: 'Plugins',
-          description: 'View and configure plugins',
+          subTitle: 'View and configure plugins',
           icon: 'plug',
           url: '/plugins',
         },
         {
           id: 'org-settings',
           text: 'Preferences',
-          description: 'Organization preferences',
+          subTitle: 'Organization preferences',
           icon: 'sliders-v-alt',
           url: '/org',
         },
         {
           id: 'apikeys',
           text: 'API keys',
-          description: 'Create & manage API keys',
+          subTitle: 'Create & manage API keys',
           icon: 'key-skeleton-alt',
           url: '/org/apikeys',
         },
         {
           id: 'serviceaccounts',
           text: 'Service accounts',
-          description: 'Manage service accounts',
+          subTitle: 'Manage service accounts',
           icon: 'gf-service-account',
           url: '/org/serviceaccounts',
         },
@@ -1701,7 +1701,7 @@ export const navIndex: NavIndex = {
   'org-settings': {
     id: 'org-settings',
     text: 'Preferences',
-    description: 'Organization preferences',
+    subTitle: 'Organization preferences',
     icon: 'sliders-v-alt',
     url: '/org',
     parentItem: {
@@ -1715,49 +1715,49 @@ export const navIndex: NavIndex = {
         {
           id: 'datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/datasources',
         },
         {
           id: 'users',
           text: 'Users',
-          description: 'Manage org members',
+          subTitle: 'Manage org members',
           icon: 'user',
           url: '/org/users',
         },
         {
           id: 'teams',
           text: 'Teams',
-          description: 'Manage org groups',
+          subTitle: 'Manage org groups',
           icon: 'users-alt',
           url: '/org/teams',
         },
         {
           id: 'plugins',
           text: 'Plugins',
-          description: 'View and configure plugins',
+          subTitle: 'View and configure plugins',
           icon: 'plug',
           url: '/plugins',
         },
         {
           id: 'org-settings',
           text: 'Preferences',
-          description: 'Organization preferences',
+          subTitle: 'Organization preferences',
           icon: 'sliders-v-alt',
           url: '/org',
         },
         {
           id: 'apikeys',
           text: 'API keys',
-          description: 'Create & manage API keys',
+          subTitle: 'Create & manage API keys',
           icon: 'key-skeleton-alt',
           url: '/org/apikeys',
         },
         {
           id: 'serviceaccounts',
           text: 'Service accounts',
-          description: 'Manage service accounts',
+          subTitle: 'Manage service accounts',
           icon: 'gf-service-account',
           url: '/org/serviceaccounts',
         },
@@ -1767,7 +1767,7 @@ export const navIndex: NavIndex = {
   apikeys: {
     id: 'apikeys',
     text: 'API keys',
-    description: 'Create & manage API keys',
+    subTitle: 'Create & manage API keys',
     icon: 'key-skeleton-alt',
     url: '/org/apikeys',
     parentItem: {
@@ -1781,49 +1781,49 @@ export const navIndex: NavIndex = {
         {
           id: 'datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/datasources',
         },
         {
           id: 'users',
           text: 'Users',
-          description: 'Manage org members',
+          subTitle: 'Manage org members',
           icon: 'user',
           url: '/org/users',
         },
         {
           id: 'teams',
           text: 'Teams',
-          description: 'Manage org groups',
+          subTitle: 'Manage org groups',
           icon: 'users-alt',
           url: '/org/teams',
         },
         {
           id: 'plugins',
           text: 'Plugins',
-          description: 'View and configure plugins',
+          subTitle: 'View and configure plugins',
           icon: 'plug',
           url: '/plugins',
         },
         {
           id: 'org-settings',
           text: 'Preferences',
-          description: 'Organization preferences',
+          subTitle: 'Organization preferences',
           icon: 'sliders-v-alt',
           url: '/org',
         },
         {
           id: 'apikeys',
           text: 'API keys',
-          description: 'Create & manage API keys',
+          subTitle: 'Create & manage API keys',
           icon: 'key-skeleton-alt',
           url: '/org/apikeys',
         },
         {
           id: 'serviceaccounts',
           text: 'Service accounts',
-          description: 'Manage service accounts',
+          subTitle: 'Manage service accounts',
           icon: 'gf-service-account',
           url: '/org/serviceaccounts',
         },
@@ -1833,7 +1833,7 @@ export const navIndex: NavIndex = {
   serviceaccounts: {
     id: 'serviceaccounts',
     text: 'Service accounts',
-    description: 'Manage service accounts',
+    subTitle: 'Manage service accounts',
     icon: 'gf-service-account',
     url: '/org/serviceaccounts',
     parentItem: {
@@ -1847,49 +1847,49 @@ export const navIndex: NavIndex = {
         {
           id: 'datasources',
           text: 'Data sources',
-          description: 'Add and configure data sources',
+          subTitle: 'Add and configure data sources',
           icon: 'database',
           url: '/datasources',
         },
         {
           id: 'users',
           text: 'Users',
-          description: 'Manage org members',
+          subTitle: 'Manage org members',
           icon: 'user',
           url: '/org/users',
         },
         {
           id: 'teams',
           text: 'Teams',
-          description: 'Manage org groups',
+          subTitle: 'Manage org groups',
           icon: 'users-alt',
           url: '/org/teams',
         },
         {
           id: 'plugins',
           text: 'Plugins',
-          description: 'View and configure plugins',
+          subTitle: 'View and configure plugins',
           icon: 'plug',
           url: '/plugins',
         },
         {
           id: 'org-settings',
           text: 'Preferences',
-          description: 'Organization preferences',
+          subTitle: 'Organization preferences',
           icon: 'sliders-v-alt',
           url: '/org',
         },
         {
           id: 'apikeys',
           text: 'API keys',
-          description: 'Create & manage API keys',
+          subTitle: 'Create & manage API keys',
           icon: 'key-skeleton-alt',
           url: '/org/apikeys',
         },
         {
           id: 'serviceaccounts',
           text: 'Service accounts',
-          description: 'Manage service accounts',
+          subTitle: 'Manage service accounts',
           icon: 'gf-service-account',
           url: '/org/serviceaccounts',
         },
diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts
index 50226da0013..8c89a2cc990 100644
--- a/public/app/features/datasources/state/navModel.ts
+++ b/public/app/features/datasources/state/navModel.ts
@@ -19,7 +19,6 @@ export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDat
     subTitle: `Type: ${pluginMeta.name}`,
     url: '',
     text: dataSource.name,
-    breadcrumbs: [{ title: 'Data Sources', url: 'datasources' }],
     children: [
       {
         active: false,
diff --git a/public/app/features/folders/components/NewDashboardsFolder.tsx b/public/app/features/folders/components/NewDashboardsFolder.tsx
index 7664956bab1..8844e162078 100644
--- a/public/app/features/folders/components/NewDashboardsFolder.tsx
+++ b/public/app/features/folders/components/NewDashboardsFolder.tsx
@@ -29,7 +29,6 @@ const initialFormModel: FormModel = { folderName: '' };
 const pageNav: NavModelItem = {
   text: 'Create a new folder',
   subTitle: 'Folders provide a way to group dashboards and alert rules.',
-  breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
 };
 
 function NewDashboardsFolder({ createNewFolder }: Props) {
diff --git a/public/app/features/folders/state/navModel.ts b/public/app/features/folders/state/navModel.ts
index 341e07ac880..113a61123b0 100644
--- a/public/app/features/folders/state/navModel.ts
+++ b/public/app/features/folders/state/navModel.ts
@@ -10,7 +10,6 @@ export function buildNavModel(folder: FolderDTO): NavModelItem {
     subTitle: 'Manage folder dashboards and permissions',
     url: '',
     text: folder.title,
-    breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
     children: [
       {
         active: false,
diff --git a/public/app/features/manage-dashboards/DashboardImportPage.tsx b/public/app/features/manage-dashboards/DashboardImportPage.tsx
index 298874dfc60..be8209a382a 100644
--- a/public/app/features/manage-dashboards/DashboardImportPage.tsx
+++ b/public/app/features/manage-dashboards/DashboardImportPage.tsx
@@ -192,7 +192,6 @@ class UnthemedDashboardImport extends PureComponent<Props> {
   pageNav: NavModelItem = {
     text: 'Import dashboard',
     subTitle: 'Import dashboard from file or Grafana.com',
-    breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
   };
 
   render() {
diff --git a/public/app/features/org/NewOrgPage.tsx b/public/app/features/org/NewOrgPage.tsx
index 0b459d24579..2b1864aba59 100644
--- a/public/app/features/org/NewOrgPage.tsx
+++ b/public/app/features/org/NewOrgPage.tsx
@@ -24,7 +24,6 @@ const pageNav: NavModelItem = {
   icon: 'building',
   id: 'org-new',
   text: 'New organization',
-  breadcrumbs: [{ title: 'Server admin', url: 'admin/orgs' }],
 };
 
 export const NewOrgPage = ({ createOrganization }: Props) => {
diff --git a/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx b/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx
index 42c2b9962b4..79cc6a2fa88 100644
--- a/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx
+++ b/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx
@@ -21,7 +21,6 @@ export const usePluginDetailsTabs = (plugin?: CatalogPlugin, pageId?: PluginTabI
   const { loading, error, value: pluginConfig } = usePluginConfig(plugin);
   const { pathname } = useLocation();
   const defaultTab = useDefaultPage(plugin, pluginConfig);
-  const parentUrl = pathname.substring(0, pathname.lastIndexOf('/'));
   const isPublished = Boolean(plugin?.isPublished);
 
   const currentPageId = pageId || defaultTab;
@@ -98,7 +97,6 @@ export const usePluginDetailsTabs = (plugin?: CatalogPlugin, pageId?: PluginTabI
   const navModel: NavModelItem = {
     text: plugin?.name ?? '',
     img: plugin?.info.logos.small,
-    breadcrumbs: [{ title: 'Plugins', url: parentUrl }],
     children: [
       {
         text: PluginTabLabels.OVERVIEW,
diff --git a/public/app/features/serviceaccounts/ServiceAccountPage.tsx b/public/app/features/serviceaccounts/ServiceAccountPage.tsx
index 936dc4e8c06..4ae6e309d0f 100644
--- a/public/app/features/serviceaccounts/ServiceAccountPage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountPage.tsx
@@ -82,7 +82,6 @@ export const ServiceAccountPageUnconnected = ({
   const pageNav: NavModelItem = {
     text: serviceAccount.name,
     img: serviceAccount.avatarUrl,
-    breadcrumbs: [{ title: 'Service accounts', url: 'org/serviceaccounts' }],
     subTitle: 'Manage settings for an individual service account.',
   };
 
diff --git a/public/app/features/teams/CreateTeam.tsx b/public/app/features/teams/CreateTeam.tsx
index 90a846cecc6..deb3330c70a 100644
--- a/public/app/features/teams/CreateTeam.tsx
+++ b/public/app/features/teams/CreateTeam.tsx
@@ -15,7 +15,6 @@ const pageNav: NavModelItem = {
   id: 'team-new',
   text: 'New team',
   subTitle: 'Create a new team. Teams let you grant permissions to a group of users.',
-  breadcrumbs: [{ title: 'Configuration', url: 'org/teams' }],
 };
 
 export const CreateTeam = (): JSX.Element => {
diff --git a/public/app/features/teams/state/navModel.ts b/public/app/features/teams/state/navModel.ts
index 0f7b503d1b6..c3fe188968a 100644
--- a/public/app/features/teams/state/navModel.ts
+++ b/public/app/features/teams/state/navModel.ts
@@ -25,7 +25,6 @@ export function buildNavModel(team: Team): NavModelItem {
     subTitle: 'Manage members and settings',
     url: '',
     text: team.name,
-    breadcrumbs: [{ title: 'Teams', url: 'org/teams' }],
     children: [
       // With RBAC this tab will always be available (but not always editable)
       // With Legacy it will be hidden by hideTabsFromNonTeamAdmin should the user not be allowed to see it

From 764f87b4859a119942e889f051125fbf8f7f15c5 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Thu, 4 May 2023 16:21:08 +0300
Subject: [PATCH 635/729] InfluxDB: Fix adding FROM statement when the
 measurement is an empty string (#67827)

* If the measurement empty don't add FROM statement

* Add comment line
---
 .../app/plugins/datasource/influxdb/query_builder.ts  | 11 +++++++++--
 .../datasource/influxdb/specs/query_builder.test.ts   |  8 ++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/query_builder.ts b/public/app/plugins/datasource/influxdb/query_builder.ts
index e62d4c818cf..60d190602da 100644
--- a/public/app/plugins/datasource/influxdb/query_builder.ts
+++ b/public/app/plugins/datasource/influxdb/query_builder.ts
@@ -64,7 +64,8 @@ export class InfluxQueryBuilder {
       measurement = this.target.measurement;
       policy = this.target.policy;
 
-      if (!measurement.match('^/.*/')) {
+      // If there is a measurement and it is not empty string
+      if (!measurement.match(/^\/.*\/|^$/)) {
         measurement = '"' + measurement + '"';
 
         if (policy && policy !== 'default') {
@@ -73,6 +74,10 @@ export class InfluxQueryBuilder {
         }
       }
 
+      if (measurement === '') {
+        return 'SHOW FIELD KEYS';
+      }
+
       return 'SHOW FIELD KEYS FROM ' + measurement;
     } else if (type === 'RETENTION POLICIES') {
       query = 'SHOW RETENTION POLICIES on "' + this.database + '"';
@@ -89,7 +94,9 @@ export class InfluxQueryBuilder {
         measurement = policy + '.' + measurement;
       }
 
-      query += ' FROM ' + measurement;
+      if (measurement !== '') {
+        query += ' FROM ' + measurement;
+      }
     }
 
     if (withKey) {
diff --git a/public/app/plugins/datasource/influxdb/specs/query_builder.test.ts b/public/app/plugins/datasource/influxdb/specs/query_builder.test.ts
index 07be475e028..17569325243 100644
--- a/public/app/plugins/datasource/influxdb/specs/query_builder.test.ts
+++ b/public/app/plugins/datasource/influxdb/specs/query_builder.test.ts
@@ -213,5 +213,13 @@ describe('InfluxQueryBuilder', () => {
       const query = builder.buildExploreQuery('TAG_KEYS');
       expect(query).toBe(`SHOW TAG KEYS WHERE "app" == ''`);
     });
+
+    it('should not add FROM statement if the measurement empty', () => {
+      const builder = new InfluxQueryBuilder({ measurement: '', tags: [] });
+      let query = builder.buildExploreQuery('TAG_KEYS');
+      expect(query).toBe('SHOW TAG KEYS');
+      query = builder.buildExploreQuery('FIELDS');
+      expect(query).toBe('SHOW FIELD KEYS');
+    });
   });
 });

From d10ee8263c95ed315f9ed03127637e8214e66c5f Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Thu, 4 May 2023 15:23:08 +0200
Subject: [PATCH 636/729] Alerting: Change order of buttons bellow payload data
 editor (#67830)

Change order of buttons bellow payload data editor
---
 .../components/receivers/PayloadEditor.tsx    | 25 ++++++++++---------
 .../receivers/form/GenerateAlertDataModal.tsx |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
index a39cbdbad48..2194fbcb7a1 100644
--- a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
+++ b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
@@ -99,9 +99,17 @@ export function PayloadEditor({
         />
 
         <div className={styles.buttonsWrapper}>
-          <Button onClick={onReset} className={styles.button} icon="arrow-up" type="button" variant="secondary">
-            {RESET_TO_DEFAULT}
+          <Button
+            type="button"
+            variant="secondary"
+            className={styles.button}
+            icon="bell"
+            disabled={errorInPayloadJson}
+            onClick={onOpenAlertSelectorModal}
+          >
+            Select alert instances
           </Button>
+
           <Button
             onClick={onOpenEditAlertModal}
             className={styles.button}
@@ -110,17 +118,10 @@ export function PayloadEditor({
             variant="secondary"
             disabled={errorInPayloadJson}
           >
-            Add alert data
+            Add custom alerts
           </Button>
-
-          <Button
-            type="button"
-            variant="secondary"
-            icon="bell"
-            disabled={errorInPayloadJson}
-            onClick={onOpenAlertSelectorModal}
-          >
-            Choose alert instances
+          <Button onClick={onReset} className={styles.button} icon="arrow-up" type="button" variant="destructive">
+            {RESET_TO_DEFAULT}
           </Button>
 
           {payloadFormatError !== null && (
diff --git a/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx b/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
index 706eacf3348..060329757a8 100644
--- a/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
+++ b/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
@@ -85,7 +85,7 @@ export const GenerateAlertDataModal = ({ isOpen, onDismiss, onAccept }: Props) =
   ];
 
   return (
-    <Modal onDismiss={onDismiss} isOpen={isOpen} title={'Add alert data'}>
+    <Modal onDismiss={onDismiss} isOpen={isOpen} title={'Add custom alerts'}>
       <FormProvider {...formMethods}>
         <form
           onSubmit={(e) => {

From dafd202bb25d6109e73e00dc1e275e13ed781ff1 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Thu, 4 May 2023 15:26:30 +0200
Subject: [PATCH 637/729] Alerting: Fix "show all instances" (#67833)

---
 .../RuleDetailsMatchingInstances.test.tsx     | 27 +++++++++++++++++++
 .../rules/RuleDetailsMatchingInstances.tsx    | 23 +++++++++-------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
index d3d5b197067..774f2ea7c79 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
@@ -1,5 +1,6 @@
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { times } from 'lodash';
 import React from 'react';
 import { byLabelText, byRole, byTestId } from 'testing-library-selector';
 
@@ -25,6 +26,7 @@ const ui = {
     pending: byLabelText(/^Pending/),
   },
   instanceRow: byTestId('row'),
+  showAllInstances: byTestId('show-all'),
 };
 
 describe('RuleDetailsMatchingInstances', () => {
@@ -116,6 +118,31 @@ describe('RuleDetailsMatchingInstances', () => {
         expect(ui.instanceRow.get()).toHaveTextContent(alertStateToReadable(state));
       }
     );
+
+    it('should correctly filter instances', async () => {
+      const event = userEvent.setup();
+
+      const rule = mockCombinedRule({
+        promRule: mockPromAlertingRule({
+          alerts: times(100, () => mockPromAlert({ state: GrafanaAlertState.Normal })),
+        }),
+        instanceTotals: {
+          inactive: 100,
+        },
+      });
+
+      render(<RuleDetailsMatchingInstances rule={rule} enableFiltering pagination={{ itemsPerPage: 10 }} />);
+
+      // should show all instances by default
+      expect(ui.showAllInstances.query()).not.toBeInTheDocument();
+
+      // filter by "error" state, should have no instances in that state
+      await event.click(ui.grafanaStateButton.error.get());
+
+      // click "show all" instances
+      await event.click(ui.showAllInstances.get());
+      expect(ui.showAllInstances.query()).not.toBeInTheDocument();
+    });
   });
 });
 
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
index c52170a4d6c..76add623041 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
@@ -1,9 +1,10 @@
 import { css, cx } from '@emotion/css';
 import { countBy, sum } from 'lodash';
 import React, { useMemo, useState } from 'react';
+import { useHistory } from 'react-router-dom';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { LinkButton, useStyles2 } from '@grafana/ui';
+import { Button, useStyles2 } from '@grafana/ui';
 import { MatcherFilter } from 'app/features/alerting/unified/components/alert-groups/MatcherFilter';
 import {
   AlertInstanceStateFilter,
@@ -34,25 +35,24 @@ interface ShowMoreStats {
   visibleItemsCount: number;
 }
 
-function ShowMoreInstances(props: { ruleViewPageLink: string; stats: ShowMoreStats }) {
+function ShowMoreInstances(props: { onClick: () => void; stats: ShowMoreStats }) {
   const styles = useStyles2(getStyles);
-  const { ruleViewPageLink, stats } = props;
+  const { onClick, stats } = props;
 
   return (
     <div className={styles.footerRow}>
       <div>
         Showing {stats.visibleItemsCount} out of {stats.totalItemsCount} instances
       </div>
-      {ruleViewPageLink && (
-        <LinkButton href={ruleViewPageLink} size="sm" variant="secondary">
-          Show all {stats.totalItemsCount} alert instances
-        </LinkButton>
-      )}
+      <Button size="sm" variant="secondary" data-testid="show-all" onClick={onClick}>
+        Show all {stats.totalItemsCount} alert instances
+      </Button>
     </div>
   );
 }
 
 export function RuleDetailsMatchingInstances(props: Props): JSX.Element | null {
+  const history = useHistory();
   const {
     rule: { promRule, namespace, instanceTotals },
     itemsDisplayLimit = Number.POSITIVE_INFINITY,
@@ -98,8 +98,13 @@ export function RuleDetailsMatchingInstances(props: Props): JSX.Element | null {
   const ruleViewPageLink = createViewLink(namespace.rulesSource, props.rule, location.pathname + location.search);
   const statsComponents = getComponentsFromStats(instanceTotals);
 
+  const resetFilter = () => setAlertState(undefined);
+  const navigateToDetailView = () => history.push(ruleViewPageLink);
+
+  const onShowMoreInstances = enableFiltering ? resetFilter : navigateToDetailView;
+
   const footerRow = hiddenInstancesCount ? (
-    <ShowMoreInstances stats={stats} ruleViewPageLink={ruleViewPageLink} />
+    <ShowMoreInstances stats={stats} onClick={onShowMoreInstances} />
   ) : undefined;
 
   return (

From 2bef09bfcb7b51bf89bd0c6aa8a6095d2cedfdff Mon Sep 17 00:00:00 2001
From: sam boyer <sdboyer@grafana.com>
Date: Thu, 4 May 2023 09:40:35 -0400
Subject: [PATCH 638/729] All: Remove make gen-cue from main dev flow (#67838)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5b113040eba..da3b9059179 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ gen-cue: ## Do all CUE/Thema code generation
 	go generate ./public/app/plugins/gen.go
 	go generate ./pkg/kindsys/report.go
 
-gen-go: $(WIRE) gen-cue
+gen-go: $(WIRE)
 	@echo "generate go files"
 	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server
 

From 49ff85ef5455b5c5619f76276173c64fbed7a0ff Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Thu, 4 May 2023 17:05:26 +0200
Subject: [PATCH 639/729] Alerting: Fix action buttons label and placement in
 several views following standard and being consistent with the rest of the ui
 (#67799)

* Fix action buttons label and placement in several views following standard and being consistent with the rest of the ui

* Update public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>

* Fix secondary buttons to not have outline

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 .../alerting/unified/RuleList.test.tsx        |  2 +-
 .../alerting/unified/Silences.test.tsx        |  2 +-
 .../unified/components/admin/ConfigEditor.tsx |  4 +-
 .../mute-timings/MuteTimingForm.tsx           | 10 ++--
 .../notification-policies/Modals.tsx          |  2 +-
 .../components/receivers/TemplateForm.tsx     |  1 -
 .../receivers/form/ReceiverForm.tsx           |  3 +-
 .../components/rule-editor/AlertRuleForm.tsx  | 48 ++++++++-----------
 .../rule-editor/DashboardPicker.tsx           | 18 +++----
 .../components/rules/EditRuleGroupModal.tsx   | 14 ++----
 .../components/rules/RulesGroup.test.tsx      |  6 +--
 .../components/silences/SilencesEditor.tsx    | 20 ++++----
 public/test/helpers/alertingRuleEditor.tsx    |  2 +-
 13 files changed, 57 insertions(+), 75 deletions(-)

diff --git a/public/app/features/alerting/unified/RuleList.test.tsx b/public/app/features/alerting/unified/RuleList.test.tsx
index fcc4018909b..3dfb29776c4 100644
--- a/public/app/features/alerting/unified/RuleList.test.tsx
+++ b/public/app/features/alerting/unified/RuleList.test.tsx
@@ -125,7 +125,7 @@ const ui = {
     intervalInput: byRole('textbox', {
       name: /Rule group evaluation interval Evaluation interval should be smaller or equal to 'For' values for existing rules in this group./i,
     }),
-    saveButton: byRole('button', { name: /Save changes/ }),
+    saveButton: byRole('button', { name: /Save evaluation interval/ }),
   },
 };
 
diff --git a/public/app/features/alerting/unified/Silences.test.tsx b/public/app/features/alerting/unified/Silences.test.tsx
index 048aa24c3b9..d1e56f45d65 100644
--- a/public/app/features/alerting/unified/Silences.test.tsx
+++ b/public/app/features/alerting/unified/Silences.test.tsx
@@ -68,7 +68,7 @@ const ui = {
     matcherOperatorSelect: byLabelText('operator'),
     matcherOperator: (operator: MatcherOperator) => byText(operator, { exact: true }),
     addMatcherButton: byRole('button', { name: 'Add matcher' }),
-    submit: byText('Submit'),
+    submit: byText(/save silence/i),
     createdBy: byText(/created by \*/i),
   },
 };
diff --git a/public/app/features/alerting/unified/components/admin/ConfigEditor.tsx b/public/app/features/alerting/unified/components/admin/ConfigEditor.tsx
index 7e0ccc51322..99f40c6edda 100644
--- a/public/app/features/alerting/unified/components/admin/ConfigEditor.tsx
+++ b/public/app/features/alerting/unified/components/admin/ConfigEditor.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Button, ConfirmModal, TextArea, HorizontalGroup, Field, Form } from '@grafana/ui';
+import { Button, ConfirmModal, Field, Form, HorizontalGroup, TextArea } from '@grafana/ui';
 
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 
@@ -60,7 +60,7 @@ export const ConfigEditor = ({
 
               <HorizontalGroup>
                 <Button type="submit" variant="primary" disabled={loading}>
-                  Save
+                  Save configuration
                 </Button>
                 {onReset && (
                   <Button type="button" disabled={loading} variant="destructive" onClick={onReset}>
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
index f8d6f1c4c4a..3270dcddfdb 100644
--- a/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
@@ -3,7 +3,7 @@ import React, { useMemo } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { Alert, Field, FieldSet, Input, Button, LinkButton, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Field, FieldSet, Input, LinkButton, useStyles2 } from '@grafana/ui';
 import {
   AlertmanagerConfig,
   AlertManagerCortexConfig,
@@ -151,6 +151,9 @@ const MuteTimingForm = ({ muteTiming, showError, provenance }: Props) => {
                 />
               </Field>
               <MuteTimingTimeInterval />
+              <Button type="submit" className={styles.submitButton}>
+                Save mute timing
+              </Button>
               <LinkButton
                 type="button"
                 variant="secondary"
@@ -158,9 +161,6 @@ const MuteTimingForm = ({ muteTiming, showError, provenance }: Props) => {
               >
                 Cancel
               </LinkButton>
-              <Button type="submit" className={styles.submitButton}>
-                {muteTiming ? 'Save' : 'Submit'}
-              </Button>
             </FieldSet>
           </form>
         </FormProvider>
@@ -174,7 +174,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     width: 400px;
   `,
   submitButton: css`
-    margin-left: ${theme.spacing(1)};
+    margin-right: ${theme.spacing(1)};
   `,
 });
 
diff --git a/public/app/features/alerting/unified/components/notification-policies/Modals.tsx b/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
index b479a76c8f7..ea34cec0963 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
@@ -62,7 +62,7 @@ const useAddPolicyModal = (
             onSubmit={(newRoute) => parentRoute && handleAdd(newRoute, parentRoute)}
             actionButtons={
               <Modal.ButtonRow>
-                <Button type="submit">Add policy</Button>
+                <Button type="submit">Save policy</Button>
                 <Button type="button" variant="secondary" onClick={handleDismiss}>
                   Cancel
                 </Button>
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
index b550fd19fab..6c38914dae1 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
@@ -212,7 +212,6 @@ export const TemplateForm = ({ existing, alertManagerSourceName, config, provena
                         href={makeAMLink('alerting/notifications', alertManagerSourceName)}
                         variant="secondary"
                         type="button"
-                        fill="outline"
                       >
                         Cancel
                       </LinkButton>
diff --git a/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx b/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx
index b83c4b71696..b8f847a86b4 100644
--- a/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
 import React, { useCallback } from 'react';
-import { useForm, FormProvider, FieldErrors, Validate } from 'react-hook-form';
+import { FieldErrors, FormProvider, useForm, Validate } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Alert, Button, Field, Input, LinkButton, useStyles2 } from '@grafana/ui';
@@ -175,7 +175,6 @@ export function ReceiverForm<R extends ChannelValues>({
             )}
             <LinkButton
               disabled={loading}
-              fill="outline"
               variant="secondary"
               data-testid="cancel-button"
               href={makeAMLink('alerting/notifications', alertManagerSourceName)}
diff --git a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
index 3226b13367e..42428c584b8 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx
@@ -4,8 +4,8 @@ import { DeepMap, FieldError, FormProvider, useForm, useFormContext, UseFormWatc
 import { Link } from 'react-router-dom';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { logInfo, config } from '@grafana/runtime';
-import { Button, ConfirmModal, CustomScrollbar, Spinner, useStyles2, HorizontalGroup, Field, Input } from '@grafana/ui';
+import { config, logInfo } from '@grafana/runtime';
+import { Button, ConfirmModal, CustomScrollbar, Field, HorizontalGroup, Input, Spinner, useStyles2 } from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { contextSrv } from 'app/core/core';
 import { useCleanup } from 'app/core/hooks/useCleanup';
@@ -198,14 +198,26 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => {
     <FormProvider {...formAPI}>
       <form onSubmit={(e) => e.preventDefault()} className={styles.form}>
         <HorizontalGroup height="auto" justify="flex-end">
+          <Button
+            variant="primary"
+            type="button"
+            onClick={handleSubmit((values) => submit(values, false), onInvalid)}
+            disabled={submitState.loading}
+          >
+            {submitState.loading && <Spinner className={styles.buttonSpinner} inline={true} />}
+            Save rule
+          </Button>
+          <Button
+            variant="primary"
+            type="button"
+            onClick={handleSubmit((values) => submit(values, true), onInvalid)}
+            disabled={submitState.loading}
+          >
+            {submitState.loading && <Spinner className={styles.buttonSpinner} inline={true} />}
+            Save rule and exit
+          </Button>
           <Link to={returnTo}>
-            <Button
-              variant="secondary"
-              disabled={submitState.loading}
-              type="button"
-              fill="outline"
-              onClick={cancelRuleCreation}
-            >
+            <Button variant="secondary" disabled={submitState.loading} type="button" onClick={cancelRuleCreation}>
               Cancel
             </Button>
           </Link>
@@ -224,24 +236,6 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => {
               Edit YAML
             </Button>
           )}
-          <Button
-            variant="primary"
-            type="button"
-            onClick={handleSubmit((values) => submit(values, false), onInvalid)}
-            disabled={submitState.loading}
-          >
-            {submitState.loading && <Spinner className={styles.buttonSpinner} inline={true} />}
-            Save
-          </Button>
-          <Button
-            variant="primary"
-            type="button"
-            onClick={handleSubmit((values) => submit(values, true), onInvalid)}
-            disabled={submitState.loading}
-          >
-            {submitState.loading && <Spinner className={styles.buttonSpinner} inline={true} />}
-            Save and exit
-          </Button>
         </HorizontalGroup>
         <div className={styles.contentOuter}>
           <CustomScrollbar autoHeightMin="100%" hideHorizontalTrack={true}>
diff --git a/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx
index 9259418c078..6462648e10b 100644
--- a/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx
@@ -6,15 +6,15 @@ import { FixedSizeList } from 'react-window';
 
 import { GrafanaTheme2 } from '@grafana/data/src';
 import {
-  FilterInput,
-  LoadingPlaceholder,
-  useStyles2,
-  Icon,
-  Modal,
-  Button,
   Alert,
+  Button,
   clearButtonStyles,
+  FilterInput,
+  Icon,
+  LoadingPlaceholder,
+  Modal,
   Tooltip,
+  useStyles2,
 } from '@grafana/ui';
 
 import { dashboardApi } from '../../api/dashboardApi';
@@ -230,9 +230,6 @@ export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDis
         </div>
       </div>
       <Modal.ButtonRow>
-        <Button type="button" variant="secondary" onClick={onDismiss}>
-          Cancel
-        </Button>
         <Button
           type="button"
           variant="primary"
@@ -245,6 +242,9 @@ export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDis
         >
           Confirm
         </Button>
+        <Button type="button" variant="secondary" onClick={onDismiss}>
+          Cancel
+        </Button>
       </Modal.ButtonRow>
     </Modal>
   );
diff --git a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
index 78581c3d3cd..b1a6da13e4e 100644
--- a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
+++ b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
@@ -374,21 +374,15 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
             )}
             <div className={styles.modalButtons}>
               <Modal.ButtonRow>
-                <Button
-                  variant="secondary"
-                  type="button"
-                  disabled={loading}
-                  onClick={() => onClose(false)}
-                  fill="outline"
-                >
-                  Close
-                </Button>
                 <Button
                   type="button"
                   disabled={!isDirty || loading}
                   onClick={handleSubmit((values) => onSubmit(values), onInvalid)}
                 >
-                  {loading ? 'Saving...' : 'Save changes'}
+                  {loading ? 'Saving...' : 'Save evaluation interval'}
+                </Button>
+                <Button variant="secondary" type="button" disabled={loading} onClick={() => onClose(false)}>
+                  Cancel
                 </Button>
               </Modal.ButtonRow>
             </div>
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
index fd6fcdb9112..c7032e7c52a 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
@@ -166,11 +166,11 @@ describe('Rules group tests', () => {
 
       await userEvent.click(ui.editGroupButton.get());
 
-      expect(screen.getByText('Close')).toBeInTheDocument();
+      expect(screen.getByText('Cancel')).toBeInTheDocument();
 
-      await userEvent.click(screen.getByText('Close'));
+      await userEvent.click(screen.getByText('Cancel'));
 
-      expect(screen.queryByText('Close')).not.toBeInTheDocument();
+      expect(screen.queryByText('Cancel')).not.toBeInTheDocument();
       expect(logInfo).toHaveBeenCalledWith(LogMessages.leavingRuleGroupEdit);
     });
   });
diff --git a/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx b/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
index 7f6c3269146..93f08924190 100644
--- a/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
+++ b/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
@@ -1,17 +1,17 @@
 import { css, cx } from '@emotion/css';
 import { isEqual, pickBy } from 'lodash';
 import React, { useMemo, useState } from 'react';
-import { useForm, FormProvider } from 'react-hook-form';
+import { FormProvider, useForm } from 'react-hook-form';
 import { useDebounce } from 'react-use';
 
 import {
-  DefaultTimeZone,
-  parseDuration,
-  intervalToAbbreviatedDurationString,
   addDurationToDate,
   dateTime,
-  isValidDate,
+  DefaultTimeZone,
   GrafanaTheme2,
+  intervalToAbbreviatedDurationString,
+  isValidDate,
+  parseDuration,
 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { Button, Field, FieldSet, Input, LinkButton, TextArea, useStyles2 } from '@grafana/ui';
@@ -23,7 +23,7 @@ import { useURLSearchParams } from '../../hooks/useURLSearchParams';
 import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
 import { createOrUpdateSilenceAction } from '../../state/actions';
 import { SilenceFormFields } from '../../types/silence-form';
-import { matcherToMatcherField, matcherFieldToMatcher } from '../../utils/alertmanager';
+import { matcherFieldToMatcher, matcherToMatcherField } from '../../utils/alertmanager';
 import { parseQueryParamMatchers } from '../../utils/matchers';
 import { makeAMLink } from '../../utils/misc';
 import { initialAsyncRequestState } from '../../utils/redux';
@@ -246,12 +246,8 @@ export const SilencesEditor = ({ silence, alertManagerSourceName }: Props) => {
               Saving...
             </Button>
           )}
-          {!loading && <Button type="submit">Submit</Button>}
-          <LinkButton
-            href={makeAMLink('alerting/silences', alertManagerSourceName)}
-            variant={'secondary'}
-            fill="outline"
-          >
+          {!loading && <Button type="submit">Save silence</Button>}
+          <LinkButton href={makeAMLink('alerting/silences', alertManagerSourceName)} variant={'secondary'}>
             Cancel
           </LinkButton>
         </div>
diff --git a/public/test/helpers/alertingRuleEditor.tsx b/public/test/helpers/alertingRuleEditor.tsx
index 02b57153da0..dcf0385f9d2 100644
--- a/public/test/helpers/alertingRuleEditor.tsx
+++ b/public/test/helpers/alertingRuleEditor.tsx
@@ -25,7 +25,7 @@ export const ui = {
     expr: byTestId('expr'),
   },
   buttons: {
-    save: byRole('button', { name: 'Save' }),
+    save: byRole('button', { name: 'Save rule' }),
     addAnnotation: byRole('button', { name: /Add info/ }),
     addLabel: byRole('button', { name: /Add label/ }),
     // alert type buttons

From 95cf598423926d930ccece2f2e8f57e08dcddb5a Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Thu, 4 May 2023 19:33:00 +0200
Subject: [PATCH 640/729] Elasticsearch: Fix processing of logs with
 not-recognized time format (#67767)

* Elasticsearch: Fix parsing of invalid time

* Fix lint

* Add more test data to data.js

* Add tests

* Fix lint

* Update pkg/tsdb/elasticsearch/client/search_request.go
---
 devenv/docker/blocks/elastic/data/data.js     | 15 ++++++
 .../elasticsearch/client/search_request.go    |  6 +++
 pkg/tsdb/elasticsearch/data_query.go          |  3 ++
 pkg/tsdb/elasticsearch/response_parser.go     | 27 ++++++++--
 .../elasticsearch/response_parser_test.go     | 52 ++++++++++++++-----
 .../testdata_request/logs.request.line1.json  |  9 +++-
 .../testdata_response/logs.a.golden.jsonc     | 32 ++++++------
 .../testdata_response/logs.response.json      | 35 +++++++++++--
 8 files changed, 142 insertions(+), 37 deletions(-)

diff --git a/devenv/docker/blocks/elastic/data/data.js b/devenv/docker/blocks/elastic/data/data.js
index efff9370005..080ae9f8f94 100644
--- a/devenv/docker/blocks/elastic/data/data.js
+++ b/devenv/docker/blocks/elastic/data/data.js
@@ -64,6 +64,18 @@ async function elasticSetupIndexTemplate() {
           '@timestamp': {
             type: 'date',
           },
+          '@timestamp_custom': {
+            type: 'date',
+            format: 'yyyy_MM_dd_HH_mm_ss'
+          },
+          '@timestamp_unix': {
+            type: 'date',
+            format: 'epoch_millis'
+          },
+          '@timestamp_nanos': {
+            type: 'date_nanos',
+            format: 'strict_date_optional_time_nanos'
+          },
           counter: {
             type: 'integer',
           },
@@ -115,6 +127,9 @@ function getRandomLogItem(counter, timestamp) {
   const maybeAnsiText = Math.random() < 0.5 ? 'with ANSI \u001b[31mpart of the text\u001b[0m' : '';
   return {
     '@timestamp': timestamp.toISOString(),
+    '@timestamp_custom': timestamp.toISOString().split('.')[0].replace(/[T:-]/g,'_'),
+    '@timestamp_unix': timestamp.getTime(),
+    '@timestamp_nanos': timestamp.toISOString().slice(0,-1) + '123Z',
     line: `log text ${maybeAnsiText} [${randomText}]`,
     counter: counter.toString(),
     float: 100 * Math.random().toString(),
diff --git a/pkg/tsdb/elasticsearch/client/search_request.go b/pkg/tsdb/elasticsearch/client/search_request.go
index d267210f103..cafd25f16f5 100644
--- a/pkg/tsdb/elasticsearch/client/search_request.go
+++ b/pkg/tsdb/elasticsearch/client/search_request.go
@@ -99,6 +99,12 @@ func (b *SearchRequestBuilder) Sort(order SortOrder, field string, unmappedType
 	return b
 }
 
+// AddTimeFieldWithStandardizedFormat adds a time field to fields with standardized time format
+func (b *SearchRequestBuilder) AddTimeFieldWithStandardizedFormat(timeField string) *SearchRequestBuilder {
+	b.customProps["fields"] = []map[string]string{{"field": timeField, "format": "strict_date_optional_time_nanos"}}
+	return b
+}
+
 // AddDocValueField adds a doc value field to the search request
 func (b *SearchRequestBuilder) AddDocValueField(field string) *SearchRequestBuilder {
 	b.customProps["docvalue_fields"] = []string{field}
diff --git a/pkg/tsdb/elasticsearch/data_query.go b/pkg/tsdb/elasticsearch/data_query.go
index f725ce441b6..8e48c7bebcc 100644
--- a/pkg/tsdb/elasticsearch/data_query.go
+++ b/pkg/tsdb/elasticsearch/data_query.go
@@ -325,6 +325,9 @@ func processLogsQuery(q *Query, b *es.SearchRequestBuilder, from, to int64, defa
 	b.Sort(sort, defaultTimeField, "boolean")
 	b.Sort(sort, "_doc", "")
 	b.AddDocValueField(defaultTimeField)
+	// We need to add timeField as field with standardized time format to not receive
+	// invalid formats that elasticsearch can parse, but our frontend can't (e.g. yyyy_MM_dd_HH_mm_ss)
+	b.AddTimeFieldWithStandardizedFormat(defaultTimeField)
 	b.Size(stringToIntWithDefaultValue(metric.Settings.Get("limit").MustString(), defaultSize))
 	b.AddHighlight()
 
diff --git a/pkg/tsdb/elasticsearch/response_parser.go b/pkg/tsdb/elasticsearch/response_parser.go
index fd32aef692d..86c3a66b9c4 100644
--- a/pkg/tsdb/elasticsearch/response_parser.go
+++ b/pkg/tsdb/elasticsearch/response_parser.go
@@ -122,6 +122,15 @@ func processLogsResponse(res *es.SearchResponse, target *Query, configuredFields
 			}
 		}
 
+		if hit["fields"] != nil {
+			source, ok := hit["fields"].(map[string]interface{})
+			if ok {
+				for k, v := range source {
+					doc[k] = v
+				}
+			}
+		}
+
 		for key := range doc {
 			propNames[key] = true
 		}
@@ -258,15 +267,27 @@ func processDocsToDataFrameFields(docs []map[string]interface{}, propNames []str
 	size := len(docs)
 	isFilterable := true
 	allFields := make([]*data.Field, len(propNames))
+	timeString := ""
+	timeStringOk := false
 
 	for propNameIdx, propName := range propNames {
 		// Special handling for time field
 		if propName == configuredFields.TimeField {
 			timeVector := make([]*time.Time, size)
 			for i, doc := range docs {
-				timeString, ok := doc[configuredFields.TimeField].(string)
-				if !ok {
-					continue
+				// Check if time field is a string
+				timeString, timeStringOk = doc[configuredFields.TimeField].(string)
+				// If not, it might be an array with one time string
+				if !timeStringOk {
+					timeList, ok := doc[configuredFields.TimeField].([]interface{})
+					if !ok || len(timeList) != 1 {
+						continue
+					}
+					// Check if the first element is a string
+					timeString, timeStringOk = timeList[0].(string)
+					if !timeStringOk {
+						continue
+					}
 				}
 				timeValue, err := time.Parse(time.RFC3339Nano, timeString)
 				if err != nil {
diff --git a/pkg/tsdb/elasticsearch/response_parser_test.go b/pkg/tsdb/elasticsearch/response_parser_test.go
index 770e42e4b2c..c245be3e776 100644
--- a/pkg/tsdb/elasticsearch/response_parser_test.go
+++ b/pkg/tsdb/elasticsearch/response_parser_test.go
@@ -50,7 +50,7 @@ func TestProcessLogsResponse(t *testing.T) {
 							  "_type": "_doc",
 							  "_index": "mock-index",
 							  "_source": {
-								"testtime": "2019-06-24T09:51:19.765Z",
+								"testtime": "06/24/2019",
 								"host": "djisaodjsoad",
 								"number": 1,
 								"line": "hello, i am a message",
@@ -58,17 +58,20 @@ func TestProcessLogsResponse(t *testing.T) {
 								"fields": { "lvl": "debug" }
 							  },
 							  "highlight": {
-								"message": [
-								  "@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
-								]
-							  }
+									"message": [
+								  	"@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
+									]
+							  },
+								"fields": {
+									"testtime": [ "2019-06-24T09:51:19.765Z" ]
+								}
 							},
 							{
 							  "_id": "kdospaidopa",
 							  "_type": "_doc",
 							  "_index": "mock-index",
 							  "_source": {
-								"testtime": "2019-06-24T09:52:19.765Z",
+								"testtime": "06/24/2019",
 								"host": "dsalkdakdop",
 								"number": 2,
 								"line": "hello, i am also message",
@@ -76,10 +79,13 @@ func TestProcessLogsResponse(t *testing.T) {
 								"fields": { "lvl": "info" }
 							  },
 							  "highlight": {
-								"message": [
-								  "@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
-								]
-							  }
+									"message": [
+								  	"@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
+									]
+							  },
+								"fields": {
+									"testtime": [ "2019-06-24T09:52:19.765Z" ]
+								}
 							}
 						  ]
 						}
@@ -141,14 +147,14 @@ func TestProcessLogsResponse(t *testing.T) {
 						"level": "debug",
 						"line": "hello, i am a message",
 						"number": 1,
-						"testtime": "2019-06-24T09:51:19.765Z",
+						"testtime": "06/24/2019",
 						"line": "hello, i am a message"
 					}
 					`
 
 			expectedJson2 := `
 					{
-						"testtime": "2019-06-24T09:52:19.765Z",
+						"testtime": "06/24/2019",
 						"host": "dsalkdakdop",
 						"number": 2,
 						"line": "hello, i am also message",
@@ -180,6 +186,28 @@ func TestProcessLogsResponse(t *testing.T) {
 			requireStringAt(t, "debug", field, 0)
 			requireStringAt(t, "error", field, 1)
 		})
+
+		t.Run("gets correct time field from fields", func(t *testing.T) {
+			result, err := queryDataTest(query, response)
+			require.NoError(t, err)
+
+			require.Len(t, result.response.Responses, 1)
+			frames := result.response.Responses["A"].Frames
+			require.Len(t, frames, 1)
+
+			logsFrame := frames[0]
+
+			logsFieldMap := make(map[string]*data.Field)
+			for _, field := range logsFrame.Fields {
+				logsFieldMap[field.Name] = field
+			}
+			t0 := time.Date(2019, time.June, 24, 9, 51, 19, 765000000, time.UTC)
+			t1 := time.Date(2019, time.June, 24, 9, 52, 19, 765000000, time.UTC)
+			require.Contains(t, logsFieldMap, "testtime")
+			require.Equal(t, data.FieldTypeNullableTime, logsFieldMap["testtime"].Type())
+			require.Equal(t, &t0, logsFieldMap["testtime"].At(0))
+			require.Equal(t, &t1, logsFieldMap["testtime"].At(1))
+		})
 	})
 	t.Run("Empty response", func(t *testing.T) {
 		query := []byte(`
diff --git a/pkg/tsdb/elasticsearch/testdata_request/logs.request.line1.json b/pkg/tsdb/elasticsearch/testdata_request/logs.request.line1.json
index 0e105e19d31..586b29fd6ba 100644
--- a/pkg/tsdb/elasticsearch/testdata_request/logs.request.line1.json
+++ b/pkg/tsdb/elasticsearch/testdata_request/logs.request.line1.json
@@ -55,5 +55,12 @@
         "*": {}
       }
 
-    }
+    },
+  "fields": 
+    [ 
+      {
+        "field": "testtime",
+        "format": "strict_date_optional_time_nanos"
+      }
+    ]
 }
\ No newline at end of file
diff --git a/pkg/tsdb/elasticsearch/testdata_response/logs.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/logs.a.golden.jsonc
index a5ebe01bac3..1ce38625103 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/logs.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/logs.a.golden.jsonc
@@ -15,17 +15,17 @@
 //  }
 //  Name: 
 //  Dimensions: 17 Fields by 5 Rows
-//  +-----------------------------------+---------------------------+----------------------+-----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------+-----------------+------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------+---------------+-----------------+-----------------+-----------------------------------------+------------------------------------+---------------------------------------------------------------------------------+--------------------------+
-//  | Name: testtime                    | Name: line                | Name: _id            | Name: _index    | Name: _source                                                                                                                                                                                                                                                                                                                                               | Name: _type              | Name: abc       | Name: counter    | Name: float        | Name: highlight                                                                                                                | Name: is_true | Name: label     | Name: level     | Name: location                          | Name: nested_field.internal.nested | Name: shapes                                                                    | Name: sort               |
-//  | Labels:                           | Labels:                   | Labels:              | Labels:         | Labels:                                                                                                                                                                                                                                                                                                                                                     | Labels:                  | Labels:         | Labels:          | Labels:            | Labels:                                                                                                                        | Labels:       | Labels:         | Labels:         | Labels:                                 | Labels:                            | Labels:                                                                         | Labels:                  |
-//  | Type: []*time.Time                | Type: []*string           | Type: []*string      | Type: []*string | Type: []*json.RawMessage                                                                                                                                                                                                                                                                                                                                    | Type: []*json.RawMessage | Type: []*string | Type: []*float64 | Type: []*float64   | Type: []*json.RawMessage                                                                                                       | Type: []*bool | Type: []*string | Type: []*string | Type: []*string                         | Type: []*string                    | Type: []*json.RawMessage                                                        | Type: []*json.RawMessage |
-//  +-----------------------------------+---------------------------+----------------------+-----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------+-----------------+------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------+---------------+-----------------+-----------------+-----------------------------------------+------------------------------------+---------------------------------------------------------------------------------+--------------------------+
-//  | 2023-02-09 14:40:01.475 +0000 UTC | log text  [106619125]     | g2aeNoYB7vaC3bq-ezfK | logs-2023.02.09 | {"abc":null,"counter":81,"float":10.911972180833306,"is_true":true,"label":"val3","line":"log text  [106619125]","location":"-42.73465234425797, -14.097854057104112","lvl":"info","nested_field.internal.nested":"value1","shapes":[{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}],"testtime":"2023-02-09T14:40:01.475Z"}  | null                     | null            | 81               | 10.911972180833306 | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | true          | val3            | info            | -42.73465234425797, -14.097854057104112 | value1                             | [{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}] | [1675953601475,4]        |
-//  | 2023-02-09 14:40:00.513 +0000 UTC | log text with [781660944] | gmaeNoYB7vaC3bq-eDcN | logs-2023.02.09 | {"abc":null,"counter":80,"float":62.94120607636795,"is_true":false,"label":"val3","line":"log text with [781660944]","location":"42.07571917624318, 15.95725088484611","lvl":"error","nested_field.internal.nested":"value2","shapes":[{"type":"triangle"},{"type":"square"}],"testtime":"2023-02-09T14:40:00.513Z"}                                        | null                     | null            | 80               | 62.94120607636795  | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | false         | val3            | error           | 42.07571917624318, 15.95725088484611    | value2                             | [{"type":"triangle"},{"type":"square"}]                                         | [1675953600513,7]        |
-//  | 2023-02-09 14:39:59.556 +0000 UTC | log text  [894867430]     | gWaeNoYB7vaC3bq-dDdL | logs-2023.02.09 | {"abc":"def","counter":79,"float":53.323706427230455,"is_true":true,"label":"val1","line":"log text  [894867430]","location":"-38.27341566189766, -23.66739642570781","lvl":"info","nested_field.internal.nested":"value3","shapes":[{"type":"triangle"},{"type":"square"}],"testtime":"2023-02-09T14:39:59.556Z"}                                          | null                     | def             | 79               | 53.323706427230455 | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | true          | val1            | info            | -38.27341566189766, -23.66739642570781  | value3                             | [{"type":"triangle"},{"type":"square"}]                                         | [1675953599556,10]       |
-//  | 2023-02-09 14:39:58.608 +0000 UTC | log text  [478598889]     | gGaeNoYB7vaC3bq-cDeY | logs-2023.02.09 | {"abc":"def","counter":78,"float":82.72012623471589,"is_true":false,"label":"val1","line":"log text  [478598889]","location":"12.373240290451287, 43.265493464362024","lvl":"info","nested_field.internal.nested":"value4","shapes":[{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}],"testtime":"2023-02-09T14:39:58.608Z"}  | null                     | def             | 78               | 82.72012623471589  | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | false         | val1            | info            | 12.373240290451287, 43.265493464362024  | value4                             | [{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}] | [1675953598608,15]       |
-//  | 2023-02-09 14:39:57.665 +0000 UTC | log text  [526995818]     | f2aeNoYB7vaC3bq-bDf7 | logs-2023.02.09 | {"abc":"def","counter":77,"float":35.05784443331803,"is_true":false,"label":"val3","line":"log text  [526995818]","location":"-31.524344042228194, -32.11254790120572","lvl":"info","nested_field.internal.nested":"value5","shapes":[{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}],"testtime":"2023-02-09T14:39:57.665Z"} | null                     | def             | 77               | 35.05784443331803  | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | false         | val3            | info            | -31.524344042228194, -32.11254790120572 | value5                             | [{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}] | [1675953597665,20]       |
-//  +-----------------------------------+---------------------------+----------------------+-----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------+-----------------+------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------+---------------+-----------------+-----------------+-----------------------------------------+------------------------------------+---------------------------------------------------------------------------------+--------------------------+
+//  +-----------------------------------+---------------------------+----------------------+-----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------+-----------------+------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------+---------------+-----------------+-----------------+-----------------------------------------+------------------------------------+---------------------------------------------------------------------------------+--------------------------+
+//  | Name: testtime                    | Name: line                | Name: _id            | Name: _index    | Name: _source                                                                                                                                                                                                                                                                                                                                 | Name: _type              | Name: abc       | Name: counter    | Name: float        | Name: highlight                                                                                                                | Name: is_true | Name: label     | Name: level     | Name: location                          | Name: nested_field.internal.nested | Name: shapes                                                                    | Name: sort               |
+//  | Labels:                           | Labels:                   | Labels:              | Labels:         | Labels:                                                                                                                                                                                                                                                                                                                                       | Labels:                  | Labels:         | Labels:          | Labels:            | Labels:                                                                                                                        | Labels:       | Labels:         | Labels:         | Labels:                                 | Labels:                            | Labels:                                                                         | Labels:                  |
+//  | Type: []*time.Time                | Type: []*string           | Type: []*string      | Type: []*string | Type: []*json.RawMessage                                                                                                                                                                                                                                                                                                                      | Type: []*json.RawMessage | Type: []*string | Type: []*float64 | Type: []*float64   | Type: []*json.RawMessage                                                                                                       | Type: []*bool | Type: []*string | Type: []*string | Type: []*string                         | Type: []*string                    | Type: []*json.RawMessage                                                        | Type: []*json.RawMessage |
+//  +-----------------------------------+---------------------------+----------------------+-----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------+-----------------+------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------+---------------+-----------------+-----------------+-----------------------------------------+------------------------------------+---------------------------------------------------------------------------------+--------------------------+
+//  | 2023-02-09 14:40:01.475 +0000 UTC | log text  [106619125]     | g2aeNoYB7vaC3bq-ezfK | logs-2023.02.09 | {"abc":null,"counter":81,"float":10.911972180833306,"is_true":true,"label":"val3","line":"log text  [106619125]","location":"-42.73465234425797, -14.097854057104112","lvl":"info","nested_field.internal.nested":"value1","shapes":[{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}],"testtime":"09/02/2023"}  | null                     | null            | 81               | 10.911972180833306 | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | true          | val3            | info            | -42.73465234425797, -14.097854057104112 | value1                             | [{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}] | [1675953601475,4]        |
+//  | 2023-02-09 14:40:00.513 +0000 UTC | log text with [781660944] | gmaeNoYB7vaC3bq-eDcN | logs-2023.02.09 | {"abc":null,"counter":80,"float":62.94120607636795,"is_true":false,"label":"val3","line":"log text with [781660944]","location":"42.07571917624318, 15.95725088484611","lvl":"error","nested_field.internal.nested":"value2","shapes":[{"type":"triangle"},{"type":"square"}],"testtime":"09/02/2023"}                                        | null                     | null            | 80               | 62.94120607636795  | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | false         | val3            | error           | 42.07571917624318, 15.95725088484611    | value2                             | [{"type":"triangle"},{"type":"square"}]                                         | [1675953600513,7]        |
+//  | 2023-02-09 14:39:59.556 +0000 UTC | log text  [894867430]     | gWaeNoYB7vaC3bq-dDdL | logs-2023.02.09 | {"abc":"def","counter":79,"float":53.323706427230455,"is_true":true,"label":"val1","line":"log text  [894867430]","location":"-38.27341566189766, -23.66739642570781","lvl":"info","nested_field.internal.nested":"value3","shapes":[{"type":"triangle"},{"type":"square"}],"testtime":"09/02/2023"}                                          | null                     | def             | 79               | 53.323706427230455 | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | true          | val1            | info            | -38.27341566189766, -23.66739642570781  | value3                             | [{"type":"triangle"},{"type":"square"}]                                         | [1675953599556,10]       |
+//  | 2023-02-09 14:39:58.608 +0000 UTC | log text  [478598889]     | gGaeNoYB7vaC3bq-cDeY | logs-2023.02.09 | {"abc":"def","counter":78,"float":82.72012623471589,"is_true":false,"label":"val1","line":"log text  [478598889]","location":"12.373240290451287, 43.265493464362024","lvl":"info","nested_field.internal.nested":"value4","shapes":[{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}],"testtime":"09/02/2023"}  | null                     | def             | 78               | 82.72012623471589  | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | false         | val1            | info            | 12.373240290451287, 43.265493464362024  | value4                             | [{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}] | [1675953598608,15]       |
+//  | 2023-02-09 14:39:57.665 +0000 UTC | log text  [526995818]     | f2aeNoYB7vaC3bq-bDf7 | logs-2023.02.09 | {"abc":"def","counter":77,"float":35.05784443331803,"is_true":false,"label":"val3","line":"log text  [526995818]","location":"-31.524344042228194, -32.11254790120572","lvl":"info","nested_field.internal.nested":"value5","shapes":[{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}],"testtime":"09/02/2023"} | null                     | def             | 77               | 35.05784443331803  | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | false         | val3            | info            | -31.524344042228194, -32.11254790120572 | value5                             | [{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}] | [1675953597665,20]       |
+//  +-----------------------------------+---------------------------+----------------------+-----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------+-----------------+------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------+---------------+-----------------+-----------------+-----------------------------------------+------------------------------------+---------------------------------------------------------------------------------+--------------------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -292,7 +292,7 @@
                   "type": "square"
                 }
               ],
-              "testtime": "2023-02-09T14:40:01.475Z"
+              "testtime": "09/02/2023"
             },
             {
               "abc": null,
@@ -312,7 +312,7 @@
                   "type": "square"
                 }
               ],
-              "testtime": "2023-02-09T14:40:00.513Z"
+              "testtime": "09/02/2023"
             },
             {
               "abc": "def",
@@ -332,7 +332,7 @@
                   "type": "square"
                 }
               ],
-              "testtime": "2023-02-09T14:39:59.556Z"
+              "testtime": "09/02/2023"
             },
             {
               "abc": "def",
@@ -358,7 +358,7 @@
                   "type": "square"
                 }
               ],
-              "testtime": "2023-02-09T14:39:58.608Z"
+              "testtime": "09/02/2023"
             },
             {
               "abc": "def",
@@ -384,7 +384,7 @@
                   "type": "square"
                 }
               ],
-              "testtime": "2023-02-09T14:39:57.665Z"
+              "testtime": "09/02/2023"
             }
           ],
           [
diff --git a/pkg/tsdb/elasticsearch/testdata_response/logs.response.json b/pkg/tsdb/elasticsearch/testdata_response/logs.response.json
index d0aacacf455..061019ec19b 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/logs.response.json
+++ b/pkg/tsdb/elasticsearch/testdata_response/logs.response.json
@@ -28,7 +28,7 @@
             "_source": {
               "abc": null,
               "is_true": true,
-              "testtime": "2023-02-09T14:40:01.475Z",
+              "testtime": "09/02/2023",
               "line": "log text  [106619125]",
               "counter": 81,
               "float": 10.911972180833306,
@@ -55,6 +55,11 @@
                 }
               }
             },
+            "fields": {
+              "testtime": [
+                "2023-02-09T14:40:01.475Z"
+              ]
+            }, 
             "sort": [
               1675953601475,
               4
@@ -71,7 +76,7 @@
             "_source": {
               "abc": null,
               "is_true": false,
-              "testtime": "2023-02-09T14:40:00.513Z",
+              "testtime": "09/02/2023",
               "line": "log text with [781660944]",
               "counter": 80,
               "float": 62.94120607636795,
@@ -92,6 +97,11 @@
                 }
               }
             },
+            "fields": {
+              "testtime": [
+                "2023-02-09T14:40:00.513Z"
+              ]
+            }, 
             "sort": [
               1675953600513,
               7
@@ -108,7 +118,7 @@
             "_source": {
               "abc": "def",
               "is_true": true,
-              "testtime": "2023-02-09T14:39:59.556Z",
+              "testtime": "09/02/2023",
               "line": "log text  [894867430]",
               "counter": 79,
               "float": 53.323706427230455,
@@ -129,6 +139,11 @@
                 }
               }
             },
+            "fields": {
+              "testtime": [
+                "2023-02-09T14:39:59.556Z"
+              ]
+            }, 
             "sort": [
               1675953599556,
               10
@@ -145,7 +160,7 @@
             "_source": {
               "abc": "def",
               "is_true": false,
-              "testtime": "2023-02-09T14:39:58.608Z",
+              "testtime": "09/02/2023",
               "line": "log text  [478598889]",
               "counter": 78,
               "float": 82.72012623471589,
@@ -172,6 +187,11 @@
                 }
               }
             },
+            "fields": {
+              "testtime": [
+                "2023-02-09T14:39:58.608Z"
+              ]
+            }, 
             "sort": [
               1675953598608,
               15
@@ -188,7 +208,7 @@
             "_source": {
               "abc": "def",
               "is_true": false,
-              "testtime": "2023-02-09T14:39:57.665Z",
+             "testtime": "09/02/2023",
               "line": "log text  [526995818]",
               "counter": 77,
               "float": 35.05784443331803,
@@ -215,6 +235,11 @@
                 }
               }
             },
+            "fields": {
+              "testtime": [
+                "2023-02-09T14:39:57.665Z"
+              ]
+            }, 
             "sort": [
               1675953597665,
               20

From a4c7450c427b1aa9703938083fe0e176c6048179 Mon Sep 17 00:00:00 2001
From: owensmallwood <owen.smallwood@grafana.com>
Date: Thu, 4 May 2023 11:42:48 -0600
Subject: [PATCH 641/729] Grafana: Upgrades mysql images from 5.7 to 8 (#67604)

adds mysql integration build step for mysql 8
---
 .drone.yml                                    | 303 +++++++++++++++---
 devenv/docker/blocks/mysql/.env               |   2 +-
 devenv/docker/blocks/mysql_tests/.env         |   2 +-
 devenv/docker/blocks/mysql_tests/Dockerfile   |   2 +-
 .../docker-compose.yaml                       |   2 +-
 devenv/docker/ha_test/docker-compose.yaml     |   2 +-
 scripts/drone/events/release.star             |   9 +-
 .../drone/pipelines/integration_tests.star    |   3 +-
 scripts/drone/services/services.star          |  19 +-
 scripts/drone/steps/lib.star                  |  10 +-
 10 files changed, 289 insertions(+), 65 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0350009bf9d..fd9fa92b69d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -797,9 +797,21 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
   image: mysql:5.7.39
-  name: mysql
+  name: mysql57
   volumes:
-  - name: mysql
+  - name: mysql57
+    path: /var/lib/mysql
+- commands:
+  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
+  environment:
+    MYSQL_DATABASE: grafana_tests
+    MYSQL_PASSWORD: password
+    MYSQL_ROOT_PASSWORD: rootpass
+    MYSQL_USER: grafana
+  image: mysql:8.0.32
+  name: mysql80
+  volumes:
+  - name: mysql80
     path: /var/lib/mysql
 - environment: {}
   image: redis:6.2.11-alpine
@@ -890,8 +902,8 @@ steps:
 - commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+  - dockerize -wait tcp://mysql57:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
     -prootpass
   - go clean -testcache
   - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -901,9 +913,26 @@ steps:
   - wire-install
   environment:
     GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
+    MYSQL_HOST: mysql57
   image: grafana/build-container:1.7.4
-  name: mysql-integration-tests
+  name: mysql-5.7-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql80:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
+  depends_on:
+  - wire-install
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql80
+  image: grafana/build-container:1.7.4
+  name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - go clean -testcache
@@ -947,7 +976,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -1832,9 +1864,21 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
   image: mysql:5.7.39
-  name: mysql
+  name: mysql57
   volumes:
-  - name: mysql
+  - name: mysql57
+    path: /var/lib/mysql
+- commands:
+  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
+  environment:
+    MYSQL_DATABASE: grafana_tests
+    MYSQL_PASSWORD: password
+    MYSQL_ROOT_PASSWORD: rootpass
+    MYSQL_USER: grafana
+  image: mysql:8.0.32
+  name: mysql80
+  volumes:
+  - name: mysql80
     path: /var/lib/mysql
 - environment: {}
   image: redis:6.2.11-alpine
@@ -1903,8 +1947,8 @@ steps:
 - commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+  - dockerize -wait tcp://mysql57:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
     -prootpass
   - go clean -testcache
   - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -1914,9 +1958,26 @@ steps:
   - wire-install
   environment:
     GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
+    MYSQL_HOST: mysql57
   image: grafana/build-container:1.7.4
-  name: mysql-integration-tests
+  name: mysql-5.7-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql80:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
+  depends_on:
+  - wire-install
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql80
+  image: grafana/build-container:1.7.4
+  name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - go clean -testcache
@@ -1954,7 +2015,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -3482,7 +3546,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -3730,7 +3797,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -4998,7 +5068,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -5160,9 +5233,21 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
   image: mysql:5.7.39
-  name: mysql
+  name: mysql57
   volumes:
-  - name: mysql
+  - name: mysql57
+    path: /var/lib/mysql
+- commands:
+  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
+  environment:
+    MYSQL_DATABASE: grafana_tests
+    MYSQL_PASSWORD: password
+    MYSQL_ROOT_PASSWORD: rootpass
+    MYSQL_USER: grafana
+  image: mysql:8.0.32
+  name: mysql80
+  volumes:
+  - name: mysql80
     path: /var/lib/mysql
 - environment: {}
   image: redis:6.2.11-alpine
@@ -5224,8 +5309,8 @@ steps:
 - commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+  - dockerize -wait tcp://mysql57:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
     -prootpass
   - go clean -testcache
   - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -5235,9 +5320,26 @@ steps:
   - wire-install
   environment:
     GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
+    MYSQL_HOST: mysql57
   image: grafana/build-container:1.7.4
-  name: mysql-integration-tests
+  name: mysql-5.7-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql80:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
+  depends_on:
+  - wire-install
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql80
+  image: grafana/build-container:1.7.4
+  name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - go clean -testcache
@@ -5269,7 +5371,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -5628,7 +5733,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -5852,9 +5960,21 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
   image: mysql:5.7.39
-  name: mysql
+  name: mysql57
   volumes:
-  - name: mysql
+  - name: mysql57
+    path: /var/lib/mysql
+- commands:
+  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
+  environment:
+    MYSQL_DATABASE: grafana_tests
+    MYSQL_PASSWORD: password
+    MYSQL_ROOT_PASSWORD: rootpass
+    MYSQL_USER: grafana
+  image: mysql:8.0.32
+  name: mysql80
+  volumes:
+  - name: mysql80
     path: /var/lib/mysql
 - environment: {}
   image: redis:6.2.11-alpine
@@ -5943,8 +6063,8 @@ steps:
 - commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+  - dockerize -wait tcp://mysql57:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
     -prootpass
   - go clean -testcache
   - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -5954,9 +6074,26 @@ steps:
   - wire-install
   environment:
     GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
+    MYSQL_HOST: mysql57
   image: grafana/build-container:1.7.4
-  name: mysql-integration-tests
+  name: mysql-5.7-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql80:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
+  depends_on:
+  - wire-install
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql80
+  image: grafana/build-container:1.7.4
+  name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - go clean -testcache
@@ -5988,7 +6125,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -6315,7 +6455,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -6350,9 +6493,21 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
   image: mysql:5.7.39
-  name: mysql
+  name: mysql57
   volumes:
-  - name: mysql
+  - name: mysql57
+    path: /var/lib/mysql
+- commands:
+  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
+  environment:
+    MYSQL_DATABASE: grafana_tests
+    MYSQL_PASSWORD: password
+    MYSQL_ROOT_PASSWORD: rootpass
+    MYSQL_USER: grafana
+  image: mysql:8.0.32
+  name: mysql80
+  volumes:
+  - name: mysql80
     path: /var/lib/mysql
 - environment: {}
   image: redis:6.2.11-alpine
@@ -6414,8 +6569,8 @@ steps:
 - commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+  - dockerize -wait tcp://mysql57:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
     -prootpass
   - go clean -testcache
   - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -6425,9 +6580,26 @@ steps:
   - wire-install
   environment:
     GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
+    MYSQL_HOST: mysql57
   image: grafana/build-container:1.7.4
-  name: mysql-integration-tests
+  name: mysql-5.7-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql80:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
+  depends_on:
+  - wire-install
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql80
+  image: grafana/build-container:1.7.4
+  name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - go clean -testcache
@@ -6460,7 +6632,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -6495,9 +6670,21 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
   image: mysql:5.7.39
-  name: mysql
+  name: mysql57
   volumes:
-  - name: mysql
+  - name: mysql57
+    path: /var/lib/mysql
+- commands:
+  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
+  environment:
+    MYSQL_DATABASE: grafana_tests
+    MYSQL_PASSWORD: password
+    MYSQL_ROOT_PASSWORD: rootpass
+    MYSQL_USER: grafana
+  image: mysql:8.0.32
+  name: mysql80
+  volumes:
+  - name: mysql80
     path: /var/lib/mysql
 - environment: {}
   image: redis:6.2.11-alpine
@@ -6587,8 +6774,8 @@ steps:
 - commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
-  - dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root
+  - dockerize -wait tcp://mysql57:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
     -prootpass
   - go clean -testcache
   - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
@@ -6598,9 +6785,26 @@ steps:
   - wire-install
   environment:
     GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
+    MYSQL_HOST: mysql57
   image: grafana/build-container:1.7.4
-  name: mysql-integration-tests
+  name: mysql-5.7-integration-tests
+- commands:
+  - apt-get update
+  - apt-get install -yq default-mysql-client
+  - dockerize -wait tcp://mysql80:3306 -timeout 120s
+  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
+    -prootpass
+  - go clean -testcache
+  - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
+    ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
+    | grep -o '\(.*\)/' | sort -u)
+  depends_on:
+  - wire-install
+  environment:
+    GRAFANA_TEST_DB: mysql
+    MYSQL_HOST: mysql80
+  image: grafana/build-container:1.7.4
+  name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - go clean -testcache
@@ -6633,7 +6837,10 @@ volumes:
 - name: postgres
   temp:
     medium: memory
-- name: mysql
+- name: mysql57
+  temp:
+    medium: memory
+- name: mysql80
   temp:
     medium: memory
 ---
@@ -6941,6 +7148,6 @@ kind: secret
 name: github_token
 ---
 kind: signature
-hmac: e7a06868456687331f07e34fec5eb6ec45d2b987564ba7ec11d7f29bfa6a98c9
+hmac: 1a5358f92b6ca848288fb7917e62b994430c89eaa43ac2e5c1de49df359886d5
 
 ...
diff --git a/devenv/docker/blocks/mysql/.env b/devenv/docker/blocks/mysql/.env
index 149162e38c2..3a9117f5ede 100644
--- a/devenv/docker/blocks/mysql/.env
+++ b/devenv/docker/blocks/mysql/.env
@@ -1 +1 @@
-mysql_version=5.7.39
+mysql_version=8.0.32
diff --git a/devenv/docker/blocks/mysql_tests/.env b/devenv/docker/blocks/mysql_tests/.env
index 149162e38c2..3a9117f5ede 100644
--- a/devenv/docker/blocks/mysql_tests/.env
+++ b/devenv/docker/blocks/mysql_tests/.env
@@ -1 +1 @@
-mysql_version=5.7.39
+mysql_version=8.0.32
diff --git a/devenv/docker/blocks/mysql_tests/Dockerfile b/devenv/docker/blocks/mysql_tests/Dockerfile
index bc7b499ecf0..8021ec4dee8 100644
--- a/devenv/docker/blocks/mysql_tests/Dockerfile
+++ b/devenv/docker/blocks/mysql_tests/Dockerfile
@@ -1,4 +1,4 @@
-ARG mysql_version=5.7.39
+ARG mysql_version=8.0.32
 FROM mysql:${mysql_version}
 ADD setup.sql /docker-entrypoint-initdb.d
 RUN chown -R mysql:mysql /docker-entrypoint-initdb.d/
diff --git a/devenv/docker/ha-test-unified-alerting/docker-compose.yaml b/devenv/docker/ha-test-unified-alerting/docker-compose.yaml
index 12ec330b1f2..bca8412b913 100644
--- a/devenv/docker/ha-test-unified-alerting/docker-compose.yaml
+++ b/devenv/docker/ha-test-unified-alerting/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "2.1"
 
 services:
   db:
-    image: mysql:5.7.39
+    image: mysql:8.0.32
     platform: linux/x86_64
     environment:
       MYSQL_ROOT_PASSWORD: rootpass
diff --git a/devenv/docker/ha_test/docker-compose.yaml b/devenv/docker/ha_test/docker-compose.yaml
index 52cbe8634c1..812600f95e5 100644
--- a/devenv/docker/ha_test/docker-compose.yaml
+++ b/devenv/docker/ha_test/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
         tag: nginx
 
   db:
-    image: mysql:5.7.39
+    image: mysql:8.0.32
     environment:
       MYSQL_ROOT_PASSWORD: rootpass
       MYSQL_DATABASE: grafana
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index 0c30444b271..0875ada4194 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -202,7 +202,8 @@ def oss_pipelines(ver_mode = ver_mode, trigger = release_trigger):
 
     integration_test_steps = [
         postgres_integration_tests_step(),
-        mysql_integration_tests_step(),
+        mysql_integration_tests_step("mysql57", "5.7"),
+        mysql_integration_tests_step("mysql80", "8.0"),
         redis_integration_tests_step(),
         memcached_integration_tests_step(),
     ]
@@ -355,7 +356,8 @@ def enterprise_pipelines(ver_mode = ver_mode, trigger = release_trigger):
 
     integration_test_steps = [
         postgres_integration_tests_step(),
-        mysql_integration_tests_step(),
+        mysql_integration_tests_step("mysql57", "5.7"),
+        mysql_integration_tests_step("mysql80", "8.0"),
         redis_integration_tests_step(),
         memcached_integration_tests_step(),
     ]
@@ -738,7 +740,8 @@ def integration_test_pipelines():
     volumes = integration_test_services_volumes()
     integration_test_steps = [
         postgres_integration_tests_step(),
-        mysql_integration_tests_step(),
+        mysql_integration_tests_step("mysql57", "5.7"),
+        mysql_integration_tests_step("mysql80", "8.0"),
         redis_integration_tests_step(),
         memcached_integration_tests_step(),
     ]
diff --git a/scripts/drone/pipelines/integration_tests.star b/scripts/drone/pipelines/integration_tests.star
index 87276500809..f6330bc6dd4 100644
--- a/scripts/drone/pipelines/integration_tests.star
+++ b/scripts/drone/pipelines/integration_tests.star
@@ -67,7 +67,8 @@ def integration_tests(trigger, prefix, ver_mode = "pr"):
 
     test_steps = [
         postgres_integration_tests_step(),
-        mysql_integration_tests_step(),
+        mysql_integration_tests_step("mysql57", "5.7"),
+        mysql_integration_tests_step("mysql80", "8.0"),
         redis_integration_tests_step(),
         memcached_integration_tests_step(),
     ]
diff --git a/scripts/drone/services/services.star b/scripts/drone/services/services.star
index d5310032f30..93113810157 100644
--- a/scripts/drone/services/services.star
+++ b/scripts/drone/services/services.star
@@ -5,7 +5,8 @@ This module has functions for Drone services to be used in pipelines.
 def integration_test_services_volumes():
     return [
         {"name": "postgres", "temp": {"medium": "memory"}},
-        {"name": "mysql", "temp": {"medium": "memory"}},
+        {"name": "mysql57", "temp": {"medium": "memory"}},
+        {"name": "mysql80", "temp": {"medium": "memory"}},
     ]
 
 def integration_test_services():
@@ -24,7 +25,7 @@ def integration_test_services():
             ],
         },
         {
-            "name": "mysql",
+            "name": "mysql57",
             "image": "mysql:5.7.39",
             "environment": {
                 "MYSQL_ROOT_PASSWORD": "rootpass",
@@ -32,7 +33,19 @@ def integration_test_services():
                 "MYSQL_USER": "grafana",
                 "MYSQL_PASSWORD": "password",
             },
-            "volumes": [{"name": "mysql", "path": "/var/lib/mysql"}],
+            "volumes": [{"name": "mysql57", "path": "/var/lib/mysql"}],
+        },
+        {
+            "name": "mysql80",
+            "image": "mysql:8.0.32",
+            "environment": {
+                "MYSQL_ROOT_PASSWORD": "rootpass",
+                "MYSQL_DATABASE": "grafana_tests",
+                "MYSQL_USER": "grafana",
+                "MYSQL_PASSWORD": "password",
+            },
+            "volumes": [{"name": "mysql80", "path": "/var/lib/mysql"}],
+            "commands": ["docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"],
         },
         {
             "name": "redis",
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 510aa041e73..45527d377c1 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1113,22 +1113,22 @@ def postgres_integration_tests_step():
         "commands": cmds,
     }
 
-def mysql_integration_tests_step():
+def mysql_integration_tests_step(hostname, version):
     cmds = [
         "apt-get update",
         "apt-get install -yq default-mysql-client",
-        "dockerize -wait tcp://mysql:3306 -timeout 120s",
-        "cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root -prootpass",
+        "dockerize -wait tcp://{}:3306 -timeout 120s".format(hostname),
+        "cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h {} -P 3306 -u root -prootpass".format(hostname),
         "go clean -testcache",
         "go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' | grep -o '\\(.*\\)/' | sort -u)",
     ]
     return {
-        "name": "mysql-integration-tests",
+        "name": "mysql-{}-integration-tests".format(version),
         "image": build_image,
         "depends_on": ["wire-install"],
         "environment": {
             "GRAFANA_TEST_DB": "mysql",
-            "MYSQL_HOST": "mysql",
+            "MYSQL_HOST": hostname,
         },
         "commands": cmds,
     }

From e74e7fa82c81c980edfbde9e806713b25e7e6cd3 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Thu, 4 May 2023 13:44:20 -0600
Subject: [PATCH 642/729] docs: Canvas: Update docs for v10 (#67793)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
---
 .../panels-visualizations/visualizations/canvas/index.md      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/sources/panels-visualizations/visualizations/canvas/index.md b/docs/sources/panels-visualizations/visualizations/canvas/index.md
index 578f79039aa..d174271322a 100644
--- a/docs/sources/panels-visualizations/visualizations/canvas/index.md
+++ b/docs/sources/panels-visualizations/visualizations/canvas/index.md
@@ -54,6 +54,10 @@ When building a canvas panel, you can connect elements together to create more c
 
 {{< video-embed src="/media/docs/grafana/canvas-connections-9-4-0.mp4" max-width="750px" caption="Canvas connections demo" >}}
 
+You can set both the size and color of connections based on fixed or field values. To do so, enter into panel edit mode, select the connection, and modify the connection's properties in the panel editor.
+
+{{< figure src="/media/docs/grafana/screenshot-grafana-10-0-canvas-service-graph.png" max-width="750px" caption="Canvas service graph" >}}
+
 ## Canvas editing
 
 ### Inline editor

From e7cbe0276e3a6f41c31dd8e1ac16ccaa90b184f3 Mon Sep 17 00:00:00 2001
From: Elliot Kirk <elliot.s.kirk@gmail.com>
Date: Thu, 4 May 2023 17:35:10 -0700
Subject: [PATCH 643/729] Faro: Adding Faro data source selector feature toggle
 (#66623)

---
 .../configure-grafana/feature-toggles/index.md             | 1 +
 packages/grafana-data/src/types/featureToggles.gen.ts      | 1 +
 pkg/services/featuremgmt/registry.go                       | 7 +++++++
 pkg/services/featuremgmt/toggles_gen.csv                   | 1 +
 pkg/services/featuremgmt/toggles_gen.go                    | 4 ++++
 5 files changed, 14 insertions(+)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index ee00de1835e..dba553cc3fc 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -58,6 +58,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `alertingNoNormalState`              | Stop maintaining state of alerts that are not firing                                                                                                                                         |
 | `renderAuthJWT`                      | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
 | `enableElasticsearchBackendQuerying` | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                              |
+| `faroDatasourceSelector`             | Enable the data source selector within the Frontend Apps section of the Frontend Observability                                                                                               |
 | `enableDatagridEditing`              | Enables the edit functionality in the datagrid panel                                                                                                                                         |
 
 ## Alpha feature toggles
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 7875ba2d63a..a3e1fd422c7 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -95,5 +95,6 @@ export interface FeatureToggles {
   pluginsAPIManifestKey?: boolean;
   advancedDataSourcePicker?: boolean;
   opensearchDetectVersion?: boolean;
+  faroDatasourceSelector?: boolean;
   enableDatagridEditing?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index b142ca014f7..d8ccafd62f3 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -516,6 +516,13 @@ var (
 			FrontendOnly: true,
 			Owner:        awsPluginsSquad,
 		},
+		{
+			Name:         "faroDatasourceSelector",
+			Description:  "Enable the data source selector within the Frontend Apps section of the Frontend Observability ",
+			State:        FeatureStateBeta,
+			FrontendOnly: true,
+			Owner:        appO11ySquad,
+		},
 		{
 			Name:         "enableDatagridEditing",
 			Description:  "Enables the edit functionality in the datagrid panel",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 612ff973b0c..d71c6171a70 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -76,4 +76,5 @@ authenticationConfigUI,alpha,@grafana/grafana-authnz-team,false,false,false,fals
 pluginsAPIManifestKey,alpha,@grafana/plugins-platform-backend,false,false,false,false
 advancedDataSourcePicker,alpha,@grafana/dashboards-squad,false,false,false,true
 opensearchDetectVersion,alpha,@grafana/aws-plugins,false,false,false,true
+faroDatasourceSelector,beta,@grafana/app-o11y,false,false,false,true
 enableDatagridEditing,beta,@grafana/grafana-bi-squad,false,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index b1c017b10b1..53bb402ff0e 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -315,6 +315,10 @@ const (
 	// Enable version detection in OpenSearch
 	FlagOpensearchDetectVersion = "opensearchDetectVersion"
 
+	// FlagFaroDatasourceSelector
+	// Enable the data source selector within the Frontend Apps section of the Frontend Observability 
+	FlagFaroDatasourceSelector = "faroDatasourceSelector"
+
 	// FlagEnableDatagridEditing
 	// Enables the edit functionality in the datagrid panel
 	FlagEnableDatagridEditing = "enableDatagridEditing"

From 21459c7c97675e06b84e1bbe137623a93c47e23b Mon Sep 17 00:00:00 2001
From: Levente Balogh <balogh.levente.hu@gmail.com>
Date: Fri, 5 May 2023 09:38:18 +0200
Subject: [PATCH 644/729] Connections: Show core datasource plugins as well
 (#67815)

fix: add a new hook & selector that can show core plugins by default
---
 .../tabs/ConnectData/ConnectData.tsx          |  9 +-
 .../features/plugins/admin/pages/Browse.tsx   | 25 ++---
 .../app/features/plugins/admin/state/hooks.ts | 33 ++-----
 .../plugins/admin/state/selectors.test.ts     | 94 +++++++++++++------
 .../features/plugins/admin/state/selectors.ts | 74 ++++++++-------
 5 files changed, 133 insertions(+), 102 deletions(-)

diff --git a/public/app/features/connections/tabs/ConnectData/ConnectData.tsx b/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
index 52e2ac97b0f..cbd2d0a3264 100644
--- a/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
+++ b/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
@@ -4,7 +4,7 @@ import React, { useMemo, useState } from 'react';
 import { PluginType } from '@grafana/data';
 import { useStyles2, LoadingPlaceholder } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
-import { useGetAllWithFilters } from 'app/features/plugins/admin/state/hooks';
+import { useGetAll } from 'app/features/plugins/admin/state/hooks';
 import { AccessControlAction } from 'app/types';
 
 import { ROUTES } from '../../constants';
@@ -38,10 +38,9 @@ export function AddNewConnection() {
     setSearchTerm(e.currentTarget.value.toLowerCase());
   };
 
-  const { isLoading, error, plugins } = useGetAllWithFilters({
-    query: searchTerm,
-    filterBy: '',
-    filterByType: PluginType.datasource,
+  const { isLoading, error, plugins } = useGetAll({
+    keyword: searchTerm,
+    type: PluginType.datasource,
   });
 
   const cardGridItems = useMemo(
diff --git a/public/app/features/plugins/admin/pages/Browse.tsx b/public/app/features/plugins/admin/pages/Browse.tsx
index 8a78fc20c4d..ac1856c86cc 100644
--- a/public/app/features/plugins/admin/pages/Browse.tsx
+++ b/public/app/features/plugins/admin/pages/Browse.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React, { ReactElement } from 'react';
 import { useLocation } from 'react-router-dom';
 
-import { SelectableValue, GrafanaTheme2 } from '@grafana/data';
+import { SelectableValue, GrafanaTheme2, PluginType } from '@grafana/data';
 import { config, locationSearchToObject } from '@grafana/runtime';
 import { LoadingPlaceholder, Select, RadioButtonGroup, useStyles2, Tooltip, Field } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
@@ -16,7 +16,7 @@ import { PluginList } from '../components/PluginList';
 import { SearchField } from '../components/SearchField';
 import { Sorters } from '../helpers';
 import { useHistory } from '../hooks/useHistory';
-import { useGetAllWithFilters, useIsRemotePluginsAvailable, useDisplayMode } from '../state/hooks';
+import { useGetAll, useIsRemotePluginsAvailable, useDisplayMode } from '../state/hooks';
 import { PluginListDisplayMode } from '../types';
 
 export default function Browse({ route }: GrafanaRouteComponentProps): ReactElement | null {
@@ -27,16 +27,19 @@ export default function Browse({ route }: GrafanaRouteComponentProps): ReactElem
   const styles = useStyles2(getStyles);
   const history = useHistory();
   const remotePluginsAvailable = useIsRemotePluginsAvailable();
-  const query = (locationSearch.q as string) || '';
+  const keyword = (locationSearch.q as string) || '';
   const filterBy = (locationSearch.filterBy as string) || 'installed';
-  const filterByType = (locationSearch.filterByType as string) || 'all';
+  const filterByType = (locationSearch.filterByType as PluginType | 'all') || 'all';
   const sortBy = (locationSearch.sortBy as Sorters) || Sorters.nameAsc;
-  const { isLoading, error, plugins } = useGetAllWithFilters({
-    query,
-    filterBy,
-    filterByType,
-    sortBy,
-  });
+  const { isLoading, error, plugins } = useGetAll(
+    {
+      keyword,
+      type: filterByType !== 'all' ? filterByType : undefined,
+      isInstalled: filterBy === 'installed' ? true : undefined,
+      isCore: filterBy === 'installed' ? undefined : false, // We only would like to show core plugins when the user filters to installed plugins
+    },
+    sortBy
+  );
   const filterByOptions = [
     { value: 'all', label: 'All' },
     { value: 'installed', label: 'Installed' },
@@ -81,7 +84,7 @@ export default function Browse({ route }: GrafanaRouteComponentProps): ReactElem
       <Page.Contents>
         <HorizontalGroup wrap>
           <Field label="Search">
-            <SearchField value={query} onSearch={onSearch} />
+            <SearchField value={keyword} onSearch={onSearch} />
           </Field>
           <HorizontalGroup wrap className={styles.actionBar}>
             {/* Filter by type */}
diff --git a/public/app/features/plugins/admin/state/hooks.ts b/public/app/features/plugins/admin/state/hooks.ts
index 98fd4a43972..013e0b00b92 100644
--- a/public/app/features/plugins/admin/state/hooks.ts
+++ b/public/app/features/plugins/admin/state/hooks.ts
@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 
 import { PluginError } from '@grafana/data';
 import { useDispatch, useSelector } from 'app/types';
@@ -9,48 +9,31 @@ import { CatalogPlugin, PluginListDisplayMode } from '../types';
 import { fetchAll, fetchDetails, fetchRemotePlugins, install, uninstall, fetchAllLocal, unsetInstall } from './actions';
 import { setDisplayMode } from './reducer';
 import {
-  find,
-  selectAll,
+  selectPlugins,
   selectById,
   selectIsRequestPending,
   selectRequestError,
   selectIsRequestNotFetched,
   selectDisplayMode,
   selectPluginErrors,
+  type PluginFilters,
 } from './selectors';
 
-type Filters = {
-  query?: string; // Note: this will be an escaped regex string as it comes from `FilterInput`
-  filterBy?: string;
-  filterByType?: string;
-  sortBy?: Sorters;
-};
-
-export const useGetAllWithFilters = ({
-  query = '',
-  filterBy = 'installed',
-  filterByType = 'all',
-  sortBy = Sorters.nameAsc,
-}: Filters) => {
+export const useGetAll = (filters: PluginFilters, sortBy: Sorters = Sorters.nameAsc) => {
   useFetchAll();
 
-  const filtered = useSelector(find(query, filterBy, filterByType));
+  const selector = useMemo(() => selectPlugins(filters), [filters]);
+  const plugins = useSelector(selector);
   const { isLoading, error } = useFetchStatus();
-  const sortedAndFiltered = sortPlugins(filtered, sortBy);
+  const sortedPlugins = sortPlugins(plugins, sortBy);
 
   return {
     isLoading,
     error,
-    plugins: sortedAndFiltered,
+    plugins: sortedPlugins,
   };
 };
 
-export const useGetAll = (): CatalogPlugin[] => {
-  useFetchAll();
-
-  return useSelector(selectAll);
-};
-
 export const useGetSingle = (id: string): CatalogPlugin | undefined => {
   useFetchAll();
   useFetchDetails(id);
diff --git a/public/app/features/plugins/admin/state/selectors.test.ts b/public/app/features/plugins/admin/state/selectors.test.ts
index c038a4930f2..84441ca42af 100644
--- a/public/app/features/plugins/admin/state/selectors.test.ts
+++ b/public/app/features/plugins/admin/state/selectors.test.ts
@@ -3,64 +3,100 @@ import { configureStore } from 'app/store/configureStore';
 
 import { getCatalogPluginMock, getPluginsStateMock } from '../__mocks__';
 
-import { find } from './selectors';
+import { selectPlugins } from './selectors';
 
 describe('Plugins Selectors', () => {
-  describe('find()', () => {
+  describe('selectPlugins()', () => {
     const store = configureStore({
       plugins: getPluginsStateMock([
-        getCatalogPluginMock({ id: 'plugin-1', name: 'Plugin 1', isInstalled: true, type: PluginType.datasource }),
-        getCatalogPluginMock({ id: 'plugin-2', name: 'Plugin 2', isInstalled: true, type: PluginType.datasource }),
-        getCatalogPluginMock({ id: 'plugin-3', name: 'Plugin 3', isInstalled: true, type: PluginType.panel }),
-        getCatalogPluginMock({ id: 'plugin-4', name: 'Plugin 4', isInstalled: false, type: PluginType.panel }),
-        getCatalogPluginMock({ id: 'plugin-5', name: 'Plugin 5', isInstalled: true, type: PluginType.app }),
+        getCatalogPluginMock({
+          id: 'plugin-1',
+          name: 'Plugin 1',
+          isInstalled: true,
+          type: PluginType.datasource,
+          isCore: true,
+        }),
+        getCatalogPluginMock({
+          id: 'plugin-2',
+          name: 'Plugin 2',
+          isInstalled: true,
+          type: PluginType.datasource,
+          isCore: true,
+        }),
+        getCatalogPluginMock({
+          id: 'plugin-3',
+          name: 'Plugin 3',
+          isInstalled: true,
+          type: PluginType.panel,
+          isCore: false,
+        }),
+        getCatalogPluginMock({
+          id: 'plugin-4',
+          name: 'Plugin 4',
+          isInstalled: false,
+          type: PluginType.panel,
+          isCore: false,
+        }),
+        getCatalogPluginMock({
+          id: 'plugin-5',
+          name: 'Plugin 5',
+          isInstalled: true,
+          type: PluginType.app,
+          isCore: false,
+        }),
       ]),
     });
 
     it('should return all plugins if there are no filters', () => {
-      const query = '';
-      const filterBy = 'all';
-      const filterByType = 'all';
-      const results = find(query, filterBy, filterByType)(store.getState());
+      const results = selectPlugins({})(store.getState());
 
       expect(results).toHaveLength(5);
     });
 
-    it('should be possible to search only by the "query"', () => {
-      const query = 'Plugin 3';
-      const filterBy = 'all';
-      const filterByType = 'all';
-      const results = find(query, filterBy, filterByType)(store.getState());
+    it('should be possible to search only by the "keyword"', () => {
+      const results = selectPlugins({ keyword: 'Plugin 3' })(store.getState());
 
       expect(results).toHaveLength(1);
       expect(results[0].name).toBe('Plugin 3');
     });
 
     it('should be possible to search by plugin type', () => {
-      const query = '';
-      const filterBy = 'all';
-      const filterByType = PluginType.panel;
-      const results = find(query, filterBy, filterByType)(store.getState());
+      const results = selectPlugins({ type: PluginType.panel })(store.getState());
 
       expect(results).toHaveLength(2);
       expect(results.map(({ name }) => name)).toEqual(['Plugin 3', 'Plugin 4']);
     });
 
-    it('should be possible to search by plugin state (installed / all)', () => {
-      const query = '';
-      const filterBy = 'installed';
-      const filterByType = 'all';
-      const results = find(query, filterBy, filterByType)(store.getState());
+    it('should be possible to search for core plugins', () => {
+      const results = selectPlugins({ isCore: true })(store.getState());
+
+      expect(results).toHaveLength(2);
+      expect(results.map(({ name }) => name)).toEqual(['Plugin 1', 'Plugin 2']);
+    });
+
+    it('should be possible to exclude core plugins from the search', () => {
+      const results = selectPlugins({ isCore: false })(store.getState());
+
+      expect(results).toHaveLength(3);
+      expect(results.map(({ name }) => name)).toEqual(['Plugin 3', 'Plugin 4', 'Plugin 5']);
+    });
+
+    it('should be possible to only search for installed plugins', () => {
+      const results = selectPlugins({ isInstalled: true })(store.getState());
 
       expect(results).toHaveLength(4);
       expect(results.map(({ name }) => name)).toEqual(['Plugin 1', 'Plugin 2', 'Plugin 3', 'Plugin 5']);
     });
 
+    it('should be possible to only search for not yet installed plugins', () => {
+      const results = selectPlugins({ isInstalled: false })(store.getState());
+
+      expect(results).toHaveLength(1);
+      expect(results.map(({ name }) => name)).toEqual(['Plugin 4']);
+    });
+
     it('should be possible to search by multiple filters', () => {
-      const query = '2';
-      const filterBy = 'all';
-      const filterByType = PluginType.datasource;
-      const results = find(query, filterBy, filterByType)(store.getState());
+      const results = selectPlugins({ keyword: '2', type: PluginType.datasource })(store.getState());
 
       expect(results).toHaveLength(1);
       expect(results[0].name).toBe('Plugin 2');
diff --git a/public/app/features/plugins/admin/state/selectors.ts b/public/app/features/plugins/admin/state/selectors.ts
index f6068facdd8..c8360328d17 100644
--- a/public/app/features/plugins/admin/state/selectors.ts
+++ b/public/app/features/plugins/admin/state/selectors.ts
@@ -1,8 +1,8 @@
 import { createSelector } from '@reduxjs/toolkit';
 
-import { PluginError, PluginErrorCode, unEscapeStringFromRegex } from '@grafana/data';
+import { PluginError, PluginErrorCode, PluginType, unEscapeStringFromRegex } from '@grafana/data';
 
-import { RequestStatus, PluginCatalogStoreState, CatalogPlugin } from '../types';
+import { RequestStatus, PluginCatalogStoreState } from '../types';
 
 import { pluginsAdapter } from './reducer';
 
@@ -14,44 +14,54 @@ export const selectDisplayMode = createSelector(selectRoot, ({ settings }) => se
 
 export const { selectAll, selectById } = pluginsAdapter.getSelectors(selectItems);
 
-const findByState = (state: string) =>
-  createSelector(selectAll, (plugins) =>
-    plugins.filter((plugin) => (state === 'installed' ? plugin.isInstalled : !plugin.isCore))
-  );
+export type PluginFilters = {
+  // Searches for a string in certain fields (e.g. "name" or "orgName")
+  // (Note: this will be an escaped regex string as it comes from `FilterInput`)
+  keyword?: string;
 
-type PluginFilters = {
-  state: string;
-  type: string;
+  // (Optional, only applied if set)
+  type?: PluginType;
+
+  // (Optional, only applied if set)
+  isCore?: boolean;
+
+  // (Optional, only applied if set)
+  isInstalled?: boolean;
+
+  // (Optional, only applied if set)
+  isEnterprise?: boolean;
 };
 
-const findPluginsByFilters = (filters: PluginFilters) =>
-  createSelector(findByState(filters.state), (plugins) =>
-    plugins.filter((plugin) => filters.type === 'all' || plugin.type === filters.type)
-  );
+export const selectPlugins = (filters: PluginFilters) =>
+  createSelector(selectAll, (plugins) => {
+    const keyword = filters.keyword ? unEscapeStringFromRegex(filters.keyword.toLowerCase()) : '';
 
-const findByKeyword = (plugins: CatalogPlugin[], query: string) => {
-  if (query === '') {
-    return plugins;
-  }
+    return plugins.filter((plugin) => {
+      const fieldsToSearchIn = [plugin.name, plugin.orgName].filter(Boolean).map((f) => f.toLowerCase());
 
-  return plugins.filter((plugin) => {
-    const fields: String[] = [];
-    if (plugin.name) {
-      fields.push(plugin.name.toLowerCase());
-    }
+      if (keyword && !fieldsToSearchIn.some((f) => f.includes(keyword))) {
+        return false;
+      }
 
-    if (plugin.orgName) {
-      fields.push(plugin.orgName.toLowerCase());
-    }
+      if (filters.type && plugin.type !== filters.type) {
+        return false;
+      }
 
-    return fields.some((f) => f.includes(unEscapeStringFromRegex(query).toLowerCase()));
+      if (filters.isInstalled !== undefined && plugin.isInstalled !== filters.isInstalled) {
+        return false;
+      }
+
+      if (filters.isCore !== undefined && plugin.isCore !== filters.isCore) {
+        return false;
+      }
+
+      if (filters.isEnterprise !== undefined && plugin.isEnterprise !== filters.isEnterprise) {
+        return false;
+      }
+
+      return true;
+    });
   });
-};
-
-export const find = (searchBy: string, filterBy: string, filterByType: string) =>
-  createSelector(findPluginsByFilters({ state: filterBy, type: filterByType }), (filteredPlugins) =>
-    findByKeyword(filteredPlugins, searchBy)
-  );
 
 export const selectPluginErrors = createSelector(selectAll, (plugins) =>
   plugins

From fcb14d2548d68dadb981f24dd76489088dd232d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 5 May 2023 09:54:43 +0200
Subject: [PATCH 645/729] InspectDrawer: Fixes issue with double scrollbars
 (#67884)

* InspectDrawer: Fixes issue with double scrollbars

* Fixed minor issue
---
 packages/grafana-ui/src/components/Table/Table.tsx | 9 ++++++++-
 public/app/features/inspector/InspectDataTab.tsx   | 6 +-----
 public/app/features/inspector/styles.ts            | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index 2f59657fbd4..11559e32c57 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -318,7 +318,14 @@ export const Table = memo((props: Props) => {
   };
 
   return (
-    <div {...getTableProps()} className={tableStyles.table} aria-label={ariaLabel} role="table" ref={tableDivRef}>
+    <div
+      {...getTableProps()}
+      className={tableStyles.table}
+      aria-label={ariaLabel}
+      role="table"
+      ref={tableDivRef}
+      style={{ width, height }}
+    >
       <CustomScrollbar hideVerticalTrack={true}>
         <div className={tableStyles.tableContentWrapper(totalColumnsWidth)}>
           {!noHeader && (
diff --git a/public/app/features/inspector/InspectDataTab.tsx b/public/app/features/inspector/InspectDataTab.tsx
index 88e93c13984..666eff6d56f 100644
--- a/public/app/features/inspector/InspectDataTab.tsx
+++ b/public/app/features/inspector/InspectDataTab.tsx
@@ -285,11 +285,7 @@ export class InspectDataTab extends PureComponent<Props, State> {
                 return null;
               }
 
-              return (
-                <div style={{ width, height }}>
-                  <Table width={width} height={height} data={dataFrame} showTypeIcons={true} />
-                </div>
-              );
+              return <Table width={width} height={height} data={dataFrame} showTypeIcons={true} />;
             }}
           </AutoSizer>
         </div>
diff --git a/public/app/features/inspector/styles.ts b/public/app/features/inspector/styles.ts
index 9e72803d2fa..888793288ba 100644
--- a/public/app/features/inspector/styles.ts
+++ b/public/app/features/inspector/styles.ts
@@ -17,6 +17,7 @@ export const getPanelInspectorStyles2 = (theme: GrafanaTheme2) => {
       height: 100%;
       width: 100%;
       flex: 1 1 0;
+      min-height: 0;
     `,
     toolbar: css`
       display: flex;
@@ -32,7 +33,6 @@ export const getPanelInspectorStyles2 = (theme: GrafanaTheme2) => {
     content: css`
       flex-grow: 1;
       height: 100%;
-      overflow: scroll;
     `,
     editor: css`
       font-family: monospace;

From 20217db100983303588ffbebca68fd023c80f490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 5 May 2023 11:31:02 +0200
Subject: [PATCH 646/729] Drawer: Introduce a size property that set's width
 percentage and minWidth  (#67809)

* Drawer: Introduce drawer size that sets width and min-width

* media queries

* Change large drawer to 75%

* Change news drawer to medium as the news items have better layout then with images on the side

* Tweaks and fixed inline drawer issue

* review fixes

* Deprecate inline, update mdx docs

* remove inline var
---
 .../src/components/Drawer/Drawer.mdx          | 12 ++-
 .../src/components/Drawer/Drawer.story.tsx    | 38 +-------
 .../src/components/Drawer/Drawer.tsx          | 91 +++++++++++++------
 .../AppChrome/News/NewsContainer.tsx          |  7 +-
 .../components/HelpWizard/HelpWizard.tsx      |  2 +-
 .../components/Inspector/InspectContent.tsx   |  1 -
 .../SaveDashboard/SaveDashboardDrawer.tsx     |  1 -
 7 files changed, 82 insertions(+), 70 deletions(-)

diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.mdx b/packages/grafana-ui/src/components/Drawer/Drawer.mdx
index f8afb9b5c3d..26a2358e217 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.mdx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.mdx
@@ -21,10 +21,20 @@ onClose = () => {
 };
 
 return (
-  <Drawer title="This a Drawer" width="60%" onClose={this.onClose}>
+  <Drawer title="This a Drawer" size="md" onClose={this.onClose}>
     <div>Put your Drawer content here</div>
   </Drawer>
 );
 ```
 
+## Sizes
+
+The Drawer supports 3 sizes: `sm`, `md`, and `lg`. This option defines a width in percentage and as well as a min-width.
+
+- sm: width = 25vh and min-width = 384px
+- md: width = 50vh and min-width = 568px
+- lg: width = 75vh and min-width = 744px
+
+## Props
+
 <Props of={Drawer} />
diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
index 9ffec537740..d762336e438 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
@@ -22,7 +22,6 @@ const meta: ComponentMeta<typeof Drawer> = {
   args: {
     closeOnMaskClick: true,
     scrollableContent: false,
-    width: '40%',
     expandable: false,
     subtitle: 'This is a subtitle.',
   },
@@ -142,42 +141,6 @@ LongContent.args = {
   title: 'Drawer title with long content',
 };
 
-export const InLine: ComponentStory<typeof Drawer> = (args) => {
-  const [isOpen, setIsOpen] = useState(false);
-  return (
-    <>
-      <div
-        style={{
-          height: '300px',
-          width: '500px',
-          border: '1px solid white',
-          position: 'relative',
-          overflow: 'hidden',
-        }}
-      >
-        <Button onClick={() => setIsOpen(true)}>Open drawer</Button>
-        {isOpen && (
-          <Drawer {...args} onClose={() => setIsOpen(false)}>
-            <ul>
-              <li>this</li>
-              <li>is</li>
-              <li>a</li>
-              <li>list</li>
-              <li>of</li>
-              <li>menu</li>
-              <li>items</li>
-            </ul>
-          </Drawer>
-        )}
-      </div>
-    </>
-  );
-};
-InLine.args = {
-  title: 'Drawer title inline',
-  inline: true,
-};
-
 export const WithTabs: ComponentStory<typeof Drawer> = (args) => {
   const [isOpen, setIsOpen] = useState(false);
   const [activeTab, setActiveTab] = useState('options');
@@ -206,6 +169,7 @@ export const WithTabs: ComponentStory<typeof Drawer> = (args) => {
     </>
   );
 };
+
 WithTabs.args = {
   title: 'Drawer title with tabs',
 };
diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index 7c5efda7ba7..1aad5038d33 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -1,9 +1,9 @@
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import { useDialog } from '@react-aria/dialog';
 import { FocusScope } from '@react-aria/focus';
 import { useOverlay } from '@react-aria/overlays';
 import RcDrawer from 'rc-drawer';
-import React, { CSSProperties, ReactNode, useState, useEffect } from 'react';
+import React, { ReactNode, useState, useEffect } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -20,12 +20,21 @@ export interface Props {
   subtitle?: ReactNode;
   /** Should the Drawer be closable by clicking on the mask, defaults to true */
   closeOnMaskClick?: boolean;
-  /** Render the drawer inside a container on the page */
+  /** @deprecated */
   inline?: boolean;
-  /** Either a number in px or a string with unit postfix */
+  /**
+   * @deprecated use the size property instead
+   **/
   width?: number | string;
   /** Should the Drawer be expandable to full width */
   expandable?: boolean;
+  /**
+   * Specifies the width and min-width.
+   * sm = width 25vw & min-width 384px
+   * md = width 50vw & min-width 568px
+   * lg = width 75vw & min-width 744px
+   **/
+  size?: 'sm' | 'md' | 'lg';
   /** Tabs */
   tabs?: React.ReactNode;
   /** Set to true if the component rendered within in drawer content has its own scroll */
@@ -36,20 +45,19 @@ export interface Props {
 
 export function Drawer({
   children,
-  inline = false,
   onClose,
   closeOnMaskClick = true,
   scrollableContent = false,
   title,
   subtitle,
-  width = '40%',
+  width,
+  size = 'md',
   expandable = false,
   tabs,
 }: Props) {
-  const drawerStyles = useStyles2(getStyles);
+  const styles = useStyles2(getStyles);
   const [isExpanded, setIsExpanded] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
-  const currentWidth = isExpanded ? '100%' : width;
   const overlayRef = React.useRef(null);
   const { dialogProps, titleProps } = useDialog({}, overlayRef);
   const { overlayProps } = useOverlay(
@@ -66,31 +74,29 @@ export function Drawer({
     setIsOpen(true);
   }, []);
 
-  const content = <div className={drawerStyles.content}>{children}</div>;
-  const style: CSSProperties = {};
-  if (inline) {
-    style.position = 'absolute';
-  }
+  // deprecated width prop now defaults to empty string which make the size prop take over
+  const fixedWidth = isExpanded ? '100%' : width ?? '';
+  const rootClass = cx(styles.drawer, !fixedWidth && styles.sizes[size]);
+  const content = <div className={styles.content}>{children}</div>;
 
   return (
     <RcDrawer
       open={isOpen}
       onClose={onClose}
       placement="right"
-      width={currentWidth}
-      getContainer={inline ? undefined : 'body'}
-      style={style}
-      className={drawerStyles.drawerContent}
-      rootClassName={drawerStyles.drawer}
+      width={fixedWidth}
+      getContainer={'.main-view'}
+      className={styles.drawerContent}
+      rootClassName={rootClass}
       motion={{
         motionAppear: true,
-        motionName: drawerStyles.drawerMotion,
+        motionName: styles.drawerMotion,
       }}
-      maskClassName={drawerStyles.mask}
+      maskClassName={styles.mask}
       maskClosable={closeOnMaskClick}
       maskMotion={{
         motionAppear: true,
-        motionName: drawerStyles.maskMotion,
+        motionName: styles.maskMotion,
       }}
     >
       <FocusScope restoreFocus contain autoFocus>
@@ -100,14 +106,14 @@ export function Drawer({
               ? selectors.components.Drawer.General.title(title)
               : selectors.components.Drawer.General.title('no title')
           }
-          className={drawerStyles.container}
+          className={styles.container}
           {...overlayProps}
           {...dialogProps}
           ref={overlayRef}
         >
           {typeof title === 'string' && (
-            <div className={drawerStyles.header}>
-              <div className={drawerStyles.actions}>
+            <div className={styles.header}>
+              <div className={styles.actions}>
                 {expandable && !isExpanded && (
                   <IconButton
                     name="angle-left"
@@ -131,16 +137,16 @@ export function Drawer({
                   aria-label={selectors.components.Drawer.General.close}
                 />
               </div>
-              <div className={drawerStyles.titleWrapper}>
+              <div className={styles.titleWrapper}>
                 <h3 {...titleProps}>{title}</h3>
                 {typeof subtitle === 'string' && <div className="muted">{subtitle}</div>}
                 {typeof subtitle !== 'string' && subtitle}
-                {tabs && <div className={drawerStyles.tabsWrapper}>{tabs}</div>}
+                {tabs && <div className={styles.tabsWrapper}>{tabs}</div>}
               </div>
             </div>
           )}
           {typeof title !== 'string' && title}
-          <div className={drawerStyles.contentScroll}>
+          <div className={styles.contentScroll}>
             {!scrollableContent ? content : <CustomScrollbar autoHeightMin="100%">{content}</CustomScrollbar>}
           </div>
         </div>
@@ -162,10 +168,39 @@ const getStyles = (theme: GrafanaTheme2) => {
         box-shadow: ${theme.shadows.z3};
 
         ${theme.breakpoints.down('sm')} {
-          width: 100% !important;
+          width: calc(100% - ${theme.spacing(2)}) !important;
+          min-width: 0 !important;
         }
       }
     `,
+    sizes: {
+      sm: css({
+        '.rc-drawer-content-wrapper': {
+          label: 'drawer-sm',
+          width: '25vw',
+          minWidth: theme.spacing(48),
+        },
+      }),
+      md: css({
+        '.rc-drawer-content-wrapper': {
+          label: 'drawer-md',
+          width: '50vw',
+          minWidth: theme.spacing(66),
+        },
+      }),
+      lg: css({
+        '.rc-drawer-content-wrapper': {
+          label: 'drawer-lg',
+          width: '75vw',
+          minWidth: theme.spacing(93),
+
+          [theme.breakpoints.down('md')]: {
+            width: `calc(100% - ${theme.spacing(2)}) !important`,
+            minWidth: 0,
+          },
+        },
+      }),
+    },
     drawerContent: css`
       background-color: ${theme.colors.background.primary} !important;
       display: flex;
diff --git a/public/app/core/components/AppChrome/News/NewsContainer.tsx b/public/app/core/components/AppChrome/News/NewsContainer.tsx
index 727e4122570..80c6a2099f0 100644
--- a/public/app/core/components/AppChrome/News/NewsContainer.tsx
+++ b/public/app/core/components/AppChrome/News/NewsContainer.tsx
@@ -22,7 +22,12 @@ export function NewsContainer({ className }: NewsContainerProps) {
     <>
       <ToolbarButton className={className} onClick={onChildClick} iconOnly icon="rss" aria-label="News" />
       {showNewsDrawer && (
-        <Drawer title={t('news.title', 'Latest from the blog')} scrollableContent onClose={onToggleShowNewsDrawer}>
+        <Drawer
+          title={t('news.title', 'Latest from the blog')}
+          scrollableContent
+          onClose={onToggleShowNewsDrawer}
+          size="md"
+        >
           <NewsWrapper feedUrl={DEFAULT_FEED_URL} />
         </Drawer>
       )}
diff --git a/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx b/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
index f2af5932fbf..541dc7bba11 100644
--- a/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
+++ b/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
@@ -72,7 +72,7 @@ export function HelpWizard({ panel, plugin, onClose }: Props) {
   return (
     <Drawer
       title={`Get help with this panel`}
-      width="90%"
+      size="lg"
       onClose={onClose}
       expandable
       scrollableContent
diff --git a/public/app/features/dashboard/components/Inspector/InspectContent.tsx b/public/app/features/dashboard/components/Inspector/InspectContent.tsx
index 198dfec4f51..af5446806b9 100644
--- a/public/app/features/dashboard/components/Inspector/InspectContent.tsx
+++ b/public/app/features/dashboard/components/Inspector/InspectContent.tsx
@@ -68,7 +68,6 @@ export const InspectContent = ({
     <Drawer
       title={title}
       subtitle={data && formatStats(data)}
-      width="50%"
       onClose={onClose}
       expandable
       scrollableContent
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
index a411d3e67ae..5b02cbd731e 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
@@ -131,7 +131,6 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
     <Drawer
       title={title}
       onClose={onDismiss}
-      width={'40%'}
       subtitle={dashboard.title}
       tabs={
         <TabsBar>

From f5ac099907febb5c559f86e5e9960745013652af Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 5 May 2023 11:35:30 +0200
Subject: [PATCH 647/729] Elasticsearch: Run requestAllIndices trough resource
 call if enableElasticsearchBackendQuerying enabled (#67825)

* Elasticsearch: Run requestAllIndices trough resource call if enabled

* Unlock resource call path

* Fix lint
---
 pkg/tsdb/elasticsearch/elasticsearch.go       |   4 +-
 .../elasticsearch/datasource.test.ts          | 174 ++++++++++++++++++
 .../datasource/elasticsearch/datasource.ts    |  11 +-
 3 files changed, 184 insertions(+), 5 deletions(-)

diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go
index 0f714996d08..546345d070a 100644
--- a/pkg/tsdb/elasticsearch/elasticsearch.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch.go
@@ -11,6 +11,7 @@ import (
 	"net/url"
 	"path"
 	"strconv"
+	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
@@ -182,7 +183,8 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 	logger := eslog.FromContext(ctx)
 	// allowed paths for resource calls:
 	// - empty string for fetching db version
-	if req.Path != "" {
+	// - /?/_mapping for fetching index mapping
+	if req.Path != "" && !strings.HasSuffix(req.Path, "/_mapping") {
 		return fmt.Errorf("invalid resource URL: %s", req.Path)
 	}
 
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index ab9c07af866..149103c6ff7 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -1326,4 +1326,178 @@ describe('ElasticDatasource using backend', () => {
       expect(version).toBe(null);
     });
   });
+
+  describe('getFields', () => {
+    const getFieldsMockData = {
+      '[test-]YYYY.MM.DD': {
+        mappings: {
+          properties: {
+            '@timestamp_millis': {
+              type: 'date',
+              format: 'epoch_millis',
+            },
+            classification_terms: {
+              type: 'keyword',
+            },
+            ip_address: {
+              type: 'ip',
+            },
+            justification_blob: {
+              properties: {
+                criterion: {
+                  type: 'text',
+                  fields: {
+                    keyword: {
+                      type: 'keyword',
+                      ignore_above: 256,
+                    },
+                  },
+                },
+                shallow: {
+                  properties: {
+                    jsi: {
+                      properties: {
+                        sdb: {
+                          properties: {
+                            dsel2: {
+                              properties: {
+                                'bootlegged-gille': {
+                                  properties: {
+                                    botness: {
+                                      type: 'float',
+                                    },
+                                    general_algorithm_score: {
+                                      type: 'float',
+                                    },
+                                  },
+                                },
+                                'uncombed-boris': {
+                                  properties: {
+                                    botness: {
+                                      type: 'float',
+                                    },
+                                    general_algorithm_score: {
+                                      type: 'float',
+                                    },
+                                  },
+                                },
+                              },
+                            },
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+            overall_vote_score: {
+              type: 'float',
+            },
+          },
+        },
+      },
+    };
+
+    it('should not retry when ES is down', async () => {
+      const twoDaysBefore = toUtc().subtract(2, 'day').format('YYYY.MM.DD');
+      const { ds, timeSrv } = getTestContext({
+        from: 'now-2w',
+        jsonData: { interval: 'Daily' },
+      });
+
+      ds.getResource = jest.fn().mockImplementation((options) => {
+        if (options.url === `test-${twoDaysBefore}/_mapping`) {
+          return of({
+            data: {},
+          });
+        }
+        return throwError({ status: 500 });
+      });
+
+      const range = timeSrv.timeRange();
+      await expect(ds.getFields(undefined, range)).toEmitValuesWith((received) => {
+        expect(received.length).toBe(1);
+        expect(received[0]).toStrictEqual({ status: 500 });
+        expect(ds.getResource).toBeCalledTimes(1);
+      });
+    });
+
+    it('should not retry more than 7 indices', async () => {
+      const { ds, timeSrv } = getTestContext({
+        from: 'now-2w',
+        jsonData: { interval: 'Daily' },
+      });
+      const range = timeSrv.timeRange();
+
+      ds.getResource = jest.fn().mockImplementation(() => {
+        return throwError({ status: 404 });
+      });
+
+      await expect(ds.getFields(undefined, range)).toEmitValuesWith((received) => {
+        expect(received.length).toBe(1);
+        expect(received[0]).toStrictEqual('Could not find an available index for this time range.');
+        expect(ds.getResource).toBeCalledTimes(7);
+      });
+    });
+
+    it('should return nested fields', async () => {
+      const { ds } = getTestContext({
+        from: 'now-2w',
+        jsonData: { interval: 'Daily' },
+      });
+
+      ds.getResource = jest.fn().mockResolvedValue(getFieldsMockData);
+
+      await expect(ds.getFields()).toEmitValuesWith((received) => {
+        expect(received.length).toBe(1);
+
+        const fieldObjects = received[0];
+        const fields = map(fieldObjects, 'text');
+        expect(fields).toEqual([
+          '@timestamp_millis',
+          'classification_terms',
+          'ip_address',
+          'justification_blob.criterion.keyword',
+          'justification_blob.criterion',
+          'justification_blob.shallow.jsi.sdb.dsel2.bootlegged-gille.botness',
+          'justification_blob.shallow.jsi.sdb.dsel2.bootlegged-gille.general_algorithm_score',
+          'justification_blob.shallow.jsi.sdb.dsel2.uncombed-boris.botness',
+          'justification_blob.shallow.jsi.sdb.dsel2.uncombed-boris.general_algorithm_score',
+          'overall_vote_score',
+        ]);
+      });
+    });
+    it('should return number fields', async () => {
+      const { ds } = getTestContext({});
+      ds.getResource = jest.fn().mockResolvedValue(getFieldsMockData);
+
+      await expect(ds.getFields(['number'])).toEmitValuesWith((received) => {
+        expect(received.length).toBe(1);
+
+        const fieldObjects = received[0];
+        const fields = map(fieldObjects, 'text');
+        expect(fields).toEqual([
+          'justification_blob.shallow.jsi.sdb.dsel2.bootlegged-gille.botness',
+          'justification_blob.shallow.jsi.sdb.dsel2.bootlegged-gille.general_algorithm_score',
+          'justification_blob.shallow.jsi.sdb.dsel2.uncombed-boris.botness',
+          'justification_blob.shallow.jsi.sdb.dsel2.uncombed-boris.general_algorithm_score',
+          'overall_vote_score',
+        ]);
+      });
+    });
+
+    it('should return date fields', async () => {
+      const { ds } = getTestContext({});
+      ds.getResource = jest.fn().mockResolvedValue(getFieldsMockData);
+
+      await expect(ds.getFields(['date'])).toEmitValuesWith((received) => {
+        expect(received.length).toBe(1);
+
+        const fieldObjects = received[0];
+        const fields = map(fieldObjects, 'text');
+        expect(fields).toEqual(['@timestamp_millis']);
+      });
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 7f2f52da49d..6647112e8c9 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -179,9 +179,12 @@ export class ElasticDatasource
     }).pipe(
       mergeMap((index) => {
         // catch all errors and emit an object with an err property to simplify checks later in the pipeline
-        return this.legacyQueryRunner
-          .request('GET', indexUrlList[listLen - index - 1])
-          .pipe(catchError((err) => of({ err })));
+        const path = indexUrlList[listLen - index - 1];
+        const requestObservable = config.featureToggles.enableElasticsearchBackendQuerying
+          ? from(this.getResource(path))
+          : this.legacyQueryRunner.request('GET', path);
+
+        return requestObservable.pipe(catchError((err) => of({ err })));
       }),
       skipWhile((resp) => resp?.err?.status === 404), // skip all requests that fail because missing Elastic index
       throwIfEmpty(() => 'Could not find an available index for this time range.'), // when i === Math.min(listLen, maxTraversals) generate will complete but without emitting any values which means we didn't find a valid index
@@ -462,7 +465,7 @@ export class ElasticDatasource
             return true;
           }
 
-          // equal query type filter, or via typemap translation
+          // equal query type filter, or via type map translation
           return type.includes(obj.type) || type.includes(typeMap[obj.type]);
         };
 

From 6b51f9e06dda2be9fc32d02ca8b42046113a3934 Mon Sep 17 00:00:00 2001
From: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
Date: Fri, 5 May 2023 11:38:35 +0200
Subject: [PATCH 648/729] Update error message when Alertmanager configuration
 override (#67895)

---
 public/app/features/alerting/unified/state/actions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/alerting/unified/state/actions.ts b/public/app/features/alerting/unified/state/actions.ts
index e2835e7aff6..3e15c9ed9bc 100644
--- a/public/app/features/alerting/unified/state/actions.ts
+++ b/public/app/features/alerting/unified/state/actions.ts
@@ -580,7 +580,7 @@ export const updateAlertManagerConfigAction = createAsyncThunk<void, UpdateAlert
 
           if (!isLatestConfigEmpty && oldLastConfigsDiffer) {
             throw new Error(
-              'It seems configuration has been recently updated. Please reload page and try again to make sure that recent changes are not overwritten.'
+              'A newer Alertmanager configuration is available. Please reload the page and try again to not overwrite recent changes.'
             );
           }
           await updateAlertManagerConfig(alertManagerSourceName, addDefaultsToAlertmanagerConfig(newConfig));

From e5b12e23b12992cfd39537719e4c387e3dca5693 Mon Sep 17 00:00:00 2001
From: Vardan Torosyan <vardants@gmail.com>
Date: Fri, 5 May 2023 11:54:39 +0200
Subject: [PATCH 649/729] Docs: Add a note about disabling SAML UI (#67877)

---
 .../configure-authentication/saml-ui/index.md                   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
index 9b3cc4aaef3..885638a9bc3 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
@@ -20,6 +20,8 @@ The Grafana SAML UI provides the following advantages over configuring SAML in t
 
 > **Note:** Configuration in the UI takes precedence over the configuration in the Grafana configuration file. SAML settings from the UI will override any SAML configuration set in the Grafana configuration file.
 
+> **Note:** Disabling the UI does not affect any configuration settings that were previously set up through the UI. Those settings will continue to function as intended even with the UI disabled.
+
 ## Before you begin
 
 To follow this guide, you need:

From 11ea63d9ddee0bc9348f1a9033b2105a8e54286d Mon Sep 17 00:00:00 2001
From: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
Date: Fri, 5 May 2023 12:18:39 +0200
Subject: [PATCH 650/729] Optional team filter when sending issue notification
 on Slack (#67901)

---
 .github/teams.yml                   |  3 ++-
 .github/workflows/issue-labeled.yml | 24 ++++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/teams.yml b/.github/teams.yml
index 38b8e264661..366c2471cd8 100644
--- a/.github/teams.yml
+++ b/.github/teams.yml
@@ -7,4 +7,5 @@ test:
 
 # Alerting team
 area/alerting:
-  channel-label: C02B9MXQE0J
+  channel-label: C028MCV4R7C
+  exclude-github-team: alerting-squad
diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml
index dada3acf164..c6046ce7447 100644
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -1,4 +1,4 @@
-name: Notify Slack channel based on issue label
+name: Notify Slack channel based on new issue label
 
 on:
   issues:
@@ -15,6 +15,7 @@ jobs:
         run: |
           # Default to null values.
           CHANNEL="null"
+          TEAM="null"
 
           echo "${{ github.event.label.name }} label added"
           export CURRENT_LABEL="${{ github.event.label.name }}" # Enable the use of the label in yq evaluations
@@ -25,10 +26,16 @@ jobs:
               CHANNEL=$(yq '.[env(CURRENT_LABEL)].channel-label' teams.yml)
               echo "Ready to send issue to channel ID ${CHANNEL}"
             fi
+
+            if [[ $(yq '.[env(CURRENT_LABEL)] | has("exclude-github-team")' teams.yml ) == true ]]; then
+              TEAM=$(yq '.[env(CURRENT_LABEL)].exclude-github-team' teams.yml)
+              echo "Will not send issue to channel if issue author is part of the team ${TEAM}"
+            fi
           fi
 
-          # set environment for next step
+          # set environment for next steps
           echo "CHANNEL=${CHANNEL}" >> $GITHUB_ENV
+          echo "TEAM=${TEAM}" >> $GITHUB_ENV
 
       - name: "Prepare payload"
         uses: frabert/replace-string-action@v2.0
@@ -40,15 +47,24 @@ jobs:
           replace-with: "'"
           flags: 'g'
 
+      - name: "Check that issue author is not part of the team"
+        if: ${{ env.TEAM != 'null' }}
+        uses: tspascoal/get-user-teams-membership@v2
+        id: checkUserMember
+        with:
+          username: ${{ github.event.issue.user.login }}
+          team: "${{ env.TEAM }}"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: "Send Slack notification"
-        if: ${{ env.CHANNEL != 'null' }}
+        if: ${{ (env.CHANNEL != 'null') && ((steps.checkUserMember.outputs.isTeamMember == 'false') || (env.TEAM != 'null')) }}
         uses: slackapi/slack-github-action@v1.23.0
         with:
           payload: >
             {
               "icon_emoji": ":grafana:",
               "username": "Grafana issue labeled",
-              "text": "Issue \"${{ steps.preparePayload.outputs.replaced }}\" labeled \"${{ github.event.label.name }}\": ${{ github.event.issue.html_url }}",
+              "text": "Issue \"${{ steps.preparePayload.outputs.replaced }}\" labeled \"${{ github.event.label.name }}\": ${{ github.event.issue.html_url }}, please triage.",
               "channel": "${{ env.CHANNEL }}"
             }
         env:

From 5cb888650d740cfa19e715ea84d158349d814b76 Mon Sep 17 00:00:00 2001
From: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
Date: Fri, 5 May 2023 12:43:56 +0200
Subject: [PATCH 651/729] Change GitHub token in issue-labeled.yml workflow
 (#67905)

---
 .github/workflows/issue-labeled.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml
index c6046ce7447..10e9ca5a114 100644
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -54,7 +54,7 @@ jobs:
         with:
           username: ${{ github.event.issue.user.login }}
           team: "${{ env.TEAM }}"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
 
       - name: "Send Slack notification"
         if: ${{ (env.CHANNEL != 'null') && ((steps.checkUserMember.outputs.isTeamMember == 'false') || (env.TEAM != 'null')) }}

From eb2eb65de85704cff08d5bfba7cd552ca0ef323f Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Fri, 5 May 2023 13:57:57 +0300
Subject: [PATCH 652/729] TablePanel: Do not allow auto-reset (#67477)

disallow react table to autoreset
---
 packages/grafana-ui/src/components/Table/Table.tsx | 1 +
 public/app/plugins/panel/table/TablePanel.tsx      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index 11559e32c57..be2ed09f413 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -120,6 +120,7 @@ export const Table = memo((props: Props) => {
       data: memoizedData,
       disableResizing: !resizable,
       stateReducer: stateReducer,
+      autoResetPage: false,
       initialState: getInitialState(initialSortBy, memoizedColumns),
       autoResetFilters: false,
       sortTypes: {
diff --git a/public/app/plugins/panel/table/TablePanel.tsx b/public/app/plugins/panel/table/TablePanel.tsx
index a080c36b3cf..fcc50f96d31 100644
--- a/public/app/plugins/panel/table/TablePanel.tsx
+++ b/public/app/plugins/panel/table/TablePanel.tsx
@@ -41,7 +41,6 @@ export function TablePanel(props: Props) {
   const tableElement = (
     <Table
       height={tableHeight}
-      // This calculation is to accommodate the optionally rendered Row Numbers Column
       width={width}
       data={main}
       noHeader={!options.showHeader}

From af9176b3a54d5c82b5abf4ee20fa1efa914f5eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Fri, 5 May 2023 15:00:39 +0200
Subject: [PATCH 653/729] Elasticsearch: Improve query type selection (#63402)

* elastic: display query types explicitly

* fixed test

* fixed test

* updated test names

* fix react-key-issue
---
 .../MetricEditor.test.tsx                     | 46 ++++++++++++-
 .../MetricAggregationsEditor/MetricEditor.tsx |  1 +
 .../MetricAggregationsEditor/index.tsx        | 47 ++++++++++----
 .../QueryEditorSpecialMetricRow.tsx           | 36 +++++++++++
 .../QueryEditor/QueryTypeSelector.tsx         | 64 +++++++++++++++++++
 .../components/QueryEditor/index.test.tsx     | 15 +++--
 .../components/QueryEditor/index.tsx          | 42 +++++++-----
 7 files changed, 214 insertions(+), 37 deletions(-)
 create mode 100644 public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorSpecialMetricRow.tsx
 create mode 100644 public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryTypeSelector.tsx

diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx
index 995ecf3c128..3b844138b92 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx
@@ -1,4 +1,5 @@
 import { act, fireEvent, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React, { PropsWithChildren } from 'react';
 import { from } from 'rxjs';
 
@@ -9,7 +10,7 @@ import { defaultBucketAgg } from '../../../queryDef';
 import { ElasticsearchQuery } from '../../../types';
 import { ElasticsearchProvider } from '../ElasticsearchQueryContext';
 
-import { Average, UniqueCount } from './../../../types';
+import { Average, Count, UniqueCount } from './../../../types';
 import { MetricEditor } from './MetricEditor';
 
 describe('Metric Editor', () => {
@@ -85,4 +86,47 @@ describe('Metric Editor', () => {
     expect(await screen.findByText('No options found')).toBeInTheDocument();
     expect(screen.queryByText('None')).not.toBeInTheDocument();
   });
+
+  it('Should not list special metrics', async () => {
+    const count: Count = {
+      id: '1',
+      type: 'count',
+    };
+
+    const query: ElasticsearchQuery = {
+      refId: 'A',
+      query: '',
+      metrics: [count],
+      bucketAggs: [],
+    };
+
+    const getDatabaseVersion: ElasticDatasource['getDatabaseVersion'] = jest.fn(() => Promise.resolve(null));
+
+    const wrapper = ({ children }: PropsWithChildren<{}>) => (
+      <ElasticsearchProvider
+        datasource={{ getDatabaseVersion } as ElasticDatasource}
+        query={query}
+        range={getDefaultTimeRange()}
+        onChange={() => {}}
+        onRunQuery={() => {}}
+      >
+        {children}
+      </ElasticsearchProvider>
+    );
+
+    render(<MetricEditor value={count} />, { wrapper });
+
+    act(() => {
+      userEvent.click(screen.getByText('Count'));
+    });
+
+    // we check if the list-of-options is visible by
+    // checking for an item to exist
+    expect(await screen.findByText('Extended Stats')).toBeInTheDocument();
+
+    // now we make sure the should-not-be-shown items are not shown
+    expect(screen.queryByText('Logs')).toBeNull();
+    expect(screen.queryByText('Raw Data')).toBeNull();
+    expect(screen.queryByText('Raw Document (deprecated)')).toBeNull();
+  });
 });
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx
index 14aad375418..a476ff13069 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx
@@ -48,6 +48,7 @@ const getTypeOptions = (
 
   return (
     Object.entries(metricAggregationConfig)
+      .filter(([_, config]) => !config.isSingleMetric)
       // Only showing metrics type supported by the version of ES.
       // if we cannot determine the version, we assume it is suitable.
       .filter(([_, { versionRange = '*' }]) => (esVersion != null ? satisfies(esVersion, versionRange) : true))
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
index c89cc86eef0..a916ef77ba9 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
@@ -4,6 +4,7 @@ import { useDispatch } from '../../../hooks/useStatelessReducer';
 import { IconButton } from '../../IconButton';
 import { useQuery } from '../ElasticsearchQueryContext';
 import { QueryEditorRow } from '../QueryEditorRow';
+import { QueryEditorSpecialMetricRow } from '../QueryEditorSpecialMetricRow';
 
 import { MetricAggregation } from './../../../types';
 import { MetricEditor } from './MetricEditor';
@@ -21,21 +22,39 @@ export const MetricAggregationsEditor = ({ nextId }: Props) => {
 
   return (
     <>
-      {metrics?.map((metric, index) => (
-        <QueryEditorRow
-          key={`${metric.type}-${metric.id}`}
-          label={`Metric (${metric.id})`}
-          hidden={metric.hide}
-          onHideClick={() => dispatch(toggleMetricVisibility(metric.id))}
-          onRemoveClick={totalMetrics > 1 && (() => dispatch(removeMetric(metric.id)))}
-        >
-          <MetricEditor value={metric} />
+      {metrics?.map((metric, index) => {
+        switch (metric.type) {
+          case 'logs':
+            return <QueryEditorSpecialMetricRow key={`${metric.type}-${metric.id}`} name="Logs" metric={metric} />;
+          case 'raw_data':
+            return <QueryEditorSpecialMetricRow key={`${metric.type}-${metric.id}`} name="Raw Data" metric={metric} />;
+          case 'raw_document':
+            return (
+              <QueryEditorSpecialMetricRow
+                key={`${metric.type}-${metric.id}`}
+                name="Raw Document"
+                metric={metric}
+                info="(NOTE: Raw document query type is deprecated)"
+              />
+            );
+          default:
+            return (
+              <QueryEditorRow
+                key={`${metric.type}-${metric.id}`}
+                label={`Metric (${metric.id})`}
+                hidden={metric.hide}
+                onHideClick={() => dispatch(toggleMetricVisibility(metric.id))}
+                onRemoveClick={totalMetrics > 1 && (() => dispatch(removeMetric(metric.id)))}
+              >
+                <MetricEditor value={metric} />
 
-          {!metricAggregationConfig[metric.type].isSingleMetric && index === 0 && (
-            <IconButton iconName="plus" onClick={() => dispatch(addMetric(nextId))} label="add" />
-          )}
-        </QueryEditorRow>
-      ))}
+                {!metricAggregationConfig[metric.type].isSingleMetric && index === 0 && (
+                  <IconButton iconName="plus" onClick={() => dispatch(addMetric(nextId))} label="add" />
+                )}
+              </QueryEditorRow>
+            );
+        }
+      })}
     </>
   );
 };
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorSpecialMetricRow.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorSpecialMetricRow.tsx
new file mode 100644
index 00000000000..67f30d472e7
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorSpecialMetricRow.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+
+import { InlineFieldRow, InlineLabel, InlineSegmentGroup } from '@grafana/ui';
+
+import { MetricAggregation } from '../../types';
+
+import { SettingsEditor } from './MetricAggregationsEditor/SettingsEditor';
+
+type Props = {
+  name: string;
+  metric: MetricAggregation;
+  info?: string;
+};
+
+export const QueryEditorSpecialMetricRow = ({ name, metric, info }: Props) => {
+  // this widget is only used in scenarios when there is only a single
+  // metric, so the array of "previousMetrics" (meaning all the metrics
+  // before the current metric), is an ampty-array
+  const previousMetrics: MetricAggregation[] = [];
+
+  return (
+    <InlineFieldRow>
+      <InlineSegmentGroup>
+        <InlineLabel width={17} as="div">
+          <span>{name}</span>
+        </InlineLabel>
+      </InlineSegmentGroup>
+      <SettingsEditor metric={metric} previousMetrics={previousMetrics} />
+      {info != null && (
+        <InlineSegmentGroup>
+          <InlineLabel>{info}</InlineLabel>
+        </InlineSegmentGroup>
+      )}
+    </InlineFieldRow>
+  );
+};
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryTypeSelector.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryTypeSelector.tsx
new file mode 100644
index 00000000000..9b8ade09bfa
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryTypeSelector.tsx
@@ -0,0 +1,64 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { RadioButtonGroup } from '@grafana/ui';
+
+import { useDispatch } from '../../hooks/useStatelessReducer';
+import { MetricAggregation } from '../../types';
+
+import { useQuery } from './ElasticsearchQueryContext';
+import { changeMetricType } from './MetricAggregationsEditor/state/actions';
+
+type QueryType = 'metrics' | 'logs' | 'raw_data' | 'raw_document';
+
+const OPTIONS: Array<SelectableValue<QueryType>> = [
+  { value: 'metrics', label: 'Metrics' },
+  { value: 'logs', label: 'Logs' },
+  { value: 'raw_data', label: 'Raw Data' },
+  { value: 'raw_document', label: 'Raw Document' },
+];
+
+function metricTypeToQueryType(type: MetricAggregation['type']): QueryType {
+  switch (type) {
+    case 'logs':
+    case 'raw_data':
+    case 'raw_document':
+      return type;
+    default:
+      return 'metrics';
+  }
+}
+
+function queryTypeToMetricType(type: QueryType): MetricAggregation['type'] {
+  switch (type) {
+    case 'logs':
+    case 'raw_data':
+    case 'raw_document':
+      return type;
+    case 'metrics':
+      return 'count';
+    default:
+      // should never happen
+      throw new Error(`invalid query type: ${type}`);
+  }
+}
+
+export const QueryTypeSelector = () => {
+  const query = useQuery();
+  const dispatch = useDispatch();
+
+  const firstMetric = query.metrics?.[0];
+
+  if (firstMetric == null) {
+    // not sure if this can really happen, but we should handle it anyway
+    return null;
+  }
+
+  const queryType = metricTypeToQueryType(firstMetric.type);
+
+  const onChange = (newQueryType: QueryType) => {
+    dispatch(changeMetricType({ id: firstMetric.id, type: queryTypeToMetricType(newQueryType) }));
+  };
+
+  return <RadioButtonGroup<QueryType> fullWidth={false} options={OPTIONS} value={queryType} onChange={onChange} />;
+};
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx
index b92fc8cfc8d..67c19e51607 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx
@@ -22,10 +22,15 @@ describe('QueryEditor', () => {
         metrics: [
           {
             id: '1',
-            type: 'raw_data',
+            type: 'count',
+          },
+        ],
+        bucketAggs: [
+          {
+            type: 'date_histogram',
+            id: '2',
           },
         ],
-        bucketAggs: [],
       };
 
       const onChange = jest.fn<void, [ElasticsearchQuery]>();
@@ -51,7 +56,7 @@ describe('QueryEditor', () => {
       expect(onChange.mock.calls[0][0].alias).toBe(newAlias);
     });
 
-    it('Should be disabled if last bucket aggregation is not Date Histogram', () => {
+    it('Should not be shown if last bucket aggregation is not Date Histogram', () => {
       const query: ElasticsearchQuery = {
         refId: 'A',
         query: '',
@@ -66,10 +71,10 @@ describe('QueryEditor', () => {
 
       render(<QueryEditor query={query} datasource={datasourceMock} onChange={noop} onRunQuery={noop} />);
 
-      expect(screen.getByLabelText('Alias')).toBeDisabled();
+      expect(screen.queryByLabelText('Alias')).toBeNull();
     });
 
-    it('Should be enabled if last bucket aggregation is Date Histogram', () => {
+    it('Should be shown if last bucket aggregation is Date Histogram', () => {
       const query: ElasticsearchQuery = {
         refId: 'A',
         query: '',
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx
index 69a4cb4be14..2e60a71865e 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx
@@ -15,6 +15,7 @@ import { BucketAggregationsEditor } from './BucketAggregationsEditor';
 import { ElasticsearchProvider } from './ElasticsearchQueryContext';
 import { MetricAggregationsEditor } from './MetricAggregationsEditor';
 import { metricAggregationConfig } from './MetricAggregationsEditor/utils';
+import { QueryTypeSelector } from './QueryTypeSelector';
 import { changeAliasPattern, changeQuery } from './state';
 
 export type ElasticQueryEditorProps = QueryEditorProps<ElasticDatasource, ElasticsearchQuery, ElasticsearchOptions>;
@@ -66,7 +67,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
   root: css`
     display: flex;
   `,
-  queryFieldWrapper: css`
+  queryItem: css`
     flex-grow: 1;
     margin: 0 ${theme.spacing(0.5)} ${theme.spacing(0.5)} 0;
   `,
@@ -80,14 +81,14 @@ export const ElasticSearchQueryField = ({ value, onChange }: { value?: string; o
   const styles = useStyles2(getStyles);
 
   return (
-    <div className={styles.queryFieldWrapper}>
+    <div className={styles.queryItem}>
       <QueryField
         query={value}
         // By default QueryField calls onChange if onBlur is not defined, this will trigger a rerender
         // And slate will claim the focus, making it impossible to leave the field.
         onBlur={() => {}}
         onChange={onChange}
-        placeholder="Lucene Query"
+        placeholder="Enter a lucene query"
         portalOrigin="elasticsearch"
       />
     </div>
@@ -109,22 +110,29 @@ const QueryEditorForm = ({ value }: Props) => {
   return (
     <>
       <div className={styles.root}>
-        <InlineLabel width={17}>Query</InlineLabel>
+        <InlineLabel width={17}>Query type</InlineLabel>
+        <div className={styles.queryItem}>
+          <QueryTypeSelector />
+        </div>
+      </div>
+      <div className={styles.root}>
+        <InlineLabel width={17}>Lucene Query</InlineLabel>
         <ElasticSearchQueryField onChange={(query) => dispatch(changeQuery(query))} value={value?.query} />
 
-        <InlineField
-          label="Alias"
-          labelWidth={15}
-          disabled={!isTimeSeriesQuery}
-          tooltip="Aliasing only works for timeseries queries (when the last group is 'Date Histogram'). For all other query types this field is ignored."
-        >
-          <Input
-            id={`ES-query-${value.refId}_alias`}
-            placeholder="Alias Pattern"
-            onBlur={(e) => dispatch(changeAliasPattern(e.currentTarget.value))}
-            defaultValue={value.alias}
-          />
-        </InlineField>
+        {isTimeSeriesQuery && (
+          <InlineField
+            label="Alias"
+            labelWidth={15}
+            tooltip="Aliasing only works for timeseries queries (when the last group is 'Date Histogram'). For all other query types this field is ignored."
+          >
+            <Input
+              id={`ES-query-${value.refId}_alias`}
+              placeholder="Alias Pattern"
+              onBlur={(e) => dispatch(changeAliasPattern(e.currentTarget.value))}
+              defaultValue={value.alias}
+            />
+          </InlineField>
+        )}
       </div>
 
       <MetricAggregationsEditor nextId={nextId} />

From a340d102a6bbd1467e994e0ee5727477e51104c6 Mon Sep 17 00:00:00 2001
From: Shirley <4163034+fridgepoet@users.noreply.github.com>
Date: Fri, 5 May 2023 15:03:50 +0200
Subject: [PATCH 654/729] CloudWatch: Update docs for cloudWatchDynamicLabels
 feature toggle removal and alias deprecation (#67386)

CloudWatch: Update docs for alias deprecation
---
 .../datasources/aws-cloudwatch/query-editor/index.md   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/sources/datasources/aws-cloudwatch/query-editor/index.md b/docs/sources/datasources/aws-cloudwatch/query-editor/index.md
index 2911fa63d72..ef7cd46de95 100644
--- a/docs/sources/datasources/aws-cloudwatch/query-editor/index.md
+++ b/docs/sources/datasources/aws-cloudwatch/query-editor/index.md
@@ -195,14 +195,10 @@ If the period field is left blank or set to `auto`, then it calculates automatic
 
 The label field allows you to override the default name of the metric legend using CloudWatch dynamic labels. If you're using a time-based dynamic label such as `${MIN_MAX_TIME_RANGE}`, then the legend value is derived from the current timezone specified in the time range picker. To see the full list of label patterns and the dynamic label limitations, refer to the [CloudWatch dynamic labels](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/graph-dynamic-labels.html) documentation.
 
-> **Alias pattern deprecation:** Since Grafana v9.0, dynamic labels replaced alias patterns in the CloudWatch data source.
+> **Alias pattern deprecation:** Since Grafana v10.0, the alias field has been deprecated and replaced by dynamic
+> labels.
 > Any existing alias pattern is migrated upon upgrade to a corresponding dynamic label pattern.
-> To use alias patterns instead of dynamic labels, set the feature toggle `cloudWatchDynamicLabels` to `false` in the [Grafana configuration file]({{< relref "../../../setup-grafana/configure-grafana/" >}}).
-> This reverts to the alias pattern system and uses the previous alias formatting logic.
-
-The alias field will be deprecated and removed in a release.
-During this interim period, we won't fix bugs related to the alias pattern system.
-For details on why we're changing this feature, refer to [issue #48434](https://github.com/grafana/grafana/issues/48434).
+> For details on this change, refer to [issue #48434](https://github.com/grafana/grafana/issues/48434).
 
 ## Query CloudWatch Logs
 

From 4abc56c583d66007c94abecfbeac76fd364422bf Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Fri, 5 May 2023 09:07:39 -0400
Subject: [PATCH 655/729] =?UTF-8?q?Prometheus:=20(Chore/Instrumentation)?=
 =?UTF-8?q?=20add=20trace=20spans=20for=20result=20proces=E2=80=A6=20(#678?=
 =?UTF-8?q?58)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prometheus: (Chore/Instrumentation) add trace spans for result processing
---
 pkg/tsdb/prometheus/querydata/response.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/prometheus/querydata/response.go b/pkg/tsdb/prometheus/querydata/response.go
index 4c4b2ff026a..713a0c149fe 100644
--- a/pkg/tsdb/prometheus/querydata/response.go
+++ b/pkg/tsdb/prometheus/querydata/response.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata/exemplar"
+	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
 	"github.com/grafana/grafana/pkg/util/converter"
 )
 
@@ -24,6 +25,9 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt
 		}
 	}()
 
+	ctx, endSpan := utils.StartTrace(ctx, s.tracer, "datasource.prometheus.parseResponse", []utils.Attribute{})
+	defer endSpan()
+
 	iter := jsoniter.Parse(jsoniter.ConfigDefault, res.Body, 1024)
 	r := converter.ReadPrometheusStyleResult(iter, converter.Options{
 		MatrixWideSeries: s.enableWideSeries,
@@ -46,13 +50,15 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt
 	}
 
 	if r.Error == nil {
-		r = s.processExemplars(q, r)
+		r = s.processExemplars(ctx, q, r)
 	}
 
 	return r
 }
 
-func (s *QueryData) processExemplars(q *models.Query, dr backend.DataResponse) backend.DataResponse {
+func (s *QueryData) processExemplars(ctx context.Context, q *models.Query, dr backend.DataResponse) backend.DataResponse {
+	_, endSpan := utils.StartTrace(ctx, s.tracer, "datasource.prometheus.processExemplars", []utils.Attribute{})
+	defer endSpan()
 	sampler := s.exemplarSampler()
 	labelTracker := exemplar.NewLabelTracker()
 

From 29e4df6a33e9f734572994dd26bcd819c40b2a3b Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 5 May 2023 13:46:53 +0000
Subject: [PATCH 656/729] Chore: Remove 'PerformanceBackend: flushing' log
 (#67915)

Remove 'PerformanceBackend: flushing' log
---
 public/app/core/services/echo/backends/PerformanceBackend.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/public/app/core/services/echo/backends/PerformanceBackend.ts b/public/app/core/services/echo/backends/PerformanceBackend.ts
index 5b3d9af2830..29ff37882bc 100644
--- a/public/app/core/services/echo/backends/PerformanceBackend.ts
+++ b/public/app/core/services/echo/backends/PerformanceBackend.ts
@@ -32,11 +32,6 @@ export class PerformanceBackend implements EchoBackend<PerformanceEvent, Perform
       return;
     }
 
-    // Currently we don't have an API for sending the metrics hence logging to console in dev environment
-    if (process.env.NODE_ENV === 'development') {
-      console.log('PerformanceBackend flushing:', this.buffer);
-    }
-
     backendSrv.post('/api/frontend-metrics', {
       events: this.buffer,
     });

From b8336fe910f18d3bdf53ffcb804cc039acd90fb1 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus.andersson@grafana.com>
Date: Fri, 5 May 2023 15:50:40 +0200
Subject: [PATCH 657/729] PluginExtensions: Make context read only with a proxy
 instead of object freeze (#67781)

* quick poc on how we could use proxies instead of object freeze for the extension context.

* wip

* wip

* added tests for readOnlyProxy.

* Changed so we use the read only proxy for the context instead of the frozen object.

* updated names according to feedback.
---
 .../extensions/getPluginExtensions.test.ts    | 15 ++--
 .../plugins/extensions/getPluginExtensions.ts | 10 ++-
 .../plugins/extensions/utils.test.tsx         | 90 ++++++++++++++++++-
 .../app/features/plugins/extensions/utils.tsx | 49 ++++++++++
 4 files changed, 154 insertions(+), 10 deletions(-)

diff --git a/public/app/features/plugins/extensions/getPluginExtensions.test.ts b/public/app/features/plugins/extensions/getPluginExtensions.test.ts
index 54d5b63b838..5002fa16c30 100644
--- a/public/app/features/plugins/extensions/getPluginExtensions.test.ts
+++ b/public/app/features/plugins/extensions/getPluginExtensions.test.ts
@@ -2,6 +2,7 @@ import { PluginExtensionLinkConfig, PluginExtensionTypes } from '@grafana/data';
 
 import { createPluginExtensionRegistry } from './createPluginExtensionRegistry';
 import { getPluginExtensions } from './getPluginExtensions';
+import { isReadOnlyProxy } from './utils';
 import { assertPluginExtensionLink } from './validators';
 
 describe('getPluginExtensions()', () => {
@@ -96,19 +97,19 @@ describe('getPluginExtensions()', () => {
     expect(link2.configure).toHaveBeenCalledTimes(1);
     expect(extensions).toHaveLength(0);
   });
-  test('should pass a frozen copy of the context to the configure() function', () => {
+  test('should pass a read only context to the configure() function', () => {
     const context = { title: 'New title from the context!' };
     const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
     const { extensions } = getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
     const [extension] = extensions;
-    const frozenContext = (link2.configure as jest.Mock).mock.calls[0][0];
+    const readOnlyContext = (link2.configure as jest.Mock).mock.calls[0][0];
 
     assertPluginExtensionLink(extension);
 
     expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(Object.isFrozen(frozenContext)).toBe(true);
+    expect(isReadOnlyProxy(readOnlyContext)).toBe(true);
     expect(() => {
-      frozenContext.title = 'New title';
+      readOnlyContext.title = 'New title';
     }).toThrow();
     expect(context.title).toBe('New title from the context!');
   });
@@ -247,7 +248,7 @@ describe('getPluginExtensions()', () => {
     expect(global.console.warn).toHaveBeenCalledWith('[Plugin Extensions] Something went wrong!');
   });
 
-  test('should pass a frozen copy of the context to the onClick() function', () => {
+  test('should pass a read only context to the onClick() function', () => {
     const context = { title: 'New title from the context!' };
 
     link2.path = undefined;
@@ -263,13 +264,13 @@ describe('getPluginExtensions()', () => {
     const helpers = (link2.onClick as jest.Mock).mock.calls[0][1];
 
     expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(Object.isFrozen(helpers.context)).toBe(true);
+    expect(isReadOnlyProxy(helpers.context)).toBe(true);
     expect(() => {
       helpers.context.title = 'New title';
     }).toThrow();
   });
 
-  test('should should not freeze the original context', () => {
+  test('should should not make original context read only', () => {
     const context = {
       title: 'New title from the context!',
       nested: { title: 'title' },
diff --git a/public/app/features/plugins/extensions/getPluginExtensions.ts b/public/app/features/plugins/extensions/getPluginExtensions.ts
index 7440528c4bc..071a67028b4 100644
--- a/public/app/features/plugins/extensions/getPluginExtensions.ts
+++ b/public/app/features/plugins/extensions/getPluginExtensions.ts
@@ -6,7 +6,13 @@ import {
 } from '@grafana/data';
 
 import type { PluginExtensionRegistry } from './types';
-import { isPluginExtensionLinkConfig, deepFreeze, logWarning, generateExtensionId, getEventHelpers } from './utils';
+import {
+  isPluginExtensionLinkConfig,
+  getReadOnlyProxy,
+  logWarning,
+  generateExtensionId,
+  getEventHelpers,
+} from './utils';
 import { assertIsNotPromise, assertLinkPathIsValid, assertStringProps, isPromise } from './validators';
 
 type GetExtensions = ({
@@ -21,7 +27,7 @@ type GetExtensions = ({
 
 // Returns with a list of plugin extensions for the given extension point
 export const getPluginExtensions: GetExtensions = ({ context, extensionPointId, registry }) => {
-  const frozenContext = context ? deepFreeze(context) : {};
+  const frozenContext = context ? getReadOnlyProxy(context) : {};
   const registryItems = registry[extensionPointId] ?? [];
   // We don't return the extensions separated by type, because in that case it would be much harder to define a sort-order for them.
   const extensions: PluginExtension[] = [];
diff --git a/public/app/features/plugins/extensions/utils.test.tsx b/public/app/features/plugins/extensions/utils.test.tsx
index 7c20bf2f2df..f814bd1df3b 100644
--- a/public/app/features/plugins/extensions/utils.test.tsx
+++ b/public/app/features/plugins/extensions/utils.test.tsx
@@ -1,6 +1,6 @@
 import { PluginExtensionLinkConfig, PluginExtensionTypes } from '@grafana/data';
 
-import { deepFreeze, isPluginExtensionLinkConfig, handleErrorsInFn } from './utils';
+import { deepFreeze, isPluginExtensionLinkConfig, handleErrorsInFn, getReadOnlyProxy } from './utils';
 
 describe('Plugin Extensions / Utils', () => {
   describe('deepFreeze()', () => {
@@ -219,4 +219,92 @@ describe('Plugin Extensions / Utils', () => {
       }).not.toThrow();
     });
   });
+
+  describe('getReadOnlyProxy()', () => {
+    it('should not be possible to modify values in proxied object', () => {
+      const proxy = getReadOnlyProxy({ a: 'a' });
+
+      expect(() => {
+        proxy.a = 'b';
+      }).toThrowError(TypeError);
+    });
+
+    it('should not be possible to modify values in proxied array', () => {
+      const proxy = getReadOnlyProxy([1, 2, 3]);
+
+      expect(() => {
+        proxy[0] = 2;
+      }).toThrowError(TypeError);
+    });
+
+    it('should not be possible to modify nested objects in proxied object', () => {
+      const proxy = getReadOnlyProxy({
+        a: {
+          c: 'c',
+        },
+        b: 'b',
+      });
+
+      expect(() => {
+        proxy.a.c = 'testing';
+      }).toThrowError(TypeError);
+    });
+
+    it('should not be possible to modify nested arrays in proxied object', () => {
+      const proxy = getReadOnlyProxy({
+        a: {
+          c: ['c', 'd'],
+        },
+        b: 'b',
+      });
+
+      expect(() => {
+        proxy.a.c[0] = 'testing';
+      }).toThrowError(TypeError);
+    });
+
+    it('should be possible to modify source object', () => {
+      const source = { a: 'b' };
+
+      getReadOnlyProxy(source);
+      source.a = 'c';
+
+      expect(source.a).toBe('c');
+    });
+
+    it('should be possible to modify source array', () => {
+      const source = ['a', 'b'];
+
+      getReadOnlyProxy(source);
+      source[0] = 'c';
+
+      expect(source[0]).toBe('c');
+    });
+
+    it('should be possible to modify nedsted objects in source object', () => {
+      const source = { a: { b: 'c' } };
+
+      getReadOnlyProxy(source);
+      source.a.b = 'd';
+
+      expect(source.a.b).toBe('d');
+    });
+
+    it('should be possible to modify nedsted arrays in source object', () => {
+      const source = { a: { b: ['c', 'd'] } };
+
+      getReadOnlyProxy(source);
+      source.a.b[0] = 'd';
+
+      expect(source.a.b[0]).toBe('d');
+    });
+
+    it('should be possible to call functions in proxied object', () => {
+      const proxy = getReadOnlyProxy({
+        a: () => 'testing',
+      });
+
+      expect(proxy.a()).toBe('testing');
+    });
+  });
 });
diff --git a/public/app/features/plugins/extensions/utils.tsx b/public/app/features/plugins/extensions/utils.tsx
index dd7de44c70a..8e02ff40c84 100644
--- a/public/app/features/plugins/extensions/utils.tsx
+++ b/public/app/features/plugins/extensions/utils.tsx
@@ -1,3 +1,4 @@
+import { isArray, isObject } from 'lodash';
 import React from 'react';
 
 import {
@@ -110,3 +111,51 @@ export function generateExtensionId(pluginId: string, extensionConfig: PluginExt
     .reduce((s, c) => (Math.imul(31, s) + c.charCodeAt(0)) | 0, 0)
     .toString();
 }
+
+const _isProxy = Symbol('isReadOnlyProxy');
+
+/**
+ * Returns a proxy that wraps the given object in a way that makes it read only.
+ * If you try to modify the object a TypeError exception will be thrown.
+ *
+ * @param obj The object to make read only
+ * @returns A new read only object, does not modify the original object
+ */
+export function getReadOnlyProxy<T extends object>(obj: T): T {
+  if (!obj || typeof obj !== 'object' || isReadOnlyProxy(obj)) {
+    return obj;
+  }
+
+  const cache = new WeakMap();
+
+  return new Proxy(obj, {
+    defineProperty: () => false,
+    deleteProperty: () => false,
+    isExtensible: () => false,
+    set: () => false,
+    get(target, prop, receiver) {
+      if (prop === _isProxy) {
+        return true;
+      }
+
+      const value = Reflect.get(target, prop, receiver);
+
+      if (isObject(value) || isArray(value)) {
+        if (!cache.has(value)) {
+          cache.set(value, getReadOnlyProxy(value));
+        }
+        return cache.get(value);
+      }
+
+      return value;
+    },
+  });
+}
+
+function isRecord(value: unknown): value is Record<string | number | symbol, unknown> {
+  return typeof value === 'object' && value !== null;
+}
+
+export function isReadOnlyProxy(value: unknown): boolean {
+  return isRecord(value) && value[_isProxy] === true;
+}

From c0bb4049811d0a3f4e3b8842338c5f9d2fa37743 Mon Sep 17 00:00:00 2001
From: Isabella Siu <Isabella.siu@grafana.com>
Date: Fri, 5 May 2023 10:41:40 -0400
Subject: [PATCH 658/729] CloudWatch: Use grafana-aws-sdk v0.15.0 (#67876)

Cloudwatch: Update grafana-aws-sdk
---
 go.mod | 2 +-
 go.sum | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index fb604764e12..967b0c8b1a7 100644
--- a/go.mod
+++ b/go.mod
@@ -57,7 +57,7 @@ require (
 	github.com/google/wire v0.5.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/grafana/alerting v0.0.0-20230428095912-33c5aa68a5ba
-	github.com/grafana/grafana-aws-sdk v0.12.0
+	github.com/grafana/grafana-aws-sdk v0.15.0
 	github.com/grafana/grafana-azure-sdk-go v1.6.0
 	github.com/grafana/grafana-plugin-sdk-go v0.160.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
diff --git a/go.sum b/go.sum
index 8b749978c97..1d845a72423 100644
--- a/go.sum
+++ b/go.sum
@@ -1290,6 +1290,8 @@ github.com/grafana/go-mssqldb v0.9.2 h1:FkyRJR4ywsT07iMtpFMHStrl8uuNkGIwp253Fee0
 github.com/grafana/go-mssqldb v0.9.2/go.mod h1:HTCsUqZdb7oIO7jc37YauiSB5C3P/13AnpctVWBhlus=
 github.com/grafana/grafana-aws-sdk v0.12.0 h1:eUjFdFZeZE+nyu/RMRz+qFxTBew69ToLBrbRhTbjkfM=
 github.com/grafana/grafana-aws-sdk v0.12.0/go.mod h1:rCXLYoMpPqF90U7XqgVJ1HIAopFVF0bB3SXBVEJIm3I=
+github.com/grafana/grafana-aws-sdk v0.15.0 h1:ZOPHQcC5NUFi1bLTwnju91G0KmGh1z+qXOKj9nDfxNs=
+github.com/grafana/grafana-aws-sdk v0.15.0/go.mod h1:rCXLYoMpPqF90U7XqgVJ1HIAopFVF0bB3SXBVEJIm3I=
 github.com/grafana/grafana-azure-sdk-go v1.6.0 h1:lxvH/mVY7gKBtJKhZ4B/6tIZFY7Jth97HxBA38olaxs=
 github.com/grafana/grafana-azure-sdk-go v1.6.0/go.mod h1:X4PdEQIYgHfn0KTa2ZTKvufhNz6jbCEKUQPZIlcyOGw=
 github.com/grafana/grafana-google-sdk-go v0.1.0 h1:LKGY8z2DSxKjYfr2flZsWgTRTZ6HGQbTqewE3JvRaNA=

From 848f1f0fb2d0b13112842301d1cdad0db9e4d27d Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Fri, 5 May 2023 15:45:48 +0100
Subject: [PATCH 659/729] Chore: change default log level (#64304)

raise log level

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
---
 pkg/util/errutil/status.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/util/errutil/status.go b/pkg/util/errutil/status.go
index 722d455cb6d..338cc0349a2 100644
--- a/pkg/util/errutil/status.go
+++ b/pkg/util/errutil/status.go
@@ -88,19 +88,19 @@ func (s CoreStatus) HTTPStatus() int {
 func (s CoreStatus) LogLevel() LogLevel {
 	switch s {
 	case StatusUnauthorized:
-		return LevelDebug
+		return LevelInfo
 	case StatusForbidden:
-		return LevelDebug
+		return LevelInfo
 	case StatusNotFound:
-		return LevelDebug
+		return LevelInfo
 	case StatusTimeout:
-		return LevelDebug
+		return LevelInfo
 	case StatusTooManyRequests:
-		return LevelDebug
+		return LevelInfo
 	case StatusBadRequest:
-		return LevelDebug
+		return LevelInfo
 	case StatusValidationFailed:
-		return LevelDebug
+		return LevelInfo
 	case StatusNotImplemented:
 		return LevelDebug
 	case StatusUnknown, StatusInternal:

From 26fc359933554be9b21f20c0e2fafe07c54adf91 Mon Sep 17 00:00:00 2001
From: Andre Pereira <adrapereira@gmail.com>
Date: Fri, 5 May 2023 15:51:13 +0100
Subject: [PATCH 660/729] Trace View: Rename span detail attribute sections
 (#67849)

* Rename span detail attribute sections

* Fix tests

* Fix more tests
---
 public/app/features/explore/TraceView/TraceView.test.tsx  | 8 ++++----
 .../TraceTimelineViewer/SpanDetail/index.test.tsx         | 4 ++--
 .../components/TraceTimelineViewer/SpanDetail/index.tsx   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/app/features/explore/TraceView/TraceView.test.tsx b/public/app/features/explore/TraceView/TraceView.test.tsx
index ddb7338155c..6287620f49e 100644
--- a/public/app/features/explore/TraceView/TraceView.test.tsx
+++ b/public/app/features/explore/TraceView/TraceView.test.tsx
@@ -91,14 +91,14 @@ describe('TraceView', () => {
 
   it('toggles detailState', async () => {
     renderTraceViewNew();
-    expect(screen.queryByText(/Attributes/)).toBeFalsy();
+    expect(screen.queryByText(/Span Attributes/)).toBeFalsy();
     const spanView = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[0];
     await userEvent.click(spanView);
-    expect(screen.queryByText(/Attributes/)).toBeTruthy();
+    expect(screen.queryByText(/Span Attributes/)).toBeTruthy();
 
     await userEvent.click(spanView);
-    screen.debug(screen.queryAllByText(/Attributes/));
-    expect(screen.queryByText(/Attributes/)).toBeFalsy();
+    screen.debug(screen.queryAllByText(/Span Attributes/));
+    expect(screen.queryByText(/Span Attributes/)).toBeFalsy();
   });
 
   it('shows timeline ticks', () => {
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx
index 260ec358c33..ece47433797 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx
@@ -144,13 +144,13 @@ describe('<SpanDetail>', () => {
 
   it('renders the span tags', async () => {
     render(<SpanDetail {...(props as unknown as SpanDetailProps)} />);
-    await userEvent.click(screen.getByRole('switch', { name: /Attributes/ }));
+    await userEvent.click(screen.getByRole('switch', { name: /Span Attributes/ }));
     expect(props.tagsToggle).toHaveBeenLastCalledWith(span.spanID);
   });
 
   it('renders the process tags', async () => {
     render(<SpanDetail {...(props as unknown as SpanDetailProps)} />);
-    await userEvent.click(screen.getByRole('switch', { name: /Resource/ }));
+    await userEvent.click(screen.getByRole('switch', { name: /Resource Attributes/ }));
     expect(props.processToggle).toHaveBeenLastCalledWith(span.spanID);
   });
 
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx
index f11a77dc230..cac62dc44c0 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx
@@ -250,7 +250,7 @@ export default function SpanDetail(props: SpanDetailProps) {
         <div>
           <AccordianKeyValues
             data={tags}
-            label="Attributes"
+            label="Span Attributes"
             linksGetter={linksGetter}
             isOpen={isTagsOpen}
             onToggle={() => tagsToggle(spanID)}
@@ -259,7 +259,7 @@ export default function SpanDetail(props: SpanDetailProps) {
             <AccordianKeyValues
               className={ubMb1}
               data={process.tags}
-              label="Resource"
+              label="Resource Attributes"
               linksGetter={linksGetter}
               isOpen={isProcessOpen}
               onToggle={() => processToggle(spanID)}

From ae1a85b5ad4bbe85c0cb01c6a33f27a3d1f8850c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 5 May 2023 17:00:33 +0200
Subject: [PATCH 661/729] Drawer: Position under nav & minor redesign  (#67824)

* Drawer: Redesign WIP

* Fix double margin

* Teak pos

* align paddings

* Hide toolbar actions when drawer is open

* deprecate expandable

* Updated test

* remove expandable var

* Added clickaway
---
 .betterer.results                             |   4 +-
 e2e/various-suite/inspect-drawer.spec.ts      |  26 ----
 .../src/components/Drawer/Drawer.tsx          | 120 ++++++++++--------
 .../core/components/AppChrome/AppChrome.tsx   |   3 +-
 .../AppChrome/NavToolbar/NavToolbar.tsx       |   6 +-
 .../components/HelpWizard/HelpWizard.tsx      |   1 -
 .../components/Inspector/InspectContent.tsx   |   1 -
 .../SaveDashboard/SaveDashboardDrawer.tsx     |   1 -
 8 files changed, 75 insertions(+), 87 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 22be1f2f322..8a02d1a063f 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -942,9 +942,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"]
     ],
     "packages/grafana-ui/src/components/Drawer/Drawer.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"]
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
     "packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
diff --git a/e2e/various-suite/inspect-drawer.spec.ts b/e2e/various-suite/inspect-drawer.spec.ts
index 155f1c7cd12..7d19f3686b4 100644
--- a/e2e/various-suite/inspect-drawer.spec.ts
+++ b/e2e/various-suite/inspect-drawer.spec.ts
@@ -41,8 +41,6 @@ e2e.scenario({
 
     expectDrawerTabsAndContent();
 
-    expectDrawerExpandAndContract(viewPortWidth);
-
     expectDrawerClose();
 
     expectSubMenuScenario('Data');
@@ -107,30 +105,6 @@ const expectDrawerClose = () => {
   e2e.components.Drawer.General.title(`Inspect: ${PANEL_UNDER_TEST}`).should('not.exist');
 };
 
-const expectDrawerExpandAndContract = (viewPortWidth: number) => {
-  // try expand button
-  // drawer should take up half the screen
-  e2e.components.Drawer.General.rcContentWrapper()
-    .should('be.visible')
-    .should('have.css', 'width', `${viewPortWidth / 2}px`);
-
-  e2e.components.Drawer.General.expand().click();
-  e2e.components.Drawer.General.contract().should('be.visible');
-
-  // drawer should take up the whole screen
-  e2e.components.Drawer.General.rcContentWrapper()
-    .should('be.visible')
-    .should('have.css', 'width', `${viewPortWidth}px`);
-
-  // try contract button
-  e2e.components.Drawer.General.contract().click();
-  e2e.components.Drawer.General.expand().should('be.visible');
-
-  e2e.components.Drawer.General.rcContentWrapper()
-    .should('be.visible')
-    .should('have.css', 'width', `${viewPortWidth / 2}px`);
-};
-
 const expectSubMenuScenario = (subMenu: string, tabTitle?: string) => {
   tabTitle = tabTitle ?? subMenu;
   // testing opening inspect drawer from sub menus under Inspect in header menu
diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index 1aad5038d33..80fea394303 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -3,14 +3,17 @@ import { useDialog } from '@react-aria/dialog';
 import { FocusScope } from '@react-aria/focus';
 import { useOverlay } from '@react-aria/overlays';
 import RcDrawer from 'rc-drawer';
-import React, { ReactNode, useState, useEffect } from 'react';
+import React, { ReactNode, useEffect } from 'react';
+import { useClickAway } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
 import { useStyles2 } from '../../themes';
+import { Button } from '../Button';
 import { CustomScrollbar } from '../CustomScrollbar/CustomScrollbar';
-import { IconButton } from '../IconButton/IconButton';
+//import { IconButton } from '../IconButton/IconButton';
+import { Text } from '../Text/Text';
 
 export interface Props {
   children: ReactNode;
@@ -26,7 +29,9 @@ export interface Props {
    * @deprecated use the size property instead
    **/
   width?: number | string;
-  /** Should the Drawer be expandable to full width */
+  /**
+   * @deprecated use a large size instead if high width is needed
+   **/
   expandable?: boolean;
   /**
    * Specifies the width and min-width.
@@ -52,39 +57,35 @@ export function Drawer({
   subtitle,
   width,
   size = 'md',
-  expandable = false,
   tabs,
 }: Props) {
   const styles = useStyles2(getStyles);
-  const [isExpanded, setIsExpanded] = useState(false);
-  const [isOpen, setIsOpen] = useState(false);
   const overlayRef = React.useRef(null);
   const { dialogProps, titleProps } = useDialog({}, overlayRef);
   const { overlayProps } = useOverlay(
     {
       isDismissable: false,
-      isOpen,
+      isOpen: true,
       onClose,
     },
     overlayRef
   );
 
-  // RcDrawer v4.x needs to be mounted in advance for animations to play.
-  useEffect(() => {
-    setIsOpen(true);
-  }, []);
+  // Adds body class while open so the toolbar nav can hide some actions while drawer is open
+  useBodyClassWhileOpen();
+  useClickAway(overlayRef, onClose);
 
-  // deprecated width prop now defaults to empty string which make the size prop take over
-  const fixedWidth = isExpanded ? '100%' : width ?? '';
-  const rootClass = cx(styles.drawer, !fixedWidth && styles.sizes[size]);
+  // Apply size styles (unless deprecated width prop is used)
+  const rootClass = cx(styles.drawer, !width && styles.sizes[size]);
   const content = <div className={styles.content}>{children}</div>;
 
   return (
     <RcDrawer
-      open={isOpen}
+      open={true}
       onClose={onClose}
       placement="right"
-      width={fixedWidth}
+      // Important to set this to empty string so that the width can be controlled by the css
+      width={width ?? ''}
       getContainer={'.main-view'}
       className={styles.drawerContent}
       rootClassName={rootClass}
@@ -112,35 +113,21 @@ export function Drawer({
           ref={overlayRef}
         >
           {typeof title === 'string' && (
-            <div className={styles.header}>
+            <div className={cx(styles.header, Boolean(tabs) && styles.headerWithTabs)}>
               <div className={styles.actions}>
-                {expandable && !isExpanded && (
-                  <IconButton
-                    name="angle-left"
-                    size="xl"
-                    onClick={() => setIsExpanded(true)}
-                    aria-label={selectors.components.Drawer.General.expand}
-                  />
-                )}
-                {expandable && isExpanded && (
-                  <IconButton
-                    name="angle-right"
-                    size="xl"
-                    onClick={() => setIsExpanded(false)}
-                    aria-label={selectors.components.Drawer.General.contract}
-                  />
-                )}
-                <IconButton
-                  name="times"
-                  size="xl"
+                <Button
+                  icon="times"
+                  variant="secondary"
+                  fill="text"
                   onClick={onClose}
                   aria-label={selectors.components.Drawer.General.close}
                 />
               </div>
               <div className={styles.titleWrapper}>
-                <h3 {...titleProps}>{title}</h3>
-                {typeof subtitle === 'string' && <div className="muted">{subtitle}</div>}
-                {typeof subtitle !== 'string' && subtitle}
+                <Text as="h3" {...titleProps}>
+                  {title}
+                </Text>
+                {subtitle && <div className={styles.subtitle}>{subtitle}</div>}
                 {tabs && <div className={styles.tabsWrapper}>{tabs}</div>}
               </div>
             </div>
@@ -155,6 +142,20 @@ export function Drawer({
   );
 }
 
+function useBodyClassWhileOpen() {
+  useEffect(() => {
+    if (!document.body) {
+      return;
+    }
+
+    document.body.classList.add('body-drawer-open');
+
+    return () => {
+      document.body.classList.remove('body-drawer-open');
+    };
+  }, []);
+}
+
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     container: css`
@@ -164,6 +165,14 @@ const getStyles = (theme: GrafanaTheme2) => {
       flex: 1 1 0;
     `,
     drawer: css`
+      .main-view & {
+        top: 81px;
+      }
+
+      .main-view--search-bar-hidden & {
+        top: 41px;
+      }
+
       .rc-drawer-content-wrapper {
         box-shadow: ${theme.shadows.z3};
 
@@ -185,7 +194,7 @@ const getStyles = (theme: GrafanaTheme2) => {
         '.rc-drawer-content-wrapper': {
           label: 'drawer-md',
           width: '50vw',
-          minWidth: theme.spacing(66),
+          minWidth: theme.spacing(60),
         },
       }),
       lg: css({
@@ -233,21 +242,26 @@ const getStyles = (theme: GrafanaTheme2) => {
         }
       }
     `,
-    header: css`
-      background-color: ${theme.colors.background.canvas};
-      flex-grow: 0;
-      padding-top: ${theme.spacing(0.5)};
-    `,
-    actions: css`
-      display: flex;
-      align-items: baseline;
-      justify-content: flex-end;
-    `,
+    header: css({
+      flexGrow: 0,
+      padding: theme.spacing(3, 2),
+      borderBottom: `1px solid ${theme.colors.border.weak}`,
+    }),
+    headerWithTabs: css({
+      borderBottom: 'none',
+    }),
+    actions: css({
+      position: 'absolute',
+      right: theme.spacing(1),
+      top: theme.spacing(2),
+    }),
     titleWrapper: css`
-      margin-bottom: ${theme.spacing(3)};
-      padding: ${theme.spacing(0, 1, 0, 3)};
       overflow-wrap: break-word;
     `,
+    subtitle: css({
+      color: theme.colors.text.secondary,
+      paddingTop: theme.spacing(1),
+    }),
     content: css({
       padding: theme.spacing(2),
       height: '100%',
@@ -259,7 +273,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     }),
     tabsWrapper: css({
       paddingLeft: theme.spacing(2),
-      margin: theme.spacing(3, -1, -3, -3),
+      margin: theme.spacing(2, -1, -3, -3),
     }),
   };
 };
diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index f140eaa06a9..72489c28fa2 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -1,4 +1,5 @@
 import { css, cx } from '@emotion/css';
+import classNames from 'classnames';
 import React, { PropsWithChildren } from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
@@ -33,7 +34,7 @@ export function AppChrome({ children }: Props) {
   // doesn't get re-mounted when chromeless goes from true to false.
 
   return (
-    <main className="main-view">
+    <main className={classNames('main-view', searchBarHidden && 'main-view--search-bar-hidden')}>
       {!state.chromeless && (
         <div className={cx(styles.topNav)}>
           {!searchBarHidden && <TopSearchBar />}
diff --git a/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx b/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
index fc7f789ca75..2dbb4f82c90 100644
--- a/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
+++ b/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
@@ -82,7 +82,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: 'flex',
       padding: theme.spacing(0, 1, 0, 2),
       alignItems: 'center',
-      justifyContent: 'space-between',
     }),
     menuButton: css({
       display: 'flex',
@@ -90,6 +89,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       marginRight: theme.spacing(1),
     }),
     actions: css({
+      label: 'NavToolbar-actions',
       display: 'flex',
       alignItems: 'center',
       flexWrap: 'nowrap',
@@ -98,6 +98,10 @@ const getStyles = (theme: GrafanaTheme2) => {
       flexGrow: 1,
       gap: theme.spacing(0.5),
       minWidth: 0,
+
+      '.body-drawer-open &': {
+        display: 'none',
+      },
     }),
   };
 };
diff --git a/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx b/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
index 541dc7bba11..4f9fa35d360 100644
--- a/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
+++ b/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
@@ -74,7 +74,6 @@ export function HelpWizard({ panel, plugin, onClose }: Props) {
       title={`Get help with this panel`}
       size="lg"
       onClose={onClose}
-      expandable
       scrollableContent
       subtitle={
         <Stack direction="column" gap={1}>
diff --git a/public/app/features/dashboard/components/Inspector/InspectContent.tsx b/public/app/features/dashboard/components/Inspector/InspectContent.tsx
index af5446806b9..5b2bbf9956d 100644
--- a/public/app/features/dashboard/components/Inspector/InspectContent.tsx
+++ b/public/app/features/dashboard/components/Inspector/InspectContent.tsx
@@ -69,7 +69,6 @@ export const InspectContent = ({
       title={title}
       subtitle={data && formatStats(data)}
       onClose={onClose}
-      expandable
       scrollableContent
       tabs={
         <TabsBar>
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
index 5b02cbd731e..18a2c6157fb 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
@@ -140,7 +140,6 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
           )}
         </TabsBar>
       }
-      expandable
       scrollableContent
     >
       {renderSaveBody()}

From 15e34505e2213b47a47d922a0cd306e071565d12 Mon Sep 17 00:00:00 2001
From: linoman <2051016+linoman@users.noreply.github.com>
Date: Fri, 5 May 2023 17:17:18 +0200
Subject: [PATCH 662/729] Render analytics identifiers (#67860)

* Append analytics identifier upon authenticate session

* Add id and module upon syncing user to identity

* Add authModule & id to `IdentityFromSignedInUser`

* Allow req calls in test to use basic auth

* Add `intercom_secret` to grafana config in tests

* Add test for analytics render in html view
---
 pkg/services/authn/authn.go                   |  2 +
 .../authn/authnimpl/sync/user_sync.go         |  2 +
 pkg/services/contexthandler/contexthandler.go | 24 ++++++++-
 pkg/tests/testinfra/testinfra.go              |  5 ++
 pkg/tests/web/index_view_test.go              | 51 +++++++++++++++++--
 5 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/pkg/services/authn/authn.go b/pkg/services/authn/authn.go
index 02eef4fe10b..500507620ee 100644
--- a/pkg/services/authn/authn.go
+++ b/pkg/services/authn/authn.go
@@ -326,6 +326,8 @@ func IdentityFromSignedInUser(id string, usr *user.SignedInUser, params ClientPa
 		Teams:          usr.Teams,
 		ClientParams:   params,
 		Permissions:    usr.Permissions,
+		AuthModule:     usr.ExternalAuthModule,
+		AuthID:         usr.ExternalAuthID,
 	}
 }
 
diff --git a/pkg/services/authn/authnimpl/sync/user_sync.go b/pkg/services/authn/authnimpl/sync/user_sync.go
index b4b38e2dbcc..20c120f262f 100644
--- a/pkg/services/authn/authnimpl/sync/user_sync.go
+++ b/pkg/services/authn/authnimpl/sync/user_sync.go
@@ -392,6 +392,8 @@ func syncSignedInUserToIdentity(usr *user.SignedInUser, identity *authn.Identity
 	identity.LastSeenAt = usr.LastSeenAt
 	identity.IsDisabled = usr.IsDisabled
 	identity.IsGrafanaAdmin = &usr.IsGrafanaAdmin
+	identity.AuthID = usr.ExternalAuthID
+	identity.AuthModule = usr.ExternalAuthModule
 }
 
 func shouldUpdateLastSeen(t time.Time) bool {
diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go
index b0b96273094..5c3760af292 100644
--- a/pkg/services/contexthandler/contexthandler.go
+++ b/pkg/services/contexthandler/contexthandler.go
@@ -3,6 +3,9 @@ package contexthandler
 
 import (
 	"context"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"net/http"
@@ -110,6 +113,25 @@ func FromContext(c context.Context) *contextmodel.ReqContext {
 	return nil
 }
 
+func hashUserIdentifier(identifier string, secret string) string {
+	key := []byte(secret)
+	h := hmac.New(sha256.New, key)
+	h.Write([]byte(identifier))
+	return hex.EncodeToString(h.Sum(nil))
+}
+
+func setSignedInUser(reqContext *contextmodel.ReqContext, identity *authn.Identity, intercomSecret string) {
+	reqContext.SignedInUser = identity.SignedInUser()
+	if identity.AuthID != "" {
+		reqContext.SignedInUser.Analytics.Identifier = identity.AuthID
+	} else {
+		reqContext.SignedInUser.Analytics.Identifier = identity.Email + "@" + setting.AppUrl
+	}
+	if intercomSecret != "" {
+		reqContext.SignedInUser.Analytics.IntercomIdentifier = hashUserIdentifier(identity.AuthID, intercomSecret)
+	}
+}
+
 // Middleware provides a middleware to initialize the request context.
 func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -151,7 +173,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
 				reqContext.LookupTokenErr = err
 			} else {
 				reqContext.UserToken = identity.SessionToken
-				reqContext.SignedInUser = identity.SignedInUser()
+				setSignedInUser(reqContext, identity, h.Cfg.IntercomSecret)
 				reqContext.IsSignedIn = !identity.IsAnonymous
 				reqContext.AllowAnonymous = identity.IsAnonymous
 				reqContext.IsRenderCall = identity.AuthModule == login.RenderModule
diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go
index b4302fc482a..535cd1ac89e 100644
--- a/pkg/tests/testinfra/testinfra.go
+++ b/pkg/tests/testinfra/testinfra.go
@@ -216,6 +216,11 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 	_, err = rbacSect.NewKey("permission_cache", "false")
 	require.NoError(t, err)
 
+	analyticsSect, err := cfg.NewSection("analytics")
+	require.NoError(t, err)
+	_, err = analyticsSect.NewKey("intercom_secret", "intercom_secret_at_config")
+	require.NoError(t, err)
+
 	getOrCreateSection := func(name string) (*ini.Section, error) {
 		section, err := cfg.GetSection(name)
 		if err != nil {
diff --git a/pkg/tests/web/index_view_test.go b/pkg/tests/web/index_view_test.go
index 8286abde819..7a17a816dff 100644
--- a/pkg/tests/web/index_view_test.go
+++ b/pkg/tests/web/index_view_test.go
@@ -1,6 +1,7 @@
 package web
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -10,6 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
 )
 
@@ -27,7 +29,7 @@ func TestIntegrationIndexView(t *testing.T) {
 		addr, _ := testinfra.StartGrafana(t, grafDir, cfgPath)
 
 		// nolint:bodyclose
-		resp, html := makeRequest(t, addr)
+		resp, html := makeRequest(t, addr, "", "")
 		assert.Regexp(t, `script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' 'nonce-[^']+';object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src \* data:;base-uri 'self';connect-src 'self' grafana.com ws://localhost:3000/ wss://localhost:3000/;manifest-src 'self';media-src 'none';form-action 'self';`, resp.Header.Get("Content-Security-Policy"))
 		assert.Regexp(t, `<script nonce="[^"]+"`, html)
 	})
@@ -37,20 +39,59 @@ func TestIntegrationIndexView(t *testing.T) {
 		addr, _ := testinfra.StartGrafana(t, grafDir, cfgPath)
 
 		// nolint:bodyclose
-		resp, html := makeRequest(t, addr)
+		resp, html := makeRequest(t, addr, "", "")
 
 		assert.Empty(t, resp.Header.Get("Content-Security-Policy"))
 		assert.Regexp(t, `<script nonce=""`, html)
 	})
+
+	t.Run("Test the exposed user data contains the analytics identifiers", func(t *testing.T) {
+		grafDir, cfgPath := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+			EnableFeatureToggles: []string{"authnService"},
+		})
+
+		addr, store := testinfra.StartGrafana(t, grafDir, cfgPath)
+		createdUser := testinfra.CreateUser(t, store, user.CreateUserCommand{
+			Login:    "admin",
+			Password: "admin",
+			Email:    "admin@grafana.com",
+			OrgID:    1,
+		})
+
+		// insert user_auth relationship
+		query := fmt.Sprintf(`INSERT INTO "user_auth" ("user_id", "auth_module", "auth_id", "created") VALUES ('%d', 'oauth_grafana_com', 'test-id-oauth-grafana', '2023-03-13 14:08:11')`, createdUser.ID)
+		_, err := store.GetEngine().Exec(query)
+		require.NoError(t, err)
+
+		// nolint:bodyclose
+		response, html := makeRequest(t, addr, "admin", "admin")
+		assert.Equal(t, 200, response.StatusCode)
+
+		// parse User.Analytics HTML view into user.AnalyticsSettings model
+		parsedHTML := strings.Split(html, "analytics\":")[1]
+		parsedHTML = strings.Split(parsedHTML, "},\n")[0]
+
+		var analyticsSettings user.AnalyticsSettings
+		require.NoError(t, json.Unmarshal([]byte(parsedHTML), &analyticsSettings))
+
+		require.Equal(t, "test-id-oauth-grafana", analyticsSettings.Identifier)
+	})
 }
 
-func makeRequest(t *testing.T, addr string) (*http.Response, string) {
+func makeRequest(t *testing.T, addr, username, passwowrd string) (*http.Response, string) {
 	t.Helper()
 
 	u := fmt.Sprintf("http://%s", addr)
 	t.Logf("Making GET request to %s", u)
-	// nolint:gosec
-	resp, err := http.Get(u)
+
+	request, err := http.NewRequest("GET", u, nil)
+	require.NoError(t, err)
+
+	if username != "" && passwowrd != "" {
+		request.SetBasicAuth(username, passwowrd)
+	}
+
+	resp, err := http.DefaultClient.Do(request)
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 	t.Cleanup(func() {

From 80162146a02f3c6626aad0b4a1a4f5fa5f55f14a Mon Sep 17 00:00:00 2001
From: Kristina <kristina.durivage@grafana.com>
Date: Fri, 5 May 2023 10:25:26 -0500
Subject: [PATCH 663/729] Correlations: Add links to prometheus dataframe where
 labels are split out (#67736)

Add links to prometheus dataframe where labels are split out
---
 public/app/features/correlations/utils.ts             | 11 ++++++++++-
 .../explore/PrometheusListView/ItemLabels.tsx         |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/app/features/correlations/utils.ts b/public/app/features/correlations/utils.ts
index 71f4f5732b9..1e363577ef1 100644
--- a/public/app/features/correlations/utils.ts
+++ b/public/app/features/correlations/utils.ts
@@ -1,5 +1,7 @@
 import { DataFrame, DataLinkConfigOrigin } from '@grafana/data';
 
+import { formatValueName } from '../explore/PrometheusListView/ItemLabels';
+
 import { CorrelationData } from './useCorrelations';
 
 type DataFrameRefIdToDataSourceUid = Record<string, string>;
@@ -21,7 +23,14 @@ export const attachCorrelationsToDataFrames = (
     if (!frameRefId) {
       return;
     }
-    const dataSourceUid = dataFrameRefIdToDataSourceUid[frameRefId];
+    let dataSourceUid = dataFrameRefIdToDataSourceUid[frameRefId];
+
+    // rawPrometheus queries append a value to refId to a separate dataframe for the table view
+    if (dataSourceUid === undefined && dataFrame.meta?.preferredVisualisationType === 'rawPrometheus') {
+      const formattedRefID = formatValueName(frameRefId);
+      dataSourceUid = dataFrameRefIdToDataSourceUid[formattedRefID];
+    }
+
     const sourceCorrelations = correlations.filter((correlation) => correlation.source.uid === dataSourceUid);
     decorateDataFrameWithInternalDataLinks(dataFrame, sourceCorrelations);
   });
diff --git a/public/app/features/explore/PrometheusListView/ItemLabels.tsx b/public/app/features/explore/PrometheusListView/ItemLabels.tsx
index b5db12afe93..289de9e2994 100644
--- a/public/app/features/explore/PrometheusListView/ItemLabels.tsx
+++ b/public/app/features/explore/PrometheusListView/ItemLabels.tsx
@@ -24,7 +24,7 @@ const getItemLabelsStyles = (theme: GrafanaTheme2, expanded: boolean) => {
   };
 };
 
-const formatValueName = (name: string): string => {
+export const formatValueName = (name: string): string => {
   if (name.includes(InstantQueryRefIdIndex)) {
     return name.replace(InstantQueryRefIdIndex, '');
   }

From 6f4d4a67508ee98d8d5f0fa2311a6cc466a84a45 Mon Sep 17 00:00:00 2001
From: Jo <joao.guerreiro@grafana.com>
Date: Fri, 5 May 2023 17:37:00 +0200
Subject: [PATCH 664/729] Add name_id_format to doc (#67803)

* add name_id_format to doc

* add labels

* add missing pipe

* add available name ID options

* Update docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* lint

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 .../configure-authentication/_index.md        |  4 ++
 .../configure-authentication/saml/index.md    | 68 ++++++++++++-------
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md
index e450af2a7bc..48205d8528e 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md
@@ -10,6 +10,10 @@ cascade:
       - oss
 description: Learn about all the ways in which you can configure Grafana to authenticate
   users.
+labels:
+  products:
+    - cloud
+    - enterprise
 title: Configure authentication
 weight: 100
 ---
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
index e3d0a6190db..16905c8f891 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
@@ -10,6 +10,10 @@ aliases:
   - ../../../enterprise/saml/troubleshoot-saml/
 description: Learn how to configure SAML authentication in Grafana's configuration file.
 menuTitle: Configure SAML using the configuration file
+labels:
+  products:
+    - cloud
+    - enterprise
 title: Configure SAML authentication using the configuration file
 weight: 1100
 ---
@@ -168,31 +172,32 @@ Grafana supports user authentication through Okta, which is useful when you want
 
 The table below describes all SAML configuration options. Continue reading below for details on specific options. Like any other Grafana configuration, you can apply these options as [environment variables]({{< relref "../../../configure-grafana/#override-configuration-with-environment-variables" >}}).
 
-| Setting                                                    | Required | Description                                                                                                                                                                                                  | Default       |
-| ---------------------------------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------- |
-| `enabled`                                                  | No       | Whether SAML authentication is allowed                                                                                                                                                                       | `false`       |
-| `single_logout`                                            | No       | Whether SAML Single Logout enabled                                                                                                                                                                           | `false`       |
-| `allow_sign_up`                                            | No       | Whether to allow new Grafana user creation through SAML login. If set to `false`, then only existing Grafana users can log in with SAML.                                                                     | `true`        |
-| `auto_login`                                               | No       | Whether SAML auto login is enabled                                                                                                                                                                           | `false`       |
-| `allow_idp_initiated`                                      | No       | Whether SAML IdP-initiated login is allowed                                                                                                                                                                  | `false`       |
-| `certificate` or `certificate_path`                        | Yes      | Base64-encoded string or Path for the SP X.509 certificate                                                                                                                                                   |               |
-| `private_key` or `private_key_path`                        | Yes      | Base64-encoded string or Path for the SP private key                                                                                                                                                         |               |
-| `signature_algorithm`                                      | No       | Signature algorithm used for signing requests to the IdP. Supported values are rsa-sha1, rsa-sha256, rsa-sha512.                                                                                             |               |
-| `idp_metadata`, `idp_metadata_path`, or `idp_metadata_url` | Yes      | Base64-encoded string, Path or URL for the IdP SAML metadata XML                                                                                                                                             |               |
-| `max_issue_delay`                                          | No       | Duration, since the IdP issued a response and the SP is allowed to process it                                                                                                                                | `90s`         |
-| `metadata_valid_duration`                                  | No       | Duration, for how long the SP metadata is valid                                                                                                                                                              | `48h`         |
-| `relay_state`                                              | No       | Relay state for IdP-initiated login. Should match relay state configured in IdP                                                                                                                              |               |
-| `assertion_attribute_name`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user name. Alternatively, this can be a template with variables that match the names of attributes within the SAML assertion. | `displayName` |
-| `assertion_attribute_login`                                | No       | Friendly name or name of the attribute within the SAML assertion to use as the user login handle                                                                                                             | `mail`        |
-| `assertion_attribute_email`                                | No       | Friendly name or name of the attribute within the SAML assertion to use as the user email                                                                                                                    | `mail`        |
-| `assertion_attribute_groups`                               | No       | Friendly name or name of the attribute within the SAML assertion to use as the user groups                                                                                                                   |               |
-| `assertion_attribute_role`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user roles                                                                                                                    |               |
-| `assertion_attribute_org`                                  | No       | Friendly name or name of the attribute within the SAML assertion to use as the user organization                                                                                                             |               |
-| `allowed_organizations`                                    | No       | List of comma- or space-separated organizations. User should be a member of at least one organization to log in.                                                                                             |               |
-| `org_mapping`                                              | No       | List of comma- or space-separated Organization:OrgId:Role mappings. Organization can be `*` meaning "All users". Role is optional and can have the following values: `Viewer`, `Editor` or `Admin`.          |               |
-| `role_values_editor`                                       | No       | List of comma- or space-separated roles which will be mapped into the Editor role                                                                                                                            |               |
-| `role_values_admin`                                        | No       | List of comma- or space-separated roles which will be mapped into the Admin role                                                                                                                             |               |
-| `role_values_grafana_admin`                                | No       | List of comma- or space-separated roles which will be mapped into the Grafana Admin (Super Admin) role                                                                                                       |
+| Setting                                                    | Required | Description                                                                                                                                                                                                  | Default                                               |
+| ---------------------------------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------- |
+| `enabled`                                                  | No       | Whether SAML authentication is allowed                                                                                                                                                                       | `false`                                               |
+| `single_logout`                                            | No       | Whether SAML Single Logout enabled                                                                                                                                                                           | `false`                                               |
+| `allow_sign_up`                                            | No       | Whether to allow new Grafana user creation through SAML login. If set to `false`, then only existing Grafana users can log in with SAML.                                                                     | `true`                                                |
+| `auto_login`                                               | No       | Whether SAML auto login is enabled                                                                                                                                                                           | `false`                                               |
+| `allow_idp_initiated`                                      | No       | Whether SAML IdP-initiated login is allowed                                                                                                                                                                  | `false`                                               |
+| `certificate` or `certificate_path`                        | Yes      | Base64-encoded string or Path for the SP X.509 certificate                                                                                                                                                   |                                                       |
+| `private_key` or `private_key_path`                        | Yes      | Base64-encoded string or Path for the SP private key                                                                                                                                                         |                                                       |
+| `signature_algorithm`                                      | No       | Signature algorithm used for signing requests to the IdP. Supported values are rsa-sha1, rsa-sha256, rsa-sha512.                                                                                             |                                                       |
+| `idp_metadata`, `idp_metadata_path`, or `idp_metadata_url` | Yes      | Base64-encoded string, Path or URL for the IdP SAML metadata XML                                                                                                                                             |                                                       |
+| `max_issue_delay`                                          | No       | Duration, since the IdP issued a response and the SP is allowed to process it                                                                                                                                | `90s`                                                 |
+| `metadata_valid_duration`                                  | No       | Duration, for how long the SP metadata is valid                                                                                                                                                              | `48h`                                                 |
+| `relay_state`                                              | No       | Relay state for IdP-initiated login. Should match relay state configured in IdP                                                                                                                              |                                                       |
+| `assertion_attribute_name`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user name. Alternatively, this can be a template with variables that match the names of attributes within the SAML assertion. | `displayName`                                         |
+| `assertion_attribute_login`                                | No       | Friendly name or name of the attribute within the SAML assertion to use as the user login handle                                                                                                             | `mail`                                                |
+| `assertion_attribute_email`                                | No       | Friendly name or name of the attribute within the SAML assertion to use as the user email                                                                                                                    | `mail`                                                |
+| `assertion_attribute_groups`                               | No       | Friendly name or name of the attribute within the SAML assertion to use as the user groups                                                                                                                   |                                                       |
+| `assertion_attribute_role`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user roles                                                                                                                    |                                                       |
+| `assertion_attribute_org`                                  | No       | Friendly name or name of the attribute within the SAML assertion to use as the user organization                                                                                                             |                                                       |
+| `allowed_organizations`                                    | No       | List of comma- or space-separated organizations. User should be a member of at least one organization to log in.                                                                                             |                                                       |
+| `org_mapping`                                              | No       | List of comma- or space-separated Organization:OrgId:Role mappings. Organization can be `*` meaning "All users". Role is optional and can have the following values: `Viewer`, `Editor` or `Admin`.          |                                                       |
+| `role_values_editor`                                       | No       | List of comma- or space-separated roles which will be mapped into the Editor role                                                                                                                            |                                                       |
+| `role_values_admin`                                        | No       | List of comma- or space-separated roles which will be mapped into the Admin role                                                                                                                             |                                                       |
+| `role_values_grafana_admin`                                | No       | List of comma- or space-separated roles which will be mapped into the Grafana Admin (Super Admin) role                                                                                                       |                                                       |
+| `name_id_format`                                           | No       | The Name ID Format to request within the SAML assertion                                                                                                                                                      | `urn:oasis:names:tc:SAML:2.0:nameid-format:transient` |
 
 ### Signature algorithm
 
@@ -200,6 +205,19 @@ The table below describes all SAML configuration options. Continue reading below
 
 The SAML standard recommends using a digital signature for some types of messages, like authentication or logout requests. If the `signature_algorithm` option is configured, Grafana will put a digital signature into SAML requests. Supported signature types are `rsa-sha1`, `rsa-sha256`, `rsa-sha512`. This option should match your IdP configuration, otherwise, signature validation will fail. Grafana uses key and certificate configured with `private_key` and `certificate` options for signing SAML requests.
 
+### Specify user's Name ID
+
+The `name_id_format` configuration field specifies the format of the NameID element in the SAML assertion.
+
+By default, this is set to `urn:oasis:names:tc:SAML:2.0:nameid-format:transient` and does not need to be specified in the configuration file.
+
+The following list includes valid configuration field values:
+
+- `urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified`
+- `urn:oasis:names:tc:SAML:2.0:nameid-format:transient`
+- `urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress`
+- `urn:oasis:names:tc:SAML:2.0:nameid-format:persistent`
+
 ### IdP metadata
 
 You also need to define the public part of the IdP for message verification. The SAML IdP metadata XML defines where and how Grafana exchanges user information.

From 765ae6cd90c341804b5df1763725bf9d2b6fdce1 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Fri, 5 May 2023 16:46:58 +0100
Subject: [PATCH 665/729] AzureMonitor: Clear queries if header value changes
 (#67916)

Clear queries if header value changes
---
 .../components/QueryEditor/QueryEditor.test.tsx             | 3 ++-
 .../datasource/azuremonitor/components/QueryHeader.tsx      | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
index 74ec7c498d9..18621f8bbf4 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
@@ -88,7 +88,8 @@ describe('Azure Monitor QueryEditor', () => {
     await selectOptionInTest(metrics, 'Logs');
 
     expect(onChange).toHaveBeenCalledWith({
-      ...mockQuery,
+      refId: mockQuery.refId,
+      datasource: mockQuery.datasource,
       queryType: AzureQueryType.LogAnalytics,
     });
   });
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx
index 3a3c77c81ea..fd2f60578bf 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx
@@ -21,11 +21,13 @@ export const QueryHeader = ({ query, onQueryChange }: QueryTypeFieldProps) => {
 
   const handleChange = useCallback(
     (change: SelectableValue<AzureQueryType>) => {
-      change.value &&
+      if (change.value && change.value !== query.queryType) {
         onQueryChange({
-          ...query,
+          refId: query.refId,
+          datasource: query.datasource,
           queryType: change.value,
         });
+      }
     },
     [onQueryChange, query]
   );

From 9d16718accd11f8db53b30ea79aac16c07e99090 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Fri, 5 May 2023 16:47:31 +0100
Subject: [PATCH 666/729] AzureMonitor: Fix logs query multi-resource and
 timespan values (#67914)

* Update TimeGrain interface methods

- Make them util functions because it's simpler

* Update logs ds to appropiately set resources and timespan

* Set timespan using RCF times

* Update tests
---
 .../azure-log-analytics-datasource.go         |  8 ++++--
 .../azure-log-analytics-datasource_test.go    | 25 +++++++++++++++++--
 .../azuremonitor/time/azuremonitor-time.go    |  3 +--
 pkg/tsdb/azuremonitor/time/time-grain.go      |  8 +++---
 pkg/tsdb/azuremonitor/time/time-grain_test.go |  8 ++----
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
index 57c857337e5..6ad2b8b5bae 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
@@ -393,11 +393,15 @@ func appendErrorNotice(frame *data.Frame, err *AzureLogAnalyticsAPIError) *data.
 }
 
 func (e *AzureLogAnalyticsDatasource) createRequest(ctx context.Context, logger log.Logger, queryURL string, query *AzureLogAnalyticsQuery) (*http.Request, error) {
+	from := query.TimeRange.From.Format(time.RFC3339)
+	to := query.TimeRange.To.Format(time.RFC3339)
+	timespan := fmt.Sprintf("%s/%s", from, to)
 	body := map[string]interface{}{
-		"query": query.Query,
+		"query":    query.Query,
+		"timespan": timespan,
 	}
 	if len(query.Resources) > 1 {
-		body["resources"] = query.Resources
+		body["workspaces"] = query.Resources
 	}
 	jsonValue, err := json.Marshal(body)
 	if err != nil {
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
index 144193c1da0..98ae108cd25 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
@@ -872,7 +872,7 @@ func TestLogAnalyticsCreateRequest(t *testing.T) {
 		if !cmp.Equal(req.Header, expectedHeaders) {
 			t.Errorf("Unexpected HTTP headers: %v", cmp.Diff(req.Header, expectedHeaders))
 		}
-		expectedBody := `{"query":"Perf"}`
+		expectedBody := `{"query":"Perf","timespan":"0001-01-01T00:00:00Z/0001-01-01T00:00:00Z"}`
 		body, err := io.ReadAll(req.Body)
 		require.NoError(t, err)
 		if !cmp.Equal(string(body), expectedBody) {
@@ -887,7 +887,28 @@ func TestLogAnalyticsCreateRequest(t *testing.T) {
 			Query:     "Perf",
 		})
 		require.NoError(t, err)
-		expectedBody := `{"query":"Perf","resources":["r1","r2"]}`
+		expectedBody := `{"query":"Perf","timespan":"0001-01-01T00:00:00Z/0001-01-01T00:00:00Z","workspaces":["r1","r2"]}`
+		body, err := io.ReadAll(req.Body)
+		require.NoError(t, err)
+		if !cmp.Equal(string(body), expectedBody) {
+			t.Errorf("Unexpected Body: %v", cmp.Diff(string(body), expectedBody))
+		}
+	})
+
+	t.Run("creates a request with timerange from query", func(t *testing.T) {
+		ds := AzureLogAnalyticsDatasource{}
+		from := time.Now()
+		to := from.Add(3 * time.Hour)
+		req, err := ds.createRequest(ctx, logger, url, &AzureLogAnalyticsQuery{
+			Resources: []string{"r1", "r2"},
+			Query:     "Perf",
+			TimeRange: backend.TimeRange{
+				From: from,
+				To:   to,
+			},
+		})
+		require.NoError(t, err)
+		expectedBody := fmt.Sprintf(`{"query":"Perf","timespan":"%s/%s","workspaces":["r1","r2"]}`, from.Format(time.RFC3339), to.Format(time.RFC3339))
 		body, err := io.ReadAll(req.Body)
 		require.NoError(t, err)
 		if !cmp.Equal(string(body), expectedBody) {
diff --git a/pkg/tsdb/azuremonitor/time/azuremonitor-time.go b/pkg/tsdb/azuremonitor/time/azuremonitor-time.go
index 3a29f24f8dc..cc6736eb93b 100644
--- a/pkg/tsdb/azuremonitor/time/azuremonitor-time.go
+++ b/pkg/tsdb/azuremonitor/time/azuremonitor-time.go
@@ -10,8 +10,7 @@ var (
 // instead of the default list of intervals
 func SetAutoTimeGrain(intervalMs int64, timeGrains []int64) (string, error) {
 	autoInterval := FindClosestAllowedIntervalMS(intervalMs, timeGrains)
-	tg := &TimeGrain{}
-	autoTimeGrain, err := tg.createISO8601DurationFromIntervalMS(autoInterval)
+	autoTimeGrain, err := CreateISO8601DurationFromIntervalMS(autoInterval)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/tsdb/azuremonitor/time/time-grain.go b/pkg/tsdb/azuremonitor/time/time-grain.go
index c7be8890fe5..6c69642482c 100644
--- a/pkg/tsdb/azuremonitor/time/time-grain.go
+++ b/pkg/tsdb/azuremonitor/time/time-grain.go
@@ -12,13 +12,11 @@ import (
 // TimeGrain handles conversions between
 // the ISO 8601 Duration format (PT1H), Kbn units (1h) and Time Grains (1 hour)
 // Also handles using the automatic Grafana interval to calculate a ISO 8601 Duration.
-type TimeGrain struct{}
-
 var (
 	smallTimeUnits = []string{"hour", "minute", "h", "m"}
 )
 
-func (tg *TimeGrain) createISO8601DurationFromIntervalMS(it int64) (string, error) {
+func CreateISO8601DurationFromIntervalMS(it int64) (string, error) {
 	formatted := intervalv2.FormatDuration(time.Duration(it) * time.Millisecond)
 
 	if strings.Contains(formatted, "ms") {
@@ -38,10 +36,10 @@ func (tg *TimeGrain) createISO8601DurationFromIntervalMS(it int64) (string, erro
 		return "PT1M", nil
 	}
 
-	return tg.createISO8601Duration(timeValue, unit), nil
+	return createISO8601Duration(timeValue, unit), nil
 }
 
-func (tg *TimeGrain) createISO8601Duration(timeValue int, timeUnit string) string {
+func createISO8601Duration(timeValue int, timeUnit string) string {
 	for _, smallTimeUnit := range smallTimeUnits {
 		if timeUnit == smallTimeUnit {
 			return fmt.Sprintf("PT%v%v", timeValue, strings.ToUpper(timeUnit[0:1]))
diff --git a/pkg/tsdb/azuremonitor/time/time-grain_test.go b/pkg/tsdb/azuremonitor/time/time-grain_test.go
index 4ff6813bec7..fa988d89c9e 100644
--- a/pkg/tsdb/azuremonitor/time/time-grain_test.go
+++ b/pkg/tsdb/azuremonitor/time/time-grain_test.go
@@ -8,8 +8,6 @@ import (
 )
 
 func TestTimeGrain_createISO8601Duration(t *testing.T) {
-	tg := &TimeGrain{}
-
 	testCases := []struct {
 		name     string
 		value    int
@@ -26,15 +24,13 @@ func TestTimeGrain_createISO8601Duration(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			d := tg.createISO8601Duration(tc.value, tc.unit)
+			d := createISO8601Duration(tc.value, tc.unit)
 			assert.Equal(t, tc.expected, d)
 		})
 	}
 }
 
 func TestTimeGrain_createISO8601DurationFromIntervalMS(t *testing.T) {
-	tg := &TimeGrain{}
-
 	testCases := []struct {
 		name     string
 		interval int64
@@ -48,7 +44,7 @@ func TestTimeGrain_createISO8601DurationFromIntervalMS(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			d, err := tg.createISO8601DurationFromIntervalMS(tc.interval)
+			d, err := CreateISO8601DurationFromIntervalMS(tc.interval)
 			require.NoError(t, err)
 			assert.Equal(t, tc.expected, d)
 		})

From 0ce7f7eaf4b03b04532bdc941e014ea50e2b1788 Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Fri, 5 May 2023 12:03:53 -0400
Subject: [PATCH 667/729] Alerting: Migration to not fail if
 alert_configuration table is not empty (#67924)

---
 pkg/services/sqlstore/migrations/ualert/ualert.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/services/sqlstore/migrations/ualert/ualert.go b/pkg/services/sqlstore/migrations/ualert/ualert.go
index 009a078fb46..38ebaf0ebf1 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert.go
@@ -457,6 +457,9 @@ func (m *migration) writeAlertmanagerConfig(orgID int64, amConfig *PostableUserC
 		return err
 	}
 
+	// remove an existing configuration, which could have been left during switching back to legacy alerting
+	_, _ = m.sess.Delete(AlertConfiguration{OrgID: orgID})
+
 	// We don't need to apply the configuration, given the multi org alertmanager will do an initial sync before the server is ready.
 	_, err = m.sess.Insert(AlertConfiguration{
 		AlertmanagerConfiguration: string(rawAmConfig),

From 854d497f94a2653a6b30f026c34ad31134b879fe Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 5 May 2023 12:16:31 -0700
Subject: [PATCH 668/729] Schema: Fix dimension schemas (#67935)

---
 .betterer.results                             |  3 +-
 .../grafana-schema/src/common/common.gen.ts   | 49 ++++++++++++++---
 .../grafana-schema/src/common/dimensions.cue  | 34 ++++++++++--
 .../grafana-schema/src/veneer/common.types.ts |  8 +++
 public/app/features/canvas/element.ts         |  3 +-
 .../app/features/canvas/elements/button.tsx   |  2 +-
 .../features/canvas/elements/droneFront.tsx   |  3 +-
 .../features/canvas/elements/droneSide.tsx    |  3 +-
 .../app/features/canvas/elements/droneTop.tsx |  3 +-
 public/app/features/canvas/elements/icon.tsx  |  8 +--
 .../features/canvas/elements/metricValue.tsx  |  2 +-
 .../canvas/elements/server/server.tsx         |  3 +-
 .../features/canvas/elements/windTurbine.tsx  |  3 +-
 public/app/features/canvas/runtime/scene.tsx  | 10 ++--
 public/app/features/canvas/types.ts           |  2 +-
 public/app/features/dimensions/color.ts       |  3 +-
 public/app/features/dimensions/context.ts     |  6 +--
 .../editors/ColorDimensionEditor.tsx          |  3 +-
 .../editors/ResourceDimensionEditor.tsx       |  9 +---
 .../editors/ScalarDimensionEditor.tsx         |  3 +-
 .../editors/ScaleDimensionEditor.tsx          |  3 +-
 .../editors/TextDimensionEditor.tsx           |  3 +-
 .../app/features/dimensions/resource.test.ts  |  3 +-
 public/app/features/dimensions/resource.ts    |  3 +-
 public/app/features/dimensions/scalar.test.ts |  3 +-
 public/app/features/dimensions/scalar.ts      |  3 +-
 public/app/features/dimensions/scale.ts       |  7 ++-
 public/app/features/dimensions/text.ts        |  3 +-
 public/app/features/dimensions/types.ts       | 52 +------------------
 public/app/features/dimensions/utils.ts       | 12 +++--
 .../plugins/panel/canvas/SetBackground.tsx    |  3 +-
 .../panel/geomap/editor/StyleEditor.tsx       | 19 ++++---
 .../panel/geomap/layers/data/heatMap.tsx      |  3 +-
 public/app/plugins/panel/geomap/migrations.ts |  2 +-
 .../app/plugins/panel/geomap/style/types.ts   |  4 +-
 .../plugins/panel/geomap/style/utils.test.ts  |  2 +-
 .../app/plugins/panel/geomap/style/utils.ts   |  2 +-
 public/app/plugins/panel/icon/IconPanel.tsx   | 12 +++--
 public/app/plugins/panel/icon/models.gen.ts   |  2 +-
 .../app/plugins/panel/xychart/models.gen.ts   |  6 +--
 public/app/plugins/panel/xychart/scatter.ts   | 16 +++---
 41 files changed, 174 insertions(+), 149 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 8a02d1a063f..b644ccadb0f 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2652,8 +2652,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/dimensions/types.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/dimensions/utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index b3d8ac000c1..d574469dd30 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -52,19 +52,39 @@ export interface DataQuery {
 }
 
 export interface BaseDimensionConfig {
+  /**
+   * fixed: T -- will be added by each element
+   */
   field?: string;
-  fixed: (string | number);
+}
+
+export enum ScaleDimensionMode {
+  Linear = 'linear',
+  Quad = 'quad',
 }
 
 export interface ScaleDimensionConfig extends BaseDimensionConfig {
+  fixed?: number;
   max: number;
   min: number;
+  mode?: ScaleDimensionMode; // | *"linear"
 }
 
-/**
- * This is actually an empty interface used mainly for naming?
- */
-export interface ColorDimensionConfig extends BaseDimensionConfig {}
+export interface ColorDimensionConfig extends BaseDimensionConfig {
+  fixed?: string; // color value
+}
+
+export enum ScalarDimensionMode {
+  Clamped = 'clamped',
+  Mod = 'mod',
+}
+
+export interface ScalarDimensionConfig extends BaseDimensionConfig {
+  fixed?: number;
+  max: number;
+  min: number;
+  mode?: ScalarDimensionMode;
+}
 
 export enum TextDimensionMode {
   Field = 'field',
@@ -72,6 +92,17 @@ export enum TextDimensionMode {
   Template = 'template',
 }
 
+export interface TextDimensionConfig extends BaseDimensionConfig {
+  fixed?: string;
+  mode: TextDimensionMode;
+}
+
+export enum ResourceDimensionMode {
+  Field = 'field',
+  Fixed = 'fixed',
+  Mapping = 'mapping',
+}
+
 export interface MapLayerOptions {
   /**
    * Custom options depending on the type
@@ -785,8 +816,12 @@ export interface DataSourceRef {
   uid?: string;
 }
 
-export interface TextDimensionConfig extends BaseDimensionConfig {
-  mode: TextDimensionMode;
+/**
+ * Links to a resource (image/svg path)
+ */
+export interface ResourceDimensionConfig extends BaseDimensionConfig {
+  fixed?: string;
+  mode: ResourceDimensionMode;
 }
 
 export interface FrameGeometrySource {
diff --git a/packages/grafana-schema/src/common/dimensions.cue b/packages/grafana-schema/src/common/dimensions.cue
index 14899a59c47..08c0b8ac452 100644
--- a/packages/grafana-schema/src/common/dimensions.cue
+++ b/packages/grafana-schema/src/common/dimensions.cue
@@ -2,19 +2,32 @@ package common
 
 BaseDimensionConfig: {
   field?: string
-  fixed: string | number
+  // fixed: T -- will be added by each element
 }@cuetsy(kind="interface")
 
+ScaleDimensionMode: "linear" | "quad" @cuetsy(kind="enum")
+
 ScaleDimensionConfig: {
   BaseDimensionConfig
-  min: int32
-  max: int32
+  min: number
+  max: number
+  fixed?: number
+  mode?: ScaleDimensionMode // | *"linear"
 }@cuetsy(kind="interface")
 
-// This is actually an empty interface used mainly for naming?
 ColorDimensionConfig: {
   BaseDimensionConfig
-  _empty: _
+  fixed?: string // color value
+}@cuetsy(kind="interface")
+
+ScalarDimensionMode: "mod" | "clamped" @cuetsy(kind="enum")
+
+ScalarDimensionConfig: {
+  BaseDimensionConfig
+  min: number
+  max: number
+  fixed?: number
+  mode?: ScalarDimensionMode
 }@cuetsy(kind="interface")
 
 TextDimensionMode: "fixed" | "field" | "template" @cuetsy(kind="enum")
@@ -22,4 +35,15 @@ TextDimensionMode: "fixed" | "field" | "template" @cuetsy(kind="enum")
 TextDimensionConfig: {
   BaseDimensionConfig
   mode: TextDimensionMode
+  fixed?: string 
 }@cuetsy(kind="interface")
+
+ResourceDimensionMode: "fixed" | "field" | "mapping" @cuetsy(kind="enum")
+
+// Links to a resource (image/svg path)
+ResourceDimensionConfig: {
+  BaseDimensionConfig
+  mode: ResourceDimensionMode
+  fixed?: string 
+}@cuetsy(kind="interface")
+
diff --git a/packages/grafana-schema/src/veneer/common.types.ts b/packages/grafana-schema/src/veneer/common.types.ts
index f5a38ac2502..2ece21b6e66 100644
--- a/packages/grafana-schema/src/veneer/common.types.ts
+++ b/packages/grafana-schema/src/veneer/common.types.ts
@@ -23,10 +23,18 @@ export interface BaseDimensionConfig<T = string | number> extends Omit<raw.BaseD
 
 export interface ScaleDimensionConfig extends BaseDimensionConfig<number>, Omit<raw.ScaleDimensionConfig, 'fixed'> {}
 
+export interface ScalarDimensionConfig extends BaseDimensionConfig<number>, Omit<raw.ScalarDimensionConfig, 'fixed'> {}
+
 export interface TextDimensionConfig extends BaseDimensionConfig<string>, Omit<raw.TextDimensionConfig, 'fixed'> {}
 
 export interface ColorDimensionConfig extends BaseDimensionConfig<string>, Omit<raw.ColorDimensionConfig, 'fixed'> {}
 
+export interface ColorDimensionConfig extends BaseDimensionConfig<string>, Omit<raw.ColorDimensionConfig, 'fixed'> {}
+
+export interface ResourceDimensionConfig
+  extends BaseDimensionConfig<string>,
+    Omit<raw.ResourceDimensionConfig, 'fixed'> {}
+
 export * from '../common/common.gen';
 
 // TODO remove when https://github.com/grafana/cuetsy/issues/74 is fixed
diff --git a/public/app/features/canvas/element.ts b/public/app/features/canvas/element.ts
index 13a5358006b..97e788fa8eb 100644
--- a/public/app/features/canvas/element.ts
+++ b/public/app/features/canvas/element.ts
@@ -2,9 +2,10 @@ import { ComponentType } from 'react';
 
 import { RegistryItem } from '@grafana/data';
 import { PanelOptionsSupplier } from '@grafana/data/src/panel/PanelPlugin';
+import { ColorDimensionConfig, ScaleDimensionConfig } from '@grafana/schema';
 import { config } from 'app/core/config';
 
-import { DimensionContext, ColorDimensionConfig, ScaleDimensionConfig } from '../dimensions';
+import { DimensionContext } from '../dimensions';
 
 import { BackgroundConfig, Constraint, LineConfig, Placement } from './types';
 
diff --git a/public/app/features/canvas/elements/button.tsx b/public/app/features/canvas/elements/button.tsx
index 88ad205b211..ca324bffe1c 100644
--- a/public/app/features/canvas/elements/button.tsx
+++ b/public/app/features/canvas/elements/button.tsx
@@ -1,10 +1,10 @@
 import React, { PureComponent } from 'react';
 
 import { PluginState } from '@grafana/data/src';
+import { TextDimensionConfig } from '@grafana/schema';
 import { Button } from '@grafana/ui';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
-import { TextDimensionConfig } from 'app/features/dimensions/types';
 import { APIEditor, APIEditorConfig, callApi } from 'app/plugins/panel/canvas/editor/APIEditor';
 
 import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
diff --git a/public/app/features/canvas/elements/droneFront.tsx b/public/app/features/canvas/elements/droneFront.tsx
index f68811d331f..f06b6eb2f5c 100644
--- a/public/app/features/canvas/elements/droneFront.tsx
+++ b/public/app/features/canvas/elements/droneFront.tsx
@@ -2,8 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { ScalarDimensionConfig } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
-import { DimensionContext, ScalarDimensionConfig } from 'app/features/dimensions';
+import { DimensionContext } from 'app/features/dimensions';
 import { ScalarDimensionEditor } from 'app/features/dimensions/editors';
 
 import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
diff --git a/public/app/features/canvas/elements/droneSide.tsx b/public/app/features/canvas/elements/droneSide.tsx
index 9258c8f2efe..76c2cdd18eb 100644
--- a/public/app/features/canvas/elements/droneSide.tsx
+++ b/public/app/features/canvas/elements/droneSide.tsx
@@ -2,8 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { ScalarDimensionConfig } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
-import { DimensionContext, ScalarDimensionConfig } from 'app/features/dimensions';
+import { DimensionContext } from 'app/features/dimensions';
 import { ScalarDimensionEditor } from 'app/features/dimensions/editors';
 
 import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
diff --git a/public/app/features/canvas/elements/droneTop.tsx b/public/app/features/canvas/elements/droneTop.tsx
index c7c67840cc1..6551f37ad9d 100644
--- a/public/app/features/canvas/elements/droneTop.tsx
+++ b/public/app/features/canvas/elements/droneTop.tsx
@@ -2,8 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { ScalarDimensionConfig } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
-import { DimensionContext, ScalarDimensionConfig } from 'app/features/dimensions';
+import { DimensionContext } from 'app/features/dimensions';
 import { ScalarDimensionEditor } from 'app/features/dimensions/editors';
 
 import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
diff --git a/public/app/features/canvas/elements/icon.tsx b/public/app/features/canvas/elements/icon.tsx
index 8d7c8a4c876..27928d61ebf 100644
--- a/public/app/features/canvas/elements/icon.tsx
+++ b/public/app/features/canvas/elements/icon.tsx
@@ -2,13 +2,9 @@ import { css } from '@emotion/css';
 import { isString } from 'lodash';
 import React, { CSSProperties } from 'react';
 
+import { ColorDimensionConfig, ResourceDimensionConfig, ResourceDimensionMode } from '@grafana/schema';
 import { SanitizedSVG } from 'app/core/components/SVG/SanitizedSVG';
-import {
-  ColorDimensionConfig,
-  ResourceDimensionConfig,
-  ResourceDimensionMode,
-  getPublicOrAbsoluteUrl,
-} from 'app/features/dimensions';
+import { getPublicOrAbsoluteUrl } from 'app/features/dimensions';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor, ResourceDimensionEditor } from 'app/features/dimensions/editors';
 import { APIEditorConfig, callApi } from 'app/plugins/panel/canvas/editor/APIEditor';
diff --git a/public/app/features/canvas/elements/metricValue.tsx b/public/app/features/canvas/elements/metricValue.tsx
index 805956c3657..e9506f9b2a4 100644
--- a/public/app/features/canvas/elements/metricValue.tsx
+++ b/public/app/features/canvas/elements/metricValue.tsx
@@ -4,9 +4,9 @@ import { useObservable } from 'react-use';
 import { of } from 'rxjs';
 
 import { DataFrame, FieldNamePickerConfigSettings, GrafanaTheme2, StandardEditorsRegistryItem } from '@grafana/data';
+import { TextDimensionMode } from '@grafana/schema';
 import { usePanelContext, useStyles2 } from '@grafana/ui';
 import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
-import { TextDimensionMode } from 'app/features/dimensions';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
diff --git a/public/app/features/canvas/elements/server/server.tsx b/public/app/features/canvas/elements/server/server.tsx
index a0205733946..e56e8aa0285 100644
--- a/public/app/features/canvas/elements/server/server.tsx
+++ b/public/app/features/canvas/elements/server/server.tsx
@@ -2,8 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { ColorDimensionConfig, ScalarDimensionConfig } from '@grafana/schema';
 import config from 'app/core/config';
-import { ColorDimensionConfig, DimensionContext, ScalarDimensionConfig } from 'app/features/dimensions';
+import { DimensionContext } from 'app/features/dimensions';
 import { ColorDimensionEditor, ScalarDimensionEditor } from 'app/features/dimensions/editors';
 
 import { CanvasElementItem, CanvasElementProps } from '../../element';
diff --git a/public/app/features/canvas/elements/windTurbine.tsx b/public/app/features/canvas/elements/windTurbine.tsx
index b26a09f5ecd..59b2ce7e0ff 100644
--- a/public/app/features/canvas/elements/windTurbine.tsx
+++ b/public/app/features/canvas/elements/windTurbine.tsx
@@ -2,8 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { ScalarDimensionConfig } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
-import { DimensionContext, ScalarDimensionConfig } from 'app/features/dimensions';
+import { DimensionContext } from 'app/features/dimensions';
 import { ScalarDimensionEditor } from 'app/features/dimensions/editors';
 
 import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
diff --git a/public/app/features/canvas/runtime/scene.tsx b/public/app/features/canvas/runtime/scene.tsx
index d6a534cc67a..5a80d311fa7 100644
--- a/public/app/features/canvas/runtime/scene.tsx
+++ b/public/app/features/canvas/runtime/scene.tsx
@@ -7,17 +7,17 @@ import Selecto from 'selecto';
 
 import { AppEvents, GrafanaTheme2, PanelData } from '@grafana/data';
 import { locationService } from '@grafana/runtime/src';
-import { Portal, stylesFactory } from '@grafana/ui';
-import { config } from 'app/core/config';
-import { CanvasFrameOptions, DEFAULT_CANVAS_ELEMENT_CONFIG } from 'app/features/canvas';
 import {
   ColorDimensionConfig,
-  DimensionContext,
   ResourceDimensionConfig,
   ScalarDimensionConfig,
   ScaleDimensionConfig,
   TextDimensionConfig,
-} from 'app/features/dimensions';
+} from '@grafana/schema';
+import { Portal, stylesFactory } from '@grafana/ui';
+import { config } from 'app/core/config';
+import { CanvasFrameOptions, DEFAULT_CANVAS_ELEMENT_CONFIG } from 'app/features/canvas';
+import { DimensionContext } from 'app/features/dimensions';
 import {
   getColorDimensionFromData,
   getResourceDimensionFromData,
diff --git a/public/app/features/canvas/types.ts b/public/app/features/canvas/types.ts
index 23b1c8dd07e..21d9f06ed18 100644
--- a/public/app/features/canvas/types.ts
+++ b/public/app/features/canvas/types.ts
@@ -1,5 +1,5 @@
 import { LinkModel } from '@grafana/data/src';
-import { ColorDimensionConfig, ResourceDimensionConfig, TextDimensionConfig } from 'app/features/dimensions/types';
+import { ColorDimensionConfig, ResourceDimensionConfig, TextDimensionConfig } from '@grafana/schema';
 
 export interface Placement {
   top?: number;
diff --git a/public/app/features/dimensions/color.ts b/public/app/features/dimensions/color.ts
index 96351e2a562..5b476a265b7 100644
--- a/public/app/features/dimensions/color.ts
+++ b/public/app/features/dimensions/color.ts
@@ -6,8 +6,9 @@ import {
   GrafanaTheme2,
   getFieldConfigWithMinMax,
 } from '@grafana/data';
+import { ColorDimensionConfig } from '@grafana/schema';
 
-import { ColorDimensionConfig, DimensionSupplier } from './types';
+import { DimensionSupplier } from './types';
 import { findField, getLastNotNullFieldValue } from './utils';
 
 //---------------------------------------------------------
diff --git a/public/app/features/dimensions/context.ts b/public/app/features/dimensions/context.ts
index f4418e1a252..a4693ada2a9 100644
--- a/public/app/features/dimensions/context.ts
+++ b/public/app/features/dimensions/context.ts
@@ -1,13 +1,13 @@
 import { PanelData } from '@grafana/data/src';
-
 import {
   ColorDimensionConfig,
-  DimensionSupplier,
   ResourceDimensionConfig,
   ScalarDimensionConfig,
   ScaleDimensionConfig,
   TextDimensionConfig,
-} from './types';
+} from '@grafana/schema';
+
+import { DimensionSupplier } from './types';
 
 export interface DimensionContext {
   getColor(color: ColorDimensionConfig): DimensionSupplier<string>;
diff --git a/public/app/features/dimensions/editors/ColorDimensionEditor.tsx b/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
index 7ddf1d91cd2..9ad58099f5a 100644
--- a/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
@@ -2,11 +2,10 @@ import { css } from '@emotion/css';
 import React, { useCallback } from 'react';
 
 import { GrafanaTheme2, SelectableValue, StandardEditorProps } from '@grafana/data';
+import { ColorDimensionConfig } from '@grafana/schema';
 import { Select, ColorPicker, useStyles2 } from '@grafana/ui';
 import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils';
 
-import { ColorDimensionConfig } from '../types';
-
 const fixedColorOption: SelectableValue<string> = {
   label: 'Fixed color',
   value: '_____fixed_____',
diff --git a/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx b/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
index 9bfb7c54df2..82d02f10c5d 100644
--- a/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
@@ -1,17 +1,12 @@
 import React, { useCallback } from 'react';
 
 import { FieldNamePickerConfigSettings, StandardEditorProps, StandardEditorsRegistryItem } from '@grafana/data';
+import { ResourceDimensionConfig, ResourceDimensionMode } from '@grafana/schema';
 import { InlineField, InlineFieldRow, RadioButtonGroup } from '@grafana/ui';
 import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
 
 import { getPublicOrAbsoluteUrl, ResourceFolderName } from '..';
-import {
-  MediaType,
-  ResourceDimensionConfig,
-  ResourceDimensionMode,
-  ResourceDimensionOptions,
-  ResourcePickerSize,
-} from '../types';
+import { MediaType, ResourceDimensionOptions, ResourcePickerSize } from '../types';
 
 import { ResourcePicker } from './ResourcePicker';
 
diff --git a/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx b/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx
index f3ed210ccb0..f9eb5432ce1 100644
--- a/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx
@@ -2,11 +2,12 @@ import { css } from '@emotion/css';
 import React, { useCallback } from 'react';
 
 import { FieldType, GrafanaTheme2, SelectableValue, StandardEditorProps } from '@grafana/data';
+import { ScalarDimensionMode, ScalarDimensionConfig } from '@grafana/schema';
 import { InlineField, InlineFieldRow, RadioButtonGroup, Select, useStyles2 } from '@grafana/ui';
 import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils';
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 
-import { ScalarDimensionConfig, ScalarDimensionMode, ScalarDimensionOptions } from '../types';
+import { ScalarDimensionOptions } from '../types';
 
 const fixedValueOption: SelectableValue<string> = {
   label: 'Fixed value',
diff --git a/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx b/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
index 14dab9ba725..f0b06dc871a 100644
--- a/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
@@ -2,12 +2,13 @@ import { css } from '@emotion/css';
 import React, { useCallback, useMemo } from 'react';
 
 import { GrafanaTheme2, SelectableValue, StandardEditorProps } from '@grafana/data';
+import { ScaleDimensionConfig } from '@grafana/schema';
 import { InlineField, InlineFieldRow, Select, useStyles2 } from '@grafana/ui';
 import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils';
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 
 import { validateScaleOptions, validateScaleConfig } from '../scale';
-import { ScaleDimensionConfig, ScaleDimensionOptions } from '../types';
+import { ScaleDimensionOptions } from '../types';
 
 const fixedValueOption: SelectableValue<string> = {
   label: 'Fixed value',
diff --git a/public/app/features/dimensions/editors/TextDimensionEditor.tsx b/public/app/features/dimensions/editors/TextDimensionEditor.tsx
index 12b6304f270..f0958ac440e 100644
--- a/public/app/features/dimensions/editors/TextDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/TextDimensionEditor.tsx
@@ -6,11 +6,12 @@ import {
   StandardEditorsRegistryItem,
   StringFieldConfigSettings,
 } from '@grafana/data';
+import { TextDimensionConfig, TextDimensionMode } from '@grafana/schema';
 import { Button, InlineField, InlineFieldRow, RadioButtonGroup } from '@grafana/ui';
 import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
 import { StringValueEditor } from 'app/core/components/OptionsUI/string';
 
-import { TextDimensionConfig, TextDimensionMode, TextDimensionOptions } from '../types';
+import { TextDimensionOptions } from '../types';
 
 const textOptions = [
   { label: 'Fixed', value: TextDimensionMode.Fixed, description: 'Fixed value' },
diff --git a/public/app/features/dimensions/resource.test.ts b/public/app/features/dimensions/resource.test.ts
index 489e6339abd..704c1a2c6dc 100644
--- a/public/app/features/dimensions/resource.test.ts
+++ b/public/app/features/dimensions/resource.test.ts
@@ -1,5 +1,6 @@
+import { ResourceDimensionMode } from '@grafana/schema';
+
 import { getResourceDimension } from './resource';
-import { ResourceDimensionMode } from './types';
 
 describe('getResourceDimension', () => {
   const publicPath = '/public/';
diff --git a/public/app/features/dimensions/resource.ts b/public/app/features/dimensions/resource.ts
index 6ff97ae8b41..feeead5958f 100644
--- a/public/app/features/dimensions/resource.ts
+++ b/public/app/features/dimensions/resource.ts
@@ -1,6 +1,7 @@
 import { DataFrame } from '@grafana/data';
+import { ResourceDimensionConfig, ResourceDimensionMode } from '@grafana/schema';
 
-import { DimensionSupplier, ResourceDimensionConfig, ResourceDimensionMode } from './types';
+import { DimensionSupplier } from './types';
 import { findField, getLastNotNullFieldValue } from './utils';
 
 //---------------------------------------------------------
diff --git a/public/app/features/dimensions/scalar.test.ts b/public/app/features/dimensions/scalar.test.ts
index 071d83ed00a..9fa506207c6 100644
--- a/public/app/features/dimensions/scalar.test.ts
+++ b/public/app/features/dimensions/scalar.test.ts
@@ -1,9 +1,8 @@
 import { DataFrame, FieldType } from '@grafana/data';
+import { ScalarDimensionMode } from '@grafana/schema';
 
 import { getScalarDimension } from './scalar';
 
-import { ScalarDimensionMode } from '.';
-
 describe('scalar dimensions', () => {
   it('handles string field', () => {
     const values = ['-720', '10', '540', '90', '-210'];
diff --git a/public/app/features/dimensions/scalar.ts b/public/app/features/dimensions/scalar.ts
index d4d9a6f550b..d1c52f5fcb4 100644
--- a/public/app/features/dimensions/scalar.ts
+++ b/public/app/features/dimensions/scalar.ts
@@ -1,6 +1,7 @@
 import { DataFrame, Field } from '@grafana/data';
+import { ScalarDimensionConfig, ScalarDimensionMode } from '@grafana/schema';
 
-import { DimensionSupplier, ScalarDimensionConfig, ScalarDimensionMode } from './types';
+import { DimensionSupplier } from './types';
 import { findField, getLastNotNullFieldValue } from './utils';
 
 //---------------------------------------------------------
diff --git a/public/app/features/dimensions/scale.ts b/public/app/features/dimensions/scale.ts
index 1cda44c3c4d..98ce993877d 100644
--- a/public/app/features/dimensions/scale.ts
+++ b/public/app/features/dimensions/scale.ts
@@ -1,11 +1,10 @@
 import { DataFrame, Field } from '@grafana/data';
 import { getMinMaxAndDelta } from '@grafana/data/src/field/scale';
+import { ScaleDimensionConfig, ScaleDimensionMode } from '@grafana/schema';
 
-import { ScaleDimensionConfig, DimensionSupplier, ScaleDimensionOptions } from './types';
+import { DimensionSupplier, ScaleDimensionOptions } from './types';
 import { findField, getLastNotNullFieldValue } from './utils';
 
-import { ScaleDimensionMode } from '.';
-
 //---------------------------------------------------------
 // Scale dimension
 //---------------------------------------------------------
@@ -43,7 +42,7 @@ export function getScaledDimensionForField(
   }
 
   let scaled = (percent: number) => config.min + percent * delta;
-  if (mode === ScaleDimensionMode.Quadratic) {
+  if (mode === ScaleDimensionMode.Quad) {
     const maxArea = Math.PI * (config.max / 2) ** 2;
     const minArea = Math.PI * (config.min / 2) ** 2;
     const deltaArea = maxArea - minArea;
diff --git a/public/app/features/dimensions/text.ts b/public/app/features/dimensions/text.ts
index 3c2b40cf9cd..4505663a1b6 100644
--- a/public/app/features/dimensions/text.ts
+++ b/public/app/features/dimensions/text.ts
@@ -1,6 +1,7 @@
 import { DataFrame, Field, FieldType, formattedValueToString } from '@grafana/data';
+import { TextDimensionConfig, TextDimensionMode } from '@grafana/schema';
 
-import { DimensionSupplier, TextDimensionConfig, TextDimensionMode } from './types';
+import { DimensionSupplier } from './types';
 import { findField, getLastNotNullFieldValue } from './utils';
 
 //---------------------------------------------------------
diff --git a/public/app/features/dimensions/types.ts b/public/app/features/dimensions/types.ts
index 8e33109b9d5..9e6720f4b9b 100644
--- a/public/app/features/dimensions/types.ts
+++ b/public/app/features/dimensions/types.ts
@@ -1,9 +1,5 @@
 import { Field } from '@grafana/data';
-
-export interface BaseDimensionConfig<T = any> {
-  fixed: T;
-  field?: string;
-}
+import { TextDimensionConfig, TextDimensionMode } from '@grafana/schema';
 
 export interface DimensionSupplier<T = any> {
   /**
@@ -32,17 +28,6 @@ export interface DimensionSupplier<T = any> {
   get: (index: number) => T;
 }
 
-export enum ScaleDimensionMode {
-  Linear = 'linear',
-  Quadratic = 'quad',
-}
-
-/** This will map the field value% to a scaled value within the range */
-export interface ScaleDimensionConfig extends BaseDimensionConfig<number> {
-  min: number;
-  max: number;
-}
-
 /** Places that use the value */
 export interface ScaleDimensionOptions {
   min: number;
@@ -51,16 +36,6 @@ export interface ScaleDimensionOptions {
   hideRange?: boolean; // false
 }
 
-export enum ScalarDimensionMode {
-  Mod = 'mod',
-  Clamped = 'clamped',
-}
-export interface ScalarDimensionConfig extends BaseDimensionConfig<number> {
-  mode: ScalarDimensionMode;
-  min: number;
-  max: number;
-}
-
 export interface ScalarDimensionOptions {
   min: number;
   max: number;
@@ -70,25 +45,12 @@ export interface TextDimensionOptions {
   // anything?
 }
 
-export enum TextDimensionMode {
-  Fixed = 'fixed',
-  Field = 'field',
-  Template = 'template',
-}
-
-export interface TextDimensionConfig extends BaseDimensionConfig<string> {
-  mode: TextDimensionMode;
-}
-
 export const defaultTextConfig: TextDimensionConfig = Object.freeze({
   fixed: '',
   mode: TextDimensionMode.Field,
   field: '',
 });
 
-/** Use the color value from field configs */
-export interface ColorDimensionConfig extends BaseDimensionConfig<string> {}
-
 /** Places that use the value */
 export interface ResourceDimensionOptions {
   resourceType: MediaType;
@@ -99,18 +61,6 @@ export interface ResourceDimensionOptions {
   showSourceRadio?: boolean;
 }
 
-export enum ResourceDimensionMode {
-  Fixed = 'fixed',
-  Field = 'field',
-  Mapping = 'mapping',
-  // pattern? uses field in the pattern
-}
-
-/** Get the path to a resource (URL) */
-export interface ResourceDimensionConfig extends BaseDimensionConfig<string> {
-  mode: ResourceDimensionMode;
-}
-
 export enum ResourceFolderName {
   Icon = 'img/icons/unicons',
   IOT = 'img/icons/iot',
diff --git a/public/app/features/dimensions/utils.ts b/public/app/features/dimensions/utils.ts
index 9b3c2bccd81..31937dc7b3b 100644
--- a/public/app/features/dimensions/utils.ts
+++ b/public/app/features/dimensions/utils.ts
@@ -1,16 +1,18 @@
 import { DataFrame, PanelData, Field, getFieldDisplayName, ReducerID } from '@grafana/data';
 import { config } from '@grafana/runtime';
+import {
+  ResourceDimensionConfig,
+  ScaleDimensionConfig,
+  TextDimensionConfig,
+  ColorDimensionConfig,
+  ScalarDimensionConfig,
+} from '@grafana/schema';
 import {
   getColorDimension,
   getScaledDimension,
   getTextDimension,
   getResourceDimension,
-  ColorDimensionConfig,
   DimensionSupplier,
-  ResourceDimensionConfig,
-  ScaleDimensionConfig,
-  TextDimensionConfig,
-  ScalarDimensionConfig,
 } from 'app/features/dimensions';
 
 import { getScalarDimension } from './scalar';
diff --git a/public/app/plugins/panel/canvas/SetBackground.tsx b/public/app/plugins/panel/canvas/SetBackground.tsx
index c5984c6df0d..2d6d3e157c3 100644
--- a/public/app/plugins/panel/canvas/SetBackground.tsx
+++ b/public/app/plugins/panel/canvas/SetBackground.tsx
@@ -2,10 +2,11 @@ import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { ResourceDimensionMode } from '@grafana/schema';
 import { Portal, useTheme2 } from '@grafana/ui';
 import { Scene } from 'app/features/canvas/runtime/scene';
 
-import { MediaType, ResourceDimensionMode, ResourceFolderName } from '../../../features/dimensions';
+import { MediaType, ResourceFolderName } from '../../../features/dimensions';
 import { ResourcePickerPopover } from '../../../features/dimensions/editors/ResourcePickerPopover';
 
 import { AnchorPoint } from './types';
diff --git a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
index 43abef1335f..ee6e369ef79 100644
--- a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
@@ -4,6 +4,13 @@ import { useObservable } from 'react-use';
 import { Observable, of } from 'rxjs';
 
 import { FieldConfigPropertyItem, StandardEditorProps, StandardEditorsRegistryItem } from '@grafana/data';
+import {
+  ScaleDimensionConfig,
+  ResourceDimensionConfig,
+  ColorDimensionConfig,
+  TextDimensionConfig,
+  ScalarDimensionConfig,
+} from '@grafana/schema';
 import {
   ColorPicker,
   Field,
@@ -22,15 +29,7 @@ import {
   ScalarDimensionEditor,
   TextDimensionEditor,
 } from 'app/features/dimensions/editors';
-import {
-  ScaleDimensionConfig,
-  ResourceDimensionConfig,
-  ColorDimensionConfig,
-  ResourceFolderName,
-  TextDimensionConfig,
-  defaultTextConfig,
-  ScalarDimensionConfig,
-} from 'app/features/dimensions/types';
+import { ResourceFolderName, defaultTextConfig, MediaType } from 'app/features/dimensions/types';
 
 import { defaultStyleConfig, GeometryTypeId, StyleConfig, TextAlignment, TextBaseline } from '../style/types';
 import { styleUsesText } from '../style/utils';
@@ -197,7 +196,7 @@ export const StyleEditor = ({ value, context, onChange, item }: Props) => {
           item={
             {
               settings: {
-                resourceType: 'icon',
+                resourceType: MediaType.Icon,
                 folderName: ResourceFolderName.Marker,
                 placeholderText: hasTextLabel ? 'Select a symbol' : 'Select a symbol or add a text label',
                 placeholderValue: defaultStyleConfig.symbol.fixed,
diff --git a/public/app/plugins/panel/geomap/layers/data/heatMap.tsx b/public/app/plugins/panel/geomap/layers/data/heatMap.tsx
index 24855548585..8df150a4f3a 100644
--- a/public/app/plugins/panel/geomap/layers/data/heatMap.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/heatMap.tsx
@@ -10,10 +10,11 @@ import {
 import Map from 'ol/Map';
 import * as layer from 'ol/layer';
 import { getLocationMatchers } from 'app/features/geo/utils/location';
-import { ScaleDimensionConfig, getScaledDimension } from 'app/features/dimensions';
+import { getScaledDimension } from 'app/features/dimensions';
 import { ScaleDimensionEditor } from 'app/features/dimensions/editors';
 import { FrameVectorSource } from 'app/features/geo/utils/frameVectorSource';
 import { Point } from 'ol/geom';
+import { ScaleDimensionConfig } from '@grafana/schema';
 
 // Configuration options for Heatmap overlays
 export interface HeatmapConfig {
diff --git a/public/app/plugins/panel/geomap/migrations.ts b/public/app/plugins/panel/geomap/migrations.ts
index 6e6369be899..7da1f75818b 100644
--- a/public/app/plugins/panel/geomap/migrations.ts
+++ b/public/app/plugins/panel/geomap/migrations.ts
@@ -11,7 +11,7 @@ import {
   DataTransformerConfig,
   DataTransformerID,
 } from '@grafana/data';
-import { ResourceDimensionMode } from 'app/features/dimensions';
+import { ResourceDimensionMode } from '@grafana/schema';
 
 import { defaultMarkersConfig, MarkersConfig } from './layers/data/markersLayer';
 import { getMarkerAsPath } from './style/markers';
diff --git a/public/app/plugins/panel/geomap/style/types.ts b/public/app/plugins/panel/geomap/style/types.ts
index 5192dbd9afa..6f2a22ba732 100644
--- a/public/app/plugins/panel/geomap/style/types.ts
+++ b/public/app/plugins/panel/geomap/style/types.ts
@@ -2,14 +2,14 @@ import { Style } from 'ol/style';
 
 import {
   ColorDimensionConfig,
-  DimensionSupplier,
   ResourceDimensionConfig,
   ResourceDimensionMode,
   ScaleDimensionConfig,
   ScalarDimensionConfig,
   ScalarDimensionMode,
   TextDimensionConfig,
-} from 'app/features/dimensions';
+} from '@grafana/schema';
+import { DimensionSupplier } from 'app/features/dimensions';
 
 export enum GeometryTypeId {
   Point = 'point',
diff --git a/public/app/plugins/panel/geomap/style/utils.test.ts b/public/app/plugins/panel/geomap/style/utils.test.ts
index be53d13fe41..15546670b82 100644
--- a/public/app/plugins/panel/geomap/style/utils.test.ts
+++ b/public/app/plugins/panel/geomap/style/utils.test.ts
@@ -1,4 +1,4 @@
-import { ResourceDimensionMode } from 'app/features/dimensions';
+import { ResourceDimensionMode } from '@grafana/schema';
 
 import { StyleConfig } from './types';
 import { getStyleConfigState } from './utils';
diff --git a/public/app/plugins/panel/geomap/style/utils.ts b/public/app/plugins/panel/geomap/style/utils.ts
index 607ab05f2d8..9075b271339 100644
--- a/public/app/plugins/panel/geomap/style/utils.ts
+++ b/public/app/plugins/panel/geomap/style/utils.ts
@@ -1,5 +1,5 @@
 import { config } from '@grafana/runtime';
-import { TextDimensionMode } from 'app/features/dimensions';
+import { TextDimensionMode } from '@grafana/schema';
 
 import { getMarkerMaker } from './markers';
 import { defaultStyleConfig, StyleConfig, StyleConfigFields, StyleConfigState } from './types';
diff --git a/public/app/plugins/panel/icon/IconPanel.tsx b/public/app/plugins/panel/icon/IconPanel.tsx
index 70e8028362b..063d1c78109 100644
--- a/public/app/plugins/panel/icon/IconPanel.tsx
+++ b/public/app/plugins/panel/icon/IconPanel.tsx
@@ -1,21 +1,23 @@
 import React, { Component } from 'react';
 
 import { PanelProps } from '@grafana/data';
+import {
+  ColorDimensionConfig,
+  ResourceDimensionConfig,
+  ScalarDimensionConfig,
+  ScaleDimensionConfig,
+  TextDimensionConfig,
+} from '@grafana/schema';
 import { HorizontalConstraint, VerticalConstraint } from 'app/features/canvas';
 import { iconItem } from 'app/features/canvas/elements/icon';
 import { ElementState } from 'app/features/canvas/runtime/element';
 import {
-  ColorDimensionConfig,
   DimensionContext,
   getColorDimensionFromData,
   getResourceDimensionFromData,
   getScalarDimensionFromData,
   getScaleDimensionFromData,
   getTextDimensionFromData,
-  ResourceDimensionConfig,
-  ScalarDimensionConfig,
-  ScaleDimensionConfig,
-  TextDimensionConfig,
 } from 'app/features/dimensions';
 
 import { PanelOptions } from './models.gen';
diff --git a/public/app/plugins/panel/icon/models.gen.ts b/public/app/plugins/panel/icon/models.gen.ts
index 1de5537934d..0dc01c29754 100644
--- a/public/app/plugins/panel/icon/models.gen.ts
+++ b/public/app/plugins/panel/icon/models.gen.ts
@@ -5,7 +5,7 @@
 
 import { CanvasElementOptions } from 'app/features/canvas';
 import { IconConfig } from 'app/features/canvas/elements/icon';
-import { ResourceDimensionMode } from 'app/features/dimensions';
+import { ResourceDimensionMode } from '@grafana/schema';
 
 export interface PanelOptions {
   root: Omit<CanvasElementOptions<IconConfig>, 'type' | 'name'>; // type is forced
diff --git a/public/app/plugins/panel/xychart/models.gen.ts b/public/app/plugins/panel/xychart/models.gen.ts
index f2727a575bf..ffbc557b909 100644
--- a/public/app/plugins/panel/xychart/models.gen.ts
+++ b/public/app/plugins/panel/xychart/models.gen.ts
@@ -6,12 +6,12 @@ import {
   HideableFieldConfig,
   AxisConfig,
   AxisPlacement,
-} from '@grafana/schema';
-import {
   ColorDimensionConfig,
-  DimensionSupplier,
   ScaleDimensionConfig,
   TextDimensionConfig,
+} from '@grafana/schema';
+import {
+  DimensionSupplier,
 } from 'app/features/dimensions';
 
 // export enum ScatterLineMode {
diff --git a/public/app/plugins/panel/xychart/scatter.ts b/public/app/plugins/panel/xychart/scatter.ts
index d3215d8e133..03b3fb42275 100644
--- a/public/app/plugins/panel/xychart/scatter.ts
+++ b/public/app/plugins/panel/xychart/scatter.ts
@@ -13,15 +13,17 @@ import {
 } from '@grafana/data';
 import { alpha } from '@grafana/data/src/themes/colorManipulator';
 import { config } from '@grafana/runtime';
-import { AxisPlacement, ScaleDirection, ScaleOrientation, VisibilityMode } from '@grafana/schema';
-import { UPlotConfigBuilder } from '@grafana/ui';
-import { FacetedData, FacetSeries } from '@grafana/ui/src/components/uPlot/types';
 import {
-  findFieldIndex,
-  getScaledDimensionForField,
+  AxisPlacement,
+  ScaleDirection,
+  ScaleOrientation,
+  VisibilityMode,
   ScaleDimensionConfig,
   ScaleDimensionMode,
-} from 'app/features/dimensions';
+} from '@grafana/schema';
+import { UPlotConfigBuilder } from '@grafana/ui';
+import { FacetedData, FacetSeries } from '@grafana/ui/src/components/uPlot/types';
+import { findFieldIndex, getScaledDimensionForField } from 'app/features/dimensions';
 
 import { pointWithin, Quadtree, Rect } from '../barchart/quadtree';
 
@@ -142,7 +144,7 @@ function getScatterSeries(
       const s = getScaledDimensionForField(
         frame.fields[dims.pointSizeIndex!],
         dims.pointSizeConfig!,
-        ScaleDimensionMode.Quadratic
+        ScaleDimensionMode.Quad
       );
       const vals = Array(frame.length);
       for (let i = 0; i < frame.length; i++) {

From b2e1b3ad91456fc70b407a52c552b718cfa7890c Mon Sep 17 00:00:00 2001
From: Adam Simpson <adam@adamsimpson.net>
Date: Fri, 5 May 2023 16:48:41 -0400
Subject: [PATCH 669/729] Google Cloud Monitor: Fix mem usage for dropdown
 (#67683)

* Google Cloud Monitor: Fix mem usage for dropdown

Previously the Metric name dropdown would attempt to load _all_ the
available metric names into the Select which would eventually crash the
browser if the dataset was large enough.

We can fix this by using AsyncSelect and making another query once a
Service is selected _and_ the user types a few characters.

* fix: update tests for AsyncSelect

* fix lint

* fix: add subset of metrics on initial load
---
 .../__mocks__/cloudMonitoringDatasource.ts    |  1 +
 .../VisualMetricQueryEditor.test.tsx          | 77 ++++---------------
 .../components/VisualMetricQueryEditor.tsx    | 59 ++++++++++----
 .../datasource/cloud-monitoring/datasource.ts | 11 +++
 4 files changed, 70 insertions(+), 78 deletions(-)

diff --git a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts b/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
index 87c377637bf..aff194f3a55 100644
--- a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
@@ -14,6 +14,7 @@ export const createMockDatasource = (overrides?: Partial<Datasource>) => {
     getProjects: jest.fn().mockResolvedValue([]),
     getDefaultProject: jest.fn().mockReturnValue('cloud-monitoring-default-project'),
     templateSrv,
+    filterMetricsByType: jest.fn().mockResolvedValue([]),
     getSLOServices: jest.fn().mockResolvedValue([]),
     migrateQuery: jest.fn().mockImplementation((query) => query),
     timeSrv: getTimeSrv(),
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx
index ec92fe09c53..3037568263c 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx
@@ -1,4 +1,5 @@
-import { act, render, screen, waitFor, within } from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { openMenu, select } from 'react-select-event';
 
@@ -60,6 +61,7 @@ describe('VisualMetricQueryEditor', () => {
     const mockMetricDescriptor = createMockMetricDescriptor({ displayName: 'metricName_test', type: 'test_type' });
     const datasource = createMockDatasource({
       getMetricTypes: jest.fn().mockResolvedValue([createMockMetricDescriptor(), mockMetricDescriptor]),
+      filterMetricsByType: jest.fn().mockResolvedValue([createMockMetricDescriptor(), mockMetricDescriptor]),
       getLabels: jest.fn().mockResolvedValue([]),
     });
 
@@ -72,6 +74,7 @@ describe('VisualMetricQueryEditor', () => {
     });
     const metricName = await screen.findByLabelText('Metric name');
     openMenu(metricName);
+    await userEvent.type(metricName, 'test');
     await waitFor(() => expect(document.body).toHaveTextContent('metricName_test'));
     await act(async () => {
       await select(metricName, 'metricName_test', { container: document.body });
@@ -81,66 +84,6 @@ describe('VisualMetricQueryEditor', () => {
     );
   });
 
-  it('should render available metric options according to the selected service', async () => {
-    const onChange = jest.fn();
-    const query = createMockTimeSeriesList();
-    const datasource = createMockDatasource({
-      getMetricTypes: jest.fn().mockResolvedValue([
-        createMockMetricDescriptor({
-          service: 'service_a',
-          serviceShortName: 'srv_a',
-          type: 'metric1',
-          description: 'description_metric1',
-          displayName: 'displayName_metric1',
-        }),
-        createMockMetricDescriptor({
-          service: 'service_b',
-          serviceShortName: 'srv_b',
-          type: 'metric2',
-          description: 'description_metric2',
-          displayName: 'displayName_metric2',
-        }),
-        createMockMetricDescriptor({
-          service: 'service_b',
-          serviceShortName: 'srv_b',
-          type: 'metric3',
-          description: 'description_metric3',
-          displayName: 'displayName_metric3',
-        }),
-      ]),
-      getLabels: jest.fn().mockResolvedValue([]),
-    });
-
-    render(<VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasource} query={query} />);
-
-    const service = await screen.findByLabelText('Service');
-    openMenu(service);
-    await act(async () => {
-      await select(service, 'Srv A', { container: document.body });
-    });
-    const metricName = await screen.findByLabelText('Metric name');
-    openMenu(metricName);
-
-    const metricNameOptions = screen.getByLabelText('Select options menu');
-    expect(within(metricNameOptions).getByText('description_metric1')).toBeInTheDocument();
-    expect(within(metricNameOptions).getByText('displayName_metric1')).toBeInTheDocument();
-    expect(within(metricNameOptions).queryByText('displayName_metric2')).not.toBeInTheDocument();
-    expect(within(metricNameOptions).queryByText('description_metric2')).not.toBeInTheDocument();
-    expect(within(metricNameOptions).queryByText('displayName_metric3')).not.toBeInTheDocument();
-    expect(within(metricNameOptions).queryByText('description_metric3')).not.toBeInTheDocument();
-
-    openMenu(service);
-    await act(async () => {
-      await select(service, 'Srv B', { container: document.body });
-    });
-    expect(within(metricNameOptions).queryByText('displayName_metric1')).not.toBeInTheDocument();
-    expect(within(metricNameOptions).queryByText('description_metric1')).not.toBeInTheDocument();
-    expect(within(metricNameOptions).getByText('displayName_metric2')).toBeInTheDocument();
-    expect(within(metricNameOptions).getByText('description_metric2')).toBeInTheDocument();
-    expect(within(metricNameOptions).getByText('displayName_metric3')).toBeInTheDocument();
-    expect(within(metricNameOptions).getByText('description_metric3')).toBeInTheDocument();
-  });
-
   it('should have a distinct list of services', async () => {
     const onChange = jest.fn();
     const datasource = createMockDatasource({
@@ -210,6 +153,12 @@ describe('VisualMetricQueryEditor', () => {
     });
     const onChange = jest.fn();
     const datasource = createMockDatasource({
+      filterMetricsByType: jest
+        .fn()
+        .mockResolvedValue([
+          createMockMetricDescriptor(),
+          createMockMetricDescriptor({ type: 'type2', displayName: 'metricName2', metricKind: MetricKind.GAUGE }),
+        ]),
       getMetricTypes: jest
         .fn()
         .mockResolvedValue([
@@ -227,7 +176,11 @@ describe('VisualMetricQueryEditor', () => {
     expect(await screen.findByText('metric.test_groupby')).toBeInTheDocument();
     const metric = await screen.findByLabelText('Metric name');
     openMenu(metric);
-    await select(metric, 'metricName2', { container: document.body });
+    await userEvent.type(metric, 'type2');
+    await waitFor(() => expect(document.body).toHaveTextContent('metricName2'));
+    await act(async () => {
+      await select(metric, 'metricName2', { container: document.body });
+    });
     expect(onChange).toBeCalledWith(
       expect.objectContaining({ filters: ['metric.test_label', '=', 'test', 'AND', 'metric.type', '=', 'type2'] })
     );
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
index 5e9976b3526..dd96bc0a0cb 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
@@ -1,10 +1,11 @@
 import { css } from '@emotion/css';
+import debounce from 'debounce-promise';
 import { startCase, uniqBy } from 'lodash';
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { GrafanaTheme2, SelectableValue, TimeRange } from '@grafana/data';
 import { EditorField, EditorFieldGroup, EditorRow } from '@grafana/experimental';
-import { getSelectStyles, Select, useStyles2, useTheme2 } from '@grafana/ui';
+import { getSelectStyles, Select, AsyncSelect, useStyles2, useTheme2 } from '@grafana/ui';
 
 import CloudMonitoringDatasource from '../datasource';
 import { getAlignmentPickerData, getMetricType, setMetricType } from '../functions';
@@ -159,6 +160,33 @@ export function Editor({
     return services.length > 0 ? uniqBy(services, (s) => s.value) : [];
   };
 
+  const filterMetrics = async (filter: string) => {
+    const metrics = await datasource.filterMetricsByType(projectName, service);
+    const filtered = metrics
+      .filter((m) => m.type.includes(filter.toLowerCase()))
+      .map((m) => ({
+        value: m.type,
+        label: m.displayName,
+        component: function optionComponent() {
+          return (
+            <div>
+              <div className={customStyle}>{m.type}</div>
+              <div className={selectStyles.optionDescription}>{m.description}</div>
+            </div>
+          );
+        },
+      }));
+    return [
+      {
+        label: 'Template Variables',
+        options: variableOptionGroup.options,
+      },
+      ...filtered,
+    ];
+  };
+
+  const debounceFilter = debounce(filterMetrics, 400);
+
   const onMetricTypeChange = ({ value }: SelectableValue<string>) => {
     const metricDescriptor = getSelectedMetricDescriptor(metricDescriptors, value!);
     setMetricDescriptor(metricDescriptor);
@@ -205,6 +233,7 @@ export function Editor({
             <Select
               width="auto"
               onChange={onServiceChange}
+              isLoading={services.length === 0}
               value={[...services, ...variableOptionGroup.options].find((s) => s.value === service)}
               options={[
                 {
@@ -217,21 +246,19 @@ export function Editor({
               inputId={`${refId}-service`}
             />
           </EditorField>
-          <EditorField label="Metric name" width="auto">
-            <Select
-              width="auto"
-              onChange={onMetricTypeChange}
-              value={[...metrics, ...variableOptionGroup.options].find((s) => s.value === metricType)}
-              options={[
-                {
-                  label: 'Template Variables',
-                  options: variableOptionGroup.options,
-                },
-                ...metrics,
-              ]}
-              placeholder="Select Metric"
-              inputId={`${refId}-select-metric`}
-            />
+          <EditorField label="Metric name" width="auto" htmlFor={`${refId}-select-metric`}>
+            <span title={service === '' ? 'Select a service first' : 'Type to search metrics'}>
+              <AsyncSelect
+                width="auto"
+                onChange={onMetricTypeChange}
+                value={[...metrics, ...variableOptionGroup.options].find((s) => s.value === metricType)}
+                loadOptions={debounceFilter}
+                defaultOptions={metrics.slice(0, 100)}
+                placeholder="Select Metric"
+                inputId={`${refId}-select-metric`}
+                disabled={service === ''}
+              />
+            </span>
           </EditorField>
         </EditorFieldGroup>
       </EditorRow>
diff --git a/public/app/plugins/datasource/cloud-monitoring/datasource.ts b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
index 0c5a9c70af1..780ef8630b3 100644
--- a/public/app/plugins/datasource/cloud-monitoring/datasource.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
@@ -196,6 +196,17 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
     ) as Promise<MetricDescriptor[]>;
   }
 
+  async filterMetricsByType(projectName: string, filter: string): Promise<MetricDescriptor[]> {
+    if (!projectName) {
+      return [];
+    }
+
+    return this.getResource(
+      `metricDescriptors/v3/projects/${this.templateSrv.replace(projectName)}/metricDescriptors`,
+      { filter: `metric.type : "${filter}"` }
+    );
+  }
+
   async getSLOServices(projectName: string): Promise<Array<SelectableValue<string>>> {
     return this.getResource(`services/v3/projects/${this.templateSrv.replace(projectName)}/services?pageSize=1000`);
   }

From 3145660f5a1b13315db92da84245c2d8e9a3c933 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Sat, 6 May 2023 10:00:43 +0200
Subject: [PATCH 670/729] Elasticsearch: Run getTerms trough resource call if
 enableElasticsearchBackendQuerying enabled (#67848)

* Elasticsearch: Run getTerms torugh backend if toggle enabled

* Add template variables to devenv dashboard for easier testing

* Add TODO

* Run feature toggle gen to fix build
---
 .../elasticsearch_complex.json                | 508 +++++++++++++++++-
 pkg/tsdb/elasticsearch/elasticsearch.go       |   5 +-
 .../elasticsearch/datasource.test.ts          |  63 +++
 .../datasource/elasticsearch/datasource.ts    |  23 +-
 4 files changed, 591 insertions(+), 8 deletions(-)

diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_complex.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_complex.json
index 5c277b491f2..dc4e4b7810c 100644
--- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_complex.json
+++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_complex.json
@@ -5274,18 +5274,520 @@
       ],
       "title": "Logs",
       "type": "row"
+     },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 13
+      },
+      "id": 97,
+      "panels": [
+        {
+          "datasource": {
+            "type": "elasticsearch",
+            "uid": "gdev-elasticsearch"
+          },
+          "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": 98,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "alias": "",
+              "bucketAggs": [
+                {
+                  "field": "@timestamp",
+                  "id": "2",
+                  "settings": {
+                    "interval": "auto"
+                  },
+                  "type": "date_histogram"
+                }
+              ],
+              "datasource": {
+                "type": "elasticsearch",
+                "uid": "gdev-elasticsearch"
+              },
+              "metrics": [
+                {
+                  "id": "1",
+                  "type": "count"
+                }
+              ],
+              "query": "hostname: $hostname",
+              "refId": "A",
+              "timeField": "@timestamp"
+            }
+          ],
+          "title": "$hostname count",
+          "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "elasticsearch",
+            "uid": "gdev-elasticsearch"
+          },
+          "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": 12,
+            "y": 1
+          },
+          "id": 99,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "alias": "",
+              "bucketAggs": [
+                {
+                  "field": "@timestamp",
+                  "id": "2",
+                  "settings": {
+                    "interval": "auto"
+                  },
+                  "type": "date_histogram"
+                }
+              ],
+              "datasource": {
+                "type": "elasticsearch",
+                "uid": "gdev-elasticsearch"
+              },
+              "metrics": [
+                {
+                  "field": "float",
+                  "id": "1",
+                  "type": "avg"
+                }
+              ],
+              "query": "hostname: $hostname",
+              "refId": "A",
+              "timeField": "@timestamp"
+            }
+          ],
+          "title": "$hostname average float",
+          "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "elasticsearch",
+            "uid": "gdev-elasticsearch"
+          },
+          "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": 9
+          },
+          "id": 100,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "alias": "",
+              "bucketAggs": [
+                {
+                  "field": "@timestamp",
+                  "id": "2",
+                  "settings": {
+                    "interval": "auto"
+                  },
+                  "type": "date_histogram"
+                }
+              ],
+              "datasource": {
+                "type": "elasticsearch",
+                "uid": "gdev-elasticsearch"
+              },
+              "metrics": [
+                {
+                  "id": "1",
+                  "type": "count"
+                }
+              ],
+              "query": "hostname: $hostname AND level: $level_by_hostname",
+              "refId": "A",
+              "timeField": "@timestamp"
+            }
+          ],
+          "title": "$hostname and $level_by_hostname count",
+          "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "elasticsearch",
+            "uid": "gdev-elasticsearch"
+          },
+          "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": 12,
+            "y": 9
+          },
+          "id": 101,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "alias": "",
+              "bucketAggs": [
+                {
+                  "field": "@timestamp",
+                  "id": "2",
+                  "settings": {
+                    "interval": "auto"
+                  },
+                  "type": "date_histogram"
+                }
+              ],
+              "datasource": {
+                "type": "elasticsearch",
+                "uid": "gdev-elasticsearch"
+              },
+              "metrics": [
+                {
+                  "field": "float",
+                  "id": "1",
+                  "type": "avg"
+                }
+              ],
+              "query": "hostname: $hostname AND level: $level_by_hostname",
+              "refId": "A",
+              "timeField": "@timestamp"
+            }
+          ],
+          "title": "$hostname and $level_by_hostname average float",
+          "type": "timeseries"
+        }
+      ],
+      "title": "Using template variables",
+      "type": "row"
     }
   ],
   "refresh": "",
   "schemaVersion": 38,
   "style": "dark",
-  "tags": [ 
+  "tags": [
     "gdev",
     "elasticsearch",
     "datasource-test"
   ],
   "templating": {
-    "list": []
+    "list": [
+      {
+        "current": {
+          "selected": true,
+          "text": "hostname2",
+          "value": "hostname2"
+        },
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "gdev-elasticsearch"
+        },
+        "definition": "{\"find\": \"terms\", \"field\": \"hostname\"}",
+        "hide": 0,
+        "includeAll": false,
+        "multi": false,
+        "name": "hostname",
+        "options": [],
+        "query": "{\"find\": \"terms\", \"field\": \"hostname\"}",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": "error",
+          "value": "error"
+        },
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "gdev-elasticsearch"
+        },
+        "definition": "{\"find\": \"terms\", \"field\": \"level\", \"query\": \"hostname:$hostname\"}",
+        "hide": 0,
+        "includeAll": false,
+        "multi": false,
+        "name": "level_by_hostname",
+        "options": [],
+        "query": "{\"find\": \"terms\", \"field\": \"level\", \"query\": \"hostname:$hostname\"}",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "gdev-elasticsearch"
+        },
+        "filters": [],
+        "hide": 0,
+        "name": "adhoc",
+        "skipUrlSync": false,
+        "type": "adhoc"
+      }
+    ]
   },
   "time": {
     "from": "now-6h",
@@ -5293,7 +5795,7 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Datasource tests - Elasticsearch complex",
+  "title": "Datasource tests - Elasticsearch complex with template variables",
   "uid": "es_complex",
   "version": 1,
   "weekStart": ""
diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go
index 546345d070a..13af0911895 100644
--- a/pkg/tsdb/elasticsearch/elasticsearch.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch.go
@@ -183,8 +183,9 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 	logger := eslog.FromContext(ctx)
 	// allowed paths for resource calls:
 	// - empty string for fetching db version
-	// - /?/_mapping for fetching index mapping
-	if req.Path != "" && !strings.HasSuffix(req.Path, "/_mapping") {
+	// - ?/_mapping for fetching index mapping
+	// - _msearch for executing getTerms queries
+	if req.Path != "" && !strings.HasSuffix(req.Path, "/_mapping") && req.Path != "_msearch" {
 		return fmt.Errorf("invalid resource URL: %s", req.Path)
 	}
 
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index 149103c6ff7..479e9e20852 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -1327,6 +1327,69 @@ describe('ElasticDatasource using backend', () => {
     });
   });
 
+  describe('metricFindQuery', () => {
+    async function runScenario() {
+      const data = {
+        responses: [
+          {
+            aggregations: {
+              '1': {
+                buckets: [
+                  { doc_count: 1, key: 'test' },
+                  {
+                    doc_count: 2,
+                    key: 'test2',
+                    key_as_string: 'test2_as_string',
+                  },
+                ],
+              },
+            },
+          },
+        ],
+      };
+
+      const { ds } = getTestContext();
+      const postResourceMock = jest.spyOn(ds, 'postResource');
+      postResourceMock.mockResolvedValue(data);
+
+      const results = await ds.metricFindQuery('{"find": "terms", "field": "test"}');
+
+      expect(ds.postResource).toHaveBeenCalledTimes(1);
+      const requestOptions = postResourceMock.mock.calls[0][1];
+      const parts = requestOptions.split('\n');
+      const header = JSON.parse(parts[0]);
+      const body = JSON.parse(parts[1]);
+
+      return { results, body, header };
+    }
+
+    it('should get results', async () => {
+      const { results } = await runScenario();
+      expect(results.length).toEqual(2);
+    });
+
+    it('should use key or key_as_string', async () => {
+      const { results } = await runScenario();
+      expect(results[0].text).toEqual('test');
+      expect(results[1].text).toEqual('test2_as_string');
+    });
+
+    it('should not set search type to count', async () => {
+      const { header } = await runScenario();
+      expect(header.search_type).not.toEqual('count');
+    });
+
+    it('should set size to 0', async () => {
+      const { body } = await runScenario();
+      expect(body.size).toBe(0);
+    });
+
+    it('should not set terms aggregation size to 0', async () => {
+      const { body } = await runScenario();
+      expect(body['aggs']['1']['terms'].size).not.toBe(0);
+    });
+  });
+
   describe('getFields', () => {
     const getFieldsMockData = {
       '[test-]YYYY.MM.DD': {
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 6647112e8c9..7e2cad0728e 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -30,7 +30,7 @@ import {
   LogRowContextOptions,
   SupplementaryQueryOptions,
 } from '@grafana/data';
-import { DataSourceWithBackend, getDataSourceSrv, config } from '@grafana/runtime';
+import { DataSourceWithBackend, getDataSourceSrv, config, BackendSrvRequest } from '@grafana/runtime';
 import { queryLogsVolume } from 'app/core/logsModel';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
@@ -148,6 +148,18 @@ export class ElasticDatasource
     this.legacyQueryRunner = new LegacyQueryRunner(this, this.templateSrv);
   }
 
+  getResourceRequest(path: string, params?: BackendSrvRequest['params'], options?: Partial<BackendSrvRequest>) {
+    return this.getResource(path, params, options);
+  }
+
+  postResourceRequest(path: string, data?: BackendSrvRequest['data'], options?: Partial<BackendSrvRequest>) {
+    const resourceOptions = options ?? {};
+    resourceOptions.headers = resourceOptions.headers ?? {};
+    resourceOptions.headers['content-type'] = 'application/x-ndjson';
+
+    return this.postResource(path, data, resourceOptions);
+  }
+
   async importFromAbstractQueries(abstractQueries: AbstractQuery[]): Promise<ElasticsearchQuery[]> {
     return abstractQueries.map((abstractQuery) => this.languageProvider.importFromAbstractQuery(abstractQuery));
   }
@@ -532,7 +544,12 @@ export class ElasticDatasource
 
     const url = this.getMultiSearchUrl();
 
-    return this.legacyQueryRunner.request('POST', url, esQuery).pipe(
+    const termsObservable = config.featureToggles.enableElasticsearchBackendQuerying
+      ? // TODO: This is run trough resource call, but maybe should run trough query
+        from(this.postResourceRequest(url, esQuery))
+      : this.legacyQueryRunner.request('POST', url, esQuery);
+
+    return termsObservable.pipe(
       map((res) => {
         if (!res.responses[0].aggregations) {
           return [];
@@ -743,7 +760,7 @@ export class ElasticDatasource
   private getDatabaseVersionUncached(): Promise<SemVer | null> {
     // we want this function to never fail
     const getDbVersionObservable = config.featureToggles.enableElasticsearchBackendQuerying
-      ? from(this.getResource(''))
+      ? from(this.getResourceRequest(''))
       : this.legacyQueryRunner.request('GET', '/');
 
     return lastValueFrom(getDbVersionObservable).then(

From 9788646110359c5c8d33a1313f75e31f28e509e0 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Sat, 6 May 2023 07:35:50 -0700
Subject: [PATCH 671/729] Docs: Add DataFrame notice to plugin migration guide
 (#67947)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
---
 .../plugins/migration-guide/v9.x-v10.x/_index.md          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/sources/developers/plugins/migration-guide/v9.x-v10.x/_index.md b/docs/sources/developers/plugins/migration-guide/v9.x-v10.x/_index.md
index 5e6fe5011d6..2b5c8ef1dc5 100644
--- a/docs/sources/developers/plugins/migration-guide/v9.x-v10.x/_index.md
+++ b/docs/sources/developers/plugins/migration-guide/v9.x-v10.x/_index.md
@@ -24,3 +24,11 @@ Recommended actions:
 - Review the React 18 [upgrade docs](https://react.dev/blog/2022/03/08/react-18-upgrade-guide)
 - Test your plugins against one of the latest [grafana-dev docker images](https://hub.docker.com/r/grafana/grafana-dev/tags?page=1) (for example, [this one](https://hub.docker.com/layers/grafana/grafana-dev/10.0.0-111404pre/images/sha256-ac78acf54b44bd2ce7e68b796b1df47030da7f35e53b02bc3eec3f4de05f780f?context=explore))
 - Add a comment to the [forum discussion](https://community.grafana.com/t/grafana-10-is-upgrading-to-react-18/86051) if your plugin is impacted in any way. Either to socialise the changes needed for your plugin or to reach out and ask for help yourself.
+
+## DataFrame field values are now just arrays
+
+In Grafana 10, the values in DataFrames are now managed as simple JavaScript arrays (see [#66480](https://github.com/grafana/grafana/issues/66480)). It is no longer necessary to wrap values in a [Vector<T>](https://github.com/grafana/grafana/blob/v9.5.x/packages/grafana-data/src/types/vector.ts) implementation. Most code targeting 9.x will continue to work without any issues. In the rare case that existing code directly implements [Vector<T>](https://github.com/grafana/grafana/blob/v9.5.x/packages/grafana-data/src/types/vector.ts) rather than extending/using base classes, this should either return an array or extend [FunctionalVector<T>](https://github.com/grafana/grafana/blob/v10.0.x/packages/grafana-data/src/vector/FunctionalVector.ts#L9). All Vector implementations have been deprecated and will be removed in the future.
+
+When writing plugins that should run on 9.x, continue to use the Vector interfaces; when targeting 10+ you can now use simple arrays rather than wrapper classes.
+
+To make this transition seamless, the Original JavaScript Sin™ was employed: the native Array prototype [had to be extended](https://github.com/grafana/grafana/blob/v10.0.x/packages/grafana-data/src/types/vector.ts) with several Vector methods. We will atone and undo this in v11, when Vector interfaces and classes are removed.

From 69a38def63f058bede36357e08da0f5c016422f5 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Sat, 6 May 2023 23:48:25 +0300
Subject: [PATCH 672/729] Prometheus: Fix Query Inspector expression range
 value (#67919)

* Use metadata from respective query

* Unit test to cover having proper metadata for each query we run
---
 .../prometheus/result_transformer.test.ts     | 56 ++++++++++++++++++-
 .../prometheus/result_transformer.ts          |  5 +-
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
index a738eaf9e6f..2b4be5767ff 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
@@ -1,9 +1,9 @@
 import {
+  createDataFrame,
   DataFrame,
   DataQueryRequest,
   DataQueryResponse,
   FieldType,
-  createDataFrame,
   PreferredVisualisationType,
 } from '@grafana/data';
 
@@ -828,6 +828,60 @@ describe('Prometheus Result Transformer', () => {
       expect(transformedTableDataFrames[1].fields[1].values).toEqual([]);
       expect(transformedTableDataFrames[1].fields[0].values).toEqual([]);
     });
+
+    it('transforms dataframes with metadata resolving from their refIds', () => {
+      const value1 = 'value1';
+      const value2 = 'value2';
+      const executedQueryForRefA = 'Expr: avg_over_time(access_evaluation_duration_bucket[15s])\nStep: 15s';
+      const executedQueryForRefB = 'Expr: avg_over_time(access_evaluation_duration_bucket[5m])\nStep: 15s';
+
+      const dataframes = [
+        createDataFrame({
+          refId: 'A',
+          meta: {
+            typeVersion: [0, 1],
+            custom: {
+              resultType: 'vector',
+            },
+            executedQueryString: executedQueryForRefA,
+          },
+          fields: [
+            { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+            {
+              name: 'value',
+              type: FieldType.number,
+              values: [6, 5, 4],
+              labels: { label1: value1, label2: value2 },
+            },
+          ],
+        }),
+        createDataFrame({
+          refId: 'B',
+          meta: {
+            typeVersion: [0, 1],
+            custom: {
+              resultType: 'vector',
+            },
+            executedQueryString: executedQueryForRefB,
+          },
+          fields: [
+            { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+            {
+              name: 'value',
+              type: FieldType.number,
+              values: [6, 5, 4],
+              labels: { label1: value1, label2: value2 },
+            },
+          ],
+        }),
+      ];
+
+      const transformedTableDataFrames = transformDFToTable(dataframes);
+      expect(transformedTableDataFrames[0].meta).toBeTruthy();
+      expect(transformedTableDataFrames[1].meta).toBeTruthy();
+      expect(transformedTableDataFrames[0].meta?.executedQueryString).toEqual(executedQueryForRefA);
+      expect(transformedTableDataFrames[1].meta?.executedQueryString).toEqual(executedQueryForRefB);
+    });
   });
 
   describe('transform', () => {
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index f430483e8c8..c8240735e45 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -247,7 +247,10 @@ export function transformDFToTable(dfs: DataFrame[]): DataFrame[] {
       refId,
       fields,
       // Prometheus specific UI for instant queries
-      meta: { ...dfs[0].meta, preferredVisualisationType: 'rawPrometheus' as PreferredVisualisationType },
+      meta: {
+        ...dataFramesByRefId[refId][0].meta,
+        preferredVisualisationType: 'rawPrometheus' as PreferredVisualisationType,
+      },
       length: timeField.values.length,
     };
   });

From 32fafffed775ab2e2a3547f0cd404d92a327cf5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Sun, 7 May 2023 15:21:40 +0200
Subject: [PATCH 673/729] PanelQueryRunner: Return previous processed
 (transform+field config) series for loading state  (#67768)

* Return same series for loading state

* Fix shared query issue

* include structureRev

* heatmap should depend on the series, not the wrapper

* fix more panels

* keep config for comparison

* fieldConfig.fieldConfig!

* cleanup

* cmon

---------

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 .betterer.results                             |   3 +-
 .../features/query/state/PanelQueryRunner.ts  | 173 +++++++++---------
 .../plugins/panel/barchart/BarChartPanel.tsx  |   2 +-
 .../panel/candlestick/CandlestickPanel.tsx    |   2 +-
 .../plugins/panel/heatmap/HeatmapPanel.tsx    |   4 +-
 public/app/plugins/panel/heatmap/fields.ts    |   7 +-
 public/app/plugins/panel/heatmap/module.tsx   |   4 +-
 .../app/plugins/panel/heatmap/suggestions.ts  |   2 +-
 .../panel/histogram/HistogramPanel.tsx        |   2 +-
 .../state-timeline/StateTimelinePanel.tsx     |   4 +-
 .../status-history/StatusHistoryPanel.tsx     |   4 +-
 .../panel/timeseries/TimeSeriesPanel.tsx      |   2 +-
 public/app/plugins/panel/trend/TrendPanel.tsx |   2 +-
 .../plugins/panel/xychart/XYChartPanel2.tsx   |   2 +-
 14 files changed, 110 insertions(+), 103 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index b644ccadb0f..4f0262e4ecb 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5594,8 +5594,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/plugins/panel/heatmap/palettes.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index 19aea5e7c5d..390fa537339 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash';
-import { MonoTypeOperatorFunction, Observable, of, ReplaySubject, Unsubscribable } from 'rxjs';
+import { Observable, of, ReplaySubject, Unsubscribable } from 'rxjs';
 import { map, mergeMap } from 'rxjs/operators';
 
 import {
@@ -26,6 +26,7 @@ import {
   toDataFrame,
   transformDataFrame,
   preProcessPanelData,
+  ApplyFieldOverrideOptions,
 } from '@grafana/data';
 import { getTemplateSrv, toDataQueryError } from '@grafana/runtime';
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
@@ -91,7 +92,9 @@ export class PanelQueryRunner {
   getData(options: GetDataOptions): Observable<PanelData> {
     const { withFieldConfig, withTransforms } = options;
     let structureRev = 1;
-    let lastData: DataFrame[] = [];
+    let lastFieldConfig: ApplyFieldOverrideOptions | undefined = undefined;
+    let lastProcessedFrames: DataFrame[] = [];
+    let lastRawFrames: DataFrame[] = [];
     let isFirstPacket = true;
     let lastConfigRev = -1;
 
@@ -105,97 +108,103 @@ export class PanelQueryRunner {
     }
 
     return this.subject.pipe(
-      this.getTransformationsStream(withTransforms),
-      map((data: PanelData) => {
-        let processedData = data;
-        let streamingPacketWithSameSchema = false;
+      mergeMap((data: PanelData) => {
+        let fieldConfig = this.dataConfigSource.getFieldOverrideOptions();
 
-        if (withFieldConfig && data.series?.length) {
-          if (lastConfigRev === this.dataConfigSource.configRev) {
-            const streamingDataFrame = data.series.find((data) => isStreamingDataFrame(data)) as
-              | StreamingDataFrame
-              | undefined;
+        if (data.series === lastRawFrames && lastFieldConfig?.fieldConfig === fieldConfig?.fieldConfig) {
+          return of({ ...data, structureRev, series: lastProcessedFrames });
+        }
+
+        lastFieldConfig = fieldConfig;
+        lastRawFrames = data.series;
+        let dataWithTransforms = of(data);
+
+        if (withTransforms) {
+          dataWithTransforms = this.applyTransformations(data);
+        }
+
+        return dataWithTransforms.pipe(
+          map((data: PanelData) => {
+            let processedData = data;
+            let streamingPacketWithSameSchema = false;
+
+            if (withFieldConfig && data.series?.length) {
+              if (lastConfigRev === this.dataConfigSource.configRev) {
+                const streamingDataFrame = data.series.find((data) => isStreamingDataFrame(data)) as
+                  | StreamingDataFrame
+                  | undefined;
+
+                if (
+                  streamingDataFrame &&
+                  !streamingDataFrame.packetInfo.schemaChanged &&
+                  // TODO: remove the condition below after fixing
+                  // https://github.com/grafana/grafana/pull/41492#issuecomment-970281430
+                  lastProcessedFrames[0].fields.length === streamingDataFrame.fields.length
+                ) {
+                  processedData = {
+                    ...processedData,
+                    series: lastProcessedFrames.map((frame, frameIndex) => ({
+                      ...frame,
+                      length: data.series[frameIndex].length,
+                      fields: frame.fields.map((field, fieldIndex) => ({
+                        ...field,
+                        values: data.series[frameIndex].fields[fieldIndex].values,
+                        state: {
+                          ...field.state,
+                          calcs: undefined,
+                          range: undefined,
+                        },
+                      })),
+                    })),
+                  };
+
+                  streamingPacketWithSameSchema = true;
+                }
+              }
+
+              if (fieldConfig != null && (isFirstPacket || !streamingPacketWithSameSchema)) {
+                lastConfigRev = this.dataConfigSource.configRev!;
+                processedData = {
+                  ...processedData,
+                  series: applyFieldOverrides({
+                    timeZone: data.request?.timezone ?? 'browser',
+                    data: processedData.series,
+                    ...fieldConfig!,
+                  }),
+                };
+                isFirstPacket = false;
+              }
+            }
 
             if (
-              streamingDataFrame &&
-              !streamingDataFrame.packetInfo.schemaChanged &&
-              // TODO: remove the condition below after fixing
-              // https://github.com/grafana/grafana/pull/41492#issuecomment-970281430
-              lastData[0].fields.length === streamingDataFrame.fields.length
+              !streamingPacketWithSameSchema &&
+              !compareArrayValues(lastProcessedFrames, processedData.series, compareDataFrameStructures)
             ) {
-              processedData = {
-                ...processedData,
-                series: lastData.map((frame, frameIndex) => ({
-                  ...frame,
-                  length: data.series[frameIndex].length,
-                  fields: frame.fields.map((field, fieldIndex) => ({
-                    ...field,
-                    values: data.series[frameIndex].fields[fieldIndex].values,
-                    state: {
-                      ...field.state,
-                      calcs: undefined,
-                      range: undefined,
-                    },
-                  })),
-                })),
-              };
-
-              streamingPacketWithSameSchema = true;
+              structureRev++;
             }
-          }
 
-          // Apply field defaults and overrides
-          let fieldConfig = this.dataConfigSource.getFieldOverrideOptions();
+            lastProcessedFrames = processedData.series;
 
-          if (fieldConfig != null && (isFirstPacket || !streamingPacketWithSameSchema)) {
-            lastConfigRev = this.dataConfigSource.configRev!;
-            processedData = {
-              ...processedData,
-              series: applyFieldOverrides({
-                timeZone: data.request?.timezone ?? 'browser',
-                data: processedData.series,
-                ...fieldConfig!,
-              }),
-            };
-            isFirstPacket = false;
-          }
-        }
-
-        if (
-          !streamingPacketWithSameSchema &&
-          !compareArrayValues(lastData, processedData.series, compareDataFrameStructures)
-        ) {
-          structureRev++;
-        }
-        lastData = processedData.series;
-
-        return { ...processedData, structureRev };
+            return { ...processedData, structureRev };
+          })
+        );
       })
     );
   }
 
-  private getTransformationsStream = (withTransforms: boolean): MonoTypeOperatorFunction<PanelData> => {
-    return (inputStream) =>
-      inputStream.pipe(
-        mergeMap((data) => {
-          if (!withTransforms) {
-            return of(data);
-          }
+  private applyTransformations(data: PanelData): Observable<PanelData> {
+    const transformations = this.dataConfigSource.getTransformations();
 
-          const transformations = this.dataConfigSource.getTransformations();
+    if (!transformations || transformations.length === 0) {
+      return of(data);
+    }
 
-          if (!transformations || transformations.length === 0) {
-            return of(data);
-          }
+    const ctx: DataTransformContext = {
+      interpolate: (v: string) => getTemplateSrv().replace(v, data?.request?.scopedVars),
+    };
 
-          const ctx: DataTransformContext = {
-            interpolate: (v: string) => getTemplateSrv().replace(v, data?.request?.scopedVars),
-          };
-
-          return transformDataFrame(transformations, data.series, ctx).pipe(map((series) => ({ ...data, series })));
-        })
-      );
-  };
+    return transformDataFrame(transformations, data.series, ctx).pipe(map((series) => ({ ...data, series })));
+  }
 
   async run(options: QueryRunnerOptions) {
     const {
@@ -216,7 +225,7 @@ export class PanelQueryRunner {
     } = options;
 
     if (isSharedDashboardQuery(datasource)) {
-      this.pipeToSubject(runSharedRequest(options, queries[0]), panelId);
+      this.pipeToSubject(runSharedRequest(options, queries[0]), panelId, true);
       return;
     }
 
@@ -284,7 +293,7 @@ export class PanelQueryRunner {
     }
   }
 
-  private pipeToSubject(observable: Observable<PanelData>, panelId?: number) {
+  private pipeToSubject(observable: Observable<PanelData>, panelId?: number, skipPreProcess = false) {
     if (this.subscription) {
       this.subscription.unsubscribe();
     }
@@ -299,7 +308,7 @@ export class PanelQueryRunner {
 
     this.subscription = panelData.subscribe({
       next: (data) => {
-        this.lastResult = preProcessPanelData(data, this.lastResult);
+        this.lastResult = skipPreProcess ? data : preProcessPanelData(data, this.lastResult);
         // Store preprocessed query results for applying overrides later on in the pipeline
         this.subject.next(this.lastResult);
       },
diff --git a/public/app/plugins/panel/barchart/BarChartPanel.tsx b/public/app/plugins/panel/barchart/BarChartPanel.tsx
index 5ca2d8543d5..748151b1758 100644
--- a/public/app/plugins/panel/barchart/BarChartPanel.tsx
+++ b/public/app/plugins/panel/barchart/BarChartPanel.tsx
@@ -98,7 +98,7 @@ export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZ
   const frame0Ref = useRef<DataFrame>();
   const colorByFieldRef = useRef<Field>();
 
-  const info = useMemo(() => prepareBarChartDisplayValues(data?.series, theme, options), [data, theme, options]);
+  const info = useMemo(() => prepareBarChartDisplayValues(data.series, theme, options), [data.series, theme, options]);
   const chartDisplay = 'viz' in info ? info : null;
 
   colorByFieldRef.current = chartDisplay?.colorByField;
diff --git a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
index 28461006b55..a8964f0c6ad 100644
--- a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
+++ b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
@@ -49,7 +49,7 @@ export const CandlestickPanel = ({
 
   const info = useMemo(() => {
     return prepareCandlestickFields(data.series, options, theme, timeRange);
-  }, [data, options, theme, timeRange]);
+  }, [data.series, options, theme, timeRange]);
 
   const { renderers, tweakScale, tweakAxis, shouldRenderPrice } = useMemo(() => {
     let tweakScale = (opts: ScaleProps, forField: Field) => opts;
diff --git a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
index c6c8c18cf44..92a2e6bd71f 100644
--- a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
@@ -56,11 +56,11 @@ export const HeatmapPanel = ({
 
   const info = useMemo(() => {
     try {
-      return prepareHeatmapData(data, options, theme, getFieldLinksSupplier);
+      return prepareHeatmapData(data.series, data.annotations, options, theme, getFieldLinksSupplier);
     } catch (ex) {
       return { warning: `${ex}` };
     }
-  }, [data, options, theme, getFieldLinksSupplier]);
+  }, [data.series, data.annotations, options, theme, getFieldLinksSupplier]);
 
   const facets = useMemo(() => {
     let exemplarsXFacet: number[] = []; // "Time" field
diff --git a/public/app/plugins/panel/heatmap/fields.ts b/public/app/plugins/panel/heatmap/fields.ts
index 9664e2cc18d..9c3aae6fcd4 100644
--- a/public/app/plugins/panel/heatmap/fields.ts
+++ b/public/app/plugins/panel/heatmap/fields.ts
@@ -8,7 +8,6 @@ import {
   GrafanaTheme2,
   LinkModel,
   outerJoinDataFrames,
-  PanelData,
   ValueFormatter,
   ValueLinkConfig,
 } from '@grafana/data';
@@ -56,17 +55,17 @@ export interface HeatmapData {
 }
 
 export function prepareHeatmapData(
-  data: PanelData,
+  frames: DataFrame[],
+  annotations: DataFrame[] | undefined,
   options: PanelOptions,
   theme: GrafanaTheme2,
   getFieldLinks?: (exemplars: DataFrame, field: Field) => (config: ValueLinkConfig) => Array<LinkModel<Field>>
 ): HeatmapData {
-  let frames = data.series;
   if (!frames?.length) {
     return {};
   }
 
-  const exemplars = data.annotations?.find((f) => f.name === 'exemplar');
+  const exemplars = annotations?.find((f) => f.name === 'exemplar');
 
   if (getFieldLinks) {
     exemplars?.fields.forEach((field, index) => {
diff --git a/public/app/plugins/panel/heatmap/module.tsx b/public/app/plugins/panel/heatmap/module.tsx
index 00586881cca..36772167e57 100644
--- a/public/app/plugins/panel/heatmap/module.tsx
+++ b/public/app/plugins/panel/heatmap/module.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { FieldConfigProperty, FieldType, identityOverrideProcessor, PanelData, PanelPlugin } from '@grafana/data';
+import { FieldConfigProperty, FieldType, identityOverrideProcessor, PanelPlugin } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import {
   AxisPlacement,
@@ -48,7 +48,7 @@ export const plugin = new PanelPlugin<PanelOptions, GraphFieldConfig>(HeatmapPan
     let isOrdinalY = false;
 
     try {
-      const v = prepareHeatmapData({ series: context.data } as PanelData, opts, config.theme2);
+      const v = prepareHeatmapData(context.data, undefined, opts, config.theme2);
       isOrdinalY = readHeatmapRowsCustomMeta(v.heatmap).yOrdinalDisplay != null;
     } catch {}
 
diff --git a/public/app/plugins/panel/heatmap/suggestions.ts b/public/app/plugins/panel/heatmap/suggestions.ts
index 57c514f635e..af8e26f4b70 100644
--- a/public/app/plugins/panel/heatmap/suggestions.ts
+++ b/public/app/plugins/panel/heatmap/suggestions.ts
@@ -18,7 +18,7 @@ export class HeatmapSuggestionsSupplier {
       return;
     }
 
-    const info = prepareHeatmapData(builder.data, defaultPanelOptions, config.theme2);
+    const info = prepareHeatmapData(builder.data.series, undefined, defaultPanelOptions, config.theme2);
     if (!info || info.warning) {
       return;
     }
diff --git a/public/app/plugins/panel/histogram/HistogramPanel.tsx b/public/app/plugins/panel/histogram/HistogramPanel.tsx
index 84e6ff96eeb..ec8dde8a4a8 100644
--- a/public/app/plugins/panel/histogram/HistogramPanel.tsx
+++ b/public/app/plugins/panel/histogram/HistogramPanel.tsx
@@ -13,7 +13,7 @@ export const HistogramPanel = ({ data, options, width, height }: Props) => {
   const theme = useTheme2();
 
   const histogram = useMemo(() => {
-    if (!data?.series?.length) {
+    if (!data.series.length) {
       return undefined;
     }
 
diff --git a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
index 8d345227b99..6baf9662a1d 100644
--- a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
+++ b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
@@ -71,8 +71,8 @@ export const StateTimelinePanel = ({
   };
 
   const { frames, warn } = useMemo(
-    () => prepareTimelineFields(data?.series, options.mergeValues ?? true, timeRange, theme),
-    [data, options.mergeValues, timeRange, theme]
+    () => prepareTimelineFields(data.series, options.mergeValues ?? true, timeRange, theme),
+    [data.series, options.mergeValues, timeRange, theme]
   );
 
   const legendItems = useMemo(
diff --git a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
index 7d9891564db..e98f3edcd72 100644
--- a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
+++ b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
@@ -68,8 +68,8 @@ export const StatusHistoryPanel = ({
   };
 
   const { frames, warn } = useMemo(
-    () => prepareTimelineFields(data?.series, false, timeRange, theme),
-    [data, timeRange, theme]
+    () => prepareTimelineFields(data.series, false, timeRange, theme),
+    [data.series, timeRange, theme]
   );
 
   const legendItems = useMemo(
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index b07db8cc1cb..9a094837587 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -38,7 +38,7 @@ export const TimeSeriesPanel = ({
     return getFieldLinksForExplore({ field, rowIndex, splitOpenFn: onSplitOpen, range: timeRange });
   };
 
-  const frames = useMemo(() => prepareGraphableFields(data.series, config.theme2, timeRange), [data, timeRange]);
+  const frames = useMemo(() => prepareGraphableFields(data.series, config.theme2, timeRange), [data.series, timeRange]);
   const timezones = useMemo(() => getTimezones(options.timezone, timeZone), [options.timezone, timeZone]);
   const suggestions = useMemo(() => {
     if (frames?.length && frames.every((df) => df.meta?.type === DataFrameType.TimeSeriesLong)) {
diff --git a/public/app/plugins/panel/trend/TrendPanel.tsx b/public/app/plugins/panel/trend/TrendPanel.tsx
index adafb81efa1..b7797c905ce 100644
--- a/public/app/plugins/panel/trend/TrendPanel.tsx
+++ b/public/app/plugins/panel/trend/TrendPanel.tsx
@@ -66,7 +66,7 @@ export const TrendPanel = ({
     }
 
     return { frames: prepareGraphableFields(frames, config.theme2, undefined, xFieldIdx) };
-  }, [data, options.xField]);
+  }, [data.series, options.xField]);
 
   if (info.warning || !info.frames) {
     return (
diff --git a/public/app/plugins/panel/xychart/XYChartPanel2.tsx b/public/app/plugins/panel/xychart/XYChartPanel2.tsx
index 83b01bcfa31..3a2438fe219 100644
--- a/public/app/plugins/panel/xychart/XYChartPanel2.tsx
+++ b/public/app/plugins/panel/xychart/XYChartPanel2.tsx
@@ -90,7 +90,7 @@ export const XYChartPanel2 = (props: Props) => {
   useEffect(() => {
     if (oldOptions !== props.options || oldData?.structureRev !== props.data.structureRev) {
       initSeries();
-    } else if (oldData !== props.data) {
+    } else if (oldData?.series !== props.data.series) {
       initFacets();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps

From 3684ca7c02219874e4b6dd26994d7fabdc818827 Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Mon, 8 May 2023 09:20:57 +0200
Subject: [PATCH 674/729] Docs: adds not on stale alerts (#67887)

* adds stale alert note

* Update docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>

* alex feedback

---------

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
---
 .../alerting/alerting-rules/create-grafana-managed-rule.md  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index 9cd75ea7582..f789ff663eb 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -111,3 +111,9 @@ If your evaluation returns an error, you can set the state on your alert rule to
 | Error    | Creates an alert instance `DatasourceError` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels. |
 | Alerting | Sets alert rule state to `Alerting`. The alert rule waits until the time set in the **For** field has finished before firing.                   |
 | Ok       | Sets alert rule state to `Normal`.                                                                                                              |
+
+### Resolve stale alert instances
+
+An alert instance is considered stale if its dimension or series has disappeared from the query results entirely for two evaluation intervals.
+
+Stale alert instances that are in the **Alerting**/**NoData**/**Error** states are automatically marked as **Resolved** and the grafana_state_reason annotation is added to the alert instance with the reason **MissingSeries**.

From 6464ce0239843aa3c5abbd32d5bdf8ecc63db5f8 Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Mon, 8 May 2023 09:21:20 +0200
Subject: [PATCH 675/729] Docs: Adds preview notification template docs
 (#67903)

Adds preview notification template
---
 .../create-notification-templates.md          | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/docs/sources/alerting/manage-notifications/template-notifications/create-notification-templates.md b/docs/sources/alerting/manage-notifications/template-notifications/create-notification-templates.md
index b4aee1d832f..6df29633643 100644
--- a/docs/sources/alerting/manage-notifications/template-notifications/create-notification-templates.md
+++ b/docs/sources/alerting/manage-notifications/template-notifications/create-notification-templates.md
@@ -32,7 +32,7 @@ To create a template, complete the following steps.
 
    {{< figure max-width="940px" src="/static/img/docs/alerting/unified/new-notification-template-email-subject-9-4.png" caption="New notification template email.subject" >}}
 
-4. Click Save.
+4. Click **Save**.
 
 `{{ define "email.subject" }}` and `{{ end }}` is automatically added to the start and end of the content:
 
@@ -48,7 +48,43 @@ To create a notification template that contains more than one template:
 
    {{< figure max-width="940px" src="/static/img/docs/alerting/unified/new-notification-template-email-9-4.png" caption="New notification template" >}}
 
-4. Click Save.
+4. Click **Save**.
+
+## Preview notification templates
+
+Preview how your notification templates will look before using them in your contact points, helping you understand the result of the template you are creating as well as enabling you to fix any errors before saving it.
+
+**Note:** This feature is only for Grafana Alertmanager.
+
+To preview your notification templates:
+
+1. Navigate to **Alerts&IRM** -> **Alerting** -> **Contact points**.
+1. Click **+Add template** or edit an existing template.
+1. Add or update your template content.
+
+   Default data is provided and you can add or edit alert data to it as well as alert instances. You can add alert data directly in the Payload data window itself or click **Choose alert instances** or **Add alert data**.
+
+1. [Optional] To add alert data from existing alert instances:
+
+   a. Click **Choose alert instances**.
+
+   b. Hover over the alert instances to view more information on each alert instance.
+
+   c. Click **Confirm** to add the alert instance(s) to the payload.
+
+1. [Optional] To add alert data using the Alert data editor, click **Add alert data:**
+
+   a. Add annotations, custom labels and/or set a dashboard or a panel.
+
+   b. Toggle Firing/resolved depending on whether you want to add firing or resolved alerts to your notification.
+
+   c. Click **Add alert data to payload**.
+
+   d. Click **Refresh preview** to see what your template content will look like and the corresponding payload data.
+
+   If there are any errors in your template, they are displayed in the Preview and you can correct them before saving.
+
+1. Click **Save.**
 
 ## Template the subject of an email
 

From 17a3c0c10197b6f16d06a51d6546082bb328eb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Mon, 8 May 2023 10:12:18 +0200
Subject: [PATCH 676/729] Navigation: Fix 'Page not found' when sending or
 going back from 'Invitate user' page (#67863)

---
 public/app/features/org/UserInviteForm.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/org/UserInviteForm.tsx b/public/app/features/org/UserInviteForm.tsx
index 40ba570823c..b8df6dc67ec 100644
--- a/public/app/features/org/UserInviteForm.tsx
+++ b/public/app/features/org/UserInviteForm.tsx
@@ -35,7 +35,7 @@ export const UserInviteForm = () => {
 
   const onSubmit = async (formData: FormModel) => {
     await dispatch(addInvitee(formData)).unwrap();
-    locationService.push('/org/users/');
+    locationService.push('/admin/users/');
   };
 
   return (
@@ -67,7 +67,7 @@ export const UserInviteForm = () => {
             </FieldSet>
             <Stack>
               <Button type="submit">Submit</Button>
-              <LinkButton href={locationUtil.assureBaseUrl(getConfig().appSubUrl + '/org/users')} variant="secondary">
+              <LinkButton href={locationUtil.assureBaseUrl(getConfig().appSubUrl + '/admin/users')} variant="secondary">
                 Back
               </LinkButton>
             </Stack>

From 0fc9a477792cb152d68c417b972a3fd1cb52a745 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Mon, 8 May 2023 10:53:11 +0200
Subject: [PATCH 677/729] Log Context: Add feature tracking of limit change
 (#67966)

* add feature tracking of load more

* Update public/app/features/logs/components/log-context/LogRowContextModal.tsx

Co-authored-by: Matias Chomicki <matyax@gmail.com>

* fix condition

---------

Co-authored-by: Matias Chomicki <matyax@gmail.com>
---
 .../logs/components/log-context/LogRowContextModal.tsx   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
index 411b725c2fc..5de66b363f6 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -180,7 +180,14 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
 
   const onChangeLimitOption = (option: SelectableValue<number>) => {
     setLoadMoreOption(option);
-    setLimit(option.value!);
+    if (option.value) {
+      setLimit(option.value);
+      reportInteraction('grafana_explore_logs_log_context_load_more_clicked', {
+        datasourceType: row.datasourceType,
+        logRowUid: row.uid,
+        new_limit: option.value,
+      });
+    }
   };
 
   const [{ loading }, fetchResults] = useAsyncFn(async () => {

From e0e2535c966af111fb2f684a8d1f3784e505ac4e Mon Sep 17 00:00:00 2001
From: Will Browne <wbrowne@users.noreply.github.com>
Date: Mon, 8 May 2023 10:58:47 +0200
Subject: [PATCH 678/729] Plugins: Tidy up CLI code (#67813)

* more tidying

* move some things around

* more tidying

* fix linter
---
 .../grafana-cli/commands/install_command.go   |   6 +-
 .../commands/listremote_command.go            |   7 +-
 .../commands/listversions_command.go          |   2 +-
 pkg/cmd/grafana-cli/commands/ls_command.go    |   8 +-
 .../commands/upgrade_all_command.go           |  23 ++-
 .../commands/upgrade_all_command_test.go      |  47 +++--
 .../grafana-cli/commands/upgrade_command.go   |   6 +-
 pkg/cmd/grafana-cli/services/api_client.go    |   2 +-
 pkg/cmd/grafana-cli/services/services.go      |  58 +++---
 pkg/plugins/manager/loader/finder/local.go    |   3 +-
 .../manager/loader/finder/local_test.go       | 122 -------------
 pkg/plugins/manager/loader/finder/util.go     |  47 -----
 pkg/plugins/plugins.go                        |  40 +++++
 pkg/plugins/plugins_test.go                   | 167 ++++++++++++++++++
 pkg/plugins/storage/fs.go                     |  42 ++---
 pkg/plugins/storage/models.go                 |  25 ---
 16 files changed, 307 insertions(+), 298 deletions(-)
 delete mode 100644 pkg/plugins/manager/loader/finder/util.go
 create mode 100644 pkg/plugins/plugins_test.go

diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index 994da69c0af..eb15d1a5f84 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -127,7 +127,7 @@ func osAndArchString() string {
 	return osString + "-" + arch
 }
 
-func supportsCurrentArch(version *models.Version) bool {
+func supportsCurrentArch(version models.Version) bool {
 	if version.Arch == nil {
 		return true
 	}
@@ -139,10 +139,10 @@ func supportsCurrentArch(version *models.Version) bool {
 	return false
 }
 
-func latestSupportedVersion(plugin *models.Plugin) *models.Version {
+func latestSupportedVersion(plugin models.Plugin) *models.Version {
 	for _, v := range plugin.Versions {
 		ver := v
-		if supportsCurrentArch(&ver) {
+		if supportsCurrentArch(ver) {
 			return &ver
 		}
 	}
diff --git a/pkg/cmd/grafana-cli/commands/listremote_command.go b/pkg/cmd/grafana-cli/commands/listremote_command.go
index 79b11c939b1..ba110b00026 100644
--- a/pkg/cmd/grafana-cli/commands/listremote_command.go
+++ b/pkg/cmd/grafana-cli/commands/listremote_command.go
@@ -15,11 +15,10 @@ func listRemoteCommand(c utils.CommandLine) error {
 	}
 
 	for _, p := range plugin.Plugins {
-		plugin := p
-		if len(plugin.Versions) > 0 {
-			ver := latestSupportedVersion(&plugin)
+		if len(p.Versions) > 0 {
+			ver := latestSupportedVersion(p)
 			if ver != nil {
-				logger.Infof("id: %v version: %s\n", plugin.ID, ver.Version)
+				logger.Infof("id: %v version: %s\n", p.ID, ver.Version)
 			}
 		}
 	}
diff --git a/pkg/cmd/grafana-cli/commands/listversions_command.go b/pkg/cmd/grafana-cli/commands/listversions_command.go
index 89ca4ffaa6f..ca6cd4edc5d 100644
--- a/pkg/cmd/grafana-cli/commands/listversions_command.go
+++ b/pkg/cmd/grafana-cli/commands/listversions_command.go
@@ -24,7 +24,7 @@ func listVersionsCommand(c utils.CommandLine) error {
 
 	pluginToList := c.Args().First()
 
-	plugin, err := services.GetPlugin(pluginToList, c.String("repo"))
+	plugin, err := services.GetPluginInfoFromRepo(pluginToList, c.String("repo"))
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/grafana-cli/commands/ls_command.go b/pkg/cmd/grafana-cli/commands/ls_command.go
index 8eb06bb2925..76132fdb327 100644
--- a/pkg/cmd/grafana-cli/commands/ls_command.go
+++ b/pkg/cmd/grafana-cli/commands/ls_command.go
@@ -6,13 +6,10 @@ import (
 	"github.com/fatih/color"
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
-var ls_getPlugins func(path string) []models.InstalledPlugin = services.GetLocalPlugins
-
 var (
 	errMissingPathFlag = errors.New("missing path flag")
 	errNotDirectory    = errors.New("plugin path is not a directory")
@@ -41,7 +38,7 @@ func lsCommand(c utils.CommandLine) error {
 		return err
 	}
 
-	plugins := ls_getPlugins(pluginDir)
+	plugins := services.GetLocalPlugins(pluginDir)
 
 	if len(plugins) > 0 {
 		logger.Info("installed plugins:\n")
@@ -50,7 +47,8 @@ func lsCommand(c utils.CommandLine) error {
 	}
 
 	for _, plugin := range plugins {
-		logger.Infof("%s %s %s\n", plugin.ID, color.YellowString("@"), plugin.Info.Version)
+		logger.Infof("%s %s %s\n", plugin.Primary.JSONData.ID,
+			color.YellowString("@"), plugin.Primary.JSONData.Info.Version)
 	}
 
 	return nil
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
index b13ddea45f7..74b3e65f038 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
@@ -9,10 +9,15 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
+	"github.com/grafana/grafana/pkg/plugins"
 )
 
-func shouldUpgrade(installed string, remote *models.Plugin) bool {
-	installedVersion, err := version.NewVersion(installed)
+func shouldUpgrade(installed plugins.FoundPlugin, remote models.Plugin) bool {
+	installedVer := installed.JSONData.Info.Version
+	if installedVer == "" {
+		installedVer = "0.0.0"
+	}
+	installedVersion, err := version.NewVersion(installedVer)
 	if err != nil {
 		return false
 	}
@@ -35,30 +40,30 @@ func upgradeAllCommand(c utils.CommandLine) error {
 		return err
 	}
 
-	pluginsToUpgrade := make([]models.InstalledPlugin, 0)
+	pluginsToUpgrade := make([]plugins.FoundPlugin, 0)
 
 	for _, localPlugin := range localPlugins {
 		for _, p := range remotePlugins.Plugins {
 			remotePlugin := p
-			if localPlugin.ID != remotePlugin.ID {
+			if localPlugin.Primary.JSONData.ID != remotePlugin.ID {
 				continue
 			}
-			if shouldUpgrade(localPlugin.Info.Version, &remotePlugin) {
-				pluginsToUpgrade = append(pluginsToUpgrade, localPlugin)
+			if shouldUpgrade(localPlugin.Primary, remotePlugin) {
+				pluginsToUpgrade = append(pluginsToUpgrade, localPlugin.Primary)
 			}
 		}
 	}
 
 	ctx := context.Background()
 	for _, p := range pluginsToUpgrade {
-		logger.Infof("Updating %v \n", p.ID)
+		logger.Infof("Updating %v \n", p.JSONData.ID)
 
-		err = uninstallPlugin(ctx, p.ID, c)
+		err = uninstallPlugin(ctx, p.JSONData.ID, c)
 		if err != nil {
 			return err
 		}
 
-		err = installPlugin(ctx, p.ID, "", c)
+		err = installPlugin(ctx, p.JSONData.ID, "", c)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_all_command_test.go b/pkg/cmd/grafana-cli/commands/upgrade_all_command_test.go
index c69f0a18a08..6749972f950 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_all_command_test.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_all_command_test.go
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
+	"github.com/grafana/grafana/pkg/plugins"
 )
 
 func TestVersionComparison(t *testing.T) {
@@ -16,15 +17,23 @@ func TestVersionComparison(t *testing.T) {
 			{Version: "2.0.0"},
 		}
 
-		upgradeablePlugins := map[string]models.Plugin{
-			"0.0.0": {Versions: versions},
-			"1.0.0": {Versions: versions},
+		upgradeablePlugins := []struct {
+			have      plugins.FoundPlugin
+			requested models.Plugin
+		}{
+			{
+				have:      plugins.FoundPlugin{JSONData: plugins.JSONData{Info: plugins.Info{Version: "0.0.0"}}},
+				requested: models.Plugin{Versions: versions},
+			},
+			{
+				have:      plugins.FoundPlugin{JSONData: plugins.JSONData{Info: plugins.Info{Version: "1.0.0"}}},
+				requested: models.Plugin{Versions: versions},
+			},
 		}
 
-		for k, v := range upgradeablePlugins {
-			val := v
-			t.Run(fmt.Sprintf("for %s should be true", k), func(t *testing.T) {
-				assert.True(t, shouldUpgrade(k, &val))
+		for _, v := range upgradeablePlugins {
+			t.Run(fmt.Sprintf("for %s should be true", v.have.JSONData.Info.Version), func(t *testing.T) {
+				require.True(t, shouldUpgrade(v.have, v.requested))
 			})
 		}
 	})
@@ -35,15 +44,23 @@ func TestVersionComparison(t *testing.T) {
 			{Version: "2.0.0"},
 		}
 
-		shouldNotUpgrade := map[string]models.Plugin{
-			"2.0.0": {Versions: versions},
-			"6.0.0": {Versions: versions},
+		shouldNotUpgrade := []struct {
+			have      plugins.FoundPlugin
+			requested models.Plugin
+		}{
+			{
+				have:      plugins.FoundPlugin{JSONData: plugins.JSONData{Info: plugins.Info{Version: "2.0.0"}}},
+				requested: models.Plugin{Versions: versions},
+			},
+			{
+				have:      plugins.FoundPlugin{JSONData: plugins.JSONData{Info: plugins.Info{Version: "6.0.0"}}},
+				requested: models.Plugin{Versions: versions},
+			},
 		}
 
-		for k, v := range shouldNotUpgrade {
-			val := v
-			t.Run(fmt.Sprintf("for %s should be false", k), func(t *testing.T) {
-				assert.False(t, shouldUpgrade(k, &val))
+		for _, v := range shouldNotUpgrade {
+			t.Run(fmt.Sprintf("for %s should be false", v.have.JSONData.Info.Version), func(t *testing.T) {
+				require.False(t, shouldUpgrade(v.have, v.requested))
 			})
 		}
 	})
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_command.go b/pkg/cmd/grafana-cli/commands/upgrade_command.go
index cf7d47ec9d2..a122f55b2fc 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_command.go
@@ -16,17 +16,17 @@ func upgradeCommand(c utils.CommandLine) error {
 	pluginsDir := c.PluginDirectory()
 	pluginID := c.Args().First()
 
-	localPlugin, err := services.ReadPlugin(pluginsDir, pluginID)
+	localPlugin, err := services.GetLocalPlugin(pluginsDir, pluginID)
 	if err != nil {
 		return err
 	}
 
-	plugin, err := services.GetPlugin(pluginID, c.PluginRepoURL())
+	plugin, err := services.GetPluginInfoFromRepo(pluginID, c.PluginRepoURL())
 	if err != nil {
 		return err
 	}
 
-	if shouldUpgrade(localPlugin.Info.Version, &plugin) {
+	if shouldUpgrade(localPlugin, plugin) {
 		if err = uninstallPlugin(ctx, pluginID, c); err != nil {
 			return fmt.Errorf("failed to remove plugin '%s': %w", pluginID, err)
 		}
diff --git a/pkg/cmd/grafana-cli/services/api_client.go b/pkg/cmd/grafana-cli/services/api_client.go
index 99d3c9b7f93..70746718d70 100644
--- a/pkg/cmd/grafana-cli/services/api_client.go
+++ b/pkg/cmd/grafana-cli/services/api_client.go
@@ -14,7 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 )
 
-func GetPlugin(pluginId, repoUrl string) (models.Plugin, error) {
+func GetPluginInfoFromRepo(pluginId, repoUrl string) (models.Plugin, error) {
 	logger.Debugf("getting plugin metadata from: %v pluginId: %v \n", repoUrl, pluginId)
 	body, err := sendRequestGetBytes(HttpClient, repoUrl, "repo", pluginId)
 	if err != nil {
diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
index 119e9f91199..6d042348d42 100644
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -1,8 +1,8 @@
 package services
 
 import (
+	"context"
 	"crypto/tls"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net"
@@ -12,6 +12,10 @@ import (
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
+	"github.com/grafana/grafana/pkg/plugins/manager/sources"
 )
 
 var (
@@ -62,43 +66,25 @@ func makeHttpClient(skipTLSVerify bool, timeout time.Duration) http.Client {
 	}
 }
 
-func ReadPlugin(pluginDir, pluginName string) (models.InstalledPlugin, error) {
-	distPluginDataPath := filepath.Join(pluginDir, pluginName, "dist", "plugin.json")
+func GetLocalPlugin(pluginDir, pluginID string) (plugins.FoundPlugin, error) {
+	pluginPath := filepath.Join(pluginDir, pluginID)
 
-	data, err := IoHelper.ReadFile(distPluginDataPath)
+	ps := GetLocalPlugins(pluginPath)
+	if len(ps) == 0 {
+		return plugins.FoundPlugin{}, errors.New("could not find plugin " + pluginID + " in " + pluginDir)
+	}
+
+	return ps[0].Primary, nil
+}
+
+func GetLocalPlugins(pluginDir string) []*plugins.FoundBundle {
+	f := finder.NewLocalFinder(&config.Cfg{})
+
+	res, err := f.Find(context.Background(), sources.NewLocalSource(plugins.External, []string{pluginDir}))
 	if err != nil {
-		pluginDataPath := filepath.Join(pluginDir, pluginName, "plugin.json")
-		data, err = IoHelper.ReadFile(pluginDataPath)
-		if err != nil {
-			return models.InstalledPlugin{}, errors.New("Could not find dist/plugin.json or plugin.json for " + pluginName + " in " + pluginDir)
-		}
+		logger.Error("Could not get local plugins", err)
+		return make([]*plugins.FoundBundle, 0)
 	}
 
-	res := models.InstalledPlugin{}
-	if err := json.Unmarshal(data, &res); err != nil {
-		return res, err
-	}
-
-	if res.Info.Version == "" {
-		res.Info.Version = "0.0.0"
-	}
-
-	if res.ID == "" {
-		return models.InstalledPlugin{}, errors.New("could not find plugin " + pluginName + " in " + pluginDir)
-	}
-
-	return res, nil
-}
-
-func GetLocalPlugins(pluginDir string) []models.InstalledPlugin {
-	result := make([]models.InstalledPlugin, 0)
-	files, _ := IoHelper.ReadDir(pluginDir)
-	for _, f := range files {
-		res, err := ReadPlugin(pluginDir, f.Name())
-		if err == nil {
-			result = append(result, res)
-		}
-	}
-
-	return result
+	return res
 }
diff --git a/pkg/plugins/manager/loader/finder/local.go b/pkg/plugins/manager/loader/finder/local.go
index a3217697a60..a192cf916cb 100644
--- a/pkg/plugins/manager/loader/finder/local.go
+++ b/pkg/plugins/manager/loader/finder/local.go
@@ -20,7 +20,6 @@ import (
 var walk = util.Walk
 
 var (
-	ErrInvalidPluginJSON         = errors.New("did not find valid type or id properties in plugin.json")
 	ErrInvalidPluginJSONFilePath = errors.New("invalid plugin.json filepath was provided")
 )
 
@@ -149,7 +148,7 @@ func (l *Local) readPluginJSON(pluginJSONPath string) (plugins.JSONData, error)
 		l.log.Warn("Skipping plugin loading as its plugin.json could not be read", "path", pluginJSONPath, "err", err)
 		return plugins.JSONData{}, err
 	}
-	plugin, err := ReadPluginJSON(reader)
+	plugin, err := plugins.ReadPluginJSON(reader)
 	if err != nil {
 		l.log.Warn("Skipping plugin loading as its plugin.json could not be read", "path", pluginJSONPath, "err", err)
 		return plugins.JSONData{}, err
diff --git a/pkg/plugins/manager/loader/finder/local_test.go b/pkg/plugins/manager/loader/finder/local_test.go
index e6b4f031e46..1a37aa977b4 100644
--- a/pkg/plugins/manager/loader/finder/local_test.go
+++ b/pkg/plugins/manager/loader/finder/local_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -331,127 +330,6 @@ func TestFinder_getAbsPluginJSONPaths(t *testing.T) {
 	})
 }
 
-func TestFinder_validatePluginJSON(t *testing.T) {
-	type args struct {
-		data plugins.JSONData
-	}
-	tests := []struct {
-		name string
-		args args
-		err  error
-	}{
-		{
-			name: "Valid case",
-			args: args{
-				data: plugins.JSONData{
-					ID:   "grafana-plugin-id",
-					Type: plugins.DataSource,
-				},
-			},
-		},
-		{
-			name: "Invalid plugin ID",
-			args: args{
-				data: plugins.JSONData{
-					Type: plugins.Panel,
-				},
-			},
-			err: ErrInvalidPluginJSON,
-		},
-		{
-			name: "Invalid plugin type",
-			args: args{
-				data: plugins.JSONData{
-					ID:   "grafana-plugin-id",
-					Type: "test",
-				},
-			},
-			err: ErrInvalidPluginJSON,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if err := validatePluginJSON(tt.args.data); !errors.Is(err, tt.err) {
-				t.Errorf("validatePluginJSON() = %v, want %v", err, tt.err)
-			}
-		})
-	}
-}
-
-func TestFinder_readPluginJSON(t *testing.T) {
-	tests := []struct {
-		name       string
-		pluginPath string
-		expected   plugins.JSONData
-		err        error
-	}{
-		{
-			name:       "Valid plugin",
-			pluginPath: "../../testdata/test-app/plugin.json",
-			expected: plugins.JSONData{
-				ID:   "test-app",
-				Type: "app",
-				Name: "Test App",
-				Info: plugins.Info{
-					Author: plugins.InfoLink{
-						Name: "Test Inc.",
-						URL:  "http://test.com",
-					},
-					Description: "Official Grafana Test App & Dashboard bundle",
-					Version:     "1.0.0",
-					Links: []plugins.InfoLink{
-						{Name: "Project site", URL: "http://project.com"},
-						{Name: "License & Terms", URL: "http://license.com"},
-					},
-					Logos: plugins.Logos{
-						Small: "img/logo_small.png",
-						Large: "img/logo_large.png",
-					},
-					Screenshots: []plugins.Screenshots{
-						{Path: "img/screenshot1.png", Name: "img1"},
-						{Path: "img/screenshot2.png", Name: "img2"},
-					},
-					Updated: "2015-02-10",
-				},
-				Dependencies: plugins.Dependencies{
-					GrafanaVersion: "3.x.x",
-					Plugins: []plugins.Dependency{
-						{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
-						{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
-					},
-				},
-				Includes: []*plugins.Includes{
-					{Name: "Nginx Connections", Path: "dashboards/connections.json", Type: "dashboard", Role: org.RoleViewer},
-					{Name: "Nginx Memory", Path: "dashboards/memory.json", Type: "dashboard", Role: org.RoleViewer},
-					{Name: "Nginx Panel", Type: "panel", Role: org.RoleViewer},
-					{Name: "Nginx Datasource", Type: "datasource", Role: org.RoleViewer},
-				},
-				Backend: false,
-			},
-		},
-		{
-			name:       "Invalid plugin JSON",
-			pluginPath: "../../testdata/invalid-plugin-json/plugin.json",
-			err:        ErrInvalidPluginJSON,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			reader, err := os.Open(tt.pluginPath)
-			require.NoError(t, err)
-			got, err := ReadPluginJSON(reader)
-			if tt.err != nil {
-				require.ErrorIs(t, err, tt.err)
-			}
-			if !cmp.Equal(got, tt.expected) {
-				t.Errorf("Unexpected pluginJSONData: %v", cmp.Diff(got, tt.expected))
-			}
-			require.NoError(t, reader.Close())
-		})
-	}
-}
-
 var fsComparer = cmp.Comparer(func(fs1 plugins.FS, fs2 plugins.FS) bool {
 	fs1Files, err := fs1.Files()
 	if err != nil {
diff --git a/pkg/plugins/manager/loader/finder/util.go b/pkg/plugins/manager/loader/finder/util.go
deleted file mode 100644
index 9502a408be2..00000000000
--- a/pkg/plugins/manager/loader/finder/util.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package finder
-
-import (
-	"encoding/json"
-	"io"
-
-	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/services/org"
-)
-
-func ReadPluginJSON(reader io.Reader) (plugins.JSONData, error) {
-	plugin := plugins.JSONData{}
-	if err := json.NewDecoder(reader).Decode(&plugin); err != nil {
-		return plugins.JSONData{}, err
-	}
-
-	if err := validatePluginJSON(plugin); err != nil {
-		return plugins.JSONData{}, err
-	}
-
-	if plugin.ID == "grafana-piechart-panel" {
-		plugin.Name = "Pie Chart (old)"
-	}
-
-	if len(plugin.Dependencies.Plugins) == 0 {
-		plugin.Dependencies.Plugins = []plugins.Dependency{}
-	}
-
-	if plugin.Dependencies.GrafanaVersion == "" {
-		plugin.Dependencies.GrafanaVersion = "*"
-	}
-
-	for _, include := range plugin.Includes {
-		if include.Role == "" {
-			include.Role = org.RoleViewer
-		}
-	}
-
-	return plugin, nil
-}
-
-func validatePluginJSON(data plugins.JSONData) error {
-	if data.ID == "" || !data.Type.IsValid() {
-		return ErrInvalidPluginJSON
-	}
-	return nil
-}
diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
index fd27a43c15c..a102ff7e71a 100644
--- a/pkg/plugins/plugins.go
+++ b/pkg/plugins/plugins.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"io/fs"
 	"path"
 	"runtime"
@@ -24,6 +25,7 @@ var (
 	ErrFileNotExist              = errors.New("file does not exist")
 	ErrPluginFileRead            = errors.New("file could not be read")
 	ErrUninstallInvalidPluginDir = errors.New("cannot recognize as plugin folder")
+	ErrInvalidPluginJSON         = errors.New("did not find valid type or id properties in plugin.json")
 )
 
 type Plugin struct {
@@ -139,6 +141,44 @@ type JSONData struct {
 	Executable string `json:"executable,omitempty"`
 }
 
+func ReadPluginJSON(reader io.Reader) (JSONData, error) {
+	plugin := JSONData{}
+	if err := json.NewDecoder(reader).Decode(&plugin); err != nil {
+		return JSONData{}, err
+	}
+
+	if err := validatePluginJSON(plugin); err != nil {
+		return JSONData{}, err
+	}
+
+	if plugin.ID == "grafana-piechart-panel" {
+		plugin.Name = "Pie Chart (old)"
+	}
+
+	if len(plugin.Dependencies.Plugins) == 0 {
+		plugin.Dependencies.Plugins = []Dependency{}
+	}
+
+	if plugin.Dependencies.GrafanaVersion == "" {
+		plugin.Dependencies.GrafanaVersion = "*"
+	}
+
+	for _, include := range plugin.Includes {
+		if include.Role == "" {
+			include.Role = org.RoleViewer
+		}
+	}
+
+	return plugin, nil
+}
+
+func validatePluginJSON(data JSONData) error {
+	if data.ID == "" || !data.Type.IsValid() {
+		return ErrInvalidPluginJSON
+	}
+	return nil
+}
+
 func (d JSONData) DashboardIncludes() []*Includes {
 	result := []*Includes{}
 	for _, include := range d.Includes {
diff --git a/pkg/plugins/plugins_test.go b/pkg/plugins/plugins_test.go
new file mode 100644
index 00000000000..e19e366f457
--- /dev/null
+++ b/pkg/plugins/plugins_test.go
@@ -0,0 +1,167 @@
+package plugins
+
+import (
+	"errors"
+	"io"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_ReadPluginJSON(t *testing.T) {
+	tests := []struct {
+		name       string
+		pluginJSON func(t *testing.T) io.ReadCloser
+		expected   JSONData
+		err        error
+	}{
+		{
+			name: "Valid plugin",
+			pluginJSON: func(t *testing.T) io.ReadCloser {
+				reader, err := os.Open("manager/testdata/test-app/plugin.json")
+				require.NoError(t, err)
+				return reader
+			},
+			expected: JSONData{
+				ID:   "test-app",
+				Type: "app",
+				Name: "Test App",
+				Info: Info{
+					Author: InfoLink{
+						Name: "Test Inc.",
+						URL:  "http://test.com",
+					},
+					Description: "Official Grafana Test App & Dashboard bundle",
+					Version:     "1.0.0",
+					Links: []InfoLink{
+						{Name: "Project site", URL: "http://project.com"},
+						{Name: "License & Terms", URL: "http://license.com"},
+					},
+					Logos: Logos{
+						Small: "img/logo_small.png",
+						Large: "img/logo_large.png",
+					},
+					Screenshots: []Screenshots{
+						{Path: "img/screenshot1.png", Name: "img1"},
+						{Path: "img/screenshot2.png", Name: "img2"},
+					},
+					Updated: "2015-02-10",
+				},
+				Dependencies: Dependencies{
+					GrafanaVersion: "3.x.x",
+					Plugins: []Dependency{
+						{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
+						{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
+					},
+				},
+				Includes: []*Includes{
+					{Name: "Nginx Connections", Path: "dashboards/connections.json", Type: "dashboard", Role: org.RoleViewer},
+					{Name: "Nginx Memory", Path: "dashboards/memory.json", Type: "dashboard", Role: org.RoleViewer},
+					{Name: "Nginx Panel", Type: "panel", Role: org.RoleViewer},
+					{Name: "Nginx Datasource", Type: "datasource", Role: org.RoleViewer},
+				},
+				Backend: false,
+			},
+		},
+		{
+			name: "Invalid plugin JSON",
+			pluginJSON: func(t *testing.T) io.ReadCloser {
+				reader, err := os.Open("manager/testdata/invalid-plugin-json/plugin.json")
+				require.NoError(t, err)
+				return reader
+			},
+			err: ErrInvalidPluginJSON,
+		},
+		{
+			name: "Default value overrides",
+			pluginJSON: func(t *testing.T) io.ReadCloser {
+				pJSON := `{
+					"id": "grafana-piechart-panel",
+					"name": "This will be overwritten",
+					"type": "panel",
+					"includes": [
+						{"type": "dashboard", "name": "Pie Charts", "path": "dashboards/demo.json"}
+					]
+				}`
+				return io.NopCloser(strings.NewReader(pJSON))
+			},
+			expected: JSONData{
+				ID:   "grafana-piechart-panel",
+				Type: "panel",
+				Name: "Pie Chart (old)",
+				Dependencies: Dependencies{
+					GrafanaVersion: "*",
+					Plugins:        []Dependency{},
+				},
+				Includes: []*Includes{
+					{Name: "Pie Charts", Path: "dashboards/demo.json", Type: "dashboard", Role: org.RoleViewer},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			p := tt.pluginJSON(t)
+			got, err := ReadPluginJSON(p)
+			if tt.err != nil {
+				require.ErrorIs(t, err, tt.err)
+			}
+			if !cmp.Equal(got, tt.expected) {
+				t.Errorf("Unexpected pluginJSONData: %v", cmp.Diff(got, tt.expected))
+			}
+			require.NoError(t, p.Close())
+		})
+	}
+}
+
+func Test_validatePluginJSON(t *testing.T) {
+	type args struct {
+		data JSONData
+	}
+	tests := []struct {
+		name string
+		args args
+		err  error
+	}{
+		{
+			name: "Valid case",
+			args: args{
+				data: JSONData{
+					ID:   "grafana-plugin-id",
+					Type: DataSource,
+				},
+			},
+		},
+		{
+			name: "Invalid plugin ID",
+			args: args{
+				data: JSONData{
+					Type: Panel,
+				},
+			},
+			err: ErrInvalidPluginJSON,
+		},
+		{
+			name: "Invalid plugin type",
+			args: args{
+				data: JSONData{
+					ID:   "grafana-plugin-id",
+					Type: "test",
+				},
+			},
+			err: ErrInvalidPluginJSON,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := validatePluginJSON(tt.args.data); !errors.Is(err, tt.err) {
+				t.Errorf("validatePluginJSON() = %v, want %v", err, tt.err)
+			}
+		})
+	}
+}
diff --git a/pkg/plugins/storage/fs.go b/pkg/plugins/storage/fs.go
index f3468ab3f23..445ce07c3f9 100644
--- a/pkg/plugins/storage/fs.go
+++ b/pkg/plugins/storage/fs.go
@@ -4,7 +4,6 @@ import (
 	"archive/zip"
 	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -13,6 +12,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/log"
 )
 
@@ -39,15 +39,15 @@ func (fs *FS) Extract(ctx context.Context, pluginID string, pluginArchive *zip.R
 		return nil, fmt.Errorf("%v: %w", "failed to extract plugin archive", err)
 	}
 
-	res, err := toPluginDTO(pluginID, pluginDir)
+	pluginJSON, err := readPluginJSON(pluginID, pluginDir)
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "failed to convert to plugin DTO", err)
 	}
 
-	fs.log.Successf("Downloaded and extracted %s v%s zip successfully to %s", res.ID, res.Info.Version, pluginDir)
+	fs.log.Successf("Downloaded and extracted %s v%s zip successfully to %s", pluginJSON.ID, pluginJSON.Info.Version, pluginDir)
 
-	deps := make([]*Dependency, 0, len(res.Dependencies.Plugins))
-	for _, plugin := range res.Dependencies.Plugins {
+	deps := make([]*Dependency, 0, len(pluginJSON.Dependencies.Plugins))
+	for _, plugin := range pluginJSON.Dependencies.Plugins {
 		deps = append(deps, &Dependency{
 			ID:      plugin.ID,
 			Version: plugin.Version,
@@ -55,8 +55,8 @@ func (fs *FS) Extract(ctx context.Context, pluginID string, pluginArchive *zip.R
 	}
 
 	return &ExtractedPluginArchive{
-		ID:           res.ID,
-		Version:      res.Info.Version,
+		ID:           pluginJSON.ID,
+		Version:      pluginJSON.Info.Version,
 		Dependencies: deps,
 		Path:         pluginDir,
 	}, nil
@@ -220,34 +220,26 @@ func removeGitBuildFromName(filename, pluginID string) string {
 	return reGitBuild.ReplaceAllString(filename, pluginID+"/")
 }
 
-func toPluginDTO(pluginID, pluginDir string) (installedPlugin, error) {
-	distPluginDataPath := filepath.Join(pluginDir, "dist", "plugin.json")
+func readPluginJSON(pluginID, pluginDir string) (plugins.JSONData, error) {
+	pluginPath := filepath.Join(pluginDir, "plugin.json")
 
 	// It's safe to ignore gosec warning G304 since the file path suffix is hardcoded
 	// nolint:gosec
-	data, err := os.ReadFile(distPluginDataPath)
+	data, err := os.ReadFile(pluginPath)
 	if err != nil {
-		pluginDataPath := filepath.Join(pluginDir, "plugin.json")
+		pluginPath = filepath.Join(pluginDir, "dist", "plugin.json")
 		// It's safe to ignore gosec warning G304 since the file path suffix is hardcoded
 		// nolint:gosec
-		data, err = os.ReadFile(pluginDataPath)
+		data, err = os.ReadFile(pluginPath)
 		if err != nil {
-			return installedPlugin{}, fmt.Errorf("could not find dist/plugin.json or plugin.json for %s in %s", pluginID, pluginDir)
+			return plugins.JSONData{}, fmt.Errorf("could not find plugin.json or dist/plugin.json for %s in %s", pluginID, pluginDir)
 		}
 	}
 
-	res := installedPlugin{}
-	if err = json.Unmarshal(data, &res); err != nil {
-		return res, err
+	pJSON, err := plugins.ReadPluginJSON(bytes.NewReader(data))
+	if err != nil {
+		return plugins.JSONData{}, err
 	}
 
-	if res.ID == "" {
-		return installedPlugin{}, fmt.Errorf("could not find valid plugin %s in %s", pluginID, pluginDir)
-	}
-
-	if res.Info.Version == "" {
-		res.Info.Version = "0.0.0"
-	}
-
-	return res, nil
+	return pJSON, nil
 }
diff --git a/pkg/plugins/storage/models.go b/pkg/plugins/storage/models.go
index d758b18660f..6cc67e48ade 100644
--- a/pkg/plugins/storage/models.go
+++ b/pkg/plugins/storage/models.go
@@ -21,28 +21,3 @@ type Dependency struct {
 	ID      string
 	Version string
 }
-
-type installedPlugin struct {
-	ID           string       `json:"id"`
-	Name         string       `json:"name"`
-	Type         string       `json:"type"`
-	Info         pluginInfo   `json:"info"`
-	Dependencies dependencies `json:"dependencies"`
-}
-
-type dependencies struct {
-	GrafanaVersion string             `json:"grafanaVersion"`
-	Plugins        []pluginDependency `json:"plugins"`
-}
-
-type pluginDependency struct {
-	ID      string `json:"id"`
-	Type    string `json:"type"`
-	Name    string `json:"name"`
-	Version string `json:"version"`
-}
-
-type pluginInfo struct {
-	Version string `json:"version"`
-	Updated string `json:"updated"`
-}

From 97802e44a6877482dff93bc37d2938c433cf2218 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Mon, 8 May 2023 11:32:46 +0200
Subject: [PATCH 679/729] Alerting: Make two boxes in template form adaptative
 to the screen  (#67967)

Make two boxes in template form adaptative to the screen width to be align in the same line when possible
---
 .../receivers/PayloadEditor.test.tsx          |   5 +
 .../components/receivers/PayloadEditor.tsx    |  45 ++--
 .../components/receivers/TemplateForm.tsx     | 200 ++++++++++--------
 .../receivers/TemplatePreview.test.tsx        |   6 +
 4 files changed, 148 insertions(+), 108 deletions(-)

diff --git a/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx b/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
index 6c38193111b..bb7a52fb4fd 100644
--- a/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
+++ b/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
@@ -2,6 +2,7 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { default as React, useState } from 'react';
 import { Provider } from 'react-redux';
+import { AutoSizerProps } from 'react-virtualized-auto-sizer';
 
 import { configureStore } from 'app/store/configureStore';
 
@@ -28,6 +29,10 @@ jest.mock('@grafana/ui', () => ({
   },
 }));
 
+jest.mock('react-virtualized-auto-sizer', () => {
+  return ({ children }: AutoSizerProps) => children({ height: 1, width: 1 });
+});
+
 const PayloadEditorWithState = () => {
   const [payload, setPayload] = useState(DEFAULT_PAYLOAD);
   return (
diff --git a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
index 2194fbcb7a1..a306daf7b5f 100644
--- a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
+++ b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
@@ -1,5 +1,6 @@
 import { css } from '@emotion/css';
 import React, { useState } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Badge, Button, CodeEditor, Icon, Tooltip, useStyles2 } from '@grafana/ui';
@@ -86,17 +87,22 @@ export function PayloadEditor({
             <Icon name="info-circle" className={styles.tooltip} size="xl" />
           </Tooltip>
         </div>
-
-        <CodeEditor
-          width={640}
-          height={363}
-          language={'json'}
-          showLineNumbers={true}
-          showMiniMap={false}
-          value={payload}
-          readOnly={false}
-          onBlur={setPayload}
-        />
+        <AutoSizer disableHeight>
+          {({ width }) => (
+            <div className={styles.editorWrapper}>
+              <CodeEditor
+                width={width}
+                height={362}
+                language={'json'}
+                showLineNumbers={true}
+                showMiniMap={false}
+                value={payload}
+                readOnly={false}
+                onBlur={setPayload}
+              />
+            </div>
+          )}
+        </AutoSizer>
 
         <div className={styles.buttonsWrapper}>
           <Button
@@ -159,28 +165,39 @@ const AlertTemplateDataTable = () => {
 };
 const getStyles = (theme: GrafanaTheme2) => ({
   jsonEditor: css`
-    width: 605px;
-    height: 363px;
+    width: 100%;
+    height: 100%;
   `,
   buttonsWrapper: css`
     margin-top: ${theme.spacing(1)};
     display: flex;
+    flex-wrap: wrap;
   `,
   button: css`
     flex: none;
     width: fit-content;
     padding-right: ${theme.spacing(1)};
     margin-right: ${theme.spacing(1)};
+    margin-bottom: ${theme.spacing(1)};
   `,
   title: css`
     font-weight: ${theme.typography.fontWeightBold};
+    heigth: 41px;
+    padding-top: 10px;
+    padding-left: ${theme.spacing(2)};
+    margin-top: 19px;
   `,
   wrapper: css`
-    padding-top: 38px;
+    flex: 1;
+    min-width: 450px;
   `,
   tooltip: css`
     padding-left: ${theme.spacing(1)};
   `,
+  editorWrapper: css`
+    width: min-content;
+    padding-top: 7px;
+  `,
   editor: css`
     display: flex;
     flex-direction: column;
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
index 6c38914dae1..46f6ea49db8 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
@@ -4,6 +4,7 @@ import { Location } from 'history';
 import React, { useCallback, useEffect, useState } from 'react';
 import { FormProvider, useForm, useFormContext, Validate } from 'react-hook-form';
 import { useLocation } from 'react-router-dom';
+import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
@@ -175,56 +176,63 @@ export const TemplateForm = ({ existing, alertManagerSourceName, config, provena
             />
           </Field>
           <TemplatingGuideline />
-          <Stack direction="row" alignItems={'center'}>
-            <div>
+          <div className={styles.editorsWrapper}>
+            <div className={styles.contentContainer}>
               <TabsBar>
                 <Tab label="Content" active={view === 'content'} onChangeTab={() => setView('content')} />
                 {isGrafanaAlertManager && (
                   <Tab label="Preview" active={view === 'preview'} onChangeTab={() => setView('preview')} />
                 )}
               </TabsBar>
-              <div className={styles.contentContainer}>
-                {view === 'content' ? (
-                  <div>
-                    <Field error={errors?.content?.message} invalid={!!errors.content?.message} required>
-                      <div className={styles.editWrapper}>
-                        <TemplateEditor
-                          value={getValues('content')}
-                          width={640}
-                          height={363}
-                          onBlur={(value) => setValue('content', value)}
+              <div className={styles.contentContainerEditor}>
+                <AutoSizer>
+                  {({ width }) => (
+                    <>
+                      {view === 'content' ? (
+                        <div>
+                          <Field error={errors?.content?.message} invalid={!!errors.content?.message} required>
+                            <div className={styles.editWrapper}>
+                              <TemplateEditor
+                                value={getValues('content')}
+                                width={width}
+                                height={363}
+                                onBlur={(value) => setValue('content', value)}
+                              />
+                            </div>
+                          </Field>
+                          <div className={styles.buttons}>
+                            {loading && (
+                              <Button disabled={true} icon="fa fa-spinner" variant="primary">
+                                Saving...
+                              </Button>
+                            )}
+                            {!loading && (
+                              <Button type="submit" variant="primary">
+                                Save template
+                              </Button>
+                            )}
+                            <LinkButton
+                              disabled={loading}
+                              href={makeAMLink('alerting/notifications', alertManagerSourceName)}
+                              variant="secondary"
+                              type="button"
+                            >
+                              Cancel
+                            </LinkButton>
+                          </div>
+                        </div>
+                      ) : (
+                        <TemplatePreview
+                          width={width}
+                          payload={payload}
+                          templateName={watch('name')}
+                          setPayloadFormatError={setPayloadFormatError}
+                          payloadFormatError={payloadFormatError}
                         />
-                      </div>
-                    </Field>
-                    <div className={styles.buttons}>
-                      {loading && (
-                        <Button disabled={true} icon="fa fa-spinner" variant="primary">
-                          Saving...
-                        </Button>
                       )}
-                      {!loading && (
-                        <Button type="submit" variant="primary">
-                          Save template
-                        </Button>
-                      )}
-                      <LinkButton
-                        disabled={loading}
-                        href={makeAMLink('alerting/notifications', alertManagerSourceName)}
-                        variant="secondary"
-                        type="button"
-                      >
-                        Cancel
-                      </LinkButton>
-                    </div>
-                  </div>
-                ) : (
-                  <TemplatePreview
-                    payload={payload}
-                    templateName={watch('name')}
-                    setPayloadFormatError={setPayloadFormatError}
-                    payloadFormatError={payloadFormatError}
-                  />
-                )}
+                    </>
+                  )}
+                </AutoSizer>
               </div>
             </div>
             {isGrafanaAlertManager && (
@@ -237,7 +245,7 @@ export const TemplateForm = ({ existing, alertManagerSourceName, config, provena
                 onPayloadError={onPayloadError}
               />
             )}
-          </Stack>
+          </div>
         </FieldSet>
         <CollapsableSection label="Data cheat sheet" isOpen={false} className={styles.collapsableSection}>
           <TemplateDataDocs />
@@ -348,11 +356,13 @@ export function TemplatePreview({
   templateName,
   payloadFormatError,
   setPayloadFormatError,
+  width,
 }: {
   payload: string;
   templateName: string;
   payloadFormatError: string | null;
   setPayloadFormatError: (value: React.SetStateAction<string | null>) => void;
+  width: number;
 }) {
   const styles = useStyles2(getStyles);
 
@@ -378,36 +388,41 @@ export function TemplatePreview({
   useEffect(() => onPreview(), [onPreview]);
 
   return (
-    <Stack direction="row" alignItems="center" gap={2}>
-      <Stack direction="column">
-        {isLoading && (
-          <>
-            <Spinner inline={true} /> Loading preview...
-          </>
-        )}
-        <pre className={styles.preview.result} data-testid="payloadJSON">
-          {previewToRender}
-        </pre>
-        <Button onClick={onPreview} className={styles.preview.button} icon="arrow-up" type="button" variant="secondary">
-          Refresh preview
-        </Button>
-      </Stack>
-    </Stack>
+    <div style={{ width: `${width}px` }} className={styles.preview.wrapper}>
+      {isLoading && (
+        <>
+          <Spinner inline={true} /> Loading preview...
+        </>
+      )}
+      <pre className={styles.preview.result} data-testid="payloadJSON">
+        {previewToRender}
+      </pre>
+      <Button onClick={onPreview} className={styles.preview.button} icon="arrow-up" type="button" variant="secondary">
+        Refresh preview
+      </Button>
+    </div>
   );
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
   contentContainer: css`
-    display: flex;
-    padding-top: 10px;
-    gap: ${theme.spacing(2)};
-    flex-direction: row;
-    align-items: flex-start;
-    flex-wrap: wrap;
-    ${theme.breakpoints.up('xxl')} {
-      flex-wrap: nowrap;
-    }
+    flex: 1;
+    margin-bottom: ${theme.spacing(6)};
   `,
+  contentContainerEditor: css`
+      flex:1;
+      display: flex;
+      padding-top: 10px;
+      gap: ${theme.spacing(2)};
+      flex-direction: row;
+      align-items: flex-start;
+      flex-wrap: wrap;
+      ${theme.breakpoints.up('xxl')} {
+        flex - wrap: nowrap;
+    }
+      min-width: 450px;
+      height: 363px;
+      `,
   snippets: css`
     margin-top: ${theme.spacing(2)};
     font-size: ${theme.typography.bodySmall.fontSize};
@@ -417,6 +432,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     font-weight: ${theme.typography.fontWeightBold};
   `,
   buttons: css`
+    display: flex;
     & > * + * {
       margin-left: ${theme.spacing(1)};
     }
@@ -426,43 +442,39 @@ const getStyles = (theme: GrafanaTheme2) => ({
     max-width: 758px;
   `,
   editWrapper: css`
-    display: block;
-    position: relative;
-    width: 640px;
-    height: 363px;
-  `,
-  toggle: css({
-    color: theme.colors.text.secondary,
-    marginRight: `${theme.spacing(1)}`,
-  }),
-  previewHeader: css({
-    display: 'flex',
-    cursor: 'pointer',
-    alignItems: 'baseline',
-    color: theme.colors.text.primary,
-    '&:hover': {
-      background: theme.colors.emphasize(theme.colors.background.primary, 0.03),
-    },
-  }),
-  previewHeaderTitle: css({
-    flexGrow: 1,
-    overflow: 'hidden',
-    fontSize: theme.typography.h4.fontSize,
-    fontWeight: theme.typography.fontWeightMedium,
-    margin: 0,
-  }),
+      display: flex;
+      width: 100%
+      heigth:100%;
+      position: relative;
+      `,
+  toggle: css`
+      color: theme.colors.text.secondary,
+      marginRight: ${theme.spacing(1)}`,
   preview: {
+    wrapper: css`
+      display: flex;
+      width: 100%
+      heigth:100%;
+      position: relative;
+      flex-direction: column;
+      `,
     result: css`
-      width: 640px;
+      width: 100%;
       height: 363px;
     `,
     button: css`
       flex: none;
       width: fit-content;
-      margin-top: ${theme.spacing(-3)};
+      margin-top: -6px;
     `,
   },
   collapsableSection: css`
     width: fit-content;
   `,
+  editorsWrapper: css`
+    display: flex;
+    flex: 1;
+    flex-wrap: wrap;
+    gap: ${theme.spacing(1)};
+  `,
 });
diff --git a/public/app/features/alerting/unified/components/receivers/TemplatePreview.test.tsx b/public/app/features/alerting/unified/components/receivers/TemplatePreview.test.tsx
index def4b0edaa3..02b0bd6fba3 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplatePreview.test.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplatePreview.test.tsx
@@ -45,6 +45,7 @@ describe('TemplatePreview component', () => {
   it('Should render error if payload has wrong format', async () => {
     render(
       <TemplatePreview
+        width={50}
         payload={'bla bla bla'}
         templateName="potato"
         payloadFormatError={'Unexpected token b in JSON at position 0'}
@@ -61,6 +62,7 @@ describe('TemplatePreview component', () => {
     const setError = jest.fn();
     render(
       <TemplatePreview
+        width={50}
         payload={'{"a":"b"}'}
         templateName="potato"
         payloadFormatError={'Unexpected token b in JSON at position 0'}
@@ -76,6 +78,7 @@ describe('TemplatePreview component', () => {
   it('Should render error if payload has wrong format rendering the preview', async () => {
     render(
       <TemplatePreview
+        width={50}
         payload={'potatos and cherries'}
         templateName="potato"
         payloadFormatError={'Unexpected token b in JSON at position 0'}
@@ -95,6 +98,7 @@ describe('TemplatePreview component', () => {
     mockPreviewTemplateResponseRejected(server);
     render(
       <TemplatePreview
+        width={50}
         payload={'[{"a":"b"}]'}
         templateName="potato"
         payloadFormatError={null}
@@ -118,6 +122,7 @@ describe('TemplatePreview component', () => {
     mockPreviewTemplateResponse(server, response);
     render(
       <TemplatePreview
+        width={50}
         payload={'[{"a":"b"}]'}
         templateName="potato"
         payloadFormatError={null}
@@ -143,6 +148,7 @@ describe('TemplatePreview component', () => {
     mockPreviewTemplateResponse(server, response);
     render(
       <TemplatePreview
+        width={50}
         payload={'[{"a":"b"}]'}
         templateName="potato"
         payloadFormatError={null}

From ee91b8c12ca7c86f1ffb40e92fd1bda2970fe4bc Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Mon, 8 May 2023 13:03:19 +0200
Subject: [PATCH 680/729] GrafanaUI: Export Toggletip (#67984)

---
 packages/grafana-ui/src/components/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 404e5168b43..7c44fc22d49 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -14,6 +14,7 @@ export { Tooltip } from './Tooltip/Tooltip';
 export type { PopoverContent } from './Tooltip/types';
 export { PopoverController } from './Tooltip/PopoverController';
 export { Popover } from './Tooltip/Popover';
+export { Toggletip } from './Toggletip/Toggletip';
 export { Portal, getPortalContainer, PortalContainer } from './Portal/Portal';
 export { CustomScrollbar, type ScrollbarPosition } from './CustomScrollbar/CustomScrollbar';
 export { TabbedContainer, type TabConfig } from './TabbedContainer/TabbedContainer';

From cb9d53708ef979b2848c7c6bffe0d1c63434bed4 Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Mon, 8 May 2023 13:57:49 +0200
Subject: [PATCH 681/729] Docs: Adds alert state history doc (#67976)

* Adds alert state history doc

* Adds config image

* Adds config as text

* correct spacing
---
 .../alerting-rules/view-state-health.md       | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/docs/sources/alerting/alerting-rules/view-state-health.md b/docs/sources/alerting/alerting-rules/view-state-health.md
index 44933c8b711..1368946c2b1 100644
--- a/docs/sources/alerting/alerting-rules/view-state-health.md
+++ b/docs/sources/alerting/alerting-rules/view-state-health.md
@@ -70,3 +70,56 @@ When evaluation of an alerting rule produces state `NoData` or `Error`, Grafana
 | **datasource_uid** | The UID of the data source that caused the state.                      |
 
 You can handle these alerts the same way as regular alerts by adding a silence, route to a contact point, and so on.
+
+## State history view
+
+Use the State history view to get insight into how your alert instances behave over time. View information on when a state change occurred, what the previous state was, the current state, any other alert instances that changed their state at the same time as well as what the query value was that triggered the change.
+
+### Configure the state history view
+
+**Note:** This applies to Open Source only. There is no configuration required if you are using Grafana Cloud.
+
+To enable the state history view, complete the following steps.
+
+1. Ensure you have a Loki instance running to save your history to.
+1. Configure the following settings in your Grafana configuration:
+
+   a. Enable the Loki backend and Loki remote URL.
+
+   b. Enable the three feature toggles for alert state history.
+
+**Example:**
+
+```
+[unified_alerting.state_history]
+enabled = true
+backend = loki
+loki_remote_url = http://localhost:3100
+
+[feature_toggles]
+enable = alertStateHistoryLokiSecondary, alertStateHistoryLokiPrimary, alertStateHistoryLokiOnly
+```
+
+### View state history
+
+To use the State history view, complete the following steps.
+
+1. Navigate to **Alerts&IRM** -> **Alerting** -> **Alert rules**.
+1. Click an alert rule.
+1. Select **Show state history**.
+
+   The State history view opens.
+
+   The timeline view at the top displays a timeline of changes for the past hour, so you can track how your alert instances are behaving over time.
+
+   The bottom part shows the alert instances, their previous and current state, the value of each part of the expression and a unique set of labels.
+
+   Common labels are displayed at the top to make it easier to identify different alert instances.
+
+1. From the timeline view, hover over a time to get an automatic display of all the changes that happened at that particular moment.
+
+   These changes are displayed in real time in the timestamp view at the bottom of the page. The timestamp view is a list of all the alert instances that changed state at that point in time. The visualization only displays 12 instances by default.
+
+   The value shown for each instance is for each part of the expression that was evaluated.
+
+1. Click the labels to filter and narrow down the results.

From e7f11f2456f28d8713a1d194421e9d74b4c5f8c6 Mon Sep 17 00:00:00 2001
From: Virginia Cepeda <virginia.cepeda@grafana.com>
Date: Mon, 8 May 2023 09:28:09 -0300
Subject: [PATCH 682/729] Alerting: Show export button for org admins (#67939)

Show export button for org admins
---
 public/app/features/alerting/unified/utils/access-control.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/alerting/unified/utils/access-control.ts b/public/app/features/alerting/unified/utils/access-control.ts
index 767b5b2c127..d12f6a19654 100644
--- a/public/app/features/alerting/unified/utils/access-control.ts
+++ b/public/app/features/alerting/unified/utils/access-control.ts
@@ -1,4 +1,5 @@
 import { contextSrv } from 'app/core/services/context_srv';
+import { isOrgAdmin } from 'app/features/plugins/admin/permissions';
 import { AccessControlAction } from 'app/types';
 
 import { GRAFANA_RULES_SOURCE_NAME, isGrafanaRulesSource } from './datasource';
@@ -123,6 +124,6 @@ export function getRulesAccess() {
         rulesSourceName === GRAFANA_RULES_SOURCE_NAME ? contextSrv.hasEditPermissionInFolders : contextSrv.isEditor;
       return contextSrv.hasAccess(getRulesPermissions(rulesSourceName).update, permissionFallback);
     },
-    canReadProvisioning: contextSrv.hasAccess(provisioningPermissions.read, contextSrv.isGrafanaAdmin),
+    canReadProvisioning: contextSrv.hasAccess(provisioningPermissions.read, isOrgAdmin()),
   };
 }

From b2fc285a5ddaa25265aea9a137fb37512ecdaf57 Mon Sep 17 00:00:00 2001
From: Horst Gutmann <horst.gutmann@grafana.com>
Date: Mon, 8 May 2023 15:22:34 +0200
Subject: [PATCH 683/729] CI: Add Windows backend tests in more places (#66438)

* CI: Add Windows backend tests in more places

* CI: Add promotion pipeline for publishing new windows-test-images

* CI: Ignore windows backend-test failures for now

* CI: Fix linting issue in ci_images.star file
---
 .drone.star                              |   5 +
 .drone.yml                               | 462 ++++++++++++++++++++++-
 scripts/build/ci-windows-test/Dockerfile |   6 +
 scripts/drone/events/main.star           |   3 +
 scripts/drone/events/pr.star             |  11 +
 scripts/drone/events/release.star        |   8 +-
 scripts/drone/pipelines/ci_images.star   |  67 ++++
 scripts/drone/pipelines/windows.star     |  40 ++
 scripts/drone/steps/lib.star             |  80 +++-
 scripts/drone/utils/utils.star           |   6 +-
 10 files changed, 676 insertions(+), 12 deletions(-)
 create mode 100644 scripts/build/ci-windows-test/Dockerfile
 create mode 100644 scripts/drone/pipelines/ci_images.star

diff --git a/.drone.star b/.drone.star
index 5c9e4793bbf..17e9ddceef5 100644
--- a/.drone.star
+++ b/.drone.star
@@ -29,6 +29,10 @@ load(
     "publish_image_pipelines_public",
     "publish_image_pipelines_security",
 )
+load(
+    "scripts/drone/pipelines/ci_images.star",
+    "publish_ci_windows_test_image_pipeline",
+)
 load("scripts/drone/pipelines/github.star", "publish_github_pipeline")
 load("scripts/drone/pipelines/aws_marketplace.star", "publish_aws_marketplace_pipeline")
 load("scripts/drone/version.star", "version_branch_pipelines")
@@ -59,6 +63,7 @@ def main(_ctx):
         artifacts_page_pipeline() +
         version_branch_pipelines() +
         integration_test_pipelines() +
+        publish_ci_windows_test_image_pipeline() +
         cronjobs() +
         secrets()
     )
diff --git a/.drone.yml b/.drone.yml
index fd9fa92b69d..ac5e04ea77a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -373,6 +373,56 @@ environment:
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
+name: pr-oss-test-backend-windows
+platform:
+  arch: amd64
+  os: windows
+  version: "1809"
+services: []
+steps:
+- commands: []
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: windows-init
+- commands:
+  - go install github.com/google/wire/cmd/wire@v0.5.0
+  - wire gen -tags oss ./pkg/server
+  depends_on:
+  - windows-init
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: wire-install
+- commands:
+  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  depends_on:
+  - wire-install
+  failure: ignore
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: test-backend
+trigger:
+  event:
+  - pull_request
+  paths:
+    exclude:
+    - docs/**
+    - '*.md'
+    - pkg/**
+    - packaging/**
+    - go.sum
+    - go.mod
+    include: []
+type: docker
+volumes:
+- host:
+    path: //./pipe/docker_engine/
+  name: docker
+---
+clone:
+  retries: 3
+depends_on: []
+environment:
+  EDITION: oss
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
 name: pr-lint-backend
 node:
   type: no-parallel
@@ -2088,7 +2138,127 @@ trigger:
 type: docker
 volumes:
 - host:
-    path: /var/run/docker.sock
+    path: //./pipe/docker_engine/
+  name: docker
+---
+clone:
+  retries: 3
+depends_on: []
+environment:
+  EDITION: oss
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: main-oss-test-backend-windows
+platform:
+  arch: amd64
+  os: windows
+  version: "1809"
+services: []
+steps:
+- commands: []
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: windows-init
+- commands:
+  - go install github.com/google/wire/cmd/wire@v0.5.0
+  - wire gen -tags oss ./pkg/server
+  depends_on:
+  - windows-init
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: wire-install
+- commands:
+  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  depends_on:
+  - wire-install
+  failure: ignore
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: test-backend
+trigger:
+  branch: main
+  event:
+  - push
+  paths:
+    exclude:
+    - '*.md'
+    - docs/**
+    - latest.json
+type: docker
+volumes:
+- host:
+    path: //./pipe/docker_engine/
+  name: docker
+---
+clone:
+  disable: true
+depends_on: []
+environment:
+  EDITION: enterprise
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: main-enterprise-test-backend-windows
+platform:
+  arch: amd64
+  os: windows
+  version: "1809"
+services: []
+steps:
+- commands:
+  - $$ProgressPreference = "SilentlyContinue"
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/windows/grabpl.exe
+    -OutFile grabpl.exe
+  image: grafana/ci-wix:0.1.1
+  name: grabpl
+- commands:
+  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
+  - cd grafana-enterprise
+  - git checkout main
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/ci-wix:0.1.1
+  name: clone
+- commands:
+  - cp -r grafana-enterprise C:\App\grafana-enterprise
+  - rm -r -force grafana-enterprise
+  - cp grabpl.exe C:\App\grabpl.exe
+  - rm -force grabpl.exe
+  - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise
+  - cp C:\App\grabpl.exe grabpl.exe
+  depends_on:
+  - clone
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/ci-wix:0.1.1
+  name: windows-init
+- commands:
+  - go install github.com/google/wire/cmd/wire@v0.5.0
+  - wire gen -tags enterprise ./pkg/server
+  depends_on:
+  - windows-init
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: wire-install
+- commands:
+  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  depends_on:
+  - wire-install
+  failure: ignore
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: test-backend
+trigger:
+  branch: main
+  event:
+  - push
+  paths:
+    exclude:
+    - '*.md'
+    - docs/**
+    - latest.json
+type: docker
+volumes:
+- host:
+    path: //./pipe/docker_engine/
   name: docker
 ---
 clone:
@@ -2646,12 +2816,132 @@ volumes:
     path: /var/run/docker.sock
   name: docker
 ---
+clone:
+  retries: 3
+depends_on: []
+environment:
+  EDITION: oss
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: release-oss-test-backend-windows
+platform:
+  arch: amd64
+  os: windows
+  version: "1809"
+services: []
+steps:
+- commands: []
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: windows-init
+- commands:
+  - go install github.com/google/wire/cmd/wire@v0.5.0
+  - wire gen -tags oss ./pkg/server
+  depends_on:
+  - windows-init
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: wire-install
+- commands:
+  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  depends_on:
+  - wire-install
+  failure: ignore
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: test-backend
+trigger:
+  event:
+    exclude:
+    - promote
+  ref:
+    exclude:
+    - refs/tags/*-cloud*
+    include:
+    - refs/tags/v*
+type: docker
+volumes:
+- host:
+    path: //./pipe/docker_engine/
+  name: docker
+---
+clone:
+  disable: true
+depends_on: []
+environment:
+  EDITION: enterprise
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: release-enterprise-test-backend-windows
+platform:
+  arch: amd64
+  os: windows
+  version: "1809"
+services: []
+steps:
+- commands:
+  - $$ProgressPreference = "SilentlyContinue"
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/windows/grabpl.exe
+    -OutFile grabpl.exe
+  image: grafana/ci-wix:0.1.1
+  name: grabpl
+- commands:
+  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
+  - cd grafana-enterprise
+  - git checkout ${DRONE_TAG}
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/ci-wix:0.1.1
+  name: clone
+- commands:
+  - cp -r grafana-enterprise C:\App\grafana-enterprise
+  - rm -r -force grafana-enterprise
+  - cp grabpl.exe C:\App\grabpl.exe
+  - rm -force grabpl.exe
+  - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise
+  - cp C:\App\grabpl.exe grabpl.exe
+  depends_on:
+  - clone
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/ci-wix:0.1.1
+  name: windows-init
+- commands:
+  - go install github.com/google/wire/cmd/wire@v0.5.0
+  - wire gen -tags enterprise ./pkg/server
+  depends_on:
+  - windows-init
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: wire-install
+- commands:
+  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  depends_on:
+  - wire-install
+  failure: ignore
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: test-backend
+trigger:
+  event:
+    exclude:
+    - promote
+  ref:
+    exclude:
+    - refs/tags/*-cloud*
+    include:
+    - refs/tags/v*
+type: docker
+volumes:
+- host:
+    path: //./pipe/docker_engine/
+  name: docker
+---
 clone:
   retries: 3
 depends_on:
 - release-oss-build-e2e-publish
 - release-oss-test-frontend
-- release-oss-test-backend
+- release-oss-test-backend-windows
 environment:
   EDITION: oss
 image_pull_secrets:
@@ -2709,7 +2999,7 @@ trigger:
 type: docker
 volumes:
 - host:
-    path: /var/run/docker.sock
+    path: //./pipe/docker_engine/
   name: docker
 ---
 clone:
@@ -3293,7 +3583,7 @@ trigger:
 type: docker
 volumes:
 - host:
-    path: /var/run/docker.sock
+    path: //./pipe/docker_engine/
   name: docker
 ---
 clone:
@@ -5210,6 +5500,114 @@ environment:
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
+name: release-branch-oss-test-backend-windows
+platform:
+  arch: amd64
+  os: windows
+  version: "1809"
+services: []
+steps:
+- commands: []
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: windows-init
+- commands:
+  - go install github.com/google/wire/cmd/wire@v0.5.0
+  - wire gen -tags oss ./pkg/server
+  depends_on:
+  - windows-init
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: wire-install
+- commands:
+  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  depends_on:
+  - wire-install
+  failure: ignore
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: test-backend
+trigger:
+  ref:
+  - refs/heads/v[0-9]*
+type: docker
+volumes:
+- host:
+    path: //./pipe/docker_engine/
+  name: docker
+---
+clone:
+  disable: true
+depends_on: []
+environment:
+  EDITION: enterprise
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: release-branch-enterprise-test-backend-windows
+platform:
+  arch: amd64
+  os: windows
+  version: "1809"
+services: []
+steps:
+- commands:
+  - $$ProgressPreference = "SilentlyContinue"
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/windows/grabpl.exe
+    -OutFile grabpl.exe
+  image: grafana/ci-wix:0.1.1
+  name: grabpl
+- commands:
+  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
+  - cd grafana-enterprise
+  - git checkout $$env:DRONE_BRANCH
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/ci-wix:0.1.1
+  name: clone
+- commands:
+  - cp -r grafana-enterprise C:\App\grafana-enterprise
+  - rm -r -force grafana-enterprise
+  - cp grabpl.exe C:\App\grabpl.exe
+  - rm -force grabpl.exe
+  - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise
+  - cp C:\App\grabpl.exe grabpl.exe
+  depends_on:
+  - clone
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/ci-wix:0.1.1
+  name: windows-init
+- commands:
+  - go install github.com/google/wire/cmd/wire@v0.5.0
+  - wire gen -tags enterprise ./pkg/server
+  depends_on:
+  - windows-init
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: wire-install
+- commands:
+  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  depends_on:
+  - wire-install
+  failure: ignore
+  image: grafana/grafana-ci-windows-test:0.1.0
+  name: test-backend
+trigger:
+  ref:
+  - refs/heads/v[0-9]*
+type: docker
+volumes:
+- host:
+    path: //./pipe/docker_engine/
+  name: docker
+---
+clone:
+  retries: 3
+depends_on: []
+environment:
+  EDITION: oss
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
 name: release-branch-oss-integration-tests
 node:
   type: no-parallel
@@ -5383,7 +5781,7 @@ clone:
 depends_on:
 - release-branch-oss-build-e2e-publish
 - release-branch-oss-test-frontend
-- release-branch-oss-test-backend
+- release-branch-oss-test-backend-windows
 environment:
   EDITION: oss
 image_pull_secrets:
@@ -5431,7 +5829,7 @@ trigger:
 type: docker
 volumes:
 - host:
-    path: /var/run/docker.sock
+    path: //./pipe/docker_engine/
   name: docker
 ---
 clone:
@@ -6205,7 +6603,7 @@ trigger:
 type: docker
 volumes:
 - host:
-    path: /var/run/docker.sock
+    path: //./pipe/docker_engine/
   name: docker
 ---
 clone:
@@ -6844,6 +7242,54 @@ volumes:
   temp:
     medium: memory
 ---
+clone:
+  disable: true
+depends_on: []
+image_pull_secrets:
+- dockerconfigjson
+kind: pipeline
+name: publish-ci-windows-test-image
+platform:
+  arch: amd64
+  os: windows
+  version: "1809"
+services: []
+steps:
+- commands:
+  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-ci-sandbox.git"
+    .
+  - git checkout -f $$env:DRONE_COMMIT
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  image: grafana/ci-wix:0.1.1
+  name: clone
+- commands:
+  - cd scripts\build\ci-windows-test
+  - docker login -u $$env:DOCKER_USERNAME -p $$env:DOCKER_PASSWORD
+  - docker build -t grafana/grafana-ci-windows-test:$$env:TAG .
+  - docker push grafana/grafana-ci-windows-test:$$env:TAG
+  environment:
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USERNAME:
+      from_secret: docker_username
+  image: docker:windowsservercore-1809
+  name: build-and-publish
+  volumes:
+  - name: docker
+    path: //./pipe/docker_engine/
+trigger:
+  event:
+  - promote
+  target:
+  - ci-windows-test-image
+type: docker
+volumes:
+- host:
+    path: //./pipe/docker_engine/
+  name: docker
+---
 clone:
   retries: 3
 kind: pipeline
@@ -7148,6 +7594,6 @@ kind: secret
 name: github_token
 ---
 kind: signature
-hmac: 1a5358f92b6ca848288fb7917e62b994430c89eaa43ac2e5c1de49df359886d5
+hmac: de8e1e63e1e22d145970d335bb1140c68c77e3833d54748f0a34720ab72d7be2
 
 ...
diff --git a/scripts/build/ci-windows-test/Dockerfile b/scripts/build/ci-windows-test/Dockerfile
new file mode 100644
index 00000000000..86dadef8e4c
--- /dev/null
+++ b/scripts/build/ci-windows-test/Dockerfile
@@ -0,0 +1,6 @@
+FROM golang:1.20.3-windowsservercore-1809
+
+SHELL ["powershell", "-command"]
+
+RUN Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+RUN choco install mingw -y --version 12.2.0.03042023
diff --git a/scripts/drone/events/main.star b/scripts/drone/events/main.star
index f3228431503..1d43da3f8c6 100644
--- a/scripts/drone/events/main.star
+++ b/scripts/drone/events/main.star
@@ -32,6 +32,7 @@ load(
 load(
     "scripts/drone/pipelines/windows.star",
     "windows",
+    "windows_test_backend",
 )
 load(
     "scripts/drone/pipelines/trigger_downstream.star",
@@ -89,6 +90,8 @@ def main_pipelines():
         build_e2e(trigger, ver_mode),
         integration_tests(trigger, prefix = ver_mode, ver_mode = ver_mode),
         windows(trigger, edition = "oss", ver_mode = ver_mode),
+        windows_test_backend(trigger, "oss", ver_mode),
+        windows_test_backend(trigger, "enterprise", ver_mode),
         notify_pipeline(
             name = "notify-drone-changes",
             slack_channel = "slack-webhooks-test",
diff --git a/scripts/drone/events/pr.star b/scripts/drone/events/pr.star
index 73ab62d2680..9e1ba26a046 100644
--- a/scripts/drone/events/pr.star
+++ b/scripts/drone/events/pr.star
@@ -15,6 +15,10 @@ load(
     "scripts/drone/pipelines/integration_tests.star",
     "integration_tests",
 )
+load(
+    "scripts/drone/pipelines/windows.star",
+    "windows_test_backend",
+)
 load(
     "scripts/drone/pipelines/build.star",
     "build_e2e",
@@ -100,6 +104,13 @@ def pr_pipelines():
             ),
             ver_mode,
         ),
+        windows_test_backend(
+            get_pr_trigger(
+                exclude_paths = ["pkg/**", "packaging/**", "go.sum", "go.mod"],
+            ),
+            "oss",
+            ver_mode,
+        ),
         lint_backend_pipeline(
             get_pr_trigger(
                 include_paths = [
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index 0875ada4194..ee0819dbcb1 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -61,6 +61,10 @@ load(
     "test_backend",
     "test_backend_enterprise",
 )
+load(
+    "scripts/drone/pipelines/windows.star",
+    "windows_test_backend",
+)
 load("scripts/drone/vault.star", "from_secret", "prerelease_bucket")
 
 ver_mode = "release"
@@ -223,7 +227,7 @@ def oss_pipelines(ver_mode = ver_mode, trigger = release_trigger):
         depends_on = [
             "{}-oss-build-e2e-publish".format(ver_mode),
             "{}-oss-test-frontend".format(ver_mode),
-            "{}-oss-test-backend".format(ver_mode),
+            "{}-oss-test-backend-windows".format(ver_mode),
         ],
         environment = environment,
     )
@@ -240,6 +244,8 @@ def oss_pipelines(ver_mode = ver_mode, trigger = release_trigger):
         ),
         test_frontend(trigger, ver_mode),
         test_backend(trigger, ver_mode),
+        windows_test_backend(trigger, "oss", ver_mode),
+        windows_test_backend(trigger, "enterprise", ver_mode),
     ]
 
     if ver_mode not in ("release"):
diff --git a/scripts/drone/pipelines/ci_images.star b/scripts/drone/pipelines/ci_images.star
new file mode 100644
index 00000000000..fa6f458cd2b
--- /dev/null
+++ b/scripts/drone/pipelines/ci_images.star
@@ -0,0 +1,67 @@
+"""
+This module contains steps and pipelines relating to creating CI Docker images.
+"""
+
+load(
+    "scripts/drone/steps/lib.star",
+    "wix_image",
+)
+load(
+    "scripts/drone/utils/utils.star",
+    "pipeline",
+)
+load(
+    "scripts/drone/vault.star",
+    "from_secret",
+)
+
+def publish_ci_windows_test_image_pipeline():
+    trigger = {
+        "event": ["promote"],
+        "target": ["ci-windows-test-image"],
+    }
+    pl = pipeline(
+        name = "publish-ci-windows-test-image",
+        trigger = trigger,
+        edition = "",
+        platform = "windows",
+        steps = [
+            {
+                "name": "clone",
+                "image": wix_image,
+                "environment": {
+                    "GITHUB_TOKEN": from_secret("github_token"),
+                },
+                "commands": [
+                    'git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-ci-sandbox.git" .',
+                    "git checkout -f $$env:DRONE_COMMIT",
+                ],
+            },
+            {
+                "name": "build-and-publish",
+                "image": "docker:windowsservercore-1809",
+                "environment": {
+                    "DOCKER_USERNAME": from_secret("docker_username"),
+                    "DOCKER_PASSWORD": from_secret("docker_password"),
+                },
+                "commands": [
+                    "cd scripts\\build\\ci-windows-test",
+                    "docker login -u $$env:DOCKER_USERNAME -p $$env:DOCKER_PASSWORD",
+                    "docker build -t grafana/grafana-ci-windows-test:$$env:TAG .",
+                    "docker push grafana/grafana-ci-windows-test:$$env:TAG",
+                ],
+                "volumes": [
+                    {
+                        "name": "docker",
+                        "path": "//./pipe/docker_engine/",
+                    },
+                ],
+            },
+        ],
+    )
+
+    pl["clone"] = {
+        "disable": True,
+    }
+
+    return [pl]
diff --git a/scripts/drone/pipelines/windows.star b/scripts/drone/pipelines/windows.star
index b726edc2463..3669cfb9986 100644
--- a/scripts/drone/pipelines/windows.star
+++ b/scripts/drone/pipelines/windows.star
@@ -9,8 +9,48 @@ load(
 load(
     "scripts/drone/steps/lib.star",
     "get_windows_steps",
+    "windows_go_image",
+    "windows_init_enterprise_steps",
+    "windows_test_backend_step",
+    "windows_wire_install_step",
 )
 
+def windows_test_backend(trigger, edition, ver_mode):
+    """ Generates a pipeline that runs backend tests on Windows
+
+    Args:
+      trigger: a Drone trigger for the pipeline
+      edition: controls whether enterprise code is included or not
+      ver_mode: controls whether a pre-release or actual release pipeline is generated.
+    Returns:
+        A single pipeline running backend tests for Windows
+    """
+    environment = {"EDITION": edition}
+    steps = []
+
+    if edition == "enterprise":
+        steps.extend(windows_init_enterprise_steps(ver_mode))
+    else:
+        steps.extend([{
+            "name": "windows-init",
+            "image": windows_go_image,
+            "commands": [],
+        }])
+
+    steps.extend([
+        windows_wire_install_step(edition),
+        windows_test_backend_step(),
+    ])
+    return pipeline(
+        name = "{}-{}-test-backend-windows".format(ver_mode, edition),
+        edition = edition,
+        trigger = trigger,
+        steps = steps,
+        depends_on = [],
+        platform = "windows",
+        environment = environment,
+    )
+
 def windows(trigger, edition, ver_mode):
     """Generates the pipeline used for building Grafana on Windows.
 
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 45527d377c1..750788754ab 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -17,6 +17,7 @@ curl_image = "byrnedo/alpine-curl:0.1.8"
 windows_image = "mcr.microsoft.com/windows:1809"
 wix_image = "grafana/ci-wix:0.1.1"
 go_image = "golang:1.20.4"
+windows_go_image = "grafana/grafana-ci-windows-test:0.1.0"
 
 trigger_oss = {
     "repo": [
@@ -57,6 +58,19 @@ def wire_install_step():
         ],
     }
 
+def windows_wire_install_step(edition):
+    return {
+        "name": "wire-install",
+        "image": windows_go_image,
+        "commands": [
+            "go install github.com/google/wire/cmd/wire@v0.5.0",
+            "wire gen -tags {} ./pkg/server".format(edition),
+        ],
+        "depends_on": [
+            "windows-init",
+        ],
+    }
+
 def identify_runner_step(platform = "linux"):
     if platform == "linux":
         return {
@@ -188,6 +202,61 @@ def init_enterprise_step(ver_mode):
         ],
     }
 
+def windows_init_enterprise_steps(ver_mode):
+    """Performs init-enterprise steps in a Windows environment
+
+    Args:
+        ver_mode: in what mode should this be run
+
+    Returns:
+        A list of steps setting up an enterprise folder
+    """
+    if ver_mode == "release":
+        source = "${DRONE_TAG}"
+    elif ver_mode == "release-branch":
+        source = "$$env:DRONE_BRANCH"
+    else:
+        source = "main"
+
+    clone_cmds = [
+        'git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"',
+        "cd grafana-enterprise",
+        "git checkout {}".format(source),
+    ]
+
+    init_cmds = [
+        # Need to move grafana-enterprise out of the way, so directory is empty and can be cloned into
+        "cp -r grafana-enterprise C:\\App\\grafana-enterprise",
+        "rm -r -force grafana-enterprise",
+        "cp grabpl.exe C:\\App\\grabpl.exe",
+        "rm -force grabpl.exe",
+        "C:\\App\\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\\App\\grafana-enterprise",
+        "cp C:\\App\\grabpl.exe grabpl.exe",
+    ]
+
+    steps = []
+    steps.extend(
+        [
+            download_grabpl_step(platform = "windows"),
+            {
+                "name": "clone",
+                "image": wix_image,
+                "environment": {
+                    "GITHUB_TOKEN": from_secret("github_token"),
+                },
+                "commands": clone_cmds,
+            },
+            {
+                "name": "windows-init",
+                "image": wix_image,
+                "commands": init_cmds,
+                "depends_on": ["clone"],
+                "environment": {"GITHUB_TOKEN": from_secret("github_token")},
+            },
+        ],
+    )
+    return steps
+
 def download_grabpl_step(platform = "linux"):
     if platform == "windows":
         return {
@@ -605,10 +674,10 @@ def build_plugins_step(edition, ver_mode):
         ],
     }
 
-def test_backend_step():
+def test_backend_step(image = build_image):
     return {
         "name": "test-backend",
-        "image": build_image,
+        "image": image,
         "depends_on": [
             "wire-install",
         ],
@@ -617,6 +686,11 @@ def test_backend_step():
         ],
     }
 
+def windows_test_backend_step():
+    step = test_backend_step(image = windows_go_image)
+    step["failure"] = "ignore"
+    return step
+
 def test_backend_integration_step():
     return {
         "name": "test-backend-integration",
@@ -1380,6 +1454,8 @@ def get_windows_steps(edition, ver_mode):
             ],
         )
 
+    # TODO: Run windows backend tests
+
     if (
         ver_mode == "main" and (edition not in ("enterprise", "enterprise2"))
     ) or ver_mode in (
diff --git a/scripts/drone/utils/utils.star b/scripts/drone/utils/utils.star
index e3c79beee89..82af7ca9604 100644
--- a/scripts/drone/utils/utils.star
+++ b/scripts/drone/utils/utils.star
@@ -63,6 +63,10 @@ def pipeline(
             },
         }
 
+    docker_mount_path = "/var/run/docker.sock"
+    if platform == "windows":
+        docker_mount_path = "//./pipe/docker_engine/"
+
     pipeline = {
         "kind": "pipeline",
         "type": "docker",
@@ -77,7 +81,7 @@ def pipeline(
             {
                 "name": "docker",
                 "host": {
-                    "path": "/var/run/docker.sock",
+                    "path": docker_mount_path,
                 },
             },
         ],

From 7a916962f27cb0db74705422a558ba1e2a936458 Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Mon, 8 May 2023 15:09:38 +0100
Subject: [PATCH 684/729] Docs: Update API keys docs to mark that api keys will
 be service account tokens (#67975)

* update docs to mark that api keys will be service account tokens

* Update docs/sources/administration/api-keys/index.md

* Update docs/sources/administration/api-keys/index.md

Co-authored-by: Vardan Torosyan <vardants@gmail.com>

---------

Co-authored-by: Vardan Torosyan <vardants@gmail.com>
---
 docs/sources/administration/api-keys/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/administration/api-keys/index.md b/docs/sources/administration/api-keys/index.md
index 462061476fc..1116227f743 100644
--- a/docs/sources/administration/api-keys/index.md
+++ b/docs/sources/administration/api-keys/index.md
@@ -61,7 +61,7 @@ For more information about the benefits of service accounts, refer to [Grafana s
 
 The service account endpoints generate a machine user for authentication instead of using API keys. When you migrate an API key to a service account, a service account will be created with a service account token.
 
-> **Note:** If you are using API keys for authentication, we recommend that you migrate your integration to the service account authentication method. The API key will continue to work. You can locate the API key in the [Grafana service account tokens]({{< relref "../service-accounts/#service-account-tokens" >}}) details.
+> **Note:** If you're currently using API keys for authentication, we strongly recommend to use Grafana Service Accounts instead. Rest assured, when migrating to Service Accounts, your existing API keys will continue working as before. To find the migrated API keys, navigate to the Service Accounts section and select the Service Account Tokens tab. For more information, please refer to the [Grafana service account tokens]({{< relref "../service-accounts/#service-account-tokens" >}}) details.
 
 ## Ways of migrating API keys to service accounts
 

From 5155455c55c2bf4b3848f03a7eecebd4f4e4ba9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 8 May 2023 16:56:06 +0200
Subject: [PATCH 685/729] Dashboard: Change add panel button to fill to remove
 outline border (#68004)

---
 .../dashboard/components/AddPanelButton/AddPanelButton.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx b/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
index 0352cfdd282..1be12e93a07 100644
--- a/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
+++ b/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
@@ -27,7 +27,7 @@ export const AddPanelButton = ({ dashboard }: Props) => {
       <Button
         icon="panel-add"
         size="lg"
-        fill="outline"
+        fill="text"
         className={cx(styles.button, styles.buttonIcon, styles.buttonText)}
         data-testid={selectors.components.PageToolbar.itemButton('Add panel button')}
       >

From b9e53f628fa65664e92353d46fe90d6de66e9ddf Mon Sep 17 00:00:00 2001
From: venkatbvc <chalapathirao@gmail.com>
Date: Mon, 8 May 2023 20:41:36 +0530
Subject: [PATCH 686/729] HTTP: Add TLS version configurability for Grafana
 server (#67482)

Co-authored-by: Rao B V Chalapathi <b_v_chalapathi.rao@nokia.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 conf/defaults.ini                             |  3 +
 conf/sample.ini                               |  3 +
 .../setup-grafana/configure-grafana/_index.md |  5 +
 pkg/api/http_server.go                        | 91 +++++++++++++------
 pkg/services/ldap/settings.go                 | 57 +-----------
 pkg/setting/setting.go                        |  6 ++
 pkg/setting/setting_test.go                   | 15 +++
 pkg/util/tls.go                               | 68 ++++++++++++++
 pkg/util/tls_test.go                          | 26 ++++++
 9 files changed, 193 insertions(+), 81 deletions(-)
 create mode 100644 pkg/util/tls.go
 create mode 100644 pkg/util/tls_test.go

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 1066299459e..989d2324458 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -34,6 +34,9 @@ provisioning = conf/provisioning
 # Protocol (http, https, h2, socket)
 protocol = http
 
+# Minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.2, TLS1.3. If nothing is set TLS1.2 would be taken
+min_tls_version = ""
+
 # The ip address to bind to, empty will bind to all interfaces
 http_addr =
 
diff --git a/conf/sample.ini b/conf/sample.ini
index 91d4e908be5..41b56c46aa7 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -34,6 +34,9 @@
 # Protocol (http, https, h2, socket)
 ;protocol = http
 
+# This is the minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.2, TLS1.3. If nothing is set TLS1.2 would be taken
+;min_tls_version = ""
+
 # The ip address to bind to, empty will bind to all interfaces
 ;http_addr =
 
diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md
index 7eb24453425..15a877018f8 100644
--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -189,6 +189,11 @@ Folder that contains [provisioning]({{< relref "../../administration/provisionin
 
 `http`,`https`,`h2` or `socket`
 
+### min_tls_version
+
+The TLS Handshake requires a minimum TLS version. The available options are TLS1.2 and TLS1.3.
+If you do not specify a version, the system uses TLS1.2.
+
 ### http_addr
 
 The host for the server to listen on. If your machine has more than one network interface, you can use this setting to expose the Grafana service on only one network interface and not have it available on others, such as the loopback interface. An empty value is equivalent to setting the value to `0.0.0.0`, which means the Grafana service binds to all interfaces.
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index b8dcc68310c..78a459389a8 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -99,6 +99,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/validations"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -501,21 +502,22 @@ func (hs *HTTPServer) configureHttps() error {
 		return fmt.Errorf(`cannot find SSL key_file at %q`, hs.Cfg.KeyFile)
 	}
 
+	minTlsVersion, err := util.TlsNameToVersion(hs.Cfg.MinTLSVersion)
+	if err != nil {
+		return err
+	}
+
+	tlsCiphers := hs.getDefaultCiphers(minTlsVersion, string(setting.HTTPSScheme))
+	if err != nil {
+		return err
+	}
+
+	hs.log.Info("HTTP Server TLS settings", "Min TLS Version", hs.Cfg.MinTLSVersion,
+		"configured ciphers", util.TlsCipherIdsToString(tlsCiphers))
+
 	tlsCfg := &tls.Config{
-		MinVersion: tls.VersionTLS12,
-		CipherSuites: []uint16{
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-		},
+		MinVersion:   minTlsVersion,
+		CipherSuites: tlsCiphers,
 	}
 
 	hs.httpSrv.TLSConfig = tlsCfg
@@ -541,20 +543,20 @@ func (hs *HTTPServer) configureHttp2() error {
 		return fmt.Errorf("cannot find SSL key_file at %q", hs.Cfg.KeyFile)
 	}
 
+	minTlsVersion, err := util.TlsNameToVersion(hs.Cfg.MinTLSVersion)
+	if err != nil {
+		return err
+	}
+
+	tlsCiphers := hs.getDefaultCiphers(minTlsVersion, string(setting.HTTP2Scheme))
+
+	hs.log.Info("HTTP Server TLS settings", "Min TLS Version", hs.Cfg.MinTLSVersion,
+		"configured ciphers", util.TlsCipherIdsToString(tlsCiphers))
+
 	tlsCfg := &tls.Config{
-		MinVersion: tls.VersionTLS12,
-		CipherSuites: []uint16{
-			tls.TLS_CHACHA20_POLY1305_SHA256,
-			tls.TLS_AES_128_GCM_SHA256,
-			tls.TLS_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
-		},
-		NextProtos: []string{"h2", "http/1.1"},
+		MinVersion:   minTlsVersion,
+		CipherSuites: tlsCiphers,
+		NextProtos:   []string{"h2", "http/1.1"},
 	}
 
 	hs.httpSrv.TLSConfig = tlsCfg
@@ -737,3 +739,38 @@ func (hs *HTTPServer) mapStatic(m *web.Mux, rootDir string, dir string, prefix s
 func (hs *HTTPServer) metricsEndpointBasicAuthEnabled() bool {
 	return hs.Cfg.MetricsEndpointBasicAuthUsername != "" && hs.Cfg.MetricsEndpointBasicAuthPassword != ""
 }
+
+func (hs *HTTPServer) getDefaultCiphers(tlsVersion uint16, protocol string) []uint16 {
+	if tlsVersion != tls.VersionTLS12 {
+		return nil
+	}
+	if protocol == "https" {
+		return []uint16{
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+		}
+	}
+	if protocol == "h2" {
+		return []uint16{
+			tls.TLS_CHACHA20_POLY1305_SHA256,
+			tls.TLS_AES_128_GCM_SHA256,
+			tls.TLS_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
+			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+		}
+	}
+	return nil
+}
diff --git a/pkg/services/ldap/settings.go b/pkg/services/ldap/settings.go
index 142a17d854c..47abe75ece3 100644
--- a/pkg/services/ldap/settings.go
+++ b/pkg/services/ldap/settings.go
@@ -1,10 +1,8 @@
 package ldap
 
 import (
-	"crypto/tls"
 	"fmt"
 	"os"
-	"strings"
 	"sync"
 
 	"github.com/BurntSushi/toml"
@@ -12,6 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 const defaultTimeout = 10
@@ -144,14 +143,14 @@ func readConfig(configFile string) (*Config, error) {
 		}
 
 		if server.MinTLSVersion != "" {
-			server.minTLSVersion, err = tlsNameToVersion(server.MinTLSVersion)
+			server.minTLSVersion, err = util.TlsNameToVersion(server.MinTLSVersion)
 			if err != nil {
 				logger.Error("Failed to set min TLS version. Ignoring", "err", err)
 			}
 		}
 
 		if len(server.TLSCiphers) > 0 {
-			server.tlsCiphers, err = tlsCiphersToIDs(server.TLSCiphers)
+			server.tlsCiphers, err = util.TlsCiphersToIDs(server.TLSCiphers)
 			if err != nil {
 				logger.Error("Unrecognized TLS Cipher(s). Ignoring", "err", err)
 			}
@@ -191,53 +190,3 @@ func assertNotEmptyCfg(val interface{}, propName string) error {
 	}
 	return nil
 }
-
-// tlsNameToVersion converts a string to a tls version
-func tlsNameToVersion(name string) (uint16, error) {
-	name = strings.ToUpper(name)
-	switch name {
-	case "TLS1.0":
-		return tls.VersionTLS10, nil
-	case "TLS1.1":
-		return tls.VersionTLS11, nil
-	case "TLS1.2":
-		return tls.VersionTLS12, nil
-	case "TLS1.3":
-		return tls.VersionTLS13, nil
-	}
-
-	return 0, fmt.Errorf("unknown tls version: %q", name)
-}
-
-// Cipher strings https://go.dev/src/crypto/tls/cipher_suites.go
-// Ex: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" or "TLS_RSA_WITH_AES_128_CBC_SHA"
-func tlsCiphersToIDs(names []string) ([]uint16, error) {
-	if len(names) == 0 || names == nil {
-		// no ciphers specified, use defaults
-		return nil, nil
-	}
-	var ids []uint16
-	var missing []string
-
-	ciphers := tls.CipherSuites()
-	var cipherMap = make(map[string]uint16, len(ciphers))
-	for _, cipher := range ciphers {
-		cipherMap[cipher.Name] = cipher.ID
-	}
-
-	for _, name := range names {
-		name = strings.ToUpper(name)
-		id, ok := cipherMap[name]
-		if !ok {
-			missing = append(missing, name)
-			continue
-		}
-		ids = append(ids, id)
-	}
-
-	if len(missing) > 0 {
-		return ids, fmt.Errorf("unknown ciphers: %v", missing)
-	}
-
-	return ids, nil
-}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 122d3ef2bf0..4865681deb5 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -166,6 +166,7 @@ type Cfg struct {
 	ReadTimeout      time.Duration
 	EnableGzip       bool
 	EnforceDomain    bool
+	MinTLSVersion    string
 
 	// Security settings
 	SecretKey             string
@@ -1796,6 +1797,11 @@ func (cfg *Cfg) readServerSettings(iniFile *ini.File) error {
 		cfg.SocketPath = server.Key("socket").String()
 	}
 
+	cfg.MinTLSVersion = valueAsString(server, "min_tls_version", "TLS1.2")
+	if cfg.MinTLSVersion == "TLS1.0" || cfg.MinTLSVersion == "TLS1.1" {
+		return fmt.Errorf("TLS version not configured correctly:%v, allowed values are TLS1.2 and TLS1.3", cfg.MinTLSVersion)
+	}
+
 	cfg.Domain = valueAsString(server, "domain", "localhost")
 	cfg.HTTPAddr = valueAsString(server, "http_addr", DefaultHTTPAddr)
 	cfg.HTTPPort = valueAsString(server, "http_port", "3000")
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index 2bc539cbeb4..9ab2dd9cc98 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -31,6 +31,7 @@ func TestLoadingSettings(t *testing.T) {
 
 		require.Equal(t, "admin", cfg.AdminUser)
 		require.Equal(t, "http://localhost:3000/", cfg.RendererCallbackUrl)
+		require.Equal(t, "TLS1.2", cfg.MinTLSVersion)
 	})
 
 	t.Run("default.ini should have no semi-colon commented entries", func(t *testing.T) {
@@ -143,6 +144,20 @@ func TestLoadingSettings(t *testing.T) {
 		require.Equal(t, "test2", cfg.Domain)
 	})
 
+	t.Run("Should be able to override TLS version via command line", func(t *testing.T) {
+		cfg := NewCfg()
+		err := cfg.Load(CommandLineArgs{
+			HomePath: "../../",
+			Args: []string{
+				"cfg:default.server.min_tls_version=TLS1.3",
+			},
+			Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"),
+		})
+		require.Nil(t, err)
+
+		require.Equal(t, "TLS1.3", cfg.MinTLSVersion)
+	})
+
 	t.Run("Defaults can be overridden in specified config file", func(t *testing.T) {
 		if runtime.GOOS == windows {
 			cfg := NewCfg()
diff --git a/pkg/util/tls.go b/pkg/util/tls.go
new file mode 100644
index 00000000000..049d6cf12da
--- /dev/null
+++ b/pkg/util/tls.go
@@ -0,0 +1,68 @@
+package util
+
+import (
+	"crypto/tls"
+	"fmt"
+	"strings"
+)
+
+// tlsNameToVersion converts a string to a tls version
+func TlsNameToVersion(name string) (uint16, error) {
+	name = strings.ToUpper(name)
+	switch name {
+	case "TLS1.0":
+		return tls.VersionTLS10, nil
+	case "TLS1.1":
+		return tls.VersionTLS11, nil
+	case "TLS1.2":
+		return tls.VersionTLS12, nil
+	case "TLS1.3":
+		return tls.VersionTLS13, nil
+	}
+
+	return 0, fmt.Errorf("unknown tls version: %q", name)
+}
+
+// Cipher strings https://go.dev/src/crypto/tls/cipher_suites.go
+// Ex: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" or "TLS_RSA_WITH_AES_128_CBC_SHA"
+func TlsCiphersToIDs(names []string) ([]uint16, error) {
+	if len(names) == 0 || names == nil {
+		// no ciphers specified, use defaults
+		return nil, nil
+	}
+	var ids []uint16
+	var missing []string
+
+	ciphers := tls.CipherSuites()
+	var cipherMap = make(map[string]uint16, len(ciphers))
+	for _, cipher := range ciphers {
+		cipherMap[cipher.Name] = cipher.ID
+	}
+
+	for _, name := range names {
+		name = strings.ToUpper(name)
+		id, ok := cipherMap[name]
+		if !ok {
+			missing = append(missing, name)
+			continue
+		}
+		ids = append(ids, id)
+	}
+
+	if len(missing) > 0 {
+		return ids, fmt.Errorf("unknown ciphers: %v", missing)
+	}
+
+	return ids, nil
+}
+
+// tlsNameToVersion converts a tls version to a string
+func TlsCipherIdsToString(ids []uint16) string {
+	var tlsCiphers []string
+	if len(ids) > 0 {
+		for _, cipher := range ids {
+			tlsCiphers = append(tlsCiphers, tls.CipherSuiteName(cipher))
+		}
+	}
+	return strings.Join(tlsCiphers, ",")
+}
diff --git a/pkg/util/tls_test.go b/pkg/util/tls_test.go
new file mode 100644
index 00000000000..8d9f402e64e
--- /dev/null
+++ b/pkg/util/tls_test.go
@@ -0,0 +1,26 @@
+package util
+
+import (
+	"crypto/tls"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTlsNameToVersion(t *testing.T) {
+	tests := []struct {
+		tlsVer   string
+		expected uint16
+	}{
+		{"TLS1.0", tls.VersionTLS10},
+		{"TLS1.1", tls.VersionTLS11},
+		{"TLS1.2", tls.VersionTLS12},
+		{"TLS1.3", tls.VersionTLS13},
+		{"SSSL", 0},
+	}
+
+	for _, testcase := range tests {
+		verStr, _ := TlsNameToVersion(testcase.tlsVer)
+		assert.EqualValues(t, testcase.expected, verStr)
+	}
+}

From a58de1f8d27539a8608246d07541a95d85b7dc71 Mon Sep 17 00:00:00 2001
From: arukiidou <arukiidou@yahoo.co.jp>
Date: Tue, 9 May 2023 00:33:11 +0900
Subject: [PATCH 687/729] Chore: Add missing tls_skip_verify_insecure for
 GitLab Oauth (#64649)

fixes https://github.com/grafana/grafana/issues/64648

Signed-off-by: junya koyama <arukiidou@yahoo.co.jp>
---
 conf/sample.ini                                                 | 1 +
 .../configure-security/configure-authentication/gitlab/index.md | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/conf/sample.ini b/conf/sample.ini
index 41b56c46aa7..0d875d2b438 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -598,6 +598,7 @@
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
 ;skip_org_role_sync = false
+;tls_skip_verify_insecure = false
 
 #################################### Google Auth ##########################
 [auth.google]
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md
index c399caa9128..57c76f505f1 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md
@@ -61,6 +61,7 @@ allowed_groups =
 role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
+tls_skip_verify_insecure = false
 ```
 
 You may have to set the `root_url` option of `[server]` for the callback URL to be
@@ -140,6 +141,7 @@ allowed_groups = example, foo/bar
 role_attribute_path = is_admin && 'Admin' || 'Viewer'
 role_attribute_strict = true
 allow_assign_grafana_admin = false
+tls_skip_verify_insecure = false
 ```
 
 ### Configure automatic login

From 5416ec4768aa12f994234fbb3da7c4cc57b529e3 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Mon, 8 May 2023 19:02:20 +0300
Subject: [PATCH 688/729] Datagrid: Refactor header column delete/clear
 (#67842)

* refactor header column delete/clear

* fix tests, add clear option on header dropdown

* fix e2e tests
---
 .../datagrid-data-change.spec.ts              |  2 +-
 .../datagrid-editing-features.spec.ts         | 14 ++++-----
 .../panel/datagrid/DataGridPanel.test.tsx     | 18 ++++++++++--
 .../plugins/panel/datagrid/DataGridPanel.tsx  | 25 ++++++++++++++--
 .../components/DatagridContextMenu.tsx        | 29 ++++++++++++-------
 5 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/e2e/datagrid-suite/datagrid-data-change.spec.ts b/e2e/datagrid-suite/datagrid-data-change.spec.ts
index f4409e32220..0938b5ebe91 100644
--- a/e2e/datagrid-suite/datagrid-data-change.spec.ts
+++ b/e2e/datagrid-suite/datagrid-data-change.spec.ts
@@ -29,7 +29,7 @@ e2e.scenario({
     cy.get('[data-testid="glide-cell-2-1"]').should('have.attr', 'aria-selected', 'true');
     cy.get('body').type('12{enter}', { delay: 500 });
 
-    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+    cy.get('[data-testid="data-testid Confirm Modal Danger Button"]').click();
 
     cy.get('[data-testid="query-editor-row"]').contains('Snapshot');
   },
diff --git a/e2e/datagrid-suite/datagrid-editing-features.spec.ts b/e2e/datagrid-suite/datagrid-editing-features.spec.ts
index e71d1f31967..c9bd5d6720b 100644
--- a/e2e/datagrid-suite/datagrid-editing-features.spec.ts
+++ b/e2e/datagrid-suite/datagrid-editing-features.spec.ts
@@ -17,7 +17,7 @@ e2e.scenario({
     cy.get('[data-testid="glide-cell-2-1"]').should('have.attr', 'aria-selected', 'true');
     cy.get('body').type('123{enter}', { delay: 500 });
 
-    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+    cy.get('[data-testid="data-testid Confirm Modal Danger Button"]').click();
 
     // Delete a cell
     cy.get('.dvn-scroller').click(200, 200);
@@ -57,7 +57,7 @@ e2e.scenario({
     cy.get('.dvn-scroller').click(20, 190, { waitForAnimations: true });
     cy.get('.dvn-scroller').click(20, 90, { shiftKey: true, waitForAnimations: true }); // with shift to select all rows between clicks
     cy.get('body').type('{del}');
-    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+    cy.get('[data-testid="data-testid Confirm Modal Danger Button"]').click();
     cy.get('[data-testid="glide-cell-1-4"]').should('have.text', '');
     cy.get('[data-testid="glide-cell-1-3"]').should('have.text', '');
     cy.get('[data-testid="glide-cell-1-2"]').should('have.text', '');
@@ -72,7 +72,7 @@ e2e.scenario({
     cy.get('.dvn-scroller').click(20, 90, { commandKey: true, waitForAnimations: true }); // with cmd to select only clicked rows
     cy.get('body').type('{del}');
 
-    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+    cy.get('[data-testid="data-testid Confirm Modal Danger Button"]').click();
 
     cy.get('[data-testid="glide-cell-1-1"]').should('have.text', '');
     cy.get('[data-testid="glide-cell-2-1"]').should('have.text', 0);
@@ -89,7 +89,7 @@ e2e.scenario({
     // Delete column through header dropdown menu
     cy.get('.dvn-scroller').click(250, 15); // click header dropdown
     cy.get('body').click(450, 420); // click delete column
-    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+    cy.get('[data-testid="data-testid Confirm Modal Danger Button"]').click();
     cy.get(`[data-testid="${DATAGRID_CANVAS}"] th`).should('have.length', 1);
 
     // Delete row through context menu
@@ -108,7 +108,7 @@ e2e.scenario({
     cy.get('.dvn-scroller').click(20, 90, { commandKey: true, waitForAnimations: true }); // with shift to select all rows between clicks
     cy.get('.dvn-scroller').rightclick(40, 90);
     cy.get('[aria-label="Context menu"]').click(10, 10);
-    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+    cy.get('[data-testid="data-testid Confirm Modal Danger Button"]').click();
     cy.get(`[data-testid="${DATAGRID_CANVAS}"] tbody tr`).should('have.length', 5); // there are 5 data rows + 1 for the add new row btns
 
     // Delete column through context menu
@@ -121,7 +121,7 @@ e2e.scenario({
 
     // Add a new column
     cy.get('body').click(350, 200).type('New Column{enter}');
-    cy.get('[aria-label="Confirm Modal Danger Button"]').click();
+    cy.get('[data-testid="data-testid Confirm Modal Danger Button"]').click();
     cy.get('body')
       .click(350, 230)
       .type('Value 1{enter}')
@@ -138,7 +138,7 @@ e2e.scenario({
     cy.get(`[data-testid="${DATAGRID_CANVAS}"] th`).contains('Renamed column');
 
     // Change column field type
-    cy.get('.dvn-scroller').click(250, 15);
+    cy.get('.dvn-scroller').click(310, 15);
     cy.get('[aria-label="Context menu"]').click(50, 50);
     cy.get('.dvn-scroller').click(200, 100);
     cy.get('body').type('Str Value{enter}');
diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
index d2e13269bf7..1b7ff145e54 100644
--- a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
@@ -111,14 +111,28 @@ describe('DataGrid', () => {
       expect(screen.getByText('Remove all data')).toBeInTheDocument();
       expect(screen.getByText('Search...')).toBeInTheDocument();
 
-      // click on header cell should show only column options
+      // right clicking on header cell without clicking/selecting the cell should show only general options
+      fireEvent.contextMenu(scroller, {
+        clientX: 50,
+        clientY: 36,
+      });
+
+      expect(screen.getByText('Remove all data')).toBeInTheDocument();
+      expect(screen.getByText('Search...')).toBeInTheDocument();
+
+      // selecting the header first and then right click on header cell should show only column options
+      const canvas = screen.getByTestId('data-grid-canvas');
+      sendClick(canvas, {
+        clientX: 50,
+        clientY: 36,
+      });
+
       fireEvent.contextMenu(scroller, {
         clientX: 50,
         clientY: 36,
       });
 
       expect(screen.getByText('Delete column')).toBeInTheDocument();
-      expect(screen.getByText('Clear column')).toBeInTheDocument();
       expect(screen.getByText('Remove all data')).toBeInTheDocument();
       expect(screen.getByText('Search...')).toBeInTheDocument();
 
diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
index a79fc9f45c6..679049e51da 100644
--- a/public/app/plugins/panel/datagrid/DataGridPanel.tsx
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.tsx
@@ -154,8 +154,29 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
       return true;
     }
 
-    if (selection.rows) {
-      updateSnapshot(deleteRows(frame, selection.rows.toArray()), onUpdateData);
+    const rows = selection.rows.toArray();
+    const cols = selection.columns.toArray();
+
+    if (rows.length) {
+      updateSnapshot(deleteRows(frame, rows), onUpdateData);
+      return true;
+    }
+
+    if (cols.length) {
+      const copiedFrame = {
+        ...frame,
+        fields: frame.fields.map((field, index) => {
+          if (cols.includes(index)) {
+            return {
+              ...field,
+              values: new Array(frame.length).fill(null),
+            };
+          }
+
+          return field;
+        }),
+      };
+      updateSnapshot(copiedFrame, onUpdateData);
       return true;
     }
 
diff --git a/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx b/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
index 648fbd45160..697f5bdfa01 100644
--- a/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
+++ b/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx
@@ -53,10 +53,11 @@ export const DatagridContextMenu = ({
     columnDeletionLabel = `Delete ${selectedColumns.length} columns`;
   }
 
+  // Show delete/clear options on cell right click, but not on header right click, unless header column is specifically selected.
   const showDeleteRow = (row !== undefined && row >= 0) || selectedRows.length;
-  const showDeleteColumn = (column !== undefined && column >= 0) || selectedColumns.length;
+  const showDeleteColumn = (column !== undefined && column >= 0 && row !== undefined) || selectedColumns.length;
   const showClearRow = row !== undefined && row >= 0 && !selectedRows.length;
-  const showClearColumn = column !== undefined && column >= 0 && !selectedColumns.length;
+  const showClearColumn = column !== undefined && column >= 0 && row !== undefined && !selectedColumns.length;
 
   const renderContextMenuItems = () => (
     <>
@@ -85,6 +86,7 @@ export const DatagridContextMenu = ({
                 ...data,
                 fields: data.fields.filter((_, index) => !selectedColumns.includes(index)),
               });
+              dispatch({ type: DatagridActionType.gridSelectionCleared });
               return;
             }
 
@@ -215,20 +217,25 @@ export const DatagridContextMenu = ({
         <MenuItem label="Rename column" onClick={renameColumnClicked} />
         <MenuDivider />
         <MenuItem
-          label={columnDeletionLabel}
+          label="Delete column"
           onClick={() => {
-            if (selectedColumns.length) {
-              saveData({
-                ...data,
-                fields: data.fields.filter((_, index) => !selectedColumns.includes(index)),
-              });
-              return;
-            }
-
             saveData({
               ...data,
               fields: data.fields.filter((_, index) => index !== column),
             });
+
+            // also clear selection since it will change it if the deleted column is selected or if indexes shift
+            dispatch({ type: DatagridActionType.gridSelectionCleared });
+          }}
+        />
+        <MenuItem
+          label="Clear column"
+          onClick={() => {
+            const field = data.fields[column];
+            field.values = field.values.map(() => null);
+            saveData({
+              ...data,
+            });
           }}
         />
       </>

From a1bc1bd36855f1ad37dc5aba82984de890645c5a Mon Sep 17 00:00:00 2001
From: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Date: Mon, 8 May 2023 11:33:30 -0500
Subject: [PATCH 689/729] Prometheus: bug in creating autocomplete queries with
 labels (#68003)

Fix bug formatting multiple prometheus labels when doing metric query
---
 .../components/MetricSelect.test.tsx          | 44 ++++++++++++++++++-
 .../querybuilder/components/MetricSelect.tsx  | 35 +++++++--------
 2 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
index 63344ad82e5..ade5c9d2c84 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
@@ -7,7 +7,12 @@ import { DataSourceInstanceSettings, MetricFindValue } from '@grafana/data/src';
 import { PrometheusDatasource } from '../../datasource';
 import { PromOptions } from '../../types';
 
-import { MetricSelect, Props } from './MetricSelect';
+import {
+  formatPrometheusLabelFilters,
+  formatPrometheusLabelFiltersToString,
+  MetricSelect,
+  Props,
+} from './MetricSelect';
 
 const instanceSettings = {
   url: 'proxied',
@@ -130,6 +135,43 @@ describe('MetricSelect', () => {
     await userEvent.type(input, 'new');
     await waitFor(() => expect(document.querySelector('mark')).not.toBeInTheDocument());
   });
+
+  it('label filters properly join', () => {
+    const query = formatPrometheusLabelFilters([
+      {
+        value: 'value',
+        label: 'label',
+        op: '=',
+      },
+      {
+        value: 'value2',
+        label: 'label2',
+        op: '=',
+      },
+    ]);
+    query.forEach((label) => {
+      expect(label.includes(',', 0));
+    });
+  });
+  it('label filter creation', () => {
+    const labels = [
+      {
+        value: 'value',
+        label: 'label',
+        op: '=',
+      },
+      {
+        value: 'value2',
+        label: 'label2',
+        op: '=',
+      },
+    ];
+
+    const queryString = formatPrometheusLabelFiltersToString('query', labels);
+    queryString.split(',').forEach((queryChunk) => {
+      expect(queryChunk.length).toBeGreaterThan(1); // must be longer then ','
+    });
+  });
 });
 
 async function openMetricSelect() {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
index 02611841f5d..4469bc41d71 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
@@ -81,24 +81,6 @@ export function MetricSelect({
     [styles.highlight]
   );
 
-  const formatLabelFilters = (labelsFilters: QueryBuilderLabelFilter[]): string[] => {
-    return labelsFilters.map((label) => {
-      return `,${label.label}="${label.value}"`;
-    });
-  };
-
-  /**
-   * Transform queryString and any currently set label filters into label_values() string
-   */
-  const queryAndFilterToLabelValuesString = (
-    queryString: string,
-    labelsFilters: QueryBuilderLabelFilter[] | undefined
-  ): string => {
-    return `label_values({__name__=~".*${queryString}"${
-      labelsFilters ? formatLabelFilters(labelsFilters).join() : ''
-    }},__name__)`;
-  };
-
   /**
    * Reformat the query string and label filters to return all valid results for current query editor state
    */
@@ -108,7 +90,7 @@ export function MetricSelect({
   ): string => {
     const queryString = regexifyLabelValuesQueryString(query);
 
-    return queryAndFilterToLabelValuesString(queryString, labelsFilters);
+    return formatPrometheusLabelFiltersToString(queryString, labelsFilters);
   };
 
   /**
@@ -284,3 +266,18 @@ const getStyles = (theme: GrafanaTheme2) => ({
     background-color: ${theme.colors.emphasize(theme.colors.background.primary, 0.03)};
   `,
 });
+
+export const formatPrometheusLabelFiltersToString = (
+  queryString: string,
+  labelsFilters: QueryBuilderLabelFilter[] | undefined
+): string => {
+  const filterArray = labelsFilters ? formatPrometheusLabelFilters(labelsFilters) : [];
+
+  return `label_values({__name__=~".*${queryString}"${filterArray ? filterArray.join('') : ''}},__name__)`;
+};
+
+export const formatPrometheusLabelFilters = (labelsFilters: QueryBuilderLabelFilter[]): string[] => {
+  return labelsFilters.map((label) => {
+    return `,${label.label}="${label.value}"`;
+  });
+};

From 29801a5ec04fdc66c37f6de5a8536c3fdf07fc52 Mon Sep 17 00:00:00 2001
From: Virginia Cepeda <virginia.cepeda@grafana.com>
Date: Mon, 8 May 2023 14:24:57 -0300
Subject: [PATCH 690/729] Alerting: Fix condition on invalid interval dropdown
 (#68024)

Fix condiiton on invalid interval dropdown
---
 .../alerting/unified/components/rule-editor/FolderAndGroup.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
index 6d1f4202942..512f1b3fc9a 100644
--- a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
@@ -169,7 +169,7 @@ export function FolderAndGroup({ initialFolder }: FolderAndGroupProps) {
                 inputId="group"
                 key={`my_unique_select_key__${selectedGroup?.title ?? ''}`}
                 {...field}
-                invalid={Boolean(folder) && !selectedGroup.value}
+                invalid={Boolean(folder) && !selectedGroup.title}
                 loadOptions={debouncedSearch}
                 loadingMessage={'Loading groups...'}
                 defaultOptions={groupOptions}

From d0adcd7d5b87ffb100fa1f5e09cb3563d5f6b9ba Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Mon, 8 May 2023 19:35:34 +0200
Subject: [PATCH 691/729] Navigation: Fixes issue where kiosk mode was not
 being exited (#68021)

---
 .../components/AppChrome/AppChromeService.test.tsx   |  7 +++++++
 .../core/components/AppChrome/AppChromeService.tsx   | 12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/public/app/core/components/AppChrome/AppChromeService.test.tsx b/public/app/core/components/AppChrome/AppChromeService.test.tsx
index d6021981a88..0f26379281d 100644
--- a/public/app/core/components/AppChrome/AppChromeService.test.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.test.tsx
@@ -8,6 +8,13 @@ describe('AppChromeService', () => {
     expect(chromeService.state.getValue().chromeless).toBe(true);
   });
 
+  it('onToggleSearchBar should clear kiosk mode', () => {
+    const chromeService = new AppChromeService();
+    chromeService.onToggleKioskMode();
+    chromeService.onToggleSearchBar();
+    expect(chromeService.state.getValue().kioskMode).toBeFalsy();
+  });
+
   it('Ignore state updates when sectionNav and pageNav have new instance but same text, url or active child', () => {
     const chromeService = new AppChromeService();
     let stateChanges = 0;
diff --git a/public/app/core/components/AppChrome/AppChromeService.tsx b/public/app/core/components/AppChrome/AppChromeService.tsx
index 32f23a690df..3b639582149 100644
--- a/public/app/core/components/AppChrome/AppChromeService.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.tsx
@@ -104,9 +104,15 @@ export class AppChromeService {
   };
 
   onToggleSearchBar = () => {
-    const searchBarHidden = !this.state.getValue().searchBarHidden;
-    store.set(this.searchBarStorageKey, searchBarHidden);
-    this.update({ searchBarHidden });
+    const { searchBarHidden, kioskMode } = this.state.getValue();
+    const newSearchBarHidden = !searchBarHidden;
+    store.set(this.searchBarStorageKey, newSearchBarHidden);
+
+    if (kioskMode) {
+      locationService.partial({ kiosk: null });
+    }
+
+    this.update({ searchBarHidden: newSearchBarHidden, kioskMode: null });
   };
 
   onToggleKioskMode = () => {

From da214735271e312271d75f83ce9b7dce48a8f9bb Mon Sep 17 00:00:00 2001
From: Isabel <76437239+imatwawana@users.noreply.github.com>
Date: Mon, 8 May 2023 14:24:23 -0400
Subject: [PATCH 692/729] docs: add empty dashboard & Add dropdown screenshots
 (#67588)

* added empty dashboard screenshots

* added Add dropdown screenshots

* removed screenshot from build first dashboard

* added Add dropdown guidance in panel editor page; updated headings

* added intro text in panel editor
---
 .../build-dashboards/create-dashboard/index.md         |  6 ++++++
 docs/sources/getting-started/build-first-dashboard.md  |  3 +++
 .../panel-editor-overview/index.md                     | 10 +++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/sources/dashboards/build-dashboards/create-dashboard/index.md b/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
index 7fc28605de7..f1cb628faf9 100644
--- a/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
+++ b/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
@@ -26,6 +26,9 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 1. Click **Dashboards** in the left-side menu.
 1. Click **New** and select **New Dashboard**.
 1. On the empty dashboard, click **+ Add visualization**.
+
+   ![Empty dashboard state](/media/docs/grafana/dashboards/empty-dashboard-9.5.png)
+
 1. In the first line of the **Query** tab, click the dropdown list and select a data source.
 1. Write or construct a query in the query language of your data source.
 
@@ -59,6 +62,9 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 
 1. Enter a name for your dashboard and select a folder, if applicable.
 1. Click **Save**.
+1. To add more panels to the dashboard, click **Add** in the dashboard header and select **Visualization** in the dropdown.
+
+   ![Add dropdown](/media/docs/grafana/dashboards/screenshot-add-dropdown-9.5.png)
 
 ## Configure repeating rows
 
diff --git a/docs/sources/getting-started/build-first-dashboard.md b/docs/sources/getting-started/build-first-dashboard.md
index c8a7378b812..8029ca3df1a 100644
--- a/docs/sources/getting-started/build-first-dashboard.md
+++ b/docs/sources/getting-started/build-first-dashboard.md
@@ -44,6 +44,9 @@ To create your first dashboard using the built-in `Grafana` data source:
 1. Click **Dashboards** in the left-side menu.
 1. On the Dashboards page, click **New** and select **New Dashboard** from the dropdown menu.
 1. On the dashboard, click **+ Add visualization**.
+
+   ![Empty dashboard state](/media/docs/grafana/dashboards/empty-dashboard-9.5.png)
+
 1. In the New dashboard/Edit panel view, go to the **Query** tab.
 1. Configure your [query]({{< relref "../panels-visualizations/query-transform-data/#add-a-query" >}}) by selecting `-- Grafana --` from the data source selector.
 
diff --git a/docs/sources/panels-visualizations/panel-editor-overview/index.md b/docs/sources/panels-visualizations/panel-editor-overview/index.md
index 2a74243d074..883e09b926a 100644
--- a/docs/sources/panels-visualizations/panel-editor-overview/index.md
+++ b/docs/sources/panels-visualizations/panel-editor-overview/index.md
@@ -24,8 +24,16 @@ weight: 1
 
 # Panel editor overview
 
+In the panel editor, you can update all the elements of a visualization including the data source, queries, time range, and visualization display options.
+
 ![Panel editor](/media/docs/grafana/panels-visualizations/screenshot-panel-editor-view.png)
 
+To add a panel in a new dashboard click **+ Add visualization** in the middle of the dashboard. To add a panel to an existing dashboard, click **Add** in the dashboard header and select **Visualization** in the dropdown:
+
+![Add dropdown](/media/docs/grafana/dashboards/screenshot-add-dropdown-9.5.png)
+
+## Panel editor
+
 This section describes the areas of the Grafana panel editor.
 
 1. Panel header: The header section lists the dashboard in which the panel appears and the following controls:
@@ -49,7 +57,7 @@ This section describes the areas of the Grafana panel editor.
 
 1. Panel display options: The display options section contains tabs where you configure almost every aspect of your data visualization.
 
-## Open the panel inspect drawer
+## Panel inspect drawer
 
 The inspect drawer helps you understand and troubleshoot your panels. You can view the raw data for any panel, export that data to a comma-separated values (CSV) file, view query requests, and export panel and data JSON.
 

From 24668137f808fb55c6aa55136be2ff9de8b04a42 Mon Sep 17 00:00:00 2001
From: Juan Cabanas <juan.cabanas@grafana.com>
Date: Mon, 8 May 2023 16:51:42 -0300
Subject: [PATCH 693/729] NavBar: app chrome state wrongly overwritten when ds
 modal is opened (#67952)

---
 .../src/components/Modal/ModalsContext.tsx    |  2 +-
 .../DashboardsListModalButton.tsx             |  7 ++-
 .../dashboard/components/DashNav/DashNav.tsx  | 44 ++-----------------
 .../components/DashNav/ShareButton.tsx        | 42 ++++++++++++++++++
 .../components/ShareModal/ShareModal.tsx      |  8 +++-
 .../SharePublicDashboardUtils.ts              |  4 ++
 .../dashboard/containers/DashboardPage.tsx    |  2 -
 .../components/picker/DataSourceModal.tsx     |  1 +
 .../PublicDashboardListTable.tsx              |  7 ++-
 9 files changed, 67 insertions(+), 50 deletions(-)
 create mode 100644 public/app/features/dashboard/components/DashNav/ShareButton.tsx

diff --git a/packages/grafana-ui/src/components/Modal/ModalsContext.tsx b/packages/grafana-ui/src/components/Modal/ModalsContext.tsx
index 5bf3fb2b159..274d10b85f2 100644
--- a/packages/grafana-ui/src/components/Modal/ModalsContext.tsx
+++ b/packages/grafana-ui/src/components/Modal/ModalsContext.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-interface ModalsContextState {
+export interface ModalsContextState {
   component: React.ComponentType<any> | null;
   props: any;
   showModal: <T>(component: React.ComponentType<T>, props: T) => void;
diff --git a/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx b/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
index f18c05d711c..ae1c4ada569 100644
--- a/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
+++ b/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
@@ -4,7 +4,10 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { Button, LoadingPlaceholder, Modal, ModalsController, useStyles2 } from '@grafana/ui/src';
-import { generatePublicDashboardUrl } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
+import {
+  generatePublicDashboardConfigUrl,
+  generatePublicDashboardUrl,
+} from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 
 import { useGetActiveUserDashboardsQuery } from '../../dashboard/api/publicDashboardApi';
 
@@ -37,7 +40,7 @@ export const DashboardsListModal = ({ email, onDismiss }: { email: string; onDis
               <span className={styles.urlsDivider}>•</span>
               <a
                 className={cx('external-link', styles.url)}
-                href={`/d/${dash.dashboardUid}?shareView=share`}
+                href={generatePublicDashboardConfigUrl(dash.dashboardUid)}
                 onClick={onDismiss}
               >
                 Public dashboard settings
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index 3da75e21590..bc5f5734fc7 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { FC, ReactNode, useContext, useEffect } from 'react';
+import React, { FC, ReactNode } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 
@@ -13,7 +13,6 @@ import {
   useForceUpdate,
   Tag,
   ToolbarButtonRow,
-  ModalsContext,
   ConfirmModal,
 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
@@ -26,7 +25,6 @@ import { t, Trans } from 'app/core/internationalization';
 import { setStarred } from 'app/core/reducers/navBarTree';
 import { AddPanelButton } from 'app/features/dashboard/components/AddPanelButton/AddPanelButton';
 import { SaveDashboardDrawer } from 'app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer';
-import { ShareModal } from 'app/features/dashboard/components/ShareModal';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { playlistSrv } from 'app/features/playlist/PlaylistSrv';
@@ -36,6 +34,7 @@ import { DashboardMetaChangedEvent, ShowModalReactEvent } from 'app/types/events
 
 import { DashNavButton } from './DashNavButton';
 import { DashNavTimeControls } from './DashNavTimeControls';
+import { ShareButton } from './ShareButton';
 
 const mapDispatchToProps = {
   setStarred,
@@ -53,7 +52,6 @@ export interface OwnProps {
   hideTimePicker: boolean;
   folderTitle?: string;
   title: string;
-  shareModalActiveTab?: string;
   onAddPanel: () => void;
 }
 
@@ -80,7 +78,6 @@ export const DashNav = React.memo<Props>((props) => {
   // this ensures the component rerenders when the location changes
   useLocation();
   const forceUpdate = useForceUpdate();
-  const { showModal, hideModal } = useContext(ModalsContext);
 
   // We don't really care about the event payload here only that it triggeres a re-render of this component
   useBusEvent(props.dashboard.events, DashboardMetaChangedEvent);
@@ -164,25 +161,6 @@ export const DashNav = React.memo<Props>((props) => {
     return playlistSrv.isPlaying;
   };
 
-  // Open/Close
-  useEffect(() => {
-    const dashboard = props.dashboard;
-    const shareModalActiveTab = props.shareModalActiveTab;
-    const { canShare } = dashboard.meta;
-
-    if (canShare && shareModalActiveTab) {
-      // automagically open modal
-      showModal(ShareModal, {
-        dashboard,
-        onDismiss: hideModal,
-        activeTab: shareModalActiveTab,
-      });
-    }
-    return () => {
-      hideModal();
-    };
-  }, [showModal, hideModal, props.dashboard, props.shareModalActiveTab]);
-
   const renderLeftActions = () => {
     const { dashboard, kioskMode } = props;
     const { canStar, canShare, isStarred } = dashboard.meta;
@@ -209,23 +187,7 @@ export const DashNav = React.memo<Props>((props) => {
     }
 
     if (canShare) {
-      buttons.push(
-        <ModalsController key="button-share">
-          {({ showModal, hideModal }) => (
-            <DashNavButton
-              tooltip={t('dashboard.toolbar.share', 'Share dashboard or panel')}
-              icon="share-alt"
-              iconSize="lg"
-              onClick={() => {
-                showModal(ShareModal, {
-                  dashboard,
-                  onDismiss: hideModal,
-                });
-              }}
-            />
-          )}
-        </ModalsController>
-      );
+      buttons.push(<ShareButton key="button-share" dashboard={dashboard} />);
     }
 
     if (dashboard.meta.publicDashboardEnabled) {
diff --git a/public/app/features/dashboard/components/DashNav/ShareButton.tsx b/public/app/features/dashboard/components/DashNav/ShareButton.tsx
new file mode 100644
index 00000000000..f762b1de090
--- /dev/null
+++ b/public/app/features/dashboard/components/DashNav/ShareButton.tsx
@@ -0,0 +1,42 @@
+import React, { useContext, useEffect } from 'react';
+
+import { ModalsContext } from '@grafana/ui';
+import { useQueryParams } from 'app/core/hooks/useQueryParams';
+import { t } from 'app/core/internationalization';
+import { DashboardModel } from 'app/features/dashboard/state';
+
+import { ShareModal } from '../ShareModal';
+
+import { DashNavButton } from './DashNavButton';
+
+export const ShareButton = ({ dashboard }: { dashboard: DashboardModel }) => {
+  const [queryParams] = useQueryParams();
+  const { showModal, hideModal } = useContext(ModalsContext);
+
+  useEffect(() => {
+    if (!!queryParams.shareView) {
+      showModal(ShareModal, {
+        dashboard,
+        onDismiss: hideModal,
+        activeTab: String(queryParams.shareView),
+      });
+    }
+    return () => {
+      hideModal();
+    };
+  }, [showModal, hideModal, dashboard, queryParams.shareView]);
+
+  return (
+    <DashNavButton
+      tooltip={t('dashboard.toolbar.share', 'Share dashboard or panel')}
+      icon="share-alt"
+      iconSize="lg"
+      onClick={() => {
+        showModal(ShareModal, {
+          dashboard,
+          onDismiss: hideModal,
+        });
+      }}
+    />
+  );
+};
diff --git a/public/app/features/dashboard/components/ShareModal/ShareModal.tsx b/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
index d661526076d..2d12915278f 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { reportInteraction } from '@grafana/runtime/src';
+import { locationService, reportInteraction } from '@grafana/runtime/src';
 import { Modal, ModalTabsHeader, TabContent } from '@grafana/ui';
 import { config } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
@@ -52,7 +52,7 @@ function getTabs(panel?: PanelModel, activeTab?: string) {
   }
 
   if (Boolean(config.featureToggles['publicDashboards'])) {
-    tabs.push({ label: 'Public dashboard', value: 'share', component: SharePublicDashboard });
+    tabs.push({ label: 'Public dashboard', value: 'public-dashboard', component: SharePublicDashboard });
   }
 
   const at = tabs.find((t) => t.value === activeTab);
@@ -95,6 +95,10 @@ export class ShareModal extends React.Component<Props, State> {
     reportInteraction('grafana_dashboards_share_modal_viewed');
   }
 
+  componentWillUnmount() {
+    locationService.partial({ shareView: null });
+  }
+
   onSelectTab: React.ComponentProps<typeof ModalTabsHeader>['onChangeTab'] = (t) => {
     this.setState((prevState) => ({ ...prevState, activeTab: t.value }));
   };
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
index 3d65f5af25a..213ef06d2b6 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
@@ -76,4 +76,8 @@ export const generatePublicDashboardUrl = (accessToken: string): string => {
   return `${getConfig().appUrl}public-dashboards/${accessToken}`;
 };
 
+export const generatePublicDashboardConfigUrl = (dashboardUid: string): string => {
+  return `/d/${dashboardUid}?shareView=public-dashboard`;
+};
+
 export const validEmailRegex = /^[A-Z\d._%+-]+@[A-Z\d.-]+\.[A-Z]{2,}$/i;
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index cab687ff7e5..5e5c7d09306 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -64,7 +64,6 @@ export type DashboardPageRouteSearchParams = {
   editPanel?: string;
   viewPanel?: string;
   editview?: string;
-  shareView?: string;
   panelType?: string;
   inspect?: string;
   from?: string;
@@ -454,7 +453,6 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
                 onAddPanel={this.onAddPanel}
                 kioskMode={kioskMode}
                 hideTimePicker={dashboard.timepicker.hidden}
-                shareModalActiveTab={this.props.queryParams.shareView}
               />
             </header>
           )}
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index 663e1f2a7db..e1494321b58 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -155,6 +155,7 @@ export function DataSourceModal({
                 item: INTERACTION_ITEM.CONFIG_NEW_DS,
                 src: analyticsInteractionSrc,
               });
+              onDismiss();
             }}
           />
         </div>
diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
index 71f7aded088..598727fab5b 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
@@ -8,7 +8,10 @@ import { Link, ButtonGroup, LinkButton, Icon, Tag, useStyles2, Tooltip, useTheme
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/services/context_srv';
 import { useListPublicDashboardsQuery } from 'app/features/dashboard/api/publicDashboardApi';
-import { generatePublicDashboardUrl } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
+import {
+  generatePublicDashboardConfigUrl,
+  generatePublicDashboardUrl,
+} from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 import { isOrgAdmin } from 'app/features/plugins/admin/permissions';
 import { AccessControlAction } from 'app/types';
 
@@ -82,7 +85,7 @@ export const PublicDashboardListTable = () => {
                     <LinkButton
                       fill="text"
                       size={responsiveSize}
-                      href={`/d/${pd.dashboardUid}?shareView=share`}
+                      href={generatePublicDashboardConfigUrl(pd.dashboardUid)}
                       title="Configure public dashboard"
                       disabled={isOrphaned}
                       data-testid={selectors.ListItem.configButton}

From 13be068919709c74a84dd7f3c82b087ca51b8c0a Mon Sep 17 00:00:00 2001
From: Joseph Perez <45749060+josmperez@users.noreply.github.com>
Date: Mon, 8 May 2023 14:33:39 -0700
Subject: [PATCH 694/729] Docs: Plugin doc review for chunk 1-A (#67070)

* Plugin doc review for chunk 1-A

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Group of fixes in response to review comments

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Updates for review comments

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fixed extra space

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Additional doc fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* More doc fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fixes from doc review

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc review fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* More changes from doc review

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fix links and relrefs using doc-validator advice

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Publishing criteria update

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Markdown fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Testing

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Testing

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Testing

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Link fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Prettier

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fix to publishing criteria

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/build-a-logs-data-source-plugin.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/get-started-with-plugins/_index.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/publish-a-plugin.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/publish-a-plugin.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/publish-a-plugin.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Update docs/sources/developers/plugins/sign-a-plugin.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* Prettier

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

---------

Signed-off-by: Joe Perez <joseph.perez@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
---
 docs/sources/developers/plugins/_index.md     |  82 +++----
 .../build-a-logs-data-source-plugin.md        |  45 ++--
 .../build-a-streaming-data-source-plugin.md   | 146 +++++++------
 .../plugins/create-a-grafana-plugin/_index.md |  27 +++
 .../sources/developers/plugins/data-frames.md |   4 +-
 .../get-started-with-plugins/_index.md        |  12 ++
 .../_index.md                                 |  13 ++
 .../plugins/migration-guide/_index.md         |   2 +-
 .../developers/plugins/publish-a-plugin.md    | 204 +++++++-----------
 .../plugins/publish-a-plugin/_index.md        |  11 +
 .../publishing-and-signing-criteria.md        |  27 +--
 .../developers/plugins/reference/_index.md    |  10 +
 .../developers/plugins/sign-a-plugin.md       |  54 ++---
 13 files changed, 315 insertions(+), 322 deletions(-)
 create mode 100644 docs/sources/developers/plugins/create-a-grafana-plugin/_index.md
 create mode 100644 docs/sources/developers/plugins/get-started-with-plugins/_index.md
 create mode 100644 docs/sources/developers/plugins/introduction-to-plugin-development/_index.md
 create mode 100644 docs/sources/developers/plugins/publish-a-plugin/_index.md
 create mode 100644 docs/sources/developers/plugins/reference/_index.md

diff --git a/docs/sources/developers/plugins/_index.md b/docs/sources/developers/plugins/_index.md
index 8011411857b..c6ead0c7599 100644
--- a/docs/sources/developers/plugins/_index.md
+++ b/docs/sources/developers/plugins/_index.md
@@ -2,81 +2,51 @@
 aliases:
   - ../plugins/developing/
 description: Resources for creating Grafana plugins
-title: Build a plugin
+title: Plugin developer's guide
 weight: 200
 ---
 
-# Build a plugin
+# Grafana plugin developer's guide
 
-For more information on the types of plugins you can build, refer to the [Plugin Overview]({{< relref "../../administration/plugin-management/" >}}).
+You can extend Grafana's built-in capabilities with plugins. Plugins enable Grafana to accomplish specialized tasks, custom-tailored to your requirements. By making a plugin for your organization, you can connect Grafana to other data sources, ticketing tools, and CI/CD tooling.
 
-## Get started
+You can create plugins for private use or contribute them to the open source community by publishing to the [Grafana plugin catalog](https://grafana.com/grafana/plugins/). This catalog has hundreds of other community and commercial plugins.
 
-The easiest way to start developing Grafana plugins is to use the Grafana [create-plugin tool](https://www.npmjs.com/package/@grafana/create-plugin).
+If you are a Grafana plugin developer or want to become one, this plugin developer's guide contains the tutorials and reference materials to help you get started.
 
-Open the terminal, and run the following command in your [plugin directory]({{< relref "../../setup-grafana/configure-grafana/#plugins" >}}):
+## Plugin basics
 
-```bash
-npx @grafana/create-plugin@latest
-```
+You can create several types of plugins, including:
 
-Follow the questions and you will have a starter plugin ready to develop.
+- **Panel plugins** - Visualize data and navigate between dashboards.
+- **Data source plugins** - Link to new databases or other sources of data.
+- **App plugins** - Create rich applications for custom out-of-the-box experiences.
 
-If you want a more guided introduction to plugin development, check out our tutorials:
+> **Note:** To learn more about the types of plugins you can build, refer to the [Plugin management]({{< relref "../../administration/plugin-management" >}}) documentation.
 
-- [Build a panel plugin](/tutorials/build-a-panel-plugin/)
-- [Build a data source plugin](/tutorials/build-a-data-source-plugin/)
+## Contents of this developer's guide
+
+The following topics are covered in this guide:
+
+- **[Get started with plugins]({{< relref "./get-started-with-plugins" >}})** - Start developing Grafana plugins with the [Create-plugin](https://www.npmjs.com/package/@grafana/create-plugin) tool.
+- **[Introduction to plugin development]({{< relref "./introduction-to-plugin-development" >}})** - Learn the fundamentals of Grafana plugin development: frontend and backend development processes, data frames, error handling, and more.
+- **[Create a Grafana plugin]({{< relref "./create-a-grafana-plugin" >}})** - If you're familiar with plugin creation, use the tutorials for creating panel plugins, data source plugins, and more to deepen your knowledge.
+- **[Migrate a plugin]({{< relref "./migration-guide" >}})** - Learn how to upgrade from a previous version of a Grafana plugin, rewrite an old Angular plugin in React, or update to a newer version.
+- **[Publish a Grafana plugin]({{< relref "./publish-a-plugin" >}})** - Learn about publishing a plugin to the Grafana plugin catalog, including publishing criteria, packaging, and deployment.
+- **[Reference]({{< relref "metadata.md" >}})** - Description of the `plugin.json` schema and plugin metadata.
 
 ## Go further
 
-Learn more about specific areas of plugin development.
+Learn more about additional tools and see plugin type examples.
 
-### Tutorials
-
-If you're looking to build your first plugin, check out these introductory tutorials:
-
-- [Build a panel plugin](/tutorials/build-a-panel-plugin/)
-- [Build a data source plugin](/tutorials/build-a-data-source-plugin/)
-- [Build a data source backend plugin](/tutorials/build-a-data-source-backend-plugin/)
-
-Ready to learn more? Check out our other tutorials:
-
-- [Build a panel plugin with D3.js](/tutorials/build-a-panel-plugin-with-d3/)
-
-### Guides
-
-Improve an existing plugin with one of our guides:
-
-- [Add authentication for data source plugins]({{< relref "add-authentication-for-data-source-plugins.md" >}})
-- [Add support for annotations]({{< relref "add-support-for-annotations.md" >}})
-- [Add support for Explore queries]({{< relref "add-support-for-explore-queries.md" >}})
-- [Add support for variables]({{< relref "add-support-for-variables.md" >}})
-- [Add a query editor help component]({{< relref "add-query-editor-help.md" >}})
-- [Add distributed tracing for backend plugins]({{< relref "add-distributed-tracing-for-backend-plugins.md" >}})
-- [Build a logs data source plugin]({{< relref "build-a-logs-data-source-plugin.md" >}})
-- [Build a streaming data source plugin]({{< relref "build-a-streaming-data-source-plugin.md" >}}/)
-- [Error handling]({{< relref "error-handling.md" >}})
-- [Working with data frames]({{< relref "working-with-data-frames.md" >}})
-- [Development with local Grafana]({{< relref "development-with-local-grafana.md" >}})
-
-### Concepts
-
-Deepen your knowledge through a series of high-level overviews of plugin concepts:
-
-- [Data frames]({{< relref "data-frames.md" >}})
-
-### UI library
+### User interface creation
 
 Explore the many UI components in our [Grafana UI library](https://developers.grafana.com/ui).
 
-### Examples
+### Plugin examples
 
-For inspiration, check out our [plugin examples](https://github.com/grafana/grafana-plugin-examples).
-
-### Metadata
-
-- [Plugin metadata]({{< relref "metadata.md" >}})
+Grafana Labs provides a number of best practice example plugins for different use cases to help you quickly get started. Browse our [plugin examples](https://github.com/grafana/grafana-plugin-examples).
 
 ### SDK
 
-- [Grafana Plugin SDK for Go]({{< relref "backend/grafana-plugin-sdk-for-go.md" >}})
+Learn more about [Grafana Plugin SDK for Go]({{< relref "./backend/grafana-plugin-sdk-for-go" >}}).
diff --git a/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md b/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
index 2df39a0315f..027521dbad8 100644
--- a/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
+++ b/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
@@ -4,19 +4,22 @@ title: Build a logs data source plugin
 
 # Build a logs data source plugin
 
-This guide explains how to build a logs data source plugin.
+Grafana data source plugins support metrics, logs, and other data types. The steps to build a logs data source plugin are largely the same as for a metrics data source, but there are a few differences which we will explain in this guide.
 
-Data sources in Grafana supports both metrics and log data. The steps to build a logs data source plugin are largely the same as for a metrics data source. This guide assumes that you're already familiar with how to [Build a data source plugin](/tutorials/build-a-data-source-plugin/) for metrics.
+## Before you begin
+
+This guide assumes that you're already familiar with how to [Build a data source plugin](/tutorials/build-a-data-source-plugin/) for metrics. We recommend that you review this material before continuing.
 
 ## Add logs support to your data source
 
 To add logs support to an existing data source, you need to:
 
-- Enable logs support
-- Construct the log data
-- (Optional) Add preferred visualisation type hint to the data frame
+1. Enable logs support
+1. Construct the log data
 
-### Enable logs support
+When these steps are done, then you can improve the user experience with one or more [optional features](#enhance-your-logs-data-source-plugin-with-optional-features).
+
+### Step 1: Enable logs support
 
 Tell Grafana that your data source plugin can return log data, by adding `"logs": true` to the [plugin.json]({{< relref "metadata/" >}}) file.
 
@@ -26,9 +29,9 @@ Tell Grafana that your data source plugin can return log data, by adding `"logs"
 }
 ```
 
-### Construct the log data
+### Step 2: Construct the log data
 
-Just like for metrics data, Grafana expects your plugin to return log data as a [data frame]({{< relref "data-frames/" >}}).
+As it does with metrics data, Grafana expects your plugin to return log data as a [data frame]({{< relref "data-frames/" >}}).
 
 To return log data, return a data frame with at least one time field and one text field from the data source's `query` method.
 
@@ -51,9 +54,13 @@ That's all you need to start returning log data from your data source. Go ahead
 
 Congratulations, you just wrote your first logs data source plugin! Next, let's look at a couple of features that can further improve the experience for the user.
 
-### (Optional) Add preferred visualisation type hint to the data frame
+## Enhance your logs data source plugin with optional features
 
-To make sure Grafana recognizes data as logs and shows logs visualization automatically in Explore you have do set `meta.preferredVisualisationType` to `'logs'` in the returned data frame. See [Selecting preferred visualisation section]({{< relref "add-support-for-explore-queries/#selecting-preferred-visualisation" >}})
+Add visualization type hints, labels, and other optional features to logs.
+
+### Add a preferred visualization type hint to the data frame
+
+To make sure Grafana recognizes data as logs and shows logs visualization automatically in Explore, set `meta.preferredVisualisationType` to `'logs'` in the returned data frame. See [Selecting preferred visualisation section]({{< relref "add-support-for-explore-queries/#selecting-preferred-visualisation" >}})
 
 **Example:**
 
@@ -70,11 +77,11 @@ const frame = new MutableDataFrame({
 });
 ```
 
-## Add labels to your logs
+### Add labels to your logs
 
-To help filter log lines, many log systems let you query logs based on metadata, or _labels_.
+Many log systems let you query logs based on metadata, or _labels_, to help filter log lines.
 
-You can add labels to a stream of logs by setting the labels property on the Field.
+Add labels to a stream of logs by setting the `labels` property on the Field.
 
 **Example**:
 
@@ -91,15 +98,15 @@ frame.add({ time: 1589189388597, content: 'user registered' });
 frame.add({ time: 1589189406480, content: 'user logged in' });
 ```
 
-## Extract detected fields from your logs
+### Extract detected fields from your logs
 
-You can add additional information about each log line by adding more data frame fields.
+Add additional information about each log line by supplying more data frame fields.
 
-If a data frame has more than one text field, then Grafana assumes the first field in the data frame to be the actual log line. Any subsequent text fields are treated as [detected fields]({{< relref "../../explore/#labels-and-detected-fields" >}}).
+If a data frame has more than one text field, then Grafana assumes the first field in the data frame to be the actual log line. Grafana treats subsequent text fields as [detected fields]({{< relref "../../explore/#labels-and-detected-fields" >}}).
 
-While you can add any number of custom fields to your data frame, Grafana comes with a couple of dedicated fields: `levels` and `id`. Let's have a closer look at each one.
+Any number of custom fields can be added to your data frame; Grafana comes with two dedicated fields: `levels` and `id`.
 
-### Levels
+#### Levels
 
 To set the level for each log line, add a `level` field.
 
@@ -119,7 +126,7 @@ frame.add({ time: 1589189388597, content: 'user registered', level: 'info' });
 frame.add({ time: 1589189406480, content: 'unknown error', level: 'error' });
 ```
 
-### Unique log lines
+#### 'id' for assigning unique identifiers to log lines
 
 By default, Grafana offers basic support for deduplicating log lines. You can improve the support by adding an `id` field to explicitly assign identifiers to each log line.
 
diff --git a/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md b/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
index feae0039a72..ecfe9aff478 100644
--- a/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
+++ b/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
@@ -4,100 +4,112 @@ title: Build a streaming data source plugin
 
 # Build a streaming data source plugin
 
-This guide explains how to build a streaming data source plugin.
+In Grafana, you can set your dashboards to automatically refresh at a certain interval, no matter what data source you use. Unfortunately, this means that your queries are requesting all the data to be sent again, regardless of whether the data has actually changed. Adding streaming to a plugin helps reduce queries so your dashboard is only updated when new data becomes available.
+
+## Before you begin
 
 This guide assumes that you're already familiar with how to [Build a data source plugin](/tutorials/build-a-data-source-plugin/).
 
-When monitoring critical applications, you want your dashboard to refresh as soon as your data does. In Grafana, you can set your dashboards to automatically refresh at a certain interval, no matter what data source you use. Unfortunately, this means that your queries are requesting all the data to be sent again, regardless of whether the data has actually changed.
+Grafana uses [RxJS](https://rxjs.dev/) to continuously send data from a data source to a panel visualization.
 
-By enabling _streaming_ for your data source plugin, you can update your dashboard as soon as new data becomes available.
+> **Note:** To learn more about RxJs, refer to the [RxJS documentation](https://rxjs.dev/guide/overview).
+
+## Add streaming to your data source
+
+Enable streaming for your data source plugin to update your dashboard when new data becomes available.
 
 For example, a streaming data source plugin can connect to a websocket, or subscribe to a message bus, and update the visualization whenever a new message is available.
 
-Let's see how you can add streaming to an existing data source!
+### Step 1: Edit the `plugin.json` file
 
-Grafana uses [RxJS](https://rxjs.dev/) to continuously send data from a data source to a panel visualization. There's a lot more to RxJS than what's covered in this guide. If you want to learn more, check out the [RxJS documentation](https://rxjs.dev/guide/overview).
+Enable streaming for your data source in the `plugin.json` file.
 
-1. Enable streaming for your data source in the `plugin.json` file.
+```json
+{
+  "streaming": true
+}
+```
 
-   ```json
-   {
-     "streaming": true
-   }
-   ```
+### Step 2: Change the signature of the `query` method
 
-1. Change the signature of the `query` method to return an `Observable` from the `rxjs` package. Make sure you remove the `async` keyword.
+Modify the signature of the `query` method to return an `Observable` from the `rxjs` package. Make sure you remove the `async` keyword.
 
-   ```ts
-   import { Observable } from 'rxjs';
-   ```
+```ts
+import { Observable } from 'rxjs';
+```
 
-   ```ts
-   query(options: DataQueryRequest<MyQuery>): Observable<DataQueryResponse> {
-     // ...
-   }
-   ```
+```ts
+query(options: DataQueryRequest<MyQuery>): Observable<DataQueryResponse> {
+  // ...
+}
+```
 
-1. Create an `Observable` for each query, and then combine them all using the `merge` function from the `rxjs` package.
+### Step 3: Create an `Observable` instance for each query
 
-   ```ts
-   import { Observable, merge } from 'rxjs';
-   ```
+Create an `Observable` instance for each query, and then combine them all using the `merge` function from the `rxjs` package.
 
-   ```ts
-   const observables = options.targets.map((target) => {
-     return new Observable<DataQueryResponse>((subscriber) => {
-       // ...
-     });
-   });
+```ts
+import { Observable, merge } from 'rxjs';
+```
 
-   return merge(...observables);
-   ```
+```ts
+const observables = options.targets.map((target) => {
+  return new Observable<DataQueryResponse>((subscriber) => {
+    // ...
+  });
+});
 
-1. In the `subscribe` function, create a `CircularDataFrame`.
+return merge(...observables);
+```
 
-   ```ts
-   import { CircularDataFrame } from '@grafana/data';
-   ```
+### Step 4: Create a `CircularDataFrame` instance
 
-   ```ts
-   const frame = new CircularDataFrame({
-     append: 'tail',
-     capacity: 1000,
-   });
+In the `subscribe` function, create a `CircularDataFrame` instance.
 
-   frame.refId = query.refId;
-   frame.addField({ name: 'time', type: FieldType.time });
-   frame.addField({ name: 'value', type: FieldType.number });
-   ```
+```ts
+import { CircularDataFrame } from '@grafana/data';
+```
 
-   Circular data frames have a limited capacity. When a circular data frame reaches its capacity, the oldest data point is removed.
+```ts
+const frame = new CircularDataFrame({
+  append: 'tail',
+  capacity: 1000,
+});
 
-1. Use `subscriber.next()` to send the updated data frame whenever you receive new updates.
+frame.refId = query.refId;
+frame.addField({ name: 'time', type: FieldType.time });
+frame.addField({ name: 'value', type: FieldType.number });
+```
 
-   ```ts
-   import { LoadingState } from '@grafana/data';
-   ```
+Circular data frames have a limited capacity. When a circular data frame reaches its capacity, the oldest data point is removed.
 
-   ```ts
-   const intervalId = setInterval(() => {
-     frame.add({ time: Date.now(), value: Math.random() });
+### Step 5: Send the updated data frame
 
-     subscriber.next({
-       data: [frame],
-       key: query.refId,
-       state: LoadingState.Streaming,
-     });
-   }, 500);
+Use `subscriber.next()` to send the updated data frame whenever you receive new updates.
 
-   return () => {
-     clearInterval(intervalId);
-   };
-   ```
+```ts
+import { LoadingState } from '@grafana/data';
+```
 
-   > **Note:** In practice, you'd call `subscriber.next` as soon as you receive new data from a websocket or a message bus. The example above simulates data being received every 500 milliseconds.
+```ts
+const intervalId = setInterval(() => {
+  frame.add({ time: Date.now(), value: Math.random() });
 
-Here's the final `query` method.
+  subscriber.next({
+    data: [frame],
+    key: query.refId,
+    state: LoadingState.Streaming,
+  });
+}, 500);
+
+return () => {
+  clearInterval(intervalId);
+};
+```
+
+> **Note:** In practice, you'd call `subscriber.next` as soon as you receive new data from a websocket or a message bus. In the example above, data is being received every 500 milliseconds.
+
+### Example code for final `query` method
 
 ```ts
 query(options: DataQueryRequest<MyQuery>): Observable<DataQueryResponse> {
@@ -134,4 +146,6 @@ query(options: DataQueryRequest<MyQuery>): Observable<DataQueryResponse> {
 }
 ```
 
-One limitation with this example is that the panel visualization is cleared every time you update the dashboard. If you have access to historical data, you can add, or _backfill_, it to the data frame before the first call to `subscriber.next()`.
+One limitation with this example is that the panel visualization is cleared every time you update the dashboard. If you have access to historical data, you can add it, or _backfill_ it, to the data frame before the first call to `subscriber.next()`.
+
+For another example of a streaming plugin, refer to the [streaming websocket example](https://github.com/grafana/grafana-plugin-examples/tree/main/examples/datasource-streaming-websocket) on GitHub.
diff --git a/docs/sources/developers/plugins/create-a-grafana-plugin/_index.md b/docs/sources/developers/plugins/create-a-grafana-plugin/_index.md
new file mode 100644
index 00000000000..7fb41d0d4e6
--- /dev/null
+++ b/docs/sources/developers/plugins/create-a-grafana-plugin/_index.md
@@ -0,0 +1,27 @@
+---
+description: How-to topics for plugin development
+title: Create a plugin
+---
+
+# Create a Grafana plugin
+
+This section contains how-to topics for developing Grafana plugins.
+
+- [Build a Grafana plugin](https://grafana.github.io/plugin-tools/docs/creating-a-plugin)
+  - [Build a panel plugin](https://grafana.com/tutorials/build-a-panel-plugin/)
+  - [Build a data source plugin](https://grafana.com/tutorials/build-a-data-source-plugin/)
+  - [Build a data source backend plugin](https://grafana.com/tutorials/build-a-data-source-backend-plugin/)
+  - [Build a logs data source plugin]({{< relref "../build-a-logs-data-source-plugin.md">}})
+  - [Build a streaming data source plugin]({{< relref "../build-a-streaming-data-source-plugin.md">}})
+- Extend a Grafana plugin
+  - [Add annotations]({{< relref "add-support-for-annotations.md">}})
+  - [Add anonymous usage reporting]({{< relref "add-anonymous-usage-reporting.md">}})
+  - [Add authentication for a data source plugin]({{< relref "add-authentication-for-data-source-plugins.md">}})
+  - [Add Explore queries]({{< relref "add-support-for-explore-queries.md">}})
+  - [Add query editor help]({{< relref "add-query-editor-help.md">}})
+  - [Add variables]({{< relref "add-support-for-variables.md">}})
+  - [Create panel option editors]({{< relref "custom-panel-option-editors.md">}})
+- [Sign a plugin]({{< relref "sign-a-plugin.md">}})
+- [Automate development with CI](https://grafana.github.io/plugin-tools/docs/ci)
+- [Create nested plugins](https://grafana.github.io/plugin-tools/docs/nested-plugins)
+- [Extend configurations](https://grafana.github.io/plugin-tools/docs/advanced-configuration)
diff --git a/docs/sources/developers/plugins/data-frames.md b/docs/sources/developers/plugins/data-frames.md
index 52a705c362a..2e5a8ce9e81 100644
--- a/docs/sources/developers/plugins/data-frames.md
+++ b/docs/sources/developers/plugins/data-frames.md
@@ -6,7 +6,7 @@ title: Data frames
 
 Grafana supports a variety of different data sources, each with its own data model. To make this possible, Grafana consolidates the query results from each of these data sources into one unified data structure called a _data frame_.
 
-The data frame structure is a concept that's borrowed from data analysis tools like the [R programming language](https://www.r-project.org), and [Pandas](https://pandas.pydata.org/).
+The data frame structure is a concept that's borrowed from data analysis tools like the [R programming language](https://www.r-project.org) and [Pandas](https://pandas.pydata.org/).
 
 > Data frames are available in Grafana 7.0+, and replaced the Time series and Table structures with a more generic data structure that can support a wider range of data types.
 
@@ -161,7 +161,7 @@ Dimensions: 5 fields by 2 rows
 +---------------------+------------------+------------------+------------------+------------------+
 ```
 
-> **Note:** Not all panels support the wide time series data frame format. To keep full backward compatibility we have introduced a transformation that can be used to convert from the wide to the long format. For usage information, refer to the [Prepare time series-transformation]({{< relref "../../panels-visualizations/query-transform-data/transform-data/#prepare-time-series" >}}).
+> **Note:** Not all panels support the wide time series data frame format. To keep full backward compatibility we've introduced a transformation that can be used to convert from the wide to the long format. For usage information, refer to the [Prepare time series-transformation]({{< relref "../../panels-visualizations/query-transform-data/transform-data/#prepare-time-series" >}}).
 
 ## Technical references
 
diff --git a/docs/sources/developers/plugins/get-started-with-plugins/_index.md b/docs/sources/developers/plugins/get-started-with-plugins/_index.md
new file mode 100644
index 00000000000..b12c6afde35
--- /dev/null
+++ b/docs/sources/developers/plugins/get-started-with-plugins/_index.md
@@ -0,0 +1,12 @@
+---
+description: Get started guide
+title: Get started with plugins
+---
+
+# Get started with Grafana plugins
+
+This section contains guidance for building plugins.
+
+- [Get started with creating a plugin](https://grafana.github.io/plugin-tools/docs/getting-started)
+- [Types of Grafana plugins](https://grafana.com/docs/grafana/latest/administration/plugin-management/)
+- [Set up your development environment](https://grafana.github.io/plugin-tools/docs/docker)
diff --git a/docs/sources/developers/plugins/introduction-to-plugin-development/_index.md b/docs/sources/developers/plugins/introduction-to-plugin-development/_index.md
new file mode 100644
index 00000000000..02feda720d8
--- /dev/null
+++ b/docs/sources/developers/plugins/introduction-to-plugin-development/_index.md
@@ -0,0 +1,13 @@
+---
+description: Conceptual topics for plugin development
+title: Introduction to plugin development
+---
+
+# Introduction to Grafana plugin development
+
+This section contains topics related to the key concepts for Grafana plugin development.
+
+- [Backend plugins]({{< relref "../backend/" >}})
+  - [Grafana plugin SDK for Go]({{< relref "../backend/grafana-plugin-sdk-for-go.md" >}})
+  - [Plugin protocol]({{< relref "../backend/plugin-protocol.md" >}})
+- [Data frames]({{< relref "data-frames.md">}})
diff --git a/docs/sources/developers/plugins/migration-guide/_index.md b/docs/sources/developers/plugins/migration-guide/_index.md
index ba9e7e944f0..1c00ce656ce 100644
--- a/docs/sources/developers/plugins/migration-guide/_index.md
+++ b/docs/sources/developers/plugins/migration-guide/_index.md
@@ -34,7 +34,7 @@ title: Migration guides
 })();
 </script>
 
-# Plugin migration guides
+# Plugin migration guide
 
 The following guides help you identify the steps required to update a plugin following changes between versions of Grafana.
 
diff --git a/docs/sources/developers/plugins/publish-a-plugin.md b/docs/sources/developers/plugins/publish-a-plugin.md
index 687dda6c910..9f12dc73408 100644
--- a/docs/sources/developers/plugins/publish-a-plugin.md
+++ b/docs/sources/developers/plugins/publish-a-plugin.md
@@ -1,162 +1,60 @@
 ---
 aliases:
   - share-a-plugin/
-  - package-a-plugin/
 description: Learn how to package and share your plugin.
 title: Publish a plugin
 type: docs
 ---
 
-# Publish a plugin
+# Publish or update a plugin
+
+You've just built your plugin; now you want to share it with the world.
 
-You've just built your first plugin, and now you want to share it with the world.
 In this guide, you'll learn how to package and share your plugin with others.
 
-For Grafana to be able to load a plugin, it first needs to be built.
-When you build a plugin from source, a `dist` directory is created that contains the production build, or _plugin assets_, for your plugin.
-
-When the Grafana server starts, it recursively looks in the plugin directory for any directory that contains a `plugin.json` file and tries to load the plugin assets in the same directory.
-
-There are three steps needed to package a plugin:
-
-- Building the plugin
-- Signing the plugin
-- Packaging the plugin
-
-1. Build the plugin
-
-   ```
-   yarn install --pure-lockfile
-   yarn build
-   ```
-
-1. (Optional) If your data source plugin has a backend plugin, build it as well.
-
-   ```
-   mage
-   ```
-
-   make sure that all the binaries are executable and have a `0755` (`-rwxr-xr-x`) permission
-
-1. [Sign the plugin]({{< relref "./sign-a-plugin" >}}).
-
-1. Rename `dist` directory to match your plugin id and create a ZIP archive
-
-   ```
-   mv dist/ myorg-simple-panel
-   zip myorg-simple-panel-1.0.0.zip myorg-simple-panel -r
-   ```
-
-1. (Optional) Verify your plugin is packaged correctly using [zipinfo](https://linux.die.net/man/1/zipinfo).
-   It should look like this:
-
-```
-zipinfo grafana-clickhouse-datasource-1.1.2.zip
-
-Archive:  grafana-clickhouse-datasource-1.1.2.zip
-Zip file size: 34324077 bytes, number of entries: 22
-drwxr-xr-x          0 bx stor 22-Mar-24 23:23 grafana-clickhouse-datasource/
--rw-r--r--       1654 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/CHANGELOG.md
--rw-r--r--      11357 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/LICENSE
--rw-r--r--       2468 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/MANIFEST.txt
--rw-r--r--       8678 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/README.md
-drwxr-xr-x          0 bx stor 22-Mar-24 23:23 grafana-clickhouse-datasource/dashboards/
--rw-r--r--      42973 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/dashboards/cluster-analysis.json
--rw-r--r--      56759 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/dashboards/data-analysis.json
--rw-r--r--      39406 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/dashboards/query-analysis.json
--rwxr-xr-x   16469136 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_darwin_amd64
--rwxr-xr-x   16397666 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_darwin_arm64
--rwxr-xr-x   14942208 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_linux_amd64
--rwxr-xr-x   14155776 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_linux_arm
--rwxr-xr-x   14548992 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_linux_arm64
--rwxr-xr-x   15209472 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_windows_amd64.exe
-drwxr-xr-x          0 bx stor 22-Mar-24 23:23 grafana-clickhouse-datasource/img/
--rw-r--r--        304 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/img/logo.png
--rw-r--r--       1587 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/img/logo.svg
--rw-r--r--     138400 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/module.js
--rw-r--r--        808 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/module.js.LICENSE.txt
--rw-r--r--     487395 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/module.js.map
--rw-r--r--       1616 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/plugin.json
-22 files, 92516655 bytes uncompressed, 34319591 bytes compressed:  62.9%
-```
-
-## Publish your plugin on Grafana.com
-
-The best way to share your plugin with the world is to publish it on [Grafana Plugins](/plugins).
+The best way to share your plugin with the world is to publish it in the [Grafana plugin catalog]{{< relref "/plugins" >}}).
 By having your plugin published on Grafana.com, more users will be able to discover your plugin.
 
-Before you submit your plugin, we ask that you read our guidelines and frequently asked questions.
+## Before you begin
 
-### Guidelines
+When you build a plugin from source, a `dist` folder is created. This folder contains the production build or _plugin assets_ for your plugin.
+
+To package a plugin, refer to [Package a plugin]{{< relref "package-a-plugin.md" >}}).
+
+### Follow our guidelines
+
+Get familiar with our plugin [publishing and signing criteria]({{< relref "./publishing-and-signing-criteria" >}})
+
+### Do this for best results
 
 To speed up the time it takes to review your plugin:
 
-- Get familiar with our plugin [publishing and signing criteria]({{< relref "./publishing-and-signing-criteria" >}})
 - Check that your plugin is ready for review using the [plugin validator](https://github.com/grafana/plugin-validator).
 - Read our [6 tips for improving your Grafana plugin before you publish](/blog/2021/01/21/6-tips-for-improving-your-grafana-plugin-before-you-publish/).
 - Refer to [plugin-examples](https://github.com/grafana/grafana-plugin-examples) to review best practices for building your plugin.
 
-### Frequently Asked Questions
+## Publish your plugin
 
-**Do I need to submit a private plugin?**
-
-- No. Please only submit plugins that you wish to make publicly available for the Grafana community.
-
-**How long does it take to review my submission?**
-
-- We're not able to give an estimate at this time, though we're constantly working on improving the time it takes to review a plugin.
-
-**Can I decide a date when my plugin will be published?**
-
-- No. We cannot guarantee specific publishing dates, as plugins are immediately published after a review based on our internal prioritization.
-
-**Can I see metrics of my plugin installs, downloads or usage?**
-
-- No. We don't offer this information at the moment to plugin authors.
-
-**How can I update my plugin's catalog page?**
-
-- The plugin's catalog page content is extracted from the plugin README file.
-  To update the plugin's catalog page, it is necessary to submit an updated plugin with the new content included in the README file.
-
-**Can I unlist my plugin from the Grafana Plugin's Catalog in case of a bug?**
-
-- In the event of a bug, unlisting the plugin from the Grafana Plugin's Catalog may be possible in exceptional cases, such as security concerns.
-  However, we do not have control over the specific instances where the plugin is installed.
-
-**Can I distribute my plugin somewhere else than the Grafana Catalog?**
-
-- The official method for distributing Grafana plugins is through the Grafana Catalog.
-  Alternative methods, such as installing private or development plugins on local Grafana instances, are available as per the guidelines provided in [this guide]({{< relref "../../administration/plugin-management#install-plugin-on-local-grafana" >}}).
-
-**Can I still use Angular for my plugin?**
-
-- No. We will not accept any new plugin submissions written in angular.
-  Please take a look at our [angular support deprecation documentation]({{< relref "../angular_deprecation" >}}).
-
-### Publishing your plugin for the first time
-
-**Do plugin signatures expire?**
-
-- Plugin signatures do not currently expire.
-
-{{< figure src="/static/img/docs/plugins/plugins-submission-create2.png" class="docs-image--no-shadow" max-width="650px" >}}
+Follow these steps to publish your plugin for the first time.
 
 1. [Sign in](/auth/sign-in) to your Grafana Cloud account.
 1. In the left menu, under **Org settings**, click **My Plugins**.
-1. Click **Submit Plugin**.
+1. Click **Submit Plugin**. The Create Plugin Submission form appears.
+
+   {{< figure src="/static/img/docs/plugins/plugins-submission-create2.png" class="docs-image--no-shadow" max-width="650px" >}}
+
 1. Enter the information requested by the form.
    - **OS & Architecture:**
      - Select **Single** if your plugin archive contains binaries for multiple architectures.
      - Select **Multiple** if you'd like to submit separate plugin archives for each architecture.
        This can lead to faster downloads since users can select the specific architecture on which they want to install the plugin.
    - **URL:** A URL that points to a ZIP archive of your packaged plugin.
-   - **Source Code URL:** A URL that points to a public git repository or ZIP archive of your complete plugin source code.
+   - **Source Code URL:** A URL that points to a public Git repository or ZIP archive of your complete plugin source code.
    - **MD5:** The MD5 hash of the plugin specified by the **URL**.
    - The remaining questions help us determine the [signature level]({{< relref "./sign-a-plugin#plugin-signature-levels" >}}) for your plugin.
 1. Click **Submit**.
-   After you have submitted your plugin, we run an automated validation to make sure it adheres to our guidelines.
-   Once your submission passes the validation, it's placed in a review queue.
+   After you submit your plugin, we run an automated validation to make sure it adheres to our guidelines.
+   Your submission is placed in the review queue after the submission is validated.
 
 All submissions are manually inspected by a plugin reviewer.
 For every new plugin, we perform a manual review that includes the following checks:
@@ -165,21 +63,69 @@ For every new plugin, we perform a manual review that includes the following che
   If you're unable to make the source code publicly available, let us know in a comment on your plugin submission.
 - **Tests:** We install your plugin on one of our Grafana instances to test it for basic use.
   For more advanced plugins, we may ask you to assist us in configuring a test environment for the plugin.
-  This test environment will be used whenever you submit an plugin update.
+  We use the test environment whenever you submit a plugin update.
 
-### Submit a plugin update
+## Update your plugin
 
 To submit an **update** for an already published plugin:
 
 1. [Sign in](/auth/sign-in) to your Grafana Cloud account.
 1. In the left menu, under **Org settings**, click **My Plugins**.
-1. Click **Submit Update** for the plugin you want to update.
+1. Click **Submit Update** for the plugin you want to update. The Create Plugin Submission form appears.
+
+   {{< figure src="/static/img/docs/plugins/plugins-submission-create2.png" class="docs-image--no-shadow" max-width="650px" >}}
+
 1. Enter the information requested by the form.
    - **OS & Architecture:**
      - Select **Single** if your plugin archive contains binaries for multiple architectures.
      - Select **Multiple** if you'd like to submit separate plugin archives for each architecture.
        This can lead to faster downloads since users can select the specific architecture they want to install the plugin on.
    - **URL:** A URL that points to a ZIP archive of your packaged plugin.
-   - **Source Code URL:** A URL that points to a public git repository or ZIP archive of your complete plugin source code.
+   - **Source Code URL:** A URL that points to a public Git repository or ZIP archive of your complete plugin source code. See [examples](#what-source-code-url-formats-are-supported).
    - **MD5:** The MD5 hash of the plugin specified by the **URL**.
 1. Click **Submit**.
+
+## Frequently asked questions
+
+### Do I need to submit a private plugin?
+
+- No. Please only submit plugins that you wish to make publicly available for the Grafana community.
+
+### How long does it take to review my submission?
+
+- We're not able to give an estimate at this time, though we're constantly working on improving the time it takes to review a plugin.
+
+### Can I decide a date when my plugin will be published?
+
+- No. We cannot guarantee specific publishing dates, as plugins are immediately published after a review based on our internal prioritization.
+
+### Can I see metrics of my plugin installs, downloads or usage?
+
+- No. We don't offer this information at the moment to plugin authors.
+
+### How can I update my plugin's catalog page?
+
+- The plugin's catalog page content is extracted from the plugin README file.
+  To update the plugin's catalog page, submit an updated plugin with the new content included in the README file.
+
+### Can I unlist my plugin from the Grafana plugin catalog in case of a bug?
+
+- In the event of a bug, unlisting the plugin from our catalog may be possible in exceptional cases, such as security concerns. However, we don't have control over the specific instances where the plugin is installed.
+
+### Can I distribute my plugin somewhere else other than the Grafana plugin catalog?
+
+- The official method for distributing Grafana plugins is through our catalog. Alternative methods, such as installing private or development plugins on local Grafana instances, are available as per the guidelines provided in [this guide]({{< relref "../../administration/plugin-management#install-plugin-on-local-grafana" >}}).
+
+### Can I still use Angular for my plugin?
+
+- No. We will not accept any new plugin submissions written in Angular. For more information, refer to our [Angular support deprecation documentation]({{< relref "../angular_deprecation" >}}).
+
+### Do plugin signatures expire?
+
+- Plugin signatures do not currently expire.
+
+### What source code URL formats are supported?
+
+- Using a tag or branch: `https://github.com/grafana/clock-panel/tree/v2.1.3`
+- A tag or branch and the code is in a subdirectory (important for mono repos): `https://github.com/grafana/clock-panel/tree/v2.1.3/plugin/` (here, the plugin contains the plugin code)
+- Using the latest main or master branch commit: `https://github.com/grafana/clock-panel/` (not recommended, it's better to pass a tag or branch)
diff --git a/docs/sources/developers/plugins/publish-a-plugin/_index.md b/docs/sources/developers/plugins/publish-a-plugin/_index.md
new file mode 100644
index 00000000000..7dcd5996f49
--- /dev/null
+++ b/docs/sources/developers/plugins/publish-a-plugin/_index.md
@@ -0,0 +1,11 @@
+---
+description: Topics related to plugin publishing
+title: Publish a plugin
+---
+
+# Publish a Grafana plugin
+
+This section contains topics related to publishing Grafana plugins.
+
+- [Publishing and signing criteria]({{< relref "publishing-and-signing-criteria.md">}})
+- [Publish a plugin]({{< relref "publish-a-plugin.md">}})
diff --git a/docs/sources/developers/plugins/publishing-and-signing-criteria.md b/docs/sources/developers/plugins/publishing-and-signing-criteria.md
index 8cc7742ea17..38325a0d31f 100644
--- a/docs/sources/developers/plugins/publishing-and-signing-criteria.md
+++ b/docs/sources/developers/plugins/publishing-and-signing-criteria.md
@@ -4,28 +4,13 @@ title: Plugin publishing and signing criteria
 
 # Plugin publishing and signing criteria
 
-Grafana plugins must adhere to the following criteria when being reviewed for publishing and signing.
+Grafana plugins must adhere to the Grafana Labs [Plugin Policy](https://grafana.com/legal/plugins/). Our review process for publishing and signing will examine your compliance with this policy.
 
-## Privacy and security
-
-- Plugins cannot collect usage or user information. Violations of this include but is not limited to:
-  - Directly collecting installation and user statistics
-  - Sending data to 3rd parties for analytics purposes
-  - Embedding tracking code
-- Data at rest: sensitive data such as credentials and user information, must be encrypted using industry standards.
-  - Use secureJsonData to store data source credentials
-  - Secrets cannot be stored in panel options
-- Data transmission: secure methods that meet industry standard encryption levels should be used, such as Secure Sockets Layer (SSL) or Transport Layer Security (TLS)
-- Abuse: plugins should not perform actions beyond the scope of the intended use.
-  - Do not include hidden files
-  - Do not manipulate the underlying environment, privileges, or related processes
-- Security:
-  - Should not access the filesystem
-  - Should not access environment variables
+> **Important:** Grafana Labs reserves the right to decline or remove any plugin at its discretion. Failure to comply with publishing and signing criteria may result in immediate removal from the Grafana plugin catalog.
 
 ## Plugin licensing
 
-Plugins must be licensed under one of the following AGPL compliant licenses for publishing to the catalog:
+Plugins must be licensed under one of the following AGPL compliant licenses for publishing to the Grafana plugin catalog:
 
 - AGPL-3.0
 - Apache-2.0
@@ -35,9 +20,3 @@ Plugins must be licensed under one of the following AGPL compliant licenses for
 - MIT
 
 If contributing a plugin on behalf of an organization, be sure to seek guidance from your legal team.
-
-## Commercial
-
-- Usage of 3rd party software or dependencies within the plugin must be licensed for the intended use. For example, using open source dependencies must be credited/licensed; embedding logos or trademarks;
-
-Grafana Labs reserves the right to decline or remove any plugin at its discretion. Failure to comply with publishing and signing criteria may result in immediate removal from the Grafana plugin catalog.
diff --git a/docs/sources/developers/plugins/reference/_index.md b/docs/sources/developers/plugins/reference/_index.md
new file mode 100644
index 00000000000..4398fc2fe61
--- /dev/null
+++ b/docs/sources/developers/plugins/reference/_index.md
@@ -0,0 +1,10 @@
+---
+description: Reference topics.
+title: Reference
+---
+
+# Reference
+
+This section contains a metadata reference for plugin development.
+
+- [{{< relref "plugin.json">}}](metadata.md)
diff --git a/docs/sources/developers/plugins/sign-a-plugin.md b/docs/sources/developers/plugins/sign-a-plugin.md
index ebcff5a678a..0797650bab2 100644
--- a/docs/sources/developers/plugins/sign-a-plugin.md
+++ b/docs/sources/developers/plugins/sign-a-plugin.md
@@ -4,17 +4,19 @@ title: Sign a plugin
 
 # Sign a plugin
 
-Signing a plugin allows Grafana to verify the authenticity of the plugin with [signature verification]({{< relref "../../administration/plugin-management#plugin-signatures" >}}). This gives users a way to make sure plugins haven't been tampered with. By [default]({{< relref "../../administration/plugin-management#allow-unsigned-plugins" >}}), Grafana **requires** all plugins to be signed in order for them to be loaded. All Grafana Labs-authored backend plugins, including Enterprise plugins, are signed.
+Grafana requires all plugins to be signed so that we can verify their authenticity with [signature verification]({{< relref "../../administration/plugin-management#plugin-signatures" >}}).
+
+All Grafana Labs-authored backend plugins, including Enterprise plugins, are signed. By [default]({{< relref "../../administration/plugin-management#allow-unsigned-plugins" >}}), Grafana **requires** all plugins to be signed in order for them to be loaded.
 
 Before you can sign your plugin, you need to decide whether you want to sign it as a _public_ or a _private_ plugin.
 
-If you want to make your plugin publicly available outside of your organization, you need to sign your plugin under a _community_ or _commercial_ [signature level](#plugin-signature-levels). Public plugins are available from [grafana.com/plugins](https://grafana.com/plugins) and can be installed by anyone.
+To make your plugin publicly available outside of your organization, sign your plugin under a _community_ or _commercial_ [signature level](#plugin-signature-levels). Public plugins are available from the [Grafana plugin catalog](https://grafana.com/plugins) and can be installed by anyone.
 
-If you intend to only use the plugin within your organization, you can sign it under a _private_ [signature level](#plugin-signature-levels).
+If you intend to only use the plugin within your organization, sign it under a _private_ [signature level](#plugin-signature-levels).
 
 ## Generate an API key
 
-To verify ownership of your plugin, you need to generate an API key that you'll use every time you need to sign a new version of your plugin.
+To verify ownership of your plugin, generate an API key that you'll use every time you need to sign a new version of your plugin.
 
 1. [Create a Grafana Cloud account](https://grafana.com/signup).
 
@@ -29,8 +31,8 @@ To verify ownership of your plugin, you need to generate an API key that you'll
 Public plugins need to be reviewed by the Grafana team before you can sign them.
 
 1. Submit your plugin for [review]({{< relref "publish-a-plugin/#publishing-your-plugin-for-the-first-time" >}})
-2. When your plugin is approved, you're granted a plugin signature level. **Without a plugin signature level, you won't be able to sign your plugin**.
-3. In your plugin directory, sign the plugin with the API key you just created. Grafana Sign Plugin creates a [MANIFEST.txt](#plugin-manifest) file in the `dist` directory of your plugin.
+1. If we approve your plugin, you're granted a plugin signature level. You need this signature level to proceed.
+1. In your plugin directory, sign the plugin with the API key you just created. Grafana Sign Plugin creates a [MANIFEST.txt](#plugin-manifest) file in the `dist` directory of your plugin:
 
    ```bash
    export GRAFANA_API_KEY=<YOUR_API_KEY>
@@ -41,24 +43,24 @@ Public plugins need to be reviewed by the Grafana team before you can sign them.
 
 1. In your plugin directory, sign the plugin with the API key you just created. Grafana Sign Plugin creates a [MANIFEST.txt](#plugin-manifest) file in the `dist` directory of your plugin.
 
-   The `rootUrls` flag accepts a comma-separated list of URLs to the Grafana instances where you intend to install the plugin.
-
    ```bash
    export GRAFANA_API_KEY=<YOUR_API_KEY>
    npx @grafana/sign-plugin@latest --rootUrls https://example.com/grafana
    ```
 
+1. After the `rootUrls` flag, enter a comma-separated list of URLs for the Grafana instances where you intend to install the plugin.
+
 ## Plugin signature levels
 
-To sign a plugin, you need to decide the _signature level_ you want to sign it under. The signature level of your plugin determines how you can distribute it.
+To sign a plugin, you need to select the _signature level_ that you want to sign it under. The signature level of your plugin determines how you can distribute it.
 
-You can sign your plugin under three different _signature levels_.
+You can sign your plugin under three different _signature levels_: _private_, _community_, and _commercial_.
 
-| **Plugin Level** | **Paid Subscription Required?**                 | **Description**                                                                                                                                                                                                                                                                                                        |
-| ---------------- | ----------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Private          | No;<br>Free of charge                           | <p>You can create and sign a Private Plugin for any technology at no charge.</p><p>Private Plugins are for use on your own Grafana. They may not be distributed to the Grafana community, and are not published in the Grafana catalog.</p>                                                                            |
-| Community        | No;<br>Free of charge                           | <p>You can create, sign and distribute plugins at no charge, provided that all dependent technologies are open source and not for profit.</p><p>Community Plugins are published in the official Grafana catalog, and are available to the Grafana community.</p>                                                       |
-| Commercial       | Yes;<br>Commercial Plugin Subscription required | <p>You can create, sign and distribute plugins with dependent technologies that are closed source or commercially backed, by entering into a Commercial Plugin Subscription with Grafana Labs.</p><p>Commercial Plugins are published on the official Grafana catalog, and are available to the Grafana community.</p> |
+| **Plugin Level** | **Paid Subscription Required?**                 | **Description**                                                                                                                                                                                                                                                                                                                  |
+| ---------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Private          | No;<br>Free of charge                           | <p>You can create and sign a Private plugin for any technology at no charge.</p><p>Private plugins are intended for use on your own installation of Grafana. They may not be distributed to the Grafana community, and they are not published in the Grafana plugin catalog.</p>                                                 |
+| Community        | No;<br>Free of charge                           | <p>You can create, sign, and distribute plugins at no charge, provided that all dependent technologies are open source and not for profit.</p><p>Community plugins are published in the official Grafana catalog, and are available to the entire Grafana community.</p>                                                         |
+| Commercial       | Yes;<br>Commercial plugin subscription required | <p>You can create, sign, and distribute plugins with dependent technologies that are closed source or commercially backed. To do so, enter into a Commercial plugin subscription with Grafana Labs.</p><p>Commercial plugins are published on the Grafana plugin catalog, and are available to the entire Grafana community.</p> |
 
 For instructions on how to sign a plugin under the Community and Commercial signature level, refer to [Sign a public plugin](#sign-a-public-plugin).
 
@@ -66,12 +68,12 @@ For instructions on how to sign a plugin under the Private signature level, refe
 
 ## Plugin manifest
 
-For Grafana to verify the digital signature of a plugin, the plugin must include a signed manifest file, _MANIFEST.txt_. The signed manifest file contains two sections:
+For Grafana to verify the digital signature of a plugin, the plugin must include a signed manifest file, `MANIFEST.txt`. The signed manifest file contains two sections:
 
-- **Signed message -** The signed message contains plugin metadata and plugin files with their respective checksums (SHA256).
-- **Digital signature -** The digital signature is created by encrypting the signed message using a private key. Grafana has a public key built-in that can be used to verify that the digital signature have been encrypted using expected private key.
+- **Signed message -** Contains plugin metadata and plugin files with their respective checksums (SHA256).
+- **Digital signature -** Created by encrypting the signed message using a private key. Grafana has a public key built-in that can be used to verify that the digital signature has been encrypted using the expected private key.
 
-**Example manifest file:**
+**Example**
 
 ```txt
 -----BEGIN PGP SIGNED MESSAGE-----
@@ -107,16 +109,18 @@ T6scfmuhWC/TOcm83EVoCzIV3R5dOTKHqkjIUg==
 -----END PGP SIGNATURE-----
 ```
 
-## Troubleshooting issues while signing your plugin
+## Troubleshooting
 
-### Why am I getting a "Modified signature" in Grafana?
+### Why do I get a "Modified signature" error?
 
-Due to an issue when signing the plugin on Windows, in some cases an invalid MANIFEST.txt is being generated. You can fix this by replacing all double backslashes, `\\`, with a forward slash, `/` in the MANIFEST.txt file. You need to do this every time you sign your plugin.
+In some cases an invalid `MANIFEST.txt` is generated because of an issue when signing the plugin on Windows. You can fix this by replacing all double backslashes, `\\`, with a forward slash, `/`, in the `MANIFEST.txt` file. You need to do this every time you sign your plugin.
 
-### Error signing manifest: Field is required: rootUrls
+### Why do I get a "Field is required: `rootUrls`" error for my public plugin?
 
-If you're trying to sign a **public** plugin, this means that your plugin doesn't have a plugin signature level assigned to it yet. A Grafana team member will assign a signature level to your plugin once it has been reviewed and approved. For more information, refer to [Sign a public plugin](#sign-a-public-plugin).
+With a **public** plugin, your plugin doesn't have a plugin signature level assigned to it yet. A Grafana team member will assign a signature level to your plugin once it has been reviewed and approved. For more information, refer to [Sign a public plugin](#sign-a-public-plugin).
 
-If you're trying to sign a **private** plugin, this means that you need to add a `rootUrls` flag to the `plugin:sign` command. The `rootUrls` must match the [root_url]({{< relref "../../setup-grafana/configure-grafana/#root_url" >}}) configuration. For more information, refer to [Sign a private plugin](#sign-a-private-plugin).
+### Why do I get a "Field is required: `rootUrls`" error for my private plugin?
+
+With a **private** plugin, you need to add a `rootUrls` flag to the `plugin:sign` command. The `rootUrls` must match the [root_url]({{< relref "../../setup-grafana/configure-grafana/#root_url" >}}) configuration. For more information, refer to [Sign a private plugin](#sign-a-private-plugin).
 
 If you still get this error, make sure that the API key was generated by a Grafana Cloud account that matches the first part of the plugin ID.

From 8e51c4895d64022284e4be43de482b6e0937462c Mon Sep 17 00:00:00 2001
From: brendamuir <100768211+brendamuir@users.noreply.github.com>
Date: Tue, 9 May 2023 08:53:12 +0200
Subject: [PATCH 695/729] Docs: Fix routes in provisioning (#67970)

* Fix routes in provisioning

* fixes spacing
---
 .../provision-alerting-resources/file-provisioning/index.md    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md
index 9abfaf4cc94..d5234e6bc3f 100644
--- a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md
+++ b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md
@@ -548,7 +548,8 @@ policies:
     repeat_interval: 4h
     # <list> Zero or more child routes
     # routes:
-    # ...
+    #   - Another recursively nested policy...
+    #     ...
 ```
 
 Here is an example of a configuration file for resetting notification policies.

From 6ae952c7c5d7510977a335a7be2ab13968433291 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Tue, 9 May 2023 11:22:18 +0300
Subject: [PATCH 696/729] CI: Remove custom enterprise2 pipelines (#68056)

Remove custom enterprise2 pipelines
---
 .drone.star |   4 -
 .drone.yml  | 253 +---------------------------------------------------
 2 files changed, 1 insertion(+), 256 deletions(-)

diff --git a/.drone.star b/.drone.star
index 17e9ddceef5..ec10d154fba 100644
--- a/.drone.star
+++ b/.drone.star
@@ -46,10 +46,6 @@ def main(_ctx):
         oss_pipelines() +
         enterprise_pipelines() +
         enterprise2_pipelines() +
-        enterprise2_pipelines(
-            prefix = "custom-",
-            trigger = {"event": ["custom"]},
-        ) +
         publish_image_pipelines_public() +
         publish_image_pipelines_security() +
         publish_github_pipeline("public") +
diff --git a/.drone.yml b/.drone.yml
index ac5e04ea77a..dbeddd1e2fd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3843,257 +3843,6 @@ volumes:
   temp:
     medium: memory
 ---
-clone:
-  disable: true
-depends_on: []
-environment:
-  EDITION: enterprise2
-image_pull_secrets:
-- dockerconfigjson
-kind: pipeline
-name: custom-release-enterprise2-build-e2e-publish
-node:
-  type: no-parallel
-platform:
-  arch: amd64
-  os: linux
-services: []
-steps:
-- commands:
-  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
-  - chmod +x bin/grabpl
-  image: byrnedo/alpine-curl:0.1.8
-  name: grabpl
-- commands:
-  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.17.1
-  name: identify-runner
-- commands:
-  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
-  - cd grafana-enterprise
-  - git checkout ${DRONE_TAG}
-  environment:
-    GITHUB_TOKEN:
-      from_secret: github_token
-  image: grafana/build-container:1.7.4
-  name: clone-enterprise
-- commands:
-  - mv bin/grabpl /tmp/
-  - rmdir bin
-  - mv grafana-enterprise /tmp/
-  - /tmp/grabpl init-enterprise --github-token $${GITHUB_TOKEN} /tmp/grafana-enterprise
-    ${DRONE_TAG}
-  - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json
-  - mkdir bin
-  - mv /tmp/grabpl bin/
-  depends_on:
-  - clone-enterprise
-  - grabpl
-  environment:
-    GITHUB_TOKEN:
-      from_secret: github_token
-  image: grafana/build-container:1.7.4
-  name: init-enterprise
-- commands:
-  - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
-  depends_on:
-  - init-enterprise
-  environment:
-    CGO_ENABLED: 0
-  image: golang:1.20.4
-  name: compile-build-cmd
-- commands:
-  - make gen-go
-  depends_on:
-  - init-enterprise
-  image: grafana/build-container:1.7.4
-  name: wire-install
-- commands:
-  - yarn install --immutable
-  depends_on:
-  - init-enterprise
-  image: grafana/build-container:1.7.4
-  name: yarn-install
-- commands:
-  - '# It is required that code generated from Thema/CUE be committed and in sync
-    with its inputs.'
-  - '# The following command will fail if running code generators produces any diff
-    in output.'
-  - CODEGEN_VERIFY=1 make gen-cue
-  depends_on:
-  - init-enterprise
-  image: grafana/build-container:1.7.4
-  name: verify-gen-cue
-- commands:
-  - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
-  depends_on:
-  - compile-build-cmd
-  - yarn-install
-  environment:
-    NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.4
-  name: build-frontend
-- commands:
-  - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
-  depends_on:
-  - compile-build-cmd
-  - yarn-install
-  environment:
-    NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.7.4
-  name: build-frontend-packages
-- commands:
-  - ./bin/build  build-plugins --jobs 8 --edition enterprise
-  depends_on:
-  - compile-build-cmd
-  - yarn-install
-  environment:
-    GRAFANA_API_KEY:
-      from_secret: grafana_api_key
-  image: grafana/build-container:1.7.4
-  name: build-plugins
-- commands:
-  - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
-  depends_on:
-  - wire-install
-  - compile-build-cmd
-  image: grafana/build-container:1.7.4
-  name: build-backend-enterprise2
-- commands:
-  - ./bin/build package --jobs 8 --edition enterprise2  --sign ${DRONE_TAG}
-  depends_on:
-  - build-plugins
-  - build-backend-enterprise2
-  - build-frontend
-  - build-frontend-packages
-  environment:
-    GPG_KEY_PASSWORD:
-      from_secret: packages_gpg_passphrase
-    GPG_PRIV_KEY:
-      from_secret: packages_gpg_private_key
-    GPG_PUB_KEY:
-      from_secret: packages_gpg_public_key
-    GRAFANA_API_KEY:
-      from_secret: grafana_api_key
-  image: grafana/build-container:1.7.4
-  name: package-enterprise2
-- commands:
-  - ./bin/build upload-cdn --edition enterprise2
-  depends_on:
-  - package-enterprise2
-  environment:
-    ENTERPRISE2_CDN_PATH:
-      from_secret: enterprise2-cdn-path
-    GCP_KEY:
-      from_secret: gcp_key
-    PRERELEASE_BUCKET:
-      from_secret: prerelease_bucket
-  image: grafana/grafana-ci-deploy:1.3.3
-  name: upload-cdn-assets-enterprise2
-- commands:
-  - ls dist/*.tar.gz*
-  - cp dist/*.tar.gz* packaging/docker/
-  depends_on:
-  - package-enterprise2
-  image: grafana/build-container:1.7.4
-  name: copy-packages-for-docker
-- commands:
-  - ./bin/build build-docker --edition enterprise2 --shouldSave
-  depends_on:
-  - copy-packages-for-docker
-  - compile-build-cmd
-  environment:
-    DOCKER_ENTERPRISE2_REPO:
-      from_secret: docker_enterprise2_repo
-    GCP_KEY:
-      from_secret: gcp_key
-  image: google/cloud-sdk
-  name: build-docker-images
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-- commands:
-  - ./bin/build build-docker --edition enterprise2 --shouldSave --ubuntu
-  depends_on:
-  - copy-packages-for-docker
-  - compile-build-cmd
-  environment:
-    DOCKER_ENTERPRISE2_REPO:
-      from_secret: docker_enterprise2_repo
-    GCP_KEY:
-      from_secret: gcp_key
-  image: google/cloud-sdk
-  name: build-docker-images-ubuntu
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-- commands:
-  - ./bin/build artifacts docker fetch --edition enterprise2
-  depends_on:
-  - build-docker-images
-  - build-docker-images-ubuntu
-  environment:
-    DOCKER_ENTERPRISE2_REPO:
-      from_secret: docker_enterprise2_repo
-    DOCKER_PASSWORD:
-      from_secret: docker_password
-    DOCKER_USER:
-      from_secret: docker_username
-    GCP_KEY:
-      from_secret: gcp_key
-  image: google/cloud-sdk
-  name: fetch-images-enterprise2
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-- commands:
-  - ./bin/build artifacts docker publish-enterprise2 --dockerhub-repo $${DOCKER_ENTERPRISE2_REPO}
-  depends_on:
-  - fetch-images-enterprise2
-  environment:
-    DOCKER_ENTERPRISE2_REPO:
-      from_secret: docker_enterprise2_repo
-    DOCKER_PASSWORD:
-      from_secret: docker_password
-    DOCKER_USER:
-      from_secret: docker_username
-    GCP_KEY:
-      from_secret: gcp_key_hg
-  image: google/cloud-sdk
-  name: publish-images-enterprise2
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-- commands:
-  - ./bin/build upload-packages --edition enterprise2
-  depends_on:
-  - package-enterprise2
-  environment:
-    GCP_KEY:
-      from_secret: gcp_key
-    PRERELEASE_BUCKET:
-      from_secret: prerelease_bucket
-  image: grafana/grafana-ci-deploy:1.3.3
-  name: upload-packages-enterprise2
-trigger:
-  event:
-  - custom
-type: docker
-volumes:
-- host:
-    path: /var/run/docker.sock
-  name: docker
-- name: postgres
-  temp:
-    medium: memory
-- name: mysql57
-  temp:
-    medium: memory
-- name: mysql80
-  temp:
-    medium: memory
----
 clone:
   retries: 3
 depends_on: []
@@ -7594,6 +7343,6 @@ kind: secret
 name: github_token
 ---
 kind: signature
-hmac: de8e1e63e1e22d145970d335bb1140c68c77e3833d54748f0a34720ab72d7be2
+hmac: dc3090ab1f4561e295654e1aa01e61a3fbb8bbe17eb5c935f3e808f545a75b39
 
 ...

From 8bb62a831623ae156b4574e01b9acedac5bbe234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?=
 <JohnnyQQQQ@users.noreply.github.com>
Date: Tue, 9 May 2023 10:32:23 +0200
Subject: [PATCH 697/729] Alerting: Add option for memberlist label (#67982)

---
 conf/defaults.ini                               |  5 +++++
 conf/sample.ini                                 |  5 +++++
 go.mod                                          |  8 ++++----
 go.sum                                          | 17 +++++++++--------
 .../ngalert/notifier/multiorg_alertmanager.go   |  1 +
 pkg/setting/setting_unified_alerting.go         |  2 ++
 6 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 989d2324458..30bd9c64886 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1013,6 +1013,11 @@ ha_peers = ""
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ha_peer_timeout = 15s
 
+# The label is an optional string to include on each packet and stream. 
+# It uniquely identifies the cluster and prevents cross-communication 
+# issues when sending gossip messages in an enviromenet with multiple clusters.
+ha_label =
+
 # The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
 # across cluster more quickly at the expense of increased bandwidth usage.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
diff --git a/conf/sample.ini b/conf/sample.ini
index 0d875d2b438..edef7dc3872 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -983,6 +983,11 @@
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;ha_peer_timeout = "15s"
 
+# The label is an optional string to include on each packet and stream. 
+# It uniquely identifies the cluster and prevents cross-communication 
+# issues when sending gossip messages in an enviromenet with multiple clusters.
+;ha_label =
+
 # The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
 # across cluster more quickly at the expense of increased bandwidth usage.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
diff --git a/go.mod b/go.mod
index 967b0c8b1a7..782a4fdb6c8 100644
--- a/go.mod
+++ b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f
 	github.com/aws/aws-sdk-go v1.44.234
 	github.com/beevik/etree v1.1.0
-	github.com/benbjohnson/clock v1.3.0
+	github.com/benbjohnson/clock v1.3.3
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/centrifugal/centrifuge v0.29.1
 	github.com/crewjam/saml v0.4.12
@@ -82,7 +82,7 @@ require (
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/alertmanager v0.25.0
-	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/client_golang v1.15.0
 	github.com/prometheus/client_model v0.3.0
 	github.com/prometheus/common v0.42.0
 	github.com/prometheus/prometheus v1.8.2-0.20211217191541-41f1a8125e66
@@ -199,7 +199,7 @@ require (
 	github.com/prometheus/exporter-toolkit v0.9.1 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect
-	github.com/rs/cors v1.8.3 // indirect
+	github.com/rs/cors v1.9.0 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/segmentio/encoding v0.3.6 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
@@ -413,7 +413,7 @@ replace xorm.io/xorm => github.com/grafana/xorm v0.8.3-0.20220614223926-2fcda756
 
 // Use our fork of the upstream alertmanagers.
 // This is required in order to get notification delivery errors from the receivers API.
-replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20230426142720-803b73a2f1f7
+replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20230508090422-7d5630522a53
 
 // grpc v1.46.0 removed "WithBalancerName()" API, still in use by weaveworks/commons.
 replace google.golang.org/grpc => google.golang.org/grpc v1.45.0
diff --git a/go.sum b/go.sum
index 1d845a72423..e607e3eedff 100644
--- a/go.sum
+++ b/go.sum
@@ -400,8 +400,8 @@ github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f/go.mod h1:2stg
 github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
-github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/benbjohnson/clock v1.3.3 h1:g+rSsSaAzhHJYcIQE78hJ3AhyjjtQvleKDjlhdBnIhc=
+github.com/benbjohnson/clock v1.3.3/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/immutable v0.2.1/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI=
 github.com/benbjohnson/tmpl v1.0.0/go.mod h1:igT620JFIi44B6awvU9IsDhR77IXWtFigTLil/RPdps=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -1304,8 +1304,8 @@ github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a h1:i2YhC6eTyDp+7Ft
 github.com/grafana/kindsys v0.0.0-20230427152021-bb328815be7a/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
 github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413 h1:bBzCezZNRyYlJpXTkyZdY4fpPxHZUdyeyRWzhtw/P6I=
 github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413/go.mod h1:IvwuGG9xa/h96UH/exgvsfy3zE+ZpctkNT9o5aaGdrU=
-github.com/grafana/prometheus-alertmanager v0.25.1-0.20230426142720-803b73a2f1f7 h1:ebffH74Mxh6WLnoShty88jWQ5iLlI/d/qOxS/wdclMg=
-github.com/grafana/prometheus-alertmanager v0.25.1-0.20230426142720-803b73a2f1f7/go.mod h1:YYDJFReDm1zvLZnY0qE4mYuBzSnUFZy+qGDM79/C4Y0=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20230508090422-7d5630522a53 h1:X3Jl4PBIGCtlPSMa6Uiu2+3FDNWmddSjivp+1DDznQs=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20230508090422-7d5630522a53/go.mod h1:QtbJShIif+fPgjXVPy3mEJaNebBHSU5NkoFtzsUS1c0=
 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=
@@ -1996,8 +1996,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr
 github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
-github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
 github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
+github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM=
+github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
@@ -2087,8 +2088,8 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM=
-github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo=
-github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
+github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
@@ -3224,7 +3225,7 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/telebot.v3 v3.1.2/go.mod h1:GJKwwWqp9nSkIVN51eRKU78aB5f5OnQuWdwiIZfPbko=
+gopkg.in/telebot.v3 v3.1.3/go.mod h1:GJKwwWqp9nSkIVN51eRKU78aB5f5OnQuWdwiIZfPbko=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager.go b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
index 8b687c2d9ac..c2c41b854a0 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
@@ -120,6 +120,7 @@ func (moa *MultiOrgAlertmanager) setupClustering(cfg *setting.Cfg) error {
 			cluster.DefaultProbeInterval,
 			nil,
 			true,
+			cfg.UnifiedAlerting.HALabel,
 		)
 
 		if err != nil {
diff --git a/pkg/setting/setting_unified_alerting.go b/pkg/setting/setting_unified_alerting.go
index 63b75b51578..88d3dd63674 100644
--- a/pkg/setting/setting_unified_alerting.go
+++ b/pkg/setting/setting_unified_alerting.go
@@ -71,6 +71,7 @@ type UnifiedAlertingSettings struct {
 	HAPeerTimeout                  time.Duration
 	HAGossipInterval               time.Duration
 	HAPushPullInterval             time.Duration
+	HALabel                        string
 	HARedisAddr                    string
 	HARedisPeerName                string
 	HARedisPrefix                  string
@@ -230,6 +231,7 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
 	}
 	uaCfg.HAListenAddr = ua.Key("ha_listen_address").MustString(alertmanagerDefaultClusterAddr)
 	uaCfg.HAAdvertiseAddr = ua.Key("ha_advertise_address").MustString("")
+	uaCfg.HALabel = ua.Key("ha_label").MustString("")
 	uaCfg.HARedisAddr = ua.Key("ha_redis_address").MustString("")
 	uaCfg.HARedisPeerName = ua.Key("ha_redis_peer_name").MustString("")
 	uaCfg.HARedisPrefix = ua.Key("ha_redis_prefix").MustString("")

From 8a33e18d2e88a5e796a9ae23b8ce05f0757ecfb8 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Tue, 9 May 2023 10:40:06 +0200
Subject: [PATCH 698/729] Chore: Bump yaml package >=2.0.0 to 2.2.2 (#67812)

chore(npm): bump yaml package >=2.0.0 to 2.2.2
---
 yarn.lock | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index de2e1c7be14..30e257a576a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -34949,17 +34949,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "yaml@npm:2.1.0"
-  checksum: 59323a8b51b10d9ad0eab951e7a1f315f1076c123b08ffe60441add1df4fa3433b1d5783b21c50a65536e9d853b23fa567921dbd4bc0d711be2dbf14a06be03b
-  languageName: node
-  linkType: hard
-
-"yaml@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "yaml@npm:2.1.3"
-  checksum: 91316062324a93f9cb547469092392e7d004ff8f70c40fecb420f042a4870b2181557350da56c92f07bd44b8f7a252b0be26e6ade1f548e1f4351bdd01c9d3c7
+"yaml@npm:^2.0.0, yaml@npm:^2.1.3":
+  version: 2.2.2
+  resolution: "yaml@npm:2.2.2"
+  checksum: d90c235e099e30094dcff61ba3350437aef53325db4a6bcd04ca96e1bfe7e348b191f6a7a52b5211e2dbc4eeedb22a00b291527da030de7c189728ef3f2b4eb3
   languageName: node
   linkType: hard
 

From 8779526f15360a13b7333d9446ea76f1380a56b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 9 May 2023 10:42:37 +0200
Subject: [PATCH 699/729] elasticsearch: improved deprecation warning (#67909)

* elasticsearch: improved deprecation warning

* adjusted warning-level
---
 .../QueryEditor/MetricAggregationsEditor/index.tsx   | 12 ++++++------
 .../QueryEditor/QueryEditorSpecialMetricRow.tsx      |  8 +-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
index a916ef77ba9..e104465fb31 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
 
+import { Alert } from '@grafana/ui';
+
 import { useDispatch } from '../../../hooks/useStatelessReducer';
 import { IconButton } from '../../IconButton';
 import { useQuery } from '../ElasticsearchQueryContext';
@@ -30,12 +32,10 @@ export const MetricAggregationsEditor = ({ nextId }: Props) => {
             return <QueryEditorSpecialMetricRow key={`${metric.type}-${metric.id}`} name="Raw Data" metric={metric} />;
           case 'raw_document':
             return (
-              <QueryEditorSpecialMetricRow
-                key={`${metric.type}-${metric.id}`}
-                name="Raw Document"
-                metric={metric}
-                info="(NOTE: Raw document query type is deprecated)"
-              />
+              <>
+                <QueryEditorSpecialMetricRow key={`${metric.type}-${metric.id}`} name="Raw Document" metric={metric} />
+                <Alert severity="warning" title="The 'Raw Document' query type is deprecated." />
+              </>
             );
           default:
             return (
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorSpecialMetricRow.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorSpecialMetricRow.tsx
index 67f30d472e7..6820e012391 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorSpecialMetricRow.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorSpecialMetricRow.tsx
@@ -9,10 +9,9 @@ import { SettingsEditor } from './MetricAggregationsEditor/SettingsEditor';
 type Props = {
   name: string;
   metric: MetricAggregation;
-  info?: string;
 };
 
-export const QueryEditorSpecialMetricRow = ({ name, metric, info }: Props) => {
+export const QueryEditorSpecialMetricRow = ({ name, metric }: Props) => {
   // this widget is only used in scenarios when there is only a single
   // metric, so the array of "previousMetrics" (meaning all the metrics
   // before the current metric), is an ampty-array
@@ -26,11 +25,6 @@ export const QueryEditorSpecialMetricRow = ({ name, metric, info }: Props) => {
         </InlineLabel>
       </InlineSegmentGroup>
       <SettingsEditor metric={metric} previousMetrics={previousMetrics} />
-      {info != null && (
-        <InlineSegmentGroup>
-          <InlineLabel>{info}</InlineLabel>
-        </InlineSegmentGroup>
-      )}
     </InlineFieldRow>
   );
 };

From 1d537086c433a075a0b9b4e1b03149788f35e420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 9 May 2023 11:01:09 +0200
Subject: [PATCH 700/729] DashboardPage: Remove file drop code (#67954)

---
 .../dashboard/containers/DashboardPage.tsx    | 154 ++----------------
 1 file changed, 11 insertions(+), 143 deletions(-)

diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index 5e5c7d09306..3f9e07827bc 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -1,23 +1,11 @@
-import { css, cx } from '@emotion/css';
+import { cx } from '@emotion/css';
 import React, { PureComponent } from 'react';
-import DropZone, { FileRejection, DropEvent, ErrorCode } from 'react-dropzone';
 import { connect, ConnectedProps } from 'react-redux';
 
-import {
-  NavModel,
-  NavModelItem,
-  TimeRange,
-  PageLayoutType,
-  locationUtil,
-  dataFrameToJSON,
-  DataFrameJSON,
-  GrafanaTheme2,
-  getValueFormat,
-  formattedValueToString,
-} from '@grafana/data';
+import { NavModel, NavModelItem, TimeRange, PageLayoutType, locationUtil } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { config, locationService, reportInteraction } from '@grafana/runtime';
-import { Icon, Themeable2, withTheme2 } from '@grafana/ui';
+import { locationService } from '@grafana/runtime';
+import { Themeable2, withTheme2 } from '@grafana/ui';
 import { notifyApp } from 'app/core/actions';
 import { Page } from 'app/core/components/Page/Page';
 import { EntityNotFound } from 'app/core/components/PageNotFound/EntityNotFound';
@@ -27,10 +15,8 @@ import { getKioskMode } from 'app/core/navigation/kiosk';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { PanelModel } from 'app/features/dashboard/state';
-import * as DFImport from 'app/features/dataframe-import';
 import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
 import { getPageNavFromSlug, getRootContentNavModel } from 'app/features/storage/StorageFolderPage';
-import { GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 import { DashboardRoutes, KioskMode, StoreState } from 'app/types';
 import { PanelEditEnteredEvent, PanelEditExitedEvent } from 'app/types/events';
 
@@ -113,70 +99,6 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
   private forceRouteReloadCounter = 0;
   state: State = this.getCleanState();
 
-  onFileDrop = (acceptedFiles: File[], fileRejections: FileRejection[], event: DropEvent) => {
-    const grafanaDS = {
-      type: 'grafana',
-      uid: 'grafana',
-    };
-    DFImport.filesToDataframes(acceptedFiles).subscribe((next) => {
-      const snapshot: DataFrameJSON[] = [];
-      next.dataFrames.forEach((df) => {
-        const dataframeJson = dataFrameToJSON(df);
-        snapshot.push(dataframeJson);
-      });
-      this.props.dashboard?.addPanel({
-        type: 'table',
-        gridPos: { x: 0, y: 0, w: 12, h: 8 },
-        title: next.file.name,
-        datasource: grafanaDS,
-        targets: [
-          {
-            queryType: GrafanaQueryType.Snapshot,
-            snapshot,
-            file: { name: next.file.name, size: next.file.size },
-            datasource: grafanaDS,
-          },
-        ],
-      });
-    });
-
-    fileRejections.forEach((fileRejection) => {
-      const errors = fileRejection.errors.map((error) => {
-        switch (error.code) {
-          case ErrorCode.FileTooLarge:
-            const formattedSize = getValueFormat('decbytes')(DFImport.maxFileSize);
-            return `File size must be less than ${formattedValueToString(formattedSize)}.`;
-          case ErrorCode.FileInvalidType:
-            return `File type must be one of the following types ${DFImport.formatFileTypes(DFImport.acceptedFiles)}.`;
-          default:
-            return error.message;
-        }
-      });
-      this.props.notifyApp(
-        createErrorNotification(
-          `Failed to load ${fileRejection.file.name}`,
-          undefined,
-          undefined,
-          <ul>
-            {errors.map((err) => {
-              return <li key={err}>{err}</li>;
-            })}
-          </ul>
-        )
-      );
-    });
-
-    reportInteraction('dashboards_dropped_files', {
-      number_of_files: fileRejections.length + acceptedFiles.length,
-      accepted_files: acceptedFiles.map((a) => {
-        return { type: a.type, size: a.size };
-      }),
-      rejected_files: fileRejections.map((r) => {
-        return { type: r.file.type, size: r.file.size };
-      }),
-    });
-  };
-
   getCleanState(): State {
     return {
       editPanel: null,
@@ -463,41 +385,13 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
               <SubMenu dashboard={dashboard} annotations={dashboard.annotations.list} links={dashboard.links} />
             </section>
           )}
-          {config.featureToggles.editPanelCSVDragAndDrop ? (
-            <DropZone
-              onDrop={this.onFileDrop}
-              accept={DFImport.acceptedFiles}
-              maxSize={DFImport.maxFileSize}
-              noClick={true}
-            >
-              {({ getRootProps, isDragActive }) => {
-                const styles = getStyles(this.props.theme, isDragActive);
-                return (
-                  <div {...getRootProps({ className: styles.dropZone })}>
-                    <div className={styles.dropOverlay}>
-                      <div className={styles.dropHint}>
-                        <Icon name="upload" size="xxxl"></Icon>
-                        <h3>Create tables from spreadsheets</h3>
-                      </div>
-                    </div>
-                    <DashboardGrid
-                      dashboard={dashboard}
-                      isEditable={!!dashboard.meta.canEdit}
-                      viewPanel={viewPanel}
-                      editPanel={editPanel}
-                    />
-                  </div>
-                );
-              }}
-            </DropZone>
-          ) : (
-            <DashboardGrid
-              dashboard={dashboard}
-              isEditable={!!dashboard.meta.canEdit}
-              viewPanel={viewPanel}
-              editPanel={editPanel}
-            />
-          )}
+          <DashboardGrid
+            dashboard={dashboard}
+            isEditable={!!dashboard.meta.canEdit}
+            viewPanel={viewPanel}
+            editPanel={editPanel}
+          />
+
           {inspectPanel && <PanelInspector dashboard={dashboard} panel={inspectPanel} />}
         </Page>
         {editPanel && (
@@ -585,32 +479,6 @@ function updateStatePageNavFromProps(props: Props, state: State): State {
   };
 }
 
-function getStyles(theme: GrafanaTheme2, isDragActive: boolean) {
-  return {
-    dropZone: css`
-      height: 100%;
-    `,
-    dropOverlay: css`
-      background-color: ${isDragActive ? theme.colors.action.hover : `inherit`};
-      border: ${isDragActive ? `2px dashed ${theme.colors.border.medium}` : 0};
-      position: absolute;
-      display: ${isDragActive ? 'flex' : 'none'};
-      z-index: ${theme.zIndex.modal};
-      top: 0px;
-      left: 0px;
-      height: 100%;
-      width: 100%;
-      align-items: center;
-      justify-content: center;
-    `,
-    dropHint: css`
-      align-items: center;
-      display: flex;
-      flex-direction: column;
-    `,
-  };
-}
-
 export const DashboardPage = withTheme2(UnthemedDashboardPage);
 DashboardPage.displayName = 'DashboardPage';
 export default connector(DashboardPage);

From 6aab5e35d585c93b2685bca8e159a7fd8ffeb685 Mon Sep 17 00:00:00 2001
From: Vardan Torosyan <vardants@gmail.com>
Date: Tue, 9 May 2023 11:03:09 +0200
Subject: [PATCH 701/729] Docs: Clarify precedence of Grafana settings (#68020)

---
 .../configure-authentication/saml-ui/index.md                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
index 885638a9bc3..88849088cef 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md
@@ -18,7 +18,7 @@ The Grafana SAML UI provides the following advantages over configuring SAML in t
 - It doesn't require Grafana to be restarted after a configuration update
 - Access to the SAML UI only requires access to authentication settings, so it can be used by users with limited access to Grafana's configuration
 
-> **Note:** Configuration in the UI takes precedence over the configuration in the Grafana configuration file. SAML settings from the UI will override any SAML configuration set in the Grafana configuration file.
+> **Note:** Any configuration changes made through the Grafana user interface (UI) will take precedence over settings specified in the Grafana configuration file or through environment variables. This means that if you modify any configuration settings in the UI, they will override any corresponding settings set via environment variables or defined in the configuration file. For more information on how Grafana determines the order of precedence for its settings, please refer to the [Settings update at runtime]({{< relref "../../configure-grafana/settings-updates-at-runtime/" >}}).
 
 > **Note:** Disabling the UI does not affect any configuration settings that were previously set up through the UI. Those settings will continue to function as intended even with the UI disabled.
 

From b8093bd0d98d81e8365d0336da69e5d187414a61 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 9 May 2023 09:44:14 +0000
Subject: [PATCH 702/729] Chore: Remove nth-child warning from dev mode
 (#67918)

---
 packages/grafana-ui/src/themes/GlobalStyles/page.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/grafana-ui/src/themes/GlobalStyles/page.ts b/packages/grafana-ui/src/themes/GlobalStyles/page.ts
index 1c301bc188d..4629736a8fd 100644
--- a/packages/grafana-ui/src/themes/GlobalStyles/page.ts
+++ b/packages/grafana-ui/src/themes/GlobalStyles/page.ts
@@ -88,12 +88,7 @@ export function getPageStyles(theme: GrafanaTheme2) {
       margin-bottom: ${theme.spacing(2)};
       display: flex;
       align-items: flex-start;
-
-      > a,
-      > button,
-      > div:nth-child(2) {
-        margin-left: ${theme.spacing(2)};
-      }
+      gap: ${theme.spacing(2)};
     }
 
     .page-action-bar--narrow {

From 04df92ab47119abcdafea0642b24462b13cdacdf Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Tue, 9 May 2023 11:47:20 +0200
Subject: [PATCH 703/729] Docs: Update backend plugin forwarding of headers
 (#67913)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com>
---
 .../plugins/add-authentication-for-data-source-plugins.md    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md b/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
index 829220f4408..aac94865702 100644
--- a/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
+++ b/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
@@ -291,7 +291,7 @@ To allow Grafana to pass the access token to the plugin, update the data source
 
 When configured, Grafana can forward authorization HTTP headers such as `Authorization` or `X-ID-Token` to a backend data source. This information is available across the `QueryData`, `CallResource` and `CheckHealth` requests.
 
-To get Grafana to forward the headers, create a HTTP client using the [Grafana Plugin SDK](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go/backend/httpclient). This package exposes request information which can be subsequently forwarded downstream and/or used directly within the plugin.
+To get Grafana to forward the headers, create a HTTP client using the [Grafana plugin SDK for Go](https://pkg.go.dev/github.com/grafana/grafana-plugin-sdk-go/backend/httpclient) and set the `ForwardHTTPHeaders` option to `true` (by default, it's set to `false`). This package exposes request information which can be subsequently forwarded downstream and/or used directly within the plugin.
 
 ```go
 func NewDatasource(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
@@ -299,6 +299,9 @@ func NewDatasource(settings backend.DataSourceInstanceSettings) (instancemgmt.In
 	if err != nil {
 		return nil, fmt.Errorf("http client options: %w", err)
 	}
+
+  opts.ForwardHTTPHeaders = true
+
   // Important to reuse the same client for each query, to avoid using all available connections on a host
 	cl, err := httpclient.New(opts)
 	if err != nil {

From 8c6b5a431937be60eea91970d1c12b53bba8a716 Mon Sep 17 00:00:00 2001
From: Gabriel MABILLE <gamab@users.noreply.github.com>
Date: Tue, 9 May 2023 13:19:38 +0200
Subject: [PATCH 704/729] RBAC: Add a function to save external service roles
 (#66299)

* AuthN: Save external services RBAC roles

* Add missing test

* Placing roles in the same group

* Split function to gen role and assignment

* add test case and comments

* Ensure we check external service roles are assigned once only

* Update pkg/services/accesscontrol/models_test.go

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

---------

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
---
 pkg/services/accesscontrol/accesscontrol.go   |   2 +
 pkg/services/accesscontrol/acimpl/service.go  |  29 ++-
 .../accesscontrol/acimpl/service_test.go      |  85 ++++++++
 pkg/services/accesscontrol/actest/fake.go     |   8 +
 .../accesscontrol/database/database.go        |   9 +-
 .../database/externalservices.go              | 198 ++++++++++++++++++
 .../database/externalservices_test.go         | 191 +++++++++++++++++
 pkg/services/accesscontrol/errors.go          |   1 +
 pkg/services/accesscontrol/mock/mock.go       |  11 +
 pkg/services/accesscontrol/models.go          |  63 ++++--
 pkg/services/accesscontrol/models_test.go     |  80 +++++++
 11 files changed, 657 insertions(+), 20 deletions(-)
 create mode 100644 pkg/services/accesscontrol/database/externalservices.go
 create mode 100644 pkg/services/accesscontrol/database/externalservices_test.go
 create mode 100644 pkg/services/accesscontrol/models_test.go

diff --git a/pkg/services/accesscontrol/accesscontrol.go b/pkg/services/accesscontrol/accesscontrol.go
index 16ca6324ee0..41de06d0ac8 100644
--- a/pkg/services/accesscontrol/accesscontrol.go
+++ b/pkg/services/accesscontrol/accesscontrol.go
@@ -38,6 +38,8 @@ type Service interface {
 	// DeclareFixedRoles allows the caller to declare, to the service, fixed roles and their
 	// assignments to organization roles ("Viewer", "Editor", "Admin") or "Grafana Admin"
 	DeclareFixedRoles(registrations ...RoleRegistration) error
+	// SaveExternalServiceRole creates or updates an external service's role and assigns it to a given service account id.
+	SaveExternalServiceRole(ctx context.Context, cmd SaveExternalServiceRoleCommand) error
 	//IsDisabled returns if access control is enabled or not
 	IsDisabled() bool
 }
diff --git a/pkg/services/accesscontrol/acimpl/service.go b/pkg/services/accesscontrol/acimpl/service.go
index 9c64d8a9257..e2bcfd3fc94 100644
--- a/pkg/services/accesscontrol/acimpl/service.go
+++ b/pkg/services/accesscontrol/acimpl/service.go
@@ -62,6 +62,7 @@ type store interface {
 	SearchUsersPermissions(ctx context.Context, orgID int64, options accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error)
 	GetUsersBasicRoles(ctx context.Context, userFilter []int64, orgID int64) (map[int64][]string, error)
 	DeleteUserPermissions(ctx context.Context, orgID, userID int64) error
+	SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error
 }
 
 // Service is the service implementing role based access control.
@@ -107,11 +108,11 @@ func (s *Service) getUserPermissions(ctx context.Context, user *user.SignedInUse
 	}
 
 	dbPermissions, err := s.store.GetUserPermissions(ctx, accesscontrol.GetUserPermissionsQuery{
-		OrgID:      user.OrgID,
-		UserID:     user.UserID,
-		Roles:      accesscontrol.GetOrgRoles(user),
-		TeamIDs:    user.Teams,
-		RolePrefix: accesscontrol.ManagedRolePrefix,
+		OrgID:        user.OrgID,
+		UserID:       user.UserID,
+		Roles:        accesscontrol.GetOrgRoles(user),
+		TeamIDs:      user.Teams,
+		RolePrefixes: []string{accesscontrol.ManagedRolePrefix, accesscontrol.ExternalServiceRolePrefix},
 	})
 	if err != nil {
 		return nil, err
@@ -414,3 +415,21 @@ func PermissionMatchesSearchOptions(permission accesscontrol.Permission, searchO
 	}
 	return strings.HasPrefix(permission.Action, searchOptions.ActionPrefix)
 }
+
+func (s *Service) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
+	// If accesscontrol is disabled no need to save the external service role
+	if accesscontrol.IsDisabled(s.cfg) {
+		return nil
+	}
+
+	if !s.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
+		s.log.Debug("registering external service role is behind a feature flag, enable it to use this feature.")
+		return nil
+	}
+
+	if err := cmd.Validate(); err != nil {
+		return err
+	}
+
+	return s.store.SaveExternalServiceRole(ctx, cmd)
+}
diff --git a/pkg/services/accesscontrol/acimpl/service_test.go b/pkg/services/accesscontrol/acimpl/service_test.go
index 06ab9b18d3d..f4fce35c319 100644
--- a/pkg/services/accesscontrol/acimpl/service_test.go
+++ b/pkg/services/accesscontrol/acimpl/service_test.go
@@ -740,3 +740,88 @@ func TestPermissionCacheKey(t *testing.T) {
 		})
 	}
 }
+
+func TestService_SaveExternalServiceRole(t *testing.T) {
+	type run struct {
+		cmd     accesscontrol.SaveExternalServiceRoleCommand
+		wantErr bool
+	}
+	tests := []struct {
+		name string
+		runs []run
+	}{
+		{
+			name: "can create a role",
+			runs: []run{
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						OrgID:             2,
+						ServiceAccountID:  2,
+						ExternalServiceID: "App 1",
+						Permissions:       []accesscontrol.Permission{{Action: "users:read", Scope: "users:id:1"}},
+					},
+					wantErr: false,
+				},
+			},
+		},
+		{
+			name: "can update a role",
+			runs: []run{
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						Global:            true,
+						ServiceAccountID:  2,
+						ExternalServiceID: "App 1",
+						Permissions:       []accesscontrol.Permission{{Action: "users:read", Scope: "users:id:1"}},
+					},
+					wantErr: false,
+				},
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						Global:            true,
+						ServiceAccountID:  2,
+						ExternalServiceID: "App 1",
+						Permissions: []accesscontrol.Permission{
+							{Action: "users:write", Scope: "users:id:1"},
+							{Action: "users:write", Scope: "users:id:2"},
+						},
+					},
+					wantErr: false,
+				},
+			},
+		},
+		{
+			name: "test command validity - no service account ID",
+			runs: []run{
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						OrgID:             2,
+						ExternalServiceID: "App 1",
+						Permissions:       []accesscontrol.Permission{{Action: "users:read", Scope: "users:id:1"}},
+					},
+					wantErr: true,
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.Background()
+			ac := setupTestEnv(t)
+			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth)
+			for _, r := range tt.runs {
+				err := ac.SaveExternalServiceRole(ctx, r.cmd)
+				if r.wantErr {
+					require.Error(t, err)
+					continue
+				}
+				require.NoError(t, err)
+
+				// Check that the permissions and assignment are stored correctly
+				perms, errGetPerms := ac.getUserPermissions(ctx, &user.SignedInUser{OrgID: r.cmd.OrgID, UserID: 2}, accesscontrol.Options{})
+				require.NoError(t, errGetPerms)
+				assert.ElementsMatch(t, r.cmd.Permissions, perms)
+			}
+		})
+	}
+}
diff --git a/pkg/services/accesscontrol/actest/fake.go b/pkg/services/accesscontrol/actest/fake.go
index c394907ff07..f25f001a398 100644
--- a/pkg/services/accesscontrol/actest/fake.go
+++ b/pkg/services/accesscontrol/actest/fake.go
@@ -53,6 +53,10 @@ func (f FakeService) IsDisabled() bool {
 	return f.ExpectedDisabled
 }
 
+func (f FakeService) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
+	return f.ExpectedErr
+}
+
 var _ accesscontrol.AccessControl = new(FakeAccessControl)
 
 type FakeAccessControl struct {
@@ -95,6 +99,10 @@ func (f FakeStore) DeleteUserPermissions(ctx context.Context, orgID, userID int6
 	return f.ExpectedErr
 }
 
+func (f FakeStore) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
+	return f.ExpectedErr
+}
+
 var _ accesscontrol.PermissionsService = new(FakePermissionsService)
 
 type FakePermissionsService struct {
diff --git a/pkg/services/accesscontrol/database/database.go b/pkg/services/accesscontrol/database/database.go
index 2ecdecff5c9..612fa2651c6 100644
--- a/pkg/services/accesscontrol/database/database.go
+++ b/pkg/services/accesscontrol/database/database.go
@@ -35,9 +35,12 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces
 			INNER JOIN role ON role.id = permission.role_id
 		` + filter
 
-		if query.RolePrefix != "" {
-			q += " WHERE role.name LIKE ?"
-			params = append(params, query.RolePrefix+"%")
+		if len(query.RolePrefixes) > 0 {
+			q += " WHERE ( " + strings.Repeat("role.name LIKE ? OR ", len(query.RolePrefixes))
+			q = q[:len(q)-4] + " )" // remove last " OR "
+			for i := range query.RolePrefixes {
+				params = append(params, query.RolePrefixes[i]+"%")
+			}
 		}
 
 		if err := sess.SQL(q, params...).Find(&result); err != nil {
diff --git a/pkg/services/accesscontrol/database/externalservices.go b/pkg/services/accesscontrol/database/externalservices.go
new file mode 100644
index 00000000000..bf724cd1572
--- /dev/null
+++ b/pkg/services/accesscontrol/database/externalservices.go
@@ -0,0 +1,198 @@
+package database
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+)
+
+func (s *AccessControlStore) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
+	role := genExternalServiceRole(cmd)
+	assignment := genExternalServiceAssignment(cmd)
+
+	return s.sql.WithDbSession(ctx, func(sess *db.Session) error {
+		// Create or update the role
+		existingRole, errSaveRole := s.saveRole(ctx, sess, &role)
+		if errSaveRole != nil {
+			return errSaveRole
+		}
+		// Assign role to service account
+		// We update the assignment before the permissions to avoid an edge case.
+		// If the role is assigned to another service account (which can only happen if the services have the same ID)
+		// and permissions are updated before the assignment, this would result in the other service account acquiring
+		// a different set of permissions.
+		assignment.RoleID = existingRole.ID
+		errSaveAssign := s.saveUserAssignment(ctx, sess, assignment)
+		if errSaveAssign != nil {
+			return errSaveAssign
+		}
+		// Update permissions
+		return s.savePermissions(ctx, sess, existingRole.ID, cmd.Permissions)
+	})
+}
+
+func genExternalServiceRole(cmd accesscontrol.SaveExternalServiceRoleCommand) accesscontrol.Role {
+	role := accesscontrol.Role{
+		OrgID:       cmd.OrgID,
+		Version:     1,
+		Name:        fmt.Sprintf("%s%s:permissions", accesscontrol.ExternalServiceRolePrefix, cmd.ExternalServiceID),
+		UID:         fmt.Sprintf("%s%s_permissions", accesscontrol.ExternalServiceRoleUIDPrefix, cmd.ExternalServiceID),
+		DisplayName: fmt.Sprintf("External Service %s Permissions", cmd.ExternalServiceID),
+		Description: fmt.Sprintf("External Service %s permissions", cmd.ExternalServiceID),
+		Group:       "External Service",
+		Hidden:      true,
+		Created:     time.Now(),
+		Updated:     time.Now(),
+	}
+	if cmd.Global {
+		role.OrgID = accesscontrol.GlobalOrgID
+	}
+	return role
+}
+
+func genExternalServiceAssignment(cmd accesscontrol.SaveExternalServiceRoleCommand) accesscontrol.UserRole {
+	assignment := accesscontrol.UserRole{
+		OrgID:   cmd.OrgID,
+		UserID:  cmd.ServiceAccountID,
+		Created: time.Now(),
+	}
+	if cmd.Global {
+		assignment.OrgID = accesscontrol.GlobalOrgID
+	}
+	return assignment
+}
+
+func getRoleByUID(ctx context.Context, sess *db.Session, uid string) (*accesscontrol.Role, error) {
+	var role accesscontrol.Role
+	has, err := sess.Where("uid = ?", uid).Get(&role)
+	if err != nil {
+		return nil, err
+	}
+	if !has {
+		return nil, accesscontrol.ErrRoleNotFound
+	}
+	return &role, nil
+}
+
+func getRoleAssignments(ctx context.Context, sess *db.Session, roleID int64) ([]accesscontrol.UserRole, error) {
+	var assignements []accesscontrol.UserRole
+	if err := sess.Where("role_id = ?", roleID).Find(&assignements); err != nil {
+		return nil, err
+	}
+	return assignements, nil
+}
+
+func getRolePermissions(ctx context.Context, sess *db.Session, id int64) ([]accesscontrol.Permission, error) {
+	var permissions []accesscontrol.Permission
+	if err := sess.Where("role_id = ?", id).Find(&permissions); err != nil {
+		return nil, err
+	}
+	return permissions, nil
+}
+
+func permissionDiff(previous, new []accesscontrol.Permission) (added, removed []accesscontrol.Permission) {
+	type key struct{ Action, Scope string }
+	prevMap := map[key]int64{}
+	for i := range previous {
+		prevMap[key{previous[i].Action, previous[i].Scope}] = previous[i].ID
+	}
+	newMap := map[key]int64{}
+	for i := range new {
+		newMap[key{new[i].Action, new[i].Scope}] = 0
+	}
+	for i := range new {
+		key := key{new[i].Action, new[i].Scope}
+		if _, already := prevMap[key]; !already {
+			added = append(added, new[i])
+		} else {
+			delete(prevMap, key)
+		}
+	}
+
+	for p, id := range prevMap {
+		removed = append(removed, accesscontrol.Permission{ID: id, Action: p.Action, Scope: p.Scope})
+	}
+
+	return added, removed
+}
+
+func (*AccessControlStore) saveRole(ctx context.Context, sess *db.Session, role *accesscontrol.Role) (*accesscontrol.Role, error) {
+	existingRole, err := getRoleByUID(ctx, sess, role.UID)
+	if err != nil && !errors.Is(err, accesscontrol.ErrRoleNotFound) {
+		return nil, err
+	}
+
+	if existingRole == nil {
+		if _, err := sess.Insert(role); err != nil {
+			return nil, err
+		}
+	} else {
+		role.ID = existingRole.ID
+		role.Created = existingRole.Created
+		if _, err := sess.Where("id = ?", existingRole.ID).MustCols("org_id").Update(role); err != nil {
+			return nil, err
+		}
+	}
+	return getRoleByUID(ctx, sess, role.UID)
+}
+
+func (*AccessControlStore) savePermissions(ctx context.Context, sess *db.Session, roleID int64, permissions []accesscontrol.Permission) error {
+	now := time.Now()
+	storedPermissions, err := getRolePermissions(ctx, sess, roleID)
+	if err != nil {
+		return err
+	}
+	added, removed := permissionDiff(storedPermissions, permissions)
+	if len(added) > 0 {
+		for i := range added {
+			added[i].RoleID = roleID
+			added[i].Created = now
+			added[i].Updated = now
+		}
+		if _, err := sess.Insert(&added); err != nil {
+			return err
+		}
+	}
+	if len(removed) > 0 {
+		ids := make([]int64, len(removed))
+		for i := range removed {
+			ids[i] = removed[i].ID
+		}
+		count, err := sess.In("id", ids).Delete(&accesscontrol.Permission{})
+		if err != nil {
+			return err
+		}
+		if count != int64(len(removed)) {
+			return errors.New("failed to delete permissions that have been removed from role")
+		}
+	}
+	return nil
+}
+
+func (*AccessControlStore) saveUserAssignment(ctx context.Context, sess *db.Session, assignment accesscontrol.UserRole) error {
+	// alreadyAssigned checks if the assignment already exists without accounting for the organization
+	assignments, errGetAssigns := getRoleAssignments(ctx, sess, assignment.RoleID)
+	if errGetAssigns != nil {
+		return errGetAssigns
+	}
+
+	if len(assignments) == 0 {
+		if _, errInsert := sess.Insert(&assignment); errInsert != nil {
+			return errInsert
+		}
+		return nil
+	}
+
+	// Ensure the role was assigned only to this service account
+	if len(assignments) > 1 || assignments[0].UserID != assignment.UserID {
+		return errors.New("external service role assigned to another user or service account")
+	}
+
+	// Ensure the assignment is in the correct organization
+	_, errUpdate := sess.Where("role_id = ? AND user_id = ?", assignment.RoleID, assignment.UserID).MustCols("org_id").Update(&assignment)
+	return errUpdate
+}
diff --git a/pkg/services/accesscontrol/database/externalservices_test.go b/pkg/services/accesscontrol/database/externalservices_test.go
new file mode 100644
index 00000000000..fbf926ea784
--- /dev/null
+++ b/pkg/services/accesscontrol/database/externalservices_test.go
@@ -0,0 +1,191 @@
+package database
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
+	type run struct {
+		cmd     accesscontrol.SaveExternalServiceRoleCommand
+		wantErr bool
+	}
+	tests := []struct {
+		name string
+		runs []run
+	}{
+		{
+			name: "create app role",
+			runs: []run{
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						Global:            true,
+						ServiceAccountID:  1,
+						Permissions: []accesscontrol.Permission{
+							{Action: "users:read", Scope: "users:id:1"},
+							{Action: "users:read", Scope: "users:id:2"},
+						},
+					},
+					wantErr: false,
+				},
+			},
+		},
+		{
+			name: "update app role",
+			runs: []run{
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						Global:            true,
+						ServiceAccountID:  1,
+						Permissions: []accesscontrol.Permission{
+							{Action: "users:read", Scope: "users:id:1"},
+							{Action: "users:read", Scope: "users:id:2"},
+						},
+					},
+				},
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						Global:            true,
+						ServiceAccountID:  1,
+						Permissions: []accesscontrol.Permission{
+							{Action: "users:write", Scope: "users:id:1"},
+							{Action: "users:write", Scope: "users:id:2"},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "allow switching role from local to global and back",
+			runs: []run{
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						OrgID:             1,
+						ServiceAccountID:  1,
+						Permissions: []accesscontrol.Permission{
+							{Action: "users:read", Scope: "users:id:1"},
+							{Action: "users:read", Scope: "users:id:2"},
+						},
+					},
+				},
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						Global:            true,
+						ServiceAccountID:  1,
+						Permissions: []accesscontrol.Permission{
+							{Action: "users:read", Scope: "users:id:1"},
+							{Action: "users:read", Scope: "users:id:2"},
+						},
+					},
+				},
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						OrgID:             1,
+						ServiceAccountID:  1,
+						Permissions: []accesscontrol.Permission{
+							{Action: "users:read", Scope: "users:id:1"},
+							{Action: "users:read", Scope: "users:id:2"},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "edge case - remove all permissions",
+			runs: []run{
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						Global:            true,
+						ServiceAccountID:  1,
+						Permissions: []accesscontrol.Permission{
+							{Action: "users:read", Scope: "users:id:1"},
+							{Action: "users:read", Scope: "users:id:2"},
+						},
+					},
+				},
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						Global:            true,
+						ServiceAccountID:  1,
+						Permissions:       []accesscontrol.Permission{},
+					},
+				},
+			},
+		},
+		{
+			name: "edge case - reassign to another service account",
+			runs: []run{
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						Global:            true,
+						ServiceAccountID:  1,
+					},
+				},
+				{
+					cmd: accesscontrol.SaveExternalServiceRoleCommand{
+						ExternalServiceID: "app1",
+						Global:            true,
+						ServiceAccountID:  2,
+					},
+					wantErr: true,
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.Background()
+			s := &AccessControlStore{
+				sql: db.InitTestDB(t),
+			}
+
+			for i := range tt.runs {
+				err := s.SaveExternalServiceRole(ctx, tt.runs[i].cmd)
+				if tt.runs[i].wantErr {
+					require.Error(t, err)
+					continue
+				}
+				require.NoError(t, err)
+
+				errDBSession := s.sql.WithDbSession(ctx, func(sess *db.Session) error {
+					storedRole, err := getRoleByUID(ctx, sess, fmt.Sprintf("externalservice_%s_permissions", tt.runs[i].cmd.ExternalServiceID))
+					require.NoError(t, err)
+					require.NotNil(t, storedRole)
+					require.Equal(t, tt.runs[i].cmd.Global, storedRole.Global(), "Incorrect global state of the role")
+					require.Equal(t, tt.runs[i].cmd.OrgID, storedRole.OrgID, "Incorrect OrgID of the role")
+
+					storedPerm, err := getRolePermissions(ctx, sess, storedRole.ID)
+					require.NoError(t, err)
+					for i := range storedPerm {
+						storedPerm[i] = accesscontrol.Permission{Action: storedPerm[i].Action, Scope: storedPerm[i].Scope}
+					}
+					require.ElementsMatch(t, tt.runs[i].cmd.Permissions, storedPerm)
+
+					var assignment accesscontrol.UserRole
+					has, err := sess.Where("role_id = ? AND user_id = ?", storedRole.ID, tt.runs[i].cmd.ServiceAccountID).Get(&assignment)
+					require.NoError(t, err)
+					require.True(t, has)
+					require.Equal(t, tt.runs[i].cmd.Global, assignment.OrgID == accesscontrol.GlobalOrgID, "Incorrect global state of the assignment")
+					require.Equal(t, tt.runs[i].cmd.OrgID, assignment.OrgID, "Incorrect OrgID for the role assignment")
+
+					return nil
+				})
+				require.NoError(t, errDBSession)
+			}
+		})
+	}
+}
diff --git a/pkg/services/accesscontrol/errors.go b/pkg/services/accesscontrol/errors.go
index 27047abb596..5616b8583ab 100644
--- a/pkg/services/accesscontrol/errors.go
+++ b/pkg/services/accesscontrol/errors.go
@@ -11,6 +11,7 @@ var (
 	ErrInvalidScope           = errors.New("invalid scope")
 	ErrResolverNotFound       = errors.New("no resolver found")
 	ErrPluginIDRequired       = errors.New("plugin ID is required")
+	ErrRoleNotFound           = errors.New("role not found")
 )
 
 type ErrorInvalidRole struct{}
diff --git a/pkg/services/accesscontrol/mock/mock.go b/pkg/services/accesscontrol/mock/mock.go
index 1ae451c0069..4b7bf250ccb 100644
--- a/pkg/services/accesscontrol/mock/mock.go
+++ b/pkg/services/accesscontrol/mock/mock.go
@@ -30,6 +30,7 @@ type Calls struct {
 	DeleteUserPermissions          []interface{}
 	SearchUsersPermissions         []interface{}
 	SearchUserPermissions          []interface{}
+	SaveExternalServiceRole        []interface{}
 }
 
 type Mock struct {
@@ -56,6 +57,7 @@ type Mock struct {
 	DeleteUserPermissionsFunc          func(context.Context, int64) error
 	SearchUsersPermissionsFunc         func(context.Context, *user.SignedInUser, int64, accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error)
 	SearchUserPermissionsFunc          func(ctx context.Context, orgID int64, searchOptions accesscontrol.SearchOptions) ([]accesscontrol.Permission, error)
+	SaveExternalServiceRoleFunc        func(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error
 
 	scopeResolvers accesscontrol.Resolvers
 }
@@ -235,3 +237,12 @@ func (m *Mock) SearchUserPermissions(ctx context.Context, orgID int64, searchOpt
 	}
 	return nil, nil
 }
+
+func (m *Mock) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
+	m.Calls.SaveExternalServiceRole = append(m.Calls.SaveExternalServiceRole, []interface{}{ctx, cmd})
+	// Use override if provided
+	if m.SaveExternalServiceRoleFunc != nil {
+		return m.SaveExternalServiceRoleFunc(ctx, cmd)
+	}
+	return nil
+}
diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index ea688c67635..aadd63aea7f 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -2,10 +2,12 @@ package accesscontrol
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
 
+	"github.com/grafana/grafana/pkg/infra/slugify"
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/util/errutil"
@@ -129,6 +131,10 @@ func (r *RoleDTO) IsBasic() bool {
 	return strings.HasPrefix(r.Name, BasicRolePrefix) || strings.HasPrefix(r.UID, BasicRoleUIDPrefix)
 }
 
+func (r *RoleDTO) IsExternalService() bool {
+	return strings.HasPrefix(r.Name, ExternalServiceRolePrefix) || strings.HasPrefix(r.UID, ExternalServiceRoleUIDPrefix)
+}
+
 func (r RoleDTO) MarshalJSON() ([]byte, error) {
 	type Alias RoleDTO
 
@@ -188,11 +194,11 @@ func (p Permission) OSSPermission() Permission {
 }
 
 type GetUserPermissionsQuery struct {
-	OrgID      int64
-	UserID     int64
-	Roles      []string
-	TeamIDs    []int64
-	RolePrefix string
+	OrgID        int64
+	UserID       int64
+	Roles        []string
+	TeamIDs      []int64
+	RolePrefixes []string
 }
 
 // ResourcePermission is structure that holds all actions that either a team / user / builtin-role
@@ -245,14 +251,47 @@ type SetResourcePermissionCommand struct {
 	Permission  string `json:"permission"`
 }
 
+type SaveExternalServiceRoleCommand struct {
+	OrgID             int64
+	Global            bool
+	ExternalServiceID string
+	ServiceAccountID  int64
+	Permissions       []Permission
+}
+
+func (cmd *SaveExternalServiceRoleCommand) Validate() error {
+	if cmd.ExternalServiceID == "" {
+		return errors.New("external service id not specified")
+	}
+
+	// slugify the external service id ID for the role to have correct name and uid
+	cmd.ExternalServiceID = slugify.Slugify(cmd.ExternalServiceID)
+
+	if (cmd.OrgID == GlobalOrgID) != cmd.Global {
+		return fmt.Errorf("invalid org id %d for global role %t", cmd.OrgID, cmd.Global)
+	}
+
+	if cmd.Permissions == nil || len(cmd.Permissions) == 0 {
+		return errors.New("no permissions provided")
+	}
+
+	if cmd.ServiceAccountID <= 0 {
+		return fmt.Errorf("invalid service account id %d", cmd.ServiceAccountID)
+	}
+
+	return nil
+}
+
 const (
-	GlobalOrgID        = 0
-	FixedRolePrefix    = "fixed:"
-	ManagedRolePrefix  = "managed:"
-	BasicRolePrefix    = "basic:"
-	PluginRolePrefix   = "plugins:"
-	BasicRoleUIDPrefix = "basic_"
-	RoleGrafanaAdmin   = "Grafana Admin"
+	GlobalOrgID                  = 0
+	FixedRolePrefix              = "fixed:"
+	ManagedRolePrefix            = "managed:"
+	BasicRolePrefix              = "basic:"
+	PluginRolePrefix             = "plugins:"
+	ExternalServiceRolePrefix    = "externalservice:"
+	BasicRoleUIDPrefix           = "basic_"
+	ExternalServiceRoleUIDPrefix = "externalservice_"
+	RoleGrafanaAdmin             = "Grafana Admin"
 
 	GeneralFolderUID = "general"
 
diff --git a/pkg/services/accesscontrol/models_test.go b/pkg/services/accesscontrol/models_test.go
new file mode 100644
index 00000000000..a8503442f38
--- /dev/null
+++ b/pkg/services/accesscontrol/models_test.go
@@ -0,0 +1,80 @@
+package accesscontrol
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestSaveExternalServiceRoleCommand_Validate(t *testing.T) {
+	tests := []struct {
+		name    string
+		cmd     SaveExternalServiceRoleCommand
+		wantID  string
+		wantErr bool
+	}{
+		{
+			name: "invalid global statement",
+			cmd: SaveExternalServiceRoleCommand{
+				OrgID:             1,
+				Global:            true,
+				ExternalServiceID: "app 1",
+				ServiceAccountID:  2,
+				Permissions:       []Permission{{Action: "users:read", Scope: "users:id:1"}},
+			},
+			wantErr: true,
+		},
+		{
+			name: "invalid no permissions",
+			cmd: SaveExternalServiceRoleCommand{
+				OrgID:             1,
+				ExternalServiceID: "app 1",
+				ServiceAccountID:  2,
+				Permissions:       []Permission{},
+			},
+			wantErr: true,
+		},
+		{
+			name: "invalid service account id",
+			cmd: SaveExternalServiceRoleCommand{
+				OrgID:             1,
+				ExternalServiceID: "app 1",
+				ServiceAccountID:  -1,
+				Permissions:       []Permission{{Action: "users:read", Scope: "users:id:1"}},
+			},
+			wantErr: true,
+		},
+		{
+			name: "invalid no Ext Service ID",
+			cmd: SaveExternalServiceRoleCommand{
+				OrgID:            1,
+				ServiceAccountID: 2,
+				Permissions:      []Permission{{Action: "users:read", Scope: "users:id:1"}},
+			},
+			wantErr: true,
+		},
+		{
+			name: "slugify the external service ID correctly",
+			cmd: SaveExternalServiceRoleCommand{
+				ExternalServiceID: "ThisIs a Very Strange ___ App Name?",
+				Global:            true,
+				ServiceAccountID:  2,
+				Permissions:       []Permission{{Action: "users:read", Scope: "users:id:1"}},
+			},
+			wantErr: false,
+			wantID:  "thisis-a-very-strange-app-name",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.cmd.Validate()
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+
+			require.Equal(t, tt.wantID, tt.cmd.ExternalServiceID)
+		})
+	}
+}

From 6137e45fe156a969972ccd0719f7464fc81b7db3 Mon Sep 17 00:00:00 2001
From: Polina Boneva <13227501+polibb@users.noreply.github.com>
Date: Tue, 9 May 2023 15:31:30 +0300
Subject: [PATCH 705/729] Template Variables: Input field in dashboard does not
 send network requests for query var with ${__searchFilter} (#67839)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
---
 .../variables/pickers/OptionsPicker/actions.ts         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/app/features/variables/pickers/OptionsPicker/actions.ts b/public/app/features/variables/pickers/OptionsPicker/actions.ts
index a4c5b3bd134..00e27452a66 100644
--- a/public/app/features/variables/pickers/OptionsPicker/actions.ts
+++ b/public/app/features/variables/pickers/OptionsPicker/actions.ts
@@ -64,20 +64,24 @@ export const filterOrSearchOptions = (
     const { id, queryValue } = getVariablesState(rootStateKey, getState()).optionsPicker;
     const identifier: KeyedVariableIdentifier = { id, rootStateKey: rootStateKey, type: 'query' };
     const variable = getVariable(identifier, getState());
-    if (!hasOptions(variable)) {
+
+    if (!('options' in variable)) {
       return;
     }
 
-    const { query, options } = variable;
     dispatch(toKeyedAction(rootStateKey, updateSearchQuery(searchQuery)));
 
     if (trim(queryValue) === trim(searchQuery)) {
       return;
     }
 
-    if (containsSearchFilter(query)) {
+    const { query, options } = variable;
+
+    const queryTarget = typeof query === 'string' ? query : query.target;
+    if (containsSearchFilter(queryTarget)) {
       return searchForOptionsWithDebounce(dispatch, getState, searchQuery, rootStateKey);
     }
+
     return dispatch(toKeyedAction(rootStateKey, updateOptionsAndFilter(options)));
   };
 };

From ea1c1b9fb89775523b3f2292e713b2d8d86542ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 9 May 2023 14:33:41 +0200
Subject: [PATCH 706/729] DashboardGrid: Fixes moving panels on first load
 (#67953)

* DashboardGrid: Fixes moving panels on first load

* Minor tweak

* Use theme breakpoint and add media query
---
 .../dashboard/dashgrid/DashboardEmpty.tsx     |  5 ++
 .../dashboard/dashgrid/DashboardGrid.tsx      | 90 +++++++------------
 public/sass/components/_dashboard_grid.scss   |  6 +-
 3 files changed, 39 insertions(+), 62 deletions(-)

diff --git a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
index 47c5ec2146a..bf0e1df1825 100644
--- a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
@@ -107,6 +107,11 @@ function getStyles(theme: GrafanaTheme2) {
       flexDirection: 'column',
       maxWidth: '890px',
       gap: theme.spacing.gridSize * 4,
+      paddingTop: theme.spacing(2),
+
+      [theme.breakpoints.up('sm')]: {
+        paddingTop: theme.spacing(12),
+      },
     }),
     containerBox: css({
       label: 'container-box',
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
index 532f1e3b824..90e2a3e33d4 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
@@ -24,12 +24,7 @@ export interface Props {
   viewPanel: PanelModel | null;
   hidePanelMenus?: boolean;
 }
-
-export interface State {
-  isLayoutInitialized: boolean;
-}
-
-export class DashboardGrid extends PureComponent<Props, State> {
+export class DashboardGrid extends PureComponent<Props> {
   private panelMap: { [key: string]: PanelModel } = {};
   private eventSubs = new Subscription();
   private windowHeight = 1200;
@@ -37,13 +32,10 @@ export class DashboardGrid extends PureComponent<Props, State> {
   private gridWidth = 0;
   /** Used to keep track of mobile panel layout position */
   private lastPanelBottom = 0;
+  private isLayoutInitialized = false;
 
   constructor(props: Props) {
     super(props);
-
-    this.state = {
-      isLayoutInitialized: false,
-    };
   }
 
   componentDidMount() {
@@ -93,15 +85,14 @@ export class DashboardGrid extends PureComponent<Props, State> {
 
   onLayoutChange = (newLayout: ReactGridLayout.Layout[]) => {
     for (const newPos of newLayout) {
-      this.panelMap[newPos.i!].updateGridPos(newPos, this.state.isLayoutInitialized);
+      this.panelMap[newPos.i!].updateGridPos(newPos, this.isLayoutInitialized);
+    }
+
+    if (this.isLayoutInitialized) {
+      this.isLayoutInitialized = true;
     }
 
     this.props.dashboard.sortPanelsByGridPos();
-
-    // This is called on grid mount as it can correct invalid initial grid positions
-    if (!this.state.isLayoutInitialized) {
-      this.setState({ isLayoutInitialized: true });
-    }
   };
 
   triggerForceUpdate = () => {
@@ -210,9 +201,24 @@ export class DashboardGrid extends PureComponent<Props, State> {
     );
   }
 
+  /**
+   * Without this hack the move animations are triggered on initial load and all panels fly into position.
+   * This can be quite distracting and make the dashboard appear to less snappy.
+   */
+  onGetWrapperDivRef = (ref: HTMLDivElement | null) => {
+    if (ref) {
+      setTimeout(() => {
+        ref.classList.add('react-grid-layout--enable-move-animations');
+      }, 50);
+    }
+  };
+
   render() {
-    const { dashboard, isEditable } = this.props;
-    const hasPanels = dashboard.panels && dashboard.panels.length > 0;
+    const { isEditable, dashboard } = this.props;
+
+    if (config.featureToggles.emptyDashboardPage && dashboard.panels.length === 0) {
+      return <DashboardEmpty dashboard={dashboard} canCreate={isEditable} />;
+    }
 
     /**
      * We have a parent with "flex: 1 1 0" we need to reset it to "flex: 1 1 auto" to have the AutoSizer
@@ -227,59 +233,23 @@ export class DashboardGrid extends PureComponent<Props, State> {
               return null;
             }
 
-            const draggable = width <= 769 ? false : isEditable;
+            // Disable draggable if mobile device, solving an issue with unintentionally
+            // moving panels. https://github.com/grafana/grafana/issues/18497
+            const draggable = width <= config.theme2.breakpoints.values.md ? false : isEditable;
 
-            /*
-            Disable draggable if mobile device, solving an issue with unintentionally
-            moving panels. https://github.com/grafana/grafana/issues/18497
-            theme.breakpoints.md = 769
-          */
-            return config.featureToggles.emptyDashboardPage ? (
-              hasPanels ? (
-                /**
-                 * The children is using a width of 100% so we need to guarantee that it is wrapped
-                 * in an element that has the calculated size given by the AutoSizer. The AutoSizer
-                 * has a width of 0 and will let its content overflow its div.
-                 */
-                <div style={{ width: `${width}px`, height: '100%' }}>
-                  <ReactGridLayout
-                    width={width}
-                    isDraggable={draggable}
-                    isResizable={isEditable}
-                    containerPadding={[0, 0]}
-                    useCSSTransforms={false}
-                    margin={[GRID_CELL_VMARGIN, GRID_CELL_VMARGIN]}
-                    cols={GRID_COLUMN_COUNT}
-                    rowHeight={GRID_CELL_HEIGHT}
-                    draggableHandle=".grid-drag-handle"
-                    draggableCancel=".grid-drag-cancel"
-                    layout={this.buildLayout()}
-                    onDragStop={this.onDragStop}
-                    onResize={this.onResize}
-                    onResizeStop={this.onResizeStop}
-                    onLayoutChange={this.onLayoutChange}
-                  >
-                    {this.renderPanels(width, draggable)}
-                  </ReactGridLayout>
-                </div>
-              ) : (
-                <div style={{ width: `${width}px`, height: '100%', padding: `${draggable ? '100px 0' : '0'}` }}>
-                  <DashboardEmpty dashboard={dashboard} canCreate={isEditable} />
-                </div>
-              )
-            ) : (
+            return (
               /**
                * The children is using a width of 100% so we need to guarantee that it is wrapped
                * in an element that has the calculated size given by the AutoSizer. The AutoSizer
                * has a width of 0 and will let its content overflow its div.
                */
-              <div style={{ width: `${width}px`, height: '100%' }}>
+              <div style={{ width: width, height: '100%' }} ref={this.onGetWrapperDivRef}>
                 <ReactGridLayout
                   width={width}
                   isDraggable={draggable}
                   isResizable={isEditable}
                   containerPadding={[0, 0]}
-                  useCSSTransforms={false}
+                  useCSSTransforms={true}
                   margin={[GRID_CELL_VMARGIN, GRID_CELL_VMARGIN]}
                   cols={GRID_COLUMN_COUNT}
                   rowHeight={GRID_CELL_HEIGHT}
diff --git a/public/sass/components/_dashboard_grid.scss b/public/sass/components/_dashboard_grid.scss
index 150d5836622..e94a891b1a1 100644
--- a/public/sass/components/_dashboard_grid.scss
+++ b/public/sass/components/_dashboard_grid.scss
@@ -94,6 +94,8 @@
   transition-property: none;
 }
 
-.animated .react-grid-item.cssTransforms {
-  transition-property: transform;
+.react-grid-layout--enable-move-animations {
+  .react-grid-item.cssTransforms {
+    transition-property: transform;
+  }
 }

From 4c536e5942710a6a0f33a37c872f9b611b0ae240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 9 May 2023 14:51:02 +0200
Subject: [PATCH 707/729] AngularDeprecation: Show warnings in panel edit for
 angular panels (#67891)

* AngularDeprecation: Show warnings in panel edit for angular panels

* update wording

* Update public/app/features/dashboard/components/PanelEditor/AngularPanelPluginWarning.tsx

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Update public/app/features/dashboard/components/PanelEditor/AngularPanelPluginWarning.tsx

---------

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
---
 .../PanelEditor/AngularPanelPluginWarning.tsx | 48 +++++++++++++++++++
 .../PanelEditor/OptionsPaneOptions.tsx        |  2 +
 .../components/PanelEditor/PanelEditor.tsx    |  5 ++
 3 files changed, 55 insertions(+)
 create mode 100644 public/app/features/dashboard/components/PanelEditor/AngularPanelPluginWarning.tsx

diff --git a/public/app/features/dashboard/components/PanelEditor/AngularPanelPluginWarning.tsx b/public/app/features/dashboard/components/PanelEditor/AngularPanelPluginWarning.tsx
new file mode 100644
index 00000000000..7351b628f19
--- /dev/null
+++ b/public/app/features/dashboard/components/PanelEditor/AngularPanelPluginWarning.tsx
@@ -0,0 +1,48 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2, PanelPlugin } from '@grafana/data';
+import { Alert, useStyles2 } from '@grafana/ui';
+
+export interface Props {
+  plugin: PanelPlugin;
+}
+
+export function AngularPanelPluginWarning({ plugin }: Props) {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.wrapper}>
+      <Alert title="Angular panel plugin" severity="warning">
+        <div className="markdown-html">
+          <p>The selected panel plugin is using deprecated plugin APIs.</p>
+          <ul>
+            <li>
+              <a
+                href="https://grafana.com/docs/grafana/latest/developers/angular_deprecation/"
+                className="external-link"
+                target="_blank"
+                rel="noreferrer"
+              >
+                Read more on Angular deprecation
+              </a>
+            </li>
+            <li>
+              <a href={`plugins/${encodeURIComponent(plugin.meta.id)}`} className="external-link">
+                View plugin details
+              </a>
+            </li>
+          </ul>
+        </div>
+      </Alert>
+    </div>
+  );
+}
+
+export function getStyles(theme: GrafanaTheme2) {
+  return {
+    wrapper: css({
+      padding: theme.spacing(1),
+    }),
+  };
+}
diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx
index 5c2eb9e7189..8fec5bc3feb 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx
@@ -7,6 +7,7 @@ import { CustomScrollbar, FilterInput, RadioButtonGroup, useStyles2 } from '@gra
 import { isPanelModelLibraryPanel } from '../../../library-panels/guard';
 
 import { AngularPanelOptions } from './AngularPanelOptions';
+import { AngularPanelPluginWarning } from './AngularPanelPluginWarning';
 import { OptionsPaneCategory } from './OptionsPaneCategory';
 import { OptionsPaneCategoryDescriptor } from './OptionsPaneCategoryDescriptor';
 import { getFieldOverrideCategories } from './getFieldOverrideElements';
@@ -100,6 +101,7 @@ export const OptionsPaneOptions = (props: OptionPaneRenderProps) => {
   return (
     <div className={styles.wrapper}>
       <div className={styles.formBox}>
+        {panel.isAngularPlugin() && <AngularPanelPluginWarning plugin={plugin} />}
         <div className={styles.formRow}>
           <FilterInput width={0} value={searchQuery} onChange={setSearchQuery} placeholder={'Search options'} />
         </div>
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
index 772301165aa..4a5b75a58ff 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
@@ -538,6 +538,11 @@ export const getStyles = stylesFactory((theme: GrafanaTheme2, props: Props) => {
       justify-content: space-between;
       flex-wrap: wrap;
     `,
+    angularWarning: css`
+      display: flex;
+      height: theme.spacing(4);
+      align-items: center;
+    `,
     toolbarLeft: css`
       padding-left: ${theme.spacing(1)};
     `,

From 8ec5527479e25ae4a12ff7b5f83f987ab27c46d9 Mon Sep 17 00:00:00 2001
From: Juan Cabanas <juan.cabanas@grafana.com>
Date: Tue, 9 May 2023 09:52:29 -0300
Subject: [PATCH 708/729] DataSourceModal: responsive behavior (#67944)

---
 .../components/picker/DataSourceModal.tsx     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx
index e1494321b58..fb41b1492f0 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx
@@ -171,11 +171,19 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
       height: 80%;
       max-width: 1200px;
       max-height: 900px;
+
+      ${theme.breakpoints.down('md')} {
+        width: 100%;
+      }
     `,
     modalContent: css`
       display: flex;
       flex-direction: row;
       height: 100%;
+
+      ${theme.breakpoints.down('md')} {
+        flex-direction: column;
+      }
     `,
     leftColumn: css`
       display: flex;
@@ -184,6 +192,15 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
       height: 100%;
       padding-right: ${theme.spacing(4)};
       border-right: 1px solid ${theme.colors.border.weak};
+
+      ${theme.breakpoints.down('md')} {
+        width: 100%;
+        height: 47%;
+        border-right: 0;
+        padding-right: 0;
+        border-bottom: 1px solid ${theme.colors.border.weak};
+        padding-bottom: ${theme.spacing(4)};
+      }
     `,
     rightColumn: css`
       display: flex;
@@ -193,6 +210,13 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
       justify-items: space-evenly;
       align-items: stretch;
       padding-left: ${theme.spacing(4)};
+
+      ${theme.breakpoints.down('md')} {
+        width: 100%;
+        height: 53%;
+        padding-left: 0;
+        padding-top: ${theme.spacing(4)};
+      }
     `,
     builtInDataSources: css`
       flex: 1;
@@ -209,6 +233,10 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) {
       flex-direction: row;
       width: 100%;
       justify-content: flex-end;
+
+      ${theme.breakpoints.down('md')} {
+        padding-bottom: ${theme.spacing(3)};
+      }
     `,
     searchInput: css`
       width: 100%;

From ee05e3675a204511b3da958dc3e2c158273dddcd Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Tue, 9 May 2023 15:18:38 +0200
Subject: [PATCH 709/729] Alerting: Fixes Alert list panel "ungrouped"
 regression (#68018)

---
 .../unified-alerting/GroupedView.test.tsx     | 46 +++++++++++++++++++
 .../unified-alerting/GroupedView.tsx          | 29 ++++++++----
 2 files changed, 65 insertions(+), 10 deletions(-)
 create mode 100644 public/app/plugins/panel/alertlist/unified-alerting/GroupedView.test.tsx

diff --git a/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.test.tsx b/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.test.tsx
new file mode 100644
index 00000000000..148c0c9f485
--- /dev/null
+++ b/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.test.tsx
@@ -0,0 +1,46 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { CombinedRuleWithLocation } from 'app/types/unified-alerting';
+import { PromRuleType } from 'app/types/unified-alerting-dto';
+
+import { UnifiedAlertListOptions } from '../types';
+
+import GroupedView, { UNGROUPED_KEY } from './GroupedView';
+
+describe('Grouped view', () => {
+  const rules: CombinedRuleWithLocation[] = [
+    {
+      promRule: {
+        type: PromRuleType.Alerting,
+        alerts: [
+          // @ts-ignore
+          { labels: { job: 'job-1', severity: 'high' } },
+          // @ts-ignore
+          { labels: { job: 'job-2', severity: 'low' } },
+        ],
+      },
+    },
+    {
+      promRule: {
+        type: PromRuleType.Alerting,
+        alerts: [
+          // @ts-ignore
+          { labels: { foo: 'bar', severity: 'low' } },
+        ],
+      },
+    },
+  ];
+
+  it('should group instances by label(s) correctly', () => {
+    // @ts-ignore
+    const options: UnifiedAlertListOptions = {
+      groupBy: ['job', 'severity'],
+    };
+
+    render(<GroupedView rules={rules} options={options} />);
+    expect(screen.getByTestId('job=job-1&severity=high')).toBeInTheDocument();
+    expect(screen.getByTestId('job=job-2&severity=low')).toBeInTheDocument();
+    expect(screen.getByTestId(UNGROUPED_KEY)).toBeInTheDocument();
+  });
+});
diff --git a/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx b/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx
index 8c8ab6131f3..cdc28794cbf 100644
--- a/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx
+++ b/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx
@@ -5,7 +5,7 @@ import { AlertLabel } from 'app/features/alerting/unified/components/AlertLabel'
 import { getAlertingRule } from 'app/features/alerting/unified/utils/rules';
 import { Alert } from 'app/types/unified-alerting';
 
-import { AlertingRule, CombinedRuleWithLocation } from '../../../../types/unified-alerting';
+import { CombinedRuleWithLocation } from '../../../../types/unified-alerting';
 import { AlertInstances } from '../AlertInstances';
 import { getStyles } from '../UnifiedAlertList';
 import { GroupedRules, UnifiedAlertListOptions } from '../types';
@@ -16,9 +16,10 @@ type Props = {
   options: UnifiedAlertListOptions;
 };
 
+export const UNGROUPED_KEY = '__ungrouped__';
+
 const GroupedModeView = ({ rules, options }: Props) => {
   const styles = useStyles2(getStyles);
-
   const groupBy = options.groupBy;
 
   const groupedRules = useMemo<GroupedRules>(() => {
@@ -27,16 +28,23 @@ const GroupedModeView = ({ rules, options }: Props) => {
     const hasInstancesWithMatchingLabels = (rule: CombinedRuleWithLocation) =>
       groupBy ? alertHasEveryLabelForCombinedRules(rule, groupBy) : true;
 
-    const matchingRules = rules.filter(hasInstancesWithMatchingLabels);
-    matchingRules.forEach((rule: CombinedRuleWithLocation) => {
-      const alertingRule: AlertingRule | null = getAlertingRule(rule);
+    rules.forEach((rule) => {
+      const alertingRule = getAlertingRule(rule);
+      const hasInstancesMatching = hasInstancesWithMatchingLabels(rule);
+
       (alertingRule?.alerts ?? []).forEach((alert) => {
-        const mapKey = createMapKey(groupBy, alert.labels);
+        const mapKey = hasInstancesMatching ? createMapKey(groupBy, alert.labels) : UNGROUPED_KEY;
+
         const existingAlerts = groupedRules.get(mapKey) ?? [];
         groupedRules.set(mapKey, [...existingAlerts, alert]);
       });
     });
 
+    // move the "UNGROUPED" key to the last item in the Map, items are shown in insertion order
+    const ungrouped = groupedRules.get(UNGROUPED_KEY) ?? [];
+    groupedRules.delete(UNGROUPED_KEY);
+    groupedRules.set(UNGROUPED_KEY, ungrouped);
+
     // Remove groups having no instances
     // This is different from filtering Rules without instances that we do in UnifiedAlertList
     const filteredGroupedRules = Array.from(groupedRules.entries()).reduce((acc, [groupKey, groupAlerts]) => {
@@ -54,12 +62,13 @@ const GroupedModeView = ({ rules, options }: Props) => {
   return (
     <>
       {Array.from(groupedRules).map(([key, alerts]) => (
-        <li className={styles.alertRuleItem} key={key}>
+        <li className={styles.alertRuleItem} key={key} data-testid={key}>
           <div>
             <div className={styles.customGroupDetails}>
               <div className={styles.alertLabels}>
-                {key && parseMapKey(key).map(([key, value]) => <AlertLabel key={key} labelKey={key} value={value} />)}
-                {!key && 'No grouping'}
+                {key !== UNGROUPED_KEY &&
+                  parseMapKey(key).map(([key, value]) => <AlertLabel key={key} labelKey={key} value={value} />)}
+                {key === UNGROUPED_KEY && 'No grouping'}
               </div>
             </div>
             <AlertInstances alerts={alerts} options={options} />
@@ -79,7 +88,7 @@ function parseMapKey(key: string): Array<[string, string]> {
 }
 
 function alertHasEveryLabelForCombinedRules(rule: CombinedRuleWithLocation, groupByKeys: string[]) {
-  const alertingRule: AlertingRule | null = getAlertingRule(rule);
+  const alertingRule = getAlertingRule(rule);
   return groupByKeys.every((key) => {
     return (alertingRule?.alerts ?? []).some((alert) => alert.labels[key]);
   });

From 2489e3524df33a68444cd7f76073e4faba25b1a5 Mon Sep 17 00:00:00 2001
From: Victor Colomb <51762123+VictorColomb@users.noreply.github.com>
Date: Tue, 9 May 2023 15:21:28 +0200
Subject: [PATCH 710/729] Variables: Add support for `$__timezone` template
 variable (#66785)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
---
 .../variables/add-template-variables/index.md  |  6 ++++++
 .../features/templating/macroRegistry.test.ts  | 18 +++++++++++++++++-
 .../app/features/templating/macroRegistry.ts   | 10 +++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/docs/sources/dashboards/variables/add-template-variables/index.md b/docs/sources/dashboards/variables/add-template-variables/index.md
index deda7868f77..b6872f1f358 100644
--- a/docs/sources/dashboards/variables/add-template-variables/index.md
+++ b/docs/sources/dashboards/variables/add-template-variables/index.md
@@ -315,6 +315,12 @@ This is used in several places, including:
 - SQL queries in MySQL, Postgres, and MSSQL.
 - The `$__timeFilter` variable is used in the MySQL data source.
 
+### $\_\_timezone
+
+The `$__timezone` variable returns the currently selected time zone, either `utc` or an entry of the IANA time zone database (for example, `America/New_York`).
+
+If the currently selected time zone is _Browser Time_, Grafana will try to determine your browser time zone.
+
 ## Chained variables
 
 _Chained variables_, also called _linked variables_ or _nested variables_, are query variables with one or more other variables in their variable query. This section explains how chained variables work and provides links to example dashboards that use chained variables.
diff --git a/public/app/features/templating/macroRegistry.test.ts b/public/app/features/templating/macroRegistry.test.ts
index 2e212c5f940..5b5a25e7687 100644
--- a/public/app/features/templating/macroRegistry.test.ts
+++ b/public/app/features/templating/macroRegistry.test.ts
@@ -3,7 +3,8 @@ import { initTemplateSrv } from 'test/helpers/initTemplateSrv';
 import { DataLinkBuiltInVars } from '@grafana/data';
 import { getTemplateSrv, setTemplateSrv } from '@grafana/runtime';
 
-import { setTimeSrv } from '../dashboard/services/TimeSrv';
+import { setTimeSrv, TimeSrv } from '../dashboard/services/TimeSrv';
+import { TimeModel } from '../dashboard/state/TimeModel';
 import { variableAdapters } from '../variables/adapters';
 import { createQueryVariableAdapter } from '../variables/query/adapter';
 
@@ -52,3 +53,18 @@ describe('__url_time_range', () => {
     expect(out).toBe('/d/1?from=1607687293000&to=1607687293100');
   });
 });
+
+describe('__timezone', () => {
+  beforeAll(() => {
+    setTimeSrv({
+      timeModel: {
+        getTimezone: () => 'Pacific/Noumea',
+      } as TimeModel,
+    } as TimeSrv);
+  });
+
+  it('should interpolate to time zone', () => {
+    const out = getTemplateSrv().replace(`TIMEZONE('$__timezone', '2023-04-19 00:00:00')`);
+    expect(out).toBe(`TIMEZONE('Pacific/Noumea', '2023-04-19 00:00:00')`);
+  });
+});
diff --git a/public/app/features/templating/macroRegistry.ts b/public/app/features/templating/macroRegistry.ts
index 65ede4f22b6..ddd0303e587 100644
--- a/public/app/features/templating/macroRegistry.ts
+++ b/public/app/features/templating/macroRegistry.ts
@@ -1,4 +1,6 @@
-import { DataLinkBuiltInVars, ScopedVars, urlUtil } from '@grafana/data';
+import moment from 'moment-timezone';
+
+import { DataLinkBuiltInVars, getTimeZone, ScopedVars, urlUtil } from '@grafana/data';
 
 import { getTimeSrv } from '../dashboard/services/TimeSrv';
 import { getVariablesUrlParams } from '../variables/getAllVariableValuesForUrl';
@@ -13,6 +15,7 @@ export const macroRegistry: Record<string, MacroHandler> = {
   ['__field']: fieldMacro,
   [DataLinkBuiltInVars.includeVars]: includeVarsMacro,
   [DataLinkBuiltInVars.keepTime]: urlTimeRangeMacro,
+  ['__timezone']: timeZoneMacro,
 };
 
 function includeVarsMacro(match: string, fieldPath?: string, scopedVars?: ScopedVars) {
@@ -23,3 +26,8 @@ function includeVarsMacro(match: string, fieldPath?: string, scopedVars?: Scoped
 function urlTimeRangeMacro() {
   return urlUtil.toUrlParams(getTimeSrv().timeRangeForUrl());
 }
+
+function timeZoneMacro() {
+  const timeZone = getTimeZone({ timeZone: getTimeSrv().timeModel?.getTimezone() });
+  return timeZone === 'browser' ? moment.tz.guess() : timeZone;
+}

From a650ddfecde8288c595a9c620c87173e7bf1e567 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 9 May 2023 07:04:49 -0700
Subject: [PATCH 711/729] Dashboards: Make the home dashboard non-editable (by
 default) (#68044)

---
 public/dashboards/home.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/dashboards/home.json b/public/dashboards/home.json
index 187a393b662..821a7eaa35a 100644
--- a/public/dashboards/home.json
+++ b/public/dashboards/home.json
@@ -62,6 +62,7 @@
     "from": "now-6h",
     "to": "now"
   },
+  "editable": false,
   "timepicker": {
     "hidden": true,
     "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],

From a7cbb72664575ee62279f0a8e4c25577cbd05936 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 9 May 2023 15:22:23 +0100
Subject: [PATCH 712/729] Accessibility: Add `Skip to content` link (#68065)

* user essentials mob! :trident:

lastFile:public/app/core/components/AppChrome/AppChrome.tsx

* user essentials mob! :trident:

lastFile:public/app/core/components/AppChrome/AppChrome.test.tsx

* only show skiplink when page has app chrome

---------

Co-authored-by: Joao Silva <joao.silva@grafana.com>
---
 .../components/AppChrome/AppChrome.test.tsx   | 27 +++++++++-
 .../core/components/AppChrome/AppChrome.tsx   | 49 ++++++++++++-------
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/public/app/core/components/AppChrome/AppChrome.test.tsx b/public/app/core/components/AppChrome/AppChrome.test.tsx
index 92390c093f8..a4c4a40e43b 100644
--- a/public/app/core/components/AppChrome/AppChrome.test.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.test.tsx
@@ -1,4 +1,5 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { KBarProvider } from 'kbar';
 import React, { ReactNode } from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
@@ -109,4 +110,28 @@ describe('AppChrome', () => {
     expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
     expect(screen.getByRole('tab', { name: 'Tab pageNav child1' })).toBeInTheDocument();
   });
+
+  it('should create a skip link to skip to main content', async () => {
+    setup(<Page navId="child1">Children</Page>);
+    expect(await screen.findByRole('link', { name: 'Skip to main content' })).toBeInTheDocument();
+  });
+
+  it('should focus the skip link on initial tab before carrying on with normal tab order', async () => {
+    setup(<Page navId="child1">Children</Page>);
+    await userEvent.keyboard('{tab}');
+    const skipLink = await screen.findByRole('link', { name: 'Skip to main content' });
+    expect(skipLink).toHaveFocus();
+    await userEvent.keyboard('{tab}');
+    expect(await screen.findByRole('link', { name: 'Go to home' })).toHaveFocus();
+  });
+
+  it('should not render a skip link if the page is chromeless', async () => {
+    const { context } = setup(<Page navId="child1">Children</Page>);
+    context.chrome.update({
+      chromeless: true,
+    });
+    waitFor(() => {
+      expect(screen.queryByRole('link', { name: 'Skip to main content' })).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index 72489c28fa2..59939ebe768 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import React, { PropsWithChildren } from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { useStyles2, LinkButton } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 import { CommandPalette } from 'app/features/commandPalette/CommandPalette';
 import { KioskMode } from 'app/types';
@@ -34,34 +34,39 @@ export function AppChrome({ children }: Props) {
   // doesn't get re-mounted when chromeless goes from true to false.
 
   return (
-    <main className={classNames('main-view', searchBarHidden && 'main-view--search-bar-hidden')}>
+    <div className={classNames('main-view', searchBarHidden && 'main-view--search-bar-hidden')}>
       {!state.chromeless && (
-        <div className={cx(styles.topNav)}>
-          {!searchBarHidden && <TopSearchBar />}
-          <NavToolbar
-            searchBarHidden={searchBarHidden}
-            sectionNav={state.sectionNav.node}
-            pageNav={state.pageNav}
-            actions={state.actions}
-            onToggleSearchBar={chrome.onToggleSearchBar}
-            onToggleMegaMenu={chrome.onToggleMegaMenu}
-            onToggleKioskMode={chrome.onToggleKioskMode}
-          />
-        </div>
+        <>
+          <LinkButton className={styles.skipLink} href="#pageContent">
+            Skip to main content
+          </LinkButton>
+          <div className={cx(styles.topNav)}>
+            {!searchBarHidden && <TopSearchBar />}
+            <NavToolbar
+              searchBarHidden={searchBarHidden}
+              sectionNav={state.sectionNav.node}
+              pageNav={state.pageNav}
+              actions={state.actions}
+              onToggleSearchBar={chrome.onToggleSearchBar}
+              onToggleMegaMenu={chrome.onToggleMegaMenu}
+              onToggleKioskMode={chrome.onToggleKioskMode}
+            />
+          </div>
+        </>
       )}
-      <div className={contentClass}>
+      <main className={contentClass} id="pageContent">
         <div className={styles.panes}>
           {state.layout === PageLayoutType.Standard && state.sectionNav && <SectionNav model={state.sectionNav} />}
           <div className={styles.pageContainer}>{children}</div>
         </div>
-      </div>
+      </main>
       {!state.chromeless && (
         <>
           <MegaMenu searchBarHidden={searchBarHidden} onClose={() => chrome.setMegaMenu(false)} />
           <CommandPalette />
         </>
       )}
-    </main>
+    </div>
   );
 }
 
@@ -112,5 +117,15 @@ const getStyles = (theme: GrafanaTheme2) => {
       flexGrow: 1,
       minHeight: 0,
     }),
+    skipLink: css({
+      position: 'absolute',
+      top: -1000,
+
+      ':focus': {
+        left: theme.spacing(1),
+        top: theme.spacing(1),
+        zIndex: theme.zIndex.portal,
+      },
+    }),
   };
 };

From 65c1505415a98b4f9e34ea75374887bce7195011 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Tue, 9 May 2023 15:24:20 +0100
Subject: [PATCH 713/729] AzureMonitor: Ensure trace exceptions are correctly
 displayed (#68079)

Ensure trace exceptions are correctly displayed
---
 .../azure-log-analytics-datasource.go         |  7 +--
 .../azure-log-analytics-datasource_test.go    | 60 ++++++++++---------
 pkg/tsdb/azuremonitor/loganalytics/consts.go  |  2 +
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
index 6ad2b8b5bae..f1933302893 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
@@ -729,10 +729,7 @@ func buildTracesQuery(operationId string, traceTypes []string, filters []types.T
 		propertiesFunc = fmt.Sprintf("bag_merge(bag_pack_columns(%s), customDimensions, customMeasurements)", strings.Join(tags, ","))
 	}
 
-	errorProperty := ""
-	if slices.Contains(filteredTypes, "exceptions") {
-		errorProperty = `| extend error = iff(itemType == "exceptions", true, false)`
-	}
+	errorProperty := `| extend error = todynamic(iff(itemType == "exception", "true", "false"))`
 
 	baseQuery := fmt.Sprintf(`set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true %s | where $__timeFilter()`, strings.Join(filteredTypes, ","))
 	propertiesStaticQuery := `| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
@@ -744,7 +741,7 @@ func buildTracesQuery(operationId string, traceTypes []string, filters []types.T
 	projectClause := `| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 		`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 		`| order by startTime asc`
-	return baseQuery + whereClause + propertiesStaticQuery + propertiesQuery + errorProperty + filtersClause + projectClause
+	return baseQuery + whereClause + propertiesStaticQuery + errorProperty + propertiesQuery + filtersClause + projectClause
 }
 
 func buildTracesLogsQuery(operationId *string) string {
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
index 98ae108cd25..97b1053dba2 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
@@ -256,6 +256,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
 						`| extend tags = bag_merge(customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -270,6 +271,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
 						`| extend tags = bag_merge(customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -318,6 +320,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
 						`| extend tags = bag_merge(customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -332,6 +335,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
 						`| extend tags = bag_merge(customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -377,8 +381,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -392,8 +396,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -441,8 +445,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -456,8 +460,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -507,8 +511,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| where appId in ("test-app-id")` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -523,8 +527,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| where appId in ("test-app-id")` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -575,8 +579,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| where appId !in ("test-app-id")` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -591,8 +595,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| where appId !in ("test-app-id")` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -643,8 +647,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| where appId !in ("test-app-id")| where clientId in ("test-client-id")` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -659,8 +663,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| where appId !in ("test-app-id")| where clientId in ("test-client-id")` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
@@ -706,8 +710,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -721,8 +725,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -770,8 +774,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -785,8 +789,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName` +
 						`| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
diff --git a/pkg/tsdb/azuremonitor/loganalytics/consts.go b/pkg/tsdb/azuremonitor/loganalytics/consts.go
index 529c5fcc7da..08f4270c5ca 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/consts.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/consts.go
@@ -92,6 +92,8 @@ var ExceptionsSchema = copyCommonProperties(map[string]string{
 	"problemId":         "ProblemId",
 	"severityLevel":     "SeverityLevel",
 	"type":              "ExceptionType",
+	// Grafana specific error tag
+	"error": "error",
 }, map[string]string{"duration": "duration", "id": "id", "name": "name", "performanceBucket": "performanceBucket", "success": "success"})
 
 var TracesSchema = copyCommonProperties(map[string]string{

From 8e752439c69103f47bd8f5ae8fe5b2e52dac1ea3 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 9 May 2023 15:26:17 +0100
Subject: [PATCH 714/729] Graph: Fix legend overlapping graph area (#67912)

use render callback instead of requestIdleTimeout
---
 public/app/plugins/panel/graph/Legend/Legend.tsx | 4 +++-
 public/app/plugins/panel/graph/graph.ts          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/graph/Legend/Legend.tsx b/public/app/plugins/panel/graph/Legend/Legend.tsx
index 670b892725e..984d2af5b8b 100644
--- a/public/app/plugins/panel/graph/Legend/Legend.tsx
+++ b/public/app/plugins/panel/graph/Legend/Legend.tsx
@@ -32,6 +32,7 @@ interface LegendDisplayProps {
   alignAsTable?: boolean;
   rightSide?: boolean;
   sideWidth?: number;
+  renderCallback?: () => void;
 }
 
 interface LegendValuesProps {
@@ -176,6 +177,7 @@ export class GraphLegend extends PureComponent<GraphLegendProps, LegendState> {
       avg,
       current,
       total,
+      renderCallback,
     } = this.props;
     const seriesValuesProps = { values, min, max, avg, current, total };
     const hiddenSeries = this.state.hiddenSeries;
@@ -205,7 +207,7 @@ export class GraphLegend extends PureComponent<GraphLegendProps, LegendState> {
     };
 
     return (
-      <div className={`graph-legend-content ${legendClass}`} style={legendStyle}>
+      <div className={`graph-legend-content ${legendClass}`} ref={renderCallback} style={legendStyle}>
         {this.props.alignAsTable ? <LegendTable {...legendProps} /> : <LegendSeriesList {...legendProps} />}
       </div>
     );
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 57f4f2a8760..819fa92e37d 100644
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -155,13 +155,13 @@ class GraphElement {
       onToggleSort: this.ctrl.onToggleSort,
       onColorChange: this.ctrl.onColorChange,
       onToggleAxis: this.ctrl.onToggleAxis,
+      renderCallback: this.renderPanel.bind(this),
     };
 
     const legendReactElem = React.createElement(LegendWithThemeProvider, legendProps);
 
     // render callback isn't supported in react 18+, see: https://github.com/reactwg/react-18/discussions/5
     this.legendElemRoot.render(legendReactElem);
-    requestIdleCallback(() => this.renderPanel());
   }
 
   onGraphHover(evt: LegacyGraphHoverEventPayload | DataHoverPayload) {

From 86228ba1a03fc7ae1774b868839dc8b3f77edeed Mon Sep 17 00:00:00 2001
From: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
Date: Tue, 9 May 2023 08:29:02 -0600
Subject: [PATCH 715/729] Datasource: Fix missing raw SQL query in Query
 Inspector when query returns zero rows (#67844)

* baldm0mma/issue5799/ add empty frame with all meta data

* baldm0mma/issue5799/ add null test

* write an integration test around query results with empty rows

* baldm0mma/issue5799/ add tests to mssql and postgres

* remove use of apparently reserved keyword in mysql8

* baldm0mma/issue5799

* baldm0mma/issue5799/ update tests

* baldm0mma/issue5799/ update test structs

* baldm0mma/issue5799/ update annotation

---------

Co-authored-by: Michael Mandrus <michael.mandrus@grafana.com>
---
 pkg/tsdb/mssql/mssql_test.go       | 44 ++++++++++++++++++++++++++++++
 pkg/tsdb/mysql/mysql_test.go       | 44 ++++++++++++++++++++++++++++++
 pkg/tsdb/postgres/postgres_test.go | 44 ++++++++++++++++++++++++++++++
 pkg/tsdb/sqleng/sql_engine.go      |  8 ++++--
 4 files changed, 138 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/mssql/mssql_test.go b/pkg/tsdb/mssql/mssql_test.go
index 55705b9a73a..a0e76ed5f78 100644
--- a/pkg/tsdb/mssql/mssql_test.go
+++ b/pkg/tsdb/mssql/mssql_test.go
@@ -1263,6 +1263,50 @@ func TestMSSQL(t *testing.T) {
 			})
 		})
 	})
+
+	t.Run("Given an empty table", func(t *testing.T) {
+		type emptyObj struct {
+			EmptyKey string
+			EmptyVal int64
+		}
+
+		exists, err := sess.IsTableExist(emptyObj{})
+		require.NoError(t, err)
+		if exists {
+			err := sess.DropTable(emptyObj{})
+			require.NoError(t, err)
+		}
+		err = sess.CreateTable(emptyObj{})
+		require.NoError(t, err)
+
+		t.Run("When no rows are returned, should return an empty frame", func(t *testing.T) {
+			query := &backend.QueryDataRequest{
+				Queries: []backend.DataQuery{
+					{
+						JSON: []byte(`{
+							"rawSql": "SELECT empty_key, empty_val FROM empty_obj",
+							"format": "table"
+						}`),
+						RefID: "A",
+						TimeRange: backend.TimeRange{
+							From: time.Now(),
+							To:   time.Now().Add(1 * time.Minute),
+						},
+					},
+				},
+			}
+
+			resp, err := endpoint.QueryData(context.Background(), query)
+			require.NoError(t, err)
+			queryResult := resp.Responses["A"]
+
+			frames := queryResult.Frames
+			require.Len(t, frames, 1)
+			require.Equal(t, 0, frames[0].Rows())
+			require.NotNil(t, frames[0].Fields)
+			require.Empty(t, frames[0].Fields)
+		})
+	})
 }
 
 func TestTransformQueryError(t *testing.T) {
diff --git a/pkg/tsdb/mysql/mysql_test.go b/pkg/tsdb/mysql/mysql_test.go
index 58142d23190..ef2b61d5ffc 100644
--- a/pkg/tsdb/mysql/mysql_test.go
+++ b/pkg/tsdb/mysql/mysql_test.go
@@ -1229,6 +1229,50 @@ func TestIntegrationMySQL(t *testing.T) {
 			})
 		})
 	})
+
+	t.Run("Given an empty table", func(t *testing.T) {
+		type emptyObj struct {
+			EmptyKey string
+			EmptyVal int64
+		}
+
+		exists, err := sess.IsTableExist(emptyObj{})
+		require.NoError(t, err)
+		if exists {
+			err := sess.DropTable(emptyObj{})
+			require.NoError(t, err)
+		}
+		err = sess.CreateTable(emptyObj{})
+		require.NoError(t, err)
+
+		t.Run("When no rows are returned, should return an empty frame", func(t *testing.T) {
+			query := &backend.QueryDataRequest{
+				Queries: []backend.DataQuery{
+					{
+						JSON: []byte(`{
+							"rawSql": "SELECT * FROM empty_obj",
+							"format": "table"
+						}`),
+						RefID: "A",
+						TimeRange: backend.TimeRange{
+							From: time.Now(),
+							To:   time.Now().Add(1 * time.Minute),
+						},
+					},
+				},
+			}
+
+			resp, err := exe.QueryData(context.Background(), query)
+			require.NoError(t, err)
+			queryResult := resp.Responses["A"]
+
+			frames := queryResult.Frames
+			require.Len(t, frames, 1)
+			require.Equal(t, 0, frames[0].Rows())
+			require.NotNil(t, frames[0].Fields)
+			require.Empty(t, frames[0].Fields)
+		})
+	})
 }
 
 func InitMySQLTestDB(t *testing.T) *xorm.Engine {
diff --git a/pkg/tsdb/postgres/postgres_test.go b/pkg/tsdb/postgres/postgres_test.go
index e48c79c5ef9..ecf9405eabf 100644
--- a/pkg/tsdb/postgres/postgres_test.go
+++ b/pkg/tsdb/postgres/postgres_test.go
@@ -1331,6 +1331,50 @@ func TestIntegrationPostgres(t *testing.T) {
 			})
 		})
 	})
+
+	t.Run("Given an empty table", func(t *testing.T) {
+		type emptyObj struct {
+			EmptyKey string
+			EmptyVal int64
+		}
+
+		exists, err := sess.IsTableExist(emptyObj{})
+		require.NoError(t, err)
+		if exists {
+			err := sess.DropTable(emptyObj{})
+			require.NoError(t, err)
+		}
+		err = sess.CreateTable(emptyObj{})
+		require.NoError(t, err)
+
+		t.Run("When no rows are returned, should return an empty frame", func(t *testing.T) {
+			query := &backend.QueryDataRequest{
+				Queries: []backend.DataQuery{
+					{
+						JSON: []byte(`{
+							"rawSql": "SELECT empty_key, empty_val FROM empty_obj",
+							"format": "table"
+						}`),
+						RefID: "A",
+						TimeRange: backend.TimeRange{
+							From: time.Now(),
+							To:   time.Now().Add(1 * time.Minute),
+						},
+					},
+				},
+			}
+
+			resp, err := exe.QueryData(context.Background(), query)
+			require.NoError(t, err)
+			queryResult := resp.Responses["A"]
+
+			frames := queryResult.Frames
+			require.Len(t, frames, 1)
+			require.Equal(t, 0, frames[0].Rows())
+			require.NotNil(t, frames[0].Fields)
+			require.Empty(t, frames[0].Fields)
+		})
+	})
 }
 
 func InitPostgresTestDB(t *testing.T) *xorm.Engine {
diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/sqleng/sql_engine.go
index aeb93d411d1..02c91b9a424 100644
--- a/pkg/tsdb/sqleng/sql_engine.go
+++ b/pkg/tsdb/sqleng/sql_engine.go
@@ -312,9 +312,13 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
 
 	frame.Meta.ExecutedQueryString = interpolatedQuery
 
-	// If no rows were returned, no point checking anything else.
+	// If no rows were returned, clear any previously set `Fields` with a single empty `data.Field` slice.
+	// Then assign `queryResult.dataResponse.Frames` the current single frame with that single empty Field.
+	// This assures 1) our visualization doesn't display unwanted empty fields, and also that 2)
+	// additionally-needed frame data stays intact and is correctly passed to our visulization.
 	if frame.Rows() == 0 {
-		queryResult.dataResponse.Frames = data.Frames{}
+		frame.Fields = []*data.Field{}
+		queryResult.dataResponse.Frames = data.Frames{frame}
 		ch <- queryResult
 		return
 	}

From 5ddc37ee21a5a10862ee44604674a4996e6ccd48 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Tue, 9 May 2023 15:29:36 +0100
Subject: [PATCH 716/729] AzureMonitor: Appropriately handle trace correlation
 resources (#67934)

* Appropriately handle correlation resources

- Retrieve resources in buildQueries step
- Build updated queries based off of correlation results
- Update tests

* Fix query building and tests

* Fix lint

* Ensure multiple resource queries will work

- Correctly set resources to ensure there is no overlapping between multiple resource selection and correlated resources
- Add tests for these specific cases
- Remove unnecessary pointers
- Build queries correctly
---
 .../azure-log-analytics-datasource.go         | 102 +++--
 .../azure-log-analytics-datasource_test.go    | 412 ++++++++++++++++--
 2 files changed, 444 insertions(+), 70 deletions(-)

diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
index f1933302893..f48b7dd93a6 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
@@ -59,7 +59,7 @@ func (e *AzureLogAnalyticsDatasource) ResourceRequest(rw http.ResponseWriter, re
 func (e *AzureLogAnalyticsDatasource) ExecuteTimeSeriesQuery(ctx context.Context, logger log.Logger, originalQueries []backend.DataQuery, dsInfo types.DatasourceInfo, client *http.Client, url string, tracer tracing.Tracer) (*backend.QueryDataResponse, error) {
 	result := backend.NewQueryDataResponse()
 	ctxLogger := logger.FromContext(ctx)
-	queries, err := e.buildQueries(ctxLogger, originalQueries, dsInfo)
+	queries, err := e.buildQueries(ctx, ctxLogger, originalQueries, dsInfo, tracer)
 	if err != nil {
 		return nil, err
 	}
@@ -81,7 +81,7 @@ func getApiURL(resourceOrWorkspace string) string {
 	}
 }
 
-func (e *AzureLogAnalyticsDatasource) buildQueries(logger log.Logger, queries []backend.DataQuery, dsInfo types.DatasourceInfo) ([]*AzureLogAnalyticsQuery, error) {
+func (e *AzureLogAnalyticsDatasource) buildQueries(ctx context.Context, logger log.Logger, queries []backend.DataQuery, dsInfo types.DatasourceInfo, tracer tracing.Tracer) ([]*AzureLogAnalyticsQuery, error) {
 	azureLogAnalyticsQueries := []*AzureLogAnalyticsQuery{}
 
 	for _, query := range queries {
@@ -144,20 +144,32 @@ func (e *AzureLogAnalyticsDatasource) buildQueries(logger log.Logger, queries []
 
 			resources = azureTracesTarget.Resources
 			resourceOrWorkspace = azureTracesTarget.Resources[0]
-
-			operationId := ""
-			if queryJSONModel.AzureTraces.OperationId != nil {
-				operationId = *queryJSONModel.AzureTraces.OperationId
+			resourcesMap := make(map[string]bool, 0)
+			if len(resources) > 1 {
+				for _, resource := range resources {
+					resourcesMap[strings.ToLower(resource)] = true
+				}
+				// Remove the base resource as that's where the query is run anyway
+				delete(resourcesMap, strings.ToLower(resourceOrWorkspace))
 			}
 
-			queryString = buildTracesQuery(operationId, queryJSONModel.AzureTraces.TraceTypes, queryJSONModel.AzureTraces.Filters, &resultFormat)
+			operationId := ""
+			if queryJSONModel.AzureTraces.OperationId != nil && *queryJSONModel.AzureTraces.OperationId != "" {
+				operationId = *queryJSONModel.AzureTraces.OperationId
+				resourcesMap, err = getCorrelationWorkspaces(ctx, logger, resourceOrWorkspace, resourcesMap, dsInfo, operationId, tracer)
+				if err != nil {
+					return nil, fmt.Errorf("failed to retrieve correlation resources for operation ID - %s: %s", operationId, err)
+				}
+			}
+
+			queryString = buildTracesQuery(operationId, queryJSONModel.AzureTraces.TraceTypes, queryJSONModel.AzureTraces.Filters, &resultFormat, resourcesMap)
 			traceIdVariable := "${__data.fields.traceID}"
 			if operationId == "" {
-				traceExploreQuery = buildTracesQuery(traceIdVariable, queryJSONModel.AzureTraces.TraceTypes, queryJSONModel.AzureTraces.Filters, nil)
-				traceLogsExploreQuery = buildTracesLogsQuery(&traceIdVariable)
+				traceExploreQuery = buildTracesQuery(traceIdVariable, queryJSONModel.AzureTraces.TraceTypes, queryJSONModel.AzureTraces.Filters, &resultFormat, resourcesMap)
+				traceLogsExploreQuery = buildTracesLogsQuery(traceIdVariable, resourcesMap)
 			} else {
 				traceExploreQuery = queryString
-				traceLogsExploreQuery = buildTracesLogsQuery(&operationId)
+				traceLogsExploreQuery = buildTracesLogsQuery(operationId, resourcesMap)
 			}
 			traceExploreQuery, err = macros.KqlInterpolate(logger, query, dsInfo, traceExploreQuery, "TimeGenerated")
 			if err != nil {
@@ -223,13 +235,6 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
 	}
 
 	if query.QueryType == string(dataquery.AzureQueryTypeAzureTraces) {
-		if queryJSONModel.AzureTraces.OperationId != nil && *queryJSONModel.AzureTraces.OperationId != "" {
-			query, err = getCorrelationWorkspaces(ctx, logger, query, dsInfo, *queryJSONModel.AzureTraces.OperationId, tracer)
-			if err != nil {
-				dataResponse.Error = err
-				return dataResponse
-			}
-		}
 		if dataquery.ResultFormat(query.ResultFormat) == (dataquery.ResultFormatTrace) && query.Query == "" {
 			return dataResponseErrorWithExecuted(fmt.Errorf("cannot visualise trace events using the trace visualiser"))
 		}
@@ -484,9 +489,9 @@ func getTracesQueryUrl(resources []string, azurePortalUrl string) (string, error
 	return portalUrl, nil
 }
 
-func getCorrelationWorkspaces(ctx context.Context, logger log.Logger, query *AzureLogAnalyticsQuery, dsInfo types.DatasourceInfo, operationId string, tracer tracing.Tracer) (*AzureLogAnalyticsQuery, error) {
+func getCorrelationWorkspaces(ctx context.Context, logger log.Logger, baseResource string, resourcesMap map[string]bool, dsInfo types.DatasourceInfo, operationId string, tracer tracing.Tracer) (map[string]bool, error) {
 	azMonService := dsInfo.Services["Azure Monitor"]
-	correlationUrl := azMonService.URL + fmt.Sprintf("%s/providers/microsoft.insights/transactions/%s", query.Resources[0], operationId)
+	correlationUrl := azMonService.URL + fmt.Sprintf("%s/providers/microsoft.insights/transactions/%s", baseResource, operationId)
 
 	callCorrelationAPI := func(url string) (AzureCorrelationAPIResponse, error) {
 		req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewBuffer([]byte{}))
@@ -539,6 +544,12 @@ func getCorrelationWorkspaces(ctx context.Context, logger log.Logger, query *Azu
 			return AzureCorrelationAPIResponse{}, err
 		}
 
+		for _, resource := range data.Properties.Resources {
+			lowerCaseResource := strings.ToLower(resource)
+			if _, ok := resourcesMap[lowerCaseResource]; !ok {
+				resourcesMap[lowerCaseResource] = true
+			}
+		}
 		return data, nil
 	}
 
@@ -547,21 +558,21 @@ func getCorrelationWorkspaces(ctx context.Context, logger log.Logger, query *Azu
 
 	correlationResponse, err := callCorrelationAPI(correlationUrl)
 	if err != nil {
-		return query, err
+		return nil, err
 	}
 	nextLink = correlationResponse.Properties.NextLink
-	query.Resources = correlationResponse.Properties.Resources
 
 	for nextLink != nil {
 		correlationResponse, err := callCorrelationAPI(correlationUrl)
 		if err != nil {
-			return query, err
+			return nil, err
 		}
-		query.Resources = append(query.Resources, correlationResponse.Properties.Resources...)
 		nextLink = correlationResponse.Properties.NextLink
 	}
 
-	return query, nil
+	// Remove the base element as that's where the query is run anyway
+	delete(resourcesMap, strings.ToLower(baseResource))
+	return resourcesMap, nil
 }
 
 // Error definition has been inferred from real data and other model definitions like
@@ -663,7 +674,7 @@ func encodeQuery(rawQuery string) (string, error) {
 	return base64.StdEncoding.EncodeToString(b.Bytes()), nil
 }
 
-func buildTracesQuery(operationId string, traceTypes []string, filters []types.TracesFilters, resultFormat *string) string {
+func buildTracesQuery(operationId string, traceTypes []string, filters []types.TracesFilters, resultFormat *string, resources map[string]bool) string {
 	types := traceTypes
 	if len(types) == 0 {
 		types = Tables
@@ -682,6 +693,19 @@ func buildTracesQuery(operationId string, traceTypes []string, filters []types.T
 		return ""
 	}
 
+	resourcesQuery := strings.Join(filteredTypes, ",")
+	if len(resources) > 0 {
+		intermediate := make([]string, 0)
+		for resource := range resources {
+			resourceSplit := strings.SplitAfter(resource, "/")
+			resourceName := resourceSplit[len(resourceSplit)-1]
+			for _, table := range filteredTypes {
+				intermediate = append(intermediate, fmt.Sprintf("app('%s').%s", resourceName, table))
+			}
+		}
+		resourcesQuery += "," + strings.Join(intermediate, ",")
+	}
+
 	tagsMap := make(map[string]bool)
 	var tags []string
 	for _, t := range filteredTypes {
@@ -731,7 +755,7 @@ func buildTracesQuery(operationId string, traceTypes []string, filters []types.T
 
 	errorProperty := `| extend error = todynamic(iff(itemType == "exception", "true", "false"))`
 
-	baseQuery := fmt.Sprintf(`set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true %s | where $__timeFilter()`, strings.Join(filteredTypes, ","))
+	baseQuery := fmt.Sprintf(`set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true %s`, resourcesQuery)
 	propertiesStaticQuery := `| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 		`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 		`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
@@ -744,9 +768,25 @@ func buildTracesQuery(operationId string, traceTypes []string, filters []types.T
 	return baseQuery + whereClause + propertiesStaticQuery + errorProperty + propertiesQuery + filtersClause + projectClause
 }
 
-func buildTracesLogsQuery(operationId *string) string {
-	tables := `union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults`
-	time := `| where $__timeFilter()`
-	operationIdFilter := fmt.Sprintf(`| where operation_Id == "%s"`, *operationId)
-	return strings.Join([]string{tables, time, operationIdFilter}, " \n")
+func buildTracesLogsQuery(operationId string, resources map[string]bool) string {
+	types := Tables
+	sort.Strings(types)
+	selectors := "union " + strings.Join(types, ",\n") + "\n"
+	if len(resources) > 0 {
+		intermediate := make([]string, 0)
+		for resource := range resources {
+			resourceSplit := strings.SplitAfter(resource, "/")
+			resourceName := resourceSplit[len(resourceSplit)-1]
+			for _, table := range types {
+				intermediate = append(intermediate, fmt.Sprintf("app('%s').%s", resourceName, table))
+			}
+		}
+		sort.Strings(intermediate)
+		types = intermediate
+		selectors = strings.Join(append([]string{"union *"}, types...), ",\n") + "\n"
+	}
+
+	query := selectors
+	query += fmt.Sprintf(`| where operation_Id == "%s"`, operationId)
+	return query
 }
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
index 97b1053dba2..02298dcb7ef 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
@@ -2,15 +2,18 @@ package loganalytics
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
+	"net/http/httptest"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -25,6 +28,71 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 	datasource := &AzureLogAnalyticsDatasource{}
 	fromStart := time.Date(2018, 3, 15, 13, 0, 0, 0, time.UTC).In(time.Local)
 	timeRange := backend.TimeRange{From: fromStart, To: fromStart.Add(34 * time.Minute)}
+	ctx := context.Background()
+	tracer := tracing.InitializeTracerForTest()
+	svr := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		var correlationRes AzureCorrelationAPIResponse
+		if strings.Contains(r.URL.Path, "test-op-id") {
+			correlationRes = AzureCorrelationAPIResponse{
+				ID:   "/subscriptions/r1",
+				Name: "guid-1",
+				Type: "microsoft.insights/transactions",
+				Properties: AzureCorrelationAPIResponseProperties{
+					Resources: []string{
+						"/subscriptions/r1",
+					},
+					NextLink: nil,
+				},
+			}
+		} else if strings.Contains(r.URL.Path, "op-id-multi") {
+			correlationRes = AzureCorrelationAPIResponse{
+				ID:   "/subscriptions/r1",
+				Name: "guid-1",
+				Type: "microsoft.insights/transactions",
+				Properties: AzureCorrelationAPIResponseProperties{
+					Resources: []string{
+						"/subscriptions/r1",
+						"/subscriptions/r2",
+					},
+					NextLink: nil,
+				},
+			}
+		} else if strings.Contains(r.URL.Path, "op-id-non-overlapping") {
+			correlationRes = AzureCorrelationAPIResponse{
+				ID:   "/subscriptions/r1",
+				Name: "guid-1",
+				Type: "microsoft.insights/transactions",
+				Properties: AzureCorrelationAPIResponseProperties{
+					Resources: []string{
+						"/subscriptions/r1",
+						"/subscriptions/r3",
+					},
+					NextLink: nil,
+				},
+			}
+		}
+		err := json.NewEncoder(w).Encode(correlationRes)
+		if err != nil {
+			t.Errorf("failed to encode correlation API response")
+		}
+	}))
+
+	provider := httpclient.NewProvider(httpclient.ProviderOptions{Timeout: &httpclient.DefaultTimeoutOptions})
+	client, err := provider.New()
+	if err != nil {
+		t.Errorf("failed to create fake client")
+	}
+
+	dsInfo := types.DatasourceInfo{
+		Services: map[string]types.DatasourceService{
+			"Azure Monitor": {URL: svr.URL, HTTPClient: client},
+		},
+		JSONData: map[string]interface{}{
+			"azureLogAnalyticsSameAs": false,
+		},
+	}
 
 	tests := []struct {
 		name                     string
@@ -249,7 +317,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 								"operationId":	"test-op-id"
 							}
 						}`, dataquery.ResultFormatTable)),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -264,7 +332,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -276,8 +344,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"test-op-id\"",
 				},
 			},
@@ -313,7 +380,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 								"operationId":	"test-op-id"
 							}
 						}`),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -328,7 +395,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true trace` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -340,8 +407,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"test-op-id\"",
 				},
 			},
@@ -375,7 +441,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 								"resultFormat": "%s"
 							}
 						}`, dataquery.ResultFormatTable)),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
@@ -389,7 +455,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == '${__data.fields.traceID}') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == '${__data.fields.traceID}')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -401,8 +467,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"${__data.fields.traceID}\"",
 				},
 			},
@@ -438,7 +503,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 								"operationId":	"test-op-id"
 							}
 						}`, dataquery.ResultFormatTable)),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -453,7 +518,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -465,8 +530,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"test-op-id\"",
 				},
 			},
@@ -504,7 +568,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "eq"}]
 								}
 							}`, dataquery.ResultFormatTable)),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -520,7 +584,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -533,8 +597,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"test-op-id\"",
 				},
 			},
@@ -572,7 +635,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "ne"}]
 								}
 							}`, dataquery.ResultFormatTable)),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -588,7 +651,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -601,8 +664,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"test-op-id\"",
 				},
 			},
@@ -640,7 +702,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 									"filters":		[{"filters": ["test-app-id"], "property": "appId", "operation": "ne"},{"filters": ["test-client-id"], "property": "clientId", "operation": "eq"}]
 							}
 						}`, dataquery.ResultFormatTable)),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -656,7 +718,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -669,8 +731,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"test-op-id\"",
 				},
 			},
@@ -704,7 +765,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 								"resultFormat": "%s"
 							}
 						}`, dataquery.ResultFormatTrace)),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
@@ -718,7 +779,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,traces | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests` +
 						`| where (operation_Id != '' and operation_Id == '${__data.fields.traceID}') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == '${__data.fields.traceID}')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -730,8 +791,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"${__data.fields.traceID}\"",
 				},
 			},
@@ -767,7 +827,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 								"resultFormat": "%s"
 							}
 						}`, dataquery.ResultFormatTrace)),
-					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -782,7 +842,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					Resources: []string{"/subscriptions/r1"},
 					TimeRange: timeRange,
 					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
-					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests | where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z')` +
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests` +
 						`| where (operation_Id != '' and operation_Id == 'test-op-id') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'test-op-id')` +
 						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
@@ -794,8 +854,7 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"test-op-id\"",
 				},
 			},
@@ -838,18 +897,293 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 					TimeRange:         timeRange,
 					QueryType:         string(dataquery.AzureQueryTypeAzureTraces),
 					TraceExploreQuery: "",
-					TraceLogsExploreQuery: "union *, traces, customEvents, pageViews, requests, dependencies, exceptions, customMetrics, availabilityResults \n" +
-						"| where ['timestamp'] >= datetime('2018-03-15T13:00:00Z') and ['timestamp'] <= datetime('2018-03-15T13:34:00Z') \n" +
+					TraceLogsExploreQuery: "union availabilityResults,\n" + "customEvents,\n" + "dependencies,\n" + "exceptions,\n" + "pageViews,\n" + "requests,\n" + "traces\n" +
 						"| where operation_Id == \"test-op-id\"",
 				},
 			},
 			Err: require.NoError,
 		},
+		{
+			name: "trace query with operation ID and correlated workspaces",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"op-id-multi",
+								"resources":    ["/subscriptions/r1"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTrace),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"op-id-multi",
+								"resources":    ["/subscriptions/r1"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,app('r2').availabilityResults,app('r2').customEvents,app('r2').dependencies,app('r2').exceptions,app('r2').pageViews,app('r2').requests` +
+						`| where (operation_Id != '' and operation_Id == 'op-id-multi') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'op-id-multi')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,app('r2').availabilityResults,app('r2').customEvents,app('r2').dependencies,app('r2').exceptions,app('r2').pageViews,app('r2').requests` +
+						`| where (operation_Id != '' and operation_Id == 'op-id-multi') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'op-id-multi')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *,\n" +
+						"app('r2').availabilityResults,\n" +
+						"app('r2').customEvents,\n" +
+						"app('r2').dependencies,\n" +
+						"app('r2').exceptions,\n" +
+						"app('r2').pageViews,\n" +
+						"app('r2').requests,\n" +
+						"app('r2').traces\n" +
+						"| where operation_Id == \"op-id-multi\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with multiple resources",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":    ["/subscriptions/r1", "/subscriptions/r2"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTrace),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"resources":    ["/subscriptions/r1", "/subscriptions/r2"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,app('r2').availabilityResults,app('r2').customEvents,app('r2').dependencies,app('r2').exceptions,app('r2').pageViews,app('r2').requests` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1", "/subscriptions/r2"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,app('r2').availabilityResults,app('r2').customEvents,app('r2').dependencies,app('r2').exceptions,app('r2').pageViews,app('r2').requests` +
+						`| where (operation_Id != '' and operation_Id == '${__data.fields.traceID}') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == '${__data.fields.traceID}')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *,\n" +
+						"app('r2').availabilityResults,\n" +
+						"app('r2').customEvents,\n" +
+						"app('r2').dependencies,\n" +
+						"app('r2').exceptions,\n" +
+						"app('r2').pageViews,\n" +
+						"app('r2').requests,\n" +
+						"app('r2').traces\n" +
+						"| where operation_Id == \"${__data.fields.traceID}\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with multiple resources and overlapping correlated workspaces",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"op-id-multi",
+								"resources":    ["/subscriptions/r1", "/subscriptions/r2"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTrace),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"op-id-multi",
+								"resources":    ["/subscriptions/r1", "/subscriptions/r2"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,app('r2').availabilityResults,app('r2').customEvents,app('r2').dependencies,app('r2').exceptions,app('r2').pageViews,app('r2').requests` +
+						`| where (operation_Id != '' and operation_Id == 'op-id-multi') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'op-id-multi')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1", "/subscriptions/r2"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,app('r2').availabilityResults,app('r2').customEvents,app('r2').dependencies,app('r2').exceptions,app('r2').pageViews,app('r2').requests` +
+						`| where (operation_Id != '' and operation_Id == 'op-id-multi') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'op-id-multi')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *,\n" +
+						"app('r2').availabilityResults,\n" +
+						"app('r2').customEvents,\n" +
+						"app('r2').dependencies,\n" +
+						"app('r2').exceptions,\n" +
+						"app('r2').pageViews,\n" +
+						"app('r2').requests,\n" +
+						"app('r2').traces\n" +
+						"| where operation_Id == \"op-id-multi\"",
+				},
+			},
+			Err: require.NoError,
+		},
+		{
+			name: "trace query with multiple resources and non-overlapping correlated workspaces",
+			queryModel: []backend.DataQuery{
+				{
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"op-id-non-overlapping",
+								"resources":    ["/subscriptions/r1", "/subscriptions/r2"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					RefID:     "A",
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+				},
+			},
+			azureLogAnalyticsQueries: []*AzureLogAnalyticsQuery{
+				{
+					RefID:        "A",
+					ResultFormat: string(dataquery.ResultFormatTrace),
+					URL:          "v1/subscriptions/r1/query",
+					JSON: []byte(fmt.Sprintf(`{
+							"queryType": "Azure Traces",
+							"azureTraces": {
+								"operationId": 	"op-id-non-overlapping",
+								"resources":    ["/subscriptions/r1", "/subscriptions/r2"],
+								"resultFormat": "%s"
+							}
+						}`, dataquery.ResultFormatTrace)),
+					Query: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,app('r2').availabilityResults,app('r2').customEvents,app('r2').dependencies,app('r2').exceptions,app('r2').pageViews,app('r2').requests,app('r3').availabilityResults,app('r3').customEvents,app('r3').dependencies,app('r3').exceptions,app('r3').pageViews,app('r3').requests` +
+						`| where (operation_Id != '' and operation_Id == 'op-id-non-overlapping') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'op-id-non-overlapping')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					Resources: []string{"/subscriptions/r1", "/subscriptions/r2"},
+					TimeRange: timeRange,
+					QueryType: string(dataquery.AzureQueryTypeAzureTraces),
+					TraceExploreQuery: `set truncationmaxrecords=10000; set truncationmaxsize=67108864; union isfuzzy=true availabilityResults,customEvents,dependencies,exceptions,pageViews,requests,app('r2').availabilityResults,app('r2').customEvents,app('r2').dependencies,app('r2').exceptions,app('r2').pageViews,app('r2').requests,app('r3').availabilityResults,app('r3').customEvents,app('r3').dependencies,app('r3').exceptions,app('r3').pageViews,app('r3').requests` +
+						`| where (operation_Id != '' and operation_Id == 'op-id-non-overlapping') or (customDimensions.ai_legacyRootId != '' and customDimensions.ai_legacyRootId == 'op-id-non-overlapping')` +
+						`| extend duration = iff(isnull(column_ifexists("duration", real(null))), toreal(0), column_ifexists("duration", real(null)))` +
+						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
+						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
+						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
+						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
+						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
+						`| order by startTime asc`,
+					TraceLogsExploreQuery: "union *,\n" +
+						"app('r2').availabilityResults,\n" +
+						"app('r2').customEvents,\n" +
+						"app('r2').dependencies,\n" +
+						"app('r2').exceptions,\n" +
+						"app('r2').pageViews,\n" +
+						"app('r2').requests,\n" +
+						"app('r2').traces,\n" +
+						"app('r3').availabilityResults,\n" +
+						"app('r3').customEvents,\n" +
+						"app('r3').dependencies,\n" +
+						"app('r3').exceptions,\n" +
+						"app('r3').pageViews,\n" +
+						"app('r3').requests,\n" +
+						"app('r3').traces\n" +
+						"| where operation_Id == \"op-id-non-overlapping\"",
+				},
+			},
+			Err: require.NoError,
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			queries, err := datasource.buildQueries(logger, tt.queryModel, types.DatasourceInfo{})
+			queries, err := datasource.buildQueries(ctx, logger, tt.queryModel, dsInfo, tracer)
 			tt.Err(t, err)
 			if diff := cmp.Diff(tt.azureLogAnalyticsQueries[0], queries[0]); diff != "" {
 				t.Errorf("Result mismatch (-want +got): \n%s", diff)

From 18d4fda6132ec5ec4d7de32e3e425c702a8845b5 Mon Sep 17 00:00:00 2001
From: Andriy <andriy.urbanas@grafana.com>
Date: Tue, 9 May 2023 16:58:10 +0200
Subject: [PATCH 717/729] Fix Enterprise Datasources link on Grafana Enterprise
 page (#67962)

fix-enterprise-datasources-link
---
 docs/sources/introduction/grafana-enterprise.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/introduction/grafana-enterprise.md b/docs/sources/introduction/grafana-enterprise.md
index be9b0f590dd..b70735815ec 100644
--- a/docs/sources/introduction/grafana-enterprise.md
+++ b/docs/sources/introduction/grafana-enterprise.md
@@ -13,7 +13,7 @@ weight: 200
 
 Grafana Enterprise is a commercial edition of Grafana that includes additional features not found in the open source version.
 
-Building on everything you already know and love about Grafana open source, Grafana Enterprise includes [exclusive datasource plugins]({{< relref "#enterprise-plugins">}}) and [additional features]({{< relref "#enterprise-features">}}). You also get 24x7x365 support and training from the core Grafana team.
+Building on everything you already know and love about Grafana open source, Grafana Enterprise includes [exclusive datasource plugins]({{< relref "#enterprise-data-sources">}}) and [additional features]({{< relref "#enterprise-features">}}). You also get 24x7x365 support and training from the core Grafana team.
 
 To learn more about Grafana Enterprise, refer to [our product page](https://grafana.com/enterprise).
 

From 5d047160e9422dd4377bcd4cf63876677b0bf6c0 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Tue, 9 May 2023 17:58:15 +0200
Subject: [PATCH 718/729] Alerting: Update contact point state semantics
 (#67994)

---
 .../src/components/Icon/cached.json           |   1 +
 .../src/components/Icon/iconBundle.ts         | 422 +++++++++---------
 .../features/alerting/unified/Receivers.tsx   |  19 +-
 .../components/receivers/ReceiversTable.tsx   |  51 ++-
 4 files changed, 252 insertions(+), 241 deletions(-)

diff --git a/packages/grafana-ui/src/components/Icon/cached.json b/packages/grafana-ui/src/components/Icon/cached.json
index 4f62efd4552..781f0d9c845 100644
--- a/packages/grafana-ui/src/components/Icon/cached.json
+++ b/packages/grafana-ui/src/components/Icon/cached.json
@@ -60,6 +60,7 @@
   "unicons/ellipsis-h",
   "unicons/envelope",
   "unicons/exchange-alt",
+  "unicons/exclamation-circle",
   "unicons/exclamation-triangle",
   "unicons/external-link-alt",
   "unicons/eye",
diff --git a/packages/grafana-ui/src/components/Icon/iconBundle.ts b/packages/grafana-ui/src/components/Icon/iconBundle.ts
index 24682bce731..675871f8201 100644
--- a/packages/grafana-ui/src/components/Icon/iconBundle.ts
+++ b/packages/grafana-ui/src/components/Icon/iconBundle.ts
@@ -68,111 +68,112 @@ import u1057 from '../../../../../public/img/icons/unicons/ellipsis-v.svg';
 import u1058 from '../../../../../public/img/icons/unicons/ellipsis-h.svg';
 import u1059 from '../../../../../public/img/icons/unicons/envelope.svg';
 import u1060 from '../../../../../public/img/icons/unicons/exchange-alt.svg';
-import u1061 from '../../../../../public/img/icons/unicons/exclamation-triangle.svg';
-import u1062 from '../../../../../public/img/icons/unicons/external-link-alt.svg';
-import u1063 from '../../../../../public/img/icons/unicons/eye.svg';
-import u1064 from '../../../../../public/img/icons/unicons/eye-slash.svg';
-import u1065 from '../../../../../public/img/icons/unicons/file-alt.svg';
-import u1066 from '../../../../../public/img/icons/unicons/file-blank.svg';
-import u1067 from '../../../../../public/img/icons/unicons/filter.svg';
-import u1068 from '../../../../../public/img/icons/unicons/folder.svg';
-import u1069 from '../../../../../public/img/icons/unicons/folder-open.svg';
-import u1070 from '../../../../../public/img/icons/unicons/folder-plus.svg';
-import u1071 from '../../../../../public/img/icons/unicons/folder-upload.svg';
-import u1072 from '../../../../../public/img/icons/unicons/forward.svg';
-import u1073 from '../../../../../public/img/icons/unicons/graph-bar.svg';
-import u1074 from '../../../../../public/img/icons/unicons/history.svg';
-import u1075 from '../../../../../public/img/icons/unicons/home-alt.svg';
-import u1076 from '../../../../../public/img/icons/unicons/import.svg';
-import u1077 from '../../../../../public/img/icons/unicons/info.svg';
-import u1078 from '../../../../../public/img/icons/unicons/info-circle.svg';
-import u1079 from '../../../../../public/img/icons/unicons/k6.svg';
-import u1080 from '../../../../../public/img/icons/unicons/key-skeleton-alt.svg';
-import u1081 from '../../../../../public/img/icons/unicons/keyboard.svg';
-import u1082 from '../../../../../public/img/icons/unicons/link.svg';
-import u1083 from '../../../../../public/img/icons/unicons/list-ul.svg';
-import u1084 from '../../../../../public/img/icons/unicons/lock.svg';
-import u1085 from '../../../../../public/img/icons/unicons/minus.svg';
-import u1086 from '../../../../../public/img/icons/unicons/minus-circle.svg';
-import u1087 from '../../../../../public/img/icons/unicons/mobile-android.svg';
-import u1088 from '../../../../../public/img/icons/unicons/monitor.svg';
-import u1089 from '../../../../../public/img/icons/unicons/pause.svg';
-import u1090 from '../../../../../public/img/icons/unicons/pen.svg';
-import u1091 from '../../../../../public/img/icons/unicons/play.svg';
-import u1092 from '../../../../../public/img/icons/unicons/plug.svg';
-import u1093 from '../../../../../public/img/icons/unicons/plus.svg';
-import u1094 from '../../../../../public/img/icons/unicons/plus-circle.svg';
-import u1095 from '../../../../../public/img/icons/unicons/power.svg';
-import u1096 from '../../../../../public/img/icons/unicons/presentation-play.svg';
-import u1097 from '../../../../../public/img/icons/unicons/process.svg';
-import u1098 from '../../../../../public/img/icons/unicons/question-circle.svg';
-import u1099 from '../../../../../public/img/icons/unicons/repeat.svg';
-import u1100 from '../../../../../public/img/icons/unicons/rocket.svg';
-import u1101 from '../../../../../public/img/icons/unicons/rss.svg';
-import u1102 from '../../../../../public/img/icons/unicons/save.svg';
-import u1103 from '../../../../../public/img/icons/unicons/search.svg';
-import u1104 from '../../../../../public/img/icons/unicons/search-minus.svg';
-import u1105 from '../../../../../public/img/icons/unicons/search-plus.svg';
-import u1106 from '../../../../../public/img/icons/unicons/share-alt.svg';
-import u1107 from '../../../../../public/img/icons/unicons/shield.svg';
-import u1108 from '../../../../../public/img/icons/unicons/signal.svg';
-import u1109 from '../../../../../public/img/icons/unicons/signin.svg';
-import u1110 from '../../../../../public/img/icons/unicons/signout.svg';
-import u1111 from '../../../../../public/img/icons/unicons/sitemap.svg';
-import u1112 from '../../../../../public/img/icons/unicons/slack.svg';
-import u1113 from '../../../../../public/img/icons/unicons/sliders-v-alt.svg';
-import u1114 from '../../../../../public/img/icons/unicons/sort-amount-down.svg';
-import u1115 from '../../../../../public/img/icons/unicons/sort-amount-up.svg';
-import u1116 from '../../../../../public/img/icons/unicons/square-shape.svg';
-import u1117 from '../../../../../public/img/icons/unicons/star.svg';
-import u1118 from '../../../../../public/img/icons/unicons/step-backward.svg';
-import u1119 from '../../../../../public/img/icons/unicons/sync.svg';
-import u1120 from '../../../../../public/img/icons/unicons/table.svg';
-import u1121 from '../../../../../public/img/icons/unicons/tag-alt.svg';
-import u1122 from '../../../../../public/img/icons/unicons/times.svg';
-import u1123 from '../../../../../public/img/icons/unicons/trash-alt.svg';
-import u1124 from '../../../../../public/img/icons/unicons/unlock.svg';
-import u1125 from '../../../../../public/img/icons/unicons/upload.svg';
-import u1126 from '../../../../../public/img/icons/unicons/user.svg';
-import u1127 from '../../../../../public/img/icons/unicons/users-alt.svg';
-import u1128 from '../../../../../public/img/icons/unicons/wrap-text.svg';
-import u1129 from '../../../../../public/img/icons/unicons/cloud-upload.svg';
-import u1130 from '../../../../../public/img/icons/unicons/credit-card.svg';
-import u1131 from '../../../../../public/img/icons/unicons/file-copy-alt.svg';
-import u1132 from '../../../../../public/img/icons/unicons/fire.svg';
-import u1133 from '../../../../../public/img/icons/unicons/hourglass.svg';
-import u1134 from '../../../../../public/img/icons/unicons/layer-group.svg';
-import u1135 from '../../../../../public/img/icons/unicons/layers-alt.svg';
-import u1136 from '../../../../../public/img/icons/unicons/line-alt.svg';
-import u1137 from '../../../../../public/img/icons/unicons/list-ui-alt.svg';
-import u1138 from '../../../../../public/img/icons/unicons/message.svg';
-import u1139 from '../../../../../public/img/icons/unicons/palette.svg';
-import u1140 from '../../../../../public/img/icons/unicons/percentage.svg';
-import u1141 from '../../../../../public/img/icons/unicons/shield-exclamation.svg';
-import u1142 from '../../../../../public/img/icons/unicons/plus-square.svg';
-import u1143 from '../../../../../public/img/icons/unicons/x.svg';
-import u1144 from '../../../../../public/img/icons/unicons/capture.svg';
-import u1145 from '../../../../../public/img/icons/custom/gf-grid.svg';
-import u1146 from '../../../../../public/img/icons/custom/gf-landscape.svg';
-import u1147 from '../../../../../public/img/icons/custom/gf-layout-simple.svg';
-import u1148 from '../../../../../public/img/icons/custom/gf-portrait.svg';
-import u1149 from '../../../../../public/img/icons/custom/gf-bar-alignment-after.svg';
-import u1150 from '../../../../../public/img/icons/custom/gf-bar-alignment-before.svg';
-import u1151 from '../../../../../public/img/icons/custom/gf-bar-alignment-center.svg';
-import u1152 from '../../../../../public/img/icons/custom/gf-interpolation-linear.svg';
-import u1153 from '../../../../../public/img/icons/custom/gf-interpolation-smooth.svg';
-import u1154 from '../../../../../public/img/icons/custom/gf-interpolation-step-after.svg';
-import u1155 from '../../../../../public/img/icons/custom/gf-interpolation-step-before.svg';
-import u1156 from '../../../../../public/img/icons/custom/gf-logs.svg';
-import u1157 from '../../../../../public/img/icons/custom/gf-movepane-left.svg';
-import u1158 from '../../../../../public/img/icons/custom/gf-movepane-right.svg';
-import u1159 from '../../../../../public/img/icons/mono/favorite.svg';
-import u1160 from '../../../../../public/img/icons/mono/grafana.svg';
-import u1161 from '../../../../../public/img/icons/mono/heart.svg';
-import u1162 from '../../../../../public/img/icons/mono/heart-break.svg';
-import u1163 from '../../../../../public/img/icons/mono/panel-add.svg';
-import u1164 from '../../../../../public/img/icons/mono/library-panel.svg';
-import u1165 from '../../../../../public/img/icons/unicons/record-audio.svg';
+import u1061 from '../../../../../public/img/icons/unicons/exclamation-circle.svg';
+import u1062 from '../../../../../public/img/icons/unicons/exclamation-triangle.svg';
+import u1063 from '../../../../../public/img/icons/unicons/external-link-alt.svg';
+import u1064 from '../../../../../public/img/icons/unicons/eye.svg';
+import u1065 from '../../../../../public/img/icons/unicons/eye-slash.svg';
+import u1066 from '../../../../../public/img/icons/unicons/file-alt.svg';
+import u1067 from '../../../../../public/img/icons/unicons/file-blank.svg';
+import u1068 from '../../../../../public/img/icons/unicons/filter.svg';
+import u1069 from '../../../../../public/img/icons/unicons/folder.svg';
+import u1070 from '../../../../../public/img/icons/unicons/folder-open.svg';
+import u1071 from '../../../../../public/img/icons/unicons/folder-plus.svg';
+import u1072 from '../../../../../public/img/icons/unicons/folder-upload.svg';
+import u1073 from '../../../../../public/img/icons/unicons/forward.svg';
+import u1074 from '../../../../../public/img/icons/unicons/graph-bar.svg';
+import u1075 from '../../../../../public/img/icons/unicons/history.svg';
+import u1076 from '../../../../../public/img/icons/unicons/home-alt.svg';
+import u1077 from '../../../../../public/img/icons/unicons/import.svg';
+import u1078 from '../../../../../public/img/icons/unicons/info.svg';
+import u1079 from '../../../../../public/img/icons/unicons/info-circle.svg';
+import u1080 from '../../../../../public/img/icons/unicons/k6.svg';
+import u1081 from '../../../../../public/img/icons/unicons/key-skeleton-alt.svg';
+import u1082 from '../../../../../public/img/icons/unicons/keyboard.svg';
+import u1083 from '../../../../../public/img/icons/unicons/link.svg';
+import u1084 from '../../../../../public/img/icons/unicons/list-ul.svg';
+import u1085 from '../../../../../public/img/icons/unicons/lock.svg';
+import u1086 from '../../../../../public/img/icons/unicons/minus.svg';
+import u1087 from '../../../../../public/img/icons/unicons/minus-circle.svg';
+import u1088 from '../../../../../public/img/icons/unicons/mobile-android.svg';
+import u1089 from '../../../../../public/img/icons/unicons/monitor.svg';
+import u1090 from '../../../../../public/img/icons/unicons/pause.svg';
+import u1091 from '../../../../../public/img/icons/unicons/pen.svg';
+import u1092 from '../../../../../public/img/icons/unicons/play.svg';
+import u1093 from '../../../../../public/img/icons/unicons/plug.svg';
+import u1094 from '../../../../../public/img/icons/unicons/plus.svg';
+import u1095 from '../../../../../public/img/icons/unicons/plus-circle.svg';
+import u1096 from '../../../../../public/img/icons/unicons/power.svg';
+import u1097 from '../../../../../public/img/icons/unicons/presentation-play.svg';
+import u1098 from '../../../../../public/img/icons/unicons/process.svg';
+import u1099 from '../../../../../public/img/icons/unicons/question-circle.svg';
+import u1100 from '../../../../../public/img/icons/unicons/repeat.svg';
+import u1101 from '../../../../../public/img/icons/unicons/rocket.svg';
+import u1102 from '../../../../../public/img/icons/unicons/rss.svg';
+import u1103 from '../../../../../public/img/icons/unicons/save.svg';
+import u1104 from '../../../../../public/img/icons/unicons/search.svg';
+import u1105 from '../../../../../public/img/icons/unicons/search-minus.svg';
+import u1106 from '../../../../../public/img/icons/unicons/search-plus.svg';
+import u1107 from '../../../../../public/img/icons/unicons/share-alt.svg';
+import u1108 from '../../../../../public/img/icons/unicons/shield.svg';
+import u1109 from '../../../../../public/img/icons/unicons/signal.svg';
+import u1110 from '../../../../../public/img/icons/unicons/signin.svg';
+import u1111 from '../../../../../public/img/icons/unicons/signout.svg';
+import u1112 from '../../../../../public/img/icons/unicons/sitemap.svg';
+import u1113 from '../../../../../public/img/icons/unicons/slack.svg';
+import u1114 from '../../../../../public/img/icons/unicons/sliders-v-alt.svg';
+import u1115 from '../../../../../public/img/icons/unicons/sort-amount-down.svg';
+import u1116 from '../../../../../public/img/icons/unicons/sort-amount-up.svg';
+import u1117 from '../../../../../public/img/icons/unicons/square-shape.svg';
+import u1118 from '../../../../../public/img/icons/unicons/star.svg';
+import u1119 from '../../../../../public/img/icons/unicons/step-backward.svg';
+import u1120 from '../../../../../public/img/icons/unicons/sync.svg';
+import u1121 from '../../../../../public/img/icons/unicons/table.svg';
+import u1122 from '../../../../../public/img/icons/unicons/tag-alt.svg';
+import u1123 from '../../../../../public/img/icons/unicons/times.svg';
+import u1124 from '../../../../../public/img/icons/unicons/trash-alt.svg';
+import u1125 from '../../../../../public/img/icons/unicons/unlock.svg';
+import u1126 from '../../../../../public/img/icons/unicons/upload.svg';
+import u1127 from '../../../../../public/img/icons/unicons/user.svg';
+import u1128 from '../../../../../public/img/icons/unicons/users-alt.svg';
+import u1129 from '../../../../../public/img/icons/unicons/wrap-text.svg';
+import u1130 from '../../../../../public/img/icons/unicons/cloud-upload.svg';
+import u1131 from '../../../../../public/img/icons/unicons/credit-card.svg';
+import u1132 from '../../../../../public/img/icons/unicons/file-copy-alt.svg';
+import u1133 from '../../../../../public/img/icons/unicons/fire.svg';
+import u1134 from '../../../../../public/img/icons/unicons/hourglass.svg';
+import u1135 from '../../../../../public/img/icons/unicons/layer-group.svg';
+import u1136 from '../../../../../public/img/icons/unicons/layers-alt.svg';
+import u1137 from '../../../../../public/img/icons/unicons/line-alt.svg';
+import u1138 from '../../../../../public/img/icons/unicons/list-ui-alt.svg';
+import u1139 from '../../../../../public/img/icons/unicons/message.svg';
+import u1140 from '../../../../../public/img/icons/unicons/palette.svg';
+import u1141 from '../../../../../public/img/icons/unicons/percentage.svg';
+import u1142 from '../../../../../public/img/icons/unicons/shield-exclamation.svg';
+import u1143 from '../../../../../public/img/icons/unicons/plus-square.svg';
+import u1144 from '../../../../../public/img/icons/unicons/x.svg';
+import u1145 from '../../../../../public/img/icons/unicons/capture.svg';
+import u1146 from '../../../../../public/img/icons/custom/gf-grid.svg';
+import u1147 from '../../../../../public/img/icons/custom/gf-landscape.svg';
+import u1148 from '../../../../../public/img/icons/custom/gf-layout-simple.svg';
+import u1149 from '../../../../../public/img/icons/custom/gf-portrait.svg';
+import u1150 from '../../../../../public/img/icons/custom/gf-bar-alignment-after.svg';
+import u1151 from '../../../../../public/img/icons/custom/gf-bar-alignment-before.svg';
+import u1152 from '../../../../../public/img/icons/custom/gf-bar-alignment-center.svg';
+import u1153 from '../../../../../public/img/icons/custom/gf-interpolation-linear.svg';
+import u1154 from '../../../../../public/img/icons/custom/gf-interpolation-smooth.svg';
+import u1155 from '../../../../../public/img/icons/custom/gf-interpolation-step-after.svg';
+import u1156 from '../../../../../public/img/icons/custom/gf-interpolation-step-before.svg';
+import u1157 from '../../../../../public/img/icons/custom/gf-logs.svg';
+import u1158 from '../../../../../public/img/icons/custom/gf-movepane-left.svg';
+import u1159 from '../../../../../public/img/icons/custom/gf-movepane-right.svg';
+import u1160 from '../../../../../public/img/icons/mono/favorite.svg';
+import u1161 from '../../../../../public/img/icons/mono/grafana.svg';
+import u1162 from '../../../../../public/img/icons/mono/heart.svg';
+import u1163 from '../../../../../public/img/icons/mono/heart-break.svg';
+import u1164 from '../../../../../public/img/icons/mono/panel-add.svg';
+import u1165 from '../../../../../public/img/icons/mono/library-panel.svg';
+import u1166 from '../../../../../public/img/icons/unicons/record-audio.svg';
 // do not edit this list directly
 // the list of icons live here: @grafana/ui/components/Icon/cached.json
 
@@ -256,111 +257,112 @@ export function initIconCache() {
   cacheItem(u1058, 'unicons/ellipsis-h.svg');
   cacheItem(u1059, 'unicons/envelope.svg');
   cacheItem(u1060, 'unicons/exchange-alt.svg');
-  cacheItem(u1061, 'unicons/exclamation-triangle.svg');
-  cacheItem(u1062, 'unicons/external-link-alt.svg');
-  cacheItem(u1063, 'unicons/eye.svg');
-  cacheItem(u1064, 'unicons/eye-slash.svg');
-  cacheItem(u1065, 'unicons/file-alt.svg');
-  cacheItem(u1066, 'unicons/file-blank.svg');
-  cacheItem(u1067, 'unicons/filter.svg');
-  cacheItem(u1068, 'unicons/folder.svg');
-  cacheItem(u1069, 'unicons/folder-open.svg');
-  cacheItem(u1070, 'unicons/folder-plus.svg');
-  cacheItem(u1071, 'unicons/folder-upload.svg');
-  cacheItem(u1072, 'unicons/forward.svg');
-  cacheItem(u1073, 'unicons/graph-bar.svg');
-  cacheItem(u1074, 'unicons/history.svg');
-  cacheItem(u1075, 'unicons/home-alt.svg');
-  cacheItem(u1076, 'unicons/import.svg');
-  cacheItem(u1077, 'unicons/info.svg');
-  cacheItem(u1078, 'unicons/info-circle.svg');
-  cacheItem(u1079, 'unicons/k6.svg');
-  cacheItem(u1080, 'unicons/key-skeleton-alt.svg');
-  cacheItem(u1081, 'unicons/keyboard.svg');
-  cacheItem(u1082, 'unicons/link.svg');
-  cacheItem(u1083, 'unicons/list-ul.svg');
-  cacheItem(u1084, 'unicons/lock.svg');
-  cacheItem(u1085, 'unicons/minus.svg');
-  cacheItem(u1086, 'unicons/minus-circle.svg');
-  cacheItem(u1087, 'unicons/mobile-android.svg');
-  cacheItem(u1088, 'unicons/monitor.svg');
-  cacheItem(u1089, 'unicons/pause.svg');
-  cacheItem(u1090, 'unicons/pen.svg');
-  cacheItem(u1091, 'unicons/play.svg');
-  cacheItem(u1092, 'unicons/plug.svg');
-  cacheItem(u1093, 'unicons/plus.svg');
-  cacheItem(u1094, 'unicons/plus-circle.svg');
-  cacheItem(u1095, 'unicons/power.svg');
-  cacheItem(u1096, 'unicons/presentation-play.svg');
-  cacheItem(u1097, 'unicons/process.svg');
-  cacheItem(u1098, 'unicons/question-circle.svg');
-  cacheItem(u1099, 'unicons/repeat.svg');
-  cacheItem(u1100, 'unicons/rocket.svg');
-  cacheItem(u1101, 'unicons/rss.svg');
-  cacheItem(u1102, 'unicons/save.svg');
-  cacheItem(u1103, 'unicons/search.svg');
-  cacheItem(u1104, 'unicons/search-minus.svg');
-  cacheItem(u1105, 'unicons/search-plus.svg');
-  cacheItem(u1106, 'unicons/share-alt.svg');
-  cacheItem(u1107, 'unicons/shield.svg');
-  cacheItem(u1108, 'unicons/signal.svg');
-  cacheItem(u1109, 'unicons/signin.svg');
-  cacheItem(u1110, 'unicons/signout.svg');
-  cacheItem(u1111, 'unicons/sitemap.svg');
-  cacheItem(u1112, 'unicons/slack.svg');
-  cacheItem(u1113, 'unicons/sliders-v-alt.svg');
-  cacheItem(u1114, 'unicons/sort-amount-down.svg');
-  cacheItem(u1115, 'unicons/sort-amount-up.svg');
-  cacheItem(u1116, 'unicons/square-shape.svg');
-  cacheItem(u1117, 'unicons/star.svg');
-  cacheItem(u1118, 'unicons/step-backward.svg');
-  cacheItem(u1119, 'unicons/sync.svg');
-  cacheItem(u1120, 'unicons/table.svg');
-  cacheItem(u1121, 'unicons/tag-alt.svg');
-  cacheItem(u1122, 'unicons/times.svg');
-  cacheItem(u1123, 'unicons/trash-alt.svg');
-  cacheItem(u1124, 'unicons/unlock.svg');
-  cacheItem(u1125, 'unicons/upload.svg');
-  cacheItem(u1126, 'unicons/user.svg');
-  cacheItem(u1127, 'unicons/users-alt.svg');
-  cacheItem(u1128, 'unicons/wrap-text.svg');
-  cacheItem(u1129, 'unicons/cloud-upload.svg');
-  cacheItem(u1130, 'unicons/credit-card.svg');
-  cacheItem(u1131, 'unicons/file-copy-alt.svg');
-  cacheItem(u1132, 'unicons/fire.svg');
-  cacheItem(u1133, 'unicons/hourglass.svg');
-  cacheItem(u1134, 'unicons/layer-group.svg');
-  cacheItem(u1135, 'unicons/layers-alt.svg');
-  cacheItem(u1136, 'unicons/line-alt.svg');
-  cacheItem(u1137, 'unicons/list-ui-alt.svg');
-  cacheItem(u1138, 'unicons/message.svg');
-  cacheItem(u1139, 'unicons/palette.svg');
-  cacheItem(u1140, 'unicons/percentage.svg');
-  cacheItem(u1141, 'unicons/shield-exclamation.svg');
-  cacheItem(u1142, 'unicons/plus-square.svg');
-  cacheItem(u1143, 'unicons/x.svg');
-  cacheItem(u1144, 'unicons/capture.svg');
-  cacheItem(u1145, 'custom/gf-grid.svg');
-  cacheItem(u1146, 'custom/gf-landscape.svg');
-  cacheItem(u1147, 'custom/gf-layout-simple.svg');
-  cacheItem(u1148, 'custom/gf-portrait.svg');
-  cacheItem(u1149, 'custom/gf-bar-alignment-after.svg');
-  cacheItem(u1150, 'custom/gf-bar-alignment-before.svg');
-  cacheItem(u1151, 'custom/gf-bar-alignment-center.svg');
-  cacheItem(u1152, 'custom/gf-interpolation-linear.svg');
-  cacheItem(u1153, 'custom/gf-interpolation-smooth.svg');
-  cacheItem(u1154, 'custom/gf-interpolation-step-after.svg');
-  cacheItem(u1155, 'custom/gf-interpolation-step-before.svg');
-  cacheItem(u1156, 'custom/gf-logs.svg');
-  cacheItem(u1157, 'custom/gf-movepane-left.svg');
-  cacheItem(u1158, 'custom/gf-movepane-right.svg');
-  cacheItem(u1159, 'mono/favorite.svg');
-  cacheItem(u1160, 'mono/grafana.svg');
-  cacheItem(u1161, 'mono/heart.svg');
-  cacheItem(u1162, 'mono/heart-break.svg');
-  cacheItem(u1163, 'mono/panel-add.svg');
-  cacheItem(u1164, 'mono/library-panel.svg');
-  cacheItem(u1165, 'unicons/record-audio.svg');
+  cacheItem(u1061, 'unicons/exclamation-circle.svg');
+  cacheItem(u1062, 'unicons/exclamation-triangle.svg');
+  cacheItem(u1063, 'unicons/external-link-alt.svg');
+  cacheItem(u1064, 'unicons/eye.svg');
+  cacheItem(u1065, 'unicons/eye-slash.svg');
+  cacheItem(u1066, 'unicons/file-alt.svg');
+  cacheItem(u1067, 'unicons/file-blank.svg');
+  cacheItem(u1068, 'unicons/filter.svg');
+  cacheItem(u1069, 'unicons/folder.svg');
+  cacheItem(u1070, 'unicons/folder-open.svg');
+  cacheItem(u1071, 'unicons/folder-plus.svg');
+  cacheItem(u1072, 'unicons/folder-upload.svg');
+  cacheItem(u1073, 'unicons/forward.svg');
+  cacheItem(u1074, 'unicons/graph-bar.svg');
+  cacheItem(u1075, 'unicons/history.svg');
+  cacheItem(u1076, 'unicons/home-alt.svg');
+  cacheItem(u1077, 'unicons/import.svg');
+  cacheItem(u1078, 'unicons/info.svg');
+  cacheItem(u1079, 'unicons/info-circle.svg');
+  cacheItem(u1080, 'unicons/k6.svg');
+  cacheItem(u1081, 'unicons/key-skeleton-alt.svg');
+  cacheItem(u1082, 'unicons/keyboard.svg');
+  cacheItem(u1083, 'unicons/link.svg');
+  cacheItem(u1084, 'unicons/list-ul.svg');
+  cacheItem(u1085, 'unicons/lock.svg');
+  cacheItem(u1086, 'unicons/minus.svg');
+  cacheItem(u1087, 'unicons/minus-circle.svg');
+  cacheItem(u1088, 'unicons/mobile-android.svg');
+  cacheItem(u1089, 'unicons/monitor.svg');
+  cacheItem(u1090, 'unicons/pause.svg');
+  cacheItem(u1091, 'unicons/pen.svg');
+  cacheItem(u1092, 'unicons/play.svg');
+  cacheItem(u1093, 'unicons/plug.svg');
+  cacheItem(u1094, 'unicons/plus.svg');
+  cacheItem(u1095, 'unicons/plus-circle.svg');
+  cacheItem(u1096, 'unicons/power.svg');
+  cacheItem(u1097, 'unicons/presentation-play.svg');
+  cacheItem(u1098, 'unicons/process.svg');
+  cacheItem(u1099, 'unicons/question-circle.svg');
+  cacheItem(u1100, 'unicons/repeat.svg');
+  cacheItem(u1101, 'unicons/rocket.svg');
+  cacheItem(u1102, 'unicons/rss.svg');
+  cacheItem(u1103, 'unicons/save.svg');
+  cacheItem(u1104, 'unicons/search.svg');
+  cacheItem(u1105, 'unicons/search-minus.svg');
+  cacheItem(u1106, 'unicons/search-plus.svg');
+  cacheItem(u1107, 'unicons/share-alt.svg');
+  cacheItem(u1108, 'unicons/shield.svg');
+  cacheItem(u1109, 'unicons/signal.svg');
+  cacheItem(u1110, 'unicons/signin.svg');
+  cacheItem(u1111, 'unicons/signout.svg');
+  cacheItem(u1112, 'unicons/sitemap.svg');
+  cacheItem(u1113, 'unicons/slack.svg');
+  cacheItem(u1114, 'unicons/sliders-v-alt.svg');
+  cacheItem(u1115, 'unicons/sort-amount-down.svg');
+  cacheItem(u1116, 'unicons/sort-amount-up.svg');
+  cacheItem(u1117, 'unicons/square-shape.svg');
+  cacheItem(u1118, 'unicons/star.svg');
+  cacheItem(u1119, 'unicons/step-backward.svg');
+  cacheItem(u1120, 'unicons/sync.svg');
+  cacheItem(u1121, 'unicons/table.svg');
+  cacheItem(u1122, 'unicons/tag-alt.svg');
+  cacheItem(u1123, 'unicons/times.svg');
+  cacheItem(u1124, 'unicons/trash-alt.svg');
+  cacheItem(u1125, 'unicons/unlock.svg');
+  cacheItem(u1126, 'unicons/upload.svg');
+  cacheItem(u1127, 'unicons/user.svg');
+  cacheItem(u1128, 'unicons/users-alt.svg');
+  cacheItem(u1129, 'unicons/wrap-text.svg');
+  cacheItem(u1130, 'unicons/cloud-upload.svg');
+  cacheItem(u1131, 'unicons/credit-card.svg');
+  cacheItem(u1132, 'unicons/file-copy-alt.svg');
+  cacheItem(u1133, 'unicons/fire.svg');
+  cacheItem(u1134, 'unicons/hourglass.svg');
+  cacheItem(u1135, 'unicons/layer-group.svg');
+  cacheItem(u1136, 'unicons/layers-alt.svg');
+  cacheItem(u1137, 'unicons/line-alt.svg');
+  cacheItem(u1138, 'unicons/list-ui-alt.svg');
+  cacheItem(u1139, 'unicons/message.svg');
+  cacheItem(u1140, 'unicons/palette.svg');
+  cacheItem(u1141, 'unicons/percentage.svg');
+  cacheItem(u1142, 'unicons/shield-exclamation.svg');
+  cacheItem(u1143, 'unicons/plus-square.svg');
+  cacheItem(u1144, 'unicons/x.svg');
+  cacheItem(u1145, 'unicons/capture.svg');
+  cacheItem(u1146, 'custom/gf-grid.svg');
+  cacheItem(u1147, 'custom/gf-landscape.svg');
+  cacheItem(u1148, 'custom/gf-layout-simple.svg');
+  cacheItem(u1149, 'custom/gf-portrait.svg');
+  cacheItem(u1150, 'custom/gf-bar-alignment-after.svg');
+  cacheItem(u1151, 'custom/gf-bar-alignment-before.svg');
+  cacheItem(u1152, 'custom/gf-bar-alignment-center.svg');
+  cacheItem(u1153, 'custom/gf-interpolation-linear.svg');
+  cacheItem(u1154, 'custom/gf-interpolation-smooth.svg');
+  cacheItem(u1155, 'custom/gf-interpolation-step-after.svg');
+  cacheItem(u1156, 'custom/gf-interpolation-step-before.svg');
+  cacheItem(u1157, 'custom/gf-logs.svg');
+  cacheItem(u1158, 'custom/gf-movepane-left.svg');
+  cacheItem(u1159, 'custom/gf-movepane-right.svg');
+  cacheItem(u1160, 'mono/favorite.svg');
+  cacheItem(u1161, 'mono/grafana.svg');
+  cacheItem(u1162, 'mono/heart.svg');
+  cacheItem(u1163, 'mono/heart-break.svg');
+  cacheItem(u1164, 'mono/panel-add.svg');
+  cacheItem(u1165, 'mono/library-panel.svg');
+  cacheItem(u1166, 'unicons/record-audio.svg');
   // do not edit this list directly
   // the list of icons live here: @grafana/ui/components/Icon/cached.json
 }
diff --git a/public/app/features/alerting/unified/Receivers.tsx b/public/app/features/alerting/unified/Receivers.tsx
index 6eff867f0f1..68cebae6705 100644
--- a/public/app/features/alerting/unified/Receivers.tsx
+++ b/public/app/features/alerting/unified/Receivers.tsx
@@ -38,13 +38,11 @@ function NotificationError({ errorCount }: NotificationErrorProps) {
   const styles = useStyles2(getStyles);
 
   return (
-    <div className={styles.warning} data-testid="receivers-notification-error">
-      <Stack alignItems="flex-end" direction="column">
-        <Stack alignItems="center">
-          <Icon name="exclamation-triangle" />
-          <div className={styles.countMessage}>
-            {`${errorCount} ${pluralize('error', errorCount)} with contact points`}
-          </div>
+    <div className={styles.error} data-testid="receivers-notification-error">
+      <Stack alignItems="flex-end" direction="column" gap={0}>
+        <Stack alignItems="center" gap={1}>
+          <Icon name="exclamation-circle" />
+          <div>{`${errorCount} ${pluralize('error', errorCount)} with contact points`}</div>
         </Stack>
         <div>{'Some alert notifications might not be delivered'}</div>
       </Stack>
@@ -214,11 +212,8 @@ function getPageNavigationModel(type: PageType | undefined, id: string | undefin
 export default withErrorBoundary(Receivers, { style: 'page' });
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  warning: css`
-    color: ${theme.colors.warning.text};
-  `,
-  countMessage: css`
-    padding-left: 10px;
+  error: css`
+    color: ${theme.colors.error.text};
   `,
   headingContainer: css`
     display: flex;
diff --git a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
index 9a2937f9286..44120922d81 100644
--- a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
+++ b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
@@ -90,8 +90,10 @@ interface ReceiverErrorProps {
 function ReceiverError({ errorCount, errorDetail, showErrorCount, tooltip }: ReceiverErrorProps) {
   const text = showErrorCount ? `${errorCount} ${pluralize('error', errorCount)}` : 'Error';
   const tooltipToRender = tooltip ?? errorDetail ?? 'Error';
-  return <Badge color="orange" icon="exclamation-triangle" text={text} tooltip={tooltipToRender} />;
+
+  return <Badge color="red" icon="exclamation-circle" text={text} tooltip={tooltipToRender} />;
 }
+
 interface NotifierHealthProps {
   errorsByNotifier: number;
   errorDetail?: string;
@@ -99,13 +101,18 @@ interface NotifierHealthProps {
 }
 
 function NotifierHealth({ errorsByNotifier, errorDetail, lastNotify }: NotifierHealthProps) {
-  const noErrorsColor = isLastNotifyNullDate(lastNotify) ? 'orange' : 'green';
-  const noErrorsText = isLastNotifyNullDate(lastNotify) ? 'No attempts' : 'OK';
-  return errorsByNotifier > 0 ? (
-    <ReceiverError errorCount={errorsByNotifier} errorDetail={errorDetail} showErrorCount={false} />
-  ) : (
-    <Badge color={noErrorsColor} text={noErrorsText} tooltip="" />
-  );
+  const hasErrors = errorsByNotifier > 0;
+  const noAttempts = isLastNotifyNullDate(lastNotify);
+
+  if (hasErrors) {
+    return <ReceiverError errorCount={errorsByNotifier} errorDetail={errorDetail} showErrorCount={false} />;
+  }
+
+  if (noAttempts) {
+    return <>No attempts</>;
+  }
+
+  return <Badge color="green" text="OK" />;
 }
 
 interface ReceiverHealthProps {
@@ -114,17 +121,23 @@ interface ReceiverHealthProps {
 }
 
 function ReceiverHealth({ errorsByReceiver, someWithNoAttempt }: ReceiverHealthProps) {
-  const noErrorsColor = someWithNoAttempt ? 'orange' : 'green';
-  const noErrorsText = someWithNoAttempt ? 'No attempts' : 'OK';
-  return errorsByReceiver > 0 ? (
-    <ReceiverError
-      errorCount={errorsByReceiver}
-      showErrorCount={true}
-      tooltip="Expand the contact point to see error details."
-    />
-  ) : (
-    <Badge color={noErrorsColor} text={noErrorsText} tooltip="" />
-  );
+  const hasErrors = errorsByReceiver > 0;
+
+  if (hasErrors) {
+    return (
+      <ReceiverError
+        errorCount={errorsByReceiver}
+        showErrorCount={true}
+        tooltip="Expand the contact point to see error details."
+      />
+    );
+  }
+
+  if (someWithNoAttempt) {
+    return <>No attempts</>;
+  }
+
+  return <Badge color="green" text="OK" />;
 }
 
 const useContactPointsState = (alertManagerName: string) => {

From 10109eaf00573b79d5e151a403291aa7bf68af73 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Tue, 9 May 2023 17:39:27 +0100
Subject: [PATCH 719/729] AzureMonitor: Fix tests (#68127)

Fix tests
---
 .../azure-log-analytics-datasource_test.go    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
index 02298dcb7ef..28f4127ee93 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
@@ -939,8 +939,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -953,8 +953,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -1004,8 +1004,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -1018,8 +1018,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -1072,8 +1072,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -1086,8 +1086,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -1140,8 +1140,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,
@@ -1154,8 +1154,8 @@ func TestBuildingAzureLogAnalyticsQueries(t *testing.T) {
 						`| extend spanID = iff(itemType == "pageView" or isempty(column_ifexists("id", "")), tostring(new_guid()), column_ifexists("id", ""))` +
 						`| extend operationName = iff(isempty(column_ifexists("name", "")), column_ifexists("problemId", ""), column_ifexists("name", ""))` +
 						`| extend serviceName = cloud_RoleName| extend serviceTags = bag_pack_columns(cloud_RoleInstance, cloud_RoleName)` +
-						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
-						`| extend error = iff(itemType == "exceptions", true, false)` +
+						`| extend error = todynamic(iff(itemType == "exception", "true", "false"))` +
+						`| extend tags = bag_merge(bag_pack_columns(appId,appName,application_Version,assembly,client_Browser,client_City,client_CountryOrRegion,client_IP,client_Model,client_OS,client_StateOrProvince,client_Type,data,details,duration,error,handledAt,iKey,id,innermostAssembly,innermostMessage,innermostMethod,innermostType,itemCount,itemId,itemType,location,message,method,name,operation_Id,operation_Name,operation_ParentId,operation_SyntheticSource,outerAssembly,outerMessage,outerMethod,outerType,performanceBucket,problemId,resultCode,sdkVersion,session_Id,severityLevel,size,source,success,target,timestamp,type,url,user_AccountId,user_AuthenticatedId,user_Id), customDimensions, customMeasurements)` +
 						`| project-rename traceID = operation_Id, parentSpanID = operation_ParentId, startTime = timestamp` +
 						`| project startTime, itemType, serviceName, duration, traceID, spanID, parentSpanID, operationName, serviceTags, tags, itemId` +
 						`| order by startTime asc`,

From 75729883051f00d550af9e23aba17389714e3c4e Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@grafana.com>
Date: Wed, 10 May 2023 03:03:28 +1000
Subject: [PATCH 720/729] add uid to team table (#66920)

* add uid to team table

* concat

* add prefix to transition uids

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
---
 pkg/services/sqlstore/migrations/team_mig.go | 13 +++++++
 pkg/services/team/model.go                   |  4 ++
 pkg/services/team/teamimpl/store.go          | 40 ++++++++++++++------
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/pkg/services/sqlstore/migrations/team_mig.go b/pkg/services/sqlstore/migrations/team_mig.go
index cf15d775865..c292d7088f9 100644
--- a/pkg/services/sqlstore/migrations/team_mig.go
+++ b/pkg/services/sqlstore/migrations/team_mig.go
@@ -24,6 +24,19 @@ func addTeamMigrations(mg *Migrator) {
 	mg.AddMigration("add index team.org_id", NewAddIndexMigration(teamV1, teamV1.Indices[0]))
 	mg.AddMigration("add unique index team_org_id_name", NewAddIndexMigration(teamV1, teamV1.Indices[1]))
 
+	mg.AddMigration("Add column uid in team", NewAddColumnMigration(teamV1, &Column{
+		Name: "uid", Type: DB_NVarchar, Length: 40, Nullable: true,
+	}))
+
+	mg.AddMigration("Update uid column values in team", NewRawSQLMigration("").
+		SQLite("UPDATE team SET uid=printf('t%09d',id) WHERE uid IS NULL;").
+		Postgres("UPDATE team SET uid='t' || lpad('' || id::text,9,'0') WHERE uid IS NULL;").
+		Mysql("UPDATE team SET uid=concat('t',lpad(id,9,'0')) WHERE uid IS NULL;"))
+
+	mg.AddMigration("Add unique index team_org_id_uid", NewAddIndexMigration(teamV1, &Index{
+		Cols: []string{"org_id", "uid"}, Type: UniqueIndex,
+	}))
+
 	teamMemberV1 := Table{
 		Name: "team_member",
 		Columns: []*Column{
diff --git a/pkg/services/team/model.go b/pkg/services/team/model.go
index c19333c8015..bff43aed86b 100644
--- a/pkg/services/team/model.go
+++ b/pkg/services/team/model.go
@@ -23,6 +23,7 @@ var (
 // Team model
 type Team struct {
 	ID    int64  `json:"id" xorm:"pk autoincr 'id'"`
+	UID   string `json:"uid" xorm:"uid"`
 	OrgID int64  `json:"orgId" xorm:"org_id"`
 	Name  string `json:"name"`
 	Email string `json:"email"`
@@ -82,6 +83,7 @@ type SearchTeamsQuery struct {
 
 type TeamDTO struct {
 	ID            int64                     `json:"id" xorm:"id"`
+	UID           string                    `json:"uid" xorm:"uid"`
 	OrgID         int64                     `json:"orgId" xorm:"org_id"`
 	Name          string                    `json:"name"`
 	Email         string                    `json:"email"`
@@ -145,6 +147,7 @@ type RemoveTeamMemberCommand struct {
 type GetTeamMembersQuery struct {
 	OrgID        int64
 	TeamID       int64
+	TeamUID      string
 	UserID       int64
 	External     bool
 	SignedInUser *user.SignedInUser
@@ -156,6 +159,7 @@ type GetTeamMembersQuery struct {
 type TeamMemberDTO struct {
 	OrgID      int64                     `json:"orgId" xorm:"org_id"`
 	TeamID     int64                     `json:"teamId" xorm:"team_id"`
+	TeamUID    string                    `json:"teamUID" xorm:"uid"`
 	UserID     int64                     `json:"userId" xorm:"user_id"`
 	External   bool                      `json:"-"`
 	AuthModule string                    `json:"auth_module"`
diff --git a/pkg/services/team/teamimpl/store.go b/pkg/services/team/teamimpl/store.go
index 585b9c1b4b3..8f2bc5178a4 100644
--- a/pkg/services/team/teamimpl/store.go
+++ b/pkg/services/team/teamimpl/store.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 type store interface {
@@ -67,6 +68,7 @@ func getTeamMemberCount(db db.DB, filteredUsers []string) string {
 func getTeamSelectSQLBase(db db.DB, filteredUsers []string) string {
 	return `SELECT
 		team.id as id,
+		team.uid,
 		team.org_id,
 		team.name as name,
 		team.email as email, ` +
@@ -77,6 +79,7 @@ func getTeamSelectSQLBase(db db.DB, filteredUsers []string) string {
 func getTeamSelectWithPermissionsSQLBase(db db.DB, filteredUsers []string) string {
 	return `SELECT
 		team.id AS id,
+		team.uid,
 		team.org_id,
 		team.name AS name,
 		team.email AS email,
@@ -88,6 +91,7 @@ func getTeamSelectWithPermissionsSQLBase(db db.DB, filteredUsers []string) strin
 
 func (ss *xormStore) Create(name, email string, orgID int64) (team.Team, error) {
 	t := team.Team{
+		UID:     util.GenerateShortUID(),
 		Name:    name,
 		Email:   email,
 		OrgID:   orgID,
@@ -536,6 +540,7 @@ func (ss *xormStore) getTeamMembers(ctx context.Context, query *team.GetTeamMemb
 		sess.Join("INNER", ss.db.GetDialect().Quote("user"),
 			fmt.Sprintf("team_member.user_id=%s.%s", ss.db.GetDialect().Quote("user"), ss.db.GetDialect().Quote("id")),
 		)
+		sess.Join("INNER", "team", "team.id=team_member.team_id")
 
 		// explicitly check for serviceaccounts
 		sess.Where(fmt.Sprintf("%s.is_service_account=?", ss.db.GetDialect().Quote("user")), ss.db.GetDialect().BooleanStr(false))
@@ -545,11 +550,12 @@ func (ss *xormStore) getTeamMembers(ctx context.Context, query *team.GetTeamMemb
 		}
 
 		// Join with only most recent auth module
-		authJoinCondition := `(
-		SELECT id from user_auth
+		authJoinCondition := `user_auth.id=(
+			SELECT id
+			FROM user_auth
 			WHERE user_auth.user_id = team_member.user_id
-			ORDER BY user_auth.created DESC `
-		authJoinCondition = "user_auth.id=" + authJoinCondition + ss.db.GetDialect().Limit(1) + ")"
+			ORDER BY user_auth.created DESC ` +
+			ss.db.GetDialect().Limit(1) + ")"
 		sess.Join("LEFT", "user_auth", authJoinCondition)
 
 		if query.OrgID != 0 {
@@ -558,6 +564,9 @@ func (ss *xormStore) getTeamMembers(ctx context.Context, query *team.GetTeamMemb
 		if query.TeamID != 0 {
 			sess.Where("team_member.team_id=?", query.TeamID)
 		}
+		if query.TeamUID != "" {
+			sess.Where("team.uid=?", query.TeamUID)
+		}
 		if query.UserID != 0 {
 			sess.Where("team_member.user_id=?", query.UserID)
 		}
@@ -574,6 +583,7 @@ func (ss *xormStore) getTeamMembers(ctx context.Context, query *team.GetTeamMemb
 			"team_member.external",
 			"team_member.permission",
 			"user_auth.auth_module",
+			"team.uid",
 		)
 		sess.Asc("user.login", "user.email")
 
@@ -587,10 +597,20 @@ func (ss *xormStore) getTeamMembers(ctx context.Context, query *team.GetTeamMemb
 }
 
 func (ss *xormStore) IsAdmin(ctx context.Context, query *team.IsAdminOfTeamsQuery) (bool, error) {
-	var queryResult bool
+	queryResult := false
+
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		sql := "SELECT COUNT(team.id) AS count FROM team INNER JOIN team_member ON team_member.team_id = team.id WHERE team.org_id = ? AND team_member.user_id = ? AND team_member.permission = ?"
-		params := []interface{}{query.SignedInUser.OrgID, query.SignedInUser.UserID, dashboards.PERMISSION_ADMIN}
+		sql := `SELECT COUNT(team.id) AS count
+			FROM team
+			INNER JOIN team_member ON team_member.team_id = team.id
+			WHERE team.org_id = ?
+				AND team_member.user_id = ?
+				AND team_member.permission = ?`
+		params := []interface{}{
+			query.SignedInUser.OrgID,
+			query.SignedInUser.UserID,
+			dashboards.PERMISSION_ADMIN,
+		}
 
 		type teamCount struct {
 			Count int64
@@ -605,8 +625,6 @@ func (ss *xormStore) IsAdmin(ctx context.Context, query *team.IsAdminOfTeamsQuer
 
 		return nil
 	})
-	if err != nil {
-		return false, err
-	}
-	return queryResult, nil
+
+	return queryResult, err
 }

From 720b5b3b6515c72f98c957b2f2c9bbc4aedec7e5 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Tue, 9 May 2023 19:50:24 +0200
Subject: [PATCH 721/729] Alerting: Omit "description" and "summary" from
 default email template annotations (#68122)

---
 .github/CODEOWNERS                            |   2 +-
 .../partials/alerting/instance_details.mjml   | 111 +++++-------------
 public/emails/ng_alert_notification.html      |  88 ++++----------
 3 files changed, 58 insertions(+), 143 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5ece762b8ff..d0da194624f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -433,7 +433,6 @@ lerna.json @grafana/frontend-ops
 /public/app/types/ @grafana/grafana-frontend-platform
 /public/dashboards/ @grafana/dashboards-squad
 /public/fonts/ @grafana/alerting-squad-frontend
-/public/emails/ @grafana/grafana-frontend-platform
 /public/gazetteer/ @ryantxu
 /public/img/ @grafana/grafana-frontend-platform
 /public/lib/ @grafana/grafana-frontend-platform
@@ -618,6 +617,7 @@ embed.go @grafana/grafana-as-code
 /docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @grafanabot
 /pkg/services/featuremgmt/toggles_gen.csv @grafanabot
 /pkg/services/featuremgmt/toggles_gen.go @grafanabot
+/public/emails/ @grafanabot
 
 # Conf
 /conf/defaults.ini @torkelo
diff --git a/emails/templates/partials/alerting/instance_details.mjml b/emails/templates/partials/alerting/instance_details.mjml
index 26a4bbd7856..458124dd974 100644
--- a/emails/templates/partials/alerting/instance_details.mjml
+++ b/emails/templates/partials/alerting/instance_details.mjml
@@ -1,71 +1,47 @@
 <!-- Image from external service -->
-<mj-raw>
-  {{ if .ImageURL }}
-</mj-raw>
+<mj-raw>{{ if .ImageURL }}</mj-raw>
 <mj-section padding="0">
   <mj-column border-bottom="1px solid #2f3037">
     <mj-image href="{{ .ImageURL }}" src="{{ .ImageURL }}" padding="0" />
   </mj-column>
 </mj-section>
-<mj-raw>
-  {{ end }}
-</mj-raw>
+<mj-raw>{{ end }}</mj-raw>
 
 <!-- Embedded Image -->
-<mj-raw>
-  {{ if .EmbeddedImage }}
-</mj-raw>
+<mj-raw>{{ if .EmbeddedImage }}</mj-raw>
 <mj-section padding="0">
   <mj-column border-bottom="1px solid #2f3037">
     <mj-image src="cid:{{ .EmbeddedImage }}" padding="0" />
   </mj-column>
 </mj-section>
-<mj-raw>
-  {{ end }}
-</mj-raw>
+<mj-raw>{{ end }}</mj-raw>
 
 <mj-section padding="0" text-align="left">
   <mj-column>
     <!-- Summary -->
-    <mj-raw>
-      {{ if .Annotations.summary }}
-    </mj-raw>
+    <mj-raw>{{ if .Annotations.summary }}</mj-raw>
     <mj-text>
       <strong>Summary</strong>
     </mj-text>
-    <mj-text>
-      {{- .Annotations.summary -}}
-    </mj-text>
-    <mj-raw>
-      {{ end }}
-    </mj-raw>
+    <mj-text> {{- .Annotations.summary -}} </mj-text>
+    <mj-raw>{{ end }}</mj-raw>
 
     <!-- Description -->
-    <mj-raw>
-      {{ if .Annotations.description }}
-    </mj-raw>
+    <mj-raw>{{ if .Annotations.description }}</mj-raw>
     <mj-text>
       <strong>Description</strong>
     </mj-text>
     <mj-text>
-      <mj-raw>
-        {{ range $line := (splitList "\n" .Annotations.description) }}
-      </mj-raw>
+      <mj-raw>{{ range $line := (splitList "\n" .Annotations.description) }}</mj-raw>
       {{ $line }}<br />
-      <mj-raw>
-        {{ end }}
-      </mj-raw>
+      <mj-raw>{{ end }}</mj-raw>
     </mj-text>
-    <mj-raw>
-      {{ end }}
-    </mj-raw>
+    <mj-raw>{{ end }}</mj-raw>
   </mj-column>
 </mj-section>
 
 <!-- Values -->
-<mj-raw>
-  {{ if .Values }}
-</mj-raw>
+<mj-raw>{{ if .Values }}</mj-raw>
 <mj-section padding="0" text-align="left">
   <mj-column>
     <mj-text>
@@ -76,80 +52,56 @@
 <mj-section padding="0 25px" text-align="left">
   <mj-column padding="10px" background-color="#111217" border="1px solid #2f3037">
     <mj-text>
-      <mj-raw>
-        {{ range $refID, $value := .Values }}
-      </mj-raw>
+      <mj-raw>{{ range $refID, $value := .Values }}</mj-raw>
       {{ $refID }}={{ $value }}&nbsp;
-      <mj-raw>
-        {{ end }}
-      </mj-raw>
+      <mj-raw>{{ end }}</mj-raw>
     </mj-text>
   </mj-column>
 </mj-section>
-<mj-raw>
-  {{ end }}
-</mj-raw>
+<mj-raw>{{ end }}</mj-raw>
 
 <!-- Labels and annotations -->
 <mj-section>
   <mj-column>
     <!-- Labels -->
-    <mj-raw>
-      {{ if .Labels.SortedPairs }}
-    </mj-raw>
+    <mj-raw>{{ if .Labels.SortedPairs }}</mj-raw>
     <mj-text>
       <strong>Labels</strong>
     </mj-text>
 
     <mj-table color="white">
-      <mj-raw>
-        {{ range .Labels.SortedPairs }}
-      </mj-raw>
+      <mj-raw>{{ range .Labels.SortedPairs }}</mj-raw>
       <tr>
         <td>
           <strong>{{ .Name }}</strong>
         </td>
-        <td>
-          {{ .Value }}
-        </td>
+        <td>{{ .Value }}</td>
       </tr>
-      <mj-raw>
-        {{ end }}
-      </mj-raw>
+      <mj-raw>{{ end }}</mj-raw>
     </mj-table>
 
-    <mj-raw>
-      {{ end }}
-    </mj-raw>
+    <mj-raw>{{ end }}</mj-raw>
 
-    <!-- Annotations -->
-    <mj-raw>
-      {{ if .Annotations.SortedPairs }}
-    </mj-raw>
+    <!-- Annotations, we exclude "description" and "summary" because those have their own dedicated section -->
+    <mj-raw>{{ if (without .Annotations.SortedPairs.Names "description" "summary") }}</mj-raw>
     <mj-text>
       <strong>Annotations</strong>
     </mj-text>
 
     <mj-table color="white">
-      <mj-raw>
-        {{ range .Annotations.SortedPairs }}
-      </mj-raw>
+      <mj-raw>{{ range .Annotations.SortedPairs }}</mj-raw>
+      <mj-raw>{{ if and (ne .Name "description") (ne .Name "summary") }}</mj-raw>
       <tr>
         <td>
           <strong>{{ .Name }}</strong>
         </td>
-        <td>
-          {{ .Value }}
-        </td>
+        <td>{{ .Value }}</td>
       </tr>
-      <mj-raw>
-        {{ end }}
-      </mj-raw>
+      <mj-raw>{{ end }}</mj-raw>
+      <mj-raw>{{ end }}</mj-raw>
     </mj-table>
 
-    <mj-raw>
-      {{ end }}
-    </mj-raw>
+    <mj-raw>{{ end }}</mj-raw>
   </mj-column>
 </mj-section>
 
@@ -178,9 +130,7 @@
   <mj-raw>{{ end }}</mj-raw>
   <mj-raw>{{ if .PanelURL }}</mj-raw>
   <mj-column>
-    <mj-button align="center" href="{{ .PanelURL }}" padding="0" inner-padding="5px 12px">
-      View panel
-    </mj-button>
+    <mj-button align="center" href="{{ .PanelURL }}" padding="0" inner-padding="5px 12px"> View panel </mj-button>
   </mj-column>
   <mj-raw>{{ end }}</mj-raw>
 </mj-section>
@@ -189,7 +139,8 @@
 <mj-section border-top="1px solid #2f3037" padding="5px 0">
   <mj-column>
     <mj-text color="#91929e">
-      Observed <strong>{{ ago .StartsAt }}</strong> before this notification was delivered, at <strong>{{ .StartsAt }}</strong>
+      Observed <strong>{{ ago .StartsAt }}</strong> before this notification was delivered, at
+      <strong>{{ .StartsAt }}</strong>
     </mj-text>
   </mj-column>
 </mj-section>
diff --git a/public/emails/ng_alert_notification.html b/public/emails/ng_alert_notification.html
index 92e98369e9b..3dcf73630d8 100644
--- a/public/emails/ng_alert_notification.html
+++ b/public/emails/ng_alert_notification.html
@@ -470,13 +470,9 @@
                               <tr>
                                 <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
-                                    <mj-raw>
-                                      {{ range $line := (splitList "\n" .Annotations.description) }}
-                                    </mj-raw>
+                                    <mj-raw>{{ range $line := (splitList "\n" .Annotations.description) }}</mj-raw>
                                     {{ $line }}<br>
-                                    <mj-raw>
-                                      {{ end }}
-                                    </mj-raw>
+                                    <mj-raw>{{ end }}</mj-raw>
                                   </div>
                                 </td>
                               </tr>
@@ -533,12 +529,8 @@
                                       <tr>
                                         <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                           <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
-                                            <mj-raw>
-                                              {{ range $refID, $value := .Values }}
-                                            </mj-raw>
-                                            {{ $refID }}={{ $value }}&nbsp; <mj-raw>
-                                              {{ end }}
-                                            </mj-raw>
+                                            <mj-raw>{{ range $refID, $value := .Values }}</mj-raw>
+                                            {{ $refID }}={{ $value }}&nbsp; <mj-raw>{{ end }}</mj-raw>
                                           </div>
                                         </td>
                                       </tr>
@@ -576,24 +568,18 @@
                               <tr>
                                 <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <table cellpadding="0" cellspacing="0" width="100%" border="0" style="color:white;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
-                                    <mj-raw>
-                                      {{ range .Labels.SortedPairs }}
-                                    </mj-raw>
+                                    <mj-raw>{{ range .Labels.SortedPairs }}</mj-raw>
                                     <tr>
                                       <td>
                                         <strong>{{ .Name }}</strong>
                                       </td>
-                                      <td>
-                                        {{ .Value }}
-                                      </td>
+                                      <td>{{ .Value }}</td>
                                     </tr>
-                                    <mj-raw>
-                                      {{ end }}
-                                    </mj-raw>
+                                    <mj-raw>{{ end }}</mj-raw>
                                   </table>
                                 </td>
                               </tr>
-                              {{ end }}{{ if .Annotations.SortedPairs }}
+                              {{ end }}{{ if (without .Annotations.SortedPairs.Names "description" "summary") }}
                               <tr>
                                 <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Annotations</strong></div>
@@ -602,20 +588,16 @@
                               <tr>
                                 <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <table cellpadding="0" cellspacing="0" width="100%" border="0" style="color:white;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
-                                    <mj-raw>
-                                      {{ range .Annotations.SortedPairs }}
-                                    </mj-raw>
+                                    <mj-raw>{{ range .Annotations.SortedPairs }}</mj-raw>
+                                    <mj-raw>{{ if and (ne .Name "description") (ne .Name "summary") }}</mj-raw>
                                     <tr>
                                       <td>
                                         <strong>{{ .Name }}</strong>
                                       </td>
-                                      <td>
-                                        {{ .Value }}
-                                      </td>
+                                      <td>{{ .Value }}</td>
                                     </tr>
-                                    <mj-raw>
-                                      {{ end }}
-                                    </mj-raw>
+                                    <mj-raw>{{ end }}</mj-raw>
+                                    <mj-raw>{{ end }}</mj-raw>
                                   </table>
                                 </td>
                               </tr>
@@ -979,13 +961,9 @@
                               <tr>
                                 <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
-                                    <mj-raw>
-                                      {{ range $line := (splitList "\n" .Annotations.description) }}
-                                    </mj-raw>
+                                    <mj-raw>{{ range $line := (splitList "\n" .Annotations.description) }}</mj-raw>
                                     {{ $line }}<br>
-                                    <mj-raw>
-                                      {{ end }}
-                                    </mj-raw>
+                                    <mj-raw>{{ end }}</mj-raw>
                                   </div>
                                 </td>
                               </tr>
@@ -1042,12 +1020,8 @@
                                       <tr>
                                         <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                           <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;">
-                                            <mj-raw>
-                                              {{ range $refID, $value := .Values }}
-                                            </mj-raw>
-                                            {{ $refID }}={{ $value }}&nbsp; <mj-raw>
-                                              {{ end }}
-                                            </mj-raw>
+                                            <mj-raw>{{ range $refID, $value := .Values }}</mj-raw>
+                                            {{ $refID }}={{ $value }}&nbsp; <mj-raw>{{ end }}</mj-raw>
                                           </div>
                                         </td>
                                       </tr>
@@ -1085,24 +1059,18 @@
                               <tr>
                                 <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <table cellpadding="0" cellspacing="0" width="100%" border="0" style="color:white;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
-                                    <mj-raw>
-                                      {{ range .Labels.SortedPairs }}
-                                    </mj-raw>
+                                    <mj-raw>{{ range .Labels.SortedPairs }}</mj-raw>
                                     <tr>
                                       <td>
                                         <strong>{{ .Name }}</strong>
                                       </td>
-                                      <td>
-                                        {{ .Value }}
-                                      </td>
+                                      <td>{{ .Value }}</td>
                                     </tr>
-                                    <mj-raw>
-                                      {{ end }}
-                                    </mj-raw>
+                                    <mj-raw>{{ end }}</mj-raw>
                                   </table>
                                 </td>
                               </tr>
-                              {{ end }}{{ if .Annotations.SortedPairs }}
+                              {{ end }}{{ if (without .Annotations.SortedPairs.Names "description" "summary") }}
                               <tr>
                                 <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1.5;text-align:left;color:#FFFFFF;"><strong>Annotations</strong></div>
@@ -1111,20 +1079,16 @@
                               <tr>
                                 <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <table cellpadding="0" cellspacing="0" width="100%" border="0" style="color:white;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
-                                    <mj-raw>
-                                      {{ range .Annotations.SortedPairs }}
-                                    </mj-raw>
+                                    <mj-raw>{{ range .Annotations.SortedPairs }}</mj-raw>
+                                    <mj-raw>{{ if and (ne .Name "description") (ne .Name "summary") }}</mj-raw>
                                     <tr>
                                       <td>
                                         <strong>{{ .Name }}</strong>
                                       </td>
-                                      <td>
-                                        {{ .Value }}
-                                      </td>
+                                      <td>{{ .Value }}</td>
                                     </tr>
-                                    <mj-raw>
-                                      {{ end }}
-                                    </mj-raw>
+                                    <mj-raw>{{ end }}</mj-raw>
+                                    <mj-raw>{{ end }}</mj-raw>
                                   </table>
                                 </td>
                               </tr>

From afbc376b2ce909cc1572428d78138e5514eb2a61 Mon Sep 17 00:00:00 2001
From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
Date: Tue, 9 May 2023 21:04:58 +0200
Subject: [PATCH 722/729] Nested Folders: Do not keep search state when
 navigating to a result item (#67749)

* Reset search state when navigating to a new search item

* Reset query on search select

* Spread initialState

* Remove unused import

* Only reset query

* Add test

* Fix spelling

* Change functionality

* Only applied saved filters when searching
---
 .../search/state/SearchStateManager.test.ts   | 25 +++++++++++++++++++
 .../search/state/SearchStateManager.ts        |  8 +++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/public/app/features/search/state/SearchStateManager.test.ts b/public/app/features/search/state/SearchStateManager.test.ts
index 11352388e1d..78267fadde4 100644
--- a/public/app/features/search/state/SearchStateManager.test.ts
+++ b/public/app/features/search/state/SearchStateManager.test.ts
@@ -3,6 +3,7 @@ import { locationService } from '@grafana/runtime';
 
 import { DashboardQueryResult, getGrafanaSearcher } from '../service';
 import { SearchLayout } from '../types';
+import * as utils from '../utils';
 
 import { getSearchStateManager } from './SearchStateManager';
 
@@ -44,5 +45,29 @@ describe('SearchStateManager', () => {
       stm.initStateFromUrl();
       expect(stm.state.folderUid).toBe(undefined);
     });
+
+    it('should reset filters if state is updated and no URL params are present', () => {
+      const parseRouteParamsSpy = jest.spyOn(utils, 'parseRouteParams');
+      // Set initial values
+      parseRouteParamsSpy.mockImplementation(() => ({
+        query: 'hello',
+        sort: 'alpha-asc',
+      }));
+      const stm = getSearchStateManager();
+      stm.initStateFromUrl();
+
+      // Verify that they have been set
+      expect(stm.state.query).toBe('hello');
+      expect(stm.state.sort).toBe('alpha-asc');
+      expect(stm.state.folderUid).toBe(undefined);
+
+      // Changed to a view with no URL state.
+      parseRouteParamsSpy.mockImplementation(() => ({}));
+      stm.initStateFromUrl('abc');
+
+      expect(stm.state.query).toBe('');
+      expect(stm.state.sort).toBe(undefined);
+      expect(stm.state.folderUid).toBe('abc');
+    });
   });
 });
diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index 22b45f93cb4..180aa23920f 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -49,6 +49,7 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
     }
 
     stateManager.setState({
+      ...initialState,
       ...stateFromUrl,
       folderUid: folderUid,
       eventTrackingNamespace: folderUid ? 'manage_dashboards' : 'dashboard_search',
@@ -63,8 +64,10 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
    * Updates internal and url state, then triggers a new search
    */
   setStateAndDoSearch(state: Partial<SearchState>) {
+    const sort = state.sort || this.state.sort || localStorage.getItem(SEARCH_SELECTED_SORT) || undefined;
+
     // Set internal state
-    this.setState(state);
+    this.setState({ sort, ...state });
 
     // Update url state
     this.updateLocation({
@@ -290,14 +293,13 @@ export function getSearchStateManager() {
   if (!stateManager) {
     const selectedLayout = localStorage.getItem(SEARCH_SELECTED_LAYOUT) as SearchLayout;
     const layout = selectedLayout ?? initialState.layout;
-    const sort = localStorage.getItem(SEARCH_SELECTED_SORT) ?? undefined;
 
     let includePanels = store.getBool(SEARCH_PANELS_LOCAL_STORAGE_KEY, true);
     if (includePanels) {
       includePanels = false;
     }
 
-    stateManager = new SearchStateManager({ ...initialState, layout, sort, includePanels });
+    stateManager = new SearchStateManager({ ...initialState, layout, includePanels });
   }
 
   return stateManager;

From 5422609fb10bf136db17a64ab38d0964423a235f Mon Sep 17 00:00:00 2001
From: Matthew Jacobson <matthew.jacobson@grafana.com>
Date: Tue, 9 May 2023 15:27:40 -0400
Subject: [PATCH 723/729] Alerting: Fix broken integration test (#68140)

From https://github.com/grafana/grafana/pull/68122
---
 pkg/services/ngalert/notifier/email_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/services/ngalert/notifier/email_test.go b/pkg/services/ngalert/notifier/email_test.go
index 1fe36a4a3bc..01da729b9bd 100644
--- a/pkg/services/ngalert/notifier/email_test.go
+++ b/pkg/services/ngalert/notifier/email_test.go
@@ -111,11 +111,11 @@ func TestEmailNotifierIntegration(t *testing.T) {
 			expSnippets: []string{
 				"2 firing instances",
 				"<strong>severity</strong>",
-				"warning\n",
-				"critical\n",
+				"warning",
+				"critical",
 				"<strong>alertname</strong>",
-				"FiringTwo\n",
-				"FiringOne\n",
+				"FiringTwo",
+				"FiringOne",
 				"<a href=\"http://fix.me\"",
 				"<a href=\"http://localhost/base/d/abc",
 				"<a href=\"http://localhost/base/d/abc?viewPanel=5",

From c9e5c229ec99fc040d287c682c4a006314abdbb3 Mon Sep 17 00:00:00 2001
From: lwandz13 <126723338+lwandz13@users.noreply.github.com>
Date: Tue, 9 May 2023 15:07:03 -0500
Subject: [PATCH 724/729] updated screenshots, links and some wording (#67864)

---
 .../prometheus/query-editor/index.md          | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/docs/sources/datasources/prometheus/query-editor/index.md b/docs/sources/datasources/prometheus/query-editor/index.md
index 6a9e6dc2d27..5b99aa0f2aa 100644
--- a/docs/sources/datasources/prometheus/query-editor/index.md
+++ b/docs/sources/datasources/prometheus/query-editor/index.md
@@ -24,13 +24,11 @@ You can switch the Prometheus query editor between two modes:
 - [Code mode](#code-mode), which provides a feature-rich editor for writing queries
 - [Builder mode](#builder-mode), which provides a visual query designer
 
-{{< figure src="/static/img/docs/prometheus/header-9-1.png" max-width="500px" class="docs-image--no-shadow" caption="Editor toolbar" >}}
+{{< figure src="/static/img/docs/prometheus/editing-mode.png" max-width="500px" class="docs-image--no-shadow" caption="Query editor mode" >}}
 
 To switch between the editor modes, select the corresponding **Builder** and **Code** tabs.
 
-To run a query, select **Run queries** located at the top of the editor.
-
-> **Note:** To run Prometheus queries in [Explore]({{< relref "../../../explore" >}}), select **Run query**.
+To run a query, select **Run query** in the upper right of the editor.
 
 Each mode is synchronized with the other modes, so you can switch between them without losing your work, although there are some limitations.
 
@@ -46,7 +44,7 @@ For options and functions common to all query editors, refer to [Query and trans
 
 You can configure Prometheus-specific options in the query editor by setting several options regardless of its mode.
 
-{{< figure src="/static/img/docs/prometheus/options-9-1.png" max-width="500px" class="docs-image--no-shadow" caption="Options" >}}
+{{< figure src="/static/img/docs/prometheus/options.png" max-width="500px" class="docs-image--no-shadow" caption="Options" >}}
 
 ### Legend
 
@@ -55,7 +53,7 @@ The **Legend** setting defines the time series's name. You can use a predefined
 | Option      | Description                                                                                                                                                                                                           |
 | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **Auto**    | Shows the value of a single label for each series with only one label, or displays all labels if a series has multiple labels.                                                                                        |
-| **Verbose** | Displays all labels.                                                                                                                                                                                                  |
+| **Verbose** | Displays all label names.                                                                                                                                                                                             |
 | **Custom**  | Uses templating to select which labels will be included.<br/>For example, `{{hostname}}` is replaced by the label value for the label `hostname`.<br/>Clear the input and click outside of it to select another mode. |
 
 ### Min step
@@ -68,11 +66,11 @@ This setting supports the `$__interval` and `$__rate_interval` macros.
 
 You can switch between **Table**, **Time series**, and **Heatmap** options by configuring the query's **Format**.
 
-| Option          | Description                                                                                                                                                                                                                       |
-| --------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Table**       | This works only in a [Table panel]{{< relref "../../../panels-visualizations/visualizations/table" >}}.                                                                                                                           |
-| **Time series** | Uses the default time series format.                                                                                                                                                                                              |
-| **Heatmap**     | Displays metrics of the Histogram type on a [Heatmap panel]{{< relref "../../../panels-visualizations/visualizations/heatmap" >}} by converting cumulative histograms to regular ones and sorting the series by the bucket bound. |
+| Option          | Description                                                                                                                                                                                                                         |
+| --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Table**       | This works only in a [Table panel]({{< relref "../../../panels-visualizations/visualizations/table" >}}).                                                                                                                           |
+| **Time series** | Uses the default time series format.                                                                                                                                                                                                |
+| **Heatmap**     | Displays metrics of the Histogram type on a [Heatmap panel]({{< relref "../../../panels-visualizations/visualizations/heatmap" >}}) by converting cumulative histograms to regular ones and sorting the series by the bucket bound. |
 
 ### Type
 
@@ -92,21 +90,18 @@ The **Type** setting selects the query type.
 
 ## Code mode
 
-{{< figure src="/static/img/docs/prometheus/code-mode-9-1.png" max-width="500px" class="docs-image--no-shadow" caption="Code mode" >}}
+{{< figure src="/static/img/docs/prometheus/code-mode.png" max-width="500px" class="docs-image--no-shadow" caption="Code mode" >}}
 
 In **Code mode**, you can write complex queries using a text editor with autocompletion features and syntax highlighting.
 It also contains a [Metrics browser]({{< relref "#metrics-browser" >}}) to further help you write queries.
 
-For more information about Prometheus's query language, refer to the [Prometheus documentation](http://prometheus.io/docs/querying/basics/).
+For more information about Prometheus's query language (PromQL), see [Querying Prometheus](http://prometheus.io/docs/querying/basics/).
 
 ### Use autocompletion
 
-{{< figure src="/static/img/docs/prometheus/autocomplete-9-1.png" max-width="500px" class="docs-image--no-shadow" caption="Autocomplete" >}}
-
 Code mode's autocompletion feature works automatically while typing.
-To manually trigger autocompletion, use the keyboard shortcut <key>Ctrl</key>/<key>Cmd</key> + <key>Space</key>.
 
-The query editor can autocomplete static functions, aggregations, and keywords, and also dynamic items like metrics and labels.
+The query editor can autocomplete static functions, aggregations, keywords, and also dynamic items like metrics and labels.
 The autocompletion dropdown includes documentation for the suggested items where available.
 
 To run a query in [Explore]({{< relref "../../../explore/" >}}), use the keyboard shortcut <key>Shift</key> + <key>Enter</key>.
@@ -117,7 +112,7 @@ The metrics browser locates metrics and selects relevant labels to help you buil
 When you open the browser, it displays all available metrics and labels.
 If supported by your Prometheus instance, each metric also displays its HELP and TYPE as a tooltip.
 
-{{< figure src="/static/img/docs/prometheus/metric-browser-9-1.png" max-width="500px" class="docs-image--no-shadow" caption="Metrics browser" >}}
+{{< figure src="/static/img/docs/prometheus/metric-browser.png" max-width="500px" class="docs-image--no-shadow" caption="Metrics browser" >}}
 
 When you select a metric, the browser narrows down the available labels to show only the ones applicable to the metric.
 You can then select one or more labels for which the available label values are shown in lists in the bottom section.
@@ -154,7 +149,7 @@ In addition to the **Run query** button and mode switcher, Builder mode includes
 
 ### Metric and labels
 
-{{< figure src="/static/img/docs/prometheus/metric-select-9-1.png" max-width="500px" class="docs-image--no-shadow" caption="Metric and labels" >}}
+{{< figure src="/static/img/docs/prometheus/metrics-and-labels.png" max-width="500px" class="docs-image--no-shadow" caption="Metric and label filters" >}}
 
 Select a specific metric name from the dropdown list.
 The data source requests the list of available metrics from the Prometheus server based on the selected time rage.
@@ -166,7 +161,7 @@ Use the `+` button to add a label, and the `x` button to remove a label.
 
 ### Operations
 
-{{< figure src="/static/img/docs/prometheus/operations-9-1.png" max-width="500px" class="docs-image--no-shadow" caption="Operations" >}}
+{{< figure src="/static/img/docs/prometheus/operations.png" max-width="500px" class="docs-image--no-shadow" caption="Operations" >}}
 
 Select the `+ Operations` button to add operations to your query.
 The query editor groups operations into related sections, and you can type while the operations dropdown is open to search and filter the list.
@@ -189,16 +184,16 @@ To re-order operations manually, drag the operation box by its name and drop it
 
 #### Hints
 
-{{< figure src="/static/img/docs/prometheus/hint-8-5.png" max-width="500px" class="docs-image--no-shadow" caption="Hint" >}}
+{{< figure src="/static/img/docs/prometheus/hint-example.png" max-width="500px" class="docs-image--no-shadow" caption="Hint" >}}
 
 The query editor can detect which operations are most appropriate for some selected metrics.
 If it does, it displays a hint next to the `+ Operations` button.
 
-To add the operations to your query, click the hint.
+To add the operation to your query, click the `hint`.
 
 ## Use Explain mode to understand queries
 
-{{< figure src="/static/img/docs/prometheus/explain-8-5.png" max-width="500px" class="docs-image--no-shadow" caption="Explain mode" >}}
+{{< figure src="/static/img/docs/prometheus/explain-results.png" max-width="500px" class="docs-image--no-shadow" caption="Explain results" >}}
 
 Explain mode helps you understand a query by displaying a step-by-step explanation of all query components and operations.
 

From 13603c7d7157b4fa2fd00f1534718f588cc233e5 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Tue, 9 May 2023 15:12:02 -0500
Subject: [PATCH 725/729] Annotations: Fix rendering (#68038)

---
 .../plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx
index c190a814b6b..8d7f9772918 100644
--- a/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx
@@ -28,6 +28,11 @@ export const AnnotationsPlugin = ({ annotations, timeZone, config }: Annotations
     }
 
     annotationsRef.current = views;
+
+    return () => {
+      // clear on unmount
+      annotationsRef.current = [];
+    };
   }, [annotations]);
 
   useLayoutEffect(() => {

From d6ba522c3cdf7947068511e8667b223df4093371 Mon Sep 17 00:00:00 2001
From: Joseph Perez <45749060+josmperez@users.noreply.github.com>
Date: Tue, 9 May 2023 13:53:11 -0700
Subject: [PATCH 726/729] Docs: Plugin doc review changes from chunk 1-B with
 corrected set of files (#67164)

* Re-pushing doc review changes from 1-B with fewer files

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fix for URL examples

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Data frames fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fixes from doc review

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* More doc review changes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Prettier

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fix migration index

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Fix screenshot

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Quick fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

---------

Signed-off-by: Joe Perez <joseph.perez@grafana.com>
---
 .../sources/developers/plugins/data-frames.md | 98 ++++++++++++-------
 .../developers/plugins/error-handling.md      | 12 ++-
 .../migration-guide/angular-react/_index.md   | 26 ++---
 .../developers/plugins/package-a-plugin.md    | 67 +++++++++++++
 .../developers/plugins/publish-a-plugin.md    | 17 ++--
 .../plugins/working-with-data-frames.md       | 24 ++---
 6 files changed, 159 insertions(+), 85 deletions(-)
 create mode 100644 docs/sources/developers/plugins/package-a-plugin.md

diff --git a/docs/sources/developers/plugins/data-frames.md b/docs/sources/developers/plugins/data-frames.md
index 2e5a8ce9e81..de02509e221 100644
--- a/docs/sources/developers/plugins/data-frames.md
+++ b/docs/sources/developers/plugins/data-frames.md
@@ -12,39 +12,59 @@ The data frame structure is a concept that's borrowed from data analysis tools l
 
 This document gives an overview of the data frame structure, and of how data is handled within Grafana.
 
-## The data frame
+### Data frame fields
 
-A data frame is a columnar-oriented table structure, which means it stores data by column and not by row. To understand what this means, let’s look at the TypeScript definition used by Grafana:
+A data frame is a collection of _fields_, where each field corresponds to a column. Each field, in turn, consists of a collection of values and metadata, such as the data type of those values.
 
 ```ts
-interface DataFrame {
-    name?:  string;
-    // reference to query that create the frame
-    refId?: string;
-
-    fields: []Field;
-}
-```
-
-In essence, a data frame is a collection of _fields_, where each field corresponds to a column. Each field, in turn, consists of a collection of values, along with meta information, such as the data type of those values.
-
-```ts
-interface Field {
+export interface Field<T = any, V = Vector<T>> {
+  /**
+   * Name of the field (column)
+   */
   name: string;
-  // Prometheus like Labels / Tags
-  labels?: Record<string, string>;
-
-  // For example string, number, time (or more specific primitives in the backend)
+  /**
+   *  Field value type (string, number, and so on)
+   */
   type: FieldType;
-  // Array of values all of the same type
-  values: Vector<T>;
-
-  // Optional display data for the field (e.g. unit, name over-ride, etc)
+  /**
+   *  Meta info about how field and how to display it
+   */
   config: FieldConfig;
+
+  /**
+   * The raw field values
+   * In Grafana 10, this accepts both simple arrays and the Vector interface
+   * In Grafana 11, the Vector interface will be removed
+   */
+  values: V | T[];
+
+  /**
+   * When type === FieldType.Time, this can optionally store
+   * the nanosecond-precison fractions as integers between
+   * 0 and 999999.
+   */
+  nanos?: number[];
+
+  labels?: Labels;
+
+  /**
+   * Cached values with appropriate display and id values
+   */
+  state?: FieldState | null;
+
+  /**
+   * Convert a value for display
+   */
+  display?: DisplayProcessor;
+
+  /**
+   * Get value data links with variables interpolated
+   */
+  getLinks?: (config: ValueLinkConfig) => Array<LinkModel<Field>>;
 }
 ```
 
-Let's look at an example. The table below demonstrates a data frame with two fields, _time_ and _temperature_.
+Let's look at an example. The following table demonstrates a data frame with two fields, _time_ and _temperature_:
 
 | time                | temperature |
 | ------------------- | ----------- |
@@ -52,22 +72,24 @@ Let's look at an example. The table below demonstrates a data frame with two fie
 | 2020-01-02 03:05:00 | 47.0        |
 | 2020-01-02 03:06:00 | 48.0        |
 
-Each field has three values, and each value in a field must share the same type. In this case, all values in the time field are timestamps, and all values in the temperature field are numbers.
+Each field has three values, and each value in a field must share the same type. In this case, all values in the `time` field are timestamps, and all values in the `temperature` field are numbers.
 
 One restriction on data frames is that all fields in the frame must be of the same length to be a valid data frame.
 
-### Field configuration
+### Field configurations
 
 Each field in a data frame contains optional information about the values in the field, such as units, scaling, and so on.
 
 By adding field configurations to a data frame, Grafana can configure visualizations automatically. For example, you could configure Grafana to automatically set the unit provided by the data source.
 
-## Transformations
+## Data transformations
 
-Along with the type information, field configs enable _data transformations_ within Grafana.
+We have seen how field configs contain type information, and they also have another role. Data frame fields enable _data transformations_ within Grafana.
 
 A data transformation is any function that accepts a data frame as input, and returns another data frame as output. By using data frames in your plugin, you get a range of transformations for free.
 
+To learn more about data transformations in Grafana, refer to [Transform data](https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/transform-data/).
+
 ## Data frames as time series
 
 A data frame with at least one time field is considered a _time series_.
@@ -76,9 +98,9 @@ For more information on time series, refer to our [Introduction to time series](
 
 ### Wide format
 
-When a collection of time series shares the same _time index_—the time fields in each time series are identical—they can be stored together, in a _wide_ format. By reusing the time field, we can reduce the amount of data being sent to the browser.
+When a collection of time series shares the same _time index_—the time fields in each time series are identical—they can be stored together, in a _wide_ format. By reusing the time field, less data is sent to the browser.
 
-In this example, the `cpu` usage from each host share the time index, so we can store them in the same data frame.
+In this example, the `cpu` usage from each host shares the time index, so we can store them in the same data frame:
 
 ```text
 Name: Wide
@@ -93,7 +115,7 @@ Dimensions: 3 fields by 2 rows
 +---------------------+-----------------+-----------------+
 ```
 
-However, if the two time series don't share the same time values, they are represented as two distinct data frames.
+However, if the two time series don't share the same time values, they are represented as two distinct data frames:
 
 ```text
 Name: cpu
@@ -119,17 +141,17 @@ Dimensions: 2 fields by 2 rows
 +---------------------+-----------------+
 ```
 
-The wide format can typically be used when multiple time series are collected by the same process. In this case, every measurement is made at the same interval and will therefore share the same time values.
+A typical use for the wide format is when multiple time series are collected by the same process. In this case, every measurement is made at the same interval and therefore shares the same time values.
 
 ### Long format
 
-Some data sources return data in a _long_ format (also called _narrow_ format). This is common format returned by, for example, SQL databases.
+Some data sources return data in a _long_ format (also called _narrow_ format). This is a common format returned by, for example, SQL databases.
 
-In long format, string values are represented as separate fields rather than as labels. As a result, a data form in long form may have duplicated time values.
+In the long format, string values are represented as separate fields rather than as labels. As a result, a data form in long form may have duplicated time values.
 
 Grafana can detect and convert data frames in long format into wide format.
 
-For example, the following data frame in long format:
+For example, the following data frame appears in long format:
 
 ```text
 Name: Long
@@ -146,7 +168,7 @@ Dimensions: 4 fields by 4 rows
 +---------------------+-----------------+-----------------+----------------+
 ```
 
-can be converted into a data frame in wide format:
+The above table can be converted into a data frame in wide format like this:
 
 ```text
 Name: Wide
@@ -161,11 +183,11 @@ Dimensions: 5 fields by 2 rows
 +---------------------+------------------+------------------+------------------+------------------+
 ```
 
-> **Note:** Not all panels support the wide time series data frame format. To keep full backward compatibility we've introduced a transformation that can be used to convert from the wide to the long format. For usage information, refer to the [Prepare time series-transformation]({{< relref "../../panels-visualizations/query-transform-data/transform-data/#prepare-time-series" >}}).
+> **Note:** Not all panels support the wide time series data frame format. To keep full backward compatibility Grafana has introduced a transformation that you can use to convert from the wide to the long format. For usage information, refer to the [Prepare time series-transformation]({{< relref "../../panels-visualizations/query-transform-data/transform-data/#prepare-time-series" >}}).
 
 ## Technical references
 
-This section contains links to technical reference and implementations of data frames.
+The concept of a data frame in Grafana is borrowed from data analysis tools like the [R programming language](https://www.r-project.org), and [Pandas](https://pandas.pydata.org/). Other technical references are provided below.
 
 ### Apache Arrow
 
diff --git a/docs/sources/developers/plugins/error-handling.md b/docs/sources/developers/plugins/error-handling.md
index a7535cdc74d..778952f0d3d 100644
--- a/docs/sources/developers/plugins/error-handling.md
+++ b/docs/sources/developers/plugins/error-handling.md
@@ -1,10 +1,10 @@
 ---
-title: Error handling
+title: Work with error handling
 ---
 
-# Error handling
+# Work with error handling
 
-This guide explains how to handle errors in plugins.
+This guide explains how to handle errors in plugins and provides suggestions for common scenarios.
 
 ## Provide usable defaults
 
@@ -33,7 +33,7 @@ Grafana displays the error message in the top-left corner of the panel.
 
 {{< figure src="/static/img/docs/panel_error.png" class="docs-image--no-shadow" max-width="850px" >}}
 
-Avoid displaying overly-technical error messages to the user. If you want to let technical users report an error, consider logging it instead.
+We recommend that you avoid displaying overly technical error messages to the user. If you want to let technical users report an error, consider logging it to the console instead.
 
 ```ts
 try {
@@ -44,7 +44,9 @@ try {
 }
 ```
 
-> **Note:** Grafana displays the exception message in the UI as written, so we recommend using grammatically correct sentences. For more information, refer to the [Documentation style guide](https://github.com/grafana/grafana/blob/main/contribute/style-guides/documentation-style-guide.md).
+> **Note:** Grafana displays the exception message in the UI as written, so use grammatically correct sentences. For more information, refer to the [Documentation style guide](https://github.com/grafana/grafana/blob/main/contribute/style-guides/documentation-style-guide.md).
+
+## Common error scenarios
 
 Here are some examples of situations where you might want to display an error to the user.
 
diff --git a/docs/sources/developers/plugins/migration-guide/angular-react/_index.md b/docs/sources/developers/plugins/migration-guide/angular-react/_index.md
index 4260bbbcaac..b4b0e7e20f6 100644
--- a/docs/sources/developers/plugins/migration-guide/angular-react/_index.md
+++ b/docs/sources/developers/plugins/migration-guide/angular-react/_index.md
@@ -13,31 +13,17 @@ weight: 1000
 
 # Migrate a plugin from AngularJS to React
 
-If you’re looking to migrate a plugin to the new plugin platform, then we recommend that you release it under a new major version. Consider keeping a release branch for the previous version to be able to roll out patch releases for versions prior to Grafana 7.
+If you want to migrate a plugin to Grafana's React-based plugin platform, then we recommend that you release it under a new major version. Consider keeping a release branch for the previous version to be able to roll out patch releases for versions prior to Grafana 7.
 
-While there's no 1-to-1 migration path from an Angular plugin to the new React platform, from early adopters, we’ve learned that one of the easiest ways to migrate is to:
+While there's no standard migration path from an Angular plugin to the new React platform, we’ve learned that one of the easiest ways to migrate is to:
 
 1. Create a new branch called `migrate-to-react`.
-1. Start from scratch with one of the templates provided by Grafana Toolkit.
+1. Start from scratch with one of the templates provided by the [Create-plugin](https://www.npmjs.com/package/@grafana/create-plugin) tool.
 1. Move the existing code into the new plugin incrementally, one component at a time.
 
 ## Migrate a panel plugin
 
-Prior to Grafana 7.0, you would export a MetricsPanelCtrl from module.ts.
-
-**src/module.ts**
-
-```ts
-import { MetricsPanelCtrl } from 'grafana/app/plugins/sdk';
-
-class MyPanelCtrl extends MetricsPanelCtrl {
-  // ...
-}
-
-export { MyPanelCtrl as PanelCtrl };
-```
-
-Starting with 7.0, plugins now export a PanelPlugin from module.ts where MyPanel is a React component containing the props from PanelProps.
+Starting with Grafana 7.0, plugins export a `PanelPlugin` from `module.ts` where `MyPanel`is a React component containing the props from `PanelProps`.
 
 **src/module.ts**
 
@@ -64,8 +50,8 @@ export function MyPanel({ options, data, width, height }: Props) {
 While all plugins are different, we'd like to share a migration process that has worked for some of our users.
 
 1. Define your configuration model and `ConfigEditor`. For many plugins, the configuration editor is the simplest component so it's a good candidate to start with.
-1. Implement the `testDatasource()` method on the class that extends `DataSourceApi` using the settings in your configuration model to make sure you can successfully configure and access the external API.
-1. Implement the `query()` method. At this point, you can hard-code your query, because we haven’t yet implemented the query editor. The `query()` method supports both the new data frame response and the old TimeSeries response, so don’t worry about converting to the new format just yet.
+1. Implement the `testDatasource()` method on the class that extends `DataSourceApi`. Use the settings in your configuration model to make sure that you can successfully configure and access the external API.
+1. Implement the `query()` method. At this point, you can hard-code your query, because we haven’t yet implemented the query editor. The `query()` method supports both the new data frame response and the old `TimeSeries` response, so don’t worry about converting to the new format just yet.
 1. Implement the `QueryEditor`. How much work this requires depends on how complex your query model is.
 
 By now, you should be able to release your new version.
diff --git a/docs/sources/developers/plugins/package-a-plugin.md b/docs/sources/developers/plugins/package-a-plugin.md
new file mode 100644
index 00000000000..6fff59f4c20
--- /dev/null
+++ b/docs/sources/developers/plugins/package-a-plugin.md
@@ -0,0 +1,67 @@
+---
+description: How to package a plugin
+title: Package a plugin
+---
+
+By packaging a plugin, you can organize the plugin code and make it ready for use in your organization.
+
+## Package a plugin for distribution
+
+1. Build the plugin
+
+   ```
+   yarn install --pure-lockfile
+   yarn build
+   ```
+
+1. Optional: If your data source plugin has a backend plugin, build it as well.
+
+   ```
+   mage
+   ```
+
+   Make sure that all the binaries are executable and have a `0755` (`-rwxr-xr-x`) permission.
+
+1. Sign the plugin. To learn more, refer to [Sign the plugin]({{< relref "./sign-a-plugin" >}}).
+
+1. Rename the `dist` directory to match your plugin ID, and then create a ZIP archive.
+
+   ```
+   mv dist/ myorg-simple-panel
+   zip myorg-simple-panel-1.0.0.zip myorg-simple-panel -r
+   ```
+
+1. Optional: Verify that your plugin is packaged correctly using [zipinfo](https://linux.die.net/man/1/zipinfo).
+   It should look like this:
+
+```
+zipinfo grafana-clickhouse-datasource-1.1.2.zip
+
+Archive:  grafana-clickhouse-datasource-1.1.2.zip
+Zip file size: 34324077 bytes, number of entries: 22
+drwxr-xr-x          0 bx stor 22-Mar-24 23:23 grafana-clickhouse-datasource/
+-rw-r--r--       1654 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/CHANGELOG.md
+-rw-r--r--      11357 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/LICENSE
+-rw-r--r--       2468 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/MANIFEST.txt
+-rw-r--r--       8678 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/README.md
+drwxr-xr-x          0 bx stor 22-Mar-24 23:23 grafana-clickhouse-datasource/dashboards/
+-rw-r--r--      42973 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/dashboards/cluster-analysis.json
+-rw-r--r--      56759 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/dashboards/data-analysis.json
+-rw-r--r--      39406 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/dashboards/query-analysis.json
+-rwxr-xr-x   16469136 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_darwin_amd64
+-rwxr-xr-x   16397666 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_darwin_arm64
+-rwxr-xr-x   14942208 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_linux_amd64
+-rwxr-xr-x   14155776 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_linux_arm
+-rwxr-xr-x   14548992 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_linux_arm64
+-rwxr-xr-x   15209472 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/gpx_clickhouse_windows_amd64.exe
+drwxr-xr-x          0 bx stor 22-Mar-24 23:23 grafana-clickhouse-datasource/img/
+-rw-r--r--        304 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/img/logo.png
+-rw-r--r--       1587 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/img/logo.svg
+-rw-r--r--     138400 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/module.js
+-rw-r--r--        808 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/module.js.LICENSE.txt
+-rw-r--r--     487395 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/module.js.map
+-rw-r--r--       1616 bX defN 22-Mar-24 23:23 grafana-clickhouse-datasource/plugin.json
+22 files, 92516655 bytes uncompressed, 34319591 bytes compressed:  62.9%
+```
+
+When you've packaged your plugin, you can proceed to [publishing a plugin]({{< relref "publish-a-plugin.md" >}}) or [installing a packaged plugin](https://grafana.com/docs/grafana/latest/administration/plugin-management/#install-a-packaged-plugin).
diff --git a/docs/sources/developers/plugins/publish-a-plugin.md b/docs/sources/developers/plugins/publish-a-plugin.md
index 9f12dc73408..35e3c432f2b 100644
--- a/docs/sources/developers/plugins/publish-a-plugin.md
+++ b/docs/sources/developers/plugins/publish-a-plugin.md
@@ -39,7 +39,7 @@ Follow these steps to publish your plugin for the first time.
 
 1. [Sign in](/auth/sign-in) to your Grafana Cloud account.
 1. In the left menu, under **Org settings**, click **My Plugins**.
-1. Click **Submit Plugin**. The Create Plugin Submission form appears.
+1. Click **Submit Plugin**. The Create Plugin Submission dialog appears.
 
    {{< figure src="/static/img/docs/plugins/plugins-submission-create2.png" class="docs-image--no-shadow" max-width="650px" >}}
 
@@ -54,10 +54,9 @@ Follow these steps to publish your plugin for the first time.
    - The remaining questions help us determine the [signature level]({{< relref "./sign-a-plugin#plugin-signature-levels" >}}) for your plugin.
 1. Click **Submit**.
    After you submit your plugin, we run an automated validation to make sure it adheres to our guidelines.
-   Your submission is placed in the review queue after the submission is validated.
-
-All submissions are manually inspected by a plugin reviewer.
-For every new plugin, we perform a manual review that includes the following checks:
+   Once your submission passes the validation, it's placed in a review queue.
+   All submissions are manually inspected by a plugin reviewer.
+   For every new plugin, we perform a manual review that includes the following checks:
 
 - **Code review:** For quality and security purposes, we review the source code for the plugin.
   If you're unable to make the source code publicly available, let us know in a comment on your plugin submission.
@@ -71,10 +70,8 @@ To submit an **update** for an already published plugin:
 
 1. [Sign in](/auth/sign-in) to your Grafana Cloud account.
 1. In the left menu, under **Org settings**, click **My Plugins**.
-1. Click **Submit Update** for the plugin you want to update. The Create Plugin Submission form appears.
-
+1. Click **Submit Update** for the plugin you want to update. The Create Plugin Submission dialog appears.
    {{< figure src="/static/img/docs/plugins/plugins-submission-create2.png" class="docs-image--no-shadow" max-width="650px" >}}
-
 1. Enter the information requested by the form.
    - **OS & Architecture:**
      - Select **Single** if your plugin archive contains binaries for multiple architectures.
@@ -110,7 +107,7 @@ To submit an **update** for an already published plugin:
 
 ### Can I unlist my plugin from the Grafana plugin catalog in case of a bug?
 
-- In the event of a bug, unlisting the plugin from our catalog may be possible in exceptional cases, such as security concerns. However, we don't have control over the specific instances where the plugin is installed.
+- In the event of a bug, unlisting the plugin from our catalog may be possible in exceptional cases, such as security concerns. However, we don't have control over the instances where the plugin is installed.
 
 ### Can I distribute my plugin somewhere else other than the Grafana plugin catalog?
 
@@ -127,5 +124,5 @@ To submit an **update** for an already published plugin:
 ### What source code URL formats are supported?
 
 - Using a tag or branch: `https://github.com/grafana/clock-panel/tree/v2.1.3`
-- A tag or branch and the code is in a subdirectory (important for mono repos): `https://github.com/grafana/clock-panel/tree/v2.1.3/plugin/` (here, the plugin contains the plugin code)
+- Using a tag or branch and the code is in a subdirectory (important for mono repos): `https://github.com/grafana/clock-panel/tree/v2.1.3/plugin/` (here, the plugin contains the plugin code)
 - Using the latest main or master branch commit: `https://github.com/grafana/clock-panel/` (not recommended, it's better to pass a tag or branch)
diff --git a/docs/sources/developers/plugins/working-with-data-frames.md b/docs/sources/developers/plugins/working-with-data-frames.md
index ac56e08f77f..8a5df83c1ab 100644
--- a/docs/sources/developers/plugins/working-with-data-frames.md
+++ b/docs/sources/developers/plugins/working-with-data-frames.md
@@ -1,20 +1,20 @@
 ---
-title: Working with data frames
+title: Work with data frames
 ---
 
-# Working with data frames
+# Work with data frames
 
-The data frame is a columnar data structure which allows efficient querying of large amounts of data. Since data frames are a central concept when developing plugins for Grafana, in this guide we'll look at some ways you can use them.
+The [data frame]({{< relref "data-frames" >}}) is a columnar data structure that allows for efficient querying of large amounts of data. Since data frames are a central concept when developing plugins for Grafana, in this guide we'll look at some ways you can use them.
 
-The DataFrame interface contains a `name` and an array of `fields` where each field contains the name, type, and the values for the field.
+The `DataFrame` interface contains a `name` and an array of `fields` where each field contains the name, type, and the values for the field.
 
-> **Note:** If you're looking to migrate an existing plugin to use the data frame format, refer to [Migrate to data frames]({{< relref "migration-guide/#migrate-to-data-frames" >}}).
+> **Note:** If you want to migrate an existing plugin to use the data frame format, refer to [Migrate to data frames]({{< relref "migration-guide/#migrate-to-data-frames" >}}).
 
 ## Create a data frame
 
-If you build a data source plugin, then you'll most likely want to convert a response from an external API to a data frame. Let's look at how to create a data frame.
+If you build a data source plugin, then you'll most likely want to convert a response from an external API to a data frame. Let's look at how to do this.
 
-Let's start with creating a simple data frame that represents a time series. The easiest way to create a data frame is to use the toDataFrame function.
+Let's start with creating a simple data frame that represents a time series. The easiest way to create a data frame is to use the `toDataFrame` function.
 
 ```ts
 // Need to be of the same length.
@@ -31,9 +31,9 @@ const frame = toDataFrame({
 });
 ```
 
-> **Note:** Data frames representing time series contain at least a `time` field, and a `number` field. By convention, built-in plugins use `Time` and `Value` as field names for data frames containing time series data.
+> **Note:** Data frames representing time series contain at least a `time` field and a `number` field. By convention, built-in plugins use `Time` and `Value` as field names for data frames containing time series data.
 
-As you can see from the example, creating data frames like this requires that your data is already stored as columnar data. If you already have the records in the form of an array of objects, then you can pass it to `toDataFrame` which tries to guess the schema based on the types and names of the objects in the array. If you're creating complex data frames this way, then be sure to verify that you get the schema you expect.
+As you can see from the example, to create data frames like this, your data must already be stored as columnar data. If you already have the records in the form of an array of objects, then you can pass it to `toDataFrame`. In this case, `toDataFrame` tries to guess the schema based on the types and names of the objects in the array. To create complex data frames this way, be sure to verify that you get the schema you expect.
 
 ```ts
 const series = [
@@ -57,7 +57,7 @@ function SimplePanel({ data: Props }) {
 }
 ```
 
-Before you start reading the data, think about what data you expect. For example, to visualize a time series we'd need at least one time field, and one number field.
+Before you start reading the data, think about what data you expect. For example, to visualize a time series you need at least one time field and one number field.
 
 ```ts
 const timeField = frame.fields.find((field) => field.type === FieldType.time);
@@ -78,7 +78,7 @@ for (let i = 0; i < frame.length; i++) {
 }
 ```
 
-Alternatively, you can use the DataFrameView, which gives you an array of objects that contain a property for each field in the frame.
+Alternatively, you can use the `DataFrameView`, which gives you an array of objects that contain a property for each field in the frame.
 
 ```ts
 const view = new DataFrameView(frame);
@@ -113,7 +113,7 @@ return (
 );
 ```
 
-To apply field options to the name of a field, use getFieldDisplayName.
+To apply field options to the name of a field, use `getFieldDisplayName`.
 
 ```ts
 const valueField = frame.fields.find((field) => field.type === FieldType.number);

From f100a4c68003300e99d7b6fa86c6f5196c41596f Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Tue, 9 May 2023 16:24:13 -0500
Subject: [PATCH 727/729] Heatmap: Handle unsorted timestamps in calculate mode
 (#68111)

---
 public/app/features/transformers/calculateHeatmap/heatmap.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/transformers/calculateHeatmap/heatmap.ts b/public/app/features/transformers/calculateHeatmap/heatmap.ts
index 15677698baf..71864a375f1 100644
--- a/public/app/features/transformers/calculateHeatmap/heatmap.ts
+++ b/public/app/features/transformers/calculateHeatmap/heatmap.ts
@@ -15,6 +15,7 @@ import {
   durationToMilliseconds,
   parseDuration,
 } from '@grafana/data';
+import { isLikelyAscendingVector } from '@grafana/data/src/transformations/transformers/joinDataFrames';
 import {
   ScaleDistribution,
   HeatmapCellLayout,
@@ -325,7 +326,7 @@ export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCa
   };
 
   const heat2d = heatmap(xs, ys, {
-    xSorted: true,
+    xSorted: isLikelyAscendingVector(xs),
     xTime: xField.type === FieldType.time,
     xMode: xBucketsCfg.mode,
     xSize:

From 4ee894b0bea4306bc171a16c0cc5f15fd799b414 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 9 May 2023 14:29:52 -0700
Subject: [PATCH 728/729] Heatmap: Fix log scale editor (#68132)

---
 packages/grafana-ui/src/options/builder/axis.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-ui/src/options/builder/axis.tsx b/packages/grafana-ui/src/options/builder/axis.tsx
index 6b940e0736c..2a728eff2e7 100644
--- a/packages/grafana-ui/src/options/builder/axis.tsx
+++ b/packages/grafana-ui/src/options/builder/axis.tsx
@@ -150,6 +150,7 @@ const LOG_DISTRIBUTION_OPTIONS: Array<SelectableValue<number>> = [
  */
 export const ScaleDistributionEditor = ({ value, onChange }: StandardEditorProps<ScaleDistributionConfig>) => {
   const type = value?.type ?? ScaleDistribution.Linear;
+  const log = value?.log ?? 2;
   return (
     <>
       <div style={{ marginBottom: 16 }}>
@@ -160,7 +161,7 @@ export const ScaleDistributionEditor = ({ value, onChange }: StandardEditorProps
             onChange({
               ...value,
               type: v!,
-              log: v === ScaleDistribution.Linear ? undefined : value.log ?? 2,
+              log: v === ScaleDistribution.Linear ? undefined : log,
             });
           }}
         />
@@ -169,7 +170,7 @@ export const ScaleDistributionEditor = ({ value, onChange }: StandardEditorProps
         <Field label="Log base">
           <Select
             options={LOG_DISTRIBUTION_OPTIONS}
-            value={value.log ?? 2}
+            value={log}
             onChange={(v) => {
               onChange({
                 ...value,
@@ -183,7 +184,7 @@ export const ScaleDistributionEditor = ({ value, onChange }: StandardEditorProps
         <Field label="Linear threshold">
           <Input
             placeholder="1"
-            value={value.linearThreshold}
+            value={value?.linearThreshold}
             onChange={(v) => {
               onChange({
                 ...value,

From d1229b532d22beb1c4853fe02f2616a3286bb71f Mon Sep 17 00:00:00 2001
From: Selene <selenepinillos@gmail.com>
Date: Wed, 10 May 2023 01:13:45 +0200
Subject: [PATCH 729/729] Chore: Delete codegen dead code (#68072)

* Delete codegen dead code

* Use codejen

* Fix lint

* Use fs verify
---
 devenv/jsonnet/dev-dashboards.go |  21 ++-
 go.mod                           |   5 +-
 go.sum                           |  65 ++-----
 pkg/codegen/coremodel.go         | 288 -------------------------------
 pkg/codegen/diffwrite.go         | 134 --------------
 pkg/codegen/tmpl.go              |  21 ---
 6 files changed, 35 insertions(+), 499 deletions(-)
 delete mode 100644 pkg/codegen/coremodel.go
 delete mode 100644 pkg/codegen/diffwrite.go

diff --git a/devenv/jsonnet/dev-dashboards.go b/devenv/jsonnet/dev-dashboards.go
index b1d926a25ff..92079311756 100644
--- a/devenv/jsonnet/dev-dashboards.go
+++ b/devenv/jsonnet/dev-dashboards.go
@@ -5,6 +5,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"embed"
 	"fmt"
 	"os"
@@ -13,8 +14,8 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/grafana/codejen"
 	dev_dashboards "github.com/grafana/grafana/devenv/dev-dashboards"
-	"github.com/grafana/grafana/pkg/codegen"
 )
 
 var (
@@ -35,17 +36,21 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	wd := codegen.NewWriteDiffer()
-	wd[OUTPUT_PATH] = []byte(out)
+
+	f := codejen.NewFile(OUTPUT_PATH, []byte(out), dummyJenny{})
+	fs := codejen.NewFS()
+	if err = fs.Add(*f); err != nil {
+		panic(err)
+	}
 
 	if _, set := os.LookupEnv("CODEGEN_VERIFY"); set {
-		err = wd.Verify()
+		err = fs.Verify(context.Background(), "")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "generated code is not up to date:\n%s\nrun `make gen-jsonnet` to regenerate\n\n", err)
 			os.Exit(1)
 		}
 	} else {
-		err = wd.Write()
+		err = fs.Verify(context.Background(), "")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error while writing generated code to disk:\n%s\n", err)
 			os.Exit(1)
@@ -121,3 +126,9 @@ func (g *libjsonnetGen) readDir(dir string) error {
 	}
 	return nil
 }
+
+type dummyJenny struct{}
+
+func (dummyJenny) JennyName() string {
+	return "dummyJenny"
+}
diff --git a/go.mod b/go.mod
index 782a4fdb6c8..beb2c46400f 100644
--- a/go.mod
+++ b/go.mod
@@ -15,9 +15,6 @@ replace github.com/docker/docker => github.com/moby/moby v23.0.4+incompatible
 // contains openapi encoder fixes. remove ASAP
 replace cuelang.org/go => github.com/sdboyer/cue v0.5.0-beta.2.0.20230419165817-251c3ae823d8
 
-// contains go generation fixes
-replace github.com/deepmap/oapi-codegen => github.com/spinillos/oapi-codegen v1.12.5-0.20230417081915-2945b61c0b1c
-
 // For some insane reason, client-go seems to have a broken v12.0.0 tag on it that forces us to
 // hoist a replace statement.
 replace k8s.io/client-go => k8s.io/client-go v0.25.3
@@ -143,7 +140,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
-	github.com/deepmap/oapi-codegen v1.12.4
+	github.com/deepmap/oapi-codegen v1.12.4 // indirect
 	github.com/dennwc/varint v1.0.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/docker/go-units v0.5.0 // indirect
diff --git a/go.sum b/go.sum
index e607e3eedff..a3d557fd4c0 100644
--- a/go.sum
+++ b/go.sum
@@ -458,8 +458,6 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/buildkite/yaml v2.1.0+incompatible h1:xirI+ql5GzfikVNDmt+yeiXpf/v1Gt03qXTtT5WXdr8=
 github.com/buildkite/yaml v2.1.0+incompatible/go.mod h1:UoU8vbcwu1+vjZq01+KrpSeLBgQQIjL/H7Y6KwikUrI=
-github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/cactus/go-statsd-client/statsd v0.0.0-20191106001114-12b4e2b38748/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI=
 github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds=
@@ -485,8 +483,6 @@ github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOo
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 h1:XCdvHbz3LhewBHN7+mQPx0sg/Hxil/1USnBmxkjHcmY=
 github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
 github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
@@ -631,6 +627,7 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4=
 github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ=
+github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
 github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
@@ -657,9 +654,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4=
 github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
-github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
+github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
+github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
+github.com/deepmap/oapi-codegen v1.12.4 h1:pPmn6qI9MuOtCz82WY2Xaw46EQjgvxednXXrP7g5Q2s=
+github.com/deepmap/oapi-codegen v1.12.4/go.mod h1:3lgHGMu6myQ2vqbbTXH2H1o4eXFTGnFiDaOaKKl5yas=
 github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE=
 github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
@@ -798,6 +796,8 @@ github.com/gchaincl/sqlhooks v1.3.0 h1:yKPXxW9a5CjXaVf2HkQn6wn7TZARvbAOAelr3H8vK
 github.com/gchaincl/sqlhooks v1.3.0/go.mod h1:9BypXnereMT0+Ys8WGWHqzgkkOfHIhyeUCqXC24ra34=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM=
+github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
+github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
 github.com/getkin/kin-openapi v0.115.0 h1:c8WHRLVY3G8m9jQTy0/DnIuljgRwTCB5twZytQS4JyU=
 github.com/getkin/kin-openapi v0.115.0/go.mod h1:l5e9PaFUo9fyLJCPGQeXI2ML8c3P8BHOEV2VaAVf/pc=
@@ -809,7 +809,6 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.3/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
-github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k=
 github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@@ -819,7 +818,7 @@ github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1T
 github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
 github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
@@ -993,16 +992,12 @@ github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUri
 github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU=
 github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY=
@@ -1054,8 +1049,6 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
 github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
 github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
@@ -1084,7 +1077,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/gogo/status v1.0.3/go.mod h1:SavQ51ycCLnc7dGyJxp8YAmudx8xqiVrRf+6IXRsugc=
 github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
@@ -1288,8 +1280,6 @@ github.com/grafana/go-mssqldb v0.9.1 h1:3CqteWF0CadwXV9f3FxoI+i3uSW3azjTlQipyOJt
 github.com/grafana/go-mssqldb v0.9.1/go.mod h1:HTCsUqZdb7oIO7jc37YauiSB5C3P/13AnpctVWBhlus=
 github.com/grafana/go-mssqldb v0.9.2 h1:FkyRJR4ywsT07iMtpFMHStrl8uuNkGIwp253Fee06z8=
 github.com/grafana/go-mssqldb v0.9.2/go.mod h1:HTCsUqZdb7oIO7jc37YauiSB5C3P/13AnpctVWBhlus=
-github.com/grafana/grafana-aws-sdk v0.12.0 h1:eUjFdFZeZE+nyu/RMRz+qFxTBew69ToLBrbRhTbjkfM=
-github.com/grafana/grafana-aws-sdk v0.12.0/go.mod h1:rCXLYoMpPqF90U7XqgVJ1HIAopFVF0bB3SXBVEJIm3I=
 github.com/grafana/grafana-aws-sdk v0.15.0 h1:ZOPHQcC5NUFi1bLTwnju91G0KmGh1z+qXOKj9nDfxNs=
 github.com/grafana/grafana-aws-sdk v0.15.0/go.mod h1:rCXLYoMpPqF90U7XqgVJ1HIAopFVF0bB3SXBVEJIm3I=
 github.com/grafana/grafana-azure-sdk-go v1.6.0 h1:lxvH/mVY7gKBtJKhZ4B/6tIZFY7Jth97HxBA38olaxs=
@@ -1603,7 +1593,6 @@ github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e
 github.com/klauspost/compress v1.15.13 h1:NFn1Wr8cfnenSJSA46lLq4wHCcBzKTSjnBIexDMMOV0=
 github.com/klauspost/compress v1.15.13/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
 github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/knadh/koanf v1.2.0/go.mod h1:xpPTwMhsA/aaQLAilyCCqfpEiY1gpa160AiCuWHJUjY=
@@ -1630,22 +1619,17 @@ github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLg
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
 github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
 github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4=
 github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U=
 github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/leoluk/perflib_exporter v0.1.0/go.mod h1:rpV0lYj7lemdTm31t7zpCqYqPnw7xs86f+BaaNBVYFM=
-github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
-github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ=
-github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
-github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
-github.com/lestrrat-go/jwx v1.2.25/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY=
-github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
 github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
@@ -1685,15 +1669,17 @@ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHef
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/matryer/moq v0.3.1/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFKH4s=
+github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
 github.com/mattermost/xml-roundtrip-validator v0.1.0 h1:RXbVD2UAl7A7nOTR4u7E3ILa4IbtvKBHw64LDsmu9hU=
 github.com/mattermost/xml-roundtrip-validator v0.1.0/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To=
 github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
 github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
@@ -1714,7 +1700,6 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
 github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
@@ -1941,7 +1926,6 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
-github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/perimeterx/marshmallow v1.1.4 h1:pZLDH9RjlLGGorbXhcaQLhfuV0pFMNfPO55FuFkxqLw=
 github.com/perimeterx/marshmallow v1.1.4/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
@@ -2197,8 +2181,6 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
-github.com/spinillos/oapi-codegen v1.12.5-0.20230417081915-2945b61c0b1c h1:u9EyGmVLczUaCNBvY4j9NItCJNaQRbEWGUR8fcu20Kk=
-github.com/spinillos/oapi-codegen v1.12.5-0.20230417081915-2945b61c0b1c/go.mod h1:WMhniMLAXaHHNYz+Nk+h35qYieaeUaASStrkdkHnBr8=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
@@ -2254,7 +2236,6 @@ github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZF
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f h1:A+MmlgpvrHLeUP8dkBVn4Pnf5Bp5Yk2OALm7SEJLLE8=
 github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f/go.mod h1:OBcG9bn7sHtXgarhUEb3OfCnNsgtGnkVf41ilSZ3K3E=
 github.com/uber-go/tally v3.3.15+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU=
@@ -2272,9 +2253,8 @@ github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
 github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU=
-github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI=
 github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8/go.mod h1:fVle4kNr08ydeohzYafr20oZzbAkhQT39gKK/pFQ5M4=
 github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
@@ -2291,6 +2271,7 @@ github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU=
 github.com/urfave/cli/v2 v2.24.4/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
@@ -2500,7 +2481,6 @@ go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 gocloud.dev v0.25.0 h1:Y7vDq8xj7SyM848KXf32Krda2e6jQ4CLh/mTeCSqXtk=
 gocloud.dev v0.25.0/go.mod h1:7HegHVCYZrMiU3IE1qtnzf/vRrDwLYnRNR3EhWX8x9Y=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -2535,6 +2515,7 @@ golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -2556,12 +2537,9 @@ golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2614,7 +2592,6 @@ golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -2714,8 +2691,6 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220907135653-1e95f45603a7/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
@@ -2854,6 +2829,7 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2937,9 +2913,7 @@ golang.org/x/sys v0.0.0-20220908150016-7ac13a9a928d/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
@@ -2949,8 +2923,6 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
@@ -2967,7 +2939,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
@@ -2977,6 +2948,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -3076,7 +3048,6 @@ golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyj
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
diff --git a/pkg/codegen/coremodel.go b/pkg/codegen/coremodel.go
deleted file mode 100644
index d6c5dc5aee2..00000000000
--- a/pkg/codegen/coremodel.go
+++ /dev/null
@@ -1,288 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing/fstest"
-
-	cerrors "cuelang.org/go/cue/errors"
-	"cuelang.org/go/pkg/encoding/yaml"
-	"github.com/deepmap/oapi-codegen/pkg/codegen"
-	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/grafana/cuetsy"
-	tsast "github.com/grafana/cuetsy/ts/ast"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/encoding/openapi"
-)
-
-// CoremodelDeclaration contains the results of statically analyzing a Grafana
-// directory for a Thema lineage.
-type CoremodelDeclaration struct {
-	Lineage thema.Lineage
-	// Absolute path to the coremodel's coremodel.cue file.
-	LineagePath string
-	// Path to the coremodel's coremodel.cue file relative to repo root.
-	RelativePath string
-	// Indicates whether the coremodel is considered canonical or not. Generated
-	// code from not-yet-canonical coremodels should include appropriate caveats in
-	// documentation and possibly be hidden from external public API surface areas.
-	IsCanonical bool
-
-	// Indicates whether the coremodel represents an API type, and should therefore
-	// be included in API client code generation.
-	IsAPIType bool
-}
-
-// ExtractLineage loads a Grafana Thema lineage from the filesystem.
-//
-// The provided path must be the absolute path to the file containing the
-// lineage to be loaded.
-//
-// This loading approach is intended primarily for use with code generators, or
-// other use cases external to grafana-server backend. For code within
-// grafana-server, prefer lineage loaders provided in e.g. pkg/coremodel/*.
-func ExtractLineage(path string, rt *thema.Runtime) (*CoremodelDeclaration, error) {
-	if !filepath.IsAbs(path) {
-		return nil, fmt.Errorf("must provide an absolute path, got %q", path)
-	}
-
-	ec := &CoremodelDeclaration{
-		LineagePath: path,
-	}
-
-	var find func(path string) (string, error)
-	find = func(path string) (string, error) {
-		parent := filepath.Dir(path)
-		if parent == path {
-			return "", errors.New("grafana root directory could not be found")
-		}
-		fp := filepath.Join(path, "go.mod")
-		if _, err := os.Stat(fp); err == nil {
-			return path, nil
-		}
-		return find(parent)
-	}
-	groot, err := find(path)
-	if err != nil {
-		return ec, err
-	}
-
-	f, err := os.Open(ec.LineagePath)
-	if err != nil {
-		return nil, fmt.Errorf("could not open lineage file at %s: %w", path, err)
-	}
-
-	byt, err := io.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	fs := fstest.MapFS{
-		"coremodel.cue": &fstest.MapFile{
-			Data: byt,
-		},
-	}
-
-	// ec.RelativePath, err = filepath.Rel(groot, filepath.Dir(path))
-	ec.RelativePath, err = filepath.Rel(groot, path)
-	if err != nil {
-		// should be unreachable, since we rootclimbed to find groot above
-		panic(err)
-	}
-	ec.RelativePath = filepath.ToSlash(ec.RelativePath)
-	ec.Lineage, err = cuectx.LoadGrafanaInstancesWithThema(filepath.Dir(ec.RelativePath), fs, rt)
-	if err != nil {
-		return ec, err
-	}
-	ec.IsCanonical = isCanonical(ec.Lineage.Name())
-	ec.IsAPIType = isAPIType(ec.Lineage.Name())
-	return ec, nil
-}
-
-// toTemplateObj extracts creates a struct with all the useful strings for template generation.
-func (cd *CoremodelDeclaration) toTemplateObj() tplVars {
-	lin := cd.Lineage
-	sch := thema.SchemaP(lin, thema.LatestVersion(lin))
-
-	return tplVars{
-		Name:        lin.Name(),
-		LineagePath: cd.RelativePath,
-		PkgPath:     filepath.ToSlash(filepath.Join("github.com/grafana/grafana", filepath.Dir(cd.RelativePath))),
-		TitleName:   strings.Title(lin.Name()), // nolint
-		LatestSeqv:  sch.Version()[0],
-		LatestSchv:  sch.Version()[1],
-	}
-}
-
-func isCanonical(name string) bool {
-	return canonicalCoremodels[name]
-}
-
-func isAPIType(name string) bool {
-	return !nonAPITypes[name]
-}
-
-// FIXME specifying coremodel canonicality DOES NOT belong here - it should be part of the coremodel declaration.
-var canonicalCoremodels = map[string]bool{
-	"dashboard": false,
-}
-
-// FIXME this also needs to be moved into coremodel metadata
-var nonAPITypes = map[string]bool{
-	"pluginmeta": true,
-}
-
-// PathVersion returns the string path element to use for the latest schema.
-// "x" if not yet canonical, otherwise, "v<major>"
-func (cd *CoremodelDeclaration) PathVersion() string {
-	if !cd.IsCanonical {
-		return "x"
-	}
-	return fmt.Sprintf("v%v", thema.LatestVersion(cd.Lineage)[0])
-}
-
-// GenerateGoCoremodel generates a standard Go model struct and coremodel
-// implementation from a coremodel CUE declaration.
-//
-// The provided path must be a directory. Generated code files will be written
-// to that path. The final element of the path must match the Lineage.Name().
-func (cd *CoremodelDeclaration) GenerateGoCoremodel(path string) (WriteDiffer, error) {
-	lin, rt := cd.Lineage, cd.Lineage.Runtime()
-	_, name := filepath.Split(path)
-	if name != lin.Name() {
-		return nil, fmt.Errorf("lineage name %q must match final element of path, got %q", lin.Name(), path)
-	}
-
-	sch := thema.SchemaP(lin, thema.LatestVersion(lin))
-	f, err := openapi.GenerateSchema(sch, nil)
-	if err != nil {
-		return nil, fmt.Errorf("thema openapi generation failed: %w", err)
-	}
-
-	str, err := yaml.Marshal(rt.Context().BuildFile(f))
-	if err != nil {
-		return nil, fmt.Errorf("cue-yaml marshaling failed: %w", err)
-	}
-
-	loader := openapi3.NewLoader()
-	oT, err := loader.LoadFromData([]byte(str))
-	if err != nil {
-		return nil, fmt.Errorf("loading generated openapi failed; %w", err)
-	}
-
-	var importbuf bytes.Buffer
-	if err = tmpls.Lookup("coremodel_imports.tmpl").Execute(&importbuf, tvars_coremodel_imports{
-		PackageName: lin.Name(),
-	}); err != nil {
-		return nil, fmt.Errorf("error executing imports template: %w", err)
-	}
-
-	gostr, err := codegen.Generate(oT, codegen.Configuration{
-		PackageName: lin.Name(),
-		Generate: codegen.GenerateOptions{
-			Models: true,
-		},
-		Compatibility: codegen.CompatibilityOptions{
-			AlwaysPrefixEnumValues: true,
-		},
-		OutputOptions: codegen.OutputOptions{
-			SkipFmt:   true,
-			SkipPrune: true,
-			UserTemplates: map[string]string{
-				"imports.tmpl": importbuf.String(),
-				"typedef.tmpl": tmplTypedef,
-			},
-		},
-	})
-	if err != nil {
-		return nil, fmt.Errorf("openapi generation failed: %w", err)
-	}
-
-	buf := new(bytes.Buffer)
-	if err = tmpls.Lookup("autogen_header.tmpl").Execute(buf, tvars_autogen_header{
-		LineagePath:   cd.RelativePath,
-		GeneratorPath: "pkg/framework/coremodel/gen.go", // FIXME hardcoding is not OK
-	}); err != nil {
-		return nil, fmt.Errorf("error executing header template: %w", err)
-	}
-
-	fmt.Fprint(buf, "\n", gostr)
-
-	vars := cd.toTemplateObj()
-	err = tmpls.Lookup("addenda.tmpl").Execute(buf, vars)
-	if err != nil {
-		panic(err)
-	}
-
-	fullp := filepath.Join(path, fmt.Sprintf("%s_gen.go", lin.Name()))
-	byt, err := postprocessGoFile(genGoFile{
-		path:   fullp,
-		walker: PrefixDropper(strings.Title(lin.Name())),
-		in:     buf.Bytes(),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	wd := NewWriteDiffer()
-	wd[fullp] = byt
-
-	return wd, nil
-}
-
-type tplVars struct {
-	Name                   string
-	LineagePath, PkgPath   string
-	TitleName              string
-	LatestSeqv, LatestSchv uint
-	IsComposed             bool
-}
-
-func (cd *CoremodelDeclaration) GenerateTypescriptCoremodel() (*tsast.File, error) {
-	schv := cd.Lineage.Latest().Underlying()
-
-	tf, err := cuetsy.GenerateAST(schv, cuetsy.Config{
-		Export: true,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("cuetsy tf gen failed: %w", err)
-	}
-
-	top, err := cuetsy.GenerateSingleAST(strings.Title(cd.Lineage.Name()), schv, cuetsy.TypeInterface)
-	if err != nil {
-		return nil, fmt.Errorf("cuetsy top gen failed: %s", cerrors.Details(err, nil))
-	}
-
-	buf := new(bytes.Buffer)
-	if err := tmpls.Lookup("autogen_header.tmpl").Execute(buf, tvars_autogen_header{
-		LineagePath:   cd.RelativePath,
-		GeneratorPath: "pkg/framework/coremodel/gen.go", // FIXME hardcoding is not OK
-	}); err != nil {
-		return nil, fmt.Errorf("error executing header template: %w", err)
-	}
-	tf.Doc = &tsast.Comment{
-		Text: buf.String(),
-	}
-
-	// TODO until cuetsy can toposort its outputs, put the top/parent type at the bottom of the file.
-	tf.Nodes = append(tf.Nodes, top.T)
-	if top.D != nil {
-		tf.Nodes = append(tf.Nodes, top.D)
-	}
-	return tf, nil
-}
-
-var tmplTypedef = `{{range .Types}}
-{{ with .Schema.Description }}{{ . }}{{ else }}// {{.TypeName}} is the Go representation of a {{.JsonName}}.{{ end }}
-//
-// THIS TYPE IS INTENDED FOR INTERNAL USE BY THE GRAFANA BACKEND, AND IS SUBJECT TO BREAKING CHANGES.
-// Equivalent Go types at stable import paths are provided in https://github.com/grafana/grok.
-type {{.TypeName}} {{if and (opts.AliasTypes) (.CanAlias)}}={{end}} {{.Schema.TypeDecl}}
-{{end}}
-`
diff --git a/pkg/codegen/diffwrite.go b/pkg/codegen/diffwrite.go
deleted file mode 100644
index fb1cece0fcd..00000000000
--- a/pkg/codegen/diffwrite.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package codegen
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"sort"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/go-multierror"
-	"golang.org/x/sync/errgroup"
-)
-
-// WriteDiffer is a pseudo-filesystem that supports batch-writing its contents
-// to the real filesystem, or batch-comparing its contents to the real
-// filesystem. Its intended use is for idiomatic `go generate`-style code
-// generators, where it is expected that the results of codegen are committed to
-// version control.
-//
-// In such cases, the normal behavior of a generator is to write files to disk,
-// but in CI, that behavior should change to verify that what is already on disk
-// is identical to the results of code generation. This allows CI to ensure that
-// the results of code generation are always up to date. WriteDiffer supports
-// these related behaviors through its Write() and Verify() methods, respectively.
-//
-// Note that the statelessness of WriteDiffer means that, if a particular input
-// to the code generator goes away, it will not notice generated files left
-// behind if their inputs are removed.
-// TODO introduce a search/match system
-type WriteDiffer map[string][]byte
-
-func NewWriteDiffer() WriteDiffer {
-	return WriteDiffer(make(map[string][]byte))
-}
-
-type writeSlice []struct {
-	path     string
-	contents []byte
-}
-
-// Verify checks the contents of each file against the filesystem. It emits an error
-// if any of its contained files differ.
-func (wd WriteDiffer) Verify() error {
-	var result error
-
-	for _, item := range wd.toSlice() {
-		if _, err := os.Stat(item.path); err != nil {
-			if errors.Is(err, os.ErrNotExist) {
-				result = multierror.Append(result, fmt.Errorf("%s: generated file should exist, but does not", item.path))
-			} else {
-				result = multierror.Append(result, fmt.Errorf("%s: could not stat generated file: %w", item.path, err))
-			}
-			continue
-		}
-
-		f, err := os.Open(filepath.Clean(item.path))
-		if err != nil {
-			result = multierror.Append(result, fmt.Errorf("%s: %w", item.path, err))
-			continue
-		}
-
-		ob, err := io.ReadAll(f)
-		if err != nil {
-			result = multierror.Append(result, fmt.Errorf("%s: %w", item.path, err))
-			continue
-		}
-		dstr := cmp.Diff(string(ob), string(item.contents))
-		if dstr != "" {
-			result = multierror.Append(result, fmt.Errorf("%s would have changed:\n\n%s", item.path, dstr))
-		}
-	}
-
-	return result
-}
-
-// Write writes all of the files to their indicated paths.
-func (wd WriteDiffer) Write() error {
-	g, _ := errgroup.WithContext(context.TODO())
-	g.SetLimit(12)
-
-	for _, item := range wd.toSlice() {
-		it := item
-		g.Go(func() error {
-			err := os.MkdirAll(filepath.Dir(it.path), os.ModePerm)
-			if err != nil {
-				return fmt.Errorf("%s: failed to ensure parent directory exists: %w", it.path, err)
-			}
-
-			if err := os.WriteFile(it.path, it.contents, 0644); err != nil {
-				return fmt.Errorf("%s: error while writing file: %w", it.path, err)
-			}
-			return nil
-		})
-	}
-
-	return g.Wait()
-}
-
-func (wd WriteDiffer) toSlice() writeSlice {
-	sl := make(writeSlice, 0, len(wd))
-	type ws struct {
-		path     string
-		contents []byte
-	}
-
-	for k, v := range wd {
-		sl = append(sl, ws{
-			path:     k,
-			contents: v,
-		})
-	}
-
-	sort.Slice(sl, func(i, j int) bool {
-		return sl[i].path < sl[j].path
-	})
-
-	return sl
-}
-
-// Merge combines all the entries from the provided WriteDiffer into the callee
-// WriteDiffer. Duplicate paths result in an error.
-func (wd WriteDiffer) Merge(wd2 WriteDiffer) error {
-	for k, v := range wd2 {
-		if _, has := wd[k]; has {
-			return fmt.Errorf("path %s already exists in write differ", k)
-		}
-		wd[k] = v
-	}
-
-	return nil
-}
diff --git a/pkg/codegen/tmpl.go b/pkg/codegen/tmpl.go
index e5071707c44..beaca5c2318 100644
--- a/pkg/codegen/tmpl.go
+++ b/pkg/codegen/tmpl.go
@@ -1,7 +1,6 @@
 package codegen
 
 import (
-	"bytes"
 	"embed"
 	"strings"
 	"text/template"
@@ -28,12 +27,6 @@ var tmplFS embed.FS
 // The following group of types, beginning with tvars_*, all contain the set
 // of variables expected by the corresponding named template file under tmpl/
 type (
-	tvars_autogen_header struct {
-		GeneratorPath  string
-		LineagePath    string
-		LineageCUEPath string
-		GenLicense     bool
-	}
 	tvars_gen_header struct {
 		MainGenerator string
 		Using         []codejen.NamedJenny
@@ -45,23 +38,9 @@ type (
 		KindPackagePrefix string
 		Kinds             []kindsys.Core
 	}
-	tvars_coremodel_imports struct {
-		PackageName string
-	}
 	tvars_resource struct {
 		PackageName      string
 		KindName         string
 		SubresourceNames []string
 	}
 )
-
-type HeaderVars = tvars_autogen_header
-
-// GenGrafanaHeader creates standard header elements for generated Grafana files.
-func GenGrafanaHeader(vars HeaderVars) string {
-	buf := new(bytes.Buffer)
-	if err := tmpls.Lookup("autogen_header.tmpl").Execute(buf, vars); err != nil {
-		panic(err)
-	}
-	return buf.String()
-}